diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 00000000000..15f67b986f1
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,73 @@
+FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04
+
+ENV DEBIAN_FRONTEND=noninteractive
+
+# Install some basics
+RUN apt-get update \
+    && apt-get install -y \
+        wget \
+        curl \
+        git \
+        vim \
+        unzip \
+        xz-utils \
+        software-properties-common \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+# Add latest cmake
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
+    && apt-add-repository "deb https://apt.kitware.com/ubuntu/ $(lsb_release -sc) main"
+
+# Install required packages for dev
+RUN apt-get update \
+    && apt-get install -y \
+        build-essential \
+        libtool autoconf pkg-config \
+        ninja-build \
+        ruby-full \
+        clang-14 \
+        llvm-14 \
+        libc++-dev libc++abi-dev \
+        cmake \
+        libboost-all-dev \
+        ccache \
+        # Swift dependencies
+        binutils \
+        git \
+        gnupg2 \
+        libc6-dev \
+        libcurl4-openssl-dev \
+        libedit2 \
+        libgcc-9-dev \
+        libpython3.8 \
+        libsqlite3-0 \
+        libstdc++-9-dev \
+        libxml2-dev \
+        libz3-dev \
+        pkg-config \
+        tzdata \
+        unzip \
+        zlib1g-dev \
+    && apt-get clean && rm -rf /var/lib/apt/lists/*
+
+ENV CC=/usr/bin/clang-14
+ENV CXX=/usr/bin/clang++-14
+
+# Instal Swift
+RUN curl -sSL \
+	https://download.swift.org/swift-5.8-release/ubuntu2204/swift-5.8-RELEASE/swift-5.8-RELEASE-ubuntu22.04.tar.gz \
+	-o swift-5.8.tar.gz && \
+    mkdir -p swift-5.8 && \
+    tar -xzf swift-5.8.tar.gz -C swift-5.8 --strip-components=1 && \
+    mv swift-5.8 /usr/share/swift
+
+ENV PATH="/usr/share/swift/usr/bin:${PATH}"
+
+USER vscode
+
+# Install rust
+RUN curl https://sh.rustup.rs -sSf | sh -s -- --no-modify-path -y
+ENV PATH="/home/vscode/.cargo/bin:${PATH}"
+RUN cargo install --force cbindgen \
+    && rustup target add wasm32-unknown-emscripten
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 00000000000..6bf6d7c88ac
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,31 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the
+// README at: https://github.com/devcontainers/templates/tree/main/src/debian
+{
+	"name": "Debian",
+	// Use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
+	"build": {
+		"dockerfile": "Dockerfile"
+	},
+
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	// "features": {},
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Configure tool-specific properties.
+	"customizations": {
+		"vscode": {
+			"extensions": [
+				"rust-lang.rust-analyzer",
+				"sswg.swift-lang",
+				"ms-vscode.cpptools",
+				"ms-vscode.cpptools-extension-pack",
+				"rebornix.Ruby"
+			]
+		}
+	},
+
+	// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
+	"remoteUser": "vscode"
+}
diff --git a/.dockerignore b/.dockerignore
new file mode 120000
index 00000000000..3e4e48b0b5f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1 @@
+.gitignore
\ No newline at end of file
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 707fa9c11ea..1724b9a1b7e 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -3,4 +3,5 @@
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
 
-* @hewigovens @catenocrypt @milerius @miloserdow
+* @milerius @satoshiotomakan @ar-g
+kotlin/ @ar-g @JaimeToca @rkokhatskyi
diff --git a/.github/workflows/android-ci.yml b/.github/workflows/android-ci.yml
index 0bb3ed90964..b8d6bb34c8a 100644
--- a/.github/workflows/android-ci.yml
+++ b/.github/workflows/android-ci.yml
@@ -2,43 +2,82 @@ name: Android CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ dev, master ]
   pull_request:
-    branches: [ master ]
+    branches: [ dev, master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-
-    runs-on: macos-12
-
+    runs-on: macos-latest-large
+    if: github.event.pull_request.draft == false
     steps:
-    - uses: actions/checkout@v2
-    - name: Set up JDK 11
-      uses: actions/setup-java@v1
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
       with:
-        java-version: 11
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+
     - name: Install system dependencies
-      run: brew install boost ninja
-    - name: Install Android Dependencies
       run: |
-        tools/install-android-dependencies
+        tools/install-sys-dependencies-mac
+
+    - name: Cache Rust
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: |
+          rust
+
+    - name: Install Rust dependencies
+      run: |
+        tools/install-rust-dependencies
+
+    - name: Install Android Dependencies
+      run: tools/install-android-dependencies
+
     - name: Cache internal dependencies
       id: internal_cache
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v3
       with:
         path: build/local
-        key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
+        key: ${{ runner.os }}-${{ runner.arch }}-internal-${{ hashFiles('tools/install-dependencies') }}
+
     - name: Install internal dependencies
-      run: |
-        tools/install-dependencies
+      run: tools/install-dependencies
       if: steps.internal_cache.outputs.cache-hit != 'true'
-    - name: Run test
+
+    - name: Generate files
+      run: tools/generate-files android
+
+    - name: Build Kotlin doc
+      run: tools/kotlin-doc
+
+    - name: Build tests
       run: |
-        tools/generate-files
-        tools/android-test
+        pushd android
+        ./gradlew assembleAndroidTest
+        popd
+
+    - name: Run tests
+      uses: reactivecircus/android-emulator-runner@v2
+      with:
+        api-level: 30
+        target: google_apis
+        arch: x86
+        ndk: 23.1.7779620
+        cmake: 3.18.1
+        script: cd android; ./gradlew connectedAndroidTest
+
     - name: Build sample app
-      run: |
-        tools/samples-build android
+      run: tools/samples-build android
       env:
         GITHUB_USER: ${{ github.actor }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/codegen-v2.yml b/.github/workflows/codegen-v2.yml
new file mode 100644
index 00000000000..8438d788d56
--- /dev/null
+++ b/.github/workflows/codegen-v2.yml
@@ -0,0 +1,47 @@
+name: Codegen-v2 Tests
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+    branches: [ dev, master ]
+
+env:
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+
+jobs:
+  test:
+    runs-on: ubuntu-24.04
+    if: github.event.pull_request.draft == false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install system dependencies
+        run: |
+          tools/install-sys-dependencies-linux
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.3
+
+      - name: Install Rust dependencies
+        run: |
+          tools/install-rust-dependencies
+
+      - name: Run codegen-v2 tests
+        run: |
+          cargo test --all
+        working-directory: codegen-v2
+
+      # Generate files for a blockchain.
+      # Please note the blockchain should not be implemented in Rust at the moment of running this step,
+      # otherwise consider either generating files for another blockchain or removing this step at all.
+      - name: Test codegen-v2 new-blockchain-rust
+        run: |
+          cargo run -- new-blockchain-rust iotex
+        working-directory: codegen-v2
+
+      # Check if `new-blockchain-rust` command has generated files that do not break project compilation.
+      - name: Check Rust compiles
+        run: |
+          cargo check --tests
+        working-directory: rust
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 369efae9cbd..336faa4ce81 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,29 +2,25 @@ name: Docker CI
 
 on:
   push:
-    branches: [ master ]
-    paths:
-      - Dockerfile
-      - tools/install-dependencies
+    branches: [ dev, master ]
   pull_request:
-    branches: [ master ]
-    paths: 
+    branches: [ dev, master ]
+    paths:
       - Dockerfile
       - tools/install-dependencies
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
-    - uses: actions/checkout@v2
-    - name: Lint Dockerfile
-      run: |
-        curl -L https://github.com/hadolint/hadolint/releases/download/v1.17.6/hadolint-Linux-x86_64 -o hadolint && chmod +x hadolint
-        ./hadolint Dockerfile
-
-    - name: Build Dockerfile
-      uses: docker/build-push-action@v1.1.0
-      with:
-        repository: trustwallet/wallet-core
-        tags: latest
-        push: false
+      - uses: actions/checkout@v3
+      - name: Lint Dockerfile
+        run: |
+          curl -L https://github.com/hadolint/hadolint/releases/download/v1.17.6/hadolint-Linux-x86_64 -o hadolint && chmod +x hadolint
+          ./hadolint Dockerfile
+      - name: Build Dockerfile
+        uses: docker/build-push-action@v1.1.0
+        with:
+          repository: trustwallet/wallet-core
+          tags: latest
+          push: false
diff --git a/.github/workflows/ios-ci.yml b/.github/workflows/ios-ci.yml
index a7078f649e3..649b15e84a2 100644
--- a/.github/workflows/ios-ci.yml
+++ b/.github/workflows/ios-ci.yml
@@ -2,34 +2,55 @@ name: iOS CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ dev, master ]
   pull_request:
-    branches: [ master ]
+    branches: [ dev, master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-    runs-on: macos-12
+    runs-on: macos-latest-xlarge
+    if: github.event.pull_request.draft == false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
+
     - name: Install system dependencies
       run: |
-        brew install boost ninja xcodegen xcbeautify
+        tools/install-sys-dependencies-mac
+
+    - name: Cache Rust
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: |
+          rust
+
+    - name: Install Rust dependencies
+      run: |
+        tools/install-rust-dependencies
+
     - name: Cache internal dependencies
       id: internal_cache
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v3
       with:
         path: build/local
         key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
+
     - name: Install internal dependencies
       run: |
         tools/install-dependencies
       if: steps.internal_cache.outputs.cache-hit != 'true'
+
     - name: Run codegen tests
       run: tools/codegen-test
+
     - name: Run iOS tests
       run: |
-        tools/generate-files
+        tools/generate-files ios
         tools/ios-test
+
     - name: Build sample app
       run: |
         tools/samples-build ios
diff --git a/.github/workflows/kotlin-ci.yml b/.github/workflows/kotlin-ci.yml
new file mode 100644
index 00000000000..1198c20ae3c
--- /dev/null
+++ b/.github/workflows/kotlin-ci.yml
@@ -0,0 +1,83 @@
+name: Kotlin CI
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+    branches: [ dev, master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: macos-latest-xlarge
+    if: github.event.pull_request.draft == false
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+      with:
+        gradle-version: 8.1.1
+
+    - name: Install system dependencies
+      run: |
+        tools/install-sys-dependencies-mac
+
+    - name: Cache Rust
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: |
+          rust
+
+    - name: Install Rust dependencies
+      run: |
+        tools/install-rust-dependencies
+
+    - name: Install emsdk
+      run: tools/install-wasm-dependencies
+
+    - name: Install Kotlin Dependencies
+      run: tools/install-kotlin-dependencies
+
+    - name: Cache internal dependencies
+      id: internal_cache
+      uses: actions/cache@v3
+      with:
+        path: build/local
+        key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
+
+    - name: Install internal dependencies
+      run: tools/install-dependencies
+      if: steps.internal_cache.outputs.cache-hit != 'true'
+
+    - name: Generate files
+      run: |
+        source emsdk/emsdk_env.sh
+        tools/generate-files
+
+    - name: CMake (Java, Kotlin)
+      run: |
+        cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug -DTW_UNITY_BUILD=ON -DTW_COMPILE_JAVA=ON -DTW_COMPILE_KOTLIN=ON -GNinja
+
+    - name: Build JNI
+      run: |
+        ninja -Cbuild
+        mv build/libTrustWalletCore.dylib kotlin/wallet-core-kotlin/src/jvmMain/resources/jni/macos-arm64/
+
+    - name: Build Kotlin Multiplatform
+      run: tools/kotlin-build
+
+    - name: Run Kotlin Multiplatform tests
+      run: tools/kotlin-test
diff --git a/.github/workflows/kotlin-sample-ci.yml b/.github/workflows/kotlin-sample-ci.yml
new file mode 100644
index 00000000000..f96b2a4b280
--- /dev/null
+++ b/.github/workflows/kotlin-sample-ci.yml
@@ -0,0 +1,39 @@
+name: Kotlin Multiplatform CI
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+    branches: [ dev, master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: macos-latest-xlarge
+    if: github.event.pull_request.draft == false
+    steps:
+    - uses: actions/checkout@v3
+
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'temurin'
+
+    - name: Setup Android SDK
+      uses: android-actions/setup-android@v3
+
+    - name: Install Kotlin Dependencies
+      run: tools/install-kotlin-dependencies
+
+    - name: Build KMP Sample
+      run: |
+        ./gradlew --version
+        ./gradlew assemble
+      working-directory: samples/kmp
+      env:
+        GITHUB_USER: ${{ github.actor }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/linux-ci-rust.yml b/.github/workflows/linux-ci-rust.yml
new file mode 100644
index 00000000000..7e0889e824a
--- /dev/null
+++ b/.github/workflows/linux-ci-rust.yml
@@ -0,0 +1,161 @@
+name: Linux CI Rust
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+    branches: [ dev, master ]
+
+env:
+  SCCACHE_GHA_ENABLED: "true"
+  RUSTC_WRAPPER: "sccache"
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  # Check formatting, clippy warnings, run tests and check code coverage.
+  build-and-test:
+    permissions:
+      contents: read
+      checks: write
+    runs-on: ubuntu-24.04
+    if: github.event.pull_request.draft == false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install system dependencies
+        run: |
+          tools/install-sys-dependencies-linux
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.3
+
+      - name: Cache Rust
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            rust
+
+      - name: Install Rust dependencies
+        run: |
+          tools/install-rust-dependencies dev
+
+      - name: Check code formatting
+        run: |
+          cargo fmt --check
+        working-directory: rust
+
+      - name: Check Clippy warnings
+        run: |
+          cargo clippy -- -D warnings
+        working-directory: rust
+
+      - name: Run tests
+        run: |
+          tools/rust-coverage
+
+      - name: Gather and check Rust code coverage
+        run: |
+          tools/check-coverage rust/coverage.stats rust/coverage.info
+
+  # Run Rust tests in WASM.
+  test-wasm:
+    runs-on: ubuntu-24.04
+    if: github.event.pull_request.draft == false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install system dependencies
+        run: |
+          tools/install-sys-dependencies-linux
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.3
+
+      - name: Cache Rust
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            rust
+
+      - name: Install Rust dependencies
+        run: |
+          tools/install-rust-dependencies
+
+      - name: Install emsdk
+        run: tools/install-wasm-dependencies
+
+      - name: Run tests in WASM
+        run: tools/rust-test wasm
+
+  check-binary-sizes:
+    permissions:
+      contents: read
+      pull-requests: write
+    runs-on: macos-latest-xlarge
+    if: github.event.pull_request.draft == false
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install system dependencies
+        run: |
+          tools/install-sys-dependencies-mac
+
+      - name: Run sccache-cache
+        uses: mozilla-actions/sccache-action@v0.0.3
+
+      - name: Cache Rust
+        uses: Swatinem/rust-cache@v2
+        with:
+          workspaces: |
+            rust
+
+      - name: Install Rust dependencies
+        run: tools/install-rust-dependencies
+
+      - name: Install emsdk
+        run: tools/install-wasm-dependencies
+
+      - name: Compile release binaries
+        run: |
+          mkdir -p build/local/lib
+          source emsdk/emsdk_env.sh
+          tools/rust-bindgen
+
+      - name: Generate release report
+        run: |
+          ./tools/release-size measure-rust > release-report.json
+
+      - name: Upload release report
+        uses: actions/upload-artifact@v4
+        with:
+          name: release_report
+          path: release-report.json
+
+      # Download previous release report, compare the release binary sizes, and post/update a comment at the Pull Request.
+      - name: Download previous release report
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+        uses: dawidd6/action-download-artifact@v6
+        with:
+          commit: ${{github.event.pull_request.base.sha}}
+          path: previous
+          if_no_artifact_found: warn
+          # Same artifact name as at the "Upload release report" step.
+          name: release_report
+          # Ignore status or conclusion in the search.
+          workflow_conclusion: ""
+
+      - name: Craft Comment Body
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+        run: |
+          # Please note `previous/release-report.json` may not exist if the previous report was not found.
+          ./tools/release-size compare --before previous/release-report.json --current release-report.json > report-diff.md
+
+      - name: Create or Update Comment
+        if: github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false
+        uses: edumserrano/find-create-or-update-comment@v2
+        with:
+          issue-number: ${{ github.event.pull_request.number }}
+          body-includes: "Binary size comparison"
+          comment-author: 'github-actions[bot]'
+          edit-mode: replace
+          body-path: 'report-diff.md'
diff --git a/.github/workflows/linux-ci-sonarcloud.yml b/.github/workflows/linux-ci-sonarcloud.yml
new file mode 100644
index 00000000000..83fa3b4f216
--- /dev/null
+++ b/.github/workflows/linux-ci-sonarcloud.yml
@@ -0,0 +1,66 @@
+name: Linux CI SonarCloud
+
+on:
+  push:
+    branches: [ dev, master ]
+  pull_request:
+    branches: [ dev, master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    if: github.event.pull_request.draft == false && github.event.pull_request.head.repo.fork == false
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: Install system dependencies
+        run: |
+          tools/install-sys-dependencies-linux
+          tools/install-rust-dependencies
+
+      - name: Cache internal dependencies
+        id: internal_cache
+        uses: actions/cache@v3
+        with:
+          path: build/local
+          key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
+
+      - name: Install internal dependencies
+        run: |
+          tools/install-dependencies
+        env:
+          CC: /usr/bin/clang
+          CXX: /usr/bin/clang++
+        if: steps.internal_cache.outputs.cache-hit != 'true'
+
+      - name: Code generation
+        run: |
+          tools/generate-files native
+        env:
+          CC: /usr/bin/clang
+          CXX: /usr/bin/clang++
+
+      - name: CMake (coverage/clang-tidy/clang-asan)
+        run: |
+          cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug -DTW_CODE_COVERAGE=ON -DTW_ENABLE_CLANG_TIDY=ON -DTW_CLANG_ASAN=ON -GNinja
+          cat build/compile_commands.json
+        env:
+          CC: /usr/bin/clang
+          CXX: /usr/bin/clang++
+
+      - name: SonarCloud Scan
+        run: |
+          ./tools/sonarcloud-analysis
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index bed1b725444..1062e02dacb 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -2,25 +2,30 @@ name: Linux CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ dev, master ]
   pull_request:
-    branches: [ master ]
+    branches: [ dev, master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    if: github.event.pull_request.draft == false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install system dependencies
       run: |
-        # build-essential clang-14 libc++-dev libc++abi-dev ruby-full cmake
-        sudo apt-get update && sudo apt-get install ninja-build lcov llvm-14 clang-tidy-14 libboost-all-dev --fix-missing
+        tools/install-sys-dependencies-linux
+        tools/install-rust-dependencies
     - name: Cache internal dependencies
       id: internal_cache
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v3
       with:
         path: build/local
-        key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
+        key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-sys-dependencies-linux') }}-${{ hashFiles('tools/install-dependencies') }}
     - name: Install internal dependencies
       run: |
         tools/install-dependencies
@@ -28,9 +33,16 @@ jobs:
         CC: /usr/bin/clang
         CXX: /usr/bin/clang++
       if: steps.internal_cache.outputs.cache-hit != 'true'
+
+    - name: Cache Rust
+      uses: Swatinem/rust-cache@v2
+      with:
+        workspaces: |
+          rust
+
     - name: Code generation
       run: |
-        tools/generate-files
+        tools/generate-files native
       env:
         CC: /usr/bin/clang
         CXX: /usr/bin/clang++
diff --git a/.github/workflows/linux-sampleapp-ci.yml b/.github/workflows/linux-sampleapp-ci.yml
index 3d16471abbd..a8c0dbe15da 100644
--- a/.github/workflows/linux-sampleapp-ci.yml
+++ b/.github/workflows/linux-sampleapp-ci.yml
@@ -2,24 +2,30 @@ name: Linux SampleApps CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ dev, master ]
   pull_request:
-    branches: [ master ]
+    branches: [ dev, master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    if: github.event.pull_request.draft == false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - name: Install system dependencies
       run: |
-        sudo apt-get update && sudo apt-get install ninja-build llvm-11 libboost-all-dev clang-11 --fix-missing
+        tools/install-sys-dependencies-linux
+        tools/install-rust-dependencies
     - name: Cache internal dependencies
       id: internal_cache
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v3
       with:
         path: build/local
-        key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
+        key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-sys-dependencies-linux') }}-${{ hashFiles('tools/install-dependencies') }}
     - name: Install internal dependencies
       run: |
         tools/install-dependencies
@@ -29,7 +35,7 @@ jobs:
       if: steps.internal_cache.outputs.cache-hit != 'true'
     - name: Code generation
       run: |
-        tools/generate-files
+        tools/generate-files native
       env:
         CC: /usr/bin/clang
         CXX: /usr/bin/clang++
@@ -55,13 +61,6 @@ jobs:
       env:
         CC: /usr/bin/clang
         CXX: /usr/bin/clang++
-    - name: Build, run, and test devconsole.ts
-      run: |
-        cd samples/typescript/devconsole.ts
-        npm install
-        npm run build
-        echo -e "help() \n .exit" | npm run start
-        npm run test
     - name: Install Go
       env:
         GO_VERSION: 1.19
@@ -88,3 +87,9 @@ jobs:
       env:
         CC: /usr/bin/clang
         CXX: /usr/bin/clang++
+    - name: Build and run Rust sample app
+      run: |
+        cd samples/rust
+        rustc --version
+        cargo build
+        cargo run
diff --git a/.github/workflows/wasm-ci.yml b/.github/workflows/wasm-ci.yml
index d383cc49195..d68b0dcb39d 100644
--- a/.github/workflows/wasm-ci.yml
+++ b/.github/workflows/wasm-ci.yml
@@ -2,27 +2,31 @@ name: Wasm CI
 
 on:
   push:
-    branches: [ master ]
+    branches: [ dev, master ]
   pull_request:
-    branches: [ master ]
+    branches: [ dev, master ]
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 
 jobs:
   build:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
+    if: github.event.pull_request.draft == false
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
 
     - name: Install system dependencies
       run: |
-        # build-essential clang-11 libc++-dev libc++abi-dev ruby-full cmake python3
-        sudo apt-get update && sudo apt-get install libboost-all-dev --fix-missing
-
+        tools/install-sys-dependencies-linux
+        tools/install-rust-dependencies
     - name: Install emsdk
       run: tools/install-wasm-dependencies
 
     - name: Cache internal dependencies
       id: internal_cache
-      uses: actions/cache@v1.1.2
+      uses: actions/cache@v3
       with:
         path: build/local
         key: ${{ runner.os }}-internal-${{ hashFiles('tools/install-dependencies') }}
@@ -35,7 +39,9 @@ jobs:
       if: steps.internal_cache.outputs.cache-hit != 'true'
 
     - name: Code generation
-      run: tools/generate-files
+      run: |
+        source emsdk/emsdk_env.sh
+        tools/generate-files wasm
       env:
         CC: /usr/bin/clang
         CXX: /usr/bin/clang++
diff --git a/.gitignore b/.gitignore
index 707a2517dee..7b093f9e1a3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,17 +23,21 @@ lib/protobuf
 .vscode/
 .project
 .history/
+*.xcuserdatad/
 
 # Generated files
+jni/android/generated
 jni/cpp/generated
 jni/java/wallet/core/jni
-jni/java/wallet/core/proto
+jni/proto/wallet
+jni/dokka-out
 swift/Sources/Generated
 swift/wallet-core/
+codegen-v2/bindings/
+
 src/Generated/*.cpp
 include/TrustWalletCore/TWHRP.h
 include/TrustWalletCore/TW*Proto.h
-include/TrustWalletCore/TWDerivation.h
 include/TrustWalletCore/TWEthereumChainID.h
 
 # Wasm
@@ -62,5 +66,5 @@ samples/cpp/*.cmake
 # built binary
 samples/cpp/sample
 
-*.xcuserdatad/
-
+# Rust target build
+**/target/
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3b061e1c15b..6fec5513326 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,8 +1,6 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
 cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 
@@ -24,14 +22,20 @@ include(cmake/CompilerWarnings.cmake)
 include(cmake/StaticAnalyzers.cmake)
 include(cmake/FindHostPackage.cmake)
 
+set(WALLET_CORE_RS_TARGET_DIR ${CMAKE_SOURCE_DIR}/rust/target)
 add_library(${PROJECT_NAME}_INTERFACE INTERFACE)
 target_include_directories(${PROJECT_NAME}_INTERFACE INTERFACE ${PREFIX}/include)
 target_link_directories(${PROJECT_NAME}_INTERFACE INTERFACE ${PREFIX}/lib)
+target_link_directories(${PROJECT_NAME}_INTERFACE INTERFACE ${WALLET_CORE_RS_TARGET_DIR}/release)
 set_project_warnings(${PROJECT_NAME}_INTERFACE)
 
 add_subdirectory(trezor-crypto)
+set(WALLET_CORE_RS_LIB libwallet_core_rs.a)
+
+set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/release/${WALLET_CORE_RS_LIB})
 if (TW_COMPILE_WASM)
     message(STATUS "Wasm build enabled")
+    set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/wasm32-unknown-emscripten/release/${WALLET_CORE_RS_LIB})
     add_subdirectory(wasm)
 endif ()
 
@@ -44,17 +48,54 @@ include(cmake/Protobuf.cmake)
 
 # Source files
 if (${ANDROID})
-    message("Configuring for JNI")
-    file(GLOB_RECURSE sources src/*.c src/*.cc src/*.cpp src/*.h jni/cpp/*.c jni/cpp/*.cpp jni/cpp/*.h jni/cpp/*.c)
+    message("Configuring for Android JNI")
+    file(GLOB_RECURSE core_sources src/*.c src/*.cc src/*.cpp src/*.h jni/cpp/*.cpp jni/cpp/*.h)
+    if (${KOTLIN})
+        file(GLOB_RECURSE specific_sources
+                jni/kotlin/*.h
+                jni/kotlin/*.c
+                kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated/*.h
+                kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated/*.c
+                )
+    else ()
+        file(GLOB_RECURSE specific_sources jni/android/*.h jni/android/*.c)
+    endif ()
+    set(sources ${core_sources} ${specific_sources})
     add_library(TrustWalletCore SHARED ${sources} ${PROTO_SRCS} ${PROTO_HDRS})
     find_library(log-lib log)
-    target_link_libraries(TrustWalletCore PUBLIC ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf ${log-lib} Boost::boost)
+    if (${CMAKE_ANDROID_ARCH_ABI} STREQUAL "arm64-v8a")
+        set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/aarch64-linux-android/release/${WALLET_CORE_RS_LIB})
+    elseif (${CMAKE_ANDROID_ARCH_ABI} STREQUAL "x86")
+        set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/i686-linux-android/release/${WALLET_CORE_RS_LIB})
+    elseif (${CMAKE_ANDROID_ARCH_ABI} STREQUAL "armeabi-v7a")
+        set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/armv7-linux-androideabi/release/${WALLET_CORE_RS_LIB})
+    elseif (${CMAKE_ANDROID_ARCH_ABI} STREQUAL "x86_64")
+        set(WALLET_CORE_BINDGEN ${WALLET_CORE_RS_TARGET_DIR}/x86_64-linux-android/release/${WALLET_CORE_RS_LIB})
+    endif ()
+    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf ${log-lib} Boost::boost)
+elseif (${TW_COMPILE_JAVA})
+    message("Configuring for JNI")
+    file(GLOB_RECURSE core_sources src/*.c src/*.cc src/*.cpp src/*.h jni/cpp/*.cpp jni/cpp/*.h)
+    if (${TW_COMPILE_KOTLIN})
+        file(GLOB_RECURSE specific_sources
+                jni/kotlin/*.h
+                jni/kotlin/*.c
+                kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated/*.h
+                kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated/*.c
+                )
+    else ()
+        file(GLOB_RECURSE specific_sources jni/android/*.h jni/android/*.c)
+    endif ()
+    set(sources ${core_sources} ${specific_sources})
+    add_library(TrustWalletCore SHARED ${sources} ${PROTO_SRCS} ${PROTO_HDRS})
+    find_package(JNI REQUIRED)
+    target_include_directories(TrustWalletCore PRIVATE ${JNI_INCLUDE_DIRS})
+    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf Boost::boost)
 else ()
     message("Configuring standalone")
     file(GLOB_RECURSE sources src/*.c src/*.cc src/*.cpp src/*.h)
-    add_library(TrustWalletCore ${sources} ${PROTO_SRCS} ${PROTO_HDRS})
-
-    target_link_libraries(TrustWalletCore PUBLIC ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf Boost::boost)
+    add_library(TrustWalletCore STATIC ${sources} ${PROTO_SRCS} ${PROTO_HDRS})
+    target_link_libraries(TrustWalletCore PUBLIC ${WALLET_CORE_BINDGEN} ${PROJECT_NAME}_INTERFACE PRIVATE TrezorCrypto protobuf Boost::boost)
 endif ()
 
 if (TW_CODE_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
@@ -94,15 +135,15 @@ if (TW_ENABLE_CLANG_TIDY)
     tw_add_clang_tidy_target(TrustWalletCore)
 endif ()
 
-if (NOT ANDROID AND TW_UNITY_BUILD)
+if (TW_UNITY_BUILD)
     set_target_properties(TrustWalletCore PROPERTIES UNITY_BUILD ON)
 
-    file(GLOB_RECURSE PROTOBUF_SOURCE_FILES CONFIGURE_DEPENDS src/Cosmos/Protobuf/*.pb.cc src/proto/*.pb.cc)
-    foreach(file ${PROTOBUF_SOURCE_FILES})
+    file(GLOB_RECURSE PROTOBUF_SOURCE_FILES CONFIGURE_DEPENDS src/Cosmos/Protobuf/*.pb.cc src/Hedera/Protobuf/*.pb.cc src/proto/*.pb.cc)
+    foreach (file ${PROTOBUF_SOURCE_FILES})
         set_property(SOURCE ${file} PROPERTY SKIP_UNITY_BUILD_INCLUSION ON)
-    endforeach()
+    endforeach ()
     message(STATUS "Unity build activated")
-endif()
+endif ()
 
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/swift/cpp.xcconfig.in ${CMAKE_CURRENT_SOURCE_DIR}/swift/cpp.xcconfig @ONLY)
 
diff --git a/Dockerfile b/Dockerfile
index fae3ef89269..082d5fd1969 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -14,13 +14,8 @@ RUN apt-get update \
         software-properties-common \
     && apt-get clean && rm -rf /var/lib/apt/lists/*
 
-# Add latest cmake/boost
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc | apt-key add - \
-    && apt-add-repository 'deb https://apt.kitware.com/ubuntu/ bionic main'
 
-
-RUN wget http://archive.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.0g-2ubuntu4_amd64.deb && dpkg -i ./libssl1.1_1.1.0g-2ubuntu4_amd64.deb
 # Install required packages for dev
 RUN apt-get update \
     && apt-get install -y \
@@ -39,34 +34,34 @@ RUN apt-get update \
 ENV CC=/usr/bin/clang-14
 ENV CXX=/usr/bin/clang++-14
 
+# Install rust
+RUN wget "https://sh.rustup.rs" -O rustup.sh \
+    && sh rustup.sh -y
+ENV PATH="/root/.cargo/bin:${PATH}"
+RUN rustup default nightly-2024-06-13
+RUN cargo install --force cbindgen \
+    && rustup target add wasm32-unknown-emscripten
+
 # ↑ Setup build environment
 # ↓ Build and compile wallet core
 
-RUN git clone https://github.com/trustwallet/wallet-core.git
+COPY . /wallet-core
 WORKDIR /wallet-core
 
 # Install dependencies
 RUN tools/install-dependencies
 
-# Build: generate, cmake, and make lib
-RUN tools/generate-files \
-    && cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug \
+# Build: generate files and rust lib
+RUN tools/generate-files native
+
+# Build: cmake + make wallet core
+RUN cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug \
     && make -Cbuild -j12 TrustWalletCore
 
 # Build unit tester
 RUN make -Cbuild -j12 tests
 
-# Download and Install Go
-ENV GO_VERSION=1.16.12
-ENV GO_ARCH=amd64
-RUN wget "https://golang.org/dl/go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" \
-    && tar -xf "go${GO_VERSION}.linux-${GO_ARCH}.tar.gz" \
-    && chown -R root:root ./go \
-    && mv -v ./go /usr/local \
-    && ls /usr/local/go \
-    && /usr/local/go/bin/go version \
-    && rm "go${GO_VERSION}.linux-${GO_ARCH}.tar.gz"
-
-# Building GoLang sample app:  cd samples/go && /usr/local/go/bin/go build -o main && ./main
+# Download and Install Go: apt install golang-go
+# Build Go sample app: cd samples/go && /usr/local/go/bin/go build -o main && ./main
 
 CMD ["/bin/bash"]
diff --git a/LICENSE b/LICENSE
index d7b2f475420..591e7191a60 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,19 +1,190 @@
-Copyright (c) 2017-2020 Trust Wallet
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   Copyright 2017 Trust Wallet
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/LICENSE-3RD-PARTY.txt b/LICENSE-3RD-PARTY.txt
new file mode 100644
index 00000000000..93b7fb0a22a
--- /dev/null
+++ b/LICENSE-3RD-PARTY.txt
@@ -0,0 +1,850 @@
+3RD PARTY LICENSES
+
+Note that not all files in the wallet-core repository and in the released
+software packages belong to the wallet-core project. For 3rd party files,
+the individual licenses apply.
+
+
+#############################################################################
+LICENSE TEXTS
+#############################################################################
+
+Copyright 2008, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+#############################################################################
+
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+	51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations
+below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it
+becomes a de-facto standard.  To achieve this, non-free programs must
+be allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control
+compilation and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at least
+    three years, to give the same user the materials specified in
+    Subsection 6a, above, for a charge no more than the cost of
+    performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply, and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License
+may add an explicit geographical distribution limitation excluding those
+countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms
+of the ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.
+It is safest to attach them to the start of each source file to most
+effectively convey the exclusion of warranty; and each file should
+have at least the "copyright" line and a pointer to where the full
+notice is found.
+
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or
+your school, if any, to sign a "copyright disclaimer" for the library,
+if necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James
+  Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
+
+#############################################################################
+
+Copyright 2008 Google Inc.  All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+Code generated by the Protocol Buffer compiler is owned by the owner
+of the input file used when generating it.  This code is not
+standalone and requires a support library to be linked with it.  This
+support library is itself covered by the above license.
+
+#############################################################################
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+    TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+    1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+    2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+    3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+    4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+    5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+    6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+    7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+    8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+    9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+    END OF TERMS AND CONDITIONS
+
+    APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+    Copyright [yyyy] [name of copyright owner]
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+
+
+
+## Runtime Library Exception to the Apache 2.0 License: ##
+
+
+    As an exception, if you use this Software to compile your source code and
+    portions of this Software are embedded into the binary product as a result,
+    you may redistribute such product without providing attribution as would
+    otherwise be required by Sections 4(a), 4(b) and 4(d) of the License.
+
+#############################################################################
+
+Boost Software License - Version 1.0 - August 17th, 2003
+
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+#############################################################################
+
+The MIT License (MIT)
+
+Copyright (c) 2013 Tomas Dzetkulic
+Copyright (c) 2013 Pavol Rusnak
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/Package.swift b/Package.swift
index 7da39e00a9d..7e933efe93d 100644
--- a/Package.swift
+++ b/Package.swift
@@ -12,13 +12,13 @@ let package = Package(
     targets: [
         .binaryTarget(
             name: "WalletCore",
-            url: "https://github.com/trustwallet/wallet-core/releases/download/2.9.5/WalletCore.xcframework.zip",
-            checksum: "bb3bccd29e4f03c58bfa1fd746a0f8d6fc4ffc9ec2183beb4facd7b01974a9a2"
+            url: "https://github.com/trustwallet/wallet-core/releases/download/4.1.12/WalletCore.xcframework.zip",
+            checksum: "1632bbbab1c6a588689eec77a24e1468d9a6746968652cf0a7e669e996c3d24d"
         ),
         .binaryTarget(
             name: "SwiftProtobuf",
-            url: "https://github.com/trustwallet/wallet-core/releases/download/2.9.5/SwiftProtobuf.xcframework.zip",
-            checksum: "7903f5e9487db4764dc57be000c384a0619a96c275993711f3a5a858d3c865bd"
+            url: "https://github.com/trustwallet/wallet-core/releases/download/4.1.12/SwiftProtobuf.xcframework.zip",
+            checksum: "33d80c20428c9db4fcf99d1272ba19655f7c6ee7e5b1809fa8a7e7d4aa1b222b"
         )
     ]
 )
diff --git a/README.md b/README.md
index 36b798cb3cd..7456046acbd 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,19 @@
 <img src="docs/banner.png" align="center" title="Trust logo">
 
-Trust Wallet Core is an open source, cross-platform, mobile-focused library
+Trust Wallet Core is an open-source, cross-platform, mobile-focused library
 implementing low-level cryptographic wallet functionality for a high number of blockchains.
 It is a core part of the popular [Trust Wallet](https://trustwallet.com), and some other projects.
 Most of the code is C++ with a set of strict C interfaces, and idiomatic interfaces for supported languages:
 Swift for iOS and Java (Kotlin) for Android.
 
-![iOS CI](https://github.com/trustwallet/wallet-core/workflows/iOS%20CI/badge.svg)
-![Android CI](https://github.com/trustwallet/wallet-core/workflows/Android%20CI/badge.svg)
-![Linux CI](https://github.com/trustwallet/wallet-core/workflows/Linux%20CI/badge.svg)
-![Wasm CI](https://github.com/trustwallet/wallet-core/workflows/Wasm%20CI/badge.svg)
-![Docker CI](https://github.com/trustwallet/wallet-core/workflows/Docker%20CI/badge.svg)
+[![iOS CI](https://github.com/trustwallet/wallet-core/actions/workflows/ios-ci.yml/badge.svg)](https://github.com/trustwallet/wallet-core/actions/workflows/ios-ci.yml)
+[![Android CI](https://github.com/trustwallet/wallet-core/actions/workflows/android-ci.yml/badge.svg)](https://github.com/trustwallet/wallet-core/actions/workflows/android-ci.yml)
+[![Linux CI](https://github.com/trustwallet/wallet-core/actions/workflows/linux-ci.yml/badge.svg)](https://github.com/trustwallet/wallet-core/actions/workflows/linux-ci.yml)
+[![Rust CI](https://github.com/trustwallet/wallet-core/actions/workflows/linux-ci-rust.yml/badge.svg)](https://github.com/trustwallet/wallet-core/actions/workflows/linux-ci-rust.yml)
+[![Wasm CI](https://github.com/trustwallet/wallet-core/actions/workflows/wasm-ci.yml/badge.svg)](https://github.com/trustwallet/wallet-core/actions/workflows/wasm-ci.yml)
+[![Kotlin CI](https://github.com/trustwallet/wallet-core/actions/workflows/kotlin-ci.yml/badge.svg)](https://github.com/trustwallet/wallet-core/actions/workflows/kotlin-ci.yml)
+[![Docker CI](https://github.com/trustwallet/wallet-core/actions/workflows/docker.yml/badge.svg)](https://github.com/trustwallet/wallet-core/actions/workflows/docker.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=TrustWallet_wallet-core&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=TrustWallet_wallet-core)
 
 [![Gitpod Ready-to-Code](https://img.shields.io/badge/Gitpod-ready--to--code-blue?logo=gitpod)](https://gitpod.io/#https://github.com/trustwallet/wallet-core)
 ![GitHub](https://img.shields.io/github/license/TrustWallet/wallet-core.svg)
@@ -22,9 +25,13 @@ Swift for iOS and Java (Kotlin) for Android.
 
 For comprehensive documentation, see [developer.trustwallet.com](https://developer.trustwallet.com/wallet-core).
 
+# Audit Reports
+
+Security Audit reports can be found in the [audit](audit) directory.
+
 # Supported Blockchains
 
-Wallet Core supports more than **60** blockchains: Bitcoin, Ethereum, BNB, Cosmos, Solana, and most major blockchain platforms.
+Wallet Core supports more than **130** blockchains: Bitcoin, Ethereum, BNB, Cosmos, Solana, and most major blockchain platforms.
 The full list is [here](docs/registry.md).
 
 # Building
@@ -38,7 +45,7 @@ If you want to use wallet core in your project follow these instructions.
 
 ## Android
 
-Android releases are hosted on [GitHub packages](https://github.com/trustwallet/wallet-core/packages/700258), you need to add GitHub access token to install it. Please checkout [this installation guide](https://developer.trustwallet.com/wallet-core/integration-guide/android-guide#adding-library-dependency) or `build.gradle` from our [android sample](https://github.com/trustwallet/wallet-core/blob/master/samples/android/build.gradle)
+Android releases are hosted on [GitHub packages](https://github.com/trustwallet/wallet-core/packages/700258), you need to add GitHub access token to install it. Please check out [this installation guide](https://developer.trustwallet.com/wallet-core/integration-guide/android-guide#adding-library-dependency) or `build.gradle` from our [android sample](https://github.com/trustwallet/wallet-core/blob/master/samples/android/build.gradle)
 
 Don't forget replacing the version in the code with latest: ![GitHub release (latest by date)](https://img.shields.io/github/v/release/trustwallet/wallet-core)
 
@@ -62,7 +69,7 @@ Or add remote url + `master` branch, it points to recent (not always latest) bin
 .package(name: "WalletCore", url: "https://github.com/trustwallet/wallet-core", .branchItem("master")),
 ```
 
-Then add libraries to target's `dependencies`: 
+Then add libraries to target's `dependencies`:
 
 ```swift
 .product(name: "WalletCore", package: "WalletCore"),
@@ -87,19 +94,24 @@ npm install @trustwallet/wallet-core
 
 Please check out the [Go integration sample](https://github.com/trustwallet/wallet-core/tree/master/samples/go).
 
+## Kotlin Multipleplatform (beta)
+
+Please check out the [Kotlin Multiplatform sample](https://github.com/trustwallet/wallet-core/tree/master/samples/kmp)
 
 # Projects
 
 Projects using Trust Wallet Core. Add yours too!
 
-[<img src="https://trustwallet.com/assets/images/trust_logotype.svg" alt="Trust Wallet"/>](https://trustwallet.com)
+[<img src="https://trustwallet.com/icon.svg" alt="Trust Wallet"/>](https://trustwallet.com)
 
 [Coinpaprika](https://coinpaprika.com/)
-| [IFWallet](https://www.ifwallet.com/)
 | [crypto.com](https://crypto.com)
-| [Alice](https://www.alicedapp.com/)
 | [Frontier](https://frontier.xyz/)
 | [Tokenary](https://tokenary.io/)
+| [MemesWallet](https://planetmemes.com/)
+| [xPortal](https://xportal.com/)
+| [Slingshot](https://slingshot.finance/)
+| [ECOIN Wallet](https://play.google.com/store/apps/details?id=org.ecoinwallet&pcampaignid=web_share)
 
 # Community
 
@@ -111,13 +123,20 @@ There are a few community-maintained projects that extend Wallet Core to some ad
 
 # Contributing
 
-The best way to submit feedback and report bugs is to [open a GitHub issue](https://github.com/trustwallet/wallet-core/issues/new).
+The best way to submit feedback and report bugs related to WalletCore is to [open a GitHub issue](https://github.com/trustwallet/wallet-core/issues/new).
+If the bug is not related to WalletCore but to the TrustWallet app, please [create a Customer Support ticket](https://support.trustwallet.com/en/support/tickets/new).
 If you want to contribute code please see [Contributing](https://developer.trustwallet.com/wallet-core/contributing).
 If you want to add support for a new blockchain also see [Adding Support for a New Blockchain](https://developer.trustwallet.com/wallet-core/newblockchain), make sure you have read the [requirements](https://developer.trustwallet.com/wallet-core/newblockchain#requirements) section.
 
 Thanks to all the people who contribute.
 <a href="https://github.com/trustwallet/wallet-core/graphs/contributors"><img src="https://opencollective.com/wallet-core/contributors.svg?width=890&button=false" /></a>
 
+# Disclaimer
+
+The Wallet Core project is led and managed by Trust Wallet with a large contributor community and actively used in several projects.  Our goal at Wallet Core is to give other wallets an easy way to add chain support.
+
+Trust Wallet products leverage wallet core, however, they may or may not leverage all the capabilities, features, and assets available in wallet core due to their own product requirements.
+
 # License
 
-Trust Wallet Core is available under the MIT license. See the [LICENSE](LICENSE) file for more info.
+Trust Wallet Core is available under the Apache 2.0 license. See the [LICENSE](LICENSE) file for more info.
diff --git a/SECURITY.MD b/SECURITY.MD
new file mode 100644
index 00000000000..720baa249ff
--- /dev/null
+++ b/SECURITY.MD
@@ -0,0 +1,29 @@
+# Security Policy
+
+The security of our users' assets is of the utmost importance to us. We take a number of steps to ensure that our crypto wallet is as secure as possible.
+
+## Reporting a Security Vulnerability
+
+If you believe you have found a security vulnerability in our wallet, please contact us immediately at [Bug Bounty Binance](https://bugcrowd.com/binance). We will investigate all reports and do our best to quickly fix any vulnerabilities.
+
+## Responsible Disclosure
+
+IMPORTANT: Do not file public issues on GitHub for security vulnerabilities. Do not publicly disclose the vulnerability until we have had a chance to patch it. This gives us time to fix the problem and protect our users’ assets.
+
+## Encryption
+
+All private keys are encrypted and stored on the user's device. The encryption uses industry-standard algorithms and is designed to protect against brute-force attacks.
+
+## Regular Audits
+
+We regularly conduct security audits of our code to ensure that it is free of vulnerabilities. We also stay up-to-date with the latest security best practices and technologies.
+
+## Bug Bounty Program
+
+As a part of Binance security program, TrustWallet also participate in their bug bounty program. For more information on eligible scope, rewards, and how to submit a report, please visit [https://bugcrowd.com/binance](https://bugcrowd.com/binance)
+
+## Disclaimer
+
+As with any software, there are always potential security risks. We do our best to minimize these risks and keep our users' assets safe, but we cannot guarantee that our wallet will be completely immune to all security threats.
+
+
diff --git a/android/app/build.gradle b/android/app/build.gradle
index f38c9acc235..1e0093c6494 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -2,6 +2,7 @@ apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 
 android {
+    namespace 'com.trustwallet.core.app'
     compileSdkVersion 32
     ndkVersion '23.1.7779620'
     defaultConfig {
@@ -27,7 +28,7 @@ android {
 }
 
 dependencies {
-    implementation project(':trustwalletcore')
+    implementation project(':wallet-core')
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2-native-mt'
     implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.2-native-mt'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
@@ -35,15 +36,10 @@ dependencies {
 
     // Tests
     androidTestImplementation('androidx.test.espresso:espresso-core:3.3.0', {
-    testImplementation 'junit:junit:4.13.1'
+        testImplementation 'junit:junit:4.13.1'
         exclude group: "com.android.support", module: "support-annotations"
     })
     androidTestImplementation 'androidx.test.espresso:espresso-contrib:3.3.0'
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'android.arch.core:core-testing:1.1.1'
-
-    implementation 'com.google.protobuf:protobuf-javalite:3.21.2'
-}
-repositories {
-    mavenCentral()
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/CoinAddressDerivationTests.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/CoinAddressDerivationTests.kt
index 55d6d14dd38..f99db4e987c 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/CoinAddressDerivationTests.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/CoinAddressDerivationTests.kt
@@ -34,15 +34,22 @@ class CoinAddressDerivationTests {
 
     private fun runDerivationChecks(coin: CoinType, address: String?) = when (coin) {
         BINANCE -> assertEquals("bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw", address)
+        TBINANCE -> assertEquals("tbnb12vtaxl9952zm6rwf7v8jerq74pvaf77fkw9xhl", address)
         BITCOIN -> assertEquals("bc1quvuarfksewfeuevuc6tn0kfyptgjvwsvrprk9d", address)
+        BITCOINDIAMOND -> assertEquals("1KaRW9xPPtCTZ9FdaTHduCPck4YvSeEWNn", address)
         BITCOINCASH -> assertEquals("bitcoincash:qpzl3jxkzgvfd9flnd26leud5duv795fnv7vuaha70", address)
         BITCOINGOLD -> assertEquals("btg1qwz9sed0k4neu6ycrudzkca6cnqe3zweq35hvtg", address)
         CALLISTO -> assertEquals("0x3E6FFC80745E6669135a76F4A7ce6BCF02436e04", address)
         DASH -> assertEquals("XqHiz8EXYbTAtBEYs4pWTHh7ipEDQcNQeT", address)
         DIGIBYTE -> assertEquals("dgb1qtjgmerfqwdffyf8ghcrkgy52cghsqptynmyswu", address)
-        ETHEREUM, SMARTCHAIN, POLYGON, OPTIMISM, ARBITRUM, ECOCHAIN, AVALANCHECCHAIN, XDAI,
+
+        ETHEREUM, SMARTCHAIN, POLYGON, OPTIMISM, ZKSYNC, ARBITRUM, ARBITRUMNOVA, ECOCHAIN, AVALANCHECCHAIN, XDAI,
         FANTOM, CELO, CRONOSCHAIN, SMARTBITCOINCASH, KUCOINCOMMUNITYCHAIN, BOBA, METIS,
-        AURORA, EVMOS, MOONRIVER, MOONBEAM, KAVAEVM, KLAYTN, METER, OKXCHAIN -> assertEquals("0x8f348F300873Fd5DA36950B2aC75a26584584feE", address)
+        AURORA, EVMOS, MOONRIVER, MOONBEAM, KAVAEVM, KAIA, METER, OKXCHAIN, POLYGONZKEVM, SCROLL,
+        CONFLUXESPACE, ACALAEVM, OPBNB, NEON, BASE, LINEA, GREENFIELD, MANTLE, ZENEON, MANTAPACIFIC,
+        ZETAEVM, MERLIN, LIGHTLINK, BLAST, BOUNCEBIT, ZKLINKNOVA,
+        -> assertEquals("0x8f348F300873Fd5DA36950B2aC75a26584584feE", address)
+
         RONIN -> assertEquals("ronin:8f348F300873Fd5DA36950B2aC75a26584584feE", address)
         ETHEREUMCLASSIC -> assertEquals("0x078bA3228F3E6C08bEEac9A005de0b7e7089aD1c", address)
         GOCHAIN -> assertEquals("0x5940ce4A14210d4Ccd0ac206CE92F21828016aC2", address)
@@ -53,12 +60,14 @@ class CoinAddressDerivationTests {
         POANETWORK -> assertEquals("0xe8a3e8bE17E172B6926130eAfB521e9D2849aca9", address)
         XRP -> assertEquals("rPwE3gChNKtZ1mhH3Ko8YFGqKmGRWLWXV3", address)
         TEZOS -> assertEquals("tz1acnY9VbMagps26Kj3RfoGRWD9nYG5qaRX", address)
-        THUNDERTOKEN -> assertEquals("0x4b92b3ED6d8b24575Bf5ce4C6a86ED261DA0C8d7", address)
-        TOMOCHAIN -> assertEquals("0xC74b6D8897cBa9A4b659d43fEF73C9cA852cE424", address)
+        THUNDERCORE -> assertEquals("0x4b92b3ED6d8b24575Bf5ce4C6a86ED261DA0C8d7", address)
+        VICTION -> assertEquals("0xC74b6D8897cBa9A4b659d43fEF73C9cA852cE424", address)
         TRON -> assertEquals("TQ5NMqJjhpQGK7YJbESKtNCo86PJ89ujio", address)
         VECHAIN -> assertEquals("0x1a553275dF34195eAf23942CB7328AcF9d48c160", address)
         WANCHAIN -> assertEquals("0xD5ca90b928279FE5D06144136a25DeD90127aC15", address)
+        KOMODO -> assertEquals("RCWJLXE5CSXydxdSnwcghzPgkFswERegyb", address)
         ZCASH -> assertEquals("t1YYnByMzdGhQv3W3rnjHMrJs6HH4Y231gy", address)
+        ZEN -> assertEquals("znUmzvod1f4P9LYsBhNxjqCDQvNSStAmYEX", address)
         FIRO -> assertEquals("aEd5XFChyXobvEics2ppAqgK3Bgusjxtik", address)
         NIMIQ -> assertEquals("NQ76 7AVR EHDA N05U X7SY XB14 XJU7 8ERV GM6H", address)
         STELLAR -> assertEquals("GA3H6I4C5XUBYGVB66KXR27JV5KS3APSTKRUWOIXZ5MVWZKVTLXWKZ2P", address)
@@ -66,16 +75,19 @@ class CoinAddressDerivationTests {
         NANO -> assertEquals("nano_39gsbcishxn3n7wd17ono4otq5wazwzusqgqigztx73wbrh5jwbdbshfnumc", address)
         NEBULAS -> assertEquals("n1ZVgEidtdseYv9ogmGz69Cz4mbqmHYSNqJ", address)
         NEAR -> assertEquals("0c91f6106ff835c0195d5388565a2d69e25038a7e23d26198f85caf6594117ec", address)
-        THETA -> assertEquals("0x0d1fa20c218Fec2f2C55d52aB267940485fa5DA4", address)
+        THETA, THETAFUEL -> assertEquals("0x0d1fa20c218Fec2f2C55d52aB267940485fa5DA4", address)
         COSMOS -> assertEquals("cosmos142j9u5eaduzd7faumygud6ruhdwme98qsy2ekn", address)
         DECRED -> assertEquals("DsidJiDGceqHTyqiejABy1ZQ3FX4SiWZkYG", address)
         DOGECOIN -> assertEquals("DJRFZNg8jkUtjcpo2zJd92FUAzwRjitw6f", address)
         KIN -> assertEquals("GBL3MT2ICHHM5OJ2QJ44CAHGDK6MLPINVXBKOKLHGBWQDVRWTWQ7U2EA", address)
         VIACOIN -> assertEquals("via1qnmsgjd6cvfprnszdgmyg9kewtjfgqflz67wwhc", address)
+        VERGE -> assertEquals("DPb3Xz4vjB6QGLKDmrbprrtv4XzNqkADc2", address)
         QTUM -> assertEquals("QhceuaTdeCZtcxmVc6yyEDEJ7Riu5gWFoF", address)
         NULS -> assertEquals("NULSd6HgU8MoRnNjBgvJpa9tqvGxYdv5ne4en", address)
         EOS -> assertEquals("EOS6hs8sRvGSzuQtq223zwJipMzqTJpXUVjyvHPvPwBSZWWrJTJkg", address)
+        WAX -> assertEquals("EOS6hs8sRvGSzuQtq223zwJipMzqTJpXUVjyvHPvPwBSZWWrJTJkg", address)
         IOTEX -> assertEquals("io1qw9cccecw09q7p5kzyqtuhfhvah2mhfrc84jfk", address)
+        IOTEXEVM -> assertEquals("0x038B8C633873Ca0f06961100BE5d37676EADDD23", address)
         ZILLIQA -> assertEquals("zil1mk6pqphhkmaguhalq6n3cq0h38ltcehg0rfmv6", address)
         ZELCASH -> assertEquals("t1UKbRPzL4WN8Rs8aZ8RNiWoD2ftCMHKGUf", address)
         RAVENCOIN -> assertEquals("RHoCwPc2FCQqwToYnSiAb3SrCET4zEHsbS", address)
@@ -87,17 +99,22 @@ class CoinAddressDerivationTests {
         HARMONY -> assertEquals("one12fk20wmvgypdkn59n4hq8e3aa5899xfx4vsu09", address)
         SOLANA -> assertEquals("2bUBiBNZyD29gP1oV6de7nxowMLoDBtopMMTGgMvjG5m", address)
         ALGORAND -> assertEquals("JTJWO524JXIHVPGBDWFLJE7XUIA32ECOZOBLF2QP3V5TQBT3NKZSCG67BQ", address)
+        ACALA -> assertEquals("25GGezx3LWFQj6HZpYzoWoVzLsHojGtybef3vthC9nd19ms3", address)
         KUSAMA -> assertEquals("G9xV2EatmrjRC1FLPexc3ddqNRRzCsAdURU8RFiAAJX6ppY", address)
         POLKADOT -> assertEquals("13nN6BGAoJwd7Nw1XxeBCx5YcBXuYnL94Mh7i3xBprqVSsFk", address)
+        PIVX -> assertEquals("D81AqC8zKma3Cht4TbVuh4jyVVyLkZULCm", address)
         KAVA -> assertEquals("kava1drpa0x9ptz0fql3frv562rcrhj2nstuz3pas87", address)
         CARDANO -> assertEquals("addr1qyr8jjfnypp95eq74aqzn7ss687ehxclgj7mu6gratmg3mul2040vt35dypp042awzsjk5xm3zr3zm5qh7454uwdv08s84ray2", address)
         NEO -> assertEquals("AT6w7PJvwPcSqHvtbNBY2aHPDv12eW5Uuf", address)
         FILECOIN -> assertEquals("f1zzykebxldfcakj5wdb5n3n7priul522fnmjzori", address)
-        ELROND -> assertEquals("erd1jfcy8aeru6vlx4fe6h3pc3vlpe2cnnur5zetxdhp879yagq7vqvs8na4f8", address)
+        MULTIVERSX -> assertEquals("erd1jfcy8aeru6vlx4fe6h3pc3vlpe2cnnur5zetxdhp879yagq7vqvs8na4f8", address)
         BANDCHAIN -> assertEquals("band1624hqgend0s3d94z68fyka2y5jak6vd7u0l50r", address)
         SMARTCHAINLEGACY -> assertEquals("0x49784f90176D8D9d4A3feCDE7C1373dAAb5b13b8", address)
         OASIS -> assertEquals("oasis1qzcpavvmuw280dk0kd4lxjhtpf0u3ll27yf7sqps", address)
         THORCHAIN -> assertEquals("thor1c8jd7ad9pcw4k3wkuqlkz4auv95mldr2kyhc65", address)
+        IOST -> assertEquals("4av8w81EyzUgHonsVWqfs15WM4Vrpgox4BYYQWhNQDVu", address)
+        SYSCOIN -> assertEquals("sys1qkl640se3mwpt666e3lyywnwh09e9jquvx9x8qj", address)
+        STRATIS -> assertEquals("strax1q0caanaw4nkf6fzwnzq2p7yum680e57pdg05zkm", address)
         BLUZELLE -> assertEquals("bluzelle1xccvees6ev4wm2r49rc6ptulsdxa8x8jfpmund", address)
         CRYPTOORG -> assertEquals("cro16fdf785ejm00jf9a24d23pzqzjh2h05klxjwu8", address)
         OSMOSIS -> assertEquals("osmo142j9u5eaduzd7faumygud6ruhdwme98qclefqp", address)
@@ -105,5 +122,38 @@ class CoinAddressDerivationTests {
         NATIVEEVMOS -> assertEquals("evmos13u6g7vqgw074mgmf2ze2cadzvkz9snlwstd20d", address)
         NERVOS -> assertEquals("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02wectaumxn0664yw2jd53lqk4mxg3", address)
         EVERSCALE -> assertEquals("0:0c39661089f86ec5926ea7d4ee4223d634ba4ed6dcc2e80c7b6a8e6d59f79b04", address)
+        TON -> assertEquals("UQDgEMqToTacHic7SnvnPFmvceG5auFkCcAw0mSCvzvKUaT4", address)
+        APTOS -> assertEquals("0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30", address)
+        NEBL -> assertEquals("NgDVaXAwNgBwb88xLiFKomfBmPkEh9F2d7", address)
+        SUI -> assertEquals("0xada112cfb90b44ba889cc5d39ac2bf46281e4a91f7919c693bcd9b8323e81ed2", address)
+        HEDERA -> assertEquals("0.0.302a300506032b657003210049eba62f64d0d941045595d9433e65d84ecc46bcdb1421de55e05fcf2d8357d5", address)
+        SECRET -> assertEquals("secret1f69sk5033zcdr2p2yf3xjehn7xvgdeq09d2llh", address)
+        NATIVEINJECTIVE -> assertEquals("inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a", address)
+        AGORIC -> assertEquals("agoric18zvvgk6j3eq5wd7mqxccgt20gz2w94cy88aek5", address)
+        STARGAZE -> assertEquals("stars142j9u5eaduzd7faumygud6ruhdwme98qycayaz", address)
+        JUNO -> assertEquals("juno142j9u5eaduzd7faumygud6ruhdwme98qxkfz30", address)
+        STRIDE -> assertEquals("stride142j9u5eaduzd7faumygud6ruhdwme98qn029zl", address)
+        AXELAR -> assertEquals("axelar142j9u5eaduzd7faumygud6ruhdwme98q52u3aj", address)
+        CRESCENT -> assertEquals("cre142j9u5eaduzd7faumygud6ruhdwme98q5veur7", address)
+        KUJIRA -> assertEquals("kujira142j9u5eaduzd7faumygud6ruhdwme98qpvgpme", address)
+        NATIVECANTO -> assertEquals("canto13u6g7vqgw074mgmf2ze2cadzvkz9snlwqua5pd", address)
+        COMDEX -> assertEquals("comdex142j9u5eaduzd7faumygud6ruhdwme98qhtgm0y", address)
+        NEUTRON -> assertEquals("neutron142j9u5eaduzd7faumygud6ruhdwme98q5mrmv5", address)
+        SOMMELIER -> assertEquals("somm142j9u5eaduzd7faumygud6ruhdwme98quc948e", address)
+        FETCHAI -> assertEquals("fetch142j9u5eaduzd7faumygud6ruhdwme98qrera5y", address)
+        MARS -> assertEquals("mars142j9u5eaduzd7faumygud6ruhdwme98qdenqrg", address)
+        UMEE -> assertEquals("umee142j9u5eaduzd7faumygud6ruhdwme98qzjhxjp", address)
+        COREUM -> assertEquals("core1rawf376jz2lnchgc4wzf4h9c77neg3zldc7xa8", address)
+        QUASAR -> assertEquals("quasar142j9u5eaduzd7faumygud6ruhdwme98q78symk", address)
+        PERSISTENCE -> assertEquals("persistence142j9u5eaduzd7faumygud6ruhdwme98q7gv2ch", address)
+        AKASH -> assertEquals("akash142j9u5eaduzd7faumygud6ruhdwme98qal870f", address)
+        NOBLE -> assertEquals("noble142j9u5eaduzd7faumygud6ruhdwme98qc8l3wa", address)
+        ROOTSTOCK -> assertEquals("0xA2D7065F94F838a3aB9C04D67B312056846424Df", address)
+        SEI -> assertEquals("sei142j9u5eaduzd7faumygud6ruhdwme98qagm0sj", address)
+        INTERNETCOMPUTER -> assertEquals("6f8e568160a3c8362789848dc0fa52891964473c045cc25208a305fb35b7c4ab", address)
+        TIA -> assertEquals("celestia142j9u5eaduzd7faumygud6ruhdwme98qpwmfv7", address)
+        NATIVEZETACHAIN -> assertEquals("zeta13u6g7vqgw074mgmf2ze2cadzvkz9snlwywj304", address)
+        DYDX -> assertEquals("dydx142j9u5eaduzd7faumygud6ruhdwme98qeayaky", address)
+        PACTUS -> assertEquals("pc1r7ys2g5a4xc2qtm0t4q987m4mvs57w5g0v4pvzg", address)
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/TestCoinType.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/TestCoinType.kt
index f8fc2f3a5bf..abbc87b7c2f 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/TestCoinType.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/TestCoinType.kt
@@ -1,13 +1,15 @@
 package com.trustwallet.core.app.blockchains
 
+import com.trustwallet.core.app.utils.toHexByteArray
 import wallet.core.jni.CoinType
 import wallet.core.jni.Curve
+import wallet.core.jni.PublicKey
 import wallet.core.jni.Purpose
 import wallet.core.jni.Derivation
 
 import org.junit.Assert.assertEquals
 import org.junit.Test
-
+import wallet.core.jni.PublicKeyType
 
 
 class TestCoinType {
@@ -21,7 +23,7 @@ class TestCoinType {
         assertEquals(CoinType.LITECOIN.value(), 2)
         assertEquals(CoinType.TRON.value(), 195)
         assertEquals(CoinType.ETHEREUM.value(), 60)
-        assertEquals(CoinType.THUNDERTOKEN.value(), 1001)
+        assertEquals(CoinType.THUNDERCORE.value(), 1001)
         assertEquals(CoinType.WANCHAIN.value(), 5718350)
         assertEquals(CoinType.CALLISTO.value(), 820)
         assertEquals(CoinType.ETHEREUMCLASSIC.value(), 61)
@@ -30,7 +32,7 @@ class TestCoinType {
         assertEquals(CoinType.POANETWORK.value(), 178)
         assertEquals(CoinType.VECHAIN.value(), 818)
         assertEquals(CoinType.ICON.value(), 74)
-        assertEquals(CoinType.TOMOCHAIN.value(), 889)
+        assertEquals(CoinType.VICTION.value(), 889)
         assertEquals(CoinType.TEZOS.value(), 1729)
         assertEquals(CoinType.QTUM.value(), 2301)
         assertEquals(CoinType.NEBULAS.value(), 2718)
@@ -52,7 +54,17 @@ class TestCoinType {
         assertEquals(res, "m/84'/0'/0'/0/0")
         res = CoinType.createFromValue(CoinType.BITCOIN.value()).derivationPathWithDerivation(Derivation.BITCOINLEGACY).toString()
         assertEquals(res, "m/44'/0'/0'/0/0")
+        res = CoinType.createFromValue(CoinType.BITCOIN.value()).derivationPathWithDerivation(Derivation.BITCOINTAPROOT).toString()
+        assertEquals(res, "m/86'/0'/0'/0/0")
         res = CoinType.createFromValue(CoinType.SOLANA.value()).derivationPathWithDerivation(Derivation.SOLANASOLANA).toString()
         assertEquals(res, "m/44'/501'/0'/0'")
     }
+
+    @Test
+    fun testDeriveAddressFromPublicKeyAndDerivation() {
+        val publicKey = PublicKey("0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798".toHexByteArray(), PublicKeyType.SECP256K1)
+
+        val address = CoinType.BITCOIN.deriveAddressFromPublicKeyAndDerivation(publicKey, Derivation.BITCOINSEGWIT)
+        assertEquals(address, "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4")
+    }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acala/TestAcalaAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acala/TestAcalaAddress.kt
new file mode 100644
index 00000000000..5e50f515ab4
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acala/TestAcalaAddress.kt
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.acala
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestAcalaAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("0x9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0".toHexByteArray())
+        val pubkey = key.publicKeyEd25519
+        val address = AnyAddress(pubkey, CoinType.ACALA)
+        assertEquals(address.description(), "269ZCS3WLGydTN8ynhyhZfzJrXkePUcdhwgLQs6TWFs5wVL5")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acala/TestAcalaSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acala/TestAcalaSigner.kt
new file mode 100644
index 00000000000..ad99985b4ec
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acala/TestAcalaSigner.kt
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.acala
+
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.Polkadot
+
+class TestAcalaSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun AcalaTransactionSigning() {
+        val transferCallIndices = Polkadot.CallIndices.newBuilder().apply {
+            custom = Polkadot.CustomCallIndices.newBuilder().apply {
+                moduleIndex = 0x0a
+                methodIndex = 0x00
+            }.build()
+        }
+
+        val call = Polkadot.Balance.Transfer.newBuilder().apply {
+            value = "0xe8d4a51000".toHexBytesInByteString() // 1 ACA
+            toAddress = "25Qqz3ARAvnZbahGZUzV3xpP1bB3eRrupEprK7f2FNbHbvsz"
+            callIndices = transferCallIndices.build()
+        }
+
+        val acalaGenesisHashStr = "0xfc41b9bd8ef8fe53d58c7ea67c794c7ec9a73daf05e6d54b14ff6342c99ba64c".toHexBytesInByteString()
+
+        val input = Polkadot.SigningInput.newBuilder().apply {
+            genesisHash = acalaGenesisHashStr
+            blockHash = "0x707ffa05b7dc6cdb6356bd8bd51ff20b2757c3214a76277516080a10f1bc7537".toHexBytesInByteString()
+            nonce = 0
+            specVersion = 2170
+            network = CoinType.ACALA.ss58Prefix()
+            transactionVersion = 2
+            privateKey = "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0".toHexBytesInByteString()
+            era = Polkadot.Era.newBuilder().apply {
+                blockNumber = 3893613
+                period = 64
+            }.build()
+            balanceCall = Polkadot.Balance.newBuilder().apply {
+                transfer = call.build()
+            }.build()
+            multiAddress = true
+        }
+
+        val output = AnySigner.sign(input.build(), CoinType.ACALA, Polkadot.SigningOutput.parser())
+        val encoded = Numeric.toHexString(output.encoded.toByteArray())
+
+        // https://acala.subscan.io/extrinsic/3893620-3
+        val expected = "0x41028400e9590e4d99264a14a85e21e69537e4a64f66a875d38cb8f76b305f41fabe24a900dd54466dffd1e3c80b76013e9459fbdcd17805bd5fdbca0961a643bad1cbd2b7fe005c62c51c18b67f31eb9e61b187a911952fee172ef18402d07c703eec3100d50200000a0000c8c602ded977c56076ae38d98026fa669ca10d6a2b5a0bfc4086ae7668ed1c60070010a5d4e8"
+        assertEquals(encoded, expected)
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acalaevm/TestAcalaEVMAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acalaevm/TestAcalaEVMAddress.kt
new file mode 100644
index 00000000000..6845bea3e89
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/acalaevm/TestAcalaEVMAddress.kt
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.acalaevm
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestAcalaEVMAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(false)
+        val address = AnyAddress(pubkey, CoinType.ACALAEVM)
+        val expected = AnyAddress("0xe32DC46bfBF78D1eada7b0a68C96903e01418D64", CoinType.ACALAEVM)
+
+        assertEquals(address.description(), expected.description())
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/agoric/TestAgoricAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/agoric/TestAgoricAddress.kt
new file mode 100644
index 00000000000..1164db16e14
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/agoric/TestAgoricAddress.kt
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.agoric
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestAgoricAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+
+        val key = PrivateKey("037048190544fa57651452f477c096de4f3073e7835cf3845b04602563a73f73".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(true)
+        val address = AnyAddress(pubkey, CoinType.AGORIC)
+        val expected = AnyAddress("agoric18zvvgk6j3eq5wd7mqxccgt20gz2w94cy88aek5", CoinType.AGORIC)
+
+        assertEquals(pubkey.data().toHex(), "0x03df9a5e4089f89d45913fb2b856de984c7e8bf1344cc6444cc9705899a48c939d")
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/agoric/TestAgoricSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/agoric/TestAgoricSigner.kt
new file mode 100644
index 00000000000..ecdf4372f3a
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/agoric/TestAgoricSigner.kt
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.agoric
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.AnyAddress
+import wallet.core.jni.CoinType
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.proto.Cosmos
+
+class TestAgoricSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun AgoricTransactionSigning() {
+        val key = PrivateKey("037048190544fa57651452f477c096de4f3073e7835cf3845b04602563a73f73".toHexByteArray())
+        val publicKey = key.getPublicKeySecp256k1(true)
+        val from = AnyAddress(publicKey, CoinType.AGORIC).description()
+
+        val transferAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "1"
+            denom = "ubld"
+        }.build()
+
+        val message = Cosmos.Message.newBuilder().apply {
+            sendCoinsMessage = Cosmos.Message.Send.newBuilder().apply {
+                fromAddress = from
+                toAddress = "agoric1cqvwa8jr6pmt45jndanc8lqmdsxjkhw0yertc0"
+                addAllAmounts(listOf(transferAmount))
+            }.build()
+        }.build()
+
+        val feeAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "2000"
+            denom = "ubld"
+        }.build()
+
+        val cosmosFee = Cosmos.Fee.newBuilder().apply {
+            gas = 100000
+            addAllAmounts(listOf(feeAmount))
+        }.build()
+
+        val signingInput = Cosmos.SigningInput.newBuilder().apply {
+            signingMode = Cosmos.SigningMode.Protobuf
+            accountNumber = 62972
+            chainId = "agoric-3"
+            sequence = 1
+            fee = cosmosFee
+            privateKey = ByteString.copyFrom(key.data())
+            addAllMessages(listOf(message))
+        }.build()
+
+        val output = AnySigner.sign(signingInput, CoinType.AGORIC, Cosmos.SigningOutput.parser())
+
+        assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWFnb3JpYzE4enZ2Z2s2ajNlcTV3ZDdtcXhjY2d0MjBnejJ3OTRjeTg4YWVrNRItYWdvcmljMWNxdndhOGpyNnBtdDQ1am5kYW5jOGxxbWRzeGpraHcweWVydGMwGgkKBHVibGQSATESZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA9+aXkCJ+J1FkT+yuFbemEx+i/E0TMZETMlwWJmkjJOdEgQKAggBGAESEgoMCgR1YmxkEgQyMDAwEKCNBhpAenbGO4UBK610dwSY6l5pl58qwHW1OujQ/9vF9unQdrA1SE0b/2mZxnevy5y3u6pJfBffWUfCx68PcVEu7D3EYQ==\"}")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/algorand/TestAlgorandSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/algorand/TestAlgorandSigner.kt
index 5047a62880e..e466740212b 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/algorand/TestAlgorandSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/algorand/TestAlgorandSigner.kt
@@ -7,6 +7,7 @@ import com.trustwallet.core.app.utils.toHexBytesInByteString
 import org.junit.Assert.*
 import org.junit.Test
 import wallet.core.java.AnySigner
+import wallet.core.jni.Base64
 import wallet.core.jni.CoinType.ALGORAND
 import wallet.core.jni.proto.Algorand
 import wallet.core.jni.proto.Algorand.SigningOutput
@@ -17,6 +18,33 @@ class TestAlgorandSigner {
         System.loadLibrary("TrustWalletCore")
     }
 
+    @Test
+    fun algorandTransactionSigningNFTTransfer() {
+        // Successfully broadcasted: https://algoexplorer.io/tx/FFLUH4QKZHG744RIQ2AZNWZUSIIH262KZ4MEWSY4RXMWN5NMOOJA
+        val transaction = Algorand.AssetTransfer.newBuilder()
+            .setToAddress("362T7CSXNLIOBX6J3H2SCPS4LPYFNV6DDWE6G64ZEUJ6SY5OJIR6SB5CVE")
+            .setAmount(1)
+            .setAssetId(989643841)
+            .build()
+        val signingInput = Algorand.SigningInput.newBuilder()
+            .setGenesisId("mainnet-v1.0")
+            .setGenesisHash(ByteString.copyFrom(Base64.decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=")))
+            .setNote(ByteString.copyFrom(Base64.decode("VFdUIFRPIFRIRSBNT09O")))
+            .setPrivateKey("dc6051ffc7b3ec601bde432f6dea34d40fe3855e4181afa0f0524c42194a6da7".toHexBytesInByteString())
+            .setFirstRound(27963950)
+            .setLastRound(27964950)
+            .setFee(1000)
+            .setAssetTransfer(transaction)
+            .build()
+
+        val output = AnySigner.sign(signingInput, ALGORAND, SigningOutput.parser())
+
+        assertEquals(
+            output.signature,
+            "nXQsDH1ilG3DIo2VQm5tdYKXe9o599ygdqikmROpZiNXAvQeK3avJqgjM5o+iByCdq6uOxlbveDyVmL9nZxxBg=="
+        )
+    }
+
     @Test
     fun AlgorandTransactionSigning() {
         val transaction = Algorand.Transfer.newBuilder()
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/aptos/TestAptosAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/aptos/TestAptosAddress.kt
new file mode 100644
index 00000000000..c8bed69c5d8
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/aptos/TestAptosAddress.kt
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.aptos
+
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestAptosAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val any = AnyAddress("0x6af7d07b8a541913dfa87a9f99628faa255c70241ef9ebd9b82a7e715ee13108", CoinType.APTOS)
+        assertEquals(any.coin(), CoinType.APTOS)
+        assertEquals(any.description(), "0x6af7d07b8a541913dfa87a9f99628faa255c70241ef9ebd9b82a7e715ee13108")
+
+        assertFalse(AnyAddress.isValid("0xMQqpqMQgCBuiPkoXfgZZsJvuzCeI1zc00z6vHJj4", CoinType.APTOS))
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/aptos/TestAptosSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/aptos/TestAptosSigner.kt
new file mode 100644
index 00000000000..e536821658b
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/aptos/TestAptosSigner.kt
@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.aptos
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexByteArray
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.Aptos
+
+class TestAptosSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun AptosTransactionBlindSigning() {
+        // Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x7efd69e7f9462774b932ce500ab51c0d0dcc004cf272e09f8ffd5804c2a84e33?network=mainnet
+        val key =
+            "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec".toHexBytesInByteString()
+
+        val payloadJson = """
+            {
+                    "function": "0x16fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c::AnimeSwapPoolV1::swap_exact_coins_for_coins_3_pair_entry",
+                    "type_arguments": [
+                        "0x1::aptos_coin::AptosCoin",
+                        "0x881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f4::coin::MOJO",
+                        "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDT",
+                        "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
+                    ],
+                    "arguments": [
+                        "1000000",
+                        "49329"
+                    ],
+                    "type": "entry_function_payload"
+            }
+        """.trimIndent()
+        val signingInput = Aptos.SigningInput.newBuilder()
+            .setChainId(1)
+            .setExpirationTimestampSecs(3664390082)
+            .setGasUnitPrice(100)
+            .setMaxGasAmount(100011)
+            .setSender("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30")
+            .setSequenceNumber(42)
+            .setAnyEncoded(payloadJson)
+            .setPrivateKey(key)
+            .build()
+
+        val result = AnySigner.sign(signingInput, CoinType.APTOS, Aptos.SigningOutput.parser())
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.rawTxn.toByteArray())),
+            "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada0000000001"
+        )
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.authenticator.signature.toByteArray())),
+            "42cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b"
+        )
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.encoded.toByteArray())),
+            "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada00000000010020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c4042cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b"
+        )
+    }
+
+    @Test
+    fun AptosTransactionSigning() {
+        // Successfully broadcasted https://explorer.aptoslabs.com/txn/0xb4d62afd3862116e060dd6ad9848ccb50c2bc177799819f1d29c059ae2042467?network=devnet
+        val key =
+            "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec".toHexBytesInByteString()
+
+        val transfer = Aptos.TransferMessage.newBuilder().setAmount(1000)
+            .setTo("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30").build()
+        val signingInput = Aptos.SigningInput.newBuilder().setChainId(33)
+            .setSender("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30")
+            .setSequenceNumber(99)
+            .setGasUnitPrice(100)
+            .setMaxGasAmount(3296766)
+            .setExpirationTimestampSecs(3664390082)
+            .setTransfer(transfer)
+            .setPrivateKey(key)
+            .build()
+
+        val result = AnySigner.sign(signingInput, CoinType.APTOS, Aptos.SigningOutput.parser())
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.rawTxn.toByteArray())),
+            "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021"
+        )
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.authenticator.signature.toByteArray())),
+            "5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01"
+        )
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.encoded.toByteArray())),
+            "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01"
+        )
+    }
+
+    @Test
+    fun AptosTransferTokensCoins() {
+        // Successfully broadcasted https://explorer.aptoslabs.com/txn/0x197d40ea12e2bfc65a0a913b9f4ca3b0b0208fe0c1514d3d55cef3d5bcf25211?network=mainnet
+        val key =
+            "e7f56c77189e03699a75d8ec5c090e41f3d9d4783bc49c33df8a93d915e10de8".toHexBytesInByteString()
+
+        val function = Aptos.StructTag.newBuilder()
+            .setAccountAddress("0xe9c192ff55cffab3963c695cff6dbf9dad6aff2bb5ac19a6415cad26a81860d9")
+            .setModule("mee_coin")
+            .setName("MeeCoin")
+            .build()
+
+        val transfer = Aptos.TokenTransferCoinsMessage.newBuilder()
+            .setAmount(10000)
+            .setTo("0xb7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c")
+            .setFunction(function)
+            .build()
+        val signingInput = Aptos.SigningInput.newBuilder()
+            .setChainId(1)
+            .setSender("0x1869b853768f0ba935d67f837a66b172dd39a60ca2315f8d4e0e669bbd35cf25")
+            .setSequenceNumber(2)
+            .setGasUnitPrice(100)
+            .setMaxGasAmount(2000)
+            .setExpirationTimestampSecs(3664390082)
+            .setTokenTransferCoins(transfer)
+            .setPrivateKey(key)
+            .build()
+
+        val result = AnySigner.sign(signingInput, CoinType.APTOS, Aptos.SigningOutput.parser())
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.rawTxn.toByteArray())),
+            "1869b853768f0ba935d67f837a66b172dd39a60ca2315f8d4e0e669bbd35cf2502000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e740e7472616e736665725f636f696e730107e9c192ff55cffab3963c695cff6dbf9dad6aff2bb5ac19a6415cad26a81860d9086d65655f636f696e074d6565436f696e000220b7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c081027000000000000d0070000000000006400000000000000c2276ada0000000001"
+        )
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.authenticator.signature.toByteArray())),
+            "30ebd7e95cb464677f411868e2cbfcb22bc01cc63cded36c459dff45e6d2f1354ae4e090e7dfbb509851c0368b343e0e5ecaf6b08e7c1b94c186530b0f7dee0d"
+        )
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.encoded.toByteArray())),
+            "1869b853768f0ba935d67f837a66b172dd39a60ca2315f8d4e0e669bbd35cf2502000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e740e7472616e736665725f636f696e730107e9c192ff55cffab3963c695cff6dbf9dad6aff2bb5ac19a6415cad26a81860d9086d65655f636f696e074d6565436f696e000220b7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c081027000000000000d0070000000000006400000000000000c2276ada0000000001002062e7a6a486553b56a53e89dfae3f780693e537e5b0a7ed33290780e581ca83694030ebd7e95cb464677f411868e2cbfcb22bc01cc63cded36c459dff45e6d2f1354ae4e090e7dfbb509851c0368b343e0e5ecaf6b08e7c1b94c186530b0f7dee0d"
+        )
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainAddress.kt
index d988eed5bb1..ec361735357 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.bandchain
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainSigner.kt
index 662773bba9c..001e9d90631 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bandchain/TestBandChainSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.bandchain
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/binance/TestBinanceAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/binance/TestBinanceAddress.kt
index 13b91a5e527..f2c62428f64 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/binance/TestBinanceAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/binance/TestBinanceAddress.kt
@@ -2,6 +2,8 @@ package com.trustwallet.core.app.blockchains.binance
 
 import com.trustwallet.core.app.utils.toHexBytes
 import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
 import org.junit.Test
 import wallet.core.jni.*
 import com.trustwallet.core.app.utils.toHex
@@ -22,6 +24,23 @@ class TestBinanceAddress {
         assertEquals("bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2", address.description())
     }
 
+    @Test
+    fun testIsValid() {
+        assertTrue(AnyAddress.isValid("bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw", CoinType.BINANCE));
+
+        assertFalse(AnyAddress.isValid("bad1devga6q804tx9fqrnx0vtu5r36kxgp9tqx8h9k", CoinType.BINANCE));
+        assertFalse(AnyAddress.isValid("tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", CoinType.BINANCE));
+    }
+
+    @Test
+    fun testIsValidBech32() {
+        assertTrue(AnyAddress.isValidBech32("bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw", CoinType.BINANCE, "bnb"));
+        assertTrue(AnyAddress.isValidBech32("tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", CoinType.BINANCE, "tbnb"));
+
+        assertFalse(AnyAddress.isValidBech32("bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw", CoinType.BINANCE, "tbnb"));
+        assertFalse(AnyAddress.isValidBech32("tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", CoinType.BINANCE, "bnb"));
+    }
+
     @Test
     fun testBinanceMainnet() {
         val wallet = HDWallet("rabbit tilt arm protect banner ill produce vendor april bike much identify pond upset front easily glass gallery address hair priority focus forest angle", "")
@@ -31,4 +50,15 @@ class TestBinanceAddress {
         assertEquals("0x727f677b390c151caf9c206fd77f77918f56904b5504243db9b21e51182c4c06", key.data().toHex())
         assertEquals("bnb1devga6q804tx9fqrnx0vtu5r36kxgp9tmk4xkm", address)
     }
+
+    @Test
+    fun testBinanceTestnet() {
+        val wallet = HDWallet("rabbit tilt arm protect banner ill produce vendor april bike much identify pond upset front easily glass gallery address hair priority focus forest angle", "")
+        val privateKey = wallet.getKeyForCoin(CoinType.BINANCE)
+        val publicKey = privateKey.getPublicKeySecp256k1(true)
+        val address = AnyAddress(publicKey, CoinType.BINANCE, "tbnb")
+
+        assertEquals("0x727f677b390c151caf9c206fd77f77918f56904b5504243db9b21e51182c4c06", privateKey.data().toHex())
+        assertEquals("tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", address.description())
+    }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/binance/TestBinanceWalletConnectSigning.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/binance/TestBinanceWalletConnectSigning.kt
new file mode 100644
index 00000000000..a66c2dc9776
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/binance/TestBinanceWalletConnectSigning.kt
@@ -0,0 +1,46 @@
+package com.trustwallet.core.app.blockchains.binance
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexBytes
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.proto.Binance.SigningOutput
+import wallet.core.jni.proto.WalletConnect
+import wallet.core.jni.*
+import wallet.core.jni.CoinType.BINANCE
+import wallet.core.java.AnySigner
+import wallet.core.jni.proto.Common
+
+class TestBinanceWalletConnectSigning {
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testSignBinanceTransactionFromWalletConnectRequest() {
+        // Step 1: Parse a signing request received through WalletConnect.
+
+        val parsingInput = WalletConnect.ParseRequestInput.newBuilder().apply {
+            method = WalletConnect.Method.CosmosSignAmino
+            payload = "{\"signerAddress\":\"bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2\",\"signDoc\":{\"account_number\":\"19\",\"chain_id\":\"chain-bnb\",\"memo\":\"\",\"data\":null,\"msgs\":[{\"inputs\":[{\"address\":\"bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2\",\"coins\":[{\"amount\":1001000000,\"denom\":\"BNB\"}]}],\"outputs\":[{\"address\":\"bnb13zeh6hs97d5eu2s5qerguhv8ewwue6u4ywa6yf\",\"coins\":[{\"amount\":1001000000,\"denom\":\"BNB\"}]}]}],\"sequence\":\"23\",\"source\":\"1\"}}"
+        }.build()
+
+        val parsingOutputBytes = WalletConnectRequest.parse(BINANCE, parsingInput.toByteArray())
+        val parsingOutput = WalletConnect.ParseRequestOutput.parseFrom(parsingOutputBytes)
+
+        assertEquals(parsingOutput.error, Common.SigningError.OK)
+
+        // Step 2: Set missing fields.
+
+        val signingInput = parsingOutput.binance.toBuilder().apply {
+            privateKey = ByteString.copyFrom("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832".toHexBytes())
+        }.build()
+
+        // Step 3: Sign the transaction.
+
+        val output = AnySigner.sign(signingInput, BINANCE, SigningOutput.parser())
+
+        assertEquals(output.error, Common.SigningError.OK)
+        assertEquals(output.signatureJson, "{\"pub_key\":{\"type\":\"tendermint/PubKeySecp256k1\",\"value\":\"Amo1kgCI2Yw4iMpoxT38k/RWRgJgbLuH8P5e5TPbOOUC\"},\"signature\":\"PCTHhMa7+Z1U/6uxU+3LbTxKd0k231xypdMolyVvjgYvMg+0dTMC+wqW8IxHWXTSDt/Ronu+7ac1h/WN3JWJdQ==\"}")
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinPsbt.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinPsbt.kt
new file mode 100644
index 00000000000..884120800ca
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinPsbt.kt
@@ -0,0 +1,108 @@
+package com.trustwallet.core.app.blockchains.bitcoin
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.BitcoinScript
+import wallet.core.jni.BitcoinSigHashType
+import wallet.core.jni.CoinType
+import wallet.core.jni.CoinType.BITCOIN
+import wallet.core.jni.Hash
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.PublicKey
+import wallet.core.jni.PublicKeyType
+import wallet.core.jni.proto.Bitcoin
+import wallet.core.jni.proto.BitcoinV2
+import wallet.core.jni.proto.Common.SigningError
+
+class TestBitcoinPsbt {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testSignThorSwap() {
+        // Successfully broadcasted tx: https://mempool.space/tx/634a416e82ac710166725f6a4090ac7b5db69687e86b2d2e38dcb3d91c956c32
+
+        val privateKey = "f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55".toHexBytesInByteString()
+        val psbt = "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d00000000".toHexBytesInByteString()
+
+        val input = BitcoinV2.SigningInput.newBuilder()
+            .setPsbt(BitcoinV2.Psbt.newBuilder().setPsbt(psbt))
+            .addPrivateKeys(privateKey)
+            .build()
+
+        val legacyInput = Bitcoin.SigningInput.newBuilder()
+            .setSigningV2(input)
+            .build()
+
+        val legacyOutput = AnySigner.sign(legacyInput, BITCOIN, Bitcoin.SigningOutput.parser())
+        val output = legacyOutput.signingResultV2
+
+        assertEquals(output.error, SigningError.OK)
+        assertEquals(
+            output.psbt.psbt.toByteArray().toHex(),
+            "0x70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d01086c02483045022100b1229a008f20691639767bf925d6b8956ea957ccc633ad6b5de3618733a55e6b02205774d3320489b8a57a6f8de07f561de3e660ff8e587f6ac5422c49020cd4dc9101210306d8c664ea8fd2683eebea1d3114d90e0a5429e5783ba49b80ddabce04ff28f300000000"
+        )
+        assertEquals(
+            output.encoded.toByteArray().toHex(),
+            "0x02000000000101147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d02483045022100b1229a008f20691639767bf925d6b8956ea957ccc633ad6b5de3618733a55e6b02205774d3320489b8a57a6f8de07f561de3e660ff8e587f6ac5422c49020cd4dc9101210306d8c664ea8fd2683eebea1d3114d90e0a5429e5783ba49b80ddabce04ff28f300000000"
+        )
+        assertEquals(
+            output.txid.toByteArray().toHex(),
+            "0x634a416e82ac710166725f6a4090ac7b5db69687e86b2d2e38dcb3d91c956c32"
+        )
+    }
+
+    @Test
+    fun testPlanThorSwap() {
+        // Successfully broadcasted tx: https://mempool.space/tx/634a416e82ac710166725f6a4090ac7b5db69687e86b2d2e38dcb3d91c956c32
+
+        val privateKey = PrivateKey("f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55".toHexBytes())
+        val publicKey = privateKey.getPublicKeySecp256k1(true)
+        val psbt = "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d00000000".toHexBytesInByteString()
+
+        val input = BitcoinV2.SigningInput.newBuilder()
+            .setPsbt(BitcoinV2.Psbt.newBuilder().setPsbt(psbt))
+            .addPublicKeys(ByteString.copyFrom(publicKey.data()))
+            .build()
+
+        val legacyInput = Bitcoin.SigningInput.newBuilder()
+            .setSigningV2(input)
+            .build()
+
+        val legacyPlan = AnySigner.plan(legacyInput, BITCOIN, Bitcoin.TransactionPlan.parser())
+        val plan = legacyPlan.planningResultV2
+
+        assertEquals(plan.error, SigningError.OK)
+
+        assertEquals(plan.getInputs(0).receiverAddress, "bc1qkyu3n8k8jmekl3pwvdl59k5w8enjp25akz2r3z")
+        assertEquals(plan.getInputs(0).value, 66_406)
+
+        // Vault transfer
+        assertEquals(plan.getOutputs(0).toAddress, "bc1q7g48qdshqd000aysws74pun2uzxrp598gcfum0")
+        assertEquals(plan.getOutputs(0).value, 60_000)
+
+        // OP_RETURN
+        assertEquals(
+            plan.getOutputs(1).customScriptPubkey.toByteArray().toHex(),
+            "0x6a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a3530"
+        )
+        assertEquals(plan.getOutputs(1).value, 0)
+
+        // Change output
+        assertEquals(plan.getOutputs(2).toAddress, "bc1qkyu3n8k8jmekl3pwvdl59k5w8enjp25akz2r3z")
+        assertEquals(plan.getOutputs(2).value, 4_670)
+
+        assertEquals(plan.feeEstimate, 1736)
+        // Please note that `change` in PSBT planning is always 0.
+        // That's because we aren't able to determine which output is an actual change from PSBT.
+        assertEquals(plan.change, 0)
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinSigning.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinSigning.kt
index 45d627d8b46..abd187f8150 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinSigning.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoin/TestBitcoinSigning.kt
@@ -10,8 +10,13 @@ import wallet.core.jni.BitcoinScript
 import wallet.core.jni.BitcoinSigHashType
 import wallet.core.jni.CoinType
 import wallet.core.jni.CoinType.BITCOIN
+import wallet.core.jni.Hash
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.PublicKey
+import wallet.core.jni.PublicKeyType
 import wallet.core.jni.proto.Bitcoin
 import wallet.core.jni.proto.Bitcoin.SigningOutput
+import wallet.core.jni.proto.BitcoinV2
 import wallet.core.jni.proto.Common.SigningError
 
 class TestBitcoinSigning {
@@ -155,4 +160,203 @@ class TestBitcoinSigning {
         assertEquals("0x01000000000102fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f00000000494830450221008d49c4d7cc5ab93c01a67ce3f4ed2c45c59d4da6c76c891a9b56e67eda2e8cb4022078849134c697b1c70c1a19b900d94d8cab00ad7bcc8afe7ad1f6b184c13effa601ffffffffef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a0100000000ffffffff02d8d60000000000001976a914a6d85a488bb777a540f24bf777d30d1486036f6188acee430000000000001976a9147d77e6cfb05a9cfc123824279f6caf8b66ac267688ac0002473044022074573d7f7828ae193fbea6d72c0fe2df6cee5c02bf455ea3d9312e16d6a9576502203861c5a3b3a83d4fe372034073f60201a8a944fb4536be0ea7544ab177b967600121025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee635700000000",
             Numeric.toHexString(encoded.toByteArray()));
     }
+
+    @Test
+    fun testSignBrc20Commit() {
+        // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1
+        val privateKeyData = (Numeric.hexStringToByteArray("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129"))
+        val dustSatoshis = 546.toLong()
+        val txId = Numeric.hexStringToByteArray("8ec895b4d30adb01e38471ca1019bfc8c3e5fbd1f28d9e7b5653260d89989008").reversedArray()
+
+        val privateKey = PrivateKey(privateKeyData)
+        val publicKey = ByteString.copyFrom(privateKey.getPublicKeySecp256k1(true).data())
+
+        val utxo0 = BitcoinV2.Input.newBuilder()
+            .setOutPoint(BitcoinV2.OutPoint.newBuilder().apply {
+                hash = ByteString.copyFrom(txId)
+                vout = 1
+            })
+            .setValue(26_400)
+            .setSighashType(BitcoinSigHashType.ALL.value())
+            .setScriptBuilder(BitcoinV2.Input.InputBuilder.newBuilder().apply {
+                p2Wpkh = BitcoinV2.PublicKeyOrHash.newBuilder().setPubkey(publicKey).build()
+            })
+
+        val out0 = BitcoinV2.Output.newBuilder()
+            .setValue(7_000)
+            .setBuilder(BitcoinV2.Output.OutputBuilder.newBuilder().apply {
+                brc20Inscribe = BitcoinV2.Output.OutputBrc20Inscription.newBuilder().apply {
+                    inscribeTo = publicKey
+                    ticker = "oadf"
+                    transferAmount = "20"
+                }.build()
+            })
+
+        val changeOutput = BitcoinV2.Output.newBuilder()
+            .setValue(16_400)
+            .setBuilder(BitcoinV2.Output.OutputBuilder.newBuilder().apply {
+                p2Wpkh = BitcoinV2.PublicKeyOrHash.newBuilder().setPubkey(publicKey).build()
+            })
+
+        val builder = BitcoinV2.TransactionBuilder.newBuilder()
+            .setVersion(BitcoinV2.TransactionVersion.V2)
+            .addInputs(utxo0)
+            .addOutputs(out0)
+            .addOutputs(changeOutput)
+            .setInputSelector(BitcoinV2.InputSelector.UseAll)
+            .setFixedDustThreshold(dustSatoshis)
+        val signingInput = BitcoinV2.SigningInput.newBuilder()
+            .setBuilder(builder)
+            .addPrivateKeys(ByteString.copyFrom(privateKeyData))
+            .setChainInfo(BitcoinV2.ChainInfo.newBuilder().apply {
+                p2PkhPrefix = 0
+                p2ShPrefix = 5
+            })
+            .setDangerousUseFixedSchnorrRng(true)
+            .build()
+
+        val legacySigningInput = Bitcoin.SigningInput.newBuilder().apply {
+            signingV2 = signingInput
+        }
+
+        val output = AnySigner.sign(legacySigningInput.build(), BITCOIN, SigningOutput.parser())
+
+        assertEquals(output.error, SigningError.OK)
+        assertEquals(output.signingResultV2.error, SigningError.OK)
+        assertEquals(Numeric.toHexString(output.signingResultV2.encoded.toByteArray()), "0x02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000")
+        assertEquals(Numeric.toHexString(output.signingResultV2.txid.toByteArray()), "0x797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1")
+    }
+
+    @Test
+    fun testSignBrc20Reveal() {
+        // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca
+        val privateKeyData = (Numeric.hexStringToByteArray("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129"))
+        val dustSatoshis = 546.toLong()
+        val txIdCommit = Numeric.hexStringToByteArray("797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1").reversedArray()
+
+        val privateKey = PrivateKey(privateKeyData)
+        val publicKey = ByteString.copyFrom(privateKey.getPublicKeySecp256k1(true).data())
+
+        val utxo0 = BitcoinV2.Input.newBuilder()
+            .setOutPoint(BitcoinV2.OutPoint.newBuilder().apply {
+                hash = ByteString.copyFrom(txIdCommit)
+                vout = 0
+            })
+            .setValue(7_000)
+            .setSighashType(BitcoinSigHashType.ALL.value())
+            .setScriptBuilder(BitcoinV2.Input.InputBuilder.newBuilder().apply {
+                brc20Inscribe = BitcoinV2.Input.InputBrc20Inscription.newBuilder().apply {
+                    inscribeTo = publicKey
+                    ticker = "oadf"
+                    transferAmount = "20"
+                }.build()
+            })
+
+        val out0 = BitcoinV2.Output.newBuilder()
+            .setValue(dustSatoshis)
+            .setBuilder(BitcoinV2.Output.OutputBuilder.newBuilder().apply {
+                p2Wpkh = BitcoinV2.PublicKeyOrHash.newBuilder().setPubkey(publicKey).build()
+            })
+
+        val builder = BitcoinV2.TransactionBuilder.newBuilder()
+            .setVersion(BitcoinV2.TransactionVersion.V2)
+            .addInputs(utxo0)
+            .addOutputs(out0)
+            .setInputSelector(BitcoinV2.InputSelector.UseAll)
+            .setFixedDustThreshold(dustSatoshis)
+        val signingInput = BitcoinV2.SigningInput.newBuilder()
+            .setBuilder(builder)
+            .addPrivateKeys(ByteString.copyFrom(privateKeyData))
+            .setChainInfo(BitcoinV2.ChainInfo.newBuilder().apply {
+                p2PkhPrefix = 0
+                p2ShPrefix = 5
+            })
+            .setDangerousUseFixedSchnorrRng(true)
+            .build()
+
+        val legacySigningInput = Bitcoin.SigningInput.newBuilder().apply {
+            signingV2 = signingInput
+        }
+
+        val output = AnySigner.sign(legacySigningInput.build(), BITCOIN, SigningOutput.parser())
+
+        assertEquals(output.error, SigningError.OK)
+        assertEquals(output.signingResultV2.error, SigningError.OK)
+        assertEquals(Numeric.toHexString(output.signingResultV2.encoded.toByteArray()), "0x02000000000101b11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790000000000ffffffff012202000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d03406a35548b8fa4620028e021a944c1d3dc6e947243a7bfc901bf63fefae0d2460efa149a6440cab51966aa4f09faef2d1e5efcba23ab4ca6e669da598022dbcfe35b0063036f7264010118746578742f706c61696e3b636861727365743d7574662d3800377b2270223a226272632d3230222c226f70223a227472616e73666572222c227469636b223a226f616466222c22616d74223a223230227d6821c00f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000")
+        assertEquals(Numeric.toHexString(output.signingResultV2.txid.toByteArray()), "0x7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca")
+    }
+
+    @Test
+    fun testSignBrc20Transfer() {
+        // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/3e3576eb02667fac284a5ecfcb25768969680cc4c597784602d0a33ba7c654b7
+        val privateKeyData = (Numeric.hexStringToByteArray("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129"))
+        val dustSatoshis = 546.toLong()
+        val txIdInscription = Numeric.hexStringToByteArray("7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca").reversedArray()
+        val txIdForFees = Numeric.hexStringToByteArray("797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1").reversedArray()
+
+        val privateKey = PrivateKey(privateKeyData)
+        val publicKey = ByteString.copyFrom(privateKey.getPublicKeySecp256k1(true).data())
+        val bobAddress = "bc1qazgc2zhu2kmy42py0vs8d7yff67l3zgpwfzlpk"
+
+        val utxo0 = BitcoinV2.Input.newBuilder()
+            .setOutPoint(BitcoinV2.OutPoint.newBuilder().apply {
+                hash = ByteString.copyFrom(txIdInscription)
+                vout = 0
+            })
+            .setValue(dustSatoshis)
+            .setSighashType(BitcoinSigHashType.ALL.value())
+            .setScriptBuilder(BitcoinV2.Input.InputBuilder.newBuilder().apply {
+                p2Wpkh = BitcoinV2.PublicKeyOrHash.newBuilder().setPubkey(publicKey).build()
+            })
+
+        val utxo1 = BitcoinV2.Input.newBuilder()
+            .setOutPoint(BitcoinV2.OutPoint.newBuilder().apply {
+                hash = ByteString.copyFrom(txIdForFees)
+                vout = 1
+            })
+            .setValue(16_400)
+            .setSighashType(BitcoinSigHashType.ALL.value())
+            .setScriptBuilder(BitcoinV2.Input.InputBuilder.newBuilder().apply {
+                p2Wpkh = BitcoinV2.PublicKeyOrHash.newBuilder().setPubkey(publicKey).build()
+            })
+
+        val out0 = BitcoinV2.Output.newBuilder()
+            .setValue(dustSatoshis)
+            .setToAddress(bobAddress)
+
+        val changeOutput = BitcoinV2.Output.newBuilder()
+            .setValue(13_400)
+            .setBuilder(BitcoinV2.Output.OutputBuilder.newBuilder().apply {
+                p2Wpkh = BitcoinV2.PublicKeyOrHash.newBuilder().setPubkey(publicKey).build()
+            })
+
+        val builder = BitcoinV2.TransactionBuilder.newBuilder()
+            .setVersion(BitcoinV2.TransactionVersion.V2)
+            .addInputs(utxo0)
+            .addInputs(utxo1)
+            .addOutputs(out0)
+            .addOutputs(changeOutput)
+            .setInputSelector(BitcoinV2.InputSelector.UseAll)
+            .setFixedDustThreshold(dustSatoshis)
+        val signingInput = BitcoinV2.SigningInput.newBuilder()
+            .setBuilder(builder)
+            .addPrivateKeys(ByteString.copyFrom(privateKeyData))
+            .setChainInfo(BitcoinV2.ChainInfo.newBuilder().apply {
+                p2PkhPrefix = 0
+                p2ShPrefix = 5
+            })
+            .setDangerousUseFixedSchnorrRng(true)
+            .build()
+
+        val legacySigningInput = Bitcoin.SigningInput.newBuilder().apply {
+            signingV2 = signingInput
+        }
+
+        val output = AnySigner.sign(legacySigningInput.build(), BITCOIN, SigningOutput.parser())
+
+        assertEquals(output.error, SigningError.OK)
+        assertEquals(output.signingResultV2.error, SigningError.OK)
+        assertEquals(Numeric.toHexString(output.signingResultV2.encoded.toByteArray()), "0x02000000000102ca3edda74a46877efa5364ab85947e148508713910ada23e147ea28926dc46700000000000ffffffffb11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790100000000ffffffff022202000000000000160014e891850afc55b64aa8247b2076f8894ebdf889015834000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d024830450221008798393eb0b7390217591a8c33abe18dd2f7ea7009766e0d833edeaec63f2ec302200cf876ff52e68dbaf108a3f6da250713a9b04949a8f1dcd1fb867b24052236950121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb0248304502210096bbb9d1f0596d69875646689e46f29485e8ceccacde9d0025db87fd96d3066902206d6de2dd69d965d28df3441b94c76e812384ab9297e69afe3480ee4031e1b2060121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000")
+        assertEquals(Numeric.toHexString(output.signingResultV2.txid.toByteArray()), "0x3e3576eb02667fac284a5ecfcb25768969680cc4c597784602d0a33ba7c654b7")
+    }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoincash/TestBitcoinCashSigning.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoincash/TestBitcoinCashSigning.kt
new file mode 100644
index 00000000000..2c826c0bd4f
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoincash/TestBitcoinCashSigning.kt
@@ -0,0 +1,81 @@
+package com.trustwallet.core.app.blockchains.bitcoincash
+
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.BitcoinSigHashType
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.Bitcoin
+import wallet.core.jni.proto.BitcoinV2
+import wallet.core.jni.proto.Common.SigningError
+
+class TestBitcoinCashSigning {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testSignV2P2PKH() {
+        val privateKey = "7fdafb9db5bc501f2096e7d13d331dc7a75d9594af3d251313ba8b6200f4e384".toHexBytesInByteString()
+
+        val utxo1 = BitcoinV2.Input.newBuilder().apply {
+            outPoint = BitcoinV2.OutPoint.newBuilder().apply {
+                hash = "e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05".toHexBytesInByteString()
+                vout = 2
+            }.build()
+            value = 5151
+            sighashType = BitcoinSigHashType.ALL.value() + BitcoinSigHashType.FORK.value()
+            receiverAddress = "bitcoincash:qzhlrcrcne07x94h99thved2pgzdtv8ccujjy73xya"
+        }
+
+        val out1 = BitcoinV2.Output.newBuilder().apply {
+            value = 600
+            // Legacy address
+            toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx"
+        }
+        val changeOutputExplicit = BitcoinV2.Output.newBuilder().apply {
+            value = 4325
+            // Legacy address
+            toAddress = "qz0q3xmg38sr94rw8wg45vujah7kzma3cskxymnw06"
+        }
+
+        val builder = BitcoinV2.TransactionBuilder.newBuilder()
+            .setVersion(BitcoinV2.TransactionVersion.V1)
+            .addInputs(utxo1)
+            .addOutputs(out1)
+            .addOutputs(changeOutputExplicit)
+            .setInputSelector(BitcoinV2.InputSelector.UseAll)
+            .setFixedDustThreshold(546)
+            .build()
+
+        val input = BitcoinV2.SigningInput.newBuilder()
+            .addPrivateKeys(privateKey)
+            .setBuilder(builder)
+            .setChainInfo(BitcoinV2.ChainInfo.newBuilder().apply {
+                p2PkhPrefix = 0
+                p2ShPrefix = 5
+                hrp = "bitcoincash"
+            })
+            .build()
+
+        val legacyInput = Bitcoin.SigningInput.newBuilder()
+            .setSigningV2(input)
+            // `CoinType` must be set to be handled correctly.
+            .setCoinType(CoinType.BITCOINCASH.value())
+            .build()
+
+        val outputLegacy = AnySigner.sign(legacyInput, CoinType.BITCOINCASH, Bitcoin.SigningOutput.parser())
+        assertEquals(outputLegacy.error, SigningError.OK)
+        assert(outputLegacy.hasSigningResultV2())
+
+        val output = outputLegacy.signingResultV2
+        assertEquals(output.error, SigningError.OK)
+        assertEquals(
+            Numeric.toHexString(output.encoded.toByteArray()),
+            "0x0100000001e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05020000006b483045022100b70d158b43cbcded60e6977e93f9a84966bc0cec6f2dfd1463d1223a90563f0d02207548d081069de570a494d0967ba388ff02641d91cadb060587ead95a98d4e3534121038eab72ec78e639d02758e7860cdec018b49498c307791f785aa3019622f4ea5bffffffff0258020000000000001976a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ace5100000000000001976a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac00000000"
+        )
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoindiamond/TestBitcoinDiamondAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoindiamond/TestBitcoinDiamondAddress.kt
new file mode 100644
index 00000000000..497b2d6dedc
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoindiamond/TestBitcoinDiamondAddress.kt
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.bitcoindiamond
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestBitcoinDiamondAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(true);
+        val address = AnyAddress(pubkey, CoinType.BITCOINDIAMOND)
+        val expected = AnyAddress("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8", CoinType.BITCOINDIAMOND)
+
+        assertEquals(pubkey.data().toHex(), "0x02485a209514cc896f8ed736e205bc4c35bd5299ef3f9e84054475336b964c02a3")
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoindiamond/TestBitcoinDiamondSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoindiamond/TestBitcoinDiamondSigner.kt
new file mode 100644
index 00000000000..3bbbd9a77fd
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bitcoindiamond/TestBitcoinDiamondSigner.kt
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.bitcoindiamond
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexByteArray
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+import wallet.core.java.AnySigner
+import wallet.core.jni.BitcoinScript
+import wallet.core.jni.BitcoinSigHashType
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.Bitcoin
+import wallet.core.jni.proto.Common.SigningError
+
+class TestBitcoinDiamondSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun BitcoinDiamondTransactionSigning() {
+        val toScript = BitcoinScript.lockScriptForAddress("1HevQVTSEc8cEpDm65UpfCdj5erd4xxBhx", CoinType.BITCOINDIAMOND);
+        assertEquals(Numeric.toHexString(toScript.data()), "0x76a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac");
+        
+        // prepare SigningInput
+        val input = Bitcoin.SigningInput.newBuilder()
+            .setHashType(BitcoinScript.hashTypeForCoin(CoinType.BITCOINDIAMOND))
+            .setAmount(17615)
+            .setByteFee(1)
+            .setToAddress("1HevQVTSEc8cEpDm65UpfCdj5erd4xxBhx")
+            .setChangeAddress("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8")
+            .setCoinType(CoinType.BITCOINDIAMOND.value())
+
+        val utxoKey0 =
+            (Numeric.hexStringToByteArray("d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee"))
+        input.addPrivateKey(ByteString.copyFrom(utxoKey0))
+
+        // build utxo
+        val txHash0 = (Numeric.hexStringToByteArray("034f4667301711e8a69236a93476ed798f9c11aaae472da5b315191a0453461d"))
+        val outpoint0 = Bitcoin.OutPoint.newBuilder()
+            .setHash(ByteString.copyFrom(txHash0))
+            .setIndex(0)
+            .setSequence(Long.MAX_VALUE.toInt())
+            .build()
+
+        val utxo0 = Bitcoin.UnspentTransaction.newBuilder()
+            .setAmount(27615)
+            .setOutPoint(outpoint0)
+            .setScript(ByteString.copyFrom("76a914a48da46386ce52cccad178de900c71f06130c31088ac".toHexBytes()))
+            .build()
+
+        input.addUtxo(utxo0)
+
+        val plan = AnySigner.plan(input.build(), CoinType.BITCOINDIAMOND, Bitcoin.TransactionPlan.parser())
+
+        input.plan = Bitcoin.TransactionPlan.newBuilder()
+            .mergeFrom(plan)
+            .setAmount(17615)
+            .setFee(10000)
+            .setChange(0)
+            .setPreblockhash(ByteString.copyFrom("99668daf7c77c6462f3ba8fab61b4f62abaabd62911e7e59729ee9e1929dfa4b".toHexBytes()))
+            .build()
+
+
+        val output = AnySigner.sign(input.build(), CoinType.BITCOINDIAMOND, Bitcoin.SigningOutput.parser())
+
+        assertEquals(output.error, SigningError.OK)
+        val signedTransaction = output.transaction
+        assert(signedTransaction.isInitialized)
+        assertEquals(12, signedTransaction.version)
+        assertEquals(1, signedTransaction.inputsCount)
+        assertEquals(1, signedTransaction.outputsCount)
+
+        val encoded = output.encoded
+        assertEquals("0x0c00000099668daf7c77c6462f3ba8fab61b4f62abaabd62911e7e59729ee9e1929dfa4b01034f4667301711e8a69236a93476ed798f9c11aaae472da5b315191a0453461d000000006a473044022078e0d3a9e1eb270ab02c15f8fcf1d3bfc95a324839690b7de4f011a4266132ff02204679e8103c4d3f0bb5192a5f53cc273732fd0e8392ab3b00dc708fd24d0160b3012102485a209514cc896f8ed736e205bc4c35bd5299ef3f9e84054475336b964c02a3ffffffff01cf440000000000001976a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac00000000",
+            Numeric.toHexString(encoded.toByteArray()));
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleAddress.kt
index 99baa611f71..d8eb3424893 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.bluzelle
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleSigner.kt
index ba4d7e99238..bf40f0dcc67 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/bluzelle/TestBluzelleSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.bluzelle
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoAddress.kt
index 6ac0f1c4d63..a505e201176 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.cardano
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoSigning.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoSigning.kt
index e76aa67b785..d9450e9881c 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoSigning.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cardano/TestCardanoSigning.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.cardano
 
@@ -15,11 +13,11 @@ import org.junit.Assert.assertEquals
 import org.junit.Test
 import wallet.core.java.AnySigner
 import wallet.core.jni.*
+import wallet.core.jni.Cardano.getByronAddress
 import wallet.core.jni.Cardano.getStakingAddress
+import wallet.core.jni.Cardano.outputMinAdaAmount
 import wallet.core.jni.CoinType.CARDANO
 import wallet.core.jni.proto.Cardano
-import wallet.core.jni.proto.Cardano.SigningInput
-import wallet.core.jni.proto.Cardano.SigningOutput
 import wallet.core.jni.proto.Common.SigningError
 
 
@@ -65,7 +63,7 @@ class TestCardanoSigning {
             .build()
         input.addUtxos(utxo2)
         
-        val output = AnySigner.sign(input.build(), CARDANO, SigningOutput.parser())
+        val output = AnySigner.sign(input.build(), CARDANO, Cardano.SigningOutput.parser())
         assertEquals(output.error, SigningError.OK)
 
         val encoded = output.encoded
@@ -76,6 +74,60 @@ class TestCardanoSigning {
         assertEquals(Numeric.toHexString(txid.toByteArray()), "0x9b5b15e133cd73ccaa85307d2986aebc846505118a2eb4e6111e6b4b67d1f389");
     }
 
+    /// Successfully broadcasted:
+    /// https://cardanoscan.io/transaction/0203ce2c91f59f169a26e9ef91254639d2b7911afac9c7c0ae64539f88ba46a5
+    @Test
+    fun testSignTransferFromLegacy() {
+        val privateKey = PrivateKey("98f266d1aac660179bc2f456033941238ee6b2beb8ed0f9f34c9902816781f5a9903d1d395d6ab887b65ea5e344ef09b449507c21a75f0ce8c59d0ed1c6764eba7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f4e890ca4eb6bec44bf751b5a843174534af64d6ad1f44e0613db78a7018781f5aa151d2997f52059466b715d8eefab30a78b874ae6ef4931fa58bb21ef8ce2423d46f19d0fbf75afb0b9a24e31d533f4fd74cee3b56e162568e8defe37123afc4".toHexByteArray())
+        var publicKey = privateKey.publicKeyEd25519Cardano
+        var byronAddress = wallet.core.jni.Cardano.getByronAddress(publicKey)
+        
+        assertEquals(byronAddress, "Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8")
+
+        val message = Cardano.Transfer.newBuilder()
+            .setToAddress("addr1q90uh2eawrdc9vaemftgd50l28yrh9lqxtjjh4z6dnn0u7ggasexxdyyk9f05atygnjlccsjsggtc87hhqjna32fpv5qeq96ls")
+            .setChangeAddress("addr1qx55ymlqemndq8gluv40v58pu76a2tp4mzjnyx8n6zrp2vtzrs43a0057y0edkn8lh9su8vh5lnhs4npv6l9tuvncv8swc7t08")
+            .setAmount(3_000_000)
+            .build()
+        val input = Cardano.SigningInput.newBuilder()
+            .setTransferMessage(message)
+            .setTtl(190000000)
+
+        input.addPrivateKey(ByteString.copyFrom(privateKey.data()))
+
+        val outpoint1 = Cardano.OutPoint.newBuilder()
+            .setTxHash(ByteString.copyFrom(Numeric.hexStringToByteArray("8316e5007d61fb90652cabb41141972a38b5bc60954d602cf843476aa3f67f63")))
+            .setOutputIndex(0)
+            .build()
+        val utxo1 = Cardano.TxInput.newBuilder()
+            .setOutPoint(outpoint1)
+            .setAddress("Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8")
+            .setAmount(2_500_000)
+            .build()
+        input.addUtxos(utxo1)
+        
+        val outpoint2 = Cardano.OutPoint.newBuilder()
+            .setTxHash(ByteString.copyFrom(Numeric.hexStringToByteArray("e29392c59c903fefb905730587d22cae8bda30bd8d9aeec3eca082ae77675946")))
+            .setOutputIndex(0)
+            .build()
+        val utxo2 = Cardano.TxInput.newBuilder()
+            .setOutPoint(outpoint2)
+            .setAddress("Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8")
+            .setAmount(1_700_000)
+            .build()
+        input.addUtxos(utxo2)
+        
+        val output = AnySigner.sign(input.build(), CARDANO, Cardano.SigningOutput.parser())
+        assertEquals(output.error, SigningError.OK)
+
+        val encoded = output.encoded
+        assertEquals(Numeric.toHexString(encoded.toByteArray()),
+            "0x83a400828258208316e5007d61fb90652cabb41141972a38b5bc60954d602cf843476aa3f67f6300825820e29392c59c903fefb905730587d22cae8bda30bd8d9aeec3eca082ae77675946000182825839015fcbab3d70db82b3b9da5686d1ff51c83b97e032e52bd45a6ce6fe7908ec32633484b152fa756444e5fc62128210bc1fd7b8253ec5490b281a002dc6c082583901a9426fe0cee6d01d1fe32af650e1e7b5d52c35d8a53218f3d0861531621c2b1ebdf4f11f96da67fdcb0e1d97a7e778566166be55f193c30f1a000f9ec1021a0002b0bf031a0b532b80a20081825820d163c8c4f0be7c22cd3a1152abb013c855ea614b92201497a568c5d93ceeb41e58406a23ab9267867fbf021c1cb2232bc83d2cdd663d651d22d59b6cddbca5cb106d4db99da50672f69a2309ca8a329a3f9576438afe4538b013de4591a6dfcd4d090281845820d163c8c4f0be7c22cd3a1152abb013c855ea614b92201497a568c5d93ceeb41e58406a23ab9267867fbf021c1cb2232bc83d2cdd663d651d22d59b6cddbca5cb106d4db99da50672f69a2309ca8a329a3f9576438afe4538b013de4591a6dfcd4d095820a7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f441a0f6");
+
+        val txid = output.txId
+        assertEquals(Numeric.toHexString(txid.toByteArray()), "0x0203ce2c91f59f169a26e9ef91254639d2b7911afac9c7c0ae64539f88ba46a5");
+    }
+
     @Test
     fun testSignTransferToken1() {
         val toToken = Cardano.TokenAmount.newBuilder()
@@ -115,7 +167,7 @@ class TestCardanoSigning {
             .setAmount(8_051_373)
         val token3 = Cardano.TokenAmount.newBuilder()
             .setPolicyId("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77")
-            .setAssetName("CUBY")
+            .setAssetNameHex("43554259")
             .setAmount(ByteString.copyFrom(Numeric.hexStringToByteArray("2dc6c0"))) // 3000000
             .build()
         utxo1.addTokenAmount(token3)
@@ -131,7 +183,7 @@ class TestCardanoSigning {
             .setAmount(2_000_000)
         val token1 = Cardano.TokenAmount.newBuilder()
             .setPolicyId("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77")
-            .setAssetName("SUNDAE")
+            .setAssetNameHex("53554e444145")
             .setAmount(ByteString.copyFrom(Numeric.hexStringToByteArray("04d3e8d9"))) // 80996569
             .build()
         utxo2.addTokenAmount(token1)
@@ -143,7 +195,7 @@ class TestCardanoSigning {
         utxo2.addTokenAmount(token2)
         input.addUtxos(utxo2.build())
         
-        val output = AnySigner.sign(input.build(), CARDANO, SigningOutput.parser())
+        val output = AnySigner.sign(input.build(), CARDANO, Cardano.SigningOutput.parser())
         assertEquals(output.error, SigningError.OK)
 
         val encoded = output.encoded
@@ -206,7 +258,7 @@ class TestCardanoSigning {
             .build()
         input.addUtxos(utxo2)
         
-        val output = AnySigner.sign(input.build(), CARDANO, SigningOutput.parser())
+        val output = AnySigner.sign(input.build(), CARDANO, Cardano.SigningOutput.parser())
         assertEquals(output.error, SigningError.OK)
 
         val encoded = output.encoded
@@ -251,7 +303,7 @@ class TestCardanoSigning {
             .build()
         input.addUtxos(utxo1)
         
-        val output = AnySigner.sign(input.build(), CARDANO, SigningOutput.parser())
+        val output = AnySigner.sign(input.build(), CARDANO, Cardano.SigningOutput.parser())
         assertEquals(output.error, SigningError.OK)
 
         val encoded = output.encoded
@@ -261,4 +313,86 @@ class TestCardanoSigning {
         val txid = output.txId
         assertEquals(Numeric.toHexString(txid.toByteArray()), "0x6dcf3956232953fc25b8355fb1ded1e912b5802090fd21434d789087d6329683");
     }
+
+    // Successfully broadcasted:
+    // https://cardanoscan.io/transaction/87ca43a36b09c0b140f0ef2b71fbdcfcf1fdc88f7aa378b861e8eed3e8974628
+    @Test
+    fun testSignNftTransfer() {
+        val fromAddress = "addr1qy5eme9r6frr0m6q2qpncg282jtrhq5lg09uxy2j0545hj8rv7v2ntdxuv6p4s3eq4lqzg39lewgvt6fk5kmpa0zppesufzjud"
+        val toAddress = "addr1qy9wjfn6nd8kak6dd8z53u7t5wt9f4lx0umll40px5hnq05avwcsq5r3ytdp36wttzv4558jaq8lvhgqhe3y8nuf5xrquju7z4"
+        val coinsPerUtxoByte = "4310"
+
+        val tokenAmount = Cardano.TokenAmount.newBuilder()
+            .setPolicyId("219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5e")
+            .setAssetName("coolcatssociety4567")
+            .setAmount(ByteString.copyFrom(Numeric.hexStringToByteArray("01"))) // 1
+            .build()
+
+        // UTXOs
+
+        val outpoint1 = Cardano.OutPoint.newBuilder()
+            .setTxHash(ByteString.copyFrom(Numeric.hexStringToByteArray("aba499ec2f23529e70bb256ceaffcc6274a882cf02f29e5670c75ee980d7c2b8")))
+            .setOutputIndex(0)
+            .build()
+        val utxo1 = Cardano.TxInput.newBuilder()
+            .setOutPoint(outpoint1)
+            .setAddress(fromAddress)
+            .setAmount(1_202_490)
+            .addTokenAmount(tokenAmount)
+
+        val outpoint2 = Cardano.OutPoint.newBuilder()
+            .setTxHash(ByteString.copyFrom(Numeric.hexStringToByteArray("ee414d635b3bc67831907354d274a31174664777c57c21ae923b9459e5644840")))
+            .setOutputIndex(0)
+            .build()
+        val utxo2 = Cardano.TxInput.newBuilder()
+            .setOutPoint(outpoint2)
+            .setAddress(fromAddress)
+            .setAmount(1_000_000)
+
+        val outpoint3 = Cardano.OutPoint.newBuilder()
+            .setTxHash(ByteString.copyFrom(Numeric.hexStringToByteArray("6a7221dcc28353ed69b733391ffeb984a34c1e72293af111d59f9ddfa8639167")))
+            .setOutputIndex(0)
+            .build()
+        val utxo3 = Cardano.TxInput.newBuilder()
+            .setOutPoint(outpoint3)
+            .setAddress(fromAddress)
+            .setAmount(2_000_000)
+
+        // Transfer TX
+
+        val privKey = Numeric.hexStringToByteArray("d09831a668db6b36ffb747600cb1cd3e3d34f36e1e6feefc11b5f988719b7557a7029ab80d3e6fe4180ad07a59ddf742ea9730f3c4145df6365fa4ae2ee49c3392e19444caf461567727b7fefec40a3763bdb6ce5e0e8c05f5e340355a8fef4528dfe7502cfbda49e38f5a0021962d52dc3dee82834a23abb6750981799b75577d1ed9af9853707f0ef74264274e71b2f12e86e3c91314b6efa75ef750d9711b84cedd742ab873ef2f9566ad20b3fc702232c6d2f5d83ff425019234037d1e58")
+        val toTokenBundle = Cardano.TokenBundle.newBuilder()
+            .addToken(tokenAmount)
+            .build()
+
+        // Check min ADA amount, set it
+        val minAmount = outputMinAdaAmount(toAddress, toTokenBundle.toByteArray(), coinsPerUtxoByte).toLong()
+        assertEquals(minAmount, 1_202_490)
+
+        val transfer = Cardano.Transfer.newBuilder()
+            .setToAddress(toAddress)
+            .setChangeAddress(fromAddress)
+            .setAmount(minAmount)
+            .setTokenAmount(toTokenBundle)
+            .build()
+        val signInput = Cardano.SigningInput.newBuilder()
+            .setTransferMessage(transfer)
+            .setTtl(89130965)
+            .addUtxos(utxo1)
+            .addUtxos(utxo2)
+            .addUtxos(utxo3)
+            .addPrivateKey(ByteString.copyFrom(privKey))
+
+        // Sign and check
+
+        val output = AnySigner.sign(signInput.build(), CARDANO, Cardano.SigningOutput.parser())
+        assertEquals(output.error, SigningError.OK)
+
+        val encoded = output.encoded
+        assertEquals(Numeric.toHexString(encoded.toByteArray()),
+            "0x83a400838258206a7221dcc28353ed69b733391ffeb984a34c1e72293af111d59f9ddfa863916700825820aba499ec2f23529e70bb256ceaffcc6274a882cf02f29e5670c75ee980d7c2b800825820ee414d635b3bc67831907354d274a31174664777c57c21ae923b9459e5644840000182825839010ae9267a9b4f6edb4d69c548f3cba39654d7e67f37ffd5e1352f303e9d63b100507122da18e9cb58995a50f2e80ff65d00be6243cf89a186821a0012593aa1581c219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5ea153636f6f6c63617473736f6369657479343536370182583901299de4a3d24637ef4050033c214754963b829f43cbc311527d2b4bc8e36798a9ada6e3341ac239057e012225fe5c862f49b52db0f5e208731a002b1525021a0002b19b031a055007d5a1008182582088bd26e8656fa7dead846c3373588f0192da5bfb90bf5d3fb877decfb3b3fd085840da8656aca0dacc57d4c2d957fc7dff03908f6dcf60c48f1e40b3006e2fd0cfacfa4c24fa02e35a310572526586d4ce0d30bf660ba274c8efd507848cbe177d09f6");
+
+        val txid = output.txId
+        assertEquals(Numeric.toHexString(txid.toByteArray()), "0x87ca43a36b09c0b140f0ef2b71fbdcfcf1fdc88f7aa378b861e8eed3e8974628");
+    }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/confluxespace/TestConfluxeSpaceAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/confluxespace/TestConfluxeSpaceAddress.kt
new file mode 100644
index 00000000000..25d5ae1c81e
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/confluxespace/TestConfluxeSpaceAddress.kt
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.confluxespace
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestConfluxeSpaceAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(false)
+        val address = AnyAddress(pubkey, CoinType.CONFLUXESPACE)
+        val expected = AnyAddress("0xe32DC46bfBF78D1eada7b0a68C96903e01418D64", CoinType.CONFLUXESPACE)
+
+        assertEquals(address.description(), expected.description())
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cosmos/TestCosmosTransactions.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cosmos/TestCosmosTransactions.kt
index 7267138e1da..4de24f9b60f 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cosmos/TestCosmosTransactions.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cosmos/TestCosmosTransactions.kt
@@ -67,9 +67,9 @@ class TestCosmosTransactions {
 
         assertEquals(
             output.serialized,
-            "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjoSNgo0Y29zbW9zdmFsb3BlcjFnanR2bHk5bGVsNnpza3Z3dHZsZzV2aHdwdTljOXdhdzdzeHp3eCABEgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQIFyfuijGKf87Hz61ZqxasfLI1PZnNge4RDq/tRyB/tZI6p80iGRqHecoV6+84EQkc9GTlNRQOSlApRCsivT9XI=\"}"
+            "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjogARI2CjRjb3Ntb3N2YWxvcGVyMWdqdHZseTlsZWw2enNrdnd0dmxnNXZod3B1OWM5d2F3N3N4end4EgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQEAN1nIfDawlHnep2bNEm14w+g7tYybJJT3htcGVS6s9D7va3ed1OUEIk9LZoc3G//VenJ+KLw26SRVBaRukgVI=\"}"
         )
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 
     @Test
@@ -114,7 +114,7 @@ class TestCosmosTransactions {
             output.serialized,
             "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CqoBCqcBCh8vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnUmV2b2tlEoMBCi1jb3Ntb3MxM2swcTBsN2xnMmtyMzJrdnQ3bHkyMzZwcGxkeTh2OWR6d2gzZ2QSLWNvc21vczFmczdsdTI4aHg1bTlha203cnAwYzI0MjJjbjhyMmY3Z3VydWpoZhojL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuTXNnRGVsZWdhdGUSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAQSEwoNCgV1YXRvbRIEMjE5NBC3rQUaQI7K+W7MMBoD6FbFZxRBqs9VTjErztjWTy57+fvrLaTCIZ+eBs7CuaKqfUZdSN8otjubSHVTQID3k9DpPAX0yDo=\"}"
         )
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 
     @Test
@@ -166,7 +166,7 @@ class TestCosmosTransactions {
             output.serialized,
             "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H\"}"
         )
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 
     @Test
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cryptoorg/TestCryptoorgAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cryptoorg/TestCryptoorgAddress.kt
index 52e06a041d8..214c391624d 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cryptoorg/TestCryptoorgAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cryptoorg/TestCryptoorgAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.cryptoorg
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cryptoorg/TestCryptoorgSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cryptoorg/TestCryptoorgSigner.kt
index 98c568d9bef..74090e73a29 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cryptoorg/TestCryptoorgSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/cryptoorg/TestCryptoorgSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.cryptoorg
 
@@ -73,6 +71,6 @@ class TestCryptoorgSigner {
 
         // https://crypto.org/explorer/tx/BCB213B0A121F0CF11BECCF52475F1C8328D6070F3CFDA9E14C42E6DB30E847E
         assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpABCo0BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm0KKmNybzFjdHd0Y3dwZ2tza3k5ODhkaHRoNmpzbHh2ZXVtZ3UwZDQ1emdmMBIqY3JvMXhwYWh5NmM3d2xkeGFjdjZsZDk5aDQzNW1odmZuc3VwMjR2Y3VzGhMKB2Jhc2Vjcm8SCDUwMDAwMDAwEmkKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQOIMbBhYj5+i+WdiIxxCEpFyNCJMHy/XsVdxiwde9Vr4xIECgIIARgCEhUKDwoHYmFzZWNybxIENTAwMBDAmgwaQAcxK9xk6r69gmz+1UWaCnYxNuXPXZdp59YcqKPJE5d6fp+IICTBOwd2rs8MiApcf8kNSrbZ6oECxcGQAdxF0SI=\"}")
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/dydx/TestDydxAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/dydx/TestDydxAddress.kt
new file mode 100644
index 00000000000..408f8fb4ae3
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/dydx/TestDydxAddress.kt
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.dydx
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestDydxAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433".toHexByteArray())
+        val pubKey = key.getPublicKeySecp256k1(true)
+        val address = AnyAddress(pubKey, CoinType.DYDX)
+        val expected = AnyAddress("dydx1mry47pkga5tdswtluy0m8teslpalkdq0hc72uz", CoinType.DYDX)
+
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/elrond/TestElrondAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/elrond/TestElrondAddress.kt
deleted file mode 100644
index e8304e3deeb..00000000000
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/elrond/TestElrondAddress.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-package com.trustwallet.core.app.blockchains.elrond
-
-import com.trustwallet.core.app.utils.toHex
-import com.trustwallet.core.app.utils.toHexByteArray
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import wallet.core.jni.*
-
-class TestElrondAddress {
-
-    init {
-        System.loadLibrary("TrustWalletCore")
-    }
-
-    private var aliceBech32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
-    private var alicePubKeyHex = "0x0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1"
-    private var aliceSeedHex = "0x413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"
-
-    @Test
-    fun testAddressFromPrivateKey() {
-        val key = PrivateKey(aliceSeedHex.toHexByteArray())
-        val pubKey = key.publicKeyEd25519
-        val address = AnyAddress(pubKey, CoinType.ELROND)
-
-        assertEquals(alicePubKeyHex, pubKey.data().toHex())
-        assertEquals(aliceBech32, address.description())
-    }
-
-    @Test
-    fun testAddressFromPublicKey() {
-        val pubKey = PublicKey(alicePubKeyHex.toHexByteArray(), PublicKeyType.ED25519)
-        val address = AnyAddress(pubKey, CoinType.ELROND)
-
-        assertEquals(aliceBech32, address.description())
-    }
-
-    @Test
-    fun testAddressFromString() {
-        val address = AnyAddress(aliceBech32, CoinType.ELROND)
-        
-        assertEquals(aliceBech32, address.description())
-    }
-}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/elrond/TestElrondSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/elrond/TestElrondSigner.kt
deleted file mode 100644
index a99a949bdb4..00000000000
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/elrond/TestElrondSigner.kt
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-package com.trustwallet.core.app.blockchains.elrond
-
-import com.google.protobuf.ByteString
-import com.trustwallet.core.app.utils.toHexByteArray
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import wallet.core.java.AnySigner
-import wallet.core.jni.CoinType
-import wallet.core.jni.PrivateKey
-import wallet.core.jni.proto.Elrond
-
-class TestElrondSigner {
-
-    init {
-        System.loadLibrary("TrustWalletCore")
-    }
-
-    private var aliceBech32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
-    private var aliceSeedHex = "0x413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"
-    private var bobBech32 = "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx"
-   
-    @Test
-    fun signGenericAction() {
-        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
-
-        val accounts = Elrond.Accounts.newBuilder()
-            .setSenderNonce(7)
-            .setSender(aliceBech32)
-            .setReceiver(bobBech32)
-            .build()
-
-        val genericAction = Elrond.GenericAction.newBuilder()
-            .setAccounts(accounts)
-            .setValue("0")
-            .setData("foo")
-            .setVersion(1)
-            .build()
-
-        val signingInput = Elrond.SigningInput.newBuilder()
-            .setGenericAction(genericAction)
-            .setGasPrice(1000000000)
-            .setGasLimit(50000)
-            .setChainId("1")
-            .setPrivateKey(privateKey)
-            .build()
-
-        val output = AnySigner.sign(signingInput, CoinType.ELROND, Elrond.SigningOutput.parser())
-        val expectedSignature = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700"
-
-        assertEquals(expectedSignature, output.signature)
-        assertEquals("""{"nonce":7,"value":"0","receiver":"$bobBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"$expectedSignature"}""", output.encoded)
-    }
-
-    @Test
-    fun signEGLDTransfer() {
-        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
-
-        val accounts = Elrond.Accounts.newBuilder()
-            .setSenderNonce(7)
-            .setSender(aliceBech32)
-            .setReceiver(bobBech32)
-            .build()
-
-        val transfer = Elrond.EGLDTransfer.newBuilder()
-            .setAccounts(accounts)
-            .setAmount("1000000000000000000")
-            .build()
-
-        val signingInput = Elrond.SigningInput.newBuilder()
-            .setEgldTransfer(transfer)
-            .setChainId("1")
-            .setPrivateKey(privateKey)
-            .build()
-
-        val output = AnySigner.sign(signingInput, CoinType.ELROND, Elrond.SigningOutput.parser())
-        val expectedSignature = "7e1c4c63b88ea72dcf7855a54463b1a424eb357ac3feb4345221e512ce07c7a50afb6d7aec6f480b554e32cf2037082f3bc17263d1394af1f3ef240be53c930b"
-
-        assertEquals(expectedSignature, output.signature)
-        assertEquals("""{"nonce":7,"value":"1000000000000000000","receiver":"$bobBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1,"signature":"$expectedSignature"}""", output.encoded)
-    }
-
-    @Test
-    fun signESDTTransfer() {
-        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
-
-        val accounts = Elrond.Accounts.newBuilder()
-            .setSenderNonce(7)
-            .setSender(aliceBech32)
-            .setReceiver(bobBech32)
-            .build()
-
-        val transfer = Elrond.ESDTTransfer.newBuilder()
-            .setAccounts(accounts)
-            .setTokenIdentifier("MYTOKEN-1234")
-            .setAmount("10000000000000")
-            .build()
-
-        val signingInput = Elrond.SigningInput.newBuilder()
-            .setEsdtTransfer(transfer)
-            .setChainId("1")
-            .setPrivateKey(privateKey)
-            .build()
-
-        val output = AnySigner.sign(signingInput, CoinType.ELROND, Elrond.SigningOutput.parser())
-        val expectedSignature = "9add6d9ac3f1a1fddb07b934e8a73cad3b8c232bdf29d723c1b38ad619905f03e864299d06eb3fe3bbb48a9f1d9b7f14e21dc5eaffe0c87f5718ad0c4198bb0c"
-        val expectedData = "RVNEVFRyYW5zZmVyQDRkNTk1NDRmNGI0NTRlMmQzMTMyMzMzNEAwOTE4NGU3MmEwMDA="
-
-        assertEquals(expectedSignature, output.signature)
-        assertEquals("""{"nonce":7,"value":"0","receiver":"$bobBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":425000,"data":"$expectedData","chainID":"1","version":1,"signature":"$expectedSignature"}""", output.encoded)
-    }
-
-    @Test
-    fun signESDTNFTTransfer() {
-        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
-
-        val accounts = Elrond.Accounts.newBuilder()
-            .setSenderNonce(7)
-            .setSender(aliceBech32)
-            .setReceiver(bobBech32)
-            .build()
-
-        val transfer = Elrond.ESDTNFTTransfer.newBuilder()
-            .setAccounts(accounts)
-            .setTokenCollection("LKMEX-aab910")
-            .setTokenNonce(4)
-            .setAmount("184300000000000000")
-            .build()
-
-        val signingInput = Elrond.SigningInput.newBuilder()
-            .setEsdtnftTransfer(transfer)
-            .setChainId("1")
-            .setPrivateKey(privateKey)
-            .build()
-
-        val output = AnySigner.sign(signingInput, CoinType.ELROND, Elrond.SigningOutput.parser())
-        val expectedSignature = "cc935685d5b31525e059a16a832cba98dee751983a5a93de4198f6553a2c55f5f1e0b4300fe9077376fa754546da0b0f6697e66462101a209aafd0fc775ab60a"
-        val expectedData = "RVNEVE5GVFRyYW5zZmVyQDRjNGI0ZDQ1NTgyZDYxNjE2MjM5MzEzMEAwNEAwMjhlYzNkZmEwMWFjMDAwQDgwNDlkNjM5ZTVhNjk4MGQxY2QyMzkyYWJjY2U0MTAyOWNkYTc0YTE1NjM1MjNhMjAyZjA5NjQxY2MyNjE4Zjg="
-
-        assertEquals(expectedSignature, output.signature)
-        assertEquals("""{"nonce":7,"value":"0","receiver":"$aliceBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":937500,"data":"$expectedData","chainID":"1","version":1,"signature":"$expectedSignature"}""", output.encoded)
-    }
-}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/eos/TestEOSSigning.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/eos/TestEOSSigning.kt
index 27fb4ce0b11..d5d073b1840 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/eos/TestEOSSigning.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/eos/TestEOSSigning.kt
@@ -82,7 +82,7 @@ class TestEOSSigning {
         val signatureValue: String = signatures.get(0) as String;
         assertNotNull("Error parsing JSON result", signatureValue)
         assertEquals(
-            "SIG_K1_KfCdjsrTnx5cBpbA5cUdHZAsRYsnC9uKzuS1shFeqfMCfdZwX4PBm9pfHwGRT6ffz3eavhtkyNci5GoFozQAx8P8PBnDmj",
+            "SIG_K1_K9RdLC7DEDWjTfR64GU8BtDHcAjzR1ntcT651JMcfHNTpdsvDrUwfyzF1FkvL9fxEi2UCtGJZ9zYoNbJoMF1fbU64cRiJ7",
             signatureValue
         )
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestBarz.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestBarz.kt
new file mode 100644
index 00000000000..235cd442b73
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestBarz.kt
@@ -0,0 +1,229 @@
+package com.trustwallet.core.app.blockchains.ethereum
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.CoinType.ETHEREUM
+import wallet.core.jni.proto.Ethereum
+import wallet.core.jni.EthereumAbi
+import wallet.core.jni.EthereumAbiFunction
+import wallet.core.jni.proto.Ethereum.SigningOutput
+import wallet.core.jni.proto.Ethereum.TransactionMode
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.PublicKey
+import wallet.core.jni.PublicKeyType
+import com.trustwallet.core.app.utils.Numeric
+import org.junit.Assert.assertArrayEquals
+import wallet.core.jni.proto.Barz
+import wallet.core.jni.Barz as WCBarz
+
+class TestBarz {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    // https://testnet.bscscan.com/tx/0x6c6e1fe81c722c0abce1856b9b4e078ab2cad06d51f2d1b04945e5ba2286d1b4
+    @Test
+    fun testInitCode() {
+        val factoryAddress = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800"
+        val publicKeyData = Numeric.hexStringToByteArray("04e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b02")
+        val publicKey = PublicKey(publicKeyData, PublicKeyType.NIST256P1EXTENDED)
+        val verificationFacet = "0x6BF22ff186CC97D88ECfbA47d1473a234CEBEFDf"
+        val result = WCBarz.getInitCode(factoryAddress, publicKey, verificationFacet, 0)
+        assertEquals(Numeric.toHexString(result), "0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000006bf22ff186cc97d88ecfba47d1473a234cebefdf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b0200000000000000000000000000000000000000000000000000000000000000")
+    }
+
+    @Test
+    fun testInitCodeNonZeroSalt() {
+        val factoryAddress = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800"
+        val publicKeyData = Numeric.hexStringToByteArray("04e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b02")
+        val publicKey = PublicKey(publicKeyData, PublicKeyType.NIST256P1EXTENDED)
+        val verificationFacet = "0x6BF22ff186CC97D88ECfbA47d1473a234CEBEFDf"
+        val salt = 1
+        val result = WCBarz.getInitCode(factoryAddress, publicKey, verificationFacet, salt)
+        assertEquals(Numeric.toHexString(result), "0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000006bf22ff186cc97d88ecfba47d1473a234cebefdf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004104e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b0200000000000000000000000000000000000000000000000000000000000000")
+    }
+
+    @Test
+    fun testCounterfactualAddress() {
+        val input = Barz.ContractAddressInput.newBuilder()
+        input.apply {
+            factory = "0x2c97f4a366Dd5D91178ec9E36c5C1fcA393A538C"
+            accountFacet = "0x3322C04EAe11B9b14c6c289f2668b6f07071b591"
+            verificationFacet = "0x90A6fE0A938B0d4188e9013C99A0d7D9ca6bFB63"
+            entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+            facetRegistry = "0xFd1A8170c12747060324D9079a386BD4290e6f93"
+            defaultFallback = "0x22eB0720d9Fc4bC90BB812B309e939880B71c20d"
+            bytecode = "0x608060405260405162003cc638038062003cc68339818101604052810190620000299190620019ad565b60008673ffffffffffffffffffffffffffffffffffffffff16633253960f6040518163ffffffff1660e01b81526004016020604051808303816000875af115801562000079573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200009f919062001aec565b9050600060e01b817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603620000fe576040517f5a5b4d3900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000600267ffffffffffffffff8111156200011e576200011d6200196b565b5b6040519080825280602002602001820160405280156200015b57816020015b62000147620018ff565b8152602001906001900390816200013d5790505b5090506000600167ffffffffffffffff8111156200017e576200017d6200196b565b5b604051908082528060200260200182016040528015620001ad5781602001602082028036833780820191505090505b5090506000600167ffffffffffffffff811115620001d057620001cf6200196b565b5b604051908082528060200260200182016040528015620001ff5781602001602082028036833780820191505090505b509050631f931c1c60e01b8260008151811062000221576200022062001b21565b5b60200260200101907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152505060405180606001604052808d73ffffffffffffffffffffffffffffffffffffffff16815260200160006002811115620002ab57620002aa62001b37565b5b81526020018381525083600081518110620002cb57620002ca62001b21565b5b60200260200101819052508381600081518110620002ee57620002ed62001b21565b5b60200260200101907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152505060405180606001604052808b73ffffffffffffffffffffffffffffffffffffffff1681526020016000600281111562000378576200037762001b37565b5b8152602001828152508360018151811062000398576200039762001b21565b5b6020026020010181905250620003b9846200047e60201b620001671760201c565b6200046c838c8b8e8e8d8d8d8d604051602401620003de979695949392919062001b8c565b6040516020818303038152906040527f95a21aec000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050620004b060201b620001911760201c565b5050505050505050505050506200211f565b806200048f6200073460201b60201c565b60010160016101000a81548163ffffffff021916908360e01c021790555050565b60005b8351811015620006df576000848281518110620004d557620004d462001b21565b5b602002602001015160200151905060006002811115620004fa57620004f962001b37565b5b81600281111562000510576200050f62001b37565b5b0362000570576200056a85838151811062000530576200052f62001b21565b5b60200260200101516000015186848151811062000552576200055162001b21565b5b6020026020010151604001516200073960201b60201c565b620006c8565b6001600281111562000587576200058662001b37565b5b8160028111156200059d576200059c62001b37565b5b03620005fd57620005f7858381518110620005bd57620005bc62001b21565b5b602002602001015160000151868481518110620005df57620005de62001b21565b5b602002602001015160400151620009db60201b60201c565b620006c7565b60028081111562000613576200061262001b37565b5b81600281111562000629576200062862001b37565b5b0362000689576200068385838151811062000649576200064862001b21565b5b6020026020010151600001518684815181106200066b576200066a62001b21565b5b60200260200101516040015162000c8f60201b60201c565b620006c6565b6040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620006bd9062001be7565b60405180910390fd5b5b5b508080620006d69062001c61565b915050620004b3565b507f8faa70878671ccd212d20771b795c50af8fd3ff6cf27f4bde57e5d4de0aeb673838383604051620007159392919062001c82565b60405180910390a16200072f828262000e3760201b60201c565b505050565b600090565b600081511162000780576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007779062001d97565b60405180910390fd5b60006200079262000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160362000806576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007fd9062001dfb565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff16036200087c576200087b828562000f9860201b60201c565b5b60005b8351811015620009d4576000848281518110620008a157620008a062001b21565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161462000998576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200098f9062001e5f565b60405180910390fd5b620009ac8583868a6200107c60201b60201c565b8380620009b99062001ec3565b94505050508080620009cb9062001c61565b9150506200087f565b5050505050565b600081511162000a22576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000a199062001d97565b60405180910390fd5b600062000a3462000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160362000aa8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000a9f9062001dfb565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff160362000b1e5762000b1d828562000f9860201b60201c565b5b60005b835181101562000c8857600084828151811062000b435762000b4262001b21565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff160362000c39576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000c309062001eef565b60405180910390fd5b62000c4c8582846200122960201b60201c565b62000c608583868a6200107c60201b60201c565b838062000c6d9062001ec3565b9450505050808062000c7f9062001c61565b91505062000b21565b5050505050565b600081511162000cd6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000ccd9062001d97565b60405180910390fd5b600062000ce862000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161462000d5c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000d539062001f53565b60405180910390fd5b60005b825181101562000e3157600083828151811062000d815762000d8062001b21565b5b602002602001015190506000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905062000e198482846200122960201b60201c565b5050808062000e289062001c61565b91505062000d5f565b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16031562000f675762000e988260405180606001604052806028815260200162003c7a60289139620018aa60201b60201c565b6000808373ffffffffffffffffffffffffffffffffffffffff168360405162000ec2919062001fb7565b600060405180830381855af49150503d806000811462000eff576040519150601f19603f3d011682016040523d82523d6000602084013e62000f04565b606091505b50915091508162000f645760008151111562000f235780518082602001fd5b83836040517f192105d700000000000000000000000000000000000000000000000000000000815260040162000f5b92919062001fd7565b60405180910390fd5b50505b5050565b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f90508091505090565b62000fc38160405180606001604052806024815260200162003ca260249139620018aa60201b60201c565b81600201805490508260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018190555081600201819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b81846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508360010160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018390806001815401808255809150506001900390600052602060002090600891828204019190066004029091909190916101000a81548163ffffffff021916908360e01c021790555080846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036200129b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620012929062002003565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036200130c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620013039062002067565b60405180910390fd5b6000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160149054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff169050600060018560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000180549050620013e59190620020cb565b9050808214620015805760008560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000182815481106200144a576200144962001b21565b5b90600052602060002090600891828204019190066004029054906101000a900460e01b9050808660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018481548110620014c957620014c862001b21565b5b90600052602060002090600891828204019190066004026101000a81548163ffffffff021916908360e01c021790555082866000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550505b8460010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001805480620015d757620015d6620020ec565b5b60019003818190600052602060002090600891828204019190066004026101000a81549063ffffffff02191690559055846000016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000820160146101000a8154906bffffffffffffffffffffffff0219169055505060008103620018a357600060018660020180549050620016c49190620020cb565b905060008660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015490508181146200180c57600087600201838154811062001732576200173162001b21565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508088600201838154811062001779576200177862001b21565b5b9060005260206000200160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550818860010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060010181905550505b86600201805480620018235762001822620020ec565b5b6001900381819060005260206000200160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905590558660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001016000905550505b5050505050565b6000823b9050600081118290620018f9576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620018f0919062002102565b60405180910390fd5b50505050565b6040518060600160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600060028111156200193e576200193d62001b37565b5b8152602001606081525090565b60008151905060018060a01b03811681146200196657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620019a157808201518184015260208101905062001984565b50600083830152505050565b600080600080600080600080610100898b031215620019cb57600080fd5b620019d6896200194b565b9750620019e660208a016200194b565b9650620019f660408a016200194b565b955062001a0660608a016200194b565b945062001a1660808a016200194b565b935062001a2660a08a016200194b565b925062001a3660c08a016200194b565b915060e089015160018060401b038082111562001a5257600080fd5b818b0191508b601f83011262001a6757600080fd5b81518181111562001a7d5762001a7c6200196b565b5b601f1960405181603f83601f860116011681019150808210848311171562001aaa5762001aa96200196b565b5b816040528281528e602084870101111562001ac457600080fd5b62001ad783602083016020880162001981565b80955050505050509295985092959890939650565b60006020828403121562001aff57600080fd5b815163ffffffff60e01b8116811462001b1757600080fd5b8091505092915050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052602160045260246000fd5b60018060a01b03811682525050565b6000815180845262001b7681602086016020860162001981565b6020601f19601f83011685010191505092915050565b600060018060a01b03808a168352808916602084015280881660408401528087166060840152808616608084015280851660a08401525060e060c083015262001bd960e083018462001b5c565b905098975050505050505050565b60208152602760208201527f4c69624469616d6f6e644375743a20496e636f7272656374204661636574437560408201527f74416374696f6e0000000000000000000000000000000000000000000000000060608201526000608082019050919050565b634e487b7160e01b600052601160045260246000fd5b60008019820362001c775762001c7662001c4b565b5b600182019050919050565b60006060808301818452808751808352608092508286019150828160051b8701016020808b0160005b8481101562001d6357607f198a8503018652815188850160018060a01b038251168652848201516003811062001cf157634e487b7160e01b600052602160045260246000fd5b80868801525060408083015192508a81880152508082518083528a880191508684019350600092505b8083101562001d465763ffffffff60e01b84511682528682019150868401935060018301925062001d1a565b508096505050508282019150828601955060018101905062001cab565b505062001d738189018b62001b4d565b50868103604088015262001d88818962001b5c565b95505050505050949350505050565b60208152602b60208201527f4c69624469616d6f6e644375743a204e6f2073656c6563746f727320696e206660408201527f6163657420746f2063757400000000000000000000000000000000000000000060608201526000608082019050919050565b60208152602c60208201527f4c69624469616d6f6e644375743a204164642066616365742063616e2774206260408201527f652061646472657373283029000000000000000000000000000000000000000060608201526000608082019050919050565b60208152603560208201527f4c69624469616d6f6e644375743a2043616e2774206164642066756e6374696f60408201527f6e207468617420616c726561647920657869737473000000000000000000000060608201526000608082019050919050565b600060018060601b0380831681810362001ee25762001ee162001c4b565b5b6001810192505050919050565b60208152603860208201527f4c69624469616d6f6e644375743a2043616e2774207265706c6163652066756e60408201527f6374696f6e20776974682073616d652066756e6374696f6e000000000000000060608201526000608082019050919050565b60208152603660208201527f4c69624469616d6f6e644375743a2052656d6f7665206661636574206164647260408201527f657373206d75737420626520616464726573732830290000000000000000000060608201526000608082019050919050565b6000825162001fcb81846020870162001981565b80830191505092915050565b60018060a01b038316815260406020820152600062001ffa604083018462001b5c565b90509392505050565b60208152603760208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f76652066756e6360408201527f74696f6e207468617420646f65736e277420657869737400000000000000000060608201526000608082019050919050565b60208152602e60208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f766520696d6d7560408201527f7461626c652066756e6374696f6e00000000000000000000000000000000000060608201526000608082019050919050565b6000828203905081811115620020e657620020e562001c4b565b5b92915050565b634e487b7160e01b600052603160045260246000fd5b60208152600062002117602083018462001b5c565b905092915050565b611b4b806200212f6000396000f3fe60806040523661000b57005b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f9050809150600082600001600080357fffffffff00000000000000000000000000000000000000000000000000000000167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610141576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610138906114d3565b60405180910390fd5b3660008037600080366000845af43d6000803e8060008114610162573d6000f35b3d6000fd5b806101706103c0565b60010160016101000a81548163ffffffff021916908360e01c021790555050565b60005b83518110156103755760008482815181106101b2576101b1611510565b5b6020026020010151602001519050600060028111156101d4576101d3611526565b5b8160028111156101e7576101e6611526565b5b036102375761023285838151811061020257610201611510565b5b60200260200101516000015186848151811061022157610220611510565b5b6020026020010151604001516103c5565b610361565b6001600281111561024b5761024a611526565b5b81600281111561025e5761025d611526565b5b036102ae576102a985838151811061027957610278611510565b5b60200260200101516000015186848151811061029857610297611510565b5b60200260200101516040015161063c565b610360565b6002808111156102c1576102c0611526565b5b8160028111156102d4576102d3611526565b5b036103245761031f8583815181106102ef576102ee611510565b5b60200260200101516000015186848151811061030e5761030d611510565b5b6020026020010151604001516108bd565b61035f565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103569061153c565b60405180910390fd5b5b5b50808061036d906115b6565b915050610194565b507f8faa70878671ccd212d20771b795c50af8fd3ff6cf27f4bde57e5d4de0aeb6738383836040516103a99392919061163b565b60405180910390a16103bb8282610a48565b505050565b600090565b6000815111610409576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161040090611747565b60405180910390fd5b6000610413610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610484576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161047b906117ab565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff16036104f1576104f08285610b97565b5b60005b835181101561063557600084828151811061051257610511611510565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614610606576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105fd9061180f565b60405180910390fd5b6106128583868a610c72565b838061061d90611873565b9450505050808061062d906115b6565b9150506104f4565b5050505050565b6000815111610680576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161067790611747565b60405180910390fd5b600061068a610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036106fb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106f2906117ab565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff1603610768576107678285610b97565b5b60005b83518110156108b657600084828151811061078957610788611510565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff160361087c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610873906118a2565b60405180910390fd5b610887858284610e1f565b6108938583868a610c72565b838061089e90611873565b945050505080806108ae906115b6565b91505061076b565b5050505050565b6000815111610901576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108f890611747565b60405180910390fd5b600061090b610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161461097c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161097390611906565b60405180910390fd5b60005b8251811015610a4257600083828151811061099d5761099c611510565b5b602002602001015190506000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050610a2d848284610e1f565b50508080610a3a906115b6565b91505061097f565b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160315610b6657610a9f82604051806060016040528060288152602001611aca60289139611481565b6000808373ffffffffffffffffffffffffffffffffffffffff1683604051610ac7919061196a565b600060405180830381855af49150503d8060008114610b02576040519150601f19603f3d011682016040523d82523d6000602084013e610b07565b606091505b509150915081610b6357600081511115610b245780518082602001fd5b83836040517f192105d7000000000000000000000000000000000000000000000000000000008152600401610b5a929190611988565b60405180910390fd5b50505b5050565b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f90508091505090565b610bb981604051806060016040528060248152602001611af260249139611481565b81600201805490508260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018190555081600201819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b81846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508360010160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018390806001815401808255809150506001900390600052602060002090600891828204019190066004029091909190916101000a81548163ffffffff021916908360e01c021790555080846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610e8e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e85906119b2565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610efc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610ef390611a16565b60405180910390fd5b6000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160149054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff169050600060018560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000180549050610fd39190611a7a565b90508082146111675760008560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001828154811061103457611033611510565b5b90600052602060002090600891828204019190066004029054906101000a900460e01b9050808660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000184815481106110b0576110af611510565b5b90600052602060002090600891828204019190066004026101000a81548163ffffffff021916908360e01c021790555082866000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550505b8460010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054806111bb576111ba611a98565b5b60019003818190600052602060002090600891828204019190066004026101000a81549063ffffffff02191690559055846000016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000820160146101000a8154906bffffffffffffffffffffffff021916905550506000810361147a576000600186600201805490506112a59190611a7a565b905060008660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015490508181146113e657600087600201838154811061130f5761130e611510565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508088600201838154811061135357611352611510565b5b9060005260206000200160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550818860010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060010181905550505b866002018054806113fa576113f9611a98565b5b6001900381819060005260206000200160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905590558660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001016000905550505b5050505050565b6000823b90506000811182906114cd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114c49190611aae565b60405180910390fd5b50505050565b602081526020808201527f4469616d6f6e643a2046756e6374696f6e20646f6573206e6f7420657869737460408201526000606082019050919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052602160045260246000fd5b60208152602760208201527f4c69624469616d6f6e644375743a20496e636f7272656374204661636574437560408201527f74416374696f6e0000000000000000000000000000000000000000000000000060608201526000608082019050919050565b634e487b7160e01b600052601160045260246000fd5b6000801982036115c9576115c86115a0565b5b600182019050919050565b60018060a01b03811682525050565b60005b838110156116015780820151818401526020810190506115e6565b50600083830152505050565b600081518084526116258160208601602086016115e3565b6020601f19601f83011685010191505092915050565b60006060808301818452808751808352608092508286019150828160051b8701016020808b0160005b8481101561171757607f198a8503018652815188850160018060a01b03825116865284820151600381106116a857634e487b7160e01b600052602160045260246000fd5b80868801525060408083015192508a81880152508082518083528a880191508684019350600092505b808310156116fb5763ffffffff60e01b8451168252868201915086840193506001830192506116d1565b5080965050505082820191508286019550600181019050611664565b50506117258189018b6115d4565b508681036040880152611738818961160d565b95505050505050949350505050565b60208152602b60208201527f4c69624469616d6f6e644375743a204e6f2073656c6563746f727320696e206660408201527f6163657420746f2063757400000000000000000000000000000000000000000060608201526000608082019050919050565b60208152602c60208201527f4c69624469616d6f6e644375743a204164642066616365742063616e2774206260408201527f652061646472657373283029000000000000000000000000000000000000000060608201526000608082019050919050565b60208152603560208201527f4c69624469616d6f6e644375743a2043616e2774206164642066756e6374696f60408201527f6e207468617420616c726561647920657869737473000000000000000000000060608201526000608082019050919050565b60006bffffffffffffffffffffffff808316818103611895576118946115a0565b5b6001810192505050919050565b60208152603860208201527f4c69624469616d6f6e644375743a2043616e2774207265706c6163652066756e60408201527f6374696f6e20776974682073616d652066756e6374696f6e000000000000000060608201526000608082019050919050565b60208152603660208201527f4c69624469616d6f6e644375743a2052656d6f7665206661636574206164647260408201527f657373206d75737420626520616464726573732830290000000000000000000060608201526000608082019050919050565b6000825161197c8184602087016115e3565b80830191505092915050565b60018060a01b03831681526040602082015260006119a9604083018461160d565b90509392505050565b60208152603760208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f76652066756e6360408201527f74696f6e207468617420646f65736e277420657869737400000000000000000060608201526000608082019050919050565b60208152602e60208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f766520696d6d7560408201527f7461626c652066756e6374696f6e00000000000000000000000000000000000060608201526000608082019050919050565b6000828203905081811115611a9257611a916115a0565b5b92915050565b634e487b7160e01b600052603160045260246000fd5b602081526000611ac1602083018461160d565b90509291505056fe4c69624469616d6f6e644375743a205f696e6974206164647265737320686173206e6f20636f64654c69624469616d6f6e644375743a204e657720666163657420686173206e6f20636f6465a264697066735822122045b771fb2128a1a34c5b052e9a86464933844b34929cf0d65bbea6a4e76e3b2764736f6c634300081200334c69624469616d6f6e644375743a205f696e6974206164647265737320686173206e6f20636f64654c69624469616d6f6e644375743a204e657720666163657420686173206e6f20636f6465"
+            publicKey = "0xB5547FBdC56DCE45e1B8ef75569916D438e09c46"
+        }
+        val result = WCBarz.getCounterfactualAddress(input.build().toByteArray())
+        assertEquals(result, "0x77F62bb3E43190253D4E198199356CD2b25063cA")
+    }
+
+    @Test
+    fun testCounterfactualAddressNonZeroSalt() {
+        val input = Barz.ContractAddressInput.newBuilder()
+        input.apply {
+            factory = "0x96C489979E39F877BDb8637b75A25C1a5B2DE14C"
+            accountFacet = "0xF6F5e5fC74905e65e3FF53c6BacEba8535dd14d1"
+            verificationFacet = "0xaB84813cbf26Fd951CB3d7E33Dccb8995027e490"
+            entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+            facetRegistry = "0x9a95d201BB8F559771784D12c01F8084278c65E5"
+            defaultFallback = "0x522cDc7558b5f798dF5D61AB09B6D95Ebd342EF9"
+            bytecode = "0x60806040526040516104c83803806104c883398101604081905261002291610163565b6000858585858560405160240161003d959493929190610264565b60408051601f198184030181529181526020820180516001600160e01b0316634a93641760e01b1790525190915060009081906001600160a01b038a16906100869085906102c3565b600060405180830381855af49150503d80600081146100c1576040519150601f19603f3d011682016040523d82523d6000602084013e6100c6565b606091505b50915091508115806100e157506100dc816102df565b600114155b156100ff57604051636ff35f8960e01b815260040160405180910390fd5b505050505050505050610306565b80516001600160a01b038116811461012457600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b8381101561015a578181015183820152602001610142565b50506000910152565b60008060008060008060c0878903121561017c57600080fd5b6101858761010d565b95506101936020880161010d565b94506101a16040880161010d565b93506101af6060880161010d565b92506101bd6080880161010d565b60a08801519092506001600160401b03808211156101da57600080fd5b818901915089601f8301126101ee57600080fd5b81518181111561020057610200610129565b604051601f8201601f19908116603f0116810190838211818310171561022857610228610129565b816040528281528c602084870101111561024157600080fd5b61025283602083016020880161013f565b80955050505050509295509295509295565b600060018060a01b0380881683528087166020840152808616604084015280851660608401525060a0608083015282518060a08401526102ab8160c085016020870161013f565b601f01601f19169190910160c0019695505050505050565b600082516102d581846020870161013f565b9190910192915050565b80516020808301519190811015610300576000198160200360031b1b821691505b50919050565b6101b3806103156000396000f3fe60806040523661000b57005b600080356001600160e01b03191681527f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f6020819052604090912054819060601c806100cf576004838101546040516366ffd66360e11b81526000356001600160e01b031916928101929092526001600160a01b03169063cdffacc690602401602060405180830381865afa1580156100a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100cc919061014d565b90505b6001600160a01b0381166101295760405162461bcd60e51b815260206004820152601d60248201527f4261727a3a2046756e6374696f6e20646f6573206e6f74206578697374000000604482015260640160405180910390fd5b3660008037600080366000845af43d6000803e808015610148573d6000f35b3d6000fd5b60006020828403121561015f57600080fd5b81516001600160a01b038116811461017657600080fd5b939250505056fea2646970667358221220d35db061bb6ecdb7688c3674af669ce44d527cae4ded59214d06722d73da62be64736f6c63430008120033"
+            publicKey = "0xB5547FBdC56DCE45e1B8ef75569916D438e09c46"
+            salt = 123456
+        }
+        val result = WCBarz.getCounterfactualAddress(input.build().toByteArray())
+        assertEquals(result, "0xB91aaa96B138A1B1D94c9df4628187132c5F2bf1")
+    }
+
+    @Test
+    fun testGetFormattedSignature() {
+        val signature = Numeric.hexStringToByteArray("0x3044022012d89e3b41e253dc9e90bd34dc1750d059b76d0b1d16af2059aa26e90b8960bf0220256d8a05572c654906ce422464693e280e243e6d9dbc5f96a681dba846bca276")
+        val challenge = Numeric.hexStringToByteArray("0xcf267a78c5adaf96f341a696eb576824284c572f3e61be619694d539db1925f9")
+        val authenticatorData = Numeric.hexStringToByteArray("0x1a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d00000000")
+        val clientDataJSON = "{\"type\":\"webauthn.get\",\"challenge\":\"zyZ6eMWtr5bzQaaW61doJChMVy8-Yb5hlpTVOdsZJfk\",\"origin\":\"https://trustwallet.com\"}"
+        val result = WCBarz.getFormattedSignature(signature, challenge, authenticatorData, clientDataJSON)
+        assertEquals(Numeric.toHexString(result), "0x12d89e3b41e253dc9e90bd34dc1750d059b76d0b1d16af2059aa26e90b8960bf256d8a05572c654906ce422464693e280e243e6d9dbc5f96a681dba846bca27600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000251a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000247b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a22000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025222c226f726967696e223a2268747470733a2f2f747275737477616c6c65742e636f6d227d000000000000000000000000000000000000000000000000000000")
+    }
+
+    // https://testnet.bscscan.com/tx/0x43fc13dfdf06bbb09da8ce070953753764f1e43782d0c8b621946d8b45749419
+    @Test
+    fun testSignK1TransferAccountDeployed() {
+        val signingInput = Ethereum.SigningInput.newBuilder()
+        signingInput.apply {
+            privateKey = ByteString.copyFrom(PrivateKey("3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483".toHexByteArray()).data())
+            chainId = ByteString.copyFrom("0x61".toHexByteArray())
+            nonce = ByteString.copyFrom("0x2".toHexByteArray())
+            toAddress = "0x61061fCAE11fD5461535e134EfF67A98CFFF44E9"
+            txMode = TransactionMode.UserOp
+
+            gasLimit = ByteString.copyFrom("0x0186A0".toHexByteArray())
+            maxFeePerGas = ByteString.copyFrom("0x01a339c9e9".toHexByteArray())
+            maxInclusionFeePerGas = ByteString.copyFrom("0x01a339c9e9".toHexByteArray())
+
+            userOperation = Ethereum.UserOperation.newBuilder().apply {
+                entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+                sender = "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f"
+                preVerificationGas = ByteString.copyFrom("0xb708".toHexByteArray())
+                verificationGasLimit = ByteString.copyFrom("0x0186a0".toHexByteArray())
+            }.build()
+
+            transaction = Ethereum.Transaction.newBuilder().apply {
+                transfer = Ethereum.Transaction.Transfer.newBuilder().apply {
+                    amount = ByteString.copyFrom("0x2386f26fc10000".toHexByteArray())
+                }.build()
+            }.build()
+        }
+
+        val output = AnySigner.sign(signingInput.build(), ETHEREUM, SigningOutput.parser())
+
+        assertEquals(Numeric.toHexString(output.preHash.toByteArray()), "0x2d37191a8688f69090451ed90a0a9ba69d652c2062ee9d023b3ebe964a3ed2ae");
+
+        assertEquals(output.encoded.toStringUtf8(), "{\"callData\":\"0xb61d27f600000000000000000000000061061fcae11fd5461535e134eff67a98cfff44e9000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"100000\",\"initCode\":\"0x\",\"maxFeePerGas\":\"7033440745\",\"maxPriorityFeePerGas\":\"7033440745\",\"nonce\":\"2\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"46856\",\"sender\":\"0xb16Db98B365B1f89191996942612B14F1Da4Bd5f\",\"signature\":\"0x80e84992ebf8d5f71180231163ed150a7557ed0aa4b4bcee23d463a09847e4642d0fbf112df2e5fa067adf4b2fa17fc4a8ac172134ba5b78e3ec9c044e7f28d71c\",\"verificationGasLimit\":\"100000\"}");
+    }
+
+    // https://testnet.bscscan.com/tx/0xea1f5cddc0653e116327cbcb3bc770360a642891176eff2ec69c227e46791c31
+    @Test
+    fun testSignR1TransferAccountNotDeployed() {
+        val factoryAddress = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800"
+        val attestationObject = "0xa363666d74646e6f6e656761747453746d74a068617574684461746158981a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e075d00000000000000000000000000000000000000000014c14f8a2dfd8f451581fad6e4e1c11821abcaacd6a5010203262001215820b173a6a812025c40c38bac46343646bd0a8137c807aae6e04aac238cc24d2ad2225820116ca14d23d357588ff2aabd7db29d5976f4ecc8037775db86f67e873a306b1f"
+        val verificationFacet = "0x5034534Efe9902779eD6eA6983F435c00f3bc510"
+        val publicKey = WebAuthn.getPublicKey(attestationObject.toHexByteArray())
+
+        val signingInput = Ethereum.SigningInput.newBuilder()
+        signingInput.apply {
+            privateKey = ByteString.copyFrom(PrivateKey("3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483".toHexByteArray()).data())
+            chainId = ByteString.copyFrom("0x61".toHexByteArray())
+            nonce = ByteString.copyFrom("0x00".toHexByteArray())
+            toAddress = "0x61061fCAE11fD5461535e134EfF67A98CFFF44E9"
+            txMode = TransactionMode.UserOp
+
+            gasLimit = ByteString.copyFrom("0x2625A0".toHexByteArray())
+            maxFeePerGas = ByteString.copyFrom("0x01a339c9e9".toHexByteArray())
+            maxInclusionFeePerGas = ByteString.copyFrom("0x01a339c9e9".toHexByteArray())
+
+            userOperation = Ethereum.UserOperation.newBuilder().apply {
+                entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+                sender = "0x1392Ae041BfBdBAA0cFF9234a0C8F64df97B7218"
+                preVerificationGas = ByteString.copyFrom("0xb708".toHexByteArray())
+                verificationGasLimit = ByteString.copyFrom("0x2DC6C0".toHexByteArray())
+                initCode = ByteString.copyFrom(WCBarz.getInitCode(factoryAddress, publicKey, verificationFacet, 0))
+            }.build()
+
+            transaction = Ethereum.Transaction.newBuilder().apply {
+                transfer = Ethereum.Transaction.Transfer.newBuilder().apply {
+                    amount = ByteString.copyFrom("0x2386f26fc10000".toHexByteArray())
+                }.build()
+            }.build()
+        }
+
+        val output = AnySigner.sign(signingInput.build(), ETHEREUM, SigningOutput.parser())
+
+        assertEquals(Numeric.toHexString(output.preHash.toByteArray()), "0x548c13a0bb87981d04a3a24a78ad5e4ba8d0afbf3cfe9311250e07b54cd38937");
+
+        assertEquals(output.encoded.toStringUtf8(), "{\"callData\":\"0xb61d27f600000000000000000000000061061fcae11fd5461535e134eff67a98cfff44e9000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"2500000\",\"initCode\":\"0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000005034534efe9902779ed6ea6983f435c00f3bc51000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104b173a6a812025c40c38bac46343646bd0a8137c807aae6e04aac238cc24d2ad2116ca14d23d357588ff2aabd7db29d5976f4ecc8037775db86f67e873a306b1f00000000000000000000000000000000000000000000000000000000000000\",\"maxFeePerGas\":\"7033440745\",\"maxPriorityFeePerGas\":\"7033440745\",\"nonce\":\"0\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"46856\",\"sender\":\"0x1392Ae041BfBdBAA0cFF9234a0C8F64df97B7218\",\"signature\":\"0xbf1b68323974e71ad9bd6dfdac07dc062599d150615419bb7876740d2bcf3c8909aa7e627bb0e08a2eab930e2e7313247c9b683c884236dd6ea0b6834fb2cb0a1b\",\"verificationGasLimit\":\"3000000\"}")
+    }
+
+    // https://testnet.bscscan.com/tx/0x872f709815a9f79623a349f2f16d93b52c4d5136967bab53a586f045edbe9203
+    @Test
+    fun testSignR1BatchedTransferAccountDeployed() {
+        val approveFunc = EthereumAbiFunction("approve")
+        approveFunc.addParamAddress("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789".toHexByteArray(), false)
+        approveFunc.addParamUInt256("0x8AC7230489E80000".toHexByteArray(), false)
+        val approveCall = EthereumAbi.encode(approveFunc)
+
+        val transferFunc = EthereumAbiFunction("transfer")
+        transferFunc.addParamAddress("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789".toHexByteArray(), false)
+        transferFunc.addParamUInt256("0x8AC7230489E80000".toHexByteArray(), false)
+        val transferCall = EthereumAbi.encode(transferFunc)
+
+        val signingInput = Ethereum.SigningInput.newBuilder()
+        signingInput.apply {
+            privateKey = ByteString.copyFrom(PrivateKey("3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483".toHexByteArray()).data())
+            chainId = ByteString.copyFrom("0x61".toHexByteArray())
+            nonce = ByteString.copyFrom("0x03".toHexByteArray())
+            txMode = TransactionMode.UserOp
+
+            gasLimit = ByteString.copyFrom("0x015A61".toHexByteArray())
+            maxFeePerGas = ByteString.copyFrom("0x02540BE400".toHexByteArray())
+            maxInclusionFeePerGas = ByteString.copyFrom("0x02540BE400".toHexByteArray())
+
+            userOperation = Ethereum.UserOperation.newBuilder().apply {
+                entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+                sender = "0x1e6c542ebc7c960c6a155a9094db838cef842cf5"
+                preVerificationGas = ByteString.copyFrom("0xDAFC".toHexByteArray())
+                verificationGasLimit = ByteString.copyFrom("0x07F7C4".toHexByteArray())
+            }.build()
+
+            transaction = Ethereum.Transaction.newBuilder().apply {
+                batch = Ethereum.Transaction.Batch.newBuilder().apply {
+                    addAllCalls(listOf(
+                        Ethereum.Transaction.Batch.BatchedCall.newBuilder().apply {
+                            address = "0x03bBb5660B8687C2aa453A0e42dCb6e0732b1266"
+                            amount = ByteString.copyFrom("0x00".toHexByteArray())
+                            payload = ByteString.copyFrom(approveCall)
+                        }.build(),
+                        Ethereum.Transaction.Batch.BatchedCall.newBuilder().apply {
+                            address = "0x03bBb5660B8687C2aa453A0e42dCb6e0732b1266"
+                            amount = ByteString.copyFrom("0x00".toHexByteArray())
+                            payload = ByteString.copyFrom(transferCall)
+                        }.build()
+                    ))
+                }.build()
+            }.build()
+        }
+
+        val output = AnySigner.sign(signingInput.build(), ETHEREUM, SigningOutput.parser())
+
+        assertEquals(Numeric.toHexString(output.preHash.toByteArray()), "0x84d0464f5a2b191e06295443970ecdcd2d18f565d0d52b5a79443192153770ab");
+        assertEquals(output.encoded.toStringUtf8(), "{\"callData\":\"0x47e1da2a000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000000200000000000000000000000003bbb5660b8687c2aa453a0e42dcb6e0732b126600000000000000000000000003bbb5660b8687c2aa453a0e42dcb6e0732b12660000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044a9059cbb0000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e8000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"88673\",\"initCode\":\"0x\",\"maxFeePerGas\":\"10000000000\",\"maxPriorityFeePerGas\":\"10000000000\",\"nonce\":\"3\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"56060\",\"sender\":\"0x1E6c542ebC7c960c6A155A9094DB838cEf842cf5\",\"signature\":\"0x0747b665fe9f3a52407f95a35ac3e76de37c9b89483ae440431244e89a77985f47df712c7364c1a299a5ef62d0b79a2cf4ed63d01772275dd61f72bd1ad5afce1c\",\"verificationGasLimit\":\"522180\"}")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAbi.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAbi.kt
index 1edb4127f62..b6ad3654115 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAbi.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAbi.kt
@@ -1,10 +1,12 @@
 package com.trustwallet.core.app.blockchains.ethereum
 
+import com.google.protobuf.ByteString
 import com.trustwallet.core.app.utils.toHexByteArray
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import com.trustwallet.core.app.utils.Numeric
-import wallet.core.jni.EthereumAbi
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.EthereumAbi
 
 class TestEthereumAbiDecoder {
 
@@ -35,15 +37,15 @@ class TestEthereumAbiDecoder {
             }
         """.trimIndent()
 
-        val decoded = EthereumAbi.decodeCall(call, abi)
-        val expected = """{"function":"approve(address,uint256)","inputs":[{"name":"_spender","type":"address","value":"0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed"},{"name":"_value","type":"uint256","value":"1"}]}"""
+        val decoded = wallet.core.jni.EthereumAbi.decodeCall(call, abi)
+        val expected = """{"function":"approve(address,uint256)","inputs":[{"name":"_spender","type":"address","value":"0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"},{"name":"_value","type":"uint256","value":"1"}]}"""
 
         assertEquals(decoded, expected)
     }
 
     @Test
     fun testEthereumAbiEncodeTyped() {
-        val hash = EthereumAbi.encodeTyped(
+        val hash = wallet.core.jni.EthereumAbi.encodeTyped(
         """
             {
                 "types": {
@@ -94,4 +96,117 @@ class TestEthereumAbiDecoder {
         """)
         assertEquals(Numeric.toHexString(hash), "0xa85c2e2b118698e88db68a8105b794a8cc7cec074e89ef991cb4f5f533819cc2")
     }
+
+    @Test
+    fun testEthereumAbiEncodeFunction() {
+        val amountIn = EthereumAbi.NumberNParam.newBuilder().apply {
+            bits = 256
+            value = ByteString.copyFrom(Numeric.hexStringToByteArray("0xde0b6b3a7640000")) // 1000000000000000000
+        }
+        val amountOutMin = EthereumAbi.NumberNParam.newBuilder().apply {
+            bits = 256
+            value = ByteString.copyFrom(Numeric.hexStringToByteArray("0x229f7e501ad62bdb")) // 2494851601099271131
+        }
+        val deadline = EthereumAbi.NumberNParam.newBuilder().apply {
+            bits = 256
+            value = ByteString.copyFrom(Numeric.hexStringToByteArray("0x5f0ed070")) // 1594806384
+        }
+        val addressType = EthereumAbi.AddressType.newBuilder().build()
+
+        val encodingInput = EthereumAbi.FunctionEncodingInput.newBuilder()
+            .setFunctionName("swapExactTokensForTokens")
+            .addTokens(EthereumAbi.Token.newBuilder().setNumberUint(amountIn))
+            .addTokens(EthereumAbi.Token.newBuilder().setNumberUint(amountOutMin))
+            .addTokens(EthereumAbi.Token.newBuilder().apply {
+                array = EthereumAbi.ArrayParam.newBuilder()
+                    .setElementType(EthereumAbi.ParamType.newBuilder().setAddress(addressType))
+                    .addElements(EthereumAbi.Token.newBuilder().setAddress("0x6B175474E89094C44Da98b954EedeAC495271d0F"))
+                    .addElements(EthereumAbi.Token.newBuilder().setAddress("0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2"))
+                    .addElements(EthereumAbi.Token.newBuilder().setAddress("0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2"))
+                    .addElements(EthereumAbi.Token.newBuilder().setAddress("0xE41d2489571d322189246DaFA5ebDe1F4699F498"))
+                    .build()
+            })
+            .addTokens(EthereumAbi.Token.newBuilder().setAddress("0x7d8bf18C7cE84b3E175b339c4Ca93aEd1dD166F1"))
+            .addTokens(EthereumAbi.Token.newBuilder().setNumberUint(deadline))
+            .build()
+
+        val encodingOutputData = wallet.core.jni.EthereumAbi.encodeFunction(CoinType.ETHEREUM, encodingInput.toByteArray())
+        val encodingOutput = EthereumAbi.FunctionEncodingOutput.parseFrom(encodingOutputData)
+
+        assertEquals(encodingOutput.error, EthereumAbi.AbiError.OK)
+        assertEquals(encodingOutput.functionType, "swapExactTokensForTokens(uint256,uint256,address[],address,uint256)")
+
+        val expectedEncoded = ByteString.copyFrom(Numeric.hexStringToByteArray("0x38ed17390000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000000000000000000000000000229f7e501ad62bdb00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000007d8bf18c7ce84b3e175b339c4ca93aed1dd166f1000000000000000000000000000000000000000000000000000000005f0ed07000000000000000000000000000000000000000000000000000000000000000040000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000009f8f72aa9304c8b593d555f12ef6589cc3a579a2000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498"))
+        assertEquals(encodingOutput.encoded, expectedEncoded)
+    }
+
+    @Test
+    fun testEthereumAbiDecodeParams() {
+        val encoded = ByteString.copyFrom(Numeric.hexStringToByteArray("00000000000000000000000088341d1a8f672d2780c8dc725902aae72f143b0c0000000000000000000000000000000000000000000000000000000000000001"))
+
+        val addressType = EthereumAbi.AddressType.newBuilder().build()
+        val boolType = EthereumAbi.BoolType.newBuilder().build()
+
+        val params = EthereumAbi.AbiParams.newBuilder()
+            .addParams(EthereumAbi.Param.newBuilder().apply {
+                name = "to"
+                param = EthereumAbi.ParamType.newBuilder().setAddress(addressType).build()
+            })
+            .addParams(EthereumAbi.Param.newBuilder().apply {
+                name = "approved"
+                param = EthereumAbi.ParamType.newBuilder().setBoolean(boolType).build()
+            })
+        val decodingInput = EthereumAbi.ParamsDecodingInput.newBuilder()
+            .setEncoded(encoded)
+            .setAbiParams(params)
+            .build()
+
+        val decodingOutputData = wallet.core.jni.EthereumAbi.decodeParams(CoinType.ETHEREUM, decodingInput.toByteArray())
+        val decodingOutput = EthereumAbi.ParamsDecodingOutput.parseFrom(decodingOutputData)
+
+        assertEquals(decodingOutput.error, EthereumAbi.AbiError.OK)
+
+        assertEquals(decodingOutput.getTokens(0).name, "to")
+        assertEquals(decodingOutput.getTokens(0).address, "0x88341d1a8F672D2780C8dC725902AAe72F143B0c")
+
+        assertEquals(decodingOutput.getTokens(1).name, "approved")
+        assertEquals(decodingOutput.getTokens(1).boolean, true)
+    }
+
+    @Test
+    fun testEthereumAbiDecodeValue() {
+        val encoded = ByteString.copyFrom(Numeric.hexStringToByteArray("000000000000000000000000000000000000000000000000000000000000002c48656c6c6f20576f726c64212020202048656c6c6f20576f726c64212020202048656c6c6f20576f726c64210000000000000000000000000000000000000000"))
+
+        val decodingInput = EthereumAbi.ValueDecodingInput.newBuilder()
+            .setEncoded(encoded)
+            .setParamType("string")
+            .build()
+
+        val decodingOutputData = wallet.core.jni.EthereumAbi.decodeValue(CoinType.ETHEREUM, decodingInput.toByteArray())
+        val decodingOutput = EthereumAbi.ValueDecodingOutput.parseFrom(decodingOutputData)
+
+        assertEquals(decodingOutput.error, EthereumAbi.AbiError.OK)
+        assertEquals(decodingOutput.token.stringValue, "Hello World!    Hello World!    Hello World!")
+    }
+
+    @Test
+    fun testEthereumAbiDecodeContractCall() {
+        val encoded = ByteString.copyFrom(Numeric.hexStringToByteArray("c47f0027000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000086465616462656566000000000000000000000000000000000000000000000000"))
+        val abi = """{"c47f0027":{"constant":false,"inputs":[{"name":"name","type":"string"}],"name":"setName","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}}"""
+        val decodingInput = EthereumAbi.ContractCallDecodingInput.newBuilder()
+            .setEncoded(encoded)
+            .setSmartContractAbiJson(abi)
+            .build()
+
+        val decodingOutputData = wallet.core.jni.EthereumAbi.decodeContractCall(CoinType.ETHEREUM, decodingInput.toByteArray())
+        val decodingOutput = EthereumAbi.ContractCallDecodingOutput.parseFrom(decodingOutputData)
+
+        assertEquals(decodingOutput.error, EthereumAbi.AbiError.OK)
+
+        val expectedJson = """{"function":"setName(string)","inputs":[{"name":"name","type":"string","value":"deadbeef"}]}"""
+        assertEquals(decodingOutput.decodedJson, expectedJson)
+
+        assertEquals(decodingOutput.getTokens(0).name, "name")
+        assertEquals(decodingOutput.getTokens(0).stringValue, "deadbeef")
+    }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAbiValue.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAbiValue.kt
index 02a2680b3e5..5afd77932f9 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAbiValue.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAbiValue.kt
@@ -87,7 +87,7 @@ class TestEthereumAbiValue {
     fun testValueDecoderValue() {
         assertEquals("42", EthereumAbiValue.decodeValue(Numeric.hexStringToByteArray("000000000000000000000000000000000000000000000000000000000000002a"), "uint"))
         assertEquals("24", EthereumAbiValue.decodeValue(Numeric.hexStringToByteArray("0000000000000000000000000000000000000000000000000000000000000018"), "uint8"))
-        assertEquals("0xf784682c82526e245f50975190ef0fff4e4fc077", EthereumAbiValue.decodeValue(Numeric.hexStringToByteArray("000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077"), "address"))
+        assertEquals("0xF784682C82526e245F50975190EF0fff4E4fC077", EthereumAbiValue.decodeValue(Numeric.hexStringToByteArray("000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077"), "address"))
         assertEquals("Hello World!    Hello World!    Hello World!", EthereumAbiValue.decodeValue(
             Numeric.hexStringToByteArray("000000000000000000000000000000000000000000000000000000000000002c48656c6c6f20576f726c64212020202048656c6c6f20576f726c64212020202048656c6c6f20576f726c64210000000000000000000000000000000000000000"),
             "string"))
@@ -103,7 +103,7 @@ class TestEthereumAbiValue {
     @Test
     fun testValueDecoderArray_address() {
         val input = Numeric.hexStringToByteArray("0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc0770000000000000000000000002e00cd222cb42b616d86d037cc494e8ab7f5c9a3")
-        assertEquals("[\"0xf784682c82526e245f50975190ef0fff4e4fc077\",\"0x2e00cd222cb42b616d86d037cc494e8ab7f5c9a3\"]", EthereumAbiValue.decodeArray(input, "address[]"))
+        assertEquals("[\"0xF784682C82526e245F50975190EF0fff4E4fC077\",\"0x2e00CD222Cb42B616D86D037Cc494e8ab7F5c9a3\"]", EthereumAbiValue.decodeArray(input, "address[]"))
     }
 
     @Test
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAddress.kt
index f4b29c5db5d..86f725fdd2e 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumAddress.kt
@@ -1,10 +1,13 @@
 package com.trustwallet.core.app.blockchains.ethereum
 
+import com.trustwallet.core.app.utils.Numeric
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import wallet.core.jni.AnyAddress
 import wallet.core.jni.CoinType
 import org.junit.Assert.assertFalse
+import wallet.core.jni.Ethereum
+import wallet.core.jni.Hash
 
 class TestEthereumAddress {
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumMessageSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumMessageSigner.kt
new file mode 100644
index 00000000000..6245751d124
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumMessageSigner.kt
@@ -0,0 +1,134 @@
+package com.trustwallet.core.app.blockchains.ethereum
+
+import com.trustwallet.core.app.utils.Numeric
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import wallet.core.jni.CoinType
+import wallet.core.jni.EthereumMessageSigner
+import wallet.core.jni.PrivateKey
+
+class TestEthereumMessageSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testEthereumSignAndVerifyMessageImmutableX() {
+        val data = Numeric.hexStringToByteArray("3b0a61f46fdae924007146eacb6db6642de7a5603ad843ec58e10331d89d4b84")
+        val privateKey = PrivateKey(data)
+        val publicKey = privateKey.getPublicKey(CoinType.ETHEREUM)
+        val msg = "Only sign this request if you’ve initiated an action with Immutable X.\n\nFor internal use:\nbd717ba31dca6e0f3f136f7c4197babce5f09a9f25176044c0b3112b1b6017a3"
+        val signature = EthereumMessageSigner.signMessageImmutableX(privateKey, msg)
+        assertEquals(signature, "32cd5a58f3419fc5db672e3d57f76199b853eda0856d491b38f557b629b0a0814ace689412bf354a1af81126d2749207dffae8ae8845160f33948a6b787e17ee01");
+        assertTrue(EthereumMessageSigner.verifyMessage(publicKey, msg, signature))
+    }
+
+    @Test
+    fun testEthereumSignAndVerifyMessageLegacy() {
+        val data = Numeric.hexStringToByteArray("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")
+        val privateKey = PrivateKey(data)
+        val publicKey = privateKey.getPublicKey(CoinType.ETHEREUM)
+        val msg = "Foo"
+        val signature = EthereumMessageSigner.signMessage(privateKey, msg)
+        assertEquals(signature, "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be71101b");
+        assertTrue(EthereumMessageSigner.verifyMessage(publicKey, msg, signature))
+    }
+
+    @Test
+    fun testEthereumSignAndVerifyMessageLegacyHex() {
+        val data = Numeric.hexStringToByteArray("9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0")
+        val privateKey = PrivateKey(data)
+        val publicKey = privateKey.getPublicKey(CoinType.ETHEREUM)
+        val msg = "0xc0a96273d5c3fbe4d4000491f08daef9c17f88df846c1d6f57eb5f33c1fbd035"
+        val signature = EthereumMessageSigner.signMessage(privateKey, msg)
+        assertEquals(signature, "b18a666ad08bf9bfcd39920b26b5a5d1486b67b45119810b3c7bda22e41e5c4c1bfbe0c932f6c14df4947a18ba310831a37b7307d724a3ac2a4935b99d7075141b");
+        assertTrue(EthereumMessageSigner.verifyMessage(publicKey, msg, signature))
+    }
+
+    @Test
+    fun testEthereumSignAndVerifyMessage712Legacy() {
+        val data = Numeric.hexStringToByteArray("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")
+        val privateKey = PrivateKey(data)
+        val publicKey = privateKey.getPublicKey(CoinType.ETHEREUM)
+        val msg = """
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ]
+                },
+                "primaryType": "Person",
+                "domain": {
+                    "name": "Ether Person",
+                    "version": "1",
+                    "chainId": 0,
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "name": "Cow",
+                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                }
+            }
+        """.trimIndent()
+        val signature = EthereumMessageSigner.signTypedMessage(privateKey, msg)
+        assertEquals(signature, "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf3761c");
+        assertTrue(EthereumMessageSigner.verifyMessage(publicKey, msg, signature))
+    }
+
+    @Test
+    fun testEthereumSignAndVerifyMessage712Eip155() {
+        val data = Numeric.hexStringToByteArray("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")
+        val privateKey = PrivateKey(data)
+        val publicKey = privateKey.getPublicKey(CoinType.ETHEREUM)
+        val msg = """
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ]
+                },
+                "primaryType": "Person",
+                "domain": {
+                    "name": "Ether Person",
+                    "version": "1",
+                    "chainId": 0,
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "name": "Cow",
+                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                }
+            }
+        """.trimIndent()
+        val signature = EthereumMessageSigner.signTypedMessageEip155(privateKey, msg, 0)
+        assertEquals(signature, "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf37624");
+        assertTrue(EthereumMessageSigner.verifyMessage(publicKey, msg, signature))
+    }
+
+    @Test
+    fun testEthereumSignAndVerifyMessageEip155() {
+        val data = Numeric.hexStringToByteArray("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")
+        val privateKey = PrivateKey(data)
+        val publicKey = privateKey.getPublicKey(CoinType.ETHEREUM)
+        val msg = "Foo"
+        val signature = EthereumMessageSigner.signMessageEip155(privateKey, msg, 0)
+        assertEquals(signature, "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be711023");
+        assertTrue(EthereumMessageSigner.verifyMessage(publicKey, msg, signature))
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumRlp.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumRlp.kt
new file mode 100644
index 00000000000..80abb39ff7f
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumRlp.kt
@@ -0,0 +1,57 @@
+package com.trustwallet.core.app.blockchains.ethereum
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import com.trustwallet.core.app.utils.Numeric
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.Common
+import wallet.core.jni.proto.EthereumRlp
+
+class TestEthereumRlp {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testEthereumRlpEncodeEip1559() {
+        val chainId = ByteString.copyFrom("0x0a".toHexByteArray())
+        val nonce = ByteString.copyFrom("0x06".toHexByteArray())
+        val maxInclusionFeePerGas = ByteString.copyFrom("0x77359400".toHexByteArray()) // 2000000000
+        val maxFeePerGas = ByteString.copyFrom("0xb2d05e00".toHexByteArray()) // 3000000000
+        val gasLimit = ByteString.copyFrom("0x526c".toHexByteArray()) // 21100
+        val to = "0x6b175474e89094c44da98b954eedeac495271d0f"
+        val amount = 0.toLong()
+        val payload = ByteString.copyFrom("a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1".toHexByteArray())
+        // An empty `accessList`.
+        val accessList = EthereumRlp.RlpList.newBuilder().build()
+
+        val rlpList = EthereumRlp.RlpList.newBuilder()
+            .addItems(EthereumRlp.RlpItem.newBuilder().setNumberU256(chainId))
+            .addItems(EthereumRlp.RlpItem.newBuilder().setNumberU256(nonce))
+            .addItems(EthereumRlp.RlpItem.newBuilder().setNumberU256(maxInclusionFeePerGas))
+            .addItems(EthereumRlp.RlpItem.newBuilder().setNumberU256(maxFeePerGas))
+            .addItems(EthereumRlp.RlpItem.newBuilder().setNumberU256(gasLimit))
+            .addItems(EthereumRlp.RlpItem.newBuilder().setAddress(to))
+            .addItems(EthereumRlp.RlpItem.newBuilder().setNumberU64(amount))
+            .addItems(EthereumRlp.RlpItem.newBuilder().setData(payload))
+            .addItems(EthereumRlp.RlpItem.newBuilder().setList(accessList))
+            .build()
+
+        val encodingInput = EthereumRlp.EncodingInput.newBuilder().apply {
+            item = EthereumRlp.RlpItem.newBuilder().setList(rlpList).build()
+        }.build()
+
+        val outputData = wallet.core.jni.EthereumRlp.encode(CoinType.ETHEREUM, encodingInput.toByteArray())
+        val output = EthereumRlp.EncodingOutput.parseFrom(outputData)
+
+        assertEquals(output.error, Common.SigningError.OK)
+        assert(output.errorMessage.isEmpty())
+        assertEquals(
+            Numeric.toHexString(output.encoded.toByteArray()),
+            "0xf86c0a06847735940084b2d05e0082526c946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1c0"
+        )
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumTransactionSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumTransactionSigner.kt
index ab3b38bf229..61a6b9a42df 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumTransactionSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ethereum/TestEthereumTransactionSigner.kt
@@ -9,6 +9,8 @@ import wallet.core.java.AnySigner
 import wallet.core.jni.CoinType
 import wallet.core.jni.CoinType.ETHEREUM
 import wallet.core.jni.proto.Ethereum
+import wallet.core.jni.EthereumAbi
+import wallet.core.jni.EthereumAbiFunction
 import wallet.core.jni.proto.Ethereum.SigningOutput
 import wallet.core.jni.proto.Ethereum.TransactionMode
 import com.trustwallet.core.app.utils.Numeric
@@ -147,6 +149,66 @@ class TestEthereumTransactionSigner {
         assertEquals(Numeric.toHexString(output.data.toByteArray()), "0xf242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000")
     }
 
+    @Test
+    fun testEthereumStakeRocketPool() {
+        val function = EthereumAbiFunction("deposit")
+        val signingInput = Ethereum.SigningInput.newBuilder()
+        signingInput.apply {
+            chainId = ByteString.copyFrom("01".toHexByteArray())
+            nonce = ByteString.copyFrom("01".toHexByteArray())
+            txMode = TransactionMode.Enveloped
+            gasPrice = ByteString.copyFrom("77541880".toHexByteArray()) // 2002000000
+            gasLimit = ByteString.copyFrom("0320c8".toHexByteArray()) // 205000
+            maxFeePerGas = ByteString.copyFrom("067ef83700".toHexByteArray()) // 27900000000
+            maxInclusionFeePerGas = ByteString.copyFrom("3b9aca00".toHexByteArray()) // 1000000000
+            toAddress = "0x2cac916b2a963bf162f076c0a8a4a8200bcfbfb4" // contract
+            privateKey = ByteString.copyFrom(PrivateKey("9f56448d33de406db1561aae15fce64bdf0e9706ff15c45d4409e8fcbfd1a498".toHexByteArray()).data())
+            transaction = Ethereum.Transaction.newBuilder().apply {
+                transfer = Ethereum.Transaction.Transfer.newBuilder().apply {
+                    amount = ByteString.copyFrom("2386f26fc10000".toHexByteArray()) // 0.01 ETH
+                    data = ByteString.copyFrom(EthereumAbi.encode(function))
+                }.build()
+            }.build()
+        }
+
+        val output = AnySigner.sign(signingInput.build(), ETHEREUM, SigningOutput.parser())
+
+        // https://etherscan.io/tx/0xfeba0c579f3e964fbc4eafa500e86891b9f4113735b1364edd4433d765506f1e
+        assertEquals(Numeric.toHexString(output.r.toByteArray()), "0xfb39e5079d7a0598ec45785d73a06b91fe1db707b9c6a150c87ffce2492c66d6")
+        assertEquals(Numeric.toHexString(output.s.toByteArray()), "0x7fbd43a6f4733b2b4f98ad1bc4678ea2615f5edf56ad91408337adec2f07c0ac")
+    }
+
+    @Test
+    fun testEthereumUnstakeRocketPool() {
+        val function = EthereumAbiFunction("burn")
+        function.addParamUInt256("0x21faa32ab2502b".toHexByteArray(), false)
+
+        val signingInput = Ethereum.SigningInput.newBuilder()
+        signingInput.apply {
+            chainId = ByteString.copyFrom("01".toHexByteArray())
+            nonce = ByteString.copyFrom("03".toHexByteArray())
+            txMode = TransactionMode.Enveloped
+            gasPrice = ByteString.copyFrom("77541880".toHexByteArray()) // 2002000000
+            gasLimit = ByteString.copyFrom("055730".toHexByteArray()) // 350000
+            maxFeePerGas = ByteString.copyFrom("067ef83700".toHexByteArray()) // 27900000000
+            maxInclusionFeePerGas = ByteString.copyFrom("3b9aca00".toHexByteArray()) // 1000000000
+            toAddress = "0xae78736Cd615f374D3085123A210448E74Fc6393" // contract
+            privateKey = ByteString.copyFrom(PrivateKey("9f56448d33de406db1561aae15fce64bdf0e9706ff15c45d4409e8fcbfd1a498".toHexByteArray()).data())
+            transaction = Ethereum.Transaction.newBuilder().apply {
+                contractGeneric = Ethereum.Transaction.ContractGeneric.newBuilder().apply {
+                    amount = ByteString.copyFrom("00".toHexByteArray())
+                    data = ByteString.copyFrom(EthereumAbi.encode(function))
+                }.build()
+            }.build()
+        }
+
+        val output = AnySigner.sign(signingInput.build(), ETHEREUM, SigningOutput.parser())
+
+        // https://etherscan.io/tx/0x7fd3c0e9b8b309b4258baa7677c60f5e00e8db7b647fbe3a52adda25058a4b37
+        assertEquals(Numeric.toHexString(output.r.toByteArray()), "0x1fc6e94908107584357799e952b4e3fb87f088aeb66d7930a7015643f19c9e7f")
+        assertEquals(Numeric.toHexString(output.s.toByteArray()), "0x2c56a0b70ff2e52bf374a3dcd404bc42317d5ca15d319f5e33665352eb48f06f")
+    }
+
     @Test
     fun testSignJSON() {
         val json = """
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/everscale/TestEverscaleAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/everscale/TestEverscaleAddress.kt
index b09cfaff057..5922fa9f191 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/everscale/TestEverscaleAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/everscale/TestEverscaleAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.everscale
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/everscale/TestEverscaleSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/everscale/TestEverscaleSigner.kt
index cb1d7266f92..a07ba7c46b4 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/everscale/TestEverscaleSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/everscale/TestEverscaleSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.everscale
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/filecoin/TestFilecoin.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/filecoin/TestFilecoin.kt
index a2d739e65c2..82f292da61d 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/filecoin/TestFilecoin.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/filecoin/TestFilecoin.kt
@@ -6,10 +6,7 @@ import com.trustwallet.core.app.utils.toHexBytesInByteString
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import wallet.core.java.AnySigner
-import wallet.core.jni.AnyAddress
-import wallet.core.jni.CoinType
-import wallet.core.jni.CoinType.FILECOIN
-import wallet.core.jni.PrivateKey
+import wallet.core.jni.*
 import wallet.core.jni.proto.Filecoin
 import wallet.core.jni.proto.Filecoin.SigningOutput
 
@@ -20,13 +17,32 @@ class TestFilecoin {
     }
 
     @Test
-    fun testAddress() {
+    fun testCreateAddress() {
         val privateKey = PrivateKey("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe".toHexByteArray())
         val publicKey = privateKey.getPublicKeySecp256k1(false)
         val address = AnyAddress(publicKey, CoinType.FILECOIN)
         assertEquals("f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq", address.description())
     }
 
+    @Test
+    fun testCreateDelegatedAddress() {
+        val privateKey = PrivateKey("825d2bb32965764a98338139412c7591ed54c951dd65504cd8ddaeaa0fea7b2a".toHexByteArray())
+        val publicKey = privateKey.getPublicKeySecp256k1(false)
+        val address = AnyAddress(publicKey, FilecoinAddressType.DELEGATED)
+        assertEquals("f410fvak24cyg3saddajborn6idt7rrtfj2ptauk5pbq", address.description())
+    }
+
+    @Test
+    fun testAddressConverter() {
+        val ethereumAddress = FilecoinAddressConverter.convertToEthereum("f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky")
+        assertEquals(ethereumAddress, "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0")
+        assert(AnyAddress.isValid(ethereumAddress, CoinType.ETHEREUM))
+
+        val filecoinAddress = FilecoinAddressConverter.convertFromEthereum("0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0")
+        assertEquals(filecoinAddress, "f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky")
+        assert(AnyAddress.isValid(filecoinAddress, CoinType.FILECOIN))
+    }
+
     @Test
     fun testSigner() {
         val input = Filecoin.SigningInput.newBuilder()
@@ -41,7 +57,7 @@ class TestFilecoin {
             .build()
 
         val output = AnySigner.sign(input, CoinType.FILECOIN, SigningOutput.parser())
-        val expted = """{"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"700000000000000000000","GasLimit":1000,"GasPremium":"800000000000000000000","Nonce":2,"To":"f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq","Value":"600000000000000000000"},"Signature":{"Data":"jMRu+OZ/lfppgmqSfGsntFrRLWZnUg3ZYmJTTRLsVt4V1310vR3VKGJpaE6S4sNvDOE6sEgmN9YmfTkPVK2qMgE=","Type":1}}"""
-        assertEquals(expted, output.json)
+        val expected = """{"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"700000000000000000000","GasLimit":1000,"GasPremium":"800000000000000000000","Method":0,"Nonce":2,"To":"f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq","Value":"600000000000000000000"},"Signature":{"Data":"jMRu+OZ/lfppgmqSfGsntFrRLWZnUg3ZYmJTTRLsVt4V1310vR3VKGJpaE6S4sNvDOE6sEgmN9YmfTkPVK2qMgE=","Type":1}}"""
+        assertEquals(expected, output.json)
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/fio/TestFIOAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/fio/TestFIOAddress.kt
index 6b6461e78d1..4a9bef5fedb 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/fio/TestFIOAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/fio/TestFIOAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.fio
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/fio/TestFIOSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/fio/TestFIOSigner.kt
index 7037706254b..6992aa0b9f8 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/fio/TestFIOSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/fio/TestFIOSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.fio
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/greenfield/TestGreenfieldSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/greenfield/TestGreenfieldSigner.kt
new file mode 100644
index 00000000000..cd7caf5e2ac
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/greenfield/TestGreenfieldSigner.kt
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.greenfield
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.proto.Greenfield
+
+class TestGreenfieldSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun GreenfieldTransactionSigningSend() {
+        // Successfully broadcasted: https://greenfieldscan.com/tx/ED8508F3C174C4430B8EE718A6D6F0B02A8C516357BE72B1336CF74356529D19
+
+        val key =
+            PrivateKey("825d2bb32965764a98338139412c7591ed54c951dd65504cd8ddaeaa0fea7b2a".toHexByteArray())
+
+        val msgSend = Greenfield.Message.Send.newBuilder().apply {
+            fromAddress = "0xA815ae0b06dC80318121745BE40e7F8c6654e9f3"
+            toAddress = "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0"
+            addAmounts(Greenfield.Amount.newBuilder().apply {
+                amount = "1234500000000000"
+                denom = "BNB"
+            })
+        }.build()
+
+        val greenfieldFee = Greenfield.Fee.newBuilder().apply {
+            gas = 1200
+            addAmounts(Greenfield.Amount.newBuilder().apply {
+                amount = "6000000000000"
+                denom = "BNB"
+            })
+        }.build()
+
+        val signingInput = Greenfield.SigningInput.newBuilder().apply {
+            signingMode = Greenfield.SigningMode.Eip712
+            encodingMode = Greenfield.EncodingMode.Protobuf
+            accountNumber = 15952
+            ethChainId = "5600"
+            cosmosChainId = "greenfield_5600-1"
+            memo = "Trust Wallet test memo"
+            sequence = 0
+            fee = greenfieldFee
+            mode = Greenfield.BroadcastMode.SYNC
+            privateKey = ByteString.copyFrom(key.data())
+            addMessages(Greenfield.Message.newBuilder().apply {
+                sendCoinsMessage = msgSend
+            })
+        }.build()
+
+        val output = AnySigner.sign(signingInput, CoinType.GREENFIELD, Greenfield.SigningOutput.parser())
+
+        assertEquals(
+            output.serialized,
+            "{\"mode\":\"BROADCAST_MODE_SYNC\",\"tx_bytes\":\"CqwBCpEBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnEKKjB4QTgxNWFlMGIwNmRDODAzMTgxMjE3NDVCRTQwZTdGOGM2NjU0ZTlmMxIqMHg4ZGJENmM3RWRlOTA2NDZhNjFCYmM2NDk4MzFiN2MyOThCRmQzN0EwGhcKA0JOQhIQMTIzNDUwMDAwMDAwMDAwMBIWVHJ1c3QgV2FsbGV0IHRlc3QgbWVtbxJzClYKTQomL2Nvc21vcy5jcnlwdG8uZXRoLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohAhm/mQgs8vzaqBLW66HrqQNv86PYTBgXyElU1OiuKD/sEgUKAwjIBRIZChQKA0JOQhINNjAwMDAwMDAwMDAwMBCwCRpBwbRb1qEAWwaqVfmp1Mn7iMi7wwV/oPi2J2eW9NBIdNoky+ZL+uegS/kY+funCOrqVZ+Kbol9/djAV+bQaNUB0xw=\"}"
+        )
+        assertEquals(output.errorMessage, "")
+    }
+
+    @Test
+    fun GreenfieldTransactionSigningTransferOut() {
+        // Successfully broadcasted Greenfield: https://greenfieldscan.com/tx/38C29C530A74946CFD22EE07DA642F5EF9399BC9AEA59EC56A9B5BE16DE16CE7
+        // BSC (parent transaction): https://testnet.bscscan.com/tx/0x7f73c8a362e14e58cb5e0ec17616afc50eff7aa398db472383a6d017c8a5861a
+
+        val key =
+            PrivateKey("9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0".toHexByteArray())
+
+        val msgTransferOut = Greenfield.Message.BridgeTransferOut.newBuilder().apply {
+            fromAddress = "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1"
+            toAddress = "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1"
+            amount = Greenfield.Amount.newBuilder().apply {
+                amount = "5670000000000000"
+                denom = "BNB"
+            }.build()
+        }.build()
+
+        val greenfieldFee = Greenfield.Fee.newBuilder().apply {
+            gas = 1200
+            addAmounts(Greenfield.Amount.newBuilder().apply {
+                amount = "6000000000000"
+                denom = "BNB"
+            })
+        }.build()
+
+        val signingInput = Greenfield.SigningInput.newBuilder().apply {
+            signingMode = Greenfield.SigningMode.Eip712
+            encodingMode = Greenfield.EncodingMode.Protobuf
+            accountNumber = 15560
+            ethChainId = "5600"
+            cosmosChainId = "greenfield_5600-1"
+            sequence = 7
+            fee = greenfieldFee
+            mode = Greenfield.BroadcastMode.SYNC
+            privateKey = ByteString.copyFrom(key.data())
+            addMessages(Greenfield.Message.newBuilder().apply {
+                bridgeTransferOut = msgTransferOut
+            })
+        }.build()
+
+        val output = AnySigner.sign(signingInput, CoinType.GREENFIELD, Greenfield.SigningOutput.parser())
+
+        assertEquals(
+            output.serialized,
+            "{\"mode\":\"BROADCAST_MODE_SYNC\",\"tx_bytes\":\"CpkBCpYBCiEvZ3JlZW5maWVsZC5icmlkZ2UuTXNnVHJhbnNmZXJPdXQScQoqMHg5ZDFkOTdhREZjZDMyNEJiZDYwM0QzODcyQkQ3OGUwNDA5ODUxMGIxEioweDlkMWQ5N2FERmNkMzI0QmJkNjAzRDM4NzJCRDc4ZTA0MDk4NTEwYjEaFwoDQk5CEhA1NjcwMDAwMDAwMDAwMDAwEnUKWApNCiYvY29zbW9zLmNyeXB0by5ldGguZXRoc2VjcDI1NmsxLlB1YktleRIjCiECee80Bk2hDbBGPHBIBha6AgcD7DpFAm3ve+vSCC9db8gSBQoDCMgFGAcSGQoUCgNCTkISDTYwMDAwMDAwMDAwMDAQsAkaQc4DDByhu80Uy/M3sQePvAmhmbFWZeGq359rugtskEiXKfCzSB86XmBi+l+Q5ETDS2folMxbufHSE8gM4WBCHzgc\"}"
+        )
+        assertEquals(output.errorMessage, "")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/hedera/TestHederaAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/hedera/TestHederaAddress.kt
new file mode 100644
index 00000000000..925c36c7851
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/hedera/TestHederaAddress.kt
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.hedera
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestHederaAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val any = AnyAddress("0.0.1377988", CoinType.HEDERA)
+        assertEquals(any.coin(), CoinType.HEDERA)
+        assertEquals(any.description(), "0.0.1377988")
+
+        Assert.assertFalse(
+            AnyAddress.isValid(
+                "0.0.a",
+                CoinType.HEDERA
+            )
+        )
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/hedera/TestHederaSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/hedera/TestHederaSigner.kt
new file mode 100644
index 00000000000..c01f813e2d0
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/hedera/TestHederaSigner.kt
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.hedera
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexByteArray
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.*
+import wallet.core.jni.proto.Hedera
+
+class TestHederaSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun HederaTransactionSimpleTransferSigning() {
+        // Successfully broadcasted: https://hashscan.io/testnet/transaction/0.0.48694347-1667222879-749068449?t=1667222891.440398729&p=1
+        val key =
+            "e87a5584c0173263e138db689fdb2a7389025aaae7cb1a18a1017d76012130e8".toHexBytesInByteString()
+
+        val transfer = Hedera.TransferMessage
+            .newBuilder()
+            .setAmount(100000000)
+            .setFrom("0.0.48694347")
+            .setTo("0.0.48462050")
+            .build()
+
+        val timestamp = Hedera.Timestamp
+            .newBuilder()
+            .setSeconds(1667222879)
+            .setNanos(749068449)
+            .build()
+
+        val transactionID = Hedera.TransactionID
+            .newBuilder()
+            .setTransactionValidStart(timestamp)
+            .setAccountID("0.0.48694347")
+            .build()
+
+        val body = Hedera.TransactionBody
+            .newBuilder()
+            .setMemo("")
+            .setTransfer(transfer)
+            .setTransactionID(transactionID)
+            .setNodeAccountID("0.0.9")
+            .setTransactionFee(100000000)
+            .setTransactionValidDuration(120)
+            .build()
+
+        val signingInput = Hedera.SigningInput
+            .newBuilder()
+            .setPrivateKey(key)
+            .setBody(body).build()
+
+        val result = AnySigner.sign(signingInput, CoinType.HEDERA, Hedera.SigningOutput.parser())
+        assertEquals(
+            Numeric.cleanHexPrefix(Numeric.toHexString(result.encoded.toByteArray())),
+            "0a440a150a0c08df9aff9a0610a1c197e502120518cb889c17120218091880c2d72f22020878721e0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f12660a640a205d3a70d08b2beafb72c7a68986b3ff819a306078b8c359d739e4966e82e6d40e1a40612589c3b15f1e3ed6084b5a3a5b1b81751578cac8d6c922f31731b3982a5bac80a22558b2197276f5bae49b62503a4d39448ceddbc5ef3ba9bee4c0f302f70c"
+        )
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/internetcomputer/TestInternetComputerAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/internetcomputer/TestInternetComputerAddress.kt
new file mode 100644
index 00000000000..2861aea3a4a
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/internetcomputer/TestInternetComputerAddress.kt
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.internetcomputer
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestInternetComputerAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("ee42eaada903e20ef6e5069f0428d552475c1ea7ed940842da6448f6ef9d48e7".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(false);
+        val address = AnyAddress(pubkey, CoinType.INTERNETCOMPUTER)
+        val expected = AnyAddress("2f25874478d06cf68b9833524a6390d0ba69c566b02f46626979a3d6a4153211", CoinType.INTERNETCOMPUTER)
+
+        assertEquals(pubkey.data().toHex(), "0x048542e6fb4b17d6dfcac3948fe412c00d626728815ee7cc70509603f1bc92128a6e7548f3432d6248bc49ff44a1e50f6389238468d17f7d7024de5be9b181dbc8")
+        assertEquals(address.description(), expected.description())
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/internetcomputer/TestInternetComputerSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/internetcomputer/TestInternetComputerSigner.kt
new file mode 100644
index 00000000000..d3e97de972e
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/internetcomputer/TestInternetComputerSigner.kt
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.internetcomputer
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.*
+import wallet.core.jni.proto.InternetComputer
+import wallet.core.jni.proto.InternetComputer.SigningOutput
+
+class TestInternetComputerSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun InternetComputerTransactionSigning() {
+        val key = PrivateKey("227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be".toHexByteArray())
+
+        val input = InternetComputer.SigningInput.newBuilder()
+            .setTransaction(InternetComputer.Transaction.newBuilder().apply {
+                transfer = InternetComputer.Transaction.Transfer.newBuilder().apply {
+                    toAccountIdentifier = "943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a"
+                    amount = 100000000
+                    memo = 0
+                    currentTimestampNanos = 1691709940000000000
+                }.build()
+            }.build())
+            .setPrivateKey(ByteString.copyFrom(key.data()))
+        val output = AnySigner.sign(input.build(), CoinType.INTERNETCOMPUTER, SigningOutput.parser())
+        assertEquals(output.signedTransaction.toByteArray().toHex(), "0x81826b5452414e53414354494f4e81a266757064617465a367636f6e74656e74a66c726571756573745f747970656463616c6c6e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d026b63616e69737465725f69644a000000000000000201016b6d6574686f645f6e616d656773656e645f706263617267583b0a0012070a050880c2d72f2a220a20943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a3a0a088090caa5a3a78abd176d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f736967984013186f18b9181c189818b318a8186518b2186118d418971618b1187d18eb185818e01826182f1873183b185018cb185d18ef18d81839186418b3183218da1824182f184e18a01880182718c0189018c918a018fd18c418d9189e189818b318ef1874183b185118e118a51864185918e718ed18c71889186c1822182318ca6a726561645f7374617465a367636f6e74656e74a46c726571756573745f747970656a726561645f73746174656e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d0265706174687381824e726571756573745f7374617475735820e8fbc2d5b0bf837b3a369249143e50d4476faafb2dd620e4e982586a51ebcf1e6d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f7369679840182d182718201888188618ce187f0c182a187a18d718e818df18fb18d318d41118a5186a184b18341842185318d718e618e8187a1828186c186a183618461418f3183318bd18a618a718bc18d918c818b7189d186e1865188418ff18fd18e418e9187f181b18d705184818b21872187818d6181c161833184318a2")
+    }
+
+    @Test
+    fun InternetComputerTransactionSigningWithInvalidToAccountIdentifier() {
+        val key = PrivateKey("227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be".toHexByteArray())
+
+        val input = InternetComputer.SigningInput.newBuilder()
+            .setTransaction(InternetComputer.Transaction.newBuilder().apply {
+                transfer = InternetComputer.Transaction.Transfer.newBuilder().apply {
+                    toAccountIdentifier = "643d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826b"
+                    amount = 100000000
+                    memo = 0
+                    currentTimestampNanos = 1691709940000000000
+                }.build()
+            }.build())
+            .setPrivateKey(ByteString.copyFrom(key.data()))
+        val output = AnySigner.sign(input.build(), CoinType.INTERNETCOMPUTER, SigningOutput.parser())
+        assertEquals(output.error.number, 16)
+    }
+
+    @Test
+    fun InternetComputerTransactionSigningWithInvalidAmount() {
+        val key = PrivateKey("227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be".toHexByteArray())
+
+        val input = InternetComputer.SigningInput.newBuilder()
+            .setTransaction(InternetComputer.Transaction.newBuilder().apply {
+                transfer = InternetComputer.Transaction.Transfer.newBuilder().apply {
+                    toAccountIdentifier = "943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a"
+                    amount = 0
+                    memo = 0
+                    currentTimestampNanos = 1691709940000000000
+                }.build()
+            }.build())
+            .setPrivateKey(ByteString.copyFrom(key.data()))
+        val output = AnySigner.sign(input.build(), CoinType.INTERNETCOMPUTER, SigningOutput.parser())
+        assertEquals(output.error.number, 23)
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/juno/TestJunoAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/juno/TestJunoAddress.kt
new file mode 100644
index 00000000000..39c7022b743
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/juno/TestJunoAddress.kt
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.juno
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestJunoAddress {
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAnyAddressValidation() {
+        val addr = "juno1gckvjxau7k56f8wg8c8xj80khyp83y8x8eqc94"
+        val anyAddr = AnyAddress(addr, CoinType.COSMOS, "juno")
+        assert(AnyAddress.isValidBech32(anyAddr.description(), CoinType.COSMOS, "juno"))
+        assert(AnyAddress.isValid(anyAddr.description(), CoinType.JUNO))
+        assert(!AnyAddress.isValidBech32(anyAddr.description(), CoinType.BITCOIN, "juno"))
+        assert(!AnyAddress.isValid(anyAddr.description(), CoinType.BITCOIN))
+        assert(!AnyAddress.isValid(anyAddr.description(), CoinType.COSMOS))
+    }
+
+    @Test
+    fun testAnyAddressFromPubkey() {
+        val pubKey = PublicKey("02753f5c275e1847ba4d2fd3df36ad00af2e165650b35fe3991e9c9c46f68b12bc".toHexByteArray(), PublicKeyType.SECP256K1)
+        val anyAddr = AnyAddress(pubKey, CoinType.COSMOS, "juno")
+        Assert.assertEquals(anyAddr.description(), "juno1cj2vfjec3c3luf9fx9vddnglhh9gawmncn4k5n");
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kcc/TestKuCoinCommunityChainAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kcc/TestKuCoinCommunityChainAddress.kt
index 0d2fe4a7446..9a2ecfc3811 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kcc/TestKuCoinCommunityChainAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kcc/TestKuCoinCommunityChainAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.kcc
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kusama/TestKusamaAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kusama/TestKusamaAddress.kt
index 23f6b258315..39fc302d0ff 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kusama/TestKusamaAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kusama/TestKusamaAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.kusama
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kusama/TestKusamaSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kusama/TestKusamaSigner.kt
index 738ff2a4c1f..7bec37b4f0e 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kusama/TestKusamaSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/kusama/TestKusamaSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.polkadot
 
@@ -36,7 +34,7 @@ class TestKusamaSigner {
             blockHash = hash
             nonce = 1
             specVersion = 2019
-            network = Polkadot.Network.KUSAMA
+            network = KUSAMA.ss58Prefix()
             transactionVersion = 2
             privateKey = key
             balanceCall = Polkadot.Balance.newBuilder().apply {
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/multiversx/TestMultiversXAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/multiversx/TestMultiversXAddress.kt
new file mode 100644
index 00000000000..ab3b1ec2483
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/multiversx/TestMultiversXAddress.kt
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.multiversx
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestMultiversXAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    private var aliceBech32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
+    private var alicePubKeyHex = "0x0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1"
+    private var aliceSeedHex = "0x413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"
+
+    @Test
+    fun testAddressFromPrivateKey() {
+        val key = PrivateKey(aliceSeedHex.toHexByteArray())
+        val pubKey = key.publicKeyEd25519
+        val address = AnyAddress(pubKey, CoinType.MULTIVERSX)
+
+        assertEquals(alicePubKeyHex, pubKey.data().toHex())
+        assertEquals(aliceBech32, address.description())
+    }
+
+    @Test
+    fun testAddressFromPublicKey() {
+        val pubKey = PublicKey(alicePubKeyHex.toHexByteArray(), PublicKeyType.ED25519)
+        val address = AnyAddress(pubKey, CoinType.MULTIVERSX)
+
+        assertEquals(aliceBech32, address.description())
+    }
+
+    @Test
+    fun testAddressFromString() {
+        val address = AnyAddress(aliceBech32, CoinType.MULTIVERSX)
+        
+        assertEquals(aliceBech32, address.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/multiversx/TestMultiversXSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/multiversx/TestMultiversXSigner.kt
new file mode 100644
index 00000000000..811c8a6b76f
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/multiversx/TestMultiversXSigner.kt
@@ -0,0 +1,275 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.multiversx
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.proto.MultiversX
+
+class TestMultiversXSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    private var aliceBech32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
+    private var aliceSeedHex = "0x413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"
+    private var bobBech32 = "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx"
+    private var carolBech32 = "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8"
+   
+    @Test
+    fun signGenericAction() {
+        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
+
+        val accounts = MultiversX.Accounts.newBuilder()
+            .setSenderNonce(7)
+            .setSender(aliceBech32)
+            .setReceiver(bobBech32)
+            .build()
+
+        val genericAction = MultiversX.GenericAction.newBuilder()
+            .setAccounts(accounts)
+            .setValue("0")
+            .setData("foo")
+            .setVersion(1)
+            .build()
+
+        val signingInput = MultiversX.SigningInput.newBuilder()
+            .setGenericAction(genericAction)
+            .setGasPrice(1000000000)
+            .setGasLimit(50000)
+            .setChainId("1")
+            .setPrivateKey(privateKey)
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.MULTIVERSX, MultiversX.SigningOutput.parser())
+        val expectedSignature = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700"
+
+        assertEquals(expectedSignature, output.signature)
+        assertEquals("""{"nonce":7,"value":"0","receiver":"$bobBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"$expectedSignature"}""", output.encoded)
+    }
+
+    @Test
+    fun signGenericActionWithGuardian() {
+        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
+
+        val accounts = MultiversX.Accounts.newBuilder()
+            .setSenderNonce(42)
+            .setSender(aliceBech32)
+            .setReceiver(bobBech32)
+            .setGuardian(carolBech32)
+            .build()
+
+        val genericAction = MultiversX.GenericAction.newBuilder()
+            .setAccounts(accounts)
+            .setValue("1000000000000000000")
+            .setVersion(2)
+            .setOptions(2)
+            .build()
+
+        val signingInput = MultiversX.SigningInput.newBuilder()
+            .setGenericAction(genericAction)
+            .setGasPrice(1000000000)
+            .setGasLimit(100000)
+            .setChainId("1")
+            .setPrivateKey(privateKey)
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.MULTIVERSX, MultiversX.SigningOutput.parser())
+        val expectedSignature = "dae30e5cddb4a1f050009f939ce2c90843770870f9e6c77366be07e5cd7b3ebfdda38cd45d04e9070037d57761b6a68cee697e6043057f9dc565a4d0e632480d"
+
+        assertEquals(expectedSignature, output.signature)
+        assertEquals("""{"nonce":42,"value":"1000000000000000000","receiver":"$bobBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":100000,"chainID":"1","version":2,"signature":"$expectedSignature","options":2,"guardian":"$carolBech32"}""", output.encoded)
+    }
+
+    @Test
+    fun signGenericActionUndelegate() {
+        // Successfully broadcasted https://explorer.multiversx.com/transactions/3301ae5a6a77f0ab9ceb5125258f12539a113b0c6787de76a5c5867f2c515d65
+        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
+
+        val accounts = MultiversX.Accounts.newBuilder()
+            .setSenderNonce(6)
+            .setSender("erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa")
+            .setReceiver("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r")
+            .build()
+
+        val genericAction = MultiversX.GenericAction.newBuilder()
+            .setAccounts(accounts)
+            .setValue("0")
+            .setData("unDelegate@0de0b6b3a7640000")
+            .setVersion(1)
+            .build()
+
+        val signingInput = MultiversX.SigningInput.newBuilder()
+            .setGenericAction(genericAction)
+            .setGasPrice(1000000000)
+            .setGasLimit(12000000)
+            .setChainId("1")
+            .setPrivateKey(privateKey)
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.MULTIVERSX, MultiversX.SigningOutput.parser())
+        val expectedSignature = "89f9683af92f7b835bff4e1d0dbfcff5245b3367df4d23538eb799e0ad0a90be29ac3bd3598ce55b35b35ebef68bfa5738eed39fd01adc33476f65bd1b966e0b"
+
+        assertEquals(expectedSignature, output.signature)
+        assertEquals("""{"nonce":6,"value":"0","receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r","sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa","gasPrice":1000000000,"gasLimit":12000000,"data":"dW5EZWxlZ2F0ZUAwZGUwYjZiM2E3NjQwMDAw","chainID":"1","version":1,"signature":"$expectedSignature"}""", output.encoded)
+    }
+
+    @Test
+    fun signGenericActionDelegate() {
+        // Successfully broadcasted https://explorer.multiversx.com/transactions/e5007662780f8ed677b37b156007c24bf60b7366000f66ec3525cfa16a4564e7
+        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
+
+        val accounts = MultiversX.Accounts.newBuilder()
+            .setSenderNonce(1)
+            .setSender("erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa")
+            .setReceiver("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r")
+            .build()
+
+        val genericAction = MultiversX.GenericAction.newBuilder()
+            .setAccounts(accounts)
+            .setValue("1")
+            .setData("delegate")
+            .setVersion(1)
+            .build()
+
+        val signingInput = MultiversX.SigningInput.newBuilder()
+            .setGenericAction(genericAction)
+            .setGasPrice(1000000000)
+            .setGasLimit(12000000)
+            .setChainId("1")
+            .setPrivateKey(privateKey)
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.MULTIVERSX, MultiversX.SigningOutput.parser())
+        val expectedSignature = "3b9164d47a4e3c0330ae387cd29ba6391f9295acf5e43a16a4a2611645e66e5fa46bf22294ca68fe1948adf45cec8cb47b8792afcdb248bd9adec7c6e6c27108"
+
+        assertEquals(expectedSignature, output.signature)
+        assertEquals("""{"nonce":1,"value":"1","receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r","sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa","gasPrice":1000000000,"gasLimit":12000000,"data":"ZGVsZWdhdGU=","chainID":"1","version":1,"signature":"$expectedSignature"}""", output.encoded)
+    }
+
+    @Test
+    fun signEGLDTransfer() {
+        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
+
+        val accounts = MultiversX.Accounts.newBuilder()
+            .setSenderNonce(7)
+            .setSender(aliceBech32)
+            .setReceiver(bobBech32)
+            .build()
+
+        val transfer = MultiversX.EGLDTransfer.newBuilder()
+            .setAccounts(accounts)
+            .setAmount("1000000000000000000")
+            .build()
+
+        val signingInput = MultiversX.SigningInput.newBuilder()
+            .setEgldTransfer(transfer)
+            .setChainId("1")
+            .setPrivateKey(privateKey)
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.MULTIVERSX, MultiversX.SigningOutput.parser())
+        val expectedSignature = "0f40dec9d37bde3c67803fc535088e536344e271807bb7c1aa24af3c69bffa9b705e149ff7bcaf21678f4900c4ee72741fa6ef08bf4c67fc6da1c6b0f337730e"
+
+        assertEquals(expectedSignature, output.signature)
+        assertEquals("""{"nonce":7,"value":"1000000000000000000","receiver":"$bobBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":2,"signature":"$expectedSignature"}""", output.encoded)
+    }
+
+    @Test
+    fun signEGLDTransferWithGuardian() {
+        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
+
+        val accounts = MultiversX.Accounts.newBuilder()
+            .setSenderNonce(7)
+            .setSender(aliceBech32)
+            .setReceiver(bobBech32)
+            .setGuardian(carolBech32)
+            .build()
+
+        val transfer = MultiversX.EGLDTransfer.newBuilder()
+            .setAccounts(accounts)
+            .setAmount("1000000000000000000")
+            .build()
+
+        val signingInput = MultiversX.SigningInput.newBuilder()
+            .setEgldTransfer(transfer)
+            .setChainId("1")
+            .setPrivateKey(privateKey)
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.MULTIVERSX, MultiversX.SigningOutput.parser())
+        val expectedSignature = "741dd0d24db4df37a050f693f8481b6e51b8dd6dfc2f01a4f90aa1af3e59c89a8b0ef9d710af33103970e353d9f0cb9fd128a2e174731cbc88265d9737ed5604"
+
+        assertEquals(expectedSignature, output.signature)
+        assertEquals("""{"nonce":7,"value":"1000000000000000000","receiver":"$bobBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":100000,"chainID":"1","version":2,"signature":"$expectedSignature","options":2,"guardian":"$carolBech32"}""", output.encoded)
+    }
+
+    @Test
+    fun signESDTTransfer() {
+        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
+
+        val accounts = MultiversX.Accounts.newBuilder()
+            .setSenderNonce(7)
+            .setSender(aliceBech32)
+            .setReceiver(bobBech32)
+            .build()
+
+        val transfer = MultiversX.ESDTTransfer.newBuilder()
+            .setAccounts(accounts)
+            .setTokenIdentifier("MYTOKEN-1234")
+            .setAmount("10000000000000")
+            .build()
+
+        val signingInput = MultiversX.SigningInput.newBuilder()
+            .setEsdtTransfer(transfer)
+            .setChainId("1")
+            .setPrivateKey(privateKey)
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.MULTIVERSX, MultiversX.SigningOutput.parser())
+        val expectedSignature = "dd7cdc90aa09da6034b00a99e3ba0f1a2a38fa788fad018d53bf2e706f99e1a42c80063c28e6b48a5f2574c4054986f34c8eb36b1da63a22d19cf3ea5990b306"
+        val expectedData = "RVNEVFRyYW5zZmVyQDRkNTk1NDRmNGI0NTRlMmQzMTMyMzMzNEAwOTE4NGU3MmEwMDA="
+
+        assertEquals(expectedSignature, output.signature)
+        assertEquals("""{"nonce":7,"value":"0","receiver":"$bobBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":425000,"data":"$expectedData","chainID":"1","version":2,"signature":"$expectedSignature"}""", output.encoded)
+    }
+
+    @Test
+    fun signESDTNFTTransfer() {
+        val privateKey = ByteString.copyFrom(PrivateKey(aliceSeedHex.toHexByteArray()).data())
+
+        val accounts = MultiversX.Accounts.newBuilder()
+            .setSenderNonce(7)
+            .setSender(aliceBech32)
+            .setReceiver(bobBech32)
+            .build()
+
+        val transfer = MultiversX.ESDTNFTTransfer.newBuilder()
+            .setAccounts(accounts)
+            .setTokenCollection("LKMEX-aab910")
+            .setTokenNonce(4)
+            .setAmount("184300000000000000")
+            .build()
+
+        val signingInput = MultiversX.SigningInput.newBuilder()
+            .setEsdtnftTransfer(transfer)
+            .setChainId("1")
+            .setPrivateKey(privateKey)
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.MULTIVERSX, MultiversX.SigningOutput.parser())
+        val expectedSignature = "59af89d9a9ece1f35bc34323c42061cae27bb5f9830f5eb26772e680732cbd901a86caa7c3eadacd392fe1024bef4c1f08ce1dfcafec257d6f41444ccea30a0c"
+        val expectedData = "RVNEVE5GVFRyYW5zZmVyQDRjNGI0ZDQ1NTgyZDYxNjE2MjM5MzEzMEAwNEAwMjhlYzNkZmEwMWFjMDAwQDgwNDlkNjM5ZTVhNjk4MGQxY2QyMzkyYWJjY2U0MTAyOWNkYTc0YTE1NjM1MjNhMjAyZjA5NjQxY2MyNjE4Zjg="
+
+        assertEquals(expectedSignature, output.signature)
+        assertEquals("""{"nonce":7,"value":"0","receiver":"$aliceBech32","sender":"$aliceBech32","gasPrice":1000000000,"gasLimit":937500,"data":"$expectedData","chainID":"1","version":2,"signature":"$expectedSignature"}""", output.encoded)
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativeinjective/TestNativeInjectiveAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativeinjective/TestNativeInjectiveAddress.kt
new file mode 100644
index 00000000000..8c70eaf1dfe
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativeinjective/TestNativeInjectiveAddress.kt
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.nativeinjective
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestNativeInjectiveAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("9ee18daf8e463877aaf497282abc216852420101430482a28e246c179e2c5ef1".toHexByteArray())
+        val pubKey = key.getPublicKeySecp256k1(false)
+        val address = AnyAddress(pubKey, CoinType.NATIVEINJECTIVE)
+        val expected = AnyAddress("inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a", CoinType.NATIVEINJECTIVE)
+
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativeinjective/TestNativeInjectiveSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativeinjective/TestNativeInjectiveSigner.kt
new file mode 100644
index 00000000000..b1295e2d823
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativeinjective/TestNativeInjectiveSigner.kt
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.nativeinjective
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.AnyAddress
+import wallet.core.jni.CoinType
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.proto.Cosmos
+
+class TestNativeInjectiveSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun NativeInjectiveTransactionSigning() {
+        val key = PrivateKey("9ee18daf8e463877aaf497282abc216852420101430482a28e246c179e2c5ef1".toHexByteArray())
+        val publicKey = key.getPublicKeySecp256k1(false)
+        val from = AnyAddress(publicKey, CoinType.NATIVEINJECTIVE).description()
+
+        val transferAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "10000000000"
+            denom = "inj"
+        }.build()
+
+        val message = Cosmos.Message.newBuilder().apply {
+            sendCoinsMessage = Cosmos.Message.Send.newBuilder().apply {
+                fromAddress = from
+                toAddress = "inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd"
+                addAllAmounts(listOf(transferAmount))
+            }.build()
+        }.build()
+
+        val feeAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "100000000000000"
+            denom = "inj"
+        }.build()
+
+        val transferFee = Cosmos.Fee.newBuilder().apply {
+            gas = 110000
+            addAllAmounts(listOf(feeAmount))
+        }.build()
+
+        val signingInput = Cosmos.SigningInput.newBuilder().apply {
+            signingMode = Cosmos.SigningMode.Protobuf
+            accountNumber = 17396
+            chainId = "injective-1"
+            sequence = 1
+            fee = transferFee
+            privateKey = ByteString.copyFrom(key.data())
+            addAllMessages(listOf(message))
+        }.build()
+
+        val output = AnySigner.sign(signingInput, CoinType.NATIVEINJECTIVE, Cosmos.SigningOutput.parser())
+
+        // https://www.mintscan.io/injective/txs/135DD2C4A1910E4334A9C0F15125DA992E724EBF23FEB9638FCB71218BB064A5
+        assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"Co8BCowBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmwKKmluajEzdTZnN3ZxZ3cwNzRtZ21mMnplMmNhZHp2a3o5c25sd2NydHE4YRIqaW5qMXhtcGtteHI0YXMwMGVtMjN0YzJ6Z211eXkyZ3I0aDN3Z2NsNnZkGhIKA2luahILMTAwMDAwMDAwMDASngEKfgp0Ci0vaW5qZWN0aXZlLmNyeXB0by52MWJldGExLmV0aHNlY3AyNTZrMS5QdWJLZXkSQwpBBFoMa4O4vZgn5QcnDK20mbfjqQlSRvaiITKB94PYd8mLJWdCdBsGOfMXdo/k9MJ2JmDCESKDp2hdgVUH3uMikXMSBAoCCAEYARIcChYKA2luahIPMTAwMDAwMDAwMDAwMDAwELDbBhpAx2vkplmzeK7n3puCFGPWhLd0l/ZC/CYkGl+stH+3S3hiCvIe7uwwMpUlNaSwvT8HwF1kNUp+Sx2m0Uo1x5xcFw==\"}")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativezetachain/TestNativeZetaChainAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativezetachain/TestNativeZetaChainAddress.kt
new file mode 100644
index 00000000000..93a2fbd2a3a
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativezetachain/TestNativeZetaChainAddress.kt
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.nativezetachain
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestNativeZetaChainAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed".toHexByteArray())
+        val pubKey = key.getPublicKeySecp256k1(false)
+        val address = AnyAddress(pubKey, CoinType.NATIVEZETACHAIN)
+        val expected = AnyAddress("zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne", CoinType.NATIVEZETACHAIN)
+
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativezetachain/TestNativeZetaChainSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativezetachain/TestNativeZetaChainSigner.kt
new file mode 100644
index 00000000000..2dd00e4f2f8
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nativezetachain/TestNativeZetaChainSigner.kt
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.nativezetachain
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.AnyAddress
+import wallet.core.jni.CoinType
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.proto.Cosmos
+
+class TestNativeZetaChainSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun NativeZetaChainTransactionSigning() {
+        val key = PrivateKey("8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed".toHexByteArray())
+        val publicKey = key.getPublicKeySecp256k1(false)
+        val from = AnyAddress(publicKey, CoinType.NATIVEZETACHAIN).description()
+
+        val transferAmount = Cosmos.Amount.newBuilder().apply {
+            // 0.3 ZETA
+            amount = "300000000000000000"
+            denom = "azeta"
+        }.build()
+
+        val message = Cosmos.Message.newBuilder().apply {
+            sendCoinsMessage = Cosmos.Message.Send.newBuilder().apply {
+                fromAddress = from
+                toAddress = "zeta1cscf4ldnkkz7f0wpveur6dpd0d6p2zxnsuu70y"
+                addAllAmounts(listOf(transferAmount))
+            }.build()
+        }.build()
+
+        val transferFee = Cosmos.Fee.newBuilder().apply {
+            gas = 200000
+        }.build()
+
+        val signingInput = Cosmos.SigningInput.newBuilder().apply {
+            signingMode = Cosmos.SigningMode.Protobuf
+            accountNumber = 2726346
+            chainId = "athens_7001-1"
+            sequence = 2
+            fee = transferFee
+            privateKey = ByteString.copyFrom(key.data())
+            txHasher = Cosmos.TxHasher.Keccak256
+            signerInfo = Cosmos.SignerInfo.newBuilder().apply {
+                // Zetachain requires a compressed public key to sign a transaction,
+                // however an uncompressed public key is used to generate address.
+                publicKeyType = Cosmos.SignerPublicKeyType.Secp256k1
+                jsonType = "ethermint/PubKeyEthSecp256k1"
+                protobufType = "/ethermint.crypto.v1.ethsecp256k1.PubKey"
+            }.build()
+            addAllMessages(listOf(message))
+        }.build()
+
+        val output = AnySigner.sign(signingInput, CoinType.NATIVEZETACHAIN, Cosmos.SigningOutput.parser())
+
+        // Successfully broadcasted (testnet):
+        // https://explorer.zetachain.com/cosmos/tx/A2FC8816657856ED274C4418C3CAEAEE645561275F6C63AB5F8B1DCFB37341A0
+        assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpoBCpcBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEncKK3pldGExNHB5MzZzeDU3dWQ4MnQ5eXJrczl6Nmhkc3JwbjV4NmtteHMwbmUSK3pldGExY3NjZjRsZG5ra3o3ZjB3cHZldXI2ZHBkMGQ2cDJ6eG5zdXU3MHkaGwoFYXpldGESEjMwMDAwMDAwMDAwMDAwMDAwMBJhClkKTwooL2V0aGVybWludC5jcnlwdG8udjEuZXRoc2VjcDI1NmsxLlB1YktleRIjCiECho5+FjRBfbKt/Z/jggW/oP6gGJin/TBWXRP3BWo3wGUSBAoCCAEYAhIEEMCaDBpAgGvqca0w2N9wnHnnxS9HiVud4aQ9lNCumzgNIW6wOR4kvPScacGS1G3kwCw7wyI2NJL8M1eVYjafFIt2FpKl3w==\"}")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/neo/TestsNEOAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/neo/TestsNEOAddress.kt
index dd1ef2e86dc..8eb3f6ac165 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/neo/TestsNEOAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/neo/TestsNEOAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.neo
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/neo/TestsNEOSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/neo/TestsNEOSigner.kt
index d67f8d11559..eb40bbf1892 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/neo/TestsNEOSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/neo/TestsNEOSigner.kt
@@ -99,5 +99,10 @@ class TestNEOSigner {
         assertEquals(
                 "8000001efb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00039b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc50083064905000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ace72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c605013cf0617000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac014140dc261ac093a87640441bf0c3ad4a55ec727932b9175f600618bb5275f31aacf122956bc88746dc666759a2d67f120fe3ce1659f916d22a91e0b02421d3bddbd1232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac",
                 hex)
+
+        // TODO uncomment when nist256p1 Rust implementation is enabled.
+        // assertEquals(
+        //         "8000001efb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00039b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc50083064905000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ace72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c605013cf0617000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac014140dc261ac093a87640441bf0c3ad4a55ec727932b9175f600618bb5275f31aacf1dd6a943678b9239a98a65d2980edf01beed0a0b4904573f31309a6a128a54980232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac",
+        //         hex)
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nervos/TestNervosAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nervos/TestNervosAddress.kt
index 64f1c492ada..f77ce3858cd 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nervos/TestNervosAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nervos/TestNervosAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.nervos
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nervos/TestNervosSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nervos/TestNervosSigner.kt
index 3d0a149e5ae..d556f883f17 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nervos/TestNervosSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nervos/TestNervosSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.nervos
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nuls/TestNULSSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nuls/TestNULSSigner.kt
index 44284c35e02..f9399034258 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nuls/TestNULSSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/nuls/TestNULSSigner.kt
@@ -38,4 +38,84 @@ class TestNULSSigner {
             "0200f885885d00008c0117010001f7ec6473df12e751d64cf20a8baa7edd50810f8101000100201d9a0000000000000000000000000000000000000000000000000000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120100010080969800000000000000000000000000000000000000000000000000000000000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1d7e3463044022028019c0099e2233c7adb84bb03a9a5666ece4a5b65a026a090fa460f3679654702204df0fcb8762b5944b3aba033fa1a287ccb098150035dd8b66f52dc58d3d0843a"
         )
     }
+
+    @Test
+    fun NULSTokenTransactionSigning() {
+        val signingInput = NULS.SigningInput.newBuilder()
+            .setPrivateKey(ByteString.copyFrom(Numeric.hexStringToByteArray("9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b")))
+            .setFrom("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H")
+            .setTo("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe")
+            .setAmount(ByteString.copyFrom("0x989680".toHexByteArray()))
+            .setChainId(9)
+            .setIdassetsId(1)
+            .setNonce(ByteString.copyFrom("0000000000000000".toByteArray()))
+            .setRemark("")
+            .setBalance(ByteString.copyFrom("0x5F5E100".toHexByteArray()))
+            .setTimestamp(0x5D8885F8)
+            .setFeePayer("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H")
+            .setFeePayerBalance(ByteString.copyFrom("0xF4240".toHexByteArray()))
+            .setFeePayerNonce(ByteString.copyFrom("0000000000000000".toByteArray()))
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.NULS, SigningOutput.parser())
+        val encoded = output.encoded.toByteArray()
+        val hex = Numeric.toHexString(encoded, 0, encoded.size, false)
+        assertEquals(hex,
+            "0200f885885d0000d20217010001f7ec6473df12e751d64cf20a8baa7edd50810f810900010080969800000000000000000000000000000000000000000000000000000000000800000000000000000017010001f7ec6473df12e751d64cf20a8baa7edd50810f8101000100a086010000000000000000000000000000000000000000000000000000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120900010080969800000000000000000000000000000000000000000000000000000000000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1d7e346304402204629e7e39708468a405f8d8dd208d0133a686beb5d3ae829b7a2f5867c74480902203d0dffac8189b1caa9087e480fd57581e8c382cc4e17034b492dd2178dac851d"
+        )
+    }
+
+    @Test
+    fun NULSTransactionWithFeePayerSigning() { 
+        val signingInput = NULS.SigningInput.newBuilder()
+            .setPrivateKey(ByteString.copyFrom(Numeric.hexStringToByteArray("48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002")))
+            .setFrom("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac")
+            .setTo("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV")
+            .setAmount(ByteString.copyFrom("0x186A0".toHexByteArray()))
+            .setChainId(1)
+            .setIdassetsId(1)
+            .setNonce(ByteString.copyFrom("0000000000000000".toByteArray()))
+            .setRemark("")
+            .setBalance(ByteString.copyFrom("0xF4240".toHexByteArray()))
+            .setTimestamp(0x62FB3F9F)
+            .setFeePayer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA")
+            .setFeePayerNonce(ByteString.copyFrom("0000000000000000".toByteArray()))
+            .setFeePayerBalance(ByteString.copyFrom("0xF4240".toHexByteArray()))
+            .setFeePayerPrivateKey(ByteString.copyFrom(Numeric.hexStringToByteArray("9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6")))
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.NULS, SigningOutput.parser())
+        val encoded = output.encoded.toByteArray()
+        val hex = Numeric.toHexString(encoded, 0, encoded.size, false)
+        assertEquals(hex,
+            "02009f3ffb620000d202170100014f019a4227bff89d51590fbf53fbd98d994485f801000100a086010000000000000000000000000000000000000000000000000000000000080000000000000000001701000152a6388c8bf54e8fcd73cc824813bfef0912299b01000100a086010000000000000000000000000000000000000000000000000000000000080000000000000000000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b701000100a0860100000000000000000000000000000000000000000000000000000000000000000000000000d22102764370693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022040b5820b93fd5e272f2a00518af45a722571834934ba20d9a866de8e6d6409ab022003c610c647648444c1e2193634b2c51817a5a6ac3fe781da1a9ea773506afd8221025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff4630440220140e46b260942a8475f38df39bf54a2eea56c77199fc7ba775aa4b7f147d0d2102206c82705cba509f37ba0e35520a97bccb71a9e35cadcb8d95dd7fde5c8aa9e428"
+        )
+    }
+
+    @Test
+    fun NULSTokenTransactionWithFeePayerSigning() {
+        val signingInput = NULS.SigningInput.newBuilder()
+            .setPrivateKey(ByteString.copyFrom(Numeric.hexStringToByteArray("48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002")))
+            .setFrom("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac")
+            .setTo("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV")
+            .setAmount(ByteString.copyFrom("0x186A0".toHexByteArray()))
+            .setChainId(9)
+            .setIdassetsId(1)
+            .setNonce(ByteString.copyFrom("0000000000000000".toByteArray()))
+            .setRemark("")
+            .setBalance(ByteString.copyFrom("0xDBBA0".toHexByteArray()))
+            .setTimestamp(0x62FB4E4C)
+            .setFeePayer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA")
+            .setFeePayerBalance(ByteString.copyFrom("0xF4240".toHexByteArray()))
+            .setFeePayerNonce(ByteString.copyFrom("e05d03df6ede0e22".toByteArray()))
+            .setFeePayerPrivateKey(ByteString.copyFrom(Numeric.hexStringToByteArray("9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6")))
+            .build()
+
+        val output = AnySigner.sign(signingInput, CoinType.NULS, SigningOutput.parser())
+        val encoded = output.encoded.toByteArray()
+        val hex = Numeric.toHexString(encoded, 0, encoded.size, false)
+        assertEquals(hex,
+            "02004c4efb620000d2021701000152a6388c8bf54e8fcd73cc824813bfef0912299b09000100a08601000000000000000000000000000000000000000000000000000000000008000000000000000000170100014f019a4227bff89d51590fbf53fbd98d994485f801000100a08601000000000000000000000000000000000000000000000000000000000008e05d03df6ede0e22000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b709000100a0860100000000000000000000000000000000000000000000000000000000000000000000000000d32102764370693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022025cb5b40bda4e6fc0ba719bb0c1a907b2a0faa91316ef2c836310d49f906b6a802207d530a56a6c56d974036c86125da06d6e47f9d8ba1544ac3e620cebd883a707821025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff473045022100ff6f45a1c3856f9ea954baca6b2988295bbb22c958f87f0d3baf9989930549530220426ecb1520513710b99ab50e1f6c7e21b0175adef08aa05070bb9bfca8a001d8"
+        )
+    }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/oasis/TestOasisAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/oasis/TestOasisAddress.kt
index 2cdc8dfcd4a..00b315bc40a 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/oasis/TestOasisAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/oasis/TestOasisAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.oasis
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/oasis/TestOasisSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/oasis/TestOasisSigner.kt
index f9962ebb13c..ef3ad829694 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/oasis/TestOasisSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/oasis/TestOasisSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.oasis
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ontology/TestOntologySigning.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ontology/TestOntologySigning.kt
index abff3b06c6c..2bf777966fb 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ontology/TestOntologySigning.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ontology/TestOntologySigning.kt
@@ -76,6 +76,11 @@ class TestOntologySigning {
         assertEquals(
                 "00d102d45c8bf401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94abac41aaf3ead76586a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140301766d925382a6ebb2ebeb18d3741954c9370dcf6d9c45b34ce7b18bc42dcdb7cff28ddaf7f1048822c0ca21a0c4926323a2497875b963f3b8cbd3717aa6e7c2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac414038466b25ac49a22ba8c301328ef049a61711b257987e85e25d63e0444a14e860305a4cd3bb6ea2fe80fd293abb3c592e679c42c546cbf3baa051a07b28b374a6232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
                 hex)
+
+        // TODO uncomment when nist256p1 Rust implementation is enabled.
+        // assertEquals(
+        //        "00d102d45c8bf401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94abac41aaf3ead76586a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140301766d925382a6ebb2ebeb18d3741954c9370dcf6d9c45b34ce7b18bc42dcdb8300d7215080efb87dd3f35de5f3b6d98aacd6161fbc0845b82d0d8be4b8b6d52321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac414038466b25ac49a22ba8c301328ef049a61711b257987e85e25d63e0444a14e860305a4cd3bb6ea2fe80fd293abb3c592e679c42c546cbf3baa051a07b28b374a6232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+        //         hex)
     }
 
     @Test
@@ -100,6 +105,11 @@ class TestOntologySigning {
         assertEquals(
                 "00d19d3182a8f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94abac41aaf3ead76586a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140e27e935b87855efad62bb76b21c7b591f445f867eff86f888ca6ee1870ecd80f73b8ab199a4d757b4c7b9ed46c4ff8cfa8aefaa90b7fb6485e358034448cba752321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac4140450047b2efb384129a16ec4c707790e9379b978cc7085170071d8d7c5c037d743b078bd4e21bb4404c0182a32ee05260e22454dffb34dacccf458dfbee6d32db232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
                 hex)
+
+        // TODO uncomment when nist256p1 Rust implementation is enabled.
+        // assertEquals(
+        //         "00d19d3182a8f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94abac41aaf3ead76586a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140e27e935b87855efad62bb76b21c7b591f445f867eff86f888ca6ee1870ecd80f8c4754e565b28a85b384612b93b00730143800049b97e83c95844a8eb7d66adc2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac4140450047b2efb384129a16ec4c707790e9379b978cc7085170071d8d7c5c037d74c4f8742a1de44bc0b3fe7d5cd11fad9edac2a5cdabe2c3b824743cc70df5f276232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+        //         hex)
     }
 
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/osmosis/TestOsmosisAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/osmosis/TestOsmosisAddress.kt
index 1d881bbdef1..88b33d1b9fd 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/osmosis/TestOsmosisAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/osmosis/TestOsmosisAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.osmosis
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/osmosis/TestOsmosisSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/osmosis/TestOsmosisSigner.kt
index 97f075947ba..679583594f7 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/osmosis/TestOsmosisSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/osmosis/TestOsmosisSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.osmosis
 
@@ -73,6 +71,6 @@ class TestOsmosisSigner {
         val output = AnySigner.sign(signingInput, OSMOSIS, SigningOutput.parser())
 
         assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"Co0BCooBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmoKK29zbW8xbWt5Njljbjhla3R3eTA4NDV2ZWM5dXBzZHBoa3R4dDBlbjk3ZjUSK29zbW8xOHMwaGRuc2xsZ2NjbHdldTlheW13NG5na3RyMmswcmt2bjdqbW4aDgoFdW9zbW8SBTk5ODAwEmQKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLs71zkN6MCxn+VRo3ksx826RH0Z9fmpStBweE+HVY2SRIECgIIARISCgwKBXVvc21vEgMyMDAQwJoMGkAMY//Md5GRUR4lVZhk558hFS3kii9QZYoYKfg4+ac/xgNeyoiEweVDhcmEvlH1orVwjLUOnYs4ly2a/yIurYVj\"}")
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/pactus/TestPactusAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/pactus/TestPactusAddress.kt
new file mode 100644
index 00000000000..b58b068b859
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/pactus/TestPactusAddress.kt
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.pactus
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestPactusAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6".toHexByteArray())
+        val pubkey = key.publicKeyEd25519
+        val address = AnyAddress(pubkey, CoinType.PACTUS)
+        val expected = AnyAddress("pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr", CoinType.PACTUS)
+
+        assertEquals(pubkey.data().toHex(), "0x95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa")
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/pactus/TestPactusSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/pactus/TestPactusSigner.kt
new file mode 100644
index 00000000000..81bbe9bf532
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/pactus/TestPactusSigner.kt
@@ -0,0 +1,149 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.pactus
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.PrivateKey
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.CoinType.PACTUS
+import wallet.core.jni.proto.Pactus
+import wallet.core.jni.proto.Pactus.SigningOutput
+import com.trustwallet.core.app.utils.Numeric
+import org.junit.Assert.assertArrayEquals
+
+class TestPactusSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testPactusTransferSigning() {
+        // Successfully broadcasted transaction:
+        // https://pacviewer.com/transaction/1b6b7226f7935a15f05371d1a1fefead585a89704ce464b7cc1d453d299d235f
+        //
+        val signingInput = Pactus.SigningInput.newBuilder()
+        signingInput.apply {
+            privateKey = ByteString.copyFrom(
+                PrivateKey("4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6"
+                    .toHexByteArray()).data()
+            )
+            transaction = Pactus.TransactionMessage.newBuilder().apply {
+                lockTime = 2335524
+                fee = 10000000
+                memo = "wallet-core"
+                transfer = Pactus.TransferPayload.newBuilder().apply {
+                    sender = "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr"
+                    receiver = "pc1r0g22ufzn8qtw0742dmfglnw73e260hep0k3yra"
+                    amount = 200000000
+                }.build()
+            }.build()
+        }
+
+        val output = AnySigner.sign(signingInput.build(), PACTUS, SigningOutput.parser())
+
+        assertEquals(
+            "0x1b6b7226f7935a15f05371d1a1fefead585a89704ce464b7cc1d453d299d235f",
+            Numeric.toHexString(output.transactionId.toByteArray())
+        )
+
+        assertEquals(
+            "0x4ed8fee3d8992e82660dd05bbe8608fc56ceabffdeeee61e3213b9b49d33a0fc8dea6d79ee7ec60f66433f189ed9b3c50b2ad6fa004e26790ee736693eda8506",
+            Numeric.toHexString(output.signature.toByteArray())
+        )
+
+        assertEquals(
+            "0x000124a3230080ade2040b77616c6c65742d636f726501037098338e0b6808119dfd4457ab806b9c2059b89b037a14ae24533816e7faaa6ed28fcdde8e55a7df218084af5f4ed8fee3d8992e82660dd05bbe8608fc56ceabffdeeee61e3213b9b49d33a0fc8dea6d79ee7ec60f66433f189ed9b3c50b2ad6fa004e26790ee736693eda850695794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa",
+            Numeric.toHexString(output.signedTransactionData.toByteArray())
+        )
+    }
+
+    @Test
+    fun testPactusBondWithPublicKeySigning() {
+        // Successfully broadcasted transaction:
+        // https://pacviewer.com/transaction/d194b445642a04ec78ced4448696e50b733f2f0b517a23871882c0eefaf1c28f
+        //
+        val signingInput = Pactus.SigningInput.newBuilder()
+        signingInput.apply {
+            privateKey = ByteString.copyFrom(
+                PrivateKey("4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6"
+                    .toHexByteArray()).data()
+            )
+            transaction = Pactus.TransactionMessage.newBuilder().apply {
+                lockTime = 2339009
+                fee = 10000000
+                memo = "wallet-core"
+                bond = Pactus.BondPayload.newBuilder().apply {
+                    sender = "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr"
+                    receiver = "pc1p9y5gmu9l002tt60wak9extgvwm69rq3a9ackrl"
+                    stake = 1000000000
+                    publicKey = "public1pnz75msstqdrq5eguvcwanug0zauhqjw2cc4flmez3qethnp68y64ehc4k69amapj7x4na2uda0snqz4yxujgx3jsse4f64fgy7jkh0xauvhrc5ts09vfk48g85t0js66hvajm6xruemsvlxqv3xvkyur8v9v0mtn"
+                }.build()
+            }.build()
+        }
+
+        val output = AnySigner.sign(signingInput.build(), PACTUS, SigningOutput.parser())
+
+        assertEquals(
+            "0xd194b445642a04ec78ced4448696e50b733f2f0b517a23871882c0eefaf1c28f",
+            Numeric.toHexString(output.transactionId.toByteArray())
+        )
+
+        assertEquals(
+            "0x0d7bc6d94927534b89e2f53bcfc9fc849e0e2982438955eda55b4338328adac79d4ee3216d143f0e1629764ab650734f8ba188e716d71f9eff65e39ce7006300",
+            Numeric.toHexString(output.signature.toByteArray())
+        )
+
+        assertEquals(
+            "0x0001c1b0230080ade2040b77616c6c65742d636f726502037098338e0b6808119dfd4457ab806b9c2059b89b0129288df0bf7bd4b5e9eeed8b932d0c76f451823d6098bd4dc20b03460a651c661dd9f10f17797049cac62a9fef228832bbcc3a39355cdf15b68bddf432f1ab3eab8debe1300aa43724834650866a9d552827a56bbcdde32e3c517079589b54e83d16f9435abb3b2de8c3e677067cc0644ccb13833b8094ebdc030d7bc6d94927534b89e2f53bcfc9fc849e0e2982438955eda55b4338328adac79d4ee3216d143f0e1629764ab650734f8ba188e716d71f9eff65e39ce700630095794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa",
+            Numeric.toHexString(output.signedTransactionData.toByteArray())
+        )
+    }
+
+    @Test
+    fun testPactusBondWithoutPublicKeySigning() {
+        // Successfully broadcasted transaction:
+        // https://pacviewer.com/transaction/f83f583a5c40adf93a90ea536a7e4b467d30ca4f308d5da52624d80c42adec80
+        //
+        val signingInput = Pactus.SigningInput.newBuilder()
+        signingInput.apply {
+            privateKey = ByteString.copyFrom(
+                PrivateKey("4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6"
+                    .toHexByteArray()).data()
+            )
+            transaction = Pactus.TransactionMessage.newBuilder().apply {
+                lockTime = 2335580
+                fee = 10000000
+                memo = "wallet-core"
+                bond = Pactus.BondPayload.newBuilder().apply {
+                    sender = "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr"
+                    receiver = "pc1p6taz5l2kq5ppnxv4agnqj48svnvsy797xpe6wd"
+                    stake = 1000000000
+                }.build()
+            }.build()
+        }
+
+        val output = AnySigner.sign(signingInput.build(), PACTUS, SigningOutput.parser())
+
+        assertEquals(
+            "0xf83f583a5c40adf93a90ea536a7e4b467d30ca4f308d5da52624d80c42adec80",
+            Numeric.toHexString(output.transactionId.toByteArray())
+        )
+
+        assertEquals(
+            "0x9e6279fb64067c7d7316ac74630bbb8589df268aa4548f1c7d85c087a8748ff0715b9149afbd94c5d8ee6b37c787ec63e963cbb38be513ebc436aa58f9a8f00d",
+            Numeric.toHexString(output.signature.toByteArray())
+        )
+
+        assertEquals(
+            "0x00015ca3230080ade2040b77616c6c65742d636f726502037098338e0b6808119dfd4457ab806b9c2059b89b01d2fa2a7d560502199995ea260954f064d90278be008094ebdc039e6279fb64067c7d7316ac74630bbb8589df268aa4548f1c7d85c087a8748ff0715b9149afbd94c5d8ee6b37c787ec63e963cbb38be513ebc436aa58f9a8f00d95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa",
+            Numeric.toHexString(output.signedTransactionData.toByteArray())
+        )
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polkadot/TestPolkadotAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polkadot/TestPolkadotAddress.kt
index 82477b4bbbe..7ab39ef55f5 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polkadot/TestPolkadotAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polkadot/TestPolkadotAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.Polkadot
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polkadot/TestPolkadotSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polkadot/TestPolkadotSigner.kt
index 2e5a09f2885..da571e5ca1a 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polkadot/TestPolkadotSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polkadot/TestPolkadotSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.polkadot
 
@@ -39,7 +37,7 @@ class TestPolkadotSigner {
             blockHash = genesisHashStr
             nonce = 0
             specVersion = 17
-            network = Polkadot.Network.POLKADOT
+            network = POLKADOT.ss58Prefix()
             transactionVersion = 3
             privateKey = key
             stakingCall = Polkadot.Staking.newBuilder().apply {
@@ -69,7 +67,7 @@ class TestPolkadotSigner {
             blockHash = genesisHashStr
             nonce = 4
             specVersion = 30
-            network = Polkadot.Network.POLKADOT
+            network = POLKADOT.ss58Prefix()
             transactionVersion = 7
             privateKey = iOSTestKey
             stakingCall = Polkadot.Staking.newBuilder().apply {
@@ -96,7 +94,7 @@ class TestPolkadotSigner {
             blockHash = "0x35ba668bb19453e8da6334cadcef2a27c8d4141bfc8b49e78e853c3d73e1ecd0".toHexBytesInByteString()
             nonce = 6
             specVersion = 9200
-            network = Polkadot.Network.POLKADOT
+            network = POLKADOT.ss58Prefix()
             transactionVersion = 12
             privateKey = "298fcced2b497ed48367261d8340f647b3fca2d9415d57c2e3c5ef90482a2266".toHexBytesInByteString()
             era = Polkadot.Era.newBuilder().apply {
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polygon/TestPolygonAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polygon/TestPolygonAddress.kt
index f6b21b1780c..ab807796d5a 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polygon/TestPolygonAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/polygon/TestPolygonAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.polygon
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ripple/TestRippleTransactionSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ripple/TestRippleTransactionSigner.kt
index d98aab2490d..9ec91772b1b 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ripple/TestRippleTransactionSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/ripple/TestRippleTransactionSigner.kt
@@ -19,20 +19,25 @@ class TestRippleTransactionSigner {
 
     @Test
     fun testRippleTransactionSigning() {
+        val operation = Ripple.OperationPayment.newBuilder()
+        operation.apply {
+            amount = 10
+            destination = "rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF"
+        }
         val signingInput = Ripple.SigningInput.newBuilder()
         signingInput.apply {
-            account = "rDpysuumkweqeC7XdNgYNtzL5GxbdsmrtF"
-            amount = 29_000_000
-            destination = "rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF"
-            fee = 200_000
-            sequence = 1
-            privateKey = ByteString.copyFrom(PrivateKey("ba005cd605d8a02e3d5dfd04234cef3a3ee4f76bfbad2722d1fb5af8e12e6764".toHexByteArray()).data())
+            account = "rfxdLwsZnoespnTDDb1Xhvbc8EFNdztaoq"
+            fee = 10
+            sequence = 32268248
+            lastLedgerSequence = 32268269
+            privateKey = ByteString.copyFrom(PrivateKey("a5576c0f63da10e584568c8d134569ff44017b0a249eb70657127ae04f38cc77".toHexByteArray()).data())
+            opPayment = operation.build()
         }
 
         val sign = AnySigner.sign(signingInput.build(), XRP, SigningOutput.parser())
         val signBytes = sign.encoded.toByteArray()
 
-        assertEquals(signBytes.toHex(), "0x12000022800000002400000001614000000001ba8140684000000000030d407321026cc34b92cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b6744630440220067f20b3eebfc7107dd0bcc72337a236ac3be042c0469f2341d76694a17d4bb9022048393d7ee7dcb729783b33f5038939ddce1bb8337e66d752974626854556bbb681148400b6b6d08d5d495653d73eda6804c249a5148883148132e4e20aecf29090ac428a9c43f230a829220d")
+        assertEquals(signBytes.toHex(), "0x12000022000000002401ec5fd8201b01ec5fed61400000000000000a68400000000000000a732103d13e1152965a51a4a9fd9a8b4ea3dd82a4eba6b25fcad5f460a2342bb650333f74463044022037d32835c9394f39b2cfd4eaf5b0a80e0db397ace06630fa2b099ff73e425dbc02205288f780330b7a88a1980fa83c647b5908502ad7de9a44500c08f0750b0d9e8481144c55f5a78067206507580be7bb2686c8460adff983148132e4e20aecf29090ac428a9c43f230a829220d")
     }
 
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/scroll/TestScrollAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/scroll/TestScrollAddress.kt
new file mode 100644
index 00000000000..23d77ff4ccb
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/scroll/TestScrollAddress.kt
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.scroll
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestScrollAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(false)
+        val address = AnyAddress(pubkey, CoinType.SCROLL)
+        val expected = AnyAddress("0xe32DC46bfBF78D1eada7b0a68C96903e01418D64", CoinType.SCROLL)
+
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/secret/TestSecretAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/secret/TestSecretAddress.kt
new file mode 100644
index 00000000000..5315c57c9ad
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/secret/TestSecretAddress.kt
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.secret
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestSecretAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("87201512d132ef7a1e57f9e24905fbc24300bd73f676b5716182be5f3e39dada".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(true)
+        val address = AnyAddress(pubkey, CoinType.SECRET)
+        val expected = AnyAddress("secret18mdrja40gfuftt5yx6tgj0fn5lurplezyp894y", CoinType.SECRET)
+
+        assertEquals(pubkey.data().toHex(), "0x02466ac5d28cb4fab6c349060c6c1619e8d301e7741fb6b33cc1edac25f45d8646")
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/secret/TestSecretSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/secret/TestSecretSigner.kt
new file mode 100644
index 00000000000..3f1ef6330a0
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/secret/TestSecretSigner.kt
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.secret
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexByteArray
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType.SECRET
+import wallet.core.jni.proto.Cosmos
+import wallet.core.jni.proto.Cosmos.SigningOutput
+import wallet.core.jni.proto.Cosmos.SigningMode
+import wallet.core.jni.*
+
+class TestSecretSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun SecretTransactionSigning() {
+        val key = PrivateKey("87201512d132ef7a1e57f9e24905fbc24300bd73f676b5716182be5f3e39dada".toHexByteArray())
+        val publicKey = key.getPublicKeySecp256k1(true)
+        val from = AnyAddress(publicKey, SECRET).description()
+
+        val txAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "100000"
+            denom = "uscrt"
+        }.build()
+
+        val sendCoinsMsg = Cosmos.Message.Send.newBuilder().apply {
+            fromAddress = from
+            toAddress = "secret1rnq6hjfnalxeef87rmdeya3nu9dhpc7k9pujs3"
+            addAllAmounts(listOf(txAmount))
+        }.build()
+
+        val message = Cosmos.Message.newBuilder().apply {
+            sendCoinsMessage = sendCoinsMsg
+        }.build()
+
+        val feeAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "2500"
+            denom = "uscrt"
+        }.build()
+
+        val secretFee = Cosmos.Fee.newBuilder().apply {
+            gas = 25000
+            addAllAmounts(listOf(feeAmount))
+        }.build()
+
+        val signingInput = Cosmos.SigningInput.newBuilder().apply {
+            signingMode = SigningMode.Protobuf
+            accountNumber = 265538
+            chainId = "secret-4"
+            memo = ""
+            sequence = 1
+            fee = secretFee
+            privateKey = ByteString.copyFrom(key.data())
+            addAllMessages(listOf(message))
+        }.build()
+
+        val output = AnySigner.sign(signingInput, SECRET, SigningOutput.parser())
+
+        assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLXNlY3JldDE4bWRyamE0MGdmdWZ0dDV5eDZ0Z2owZm41bHVycGxlenlwODk0eRItc2VjcmV0MXJucTZoamZuYWx4ZWVmODdybWRleWEzbnU5ZGhwYzdrOXB1anMzGg8KBXVzY3J0EgYxMDAwMDASZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAkZqxdKMtPq2w0kGDGwWGejTAed0H7azPMHtrCX0XYZGEgQKAggBGAESEwoNCgV1c2NydBIEMjUwMBCowwEaQOcHd2gHpa5WKZ/5RRerEtrHlyDlojIEzUGhC9xMFgs7UQMWy+kTTN+NRf7zQ8rx3cPkIKeZhv0u1KRc8uRCc4o=\"}")
+        assertEquals(output.errorMessage, "")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/smartbitcoincash/TestSmartBitcoinCashAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/smartbitcoincash/TestSmartBitcoinCashAddress.kt
index 852245d5a05..64c33ba9c58 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/smartbitcoincash/TestSmartBitcoinCashAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/smartbitcoincash/TestSmartBitcoinCashAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.smartbitcoincash
 
@@ -20,12 +18,12 @@ class TestSmartBitcoinCashAddress {
 
     @Test
     fun testAddress() {
-        val key = PrivateKey("ab4accc9310d90a61fc354d8f353bca4a2b3c0590685d3eb82d0216af3badddc".toHexByteArray())
+        val key = PrivateKey("155cbd57319f3d938977b4c18000473eb3c432c4e31b667b63e88559c497d82d".toHexByteArray())
         val pubkey = key.getPublicKeySecp256k1(false)
         val address = AnyAddress(pubkey, CoinType.SMARTBITCOINCASH)
-        val expected = AnyAddress("0xA3Dcd899C0f3832DFDFed9479a9d828c6A4EB2A7", CoinType.SMARTBITCOINCASH)
+        val expected = AnyAddress("0x8bFC9477684987dcAf0970b9bce5E3D9267C99C0", CoinType.SMARTBITCOINCASH)
 
-        assertEquals(pubkey.data().toHex(), "0x0448a9ffac8022f1c7eb5253746e24d11d9b6b2737c0aecd48335feabb95a179916b1f3a97bed6740a85a2d11c663d38566acfb08af48a47ce0c835c65c9b23d0d")
+        assertEquals(pubkey.data().toHex(), "0x046439f94100c802691c53ef18523be2c24d301f0e2bd3b425e832378a5405eff4331d5e57303785969073321fc76a8504a3854bdb21e6ab7b268a1737882a29c0")
         assertEquals(address.description(), expected.description())
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/smartchain/TestBinanceSmartChainAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/smartchain/TestBinanceSmartChainAddress.kt
index 142cbc0babe..a9a83132c36 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/smartchain/TestBinanceSmartChainAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/smartchain/TestBinanceSmartChainAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.binancesmartchain
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/solana/TestSolanaTransaction.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/solana/TestSolanaTransaction.kt
new file mode 100644
index 00000000000..a7f1ca53348
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/solana/TestSolanaTransaction.kt
@@ -0,0 +1,121 @@
+package com.trustwallet.core.app.blockchains.solana
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.Base64
+import wallet.core.jni.CoinType.SOLANA
+import wallet.core.jni.SolanaTransaction
+import wallet.core.jni.DataVector
+import wallet.core.jni.TransactionDecoder
+import wallet.core.jni.proto.Common.SigningError
+import wallet.core.jni.proto.Solana
+import wallet.core.jni.proto.Solana.DecodingTransactionOutput
+import wallet.core.jni.proto.Solana.SigningInput
+import wallet.core.jni.proto.Solana.SigningOutput
+import wallet.core.jni.proto.Solana.Encoding
+
+class TestSolanaTransaction {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testUpdateBlockhashAndSign() {
+        val encodedTx = "AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG"
+        val newBlockhash = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg"
+
+        val myPrivateKey = "7f0932159226ddec9e1a4b0b8fe7cdc135049f9e549a867d722aa720dd64f32e".toHexByteArray()
+        val feePayerPrivateKey = "4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7".toHexByteArray()
+
+        val privateKeys = DataVector()
+        privateKeys.add(myPrivateKey)
+        privateKeys.add(feePayerPrivateKey)
+
+        val outputData = SolanaTransaction.updateBlockhashAndSign(encodedTx, newBlockhash, privateKeys)
+        val output = SigningOutput.parseFrom(outputData)
+
+        assertEquals(output.error, SigningError.OK)
+        val expectedString = "Ajzc/Tke0CG8Cew5qFa6xZI/7Ya3DN0M8Ige6tKPsGzhg8Bw9DqL18KUrEZZ1F4YqZBo4Rv+FsDT8A7Nss7p4A6BNVZzzGprCJqYQeNg0EVIbmPc6mDitNniHXGeKgPZ6QZbM4FElw9O7IOFTpOBPvQFeqy0vZf/aayncL8EK/UEAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG"
+        assertEquals(output.encoded, expectedString)
+    }
+
+    @Test
+    fun testDecodeUpdateBlockhashAndSign() {
+        // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+        val encodedTx = Base64.decode("AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG")
+        val newBlockhash = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg"
+
+        val senderPrivateKeyData = "7f0932159226ddec9e1a4b0b8fe7cdc135049f9e549a867d722aa720dd64f32e".toHexByteArray()
+        val feePayerPrivateKeyData = "4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7".toHexByteArray()
+
+        // Step 1: Decode the transaction.
+
+        val decodedData = TransactionDecoder.decode(SOLANA, encodedTx)
+        val decodedOutput = DecodingTransactionOutput.parseFrom(decodedData)
+
+        assertEquals(decodedOutput.error, SigningError.OK)
+        assert(decodedOutput.transaction.hasLegacy())
+
+        // Step 2: Update recent blockhash.
+
+        val rawTx = decodedOutput.transaction.toBuilder().apply {
+            legacy = decodedOutput.transaction.legacy.toBuilder().setRecentBlockhash(newBlockhash).build()
+        }.build()
+
+        // Step 3: Re-sign the updated transaction.
+
+        val signingInput = SigningInput.newBuilder().apply {
+            rawMessage = rawTx
+            privateKey = ByteString.copyFrom(senderPrivateKeyData)
+            feePayerPrivateKey = ByteString.copyFrom(feePayerPrivateKeyData)
+            txEncoding = Solana.Encoding.Base64
+        }.build()
+
+        val output = AnySigner.sign(signingInput, SOLANA, SigningOutput.parser())
+        val expectedString = "Ajzc/Tke0CG8Cew5qFa6xZI/7Ya3DN0M8Ige6tKPsGzhg8Bw9DqL18KUrEZZ1F4YqZBo4Rv+FsDT8A7Nss7p4A6BNVZzzGprCJqYQeNg0EVIbmPc6mDitNniHXGeKgPZ6QZbM4FElw9O7IOFTpOBPvQFeqy0vZf/aayncL8EK/UEAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG"
+        assertEquals(output.encoded, expectedString)
+    }
+
+    @Test
+    fun testSetPriorityFee() {
+        val privateKey = ByteString.copyFrom("baf2b2dbbbad7ca96c1fa199c686f3d8fbd2c7b352f307e37e04f33df6741f18".toHexByteArray())
+        val originalTx = "AX43+Ir2EDqf2zLEvgzFrCZKRjdr3wCdp8CnvYh6N0G/s86IueX9BbiNUl16iLRGvwREDfi2Srb0hmLNBFw1BwABAAEDODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG6GdPcA92ORzVJe2jfG8KQqqMHr9YTLu30oM4i7MFEoBAgIAAQwCAAAA6AMAAAAAAAA="
+
+        // Step 1 - Check if there are no price and limit instructions in the original transaction.
+        assertEquals(SolanaTransaction.getComputeUnitPrice(originalTx), null)
+        assertEquals(SolanaTransaction.getComputeUnitLimit(originalTx), null)
+
+        // Step 2 - Set price and limit instructions.
+        val txWithPrice = SolanaTransaction.setComputeUnitPrice(originalTx, "1000")
+        val updatedTx = SolanaTransaction.setComputeUnitLimit(txWithPrice, "10000")
+
+        assertEquals(updatedTx, "AX43+Ir2EDqf2zLEvgzFrCZKRjdr3wCdp8CnvYh6N0G/s86IueX9BbiNUl16iLRGvwREDfi2Srb0hmLNBFw1BwABAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAboZ09wD3Y5HNUl7aN8bwpCqowev1hMu7fSgziLswUSgMDAAUCECcAAAICAAEMAgAAAOgDAAAAAAAAAwAJA+gDAAAAAAAA")
+
+        // Step 3 - Check if price and limit instructions are set successfully.
+        assertEquals(SolanaTransaction.getComputeUnitPrice(updatedTx), "1000")
+        assertEquals(SolanaTransaction.getComputeUnitLimit(updatedTx), "10000")
+
+        // Step 4 - Decode transaction into a `RawMessage` Protobuf.
+        val updatedTxData = Base64.decode(updatedTx)
+        val decodedData = TransactionDecoder.decode(SOLANA, updatedTxData)
+        val decodedOutput = DecodingTransactionOutput.parseFrom(decodedData)
+
+        assertEquals(decodedOutput.error, SigningError.OK)
+
+        // Step 5 - Sign the decoded `RawMessage` transaction.
+        val signingInput = SigningInput.newBuilder()
+            .setPrivateKey(privateKey)
+            .setRawMessage(decodedOutput.transaction)
+            .setTxEncoding(Encoding.Base64)
+            .build()
+        val output = AnySigner.sign(signingInput, SOLANA, SigningOutput.parser())
+        // Successfully broadcasted tx:
+        // https://explorer.solana.com/tx/2ho7wZUXbDNz12xGfsXg2kcNMqkBAQjv7YNXNcVcuCmbC4p9FZe9ELeM2gMjq9MKQPpmE3nBW5pbdgwVCfNLr1h8
+        val expectedString = "AVUye82Mv+/aWeU2G+B6Nes365mUU2m8iqcGZn/8kFJvw4wY6AgKGG+vJHaknHlCDwE1yi1SIMVUUtNCOm3kHg8BAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAboZ09wD3Y5HNUl7aN8bwpCqowev1hMu7fSgziLswUSgMDAAUCECcAAAICAAEMAgAAAOgDAAAAAAAAAwAJA+gDAAAAAAAA"
+        assertEquals(output.encoded, expectedString)
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/solana/TestSolanaWalletConnectSigning.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/solana/TestSolanaWalletConnectSigning.kt
new file mode 100644
index 00000000000..51360e7b5af
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/solana/TestSolanaWalletConnectSigning.kt
@@ -0,0 +1,52 @@
+package com.trustwallet.core.app.blockchains.solana
+
+import com.google.protobuf.ByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.Base58
+import wallet.core.jni.CoinType.SOLANA
+import wallet.core.jni.WalletConnectRequest
+import wallet.core.jni.proto.Common.SigningError
+import wallet.core.jni.proto.Solana.Encoding
+import wallet.core.jni.proto.Solana.SigningOutput
+import wallet.core.jni.proto.WalletConnect
+
+class TestSolanaWalletConnectSigning {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testSignSolanaTransactionFromWalletConnectRequest() {
+        // Step 1: Parse a signing request received through WalletConnect.
+
+        val parsingInput = WalletConnect.ParseRequestInput.newBuilder().apply {
+            method = WalletConnect.Method.SolanaSignTransaction
+            payload = "{\"transaction\":\"AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA=\"}"
+        }.build()
+
+        val parsingOutputBytes = WalletConnectRequest.parse(SOLANA, parsingInput.toByteArray())
+        val parsingOutput = WalletConnect.ParseRequestOutput.parseFrom(parsingOutputBytes)
+
+        assertEquals(parsingOutput.error, SigningError.OK)
+
+        // Step 2: Set missing fields.
+
+        val signingInput = parsingOutput.solana.toBuilder().apply {
+            privateKey = ByteString.copyFrom(Base58.decodeNoCheck("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr"))
+            txEncoding = Encoding.Base64
+        }.build()
+
+        // Step 3: Sign the transaction.
+
+        val output = AnySigner.sign(signingInput, SOLANA, SigningOutput.parser())
+
+        assertEquals(output.error, SigningError.OK)
+        assertEquals(output.encoded, "AQPWaOi7dMdmQpXi8HyQQKwiqIftrg1igGQxGtZeT50ksn4wAnyH4DtDrkkuE0fqgx80LTp4LwNN9a440SrmoA8BAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA=")
+
+        assertEquals(output.getSignatures(0).pubkey, "7v91N7iZ9mNicL8WfG6cgSCKyRXydQjLh6UYBWwm6y1Q")
+        assertEquals(output.getSignatures(0).signature, "5T6uZBHnHFd8uWErDBTFRVkbKuhbcm94K5MJ2beTYDruzqv4FjS7EMKvC94ZfxNAiWUXZ6bZxS3WXUbhJwYNPWn")
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/stargaze/TestStargazeAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/stargaze/TestStargazeAddress.kt
new file mode 100644
index 00000000000..54577d7971d
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/stargaze/TestStargazeAddress.kt
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.stargaze
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestStargazeAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(true)
+        val address = AnyAddress(pubkey, CoinType.STARGAZE)
+        val expected = AnyAddress("stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy", CoinType.STARGAZE)
+
+        assertEquals(pubkey.data().toHex(), "0x02cbfdb5e472893322294e60cf0883d43df431e1089d29ecb447a9e6d55045aae5")
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/stargaze/TestStargazeSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/stargaze/TestStargazeSigner.kt
new file mode 100644
index 00000000000..63a7a166b60
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/stargaze/TestStargazeSigner.kt
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.stargaze
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.AnyAddress
+import wallet.core.jni.CoinType
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.proto.Cosmos
+
+class TestStargazeSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun stargazeTransactionCW721Signing() {
+        val key =
+            PrivateKey("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433".toHexByteArray())
+
+        val txMsg = Cosmos.Message.WasmExecuteContractGeneric.newBuilder().apply {
+            senderAddress = "stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy"
+            contractAddress = "stars14gmjlyfz5mpv5d8zrksn0tjhz2wwvdc4yk06754alfasq9qen7fsknry42"
+            executeMsg = """{"transfer_nft": {"recipient": "stars1kd5q7qejlqz94kpmd9pvr4v2gzgnca3lvt6xnp","token_id": "1209"}}"""
+        }.build()
+
+        val message = Cosmos.Message.newBuilder().apply {
+            wasmExecuteContractGeneric = txMsg
+        }.build()
+
+        val feeAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "1000"
+            denom = "ustars"
+        }.build()
+
+        val stargazeFee = Cosmos.Fee.newBuilder().apply {
+            gas = 666666
+            addAllAmounts(listOf(feeAmount))
+        }.build()
+
+        val signingInput = Cosmos.SigningInput.newBuilder().apply {
+            signingMode = Cosmos.SigningMode.Protobuf
+            accountNumber = 188393
+            chainId = "stargaze-1"
+            memo = ""
+            sequence = 5
+            fee = stargazeFee
+            privateKey = ByteString.copyFrom(key.data())
+            addAllMessages(listOf(message))
+        }.build()
+
+        val output = AnySigner.sign(signingInput, CoinType.STARGAZE, Cosmos.SigningOutput.parser())
+        // Successfully broadcasted: https://www.mintscan.io/stargaze/txs/300836A5BF9002CF38EE34A8C56E8E7E6854FA64F1DEB3AE108F381A48150F7C
+        val expected = """{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CoACCv0BCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QS1AEKLHN0YXJzMW1yeTQ3cGtnYTV0ZHN3dGx1eTBtOHRlc2xwYWxrZHEwMmE4bmh5EkBzdGFyczE0Z21qbHlmejVtcHY1ZDh6cmtzbjB0amh6Mnd3dmRjNHlrMDY3NTRhbGZhc3E5cWVuN2Zza25yeTQyGmJ7InRyYW5zZmVyX25mdCI6IHsicmVjaXBpZW50IjogInN0YXJzMWtkNXE3cWVqbHF6OTRrcG1kOXB2cjR2Mmd6Z25jYTNsdnQ2eG5wIiwidG9rZW5faWQiOiAiMTIwOSJ9fRJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECy/215HKJMyIpTmDPCIPUPfQx4QidKey0R6nm1VBFquUSBAoCCAEYBRIUCg4KBnVzdGFycxIEMTAwMBCq2CgaQMx+l2sdM5DAPbDyY1p173MLnjGyNWIcRmaFiVNphLuTV3tjhwPbsXEA0hyRxyWS3vN0/xUF/JEsO9wRspj2aJ4="}""".trimIndent()
+        assertEquals(
+            output.serialized,
+            expected
+        )
+        assertEquals(output.errorMessage, "")
+    }
+
+    @Test
+    fun stargazeTransactionSigning() {
+        val key =
+            PrivateKey("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433".toHexByteArray())
+        val publicKey = key.getPublicKeySecp256k1(true)
+        val from = AnyAddress(publicKey, CoinType.STARGAZE).description()
+
+        val txAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "10000"
+            denom = "ustars"
+        }.build()
+
+        val sendCoinsMsg = Cosmos.Message.Send.newBuilder().apply {
+            fromAddress = from
+            toAddress = "stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy"
+            addAllAmounts(listOf(txAmount))
+        }.build()
+
+        val message = Cosmos.Message.newBuilder().apply {
+            sendCoinsMessage = sendCoinsMsg
+        }.build()
+
+        val feeAmount = Cosmos.Amount.newBuilder().apply {
+            amount = "1000"
+            denom = "ustars"
+        }.build()
+
+        val stargazeFee = Cosmos.Fee.newBuilder().apply {
+            gas = 80000
+            addAllAmounts(listOf(feeAmount))
+        }.build()
+
+        val signingInput = Cosmos.SigningInput.newBuilder().apply {
+            signingMode = Cosmos.SigningMode.Protobuf
+            accountNumber = 188393
+            chainId = "stargaze-1"
+            memo = ""
+            sequence = 0
+            fee = stargazeFee
+            privateKey = ByteString.copyFrom(key.data())
+            addAllMessages(listOf(message))
+        }.build()
+
+        val output = AnySigner.sign(signingInput, CoinType.STARGAZE, Cosmos.SigningOutput.parser())
+        // Successfully broadcasted: https://www.mintscan.io/stargaze/txs/98D5E36CA7080DDB286FE924A5A9976ABD4EBE49C92A09D322F29AD30DE4BE4D
+        val expected = """{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpABCo0BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm0KLHN0YXJzMW1yeTQ3cGtnYTV0ZHN3dGx1eTBtOHRlc2xwYWxrZHEwMmE4bmh5EixzdGFyczFtcnk0N3BrZ2E1dGRzd3RsdXkwbTh0ZXNscGFsa2RxMDJhOG5oeRoPCgZ1c3RhcnMSBTEwMDAwEmYKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLL/bXkcokzIilOYM8Ig9Q99DHhCJ0p7LRHqebVUEWq5RIECgIIARIUCg4KBnVzdGFycxIEMTAwMBCA8QQaQHAkntxzC1oH7Yde4+KEmnB+K3XbJIYw0q6MqMPEY65YAwBDNDOdaTu/rpehus/20MvBfbAEZiw9+whzXLpkQ5A="}""".trimIndent()
+        assertEquals(
+            output.serialized,
+            expected
+        )
+        assertEquals(output.errorMessage, "")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/starkex/TestStarkExMessageSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/starkex/TestStarkExMessageSigner.kt
new file mode 100644
index 00000000000..d68cd722b80
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/starkex/TestStarkExMessageSigner.kt
@@ -0,0 +1,27 @@
+package com.trustwallet.core.app.blockchains.starkex
+
+import com.trustwallet.core.app.utils.Numeric
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.PublicKeyType
+import wallet.core.jni.StarkExMessageSigner
+
+class TestStarkExMessageSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testStarkExSignAndVerifyMessage() {
+        val data = Numeric.hexStringToByteArray("04be51a04e718c202e4dca60c2b72958252024cfc1070c090dd0f170298249de")
+        val privateKey = PrivateKey(data)
+        val publicKey = privateKey.getPublicKeyByType(PublicKeyType.STARKEX)
+        val msg = "463a2240432264a3aa71a5713f2a4e4c1b9e12bbb56083cd56af6d878217cf"
+        val signature = StarkExMessageSigner.signMessage(privateKey, msg)
+        assertEquals(signature, "04cf5f21333dd189ada3c0f2a51430d733501a9b1d5e07905273c1938cfb261e05b6013d74adde403e8953743a338c8d414bb96bf69d2ca1a91a85ed2700a528");
+        assertTrue(StarkExMessageSigner.verifyMessage(publicKey, msg, signature))
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/sui/TestSuiAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/sui/TestSuiAddress.kt
new file mode 100644
index 00000000000..503e6e8c8ad
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/sui/TestSuiAddress.kt
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.sui
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestSuiAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val any = AnyAddress("0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015", CoinType.SUI)
+        assertEquals(any.coin(), CoinType.SUI)
+        assertEquals(any.description(), "0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015")
+
+        Assert.assertFalse(
+            AnyAddress.isValid(
+                "0xMQqpqMQgCBuiPkoXfgZZsJvuzCeI1zc00z6vHJj4",
+                CoinType.SUI
+            )
+        )
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/sui/TestSuiSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/sui/TestSuiSigner.kt
new file mode 100644
index 00000000000..84ab0914391
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/sui/TestSuiSigner.kt
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.sui
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexByteArray
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.Sui
+
+class TestSuiSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testSuiDirectSigning() {
+        // Successfully broadcasted https://explorer.sui.io/txblock/HkPo6rYPyDY53x1MBszvSZVZyixVN7CHvCJGX381czAh?network=devnet
+        val txBytes = """
+            AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA
+        """.trimIndent()
+        val key =
+            "3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266".toHexBytesInByteString()
+        val signDirect = Sui.SignDirect.newBuilder().setUnsignedTxMsg(txBytes).build()
+        val signingInput =
+            Sui.SigningInput.newBuilder().setSignDirectMessage(signDirect).setPrivateKey(key).build()
+        val result = AnySigner.sign(signingInput, CoinType.SUI, Sui.SigningOutput.parser())
+        val expectedSignature = "APxPduNVvHj2CcRcHOtiP2aBR9qP3vO2Cb0g12PI64QofDB6ks33oqe/i/iCTLcop2rBrkczwrayZuJOdi7gvwNqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg=="
+        assertEquals(result.unsignedTx, txBytes);
+        assertEquals(result.signature, expectedSignature)
+    }
+
+    @Test
+    fun testSuiTransfer() {
+        // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/D4Ay9TdBJjXkGmrZSstZakpEWskEQHaWURP6xWPRXbAm
+        val txBytes = """
+            AAAEAAjoAwAAAAAAAAAIUMMAAAAAAAAAIKcXWr3V7ZLr4605DbNmxqcGR4zfUXzebPmGMAZc2jd6ACBU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgMCAAIBAAABAQABAQMAAAAAAQIAAQEDAAABAAEDAFToDXbXkMJ39aRPPOkvU9JvWJSJK/OV3uY3WYiHa+ayAWNgILOn3HsRw6pvQZsX+KnBLn95ox0b3S3mcLTt1jAFeHEaBQAAAAAgGGuNnxrqusosgjP3gQ3jBjnhapGNBlcU0yTaupXpa0BU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsu4CAAAAAAAAwMYtAAAAAAAA
+        """.trimIndent()
+        val key =
+            "7e6682f7bf479ef0f627823cffd4e1a940a7af33e5fb39d9e0f631d2ecc5daff".toHexBytesInByteString()
+
+        val paySui = Sui.PaySui.newBuilder()
+            .addInputCoins(Sui.ObjectRef.newBuilder().apply {
+                objectId = "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005"
+                version = 85619064
+                objectDigest = "2eKuWbZSVfpFVfg8FXY9wP6W5AFXnTchSoUdp7obyYZ5"
+            })
+            .addRecipients("0xa7175abdd5ed92ebe3ad390db366c6a706478cdf517cde6cf98630065cda377a")
+            .addRecipients("0x54e80d76d790c277f5a44f3ce92f53d26f5894892bf395dee6375988876be6b2")
+            .addAmounts(1000)
+            .addAmounts(50000)
+
+        val signingInput = Sui.SigningInput.newBuilder()
+            .setPaySui(paySui)
+            .setPrivateKey(key)
+            .setGasBudget(3000000)
+            .setReferenceGasPrice(750)
+            .build()
+
+        val result = AnySigner.sign(signingInput, CoinType.SUI, Sui.SigningOutput.parser())
+        val expectedSignature = "AEh44B7iGArEHF1wOLAQJMLNgGnaIwn3gKPC92vtDJqITDETAM5z9plaxio1xomt6/cZReQ5FZaQsMC6l7E0BwmF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g=="
+        assertEquals(result.unsignedTx, txBytes);
+        assertEquals(result.signature, expectedSignature)
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/terra/TestTerraClassicTxs.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/terra/TestTerraClassicTxs.kt
index 2c67c665dd8..538d0efb76b 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/terra/TestTerraClassicTxs.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/terra/TestTerraClassicTxs.kt
@@ -110,7 +110,7 @@ class TestTerraClassicTxs {
         val output = AnySigner.sign(signingInput, TERRA, SigningOutput.parser())
 
         assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CucBCuQBCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBK5AQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2Glt7InRyYW5zZmVyIjp7ImFtb3VudCI6IjI1MDAwMCIsInJlY2lwaWVudCI6InRlcnJhMWpsZ2FxeTludm4yaGY1dDJzcmE5eWN6OHM3N3duZjlsMGttZ2NwIn19EmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQNwZjrHsPmJKW/rXOWfukpQ1+lOHOJW3/IlFFnKLNmsABIECgIIARgDEhMKDQoFdWx1bmESBDMwMDAQwJoMGkAaprIEMLPH2HmFdwFGoaipb2GIyhXt6ombz+WMnG2mORBI6gFt0M+IymYgzZz6w1SW52R922yafDnn7yXfutRw\"}")
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 
     @Test
@@ -154,7 +154,7 @@ class TestTerraClassicTxs {
         val output = AnySigner.sign(signingInput, TERRA, SigningOutput.parser())
 
         assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"Cu4BCusBCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBLAAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2GmJ7InRyYW5zZmVyIjogeyAiYW1vdW50IjogIjI1MDAwMCIsICJyZWNpcGllbnQiOiAidGVycmExZDcwNDhjc2FwNHd6Y3Y1em03ejZ0ZHFlbTJhZ3lwOTY0N3ZkeWoiIH0gfRJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYBxITCg0KBXVsdW5hEgQzMDAwEMCaDBpAkPsS7xlSng2LMc9KiD1soN5NLaDcUh8I9okPmsdJN3le1B7yxRGNB4aQfhaRl/8Z0r5vitRT0AWuxDasd8wcFw==\"}")
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 
     @Test
@@ -204,6 +204,6 @@ class TestTerraClassicTxs {
         val output = AnySigner.sign(signingInput, TERRA, SigningOutput.parser())
 
         assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CrIBCq8BCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBKEAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMXNlcGZqN3MwYWVnNTk2N3V4bmZrNHRoemxlcnJza3RrcGVsbTVzGhh7ICJkZXBvc2l0X3N0YWJsZSI6IHt9IH0qDAoEdXVzZBIEMTAwMBJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYCRITCg0KBXVsdW5hEgQ3MDAwEMDPJBpAGyi7f1ioY8XV6pjFq1s86Om4++CIUnd3rLHif2iopCcYvX0mLkTlQ6NUERg8nWTYgXcj6fOTO/ptgPuAtv0NWg==\"}")
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/terra/TestTerraTransactions.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/terra/TestTerraTransactions.kt
index 6ee4574001a..e4591ff57e3 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/terra/TestTerraTransactions.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/terra/TestTerraTransactions.kt
@@ -64,7 +64,7 @@ class TestTerraTransactions {
         val jsonPayload = output.json
 
         assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpEBCo4BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm4KLHRlcnJhMWhzazZqcnl5cWpmaHA1ZGhjNTV0YzlqdGNreWd4MGVwMzdoZGQyEix0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcBoQCgV1bHVuYRIHMTAwMDAwMBJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYARIUCg4KBXVsdW5hEgUzMDAwMBDAmgwaQPh0C3rjzdixIUiyPx3FlWAxzbKILNAcSRVeQnaTl1vsI5DEfYa2oYlUBLqyilcMCcU/iaJLhex30No2ak0Zn1Q=\"}")
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 
     @Test
@@ -109,6 +109,6 @@ class TestTerraTransactions {
         val output = AnySigner.sign(signingInput, TERRAV2, SigningOutput.parser())
 
         assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CuUBCuIBCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QSuQEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3NhpbeyJ0cmFuc2ZlciI6eyJhbW91bnQiOiIyNTAwMDAiLCJyZWNpcGllbnQiOiJ0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcCJ9fRJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYAxITCg0KBXVsdW5hEgQzMDAwEMCaDBpAiBGbQaj+jsXE6/FssD3fC77QOxpli9GqsPea+KoNyMIEgVj89Hii+oU1bAEQS4qV0SaE2V6RNy24uCcFTIRbcQ==\"}")
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tezos/TestTezosMessageSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tezos/TestTezosMessageSigner.kt
new file mode 100644
index 00000000000..57b06f83714
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tezos/TestTezosMessageSigner.kt
@@ -0,0 +1,42 @@
+package com.trustwallet.core.app.blockchains.tezos
+
+import com.trustwallet.core.app.utils.Numeric
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import wallet.core.jni.CoinType
+import wallet.core.jni.TezosMessageSigner
+import wallet.core.jni.PrivateKey
+import java.util.regex.Pattern
+
+class TestTezosMessageSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testMessageSignerSignAndVerify() {
+        val data = Numeric.hexStringToByteArray("91b4fb8d7348db2e7de2693f58ce1cceb966fa960739adac1d9dba2cbaa0940a")
+        val privateKey = PrivateKey(data)
+        val msg = "05010000004254657a6f73205369676e6564204d6573736167653a207465737455726c20323032332d30322d30385431303a33363a31382e3435345a2048656c6c6f20576f726c64"
+        val signature = TezosMessageSigner.signMessage(privateKey, msg)
+        assertEquals("edsigu3se2fcEJUCm1aqxjzbHdf7Wsugr4mLaA9YM2UVZ9Yy5meGv87VqHN3mmDeRwApTj1JKDaYjqmLZifSFdWCqBoghqaowwJ", signature)
+        val pubKey = privateKey.getPublicKey(CoinType.TEZOS)
+        assertTrue(TezosMessageSigner.verifyMessage(pubKey, msg, signature))
+    }
+
+    @Test
+    fun testMessageSignerInputToPayload() {
+        val payload = TezosMessageSigner.inputToPayload("Tezos Signed Message: testUrl 2023-02-08T10:36:18.454Z Hello World")
+        val expected = "05010000004254657a6f73205369676e6564204d6573736167653a207465737455726c20323032332d30322d30385431303a33363a31382e3435345a2048656c6c6f20576f726c64"
+        assertEquals(expected, payload)
+    }
+
+    @Test
+    fun testMessageSignerFormatMessage() {
+        val formatedMsg = TezosMessageSigner.formatMessage("Hello World", "testUrl")
+        val regex = Pattern.compile("Tezos Signed Message: \\S+ \\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z .+")
+        assertTrue(regex.matcher(formatedMsg).matches())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkAddress.kt
new file mode 100644
index 00000000000..f37d4c7e4e9
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkAddress.kt
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.theopennetwork
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestTheOpenNetworkAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddressFromPrivateKey() {
+        val privateKey = PrivateKey("63474e5fe9511f1526a50567ce142befc343e71a49b865ac3908f58667319cb8".toHexByteArray())
+        val publicKey = privateKey.getPublicKeyEd25519()
+        val address = AnyAddress(publicKey, CoinType.TON)
+        assertEquals(publicKey.data().toHex(), "0xf42c77f931bea20ec5d0150731276bbb2e2860947661245b2319ef8133ee8d41")
+        assertEquals(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    @Test
+    fun testAddressFromPublicKey() {
+        val publicKey = PublicKey("f42c77f931bea20ec5d0150731276bbb2e2860947661245b2319ef8133ee8d41".toHexByteArray(), PublicKeyType.ED25519)
+        val address = AnyAddress(publicKey, CoinType.TON)
+        assertEquals(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    @Test
+    fun testAddressFromRawString() {
+        val addressString = "0:66fbe3c5c03bf5c82792f904c9f8bf28894a6aa3d213d41c20569b654aadedb3"
+        val address = AnyAddress(addressString, CoinType.TON)
+        assertEquals(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    @Test
+    fun testAddressFromBounceableString() {
+        val addressString = "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q"
+        val address = AnyAddress(addressString, CoinType.TON)
+        assertEquals(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    @Test
+    fun testAddressFromUserFriendlyString() {
+        val addressString = "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV"
+        val address = AnyAddress(addressString, CoinType.TON)
+        assertEquals(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    @Test
+    fun testAddressToBounceable() {
+        val addressString = "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV"
+        val bounceable = true
+        val testnet = false
+        val address = TONAddressConverter.toUserFriendly(addressString, bounceable, testnet)
+        assertEquals(address, "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q")
+    }
+
+    @Test
+    fun testGenerateJettonAddress() {
+        val mainAddress = "UQBjKqthWBE6GEcqb_epTRFrQ1niS6Z1Z1MHMwR-mnAYRoYr"
+        val mainAddressBoc = TONAddressConverter.toBoc(mainAddress)
+        assertEquals(mainAddressBoc, "te6cckEBAQEAJAAAQ4AMZVVsKwInQwjlTf71KaItaGs8SXTOrOpg5mCP004DCNAptHQU")
+
+        // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+        // '{"address":"EQAvlWFDxGF2lXm67y4yzC17wYKD9A0guwPkMs1gOsM__NOT","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","te6ccgICAAEAAQAAACQAAABDgAxlVWwrAidDCOVN/vUpoi1oazxJdM6s6mDmYI/TTgMI0A=="]]}'
+
+        // Parse the `get_wallet_address` RPC response.
+        val jettonAddressBocEncoded = "te6cckEBAQEAJAAAQ4AFvT5rqwxcbKfITqnkwL+go4Zi9bulRHAtLt4cjjFdK7B8L+Cq"
+        val jettonAddress = TONAddressConverter.fromBoc(jettonAddressBocEncoded)
+        assertEquals(jettonAddress, "UQAt6fNdWGLjZT5CdU8mBf0FHDMXrd0qI4FpdvDkcYrpXV5H")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkMessageSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkMessageSigner.kt
new file mode 100644
index 00000000000..64c4627cb97
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkMessageSigner.kt
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.theopennetwork
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.TONMessageSigner
+import wallet.core.jni.TONWallet
+
+class TestTheOpenNetworkMessageSigner {
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun TheOpenNetworkMessageSignerSignMessage() {
+        // The private key has been derived by using [ton-mnemonic](https://www.npmjs.com/package/tonweb-mnemonic/v/0.0.2)
+        // from the following mnemonic:
+        // document shield addict crime broom point story depend suit satisfy test chicken valid tail speak fortune sound drill seek cube cheap body music recipe
+        val privateKey = PrivateKey("112d4e2e700a468f1eae699329202f1ee671d6b665caa2d92dea038cf3868c18".toHexByteArray())
+        val message = "Hello world"
+        val signature = TONMessageSigner.signMessage(privateKey, message)
+        // The following signature has been computed by calling `window.ton.send("ton_personalSign", { data: "Hello world" });`.
+        assertEquals(signature, "2490fbaa72aec0b77b19162bbbe0b0e3f7afd42cc9ef469f0494cd4a366a4bf76643300cd5991f66bce6006336742b8d1d435d541d244dcc013d428472e89504")
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkSigner.kt
new file mode 100644
index 00000000000..69dd91abada
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkSigner.kt
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.theopennetwork
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.CoinType
+import wallet.core.jni.PrivateKey
+import wallet.core.jni.proto.TheOpenNetwork
+import wallet.core.jni.proto.TheOpenNetwork.SigningOutput
+
+class TestTheOpenNetworkSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun TheOpenNetworkTransactionSigning() {
+        val privateKey = PrivateKey("c38f49de2fb13223a9e7d37d5d0ffbdd89a5eb7c8b0ee4d1c299f2cefe7dc4a0".toHexByteArray())
+
+        val transfer = TheOpenNetwork.Transfer.newBuilder()
+            .setDest("EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q")
+            .setAmount(10)
+            .setMode(TheOpenNetwork.SendMode.PAY_FEES_SEPARATELY_VALUE or TheOpenNetwork.SendMode.IGNORE_ACTION_PHASE_ERRORS_VALUE)
+            .setBounceable(true)
+            .build()
+
+        val input = TheOpenNetwork.SigningInput.newBuilder()
+            .setPrivateKey(ByteString.copyFrom(privateKey.data()))
+            .addMessages(transfer)
+            .setSequenceNumber(6)
+            .setExpireAt(1671132440)
+            .setWalletVersion(TheOpenNetwork.WalletVersion.WALLET_V4_R2)
+            .build()
+
+        val output = AnySigner.sign(input, CoinType.TON, SigningOutput.parser())
+
+        // tx: https://tonscan.org/tx/3Z4tHpXNLyprecgu5aTQHWtY7dpHXEoo11MAX61Xyg0=
+        val expectedString = "te6cckEBBAEArQABRYgBsLf6vJOEq42xW0AoyWX0K+uBMUcXFDLFqmkDg6k1Io4MAQGcEUPkil2aZ4s8KKparSep/OKHMC8vuXafFbW2HGp/9AcTRv0J5T4dwyW1G0JpHw+g5Ov6QI3Xo0O9RFr3KidICimpoxdjm3UYAAAABgADAgFiYgAzffHi4B365BPJfIJk/F+URKU1UekJ6g4QK02ypVb22YhQAAAAAAAAAAAAAAAAAQMAAA08Nzs="
+
+        assertEquals(output.encoded, expectedString)
+    }
+
+    @Test
+    fun TheOpenNetworkJettonTransferSigning() {
+        val privateKey = PrivateKey("c054900a527538c1b4325688a421c0469b171c29f23a62da216e90b0df2412ee".toHexByteArray())
+
+        val jettonTransfer = TheOpenNetwork.JettonTransfer.newBuilder()
+            .setJettonAmount(500 * 1000 * 1000)
+            .setToOwner("EQAFwMs5ha8OgZ9M4hQr80z9NkE7rGxUpE1hCFndiY6JnDx8")
+            .setResponseAddress("EQBaKIMq5Am2p_rfR1IFTwsNWHxBkOpLTmwUain5Fj4llTXk")
+            .setForwardAmount(1)
+            .build()
+
+        val transfer = TheOpenNetwork.Transfer.newBuilder()
+            .setDest("EQBiaD8PO1NwfbxSkwbcNT9rXDjqhiIvXWymNO-edV0H5lja")
+            .setAmount(100 * 1000 * 1000)
+            .setMode(TheOpenNetwork.SendMode.PAY_FEES_SEPARATELY_VALUE or TheOpenNetwork.SendMode.IGNORE_ACTION_PHASE_ERRORS_VALUE)
+            .setComment("test comment")
+            .setBounceable(true)
+            .setJettonTransfer(jettonTransfer)
+
+        val input = TheOpenNetwork.SigningInput.newBuilder()
+            .setPrivateKey(ByteString.copyFrom(privateKey.data()))
+            .addMessages(transfer)
+            .setSequenceNumber(1)
+            .setExpireAt(1787693046)
+            .setWalletVersion(TheOpenNetwork.WalletVersion.WALLET_V4_R2)
+            .build()
+
+        val output = AnySigner.sign(input, CoinType.TON, SigningOutput.parser())
+
+        // tx: https://testnet.tonscan.org/tx/Er_oT5R3QK7D-qVPBKUGkJAOOq6ayVls-mgEphpI9Ck=
+        val expectedString = "te6cckECBAEAARUAAUWIALRRBlXIE21P9b6OpAqeFhqw+IMh1Jac2CjUU/IsfEsqDAEBnGiFlaLItV573gJqBvctP5j3jVKlLuxmO+pnW0QGlXjXgzjw5YeTNwRG9upJHOl6GA3pFetKNojqGzfkxku+owUpqaMXao4H9gAAAAEAAwIBaGIAMTQfh52puD7eKUmDbhqfta4cdUMRF662Uxp3zzqug/MgL68IAAAAAAAAAAAAAAAAAAEDAMoPin6lAAAAAAAAAABB3NZQCAALgZZzC14dAz6ZxChX5pn6bIJ3WNipSJrCELO7Ex0TOQAWiiDKuQJtqf630dSBU8LDVh8QZDqS05sFGop+RY+JZUICAAAAAHRlc3QgY29tbWVudG/bd5c="
+
+        assertEquals(output.encoded, expectedString)
+    }
+
+    @Test
+    fun TheOpenNetworkTransferCustomPayload() {
+        val privateKey = PrivateKey("5525e673087587bc0efd7ab09920ef7d3c1bf6b854a661430244ca59ab19e9d1".toHexByteArray())
+
+        // Doge chatbot contract payload to be deployed.
+        // Docs: https://docs.ton.org/develop/dapps/ton-connect/transactions#smart-contract-deployment
+        val dogeChatbotStateInit = "te6cckEBBAEAUwACATQBAgEU/wD0pBP0vPLICwMAEAAAAZDrkbgQAGrTMAGCCGlJILmRMODQ0wMx+kAwi0ZG9nZYcCCAGMjLBVAEzxaARfoCE8tqEssfAc8WyXP7AO4ioYU="
+        // Doge chatbot's address after the contract is deployed.
+        val dogeChatbotDeployingAddress = "0:3042cd5480da232d5ac1d9cbe324e3c9eb58f167599f6b7c20c6e638aeed0335"
+
+        // The comment has nothing to do with Doge chatbot.
+        // It's just used to attach the following ASCII comment to the transaction:
+        // "This transaction deploys Doge Chatbot contract"
+        val commentPayload = "te6cckEBAQEANAAAZAAAAABUaGlzIHRyYW5zYWN0aW9uIGRlcGxveXMgRG9nZSBDaGF0Ym90IGNvbnRyYWN0v84vSg=="
+
+        val transfer = TheOpenNetwork.Transfer.newBuilder()
+            .setDest(dogeChatbotDeployingAddress)
+            // 0.069 TON
+            .setAmount(69_000_000)
+            .setMode(TheOpenNetwork.SendMode.PAY_FEES_SEPARATELY_VALUE or TheOpenNetwork.SendMode.IGNORE_ACTION_PHASE_ERRORS_VALUE)
+            .setBounceable(false)
+            .setStateInit(dogeChatbotStateInit)
+            .setCustomPayload(commentPayload)
+
+        val input = TheOpenNetwork.SigningInput.newBuilder()
+            .setPrivateKey(ByteString.copyFrom(privateKey.data()))
+            .addMessages(transfer)
+            .setSequenceNumber(4)
+            .setExpireAt(1721939714)
+            .setWalletVersion(TheOpenNetwork.WalletVersion.WALLET_V4_R2)
+            .build()
+
+        val output = AnySigner.sign(input, CoinType.TON, SigningOutput.parser())
+
+        // Successfully broadcasted: https://tonviewer.com/transaction/f4b7ed2247b1adf54f33dd2fd99216fbd61beefb281542d0b330ccea9b8d0338
+        val expectedString = "te6cckECCAEAATcAAUWIAfq4NsPLegfou/MPhtHE9YuzV3gnI/q6jm3MRJh2PtpaDAEBnPbyCSsWrOZpEjb7ZFxz5yYi+an6M6Lnq7rI7TFWdDS76LEtGBrVVrhMGziwxuy6LCVtsMBikI7RPVQ89FCIAAYpqaMXZqK3AgAAAAQAAwICaUIAGCFmqkBtEZatYOzl8ZJx5PWseLOsz7W+EGNzHFd2gZqgIObaAAAAAAAAAAAAAAAAAAPAAwQCATQFBgBkAAAAAFRoaXMgdHJhbnNhY3Rpb24gZGVwbG95cyBEb2dlIENoYXRib3QgY29udHJhY3QBFP8A9KQT9LzyyAsHABAAAAGQ65G4EABq0zABgghpSSC5kTDg0NMDMfpAMItGRvZ2WHAggBjIywVQBM8WgEX6AhPLahLLHwHPFslz+wAa2r/S"
+
+        assertEquals(output.encoded, expectedString)
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkWallet.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkWallet.kt
new file mode 100644
index 00000000000..9305072bb75
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/theopennetwork/TestTheOpenNetworkWallet.kt
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.theopennetwork
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.PublicKey
+import wallet.core.jni.PublicKeyType
+import wallet.core.jni.TONWallet
+
+class TestTheOpenNetworkWallet {
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun TheOpenNetworkWalletBuildV4R2StateInit() {
+        val publicKey = PublicKey("f229a9371fa7c2108b3d90ea22c9be705ff5d0cfeaee9cbb9366ff0171579357".toHexByteArray(), PublicKeyType.ED25519)
+        val baseWorkchain = 0
+        val defaultWalletId = 0x29a9a317
+        val stateInit = TONWallet.buildV4R2StateInit(publicKey, baseWorkchain, defaultWalletId)
+
+        val expected = "te6cckECFgEAAwQAAgE0AQIBFP8A9KQT9LzyyAsDAFEAAAAAKamjF/IpqTcfp8IQiz2Q6iLJvnBf9dDP6u6cu5Nm/wFxV5NXQAIBIAQFAgFIBgcE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8ICQoLAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNDA0CASAODwBu0gf6ANTUIvkABcjKBxXL/8nQd3SAGMjLBcsCIs8WUAX6AhTLaxLMzMlz+wDIQBSBAQj0UfKnAgBwgQEI1xj6ANM/yFQgR4EBCPRR8qeCEG5vdGVwdIAYyMsFywJQBs8WUAT6AhTLahLLH8s/yXP7AAIAbIEBCNcY+gDTPzBSJIEBCPRZ8qeCEGRzdHJwdIAYyMsFywJQBc8WUAP6AhPLassfEss/yXP7AAAK9ADJ7VQAeAH6APQEMPgnbyIwUAqhIb7y4FCCEHBsdWeDHrFwgBhQBMsFJs8WWPoCGfQAy2kXyx9SYMs/IMmAQPsABgCKUASBAQj0WTDtRNCBAUDXIMgBzxb0AMntVAFysI4jghBkc3Rygx6xcIAYUAXLBVADzxYj+gITy2rLH8s/yYBA+wCSXwPiAgEgEBEAWb0kK29qJoQICga5D6AhhHDUCAhHpJN9KZEM5pA+n/mDeBKAG3gQFImHFZ8xhAIBWBITABG4yX7UTQ1wsfgAPbKd+1E0IEBQNch9AQwAsjKB8v/ydABgQEI9ApvoTGACASAUFQAZrc52omhAIGuQ64X/wAAZrx32omhAEGuQ64WPwEXtMkg="
+        assertEquals(stateInit, expected)
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thetafuel/TestThetaFuelAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thetafuel/TestThetaFuelAddress.kt
new file mode 100644
index 00000000000..17e60b89aeb
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thetafuel/TestThetaFuelAddress.kt
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.thetafuel
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestThetaFuelAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("4646464646464646464646464646464646464646464646464646464646464646".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(false)
+        val address = AnyAddress(pubkey, CoinType.THETAFUEL)
+        val expected = AnyAddress("0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F", CoinType.THETAFUEL)
+
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORChainAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORChainAddress.kt
index 8a1c5768d90..0974995d3f1 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORChainAddress.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORChainAddress.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.thorchain
 
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORChainSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORChainSigner.kt
index 2314586d13e..fde6325529f 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORChainSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORChainSigner.kt
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.thorchain
 
@@ -74,7 +72,7 @@ class TestTHORChainSigner {
         val output = AnySigner.sign(signingInput, THORCHAIN, SigningOutput.parser())
 
         assertEquals(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"ClIKUAoOL3R5cGVzLk1zZ1NlbmQSPgoUFSLnZ9tusZcIsAOAKb+9YHvJvQ4SFMqGRZ+wBVHH30JUDF54aRksgzrbGhAKBHJ1bmUSCDM4MDAwMDAwEmYKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQPtmX45bPQpL1/OWkK7pBWZzNXZbjExVKfJ6nBJ3jF8dxIECgIIARgVEhIKCwoEcnVuZRIDMjAwEKDLmAEaQKZtS3ATa26OOGvqdKm14ZbHeNfkPtIajXi5MkZ5XaX2SWOeX+YnCPZ9TxF9Jj5cVIo71m55xq4hVL3yDbRe89g=\"}")
-        assertEquals(output.error, "")
+        assertEquals(output.errorMessage, "")
         assertEquals(output.json, "")
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORSwapSigning.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORSwapSigning.kt
index 2d1d3caf77e..68f0f8acc55 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORSwapSigning.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/thorchain/TestTHORSwapSigning.kt
@@ -20,11 +20,13 @@ class TestTHORChainSwap {
     }
 
     @Test
-    fun testSwapEthBnb() {
+    fun testSwapEthBnbWithFee() {
         // prepare swap input
         val input = THORChainSwap.SwapInput.newBuilder()
         input.apply {
-            fromChain = THORChainSwap.Chain.ETH
+            fromAsset = THORChainSwap.Asset.newBuilder().apply {
+                chain = THORChainSwap.Chain.ETH
+            }.build()
             fromAddress = "0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7"
             toAsset = THORChainSwap.Asset.newBuilder().apply {
                 chain = THORChainSwap.Chain.BNB
@@ -36,15 +38,17 @@ class TestTHORChainSwap {
             routerAddress = "0x42A5Ed456650a09Dc10EBc6361A7480fDd61f27B"
             fromAmount = "50000000000000000"
             toAmountLimit = "600003"
+            affiliateFeeAddress = "tthor1ql2tcqyrqsgnql2tcqyj2n8kfdmt9lh0yzql2tcqy"
+            affiliateFeeRateBp = "10"
         }
 
         // serialize input
         val inputSerialized = input.build().toByteArray()
-        assertEquals(Numeric.toHexString(inputSerialized), "0x0802122a3078623966353737316332373636346266323238326439386530396437663530636563376362303161371a0708031203424e42222a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372782a2a307831303931633444653661336346303943644130304162444165443432633763334236394338334543322a3078343241354564343536363530613039446331304542633633363141373438306644643631663237423a1135303030303030303030303030303030304206363030303033")
+        assertEquals(Numeric.toHexString(inputSerialized), "0x0a020802122a3078623966353737316332373636346266323238326439386530396437663530636563376362303161371a0708031203424e42222a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372782a2a307831303931633444653661336346303943644130304162444165443432633763334236394338334543322a3078343241354564343536363530613039446331304542633633363141373438306644643631663237423a11353030303030303030303030303030303042063630303030334a2f7474686f7231716c3274637179727173676e716c32746371796a326e386b66646d74396c6830797a716c327463717952023130")
 
         // invoke swap
         val outputData = buildSwap(inputSerialized)
-        assertEquals(outputData.count(), 311)
+        assertEquals(outputData.count(), 192)
 
         // parse result in proto
         val outputProto = THORChainSwap.SwapOutput.newBuilder().mergeFrom(outputData)
@@ -66,6 +70,6 @@ class TestTHORChainSwap {
         // sign and encode resulting input
         val output = AnySigner.sign(txInputFull, ETHEREUM, SigningOutput.parser())
 
-        assertEquals(Numeric.toHexString(output.encoded.toByteArray()), "0xf90151038506fc23ac00830138809442a5ed456650a09dc10ebc6361a7480fdd61f27b87b1a2bc2ec50000b8e41fece7b40000000000000000000000001091c4de6a3cf09cda00abdaed42c7c3b69c83ec000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec500000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000003e535741503a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a363030303033000025a06ae104be3201baca38315352f81fac70ca4dd47339981914e64e91149813e780a066a3f0b2c44ddf5a96a38481274f623f552a593d723237d6742185f4885c0064")
+        assertEquals(Numeric.toHexString(output.encoded.toByteArray()), "0x02f8d90103808083013880941091c4de6a3cf09cda00abdaed42c7c3b69c83ec87b1a2bc2ec50000b86e3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a3630303030333a7474686f7231716c3274637179727173676e716c32746371796a326e386b66646d74396c6830797a716c32746371793a3130c001a05c16871b66fd0fa8f658d6f171310bab332d09e0533d6c97329a59ddc93a9a11a05ed2be94e6dbb640e58920c8be4fa597cd5f0a918123245acb899042dd43777f")
     }
 }
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tron/TestTronMessageSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tron/TestTronMessageSigner.kt
new file mode 100644
index 00000000000..23cfb2302d3
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tron/TestTronMessageSigner.kt
@@ -0,0 +1,27 @@
+package com.trustwallet.core.app.blockchains.tron
+
+import com.trustwallet.core.app.utils.Numeric
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import wallet.core.jni.CoinType
+import wallet.core.jni.TronMessageSigner
+import wallet.core.jni.PrivateKey
+
+class TestTronMessageSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testMessageSignerSignAndVerify() {
+        val data = Numeric.hexStringToByteArray("75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a")
+        val privateKey = PrivateKey(data)
+        val msg = "Hello World"
+        val signature = TronMessageSigner.signMessage(privateKey, msg)
+        assertEquals("9bb6d11ec8a6a3fb686a8f55b123e7ec4e9746a26157f6f9e854dd72f5683b450397a7b0a9653865658de8f9243f877539882891bad30c7286c3bf5622b900471b", signature)
+        val pubKey = privateKey.getPublicKey(CoinType.TRON)
+        assertTrue(TronMessageSigner.verifyMessage(pubKey, msg, signature))
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tron/TestTronTransactionSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tron/TestTronTransactionSigner.kt
index 254f79bb860..295416c5487 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tron/TestTronTransactionSigner.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/tron/TestTronTransactionSigner.kt
@@ -17,6 +17,18 @@ class TestTronTransactionSigner {
         System.loadLibrary("TrustWalletCore")
     }
 
+    @Test
+    fun testSignDirect() {
+        val signingInput = Tron.SigningInput.newBuilder()
+            .setTxId("546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb")
+            .setPrivateKey(ByteString.copyFrom("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54".toHexByteArray()))
+
+        val output = AnySigner.sign(signingInput.build(), TRON, Tron.SigningOutput.parser())
+
+        assertEquals(Numeric.toHexString(output.id.toByteArray()), "0x546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb")
+        assertEquals(Numeric.toHexString(output.signature.toByteArray()), "0x77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00")
+    }
+
     @Test
     fun testSignTransferTrc20Contract() {
         val trc20Contract = Tron.TransferTRC20Contract.newBuilder()
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/zen/TestZenAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/zen/TestZenAddress.kt
new file mode 100644
index 00000000000..8398b636928
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/zen/TestZenAddress.kt
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.zen
+
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestZenAddress {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testAddress() {
+        val key = PrivateKey("3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a".toHexByteArray())
+        val pubkey = key.getPublicKeySecp256k1(true)
+        val address = AnyAddress(pubkey, CoinType.ZEN)
+        val expected = AnyAddress("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg", CoinType.ZEN)
+
+        assertEquals(pubkey.data().toHex(), "0x02b4ac9056d20c52ac11b0d7e83715dd3eac851cfc9cb64b8546d9ea0d4bb3bdfe")
+        assertEquals(address.description(), expected.description())
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/zen/TestZenSigner.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/zen/TestZenSigner.kt
new file mode 100644
index 00000000000..36682ac0293
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/zen/TestZenSigner.kt
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.blockchains.zen
+
+import com.google.protobuf.ByteString
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHexByteArray
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHexBytesInByteString
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+import wallet.core.java.AnySigner
+import wallet.core.jni.BitcoinScript
+import wallet.core.jni.BitcoinSigHashType
+import wallet.core.jni.CoinType
+import wallet.core.jni.proto.Bitcoin
+import wallet.core.jni.proto.Common.SigningError
+
+class TestZenSigner {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun ZenTransactionSigning() {
+        // prepare SigningInput
+        val input = Bitcoin.SigningInput.newBuilder()
+            .setHashType(BitcoinScript.hashTypeForCoin(CoinType.ZEN))
+            .setAmount(10000)
+            .setByteFee(1)
+            .setToAddress("zngBGZGKaaBamofSuFw5WMnvU2HQAtwGeb5")
+            .setChangeAddress("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg")
+            .setCoinType(CoinType.ZEN.value())
+
+        val utxoKey0 =
+            (Numeric.hexStringToByteArray("3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a"))
+        input.addPrivateKey(ByteString.copyFrom(utxoKey0))
+
+        // build utxo
+        val txHash0 = (Numeric.hexStringToByteArray("a39e13b5ab406547e31284cd96fb40ed271813939c195ae7a86cd67fb8a4de62"))
+        val outpoint0 = Bitcoin.OutPoint.newBuilder()
+            .setHash(ByteString.copyFrom(txHash0))
+            .setIndex(0)
+            .setSequence(Long.MAX_VALUE.toInt())
+            .build()
+
+        val utxo0 = Bitcoin.UnspentTransaction.newBuilder()
+            .setAmount(17600)
+            .setOutPoint(outpoint0)
+            .setScript(ByteString.copyFrom("76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4".toHexBytes()))
+            .build()
+
+        input.addUtxo(utxo0)
+
+        val plan = AnySigner.plan(input.build(), CoinType.ZEN, Bitcoin.TransactionPlan.parser())
+
+        input.plan = Bitcoin.TransactionPlan.newBuilder()
+            .mergeFrom(plan)
+            .setPreblockhash(ByteString.copyFrom("81dc725fd33fada1062323802eefb54d3325d924d4297a692214560400000000".toHexBytes()))
+            .setPreblockheight(1147624)
+            .build()
+
+
+        val output = AnySigner.sign(input.build(), CoinType.ZEN, Bitcoin.SigningOutput.parser())
+        
+        assertEquals(output.error, SigningError.OK)
+
+        val encoded = output.encoded
+        assertEquals("0x0100000001a39e13b5ab406547e31284cd96fb40ed271813939c195ae7a86cd67fb8a4de62000000006a473044022014d687c0bee0b7b584db2eecbbf73b545ee255c42b8edf0944665df3fa882cfe02203bce2412d93c5a56cb4806ddd8297ff05f8fc121306e870bae33377a58a02f05012102b4ac9056d20c52ac11b0d7e83715dd3eac851cfc9cb64b8546d9ea0d4bb3bdfeffffffff0210270000000000003f76a914a58d22659b1082d1fa8698fc51996b43281bfce788ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4ce1c0000000000003f76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b400000000",
+            Numeric.toHexString(encoded.toByteArray()));
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestAnyAddress.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestAnyAddress.kt
new file mode 100644
index 00000000000..e440a5f0f32
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestAnyAddress.kt
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.utils
+
+import com.trustwallet.core.app.utils.Numeric
+import com.trustwallet.core.app.utils.toHex
+import com.trustwallet.core.app.utils.toHexByteArray
+import wallet.core.jni.*
+import java.security.InvalidParameterException
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertTrue
+import org.junit.Assert.fail
+import org.junit.Test
+
+class TestAnyAddress {
+    init {
+        System.loadLibrary("TrustWalletCore");
+    }
+
+    val any_address_test_address = "bc1qcj2vfjec3c3luf9fx9vddnglhh9gawmncmgxhz"
+    val any_address_test_pubkey = "02753f5c275e1847ba4d2fd3df36ad00af2e165650b35fe3991e9c9c46f68b12bc"
+
+    @Test
+    fun testCreateWithString() {
+        val coin = CoinType.BITCOIN
+        val address = AnyAddress(any_address_test_address, coin)
+        assertEquals(address.coin(), coin)
+        assertEquals(address.description(), any_address_test_address)
+    }
+
+    @Test
+    fun testCreateWithStringBech32() {
+        val coin = CoinType.BITCOIN
+        val address1 = AnyAddress(any_address_test_address, coin, "bc")
+        assertEquals(address1.description(), any_address_test_address)
+
+        val address2 = AnyAddress("tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3", coin, "tb")
+        assertEquals(address2.description(), "tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3")
+    }
+
+    @Test
+    fun testCreateWithPublicKey() {
+        val coin = CoinType.BITCOIN
+        val pubkey = PublicKey(any_address_test_pubkey.toHexByteArray(), PublicKeyType.SECP256K1)
+        val address = AnyAddress(pubkey, coin)
+        assertEquals(address.description(), any_address_test_address)
+    }
+
+    @Test
+    fun testCreateWithPublicKeyDerivation() {
+        val coin = CoinType.BITCOIN
+        val pubkey = PublicKey(any_address_test_pubkey.toHexByteArray(), PublicKeyType.SECP256K1)
+        val address1 = AnyAddress(pubkey, coin, Derivation.BITCOINSEGWIT)
+        assertEquals(address1.description(), any_address_test_address)
+
+        val address2 = AnyAddress(pubkey, coin, Derivation.BITCOINLEGACY)
+        assertEquals(address2.description(), "1JvRfEQFv5q5qy9uTSAezH7kVQf4hqnHXx")
+
+        val address3 = AnyAddress(pubkey, coin, Derivation.BITCOINTAPROOT)
+        assertEquals(address3.description(), "bc1pnncpg8s7gu7t6xmmzxqarcj8ydthmaz8gr4m76eephjfprs53maswgel0w")
+    }
+
+    @Test
+    fun testCreateBech32WithPublicKey() {
+        val coin = CoinType.BITCOIN
+        val pubkey = PublicKey(any_address_test_pubkey.toHexByteArray(), PublicKeyType.SECP256K1)
+        val address1 = AnyAddress(pubkey, coin, "bc")
+        assertEquals(address1.description(), any_address_test_address)
+
+        val address2 = AnyAddress(pubkey, coin, "tb")
+        assertEquals(address2.description(), "tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3")
+    }
+
+    @Test
+    fun testIsValid() {
+        val coin = CoinType.BITCOIN
+        assertTrue(AnyAddress.isValid(any_address_test_address, coin));
+        assertFalse(AnyAddress.isValid(any_address_test_address, CoinType.ETHEREUM));
+        assertFalse(AnyAddress.isValid("__INVALID_ADDRESS__", CoinType.ETHEREUM));
+    }
+
+    @Test
+    fun testIsValidBech32() {
+        val coin = CoinType.BITCOIN
+        assertTrue(AnyAddress.isValidBech32(any_address_test_address, coin, "bc"));
+        assertFalse(AnyAddress.isValidBech32(any_address_test_address, coin, "tb"));
+        assertTrue(AnyAddress.isValidBech32("tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3", coin, "tb"));
+        assertFalse(AnyAddress.isValidBech32("tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3", coin, "bc"));
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestAsnParser.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestAsnParser.kt
new file mode 100644
index 00000000000..7c896d7860c
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestAsnParser.kt
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.utils
+
+import wallet.core.jni.AsnParser
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class TestAsnParser {
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testEcdsaSignatureFromDer() {
+        val encoded = "3046022100db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495da022100ff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1"
+        val expected = "0xdb421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495daff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1"
+        val actual = AsnParser.ecdsaSignatureFromDer(encoded.toHexBytes())
+        assertEquals(actual.toHex(), expected)
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestBech32.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestBech32.kt
new file mode 100644
index 00000000000..64b32728c5c
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestBech32.kt
@@ -0,0 +1,49 @@
+package com.trustwallet.core.app.utils
+
+import org.junit.Assert.*
+import org.junit.Test
+import wallet.core.jni.Bech32
+
+class TestBech32 {
+    init {
+        System.loadLibrary("TrustWalletCore");
+    }
+
+    @Test
+    fun testEncode() {
+        val data = Numeric.hexStringToByteArray("00443214c74254b635cf84653a56d7c675be77df")
+        assertEquals(Bech32.encode("abcdef", data), "abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw")
+    }
+
+    @Test
+    fun testDecode() {
+        val decoded = Bech32.decode("abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw")
+        assertEquals(Numeric.toHexString(decoded), "0x00443214c74254b635cf84653a56d7c675be77df")
+    }
+
+    @Test
+    fun testDecodeWrongChecksumVariant() {
+        // This is a Bech32m variant, not Bech32 variant. So it should fail using Bech32 decoder.
+        val decoded = Bech32.decode("abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx")
+        assertNull(decoded)
+    }
+
+    @Test
+    fun testEncodeM() {
+        val data = Numeric.hexStringToByteArray("ffbbcdeb38bdab49ca307b9ac5a928398a418820")
+        assertEquals(Bech32.encodeM("abcdef", data), "abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx")
+    }
+
+    @Test
+    fun testDecodeM() {
+        val decoded = Bech32.decodeM("abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx")
+        assertEquals(Numeric.toHexString(decoded), "0xffbbcdeb38bdab49ca307b9ac5a928398a418820")
+    }
+
+    @Test
+    fun testDecodeMWrongChecksumVariant() {
+        // This is a Bech32 variant, not Bech32m variant. So it should fail using Bech32M decoder.
+        val decoded = Bech32.decodeM("abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw")
+        assertNull(decoded)
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestCryptoBox.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestCryptoBox.kt
new file mode 100644
index 00000000000..4b5bc226ce9
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestCryptoBox.kt
@@ -0,0 +1,47 @@
+package com.trustwallet.core.app.utils
+
+import com.trustwallet.core.app.utils.toHexBytes
+import com.trustwallet.core.app.utils.toHex
+import org.junit.Assert.*
+import org.junit.Test
+import wallet.core.jni.*
+
+class TestCryptoBox {
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testEncryptDecryptEasy() {
+        val mySecret = CryptoBoxSecretKey()
+        val myPubkey = mySecret.publicKey
+
+        val otherSecret = CryptoBoxSecretKey()
+        val otherPubkey = otherSecret.publicKey
+
+        val message = "Well done is better than well said. -Benjamin Franklin"
+        val encrypted = CryptoBox.encryptEasy(mySecret, otherPubkey, message.toByteArray())
+
+        // Step 2. Make sure the Box can be decrypted by the other side.
+        val decrypted = CryptoBox.decryptEasy(otherSecret, myPubkey, encrypted)
+        assertEquals(decrypted.toString(Charsets.UTF_8), message)
+    }
+
+    @Test
+    fun testSecretKeyFromToBytes() {
+        val secretBytesHex = "0xdd87000d4805d6fbd89ae1352f5e4445648b79d5e901c92aebcb610e9be468e4"
+        val secretBytes = secretBytesHex.toHexByteArray()
+        assert(CryptoBoxSecretKey.isValid(secretBytes))
+        val secret = CryptoBoxSecretKey(secretBytes)
+        assertEquals(secret.data().toHex(), secretBytesHex)
+    }
+
+    @Test
+    fun testPublicKeyFromToBytes() {
+        val publicBytesHex = "0xafccabc5b28a8a1fd1cd880516f9c854ae2498d0d1b978b53a59f38e4ae55747"
+        val publicBytes = publicBytesHex.toHexByteArray()
+        assert(CryptoBoxPublicKey.isValid(publicBytes))
+        val pubkey = CryptoBoxPublicKey(publicBytes)
+        assertEquals(pubkey.data().toHex(), publicBytesHex)
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestHDWallet.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestHDWallet.kt
index 0d85be821d8..9d165d95142 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestHDWallet.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestHDWallet.kt
@@ -1,18 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
 package com.trustwallet.core.app.utils
 
 import com.trustwallet.core.app.utils.Numeric
-import wallet.core.jni.CoinType
-import wallet.core.jni.Curve
-import wallet.core.jni.HDVersion
-import wallet.core.jni.HDWallet
-import wallet.core.jni.Mnemonic
-import wallet.core.jni.Purpose
+import com.trustwallet.core.app.utils.toHex
 import java.security.InvalidParameterException
 import org.junit.Assert.assertEquals
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Assert.fail
 import org.junit.Test
+import wallet.core.jni.*
 
 class TestHDWallet {
     init {
@@ -23,6 +23,39 @@ class TestHDWallet {
         "ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal"
     val password = "TREZOR"
 
+    @Test
+    fun testCreateFromMnemonicImmutableXMainnetFromSignature() {
+        // Successfully register: https://api.x.immutable.com/v1/users/0xd0972E2312518Ca15A2304D56ff9cc0b7ea0Ea37
+        val hd = HDWallet("obscure opera favorite shuffle mail tip age debate dirt pact cement loyal", "")
+        val derivationPath = Ethereum.eip2645GetPath("0xd0972E2312518Ca15A2304D56ff9cc0b7ea0Ea37", "starkex", "immutablex", "1")
+        assertEquals(derivationPath, "m/2645'/579218131'/211006541'/2124474935'/1609799702'/1")
+
+        // Retrieve eth private key
+        val ethPrivateKey = hd.getKeyForCoin(CoinType.ETHEREUM)
+        assertEquals(Numeric.toHexString(ethPrivateKey.data()), "0x03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")
+
+        // Retrieve StarkKey DerivationPath
+        val starkDerivationPath = DerivationPath(derivationPath)
+
+        // Retrieve Stark Private key part
+        val ethMsg = "Only sign this request if you’ve initiated an action with Immutable X."
+        val ethSignature = EthereumMessageSigner.signMessageImmutableX(ethPrivateKey, ethMsg)
+        assertEquals(ethSignature, "18b1be8b78807d3326e28bc286d7ee3d068dcd90b1949ce1d25c1f99825f26e70992c5eb7f44f76b202aceded00d74f771ed751f2fe538eec01e338164914fe001")
+        val starkPrivateKey = StarkWare.getStarkKeyFromSignature(starkDerivationPath, ethSignature)
+        val starkPublicKey = starkPrivateKey.getPublicKeyByType(PublicKeyType.STARKEX)
+        assertEquals(Numeric.toHexString(starkPrivateKey.data()), "0x04be51a04e718c202e4dca60c2b72958252024cfc1070c090dd0f170298249de")
+        assertEquals(Numeric.toHexString(starkPublicKey.data()), "0x00e5b9b11f8372610ef35d647a1dcaba1a4010716588d591189b27bf3c2d5095")
+
+        // Account register
+        val ethMsgToRegister = "Only sign this key linking request from Immutable X"
+        val ethSignatureToRegister = EthereumMessageSigner.signMessageImmutableX(ethPrivateKey, ethMsgToRegister)
+        assertEquals(ethSignatureToRegister, "646da4160f7fc9205e6f502fb7691a0bf63ecbb74bbb653465cd62388dd9f56325ab1e4a9aba99b1661e3e6251b42822855a71e60017b310b9f90e990a12e1dc01")
+        val starkMsg = "463a2240432264a3aa71a5713f2a4e4c1b9e12bbb56083cd56af6d878217cf"
+        val starkSignature = StarkExMessageSigner.signMessage(starkPrivateKey, starkMsg)
+        assertEquals(starkSignature, "04cf5f21333dd189ada3c0f2a51430d733501a9b1d5e07905273c1938cfb261e05b6013d74adde403e8953743a338c8d414bb96bf69d2ca1a91a85ed2700a528")
+        assertTrue(StarkExMessageSigner.verifyMessage(starkPublicKey, starkMsg, starkSignature))
+    }
+
     @Test
     fun testCreateFromMnemonic() {
         val hd = HDWallet(words, password)
@@ -65,6 +98,61 @@ class TestHDWallet {
         assertEquals(Numeric.toHexString(hd.entropy()), "0xba5821e8c356c05ba5f025d9532fe0f21f65d594")
     }
 
+    @Test
+    fun testGetKeyForCoin() {
+        val coin = CoinType.BITCOIN
+        val wallet = HDWallet(words, password)
+        val key = wallet.getKeyForCoin(coin)
+
+        val address = coin.deriveAddress(key)
+        assertEquals(address, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85")
+    }
+
+    @Test
+    fun testGetKeyDerivation() {
+        val coin = CoinType.BITCOIN
+        val wallet = HDWallet(words, password)
+
+        val key1 = wallet.getKeyDerivation(coin, Derivation.BITCOINSEGWIT)
+        assertEquals(key1.data().toHex(), "0x1901b5994f075af71397f65bd68a9fff8d3025d65f5a2c731cf90f5e259d6aac")
+
+        val key2 = wallet.getKeyDerivation(coin, Derivation.BITCOINLEGACY)
+        assertEquals(key2.data().toHex(), "0x28071bf4e2b0340db41b807ed8a5514139e5d6427ff9d58dbd22b7ed187103a4")
+
+        val key3 = wallet.getKeyDerivation(coin, Derivation.BITCOINTESTNET)
+        assertEquals(key3.data().toHex(), "0xca5845e1b43e3adf577b7f110b60596479425695005a594c88f9901c3afe864f")
+
+        val key4 = wallet.getKeyDerivation(coin, Derivation.BITCOINTAPROOT)
+        assertEquals(key4.data().toHex(), "0xa2c4d6df786f118f20330affd65d248ffdc0750ae9cbc729d27c640302afd030")
+    }
+
+    @Test
+    fun testGetAddressForCoin() {
+        val coin = CoinType.BITCOIN
+        val wallet = HDWallet(words, password)
+
+        val address = wallet.getAddressForCoin(coin)
+        assertEquals(address, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85")
+    }
+
+    @Test
+    fun testGetAddressDerivation() {
+        val coin = CoinType.BITCOIN
+        val wallet = HDWallet(words, password)
+
+        val address1 = wallet.getAddressDerivation(coin, Derivation.BITCOINSEGWIT)
+        assertEquals(address1, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85")
+
+        val address2 = wallet.getAddressDerivation(coin, Derivation.BITCOINLEGACY)
+        assertEquals(address2, "1PeUvjuxyf31aJKX6kCXuaqxhmG78ZUdL1")
+
+        val address3 = wallet.getAddressDerivation(coin, Derivation.BITCOINTESTNET)
+        assertEquals(address3, "tb1qwgpxgwn33z3ke9s7q65l976pseh4edrzfmyvl0")
+
+        val address4 = wallet.getAddressDerivation(coin, Derivation.BITCOINTAPROOT)
+        assertEquals(address4, "bc1pgqks0cynn93ymve4x0jq3u7hne77908nlysp289hc44yc4cmy0hslyckrz")
+    }
+
     @Test
     fun testDerive() {
         val wallet = HDWallet(words, password)
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestKeyStore.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestKeyStore.kt
index 3832db95139..599d3369216 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestKeyStore.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestKeyStore.kt
@@ -4,6 +4,7 @@ import org.junit.Assert.*
 import org.junit.Test
 import wallet.core.jni.StoredKey
 import wallet.core.jni.CoinType
+import wallet.core.jni.StoredKeyEncryption
 
 class TestKeyStore {
 
@@ -21,6 +22,16 @@ class TestKeyStore {
         assertNotNull(result2)
     }
 
+    @Test
+    fun testDecryptMnemonicAes256() {
+        val keyStore = StoredKey("Test Wallet", "password".toByteArray(), StoredKeyEncryption.AES256CTR)
+        val result = keyStore.decryptMnemonic("wrong".toByteArray())
+        val result2 = keyStore.decryptMnemonic("password".toByteArray())
+
+        assertNull(result)
+        assertNotNull(result2)
+    }
+
     @Test
     fun testRemoveCoins() {
         val password = "password".toByteArray()
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestLiquidStaking.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestLiquidStaking.kt
new file mode 100644
index 00000000000..44701d5f2b1
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestLiquidStaking.kt
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core.app.utils
+
+import com.google.protobuf.ByteString
+import org.junit.Assert
+import wallet.core.jni.*
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import wallet.core.java.AnySigner
+import wallet.core.jni.proto.Ethereum
+import wallet.core.jni.proto.LiquidStaking
+import wallet.core.jni.LiquidStaking as WCLiquidStaking
+
+class TestLiquidStaking {
+    init {
+        System.loadLibrary("TrustWalletCore");
+    }
+
+    @Test
+    fun testStraderStakeMatic() {
+        val input = LiquidStaking.Input.newBuilder()
+        input.apply {
+            blockchain = LiquidStaking.Blockchain.POLYGON
+            protocol = LiquidStaking.Protocol.Strader
+            smartContractAddress = "0xfd225c9e6601c9d38d8f98d8731bf59efcf8c0e3"
+            stake = LiquidStaking.Stake.newBuilder().apply {
+                amount = "1000000000000000000"
+                asset = LiquidStaking.Asset.newBuilder().apply {
+                    stakingToken = LiquidStaking.Coin.POL
+                }.build()
+            }.build()
+        }
+
+
+        val inputSerialized = input.build().toByteArray()
+        assertEquals(Numeric.toHexString(inputSerialized), "0x0a170a00121331303030303030303030303030303030303030222a3078666432323563396536363031633964333864386639386438373331626635396566636638633065333001")
+        val outputData = WCLiquidStaking.buildRequest(inputSerialized)
+        assertEquals(outputData.count(), 68)
+
+        val outputProto = LiquidStaking.Output.newBuilder().mergeFrom(outputData)
+        Assert.assertTrue(outputProto.hasEthereum())
+        val txInput = outputProto.ethereum
+
+        val txInputFull = txInput.toBuilder().apply {
+            chainId = ByteString.copyFrom("0x89".toHexByteArray())
+            nonce = ByteString.copyFrom("0x01".toHexByteArray())
+            maxFeePerGas = ByteString.copyFrom("0x8fbcc8fcd8".toHexByteArray())
+            maxInclusionFeePerGas = ByteString.copyFrom("0x085e42c7c0".toHexByteArray())
+            gasLimit = ByteString.copyFrom("0x01c520".toHexByteArray())
+            privateKey = ByteString.copyFrom(PrivateKey("0x4a160b803c4392ea54865d0c5286846e7ad5e68fbd78880547697472b22ea7ab".toHexByteArray()).data())
+        }.build()
+
+        val output = AnySigner.sign(txInputFull, CoinType.ETHEREUM, Ethereum.SigningOutput.parser())
+
+        assertEquals(Numeric.toHexString(output.encoded.toByteArray()), "0x02f87a81890185085e42c7c0858fbcc8fcd88301c52094fd225c9e6601c9d38d8f98d8731bf59efcf8c0e3880de0b6b3a764000084c78cf1a0c001a04bcf92394d53d4908130cc6d4f7b2491967f9d6c59292b84c1f56adc49f6c458a073e09f45d64078c41a7946ffdb1dee8e604eb76f318088490f8f661bb7ddfc54")
+        // Successfully broadcasted: https://polygonscan.com/tx/0x0f6c4f7a893c3f08be30d2ea24479d7ed4bdba40875d07cfd607cf97980b7cf0
+    }
+}
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestPrivateKey.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestPrivateKey.kt
index abdbc8050ab..d84bccd69c5 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestPrivateKey.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestPrivateKey.kt
@@ -3,11 +3,7 @@ package com.trustwallet.core.app.utils
 import com.trustwallet.core.app.utils.toHexBytes
 import org.junit.Assert.*
 import org.junit.Test
-import wallet.core.jni.Curve
-import wallet.core.jni.Hash
-import wallet.core.jni.PrivateKey
-import wallet.core.jni.PublicKey
-import wallet.core.jni.PublicKeyType
+import wallet.core.jni.*
 
 class TestPrivateKey {
     private val validPrivateKeyData = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5".toHexBytes()
@@ -23,6 +19,24 @@ class TestPrivateKey {
         assertTrue(data.size == 32);
     }
 
+    @Test
+    fun testCreateStarkKey() {
+        val data = Numeric.hexStringToByteArray("06cf0a8bf113352eb863157a45c5e5567abb34f8d32cddafd2c22aa803f4892c")
+        assertTrue(PrivateKey.isValid(data, Curve.STARKEX))
+        var privateKey = PrivateKey(data)
+        var pubKey = privateKey.getPublicKeyByType(PublicKeyType.STARKEX)
+        assertEquals(pubKey.data().toHex(), "0x02d2bbdc1adaf887b0027cdde2113cfd81c60493aa6dc15d7887ddf1a82bc831")
+    }
+
+    @Test
+    fun testCreateStarkKeySigning() {
+        val data = Numeric.hexStringToByteArray("0139fe4d6f02e666e86a6f58e65060f115cd3c185bd9e98bd829636931458f79")
+        var privateKey = PrivateKey(data)
+        val digest = Numeric.hexStringToByteArray("06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76")
+        val signature = privateKey.sign(digest, Curve.STARKEX)
+        assertEquals(signature.toHex(), "0x061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a")
+    }
+
     @Test
     fun testInvalid() {
         val bytes = Numeric.hexStringToByteArray("deadbeaf")
@@ -67,61 +81,9 @@ class TestPrivateKey {
     }
 
     @Test
-    fun testGetSharedKey() {
-        val privateKeyData = "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0".toHexBytes()
-        val privateKey = PrivateKey(privateKeyData)
-        
-        val publicKeyData = "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992".toHexBytes()
-        val publicKey = PublicKey(publicKeyData, PublicKeyType.SECP256K1)
-
-        val derivedData = privateKey.getSharedKey(publicKey, Curve.SECP256K1)
-        assertNotNull(derivedData)
-
-        assertEquals(derivedData?.toHex(), "0xef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a")
-    }
-
-    @Test
-    fun testGetSharedKeyWycherproof() {
-        val privateKeyData = "f4b7ff7cccc98813a69fae3df222bfe3f4e28f764bf91b4a10d8096ce446b254".toHexBytes()
+    fun testGetPublicKeyCoinType() {
+        val privateKeyData = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5".toHexBytes()
         val privateKey = PrivateKey(privateKeyData)
-        
-        val publicKeyData = "02d8096af8a11e0b80037e1ee68246b5dcbb0aeb1cf1244fd767db80f3fa27da2b".toHexBytes()
-        val publicKey = PublicKey(publicKeyData, PublicKeyType.SECP256K1)
-
-        val derivedData = privateKey.getSharedKey(publicKey, Curve.SECP256K1)
-        assertNotNull(derivedData)
-
-        assertEquals(derivedData?.toHex(), "0x81165066322732362ca5d3f0991d7f1f7d0aad7ea533276496785d369e35159a")
-    }
-
-    @Test
-    fun testGetSharedKeyBidirectional() {
-        val privateKeyData1 = "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0".toHexBytes()
-        val privateKey1 = PrivateKey(privateKeyData1)
-        val publicKey1 = privateKey1.getPublicKeySecp256k1(true)
-        
-        val privateKeyData2 = "ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a".toHexBytes()
-        val privateKey2 = PrivateKey(privateKeyData2)
-        val publicKey2 = privateKey2.getPublicKeySecp256k1(true)
-
-        val derivedData1 = privateKey1.getSharedKey(publicKey2, Curve.SECP256K1)
-        assertNotNull(derivedData1)
-
-        val derivedData2 = privateKey2.getSharedKey(publicKey1, Curve.SECP256K1)
-        assertNotNull(derivedData2)
-
-        assertEquals(derivedData1?.toHex(), derivedData2?.toHex())
+        assertEquals(privateKey.getPublicKey(CoinType.ETHEREUM).data().toHex(), "0x0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91");
     }
-
-    @Test
-    fun testGetSharedKeyError() {
-        val privateKeyData = "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0".toHexBytes()
-        val privateKey = PrivateKey(privateKeyData)
-        
-        val publicKeyData = "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992".toHexBytes()
-        val publicKey = PublicKey(publicKeyData, PublicKeyType.SECP256K1)
-
-        val derivedData = privateKey.getSharedKey(publicKey, Curve.ED25519)
-        assertNull(derivedData)
-    }    
 }
\ No newline at end of file
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestPublicKey.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestPublicKey.kt
index dbd57dc1425..bfecc51014e 100644
--- a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestPublicKey.kt
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestPublicKey.kt
@@ -4,10 +4,7 @@ import com.trustwallet.core.app.utils.toHexBytes
 import com.trustwallet.core.app.utils.toHex
 import org.junit.Assert.*
 import org.junit.Test
-import wallet.core.jni.Curve
-import wallet.core.jni.Hash
-import wallet.core.jni.PrivateKey
-import wallet.core.jni.PublicKey
+import wallet.core.jni.*
 
 
 class TestPublicKey {
@@ -28,6 +25,17 @@ class TestPublicKey {
         val publicKey = privateKey?.getPublicKeySecp256k1(true)
         assertEquals("0x0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1", publicKey?.data()?.toHex())
     }
+    
+    @Test
+    fun testVerifyStarkey() {
+        val data = Numeric.hexStringToByteArray("02c5dbad71c92a45cc4b40573ae661f8147869a91d57b8d9b8f48c8af7f83159")
+        val publicKey = PublicKey(data, PublicKeyType.STARKEX)
+        var signature = Numeric.hexStringToByteArray("061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a")
+        val hash = Numeric.hexStringToByteArray("06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76")
+        assertTrue(publicKey.verify(signature, hash))
+        signature = Numeric.hexStringToByteArray("061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9b")
+        assertFalse(publicKey.verify(signature, hash))
+    }
 
     @Test
     fun testSign() {
diff --git a/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestWebAuthn.kt b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestWebAuthn.kt
new file mode 100644
index 00000000000..d24ff122dbe
--- /dev/null
+++ b/android/app/src/androidTest/java/com/trustwallet/core/app/utils/TestWebAuthn.kt
@@ -0,0 +1,36 @@
+package com.trustwallet.core.app.utils
+
+import com.trustwallet.core.app.utils.toHexByteArray
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import com.trustwallet.core.app.utils.Numeric
+import wallet.core.jni.*
+
+class TestWebAuthn {
+
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+
+    @Test
+    fun testGetPublicKey() {
+        val attestationObject = Numeric.hexStringToByteArray("0xa363666d74646e6f6e656761747453746d74a068617574684461746158a4f95bc73828ee210f9fd3bbe72d97908013b0a3759e9aea3d0ae318766cd2e1ad4500000000adce000235bcc60a648b0b25f1f055030020c720eb493e167ce93183dd91f5661e1004ed8cc1be23d3340d92381da5c0c80ca5010203262001215820a620a8cfc88fd062b11eab31663e56cad95278bef612959be214d98779f645b82258204e7b905b42917570148b0432f99ba21f2e7eebe018cbf837247e38150a89f771")
+        val result = WebAuthn.getPublicKey(attestationObject).data()
+        assertEquals(Numeric.toHexString(result), "0x04a620a8cfc88fd062b11eab31663e56cad95278bef612959be214d98779f645b84e7b905b42917570148b0432f99ba21f2e7eebe018cbf837247e38150a89f771")
+    }
+
+    @Test
+    fun testGetRSValues() {
+        val signature = Numeric.hexStringToByteArray("0x30440220766589b461a838748708cdf88444b21b1fa52b57d70671b4f9bf60ad14b372ec022020cc439c9c20661bfa39bbea24a900ec1484b2395eb065ead8ef4e273144a57d")
+        val result = WebAuthn.getRSValues(signature)
+        assertEquals(Numeric.toHexString(result), "0x766589b461a838748708cdf88444b21b1fa52b57d70671b4f9bf60ad14b372ec20cc439c9c20661bfa39bbea24a900ec1484b2395eb065ead8ef4e273144a57d")
+    }
+
+    @Test
+    fun testReconstructOriginalMessage() {
+        val authenticatorData = Numeric.hexStringToByteArray("0x1a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d00000000")
+        val clientDataJSON = Numeric.hexStringToByteArray("0x7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a224e5549794f5545774d6b45744e554535517930304d6b5a424c546847516a4174517a52474f4441794d3045304f546b30222c226f726967696e223a2268747470733a2f2f747275737477616c6c65742e636f6d227d")
+        val result = WebAuthn.reconstructOriginalMessage(authenticatorData, clientDataJSON)
+        assertEquals(Numeric.toHexString(result), "0x3254cdbd677e6e31e75d2135bad0cf56440d7c6b108c141a3509d76ce45c6731")
+    }
+}
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index ef7f63193fb..1df538f8715 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.trustwallet.core.app">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
-            android:allowBackup="true"
-            android:icon="@mipmap/ic_launcher"
-            android:label="@string/app_name"
-            android:roundIcon="@mipmap/ic_launcher_round"
-            android:supportsRtl="true"
-            android:theme="@style/AppTheme">
+        android:allowBackup="true"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/app_name"
+        android:roundIcon="@mipmap/ic_launcher_round"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/android/build.gradle b/android/build.gradle
index b1ca946f2d1..ae4f70d4299 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,18 +1,12 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-
 buildscript {
     ext.kotlin_version = '1.6.10'
     repositories {
         google()
         mavenCentral()
-        maven {
-            url = uri("https://plugins.gradle.org/m2/")
-        }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
     }
 }
 
@@ -26,7 +20,7 @@ allprojects {
 subprojects {
     afterEvaluate {
         if (getPlugins().hasPlugin('android') ||
-            getPlugins().hasPlugin('android-library')) {
+                getPlugins().hasPlugin('android-library')) {
             configure(android.lintOptions) {
                 abortOnError false
             }
diff --git a/android/gradle.properties b/android/gradle.properties
index 53c570a2de0..395c1f03275 100644
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -20,6 +20,8 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=false
+android.defaults.buildfeatures.resvalues=false
 
 VERSION_NAME=0.12.1
 VERSION_CODE=1
diff --git a/android/gradle/wrapper/gradle-wrapper.jar b/android/gradle/wrapper/gradle-wrapper.jar
index 62d4c053550..c1962a79e29 100644
Binary files a/android/gradle/wrapper/gradle-wrapper.jar and b/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
index 4cf5f4720c8..a21c6ebe28b 100644
--- a/android/gradle/wrapper/gradle-wrapper.properties
+++ b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jan 19 18:01:57 JST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.9.2-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1-all.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/android/gradlew b/android/gradlew
index fbd7c515832..aeb74cbb43e 100755
--- a/android/gradlew
+++ b/android/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,98 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,7 +129,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +137,109 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-    
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/android/gradlew.bat b/android/gradlew.bat
index a9f778a7a96..6689b85beec 100644
--- a/android/gradlew.bat
+++ b/android/gradlew.bat
@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +65,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,17 +72,19 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal
diff --git a/android/settings.gradle b/android/settings.gradle
index 1924f990d04..044d01a9482 100644
--- a/android/settings.gradle
+++ b/android/settings.gradle
@@ -1 +1 @@
-include ':app', ':trustwalletcore'
+include ':app', ':wallet-core', ':wallet-core-proto'
diff --git a/android/trustwalletcore/build.gradle b/android/trustwalletcore/build.gradle
deleted file mode 100644
index bf97bfd2412..00000000000
--- a/android/trustwalletcore/build.gradle
+++ /dev/null
@@ -1,53 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'maven-publish'
-group='com.github.trustwallet'
-
-android {
-    compileSdkVersion 32
-    ndkVersion '23.1.7779620'
-    defaultConfig {
-        minSdkVersion 23
-        versionCode 1
-        versionName "1.0"
-        externalNativeBuild {
-            cmake {
-                arguments "-DCMAKE_BUILD_TYPE=Release"
-            }
-        }
-    }
-
-    lintOptions {
-        abortOnError false
-        disable 'InvalidPackage'
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
-        debug {
-            minifyEnabled false
-            // limit platforms built for testing
-            ndk {
-                abiFilters 'x86', 'arm64-v8a'
-            }
-        }
-    }
-
-    sourceSets {
-        main.java.srcDirs += '../../jni/java'
-    }
-
-    externalNativeBuild {
-        cmake {
-            version "3.18.1"
-            path "../../CMakeLists.txt"
-        }
-    }
-}
-
-dependencies {
-    implementation 'com.google.protobuf:protobuf-javalite:3.21.2'
-}
-
-apply from: 'maven-push.gradle'
diff --git a/android/trustwalletcore/maven-push.gradle b/android/trustwalletcore/maven-push.gradle
deleted file mode 100644
index 12746f09c4a..00000000000
--- a/android/trustwalletcore/maven-push.gradle
+++ /dev/null
@@ -1,51 +0,0 @@
-apply plugin: 'maven-publish'
-
-version project.property('version')
-group 'com.trustwallet'
-
-task sourcesJar(type: Jar) {
-    classifier = 'sources'
-    from android.sourceSets.main.java.sourceFiles
-}
-
-artifacts {
-    archives sourcesJar
-}
-
-publishing {
-    publications {
-        Production(MavenPublication) {
-            artifact("$buildDir/outputs/aar/trustwalletcore-release.aar")
-            artifact sourcesJar { 
-                classifier "sources"
-            }
-            groupId this.group
-            artifactId 'wallet-core'
-            version this.version
-
-            pom.withXml {
-                def dependenciesNode = asNode().appendNode('dependencies')
-
-                configurations.implementation.allDependencies.each {
-                    if (it.name != 'unspecified') {
-                        def dependencyNode = dependenciesNode.appendNode('dependency')
-                        dependencyNode.appendNode('groupId', it.group)
-                        dependencyNode.appendNode('artifactId', it.name)
-                        dependencyNode.appendNode('version', it.version)
-                    }
-                }
-            }
-        }
-    }
-
-    repositories {
-        maven {
-            name = "GitHubPackages"
-            url = uri("https://maven.pkg.github.com/trustwallet/wallet-core")
-            credentials {
-                username = System.getenv("WC_GITHUB_USER")
-                password = System.getenv("WC_GITHUB_TOKEN")
-            }
-        }
-    }
-}
diff --git a/android/trustwalletcore/src/main/AndroidManifest.xml b/android/trustwalletcore/src/main/AndroidManifest.xml
deleted file mode 100644
index 3f53eb1d42b..00000000000
--- a/android/trustwalletcore/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.trustwallet.core"/>
diff --git a/android/wallet-core-proto/build.gradle b/android/wallet-core-proto/build.gradle
new file mode 100644
index 00000000000..c04e323f48e
--- /dev/null
+++ b/android/wallet-core-proto/build.gradle
@@ -0,0 +1,21 @@
+apply plugin: 'java-library'
+apply plugin: 'maven-publish'
+
+group = 'com.trustwallet'
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_17
+    targetCompatibility = JavaVersion.VERSION_17
+
+    withSourcesJar()
+
+    sourceSets {
+        main.java.srcDirs += '../../jni/proto'
+    }
+}
+
+dependencies {
+    api 'com.google.protobuf:protobuf-javalite:3.22.3'
+}
+
+apply from: 'maven-push.gradle'
diff --git a/android/wallet-core-proto/maven-push.gradle b/android/wallet-core-proto/maven-push.gradle
new file mode 100644
index 00000000000..cb48062952d
--- /dev/null
+++ b/android/wallet-core-proto/maven-push.gradle
@@ -0,0 +1,20 @@
+apply plugin: 'maven-publish'
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            from components.java
+        }
+    }
+
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/trustwallet/wallet-core")
+            credentials {
+                username = System.getenv("GITHUB_USER")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
diff --git a/android/trustwalletcore/.gitignore b/android/wallet-core/.gitignore
similarity index 100%
rename from android/trustwalletcore/.gitignore
rename to android/wallet-core/.gitignore
diff --git a/android/wallet-core/build.gradle b/android/wallet-core/build.gradle
new file mode 100644
index 00000000000..fcdf15afbbc
--- /dev/null
+++ b/android/wallet-core/build.gradle
@@ -0,0 +1,61 @@
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+
+group = 'com.trustwallet'
+
+android {
+    namespace 'wallet.core'
+    compileSdkVersion 32
+    ndkVersion '23.1.7779620'
+    defaultConfig {
+        minSdkVersion 23
+        versionCode 1
+        versionName "1.0"
+        externalNativeBuild {
+            cmake {
+                arguments "-DCMAKE_BUILD_TYPE=Release", "-DTW_UNITY_BUILD=ON"
+            }
+        }
+    }
+
+    lintOptions {
+        abortOnError false
+        disable 'InvalidPackage'
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+        debug {
+            minifyEnabled false
+            // limit platforms built for testing
+            ndk {
+                abiFilters 'x86', 'arm64-v8a'
+            }
+        }
+    }
+
+    sourceSets {
+        main.java.srcDirs += '../../jni/java'
+    }
+
+    externalNativeBuild {
+        cmake {
+            version "3.18.1"
+            path "../../CMakeLists.txt"
+        }
+    }
+
+    publishing {
+        singleVariant('release') {
+            withSourcesJar()
+        }
+    }
+}
+
+dependencies {
+    api project(':wallet-core-proto')
+}
+
+apply from: 'maven-push.gradle'
diff --git a/android/trustwalletcore/gradle.properties b/android/wallet-core/gradle.properties
similarity index 100%
rename from android/trustwalletcore/gradle.properties
rename to android/wallet-core/gradle.properties
diff --git a/android/wallet-core/maven-push.gradle b/android/wallet-core/maven-push.gradle
new file mode 100644
index 00000000000..49dd6eec103
--- /dev/null
+++ b/android/wallet-core/maven-push.gradle
@@ -0,0 +1,22 @@
+apply plugin: 'maven-publish'
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            afterEvaluate {
+                from components.release
+            }
+        }
+    }
+
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/trustwallet/wallet-core")
+            credentials {
+                username = System.getenv("GITHUB_USER")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
diff --git a/audit/2023-09-15_TrustWallet_SecureCodeReviewReport_Public_v2.00.pdf b/audit/2023-09-15_TrustWallet_SecureCodeReviewReport_Public_v2.00.pdf
new file mode 100644
index 00000000000..d0efac0de8d
Binary files /dev/null and b/audit/2023-09-15_TrustWallet_SecureCodeReviewReport_Public_v2.00.pdf differ
diff --git a/bootstrap.sh b/bootstrap.sh
index 1dba588dd30..1cc2636b987 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -5,8 +5,43 @@
 # Fail if any commands fails
 set -e
 
-echo "#### Initializing workspace with dependencies ... ####"
+source tools/parse_args "$@"
+
+if isHelp; then
+  echo "usage: bootstrap.sh [-h | --help] [all | wasm | android | ios]"
+  echo ""
+  echo "Installs dependencies and prepares WalletCore for building"
+  exit 0
+fi
+
+echo "#### Installing system dependencies ... ####"
+if [[ $(uname) == "Darwin" ]]; then
+  tools/install-sys-dependencies-mac
+else
+  tools/install-sys-dependencies-linux
+fi
+
+echo "#### Installing C++ libraries ... ####"
 tools/install-dependencies
 
-echo "#### Building and running tests ... ####"
-tools/build-and-test
+echo "#### Installing Rust toolchain and tools ... ####"
+tools/install-rust-dependencies dev
+
+# WASM
+if isTargetSpecified "wasm"; then
+  echo "#### Installing WASM environment ... ####"
+  tools/install-wasm-dependencies
+fi
+
+# Android
+if isTargetSpecified "android"; then
+  echo "#### Installing Android dependencies ... ####"
+  tools/install-android-dependencies
+fi
+
+echo "#### Generating files... ####"
+tools/generate-files "$@"
+
+echo ""
+echo "WalletCore is ready for development!"
+echo "Consider running native C++ tests via './tools/build-and-test'"
diff --git a/cmake/Protobuf.cmake b/cmake/Protobuf.cmake
index fe59c9ea73a..8e0a93251d2 100644
--- a/cmake/Protobuf.cmake
+++ b/cmake/Protobuf.cmake
@@ -1,11 +1,9 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
-set(protobuf_SOURCE_DIR ${CMAKE_SOURCE_DIR}/build/local/src/protobuf/protobuf-3.19.2)
-set(protobuf_source_dir ${CMAKE_SOURCE_DIR}/build/local/src/protobuf/protobuf-3.19.2)
+set(protobuf_SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}/../build/local/src/protobuf/protobuf-3.19.2)
+set(protobuf_source_dir ${CMAKE_CURRENT_LIST_DIR}/../build/local/src/protobuf/protobuf-3.19.2)
 
 # sort + uniq -u
 # https://github.com/protocolbuffers/protobuf/blob/master/cmake/libprotobuf.cmake
diff --git a/cmake/StandardSettings.cmake b/cmake/StandardSettings.cmake
index 752b2285672..bef5a651b52 100644
--- a/cmake/StandardSettings.cmake
+++ b/cmake/StandardSettings.cmake
@@ -66,7 +66,7 @@ endif ()
 option(TW_UNIT_TESTS "Enable the unit tests of the project" ON)
 option(TW_BUILD_EXAMPLES "Enable the examples builds of the project" ON)
 
-if (ANDROID OR IOS_PLATFORM OR TW_COMPILE_WASM)
+if (ANDROID OR IOS_PLATFORM OR TW_COMPILE_WASM OR TW_COMPILE_JAVA)
     set(TW_UNIT_TESTS OFF)
     set(TW_BUILD_EXAMPLES OFF)
 endif()
diff --git a/codegen-v2/Cargo.lock b/codegen-v2/Cargo.lock
new file mode 100644
index 00000000000..6ed11b1c48a
--- /dev/null
+++ b/codegen-v2/Cargo.lock
@@ -0,0 +1,385 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "codegen-v2"
+version = "0.1.0"
+dependencies = [
+ "aho-corasick",
+ "convert_case",
+ "handlebars",
+ "heck",
+ "pathdiff",
+ "serde",
+ "serde_json",
+ "serde_yaml",
+ "toml_edit",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
+dependencies = [
+ "unicode-segmentation",
+]
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "crypto-common",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "handlebars"
+version = "4.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
+dependencies = [
+ "log",
+ "pest",
+ "pest_derive",
+ "serde",
+ "serde_json",
+ "thiserror",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "indexmap"
+version = "2.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "pathdiff"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
+
+[[package]]
+name = "pest"
+version = "2.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f8023d0fb78c8e03784ea1c7f3fa36e68a723138990b8d5a47d916b651e7a8"
+dependencies = [
+ "memchr",
+ "thiserror",
+ "ucd-trie",
+]
+
+[[package]]
+name = "pest_derive"
+version = "2.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0d24f72393fd16ab6ac5738bc33cdb6a9aa73f8b902e8fe29cf4e67d7dd1026"
+dependencies = [
+ "pest",
+ "pest_generator",
+]
+
+[[package]]
+name = "pest_generator"
+version = "2.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc17e2a6c7d0a492f0158d7a4bd66cc17280308bbaff78d5bef566dca35ab80"
+dependencies = [
+ "pest",
+ "pest_meta",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "pest_meta"
+version = "2.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "934cd7631c050f4674352a6e835d5f6711ffbfb9345c2fc0107155ac495ae293"
+dependencies = [
+ "once_cell",
+ "pest",
+ "sha2",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e835ff2298f5721608eb1a980ecaee1aef2c132bf95ecc026a11b7bf3c01c02e"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+
+[[package]]
+name = "serde"
+version = "1.0.197"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.197"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.114"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_yaml"
+version = "0.9.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fd075d994154d4a774f95b51fb96bdc2832b0ea48425c92546073816cda1f2f"
+dependencies = [
+ "indexmap",
+ "itoa",
+ "ryu",
+ "serde",
+ "unsafe-libyaml",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.58"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "typenum"
+version = "1.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
+
+[[package]]
+name = "ucd-trie"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "unicode-segmentation"
+version = "1.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
+
+[[package]]
+name = "unsafe-libyaml"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab4c90930b95a82d00dc9e9ac071b4991924390d46cbd0dfe566148667605e4b"
+
+[[package]]
+name = "version_check"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
diff --git a/codegen-v2/Cargo.toml b/codegen-v2/Cargo.toml
new file mode 100644
index 00000000000..43c2afea1c6
--- /dev/null
+++ b/codegen-v2/Cargo.toml
@@ -0,0 +1,23 @@
+[package]
+name = "codegen-v2"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "libparser"
+path = "src/lib.rs"
+
+[[bin]]
+name = "parser"
+path = "src/main.rs"
+
+[dependencies]
+aho-corasick = "1.1.2"
+convert_case = "0.6.0"
+pathdiff = "0.2.1"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_yaml = "0.9.21"
+toml_edit = "0.21.0"
+handlebars = "4.3.6"
+heck = "0.4.1"
diff --git a/codegen-v2/README.md b/codegen-v2/README.md
new file mode 100644
index 00000000000..33e018ac407
--- /dev/null
+++ b/codegen-v2/README.md
@@ -0,0 +1,14 @@
+# About
+
+This is a _work-in-progress_ parser meant to deprecate the existing Ruby parser
+in `codegen/`. As of now, we only support Swift binding generation. This project
+will progress over multiple stages (PRs).
+
+## Execution
+
+```bash
+$ cd codegen-v2
+$ cargo run -- swift
+```
+
+The bindings are saved to `bindings/`.
diff --git a/codegen-v2/manifest/TWAES.yaml b/codegen-v2/manifest/TWAES.yaml
new file mode 100644
index 00000000000..24637e9155b
--- /dev/null
+++ b/codegen-v2/manifest/TWAES.yaml
@@ -0,0 +1,134 @@
+name: TWAES
+structs:
+- name: TWAES
+  is_public: true
+  is_class: false
+  fields:
+  - - unused
+    - variant: u_int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+functions:
+- name: TWAESEncryptCBC
+  is_public: true
+  is_static: true
+  params:
+  - name: key
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: iv
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: mode
+    type:
+      variant: enum
+      value: TWAESPaddingMode
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWAESDecryptCBC
+  is_public: true
+  is_static: true
+  params:
+  - name: key
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: iv
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: mode
+    type:
+      variant: enum
+      value: TWAESPaddingMode
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWAESEncryptCTR
+  is_public: true
+  is_static: true
+  params:
+  - name: key
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: iv
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWAESDecryptCTR
+  is_public: true
+  is_static: true
+  params:
+  - name: key
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: iv
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWAESPaddingMode.yaml b/codegen-v2/manifest/TWAESPaddingMode.yaml
new file mode 100644
index 00000000000..2776625e45f
--- /dev/null
+++ b/codegen-v2/manifest/TWAESPaddingMode.yaml
@@ -0,0 +1,11 @@
+name: TWAESPaddingMode
+enums:
+- name: TWAESPaddingMode
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: zero
+    value: 0
+  - name: pkcs7
+    value: 1
diff --git a/codegen-v2/manifest/TWAccount.yaml b/codegen-v2/manifest/TWAccount.yaml
new file mode 100644
index 00000000000..4a2be534e60
--- /dev/null
+++ b/codegen-v2/manifest/TWAccount.yaml
@@ -0,0 +1,95 @@
+name: TWAccount
+structs:
+- name: TWAccount
+  is_public: true
+  is_class: true
+inits:
+- name: TWAccountCreate
+  is_public: true
+  is_nullable: false
+  params:
+  - name: address
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivationPath
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: publicKey
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: extendedPublicKey
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWAccountDelete
+properties:
+- name: TWAccountAddress
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWAccountCoin
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWCoinType
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWAccountDerivation
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWDerivation
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWAccountDerivationPath
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWAccountPublicKey
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWAccountExtendedPublicKey
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWAeternityProto.yaml b/codegen-v2/manifest/TWAeternityProto.yaml
new file mode 100644
index 00000000000..4e2479caffb
--- /dev/null
+++ b/codegen-v2/manifest/TWAeternityProto.yaml
@@ -0,0 +1,4 @@
+name: TWAeternityProto
+protos:
+- TW_Aeternity_Proto_SigningInput
+- TW_Aeternity_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWAionProto.yaml b/codegen-v2/manifest/TWAionProto.yaml
new file mode 100644
index 00000000000..f081c9c56dc
--- /dev/null
+++ b/codegen-v2/manifest/TWAionProto.yaml
@@ -0,0 +1,4 @@
+name: TWAionProto
+protos:
+- TW_Aion_Proto_SigningInput
+- TW_Aion_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWAlgorandProto.yaml b/codegen-v2/manifest/TWAlgorandProto.yaml
new file mode 100644
index 00000000000..23e6f9e283d
--- /dev/null
+++ b/codegen-v2/manifest/TWAlgorandProto.yaml
@@ -0,0 +1,7 @@
+name: TWAlgorandProto
+protos:
+- TW_Algorand_Proto_Transfer
+- TW_Algorand_Proto_AssetTransfer
+- TW_Algorand_Proto_AssetOptIn
+- TW_Algorand_Proto_SigningInput
+- TW_Algorand_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWAnyAddress.yaml b/codegen-v2/manifest/TWAnyAddress.yaml
new file mode 100644
index 00000000000..52ce8860dd7
--- /dev/null
+++ b/codegen-v2/manifest/TWAnyAddress.yaml
@@ -0,0 +1,308 @@
+name: TWAnyAddress
+structs:
+- name: TWPublicKey
+  is_public: false
+  is_class: false
+- name: TWAnyAddress
+  is_public: true
+  is_class: true
+inits:
+- name: TWAnyAddressCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWAnyAddressCreateBech32
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: hrp
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWAnyAddressCreateSS58
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: ss58Prefix
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWAnyAddressCreateWithPublicKey
+  is_public: true
+  is_nullable: false
+  params:
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWAnyAddressCreateWithPublicKeyDerivation
+  is_public: true
+  is_nullable: false
+  params:
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWAnyAddressCreateBech32WithPublicKey
+  is_public: true
+  is_nullable: false
+  params:
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: hrp
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWAnyAddressCreateSS58WithPublicKey
+  is_public: true
+  is_nullable: false
+  params:
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: ss58Prefix
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWAnyAddressCreateWithPublicKeyFilecoinAddressType
+  is_public: true
+  is_nullable: false
+  params:
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: filecoinAddressType
+    type:
+      variant: enum
+      value: TWFilecoinAddressType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+deinits:
+- name: TWAnyAddressDelete
+functions:
+- name: TWAnyAddressEqual
+  is_public: true
+  is_static: true
+  params:
+  - name: lhs
+    type:
+      variant: struct
+      value: TWAnyAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: rhs
+    type:
+      variant: struct
+      value: TWAnyAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWAnyAddressIsValid
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWAnyAddressIsValidBech32
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: hrp
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWAnyAddressIsValidSS58
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: ss58Prefix
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWAnyAddressDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWAnyAddressCoin
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWCoinType
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWAnyAddressData
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWAptosProto.yaml b/codegen-v2/manifest/TWAptosProto.yaml
new file mode 100644
index 00000000000..f32f51b7632
--- /dev/null
+++ b/codegen-v2/manifest/TWAptosProto.yaml
@@ -0,0 +1,14 @@
+name: TWAptosProto
+protos:
+- TW_Aptos_Proto_TransferMessage
+- TW_Aptos_Proto_StructTag
+- TW_Aptos_Proto_TokenTransferMessage
+- TW_Aptos_Proto_ManagedTokensRegisterMessage
+- TW_Aptos_Proto_CreateAccountMessage
+- TW_Aptos_Proto_OfferNftMessage
+- TW_Aptos_Proto_CancelOfferNftMessage
+- TW_Aptos_Proto_ClaimNftMessage
+- TW_Aptos_Proto_NftMessage
+- TW_Aptos_Proto_SigningInput
+- TW_Aptos_Proto_TransactionAuthenticator
+- TW_Aptos_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWBarz.yaml b/codegen-v2/manifest/TWBarz.yaml
new file mode 100644
index 00000000000..8383f1c05cc
--- /dev/null
+++ b/codegen-v2/manifest/TWBarz.yaml
@@ -0,0 +1,21 @@
+name: TWBarz
+structs:
+  - name: TWBarz
+    is_public: true
+    is_class: false
+functions:
+  - name: TWBarzGetCounterfactualAddress
+    is_public: true
+    is_static: true
+    params:
+      - name: input
+        type:
+          variant: data
+          is_constant: true
+          is_nullable: false
+          is_pointer: true
+    return_type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
\ No newline at end of file
diff --git a/codegen-v2/manifest/TWBase32.yaml b/codegen-v2/manifest/TWBase32.yaml
new file mode 100644
index 00000000000..3c1dd778457
--- /dev/null
+++ b/codegen-v2/manifest/TWBase32.yaml
@@ -0,0 +1,78 @@
+name: TWBase32
+structs:
+- name: TWBase32
+  is_public: true
+  is_class: false
+functions:
+- name: TWBase32DecodeWithAlphabet
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: alphabet
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: true
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBase32Decode
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBase32EncodeWithAlphabet
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: alphabet
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: true
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBase32Encode
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWBase58.yaml b/codegen-v2/manifest/TWBase58.yaml
new file mode 100644
index 00000000000..4806a101d67
--- /dev/null
+++ b/codegen-v2/manifest/TWBase58.yaml
@@ -0,0 +1,66 @@
+name: TWBase58
+structs:
+- name: TWBase58
+  is_public: true
+  is_class: false
+functions:
+- name: TWBase58Encode
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBase58EncodeNoCheck
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBase58Decode
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBase58DecodeNoCheck
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWBase64.yaml b/codegen-v2/manifest/TWBase64.yaml
new file mode 100644
index 00000000000..bcb60202257
--- /dev/null
+++ b/codegen-v2/manifest/TWBase64.yaml
@@ -0,0 +1,66 @@
+name: TWBase64
+structs:
+- name: TWBase64
+  is_public: true
+  is_class: false
+functions:
+- name: TWBase64Decode
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBase64DecodeUrl
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBase64Encode
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBase64EncodeUrl
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWBech32.yaml b/codegen-v2/manifest/TWBech32.yaml
new file mode 100644
index 00000000000..1d192712adb
--- /dev/null
+++ b/codegen-v2/manifest/TWBech32.yaml
@@ -0,0 +1,78 @@
+name: TWBech32
+structs:
+- name: TWBech32
+  is_public: true
+  is_class: false
+functions:
+- name: TWBech32Encode
+  is_public: true
+  is_static: true
+  params:
+  - name: hrp
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBech32Decode
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBech32EncodeM
+  is_public: true
+  is_static: true
+  params:
+    - name: hrp
+      type:
+        variant: string
+        is_constant: true
+        is_nullable: false
+        is_pointer: true
+    - name: data
+      type:
+        variant: data
+        is_constant: true
+        is_nullable: false
+        is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBech32DecodeM
+  is_public: true
+  is_static: true
+  params:
+    - name: string
+      type:
+        variant: string
+        is_constant: true
+        is_nullable: false
+        is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWBinanceProto.yaml b/codegen-v2/manifest/TWBinanceProto.yaml
new file mode 100644
index 00000000000..44483799529
--- /dev/null
+++ b/codegen-v2/manifest/TWBinanceProto.yaml
@@ -0,0 +1,25 @@
+name: TWBinanceProto
+protos:
+- TW_Binance_Proto_Transaction
+- TW_Binance_Proto_Signature
+- TW_Binance_Proto_TradeOrder
+- TW_Binance_Proto_CancelTradeOrder
+- TW_Binance_Proto_SendOrder
+- TW_Binance_Proto_TokenIssueOrder
+- TW_Binance_Proto_TokenMintOrder
+- TW_Binance_Proto_TokenBurnOrder
+- TW_Binance_Proto_TokenFreezeOrder
+- TW_Binance_Proto_TokenUnfreezeOrder
+- TW_Binance_Proto_HTLTOrder
+- TW_Binance_Proto_DepositHTLTOrder
+- TW_Binance_Proto_ClaimHTLOrder
+- TW_Binance_Proto_RefundHTLTOrder
+- TW_Binance_Proto_TransferOut
+- TW_Binance_Proto_SideChainDelegate
+- TW_Binance_Proto_SideChainRedelegate
+- TW_Binance_Proto_SideChainUndelegate
+- TW_Binance_Proto_TimeLockOrder
+- TW_Binance_Proto_TimeRelockOrder
+- TW_Binance_Proto_TimeUnlockOrder
+- TW_Binance_Proto_SigningInput
+- TW_Binance_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWBitcoinAddress.yaml b/codegen-v2/manifest/TWBitcoinAddress.yaml
new file mode 100644
index 00000000000..3e92416eba5
--- /dev/null
+++ b/codegen-v2/manifest/TWBitcoinAddress.yaml
@@ -0,0 +1,124 @@
+name: TWBitcoinAddress
+structs:
+- name: TWPublicKey
+  is_public: false
+  is_class: false
+- name: TWBitcoinAddress
+  is_public: true
+  is_class: true
+inits:
+- name: TWBitcoinAddressCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWBitcoinAddressCreateWithData
+  is_public: true
+  is_nullable: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWBitcoinAddressCreateWithPublicKey
+  is_public: true
+  is_nullable: true
+  params:
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: prefix
+    type:
+      variant: u_int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+deinits:
+- name: TWBitcoinAddressDelete
+functions:
+- name: TWBitcoinAddressEqual
+  is_public: true
+  is_static: true
+  params:
+  - name: lhs
+    type:
+      variant: struct
+      value: TWBitcoinAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: rhs
+    type:
+      variant: struct
+      value: TWBitcoinAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinAddressIsValid
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinAddressIsValidString
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWBitcoinAddressDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinAddressPrefix
+  is_public: true
+  return_type:
+    variant: u_int8_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinAddressKeyhash
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWBitcoinMessageSigner.yaml b/codegen-v2/manifest/TWBitcoinMessageSigner.yaml
new file mode 100644
index 00000000000..e97a4209b14
--- /dev/null
+++ b/codegen-v2/manifest/TWBitcoinMessageSigner.yaml
@@ -0,0 +1,61 @@
+name: TWBitcoinMessageSigner
+structs:
+- name: TWBitcoinMessageSigner
+  is_public: true
+  is_class: false
+functions:
+- name: TWBitcoinMessageSignerSignMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: address
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinMessageSignerVerifyMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: address
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWBitcoinProto.yaml b/codegen-v2/manifest/TWBitcoinProto.yaml
new file mode 100644
index 00000000000..7bc66e0c655
--- /dev/null
+++ b/codegen-v2/manifest/TWBitcoinProto.yaml
@@ -0,0 +1,12 @@
+name: TWBitcoinProto
+protos:
+- TW_Bitcoin_Proto_Transaction
+- TW_Bitcoin_Proto_TransactionInput
+- TW_Bitcoin_Proto_OutPoint
+- TW_Bitcoin_Proto_TransactionOutput
+- TW_Bitcoin_Proto_UnspentTransaction
+- TW_Bitcoin_Proto_SigningInput
+- TW_Bitcoin_Proto_TransactionPlan
+- TW_Bitcoin_Proto_SigningOutput
+- TW_Bitcoin_Proto_HashPublicKey
+- TW_Bitcoin_Proto_PreSigningOutput
diff --git a/codegen-v2/manifest/TWBitcoinScript.yaml b/codegen-v2/manifest/TWBitcoinScript.yaml
new file mode 100644
index 00000000000..1a06577cd1a
--- /dev/null
+++ b/codegen-v2/manifest/TWBitcoinScript.yaml
@@ -0,0 +1,321 @@
+name: TWBitcoinScript
+structs:
+- name: TWBitcoinScript
+  is_public: true
+  is_class: true
+inits:
+- name: TWBitcoinScriptCreate
+  is_public: true
+  is_nullable: false
+- name: TWBitcoinScriptCreateWithData
+  is_public: true
+  is_nullable: false
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWBitcoinScriptCreateCopy
+  is_public: true
+  is_nullable: false
+  params:
+  - name: script
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWBitcoinScriptDelete
+functions:
+- name: TWBitcoinScriptEqual
+  is_public: true
+  is_static: true
+  params:
+  - name: lhs
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: rhs
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinScriptMatchPayToPubkey
+  is_public: true
+  is_static: false
+  params:
+  - name: script
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBitcoinScriptMatchPayToPubkeyHash
+  is_public: true
+  is_static: false
+  params:
+  - name: script
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBitcoinScriptMatchPayToScriptHash
+  is_public: true
+  is_static: false
+  params:
+  - name: script
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBitcoinScriptMatchPayToWitnessPublicKeyHash
+  is_public: true
+  is_static: false
+  params:
+  - name: script
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBitcoinScriptMatchPayToWitnessScriptHash
+  is_public: true
+  is_static: false
+  params:
+  - name: script
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWBitcoinScriptEncode
+  is_public: true
+  is_static: false
+  params:
+  - name: script
+    type:
+      variant: struct
+      value: TWBitcoinScript
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptBuildPayToPublicKey
+  is_public: true
+  is_static: true
+  params:
+  - name: pubkey
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWBitcoinScript
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptBuildPayToPublicKeyHash
+  is_public: true
+  is_static: true
+  params:
+  - name: hash
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWBitcoinScript
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptBuildPayToScriptHash
+  is_public: true
+  is_static: true
+  params:
+  - name: scriptHash
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWBitcoinScript
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptBuildPayToWitnessPubkeyHash
+  is_public: true
+  is_static: true
+  params:
+  - name: hash
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWBitcoinScript
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptBuildPayToWitnessScriptHash
+  is_public: true
+  is_static: true
+  params:
+  - name: scriptHash
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWBitcoinScript
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptLockScriptForAddress
+  is_public: true
+  is_static: true
+  params:
+  - name: address
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWBitcoinScript
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptHashTypeForCoin
+  is_public: true
+  is_static: true
+  params:
+  - name: coinType
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWBitcoinScriptSize
+  is_public: true
+  return_type:
+    variant: size_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinScriptData
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptScriptHash
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWBitcoinScriptIsPayToScriptHash
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinScriptIsPayToWitnessScriptHash
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinScriptIsPayToWitnessPublicKeyHash
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinScriptIsWitnessProgram
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWBitcoinSigHashType.yaml b/codegen-v2/manifest/TWBitcoinSigHashType.yaml
new file mode 100644
index 00000000000..27e2c5f339f
--- /dev/null
+++ b/codegen-v2/manifest/TWBitcoinSigHashType.yaml
@@ -0,0 +1,52 @@
+name: TWBitcoinSigHashType
+enums:
+- name: TWBitcoinSigHashType
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: all
+    value: 0x01
+  - name: none
+    value: 0x02
+  - name: single
+    value: 0x03
+  - name: fork
+    value: 0x40
+  - name: forkBtg
+    value: 0x4f40
+  - name: anyoneCanPay
+    value: 0x80
+functions:
+- name: TWBitcoinSigHashTypeIsSingle
+  is_public: true
+  is_static: false
+  params:
+  - name: type
+    type:
+      variant: enum
+      value: TWBitcoinSigHashType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWBitcoinSigHashTypeIsNone
+  is_public: true
+  is_static: false
+  params:
+  - name: type
+    type:
+      variant: enum
+      value: TWBitcoinSigHashType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWBlockchain.yaml b/codegen-v2/manifest/TWBlockchain.yaml
new file mode 100644
index 00000000000..545fafee77b
--- /dev/null
+++ b/codegen-v2/manifest/TWBlockchain.yaml
@@ -0,0 +1,97 @@
+name: TWBlockchain
+enums:
+- name: TWBlockchain
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: bitcoin
+    value: 0
+  - name: ethereum
+    value: 1
+  - name: vechain
+    value: 3
+  - name: tron
+    value: 4
+  - name: icon
+    value: 5
+  - name: binance
+    value: 6
+  - name: ripple
+    value: 7
+  - name: tezos
+    value: 8
+  - name: nimiq
+    value: 9
+  - name: stellar
+    value: 10
+  - name: aion
+    value: 11
+  - name: cosmos
+    value: 12
+  - name: theta
+    value: 13
+  - name: ontology
+    value: 14
+  - name: zilliqa
+    value: 15
+  - name: ioTeX
+    value: 16
+  - name: eos
+    value: 17
+  - name: nano
+    value: 18
+  - name: nuls
+    value: 19
+  - name: waves
+    value: 20
+  - name: aeternity
+    value: 21
+  - name: nebulas
+    value: 22
+  - name: fio
+    value: 23
+  - name: solana
+    value: 24
+  - name: harmony
+    value: 25
+  - name: near
+    value: 26
+  - name: algorand
+    value: 27
+  - name: polkadot
+    value: 29
+  - name: cardano
+    value: 30
+  - name: neo
+    value: 31
+  - name: filecoin
+    value: 32
+  - name: multiversX
+    value: 33
+  - name: oasisNetwork
+    value: 34
+  - name: decred
+    value: 35
+  - name: zcash
+    value: 36
+  - name: groestlcoin
+    value: 37
+  - name: thorchain
+    value: 38
+  - name: ronin
+    value: 39
+  - name: kusama
+    value: 40
+  - name: nervos
+    value: 41
+  - name: everscale
+    value: 42
+  - name: aptos
+    value: 43
+  - name: hedera
+    value: 44
+  - name: theOpenNetwork
+    value: 45
+  - name: sui
+    value: 46
diff --git a/codegen-v2/manifest/TWCardano.yaml b/codegen-v2/manifest/TWCardano.yaml
new file mode 100644
index 00000000000..d6489ffa40e
--- /dev/null
+++ b/codegen-v2/manifest/TWCardano.yaml
@@ -0,0 +1,63 @@
+name: TWCardano
+structs:
+- name: TWCardano
+  is_public: true
+  is_class: false
+functions:
+- name: TWCardanoMinAdaAmount
+  is_public: true
+  is_static: true
+  params:
+  - name: tokenBundle
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: u_int64_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCardanoOutputMinAdaAmount
+  is_public: true
+  is_static: true
+  params:
+  - name: toAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: tokenBundle
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coinsPerUtxoByte
+    type:
+      variant: u_int64_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: u_int64_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCardanoGetStakingAddress
+  is_public: true
+  is_static: true
+  params:
+  - name: baseAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWCardanoProto.yaml b/codegen-v2/manifest/TWCardanoProto.yaml
new file mode 100644
index 00000000000..3d01f415f85
--- /dev/null
+++ b/codegen-v2/manifest/TWCardanoProto.yaml
@@ -0,0 +1,15 @@
+name: TWCardanoProto
+protos:
+- TW_Cardano_Proto_OutPoint
+- TW_Cardano_Proto_TokenAmount
+- TW_Cardano_Proto_TxInput
+- TW_Cardano_Proto_TxOutput
+- TW_Cardano_Proto_TokenBundle
+- TW_Cardano_Proto_Transfer
+- TW_Cardano_Proto_RegisterStakingKey
+- TW_Cardano_Proto_DeregisterStakingKey
+- TW_Cardano_Proto_Delegate
+- TW_Cardano_Proto_Withdraw
+- TW_Cardano_Proto_TransactionPlan
+- TW_Cardano_Proto_SigningInput
+- TW_Cardano_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWCoinType.yaml b/codegen-v2/manifest/TWCoinType.yaml
new file mode 100644
index 00000000000..af01f64569b
--- /dev/null
+++ b/codegen-v2/manifest/TWCoinType.yaml
@@ -0,0 +1,465 @@
+name: TWCoinType
+structs:
+- name: TWPrivateKey
+  is_public: false
+  is_class: false
+- name: TWPublicKey
+  is_public: false
+  is_class: false
+enums:
+- name: TWCoinType
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: aeternity
+    value: 457
+  - name: aion
+    value: 425
+  - name: binance
+    value: 714
+  - name: bitcoin
+    value: 0
+  - name: bitcoinCash
+    value: 145
+  - name: bitcoinGold
+    value: 156
+  - name: callisto
+    value: 820
+  - name: cardano
+    value: 1815
+  - name: cosmos
+    value: 118
+  - name: dash
+    value: 5
+  - name: decred
+    value: 42
+  - name: digiByte
+    value: 20
+  - name: dogecoin
+    value: 3
+  - name: eos
+    value: 194
+  - name: wax
+    value: 14001
+  - name: ethereum
+    value: 60
+  - name: ethereumClassic
+    value: 61
+  - name: fio
+    value: 235
+  - name: goChain
+    value: 6060
+  - name: groestlcoin
+    value: 17
+  - name: icon
+    value: 74
+  - name: ioTeX
+    value: 304
+  - name: kava
+    value: 459
+  - name: kin
+    value: 2017
+  - name: litecoin
+    value: 2
+  - name: monacoin
+    value: 22
+  - name: nebulas
+    value: 2718
+  - name: nuls
+    value: 8964
+  - name: nano
+    value: 165
+  - name: near
+    value: 397
+  - name: nimiq
+    value: 242
+  - name: ontology
+    value: 1024
+  - name: poanetwork
+    value: 178
+  - name: qtum
+    value: 2301
+  - name: xrp
+    value: 144
+  - name: solana
+    value: 501
+  - name: stellar
+    value: 148
+  - name: tezos
+    value: 1729
+  - name: theta
+    value: 500
+  - name: thunderCore
+    value: 1001
+  - name: neo
+    value: 888
+  - name: tomoChain
+    value: 889
+  - name: tron
+    value: 195
+  - name: veChain
+    value: 818
+  - name: viacoin
+    value: 14
+  - name: wanchain
+    value: 5718350
+  - name: zcash
+    value: 133
+  - name: firo
+    value: 136
+  - name: zilliqa
+    value: 313
+  - name: zelcash
+    value: 19167
+  - name: ravencoin
+    value: 175
+  - name: waves
+    value: 5741564
+  - name: terra
+    value: 330
+  - name: terraV2
+    value: 10000330
+  - name: harmony
+    value: 1023
+  - name: algorand
+    value: 283
+  - name: kusama
+    value: 434
+  - name: polkadot
+    value: 354
+  - name: filecoin
+    value: 461
+  - name: multiversX
+    value: 508
+  - name: bandChain
+    value: 494
+  - name: smartChainLegacy
+    value: 10000714
+  - name: smartChain
+    value: 20000714
+  - name: oasis
+    value: 474
+  - name: polygon
+    value: 966
+  - name: thorchain
+    value: 931
+  - name: bluzelle
+    value: 483
+  - name: optimism
+    value: 10000070
+  - name: zksync
+    value: 10000324
+  - name: arbitrum
+    value: 10042221
+  - name: ecochain
+    value: 10000553
+  - name: avalancheCChain
+    value: 10009000
+  - name: xdai
+    value: 10000100
+  - name: fantom
+    value: 10000250
+  - name: cryptoOrg
+    value: 394
+  - name: celo
+    value: 52752
+  - name: ronin
+    value: 10002020
+  - name: osmosis
+    value: 10000118
+  - name: ecash
+    value: 899
+  - name: cronosChain
+    value: 10000025
+  - name: smartBitcoinCash
+    value: 10000145
+  - name: kuCoinCommunityChain
+    value: 10000321
+  - name: boba
+    value: 10000288
+  - name: metis
+    value: 10001088
+  - name: aurora
+    value: 1323161554
+  - name: evmos
+    value: 10009001
+  - name: nativeEvmos
+    value: 20009001
+  - name: moonriver
+    value: 10001285
+  - name: moonbeam
+    value: 10001284
+  - name: kavaEvm
+    value: 10002222
+  - name: kaia
+    value: 10008217
+  - name: meter
+    value: 18000
+  - name: okxchain
+    value: 996
+  - name: nervos
+    value: 309
+  - name: everscale
+    value: 396
+  - name: aptos
+    value: 637
+  - name: hedera
+    value: 3030
+  - name: secret
+    value: 529
+  - name: nativeInjective
+    value: 10000060
+  - name: agoric
+    value: 564
+  - name: ton
+    value: 607
+  - name: sui
+    value: 784
+  - name: stargaze
+    value: 20000118
+  - name: polygonzkEVM
+    value: 10001101
+  - name: juno
+    value: 30000118
+  - name: stride
+    value: 40000118
+  - name: axelar
+    value: 50000118
+  - name: crescent
+    value: 60000118
+  - name: kujira
+    value: 70000118
+  - name: ioTeXEVM
+    value: 10004689
+  - name: nativeCanto
+    value: 10007700
+  - name: comdex
+    value: 80000118
+  - name: neutron
+    value: 90000118
+  - name: sommelier
+    value: 11000118
+  - name: fetchAI
+    value: 12000118
+  - name: mars
+    value: 13000118
+  - name: umee
+    value: 14000118
+  - name: coreum
+    value: 10000990
+  - name: quasar
+    value: 15000118
+  - name: persistence
+    value: 16000118
+  - name: akash
+    value: 17000118
+  - name: noble
+    value: 18000118
+functions:
+- name: TWCoinTypeValidate
+  is_public: true
+  is_static: false
+  params:
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: address
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeDerivationPath
+  is_public: true
+  is_static: false
+  params:
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWCoinTypeDerivationPathWithDerivation
+  is_public: true
+  is_static: false
+  params:
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWCoinTypeDeriveAddress
+  is_public: true
+  is_static: false
+  params:
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWCoinTypeDeriveAddressFromPublicKey
+  is_public: true
+  is_static: false
+  params:
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+properties:
+- name: TWCoinTypeBlockchain
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWBlockchain
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypePurpose
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWPurpose
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeCurve
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWCurve
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeXpubVersion
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWHDVersion
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeXprvVersion
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWHDVersion
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeHRP
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWHRP
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeP2pkhPrefix
+  is_public: true
+  return_type:
+    variant: u_int8_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeP2shPrefix
+  is_public: true
+  return_type:
+    variant: u_int8_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeStaticPrefix
+  is_public: true
+  return_type:
+    variant: u_int8_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeChainId
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWCoinTypeSlip44Id
+  is_public: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeSS58Prefix
+  is_public: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypePublicKeyType
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWPublicKeyType
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWCoinTypeConfiguration.yaml b/codegen-v2/manifest/TWCoinTypeConfiguration.yaml
new file mode 100644
index 00000000000..aafa2b803cd
--- /dev/null
+++ b/codegen-v2/manifest/TWCoinTypeConfiguration.yaml
@@ -0,0 +1,120 @@
+name: TWCoinTypeConfiguration
+structs:
+- name: TWCoinTypeConfiguration
+  is_public: true
+  is_class: false
+  fields:
+  - - unused
+    - variant: u_int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+functions:
+- name: TWCoinTypeConfigurationGetSymbol
+  is_public: true
+  is_static: true
+  params:
+  - name: type
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWCoinTypeConfigurationGetDecimals
+  is_public: true
+  is_static: true
+  params:
+  - name: type
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWCoinTypeConfigurationGetTransactionURL
+  is_public: true
+  is_static: true
+  params:
+  - name: type
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: transactionID
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWCoinTypeConfigurationGetAccountURL
+  is_public: true
+  is_static: true
+  params:
+  - name: type
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: accountID
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWCoinTypeConfigurationGetID
+  is_public: true
+  is_static: true
+  params:
+  - name: type
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWCoinTypeConfigurationGetName
+  is_public: true
+  is_static: true
+  params:
+  - name: type
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWCommonProto.yaml b/codegen-v2/manifest/TWCommonProto.yaml
new file mode 100644
index 00000000000..c5bbdcc1546
--- /dev/null
+++ b/codegen-v2/manifest/TWCommonProto.yaml
@@ -0,0 +1,3 @@
+name: TWCommonProto
+protos:
+- TW_Common_Proto_SigningError
diff --git a/codegen-v2/manifest/TWCosmosProto.yaml b/codegen-v2/manifest/TWCosmosProto.yaml
new file mode 100644
index 00000000000..e9ddb053872
--- /dev/null
+++ b/codegen-v2/manifest/TWCosmosProto.yaml
@@ -0,0 +1,8 @@
+name: TWCosmosProto
+protos:
+- TW_Cosmos_Proto_Amount
+- TW_Cosmos_Proto_Fee
+- TW_Cosmos_Proto_Height
+- TW_Cosmos_Proto_Message
+- TW_Cosmos_Proto_SigningInput
+- TW_Cosmos_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWCurve.yaml b/codegen-v2/manifest/TWCurve.yaml
new file mode 100644
index 00000000000..01f14d2dfd5
--- /dev/null
+++ b/codegen-v2/manifest/TWCurve.yaml
@@ -0,0 +1,28 @@
+name: TWCurve
+enums:
+- name: TWCurve
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: secp256k1
+    value: 0
+    as_string: secp256k1
+  - name: ed25519
+    value: 1
+    as_string: ed25519
+  - name: ed25519Blake2bNano
+    value: 2
+    as_string: ed25519-blake2b-nano
+  - name: curve25519
+    value: 3
+    as_string: curve25519
+  - name: nist256p1
+    value: 4
+    as_string: nist256p1
+  - name: ed25519ExtendedCardano
+    value: 5
+    as_string: ed25519-cardano-seed
+  - name: starkex
+    value: 6
+    as_string: starkex
diff --git a/codegen-v2/manifest/TWDataVector.yaml b/codegen-v2/manifest/TWDataVector.yaml
new file mode 100644
index 00000000000..f9011148096
--- /dev/null
+++ b/codegen-v2/manifest/TWDataVector.yaml
@@ -0,0 +1,74 @@
+name: TWDataVector
+structs:
+- name: TWDataVector
+  is_public: true
+  is_class: true
+inits:
+- name: TWDataVectorCreate
+  is_public: true
+  is_nullable: false
+- name: TWDataVectorCreateWithData
+  is_public: true
+  is_nullable: false
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWDataVectorDelete
+functions:
+- name: TWDataVectorAdd
+  is_public: true
+  is_static: false
+  params:
+  - name: dataVector
+    type:
+      variant: struct
+      value: TWDataVector
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: void
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWDataVectorGet
+  is_public: true
+  is_static: false
+  params:
+  - name: dataVector
+    type:
+      variant: struct
+      value: TWDataVector
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: index
+    type:
+      variant: size_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+properties:
+- name: TWDataVectorSize
+  is_public: true
+  return_type:
+    variant: size_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWDecredProto.yaml b/codegen-v2/manifest/TWDecredProto.yaml
new file mode 100644
index 00000000000..eb8bddcc303
--- /dev/null
+++ b/codegen-v2/manifest/TWDecredProto.yaml
@@ -0,0 +1,6 @@
+name: TWDecredProto
+protos:
+- TW_Decred_Proto_Transaction
+- TW_Decred_Proto_TransactionInput
+- TW_Decred_Proto_TransactionOutput
+- TW_Decred_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWDerivation.yaml b/codegen-v2/manifest/TWDerivation.yaml
new file mode 100644
index 00000000000..c2143b80431
--- /dev/null
+++ b/codegen-v2/manifest/TWDerivation.yaml
@@ -0,0 +1,21 @@
+name: TWDerivation
+enums:
+- name: TWDerivation
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: default
+    value: 0
+  - name: custom
+    value: 1
+  - name: bitcoinSegwit
+    value: 2
+  - name: bitcoinLegacy
+    value: 3
+  - name: bitcoinTestnet
+    value: 4
+  - name: litecoinLegacy
+    value: 5
+  - name: solanaSolana
+    value: 6
diff --git a/codegen-v2/manifest/TWDerivationPath.yaml b/codegen-v2/manifest/TWDerivationPath.yaml
new file mode 100644
index 00000000000..8e550ded65e
--- /dev/null
+++ b/codegen-v2/manifest/TWDerivationPath.yaml
@@ -0,0 +1,137 @@
+name: TWDerivationPath
+structs:
+- name: TWDerivationPath
+  is_public: true
+  is_class: true
+inits:
+- name: TWDerivationPathCreate
+  is_public: true
+  is_nullable: false
+  params:
+  - name: purpose
+    type:
+      variant: enum
+      value: TWPurpose
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: coin
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: account
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: change
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: address
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWDerivationPathCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWDerivationPathDelete
+functions:
+- name: TWDerivationPathIndexAt
+  is_public: true
+  is_static: false
+  params:
+  - name: path
+    type:
+      variant: struct
+      value: TWDerivationPath
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: index
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWDerivationPathIndex
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWDerivationPathIndicesCount
+  is_public: true
+  is_static: false
+  params:
+  - name: path
+    type:
+      variant: struct
+      value: TWDerivationPath
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWDerivationPathPurpose
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWPurpose
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWDerivationPathCoin
+  is_public: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWDerivationPathAccount
+  is_public: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWDerivationPathChange
+  is_public: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWDerivationPathAddress
+  is_public: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWDerivationPathDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWDerivationPathIndex.yaml b/codegen-v2/manifest/TWDerivationPathIndex.yaml
new file mode 100644
index 00000000000..8106efe6dfe
--- /dev/null
+++ b/codegen-v2/manifest/TWDerivationPathIndex.yaml
@@ -0,0 +1,46 @@
+name: TWDerivationPathIndex
+structs:
+- name: TWDerivationPathIndex
+  is_public: true
+  is_class: true
+inits:
+- name: TWDerivationPathIndexCreate
+  is_public: true
+  is_nullable: false
+  params:
+  - name: value
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: hardened
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+deinits:
+- name: TWDerivationPathIndexDelete
+properties:
+- name: TWDerivationPathIndexValue
+  is_public: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWDerivationPathIndexHardened
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWDerivationPathIndexDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWEOSProto.yaml b/codegen-v2/manifest/TWEOSProto.yaml
new file mode 100644
index 00000000000..ea0032abfe9
--- /dev/null
+++ b/codegen-v2/manifest/TWEOSProto.yaml
@@ -0,0 +1,5 @@
+name: TWEOSProto
+protos:
+- TW_EOS_Proto_Asset
+- TW_EOS_Proto_SigningInput
+- TW_EOS_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWEthereum.yaml b/codegen-v2/manifest/TWEthereum.yaml
new file mode 100644
index 00000000000..1d4aa9b9d97
--- /dev/null
+++ b/codegen-v2/manifest/TWEthereum.yaml
@@ -0,0 +1,66 @@
+name: TWEthereum
+structs:
+- name: TWEthereum
+  is_public: true
+  is_class: false
+functions:
+- name: TWEthereumEip2645GetPath
+  is_public: true
+  is_static: true
+  params:
+  - name: ethAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: layer
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: application
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: index
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumEip4337GetDeploymentAddress
+  is_public: true
+  is_static: true
+  params:
+  - name: factoryAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: logicAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: ownerAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWEthereumAbi.yaml b/codegen-v2/manifest/TWEthereumAbi.yaml
new file mode 100644
index 00000000000..fda88c4c4c1
--- /dev/null
+++ b/codegen-v2/manifest/TWEthereumAbi.yaml
@@ -0,0 +1,83 @@
+name: TWEthereumAbi
+structs:
+- name: TWEthereumAbiFunction
+  is_public: false
+  is_class: false
+- name: TWEthereumAbi
+  is_public: true
+  is_class: false
+functions:
+- name: TWEthereumAbiEncode
+  is_public: true
+  is_static: true
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiDecodeOutput
+  is_public: true
+  is_static: true
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: encoded
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiDecodeCall
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: abi
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWEthereumAbiEncodeTyped
+  is_public: true
+  is_static: true
+  params:
+  - name: messageJson
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWEthereumAbiFunction.yaml b/codegen-v2/manifest/TWEthereumAbiFunction.yaml
new file mode 100644
index 00000000000..95a54c8338d
--- /dev/null
+++ b/codegen-v2/manifest/TWEthereumAbiFunction.yaml
@@ -0,0 +1,1213 @@
+name: TWEthereumAbiFunction
+structs:
+- name: TWEthereumAbiFunction
+  is_public: true
+  is_class: true
+inits:
+- name: TWEthereumAbiFunctionCreateWithString
+  is_public: true
+  is_nullable: false
+  params:
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWEthereumAbiFunctionDelete
+functions:
+- name: TWEthereumAbiFunctionGetType
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiFunctionAddParamUInt8
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: u_int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamUInt16
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: u_int16_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamUInt32
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamUInt64
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: u_int64_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamUInt256
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamUIntN
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: bits
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamInt8
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamInt16
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: int16_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamInt32
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamInt64
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: int64_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamInt256
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamIntN
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: bits
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamBool
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamString
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamAddress
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamBytes
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamBytesFix
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: size
+    type:
+      variant: size_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddParamArray
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionGetParamUInt8
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: idx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: u_int8_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionGetParamUInt64
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: idx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: u_int64_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionGetParamUInt256
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: idx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiFunctionGetParamBool
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: idx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionGetParamString
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: idx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiFunctionGetParamAddress
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: idx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: isOutput
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiFunctionAddInArrayParamUInt8
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: u_int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamUInt16
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: u_int16_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamUInt32
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamUInt64
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: u_int64_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamUInt256
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamUIntN
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: bits
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamInt8
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamInt16
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: int16_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamInt32
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamInt64
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: int64_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamInt256
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamIntN
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: bits
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamBool
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamString
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamAddress
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamBytes
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWEthereumAbiFunctionAddInArrayParamBytesFix
+  is_public: true
+  is_static: false
+  params:
+  - name: fn
+    type:
+      variant: struct
+      value: TWEthereumAbiFunction
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: arrayIdx
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: size
+    type:
+      variant: size_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: val
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWEthereumAbiValue.yaml b/codegen-v2/manifest/TWEthereumAbiValue.yaml
new file mode 100644
index 00000000000..31e60cf14f8
--- /dev/null
+++ b/codegen-v2/manifest/TWEthereumAbiValue.yaml
@@ -0,0 +1,198 @@
+name: TWEthereumAbiValue
+structs:
+- name: TWEthereumAbiValue
+  is_public: true
+  is_class: false
+functions:
+- name: TWEthereumAbiValueEncodeBool
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueEncodeInt32
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueEncodeUInt32
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueEncodeInt256
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueEncodeUInt256
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueEncodeAddress
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueEncodeString
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueEncodeBytes
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueEncodeBytesDyn
+  is_public: true
+  is_static: true
+  params:
+  - name: value
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueDecodeUInt256
+  is_public: true
+  is_static: true
+  params:
+  - name: input
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueDecodeValue
+  is_public: true
+  is_static: true
+  params:
+  - name: input
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: type
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumAbiValueDecodeArray
+  is_public: true
+  is_static: true
+  params:
+  - name: input
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: type
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWEthereumChainID.yaml b/codegen-v2/manifest/TWEthereumChainID.yaml
new file mode 100644
index 00000000000..a8c93f297cc
--- /dev/null
+++ b/codegen-v2/manifest/TWEthereumChainID.yaml
@@ -0,0 +1,77 @@
+name: TWEthereumChainID
+enums:
+- name: TWEthereumChainID
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: ethereum
+    value: 1
+  - name: classic
+    value: 61
+  - name: poa
+    value: 99
+  - name: vechain
+    value: 74
+  - name: callisto
+    value: 820
+  - name: tomochain
+    value: 88
+  - name: polygon
+    value: 137
+  - name: okc
+    value: 66
+  - name: thundertoken
+    value: 108
+  - name: gochain
+    value: 60
+  - name: meter
+    value: 82
+  - name: celo
+    value: 42220
+  - name: wanchain
+    value: 888
+  - name: cronos
+    value: 25
+  - name: optimism
+    value: 10
+  - name: xdai
+    value: 100
+  - name: smartbch
+    value: 10000
+  - name: fantom
+    value: 250
+  - name: boba
+    value: 288
+  - name: kcc
+    value: 321
+  - name: zksync
+    value: 324
+  - name: heco
+    value: 128
+  - name: metis
+    value: 1088
+  - name: polygonzkevm
+    value: 1101
+  - name: moonbeam
+    value: 1284
+  - name: moonriver
+    value: 1285
+  - name: ronin
+    value: 2020
+  - name: kavaevm
+    value: 2222
+  - name: iotexevm
+    value: 4689
+  - name: kaia
+    value: 8217
+  - name: avalanchec
+    value: 43114
+  - name: evmos
+    value: 9001
+  - name: arbitrum
+    value: 42161
+  - name: smartchain
+    value: 56
+  - name: aurora
+    value: 1313161554
diff --git a/codegen-v2/manifest/TWEthereumMessageSigner.yaml b/codegen-v2/manifest/TWEthereumMessageSigner.yaml
new file mode 100644
index 00000000000..628ed6cbf76
--- /dev/null
+++ b/codegen-v2/manifest/TWEthereumMessageSigner.yaml
@@ -0,0 +1,156 @@
+name: TWEthereumMessageSigner
+structs:
+- name: TWEthereumMessageSigner
+  is_public: true
+  is_class: false
+functions:
+- name: TWEthereumMessageSignerSignTypedMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: messageJson
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumMessageSignerSignTypedMessageEip155
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: messageJson
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: chainId
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumMessageSignerSignMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumMessageSignerSignMessageImmutableX
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumMessageSignerSignMessageEip155
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: chainId
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWEthereumMessageSignerVerifyMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: pubKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWEthereumProto.yaml b/codegen-v2/manifest/TWEthereumProto.yaml
new file mode 100644
index 00000000000..0d7451a69fe
--- /dev/null
+++ b/codegen-v2/manifest/TWEthereumProto.yaml
@@ -0,0 +1,6 @@
+name: TWEthereumProto
+protos:
+- TW_Ethereum_Proto_Transaction
+- TW_Ethereum_Proto_UserOperation
+- TW_Ethereum_Proto_SigningInput
+- TW_Ethereum_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWEverscaleProto.yaml b/codegen-v2/manifest/TWEverscaleProto.yaml
new file mode 100644
index 00000000000..4b932b376aa
--- /dev/null
+++ b/codegen-v2/manifest/TWEverscaleProto.yaml
@@ -0,0 +1,5 @@
+name: TWEverscaleProto
+protos:
+- TW_Everscale_Proto_Transfer
+- TW_Everscale_Proto_SigningInput
+- TW_Everscale_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWFIOAccount.yaml b/codegen-v2/manifest/TWFIOAccount.yaml
new file mode 100644
index 00000000000..b95d7f7f461
--- /dev/null
+++ b/codegen-v2/manifest/TWFIOAccount.yaml
@@ -0,0 +1,26 @@
+name: TWFIOAccount
+structs:
+- name: TWFIOAccount
+  is_public: true
+  is_class: true
+inits:
+- name: TWFIOAccountCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWFIOAccountDelete
+properties:
+- name: TWFIOAccountDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWFIOProto.yaml b/codegen-v2/manifest/TWFIOProto.yaml
new file mode 100644
index 00000000000..84e46536c2f
--- /dev/null
+++ b/codegen-v2/manifest/TWFIOProto.yaml
@@ -0,0 +1,8 @@
+name: TWFIOProto
+protos:
+- TW_FIO_Proto_PublicAddress
+- TW_FIO_Proto_NewFundsContent
+- TW_FIO_Proto_Action
+- TW_FIO_Proto_ChainParams
+- TW_FIO_Proto_SigningInput
+- TW_FIO_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWFilecoinAddressConverter.yaml b/codegen-v2/manifest/TWFilecoinAddressConverter.yaml
new file mode 100644
index 00000000000..1823914ebef
--- /dev/null
+++ b/codegen-v2/manifest/TWFilecoinAddressConverter.yaml
@@ -0,0 +1,36 @@
+name: TWFilecoinAddressConverter
+structs:
+- name: TWFilecoinAddressConverter
+  is_public: true
+  is_class: false
+functions:
+- name: TWFilecoinAddressConverterConvertToEthereum
+  is_public: true
+  is_static: true
+  params:
+  - name: filecoinAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWFilecoinAddressConverterConvertFromEthereum
+  is_public: true
+  is_static: true
+  params:
+  - name: ethAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWFilecoinAddressType.yaml b/codegen-v2/manifest/TWFilecoinAddressType.yaml
new file mode 100644
index 00000000000..d7b3e3186d6
--- /dev/null
+++ b/codegen-v2/manifest/TWFilecoinAddressType.yaml
@@ -0,0 +1,11 @@
+name: TWFilecoinAddressType
+enums:
+- name: TWFilecoinAddressType
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: default
+    value: 0
+  - name: delegated
+    value: 1
diff --git a/codegen-v2/manifest/TWFilecoinProto.yaml b/codegen-v2/manifest/TWFilecoinProto.yaml
new file mode 100644
index 00000000000..34e11a135a5
--- /dev/null
+++ b/codegen-v2/manifest/TWFilecoinProto.yaml
@@ -0,0 +1,4 @@
+name: TWFilecoinProto
+protos:
+- TW_Filecoin_Proto_SigningInput
+- TW_Filecoin_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWGroestlcoinAddress.yaml b/codegen-v2/manifest/TWGroestlcoinAddress.yaml
new file mode 100644
index 00000000000..8f25de34905
--- /dev/null
+++ b/codegen-v2/manifest/TWGroestlcoinAddress.yaml
@@ -0,0 +1,85 @@
+name: TWGroestlcoinAddress
+structs:
+- name: TWPublicKey
+  is_public: false
+  is_class: false
+- name: TWGroestlcoinAddress
+  is_public: true
+  is_class: true
+inits:
+- name: TWGroestlcoinAddressCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWGroestlcoinAddressCreateWithPublicKey
+  is_public: true
+  is_nullable: false
+  params:
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: prefix
+    type:
+      variant: u_int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+deinits:
+- name: TWGroestlcoinAddressDelete
+functions:
+- name: TWGroestlcoinAddressEqual
+  is_public: true
+  is_static: true
+  params:
+  - name: lhs
+    type:
+      variant: struct
+      value: TWGroestlcoinAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: rhs
+    type:
+      variant: struct
+      value: TWGroestlcoinAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWGroestlcoinAddressIsValidString
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWGroestlcoinAddressDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWHDVersion.yaml b/codegen-v2/manifest/TWHDVersion.yaml
new file mode 100644
index 00000000000..72cfb07914a
--- /dev/null
+++ b/codegen-v2/manifest/TWHDVersion.yaml
@@ -0,0 +1,52 @@
+name: TWHDVersion
+enums:
+- name: TWHDVersion
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: none
+    value: 0
+  - name: xpub
+    value: 0x0488b21e
+  - name: xprv
+    value: 0x0488ade4
+  - name: ypub
+    value: 0x049d7cb2
+  - name: yprv
+    value: 0x049d7878
+  - name: zpub
+    value: 0x04b24746
+  - name: zprv
+    value: 0x04b2430c
+  - name: ltub
+    value: 0x019da462
+  - name: ltpv
+    value: 0x019d9cfe
+  - name: mtub
+    value: 0x01b26ef6
+  - name: mtpv
+    value: 0x01b26792
+  - name: dpub
+    value: 0x2fda926
+  - name: dprv
+    value: 0x2fda4e8
+  - name: dgub
+    value: 0x02facafd
+  - name: dgpv
+    value: 0x02fac398
+properties:
+- name: TWHDVersionIsPublic
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWHDVersionIsPrivate
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWHDWallet.yaml b/codegen-v2/manifest/TWHDWallet.yaml
new file mode 100644
index 00000000000..34dd244a3c9
--- /dev/null
+++ b/codegen-v2/manifest/TWHDWallet.yaml
@@ -0,0 +1,626 @@
+name: TWHDWallet
+structs:
+- name: TWHDWallet
+  is_public: true
+  is_class: true
+inits:
+- name: TWHDWalletCreate
+  is_public: true
+  is_nullable: true
+  params:
+  - name: strength
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: passphrase
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWHDWalletCreateWithMnemonic
+  is_public: true
+  is_nullable: true
+  params:
+  - name: mnemonic
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: passphrase
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWHDWalletCreateWithMnemonicCheck
+  is_public: true
+  is_nullable: true
+  params:
+  - name: mnemonic
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: passphrase
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: check
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWHDWalletCreateWithEntropy
+  is_public: true
+  is_nullable: true
+  params:
+  - name: entropy
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: passphrase
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWHDWalletDelete
+functions:
+- name: TWHDWalletGetMasterKey
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: curve
+    type:
+      variant: enum
+      value: TWCurve
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWPrivateKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetKeyForCoin
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWPrivateKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetAddressForCoin
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetAddressDerivation
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetKey
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivationPath
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPrivateKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetKeyDerivation
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWPrivateKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetKeyByCurve
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: curve
+    type:
+      variant: enum
+      value: TWCurve
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivationPath
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPrivateKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetDerivedKey
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: account
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: change
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: address
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWPrivateKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetExtendedPrivateKey
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: purpose
+    type:
+      variant: enum
+      value: TWPurpose
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: version
+    type:
+      variant: enum
+      value: TWHDVersion
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetExtendedPublicKey
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: purpose
+    type:
+      variant: enum
+      value: TWPurpose
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: version
+    type:
+      variant: enum
+      value: TWHDVersion
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetExtendedPrivateKeyAccount
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: purpose
+    type:
+      variant: enum
+      value: TWPurpose
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: version
+    type:
+      variant: enum
+      value: TWHDVersion
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: account
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetExtendedPublicKeyAccount
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: purpose
+    type:
+      variant: enum
+      value: TWPurpose
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: version
+    type:
+      variant: enum
+      value: TWHDVersion
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: account
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetExtendedPrivateKeyDerivation
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: purpose
+    type:
+      variant: enum
+      value: TWPurpose
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: version
+    type:
+      variant: enum
+      value: TWHDVersion
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetExtendedPublicKeyDerivation
+  is_public: true
+  is_static: false
+  params:
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: purpose
+    type:
+      variant: enum
+      value: TWPurpose
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: version
+    type:
+      variant: enum
+      value: TWHDVersion
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletGetPublicKeyFromExtended
+  is_public: true
+  is_static: true
+  params:
+  - name: extended
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivationPath
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+properties:
+- name: TWHDWalletSeed
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletMnemonic
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHDWalletEntropy
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWHRP.yaml b/codegen-v2/manifest/TWHRP.yaml
new file mode 100644
index 00000000000..3b02a2f6520
--- /dev/null
+++ b/codegen-v2/manifest/TWHRP.yaml
@@ -0,0 +1,190 @@
+name: TWHRP
+enums:
+- name: TWHRP
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: unknown
+    value: 0
+    as_string: ''
+  - name: bitcoin
+    value: 1
+    as_string: bc
+  - name: litecoin
+    value: 2
+    as_string: ltc
+  - name: viacoin
+    value: 3
+    as_string: via
+  - name: groestlcoin
+    value: 4
+    as_string: grs
+  - name: digiByte
+    value: 5
+    as_string: dgb
+  - name: monacoin
+    value: 6
+    as_string: mona
+  - name: cosmos
+    value: 7
+    as_string: cosmos
+  - name: bitcoinCash
+    value: 8
+    as_string: bitcoincash
+  - name: bitcoinGold
+    value: 9
+    as_string: btg
+  - name: ioTeX
+    value: 10
+    as_string: io
+  - name: nervos
+    value: 11
+    as_string: ckb
+  - name: zilliqa
+    value: 12
+    as_string: zil
+  - name: terra
+    value: 13
+    as_string: terra
+  - name: cryptoOrg
+    value: 14
+    as_string: cro
+  - name: kava
+    value: 15
+    as_string: kava
+  - name: oasis
+    value: 16
+    as_string: oasis
+  - name: bluzelle
+    value: 17
+    as_string: bluzelle
+  - name: bandChain
+    value: 18
+    as_string: band
+  - name: multiversX
+    value: 19
+    as_string: erd
+  - name: secret
+    value: 20
+    as_string: secret
+  - name: agoric
+    value: 21
+    as_string: agoric
+  - name: binance
+    value: 22
+    as_string: bnb
+  - name: ecash
+    value: 23
+    as_string: ecash
+  - name: thorchain
+    value: 24
+    as_string: thor
+  - name: harmony
+    value: 25
+    as_string: one
+  - name: cardano
+    value: 26
+    as_string: addr
+  - name: qtum
+    value: 27
+    as_string: qc
+  - name: nativeInjective
+    value: 28
+    as_string: inj
+  - name: osmosis
+    value: 29
+    as_string: osmo
+  - name: terraV2
+    value: 30
+    as_string: terra
+  - name: coreum
+    value: 31
+    as_string: core
+  - name: nativeCanto
+    value: 32
+    as_string: canto
+  - name: sommelier
+    value: 33
+    as_string: somm
+  - name: fetchAI
+    value: 34
+    as_string: fetch
+  - name: mars
+    value: 35
+    as_string: mars
+  - name: umee
+    value: 36
+    as_string: umee
+  - name: quasar
+    value: 37
+    as_string: quasar
+  - name: persistence
+    value: 38
+    as_string: persistence
+  - name: akash
+    value: 39
+    as_string: akash
+  - name: noble
+    value: 40
+    as_string: noble
+  - name: stargaze
+    value: 41
+    as_string: stars
+  - name: nativeEvmos
+    value: 42
+    as_string: evmos
+  - name: juno
+    value: 43
+    as_string: juno
+  - name: stride
+    value: 44
+    as_string: stride
+  - name: axelar
+    value: 45
+    as_string: axelar
+  - name: crescent
+    value: 46
+    as_string: cre
+  - name: kujira
+    value: 47
+    as_string: kujira
+  - name: comdex
+    value: 48
+    as_string: comdex
+  - name: neutron
+    value: 49
+    as_string: neutron
+functions:
+- name: stringForHRP
+  is_public: false
+  is_static: false
+  params:
+  - name: hrp
+    type:
+      variant: enum
+      value: TWHRP
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: char
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: hrpForString
+  is_public: false
+  is_static: false
+  params:
+  - name: string
+    type:
+      variant: char
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: enum
+    value: TWHRP
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWHarmonyProto.yaml b/codegen-v2/manifest/TWHarmonyProto.yaml
new file mode 100644
index 00000000000..b11c9c5c6ca
--- /dev/null
+++ b/codegen-v2/manifest/TWHarmonyProto.yaml
@@ -0,0 +1,14 @@
+name: TWHarmonyProto
+protos:
+- TW_Harmony_Proto_SigningInput
+- TW_Harmony_Proto_SigningOutput
+- TW_Harmony_Proto_TransactionMessage
+- TW_Harmony_Proto_StakingMessage
+- TW_Harmony_Proto_Description
+- TW_Harmony_Proto_Decimal
+- TW_Harmony_Proto_CommissionRate
+- TW_Harmony_Proto_DirectiveCreateValidator
+- TW_Harmony_Proto_DirectiveEditValidator
+- TW_Harmony_Proto_DirectiveDelegate
+- TW_Harmony_Proto_DirectiveUndelegate
+- TW_Harmony_Proto_DirectiveCollectRewards
diff --git a/codegen-v2/manifest/TWHash.yaml b/codegen-v2/manifest/TWHash.yaml
new file mode 100644
index 00000000000..6f900c4cb9d
--- /dev/null
+++ b/codegen-v2/manifest/TWHash.yaml
@@ -0,0 +1,288 @@
+name: TWHash
+structs:
+- name: TWHash
+  is_public: true
+  is_class: false
+  fields:
+  - - unused
+    - variant: u_int8_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+functions:
+- name: TWHashSHA1
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashSHA256
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashSHA512
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashSHA512_256
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashKeccak256
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashKeccak512
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashSHA3_256
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashSHA3_512
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashRIPEMD
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashBlake256
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashBlake2b
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: size
+    type:
+      variant: size_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashGroestl512
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashSHA256SHA256
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashSHA256RIPEMD
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashSHA3_256RIPEMD
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashBlake256Blake256
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashBlake256RIPEMD
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWHashGroestl512Groestl512
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWHederaProto.yaml b/codegen-v2/manifest/TWHederaProto.yaml
new file mode 100644
index 00000000000..96074d6e307
--- /dev/null
+++ b/codegen-v2/manifest/TWHederaProto.yaml
@@ -0,0 +1,8 @@
+name: TWHederaProto
+protos:
+- TW_Hedera_Proto_Timestamp
+- TW_Hedera_Proto_TransactionID
+- TW_Hedera_Proto_TransferMessage
+- TW_Hedera_Proto_TransactionBody
+- TW_Hedera_Proto_SigningInput
+- TW_Hedera_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWIconProto.yaml b/codegen-v2/manifest/TWIconProto.yaml
new file mode 100644
index 00000000000..86868b8dc30
--- /dev/null
+++ b/codegen-v2/manifest/TWIconProto.yaml
@@ -0,0 +1,4 @@
+name: TWIconProto
+protos:
+- TW_Icon_Proto_SigningInput
+- TW_Icon_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWIoTeXProto.yaml b/codegen-v2/manifest/TWIoTeXProto.yaml
new file mode 100644
index 00000000000..c05c82dcb2b
--- /dev/null
+++ b/codegen-v2/manifest/TWIoTeXProto.yaml
@@ -0,0 +1,9 @@
+name: TWIoTeXProto
+protos:
+- TW_IoTeX_Proto_Transfer
+- TW_IoTeX_Proto_Staking
+- TW_IoTeX_Proto_ContractCall
+- TW_IoTeX_Proto_SigningInput
+- TW_IoTeX_Proto_SigningOutput
+- TW_IoTeX_Proto_ActionCore
+- TW_IoTeX_Proto_Action
diff --git a/codegen-v2/manifest/TWLiquidStaking.yaml b/codegen-v2/manifest/TWLiquidStaking.yaml
new file mode 100644
index 00000000000..e5cbae32b2d
--- /dev/null
+++ b/codegen-v2/manifest/TWLiquidStaking.yaml
@@ -0,0 +1,21 @@
+name: TWLiquidStaking
+structs:
+- name: TWLiquidStaking
+  is_public: true
+  is_class: false
+functions:
+- name: TWLiquidStakingBuildRequest
+  is_public: true
+  is_static: true
+  params:
+  - name: input
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWLiquidStakingProto.yaml b/codegen-v2/manifest/TWLiquidStakingProto.yaml
new file mode 100644
index 00000000000..f678e946b79
--- /dev/null
+++ b/codegen-v2/manifest/TWLiquidStakingProto.yaml
@@ -0,0 +1,9 @@
+name: TWLiquidStakingProto
+protos:
+- TW_LiquidStaking_Proto_Status
+- TW_LiquidStaking_Proto_Asset
+- TW_LiquidStaking_Proto_Stake
+- TW_LiquidStaking_Proto_Unstake
+- TW_LiquidStaking_Proto_Withdraw
+- TW_LiquidStaking_Proto_Input
+- TW_LiquidStaking_Proto_Output
diff --git a/codegen-v2/manifest/TWMnemonic.yaml b/codegen-v2/manifest/TWMnemonic.yaml
new file mode 100644
index 00000000000..f1b426ec636
--- /dev/null
+++ b/codegen-v2/manifest/TWMnemonic.yaml
@@ -0,0 +1,51 @@
+name: TWMnemonic
+structs:
+- name: TWMnemonic
+  is_public: true
+  is_class: false
+functions:
+- name: TWMnemonicIsValid
+  is_public: true
+  is_static: true
+  params:
+  - name: mnemonic
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWMnemonicIsValidWord
+  is_public: true
+  is_static: true
+  params:
+  - name: word
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWMnemonicSuggest
+  is_public: true
+  is_static: true
+  params:
+  - name: prefix
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWMultiversXProto.yaml b/codegen-v2/manifest/TWMultiversXProto.yaml
new file mode 100644
index 00000000000..71df5e72131
--- /dev/null
+++ b/codegen-v2/manifest/TWMultiversXProto.yaml
@@ -0,0 +1,9 @@
+name: TWMultiversXProto
+protos:
+- TW_MultiversX_Proto_GenericAction
+- TW_MultiversX_Proto_EGLDTransfer
+- TW_MultiversX_Proto_ESDTTransfer
+- TW_MultiversX_Proto_ESDTNFTTransfer
+- TW_MultiversX_Proto_Accounts
+- TW_MultiversX_Proto_SigningInput
+- TW_MultiversX_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWNEARAccount.yaml b/codegen-v2/manifest/TWNEARAccount.yaml
new file mode 100644
index 00000000000..05b607a0325
--- /dev/null
+++ b/codegen-v2/manifest/TWNEARAccount.yaml
@@ -0,0 +1,26 @@
+name: TWNEARAccount
+structs:
+- name: TWNEARAccount
+  is_public: true
+  is_class: true
+inits:
+- name: TWNEARAccountCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWNEARAccountDelete
+properties:
+- name: TWNEARAccountDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWNEARProto.yaml b/codegen-v2/manifest/TWNEARProto.yaml
new file mode 100644
index 00000000000..1d983a286c8
--- /dev/null
+++ b/codegen-v2/manifest/TWNEARProto.yaml
@@ -0,0 +1,17 @@
+name: TWNEARProto
+protos:
+- TW_NEAR_Proto_PublicKey
+- TW_NEAR_Proto_FunctionCallPermission
+- TW_NEAR_Proto_FullAccessPermission
+- TW_NEAR_Proto_AccessKey
+- TW_NEAR_Proto_CreateAccount
+- TW_NEAR_Proto_DeployContract
+- TW_NEAR_Proto_FunctionCall
+- TW_NEAR_Proto_Transfer
+- TW_NEAR_Proto_Stake
+- TW_NEAR_Proto_AddKey
+- TW_NEAR_Proto_DeleteKey
+- TW_NEAR_Proto_DeleteAccount
+- TW_NEAR_Proto_Action
+- TW_NEAR_Proto_SigningInput
+- TW_NEAR_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWNEOProto.yaml b/codegen-v2/manifest/TWNEOProto.yaml
new file mode 100644
index 00000000000..b4db4f7ef01
--- /dev/null
+++ b/codegen-v2/manifest/TWNEOProto.yaml
@@ -0,0 +1,8 @@
+name: TWNEOProto
+protos:
+- TW_NEO_Proto_TransactionInput
+- TW_NEO_Proto_TransactionOutput
+- TW_NEO_Proto_SigningInput
+- TW_NEO_Proto_SigningOutput
+- TW_NEO_Proto_TransactionOutputPlan
+- TW_NEO_Proto_TransactionPlan
diff --git a/codegen-v2/manifest/TWNULSProto.yaml b/codegen-v2/manifest/TWNULSProto.yaml
new file mode 100644
index 00000000000..0ecedf0290f
--- /dev/null
+++ b/codegen-v2/manifest/TWNULSProto.yaml
@@ -0,0 +1,8 @@
+name: TWNULSProto
+protos:
+- TW_NULS_Proto_TransactionCoinFrom
+- TW_NULS_Proto_TransactionCoinTo
+- TW_NULS_Proto_Signature
+- TW_NULS_Proto_Transaction
+- TW_NULS_Proto_SigningInput
+- TW_NULS_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWNanoProto.yaml b/codegen-v2/manifest/TWNanoProto.yaml
new file mode 100644
index 00000000000..b153219bbce
--- /dev/null
+++ b/codegen-v2/manifest/TWNanoProto.yaml
@@ -0,0 +1,4 @@
+name: TWNanoProto
+protos:
+- TW_Nano_Proto_SigningInput
+- TW_Nano_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWNebulasProto.yaml b/codegen-v2/manifest/TWNebulasProto.yaml
new file mode 100644
index 00000000000..a53a6975f97
--- /dev/null
+++ b/codegen-v2/manifest/TWNebulasProto.yaml
@@ -0,0 +1,6 @@
+name: TWNebulasProto
+protos:
+- TW_Nebulas_Proto_SigningInput
+- TW_Nebulas_Proto_SigningOutput
+- TW_Nebulas_Proto_Data
+- TW_Nebulas_Proto_RawTransaction
diff --git a/codegen-v2/manifest/TWNervosAddress.yaml b/codegen-v2/manifest/TWNervosAddress.yaml
new file mode 100644
index 00000000000..33a5502426b
--- /dev/null
+++ b/codegen-v2/manifest/TWNervosAddress.yaml
@@ -0,0 +1,86 @@
+name: TWNervosAddress
+structs:
+- name: TWNervosAddress
+  is_public: true
+  is_class: true
+inits:
+- name: TWNervosAddressCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWNervosAddressDelete
+functions:
+- name: TWNervosAddressEqual
+  is_public: true
+  is_static: true
+  params:
+  - name: lhs
+    type:
+      variant: struct
+      value: TWNervosAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: rhs
+    type:
+      variant: struct
+      value: TWNervosAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWNervosAddressIsValidString
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWNervosAddressDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWNervosAddressCodeHash
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWNervosAddressHashType
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWNervosAddressArgs
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWNervosProto.yaml b/codegen-v2/manifest/TWNervosProto.yaml
new file mode 100644
index 00000000000..5c75962a775
--- /dev/null
+++ b/codegen-v2/manifest/TWNervosProto.yaml
@@ -0,0 +1,15 @@
+name: TWNervosProto
+protos:
+- TW_Nervos_Proto_TransactionPlan
+- TW_Nervos_Proto_CellDep
+- TW_Nervos_Proto_OutPoint
+- TW_Nervos_Proto_CellOutput
+- TW_Nervos_Proto_Script
+- TW_Nervos_Proto_NativeTransfer
+- TW_Nervos_Proto_SudtTransfer
+- TW_Nervos_Proto_DaoDeposit
+- TW_Nervos_Proto_DaoWithdrawPhase1
+- TW_Nervos_Proto_DaoWithdrawPhase2
+- TW_Nervos_Proto_SigningInput
+- TW_Nervos_Proto_Cell
+- TW_Nervos_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWNimiqProto.yaml b/codegen-v2/manifest/TWNimiqProto.yaml
new file mode 100644
index 00000000000..874c5688186
--- /dev/null
+++ b/codegen-v2/manifest/TWNimiqProto.yaml
@@ -0,0 +1,4 @@
+name: TWNimiqProto
+protos:
+- TW_Nimiq_Proto_SigningInput
+- TW_Nimiq_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWOasisProto.yaml b/codegen-v2/manifest/TWOasisProto.yaml
new file mode 100644
index 00000000000..d20358b3002
--- /dev/null
+++ b/codegen-v2/manifest/TWOasisProto.yaml
@@ -0,0 +1,5 @@
+name: TWOasisProto
+protos:
+- TW_Oasis_Proto_TransferMessage
+- TW_Oasis_Proto_SigningInput
+- TW_Oasis_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWOntologyProto.yaml b/codegen-v2/manifest/TWOntologyProto.yaml
new file mode 100644
index 00000000000..7d9c965172f
--- /dev/null
+++ b/codegen-v2/manifest/TWOntologyProto.yaml
@@ -0,0 +1,4 @@
+name: TWOntologyProto
+protos:
+- TW_Ontology_Proto_SigningInput
+- TW_Ontology_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWPBKDF2.yaml b/codegen-v2/manifest/TWPBKDF2.yaml
new file mode 100644
index 00000000000..1e1a36a0b0f
--- /dev/null
+++ b/codegen-v2/manifest/TWPBKDF2.yaml
@@ -0,0 +1,72 @@
+name: TWPBKDF2
+structs:
+- name: TWPBKDF2
+  is_public: true
+  is_class: false
+functions:
+- name: TWPBKDF2HmacSha256
+  is_public: true
+  is_static: true
+  params:
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: salt
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: iterations
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: dkLen
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWPBKDF2HmacSha512
+  is_public: true
+  is_static: true
+  params:
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: salt
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: iterations
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: dkLen
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWPolkadotProto.yaml b/codegen-v2/manifest/TWPolkadotProto.yaml
new file mode 100644
index 00000000000..80eb51c7c9d
--- /dev/null
+++ b/codegen-v2/manifest/TWPolkadotProto.yaml
@@ -0,0 +1,7 @@
+name: TWPolkadotProto
+protos:
+- TW_Polkadot_Proto_Era
+- TW_Polkadot_Proto_Balance
+- TW_Polkadot_Proto_Staking
+- TW_Polkadot_Proto_SigningInput
+- TW_Polkadot_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWPrivateKey.yaml b/codegen-v2/manifest/TWPrivateKey.yaml
new file mode 100644
index 00000000000..5ec6bfd486d
--- /dev/null
+++ b/codegen-v2/manifest/TWPrivateKey.yaml
@@ -0,0 +1,322 @@
+name: TWPrivateKey
+structs:
+- name: TWPrivateKey
+  is_public: true
+  is_class: true
+inits:
+- name: TWPrivateKeyCreate
+  is_public: true
+  is_nullable: false
+- name: TWPrivateKeyCreateWithData
+  is_public: true
+  is_nullable: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWPrivateKeyCreateCopy
+  is_public: true
+  is_nullable: true
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWPrivateKeyDelete
+functions:
+- name: TWPrivateKeyIsValid
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: curve
+    type:
+      variant: enum
+      value: TWCurve
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWPrivateKeyGetPublicKey
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coinType
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPrivateKeyGetPublicKeyByType
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: pubkeyType
+    type:
+      variant: enum
+      value: TWPublicKeyType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPrivateKeyGetPublicKeySecp256k1
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: compressed
+    type:
+      variant: bool
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPrivateKeyGetPublicKeyNist256p1
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPrivateKeyGetPublicKeyEd25519
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPrivateKeyGetPublicKeyEd25519Blake2b
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPrivateKeyGetPublicKeyEd25519Cardano
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPrivateKeyGetPublicKeyCurve25519
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPrivateKeyGetSharedKey
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: curve
+    type:
+      variant: enum
+      value: TWCurve
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWPrivateKeySign
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: digest
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: curve
+    type:
+      variant: enum
+      value: TWCurve
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWPrivateKeySignAsDER
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: digest
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWPrivateKeySignZilliqaSchnorr
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+properties:
+- name: TWPrivateKeyData
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWPrivateKeyType.yaml b/codegen-v2/manifest/TWPrivateKeyType.yaml
new file mode 100644
index 00000000000..c16c8082188
--- /dev/null
+++ b/codegen-v2/manifest/TWPrivateKeyType.yaml
@@ -0,0 +1,11 @@
+name: TWPrivateKeyType
+enums:
+- name: TWPrivateKeyType
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: default
+    value: 0
+  - name: cardano
+    value: 1
diff --git a/codegen-v2/manifest/TWPublicKey.yaml b/codegen-v2/manifest/TWPublicKey.yaml
new file mode 100644
index 00000000000..bacfe840deb
--- /dev/null
+++ b/codegen-v2/manifest/TWPublicKey.yaml
@@ -0,0 +1,200 @@
+name: TWPublicKey
+structs:
+- name: TWPublicKey
+  is_public: true
+  is_class: true
+inits:
+- name: TWPublicKeyCreateWithData
+  is_public: true
+  is_nullable: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: type
+    type:
+      variant: enum
+      value: TWPublicKeyType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+deinits:
+- name: TWPublicKeyDelete
+functions:
+- name: TWPublicKeyIsValid
+  is_public: true
+  is_static: true
+  params:
+  - name: data
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: type
+    type:
+      variant: enum
+      value: TWPublicKeyType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWPublicKeyVerify
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWPublicKeyVerifyAsDER
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWPublicKeyVerifyZilliqaSchnorr
+  is_public: true
+  is_static: false
+  params:
+  - name: pk
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWPublicKeyRecover
+  is_public: true
+  is_static: true
+  params:
+  - name: signature
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+properties:
+- name: TWPublicKeyIsCompressed
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWPublicKeyCompressed
+  is_public: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPublicKeyUncompressed
+  is_public: true
+  return_type:
+    variant: struct
+    value: TWPublicKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
+- name: TWPublicKeyData
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWPublicKeyKeyType
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWPublicKeyType
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWPublicKeyDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWPublicKeyType.yaml b/codegen-v2/manifest/TWPublicKeyType.yaml
new file mode 100644
index 00000000000..3498161aa65
--- /dev/null
+++ b/codegen-v2/manifest/TWPublicKeyType.yaml
@@ -0,0 +1,25 @@
+name: TWPublicKeyType
+enums:
+- name: TWPublicKeyType
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: secp256k1
+    value: 0
+  - name: secp256k1Extended
+    value: 1
+  - name: nist256p1
+    value: 2
+  - name: nist256p1Extended
+    value: 3
+  - name: ed25519
+    value: 4
+  - name: ed25519Blake2b
+    value: 5
+  - name: curve25519
+    value: 6
+  - name: ed25519Cardano
+    value: 7
+  - name: starkex
+    value: 8
diff --git a/codegen-v2/manifest/TWPurpose.yaml b/codegen-v2/manifest/TWPurpose.yaml
new file mode 100644
index 00000000000..8ccf4d8cc0e
--- /dev/null
+++ b/codegen-v2/manifest/TWPurpose.yaml
@@ -0,0 +1,15 @@
+name: TWPurpose
+enums:
+- name: TWPurpose
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: bip44
+    value: 44
+  - name: bip49
+    value: 49
+  - name: bip84
+    value: 84
+  - name: bip1852
+    value: 1852
diff --git a/codegen-v2/manifest/TWRippleProto.yaml b/codegen-v2/manifest/TWRippleProto.yaml
new file mode 100644
index 00000000000..de3b2af9e88
--- /dev/null
+++ b/codegen-v2/manifest/TWRippleProto.yaml
@@ -0,0 +1,11 @@
+name: TWRippleProto
+protos:
+- TW_Ripple_Proto_CurrencyAmount
+- TW_Ripple_Proto_OperationTrustSet
+- TW_Ripple_Proto_OperationPayment
+- TW_Ripple_Proto_OperationNFTokenBurn
+- TW_Ripple_Proto_OperationNFTokenCreateOffer
+- TW_Ripple_Proto_OperationNFTokenAcceptOffer
+- TW_Ripple_Proto_OperationNFTokenCancelOffer
+- TW_Ripple_Proto_SigningInput
+- TW_Ripple_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWRippleXAddress.yaml b/codegen-v2/manifest/TWRippleXAddress.yaml
new file mode 100644
index 00000000000..8793e2ce5f4
--- /dev/null
+++ b/codegen-v2/manifest/TWRippleXAddress.yaml
@@ -0,0 +1,92 @@
+name: TWRippleXAddress
+structs:
+- name: TWPublicKey
+  is_public: false
+  is_class: false
+- name: TWRippleXAddress
+  is_public: true
+  is_class: true
+inits:
+- name: TWRippleXAddressCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWRippleXAddressCreateWithPublicKey
+  is_public: true
+  is_nullable: false
+  params:
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: tag
+    type:
+      variant: u_int32_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+deinits:
+- name: TWRippleXAddressDelete
+functions:
+- name: TWRippleXAddressEqual
+  is_public: true
+  is_static: true
+  params:
+  - name: lhs
+    type:
+      variant: struct
+      value: TWRippleXAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: rhs
+    type:
+      variant: struct
+      value: TWRippleXAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWRippleXAddressIsValidString
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWRippleXAddressDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWRippleXAddressTag
+  is_public: true
+  return_type:
+    variant: u_int32_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWSS58AddressType.yaml b/codegen-v2/manifest/TWSS58AddressType.yaml
new file mode 100644
index 00000000000..617d5ca49a0
--- /dev/null
+++ b/codegen-v2/manifest/TWSS58AddressType.yaml
@@ -0,0 +1,11 @@
+name: TWSS58AddressType
+enums:
+- name: TWSS58AddressType
+  is_public: true
+  value_type:
+    variant: u_int8_t
+  variants:
+  - name: polkadot
+    value: 0
+  - name: kusama
+    value: 2
diff --git a/codegen-v2/manifest/TWSegwitAddress.yaml b/codegen-v2/manifest/TWSegwitAddress.yaml
new file mode 100644
index 00000000000..6225484c27d
--- /dev/null
+++ b/codegen-v2/manifest/TWSegwitAddress.yaml
@@ -0,0 +1,108 @@
+name: TWSegwitAddress
+structs:
+- name: TWPublicKey
+  is_public: false
+  is_class: false
+- name: TWSegwitAddress
+  is_public: true
+  is_class: true
+inits:
+- name: TWSegwitAddressCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWSegwitAddressCreateWithPublicKey
+  is_public: true
+  is_nullable: false
+  params:
+  - name: hrp
+    type:
+      variant: enum
+      value: TWHRP
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: publicKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWSegwitAddressDelete
+functions:
+- name: TWSegwitAddressEqual
+  is_public: true
+  is_static: true
+  params:
+  - name: lhs
+    type:
+      variant: struct
+      value: TWSegwitAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: rhs
+    type:
+      variant: struct
+      value: TWSegwitAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWSegwitAddressIsValidString
+  is_public: true
+  is_static: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWSegwitAddressDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWSegwitAddressHRP
+  is_public: true
+  return_type:
+    variant: enum
+    value: TWHRP
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWSegwitAddressWitnessVersion
+  is_public: true
+  return_type:
+    variant: int
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWSegwitAddressWitnessProgram
+  is_public: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWSolanaAddress.yaml b/codegen-v2/manifest/TWSolanaAddress.yaml
new file mode 100644
index 00000000000..28908ef2a9d
--- /dev/null
+++ b/codegen-v2/manifest/TWSolanaAddress.yaml
@@ -0,0 +1,49 @@
+name: TWSolanaAddress
+structs:
+- name: TWSolanaAddress
+  is_public: true
+  is_class: true
+inits:
+- name: TWSolanaAddressCreateWithString
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: TWSolanaAddressDelete
+functions:
+- name: TWSolanaAddressDefaultTokenAddress
+  is_public: true
+  is_static: false
+  params:
+  - name: address
+    type:
+      variant: struct
+      value: TWSolanaAddress
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: tokenMintAddress
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+properties:
+- name: TWSolanaAddressDescription
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWSolanaProto.yaml b/codegen-v2/manifest/TWSolanaProto.yaml
new file mode 100644
index 00000000000..4d002e53fad
--- /dev/null
+++ b/codegen-v2/manifest/TWSolanaProto.yaml
@@ -0,0 +1,14 @@
+name: TWSolanaProto
+protos:
+- TW_Solana_Proto_Transfer
+- TW_Solana_Proto_DelegateStake
+- TW_Solana_Proto_DeactivateStake
+- TW_Solana_Proto_DeactivateAllStake
+- TW_Solana_Proto_WithdrawStake
+- TW_Solana_Proto_StakeAccountValue
+- TW_Solana_Proto_WithdrawAllStake
+- TW_Solana_Proto_CreateTokenAccount
+- TW_Solana_Proto_TokenTransfer
+- TW_Solana_Proto_CreateAndTransferToken
+- TW_Solana_Proto_SigningInput
+- TW_Solana_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWStarkExMessageSigner.yaml b/codegen-v2/manifest/TWStarkExMessageSigner.yaml
new file mode 100644
index 00000000000..2c927399e52
--- /dev/null
+++ b/codegen-v2/manifest/TWStarkExMessageSigner.yaml
@@ -0,0 +1,56 @@
+name: TWStarkExMessageSigner
+structs:
+- name: TWStarkExMessageSigner
+  is_public: true
+  is_class: false
+functions:
+- name: TWStarkExMessageSignerSignMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWStarkExMessageSignerVerifyMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: pubKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWStarkWare.yaml b/codegen-v2/manifest/TWStarkWare.yaml
new file mode 100644
index 00000000000..491f36d1826
--- /dev/null
+++ b/codegen-v2/manifest/TWStarkWare.yaml
@@ -0,0 +1,29 @@
+name: TWStarkWare
+structs:
+- name: TWStarkWare
+  is_public: true
+  is_class: false
+functions:
+- name: TWStarkWareGetStarkKeyFromSignature
+  is_public: true
+  is_static: true
+  params:
+  - name: derivationPath
+    type:
+      variant: struct
+      value: TWDerivationPath
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPrivateKey
+    is_constant: false
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWStellarMemoType.yaml b/codegen-v2/manifest/TWStellarMemoType.yaml
new file mode 100644
index 00000000000..d086e056a0c
--- /dev/null
+++ b/codegen-v2/manifest/TWStellarMemoType.yaml
@@ -0,0 +1,17 @@
+name: TWStellarMemoType
+enums:
+- name: TWStellarMemoType
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: none
+    value: 0
+  - name: text
+    value: 1
+  - name: id
+    value: 2
+  - name: hash
+    value: 3
+  - name: return
+    value: 4
diff --git a/codegen-v2/manifest/TWStellarPassphrase.yaml b/codegen-v2/manifest/TWStellarPassphrase.yaml
new file mode 100644
index 00000000000..4daba41e364
--- /dev/null
+++ b/codegen-v2/manifest/TWStellarPassphrase.yaml
@@ -0,0 +1,13 @@
+name: TWStellarPassphrase
+enums:
+- name: TWStellarPassphrase
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: stellar
+    value: 0
+    as_string: Public Global Stellar Network ; September 2015
+  - name: kin
+    value: 1
+    as_string: Kin Mainnet ; December 2018
diff --git a/codegen-v2/manifest/TWStellarProto.yaml b/codegen-v2/manifest/TWStellarProto.yaml
new file mode 100644
index 00000000000..7c016b1627e
--- /dev/null
+++ b/codegen-v2/manifest/TWStellarProto.yaml
@@ -0,0 +1,15 @@
+name: TWStellarProto
+protos:
+- TW_Stellar_Proto_Asset
+- TW_Stellar_Proto_OperationCreateAccount
+- TW_Stellar_Proto_OperationPayment
+- TW_Stellar_Proto_OperationChangeTrust
+- TW_Stellar_Proto_Claimant
+- TW_Stellar_Proto_OperationCreateClaimableBalance
+- TW_Stellar_Proto_OperationClaimClaimableBalance
+- TW_Stellar_Proto_MemoVoid
+- TW_Stellar_Proto_MemoText
+- TW_Stellar_Proto_MemoId
+- TW_Stellar_Proto_MemoHash
+- TW_Stellar_Proto_SigningInput
+- TW_Stellar_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWStellarVersionByte.yaml b/codegen-v2/manifest/TWStellarVersionByte.yaml
new file mode 100644
index 00000000000..7e962ba517c
--- /dev/null
+++ b/codegen-v2/manifest/TWStellarVersionByte.yaml
@@ -0,0 +1,15 @@
+name: TWStellarVersionByte
+enums:
+- name: TWStellarVersionByte
+  is_public: true
+  value_type:
+    variant: u_int16_t
+  variants:
+  - name: accountId
+    value: 0x30
+  - name: seed
+    value: 0xc0
+  - name: preAuthTx
+    value: 0xc8
+  - name: sha256Hash
+    value: 0x118
diff --git a/codegen-v2/manifest/TWStoredKey.yaml b/codegen-v2/manifest/TWStoredKey.yaml
new file mode 100644
index 00000000000..41080bad5c6
--- /dev/null
+++ b/codegen-v2/manifest/TWStoredKey.yaml
@@ -0,0 +1,755 @@
+name: TWStoredKey
+structs:
+- name: TWStoredKey
+  is_public: true
+  is_class: true
+inits:
+- name: TWStoredKeyCreateLevel
+  is_public: true
+  is_nullable: false
+  params:
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: encryptionLevel
+    type:
+      variant: enum
+      value: TWStoredKeyEncryptionLevel
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWStoredKeyCreateLevelAndEncryption
+  is_public: true
+  is_nullable: false
+  params:
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: encryptionLevel
+    type:
+      variant: enum
+      value: TWStoredKeyEncryptionLevel
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: encryption
+    type:
+      variant: enum
+      value: TWStoredKeyEncryption
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+- name: TWStoredKeyCreate
+  is_public: true
+  is_nullable: false
+  params:
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+- name: TWStoredKeyCreateEncryption
+  is_public: true
+  is_nullable: false
+  params:
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: encryption
+    type:
+      variant: enum
+      value: TWStoredKeyEncryption
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+deinits:
+- name: TWStoredKeyDelete
+functions:
+- name: TWStoredKeyLoad
+  is_public: true
+  is_static: true
+  params:
+  - name: path
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWStoredKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyImportPrivateKey
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWStoredKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyImportPrivateKeyWithEncryption
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: encryption
+    type:
+      variant: enum
+      value: TWStoredKeyEncryption
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWStoredKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyImportHDWallet
+  is_public: true
+  is_static: true
+  params:
+  - name: mnemonic
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWStoredKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyImportHDWalletWithEncryption
+  is_public: true
+  is_static: true
+  params:
+  - name: mnemonic
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: name
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: encryption
+    type:
+      variant: enum
+      value: TWStoredKeyEncryption
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWStoredKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyImportJSON
+  is_public: true
+  is_static: true
+  params:
+  - name: json
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWStoredKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyAccount
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: index
+    type:
+      variant: size_t
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: struct
+    value: TWAccount
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyAccountForCoin
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: true
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWAccount
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyAccountForCoinDerivation
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: wallet
+    type:
+      variant: struct
+      value: TWHDWallet
+      is_constant: false
+      is_nullable: true
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWAccount
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyAddAccountDerivation
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: address
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivationPath
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: publicKey
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: extendedPublicKey
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: void
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWStoredKeyAddAccount
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: address
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivationPath
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: publicKey
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: extendedPublicKey
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: void
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWStoredKeyRemoveAccountForCoin
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: void
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWStoredKeyRemoveAccountForCoinDerivation
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivation
+    type:
+      variant: enum
+      value: TWDerivation
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  return_type:
+    variant: void
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWStoredKeyRemoveAccountForCoinDerivationPath
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: derivationPath
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: void
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWStoredKeyStore
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: path
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWStoredKeyDecryptPrivateKey
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyDecryptMnemonic
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyPrivateKey
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: coin
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWPrivateKey
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyWallet
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: struct
+    value: TWHDWallet
+    is_constant: false
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyExportJSON
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyFixAddresses
+  is_public: true
+  is_static: false
+  params:
+  - name: key
+    type:
+      variant: struct
+      value: TWStoredKey
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  - name: password
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: TWStoredKeyIdentifier
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: TWStoredKeyName
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWStoredKeyIsMnemonic
+  is_public: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWStoredKeyAccountCount
+  is_public: true
+  return_type:
+    variant: size_t
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: TWStoredKeyEncryptionParameters
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWStoredKeyEncryption.yaml b/codegen-v2/manifest/TWStoredKeyEncryption.yaml
new file mode 100644
index 00000000000..417bea38cb3
--- /dev/null
+++ b/codegen-v2/manifest/TWStoredKeyEncryption.yaml
@@ -0,0 +1,15 @@
+name: TWStoredKeyEncryption
+enums:
+- name: TWStoredKeyEncryption
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: aes128Ctr
+    value: 0
+  - name: aes128Cbc
+    value: 1
+  - name: aes192Ctr
+    value: 2
+  - name: aes256Ctr
+    value: 3
diff --git a/codegen-v2/manifest/TWStoredKeyEncryptionLevel.yaml b/codegen-v2/manifest/TWStoredKeyEncryptionLevel.yaml
new file mode 100644
index 00000000000..4c0df079d88
--- /dev/null
+++ b/codegen-v2/manifest/TWStoredKeyEncryptionLevel.yaml
@@ -0,0 +1,15 @@
+name: TWStoredKeyEncryptionLevel
+enums:
+- name: TWStoredKeyEncryptionLevel
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: default
+    value: 0
+  - name: minimal
+    value: 1
+  - name: weak
+    value: 2
+  - name: standard
+    value: 3
diff --git a/codegen-v2/manifest/TWSuiProto.yaml b/codegen-v2/manifest/TWSuiProto.yaml
new file mode 100644
index 00000000000..c84041beac8
--- /dev/null
+++ b/codegen-v2/manifest/TWSuiProto.yaml
@@ -0,0 +1,5 @@
+name: TWSuiProto
+protos:
+- TW_Sui_Proto_SignDirect
+- TW_Sui_Proto_SigningInput
+- TW_Sui_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWTHORChainSwap.yaml b/codegen-v2/manifest/TWTHORChainSwap.yaml
new file mode 100644
index 00000000000..f6e42c8966f
--- /dev/null
+++ b/codegen-v2/manifest/TWTHORChainSwap.yaml
@@ -0,0 +1,21 @@
+name: TWTHORChainSwap
+structs:
+- name: TWTHORChainSwap
+  is_public: true
+  is_class: false
+functions:
+- name: TWTHORChainSwapBuildSwap
+  is_public: true
+  is_static: true
+  params:
+  - name: input
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWTHORChainSwapProto.yaml b/codegen-v2/manifest/TWTHORChainSwapProto.yaml
new file mode 100644
index 00000000000..41a265cae34
--- /dev/null
+++ b/codegen-v2/manifest/TWTHORChainSwapProto.yaml
@@ -0,0 +1,6 @@
+name: TWTHORChainSwapProto
+protos:
+- TW_THORChainSwap_Proto_Error
+- TW_THORChainSwap_Proto_Asset
+- TW_THORChainSwap_Proto_SwapInput
+- TW_THORChainSwap_Proto_SwapOutput
diff --git a/codegen-v2/manifest/TWTezosMessageSigner.yaml b/codegen-v2/manifest/TWTezosMessageSigner.yaml
new file mode 100644
index 00000000000..7019250a8d6
--- /dev/null
+++ b/codegen-v2/manifest/TWTezosMessageSigner.yaml
@@ -0,0 +1,92 @@
+name: TWTezosMessageSigner
+structs:
+- name: TWTezosMessageSigner
+  is_public: true
+  is_class: false
+functions:
+- name: TWTezosMessageSignerFormatMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: url
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWTezosMessageSignerInputToPayload
+  is_public: true
+  is_static: true
+  params:
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWTezosMessageSignerSignMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWTezosMessageSignerVerifyMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: pubKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWTezosProto.yaml b/codegen-v2/manifest/TWTezosProto.yaml
new file mode 100644
index 00000000000..b6a974069bf
--- /dev/null
+++ b/codegen-v2/manifest/TWTezosProto.yaml
@@ -0,0 +1,14 @@
+name: TWTezosProto
+protos:
+- TW_Tezos_Proto_SigningInput
+- TW_Tezos_Proto_SigningOutput
+- TW_Tezos_Proto_OperationList
+- TW_Tezos_Proto_Operation
+- TW_Tezos_Proto_FA12Parameters
+- TW_Tezos_Proto_Txs
+- TW_Tezos_Proto_TxObject
+- TW_Tezos_Proto_FA2Parameters
+- TW_Tezos_Proto_OperationParameters
+- TW_Tezos_Proto_TransactionOperationData
+- TW_Tezos_Proto_RevealOperationData
+- TW_Tezos_Proto_DelegationOperationData
diff --git a/codegen-v2/manifest/TWTheOpenNetworkProto.yaml b/codegen-v2/manifest/TWTheOpenNetworkProto.yaml
new file mode 100644
index 00000000000..bbfb681aa75
--- /dev/null
+++ b/codegen-v2/manifest/TWTheOpenNetworkProto.yaml
@@ -0,0 +1,5 @@
+name: TWTheOpenNetworkProto
+protos:
+- TW_TheOpenNetwork_Proto_Transfer
+- TW_TheOpenNetwork_Proto_SigningInput
+- TW_TheOpenNetwork_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWThetaProto.yaml b/codegen-v2/manifest/TWThetaProto.yaml
new file mode 100644
index 00000000000..4097843f588
--- /dev/null
+++ b/codegen-v2/manifest/TWThetaProto.yaml
@@ -0,0 +1,4 @@
+name: TWThetaProto
+protos:
+- TW_Theta_Proto_SigningInput
+- TW_Theta_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWTransactionCompiler.yaml b/codegen-v2/manifest/TWTransactionCompiler.yaml
new file mode 100644
index 00000000000..e31c93bd780
--- /dev/null
+++ b/codegen-v2/manifest/TWTransactionCompiler.yaml
@@ -0,0 +1,116 @@
+name: TWTransactionCompiler
+structs:
+- name: TWTransactionCompiler
+  is_public: true
+  is_class: false
+functions:
+- name: TWTransactionCompilerBuildInput
+  is_public: true
+  is_static: true
+  params:
+  - name: coinType
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: from
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: to
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: amount
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: asset
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: memo
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: chainId
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWTransactionCompilerPreImageHashes
+  is_public: true
+  is_static: true
+  params:
+  - name: coinType
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: txInputData
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWTransactionCompilerCompileWithSignatures
+  is_public: true
+  is_static: true
+  params:
+  - name: coinType
+    type:
+      variant: enum
+      value: TWCoinType
+      is_constant: false
+      is_nullable: false
+      is_pointer: false
+  - name: txInputData
+    type:
+      variant: data
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: signatures
+    type:
+      variant: struct
+      value: TWDataVector
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: publicKeys
+    type:
+      variant: struct
+      value: TWDataVector
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: data
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/manifest/TWTransactionCompilerProto.yaml b/codegen-v2/manifest/TWTransactionCompilerProto.yaml
new file mode 100644
index 00000000000..46dd9568d6f
--- /dev/null
+++ b/codegen-v2/manifest/TWTransactionCompilerProto.yaml
@@ -0,0 +1,3 @@
+name: TWTransactionCompilerProto
+protos:
+- TW_TxCompiler_Proto_PreSigningOutput
diff --git a/codegen-v2/manifest/TWTronMessageSigner.yaml b/codegen-v2/manifest/TWTronMessageSigner.yaml
new file mode 100644
index 00000000000..12d9081737e
--- /dev/null
+++ b/codegen-v2/manifest/TWTronMessageSigner.yaml
@@ -0,0 +1,56 @@
+name: TWTronMessageSigner
+structs:
+- name: TWTronMessageSigner
+  is_public: true
+  is_class: false
+functions:
+- name: TWTronMessageSignerSignMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: privateKey
+    type:
+      variant: struct
+      value: TWPrivateKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+- name: TWTronMessageSignerVerifyMessage
+  is_public: true
+  is_static: true
+  params:
+  - name: pubKey
+    type:
+      variant: struct
+      value: TWPublicKey
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: message
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  - name: signature
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/manifest/TWTronProto.yaml b/codegen-v2/manifest/TWTronProto.yaml
new file mode 100644
index 00000000000..56bd975df44
--- /dev/null
+++ b/codegen-v2/manifest/TWTronProto.yaml
@@ -0,0 +1,21 @@
+name: TWTronProto
+protos:
+- TW_Tron_Proto_TransferContract
+- TW_Tron_Proto_TransferAssetContract
+- TW_Tron_Proto_TransferTRC20Contract
+- TW_Tron_Proto_FreezeBalanceContract
+- TW_Tron_Proto_FreezeBalanceV2Contract
+- TW_Tron_Proto_UnfreezeBalanceV2Contract
+- TW_Tron_Proto_WithdrawExpireUnfreezeContract
+- TW_Tron_Proto_DelegateResourceContract
+- TW_Tron_Proto_UnDelegateResourceContract
+- TW_Tron_Proto_UnfreezeBalanceContract
+- TW_Tron_Proto_UnfreezeAssetContract
+- TW_Tron_Proto_VoteAssetContract
+- TW_Tron_Proto_VoteWitnessContract
+- TW_Tron_Proto_WithdrawBalanceContract
+- TW_Tron_Proto_TriggerSmartContract
+- TW_Tron_Proto_BlockHeader
+- TW_Tron_Proto_Transaction
+- TW_Tron_Proto_SigningInput
+- TW_Tron_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWVeChainProto.yaml b/codegen-v2/manifest/TWVeChainProto.yaml
new file mode 100644
index 00000000000..21acf417b22
--- /dev/null
+++ b/codegen-v2/manifest/TWVeChainProto.yaml
@@ -0,0 +1,5 @@
+name: TWVeChainProto
+protos:
+- TW_VeChain_Proto_Clause
+- TW_VeChain_Proto_SigningInput
+- TW_VeChain_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWWavesProto.yaml b/codegen-v2/manifest/TWWavesProto.yaml
new file mode 100644
index 00000000000..03ff214aff8
--- /dev/null
+++ b/codegen-v2/manifest/TWWavesProto.yaml
@@ -0,0 +1,7 @@
+name: TWWavesProto
+protos:
+- TW_Waves_Proto_TransferMessage
+- TW_Waves_Proto_LeaseMessage
+- TW_Waves_Proto_CancelLeaseMessage
+- TW_Waves_Proto_SigningInput
+- TW_Waves_Proto_SigningOutput
diff --git a/codegen-v2/manifest/TWZilliqaProto.yaml b/codegen-v2/manifest/TWZilliqaProto.yaml
new file mode 100644
index 00000000000..671d3a1d432
--- /dev/null
+++ b/codegen-v2/manifest/TWZilliqaProto.yaml
@@ -0,0 +1,5 @@
+name: TWZilliqaProto
+protos:
+- TW_Zilliqa_Proto_Transaction
+- TW_Zilliqa_Proto_SigningInput
+- TW_Zilliqa_Proto_SigningOutput
diff --git a/codegen-v2/src/codegen/cpp/blockchain_dispatcher_generator.rs b/codegen-v2/src/codegen/cpp/blockchain_dispatcher_generator.rs
new file mode 100644
index 00000000000..0871d545995
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/blockchain_dispatcher_generator.rs
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::cpp_source_directory;
+use crate::registry::CoinItem;
+use crate::utils::FileContent;
+use crate::Result;
+use std::path::PathBuf;
+
+const COIN_INCLUDES_END: &str = "end_of_coin_includes_marker_do_not_modify";
+const COIN_DISPATCHER_DECLARATIONS_END: &str =
+    "end_of_coin_dipatcher_declarations_marker_do_not_modify";
+const COIN_DISPATCHER_SWITCH_END: &str = "end_of_coin_dipatcher_switch_marker_do_not_modify";
+
+fn dispatcher_coin_cpp_path() -> PathBuf {
+    cpp_source_directory().join("Coin.cpp")
+}
+
+/// Represents `Coin.cpp`.
+pub struct BlockchainDispatcherGenerator;
+
+impl BlockchainDispatcherGenerator {
+    pub fn generate_new_blockchain_type_dispatching(coin: &CoinItem) -> Result<()> {
+        let dispatcher_path = dispatcher_coin_cpp_path();
+        println!("[EDIT] {dispatcher_path:?}");
+        let mut file_content = FileContent::read(dispatcher_path)?;
+
+        Self::generate_include_of_blockchain_entry(coin, &mut file_content)?;
+        Self::generate_blockchain_entry_constant(coin, &mut file_content)?;
+        Self::generate_blockchain_dispatcher_case(coin, &mut file_content)?;
+
+        file_content.write()
+    }
+
+    fn generate_include_of_blockchain_entry(
+        coin: &CoinItem,
+        file_content: &mut FileContent,
+    ) -> Result<()> {
+        let blockchain_type = coin.blockchain_type();
+
+        let mut line_marker = file_content.rfind_line(|line| line.contains(COIN_INCLUDES_END))?;
+        line_marker.push_line_before(format!(r#"#include "{blockchain_type}/Entry.h""#));
+
+        Ok(())
+    }
+
+    fn generate_blockchain_entry_constant(
+        coin: &CoinItem,
+        file_content: &mut FileContent,
+    ) -> Result<()> {
+        let blockchain_type = coin.blockchain_type();
+
+        let mut entries_region =
+            file_content.rfind_line(|line| line.contains(COIN_DISPATCHER_DECLARATIONS_END))?;
+        entries_region.push_line_before(format!("{blockchain_type}::Entry {blockchain_type}DP;"));
+
+        Ok(())
+    }
+
+    fn generate_blockchain_dispatcher_case(
+        coin: &CoinItem,
+        file_content: &mut FileContent,
+    ) -> Result<()> {
+        let blockchain_type = coin.blockchain_type();
+
+        let mut entries_region =
+            file_content.rfind_line(|line| line.contains(COIN_DISPATCHER_SWITCH_END))?;
+        entries_region.push_line_before(format!(
+            "        case TWBlockchain{blockchain_type}: entry = &{blockchain_type}DP; break;"
+        ));
+
+        Ok(())
+    }
+}
diff --git a/codegen-v2/src/codegen/cpp/entry_generator.rs b/codegen-v2/src/codegen/cpp/entry_generator.rs
new file mode 100644
index 00000000000..639ee6c0488
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/entry_generator.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::cpp_source_directory;
+use crate::codegen::template_generator::TemplateGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+use std::fs;
+use std::path::PathBuf;
+
+const ENTRY_HEADER_TEMPLATE: &str = include_str!("templates/Entry.h");
+
+pub fn coin_source_directory(coin: &CoinItem) -> PathBuf {
+    cpp_source_directory().join(coin.blockchain_type())
+}
+
+pub struct EntryGenerator;
+
+impl EntryGenerator {
+    pub fn generate(coin: &CoinItem) -> Result<PathBuf> {
+        let blockchain_dir = coin_source_directory(coin);
+        let entry_header_path = blockchain_dir.join("Entry.h");
+
+        if blockchain_dir.exists() {
+            println!("[SKIP] Entry file already exists: {blockchain_dir:?}");
+            return Ok(blockchain_dir);
+        }
+
+        fs::create_dir_all(&blockchain_dir)?;
+
+        println!("[ADD] {entry_header_path:?}");
+        TemplateGenerator::new(ENTRY_HEADER_TEMPLATE)
+            .write_to(entry_header_path.clone())
+            .with_default_patterns(coin)
+            .write()?;
+
+        Ok(entry_header_path)
+    }
+}
diff --git a/codegen-v2/src/codegen/cpp/mod.rs b/codegen-v2/src/codegen/cpp/mod.rs
new file mode 100644
index 00000000000..1ef7188d86f
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/mod.rs
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::registry::CoinItem;
+use std::env;
+use std::path::PathBuf;
+
+pub mod blockchain_dispatcher_generator;
+pub mod entry_generator;
+pub mod new_blockchain;
+pub mod new_cosmos_chain;
+pub mod new_evmchain;
+pub mod tw_any_address_tests_generator;
+pub mod tw_any_signer_tests_generator;
+pub mod tw_blockchain;
+pub mod tw_coin_address_derivation_tests_generator;
+pub mod tw_coin_type_generator;
+pub mod tw_coin_type_tests_generator;
+
+pub fn cpp_source_directory() -> PathBuf {
+    PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("..")
+        .join("src")
+}
+
+pub fn cpp_include_directory() -> PathBuf {
+    PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("..")
+        .join("include")
+        .join("TrustWalletCore")
+}
+
+pub fn integration_tests_directory() -> PathBuf {
+    PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("..")
+        .join("tests")
+}
+
+pub fn coin_integration_tests_directory(coin: &CoinItem) -> PathBuf {
+    integration_tests_directory()
+        .join("chains")
+        .join(coin.coin_type())
+}
+
+pub fn cosmos_coin_integration_tests_directory(coin: &CoinItem) -> PathBuf {
+    integration_tests_directory()
+        .join("chains")
+        .join("Cosmos")
+        .join(coin.coin_type())
+}
diff --git a/codegen-v2/src/codegen/cpp/new_blockchain.rs b/codegen-v2/src/codegen/cpp/new_blockchain.rs
new file mode 100644
index 00000000000..df7c94c62bd
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/new_blockchain.rs
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::blockchain_dispatcher_generator::BlockchainDispatcherGenerator;
+use crate::codegen::cpp::entry_generator::EntryGenerator;
+use crate::codegen::cpp::tw_any_address_tests_generator::TWAnyAddressTestsGenerator;
+use crate::codegen::cpp::tw_any_signer_tests_generator::TWAnySignerTestsGenerator;
+use crate::codegen::cpp::tw_blockchain::TWBlockchainGenerator;
+use crate::codegen::cpp::tw_coin_address_derivation_tests_generator::CoinAddressDerivationTestsGenerator;
+use crate::codegen::cpp::tw_coin_type_generator::TWCoinTypeGenerator;
+use crate::codegen::cpp::tw_coin_type_tests_generator::TWCoinTypeTestsGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+
+pub fn new_blockchain(coin: &CoinItem) -> Result<()> {
+    // Generate C++ files.
+    EntryGenerator::generate(coin)?;
+
+    // Add the new coin type to the `TWCoinType` enum.
+    TWCoinTypeGenerator::generate_coin_type_variant(coin)?;
+    // Add the new blockchain type to the `TWBlockchain` enum.
+    TWBlockchainGenerator::generate_blockchain_type_variant(coin)?;
+    // Add the blockchain entry to the dispatcher `Coin.cpp`.
+    BlockchainDispatcherGenerator::generate_new_blockchain_type_dispatching(coin)?;
+
+    // Add integration tests.
+    TWCoinTypeTestsGenerator::generate(coin)?;
+    TWAnyAddressTestsGenerator::generate(coin)?;
+    TWAnySignerTestsGenerator::generate(coin)?;
+    CoinAddressDerivationTestsGenerator::generate_new_coin_type_case(coin)?;
+
+    Ok(())
+}
diff --git a/codegen-v2/src/codegen/cpp/new_cosmos_chain.rs b/codegen-v2/src/codegen/cpp/new_cosmos_chain.rs
new file mode 100644
index 00000000000..08c4406f994
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/new_cosmos_chain.rs
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::tw_coin_address_derivation_tests_generator::CoinAddressDerivationTestsGenerator;
+use crate::codegen::cpp::tw_coin_type_generator::TWCoinTypeGenerator;
+use crate::codegen::cpp::tw_coin_type_tests_generator::TWCoinTypeTestsGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+
+pub fn new_cosmos_chain(coin: &CoinItem) -> Result<()> {
+    // Add the new coin type to the `TWCoinType` enum.
+    TWCoinTypeGenerator::generate_coin_type_variant(coin)?;
+
+    // Add integration tests.
+    TWCoinTypeTestsGenerator::generate(coin)?;
+    CoinAddressDerivationTestsGenerator::generate_new_coin_type_case(coin)?;
+
+    Ok(())
+}
diff --git a/codegen-v2/src/codegen/cpp/new_evmchain.rs b/codegen-v2/src/codegen/cpp/new_evmchain.rs
new file mode 100644
index 00000000000..2368c797ab3
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/new_evmchain.rs
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::tw_coin_address_derivation_tests_generator::CoinAddressDerivationTestsGenerator;
+use crate::codegen::cpp::tw_coin_type_generator::TWCoinTypeGenerator;
+use crate::codegen::cpp::tw_coin_type_tests_generator::TWCoinTypeTestsGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+
+pub fn new_evmchain(coin: &CoinItem) -> Result<()> {
+    // Add the new coin type to the `TWCoinType` enum.
+    TWCoinTypeGenerator::generate_coin_type_variant(coin)?;
+
+    // Add integration tests.
+    TWCoinTypeTestsGenerator::generate(coin)?;
+    CoinAddressDerivationTestsGenerator::generate_new_evm_coin_type_case(coin)?;
+
+    Ok(())
+}
diff --git a/codegen-v2/src/codegen/cpp/templates/Entry.h b/codegen-v2/src/codegen/cpp/templates/Entry.h
new file mode 100644
index 00000000000..2c2520f9ccb
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/templates/Entry.h
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/RustCoinEntry.h"
+
+namespace TW::{BLOCKCHAIN} {
+
+/// Entry point for {BLOCKCHAIN} coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry : public Rust::RustCoinEntry {
+};
+
+} // namespace TW::{BLOCKCHAIN}
+
diff --git a/codegen-v2/src/codegen/cpp/templates/TWAnyAddressTests.cpp b/codegen-v2/src/codegen/cpp/templates/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..139234a20e4
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/templates/TWAnyAddressTests.cpp
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+// TODO: Finalize tests
+
+TEST(TW{COIN_TYPE}, Address) {
+    // TODO: Finalize test implementation
+
+    auto string = STRING("__ADD_VALID_ADDRESS_HERE__");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinType{COIN_TYPE}));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "__CORRESPONDING_ADDRESS_DATA__");
+}
diff --git a/codegen-v2/src/codegen/cpp/templates/TWAnySignerTests.cpp b/codegen-v2/src/codegen/cpp/templates/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..ce5b56f0467
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/templates/TWAnySignerTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+// TODO: Finalize tests
+
+TEST(TWAnySigner{COIN_TYPE}, Sign) {
+    // TODO: Finalize test implementation
+}
diff --git a/codegen-v2/src/codegen/cpp/templates/TWCoinTypeTests.cpp b/codegen-v2/src/codegen/cpp/templates/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..8e917150dd4
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/templates/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TW{COIN_TYPE}CoinType, TWCoinType) {
+    const auto coin = TWCoinType{COIN_TYPE};
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("{EXPLORER_SAMPLE_TX}"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("{EXPLORER_SAMPLE_ACCOUNT}"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "{COIN_ID}");
+    assertStringsEqual(name, "{COIN_NAME}");
+    assertStringsEqual(symbol, "{SYMBOL}");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), {DECIMALS});
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchain{BLOCKCHAIN});
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), {P2PKH_PREFIX});
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), {P2SH_PREFIX});
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), {STATIC_PREFIX});
+    assertStringsEqual(txUrl, "{EXPLORER_URL}{EXPLORER_TX_PATH}{EXPLORER_SAMPLE_TX}");
+    assertStringsEqual(accUrl, "{EXPLORER_URL}{EXPLORER_ACCOUNT_PATH}{EXPLORER_SAMPLE_ACCOUNT}");
+}
diff --git a/codegen-v2/src/codegen/cpp/tw_any_address_tests_generator.rs b/codegen-v2/src/codegen/cpp/tw_any_address_tests_generator.rs
new file mode 100644
index 00000000000..599ea265235
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/tw_any_address_tests_generator.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::coin_integration_tests_directory;
+use crate::codegen::template_generator::TemplateGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+use std::fs;
+use std::path::PathBuf;
+
+const TW_ANY_ADDRESS_TESTS_TEMPLATE: &str = include_str!("templates/TWAnyAddressTests.cpp");
+
+pub fn tw_any_address_tests_path(coin: &CoinItem) -> PathBuf {
+    coin_integration_tests_directory(coin).join("TWAnyAddressTests.cpp")
+}
+
+pub struct TWAnyAddressTestsGenerator;
+
+impl TWAnyAddressTestsGenerator {
+    pub fn generate(coin: &CoinItem) -> Result<()> {
+        let coin_tests_dir = coin_integration_tests_directory(coin);
+        let tw_any_address_tests_path = coin_tests_dir.join("TWAnyAddressTests.cpp");
+
+        fs::create_dir_all(coin_tests_dir)?;
+        if tw_any_address_tests_path.exists() {
+            println!("[SKIP] {tw_any_address_tests_path:?} already exists");
+            return Ok(());
+        }
+
+        println!("[ADD] {tw_any_address_tests_path:?}");
+        TemplateGenerator::new(TW_ANY_ADDRESS_TESTS_TEMPLATE)
+            .write_to(tw_any_address_tests_path)
+            .with_default_patterns(coin)
+            .write()?;
+
+        Ok(())
+    }
+}
diff --git a/codegen-v2/src/codegen/cpp/tw_any_signer_tests_generator.rs b/codegen-v2/src/codegen/cpp/tw_any_signer_tests_generator.rs
new file mode 100644
index 00000000000..9ea4337616a
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/tw_any_signer_tests_generator.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::coin_integration_tests_directory;
+use crate::codegen::template_generator::TemplateGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+use std::fs;
+use std::path::PathBuf;
+
+const TW_ANY_SIGNER_TESTS_TEMPLATE: &str = include_str!("templates/TWAnySignerTests.cpp");
+
+pub fn tw_any_signer_tests_path(coin: &CoinItem) -> PathBuf {
+    coin_integration_tests_directory(coin).join("TWAnySignerTests.cpp")
+}
+
+pub struct TWAnySignerTestsGenerator;
+
+impl TWAnySignerTestsGenerator {
+    pub fn generate(coin: &CoinItem) -> Result<()> {
+        let coin_tests_dir = coin_integration_tests_directory(coin);
+        let tw_any_signer_tests_path = coin_tests_dir.join("TWAnySignerTests.cpp");
+
+        fs::create_dir_all(coin_tests_dir)?;
+        if tw_any_signer_tests_path.exists() {
+            println!("[SKIP] {tw_any_signer_tests_path:?} already exists");
+            return Ok(());
+        }
+
+        println!("[ADD] {tw_any_signer_tests_path:?}");
+        TemplateGenerator::new(TW_ANY_SIGNER_TESTS_TEMPLATE)
+            .write_to(tw_any_signer_tests_path)
+            .with_default_patterns(coin)
+            .write()?;
+
+        Ok(())
+    }
+}
diff --git a/codegen-v2/src/codegen/cpp/tw_blockchain.rs b/codegen-v2/src/codegen/cpp/tw_blockchain.rs
new file mode 100644
index 00000000000..a76a73ab055
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/tw_blockchain.rs
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::cpp_include_directory;
+use crate::registry::CoinItem;
+use crate::utils::FileContent;
+use crate::Result;
+use std::path::PathBuf;
+
+/// An offset because of removed blockchain enum types.
+const BLOCKCHAIN_TYPE_OFFSET: usize = 2;
+
+pub fn tw_blockchain_path() -> PathBuf {
+    cpp_include_directory().join("TWBlockchain.h")
+}
+
+/// Represents `TWBlockchain.h`.
+pub struct TWBlockchainGenerator;
+
+impl TWBlockchainGenerator {
+    pub fn generate_blockchain_type_variant(coin: &CoinItem) -> Result<()> {
+        let coin_type = coin.blockchain_type();
+        let tw_blockchain_type_path = tw_blockchain_path();
+
+        println!("[EDIT] {tw_blockchain_type_path:?}");
+        let mut tw_blockchain_type_rs = FileContent::read(tw_blockchain_type_path)?;
+
+        {
+            let mut enum_region =
+                tw_blockchain_type_rs.find_region_with_prefix("    TWBlockchain")?;
+            // Add an offset because of removed blockchain enum types.
+            let new_blockchain_id = enum_region.count_lines() + BLOCKCHAIN_TYPE_OFFSET;
+            enum_region.push_line(format!(
+                "    TWBlockchain{coin_type} = {new_blockchain_id},"
+            ));
+        }
+
+        tw_blockchain_type_rs.write()
+    }
+}
diff --git a/codegen-v2/src/codegen/cpp/tw_coin_address_derivation_tests_generator.rs b/codegen-v2/src/codegen/cpp/tw_coin_address_derivation_tests_generator.rs
new file mode 100644
index 00000000000..91321dffb05
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/tw_coin_address_derivation_tests_generator.rs
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::integration_tests_directory;
+use crate::registry::CoinItem;
+use crate::utils::FileContent;
+use crate::Result;
+use std::path::PathBuf;
+
+const COIN_ADDRESS_DERIVATION_TESTS_END: &str =
+    "end_of_coin_address_derivation_tests_marker_do_not_modify";
+const EVM_ADDRESS_DERIVATION_TESTS_END: &str =
+    "end_of_evm_address_derivation_tests_marker_do_not_modify";
+
+pub fn coin_address_derivation_tests_path() -> PathBuf {
+    integration_tests_directory()
+        .join("common")
+        .join("CoinAddressDerivationTests.cpp")
+}
+
+/// Represents `CoinAddressDerivationTests.cpp`.
+pub struct CoinAddressDerivationTestsGenerator;
+
+impl CoinAddressDerivationTestsGenerator {
+    pub fn generate_new_coin_type_case(coin: &CoinItem) -> Result<()> {
+        let coin_type = coin.coin_type();
+        let test_path = coin_address_derivation_tests_path();
+        println!("[EDIT] {test_path:?}");
+
+        let mut coin_address_derivation_test_rs = FileContent::read(test_path)?;
+
+        {
+            let mut switch_case_region = coin_address_derivation_test_rs
+                .rfind_line(|line| line.contains(COIN_ADDRESS_DERIVATION_TESTS_END))?;
+
+            #[rustfmt::skip]
+            let test_case = format!(
+r#"        case TWCoinType{coin_type}:
+            EXPECT_EQ(address, "__TODO__");
+            break;"#
+);
+
+            switch_case_region.push_paragraph_before(test_case);
+        }
+
+        coin_address_derivation_test_rs.write()
+    }
+
+    pub fn generate_new_evm_coin_type_case(coin: &CoinItem) -> Result<()> {
+        let coin_type = coin.coin_type();
+        let test_path = coin_address_derivation_tests_path();
+        println!("[EDIT] {test_path:?}");
+
+        let mut evm_address_derivation_test_rs = FileContent::read(test_path)?;
+
+        {
+            let mut switch_case_region = evm_address_derivation_test_rs
+                .rfind_line(|line| line.contains(EVM_ADDRESS_DERIVATION_TESTS_END))?;
+            switch_case_region.push_line_before(format!("        case TWCoinType{coin_type}:"));
+        }
+
+        evm_address_derivation_test_rs.write()
+    }
+}
diff --git a/codegen-v2/src/codegen/cpp/tw_coin_type_generator.rs b/codegen-v2/src/codegen/cpp/tw_coin_type_generator.rs
new file mode 100644
index 00000000000..0271838af03
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/tw_coin_type_generator.rs
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::cpp_include_directory;
+use crate::registry::CoinItem;
+use crate::utils::FileContent;
+use crate::Result;
+use std::path::PathBuf;
+
+const TW_COIN_TYPE_END: &str = "end_of_tw_coin_type_marker_do_not_modify";
+
+pub fn tw_coin_type_path() -> PathBuf {
+    cpp_include_directory().join("TWCoinType.h")
+}
+
+/// Represents `TWCoinType.h`.
+pub struct TWCoinTypeGenerator;
+
+impl TWCoinTypeGenerator {
+    pub fn generate_coin_type_variant(coin: &CoinItem) -> Result<()> {
+        let coin_type = coin.coin_type();
+        let coin_id_number = coin.coin_id_number;
+        let tw_coin_type_file_path = tw_coin_type_path();
+
+        println!("[EDIT] {tw_coin_type_file_path:?}");
+        let mut tw_coin_type_rs = FileContent::read(tw_coin_type_file_path)?;
+
+        {
+            let mut enum_region =
+                tw_coin_type_rs.rfind_line(|line| line.contains(TW_COIN_TYPE_END))?;
+            enum_region.push_line_before(format!("    TWCoinType{coin_type} = {coin_id_number},"));
+        }
+
+        tw_coin_type_rs.write()
+    }
+}
diff --git a/codegen-v2/src/codegen/cpp/tw_coin_type_tests_generator.rs b/codegen-v2/src/codegen/cpp/tw_coin_type_tests_generator.rs
new file mode 100644
index 00000000000..a3f9f50c5da
--- /dev/null
+++ b/codegen-v2/src/codegen/cpp/tw_coin_type_tests_generator.rs
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::cpp::{
+    coin_integration_tests_directory, cosmos_coin_integration_tests_directory,
+};
+use crate::codegen::template_generator::TemplateGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+use std::fs;
+use std::path::PathBuf;
+
+const TW_COIN_TYPE_TESTS_TEMPLATE: &str = include_str!("templates/TWCoinTypeTests.cpp");
+
+pub fn tw_coin_type_tests_path(coin: &CoinItem) -> PathBuf {
+    coin_integration_tests_directory(coin).join("TWCoinTypeTests.cpp")
+}
+
+pub struct TWCoinTypeTestsGenerator;
+
+impl TWCoinTypeTestsGenerator {
+    pub fn generate(coin: &CoinItem) -> Result<()> {
+        let coin_tests_dir = coin_integration_tests_directory(coin);
+        Self::generate_at(coin, coin_tests_dir)
+    }
+
+    pub fn generate_cosmos(coin: &CoinItem) -> Result<()> {
+        let cosmos_coin_tests_dir = cosmos_coin_integration_tests_directory(coin);
+        Self::generate_at(coin, cosmos_coin_tests_dir)
+    }
+
+    fn generate_at(coin: &CoinItem, coin_tests_dir: PathBuf) -> Result<()> {
+        let tw_coin_type_tests_path = coin_tests_dir.join("TWCoinTypeTests.cpp");
+
+        fs::create_dir(coin_tests_dir)?;
+        if tw_coin_type_tests_path.exists() {
+            println!("[SKIP] {tw_coin_type_tests_path:?} already exists");
+            return Ok(());
+        }
+
+        println!("[ADD] {tw_coin_type_tests_path:?}");
+        TemplateGenerator::new(TW_COIN_TYPE_TESTS_TEMPLATE)
+            .write_to(tw_coin_type_tests_path)
+            .with_default_patterns(coin)
+            .write()?;
+
+        Ok(())
+    }
+}
diff --git a/codegen-v2/src/codegen/mod.rs b/codegen-v2/src/codegen/mod.rs
new file mode 100644
index 00000000000..1d8522e6b9f
--- /dev/null
+++ b/codegen-v2/src/codegen/mod.rs
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod cpp;
+pub mod proto;
+pub mod rust;
+pub mod swift;
+pub mod template_generator;
diff --git a/codegen-v2/src/codegen/proto/mod.rs b/codegen-v2/src/codegen/proto/mod.rs
new file mode 100644
index 00000000000..47d3e1a2dd5
--- /dev/null
+++ b/codegen-v2/src/codegen/proto/mod.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::env;
+use std::path::PathBuf;
+
+pub mod new_blockchain;
+pub mod proto_generator;
+
+pub fn proto_source_directory() -> PathBuf {
+    PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("..")
+        .join("src")
+        .join("proto")
+}
diff --git a/codegen-v2/src/codegen/proto/new_blockchain.rs b/codegen-v2/src/codegen/proto/new_blockchain.rs
new file mode 100644
index 00000000000..9e5f51a5387
--- /dev/null
+++ b/codegen-v2/src/codegen/proto/new_blockchain.rs
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::proto::proto_generator::ProtoGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+
+pub fn new_blockchain(coin: &CoinItem) -> Result<()> {
+    ProtoGenerator::generate(coin)
+}
diff --git a/codegen-v2/src/codegen/proto/proto_generator.rs b/codegen-v2/src/codegen/proto/proto_generator.rs
new file mode 100644
index 00000000000..f2cdfd94a86
--- /dev/null
+++ b/codegen-v2/src/codegen/proto/proto_generator.rs
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::proto::proto_source_directory;
+use crate::codegen::template_generator::TemplateGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+use std::path::PathBuf;
+
+const PROTO_TEMPLATE: &str = include_str!("templates/Blockchain.proto");
+
+pub fn blockchain_proto_path(coin: &CoinItem) -> PathBuf {
+    let blockchain_type = coin.blockchain_type();
+    proto_source_directory().join(format!("{blockchain_type}.proto"))
+}
+
+pub struct ProtoGenerator;
+
+impl ProtoGenerator {
+    pub fn generate(coin: &CoinItem) -> Result<()> {
+        let proto_path = blockchain_proto_path(coin);
+
+        if proto_path.exists() {
+            println!("[SKIP] Protobuf interface already exists: {proto_path:?}");
+            return Ok(());
+        }
+
+        println!("[ADD] {proto_path:?}");
+        TemplateGenerator::new(PROTO_TEMPLATE)
+            .write_to(proto_path)
+            .with_default_patterns(coin)
+            .write()?;
+
+        Ok(())
+    }
+}
diff --git a/codegen-v2/src/codegen/proto/templates/Blockchain.proto b/codegen-v2/src/codegen/proto/templates/Blockchain.proto
new file mode 100644
index 00000000000..9c4c6e34478
--- /dev/null
+++ b/codegen-v2/src/codegen/proto/templates/Blockchain.proto
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.{BLOCKCHAIN}.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+// TODO: typical balance transfer, add more fields needed to sign
+message TransferMessage {
+    int64 amount = 1;
+    int64 fee = 2;
+    string to = 3;
+}
+
+// TODO: Input data necessary to create a signed transaction.
+message SigningInput {
+    bytes private_key = 1;
+
+    oneof message_oneof {
+        TransferMessage transfer = 2;
+    }
+}
+
+// Transaction signing output.
+message SigningOutput {
+    // Signed and encoded transaction bytes.
+    bytes encoded = 1;
+
+    // A possible error, `OK` if none.
+    Common.Proto.SigningError error = 2;
+
+    string error_message = 3;
+}
diff --git a/codegen-v2/src/codegen/rust/blockchain_dispatcher_generator.rs b/codegen-v2/src/codegen/rust/blockchain_dispatcher_generator.rs
new file mode 100644
index 00000000000..92f98bac940
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/blockchain_dispatcher_generator.rs
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::coin_registry_directory;
+use crate::registry::CoinItem;
+use crate::utils::FileContent;
+use crate::Result;
+use std::path::PathBuf;
+
+const BLOCKCHAIN_ENTRIES_START: &str = "start_of_blockchain_entries";
+const BLOCKCHAIN_ENTRIES_END: &str = "end_of_blockchain_entries";
+const BLOCKCHAIN_DISPATCHER_START: &str = "start_of_blockchain_dispatcher";
+const BLOCKCHAIN_DISPATCHER_END: &str = "end_of_blockchain_dispatcher";
+
+pub fn dispatcher_path() -> PathBuf {
+    coin_registry_directory().join("src").join("dispatcher.rs")
+}
+
+pub struct BlockchainDispatcherGenerator;
+
+impl BlockchainDispatcherGenerator {
+    pub fn generate_new_blockchain_type_dispatching(coin: &CoinItem) -> Result<()> {
+        let dispatcher_rs_path = dispatcher_path();
+        println!("[EDIT] {dispatcher_rs_path:?}");
+        let mut dispatcher_rs = FileContent::read(dispatcher_rs_path)?;
+
+        Self::generate_use_of_blockchain_entry(coin, &mut dispatcher_rs)?;
+        Self::generate_blockchain_entry_constant(coin, &mut dispatcher_rs)?;
+        Self::generate_blockchain_dispatch(coin, &mut dispatcher_rs)?;
+
+        dispatcher_rs.write()
+    }
+
+    fn generate_use_of_blockchain_entry(
+        coin: &CoinItem,
+        file_content: &mut FileContent,
+    ) -> Result<()> {
+        let import_pattern = "use ";
+        let blockchain_entry = coin.blockchain_entry();
+        let tw_crate_name = coin.id.to_tw_crate_name();
+
+        let mut last_entry = file_content.rfind_line(|line| line.contains(import_pattern))?;
+        last_entry.push_line_after(format!("use {tw_crate_name}::entry::{blockchain_entry};"));
+
+        Ok(())
+    }
+
+    fn generate_blockchain_entry_constant(
+        coin: &CoinItem,
+        file_content: &mut FileContent,
+    ) -> Result<()> {
+        let blockchain_entry = coin.blockchain_entry();
+        let blockchain_entry_const = coin.blockchain_entry_upper_snake();
+
+        let mut entries_region = file_content
+            .find_region_with_comments(BLOCKCHAIN_ENTRIES_START, BLOCKCHAIN_ENTRIES_END)?;
+        entries_region.push_line(format!(
+            "const {blockchain_entry_const}: {blockchain_entry} = {blockchain_entry};"
+        ));
+        entries_region.sort();
+
+        Ok(())
+    }
+
+    fn generate_blockchain_dispatch(coin: &CoinItem, file_content: &mut FileContent) -> Result<()> {
+        let blockchain_type = coin.blockchain_type();
+        let blockchain_entry_const = coin.blockchain_entry_upper_snake();
+
+        let mut dispatcher_region = file_content
+            .find_region_with_comments(BLOCKCHAIN_DISPATCHER_START, BLOCKCHAIN_DISPATCHER_END)?;
+        dispatcher_region.push_line(format!(
+            "        BlockchainType::{blockchain_type} => Ok(&{blockchain_entry_const}),"
+        ));
+        dispatcher_region.sort();
+
+        Ok(())
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/blockchain_type_generator.rs b/codegen-v2/src/codegen/rust/blockchain_type_generator.rs
new file mode 100644
index 00000000000..4895bf8a923
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/blockchain_type_generator.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::coin_registry_directory;
+use crate::registry::CoinItem;
+use crate::utils::FileContent;
+use crate::Result;
+use std::path::PathBuf;
+
+const BLOCKCHAIN_TYPE_START: &str = "start_of_blockchain_type";
+const BLOCKCHAIN_TYPE_END: &str = "end_of_blockchain_type";
+
+pub fn blockchain_type_path() -> PathBuf {
+    coin_registry_directory()
+        .join("src")
+        .join("blockchain_type.rs")
+}
+
+/// Represents `BlockchainType` enum generator.
+pub struct BlockchainTypeGenerator;
+
+impl BlockchainTypeGenerator {
+    pub fn add_new_blockchain_type(coin: &CoinItem) -> Result<()> {
+        let blockchain_type_rs_path = blockchain_type_path();
+        let blockchain_type = coin.blockchain_type();
+
+        println!("[EDIT] {blockchain_type_rs_path:?}");
+        let mut blockchain_type_rs = FileContent::read(blockchain_type_rs_path)?;
+
+        {
+            let mut enum_region = blockchain_type_rs
+                .find_region_with_comments(BLOCKCHAIN_TYPE_START, BLOCKCHAIN_TYPE_END)?;
+            enum_region.push_line(format!("    {blockchain_type},"));
+            enum_region.sort();
+        }
+
+        blockchain_type_rs.write()
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/coin_address_derivation_test_generator.rs b/codegen-v2/src/codegen/rust/coin_address_derivation_test_generator.rs
new file mode 100644
index 00000000000..4d339cb05ad
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/coin_address_derivation_test_generator.rs
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::tw_tests_directory;
+use crate::registry::CoinItem;
+use crate::utils::FileContent;
+use crate::Result;
+use std::path::PathBuf;
+
+const COIN_ADDRESS_DERIVATION_TEST_END: &str =
+    "end_of_coin_address_derivation_tests_marker_do_not_modify";
+const EVM_ADDRESS_DERIVATION_TEST_END: &str =
+    "end_of_evm_address_derivation_tests_marker_do_not_modify";
+
+pub fn coin_address_derivation_test_path() -> PathBuf {
+    tw_tests_directory()
+        .join("tests")
+        .join("coin_address_derivation_test.rs")
+}
+
+pub struct CoinAddressDerivationTestGenerator;
+
+impl CoinAddressDerivationTestGenerator {
+    pub fn generate_new_coin_type_case(coin: &CoinItem) -> Result<()> {
+        let test_path = coin_address_derivation_test_path();
+        let coin_type = coin.coin_type();
+
+        println!("[EDIT] {test_path:?}");
+        let mut coin_address_derivation_test_rs = FileContent::read(test_path)?;
+
+        {
+            let mut end_of_test = coin_address_derivation_test_rs
+                .rfind_line(|line| line.contains(COIN_ADDRESS_DERIVATION_TEST_END))?;
+            end_of_test.push_line_before(format!("            CoinType::{coin_type} => todo!(),"));
+        }
+
+        coin_address_derivation_test_rs.write()
+    }
+
+    pub fn generate_new_evm_coin_type_case(coin: &CoinItem) -> Result<()> {
+        let test_path = coin_address_derivation_test_path();
+        let coin_type = coin.coin_type();
+
+        println!("[EDIT] {test_path:?}");
+        let mut coin_address_derivation_test_rs = FileContent::read(test_path)?;
+
+        {
+            let mut end_of_test = coin_address_derivation_test_rs
+                .rfind_line(|line| line.contains(EVM_ADDRESS_DERIVATION_TEST_END))?;
+            end_of_test.push_line_before(format!("            | CoinType::{coin_type}"));
+        }
+
+        coin_address_derivation_test_rs.write()
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/coin_crate.rs b/codegen-v2/src/codegen/rust/coin_crate.rs
new file mode 100644
index 00000000000..0e1b133f171
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/coin_crate.rs
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::chains_directory;
+use crate::codegen::template_generator::TemplateGenerator;
+use crate::coin_id::CoinId;
+use crate::registry::CoinItem;
+use crate::Result;
+use std::fs;
+use std::path::PathBuf;
+
+const BLOCKCHAIN_ADDRESS_TEMPLATE: &str = include_str!("templates/blockchain_crate/address.rs");
+const BLOCKCHAIN_COMPILER_TEMPLATE: &str = include_str!("templates/blockchain_crate/compiler.rs");
+const BLOCKCHAIN_ENTRY_TEMPLATE: &str = include_str!("templates/blockchain_crate/entry.rs");
+const BLOCKCHAIN_MANIFEST_TEMPLATE: &str = include_str!("templates/blockchain_crate/Cargo.toml");
+const BLOCKCHAIN_LIB_TEMPLATE: &str = include_str!("templates/blockchain_crate/lib.rs");
+const BLOCKCHAIN_SIGNER_TEMPLATE: &str = include_str!("templates/blockchain_crate/signer.rs");
+
+pub fn coin_source_directory(id: &CoinId) -> PathBuf {
+    chains_directory().join(id.to_tw_crate_name())
+}
+
+pub struct CoinCrate {
+    coin: CoinItem,
+}
+
+impl CoinCrate {
+    pub fn new(coin: CoinItem) -> CoinCrate {
+        CoinCrate { coin }
+    }
+
+    /// Creates a Cargo crate with `entry.rs` file.
+    /// Returns the path to the create crate.
+    pub fn create(self) -> Result<PathBuf> {
+        let blockchain_path = coin_source_directory(&self.coin.id);
+        let blockchain_toml_path = blockchain_path.join("Cargo.toml");
+
+        let blockchain_src_path = blockchain_path.join("src");
+        let blockchain_lib_rs_path = blockchain_src_path.join("lib.rs");
+        let blockchain_entry_path = blockchain_src_path.join("entry.rs");
+        let blockchain_compiler_path = blockchain_src_path.join("compiler.rs");
+        let blockchain_address_rs_path = blockchain_src_path.join("address.rs");
+        let blockchain_signer_rs_path = blockchain_src_path.join("signer.rs");
+
+        if blockchain_path.exists() {
+            let tw_crate_name = self.coin.id.to_tw_crate_name();
+            println!(
+                "[SKIP] '{tw_crate_name}' blockchain crate already exists: {blockchain_path:?}"
+            );
+            return Ok(blockchain_path);
+        }
+
+        fs::create_dir_all(&blockchain_path)?;
+        fs::create_dir_all(&blockchain_src_path)?;
+
+        println!("[ADD] {blockchain_toml_path:?}");
+        TemplateGenerator::new(BLOCKCHAIN_MANIFEST_TEMPLATE)
+            .write_to(blockchain_toml_path)
+            .with_default_patterns(&self.coin)
+            .write()?;
+
+        println!("[ADD] {blockchain_lib_rs_path:?}");
+        TemplateGenerator::new(BLOCKCHAIN_LIB_TEMPLATE)
+            .write_to(blockchain_lib_rs_path)
+            .with_default_patterns(&self.coin)
+            .write()?;
+
+        println!("[ADD] {blockchain_entry_path:?}");
+        TemplateGenerator::new(BLOCKCHAIN_ENTRY_TEMPLATE)
+            .write_to(blockchain_entry_path)
+            .with_default_patterns(&self.coin)
+            .write()?;
+
+        println!("[ADD] {blockchain_compiler_path:?}");
+        TemplateGenerator::new(BLOCKCHAIN_COMPILER_TEMPLATE)
+            .write_to(blockchain_compiler_path)
+            .with_default_patterns(&self.coin)
+            .write()?;
+
+        println!("[ADD] {blockchain_address_rs_path:?}");
+        TemplateGenerator::new(BLOCKCHAIN_ADDRESS_TEMPLATE)
+            .write_to(blockchain_address_rs_path)
+            .with_default_patterns(&self.coin)
+            .write()?;
+
+        println!("[ADD] {blockchain_signer_rs_path:?}");
+        TemplateGenerator::new(BLOCKCHAIN_SIGNER_TEMPLATE)
+            .write_to(blockchain_signer_rs_path)
+            .with_default_patterns(&self.coin)
+            .write()?;
+
+        Ok(blockchain_path)
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/coin_integration_tests.rs b/codegen-v2/src/codegen/rust/coin_integration_tests.rs
new file mode 100644
index 00000000000..067462aacfc
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/coin_integration_tests.rs
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::tw_tests_directory;
+use crate::codegen::template_generator::TemplateGenerator;
+use crate::coin_id::CoinId;
+use crate::registry::CoinItem;
+use crate::utils::FileContent;
+use crate::Result;
+use std::fs;
+use std::path::PathBuf;
+
+const ADDRESS_TESTS_TEMPLATE: &str = include_str!("templates/integration_tests/address_tests.rs");
+const COSMOS_ADDRESS_TESTS_TEMPLATE: &str =
+    include_str!("templates/integration_tests/cosmos_address_tests.rs");
+const COMPILE_TESTS_TEMPLATE: &str = include_str!("templates/integration_tests/compile_tests.rs");
+const MOD_TESTS_TEMPLATE: &str = include_str!("templates/integration_tests/mod.rs");
+const MOD_ADDRESS_TESTS_TEMPLATE: &str = include_str!("templates/integration_tests/mod_address.rs");
+const SIGN_TESTS_TEMPLATE: &str = include_str!("templates/integration_tests/sign_tests.rs");
+
+pub fn chains_integration_tests_directory() -> PathBuf {
+    tw_tests_directory().join("tests").join("chains")
+}
+
+pub fn coin_integration_tests_directory(id: &CoinId) -> PathBuf {
+    chains_integration_tests_directory().join(id.as_str())
+}
+
+pub fn coin_address_derivation_test_path() -> PathBuf {
+    tw_tests_directory()
+        .join("tests")
+        .join("coin_address_derivation_test.rs")
+}
+
+pub struct CoinIntegrationTests {
+    coin: CoinItem,
+}
+
+impl CoinIntegrationTests {
+    pub fn new(coin: CoinItem) -> CoinIntegrationTests {
+        CoinIntegrationTests { coin }
+    }
+
+    pub fn create(self) -> Result<PathBuf> {
+        let blockchain_tests_path = self.coin_tests_directory();
+        if blockchain_tests_path.exists() {
+            println!("[SKIP] integration tests already exists: {blockchain_tests_path:?}");
+            return Ok(blockchain_tests_path);
+        }
+
+        fs::create_dir_all(&blockchain_tests_path)?;
+
+        self.list_blockchain_in_chains_mod()?;
+        self.create_address_tests(ADDRESS_TESTS_TEMPLATE)?;
+        self.create_compile_tests()?;
+        self.create_sign_tests()?;
+        self.create_chain_tests_mod_rs(MOD_TESTS_TEMPLATE)?;
+
+        Ok(blockchain_tests_path)
+    }
+
+    /// For a Cosmos chain, it's enough to create address tests only, but with additional Bech32 prefix tests.
+    pub fn create_cosmos(self) -> Result<PathBuf> {
+        let blockchain_tests_path = self.coin_tests_directory();
+        if blockchain_tests_path.exists() {
+            println!("[SKIP] integration tests already exists: {blockchain_tests_path:?}");
+            return Ok(blockchain_tests_path);
+        }
+
+        fs::create_dir_all(&blockchain_tests_path)?;
+
+        self.list_blockchain_in_chains_mod()?;
+        self.create_address_tests(COSMOS_ADDRESS_TESTS_TEMPLATE)?;
+        // `mod.rs` should contain `{COIN_TYPE}_address` module only.
+        self.create_chain_tests_mod_rs(MOD_ADDRESS_TESTS_TEMPLATE)?;
+
+        Ok(blockchain_tests_path)
+    }
+
+    fn coin_tests_directory(&self) -> PathBuf {
+        coin_integration_tests_directory(&self.coin.id)
+    }
+
+    fn create_address_tests(&self, template: &'static str) -> Result<()> {
+        let coin_id = self.coin.id.as_str();
+        let address_tests_path = self
+            .coin_tests_directory()
+            .join(format!("{coin_id}_address.rs"));
+
+        println!("[ADD] {address_tests_path:?}");
+        TemplateGenerator::new(template)
+            .write_to(address_tests_path)
+            .with_default_patterns(&self.coin)
+            .write()
+    }
+
+    fn create_compile_tests(&self) -> Result<()> {
+        let coin_id = self.coin.id.as_str();
+        let compile_tests_path = self
+            .coin_tests_directory()
+            .join(format!("{coin_id}_compile.rs"));
+
+        println!("[ADD] {compile_tests_path:?}");
+        TemplateGenerator::new(COMPILE_TESTS_TEMPLATE)
+            .write_to(compile_tests_path)
+            .with_default_patterns(&self.coin)
+            .write()
+    }
+
+    fn create_sign_tests(&self) -> Result<()> {
+        let coin_id = self.coin.id.as_str();
+        let sign_tests_path = self
+            .coin_tests_directory()
+            .join(format!("{coin_id}_sign.rs"));
+
+        println!("[ADD] {sign_tests_path:?}");
+        TemplateGenerator::new(SIGN_TESTS_TEMPLATE)
+            .write_to(sign_tests_path)
+            .with_default_patterns(&self.coin)
+            .write()
+    }
+
+    fn create_chain_tests_mod_rs(&self, template: &'static str) -> Result<()> {
+        let blockchain_tests_mod_path = self.coin_tests_directory().join("mod.rs");
+
+        println!("[ADD] {blockchain_tests_mod_path:?}");
+        TemplateGenerator::new(template)
+            .write_to(blockchain_tests_mod_path)
+            .with_default_patterns(&self.coin)
+            .write()
+    }
+
+    fn list_blockchain_in_chains_mod(&self) -> Result<()> {
+        let chains_mod_path = chains_integration_tests_directory().join("mod.rs");
+        let chain_id = self.coin.id.as_str();
+
+        println!("[EDIT] {chains_mod_path:?}");
+        let mut chains_mod_rs = FileContent::read(chains_mod_path)?;
+
+        {
+            let mod_pattern = "mod ";
+            let mut mod_region = chains_mod_rs.find_region_with_prefix(mod_pattern)?;
+            mod_region.push_line(format!("mod {chain_id};"));
+            mod_region.sort();
+        }
+
+        chains_mod_rs.write()
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/coin_registry_manifest_generator.rs b/codegen-v2/src/codegen/rust/coin_registry_manifest_generator.rs
new file mode 100644
index 00000000000..2a63e90e336
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/coin_registry_manifest_generator.rs
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::coin_registry_directory;
+use crate::codegen::rust::toml_editor::Dependencies;
+use crate::registry::CoinItem;
+use crate::Result;
+use std::path::Path;
+
+pub struct CoinRegistryManifestGenerator;
+
+impl CoinRegistryManifestGenerator {
+    pub fn add_dependency(coin: &CoinItem, path_to_new_blockchain_crate: &Path) -> Result<()> {
+        let path_to_cargo_manifest = coin_registry_directory().join("Cargo.toml");
+        println!("[EDIT] {path_to_cargo_manifest:?}");
+        Dependencies::new(path_to_cargo_manifest)
+            .insert_dependency(&coin.id.to_tw_crate_name(), path_to_new_blockchain_crate)
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/mod.rs b/codegen-v2/src/codegen/rust/mod.rs
new file mode 100644
index 00000000000..a9de11f38fa
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/mod.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::env;
+use std::path::PathBuf;
+
+pub mod blockchain_dispatcher_generator;
+pub mod blockchain_type_generator;
+pub mod coin_address_derivation_test_generator;
+pub mod coin_crate;
+pub mod coin_integration_tests;
+pub mod coin_registry_manifest_generator;
+pub mod new_blockchain;
+pub mod new_cosmos_chain;
+pub mod new_evmchain;
+pub mod toml_editor;
+
+pub fn rust_source_directory() -> PathBuf {
+    PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("..")
+        .join("rust")
+}
+
+pub fn chains_directory() -> PathBuf {
+    rust_source_directory().join("chains")
+}
+
+pub fn tw_tests_directory() -> PathBuf {
+    rust_source_directory().join("tw_tests")
+}
+
+pub fn workspace_toml_path() -> PathBuf {
+    rust_source_directory().join("Cargo.toml")
+}
+
+pub fn coin_registry_directory() -> PathBuf {
+    rust_source_directory().join("tw_coin_registry")
+}
diff --git a/codegen-v2/src/codegen/rust/new_blockchain.rs b/codegen-v2/src/codegen/rust/new_blockchain.rs
new file mode 100644
index 00000000000..ca27f77b08e
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/new_blockchain.rs
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::blockchain_dispatcher_generator::BlockchainDispatcherGenerator;
+use crate::codegen::rust::blockchain_type_generator::BlockchainTypeGenerator;
+use crate::codegen::rust::coin_address_derivation_test_generator::CoinAddressDerivationTestGenerator;
+use crate::codegen::rust::coin_crate::CoinCrate;
+use crate::codegen::rust::coin_integration_tests::CoinIntegrationTests;
+use crate::codegen::rust::coin_registry_manifest_generator::CoinRegistryManifestGenerator;
+use crate::codegen::rust::toml_editor::Workspace;
+use crate::codegen::rust::workspace_toml_path;
+use crate::registry::CoinItem;
+use crate::Result;
+
+pub fn new_blockchain(coin: &CoinItem) -> Result<()> {
+    // Create blockchain's crate.
+    let blockchain_crate_path = CoinCrate::new(coin.clone()).create()?;
+
+    // Insert the created crate to the workspace.
+    Workspace::new(workspace_toml_path()).insert_crate(&blockchain_crate_path)?;
+
+    // Create integration tests.
+    CoinIntegrationTests::new(coin.clone()).create()?;
+    CoinAddressDerivationTestGenerator::generate_new_coin_type_case(coin)?;
+
+    // Add the new blockchain to the `tw_coin_registry`.
+    BlockchainTypeGenerator::add_new_blockchain_type(coin)?;
+    CoinRegistryManifestGenerator::add_dependency(coin, &blockchain_crate_path)?;
+    BlockchainDispatcherGenerator::generate_new_blockchain_type_dispatching(coin)?;
+
+    Ok(())
+}
diff --git a/codegen-v2/src/codegen/rust/new_cosmos_chain.rs b/codegen-v2/src/codegen/rust/new_cosmos_chain.rs
new file mode 100644
index 00000000000..96151ff6446
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/new_cosmos_chain.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::coin_address_derivation_test_generator::CoinAddressDerivationTestGenerator;
+use crate::codegen::rust::coin_integration_tests::CoinIntegrationTests;
+use crate::registry::CoinItem;
+use crate::Result;
+
+pub fn new_cosmos_chain(coin: &CoinItem) -> Result<()> {
+    // Create integration tests.
+    CoinIntegrationTests::new(coin.clone()).create_cosmos()?;
+    CoinAddressDerivationTestGenerator::generate_new_coin_type_case(coin)?;
+
+    Ok(())
+}
diff --git a/codegen-v2/src/codegen/rust/new_evmchain.rs b/codegen-v2/src/codegen/rust/new_evmchain.rs
new file mode 100644
index 00000000000..f754fa5ba1b
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/new_evmchain.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::rust::coin_address_derivation_test_generator::CoinAddressDerivationTestGenerator;
+use crate::registry::CoinItem;
+use crate::Result;
+
+pub fn new_evmchain(coin: &CoinItem) -> Result<()> {
+    // Modify integration tests.
+    CoinAddressDerivationTestGenerator::generate_new_evm_coin_type_case(coin)
+}
diff --git a/codegen-v2/src/codegen/rust/templates/blockchain_crate/Cargo.toml b/codegen-v2/src/codegen/rust/templates/blockchain_crate/Cargo.toml
new file mode 100644
index 00000000000..9d5a7a7d04a
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/blockchain_crate/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "{TW_CRATE_NAME}"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
diff --git a/codegen-v2/src/codegen/rust/templates/blockchain_crate/address.rs b/codegen-v2/src/codegen/rust/templates/blockchain_crate/address.rs
new file mode 100644
index 00000000000..3ec4f8516b5
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/blockchain_crate/address.rs
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+
+pub struct {BLOCKCHAIN}Address {
+    // TODO add necessary fields.
+}
+
+impl CoinAddress for {BLOCKCHAIN}Address {
+    #[inline]
+    fn data(&self) -> Data {
+        todo!()
+    }
+}
+
+impl FromStr for {BLOCKCHAIN}Address {
+    type Err = AddressError;
+
+    fn from_str(_s: &str) -> Result<Self, Self::Err> {
+        todo!()
+    }
+}
+
+impl fmt::Display for {BLOCKCHAIN}Address {
+    fn fmt(&self, _f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        todo!()
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/templates/blockchain_crate/compiler.rs b/codegen-v2/src/codegen/rust/templates/blockchain_crate/compiler.rs
new file mode 100644
index 00000000000..63d51f1df50
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/blockchain_crate/compiler.rs
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_proto::{BLOCKCHAIN}::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct {BLOCKCHAIN}Compiler;
+
+impl {BLOCKCHAIN}Compiler {
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        _coin: &dyn CoinContext,
+        _input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        todo!()
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn compile_impl(
+        _coin: &dyn CoinContext,
+        _input: Proto::SigningInput<'_>,
+        _signatures: Vec<SignatureBytes>,
+        _public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        todo!()
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/templates/blockchain_crate/entry.rs b/codegen-v2/src/codegen/rust/templates/blockchain_crate/entry.rs
new file mode 100644
index 00000000000..e26b696fa59
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/blockchain_crate/entry.rs
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::{BLOCKCHAIN}Address;
+use crate::compiler::{BLOCKCHAIN}Compiler;
+use crate::signer::{BLOCKCHAIN}Signer;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::transaction_util::NoTransactionUtil;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_keypair::tw::PublicKey;
+use tw_proto::{BLOCKCHAIN}::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct {BLOCKCHAIN}Entry;
+
+impl CoinEntry for {BLOCKCHAIN}Entry {
+    type AddressPrefix = NoPrefix;
+    type Address = {BLOCKCHAIN}Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = NoTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        _address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        todo!()
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        {BLOCKCHAIN}Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        _public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        todo!()
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        {BLOCKCHAIN}Signer::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        {BLOCKCHAIN}Compiler::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        {BLOCKCHAIN}Compiler::compile(coin, input, signatures, public_keys)
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/templates/blockchain_crate/lib.rs b/codegen-v2/src/codegen/rust/templates/blockchain_crate/lib.rs
new file mode 100644
index 00000000000..c41edeb4471
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/blockchain_crate/lib.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod compiler;
+pub mod entry;
+pub mod signer;
diff --git a/codegen-v2/src/codegen/rust/templates/blockchain_crate/signer.rs b/codegen-v2/src/codegen/rust/templates/blockchain_crate/signer.rs
new file mode 100644
index 00000000000..3a64018e599
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/blockchain_crate/signer.rs
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_proto::{BLOCKCHAIN}::Proto;
+
+pub struct {BLOCKCHAIN}Signer;
+
+impl {BLOCKCHAIN}Signer {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_impl(
+        _coin: &dyn CoinContext,
+        _input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        todo!()
+    }
+}
diff --git a/codegen-v2/src/codegen/rust/templates/integration_tests/address_tests.rs b/codegen-v2/src/codegen/rust/templates/integration_tests/address_tests.rs
new file mode 100644
index 00000000000..1d417a77ed4
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/integration_tests/address_tests.rs
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_derive, test_address_get_data, test_address_invalid, test_address_normalization,
+    test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_{COIN_ID}_address_derive() {
+    test_address_derive(CoinType::{COIN_TYPE}, "PRIVATE_KEY", "EXPECTED ADDRESS");
+}
+
+#[test]
+fn test_{COIN_ID}_address_normalization() {
+    test_address_normalization(CoinType::{COIN_TYPE}, "DENORMALIZED", "EXPECTED");
+}
+
+#[test]
+fn test_{COIN_ID}_address_is_valid() {
+    test_address_valid(CoinType::{COIN_TYPE}, "VALID ADDRESS");
+}
+
+#[test]
+fn test_{COIN_ID}_address_invalid() {
+    test_address_invalid(CoinType::{COIN_TYPE}, "INVALID ADDRESS");
+}
+
+#[test]
+fn test_{COIN_ID}_address_get_data() {
+    test_address_get_data(CoinType::{COIN_TYPE}, "ADDRESS", "HEX(DATA)");
+}
diff --git a/codegen-v2/src/codegen/rust/templates/integration_tests/compile_tests.rs b/codegen-v2/src/codegen/rust/templates/integration_tests/compile_tests.rs
new file mode 100644
index 00000000000..fad7f69330a
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/integration_tests/compile_tests.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#[test]
+fn test_{COIN_ID}_compile() {
+    todo!()
+}
diff --git a/codegen-v2/src/codegen/rust/templates/integration_tests/cosmos_address_tests.rs b/codegen-v2/src/codegen/rust/templates/integration_tests/cosmos_address_tests.rs
new file mode 100644
index 00000000000..6bf6079ac9d
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/integration_tests/cosmos_address_tests.rs
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_bech32_is_valid, test_address_create_bech32_with_public_key,
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+    AddressBech32IsValid, AddressCreateBech32WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_{COIN_ID}_address_normalization() {
+    test_address_normalization(CoinType::{COIN_TYPE}, "DENORMALIZED", "EXPECTED");
+}
+
+#[test]
+fn test_{COIN_ID}_address_is_valid() {
+    test_address_valid(CoinType::{COIN_TYPE}, "VALID {COIN_TYPE} ADDRESS");
+}
+
+#[test]
+fn test_{COIN_ID}_address_invalid() {
+    test_address_invalid(CoinType::{COIN_TYPE}, "INVALID ADDRESS");
+    // Cosmos has a different `hrp`.
+    test_address_invalid(CoinType::Cosmos, "VALID {COIN_TYPE} ADDRESS");
+}
+
+#[test]
+fn test_{COIN_ID}_address_get_data() {
+    test_address_get_data(CoinType::{COIN_TYPE}, "ADDRESS", "HEX(DATA)");
+}
+
+#[test]
+fn test_{COIN_ID}_is_valid_bech32() {
+    // {COIN_TYPE} address must be valid if its Base32 prefix passed.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::{COIN_TYPE},
+        address: "{COIN_TYPE} ADDRESS",
+        hrp: "{HRP}",
+    });
+    // {COIN_TYPE} address must be valid for the standard Cosmos hub if its Base32 prefix passed.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Cosmos,
+        address: "{COIN_TYPE} ADDRESS",
+        hrp: "{HRP}",
+    });
+    // Cosmos address must be valid with "cosmos" hrp.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::{COIN_TYPE},
+        address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02",
+        hrp: "cosmos",
+    });
+}
+
+#[test]
+fn test_any_address_create_bech32_with_public_key() {
+    test_address_create_bech32_with_public_key(AddressCreateBech32WithPublicKey {
+        // TODO consider using `CoinType::{COIN_TYPE}` if the chain's `addressHasher` is different from Cosmos's.
+        coin: CoinType::Cosmos,
+        private_key: "PRIVATE_KEY",
+        // TODO consider using another `PublicKeyType` if the chain's `publicKeyType` is different from Cosmos's.
+        public_key_type: PublicKeyType::Secp256k1,
+        hrp: "{HRP}",
+        expected: "{COIN_TYPE} ADDRESS",
+    });
+}
+
diff --git a/codegen-v2/src/codegen/rust/templates/integration_tests/mod.rs b/codegen-v2/src/codegen/rust/templates/integration_tests/mod.rs
new file mode 100644
index 00000000000..15dccad969f
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/integration_tests/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod {COIN_ID}_address;
+mod {COIN_ID}_compile;
+mod {COIN_ID}_sign;
diff --git a/codegen-v2/src/codegen/rust/templates/integration_tests/mod_address.rs b/codegen-v2/src/codegen/rust/templates/integration_tests/mod_address.rs
new file mode 100644
index 00000000000..6f501e180bc
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/integration_tests/mod_address.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod {COIN_ID}_address;
diff --git a/codegen-v2/src/codegen/rust/templates/integration_tests/sign_tests.rs b/codegen-v2/src/codegen/rust/templates/integration_tests/sign_tests.rs
new file mode 100644
index 00000000000..38f01a4e0e1
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/templates/integration_tests/sign_tests.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#[test]
+fn test_{COIN_ID}_sign() {
+    todo!()
+}
diff --git a/codegen-v2/src/codegen/rust/toml_editor.rs b/codegen-v2/src/codegen/rust/toml_editor.rs
new file mode 100644
index 00000000000..0811182365d
--- /dev/null
+++ b/codegen-v2/src/codegen/rust/toml_editor.rs
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{Error, Result};
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::str::FromStr;
+use toml_edit::{Document, InlineTable, Item, Value};
+
+const NEW_LINE_TAB_DECORATOR: &str = "\n    ";
+const NO_DECORATOR: &str = "";
+
+pub struct Workspace {
+    path_to_toml: PathBuf,
+}
+
+impl Workspace {
+    pub fn new(path_to_toml: PathBuf) -> Workspace {
+        Workspace { path_to_toml }
+    }
+
+    pub fn insert_crate(self, path_to_crate: &Path) -> Result<()> {
+        let manifest = fs::read_to_string(&self.path_to_toml)?;
+        let mut manifest = Document::from_str(&manifest)?;
+
+        let members = manifest["workspace"]["members"]
+            .as_array_mut()
+            .ok_or(Error::TomlFormat(
+                "Invalid 'workspace' TOML format".to_string(),
+            ))?;
+
+        // Try to get a path to the crate relative to the `Cargo.toml`.
+        let relative_path_to_crate = relative_path_to_crate(&self.path_to_toml, path_to_crate)?;
+
+        // Push the new member, sort and save the manifest.
+
+        let relative_path_to_crate_decorated =
+            Value::from(relative_path_to_crate).decorated(NEW_LINE_TAB_DECORATOR, NO_DECORATOR);
+
+        members.push_formatted(relative_path_to_crate_decorated);
+        members.sort_by(|x, y| x.as_str().cmp(&y.as_str()));
+
+        fs::write(self.path_to_toml, manifest.to_string())?;
+        Ok(())
+    }
+}
+
+pub struct Dependencies {
+    path_to_toml: PathBuf,
+}
+
+impl Dependencies {
+    pub fn new(path_to_toml: PathBuf) -> Dependencies {
+        Dependencies { path_to_toml }
+    }
+
+    pub fn insert_dependency(self, dep_name: &str, path_to_dep_crate: &Path) -> Result<()> {
+        let manifest = fs::read_to_string(&self.path_to_toml)?;
+        let mut manifest = Document::from_str(&manifest)?;
+
+        let dependencies = manifest["dependencies"]
+            .as_table_like_mut()
+            .ok_or(Error::TomlFormat("Invalid 'Cargo.toml' format".to_string()))?;
+
+        // Try to get a path to the crate relative to the `Cargo.toml`.
+        let relative_path_to_crate = relative_path_to_crate(&self.path_to_toml, path_to_dep_crate)?;
+
+        // Create the new dependency member (aka a TOML inline table with `path` key-value).
+        let mut new_member = InlineTable::new();
+        new_member.insert("path", relative_path_to_crate.into());
+
+        // Push the new member, sort and save the manifest.
+        dependencies.insert(dep_name, Item::Value(Value::InlineTable(new_member)));
+        dependencies.sort_values();
+
+        fs::write(self.path_to_toml, manifest.to_string())?;
+
+        Ok(())
+    }
+}
+
+/// Returns a path to the dependency accordingly to the Cargo manifest file.
+/// The result string can be put to `Cargo.toml` as:
+/// ```toml
+/// tw_foo = { path = "<RESULT_PATH>" }
+/// ```
+fn relative_path_to_crate(
+    path_to_cargo_manifest: &Path,
+    path_to_dependency: &Path,
+) -> Result<String> {
+    let absolute_path_to_crate_directory = path_to_cargo_manifest
+        .parent()
+        .ok_or_else(|| Error::io_error_other("Cannot get a parent directory".to_string()))?
+        .canonicalize()?;
+    let absolute_path_to_dependency = path_to_dependency.canonicalize()?;
+
+    let relative_path_to_dependency = pathdiff::diff_paths(
+        absolute_path_to_dependency,
+        absolute_path_to_crate_directory,
+    )
+    .ok_or_else(|| {
+        Error::io_error_other("Cannot get a relative path to the dependency".to_string())
+    })?
+    .to_str()
+    .ok_or_else(|| Error::io_error_other("Invalid path to the crate".to_string()))?
+    .to_string();
+
+    Ok(relative_path_to_dependency)
+}
diff --git a/codegen-v2/src/codegen/swift/functions.rs b/codegen-v2/src/codegen/swift/functions.rs
new file mode 100644
index 00000000000..1f7e4aa8d39
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/functions.rs
@@ -0,0 +1,155 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::*;
+use crate::manifest::{FunctionInfo, TypeVariant};
+use heck::ToLowerCamelCase;
+
+/// This function checks each function and determines whether there's an
+/// association with the passed on object (struct or enum), based on common name
+/// prefix, and maps the data into a Swift structure.
+///
+/// This function returns a tuple of associated Swift functions and the skipped
+/// respectively non-associated functions.
+pub(super) fn process_methods(
+    object: &ObjectVariant,
+    functions: Vec<FunctionInfo>,
+) -> Result<(Vec<SwiftFunction>, Vec<FunctionInfo>)> {
+    let mut swift_funcs = vec![];
+    let mut skipped_funcs = vec![];
+
+    for func in functions {
+        if !func.name.starts_with(object.name()) {
+            // Function is not assciated with the object.
+            skipped_funcs.push(func);
+            continue;
+        }
+
+        let mut ops = vec![];
+
+        // Initalize the 'self' type, which is then passed on to the underlying
+        // C FFI function, assuming the function is not static.
+        //
+        // E.g:
+        // - `let obj = self.rawValue`
+        // - `let obj = TWSomeEnum(rawValue: self.RawValue")`
+        if !func.is_static {
+            ops.push(match object {
+                ObjectVariant::Struct(_) => SwiftOperation::Call {
+                    var_name: "obj".to_string(),
+                    call: "self.rawValue".to_string(),
+                    defer: None,
+                },
+                ObjectVariant::Enum(name) => SwiftOperation::Call {
+                    var_name: "obj".to_string(),
+                    call: format!("{}(rawValue: self.rawValue)", name),
+                    defer: None,
+                },
+            });
+        }
+
+        // For each parameter, we track a list of `params` which is used for the
+        // function interface and add the necessary operations on how to process
+        // those parameters.
+        let mut params = vec![];
+        for param in func.params {
+            // Skip self parameter
+            match &param.ty.variant {
+                TypeVariant::Enum(name) | TypeVariant::Struct(name) if name == object.name() => {
+                    continue
+                }
+                _ => {}
+            }
+
+            // Convert parameter to Swift parameter for the function interface.
+            params.push(SwiftParam {
+                name: param.name.clone(),
+                param_type: SwiftType::from(param.ty.variant.clone()),
+                is_nullable: param.ty.is_nullable,
+            });
+
+            // Process parameter.
+            if let Some(op) = param_c_ffi_call(&param) {
+                ops.push(op)
+            }
+        }
+
+        // Prepepare parameter list to be passed on to the underlying C FFI function.
+        let param_name = if func.is_static { vec![] } else { vec!["obj"] };
+        let param_names = param_name
+            .into_iter()
+            .chain(params.iter().map(|p| p.name.as_str()))
+            .collect::<Vec<&str>>()
+            .join(",");
+
+        // Call the underlying C FFI function, passing on the parameter list.
+        let (var_name, call) = (
+            "result".to_string(),
+            format!("{}({})", func.name, param_names),
+        );
+        if func.return_type.is_nullable {
+            ops.push(SwiftOperation::GuardedCall { var_name, call });
+        } else {
+            ops.push(SwiftOperation::Call {
+                var_name,
+                call,
+                defer: None,
+            });
+        }
+
+        // Wrap result.
+        ops.push(wrap_return(&func.return_type));
+
+        // Convert return type for function interface.
+        let return_type = SwiftReturn {
+            param_type: SwiftType::from(func.return_type.variant),
+            is_nullable: func.return_type.is_nullable,
+        };
+
+        // Prettify name, remove object name prefix from this property.
+        let pretty_name = func
+            .name
+            .strip_prefix(object.name())
+            // Panicing implies bug, checked at the start of the loop.
+            .unwrap()
+            .to_lower_camel_case();
+
+        // Special handling: some functions do not follow standard camelCase
+        // convention.
+        #[rustfmt::skip]
+        let pretty_name = if object.name() == "TWStoredKey" {
+            pretty_name
+                .replace("Json", "JSON")
+                .replace("Hd", "HD")
+        } else if object.name() == "TWPublicKey" {
+            pretty_name
+                .replace("Der", "DER")
+        } else if object.name() == "TWHash" {
+            pretty_name
+                .replace("ripemd", "RIPEMD")
+                .replace("Ripemd", "RIPEMD")
+                .replace("sha512256", "sha512_256")
+                .replace("sha3256", "sha3_256")
+                .replace("sha256sha256", "sha256SHA256")
+        } else if object.name() == "TWAES" {
+            pretty_name
+                .replace("Cbc", "CBC")
+                .replace("Ctr", "CTR")
+        } else {
+            pretty_name
+        };
+
+        swift_funcs.push(SwiftFunction {
+            name: pretty_name,
+            is_public: func.is_public,
+            is_static: func.is_static,
+            operations: ops,
+            params,
+            return_type,
+            comments: vec![],
+        });
+    }
+
+    Ok((swift_funcs, skipped_funcs))
+}
diff --git a/codegen-v2/src/codegen/swift/inits.rs b/codegen-v2/src/codegen/swift/inits.rs
new file mode 100644
index 00000000000..a1f140c326e
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/inits.rs
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::*;
+use crate::manifest::InitInfo;
+
+/// This function checks each constructor and determines whether there's an
+/// association with the passed on object (struct or enum), based on common name
+/// prefix, and maps the data into a Swift structure.
+///
+/// This function returns a tuple of associated Swift constructor and the skipped
+/// respectively non-associated constructors.
+pub(super) fn process_inits(
+    object: &ObjectVariant,
+    inits: Vec<InitInfo>,
+) -> Result<(Vec<SwiftInit>, Vec<InitInfo>)> {
+    let mut swift_inits = vec![];
+    let mut skipped_inits = vec![];
+
+    for init in inits {
+        if !init.name.starts_with(object.name()) {
+            // Init is not assciated with the object.
+            skipped_inits.push(init);
+            continue;
+        }
+
+        let mut ops = vec![];
+
+        // For each parameter, we track a list of `params` which is used for the
+        // function interface and add the necessary operations on how to process
+        // those parameters.
+        let mut params = vec![];
+        for param in init.params {
+            // Convert parameter to Swift parameter.
+            params.push(SwiftParam {
+                name: param.name.clone(),
+                param_type: SwiftType::from(param.ty.variant.clone()),
+                is_nullable: param.ty.is_nullable,
+            });
+
+            // Process parameter.
+            if let Some(op) = param_c_ffi_call(&param) {
+                ops.push(op);
+            }
+        }
+
+        // Prepepare parameter list to be passed on to the underlying C FFI function.
+        let param_names = params
+            .iter()
+            .map(|p| p.name.as_str())
+            .collect::<Vec<&str>>()
+            .join(",");
+
+        // Call the underlying C FFI function, passing on the parameter list.
+        if init.is_nullable {
+            ops.push(SwiftOperation::GuardedCall {
+                var_name: "result".to_string(),
+                call: format!("{}({})", init.name, param_names),
+            });
+        } else {
+            ops.push(SwiftOperation::Call {
+                var_name: "result".to_string(),
+                call: format!("{}({})", init.name, param_names),
+                defer: None,
+            });
+        }
+
+        // Note that we do not return a value here; the template sets a
+        // `self.rawValue = result` entry at the end of the constructor.
+
+        // Prettify name, remove object name prefix from this property.
+        let pretty_name = init
+            .name
+            .strip_prefix(object.name())
+            // Panicing implies bug, checked at the start of the loop.
+            .unwrap()
+            .to_string();
+
+        swift_inits.push(SwiftInit {
+            name: pretty_name,
+            is_nullable: init.is_nullable,
+            is_public: init.is_public,
+            params,
+            operations: ops,
+            comments: vec![],
+        });
+    }
+
+    Ok((swift_inits, skipped_inits))
+}
+
+pub(super) fn process_deinits(
+    object: &ObjectVariant,
+    deinit: Vec<DeinitInfo>,
+) -> Result<(Vec<DeinitInfo>, Vec<DeinitInfo>)> {
+    let mut swift_deinits = vec![];
+    let mut skipped_deinits = vec![];
+
+    for deinit in deinit {
+        if deinit.name.starts_with(object.name()) {
+            swift_deinits.push(deinit)
+        } else {
+            // Deinit is not assciated with the object.
+            skipped_deinits.push(deinit);
+            continue;
+        }
+    }
+
+    Ok((swift_deinits, skipped_deinits))
+}
diff --git a/codegen-v2/src/codegen/swift/mod.rs b/codegen-v2/src/codegen/swift/mod.rs
new file mode 100644
index 00000000000..4bc70e7e416
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/mod.rs
@@ -0,0 +1,370 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use self::functions::process_methods;
+use self::inits::process_inits;
+use self::properties::process_properties;
+use self::render::pretty_name;
+use crate::manifest::{DeinitInfo, FileInfo, ParamInfo, ProtoInfo, TypeInfo, TypeVariant};
+use crate::{Error, Result};
+use handlebars::Handlebars;
+use serde_json::json;
+use std::fmt::Display;
+
+mod functions;
+mod inits;
+mod properties;
+mod render;
+
+// Re-exports
+pub use self::render::{
+    generate_swift_types, render_to_strings, GeneratedSwiftTypes, GeneratedSwiftTypesStrings,
+    RenderIntput,
+};
+
+/// Represents a Swift struct or class.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftStruct {
+    name: String,
+    is_class: bool,
+    is_public: bool,
+    init_instance: bool,
+    superclasses: Vec<String>,
+    eq_operator: Option<SwiftOperatorEquality>,
+    inits: Vec<SwiftInit>,
+    deinits: Vec<DeinitInfo>,
+    methods: Vec<SwiftFunction>,
+    properties: Vec<SwiftProperty>,
+}
+
+/// Represents a Swift enum.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftEnum {
+    name: String,
+    is_public: bool,
+    add_description: bool,
+    superclasses: Vec<String>,
+    variants: Vec<SwiftEnumVariant>,
+}
+
+/// Represents a Swift enum variant.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftEnumVariant {
+    name: String,
+    value: String,
+    as_string: Option<String>,
+}
+
+/// Represents associated methods and properties of an enum. Based on the first
+/// codegen, those extensions are placed in a separate file.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftEnumExtension {
+    name: String,
+    init_instance: bool,
+    methods: Vec<SwiftFunction>,
+    properties: Vec<SwiftProperty>,
+}
+
+// Wrapper around a valid Swift type (built in or custom). Meant to be used as
+// `<SwiftType as From<TypeVariant>>::from(...)`.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftType(String);
+
+impl Display for SwiftType {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+/// Represents a Swift function or method.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftFunction {
+    pub name: String,
+    pub is_public: bool,
+    pub is_static: bool,
+    pub params: Vec<SwiftParam>,
+    pub operations: Vec<SwiftOperation>,
+    #[serde(rename = "return")]
+    pub return_type: SwiftReturn,
+    pub comments: Vec<String>,
+}
+
+/// Represents a Swift property of a struct/class or enum.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+struct SwiftProperty {
+    pub name: String,
+    pub is_public: bool,
+    pub operations: Vec<SwiftOperation>,
+    #[serde(rename = "return")]
+    pub return_type: SwiftReturn,
+    pub comments: Vec<String>,
+}
+
+/// The operation to be interpreted by the templating engine. This handles
+/// parameters and C FFI calls in an appropriate way, depending on context.
+#[derive(Debug, Clone, Serialize, Deserialize)]
+#[serde(rename_all = "snake_case")]
+pub enum SwiftOperation {
+    // Results in:
+    // ```swift
+    // let <var_name> = <call>
+    // defer {
+    //     <defer.String>(<var_name>)
+    // }
+    // ```
+    Call {
+        var_name: String,
+        call: String,
+        defer: Option<String>,
+    },
+    // Results in:
+    // ```swift
+    // let ptr: UnsafeRawPointer?
+    // if let alphabet = alphabet {
+    //     ptr = TWStringCreateWithNSString(alphabet)
+    // } else {
+    //     ptr = nil
+    // }
+    // ```
+    // ... with an optional `defer` operation.
+    CallOptional {
+        var_name: String,
+        call: String,
+        defer: Option<String>,
+    },
+    // Results in:
+    // ```swift
+    // let <var_name> = <call>
+    // guard let <var_name> = <var_name> else {
+    //     return nil
+    // }
+    // ```
+    GuardedCall {
+        var_name: String,
+        call: String,
+    },
+    // Results in:
+    // ```swift
+    // return <call>
+    // ```
+    Return {
+        call: String,
+    },
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftParam {
+    pub name: String,
+    #[serde(rename = "type")]
+    pub param_type: SwiftType,
+    pub is_nullable: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftReturn {
+    #[serde(rename = "type")]
+    pub param_type: SwiftType,
+    pub is_nullable: bool,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftInit {
+    pub name: String,
+    pub is_nullable: bool,
+    pub is_public: bool,
+    pub params: Vec<SwiftParam>,
+    pub operations: Vec<SwiftOperation>,
+    pub comments: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftProto {
+    pub name: String,
+    pub c_ffi_name: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct SwiftOperatorEquality {
+    pub c_ffi_name: String,
+}
+
+/// Used for the individual `process_*` functions.
+enum ObjectVariant<'a> {
+    Struct(&'a str),
+    Enum(&'a str),
+}
+
+impl<'a> ObjectVariant<'a> {
+    fn name(&'a self) -> &'a str {
+        match self {
+            ObjectVariant::Struct(n) | ObjectVariant::Enum(n) => n,
+        }
+    }
+}
+
+impl TryFrom<ProtoInfo> for SwiftProto {
+    type Error = Error;
+
+    fn try_from(value: ProtoInfo) -> std::result::Result<Self, Self::Error> {
+        Ok(SwiftProto {
+            // Convert the name into an appropriate format.
+            name: pretty_name(value.0.clone()),
+            c_ffi_name: value.0,
+        })
+    }
+}
+
+/// Convert the `TypeVariant` into the appropriate Swift type.
+impl From<TypeVariant> for SwiftType {
+    fn from(value: TypeVariant) -> Self {
+        let res = match value {
+            TypeVariant::Void => "Void".to_string(),
+            TypeVariant::Bool => "Bool".to_string(),
+            TypeVariant::Char => "Character".to_string(),
+            TypeVariant::ShortInt => "Int16".to_string(),
+            TypeVariant::Int => "Int32".to_string(),
+            TypeVariant::UnsignedInt => "UInt32".to_string(),
+            TypeVariant::LongInt => "Int64".to_string(),
+            TypeVariant::Float => "Float".to_string(),
+            TypeVariant::Double => "Double".to_string(),
+            TypeVariant::SizeT => "Int".to_string(),
+            TypeVariant::Int8T => "Int8".to_string(),
+            TypeVariant::Int16T => "Int16".to_string(),
+            TypeVariant::Int32T => "Int32".to_string(),
+            TypeVariant::Int64T => "Int64".to_string(),
+            TypeVariant::UInt8T => "UInt8".to_string(),
+            TypeVariant::UInt16T => "UInt16".to_string(),
+            TypeVariant::UInt32T => "UInt32".to_string(),
+            TypeVariant::UInt64T => "UInt64".to_string(),
+            TypeVariant::String => "String".to_string(),
+            TypeVariant::Data => "Data".to_string(),
+            TypeVariant::Struct(n) | TypeVariant::Enum(n) => {
+                // We strip the "TW" prefix for Swift representations of
+                // structs/enums.
+                n.strip_prefix("TW").map(|n| n.to_string()).unwrap_or(n)
+            }
+        };
+
+        SwiftType(res)
+    }
+}
+
+// Covenience function: process the parameter, returning the operation for
+// handling the C FFI call (if any).
+fn param_c_ffi_call(param: &ParamInfo) -> Option<SwiftOperation> {
+    let op = match &param.ty.variant {
+        // E.g. `let param = TWStringCreateWithNSString(param)`
+        TypeVariant::String => {
+            let (var_name, call, defer) = (
+                param.name.clone(),
+                format!("TWStringCreateWithNSString({})", param.name),
+                Some(format!("TWStringDelete({})", param.name)),
+            );
+
+            // If the parameter is nullable, add special handler.
+            if param.ty.is_nullable {
+                SwiftOperation::CallOptional {
+                    var_name,
+                    call,
+                    defer,
+                }
+            } else {
+                SwiftOperation::Call {
+                    var_name,
+                    call,
+                    defer,
+                }
+            }
+        }
+        TypeVariant::Data => {
+            let (var_name, call, defer) = (
+                param.name.clone(),
+                format!("TWDataCreateWithNSData({})", param.name),
+                Some(format!("TWDataDelete({})", param.name)),
+            );
+
+            // If the parameter is nullable, add special handler.
+            if param.ty.is_nullable {
+                SwiftOperation::CallOptional {
+                    var_name,
+                    call,
+                    defer,
+                }
+            } else {
+                SwiftOperation::Call {
+                    var_name,
+                    call,
+                    defer,
+                }
+            }
+        }
+        // E.g.
+        // - `let param = param.rawValue`
+        // - `let param = param?.rawValue`
+        TypeVariant::Struct(_) => {
+            // For nullable structs, we do not use the special
+            // `CallOptional` handler but rather use the question mark
+            // operator.
+            let (var_name, call, defer) = if param.ty.is_nullable {
+                (
+                    param.name.clone(),
+                    format!("{}?.rawValue", param.name),
+                    None,
+                )
+            } else {
+                (param.name.clone(), format!("{}.rawValue", param.name), None)
+            };
+
+            SwiftOperation::Call {
+                var_name,
+                call,
+                defer,
+            }
+        }
+        // E.g. `let param = TWSomeEnum(rawValue: param.rawValue)`
+        // Note that it calls the constructor of the enum, which calls
+        // the underlying "*Create*" C FFI function.
+        TypeVariant::Enum(enm) => SwiftOperation::Call {
+            var_name: param.name.clone(),
+            call: format!("{enm}(rawValue: {}.rawValue)", param.name),
+            defer: None,
+        },
+        // Skip processing parameter, reference the parameter by name
+        // directly, as defined in the function interface (usually the
+        // case for primitive types).
+        _ => return None,
+    };
+
+    Some(op)
+}
+
+// Convenience funcion: wrap the return value, returning the operation. Note
+// that types are wrapped differently when returning, compared to
+// `param_c_ffi_call`; such as using `TWStringNSString` instead of
+// `TWDataCreateWithNSData` for Strings.
+fn wrap_return(ty: &TypeInfo) -> SwiftOperation {
+    match &ty.variant {
+        // E.g.`return TWStringNSString(result)`
+        TypeVariant::String => SwiftOperation::Return {
+            call: "TWStringNSString(result)".to_string(),
+        },
+        TypeVariant::Data => SwiftOperation::Return {
+            call: "TWDataNSData(result)".to_string(),
+        },
+        // E.g. `return SomeEnum(rawValue: result.rawValue)`
+        TypeVariant::Enum(_) => SwiftOperation::Return {
+            call: format!(
+                "{}(rawValue: result.rawValue)!",
+                SwiftType::from(ty.variant.clone())
+            ),
+        },
+        // E.g. `return SomeStruct(rawValue: result)`
+        TypeVariant::Struct(_) => SwiftOperation::Return {
+            call: format!("{}(rawValue: result)", SwiftType::from(ty.variant.clone())),
+        },
+        _ => SwiftOperation::Return {
+            call: "result".to_string(),
+        },
+    }
+}
diff --git a/codegen-v2/src/codegen/swift/properties.rs b/codegen-v2/src/codegen/swift/properties.rs
new file mode 100644
index 00000000000..61d73e7171f
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/properties.rs
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::*;
+use crate::manifest::PropertyInfo;
+use heck::ToLowerCamelCase;
+
+/// This function checks each property and determines whether there's an
+/// association with the passed on object (struct or enum), based on common name
+/// prefix, and maps the data into a Swift structure.
+///
+/// This function returns a tuple of associated Swift properties and skipped
+/// respectively non-associated properties.
+pub(super) fn process_properties(
+    object: &ObjectVariant,
+    properties: Vec<PropertyInfo>,
+) -> Result<(Vec<SwiftProperty>, Vec<PropertyInfo>)> {
+    let mut swift_props = vec![];
+    let mut skipped_props = vec![];
+
+    for prop in properties {
+        if !prop.name.starts_with(object.name()) {
+            // Property is not assciated with the object.
+            skipped_props.push(prop);
+            continue;
+        }
+
+        let mut ops = vec![];
+
+        // Initalize the 'self' type, which is then passed on to the underlying
+        // C FFI function.
+        ops.push(match object {
+            // E.g. `let obj = self.rawValue`
+            ObjectVariant::Struct(_) => SwiftOperation::Call {
+                var_name: "obj".to_string(),
+                call: "self.rawValue".to_string(),
+                defer: None,
+            },
+            // E.g. `let obj = TWSomeEnum(rawValue: self.rawValue")`
+            ObjectVariant::Enum(name) => SwiftOperation::Call {
+                var_name: "obj".to_string(),
+                call: format!("{}(rawValue: self.rawValue)", name),
+                defer: None,
+            },
+        });
+
+        // Call the underlying C FFI function, passing on the `obj` instance.
+        //
+        // E.g: `let result = TWSomeFunc(obj)`.
+        let (var_name, call) = ("result".to_string(), format!("{}(obj)", prop.name));
+        if prop.return_type.is_nullable {
+            ops.push(SwiftOperation::GuardedCall { var_name, call });
+        } else {
+            ops.push(SwiftOperation::Call {
+                var_name,
+                call,
+                defer: None,
+            });
+        }
+
+        // Wrap result.
+        ops.push(wrap_return(&prop.return_type));
+
+        // Prettify name, remove object name prefix from this property.
+        let pretty_name = prop
+            .name
+            .strip_prefix(object.name())
+            // Panicing implies bug, checked at the start of the loop.
+            .unwrap()
+            .to_lower_camel_case();
+
+        // Convert return type for property interface.
+        let return_type = SwiftReturn {
+            param_type: SwiftType::from(prop.return_type.variant),
+            is_nullable: prop.return_type.is_nullable,
+        };
+
+        swift_props.push(SwiftProperty {
+            name: pretty_name,
+            is_public: prop.is_public,
+            operations: ops,
+            return_type,
+            comments: vec![],
+        });
+    }
+
+    Ok((swift_props, skipped_props))
+}
diff --git a/codegen-v2/src/codegen/swift/render.rs b/codegen-v2/src/codegen/swift/render.rs
new file mode 100644
index 00000000000..465a7277682
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/render.rs
@@ -0,0 +1,252 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::{inits::process_deinits, *};
+
+#[derive(Debug, Clone)]
+pub struct RenderIntput<'a> {
+    pub file_info: FileInfo,
+    pub struct_template: &'a str,
+    pub enum_template: &'a str,
+    pub extension_template: &'a str,
+    pub proto_template: &'a str,
+    pub partial_init_template: &'a str,
+    pub partial_func_tempalte: &'a str,
+    pub partial_prop_tempalte: &'a str,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct GeneratedSwiftTypesStrings {
+    pub structs: Vec<(String, String)>,
+    pub enums: Vec<(String, String)>,
+    pub extensions: Vec<(String, String)>,
+    pub protos: Vec<(String, String)>,
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct GeneratedSwiftTypes {
+    pub structs: Vec<SwiftStruct>,
+    pub enums: Vec<SwiftEnum>,
+    pub extensions: Vec<SwiftEnumExtension>,
+    pub protos: Vec<SwiftProto>,
+}
+
+/// Convenience wrapper for setting copyright year when generating bindings.
+#[derive(Debug, Clone, Serialize)]
+struct WithYear<'a, T> {
+    pub current_year: u64,
+    #[serde(flatten)]
+    pub data: &'a T,
+}
+
+pub fn pretty_name(name: String) -> String {
+    name.replace("_", "").replace("TW", "").replace("Proto", "")
+}
+
+pub fn render_to_strings<'a>(input: RenderIntput<'a>) -> Result<GeneratedSwiftTypesStrings> {
+    // The current year for the copyright header in the generated bindings.
+    let current_year = crate::current_year();
+    // Convert the name into an appropriate format.
+    let pretty_file_name = pretty_name(input.file_info.name.clone());
+
+    let mut engine = Handlebars::new();
+    // Unmatched variables should result in an error.
+    engine.set_strict_mode(true);
+
+    engine.register_partial("struct", input.struct_template)?;
+    engine.register_partial("enum", input.enum_template)?;
+    engine.register_partial("extension", input.extension_template)?;
+    engine.register_partial("proto", input.proto_template)?;
+    engine.register_partial("partial_init", input.partial_init_template)?;
+    engine.register_partial("partial_func", input.partial_func_tempalte)?;
+    engine.register_partial("partial_prop", input.partial_prop_tempalte)?;
+
+    let rendered = generate_swift_types(input.file_info)?;
+    let mut out_str = GeneratedSwiftTypesStrings::default();
+
+    //  Render structs.
+    for strct in rendered.structs {
+        let out = engine.render(
+            "struct",
+            &WithYear {
+                current_year,
+                data: &strct,
+            },
+        )?;
+
+        out_str.structs.push((strct.name, out));
+    }
+
+    //  Render enums.
+    for enm in rendered.enums {
+        let out = engine.render(
+            "enum",
+            &WithYear {
+                current_year,
+                data: &enm,
+            },
+        )?;
+
+        out_str.enums.push((enm.name, out));
+    }
+
+    //  Render extensions.
+    for ext in rendered.extensions {
+        let out = engine.render(
+            "extension",
+            &WithYear {
+                current_year,
+                data: &ext,
+            },
+        )?;
+
+        out_str.extensions.push((ext.name, out));
+    }
+
+    //  Render protos.
+    if !rendered.protos.is_empty() {
+        let out = engine.render(
+            "proto",
+            &WithYear {
+                current_year,
+                data: &json!({
+                    "protos": &rendered.protos
+                }),
+            },
+        )?;
+
+        out_str.protos.push((pretty_file_name, out));
+    }
+
+    Ok(out_str)
+}
+
+/// Uses the given input templates to render all files.
+pub fn generate_swift_types(mut info: FileInfo) -> Result<GeneratedSwiftTypes> {
+    let mut outputs = GeneratedSwiftTypes::default();
+
+    // Render structs/classes.
+    for strct in info.structs {
+        let obj = ObjectVariant::Struct(&strct.name);
+
+        // Process items.
+        let (inits, deinits, mut methods, properties);
+        (inits, info.inits) = process_inits(&obj, info.inits)?;
+        (deinits, info.deinits) = process_deinits(&obj, info.deinits)?;
+        (methods, info.functions) = process_methods(&obj, info.functions)?;
+        (properties, info.properties) = process_properties(&obj, info.properties)?;
+
+        // Avoid rendering empty structs.
+        if inits.is_empty() && methods.is_empty() && properties.is_empty() {
+            continue;
+        }
+
+        // Convert the name into an appropriate format.
+        let pretty_struct_name = pretty_name(strct.name.clone());
+
+        // Add superclasses.
+        let superclasses = if pretty_struct_name.ends_with("Address") {
+            vec!["Address".to_string()]
+        } else {
+            vec![]
+        };
+
+        // Handle equality operator.
+        let eq_method = methods.iter().enumerate().find(|(_, f)| f.name == "equal");
+        let eq_operator = if let Some((idx, _)) = eq_method {
+            let operator = SwiftOperatorEquality {
+                c_ffi_name: format!("{}Equal", strct.name),
+            };
+
+            // Remove that method from the `methods` list.
+            methods.remove(idx);
+
+            Some(operator)
+        } else {
+            None
+        };
+
+        outputs.structs.push(SwiftStruct {
+            name: pretty_struct_name,
+            is_class: strct.is_class,
+            is_public: strct.is_public,
+            init_instance: strct.is_class,
+            superclasses,
+            eq_operator,
+            inits: inits,
+            deinits: deinits,
+            methods,
+            properties,
+        });
+    }
+
+    // Render enums.
+    for enm in info.enums {
+        let obj = ObjectVariant::Enum(&enm.name);
+
+        // Process items.
+        let (methods, properties);
+        (methods, info.functions) = process_methods(&obj, info.functions)?;
+        (properties, info.properties) = process_properties(&obj, info.properties)?;
+
+        // Convert the name into an appropriate format.
+        let pretty_enum_name = pretty_name(enm.name);
+
+        // Add superclasses.
+        let value_type = SwiftType::from(enm.value_type);
+        let mut superclasses = vec![value_type.0, "CaseIterable".to_string()];
+
+        let mut add_class = false;
+
+        // Convert to Swift enum variants
+        let variants = enm
+            .variants
+            .into_iter()
+            .map(|info| {
+                if info.as_string.is_some() {
+                    add_class = true;
+                }
+
+                SwiftEnumVariant {
+                    name: info.name,
+                    value: info.value,
+                    as_string: info.as_string,
+                }
+            })
+            .collect();
+
+        if add_class {
+            superclasses.push("CustomStringConvertible".to_string());
+        }
+
+        outputs.enums.push(SwiftEnum {
+            name: pretty_enum_name.clone(),
+            is_public: enm.is_public,
+            add_description: add_class,
+            superclasses,
+            variants,
+        });
+
+        // Avoid rendering empty extension for enums.
+        if methods.is_empty() && properties.is_empty() {
+            continue;
+        }
+
+        outputs.extensions.push(SwiftEnumExtension {
+            name: pretty_enum_name,
+            init_instance: true,
+            methods,
+            properties,
+        });
+    }
+
+    // Render Protobufs.
+    if !info.protos.is_empty() {
+        for proto in info.protos {
+            outputs.protos.push(SwiftProto::try_from(proto)?);
+        }
+    }
+
+    Ok(outputs)
+}
diff --git a/codegen-v2/src/codegen/swift/templates/WalletCore.h b/codegen-v2/src/codegen/swift/templates/WalletCore.h
new file mode 100644
index 00000000000..76f61b9fa74
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/templates/WalletCore.h
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for TrustWalletCore.
+FOUNDATION_EXPORT double WalletCoreVersionNumber;
+
+//! Project version string for TrustWalletCore.
+FOUNDATION_EXPORT const unsigned char WalletCoreVersionString[];
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+
+#include "TWAnySigner.h"
+
+#include "TWAES.h"
+#include "TWAESPaddingMode.h"
+#include "TWAccount.h"
+#include "TWAnyAddress.h"
+#include "TWAsnParser.h"
+#include "TWBarz.h"
+#include "TWBase32.h"
+#include "TWBase58.h"
+#include "TWBase64.h"
+#include "TWBitcoinAddress.h"
+#include "TWBitcoinMessageSigner.h"
+#include "TWBitcoinScript.h"
+#include "TWBitcoinSigHashType.h"
+#include "TWBlockchain.h"
+#include "TWCardano.h"
+#include "TWCoinType.h"
+#include "TWCoinTypeConfiguration.h"
+#include "TWCurve.h"
+#include "TWDataVector.h"
+#include "TWDerivation.h"
+#include "TWDerivationPath.h"
+#include "TWDerivationPathIndex.h"
+#include "TWEthereum.h"
+#include "TWEthereumAbi.h"
+#include "TWEthereumAbiFunction.h"
+#include "TWEthereumAbiValue.h"
+#include "TWEthereumChainID.h"
+#include "TWEthereumRlp.h"
+#include "TWEthereumMessageSigner.h"
+#include "TWFIOAccount.h"
+#include "TWFilecoinAddressConverter.h"
+#include "TWFilecoinAddressType.h"
+#include "TWGroestlcoinAddress.h"
+#include "TWHDVersion.h"
+#include "TWHDWallet.h"
+#include "TWHRP.h"
+#include "TWHash.h"
+#include "TWLiquidStaking.h"
+#include "TWMnemonic.h"
+#include "TWNEARAccount.h"
+#include "TWNervosAddress.h"
+#include "TWPBKDF2.h"
+#include "TWPrivateKey.h"
+#include "TWPrivateKeyType.h"
+#include "TWPublicKey.h"
+#include "TWPublicKeyType.h"
+#include "TWPurpose.h"
+#include "TWRippleXAddress.h"
+#include "TWSS58AddressType.h"
+#include "TWSegwitAddress.h"
+#include "TWSolanaAddress.h"
+#include "TWStarkExMessageSigner.h"
+#include "TWStarkWare.h"
+#include "TWStellarMemoType.h"
+#include "TWStellarPassphrase.h"
+#include "TWStellarVersionByte.h"
+#include "TWStoredKey.h"
+#include "TWStoredKeyEncryption.h"
+#include "TWStoredKeyEncryptionLevel.h"
+#include "TWTHORChainSwap.h"
+#include "TWTezosMessageSigner.h"
+#include "TWTransactionCompiler.h"
+#include "TWTronMessageSigner.h"
diff --git a/codegen-v2/src/codegen/swift/templates/enum.hbs b/codegen-v2/src/codegen/swift/templates/enum.hbs
new file mode 100644
index 00000000000..5363fb776b4
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/templates/enum.hbs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+{{#if is_public}}public {{/if}}enum {{name}}
+    {{~#if superclasses}}: {{/if}}{{#each superclasses}}{{this}}{{#unless @last}}, {{/unless}}{{/each}} {
+    {{#each variants}}
+    case `{{this.name}}` = {{this.value}}
+    {{/each}}
+    {{#if add_description}}
+
+    public var description: String {
+        switch self {
+            {{#each variants}}
+            case .{{this.name}}: return "{{this.as_string}}"
+            {{/each}}
+        }
+    }
+    {{/if}}
+}
diff --git a/codegen-v2/src/codegen/swift/templates/extension.hbs b/codegen-v2/src/codegen/swift/templates/extension.hbs
new file mode 100644
index 00000000000..ddae1f95ba6
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/templates/extension.hbs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+extension {{name}} {
+    {{! Methods }}
+    {{#each methods}}
+    {{~> partial_func}}
+    {{#unless @last}}
+
+    {{/unless}}
+    {{/each}}
+    {{! Properties }}
+    {{#each properties}}
+    {{~> partial_prop}}
+    {{#unless @last}}
+
+    {{/unless}}
+    {{/each}}
+}
diff --git a/codegen-v2/src/codegen/swift/templates/partial_func.hbs b/codegen-v2/src/codegen/swift/templates/partial_func.hbs
new file mode 100644
index 00000000000..5ebc73fd8e8
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/templates/partial_func.hbs
@@ -0,0 +1,38 @@
+    {{#if is_public}}public {{/if}}{{#if is_static}}static {{/if}}func {{name}}({{#each params}}{{name}}: {{type}}{{#if is_nullable}}?{{/if}}{{#unless @last}}, {{/unless}}{{/each}}) -> {{return.type}}{{#if return.is_nullable}}?{{/if}} {
+        {{#each operations}}
+        {{#if this.call}}
+        let {{this.call.var_name}} = {{this.call.call}}
+        {{#if this.call.defer}}
+        defer {
+            {{this.call.defer}}
+        }
+
+        {{/if}}
+        {{/if}}
+        {{#if this.call_optional}}
+        let ptr: UnsafeRawPointer?
+        if let {{this.call_optional.var_name}} = {{this.call_optional.var_name}} {
+            ptr = {{this.call_optional.call}}
+        } else {
+            ptr = nil
+        }
+        {{#if this.call_optional.defer}}
+        defer {
+            if let {{this.call_optional.var_name}}  = ptr {
+                {{this.call_optional.defer}}
+            }
+        }
+        {{/if}}
+        let {{this.call_optional.var_name}} = ptr
+
+        {{/if}}
+        {{#if this.guarded_call}}
+        guard let {{this.guarded_call.var_name}} = {{this.guarded_call.call}} else {
+            return nil
+        }
+        {{/if}}
+        {{#if this.return}}
+        return {{this.return.call}}
+        {{/if}}
+        {{/each}}
+    }
diff --git a/codegen-v2/src/codegen/swift/templates/partial_init.hbs b/codegen-v2/src/codegen/swift/templates/partial_init.hbs
new file mode 100644
index 00000000000..c367bde8435
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/templates/partial_init.hbs
@@ -0,0 +1,23 @@
+    {{#if is_public}}public {{/if}}init{{#if is_nullable}}?{{/if}}({{#each params}}{{name}}: {{type}}{{#if is_nullable}}?{{/if}}{{#unless @last}}, {{/unless}}{{/each}}) {
+        {{#each operations}}
+        {{#if this.call}}
+        let {{this.call.var_name}} = {{this.call.call}}
+        {{#if this.call.defer}}
+        defer {
+            {{this.call.defer}}
+        }
+
+        {{/if}}
+        {{/if}}
+        {{#if this.guarded_call}}
+        guard let {{this.guarded_call.var_name}} = {{this.guarded_call.call}} else {
+            return nil
+        }
+        {{/if}}
+        {{#if this.return}}
+        return {{this.return.call}}
+        {{/if}}
+        {{/each}}
+
+        self.rawValue = result
+    }
diff --git a/codegen-v2/src/codegen/swift/templates/partial_prop.hbs b/codegen-v2/src/codegen/swift/templates/partial_prop.hbs
new file mode 100644
index 00000000000..fd1d5697866
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/templates/partial_prop.hbs
@@ -0,0 +1,38 @@
+    {{#if is_public}}public {{/if}}var {{name}}: {{return.type}}{{#if return.is_nullable}}?{{/if}} {
+        {{#each operations}}
+        {{#if this.call}}
+        let {{this.call.var_name}} = {{this.call.call}}
+        {{#if this.call.defer}}
+        defer {
+            {{this.call.defer}}
+        }
+
+        {{/if}}
+        {{/if}}
+        {{#if this.call_optional}}
+        let ptr: UnsafeRawPointer?
+        if let {{this.call_optional.var_name}} = {{this.call_optional.var_name}} {
+            ptr = {{this.call_optional.call}}
+        } else {
+            ptr = nil
+        }
+        {{#if this.call_optional.defer}}
+        defer {
+            if let {{this.call_optional.var_name}}  = ptr {
+                {{this.call_optional.defer}}
+            }
+        }
+        {{/if}}
+        let {{this.call_optional.var_name}} = ptr
+
+        {{/if}}
+        {{#if this.guarded_call}}
+        guard let {{this.guarded_call.var_name}} = {{this.guarded_call.call}} else {
+            return nil
+        }
+        {{/if}}
+        {{#if this.return}}
+        return {{this.return.call}}
+        {{/if}}
+        {{/each}}
+    }
diff --git a/codegen-v2/src/codegen/swift/templates/proto.hbs b/codegen-v2/src/codegen/swift/templates/proto.hbs
new file mode 100644
index 00000000000..23e1c541698
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/templates/proto.hbs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+{{#each protos}}
+public typealias {{name}} = {{c_ffi_name}}
+{{/each}}
diff --git a/codegen-v2/src/codegen/swift/templates/struct.hbs b/codegen-v2/src/codegen/swift/templates/struct.hbs
new file mode 100644
index 00000000000..eccc0499fd7
--- /dev/null
+++ b/codegen-v2/src/codegen/swift/templates/struct.hbs
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+import Foundation
+
+{{#if is_public}}public {{/if}}{{#if is_class}}final class {{else}}struct {{/if}}{{name}}
+    {{~#if superclasses}}: {{/if}}{{#each superclasses}}{{this}}{{#unless @last}}, {{/unless}}{{/each}} {
+    {{#if init_instance}}
+    let rawValue: OpaquePointer
+
+    init(rawValue: OpaquePointer) {
+        self.rawValue = rawValue
+    }
+    {{else}}
+    init() {}
+    {{/if}}
+
+    {{! Equality operator, if available }}
+    {{#if eq_operator}}
+    public static func == (lhs: {{name}}, rhs: {{name}}) -> Bool {
+        return {{eq_operator.c_ffi_name}}(lhs.rawValue, rhs.rawValue)
+    }
+
+    {{/if}}
+    {{! Inits }}
+    {{#each inits}}
+    {{~> partial_init}}
+
+    {{/each}}
+    {{! Deinits }}
+    {{#each deinits}}
+    deinit {
+        {{name}}(self.rawValue)
+    }
+
+    {{/each}}
+    {{! Methods }}
+    {{#each methods}}
+    {{~> partial_func}}
+
+    {{/each}}
+    {{! Properties }}
+    {{#each properties}}
+    {{~> partial_prop}}
+    {{#unless @last}}
+
+    {{/unless}}
+    {{/each}}
+}
diff --git a/codegen-v2/src/codegen/template_generator.rs b/codegen-v2/src/codegen/template_generator.rs
new file mode 100644
index 00000000000..7b725ba74e7
--- /dev/null
+++ b/codegen-v2/src/codegen/template_generator.rs
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::registry::CoinItem;
+use crate::{current_year, Error, Result};
+use std::fs;
+use std::path::PathBuf;
+
+const PATTERNS_CAPACITY: usize = 20;
+
+pub struct TemplateGenerator {
+    template_content: &'static str,
+    write_to: Option<PathBuf>,
+    to_replace: Vec<String>,
+    replace_with: Vec<String>,
+}
+
+impl TemplateGenerator {
+    pub fn new(template_content: &'static str) -> TemplateGenerator {
+        TemplateGenerator {
+            template_content,
+            write_to: None,
+            to_replace: Vec::with_capacity(PATTERNS_CAPACITY),
+            replace_with: Vec::with_capacity(PATTERNS_CAPACITY),
+        }
+    }
+
+    pub fn write_to(mut self, write_to: PathBuf) -> TemplateGenerator {
+        self.write_to = Some(write_to);
+        self
+    }
+
+    /// Use default patterns.
+    pub fn with_default_patterns(self, coin: &CoinItem) -> TemplateGenerator {
+        self.add_pattern("{YEAR}", current_year())
+            .add_pattern("{BLOCKCHAIN}", coin.blockchain_type())
+            .add_pattern("{TW_CRATE_NAME}", coin.id.to_tw_crate_name())
+            .add_pattern("{COIN_ID}", coin.id.as_str())
+            .add_pattern("{COIN_TYPE}", coin.coin_type())
+            .add_pattern("{COIN_NAME}", if coin.display_name.len() > 0 { &coin.display_name } else { &coin.name })
+            .add_pattern("{SYMBOL}", &coin.symbol)
+            .add_pattern("{DECIMALS}", coin.decimals)
+            .add_pattern("{P2PKH_PREFIX}", coin.p2pkh_prefix)
+            .add_pattern("{P2SH_PREFIX}", coin.p2sh_prefix)
+            .add_pattern("{HRP}", coin.hrp.as_str())
+            .add_pattern("{STATIC_PREFIX}", coin.static_prefix)
+            .add_pattern("{EXPLORER_URL}", &coin.explorer.url)
+            .add_pattern("{EXPLORER_TX_PATH}", &coin.explorer.tx_path)
+            .add_pattern("{EXPLORER_ACCOUNT_PATH}", &coin.explorer.account_path)
+            .add_pattern("{EXPLORER_SAMPLE_TX}", &coin.explorer.sample_tx)
+            .add_pattern("{EXPLORER_SAMPLE_ACCOUNT}", &coin.explorer.sample_account)
+    }
+
+    pub fn add_pattern<K: ToString, V: ToString>(
+        mut self,
+        to_replace: K,
+        replace_with: V,
+    ) -> TemplateGenerator {
+        self.to_replace.push(to_replace.to_string());
+        self.replace_with.push(replace_with.to_string());
+        self
+    }
+
+    pub fn write(self) -> Result<()> {
+        let write_to_path = self.write_to.ok_or_else(|| {
+            Error::io_error_other("Incorrect use of 'TemplateGenerator'".to_string())
+        })?;
+        let file_to_write = fs::File::create(write_to_path)?;
+
+        aho_corasick::AhoCorasick::new(self.to_replace)
+            .map_err(|e| Error::io_error_other(format!("Invalid patterns: {e}")))?
+            .try_stream_replace_all(
+                self.template_content.as_bytes(),
+                file_to_write,
+                &self.replace_with,
+            )
+            .map_err(Error::from)
+    }
+}
diff --git a/codegen-v2/src/coin_id.rs b/codegen-v2/src/coin_id.rs
new file mode 100644
index 00000000000..87a6b9e13c4
--- /dev/null
+++ b/codegen-v2/src/coin_id.rs
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{Error, Result};
+use serde::de::Error as SerdeError;
+use serde::{Deserialize, Deserializer};
+
+#[derive(Clone, Eq, PartialEq)]
+pub struct CoinId(String);
+
+impl CoinId {
+    /// Returns `Ok` if only the given `id` is a valid Rust identifier.
+    pub fn new(id: String) -> Result<CoinId> {
+        let first_letter = id
+            .chars()
+            .next()
+            .ok_or(Error::RegistryError("Invalid 'id'".to_string()))?;
+        let valid_chars = id.chars().all(|ch| ch.is_ascii_alphanumeric() || ch == '_');
+
+        if first_letter.is_numeric() || !valid_chars {
+            return Err(Error::RegistryError("Invalid 'id'".to_string()));
+        }
+        Ok(CoinId(id))
+    }
+
+    pub fn to_tw_crate_name(&self) -> String {
+        format!("tw_{}", self.0)
+    }
+
+    pub fn as_str(&self) -> &str {
+        &self.0
+    }
+}
+
+impl<'de> Deserialize<'de> for CoinId {
+    fn deserialize<D>(deserializer: D) -> std::result::Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let id = String::deserialize(deserializer)?;
+        CoinId::new(id).map_err(|e| SerdeError::custom(format!("{e:?}")))
+    }
+}
diff --git a/codegen-v2/src/lib.rs b/codegen-v2/src/lib.rs
new file mode 100644
index 00000000000..3e2c2e2e59d
--- /dev/null
+++ b/codegen-v2/src/lib.rs
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#[macro_use]
+extern crate serde;
+
+use handlebars::{RenderError, TemplateError};
+use serde_yaml::Error as YamlError;
+use std::io;
+use std::io::Error as IoError;
+use toml_edit::TomlError;
+
+pub mod codegen;
+pub mod coin_id;
+pub mod manifest;
+pub mod registry;
+#[cfg(test)]
+mod tests;
+pub mod utils;
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+#[derive(Debug)]
+pub enum Error {
+    IoError(IoError),
+    YamlError(YamlError),
+    RenderError(RenderError),
+    TemplateError(TemplateError),
+    BadFormat(String),
+    RegistryError(String),
+    TomlFormat(String),
+    InvalidCommand,
+}
+
+impl Error {
+    pub fn io_error_other(err: String) -> Error {
+        Error::IoError(IoError::new(io::ErrorKind::Other, err))
+    }
+}
+
+impl From<IoError> for Error {
+    fn from(err: IoError) -> Self {
+        Error::IoError(err)
+    }
+}
+
+impl From<YamlError> for Error {
+    fn from(err: YamlError) -> Self {
+        Error::YamlError(err)
+    }
+}
+
+impl From<RenderError> for Error {
+    fn from(err: RenderError) -> Self {
+        Error::RenderError(err)
+    }
+}
+
+impl From<TemplateError> for Error {
+    fn from(err: TemplateError) -> Self {
+        Error::TemplateError(err)
+    }
+}
+
+impl From<TomlError> for Error {
+    fn from(err: TomlError) -> Self {
+        Error::TomlFormat(err.to_string())
+    }
+}
+
+fn current_year() -> u64 {
+    use std::time::{SystemTime, UNIX_EPOCH};
+
+    let now = SystemTime::now();
+    let seconds_since_epoch = now
+        .duration_since(UNIX_EPOCH)
+        .expect("System's time is set before the start of the Unix epoch");
+
+    // One Gregorian calendar year has 365.2425 days,
+    // respectively 31556952 seconds.
+    1970 + (seconds_since_epoch.as_secs() / 31556952)
+}
diff --git a/codegen-v2/src/main.rs b/codegen-v2/src/main.rs
new file mode 100644
index 00000000000..53fd140cc65
--- /dev/null
+++ b/codegen-v2/src/main.rs
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use libparser::codegen::swift::RenderIntput;
+use libparser::codegen::{cpp, proto, rust};
+use libparser::coin_id::CoinId;
+use libparser::manifest::parse_dir;
+use libparser::registry::read_coin_from_registry;
+use libparser::{Error, Result};
+use std::fs::read_to_string;
+
+fn main() -> Result<()> {
+    let args: Vec<String> = std::env::args().collect();
+
+    if args.len() < 2 {
+        panic!("Invalid command");
+    }
+
+    match args[1].as_str() {
+        "new-blockchain-rust" => new_blockchain_rust(&args[2..]),
+        "new-blockchain" => new_blockchain(&args[2..]),
+        "new-evmchain" => new_evmchain(&args[2..]),
+        "new-cosmos-chain" => new_cosmos_chain(&args[2..]),
+        "swift" => generate_swift_bindings(),
+        _ => Err(Error::InvalidCommand),
+    }
+}
+
+fn new_blockchain_rust(args: &[String]) -> Result<()> {
+    let coin_str = args.iter().next().ok_or_else(|| Error::InvalidCommand)?;
+    let coin_id = CoinId::new(coin_str.clone())?;
+    let coin_item = read_coin_from_registry(&coin_id)?;
+
+    println!("New Rust blockchain template for coin '{coin_str}' requested");
+    rust::new_blockchain::new_blockchain(&coin_item)?;
+
+    Ok(())
+}
+
+fn new_blockchain(args: &[String]) -> Result<()> {
+    let coin_str = args.iter().next().ok_or_else(|| Error::InvalidCommand)?;
+    let coin_id = CoinId::new(coin_str.clone())?;
+    let coin_item = read_coin_from_registry(&coin_id)?;
+
+    println!("New '{coin_str}' blockchain template requested");
+
+    proto::new_blockchain::new_blockchain(&coin_item)?;
+    rust::new_blockchain::new_blockchain(&coin_item)?;
+    cpp::new_blockchain::new_blockchain(&coin_item)?;
+
+    Ok(())
+}
+
+fn new_evmchain(args: &[String]) -> Result<()> {
+    let coin_str = args.iter().next().ok_or_else(|| Error::InvalidCommand)?;
+    let coin_id = CoinId::new(coin_str.clone())?;
+    let coin_item = read_coin_from_registry(&coin_id)?;
+
+    println!("New '{coin_str}' EVM chain template requested");
+
+    rust::new_evmchain::new_evmchain(&coin_item)?;
+    cpp::new_evmchain::new_evmchain(&coin_item)?;
+
+    Ok(())
+}
+
+fn new_cosmos_chain(args: &[String]) -> Result<()> {
+    let coin_str = args.iter().next().ok_or_else(|| Error::InvalidCommand)?;
+    let coin_id = CoinId::new(coin_str.clone())?;
+    let coin_item = read_coin_from_registry(&coin_id)?;
+
+    println!("New '{coin_str}' Cosmos chain template requested");
+
+    rust::new_cosmos_chain::new_cosmos_chain(&coin_item)?;
+    cpp::new_cosmos_chain::new_cosmos_chain(&coin_item)?;
+
+    Ok(())
+}
+
+fn generate_swift_bindings() -> Result<()> {
+    // NOTE: The paths will be configurable, eventually.
+    const OUT_DIR: &str = "bindings/";
+    const IN_DIR: &str = "src/codegen/swift/templates";
+
+    std::fs::create_dir_all(OUT_DIR)?;
+
+    let struct_t = read_to_string(&format!("{IN_DIR}/struct.hbs"))?;
+    let enum_t = read_to_string(&format!("{IN_DIR}/enum.hbs"))?;
+    let ext_t = read_to_string(&format!("{IN_DIR}/extension.hbs"))?;
+    let proto_t = read_to_string(&format!("{IN_DIR}/proto.hbs"))?;
+    let part_init_t = read_to_string(&format!("{IN_DIR}/partial_init.hbs"))?;
+    let part_func_t = read_to_string(&format!("{IN_DIR}/partial_func.hbs"))?;
+    let part_prop_t = read_to_string(&format!("{IN_DIR}/partial_prop.hbs"))?;
+
+    // Read the manifest dir, generate bindings for each entry.
+    let file_infos = parse_dir("manifest/")?;
+
+    for file_info in file_infos {
+        let input = RenderIntput {
+            file_info,
+            struct_template: &struct_t,
+            enum_template: &enum_t,
+            extension_template: &ext_t,
+            proto_template: &proto_t,
+            partial_init_template: &part_init_t,
+            partial_func_tempalte: &part_func_t,
+            partial_prop_tempalte: &part_prop_t,
+        };
+
+        let rendered = libparser::codegen::swift::render_to_strings(input)?;
+
+        // Enum declarations go into their own subfolder.
+        if !rendered.enums.is_empty() {
+            std::fs::create_dir_all(format!("{OUT_DIR}/Enums"))?;
+        }
+
+        // Protobuf declarations go into their own subfolder.
+        if !rendered.protos.is_empty() {
+            std::fs::create_dir_all(format!("{OUT_DIR}/Protobuf"))?;
+        }
+
+        for (name, rendered) in rendered.structs {
+            let file_path = format!("{OUT_DIR}/{name}.swift");
+            std::fs::write(&file_path, rendered.as_bytes())?;
+        }
+
+        for (name, rendered) in rendered.enums {
+            let file_path = format!("{OUT_DIR}/Enums/{name}.swift");
+            std::fs::write(&file_path, rendered.as_bytes())?;
+        }
+
+        // Enum extensions.
+        for (name, rendered) in rendered.extensions {
+            let file_path = format!("{OUT_DIR}/{name}+Extension.swift");
+            std::fs::write(&file_path, rendered.as_bytes())?;
+        }
+
+        // Protobuf messages.
+        for (name, rendered) in rendered.protos {
+            let file_path = format!("{OUT_DIR}/Protobuf/{name}+Proto.swift");
+            std::fs::write(&file_path, rendered.as_bytes())?;
+        }
+    }
+
+    println!("Created bindings in directory 'bindings/'!");
+    Ok(())
+}
diff --git a/codegen-v2/src/manifest.rs b/codegen-v2/src/manifest.rs
new file mode 100644
index 00000000000..f70c24b2e5a
--- /dev/null
+++ b/codegen-v2/src/manifest.rs
@@ -0,0 +1,172 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::Result;
+use std::fs;
+use std::path::Path;
+
+pub fn parse_dir<P: AsRef<Path>>(path: P) -> Result<Vec<FileInfo>> {
+    // Get a list of all files in the directory
+    let entries = fs::read_dir(path)?;
+
+    let mut file_infos = vec![];
+    for entry in entries {
+        let entry = entry?;
+        let file_path = entry.path();
+
+        // Skip directories
+        if file_path.is_dir() {
+            println!("Found unexpected directory: {}", file_path.display());
+            continue;
+        }
+
+        // Read the file into a string
+        let file_contents = fs::read_to_string(&file_path)?;
+
+        // Deserialize the JSON into a struct
+        let info = parse_str(&file_contents)?;
+        file_infos.push(info);
+    }
+
+    Ok(file_infos)
+}
+
+pub fn parse_str(str: &str) -> Result<FileInfo> {
+    serde_yaml::from_str(str).map_err(|err| err.into())
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+pub struct TypeInfo {
+    #[serde(flatten)]
+    pub variant: TypeVariant,
+    pub is_constant: bool,
+    pub is_nullable: bool,
+    pub is_pointer: bool,
+}
+
+#[derive(Debug, Clone, Eq, PartialEq, Serialize, Deserialize)]
+#[serde(tag = "variant", content = "value", rename_all = "snake_case")]
+pub enum TypeVariant {
+    Void,
+    Bool,
+    Char,
+    ShortInt,
+    Int,
+    UnsignedInt,
+    LongInt,
+    Float,
+    Double,
+    SizeT,
+    Int8T,
+    Int16T,
+    Int32T,
+    Int64T,
+    UInt8T,
+    UInt16T,
+    UInt32T,
+    UInt64T,
+    Struct(String),
+    Enum(String),
+    Data,
+    String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct FileInfo {
+    pub name: String,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub structs: Vec<StructInfo>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub inits: Vec<InitInfo>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub deinits: Vec<DeinitInfo>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub enums: Vec<EnumInfo>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub functions: Vec<FunctionInfo>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub properties: Vec<PropertyInfo>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub protos: Vec<ProtoInfo>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ImportInfo {
+    // Expressed as directories plus the final file.
+    // E.g. `to/some/file.h` ~= ["to", "some", "file.h"]
+    pub path: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ProtoInfo(pub String);
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct EnumInfo {
+    pub name: String,
+    pub is_public: bool,
+    pub value_type: TypeVariant,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub variants: Vec<EnumVariantInfo>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct EnumVariantInfo {
+    pub name: String,
+    pub value: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub as_string: Option<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct StructInfo {
+    pub name: String,
+    pub is_public: bool,
+    pub is_class: bool,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub fields: Vec<(String, TypeInfo)>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct InitInfo {
+    pub name: String,
+    pub is_public: bool,
+    pub is_nullable: bool,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub params: Vec<ParamInfo>,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub comments: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct DeinitInfo {
+    pub name: String,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct FunctionInfo {
+    pub name: String,
+    pub is_public: bool,
+    pub is_static: bool,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub params: Vec<ParamInfo>,
+    pub return_type: TypeInfo,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub comments: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct PropertyInfo {
+    pub name: String,
+    pub is_public: bool,
+    pub return_type: TypeInfo,
+    #[serde(default, skip_serializing_if = "Vec::is_empty")]
+    pub comments: Vec<String>,
+}
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub struct ParamInfo {
+    pub name: String,
+    #[serde(rename = "type")]
+    pub ty: TypeInfo,
+}
diff --git a/codegen-v2/src/registry.rs b/codegen-v2/src/registry.rs
new file mode 100644
index 00000000000..c83ef174dd0
--- /dev/null
+++ b/codegen-v2/src/registry.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_id::CoinId;
+use crate::{Error, Result};
+use convert_case::{Case, Casing};
+use std::path::PathBuf;
+use std::{env, fs};
+
+pub fn registry_json_path() -> PathBuf {
+    PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("..")
+        .join("registry.json")
+}
+
+#[derive(Clone, Deserialize)]
+pub struct CoinExplorer {
+    pub url: String,
+    #[serde(rename = "txPath")]
+    pub tx_path: String,
+    #[serde(rename = "accountPath")]
+    pub account_path: String,
+    #[serde(rename = "sampleTx")]
+    #[serde(default)]
+    pub sample_tx: String,
+    #[serde(rename = "sampleAccount")]
+    #[serde(default)]
+    pub sample_account: String,
+}
+
+#[derive(Clone, Deserialize)]
+pub struct CoinItem {
+    pub id: CoinId,
+    pub name: String,
+    #[serde(rename = "displayName")]
+    #[serde(default)]
+    pub display_name: String,
+    #[serde(rename = "coinId")]
+    pub coin_id_number: u32,
+    pub symbol: String,
+    pub decimals: u8,
+    pub blockchain: String,
+    #[serde(rename = "p2pkhPrefix")]
+    #[serde(default)]
+    pub p2pkh_prefix: u8,
+    #[serde(rename = "p2shPrefix")]
+    #[serde(default)]
+    pub p2sh_prefix: u8,
+    #[serde(rename = "staticPrefix")]
+    #[serde(default)]
+    pub static_prefix: u8,
+    #[serde(default)]
+    pub hrp: String,
+    pub explorer: CoinExplorer,
+}
+
+impl CoinItem {
+    /// Transforms a coin name to a Rust name.
+    /// https://github.com/trustwallet/wallet-core/blob/3769f31b7d0c75126b2f426bb065364429aaa379/codegen/lib/coin_skeleton_gen.rb#L15-L22
+    pub fn coin_type(&self) -> String {
+        self.name.replace([' ', '.', '-'], "")
+    }
+
+    /// Returns the blockchain type in `UpperCamel` case.
+    pub fn blockchain_type(&self) -> String {
+        self.blockchain.to_case(Case::UpperCamel)
+    }
+
+    /// Returns the blockchain type in `UPPER_SNAKE` case.
+    pub fn blockchain_entry_upper_snake(&self) -> String {
+        self.blockchain.to_case(Case::UpperSnake)
+    }
+
+    /// Returns a Rust blockchain entry of the blockchain.
+    pub fn blockchain_entry(&self) -> String {
+        format!("{}Entry", self.blockchain_type())
+    }
+}
+
+pub fn read_coin_from_registry(coin: &CoinId) -> Result<CoinItem> {
+    let registry_path = registry_json_path();
+
+    let registry_bytes = fs::read(registry_path)?;
+    let coins: Vec<CoinItem> =
+        serde_json::from_slice(&registry_bytes).map_err(|e| Error::RegistryError(e.to_string()))?;
+
+    coins
+        .into_iter()
+        .find(|item| item.id == *coin)
+        .ok_or(Error::InvalidCommand)
+}
diff --git a/codegen-v2/src/tests/mod.rs b/codegen-v2/src/tests/mod.rs
new file mode 100644
index 00000000000..6a889017da4
--- /dev/null
+++ b/codegen-v2/src/tests/mod.rs
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::codegen::swift::{render_to_strings, RenderIntput};
+use crate::manifest::parse_str;
+
+/// Convenience function.
+fn create_intput(yaml: &str) -> RenderIntput {
+    let file_info = parse_str(yaml).unwrap();
+
+    RenderIntput {
+        file_info,
+        struct_template: include_str!("../codegen/swift/templates/struct.hbs"),
+        enum_template: include_str!("../codegen/swift/templates/enum.hbs"),
+        extension_template: include_str!("../codegen/swift/templates/extension.hbs"),
+        proto_template: include_str!("../codegen/swift/templates/proto.hbs"),
+        partial_init_template: include_str!("../codegen/swift/templates/partial_init.hbs"),
+        partial_func_tempalte: include_str!("../codegen/swift/templates/partial_func.hbs"),
+        partial_prop_tempalte: include_str!("../codegen/swift/templates/partial_prop.hbs"),
+    }
+}
+
+// Convenience function: runs the codegen on the given `input` and compares it
+// with the `expected` value. Expects a single, rendered file as output.
+fn render_and_compare_struct(input: &str, expected: &str) {
+    let input = create_intput(input);
+    let rendered = render_to_strings(input).unwrap();
+
+    assert_eq!(rendered.structs.len(), 1);
+    assert!(rendered.enums.is_empty());
+    assert!(rendered.extensions.is_empty());
+    assert!(rendered.protos.is_empty());
+
+    let (_name, output) = &rendered.structs[0];
+    println!("{output}");
+    assert_eq!(output, expected);
+}
+
+fn render_and_compare_enum(input: &str, expected: &str) {
+    let input = create_intput(input);
+    let rendered = render_to_strings(input).unwrap();
+
+    assert!(rendered.structs.is_empty());
+    assert_eq!(rendered.enums.len(), 1);
+    assert!(rendered.extensions.is_empty());
+    assert!(rendered.protos.is_empty());
+
+    let (_name, output) = &rendered.enums[0];
+    assert_eq!(output, expected);
+}
+
+#[test]
+fn single_struct() {
+    const INPUT: &str = include_str!("samples/struct.input.yaml");
+    const EXPECTED: &str = include_str!("samples/struct.output.swift");
+
+    render_and_compare_struct(INPUT, EXPECTED);
+}
+
+#[test]
+fn single_class() {
+    const INPUT: &str = include_str!("samples/class.input.yaml");
+    const EXPECTED: &str = include_str!("samples/class.output.swift");
+
+    render_and_compare_struct(INPUT, EXPECTED);
+}
+
+#[test]
+fn private() {
+    const INPUT: &str = include_str!("samples/private_class.input.yaml");
+    const EXPECTED: &str = include_str!("samples/private_class.output.swift");
+
+    render_and_compare_struct(INPUT, EXPECTED);
+}
+
+#[test]
+fn optional() {
+    const INPUT: &str = include_str!("samples/optional.input.yaml");
+    const EXPECTED: &str = include_str!("samples/optional.output.swift");
+
+    render_and_compare_struct(INPUT, EXPECTED);
+}
+
+#[test]
+fn enum_with_description() {
+    const INPUT: &str = include_str!("samples/enum.input.yaml");
+    const EXPECTED: &str = include_str!("samples/enum.output.swift");
+
+    render_and_compare_enum(INPUT, EXPECTED);
+}
+
+#[test]
+fn privat_enum_with_description() {
+    const INPUT: &str = include_str!("samples/enum_private.input.yaml");
+    const EXPECTED: &str = include_str!("samples/enum_private.output.swift");
+
+    render_and_compare_enum(INPUT, EXPECTED);
+}
+
+#[test]
+fn enum_with_extension() {
+    const INPUT: &str = include_str!("samples/enum_extension.input.yaml");
+    const EXPECTED_ENUM: &str = include_str!("samples/enum.output.swift");
+    const EXPECTED_EXTENSION: &str = include_str!("samples/enum_extension.output.swift");
+
+    let input = create_intput(INPUT);
+    let rendered = render_to_strings(input).unwrap();
+
+    assert!(rendered.structs.is_empty());
+    assert_eq!(rendered.enums.len(), 1);
+    assert_eq!(rendered.extensions.len(), 1);
+    assert!(rendered.protos.is_empty());
+
+    // Check generated enum.
+    let (_name, output) = &rendered.enums[0];
+    assert_eq!(output, EXPECTED_ENUM);
+
+    // Check generated extension.
+    let (_name, output) = &rendered.extensions[0];
+    assert_eq!(output, EXPECTED_EXTENSION);
+}
+
+#[test]
+fn non_associated() {
+    const INPUT: &str = include_str!("samples/non-associated.input.yaml");
+    const EXPECTED: &str = include_str!("samples/non-associated.output.swift");
+
+    render_and_compare_struct(INPUT, EXPECTED);
+}
diff --git a/codegen-v2/src/tests/samples/class.input.yaml b/codegen-v2/src/tests/samples/class.input.yaml
new file mode 100644
index 00000000000..2593f18a6dc
--- /dev/null
+++ b/codegen-v2/src/tests/samples/class.input.yaml
@@ -0,0 +1,42 @@
+name: Class
+structs:
+- name: MainStruct 
+  is_public: true
+  is_class: true
+inits:
+- name: MainStructCreate
+  is_public: true
+  is_nullable: false
+  params:
+  - name: string 
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: MainStructDelete
+functions:
+- name: MainStructFirstFunction
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: int 
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: MainStructFirstProperty
+  is_public: true
+  return_type:
+    variant: bool 
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/src/tests/samples/class.output.swift b/codegen-v2/src/tests/samples/class.output.swift
new file mode 100644
index 00000000000..ed7c0b000ac
--- /dev/null
+++ b/codegen-v2/src/tests/samples/class.output.swift
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+import Foundation
+
+public final class MainStruct {
+    let rawValue: OpaquePointer
+
+    init(rawValue: OpaquePointer) {
+        self.rawValue = rawValue
+    }
+
+    public init(string: String) {
+        let string = TWStringCreateWithNSString(string)
+        defer {
+            TWStringDelete(string)
+        }
+
+        let result = MainStructCreate(string)
+
+        self.rawValue = result
+    }
+
+    deinit {
+        MainStructDelete(self.rawValue)
+    }
+
+    public static func firstFunction(first_param: Int32) -> Bool {
+        let result = MainStructFirstFunction(first_param)
+        return result
+    }
+
+    public var firstProperty: Bool {
+        let obj = self.rawValue
+        let result = MainStructFirstProperty(obj)
+        return result
+    }
+}
diff --git a/codegen-v2/src/tests/samples/enum.input.yaml b/codegen-v2/src/tests/samples/enum.input.yaml
new file mode 100644
index 00000000000..32beb097c95
--- /dev/null
+++ b/codegen-v2/src/tests/samples/enum.input.yaml
@@ -0,0 +1,15 @@
+name: Enum
+enums:
+- name: MainEnum
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: one 
+    value: 0
+    as_string: one_string
+  - name: two 
+    value: 1
+  - name: three
+    value: 2
+    as_string: three_string
diff --git a/codegen-v2/src/tests/samples/enum.output.swift b/codegen-v2/src/tests/samples/enum.output.swift
new file mode 100644
index 00000000000..0e5b8346d6f
--- /dev/null
+++ b/codegen-v2/src/tests/samples/enum.output.swift
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+public enum MainEnum: UInt32, CaseIterable, CustomStringConvertible {
+    case `one` = 0
+    case `two` = 1
+    case `three` = 2
+
+    public var description: String {
+        switch self {
+            case .one: return "one_string"
+            case .two: return ""
+            case .three: return "three_string"
+        }
+    }
+}
diff --git a/codegen-v2/src/tests/samples/enum_extension.input.yaml b/codegen-v2/src/tests/samples/enum_extension.input.yaml
new file mode 100644
index 00000000000..86551b52a83
--- /dev/null
+++ b/codegen-v2/src/tests/samples/enum_extension.input.yaml
@@ -0,0 +1,47 @@
+name: EnumExtension
+enums:
+- name: MainEnum
+  is_public: true
+  value_type:
+    variant: u_int32_t
+  variants:
+  - name: one 
+    value: 0
+    as_string: one_string
+  - name: two 
+    value: 1
+  - name: three
+    value: 2
+    as_string: three_string
+functions:
+- name: MainEnumFirstFunction
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: int 
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: MainEnumSecondFunction
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: struct
+      value: SomeStruct
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
diff --git a/codegen-v2/src/tests/samples/enum_extension.output.swift b/codegen-v2/src/tests/samples/enum_extension.output.swift
new file mode 100644
index 00000000000..706368ee760
--- /dev/null
+++ b/codegen-v2/src/tests/samples/enum_extension.output.swift
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+extension MainEnum {
+    public static func firstFunction(first_param: Int32) -> Bool {
+        let result = MainEnumFirstFunction(first_param)
+        return result
+    }
+
+    public static func secondFunction(first_param: SomeStruct) -> Bool {
+        let first_param = first_param.rawValue
+        let result = MainEnumSecondFunction(first_param)
+        return result
+    }
+}
diff --git a/codegen-v2/src/tests/samples/enum_private.input.yaml b/codegen-v2/src/tests/samples/enum_private.input.yaml
new file mode 100644
index 00000000000..db0ca4d0850
--- /dev/null
+++ b/codegen-v2/src/tests/samples/enum_private.input.yaml
@@ -0,0 +1,16 @@
+name: EnumPrivate
+enums:
+- name: MainEnum
+  is_public: false
+  value_type:
+    variant: u_int32_t
+  # Note that the `description` method is always public.
+  variants:
+  - name: one 
+    value: 0
+    as_string: one_string
+  - name: two 
+    value: 1
+  - name: three
+    value: 2
+    as_string: three_string
diff --git a/codegen-v2/src/tests/samples/enum_private.output.swift b/codegen-v2/src/tests/samples/enum_private.output.swift
new file mode 100644
index 00000000000..b2cb22aea3a
--- /dev/null
+++ b/codegen-v2/src/tests/samples/enum_private.output.swift
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+enum MainEnum: UInt32, CaseIterable, CustomStringConvertible {
+    case `one` = 0
+    case `two` = 1
+    case `three` = 2
+
+    public var description: String {
+        switch self {
+            case .one: return "one_string"
+            case .two: return ""
+            case .three: return "three_string"
+        }
+    }
+}
diff --git a/codegen-v2/src/tests/samples/non-associated.input.yaml b/codegen-v2/src/tests/samples/non-associated.input.yaml
new file mode 100644
index 00000000000..21a42bf3a3d
--- /dev/null
+++ b/codegen-v2/src/tests/samples/non-associated.input.yaml
@@ -0,0 +1,79 @@
+name: NonAssociated
+structs:
+- name: MainStruct 
+  is_public: true
+  is_class: true
+inits:
+- name: MainStructCreate
+  is_public: true
+  is_nullable: false
+  params:
+  - name: string 
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+# Non-associated.
+- name: OtherStructCreate
+  is_public: true
+  is_nullable: false
+  params:
+  - name: number 
+    type:
+      variant: int
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: MainStructDelete
+# Non-associated.
+- name: OtherStructDelete
+functions:
+# Non-associated.
+- name: OtherStructFirstFunction
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: int 
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+- name: MainStructSecondFunction
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: int 
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: MainStructFirstProperty
+  is_public: true
+  return_type:
+    variant: bool 
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
+# Non-associated.
+- name: OtherStructSecondProperty
+  is_public: true
+  return_type:
+    variant: bool 
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/src/tests/samples/non-associated.output.swift b/codegen-v2/src/tests/samples/non-associated.output.swift
new file mode 100644
index 00000000000..478b8b1d6b5
--- /dev/null
+++ b/codegen-v2/src/tests/samples/non-associated.output.swift
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+import Foundation
+
+public final class MainStruct {
+    let rawValue: OpaquePointer
+
+    init(rawValue: OpaquePointer) {
+        self.rawValue = rawValue
+    }
+
+    public init(string: String) {
+        let string = TWStringCreateWithNSString(string)
+        defer {
+            TWStringDelete(string)
+        }
+
+        let result = MainStructCreate(string)
+
+        self.rawValue = result
+    }
+
+    deinit {
+        MainStructDelete(self.rawValue)
+    }
+
+    public static func secondFunction(first_param: Int32) -> Bool {
+        let result = MainStructSecondFunction(first_param)
+        return result
+    }
+
+    public var firstProperty: Bool {
+        let obj = self.rawValue
+        let result = MainStructFirstProperty(obj)
+        return result
+    }
+}
diff --git a/codegen-v2/src/tests/samples/optional.input.yaml b/codegen-v2/src/tests/samples/optional.input.yaml
new file mode 100644
index 00000000000..d235f0d6262
--- /dev/null
+++ b/codegen-v2/src/tests/samples/optional.input.yaml
@@ -0,0 +1,112 @@
+name: Optional
+structs:
+- name: MainStruct 
+  is_public: true
+  is_class: true
+inits:
+- name: MainStructCreate
+  is_public: true
+  is_nullable: true
+  params:
+  - name: string 
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: true
+      is_pointer: true
+deinits:
+- name: MainStructDelete
+functions:
+- name: MainStructWithOptionalInt
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: int 
+      is_constant: false
+      is_nullable: true
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: true
+    is_pointer: false
+- name: MainStructWithOptionalStruct
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: struct
+      value: SomeStruct
+      is_constant: false
+      is_nullable: true
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: true
+    is_pointer: false
+- name: MainStructWithOptionalString
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: string
+      is_constant: false
+      is_nullable: true
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: true
+    is_pointer: false
+- name: MainStructWithOptionalEnum
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: enum
+      value: SomeEnum
+      is_constant: false
+      is_nullable: true
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: true
+    is_pointer: false
+properties:
+- name: MainStructWithOptionalInt
+  is_public: true
+  return_type:
+    variant: int
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: MainStructWithOptionalString
+  is_public: true
+  return_type:
+    variant: string
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: MainStructWithOptionalStruct
+  is_public: true
+  return_type:
+    variant: struct
+    value: SomeStruct
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
+- name: MainStructWithOptionalEnum
+  is_public: true
+  return_type:
+    variant: enum
+    value: SomeEnum
+    is_constant: true
+    is_nullable: true
+    is_pointer: true
diff --git a/codegen-v2/src/tests/samples/optional.output.swift b/codegen-v2/src/tests/samples/optional.output.swift
new file mode 100644
index 00000000000..a33b4afea58
--- /dev/null
+++ b/codegen-v2/src/tests/samples/optional.output.swift
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+import Foundation
+
+public final class MainStruct {
+    let rawValue: OpaquePointer
+
+    init(rawValue: OpaquePointer) {
+        self.rawValue = rawValue
+    }
+
+    public init?(string: String?) {
+        guard let result = MainStructCreate(string) else {
+            return nil
+        }
+
+        self.rawValue = result
+    }
+
+    deinit {
+        MainStructDelete(self.rawValue)
+    }
+
+    public static func withOptionalInt(first_param: Int32?) -> Bool? {
+        guard let result = MainStructWithOptionalInt(first_param) else {
+            return nil
+        }
+        return result
+    }
+
+    public static func withOptionalStruct(first_param: SomeStruct?) -> Bool? {
+        let first_param = first_param?.rawValue
+        guard let result = MainStructWithOptionalStruct(first_param) else {
+            return nil
+        }
+        return result
+    }
+
+    public static func withOptionalString(first_param: String?) -> Bool? {
+        let ptr: UnsafeRawPointer?
+        if let first_param = first_param {
+            ptr = TWStringCreateWithNSString(first_param)
+        } else {
+            ptr = nil
+        }
+        defer {
+            if let first_param  = ptr {
+                TWStringDelete(first_param)
+            }
+        }
+        let first_param = ptr
+
+        guard let result = MainStructWithOptionalString(first_param) else {
+            return nil
+        }
+        return result
+    }
+
+    public static func withOptionalEnum(first_param: SomeEnum?) -> Bool? {
+        let first_param = SomeEnum(rawValue: first_param.rawValue)
+        guard let result = MainStructWithOptionalEnum(first_param) else {
+            return nil
+        }
+        return result
+    }
+
+    public var withOptionalInt: Int32? {
+        let obj = self.rawValue
+        guard let result = MainStructWithOptionalInt(obj) else {
+            return nil
+        }
+        return result
+    }
+
+    public var withOptionalString: String? {
+        let obj = self.rawValue
+        guard let result = MainStructWithOptionalString(obj) else {
+            return nil
+        }
+        return TWStringNSString(result)
+    }
+
+    public var withOptionalStruct: SomeStruct? {
+        let obj = self.rawValue
+        guard let result = MainStructWithOptionalStruct(obj) else {
+            return nil
+        }
+        return SomeStruct(rawValue: result)
+    }
+
+    public var withOptionalEnum: SomeEnum? {
+        let obj = self.rawValue
+        guard let result = MainStructWithOptionalEnum(obj) else {
+            return nil
+        }
+        return SomeEnum(rawValue: result.rawValue)!
+    }
+}
diff --git a/codegen-v2/src/tests/samples/private_class.input.yaml b/codegen-v2/src/tests/samples/private_class.input.yaml
new file mode 100644
index 00000000000..65365d45781
--- /dev/null
+++ b/codegen-v2/src/tests/samples/private_class.input.yaml
@@ -0,0 +1,42 @@
+name: PrivateClass
+structs:
+- name: MainStruct
+  is_public: false
+  is_class: true
+inits:
+- name: MainStructCreate
+  is_public: false
+  is_nullable: false
+  params:
+  - name: string
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: MainStructDelete
+functions:
+- name: MainStructFirstFunction
+  is_public: false
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: int
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: MainStructFirstProperty
+  is_public: false
+  return_type:
+    variant: bool
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/src/tests/samples/private_class.output.swift b/codegen-v2/src/tests/samples/private_class.output.swift
new file mode 100644
index 00000000000..2362367af00
--- /dev/null
+++ b/codegen-v2/src/tests/samples/private_class.output.swift
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+import Foundation
+
+final class MainStruct {
+    let rawValue: OpaquePointer
+
+    init(rawValue: OpaquePointer) {
+        self.rawValue = rawValue
+    }
+
+    init(string: String) {
+        let string = TWStringCreateWithNSString(string)
+        defer {
+            TWStringDelete(string)
+        }
+
+        let result = MainStructCreate(string)
+
+        self.rawValue = result
+    }
+
+    deinit {
+        MainStructDelete(self.rawValue)
+    }
+
+    static func firstFunction(first_param: Int32) -> Bool {
+        let result = MainStructFirstFunction(first_param)
+        return result
+    }
+
+    var firstProperty: Bool {
+        let obj = self.rawValue
+        let result = MainStructFirstProperty(obj)
+        return result
+    }
+}
diff --git a/codegen-v2/src/tests/samples/struct.input.yaml b/codegen-v2/src/tests/samples/struct.input.yaml
new file mode 100644
index 00000000000..1e21a100e81
--- /dev/null
+++ b/codegen-v2/src/tests/samples/struct.input.yaml
@@ -0,0 +1,42 @@
+name: Struct
+structs:
+- name: MainStruct 
+  is_public: true
+  is_class: false 
+inits:
+- name: MainStructCreate
+  is_public: true
+  is_nullable: false
+  params:
+  - name: string 
+    type:
+      variant: string
+      is_constant: true
+      is_nullable: false
+      is_pointer: true
+deinits:
+- name: MainStructDelete
+functions:
+- name: MainStructFirstFunction
+  is_public: true
+  is_static: true
+  params:
+  - name: first_param
+    type:
+      variant: int 
+      is_constant: false
+      is_nullable: false
+      is_pointer: true
+  return_type:
+    variant: bool
+    is_constant: false
+    is_nullable: false
+    is_pointer: false
+properties:
+- name: MainStructFirstProperty
+  is_public: true
+  return_type:
+    variant: bool 
+    is_constant: true
+    is_nullable: false
+    is_pointer: true
diff --git a/codegen-v2/src/tests/samples/struct.output.swift b/codegen-v2/src/tests/samples/struct.output.swift
new file mode 100644
index 00000000000..34f310c1eb8
--- /dev/null
+++ b/codegen-v2/src/tests/samples/struct.output.swift
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here WILL BE LOST.
+//
+
+import Foundation
+
+public struct MainStruct {
+    init() {}
+
+    public init(string: String) {
+        let string = TWStringCreateWithNSString(string)
+        defer {
+            TWStringDelete(string)
+        }
+
+        let result = MainStructCreate(string)
+
+        self.rawValue = result
+    }
+
+    deinit {
+        MainStructDelete(self.rawValue)
+    }
+
+    public static func firstFunction(first_param: Int32) -> Bool {
+        let result = MainStructFirstFunction(first_param)
+        return result
+    }
+
+    public var firstProperty: Bool {
+        let obj = self.rawValue
+        let result = MainStructFirstProperty(obj)
+        return result
+    }
+}
diff --git a/codegen-v2/src/utils.rs b/codegen-v2/src/utils.rs
new file mode 100644
index 00000000000..a61222fc3fd
--- /dev/null
+++ b/codegen-v2/src/utils.rs
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{Error, Result};
+use std::fs;
+use std::path::{Path, PathBuf};
+
+pub fn read_lines<P: AsRef<Path>>(path: P) -> Result<Vec<String>> {
+    let lines = fs::read_to_string(path)?
+        .split('\n')
+        .map(|line| line.to_string())
+        .collect();
+    Ok(lines)
+}
+
+pub fn write_lines<P: AsRef<Path>>(path: P, lines: Vec<String>) -> Result<()> {
+    let content = lines.join("\n");
+    fs::write(path, content).map_err(Error::from)
+}
+
+pub struct FileContent {
+    path: PathBuf,
+    lines: Vec<String>,
+}
+
+impl FileContent {
+    pub fn read(path: PathBuf) -> Result<FileContent> {
+        read_lines(&path).map(|lines| FileContent { path, lines })
+    }
+
+    pub fn find_region_with_prefix(&mut self, prefix: &str) -> Result<FileRegion<'_>> {
+        // Find the first line that starts with the `prefix`.
+        let region_starts_at = self
+            .lines
+            .iter()
+            .position(|line| line.starts_with(prefix))
+            .ok_or_else(|| Error::io_error_other(format!("Cannot find the `{prefix}` region")))?;
+
+        // Find the last line that starts with the `prefix`.
+        let region_ends_at = self
+            .lines
+            .iter()
+            .rposition(|line| line.starts_with(prefix))
+            .ok_or_else(|| Error::io_error_other(format!("Cannot find the `{prefix}` region")))?;
+
+        Ok(FileRegion {
+            lines: &mut self.lines,
+            region_starts_at,
+            region_ends_at,
+        })
+    }
+
+    pub fn find_region_with_comments(
+        &mut self,
+        start_comment: &str,
+        end_comment: &str,
+    ) -> Result<FileRegion<'_>> {
+        // Find the position of the `start_comment`.
+        let start_comment_at = self
+            .lines
+            .iter()
+            .position(|line| line.contains(start_comment))
+            .ok_or_else(|| {
+                Error::io_error_other(format!("Cannot find the `{start_comment}` line"))
+            })?;
+        let end_comment_at = self
+            .lines
+            .iter()
+            .skip(start_comment_at)
+            .position(|line| line.contains(end_comment))
+            .ok_or_else(|| {
+                Error::io_error_other(format!("Cannot find the `{end_comment}` line"))
+            })?
+            + start_comment_at;
+
+        let region_starts_at = start_comment_at + 1;
+        let region_ends_at = end_comment_at - 1;
+
+        if region_starts_at > region_ends_at {
+            return Err(Error::io_error_other(format!(
+                "There must be the content between {start_comment} and {end_comment}"
+            )));
+        }
+
+        Ok(FileRegion {
+            lines: &mut self.lines,
+            region_starts_at,
+            region_ends_at,
+        })
+    }
+
+    pub fn rfind_line<F>(&mut self, f: F) -> Result<LinePointer<'_>>
+    where
+        F: Fn(&str) -> bool,
+    {
+        let line_idx = self.lines.iter().rposition(|line| f(line)).ok_or_else(|| {
+            Error::io_error_other(format!(
+                "{:?} file does not contain a required pattern",
+                self.path
+            ))
+        })?;
+        Ok(LinePointer {
+            lines: &mut self.lines,
+            line_idx,
+        })
+    }
+
+    pub fn write(self) -> Result<()> {
+        write_lines(self.path, self.lines)
+    }
+}
+
+pub struct FileRegion<'a> {
+    lines: &'a mut Vec<String>,
+    region_starts_at: usize,
+    region_ends_at: usize,
+}
+
+impl<'a> FileRegion<'a> {
+    pub fn push_line(&mut self, line: String) {
+        self.lines.insert(self.region_ends_at + 1, line);
+        self.region_ends_at += 1;
+    }
+
+    pub fn sort(&mut self) {
+        self.lines[self.region_starts_at..=self.region_ends_at].sort()
+    }
+
+    pub fn count_lines(&self) -> usize {
+        self.region_ends_at - self.region_starts_at
+    }
+}
+
+pub struct LinePointer<'a> {
+    lines: &'a mut Vec<String>,
+    line_idx: usize,
+}
+
+impl<'a> LinePointer<'a> {
+    /// Please note that the line pointer will be shifted to the same line on which it pointed before.
+    pub fn push_line_before(&mut self, line: String) {
+        self.lines.insert(self.line_idx, line);
+        self.line_idx += 1;
+    }
+
+    pub fn push_paragraph_before(&mut self, paragraph: String) {
+        for line in paragraph.split("\n") {
+            self.push_line_before(line.to_string());
+        }
+    }
+
+    /// Please note that the line pointer will not be shifted to the pushed element.
+    pub fn push_line_after(&mut self, line: String) {
+        self.lines.insert(self.line_idx + 1, line);
+    }
+}
diff --git a/codegen/bin/codegen b/codegen/bin/codegen
index 8fc86c7e86e..5cd99179bb8 100755
--- a/codegen/bin/codegen
+++ b/codegen/bin/codegen
@@ -22,6 +22,7 @@ options.jni_h = true
 options.jni_c = true
 options.wasm_cpp = true
 options.ts_declaration = true
+options.kotlin = true
 
 OptionParser.new do |opts|
   opts.banner = 'Usage: codegen [options]'
@@ -50,6 +51,9 @@ OptionParser.new do |opts|
   opts.on('-t', '--typescript-declaration', "Generate typescript declaration file Default: #{options.ts_declaration}") do |v|
     options.ts_declaration = v
   end
+  opts.on('-k', '--kotlin', "Generate Kotlin code. Default: #{options.kotlin}") do |v|
+    options.kotlin = v
+  end
   opts.on_tail('-h', '--help', 'Show this message') do
     puts opts
     exit
@@ -88,3 +92,12 @@ end
 if options.ts_declaration
   generator.render_ts_declaration
 end
+if options.kotlin
+  generator.render_kotlin_common
+  generator.render_kotlin_android
+  generator.render_kotlin_ios
+  generator.render_kotlin_js
+  generator.render_kotlin_js_accessors
+  generator.render_kotlin_jni_h
+  generator.render_kotlin_jni_c
+end
diff --git a/codegen/bin/coins b/codegen/bin/coins
index a5ea5909e05..c5a3690c1a4 100755
--- a/codegen/bin/coins
+++ b/codegen/bin/coins
@@ -4,6 +4,10 @@ require 'erb'
 require 'fileutils'
 require 'json'
 
+CurrentDir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.join(CurrentDir, '..', 'lib'))
+require 'derivation'
+
 # Transforms a coin name to a C++ name
 def self.format_name(n)
   formatted = n
@@ -18,24 +22,10 @@ def self.coin_name(coin)
   coin['displayName'] || coin['name']
 end
 
-def self.derivation_path(coin)
-  coin['derivation'][0]['path']
-end
-
 def self.camel_case(id)
   id[0].upcase + id[1..].downcase
 end
 
-def self.derivation_name(deriv)
-  return "" if deriv['name'].nil?
-  deriv['name'].downcase
-end
-
-def self.derivation_enum_name(deriv, coin)
-  return "TWDerivationDefault" if deriv['name'].nil?
-  "TWDerivation" + format_name(coin['name']) + camel_case(deriv['name'])
-end
-
 def self.coin_img(coin)
   "<img src=\"https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/#{coin}/info/logo.png\" width=\"32\" />"
 end
@@ -55,7 +45,6 @@ coins = JSON.parse(json_string).sort_by { |x| x['coinId'] }
 enum_count = 0
 
 erbs = [
-  {'template' => 'TWDerivation.h.erb', 'folder' => 'include/TrustWalletCore', 'file' => 'TWDerivation.h'},
   {'template' => 'CoinInfoData.cpp.erb', 'folder' => 'src/Generated', 'file' => 'CoinInfoData.cpp'},
   {'template' => 'registry.md.erb', 'folder' => 'docs', 'file' => 'registry.md'},
   {'template' => 'hrp.cpp.erb', 'folder' => 'src/Generated', 'file' => 'TWHRP.cpp'},
@@ -63,6 +52,9 @@ erbs = [
   {'template' => 'TWEthereumChainID.h.erb', 'folder' => 'include/TrustWalletCore', 'file' => 'TWEthereumChainID.h'}
 ]
 
+# Update coins derivations if changed.
+update_derivation_enum(coins)
+
 FileUtils.mkdir_p File.join('src', 'Generated')
 erbs.each do |erb|
   path = File.expand_path(erb['template'], File.join(File.dirname(__FILE__), '..', 'lib', 'templates'))
diff --git a/codegen/bin/newcoin b/codegen/bin/newcoin
index af985bd292b..ee14b241f7a 100755
--- a/codegen/bin/newcoin
+++ b/codegen/bin/newcoin
@@ -1,96 +1,14 @@
 #!/usr/bin/env ruby
 
-# Sript for creating new skeleton files for a new coin
-# 1. Add relevsant entry to registry.json (in order to minimize merge conflict, don't add at the very end)
+# Sript for creating new skeleton files for a new coin. See also `newevmchain`.
+# 1. Add relevant entry to registry.json (in order to minimize merge conflict, don't add at the very end)
 # 2. Invoke this script with the id of the coin, e.g.: codegen/bin/newcoin ethereum
 
-require 'erb'
 require 'fileutils'
-require 'json'
 
 CurrentDir = File.dirname(__FILE__)
 $LOAD_PATH.unshift(File.join(CurrentDir, '..', 'lib'))
-require 'entity_decl'
-require 'code_generator'
-require 'coin_test_gen'
-
-$flag_comment = " // TODO remove if the blockchain already exists, or just remove this comment if not"
-
-# Transforms a coin name to a C++ name
-def self.format_name(coin)
-    formatted = coin['name']
-    formatted = formatted.gsub(/-/, ' ')
-    formatted = formatted.gsub(/\./, ' ')
-    formatted = formatted.gsub(/\s/, '')
-    formatted
-end
-
-def self.format_name_lowercase(coin)
-  format_name(coin).downcase
-end
-
-def self.format_name_uppercase(coin)
-  format_name(coin).upcase
-end
-
-def self.generate_file(templateFile, folder, fileName, coin)
-    @coin = coin
-    name = format_name(coin)
-    path = File.expand_path(templateFile, File.join(File.dirname(__FILE__), '..', 'lib', 'templates'))
-    template = ERB.new(File.read(path), nil, '-')
-    result = template.result(binding)
-
-    FileUtils.mkdir_p folder
-    path = File.join(folder, fileName)
-    File.write(path, result)
-    puts "Generated file " + path
-end
-
-def self.insert_coin_type(coin)
-    target_file = "include/TrustWalletCore/TWCoinType.h"
-    target_line = "    TWCoinType#{format_name(coin)} = #{coin['coinId']},\n"
-    if insert_target_line(target_file, target_line, "};\n")
-        insert_blockchain_type(coin)
-    end
-end
-
-def insert_blockchain_type(coin)
-    target_file = "include/TrustWalletCore/TWBlockchain.h"
-    line_number = File.readlines(target_file).count + 2 # add offset because of removed blockchain enum type
-    target_line = "    TWBlockchain#{coin['blockchain']} = #{line_number - 17}, " + $flag_comment + "\n"
-    insert_target_line(target_file, target_line, "};\n")
-end
-
-def insert_coin_entry(coin)
-    target_file = "src/Coin.cpp"
-    entryName = coin['blockchain']
-    target_line = "#include \"#{entryName}/Entry.h\"" + $flag_comment + "\n"
-    insert_target_line(target_file, target_line, "// end_of_coin_includes_marker_do_not_modify\n")
-    target_line = "#{entryName}::Entry #{entryName}DP;" + $flag_comment + "\n"
-    insert_target_line(target_file, target_line, "// end_of_coin_dipatcher_declarations_marker_do_not_modify\n")
-    target_line = "        case TWBlockchain#{entryName}: entry = &#{entryName}DP; break;" + $flag_comment + "\n"
-    insert_target_line(target_file, target_line, "        // end_of_coin_dipatcher_switch_marker_do_not_modify\n")
-end
-
-def self.insert_target_line(target_file, target_line, original_line)
-    lines = File.readlines(target_file)
-    index = lines.index(target_line)
-    if !index.nil?
-        puts "Line is already present, file: #{target_file}  line: #{target_line}"
-        return true
-    end
-    index = lines.index(original_line)
-    if index.nil?
-        puts "WARNING: Could not find line! file: #{target_file}  line: #{original_line}"
-        return false
-    end
-    lines.insert(index, target_line)
-    File.open(target_file, "w+") do |f|
-        f.puts(lines)
-    end
-    puts "Updated file: #{target_file}  new line: #{target_line}"
-    return true
-end
+require 'coin_skeleton_gen'
 
 command_line_args = ARGV
 if command_line_args.length < 1
@@ -99,49 +17,5 @@ if command_line_args.length < 1
 end
 
 coin_id = command_line_args[0]
-puts "New coin template for coin '#{coin_id}' requested"
-
-json_string = File.read('registry.json')
-coins = JSON.parse(json_string).sort_by { |x| x['name'] }
-
-entity = EntityDecl.new(name: "New" + coin_id, is_struct: false, comment: '')
-file = "new"+ coin_id
-
-generator = CodeGenerator.new(entities: [entity], files: [file], output_folder: ".")
-
-@coins = coins
-
-coin_test_gen = CoinTestGen.new()
-
-# Find coin in list of coins, by Id
-coinSelect = coins.select {|c| c['id'] == coin_id}
-if coinSelect.length() == 0
-    puts "Error: coin #{coin_id} not found!"
-    return
-end
-coin = coinSelect.first
-name = format_name(coin)
-
-
-insert_coin_type(coin)
-insert_coin_entry(coin)
-
-generate_file("newcoin/Address.h.erb", "src/#{name}", "Address.h", coin)
-generate_file("newcoin/Address.cpp.erb", "src/#{name}", "Address.cpp", coin)
-generate_file("newcoin/Entry.h.erb", "src/#{name}", "Entry.h", coin)
-generate_file("newcoin/Entry.cpp.erb", "src/#{name}", "Entry.cpp", coin)
-generate_file("newcoin/Proto.erb", "src/proto", "#{name}.proto", coin)
-generate_file("newcoin/Signer.h.erb", "src/#{name}", "Signer.h", coin)
-generate_file("newcoin/Signer.cpp.erb", "src/#{name}", "Signer.cpp", coin)
-
-generate_file("newcoin/AddressTests.cpp.erb", "tests/#{name}", "AddressTests.cpp", coin)
-generate_file("newcoin/SignerTests.cpp.erb", "tests/#{name}", "SignerTests.cpp", coin)
-generate_file("newcoin/TWAddressTests.cpp.erb", "tests/#{name}", "TWAnyAddressTests.cpp", coin)
-generate_file("newcoin/TWSignerTests.cpp.erb", "tests/#{name}", "TWAnySignerTests.cpp", coin)
-generate_file("newcoin/AddressTests.kt.erb", "android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/#{format_name_lowercase(coin)}", "Test#{name}Address.kt", coin)
-generate_file("newcoin/SignerTests.kt.erb", "android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/#{format_name_lowercase(coin)}", "Test#{name}Signer.kt", coin)
-generate_file("newcoin/Tests.swift.erb", "swift/Tests/Blockchains", "#{name}Tests.swift", coin)
-
-coin_test_gen.generate_coin_test_file(coin, 'TWCoinTypeTests.cpp.erb', true)
 
-puts "please tools/generate-files to generate Swift/Java/Protobuf files"
+generate_skeleton(coin_id, "full")
diff --git a/codegen/bin/newcoin-mobile-tests b/codegen/bin/newcoin-mobile-tests
new file mode 100755
index 00000000000..d6ea29a84c9
--- /dev/null
+++ b/codegen/bin/newcoin-mobile-tests
@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+
+# Sript for creating new skeleton files for new coin mobile tests. See also `newcoin` or `newevmchain`.
+# It is considered to be used by codegen-v2 tool until Swift and Android tests generating supported.
+# 1. Add relevant entry to registry.json (in order to minimize merge conflict, don't add at the very end)
+# 2. Invoke this script with the id of the coin, e.g.: codegen/bin/newcoin-mobile-tests ethereum
+
+require 'fileutils'
+
+CurrentDir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.join(CurrentDir, '..', 'lib'))
+require 'coin_skeleton_gen'
+
+command_line_args = ARGV
+if command_line_args.length < 1
+    puts "Usage: newcoin-mobile-tests <new_coin_id>"
+    return
+end
+
+coin_id = command_line_args[0]
+
+generate_skeleton(coin_id, "mobile-tests")
diff --git a/codegen/bin/newevmchain b/codegen/bin/newevmchain
new file mode 100755
index 00000000000..e5fed2a97fb
--- /dev/null
+++ b/codegen/bin/newevmchain
@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+
+# Sript for creating new skeleton files for a new EVM chain, subset of newcoin
+# 1. Add relevant entry to registry.json (in order to minimize merge conflict, don't add at the very end)
+# 2. Invoke this script with the id of the coin, e.g.: codegen/bin/newevmchain ethereumclone
+
+require 'fileutils'
+
+CurrentDir = File.dirname(__FILE__)
+$LOAD_PATH.unshift(File.join(CurrentDir, '..', 'lib'))
+require 'coin_skeleton_gen'
+
+command_line_args = ARGV
+if command_line_args.length < 1
+    puts "Usage: newevmchain <new_coin_id>"
+    return
+end
+
+coin_id = command_line_args[0]
+
+generate_skeleton(coin_id, "evm")
diff --git a/codegen/lib/code_generator.rb b/codegen/lib/code_generator.rb
index 7896c2f8dca..d1fcf3881af 100644
--- a/codegen/lib/code_generator.rb
+++ b/codegen/lib/code_generator.rb
@@ -7,6 +7,8 @@
 require 'swift_helper'
 require 'wasm_cpp_helper'
 require 'ts_helper'
+require 'kotlin_helper'
+require 'kotlin_jni_helper'
 
 # Code generation
 class CodeGenerator
@@ -47,7 +49,7 @@ def render_swift_enum_template(file:, header:, template:, output_subfolder:, ext
   end
 
   # Renders a template
-  def render_template(header:, template:, output_subfolder:, extension:)
+  def render_template(header:, template:, output_subfolder:, extension:, file_prefix: "")
     FileUtils.mkdir_p File.join(output_folder, output_subfolder)
     @entities.zip(files) do |entity, file|
       # Make current entity available to templates
@@ -63,7 +65,7 @@ def render_template(header:, template:, output_subfolder:, extension:)
           code << "\n" unless header.nil?
           code << string
 
-          path = File.expand_path(File.join(output_folder, output_subfolder, "#{file}.#{extension}"))
+          path = File.expand_path(File.join(output_folder, output_subfolder, "#{file_prefix}#{file}.#{extension}"))
           File.write(path, code)
         end
       end
@@ -83,11 +85,11 @@ def render_java
   end
 
   def render_jni_h
-    render_template(header: 'copyright_header.erb', template: 'jni_h.erb', output_subfolder: 'jni/cpp/generated', extension: 'h')
+    render_template(header: 'copyright_header.erb', template: 'jni_h.erb', output_subfolder: 'jni/android/generated', extension: 'h')
   end
 
   def render_jni_c
-    render_template(header: 'copyright_header.erb', template: 'jni_c.erb', output_subfolder: 'jni/cpp/generated', extension: 'c')
+    render_template(header: 'copyright_header.erb', template: 'jni_c.erb', output_subfolder: 'jni/android/generated', extension: 'c')
   end
 
   def render_wasm_h
@@ -103,10 +105,38 @@ def render_ts_declaration
     TsHelper.combine_declaration_files()
   end
 
+  def render_kotlin_common
+    render_template(header: nil, template: 'kotlin_common.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/commonMain/generated/com/trustwallet/core', extension: 'kt')
+  end
+
+  def render_kotlin_android
+    render_template(header: nil, template: 'kotlin_android.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/generated/com/trustwallet/core', extension: 'kt')
+  end
+
+  def render_kotlin_ios
+    render_template(header: nil, template: 'kotlin_ios.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/iosMain/generated/com/trustwallet/core', extension: 'kt')
+  end
+
+  def render_kotlin_js
+    render_template(header: nil, template: 'kotlin_js.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/jsMain/generated/com/trustwallet/core', extension: 'kt')
+  end
+
+  def render_kotlin_js_accessors
+    render_template(header: nil, template: 'kotlin_js_accessors.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/jsMain/generated/com/trustwallet/core', extension: 'kt', file_prefix: "Js")
+  end
+
+  def render_kotlin_jni_h
+    render_template(header: 'copyright_header.erb', template: 'kotlin_jni_h.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated', extension: 'h')
+  end
+
+  def render_kotlin_jni_c
+    render_template(header: 'copyright_header.erb', template: 'kotlin_jni_c.erb', output_subfolder: 'kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/cpp/generated', extension: 'c')
+  end
+
   def render(file, locals = {})
     @locals = locals
     path = File.expand_path(file, File.join(File.dirname(__FILE__), 'templates'))
-    template = ERB.new(File.read(path), nil, '-')
+    template = ERB.new(File.read(path), trim_mode: '-')
     template.result(binding)
   end
 
diff --git a/codegen/lib/coin_skeleton_gen.rb b/codegen/lib/coin_skeleton_gen.rb
new file mode 100755
index 00000000000..feec8fef8e6
--- /dev/null
+++ b/codegen/lib/coin_skeleton_gen.rb
@@ -0,0 +1,140 @@
+# frozen_string_literal: true
+
+require 'erb'
+require 'fileutils'
+require 'json'
+
+require 'entity_decl'
+require 'code_generator'
+require 'coin_test_gen'
+require 'file_editor'
+
+# Coin template generation
+
+$flag_comment = " // TODO remove if the blockchain already exists, or just remove this comment if not"
+
+# Transforms a coin name to a C++ name
+def self.format_name(coin)
+    formatted = coin['name']
+    formatted = formatted.gsub(/-/, ' ')
+    formatted = formatted.gsub(/\./, ' ')
+    formatted = formatted.gsub(/\s/, '')
+    formatted
+end
+
+def self.format_name_lowercase(coin)
+format_name(coin).downcase
+end
+
+def self.format_name_uppercase(coin)
+format_name(coin).upcase
+end
+
+def self.generate_file(templateFile, folder, fileName, coin)
+    @coin = coin
+    name = format_name(coin)
+    path = File.expand_path(templateFile, File.join(File.dirname(__FILE__), '..', 'lib', 'templates'))
+    template = ERB.new(File.read(path), nil, '-')
+    result = template.result(binding)
+
+    FileUtils.mkdir_p folder
+    path = File.join(folder, fileName)
+    File.write(path, result)
+    puts "Generated file " + path
+end
+
+def self.insert_coin_type(coin, mode)
+    target_file = "include/TrustWalletCore/TWCoinType.h"
+    target_line = "    TWCoinType#{format_name(coin)} = #{coin['coinId']},\n"
+    if insert_target_line(target_file, target_line, "};\n")
+        if (mode != "evm")
+            insert_blockchain_type(coin)
+        end
+    end
+end
+
+def insert_blockchain_type(coin)
+    target_file = "include/TrustWalletCore/TWBlockchain.h"
+    line_number = File.readlines(target_file).count + 2 # add offset because of removed blockchain enum type
+    target_line = "    TWBlockchain#{coin['blockchain']} = #{line_number - 17}, " + $flag_comment + "\n"
+    insert_target_line(target_file, target_line, "};\n")
+end
+
+def insert_coin_entry(coin)
+    target_file = "src/Coin.cpp"
+    entryName = coin['blockchain']
+    target_line = "#include \"#{entryName}/Entry.h\"" + $flag_comment + "\n"
+    insert_target_line(target_file, target_line, "// end_of_coin_includes_marker_do_not_modify\n")
+    target_line = "#{entryName}::Entry #{entryName}DP;" + $flag_comment + "\n"
+    insert_target_line(target_file, target_line, "// end_of_coin_dipatcher_declarations_marker_do_not_modify\n")
+    target_line = "        case TWBlockchain#{entryName}: entry = &#{entryName}DP; break;" + $flag_comment + "\n"
+    insert_target_line(target_file, target_line, "        // end_of_coin_dipatcher_switch_marker_do_not_modify\n")
+end
+
+def generate_blockchain_files(coin)
+    name = format_name(coin)
+
+    generate_file("newcoin/Address.h.erb", "src/#{name}", "Address.h", coin)
+    generate_file("newcoin/Address.cpp.erb", "src/#{name}", "Address.cpp", coin)
+    generate_file("newcoin/Entry.h.erb", "src/#{name}", "Entry.h", coin)
+    generate_file("newcoin/Entry.cpp.erb", "src/#{name}", "Entry.cpp", coin)
+    generate_file("newcoin/Proto.erb", "src/proto", "#{name}.proto", coin)
+    generate_file("newcoin/Signer.h.erb", "src/#{name}", "Signer.h", coin)
+    generate_file("newcoin/Signer.cpp.erb", "src/#{name}", "Signer.cpp", coin)
+
+    generate_file("newcoin/AddressTests.cpp.erb", "tests/chains/#{name}", "AddressTests.cpp", coin)
+    generate_file("newcoin/SignerTests.cpp.erb", "tests/chains/#{name}", "SignerTests.cpp", coin)
+    generate_file("newcoin/TransactionCompilerTests.cpp.erb", "tests/chains/#{name}", "TransactionCompilerTests.cpp", coin)
+    generate_file("newcoin/TWAddressTests.cpp.erb", "tests/chains/#{name}", "TWAnyAddressTests.cpp", coin)
+    generate_file("newcoin/TWSignerTests.cpp.erb", "tests/chains/#{name}", "TWAnySignerTests.cpp", coin)
+end
+
+def generate_mobile_tests(coin)
+    name = format_name(coin)
+
+    generate_file("newcoin/AddressTests.kt.erb", "android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/#{format_name_lowercase(coin)}", "Test#{name}Address.kt", coin)
+    generate_file("newcoin/SignerTests.kt.erb", "android/app/src/androidTest/java/com/trustwallet/core/app/blockchains/#{format_name_lowercase(coin)}", "Test#{name}Signer.kt", coin)
+    generate_file("newcoin/Tests.swift.erb", "swift/Tests/Blockchains", "#{name}Tests.swift", coin)
+end
+
+def generate_coin_type_tests(coin)
+    coin_test_gen = CoinTestGen.new()
+    coin_test_gen.generate_coin_test_file(coin, 'TWCoinTypeTests.cpp.erb', true)
+end
+
+def generate_skeleton(coin_id, mode)
+    puts "New coin template for coin '#{coin_id}' #{mode} requested"
+
+    json_string = File.read('registry.json')
+    coins = JSON.parse(json_string).sort_by { |x| x['name'] }
+
+    entity = EntityDecl.new(name: "New" + coin_id, is_struct: false, comment: '')
+    file = "new"+ coin_id
+
+    generator = CodeGenerator.new(entities: [entity], files: [file], output_folder: ".")
+
+    @coins = coins
+
+    # Find coin in list of coins, by Id
+    coinSelect = coins.select {|c| c['id'] == coin_id}
+    if coinSelect.length() == 0
+        puts "Error: coin #{coin_id} not found!"
+        return
+    end
+    coin = coinSelect.first
+
+    if (mode == "full")
+        insert_coin_type(coin, mode)
+        insert_coin_entry(coin)
+        generate_blockchain_files(coin)
+        generate_mobile_tests(coin)
+        generate_coin_type_tests(coin)
+    elsif (mode == "evm")
+        insert_coin_type(coin, mode)
+        generate_coin_type_tests(coin)
+    elsif (mode == "mobile-tests")
+        generate_mobile_tests(coin)
+    end
+
+    puts "please tools/generate-files to generate Swift/Java/Protobuf files"
+end
diff --git a/codegen/lib/coin_test_gen.rb b/codegen/lib/coin_test_gen.rb
index e4d7d845fce..0b831bfb277 100755
--- a/codegen/lib/coin_test_gen.rb
+++ b/codegen/lib/coin_test_gen.rb
@@ -63,7 +63,7 @@ def generate_coin_test_file(coin, templateFile, overwriteExisting = true)
     template = ERB.new(File.read(path), nil, '-')
     result = template.result(binding)
 
-    folder = 'tests/'
+    folder = 'tests/chains/'
     if coin.key?('testFolderName')
       folder += format_name(coin['testFolderName'])
     else
diff --git a/codegen/lib/derivation.rb b/codegen/lib/derivation.rb
new file mode 100644
index 00000000000..1b9b8233e78
--- /dev/null
+++ b/codegen/lib/derivation.rb
@@ -0,0 +1,76 @@
+# frozen_string_literal: true
+
+require 'file_editor'
+
+$derivation_file = "include/TrustWalletCore/TWDerivation.h"
+$derivation_file_rust = "rust/tw_coin_registry/src/tw_derivation.rs"
+
+# Returns a derivation name if specified.
+def derivation_name(deriv)
+  return "" if deriv['name'].nil?
+  deriv['name'].downcase
+end
+
+# Returns a string of `<Coin><Derivation>` if derivation's name is specified, otherwise returns `Default`.
+def derivation_enum_name_no_prefix(deriv, coin)
+  return "Default" if deriv['name'].nil?
+  format_name(coin['name']) + camel_case(deriv['name'])
+end
+
+# Returns a string of `TWDerivation<Coin><Derivation>` if derivation's name is specified, otherwise returns `TWDerivationDefault`.
+def derivation_enum_name(deriv, coin)
+  return "TWDerivation" + derivation_enum_name_no_prefix(deriv, coin)
+end
+
+# Returns a derivation path.
+def derivation_path(coin)
+  coin['derivation'][0]['path']
+end
+
+# Get the last `TWDerivation` enum variant ID.
+def get_last_derivation(file_path)
+  last_derivation_id = nil
+
+  File.open(file_path, "r") do |file|
+    file.each_line do |line|
+      # Match lines that define a TWDerivation enum value
+      if line =~ /TWDerivation\w+\s*=\s*(\d+),/
+        last_derivation_id = $1.to_i
+      end
+    end
+  end
+
+  last_derivation_id
+end
+
+# Returns whether the TWDerivation enum contains the given `derivation` variant.
+def find_derivation(file_path, derivation)
+  File.open(file_path, "r") do |file|
+    file.each_line do |line|
+      return true if line.include?(derivation)
+    end
+  end
+  return false
+end
+
+# Insert a new `TWDerivation<X> = N,` to the end of the enum.
+def insert_derivation(file_path, derivation, derivation_id)
+  target_line = "    #{derivation} = #{derivation_id},"
+  insert_target_line(file_path, target_line, "    // end_of_derivation_enum - USED TO GENERATE CODE\n")
+end
+
+# Update TWDerivation enum variants if new derivation appeared.
+def update_derivation_enum(coins)
+  coins.each do |coin|
+    coin['derivation'].each_with_index do |deriv, index|
+      deriv_name = derivation_enum_name(deriv, coin)
+      if !find_derivation($derivation_file, deriv_name)
+        new_derivation_id = get_last_derivation($derivation_file) + 1
+        insert_derivation($derivation_file, deriv_name, new_derivation_id)
+
+        rust_deriv_name = derivation_enum_name_no_prefix(deriv, coin)
+        insert_derivation($derivation_file_rust, rust_deriv_name, new_derivation_id)
+      end
+    end
+  end
+end
diff --git a/codegen/lib/file_editor.rb b/codegen/lib/file_editor.rb
new file mode 100644
index 00000000000..15e60726d67
--- /dev/null
+++ b/codegen/lib/file_editor.rb
@@ -0,0 +1,19 @@
+def insert_target_line(target_file, target_line, original_line)
+  lines = File.readlines(target_file)
+  index = lines.index(target_line)
+  if !index.nil?
+      puts "Line is already present, file: #{target_file}  line: #{target_line}"
+      return true
+  end
+  index = lines.index(original_line)
+  if index.nil?
+      puts "WARNING: Could not find line! file: #{target_file}  line: #{original_line}"
+      return false
+  end
+  lines.insert(index, target_line)
+  File.open(target_file, "w+") do |f|
+      f.puts(lines)
+  end
+  puts "Updated file: #{target_file}  new line: #{target_line}"
+  return true
+end
diff --git a/codegen/lib/kotlin_helper.rb b/codegen/lib/kotlin_helper.rb
new file mode 100644
index 00000000000..b37537b4fa4
--- /dev/null
+++ b/codegen/lib/kotlin_helper.rb
@@ -0,0 +1,252 @@
+# frozen_string_literal: true
+
+module KotlinHelper
+  # Transforms an interface name to a Java method name
+  def self.format_name(name)
+    return 'equals' if name == 'Equal'
+
+    result = name
+    match = /^([A-Z]+)/.match(name)
+    result = name.sub(match[1], match[1].downcase) unless match.nil?
+
+    result.sub(/_/, '')
+  end
+
+  def self.parameters(params)
+    names = params.map do |param|
+      name = fix_name(param.name)
+      "#{name}: #{type(param.type)}"
+    end
+    names.join(', ')
+  end
+
+  def self.js_parameters(params)
+    names = params.map do |param|
+      name = fix_name(param.name)
+      "#{name}: #{js_type(param.type)}"
+    end
+    names.join(', ')
+  end
+
+  def self.calling_parameters_ios(params)
+    names = params.map do |param|
+      name = fix_name(param.name)
+        "#{name}#{convert_calling_type_ios(param.type)}"
+    end
+    names.join(', ')
+  end
+
+  def self.calling_parameters_android(params)
+    names = params.map do |param|
+      fix_name(param.name)
+    end
+    names.join(', ')
+  end
+
+  def self.calling_parameters_js(params)
+    names = params.map do |param|
+      name = fix_name(param.name)
+        "#{name}#{convert_calling_type_js(param.type)}"
+    end
+    names.join(', ')
+  end
+
+  def self.fix_name(name)
+    case name
+    when ''
+      "value"
+    when 'val'
+      "value"
+    when 'return'
+      '`return`'
+    else
+      name
+    end
+  end
+
+  def self.convert_calling_type_ios(t)
+    case t.name
+    when :data
+      "#{if t.is_nullable then '?' else '' end}.toTwData()"
+    when :string
+      "#{if t.is_nullable then '?' else '' end}.toTwString()"
+    else
+      if t.is_enum
+        "#{if t.is_nullable then '?' else '' end}.nativeValue"
+      elsif t.is_class
+        "#{if t.is_nullable then '?' else '' end}.pointer"
+      else
+        ''
+      end
+    end
+  end
+
+  def self.convert_calling_type_js(t)
+    case t.name
+    when :data
+      "#{if t.is_nullable then '?' else '' end}.asUInt8Array()"
+    when :uint8
+      ".toByte()"
+    when :uint16
+      ".toShort()"
+    when :uint32
+      ".toInt()"
+    when :uint64
+      ".toInt()"
+    when :int64
+      ".toInt()"
+    when :size
+      ".toInt()"
+    else
+      if t.is_enum
+        "#{if t.is_nullable then '?' else '' end}.jsValue"
+      elsif t.is_class
+        "#{if t.is_nullable then '?' else '' end}.jsValue"
+      else
+        ''
+      end
+    end
+  end
+
+  def self.convert_calling_return_type_ios(t, expression = '')
+    case t.name
+    when :data
+      "#{expression}.readTwBytes()#{if t.is_nullable then '' else '!!' end}"
+    when :string
+      "#{expression}.fromTwString()#{if t.is_nullable then '' else '!!' end}"
+    else
+      if t.is_enum
+        "#{t.name}.fromValue(#{expression})#{if t.is_nullable then '' else '!!' end}"
+      elsif t.is_class
+        if t.is_nullable
+          "#{expression}?.let { #{t.name}(it) }"
+        else
+          "#{t.name}(#{expression}!!)"
+        end
+      else
+        expression
+      end
+    end
+  end
+
+  def self.convert_calling_return_type_js(t, expression = '')
+    nullable = "#{if t.is_nullable then '?' else '' end}"
+    case t.name
+    when :void
+      expression
+    when :data
+      "#{expression}#{nullable}.asByteArray()"
+    when :int
+      "#{expression}.toInt()"
+    when :uint8
+      "#{expression}.toByte().toUByte()"
+    when :uint16
+      "#{expression}.toShort().toUShort()"
+    when :uint32
+      "#{expression}.toInt().toUInt()"
+    when :uint64
+      "#{expression}.toLong().toULong()"
+    when :int8
+      "#{expression}.toByte()"
+    when :int16
+      "#{expression}.toShort()"
+    when :int32
+      "#{expression}.toInt()"
+    when :int64
+      "#{expression}.toLong()"
+    when :size
+      "#{expression}.toLong().toULong()"
+    else
+      if t.is_enum
+        "#{t.name}.fromValue(#{expression})"
+      elsif t.is_class
+        if t.is_nullable
+          "#{expression}?.let { #{t.name}(it) }"
+        else
+          "#{t.name}(#{expression})"
+        end
+      else
+        expression
+      end
+    end
+  end
+
+  def self.arguments(params)
+    params.map do |param|
+      param.name || 'value'
+    end.join(', ')
+  end
+
+  def self.type(t)
+    nullable = "#{if t.is_nullable then '?' else '' end}"
+    case t.name
+    when :void
+      ""
+    when :bool
+      "Boolean#{nullable}"
+    when :int
+      "Int#{nullable}"
+    when :uint8
+      "UByte#{nullable}"
+    when :uint16
+      "UShort#{nullable}"
+    when :uint32
+      "UInt#{nullable}"
+    when :uint64
+      "ULong#{nullable}"
+    when :int8
+      "Byte#{nullable}"
+    when :int16
+      "Short#{nullable}"
+    when :int32
+      "Int#{nullable}"
+    when :int64
+      "Long#{nullable}"
+    when :size
+      "ULong#{nullable}"
+    when :data
+      "ByteArray#{nullable}"
+    when :string
+      "String#{nullable}"
+    else
+      "#{t.name}#{nullable}"
+    end
+  end
+
+  def self.return_type(t)
+    case t.name
+    when :void
+      ""
+    else
+      ": #{type(t)}"
+    end
+  end
+
+  def self.js_type(t)
+    nullable = "#{if t.is_nullable then '?' else '' end}"
+    case t.name
+    when :void
+      ""
+    when :bool
+      "Boolean#{nullable}"
+    when :int, :uint8, :int8, :uint16, :int16, :uint32, :int32, :uint64, :int64, :size
+      "Number#{nullable}"
+    when :data
+      "UInt8Array#{nullable}"
+    when :string
+      "String#{nullable}"
+    else
+      "Js#{t.name}#{nullable}"
+    end
+  end
+
+  def self.js_return_type(t)
+    case t.name
+    when :void
+      ""
+    else
+      ": #{js_type(t)}"
+    end
+  end
+
+end
diff --git a/codegen/lib/kotlin_jni_helper.rb b/codegen/lib/kotlin_jni_helper.rb
new file mode 100644
index 00000000000..b1303a6d69e
--- /dev/null
+++ b/codegen/lib/kotlin_jni_helper.rb
@@ -0,0 +1,113 @@
+# frozen_string_literal: true
+
+module KotlinJniHelper
+  # Transforms an interface name to a JNI method name
+  def self.format_name(name)
+    return 'equals' if name == 'Equal'
+
+    result = name
+    match = /^([A-Z]+)/.match(name)
+    result = name.sub(match[1], match[1].downcase) unless match.nil?
+
+    result.sub(/_/, '')
+  end
+
+  # Transforms a method/property name to a JNI function name
+  def self.function_name(entity:, function:, native_prefix: false)
+    "Java_com_trustwallet_core_#{entity.name}_#{format_name(function.name)}"
+  end
+
+  # Transforms a proto name name to a JNI class name
+  def self.proto_to_class(name)
+    parts = name.split('_')
+    return nil if parts.count < 3 || parts[0] != 'TW'
+
+    if parts.count == 3
+      "wallet/core/jni/proto/Common$#{parts.last}"
+    else
+      "wallet/core/jni/proto/#{parts[1]}$#{parts[3]}"
+    end
+  end
+
+  def self.parameters(params)
+    names = params.map do |param|
+      ", #{type(param.type)} #{param.name || 'value'}"
+    end
+    names.join('')
+  end
+
+  def self.arguments(params)
+    params.map do |param|
+      if param.type.is_class
+        (param.name || 'value') + 'Instance'
+      elsif param.type.is_struct
+        '*' + (param.name || 'value') + 'Instance'
+      elsif param.type.name == :data
+        (param.name || 'value') + 'Data'
+      elsif param.type.name == :string
+        (param.name || 'value') + 'String'
+      elsif param.type.is_enum
+        (param.name || 'value') + 'Value'
+      elsif param.type.is_proto
+        (param.name || 'value') + 'Data'
+      else
+        param.name || 'value'
+      end
+    end
+  end
+
+  def self.type(t)
+    case t.name
+    when :void
+      'void'
+    when :bool
+      'jboolean'
+    when :int
+      'jint'
+    when :uint8
+      'jchar'
+    when :uint16
+      'jshort'
+    when :uint32
+      'jint'
+    when :uint64
+      'jlong'
+    when :int8
+      'jbyte'
+    when :int16
+      'jshort'
+    when :int32
+      'jint'
+    when :int64
+      'jlong'
+    when :size
+      'jsize'
+    when :data
+      'jbyteArray'
+    when 'Data'
+      'jbyteArray'
+    when :string
+      'jstring'
+    else
+      if t.is_class || t.is_struct
+        'jobject'
+      elsif t.is_enum
+        'jobject'
+      elsif t.is_proto
+        'jobject'
+      else
+        raise "Invalid type #{t.name}"
+      end
+    end
+  end
+
+  def self.compareMethod(entity)
+    FunctionDecl.new(
+      name: 'compareTo',
+      entity: entity,
+      is_method: true,
+      return_type: TypeDecl.new(name: :int),
+      parameters: [Parameter.new(name: 'thisObject', type: entity.type), Parameter.new(name: 'other', type: entity.type)],
+      static: false)
+  end
+end
diff --git a/codegen/lib/templates/CoinInfoData.cpp.erb b/codegen/lib/templates/CoinInfoData.cpp.erb
index 44dd8acd044..d2bbb5d6b71 100644
--- a/codegen/lib/templates/CoinInfoData.cpp.erb
+++ b/codegen/lib/templates/CoinInfoData.cpp.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 // This is a GENERATED FILE, changes made here WILL BE LOST.
 //
@@ -36,6 +34,7 @@ static const CoinInfo defaultsForMissing = {
     "",
     "",
     0,
+    0
 };
 
 /// Get coin from map, if missing returns defaults (not to have contains-check in each accessor method)
@@ -73,6 +72,7 @@ const CoinInfo getCoinInfo(TWCoinType coin) {
                 "<%= explorer_tx_url(coin) %>",
                 "<%= explorer_account_url(coin) %>",
                 <% if coin['slip44'].nil? -%><%= coin['coinId'] %><% else -%><%= coin['slip44'] %><% end -%>,
+                <% if coin['ss58Prefix'].nil? -%>0<% else -%><%= coin['ss58Prefix'] %><% end -%>,
             };
 <% end -%>
         default:
diff --git a/codegen/lib/templates/TWCoinTypeTests.cpp.erb b/codegen/lib/templates/TWCoinTypeTests.cpp.erb
index 4c8cd77e4fc..bb8cbdadb79 100644
--- a/codegen/lib/templates/TWCoinTypeTests.cpp.erb
+++ b/codegen/lib/templates/TWCoinTypeTests.cpp.erb
@@ -1,14 +1,12 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 // This is a GENERATED FILE, changes made here MAY BE LOST.
 // Generated one-time (codegen/bin/cointests)
 //
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <TrustWalletCore/TWCoinTypeConfiguration.h>
 #include <gtest/gtest.h>
 
diff --git a/codegen/lib/templates/TWDerivation.h.erb b/codegen/lib/templates/TWDerivation.h.erb
index 06266d5cb82..e2c9a53a494 100644
--- a/codegen/lib/templates/TWDerivation.h.erb
+++ b/codegen/lib/templates/TWDerivation.h.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 // This is a GENERATED FILE from \registry.json, changes made here WILL BE LOST.
 //
@@ -20,14 +18,12 @@ enum TWDerivation {
     TWDerivationCustom = 1, // custom, for any coin
 <% enum_count += 1 -%>
 <% coins.each do |coin| -%>
-<% if coin['derivation'].count > 1 -%>
 <% coin['derivation'].each_with_index do |deriv, index| -%>
 <% if index > 0 or !deriv['name'].nil? -%>
     <%= derivation_enum_name(deriv, coin) %> = <% enum_count += 1 -%><%= enum_count %>,
 <% end -%>
 <% end -%>
 <% end -%>
-<% end -%>
 };
 
 TW_EXTERN_C_END
diff --git a/codegen/lib/templates/TWEthereumChainID.h.erb b/codegen/lib/templates/TWEthereumChainID.h.erb
index 99862693b3f..3e6385e1b77 100644
--- a/codegen/lib/templates/TWEthereumChainID.h.erb
+++ b/codegen/lib/templates/TWEthereumChainID.h.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 // This is a GENERATED FILE from \registry.json, changes made here WILL BE LOST.
 //
diff --git a/codegen/lib/templates/copyright_header.erb b/codegen/lib/templates/copyright_header.erb
index be628ee1f6e..39239c27440 100644
--- a/codegen/lib/templates/copyright_header.erb
+++ b/codegen/lib/templates/copyright_header.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 // This is a GENERATED FILE, changes made here WILL BE LOST.
 //
diff --git a/codegen/lib/templates/hrp.cpp.erb b/codegen/lib/templates/hrp.cpp.erb
index 24eede081df..c3705bd5a9f 100644
--- a/codegen/lib/templates/hrp.cpp.erb
+++ b/codegen/lib/templates/hrp.cpp.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 // This is a GENERATED FILE from \registry.json, changes made here WILL BE LOST.
 //
diff --git a/codegen/lib/templates/hrp.h.erb b/codegen/lib/templates/hrp.h.erb
index 0f4ed0432f1..4691fbafc5b 100644
--- a/codegen/lib/templates/hrp.h.erb
+++ b/codegen/lib/templates/hrp.h.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 // This is a GENERATED FILE from \registry.json, changes made here WILL BE LOST.
 //
diff --git a/codegen/lib/templates/java/class.erb b/codegen/lib/templates/java/class.erb
index 69cd027f403..fa491ff2560 100644
--- a/codegen/lib/templates/java/class.erb
+++ b/codegen/lib/templates/java/class.erb
@@ -5,9 +5,9 @@ import java.util.HashSet;
 <%  equal = entity.static_methods.detect{ |i| i.name == 'Equal' } -%>
 <%= entity.comment %>
 <%  if !less.nil? && !equal.nil? -%>
-public class <%= entity.name %> implements Comparable<<%= entity.name %>> {
+public final class <%= entity.name %> implements Comparable<<%= entity.name %>> {
 <%  else -%>
-public class <%= entity.name %> {
+public final class <%= entity.name %> {
 <%  end -%>
     private long nativeHandle;
 
diff --git a/codegen/lib/templates/java/header.erb b/codegen/lib/templates/java/header.erb
index b1b1aeabc86..3c5da1f81ed 100644
--- a/codegen/lib/templates/java/header.erb
+++ b/codegen/lib/templates/java/header.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 // This is a GENERATED FILE, changes made here WILL BE LOST.
 //
diff --git a/codegen/lib/templates/java/struct.erb b/codegen/lib/templates/java/struct.erb
index bb57cf25017..6f09dda87d2 100644
--- a/codegen/lib/templates/java/struct.erb
+++ b/codegen/lib/templates/java/struct.erb
@@ -4,9 +4,9 @@ import java.security.InvalidParameterException;
 <%  equal = entity.static_methods.detect{ |i| i.name == 'Equal' } -%>
 <%= entity.comment %>
 <%  if !less.nil? && !equal.nil? -%>
-public class <%= entity.name %> implements Comparable<<%= entity.name %>> {
+public final class <%= entity.name %> implements Comparable<<%= entity.name %>> {
 <%  else -%>
-public class <%= entity.name %> {
+public final class <%= entity.name %> {
 <%  end -%>
     private byte[] bytes;
 
diff --git a/codegen/lib/templates/jni/parameter_access.erb b/codegen/lib/templates/jni/parameter_access.erb
index 71bc2641c41..4c3ceb9f2fa 100644
--- a/codegen/lib/templates/jni/parameter_access.erb
+++ b/codegen/lib/templates/jni/parameter_access.erb
@@ -1,6 +1,6 @@
 <%
   method = locals[:method]
-  if method.static && !method.name.include?('Init')
+  if method.static && !method.name.start_with?('Init')
       parameters = method.parameters
   else
       parameters = method.parameters.drop(1)
diff --git a/codegen/lib/templates/jni/parameter_release.erb b/codegen/lib/templates/jni/parameter_release.erb
index 147e40c3496..1db6f1a86e1 100644
--- a/codegen/lib/templates/jni/parameter_release.erb
+++ b/codegen/lib/templates/jni/parameter_release.erb
@@ -1,6 +1,6 @@
 <%
   method = locals[:method]
-  if method.static && !method.name.include?('Init')
+  if method.static && !method.name.start_with?('Init')
       parameters = method.parameters
   else
       parameters = method.parameters.drop(1)
diff --git a/codegen/lib/templates/kotlin/android_class.erb b/codegen/lib/templates/kotlin/android_class.erb
new file mode 100644
index 00000000000..3091b094ca7
--- /dev/null
+++ b/codegen/lib/templates/kotlin/android_class.erb
@@ -0,0 +1,63 @@
+<%= render('kotlin/package.erb') %>
+
+<% constructors = entity.static_methods.select { |method| method.name.start_with?('Create') } -%>
+<% methods = entity.methods.select { |method| not method.name.start_with?('Delete') } -%>
+<% static_methods = entity.static_methods.select { |method| not method.name.start_with?('Create') } -%>
+actual class <%= entity.name %> private constructor(
+    private val nativeHandle: Long,
+) {
+
+    init {
+        if (nativeHandle == 0L) throw IllegalArgumentException()
+    }
+<%# Constructors -%>
+<%- constructors.each do |constructor| -%>
+
+<%  if constructor.return_type.is_nullable -%>
+    @Throws(IllegalArgumentException::class)
+<%  end -%>
+    actual constructor(<%= KotlinHelper.parameters(constructor.parameters) %>) : this(<%= KotlinHelper.format_name(constructor.name) %>(<%= KotlinHelper.calling_parameters_android(constructor.parameters) %>))
+<%  end -%>
+<%# Property declarations -%>
+<%  entity.properties.each do |property| -%>
+
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        @JvmName("<%= KotlinHelper.format_name(property.name) %>")
+        external get
+<%  end -%>
+<%# Method declarations -%>
+<%  methods.each do |method| -%>
+
+    @JvmName("<%= KotlinHelper.format_name(method.name) %>")
+    actual external fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.return_type(method.return_type) %>
+<%  end -%>
+<%  if entity.static_properties.any? || static_methods.any? || constructors.any? -%>
+
+    <%= if entity.static_properties.any? || static_methods.any? then "actual" else "private" end %> companion object {
+<%# Static property declarations -%>
+<%  entity.static_properties.each do |property| -%>
+
+        actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+            @JvmName("<%= KotlinHelper.format_name(property.name) %>")
+            external get
+<% end -%>
+<%# Static method declarations -%>
+<%  static_methods.each do |method| -%>
+
+        @JvmStatic
+        @JvmName("<%= KotlinHelper.format_name(method.name) %>")
+        actual external fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters) %>)<%= KotlinHelper.return_type(method.return_type) %>
+<%  end -%>
+
+        @JvmStatic
+        @JvmName("createFromNative")
+        private fun createFromNative(nativeHandle: Long) = <%= entity.name %>(nativeHandle)
+<%- constructors.each do |constructor| -%>
+
+        @JvmStatic
+        @JvmName("<%= KotlinHelper.format_name(constructor.name) %>")
+        private external fun <%= KotlinHelper.format_name(constructor.name) %>(<%= KotlinHelper.parameters(constructor.parameters) %>): Long
+<%- end -%>
+    }
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/android_enum.erb b/codegen/lib/templates/kotlin/android_enum.erb
new file mode 100644
index 00000000000..e00cb92f5bc
--- /dev/null
+++ b/codegen/lib/templates/kotlin/android_enum.erb
@@ -0,0 +1,44 @@
+<%= render('kotlin/package.erb') %>
+
+<%  has_string = entity.cases.all? { |c| !c.string.nil? } -%>
+actual enum class <%= entity.name %>(
+    @get:JvmName("value")
+    actual val value: UInt,
+<%  if has_string -%>
+    actual val stringValue: String,
+<%  end -%>
+) {
+<%# Cases -%>
+<%  entity.cases.each_with_index do |c, i| -%>
+<%  if has_string -%>
+    <%= c.name %>(<%= c.value %>u, <%= c.string %>),
+<%  else -%>
+    <%= c.name %>(<%= c.value %>u),
+<%  end -%>
+<%  end -%>
+    ;
+<%# Property declarations -%>
+<%- entity.properties.each do |property| -%>
+
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        @JvmName("<%= KotlinHelper.format_name(property.name) %>")
+        external get
+<%- end -%>
+<%# Method declarations -%>
+<%- entity.methods.each do |method| -%>
+<%-   next if method.name.start_with?('Delete') -%>
+
+    @JvmName("<%= KotlinHelper.format_name(method.name) %>")
+    actual external fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.return_type(method.return_type) %>
+<%- end -%>
+<%# Value -%>
+<%  if entity.cases.any? { |e| !e.value.nil? } -%>
+
+    actual companion object {
+        @JvmStatic
+        @JvmName("createFromValue")
+        actual fun fromValue(value: UInt): <%= entity.name %>? =
+            values().firstOrNull { it.value == value }
+    }
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/android_struct.erb b/codegen/lib/templates/kotlin/android_struct.erb
new file mode 100644
index 00000000000..099704dd35b
--- /dev/null
+++ b/codegen/lib/templates/kotlin/android_struct.erb
@@ -0,0 +1,19 @@
+<%= render('kotlin/package.erb') %>
+
+actual object <%= entity.name %> {
+<%# Static property declarations -%>
+<%  entity.static_properties.each do |property| -%>
+
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        @JvmName("<%= KotlinHelper.format_name(property.name) %>")
+        external get
+<% end -%>
+<%# Static method declarations -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next if method.name.start_with?('Create') -%>
+
+    @JvmStatic
+    @JvmName("<%= KotlinHelper.format_name(method.name) %>")
+    actual external fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters) %>)<%= KotlinHelper.return_type(method.return_type) %>
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/common_class.erb b/codegen/lib/templates/kotlin/common_class.erb
new file mode 100644
index 00000000000..0cd6d4a506a
--- /dev/null
+++ b/codegen/lib/templates/kotlin/common_class.erb
@@ -0,0 +1,60 @@
+<%= render('kotlin/package.erb') %>
+
+<% constructors = entity.static_methods.select { |method| method.name.start_with?('Create') } -%>
+<% methods = entity.methods.select { |method| not method.name.start_with?('Delete') } -%>
+<% static_methods = entity.static_methods.select { |method| not method.name.start_with?('Create') } -%>
+<%  if constructors.one? -%>
+<%  if constructors.first.return_type.is_nullable -%>
+expect class <%= entity.name %> @Throws(IllegalArgumentException::class) constructor(
+<%  else -%>
+expect class <%= entity.name %>(
+<%  end -%>
+<%- constructors.first.parameters.each do |parameter| -%>
+    <%= KotlinHelper.parameters([parameter]) %>,
+<%- end -%>
+) {
+<%- else -%>
+expect class <%= entity.name %> {
+<%# Constructors -%>
+<%- constructors.each do |constructor| -%>
+
+<%  if constructor.return_type.is_nullable -%>
+    @Throws(IllegalArgumentException::class)
+<%  end -%>
+    constructor(<%= KotlinHelper.parameters(constructor.parameters) %>)
+<%- end -%>
+<%  end -%>
+<%# Property declarations -%>
+<%  if entity.properties.any? -%>
+
+<%  end -%>
+<%  entity.properties.each do |property| -%>
+    val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+<%  end -%>
+<%# Method declarations -%>
+<%  if methods.any? -%>
+
+<%  end -%>
+<%  methods.each do |method| -%>
+    fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.return_type(method.return_type) %>
+<%  end -%>
+<%  if entity.static_properties.any? || static_methods.any? -%>
+
+    companion object {
+<%# Static property declarations -%>
+<%  if entity.static_properties.any? -%>
+
+<%  end -%>
+<%  entity.static_properties.each do |property| -%>
+        val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+<% end -%>
+<%# Static method declarations -%>
+<%  if static_methods.any? -%>
+
+<%  end -%>
+<%  static_methods.each do |method| -%>
+        fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters) %>)<%= KotlinHelper.return_type(method.return_type) %>
+<%  end -%>
+    }
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/common_enum.erb b/codegen/lib/templates/kotlin/common_enum.erb
new file mode 100644
index 00000000000..234df7e8d28
--- /dev/null
+++ b/codegen/lib/templates/kotlin/common_enum.erb
@@ -0,0 +1,34 @@
+<%= render('kotlin/package.erb') %>
+
+<%  has_string = entity.cases.all? { |c| !c.string.nil? } -%>
+expect enum class <%= entity.name %> {
+<%# Cases -%>
+<%  entity.cases.each_with_index do |c, i| -%>
+    <%= c.name %>,
+<%  end -%>
+    ;
+
+    val value: UInt
+<%  if has_string -%>
+    val stringValue: String
+<%  end -%>
+<%# Property declarations -%>
+<%- entity.properties.each do |property| -%>
+    val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+<%- end -%>
+<%# Method declarations -%>
+<%  if entity.methods.any? -%>
+
+<%  end -%>
+<%- entity.methods.each do |method| -%>
+<%-   next if method.name.start_with?('Delete') -%>
+    fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.return_type(method.return_type) %>
+<%- end -%>
+<%# Value -%>
+<%  if entity.cases.any? { |e| !e.value.nil? } -%>
+
+    companion object {
+        fun fromValue(value: UInt): <%= entity.name %>?
+    }
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/common_struct.erb b/codegen/lib/templates/kotlin/common_struct.erb
new file mode 100644
index 00000000000..39e085799ea
--- /dev/null
+++ b/codegen/lib/templates/kotlin/common_struct.erb
@@ -0,0 +1,13 @@
+<%= render('kotlin/package.erb') %>
+
+expect object <%= entity.name %> {
+<%# Static property declarations -%>
+<%  entity.static_properties.each do |property| -%>
+    val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+<% end -%>
+<%# Static method declarations -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next if method.name.start_with?('Create') -%>
+    fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters) %>)<%= KotlinHelper.return_type(method.return_type) %>
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/ios_class.erb b/codegen/lib/templates/kotlin/ios_class.erb
new file mode 100644
index 00000000000..36bc94e8276
--- /dev/null
+++ b/codegen/lib/templates/kotlin/ios_class.erb
@@ -0,0 +1,54 @@
+<%= render('kotlin/package.erb') %>
+
+import cnames.structs.TW<%= entity.name %>
+import kotlinx.cinterop.CPointer
+
+<% constructors = entity.static_methods.select { |method| method.name.start_with?('Create') } -%>
+<% methods = entity.methods.select { |method| not method.name.start_with?('Delete') } -%>
+<% static_methods = entity.static_methods.select { |method| not method.name.start_with?('Create') } -%>
+actual class <%= entity.name %> constructor(
+    val pointer: CPointer<TW<%= entity.name %>>,
+) {
+<%# Constructors -%>
+<%- constructors.each do |constructor| -%>
+
+<%  if constructor.return_type.is_nullable -%>
+    @Throws(IllegalArgumentException::class)
+    actual constructor(<%= KotlinHelper.parameters(constructor.parameters) %>) : this(
+        TW<%= entity.name %><%= constructor.name %>(<%= KotlinHelper.calling_parameters_ios(constructor.parameters) %>) ?: throw IllegalArgumentException()
+<%  else -%>
+    actual constructor(<%= KotlinHelper.parameters(constructor.parameters) %>) : this(
+        TW<%= entity.name %><%= constructor.name %>(<%= KotlinHelper.calling_parameters_ios(constructor.parameters) %>)!!
+<%  end -%>
+    )
+<%  end -%>
+<%# Property declarations -%>
+<%  entity.properties.each do |property| -%>
+
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        get() = <%= KotlinHelper.convert_calling_return_type_ios(property.return_type, "TW#{entity.name}#{property.name}(pointer)") %>
+<%  end -%>
+<%# Method declarations -%>
+<%  methods.each do |method| -%>
+
+    actual fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.return_type(method.return_type) %> =
+        <%= KotlinHelper.convert_calling_return_type_ios(method.return_type, "TW#{entity.name}#{method.name}(pointer#{', ' if not method.parameters.one?}#{KotlinHelper.calling_parameters_ios(method.parameters.drop(1))})") %>
+<%  end -%>
+<%  if entity.static_properties.any? || static_methods.any? -%>
+
+    actual companion object {
+<%# Static property declarations -%>
+<%  entity.static_properties.each do |property| -%>
+
+        actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+            get() = TW<%= entity.name %><%= property.name %>()<%= KotlinHelper.convert_calling_return_type_ios(property.return_type) %>
+<% end -%>
+<%# Static method declarations -%>
+<%  static_methods.each do |method| -%>
+
+        actual fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters) %>)<%= KotlinHelper.return_type(method.return_type) %> =
+            <%= KotlinHelper.convert_calling_return_type_ios(method.return_type, "TW#{entity.name}#{method.name}(#{KotlinHelper.calling_parameters_ios(method.parameters)})") %>
+<%  end -%>
+    }
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/ios_enum.erb b/codegen/lib/templates/kotlin/ios_enum.erb
new file mode 100644
index 00000000000..5f64c80a7fa
--- /dev/null
+++ b/codegen/lib/templates/kotlin/ios_enum.erb
@@ -0,0 +1,63 @@
+<%= render('kotlin/package.erb') %>
+
+<%  has_string = entity.cases.all? { |c| !c.string.nil? } -%>
+<%  if has_string -%>
+import com.trustwallet.core.<%= "TW#{entity.name}" %>.*
+
+<%  end -%>
+<%  type = ": TW#{entity.name}" -%>
+actual enum class <%= entity.name %>(
+<%  if has_string -%>
+    val nativeValue<%= type %>,
+    actual val stringValue: String,
+<%  else -%>
+    val nativeValue<%= type %>,
+<%  end -%>
+) {
+<%# Cases -%>
+<%  entity.cases.each_with_index do |c, i| -%>
+<%  if has_string -%>
+    <%= c.name %>(TW<%= entity.name %><%= c.name %>, <%= c.string %>),
+<%  else -%>
+    <%= c.name %>(TW<%= entity.name %><%= c.name %>),
+<%  end -%>
+<%  end -%>
+    ;
+
+<%  if has_string -%>
+    actual val value: UInt
+        get() = nativeValue.value
+<%  else -%>
+    actual val value<%= type %>
+        get() = nativeValue
+<%  end -%>
+<%# Property declarations -%>
+<%- entity.properties.each do |property| -%>
+
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        get() = <%= KotlinHelper.convert_calling_return_type_ios(property.return_type, "TW#{entity.name}#{property.name}(value)") %>
+<%- end -%>
+<%# Method declarations -%>
+<%- entity.methods.each do |method| -%>
+<%-   next if method.name.start_with?('Delete') -%>
+
+    actual fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.return_type(method.return_type) %> =
+        TW<%= entity.name %><%= method.name %>(value<%= ', ' if not method.parameters.one? %><%= KotlinHelper.calling_parameters_ios(method.parameters.drop(1)) %>)<%= KotlinHelper.convert_calling_return_type_ios(method.return_type) %>
+<%- end -%>
+<%# Value -%>
+<%  if entity.cases.any? { |e| !e.value.nil? } -%>
+
+    actual companion object {
+<%  if has_string -%>
+        actual fun fromValue(value: UInt): <%= entity.name %>? =
+            values().firstOrNull { it.value == value }
+
+        fun fromValue(value<%= type %>): <%= entity.name %> =
+            fromValue(value.value)!!
+<%  else -%>
+        actual fun fromValue(value<%= type %>): <%= entity.name %>? =
+            values().firstOrNull { it.value == value }
+<%  end -%>
+    }
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/ios_struct.erb b/codegen/lib/templates/kotlin/ios_struct.erb
new file mode 100644
index 00000000000..6bf3da876ee
--- /dev/null
+++ b/codegen/lib/templates/kotlin/ios_struct.erb
@@ -0,0 +1,16 @@
+<%= render('kotlin/package.erb') %>
+
+actual object <%= entity.name %> {
+<%# Static property declarations -%>
+<%  entity.static_properties.each do |property| -%>
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        get() = TODO()
+<% end -%>
+<%# Static method declarations -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next if method.name.start_with?('Create') -%>
+
+    actual fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters) %>)<%= KotlinHelper.return_type(method.return_type) %> =
+        <%= KotlinHelper.convert_calling_return_type_ios(method.return_type, "TW#{entity.name}#{method.name}(#{KotlinHelper.calling_parameters_ios(method.parameters)})") %>
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/js_accessors_class.erb b/codegen/lib/templates/kotlin/js_accessors_class.erb
new file mode 100644
index 00000000000..77645552c83
--- /dev/null
+++ b/codegen/lib/templates/kotlin/js_accessors_class.erb
@@ -0,0 +1,23 @@
+@file:Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+
+<%= render('kotlin/package.erb') %>
+
+@JsModule("@trustwallet/wallet-core")
+@JsName("<%= entity.name %>")
+external interface Js<%= entity.name %> {
+<%- entity.properties.each do |property| -%>
+    fun <%= KotlinHelper.fix_name(WasmCppHelper.format_name(property.name)) %>()<%= KotlinHelper.js_return_type(property.return_type) %>
+<%- end -%>
+<% entity.methods.each do |method| -%>
+<%   next if method.name == "Delete" -%>
+    fun <%= KotlinHelper.fix_name(WasmCppHelper.format_name(method.name)) %>(<%= KotlinHelper.js_parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.js_return_type(method.return_type) %>
+<% end -%>
+    companion object {
+<%  entity.static_methods.each do |method| -%>
+        fun <%= KotlinHelper.fix_name(WasmCppHelper.function_name(entity: entity, function: method)) %>(<%= KotlinHelper.js_parameters(method.parameters) %>)<%= KotlinHelper.js_return_type(method.return_type) %>
+<%  end -%>
+    }
+}
+
+inline val JsWalletCore.<%= entity.name %>: Js<%= entity.name %>.Companion
+    get() = asDynamic().<%= entity.name %>.unsafeCast<Js<%= entity.name %>.Companion>()
diff --git a/codegen/lib/templates/kotlin/js_accessors_enum.erb b/codegen/lib/templates/kotlin/js_accessors_enum.erb
new file mode 100644
index 00000000000..feaa2e82caf
--- /dev/null
+++ b/codegen/lib/templates/kotlin/js_accessors_enum.erb
@@ -0,0 +1,36 @@
+@file:Suppress("NESTED_CLASS_IN_EXTERNAL_INTERFACE")
+
+<%= render('kotlin/package.erb') %>
+
+@JsModule("@trustwallet/wallet-core")
+@JsName("<%= entity.name %>")
+external interface Js<%= entity.name %> {
+    val value: Number
+    companion object {
+<%  entity.cases.each do |c| -%>
+        val <%= KotlinHelper.fix_name(WasmCppHelper.format_name(c.name)) %>: Js<%= entity.name %>
+<%  end -%>
+    }
+}
+
+inline val JsWalletCore.<%= entity.name %>: Js<%= entity.name %>.Companion
+    get() = asDynamic().<%= entity.name %>.unsafeCast<Js<%= entity.name %>.Companion>()
+
+<%  if entity.properties.any? || entity.methods.any? -%>
+@JsModule("@trustwallet/wallet-core")
+@JsName("<%= entity.name %>Ext")
+external interface Js<%= entity.name %>Ext {
+<%# Static method declarations -%>
+<%- entity.properties.each do |property| -%>
+    fun <%= KotlinHelper.fix_name(WasmCppHelper.format_name(property.name)) %>(<%= KotlinHelper.js_parameters(property.parameters) %>)<%= KotlinHelper.js_return_type(property.return_type) %>
+<%- end -%>
+<%  entity.methods.each do |method| -%>
+<%    next if method.name.start_with?('Create') -%>
+    fun <%= KotlinHelper.fix_name(WasmCppHelper.function_name(entity: entity, function: method)) %>(<%= KotlinHelper.js_parameters(method.parameters) %>)<%= KotlinHelper.js_return_type(method.return_type) %>
+<%  end -%>
+}
+
+inline val JsWalletCore.<%= entity.name %>Ext: Js<%= entity.name %>Ext
+    get() = asDynamic().<%= entity.name %>Ext.unsafeCast<Js<%= entity.name %>Ext>()
+
+<%  end -%>
\ No newline at end of file
diff --git a/codegen/lib/templates/kotlin/js_accessors_struct.erb b/codegen/lib/templates/kotlin/js_accessors_struct.erb
new file mode 100644
index 00000000000..911024dc9ee
--- /dev/null
+++ b/codegen/lib/templates/kotlin/js_accessors_struct.erb
@@ -0,0 +1,14 @@
+<%= render('kotlin/package.erb') %>
+
+@JsModule("@trustwallet/wallet-core")
+@JsName("<%= entity.name %>")
+external interface Js<%= entity.name %> {
+<%# Static method declarations -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next if method.name.start_with?('Create') -%>
+    fun <%= KotlinHelper.fix_name(WasmCppHelper.function_name(entity: entity, function: method)) %>(<%= KotlinHelper.js_parameters(method.parameters) %>)<%= KotlinHelper.js_return_type(method.return_type) %>
+<%  end -%>
+}
+
+inline val JsWalletCore.<%= entity.name %>: Js<%= entity.name %>
+    get() = asDynamic().<%= entity.name %>.unsafeCast<Js<%= entity.name %>>()
diff --git a/codegen/lib/templates/kotlin/js_class.erb b/codegen/lib/templates/kotlin/js_class.erb
new file mode 100644
index 00000000000..14cd6ef5e40
--- /dev/null
+++ b/codegen/lib/templates/kotlin/js_class.erb
@@ -0,0 +1,48 @@
+<%= render('kotlin/package.erb') %>
+
+<% constructors = entity.static_methods.select { |method| method.name.start_with?('Create') } -%>
+<% methods = entity.methods.select { |method| not method.name.start_with?('Delete') } -%>
+<% static_methods = entity.static_methods.select { |method| not method.name.start_with?('Create') } -%>
+actual class <%= entity.name %> constructor(
+    val jsValue: Js<%= entity.name %>,
+) {
+<%# Constructors -%>
+<%- constructors.each do |constructor| -%>
+
+    actual constructor(<%= KotlinHelper.parameters(constructor.parameters) %>) :
+<%  if constructor.return_type.is_nullable -%>
+        this(WalletCore.Instance.<%= entity.name %>.<%= WasmCppHelper.function_name(entity: entity, function: constructor) %>(<%= KotlinHelper.calling_parameters_js(constructor.parameters) %>) ?: throw IllegalArgumentException())
+<%  else -%>
+        this(WalletCore.Instance.<%= entity.name %>.<%= WasmCppHelper.function_name(entity: entity, function: constructor) %>(<%= KotlinHelper.calling_parameters_js(constructor.parameters) %>))
+<%  end -%>
+<%  end -%>
+<%# Property declarations -%>
+<%  entity.properties.each do |property| -%>
+
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        get() = <%= KotlinHelper.convert_calling_return_type_js(property.return_type, "jsValue.#{WasmCppHelper.function_name(entity: entity, function: property)}()") %>
+<%  end -%>
+<%# Method declarations -%>
+<%  methods.each do |method| -%>
+
+    actual fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.return_type(method.return_type) %> =
+        <%= KotlinHelper.convert_calling_return_type_js(method.return_type, "jsValue.#{WasmCppHelper.function_name(entity: entity, function: method)}(#{KotlinHelper.calling_parameters_js(method.parameters.drop(1))})") %>
+<%  end -%>
+<%  if entity.static_properties.any? || static_methods.any? -%>
+
+    <%= if entity.static_properties.any? || static_methods.any? then "actual" else "private" end %> companion object {
+<%# Static property declarations -%>
+<%  entity.static_properties.each do |property| -%>
+
+        actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+            get() = TODO()
+<% end -%>
+<%# Static method declarations -%>
+<%  static_methods.each do |method| -%>
+
+        actual fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters) %>)<%= KotlinHelper.return_type(method.return_type) %> =
+            <%= KotlinHelper.convert_calling_return_type_js(method.return_type, "WalletCore.Instance.#{entity.name}.#{WasmCppHelper.function_name(entity: entity, function: method)}(#{KotlinHelper.calling_parameters_js(method.parameters)})") %>
+<%  end -%>
+    }
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/js_enum.erb b/codegen/lib/templates/kotlin/js_enum.erb
new file mode 100644
index 00000000000..2b910a5e7aa
--- /dev/null
+++ b/codegen/lib/templates/kotlin/js_enum.erb
@@ -0,0 +1,46 @@
+<%= render('kotlin/package.erb') %>
+
+<%  has_string = entity.cases.all? { |c| !c.string.nil? } -%>
+actual enum class <%= entity.name %>(
+    val jsValue: Js<%= entity.name %>,
+<%  if has_string -%>
+    actual val stringValue: String,
+<%  end -%>
+) {
+<%# Cases -%>
+<%  entity.cases.each_with_index do |c, i| -%>
+<%  if has_string -%>
+    <%= c.name %>(WalletCore.Instance.<%= entity.name %>.<%= KotlinHelper.fix_name(WasmCppHelper.format_name(c.name)) %>, <%= c.string %>),
+<%  else -%>
+    <%= c.name %>(WalletCore.Instance.<%= entity.name %>.<%= KotlinHelper.fix_name(WasmCppHelper.format_name(c.name)) %>),
+<%  end -%>
+<%  end -%>
+    ;
+
+    actual val value: UInt
+        get() = jsValue.value.toInt().toUInt()
+<%# Property declarations -%>
+<%- entity.properties.each do |property| -%>
+
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        get() = <%= KotlinHelper.convert_calling_return_type_js(property.return_type, "WalletCore.Instance.#{entity.name}Ext.#{WasmCppHelper.function_name(entity: entity, function: property)}(jsValue)") %>
+<%- end -%>
+<%# Method declarations -%>
+<%- entity.methods.each do |method| -%>
+<%-   next if method.name.start_with?('Delete') -%>
+
+    actual fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters.drop(1)) %>)<%= KotlinHelper.return_type(method.return_type) %> =
+        <%= KotlinHelper.convert_calling_return_type_js(method.return_type, "WalletCore.Instance.#{entity.name}Ext.#{WasmCppHelper.function_name(entity: entity, function: method)}(jsValue#{', ' if not method.parameters.one?}#{KotlinHelper.calling_parameters_js(method.parameters.drop(1))})") %>
+<%- end -%>
+<%# Value -%>
+<%  if entity.cases.any? { |e| !e.value.nil? } -%>
+
+    actual companion object {
+        actual fun fromValue(value: UInt): <%= entity.name %>? =
+            values().first { it.value == value }
+
+        fun fromValue(jsValue: Js<%= entity.name %>): <%= entity.name %> =
+            values().first { it.jsValue.value == jsValue.value }
+    }
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/js_struct.erb b/codegen/lib/templates/kotlin/js_struct.erb
new file mode 100644
index 00000000000..80fd05feb72
--- /dev/null
+++ b/codegen/lib/templates/kotlin/js_struct.erb
@@ -0,0 +1,16 @@
+<%= render('kotlin/package.erb') %>
+
+actual object <%= entity.name %> {
+<%# Static property declarations -%>
+<%  entity.static_properties.each do |property| -%>
+    actual val <%= KotlinHelper.format_name(property.name) %><%= KotlinHelper.return_type(property.return_type) %>
+        get() = TODO()
+<% end -%>
+<%# Static method declarations -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next if method.name.start_with?('Create') -%>
+
+    actual fun <%= KotlinHelper.format_name(method.name) %>(<%= KotlinHelper.parameters(method.parameters) %>)<%= KotlinHelper.return_type(method.return_type) %> =
+        <%= KotlinHelper.convert_calling_return_type_js(method.return_type, "WalletCore.Instance.#{entity.name}.#{WasmCppHelper.function_name(entity: entity, function: method)}(#{KotlinHelper.calling_parameters_js(method.parameters)})") %>
+<%  end -%>
+}
diff --git a/codegen/lib/templates/kotlin/package.erb b/codegen/lib/templates/kotlin/package.erb
new file mode 100644
index 00000000000..64142a21c30
--- /dev/null
+++ b/codegen/lib/templates/kotlin/package.erb
@@ -0,0 +1 @@
+package com.trustwallet.core
\ No newline at end of file
diff --git a/codegen/lib/templates/kotlin_android.erb b/codegen/lib/templates/kotlin_android.erb
new file mode 100644
index 00000000000..a9767e71d97
--- /dev/null
+++ b/codegen/lib/templates/kotlin_android.erb
@@ -0,0 +1,7 @@
+<%-  if entity.is_a?(EnumDecl) -%>
+<%=   render('kotlin/android_enum.erb') -%>
+<%-  elsif entity.is_struct -%>
+<%=   render('kotlin/android_struct.erb') -%>
+<%- else -%>
+<%=   render('kotlin/android_class.erb') -%>
+<%- end -%>
diff --git a/codegen/lib/templates/kotlin_common.erb b/codegen/lib/templates/kotlin_common.erb
new file mode 100644
index 00000000000..31db319babd
--- /dev/null
+++ b/codegen/lib/templates/kotlin_common.erb
@@ -0,0 +1,7 @@
+<%-  if entity.is_a?(EnumDecl) -%>
+<%=   render('kotlin/common_enum.erb') -%>
+<%-  elsif entity.is_struct -%>
+<%=   render('kotlin/common_struct.erb') -%>
+<%- else -%>
+<%=   render('kotlin/common_class.erb') -%>
+<%- end -%>
diff --git a/codegen/lib/templates/kotlin_ios.erb b/codegen/lib/templates/kotlin_ios.erb
new file mode 100644
index 00000000000..272ad2cf1df
--- /dev/null
+++ b/codegen/lib/templates/kotlin_ios.erb
@@ -0,0 +1,7 @@
+<%-  if entity.is_a?(EnumDecl) -%>
+<%=   render('kotlin/ios_enum.erb') -%>
+<%-  elsif entity.is_struct -%>
+<%=   render('kotlin/ios_struct.erb') -%>
+<%- else -%>
+<%=   render('kotlin/ios_class.erb') -%>
+<%- end -%>
diff --git a/codegen/lib/templates/kotlin_jni/class_access.erb b/codegen/lib/templates/kotlin_jni/class_access.erb
new file mode 100644
index 00000000000..a260b8cfd35
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/class_access.erb
@@ -0,0 +1,6 @@
+<% param = locals[:param] -%>
+<% name = param.name -%>
+<% type = param.type -%>
+    jclass <%= name %>Class = (*env)->GetObjectClass(env, <%= name %>);
+    jfieldID <%= name %>HandleFieldID = (*env)->GetFieldID(env, <%= name %>Class, "nativeHandle", "J");
+    struct TW<%= type.name %> *<%= name %>Instance = (struct TW<%= type.name %> *) (*env)->GetLongField(env, <%= name %>, <%= name %>HandleFieldID);
diff --git a/codegen/lib/templates/kotlin_jni/compare_to.erb b/codegen/lib/templates/kotlin_jni/compare_to.erb
new file mode 100644
index 00000000000..253a8584b6e
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/compare_to.erb
@@ -0,0 +1,22 @@
+<%  less = locals[:less] -%>
+<%  equal = locals[:equal] -%>
+<%  compareMethod = KotlinJniHelper.compareMethod(entity) -%>
+<%= render('kotlin_jni/method_prototype.erb', { method: compareMethod }) %> {
+<%= render('kotlin_jni/instance_access.erb', { entity: entity }) %>
+<%= render('kotlin_jni/parameter_access.erb', { method: compareMethod }) -%>
+<%  if entity.struct? -%>
+    jboolean equal = (jboolean) TW<%= entity.name %>Equal(*instance, *otherInstance);
+<%  else -%>
+    jboolean equal = (jboolean) TW<%= entity.name %>Equal(instance, otherInstance);
+<%  end -%>
+    if (equal) {
+        return 0;
+    }
+<%  if entity.struct? -%>
+    jboolean less = (jboolean) TW<%= entity.name %>Less(*instance, *otherInstance);
+<%  else -%>
+    jboolean less = (jboolean) TW<%= entity.name %>Less(instance, otherInstance);
+<%  end -%>
+<%= render('kotlin_jni/instance_release.erb', { entity: entity }) %>
+    return less ? -1 : 1;
+}
diff --git a/codegen/lib/templates/kotlin_jni/enum_access.erb b/codegen/lib/templates/kotlin_jni/enum_access.erb
new file mode 100644
index 00000000000..43d612c0fa0
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/enum_access.erb
@@ -0,0 +1,6 @@
+<% param = locals[:param] -%>
+<% name = param.name -%>
+<% type = param.type -%>
+    jclass <%= name %>Class = (*env)->GetObjectClass(env, <%= name %>);
+    jmethodID <%= name %>ValueMethodID = (*env)->GetMethodID(env, <%= name %>Class, "value", "()I");
+    jint <%= name %>Value = (*env)->CallIntMethod(env, <%= name %>, <%= name %>ValueMethodID);
diff --git a/codegen/lib/templates/kotlin_jni/instance_access.erb b/codegen/lib/templates/kotlin_jni/instance_access.erb
new file mode 100644
index 00000000000..5654c472858
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/instance_access.erb
@@ -0,0 +1,14 @@
+<%  entity = locals[:entity] -%>
+    jclass thisClass = (*env)->GetObjectClass(env, thisObject);
+<%  if entity.struct? -%>
+    jfieldID bytesFieldID = (*env)->GetFieldID(env, thisClass, "bytes", "[B");
+    jbyteArray bytesArray = (*env)->GetObjectField(env, thisObject, bytesFieldID);
+    jbyte* bytesBuffer = (*env)->GetByteArrayElements(env, bytesArray, NULL);
+    struct TW<%= entity.name %> *instance = (struct TW<%= entity.name %> *) bytesBuffer;
+<%  elsif entity.enum? -%>
+    jfieldID handleFieldID = (*env)->GetFieldID(env, thisClass, "value", "I");
+    enum TW<%= entity.name %> instance = (enum TW<%= entity.name %>) (*env)->GetIntField(env, thisObject, handleFieldID);
+<%  else -%>
+    jfieldID handleFieldID = (*env)->GetFieldID(env, thisClass, "nativeHandle", "J");
+    struct TW<%= entity.name %> *instance = (struct TW<%= entity.name %> *) (*env)->GetLongField(env, thisObject, handleFieldID);
+<%  end -%>
diff --git a/codegen/lib/templates/kotlin_jni/instance_release.erb b/codegen/lib/templates/kotlin_jni/instance_release.erb
new file mode 100644
index 00000000000..1231d03119b
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/instance_release.erb
@@ -0,0 +1,6 @@
+<%  entity = locals[:entity] -%>
+<%  if entity.struct? -%>
+    (*env)->ReleaseByteArrayElements(env, bytesArray, bytesBuffer, JNI_ABORT);
+    (*env)->DeleteLocalRef(env, bytesArray);
+<%  end -%>
+    (*env)->DeleteLocalRef(env, thisClass);
\ No newline at end of file
diff --git a/codegen/lib/templates/kotlin_jni/method.erb b/codegen/lib/templates/kotlin_jni/method.erb
new file mode 100644
index 00000000000..f41b05435a8
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/method.erb
@@ -0,0 +1,8 @@
+<%  method = locals[:method] -%>
+<%= render('kotlin_jni/method_prototype.erb', { method: method }) %> {
+<%  if !method.static -%>
+<%=   render('kotlin_jni/instance_access.erb', { entity: entity }) %>
+<%  end -%>
+<%= render('kotlin_jni/parameter_access.erb', { method: method }) -%>
+<%= render('kotlin_jni/method_forward.erb', { method: method }) -%>
+}
diff --git a/codegen/lib/templates/kotlin_jni/method_call.erb b/codegen/lib/templates/kotlin_jni/method_call.erb
new file mode 100644
index 00000000000..68dfee4205a
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/method_call.erb
@@ -0,0 +1,6 @@
+<%
+  method = locals[:method]
+  instance = (method.entity.struct? ? '*' : '') + 'instance'
+  arguments = locals[:arguments] || [instance] + KotlinJniHelper.arguments(method.parameters.drop(1))
+-%>
+TW<%= entity.name %><%= method.name %>(<%= arguments.join(', ') %>)
\ No newline at end of file
diff --git a/codegen/lib/templates/kotlin_jni/method_forward.erb b/codegen/lib/templates/kotlin_jni/method_forward.erb
new file mode 100644
index 00000000000..3673db58a48
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/method_forward.erb
@@ -0,0 +1,118 @@
+<%
+  method = locals[:method]
+  if method.static
+    arguments = locals[:arguments] || KotlinJniHelper.arguments(method.parameters)
+    call = render('kotlin_jni/method_call.erb', { method: method, arguments: arguments })
+  else
+    instance = (method.entity.struct? ? '*' : '') + 'instance'
+    arguments = locals[:arguments] || [instance] + KotlinJniHelper.arguments(method.parameters.drop(1))
+    call = render('kotlin_jni/method_call.erb', { method: method, arguments: arguments })
+  end
+
+  # Method returns data
+  if should_return_data(method) -%>
+    <%= KotlinJniHelper.type(method.return_type) %> result = NULL;
+    TWData *resultData = <%= call %>;
+<%  if method.return_type.is_nullable %>
+    if (resultData == NULL) {
+        goto cleanup;
+    }
+<%  end -%>
+    result = TWDataJByteArray(resultData, env);
+<%  if method.return_type.is_nullable %>
+cleanup:
+<%  end -%>
+<%= render('kotlin_jni/parameter_release.erb', { method: method }) -%>
+<%  if !method.static %>
+<%= render('kotlin_jni/instance_release.erb', { entity: entity }) %>
+<%  end -%>
+    return result;
+<%
+  # Method returns a string
+  elsif should_return_string(method) -%>
+    jstring result = NULL;
+    TWString *resultString = <%= call %>;
+<%  if method.return_type.is_nullable %>
+    if (resultString == NULL) {
+        goto cleanup;
+    }
+<%  end -%>
+    result = TWStringJString(resultString, env);
+<%  if method.return_type.is_nullable %>
+cleanup:
+<%  end -%>
+<%= render('kotlin_jni/parameter_release.erb', { method: method }) -%>
+<%  if !method.static %>
+<%= render('kotlin_jni/instance_release.erb', { entity: entity }) %>
+<%  end -%>
+    return result;
+<%
+  # Method returns proto
+  elsif method.return_type.is_proto -%>
+    jbyteArray resultData = TWDataJByteArray(<%= call %>, env);
+    jclass resultClass = (*env)->FindClass(env, "<%= KotlinJniHelper.proto_to_class(method.return_type.name) %>");
+    jmethodID parseFromMethodID = (*env)->GetStaticMethodID(env, resultClass, "parseFrom", "([B)L<%= KotlinJniHelper.proto_to_class(method.return_type.name) %>;");
+    jobject result = (*env)->CallStaticObjectMethod(env, resultClass, parseFromMethodID, resultData);
+
+    (*env)->DeleteLocalRef(env, resultClass);
+<%= render('kotlin_jni/parameter_release.erb', { method: method }) -%>
+<%  if !method.static %>
+<%= render('kotlin_jni/instance_release.erb', { entity: entity }) %>
+<%  end -%>
+
+    return result;
+<%
+  # Method returns an object
+  elsif method.return_type.is_struct || method.return_type.is_class || method.return_type.is_enum
+    if method.return_type.is_struct -%>
+    struct TW<%= method.return_type.name %> result = <%= call %>;
+<%  elsif method.return_type.is_class -%>
+    struct TW<%= method.return_type.name %> *result = <%= call %>;
+<%  elsif method.return_type.is_enum -%>
+    enum TW<%= method.return_type.name %> result = <%= call %>;
+<%  else -%>
+    TW<%= method.return_type.name %> *result = <%= call %>;
+<%  end -%>
+
+<%= render('kotlin_jni/parameter_release.erb', { method: method }) -%>
+<%  if !method.static %>
+<%= render('kotlin_jni/instance_release.erb', { entity: entity }) %>
+<%  end -%>
+
+    jclass class = (*env)->FindClass(env, "com/trustwallet/core/<%= method.return_type.name %>");
+<%  if method.return_type.is_struct -%>
+    jbyteArray resultArray = (*env)->NewByteArray(env, sizeof(struct TW<%= method.return_type.name %>));
+    (*env)->SetByteArrayRegion(env, resultArray, 0, sizeof(struct TW<%= method.return_type.name %>), (jbyte *) &result);
+    jmethodID method = (*env)->GetStaticMethodID(env, class, "createFromNative", "([B)Lcom/trustwallet/core/<%= method.return_type.name %>;");
+    return (*env)->CallStaticObjectMethod(env, class, method, resultArray);
+<%  elsif method.return_type.is_enum -%>
+    jmethodID method = (*env)->GetStaticMethodID(env, class, "createFromValue", "(I)Lcom/trustwallet/core/<%= method.return_type.name %>;");
+    return (*env)->CallStaticObjectMethod(env, class, method, (jint) result);
+<%  else -%>
+    if (result == NULL) {
+        return NULL;
+    }
+    jmethodID method = (*env)->GetStaticMethodID(env, class, "createFromNative", "(J)Lcom/trustwallet/core/<%= method.return_type.name %>;");
+    return (*env)->CallStaticObjectMethod(env, class, method, (jlong) result);
+<%  end
+
+  # Method returns void
+  elsif method.return_type.name == :void -%>
+    <%= call %>;
+
+<%= render('kotlin_jni/parameter_release.erb', { method: method }) -%>
+<%  if !method.static %>
+<%= render('kotlin_jni/instance_release.erb', { entity: entity }) %>
+<%  end
+
+  # Method returns a primitive
+  else -%>
+    <%= KotlinJniHelper.type(method.return_type) %> resultValue = (<%= KotlinJniHelper.type(method.return_type) %>) <%= call %>;
+
+<%= render('kotlin_jni/parameter_release.erb', { method: method }) -%>
+<%  if !method.static %>
+<%= render('kotlin_jni/instance_release.erb', { entity: entity }) %>
+<%  end -%>
+
+    return resultValue;
+<%end -%>
\ No newline at end of file
diff --git a/codegen/lib/templates/kotlin_jni/method_prototype.erb b/codegen/lib/templates/kotlin_jni/method_prototype.erb
new file mode 100644
index 00000000000..a971ce95bd5
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/method_prototype.erb
@@ -0,0 +1,9 @@
+<%
+  method = locals[:method]
+  if method.static
+    parameters = 'jclass thisClass' + KotlinJniHelper.parameters(method.parameters)
+  else
+    parameters = 'jobject thisObject' + KotlinJniHelper.parameters(method.parameters.drop(1))
+  end
+-%>
+<%= KotlinJniHelper.type(method.return_type) %> JNICALL <%= KotlinJniHelper.function_name(entity: entity, function: method) %>(JNIEnv *env, <%= parameters %>)<% -%>
diff --git a/codegen/lib/templates/kotlin_jni/parameter_access.erb b/codegen/lib/templates/kotlin_jni/parameter_access.erb
new file mode 100644
index 00000000000..a5dcae13aa1
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/parameter_access.erb
@@ -0,0 +1,23 @@
+<%
+  method = locals[:method]
+  if method.static && !method.name.start_with?('Init')
+      parameters = method.parameters
+  else
+      parameters = method.parameters.drop(1)
+  end
+
+  parameters.each do |param|
+    if param.type.name == :data -%>
+    TWData *<%= param.name %>Data = TWDataCreateWithJByteArray(env, <%= param.name %>);
+<%  elsif param.type.name == :string -%>
+    TWString *<%= param.name %>String = TWStringCreateWithJString(env, <%= param.name %>);
+<%  elsif param.type.is_struct -%>
+<%=     render('kotlin_jni/struct_access.erb', { param: param }) -%>
+<%  elsif param.type.is_class -%>
+<%=     render('kotlin_jni/class_access.erb', { param: param }) -%>
+<%  elsif param.type.is_enum -%>
+<%=     render('kotlin_jni/enum_access.erb', { param: param }) -%>
+<%  elsif param.type.is_proto -%>
+<%=     render('kotlin_jni/proto_access.erb', { param: param }) -%>
+<%  end -%>
+<%end -%>
diff --git a/codegen/lib/templates/kotlin_jni/parameter_release.erb b/codegen/lib/templates/kotlin_jni/parameter_release.erb
new file mode 100644
index 00000000000..1db6f1a86e1
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/parameter_release.erb
@@ -0,0 +1,26 @@
+<%
+  method = locals[:method]
+  if method.static && !method.name.start_with?('Init')
+      parameters = method.parameters
+  else
+      parameters = method.parameters.drop(1)
+  end
+
+  parameters.each do |param|
+    if param.type.name == :data -%>
+    TWDataDelete(<%= param.name %>Data);
+<%  elsif param.type.name == :string -%>
+    TWStringDelete(<%= param.name %>String);
+<%  elsif param.type.is_struct -%>
+    (*env)->ReleaseByteArrayElements(env, <%= param.name %>BytesArray, <%= param.name %>BytesBuffer, JNI_ABORT);
+    (*env)->DeleteLocalRef(env, <%= param.name %>BytesArray);
+    (*env)->DeleteLocalRef(env, <%= param.name %>Class);
+<%  elsif param.type.is_class -%>
+    (*env)->DeleteLocalRef(env, <%= param.name %>Class);
+<%  elsif param.type.is_enum -%>
+    (*env)->DeleteLocalRef(env, <%= param.name %>Class);
+<%  elsif param.type.is_proto -%>
+    (*env)->DeleteLocalRef(env, <%= param.name %>ByteArray);
+    (*env)->DeleteLocalRef(env, <%= param.name %>Class);
+<%  end -%>
+<%end -%>
diff --git a/codegen/lib/templates/kotlin_jni/proto_access.erb b/codegen/lib/templates/kotlin_jni/proto_access.erb
new file mode 100644
index 00000000000..36d930a73cd
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/proto_access.erb
@@ -0,0 +1,7 @@
+<% param = locals[:param] -%>
+<% name = param.name -%>
+<% type = param.type -%>
+    jclass <%= name %>Class = (*env)->GetObjectClass(env, <%= name %>);
+    jmethodID <%= name %>ToByteArrayMethodID = (*env)->GetMethodID(env, <%= name %>Class, "toByteArray", "()[B");
+    jbyteArray <%= name %>ByteArray = (*env)->CallObjectMethod(env, <%= name %>, <%= name %>ToByteArrayMethodID);
+    TWData *<%= param.name %>Data = TWDataCreateWithJByteArray(env, <%= name %>ByteArray);
diff --git a/codegen/lib/templates/kotlin_jni/struct_access.erb b/codegen/lib/templates/kotlin_jni/struct_access.erb
new file mode 100644
index 00000000000..ed8c88c027b
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni/struct_access.erb
@@ -0,0 +1,8 @@
+<% param = locals[:param] -%>
+<% name = param.name -%>
+<% type = param.type -%>
+    jclass <%= name %>Class = (*env)->GetObjectClass(env, <%= name %>);
+    jfieldID <%= name %>BytesFieldID = (*env)->GetFieldID(env, <%= name %>Class, "bytes", "[B");
+    jbyteArray <%= name %>BytesArray = (*env)->GetObjectField(env, <%= name %>, <%= name %>BytesFieldID);
+    jbyte* <%= name %>BytesBuffer = (*env)->GetByteArrayElements(env, <%= name %>BytesArray, NULL);
+    struct TW<%= type.name %> *<%= name %>Instance = (struct TW<%= type.name %> *) <%= name %>BytesBuffer;
diff --git a/codegen/lib/templates/kotlin_jni_c.erb b/codegen/lib/templates/kotlin_jni_c.erb
new file mode 100644
index 00000000000..3b1f05b0588
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni_c.erb
@@ -0,0 +1,90 @@
+#include <jni.h>
+#include <stdio.h>
+#include <string.h>
+
+<% require 'set' -%>
+<%  includes = Set.new([entity.name]) -%>
+<%  entity.static_methods.each do |method| -%>
+<%    includes << method.return_type.name if method.return_type.is_struct || method.return_type.is_class -%>
+<%    method.parameters.each do |param| -%>
+<%      includes << param.type.name if param.type.is_struct || param.type.is_class -%>
+<%    end -%>
+<%  end -%>
+<%  includes.each do |include| -%>
+#include <TrustWalletCore/TW<%= include %>.h>
+<%  end -%>
+
+#include "TWJNI.h"
+#include "<%= entity.name %>.h"
+
+<%# Constructors -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next unless method.name.start_with?('Create') -%>
+jlong JNICALL <%= KotlinJniHelper.function_name(entity: entity, function: method, native_prefix: true) %>(JNIEnv *env, jclass thisClass<%= KotlinJniHelper.parameters(method.parameters) %>) {
+<%=   render('kotlin_jni/parameter_access.erb', { method: method }) -%>
+    struct TW<%= entity.name %> *instance = TW<%= entity.name %><%= method.name %>(<%= KotlinJniHelper.arguments(method.parameters).join(', ') %>);
+<%=   render('kotlin_jni/parameter_release.erb', { method: method }) -%>
+    return (jlong) instance;
+}
+
+<%  end -%>
+<%# Destructors -%>
+<%  entity.methods.each do |method| -%>
+<%    next unless method.name.start_with?('Delete') -%>
+void JNICALL <%= KotlinJniHelper.function_name(entity: entity, function: method, native_prefix: true) %>(JNIEnv *env, jclass thisClass, jlong handle) {
+    TW<%= entity.name %>Delete((struct TW<%= entity.name %> *) handle);
+}
+
+<%  end -%>
+<%# Initializers -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next unless method.name.start_with?('Init') -%>
+jbyteArray JNICALL <%= KotlinJniHelper.function_name(entity: entity, function: method) %>(JNIEnv *env, jclass thisClass<%= KotlinJniHelper.parameters(method.parameters.drop(1)) %>) {
+    jbyteArray array = (*env)->NewByteArray(env, sizeof(struct TW<%= entity.name %>));
+    jbyte* bytesBuffer = (*env)->GetByteArrayElements(env, array, NULL);
+    struct TW<%= entity.name %> *instance = (struct TW<%= entity.name %> *) bytesBuffer;
+<%=   render('kotlin_jni/parameter_access.erb', { method: method }) -%>
+<%  if method.return_type.name != :void -%>
+    <%= KotlinJniHelper.type(method.return_type) %> result = (<%= KotlinJniHelper.type(method.return_type) %>) TW<%= entity.name %><%= method.name %>(instance, <%= KotlinJniHelper.arguments(method.parameters.drop(1)).join(', ') %>);
+<%  else -%>
+    TW<%= entity.name %><%= method.name %>(instance, <%= KotlinJniHelper.arguments(method.parameters.drop(1)).join(', ') %>);
+<%  end -%>
+<%=   render('kotlin_jni/parameter_release.erb', { method: method }) -%>
+    (*env)->ReleaseByteArrayElements(env, array, bytesBuffer, 0);
+
+<%  if method.return_type.name != :void -%>
+    if (result) {
+        return array;
+    } else {
+        (*env)->DeleteLocalRef(env, array);
+        return NULL;
+    }
+<%  else -%>
+    return array;
+<%  end -%>
+}
+
+<%  end -%>
+<%# Static properties -%>
+<%  entity.static_properties.each do |method| -%>
+<%=   render('kotlin_jni/method.erb', { method: method }) %>
+<%  end -%>
+<%# Static methods -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next if method.name.start_with?('Create') || method.name.start_with?('Init') -%>
+<%=   render('kotlin_jni/method.erb', { method: method }) %>
+<%  end -%>
+<%# Properties -%>
+<% entity.properties.each do |method| -%>
+<%=  render('kotlin_jni/method.erb', { method: method }) %>
+<% end -%>
+<%# Methods -%>
+<% entity.methods.each do |method| -%>
+<%   next if method.name == "Delete" -%>
+<%=  render('kotlin_jni/method.erb', { method: method }) %>
+<% end -%>
+<%  less = entity.static_methods.detect{ |i| i.name == 'Less' } -%>
+<%  equal = entity.static_methods.detect{ |i| i.name == 'Equal' } -%>
+<%  if !less.nil? && !equal.nil? -%>
+<%=   render('kotlin_jni/compare_to.erb', { less: less, equal: equal }) %>
+<%  end -%>
diff --git a/codegen/lib/templates/kotlin_jni_h.erb b/codegen/lib/templates/kotlin_jni_h.erb
new file mode 100644
index 00000000000..44e3bec9cf8
--- /dev/null
+++ b/codegen/lib/templates/kotlin_jni_h.erb
@@ -0,0 +1,66 @@
+#ifndef JNI_TW_<%= entity.name.upcase %>_H
+#define JNI_TW_<%= entity.name.upcase %>_H
+
+#include <jni.h>
+#include <TrustWalletCore/TWBase.h>
+
+TW_EXTERN_C_BEGIN
+
+<%# Constructor declarations -%>
+<% entity.static_methods.each do |method| -%>
+<%   next unless method.name.start_with?('Create') -%>
+JNIEXPORT
+jlong JNICALL <%= KotlinJniHelper.function_name(entity: entity, function: method, native_prefix: true) %>(JNIEnv *env, jclass thisClass<%= KotlinJniHelper.parameters(method.parameters) %>);
+
+<% end -%>
+<%# Destructor declarations -%>
+<% entity.methods.each do |method| -%>
+<%   next unless method.name.start_with?('Delete') -%>
+JNIEXPORT
+void JNICALL <%= KotlinJniHelper.function_name(entity: entity, function: method, native_prefix: true) %>(JNIEnv *env, jclass thisClass, jlong handle);
+
+<% end -%>
+<%# Initializer declarations -%>
+<% entity.static_methods.each do |method| -%>
+<%   next unless method.name.start_with?('Init') -%>
+JNIEXPORT
+jbyteArray JNICALL <%= KotlinJniHelper.function_name(entity: entity, function: method) %>(JNIEnv *env, jclass thisClass<%= KotlinJniHelper.parameters(method.parameters.drop(1)) %>);
+
+<% end -%>
+<%# Static property declarations -%>
+<% entity.static_properties.each do |property| -%>
+JNIEXPORT
+<%=  render('kotlin_jni/method_prototype.erb', { method: property }) %>;
+
+<% end -%>
+<%# Static method declarations -%>
+<%  entity.static_methods.each do |method| -%>
+<%    next if method.name.start_with?('Create') || method.name.start_with?('Init') -%>
+JNIEXPORT
+<%=   render('kotlin_jni/method_prototype.erb', { method: method }) %>;
+
+<%  end -%>
+<%# Property declarations -%>
+<% entity.properties.each do |property| -%>
+JNIEXPORT
+<%=  render('kotlin_jni/method_prototype.erb', { method: property }) %>;
+
+<% end -%>
+<%# Method declarations -%>
+<% entity.methods.each do |method| -%>
+<%   next if method.name.start_with?('Delete') -%>
+JNIEXPORT
+<%=  render('kotlin_jni/method_prototype.erb', { method: method }) %>;
+
+<% end -%>
+<%  less = entity.static_methods.detect{ |i| i.name == 'Less' } -%>
+<%  equal = entity.static_methods.detect{ |i| i.name == 'Equal' } -%>
+<%  if !less.nil? && !equal.nil? -%>
+JNIEXPORT
+<%=   render('kotlin_jni/method_prototype.erb', { method: KotlinJniHelper.compareMethod(entity) }) %>;
+
+<%  end -%>
+
+TW_EXTERN_C_END
+
+#endif // JNI_TW_<%= entity.name.upcase %>_H
diff --git a/codegen/lib/templates/kotlin_js.erb b/codegen/lib/templates/kotlin_js.erb
new file mode 100644
index 00000000000..db9c23dd567
--- /dev/null
+++ b/codegen/lib/templates/kotlin_js.erb
@@ -0,0 +1,7 @@
+<%-  if entity.is_a?(EnumDecl) -%>
+<%=   render('kotlin/js_enum.erb') -%>
+<%-  elsif entity.is_struct -%>
+<%=   render('kotlin/js_struct.erb') -%>
+<%- else -%>
+<%=   render('kotlin/js_class.erb') -%>
+<%- end -%>
diff --git a/codegen/lib/templates/kotlin_js_accessors.erb b/codegen/lib/templates/kotlin_js_accessors.erb
new file mode 100644
index 00000000000..63dda74b3b2
--- /dev/null
+++ b/codegen/lib/templates/kotlin_js_accessors.erb
@@ -0,0 +1,7 @@
+<%-  if entity.is_a?(EnumDecl) -%>
+<%=   render('kotlin/js_accessors_enum.erb') -%>
+<%-  elsif entity.is_struct -%>
+<%=   render('kotlin/js_accessors_struct.erb') -%>
+<%- else -%>
+<%=   render('kotlin/js_accessors_class.erb') -%>
+<%- end -%>
diff --git a/codegen/lib/templates/newcoin/Address.cpp.erb b/codegen/lib/templates/newcoin/Address.cpp.erb
index e9eb3b1412f..ea1c354db0e 100644
--- a/codegen/lib/templates/newcoin/Address.cpp.erb
+++ b/codegen/lib/templates/newcoin/Address.cpp.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
diff --git a/codegen/lib/templates/newcoin/Address.h.erb b/codegen/lib/templates/newcoin/Address.h.erb
index 9c6f60df4f6..7fe392b92df 100644
--- a/codegen/lib/templates/newcoin/Address.h.erb
+++ b/codegen/lib/templates/newcoin/Address.h.erb
@@ -1,13 +1,11 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../Data.h"
-#include "../PublicKey.h"
+#include "Data.h"
+#include "PublicKey.h"
 
 #include <string>
 
diff --git a/codegen/lib/templates/newcoin/AddressTests.cpp.erb b/codegen/lib/templates/newcoin/AddressTests.cpp.erb
index ca9d99d3139..27c4c09ab89 100644
--- a/codegen/lib/templates/newcoin/AddressTests.cpp.erb
+++ b/codegen/lib/templates/newcoin/AddressTests.cpp.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "HexCoding.h"
 #include "<%= format_name(coin) %>/Address.h"
diff --git a/codegen/lib/templates/newcoin/AddressTests.kt.erb b/codegen/lib/templates/newcoin/AddressTests.kt.erb
index 34781800a4c..20bbd774cc9 100644
--- a/codegen/lib/templates/newcoin/AddressTests.kt.erb
+++ b/codegen/lib/templates/newcoin/AddressTests.kt.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.<%= format_name_lowercase(coin) %>
 
diff --git a/codegen/lib/templates/newcoin/Entry.cpp.erb b/codegen/lib/templates/newcoin/Entry.cpp.erb
index d0585ed64b9..793f5bf8f3f 100644
--- a/codegen/lib/templates/newcoin/Entry.cpp.erb
+++ b/codegen/lib/templates/newcoin/Entry.cpp.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -13,11 +11,11 @@ namespace TW::<%= format_name(coin) %> {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress(TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -25,4 +23,12 @@ void Entry::sign(TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) con
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes(TWCoinType coin, const Data& txInputData) const {
+    return TW::Data();
+}
+
+void Entry::compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    
+}
+
 } // namespace TW::<%= format_name(coin) %>
diff --git a/codegen/lib/templates/newcoin/Entry.h.erb b/codegen/lib/templates/newcoin/Entry.h.erb
index 1b58f5f78cd..32b48e0e42c 100644
--- a/codegen/lib/templates/newcoin/Entry.h.erb
+++ b/codegen/lib/templates/newcoin/Entry.h.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,13 +10,16 @@ namespace TW::<%= format_name(coin) %> {
 
 /// Entry point for implementation of <%= format_name(coin) %> coin.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry : public CoinEntry {
+class Entry final : public CoinEntry {
 public:
-    virtual bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-    virtual std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-    virtual void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
     // normalizeAddress(): implement this if needed, e.g. Ethereum address is EIP55 checksummed
     // plan(): implement this if the blockchain is UTXO based
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::<%= format_name(coin) %>
diff --git a/codegen/lib/templates/newcoin/Proto.erb b/codegen/lib/templates/newcoin/Proto.erb
index 3065a609020..bbd242d66be 100644
--- a/codegen/lib/templates/newcoin/Proto.erb
+++ b/codegen/lib/templates/newcoin/Proto.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 syntax = "proto3";
 
diff --git a/codegen/lib/templates/newcoin/Signer.cpp.erb b/codegen/lib/templates/newcoin/Signer.cpp.erb
index 7dec6579529..aeedceda863 100644
--- a/codegen/lib/templates/newcoin/Signer.cpp.erb
+++ b/codegen/lib/templates/newcoin/Signer.cpp.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Address.h"
diff --git a/codegen/lib/templates/newcoin/Signer.h.erb b/codegen/lib/templates/newcoin/Signer.h.erb
index 1261f9c6149..f77982f3ac3 100644
--- a/codegen/lib/templates/newcoin/Signer.h.erb
+++ b/codegen/lib/templates/newcoin/Signer.h.erb
@@ -1,12 +1,10 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../Data.h"
+#include "Data.h"
 #include "../PrivateKey.h"
 #include "../proto/<%= name %>.pb.h"
 
@@ -19,7 +17,10 @@ public:
     Signer() = delete;
 
     /// Signs a Proto::SigningInput transaction
-    static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+    static Proto::SigningOutput sign(const Proto::SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs = {}) noexcept;
+
+    /// Collect pre-image hashes to be signed
+    static PreSigningOutput preImageHashes(const SigningInput& input) noexcept;
 };
 
 } // namespace TW::<%= name %>
diff --git a/codegen/lib/templates/newcoin/SignerTests.cpp.erb b/codegen/lib/templates/newcoin/SignerTests.cpp.erb
index 9df8b26ee1e..d88ad46994f 100644
--- a/codegen/lib/templates/newcoin/SignerTests.cpp.erb
+++ b/codegen/lib/templates/newcoin/SignerTests.cpp.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "<%= format_name(coin) %>/Signer.h"
 #include "<%= format_name(coin) %>/Address.h"
diff --git a/codegen/lib/templates/newcoin/SignerTests.kt.erb b/codegen/lib/templates/newcoin/SignerTests.kt.erb
index e0512c55b1d..4add9add89f 100644
--- a/codegen/lib/templates/newcoin/SignerTests.kt.erb
+++ b/codegen/lib/templates/newcoin/SignerTests.kt.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package com.trustwallet.core.app.blockchains.<%= format_name_lowercase(coin) %>
 
diff --git a/codegen/lib/templates/newcoin/TWAddressTests.cpp.erb b/codegen/lib/templates/newcoin/TWAddressTests.cpp.erb
index 0a4ea03764d..91a0cbf0729 100644
--- a/codegen/lib/templates/newcoin/TWAddressTests.cpp.erb
+++ b/codegen/lib/templates/newcoin/TWAddressTests.cpp.erb
@@ -1,13 +1,11 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWAnyAddress.h>
 #include "HexCoding.h"
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <gtest/gtest.h>
 
 using namespace TW;
diff --git a/codegen/lib/templates/newcoin/TWSignerTests.cpp.erb b/codegen/lib/templates/newcoin/TWSignerTests.cpp.erb
index 4e72ef5fa5f..8e8193db07c 100644
--- a/codegen/lib/templates/newcoin/TWSignerTests.cpp.erb
+++ b/codegen/lib/templates/newcoin/TWSignerTests.cpp.erb
@@ -1,13 +1,11 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWAnySigner.h>
 #include "HexCoding.h"
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <gtest/gtest.h>
 
 using namespace TW;
diff --git a/codegen/lib/templates/newcoin/Tests.swift.erb b/codegen/lib/templates/newcoin/Tests.swift.erb
index 583696882c5..e28d0ec1bc2 100644
--- a/codegen/lib/templates/newcoin/Tests.swift.erb
+++ b/codegen/lib/templates/newcoin/Tests.swift.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/codegen/lib/templates/newcoin/TransactionCompilerTests.cpp.erb b/codegen/lib/templates/newcoin/TransactionCompilerTests.cpp.erb
new file mode 100644
index 00000000000..c996dd2c6ab
--- /dev/null
+++ b/codegen/lib/templates/newcoin/TransactionCompilerTests.cpp.erb
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "<%= format_name(coin) %>/Signer.h"
+#include "<%= format_name(coin) %>/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestUtilities.h"
+#include "TransactionCompiler.h"
+
+#include "proto/<%= format_name(coin) %>.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::<%= format_name(coin) %> {
+
+TEST(<%= format_name(coin) %>Compiler, CompileWithSignatures) {
+    // TODO: Finalize test implementation
+}
+
+} // namespace TW::<%= format_name(coin) %>
diff --git a/codegen/lib/templates/swift/TrustWalletCore.h.erb b/codegen/lib/templates/swift/TrustWalletCore.h.erb
index 085c7e80064..5e2ac88537a 100644
--- a/codegen/lib/templates/swift/TrustWalletCore.h.erb
+++ b/codegen/lib/templates/swift/TrustWalletCore.h.erb
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #import <Foundation/Foundation.h>
 
diff --git a/codegen/lib/templates/swift/parameter_access.erb b/codegen/lib/templates/swift/parameter_access.erb
index 8521c18bb4a..ddf4335753f 100644
--- a/codegen/lib/templates/swift/parameter_access.erb
+++ b/codegen/lib/templates/swift/parameter_access.erb
@@ -10,12 +10,14 @@
         let <%= param.name %>String: UnsafeRawPointer?
         if let s = <%= param.name %> {
             <%= param.name %>String = TWStringCreateWithNSString(s)
-            defer {
-                TWStringDelete(s)
-            }
         } else {
             <%= param.name %>String = nil
         }
+        defer {
+            if let s = <%= param.name %>String {
+                TWStringDelete(s)
+            }
+        }
 <%      else -%>
         let <%= param.name %>String = TWStringCreateWithNSString(<%= param.name %>)
         defer {
diff --git a/coverage.stats b/coverage.stats
index b99dacf6dff..8b3541cc00d 100644
--- a/coverage.stats
+++ b/coverage.stats
@@ -1 +1 @@
-95.0
\ No newline at end of file
+93.0
diff --git a/docs/registry-fields.md b/docs/registry-fields.md
index f4662d510cd..ff6b0e539e6 100644
--- a/docs/registry-fields.md
+++ b/docs/registry-fields.md
@@ -31,7 +31,7 @@ Ex.: `10000118` for Osmosis, `118` for Cosmos; `20000714` for BNB Smart Chain.
 See also: `slip44` and `chainId`.
 
 **`slip44`**
-Optionally, SLIP-44 (BIP-44) coin ID can be specified here, in case it differs from `coinId`.  Most of the case the two are the same, so this can be omitted.
+Optionally, SLIP-44 (BIP-44) coin ID can be specified here, in case it differs from `coinId`.  In most cases the two are the same, so this can be omitted.
 Ex.: `60` for Optimism (coinID is `10000070`).
 
 **`symbol`**
@@ -67,7 +67,7 @@ Note that the second number, the BIP-44 ID, usually matches the coinId.
 Some blockchains may support additional alternative derivations.  These have:
 
 - a name
-- a alternative derivation path (optional)
+- an alternative derivation path (optional)
 
 Derivation may differ in the derivation path, or by address generation method (based on the derivation name).
 The first derivation is considered the default.
@@ -126,7 +126,7 @@ Defines the prefix byte used in P2PKH and P2SH addresses, Bitcoin style.
 Ex. `0` and `5` for Bitcoin.
 
 **`hrp`**
-Human Readable Prefix used to prefix an address, used to indicate type of address, to minimalize risk of accidental address mix-up across chains.
+Human Readable Prefix used to prefix an address, used to indicate type of address, to minimize risk of accidental address mix-up across chains.
 Ex. `'bc'` for Bitcoin, `'cosmos'` for Cosmos.
 
 **`chainId`**
@@ -150,7 +150,7 @@ Ex.: `'sha256d'` for Bitcoin, `'blake256d'` for Decred.
 
 **`addressHasher`**
 Hash method used in the publicKey -> address generation.
-Only some chain implementation use this setting, in most implementation this is fixed (and value here is only informative).
+Only some chain implementations use this setting, in most implementations this is fixed (and value here is only informative).
 Default is `sha256ripemd`.
 Ex.: missing ('sha256ripemd') for Bitcoin, `'keccak256'` for Ethereum, `'sha256ripemd'` for Cosmos, `'keccak256'` for Native Evmos, despite being a Cosmos fork.
 
@@ -189,7 +189,7 @@ Link to the default implementation of the node or RPC gateway that can be used b
 Optional URL to an available public RPC service.
 
 **`info/documentation`**
-Main porject documentation site/subsite.
+Main project documentation site/subsite.
 
 **`deprecated`**
 If set to `true`, the project is considered deprecated: its info is kept here, but it will not be supported.
diff --git a/docs/registry.md b/docs/registry.md
index 755c49365ac..a5045889d19 100644
--- a/docs/registry.md
+++ b/docs/registry.md
@@ -13,29 +13,41 @@ This list is generated from [./registry.json](../registry.json)
 | 20      | DigiByte         | DGB    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/digibyte/info/logo.png" width="32" />     | <https://www.digibyte.io>     |
 | 22      | Monacoin         | MONA   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/monacoin/info/logo.png" width="32" />     | <https://monacoin.org>        |
 | 42      | Decred           | DCR    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/decred/info/logo.png" width="32" />       | <https://decred.org>          |
+| 57      | Syscoin          | SYS    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/syscoin/info/logo.png" width="32" />      | <https://syscoin.org>         |
 | 60      | Ethereum         | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ethereum/info/logo.png" width="32" />     | <https://ethereum.org>        |
 | 61      | Ethereum Classic | ETC    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/classic/info/logo.png" width="32" />      | <https://ethereumclassic.org> |
 | 74      | ICON             | ICX    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/icon/info/logo.png" width="32" />         | <https://icon.foundation>     |
+| 77      | Verge            | XVG    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/verge/info/logo.png" width="32" />        | <https://vergecurrency.com>   |
 | 118     | Cosmos Hub       | ATOM   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/cosmos/info/logo.png" width="32" />       | <https://cosmos.network>      |
+| 119     | Pivx             | PIVX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/pivx/info/logo.png" width="32" />         | <https://pivx.org>            |
+| 121     | Zen              | ZEN    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zen/info/logo.png" width="32" />          | <https://www.horizen.io>      |
 | 133     | Zcash            | ZEC    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zcash/info/logo.png" width="32" />        | <https://z.cash>              |
 | 136     | Firo             | FIRO   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/firo/info/logo.png" width="32" />         | <https://firo.org/>           |
+| 137     | Rootstock        | RBTC   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/rootstock/info/logo.png" width="32" />    | <https://rootstock.io>        |
+| 141     | Komodo           | KMD    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/komodo/info/logo.png" width="32" />       | <https://komodoplatform.com>  |
 | 144     | XRP              | XRP    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ripple/info/logo.png" width="32" />       | <https://ripple.com/xrp>      |
 | 145     | Bitcoin Cash     | BCH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/bitcoincash/info/logo.png" width="32" />  | <https://bitcoincash.org>     |
+| 146     | Nebl             | NEBL   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/Nebl/info/logo.png" width="32" />         | <https://nebl.io>             |
 | 148     | Stellar          | XLM    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/stellar/info/logo.png" width="32" />      | <https://stellar.org>         |
 | 156     | Bitcoin Gold     | BTG    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/bitcoingold/info/logo.png" width="32" />  | <https://bitcoingold.org>     |
 | 165     | Nano             | XNO    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nano/info/logo.png" width="32" />         | <https://nano.org>            |
+| 169     | Manta Pacific    | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/manta/info/logo.png" width="32" />        | <https://pacific.manta.network> |
 | 175     | Ravencoin        | RVN    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ravencoin/info/logo.png" width="32" />    | <https://ravencoin.org>       |
 | 178     | POA Network      | POA    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/poa/info/logo.png" width="32" />          | <https://poa.network>         |
 | 194     | EOS              | EOS    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/eos/info/logo.png" width="32" />          | <http://eos.io>               |
 | 195     | Tron             | TRX    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tron/info/logo.png" width="32" />         | <https://tron.network>        |
+| 204     | OpBNB            | BNB    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/opbnb/info/logo.png" width="32" />        | <https://opbnb.bnbchain.org/en> |
+| 223     | Internet Computer | ICP    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/internet_computer/info/logo.png" width="32" /> | <https://internetcomputer.org> |
 | 235     | FIO              | FIO    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/fio/info/logo.png" width="32" />          | <https://fioprotocol.io>      |
 | 242     | Nimiq            | NIM    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nimiq/info/logo.png" width="32" />        | <https://nimiq.com>           |
 | 283     | Algorand         | ALGO   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/algorand/info/logo.png" width="32" />     | <https://www.algorand.com/>   |
+| 291     | IOST             | IOST   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/iost/info/logo.png" width="32" />         | <https://iost.io>             |
 | 304     | IoTeX            | IOTX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/iotex/info/logo.png" width="32" />        | <https://iotex.io>            |
 | 309     | Nervos           | CKB    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nervos/info/logo.png" width="32" />       | <https://nervos.org>          |
 | 313     | Zilliqa          | ZIL    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zilliqa/info/logo.png" width="32" />      | <https://zilliqa.com>         |
 | 330     | Terra Classic    | LUNC   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/terra/info/logo.png" width="32" />        | <https://terra.money>         |
 | 354     | Polkadot         | DOT    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polkadot/info/logo.png" width="32" />     | <https://polkadot.network/>   |
+| 361     | Theta Fuel       | TFUEL  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tfuelevm/info/logo.png" width="32" />     | <https://www.thetatoken.org>  |
 | 394     | Crypto.org       | CRO    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/cryptoorg/info/logo.png" width="32" />    | <https://crypto.org/>         |
 | 396     | Everscale        | EVER   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/everscale/info/logo.png" width="32" />    | <https://everscale.network/>  |
 | 397     | NEAR             | NEAR   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/near/info/logo.png" width="32" />         | <https://nearprotocol.com>    |
@@ -49,49 +61,103 @@ This list is generated from [./registry.json](../registry.json)
 | 494     | BandChain        | BAND   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/band/info/logo.png" width="32" />         | <https://bandprotocol.com/>   |
 | 500     | Theta            | THETA  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/theta/info/logo.png" width="32" />        | <https://www.thetatoken.org>  |
 | 501     | Solana           | SOL    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/solana/info/logo.png" width="32" />       | <https://solana.com>          |
-| 508     | Elrond           | eGLD   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/elrond/info/logo.png" width="32" />       | <https://elrond.com/>         |
-| 714     | BNB Beacon Chain | BNB    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/binance/info/logo.png" width="32" />      | <https://binance.org>         |
+| 508     | MultiversX       | eGLD   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/elrond/info/logo.png" width="32" />       | <https://multiversx.com/>     |
+| 529     | Secret           | SCRT   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/secret/info/logo.png" width="32" />       | <https://scrt.network/>       |
+| 564     | Agoric           | BLD    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/agoric/info/logo.png" width="32" />       | <https://agoric.com>          |
+| 607     | TON              | TON    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ton/info/logo.png" width="32" />          | <https://ton.org>             |
+| 637     | Aptos            | APT    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/aptos/info/logo.png" width="32" />        | <https://aptoslabs.com/>      |
+| 714     | BNB Beacon Chain | BNB    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/binance/info/logo.png" width="32" />      | <https://www.bnbchain.org>    |
+| 784     | Sui              | SUI    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/sui/info/logo.png" width="32" />          | <https://sui.io/>             |
+| 787     | Acala            | ACA    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/acala/info/logo.png" width="32" />        | <https://acala.network>       |
 | 818     | VeChain          | VET    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/vechain/info/logo.png" width="32" />      | <https://vechain.org>         |
 | 820     | Callisto         | CLO    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/callisto/info/logo.png" width="32" />     | <https://callisto.network>    |
 | 888     | NEO              | NEO    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/neo/info/logo.png" width="32" />          | <https://neo.org>             |
-| 889     | TomoChain        | TOMO   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tomochain/info/logo.png" width="32" />    | <https://tomochain.com>       |
+| 889     | Viction          | VIC    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/viction/info/logo.png" width="32" />      | <https://www.viction.xyz/>    |
 | 899     | eCash            | XEC    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ecash/info/logo.png" width="32" />        | <https://e.cash>              |
 | 931     | THORChain        | RUNE   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/thorchain/info/logo.png" width="32" />    | <https://thorchain.org>       |
-| 966     | Polygon          | MATIC  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/info/logo.png" width="32" />      | <https://polygon.technology>  |
+| 966     | Polygon          | POL    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygon/info/logo.png" width="32" />      | <https://polygon.technology>  |
 | 996     | OKX Chain        | OKT    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/okc/info/logo.png" width="32" />          | <https://www.okx.com/okc>     |
-| 1001    | Thunder Token    | TT     | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/thundertoken/info/logo.png" width="32" /> | <https://thundercore.com>     |
+| 999     | Bitcoin Diamond  | BCD    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/bitcoindiamond/info/logo.png" width="32" /> | <https://www.bitcoindiamond.org> |
+| 1001    | ThunderCore      | TT     | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/thundertoken/info/logo.png" width="32" /> | <https://thundercore.com>     |
 | 1023    | Harmony          | ONE    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/harmony/info/logo.png" width="32" />      | <https://harmony.one>         |
 | 1024    | Ontology         | ONT    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ontology/info/logo.png" width="32" />     | <https://ont.io>              |
+| 1030    | Conflux eSpace   | CFX    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/cfxevm/info/logo.png" width="32" />       | <https://confluxnetwork.org>  |
 | 1729    | Tezos            | XTZ    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tezos/info/logo.png" width="32" />        | <https://tezos.com>           |
 | 1815    | Cardano          | ADA    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/cardano/info/logo.png" width="32" />      | <https://www.cardano.org>     |
+| 1890    | Lightlink Phoenix | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/lightlink/info/logo.png" width="32" />    | <https://lightlink.io>        |
 | 2301    | Qtum             | QTUM   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/qtum/info/logo.png" width="32" />         | <https://qtum.org>            |
 | 2718    | Nebulas          | NAS    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nebulas/info/logo.png" width="32" />      | <https://nebulas.io>          |
+| 3030    | Hedera           | HBAR   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/hedera/info/logo.png" width="32" />       | <https://hedera.com/>         |
+| 4200    | Merlin           | BTC    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/merlin/info/logo.png" width="32" />       | <https://merlinchain.io>      |
+| 5000    | Mantle           | MNT    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/mantle/info/logo.png" width="32" />       | <https://www.mantle.xyz>      |
+| 5600    | BNB Greenfield   | BNB    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/greenfield/info/logo.png" width="32" />   | <https://greenfield.bnbchain.org> |
+| 6001    | BounceBit        | BB     | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/bouncebit/info/logo.png" width="32" />    | <https://bouncebit.io>        |
 | 6060    | GoChain          | GO     | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/gochain/info/logo.png" width="32" />      | <https://gochain.io>          |
+| 7332    | Zen EON          | ZEN    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zeneon/info/logo.png" width="32" />       | <https://eon.horizen.io>      |
+| 8453    | Base             | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/base/info/logo.png" width="32" />         | <https://base.mirror.xyz/>    |
 | 8964    | NULS             | NULS   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nuls/info/logo.png" width="32" />         | <https://nuls.io>             |
+| 14001   | WAX              | WAXP   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/wax/info/logo.png" width="32" />          | <http://wax.io>               |
 | 18000   | Meter            | MTR    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/meter/info/logo.png" width="32" />        | <https://meter.io/>           |
 | 19167   | Flux             | FLUX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zelcash/info/logo.png" width="32" />      | <https://runonflux.io>        |
+| 21888   | Pactus           | PAC    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/pactus/info/logo.png" width="32" />       | <https://pactus.org>          |
 | 52752   | Celo             | CELO   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/celo/info/logo.png" width="32" />         | <https://celo.org>            |
+| 59144   | Linea            | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/linea/info/logo.png" width="32" />        | <https://linea.build>         |
+| 81457   | Blast            | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/blast/info/logo.png" width="32" />        | <https://blast.io>            |
+| 105105  | Stratis          | STRAX  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/stratis/info/logo.png" width="32" />      | <https://www.stratisplatform.com/> |
+| 534352  | Scroll           | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/scroll/info/logo.png" width="32" />       | <https://scroll.io>           |
+| 810180  | zkLink Nova Mainnet | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zklinknova/info/logo.png" width="32" />   | <https://zklink.io>           |
 | 5718350 | Wanchain         | WAN    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/wanchain/info/logo.png" width="32" />     | <https://wanchain.org>        |
 | 5741564 | Waves            | WAVES  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/waves/info/logo.png" width="32" />        | <https://wavesplatform.com>   |
 | 10000025 | Cronos Chain     | CRO    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/cronos/info/logo.png" width="32" />       | <https://cronos.org>          |
-| 10000070 | Optimistic Ethereum | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/info/logo.png" width="32" />     | <https://optimism.io/>        |
+| 10000060 | Native Injective | INJ    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nativeinjective/info/logo.png" width="32" /> | <https://injective.com>       |
+| 10000070 | OP Mainnet       | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/optimism/info/logo.png" width="32" />     | <https://optimism.io/>        |
 | 10000100 | Gnosis Chain     | xDAI   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/xdai/info/logo.png" width="32" />         | <https://www.xdaichain.com>   |
 | 10000118 | Osmosis          | OSMO   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/osmosis/info/logo.png" width="32" />      | <https://osmosis.zone/>       |
 | 10000145 | Smart Bitcoin Cash | BCH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/smartbch/info/logo.png" width="32" />     | <https://smartbch.org/>       |
 | 10000250 | Fantom           | FTM    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/fantom/info/logo.png" width="32" />       | <https://fantom.foundation>   |
 | 10000288 | Boba             | BOBAETH | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/boba/info/logo.png" width="32" />         | <https://boba.network/>       |
 | 10000321 | KuCoin Community Chain | KCS    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/kcc/info/logo.png" width="32" />          | <https://www.kcc.io/>         |
+| 10000324 | zkSync Era       | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zksync/info/logo.png" width="32" />       | <https://portal.zksync.io/>   |
 | 10000330 | Terra            | LUNA   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/terrav2/info/logo.png" width="32" />      | <https://terra.money>         |
 | 10000553 | Huobi ECO Chain  | HT     | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/heco/info/logo.png" width="32" />         | <https://www.hecochain.com/en-us> |
+| 10000787 | Acala EVM        | ACA    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/acalaevm/info/logo.png" width="32" />     | <https://acala.network>       |
+| 10000990 | Coreum           | CORE   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/coreum/info/logo.png" width="32" />       | <https://www.coreum.com/>     |
 | 10001088 | Metis            | METIS  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/metis/info/logo.png" width="32" />        | <https://www.metis.io/>       |
+| 10001101 | Polygon zkEVM    | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/polygonzkevm/info/logo.png" width="32" /> | <https://www.polygon.technology/> |
 | 10001284 | Moonbeam         | GLMR   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/moonbeam/info/logo.png" width="32" />     | <https://moonbeam.network>    |
 | 10001285 | Moonriver        | MOVR   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/moonriver/info/logo.png" width="32" />    | <https://moonbeam.network/networks/moonriver> |
 | 10002020 | Ronin            | RON    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/ronin/info/logo.png" width="32" />        | <https://whitepaper.axieinfinity.com/technology/ronin-ethereum-sidechain> |
 | 10002222 | KavaEvm          | KAVA   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/kavaevm/info/logo.png" width="32" />      | <https://www.kava.io/>        |
-| 10008217 | Klaytn           | KLAY   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/klaytn/info/logo.png" width="32" />       | <https://klaytn.foundation>   |
+| 10004689 | IoTeX EVM        | IOTX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/iotexevm/info/logo.png" width="32" />     | <https://iotex.io/>           |
+| 10007000 | NativeZetaChain  | ZETA   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zetachain/info/logo.png" width="32" />    | <https://www.zetachain.com/>  |
+| 10007700 | NativeCanto      | CANTO  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nativecanto/info/logo.png" width="32" />  | <https://canto.io/>           |
+| 10008217 | Kaia             | KLAY   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/kaia/info/logo.png" width="32" />         | <https://kaia.io>             |
 | 10009000 | Avalanche C-Chain | AVAX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/avalanchec/info/logo.png" width="32" />   | <https://www.avalabs.org/>    |
 | 10009001 | Evmos            | EVMOS  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/evmos/info/logo.png" width="32" />        | <https://evmos.org/>          |
+| 10042170 | Arbitrum Nova    | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/arbitrumnova/info/logo.png" width="32" /> | <https://nova.arbitrum.io>    |
 | 10042221 | Arbitrum         | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/arbitrum/info/logo.png" width="32" />     | <https://arbitrum.io>         |
+| 11000118 | Sommelier        | SOMM   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/sommelier/info/logo.png" width="32" />    | <https://www.sommelier.finance/> |
+| 12000118 | Fetch AI         | FET    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/fetchai/info/logo.png" width="32" />      | <https://fetch.ai/>           |
+| 13000118 | Mars Hub         | MARS   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/mars/info/logo.png" width="32" />         | <https://marsprotocol.io/>    |
+| 14000118 | Umee             | UMEE   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/umee/info/logo.png" width="32" />         | <https://umee.cc/>            |
+| 15000118 | Quasar           | QSR    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/quasar/info/logo.png" width="32" />       | <https://www.quasar.fi/>      |
+| 16000118 | Persistence      | XPRT   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/persistence/info/logo.png" width="32" />  | <https://persistence.one/>    |
+| 17000118 | Akash            | AKT    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/akash/info/logo.png" width="32" />        | <https://akash.network/>      |
+| 18000118 | Noble            | USDC   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/noble/info/logo.png" width="32" />        | <https://nobleassets.xyz/>    |
+| 19000118 | Sei              | SEI    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/sei/info/logo.png" width="32" />          | <https://sei.io/>             |
+| 20000118 | Stargaze         | STARS  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/stargaze/info/logo.png" width="32" />     | <https://www.stargaze.zone/>  |
 | 20000714 | BNB Smart Chain  | BNB    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/smartchain/info/logo.png" width="32" />   | <https://www.binance.org/en/smartChain> |
+| 20007000 | Zeta EVM         | ZETA   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/zetaevm/info/logo.png" width="32" />      | <https://www.zetachain.com/>  |
 | 20009001 | Native Evmos     | EVMOS  | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/nativeevmos/info/logo.png" width="32" />  | <https://evmos.org/>          |
+| 21000118 | Celestia         | TIA    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tia/info/logo.png" width="32" />          | <https://celestia.org/>       |
+| 22000118 | dYdX             | DYDX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/dydx/info/logo.png" width="32" />         | <https://dydx.exchange>       |
+| 30000118 | Juno             | JUNO   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/juno/info/logo.png" width="32" />         | <https://www.junonetwork.io/> |
+| 30000714 | TBNB             | BNB    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/tbinance/info/logo.png" width="32" />     | <https://www.bnbchain.org>    |
+| 40000118 | Stride           | STRD   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/stride/info/logo.png" width="32" />       | <https://stride.zone/>        |
+| 50000118 | Axelar           | AXL    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/axelar/info/logo.png" width="32" />       | <https://axelar.network/>     |
+| 60000118 | Crescent         | CRE    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/crescent/info/logo.png" width="32" />     | <https://crescent.network/>   |
+| 70000118 | Kujira           | KUJI   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/kujira/info/logo.png" width="32" />       | <https://kujira.app/>         |
+| 80000118 | Comdex           | CMDX   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/comdex/info/logo.png" width="32" />       | <https://comdex.one/>         |
+| 90000118 | Neutron          | NTRN   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/neutron/info/logo.png" width="32" />      | <https://neutron.org/>        |
+| 245022934 | Neon             | NEON   | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/neon/info/logo.png" width="32" />         | <https://neonevm.org>         |
 | 1323161554 | Aurora           | ETH    | <img src="https://raw.githubusercontent.com/trustwallet/assets/master/blockchains/aurora/info/logo.png" width="32" />       | <https://aurora.dev/>         |
diff --git a/include/TrustWalletCore/TWAES.h b/include/TrustWalletCore/TWAES.h
index b44041f36f2..e4a30c656d1 100644
--- a/include/TrustWalletCore/TWAES.h
+++ b/include/TrustWalletCore/TWAES.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWAESPaddingMode.h b/include/TrustWalletCore/TWAESPaddingMode.h
index 5cfe2103172..da271a5b989 100644
--- a/include/TrustWalletCore/TWAESPaddingMode.h
+++ b/include/TrustWalletCore/TWAESPaddingMode.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWAccount.h b/include/TrustWalletCore/TWAccount.h
index c5d6f5e33ce..a5cc0fc0e2f 100644
--- a/include/TrustWalletCore/TWAccount.h
+++ b/include/TrustWalletCore/TWAccount.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -28,7 +26,8 @@ struct TWAccount;
 /// \param extendedPublicKey Base58 encoded extended public key.
 /// \return A new Account.
 TW_EXPORT_STATIC_METHOD
-struct TWAccount* _Nonnull TWAccountCreate(TWString* _Nonnull address, enum TWCoinType coin,
+struct TWAccount* _Nonnull TWAccountCreate(TWString* _Nonnull address,
+                                           enum TWCoinType coin,
                                            enum TWDerivation derivation,
                                            TWString* _Nonnull derivationPath,
                                            TWString* _Nonnull publicKey,
@@ -45,6 +44,12 @@ void TWAccountDelete(struct TWAccount *_Nonnull account);
 TW_EXPORT_PROPERTY
 TWString *_Nonnull TWAccountAddress(struct TWAccount *_Nonnull account);
 
+/// Return CoinType enum of an account.
+///
+/// \param account Account to get the coin type of.
+TW_EXPORT_PROPERTY
+enum TWCoinType TWAccountCoin(struct TWAccount* _Nonnull account);
+
 /// Returns the derivation enum of an account.
 ///
 /// \param account Account to get the derivation enum of.
@@ -69,10 +74,4 @@ TWString* _Nonnull TWAccountPublicKey(struct TWAccount* _Nonnull account);
 TW_EXPORT_PROPERTY
 TWString* _Nonnull TWAccountExtendedPublicKey(struct TWAccount* _Nonnull account);
 
-/// Return CoinType enum of an account.
-///
-/// \param account Account to get the coin type of.
-TW_EXPORT_PROPERTY
-enum TWCoinType TWAccountCoin(struct TWAccount* _Nonnull account);
-
 TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWAnyAddress.h b/include/TrustWalletCore/TWAnyAddress.h
index a815607989e..49b604aa9fc 100644
--- a/include/TrustWalletCore/TWAnyAddress.h
+++ b/include/TrustWalletCore/TWAnyAddress.h
@@ -1,14 +1,14 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "TWBase.h"
 #include "TWCoinType.h"
 #include "TWData.h"
+#include "TWFilecoinAddressType.h"
+#include "TWFiroAddressType.h"
 #include "TWString.h"
 
 TW_EXTERN_C_BEGIN
@@ -35,6 +35,24 @@ bool TWAnyAddressEqual(struct TWAnyAddress* _Nonnull lhs, struct TWAnyAddress* _
 TW_EXPORT_STATIC_METHOD
 bool TWAnyAddressIsValid(TWString* _Nonnull string, enum TWCoinType coin);
 
+/// Determines if the string is a valid Any address with the given hrp.
+///
+/// \param string address to validate.
+/// \param coin coin type of the address.
+/// \param hrp explicit given hrp of the given address.
+/// \return bool indicating if the address is valid.
+TW_EXPORT_STATIC_METHOD
+bool TWAnyAddressIsValidBech32(TWString* _Nonnull string, enum TWCoinType coin, TWString* _Nonnull hrp);
+
+/// Determines if the string is a valid Any address with the given SS58 network prefix.
+///
+/// \param string address to validate.
+/// \param coin coin type of the address.
+/// \param ss58Prefix ss58Prefix of the given address.
+/// \return bool indicating if the address is valid.
+TW_EXPORT_STATIC_METHOD
+bool TWAnyAddressIsValidSS58(TWString* _Nonnull string, enum TWCoinType coin, uint32_t ss58Prefix);
+
 /// Creates an address from a string representation and a coin type. Must be deleted with TWAnyAddressDelete after use.
 ///
 /// \param string address to create.
@@ -43,6 +61,25 @@ bool TWAnyAddressIsValid(TWString* _Nonnull string, enum TWCoinType coin);
 TW_EXPORT_STATIC_METHOD
 struct TWAnyAddress* _Nullable TWAnyAddressCreateWithString(TWString* _Nonnull string, enum TWCoinType coin);
 
+/// Creates an bech32 address from a string representation, a coin type and the given hrp. Must be deleted with TWAnyAddressDelete after use.
+///
+/// \param string address to create.
+/// \param coin coin type of the address.
+/// \param hrp hrp of the address.
+/// \return TWAnyAddress pointer or nullptr if address and coin are invalid.
+TW_EXPORT_STATIC_METHOD
+struct TWAnyAddress* _Nullable TWAnyAddressCreateBech32(TWString* _Nonnull string, enum TWCoinType coin, TWString* _Nonnull hrp);
+
+/// Creates an SS58 address from a string representation, a coin type and the given ss58Prefix. Must be deleted with TWAnyAddressDelete after use.
+///
+/// \param string address to create.
+/// \param coin coin type of the address.
+/// \param ss58Prefix ss58Prefix of the SS58 address.
+/// \return TWAnyAddress pointer or nullptr if address and coin are invalid.
+TW_EXPORT_STATIC_METHOD
+struct TWAnyAddress* _Nullable TWAnyAddressCreateSS58(TWString* _Nonnull string, enum TWCoinType coin, uint32_t ss58Prefix);
+
+
 /// Creates an address from a public key.
 ///
 /// \param publicKey derivates the address from the public key.
@@ -51,6 +88,49 @@ struct TWAnyAddress* _Nullable TWAnyAddressCreateWithString(TWString* _Nonnull s
 TW_EXPORT_STATIC_METHOD
 struct TWAnyAddress* _Nonnull TWAnyAddressCreateWithPublicKey(struct TWPublicKey* _Nonnull publicKey, enum TWCoinType coin);
 
+/// Creates an address from a public key and derivation option.
+///
+/// \param publicKey derivates the address from the public key.
+/// \param coin coin type of the address.
+/// \param derivation the custom derivation to use.
+/// \return TWAnyAddress pointer or nullptr if public key is invalid.
+TW_EXPORT_STATIC_METHOD
+struct TWAnyAddress* _Nonnull TWAnyAddressCreateWithPublicKeyDerivation(struct TWPublicKey* _Nonnull publicKey, enum TWCoinType coin, enum TWDerivation derivation);
+
+/// Creates an bech32 address from a public key and a given hrp.
+///
+/// \param publicKey derivates the address from the public key.
+/// \param coin coin type of the address.
+/// \param hrp hrp of the address.
+/// \return TWAnyAddress pointer or nullptr if public key is invalid.
+TW_EXPORT_STATIC_METHOD
+struct TWAnyAddress* _Nonnull TWAnyAddressCreateBech32WithPublicKey(struct TWPublicKey* _Nonnull publicKey, enum TWCoinType coin, TWString* _Nonnull hrp);
+
+/// Creates an SS58 address from a public key and a given ss58Prefix.
+///
+/// \param publicKey derivates the address from the public key.
+/// \param coin coin type of the address.
+/// \param ss58Prefix ss58Prefix of the SS58 address.
+/// \return TWAnyAddress pointer or nullptr if public key is invalid.
+TW_EXPORT_STATIC_METHOD
+struct TWAnyAddress* _Nonnull TWAnyAddressCreateSS58WithPublicKey(struct TWPublicKey* _Nonnull publicKey, enum TWCoinType coin, uint32_t ss58Prefix);
+
+/// Creates a Filecoin address from a public key and a given address type.
+///
+/// \param publicKey derivates the address from the public key.
+/// \param filecoinAddressType Filecoin address type.
+/// \return TWAnyAddress pointer or nullptr if public key is invalid.
+TW_EXPORT_STATIC_METHOD
+struct TWAnyAddress* _Nonnull TWAnyAddressCreateWithPublicKeyFilecoinAddressType(struct TWPublicKey* _Nonnull publicKey, enum TWFilecoinAddressType filecoinAddressType);
+
+/// Creates a Firo address from a public key and a given address type.
+///
+/// \param publicKey derivates the address from the public key.
+/// \param firoAddressType Firo address type.
+/// \return TWAnyAddress pointer or nullptr if public key is invalid.
+TW_EXPORT_STATIC_METHOD
+struct TWAnyAddress* _Nonnull TWAnyAddressCreateWithPublicKeyFiroAddressType(struct TWPublicKey* _Nonnull publicKey, enum TWFiroAddressType firoAddressType);
+
 /// Deletes an address.
 ///
 /// \param address address to delete.
diff --git a/include/TrustWalletCore/TWAnySigner.h b/include/TrustWalletCore/TWAnySigner.h
index f3864bcfa83..a50f1246618 100644
--- a/include/TrustWalletCore/TWAnySigner.h
+++ b/include/TrustWalletCore/TWAnySigner.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #pragma once
 
 #include "TWBase.h"
diff --git a/include/TrustWalletCore/TWAsnParser.h b/include/TrustWalletCore/TWAsnParser.h
new file mode 100644
index 00000000000..b008a0578d8
--- /dev/null
+++ b/include/TrustWalletCore/TWAsnParser.h
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWData.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Represents an ASN.1 DER parser.
+TW_EXPORT_STRUCT
+struct TWAsnParser;
+
+/// Parses the given ECDSA signature from ASN.1 DER encoded bytes.
+///
+/// \param encoded The ASN.1 DER encoded signature.
+/// \return The ECDSA signature standard binary representation: RS, where R - 32 byte array, S - 32 byte array.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nullable TWAsnParserEcdsaSignatureFromDer(TWData* _Nonnull encoded);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWBarz.h b/include/TrustWalletCore/TWBarz.h
new file mode 100644
index 00000000000..1454e219b5d
--- /dev/null
+++ b/include/TrustWalletCore/TWBarz.h
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+#include "TWPublicKey.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Barz functions
+TW_EXPORT_STRUCT
+struct TWBarz;
+
+/// Calculate a counterfactual address for the smart contract wallet
+///
+/// \param input The serialized data of ContractAddressInput.
+/// \return The address.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nonnull TWBarzGetCounterfactualAddress(TWData *_Nonnull input);
+
+/// Returns the init code parameter of ERC-4337 User Operation
+///
+/// \param factory Wallet factory address (BarzFactory)
+/// \param publicKey Public key for the verification facet
+/// \param verificationFacet Verification facet address
+/// \return The address.
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWBarzGetInitCode(TWString* _Nonnull factory, struct TWPublicKey* _Nonnull publicKey, TWString* _Nonnull verificationFacet, uint32_t salt);
+
+/// Converts the original ASN-encoded signature from webauthn to the format accepted by Barz
+///
+/// \param signature Original signature
+/// \param challenge The original challenge that was signed
+/// \param authenticatorData Returned from Webauthn API
+/// \param clientDataJSON Returned from Webauthn API
+/// \return Bytes of the formatted signature
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWBarzGetFormattedSignature(TWData* _Nonnull signature, TWData* _Nonnull challenge, TWData* _Nonnull authenticatorData, TWString* _Nonnull clientDataJSON);
+
+/// Returns the final hash to be signed by Barz for signing messages & typed data
+///
+/// \param msgHash Original msgHash
+/// \param barzAddress The address of Barz wallet signing the message
+/// \param chainId The chainId of the network the verification will happen
+/// \return The final hash to be signed
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWBarzGetPrefixedMsgHash(TWData* _Nonnull msgHash, TWString* _Nonnull barzAddress, uint32_t chainId);
+
+/// Returns the encoded diamondCut function call for Barz contract upgrades
+///
+/// \param input The serialized data of DiamondCutInput
+/// \return The encoded bytes of diamondCut function call
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWBarzGetDiamondCutCode(TWData *_Nonnull input);
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWBase.h b/include/TrustWalletCore/TWBase.h
index 17e618ace45..1e334d18679 100644
--- a/include/TrustWalletCore/TWBase.h
+++ b/include/TrustWalletCore/TWBase.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #if !defined(TW_EXTERN_C_BEGIN)
 #if defined(__cplusplus)
@@ -55,6 +53,13 @@
 #define TW_ASSUME_NONNULL_END
 #endif
 
+#if defined(__cplusplus) && (__cplusplus >= 201402L)
+#  define TW_DEPRECATED(since) [[deprecated("Since " #since)]]
+#  define TW_DEPRECATED_FOR(since, replacement) [[deprecated("Since " #since "; use " #replacement)]]
+#else
+#  define TW_DEPRECATED(since)
+#  define TW_DEPRECATED_FOR(since, replacement)
+#endif
 
 #if !__has_feature(nullability)
 #ifndef _Nullable
diff --git a/include/TrustWalletCore/TWBase32.h b/include/TrustWalletCore/TWBase32.h
index 871bbf8b561..a8f09039ec8 100644
--- a/include/TrustWalletCore/TWBase32.h
+++ b/include/TrustWalletCore/TWBase32.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -19,34 +17,34 @@ struct TWBase32;
 /// Decode a Base32 input with the given alphabet
 ///
 /// \param string Encoded base32 input to be decoded
-/// \param alphabet Decode with the given alphabet, if empty ALPHABET_RFC4648 is used by default
+/// \param alphabet Decode with the given alphabet, if nullptr ALPHABET_RFC4648 is used by default
 /// \return The decoded data, can be null.
 /// \note ALPHABET_RFC4648 doesn't support padding in the default alphabet
 TW_EXPORT_STATIC_METHOD
-TWData* _Nullable TWBase32DecodeWithAlphabet(TWString* _Nonnull string, TWString* _Nonnull alphabet);
+TWData* _Nullable TWBase32DecodeWithAlphabet(TWString* _Nonnull string, TWString* _Nullable alphabet);
 
 /// Decode a Base32 input with the default alphabet (ALPHABET_RFC4648)
 ///
 /// \param string Encoded input to be decoded
 /// \return The decoded data
-/// \note Call TWBase32DecodeWithAlphabet with empty string.
+/// \note Call TWBase32DecodeWithAlphabet with nullptr.
 TW_EXPORT_STATIC_METHOD
 TWData* _Nullable TWBase32Decode(TWString* _Nonnull string);
 
 /// Encode an input to Base32 with the given alphabet
 ///
 /// \param data Data to be encoded (raw bytes)
-/// \param alphabet Encode with the given alphabet, if empty ALPHABET_RFC4648 is used by default
+/// \param alphabet Encode with the given alphabet, if nullptr ALPHABET_RFC4648 is used by default
 /// \return The encoded data
 /// \note ALPHABET_RFC4648 doesn't support padding in the default alphabet
 TW_EXPORT_STATIC_METHOD
-TWString *_Nonnull TWBase32EncodeWithAlphabet(TWData *_Nonnull data, TWString* _Nonnull alphabet);
+TWString *_Nonnull TWBase32EncodeWithAlphabet(TWData *_Nonnull data, TWString* _Nullable alphabet);
 
 /// Encode an input to Base32 with the default alphabet (ALPHABET_RFC4648)
 ///
 /// \param data Data to be encoded (raw bytes)
 /// \return The encoded data
-/// \note Call TWBase32EncodeWithAlphabet with empty string.
+/// \note Call TWBase32EncodeWithAlphabet with nullptr.
 TW_EXPORT_STATIC_METHOD
 TWString *_Nonnull TWBase32Encode(TWData *_Nonnull data);
 
diff --git a/include/TrustWalletCore/TWBase58.h b/include/TrustWalletCore/TWBase58.h
index 6e5dbd30a48..a35ae178865 100644
--- a/include/TrustWalletCore/TWBase58.h
+++ b/include/TrustWalletCore/TWBase58.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -33,14 +31,14 @@ TWString *_Nonnull TWBase58EncodeNoCheck(TWData *_Nonnull data);
 /// Decodes a Base58 string, checking the checksum. Returns null if the string is not a valid Base58 string.
 ///
 /// \param string The Base58 string to decode.
-/// \return the decoded data, empty if the string is not a valid Base58 string with checksum.
+/// \return the decoded data, null if the string is not a valid Base58 string with checksum.
 TW_EXPORT_STATIC_METHOD
 TWData *_Nullable TWBase58Decode(TWString *_Nonnull string);
 
 /// Decodes a Base58 string, w/o checking the checksum. Returns null if the string is not a valid Base58 string.
 ///
 /// \param string The Base58 string to decode.
-/// \return the decoded data, empty if the string is not a valid Base58 string without checksum.
+/// \return the decoded data, null if the string is not a valid Base58 string without checksum.
 TW_EXPORT_STATIC_METHOD
 TWData *_Nullable TWBase58DecodeNoCheck(TWString *_Nonnull string);
 
diff --git a/include/TrustWalletCore/TWBase64.h b/include/TrustWalletCore/TWBase64.h
index fa1c29173d1..5b3cff51a73 100644
--- a/include/TrustWalletCore/TWBase64.h
+++ b/include/TrustWalletCore/TWBase64.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWBech32.h b/include/TrustWalletCore/TWBech32.h
new file mode 100644
index 00000000000..53c0ab8973b
--- /dev/null
+++ b/include/TrustWalletCore/TWBech32.h
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Bech32 encode / decode functions
+TW_EXPORT_STRUCT
+struct TWBech32;
+
+/// Encodes data as a Bech32 string.
+///
+/// \param hrp The human-readable part.
+/// \param data The data part.
+/// \return the encoded Bech32 string.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nonnull TWBech32Encode(TWString* _Nonnull hrp, TWData *_Nonnull data);
+
+/// Decodes a Bech32 string. Returns null if the string is not a valid Bech32 string.
+///
+/// \param string The Bech32 string to decode.
+/// \return the decoded data, null if the string is not a valid Bech32 string. Note that the human-readable part is not returned.
+TW_EXPORT_STATIC_METHOD
+TWData *_Nullable TWBech32Decode(TWString *_Nonnull string);
+
+/// Encodes data as a Bech32m string.
+///
+/// \param hrp The human-readable part.
+/// \param data The data part.
+/// \return the encoded Bech32m string.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nonnull TWBech32EncodeM(TWString* _Nonnull hrp, TWData *_Nonnull data);
+
+/// Decodes a Bech32m string. Returns null if the string is not a valid Bech32m string.
+///
+/// \param string The Bech32m string to decode.
+/// \return the decoded data, null if the string is not a valid Bech32m string. Note that the human-readable part is not returned.
+TW_EXPORT_STATIC_METHOD
+TWData *_Nullable TWBech32DecodeM(TWString *_Nonnull string);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWBitcoinAddress.h b/include/TrustWalletCore/TWBitcoinAddress.h
index 77ae6bf1d5d..5fd4d2172a0 100644
--- a/include/TrustWalletCore/TWBitcoinAddress.h
+++ b/include/TrustWalletCore/TWBitcoinAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWBitcoinMessageSigner.h b/include/TrustWalletCore/TWBitcoinMessageSigner.h
new file mode 100644
index 00000000000..4090ff4850f
--- /dev/null
+++ b/include/TrustWalletCore/TWBitcoinMessageSigner.h
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+#include "TWPrivateKey.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Bitcoin message signing and verification.
+///
+/// Bitcoin Core and some other wallets support a message signing & verification format, to create a proof (a signature)
+/// that someone has access to the private keys of a specific address.
+/// This feature currently works on old legacy addresses only.
+TW_EXPORT_STRUCT
+struct TWBitcoinMessageSigner;
+
+/// Sign a message.
+///
+/// \param privateKey: the private key used for signing
+/// \param address: the address that matches the privateKey, must be a legacy address (P2PKH)
+/// \param message: A custom message which is input to the signing.
+/// \note Address is derived assuming compressed public key format.
+/// \returns the signature, Base64-encoded.  On invalid input empty string is returned. Returned object needs to be deleteed after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWBitcoinMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull address, TWString* _Nonnull message);
+
+/// Verify signature for a message.
+///
+/// \param address: address to use, only legacy is supported
+/// \param message: the message signed (without prefix)
+/// \param signature: in Base64-encoded form.
+/// \returns false on any invalid input (does not throw).
+TW_EXPORT_STATIC_METHOD
+bool TWBitcoinMessageSignerVerifyMessage(TWString* _Nonnull address, TWString* _Nonnull message, TWString* _Nonnull signature);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWBitcoinScript.h b/include/TrustWalletCore/TWBitcoinScript.h
index c04611ab166..b49e65ae1f8 100644
--- a/include/TrustWalletCore/TWBitcoinScript.h
+++ b/include/TrustWalletCore/TWBitcoinScript.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -200,7 +198,11 @@ struct TWBitcoinScript* _Nonnull TWBitcoinScriptBuildPayToWitnessScriptHash(TWDa
 /// \note Must be deleted with \TWBitcoinScriptDelete
 /// \return A pointer to the built script
 TW_EXPORT_STATIC_METHOD
-struct TWBitcoinScript* _Nonnull TWBitcoinScriptLockScriptForAddress(TWString* _Nonnull address, enum TWCoinType coin);
+struct TWBitcoinScript *_Nonnull TWBitcoinScriptLockScriptForAddress(TWString* _Nonnull address, enum TWCoinType coin);
+
+/// Builds a appropriate lock script for the given address with replay.
+TW_EXPORT_STATIC_METHOD
+struct TWBitcoinScript *_Nonnull TWBitcoinScriptLockScriptForAddressReplay(TWString *_Nonnull address, enum TWCoinType coin, TWData *_Nonnull blockHash, int64_t blockHeight);
 
 /// Return the default HashType for the given coin, such as TWBitcoinSigHashTypeAll.
 ///
diff --git a/include/TrustWalletCore/TWBitcoinSigHashType.h b/include/TrustWalletCore/TWBitcoinSigHashType.h
index b2682d67074..4d7e9c49a38 100644
--- a/include/TrustWalletCore/TWBitcoinSigHashType.h
+++ b/include/TrustWalletCore/TWBitcoinSigHashType.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWBlockchain.h b/include/TrustWalletCore/TWBlockchain.h
index eb289fc6d43..eeb2f744474 100644
--- a/include/TrustWalletCore/TWBlockchain.h
+++ b/include/TrustWalletCore/TWBlockchain.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -40,11 +38,12 @@ enum TWBlockchain {
     TWBlockchainHarmony = 25,
     TWBlockchainNEAR = 26,
     TWBlockchainAlgorand = 27,
+    TWBlockchainIOST = 28,
     TWBlockchainPolkadot = 29,
     TWBlockchainCardano = 30,
     TWBlockchainNEO = 31,
     TWBlockchainFilecoin = 32,
-    TWBlockchainElrondNetwork = 33,
+    TWBlockchainMultiversX = 33,
     TWBlockchainOasisNetwork = 34,
     TWBlockchainDecred = 35, // Bitcoin
     TWBlockchainZcash = 36, // Bitcoin
@@ -52,8 +51,22 @@ enum TWBlockchain {
     TWBlockchainThorchain = 38, // Cosmos
     TWBlockchainRonin = 39, // Ethereum
     TWBlockchainKusama = 40, // Polkadot
-    TWBlockchainNervos = 41,
-    TWBlockchainEverscale = 42,
+    TWBlockchainZen = 41, // Bitcoin
+    TWBlockchainBitcoinDiamond = 42, // Bitcoin
+    TWBlockchainVerge = 43, // Bitcoin
+    TWBlockchainNervos = 44,
+    TWBlockchainEverscale = 45,
+    TWBlockchainAptos = 46, // Aptos
+    TWBlockchainNebl = 47, // Bitcoin
+    TWBlockchainHedera = 48, // Hedera
+    TWBlockchainTheOpenNetwork = 49,
+    TWBlockchainSui = 50,
+    TWBlockchainGreenfield = 51,
+    TWBlockchainInternetComputer = 52,
+    TWBlockchainNativeEvmos = 53, // Cosmos
+    TWBlockchainNativeInjective = 54, // Cosmos
+    TWBlockchainBitcoinCash = 55,
+    TWBlockchainPactus = 56,
 };
 
 TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWCardano.h b/include/TrustWalletCore/TWCardano.h
index 0def3db33b6..17bd9ebb61f 100644
--- a/include/TrustWalletCore/TWCardano.h
+++ b/include/TrustWalletCore/TWCardano.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -18,12 +16,23 @@ struct TWCardano;
 
 /// Calculates the minimum ADA amount needed for a UTXO.
 ///
+/// \deprecated consider using `TWCardanoOutputMinAdaAmount` instead.
 /// \see reference https://docs.cardano.org/native-tokens/minimum-ada-value-requirement
 /// \param tokenBundle serialized data of TW.Cardano.Proto.TokenBundle.
 /// \return the minimum ADA amount.
 TW_EXPORT_STATIC_METHOD
 uint64_t TWCardanoMinAdaAmount(TWData *_Nonnull tokenBundle) TW_VISIBILITY_DEFAULT;
 
+/// Calculates the minimum ADA amount needed for an output.
+///
+/// \see reference https://docs.cardano.org/native-tokens/minimum-ada-value-requirement
+/// \param toAddress valid destination address, as string.
+/// \param tokenBundle serialized data of TW.Cardano.Proto.TokenBundle.
+/// \param coinsPerUtxoByte cost per one byte of a serialized UTXO (Base-10 decimal string).
+/// \return the minimum ADA amount (Base-10 decimal string).
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWCardanoOutputMinAdaAmount(TWString *_Nonnull toAddress, TWData *_Nonnull tokenBundle, TWString *_Nonnull coinsPerUtxoByte) TW_VISIBILITY_DEFAULT;
+
 /// Return the staking address associated to (contained in) this address. Must be a Base address.
 /// Empty string is returned on error. Result must be freed.
 /// \param baseAddress A valid base address, as string.
@@ -31,4 +40,10 @@ uint64_t TWCardanoMinAdaAmount(TWData *_Nonnull tokenBundle) TW_VISIBILITY_DEFAU
 TW_EXPORT_STATIC_METHOD
 TWString *_Nonnull TWCardanoGetStakingAddress(TWString *_Nonnull baseAddress) TW_VISIBILITY_DEFAULT;
 
+/// Return the legacy(byron) address.
+/// \param publicKey A valid public key with TWPublicKeyTypeED25519Cardano type.
+/// \return the legacy(byron) address, as string, or empty string on error.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nonnull TWCardanoGetByronAddress(struct TWPublicKey *_Nonnull publicKey);
+
 TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWCoinType.h b/include/TrustWalletCore/TWCoinType.h
index 002b622c28a..9d2f10e36c9 100644
--- a/include/TrustWalletCore/TWCoinType.h
+++ b/include/TrustWalletCore/TWCoinType.h
@@ -1,23 +1,28 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "TWBase.h"
 #include "TWBlockchain.h"
 #include "TWCurve.h"
+#include "TWDerivation.h"
 #include "TWHDVersion.h"
 #include "TWHRP.h"
-#include "TWPrivateKey.h"
 #include "TWPurpose.h"
 #include "TWString.h"
 #include "TWDerivation.h"
+#include "TWPublicKeyType.h"
 
 TW_EXTERN_C_BEGIN
 
+/// Represents a private key.
+struct TWPrivateKey;
+
+/// Represents a public key.
+struct TWPublicKey;
+
 /// Coin type for Level 2 of BIP44.
 ///
 /// \see https://github.com/satoshilabs/slips/blob/master/slip-0044.md
@@ -32,11 +37,13 @@ enum TWCoinType {
     TWCoinTypeCallisto = 820,
     TWCoinTypeCardano = 1815, // Note: Cardano Shelley testnet uses purpose 1852 (not 44) 1852/1815
     TWCoinTypeCosmos = 118,
+    TWCoinTypePivx = 119,
     TWCoinTypeDash = 5,
     TWCoinTypeDecred = 42,
     TWCoinTypeDigiByte = 20,
     TWCoinTypeDogecoin = 3,
     TWCoinTypeEOS = 194,
+    TWCoinTypeWAX = 14001,
     TWCoinTypeEthereum = 60,
     TWCoinTypeEthereumClassic = 61,
     TWCoinTypeFIO = 235,
@@ -61,9 +68,9 @@ enum TWCoinType {
     TWCoinTypeStellar = 148,
     TWCoinTypeTezos = 1729,
     TWCoinTypeTheta = 500,
-    TWCoinTypeThunderToken = 1001,
+    TWCoinTypeThunderCore = 1001,
     TWCoinTypeNEO = 888,
-    TWCoinTypeTomoChain = 889,
+    TWCoinTypeViction = 889,
     TWCoinTypeTron = 195,
     TWCoinTypeVeChain = 818,
     TWCoinTypeViacoin = 14,
@@ -81,15 +88,17 @@ enum TWCoinType {
     TWCoinTypeKusama = 434,
     TWCoinTypePolkadot = 354,
     TWCoinTypeFilecoin = 461,
-    TWCoinTypeElrond = 508,
+    TWCoinTypeMultiversX = 508,
     TWCoinTypeBandChain = 494,
     TWCoinTypeSmartChainLegacy = 10000714,
     TWCoinTypeSmartChain = 20000714,
+    TWCoinTypeTBinance = 30000714,
     TWCoinTypeOasis = 474,
     TWCoinTypePolygon = 966,
     TWCoinTypeTHORChain = 931,
     TWCoinTypeBluzelle = 483,
     TWCoinTypeOptimism = 10000070,
+    TWCoinTypeZksync = 10000324,
     TWCoinTypeArbitrum = 10042221,
     TWCoinTypeECOChain = 10000553,
     TWCoinTypeAvalancheCChain = 10009000,
@@ -100,22 +109,85 @@ enum TWCoinType {
     TWCoinTypeRonin = 10002020,
     TWCoinTypeOsmosis = 10000118,
     TWCoinTypeECash = 899,
+    TWCoinTypeIOST = 291,
     TWCoinTypeCronosChain = 10000025,
     TWCoinTypeSmartBitcoinCash = 10000145,
     TWCoinTypeKuCoinCommunityChain = 10000321,
+    TWCoinTypeBitcoinDiamond = 999,
     TWCoinTypeBoba = 10000288,
-    TWCoinTypeMetis = 1001088,
+    TWCoinTypeSyscoin = 57,
+    TWCoinTypeVerge = 77,
+    TWCoinTypeZen = 121,
+    TWCoinTypeMetis = 10001088,
     TWCoinTypeAurora = 1323161554,
     TWCoinTypeEvmos = 10009001,
     TWCoinTypeNativeEvmos = 20009001,
     TWCoinTypeMoonriver = 10001285,
     TWCoinTypeMoonbeam = 10001284,
     TWCoinTypeKavaEvm = 10002222,
-    TWCoinTypeKlaytn = 10008217,
+    TWCoinTypeKaia = 10008217,
     TWCoinTypeMeter = 18000,
     TWCoinTypeOKXChain = 996,
+    TWCoinTypeStratis = 105105,
+    TWCoinTypeKomodo = 141,
     TWCoinTypeNervos = 309,
     TWCoinTypeEverscale = 396,
+    TWCoinTypeAptos = 637,
+    TWCoinTypeNebl = 146,
+    TWCoinTypeHedera = 3030,
+    TWCoinTypeSecret = 529,
+    TWCoinTypeNativeInjective = 10000060,
+    TWCoinTypeAgoric = 564,
+    TWCoinTypeTON = 607,
+    TWCoinTypeSui = 784,
+    TWCoinTypeStargaze = 20000118,
+    TWCoinTypePolygonzkEVM = 10001101,
+    TWCoinTypeJuno = 30000118,
+    TWCoinTypeStride = 40000118,
+    TWCoinTypeAxelar = 50000118,
+    TWCoinTypeCrescent = 60000118,
+    TWCoinTypeKujira = 70000118,
+    TWCoinTypeIoTeXEVM = 10004689,
+    TWCoinTypeNativeCanto = 10007700,
+    TWCoinTypeComdex = 80000118,
+    TWCoinTypeNeutron = 90000118,
+    TWCoinTypeSommelier = 11000118,
+    TWCoinTypeFetchAI = 12000118,
+    TWCoinTypeMars = 13000118,
+    TWCoinTypeUmee = 14000118,
+    TWCoinTypeCoreum = 10000990,
+    TWCoinTypeQuasar = 15000118,
+    TWCoinTypePersistence = 16000118,
+    TWCoinTypeAkash = 17000118,
+    TWCoinTypeNoble = 18000118,
+    TWCoinTypeScroll = 534352,
+    TWCoinTypeRootstock = 137,
+    TWCoinTypeThetaFuel = 361,
+    TWCoinTypeConfluxeSpace = 1030,
+    TWCoinTypeAcala = 787,
+    TWCoinTypeAcalaEVM = 10000787,
+    TWCoinTypeOpBNB = 204,
+    TWCoinTypeNeon = 245022934,
+    TWCoinTypeBase = 8453,
+    TWCoinTypeSei = 19000118,
+    TWCoinTypeArbitrumNova = 10042170,
+    TWCoinTypeLinea = 59144,
+    TWCoinTypeGreenfield = 5600,
+    TWCoinTypeMantle = 5000,
+    TWCoinTypeZenEON = 7332,
+    TWCoinTypeInternetComputer = 223,
+    TWCoinTypeTia = 21000118,
+    TWCoinTypeMantaPacific = 169,
+    TWCoinTypeNativeZetaChain = 10007000,
+    TWCoinTypeZetaEVM = 20007000,
+    TWCoinTypeDydx = 22000118,
+    TWCoinTypeMerlin = 4200,
+    TWCoinTypeLightlink = 1890,
+    TWCoinTypeBlast = 81457,
+    TWCoinTypeBounceBit = 6001,
+    TWCoinTypeZkLinkNova = 810180,
+    TWCoinTypePactus = 21888,
+    // end_of_tw_coin_type_marker_do_not_modify
 };
 
 /// Returns the blockchain for a coin type.
@@ -194,6 +266,12 @@ TW_EXPORT_METHOD
 TWString* _Nonnull TWCoinTypeDeriveAddressFromPublicKey(enum TWCoinType coin,
                                                         struct TWPublicKey* _Nonnull publicKey);
 
+/// Derives the address for a particular coin from the public key with the derivation.
+TW_EXPORT_METHOD
+TWString* _Nonnull TWCoinTypeDeriveAddressFromPublicKeyAndDerivation(enum TWCoinType coin,
+                                                                     struct TWPublicKey* _Nonnull publicKey,
+                                                                     enum TWDerivation derivation);
+
 /// HRP for this coin type
 ///
 /// \param coin A coin type
@@ -237,6 +315,13 @@ TWString* _Nonnull TWCoinTypeChainId(enum TWCoinType coin);
 TW_EXPORT_PROPERTY
 uint32_t TWCoinTypeSlip44Id(enum TWCoinType coin);
 
+/// SS58Prefix for this coin type
+///
+/// \param coin A coin type
+/// \return SS58Prefix for the given coin type
+TW_EXPORT_PROPERTY
+uint32_t TWCoinTypeSS58Prefix(enum TWCoinType coin);
+
 /// public key type for this coin type
 ///
 /// \param coin A coin type
diff --git a/include/TrustWalletCore/TWCoinTypeConfiguration.h b/include/TrustWalletCore/TWCoinTypeConfiguration.h
index 1a04fab57d8..ca71f4dc56e 100644
--- a/include/TrustWalletCore/TWCoinTypeConfiguration.h
+++ b/include/TrustWalletCore/TWCoinTypeConfiguration.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWCryptoBox.h b/include/TrustWalletCore/TWCryptoBox.h
new file mode 100644
index 00000000000..abd27ca8191
--- /dev/null
+++ b/include/TrustWalletCore/TWCryptoBox.h
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWCryptoBoxPublicKey.h"
+#include "TWCryptoBoxSecretKey.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// `crypto_box` encryption algorithms.
+TW_EXPORT_STRUCT
+struct TWCryptoBox;
+
+/// Encrypts message using `my_secret` and `other_pubkey`.
+/// The output will have a randomly generated nonce prepended to it.
+/// The output will be Overhead + 24 bytes longer than the original.
+///
+/// \param mySecret *non-null* pointer to my secret key.
+/// \param otherPubkey *non-null* pointer to other's public key.
+/// \param message *non-null* pointer to the message to be encrypted.
+/// \return *nullable* pointer to the encrypted message with randomly generated nonce prepended to it.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nonnull TWCryptoBoxEncryptEasy(struct TWCryptoBoxSecretKey* _Nonnull mySecret, struct TWCryptoBoxPublicKey* _Nonnull otherPubkey, TWData* _Nonnull message);
+
+/// Decrypts box produced by `TWCryptoBoxEncryptEasy`.
+/// We assume a 24-byte nonce is prepended to the encrypted text in box.
+///
+/// \param mySecret *non-null* pointer to my secret key.
+/// \param otherPubkey *non-null* pointer to other's public key.
+/// \param encrypted *non-null* pointer to the encrypted message with nonce prepended to it.
+/// \return *nullable* pointer to the decrypted message.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nullable TWCryptoBoxDecryptEasy(struct TWCryptoBoxSecretKey* _Nonnull mySecret, struct TWCryptoBoxPublicKey* _Nonnull otherPubkey, TWData* _Nonnull encrypted);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWCryptoBoxPublicKey.h b/include/TrustWalletCore/TWCryptoBoxPublicKey.h
new file mode 100644
index 00000000000..e46ea72feae
--- /dev/null
+++ b/include/TrustWalletCore/TWCryptoBoxPublicKey.h
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Public key used in `crypto_box` cryptography.
+TW_EXPORT_CLASS
+struct TWCryptoBoxPublicKey;
+
+/// Determines if the given public key is valid or not.
+///
+/// \param data *non-null* byte array.
+/// \return true if the public key is valid, false otherwise.
+TW_EXPORT_STATIC_METHOD
+bool TWCryptoBoxPublicKeyIsValid(TWData* _Nonnull data);
+
+/// Create a `crypto_box` public key with the given block of data.
+///
+/// \param data *non-null* byte array. Expected to have 32 bytes.
+/// \note Should be deleted with \tw_crypto_box_public_key_delete.
+/// \return Nullable pointer to Public Key.
+TW_EXPORT_STATIC_METHOD
+struct TWCryptoBoxPublicKey* _Nullable TWCryptoBoxPublicKeyCreateWithData(TWData* _Nonnull data);
+
+/// Delete the given public key.
+///
+/// \param publicKey *non-null* pointer to public key.
+TW_EXPORT_METHOD
+void TWCryptoBoxPublicKeyDelete(struct TWCryptoBoxPublicKey* _Nonnull publicKey);
+
+/// Returns the raw data of the given public-key.
+///
+/// \param publicKey *non-null* pointer to a public key.
+/// \return C-compatible result with a C-compatible byte array.
+TW_EXPORT_PROPERTY
+TWData* _Nonnull TWCryptoBoxPublicKeyData(struct TWCryptoBoxPublicKey* _Nonnull publicKey);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWCryptoBoxSecretKey.h b/include/TrustWalletCore/TWCryptoBoxSecretKey.h
new file mode 100644
index 00000000000..f93ad92eb56
--- /dev/null
+++ b/include/TrustWalletCore/TWCryptoBoxSecretKey.h
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWCryptoBoxPublicKey.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Secret key used in `crypto_box` cryptography.
+TW_EXPORT_CLASS
+struct TWCryptoBoxSecretKey;
+
+/// Determines if the given secret key is valid or not.
+///
+/// \param data *non-null* byte array.
+/// \return true if the secret key is valid, false otherwise.
+TW_EXPORT_STATIC_METHOD
+bool TWCryptoBoxSecretKeyIsValid(TWData* _Nonnull data);
+
+/// Create a random secret key.
+///
+/// \note Should be deleted with \tw_crypto_box_secret_key_delete.
+/// \return *non-null* pointer to Secret Key.
+TW_EXPORT_STATIC_METHOD
+struct TWCryptoBoxSecretKey* _Nonnull TWCryptoBoxSecretKeyCreate();
+
+/// Create a `crypto_box` secret key with the given block of data.
+///
+/// \param data *non-null* byte array. Expected to have 32 bytes.
+/// \note Should be deleted with \tw_crypto_box_secret_key_delete.
+/// \return Nullable pointer to Secret Key.
+TW_EXPORT_STATIC_METHOD
+struct TWCryptoBoxSecretKey* _Nullable TWCryptoBoxSecretKeyCreateWithData(TWData* _Nonnull data);
+
+/// Delete the given secret `key`.
+///
+/// \param key *non-null* pointer to secret key.
+TW_EXPORT_METHOD
+void TWCryptoBoxSecretKeyDelete(struct TWCryptoBoxSecretKey* _Nonnull key);
+
+/// Returns the public key associated with the given `key`.
+///
+/// \param key *non-null* pointer to the private key.
+/// \return *non-null* pointer to the corresponding public key.
+TW_EXPORT_METHOD
+struct TWCryptoBoxPublicKey* _Nonnull TWCryptoBoxSecretKeyGetPublicKey(struct TWCryptoBoxSecretKey* _Nonnull key);
+
+/// Returns the raw data of the given secret-key.
+///
+/// \param secretKey *non-null* pointer to a secret key.
+/// \return C-compatible result with a C-compatible byte array.
+TW_EXPORT_PROPERTY
+TWData* _Nonnull TWCryptoBoxSecretKeyData(struct TWCryptoBoxSecretKey* _Nonnull secretKey);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWCurve.h b/include/TrustWalletCore/TWCurve.h
index 79d2891aa40..3b7f2b003bd 100644
--- a/include/TrustWalletCore/TWCurve.h
+++ b/include/TrustWalletCore/TWCurve.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -19,6 +17,7 @@ enum TWCurve {
     TWCurveCurve25519             /* "curve25519" */,
     TWCurveNIST256p1              /* "nist256p1" */,
     TWCurveED25519ExtendedCardano /* "ed25519-cardano-seed" */,
+    TWCurveStarkex                /* "starkex" */,
     TWCurveNone
 };
 
diff --git a/include/TrustWalletCore/TWData.h b/include/TrustWalletCore/TWData.h
index 2eebf174c39..77dc7c625b6 100644
--- a/include/TrustWalletCore/TWData.h
+++ b/include/TrustWalletCore/TWData.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWDataVector.h b/include/TrustWalletCore/TWDataVector.h
index 6e2e88912d0..fbfae776ad2 100644
--- a/include/TrustWalletCore/TWDataVector.h
+++ b/include/TrustWalletCore/TWDataVector.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWDerivation.h b/include/TrustWalletCore/TWDerivation.h
new file mode 100644
index 00000000000..3437313e934
--- /dev/null
+++ b/include/TrustWalletCore/TWDerivation.h
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE from \registry.json, changes made here WILL BE LOST.
+//
+
+#pragma once
+
+#include "TWBase.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Non-default coin address derivation names (default, unnamed derivations are not included).
+/// Note the enum variant must be sync with `TWDerivation` enum in Rust:
+/// https://github.com/trustwallet/wallet-core/blob/master/rust/tw_coin_registry/src/tw_derivation.rs
+TW_EXPORT_ENUM()
+enum TWDerivation {
+    TWDerivationDefault = 0, // default, for any coin
+    TWDerivationCustom = 1, // custom, for any coin
+    TWDerivationBitcoinSegwit = 2,
+    TWDerivationBitcoinLegacy = 3,
+    TWDerivationBitcoinTestnet = 4,
+    TWDerivationLitecoinLegacy = 5,
+    TWDerivationSolanaSolana = 6,
+    TWDerivationStratisSegwit = 7,
+    TWDerivationBitcoinTaproot = 8,
+    // end_of_derivation_enum - USED TO GENERATE CODE
+};
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWDerivationPath.h b/include/TrustWalletCore/TWDerivationPath.h
index 910288f600f..ccec3051138 100644
--- a/include/TrustWalletCore/TWDerivationPath.h
+++ b/include/TrustWalletCore/TWDerivationPath.h
@@ -1,14 +1,11 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "TWBase.h"
 #include "TWCoinType.h"
-#include "TWDerivationPath.h"
 #include "TWPurpose.h"
 #include "TWString.h"
 
diff --git a/include/TrustWalletCore/TWDerivationPathIndex.h b/include/TrustWalletCore/TWDerivationPathIndex.h
index 72bd2b8344e..a015f37b5f5 100644
--- a/include/TrustWalletCore/TWDerivationPathIndex.h
+++ b/include/TrustWalletCore/TWDerivationPathIndex.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWEthereum.h b/include/TrustWalletCore/TWEthereum.h
new file mode 100644
index 00000000000..9ff49f208b2
--- /dev/null
+++ b/include/TrustWalletCore/TWEthereum.h
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+TW_EXPORT_STRUCT
+struct TWEthereum;
+
+/// Generate a layer 2 eip2645 derivation path from eth address, layer, application and given index.
+///
+/// \param wallet non-null TWHDWallet
+/// \param ethAddress non-null Ethereum address
+/// \param layer  non-null layer 2 name (E.G starkex)
+/// \param application non-null layer 2 application (E.G immutablex)
+/// \param index non-null layer 2 index (E.G 1)
+/// \return a valid eip2645 layer 2 derivation path as a string
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWEthereumEip2645GetPath(TWString* _Nonnull ethAddress, TWString* _Nonnull layer,  TWString* _Nonnull application,  TWString* _Nonnull index);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWEthereumAbi.h b/include/TrustWalletCore/TWEthereumAbi.h
index 5baf7161942..f2d23a4dec5 100644
--- a/include/TrustWalletCore/TWEthereumAbi.h
+++ b/include/TrustWalletCore/TWEthereumAbi.h
@@ -1,14 +1,13 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "TWBase.h"
-#include "TWString.h"
+#include "TWCoinType.h"
 #include "TWData.h"
+#include "TWString.h"
 
 TW_EXTERN_C_BEGIN
 
@@ -18,6 +17,38 @@ struct TWEthereumAbiFunction;
 TW_EXPORT_STRUCT
 struct TWEthereumAbi;
 
+/// Decode a contract call (function input) according to an ABI json.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.ContractCallDecodingInput`.
+/// \return The serialized data of a `TW.EthereumAbi.Proto.ContractCallDecodingOutput` proto object.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nonnull TWEthereumAbiDecodeContractCall(enum TWCoinType coin, TWData* _Nonnull input);
+
+/// Decode a function input or output data according to a given ABI.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.ParamsDecodingInput`.
+/// \return The serialized data of a `TW.EthereumAbi.Proto.ParamsDecodingOutput` proto object.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nonnull TWEthereumAbiDecodeParams(enum TWCoinType coin, TWData* _Nonnull input);
+
+/// /// Decodes an Eth ABI value according to a given type.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.ValueDecodingInput`.
+/// \return The serialized data of a `TW.EthereumAbi.Proto.ValueDecodingOutput` proto object.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nonnull TWEthereumAbiDecodeValue(enum TWCoinType coin, TWData* _Nonnull input);
+
+/// Encode function to Eth ABI binary.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.FunctionEncodingInput`.
+/// \return The serialized data of a `TW.EthereumAbi.Proto.FunctionEncodingOutput` proto object.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nonnull TWEthereumAbiEncodeFunction(enum TWCoinType coin, TWData* _Nonnull input);
+
 /// Encode function to Eth ABI binary
 ///
 /// \param fn Non-null Eth abi function
diff --git a/include/TrustWalletCore/TWEthereumAbiFunction.h b/include/TrustWalletCore/TWEthereumAbiFunction.h
index 4034ade5180..cb5fbb9407c 100644
--- a/include/TrustWalletCore/TWEthereumAbiFunction.h
+++ b/include/TrustWalletCore/TWEthereumAbiFunction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWEthereumAbiValue.h b/include/TrustWalletCore/TWEthereumAbiValue.h
index 9bbf6ce34eb..fcbe14de839 100644
--- a/include/TrustWalletCore/TWEthereumAbiValue.h
+++ b/include/TrustWalletCore/TWEthereumAbiValue.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWEthereumMessageSigner.h b/include/TrustWalletCore/TWEthereumMessageSigner.h
new file mode 100644
index 00000000000..6d73c338f6c
--- /dev/null
+++ b/include/TrustWalletCore/TWEthereumMessageSigner.h
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+#include "TWPrivateKey.h"
+#include "TWPublicKey.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Ethereum message signing and verification.
+///
+/// Ethereum and some other wallets support a message signing & verification format, to create a proof (a signature)
+/// that someone has access to the private keys of a specific address.
+TW_EXPORT_STRUCT
+struct TWEthereumMessageSigner;
+
+/// Sign a typed message EIP-712 V4.
+///
+/// \param privateKey: the private key used for signing
+/// \param messageJson: A custom typed data message in json
+/// \returns the signature, Hex-encoded. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWEthereumMessageSignerSignTypedMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull messageJson);
+
+/// Sign a typed message EIP-712 V4 with EIP-155 replay attack protection.
+///
+/// \param privateKey: the private key used for signing
+/// \param messageJson: A custom typed data message in json
+/// \param chainId: chainId for eip-155 protection
+/// \returns the signature, Hex-encoded. On invalid input empty string is returned or invalid chainId error message. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWEthereumMessageSignerSignTypedMessageEip155(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull messageJson, int chainId);
+
+/// Sign a message.
+///
+/// \param privateKey: the private key used for signing
+/// \param message: A custom message which is input to the signing.
+/// \returns the signature, Hex-encoded. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWEthereumMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message);
+
+/// Sign a message with Immutable X msg type.
+///
+/// \param privateKey: the private key used for signing
+/// \param message: A custom message which is input to the signing.
+/// \returns the signature, Hex-encoded. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWEthereumMessageSignerSignMessageImmutableX(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message);
+
+/// Sign a message with Eip-155 msg type.
+///
+/// \param privateKey: the private key used for signing
+/// \param message: A custom message which is input to the signing.
+/// \param chainId: chainId for eip-155 protection
+/// \returns the signature, Hex-encoded. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWEthereumMessageSignerSignMessageEip155(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message, int chainId);
+
+/// Verify signature for a message.
+///
+/// \param pubKey: pubKey that will verify and recover the message from the signature
+/// \param message: the message signed (without prefix)
+/// \param signature: in Hex-encoded form.
+/// \returns false on any invalid input (does not throw), true if the message can be recovered from the signature
+TW_EXPORT_STATIC_METHOD
+bool TWEthereumMessageSignerVerifyMessage(const struct TWPublicKey* _Nonnull pubKey, TWString* _Nonnull message, TWString* _Nonnull signature);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWEthereumRlp.h b/include/TrustWalletCore/TWEthereumRlp.h
new file mode 100644
index 00000000000..361ac305cbc
--- /dev/null
+++ b/include/TrustWalletCore/TWEthereumRlp.h
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWCoinType.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+TW_EXPORT_STRUCT
+struct TWEthereumRlp;
+
+/// Encode an item or a list of items as Eth RLP binary format.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input Non-null serialized `EthereumRlp::Proto::EncodingInput`.
+/// \return serialized `EthereumRlp::Proto::EncodingOutput`.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nonnull TWEthereumRlpEncode(enum TWCoinType coin, TWData* _Nonnull input);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWFIOAccount.h b/include/TrustWalletCore/TWFIOAccount.h
index 876aabbda7d..e11a65c4b3d 100644
--- a/include/TrustWalletCore/TWFIOAccount.h
+++ b/include/TrustWalletCore/TWFIOAccount.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWFilecoinAddressConverter.h b/include/TrustWalletCore/TWFilecoinAddressConverter.h
new file mode 100644
index 00000000000..b6c3689984c
--- /dev/null
+++ b/include/TrustWalletCore/TWFilecoinAddressConverter.h
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Filecoin-Ethereum address converter.
+TW_EXPORT_STRUCT
+struct TWFilecoinAddressConverter;
+
+/// Converts a Filecoin address to Ethereum.
+///
+/// \param filecoinAddress: a Filecoin address.
+/// \returns the Ethereum address. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWFilecoinAddressConverterConvertToEthereum(TWString* _Nonnull filecoinAddress);
+
+/// Converts an Ethereum address to Filecoin.
+///
+/// \param ethAddress: an Ethereum address.
+/// \returns the Filecoin address. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWFilecoinAddressConverterConvertFromEthereum(TWString* _Nonnull ethAddress);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWFilecoinAddressType.h b/include/TrustWalletCore/TWFilecoinAddressType.h
new file mode 100644
index 00000000000..5bab60774c5
--- /dev/null
+++ b/include/TrustWalletCore/TWFilecoinAddressType.h
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Filecoin address type.
+TW_EXPORT_ENUM(uint32_t)
+enum TWFilecoinAddressType {
+    TWFilecoinAddressTypeDefault = 0, // default
+    TWFilecoinAddressTypeDelegated = 1,
+};
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWFiroAddressType.h b/include/TrustWalletCore/TWFiroAddressType.h
new file mode 100644
index 00000000000..55fa3a84259
--- /dev/null
+++ b/include/TrustWalletCore/TWFiroAddressType.h
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Firo address type.
+TW_EXPORT_ENUM(uint32_t)
+enum TWFiroAddressType {
+    TWFiroAddressTypeDefault = 0, // default
+    TWFiroAddressTypeExchange = 1,
+};
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWGroestlcoinAddress.h b/include/TrustWalletCore/TWGroestlcoinAddress.h
index b35ce21ee64..52114afd736 100644
--- a/include/TrustWalletCore/TWGroestlcoinAddress.h
+++ b/include/TrustWalletCore/TWGroestlcoinAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWHDVersion.h b/include/TrustWalletCore/TWHDVersion.h
index dec82a60ebc..ceb7733e676 100644
--- a/include/TrustWalletCore/TWHDVersion.h
+++ b/include/TrustWalletCore/TWHDVersion.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -24,12 +22,18 @@ enum TWHDVersion {
     TWHDVersionYPRV = 0x049d7878,
     TWHDVersionZPUB = 0x04b24746,
     TWHDVersionZPRV = 0x04b2430c,
+    TWHDVersionVPUB = 0x045f1cf6,
+    TWHDVersionVPRV = 0x045f18bc,
+    TWHDVersionTPUB = 0x043587cf,
+    TWHDVersionTPRV = 0x04358394,
 
     // Litecoin
     TWHDVersionLTUB = 0x019da462,
     TWHDVersionLTPV = 0x019d9cfe,
     TWHDVersionMTUB = 0x01b26ef6,
     TWHDVersionMTPV = 0x01b26792,
+    TWHDVersionTTUB = 0x0436f6e1,
+    TWHDVersionTTPV = 0x0436ef7d,
 
     // Decred
     TWHDVersionDPUB = 0x2fda926,
diff --git a/include/TrustWalletCore/TWHDWallet.h b/include/TrustWalletCore/TWHDWallet.h
index 55ab3e13b4a..9e902a55587 100644
--- a/include/TrustWalletCore/TWHDWallet.h
+++ b/include/TrustWalletCore/TWHDWallet.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -11,7 +9,9 @@
 #include "TWCurve.h"
 #include "TWData.h"
 #include "TWDerivation.h"
+#include "TWDerivationPath.h"
 #include "TWHDVersion.h"
+#include "TWDerivation.h"
 #include "TWPrivateKey.h"
 #include "TWPublicKey.h"
 #include "TWPurpose.h"
@@ -100,8 +100,10 @@ TWData* _Nonnull TWHDWalletEntropy(struct TWHDWallet* _Nonnull wallet);
 TW_EXPORT_METHOD
 struct TWPrivateKey* _Nonnull TWHDWalletGetMasterKey(struct TWHDWallet* _Nonnull wallet, enum TWCurve curve);
 
-/// Generates the default private key for the specified coin.
+/// Generates the default private key for the specified coin, using default derivation.
 ///
+/// \see TWHDWalletGetKey
+/// \see TWHDWalletGetKeyDerivation
 /// \param wallet non-null TWHDWallet
 /// \param coin  a coin type
 /// \note Returned object needs to be deleted with \TWPrivateKeyDelete
@@ -109,16 +111,29 @@ struct TWPrivateKey* _Nonnull TWHDWalletGetMasterKey(struct TWHDWallet* _Nonnull
 TW_EXPORT_METHOD
 struct TWPrivateKey* _Nonnull TWHDWalletGetKeyForCoin(struct TWHDWallet* _Nonnull wallet, enum TWCoinType coin);
 
-/// Generates the default address for the specified coin (without exposing intermediary private key).
+/// Generates the default address for the specified coin (without exposing intermediary private key), default derivation.
 ///
+/// \see TWHDWalletGetAddressDerivation
 /// \param wallet non-null TWHDWallet
 /// \param coin  a coin type
 /// \return return the default address for the specified coin as a non-null TWString
 TW_EXPORT_METHOD
 TWString* _Nonnull TWHDWalletGetAddressForCoin(struct TWHDWallet* _Nonnull wallet, enum TWCoinType coin);
 
+/// Generates the default address for the specified coin and derivation (without exposing intermediary private key).
+///
+/// \see TWHDWalletGetAddressForCoin
+/// \param wallet non-null TWHDWallet
+/// \param coin  a coin type
+/// \param derivation  a (custom) derivation to use
+/// \return return the default address for the specified coin as a non-null TWString
+TW_EXPORT_METHOD
+TWString* _Nonnull TWHDWalletGetAddressDerivation(struct TWHDWallet* _Nonnull wallet, enum TWCoinType coin, enum TWDerivation derivation);
+
 /// Generates the private key for the specified derivation path.
 ///
+/// \see TWHDWalletGetKeyForCoin
+/// \see TWHDWalletGetKeyDerivation
 /// \param wallet non-null TWHDWallet
 /// \param coin a coin type
 /// \param derivationPath  a non-null derivation path
@@ -127,6 +142,18 @@ TWString* _Nonnull TWHDWalletGetAddressForCoin(struct TWHDWallet* _Nonnull walle
 TW_EXPORT_METHOD
 struct TWPrivateKey* _Nonnull TWHDWalletGetKey(struct TWHDWallet* _Nonnull wallet, enum TWCoinType coin, TWString* _Nonnull derivationPath);
 
+/// Generates the private key for the specified derivation.
+///
+/// \see TWHDWalletGetKey
+/// \see TWHDWalletGetKeyForCoin
+/// \param wallet non-null TWHDWallet
+/// \param coin a coin type
+/// \param derivation a (custom) derivation to use
+/// \note Returned object needs to be deleted with \TWPrivateKeyDelete
+/// \return The private key for the specified derivation path/coin
+TW_EXPORT_METHOD
+struct TWPrivateKey* _Nonnull TWHDWalletGetKeyDerivation(struct TWHDWallet* _Nonnull wallet, enum TWCoinType coin, enum TWDerivation derivation);
+
 /// Generates the private key for the specified derivation path and curve.
 ///
 /// \param wallet non-null TWHDWallet
diff --git a/include/TrustWalletCore/TWHash.h b/include/TrustWalletCore/TWHash.h
index ccdb7d0fb9e..06024bb4e4f 100644
--- a/include/TrustWalletCore/TWHash.h
+++ b/include/TrustWalletCore/TWHash.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -103,6 +101,9 @@ TWData *_Nonnull TWHashBlake2b(TWData *_Nonnull data, size_t size);
 ///
 /// \param data Non-null block of data
 /// \return Non-null computed Groestl512 block of data
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWHashBlake2bPersonal(TWData *_Nonnull data, TWData * _Nonnull personal, size_t outlen);
+
 TW_EXPORT_STATIC_METHOD
 TWData *_Nonnull TWHashGroestl512(TWData *_Nonnull data);
 
diff --git a/include/TrustWalletCore/TWLiquidStaking.h b/include/TrustWalletCore/TWLiquidStaking.h
new file mode 100644
index 00000000000..a50f3e2709b
--- /dev/null
+++ b/include/TrustWalletCore/TWLiquidStaking.h
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// THORChain swap functions
+TW_EXPORT_STRUCT
+struct TWLiquidStaking;
+
+/// Builds a LiquidStaking transaction input.
+///
+/// \param input The serialized data of LiquidStakingInput.
+/// \return The serialized data of LiquidStakingOutput.
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWLiquidStakingBuildRequest(TWData *_Nonnull input);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWMnemonic.h b/include/TrustWalletCore/TWMnemonic.h
index f74b6ad164f..2cfba1dba70 100644
--- a/include/TrustWalletCore/TWMnemonic.h
+++ b/include/TrustWalletCore/TWMnemonic.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWNEARAccount.h b/include/TrustWalletCore/TWNEARAccount.h
index 73e7662fe34..cd8fbb4b97a 100644
--- a/include/TrustWalletCore/TWNEARAccount.h
+++ b/include/TrustWalletCore/TWNEARAccount.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWNervosAddress.h b/include/TrustWalletCore/TWNervosAddress.h
index b12e663aec1..0254c2bf5cf 100644
--- a/include/TrustWalletCore/TWNervosAddress.h
+++ b/include/TrustWalletCore/TWNervosAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWPBKDF2.h b/include/TrustWalletCore/TWPBKDF2.h
index a7edcc65380..86c6cca6801 100644
--- a/include/TrustWalletCore/TWPBKDF2.h
+++ b/include/TrustWalletCore/TWPBKDF2.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWPrivateKey.h b/include/TrustWalletCore/TWPrivateKey.h
index ee4cf3fc7e2..5fdfc61bcde 100644
--- a/include/TrustWalletCore/TWPrivateKey.h
+++ b/include/TrustWalletCore/TWPrivateKey.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -10,6 +8,7 @@
 #include "TWCurve.h"
 #include "TWData.h"
 #include "TWPublicKey.h"
+#include "TWCoinType.h"
 
 TW_EXTERN_C_BEGIN
 
@@ -63,6 +62,22 @@ bool TWPrivateKeyIsValid(TWData* _Nonnull data, enum TWCurve curve);
 TW_EXPORT_PROPERTY
 TWData* _Nonnull TWPrivateKeyData(struct TWPrivateKey* _Nonnull pk);
 
+/// Returns the public key associated with the given coinType and privateKey
+///
+/// \param pk Non-null pointer to the private key
+/// \param coinType coinType of the given private key
+/// \return Non-null pointer to the corresponding public key
+TW_EXPORT_METHOD
+struct TWPublicKey* _Nonnull TWPrivateKeyGetPublicKey(struct TWPrivateKey* _Nonnull pk, enum TWCoinType coinType);
+
+/// Returns the public key associated with the given pubkeyType and privateKey
+///
+/// \param pk Non-null pointer to the private key
+/// \param pubkeyType pubkeyType of the given private key
+/// \return Non-null pointer to the corresponding public key
+TW_EXPORT_METHOD
+struct TWPublicKey* _Nonnull TWPrivateKeyGetPublicKeyByType(struct TWPrivateKey* _Nonnull pk, enum TWPublicKeyType pubkeyType);
+
 /// Returns the Secp256k1 public key associated with the given private key
 ///
 /// \param pk Non-null pointer to the private key
@@ -106,16 +121,6 @@ struct TWPublicKey* _Nonnull TWPrivateKeyGetPublicKeyEd25519Cardano(struct TWPri
 TW_EXPORT_METHOD
 struct TWPublicKey* _Nonnull TWPrivateKeyGetPublicKeyCurve25519(struct TWPrivateKey* _Nonnull pk);
 
-/// Computes an EC Diffie-Hellman secret in constant time
-/// Supported curves: secp256k1
-///
-/// \param pk Non-null pointer to a Private key
-/// \param publicKey Non-null pointer to the corresponding public key
-/// \param curve Eliptic curve
-/// \return The corresponding shared key as a non-null block of data
-TW_EXPORT_METHOD
-TWData* _Nullable TWPrivateKeyGetSharedKey(const struct TWPrivateKey* _Nonnull pk, const struct TWPublicKey* _Nonnull publicKey, enum TWCurve curve);
-
 /// Signs a digest using ECDSA and given curve.
 ///
 /// \param pk  Non-null pointer to a Private key
diff --git a/include/TrustWalletCore/TWPrivateKeyType.h b/include/TrustWalletCore/TWPrivateKeyType.h
index 868b5d2dfea..ee9255e0893 100644
--- a/include/TrustWalletCore/TWPrivateKeyType.h
+++ b/include/TrustWalletCore/TWPrivateKeyType.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWPublicKey.h b/include/TrustWalletCore/TWPublicKey.h
index d9164855382..7187ac564af 100644
--- a/include/TrustWalletCore/TWPublicKey.h
+++ b/include/TrustWalletCore/TWPublicKey.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWPublicKeyType.h b/include/TrustWalletCore/TWPublicKeyType.h
index e9d0e53b347..f175fc8c471 100644
--- a/include/TrustWalletCore/TWPublicKeyType.h
+++ b/include/TrustWalletCore/TWPublicKeyType.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -21,6 +19,7 @@ enum TWPublicKeyType {
     TWPublicKeyTypeED25519Blake2b = 5,
     TWPublicKeyTypeCURVE25519 = 6,
     TWPublicKeyTypeED25519Cardano = 7,
+    TWPublicKeyTypeStarkex = 8,
 };
 
 TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWPurpose.h b/include/TrustWalletCore/TWPurpose.h
index 509b813bbec..027a5a76844 100644
--- a/include/TrustWalletCore/TWPurpose.h
+++ b/include/TrustWalletCore/TWPurpose.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -20,6 +18,7 @@ enum TWPurpose {
     TWPurposeBIP44 = 44,
     TWPurposeBIP49 = 49, // Derivation scheme for P2WPKH-nested-in-P2SH
     TWPurposeBIP84 = 84, // Derivation scheme for P2WPKH
+    TWPurposeBIP86 = 86, // Derivation scheme for P2TR
     TWPurposeBIP1852 = 1852, // Derivation scheme used by Cardano-Shelley
 };
 
diff --git a/include/TrustWalletCore/TWRippleXAddress.h b/include/TrustWalletCore/TWRippleXAddress.h
index 401b885e554..3c9256d2613 100644
--- a/include/TrustWalletCore/TWRippleXAddress.h
+++ b/include/TrustWalletCore/TWRippleXAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWSS58AddressType.h b/include/TrustWalletCore/TWSS58AddressType.h
index b6bf7e50927..9f9010c670e 100644
--- a/include/TrustWalletCore/TWSS58AddressType.h
+++ b/include/TrustWalletCore/TWSS58AddressType.h
@@ -1,9 +1,7 @@
 
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWSegwitAddress.h b/include/TrustWalletCore/TWSegwitAddress.h
index 3e106375527..452b4bc2ed0 100644
--- a/include/TrustWalletCore/TWSegwitAddress.h
+++ b/include/TrustWalletCore/TWSegwitAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWSolanaAddress.h b/include/TrustWalletCore/TWSolanaAddress.h
index b8a372155e6..3a21460e759 100644
--- a/include/TrustWalletCore/TWSolanaAddress.h
+++ b/include/TrustWalletCore/TWSolanaAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -37,6 +35,14 @@ void TWSolanaAddressDelete(struct TWSolanaAddress* _Nonnull address);
 TW_EXPORT_METHOD
 TWString* _Nullable TWSolanaAddressDefaultTokenAddress(struct TWSolanaAddress* _Nonnull address, TWString* _Nonnull tokenMintAddress);
 
+/// Derive token 2022 address for token
+///
+/// \param address Non-null pointer to a Solana Address
+/// \param tokenMintAddress Non-null pointer to a token mint address as a string
+/// \return Null pointer if the token 2022 address for a token is not found, valid pointer otherwise
+TW_EXPORT_METHOD
+TWString* _Nullable TWSolanaAddressToken2022Address(struct TWSolanaAddress* _Nonnull address, TWString* _Nonnull tokenMintAddress);
+
 /// Returns the address string representation.
 ///
 /// \param address Non-null pointer to a Solana Address
diff --git a/include/TrustWalletCore/TWSolanaTransaction.h b/include/TrustWalletCore/TWSolanaTransaction.h
new file mode 100644
index 00000000000..871393fc840
--- /dev/null
+++ b/include/TrustWalletCore/TWSolanaTransaction.h
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWDataVector.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+TW_EXPORT_STRUCT
+struct TWSolanaTransaction;
+
+/// Decode Solana transaction, update the recent blockhash and re-sign the transaction.
+///
+/// # Warning
+///
+/// This is a temporary solution. It will be removed when `Solana.proto` supports
+/// direct transaction signing.
+///
+/// \param encodedTx base64 encoded Solana transaction.
+/// \param recentBlockhash base58 encoded recent blockhash.
+/// \param privateKeys list of private keys that should be used to re-sign the transaction.
+/// \return serialized `Solana::Proto::SigningOutput`.
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWSolanaTransactionUpdateBlockhashAndSign(TWString *_Nonnull encodedTx,
+                                                           TWString *_Nonnull recentBlockhash,
+                                                           const struct TWDataVector *_Nonnull privateKeys);
+
+/// Try to find a `ComputeBudgetInstruction::SetComputeUnitPrice` instruction in the given transaction,
+/// and returns the specified Unit Price.
+///
+/// \param encodedTx base64 encoded Solana transaction.
+/// \return nullable Unit Price as a decimal string. Null if no instruction found.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWSolanaTransactionGetComputeUnitPrice(TWString *_Nonnull encodedTx);
+
+/// Try to find a `ComputeBudgetInstruction::SetComputeUnitLimit` instruction in the given transaction,
+/// and returns the specified Unit Limit.
+///
+/// \param encodedTx base64 encoded Solana transaction.
+/// \return nullable Unit Limit as a decimal string. Null if no instruction found.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWSolanaTransactionGetComputeUnitLimit(TWString *_Nonnull encodedTx);
+
+/// Adds or updates a `ComputeBudgetInstruction::SetComputeUnitPrice` instruction of the given transaction,
+/// and returns the updated transaction.
+///
+/// \param encodedTx base64 encoded Solana transaction.
+/// \price Unit Price as a decimal string.
+/// \return base64 encoded Solana transaction. Null if an error occurred.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWSolanaTransactionSetComputeUnitPrice(TWString *_Nonnull encodedTx, TWString *_Nonnull price);
+
+/// Adds or updates a `ComputeBudgetInstruction::SetComputeUnitLimit` instruction of the given transaction,
+/// and returns the updated transaction.
+///
+/// \param encodedTx base64 encoded Solana transaction.
+/// \limit Unit Limit as a decimal string.
+/// \return base64 encoded Solana transaction. Null if an error occurred.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWSolanaTransactionSetComputeUnitLimit(TWString *_Nonnull encodedTx, TWString *_Nonnull limit);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWStarkExMessageSigner.h b/include/TrustWalletCore/TWStarkExMessageSigner.h
new file mode 100644
index 00000000000..d5299f4f026
--- /dev/null
+++ b/include/TrustWalletCore/TWStarkExMessageSigner.h
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+#include "TWPrivateKey.h"
+
+TW_EXTERN_C_BEGIN
+
+/// StarkEx message signing and verification.
+///
+/// StarkEx and some other wallets support a message signing & verification format, to create a proof (a signature)
+/// that someone has access to the private keys of a specific address.
+TW_EXPORT_STRUCT
+struct TWStarkExMessageSigner;
+
+/// Sign a message.
+///
+/// \param privateKey: the private key used for signing
+/// \param message: A custom hex message which is input to the signing.
+/// \returns the signature, Hex-encoded. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWStarkExMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message);
+
+/// Verify signature for a message.
+///
+/// \param pubKey: pubKey that will verify and recover the message from the signature
+/// \param message: the message signed (without prefix) in hex
+/// \param signature: in Hex-encoded form.
+/// \returns false on any invalid input (does not throw), true if the message can be recovered from the signature
+TW_EXPORT_STATIC_METHOD
+bool TWStarkExMessageSignerVerifyMessage(const struct TWPublicKey* _Nonnull pubKey, TWString* _Nonnull message, TWString* _Nonnull signature);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWStarkWare.h b/include/TrustWalletCore/TWStarkWare.h
new file mode 100644
index 00000000000..1ff02199f71
--- /dev/null
+++ b/include/TrustWalletCore/TWStarkWare.h
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWPrivateKey.h"
+#include "TWString.h"
+#include "TWDerivationPath.h"
+
+TW_EXTERN_C_BEGIN
+
+TW_EXPORT_STRUCT
+struct TWStarkWare;
+
+/// Generates the private stark key at the given derivation path from a valid eth signature
+///
+/// \param derivationPath non-null StarkEx Derivation path
+/// \param signature valid eth signature
+/// \return  The private key for the specified derivation path/signature
+TW_EXPORT_STATIC_METHOD
+struct TWPrivateKey* _Nonnull TWStarkWareGetStarkKeyFromSignature(const struct TWDerivationPath* _Nonnull derivationPath, TWString* _Nonnull signature);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWStellarMemoType.h b/include/TrustWalletCore/TWStellarMemoType.h
index ef3f42702e4..8f6b66eec8f 100644
--- a/include/TrustWalletCore/TWStellarMemoType.h
+++ b/include/TrustWalletCore/TWStellarMemoType.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWStellarPassphrase.h b/include/TrustWalletCore/TWStellarPassphrase.h
index 4854a4d3977..307afb84865 100644
--- a/include/TrustWalletCore/TWStellarPassphrase.h
+++ b/include/TrustWalletCore/TWStellarPassphrase.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWStellarVersionByte.h b/include/TrustWalletCore/TWStellarVersionByte.h
index 4439d1a555a..94f125ab94c 100644
--- a/include/TrustWalletCore/TWStellarVersionByte.h
+++ b/include/TrustWalletCore/TWStellarVersionByte.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWStoredKey.h b/include/TrustWalletCore/TWStoredKey.h
index 02bd0ae4dad..58a07e521c0 100644
--- a/include/TrustWalletCore/TWStoredKey.h
+++ b/include/TrustWalletCore/TWStoredKey.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -13,6 +11,7 @@
 #include "TWHDWallet.h"
 #include "TWPrivateKey.h"
 #include "TWStoredKeyEncryptionLevel.h"
+#include "TWStoredKeyEncryption.h"
 #include "TWString.h"
 
 TW_EXTERN_C_BEGIN
@@ -40,6 +39,18 @@ struct TWStoredKey* _Nullable TWStoredKeyLoad(TWString* _Nonnull path);
 TW_EXPORT_STATIC_METHOD
 struct TWStoredKey* _Nullable TWStoredKeyImportPrivateKey(TWData* _Nonnull privateKey, TWString* _Nonnull name, TWData* _Nonnull password, enum TWCoinType coin);
 
+/// Imports a private key.
+///
+/// \param privateKey Non-null Block of data private key
+/// \param name The name of the stored key to import as a non-null string
+/// \param password Non-null block of data, password of the stored key
+/// \param coin the coin type
+/// \param encryption cipher encryption mode
+/// \note Returned object needs to be deleted with \TWStoredKeyDelete
+/// \return Nullptr if the key can't be imported, the stored key otherwise
+TW_EXPORT_STATIC_METHOD
+struct TWStoredKey* _Nullable TWStoredKeyImportPrivateKeyWithEncryption(TWData* _Nonnull privateKey, TWString* _Nonnull name, TWData* _Nonnull password, enum TWCoinType coin, enum TWStoredKeyEncryption encryption);
+
 /// Imports an HD wallet.
 ///
 /// \param mnemonic Non-null bip39 mnemonic
@@ -51,6 +62,18 @@ struct TWStoredKey* _Nullable TWStoredKeyImportPrivateKey(TWData* _Nonnull priva
 TW_EXPORT_STATIC_METHOD
 struct TWStoredKey* _Nullable TWStoredKeyImportHDWallet(TWString* _Nonnull mnemonic, TWString* _Nonnull name, TWData* _Nonnull password, enum TWCoinType coin);
 
+/// Imports an HD wallet.
+///
+/// \param mnemonic Non-null bip39 mnemonic
+/// \param name The name of the stored key to import as a non-null string
+/// \param password Non-null block of data, password of the stored key
+/// \param coin the coin type
+/// \param encryption cipher encryption mode
+/// \note Returned object needs to be deleted with \TWStoredKeyDelete
+/// \return Nullptr if the key can't be imported, the stored key otherwise
+TW_EXPORT_STATIC_METHOD
+struct TWStoredKey* _Nullable TWStoredKeyImportHDWalletWithEncryption(TWString* _Nonnull mnemonic, TWString* _Nonnull name, TWData* _Nonnull password, enum TWCoinType coin, enum TWStoredKeyEncryption encryption);
+
 /// Imports a key from JSON.
 ///
 /// \param json Json stored key import format as a non-null block of data
@@ -59,16 +82,28 @@ struct TWStoredKey* _Nullable TWStoredKeyImportHDWallet(TWString* _Nonnull mnemo
 TW_EXPORT_STATIC_METHOD
 struct TWStoredKey* _Nullable TWStoredKeyImportJSON(TWData* _Nonnull json);
 
-/// Creates a new key, with given encryption strength level.  Returned object needs to be deleted.
+/// Creates a new key, with given encryption strength level. Returned object needs to be deleted.
 ///
 /// \param name The name of the key to be stored
 /// \param password Non-null block of data, password of the stored key
 /// \param encryptionLevel The level of encryption, see \TWStoredKeyEncryptionLevel
 /// \note Returned object needs to be deleted with \TWStoredKeyDelete
 /// \return The stored key as a non-null pointer
+TW_DEPRECATED_FOR("3.1.1", "TWStoredKeyCreateLevelAndEncryption")
 TW_EXPORT_STATIC_METHOD
 struct TWStoredKey* _Nonnull TWStoredKeyCreateLevel(TWString* _Nonnull name, TWData* _Nonnull password, enum TWStoredKeyEncryptionLevel encryptionLevel);
 
+/// Creates a new key, with given encryption strength level.  Returned object needs to be deleted.
+///
+/// \param name The name of the key to be stored
+/// \param password Non-null block of data, password of the stored key
+/// \param encryptionLevel The level of encryption, see \TWStoredKeyEncryptionLevel
+/// \param encryption cipher encryption mode
+/// \note Returned object needs to be deleted with \TWStoredKeyDelete
+/// \return The stored key as a non-null pointer
+TW_EXPORT_STATIC_METHOD
+struct TWStoredKey* _Nonnull TWStoredKeyCreateLevelAndEncryption(TWString* _Nonnull name, TWData* _Nonnull password, enum TWStoredKeyEncryptionLevel encryptionLevel, enum TWStoredKeyEncryption encryption);
+
 /// Creates a new key.
 ///
 /// \deprecated use TWStoredKeyCreateLevel.
@@ -78,6 +113,16 @@ struct TWStoredKey* _Nonnull TWStoredKeyCreateLevel(TWString* _Nonnull name, TWD
 /// \return The stored key as a non-null pointer
 TW_EXPORT_STATIC_METHOD struct TWStoredKey* _Nonnull TWStoredKeyCreate(TWString* _Nonnull name, TWData* _Nonnull password);
 
+/// Creates a new key.
+///
+/// \deprecated use TWStoredKeyCreateLevel.
+/// \param name The name of the key to be stored
+/// \param password Non-null block of data, password of the stored key
+/// \param encryption cipher encryption mode
+/// \note Returned object needs to be deleted with \TWStoredKeyDelete
+/// \return The stored key as a non-null pointer
+TW_EXPORT_STATIC_METHOD struct TWStoredKey* _Nonnull TWStoredKeyCreateEncryption(TWString* _Nonnull name, TWData* _Nonnull password, enum TWStoredKeyEncryption encryption);
+
 /// Delete a stored key
 ///
 /// \param key The key to be deleted
@@ -250,6 +295,16 @@ TWData* _Nullable TWStoredKeyExportJSON(struct TWStoredKey* _Nonnull key);
 TW_EXPORT_METHOD
 bool TWStoredKeyFixAddresses(struct TWStoredKey* _Nonnull key, TWData* _Nonnull password);
 
+/// Re-derives address for the account(s) associated with the given coin.
+/// This method can be used if address format has been changed.
+/// In case of multiple accounts, all of them will be updated.
+///
+/// \param key Non-null pointer to a stored key
+/// \param coin Account(s) coin type to be updated
+/// \return `false` if there are no accounts associated with the given coin, true otherwise
+TW_EXPORT_METHOD
+bool TWStoredKeyUpdateAddress(struct TWStoredKey* _Nonnull key, enum TWCoinType coin);
+
 /// Retrieve stored key encoding parameters, as JSON string.
 ///
 /// \param key Non-null pointer to a stored key
diff --git a/include/TrustWalletCore/TWStoredKeyEncryption.h b/include/TrustWalletCore/TWStoredKeyEncryption.h
new file mode 100644
index 00000000000..ccb0d7cfcac
--- /dev/null
+++ b/include/TrustWalletCore/TWStoredKeyEncryption.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Preset encryption kind
+TW_EXPORT_ENUM(uint32_t)
+enum TWStoredKeyEncryption {
+    TWStoredKeyEncryptionAes128Ctr = 0,
+    TWStoredKeyEncryptionAes128Cbc = 1,
+    TWStoredKeyEncryptionAes192Ctr = 2,
+    TWStoredKeyEncryptionAes256Ctr = 3,
+};
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWStoredKeyEncryptionLevel.h b/include/TrustWalletCore/TWStoredKeyEncryptionLevel.h
index 6b0b79476ea..6a7ceb7bcbc 100644
--- a/include/TrustWalletCore/TWStoredKeyEncryptionLevel.h
+++ b/include/TrustWalletCore/TWStoredKeyEncryptionLevel.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWString.h b/include/TrustWalletCore/TWString.h
index f02eef86ae3..9cfc8e77bfc 100644
--- a/include/TrustWalletCore/TWString.h
+++ b/include/TrustWalletCore/TWString.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/include/TrustWalletCore/TWTHORChainSwap.h b/include/TrustWalletCore/TWTHORChainSwap.h
index 27708cec96f..11844425bbe 100644
--- a/include/TrustWalletCore/TWTHORChainSwap.h
+++ b/include/TrustWalletCore/TWTHORChainSwap.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #pragma once
 
 #include "TWBase.h"
diff --git a/include/TrustWalletCore/TWTONAddressConverter.h b/include/TrustWalletCore/TWTONAddressConverter.h
new file mode 100644
index 00000000000..39bb4dfed7e
--- /dev/null
+++ b/include/TrustWalletCore/TWTONAddressConverter.h
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// TON address operations.
+TW_EXPORT_CLASS
+struct TWTONAddressConverter;
+
+/// Converts a TON user address into a Bag of Cells (BoC) with a single root Cell.
+/// The function is mostly used to request a Jetton user address via `get_wallet_address` RPC.
+/// https://docs.ton.org/develop/dapps/asset-processing/jettons#retrieving-jetton-wallet-addresses-for-a-given-user
+///
+/// \param address Address to be converted into a Bag Of Cells (BoC).
+/// \return Pointer to a base64 encoded Bag Of Cells (BoC). Null if invalid address provided.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWTONAddressConverterToBoc(TWString *_Nonnull address);
+
+/// Parses a TON address from a Bag of Cells (BoC) with a single root Cell.
+/// The function is mostly used to parse a Jetton user address received on `get_wallet_address` RPC.
+/// https://docs.ton.org/develop/dapps/asset-processing/jettons#retrieving-jetton-wallet-addresses-for-a-given-user
+///
+/// \param boc Base64 encoded Bag Of Cells (BoC).
+/// \return Pointer to a Jetton address.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWTONAddressConverterFromBoc(TWString *_Nonnull boc);
+
+/// Converts any TON address format to user friendly with the given parameters.
+///
+/// \param address raw or user-friendly address to be converted.
+/// \param bounceable whether the result address should be bounceable.
+/// \param testnet whether the result address should be testnet.
+/// \return user-friendly address str.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWTONAddressConverterToUserFriendly(TWString *_Nonnull address, bool bounceable, bool testnet);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWTONMessageSigner.h b/include/TrustWalletCore/TWTONMessageSigner.h
new file mode 100644
index 00000000000..c9c73876ee3
--- /dev/null
+++ b/include/TrustWalletCore/TWTONMessageSigner.h
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWPrivateKey.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// TON message signing.
+TW_EXPORT_CLASS
+struct TWTONMessageSigner;
+
+/// Signs an arbitrary message to prove ownership of an address for off-chain services.
+/// https://github.com/ton-foundation/specs/blob/main/specs/wtf-0002.md
+///
+/// \param privateKey: the private key used for signing
+/// \param message: A custom message which is input to the signing.
+/// \returns the signature, Hex-encoded. On invalid input null is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWTONMessageSignerSignMessage(struct TWPrivateKey *_Nonnull privateKey, TWString* _Nonnull message);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWTONWallet.h b/include/TrustWalletCore/TWTONWallet.h
new file mode 100644
index 00000000000..098702faa6a
--- /dev/null
+++ b/include/TrustWalletCore/TWTONWallet.h
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWPublicKey.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+/// TON wallet operations.
+TW_EXPORT_CLASS
+struct TWTONWallet;
+
+/// Constructs a TON Wallet V4R2 stateInit encoded as BoC (BagOfCells) for the given `public_key`.
+///
+/// \param publicKey wallet's public key.
+/// \param workchain TON workchain to which the wallet belongs. Usually, base chain is used (0).
+/// \param walletId wallet's ID allows to create multiple wallets for the same private key.
+/// \return Pointer to a base64 encoded Bag Of Cells (BoC) StateInit. Null if invalid public key provided.
+TW_EXPORT_STATIC_METHOD
+TWString *_Nullable TWTONWalletBuildV4R2StateInit(struct TWPublicKey *_Nonnull publicKey, int32_t workchain, int32_t walletId);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWTezosMessageSigner.h b/include/TrustWalletCore/TWTezosMessageSigner.h
new file mode 100644
index 00000000000..be1f586f448
--- /dev/null
+++ b/include/TrustWalletCore/TWTezosMessageSigner.h
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+#include "TWPrivateKey.h"
+#include "TWPublicKey.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Tezos message signing, verification and utilities.
+TW_EXPORT_STRUCT
+struct TWTezosMessageSigner;
+
+/// Implement format input as described in https://tezostaquito.io/docs/signing/
+///
+/// \param message message to format e.g: Hello, World
+/// \param dAppUrl the app url, e.g: testUrl
+/// \returns the formatted message as a string
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWTezosMessageSignerFormatMessage(TWString* _Nonnull message, TWString* _Nonnull url);
+
+/// Implement input to payload as described in: https://tezostaquito.io/docs/signing/
+///
+/// \param message formatted message to be turned into an hex payload
+/// \return the hexpayload of the formated message as a hex string
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWTezosMessageSignerInputToPayload(TWString* _Nonnull message);
+
+/// Sign a message as described in https://tezostaquito.io/docs/signing/
+///
+/// \param privateKey: the private key used for signing
+/// \param message: A custom message payload (hex) which is input to the signing.
+/// \returns the signature, Hex-encoded. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWTezosMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message);
+
+/// Verify signature for a message as described in https://tezostaquito.io/docs/signing/
+///
+/// \param pubKey: pubKey that will verify the message from the signature
+/// \param message: the message signed as a payload (hex)
+/// \param signature: in Base58-encoded form.
+/// \returns false on any invalid input (does not throw), true if the message can be verified from the signature
+TW_EXPORT_STATIC_METHOD
+bool TWTezosMessageSignerVerifyMessage(const struct TWPublicKey* _Nonnull pubKey, TWString* _Nonnull message, TWString* _Nonnull signature);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWTransactionCompiler.h b/include/TrustWalletCore/TWTransactionCompiler.h
index 93e68c65cce..67dfc4f0124 100644
--- a/include/TrustWalletCore/TWTransactionCompiler.h
+++ b/include/TrustWalletCore/TWTransactionCompiler.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -18,22 +16,6 @@ TW_EXTERN_C_BEGIN
 TW_EXPORT_STRUCT
 struct TWTransactionCompiler;
 
-/// Builds a coin-specific SigningInput (proto object) from a simple transaction.
-///
-/// \param coin coin type.
-/// \param from sender of the transaction.
-/// \param to receiver of the transaction.
-/// \param amount transaction amount in string
-/// \param asset optional asset name, like "BNB"
-/// \param memo optional memo
-/// \param chainId optional chainId to override default
-/// \return serialized data of the SigningInput proto object.
-TW_EXPORT_STATIC_METHOD
-TWData* _Nonnull TWTransactionCompilerBuildInput(enum TWCoinType coinType, TWString* _Nonnull from,
-                                                 TWString* _Nonnull to, TWString* _Nonnull amount,
-                                                 TWString* _Nonnull asset, TWString* _Nonnull memo,
-                                                 TWString* _Nonnull chainId);
-
 /// Obtains pre-signing hashes of a transaction.
 ///
 /// We provide a default `PreSigningOutput` in TransactionCompiler.proto. 
@@ -60,4 +42,10 @@ TWData* _Nonnull TWTransactionCompilerCompileWithSignatures(
     enum TWCoinType coinType, TWData* _Nonnull txInputData,
     const struct TWDataVector* _Nonnull signatures, const struct TWDataVector* _Nonnull publicKeys);
 
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWTransactionCompilerCompileWithSignaturesAndPubKeyType(
+    enum TWCoinType coinType, TWData *_Nonnull txInputData,
+    const struct TWDataVector *_Nonnull signatures, const struct TWDataVector *_Nonnull publicKeys,
+    enum TWPublicKeyType pubKeyType);
+
 TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWTransactionDecoder.h b/include/TrustWalletCore/TWTransactionDecoder.h
new file mode 100644
index 00000000000..2d1a22cffe4
--- /dev/null
+++ b/include/TrustWalletCore/TWTransactionDecoder.h
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWCoinType.h"
+#include "TWData.h"
+#include "TWString.h"
+
+TW_EXTERN_C_BEGIN
+
+TW_EXPORT_STRUCT
+struct TWTransactionDecoder;
+
+/// Decodes a transaction from a binary representation.
+///
+/// \param coin coin type.
+/// \param encodedTx encoded transaction data.
+/// \return serialized protobuf message specific for the given coin.
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWTransactionDecoderDecode(enum TWCoinType coinType, TWData *_Nonnull encodedTx);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWTransactionUtil.h b/include/TrustWalletCore/TWTransactionUtil.h
new file mode 100644
index 00000000000..55b2a811428
--- /dev/null
+++ b/include/TrustWalletCore/TWTransactionUtil.h
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWCoinType.h"
+#include "TWData.h"
+
+TW_EXTERN_C_BEGIN
+
+TW_EXPORT_STRUCT
+struct TWTransactionUtil;
+
+/// Calculate the TX hash of a transaction.
+///
+/// \param coin coin type.
+/// \param encodedTx encoded transaction data.
+/// \return The TX hash of a transaction, If the input is invalid or the chain is unsupported, null is returned.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nullable TWTransactionUtilCalcTxHash(enum TWCoinType coinType, TWString* _Nonnull encodedTx);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWTronMessageSigner.h b/include/TrustWalletCore/TWTronMessageSigner.h
new file mode 100644
index 00000000000..d20baba14c1
--- /dev/null
+++ b/include/TrustWalletCore/TWTronMessageSigner.h
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWString.h"
+#include "TWPrivateKey.h"
+#include "TWPublicKey.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Tron message signing and verification.
+///
+/// Tron and some other wallets support a message signing & verification format, to create a proof (a signature)
+/// that someone has access to the private keys of a specific address.
+TW_EXPORT_STRUCT
+struct TWTronMessageSigner;
+
+/// Sign a message.
+///
+/// \param privateKey: the private key used for signing
+/// \param message: A custom message which is input to the signing.
+/// \returns the signature, Hex-encoded. On invalid input empty string is returned. Returned object needs to be deleted after use.
+TW_EXPORT_STATIC_METHOD
+TWString* _Nonnull TWTronMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message);
+
+/// Verify signature for a message.
+///
+/// \param pubKey: pubKey that will verify and recover the message from the signature
+/// \param message: the message signed (without prefix)
+/// \param signature: in Hex-encoded form.
+/// \returns false on any invalid input (does not throw), true if the message can be recovered from the signature
+TW_EXPORT_STATIC_METHOD
+bool TWTronMessageSignerVerifyMessage(const struct TWPublicKey* _Nonnull pubKey, TWString* _Nonnull message, TWString* _Nonnull signature);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWWalletConnectRequest.h b/include/TrustWalletCore/TWWalletConnectRequest.h
new file mode 100644
index 00000000000..41ba895457c
--- /dev/null
+++ b/include/TrustWalletCore/TWWalletConnectRequest.h
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TWBase.h"
+#include "TWCoinType.h"
+#include "TWData.h"
+
+TW_EXTERN_C_BEGIN
+
+/// Represents a WalletConnect signing request.
+TW_EXPORT_CLASS
+struct TWWalletConnectRequest;
+
+/// Parses the WalletConnect signing request as a `SigningInput`.
+///
+/// \param coin The given coin type to plan the transaction for.
+/// \param input The serialized data of a `WalletConnect::Proto::ParseRequestInput` proto object.
+/// \return The serialized data of `WalletConnect::Proto::ParseRequestOutput` proto object.
+TW_EXPORT_STATIC_METHOD
+TWData* _Nonnull TWWalletConnectRequestParse(enum TWCoinType coin, TWData* _Nonnull input);
+
+TW_EXTERN_C_END
diff --git a/include/TrustWalletCore/TWWebAuthn.h b/include/TrustWalletCore/TWWebAuthn.h
new file mode 100644
index 00000000000..c3f24b27a2b
--- /dev/null
+++ b/include/TrustWalletCore/TWWebAuthn.h
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+#pragma once
+
+#include "TWBase.h"
+#include "TWData.h"
+#include "TWPublicKey.h"
+
+TW_EXTERN_C_BEGIN
+
+TW_EXPORT_STRUCT
+struct TWWebAuthn;
+
+/// Converts attestation object to the public key on P256 curve
+///
+/// \param attestationObject Attestation object retrieved from webuthn.get method
+/// \return Public key.
+TW_EXPORT_STATIC_METHOD
+struct TWPublicKey *_Nullable TWWebAuthnGetPublicKey(TWData *_Nonnull attestationObject);
+
+/// Uses ASN parser to extract r and s values from a webauthn signature
+///
+/// \param signature ASN encoded webauthn signature: https://www.w3.org/TR/webauthn-2/#sctn-signature-attestation-types
+/// \return Concatenated r and s values.
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWWebAuthnGetRSValues(TWData *_Nonnull signature);
+
+/// Reconstructs the original message that was signed via P256 curve. Can be used for signature validation.
+///
+/// \param authenticatorData Authenticator Data: https://www.w3.org/TR/webauthn-2/#authenticator-data
+/// \param clientDataJSON clientDataJSON: https://www.w3.org/TR/webauthn-2/#dom-authenticatorresponse-clientdatajson
+/// \return original messages.
+TW_EXPORT_STATIC_METHOD
+TWData *_Nonnull TWWebAuthnReconstructOriginalMessage(TWData* _Nonnull authenticatorData, TWData* _Nonnull clientDataJSON);
+TW_EXTERN_C_END
\ No newline at end of file
diff --git a/jni/android/AnySigner.c b/jni/android/AnySigner.c
new file mode 100644
index 00000000000..fd1704562f5
--- /dev/null
+++ b/jni/android/AnySigner.c
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <jni.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "AnySigner.h"
+#include "TWJNI.h"
+
+jbyteArray JNICALL Java_wallet_core_java_AnySigner_nativeSign(JNIEnv *env, jclass thisClass, jbyteArray input, jint coin) {
+    TWData *inputData = TWDataCreateWithJByteArray(env, input);
+    TWData *outputData = TWAnySignerSign(inputData, coin);
+    jbyteArray resultData = TWDataJByteArray(outputData, env);
+    TWDataDelete(inputData);
+    return resultData;
+}
+
+jboolean JNICALL Java_wallet_core_java_AnySigner_supportsJSON(JNIEnv *env, jclass thisClass, jint coin) {
+    return TWAnySignerSupportsJSON(coin);
+}
+
+jstring JNICALL Java_wallet_core_java_AnySigner_signJSON(JNIEnv *env, jclass thisClass, jstring json, jbyteArray key, jint coin) {
+    TWString *jsonString = TWStringCreateWithJString(env, json);
+    TWData *keyData = TWDataCreateWithJByteArray(env, key);
+    TWString *result = TWAnySignerSignJSON(jsonString, keyData, coin);
+    TWDataDelete(keyData);
+    TWStringDelete(jsonString);
+    return TWStringJString(result, env);
+}
+
+jbyteArray JNICALL Java_wallet_core_java_AnySigner_nativePlan(JNIEnv *env, jclass thisClass, jbyteArray input, jint coin) {
+    TWData *inputData = TWDataCreateWithJByteArray(env, input);
+    TWData *outputData = TWAnySignerPlan(inputData, coin);
+    jbyteArray resultData = TWDataJByteArray(outputData, env);
+    TWDataDelete(inputData);
+    return resultData;
+}
diff --git a/jni/android/AnySigner.h b/jni/android/AnySigner.h
new file mode 100644
index 00000000000..566d446a7ee
--- /dev/null
+++ b/jni/android/AnySigner.h
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#ifndef JNI_TW_ANYSIGNER_H
+#define JNI_TW_ANYSIGNER_H
+
+#include <jni.h>
+#include <TrustWalletCore/TWBase.h>
+
+TW_EXTERN_C_BEGIN
+
+JNIEXPORT
+jbyteArray JNICALL Java_wallet_core_java_AnySigner_nativeSign(JNIEnv *env, jclass thisClass, jbyteArray input, jint coin);
+
+JNIEXPORT
+jboolean JNICALL Java_wallet_core_java_AnySigner_supportsJSON(JNIEnv *env, jclass thisClass, jint coin);
+
+JNIEXPORT
+jbyteArray JNICALL Java_wallet_core_java_AnySigner_signJSON(JNIEnv *env, jclass thisClass, jstring json, jbyteArray key, jint coin);
+
+JNIEXPORT
+jbyteArray JNICALL Java_wallet_core_java_AnySigner_nativePlan(JNIEnv *env, jclass thisClass, jbyteArray input, jint coin);
+
+TW_EXTERN_C_END
+
+#endif // JNI_TW_ANYSIGNER_H
diff --git a/jni/cpp/AnySigner.c b/jni/cpp/AnySigner.c
deleted file mode 100644
index d9ac054adc4..00000000000
--- a/jni/cpp/AnySigner.c
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <jni.h>
-#include <stdio.h>
-#include <string.h>
-
-#include "AnySigner.h"
-#include "TWJNI.h"
-
-jbyteArray JNICALL Java_wallet_core_java_AnySigner_nativeSign(JNIEnv *env, jclass thisClass, jbyteArray input, jint coin) {
-    TWData *inputData = TWDataCreateWithJByteArray(env, input);
-    TWData *outputData = TWAnySignerSign(inputData, coin);
-    jbyteArray resultData = TWDataJByteArray(outputData, env);
-    TWDataDelete(inputData);
-    return resultData;
-}
-
-jboolean JNICALL Java_wallet_core_java_AnySigner_supportsJSON(JNIEnv *env, jclass thisClass, jint coin) {
-    return TWAnySignerSupportsJSON(coin);
-}
-
-jstring JNICALL Java_wallet_core_java_AnySigner_signJSON(JNIEnv *env, jclass thisClass, jstring json, jbyteArray key, jint coin) {
-    TWString *jsonString = TWStringCreateWithJString(env, json);
-    TWData *keyData = TWDataCreateWithJByteArray(env, key);
-    TWString *result = TWAnySignerSignJSON(jsonString, keyData, coin);
-    TWDataDelete(keyData);
-    TWStringDelete(jsonString);
-    return TWStringJString(result, env);
-}
-
-jbyteArray JNICALL Java_wallet_core_java_AnySigner_nativePlan(JNIEnv *env, jclass thisClass, jbyteArray input, jint coin) {
-    TWData *inputData = TWDataCreateWithJByteArray(env, input);
-    TWData *outputData = TWAnySignerPlan(inputData, coin);
-    jbyteArray resultData = TWDataJByteArray(outputData, env);
-    TWDataDelete(inputData);
-    return resultData;
-}
diff --git a/jni/cpp/AnySigner.h b/jni/cpp/AnySigner.h
deleted file mode 100644
index b51323a6554..00000000000
--- a/jni/cpp/AnySigner.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#ifndef JNI_TW_ANYSIGNER_H
-#define JNI_TW_ANYSIGNER_H
-
-#include <jni.h>
-#include <TrustWalletCore/TWBase.h>
-
-TW_EXTERN_C_BEGIN
-
-JNIEXPORT
-jbyteArray JNICALL Java_wallet_core_java_AnySigner_nativeSign(JNIEnv *env, jclass thisClass, jbyteArray input, jint coin);
-
-JNIEXPORT
-jboolean JNICALL Java_wallet_core_java_AnySigner_supportsJSON(JNIEnv *env, jclass thisClass, jint coin);
-
-JNIEXPORT
-jbyteArray JNICALL Java_wallet_core_java_AnySigner_signJSON(JNIEnv *env, jclass thisClass, jstring json, jbyteArray key, jint coin);
-
-JNIEXPORT
-jbyteArray JNICALL Java_wallet_core_java_AnySigner_nativePlan(JNIEnv *env, jclass thisClass, jbyteArray input, jint coin);
-
-TW_EXTERN_C_END
-
-#endif // JNI_TW_ANYSIGNER_H
diff --git a/jni/cpp/Random.cpp b/jni/cpp/Random.cpp
index de97baff225..216c61d46cc 100644
--- a/jni/cpp/Random.cpp
+++ b/jni/cpp/Random.cpp
@@ -1,11 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <jni.h>
 #include <string.h>
+#include <stdint.h>
+#include <fstream>
 
 static JavaVM* cachedJVM;
 
@@ -26,26 +26,42 @@ uint32_t random32() {
 }
 
 void random_buffer(uint8_t *buf, size_t len) {
-    JNIEnv *env;
-    cachedJVM->AttachCurrentThread(&env, NULL);
+    if (cachedJVM)
+    {
+        JNIEnv *env;
+    
+#if defined(__ANDROID__) || defined(ANDROID)
+    cachedJVM->AttachCurrentThread(&env, nullptr);
+#else
+    cachedJVM->AttachCurrentThread((void **) &env, nullptr);
+#endif
 
-    // SecureRandom random = new SecureRandom();
-    jclass secureRandomClass = env->FindClass("java/security/SecureRandom");
-    jmethodID constructor = env->GetMethodID(secureRandomClass, "<init>", "()V");
-    jobject random = env->NewObject(secureRandomClass, constructor);
+        // SecureRandom random = new SecureRandom();
+        jclass secureRandomClass = env->FindClass("java/security/SecureRandom");
+        jmethodID constructor = env->GetMethodID(secureRandomClass, "<init>", "()V");
+        jobject random = env->NewObject(secureRandomClass, constructor);
 
-    //byte array[] = new byte[len];
-    jbyteArray array = env->NewByteArray(static_cast<jsize>(len));
+        //byte array[] = new byte[len];
+        jbyteArray array = env->NewByteArray(static_cast<jsize>(len));
 
-    //random.nextBytes(bytes);
-    jmethodID nextBytes = env->GetMethodID(secureRandomClass, "nextBytes", "([B)V");
-    env->CallVoidMethod(random, nextBytes, array);
+        //random.nextBytes(bytes);
+        jmethodID nextBytes = env->GetMethodID(secureRandomClass, "nextBytes", "([B)V");
+        env->CallVoidMethod(random, nextBytes, array);
 
-    jbyte* bytes = env->GetByteArrayElements(array, nullptr);
-    memcpy(buf, bytes, len);
-    env->ReleaseByteArrayElements(array, bytes, JNI_ABORT);
+        jbyte* bytes = env->GetByteArrayElements(array, nullptr);
+        memcpy(buf, bytes, len);
+        env->ReleaseByteArrayElements(array, bytes, JNI_ABORT);
 
-    env->DeleteLocalRef(array);
-    env->DeleteLocalRef(random);
-    env->DeleteLocalRef(secureRandomClass);
+        env->DeleteLocalRef(array);
+        env->DeleteLocalRef(random);
+        env->DeleteLocalRef(secureRandomClass);
+    }
+    else
+    {
+        std::ifstream randomData("/dev/urandom", std::ios::in | std::ios::binary);
+        if (randomData.is_open()) {
+            randomData.read(reinterpret_cast<char*>(buf), len);
+            randomData.close();
+        }
+    }
 }
diff --git a/jni/cpp/TWJNI.h b/jni/cpp/TWJNI.h
index 29bf14ba4df..86fc962ca29 100644
--- a/jni/cpp/TWJNI.h
+++ b/jni/cpp/TWJNI.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/jni/cpp/TWJNIData.cpp b/jni/cpp/TWJNIData.cpp
index c0577f31442..942505f593f 100644
--- a/jni/cpp/TWJNIData.cpp
+++ b/jni/cpp/TWJNIData.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <assert.h>
 #include <vector>
@@ -10,7 +8,7 @@
 #include "TWJNIData.h"
 
 jbyteArray TWDataJByteArray(TWData *_Nonnull data, JNIEnv *env) {
-    jsize dataSize = static_cast<jsize>(TWDataSize(data));
+    auto dataSize = static_cast<jsize>(TWDataSize(data));
     jbyteArray array = env->NewByteArray(dataSize);
     env->SetByteArrayRegion(array, 0, dataSize, (jbyte *) TWDataBytes(data));
     TWDataDelete(data);
diff --git a/jni/cpp/TWJNIData.h b/jni/cpp/TWJNIData.h
index a7002bffce5..9d1c6730368 100644
--- a/jni/cpp/TWJNIData.h
+++ b/jni/cpp/TWJNIData.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/jni/cpp/TWJNIString.cpp b/jni/cpp/TWJNIString.cpp
index 2bb220fb6fc..996eb0c747c 100644
--- a/jni/cpp/TWJNIString.cpp
+++ b/jni/cpp/TWJNIString.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <assert.h>
 #include <string.h>
@@ -15,8 +13,8 @@ jstring _Nonnull TWStringJString(TWString *_Nonnull string, JNIEnv *env) {
 }
 
 TWString *_Nonnull TWStringCreateWithJString(JNIEnv *env, jstring _Nonnull string) {
-    auto chars = env->GetStringUTFChars(string, nullptr);
-    auto twstring = TWStringCreateWithUTF8Bytes(chars);
+    const auto *chars = env->GetStringUTFChars(string, nullptr);
+    const auto *twstring = TWStringCreateWithUTF8Bytes(chars);
     env->ReleaseStringUTFChars(string, chars);
     return twstring;
 }
diff --git a/jni/cpp/TWJNIString.h b/jni/cpp/TWJNIString.h
index 95f0f967898..1691fe47abb 100644
--- a/jni/cpp/TWJNIString.h
+++ b/jni/cpp/TWJNIString.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/jni/java/wallet/core/java/AnySigner.java b/jni/java/wallet/core/java/AnySigner.java
index 49c7770d3d1..21caaa185d4 100644
--- a/jni/java/wallet/core/java/AnySigner.java
+++ b/jni/java/wallet/core/java/AnySigner.java
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 package wallet.core.java;
 
diff --git a/jni/kotlin/AnySigner.c b/jni/kotlin/AnySigner.c
new file mode 100644
index 00000000000..83211fb3512
--- /dev/null
+++ b/jni/kotlin/AnySigner.c
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <jni.h>
+#include <stdio.h>
+#include <string.h>
+
+#include "AnySigner.h"
+#include "TWJNI.h"
+
+jbyteArray JNICALL Java_com_trustwallet_core_AnySigner_sign(JNIEnv *env, jclass thisClass, jbyteArray input, jobject coin) {
+    jclass coinClass = (*env)->GetObjectClass(env, coin);
+    jmethodID coinValueMethodID = (*env)->GetMethodID(env, coinClass, "value", "()I");
+    uint32_t coinValue = (*env)->CallIntMethod(env, coin, coinValueMethodID);
+
+    TWData *inputData = TWDataCreateWithJByteArray(env, input);
+    TWData *outputData = TWAnySignerSign(inputData, coinValue);
+    jbyteArray resultData = TWDataJByteArray(outputData, env);
+    TWDataDelete(inputData);
+    return resultData;
+}
+
+jboolean JNICALL Java_com_trustwallet_core_AnySigner_supportsJson(JNIEnv *env, jclass thisClass, jobject coin) {
+    jclass coinClass = (*env)->GetObjectClass(env, coin);
+    jmethodID coinValueMethodID = (*env)->GetMethodID(env, coinClass, "value", "()I");
+    uint32_t coinValue = (*env)->CallIntMethod(env, coin, coinValueMethodID);
+    return TWAnySignerSupportsJSON(coinValue);
+}
+
+jstring JNICALL Java_com_trustwallet_core_AnySigner_signJson(JNIEnv *env, jclass thisClass, jstring json, jbyteArray key, jobject coin) {
+    jclass coinClass = (*env)->GetObjectClass(env, coin);
+    jmethodID coinValueMethodID = (*env)->GetMethodID(env, coinClass, "value", "()I");
+    uint32_t coinValue = (*env)->CallIntMethod(env, coin, coinValueMethodID);
+
+    TWString *jsonString = TWStringCreateWithJString(env, json);
+    TWData *keyData = TWDataCreateWithJByteArray(env, key);
+    TWString *result = TWAnySignerSignJSON(jsonString, keyData, coinValue);
+    TWDataDelete(keyData);
+    TWStringDelete(jsonString);
+    return TWStringJString(result, env);
+}
+
+jbyteArray JNICALL Java_com_trustwallet_core_AnySigner_plan(JNIEnv *env, jclass thisClass, jbyteArray input, jobject coin) {
+    jclass coinClass = (*env)->GetObjectClass(env, coin);
+    jmethodID coinValueMethodID = (*env)->GetMethodID(env, coinClass, "value", "()I");
+    uint32_t coinValue = (*env)->CallIntMethod(env, coin, coinValueMethodID);
+
+    TWData *inputData = TWDataCreateWithJByteArray(env, input);
+    TWData *outputData = TWAnySignerPlan(inputData, coinValue);
+    jbyteArray resultData = TWDataJByteArray(outputData, env);
+    TWDataDelete(inputData);
+    return resultData;
+}
diff --git a/jni/kotlin/AnySigner.h b/jni/kotlin/AnySigner.h
new file mode 100644
index 00000000000..eac2bd9340b
--- /dev/null
+++ b/jni/kotlin/AnySigner.h
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#ifndef JNI_TW_ANYSIGNER_H
+#define JNI_TW_ANYSIGNER_H
+
+#include <jni.h>
+#include <TrustWalletCore/TWBase.h>
+
+TW_EXTERN_C_BEGIN
+
+JNIEXPORT
+jbyteArray JNICALL Java_com_trustwallet_core_AnySigner_sign(JNIEnv *env, jclass thisClass, jbyteArray input, jobject coin);
+
+JNIEXPORT
+jboolean JNICALL Java_com_trustwallet_core_AnySigner_supportsJson(JNIEnv *env, jclass thisClass, jobject coin);
+
+JNIEXPORT
+jstring JNICALL Java_com_trustwallet_core_AnySigner_signJson(JNIEnv *env, jclass thisClass, jstring json, jbyteArray key, jobject coin);
+
+JNIEXPORT
+jbyteArray JNICALL Java_com_trustwallet_core_AnySigner_plan(JNIEnv *env, jclass thisClass, jbyteArray input, jobject coin);
+
+TW_EXTERN_C_END
+
+#endif // JNI_TW_ANYSIGNER_H
diff --git a/jni/proto/.gitkeep b/jni/proto/.gitkeep
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/kotlin/.editorconfig b/kotlin/.editorconfig
new file mode 100644
index 00000000000..87dad77100a
--- /dev/null
+++ b/kotlin/.editorconfig
@@ -0,0 +1,21 @@
+root = true
+
+[*]
+indent_style = space
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true
+insert_final_newline = true
+max_line_length = 120
+
+[*.{kt,kts}]
+indent_size = 4
+ij_kotlin_code_style_defaults = KOTLIN_OFFICIAL
+ij_kotlin_imports_layout = *
+ij_kotlin_allow_trailing_comma = true
+ij_kotlin_allow_trailing_comma_on_call_site = true
+ij_kotlin_enum_constants_wrap = split_into_lines
+ij_kotlin_name_count_to_use_star_import = 5
+ij_kotlin_name_count_to_use_star_import_for_members = 3
+ij_kotlin_packages_to_use_import_on_demand = *
+ij_kotlin_wrap_first_method_in_call_chain = true
diff --git a/kotlin/.gitignore b/kotlin/.gitignore
new file mode 100644
index 00000000000..f8ed7018916
--- /dev/null
+++ b/kotlin/.gitignore
@@ -0,0 +1,2 @@
+.gradle
+local.properties
diff --git a/kotlin/README.md b/kotlin/README.md
new file mode 100644
index 00000000000..d80405f6046
--- /dev/null
+++ b/kotlin/README.md
@@ -0,0 +1,3 @@
+### Tasks:
+
+- `./gradlew :wallet-core-kotlin:generateProtos` – Generates Kotlin classes for Protos
diff --git a/kotlin/build-logic/build.gradle.kts b/kotlin/build-logic/build.gradle.kts
new file mode 100644
index 00000000000..1f41e03775b
--- /dev/null
+++ b/kotlin/build-logic/build.gradle.kts
@@ -0,0 +1,19 @@
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    `kotlin-dsl`
+}
+
+allprojects {
+    tasks.withType<JavaCompile> {
+        sourceCompatibility = "17"
+        targetCompatibility = "17"
+    }
+    tasks.withType<KotlinCompile> {
+        compilerOptions {
+            allWarningsAsErrors.set(true)
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+}
diff --git a/kotlin/build-logic/settings.gradle.kts b/kotlin/build-logic/settings.gradle.kts
new file mode 100644
index 00000000000..5cab7b66872
--- /dev/null
+++ b/kotlin/build-logic/settings.gradle.kts
@@ -0,0 +1,23 @@
+@file:Suppress("UnstableApiUsage")
+
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+
+    versionCatalogs {
+        create("libs") {
+            from(files("../gradle/libs.versions.toml"))
+        }
+    }
+}
diff --git a/kotlin/build-logic/src/main/kotlin/convention.maven-publish.gradle.kts b/kotlin/build-logic/src/main/kotlin/convention.maven-publish.gradle.kts
new file mode 100644
index 00000000000..37072540d89
--- /dev/null
+++ b/kotlin/build-logic/src/main/kotlin/convention.maven-publish.gradle.kts
@@ -0,0 +1,21 @@
+plugins {
+    `maven-publish`
+}
+
+group = "com.trustwallet"
+if (version == Project.DEFAULT_VERSION) {
+    version = "0.0.0-alpha"
+}
+
+publishing {
+    repositories {
+        maven {
+            name = "GitHubPackages"
+            url = uri("https://maven.pkg.github.com/trustwallet/wallet-core")
+            credentials {
+                username = System.getenv("GITHUB_USER")
+                password = System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
diff --git a/kotlin/build-logic/src/main/kotlin/convention.proto-generation.gradle.kts b/kotlin/build-logic/src/main/kotlin/convention.proto-generation.gradle.kts
new file mode 100644
index 00000000000..112de933e3a
--- /dev/null
+++ b/kotlin/build-logic/src/main/kotlin/convention.proto-generation.gradle.kts
@@ -0,0 +1,56 @@
+val libs = extensions.getByType<VersionCatalogsExtension>().named("libs")
+
+val copyProtoTask = task<Copy>("copyProtos") {
+    val sourceDir = rootDir.parentFile.resolve("src/proto")
+    val destinationDir = projectDir.resolve("build/tmp/proto")
+
+    doFirst {
+        destinationDir.deleteRecursively()
+    }
+
+    from(sourceDir) {
+        include("*.proto")
+    }
+    into(destinationDir)
+
+    doLast {
+        destinationDir
+            .listFiles { file -> file.extension == "proto" }
+            .orEmpty()
+            .forEach { file ->
+                val packageName = file.nameWithoutExtension.lowercase()
+                file
+                    .readText()
+                    .replaceFirst(
+                        oldValue = """option java_package = "wallet.core.jni.proto";""",
+                        newValue = """option java_package = "com.trustwallet.core.$packageName";""",
+                    )
+                    .let { file.writeText(it) }
+            }
+    }
+}
+
+val wire: Configuration by configurations.creating
+dependencies {
+    wire(libs.findLibrary("wire.compiler").get().get())
+}
+
+val generateProtosTask = task<JavaExec>("generateProtos") {
+    dependsOn(copyProtoTask)
+
+    val sourceDir = projectDir.resolve("build/tmp/proto")
+    val destinationDir = projectDir.resolve("src/commonMain/proto")
+
+    doFirst {
+        destinationDir.deleteRecursively()
+        destinationDir.mkdirs()
+    }
+
+    mainClass.set("com.squareup.wire.WireCompiler")
+    classpath = wire
+
+    args(
+        "--proto_path=$sourceDir",
+        "--kotlin_out=$destinationDir",
+    )
+}
diff --git a/kotlin/build.gradle.kts b/kotlin/build.gradle.kts
new file mode 100644
index 00000000000..387b99278c9
--- /dev/null
+++ b/kotlin/build.gradle.kts
@@ -0,0 +1,21 @@
+// Workaround https://github.com/gradle/gradle/issues/22797
+@file:Suppress("DSL_SCOPE_VIOLATION")
+
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+
+plugins {
+    id("com.android.application") version libs.versions.agp.get() apply false
+    id("com.android.library") version libs.versions.agp.get() apply false
+    kotlin("android") version libs.versions.kotlin.get() apply false
+    kotlin("multiplatform") version libs.versions.kotlin.get() apply false
+}
+
+allprojects {
+    tasks.withType<KotlinCompile> {
+        compilerOptions {
+            allWarningsAsErrors.set(true)
+            jvmTarget.set(JvmTarget.JVM_17)
+        }
+    }
+}
diff --git a/kotlin/gradle.properties b/kotlin/gradle.properties
new file mode 100644
index 00000000000..e77b878e37e
--- /dev/null
+++ b/kotlin/gradle.properties
@@ -0,0 +1,11 @@
+# Gradle
+org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=512m -Dfile.encoding=UTF-8
+org.gradle.parallel=true
+# Kotlin
+kotlin.code.style=official
+kotlin.js.compiler=ir
+kotlin.mpp.androidSourceSetLayoutVersion=2
+kotlin.mpp.enableCInteropCommonization=true
+# Android
+android.useAndroidX=true
+android.nonTransitiveRClass=true
diff --git a/kotlin/gradle/libs.versions.toml b/kotlin/gradle/libs.versions.toml
new file mode 100644
index 00000000000..e6e4289dd86
--- /dev/null
+++ b/kotlin/gradle/libs.versions.toml
@@ -0,0 +1,14 @@
+[versions]
+android-sdk-tools = "33.0.2"
+android-sdk-min = "24"
+android-sdk-compile = "33"
+android-cmake = "3.22.1"
+android-ndk = "25.2.9519653"
+
+kotlin = "1.8.21"
+agp = "8.0.0"
+wire = "4.5.6"
+
+[libraries]
+wire-runtime = { module = "com.squareup.wire:wire-runtime", version.ref = "wire" }
+wire-compiler = { module = "com.squareup.wire:wire-compiler", version.ref = "wire" }
diff --git a/kotlin/gradle/wrapper/gradle-wrapper.jar b/kotlin/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..c1962a79e29
Binary files /dev/null and b/kotlin/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/kotlin/gradle/wrapper/gradle-wrapper.properties b/kotlin/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..8707e8b5067
--- /dev/null
+++ b/kotlin/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-all.zip
+networkTimeout=10000
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/kotlin/gradlew b/kotlin/gradlew
new file mode 100755
index 00000000000..aeb74cbb43e
--- /dev/null
+++ b/kotlin/gradlew
@@ -0,0 +1,245 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/kotlin/gradlew.bat b/kotlin/gradlew.bat
new file mode 100755
index 00000000000..6689b85beec
--- /dev/null
+++ b/kotlin/gradlew.bat
@@ -0,0 +1,92 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/kotlin/kotlin-js-store/yarn.lock b/kotlin/kotlin-js-store/yarn.lock
new file mode 100644
index 00000000000..0995b488885
--- /dev/null
+++ b/kotlin/kotlin-js-store/yarn.lock
@@ -0,0 +1,2238 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@babel/code-frame@^7.10.4":
+  version "7.23.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.23.5.tgz#9009b69a8c602293476ad598ff53e4562e15c244"
+  integrity sha512-CgH3s1a96LipHCmSUmYFPwY7MNx8C3avkq7i4Wl3cfa662ldtUe4VM1TPXX70pfmrlWTb6jLqTYrZyT2ZTJBgA==
+  dependencies:
+    "@babel/highlight" "^7.23.4"
+    chalk "^2.4.2"
+
+"@babel/helper-validator-identifier@^7.22.20":
+  version "7.22.20"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0"
+  integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A==
+
+"@babel/highlight@^7.23.4":
+  version "7.23.4"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.23.4.tgz#edaadf4d8232e1a961432db785091207ead0621b"
+  integrity sha512-acGdbYSfp2WheJoJm/EBBBLh/ID8KDc64ISZ9DYtBmC8/Q204PZJLHyzeB5qMzJ5trcOkybd78M4x2KWsUq++A==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.22.20"
+    chalk "^2.4.2"
+    js-tokens "^4.0.0"
+
+"@colors/colors@1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9"
+  integrity sha512-ooWCrlZP11i8GImSjTHYHLkvFDP48nS4+204nGb1RiX/WXYHmJA2III9/e2DWVabCESdW7hBAEzHRqUn9OUVvQ==
+
+"@discoveryjs/json-ext@^0.5.0":
+  version "0.5.7"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz#1d572bfbbe14b7704e0ba0f39b74815b84870d70"
+  integrity sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==
+
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.3"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.3.tgz#7e02e6eb5df901aaedb08514203b096614024098"
+  integrity sha512-HLhSWOLRi875zjjMG/r+Nv0oCW8umGb0BgEhyX3dDX3egwZtB8PqLnjz3yedt8R5StBrzcg4aBpnh8UA9D1BoQ==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@^3.1.0":
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.1.tgz#c08679063f279615a3326583ba3a90d1d82cc721"
+  integrity sha512-dSYZh7HhCDtCKm4QakX0xFpsRDqjjtZf/kjI/v3T3Nwt5r8/qz/M19F9ySyOqU94SXBmeG9ttTul+YnR4LOxFA==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.3":
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.5.tgz#a3bb4d5c6825aab0d281268f47f6ad5853431e91"
+  integrity sha512-UTYAUj/wviwdsMfzoSJspJxbkH5o1snzwX0//0ENX1u/55kkZZkcTZP6u9bwKGkv+dkk9at4m1Cpt0uY80kcpQ==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@^1.4.10", "@jridgewell/sourcemap-codec@^1.4.14":
+  version "1.4.15"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz#d7c6e6755c78567a951e04ab52ef0fd26de59f32"
+  integrity sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg==
+
+"@jridgewell/trace-mapping@^0.3.17", "@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.20"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.20.tgz#72e45707cf240fa6b081d0366f8265b0cd10197f"
+  integrity sha512-R8LcPeWZol2zR8mmH3JeKQ6QRCFb7XgUhV9ZlGhHLGyg4wpPiPZNQOOWhFZhxKw8u//yTbNGI42Bx/3paXEQ+Q==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.1.0"
+    "@jridgewell/sourcemap-codec" "^1.4.14"
+
+"@rollup/plugin-commonjs@^21.0.1":
+  version "21.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-21.1.0.tgz#45576d7b47609af2db87f55a6d4b46e44fc3a553"
+  integrity sha512-6ZtHx3VHIp2ReNNDxHjuUml6ur+WcQ28N1yHgCQwsbNkQg2suhxGMDQGJOn/KuDxKtd1xuZP5xSTwBA4GQ8hbA==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    commondir "^1.0.1"
+    estree-walker "^2.0.1"
+    glob "^7.1.6"
+    is-reference "^1.2.1"
+    magic-string "^0.25.7"
+    resolve "^1.17.0"
+
+"@rollup/plugin-node-resolve@^13.1.3":
+  version "13.3.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.3.0.tgz#da1c5c5ce8316cef96a2f823d111c1e4e498801c"
+  integrity sha512-Lus8rbUo1eEcnS4yTFKLZrVumLPY+YayBdWXgFSHYhTT2iJbMhoaaBL3xl5NCdeRytErGr8tZ0L71BMRmnlwSw==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    "@types/resolve" "1.17.1"
+    deepmerge "^4.2.2"
+    is-builtin-module "^3.1.0"
+    is-module "^1.0.0"
+    resolve "^1.19.0"
+
+"@rollup/plugin-typescript@^8.3.0":
+  version "8.5.0"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-typescript/-/plugin-typescript-8.5.0.tgz#7ea11599a15b0a30fa7ea69ce3b791d41b862515"
+  integrity sha512-wMv1/scv0m/rXx21wD2IsBbJFba8wGF3ErJIr6IKRfRj49S85Lszbxb4DCo8iILpluTjk2GAAu9CoZt4G3ppgQ==
+  dependencies:
+    "@rollup/pluginutils" "^3.1.0"
+    resolve "^1.17.0"
+
+"@rollup/pluginutils@^3.0.9", "@rollup/pluginutils@^3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@rollup/pluginutils/-/pluginutils-3.1.0.tgz#706b4524ee6dc8b103b3c995533e5ad680c02b9b"
+  integrity sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==
+  dependencies:
+    "@types/estree" "0.0.39"
+    estree-walker "^1.0.1"
+    picomatch "^2.2.2"
+
+"@socket.io/component-emitter@~3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@socket.io/component-emitter/-/component-emitter-3.1.0.tgz#96116f2a912e0c02817345b3c10751069920d553"
+  integrity sha512-+9jVqKhRSpsc591z5vX+X5Yyw+he/HCB4iQ/RYxw35CEPaY1gnsNE43nf9n9AaYjAQrTiI/mOwKUKdUs9vf7Xg==
+
+"@types/cookie@^0.4.1":
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
+
+"@types/cors@^2.8.12":
+  version "2.8.17"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.17.tgz#5d718a5e494a8166f569d986794e49c48b216b2b"
+  integrity sha512-8CGDvrBj1zgo2qE+oS3pOCyYNqCPryMWY2bGfwA0dcfopWGgxs+78df0Rs3rc9THP4JkOhLsAa+15VdpAqkcUA==
+  dependencies:
+    "@types/node" "*"
+
+"@types/eslint-scope@^3.7.3":
+  version "3.7.7"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.7.tgz#3108bd5f18b0cdb277c867b3dd449c9ed7079ac5"
+  integrity sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==
+  dependencies:
+    "@types/eslint" "*"
+    "@types/estree" "*"
+
+"@types/eslint@*":
+  version "8.44.9"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.9.tgz#5799663009645637bd1c45b2e1a7c8f4caf89534"
+  integrity sha512-6yBxcvwnnYoYT1Uk2d+jvIfsuP4mb2EdIxFnrPABj5a/838qe5bGkNLFOiipX4ULQ7XVQvTxOh7jO+BTAiqsEw==
+  dependencies:
+    "@types/estree" "*"
+    "@types/json-schema" "*"
+
+"@types/estree@*", "@types/estree@^1.0.0":
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
+  integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
+
+"@types/estree@0.0.39":
+  version "0.0.39"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
+  integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
+
+"@types/json-schema@*", "@types/json-schema@^7.0.8":
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
+
+"@types/node@*", "@types/node@>=10.0.0":
+  version "20.10.4"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.10.4.tgz#b246fd84d55d5b1b71bf51f964bd514409347198"
+  integrity sha512-D08YG6rr8X90YB56tSIuBaddy/UXAA9RKJoFvrsnogAum/0pmjkgi4+2nx96A330FmioegBWmEYQ+syqCFaveg==
+  dependencies:
+    undici-types "~5.26.4"
+
+"@types/node@^12.12.14":
+  version "12.20.55"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240"
+  integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==
+
+"@types/resolve@1.17.1":
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.17.1.tgz#3afd6ad8967c77e4376c598a82ddd58f46ec45d6"
+  integrity sha512-yy7HuzQhj0dhGpD8RLXSZWEkLsV9ibvxvi6EiJ3bkqLAO1RGo0WbkWQiwpRlSFymTJRz0d3k5LM3kkx8ArDbLw==
+  dependencies:
+    "@types/node" "*"
+
+"@ungap/promise-all-settled@1.1.2":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
+  integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
+
+"@webassemblyjs/ast@1.11.6", "@webassemblyjs/ast@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.6.tgz#db046555d3c413f8966ca50a95176a0e2c642e24"
+  integrity sha512-IN1xI7PwOvLPgjcf180gC1bqn3q/QaOCwYUahIOhbYUu8KA/3tw2RT/T0Gidi1l7Hhj5D/INhJxiICObqpMu4Q==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz#dacbcb95aff135c8260f77fa3b4c5fea600a6431"
+  integrity sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==
+
+"@webassemblyjs/helper-api-error@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz#6132f68c4acd59dcd141c44b18cbebbd9f2fa768"
+  integrity sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==
+
+"@webassemblyjs/helper-buffer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.6.tgz#b66d73c43e296fd5e88006f18524feb0f2c7c093"
+  integrity sha512-z3nFzdcp1mb8nEOFFk8DrYLpHvhKC3grJD2ardfKOzmbmJvEf/tPIqCY+sNcwZIY8ZD7IkB2l7/pqhUhqm7hLA==
+
+"@webassemblyjs/helper-numbers@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz#cbce5e7e0c1bd32cf4905ae444ef64cea919f1b5"
+  integrity sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/helper-wasm-bytecode@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz#bb2ebdb3b83aa26d9baad4c46d4315283acd51e9"
+  integrity sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==
+
+"@webassemblyjs/helper-wasm-section@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.6.tgz#ff97f3863c55ee7f580fd5c41a381e9def4aa577"
+  integrity sha512-LPpZbSOwTpEC2cgn4hTydySy1Ke+XEu+ETXuoyvuyezHO3Kjdu90KK95Sh9xTbmjrCsUwvWwCOQQNta37VrS9g==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+
+"@webassemblyjs/ieee754@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz#bb665c91d0b14fffceb0e38298c329af043c6e3a"
+  integrity sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==
+  dependencies:
+    "@xtuc/ieee754" "^1.2.0"
+
+"@webassemblyjs/leb128@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.6.tgz#70e60e5e82f9ac81118bc25381a0b283893240d7"
+  integrity sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==
+  dependencies:
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/utf8@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.6.tgz#90f8bc34c561595fe156603be7253cdbcd0fab5a"
+  integrity sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==
+
+"@webassemblyjs/wasm-edit@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.6.tgz#c72fa8220524c9b416249f3d94c2958dfe70ceab"
+  integrity sha512-Ybn2I6fnfIGuCR+Faaz7YcvtBKxvoLV3Lebn1tM4o/IAJzmi9AWYIPWpyBfU8cC+JxAO57bk4+zdsTjJR+VTOw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/helper-wasm-section" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-opt" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+    "@webassemblyjs/wast-printer" "1.11.6"
+
+"@webassemblyjs/wasm-gen@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.6.tgz#fb5283e0e8b4551cc4e9c3c0d7184a65faf7c268"
+  integrity sha512-3XOqkZP/y6B4F0PBAXvI1/bky7GryoogUtfwExeP/v7Nzwo1QLcq5oQmpKlftZLbT+ERUOAZVQjuNVak6UXjPA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wasm-opt@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.6.tgz#d9a22d651248422ca498b09aa3232a81041487c2"
+  integrity sha512-cOrKuLRE7PCe6AsOVl7WasYf3wbSo4CeOk6PkrjS7g57MFfVUF9u6ysQBBODX0LdgSvQqRiGz3CXvIDKcPNy4g==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-buffer" "1.11.6"
+    "@webassemblyjs/wasm-gen" "1.11.6"
+    "@webassemblyjs/wasm-parser" "1.11.6"
+
+"@webassemblyjs/wasm-parser@1.11.6", "@webassemblyjs/wasm-parser@^1.11.5":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.6.tgz#bb85378c527df824004812bbdb784eea539174a1"
+  integrity sha512-6ZwPeGzMJM3Dqp3hCsLgESxBGtT/OeCvCZ4TA1JUPYgmhAx38tTPR9JaKy0S5H3evQpO/h2uWs2j6Yc/fjkpTQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@webassemblyjs/helper-api-error" "1.11.6"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.6"
+    "@webassemblyjs/ieee754" "1.11.6"
+    "@webassemblyjs/leb128" "1.11.6"
+    "@webassemblyjs/utf8" "1.11.6"
+
+"@webassemblyjs/wast-printer@1.11.6":
+  version "1.11.6"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.6.tgz#a7bf8dd7e362aeb1668ff43f35cb849f188eff20"
+  integrity sha512-JM7AhRcE+yW2GWYaKeHL5vt4xqee5N2WcezptmgyhNS+ScggqcT1OtXykhAb13Sn5Yas0j2uv9tHgrjwvzAP4A==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.6"
+    "@xtuc/long" "4.2.2"
+
+"@webpack-cli/configtest@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/configtest/-/configtest-1.2.0.tgz#7b20ce1c12533912c3b217ea68262365fa29a6f5"
+  integrity sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==
+
+"@webpack-cli/info@^1.5.0":
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/info/-/info-1.5.0.tgz#6c78c13c5874852d6e2dd17f08a41f3fe4c261b1"
+  integrity sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==
+  dependencies:
+    envinfo "^7.7.3"
+
+"@webpack-cli/serve@^1.7.0":
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/@webpack-cli/serve/-/serve-1.7.0.tgz#e1993689ac42d2b16e9194376cfb6753f6254db1"
+  integrity sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+abab@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.6.tgz#41b80f2c871d19686216b82309231cfd3cb3d291"
+  integrity sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==
+
+accepts@~1.3.4:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
+  dependencies:
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
+
+acorn-import-assertions@^1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
+  integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
+
+acorn@^8.7.1, acorn@^8.8.2:
+  version "8.11.2"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.11.2.tgz#ca0d78b51895be5390a5903c5b3bdcdaf78ae40b"
+  integrity sha512-nc0Axzp/0FILLEVsm4fNwLCwMttvhEI263QtVPQcbpfZZ3ts0hLsZGOpE6czNlid7CJ9MlyH8reXkpsf3YUY4w==
+
+ajv-keywords@^3.5.2:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
+  integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
+
+ajv@^6.12.5:
+  version "6.12.6"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
+  integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
+  dependencies:
+    fast-deep-equal "^3.1.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ansi-colors@4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348"
+  integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==
+
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
+ansi-styles@^3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-3.2.1.tgz#41fbb20243e50b12be0f04b8dedbf07520ce841d"
+  integrity sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==
+  dependencies:
+    color-convert "^1.9.0"
+
+ansi-styles@^4.0.0, ansi-styles@^4.1.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937"
+  integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==
+  dependencies:
+    color-convert "^2.0.1"
+
+anymatch@~3.1.2:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.3.tgz#790c58b19ba1720a84205b57c618d5ad8524973e"
+  integrity sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==
+  dependencies:
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+argparse@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-2.0.1.tgz#246f50f3ca78a3240f6c997e8a9bd1eac49e4b38"
+  integrity sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==
+
+atob@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
+balanced-match@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
+
+base64id@2.0.0, base64id@~2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/base64id/-/base64id-2.0.0.tgz#2770ac6bc47d312af97a8bf9a634342e0cd25cb6"
+  integrity sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==
+
+binary-extensions@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.2.0.tgz#75f502eeaf9ffde42fc98829645be4ea76bd9e2d"
+  integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==
+
+body-parser@^1.19.0:
+  version "1.20.2"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.2.tgz#6feb0e21c4724d06de7ff38da36dad4f57a747fd"
+  integrity sha512-ml9pReCu3M61kGlqoTm2umSXTlRTuGTx0bfYj+uIUKKYycG5NtSbeetV3faSU6R7ajOPw0g/J1PvK4qNy7s5bA==
+  dependencies:
+    bytes "3.1.2"
+    content-type "~1.0.5"
+    debug "2.6.9"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.2"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
+
+brace-expansion@^1.1.7:
+  version "1.1.11"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
+  integrity sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
+braces@^3.0.2, braces@~3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  dependencies:
+    fill-range "^7.0.1"
+
+browser-stdout@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/browser-stdout/-/browser-stdout-1.3.1.tgz#baa559ee14ced73452229bad7326467c61fabd60"
+  integrity sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==
+
+browserslist@^4.14.5:
+  version "4.22.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.22.2.tgz#704c4943072bd81ea18997f3bd2180e89c77874b"
+  integrity sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==
+  dependencies:
+    caniuse-lite "^1.0.30001565"
+    electron-to-chromium "^1.4.601"
+    node-releases "^2.0.14"
+    update-browserslist-db "^1.0.13"
+
+buffer-from@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
+  integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
+
+builtin-modules@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-3.3.0.tgz#cae62812b89801e9656336e46223e030386be7b6"
+  integrity sha512-zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==
+
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
+
+call-bind@^1.0.0:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.5.tgz#6fa2b7845ce0ea49bf4d8b9ef64727a2c2e2e513"
+  integrity sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==
+  dependencies:
+    function-bind "^1.1.2"
+    get-intrinsic "^1.2.1"
+    set-function-length "^1.1.1"
+
+camelcase@^6.0.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-6.3.0.tgz#5685b95eb209ac9c0c177467778c9c84df58ba9a"
+  integrity sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==
+
+caniuse-lite@^1.0.30001565:
+  version "1.0.30001570"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001570.tgz#b4e5c1fa786f733ab78fc70f592df6b3f23244ca"
+  integrity sha512-+3e0ASu4sw1SWaoCtvPeyXp+5PsjigkSt8OXZbF9StH5pQWbxEjLAZE3n8Aup5udop1uRiKA7a4utUk/uoSpUw==
+
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
+chalk@^4.1.0:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
+  dependencies:
+    ansi-styles "^4.1.0"
+    supports-color "^7.1.0"
+
+chokidar@3.5.3, chokidar@^3.5.1:
+  version "3.5.3"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
+  integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==
+  dependencies:
+    anymatch "~3.1.2"
+    braces "~3.0.2"
+    glob-parent "~5.1.2"
+    is-binary-path "~2.1.0"
+    is-glob "~4.0.1"
+    normalize-path "~3.0.0"
+    readdirp "~3.6.0"
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+chrome-trace-event@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
+
+cliui@^7.0.2:
+  version "7.0.4"
+  resolved "https://registry.yarnpkg.com/cliui/-/cliui-7.0.4.tgz#a0265ee655476fc807aea9df3df8df7783808b4f"
+  integrity sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==
+  dependencies:
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
+    wrap-ansi "^7.0.0"
+
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
+color-convert@^1.9.0:
+  version "1.9.3"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
+  integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
+  dependencies:
+    color-name "1.1.3"
+
+color-convert@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"
+  integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==
+  dependencies:
+    color-name "~1.1.4"
+
+color-name@1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+  integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
+
+color-name@~1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
+  integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
+
+colorette@^2.0.14:
+  version "2.0.20"
+  resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
+  integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
+
+commander@^2.20.0:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^7.0.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7"
+  integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==
+
+commondir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
+  integrity sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==
+
+concat-map@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
+  integrity sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==
+
+connect@^3.7.0:
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
+  integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
+  dependencies:
+    debug "2.6.9"
+    finalhandler "1.1.2"
+    parseurl "~1.3.3"
+    utils-merge "1.0.1"
+
+content-type@~1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.5.tgz#8b773162656d1d1086784c8f23a54ce6d73d7918"
+  integrity sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==
+
+cookie@~0.4.1:
+  version "0.4.2"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.2.tgz#0e41f24de5ecf317947c82fc789e06a884824432"
+  integrity sha512-aSWTXFzaKWkvHO1Ny/s+ePFpvKsPnjc551iI41v3ny/ow6tBG5Vd+FuqGNhh1LxOmVzOlGUriIlOaokOvhaStA==
+
+cors@~2.8.5:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/cors/-/cors-2.8.5.tgz#eac11da51592dd86b9f06f6e7ac293b3df875d29"
+  integrity sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==
+  dependencies:
+    object-assign "^4"
+    vary "^1"
+
+cross-spawn@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
+  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  dependencies:
+    path-key "^3.1.0"
+    shebang-command "^2.0.0"
+    which "^2.0.1"
+
+custom-event@~1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
+  integrity sha512-GAj5FOq0Hd+RsCGVJxZuKaIDXDf3h6GQoNEjFgbLLI/trgtavwUbSnZ5pVfg27DVCaWjIohryS0JFwIJyT2cMg==
+
+date-format@^4.0.14:
+  version "4.0.14"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-4.0.14.tgz#7a8e584434fb169a521c8b7aa481f355810d9400"
+  integrity sha512-39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==
+
+debug@2.6.9:
+  version "2.6.9"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
+  integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
+  dependencies:
+    ms "2.0.0"
+
+debug@4.3.4, debug@^4.3.4, debug@~4.3.1, debug@~4.3.2:
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
+  integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
+  dependencies:
+    ms "2.1.2"
+
+decamelize@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-4.0.0.tgz#aa472d7bf660eb15f3494efd531cab7f2a709837"
+  integrity sha512-9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==
+
+decode-uri-component@^0.2.0:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.2.tgz#e69dbe25d37941171dd540e024c444cd5188e1e9"
+  integrity sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==
+
+deepmerge@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-4.3.1.tgz#44b5f2147cd3b00d4b56137685966f26fd25dd4a"
+  integrity sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==
+
+define-data-property@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.1.tgz#c35f7cd0ab09883480d12ac5cb213715587800b3"
+  integrity sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==
+  dependencies:
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
+
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
+
+di@^0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
+  integrity sha512-uJaamHkagcZtHPqCIHZxnFrXlunQXgBOsZSUOWwFw31QJCAbyTBoHMW75YOTur5ZNx8pIeAKgf6GWIgaqqiLhA==
+
+diff@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/diff/-/diff-5.0.0.tgz#7ed6ad76d859d030787ec35855f5b1daf31d852b"
+  integrity sha512-/VTCrvm5Z0JGty/BWHljh+BAiw3IK+2j87NGMu8Nwc/f48WoDAC395uomO9ZD117ZOBaHmkX1oyLvkVM/aIT3w==
+
+dom-serialize@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
+  integrity sha512-Yra4DbvoW7/Z6LBN560ZwXMjoNOSAN2wRsKFGc4iBeso+mpIA6qj1vfdf9HpMaKAqG6wXTy+1SYEzmNpKXOSsQ==
+  dependencies:
+    custom-event "~1.0.0"
+    ent "~2.2.0"
+    extend "^3.0.0"
+    void-elements "^2.0.0"
+
+ee-first@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
+
+electron-to-chromium@^1.4.601:
+  version "1.4.612"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.612.tgz#350c6fd4201d677307519b931949fa64dae6a5cc"
+  integrity sha512-dM8BMtXtlH237ecSMnYdYuCkib2QHq0kpWfUnavjdYsyr/6OsAwg5ZGUfnQ9KD1Ga4QgB2sqXlB2NT8zy2GnVg==
+
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
+encodeurl@~1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
+
+engine.io-parser@~5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/engine.io-parser/-/engine.io-parser-5.2.1.tgz#9f213c77512ff1a6cc0c7a86108a7ffceb16fcfb"
+  integrity sha512-9JktcM3u18nU9N2Lz3bWeBgxVgOKpw7yhRaoxQA3FUDZzzw+9WlA6p4G4u0RixNkg14fH7EfEc/RhpurtiROTQ==
+
+engine.io@~6.5.2:
+  version "6.5.4"
+  resolved "https://registry.yarnpkg.com/engine.io/-/engine.io-6.5.4.tgz#6822debf324e781add2254e912f8568508850cdc"
+  integrity sha512-KdVSDKhVKyOi+r5uEabrDLZw2qXStVvCsEB/LN3mw4WFi6Gx50jTyuxYVCwAAC0U46FdnzP/ScKRBTXb/NiEOg==
+  dependencies:
+    "@types/cookie" "^0.4.1"
+    "@types/cors" "^2.8.12"
+    "@types/node" ">=10.0.0"
+    accepts "~1.3.4"
+    base64id "2.0.0"
+    cookie "~0.4.1"
+    cors "~2.8.5"
+    debug "~4.3.1"
+    engine.io-parser "~5.2.1"
+    ws "~8.11.0"
+
+enhanced-resolve@^5.15.0:
+  version "5.15.0"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.15.0.tgz#1af946c7d93603eb88e9896cee4904dc012e9c35"
+  integrity sha512-LXYT42KJ7lpIKECr2mAXIaMldcNCh/7E0KBKOu4KSfkHmP+mZmSs+8V5gBAqisWBy0OO4W5Oyys0GO1Y8KtdKg==
+  dependencies:
+    graceful-fs "^4.2.4"
+    tapable "^2.2.0"
+
+ent@~2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
+  integrity sha512-GHrMyVZQWvTIdDtpiEXdHZnFQKzeO09apj8Cbl4pKWy4i0Oprcq17usfDt5aO63swf0JOeMWjWQE/LzgSRuWpA==
+
+envinfo@^7.7.3:
+  version "7.11.0"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.11.0.tgz#c3793f44284a55ff8c82faf1ffd91bc6478ea01f"
+  integrity sha512-G9/6xF1FPbIw0TtalAMaVPpiq2aDEuKLXM314jPVAO9r2fo2a4BLqMNkmRS7O/xPPZ+COAhGIz3ETvHEV3eUcg==
+
+es-module-lexer@^1.2.1:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-1.4.1.tgz#41ea21b43908fe6a287ffcbe4300f790555331f5"
+  integrity sha512-cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==
+
+escalade@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
+  integrity sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==
+
+escape-html@~1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
+
+escape-string-regexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
+escape-string-regexp@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+  integrity sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==
+
+eslint-scope@5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
+  integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
+  dependencies:
+    esrecurse "^4.3.0"
+    estraverse "^4.1.1"
+
+esrecurse@^4.3.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
+  integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==
+  dependencies:
+    estraverse "^5.2.0"
+
+estraverse@^4.1.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
+estraverse@^5.2.0:
+  version "5.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123"
+  integrity sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==
+
+estree-walker@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
+  integrity sha512-1fMXF3YP4pZZVozF8j/ZLfvnR8NSIljt56UhbZ5PeeDmmGHpgpdwQt7ITlGvYaQukCvuBRMLEiKiYC+oeIg4cg==
+
+estree-walker@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-2.0.2.tgz#52f010178c2a4c117a7757cfe942adb7d2da4cac"
+  integrity sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==
+
+eventemitter3@^4.0.0:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
+  integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
+
+events@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
+
+extend@^3.0.0:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
+  integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
+
+fast-deep-equal@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
+  integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
+
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fastest-levenshtein@^1.0.12:
+  version "1.0.16"
+  resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz#210e61b6ff181de91ea9b3d1b84fdedd47e034e5"
+  integrity sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+  dependencies:
+    debug "2.6.9"
+    encodeurl "~1.0.2"
+    escape-html "~1.0.3"
+    on-finished "~2.3.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
+    unpipe "~1.0.0"
+
+find-up@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-5.0.0.tgz#4c92819ecb7083561e4f4a240a86be5198f536fc"
+  integrity sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==
+  dependencies:
+    locate-path "^6.0.0"
+    path-exists "^4.0.0"
+
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+flat@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/flat/-/flat-5.0.2.tgz#8ca6fe332069ffa9d324c327198c598259ceb241"
+  integrity sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==
+
+flatted@^3.2.7:
+  version "3.2.9"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.9.tgz#7eb4c67ca1ba34232ca9d2d93e9886e611ad7daf"
+  integrity sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==
+
+follow-redirects@^1.0.0:
+  version "1.15.3"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.3.tgz#fe2f3ef2690afce7e82ed0b44db08165b207123a"
+  integrity sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==
+
+format-util@1.0.5, format-util@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/format-util/-/format-util-1.0.5.tgz#1ffb450c8a03e7bccffe40643180918cc297d271"
+  integrity sha512-varLbTj0e0yVyRpqQhuWV+8hlePAgaoFRhNFj50BNjEIrw1/DphHSObtqwskVCPWNgzwPoQrZAbfa/SBiicNeg==
+
+fs-extra@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
+  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
+  dependencies:
+    graceful-fs "^4.2.0"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+  integrity sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==
+
+fsevents@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.3.tgz#cac6407785d03675a2a5e1a5305c697b347d90d6"
+  integrity sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==
+
+function-bind@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.2.tgz#2c02d864d97f3ea6c8830c464cbd11ab6eab7a1c"
+  integrity sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==
+
+get-caller-file@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
+  integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
+
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.3, get-intrinsic@^1.2.1, get-intrinsic@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.2.tgz#281b7622971123e1ef4b3c90fd7539306da93f3b"
+  integrity sha512-0gSo4ml/0j98Y3lngkFEot/zhiCeWsbYIlZ+uZOVgzLyLaUw7wxUL+nCTP0XJvJg1AXulJRI3UJi8GsbDuxdGA==
+  dependencies:
+    function-bind "^1.1.2"
+    has-proto "^1.0.1"
+    has-symbols "^1.0.3"
+    hasown "^2.0.0"
+
+glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-to-regexp@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
+  integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
+
+glob@7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.0.tgz#d15535af7732e02e948f4c41628bd910293f6023"
+  integrity sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+glob@^7.1.3, glob@^7.1.6, glob@^7.1.7:
+  version "7.2.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b"
+  integrity sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.1.1"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+gopd@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
+  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
+  dependencies:
+    get-intrinsic "^1.1.3"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6, graceful-fs@^4.2.9:
+  version "4.2.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
+  integrity sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==
+
+has-flag@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
+  integrity sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==
+
+has-flag@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
+  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
+
+has-property-descriptors@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.1.tgz#52ba30b6c5ec87fd89fa574bc1c39125c6f65340"
+  integrity sha512-VsX8eaIewvas0xnvinAe9bw4WfIeODpGYikiWYLH+dma0Jw6KHYqWiWfhQlgOVK8D6PvjubK5Uc4P0iIhIcNVg==
+  dependencies:
+    get-intrinsic "^1.2.2"
+
+has-proto@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.1.tgz#1885c1305538958aff469fef37937c22795408e0"
+  integrity sha512-7qE+iP+O+bgF9clE5+UoBFzE65mlBiVj3tKCrlNQ0Ogwm0BjpT/gK4SlLYDMybDh5I3TCTKnPPa0oMG7JDYrhg==
+
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
+
+hasown@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
+  integrity sha512-vUptKVTpIJhcczKBbgnS+RtcuYMB8+oNzPK2/Hp3hanz8JmpATdmmgLgSaadVREkDm+e2giHwY3ZRkyjSIDDFA==
+  dependencies:
+    function-bind "^1.1.2"
+
+he@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
+  integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
+
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
+  dependencies:
+    depd "2.0.0"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    toidentifier "1.0.1"
+
+http-proxy@^1.18.1:
+  version "1.18.1"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
+  integrity sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
+iconv-lite@0.4.24:
+  version "0.4.24"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
+  integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3"
+
+iconv-lite@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
+import-local@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.1.0.tgz#b4479df8a5fd44f6cdce24070675676063c95cb4"
+  integrity sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==
+  dependencies:
+    pkg-dir "^4.2.0"
+    resolve-cwd "^3.0.0"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  integrity sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+inherits@2, inherits@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+interpret@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9"
+  integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==
+
+is-binary-path@~2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
+is-builtin-module@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/is-builtin-module/-/is-builtin-module-3.2.1.tgz#f03271717d8654cfcaf07ab0463faa3571581169"
+  integrity sha512-BSLE3HnV2syZ0FK0iMA/yUGplUeMmNz4AW5fnTunbCIqZi4vG3WjJT9FHMy5D69xmAYBHXQhJdALdpwVxV501A==
+  dependencies:
+    builtin-modules "^3.3.0"
+
+is-core-module@^2.13.0:
+  version "2.13.1"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.13.1.tgz#ad0d7532c6fea9da1ebdc82742d74525c6273384"
+  integrity sha512-hHrIjvZsftOsvKSn2TRYl63zvxsgE0K+0mYMoH6gD4omR5IWB2KynivBQczo3+wF1cCkjzvptnI9Q0sPU66ilw==
+  dependencies:
+    hasown "^2.0.0"
+
+is-docker@^2.0.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
+
+is-extglob@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
+  integrity sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==
+
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
+is-glob@^4.0.1, is-glob@~4.0.1:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.3.tgz#64f61e42cbbb2eec2071a9dac0b28ba1e65d5084"
+  integrity sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==
+  dependencies:
+    is-extglob "^2.1.1"
+
+is-module@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-module/-/is-module-1.0.0.tgz#3258fb69f78c14d5b815d664336b4cffb6441591"
+  integrity sha512-51ypPSPCoTEIN9dy5Oy+h4pShgJmPCygKfyRCISBI+JoWT/2oJvK8QPxmwv7b/p239jXrm9M1mlQbyKJ5A152g==
+
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
+is-plain-obj@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-2.1.0.tgz#45e42e37fccf1f40da8e5f76ee21515840c09287"
+  integrity sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==
+
+is-plain-object@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
+  integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
+  dependencies:
+    isobject "^3.0.1"
+
+is-reference@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
+  integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
+  dependencies:
+    "@types/estree" "*"
+
+is-unicode-supported@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz#3f26c76a809593b52bfa2ecb5710ed2779b522a7"
+  integrity sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==
+
+is-wsl@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz#74a4c76e77ca9fd3f932f290c17ea326cd157271"
+  integrity sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==
+  dependencies:
+    is-docker "^2.0.0"
+
+isbinaryfile@^4.0.8:
+  version "4.0.10"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.10.tgz#0c5b5e30c2557a2f06febd37b7322946aaee42b3"
+  integrity sha512-iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==
+
+isexe@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
+  integrity sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==
+
+isobject@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
+  integrity sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==
+
+jest-worker@^26.2.1:
+  version "26.6.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
+  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^7.0.0"
+
+jest-worker@^27.4.5:
+  version "27.5.1"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.5.1.tgz#8d146f0900e8973b106b6f73cc1e9a8cb86f8db0"
+  integrity sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==
+  dependencies:
+    "@types/node" "*"
+    merge-stream "^2.0.0"
+    supports-color "^8.0.0"
+
+js-tokens@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+  integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+
+js-yaml@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
+  dependencies:
+    argparse "^2.0.1"
+
+json-parse-even-better-errors@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz#7c47805a94319928e05777405dc12e1f7a4ee02d"
+  integrity sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==
+
+json-schema-traverse@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
+  integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  integrity sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+karma-chrome-launcher@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/karma-chrome-launcher/-/karma-chrome-launcher-3.1.1.tgz#baca9cc071b1562a1db241827257bfe5cab597ea"
+  integrity sha512-hsIglcq1vtboGPAN+DGCISCFOxW+ZVnIqhDQcCMqqCp+4dmJ0Qpq5QAjkbA0X2L9Mi6OBkHi2Srrbmm7pUKkzQ==
+  dependencies:
+    which "^1.2.1"
+
+karma-mocha@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-mocha/-/karma-mocha-2.0.1.tgz#4b0254a18dfee71bdbe6188d9a6861bf86b0cd7d"
+  integrity sha512-Tzd5HBjm8his2OA4bouAsATYEpZrp9vC7z5E5j4C5Of5Rrs1jY67RAwXNcVmd/Bnk1wgvQRou0zGVLey44G4tQ==
+  dependencies:
+    minimist "^1.2.3"
+
+karma-sourcemap-loader@0.3.8:
+  version "0.3.8"
+  resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.8.tgz#d4bae72fb7a8397328a62b75013d2df937bdcf9c"
+  integrity sha512-zorxyAakYZuBcHRJE+vbrK2o2JXLFWK8VVjiT/6P+ltLBUGUvqTEkUiQ119MGdOrK7mrmxXHZF1/pfT6GgIZ6g==
+  dependencies:
+    graceful-fs "^4.1.2"
+
+karma-webpack@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/karma-webpack/-/karma-webpack-5.0.0.tgz#2a2c7b80163fe7ffd1010f83f5507f95ef39f840"
+  integrity sha512-+54i/cd3/piZuP3dr54+NcFeKOPnys5QeM1IY+0SPASwrtHsliXUiCL50iW+K9WWA7RvamC4macvvQ86l3KtaA==
+  dependencies:
+    glob "^7.1.3"
+    minimatch "^3.0.4"
+    webpack-merge "^4.1.5"
+
+karma@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.0.tgz#82652dfecdd853ec227b74ed718a997028a99508"
+  integrity sha512-s8m7z0IF5g/bS5ONT7wsOavhW4i4aFkzD4u4wgzAQWT4HGUeWI3i21cK2Yz6jndMAeHETp5XuNsRoyGJZXVd4w==
+  dependencies:
+    "@colors/colors" "1.5.0"
+    body-parser "^1.19.0"
+    braces "^3.0.2"
+    chokidar "^3.5.1"
+    connect "^3.7.0"
+    di "^0.0.1"
+    dom-serialize "^2.2.1"
+    glob "^7.1.7"
+    graceful-fs "^4.2.6"
+    http-proxy "^1.18.1"
+    isbinaryfile "^4.0.8"
+    lodash "^4.17.21"
+    log4js "^6.4.1"
+    mime "^2.5.2"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.5"
+    qjobs "^1.2.0"
+    range-parser "^1.2.1"
+    rimraf "^3.0.2"
+    socket.io "^4.4.1"
+    source-map "^0.6.1"
+    tmp "^0.2.1"
+    ua-parser-js "^0.7.30"
+    yargs "^16.1.1"
+
+kind-of@^6.0.2:
+  version "6.0.3"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
+  integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
+
+loader-runner@^4.2.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.3.0.tgz#c1b4a163b99f614830353b16755e7149ac2314e1"
+  integrity sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==
+
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
+  dependencies:
+    p-locate "^4.1.0"
+
+locate-path@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-6.0.0.tgz#55321eb309febbc59c4801d931a72452a681d286"
+  integrity sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==
+  dependencies:
+    p-locate "^5.0.0"
+
+lodash@^4.17.15, lodash@^4.17.21:
+  version "4.17.21"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
+  integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
+
+log-symbols@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
+  integrity sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==
+  dependencies:
+    chalk "^4.1.0"
+    is-unicode-supported "^0.1.0"
+
+log4js@^6.4.1:
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.9.1.tgz#aba5a3ff4e7872ae34f8b4c533706753709e38b6"
+  integrity sha512-1somDdy9sChrr9/f4UlzhdaGfDR2c/SaD2a4T7qEkG4jTS57/B3qmnjLYePwQ8cqWnUHZI0iAKxMBpCZICiZ2g==
+  dependencies:
+    date-format "^4.0.14"
+    debug "^4.3.4"
+    flatted "^3.2.7"
+    rfdc "^1.3.0"
+    streamroller "^3.1.5"
+
+magic-string@^0.25.7:
+  version "0.25.9"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.9.tgz#de7f9faf91ef8a1c91d02c2e5314c8277dbcdd1c"
+  integrity sha512-RmF0AsMzgt25qzqqLc1+MbHmhdx0ojF2Fvs4XnOqz2ZOBXzzkEwc/dJQZCYHAn7v1jbVOjAZfK8msRn4BxO4VQ==
+  dependencies:
+    sourcemap-codec "^1.4.8"
+
+media-typer@0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
+
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.27, mime-types@~2.1.24, mime-types@~2.1.34:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
+mime@^2.5.2:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-2.6.0.tgz#a2a682a95cd4d0cb1d6257e28f83da7e35800367"
+  integrity sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==
+
+minimatch@5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.0.1.tgz#fb9022f7528125187c92bd9e9b6366be1cf3415b"
+  integrity sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==
+  dependencies:
+    brace-expansion "^2.0.1"
+
+minimatch@^3.0.4, minimatch@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
+  integrity sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.3, minimist@^1.2.6:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c"
+  integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==
+
+mkdirp@^0.5.5:
+  version "0.5.6"
+  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.6.tgz#7def03d2432dcae4ba1d611445c48396062255f6"
+  integrity sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==
+  dependencies:
+    minimist "^1.2.6"
+
+mocha@10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/mocha/-/mocha-10.0.0.tgz#205447d8993ec755335c4b13deba3d3a13c4def9"
+  integrity sha512-0Wl+elVUD43Y0BqPZBzZt8Tnkw9CMUdNYnUsTfOM1vuhJVZL+kiesFYsqwBkEEuEixaiPe5ZQdqDgX2jddhmoA==
+  dependencies:
+    "@ungap/promise-all-settled" "1.1.2"
+    ansi-colors "4.1.1"
+    browser-stdout "1.3.1"
+    chokidar "3.5.3"
+    debug "4.3.4"
+    diff "5.0.0"
+    escape-string-regexp "4.0.0"
+    find-up "5.0.0"
+    glob "7.2.0"
+    he "1.2.0"
+    js-yaml "4.1.0"
+    log-symbols "4.1.0"
+    minimatch "5.0.1"
+    ms "2.1.3"
+    nanoid "3.3.3"
+    serialize-javascript "6.0.0"
+    strip-json-comments "3.1.1"
+    supports-color "8.1.1"
+    workerpool "6.2.1"
+    yargs "16.2.0"
+    yargs-parser "20.2.4"
+    yargs-unparser "2.0.0"
+
+ms@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
+
+ms@2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
+  integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
+
+ms@2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
+
+nanoid@3.3.3:
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25"
+  integrity sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==
+
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
+
+neo-async@^2.6.2:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz#b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"
+  integrity sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==
+
+node-releases@^2.0.14:
+  version "2.0.14"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.14.tgz#2ffb053bceb8b2be8495ece1ab6ce600c4461b0b"
+  integrity sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw==
+
+normalize-path@^3.0.0, normalize-path@~3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
+
+object-assign@^4:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
+  integrity sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==
+
+object-inspect@^1.9.0:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.1.tgz#b96c6109324ccfef6b12216a956ca4dc2ff94bc2"
+  integrity sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==
+
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
+  dependencies:
+    ee-first "1.1.1"
+
+on-finished@~2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
+  integrity sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==
+  dependencies:
+    ee-first "1.1.1"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  integrity sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==
+  dependencies:
+    wrappy "1"
+
+p-limit@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1"
+  integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==
+  dependencies:
+    p-try "^2.0.0"
+
+p-limit@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-3.1.0.tgz#e1daccbe78d0d1388ca18c64fea38e3e57e3706b"
+  integrity sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==
+  dependencies:
+    yocto-queue "^0.1.0"
+
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-locate@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-5.0.0.tgz#83c8315c6785005e3bd021839411c9e110e6d834"
+  integrity sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==
+  dependencies:
+    p-limit "^3.0.2"
+
+p-try@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6"
+  integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==
+
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+  integrity sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==
+
+path-key@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375"
+  integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
+
+path-parse@^1.0.7:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
+
+picocolors@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-1.0.0.tgz#cb5bdc74ff3f51892236eaf79d68bc44564ab81c"
+  integrity sha512-1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.1.tgz#3ba3833733646d9d3e4995946c1365a67fb07a42"
+  integrity sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==
+
+pkg-dir@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+punycode@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
+  integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
+
+qjobs@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
+  integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
+
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
+
+randombytes@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
+  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
+  dependencies:
+    safe-buffer "^5.1.0"
+
+range-parser@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
+
+raw-body@2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.2.tgz#99febd83b90e08975087e8f1f9419a149366b68a"
+  integrity sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==
+  dependencies:
+    bytes "3.1.2"
+    http-errors "2.0.0"
+    iconv-lite "0.4.24"
+    unpipe "1.0.0"
+
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
+  dependencies:
+    picomatch "^2.2.1"
+
+rechoir@^0.7.0:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.7.1.tgz#9478a96a1ca135b5e88fc027f03ee92d6c645686"
+  integrity sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==
+  dependencies:
+    resolve "^1.9.0"
+
+require-directory@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
+  integrity sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==
+
+requires-port@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/requires-port/-/requires-port-1.0.0.tgz#925d2601d39ac485e091cf0da5c6e694dc3dcaff"
+  integrity sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==
+
+resolve-cwd@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-cwd/-/resolve-cwd-3.0.0.tgz#0f0075f1bb2544766cf73ba6a6e2adfebcb13f2d"
+  integrity sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==
+  dependencies:
+    resolve-from "^5.0.0"
+
+resolve-from@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-5.0.0.tgz#c35225843df8f776df21c57557bc087e9dfdfc69"
+  integrity sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==
+
+resolve@^1.17.0, resolve@^1.19.0, resolve@^1.9.0:
+  version "1.22.8"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.8.tgz#b6c87a9f2aa06dfab52e3d70ac8cde321fa5a48d"
+  integrity sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==
+  dependencies:
+    is-core-module "^2.13.0"
+    path-parse "^1.0.7"
+    supports-preserve-symlinks-flag "^1.0.0"
+
+rfdc@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
+  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
+
+rimraf@^3.0.0, rimraf@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"
+  integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==
+  dependencies:
+    glob "^7.1.3"
+
+rollup-plugin-sourcemaps@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-sourcemaps/-/rollup-plugin-sourcemaps-0.6.3.tgz#bf93913ffe056e414419607f1d02780d7ece84ed"
+  integrity sha512-paFu+nT1xvuO1tPFYXGe+XnQvg4Hjqv/eIhG8i5EspfYYPBKL57X7iVbfv55aNVASg3dzWvES9dmWsL2KhfByw==
+  dependencies:
+    "@rollup/pluginutils" "^3.0.9"
+    source-map-resolve "^0.6.0"
+
+rollup-plugin-terser@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz#e8fbba4869981b2dc35ae7e8a502d5c6c04d324d"
+  integrity sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==
+  dependencies:
+    "@babel/code-frame" "^7.10.4"
+    jest-worker "^26.2.1"
+    serialize-javascript "^4.0.0"
+    terser "^5.0.0"
+
+rollup@^2.68.0:
+  version "2.79.1"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.79.1.tgz#bedee8faef7c9f93a2647ac0108748f497f081c7"
+  integrity sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==
+  optionalDependencies:
+    fsevents "~2.3.2"
+
+safe-buffer@^5.1.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
+
+"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
+schema-utils@^3.1.1, schema-utils@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.3.0.tgz#f50a88877c3c01652a15b622ae9e9795df7a60fe"
+  integrity sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==
+  dependencies:
+    "@types/json-schema" "^7.0.8"
+    ajv "^6.12.5"
+    ajv-keywords "^3.5.2"
+
+serialize-javascript@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
+  dependencies:
+    randombytes "^2.1.0"
+
+serialize-javascript@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz#b525e1238489a5ecfc42afacc3fe99e666f4b1aa"
+  integrity sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==
+  dependencies:
+    randombytes "^2.1.0"
+
+serialize-javascript@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.1.tgz#b206efb27c3da0b0ab6b52f48d170b7996458e5c"
+  integrity sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==
+  dependencies:
+    randombytes "^2.1.0"
+
+set-function-length@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.1.1.tgz#4bc39fafb0307224a33e106a7d35ca1218d659ed"
+  integrity sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==
+  dependencies:
+    define-data-property "^1.1.1"
+    get-intrinsic "^1.2.1"
+    gopd "^1.0.1"
+    has-property-descriptors "^1.0.0"
+
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
+
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
+shebang-command@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea"
+  integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==
+  dependencies:
+    shebang-regex "^3.0.0"
+
+shebang-regex@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
+  integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
+
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
+socket.io-adapter@~2.5.2:
+  version "2.5.2"
+  resolved "https://registry.yarnpkg.com/socket.io-adapter/-/socket.io-adapter-2.5.2.tgz#5de9477c9182fdc171cd8c8364b9a8894ec75d12"
+  integrity sha512-87C3LO/NOMc+eMcpcxUBebGjkpMDkNBS9tf7KJqcDsmL936EChtVva71Dw2q4tQcuVC+hAUy4an2NO/sYXmwRA==
+  dependencies:
+    ws "~8.11.0"
+
+socket.io-parser@~4.2.4:
+  version "4.2.4"
+  resolved "https://registry.yarnpkg.com/socket.io-parser/-/socket.io-parser-4.2.4.tgz#c806966cf7270601e47469ddeec30fbdfda44c83"
+  integrity sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==
+  dependencies:
+    "@socket.io/component-emitter" "~3.1.0"
+    debug "~4.3.1"
+
+socket.io@^4.4.1:
+  version "4.7.2"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-4.7.2.tgz#22557d76c3f3ca48f82e73d68b7add36a22df002"
+  integrity sha512-bvKVS29/I5fl2FGLNHuXlQaUH/BlzX1IN6S+NKLNZpBsPZIDH+90eQmCs2Railn4YUiww4SzUedJ6+uzwFnKLw==
+  dependencies:
+    accepts "~1.3.4"
+    base64id "~2.0.0"
+    cors "~2.8.5"
+    debug "~4.3.2"
+    engine.io "~6.5.2"
+    socket.io-adapter "~2.5.2"
+    socket.io-parser "~4.2.4"
+
+source-map-js@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/source-map-js/-/source-map-js-1.0.2.tgz#adbc361d9c62df380125e7f161f71c826f1e490c"
+  integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
+
+source-map-loader@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-4.0.0.tgz#bdc6b118bc6c87ee4d8d851f2d4efcc5abdb2ef5"
+  integrity sha512-i3KVgM3+QPAHNbGavK+VBq03YoJl24m9JWNbLgsjTj8aJzXG9M61bantBTNBt7CNwY2FYf+RJRYJ3pzalKjIrw==
+  dependencies:
+    abab "^2.0.6"
+    iconv-lite "^0.6.3"
+    source-map-js "^1.0.2"
+
+source-map-resolve@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.6.0.tgz#3d9df87e236b53f16d01e58150fc7711138e5ed2"
+  integrity sha512-KXBr9d/fO/bWo97NXsPIAW1bFSBOuCnjbNTBMO7N59hsv5i9yzRDfcYwwt0l04+VqnKC+EwzvJZIP/qkuMgR/w==
+  dependencies:
+    atob "^2.1.2"
+    decode-uri-component "^0.2.0"
+
+source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
+source-map@^0.6.0, source-map@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
+  integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
+
+sourcemap-codec@^1.4.8:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
+  integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
+
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
+statuses@~1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
+  integrity sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==
+
+streamroller@^3.1.5:
+  version "3.1.5"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-3.1.5.tgz#1263182329a45def1ffaef58d31b15d13d2ee7ff"
+  integrity sha512-KFxaM7XT+irxvdqSP1LGLgNWbYN7ay5owZ3r/8t77p+EtSUAfUgtl7be3xtqtOmGUl9K9YPO2ca8133RlTjvKw==
+  dependencies:
+    date-format "^4.0.14"
+    debug "^4.3.4"
+    fs-extra "^8.1.0"
+
+string-width@^4.1.0, string-width@^4.2.0:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-json-comments@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
+
+supports-color@8.1.1, supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-color@^5.3.0:
+  version "5.5.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
+  integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
+  dependencies:
+    has-flag "^3.0.0"
+
+supports-color@^7.0.0, supports-color@^7.1.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
+  integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
+  dependencies:
+    has-flag "^4.0.0"
+
+supports-preserve-symlinks-flag@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09"
+  integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==
+
+tapable@^2.1.1, tapable@^2.2.0:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0"
+  integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==
+
+terser-webpack-plugin@^5.3.7:
+  version "5.3.9"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.3.9.tgz#832536999c51b46d468067f9e37662a3b96adfe1"
+  integrity sha512-ZuXsqE07EcggTWQjXUj+Aot/OMcD0bMKGgF63f7UxYcu5/AJF53aIpK1YoP5xR9l6s/Hy2b+t1AM0bLNPRuhwA==
+  dependencies:
+    "@jridgewell/trace-mapping" "^0.3.17"
+    jest-worker "^27.4.5"
+    schema-utils "^3.1.1"
+    serialize-javascript "^6.0.1"
+    terser "^5.16.8"
+
+terser@^5.0.0, terser@^5.16.8:
+  version "5.26.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.26.0.tgz#ee9f05d929f4189a9c28a0feb889d96d50126fe1"
+  integrity sha512-dytTGoE2oHgbNV9nTzgBEPaqAWvcJNl66VZ0BkJqlvp71IjO8CxdBx/ykCNb47cLnCmCvRZ6ZR0tLkqvZCdVBQ==
+  dependencies:
+    "@jridgewell/source-map" "^0.3.3"
+    acorn "^8.8.2"
+    commander "^2.20.0"
+    source-map-support "~0.5.20"
+
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
+
+tslib@^2.3.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae"
+  integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q==
+
+type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
+  dependencies:
+    media-typer "0.3.0"
+    mime-types "~2.1.24"
+
+typescript@4.7.4:
+  version "4.7.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.7.4.tgz#1a88596d1cf47d59507a1bcdfb5b9dfe4d488235"
+  integrity sha512-C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ==
+
+typescript@^3.7.2:
+  version "3.9.10"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.9.10.tgz#70f3910ac7a51ed6bef79da7800690b19bf778b8"
+  integrity sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==
+
+ua-parser-js@^0.7.30:
+  version "0.7.37"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.37.tgz#e464e66dac2d33a7a1251d7d7a99d6157ec27832"
+  integrity sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==
+
+undici-types@~5.26.4:
+  version "5.26.5"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-5.26.5.tgz#bcd539893d00b56e964fd2657a4866b221a65617"
+  integrity sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==
+
+universalify@^0.1.0:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
+  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
+
+unpipe@1.0.0, unpipe@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
+
+update-browserslist-db@^1.0.13:
+  version "1.0.13"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz#3c5e4f5c083661bd38ef64b6328c26ed6c8248c4"
+  integrity sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==
+  dependencies:
+    escalade "^3.1.1"
+    picocolors "^1.0.0"
+
+uri-js@^4.2.2:
+  version "4.4.1"
+  resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e"
+  integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==
+  dependencies:
+    punycode "^2.1.0"
+
+utils-merge@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
+
+vary@^1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
+
+void-elements@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
+  integrity sha512-qZKX4RnBzH2ugr8Lxa7x+0V6XD9Sb/ouARtiasEQCHB1EVU4NXtmHsDDrx1dO4ne5fc3J6EW05BP1Dl0z0iung==
+
+watchpack@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.4.0.tgz#fa33032374962c78113f93c7f2fb4c54c9862a5d"
+  integrity sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==
+  dependencies:
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.1.2"
+
+webpack-cli@4.10.0:
+  version "4.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-4.10.0.tgz#37c1d69c8d85214c5a65e589378f53aec64dab31"
+  integrity sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==
+  dependencies:
+    "@discoveryjs/json-ext" "^0.5.0"
+    "@webpack-cli/configtest" "^1.2.0"
+    "@webpack-cli/info" "^1.5.0"
+    "@webpack-cli/serve" "^1.7.0"
+    colorette "^2.0.14"
+    commander "^7.0.0"
+    cross-spawn "^7.0.3"
+    fastest-levenshtein "^1.0.12"
+    import-local "^3.0.2"
+    interpret "^2.2.0"
+    rechoir "^0.7.0"
+    webpack-merge "^5.7.3"
+
+webpack-merge@^4.1.5:
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.2.tgz#a27c52ea783d1398afd2087f547d7b9d2f43634d"
+  integrity sha512-TUE1UGoTX2Cd42j3krGYqObZbOD+xF7u28WB7tfUordytSjbWTIjK/8V0amkBfTYN4/pB/GIDlJZZ657BGG19g==
+  dependencies:
+    lodash "^4.17.15"
+
+webpack-merge@^5.7.3:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.10.0.tgz#a3ad5d773241e9c682803abf628d4cd62b8a4177"
+  integrity sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==
+  dependencies:
+    clone-deep "^4.0.1"
+    flat "^5.0.2"
+    wildcard "^2.0.0"
+
+webpack-sources@^3.2.3:
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
+  integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
+
+webpack@5.89.0:
+  version "5.89.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.89.0.tgz#56b8bf9a34356e93a6625770006490bf3a7f32dc"
+  integrity sha512-qyfIC10pOr70V+jkmud8tMfajraGCZMBWJtrmuBymQKCrLTRejBI8STDp1MCyZu/QTdZSeacCQYpYNQVOzX5kw==
+  dependencies:
+    "@types/eslint-scope" "^3.7.3"
+    "@types/estree" "^1.0.0"
+    "@webassemblyjs/ast" "^1.11.5"
+    "@webassemblyjs/wasm-edit" "^1.11.5"
+    "@webassemblyjs/wasm-parser" "^1.11.5"
+    acorn "^8.7.1"
+    acorn-import-assertions "^1.9.0"
+    browserslist "^4.14.5"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^5.15.0"
+    es-module-lexer "^1.2.1"
+    eslint-scope "5.1.1"
+    events "^3.2.0"
+    glob-to-regexp "^0.4.1"
+    graceful-fs "^4.2.9"
+    json-parse-even-better-errors "^2.3.1"
+    loader-runner "^4.2.0"
+    mime-types "^2.1.27"
+    neo-async "^2.6.2"
+    schema-utils "^3.2.0"
+    tapable "^2.1.1"
+    terser-webpack-plugin "^5.3.7"
+    watchpack "^2.4.0"
+    webpack-sources "^3.2.3"
+
+which@^1.2.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
+  integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
+  dependencies:
+    isexe "^2.0.0"
+
+which@^2.0.1:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"
+  integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==
+  dependencies:
+    isexe "^2.0.0"
+
+wildcard@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.1.tgz#5ab10d02487198954836b6349f74fff961e10f67"
+  integrity sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==
+
+workerpool@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343"
+  integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==
+
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+  integrity sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==
+
+ws@~8.11.0:
+  version "8.11.0"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.11.0.tgz#6a0d36b8edfd9f96d8b25683db2f8d7de6e8e143"
+  integrity sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==
+
+y18n@^5.0.5:
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
+
+yargs-parser@20.2.4:
+  version "20.2.4"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.4.tgz#b42890f14566796f85ae8e3a25290d205f154a54"
+  integrity sha512-WOkpgNhPTlE73h4VFAFsOnomJVaovO8VqLDzy5saChRBFQFBoMYirowyW+Q9HB4HFF4Z7VZTiG3iSzJJA29yRA==
+
+yargs-parser@^20.2.2:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
+
+yargs-unparser@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-unparser/-/yargs-unparser-2.0.0.tgz#f131f9226911ae5d9ad38c432fe809366c2325eb"
+  integrity sha512-7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==
+  dependencies:
+    camelcase "^6.0.0"
+    decamelize "^4.0.0"
+    flat "^5.0.2"
+    is-plain-obj "^2.1.0"
+
+yargs@16.2.0, yargs@^16.1.1:
+  version "16.2.0"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-16.2.0.tgz#1c82bf0f6b6a66eafce7ef30e376f49a12477f66"
+  integrity sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==
+  dependencies:
+    cliui "^7.0.2"
+    escalade "^3.1.1"
+    get-caller-file "^2.0.5"
+    require-directory "^2.1.1"
+    string-width "^4.2.0"
+    y18n "^5.0.5"
+    yargs-parser "^20.2.2"
+
+yocto-queue@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
+  integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
diff --git a/kotlin/settings.gradle.kts b/kotlin/settings.gradle.kts
new file mode 100644
index 00000000000..481134aa1f2
--- /dev/null
+++ b/kotlin/settings.gradle.kts
@@ -0,0 +1,27 @@
+@file:Suppress("UnstableApiUsage")
+
+rootProject.name = "WalletCoreKotlin"
+
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+dependencyResolutionManagement {
+    // Uncomment after https://youtrack.jetbrains.com/issue/KT-55620/
+    // repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+includeBuild(
+    "build-logic",
+)
+
+include(
+    ":wallet-core-kotlin"
+)
diff --git a/kotlin/wallet-core-kotlin/.gitignore b/kotlin/wallet-core-kotlin/.gitignore
new file mode 100644
index 00000000000..a9e76bfd475
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/.gitignore
@@ -0,0 +1,2 @@
+/src/**/generated/
+/src/**/proto/
diff --git a/kotlin/wallet-core-kotlin/build.gradle.kts b/kotlin/wallet-core-kotlin/build.gradle.kts
new file mode 100644
index 00000000000..63d879ca7c3
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/build.gradle.kts
@@ -0,0 +1,147 @@
+@file:Suppress("UnstableApiUsage", "OPT_IN_USAGE")
+
+import org.jetbrains.kotlin.gradle.targets.js.webpack.KotlinWebpackOutput
+
+plugins {
+    kotlin("multiplatform")
+    id("com.android.library")
+    id("convention.maven-publish")
+    id("convention.proto-generation")
+}
+
+kotlin {
+    targetHierarchy.default()
+
+    android {
+        publishLibraryVariants = listOf("release")
+    }
+
+    jvm {
+        testRuns.named("test") {
+            executionTask.configure {
+                useJUnitPlatform()
+            }
+        }
+    }
+
+    val nativeTargets =
+        listOf(
+            iosArm64(),
+            iosSimulatorArm64(),
+            iosX64(),
+        )
+
+    js {
+        browser {
+            webpackTask {
+                output.libraryTarget = KotlinWebpackOutput.Target.COMMONJS2
+            }
+        }
+        useCommonJs()
+    }
+
+    sourceSets {
+        all {
+            languageSettings {
+                optIn("kotlin.js.ExperimentalJsExport")
+            }
+        }
+
+        val commonMain by getting {
+            kotlin.srcDirs(
+                projectDir.resolve("src/commonMain/generated"),
+                projectDir.resolve("src/commonMain/proto"),
+            )
+
+            dependencies {
+                api(libs.wire.runtime)
+            }
+        }
+
+        getByName("commonTest") {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+
+        val androidMain by getting
+        val jvmMain by getting
+        create("commonAndroidJvmMain") {
+            kotlin.srcDir(projectDir.resolve("src/commonAndroidJvmMain/generated"))
+
+            dependsOn(commonMain)
+            androidMain.dependsOn(this)
+            jvmMain.dependsOn(this)
+        }
+
+        getByName("iosMain") {
+            kotlin.srcDir(projectDir.resolve("src/iosMain/generated"))
+        }
+
+        getByName("jsMain") {
+            kotlin.srcDir(projectDir.resolve("src/jsMain/generated"))
+
+            dependencies {
+                implementation(npm(name = "webpack", version = "5.89.0"))
+            }
+        }
+    }
+
+    nativeTargets.forEach { nativeTarget ->
+        nativeTarget.apply {
+            val main by compilations.getting
+            main.cinterops.create("WalletCore") {
+                packageName = "com.trustwallet.core"
+                headers(rootDir.parentFile.resolve("include/TrustWalletCore").listFiles()!!)
+            }
+        }
+    }
+}
+
+android {
+    namespace = "com.trustwallet.core"
+    compileSdk = libs.versions.android.sdk.compile.get().toInt()
+    buildToolsVersion = libs.versions.android.sdk.tools.get()
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+
+    defaultConfig {
+        minSdk = libs.versions.android.sdk.min.get().toInt()
+        ndkVersion = libs.versions.android.ndk.get()
+
+        consumerProguardFiles += projectDir.resolve("consumer-rules.pro")
+
+        externalNativeBuild {
+            cmake {
+                arguments += listOf("-DCMAKE_BUILD_TYPE=Release", "-DKOTLIN=True", "-DTW_UNITY_BUILD=ON")
+            }
+        }
+    }
+
+    buildFeatures {
+        aidl = false
+        compose = false
+        buildConfig = false
+        prefab = false
+        renderScript = false
+        resValues = false
+        shaders = false
+        viewBinding = false
+    }
+
+    androidComponents {
+        beforeVariants {
+            it.enable = it.name == "release"
+        }
+    }
+
+    externalNativeBuild {
+        cmake {
+            version = libs.versions.android.cmake.get()
+            path = rootDir.parentFile.resolve("CMakeLists.txt")
+        }
+    }
+}
diff --git a/kotlin/wallet-core-kotlin/consumer-rules.pro b/kotlin/wallet-core-kotlin/consumer-rules.pro
new file mode 100644
index 00000000000..877985aff56
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/consumer-rules.pro
@@ -0,0 +1,15 @@
+-keepclassmembers class com.trustwallet.core.* {
+    # Usage example: (*env)->GetFieldID(env, thisClass, "nativeHandle", "J");
+    private long nativeHandle;
+    # Usage example: (*env)->GetStaticMethodID(env, class, "createFromNative", "(J)Lcom/trustwallet/core/Account;");
+    private static ** createFromNative(long);
+}
+
+-keepclassmembers enum com.trustwallet.core.* {
+    # Usage example: (*env)->GetFieldID(env, thisClass, "value", "I");
+    private int value;
+    # Usage example: (*env)->GetMethodID(env, coinClass, "value", "()I");
+    public int value();
+    # Usage example: (*env)->GetStaticMethodID(env, class, "createFromValue", "(I)Lcom/trustwallet/core/CoinType;");
+    public static ** createFromValue(int);
+}
diff --git a/kotlin/wallet-core-kotlin/src/androidUnitTest/kotlin/com/trustwallet/core/LibLoader.kt b/kotlin/wallet-core-kotlin/src/androidUnitTest/kotlin/com/trustwallet/core/LibLoader.kt
new file mode 100644
index 00000000000..1d4f9311712
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/androidUnitTest/kotlin/com/trustwallet/core/LibLoader.kt
@@ -0,0 +1,7 @@
+package com.trustwallet.core
+
+actual object LibLoader {
+    actual fun loadLibrary() {
+        throw NotImplementedError()
+    }
+}
diff --git a/kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/kotlin/com/trustwallet/core/AnySigner.kt b/kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/kotlin/com/trustwallet/core/AnySigner.kt
new file mode 100644
index 00000000000..e6b348433c4
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/commonAndroidJvmMain/kotlin/com/trustwallet/core/AnySigner.kt
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core
+
+actual object AnySigner {
+
+    @JvmStatic
+    actual external fun sign(input: ByteArray, coin: CoinType): ByteArray
+
+    @JvmStatic
+    actual external fun supportsJson(coin: CoinType): Boolean
+
+    @JvmStatic
+    actual external fun signJson(json: String, key: ByteArray, coin: CoinType): String
+
+    @JvmStatic
+    actual external fun plan(input: ByteArray, coin: CoinType): ByteArray
+}
diff --git a/kotlin/wallet-core-kotlin/src/commonMain/kotlin/com/trustwallet/core/AnySigner.kt b/kotlin/wallet-core-kotlin/src/commonMain/kotlin/com/trustwallet/core/AnySigner.kt
new file mode 100644
index 00000000000..576aa1d32cb
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/commonMain/kotlin/com/trustwallet/core/AnySigner.kt
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core
+
+import com.squareup.wire.Message
+import com.squareup.wire.ProtoAdapter
+
+expect object AnySigner {
+
+    fun sign(input: ByteArray, coin: CoinType): ByteArray
+
+    fun supportsJson(coin: CoinType): Boolean
+
+    fun signJson(json: String, key: ByteArray, coin: CoinType): String
+
+    fun plan(input: ByteArray, coin: CoinType): ByteArray
+}
+
+fun <T : Message<T, *>> AnySigner.sign(input: Message<*, *>, coin: CoinType, adapter: ProtoAdapter<T>): T =
+    adapter.decode(sign(input.encode(), coin))
+
+fun <T : Message<T, *>> AnySigner.plan(input: Message<*, *>, coin: CoinType, adapter: ProtoAdapter<T>): T =
+    adapter.decode(plan(input.encode(), coin))
diff --git a/kotlin/wallet-core-kotlin/src/commonTest/kotlin/com/trustwallet/core/LibLoader.kt b/kotlin/wallet-core-kotlin/src/commonTest/kotlin/com/trustwallet/core/LibLoader.kt
new file mode 100644
index 00000000000..5d78d0dc298
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/commonTest/kotlin/com/trustwallet/core/LibLoader.kt
@@ -0,0 +1,5 @@
+package com.trustwallet.core
+
+expect object LibLoader {
+    fun loadLibrary()
+}
diff --git a/kotlin/wallet-core-kotlin/src/commonTest/kotlin/com/trustwallet/core/test/CoinAddressDerivationTests.kt b/kotlin/wallet-core-kotlin/src/commonTest/kotlin/com/trustwallet/core/test/CoinAddressDerivationTests.kt
new file mode 100644
index 00000000000..959fd4821eb
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/commonTest/kotlin/com/trustwallet/core/test/CoinAddressDerivationTests.kt
@@ -0,0 +1,152 @@
+package com.trustwallet.core.test
+
+import com.trustwallet.core.CoinType
+import com.trustwallet.core.CoinType.*
+import com.trustwallet.core.HDWallet
+import com.trustwallet.core.LibLoader
+import kotlin.test.Test
+import kotlin.test.assertEquals
+
+class CoinAddressDerivationTests {
+
+    init {
+        LibLoader.loadLibrary()
+    }
+
+    @Test
+    fun testDeriveAddressesFromPhrase() {
+        val wallet = HDWallet("shoot island position soft burden budget tooth cruel issue economy destroy above", "")
+
+        CoinType.values().forEach { coin ->
+            val address = wallet.getAddressForCoin(coin)
+            val expectedAddress = getExpectedAddress(coin)
+
+            assertEquals(expectedAddress, address, "Coin = $coin")
+        }
+    }
+
+    private fun getExpectedAddress(coin: CoinType): String = when (coin) {
+        Binance -> "bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw"
+        TBinance -> "tbnb12vtaxl9952zm6rwf7v8jerq74pvaf77fkw9xhl"
+        Bitcoin -> "bc1quvuarfksewfeuevuc6tn0kfyptgjvwsvrprk9d"
+        BitcoinDiamond -> "1KaRW9xPPtCTZ9FdaTHduCPck4YvSeEWNn"
+        BitcoinCash -> "bitcoincash:qpzl3jxkzgvfd9flnd26leud5duv795fnv7vuaha70"
+        BitcoinGold -> "btg1qwz9sed0k4neu6ycrudzkca6cnqe3zweq35hvtg"
+        Callisto -> "0x3E6FFC80745E6669135a76F4A7ce6BCF02436e04"
+        Dash -> "XqHiz8EXYbTAtBEYs4pWTHh7ipEDQcNQeT"
+        DigiByte -> "dgb1qtjgmerfqwdffyf8ghcrkgy52cghsqptynmyswu"
+
+        Ethereum, SmartChain, Polygon, Optimism, Zksync, Arbitrum, ArbitrumNova, ECOChain, AvalancheCChain, XDai,
+        Fantom, Celo, CronosChain, SmartBitcoinCash, KuCoinCommunityChain, Boba, Metis,
+        Aurora, Evmos, Moonriver, Moonbeam, KavaEvm, Kaia, Meter, OKXChain, PolygonzkEVM, Scroll,
+        ConfluxeSpace, AcalaEVM, OpBNB, Neon, Base, Linea, Greenfield, Mantle, ZenEON, MantaPacific,
+        ZetaEVM, Merlin, Lightlink, Blast, BounceBit, ZkLinkNova,
+        -> "0x8f348F300873Fd5DA36950B2aC75a26584584feE"
+
+        Ronin -> "ronin:8f348F300873Fd5DA36950B2aC75a26584584feE"
+        EthereumClassic -> "0x078bA3228F3E6C08bEEac9A005de0b7e7089aD1c"
+        GoChain -> "0x5940ce4A14210d4Ccd0ac206CE92F21828016aC2"
+        Groestlcoin -> "grs1qexwmshts5pdpeqglkl39zyl6693tmfwp0cue4j"
+        ICON -> "hx18b380b53c23dc4ee9f6666bc20d1be02f3fe106"
+        Litecoin -> "ltc1qhd8fxxp2dx3vsmpac43z6ev0kllm4n53t5sk0u"
+        Ontology -> "AHKTnybvnWo3TeY8uvNXekvYxMrXogUjeT"
+        POANetwork -> "0xe8a3e8bE17E172B6926130eAfB521e9D2849aca9"
+        XRP -> "rPwE3gChNKtZ1mhH3Ko8YFGqKmGRWLWXV3"
+        Tezos -> "tz1acnY9VbMagps26Kj3RfoGRWD9nYG5qaRX"
+        ThunderCore -> "0x4b92b3ED6d8b24575Bf5ce4C6a86ED261DA0C8d7"
+        Viction -> "0xC74b6D8897cBa9A4b659d43fEF73C9cA852cE424"
+        Tron -> "TQ5NMqJjhpQGK7YJbESKtNCo86PJ89ujio"
+        VeChain -> "0x1a553275dF34195eAf23942CB7328AcF9d48c160"
+        Wanchain -> "0xD5ca90b928279FE5D06144136a25DeD90127aC15"
+        Komodo -> "RCWJLXE5CSXydxdSnwcghzPgkFswERegyb"
+        Zcash -> "t1YYnByMzdGhQv3W3rnjHMrJs6HH4Y231gy"
+        Zen -> "znUmzvod1f4P9LYsBhNxjqCDQvNSStAmYEX"
+        Firo -> "aEd5XFChyXobvEics2ppAqgK3Bgusjxtik"
+        Nimiq -> "NQ76 7AVR EHDA N05U X7SY XB14 XJU7 8ERV GM6H"
+        Stellar -> "GA3H6I4C5XUBYGVB66KXR27JV5KS3APSTKRUWOIXZ5MVWZKVTLXWKZ2P"
+        Aion -> "0xa0629f34c9ea4757ad0b275628d4d02e3db6c9009ba2ceeba76a5b55fb2ca42e"
+        Nano -> "nano_39gsbcishxn3n7wd17ono4otq5wazwzusqgqigztx73wbrh5jwbdbshfnumc"
+        Nebulas -> "n1ZVgEidtdseYv9ogmGz69Cz4mbqmHYSNqJ"
+        NEAR -> "0c91f6106ff835c0195d5388565a2d69e25038a7e23d26198f85caf6594117ec"
+        Theta, ThetaFuel -> "0x0d1fa20c218Fec2f2C55d52aB267940485fa5DA4"
+        Cosmos -> "cosmos142j9u5eaduzd7faumygud6ruhdwme98qsy2ekn"
+        Decred -> "DsidJiDGceqHTyqiejABy1ZQ3FX4SiWZkYG"
+        Dogecoin -> "DJRFZNg8jkUtjcpo2zJd92FUAzwRjitw6f"
+        Kin -> "GBL3MT2ICHHM5OJ2QJ44CAHGDK6MLPINVXBKOKLHGBWQDVRWTWQ7U2EA"
+        Viacoin -> "via1qnmsgjd6cvfprnszdgmyg9kewtjfgqflz67wwhc"
+        Verge -> "DPb3Xz4vjB6QGLKDmrbprrtv4XzNqkADc2"
+        Qtum -> "QhceuaTdeCZtcxmVc6yyEDEJ7Riu5gWFoF"
+        NULS -> "NULSd6HgU8MoRnNjBgvJpa9tqvGxYdv5ne4en"
+        EOS -> "EOS6hs8sRvGSzuQtq223zwJipMzqTJpXUVjyvHPvPwBSZWWrJTJkg"
+        WAX -> "EOS6hs8sRvGSzuQtq223zwJipMzqTJpXUVjyvHPvPwBSZWWrJTJkg"
+        IoTeX -> "io1qw9cccecw09q7p5kzyqtuhfhvah2mhfrc84jfk"
+        IoTeXEVM -> "0x038B8C633873Ca0f06961100BE5d37676EADDD23"
+        Zilliqa -> "zil1mk6pqphhkmaguhalq6n3cq0h38ltcehg0rfmv6"
+        Zelcash -> "t1UKbRPzL4WN8Rs8aZ8RNiWoD2ftCMHKGUf"
+        Ravencoin -> "RHoCwPc2FCQqwToYnSiAb3SrCET4zEHsbS"
+        Waves -> "3P63vkaHhyE9pPv9EfsjwGKqmZYcCRHys4n"
+        Aeternity -> "ak_QDHJSfvHG9sDHBobaWt2TAGhuhipYjEqZEH34bWugpJfJc3GN"
+        Terra, TerraV2 -> "terra1rh402g98t7sly8trzqw5cyracntlep6qe3smug"
+        Monacoin -> "M9xFZzZdZhCDxpx42cM8bQHnLwaeX1aNja"
+        FIO -> "FIO7MN1LuSfFgrbVHmrt9cVa2FYAs857Ppr9dzvEXoD1miKSxm3n3"
+        Harmony -> "one12fk20wmvgypdkn59n4hq8e3aa5899xfx4vsu09"
+        Solana -> "2bUBiBNZyD29gP1oV6de7nxowMLoDBtopMMTGgMvjG5m"
+        Algorand -> "JTJWO524JXIHVPGBDWFLJE7XUIA32ECOZOBLF2QP3V5TQBT3NKZSCG67BQ"
+        Acala -> "25GGezx3LWFQj6HZpYzoWoVzLsHojGtybef3vthC9nd19ms3"
+        Kusama -> "G9xV2EatmrjRC1FLPexc3ddqNRRzCsAdURU8RFiAAJX6ppY"
+        Polkadot -> "13nN6BGAoJwd7Nw1XxeBCx5YcBXuYnL94Mh7i3xBprqVSsFk"
+        Pivx -> "D81AqC8zKma3Cht4TbVuh4jyVVyLkZULCm"
+        Kava -> "kava1drpa0x9ptz0fql3frv562rcrhj2nstuz3pas87"
+        Cardano -> "addr1qyr8jjfnypp95eq74aqzn7ss687ehxclgj7mu6gratmg3mul2040vt35dypp042awzsjk5xm3zr3zm5qh7454uwdv08s84ray2"
+        NEO -> "AT6w7PJvwPcSqHvtbNBY2aHPDv12eW5Uuf"
+        Filecoin -> "f1zzykebxldfcakj5wdb5n3n7priul522fnmjzori"
+        MultiversX -> "erd1jfcy8aeru6vlx4fe6h3pc3vlpe2cnnur5zetxdhp879yagq7vqvs8na4f8"
+        BandChain -> "band1624hqgend0s3d94z68fyka2y5jak6vd7u0l50r"
+        SmartChainLegacy -> "0x49784f90176D8D9d4A3feCDE7C1373dAAb5b13b8"
+        Oasis -> "oasis1qzcpavvmuw280dk0kd4lxjhtpf0u3ll27yf7sqps"
+        THORChain -> "thor1c8jd7ad9pcw4k3wkuqlkz4auv95mldr2kyhc65"
+        IOST -> "4av8w81EyzUgHonsVWqfs15WM4Vrpgox4BYYQWhNQDVu"
+        Syscoin -> "sys1qkl640se3mwpt666e3lyywnwh09e9jquvx9x8qj"
+        Stratis -> "strax1q0caanaw4nkf6fzwnzq2p7yum680e57pdg05zkm"
+        Bluzelle -> "bluzelle1xccvees6ev4wm2r49rc6ptulsdxa8x8jfpmund"
+        CryptoOrg -> "cro16fdf785ejm00jf9a24d23pzqzjh2h05klxjwu8"
+        Osmosis -> "osmo142j9u5eaduzd7faumygud6ruhdwme98qclefqp"
+        ECash -> "ecash:qpelrdn7a0hcucjlf9ascz3lkxv7r3rffgzn6x5377"
+        NativeEvmos -> "evmos13u6g7vqgw074mgmf2ze2cadzvkz9snlwstd20d"
+        Nervos -> "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02wectaumxn0664yw2jd53lqk4mxg3"
+        Everscale -> "0:0c39661089f86ec5926ea7d4ee4223d634ba4ed6dcc2e80c7b6a8e6d59f79b04"
+        TON -> "UQDgEMqToTacHic7SnvnPFmvceG5auFkCcAw0mSCvzvKUaT4"
+        Aptos -> "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30"
+        Nebl -> "NgDVaXAwNgBwb88xLiFKomfBmPkEh9F2d7"
+        Sui -> "0xada112cfb90b44ba889cc5d39ac2bf46281e4a91f7919c693bcd9b8323e81ed2"
+        Hedera -> "0.0.302a300506032b657003210049eba62f64d0d941045595d9433e65d84ecc46bcdb1421de55e05fcf2d8357d5"
+        Secret -> "secret1f69sk5033zcdr2p2yf3xjehn7xvgdeq09d2llh"
+        NativeInjective -> "inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a"
+        Agoric -> "agoric18zvvgk6j3eq5wd7mqxccgt20gz2w94cy88aek5"
+        Stargaze -> "stars142j9u5eaduzd7faumygud6ruhdwme98qycayaz"
+        Juno -> "juno142j9u5eaduzd7faumygud6ruhdwme98qxkfz30"
+        Stride -> "stride142j9u5eaduzd7faumygud6ruhdwme98qn029zl"
+        Axelar -> "axelar142j9u5eaduzd7faumygud6ruhdwme98q52u3aj"
+        Crescent -> "cre142j9u5eaduzd7faumygud6ruhdwme98q5veur7"
+        Kujira -> "kujira142j9u5eaduzd7faumygud6ruhdwme98qpvgpme"
+        NativeCanto -> "canto13u6g7vqgw074mgmf2ze2cadzvkz9snlwqua5pd"
+        Comdex -> "comdex142j9u5eaduzd7faumygud6ruhdwme98qhtgm0y"
+        Neutron -> "neutron142j9u5eaduzd7faumygud6ruhdwme98q5mrmv5"
+        Sommelier -> "somm142j9u5eaduzd7faumygud6ruhdwme98quc948e"
+        FetchAI -> "fetch142j9u5eaduzd7faumygud6ruhdwme98qrera5y"
+        Mars -> "mars142j9u5eaduzd7faumygud6ruhdwme98qdenqrg"
+        Umee -> "umee142j9u5eaduzd7faumygud6ruhdwme98qzjhxjp"
+        Coreum -> "core1rawf376jz2lnchgc4wzf4h9c77neg3zldc7xa8"
+        Quasar -> "quasar142j9u5eaduzd7faumygud6ruhdwme98q78symk"
+        Persistence -> "persistence142j9u5eaduzd7faumygud6ruhdwme98q7gv2ch"
+        Akash -> "akash142j9u5eaduzd7faumygud6ruhdwme98qal870f"
+        Noble -> "noble142j9u5eaduzd7faumygud6ruhdwme98qc8l3wa"
+        Rootstock -> "0xA2D7065F94F838a3aB9C04D67B312056846424Df"
+        Sei -> "sei142j9u5eaduzd7faumygud6ruhdwme98qagm0sj"
+        InternetComputer -> "6f8e568160a3c8362789848dc0fa52891964473c045cc25208a305fb35b7c4ab"
+        Tia -> "celestia142j9u5eaduzd7faumygud6ruhdwme98qpwmfv7"
+        NativeZetaChain -> "zeta13u6g7vqgw074mgmf2ze2cadzvkz9snlwywj304"
+        Dydx -> "dydx142j9u5eaduzd7faumygud6ruhdwme98qeayaky"
+        Pactus -> "pc1r7ys2g5a4xc2qtm0t4q987m4mvs57w5g0v4pvzg"
+    }
+}
diff --git a/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/AnySigner.kt b/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/AnySigner.kt
new file mode 100644
index 00000000000..6de0b110bea
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/AnySigner.kt
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core
+
+actual object AnySigner {
+
+    actual fun sign(input: ByteArray, coin: CoinType): ByteArray =
+        TWAnySignerSign(input.toTwData(), coin.value)!!.readTwBytes()!!
+
+    actual fun supportsJson(coin: CoinType): Boolean =
+        TWAnySignerSupportsJSON(coin.value)
+
+    actual fun signJson(json: String, key: ByteArray, coin: CoinType): String =
+        TWAnySignerSignJSON(json.toTwString(), key.toTwData(), coin.value).fromTwString()!!
+
+    actual fun plan(input: ByteArray, coin: CoinType): ByteArray =
+        TWAnySignerPlan(input.toTwData(), coin.value)?.readTwBytes()!!
+}
diff --git a/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/ByteArrayExt.kt b/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/ByteArrayExt.kt
new file mode 100644
index 00000000000..ec5923272a1
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/ByteArrayExt.kt
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core
+
+import kotlinx.cinterop.COpaquePointer
+import kotlinx.cinterop.readBytes
+import kotlinx.cinterop.toCValues
+
+internal fun COpaquePointer?.readTwBytes(): ByteArray? =
+    TWDataBytes(this)?.readBytes(TWDataSize(this).toInt())
+
+@OptIn(ExperimentalUnsignedTypes::class)
+internal fun ByteArray?.toTwData(): COpaquePointer? =
+    TWDataCreateWithBytes(this?.toUByteArray()?.toCValues(), this?.size?.toULong() ?: 0u)
diff --git a/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/StringExt.kt b/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/StringExt.kt
new file mode 100644
index 00000000000..2eb7fdd311e
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/iosMain/kotlin/com/trustwallet/core/StringExt.kt
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core
+
+import kotlinx.cinterop.COpaquePointer
+import kotlinx.cinterop.CValuesRef
+import kotlinx.cinterop.toKString
+
+internal fun String?.toTwString(): COpaquePointer? =
+    this?.let { TWStringCreateWithUTF8Bytes(it) }
+
+internal fun CValuesRef<*>?.fromTwString(): String? =
+    this?.let { TWStringUTF8Bytes(it)?.toKString() }
diff --git a/kotlin/wallet-core-kotlin/src/iosTest/kotlin/com/trustwallet/core/LibLoader.kt b/kotlin/wallet-core-kotlin/src/iosTest/kotlin/com/trustwallet/core/LibLoader.kt
new file mode 100644
index 00000000000..1d4f9311712
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/iosTest/kotlin/com/trustwallet/core/LibLoader.kt
@@ -0,0 +1,7 @@
+package com.trustwallet.core
+
+actual object LibLoader {
+    actual fun loadLibrary() {
+        throw NotImplementedError()
+    }
+}
diff --git a/kotlin/wallet-core-kotlin/src/jsMain/kotlin/WalletCore.kt b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/WalletCore.kt
new file mode 100644
index 00000000000..a454889ea72
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/WalletCore.kt
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import com.trustwallet.core.*
+import kotlin.js.Promise
+
+@JsExport
+@JsName("WalletCoreKotlin")
+object WalletCore {
+
+    lateinit var Instance: JsWalletCore
+        private set
+
+    fun init(): Promise<JsWalletCore> =
+        if (::Instance.isInitialized) {
+            Promise.resolve(Instance)
+        } else {
+            WalletCoreExports.initWasm()
+                .then { walletCore ->
+                    Instance = walletCore
+                    walletCore
+                }
+        }
+}
+
+@JsModule("@trustwallet/wallet-core")
+@JsNonModule
+private external object WalletCoreExports {
+    fun initWasm(): Promise<JsWalletCore>
+}
diff --git a/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/AnySigner.kt b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/AnySigner.kt
new file mode 100644
index 00000000000..d62bf4f81c3
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/AnySigner.kt
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core
+
+import WalletCore
+
+actual object AnySigner {
+
+    actual fun sign(input: ByteArray, coin: CoinType): ByteArray =
+        WalletCore.Instance.AnySigner.sign(input.asUInt8Array(), coin.jsValue).asByteArray()
+
+    actual fun supportsJson(coin: CoinType): Boolean =
+        WalletCore.Instance.AnySigner.supportsJSON(coin.jsValue)
+
+    actual fun signJson(json: String, key: ByteArray, coin: CoinType): String =
+        TODO()
+
+    actual fun plan(input: ByteArray, coin: CoinType): ByteArray =
+        WalletCore.Instance.AnySigner.plan(input.asUInt8Array(), coin.jsValue).asByteArray()
+}
diff --git a/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/ByteArray.kt b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/ByteArray.kt
new file mode 100644
index 00000000000..9163d5bdca2
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/ByteArray.kt
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core
+
+import org.khronos.webgl.Int8Array
+import org.khronos.webgl.Uint8Array
+
+internal typealias UInt8Array = Uint8Array
+
+fun Int8Array.asByteArray(): ByteArray =
+    unsafeCast<ByteArray>()
+
+fun Uint8Array.asByteArray(): ByteArray =
+    Int8Array(buffer, byteOffset, length).asByteArray()
+
+fun ByteArray.asInt8Array(): Int8Array =
+    unsafeCast<Int8Array>()
+
+fun ByteArray.asUInt8Array(): Uint8Array =
+    asInt8Array().let { Uint8Array(it.buffer, it.byteOffset, it.length) }
diff --git a/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/JsAnySigner.kt b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/JsAnySigner.kt
new file mode 100644
index 00000000000..75be5fbd8d7
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/JsAnySigner.kt
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+package com.trustwallet.core
+
+@JsModule("@trustwallet/wallet-core")
+@JsName("AnySigner")
+external class JsAnySigner {
+    companion object {
+        fun sign(data: UInt8Array, coin: JsCoinType): UInt8Array
+        fun plan(data: UInt8Array, coin: JsCoinType): UInt8Array
+        fun supportsJSON(coin: JsCoinType): Boolean
+    }
+}
+
+inline val JsWalletCore.AnySigner: JsAnySigner.Companion
+    get() = asDynamic().AnySigner.unsafeCast<JsAnySigner.Companion>()
diff --git a/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/JsWalletCore.kt b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/JsWalletCore.kt
new file mode 100644
index 00000000000..0865e64e531
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jsMain/kotlin/com/trustwallet/core/JsWalletCore.kt
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+@file:Suppress("PropertyName")
+
+package com.trustwallet.core
+
+@JsModule("@trustwallet/wallet-core")
+@JsName("WalletCore")
+external interface JsWalletCore
diff --git a/kotlin/wallet-core-kotlin/src/jsTest/kotlin/com/trustwallet/core/LibLoader.kt b/kotlin/wallet-core-kotlin/src/jsTest/kotlin/com/trustwallet/core/LibLoader.kt
new file mode 100644
index 00000000000..1d4f9311712
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jsTest/kotlin/com/trustwallet/core/LibLoader.kt
@@ -0,0 +1,7 @@
+package com.trustwallet.core
+
+actual object LibLoader {
+    actual fun loadLibrary() {
+        throw NotImplementedError()
+    }
+}
diff --git a/kotlin/wallet-core-kotlin/src/jvmMain/kotlin/com/trustwallet/core/WalletCoreLibLoader.kt b/kotlin/wallet-core-kotlin/src/jvmMain/kotlin/com/trustwallet/core/WalletCoreLibLoader.kt
new file mode 100644
index 00000000000..23c20a24897
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jvmMain/kotlin/com/trustwallet/core/WalletCoreLibLoader.kt
@@ -0,0 +1,60 @@
+package com.trustwallet.core
+
+import com.trustwallet.core.WalletCoreLibLoader.Linux64Path
+import com.trustwallet.core.WalletCoreLibLoader.MacArm64Path
+import java.io.File
+import java.util.concurrent.atomic.AtomicBoolean
+
+/**
+ * Simple helper class that extracts proper native library for current OS/arch from .jar to temporary file and loads it.
+ * You can do the same by yourself, just use path constants: [MacArm64Path], [Linux64Path]
+ */
+object WalletCoreLibLoader {
+
+    const val MacArm64Path = "/jni/macos-arm64/libTrustWalletCore.dylib"
+    const val Linux64Path = "/jni/linux-x86_64/libTrustWalletCore.so"
+
+    private val isLoaded = AtomicBoolean(false)
+
+    @JvmStatic
+    fun loadLibrary() {
+        if (isLoaded.compareAndSet(false, true)) {
+            val resLibPath = getLibResourcePath()
+            val resLibStream = WalletCoreLibLoader::class.java.getResourceAsStream(resLibPath)
+                ?: error("File not found: $resLibPath")
+
+            val fileOut = File.createTempFile("libTrustWalletCore", null)
+            fileOut.deleteOnExit()
+
+            resLibStream.copyTo(fileOut.outputStream())
+
+            @Suppress("UnsafeDynamicallyLoadedCode")
+            System.load(fileOut.absolutePath)
+        }
+    }
+
+    private fun getLibResourcePath(): String {
+        val osNameOriginal = System.getProperty("os.name").lowercase()
+        val osName = osNameOriginal.lowercase()
+        val archOriginal = System.getProperty("os.arch").lowercase()
+        val arch = archOriginal.lowercase()
+
+        return when {
+            osName.startsWith("mac") -> {
+                when (arch) {
+                    "aarch64" -> MacArm64Path
+                    else -> error("Arch is not supported: $archOriginal")
+                }
+            }
+
+            osName.startsWith("linux") -> {
+                when (arch) {
+                    "amd64", "x86_64" -> Linux64Path
+                    else -> error("Arch is not supported: $archOriginal")
+                }
+            }
+
+            else -> error("OS is not supported: $osNameOriginal")
+        }
+    }
+}
diff --git a/kotlin/wallet-core-kotlin/src/jvmMain/resources/jni/linux-x86_64/.gitignore b/kotlin/wallet-core-kotlin/src/jvmMain/resources/jni/linux-x86_64/.gitignore
new file mode 100644
index 00000000000..6519c51f274
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jvmMain/resources/jni/linux-x86_64/.gitignore
@@ -0,0 +1 @@
+libTrustWalletCore.so
diff --git a/kotlin/wallet-core-kotlin/src/jvmMain/resources/jni/macos-arm64/.gitignore b/kotlin/wallet-core-kotlin/src/jvmMain/resources/jni/macos-arm64/.gitignore
new file mode 100644
index 00000000000..9162c6ec1f1
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jvmMain/resources/jni/macos-arm64/.gitignore
@@ -0,0 +1 @@
+libTrustWalletCore.dylib
diff --git a/kotlin/wallet-core-kotlin/src/jvmTest/kotlin/com/trustwallet/core/LibLoader.kt b/kotlin/wallet-core-kotlin/src/jvmTest/kotlin/com/trustwallet/core/LibLoader.kt
new file mode 100644
index 00000000000..0c153abd9e7
--- /dev/null
+++ b/kotlin/wallet-core-kotlin/src/jvmTest/kotlin/com/trustwallet/core/LibLoader.kt
@@ -0,0 +1,7 @@
+package com.trustwallet.core
+
+actual object LibLoader {
+    actual fun loadLibrary() {
+        WalletCoreLibLoader.loadLibrary()
+    }
+}
diff --git a/kotlin/wallet-core-kotlin/src/nativeInterop/cinterop/WalletCore.def b/kotlin/wallet-core-kotlin/src/nativeInterop/cinterop/WalletCore.def
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/protobuf-plugin/CMakeLists.txt b/protobuf-plugin/CMakeLists.txt
index 57b7ac59d83..237789be7be 100644
--- a/protobuf-plugin/CMakeLists.txt
+++ b/protobuf-plugin/CMakeLists.txt
@@ -1,33 +1,26 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
-cmake_minimum_required(VERSION 3.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.5 FATAL_ERROR)
 project(TrustWalletCoreProtobufPlugin)
 
 set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum OS X deployment version" FORCE)
 set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-if ("$ENV{PREFIX}" STREQUAL "")
+if("$ENV{PREFIX}" STREQUAL "")
     set(PREFIX "${CMAKE_SOURCE_DIR}/../build/local")
 else()
     set(PREFIX "$ENV{PREFIX}")
 endif()
 
-include_directories(${PREFIX}/include)
-link_directories(${PREFIX}/lib)
+find_package(Protobuf CONFIG REQUIRED PATH ${PREFIX}/lib/pkgconfig)
 
-find_package(Protobuf REQUIRED PATH ${PREFIX}/lib/pkgconfig)
-include_directories(${Protobuf_INCLUDE_DIRS})
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
+add_executable(protoc-gen-c-typedef c_typedef.cc)
+target_link_libraries(protoc-gen-c-typedef protobuf::libprotobuf protobuf::libprotoc)
 
-add_executable(protoc-gen-c-typedef c_typedef.cc ${PROTO_SRCS} ${PROTO_HDRS})
-target_link_libraries(protoc-gen-c-typedef protobuf -lprotoc -pthread)
-
-add_executable(protoc-gen-swift-typealias swift_typealias.cc ${PROTO_SRCS} ${PROTO_HDRS})
-target_link_libraries(protoc-gen-swift-typealias protobuf -lprotoc -pthread)
+add_executable(protoc-gen-swift-typealias swift_typealias.cc)
+target_link_libraries(protoc-gen-swift-typealias protobuf::libprotobuf protobuf::libprotoc)
 
 install(TARGETS protoc-gen-c-typedef protoc-gen-swift-typealias DESTINATION bin)
diff --git a/protobuf-plugin/c_typedef.cc b/protobuf-plugin/c_typedef.cc
index 9cd48a5e798..1352898cb73 100644
--- a/protobuf-plugin/c_typedef.cc
+++ b/protobuf-plugin/c_typedef.cc
@@ -14,16 +14,14 @@ class Generator : public  compiler::CodeGenerator {
         return "TW" + proto_file.substr(0, index) + "Proto.h";
     }
 
-    bool Generate(const FileDescriptor* file, const std::string& parameter, compiler::GeneratorContext* generator_context, string* error) const {
+    bool Generate(const FileDescriptor* file, const std::string& parameter, compiler::GeneratorContext* generator_context, std::string* error) const {
         std::unique_ptr<io::ZeroCopyOutputStream> output(generator_context->Open(GetOutputFilename(file->name())));
         io::Printer printer(output.get(), '$');
 
         printer.Print(
-            "// Copyright © 2017-2020 Trust Wallet.\n"
+            "// SPDX-License-Identifier: Apache-2.0\n"
             "//\n"
-            "// This file is part of Trust. The full Trust copyright notice, including\n"
-            "// terms governing use, modification, and redistribution, is contained in the\n"
-            "// file LICENSE at the root of the source code distribution tree.\n"
+            "// Copyright © 2017 Trust Wallet.\n"
             "//\n"
             "// This is a GENERATED FILE, changes made here WILL BE LOST.\n"
             "\n"
diff --git a/protobuf-plugin/swift_typealias.cc b/protobuf-plugin/swift_typealias.cc
index 57a169dea03..3d0983c2ca3 100644
--- a/protobuf-plugin/swift_typealias.cc
+++ b/protobuf-plugin/swift_typealias.cc
@@ -16,16 +16,14 @@ class Generator : public  compiler::CodeGenerator {
         return proto_file.substr(0, index) + "+Proto.swift";
     }
 
-    bool Generate(const FileDescriptor* file, const std::string& parameter, compiler::GeneratorContext* generator_context, string* error) const {
+    bool Generate(const FileDescriptor* file, const std::string& parameter, compiler::GeneratorContext* generator_context, std::string* error) const {
         std::unique_ptr<io::ZeroCopyOutputStream> output(generator_context->Open(GetOutputFilename(file->name())));
         io::Printer printer(output.get(), '$');
 
         printer.Print(
-            "// Copyright © 2017-2020 Trust Wallet.\n"
+            "// SPDX-License-Identifier: Apache-2.0\n"
             "//\n"
-            "// This file is part of Trust. The full Trust copyright notice, including\n"
-            "// terms governing use, modification, and redistribution, is contained in the\n"
-            "// file LICENSE at the root of the source code distribution tree.\n"
+            "// Copyright © 2017 Trust Wallet.\n"
             "\n"
         );
 
diff --git a/registry.json b/registry.json
index 537498c91ac..d88798aff9c 100644
--- a/registry.json
+++ b/registry.json
@@ -18,6 +18,18 @@
         "path": "m/44'/0'/0'/0/0",
         "xpub": "xpub",
         "xprv": "xprv"
+      },
+      {
+        "name": "testnet",
+        "path": "m/84'/1'/0'/0/0",
+        "xpub": "zpub",
+        "xprv": "zprv"
+      },
+      {
+        "name": "taproot",
+        "path": "m/86'/0'/0'/0/0",
+        "xpub": "zpub",
+        "xprv": "zprv"
       }
     ],
     "curve": "secp256k1",
@@ -28,9 +40,9 @@
     "publicKeyHasher": "sha256ripemd",
     "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://blockchair.com",
-      "txPath": "/bitcoin/transaction/",
-      "accountPath": "/bitcoin/address/",
+      "url": "https://mempool.space",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
       "sampleTx": "0607f62530b68cfcc91c57a1702841dd399a899d0eecda8e31ecca3f52f01df2",
       "sampleAccount": "17A16QmavnUfCW11DAApiJxp7ARnxN5pGX"
     },
@@ -309,6 +321,161 @@
       "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
+  {
+    "id": "syscoin",
+    "name": "Syscoin",
+    "coinId": 57,
+    "symbol": "SYS",
+    "decimals": 8,
+    "blockchain": "Bitcoin",
+    "derivation": [
+      {
+        "path": "m/84'/57'/0'/0/0",
+        "xpub": "zpub",
+        "xprv": "zprv"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "p2pkhPrefix": 63,
+    "p2shPrefix": 5,
+    "hrp": "sys",
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
+    "explorer": {
+      "url": "https://sys1.bcfn.ca",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "19e043f76f6ffc960f5fe93ecec37bc37a58ae7525d7e9cd6ed40f71f0da60eb",
+      "sampleAccount": "sys1qh3gvhnzq2ch7w8g04x8zksr2mz7r90x7ksmu40"
+    },
+    "info": {
+      "url": "https://syscoin.org",
+      "source": "https://github.com/syscoin",
+      "rpc": "https://sys1.bcfn.ca",
+      "documentation": "https://docs.syscoin.org"
+    }
+  },
+  {
+    "id": "base",
+    "name": "Base",
+    "coinId": 8453,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "8453",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://basescan.org",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x4acb15506b7696a2dfac4258f3f86392b4b2b717a3f316a8aa78509b2c3b6ab4",
+      "sampleAccount": "0xb8ff877ed78ba520ece21b1de7843a8a57ca47cb"
+    },
+    "info": {
+      "url": "https://base.mirror.xyz/",
+      "source": "https://github.com/base-org",
+      "rpc": "https://mainnet.base.org",
+      "documentation": "https://docs.base.org/"
+    }
+  },
+  {
+    "id": "linea",
+    "name": "Linea",
+    "coinId": 59144,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "59144",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://lineascan.build",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x0c7086f96865f4fcad58d7f3449db7baab9fce2625bcb79e7ea26676aa0d3420",
+      "sampleAccount": "0xbf71018f716ca6c64b0b12622f87a26b3b86100f"
+    },
+    "info": {
+      "url": "https://linea.build",
+      "source": "https://github.com/LineaLabs",
+      "rpc": "https://rpc.linea.build",
+      "documentation": "https://docs.linea.build"
+    }
+  },
+  {
+    "id": "mantle",
+    "name": "Mantle",
+    "coinId": 5000,
+    "symbol": "MNT",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "5000",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://explorer.mantle.xyz",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xfae996ea23f1ff9909ac04d26ae6e52ab600a84163fab9e0e893483c685629dd",
+      "sampleAccount": "0xA295EEFd401C8BE1457F266d3e73cdD015e5CFbb"
+    },
+    "info": {
+      "url": "https://www.mantle.xyz",
+      "source": "https://github.com/mantlenetworkio",
+      "rpc": "https://rpc.mantle.xyz",
+      "documentation": "https://docs.mantle.xyz/network/introduction/overview"
+    }
+  },
+  {
+    "id": "zeneon",
+    "name": "Zen EON",
+    "coinId": 7332,
+    "symbol": "ZEN",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "7332",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://eon-explorer.horizenlabs.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xb462e3dac8eef21957d3b6cff3c184d083434367a726dd871e98a774f4d037a5",
+      "sampleAccount": "0x09bCfC348101B1179BCF3837aC996cF09357215f"
+    },
+    "info": {
+      "url": "https://eon.horizen.io",
+      "source": "https://github.com/HorizenOfficial/eon",
+      "rpc": "https://eon-rpc.horizenlabs.io/ethv1",
+      "documentation": "https://eon.horizen.io/docs"
+    }
+  },
   {
     "id": "ethereum",
     "name": "Ethereum",
@@ -358,7 +525,9 @@
     "explorer": {
       "url": "https://blockscout.com/etc/mainnet",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/address/",
+      "sampleTx": "0x66004165d3901819dc22e568931591d2e4287bda54995f4ce2701a12016f5997",
+      "sampleAccount": "0x9eab4b0fc468a7f5d46228bf5a76cb52370d068d"
     },
     "info": {
       "url": "https://ethereumclassic.org",
@@ -394,1529 +563,3427 @@
     }
   },
   {
-    "id": "cosmos",
-    "name": "Cosmos",
-    "displayName": "Cosmos Hub",
-    "coinId": 118,
-    "symbol": "ATOM",
+    "id": "verge",
+    "name": "Verge",
+    "coinId": 77,
+    "symbol": "XVG",
     "decimals": 6,
-    "chainId": "cosmoshub-4",
-    "blockchain": "Cosmos",
+    "blockchain": "Verge",
     "derivation": [
       {
-        "path": "m/44'/118'/0'/0/0"
+        "path": "m/84'/77'/0'/0/0",
+        "xpub": "zpub",
+        "xprv": "zprv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "cosmos",
-    "addressHasher": "sha256ripemd",
+    "p2pkhPrefix": 30,
+    "p2shPrefix": 33,
+    "hrp": "vg",
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://mintscan.io/cosmos",
-      "txPath": "/txs/",
-      "accountPath": "/account/"
+      "url": "https://verge-blockchain.info",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "8c99979a2b25a46659bff35b238aab1c3158f736f215d99526429c7c96203581",
+      "sampleAccount": "DFre88gd87bAZQdnS7dbBLwT6GWiGFMQB6"
     },
     "info": {
-      "url": "https://cosmos.network",
-      "source": "https://github.com/cosmos/cosmos-sdk",
-      "rpc": "https://stargate.cosmos.network",
-      "documentation": "https://cosmos.network/rpc"
+      "url": "https://vergecurrency.com",
+      "source": "https://github.com/vergecurrency/verge",
+      "rpc": "",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "zcash",
-    "name": "Zcash",
-    "coinId": 133,
-    "symbol": "ZEC",
+    "id": "pivx",
+    "name": "Pivx",
+    "coinId": 119,
+    "symbol": "PIVX",
     "decimals": 8,
-    "blockchain": "Zcash",
+    "blockchain": "Bitcoin",
     "derivation": [
       {
-        "path": "m/44'/133'/0'/0/0",
+        "path": "m/44'/119'/0'/0/0",
         "xpub": "xpub",
         "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "staticPrefix": 28,
-    "p2pkhPrefix": 184,
-    "p2shPrefix": 189,
+    "p2pkhPrefix": 30,
+    "p2shPrefix": 13,
     "publicKeyHasher": "sha256ripemd",
     "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://blockchair.com/zcash",
+      "url": "https://pivx.ccore.online",
       "txPath": "/transaction/",
       "accountPath": "/address/"
     },
     "info": {
-      "url": "https://z.cash",
+      "url": "https://pivx.org",
       "source": "https://github.com/trezor/blockbook",
       "rpc": "",
       "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "firo",
-    "name": "Firo",
-    "coinId": 136,
-    "symbol": "FIRO",
+    "id": "zen",
+    "name": "Zen",
+    "coinId": 121,
+    "symbol": "ZEN",
     "decimals": 8,
-    "blockchain": "Bitcoin",
+    "blockchain": "Zen",
     "derivation": [
       {
-        "path": "m/44'/136'/0'/0/0",
+        "path": "m/44'/121'/0'/0/0",
         "xpub": "xpub",
         "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "p2pkhPrefix": 82,
-    "p2shPrefix": 7,
+    "staticPrefix": 32,
+    "p2pkhPrefix": 137,
+    "p2shPrefix": 150,
     "publicKeyHasher": "sha256ripemd",
     "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://explorer.firo.org",
+      "url": "https://explorer.horizen.io",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/address/",
+      "sampleTx": "b7f548640766fb024247accf4e01bec37d88d49c4900357edc84d49a09ff4430",
+      "sampleAccount": "znRchPtvEyJJUwGbCALqyjwHJb1Gx6z4H4j"
     },
     "info": {
-      "url": "https://firo.org/",
-      "source": "https://github.com/firoorg/firo",
+      "url": "https://www.horizen.io",
+      "source": "https://github.com/trezor/blockbook",
       "rpc": "",
       "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "ripple",
-    "name": "XRP",
-    "coinId": 144,
-    "symbol": "XRP",
-    "decimals": 6,
-    "blockchain": "Ripple",
+    "id": "aptos",
+    "name": "Aptos",
+    "displayName": "Aptos",
+    "coinId": 637,
+    "symbol": "APT",
+    "decimals": 8,
+    "chainId": "1",
+    "blockchain": "Aptos",
     "derivation": [
       {
-        "path": "m/44'/144'/0'/0/0"
+        "path": "m/44'/637'/0'/0'/0'"
       }
     ],
-    "curve": "secp256k1",
-    "publicKeyType": "secp256k1",
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
     "explorer": {
-      "url": "https://bithomp.com",
-      "txPath": "/explorer/",
-      "accountPath": "/explorer/",
-      "sampleTx": "E26AB8F3372D2FC02DEC1FD5674ADAB762D684BFFDBBDF5D674E9D7CF4A47054",
-      "sampleAccount": "rfkH7EuS1XcSkB9pocy1R6T8F4CsNYixYU"
+      "url": "https://explorer.aptoslabs.com",
+      "txPath": "/txn/",
+      "accountPath": "/account/",
+      "sampleTx": "0xedc88058e27f6c065fd6607e262cb2a83a65f74301df90c61923014c59f9d465",
+      "sampleAccount": "0x60ad80e8cdadb81399e8a738014bc9ec865cef842f7c2cf7d84fbf7e40d065"
     },
     "info": {
-      "url": "https://ripple.com/xrp",
-      "source": "https://github.com/ripple/rippled",
-      "rpc": "https://s2.ripple.com:51234",
-      "documentation": "https://xrpl.org/rippled-api.html"
+      "url": "https://aptoslabs.com/",
+      "source": "https://github.com/aptos-labs/aptos-core",
+      "rpc": "https://fullnode.mainnet.aptoslabs.com/v1",
+      "documentation": "https://fullnode.mainnet.aptoslabs.com/v1/spec#/"
     }
   },
   {
-    "id": "bitcoincash",
-    "name": "Bitcoin Cash",
-    "coinId": 145,
-    "symbol": "BCH",
-    "decimals": 8,
-    "blockchain": "Bitcoin",
+    "id": "sui",
+    "name": "Sui",
+    "coinId": 784,
+    "symbol": "SUI",
+    "decimals": 9,
+    "blockchain": "Sui",
     "derivation": [
       {
-        "path": "m/44'/145'/0'/0/0",
-        "xpub": "xpub",
-        "xprv": "xprv"
+        "path": "m/44'/784'/0'/0'/0'"
       }
     ],
-    "curve": "secp256k1",
-    "publicKeyType": "secp256k1",
-    "p2pkhPrefix": 0,
-    "p2shPrefix": 5,
-    "hrp": "bitcoincash",
-    "publicKeyHasher": "sha256ripemd",
-    "base58Hasher": "sha256d",
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
     "explorer": {
-      "url": "https://blockchair.com",
-      "txPath": "/bitcoin-cash/transaction/",
-      "accountPath": "/bitcoin-cash/address/"
+      "url": "https://explorer.sui.io/",
+      "txPath": "/txblock/",
+      "accountPath": "/address/",
+      "sampleTx": "5i8fbSL6r8yw2xcKmXxwkzHu3wpiyMLsyf2htCvDH8Ao",
+      "sampleAccount": "0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015"
     },
     "info": {
-      "url": "https://bitcoincash.org",
-      "source": "https://github.com/trezor/blockbook",
-      "rpc": "",
-      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
+      "url": "https://sui.io/",
+      "source": "https://github.com/MystenLabs/sui",
+      "rpc": "https://fullnode.testnet.sui.io",
+      "documentation": "https://docs.sui.io/"
     }
   },
   {
-    "id": "stellar",
-    "name": "Stellar",
-    "coinId": 148,
-    "symbol": "XLM",
-    "decimals": 7,
-    "blockchain": "Stellar",
+    "id": "cosmos",
+    "name": "Cosmos",
+    "displayName": "Cosmos Hub",
+    "coinId": 118,
+    "symbol": "ATOM",
+    "decimals": 6,
+    "chainId": "cosmoshub-4",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/148'/0'"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "cosmos",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://blockchair.com/stellar",
-      "txPath": "/transaction/",
-      "accountPath": "/account/"
+      "url": "https://mintscan.io/cosmos",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "541FA06FB37AC1BF61922143783DD76FECA361830F9876D0342536EE8A87A790",
+      "sampleAccount": "cosmos1gu6y2a0ffteesyeyeesk23082c6998xyzmt9mz"
     },
     "info": {
-      "url": "https://stellar.org",
-      "source": "https://github.com/stellar/go",
-      "rpc": "https://horizon.stellar.org",
-      "documentation": "https://www.stellar.org/developers/horizon/reference"
+      "url": "https://cosmos.network",
+      "source": "https://github.com/cosmos/cosmos-sdk",
+      "rpc": "https://stargate.cosmos.network",
+      "documentation": "https://cosmos.network/rpc"
     }
   },
   {
-    "id": "bitcoingold",
-    "name": "Bitcoin Gold",
-    "coinId": 156,
-    "symbol": "BTG",
-    "decimals": 8,
-    "blockchain": "Bitcoin",
-    "derivation": [
+    "id": "stargaze",
+    "name": "Stargaze",
+    "displayName": "Stargaze",
+    "coinId": 20000118,
+    "symbol": "STARS",
+    "decimals": 6,
+    "chainId": "stargaze-1",
+    "blockchain": "Cosmos",
+    "derivation": [
       {
-        "path": "m/84'/156'/0'/0/0",
-        "xpub": "zpub",
-        "xprv": "zprv"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "p2pkhPrefix": 38,
-    "p2shPrefix": 23,
-    "hrp": "btg",
-    "publicKeyHasher": "sha256ripemd",
-    "base58Hasher": "sha256d",
+    "hrp": "stars",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://explorer.bitcoingold.org/insight",
-      "txPath": "/tx/",
-      "accountPath": "/address/"
+      "url": "https://www.mintscan.io/stargaze",
+      "txPath": "/txs/",
+      "accountPath": "/account/"
     },
     "info": {
-      "url": "https://bitcoingold.org",
-      "source": "https://github.com/trezor/blockbook",
-      "rpc": "",
-      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
+      "url": "https://www.stargaze.zone/",
+      "source": "https://github.com/public-awesome/stargaze",
+      "rpc": "https://stargaze-rpc.polkachu.com/",
+      "documentation": "https://docs.stargaze.zone/guides/readme"
     }
   },
   {
-    "id": "nano",
-    "name": "Nano",
-    "coinId": 165,
-    "symbol": "XNO",
-    "decimals": 30,
-    "blockchain": "Nano",
+    "id": "juno",
+    "name": "Juno",
+    "displayName": "Juno",
+    "coinId": 30000118,
+    "symbol": "JUNO",
+    "decimals": 6,
+    "chainId": "juno-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/165'/0'"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
-    "curve": "ed25519Blake2bNano",
-    "publicKeyType": "ed25519Blake2b",
-    "url": "https://nano.org",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "juno",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://nanocrawler.cc",
-      "txPath": "/explorer/block/",
-      "accountPath": "/explorer/account/",
-      "sampleTx": "C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F",
-      "sampleAccount": "nano_1wpj616kwhe1y38y1mspd8aub8i334cwybqco511iyuxm55zx8d67ptf1tsf"
+      "url": "https://www.mintscan.io/juno",
+      "txPath": "/txs/",
+      "accountPath": "/account/"
     },
     "info": {
-      "url": "https://nano.org",
-      "source": "https://github.com/nanocurrency/nano-node",
-      "rpc": "",
-      "documentation": "https://docs.nano.org/commands/rpc-protocol/"
+      "url": "https://www.junonetwork.io/",
+      "source": "https://github.com/CosmosContracts/juno",
+      "rpc": "https://juno-rpc.polkachu.com",
+      "documentation": "https://docs.junonetwork.io/juno/readme"
     }
   },
   {
-    "id": "ravencoin",
-    "name": "Ravencoin",
-    "coinId": 175,
-    "symbol": "RVN",
-    "decimals": 8,
-    "blockchain": "Bitcoin",
+    "id": "stride",
+    "name": "Stride",
+    "displayName": "Stride",
+    "coinId": 40000118,
+    "symbol": "STRD",
+    "decimals": 6,
+    "chainId": "stride-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/175'/0'/0/0",
-        "xpub": "xpub",
-        "xprv": "xprv"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "p2pkhPrefix": 60,
-    "p2shPrefix": 122,
-    "publicKeyHasher": "sha256ripemd",
-    "base58Hasher": "sha256d",
+    "hrp": "stride",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://ravencoin.network",
-      "txPath": "/tx/",
-      "accountPath": "/address/"
+      "url": "https://www.mintscan.io/stride",
+      "txPath": "/txs/",
+      "accountPath": "/account/"
     },
     "info": {
-      "url": "https://ravencoin.org",
-      "source": "https://github.com/trezor/blockbook",
-      "rpc": "",
-      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
+      "url": "https://stride.zone/",
+      "source": "https://github.com/Stride-Labs/stride",
+      "rpc": "https://stride-rpc.polkachu.com/",
+      "documentation": "https://docs.stride.zone/docs"
     }
   },
   {
-    "id": "poa",
-    "name": "POA Network",
-    "coinId": 178,
-    "symbol": "POA",
-    "decimals": 18,
-    "blockchain": "Ethereum",
+    "id": "axelar",
+    "name": "Axelar",
+    "displayName": "Axelar",
+    "coinId": 50000118,
+    "symbol": "AXL",
+    "decimals": 6,
+    "chainId": "axelar-dojo-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/178'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "chainId": "99",
-    "addressHasher": "keccak256",
+    "publicKeyType": "secp256k1",
+    "hrp": "axelar",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://blockscout.com",
-      "txPath": "/poa/core/tx/",
-      "accountPath": "/poa/core/address/"
+      "url": "https://www.mintscan.io/axelar",
+      "txPath": "/txs/",
+      "accountPath": "/account/"
     },
     "info": {
-      "url": "https://poa.network",
-      "source": "https://github.com/poanetwork/parity-ethereum",
-      "rpc": "https://core.poa.network",
-      "documentation": "https://eth.wiki/json-rpc/API"
+      "url": "https://axelar.network/",
+      "source": "https://github.com/axelarnetwork/axelar-core",
+      "rpc": "https://axelar-rpc.polkachu.com",
+      "documentation": "https://docs.axelar.dev/"
     }
   },
   {
-    "id": "eos",
-    "name": "EOS",
-    "coinId": 194,
-    "symbol": "EOS",
-    "decimals": 4,
-    "blockchain": "EOS",
+    "id": "crescent",
+    "name": "Crescent",
+    "displayName": "Crescent",
+    "coinId": 60000118,
+    "symbol": "CRE",
+    "decimals": 6,
+    "chainId": "crescent-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/194'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
+    "hrp": "cre",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://bloks.io",
-      "txPath": "/transaction/",
+      "url": "https://www.mintscan.io/crescent",
+      "txPath": "/txs/",
       "accountPath": "/account/"
     },
     "info": {
-      "url": "http://eos.io",
-      "source": "https://github.com/eosio/eos",
-      "rpc": "",
-      "documentation": "https://developers.eos.io/eosio-nodeos/reference"
+      "url": "https://crescent.network/",
+      "source": "https://github.com/crescent-network/crescent",
+      "rpc": "https://crescent-rpc.polkachu.com",
+      "documentation": "https://docs.crescent.network/introduction/what-is-crescent"
     }
   },
   {
-    "id": "tron",
-    "name": "Tron",
-    "coinId": 195,
-    "symbol": "TRX",
+    "id": "kujira",
+    "name": "Kujira",
+    "displayName": "Kujira",
+    "coinId": 70000118,
+    "symbol": "KUJI",
     "decimals": 6,
-    "blockchain": "Tron",
+    "chainId": "kaiyo-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/195'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
+    "publicKeyType": "secp256k1",
+    "hrp": "kujira",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://tronscan.org",
-      "txPath": "/#/transaction/",
-      "accountPath": "/#/address/"
+      "url": "https://www.mintscan.io/kujira",
+      "txPath": "/txs/",
+      "accountPath": "/account/"
     },
     "info": {
-      "url": "https://tron.network",
-      "source": "https://github.com/tronprotocol/java-tron",
-      "rpc": "https://api.trongrid.io",
-      "documentation": "https://developers.tron.network/docs/tron-wallet-rpc-api"
+      "url": "https://kujira.app/",
+      "source": "https://github.com/Team-Kujira/core",
+      "rpc": "https://kujira-rpc.polkachu.com",
+      "documentation": "https://docs.kujira.app/introduction/readme"
     }
   },
   {
-    "id": "fio",
-    "name": "FIO",
-    "coinId": 235,
-    "symbol": "FIO",
-    "decimals": 9,
-    "blockchain": "FIO",
+    "id": "comdex",
+    "name": "Comdex",
+    "displayName": "Comdex",
+    "coinId": 80000118,
+    "symbol": "CMDX",
+    "decimals": 6,
+    "chainId": "comdex-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/235'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "url": "https://fioprotocol.io/",
+    "hrp": "comdex",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://explorer.fioprotocol.io",
-      "txPath": "/transaction/",
-      "accountPath": "/account/"
+      "url": "https://www.mintscan.io/comdex",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "04C790D09A40EE958DBDD385B679B5EB60C10F9BC1389CC8F896DC9193A5ED6C",
+      "sampleAccount": "comdex1jz7av7cq45gh5hhrugtak7lkps2ga5v0u64nz6"
     },
     "info": {
-      "url": "https://fioprotocol.io",
-      "source": "https://github.com/fioprotocol/fio",
-      "rpc": "https://mainnet.fioprotocol.io",
-      "documentation": "https://developers.fioprotocol.io"
+      "url": "https://comdex.one/",
+      "documentation": "https://docs.comdex.one/"
     }
   },
   {
-    "id": "nimiq",
-    "name": "Nimiq",
-    "coinId": 242,
-    "symbol": "NIM",
-    "decimals": 5,
-    "blockchain": "Nimiq",
+    "id": "neutron",
+    "name": "Neutron",
+    "displayName": "Neutron",
+    "coinId": 90000118,
+    "symbol": "NTRN",
+    "decimals": 6,
+    "chainId": "neutron-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/242'/0'/0'"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "neutron",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://nimiq.watch",
-      "txPath": "/#",
-      "accountPath": "/#"
+      "url": "https://www.mintscan.io/neutron",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "E18BA087009A05EB6A15A22FE30BA99379B909F74A74120E6F92B9882C45F0D7",
+      "sampleAccount": "neutron1pm4af8pcurxssdxztqw9rexx5f8zfq7uzqfmy8"
     },
     "info": {
-      "url": "https://nimiq.com",
-      "source": "https://github.com/nimiq/core-rs",
-      "rpc": "",
-      "documentation": "https://github.com/nimiq/core-js/wiki/JSON-RPC-API"
+      "url": "https://neutron.org/",
+      "documentation": "https://docs.neutron.org/"
     }
   },
   {
-    "id": "algorand",
-    "name": "Algorand",
-    "coinId": 283,
-    "symbol": "ALGO",
+    "id": "sommelier",
+    "name": "Sommelier",
+    "displayName": "Sommelier",
+    "coinId": 11000118,
+    "symbol": "SOMM",
     "decimals": 6,
-    "blockchain": "Algorand",
+    "chainId": "sommelier-3",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/283'/0'/0'/0'"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "somm",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://algoexplorer.io",
-      "txPath": "/tx/",
-      "accountPath": "/address/",
-      "sampleTx": "CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A",
-      "sampleAccount": "J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM"
+      "url": "https://www.mintscan.io/sommelier",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "E73A9E5E534777DDADF7F69A5CB41972894B862D1763FA4081FE913D8D3A5E80",
+      "sampleAccount": "somm10d5wmqvezwtj20u5hg3wuvwucce2nhsy0tzqgn"
     },
     "info": {
-      "url": "https://www.algorand.com/",
-      "source": "https://github.com/algorand/go-algorand",
-      "rpc": "https://indexer.algorand.network",
-      "documentation": "https://developer.algorand.org/docs/algod-rest-paths"
+      "url": "https://www.sommelier.finance/"
     }
   },
   {
-    "id": "iotex",
-    "name": "IoTeX",
-    "coinId": 304,
-    "symbol": "IOTX",
-    "decimals": 18,
-    "blockchain": "IoTeX",
+    "id": "fetchai",
+    "name": "FetchAI",
+    "displayName": "Fetch AI",
+    "coinId": 12000118,
+    "symbol": "FET",
+    "decimals": 6,
+    "chainId": "fetchhub-4",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/304'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "hrp": "io",
+    "publicKeyType": "secp256k1",
+    "hrp": "fetch",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://iotexscan.io",
-      "txPath": "/action/",
-      "accountPath": "/address/"
+      "url": "https://www.mintscan.io/fetchai",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "7EB4F6C26809BA047F81CEFD0889775AC8522B7B8AF559B436083BE7039C5EA6",
+      "sampleAccount": "fetch1t3qet68dr0qkmrjtq89lrx837qa2t05265qy6s"
     },
     "info": {
-      "url": "https://iotex.io",
-      "source": "https://github.com/iotexproject/iotex-core",
-      "rpc": "",
-      "documentation": "https://docs.iotex.io/#api"
+      "url": "https://fetch.ai/",
+      "documentation": "https://docs.fetch.ai/"
     }
   },
   {
-    "id": "nervos",
-    "name": "Nervos",
-    "coinId": 309,
-    "symbol": "CKB",
-    "decimals": 8,
-    "blockchain": "Nervos",
+    "id": "mars",
+    "name": "Mars",
+    "displayName": "Mars Hub",
+    "coinId": 13000118,
+    "symbol": "MARS",
+    "decimals": 6,
+    "chainId": "mars-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/309'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "ckb",
+    "hrp": "mars",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://explorer.nervos.org",
-      "txPath": "/transaction/",
-      "accountPath": "/address/"
+      "url": "https://www.mintscan.io/mars-protocol",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "C12120760C71189A678739E0F1FD4EFAF2C29EA660B57A359AC728F89FAA7528",
+      "sampleAccount": "mars1nnjy6nct405pzfaqjm3dsyw0pf0kyw72vhw4pr"
     },
     "info": {
-      "url": "https://nervos.org",
-      "source": "https://github.com/nervosnetwork/ckb",
-      "rpc": "https://mainnet.ckb.dev/rpc",
-      "documentation": "https://github.com/nervosnetwork/rfcs"
+      "url": "https://marsprotocol.io/",
+      "documentation": "https://docs.marsprotocol.io/"
     }
   },
   {
-    "id": "zilliqa",
-    "name": "Zilliqa",
-    "coinId": 313,
-    "symbol": "ZIL",
-    "decimals": 12,
-    "blockchain": "Zilliqa",
+    "id": "umee",
+    "name": "Umee",
+    "displayName": "Umee",
+    "coinId": 14000118,
+    "symbol": "UMEE",
+    "decimals": 6,
+    "chainId": "umee-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/313'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "zil",
+    "hrp": "umee",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://viewblock.io",
-      "txPath": "/zilliqa/tx/",
-      "accountPath": "/zilliqa/address/"
+      "url": "https://www.mintscan.io/umee",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "65B4B52C5F324F2287540847A114F645D89D544D99F793879FB3DBFF2CFEFC84",
+      "sampleAccount": "umee16934q0qf4akw8qruy5y8v748rvtxxjckgsecq4"
     },
     "info": {
-      "url": "https://zilliqa.com",
-      "source": "https://github.com/Zilliqa/Zilliqa",
-      "rpc": "https://api.zilliqa.com",
-      "documentation": "https://apidocs.zilliqa.com"
+      "url": "https://umee.cc/",
+      "documentation": "https://umeeversity.umee.cc/developers/"
     }
   },
   {
-    "id": "terra",
-    "name": "Terra",
-    "displayName": "Terra Classic",
-    "coinId": 330,
-    "symbol": "LUNC",
+    "id": "noble",
+    "name": "Noble",
+    "displayName": "Noble",
+    "coinId": 18000118,
+    "symbol": "USDC",
     "decimals": 6,
+    "chainId": "noble-1",
     "blockchain": "Cosmos",
-    "chainId": "columbus-5",
     "derivation": [
       {
-        "path": "m/44'/330'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "terra",
+    "hrp": "noble",
     "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://finder.terra.money/classic",
-      "txPath": "/tx/",
-      "accountPath": "/address/"
+      "url": "https://www.mintscan.io/noble",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "EA231079975A058FEC28EF372B445763918C098DE033E868E2E035F3F98C59C7",
+      "sampleAccount": "noble1y2egevq0nyzm7w6a9kpxkw86eqytcvxpwsp6d9"
     },
     "info": {
-      "url": "https://terra.money",
-      "source": "https://github.com/terra-project/core",
-      "rpc": "https://columbus-fcd.terra.dev",
-      "documentation": "https://docs.terra.money"
+      "url": "https://nobleassets.xyz/"
     }
   },
   {
-    "id": "terrav2",
-    "name": "TerraV2",
-    "displayName": "Terra",
-    "coinId": 10000330,
-    "symbol": "LUNA",
+    "id": "sei",
+    "name": "Sei",
+    "displayName": "Sei",
+    "coinId": 19000118,
+    "symbol": "SEI",
     "decimals": 6,
     "blockchain": "Cosmos",
+    "chainId": "pacific-1",
     "derivation": [
       {
-        "path": "m/44'/330'/0'/0/0"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "terra",
-    "chainId": "phoenix-1",
+    "hrp": "sei",
     "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://finder.terra.money/mainnet",
-      "txPath": "/tx/",
-      "accountPath": "/address/"
+      "url": "https://www.mintscan.io/sei",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "4A2114EE45317439690F3BEA9C8B6CFA11D42CF978F9487754902D372EEB488C",
+      "sampleAccount": "sei155hqv2rsypqzq0zpjn72frsxx4l6tcmplw63m2"
     },
     "info": {
-      "url": "https://terra.money",
-      "source": "https://github.com/terra-project/core",
-      "rpc": "https://phoenix-lcd.terra.dev",
-      "documentation": "https://docs.terra.money"
+      "url": "https://sei.io/",
+      "documentation": "https://docs.sei.io/"
     }
   },
   {
-    "id": "polkadot",
-    "name": "Polkadot",
-    "coinId": 354,
-    "symbol": "DOT",
-    "decimals": 10,
-    "blockchain": "Polkadot",
+    "id": "tia",
+    "name": "Tia",
+    "displayName": "Celestia",
+    "coinId": 21000118,
+    "symbol": "TIA",
+    "decimals": 6,
+    "blockchain": "Cosmos",
+    "chainId": "celestia",
     "derivation": [
       {
-        "path": "m/44'/354'/0'/0'/0'"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
-    "addressHasher": "keccak256",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "celestia",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://polkadot.subscan.io",
-      "txPath": "/extrinsic/",
-      "accountPath": "/account/"
+      "url": "https://www.mintscan.io/celestia",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "FF370C65D8D67B8236F9D3A8D2B1256337C60C1965092CADD1FA970288FCE99B",
+      "sampleAccount": "celestia1tt4tv4jrs4twdtzwywxd8u65duxgk8y73wvfu2"
     },
     "info": {
-      "url": "https://polkadot.network/",
-      "source": "https://github.com/paritytech/polkadot",
-      "rpc": "",
-      "documentation": "https://polkadot.js.org/api/substrate/rpc.html"
+      "url": "https://celestia.org/",
+      "documentation": "https://docs.celestia.org/"
     }
   },
   {
-    "id": "everscale",
-    "name": "Everscale",
-    "coinId": 396,
-    "symbol": "EVER",
-    "decimals": 9,
-    "blockchain": "Everscale",
+    "id": "coreum",
+    "name": "Coreum",
+    "displayName": "Coreum",
+    "coinId": 10000990,
+    "symbol": "CORE",
+    "decimals": 6,
+    "chainId": "coreum-mainnet-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/396'/0'/0/0"
+        "path": "m/44'/990'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "core",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://everscan.io",
-      "txPath": "/transactions/",
-      "accountPath": "/accounts/",
-      "sampleTx": "781238b2b0d15cd4cd2e2a0a142753750cd5e1b2c8b506fcede75a90e02f1268",
-      "sampleAccount": "0:d2bf59964a05dee84a0dd1ddc0ad83ba44d49719cf843d689dc8b726d0fb59d8"
+      "url": "https://www.mintscan.io/coreum",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "32A4AE2AE6AAE31E75EDDADE0AB9F1499ABD5AD8D3F261ADEF2805CD46FF74E7",
+      "sampleAccount": "core1zmwdnfpwuymwn0fkwnj2aaje34npd5sqgjxq9v"
     },
     "info": {
-      "url": "https://everscale.network/",
-      "source": "https://github.com/tonlabs/evernode-ds",
-      "rpc": "https://evercloud.dev",
-      "documentation": "https://docs.everos.dev/evernode-platform/products/evercloud/get-started"
+      "url": "https://www.coreum.com/",
+      "documentation": "https://www.coreum.com/developers"
     }
   },
   {
-    "id": "near",
-    "name": "NEAR",
-    "coinId": 397,
-    "symbol": "NEAR",
-    "decimals": 24,
-    "blockchain": "NEAR",
+    "id": "quasar",
+    "name": "Quasar",
+    "displayName": "Quasar",
+    "coinId": 15000118,
+    "symbol": "QSR",
+    "decimals": 6,
+    "chainId": "quasar-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/397'/0'"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "quasar",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://explorer.near.org",
-      "txPath": "/transactions/",
-      "accountPath": "/accounts/"
+      "url": "https://www.mintscan.io/quasar",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "2898B89C98FE1E8CF1E05A37E4EE5EE5ED83FD957B0CAEE53DE39FC82BF1A033",
+      "sampleAccount": "quasar1cqu6w425slheul3jsmyt6q0ec0rs0w0ugkst3k"
     },
     "info": {
-      "url": "https://nearprotocol.com",
-      "source": "https://github.com/nearprotocol/nearcore",
-      "rpc": "https://rpc.nearprotocol.com",
-      "documentation": "https://docs.nearprotocol.com"
+      "url": "https://www.quasar.fi/",
+      "documentation": "https://docs.quasar.fi/"
     }
   },
   {
-    "id": "aion",
-    "name": "Aion",
-    "coinId": 425,
-    "symbol": "AION",
-    "decimals": 18,
-    "blockchain": "Aion",
+    "id": "persistence",
+    "name": "Persistence",
+    "displayName": "Persistence",
+    "coinId": 16000118,
+    "symbol": "XPRT",
+    "decimals": 6,
+    "chainId": "core-1",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/425'/0'/0'/0'"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "persistence",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://mainnet.aion.network",
-      "txPath": "/#/transaction/",
-      "accountPath": "/#/account/"
+      "url": "https://www.mintscan.io/persistence",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "BBD9DEE03A8D7538D8E7398217467F4A2B5690D15773E8A6442E6AEEEFA21E64",
+      "sampleAccount": "persistence10ys69560pqr6zmqam80g8s0smtjw6p3ugzmy3u"
     },
     "info": {
-      "url": "https://aion.network",
-      "source": "https://github.com/aionnetwork/aion",
-      "rpc": "",
-      "documentation": "https://github.com/aionnetwork/aion/wiki/JSON-RPC-API-Docs"
+      "url": "https://persistence.one/",
+      "documentation": "https://docs.persistence.one/"
     }
   },
   {
-    "id": "kusama",
-    "name": "Kusama",
-    "coinId": 434,
-    "symbol": "KSM",
-    "decimals": 12,
-    "blockchain": "Kusama",
+    "id": "akash",
+    "name": "Akash",
+    "displayName": "Akash",
+    "coinId": 17000118,
+    "symbol": "AKT",
+    "decimals": 6,
+    "chainId": "akashnet-2",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/434'/0'/0'/0'"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
-    "addressHasher": "keccak256",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "akash",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://kusama.subscan.io",
-      "txPath": "/extrinsic/",
+      "url": "https://www.mintscan.io/akash",
+      "txPath": "/txs/",
       "accountPath": "/account/",
-      "sampleTx": "0xcbe0c2e2851c1245bedaae4d52f06eaa6b4784b786bea2f0bff11af7715973dd",
-      "sampleAccount": "DbCNECPna3k6MXFWWNZa5jGsuWycqEE6zcUxZYkxhVofrFk"
+      "sampleTx": "C0083856344425908D5333D4325E3E0DE9D697BA568C6D99C34303819F615D25",
+      "sampleAccount": "akash1f4nskxfw8ufhwnajh7xwt0wmdtxm02vwta6krg"
     },
     "info": {
-      "url": "https://kusama.network",
-      "source": "https://github.com/paritytech/polkadot",
-      "rpc": "wss://kusama-rpc.polkadot.io/",
-      "documentation": "https://polkadot.js.org/api/substrate/rpc.html"
+      "url": "https://akash.network/",
+      "documentation": "https://docs.akash.network/"
     }
   },
   {
-    "id": "aeternity",
-    "name": "Aeternity",
-    "coinId": 457,
-    "symbol": "AE",
-    "decimals": 18,
-    "blockchain": "Aeternity",
+    "id": "zcash",
+    "name": "Zcash",
+    "coinId": 133,
+    "symbol": "ZEC",
+    "decimals": 8,
+    "blockchain": "Zcash",
     "derivation": [
       {
-        "path": "m/44'/457'/0'/0'/0'"
+        "path": "m/44'/133'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "staticPrefix": 28,
+    "p2pkhPrefix": 184,
+    "p2shPrefix": 189,
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://explorer.aepps.com",
-      "txPath": "/transactions/",
-      "accountPath": "/account/transactions/"
+      "url": "https://blockchair.com/zcash",
+      "txPath": "/transaction/",
+      "accountPath": "/address/",
+      "sampleTx": "f2438a93039faf08d39bd3df1f7b5f19a2c29ffe8753127e2956ab4461adab35",
+      "sampleAccount": "t1Yfrf1dssDLmaMBsq2LFKWPbS5vH3nGpa2"
     },
     "info": {
-      "url": "https://aeternity.com",
-      "source": "https://github.com/aeternity/aeternity",
-      "rpc": "https://sdk-mainnet.aepps.com",
-      "documentation": "http://aeternity.com/api-docs/"
+      "url": "https://z.cash",
+      "source": "https://github.com/trezor/blockbook",
+      "rpc": "",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "kava",
-    "name": "Kava",
-    "coinId": 459,
-    "symbol": "KAVA",
-    "decimals": 6,
-    "blockchain": "Cosmos",
-    "chainId": "kava_2222-10",
+    "id": "firo",
+    "name": "Firo",
+    "coinId": 136,
+    "symbol": "FIRO",
+    "decimals": 8,
+    "blockchain": "Bitcoin",
     "derivation": [
       {
-        "path": "m/44'/459'/0'/0/0"
+        "path": "m/44'/136'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "kava",
-    "addressHasher": "sha256ripemd",
+    "p2pkhPrefix": 82,
+    "p2shPrefix": 7,
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://mintscan.io/kava",
-      "txPath": "/txs/",
-      "accountPath": "/account/",
-      "sampleTx": "2988DF83FCBFAA38179D583A96734CBD071541D6768221BB23111BC8136D5E6A",
-      "sampleAccount": "kava1jf9aaj9myrzsnmpdr7twecnaftzmku2mdpy2a7"
+      "url": "https://explorer.firo.org",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "09a60d58b3d17519a42a8eca60750c33b710ca8f3ca71994192e05c248a2a111",
+      "sampleAccount": "a8ULhhDgfdSiXJhSZVdhb8EuDc6R3ogsaM"
     },
     "info": {
-      "url": "https://kava.io",
-      "source": "https://github.com/kava-labs/kava",
-      "rpc": "https://data.kava.io",
-      "documentation": "https://rpc.kava.io"
+      "url": "https://firo.org/",
+      "source": "https://github.com/firoorg/firo",
+      "rpc": "",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "filecoin",
-    "name": "Filecoin",
-    "coinId": 461,
-    "symbol": "FIL",
-    "decimals": 18,
-    "blockchain": "Filecoin",
+    "id": "komodo",
+    "name": "Komodo",
+    "coinId": 141,
+    "symbol": "KMD",
+    "decimals": 8,
+    "blockchain": "Zcash",
     "derivation": [
       {
-        "path": "m/44'/461'/0'/0/0"
+        "path": "m/44'/141'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
+    "publicKeyType": "secp256k1",
+    "p2pkhPrefix": 60,
+    "p2shPrefix": 85,
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://filfox.info/en",
-      "txPath": "/message/",
+      "url": "https://kmdexplorer.io/",
+      "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "bafy2bzacedsgjcd6xfhrrymmfrqubb44otlyhvgqkgsh533d5j5hwniiqespm",
-      "sampleAccount": "f1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za"
+      "sampleTx": "f53bd1a5c0f5dc4b60ba9a1882742ea96faa996e1b870795812a29604dd7829e",
+      "sampleAccount": "RWvfkt8UjbPWXgeZEcgYmKw2vA1bbAx5t2"
     },
     "info": {
-      "url": "https://filecoin.io/",
-      "source": "https://github.com/filecoin-project/lotus",
+      "url": "https://komodoplatform.com",
+      "source": "https://github.com/KomodoPlatform/komodo",
       "rpc": "",
-      "documentation": "https://docs.lotu.sh"
+      "documentation": "https://developers.komodoplatform.com"
     }
   },
   {
-    "id": "bluzelle",
-    "name": "Bluzelle",
-    "coinId": 483,
-    "symbol": "BLZ",
+    "id": "ripple",
+    "name": "XRP",
+    "coinId": 144,
+    "symbol": "XRP",
     "decimals": 6,
-    "blockchain": "Cosmos",
+    "blockchain": "Ripple",
     "derivation": [
       {
-        "path": "m/44'/483'/0'/0/0"
+        "path": "m/44'/144'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "bluzelle",
-    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://bigdipper.net.bluzelle.com",
-      "txPath": "/transactions/",
-      "accountPath": "/account/",
-      "sampleTx": "AC026E0EC6E33A77D5EA6B9CEF9810699BC2AD8C5582E007E7857457C6D3B819",
-      "sampleAccount": "bluzelle1q9cryfal7u3jvnq6er5ufety20xtzw6ycx2te9"
+      "url": "https://bithomp.com",
+      "txPath": "/explorer/",
+      "accountPath": "/explorer/",
+      "sampleTx": "E26AB8F3372D2FC02DEC1FD5674ADAB762D684BFFDBBDF5D674E9D7CF4A47054",
+      "sampleAccount": "rfkH7EuS1XcSkB9pocy1R6T8F4CsNYixYU"
     },
     "info": {
-      "url": "https://bluzelle.com",
-      "source": "https://github.com/bluzelle",
-      "rpc": "https://bluzelle.github.io/api/",
-      "documentation": "https://docs.bluzelle.com/developers/"
+      "url": "https://ripple.com/xrp",
+      "source": "https://github.com/ripple/rippled",
+      "rpc": "https://s2.ripple.com:51234",
+      "documentation": "https://xrpl.org/rippled-api.html"
     }
   },
   {
-    "id": "band",
-    "name": "BandChain",
-    "symbol": "BAND",
-    "coinId": 494,
-    "decimals": 6,
-    "blockchain": "Cosmos",
-    "chainId": "laozi-mainnet",
+    "id": "bitcoincash",
+    "name": "Bitcoin Cash",
+    "coinId": 145,
+    "symbol": "BCH",
+    "decimals": 8,
+    "blockchain": "BitcoinCash",
     "derivation": [
       {
-        "path": "m/44'/494'/0'/0/0"
+        "path": "m/44'/145'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "band",
-    "addressHasher": "sha256ripemd",
+    "p2pkhPrefix": 0,
+    "p2shPrefix": 5,
+    "hrp": "bitcoincash",
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://scan-wenchang-testnet2.bandchain.org/",
-      "txPath": "/tx/",
-      "accountPath": "/account/",
-      "sampleTx": "473264551D3063A9EC64EC251C61BE92DDDFCF6CC46D026D1E574D83D5447173",
-      "sampleAccount": "band12nmsm9khdsv0tywge43q3zwj8kkj3hvup9rltp"
+      "url": "https://blockchair.com",
+      "txPath": "/bitcoin-cash/transaction/",
+      "accountPath": "/bitcoin-cash/address/"
     },
     "info": {
-      "url": "https://bandprotocol.com/",
-      "source": "https://github.com/bandprotocol/bandchain",
-      "rpc": "https://api-wt2-lb.bandchain.org",
-      "documentation": "https://docs.bandchain.org/"
+      "url": "https://bitcoincash.org",
+      "source": "https://github.com/trezor/blockbook",
+      "rpc": "",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "theta",
-    "name": "Theta",
-    "coinId": 500,
-    "symbol": "THETA",
-    "decimals": 18,
-    "blockchain": "Theta",
+    "id": "stellar",
+    "name": "Stellar",
+    "coinId": 148,
+    "symbol": "XLM",
+    "decimals": 7,
+    "blockchain": "Stellar",
     "derivation": [
       {
-        "path": "m/44'/500'/0'/0/0"
+        "path": "m/44'/148'/0'"
       }
     ],
-    "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
     "explorer": {
-      "url": "https://explorer.thetatoken.org",
-      "txPath": "/txs/",
-      "accountPath": "/account/"
+      "url": "https://blockchair.com/stellar",
+      "txPath": "/transaction/",
+      "accountPath": "/account/",
+      "sampleTx": "8a7ff7261e8b3f31af7f6ed257c2e9fe7c47afcd9b1ce1be1bfc1bc5f6a3ad9e",
+      "sampleAccount": "GCILJZQ3CKBKBUJWW4TAM6Q37LJA5MQX6GMSFSQN75BPLWIZ33OPRG52"
     },
     "info": {
-      "url": "https://www.thetatoken.org",
-      "source": "https://github.com/thetatoken/theta-protocol-ledger",
-      "rpc": "",
-      "documentation": "https://github.com/thetatoken/theta-mainnet-integration-guide/blob/master/docs/api.md#api-reference"
+      "url": "https://stellar.org",
+      "source": "https://github.com/stellar/go",
+      "rpc": "https://horizon.stellar.org",
+      "documentation": "https://www.stellar.org/developers/horizon/reference"
     }
   },
   {
-    "id": "solana",
-    "name": "Solana",
-    "coinId": 501,
-    "symbol": "SOL",
-    "decimals": 9,
-    "blockchain": "Solana",
+    "id": "bitcoingold",
+    "name": "Bitcoin Gold",
+    "coinId": 156,
+    "symbol": "BTG",
+    "decimals": 8,
+    "blockchain": "Bitcoin",
     "derivation": [
       {
-        "path": "m/44'/501'/0'"
-      },
-      {
-        "name": "solana",
-        "path": "m/44'/501'/0'/0'"
+        "path": "m/84'/156'/0'/0/0",
+        "xpub": "zpub",
+        "xprv": "zprv"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "p2pkhPrefix": 38,
+    "p2shPrefix": 23,
+    "hrp": "btg",
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://solscan.io",
+      "url": "https://explorer.bitcoingold.org/insight",
       "txPath": "/tx/",
-      "accountPath": "/account/",
-      "sampleTx": "5LmxrEKGchhMuYfw6Qut6CbsvE9pVfb8YvwZKvWssSesDVjHioBCmWKSJQh1WhvcM6CpemhpHNmEMA2a36rzwTa8",
-      "sampleAccount": "Bxp8yhH9zNwxyE4UqxP7a7hgJ5xTZfxNNft7YJJ2VRjT"
+      "accountPath": "/address/",
+      "sampleTx": "2f807d7734de35d2236a1b3d8704eb12954f5f82ea66987949b10e94d9999b23",
+      "sampleAccount": "GJjz2Du9BoJQ3CPcoyVTHUJZSj62i1693U"
     },
     "info": {
-      "url": "https://solana.com",
-      "source": "https://github.com/solana-labs/solana",
-      "rpc": "https://api.mainnet-beta.solana.com",
-      "documentation": "https://docs.solana.com"
+      "url": "https://bitcoingold.org",
+      "source": "https://github.com/trezor/blockbook",
+      "rpc": "",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "elrond",
-    "name": "Elrond",
-    "coinId": 508,
-    "symbol": "eGLD",
-    "decimals": 18,
-    "blockchain": "ElrondNetwork",
+    "id": "nano",
+    "name": "Nano",
+    "coinId": 165,
+    "symbol": "XNO",
+    "decimals": 30,
+    "blockchain": "Nano",
     "derivation": [
       {
-        "path": "m/44'/508'/0'/0'/0'"
+        "path": "m/44'/165'/0'"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
-    "hrp": "erd",
+    "curve": "ed25519Blake2bNano",
+    "publicKeyType": "ed25519Blake2b",
+    "url": "https://nano.org",
     "explorer": {
-      "url": "https://explorer.elrond.com",
-      "txPath": "/transactions/",
-      "accountPath": "/address/"
+      "url": "https://www.nanolooker.com",
+      "txPath": "/block/",
+      "accountPath": "/account/",
+      "sampleTx": "C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F",
+      "sampleAccount": "nano_1wpj616kwhe1y38y1mspd8aub8i334cwybqco511iyuxm55zx8d67ptf1tsf"
     },
     "info": {
-      "url": "https://elrond.com/",
-      "source": "https://github.com/ElrondNetwork/elrond-go",
-      "rpc": "https://api.elrond.com",
-      "documentation": "https://docs.elrond.com"
+      "url": "https://nano.org",
+      "source": "https://github.com/nanocurrency/nano-node",
+      "rpc": "",
+      "documentation": "https://docs.nano.org/commands/rpc-protocol/"
     }
   },
   {
-    "id": "binance",
-    "name": "Binance",
-    "displayName": "BNB Beacon Chain",
-    "coinId": 714,
-    "symbol": "BNB",
+    "id": "ravencoin",
+    "name": "Ravencoin",
+    "coinId": 175,
+    "symbol": "RVN",
     "decimals": 8,
-    "blockchain": "Binance",
+    "blockchain": "Bitcoin",
     "derivation": [
       {
-        "path": "m/44'/714'/0'/0/0"
+        "path": "m/44'/175'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "bnb",
-    "chainId": "Binance-Chain-Tigris",
+    "p2pkhPrefix": 60,
+    "p2shPrefix": 122,
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://explorer.binance.org",
+      "url": "https://blockbook.ravencoin.org",
       "txPath": "/tx/",
-      "accountPath": "/address/",
-      "sampleTx": "A93625C9F9ABEA1A8E31585B30BBB16C34FAE0D172EB5B6B2F834AF077BF06BB",
-      "sampleAccount": "bnb1u7jm0cll5h3224y0tapwn6gf6pr49ytewx4gsz"
+      "accountPath": "/address/"
     },
     "info": {
-      "url": "https://binance.org",
-      "source": "https://github.com/binance-chain/node-binary",
-      "rpc": "https://dex.binance.org",
-      "documentation": "https://docs.binance.org/api-reference/dex-api/paths.html"
+      "url": "https://ravencoin.org",
+      "source": "https://github.com/trezor/blockbook",
+      "rpc": "",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "vechain",
-    "name": "VeChain",
-    "coinId": 818,
-    "symbol": "VET",
+    "id": "poa",
+    "name": "POA Network",
+    "coinId": 178,
+    "symbol": "POA",
     "decimals": 18,
-    "blockchain": "Vechain",
+    "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/818'/0'/0/0"
+        "path": "m/44'/178'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "74",
+    "chainId": "99",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://explore.vechain.org",
-      "txPath": "/transactions/",
-      "accountPath": "/accounts/"
+      "url": "https://blockscout.com",
+      "txPath": "/poa/core/tx/",
+      "accountPath": "/poa/core/address/"
     },
     "info": {
-      "url": "https://vechain.org",
-      "source": "https://github.com/vechain/thor",
-      "rpc": "",
-      "documentation": "https://doc.vechainworld.io/docs"
+      "url": "https://poa.network",
+      "source": "https://github.com/poanetwork/parity-ethereum",
+      "rpc": "https://core.poa.network",
+      "documentation": "https://eth.wiki/json-rpc/API"
     }
   },
   {
-    "id": "callisto",
-    "name": "Callisto",
-    "coinId": 820,
-    "symbol": "CLO",
-    "decimals": 18,
-    "blockchain": "Ethereum",
+    "id": "eos",
+    "name": "EOS",
+    "coinId": 194,
+    "symbol": "EOS",
+    "decimals": 4,
+    "blockchain": "EOS",
     "derivation": [
       {
-        "path": "m/44'/820'/0'/0/0"
+        "path": "m/44'/194'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "chainId": "820",
-    "addressHasher": "keccak256",
+    "publicKeyType": "secp256k1",
     "explorer": {
-      "url": "https://explorer.callisto.network",
-      "txPath": "/tx/",
-      "accountPath": "/addr/"
+      "url": "https://bloks.io",
+      "txPath": "/transaction/",
+      "accountPath": "/account/"
     },
     "info": {
-      "url": "https://callisto.network",
-      "source": "https://github.com/EthereumCommonwealth/go-callisto",
-      "rpc": "https://clo-geth.0xinfra.com",
-      "documentation": "https://eth.wiki/json-rpc/API"
+      "url": "http://eos.io",
+      "source": "https://github.com/eosio/eos",
+      "rpc": "",
+      "documentation": "https://developers.eos.io/eosio-nodeos/reference"
     }
   },
   {
-    "id": "neo",
-    "name": "NEO",
-    "coinId": 888,
-    "symbol": "NEO",
-    "decimals": 8,
-    "blockchain": "NEO",
+    "id": "wax",
+    "name": "WAX",
+    "coinId": 14001,
+    "symbol": "WAXP",
+    "decimals": 4,
+    "blockchain": "EOS",
     "derivation": [
       {
-        "path": "m/44'/888'/0'/0/0"
+        "path": "m/44'/194'/0'/0/0"
       }
     ],
-    "curve": "nist256p1",
-    "publicKeyType": "nist256p1",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
     "explorer": {
-      "url": "https://neoscan.io",
+      "url": "https://wax.bloks.io",
       "txPath": "/transaction/",
-      "accountPath": "/address/",
-      "sampleTx": "e0ddf7c81c732df26180aca0c36d5868ad009fdbbe6e7a56ebafc14bba41cd53",
-      "sampleAccount": "AcxuqWhTureEQGeJgbmtSWNAtssjMLU7pb"
+      "accountPath": "/account/"
     },
     "info": {
-      "url": "https://neo.org",
-      "source": "https://github.com/neo-project/neo",
-      "rpc": "http://seed1.ngd.network:10332",
-      "documentation": "https://neo.org/eco"
+      "url": "http://wax.io",
+      "source": "https://github.com/worldwide-asset-exchange/wax-blockchain",
+      "rpc": "https://wax.blacklusion.io",
+      "documentation": "https://https://developer.wax.io"
     }
   },
   {
-    "id": "tomochain",
-    "name": "TomoChain",
-    "coinId": 889,
-    "symbol": "TOMO",
-    "decimals": 18,
-    "blockchain": "Ethereum",
+    "id": "tron",
+    "name": "Tron",
+    "coinId": 195,
+    "symbol": "TRX",
+    "decimals": 6,
+    "blockchain": "Tron",
     "derivation": [
       {
-        "path": "m/44'/889'/0'/0/0"
+        "path": "m/44'/195'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "88",
-    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://tomoscan.io",
-      "txPath": "/tx/",
-      "accountPath": "/address/"
+      "url": "https://tronscan.org",
+      "txPath": "/#/transaction/",
+      "accountPath": "/#/address/"
     },
     "info": {
-      "url": "https://tomochain.com",
-      "source": "https://github.com/tomochain/tomochain",
-      "rpc": "https://rpc.tomochain.com",
-      "documentation": "https://eth.wiki/json-rpc/API"
+      "url": "https://tron.network",
+      "source": "https://github.com/tronprotocol/java-tron",
+      "rpc": "https://api.trongrid.io",
+      "documentation": "https://developers.tron.network/docs/tron-wallet-rpc-api"
     }
   },
   {
-    "id": "thundertoken",
-    "name": "Thunder Token",
-    "coinId": 1001,
-    "symbol": "TT",
-    "decimals": 18,
-    "blockchain": "Ethereum",
+    "id": "fio",
+    "name": "FIO",
+    "coinId": 235,
+    "symbol": "FIO",
+    "decimals": 9,
+    "blockchain": "FIO",
     "derivation": [
       {
-        "path": "m/44'/1001'/0'/0/0"
+        "path": "m/44'/235'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "chainId": "108",
-    "addressHasher": "keccak256",
+    "publicKeyType": "secp256k1",
+    "url": "https://fioprotocol.io/",
     "explorer": {
-      "url": "https://scan.thundercore.com",
-      "txPath": "/transactions/",
-      "accountPath": "/address/"
+      "url": "https://explorer.fioprotocol.io",
+      "txPath": "/transaction/",
+      "accountPath": "/account/",
+      "sampleTx": "930d1d3cf8988b39b5f64b64e9d61314a3e05a155d9e3505bdf863aab1adddf3",
+      "sampleAccount": "f5axfpgffiqz"
     },
     "info": {
-      "url": "https://thundercore.com",
-      "source": "https://github.com/thundercore/pala",
-      "rpc": "https://mainnet-rpc.thundercore.com",
-      "documentation": "https://eth.wiki/json-rpc/API"
+      "url": "https://fioprotocol.io",
+      "source": "https://github.com/fioprotocol/fio",
+      "rpc": "https://mainnet.fioprotocol.io",
+      "documentation": "https://developers.fioprotocol.io"
     }
   },
   {
-    "id": "harmony",
-    "name": "Harmony",
-    "coinId": 1023,
-    "symbol": "ONE",
-    "decimals": 18,
-    "blockchain": "Harmony",
+    "id": "nimiq",
+    "name": "Nimiq",
+    "coinId": 242,
+    "symbol": "NIM",
+    "decimals": 5,
+    "blockchain": "Nimiq",
     "derivation": [
       {
-        "path": "m/44'/1023'/0'/0/0"
+        "path": "m/44'/242'/0'/0'"
       }
     ],
-    "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "hrp": "one",
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
     "explorer": {
-      "url": "https://explorer.harmony.one",
-      "txPath": "/#/tx/",
-      "accountPath": "/#/address/"
+      "url": "https://nimiq.watch",
+      "txPath": "/#",
+      "accountPath": "/#"
     },
     "info": {
-      "url": "https://harmony.one",
-      "source": "https://github.com/harmony-one/go-sdk",
+      "url": "https://nimiq.com",
+      "source": "https://github.com/nimiq/core-rs",
       "rpc": "",
-      "documentation": "https://docs.harmony.one/home/harmony-networks/harmony-network-overview/mainnet"
+      "documentation": "https://github.com/nimiq/core-js/wiki/JSON-RPC-API"
     }
   },
   {
-    "id": "oasis",
-    "name": "Oasis",
-    "coinId": 474,
-    "symbol": "ROSE",
-    "decimals": 9,
-    "blockchain": "OasisNetwork",
+    "id": "algorand",
+    "name": "Algorand",
+    "coinId": 283,
+    "symbol": "ALGO",
+    "decimals": 6,
+    "blockchain": "Algorand",
     "derivation": [
       {
-        "path": "m/44'/474'/0'"
+        "path": "m/44'/283'/0'/0'/0'"
       }
     ],
     "curve": "ed25519",
     "publicKeyType": "ed25519",
-    "hrp": "oasis",
     "explorer": {
-      "url": "https://oasisscan.com",
-      "txPath": "/transactions/",
-      "accountPath": "/accounts/detail/",
-      "sampleTx": "0b9bd4983f1c88a1c71bf33562b6ba02b3064e01697d15a0de4bfe1922ec74b8",
-      "sampleAccount": "oasis1qrx376dmwuckmruzn9vq64n49clw72lywctvxdf4"
+      "url": "https://app.dappflow.org/explorer",
+      "txPath": "/transaction/",
+      "accountPath": "/account/",
+      "sampleTx": "CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A",
+      "sampleAccount": "J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM"
     },
     "info": {
-      "url": "https://oasisprotocol.org/",
-      "source": "https://github.com/oasisprotocol/oasis-core",
-      "rpc": "https://rosetta.oasis.dev/api/v1",
-      "documentation": "https://docs.oasis.dev/oasis-core/"
+      "url": "https://www.algorand.com/",
+      "source": "https://github.com/algorand/go-algorand",
+      "rpc": "https://indexer.algorand.network",
+      "documentation": "https://developer.algorand.org/docs/algod-rest-paths"
     }
   },
   {
-    "id": "ontology",
-    "name": "Ontology",
-    "coinId": 1024,
-    "symbol": "ONT",
-    "decimals": 0,
-    "blockchain": "Ontology",
+    "id": "iotex",
+    "name": "IoTeX",
+    "coinId": 304,
+    "symbol": "IOTX",
+    "decimals": 18,
+    "blockchain": "IoTeX",
     "derivation": [
       {
-        "path": "m/44'/1024'/0'/0/0"
+        "path": "m/44'/304'/0'/0/0"
       }
     ],
-    "curve": "nist256p1",
-    "publicKeyType": "nist256p1",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "hrp": "io",
     "explorer": {
-      "url": "https://explorer.ont.io",
-      "txPath": "/transaction/",
+      "url": "https://iotexscan.io",
+      "txPath": "/action/",
       "accountPath": "/address/"
     },
     "info": {
-      "url": "https://ont.io",
-      "source": "https://github.com/ontio/ontology",
-      "rpc": "http://dappnode1.ont.io:20336",
-      "documentation": "https://github.com/ontio/ontology/blob/master/docs/specifications/rpc_api.md"
+      "url": "https://iotex.io",
+      "source": "https://github.com/iotexproject/iotex-core",
+      "rpc": "",
+      "documentation": "https://docs.iotex.io/#api"
     }
   },
   {
-    "id": "tezos",
-    "name": "Tezos",
-    "coinId": 1729,
-    "symbol": "XTZ",
-    "decimals": 6,
-    "blockchain": "Tezos",
+    "id": "iotexevm",
+    "name": "IoTeX EVM",
+    "displayName": "IoTeX EVM",
+    "coinId": 10004689,
+    "symbol": "IOTX",
+    "decimals": 18,
+    "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/1729'/0'/0'"
+        "path": "m/44'/304'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "4689",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://tzstats.com",
-      "txPath": "/",
-      "accountPath": "/"
+      "url": "https://iotexscan.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
     },
     "info": {
-      "url": "https://tezos.com",
-      "source": "https://gitlab.com/tezos/tezos",
-      "rpc": "https://rpc.tulip.tools/mainnet",
-      "documentation": "https://tezos.gitlab.io/tezos/api/rpc.html"
+      "url": "https://iotex.io/",
+      "documentation": "https://iotex.io/developers"
     }
   },
   {
-    "id": "cardano",
-    "name": "Cardano",
-    "coinId": 1815,
-    "symbol": "ADA",
-    "decimals": 6,
-    "blockchain": "Cardano",
+    "id": "nervos",
+    "name": "Nervos",
+    "coinId": 309,
+    "symbol": "CKB",
+    "decimals": 8,
+    "blockchain": "Nervos",
     "derivation": [
       {
-        "path": "m/1852'/1815'/0'/0/0"
+        "path": "m/44'/309'/0'/0/0"
       }
     ],
-    "curve": "ed25519ExtendedCardano",
-    "publicKeyType": "ed25519Cardano",
-    "hrp": "addr",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "ckb",
     "explorer": {
-      "url": "https://cardanoscan.io",
+      "url": "https://explorer.nervos.org",
       "txPath": "/transaction/",
-      "accountPath": "/address/",
-      "sampleTx": "b7a6c5cadab0f64bdc89c77ee4a351463aba5c33f2cef6bbd6542a74a90a3af3",
-      "sampleAccount": "addr1s3xuxwfetyfe7q9u3rfn6je9stlvcgmj8rezd87qjjegdtxm3y3f2mgtn87mrny9r77gm09h6ecslh3gmarrvrp9n4yzmdnecfxyu59jz29g8j"
+      "accountPath": "/address/"
     },
     "info": {
-      "url": "https://www.cardano.org",
-      "source": "https://github.com/input-output-hk/cardano-sl",
-      "rpc": "",
-      "documentation": "https://cardanodocs.com/introduction/"
+      "url": "https://nervos.org",
+      "source": "https://github.com/nervosnetwork/ckb",
+      "rpc": "https://mainnet.ckb.dev/rpc",
+      "documentation": "https://github.com/nervosnetwork/rfcs"
     }
   },
   {
-    "id": "kin",
-    "name": "Kin",
-    "coinId": 2017,
-    "symbol": "KIN",
-    "decimals": 5,
-    "blockchain": "Stellar",
-    "derivation": [
+    "id": "zilliqa",
+    "name": "Zilliqa",
+    "coinId": 313,
+    "symbol": "ZIL",
+    "decimals": 12,
+    "blockchain": "Zilliqa",
+    "derivation": [
+      {
+        "path": "m/44'/313'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "zil",
+    "explorer": {
+      "url": "https://viewblock.io",
+      "txPath": "/zilliqa/tx/",
+      "accountPath": "/zilliqa/address/"
+    },
+    "info": {
+      "url": "https://zilliqa.com",
+      "source": "https://github.com/Zilliqa/Zilliqa",
+      "rpc": "https://api.zilliqa.com",
+      "documentation": "https://apidocs.zilliqa.com"
+    }
+  },
+  {
+    "id": "terra",
+    "name": "Terra",
+    "displayName": "Terra Classic",
+    "coinId": 330,
+    "symbol": "LUNC",
+    "decimals": 6,
+    "blockchain": "Cosmos",
+    "chainId": "columbus-5",
+    "derivation": [
+      {
+        "path": "m/44'/330'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "terra",
+    "addressHasher": "sha256ripemd",
+    "explorer": {
+      "url": "https://finder.terra.money/classic",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://terra.money",
+      "source": "https://github.com/terra-project/core",
+      "rpc": "https://columbus-fcd.terra.dev",
+      "documentation": "https://docs.terra.money"
+    }
+  },
+  {
+    "id": "terrav2",
+    "name": "TerraV2",
+    "displayName": "Terra",
+    "coinId": 10000330,
+    "symbol": "LUNA",
+    "decimals": 6,
+    "blockchain": "Cosmos",
+    "derivation": [
+      {
+        "path": "m/44'/330'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "terra",
+    "chainId": "phoenix-1",
+    "addressHasher": "sha256ripemd",
+    "explorer": {
+      "url": "https://finder.terra.money/mainnet",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://terra.money",
+      "source": "https://github.com/terra-project/core",
+      "rpc": "https://phoenix-lcd.terra.dev",
+      "documentation": "https://docs.terra.money"
+    }
+  },
+  {
+    "id": "polkadot",
+    "name": "Polkadot",
+    "coinId": 354,
+    "symbol": "DOT",
+    "decimals": 10,
+    "blockchain": "Polkadot",
+    "derivation": [
+      {
+        "path": "m/44'/354'/0'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "addressHasher": "keccak256",
+    "ss58Prefix": 0,
+    "explorer": {
+      "url": "https://polkadot.subscan.io",
+      "txPath": "/extrinsic/",
+      "accountPath": "/account/",
+      "sampleTx": "0xb96f97d8ee508f420e606e1a6dcc74b88844713ddec2bd7cf4e3aa6b1d6beef4",
+      "sampleAccount": "13hJFqnkqQbmgnGQteGntjMjTdmTBRE8Z93JqxsrpgT7Yjd2"
+    },
+    "info": {
+      "url": "https://polkadot.network/",
+      "source": "https://github.com/paritytech/polkadot",
+      "rpc": "",
+      "documentation": "https://polkadot.js.org/api/substrate/rpc.html"
+    }
+  },
+  {
+    "id": "everscale",
+    "name": "Everscale",
+    "coinId": 396,
+    "symbol": "EVER",
+    "decimals": 9,
+    "blockchain": "Everscale",
+    "derivation": [
+      {
+        "path": "m/44'/396'/0'/0/0"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "explorer": {
+      "url": "https://everscan.io",
+      "txPath": "/transactions/",
+      "accountPath": "/accounts/",
+      "sampleTx": "781238b2b0d15cd4cd2e2a0a142753750cd5e1b2c8b506fcede75a90e02f1268",
+      "sampleAccount": "0:d2bf59964a05dee84a0dd1ddc0ad83ba44d49719cf843d689dc8b726d0fb59d8"
+    },
+    "info": {
+      "url": "https://everscale.network/",
+      "source": "https://github.com/tonlabs/evernode-ds",
+      "rpc": "https://evercloud.dev",
+      "documentation": "https://docs.everos.dev/evernode-platform/products/evercloud/get-started"
+    }
+  },
+  {
+    "id": "near",
+    "name": "NEAR",
+    "coinId": 397,
+    "symbol": "NEAR",
+    "decimals": 24,
+    "blockchain": "NEAR",
+    "derivation": [
+      {
+        "path": "m/44'/397'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "explorer": {
+      "url": "https://nearblocks.io",
+      "txPath": "/txns/",
+      "accountPath": "/address/",
+      "sampleTx": "FPQAMaVnvFHNwNBJWnTttXfdJhp5FvMGGDJEesB8gvbL",
+      "sampleAccount": "test-trust.vlad.near"
+    },
+    "info": {
+      "url": "https://nearprotocol.com",
+      "source": "https://github.com/nearprotocol/nearcore",
+      "rpc": "https://rpc.nearprotocol.com",
+      "documentation": "https://docs.nearprotocol.com"
+    }
+  },
+  {
+    "id": "aion",
+    "name": "Aion",
+    "coinId": 425,
+    "symbol": "AION",
+    "decimals": 18,
+    "blockchain": "Aion",
+    "derivation": [
+      {
+        "path": "m/44'/425'/0'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "explorer": {
+      "url": "https://mainnet.aion.network",
+      "txPath": "/#/transaction/",
+      "accountPath": "/#/account/"
+    },
+    "info": {
+      "url": "https://aion.network",
+      "source": "https://github.com/aionnetwork/aion",
+      "rpc": "",
+      "documentation": "https://github.com/aionnetwork/aion/wiki/JSON-RPC-API-Docs"
+    }
+  },
+  {
+    "id": "kusama",
+    "name": "Kusama",
+    "coinId": 434,
+    "symbol": "KSM",
+    "decimals": 12,
+    "blockchain": "Kusama",
+    "derivation": [
+      {
+        "path": "m/44'/434'/0'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "addressHasher": "keccak256",
+    "ss58Prefix": 2,
+    "explorer": {
+      "url": "https://kusama.subscan.io",
+      "txPath": "/extrinsic/",
+      "accountPath": "/account/",
+      "sampleTx": "0xcbe0c2e2851c1245bedaae4d52f06eaa6b4784b786bea2f0bff11af7715973dd",
+      "sampleAccount": "DbCNECPna3k6MXFWWNZa5jGsuWycqEE6zcUxZYkxhVofrFk"
+    },
+    "info": {
+      "url": "https://kusama.network",
+      "source": "https://github.com/paritytech/polkadot",
+      "rpc": "wss://kusama-rpc.polkadot.io/",
+      "documentation": "https://polkadot.js.org/api/substrate/rpc.html"
+    }
+  },
+  {
+    "id": "acala",
+    "name": "Acala",
+    "coinId": 787,
+    "symbol": "ACA",
+    "decimals": 12,
+    "blockchain": "Polkadot",
+    "derivation": [
+      {
+        "path": "m/44'/787'/0'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "addressHasher": "keccak256",
+    "ss58Prefix": 10,
+    "explorer": {
+      "url": "https://acala.subscan.io",
+      "txPath": "/extrinsic/",
+      "accountPath": "/account/",
+      "sampleTx": "0xf3d58aafb1208bc09d10ba74bbf1c7811dc55a9149c1505256b6fb5603f5047f",
+      "sampleAccount": "26JqMKx4HJJcmb1kXo24HYYobiK2jURGCq6zuEzFBK3hQ9Ti"
+    },
+    "info": {
+      "url": "https://acala.network",
+      "source": "https://github.com/AcalaNetwork/Acala",
+      "rpc": "wss://acala-rpc.dwellir.com",
+      "documentation": "https://polkadot.js.org/api/substrate/rpc.html"
+    }
+  },
+  {
+    "id": "acalaevm",
+    "name": "Acala EVM",
+    "coinId": 10000787,
+    "slip44": 60,
+    "symbol": "ACA",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "787",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://blockscout.acala.network",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x4b0b151dd71ed8ef3174da18565790bf14f0a903a13e4f3266c7848bc8841593",
+      "sampleAccount": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1"
+    },
+    "info": {
+      "url": "https://acala.network",
+      "source": "https://github.com/AcalaNetwork/Acala",
+      "rpc": "https://eth-rpc-acala.aca-api.network",
+      "documentation": "https://polkadot.js.org/api/substrate/rpc.html"
+    }
+  },
+  {
+    "id": "aeternity",
+    "name": "Aeternity",
+    "coinId": 457,
+    "symbol": "AE",
+    "decimals": 18,
+    "blockchain": "Aeternity",
+    "derivation": [
+      {
+        "path": "m/44'/457'/0'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "explorer": {
+      "url": "https://explorer.aepps.com",
+      "txPath": "/transactions/",
+      "accountPath": "/account/transactions/"
+    },
+    "info": {
+      "url": "https://aeternity.com",
+      "source": "https://github.com/aeternity/aeternity",
+      "rpc": "https://sdk-mainnet.aepps.com",
+      "documentation": "http://aeternity.com/api-docs/"
+    }
+  },
+  {
+    "id": "kava",
+    "name": "Kava",
+    "coinId": 459,
+    "symbol": "KAVA",
+    "decimals": 6,
+    "blockchain": "Cosmos",
+    "chainId": "kava_2222-10",
+    "derivation": [
+      {
+        "path": "m/44'/459'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "kava",
+    "addressHasher": "sha256ripemd",
+    "explorer": {
+      "url": "https://mintscan.io/kava",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "2988DF83FCBFAA38179D583A96734CBD071541D6768221BB23111BC8136D5E6A",
+      "sampleAccount": "kava1xd39avn2f008jmvua0eupg39zsp2xn3wf802vn"
+    },
+    "info": {
+      "url": "https://kava.io",
+      "source": "https://github.com/kava-labs/kava",
+      "rpc": "https://data.kava.io",
+      "documentation": "https://rpc.kava.io"
+    }
+  },
+  {
+    "id": "filecoin",
+    "name": "Filecoin",
+    "coinId": 461,
+    "symbol": "FIL",
+    "decimals": 18,
+    "blockchain": "Filecoin",
+    "derivation": [
+      {
+        "path": "m/44'/461'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "explorer": {
+      "url": "https://filfox.info/en",
+      "txPath": "/message/",
+      "accountPath": "/address/",
+      "sampleTx": "bafy2bzacedsgjcd6xfhrrymmfrqubb44otlyhvgqkgsh533d5j5hwniiqespm",
+      "sampleAccount": "f1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za"
+    },
+    "info": {
+      "url": "https://filecoin.io/",
+      "source": "https://github.com/filecoin-project/lotus",
+      "rpc": "",
+      "documentation": "https://docs.lotu.sh"
+    }
+  },
+  {
+    "id": "bluzelle",
+    "name": "Bluzelle",
+    "coinId": 483,
+    "symbol": "BLZ",
+    "decimals": 6,
+    "blockchain": "Cosmos",
+    "derivation": [
+      {
+        "path": "m/44'/483'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "bluzelle",
+    "addressHasher": "sha256ripemd",
+    "explorer": {
+      "url": "https://bigdipper.net.bluzelle.com",
+      "txPath": "/transactions/",
+      "accountPath": "/account/",
+      "sampleTx": "AC026E0EC6E33A77D5EA6B9CEF9810699BC2AD8C5582E007E7857457C6D3B819",
+      "sampleAccount": "bluzelle1q9cryfal7u3jvnq6er5ufety20xtzw6ycx2te9"
+    },
+    "info": {
+      "url": "https://bluzelle.com",
+      "source": "https://github.com/bluzelle",
+      "rpc": "https://bluzelle.github.io/api/",
+      "documentation": "https://docs.bluzelle.com/developers/"
+    }
+  },
+  {
+    "id": "band",
+    "name": "BandChain",
+    "symbol": "BAND",
+    "coinId": 494,
+    "decimals": 6,
+    "blockchain": "Cosmos",
+    "chainId": "laozi-mainnet",
+    "derivation": [
+      {
+        "path": "m/44'/494'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "band",
+    "addressHasher": "sha256ripemd",
+    "explorer": {
+      "url": "https://www.mintscan.io/band",
+      "txPath": "/tx/",
+      "accountPath": "/account/",
+      "sampleTx": "74AF38C2183B06EB6274DA4AAC0D2334E6E283643D436852F5E088AEA2CD0B17",
+      "sampleAccount": "band16gpgu994g2gdrzvwp9047le3pcq9wz6mcgtd4w"
+    },
+    "info": {
+      "url": "https://bandprotocol.com/",
+      "source": "https://github.com/bandprotocol/bandchain",
+      "rpc": "https://api-wt2-lb.bandchain.org",
+      "documentation": "https://docs.bandchain.org/"
+    }
+  },
+  {
+    "id": "theta",
+    "name": "Theta",
+    "coinId": 500,
+    "symbol": "THETA",
+    "decimals": 18,
+    "blockchain": "Theta",
+    "derivation": [
+      {
+        "path": "m/44'/500'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "explorer": {
+      "url": "https://explorer.thetatoken.org",
+      "txPath": "/txs/",
+      "accountPath": "/account/"
+    },
+    "info": {
+      "url": "https://www.thetatoken.org",
+      "source": "https://github.com/thetatoken/theta-protocol-ledger",
+      "rpc": "",
+      "documentation": "https://github.com/thetatoken/theta-mainnet-integration-guide/blob/master/docs/api.md#api-reference"
+    }
+  },
+  {
+    "id": "tfuelevm",
+    "name": "Theta Fuel",
+    "coinId": 361,
+    "symbol": "TFUEL",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/500'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "361",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://explorer.thetatoken.org",
+      "txPath": "/tx/",
+      "accountPath": "/account/",
+      "sampleTx": "0xdb1c1c4e06289a4fc71b98ced218242d4f4a54a09987791a6a53a5260c053555",
+      "sampleAccount": "0xa144e6a98b967e585b214bfa7f6692af81987e5b"
+    },
+    "info": {
+      "url": "https://www.thetatoken.org",
+      "source": "https://github.com/thetatoken/theta-protocol-ledger",
+      "rpc": "https://eth-rpc-api.thetatoken.org/rpc",
+      "documentation": "https://github.com/thetatoken/theta-mainnet-integration-guide/blob/master/docs/api.md#api-reference"
+    }
+  },
+  {
+    "id": "solana",
+    "name": "Solana",
+    "coinId": 501,
+    "symbol": "SOL",
+    "decimals": 9,
+    "blockchain": "Solana",
+    "derivation": [
+      {
+        "path": "m/44'/501'/0'"
+      },
+      {
+        "name": "solana",
+        "path": "m/44'/501'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "explorer": {
+      "url": "https://solscan.io",
+      "txPath": "/tx/",
+      "accountPath": "/account/",
+      "sampleTx": "5LmxrEKGchhMuYfw6Qut6CbsvE9pVfb8YvwZKvWssSesDVjHioBCmWKSJQh1WhvcM6CpemhpHNmEMA2a36rzwTa8",
+      "sampleAccount": "Bxp8yhH9zNwxyE4UqxP7a7hgJ5xTZfxNNft7YJJ2VRjT"
+    },
+    "info": {
+      "url": "https://solana.com",
+      "source": "https://github.com/solana-labs/solana",
+      "rpc": "https://api.mainnet-beta.solana.com",
+      "documentation": "https://docs.solana.com"
+    }
+  },
+  {
+    "id": "elrond",
+    "name": "MultiversX",
+    "coinId": 508,
+    "symbol": "eGLD",
+    "decimals": 18,
+    "blockchain": "MultiversX",
+    "derivation": [
+      {
+        "path": "m/44'/508'/0'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "hrp": "erd",
+    "explorer": {
+      "url": "https://explorer.multiversx.com",
+      "txPath": "/transactions/",
+      "accountPath": "/accounts/"
+    },
+    "info": {
+      "url": "https://multiversx.com/",
+      "source": "https://github.com/multiversx/mx-chain-go",
+      "rpc": "https://api.multiversx.com",
+      "documentation": "https://docs.multiversx.com"
+    }
+  },
+  {
+    "id": "binance",
+    "name": "Binance",
+    "displayName": "BNB Beacon Chain",
+    "coinId": 714,
+    "symbol": "BNB",
+    "decimals": 8,
+    "blockchain": "Binance",
+    "derivation": [
+      {
+        "path": "m/44'/714'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "addressHasher": "sha256ripemd",
+    "hrp": "bnb",
+    "chainId": "Binance-Chain-Tigris",
+    "explorer": {
+      "url": "https://explorer.binance.org",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "A93625C9F9ABEA1A8E31585B30BBB16C34FAE0D172EB5B6B2F834AF077BF06BB",
+      "sampleAccount": "bnb1u7jm0cll5h3224y0tapwn6gf6pr49ytewx4gsz"
+    },
+    "info": {
+      "url": "https://www.bnbchain.org",
+      "source": "https://github.com/bnb-chain/node-binary",
+      "rpc": "https://dex.binance.org",
+      "documentation": "https://docs.bnbchain.org/docs/beaconchain/develop/api-reference/dex-api/paths"
+    }
+  },
+  {
+    "id": "tbinance",
+    "name": "TBinance",
+    "displayName": "TBNB",
+    "coinId": 30000714,
+    "slip44": 714,
+    "symbol": "BNB",
+    "decimals": 8,
+    "blockchain": "Binance",
+    "derivation": [
+      {
+        "path": "m/44'/714'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "addressHasher": "sha256ripemd",
+    "hrp": "tbnb",
+    "explorer": {
+      "url": "https://testnet-explorer.binance.org",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "92E9DA1B6D603667E2DE83C0AC0C1D9E6D65405AD642DA794421C64A82A078D0",
+      "sampleAccount": "tbnb1c2cxgv3cklswxlvqr9anm6mlp6536qnd36txgr"
+    },
+    "info": {
+      "url": "https://www.bnbchain.org",
+      "source": "https://github.com/bnb-chain/node-binary",
+      "rpc": "https://testnet-dex.binance.org",
+      "documentation": "https://docs.bnbchain.org/docs/beaconchain/develop/api-reference/dex-api/paths-testnet"
+    }
+  },
+  {
+    "id": "vechain",
+    "name": "VeChain",
+    "coinId": 818,
+    "symbol": "VET",
+    "decimals": 18,
+    "blockchain": "Vechain",
+    "derivation": [
+      {
+        "path": "m/44'/818'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "74",
+    "explorer": {
+      "url": "https://explore.vechain.org",
+      "txPath": "/transactions/",
+      "accountPath": "/accounts/",
+      "sampleTx": "0xa424053be0063555aee73a595ca69968c2e4d90d36f280753e503b92b11a655d",
+      "sampleAccount": "0x8a0a035a33173601bfbec8b6ae7c4a6557a55103"
+    },
+    "info": {
+      "url": "https://vechain.org",
+      "source": "https://github.com/vechain/thor",
+      "rpc": "",
+      "documentation": "https://doc.vechainworld.io/docs"
+    }
+  },
+  {
+    "id": "callisto",
+    "name": "Callisto",
+    "coinId": 820,
+    "symbol": "CLO",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/820'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "820",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://explorer.callisto.network",
+      "txPath": "/tx/",
+      "accountPath": "/addr/"
+    },
+    "info": {
+      "url": "https://callisto.network",
+      "source": "https://github.com/EthereumCommonwealth/go-callisto",
+      "rpc": "https://clo-geth.0xinfra.com",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "neo",
+    "name": "NEO",
+    "coinId": 888,
+    "symbol": "NEO",
+    "decimals": 8,
+    "blockchain": "NEO",
+    "derivation": [
+      {
+        "path": "m/44'/888'/0'/0/0"
+      }
+    ],
+    "curve": "nist256p1",
+    "publicKeyType": "nist256p1",
+    "explorer": {
+      "url": "https://neoscan.io",
+      "txPath": "/transaction/",
+      "accountPath": "/address/",
+      "sampleTx": "e0ddf7c81c732df26180aca0c36d5868ad009fdbbe6e7a56ebafc14bba41cd53",
+      "sampleAccount": "AcxuqWhTureEQGeJgbmtSWNAtssjMLU7pb"
+    },
+    "info": {
+      "url": "https://neo.org",
+      "source": "https://github.com/neo-project/neo",
+      "rpc": "http://seed1.ngd.network:10332",
+      "documentation": "https://neo.org/eco"
+    }
+  },
+  {
+    "id": "viction",
+    "name": "Viction",
+    "coinId": 889,
+    "symbol": "VIC",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/889'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "88",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://www.vicscan.xyz",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x35a8d3ab06c94d5b7d27221b7c9a24ba3f1710dd0fcfd75c5d59b3a885fd709b",
+      "sampleAccount": "0x86cCbD9bfb371c355202086882bC644A7D0b024B"
+    },
+    "info": {
+      "url": "https://www.viction.xyz/",
+      "source": "https://github.com/BuildOnViction/tomochain",
+      "rpc": "https://rpc.tomochain.com",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "bitcoindiamond",
+    "name": "Bitcoin Diamond",
+    "coinId": 999,
+    "symbol": "BCD",
+    "decimals": 7,
+    "blockchain": "BitcoinDiamond",
+    "derivation": [
+      {
+        "path": "m/84'/999'/0'/0/0",
+        "xpub": "zpub",
+        "xprv": "zprv"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "p2pkhPrefix": 0,
+    "p2shPrefix": 5,
+    "hrp": "bcd",
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
+    "explorer": {
+      "url": "http://explorer.btcd.io/#",
+      "txPath": "/tx?tx=",
+      "accountPath": "/address?address=",
+      "sampleTx": "ec564fe8993ba77f3f5c8b7f6ebb4cbc08e564a54612d6f4584cd1017cf723d4",
+      "sampleAccount": "1HNTyntGXNhy4WxNzWfffPqp7LHb8bGJ9R"
+    },
+    "info": {
+      "url": "https://www.bitcoindiamond.org",
+      "source": "https://github.com/trezor/blockbook",
+      "rpc": "",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
+    }
+  },
+  {
+    "id": "thundertoken",
+    "name": "ThunderCore",
+    "coinId": 1001,
+    "symbol": "TT",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/1001'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "108",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://scan.thundercore.com",
+      "txPath": "/transactions/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://thundercore.com",
+      "source": "https://github.com/thundercore/pala",
+      "rpc": "https://mainnet-rpc.thundercore.com",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "harmony",
+    "name": "Harmony",
+    "coinId": 1023,
+    "symbol": "ONE",
+    "decimals": 18,
+    "blockchain": "Harmony",
+    "derivation": [
+      {
+        "path": "m/44'/1023'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "hrp": "one",
+    "explorer": {
+      "url": "https://explorer.harmony.one",
+      "txPath": "/#/tx/",
+      "accountPath": "/#/address/"
+    },
+    "info": {
+      "url": "https://harmony.one",
+      "source": "https://github.com/harmony-one/go-sdk",
+      "rpc": "",
+      "documentation": "https://docs.harmony.one/home/harmony-networks/harmony-network-overview/mainnet"
+    }
+  },
+  {
+    "id": "oasis",
+    "name": "Oasis",
+    "coinId": 474,
+    "symbol": "ROSE",
+    "decimals": 9,
+    "blockchain": "OasisNetwork",
+    "derivation": [
+      {
+        "path": "m/44'/474'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "hrp": "oasis",
+    "explorer": {
+      "url": "https://oasisscan.com",
+      "txPath": "/transactions/",
+      "accountPath": "/accounts/detail/",
+      "sampleTx": "73dc977fdd8596d4a57e6feb891b21f5da3652d26815dc94f15f7420c298e29e",
+      "sampleAccount": "oasis1qrx376dmwuckmruzn9vq64n49clw72lywctvxdf4"
+    },
+    "info": {
+      "url": "https://oasisprotocol.org/",
+      "source": "https://github.com/oasisprotocol/oasis-core",
+      "rpc": "https://rosetta.oasis.dev/api/v1",
+      "documentation": "https://docs.oasis.dev/oasis-core/"
+    }
+  },
+  {
+    "id": "ontology",
+    "name": "Ontology",
+    "coinId": 1024,
+    "symbol": "ONT",
+    "decimals": 0,
+    "blockchain": "Ontology",
+    "derivation": [
+      {
+        "path": "m/44'/1024'/0'/0/0"
+      }
+    ],
+    "curve": "nist256p1",
+    "publicKeyType": "nist256p1",
+    "explorer": {
+      "url": "https://explorer.ont.io",
+      "txPath": "/transaction/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://ont.io",
+      "source": "https://github.com/ontio/ontology",
+      "rpc": "http://dappnode1.ont.io:20336",
+      "documentation": "https://github.com/ontio/ontology/blob/master/docs/specifications/rpc_api.md"
+    }
+  },
+  {
+    "id": "tezos",
+    "name": "Tezos",
+    "coinId": 1729,
+    "symbol": "XTZ",
+    "decimals": 6,
+    "blockchain": "Tezos",
+    "derivation": [
+      {
+        "path": "m/44'/1729'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "explorer": {
+      "url": "https://tzstats.com",
+      "txPath": "/",
+      "accountPath": "/",
+      "sampleTx": "onk3Z6V4StyfiXTPSHwZFvTKVAaws37cHmZacmULPr3VbVHpKrg",
+      "sampleAccount": "tz1SiPXX4MYGNJNDsRc7n8hkvUqFzg8xqF9m"
+    },
+    "info": {
+      "url": "https://tezos.com",
+      "source": "https://gitlab.com/tezos/tezos",
+      "rpc": "https://rpc.tulip.tools/mainnet",
+      "documentation": "https://tezos.gitlab.io/tezos/api/rpc.html"
+    }
+  },
+  {
+    "id": "cardano",
+    "name": "Cardano",
+    "coinId": 1815,
+    "symbol": "ADA",
+    "decimals": 6,
+    "blockchain": "Cardano",
+    "derivation": [
+      {
+        "path": "m/1852'/1815'/0'/0/0"
+      }
+    ],
+    "curve": "ed25519ExtendedCardano",
+    "publicKeyType": "ed25519Cardano",
+    "hrp": "addr",
+    "explorer": {
+      "url": "https://cardanoscan.io",
+      "txPath": "/transaction/",
+      "accountPath": "/address/",
+      "sampleTx": "b7a6c5cadab0f64bdc89c77ee4a351463aba5c33f2cef6bbd6542a74a90a3af3",
+      "sampleAccount": "DdzFFzCqrhstpwKc8WMvPwwBb5oabcTW9zc5ykA37wJR4tYQucvsR9dXb2kEGNXkFJz2PtrpzfRiZkx8R1iNo8NYqdsukVmv7EAybFwC"
+    },
+    "info": {
+      "url": "https://www.cardano.org",
+      "source": "https://github.com/input-output-hk/cardano-sl",
+      "rpc": "",
+      "documentation": "https://cardanodocs.com/introduction/"
+    }
+  },
+  {
+    "id": "kin",
+    "name": "Kin",
+    "coinId": 2017,
+    "symbol": "KIN",
+    "decimals": 5,
+    "blockchain": "Stellar",
+    "derivation": [
+      {
+        "path": "m/44'/2017'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "explorer": {
+      "url": "https://www.kin.org",
+      "txPath": "/blockchainInfoPage/?&dataType=public&header=Transaction&id=",
+      "accountPath": "/blockchainAccount/?&dataType=public&header=accountID&id="
+    },
+    "info": {
+      "url": "https://www.kin.org",
+      "source": "https://github.com/kinecosystem/go",
+      "rpc": "https://horizon.kinfederation.com",
+      "documentation": "https://www.stellar.org/developers/horizon/reference"
+    },
+    "deprecated": true
+  },
+  {
+    "id": "qtum",
+    "name": "Qtum",
+    "coinId": 2301,
+    "symbol": "QTUM",
+    "decimals": 8,
+    "blockchain": "Bitcoin",
+    "derivation": [
+      {
+        "path": "m/44'/2301'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "p2pkhPrefix": 58,
+    "p2shPrefix": 50,
+    "hrp": "qc",
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
+    "explorer": {
+      "url": "https://qtum.info",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://qtum.org",
+      "source": "https://github.com/trezor/blockbook",
+      "rpc": "",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
+    }
+  },
+  {
+    "id": "nebulas",
+    "name": "Nebulas",
+    "coinId": 2718,
+    "symbol": "NAS",
+    "decimals": 18,
+    "blockchain": "Nebulas",
+    "derivation": [
+      {
+        "path": "m/44'/2718'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "explorer": {
+      "url": "https://explorer.nebulas.io",
+      "txPath": "/#/tx/",
+      "accountPath": "/#/address/"
+    },
+    "info": {
+      "url": "https://nebulas.io",
+      "source": "https://github.com/nebulasio/go-nebulas",
+      "rpc": "https://mainnet.nebulas.io",
+      "documentation": "https://wiki.nebulas.io/en/latest/dapp-development/rpc/rpc.html"
+    }
+  },
+  {
+    "id": "gochain",
+    "name": "GoChain",
+    "coinId": 6060,
+    "symbol": "GO",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/6060'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "60",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://explorer.gochain.io",
+      "txPath": "/tx/",
+      "accountPath": "/addr/"
+    },
+    "info": {
+      "url": "https://gochain.io",
+      "source": "https://github.com/gochain-io/gochain",
+      "rpc": "https://rpc.gochain.io",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "nuls",
+    "name": "NULS",
+    "coinId": 8964,
+    "symbol": "NULS",
+    "decimals": 8,
+    "blockchain": "NULS",
+    "derivation": [
+      {
+        "path": "m/44'/8964'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "explorer": {
+      "url": "https://nulscan.io",
+      "txPath": "/transaction/info?hash=",
+      "accountPath": "/address/info?address=",
+      "sampleTx": "303e0e42c28acc37ba952a1effd43daa1caec79928054f7abefb21c32e6fdc02",
+      "sampleAccount": "NULSd6HgdSjUZy7jKMZfvQ5QU6Z97oufGTGcF"
+    },
+    "info": {
+      "url": "https://nuls.io",
+      "source": "https://github.com/nuls-io/nuls-v2",
+      "rpc": "https://public1.nuls.io/",
+      "documentation": "https://docs.nuls.io/"
+    }
+  },
+  {
+    "id": "zelcash",
+    "name": "Zelcash",
+    "displayName": "Flux",
+    "coinId": 19167,
+    "symbol": "FLUX",
+    "decimals": 8,
+    "blockchain": "Zcash",
+    "derivation": [
+      {
+        "path": "m/44'/19167'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "staticPrefix": 28,
+    "p2pkhPrefix": 184,
+    "p2shPrefix": 189,
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
+    "explorer": {
+      "url": "https://explorer.runonflux.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://runonflux.io",
+      "source": "https://github.com/trezor/blockbook",
+      "rpc": "https://blockbook.runonflux.io",
+      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
+    }
+  },
+  {
+    "id": "wanchain",
+    "name": "Wanchain",
+    "coinId": 5718350,
+    "symbol": "WAN",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/5718350'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "888",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://www.wanscan.org",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x180ea96a3218b82b9b35d796823266d8a425c182507adfe5eeffc96e6a14d856",
+      "sampleAccount": "0x69B492D57bb777e97aa7044D0575228434e2E8B1"
+    },
+    "info": {
+      "url": "https://wanchain.org",
+      "source": "https://github.com/wanchain/go-wanchain",
+      "rpc": "",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "waves",
+    "name": "Waves",
+    "coinId": 5741564,
+    "symbol": "WAVES",
+    "decimals": 8,
+    "blockchain": "Waves",
+    "derivation": [
+      {
+        "path": "m/44'/5741564'/0'/0'/0'"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "curve25519",
+    "explorer": {
+      "url": "https://wavesexplorer.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://wavesplatform.com",
+      "source": "https://github.com/wavesplatform/Waves",
+      "rpc": "https://nodes.wavesnodes.com",
+      "documentation": "https://nodes.wavesnodes.com/api-docs/index.html"
+    }
+  },
+  {
+    "id": "bsc",
+    "name": "Smart Chain Legacy",
+    "coinId": 10000714,
+    "slip44": 714,
+    "symbol": "BNB",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/714'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "56",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://bscscan.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xb9ae2e808fe8e57171f303ad8f6e3fd17d949b0bfc7b4db6e8e30a71cc517d7e",
+      "sampleAccount": "0x35552c16704d214347f29Fa77f77DA6d75d7C752"
+    },
+    "info": {
+      "url": "https://www.binance.org/en/smartChain",
+      "source": "https://github.com/binance-chain/bsc",
+      "rpc": "https://data-seed-prebsc-1-s1.binance.org:8545",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    },
+    "deprecated": true,
+    "testFolderName": "Binance"
+  },
+  {
+    "id": "smartchain",
+    "name": "Smart Chain",
+    "displayName": "BNB Smart Chain",
+    "coinId": 20000714,
+    "slip44": 714,
+    "symbol": "BNB",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "56",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://bscscan.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xb9ae2e808fe8e57171f303ad8f6e3fd17d949b0bfc7b4db6e8e30a71cc517d7e",
+      "sampleAccount": "0x35552c16704d214347f29Fa77f77DA6d75d7C752"
+    },
+    "info": {
+      "url": "https://www.binance.org/en/smartChain",
+      "source": "https://github.com/binance-chain/bsc",
+      "rpc": "https://bsc-dataseed1.binance.org",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    },
+    "testFolderName": "Binance"
+  },
+  {
+    "id": "polygon",
+    "name": "Polygon",
+    "coinId": 966,
+    "symbol": "POL",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "137",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://polygonscan.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xe26ed1470d5bf99a53d687843e7acdf7e4ba6620af93b4d672e714de90476e8e",
+      "sampleAccount": "0x720E1fa107A1Df39Db4E78A3633121ac36Bec132"
+    },
+    "info": {
+      "url": "https://polygon.technology",
+      "source": "https://github.com/maticnetwork",
+      "rpc": "https://polygon-rpc.com",
+      "documentation": "https://docs.polygon.technology"
+    }
+  },
+  {
+    "id": "rootstock",
+    "name": "Rootstock",
+    "coinId": 137,
+    "symbol": "RBTC",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/137'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "30",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://explorer.rsk.co",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xeb8fa0488a655f8dc975153bffd066800bcaae5f21cf372356365b2a1d6d2288",
+      "sampleAccount": "0x4e5dabc28e4a0f5e5b19fcb56b28c5a1989352c1"
+    },
+    "info": {
+      "url": "https://rootstock.io",
+      "source": "https://github.com/rsksmart/rskj",
+      "rpc": "https://public-node.rsk.co",
+      "documentation": "https://dev.rootstock.io"
+    }
+  },
+  {
+    "id": "thorchain",
+    "name": "THORChain",
+    "coinId": 931,
+    "symbol": "RUNE",
+    "decimals": 8,
+    "blockchain": "Thorchain",
+    "derivation": [
+      {
+        "path": "m/44'/931'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "thor",
+    "addressHasher": "sha256ripemd",
+    "chainId": "thorchain-mainnet-v1",
+    "explorer": {
+      "url": "https://viewblock.io/thorchain",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "ADF0899E58C177E2391F22D04E9C5E1C35BB0F75B42B363A0761687907FD9476",
+      "sampleAccount": "thor196yf4pq80hjrmz7nnh0ar0ypqg02r0w4dq4mzu"
+    },
+    "info": {
+      "url": "https://thorchain.org",
+      "source": "https://gitlab.com/thorchain/thornode",
+      "rpc": "https://seed.thorchain.info",
+      "documentation": "https://docs.thorchain.org"
+    }
+  },
+  {
+    "id": "optimism",
+    "name": "Optimism",
+    "displayName": "OP Mainnet",
+    "coinId": 10000070,
+    "slip44": 60,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "10",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://optimistic.etherscan.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x6fd99288be9bf71eb002bb31da10a4fb0fbbb3c45ae73693b212f49c9db7df8f",
+      "sampleAccount": "0x1f932361e31d206b4f6b2478123a9d0f8c761031"
+    },
+    "info": {
+      "url": "https://optimism.io/",
+      "source": "https://github.com/ethereum-optimism/optimism",
+      "rpc": "https://mainnet.optimism.io",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "polygonzkevm",
+    "name": "Polygon zkEVM",
+    "displayName": "Polygon zkEVM",
+    "coinId": 10001101,
+    "slip44": 60,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "1101",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://zkevm.polygonscan.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://www.polygon.technology/",
+      "source": "https://github.com/0xpolygonhermez",
+      "rpc": "https://zkevm-rpc.com",
+      "documentation": "https://wiki.polygon.technology/docs/zkEVM/introduction/"
+    }
+  },
+  {
+    "id": "zksync",
+    "name": "Zksync",
+    "displayName": "zkSync Era",
+    "coinId": 10000324,
+    "slip44": 60,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "324",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://explorer.zksync.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://portal.zksync.io/",
+      "source": "https://github.com/matter-labs/zksync",
+      "rpc": "https://zksync2-mainnet.zksync.io",
+      "documentation": "https://era.zksync.io/docs"
+    }
+  },
+  {
+    "id": "scroll",
+    "name": "Scroll",
+    "displayName": "Scroll",
+    "coinId": 534352,
+    "slip44": 60,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "534352",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://scrollscan.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xa2062a4530b194a438bb9f9e87cdce59f70775a52e8336892364445847c43ca2",
+      "sampleAccount": "0xf9062b8a30e0d7722960e305049fa50b86ba6253"
+    },
+    "info": {
+      "url": "https://scroll.io",
+      "source": "https://github.com/scroll-tech",
+      "rpc": "https://rpc.scroll.io",
+      "documentation": "https://guide.scroll.io"
+    }
+  },
+  {
+    "id": "arbitrum",
+    "name": "Arbitrum",
+    "coinId": 10042221,
+    "slip44": 60,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "42161",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://arbiscan.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xa1e319be22c08155e5904aa211fb87df5f4ade48de79c6578b1cf3dfda9e498c",
+      "sampleAccount": "0xecf9ffa7f51e1194f89c25ad8c484f6bfd04e1ac"
+    },
+    "info": {
+      "url": "https://arbitrum.io",
+      "source": "https://github.com/OffchainLabs/arbitrum",
+      "rpc": "https://arb1.arbitrum.io/rpc",
+      "documentation": "https://docs.arbitrum.io/"
+    }
+  },
+  {
+    "id": "arbitrumnova",
+    "name": "Arbitrum Nova",
+    "coinId": 10042170,
+    "slip44": 60,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "42170",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://nova.arbiscan.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xfdfee13848c2d21813c82c53afc9925f31770564c3117477960a81055702c1be",
+      "sampleAccount": "0x0d0707963952f2fba59dd06f2b425ace40b492fe"
+    },
+    "info": {
+      "url": "https://nova.arbitrum.io",
+      "source": "https://github.com/OffchainLabs/arbitrum",
+      "rpc": "https://nova.arbitrum.io/rpc",
+      "documentation": "https://docs.arbitrum.io/"
+    }
+  },
+  {
+    "id": "heco",
+    "name": "ECO Chain",
+    "displayName": "Huobi ECO Chain",
+    "coinId": 10000553,
+    "slip44": 553,
+    "symbol": "HT",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "128",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://hecoinfo.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://www.hecochain.com/en-us",
+      "source": "https://github.com/HuobiGroup/huobi-eco-chain",
+      "rpc": "https://http-mainnet-node.huobichain.com",
+      "documentation": "https://eth.wiki/json-rpc/API"
+    },
+    "testFolderName": "ECO"
+  },
+  {
+    "id": "avalanchec",
+    "name": "Avalanche C-Chain",
+    "coinId": 10009000,
+    "symbol": "AVAX",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "43114",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://snowtrace.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x9243890b844219accefd8798271052f5a056453ec18984a56e81c92921330d54",
+      "sampleAccount": "0xa664325f36Ec33E66323fe2620AF3f2294b2Ef3A"
+    },
+    "info": {
+      "url": "https://www.avalabs.org/",
+      "client": "https://github.com/ava-labs/avalanchego",
+      "clientPublic": "https://api.avax.network/ext/bc/C/rpc",
+      "clientDocs": "https://docs.avax.network/"
+    },
+    "testFolderName": "Avalanche"
+  },
+  {
+    "id": "xdai",
+    "name": "xDai",
+    "displayName": "Gnosis Chain",
+    "coinId": 10000100,
+    "symbol": "xDAI",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "100",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://blockscout.com/xdai/mainnet",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x936798a1ef607c9e856d7861b15999c770c06f0887c4fc1f6acbf3bef09899c1",
+      "sampleAccount": "0x12d61a95CF55e18D267C2F1AA67d8e42ae1368f8"
+    },
+    "info": {
+      "url": "https://www.xdaichain.com",
+      "client": "https://github.com/openethereum/openethereum",
+      "clientPublic": "https://rpc.gnosischain.com",
+      "clientDocs": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "fantom",
+    "name": "Fantom",
+    "coinId": 10000250,
+    "symbol": "FTM",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
       {
-        "path": "m/44'/2017'/0'"
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "ed25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "250",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://www.kin.org",
-      "txPath": "/blockchainInfoPage/?&dataType=public&header=Transaction&id=",
-      "accountPath": "/blockchainAccount/?&dataType=public&header=accountID&id="
+      "url": "https://ftmscan.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xb0a741d882291951de1fac72e90b9baf886ddb0c9c87658a0c206490dfaa5202",
+      "sampleAccount": "0x9474feb9917b87da6f0d830ba66ee0035835c0d3"
     },
     "info": {
-      "url": "https://www.kin.org",
-      "source": "https://github.com/kinecosystem/go",
-      "rpc": "https://horizon.kinfederation.com",
-      "documentation": "https://www.stellar.org/developers/horizon/reference"
-    },
-    "deprecated": true
+      "url": "https://fantom.foundation",
+      "client": "https://github.com/openethereum/openethereum",
+      "clientPublic": "https://rpc.ftm.tools",
+      "clientDocs": "https://eth.wiki/json-rpc/API"
+    }
   },
   {
-    "id": "qtum",
-    "name": "Qtum",
-    "coinId": 2301,
-    "symbol": "QTUM",
+    "id": "cryptoorg",
+    "name": "CryptoOrg",
+    "displayName": "Crypto.org",
+    "coinId": 394,
+    "symbol": "CRO",
     "decimals": 8,
-    "blockchain": "Bitcoin",
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/2301'/0'/0/0",
+        "path": "m/44'/394'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "cro",
+    "chainId": "crypto-org-chain-mainnet-1",
+    "addressHasher": "sha256ripemd",
+    "explorer": {
+      "url": "https://crypto.org/explorer",
+      "txPath": "/tx/",
+      "accountPath": "/account/",
+      "sampleTx": "D87D2EB46B21466886EE149C1DEA3AE6C2E019C7D8C24FA1533A95439DDCE1E2",
+      "sampleAccount": "cro10wrflcdc4pys9vvgqm98yg7yv5ltj7d3xehent"
+    },
+    "info": {
+      "url": "https://crypto.org/",
+      "client": "https://github.com/crypto-org-chain/chain-main",
+      "clientPublic": "https://mainnet.crypto.org:1317/",
+      "clientDocs": "https://crypto.org/docs/resources/chain-integration.html#api-documentation"
+    }
+  },
+  {
+    "id": "celo",
+    "name": "Celo",
+    "coinId": 52752,
+    "symbol": "CELO",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "42220",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://explorer.celo.org",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xaf41ee58afe633dc7b179c15693cca40fe0372c1d7c70351620105d59d326693",
+      "sampleAccount": "0xFBFf95e2Fa7e4Ff3aeA34eFB05fB60F9968a6aaD"
+    },
+    "info": {
+      "url": "https://celo.org",
+      "client": "https://github.com/celo-org/celo-blockchain",
+      "clientPublic": "https://forno.celo.org",
+      "clientDocs": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "ronin",
+    "name": "Ronin",
+    "coinId": 10002020,
+    "slip44": 60,
+    "symbol": "RON",
+    "decimals": 18,
+    "blockchain": "Ronin",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "2020",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://explorer.roninchain.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xc09835aaf9c1cacea8ce322865583c791d3a4dfbd9a3b72f79539db88d3697ab",
+      "sampleAccount": "0xdc05ecd5fbdb64058d94f3182d66f44342b9adcb"
+    },
+    "info": {
+      "url": "https://whitepaper.axieinfinity.com/technology/ronin-ethereum-sidechain",
+      "client": "https://github.com/axieinfinity/ronin-smart-contracts",
+      "clientPublic": "https://api.roninchain.com/rpc",
+      "clientDocs": "https://eth.wiki/json-rpc/API"
+    }
+  },
+  {
+    "id": "secret",
+    "name": "Secret",
+    "displayName": "Secret",
+    "coinId": 529,
+    "symbol": "SCRT",
+    "decimals": 6,
+    "blockchain": "Cosmos",
+    "derivation": [
+      {
+        "path": "m/44'/529'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "secret",
+    "chainId": "secret-4",
+    "addressHasher": "sha256ripemd",
+    "explorer": {
+      "url": "https://mintscan.io/secret",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "026B4886B1D9CE836A99755DDE99D4F8A7748D27B1CE9D298A763B1CFFF62C00",
+      "sampleAccount": "secret167m3s89ddurjpyr82vsluvvj0t8ylzn95trrqy"
+    },
+    "info": {
+      "url": "https://scrt.network/",
+      "source": "https://github.com/scrtlabs/SecretNetwork",
+      "rpc": "https://scrt-rpc.blockpane.com/",
+      "documentation": "https://docs.scrt.network/"
+    }
+  },
+  {
+    "id": "osmosis",
+    "name": "Osmosis",
+    "displayName": "Osmosis",
+    "coinId": 10000118,
+    "symbol": "OSMO",
+    "decimals": 6,
+    "blockchain": "Cosmos",
+    "derivation": [
+      {
+        "path": "m/44'/118'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1",
+    "hrp": "osmo",
+    "chainId": "osmosis-1",
+    "addressHasher": "sha256ripemd",
+    "explorer": {
+      "url": "https://mintscan.io/osmosis",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "5A6E50A6F2927E4B8C87BB094D5FBF15F1287429A09111806FC44B3CD86CACA8",
+      "sampleAccount": "osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5"
+    },
+    "info": {
+      "url": "https://osmosis.zone/",
+      "client": "https://github.com/osmosis-labs/osmosis",
+      "clientPublic": "https://rpc-osmosis.keplr.app/",
+      "clientDocs": ""
+    }
+  },
+  {
+    "id": "ecash",
+    "name": "eCash",
+    "coinId": 899,
+    "symbol": "XEC",
+    "decimals": 2,
+    "blockchain": "BitcoinCash",
+    "derivation": [
+      {
+        "path": "m/44'/899'/0'/0/0",
         "xpub": "xpub",
         "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "p2pkhPrefix": 58,
-    "p2shPrefix": 50,
-    "hrp": "qc",
+    "p2pkhPrefix": 0,
+    "p2shPrefix": 5,
+    "hrp": "ecash",
     "publicKeyHasher": "sha256ripemd",
     "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://qtum.info",
+      "url": "https://explorer.bitcoinabc.org",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/address/",
+      "sampleTx": "6bc767e69cfacffd954c9e5acd178d3140bf00d094b92c6f6052b517500c553b",
+      "sampleAccount": "ecash:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdg2jj94l5j"
     },
     "info": {
-      "url": "https://qtum.org",
+      "url": "https://e.cash",
       "source": "https://github.com/trezor/blockbook",
-      "rpc": "",
+      "rpc": "https://blockbook.fabien.cash:9197",
       "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
     }
   },
   {
-    "id": "nebulas",
-    "name": "Nebulas",
-    "coinId": 2718,
-    "symbol": "NAS",
+    "id": "iost",
+    "name": "IOST",
+    "coinId": 291,
+    "symbol": "IOST",
+    "decimals": 2,
+    "blockchain": "IOST",
+    "derivation": [
+      {
+        "path": "m/44'/899'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
+      }
+    ],
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "p2pkhPrefix": 0,
+    "p2shPrefix": 5,
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
+    "explorer": {
+      "url": "https://explorer.iost.io",
+      "txPath": "/tx/",
+      "accountPath": "/account/",
+      "sampleTx": "7dKQzgTkPBNrZqrQ2Bqhqq132CHGPKANFDtzRsjHRCqx",
+      "sampleAccount": "4av8w81EyzUgHonsVWqfs15WM4Vrpgox4BYYQWhNQDVu"
+    },
+    "info": {
+      "url": "https://iost.io",
+      "source": "https://github.com/iost-official/go-iost",
+      "rpc": "",
+      "documentation": "https://developers.iost.io/docs/en/6-reference/API.html"
+    }
+  },
+  {
+    "id": "cronos",
+    "name": "Cronos Chain",
+    "coinId": 10000025,
+    "symbol": "CRO",
     "decimals": 18,
-    "blockchain": "Nebulas",
+    "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/2718'/0'/0/0"
+        "path": "m/44'/60'/0'/0/0"
+      }
+    ],
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "25",
+    "addressHasher": "keccak256",
+    "explorer": {
+      "url": "https://cronoscan.com",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
+    },
+    "info": {
+      "url": "https://cronos.org",
+      "client": "https://github.com/crypto-org-chain/cronos",
+      "clientPublic": "https://evm-cronos.crypto.org",
+      "clientDocs": "https://eth.wiki/json-rpc/API"
+    },
+    "testFolderName": "Cronos"
+  },
+  {
+    "id": "kavaevm",
+    "name": "KavaEvm",
+    "coinId": 10002222,
+    "symbol": "KAVA",
+    "decimals": 18,
+    "blockchain": "Ethereum",
+    "derivation": [
+      {
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
+    "chainId": "2222",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://explorer.nebulas.io",
-      "txPath": "/#/tx/",
-      "accountPath": "/#/address/"
+      "url": "https://explorer.kava.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/"
     },
     "info": {
-      "url": "https://nebulas.io",
-      "source": "https://github.com/nebulasio/go-nebulas",
-      "rpc": "https://mainnet.nebulas.io",
-      "documentation": "https://wiki.nebulas.io/en/latest/dapp-development/rpc/rpc.html"
+      "url": "https://www.kava.io/",
+      "client": "https://github.com/Kava-Labs/kava",
+      "documentation": "https://docs.kava.io/docs/ethereum/overview/",
+      "rpc": "https://evm.kava.io"
     }
   },
   {
-    "id": "gochain",
-    "name": "GoChain",
-    "coinId": 6060,
-    "symbol": "GO",
+    "id": "smartbch",
+    "name": "Smart Bitcoin Cash",
+    "coinId": 10000145,
+    "symbol": "BCH",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/6060'/0'/0/0"
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "60",
+    "chainId": "10000",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://explorer.gochain.io",
+      "url": "https://www.smartscan.cash",
       "txPath": "/tx/",
-      "accountPath": "/addr/"
+      "accountPath": "/address/",
+      "sampleTx": "0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9",
+      "sampleAccount": "0xFeEc227410E1DF9f3b4e6e2E284DC83051ae468F"
     },
     "info": {
-      "url": "https://gochain.io",
-      "source": "https://github.com/gochain-io/gochain",
-      "rpc": "https://rpc.gochain.io",
-      "documentation": "https://eth.wiki/json-rpc/API"
-    }
+      "url": "https://smartbch.org/",
+      "source": "https://github.com/smartbch/smartbch",
+      "rpc": "https://smartbch.fountainhead.cash/mainnet",
+      "documentation": "https://github.com/smartbch/docs/blob/main/developers-guide/jsonrpc.md"
+    },
+    "testFolderName": "Bitcoin"
   },
   {
-    "id": "nuls",
-    "name": "NULS",
-    "coinId": 8964,
-    "symbol": "NULS",
-    "decimals": 8,
-    "blockchain": "NULS",
+    "id": "kcc",
+    "name": "KuCoin Community Chain",
+    "coinId": 10000321,
+    "symbol": "KCS",
+    "decimals": 18,
+    "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/8964'/0'/0/0"
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "321",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://nulscan.io",
-      "txPath": "/transaction/info?hash=",
-      "accountPath": "/address/info?address="
+      "url": "https://explorer.kcc.io/en",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0x2f0d79cd289a02f3181b68b9583a64c3809fe7387810b274275985c29d02c80d",
+      "sampleAccount": "0x4446fc4eb47f2f6586f9faab68b3498f86c07521"
     },
     "info": {
-      "url": "https://nuls.io",
-      "source": "https://github.com/nuls-io/nuls-v2",
-      "rpc": "https://public1.nuls.io/",
-      "documentation": "https://docs.nuls.io/"
-    }
+      "url": "https://www.kcc.io/",
+      "source": "https://github.com/kcc-community/kcc",
+      "rpc": "https://rpc-mainnet.kcc.network",
+      "documentation": "https://docs.kcc.io/#/en-us/"
+    },
+    "testFolderName": "KuCoinCommunityChain"
   },
   {
-    "id": "zelcash",
-    "name": "Zelcash",
-    "displayName": "Flux",
-    "coinId": 19167,
-    "symbol": "FLUX",
-    "decimals": 8,
-    "blockchain": "Zcash",
+    "id": "boba",
+    "name": "Boba",
+    "coinId": 10000288,
+    "symbol": "BOBAETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/19167'/0'/0/0",
-        "xpub": "xpub",
-        "xprv": "xprv"
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1",
-    "staticPrefix": 28,
-    "p2pkhPrefix": 184,
-    "p2shPrefix": 189,
-    "publicKeyHasher": "sha256ripemd",
-    "base58Hasher": "sha256d",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "288",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://explorer.runonflux.io",
+      "url": "https://blockexplorer.boba.network",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/address/",
+      "sampleTx": "0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103",
+      "sampleAccount": "0x4F96F50eDB37a19216d87693E5dB241e31bD3735"
     },
     "info": {
-      "url": "https://runonflux.io",
-      "source": "https://github.com/trezor/blockbook",
-      "rpc": "https://blockbook.runonflux.io",
-      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
+      "url": "https://boba.network/",
+      "source": "https://github.com/bobanetwork/boba",
+      "rpc": "https://mainnet.boba.network",
+      "documentation": "https://docs.boba.network/"
     }
   },
   {
-    "id": "wanchain",
-    "name": "Wanchain",
-    "coinId": 5718350,
-    "symbol": "WAN",
+    "id": "metis",
+    "name": "Metis",
+    "coinId": 10001088,
+    "symbol": "METIS",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/5718350'/0'/0/0"
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "888",
+    "chainId": "1088",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://www.wanscan.org",
+      "url": "https://andromeda-explorer.metis.io",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0x180ea96a3218b82b9b35d796823266d8a425c182507adfe5eeffc96e6a14d856",
-      "sampleAccount": "0xc6D3DBf8dF90BA3f957A9634677805eee0e43bBe"
+      "sampleTx": "0x422f2ebbede32d4434ad0cf0ae55d44a84e14d3d5725a760133255b42676d8ce",
+      "sampleAccount": "0xBe9E8Ec25866B21bA34e97b9393BCabBcB4A5C86"
     },
     "info": {
-      "url": "https://wanchain.org",
-      "source": "https://github.com/wanchain/go-wanchain",
-      "rpc": "",
-      "documentation": "https://eth.wiki/json-rpc/API"
+      "url": "https://www.metis.io/",
+      "source": "https://github.com/MetisProtocol/mvm",
+      "rpc": "https://andromeda.metis.io/?owner=1088",
+      "documentation": "https://docs.metis.io/"
     }
   },
   {
-    "id": "waves",
-    "name": "Waves",
-    "coinId": 5741564,
-    "symbol": "WAVES",
-    "decimals": 8,
-    "blockchain": "Waves",
+    "id": "aurora",
+    "name": "Aurora",
+    "coinId": 1323161554,
+    "symbol": "ETH",
+    "decimals": 18,
+    "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/5741564'/0'/0'/0'"
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
-    "curve": "ed25519",
-    "publicKeyType": "curve25519",
+    "curve": "secp256k1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "1313161554",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://wavesexplorer.com",
+      "url": "https://aurorascan.dev",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/address/",
+      "sampleTx": "0x99deebdb70f8027037abb3d3d0f3c7523daee857d85e9056d2671593ff2f2f28",
+      "sampleAccount": "0x8707cdE20dd43E3dB1F74c28fcd509ef38B0bA51"
     },
     "info": {
-      "url": "https://wavesplatform.com",
-      "source": "https://github.com/wavesplatform/Waves",
-      "rpc": "https://nodes.wavesnodes.com",
-      "documentation": "https://nodes.wavesnodes.com/api-docs/index.html"
+      "url": "https://aurora.dev/",
+      "source": "https://github.com/aurora-is-near/aurora-engine",
+      "rpc": "https://mainnet.aurora.dev/",
+      "documentation": "https://doc.aurora.dev/"
     }
   },
   {
-    "id": "bsc",
-    "name": "Smart Chain Legacy",
-    "coinId": 10000714,
-    "slip44": 714,
-    "symbol": "BNB",
+    "id": "evmos",
+    "name": "Evmos",
+    "coinId": 10009001,
+    "symbol": "EVMOS",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/714'/0'/0/0"
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "56",
+    "chainId": "9001",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://bscscan.com",
+      "url": "https://evm.evmos.org",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0xb9ae2e808fe8e57171f303ad8f6e3fd17d949b0bfc7b4db6e8e30a71cc517d7e",
-      "sampleAccount": "0x35552c16704d214347f29Fa77f77DA6d75d7C752"
+      "sampleTx": "0x24af42cf4977a96d62e3a82c3cd9b519c3e7c53dd83398b88f0cb435d867b422",
+      "sampleAccount": "0x30627903124Aa1e71384bc52e1cb96E4AB3252b6"
     },
     "info": {
-      "url": "https://www.binance.org/en/smartChain",
-      "source": "https://github.com/binance-chain/bsc",
-      "rpc": "https://data-seed-prebsc-1-s1.binance.org:8545",
-      "documentation": "https://eth.wiki/json-rpc/API"
-    },
-    "deprecated": true,
-    "testFolderName" : "Binance"
+      "url": "https://evmos.org/",
+      "source": "https://github.com/tharsis/evmos",
+      "rpc": "https://eth.bd.evmos.org:8545",
+      "documentation": "https://docs.evmos.org/"
+    }
   },
   {
-    "id": "smartchain",
-    "name": "Smart Chain",
-    "displayName": "BNB Smart Chain",
-    "coinId": 20000714,
-    "slip44": 714,
-    "symbol": "BNB",
+    "id": "nativeevmos",
+    "name": "NativeEvmos",
+    "displayName": "Native Evmos",
+    "coinId": 20009001,
+    "symbol": "EVMOS",
     "decimals": 18,
-    "blockchain": "Ethereum",
+    "blockchain": "NativeEvmos",
+    "chainId": "evmos_9001-2",
     "derivation": [
       {
         "path": "m/44'/60'/0'/0/0"
@@ -1924,28 +3991,27 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "56",
+    "hrp": "evmos",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://bscscan.com",
-      "txPath": "/tx/",
-      "accountPath": "/address/",
-      "sampleTx": "0xb9ae2e808fe8e57171f303ad8f6e3fd17d949b0bfc7b4db6e8e30a71cc517d7e",
-      "sampleAccount": "0x35552c16704d214347f29Fa77f77DA6d75d7C752"
+      "url": "https://mintscan.io/evmos",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "A16C211C83AD1E684DE46F694FAAC17D8465C864BD7385A81EC062CDE0638811",
+      "sampleAccount": "evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34"
     },
     "info": {
-      "url": "https://www.binance.org/en/smartChain",
-      "source": "https://github.com/binance-chain/bsc",
-      "rpc": "https://bsc-dataseed1.binance.org",
-      "documentation": "https://eth.wiki/json-rpc/API"
-    },
-    "testFolderName" : "Binance"
+      "url": "https://evmos.org/",
+      "client": "https://github.com/tharsis/evmos",
+      "clientPublic": "https://rest.bd.evmos.org:1317",
+      "clientDocs": ""
+    }
   },
   {
-    "id": "polygon",
-    "name": "Polygon",
-    "coinId": 966,
-    "symbol": "MATIC",
+    "id": "moonriver",
+    "name": "Moonriver",
+    "coinId": 10001285,
+    "symbol": "MOVR",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -1955,59 +4021,52 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "137",
-    "addressHasher": "keccak256",
+    "chainId": "1285",
     "explorer": {
-      "url": "https://polygonscan.com",
+      "url": "https://moonriver.moonscan.io",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0xe26ed1470d5bf99a53d687843e7acdf7e4ba6620af93b4d672e714de90476e8e",
-      "sampleAccount": "0x720E1fa107A1Df39Db4E78A3633121ac36Bec132"
+      "sampleTx": "0x2e2daa3943ba65d9bbb910a4f6765aa6a466a0ef8935090547ca9d30e201e032",
+      "sampleAccount": "0x899831D937937d011305E73EE782cce0455DF15a"
     },
     "info": {
-      "url": "https://polygon.technology",
-      "source": "https://github.com/maticnetwork/contracts",
-      "rpc": "https://polygon-rpc.com",
-      "documentation": "https://eth.wiki/json-rpc/API"
+      "url": "https://moonbeam.network/networks/moonriver",
+      "rpc": "https://moonriver.public.blastapi.io"
     }
   },
   {
-    "id": "thorchain",
-    "name": "THORChain",
-    "coinId": 931,
-    "symbol": "RUNE",
-    "decimals": 8,
-    "blockchain": "Thorchain",
+    "id": "moonbeam",
+    "name": "Moonbeam",
+    "coinId": 10001284,
+    "symbol": "GLMR",
+    "decimals": 18,
+    "blockchain": "Ethereum",
     "derivation": [
       {
-        "path": "m/44'/931'/0'/0/0"
+        "path": "m/44'/60'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1",
-    "hrp": "thor",
-    "chainId": "thorchain-mainnet-v1",
+    "publicKeyType": "secp256k1Extended",
+    "chainId": "1284",
     "explorer": {
-      "url": "https://viewblock.io/thorchain",
+      "url": "https://moonscan.io",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "ADF0899E58C177E2391F22D04E9C5E1C35BB0F75B42B363A0761687907FD9476",
-      "sampleAccount": "thor196yf4pq80hjrmz7nnh0ar0ypqg02r0w4dq4mzu"
+      "sampleTx": "0xb22a146c933e6e51affbfa5f712a266b5f5e92ae453cd2f252bcc3c36ff035a6",
+      "sampleAccount": "0x201bb4f276C765dF7225e5A4153E17edD23a67eC"
     },
     "info": {
-      "url": "https://thorchain.org",
-      "source": "https://gitlab.com/thorchain/thornode",
-      "rpc": "https://seed.thorchain.info",
-      "documentation": "https://docs.thorchain.org"
+      "url": "https://moonbeam.network",
+      "rpc": "https://rpc.api.moonbeam.network",
+      "documentation": "https://docs.moonbeam.network"
     }
   },
   {
-    "id": "optimism",
-    "name": "Optimism",
-    "displayName": "Optimistic Ethereum",
-    "coinId": 10000070,
-    "slip44": 60,
-    "symbol": "ETH",
+    "id": "kaia",
+    "name": "Kaia",
+    "coinId": 10008217,
+    "symbol": "KLAY",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2017,26 +4076,26 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "10",
-    "addressHasher": "keccak256",
+    "chainId": "8217",
     "explorer": {
-      "url": "https://optimistic.etherscan.io",
+      "url": "https://kaiascan.io",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/account/",
+      "sampleTx": "0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7",
+      "sampleAccount": "0x2ad9656bf5b82caf10847b431012e28e301e83ba"
     },
     "info": {
-      "url": "https://optimism.io/",
-      "source": "https://github.com/ethereum-optimism/optimism",
-      "rpc": "https://mainnet.optimism.io",
-      "documentation": "https://eth.wiki/json-rpc/API"
+      "url": "https://kaia.io",
+      "rpc": "https://public-en.node.kaia.io",
+      "documentation": "https://docs.kaia.io"
     }
   },
   {
-    "id": "arbitrum",
-    "name": "Arbitrum",
-    "coinId": 10042221,
-    "slip44": 60,
-    "symbol": "ETH",
+    "id": "meter",
+    "name": "Meter",
+    "coinId": 18000,
+    "chainId": "82",
+    "symbol": "MTR",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2046,27 +4105,26 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "42161",
-    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://arbiscan.io",
+      "url": "https://scan.meter.io",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/address/",
+      "sampleTx": "0x8ea268d5dbb40217c763b800a75fc063cf28b56f40f2bc69dc043f5c4bbdc144",
+      "sampleAccount": "0xe5a273954d24eddf9ae9ea4cef2347d584cfa3dd"
     },
     "info": {
-      "url": "https://arbitrum.io",
-      "source": "https://github.com/OffchainLabs/arbitrum",
-      "rpc": "https://node.offchainlabs.com:8547",
-      "documentation": "https://developer.offchainlabs.com"
+      "url": "https://meter.io/",
+      "source": "https://github.com/meterio/meter-pov",
+      "rpc": "https://rpc.meter.io",
+      "documentation": "https://docs.meter.io/"
     }
   },
   {
-    "id": "heco",
-    "name": "ECO Chain",
-    "displayName": "Huobi ECO Chain",
-    "coinId": 10000553,
-    "slip44": 553,
-    "symbol": "HT",
+    "id": "okc",
+    "name": "OKX Chain",
+    "coinId": 996,
+    "chainId": "66",
+    "symbol": "OKT",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2076,26 +4134,27 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "128",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://hecoinfo.com",
+      "url": "https://www.oklink.com/oktc",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/address/",
+      "sampleTx": "0x46C3A947E8248570FBD28E4FE456CC8F80DFD90716533878FB67857B95FA3D37",
+      "sampleAccount": "0x074faafd0b20fad2efa115b8ed7e75993e580b85"
     },
     "info": {
-      "url": "https://www.hecochain.com/en-us",
-      "source": "https://github.com/HuobiGroup/huobi-eco-chain",
-      "rpc": "https://http-mainnet-node.huobichain.com",
-      "documentation": "https://eth.wiki/json-rpc/API"
-    },
-    "testFolderName" : "ECO"
+      "url": "https://www.okx.com/okc",
+      "source": "https://github.com/okex/exchain",
+      "rpc": "https://exchainrpc.okex.org",
+      "documentation": "https://okc-docs.readthedocs.io/en/latest"
+    }
   },
   {
-    "id": "avalanchec",
-    "name": "Avalanche C-Chain",
-    "coinId": 10009000,
-    "symbol": "AVAX",
+    "id": "cfxevm",
+    "name": "Conflux eSpace",
+    "coinId": 1030,
+    "chainId": "1030",
+    "symbol": "CFX",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2105,59 +4164,58 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "43114",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://snowtrace.io",
+      "url": "https://evm.confluxscan.net",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0x9243890b844219accefd8798271052f5a056453ec18984a56e81c92921330d54",
-      "sampleAccount": "0xa664325f36Ec33E66323fe2620AF3f2294b2Ef3A"
+      "sampleTx": "0x920efefb3213b2d6a3b84149cb50b61a813d085443a20e1b0eab74120e41ff72",
+      "sampleAccount": "0x337a087daef75c72871de592fbbba570829a936a"
     },
     "info": {
-      "url": "https://www.avalabs.org/",
-      "client": "https://github.com/ava-labs/avalanchego",
-      "clientPublic": "https://api.avax.network/ext/bc/C/rpc",
-      "clientDocs": "https://docs.avax.network/"
-    },
-    "testFolderName" : "Avalanche"
+      "url": "https://confluxnetwork.org",
+      "source": "https://github.com/conflux-chain",
+      "rpc": "https://evm.confluxrpc.com",
+      "documentation": "https://doc.confluxnetwork.org/docs/espace"
+    }
   },
   {
-    "id": "xdai",
-    "name": "xDai",
-    "displayName": "Gnosis Chain",
-    "coinId": 10000100,
-    "symbol": "xDAI",
+    "id": "greenfield",
+    "name": "Greenfield",
+    "displayName": "BNB Greenfield",
+    "coinId": 5600,
+    "symbol": "BNB",
     "decimals": 18,
-    "blockchain": "Ethereum",
+    "chainId": "1017",
+    "blockchain": "Greenfield",
     "derivation": [
       {
         "path": "m/44'/60'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "chainId": "100",
+    "publicKeyType": "secp256k1",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://blockscout.com/xdai/mainnet",
+      "url": "https://greenfieldscan.com",
       "txPath": "/tx/",
-      "accountPath": "/address/",
-      "sampleTx": "0x936798a1ef607c9e856d7861b15999c770c06f0887c4fc1f6acbf3bef09899c1",
-      "sampleAccount": "0x12d61a95CF55e18D267C2F1AA67d8e42ae1368f8"
+      "accountPath": "/account/",
+      "sampleTx": "0x150eac42070957115fd538b1f348fadd78d710fb641c248120efcf35d1e7e4f3",
+      "sampleAccount": "0xcf0f6b88ed72653b00fdebbffc90b98072cb3285"
     },
     "info": {
-      "url": "https://www.xdaichain.com",
-      "client": "https://github.com/openethereum/openethereum",
-      "clientPublic": "https://rpc.gnosischain.com",
-      "clientDocs": "https://eth.wiki/json-rpc/API"
+      "url": "https://greenfield.bnbchain.org",
+      "source": "https://github.com/bnb-chain/greenfield",
+      "rpc": "https://gnfd-testnet-fullnode-tendermint-us.bnbchain.org",
+      "documentation": "https://docs.bnbchain.org/greenfield-docs"
     }
   },
   {
-    "id": "fantom",
-    "name": "Fantom",
-    "coinId": 10000250,
-    "symbol": "FTM",
+    "id": "opbnb",
+    "name": "OpBNB",
+    "coinId": 204,
+    "chainId": "204",
+    "symbol": "BNB",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2167,187 +4225,189 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "250",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://ftmscan.com",
+      "url": "https://opbnbscan.com",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0xb0a741d882291951de1fac72e90b9baf886ddb0c9c87658a0c206490dfaa5202",
-      "sampleAccount": "0x9474feb9917b87da6f0d830ba66ee0035835c0d3"
+      "sampleTx": "0x788ea8fb4a82dae957f1d3b18af3cd0bbde55a276e66bd17af8c869f24c03a0f",
+      "sampleAccount": "0x4eaf936c172b5e5511959167e8ab4f7031113ca3"
     },
     "info": {
-      "url": "https://fantom.foundation",
-      "client": "https://github.com/openethereum/openethereum",
-      "clientPublic": "https://rpc.ftm.tools",
-      "clientDocs": "https://eth.wiki/json-rpc/API"
+      "url": "https://opbnb.bnbchain.org/en",
+      "source": "https://github.com/bnb-chain/opbnb",
+      "rpc": "https://opbnb-mainnet-rpc.bnbchain.org",
+      "documentation": "https://docs.bnbchain.org/opbnb-docs"
     }
   },
   {
-    "id": "cryptoorg",
-    "name": "CryptoOrg",
-    "displayName": "Crypto.org",
-    "coinId": 394,
-    "symbol": "CRO",
+    "id": "stratis",
+    "name": "Stratis",
+    "coinId": 105105,
+    "symbol": "STRAX",
     "decimals": 8,
-    "blockchain": "Cosmos",
+    "blockchain": "Bitcoin",
     "derivation": [
       {
-        "path": "m/44'/394'/0'/0/0"
+        "name": "segwit",
+        "path": "m/44'/105105'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "cro",
-    "chainId": "crypto-org-chain-mainnet-1",
-    "addressHasher": "sha256ripemd",
+    "hrp": "strax",
+    "p2pkhPrefix": 75,
+    "p2shPrefix": 140,
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://crypto.org/explorer",
-      "txPath": "/tx/",
-      "accountPath": "/account/",
-      "sampleTx": "D87D2EB46B21466886EE149C1DEA3AE6C2E019C7D8C24FA1533A95439DDCE1E2",
-      "sampleAccount": "cro10wrflcdc4pys9vvgqm98yg7yv5ltj7d3xehent"
+      "url": "https://explorer.rutanio.com/strax/explorer",
+      "txPath": "/transaction/",
+      "accountPath": "/address/",
+      "sampleTx": "3923df87e83859dec8b87a414cbb1529113788c512a4d0c283e1394c274f0bfb",
+      "sampleAccount": "XWqnSWzQA5kDAS727UTYtXkdcbKc8mEvyN"
     },
     "info": {
-      "url": "https://crypto.org/",
-      "client": "https://github.com/crypto-org-chain/chain-main",
-      "clientPublic": "https://mainnet.crypto.org:1317/",
-      "clientDocs": "https://crypto.org/docs/resources/chain-integration.html#api-documentation"
+      "url": "https://www.stratisplatform.com/",
+      "source": "https://github.com/stratisproject",
+      "rpc": "",
+      "documentation": "https://academy.stratisplatform.com/index.html"
     }
   },
   {
-    "id": "celo",
-    "name": "Celo",
-    "coinId": 52752,
-    "symbol": "CELO",
-    "decimals": 18,
-    "blockchain": "Ethereum",
+    "id": "Nebl",
+    "name": "Nebl",
+    "coinId": 146,
+    "symbol": "NEBL",
+    "decimals": 8,
+    "blockchain": "Verge",
     "derivation": [
       {
-        "path": "m/44'/60'/0'/0/0"
+        "path": "m/44'/146'/0'/0/0",
+        "xpub": "xpub",
+        "xprv": "xprv"
       }
     ],
     "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "chainId": "42220",
-    "addressHasher": "keccak256",
+    "publicKeyType": "secp256k1",
+    "p2pkhPrefix": 53,
+    "p2shPrefix": 112,
+    "publicKeyHasher": "sha256ripemd",
+    "base58Hasher": "sha256d",
     "explorer": {
-      "url": "https://explorer.celo.org",
+      "url": "https://explorer.nebl.io",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0xaf41ee58afe633dc7b179c15693cca40fe0372c1d7c70351620105d59d326693",
-      "sampleAccount": "0xFBFf95e2Fa7e4Ff3aeA34eFB05fB60F9968a6aaD"
+      "sampleTx": "1e56c745ab87d702c98eddc6bc2475b2eb292ed4af92d170b2362c8a089272a4",
+      "sampleAccount": "NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc"
     },
     "info": {
-      "url": "https://celo.org",
-      "client": "https://github.com/celo-org/celo-blockchain",
-      "clientPublic": "https://forno.celo.org",
-      "clientDocs": "https://eth.wiki/json-rpc/API"
+      "url": "https://nebl.io",
+      "source": "https://github.com/NeblioTeam",
+      "rpc": "",
+      "documentation": "https://github.com/NeblioTeam"
     }
   },
   {
-    "id": "ronin",
-    "name": "Ronin",
-    "coinId": 10002020,
-    "slip44": 60,
-    "symbol": "RON",
-    "decimals": 18,
-    "blockchain": "Ronin",
+    "id": "hedera",
+    "name": "Hedera",
+    "coinId": 3030,
+    "symbol": "HBAR",
+    "decimals": 8,
+    "blockchain": "Hedera",
     "derivation": [
       {
-        "path": "m/44'/60'/0'/0/0"
+        "path": "m/44'/3030'/0'/0'/0"
       }
     ],
-    "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "chainId": "2020",
-    "addressHasher": "keccak256",
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
     "explorer": {
-      "url": "https://explorer.roninchain.com",
-      "txPath": "/tx/",
-      "accountPath": "/address/",
-      "sampleTx": "0xc09835aaf9c1cacea8ce322865583c791d3a4dfbd9a3b72f79539db88d3697ab",
-      "sampleAccount": "0xdc05ecd5fbdb64058d94f3182d66f44342b9adcb"
+      "url": "https://hashscan.io/mainnet",
+      "txPath": "/transaction/",
+      "accountPath": "/account/",
+      "sampleTx": "0.0.19790-1666769504-858851231",
+      "sampleAccount": "0.0.19790"
     },
     "info": {
-      "url": "https://whitepaper.axieinfinity.com/technology/ronin-ethereum-sidechain",
-      "client": "https://github.com/axieinfinity/ronin-smart-contracts",
-      "clientPublic": "https://api.roninchain.com/rpc",
-      "clientDocs": "https://eth.wiki/json-rpc/API"
+      "url": "https://hedera.com/",
+      "source": "https://github.com/hashgraph",
+      "documentation": "https://docs.hedera.com"
     }
   },
   {
-    "id": "osmosis",
-    "name": "Osmosis",
-    "displayName": "Osmosis",
-    "coinId": 10000118,
-    "symbol": "OSMO",
+    "id": "agoric",
+    "name": "Agoric",
+    "coinId": 564,
+    "symbol": "BLD",
     "decimals": 6,
     "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/118'/0'/0/0"
+        "path": "m/44'/564'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "hrp": "osmo",
-    "chainId": "osmosis-1",
+    "hrp": "agoric",
+    "chainId": "agoric-3",
     "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://mintscan.io/osmosis",
-      "txPath": "/txs/",
-      "accountPath": "/account/",
-      "sampleTx": "5A6E50A6F2927E4B8C87BB094D5FBF15F1287429A09111806FC44B3CD86CACA8",
-      "sampleAccount": "osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5"
-    },
-    "info": {
-      "url": "https://osmosis.zone/",
-      "client": "https://github.com/osmosis-labs/osmosis",
-      "clientPublic": "https://rpc-osmosis.keplr.app/",
-      "clientDocs": ""
+      "url": "https://atomscan.com/agoric",
+      "txPath": "/transactions/",
+      "accountPath": "/accounts/",
+      "sampleTx": "576224B1A0F3D56BA23C5350C2A0E3CEA86F40005B828793E5ACBC2F4813152E",
+      "sampleAccount": "agoric1cqvwa8jr6pmt45jndanc8lqmdsxjkhw0yertc0"
+    },
+    "info": {
+      "url": "https://agoric.com",
+      "source": "https://github.com/Agoric/agoric-sdk",
+      "rpc": "https://agoric-rpc.polkachu.com",
+      "documentation": "https://docs.agoric.com"
     }
   },
   {
-    "id": "ecash",
-    "name": "eCash",
-    "coinId": 899,
-    "symbol": "XEC",
-    "decimals": 2,
-    "blockchain": "Bitcoin",
+    "id": "dydx",
+    "name": "Dydx",
+    "displayName": "dYdX",
+    "coinId": 22000118,
+    "symbol": "DYDX",
+    "decimals": 18,
+    "blockchain": "Cosmos",
     "derivation": [
       {
-        "path": "m/44'/899'/0'/0/0",
-        "xpub": "xpub",
-        "xprv": "xprv"
+        "path": "m/44'/118'/0'/0/0"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1",
-    "p2pkhPrefix": 0,
-    "p2shPrefix": 5,
-    "hrp": "ecash",
-    "publicKeyHasher": "sha256ripemd",
-    "base58Hasher": "sha256d",
+    "hrp": "dydx",
+    "chainId": "dydx-mainnet-1",
+    "addressHasher": "sha256ripemd",
     "explorer": {
-      "url": "https://explorer.bitcoinabc.org",
+      "url": "https://www.mintscan.io/dydx",
       "txPath": "/tx/",
-      "accountPath": "/address/"
+      "accountPath": "/address/",
+      "sampleTx": "F236222E4F7C92FA84711FD6451ED22DD56CBDFA319BFDAFB99A21E4E9B9EC2F",
+      "sampleAccount": "dydx1adl7usw7z2dnysyn7wvrghu0u0q6gr7jqs4gtt"
     },
     "info": {
-      "url": "https://e.cash",
-      "source": "https://github.com/trezor/blockbook",
-      "rpc": "https://blockbook.fabien.cash:9197",
-      "documentation": "https://github.com/trezor/blockbook/blob/master/docs/api.md"
+      "url": "https://dydx.exchange",
+      "source": "https://github.com/dydxprotocol",
+      "rpc": "https://dydx-dao-api.polkachu.com",
+      "documentation": "https://docs.dydx.exchange"
     }
   },
   {
-    "id": "cronos",
-    "name": "Cronos Chain",
-    "coinId": 10000025,
-    "symbol": "CRO",
+    "id": "nativeinjective",
+    "name": "NativeInjective",
+    "displayName": "Native Injective",
+    "coinId": 10000060,
+    "symbol": "INJ",
     "decimals": 18,
-    "blockchain": "Ethereum",
+    "blockchain": "NativeInjective",
     "derivation": [
       {
         "path": "m/44'/60'/0'/0/0"
@@ -2355,28 +4415,30 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "25",
+    "hrp": "inj",
     "addressHasher": "keccak256",
+    "chainId": "injective-1",
     "explorer": {
-      "url": "https://cronoscan.com",
-      "txPath": "/tx/",
-      "accountPath": "/address/"
+      "url": "https://www.mintscan.io/injective",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "C5F6A4FF9DF1AE9FF543D2CEBD8E3E9B04290B2445F9D91D7707EDBF4B7EE16B",
+      "sampleAccount": "inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd"
     },
     "info": {
-      "url": "https://cronos.org",
-      "client": "https://github.com/crypto-org-chain/cronos",
-      "clientPublic": "https://evm-cronos.crypto.org",
-      "clientDocs": "https://eth.wiki/json-rpc/API"
-    },
-    "testFolderName" : "Cronos"
+      "url": "https://injective.com",
+      "documentation": "https://docs.injective.network"
+    }
   },
   {
-    "id": "kavaevm",
-    "name": "KavaEvm",
-    "coinId": 10002222,
-    "symbol": "KAVA",
+    "id": "nativecanto",
+    "name": "NativeCanto",
+    "displayName": "NativeCanto",
+    "coinId": 10007700,
+    "symbol": "CANTO",
     "decimals": 18,
-    "blockchain": "Ethereum",
+    "blockchain": "Cosmos",
+    "chainId": "canto_7700-1",
     "derivation": [
       {
         "path": "m/44'/60'/0'/0/0"
@@ -2384,27 +4446,29 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "2222",
+    "hrp": "canto",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://explorer.kava.io",
-      "txPath": "/tx/",
-      "accountPath": "/address/"
+      "url": "https://mintscan.io/canto",
+      "txPath": "/txs/",
+      "accountPath": "/account/",
+      "sampleTx": "7A7830270097AA9AC8B819EFBB8E0B56579F20ECB7615ECD37E19ABEEFB8DB83",
+      "sampleAccount": "canto17xpfvakm2amg962yls6f84z3kell8c5lz0zsl4"
     },
     "info": {
-      "url": "https://www.kava.io/",
-      "client": "https://github.com/Kava-Labs/kava",
-      "documentation": "https://docs.kava.io/docs/ethereum/overview/",
-      "rpc": "https://evm.kava.io"
+      "url": "https://canto.io/",
+      "documentation": "https://docs.canto.io/"
     }
   },
   {
-    "id": "smartbch",
-    "name": "Smart Bitcoin Cash",
-    "coinId": 10000145,
-    "symbol": "BCH",
+    "id": "zetachain",
+    "name": "NativeZetaChain",
+    "displayName": "NativeZetaChain",
+    "coinId": 10007000,
+    "symbol": "ZETA",
     "decimals": 18,
-    "blockchain": "Ethereum",
+    "blockchain": "Cosmos",
+    "chainId": "zetachain_7000-1",
     "derivation": [
       {
         "path": "m/44'/60'/0'/0/0"
@@ -2412,28 +4476,25 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "10000",
+    "hrp": "zeta",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://www.smartscan.cash",
-      "txPath": "/tx/",
+      "url": "https://explorer.zetachain.com",
+      "txPath": "/cosmos/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9",
-      "sampleAccount": "0xFeEc227410E1DF9f3b4e6e2E284DC83051ae468F"
+      "sampleTx": "2DBB071DDD47985F4470A21E5943CE95D371AE4BDE2267E201D3553FB2BDCFDE",
+      "sampleAccount": "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne"
     },
     "info": {
-      "url": "https://smartbch.org/",
-      "source": "https://github.com/smartbch/smartbch",
-      "rpc": "https://smartbch.fountainhead.cash/mainnet",
-      "documentation": "https://github.com/smartbch/docs/blob/main/developers-guide/jsonrpc.md"
-    },
-    "testFolderName" : "Bitcoin"
+      "url": "https://www.zetachain.com/",
+      "documentation": "https://www.zetachain.com/docs/"
+    }
   },
   {
-    "id": "kcc",
-    "name": "KuCoin Community Chain",
-    "coinId": 10000321,
-    "symbol": "KCS",
+    "id": "zetaevm",
+    "name": "Zeta EVM",
+    "coinId": 20007000,
+    "symbol": "ZETA",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2443,58 +4504,53 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "321",
+    "chainId": "7000",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://explorer.kcc.io/en",
-      "txPath": "/tx/",
+      "url": "https://explorer.zetachain.com",
+      "txPath": "/evm/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0x2f0d79cd289a02f3181b68b9583a64c3809fe7387810b274275985c29d02c80d",
-      "sampleAccount": "0x4446fc4eb47f2f6586f9faab68b3498f86c07521"
+      "sampleTx": "0x04cb1201857de29af97b755e51c888454fb96c1f3bb3c1329bb94d5353d5c19e",
+      "sampleAccount": "0x85539A58F9c88DdDccBaBBfc660968323Fd1e167"
     },
     "info": {
-      "url": "https://www.kcc.io/",
-      "source": "https://github.com/kcc-community/kcc",
-      "rpc": "https://rpc-mainnet.kcc.network",
-      "documentation": "https://docs.kcc.io/#/en-us/"
-    },
-    "testFolderName" : "KuCoinCommunityChain"
+      "url": "https://www.zetachain.com/",
+      "documentation": "https://www.zetachain.com/docs/"
+    }
   },
   {
-    "id": "boba",
-    "name": "Boba",
-    "coinId": 10000288,
-    "symbol": "BOBAETH",
-    "decimals": 18,
-    "blockchain": "Ethereum",
+    "id": "ton",
+    "name": "TON",
+    "coinId": 607,
+    "symbol": "TON",
+    "decimals": 9,
+    "blockchain": "TheOpenNetwork",
     "derivation": [
       {
-        "path": "m/44'/60'/0'/0/0"
+        "path": "m/44'/607'/0'"
       }
     ],
-    "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "chainId": "288",
-    "addressHasher": "keccak256",
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
     "explorer": {
-      "url": "https://blockexplorer.boba.network",
-      "txPath": "/tx/",
-      "accountPath": "/address/",
-      "sampleTx": "0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103",
-      "sampleAccount": "0x4F96F50eDB37a19216d87693E5dB241e31bD3735"
+      "url": "https://tonviewer.com",
+      "txPath": "/transaction/",
+      "accountPath": "/",
+      "sampleTx": "fJXfn0EVhV09HFuEgUHu4Cchb24nUQtIMwSzmzk2tLs=",
+      "sampleAccount": "EQCD39VS5jcptHL8vMjEXrzGaRcCVYto7HUn4bpAOg8xqB2N"
     },
     "info": {
-      "url": "https://boba.network/",
-      "source": "https://github.com/bobanetwork/boba",
-      "rpc": "https://mainnet.boba.network",
-      "documentation": "https://docs.boba.network/"
+      "url": "https://ton.org",
+      "source": "https://github.com/ton-blockchain",
+      "rpc": "https://toncenter.com/api/v2/jsonRPC",
+      "documentation": "https://ton.org/docs"
     }
   },
   {
-    "id": "metis",
-    "name": "Metis",
-    "coinId": 10001088,
-    "symbol": "METIS",
+    "id": "neon",
+    "name": "Neon",
+    "coinId": 245022934,
+    "symbol": "NEON",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2504,57 +4560,57 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "1088",
+    "chainId": "245022934",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://andromeda-explorer.metis.io",
+      "url": "https://neonscan.org",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0x422f2ebbede32d4434ad0cf0ae55d44a84e14d3d5725a760133255b42676d8ce",
-      "sampleAccount": "0xBe9E8Ec25866B21bA34e97b9393BCabBcB4A5C86"
+      "sampleTx": "0x77d86af2c6f02f14ef13ca52bf54864d92fcc4b32d8e884e225061c006738ed6",
+      "sampleAccount": "0xfa4a8650e7bebb918859c280a86f9661bed29877"
     },
     "info": {
-      "url": "https://www.metis.io/",
-      "source": "https://github.com/MetisProtocol/mvm",
-      "rpc": "https://andromeda.metis.io/?owner=1088",
-      "documentation": "https://docs.metis.io/"
+      "url": "https://neonevm.org",
+      "source": "https://github.com/neonevm/neon-evm",
+      "rpc": "https://neon-proxy-mainnet.solana.p2p.org/",
+      "documentation": "https://docs.neonfoundation.io/docs/quick_start"
     }
   },
   {
-    "id": "aurora",
-    "name": "Aurora",
-    "coinId": 1323161554,
-    "symbol": "ETH",
-    "decimals": 18,
-    "blockchain": "Ethereum",
+    "id": "internet_computer",
+    "name": "Internet Computer",
+    "coinId": 223,
+    "symbol": "ICP",
+    "decimals": 8,
+    "blockchain": "InternetComputer",
     "derivation": [
       {
-        "path": "m/44'/60'/0'/0/0"
+        "path": "m/44'/223'/0'/0/0",
+        "xpub": "xpub",
+        "xpriv": "xpriv"
       }
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "1313161554",
-    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://aurorascan.dev",
-      "txPath": "/tx/",
-      "accountPath": "/address/",
-      "sampleTx": "0x99deebdb70f8027037abb3d3d0f3c7523daee857d85e9056d2671593ff2f2f28",
-      "sampleAccount": "0x8707cdE20dd43E3dB1F74c28fcd509ef38B0bA51"
+      "url": "https://dashboard.internetcomputer.org",
+      "txPath": "/transaction/",
+      "accountPath": "/account/",
+      "sampleTx": "9e32c54975adf84a1d98f19df41bbc34a752a899c32cc9c0000200b2c4308f85",
+      "sampleAccount": "529ea51c22e8d66e8302eabd9297b100fdb369109822248bb86939a671fbc55b"
     },
     "info": {
-      "url": "https://aurora.dev/",
-      "source": "https://github.com/aurora-is-near/aurora-engine",
-      "rpc": "https://mainnet.aurora.dev/",
-      "documentation": "https://doc.aurora.dev/"
+      "url": "https://internetcomputer.org",
+      "source": "https://github.com/dfinity/ic",
+      "rpc": "",
+      "documentation": "https://internetcomputer.org/docs"
     }
   },
   {
-    "id": "evmos",
-    "name": "Evmos",
-    "coinId": 10009001,
-    "symbol": "EVMOS",
+    "id": "manta",
+    "name": "Manta Pacific",
+    "coinId": 169,
+    "symbol": "ETH",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2564,31 +4620,29 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "9001",
+    "chainId": "169",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://evm.evmos.org",
+      "url": "https://pacific-explorer.manta.network",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0x24af42cf4977a96d62e3a82c3cd9b519c3e7c53dd83398b88f0cb435d867b422",
-      "sampleAccount": "0x30627903124Aa1e71384bc52e1cb96E4AB3252b6"
+      "sampleTx": "0x2bbd5d85b0ed05d1416e30ce1197a6f0c27d10ce02593a2719e2baf486d2e8c2",
+      "sampleAccount": "0xF122a1aC569a36a5Cf6d0F828A22254c8A9afF84"
     },
     "info": {
-      "url": "https://evmos.org/",
-      "source": "https://github.com/tharsis/evmos",
-      "rpc": "https://eth.bd.evmos.org:8545",
-      "documentation": "https://docs.evmos.org/"
+      "url": "https://pacific.manta.network",
+      "source": "https://github.com/manta-network",
+      "rpc": "https://pacific-rpc.manta.network/http",
+      "documentation": "https://docs.manta.network/docs/Introduction"
     }
   },
   {
-    "id": "nativeevmos",
-    "name": "NativeEvmos",
-    "displayName": "Native Evmos",
-    "coinId": 20009001,
-    "symbol": "EVMOS",
+    "id": "merlin",
+    "name": "Merlin",
+    "coinId": 4200,
+    "symbol": "BTC",
     "decimals": 18,
-    "blockchain": "Cosmos",
-    "chainId": "evmos_9001-2",
+    "blockchain": "Ethereum",
     "derivation": [
       {
         "path": "m/44'/60'/0'/0/0"
@@ -2596,27 +4650,28 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "hrp": "evmos",
+    "chainId": "4200",
     "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://mintscan.io/evmos",
-      "txPath": "/txs/",
-      "accountPath": "/account/",
-      "sampleTx": "A16C211C83AD1E684DE46F694FAAC17D8465C864BD7385A81EC062CDE0638811",
-      "sampleAccount": "evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34"
+      "url": "https://scan.merlinchain.io",
+      "txPath": "/tx/",
+      "accountPath": "/address/",
+      "sampleTx": "0xca6f2891959b669237738dd0bc2c1051d966778c9de90b94165032ce58364212",
+      "sampleAccount": "0xf7e017b3f61bD3410A3b03D7DAD7699FD6780584"
     },
     "info": {
-      "url": "https://evmos.org/",
-      "client": "https://github.com/tharsis/evmos",
-      "clientPublic": "https://rest.bd.evmos.org:1317",
-      "clientDocs": ""
+      "url": "https://merlinchain.io",
+      "source": "https://merlinchain.io",
+      "rpc": "https://rpc.merlinchain.io",
+      "documentation": "https://docs.merlinchain.io/merlin-docs"
     }
   },
   {
-    "id": "moonriver",
-    "name": "Moonriver",
-    "coinId": 10001285,
-    "symbol": "MOVR",
+    "id": "lightlink",
+    "name": "Lightlink",
+    "displayName": "Lightlink Phoenix",
+    "coinId": 1890,
+    "symbol": "ETH",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2626,24 +4681,27 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "1285",
+    "chainId": "1890",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://moonriver.moonscan.io",
+      "url": "https://phoenix.lightlink.io",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0x2e2daa3943ba65d9bbb910a4f6765aa6a466a0ef8935090547ca9d30e201e032",
-      "sampleAccount": "0x899831D937937d011305E73EE782cce0455DF15a"
+      "sampleTx": "0xc65f82445aefc883fd4ffe09149c8ce48f61b670c0734528a49d4a8bd8309bb0",
+      "sampleAccount": "0x4566ED6c7a7fFc90E2C7cfF7eB9156262afD2fDe"
     },
     "info": {
-      "url": "https://moonbeam.network/networks/moonriver",
-      "rpc": "https://moonriver.public.blastapi.io"
+      "url": "https://lightlink.io",
+      "source": "https://github.com/lightlink-network",
+      "rpc": "https://endpoints.omniatech.io/v1/lightlink/phoenix/public",
+      "documentation": "https://docs.lightlink.io/lightlink-protocol"
     }
   },
   {
-    "id": "moonbeam",
-    "name": "Moonbeam",
-    "coinId": 10001284,
-    "symbol": "GLMR",
+    "id": "blast",
+    "name": "Blast",
+    "coinId": 81457,
+    "symbol": "ETH",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2653,25 +4711,27 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "1284",
+    "chainId": "81457",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://moonscan.io",
+      "url": "https://blastscan.io",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0xb22a146c933e6e51affbfa5f712a266b5f5e92ae453cd2f252bcc3c36ff035a6",
-      "sampleAccount": "0x201bb4f276C765dF7225e5A4153E17edD23a67eC"
+      "sampleTx": "0x511fc00e8329343b9e953bf1f75e9b0a7b3cc2eb3a8f049d5be41adf4fbd6cac",
+      "sampleAccount": "0x0d11f2f0ff55c4fcfc3ff86bdc8e78ffa7df99fd"
     },
     "info": {
-      "url": "https://moonbeam.network",
-      "rpc": "https://rpc.api.moonbeam.network",
-      "documentation": "https://docs.moonbeam.network"
+      "url": "https://blast.io",
+      "source": "https://github.com/blast-io",
+      "rpc": "https://rpc.blast.io",
+      "documentation": "https://docs.blast.io"
     }
   },
   {
-    "id": "klaytn",
-    "name": "Klaytn",
-    "coinId": 10008217,
-    "symbol": "KLAY",
+    "id": "bouncebit",
+    "name": "BounceBit",
+    "coinId": 6001,
+    "symbol": "BB",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2681,26 +4741,28 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
-    "chainId": "8217",
+    "chainId": "6001",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://scope.klaytn.com",
+      "url": "https://bbscan.io",
       "txPath": "/tx/",
-      "accountPath": "/account/",
-      "sampleTx": "0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7",
-      "sampleAccount": "0x2ad9656bf5b82caf10847b431012e28e301e83ba"
+      "accountPath": "/address/",
+      "sampleTx": "0x52558f4143d058d942e3b73414090266ae3ffce1fe8c25fe86896e2c8e5ef932",
+      "sampleAccount": "0xf4aa7349a9ccca4609943955b5ddc7bd9278c223"
     },
     "info": {
-      "url": "https://klaytn.foundation",
-      "rpc": "https://public-node-api.klaytnapi.com/v1/cypress",
-      "documentation": "https://docs.klaytn.foundation"
+      "url": "https://bouncebit.io",
+      "source": "https://github.com/BounceBit-Labs",
+      "rpc": "https://fullnode-mainnet.bouncebitapi.com",
+      "documentation": "https://docs.bouncebit.io"
     }
   },
   {
-    "id": "meter",
-    "name": "Meter",
-    "coinId": 18000,
-    "chainId": "82",
-    "symbol": "MTR",
+    "id": "zklinknova",
+    "name": "ZkLinkNova",
+    "displayName": "zkLink Nova Mainnet",
+    "coinId": 810180,
+    "symbol": "ETH",
     "decimals": 18,
     "blockchain": "Ethereum",
     "derivation": [
@@ -2710,48 +4772,47 @@
     ],
     "curve": "secp256k1",
     "publicKeyType": "secp256k1Extended",
+    "chainId": "810180",
+    "addressHasher": "keccak256",
     "explorer": {
-      "url": "https://scan.meter.io",
+      "url": "https://explorer.zklink.io",
       "txPath": "/tx/",
       "accountPath": "/address/",
-      "sampleTx": "0x8ea268d5dbb40217c763b800a75fc063cf28b56f40f2bc69dc043f5c4bbdc144",
-      "sampleAccount": "0xe5a273954d24eddf9ae9ea4cef2347d584cfa3dd"
+      "sampleTx": "0xeb5eb8710369c89115a83f3e744c15c9d388030cfce2fd3a653dbd18f2947400",
+      "sampleAccount": "0xF95115BaD9a4585B3C5e2bfB50579f17163A45aA"
     },
     "info": {
-      "url": "https://meter.io/",
-      "source": "https://github.com/meterio/meter-pov",
-      "rpc": "https://rpc.meter.io",
-      "documentation": "https://docs.meter.io/"
+      "url": "https://zklink.io",
+      "source": "https://github.com/zkLinkProtocol",
+      "rpc": "https://rpc.zklink.io",
+      "documentation": "https://docs.zklink.io"
     }
   },
   {
-    "id": "okc",
-    "name": "OKX Chain",
-    "coinId": 996,
-    "chainId": "66",
-    "symbol": "OKT",
-    "decimals": 18,
-    "blockchain": "Ethereum",
+    "id": "pactus",
+    "name": "Pactus",
+    "coinId": 21888,
+    "symbol": "PAC",
+    "decimals": 9,
+    "blockchain": "Pactus",
     "derivation": [
       {
-        "path": "m/44'/60'/0'/0/0"
+        "path": "m/44'/21888'/3'/0'"
       }
     ],
-    "curve": "secp256k1",
-    "publicKeyType": "secp256k1Extended",
-    "addressHasher": "keccak256",
+    "curve": "ed25519",
+    "publicKeyType": "ed25519",
+    "hrp": "pc",
     "explorer": {
-      "url": "https://www.oklink.com/en/okc",
-      "txPath": "/tx/",
-      "accountPath": "/address/",
-      "sampleTx": "0x46C3A947E8248570FBD28E4FE456CC8F80DFD90716533878FB67857B95FA3D37",
-      "sampleAccount": "0x074faafd0b20fad2efa115b8ed7e75993e580b85"
+      "url": "https://pacviewer.com",
+      "txPath": "/transaction/",
+      "accountPath": "/address/"
     },
     "info": {
-      "url": "https://www.okx.com/okc",
-      "source": "https://github.com/okex/exchain",
-      "rpc": "https://exchainrpc.okex.org",
-      "documentation": "https://okc-docs.readthedocs.io/en/latest"
+      "url": "https://pactus.org",
+      "source": "https://github.com/pactus-project/pactus",
+      "rpc": "https://docs.pactus.org/api/http",
+      "documentation": "https://docs.pactus.org"
     }
   }
 ]
diff --git a/rust/.gitignore b/rust/.gitignore
new file mode 100644
index 00000000000..bca6f9b85aa
--- /dev/null
+++ b/rust/.gitignore
@@ -0,0 +1,7 @@
+# Generated by Cargo
+# will have compiled files and executables
+debug/
+target/
+
+# These are backup files generated by rustfmt
+**/*.rs.bk
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
new file mode 100644
index 00000000000..e12cf3ea375
--- /dev/null
+++ b/rust/Cargo.lock
@@ -0,0 +1,2467 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aead"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d122413f284cf2d62fb1b7db97e02edb8cda96d769b16e443a4f6195e35662b0"
+dependencies = [
+ "crypto-common",
+ "generic-array",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "0.7.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
+
+[[package]]
+name = "arbitrary"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db55d72333851e17d572bec876e390cd3b11eb1ef53ae821dd9f3b653d2b4569"
+
+[[package]]
+name = "arbitrary"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
+dependencies = [
+ "derive_arbitrary",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "digest 0.10.6",
+ "itertools",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "rustc_version",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-std",
+ "digest 0.10.6",
+ "num-bigint",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bcs"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b6598a2f5d564fb7855dc6b06fd1c38cff5a72bd8b863a4d021938497b440a"
+dependencies = [
+ "serde",
+ "thiserror",
+]
+
+[[package]]
+name = "bech32"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445"
+
+[[package]]
+name = "bigdecimal"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6aaf33151a6429fe9211d1b276eafdf70cdff28b071e76c0b0e1503221ea3744"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "bincode"
+version = "1.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1f45e9417d87227c7a56d22e471c6206462cba514c7590c09aff4cf6d1ddcad"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "bitcoin"
+version = "0.30.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e99ff7289b20a7385f66a0feda78af2fc119d28fb56aea8886a9cd0a4abdd75"
+dependencies = [
+ "bech32",
+ "bitcoin-private",
+ "bitcoin_hashes",
+ "hex_lit",
+ "secp256k1",
+]
+
+[[package]]
+name = "bitcoin-private"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73290177011694f38ec25e165d0387ab7ea749a4b81cd4c80dae5988229f7a57"
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d7066118b13d4b20b23645932dfb3a81ce7e29f95726c2036fa33cd7b092501"
+dependencies = [
+ "bitcoin-private",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitreader"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdd859c9d97f7c468252795b35aeccc412bdbb1e90ee6969c4fa6328272eaeff"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "bitstream-io"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499"
+
+[[package]]
+name = "bitvec"
+version = "0.20.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7774144344a4faa177370406a7ff5f1da24303817368584c6206c8303eb07848"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "blake-hash"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94d1988118c887f61418940e322d574e8a2dd67165f1f1556eaae22e4019c6af"
+dependencies = [
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
+ "ppv-lite86",
+]
+
+[[package]]
+name = "blake2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46502ad458c9a52b69d4d4d32775c788b7a1b85e8bc9d482d92250fc0e3f8efe"
+dependencies = [
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "blake2b-ref"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "294d17c72e0ba59fad763caa112368d0672083779cdebbb97164f4bb4c1e339a"
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "borsh"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f58b559fd6448c6e2fd0adb5720cd98a2506594cafa4737ff98c396f3e82f667"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aadb5b6ccbd078890f6d7003694e33816e6b784358f18e15e7e6d9f065a57cd"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+ "syn_derive",
+]
+
+[[package]]
+name = "bs58"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+
+[[package]]
+name = "bumpalo"
+version = "3.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d261e256854913907f67ed06efbc3338dfe6179796deefc1ff763fc1aee5535"
+
+[[package]]
+name = "byte-slice-cast"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "bytes"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89b2fd2a0dcf38d7971e2194b6b6eebab45ae01067456a7fd93d5547a61b70be"
+
+[[package]]
+name = "cc"
+version = "1.0.79"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
+
+[[package]]
+name = "ciborium"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+ "zeroize",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "520fbf3c07483f94e3e3ca9d0cfd913d7718ef2483d2cfd91c0d9e91474ab913"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "rand_core",
+ "typenum",
+]
+
+[[package]]
+name = "crypto_box"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16182b4f39a82ec8a6851155cc4c0cda3065bb1db33651726a29e1951de0f009"
+dependencies = [
+ "aead",
+ "crypto_secretbox",
+ "curve25519-dalek",
+ "salsa20",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto_secretbox"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1"
+dependencies = [
+ "aead",
+ "cipher",
+ "generic-array",
+ "poly1305",
+ "salsa20",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "4.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "curve25519-dalek-derive",
+ "digest 0.10.6",
+ "fiat-crypto",
+ "rustc_version",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "curve25519-dalek-derive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+
+[[package]]
+name = "der"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b10af9f9f9f2134a42d3f8aa74658660f2e0234b0eb81bd171df8aa32779ed"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[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",
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f3cdeb9ec472d588e539a818b2dee436825730da08ad0017c4b1a17676bdc8b7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+dependencies = [
+ "block-buffer 0.10.3",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a48e5d537b8a30c0b023116d981b16334be1485af7ca68db3a2b7024cbc957fd"
+dependencies = [
+ "der",
+ "digest 0.10.6",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+]
+
+[[package]]
+name = "either"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75c71eaa367f2e5d556414a8eea812bc62985c879748d6403edabd9cb03f16e7"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest 0.10.6",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pkcs8",
+ "rand_core",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88bffebc5d80432c9b140ee17875ff173a8ab62faad5b257da912bd2f6c1c0a1"
+
+[[package]]
+name = "ethnum"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c8ff382b2fa527fb7fb06eeebfc5bbb3f17e3cc6b9d70b006c41daa8824adac"
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "fiat-crypto"
+version = "0.2.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1676f435fc1dadde4d03e43f5d62b259e1ce5f40bd4ffb21db2b42ebe59c1382"
+
+[[package]]
+name = "fixed-hash"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcf0ed7fe52a17a03854ec54a9f76d6d84508d1c0e66bc1793301c73fc8493c"
+dependencies = [
+ "arbitrary 0.4.7",
+ "byteorder",
+ "rand",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "funty"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fed34cd105917e91daa4da6b3728c47b068749d6a62c59811f06ed2ac71d9da7"
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c85e1d9ab2eadba7e5040d4e09cbd6d072b76a557ad64e797c2cb9d4da21d7e4"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "groestl"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343cfc165f92a988fd60292f7a0bfde4352a5a0beff9fbec29251ca4e9676e4d"
+dependencies = [
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core",
+ "subtle",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hex_lit"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd"
+
+[[package]]
+name = "hkdf"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "humantime"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+dependencies = [
+ "quick-error",
+]
+
+[[package]]
+name = "impl-codec"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "161ebdfec3c8e3b52bf61c4f3550a1eea4f9579d10dc1b936f3171ebdcd6c443"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "impl-serde"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4551f042f3438e64dbd6226b20527fc84a6e1fe65688b58746a2f53623f25f5c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0c10553d664a4d0bcff9f4215d0aac67a639cc68ef660840afe309b807bc9f5"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "453ad9f582a441959e5f0d088b02ce04cfe8d51a8eaf077f12ac6d3e94164ca6"
+
+[[package]]
+name = "js-sys"
+version = "0.3.61"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "445dde2150c55e483f3d8416706b97ec8e8237c307e5b7b4b8dd15e6af2a0730"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "sha2",
+ "signature",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3afef3b6eff9ce9d8ff9b3601125eec7f0c8cbac7abd14f355d053fa56c98768"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "log"
+version = "0.4.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "memchr"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "move-core-types"
+version = "0.0.4"
+source = "git+https://github.com/move-language/move?rev=ea70797099baea64f05194a918cebd69ed02b285#ea70797099baea64f05194a918cebd69ed02b285"
+dependencies = [
+ "anyhow",
+ "bcs",
+ "ethnum",
+ "hex",
+ "num",
+ "once_cell",
+ "primitive-types",
+ "rand",
+ "ref-cast",
+ "serde",
+ "serde_bytes",
+ "uint",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+dependencies = [
+ "num-bigint",
+ "num-complex",
+ "num-integer",
+ "num-iter",
+ "num-rational",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-complex"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.43"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-rational"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+dependencies = [
+ "autocfg",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381"
+
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2",
+]
+
+[[package]]
+name = "parity-scale-codec"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "373b1a4c1338d9cd3d1fa53b3a11bdab5ab6bd80a20f7f7becd76953ae2be909"
+dependencies = [
+ "arrayvec",
+ "bitvec",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive",
+ "serde",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1557010476e0595c9b568d16dcfb81b93cdeb157612726f5170d31aa707bed27"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+
+[[package]]
+name = "pb-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "354a34df9c65b596152598001c0fe3393379ec2db03ae30b9985659422e2607e"
+dependencies = [
+ "clap",
+ "env_logger",
+ "log",
+ "nom",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "poly1305"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8159bd90725d2df49889a078b54f4f79e87f1f8a8444194cdca81d38f5393abf"
+dependencies = [
+ "cpufeatures",
+ "opaque-debug",
+ "universal-hash",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "primeorder"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf8d3875361e28f7753baefef104386e7aa47642c93023356d97fdef4003bfb5"
+dependencies = [
+ "elliptic-curve",
+]
+
+[[package]]
+name = "primitive-types"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e4722c697a58a99d5d06a08c30821d7c082a4632198de1eaa5a6c22ef42373"
+dependencies = [
+ "fixed-hash",
+ "impl-codec",
+ "impl-serde",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.11",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quick-protobuf"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom",
+]
+
+[[package]]
+name = "ref-cast"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c78fb8c9293bcd48ef6fce7b4ca950ceaf21210de6e105a883ee280c0f7b9ed"
+dependencies = [
+ "ref-cast-impl",
+]
+
+[[package]]
+name = "ref-cast-impl"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f9c0c92af03644e4806106281fe2e068ac5bc0ae74a707266d06ea27bccee5f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "regex"
+version = "1.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b1f693b24f6ac912f4893ef08244d70b6067480d2f1a46e950c9691e6749d1d"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.6.29"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "rlp"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec"
+dependencies = [
+ "bytes",
+ "rustc-hex",
+]
+
+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
+
+[[package]]
+name = "ryu"
+version = "1.0.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f91339c0467de62360649f8d3e185ca8de4224ff281f66000de5eb2a77a79041"
+
+[[package]]
+name = "salsa20"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "sec1"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "secp256k1"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25996b82292a7a57ed3508f052cfff8640d38d32018784acd714758b43da9c8f"
+dependencies = [
+ "bitcoin_hashes",
+ "rand",
+ "secp256k1-sys",
+]
+
+[[package]]
+name = "secp256k1-sys"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70a129b9e9efbfb223753b9163c4ab3b13cff7fd9c7f010fbac25ab4099fa07e"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bebd363326d05ec3e2f532ab7660680f3b02130d780c299bca73469d521bc0ed"
+
+[[package]]
+name = "serde"
+version = "1.0.189"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.189"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_repr"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82e6b795fe2e3b1e845bafcb27aa35405c4d47cdfc92af5fc8d3002f76cebdc0"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.6",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bdf0c33fae925bdc080598b84bc15c55e7b9a4a43b3c704da051f977469691c9"
+dependencies = [
+ "digest 0.10.6",
+ "keccak",
+]
+
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest 0.10.6",
+ "rand_core",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37a5be806ab6f127c3da44b7378837ebf01dadca8510a0e572460216b228bd0e"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "starknet-crypto"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693e6362f150f9276e429a910481fb7f3bcb8d6aa643743f587cfece0b374874"
+dependencies = [
+ "crypto-bigint",
+ "hex",
+ "hmac",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "rfc6979",
+ "sha2",
+ "starknet-crypto-codegen",
+ "starknet-curve",
+ "starknet-ff",
+ "zeroize",
+]
+
+[[package]]
+name = "starknet-crypto-codegen"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6dc88f1f470d9de1001ffbb90d2344c9dd1a615f5467daf0574e2975dfd9ebd"
+dependencies = [
+ "starknet-curve",
+ "starknet-ff",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "starknet-curve"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "252610baff59e4c4332ce3569f7469c5d3f9b415a2240d698fb238b2b4fc0942"
+dependencies = [
+ "starknet-ff",
+]
+
+[[package]]
+name = "starknet-ff"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcdf692e13247ec111718e219caaa44ea1a687e9c36bf6083e1cd1b98374a2ad"
+dependencies = [
+ "ark-ff",
+ "bigdecimal",
+ "crypto-bigint",
+ "getrandom",
+ "hex",
+ "serde",
+]
+
+[[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 = "strum"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
+
+[[package]]
+name = "strum_macros"
+version = "0.25.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
+dependencies = [
+ "heck",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "subtle"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+
+[[package]]
+name = "syn"
+version = "1.0.107"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn_derive"
+version = "0.1.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1329189c02ff984e9736652b1631330da25eaa6bc639089ed4915d25446cbe7b"
+dependencies = [
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "termcolor"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+dependencies = [
+ "winapi-util",
+]
+
+[[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.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.38"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "266f016b7f039eec8a1a80dfe6156b633d208b9fccca5e4db1d6775b0c4e34a7"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.4.7",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "tw_any_coin"
+version = "0.1.0"
+dependencies = [
+ "tw_coin_entry",
+ "tw_coin_registry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_aptos"
+version = "0.1.0"
+dependencies = [
+ "move-core-types",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_number",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_base58_address"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+]
+
+[[package]]
+name = "tw_bech32_address"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+]
+
+[[package]]
+name = "tw_binance"
+version = "0.1.0"
+dependencies = [
+ "quick-protobuf",
+ "serde",
+ "serde_json",
+ "serde_repr",
+ "strum_macros",
+ "tw_bech32_address",
+ "tw_coin_entry",
+ "tw_cosmos_sdk",
+ "tw_encoding",
+ "tw_evm",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_bitcoin"
+version = "0.1.0"
+dependencies = [
+ "bitcoin",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "tw_base58_address",
+ "tw_bech32_address",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_proto",
+ "tw_utxo",
+]
+
+[[package]]
+name = "tw_bitcoincash"
+version = "0.1.0"
+dependencies = [
+ "tw_bitcoin",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_proto",
+ "tw_utxo",
+]
+
+[[package]]
+name = "tw_coin_entry"
+version = "0.1.0"
+dependencies = [
+ "derivation-path",
+ "serde",
+ "serde_json",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_number",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_coin_registry"
+version = "0.1.0"
+dependencies = [
+ "itertools",
+ "lazy_static",
+ "serde",
+ "serde_json",
+ "strum",
+ "strum_macros",
+ "tw_aptos",
+ "tw_binance",
+ "tw_bitcoin",
+ "tw_bitcoincash",
+ "tw_coin_entry",
+ "tw_cosmos",
+ "tw_ethereum",
+ "tw_evm",
+ "tw_greenfield",
+ "tw_hash",
+ "tw_internet_computer",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_native_evmos",
+ "tw_native_injective",
+ "tw_pactus",
+ "tw_ronin",
+ "tw_solana",
+ "tw_sui",
+ "tw_thorchain",
+ "tw_ton",
+ "tw_utxo",
+]
+
+[[package]]
+name = "tw_cosmos"
+version = "0.1.0"
+dependencies = [
+ "tw_coin_entry",
+ "tw_cosmos_sdk",
+ "tw_keypair",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_cosmos_sdk"
+version = "0.1.0"
+dependencies = [
+ "pb-rs",
+ "quick-protobuf",
+ "serde",
+ "serde_json",
+ "tw_bech32_address",
+ "tw_coin_entry",
+ "tw_cosmos_sdk",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_number",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_encoding"
+version = "0.1.0"
+dependencies = [
+ "arbitrary 1.3.0",
+ "bcs",
+ "bech32",
+ "bs58",
+ "ciborium",
+ "data-encoding",
+ "hex",
+ "serde",
+ "serde_bytes",
+ "tw_memory",
+]
+
+[[package]]
+name = "tw_ethereum"
+version = "0.1.0"
+dependencies = [
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_evm",
+ "tw_keypair",
+ "tw_number",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_evm"
+version = "0.1.0"
+dependencies = [
+ "itertools",
+ "lazy_static",
+ "rlp",
+ "serde",
+ "serde_json",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_number",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_greenfield"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "tw_coin_entry",
+ "tw_cosmos_sdk",
+ "tw_encoding",
+ "tw_evm",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_number",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_hash"
+version = "0.1.0"
+dependencies = [
+ "arbitrary 1.3.0",
+ "blake-hash",
+ "blake2b-ref",
+ "digest 0.10.6",
+ "groestl",
+ "hmac",
+ "ripemd",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "sha3",
+ "tw_encoding",
+ "tw_memory",
+ "zeroize",
+]
+
+[[package]]
+name = "tw_internet_computer"
+version = "0.1.0"
+dependencies = [
+ "pb-rs",
+ "quick-protobuf",
+ "serde",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_keypair"
+version = "0.1.0"
+dependencies = [
+ "arbitrary 1.3.0",
+ "bitcoin",
+ "blake2",
+ "crypto_box",
+ "curve25519-dalek",
+ "der",
+ "digest 0.10.6",
+ "ecdsa",
+ "k256",
+ "lazy_static",
+ "p256",
+ "pkcs8",
+ "rand_core",
+ "rfc6979",
+ "secp256k1",
+ "serde",
+ "serde_json",
+ "sha2",
+ "starknet-crypto",
+ "starknet-ff",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "zeroize",
+]
+
+[[package]]
+name = "tw_memory"
+version = "0.1.0"
+
+[[package]]
+name = "tw_misc"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "zeroize",
+]
+
+[[package]]
+name = "tw_native_evmos"
+version = "0.1.0"
+dependencies = [
+ "tw_coin_entry",
+ "tw_cosmos_sdk",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_native_injective"
+version = "0.1.0"
+dependencies = [
+ "tw_coin_entry",
+ "tw_cosmos_sdk",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_number"
+version = "0.1.0"
+dependencies = [
+ "arbitrary 1.3.0",
+ "lazy_static",
+ "primitive-types",
+ "serde",
+ "tw_encoding",
+ "tw_hash",
+ "tw_memory",
+]
+
+[[package]]
+name = "tw_pactus"
+version = "0.1.0"
+dependencies = [
+ "bech32",
+ "byteorder",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_proto"
+version = "0.1.0"
+dependencies = [
+ "arbitrary 1.3.0",
+ "pb-rs",
+ "quick-protobuf",
+]
+
+[[package]]
+name = "tw_ronin"
+version = "0.1.0"
+dependencies = [
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_evm",
+ "tw_keypair",
+ "tw_memory",
+ "tw_number",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_solana"
+version = "0.1.0"
+dependencies = [
+ "bincode",
+ "borsh",
+ "lazy_static",
+ "serde",
+ "serde_json",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_sui"
+version = "0.1.0"
+dependencies = [
+ "indexmap",
+ "move-core-types",
+ "serde",
+ "serde_repr",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_tests"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "tw_any_coin",
+ "tw_coin_entry",
+ "tw_coin_registry",
+ "tw_cosmos_sdk",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_number",
+ "tw_proto",
+ "tw_solana",
+ "tw_ton",
+ "tw_ton_sdk",
+ "tw_utxo",
+ "wallet-core-rs",
+]
+
+[[package]]
+name = "tw_thorchain"
+version = "0.1.0"
+dependencies = [
+ "tw_coin_entry",
+ "tw_cosmos_sdk",
+ "tw_keypair",
+ "tw_memory",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_ton"
+version = "0.1.0"
+dependencies = [
+ "lazy_static",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_number",
+ "tw_proto",
+ "tw_ton_sdk",
+]
+
+[[package]]
+name = "tw_ton_sdk"
+version = "0.1.0"
+dependencies = [
+ "bitreader",
+ "bitstream-io",
+ "crc",
+ "lazy_static",
+ "num-bigint",
+ "serde",
+ "serde_json",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_number",
+]
+
+[[package]]
+name = "tw_utxo"
+version = "0.1.0"
+dependencies = [
+ "bech32",
+ "bitcoin",
+ "byteorder",
+ "itertools",
+ "secp256k1",
+ "strum_macros",
+ "tw_base58_address",
+ "tw_bech32_address",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_proto",
+]
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "arbitrary 1.3.0",
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[package]]
+name = "universal-hash"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
+dependencies = [
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "uuid"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f00cc9702ca12d3c81455259621e676d0f7251cec66a21e98fe2e9a37db93b2a"
+dependencies = [
+ "getrandom",
+]
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wallet-core-rs"
+version = "0.1.0"
+dependencies = [
+ "bitreader",
+ "tw_any_coin",
+ "tw_bitcoin",
+ "tw_coin_registry",
+ "tw_encoding",
+ "tw_ethereum",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_number",
+ "tw_proto",
+ "tw_solana",
+ "tw_ton",
+ "uuid",
+]
+
+[[package]]
+name = "wallet_core_bin"
+version = "0.1.0"
+dependencies = [
+ "serde",
+ "serde_json",
+ "tw_coin_registry",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31f8dcbc21f30d9b8f2ea926ecb58f6b91192c17e9d33594b3df58b2007ca53b"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95ce90fd5bcc06af55a641a86428ee4229e44e07033963a2290a8e241607ccb9"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c21f77c0bedc37fd5dc21f897894a5ca01e7bb159884559461862ae90c0b4c5"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2aff81306fcac3c7515ad4e177f521b5c9a15f2b08f4e32d823066102f35a5f6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.107",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.84"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "winnow"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca0ace3845f0d96209f0375e6d367e3eb87eb65d27d445bdc9f1843a26f39448"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wyz"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85e60b0d1b5f99db2556934e21937020776a5d31520bf169e851ac44e6420214"
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.37",
+]
diff --git a/rust/Cargo.toml b/rust/Cargo.toml
new file mode 100644
index 00000000000..692beec2692
--- /dev/null
+++ b/rust/Cargo.toml
@@ -0,0 +1,54 @@
+[workspace]
+members = [
+    "chains/tw_aptos",
+    "chains/tw_binance",
+    "chains/tw_bitcoin",
+    "chains/tw_bitcoincash",
+    "chains/tw_cosmos",
+    "chains/tw_ethereum",
+    "chains/tw_greenfield",
+    "chains/tw_internet_computer",
+    "chains/tw_native_evmos",
+    "chains/tw_native_injective",
+    "chains/tw_pactus",
+    "chains/tw_ronin",
+    "chains/tw_solana",
+    "chains/tw_sui",
+    "chains/tw_thorchain",
+    "chains/tw_ton",
+    "frameworks/tw_ton_sdk",
+    "frameworks/tw_utxo",
+    "tw_any_coin",
+    "tw_base58_address",
+    "tw_bech32_address",
+    "tw_coin_entry",
+    "tw_coin_registry",
+    "tw_cosmos_sdk",
+    "tw_encoding",
+    "tw_evm",
+    "tw_hash",
+    "tw_keypair",
+    "tw_memory",
+    "tw_misc",
+    "tw_number",
+    "tw_proto",
+    "tw_tests",
+    "wallet_core_bin",
+    "wallet_core_rs",
+]
+
+[profile.release]
+strip = true
+codegen-units = 1
+panic = "abort"
+
+[profile.wasm-test]
+inherits = "release"
+# Fixes an incredibly slow compilation of `curve25519-dalek` package.
+opt-level = 1
+debug = true
+debug-assertions = true
+overflow-checks = true
+
+[profile.release.package.curve25519-dalek]
+opt-level = 2
diff --git a/rust/chains/tw_aptos/Cargo.toml b/rust/chains/tw_aptos/Cargo.toml
new file mode 100644
index 00000000000..d78b0e3c644
--- /dev/null
+++ b/rust/chains/tw_aptos/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "tw_aptos"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde_json = "1.0"
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_proto = { path = "../../tw_proto" }
+tw_number = { path = "../../tw_number" }
+tw_hash = { path = "../../tw_hash" }
+tw_memory = { path = "../../tw_memory" }
+move-core-types = { git = "https://github.com/move-language/move", rev = "ea70797099baea64f05194a918cebd69ed02b285", features = ["address32"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_bytes = "0.11.12"
+
+[dev-dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry", features = ["test-utils"] }
+tw_encoding = { path = "../../tw_encoding" }
+tw_number = { path = "../../tw_number", features = ["helpers"] }
diff --git a/rust/chains/tw_aptos/fuzz/.gitignore b/rust/chains/tw_aptos/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/chains/tw_aptos/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/chains/tw_aptos/fuzz/Cargo.toml b/rust/chains/tw_aptos/fuzz/Cargo.toml
new file mode 100644
index 00000000000..721a84b3ab9
--- /dev/null
+++ b/rust/chains/tw_aptos/fuzz/Cargo.toml
@@ -0,0 +1,28 @@
+[package]
+name = "tw_aptos-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+tw_proto = { path = "../../tw_proto", features = ["fuzz"] }
+
+[dependencies.tw_aptos]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "sign"
+path = "fuzz_targets/sign.rs"
+test = false
+doc = false
diff --git a/rust/chains/tw_aptos/fuzz/fuzz_targets/sign.rs b/rust/chains/tw_aptos/fuzz/fuzz_targets/sign.rs
new file mode 100644
index 00000000000..5d55e467d14
--- /dev/null
+++ b/rust/chains/tw_aptos/fuzz/fuzz_targets/sign.rs
@@ -0,0 +1,9 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_aptos::signer::Signer;
+use tw_proto::Aptos::Proto;
+
+fuzz_target!(|input: Proto::SigningInput<'_>| {
+    let _ = Signer::sign_proto(input);
+});
diff --git a/rust/chains/tw_aptos/src/address.rs b/rust/chains/tw_aptos/src/address.rs
new file mode 100644
index 00000000000..3915750c625
--- /dev/null
+++ b/rust/chains/tw_aptos/src/address.rs
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use move_core_types::account_address::{AccountAddress, AccountAddressParseError};
+use std::fmt::{Display, Formatter};
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::sha3::sha3_256;
+use tw_keypair::ed25519;
+use tw_memory::Data;
+
+#[repr(u8)]
+pub enum Scheme {
+    Ed25519 = 0,
+}
+
+#[derive(Clone)]
+pub struct Address {
+    addr: AccountAddress,
+}
+
+impl Address {
+    pub const LENGTH: usize = AccountAddress::LENGTH;
+
+    /// Initializes an address with a `ed25519` public key.
+    pub fn with_ed25519_pubkey(
+        pubkey: &ed25519::sha512::PublicKey,
+    ) -> Result<Address, AddressError> {
+        let mut to_hash = pubkey.as_slice().to_vec();
+        to_hash.push(Scheme::Ed25519 as u8);
+        let hashed = sha3_256(to_hash.as_slice());
+        let addr = AccountAddress::from_bytes(hashed).map_err(from_account_error)?;
+        Ok(Address { addr })
+    }
+
+    pub fn inner(&self) -> AccountAddress {
+        self.addr
+    }
+}
+
+impl Display for Address {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.addr.to_hex_literal())
+    }
+}
+
+impl CoinAddress for Address {
+    #[inline]
+    fn data(&self) -> Data {
+        self.addr.to_vec()
+    }
+}
+
+#[inline]
+pub fn from_account_error(_err: AccountAddressParseError) -> AddressError {
+    AddressError::InvalidInput
+}
+
+impl FromStr for Address {
+    type Err = AddressError;
+
+    // https://github.com/aptos-labs/aptos-core/blob/261019cbdafe1c514c60c2b74357ea2c77d25e67/types/src/account_address.rs#L44
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        const NUM_CHARS: usize = AccountAddress::LENGTH * 2;
+        let mut has_0x = false;
+        let mut working = s.trim();
+
+        // Checks if it has a 0x at the beginning, which is okay
+        if working.starts_with("0x") {
+            has_0x = true;
+            working = &working[2..];
+        }
+
+        if working.len() > NUM_CHARS || (!has_0x && working.len() < NUM_CHARS) {
+            return Err(AddressError::InvalidInput);
+        }
+
+        if !working.chars().all(|c| char::is_ascii_hexdigit(&c)) {
+            return Err(AddressError::InvalidInput);
+        }
+
+        let addr = if has_0x {
+            AccountAddress::from_hex_literal(s.trim())
+        } else {
+            AccountAddress::from_str(s.trim())
+        }
+        .map_err(from_account_error)?;
+
+        Ok(Address { addr })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_keypair::ed25519::sha512::PrivateKey;
+
+    #[test]
+    fn test_from_public_key() {
+        let private = PrivateKey::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let public = private.public();
+        let addr = Address::with_ed25519_pubkey(&public);
+        assert_eq!(
+            addr.as_ref().unwrap().to_string(),
+            "0x9006fa46f038224e8004bdda97f2e7a60c2c3d135bce7cb15541e5c0aae907a4"
+        );
+        assert_eq!(addr.unwrap().data().len(), Address::LENGTH);
+    }
+
+    #[test]
+    fn test_from_account_error() {
+        assert_eq!(
+            from_account_error(AccountAddressParseError {}),
+            AddressError::InvalidInput
+        );
+    }
+}
diff --git a/rust/chains/tw_aptos/src/aptos_move_packages.rs b/rust/chains/tw_aptos/src/aptos_move_packages.rs
new file mode 100644
index 00000000000..e90e6bf2a4b
--- /dev/null
+++ b/rust/chains/tw_aptos/src/aptos_move_packages.rs
@@ -0,0 +1,207 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction_payload::{EntryFunction, TransactionPayload};
+use move_core_types::account_address::AccountAddress;
+use move_core_types::ident_str;
+use move_core_types::language_storage::{ModuleId, TypeTag};
+use serde_json::json;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::bcs;
+
+pub fn aptos_account_transfer(
+    to: AccountAddress,
+    amount: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("aptos_account").to_owned(),
+        ),
+        ident_str!("transfer").to_owned(),
+        vec![],
+        vec![bcs::encode(&to)?, bcs::encode(&amount)?],
+        json!([to.to_hex_literal(), amount.to_string()]),
+    )))
+}
+
+pub fn aptos_account_create_account(auth_key: AccountAddress) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("aptos_account").to_owned(),
+        ),
+        ident_str!("create_account").to_owned(),
+        vec![],
+        vec![bcs::encode(&auth_key)?],
+        json!([auth_key.to_hex_literal()]),
+    )))
+}
+
+pub fn coin_transfer(
+    coin_type: TypeTag,
+    to: AccountAddress,
+    amount: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("coin").to_owned(),
+        ),
+        ident_str!("transfer").to_owned(),
+        vec![coin_type],
+        vec![bcs::encode(&to)?, bcs::encode(&amount)?],
+        json!([to.to_hex_literal(), amount.to_string()]),
+    )))
+}
+
+pub fn aptos_account_transfer_coins(
+    coin_type: TypeTag,
+    to: AccountAddress,
+    amount: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("aptos_account").to_owned(),
+        ),
+        ident_str!("transfer_coins").to_owned(),
+        vec![coin_type],
+        vec![bcs::encode(&to)?, bcs::encode(&amount)?],
+        json!([to.to_hex_literal(), amount.to_string()]),
+    )))
+}
+
+pub fn token_transfers_offer_script(
+    receiver: AccountAddress,
+    creator: AccountAddress,
+    collection: Vec<u8>,
+    name: Vec<u8>,
+    property_version: u64,
+    amount: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 3,
+            ]),
+            ident_str!("token_transfers").to_owned(),
+        ),
+        ident_str!("offer_script").to_owned(),
+        vec![],
+        vec![
+            bcs::encode(&receiver)?,
+            bcs::encode(&creator)?,
+            bcs::encode(&collection)?,
+            bcs::encode(&name)?,
+            bcs::encode(&property_version)?,
+            bcs::encode(&amount)?,
+        ],
+        json!([
+            receiver.to_hex_literal(),
+            creator.to_hex_literal(),
+            String::from_utf8_lossy(&collection),
+            String::from_utf8_lossy(&name),
+            property_version.to_string(),
+            amount.to_string()
+        ]),
+    )))
+}
+
+pub fn token_transfers_cancel_offer_script(
+    receiver: AccountAddress,
+    creator: AccountAddress,
+    collection: Vec<u8>,
+    name: Vec<u8>,
+    property_version: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 3,
+            ]),
+            ident_str!("token_transfers").to_owned(),
+        ),
+        ident_str!("cancel_offer_script").to_owned(),
+        vec![],
+        vec![
+            bcs::encode(&receiver)?,
+            bcs::encode(&creator)?,
+            bcs::encode(&collection)?,
+            bcs::encode(&name)?,
+            bcs::encode(&property_version)?,
+        ],
+        json!([
+            receiver.to_hex_literal(),
+            creator.to_hex_literal(),
+            String::from_utf8_lossy(&collection),
+            String::from_utf8_lossy(&name),
+            property_version.to_string()
+        ]),
+    )))
+}
+
+pub fn token_transfers_claim_script(
+    sender: AccountAddress,
+    creator: AccountAddress,
+    collection: Vec<u8>,
+    name: Vec<u8>,
+    property_version: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 3,
+            ]),
+            ident_str!("token_transfers").to_owned(),
+        ),
+        ident_str!("claim_script").to_owned(),
+        vec![],
+        vec![
+            bcs::encode(&sender)?,
+            bcs::encode(&creator)?,
+            bcs::encode(&collection)?,
+            bcs::encode(&name)?,
+            bcs::encode(&property_version)?,
+        ],
+        json!([
+            sender.to_hex_literal(),
+            creator.to_hex_literal(),
+            String::from_utf8_lossy(&collection),
+            String::from_utf8_lossy(&name),
+            property_version.to_string()
+        ]),
+    )))
+}
+
+pub fn managed_coin_register(coin_type: TypeTag) -> TransactionPayload {
+    TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            AccountAddress::new([
+                0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+                0, 0, 0, 1,
+            ]),
+            ident_str!("managed_coin").to_owned(),
+        ),
+        ident_str!("register").to_owned(),
+        vec![coin_type],
+        vec![],
+        json!([]),
+    ))
+}
diff --git a/rust/chains/tw_aptos/src/compiler.rs b/rust/chains/tw_aptos/src/compiler.rs
new file mode 100644
index 00000000000..53b9df11bd4
--- /dev/null
+++ b/rust/chains/tw_aptos/src/compiler.rs
@@ -0,0 +1,76 @@
+use crate::address::Address;
+use crate::transaction_builder;
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_proto::Aptos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct Compiler;
+
+impl Compiler {
+    #[inline]
+    pub fn preimage_hashes(
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let builder = transaction_builder::TransactionFactory::new_from_protobuf(input.clone())?;
+        let sender = Address::from_str(&input.sender)
+            .into_tw()
+            .context("Invalid sender address")?;
+        let signed_tx = builder
+            .sender(sender.inner())
+            .sequence_number(input.sequence_number as u64)
+            .build()?
+            .pre_image()?;
+        Ok(CompilerProto::PreSigningOutput {
+            data: signed_tx.into(),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    #[inline]
+    pub fn compile(
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn compile_impl(
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let builder = transaction_builder::TransactionFactory::new_from_protobuf(input.clone())?;
+        let sender = Address::from_str(&input.sender)?;
+        let signature = signatures
+            .first()
+            .or_tw_err(SigningErrorType::Error_signatures_count)?;
+        let public_key = public_keys
+            .first()
+            .or_tw_err(SigningErrorType::Error_signatures_count)?;
+
+        let signed_tx = builder
+            .sender(sender.inner())
+            .sequence_number(input.sequence_number as u64)
+            .build()?
+            .compile(signature.to_vec(), public_key.to_vec())?;
+        Ok(Proto::SigningOutput {
+            raw_txn: signed_tx.raw_txn_bytes().clone().into(),
+            encoded: signed_tx.encoded().clone().into(),
+            authenticator: Some((*signed_tx.authenticator()).clone().into()),
+            json: signed_tx.to_json().to_string().into(),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_aptos/src/constants.rs b/rust/chains/tw_aptos/src/constants.rs
new file mode 100644
index 00000000000..714c1a2f782
--- /dev/null
+++ b/rust/chains/tw_aptos/src/constants.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub const GAS_UNIT_PRICE: u64 = 100;
+pub const MAX_GAS_AMOUNT: u64 = 100_000_000;
+pub const APTOS_SALT: &[u8] = b"APTOS::RawTransaction";
diff --git a/rust/chains/tw_aptos/src/entry.rs b/rust/chains/tw_aptos/src/entry.rs
new file mode 100644
index 00000000000..e2ef01a6e2f
--- /dev/null
+++ b/rust/chains/tw_aptos/src/entry.rs
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::compiler::Compiler;
+use crate::modules::transaction_util::AptosTransactionUtil;
+use crate::signer::Signer;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_keypair::tw::PublicKey;
+use tw_proto::Aptos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct AptosEntry;
+
+impl CoinEntry for AptosEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = AptosTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let public_key = public_key
+            .to_ed25519()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        Address::with_ed25519_pubkey(public_key)
+    }
+
+    #[inline]
+    fn sign(&self, _coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        Signer::sign_proto(input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        Compiler::preimage_hashes(input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        Compiler::compile(input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn json_signer(&self) -> Option<Self::JsonSigner> {
+        None
+    }
+
+    #[inline]
+    fn message_signer(&self) -> Option<Self::MessageSigner> {
+        None
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(AptosTransactionUtil)
+    }
+}
diff --git a/rust/chains/tw_aptos/src/lib.rs b/rust/chains/tw_aptos/src/lib.rs
new file mode 100644
index 00000000000..5388e03f4e7
--- /dev/null
+++ b/rust/chains/tw_aptos/src/lib.rs
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod aptos_move_packages;
+pub mod constants;
+pub mod entry;
+mod serde_helper;
+
+pub mod nft;
+
+pub mod compiler;
+pub mod liquid_staking;
+pub mod modules;
+pub mod signer;
+pub mod transaction;
+pub mod transaction_builder;
+pub mod transaction_payload;
diff --git a/rust/chains/tw_aptos/src/liquid_staking.rs b/rust/chains/tw_aptos/src/liquid_staking.rs
new file mode 100644
index 00000000000..2ce311e4350
--- /dev/null
+++ b/rust/chains/tw_aptos/src/liquid_staking.rs
@@ -0,0 +1,158 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::from_account_error;
+use crate::transaction_payload::{EntryFunction, TransactionPayload};
+use move_core_types::{account_address::AccountAddress, ident_str, language_storage::ModuleId};
+use serde_json::json;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::bcs;
+use tw_proto::{
+    Aptos::Proto::mod_LiquidStaking::OneOfliquid_stake_transaction_payload,
+    Aptos::Proto::{LiquidStaking, TortugaClaim, TortugaStake, TortugaUnstake},
+};
+
+pub fn tortuga_stake(
+    smart_contract_address: AccountAddress,
+    amount: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            smart_contract_address,
+            ident_str!("stake_router").to_owned(),
+        ),
+        ident_str!("stake").to_owned(),
+        vec![],
+        vec![bcs::encode(&amount)?],
+        json!([amount.to_string()]),
+    )))
+}
+
+pub fn tortuga_unstake(
+    smart_contract_address: AccountAddress,
+    amount: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            smart_contract_address,
+            ident_str!("stake_router").to_owned(),
+        ),
+        ident_str!("unstake").to_owned(),
+        vec![],
+        vec![bcs::encode(&amount)?],
+        json!([amount.to_string()]),
+    )))
+}
+
+pub fn tortuga_claim(
+    smart_contract_address: AccountAddress,
+    idx: u64,
+) -> SigningResult<TransactionPayload> {
+    Ok(TransactionPayload::EntryFunction(EntryFunction::new(
+        ModuleId::new(
+            smart_contract_address,
+            ident_str!("stake_router").to_owned(),
+        ),
+        ident_str!("claim").to_owned(),
+        vec![],
+        vec![bcs::encode(&idx)?],
+        json!([idx.to_string()]),
+    )))
+}
+
+pub struct Stake {
+    pub amount: u64,
+    pub smart_contract_address: AccountAddress,
+}
+
+pub struct Unstake {
+    pub amount: u64,
+    pub smart_contract_address: AccountAddress,
+}
+
+pub struct Claim {
+    pub idx: u64,
+    pub smart_contract_address: AccountAddress,
+}
+
+pub enum LiquidStakingOperation {
+    Stake(Stake),
+    Unstake(Unstake),
+    Claim(Claim),
+}
+
+impl TryFrom<LiquidStaking<'_>> for LiquidStakingOperation {
+    type Error = SigningError;
+
+    fn try_from(value: LiquidStaking) -> SigningResult<Self> {
+        match value.liquid_stake_transaction_payload {
+            OneOfliquid_stake_transaction_payload::stake(stake_msg) => {
+                let smart_contract_address =
+                    AccountAddress::from_str(&value.smart_contract_address)
+                        .map_err(from_account_error)
+                        .into_tw()
+                        .context("Invalid Smart Contract address")?;
+                Ok(LiquidStakingOperation::Stake(Stake {
+                    amount: stake_msg.amount,
+                    smart_contract_address,
+                }))
+            },
+            OneOfliquid_stake_transaction_payload::unstake(unstake_msg) => {
+                let smart_contract_address =
+                    AccountAddress::from_str(&value.smart_contract_address)
+                        .map_err(from_account_error)
+                        .into_tw()
+                        .context("Invalid Smart Contract address")?;
+                Ok(LiquidStakingOperation::Unstake(Unstake {
+                    amount: unstake_msg.amount,
+                    smart_contract_address,
+                }))
+            },
+            OneOfliquid_stake_transaction_payload::claim(claim) => {
+                let smart_contract_address =
+                    AccountAddress::from_str(&value.smart_contract_address)
+                        .map_err(from_account_error)
+                        .into_tw()
+                        .context("Invalid Smart Contract address")?;
+                Ok(LiquidStakingOperation::Claim(Claim {
+                    idx: claim.idx,
+                    smart_contract_address,
+                }))
+            },
+            OneOfliquid_stake_transaction_payload::None => {
+                SigningError::err(SigningErrorType::Error_invalid_params)
+            },
+        }
+    }
+}
+
+impl From<LiquidStakingOperation> for LiquidStaking<'_> {
+    fn from(value: LiquidStakingOperation) -> Self {
+        match value {
+            LiquidStakingOperation::Stake(stake) => LiquidStaking {
+                smart_contract_address: stake.smart_contract_address.to_hex_literal().into(),
+                liquid_stake_transaction_payload: OneOfliquid_stake_transaction_payload::stake(
+                    TortugaStake {
+                        amount: stake.amount,
+                    },
+                ),
+            },
+            LiquidStakingOperation::Unstake(unstake) => LiquidStaking {
+                smart_contract_address: unstake.smart_contract_address.to_hex_literal().into(),
+                liquid_stake_transaction_payload: OneOfliquid_stake_transaction_payload::unstake(
+                    TortugaUnstake {
+                        amount: unstake.amount,
+                    },
+                ),
+            },
+            LiquidStakingOperation::Claim(claim) => LiquidStaking {
+                smart_contract_address: claim.smart_contract_address.to_hex_literal().into(),
+                liquid_stake_transaction_payload: OneOfliquid_stake_transaction_payload::claim(
+                    TortugaClaim { idx: claim.idx },
+                ),
+            },
+        }
+    }
+}
diff --git a/rust/chains/tw_aptos/src/modules/mod.rs b/rust/chains/tw_aptos/src/modules/mod.rs
new file mode 100644
index 00000000000..c083bb0102e
--- /dev/null
+++ b/rust/chains/tw_aptos/src/modules/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod transaction_util;
diff --git a/rust/chains/tw_aptos/src/modules/transaction_util.rs b/rust/chains/tw_aptos/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..6b7034477f8
--- /dev/null
+++ b/rust/chains/tw_aptos/src/modules/transaction_util.rs
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_util::TransactionUtil;
+use tw_encoding::hex;
+use tw_hash::sha3::sha3_256;
+
+pub struct AptosTransactionUtil;
+
+impl TransactionUtil for AptosTransactionUtil {
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        Self::calc_tx_hash_impl(coin, encoded_tx)
+    }
+}
+
+impl AptosTransactionUtil {
+    fn calc_tx_hash_impl(_coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        let txn_bytes = hex::decode(encoded_tx).map_err(|_| SigningErrorType::Error_input_parse)?;
+
+        // See: https://github.com/aptos-labs/aptos-ts-sdk/blob/f54cac824a41e41dea09c7a6916858a8604dc901/src/api/transaction.ts#L118
+        let prefix = sha3_256("APTOS::Transaction".as_bytes());
+
+        let mut hash_message = Vec::new();
+        hash_message.extend_from_slice(&prefix);
+        // 0 is the index of the enum `Transaction`, see: https://github.com/aptos-labs/aptos-core/blob/6a130c1cca274a5cfdb4a65b441cd5fe61b6c15b/types/src/transaction/mod.rs#L1939
+        hash_message.push(0);
+        hash_message.extend_from_slice(&txn_bytes);
+
+        let tx_hash = sha3_256(&hash_message);
+        Ok(hex::encode(tx_hash, true))
+    }
+}
diff --git a/rust/chains/tw_aptos/src/nft.rs b/rust/chains/tw_aptos/src/nft.rs
new file mode 100644
index 00000000000..172308b4ee2
--- /dev/null
+++ b/rust/chains/tw_aptos/src/nft.rs
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::from_account_error;
+use move_core_types::account_address::AccountAddress;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::Aptos::Proto::mod_NftMessage::OneOfnft_transaction_payload;
+use tw_proto::Aptos::Proto::{CancelOfferNftMessage, ClaimNftMessage, NftMessage, OfferNftMessage};
+
+pub struct Offer {
+    pub receiver: AccountAddress,
+    pub creator: AccountAddress,
+    pub collection: Vec<u8>,
+    pub name: Vec<u8>,
+    pub property_version: u64,
+    pub amount: u64,
+}
+
+pub struct Claim {
+    pub sender: AccountAddress,
+    pub creator: AccountAddress,
+    pub collection: Vec<u8>,
+    pub name: Vec<u8>,
+    pub property_version: u64,
+}
+
+pub enum NftOperation {
+    Claim(Claim),
+    Offer(Offer),
+    Cancel(Offer),
+}
+
+impl TryFrom<NftMessage<'_>> for NftOperation {
+    type Error = SigningError;
+
+    fn try_from(value: NftMessage) -> SigningResult<Self> {
+        match value.nft_transaction_payload {
+            OneOfnft_transaction_payload::offer_nft(msg) => {
+                Ok(NftOperation::Offer(Offer::try_from(msg)?))
+            },
+            OneOfnft_transaction_payload::cancel_offer_nft(msg) => {
+                Ok(NftOperation::Cancel(Offer::try_from(msg)?))
+            },
+            OneOfnft_transaction_payload::claim_nft(msg) => {
+                Ok(NftOperation::Claim(Claim::try_from(msg)?))
+            },
+            OneOfnft_transaction_payload::None => {
+                SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("No transaction payload provided")
+            },
+        }
+    }
+}
+
+impl From<NftOperation> for NftMessage<'_> {
+    fn from(value: NftOperation) -> Self {
+        match value {
+            NftOperation::Claim(claim) => NftMessage {
+                nft_transaction_payload: OneOfnft_transaction_payload::claim_nft(claim.into()),
+            },
+            NftOperation::Offer(offer) => NftMessage {
+                nft_transaction_payload: OneOfnft_transaction_payload::offer_nft(offer.into()),
+            },
+            NftOperation::Cancel(cancel) => NftMessage {
+                nft_transaction_payload: OneOfnft_transaction_payload::cancel_offer_nft(
+                    cancel.into(),
+                ),
+            },
+        }
+    }
+}
+
+impl TryFrom<OfferNftMessage<'_>> for Offer {
+    type Error = SigningError;
+
+    fn try_from(value: OfferNftMessage) -> SigningResult<Self> {
+        Ok(Offer {
+            receiver: AccountAddress::from_str(&value.receiver).map_err(from_account_error)?,
+            creator: AccountAddress::from_str(&value.creator).map_err(from_account_error)?,
+            collection: value.collectionName.as_bytes().to_vec(),
+            name: value.name.as_bytes().to_vec(),
+            property_version: value.property_version,
+            amount: value.amount,
+        })
+    }
+}
+
+impl From<Offer> for OfferNftMessage<'_> {
+    fn from(value: Offer) -> Self {
+        OfferNftMessage {
+            receiver: value.receiver.to_hex_literal().into(),
+            creator: value.creator.to_hex_literal().into(),
+            collectionName: String::from_utf8_lossy(value.collection.as_slice())
+                .to_string()
+                .into(),
+            name: String::from_utf8_lossy(&value.name).to_string().into(),
+            property_version: value.property_version,
+            amount: value.amount,
+        }
+    }
+}
+
+impl TryFrom<CancelOfferNftMessage<'_>> for Offer {
+    type Error = SigningError;
+
+    fn try_from(value: CancelOfferNftMessage) -> SigningResult<Self> {
+        Ok(Offer {
+            receiver: AccountAddress::from_str(&value.receiver)
+                .map_err(from_account_error)
+                .into_tw()
+                .context("Invalid receiver address")?,
+            creator: AccountAddress::from_str(&value.creator)
+                .map_err(from_account_error)
+                .into_tw()
+                .context("Invalid creator address")?,
+            collection: value.collectionName.as_bytes().to_vec(),
+            name: value.name.as_bytes().to_vec(),
+            property_version: value.property_version,
+            amount: 0,
+        })
+    }
+}
+
+impl From<Offer> for CancelOfferNftMessage<'_> {
+    fn from(value: Offer) -> Self {
+        CancelOfferNftMessage {
+            receiver: value.receiver.to_hex_literal().into(),
+            creator: value.creator.to_hex_literal().into(),
+            collectionName: String::from_utf8_lossy(value.collection.as_slice())
+                .to_string()
+                .into(),
+            name: String::from_utf8_lossy(value.name.as_slice())
+                .to_string()
+                .into(),
+            property_version: value.property_version,
+        }
+    }
+}
+
+impl TryFrom<ClaimNftMessage<'_>> for Claim {
+    type Error = SigningError;
+
+    fn try_from(value: ClaimNftMessage) -> SigningResult<Self> {
+        Ok(Claim {
+            sender: AccountAddress::from_str(&value.sender)
+                .map_err(from_account_error)
+                .into_tw()
+                .context("Invalid sender address")?,
+            creator: AccountAddress::from_str(&value.creator)
+                .map_err(from_account_error)
+                .into_tw()
+                .context("Invalid creator address")?,
+            collection: value.collectionName.as_bytes().to_vec(),
+            name: value.name.as_bytes().to_vec(),
+            property_version: value.property_version,
+        })
+    }
+}
+
+impl From<Claim> for ClaimNftMessage<'_> {
+    fn from(value: Claim) -> Self {
+        ClaimNftMessage {
+            sender: value.sender.to_hex_literal().into(),
+            creator: value.creator.to_hex_literal().into(),
+            collectionName: String::from_utf8_lossy(value.collection.as_slice())
+                .to_string()
+                .into(),
+            name: String::from_utf8_lossy(value.name.as_slice())
+                .to_string()
+                .into(),
+            property_version: value.property_version,
+        }
+    }
+}
diff --git a/rust/chains/tw_aptos/src/serde_helper/mod.rs b/rust/chains/tw_aptos/src/serde_helper/mod.rs
new file mode 100644
index 00000000000..876f018225e
--- /dev/null
+++ b/rust/chains/tw_aptos/src/serde_helper/mod.rs
@@ -0,0 +1,5 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+pub mod vec_bytes;
diff --git a/rust/chains/tw_aptos/src/serde_helper/vec_bytes.rs b/rust/chains/tw_aptos/src/serde_helper/vec_bytes.rs
new file mode 100644
index 00000000000..f57311d19dd
--- /dev/null
+++ b/rust/chains/tw_aptos/src/serde_helper/vec_bytes.rs
@@ -0,0 +1,30 @@
+// Copyright © Aptos Foundation
+// Parts of the project are originally copyright © Meta Platforms, Inc.
+// SPDX-License-Identifier: Apache-2.0
+
+use serde::{
+    de::Deserializer,
+    ser::{SerializeSeq, Serializer},
+    Deserialize,
+};
+
+pub fn serialize<S>(data: &[Vec<u8>], serializer: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    let mut seq = serializer.serialize_seq(Some(data.len()))?;
+    for e in data {
+        seq.serialize_element(serde_bytes::Bytes::new(e.as_slice()))?;
+    }
+    seq.end()
+}
+
+pub fn deserialize<'de, D>(deserializer: D) -> Result<Vec<Vec<u8>>, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    Ok(<Vec<serde_bytes::ByteBuf>>::deserialize(deserializer)?
+        .into_iter()
+        .map(serde_bytes::ByteBuf::into_vec)
+        .collect())
+}
diff --git a/rust/chains/tw_aptos/src/signer.rs b/rust/chains/tw_aptos/src/signer.rs
new file mode 100644
index 00000000000..8937e821081
--- /dev/null
+++ b/rust/chains/tw_aptos/src/signer.rs
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::transaction_builder;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_keypair::ed25519;
+use tw_proto::Aptos::Proto;
+
+pub struct Signer;
+
+impl Signer {
+    #[inline]
+    pub fn sign_proto(input: Proto::SigningInput<'_>) -> Proto::SigningOutput<'static> {
+        Self::sign_proto_impl(input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_proto_impl(
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let key_pair = ed25519::sha512::KeyPair::try_from(input.private_key.as_ref())?;
+        let builder = transaction_builder::TransactionFactory::new_from_protobuf(input.clone())?;
+        let sender = Address::from_str(&input.sender)
+            .into_tw()
+            .context("Invalid sender address")?;
+        let signed_tx = builder
+            .sender(sender.inner())
+            .sequence_number(input.sequence_number as u64)
+            .build()?
+            .sign(key_pair)?;
+        Ok(Proto::SigningOutput {
+            raw_txn: signed_tx.raw_txn_bytes().clone().into(),
+            encoded: signed_tx.encoded().clone().into(),
+            authenticator: Some((*signed_tx.authenticator()).clone().into()),
+            json: signed_tx.to_json().to_string().into(),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_aptos/src/transaction.rs b/rust/chains/tw_aptos/src/transaction.rs
new file mode 100644
index 00000000000..f4ca4a2c151
--- /dev/null
+++ b/rust/chains/tw_aptos/src/transaction.rs
@@ -0,0 +1,221 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::constants::APTOS_SALT;
+use crate::transaction_payload::TransactionPayload;
+use move_core_types::account_address::AccountAddress;
+use serde::Serialize;
+use serde_json::{json, Value};
+use std::borrow::Cow;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::encode;
+use tw_encoding::{bcs, EncodingResult};
+use tw_keypair::ed25519::sha512::KeyPair;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_memory::Data;
+use tw_proto::Aptos::Proto;
+
+#[derive(Clone, Serialize)]
+pub enum TransactionAuthenticator {
+    /// Single Ed25519 signature
+    Ed25519 {
+        public_key: Vec<u8>,
+        signature: Vec<u8>,
+    },
+}
+
+impl From<TransactionAuthenticator> for Proto::TransactionAuthenticator<'_> {
+    fn from(from: TransactionAuthenticator) -> Self {
+        Proto::TransactionAuthenticator {
+            signature: Cow::from(from.get_signature()),
+            public_key: Cow::from(from.get_public_key()),
+        }
+    }
+}
+
+impl TransactionAuthenticator {
+    pub fn get_signature(&self) -> Vec<u8> {
+        match self {
+            TransactionAuthenticator::Ed25519 {
+                public_key: _public_key,
+                signature,
+            } => signature.clone(),
+        }
+    }
+
+    pub fn get_public_key(&self) -> Vec<u8> {
+        match self {
+            TransactionAuthenticator::Ed25519 {
+                public_key,
+                signature: _signature,
+            } => public_key.clone(),
+        }
+    }
+
+    pub fn to_json(&self) -> Value {
+        match self {
+            TransactionAuthenticator::Ed25519 {
+                public_key,
+                signature,
+            } => {
+                json!({"public_key": encode(public_key, true),
+                       "signature": encode(signature, true),
+                       "type": "ed25519_signature"})
+            },
+        }
+    }
+}
+
+/// RawTransaction is the portion of a transaction that a client signs.
+#[derive(Clone, Serialize)]
+pub struct RawTransaction {
+    /// Sender's address.
+    sender: AccountAddress,
+
+    /// Sequence number of this transaction. This must match the sequence number
+    /// stored in the sender's account at the time the transaction executes.
+    sequence_number: u64,
+
+    /// The transaction payload, e.g., a script to execute.
+    payload: TransactionPayload,
+
+    /// Maximal total gas to spend for this transaction.
+    max_gas_amount: u64,
+
+    /// Price to be paid per gas unit.
+    gas_unit_price: u64,
+
+    /// Expiration timestamp for this transaction, represented
+    /// as seconds from the Unix Epoch. If the current blockchain timestamp
+    /// is greater than or equal to this time, then the transaction has
+    /// expired and will be discarded. This can be set to a large value far
+    /// in the future to indicate that a transaction does not expire.
+    expiration_timestamp_secs: u64,
+
+    /// Chain ID of the Aptos network this transaction is intended for.
+    chain_id: u8,
+}
+
+impl RawTransaction {
+    /// Create a new `RawTransaction` with a payload.
+    ///
+    /// It can be either to publish a module, to execute a script, or to issue a writeset
+    /// transaction.
+    pub fn new(
+        sender: AccountAddress,
+        sequence_number: u64,
+        payload: TransactionPayload,
+        max_gas_amount: u64,
+        gas_unit_price: u64,
+        expiration_timestamp_secs: u64,
+        chain_id: u8,
+    ) -> Self {
+        RawTransaction {
+            sender,
+            sequence_number,
+            payload,
+            max_gas_amount,
+            gas_unit_price,
+            expiration_timestamp_secs,
+            chain_id,
+        }
+    }
+
+    /// Create a new `RawTransaction` with an entry function
+    fn serialize(&self) -> EncodingResult<Data> {
+        bcs::encode(&self)
+    }
+
+    fn msg_to_sign(&self) -> SigningResult<Data> {
+        let serialized = self
+            .serialize()
+            .into_tw()
+            .context("Error serializing RawTransaction")?;
+        let mut preimage = tw_hash::sha3::sha3_256(APTOS_SALT);
+        preimage.extend_from_slice(serialized.as_slice());
+        Ok(preimage)
+    }
+
+    pub fn pre_image(&self) -> SigningResult<Vec<u8>> {
+        self.msg_to_sign()
+    }
+
+    pub fn compile(
+        &self,
+        signature: Vec<u8>,
+        public_key: Vec<u8>,
+    ) -> SigningResult<SignedTransaction> {
+        let serialized = self.serialize()?;
+        let auth = TransactionAuthenticator::Ed25519 {
+            public_key,
+            signature,
+        };
+        let mut encoded = serialized.clone();
+        encoded.extend_from_slice(bcs::encode(&auth)?.as_slice());
+        Ok(SignedTransaction {
+            raw_txn: self.clone(),
+            authenticator: auth,
+            raw_txn_bytes: serialized.to_vec(),
+            encoded,
+        })
+    }
+
+    pub fn sign(self, key_pair: KeyPair) -> SigningResult<SignedTransaction> {
+        let to_sign = self.pre_image()?;
+        let signature = key_pair.private().sign(to_sign)?.to_bytes().into_vec();
+        let pubkey = key_pair.public().as_slice().to_vec();
+        self.compile(signature, pubkey)
+    }
+
+    pub fn to_json(&self) -> Value {
+        json!({
+            "expiration_timestamp_secs": self.expiration_timestamp_secs.to_string(),
+            "gas_unit_price": self.gas_unit_price.to_string(),
+            "max_gas_amount": self.max_gas_amount.to_string(),
+            "payload": self.payload.to_json(),
+            "sender": self.sender.to_hex_literal(),
+            "sequence_number": self.sequence_number.to_string()
+        })
+    }
+}
+
+/// A transaction that has been signed.
+///
+/// A `SignedTransaction` is a single transaction that can be atomically executed. Clients submit
+/// these to validator nodes, and the validator and executor submits these to the VM.
+///
+#[derive(Clone, Serialize)]
+pub struct SignedTransaction {
+    /// The raw transaction
+    raw_txn: RawTransaction,
+
+    /// Public key and signature to authenticate
+    authenticator: TransactionAuthenticator,
+
+    #[serde(skip_serializing)]
+    /// Raw txs bytes
+    raw_txn_bytes: Vec<u8>,
+
+    #[serde(skip_serializing)]
+    /// Encoded bytes to be broadcast
+    encoded: Vec<u8>,
+}
+
+impl SignedTransaction {
+    pub fn authenticator(&self) -> &TransactionAuthenticator {
+        &self.authenticator
+    }
+    pub fn raw_txn_bytes(&self) -> &Vec<u8> {
+        &self.raw_txn_bytes
+    }
+    pub fn encoded(&self) -> &Vec<u8> {
+        &self.encoded
+    }
+
+    pub fn to_json(&self) -> Value {
+        let mut json_value = self.raw_txn.to_json();
+        json_value["signature"] = self.authenticator.to_json();
+        json_value
+    }
+}
diff --git a/rust/chains/tw_aptos/src/transaction_builder.rs b/rust/chains/tw_aptos/src/transaction_builder.rs
new file mode 100644
index 00000000000..deae84c8008
--- /dev/null
+++ b/rust/chains/tw_aptos/src/transaction_builder.rs
@@ -0,0 +1,278 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::from_account_error;
+use crate::aptos_move_packages::{
+    aptos_account_create_account, aptos_account_transfer, aptos_account_transfer_coins,
+    coin_transfer, managed_coin_register, token_transfers_cancel_offer_script,
+    token_transfers_claim_script, token_transfers_offer_script,
+};
+use crate::constants::{GAS_UNIT_PRICE, MAX_GAS_AMOUNT};
+use crate::liquid_staking::{
+    tortuga_claim, tortuga_stake, tortuga_unstake, LiquidStakingOperation,
+};
+use crate::nft::NftOperation;
+use crate::transaction::RawTransaction;
+use crate::transaction_payload::{
+    convert_proto_struct_tag_to_type_tag, EntryFunction, TransactionPayload,
+};
+use move_core_types::account_address::AccountAddress;
+use move_core_types::language_storage::TypeTag;
+use serde_json::Value;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::Aptos::Proto::mod_SigningInput::OneOftransaction_payload;
+use tw_proto::Aptos::Proto::SigningInput;
+
+pub struct TransactionBuilder {
+    sender: Option<AccountAddress>,
+    sequence_number: Option<u64>,
+    payload: TransactionPayload,
+    max_gas_amount: u64,
+    gas_unit_price: u64,
+    expiration_timestamp_secs: u64,
+    chain_id: u8,
+}
+
+impl TransactionBuilder {
+    pub fn sender(mut self, sender: AccountAddress) -> Self {
+        self.sender = Some(sender);
+        self
+    }
+
+    pub fn sequence_number(mut self, sequence_number: u64) -> Self {
+        self.sequence_number = Some(sequence_number);
+        self
+    }
+
+    pub fn build(self) -> SigningResult<RawTransaction> {
+        let sender = self
+            .sender
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("Invalid sender address")?;
+        let sequence_number = self
+            .sequence_number
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("Invalid sequence number")?;
+        Ok(RawTransaction::new(
+            sender,
+            sequence_number,
+            self.payload,
+            self.max_gas_amount,
+            self.gas_unit_price,
+            self.expiration_timestamp_secs,
+            self.chain_id,
+        ))
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct TransactionFactory {
+    max_gas_amount: u64,
+    gas_unit_price: u64,
+    transaction_expiration_time: u64,
+    chain_id: u8,
+}
+
+impl TransactionFactory {
+    pub fn new(chain_id: u8) -> Self {
+        Self {
+            max_gas_amount: MAX_GAS_AMOUNT,
+            gas_unit_price: GAS_UNIT_PRICE,
+            transaction_expiration_time: 30,
+            chain_id,
+        }
+    }
+
+    pub fn new_from_protobuf(input: SigningInput) -> SigningResult<TransactionBuilder> {
+        let factory = TransactionFactory::new(input.chain_id as u8)
+            .with_gas_unit_price(input.gas_unit_price)
+            .with_max_gas_amount(input.max_gas_amount)
+            .with_transaction_expiration_time(input.expiration_timestamp_secs);
+        match input.transaction_payload {
+            OneOftransaction_payload::transfer(transfer) => factory
+                .implicitly_create_user_account_and_transfer(
+                    AccountAddress::from_str(&transfer.to)
+                        .map_err(from_account_error)
+                        .into_tw()
+                        .context("Invalid destination address")?,
+                    transfer.amount,
+                ),
+            OneOftransaction_payload::token_transfer(token_transfer) => {
+                let func = token_transfer
+                    .function
+                    .or_tw_err(SigningErrorType::Error_invalid_params)
+                    .context("'TokenTransferMessage::function' is not set")?;
+                factory.coins_transfer(
+                    AccountAddress::from_str(&token_transfer.to)
+                        .map_err(from_account_error)
+                        .into_tw()
+                        .context("Invalid destination address")?,
+                    token_transfer.amount,
+                    convert_proto_struct_tag_to_type_tag(func)?,
+                )
+            },
+            OneOftransaction_payload::create_account(create_account) => {
+                let address = AccountAddress::from_str(&create_account.auth_key)
+                    .map_err(from_account_error)
+                    .into_tw()
+                    .context("Invalid 'auth_key' address")?;
+                factory.create_user_account(address)
+            },
+            OneOftransaction_payload::nft_message(nft_message) => {
+                factory.nft_ops(NftOperation::try_from(nft_message)?)
+            },
+            OneOftransaction_payload::register_token(register_token) => {
+                let function = register_token
+                    .function
+                    .or_tw_err(SigningErrorType::Error_invalid_params)
+                    .context("'ManagedTokensRegisterMessage::function' is not set")?;
+                Ok(factory.register_token(convert_proto_struct_tag_to_type_tag(function)?))
+            },
+            OneOftransaction_payload::liquid_staking_message(msg) => {
+                factory.liquid_staking_ops(LiquidStakingOperation::try_from(msg)?)
+            },
+            OneOftransaction_payload::token_transfer_coins(token_transfer_coins) => {
+                let func = token_transfer_coins
+                    .function
+                    .or_tw_err(SigningErrorType::Error_invalid_params)
+                    .context("'TokenTransferCoinsMessage::function' is not set")?;
+                factory.implicitly_create_user_and_coins_transfer(
+                    AccountAddress::from_str(&token_transfer_coins.to)
+                        .map_err(from_account_error)
+                        .into_tw()
+                        .context("Invalid destination address")?,
+                    token_transfer_coins.amount,
+                    convert_proto_struct_tag_to_type_tag(func)?,
+                )
+            },
+            OneOftransaction_payload::None => {
+                let is_blind_sign = !input.any_encoded.is_empty();
+                let v = serde_json::from_str::<Value>(&input.any_encoded)
+                    .into_tw()
+                    .context("Error decoding 'SigningInput::any_encoded' as JSON")?;
+                if is_blind_sign {
+                    let entry_function = EntryFunction::try_from(v)?;
+                    Ok(factory.payload(TransactionPayload::EntryFunction(entry_function)))
+                } else {
+                    SigningError::err(SigningErrorType::Error_input_parse)
+                }
+            },
+        }
+    }
+
+    pub fn with_max_gas_amount(mut self, max_gas_amount: u64) -> Self {
+        self.max_gas_amount = max_gas_amount;
+        self
+    }
+
+    pub fn with_gas_unit_price(mut self, gas_unit_price: u64) -> Self {
+        self.gas_unit_price = gas_unit_price;
+        self
+    }
+
+    pub fn with_transaction_expiration_time(mut self, transaction_expiration_time: u64) -> Self {
+        self.transaction_expiration_time = transaction_expiration_time;
+        self
+    }
+
+    pub fn payload(&self, payload: TransactionPayload) -> TransactionBuilder {
+        self.transaction_builder(payload)
+    }
+
+    pub fn create_user_account(&self, to: AccountAddress) -> SigningResult<TransactionBuilder> {
+        Ok(self.payload(aptos_account_create_account(to)?))
+    }
+
+    pub fn register_token(&self, coin_type: TypeTag) -> TransactionBuilder {
+        self.payload(managed_coin_register(coin_type))
+    }
+
+    pub fn nft_ops(&self, operation: NftOperation) -> SigningResult<TransactionBuilder> {
+        match operation {
+            NftOperation::Claim(claim) => Ok(self.payload(token_transfers_claim_script(
+                claim.sender,
+                claim.creator,
+                claim.collection,
+                claim.name,
+                claim.property_version,
+            )?)),
+            NftOperation::Cancel(offer) => Ok(self.payload(token_transfers_cancel_offer_script(
+                offer.receiver,
+                offer.creator,
+                offer.collection,
+                offer.name,
+                offer.property_version,
+            )?)),
+            NftOperation::Offer(offer) => Ok(self.payload(token_transfers_offer_script(
+                offer.receiver,
+                offer.creator,
+                offer.collection,
+                offer.name,
+                offer.property_version,
+                offer.amount,
+            )?)),
+        }
+    }
+
+    pub fn liquid_staking_ops(
+        &self,
+        operation: LiquidStakingOperation,
+    ) -> SigningResult<TransactionBuilder> {
+        match operation {
+            LiquidStakingOperation::Stake(stake) => {
+                Ok(self.payload(tortuga_stake(stake.smart_contract_address, stake.amount)?))
+            },
+            LiquidStakingOperation::Unstake(unstake) => Ok(self.payload(tortuga_unstake(
+                unstake.smart_contract_address,
+                unstake.amount,
+            )?)),
+            LiquidStakingOperation::Claim(claim) => {
+                Ok(self.payload(tortuga_claim(claim.smart_contract_address, claim.idx)?))
+            },
+        }
+    }
+
+    pub fn implicitly_create_user_account_and_transfer(
+        &self,
+        to: AccountAddress,
+        amount: u64,
+    ) -> SigningResult<TransactionBuilder> {
+        Ok(self.payload(aptos_account_transfer(to, amount)?))
+    }
+
+    pub fn coins_transfer(
+        &self,
+        to: AccountAddress,
+        amount: u64,
+        coin_type: TypeTag,
+    ) -> SigningResult<TransactionBuilder> {
+        Ok(self.payload(coin_transfer(coin_type, to, amount)?))
+    }
+
+    pub fn implicitly_create_user_and_coins_transfer(
+        &self,
+        to: AccountAddress,
+        amount: u64,
+        coin_type: TypeTag,
+    ) -> SigningResult<TransactionBuilder> {
+        Ok(self.payload(aptos_account_transfer_coins(coin_type, to, amount)?))
+    }
+
+    fn transaction_builder(&self, payload: TransactionPayload) -> TransactionBuilder {
+        TransactionBuilder {
+            sender: None,
+            sequence_number: None,
+            payload,
+            max_gas_amount: self.max_gas_amount,
+            gas_unit_price: self.gas_unit_price,
+            expiration_timestamp_secs: self.expiration_timestamp(),
+            chain_id: self.chain_id,
+        }
+    }
+
+    fn expiration_timestamp(&self) -> u64 {
+        self.transaction_expiration_time
+    }
+}
diff --git a/rust/chains/tw_aptos/src/transaction_payload.rs b/rust/chains/tw_aptos/src/transaction_payload.rs
new file mode 100644
index 00000000000..d0105bc949d
--- /dev/null
+++ b/rust/chains/tw_aptos/src/transaction_payload.rs
@@ -0,0 +1,276 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::serde_helper::vec_bytes;
+use move_core_types::identifier::Identifier;
+use move_core_types::language_storage::{ModuleId, StructTag, TypeTag};
+use move_core_types::parser::parse_transaction_argument;
+use move_core_types::transaction_argument::TransactionArgument;
+use serde::{Deserialize, Serialize};
+use serde_json::{json, Value};
+use std::default::Default;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::{bcs, EncodingError, EncodingResult};
+use tw_memory::Data;
+use tw_proto::Aptos;
+
+pub type EntryFunctionResult<T> = Result<T, EntryFunctionError>;
+
+#[derive(Debug)]
+pub enum EntryFunctionError {
+    MissingFunctionName,
+    InvalidFunctionName,
+    MissingArguments,
+    InvalidArguments,
+    EncodingError,
+    MissingTypeArguments,
+    InvalidTypeArguments,
+}
+
+impl From<EncodingError> for EntryFunctionError {
+    fn from(_error: EncodingError) -> Self {
+        EntryFunctionError::EncodingError
+    }
+}
+
+impl From<EntryFunctionError> for SigningError {
+    fn from(e: EntryFunctionError) -> Self {
+        SigningError::new(SigningErrorType::Error_invalid_params)
+            .context(format!("Error decoding EntryFunction: {e:?}"))
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub struct EntryFunction {
+    module: ModuleId,
+    function: Identifier,
+    ty_args: Vec<TypeTag>,
+    #[serde(with = "vec_bytes")]
+    args: Vec<Vec<u8>>,
+    #[serde(skip_serializing)]
+    json_args: Value,
+}
+
+impl TryFrom<Value> for EntryFunction {
+    type Error = EntryFunctionError;
+
+    fn try_from(value: Value) -> EntryFunctionResult<Self> {
+        let function_str = value["function"]
+            .as_str()
+            .ok_or(EntryFunctionError::MissingFunctionName)?;
+        let tag = StructTag::from_str(function_str)
+            .map_err(|_| EntryFunctionError::InvalidFunctionName)?;
+
+        let args = value["arguments"]
+            .as_array()
+            .ok_or(EntryFunctionError::MissingArguments)?
+            .iter()
+            .map(|element| {
+                let arg_str = element.to_string();
+                let arg = parse_transaction_argument(
+                    arg_str.trim_start_matches('"').trim_end_matches('"'),
+                )
+                .map_err(|_| EntryFunctionError::InvalidArguments)?;
+                serialize_argument(&arg).map_err(EntryFunctionError::from)
+            })
+            .collect::<EntryFunctionResult<Vec<Data>>>()?;
+
+        let ty_args = value["type_arguments"]
+            .as_array()
+            .ok_or(EntryFunctionError::MissingTypeArguments)?
+            .iter()
+            .map(|element| {
+                let ty_arg_str = element
+                    .as_str()
+                    .ok_or(EntryFunctionError::InvalidTypeArguments)?;
+                TypeTag::from_str(ty_arg_str).map_err(|_| EntryFunctionError::InvalidTypeArguments)
+            })
+            .collect::<EntryFunctionResult<Vec<TypeTag>>>()?;
+
+        Ok(EntryFunction {
+            module: tag.module_id(),
+            function: tag.name,
+            ty_args,
+            args,
+            json_args: value["arguments"].clone(),
+        })
+    }
+}
+
+fn serialize_argument(arg: &TransactionArgument) -> EncodingResult<Data> {
+    match arg {
+        TransactionArgument::U8(v) => bcs::encode(v),
+        TransactionArgument::U16(v) => bcs::encode(v),
+        TransactionArgument::U32(v) => bcs::encode(v),
+        TransactionArgument::U64(v) => bcs::encode(v),
+        TransactionArgument::U128(v) => bcs::encode(v),
+        TransactionArgument::U256(v) => bcs::encode(v),
+        TransactionArgument::U8Vector(v) => bcs::encode(v),
+        TransactionArgument::Bool(v) => bcs::encode(v),
+        TransactionArgument::Address(v) => bcs::encode(v),
+    }
+}
+
+pub fn convert_proto_struct_tag_to_type_tag(
+    struct_tag: Aptos::Proto::StructTag,
+) -> SigningResult<TypeTag> {
+    TypeTag::from_str(&format!(
+        "{}::{}::{}",
+        struct_tag.account_address, struct_tag.module, struct_tag.name
+    ))
+    .tw_err(|_| SigningErrorType::Error_invalid_params)
+}
+
+pub fn convert_type_tag_to_struct_tag(type_tag: TypeTag) -> Aptos::Proto::StructTag<'static> {
+    if let TypeTag::Struct(st) = type_tag {
+        Aptos::Proto::StructTag {
+            account_address: st.address.to_hex_literal().into(),
+            module: st.module.to_string().into(),
+            name: st.name.to_string().into(),
+        }
+    } else {
+        Aptos::Proto::StructTag::default()
+    }
+}
+
+impl EntryFunction {
+    fn to_json(&self) -> Value {
+        // Create a JSON array from the `ty_args` field by filtering and mapping
+        // the items that match `TypeTag::Struct` to their string representation.
+        let type_arguments: Value = self
+            .ty_args
+            .iter()
+            .map(|item| Some(json!(item.to_string())))
+            .collect();
+
+        // Construct the final JSON value
+        json!({
+            "type": "entry_function_payload",
+            "function": format!("{}::{}", self.module.short_str_lossless(), self.function.clone().into_string()),
+            "arguments": self.json_args,
+            "type_arguments": type_arguments
+        })
+    }
+}
+
+#[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
+pub enum TransactionPayload {
+    Script,
+    ModuleBundle,
+    /// A transaction that executes an existing entry function published on-chain.
+    EntryFunction(EntryFunction),
+}
+
+impl TransactionPayload {
+    pub fn to_json(&self) -> Value {
+        match self {
+            TransactionPayload::Script => Value::default(),
+            TransactionPayload::ModuleBundle => Value::default(),
+            TransactionPayload::EntryFunction(entry) => entry.to_json(),
+        }
+    }
+}
+
+impl EntryFunction {
+    pub fn new(
+        module: ModuleId,
+        function: Identifier,
+        ty_args: Vec<TypeTag>,
+        args: Vec<Vec<u8>>,
+        json_args: Value,
+    ) -> Self {
+        EntryFunction {
+            module,
+            function,
+            ty_args,
+            args,
+            json_args,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::address::Address;
+    use move_core_types::account_address::AccountAddress;
+    use move_core_types::identifier::Identifier;
+    use move_core_types::language_storage::{ModuleId, TypeTag};
+    use serde_json::{json, Value};
+    use std::str::FromStr;
+    use tw_encoding::hex;
+
+    #[test]
+    fn test_payload_from_json() {
+        let payload_value: Value = json!({
+            "arguments": ["0xc95db29a67a848940829b3df6119b5e67b788ff0248676e4484c7c6f29c0f5e6"],
+            "function": "0xc23c3b70956ce8d88fb18ad9ed3b463fe873cb045db3f6d2e2fb15b9aab71d50::IFO::release",
+            "type": "entry_function_payload",
+            "type_arguments": [
+              "0x48e0e3958d42b8d452c9199d4a221d0d1b15d14655787453dbe77208ced90517::coins::BUSD",
+              "0x48e0e3958d42b8d452c9199d4a221d0d1b15d14655787453dbe77208ced90517::coins::DAI",
+              "0x9936836587ca33240d3d3f91844651b16cb07802faf5e34514ed6f78580deb0a::uints::U1"
+            ]
+        });
+
+        let v = EntryFunction::try_from(payload_value.clone()).unwrap();
+        assert_eq!(payload_value, v.to_json());
+
+        let tp = TransactionPayload::EntryFunction(v);
+        let serialized = bcs::encode(&tp).unwrap();
+        assert_eq!(hex::encode(serialized, false), "02c23c3b70956ce8d88fb18ad9ed3b463fe873cb045db3f6d2e2fb15b9aab71d500349464f0772656c65617365030748e0e3958d42b8d452c9199d4a221d0d1b15d14655787453dbe77208ced9051705636f696e730442555344000748e0e3958d42b8d452c9199d4a221d0d1b15d14655787453dbe77208ced9051705636f696e730344414900079936836587ca33240d3d3f91844651b16cb07802faf5e34514ed6f78580deb0a0575696e7473025531000120c95db29a67a848940829b3df6119b5e67b788ff0248676e4484c7c6f29c0f5e6");
+    }
+
+    #[test]
+    fn test_payload_from_json_with_arg_non_str() {
+        let payload_value: Value = json!({
+            "type":"entry_function_payload",
+            "function":"0xd11107bdf0d6d7040c6c0bfbdecb6545191fdf13e8d8d259952f53e1713f61b5::ditto_staking::stake_aptos",
+            "type_arguments":[],
+            "arguments": [1000000]
+        });
+
+        let v = EntryFunction::try_from(payload_value.clone()).unwrap();
+        assert_eq!(payload_value, v.to_json());
+    }
+
+    #[test]
+    fn test_basic_payload() {
+        let addr =
+            Address::from_str("0xeeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b")
+                .unwrap()
+                .inner();
+        let amount: i64 = 1000;
+        let args = vec![bcs::encode(&addr).unwrap(), bcs::encode(&amount).unwrap()];
+        let module = ModuleId::new(AccountAddress::ONE, Identifier::from_str("coin").unwrap());
+        let function = Identifier::from_str("transfer").unwrap();
+        let type_tag = vec![TypeTag::from_str("0x1::aptos_coin::AptosCoin").unwrap()];
+        let entry = EntryFunction::new(
+            module,
+            function,
+            type_tag,
+            args,
+            json!([addr.to_hex_literal(), amount.to_string()]),
+        );
+        let tp = TransactionPayload::EntryFunction(entry);
+        let serialized = bcs::encode(&tp).unwrap();
+        let expected_serialized = "02000000000000000000000000000000000000000000000000000000000000000104636f696e087472616e73666572010700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e000220eeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b08e803000000000000";
+        assert_eq!(hex::encode(serialized, false), expected_serialized);
+        let payload_value: Value = json!({
+                "function": "0x1::coin::transfer",
+                "type": "entry_function_payload",
+                "arguments": ["0xeeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b", "1000"],
+                "type_arguments": ["0x1::aptos_coin::AptosCoin"]
+        });
+        assert_eq!(tp.to_json(), payload_value);
+
+        // Rebuild a new EntryFunction object from the JSON above
+        let v = EntryFunction::try_from(payload_value.clone()).unwrap();
+        let tp = TransactionPayload::EntryFunction(v);
+        // Serialize the new EntryFunction object and compare with the expected serialized value
+        let serialized = bcs::encode(&tp).unwrap();
+        assert_eq!(hex::encode(serialized, false), expected_serialized);
+    }
+}
diff --git a/rust/chains/tw_aptos/tests/signer.rs b/rust/chains/tw_aptos/tests/signer.rs
new file mode 100644
index 00000000000..e69c6894839
--- /dev/null
+++ b/rust/chains/tw_aptos/tests/signer.rs
@@ -0,0 +1,871 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use move_core_types::account_address::AccountAddress;
+use move_core_types::language_storage::TypeTag;
+use std::str::FromStr;
+use tw_aptos::liquid_staking;
+use tw_aptos::liquid_staking::{LiquidStakingOperation, Stake, Unstake};
+use tw_aptos::nft::{Claim, NftOperation, Offer};
+use tw_aptos::signer::Signer;
+use tw_aptos::transaction_payload::convert_type_tag_to_struct_tag;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex;
+use tw_proto::Aptos::Proto;
+use tw_proto::Aptos::Proto::{SigningInput, SigningOutput};
+
+pub struct AccountCreation {
+    to: String,
+}
+
+pub struct Transfer {
+    to: String,
+    amount: u64,
+}
+
+pub struct TokenTransfer {
+    transfer: Transfer,
+    tag: TypeTag,
+}
+
+pub struct RegisterToken {
+    coin_type: TypeTag,
+}
+
+pub enum OpsDetails {
+    RegisterToken(RegisterToken),
+    LiquidStakingOps(LiquidStakingOperation),
+    AccountCreation(AccountCreation),
+    Transfer(Transfer),
+    TokenTransfer(TokenTransfer),
+    ImplicitTokenTransfer(TokenTransfer),
+    NftOps(NftOperation),
+}
+
+fn setup_proto_transaction<'a>(
+    sender: &'a str,
+    keypair_str: &'a str,
+    transaction_type: &'a str,
+    sequence_number: i64,
+    chain_id: u32,
+    max_gas_amount: u64,
+    timestamp: u64,
+    gas_unit_price: u64,
+    any_encoded: &'a str,
+    ops_details: Option<OpsDetails>,
+) -> SigningInput<'a> {
+    let private = hex::decode(keypair_str).unwrap();
+
+    let payload: Proto::mod_SigningInput::OneOftransaction_payload = match transaction_type {
+        "transfer" => {
+            if let OpsDetails::Transfer(transfer) = ops_details.unwrap() {
+                Proto::mod_SigningInput::OneOftransaction_payload::transfer(
+                    Proto::TransferMessage {
+                        to: transfer.to.into(),
+                        amount: transfer.amount,
+                    },
+                )
+            } else {
+                panic!("Unsupported arguments")
+            }
+        },
+        "create_account" => {
+            if let OpsDetails::AccountCreation(account) = ops_details.unwrap() {
+                Proto::mod_SigningInput::OneOftransaction_payload::create_account(
+                    Proto::CreateAccountMessage {
+                        auth_key: account.to.into(),
+                    },
+                )
+            } else {
+                panic!("Unsupported arguments")
+            }
+        },
+        "coin_transfer" => {
+            if let OpsDetails::TokenTransfer(token_transfer) = ops_details.unwrap() {
+                Proto::mod_SigningInput::OneOftransaction_payload::token_transfer(
+                    Proto::TokenTransferMessage {
+                        to: token_transfer.transfer.to.into(),
+                        amount: token_transfer.transfer.amount,
+                        function: Some(convert_type_tag_to_struct_tag(token_transfer.tag)),
+                    },
+                )
+            } else {
+                panic!("Unsupported arguments")
+            }
+        },
+        "implicit_coin_transfer" => {
+            if let OpsDetails::ImplicitTokenTransfer(token_transfer) = ops_details.unwrap() {
+                Proto::mod_SigningInput::OneOftransaction_payload::token_transfer_coins(
+                    Proto::TokenTransferCoinsMessage {
+                        to: token_transfer.transfer.to.into(),
+                        amount: token_transfer.transfer.amount,
+                        function: Some(convert_type_tag_to_struct_tag(token_transfer.tag)),
+                    },
+                )
+            } else {
+                panic!("Unsupported arguments")
+            }
+        },
+        "nft_ops" => {
+            if let OpsDetails::NftOps(nft) = ops_details.unwrap() {
+                Proto::mod_SigningInput::OneOftransaction_payload::nft_message(nft.into())
+            } else {
+                panic!("Unsupported arguments")
+            }
+        },
+        "register_token" => {
+            if let OpsDetails::RegisterToken(register_token) = ops_details.unwrap() {
+                Proto::mod_SigningInput::OneOftransaction_payload::register_token(
+                    Proto::ManagedTokensRegisterMessage {
+                        function: Some(convert_type_tag_to_struct_tag(register_token.coin_type)),
+                    },
+                )
+            } else {
+                panic!("Unsupported arguments")
+            }
+        },
+        "liquid_staking_ops" => {
+            if let OpsDetails::LiquidStakingOps(liquid_staking_ops) = ops_details.unwrap() {
+                Proto::mod_SigningInput::OneOftransaction_payload::liquid_staking_message(
+                    liquid_staking_ops.into(),
+                )
+            } else {
+                panic!("Unsupported arguments")
+            }
+        },
+        "blind_sign_json" => Proto::mod_SigningInput::OneOftransaction_payload::None,
+        _ => Proto::mod_SigningInput::OneOftransaction_payload::None,
+    };
+
+    let input = SigningInput {
+        chain_id,
+        sender: sender.into(),
+        sequence_number,
+        max_gas_amount,
+        gas_unit_price,
+        expiration_timestamp_secs: timestamp,
+        private_key: private.into(),
+        any_encoded: any_encoded.into(),
+        transaction_payload: payload,
+    };
+
+    input
+}
+
+fn test_tx_result(
+    output: SigningOutput,
+    expected_raw_txn_bytes_str: &str,
+    expected_signature_str: &str,
+    expected_encoded_txn_str: &str,
+    json_literal: &str,
+) {
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    assert_eq!(
+        hex::encode(output.raw_txn.to_vec(), false),
+        expected_raw_txn_bytes_str
+    );
+    assert_eq!(
+        hex::encode(output.authenticator.unwrap().signature.to_vec(), false),
+        expected_signature_str
+    );
+    assert_eq!(
+        hex::encode(output.encoded.to_vec(), false),
+        expected_encoded_txn_str
+    );
+
+    let json_value_expected: serde_json::Value = serde_json::from_str(json_literal).unwrap();
+    let json_value: serde_json::Value = serde_json::from_str(output.json.as_ref()).unwrap();
+    assert_eq!(json_value, json_value_expected);
+}
+
+// Successfully broadcasted https://explorer.aptoslabs.com/txn/0xb4d62afd3862116e060dd6ad9848ccb50c2bc177799819f1d29c059ae2042467?network=devnet
+#[test]
+fn test_aptos_sign_transaction_transfer() {
+    let input = setup_proto_transaction(
+        "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",
+        "transfer",
+        99,
+        33,
+        3296766,
+        3664390082,
+        100,
+        "",
+        Some(OpsDetails::Transfer(Transfer {
+            to: "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30".to_string(),
+            amount: 1000,
+        })),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021",
+                   "5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01",
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01",
+                   r#"{
+            "expiration_timestamp_secs": "3664390082",
+            "gas_unit_price": "100",
+            "max_gas_amount": "3296766",
+            "payload": {
+                "arguments": ["0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30","1000"],
+                "function": "0x1::aptos_account::transfer",
+                "type": "entry_function_payload",
+                "type_arguments": []
+            },
+            "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+            "sequence_number": "99",
+            "signature": {
+                "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                "signature": "0x5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01",
+                "type": "ed25519_signature"
+            }
+        }"#);
+}
+
+// Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x477141736de6b0936a6c3734e4d6fd018c7d21f1f28f99028ef0bc6881168602?network=Devnet
+#[test]
+fn test_aptos_sign_create_account() {
+    let input = setup_proto_transaction(
+        "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30", // Sender's address
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",   // Keypair
+        "create_account",
+        0, // Sequence number
+        33,
+        3296766,
+        3664390082,
+        100,
+        "",
+        Some(OpsDetails::AccountCreation(AccountCreation {
+            to: "0x3aa1672641a4e17b3d913b4c0301e805755a80b12756fc729c5878f12344d30e".to_string(),
+        })),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3000000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e740e6372656174655f6163636f756e740001203aa1672641a4e17b3d913b4c0301e805755a80b12756fc729c5878f12344d30efe4d3200000000006400000000000000c2276ada0000000021", // Expected raw transaction bytes
+                   "fcba3dfbec76721454ef414955f09f159660a13886b4edd8c579e3c779c29073afe7b25efa3fef9b21c2efb1cf16b4247fc0e5c8f63fdcd1c8d87f5d59f44501", // Expected signature
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3000000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e740e6372656174655f6163636f756e740001203aa1672641a4e17b3d913b4c0301e805755a80b12756fc729c5878f12344d30efe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c40fcba3dfbec76721454ef414955f09f159660a13886b4edd8c579e3c779c29073afe7b25efa3fef9b21c2efb1cf16b4247fc0e5c8f63fdcd1c8d87f5d59f44501", // Expected encoded transaction
+                   r#"{
+            "expiration_timestamp_secs": "3664390082",
+            "gas_unit_price": "100",
+            "max_gas_amount": "3296766",
+            "payload": {
+                "arguments": ["0x3aa1672641a4e17b3d913b4c0301e805755a80b12756fc729c5878f12344d30e"],
+                "function": "0x1::aptos_account::create_account",
+                "type": "entry_function_payload",
+                "type_arguments": []
+            },
+            "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+            "sequence_number": "0",
+            "signature": {
+                "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                "signature": "0xfcba3dfbec76721454ef414955f09f159660a13886b4edd8c579e3c779c29073afe7b25efa3fef9b21c2efb1cf16b4247fc0e5c8f63fdcd1c8d87f5d59f44501",
+                "type": "ed25519_signature"
+            }
+        }"#);
+}
+
+// Successfully broadcasted https://explorer.aptoslabs.com/txn/0xb5b383a5c7f99b2edb3bed9533f8169a89051b149d65876a82f4c0b9bf78a15b?network=Devnet
+#[test]
+fn test_aptos_sign_coin_transfer() {
+    let input = setup_proto_transaction(
+        "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30", // Sender's address
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",   // Keypair
+        "coin_transfer",
+        24, // Sequence number
+        32,
+        3296766,
+        3664390082,
+        100,
+        "",
+        Some(OpsDetails::TokenTransfer(TokenTransfer {
+            transfer: Transfer {
+                to: "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30"
+                    .to_string(),
+                amount: 100000,
+            },
+            tag: TypeTag::from_str(
+                "0x43417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b9::coins::BTC",
+            )
+            .unwrap(),
+        })),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30180000000000000002000000000000000000000000000000000000000000000000000000000000000104636f696e087472616e73666572010743417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b905636f696e730342544300022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008a086010000000000fe4d3200000000006400000000000000c2276ada0000000020", // Expected raw transaction bytes
+                   "7643ec8aae6198bd13ca6ea2962265859cba5a228e7d181131f6c022700dd02a7a04dc0345ad99a0289e5ab80b130b3864e6404079980bc226f1a13aee7d280a", // Expected signature
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30180000000000000002000000000000000000000000000000000000000000000000000000000000000104636f696e087472616e73666572010743417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b905636f696e730342544300022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008a086010000000000fe4d3200000000006400000000000000c2276ada00000000200020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c407643ec8aae6198bd13ca6ea2962265859cba5a228e7d181131f6c022700dd02a7a04dc0345ad99a0289e5ab80b130b3864e6404079980bc226f1a13aee7d280a", // Expected encoded transaction
+                   r#"{
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "3296766",
+                    "payload": {
+                        "arguments": ["0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30","100000"],
+                        "function": "0x1::coin::transfer",
+                        "type": "entry_function_payload",
+                        "type_arguments": ["0x43417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b9::coins::BTC"]
+                    },
+                    "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+                    "sequence_number": "24",
+                    "signature": {
+                        "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                        "signature": "0x7643ec8aae6198bd13ca6ea2962265859cba5a228e7d181131f6c022700dd02a7a04dc0345ad99a0289e5ab80b130b3864e6404079980bc226f1a13aee7d280a",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted https://explorer.aptoslabs.com/txn/0x197d40ea12e2bfc65a0a913b9f4ca3b0b0208fe0c1514d3d55cef3d5bcf25211?network=mainnet
+#[test]
+fn test_implicit_aptos_sign_coin_transfer() {
+    let input = setup_proto_transaction("0x1869b853768f0ba935d67f837a66b172dd39a60ca2315f8d4e0e669bbd35cf25", // Sender's address
+                                        "e7f56c77189e03699a75d8ec5c090e41f3d9d4783bc49c33df8a93d915e10de8", // Keypair
+                                        "implicit_coin_transfer",
+                                        2, // Sequence number
+                                        1,
+                                        2000,
+                                        3664390082,
+                                        100,
+                                        "",
+                                        Some(OpsDetails::ImplicitTokenTransfer(TokenTransfer { transfer: Transfer { to: "0xb7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c".to_string(), amount: 10000 }, tag: TypeTag::from_str("0xe9c192ff55cffab3963c695cff6dbf9dad6aff2bb5ac19a6415cad26a81860d9::mee_coin::MeeCoin").unwrap() })),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "1869b853768f0ba935d67f837a66b172dd39a60ca2315f8d4e0e669bbd35cf2502000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e740e7472616e736665725f636f696e730107e9c192ff55cffab3963c695cff6dbf9dad6aff2bb5ac19a6415cad26a81860d9086d65655f636f696e074d6565436f696e000220b7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c081027000000000000d0070000000000006400000000000000c2276ada0000000001", // Expected raw transaction bytes
+                   "30ebd7e95cb464677f411868e2cbfcb22bc01cc63cded36c459dff45e6d2f1354ae4e090e7dfbb509851c0368b343e0e5ecaf6b08e7c1b94c186530b0f7dee0d", // Expected signature
+                   "1869b853768f0ba935d67f837a66b172dd39a60ca2315f8d4e0e669bbd35cf2502000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e740e7472616e736665725f636f696e730107e9c192ff55cffab3963c695cff6dbf9dad6aff2bb5ac19a6415cad26a81860d9086d65655f636f696e074d6565436f696e000220b7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c081027000000000000d0070000000000006400000000000000c2276ada0000000001002062e7a6a486553b56a53e89dfae3f780693e537e5b0a7ed33290780e581ca83694030ebd7e95cb464677f411868e2cbfcb22bc01cc63cded36c459dff45e6d2f1354ae4e090e7dfbb509851c0368b343e0e5ecaf6b08e7c1b94c186530b0f7dee0d", // Expected encoded transaction
+                   r#"{
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "2000",
+                    "payload": {
+                        "arguments": ["0xb7c7d12080209e9dc14498c80200706e760363fb31782247e82cf57d1d6e5d6c","10000"],
+                        "function": "0x1::aptos_account::transfer_coins",
+                        "type": "entry_function_payload",
+                        "type_arguments": ["0xe9c192ff55cffab3963c695cff6dbf9dad6aff2bb5ac19a6415cad26a81860d9::mee_coin::MeeCoin"]
+                    },
+                    "sender": "0x1869b853768f0ba935d67f837a66b172dd39a60ca2315f8d4e0e669bbd35cf25",
+                    "sequence_number": "2",
+                    "signature": {
+                        "public_key": "0x62e7a6a486553b56a53e89dfae3f780693e537e5b0a7ed33290780e581ca8369",
+                        "signature": "0x30ebd7e95cb464677f411868e2cbfcb22bc01cc63cded36c459dff45e6d2f1354ae4e090e7dfbb509851c0368b343e0e5ecaf6b08e7c1b94c186530b0f7dee0d",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted https://explorer.aptoslabs.com/txn/0x514e473618bd3cb89a2b110b7c473db9a2e10532f98eb42d02d86fb31c00525d?network=testnet
+#[test]
+fn test_aptos_nft_offer() {
+    let input = setup_proto_transaction(
+        "0x783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee", // Sender's address
+        "7bebb6d543d17f6fe4e685cfab239fa37896edd594ff859f1df32f244fb707e2",   // Keypair
+        "nft_ops",
+        1, // Sequence number
+        2,
+        3296766,
+        3664390082,
+        100,
+        "",
+        Some(OpsDetails::NftOps(NftOperation::Offer(Offer {
+            receiver: AccountAddress::from_str(
+                "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+            )
+            .unwrap(),
+            creator: AccountAddress::from_str(
+                "0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac",
+            )
+            .unwrap(),
+            collection: "Topaz Troopers".as_bytes().to_vec(),
+            name: "Topaz Trooper #20068".as_bytes().to_vec(),
+            property_version: 0,
+            amount: 1,
+        }))),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee01000000000000000200000000000000000000000000000000000000000000000000000000000000030f746f6b656e5f7472616e73666572730c6f666665725f73637269707400062007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30209125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac0f0e546f70617a2054726f6f706572731514546f70617a2054726f6f70657220233230303638080000000000000000080100000000000000fe4d3200000000006400000000000000c2276ada0000000002", // Expected raw transaction bytes
+                   "af5c7357a83c69e3f425beb23eaf232f8bb36dea3b7cad4a7ab8d735cee999c8ec5285005adf69dc85a6c34b042dd0308fe92b76dad5d6ac88c7b9259902c10f", // Expected signature
+                   "783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee01000000000000000200000000000000000000000000000000000000000000000000000000000000030f746f6b656e5f7472616e73666572730c6f666665725f73637269707400062007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30209125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac0f0e546f70617a2054726f6f706572731514546f70617a2054726f6f70657220233230303638080000000000000000080100000000000000fe4d3200000000006400000000000000c2276ada00000000020020d1d99b67e37b483161a0fa369c46f34a3be4863c20e20fc7cdc669c0826a411340af5c7357a83c69e3f425beb23eaf232f8bb36dea3b7cad4a7ab8d735cee999c8ec5285005adf69dc85a6c34b042dd0308fe92b76dad5d6ac88c7b9259902c10f", // Expected encoded transaction
+                   r#"{
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "3296766",
+                    "payload": {
+                        "arguments": [
+                                      "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+                                      "0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac",
+                                      "Topaz Troopers", "Topaz Trooper #20068", "0", "1"],
+                        "function": "0x3::token_transfers::offer_script",
+                        "type": "entry_function_payload",
+                        "type_arguments": []
+                    },
+                    "sender": "0x783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee",
+                    "sequence_number": "1",
+                    "signature": {
+                        "public_key": "0xd1d99b67e37b483161a0fa369c46f34a3be4863c20e20fc7cdc669c0826a4113",
+                        "signature": "0xaf5c7357a83c69e3f425beb23eaf232f8bb36dea3b7cad4a7ab8d735cee999c8ec5285005adf69dc85a6c34b042dd0308fe92b76dad5d6ac88c7b9259902c10f",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted https://explorer.aptoslabs.com/txn/0x0b8c64e6847c368e4c6bd2cce0e9eab378971b0ef2e3bc40cbd292910a80201d?network=testnet
+#[test]
+fn test_aptos_cancel_nft_offer() {
+    let input = setup_proto_transaction(
+        "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30", // Sender's address
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",  // Keypair
+        "nft_ops",
+        21, // Sequence number
+        2,
+        3296766,
+        3664390082,
+        100,
+        "",
+        Some(OpsDetails::NftOps(NftOperation::Cancel(Offer {
+            receiver: AccountAddress::from_str(
+                "0x783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee",
+            )
+            .unwrap(),
+            creator: AccountAddress::from_str(
+                "0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac",
+            )
+            .unwrap(),
+            collection: "Topaz Troopers".as_bytes().to_vec(),
+            name: "Topaz Trooper #20068".as_bytes().to_vec(),
+            property_version: 0,
+            amount: 0,
+        }))),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3015000000000000000200000000000000000000000000000000000000000000000000000000000000030f746f6b656e5f7472616e73666572731363616e63656c5f6f666665725f736372697074000520783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee209125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac0f0e546f70617a2054726f6f706572731514546f70617a2054726f6f70657220233230303638080000000000000000fe4d3200000000006400000000000000c2276ada0000000002", // Expected raw transaction bytes
+                   "826722d374e276f618123e77da3ac024c89a3f97db9e09e19aa8ed06c3cdfc57d4a21c7890137f9a7c0447cc303447ba10ca5b1908e889071e0a68f48c0f260a", // Expected signature
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3015000000000000000200000000000000000000000000000000000000000000000000000000000000030f746f6b656e5f7472616e73666572731363616e63656c5f6f666665725f736372697074000520783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee209125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac0f0e546f70617a2054726f6f706572731514546f70617a2054726f6f70657220233230303638080000000000000000fe4d3200000000006400000000000000c2276ada00000000020020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c40826722d374e276f618123e77da3ac024c89a3f97db9e09e19aa8ed06c3cdfc57d4a21c7890137f9a7c0447cc303447ba10ca5b1908e889071e0a68f48c0f260a", // Expected encoded transaction
+                   r#"{
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "3296766",
+                    "payload": {
+                        "arguments": [
+                                      "0x783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee",
+                                      "0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac",
+                                      "Topaz Troopers", "Topaz Trooper #20068", "0"],
+                        "function": "0x3::token_transfers::cancel_offer_script",
+                        "type": "entry_function_payload",
+                        "type_arguments": []
+                    },
+                    "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+                    "sequence_number": "21",
+                    "signature": {
+                        "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                        "signature": "0x826722d374e276f618123e77da3ac024c89a3f97db9e09e19aa8ed06c3cdfc57d4a21c7890137f9a7c0447cc303447ba10ca5b1908e889071e0a68f48c0f260a",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x60b51e15140ec0b7650334e948fb447ce3cb13ae63492260461ebfa9d02e85c4?network=testnet
+#[test]
+fn test_aptos_nft_claim() {
+    let input = setup_proto_transaction(
+        "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30", // Sender's address
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",  // Keypair
+        "nft_ops",
+        19, // Sequence number
+        2,
+        3296766,
+        3664390082,
+        100,
+        "",
+        Some(OpsDetails::NftOps(NftOperation::Claim(Claim {
+            sender: AccountAddress::from_str(
+                "0x783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee",
+            )
+            .unwrap(),
+            creator: AccountAddress::from_str(
+                "0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac",
+            )
+            .unwrap(),
+            collection: "Topaz Troopers".as_bytes().to_vec(),
+            name: "Topaz Trooper #20068".as_bytes().to_vec(),
+            property_version: 0,
+        }))),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3013000000000000000200000000000000000000000000000000000000000000000000000000000000030f746f6b656e5f7472616e73666572730c636c61696d5f736372697074000520783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee209125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac0f0e546f70617a2054726f6f706572731514546f70617a2054726f6f70657220233230303638080000000000000000fe4d3200000000006400000000000000c2276ada0000000002", // Expected raw transaction bytes
+                   "ede1ffb5f8f663741c2ca9597af44af81c98f7a910261bb4125f758fd0c0ebbf5bacb34f1196ad45153177729eb6d478676b364ab747da17602713f65ca2dd0a", // Expected signature
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3013000000000000000200000000000000000000000000000000000000000000000000000000000000030f746f6b656e5f7472616e73666572730c636c61696d5f736372697074000520783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee209125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac0f0e546f70617a2054726f6f706572731514546f70617a2054726f6f70657220233230303638080000000000000000fe4d3200000000006400000000000000c2276ada00000000020020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c40ede1ffb5f8f663741c2ca9597af44af81c98f7a910261bb4125f758fd0c0ebbf5bacb34f1196ad45153177729eb6d478676b364ab747da17602713f65ca2dd0a", // Expected encoded transaction
+                   r#"{
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "3296766",
+                    "payload": {
+                        "arguments": [
+                                      "0x783135e8b00430253a22ba041d860c373d7a1501ccf7ac2d1ad37a8ed2775aee",
+                                      "0x9125e4054d884fdc7296b66e12c0d63a7baa0d88c77e8e784987c0a967c670ac",
+                                      "Topaz Troopers", "Topaz Trooper #20068", "0"],
+                        "function": "0x3::token_transfers::claim_script",
+                        "type": "entry_function_payload",
+                        "type_arguments": []
+                    },
+                    "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+                    "sequence_number": "19",
+                    "signature": {
+                        "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                        "signature": "0xede1ffb5f8f663741c2ca9597af44af81c98f7a910261bb4125f758fd0c0ebbf5bacb34f1196ad45153177729eb6d478676b364ab747da17602713f65ca2dd0a",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted https://explorer.aptoslabs.com/txn/0xe591252daed785641bfbbcf72a5d17864568cf32e04c0cc9129f3a13834d0e8e?network=testnet
+#[test]
+fn test_aptos_register_token() {
+    let input = setup_proto_transaction("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30", // Sender's address
+                                        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec", // Keypair
+                                        "register_token",
+                                        23, // Sequence number
+                                        2,
+                                        2000000,
+                                        3664390082,
+                                        100,
+                                        "",
+                                        Some(OpsDetails::RegisterToken(RegisterToken { coin_type: TypeTag::from_str("0xe4497a32bf4a9fd5601b27661aa0b933a923191bf403bd08669ab2468d43b379::move_coin::MoveCoin").unwrap() })),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3017000000000000000200000000000000000000000000000000000000000000000000000000000000010c6d616e616765645f636f696e0872656769737465720107e4497a32bf4a9fd5601b27661aa0b933a923191bf403bd08669ab2468d43b379096d6f76655f636f696e084d6f7665436f696e000080841e00000000006400000000000000c2276ada0000000002", // Expected raw transaction bytes
+                   "e230b49f552fb85356dbec9df13f0dc56228eb7a9c29a8af3a99f4ae95b86c72bdcaa4ff1e9beb0bd81c298b967b9d97449856ec8bc672a08e2efef345c37100", // Expected signature
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3017000000000000000200000000000000000000000000000000000000000000000000000000000000010c6d616e616765645f636f696e0872656769737465720107e4497a32bf4a9fd5601b27661aa0b933a923191bf403bd08669ab2468d43b379096d6f76655f636f696e084d6f7665436f696e000080841e00000000006400000000000000c2276ada00000000020020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c40e230b49f552fb85356dbec9df13f0dc56228eb7a9c29a8af3a99f4ae95b86c72bdcaa4ff1e9beb0bd81c298b967b9d97449856ec8bc672a08e2efef345c37100", // Expected encoded transaction
+                   r#"{
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "2000000",
+                    "payload": {
+                        "arguments": [],
+                        "function": "0x1::managed_coin::register",
+                        "type": "entry_function_payload",
+                        "type_arguments": ["0xe4497a32bf4a9fd5601b27661aa0b933a923191bf403bd08669ab2468d43b379::move_coin::MoveCoin"]
+                    },
+                    "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+                    "sequence_number": "23",
+                    "signature": {
+                        "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                        "signature": "0xe230b49f552fb85356dbec9df13f0dc56228eb7a9c29a8af3a99f4ae95b86c72bdcaa4ff1e9beb0bd81c298b967b9d97449856ec8bc672a08e2efef345c37100",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x25dca849cb4ebacbff223139f7ad5d24c37c225d9506b8b12a925de70429e685/userTxnOverview?network=mainnet
+#[test]
+fn test_aptos_tortuga_stake() {
+    let input = setup_proto_transaction(
+        "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc", // Sender's address
+        "786fc7ceca43b4c1da018fea5d96f35dfdf5605f220b1205ff29c5c6d9eccf05",   // Keypair
+        "liquid_staking_ops",
+        19, // Sequence number
+        1,
+        5554,
+        1670240203,
+        100,
+        "",
+        Some(OpsDetails::LiquidStakingOps(LiquidStakingOperation::Stake(
+            Stake {
+                amount: 100000000,
+                smart_contract_address: AccountAddress::from_str(
+                    "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f",
+                )
+                .unwrap(),
+            },
+        ))),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1300000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f75746572057374616b6500010800e1f50500000000b2150000000000006400000000000000cbd78d630000000001", // Expected raw transaction bytes
+                   "22d3166c3003f9c24a35fd39c71eb27e0d2bb82541be610822165c9283f56fefe5a9d46421b9caf174995bd8f83141e60ea8cff521ecf4741fe19e6ae9a5680d", // Expected signature
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1300000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f75746572057374616b6500010800e1f50500000000b2150000000000006400000000000000cbd78d630000000001002089e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc44022d3166c3003f9c24a35fd39c71eb27e0d2bb82541be610822165c9283f56fefe5a9d46421b9caf174995bd8f83141e60ea8cff521ecf4741fe19e6ae9a5680d", // Expected encoded transaction
+                   r#"{
+                    "sender": "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+                    "sequence_number": "19",
+                    "max_gas_amount": "5554",
+                    "gas_unit_price": "100",
+                    "expiration_timestamp_secs": "1670240203",
+                    "payload": {
+                        "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::stake",
+                        "type_arguments": [],
+                        "arguments": [
+                            "100000000"
+                        ],
+                    "type": "entry_function_payload"
+                    },
+                    "signature": {
+                        "public_key": "0x89e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc4",
+                        "signature": "0x22d3166c3003f9c24a35fd39c71eb27e0d2bb82541be610822165c9283f56fefe5a9d46421b9caf174995bd8f83141e60ea8cff521ecf4741fe19e6ae9a5680d",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x92edb4f756fe86118e34a0e64746c70260ee02c2ae2cf402b3e39f6a282ce968?network=mainnet
+#[test]
+fn test_aptos_tortuga_unstake() {
+    let input = setup_proto_transaction(
+        "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc", // Sender's address
+        "786fc7ceca43b4c1da018fea5d96f35dfdf5605f220b1205ff29c5c6d9eccf05",   // Keypair
+        "liquid_staking_ops",
+        20, // Sequence number
+        1,
+        2371,
+        1670304949,
+        120,
+        "",
+        Some(OpsDetails::LiquidStakingOps(
+            LiquidStakingOperation::Unstake(Unstake {
+                amount: 99178100,
+                smart_contract_address: AccountAddress::from_str(
+                    "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f",
+                )
+                .unwrap(),
+            }),
+        )),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1400000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657207756e7374616b650001087456e9050000000043090000000000007800000000000000b5d48e630000000001", // Expected raw transaction bytes
+                   "6994b917432ad70ae84d2ce1484e6aece589a68aad1b7c6e38c9697f2a012a083a3a755c5e010fd3d0f149a75dd8d257acbd09f10800e890074e5ad384314d0c", // Expected signature
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1400000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657207756e7374616b650001087456e9050000000043090000000000007800000000000000b5d48e630000000001002089e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc4406994b917432ad70ae84d2ce1484e6aece589a68aad1b7c6e38c9697f2a012a083a3a755c5e010fd3d0f149a75dd8d257acbd09f10800e890074e5ad384314d0c", // Expected encoded transaction
+                   r#"{
+                    "sender": "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+                    "sequence_number": "20",
+                    "max_gas_amount": "2371",
+                    "gas_unit_price": "120",
+                    "expiration_timestamp_secs": "1670304949",
+                    "payload": {
+                        "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::unstake",
+                        "type_arguments": [],
+                        "arguments": [
+                            "99178100"
+                        ],
+                    "type": "entry_function_payload"
+                    },
+                    "signature": {
+                        "public_key": "0x89e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc4",
+                        "signature": "0x6994b917432ad70ae84d2ce1484e6aece589a68aad1b7c6e38c9697f2a012a083a3a755c5e010fd3d0f149a75dd8d257acbd09f10800e890074e5ad384314d0c",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// // Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x9fc874de7a7d3e813d9a1658d896023de270a0096a5e258c196005656ace7d54?network=mainnet
+#[test]
+fn test_aptos_tortuga_claim() {
+    let input = setup_proto_transaction(
+        "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc", // Sender's address
+        "786fc7ceca43b4c1da018fea5d96f35dfdf5605f220b1205ff29c5c6d9eccf05",   // Keypair
+        "liquid_staking_ops",
+        28, // Sequence number
+        1,
+        10,
+        1682066783,
+        148,
+        "",
+        Some(OpsDetails::LiquidStakingOps(LiquidStakingOperation::Claim(
+            liquid_staking::Claim {
+                idx: 0,
+                smart_contract_address: AccountAddress::from_str(
+                    "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f",
+                )
+                .unwrap(),
+            },
+        ))),
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1c00000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657205636c61696d00010800000000000000000a0000000000000094000000000000005f4d42640000000001", // Expected raw transaction bytes
+                   "c936584f89777e1fe2d5dd75cd8d9c514efc445810ba22f462b6fe7229c6ec7fc1c8b25d3e233eafaa8306433b3220235e563498ba647be38cac87ff618e3d03", // Expected signature
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1c00000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657205636c61696d00010800000000000000000a0000000000000094000000000000005f4d42640000000001002089e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc440c936584f89777e1fe2d5dd75cd8d9c514efc445810ba22f462b6fe7229c6ec7fc1c8b25d3e233eafaa8306433b3220235e563498ba647be38cac87ff618e3d03", // Expected encoded transaction
+                   r#"{
+                    "sender": "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+                    "sequence_number": "28",
+                    "max_gas_amount": "10",
+                    "gas_unit_price": "148",
+                    "expiration_timestamp_secs": "1682066783",
+                    "payload": {
+                        "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::claim",
+                        "type_arguments": [],
+                        "arguments": [
+                            "0"
+                        ],
+                        "type": "entry_function_payload"
+                    },
+                    "signature": {
+                        "public_key": "0x89e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc4",
+                        "signature": "0xc936584f89777e1fe2d5dd75cd8d9c514efc445810ba22f462b6fe7229c6ec7fc1c8b25d3e233eafaa8306433b3220235e563498ba647be38cac87ff618e3d03",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x7efd69e7f9462774b932ce500ab51c0d0dcc004cf272e09f8ffd5804c2a84e33?network=mainnet
+#[test]
+fn test_aptos_blind_sign() {
+    let input = setup_proto_transaction(
+        "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30", // Sender's address
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",   // Keypair
+        "blind_sign_json",
+        42, // Sequence number
+        1,
+        100011,
+        3664390082,
+        100,
+        r#"{
+                                            "function": "0x16fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c::AnimeSwapPoolV1::swap_exact_coins_for_coins_3_pair_entry",
+                                            "type_arguments": [
+                                                    "0x1::aptos_coin::AptosCoin",
+                                                    "0x881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f4::coin::MOJO",
+                                                    "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDT",
+                                                    "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
+                                                ],
+                                           "arguments": [
+                                                    "1000000",
+                                                    "49329"
+                                                ],
+                                           "type": "entry_function_payload"
+                                           }"#,
+        None,
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada0000000001", // Expected raw transaction bytes
+                   "42cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b", // Expected signature
+                   "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada00000000010020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c4042cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b", // Expected encoded transaction
+                   r#"{
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "100011",
+                    "payload": {
+                        "function": "0x16fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c::AnimeSwapPoolV1::swap_exact_coins_for_coins_3_pair_entry",
+                        "type_arguments": [
+                            "0x1::aptos_coin::AptosCoin",
+                            "0x881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f4::coin::MOJO",
+                            "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDT",
+                            "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
+                        ],
+                        "arguments": [
+                            "1000000",
+                            "49329"
+                        ],
+                        "type": "entry_function_payload"
+                    },
+                    "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+                    "sequence_number": "42",
+                    "signature": {
+                        "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                        "signature": "0x42cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b",
+                        "type": "ed25519_signature"
+                    }
+                }"#);
+}
+
+// Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x25dca849cb4ebacbff223139f7ad5d24c37c225d9506b8b12a925de70429e685/payload
+#[test]
+fn test_aptos_blind_sign_staking() {
+    let input = setup_proto_transaction(
+        "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc", // Sender's address
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",   // Keypair
+        "blind_sign_json",
+        43, // Sequence number
+        1,
+        100011,
+        3664390082,
+        100,
+        r#"{
+                                            "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::stake",
+                                            "type_arguments": [],
+                                            "arguments": [
+                                            "100000000"
+                                            ],
+                                            "type": "entry_function_payload"
+                                        }"#,
+        None,
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc2b00000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f75746572057374616b6500010800e1f50500000000ab860100000000006400000000000000c2276ada0000000001", // Expected raw transaction bytes
+                   "a41b7440a50f36e8491319508734acb55488abc6d88fbc9cb2b37ba23210f01f5d08c856cb7abf18c414cf9302ee144450bd99495a7e21e61f624764db91eb0b", // Expected signature
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc2b00000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f75746572057374616b6500010800e1f50500000000ab860100000000006400000000000000c2276ada00000000010020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c40a41b7440a50f36e8491319508734acb55488abc6d88fbc9cb2b37ba23210f01f5d08c856cb7abf18c414cf9302ee144450bd99495a7e21e61f624764db91eb0b", // Expected encoded transaction
+                   r#"{
+                                "expiration_timestamp_secs": "3664390082",
+                                "gas_unit_price": "100",
+                                "max_gas_amount": "100011",
+                                "payload": {
+                                    "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::stake",
+                                    "type_arguments": [],
+                                    "arguments": [
+                                    "100000000"
+                                    ],
+                                    "type": "entry_function_payload"
+                                },
+                                "sender": "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+                                "sequence_number": "43",
+                                "signature": {
+                                    "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                                    "signature": "0xa41b7440a50f36e8491319508734acb55488abc6d88fbc9cb2b37ba23210f01f5d08c856cb7abf18c414cf9302ee144450bd99495a7e21e61f624764db91eb0b",
+                                    "type": "ed25519_signature"
+                                }
+                        }"#);
+}
+
+// Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x92edb4f756fe86118e34a0e64746c70260ee02c2ae2cf402b3e39f6a282ce968/payload
+#[test]
+fn test_aptos_blind_sign_unstaking() {
+    let input = setup_proto_transaction(
+        "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc", // Sender's address
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",   // Keypair
+        "blind_sign_json",
+        44, // Sequence number
+        1,
+        100011,
+        3664390082,
+        100,
+        r#"{
+                                            "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::unstake",
+                                            "type_arguments": [],
+                                            "arguments": [
+                                            "99178100"
+                                            ],
+                                            "type": "entry_function_payload"
+                                        }"#,
+        None,
+    );
+    let output = Signer::sign_proto(input);
+    test_tx_result(output,
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc2c00000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657207756e7374616b650001087456e90500000000ab860100000000006400000000000000c2276ada0000000001", // Expected raw transaction bytes
+                   "a58ad5e3331beb8c0212a18a1f932207cb664b78f5aad3cb1fe7435e0e0e053247ce49b38fd67b064bed34ed643eb6a03165d77c681d7d73ac3161ab984a960a", // Expected signature
+                   "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc2c00000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657207756e7374616b650001087456e90500000000ab860100000000006400000000000000c2276ada00000000010020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c40a58ad5e3331beb8c0212a18a1f932207cb664b78f5aad3cb1fe7435e0e0e053247ce49b38fd67b064bed34ed643eb6a03165d77c681d7d73ac3161ab984a960a", // Expected encoded transaction
+                   r#"{
+                            "expiration_timestamp_secs": "3664390082",
+                            "gas_unit_price": "100",
+                            "max_gas_amount": "100011",
+                            "payload": {
+                                "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::unstake",
+                                "type_arguments": [],
+                                "arguments": [
+                                "99178100"
+                                ],
+                                "type": "entry_function_payload"
+                            },
+                            "sender": "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+                            "sequence_number": "44",
+                            "signature": {
+                                "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                                "signature": "0xa58ad5e3331beb8c0212a18a1f932207cb664b78f5aad3cb1fe7435e0e0e053247ce49b38fd67b064bed34ed643eb6a03165d77c681d7d73ac3161ab984a960a",
+                                "type": "ed25519_signature"
+                            }
+                    }"#);
+}
diff --git a/rust/chains/tw_binance/Cargo.toml b/rust/chains/tw_binance/Cargo.toml
new file mode 100644
index 00000000000..e5c9a10aa2c
--- /dev/null
+++ b/rust/chains/tw_binance/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "tw_binance"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+quick-protobuf = "0.8.1"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_repr = "0.1"
+strum_macros = "0.25"
+tw_bech32_address = { path = "../../tw_bech32_address" }
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_evm = { path = "../../tw_evm" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_misc = { path = "../../tw_misc", features = ["serde"] }
+tw_proto = { path = "../../tw_proto" }
diff --git a/rust/chains/tw_binance/fuzz/.gitignore b/rust/chains/tw_binance/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/chains/tw_binance/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/chains/tw_binance/fuzz/Cargo.toml b/rust/chains/tw_binance/fuzz/Cargo.toml
new file mode 100644
index 00000000000..179f9d77239
--- /dev/null
+++ b/rust/chains/tw_binance/fuzz/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "tw_binance-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+tw_any_coin = { path = "../../../tw_any_coin", features = ["test-utils"] }
+tw_coin_registry = { path = "../../../tw_coin_registry" }
+tw_proto = { path = "../../../tw_proto", features = ["fuzz"] }
+
+[dependencies.tw_binance]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "sign"
+path = "fuzz_targets/sign.rs"
+test = false
+doc = false
diff --git a/rust/chains/tw_binance/fuzz/fuzz_targets/sign.rs b/rust/chains/tw_binance/fuzz/fuzz_targets/sign.rs
new file mode 100644
index 00000000000..482fd1f5844
--- /dev/null
+++ b/rust/chains/tw_binance/fuzz/fuzz_targets/sign.rs
@@ -0,0 +1,11 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_proto::Binance::Proto;
+
+fuzz_target!(|input: Proto::SigningInput<'_>| {
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let _ = signer.sign(CoinType::Binance, input);
+});
diff --git a/rust/chains/tw_binance/src/address.rs b/rust/chains/tw_binance/src/address.rs
new file mode 100644
index 00000000000..45b00e26bb4
--- /dev/null
+++ b/rust/chains/tw_binance/src/address.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::{Deserialize, Serialize};
+use std::fmt;
+use std::str::FromStr;
+use tw_bech32_address::bech32_prefix::Bech32Prefix;
+use tw_bech32_address::Bech32Address;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::address::CosmosAddress;
+use tw_keypair::tw::PublicKey;
+use tw_memory::Data;
+
+/// The list of known BNB hrps.
+const BNB_KNOWN_HRPS: [&str; 2] = [
+    BinanceAddress::VALIDATOR_HRP, // BNB Validator HRP.
+    "bca",
+];
+
+#[derive(Deserialize, PartialEq, Serialize)]
+pub struct BinanceAddress(Bech32Address);
+
+impl CoinAddress for BinanceAddress {
+    #[inline]
+    fn data(&self) -> Data {
+        self.0.data()
+    }
+}
+
+impl CosmosAddress for BinanceAddress {}
+
+impl BinanceAddress {
+    pub const VALIDATOR_HRP: &'static str = "bva";
+
+    pub fn new_validator_addr(key_hash: Data) -> AddressResult<BinanceAddress> {
+        Bech32Address::new(Self::VALIDATOR_HRP.to_string(), key_hash).map(BinanceAddress)
+    }
+
+    /// Creates a Binance address with the only `prefix`
+    pub fn from_str_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        address_str: String,
+        prefix: Option<Bech32Prefix>,
+    ) -> AddressResult<BinanceAddress>
+    where
+        Self: Sized,
+    {
+        let possible_hrps = match prefix {
+            Some(Bech32Prefix { hrp }) => vec![hrp],
+            None => {
+                let coin_hrp = coin.hrp().ok_or(AddressError::InvalidHrp)?;
+                let other_hrps = BNB_KNOWN_HRPS
+                    .iter()
+                    .map(|another_hrp| another_hrp.to_string());
+                std::iter::once(coin_hrp).chain(other_hrps).collect()
+            },
+        };
+        Bech32Address::from_str_checked(possible_hrps, address_str).map(BinanceAddress)
+    }
+
+    pub fn with_public_key_coin_context(
+        coin: &dyn CoinContext,
+        public_key: &PublicKey,
+        prefix: Option<Bech32Prefix>,
+    ) -> AddressResult<BinanceAddress> {
+        Bech32Address::with_public_key_coin_context(coin, public_key, prefix).map(BinanceAddress)
+    }
+
+    pub fn from_key_hash_with_coin(
+        coin: &dyn CoinContext,
+        key_hash: Data,
+    ) -> AddressResult<BinanceAddress> {
+        Bech32Address::from_key_hash_with_coin(coin, key_hash).map(BinanceAddress)
+    }
+}
+
+impl FromStr for BinanceAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Bech32Address::from_str(s).map(BinanceAddress)
+    }
+}
+
+impl fmt::Display for BinanceAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        fmt::Display::fmt(&self.0, f)
+    }
+}
diff --git a/rust/chains/tw_binance/src/amino.rs b/rust/chains/tw_binance/src/amino.rs
new file mode 100644
index 00000000000..6bcc017dd48
--- /dev/null
+++ b/rust/chains/tw_binance/src/amino.rs
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use quick_protobuf::MessageWrite;
+use tw_encoding::{EncodingError, EncodingResult};
+use tw_memory::Data;
+use tw_proto::serialize;
+
+pub struct AminoEncoder {
+    /// The Amino content starts with a prefix.
+    content: Data,
+}
+
+impl AminoEncoder {
+    pub fn new(prefix: &[u8]) -> AminoEncoder {
+        AminoEncoder {
+            content: prefix.to_vec(),
+        }
+    }
+
+    pub fn extend_content(mut self, content: &[u8]) -> AminoEncoder {
+        self.content.extend_from_slice(content);
+        self
+    }
+
+    pub fn extend_with_msg<M: MessageWrite>(mut self, msg: &M) -> EncodingResult<AminoEncoder> {
+        let msg_data = serialize(msg).map_err(|_| EncodingError::Internal)?;
+        self.content.extend_from_slice(&msg_data);
+        Ok(self)
+    }
+
+    pub fn encode(self) -> Data {
+        self.content
+    }
+
+    pub fn encode_size_prefixed(self) -> EncodingResult<Data> {
+        const CONTENT_SIZE_CAPACITY: usize = 10;
+
+        let content_len = self.content.len();
+        let capacity = content_len + CONTENT_SIZE_CAPACITY;
+
+        let mut buffer = Vec::with_capacity(capacity);
+
+        Self::write_varint(&mut buffer, content_len as u64)?;
+        buffer.extend_from_slice(&self.content);
+
+        Ok(buffer)
+    }
+
+    /// This method takes `&mut Data` instead of `&mut [u8]` because the given `buffer` can be extended (become longer).
+    fn write_varint(buffer: &mut Data, num: u64) -> EncodingResult<()> {
+        let mut writer = quick_protobuf::Writer::new(buffer);
+        writer
+            .write_varint(num)
+            .map_err(|_| EncodingError::Internal)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex::DecodeHex;
+
+    struct TestInput {
+        prefix: &'static str,
+        content: &'static str,
+        content_size_prefixed: bool,
+        expected: &'static str,
+    }
+
+    fn amino_encode_impl(input: TestInput) {
+        let prefix = input.prefix.decode_hex().unwrap();
+        let content = input.content.decode_hex().unwrap();
+
+        let encoder = AminoEncoder::new(&prefix).extend_content(&content);
+
+        let actual = if input.content_size_prefixed {
+            encoder
+                .encode_size_prefixed()
+                .expect("Error on Amino encoding with content size prefix")
+        } else {
+            encoder.encode()
+        };
+
+        let expected = input.expected.decode_hex().unwrap();
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_amino_encode() {
+        let content_size_prefixed = false;
+
+        amino_encode_impl(TestInput {
+            prefix: "0b0c0d0e",
+            content: "0102030405060708",
+            content_size_prefixed,
+            expected: "0b0c0d0e0102030405060708",
+        });
+        amino_encode_impl(TestInput {
+            prefix: "0b0c0d0e",
+            content: "01020304050607080102030405060708010203040506070801020304050607080102030405060708",
+            content_size_prefixed,
+            expected: "0b0c0d0e01020304050607080102030405060708010203040506070801020304050607080102030405060708",
+        });
+    }
+
+    #[test]
+    fn test_amino_encode_with_content_size_prefix() {
+        let content_size_prefixed = true;
+
+        amino_encode_impl(TestInput {
+            prefix: "0b0c0d0e",
+            content: "0102030405060708",
+            content_size_prefixed,
+            expected: "0c0b0c0d0e0102030405060708",
+        });
+        amino_encode_impl(TestInput {
+            prefix: "0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e",
+            content: "0102030405060708",
+            content_size_prefixed,
+            expected: "dc020b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0b0c0d0e0f101112131415161718191a1b1c1d1e0102030405060708",
+        });
+    }
+}
diff --git a/rust/chains/tw_binance/src/compiler.rs b/rust/chains/tw_binance/src/compiler.rs
new file mode 100644
index 00000000000..400c37e36ec
--- /dev/null
+++ b/rust/chains/tw_binance/src/compiler.rs
@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::BinanceContext;
+use crate::modules::preimager::{JsonPreimager, JsonTxPreimage};
+use crate::modules::serializer::BinanceAminoSerializer;
+use crate::modules::tx_builder::TxBuilder;
+use crate::signature::BinanceSignature;
+use crate::transaction::SignerInfo;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::common::compile_input::SingleSignaturePubkey;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_cosmos_sdk::modules::serializer::json_serializer::JsonSerializer;
+use tw_cosmos_sdk::public_key::secp256k1::Secp256PublicKey;
+use tw_cosmos_sdk::public_key::CosmosPublicKey;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Binance::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct BinanceCompiler;
+
+impl BinanceCompiler {
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let unsigned_tx = TxBuilder::unsigned_tx_from_proto(coin, &input)?;
+        let JsonTxPreimage {
+            tx_hash,
+            encoded_tx,
+        } = JsonPreimager::preimage_hash(&unsigned_tx)?;
+
+        Ok(CompilerProto::PreSigningOutput {
+            data_hash: tx_hash.to_vec().into(),
+            data: encoded_tx.as_bytes().to_vec().into(),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn compile_impl(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let SingleSignaturePubkey {
+            signature,
+            public_key,
+        } = SingleSignaturePubkey::from_sign_pubkey_list(signatures, public_keys)?;
+        let signature = BinanceSignature::try_from(signature.as_slice())?;
+        let public_key_params = None;
+        let public_key =
+            Secp256PublicKey::from_bytes(coin, public_key.as_slice(), public_key_params)?;
+
+        let signature_bytes = signature.to_vec();
+        let signature_json = JsonSerializer::<BinanceContext>::serialize_signature(
+            &public_key,
+            signature_bytes.clone(),
+        );
+
+        let unsigned_tx = TxBuilder::unsigned_tx_from_proto(coin, &input)?;
+        let signed_tx = unsigned_tx.into_signed(SignerInfo {
+            public_key,
+            signature,
+        });
+
+        let encoded_tx = BinanceAminoSerializer::serialize_signed_tx(&signed_tx)?;
+
+        let signature_json =
+            serde_json::to_string(&signature_json).tw_err(|_| SigningErrorType::Error_internal)?;
+        Ok(Proto::SigningOutput {
+            encoded: encoded_tx.into(),
+            signature: signature_bytes.into(),
+            signature_json: signature_json.into(),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_binance/src/context.rs b/rust/chains/tw_binance/src/context.rs
new file mode 100644
index 00000000000..58952365b63
--- /dev/null
+++ b/rust/chains/tw_binance/src/context.rs
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use tw_cosmos_sdk::context::CosmosContext;
+use tw_cosmos_sdk::private_key::secp256k1::Secp256PrivateKey;
+use tw_cosmos_sdk::public_key::secp256k1::Secp256PublicKey;
+use tw_cosmos_sdk::signature::secp256k1::Secp256k1Signature;
+use tw_hash::hasher::Hasher;
+
+pub struct BinanceContext;
+
+impl CosmosContext for BinanceContext {
+    type Address = BinanceAddress;
+    type PrivateKey = Secp256PrivateKey;
+    type PublicKey = Secp256PublicKey;
+    type Signature = Secp256k1Signature;
+
+    /// Binance Beacon chain uses `sha256` hash.
+    fn default_tx_hasher() -> Hasher {
+        Hasher::Sha256
+    }
+}
diff --git a/rust/chains/tw_binance/src/entry.rs b/rust/chains/tw_binance/src/entry.rs
new file mode 100644
index 00000000000..6552c0e6bd0
--- /dev/null
+++ b/rust/chains/tw_binance/src/entry.rs
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use crate::compiler::BinanceCompiler;
+use crate::modules::wallet_connect::connector::BinanceWalletConnector;
+use crate::signer::BinanceSigner;
+use std::str::FromStr;
+use tw_bech32_address::bech32_prefix::Bech32Prefix;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::transaction_util::NoTransactionUtil;
+use tw_keypair::tw::PublicKey;
+use tw_proto::Binance::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct BinanceEntry;
+
+impl CoinEntry for BinanceEntry {
+    type AddressPrefix = Bech32Prefix;
+    type Address = BinanceAddress;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = BinanceWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = NoTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        BinanceAddress::from_str_with_coin_and_prefix(coin, address.to_string(), prefix)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        BinanceAddress::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        BinanceAddress::with_public_key_coin_context(coin, &public_key, prefix)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        BinanceSigner::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        BinanceCompiler::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        BinanceCompiler::compile(coin, input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn wallet_connector(&self) -> Option<Self::WalletConnector> {
+        Some(BinanceWalletConnector)
+    }
+}
diff --git a/rust/chains/tw_binance/src/lib.rs b/rust/chains/tw_binance/src/lib.rs
new file mode 100644
index 00000000000..6df844a203d
--- /dev/null
+++ b/rust/chains/tw_binance/src/lib.rs
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod amino;
+pub mod compiler;
+pub mod context;
+pub mod entry;
+pub mod modules;
+pub mod signature;
+pub mod signer;
+pub mod transaction;
diff --git a/rust/chains/tw_binance/src/modules/mod.rs b/rust/chains/tw_binance/src/modules/mod.rs
new file mode 100644
index 00000000000..943cd0f39ce
--- /dev/null
+++ b/rust/chains/tw_binance/src/modules/mod.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod preimager;
+pub mod serializer;
+pub mod tx_builder;
+pub mod wallet_connect;
diff --git a/rust/chains/tw_binance/src/modules/preimager.rs b/rust/chains/tw_binance/src/modules/preimager.rs
new file mode 100644
index 00000000000..45e2dacdf53
--- /dev/null
+++ b/rust/chains/tw_binance/src/modules/preimager.rs
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::UnsignedTransaction;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{sha2, H256};
+
+pub struct JsonTxPreimage {
+    pub encoded_tx: String,
+    pub tx_hash: H256,
+}
+
+pub struct JsonPreimager;
+
+impl JsonPreimager {
+    pub fn preimage_hash(unsigned: &UnsignedTransaction) -> SigningResult<JsonTxPreimage> {
+        let encoded_tx =
+            serde_json::to_string(unsigned).tw_err(|_| SigningErrorType::Error_internal)?;
+        let tx_hash = sha2::sha256(encoded_tx.as_bytes());
+        let tx_hash = H256::try_from(tx_hash.as_slice()).expect("sha256 must return 32 bytes");
+        Ok(JsonTxPreimage {
+            encoded_tx,
+            tx_hash,
+        })
+    }
+}
diff --git a/rust/chains/tw_binance/src/modules/serializer.rs b/rust/chains/tw_binance/src/modules/serializer.rs
new file mode 100644
index 00000000000..88ec0ad22f3
--- /dev/null
+++ b/rust/chains/tw_binance/src/modules/serializer.rs
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::amino::AminoEncoder;
+use crate::transaction::SignedTransaction;
+use std::borrow::Cow;
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::public_key::CosmosPublicKey;
+use tw_memory::Data;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::serialize;
+use tw_proto::Binance::Proto;
+
+/// cbindgen:ignore
+pub const TRANSACTION_AMINO_PREFIX: [u8; 4] = [0xF0, 0x62, 0x5D, 0xEE];
+/// cbindgen:ignore
+pub const PUBLIC_KEY_PREFIX: [u8; 4] = [0xEB, 0x5A, 0xE9, 0x87];
+
+pub struct BinanceAminoSerializer;
+
+impl BinanceAminoSerializer {
+    pub fn serialize_signed_tx(tx: &SignedTransaction) -> SigningResult<Data> {
+        let msgs = tx
+            .unsigned
+            .msgs
+            .iter()
+            .map(|msg| msg.as_ref().to_amino_protobuf().map(Cow::from))
+            .collect::<SigningResult<Vec<_>>>()?;
+
+        let signature = Self::serialize_signature(tx)?;
+        let tx = Proto::Transaction {
+            msgs,
+            signatures: vec![signature.into()],
+            memo: tx.unsigned.memo.clone().into(),
+            source: tx.unsigned.source,
+            data: tx.unsigned.data.clone().unwrap_or_default().into(),
+        };
+        Ok(AminoEncoder::new(&TRANSACTION_AMINO_PREFIX)
+            .extend_with_msg(&tx)?
+            .encode_size_prefixed()?)
+    }
+
+    pub fn serialize_public_key(public_key: Data) -> Data {
+        let public_key_len = public_key.len() as u8;
+        AminoEncoder::new(&PUBLIC_KEY_PREFIX)
+            // Push the length of the public key.
+            .extend_content(&[public_key_len])
+            .extend_content(public_key.as_slice())
+            .encode()
+    }
+
+    pub fn serialize_signature(signed: &SignedTransaction) -> SigningResult<Data> {
+        let sign_msg = Proto::Signature {
+            pub_key: Self::serialize_public_key(signed.signer.public_key.to_bytes()).into(),
+            signature: signed.signer.signature.to_vec().into(),
+            account_number: signed.unsigned.account_number,
+            sequence: signed.unsigned.sequence,
+        };
+        // There is no need to use Amino encoding here as the prefix is empty.
+        serialize(&sign_msg).tw_err(|_| SigningErrorType::Error_internal)
+    }
+}
diff --git a/rust/chains/tw_binance/src/modules/tx_builder.rs b/rust/chains/tw_binance/src/modules/tx_builder.rs
new file mode 100644
index 00000000000..ce1340d63c0
--- /dev/null
+++ b/rust/chains/tw_binance/src/modules/tx_builder.rs
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::message::{BinanceMessageEnum, TWBinanceProto};
+use crate::transaction::UnsignedTransaction;
+use std::borrow::Cow;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::Binance::Proto;
+
+pub struct TxBuilder;
+
+impl TxBuilder {
+    pub fn unsigned_tx_from_proto(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput<'_>,
+    ) -> SigningResult<UnsignedTransaction> {
+        let msg = BinanceMessageEnum::from_tw_proto(coin, &input.order_oneof)?;
+        Ok(UnsignedTransaction {
+            account_number: input.account_number,
+            chain_id: input.chain_id.to_string(),
+            data: None,
+            memo: input.memo.to_string(),
+            msgs: vec![msg],
+            sequence: input.sequence,
+            source: input.source,
+        })
+    }
+
+    pub fn unsigned_tx_to_proto(
+        unsigned: &UnsignedTransaction,
+    ) -> SigningResult<Proto::SigningInput<'static>> {
+        if unsigned.msgs.len() != 1 {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Expected exactly one Transaction Message");
+        }
+        let msg = unsigned
+            .msgs
+            .first()
+            .expect("There should be exactly one message")
+            .to_tw_proto();
+
+        Ok(Proto::SigningInput {
+            chain_id: unsigned.chain_id.clone().into(),
+            account_number: unsigned.account_number,
+            sequence: unsigned.sequence,
+            source: unsigned.source,
+            memo: unsigned.memo.clone().into(),
+            private_key: Cow::default(),
+            order_oneof: msg,
+        })
+    }
+}
diff --git a/rust/chains/tw_binance/src/modules/wallet_connect/connector.rs b/rust/chains/tw_binance/src/modules/wallet_connect/connector.rs
new file mode 100644
index 00000000000..e66b4688a2f
--- /dev/null
+++ b/rust/chains/tw_binance/src/modules/wallet_connect/connector.rs
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::tx_builder::TxBuilder;
+use crate::modules::wallet_connect::types::SignAminoRequest;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::wallet_connector::WalletConnector;
+use tw_coin_entry::signing_output_error;
+use tw_proto::WalletConnect::Proto::{
+    self as WCProto, mod_ParseRequestOutput::OneOfsigning_input_oneof as SigningInputEnum,
+};
+
+pub struct BinanceWalletConnector;
+
+impl WalletConnector for BinanceWalletConnector {
+    fn parse_request(
+        &self,
+        coin: &dyn CoinContext,
+        request: WCProto::ParseRequestInput<'_>,
+    ) -> WCProto::ParseRequestOutput<'static> {
+        Self::parse_request_impl(coin, request)
+            .unwrap_or_else(|e| signing_output_error!(WCProto::ParseRequestOutput, e))
+    }
+}
+
+impl BinanceWalletConnector {
+    fn parse_request_impl(
+        coin: &dyn CoinContext,
+        request: WCProto::ParseRequestInput<'_>,
+    ) -> SigningResult<WCProto::ParseRequestOutput<'static>> {
+        match request.method {
+            WCProto::Method::CosmosSignAmino => Self::parse_sign_amino_request(coin, request),
+            _ => SigningError::err(SigningErrorType::Error_not_supported)
+                .context("Unknown WalletConnect method"),
+        }
+    }
+
+    pub fn parse_sign_amino_request(
+        _coin: &dyn CoinContext,
+        request: WCProto::ParseRequestInput<'_>,
+    ) -> SigningResult<WCProto::ParseRequestOutput<'static>> {
+        let amino_req: SignAminoRequest = serde_json::from_str(&request.payload)
+            .tw_err(|_| SigningErrorType::Error_input_parse)
+            .context("Error deserializing WalletConnect signAmino request as JSON")?;
+
+        // Parse a `SigningInput` from the given `signDoc`.
+        let signing_input = TxBuilder::unsigned_tx_to_proto(&amino_req.sign_doc)?;
+
+        Ok(WCProto::ParseRequestOutput {
+            signing_input_oneof: SigningInputEnum::binance(signing_input),
+            ..WCProto::ParseRequestOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_binance/src/modules/wallet_connect/mod.rs b/rust/chains/tw_binance/src/modules/wallet_connect/mod.rs
new file mode 100644
index 00000000000..1a90ae8a9cf
--- /dev/null
+++ b/rust/chains/tw_binance/src/modules/wallet_connect/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod connector;
+pub mod types;
diff --git a/rust/chains/tw_binance/src/modules/wallet_connect/types.rs b/rust/chains/tw_binance/src/modules/wallet_connect/types.rs
new file mode 100644
index 00000000000..f5ac124e47e
--- /dev/null
+++ b/rust/chains/tw_binance/src/modules/wallet_connect/types.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::UnsignedTransaction;
+use serde::Deserialize;
+
+#[derive(Deserialize)]
+pub struct SignAminoRequest {
+    #[serde(rename = "signDoc")]
+    pub sign_doc: UnsignedTransaction,
+}
diff --git a/rust/chains/tw_binance/src/signature.rs b/rust/chains/tw_binance/src/signature.rs
new file mode 100644
index 00000000000..45e1b5c6fca
--- /dev/null
+++ b/rust/chains/tw_binance/src/signature.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_keypair::ecdsa::secp256k1;
+
+pub type BinanceSignature = secp256k1::VerifySignature;
diff --git a/rust/chains/tw_binance/src/signer.rs b/rust/chains/tw_binance/src/signer.rs
new file mode 100644
index 00000000000..86cb5da5b4b
--- /dev/null
+++ b/rust/chains/tw_binance/src/signer.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::BinanceContext;
+use crate::modules::preimager::{JsonPreimager, JsonTxPreimage};
+use crate::modules::serializer::BinanceAminoSerializer;
+use crate::modules::tx_builder::TxBuilder;
+use crate::signature::BinanceSignature;
+use crate::transaction::SignerInfo;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_cosmos_sdk::modules::serializer::json_serializer::JsonSerializer;
+use tw_cosmos_sdk::public_key::secp256k1::Secp256PublicKey;
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Binance::Proto;
+
+pub struct BinanceSigner;
+
+impl BinanceSigner {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_impl(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let unsigned_tx = TxBuilder::unsigned_tx_from_proto(coin, &input)?;
+        let JsonTxPreimage { tx_hash, .. } = JsonPreimager::preimage_hash(&unsigned_tx)?;
+
+        let key_pair = secp256k1::KeyPair::try_from(input.private_key.as_ref())?;
+
+        let signature = BinanceSignature::from(key_pair.sign(tx_hash)?);
+        let public_key =
+            Secp256PublicKey::from_secp256k1_public_key(coin.public_key_type(), key_pair.public())?;
+
+        let signature_bytes = signature.to_vec();
+        let signature_json = JsonSerializer::<BinanceContext>::serialize_signature(
+            &public_key,
+            signature_bytes.clone(),
+        );
+
+        let signed_tx = unsigned_tx.into_signed(SignerInfo {
+            public_key,
+            signature,
+        });
+        let encoded_tx = BinanceAminoSerializer::serialize_signed_tx(&signed_tx)?;
+
+        let signature_json =
+            serde_json::to_string(&signature_json).tw_err(|_| SigningErrorType::Error_internal)?;
+        Ok(Proto::SigningOutput {
+            encoded: encoded_tx.into(),
+            signature: signature_bytes.into(),
+            signature_json: signature_json.into(),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/message/htlt_order.rs b/rust/chains/tw_binance/src/transaction/message/htlt_order.rs
new file mode 100644
index 00000000000..902ae019e82
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/message/htlt_order.rs
@@ -0,0 +1,207 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use crate::amino::AminoEncoder;
+use crate::transaction::message::{BinanceMessage, TWBinanceProto, Token};
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::as_hex;
+use tw_memory::Data;
+use tw_proto::Binance::Proto;
+
+#[derive(Deserialize, Serialize)]
+pub struct HTLTOrder {
+    pub amount: Vec<Token>,
+    pub cross_chain: bool,
+    pub expected_income: String,
+    pub from: BinanceAddress,
+    pub height_span: i64,
+    #[serde(with = "as_hex")]
+    pub random_number_hash: Data,
+    pub recipient_other_chain: String,
+    pub sender_other_chain: String,
+    pub timestamp: i64,
+    pub to: BinanceAddress,
+}
+
+impl HTLTOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0xB3, 0x3F, 0x9A, 0x24];
+}
+
+impl BinanceMessage for HTLTOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for HTLTOrder {
+    type Proto<'a> = Proto::HTLTOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+        let to = BinanceAddress::from_key_hash_with_coin(coin, msg.to.to_vec())?;
+
+        let amount = msg.amount.iter().map(Token::from_tw_proto).collect();
+
+        Ok(HTLTOrder {
+            from,
+            to,
+            recipient_other_chain: msg.recipient_other_chain.to_string(),
+            sender_other_chain: msg.sender_other_chain.to_string(),
+            random_number_hash: msg.random_number_hash.to_vec(),
+            timestamp: msg.timestamp,
+            amount,
+            expected_income: msg.expected_income.to_string(),
+            height_span: msg.height_span,
+            cross_chain: msg.cross_chain,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::HTLTOrder {
+            from: self.from.data().into(),
+            to: self.to.data().into(),
+            recipient_other_chain: self.recipient_other_chain.clone().into(),
+            sender_other_chain: self.sender_other_chain.clone().into(),
+            random_number_hash: self.random_number_hash.clone().into(),
+            timestamp: self.timestamp,
+            amount: self.amount.iter().map(Token::to_tw_proto).collect(),
+            expected_income: self.expected_income.clone().into(),
+            height_span: self.height_span,
+            cross_chain: self.cross_chain,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct DepositHTLTOrder {
+    pub amount: Vec<Token>,
+    pub from: BinanceAddress,
+    #[serde(with = "as_hex")]
+    pub swap_id: Data,
+}
+
+impl DepositHTLTOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x63, 0x98, 0x64, 0x96];
+}
+
+impl BinanceMessage for DepositHTLTOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for DepositHTLTOrder {
+    type Proto<'a> = Proto::DepositHTLTOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+        let amount = msg.amount.iter().map(Token::from_tw_proto).collect();
+
+        Ok(DepositHTLTOrder {
+            from,
+            amount,
+            swap_id: msg.swap_id.to_vec(),
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::DepositHTLTOrder {
+            from: self.from.data().into(),
+            amount: self.amount.iter().map(Token::to_tw_proto).collect(),
+            swap_id: self.swap_id.clone().into(),
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct ClaimHTLTOrder {
+    pub from: BinanceAddress,
+    #[serde(with = "as_hex")]
+    pub random_number: Data,
+    #[serde(with = "as_hex")]
+    pub swap_id: Data,
+}
+
+impl ClaimHTLTOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0xC1, 0x66, 0x53, 0x00];
+}
+
+impl BinanceMessage for ClaimHTLTOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for ClaimHTLTOrder {
+    type Proto<'a> = Proto::ClaimHTLOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+
+        Ok(ClaimHTLTOrder {
+            from,
+            swap_id: msg.swap_id.to_vec(),
+            random_number: msg.random_number.to_vec(),
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::ClaimHTLOrder {
+            from: self.from.data().into(),
+            swap_id: self.swap_id.clone().into(),
+            random_number: self.random_number.clone().into(),
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct RefundHTLTOrder {
+    pub from: BinanceAddress,
+    #[serde(with = "as_hex")]
+    pub swap_id: Data,
+}
+
+impl RefundHTLTOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x34, 0x54, 0xA2, 0x7C];
+}
+
+impl TWBinanceProto for RefundHTLTOrder {
+    type Proto<'a> = Proto::RefundHTLTOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+        let swap_id = msg.swap_id.to_vec();
+
+        Ok(RefundHTLTOrder { from, swap_id })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::RefundHTLTOrder {
+            from: self.from.data().into(),
+            swap_id: self.swap_id.clone().into(),
+        }
+    }
+}
+
+impl BinanceMessage for RefundHTLTOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/message/mod.rs b/rust/chains/tw_binance/src/transaction/message/mod.rs
new file mode 100644
index 00000000000..0879bcf5b3e
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/message/mod.rs
@@ -0,0 +1,273 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::{Deserialize, Serialize, Serializer};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+use tw_proto::Binance::Proto::{self, mod_SigningInput::OneOforder_oneof as BinanceMessageProto};
+
+pub mod htlt_order;
+pub mod send_order;
+pub mod side_chain_delegate;
+pub mod time_lock_order;
+pub mod token_order;
+pub mod trade_order;
+pub mod tranfer_out_order;
+
+pub trait BinanceMessage {
+    fn to_amino_protobuf(&self) -> SigningResult<Data>;
+}
+
+/// A Binance message represented as a Trust Wallet Core Protobuf message.
+pub trait TWBinanceProto: Sized {
+    type Proto<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self>;
+
+    fn to_tw_proto(&self) -> Self::Proto<'static>;
+}
+
+/// Please note that some of the fields are typped such as `SideDelegateOrder`.
+#[derive(Deserialize, Serialize)]
+#[serde(untagged)]
+pub enum BinanceMessageEnum {
+    HTLTOrder(htlt_order::HTLTOrder),
+    DepositHTLTOrder(htlt_order::DepositHTLTOrder),
+    ClaimHTLTOrder(htlt_order::ClaimHTLTOrder),
+    RefundHTLTOrder(htlt_order::RefundHTLTOrder),
+    SendOrder(send_order::SendOrder),
+    SideDelegateOrder(side_chain_delegate::SideDelegateOrder),
+    SideRedelegateOrder(side_chain_delegate::SideRedelegateOrder),
+    SideUndelegateOrder(side_chain_delegate::SideUndelegateOrder),
+    StakeMigrationOrder(side_chain_delegate::StakeMigrationOrder),
+    TimeLockOrder(time_lock_order::TimeLockOrder),
+    TimeRelockOrder(time_lock_order::TimeRelockOrder),
+    TimeUnlockOrder(time_lock_order::TimeUnlockOrder),
+    TokenFreezeOrder(token_order::TokenFreezeOrder),
+    TokenUnfreezeOrder(token_order::TokenUnfreezeOrder),
+    TokenIssueOrder(token_order::TokenIssueOrder),
+    TokenMintOrder(token_order::TokenMintOrder),
+    TokenBurnOrder(token_order::TokenBurnOrder),
+    NewTradeOrder(trade_order::NewTradeOrder),
+    CancelTradeOrder(trade_order::CancelTradeOrder),
+    TransferOutOrder(tranfer_out_order::TransferOutOrder),
+}
+
+impl TWBinanceProto for BinanceMessageEnum {
+    type Proto<'a> = BinanceMessageProto<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        match msg {
+            BinanceMessageProto::trade_order(ref order) => {
+                trade_order::NewTradeOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::NewTradeOrder)
+            },
+            BinanceMessageProto::cancel_trade_order(ref order) => {
+                trade_order::CancelTradeOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::CancelTradeOrder)
+            },
+            BinanceMessageProto::send_order(ref order) => {
+                send_order::SendOrder::from_tw_proto(coin, order).map(BinanceMessageEnum::SendOrder)
+            },
+            BinanceMessageProto::freeze_order(ref order) => {
+                token_order::TokenFreezeOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TokenFreezeOrder)
+            },
+            BinanceMessageProto::unfreeze_order(ref order) => {
+                token_order::TokenUnfreezeOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TokenUnfreezeOrder)
+            },
+            BinanceMessageProto::htlt_order(ref order) => {
+                htlt_order::HTLTOrder::from_tw_proto(coin, order).map(BinanceMessageEnum::HTLTOrder)
+            },
+            BinanceMessageProto::depositHTLT_order(ref order) => {
+                htlt_order::DepositHTLTOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::DepositHTLTOrder)
+            },
+            BinanceMessageProto::claimHTLT_order(ref order) => {
+                htlt_order::ClaimHTLTOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::ClaimHTLTOrder)
+            },
+            BinanceMessageProto::refundHTLT_order(ref order) => {
+                htlt_order::RefundHTLTOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::RefundHTLTOrder)
+            },
+            BinanceMessageProto::issue_order(ref order) => {
+                token_order::TokenIssueOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TokenIssueOrder)
+            },
+            BinanceMessageProto::mint_order(ref order) => {
+                token_order::TokenMintOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TokenMintOrder)
+            },
+            BinanceMessageProto::burn_order(ref order) => {
+                token_order::TokenBurnOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TokenBurnOrder)
+            },
+            BinanceMessageProto::transfer_out_order(ref order) => {
+                tranfer_out_order::TransferOutOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TransferOutOrder)
+            },
+            BinanceMessageProto::side_delegate_order(ref order) => {
+                side_chain_delegate::SideDelegateOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::SideDelegateOrder)
+            },
+            BinanceMessageProto::side_redelegate_order(ref order) => {
+                side_chain_delegate::SideRedelegateOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::SideRedelegateOrder)
+            },
+            BinanceMessageProto::side_undelegate_order(ref order) => {
+                side_chain_delegate::SideUndelegateOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::SideUndelegateOrder)
+            },
+            BinanceMessageProto::time_lock_order(ref order) => {
+                time_lock_order::TimeLockOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TimeLockOrder)
+            },
+            BinanceMessageProto::time_relock_order(ref order) => {
+                time_lock_order::TimeRelockOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TimeRelockOrder)
+            },
+            BinanceMessageProto::time_unlock_order(ref order) => {
+                time_lock_order::TimeUnlockOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::TimeUnlockOrder)
+            },
+            BinanceMessageProto::side_stake_migration_order(ref order) => {
+                side_chain_delegate::StakeMigrationOrder::from_tw_proto(coin, order)
+                    .map(BinanceMessageEnum::StakeMigrationOrder)
+            },
+            BinanceMessageProto::None => SigningError::err(SigningErrorType::Error_invalid_params),
+        }
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        match self {
+            BinanceMessageEnum::HTLTOrder(m) => BinanceMessageProto::htlt_order(m.to_tw_proto()),
+            BinanceMessageEnum::DepositHTLTOrder(m) => {
+                BinanceMessageProto::depositHTLT_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::ClaimHTLTOrder(m) => {
+                BinanceMessageProto::claimHTLT_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::RefundHTLTOrder(m) => {
+                BinanceMessageProto::refundHTLT_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::SendOrder(m) => BinanceMessageProto::send_order(m.to_tw_proto()),
+            BinanceMessageEnum::SideDelegateOrder(m) => {
+                BinanceMessageProto::side_delegate_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::SideRedelegateOrder(m) => {
+                BinanceMessageProto::side_redelegate_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::SideUndelegateOrder(m) => {
+                BinanceMessageProto::side_undelegate_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::StakeMigrationOrder(m) => {
+                BinanceMessageProto::side_stake_migration_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TimeLockOrder(m) => {
+                BinanceMessageProto::time_lock_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TimeRelockOrder(m) => {
+                BinanceMessageProto::time_relock_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TimeUnlockOrder(m) => {
+                BinanceMessageProto::time_unlock_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TokenFreezeOrder(m) => {
+                BinanceMessageProto::freeze_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TokenUnfreezeOrder(m) => {
+                BinanceMessageProto::unfreeze_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TokenIssueOrder(m) => {
+                BinanceMessageProto::issue_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TokenMintOrder(m) => {
+                BinanceMessageProto::mint_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TokenBurnOrder(m) => {
+                BinanceMessageProto::burn_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::NewTradeOrder(m) => {
+                BinanceMessageProto::trade_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::CancelTradeOrder(m) => {
+                BinanceMessageProto::cancel_trade_order(m.to_tw_proto())
+            },
+            BinanceMessageEnum::TransferOutOrder(m) => {
+                BinanceMessageProto::transfer_out_order(m.to_tw_proto())
+            },
+        }
+    }
+}
+
+impl<'a> AsRef<dyn BinanceMessage + 'a> for BinanceMessageEnum {
+    fn as_ref(&self) -> &(dyn BinanceMessage + 'a) {
+        match self {
+            BinanceMessageEnum::HTLTOrder(m) => m,
+            BinanceMessageEnum::DepositHTLTOrder(m) => m,
+            BinanceMessageEnum::ClaimHTLTOrder(m) => m,
+            BinanceMessageEnum::RefundHTLTOrder(m) => m,
+            BinanceMessageEnum::SendOrder(m) => m,
+            BinanceMessageEnum::SideDelegateOrder(m) => m,
+            BinanceMessageEnum::SideRedelegateOrder(m) => m,
+            BinanceMessageEnum::SideUndelegateOrder(m) => m,
+            BinanceMessageEnum::StakeMigrationOrder(m) => m,
+            BinanceMessageEnum::TimeLockOrder(m) => m,
+            BinanceMessageEnum::TimeRelockOrder(m) => m,
+            BinanceMessageEnum::TimeUnlockOrder(m) => m,
+            BinanceMessageEnum::TokenFreezeOrder(m) => m,
+            BinanceMessageEnum::TokenUnfreezeOrder(m) => m,
+            BinanceMessageEnum::TokenIssueOrder(m) => m,
+            BinanceMessageEnum::TokenMintOrder(m) => m,
+            BinanceMessageEnum::TokenBurnOrder(m) => m,
+            BinanceMessageEnum::NewTradeOrder(m) => m,
+            BinanceMessageEnum::CancelTradeOrder(m) => m,
+            BinanceMessageEnum::TransferOutOrder(m) => m,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct Token {
+    /// Amount.
+    pub amount: i64,
+    /// Token ID.
+    pub denom: String,
+}
+
+impl Token {
+    pub fn serialize_with_string_amount<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        #[derive(Serialize)]
+        struct TokenWithStringAmount<'a> {
+            amount: String,
+            denom: &'a str,
+        }
+
+        TokenWithStringAmount {
+            amount: self.amount.to_string(),
+            denom: &self.denom,
+        }
+        .serialize(serializer)
+    }
+
+    fn from_tw_proto(msg: &Proto::mod_SendOrder::Token<'_>) -> Self {
+        Token {
+            denom: msg.denom.to_string(),
+            amount: msg.amount,
+        }
+    }
+
+    fn to_tw_proto(&self) -> Proto::mod_SendOrder::Token<'static> {
+        Proto::mod_SendOrder::Token {
+            denom: self.denom.clone().into(),
+            amount: self.amount,
+        }
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/message/send_order.rs b/rust/chains/tw_binance/src/transaction/message/send_order.rs
new file mode 100644
index 00000000000..6ffd7d69be2
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/message/send_order.rs
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use crate::amino::AminoEncoder;
+use crate::transaction::message::{BinanceMessage, TWBinanceProto, Token};
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+use tw_proto::Binance::Proto;
+
+/// Either an input or output of a `SendOrder`.
+#[derive(Deserialize, Serialize)]
+pub struct InOut {
+    /// Source address.
+    pub address: BinanceAddress,
+
+    /// Input coin amounts.
+    pub coins: Vec<Token>,
+}
+
+impl InOut {
+    pub fn to_input_proto(&self) -> Proto::mod_SendOrder::Input<'static> {
+        Proto::mod_SendOrder::Input {
+            address: self.address.data().into(),
+            coins: self.coins.iter().map(Token::to_tw_proto).collect(),
+        }
+    }
+
+    pub fn to_output_proto(&self) -> Proto::mod_SendOrder::Output<'static> {
+        Proto::mod_SendOrder::Output {
+            address: self.address.data().into(),
+            coins: self.coins.iter().map(Token::to_tw_proto).collect(),
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct SendOrder {
+    pub inputs: Vec<InOut>,
+    pub outputs: Vec<InOut>,
+}
+
+impl SendOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x2A, 0x2C, 0x87, 0xFA];
+}
+
+impl BinanceMessage for SendOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for SendOrder {
+    type Proto<'a> = Proto::SendOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        fn in_out_from_proto(
+            coin: &dyn CoinContext,
+            address_key_hash: &[u8],
+            coins: &[Proto::mod_SendOrder::Token],
+        ) -> SigningResult<InOut> {
+            let address = BinanceAddress::from_key_hash_with_coin(coin, address_key_hash.to_vec())?;
+            let coins = coins.iter().map(Token::from_tw_proto).collect();
+
+            Ok(InOut { address, coins })
+        }
+
+        let inputs = msg
+            .inputs
+            .iter()
+            .map(|input| in_out_from_proto(coin, &input.address, &input.coins))
+            .collect::<SigningResult<Vec<_>>>()?;
+
+        let outputs = msg
+            .outputs
+            .iter()
+            .map(|output| in_out_from_proto(coin, &output.address, &output.coins))
+            .collect::<SigningResult<Vec<_>>>()?;
+
+        Ok(SendOrder { inputs, outputs })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::SendOrder {
+            inputs: self.inputs.iter().map(InOut::to_input_proto).collect(),
+            outputs: self.outputs.iter().map(InOut::to_output_proto).collect(),
+        }
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/message/side_chain_delegate.rs b/rust/chains/tw_binance/src/transaction/message/side_chain_delegate.rs
new file mode 100644
index 00000000000..4684056cede
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/message/side_chain_delegate.rs
@@ -0,0 +1,275 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use crate::amino::AminoEncoder;
+use crate::transaction::message::{BinanceMessage, TWBinanceProto, Token};
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_evm::address::Address as EthereumAddress;
+use tw_memory::Data;
+use tw_misc::serde::Typed;
+use tw_proto::Binance::Proto;
+
+pub type SideDelegateOrder = Typed<SideDelegateOrderValue>;
+
+/// cosmos-sdk/MsgSideChainDelegate
+#[derive(Deserialize, Serialize)]
+pub struct SideDelegateOrderValue {
+    #[serde(serialize_with = "Token::serialize_with_string_amount")]
+    pub delegation: Token,
+    pub delegator_addr: BinanceAddress,
+    pub side_chain_id: String,
+    pub validator_addr: BinanceAddress,
+}
+
+impl SideDelegateOrderValue {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0xE3, 0xA0, 0x7F, 0xD2];
+    /// cbindgen:ignore
+    pub const MESSAGE_TYPE: &'static str = "cosmos-sdk/MsgSideChainDelegate";
+}
+
+impl BinanceMessage for SideDelegateOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&SideDelegateOrderValue::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for SideDelegateOrder {
+    type Proto<'a> = Proto::SideChainDelegate<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let delegator_addr =
+            BinanceAddress::from_key_hash_with_coin(coin, msg.delegator_addr.to_vec())?;
+        let validator_addr = BinanceAddress::new_validator_addr(msg.validator_addr.to_vec())?;
+
+        let delegation = msg
+            .delegation
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)?;
+
+        let value = SideDelegateOrderValue {
+            delegator_addr,
+            validator_addr,
+            delegation: Token::from_tw_proto(delegation),
+            side_chain_id: msg.chain_id.to_string(),
+        };
+        Ok(Typed {
+            ty: SideDelegateOrderValue::MESSAGE_TYPE.to_string(),
+            value,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::SideChainDelegate {
+            delegator_addr: self.value.delegator_addr.data().into(),
+            validator_addr: self.value.validator_addr.data().into(),
+            delegation: Some(self.value.delegation.to_tw_proto()),
+            chain_id: self.value.side_chain_id.clone().into(),
+        }
+    }
+}
+
+pub type SideRedelegateOrder = Typed<SideRedelegateOrderValue>;
+
+/// cosmos-sdk/MsgSideChainRedelegate
+#[derive(Deserialize, Serialize)]
+pub struct SideRedelegateOrderValue {
+    #[serde(serialize_with = "Token::serialize_with_string_amount")]
+    pub amount: Token,
+    pub delegator_addr: BinanceAddress,
+    pub side_chain_id: String,
+    pub validator_dst_addr: BinanceAddress,
+    pub validator_src_addr: BinanceAddress,
+}
+
+impl SideRedelegateOrderValue {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0xE3, 0xCE, 0xD3, 0x64];
+    /// cbindgen:ignore
+    pub const MESSAGE_TYPE: &'static str = "cosmos-sdk/MsgSideChainRedelegate";
+}
+
+impl BinanceMessage for SideRedelegateOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&SideRedelegateOrderValue::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for SideRedelegateOrder {
+    type Proto<'a> = Proto::SideChainRedelegate<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let delegator_addr =
+            BinanceAddress::from_key_hash_with_coin(coin, msg.delegator_addr.to_vec())?;
+        let validator_src_addr =
+            BinanceAddress::new_validator_addr(msg.validator_src_addr.to_vec())?;
+        let validator_dst_addr =
+            BinanceAddress::new_validator_addr(msg.validator_dst_addr.to_vec())?;
+
+        let amount = msg
+            .amount
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)?;
+
+        let value = SideRedelegateOrderValue {
+            delegator_addr,
+            validator_src_addr,
+            validator_dst_addr,
+            amount: Token::from_tw_proto(amount),
+            side_chain_id: msg.chain_id.to_string(),
+        };
+        Ok(Typed {
+            ty: SideRedelegateOrderValue::MESSAGE_TYPE.to_string(),
+            value,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::SideChainRedelegate {
+            delegator_addr: self.value.delegator_addr.data().into(),
+            validator_src_addr: self.value.validator_src_addr.data().into(),
+            validator_dst_addr: self.value.validator_dst_addr.data().into(),
+            amount: Some(self.value.amount.to_tw_proto()),
+            chain_id: self.value.side_chain_id.clone().into(),
+        }
+    }
+}
+
+pub type SideUndelegateOrder = Typed<SideUndelegateOrderValue>;
+
+/// cosmos-sdk/MsgSideChainUndelegate
+#[derive(Deserialize, Serialize)]
+pub struct SideUndelegateOrderValue {
+    #[serde(serialize_with = "Token::serialize_with_string_amount")]
+    pub amount: Token,
+    pub delegator_addr: BinanceAddress,
+    pub side_chain_id: String,
+    pub validator_addr: BinanceAddress,
+}
+
+impl SideUndelegateOrderValue {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x51, 0x4F, 0x7E, 0x0E];
+    /// cbindgen:ignore
+    pub const MESSAGE_TYPE: &'static str = "cosmos-sdk/MsgSideChainUndelegate";
+}
+
+impl BinanceMessage for SideUndelegateOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&SideUndelegateOrderValue::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for SideUndelegateOrder {
+    type Proto<'a> = Proto::SideChainUndelegate<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let delegator_addr =
+            BinanceAddress::from_key_hash_with_coin(coin, msg.delegator_addr.to_vec())?;
+        let validator_addr = BinanceAddress::new_validator_addr(msg.validator_addr.to_vec())?;
+
+        let amount = msg
+            .amount
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)?;
+
+        let value = SideUndelegateOrderValue {
+            delegator_addr,
+            validator_addr,
+            amount: Token::from_tw_proto(amount),
+            side_chain_id: msg.chain_id.to_string(),
+        };
+        Ok(Typed {
+            ty: SideUndelegateOrderValue::MESSAGE_TYPE.to_string(),
+            value,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::SideChainUndelegate {
+            delegator_addr: self.value.delegator_addr.data().into(),
+            validator_addr: self.value.validator_addr.data().into(),
+            amount: Some(self.value.amount.to_tw_proto()),
+            chain_id: self.value.side_chain_id.clone().into(),
+        }
+    }
+}
+
+pub type StakeMigrationOrder = Typed<StakeMigrationOrderValue>;
+
+/// https://github.com/bnb-chain/bnc-cosmos-sdk/blob/cf3ab19af300ccd6a6381287c3fae6bf6ac12f5e/x/stake/types/stake_migration.go#L29-L35
+#[derive(Deserialize, Serialize)]
+pub struct StakeMigrationOrderValue {
+    #[serde(serialize_with = "Token::serialize_with_string_amount")]
+    pub amount: Token,
+    pub delegator_addr: EthereumAddress,
+    pub refund_addr: BinanceAddress,
+    pub validator_dst_addr: EthereumAddress,
+    pub validator_src_addr: BinanceAddress,
+}
+
+impl StakeMigrationOrderValue {
+    /// cbindgen:ignore
+    /// https://github.com/bnb-chain/javascript-sdk/blob/442286ac2923fdfd7cb4fb2299f722ec263c714c/src/types/tx/stdTx.ts#L68
+    pub const PREFIX: [u8; 4] = [0x38, 0x58, 0x91, 0x96];
+    /// cbindgen:ignore
+    pub const MESSAGE_TYPE: &'static str = "cosmos-sdk/MsgSideChainStakeMigration";
+}
+
+impl BinanceMessage for StakeMigrationOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&StakeMigrationOrderValue::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for StakeMigrationOrder {
+    type Proto<'a> = Proto::SideChainStakeMigration<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let delegator_addr = EthereumAddress::try_from(msg.delegator_addr.as_ref())?;
+        let refund_addr = BinanceAddress::from_key_hash_with_coin(coin, msg.refund_addr.to_vec())?;
+        let validator_dst_addr = EthereumAddress::try_from(msg.validator_dst_addr.as_ref())?;
+        let validator_src_addr =
+            BinanceAddress::new_validator_addr(msg.validator_src_addr.to_vec())?;
+
+        let amount = msg
+            .amount
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)?;
+
+        let value = StakeMigrationOrderValue {
+            amount: Token::from_tw_proto(amount),
+            delegator_addr,
+            refund_addr,
+            validator_dst_addr,
+            validator_src_addr,
+        };
+        Ok(Typed {
+            ty: StakeMigrationOrderValue::MESSAGE_TYPE.to_string(),
+            value,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::SideChainStakeMigration {
+            delegator_addr: self.value.delegator_addr.data().into(),
+            validator_src_addr: self.value.validator_src_addr.data().into(),
+            validator_dst_addr: self.value.validator_dst_addr.data().into(),
+            refund_addr: self.value.refund_addr.data().into(),
+            amount: Some(self.value.amount.to_tw_proto()),
+        }
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/message/time_lock_order.rs b/rust/chains/tw_binance/src/transaction/message/time_lock_order.rs
new file mode 100644
index 00000000000..9e2e4e21e8c
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/message/time_lock_order.rs
@@ -0,0 +1,157 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use crate::amino::AminoEncoder;
+use crate::transaction::message::{BinanceMessage, TWBinanceProto, Token};
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+use tw_proto::Binance::Proto;
+
+#[derive(Deserialize, Serialize)]
+pub struct TimeLockOrder {
+    pub amount: Vec<Token>,
+    pub description: String,
+    pub from: BinanceAddress,
+    pub lock_time: i64,
+}
+
+impl TimeLockOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x07, 0x92, 0x15, 0x31];
+}
+
+impl BinanceMessage for TimeLockOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TimeLockOrder {
+    type Proto<'a> = Proto::TimeLockOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from_address.to_vec())?;
+        let amount = msg.amount.iter().map(Token::from_tw_proto).collect();
+
+        Ok(TimeLockOrder {
+            from,
+            description: msg.description.to_string(),
+            amount,
+            lock_time: msg.lock_time,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TimeLockOrder {
+            from_address: self.from.data().into(),
+            description: self.description.clone().into(),
+            amount: self.amount.iter().map(Token::to_tw_proto).collect(),
+            lock_time: self.lock_time,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct TimeRelockOrder {
+    /// If the amount is empty or omitted, set null to avoid signature verification error.
+    pub amount: Option<Vec<Token>>,
+    pub description: String,
+    pub from: BinanceAddress,
+    pub lock_time: i64,
+    pub time_lock_id: i64,
+}
+
+impl TimeRelockOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x50, 0x47, 0x11, 0xDA];
+}
+
+impl BinanceMessage for TimeRelockOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TimeRelockOrder {
+    type Proto<'a> = Proto::TimeRelockOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from_address.to_vec())?;
+
+        let amount = if msg.amount.is_empty() {
+            None
+        } else {
+            Some(msg.amount.iter().map(Token::from_tw_proto).collect())
+        };
+
+        Ok(TimeRelockOrder {
+            from,
+            time_lock_id: msg.id,
+            description: msg.description.to_string(),
+            amount,
+            lock_time: msg.lock_time,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        let amount = match self.amount {
+            Some(ref tokens) => tokens.iter().map(Token::to_tw_proto).collect(),
+            None => Vec::default(),
+        };
+
+        Proto::TimeRelockOrder {
+            from_address: self.from.data().into(),
+            id: self.time_lock_id,
+            description: self.description.clone().into(),
+            amount,
+            lock_time: self.lock_time,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct TimeUnlockOrder {
+    pub from: BinanceAddress,
+    pub time_lock_id: i64,
+}
+
+impl TimeUnlockOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0xC4, 0x05, 0x0C, 0x6C];
+}
+
+impl BinanceMessage for TimeUnlockOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TimeUnlockOrder {
+    type Proto<'a> = Proto::TimeUnlockOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from_address.to_vec())?;
+        Ok(TimeUnlockOrder {
+            from,
+            time_lock_id: msg.id,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TimeUnlockOrder {
+            from_address: self.from.data().into(),
+            id: self.time_lock_id,
+        }
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/message/token_order.rs b/rust/chains/tw_binance/src/transaction/message/token_order.rs
new file mode 100644
index 00000000000..ec88ba88e26
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/message/token_order.rs
@@ -0,0 +1,224 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use crate::amino::AminoEncoder;
+use crate::transaction::message::{BinanceMessage, TWBinanceProto};
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+use tw_proto::Binance::Proto;
+
+#[derive(Deserialize, Serialize)]
+pub struct TokenFreezeOrder {
+    pub amount: i64,
+    pub from: BinanceAddress,
+    pub symbol: String,
+}
+
+impl TokenFreezeOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0xE7, 0x74, 0xB3, 0x2D];
+}
+
+impl BinanceMessage for TokenFreezeOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TokenFreezeOrder {
+    type Proto<'a> = Proto::TokenFreezeOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+        Ok(TokenFreezeOrder {
+            from,
+            symbol: msg.symbol.to_string(),
+            amount: msg.amount,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TokenFreezeOrder {
+            from: self.from.data().into(),
+            symbol: self.symbol.clone().into(),
+            amount: self.amount,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct TokenUnfreezeOrder {
+    pub amount: i64,
+    pub from: BinanceAddress,
+    pub symbol: String,
+}
+
+impl TokenUnfreezeOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x65, 0x15, 0xFF, 0x0D];
+}
+
+impl BinanceMessage for TokenUnfreezeOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TokenUnfreezeOrder {
+    type Proto<'a> = Proto::TokenUnfreezeOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+        Ok(TokenUnfreezeOrder {
+            from,
+            symbol: msg.symbol.to_string(),
+            amount: msg.amount,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TokenUnfreezeOrder {
+            from: self.from.data().into(),
+            symbol: self.symbol.clone().into(),
+            amount: self.amount,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct TokenIssueOrder {
+    pub from: BinanceAddress,
+    pub mintable: bool,
+    pub name: String,
+    pub symbol: String,
+    pub total_supply: i64,
+}
+
+impl TokenIssueOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x17, 0xEF, 0xAB, 0x80];
+}
+
+impl BinanceMessage for TokenIssueOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TokenIssueOrder {
+    type Proto<'a> = Proto::TokenIssueOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+        Ok(TokenIssueOrder {
+            from,
+            name: msg.name.to_string(),
+            symbol: msg.symbol.to_string(),
+            total_supply: msg.total_supply,
+            mintable: msg.mintable,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TokenIssueOrder {
+            from: self.from.data().into(),
+            name: self.name.clone().into(),
+            symbol: self.symbol.clone().into(),
+            total_supply: self.total_supply,
+            mintable: self.mintable,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct TokenMintOrder {
+    pub amount: i64,
+    pub from: BinanceAddress,
+    pub symbol: String,
+}
+
+impl TokenMintOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x46, 0x7E, 0x08, 0x29];
+}
+
+impl BinanceMessage for TokenMintOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TokenMintOrder {
+    type Proto<'a> = Proto::TokenMintOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+        Ok(TokenMintOrder {
+            from,
+            symbol: msg.symbol.to_string(),
+            amount: msg.amount,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TokenMintOrder {
+            from: self.from.data().into(),
+            symbol: self.symbol.clone().into(),
+            amount: self.amount,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct TokenBurnOrder {
+    pub amount: i64,
+    pub from: BinanceAddress,
+    pub symbol: String,
+}
+
+impl TokenBurnOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x7E, 0xD2, 0xD2, 0xA0];
+}
+
+impl BinanceMessage for TokenBurnOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TokenBurnOrder {
+    type Proto<'a> = Proto::TokenBurnOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+        Ok(TokenBurnOrder {
+            from,
+            symbol: msg.symbol.to_string(),
+            amount: msg.amount,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TokenBurnOrder {
+            from: self.from.data().into(),
+            symbol: self.symbol.clone().into(),
+            amount: self.amount,
+        }
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/message/trade_order.rs b/rust/chains/tw_binance/src/transaction/message/trade_order.rs
new file mode 100644
index 00000000000..0add4dcd87b
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/message/trade_order.rs
@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use crate::amino::AminoEncoder;
+use crate::transaction::message::{BinanceMessage, TWBinanceProto};
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+use tw_proto::Binance::Proto;
+
+#[repr(i64)]
+#[derive(
+    Clone, Copy, serde_repr::Deserialize_repr, serde_repr::Serialize_repr, strum_macros::FromRepr,
+)]
+pub enum OrderType {
+    /// https://github.com/bnb-chain/python-sdk/blob/0f6b8a6077f486b26eda3e448f3e84ef35bfff75/binance_chain/constants.py#L62
+    Limit = 2,
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct NewTradeOrder {
+    /// Order id, optional.
+    pub id: String,
+    /// Order type.
+    #[serde(rename = "ordertype")]
+    pub order_type: OrderType,
+    /// Price of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer.
+    pub price: i64,
+    /// Quantity of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer.
+    pub quantity: i64,
+    /// Originating address.
+    pub sender: BinanceAddress,
+    /// 1 for buy and 2 for sell.
+    pub side: i64,
+    /// Symbol for trading pair in full name of the tokens.
+    pub symbol: String,
+    /// 1 for Good Till Expire(GTE) order and 3 for Immediate Or Cancel (IOC).
+    #[serde(rename = "timeinforce")]
+    pub time_in_force: i64,
+}
+
+impl NewTradeOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0xCE, 0x6D, 0xC0, 0x43];
+}
+
+impl BinanceMessage for NewTradeOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for NewTradeOrder {
+    type Proto<'a> = Proto::TradeOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let order_type = OrderType::from_repr(msg.ordertype)
+            .or_tw_err(SigningErrorType::Error_invalid_params)?;
+        let sender = BinanceAddress::from_key_hash_with_coin(coin, msg.sender.to_vec())?;
+
+        Ok(NewTradeOrder {
+            id: msg.id.to_string(),
+            order_type,
+            price: msg.price,
+            quantity: msg.quantity,
+            sender,
+            side: msg.side,
+            symbol: msg.symbol.to_string(),
+            time_in_force: msg.timeinforce,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TradeOrder {
+            id: self.id.clone().into(),
+            ordertype: self.order_type as i64,
+            price: self.price,
+            quantity: self.quantity,
+            sender: self.sender.data().into(),
+            side: self.side,
+            symbol: self.symbol.clone().into(),
+            timeinforce: self.time_in_force,
+        }
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct CancelTradeOrder {
+    /// Order id to cancel.
+    pub refid: String,
+    /// Originating address.
+    pub sender: BinanceAddress,
+    /// Symbol for trading pair in full name of the tokens.
+    pub symbol: String,
+}
+
+impl CancelTradeOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x16, 0x6E, 0x68, 0x1B];
+}
+
+impl BinanceMessage for CancelTradeOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for CancelTradeOrder {
+    type Proto<'a> = Proto::CancelTradeOrder<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let sender = BinanceAddress::from_key_hash_with_coin(coin, msg.sender.to_vec())?;
+        Ok(CancelTradeOrder {
+            sender,
+            symbol: msg.symbol.to_string(),
+            refid: msg.refid.to_string(),
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::CancelTradeOrder {
+            sender: self.sender.data().into(),
+            symbol: self.symbol.clone().into(),
+            refid: self.refid.clone().into(),
+        }
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/message/tranfer_out_order.rs b/rust/chains/tw_binance/src/transaction/message/tranfer_out_order.rs
new file mode 100644
index 00000000000..30dfef73f56
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/message/tranfer_out_order.rs
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::BinanceAddress;
+use crate::amino::AminoEncoder;
+use crate::transaction::message::{BinanceMessage, TWBinanceProto, Token};
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_evm::address::Address as EthereumAddress;
+use tw_hash::H160;
+use tw_memory::Data;
+use tw_proto::Binance::Proto;
+
+#[derive(Deserialize, Serialize)]
+pub struct TransferOutOrder {
+    pub amount: Token,
+    pub expire_time: i64,
+    pub from: BinanceAddress,
+    pub to: EthereumAddress,
+}
+
+impl TransferOutOrder {
+    /// cbindgen:ignore
+    pub const PREFIX: [u8; 4] = [0x80, 0x08, 0x19, 0xC0];
+}
+
+impl BinanceMessage for TransferOutOrder {
+    fn to_amino_protobuf(&self) -> SigningResult<Data> {
+        Ok(AminoEncoder::new(&Self::PREFIX)
+            .extend_with_msg(&self.to_tw_proto())?
+            .encode())
+    }
+}
+
+impl TWBinanceProto for TransferOutOrder {
+    type Proto<'a> = Proto::TransferOut<'a>;
+
+    fn from_tw_proto(coin: &dyn CoinContext, msg: &Self::Proto<'_>) -> SigningResult<Self> {
+        let from = BinanceAddress::from_key_hash_with_coin(coin, msg.from.to_vec())?;
+
+        let to_bytes =
+            H160::try_from(msg.to.as_ref()).tw_err(|_| SigningErrorType::Error_invalid_address)?;
+        let to = EthereumAddress::from_bytes(to_bytes);
+
+        let amount_proto = msg
+            .amount
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)?;
+
+        Ok(TransferOutOrder {
+            from,
+            to,
+            amount: Token::from_tw_proto(amount_proto),
+            expire_time: msg.expire_time,
+        })
+    }
+
+    fn to_tw_proto(&self) -> Self::Proto<'static> {
+        Proto::TransferOut {
+            from: self.from.data().into(),
+            to: self.to.data().into(),
+            amount: Some(self.amount.to_tw_proto()),
+            expire_time: self.expire_time,
+        }
+    }
+}
diff --git a/rust/chains/tw_binance/src/transaction/mod.rs b/rust/chains/tw_binance/src/transaction/mod.rs
new file mode 100644
index 00000000000..fbd24f33ebe
--- /dev/null
+++ b/rust/chains/tw_binance/src/transaction/mod.rs
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::signature::BinanceSignature;
+use crate::transaction::message::BinanceMessageEnum;
+use serde::{Deserialize, Serialize};
+use tw_cosmos_sdk::public_key::secp256k1::Secp256PublicKey;
+use tw_memory::Data;
+use tw_misc::serde::as_string;
+
+pub mod message;
+
+#[derive(Deserialize, Serialize)]
+pub struct UnsignedTransaction {
+    #[serde(with = "as_string")]
+    pub account_number: i64,
+    pub chain_id: String,
+    pub data: Option<Data>,
+    pub memo: String,
+    pub msgs: Vec<BinanceMessageEnum>,
+    #[serde(with = "as_string")]
+    pub sequence: i64,
+    #[serde(with = "as_string")]
+    pub source: i64,
+}
+
+impl UnsignedTransaction {
+    pub fn into_signed(self, signer: SignerInfo) -> SignedTransaction {
+        SignedTransaction {
+            unsigned: self,
+            signer,
+        }
+    }
+}
+
+pub struct SignerInfo {
+    pub public_key: Secp256PublicKey,
+    pub signature: BinanceSignature,
+}
+
+pub struct SignedTransaction {
+    pub unsigned: UnsignedTransaction,
+    pub signer: SignerInfo,
+}
diff --git a/rust/chains/tw_bitcoin/Cargo.toml b/rust/chains/tw_bitcoin/Cargo.toml
new file mode 100644
index 00000000000..1d5571814b0
--- /dev/null
+++ b/rust/chains/tw_bitcoin/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "tw_bitcoin"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bitcoin = { version = "0.30.0", features = ["rand-std"] }
+secp256k1 = { version = "0.27.0", features = ["global-context", "rand-std"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+tw_bech32_address = { path = "../../tw_bech32_address" }
+tw_base58_address = { path = "../../tw_base58_address" }
+tw_coin_entry = { path = "../../tw_coin_entry", features = ["test-utils"] }
+tw_encoding = { path = "../../tw_encoding" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_misc = { path = "../../tw_misc" }
+tw_proto = { path = "../../tw_proto" }
+tw_utxo = { path = "../../frameworks/tw_utxo" }
diff --git a/rust/chains/tw_bitcoin/src/context.rs b/rust/chains/tw_bitcoin/src/context.rs
new file mode 100644
index 00000000000..8ecdd4f8e55
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/context.rs
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::SigningResult;
+use tw_utxo::address::standard_bitcoin::StandardBitcoinAddress;
+use tw_utxo::context::{AddressPrefixes, UtxoContext};
+use tw_utxo::script::Script;
+
+#[derive(Default)]
+pub struct StandardBitcoinContext;
+
+impl UtxoContext for StandardBitcoinContext {
+    type Address = StandardBitcoinAddress;
+
+    fn addr_to_script_pubkey(
+        addr: &Self::Address,
+        prefixes: AddressPrefixes,
+    ) -> SigningResult<Script> {
+        match addr {
+            StandardBitcoinAddress::Legacy(legacy) => {
+                legacy.to_script_pubkey(prefixes.p2pkh_prefix, prefixes.p2sh_prefix)
+            },
+            StandardBitcoinAddress::Segwit(segwit) => segwit.to_script_pubkey(),
+            StandardBitcoinAddress::Taproot(taproot) => taproot.to_script_pubkey(),
+        }
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/entry.rs b/rust/chains/tw_bitcoin/src/entry.rs
new file mode 100644
index 00000000000..02a728b5d0e
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/entry.rs
@@ -0,0 +1,96 @@
+use crate::context::StandardBitcoinContext;
+use crate::modules::compiler::BitcoinCompiler;
+use crate::modules::planner::BitcoinPlanner;
+use crate::modules::signer::BitcoinSigner;
+use crate::modules::transaction_util::BitcoinTransactionUtil;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_keypair::tw::PublicKey;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::address::standard_bitcoin::{StandardBitcoinAddress, StandardBitcoinPrefix};
+
+pub struct BitcoinEntry;
+
+impl CoinEntry for BitcoinEntry {
+    type AddressPrefix = StandardBitcoinPrefix;
+    type Address = StandardBitcoinAddress;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = Proto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = BitcoinPlanner<StandardBitcoinContext>;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = BitcoinTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        StandardBitcoinAddress::from_str_with_coin_and_prefix(coin, address, prefix)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        StandardBitcoinAddress::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: PublicKey,
+        derivation: Derivation,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        StandardBitcoinAddress::derive_as_tw(coin, &public_key, derivation, prefix)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, proto: Self::SigningInput<'_>) -> Self::SigningOutput {
+        BitcoinSigner::<StandardBitcoinContext>::sign(coin, &proto)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        proto: Proto::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        BitcoinCompiler::<StandardBitcoinContext>::preimage_hashes(coin, proto)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        proto: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        BitcoinCompiler::<StandardBitcoinContext>::compile(coin, proto, signatures, public_keys)
+    }
+
+    #[inline]
+    fn plan_builder(&self) -> Option<Self::PlanBuilder> {
+        Some(BitcoinPlanner::<StandardBitcoinContext>::default())
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(BitcoinTransactionUtil)
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/lib.rs b/rust/chains/tw_bitcoin/src/lib.rs
new file mode 100644
index 00000000000..6f1db4b73ee
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/lib.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod context;
+pub mod entry;
+pub mod modules;
diff --git a/rust/chains/tw_bitcoin/src/modules/compiler.rs b/rust/chains/tw_bitcoin/src/modules/compiler.rs
new file mode 100644
index 00000000000..e596df15a58
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/compiler.rs
@@ -0,0 +1,177 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::protobuf_builder::ProtobufBuilder;
+use crate::modules::psbt_request::PsbtRequest;
+use crate::modules::signing_request::SigningRequestBuilder;
+use std::borrow::Cow;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_proto::BitcoinV2::Proto;
+use tw_proto::BitcoinV2::Proto::mod_PreSigningOutput::{
+    SigningMethod as ProtoSigningMethod, TaprootTweak as ProtoTaprootTweak,
+};
+use tw_proto::BitcoinV2::Proto::mod_SigningInput::OneOftransaction as TransactionType;
+use tw_utxo::context::UtxoContext;
+use tw_utxo::modules::sighash_computer::{SighashComputer, TaprootTweak, TxPreimage};
+use tw_utxo::modules::sighash_verifier::SighashVerifier;
+use tw_utxo::modules::tx_compiler::TxCompiler;
+use tw_utxo::modules::tx_planner::TxPlanner;
+use tw_utxo::modules::utxo_selector::SelectResult;
+use tw_utxo::signing_mode::SigningMethod;
+use tw_utxo::transaction::transaction_interface::TransactionInterface;
+
+pub struct BitcoinCompiler<Context: UtxoContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: UtxoContext> BitcoinCompiler<Context> {
+    /// Please note that [`Proto::SigningInput::public_key`] must be set.
+    /// If the public key should be derived from a private key, please do it before this method is called.
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::PreSigningOutput<'static>> {
+        let unsigned_tx = match input.transaction {
+            TransactionType::builder(ref tx_builder) => {
+                let request = SigningRequestBuilder::<Context>::build(coin, &input, tx_builder)?;
+                TxPlanner::plan(request)?.unsigned_tx
+            },
+            TransactionType::psbt(ref psbt) => {
+                PsbtRequest::<Context>::build(&input, psbt)?.unsigned_tx
+            },
+            TransactionType::None => {
+                return SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("Either `TransactionBuilder` or `Psbt` should be set")
+            },
+        };
+
+        let TxPreimage { sighashes } = SighashComputer::preimage_tx(&unsigned_tx)?;
+
+        let sighashes: Vec<_> = sighashes
+            .into_iter()
+            .map(|sighash| Proto::mod_PreSigningOutput::Sighash {
+                public_key: Cow::from(sighash.signer_pubkey),
+                sighash: Cow::from(sighash.sighash.to_vec()),
+                signing_method: signing_method(sighash.signing_method),
+                tweak: taproot_tweak(sighash.taproot_tweak),
+            })
+            .collect();
+
+        Ok(Proto::PreSigningOutput {
+            sighashes,
+            ..Proto::PreSigningOutput::default()
+        })
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn compile_impl(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        _public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        match input.transaction {
+            TransactionType::builder(ref tx) => {
+                Self::compile_with_tx_builder(coin, &input, tx, signatures)
+            },
+            TransactionType::psbt(ref psbt) => Self::compile_psbt(coin, &input, psbt, signatures),
+            TransactionType::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No transaction type specified"),
+        }
+    }
+
+    fn compile_with_tx_builder(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+        tx_builder_input: &Proto::TransactionBuilder,
+        signatures: Vec<SignatureBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let request = SigningRequestBuilder::<Context>::build(coin, input, tx_builder_input)?;
+        let SelectResult { unsigned_tx, plan } = TxPlanner::plan(request)?;
+
+        SighashVerifier::verify_signatures(&unsigned_tx, &signatures)?;
+        let signed_tx = TxCompiler::compile(unsigned_tx, &signatures)?;
+        let tx_proto = ProtobufBuilder::tx_to_proto(&signed_tx);
+
+        Ok(Proto::SigningOutput {
+            transaction: Some(tx_proto),
+            encoded: Cow::from(signed_tx.encode_out()),
+            txid: Cow::from(signed_tx.txid()),
+            // `vsize` could have been changed after the transaction being signed.
+            vsize: signed_tx.vsize() as u64,
+            weight: signed_tx.weight() as u64,
+            // `fee` should haven't been changed since it's a difference between `sum(inputs)` and `sum(outputs)`.
+            fee: plan.fee_estimate,
+            ..Proto::SigningOutput::default()
+        })
+    }
+
+    fn compile_psbt(
+        _coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+        psbt: &Proto::Psbt,
+        signatures: Vec<SignatureBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let PsbtRequest { unsigned_tx, .. } = PsbtRequest::<Context>::build(input, psbt)?;
+        let fee = unsigned_tx.fee()?;
+
+        SighashVerifier::verify_signatures(&unsigned_tx, &signatures)?;
+        let signed_tx = TxCompiler::compile(unsigned_tx, &signatures)?;
+        let tx_proto = ProtobufBuilder::tx_to_proto(&signed_tx);
+
+        Ok(Proto::SigningOutput {
+            transaction: Some(tx_proto),
+            encoded: Cow::from(signed_tx.encode_out()),
+            txid: Cow::from(signed_tx.txid()),
+            // `vsize` could have been changed after the transaction being signed.
+            vsize: signed_tx.vsize() as u64,
+            weight: signed_tx.weight() as u64,
+            fee,
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
+
+pub fn signing_method(s: SigningMethod) -> ProtoSigningMethod {
+    match s {
+        SigningMethod::Legacy => ProtoSigningMethod::Legacy,
+        SigningMethod::Segwit => ProtoSigningMethod::Segwit,
+        SigningMethod::Taproot => ProtoSigningMethod::Taproot,
+    }
+}
+
+pub fn taproot_tweak(tweak: Option<TaprootTweak>) -> Option<ProtoTaprootTweak<'static>> {
+    tweak.map(|tweak| {
+        let merkle_root = match tweak.merkle_root {
+            Some(root) => root.to_vec(),
+            None => Vec::default(),
+        };
+        ProtoTaprootTweak {
+            merkle_root: Cow::from(merkle_root),
+        }
+    })
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/mod.rs b/rust/chains/tw_bitcoin/src/modules/mod.rs
new file mode 100644
index 00000000000..fc470aafecb
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/mod.rs
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod compiler;
+pub mod planner;
+pub mod protobuf_builder;
+pub mod psbt;
+pub mod psbt_request;
+pub mod signer;
+pub mod signing_request;
+pub mod transaction_util;
+pub mod tx_builder;
diff --git a/rust/chains/tw_bitcoin/src/modules/planner/mod.rs b/rust/chains/tw_bitcoin/src/modules/planner/mod.rs
new file mode 100644
index 00000000000..f36669e1931
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/planner/mod.rs
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::signing_request::SigningRequestBuilder;
+use crate::modules::tx_builder::utxo_protobuf::parse_out_point;
+use std::borrow::Cow;
+use std::collections::HashMap;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::plan_builder::PlanBuilder;
+use tw_coin_entry::signing_output_error;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::context::UtxoContext;
+use tw_utxo::modules::tx_planner::TxPlanner;
+use tw_utxo::modules::utxo_selector::SelectResult;
+
+pub mod psbt_planner;
+
+#[derive(Default)]
+pub struct BitcoinPlanner<Context: UtxoContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: UtxoContext> BitcoinPlanner<Context> {
+    pub fn plan_impl<'a>(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput<'a>,
+    ) -> SigningResult<Proto::TransactionPlan<'a>> {
+        use Proto::mod_SigningInput::OneOftransaction as TransactionType;
+
+        match input.transaction {
+            TransactionType::builder(ref tx) => Self::plan_with_tx_builder(coin, input, tx),
+            TransactionType::psbt(ref psbt) => {
+                psbt_planner::PsbtPlanner::<Context>::plan_psbt(coin, input, psbt)
+            },
+            TransactionType::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Either `TransactionBuilder` or `Psbt` should be set"),
+        }
+    }
+
+    pub fn plan_with_tx_builder<'a>(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput<'a>,
+        tx_builder: &Proto::TransactionBuilder<'a>,
+    ) -> SigningResult<Proto::TransactionPlan<'a>> {
+        let request = SigningRequestBuilder::<Context>::build(coin, input, tx_builder)?;
+        let SelectResult { unsigned_tx, plan } = TxPlanner::plan(request)?;
+
+        // Prepare a map of source Inputs Proto `{ OutPoint -> Input }`.
+        // It will be used to find a Input Proto by its `OutPoint`.
+        let mut inputs_map = HashMap::with_capacity(tx_builder.inputs.len());
+        for utxo in tx_builder.inputs.iter() {
+            let key = parse_out_point(&utxo.out_point)?;
+            if inputs_map.insert(key, utxo).is_some() {
+                // Found a duplicate UTXO. Return an error.
+                return SigningError::err(SigningErrorType::Error_invalid_utxo)
+                    .context("Provided duplicate UTXOs with the same OutPoint");
+            }
+        }
+
+        // Fill out the selected Inputs Proto.
+        let mut selected_inputs_proto = Vec::with_capacity(unsigned_tx.inputs().len());
+        for selected_utxo in unsigned_tx.inputs() {
+            let utxo_proto = inputs_map
+                .get(&selected_utxo.previous_output)
+                .or_tw_err(SigningErrorType::Error_internal)
+                .context("Planned transaction contains an unknown UTXO")?;
+            selected_inputs_proto.push((*utxo_proto).clone());
+        }
+
+        // Fill out the Output Proto.
+        let mut outputs_proto = Vec::with_capacity(unsigned_tx.transaction().outputs.len());
+        for selected_output in unsigned_tx.transaction().outputs.iter() {
+            // For now, just provide a scriptPubkey as is.
+            // Later it's probably worth to return the same output builders as in `SigningInput`.
+            let to_recipient = Proto::mod_Output::OneOfto_recipient::custom_script_pubkey(
+                Cow::from(selected_output.script_pubkey.to_vec()),
+            );
+
+            outputs_proto.push(Proto::Output {
+                value: selected_output.value,
+                to_recipient,
+            })
+        }
+
+        Ok(Proto::TransactionPlan {
+            inputs: selected_inputs_proto,
+            outputs: outputs_proto,
+            available_amount: plan.total_spend,
+            send_amount: plan.total_send,
+            vsize_estimate: plan.vsize_estimate as u64,
+            fee_estimate: plan.fee_estimate,
+            change: plan.change,
+            ..Proto::TransactionPlan::default()
+        })
+    }
+}
+
+impl<Context: UtxoContext> PlanBuilder for BitcoinPlanner<Context> {
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type Plan<'a> = Proto::TransactionPlan<'a>;
+
+    fn plan<'a>(&self, coin: &dyn CoinContext, input: &Self::SigningInput<'a>) -> Self::Plan<'a> {
+        Self::plan_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::TransactionPlan, e))
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/planner/psbt_planner.rs b/rust/chains/tw_bitcoin/src/modules/planner/psbt_planner.rs
new file mode 100644
index 00000000000..545862d1691
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/planner/psbt_planner.rs
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::psbt_request::PsbtRequest;
+use crate::modules::signing_request::SigningRequestBuilder;
+use crate::modules::tx_builder::script_parser::StandardScriptParser;
+use crate::modules::tx_builder::BitcoinChainInfo;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::BitcoinV2::Proto;
+use tw_proto::BitcoinV2::Proto::mod_Input::OneOfclaiming_script as ClaimingScriptProto;
+use tw_proto::BitcoinV2::Proto::mod_Output::OneOfto_recipient as ToRecipientProto;
+use tw_utxo::context::UtxoContext;
+use tw_utxo::transaction::standard_transaction::{TransactionInput, TransactionOutput};
+use tw_utxo::transaction::transaction_interface::TransactionInterface;
+use tw_utxo::transaction::UtxoToSign;
+
+pub struct PsbtPlanner<Context: UtxoContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: UtxoContext> PsbtPlanner<Context> {
+    pub fn plan_psbt(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+        psbt_input: &Proto::Psbt,
+    ) -> SigningResult<Proto::TransactionPlan<'static>> {
+        let chain_info = SigningRequestBuilder::<Context>::chain_info(coin, &input.chain_info)?;
+        let PsbtRequest { unsigned_tx, .. } = PsbtRequest::<Context>::build(input, psbt_input)?;
+
+        let total_input = unsigned_tx.total_input()?;
+        let fee_estimate = unsigned_tx.fee()?;
+
+        let vsize_estimate = unsigned_tx.estimate_transaction().vsize() as u64;
+
+        let inputs: Vec<_> = unsigned_tx
+            .input_args()
+            .iter()
+            .zip(unsigned_tx.inputs())
+            .map(|(unsigned_txin, txin)| Self::utxo_to_proto(unsigned_txin, txin, &chain_info))
+            .collect::<SigningResult<_>>()?;
+
+        let outputs: Vec<_> = unsigned_tx
+            .outputs()
+            .iter()
+            .map(|txout| Self::output_to_proto(txout, &chain_info))
+            .collect::<SigningResult<_>>()?;
+
+        Ok(Proto::TransactionPlan {
+            inputs,
+            outputs,
+            available_amount: total_input,
+            send_amount: total_input,
+            vsize_estimate,
+            fee_estimate,
+            change: 0,
+            ..Proto::TransactionPlan::default()
+        })
+    }
+
+    pub fn utxo_to_proto(
+        unsigned_txin: &UtxoToSign,
+        txin: &TransactionInput,
+        chain_info: &BitcoinChainInfo,
+    ) -> SigningResult<Proto::Input<'static>> {
+        let out_point = Proto::OutPoint {
+            hash: txin.previous_output.hash.to_vec().into(),
+            vout: txin.previous_output.index,
+        };
+        let sequence = Proto::mod_Input::Sequence {
+            sequence: txin.sequence,
+        };
+
+        let from_address = StandardScriptParser
+            .parse(&unsigned_txin.prevout_script_pubkey)?
+            .try_to_address(chain_info)?
+            .or_tw_err(SigningErrorType::Error_invalid_utxo)
+            .context("Unexpected UTXO scriptPubkey")?
+            .to_string();
+
+        Ok(Proto::Input {
+            out_point: Some(out_point),
+            value: unsigned_txin.amount,
+            sighash_type: unsigned_txin.sighash_ty.raw_sighash(),
+            sequence: Some(sequence),
+            claiming_script: ClaimingScriptProto::receiver_address(from_address.into()),
+        })
+    }
+
+    pub fn output_to_proto(
+        output: &TransactionOutput,
+        chain_info: &BitcoinChainInfo,
+    ) -> SigningResult<Proto::Output<'static>> {
+        let to_recipient = match StandardScriptParser
+            .parse(&output.script_pubkey)?
+            .try_to_address(chain_info)?
+        {
+            Some(to_addr) => ToRecipientProto::to_address(to_addr.to_string().into()),
+            // Cannot convert the output scriptPubkey into an address. Return it as is.
+            None => ToRecipientProto::custom_script_pubkey(output.script_pubkey.to_vec().into()),
+        };
+
+        Ok(Proto::Output {
+            value: output.value,
+            to_recipient,
+        })
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/protobuf_builder/mod.rs b/rust/chains/tw_bitcoin/src/modules/protobuf_builder/mod.rs
new file mode 100644
index 00000000000..dc25bc975e5
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/protobuf_builder/mod.rs
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::script::{Script, Witness};
+use tw_utxo::transaction::standard_transaction::{
+    Transaction, TransactionInput, TransactionOutput,
+};
+use tw_utxo::transaction::transaction_interface::TransactionInterface;
+
+pub struct ProtobufBuilder;
+
+impl ProtobufBuilder {
+    pub fn tx_to_proto(tx: &Transaction) -> Proto::Transaction<'static> {
+        let inputs = tx.inputs().iter().map(Self::tx_input_to_proto).collect();
+        let outputs = tx.outputs().iter().map(Self::tx_output_to_proto).collect();
+
+        Proto::Transaction {
+            version: tx.version(),
+            lock_time: tx.locktime,
+            inputs,
+            outputs,
+        }
+    }
+
+    fn tx_input_to_proto(
+        input: &TransactionInput,
+    ) -> Proto::mod_Transaction::TransactionInput<'static> {
+        Proto::mod_Transaction::TransactionInput {
+            out_point: Some(Proto::OutPoint {
+                hash: Cow::from(input.previous_output.hash.to_vec()),
+                vout: input.previous_output.index,
+            }),
+            sequence: input.sequence,
+            script_sig: Self::script_data(&input.script_sig),
+            witness_items: Self::witness_to_proto(&input.witness),
+        }
+    }
+
+    fn tx_output_to_proto(
+        output: &TransactionOutput,
+    ) -> Proto::mod_Transaction::TransactionOutput<'static> {
+        Proto::mod_Transaction::TransactionOutput {
+            script_pubkey: Self::script_data(&output.script_pubkey),
+            value: output.value,
+        }
+    }
+
+    fn witness_to_proto(witness: &Witness) -> Vec<Cow<'static, [u8]>> {
+        witness.as_items().iter().map(Self::script_data).collect()
+    }
+
+    fn script_data(script: &Script) -> Cow<'static, [u8]> {
+        Cow::from(script.to_vec())
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/psbt.rs b/rust/chains/tw_bitcoin/src/modules/psbt.rs
new file mode 100644
index 00000000000..58bb5d54a58
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/psbt.rs
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use bitcoin::psbt::Psbt;
+use tw_utxo::transaction::standard_transaction::Transaction;
+
+/// Finalizes the [Partially Signed Bitcoin Transaction](Psbt)
+/// by updating the final `script_sig` and/or `witness`.
+pub fn update_psbt_signed(psbt: &mut Psbt, signed_tx: &Transaction) {
+    for (signed_txin, utxo_psbt) in signed_tx.inputs.iter().zip(psbt.inputs.iter_mut()) {
+        if !signed_txin.script_sig.is_empty() {
+            utxo_psbt.final_script_sig = Some(bitcoin::ScriptBuf::from_bytes(
+                signed_txin.script_sig.to_vec(),
+            ));
+        }
+
+        if !signed_txin.witness.is_empty() {
+            let mut final_witness = bitcoin::Witness::new();
+            for witness_item in signed_txin.witness.as_items() {
+                final_witness.push(bitcoin::ScriptBuf::from_bytes(witness_item.to_vec()));
+            }
+            utxo_psbt.final_script_witness = Some(final_witness);
+        }
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/psbt_request/mod.rs b/rust/chains/tw_bitcoin/src/modules/psbt_request/mod.rs
new file mode 100644
index 00000000000..5ecac42cae0
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/psbt_request/mod.rs
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::psbt_request::output_psbt::OutputPsbt;
+use crate::modules::psbt_request::utxo_psbt::UtxoPsbt;
+use crate::modules::signing_request::SigningRequestBuilder;
+use bitcoin::psbt::Psbt;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::context::UtxoContext;
+use tw_utxo::transaction::standard_transaction::builder::TransactionBuilder;
+use tw_utxo::transaction::standard_transaction::Transaction;
+use tw_utxo::transaction::unsigned_transaction::UnsignedTransaction;
+
+pub mod output_psbt;
+pub mod utxo_psbt;
+
+pub struct PsbtRequest<Context: UtxoContext> {
+    pub psbt: Psbt,
+    pub unsigned_tx: UnsignedTransaction<Transaction>,
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: UtxoContext> PsbtRequest<Context> {
+    pub fn build(input: &Proto::SigningInput, psbt_input: &Proto::Psbt) -> SigningResult<Self> {
+        let psbt = Psbt::deserialize(&psbt_input.psbt)
+            .tw_err(|_| SigningErrorType::Error_input_parse)
+            .context("Error deserializing PSBT")?;
+
+        let version = psbt
+            .unsigned_tx
+            .version
+            .try_into()
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid PSBT transaction version")?;
+        let lock_time = psbt.unsigned_tx.lock_time.to_consensus_u32();
+
+        let public_keys = SigningRequestBuilder::<Context>::get_public_keys(input)?;
+
+        let mut builder = TransactionBuilder::default();
+        builder.version(version).lock_time(lock_time);
+
+        // Add all UTXOs to the unsigned transaction builder.
+        for (txin, txin_psbt) in psbt.unsigned_tx.input.iter().zip(psbt.inputs.iter()) {
+            let utxo_builder = UtxoPsbt::new(txin, txin_psbt, &public_keys);
+
+            let (utxo, utxo_args) = utxo_builder
+                .build()
+                .context("Error creating UTXO from PSBT")?;
+            builder.push_input(utxo, utxo_args);
+        }
+
+        // Add all outputs to the unsigned transaction builder.
+        for txout in psbt.unsigned_tx.output.iter() {
+            let output = OutputPsbt::new(txout)
+                .build()
+                .context("Error creating Output from PSBT")?;
+            builder.push_output(output);
+        }
+
+        let unsigned_tx = builder.build()?;
+        Ok(PsbtRequest {
+            psbt,
+            unsigned_tx,
+            _phantom: PhantomData,
+        })
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/psbt_request/output_psbt.rs b/rust/chains/tw_bitcoin/src/modules/psbt_request/output_psbt.rs
new file mode 100644
index 00000000000..c691744230d
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/psbt_request/output_psbt.rs
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_utxo::script::Script;
+use tw_utxo::transaction::standard_transaction::TransactionOutput;
+
+/// Currently, we rely on `bitcoin` crate to build our own [`TransactionOutput`].
+pub struct OutputPsbt<'a> {
+    output: &'a bitcoin::TxOut,
+}
+
+impl<'a> OutputPsbt<'a> {
+    pub fn new(output: &'a bitcoin::TxOut) -> Self {
+        OutputPsbt { output }
+    }
+
+    pub fn build(self) -> SigningResult<TransactionOutput> {
+        let value = self
+            .output
+            .value
+            .try_into()
+            .tw_err(|_| SigningErrorType::Error_invalid_utxo_amount)
+            .context("PSBT Output amount is too large")?;
+        let script_pubkey = Script::from(self.output.script_pubkey.to_bytes());
+        Ok(TransactionOutput {
+            value,
+            script_pubkey,
+        })
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/psbt_request/utxo_psbt.rs b/rust/chains/tw_bitcoin/src/modules/psbt_request/utxo_psbt.rs
new file mode 100644
index 00000000000..58d144de377
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/psbt_request/utxo_psbt.rs
@@ -0,0 +1,132 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::tx_builder::public_keys::PublicKeys;
+use crate::modules::tx_builder::script_parser::{StandardScript, StandardScriptParser};
+use secp256k1::ThirtyTwoByteHash;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H256;
+use tw_utxo::script::Script;
+use tw_utxo::sighash::SighashType;
+use tw_utxo::transaction::standard_transaction::builder::UtxoBuilder;
+use tw_utxo::transaction::standard_transaction::TransactionInput;
+use tw_utxo::transaction::UtxoToSign;
+
+/// Currently, we rely on `bitcoin` crate to build our own [`UtxoToSign`].
+pub struct UtxoPsbt<'a> {
+    utxo: &'a bitcoin::TxIn,
+    utxo_psbt: &'a bitcoin::psbt::Input,
+    public_keys: &'a PublicKeys,
+}
+
+impl<'a> UtxoPsbt<'a> {
+    pub fn new(
+        utxo: &'a bitcoin::TxIn,
+        utxo_psbt: &'a bitcoin::psbt::Input,
+        public_keys: &'a PublicKeys,
+    ) -> Self {
+        UtxoPsbt {
+            utxo,
+            utxo_psbt,
+            public_keys,
+        }
+    }
+
+    pub fn build(self) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        if let Some(ref non_witness_utxo) = self.utxo_psbt.non_witness_utxo {
+            self.build_non_witness_utxo(non_witness_utxo)
+        } else if let Some(ref witness_utxo) = self.utxo_psbt.witness_utxo {
+            self.build_witness_utxo(witness_utxo)
+        } else {
+            SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Neither 'witness_utxo' nor 'non_witness_utxo' are set in the PSBT")
+        }
+    }
+
+    pub fn build_non_witness_utxo(
+        &self,
+        non_witness_utxo: &bitcoin::Transaction,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let prev_out_idx = self.utxo.previous_output.vout as usize;
+        let prev_out = non_witness_utxo
+            .output
+            .get(prev_out_idx)
+            .or_tw_err(SigningErrorType::Error_invalid_utxo)
+            .with_context(|| {
+                format!("'Psbt::non_witness_utxo' does not contain '{prev_out_idx}' output")
+            })?;
+
+        let script = Script::from(prev_out.script_pubkey.to_bytes());
+        let builder = self.prepare_builder(prev_out.value)?;
+
+        self.build_utxo_with_script(builder, &script)
+    }
+
+    pub fn build_witness_utxo(
+        &self,
+        witness_utxo: &bitcoin::TxOut,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let script = Script::from(witness_utxo.script_pubkey.to_bytes());
+        let builder = self.prepare_builder(witness_utxo.value)?;
+        self.build_utxo_with_script(builder, &script)
+    }
+
+    fn build_utxo_with_script(
+        &self,
+        builder: UtxoBuilder,
+        script: &Script,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        match StandardScriptParser.parse(script)? {
+            StandardScript::P2PK(pubkey) => builder.p2pk(&pubkey),
+            StandardScript::P2PKH(pubkey_hash) => {
+                let pubkey = self.public_keys.get_ecdsa_public_key(&pubkey_hash)?;
+                builder.p2pkh(&pubkey)
+            },
+            StandardScript::P2WPKH(pubkey_hash) => {
+                let pubkey = self.public_keys.get_ecdsa_public_key(&pubkey_hash)?;
+                builder.p2wpkh(&pubkey)
+            },
+            StandardScript::P2TR(tweaked_pubkey) => {
+                if self.has_tap_scripts() {
+                    return SigningError::err(SigningErrorType::Error_not_supported)
+                        .context("P2TR script path is not supported for PSBT at the moment");
+                }
+                builder.p2tr_key_path_with_tweaked_pubkey(&tweaked_pubkey)
+            },
+            StandardScript::P2SH(_) | StandardScript::P2WSH(_) => {
+                SigningError::err(SigningErrorType::Error_not_supported)
+                    .context("P2SH and P2WSH scriptPubkey's are not supported yet")
+            },
+            StandardScript::OpReturn(_) => SigningError::err(SigningErrorType::Error_invalid_utxo)
+                .context("Cannot spend an OP_RETURN output"),
+        }
+    }
+
+    fn prepare_builder(&self, amount: u64) -> SigningResult<UtxoBuilder> {
+        let prevout_hash = H256::from(self.utxo.previous_output.txid.to_raw_hash().into_32());
+        let prevout_index = self.utxo.previous_output.vout;
+        let sequence = self.utxo.sequence.0;
+
+        let sighash_ty = match self.utxo_psbt.sighash_type {
+            Some(psbt_ty) => SighashType::from_u32(psbt_ty.to_u32())?,
+            None => SighashType::default(),
+        };
+
+        let amount = amount
+            .try_into()
+            .tw_err(|_| SigningErrorType::Error_invalid_utxo_amount)
+            .context("PSBT UTXO amount is too large")?;
+
+        Ok(UtxoBuilder::default()
+            .prev_txid(prevout_hash)
+            .prev_index(prevout_index)
+            .sequence(sequence)
+            .sighash_type(sighash_ty)
+            .amount(amount))
+    }
+
+    fn has_tap_scripts(&self) -> bool {
+        !self.utxo_psbt.tap_scripts.is_empty()
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/signer.rs b/rust/chains/tw_bitcoin/src/modules/signer.rs
new file mode 100644
index 00000000000..5db22d32e74
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/signer.rs
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::protobuf_builder::ProtobufBuilder;
+use crate::modules::psbt::update_psbt_signed;
+use crate::modules::psbt_request::PsbtRequest;
+use crate::modules::signing_request::SigningRequestBuilder;
+use std::borrow::Cow;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_keypair::{ecdsa, schnorr};
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::context::UtxoContext;
+use tw_utxo::modules::keys_manager::KeysManager;
+use tw_utxo::modules::tx_planner::TxPlanner;
+use tw_utxo::modules::tx_signer::TxSigner;
+use tw_utxo::modules::utxo_selector::SelectResult;
+use tw_utxo::signing_mode::SigningMethod;
+use tw_utxo::transaction::standard_transaction::Transaction;
+use tw_utxo::transaction::transaction_interface::TransactionInterface;
+use tw_utxo::transaction::unsigned_transaction::UnsignedTransaction;
+
+pub struct BitcoinSigner<Context: UtxoContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: UtxoContext> BitcoinSigner<Context> {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    pub fn sign_impl(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        use Proto::mod_SigningInput::OneOftransaction as TransactionType;
+
+        match input.transaction {
+            TransactionType::builder(ref tx) => Self::sign_with_tx_builder(coin, input, tx),
+            TransactionType::psbt(ref psbt) => Self::sign_psbt(coin, input, psbt),
+            TransactionType::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Either `TransactionBuilder` or `Psbt` should be set"),
+        }
+    }
+
+    pub fn sign_with_tx_builder(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+        tx_builder_input: &Proto::TransactionBuilder,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let request = SigningRequestBuilder::<Context>::build(coin, input, tx_builder_input)?;
+        let SelectResult { unsigned_tx, plan } = TxPlanner::plan(request)?;
+
+        let keys_manager = Self::keys_manager_for_tx(
+            &input.private_keys,
+            &unsigned_tx,
+            input.dangerous_use_fixed_schnorr_rng,
+        )?;
+
+        let signed_tx =
+            TxSigner::sign_tx(unsigned_tx, &keys_manager).context("Error signing transaction")?;
+
+        Ok(Proto::SigningOutput {
+            transaction: Some(ProtobufBuilder::tx_to_proto(&signed_tx)),
+            encoded: Cow::from(signed_tx.encode_out()),
+            txid: Cow::from(signed_tx.txid()),
+            // `vsize` could have been changed after the transaction being signed.
+            vsize: signed_tx.vsize() as u64,
+            // `fee` should haven't been changed since it's a difference between `sum(inputs)` and `sum(outputs)`.
+            fee: plan.fee_estimate,
+            weight: signed_tx.weight() as u64,
+            ..Proto::SigningOutput::default()
+        })
+    }
+
+    pub fn sign_psbt(
+        _coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+        psbt_input: &Proto::Psbt,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let PsbtRequest {
+            mut psbt,
+            unsigned_tx,
+            ..
+        } = PsbtRequest::<Context>::build(input, psbt_input)?;
+
+        let fee = unsigned_tx.fee()?;
+
+        let keys_manager = Self::keys_manager_for_tx(
+            &input.private_keys,
+            &unsigned_tx,
+            input.dangerous_use_fixed_schnorr_rng,
+        )?;
+
+        let signed_tx =
+            TxSigner::sign_tx(unsigned_tx, &keys_manager).context("Error signing transaction")?;
+
+        update_psbt_signed(&mut psbt, &signed_tx);
+
+        Ok(Proto::SigningOutput {
+            transaction: Some(ProtobufBuilder::tx_to_proto(&signed_tx)),
+            encoded: Cow::from(signed_tx.encode_out()),
+            txid: Cow::from(signed_tx.txid()),
+            // `vsize` could have been changed after the transaction being signed.
+            vsize: signed_tx.vsize() as u64,
+            fee,
+            weight: signed_tx.weight() as u64,
+            psbt: Some(Proto::Psbt {
+                psbt: Cow::from(psbt.serialize()),
+            }),
+            ..Proto::SigningOutput::default()
+        })
+    }
+
+    fn keys_manager_for_tx<P>(
+        private_keys: &[P],
+        unsigned_tx: &UnsignedTransaction<Transaction>,
+        dangerous_use_fixed_schnorr_rng: bool,
+    ) -> SigningResult<KeysManager>
+    where
+        P: AsRef<[u8]>,
+    {
+        let has_taproot = unsigned_tx
+            .input_args()
+            .iter()
+            .any(|utxo_args| utxo_args.signing_method == SigningMethod::Taproot);
+
+        let mut keys_manager = KeysManager::default();
+
+        // Parse private keys and put them to the keys manager.
+        for private in private_keys.iter() {
+            let ecdsa_private = ecdsa::secp256k1::PrivateKey::try_from(private.as_ref())
+                .into_tw()
+                .context("Invalid ecdsa secp256k1 private key")?;
+            keys_manager.add_ecdsa_private(ecdsa_private);
+
+            if has_taproot {
+                let schnorr_private = schnorr::PrivateKey::try_from(private.as_ref())
+                    .into_tw()
+                    .context("Invalid schnorr private key")?;
+
+                if dangerous_use_fixed_schnorr_rng {
+                    keys_manager.add_schnorr_private(schnorr_private.no_aux_rand());
+                } else {
+                    keys_manager.add_schnorr_private(schnorr_private);
+                }
+            }
+        }
+
+        Ok(keys_manager)
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/signing_request/mod.rs b/rust/chains/tw_bitcoin/src/modules/signing_request/mod.rs
new file mode 100644
index 00000000000..8e62b8b6d2b
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/signing_request/mod.rs
@@ -0,0 +1,182 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::tx_builder::output_protobuf::OutputProtobuf;
+use crate::modules::tx_builder::public_keys::PublicKeys;
+use crate::modules::tx_builder::utxo_protobuf::UtxoProtobuf;
+use crate::modules::tx_builder::BitcoinChainInfo;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_misc::traits::OptionalEmpty;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::context::UtxoContext;
+use tw_utxo::dust::DustPolicy;
+use tw_utxo::modules::tx_planner::{PlanRequest, RequestType};
+use tw_utxo::modules::utxo_selector::InputSelector;
+use tw_utxo::transaction::standard_transaction::builder::TransactionBuilder;
+use tw_utxo::transaction::standard_transaction::Transaction;
+use Proto::mod_TransactionBuilder::OneOfdust_policy as ProtoDustPolicy;
+
+const DEFAULT_TX_VERSION: u32 = 1;
+
+pub type StandardSigningRequest = PlanRequest<Transaction>;
+
+pub struct SigningRequestBuilder<Context: UtxoContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: UtxoContext> SigningRequestBuilder<Context> {
+    pub fn build(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+        transaction_builder: &Proto::TransactionBuilder,
+    ) -> SigningResult<StandardSigningRequest> {
+        let chain_info = Self::chain_info(coin, &input.chain_info)?;
+        let dust_policy = Self::dust_policy(&transaction_builder.dust_policy)?;
+        let fee_per_vbyte = transaction_builder.fee_per_vb;
+        let version = Self::transaction_version(&transaction_builder.version);
+
+        let public_keys = Self::get_public_keys(input)?;
+
+        let mut builder = TransactionBuilder::default();
+        builder
+            .version(version)
+            .lock_time(transaction_builder.lock_time);
+
+        // Parse all UTXOs.
+        for utxo_proto in transaction_builder.inputs.iter() {
+            let utxo_builder = UtxoProtobuf::<Context>::new(&chain_info, utxo_proto, &public_keys);
+
+            let (utxo, utxo_args) = utxo_builder
+                .utxo_from_proto()
+                .context("Error creating UTXO from Protobuf")?;
+            builder.push_input(utxo, utxo_args);
+        }
+
+        // If `max_amount_output` is set, construct a transaction with only one output.
+        if let Some(max_output_proto) = transaction_builder.max_amount_output.as_ref() {
+            let output_builder = OutputProtobuf::<Context>::new(&chain_info, max_output_proto);
+
+            let max_output = output_builder
+                .output_from_proto()
+                .context("Error creating Max Output from Protobuf")?;
+            builder.push_output(max_output);
+
+            let unsigned_tx = builder.build()?;
+            return Ok(StandardSigningRequest {
+                ty: RequestType::SendMax { unsigned_tx },
+                dust_policy,
+                fee_per_vbyte,
+            });
+        }
+
+        // `max_amount_output` isn't set, parse all Outputs.
+        for output_proto in transaction_builder.outputs.iter() {
+            let output = OutputProtobuf::<Context>::new(&chain_info, output_proto)
+                .output_from_proto()
+                .context("Error creating Output from Proto")?;
+            builder.push_output(output);
+        }
+
+        // Parse change output if it was provided.
+        let change_output = transaction_builder
+            .change_output
+            .as_ref()
+            .map(|change_output_proto| {
+                OutputProtobuf::<Context>::new(&chain_info, change_output_proto)
+                    .output_from_proto()
+                    .context("Error creating Change Output from Proto")
+            })
+            .transpose()?;
+
+        let input_selector = Self::input_selector(&transaction_builder.input_selector);
+
+        let unsigned_tx = builder.build()?;
+        Ok(StandardSigningRequest {
+            ty: RequestType::SendExact {
+                unsigned_tx,
+                change_output,
+                input_selector,
+            },
+            dust_policy,
+            fee_per_vbyte,
+        })
+    }
+
+    pub fn get_public_keys(input: &Proto::SigningInput) -> SigningResult<PublicKeys> {
+        let mut public_keys = PublicKeys::default();
+
+        if input.private_keys.is_empty() {
+            for public in input.public_keys.iter() {
+                public_keys.add_public_key(public.to_vec());
+            }
+        } else {
+            for private in input.private_keys.iter() {
+                public_keys.add_public_with_ecdsa_private(private)?;
+            }
+        }
+
+        Ok(public_keys)
+    }
+
+    fn input_selector(selector: &Proto::InputSelector) -> InputSelector {
+        match selector {
+            Proto::InputSelector::SelectAscending => InputSelector::Ascending,
+            Proto::InputSelector::SelectInOrder => InputSelector::InOrder,
+            Proto::InputSelector::SelectDescending => InputSelector::Descending,
+            Proto::InputSelector::UseAll => InputSelector::UseAll,
+        }
+    }
+
+    fn dust_policy(proto: &ProtoDustPolicy) -> SigningResult<DustPolicy> {
+        match proto {
+            ProtoDustPolicy::fixed_dust_threshold(fixed) => Ok(DustPolicy::FixedAmount(*fixed)),
+            ProtoDustPolicy::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No dust policy provided"),
+        }
+    }
+
+    fn transaction_version(proto: &Proto::TransactionVersion) -> u32 {
+        match proto {
+            Proto::TransactionVersion::UseDefault => DEFAULT_TX_VERSION,
+            Proto::TransactionVersion::V1 => 1,
+            Proto::TransactionVersion::V2 => 2,
+        }
+    }
+
+    pub fn chain_info(
+        coin: &dyn CoinContext,
+        chain_info: &Option<Proto::ChainInfo>,
+    ) -> SigningResult<BitcoinChainInfo> {
+        fn prefix_to_u8(prefix: u32, prefix_name: &str) -> SigningResult<u8> {
+            prefix
+                .try_into()
+                .tw_err(|_| SigningErrorType::Error_invalid_params)
+                .with_context(|| format!("Invalid {prefix_name} prefix. It must fit uint8"))
+        }
+
+        if let Some(info) = chain_info {
+            let hrp = info.hrp.to_string().empty_or_some();
+            return Ok(BitcoinChainInfo {
+                p2pkh_prefix: prefix_to_u8(info.p2pkh_prefix, "p2pkh")?,
+                p2sh_prefix: prefix_to_u8(info.p2sh_prefix, "p2sh")?,
+                hrp,
+            });
+        }
+
+        // Try to get the chain info from the context.
+        // Note that not all Bitcoin forks support HRP (segwit addresses).
+        let hrp = coin.hrp();
+        match (coin.p2pkh_prefix(), coin.p2sh_prefix()) {
+            (Some(p2pkh_prefix), Some(p2sh_prefix)) => Ok(BitcoinChainInfo {
+                p2pkh_prefix,
+                p2sh_prefix,
+                hrp,
+            }),
+            _ => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Neither 'SigningInput.chain_info' nor p2pkh/p2sh prefixes specified in the registry.json")
+        }
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/transaction_util.rs b/rust/chains/tw_bitcoin/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..19862095334
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/transaction_util.rs
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use bitcoin::consensus::deserialize;
+use bitcoin::Transaction;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_util::TransactionUtil;
+use tw_encoding::hex::decode;
+
+pub struct BitcoinTransactionUtil;
+
+impl TransactionUtil for BitcoinTransactionUtil {
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        Self::calc_tx_hash_impl(coin, encoded_tx)
+    }
+}
+
+impl BitcoinTransactionUtil {
+    fn calc_tx_hash_impl(_coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        let tx = decode(encoded_tx).map_err(|_| SigningErrorType::Error_input_parse)?;
+
+        // Deserialize the transaction
+        let tx: Transaction = deserialize(&tx).map_err(|_| SigningErrorType::Error_input_parse)?;
+
+        // Calculate the transaction ID
+        let txid = tx.txid();
+
+        // Note: to_string() returns the reversed byte order, which is the RPC format
+        Ok(txid.to_string())
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/tx_builder/mod.rs b/rust/chains/tw_bitcoin/src/modules/tx_builder/mod.rs
new file mode 100644
index 00000000000..98c05c767aa
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/tx_builder/mod.rs
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_utxo::context::AddressPrefixes;
+
+pub mod output_protobuf;
+pub mod public_keys;
+pub mod script_parser;
+pub mod utxo_protobuf;
+
+pub struct BitcoinChainInfo {
+    pub p2pkh_prefix: u8,
+    pub p2sh_prefix: u8,
+    /// Note that not all Bitcoin forks support HRP (segwit addresses).
+    pub hrp: Option<String>,
+}
+
+impl BitcoinChainInfo {
+    pub fn to_address_prefixes(&self) -> AddressPrefixes {
+        AddressPrefixes {
+            p2pkh_prefix: self.p2pkh_prefix,
+            p2sh_prefix: self.p2sh_prefix,
+        }
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/tx_builder/output_protobuf.rs b/rust/chains/tw_bitcoin/src/modules/tx_builder/output_protobuf.rs
new file mode 100644
index 00000000000..7b503a0f925
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/tx_builder/output_protobuf.rs
@@ -0,0 +1,223 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::tx_builder::BitcoinChainInfo;
+use std::marker::PhantomData;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::hasher::sha256_ripemd;
+use tw_hash::sha2::sha256;
+use tw_hash::{Hash, H256};
+use tw_keypair::{ecdsa, schnorr};
+use tw_memory::Data;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::context::UtxoContext;
+use tw_utxo::script::Script;
+use tw_utxo::transaction::standard_transaction::builder::OutputBuilder;
+use tw_utxo::transaction::standard_transaction::TransactionOutput;
+
+pub struct OutputProtobuf<'a, Context: UtxoContext> {
+    chain_info: &'a BitcoinChainInfo,
+    output: &'a Proto::Output<'a>,
+    _phantom: PhantomData<Context>,
+}
+
+impl<'a, Context: UtxoContext> OutputProtobuf<'a, Context> {
+    pub fn new(chain_info: &'a BitcoinChainInfo, output: &'a Proto::Output<'a>) -> Self {
+        OutputProtobuf {
+            chain_info,
+            output,
+            _phantom: PhantomData,
+        }
+    }
+
+    pub fn output_from_proto(self) -> SigningResult<TransactionOutput> {
+        use Proto::mod_Output::mod_OutputBuilder::OneOfvariant as BuilderType;
+        use Proto::mod_Output::OneOfto_recipient as RecipientType;
+
+        match self.output.to_recipient {
+            RecipientType::builder(ref builder) => match builder.variant {
+                BuilderType::p2sh(ref redeem) => self.p2sh(redeem),
+                BuilderType::p2pk(ref pubkey) => self.p2pk(pubkey),
+                BuilderType::p2pkh(ref pubkey_or_hash) => self.p2pkh(pubkey_or_hash),
+                BuilderType::p2wsh(ref redeem) => self.p2wsh(redeem),
+                BuilderType::p2wpkh(ref pubkey_or_hash) => self.p2wpkh(pubkey_or_hash),
+                BuilderType::p2tr_key_path(ref key_path) => self.p2tr_key_path(key_path),
+                BuilderType::p2tr_script_path(ref script) => self.p2tr_script_path(script),
+                BuilderType::p2tr_dangerous_assume_tweaked(ref pubkey) => {
+                    self.p2tr_dangerous_assume_tweaked(pubkey)
+                },
+                BuilderType::brc20_inscribe(ref inscription) => self.brc20_inscribe(inscription),
+                BuilderType::op_return(ref data) => self.op_return(data),
+                BuilderType::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("No Output Builder type provided"),
+            },
+            RecipientType::custom_script_pubkey(ref script) => self.custom_script(script.to_vec()),
+            RecipientType::to_address(ref address) => self.recipient_address(address),
+            RecipientType::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No Output recipient type provided"),
+        }
+    }
+
+    pub fn p2sh(
+        &self,
+        redeem: &Proto::mod_Output::RedeemScriptOrHash,
+    ) -> SigningResult<TransactionOutput> {
+        let redeem_hash =
+            Self::redeem_hash_from_proto(redeem, sha256_ripemd).context("P2SH builder")?;
+        Ok(self.prepare_builder()?.p2sh_from_hash(&redeem_hash))
+    }
+
+    pub fn p2pk(&self, pubkey: &[u8]) -> SigningResult<TransactionOutput> {
+        let pubkey = ecdsa::secp256k1::PublicKey::try_from(pubkey)
+            .into_tw()
+            .context("Invalid P2PK public key")?;
+        Ok(self.prepare_builder()?.p2pk(&pubkey))
+    }
+
+    pub fn p2pkh(
+        &self,
+        pubkey_or_hash: &Proto::PublicKeyOrHash,
+    ) -> SigningResult<TransactionOutput> {
+        let pubkey_hash = Self::pubkey_hash_from_proto(pubkey_or_hash).context("P2PKH builder")?;
+        Ok(self.prepare_builder()?.p2pkh_from_hash(&pubkey_hash))
+    }
+
+    pub fn p2wsh(
+        &self,
+        redeem: &Proto::mod_Output::RedeemScriptOrHash,
+    ) -> SigningResult<TransactionOutput> {
+        let redeem_hash = Self::redeem_hash_from_proto(redeem, sha256).context("P2WSH builder")?;
+        Ok(self.prepare_builder()?.p2wsh_from_hash(&redeem_hash))
+    }
+
+    pub fn p2wpkh(
+        &self,
+        pubkey_or_hash: &Proto::PublicKeyOrHash,
+    ) -> SigningResult<TransactionOutput> {
+        let pubkey_hash = Self::pubkey_hash_from_proto(pubkey_or_hash).context("P2WPKH builder")?;
+        Ok(self.prepare_builder()?.p2wpkh_from_hash(&pubkey_hash))
+    }
+
+    pub fn p2tr_key_path(&self, taproot_pubkey: &[u8]) -> SigningResult<TransactionOutput> {
+        let public_key = schnorr::PublicKey::try_from(taproot_pubkey)
+            .into_tw()
+            .context("Invalid P2TR key path. Must be a schnorr public key")?;
+        Ok(self.prepare_builder()?.p2tr_key_path(&public_key))
+    }
+
+    pub fn p2tr_dangerous_assume_tweaked(
+        &self,
+        tweaked_pubkey: &[u8],
+    ) -> SigningResult<TransactionOutput> {
+        let tweaked_x_only = H256::try_from(tweaked_pubkey)
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid P2TR tweaked public key. Expected 32 bytes x-only public key")?;
+        Ok(self
+            .prepare_builder()?
+            .p2tr_dangerous_assume_tweaked(&tweaked_x_only))
+    }
+
+    pub fn p2tr_script_path(
+        &self,
+        taproot_script_path: &Proto::mod_Output::OutputTaprootScriptPath,
+    ) -> SigningResult<TransactionOutput> {
+        let public_key = schnorr::PublicKey::try_from(taproot_script_path.internal_key.as_ref())
+            .into_tw()
+            .context(
+                "Invalid OutputTaprootScriptPath.internal_key. Must be a schnorr public key",
+            )?;
+
+        let merkle_root = H256::try_from(taproot_script_path.merkle_root.as_ref())
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid OutputTaprootScriptPath.merkle_root. Must be a 32 byte array")?;
+
+        Ok(self
+            .prepare_builder()?
+            .p2tr_script_path(&public_key, merkle_root))
+    }
+
+    pub fn brc20_inscribe(
+        &self,
+        inscription: &Proto::mod_Output::OutputBrc20Inscription,
+    ) -> SigningResult<TransactionOutput> {
+        let public_key = schnorr::PublicKey::try_from(inscription.inscribe_to.as_ref())?;
+        self.prepare_builder()?.brc20_transfer(
+            &public_key,
+            inscription.ticker.to_string(),
+            inscription.transfer_amount.to_string(),
+        )
+    }
+
+    pub fn custom_script(&self, script_data: Data) -> SigningResult<TransactionOutput> {
+        let script = Script::from(script_data);
+        Ok(self.prepare_builder()?.custom_script_pubkey(script))
+    }
+
+    pub fn recipient_address(&self, addr_str: &str) -> SigningResult<TransactionOutput> {
+        let addr = Context::Address::from_str(addr_str)
+            .into_tw()
+            .context("Invalid recipient address")?;
+        let claiming_script_pubkey =
+            Context::addr_to_script_pubkey(&addr, self.chain_info.to_address_prefixes())?;
+        self.custom_script(claiming_script_pubkey.into())
+            .with_context(|| format!("Error handling {addr_str} output address"))
+    }
+
+    pub fn op_return(&self, op_return_data: &[u8]) -> SigningResult<TransactionOutput> {
+        self.prepare_builder()?.op_return(op_return_data)
+    }
+
+    /// Tries to convert [`Proto::RedeemScriptOrHash`] to [`Hash<N>`] using a specific `hasher` function.
+    /// Please note `P2SH` and `P2WSH` use different hashing functions.
+    pub fn redeem_hash_from_proto<const N: usize, F>(
+        input: &Proto::mod_Output::RedeemScriptOrHash,
+        hasher: F,
+    ) -> SigningResult<Hash<N>>
+    where
+        F: FnOnce(&[u8]) -> Data,
+    {
+        use Proto::mod_Output::mod_RedeemScriptOrHash::OneOfvariant as RedeemOrHashType;
+
+        let hash_data = match input.variant {
+            RedeemOrHashType::redeem_script(ref redeem) => hasher(redeem.as_ref()),
+            RedeemOrHashType::hash(ref hash) => hash.to_vec(),
+            RedeemOrHashType::None => {
+                return SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("Expected a redeem script or its hash")
+            },
+        };
+        Hash::<N>::try_from(hash_data.as_slice())
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .with_context(|| format!("Expected exactly {N} bytes redeem script hash"))
+    }
+
+    pub fn prepare_builder(&self) -> SigningResult<OutputBuilder> {
+        if self.output.value < 0 {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Transaction Output amount cannot be negative");
+        }
+        Ok(OutputBuilder::new(self.output.value))
+    }
+
+    /// Tries to convert [`Proto::PublicKeyOrHash`] to [`Hash<N>`].
+    /// Please note `P2PKH` and `P2WPKH` use the same `ripemd(sha256(x))` hash function.
+    pub fn pubkey_hash_from_proto<const N: usize>(
+        input: &Proto::PublicKeyOrHash,
+    ) -> SigningResult<Hash<N>> {
+        use Proto::mod_PublicKeyOrHash::OneOfvariant as PublicKeyOrHashType;
+
+        let hash_data = match input.variant {
+            PublicKeyOrHashType::pubkey(ref pubkey) => sha256_ripemd(pubkey.as_ref()),
+            PublicKeyOrHashType::hash(ref hash) => hash.to_vec(),
+            PublicKeyOrHashType::None => {
+                return SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("Expected a public key or its hash")
+            },
+        };
+        Hash::<N>::try_from(hash_data.as_slice())
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .with_context(|| format!("Expected exactly {N} bytes public key hash"))
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/tx_builder/public_keys.rs b/rust/chains/tw_bitcoin/src/modules/tx_builder/public_keys.rs
new file mode 100644
index 00000000000..6c822c686b6
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/tx_builder/public_keys.rs
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::collections::HashMap;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::hasher::sha256_ripemd;
+use tw_hash::H160;
+use tw_keypair::ecdsa;
+use tw_memory::Data;
+
+/// A transaction builder helper that allows to easily get an access to a public key by using its `ripemd(sha256)` hash.
+#[derive(Default)]
+pub struct PublicKeys {
+    /// The map of public keys by their hash, i.e `{ ripemd(sha256(public_key)) -> public_key }`.
+    public_key_hash_map: HashMap<H160, Data>,
+}
+
+impl PublicKeys {
+    /// Adds a public key to the keys manager.
+    /// Simply ignore duplicate keys.
+    pub fn add_public_key(&mut self, pubkey: Data) -> &mut Self {
+        let pubkey_hash = H160::try_from(sha256_ripemd(&pubkey).as_slice())
+            .expect("sha256_ripemd must return exactly 20 bytes");
+        self.public_key_hash_map.insert(pubkey_hash, pubkey);
+        self
+    }
+
+    /// Adds a public key derived from the ecdsa secp256k1 `private`.
+    pub fn add_public_with_ecdsa_private(&mut self, private: &[u8]) -> SigningResult<&mut Self> {
+        let private = ecdsa::secp256k1::PrivateKey::try_from(private)
+            .into_tw()
+            .context("Given an invalid ecdsa secp256k1 private key")?;
+        Ok(self.add_public_key(private.public().compressed().to_vec()))
+    }
+
+    pub fn get_public_key(&self, pubkey_hash: &H160) -> SigningResult<&[u8]> {
+        self.public_key_hash_map
+            .get(pubkey_hash)
+            .map(|pubkey_bytes|pubkey_bytes.as_slice())
+            .or_tw_err(SigningErrorType::Error_missing_private_key)
+            .with_context(|| format!("Missing either a private or public key corresponding to the pubkey hash: {pubkey_hash}"))
+    }
+
+    pub fn get_ecdsa_public_key(
+        &self,
+        pubkey_hash: &H160,
+    ) -> SigningResult<ecdsa::secp256k1::PublicKey> {
+        let pubkey_data = self.get_public_key(pubkey_hash)?;
+        ecdsa::secp256k1::PublicKey::try_from(pubkey_data)
+            .into_tw()
+            .context("Expected a valid ecdsa secp256k1 public key")
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/tx_builder/script_parser.rs b/rust/chains/tw_bitcoin/src/modules/tx_builder/script_parser.rs
new file mode 100644
index 00000000000..26d8a70e009
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/tx_builder/script_parser.rs
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::tx_builder::BitcoinChainInfo;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{H160, H256};
+use tw_keypair::{ecdsa, schnorr};
+use tw_memory::Data;
+use tw_utxo::address::legacy::LegacyAddress;
+use tw_utxo::address::segwit::SegwitAddress;
+use tw_utxo::address::standard_bitcoin::StandardBitcoinAddress;
+use tw_utxo::address::taproot::TaprootAddress;
+use tw_utxo::script::standard_script::conditions;
+use tw_utxo::script::Script;
+
+pub enum StandardScript {
+    /// Compressed or uncompressed public key bytes.
+    P2PK(ecdsa::secp256k1::PublicKey),
+    /// Public key hash.
+    P2PKH(H160),
+    /// Script hash.
+    P2SH(H160),
+    /// Public key hash.
+    P2WPKH(H160),
+    /// Script hash.
+    P2WSH(H256),
+    /// Tweaked public key.
+    /// The public key can be tweaked as either key-path or script-path,
+    P2TR(schnorr::XOnlyPublicKey),
+    /// OP_RETURN payload.
+    OpReturn(Data),
+}
+
+impl StandardScript {
+    pub fn try_to_address(
+        &self,
+        chain_info: &BitcoinChainInfo,
+    ) -> AddressResult<Option<StandardBitcoinAddress>> {
+        let try_hrp = || chain_info.hrp.clone().ok_or(AddressError::MissingPrefix);
+
+        match self {
+            StandardScript::P2PK(pubkey) => {
+                // Display P2PK input as P2PKH.
+                LegacyAddress::p2pkh_with_public_key(chain_info.p2pkh_prefix, pubkey)
+                    .map(StandardBitcoinAddress::Legacy)
+                    .map(Some)
+            },
+            StandardScript::P2PKH(pubkey_hash) => {
+                LegacyAddress::new(chain_info.p2pkh_prefix, pubkey_hash.as_slice())
+                    .map(StandardBitcoinAddress::Legacy)
+                    .map(Some)
+            },
+            StandardScript::P2SH(script_hash) => {
+                LegacyAddress::new(chain_info.p2sh_prefix, script_hash.as_slice())
+                    .map(StandardBitcoinAddress::Legacy)
+                    .map(Some)
+            },
+            StandardScript::P2WPKH(pubkey_hash) => {
+                SegwitAddress::new(try_hrp()?, pubkey_hash.to_vec())
+                    .map(StandardBitcoinAddress::Segwit)
+                    .map(Some)
+            },
+            StandardScript::P2WSH(script_hash) => {
+                SegwitAddress::new(try_hrp()?, script_hash.to_vec())
+                    .map(StandardBitcoinAddress::Segwit)
+                    .map(Some)
+            },
+            StandardScript::P2TR(tweaked_pubkey) => {
+                TaprootAddress::new(try_hrp()?, tweaked_pubkey.bytes().to_vec())
+                    .map(StandardBitcoinAddress::Taproot)
+                    .map(Some)
+            },
+            StandardScript::OpReturn(_) => Ok(None),
+        }
+    }
+}
+
+pub struct StandardScriptParser;
+
+impl StandardScriptParser {
+    /// Later, this method can be moved to a trait.
+    pub fn parse(&self, script: &Script) -> SigningResult<StandardScript> {
+        if let Some(pubkey) = conditions::match_p2pk(script) {
+            // P2PK
+            let pubkey = ecdsa::secp256k1::PublicKey::try_from(pubkey)
+                .into_tw()
+                .context("P2PK scriptPubkey must contain a valid ecdsa secp256k1 public key")?;
+            Ok(StandardScript::P2PK(pubkey))
+        } else if let Some(pubkey_hash) = conditions::match_p2pkh(script) {
+            // P2PKH
+            Ok(StandardScript::P2PKH(pubkey_hash))
+        } else if let Some(script_hash) = conditions::match_p2sh(script) {
+            // P2SH
+            Ok(StandardScript::P2SH(script_hash))
+        } else if let Some(pubkey_hash) = conditions::match_p2wpkh(script) {
+            // P2WPKH
+            Ok(StandardScript::P2WPKH(pubkey_hash))
+        } else if let Some(script_hash) = conditions::match_p2wsh(script) {
+            // P2WSH
+            Ok(StandardScript::P2WSH(script_hash))
+        } else if let Some(tweaked_pubkey) = conditions::match_p2tr(script) {
+            // P2TR
+            let tweaked_pubkey_x_only =
+                schnorr::XOnlyPublicKey::try_from(tweaked_pubkey.as_slice())
+                    .into_tw()
+                    .context("P2TR scriptPubkey must contain a valid tweaked schnorr public key")?;
+            Ok(StandardScript::P2TR(tweaked_pubkey_x_only))
+        } else if let Some(payload) = conditions::match_op_return(script) {
+            // OP_RETURN
+            Ok(StandardScript::OpReturn(payload))
+        } else {
+            // Unknown
+            SigningError::err(SigningErrorType::Error_script_output).context(
+                "The given custom scriptPubkey is not supported. Consider using a proper Input/Output builder",
+            )
+        }
+    }
+}
diff --git a/rust/chains/tw_bitcoin/src/modules/tx_builder/utxo_protobuf.rs b/rust/chains/tw_bitcoin/src/modules/tx_builder/utxo_protobuf.rs
new file mode 100644
index 00000000000..aa21a02f41b
--- /dev/null
+++ b/rust/chains/tw_bitcoin/src/modules/tx_builder/utxo_protobuf.rs
@@ -0,0 +1,242 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::tx_builder::public_keys::PublicKeys;
+use crate::modules::tx_builder::script_parser::{StandardScript, StandardScriptParser};
+use crate::modules::tx_builder::BitcoinChainInfo;
+use std::marker::PhantomData;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{H160, H256};
+use tw_keypair::{ecdsa, schnorr};
+use tw_memory::Data;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::context::UtxoContext;
+use tw_utxo::script::Script;
+use tw_utxo::sighash::SighashType;
+use tw_utxo::transaction::standard_transaction::builder::UtxoBuilder;
+use tw_utxo::transaction::standard_transaction::TransactionInput;
+use tw_utxo::transaction::transaction_parts::OutPoint;
+use tw_utxo::transaction::UtxoToSign;
+
+pub struct UtxoProtobuf<'a, Context: UtxoContext> {
+    chain_info: &'a BitcoinChainInfo,
+    input: &'a Proto::Input<'a>,
+    public_keys: &'a PublicKeys,
+    _phantom: PhantomData<Context>,
+}
+
+impl<'a, Context: UtxoContext> UtxoProtobuf<'a, Context> {
+    pub fn new(
+        chain_info: &'a BitcoinChainInfo,
+        input: &'a Proto::Input<'a>,
+        public_keys: &'a PublicKeys,
+    ) -> Self {
+        UtxoProtobuf {
+            chain_info,
+            input,
+            public_keys,
+            _phantom: PhantomData,
+        }
+    }
+
+    pub fn utxo_from_proto(self) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        use Proto::mod_Input::mod_InputBuilder::OneOfvariant as BuilderType;
+        use Proto::mod_Input::OneOfclaiming_script as ScriptType;
+
+        match self.input.claiming_script {
+            ScriptType::script_builder(ref builder) => match builder.variant {
+                // BuilderType::p2sh(ref redeem_script) => self.p2sh(redeem_script.to_vec()),
+                BuilderType::p2pk(ref pubkey) => self.p2pk(pubkey),
+                BuilderType::p2pkh(ref pubkey_or_hash) => self.p2pkh(pubkey_or_hash),
+                // BuilderType::p2wsh(ref redeem_script) => self.p2wsh(redeem_script.to_vec()),
+                BuilderType::p2wpkh(ref pubkey_or_hash) => self.p2wpkh(pubkey_or_hash),
+                BuilderType::p2tr_key_path(ref key_path) => self.p2tr_key_path(key_path),
+                // BuilderType::p2tr_script_path(ref script) => self.p2tr_script_path(script),
+                BuilderType::brc20_inscribe(ref inscription) => self.brc20_inscribe(inscription),
+                BuilderType::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("No Input Builder type provided"),
+            },
+            ScriptType::script_data(ref script) => self.custom_script(script.to_vec()),
+            ScriptType::receiver_address(ref address) => self.recipient_address(address),
+            ScriptType::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No Input claiming script provided"),
+        }
+    }
+
+    // TODO next iteration
+    // pub fn p2sh(&self, redeem_script: Data) -> SigningResult<(TransactionInput, UtxoToSign)> {
+    //     let redeem_script = Script::from(redeem_script);
+    //     self.prepare_builder()?.p2sh(redeem_script)
+    // }
+
+    pub fn p2pk(&self, pubkey: &[u8]) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let pubkey = ecdsa::secp256k1::PublicKey::try_from(pubkey)
+            .into_tw()
+            .context("Invalid P2PK public key")?;
+
+        self.prepare_builder()?.p2pk(&pubkey)
+    }
+
+    pub fn p2pkh(
+        &self,
+        pubkey_or_hash: &Proto::PublicKeyOrHash,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let pubkey_hash = self.get_ecdsa_pubkey_from_proto(pubkey_or_hash)?;
+        self.prepare_builder()?.p2pkh(&pubkey_hash)
+    }
+
+    // TODO next iteration
+    // pub fn p2wsh(&self, redeem_script: Data) -> SigningResult<(TransactionInput, UtxoToSign)> {
+    //     let script = Script::from(redeem_script);
+    //     self.prepare_builder()?.p2wsh(script)
+    // }
+
+    pub fn p2wpkh(
+        &self,
+        pubkey_or_hash: &Proto::PublicKeyOrHash,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let pubkey = self.get_ecdsa_pubkey_from_proto(pubkey_or_hash)?;
+        self.prepare_builder()?.p2wpkh(&pubkey)
+    }
+
+    pub fn p2tr_key_path(&self, pubkey: &[u8]) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let public_key = schnorr::PublicKey::try_from(pubkey)?;
+        self.prepare_builder()?.p2tr_key_path(&public_key)
+    }
+
+    // TODO next iteration
+    // pub fn p2tr_script_path(
+    //     &self,
+    //     taproot_script_path: &Proto::mod_Input::InputTaprootScriptPath,
+    // ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+    //     let payload = Script::from(taproot_script_path.payload.to_vec());
+    //     // let x = taproot_script_path.
+    //     self.prepare_builder()?
+    //         .p2tr_script_path(payload, taproot_script_path.control_block.to_vec())
+    // }
+
+    pub fn brc20_inscribe(
+        &self,
+        inscription: &Proto::mod_Input::InputBrc20Inscription,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let public_key = schnorr::PublicKey::try_from(inscription.inscribe_to.as_ref())?;
+        self.prepare_builder()?.brc20_transfer(
+            &public_key,
+            inscription.ticker.to_string(),
+            inscription.transfer_amount.to_string(),
+        )
+    }
+
+    pub fn custom_script(
+        &self,
+        script_data: Data,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let script = Script::from(script_data);
+        let builder = self.prepare_builder()?;
+
+        match StandardScriptParser.parse(&script)? {
+            StandardScript::P2PK(pk) => builder.p2pk(&pk),
+            StandardScript::P2PKH(pubkey_hash) => {
+                let pubkey = self.public_keys.get_ecdsa_public_key(&pubkey_hash)?;
+                builder.p2pkh(&pubkey)
+            },
+            StandardScript::P2WPKH(pubkey_hash) => {
+                let pubkey = self.public_keys.get_ecdsa_public_key(&pubkey_hash)?;
+                builder.p2wpkh(&pubkey)
+            },
+            StandardScript::P2TR(tweaked_pubkey) => {
+                builder.p2tr_key_path_with_tweaked_pubkey(&tweaked_pubkey)
+            },
+            StandardScript::P2SH(_) | StandardScript::P2WSH(_) => {
+                SigningError::err(SigningErrorType::Error_not_supported)
+                    .context("P2SH and P2WSH scriptPubkey's are not supported yet")
+            },
+            StandardScript::OpReturn(_) => SigningError::err(SigningErrorType::Error_invalid_utxo)
+                .context("Cannot spend an OP_RETURN output"),
+        }
+    }
+
+    pub fn recipient_address(
+        &self,
+        addr_str: &str,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let addr = Context::Address::from_str(addr_str)
+            .into_tw()
+            .context("Invalid claiming script recipient address")?;
+        let claiming_script_pubkey =
+            Context::addr_to_script_pubkey(&addr, self.chain_info.to_address_prefixes())?;
+        self.custom_script(claiming_script_pubkey.into())
+            .with_context(|| format!("Error handling {addr_str} input recipient"))
+    }
+
+    pub fn prepare_builder(&self) -> SigningResult<UtxoBuilder> {
+        let OutPoint { hash, index } = parse_out_point(&self.input.out_point)?;
+        let sighash_ty = SighashType::from_u32(self.input.sighash_type)?;
+
+        if self.input.value < 0 {
+            return SigningError::err(SigningErrorType::Error_invalid_utxo_amount)
+                .context("UTXO amount cannot be negative");
+        }
+
+        let sequence = self
+            .input
+            .sequence
+            .clone()
+            .map(|seq| seq.sequence)
+            // Use the default 0xFFFFFFFF sequence value if not specified.
+            .unwrap_or(u32::MAX);
+
+        Ok(UtxoBuilder::default()
+            .prev_txid(hash)
+            .prev_index(index)
+            .sequence(sequence)
+            .amount(self.input.value)
+            .sighash_type(sighash_ty))
+    }
+
+    /// Tries to convert [`Proto::PublicKeyOrHash`] to [`Hash<N>`].
+    /// Please note `P2PKH` and `P2WPKH` use the same `ripemd(sha256(x))` hash function.
+    fn get_ecdsa_pubkey_from_proto(
+        &self,
+        input: &Proto::PublicKeyOrHash,
+    ) -> SigningResult<ecdsa::secp256k1::PublicKey> {
+        use Proto::mod_PublicKeyOrHash::OneOfvariant as PublicKeyOrHashType;
+
+        let pubkey_data = match input.variant {
+            PublicKeyOrHashType::pubkey(ref pubkey) => pubkey.as_ref(),
+            PublicKeyOrHashType::hash(ref hash) => {
+                let hash = H160::try_from(hash.as_ref())
+                    .tw_err(|_| SigningErrorType::Error_invalid_params)
+                    .context("Expected 20 bytes public key hash")?;
+                self.public_keys.get_public_key(&hash)?
+            },
+            PublicKeyOrHashType::None => {
+                return SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("Expected a public key or its hash")
+            },
+        };
+
+        ecdsa::secp256k1::PublicKey::try_from(pubkey_data)
+            .into_tw()
+            .context("Expected a valid ecdsa secp256k1 public key")
+    }
+}
+
+pub fn parse_out_point(maybe_out_point: &Option<Proto::OutPoint>) -> SigningResult<OutPoint> {
+    let out_point = maybe_out_point
+        .as_ref()
+        .or_tw_err(SigningErrorType::Error_invalid_params)
+        .context("No OutPoint provided for a UTXO")?;
+
+    let hash = H256::try_from(out_point.hash.as_ref())
+        .tw_err(|_| SigningErrorType::Error_invalid_params)
+        .context("Invalid previous txid")?;
+
+    Ok(OutPoint {
+        hash,
+        index: out_point.vout,
+    })
+}
diff --git a/rust/chains/tw_bitcoincash/Cargo.toml b/rust/chains/tw_bitcoincash/Cargo.toml
new file mode 100644
index 00000000000..2ef2ff965c8
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "tw_bitcoincash"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_bitcoin = { path = "../tw_bitcoin" }
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_misc = { path = "../../tw_misc" }
+tw_proto = { path = "../../tw_proto" }
+tw_utxo = { path = "../../frameworks/tw_utxo" }
diff --git a/rust/chains/tw_bitcoincash/src/address.rs b/rust/chains/tw_bitcoincash/src/address.rs
new file mode 100644
index 00000000000..748a8636f0f
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/src/address.rs
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::cash_address::CashAddress;
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::{AddressError, AddressResult};
+use tw_coin_entry::prefix::BitcoinBase58Prefix;
+use tw_keypair::ecdsa;
+use tw_memory::Data;
+use tw_utxo::address::legacy::LegacyAddress;
+
+pub enum Address {
+    Cash(CashAddress),
+    Legacy(LegacyAddress),
+}
+
+impl Address {
+    pub fn from_str_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        address_str: &str,
+        prefix: Option<BitcoinBase58Prefix>,
+    ) -> AddressResult<Self> {
+        // Check whether the prefix is set and specifies the legacy address prefixes.
+        if let Some(prefix) = prefix {
+            return LegacyAddress::from_str_with_coin_and_prefix(coin, address_str, Some(prefix))
+                .map(Address::Legacy);
+        }
+
+        // Otherwise, try to parse address as either Cash or Legacy.
+        if let Ok(cash) = CashAddress::from_str_with_coin_and_hrp(coin, address_str, None) {
+            return Ok(Address::Cash(cash));
+        }
+        if let Ok(legacy) = LegacyAddress::from_str_with_coin_and_prefix(coin, address_str, None) {
+            return Ok(Address::Legacy(legacy));
+        }
+        Err(AddressError::InvalidInput)
+    }
+
+    pub fn p2pkh_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        public_key: &ecdsa::secp256k1::PublicKey,
+        prefix: Option<BitcoinBase58Prefix>,
+    ) -> AddressResult<Self> {
+        match prefix {
+            // Check whether the prefix is set and specifies the legacy address prefixes.
+            Some(prefix) => {
+                LegacyAddress::p2pkh_with_public_key(prefix.p2pkh, public_key).map(Address::Legacy)
+            },
+            // Otherwise, derive a Cash address by default.
+            None => CashAddress::p2pkh_with_coin(coin, public_key).map(Address::Cash),
+        }
+    }
+}
+
+impl FromStr for Address {
+    type Err = AddressError;
+
+    fn from_str(address_str: &str) -> Result<Self, Self::Err> {
+        if let Ok(cash) = CashAddress::from_str_unchecked(address_str) {
+            return Ok(Address::Cash(cash));
+        }
+        if let Ok(legacy) = LegacyAddress::from_str(address_str) {
+            return Ok(Address::Legacy(legacy));
+        }
+        Err(AddressError::InvalidInput)
+    }
+}
+
+impl CoinAddress for Address {
+    fn data(&self) -> Data {
+        match self {
+            Address::Cash(cash) => cash.data(),
+            Address::Legacy(legacy) => legacy.bytes().to_vec(),
+        }
+    }
+}
+
+impl fmt::Display for Address {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Address::Cash(cash) => write!(f, "{cash}"),
+            Address::Legacy(legacy) => write!(f, "{legacy}"),
+        }
+    }
+}
diff --git a/rust/chains/tw_bitcoincash/src/cash_address/cash_base32.rs b/rust/chains/tw_bitcoincash/src/cash_address/cash_base32.rs
new file mode 100644
index 00000000000..4d7ebcab0b8
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/src/cash_address/cash_base32.rs
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::{EncodingError, EncodingResult};
+
+/// Charset for converting from base32.
+const CHARSET_REV: [i8; 128] = [
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+    15, -1, 10, 17, 21, 20, 26, 30, 7, 5, -1, -1, -1, -1, -1, -1, -1, 29, -1, 24, 13, 25, 9, 8, 23,
+    -1, 18, 22, 31, 27, 19, -1, 1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1, -1, -1, -1, -1, -1, 29,
+    -1, 24, 13, 25, 9, 8, 23, -1, 18, 22, 31, 27, 19, -1, 1, 0, 3, 16, 11, 28, 12, 14, 6, 4, 2, -1,
+    -1, -1, -1, -1,
+];
+
+/// Charset for converting to base32.
+const CHARSET: [char; 32] = [
+    'q', 'p', 'z', 'r', 'y', '9', 'x', '8', 'g', 'f', '2', 't', 'v', 'd', 'w', '0', 's', '3', 'j',
+    'n', '5', '4', 'k', 'h', 'c', 'e', '6', 'm', 'u', 'a', '7', 'l',
+];
+
+/// Encodes a 5-bit packed array as BCH base32.
+pub fn encode(input: &[u8]) -> EncodingResult<String> {
+    input
+        .iter()
+        .map(|i| CHARSET.get(*i as usize))
+        .collect::<Option<String>>()
+        .ok_or(EncodingError::InvalidInput)
+}
+
+/// Decods a BCH base32 string as a 5-bit packed array.
+pub fn decode(input: &str) -> EncodingResult<Vec<u8>> {
+    input
+        .chars()
+        .map(|c| {
+            let val = *CHARSET_REV
+                .get(c as usize)
+                .ok_or(EncodingError::InvalidInput)?;
+            if val == -1 {
+                return Err(EncodingError::InvalidInput);
+            }
+            Ok(val as u8)
+        })
+        .collect()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex::DecodeHex;
+
+    /// `raw` must be 5-bit packed - the condition is required by base32 encode and decode functions.
+    #[track_caller]
+    fn test_base32_impl(raw_hex: &str, encoded: &str) {
+        let raw = raw_hex.decode_hex().unwrap();
+        let actual_encoded = encode(&raw).unwrap();
+        assert_eq!(actual_encoded, encoded);
+        let actual_raw = decode(&actual_encoded).unwrap();
+        assert_eq!(actual_raw, raw);
+    }
+
+    #[test]
+    fn test_base32() {
+        test_base32_impl(
+            "180e0919131e16011c001e1c1607010b120701071317151e1819141b031b1d0a",
+            "cwfen7kpuq7uk8ptj8p8nh47ce5mrma2",
+        );
+        test_base32_impl(
+            "08080f081c1d1002011119051104020811150f140b181d1006140b0216121605",
+            "gg0guaszp3e93yzg3405tcasx5tzkjk9",
+        );
+        test_base32_impl(
+            "0c0215180000050e07061619161f1409120c0a060b1c070e13090f1d0f160b1b",
+            "vz4cqq9w8xkekl5fjv2xtu8wnf0a0ktm",
+        );
+    }
+}
diff --git a/rust/chains/tw_bitcoincash/src/cash_address/checksum.rs b/rust/chains/tw_bitcoincash/src/cash_address/checksum.rs
new file mode 100644
index 00000000000..dd9fbf6c13a
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/src/cash_address/checksum.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_memory::Data;
+
+pub const CHECKSUM_LEN: usize = 8;
+pub const PHANTOM_CHECKSUM: [u8; CHECKSUM_LEN] = [0; CHECKSUM_LEN];
+
+// CalculateChecksum calculates a BCH checksum for a nibble-packed cashaddress
+// that properly includes the network prefix.
+pub fn calculate_checksum(prefix: &str, payload: &[u8]) -> u64 {
+    // Convert the prefix string to a byte array with each element
+    // being the corresponding character's right-most 5 bits.
+    let mut raw_data: Vec<_> = prefix.as_bytes().iter().map(|x| x & 0b11111).collect();
+    // Add a null termination byte after the prefix.
+    raw_data.push(0);
+    raw_data.extend(payload);
+    poly_mod(&raw_data)
+}
+
+pub fn cacl_and_append_checksum(prefix: &str, payload: &[u8]) -> Data {
+    // The checksum sits in the last eight bytes.
+    // Append the phantom checksum to calculate an actual value.
+    let mut payload_with_checksum: Vec<_> =
+        payload.iter().copied().chain(PHANTOM_CHECKSUM).collect();
+
+    let checksum = calculate_checksum(prefix, &payload_with_checksum);
+
+    let mut checksum_starts_at = payload_with_checksum.len() - CHECKSUM_LEN;
+    // Rewrite the checksum.
+    for i in 0..CHECKSUM_LEN {
+        payload_with_checksum[checksum_starts_at] = ((checksum >> (5 * (7 - i))) & 0x1F) as u8;
+        checksum_starts_at += 1;
+    }
+
+    payload_with_checksum
+}
+
+/// The poly_mod is a BCH-encoding checksum function per the CashAddr specification.
+/// See https://github.com/bitcoincashorg/bitcoincash.org/blob/master/spec/cashaddr.md#checksum
+pub fn poly_mod(raw_data: &[u8]) -> u64 {
+    let mut c = 1u64;
+    for d in raw_data {
+        let c0 = c >> 35;
+        c = ((c & 0x07ffffffff) << 5) ^ (*d as u64);
+
+        if c0 & 0x01 != 0 {
+            c ^= 0x98f2bc8e61;
+        }
+        if c0 & 0x02 != 0 {
+            c ^= 0x79b76d99e2;
+        }
+        if c0 & 0x04 != 0 {
+            c ^= 0xf33e5fb3c4;
+        }
+        if c0 & 0x08 != 0 {
+            c ^= 0xae2eabe2a8;
+        }
+        if c0 & 0x10 != 0 {
+            c ^= 0x1e4f43e470;
+        }
+    }
+
+    c ^ 1
+}
diff --git a/rust/chains/tw_bitcoincash/src/cash_address/mod.rs b/rust/chains/tw_bitcoincash/src/cash_address/mod.rs
new file mode 100644
index 00000000000..f060724fc40
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/src/cash_address/mod.rs
@@ -0,0 +1,249 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::bech32;
+use tw_hash::hasher::sha256_ripemd;
+use tw_hash::H160;
+use tw_keypair::ecdsa;
+use tw_memory::Data;
+use tw_utxo::address::legacy::LegacyAddress;
+
+/// BitcoinCash specific base32 format.
+mod cash_base32;
+mod checksum;
+mod unchecked;
+
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+pub enum CashAddressType {
+    P2PKH,
+    P2SH,
+}
+
+#[derive(Debug, Eq, PartialEq)]
+pub struct CashAddress {
+    hrp: String,
+    ty: CashAddressType,
+    key_hash: H160,
+    /// An address string created from this `hrp`, `ty` and `key_hash`.
+    address_str: String,
+}
+
+impl CashAddress {
+    pub fn p2pkh_with_coin(
+        coin: &dyn CoinContext,
+        public_key: &ecdsa::secp256k1::PublicKey,
+    ) -> AddressResult<CashAddress> {
+        let hrp = coin.hrp().ok_or(AddressError::InvalidRegistry)?;
+        Self::p2pkh_with_hrp(hrp, public_key)
+    }
+
+    pub fn p2pkh_with_hrp(
+        hrp: String,
+        public_key: &ecdsa::secp256k1::PublicKey,
+    ) -> AddressResult<CashAddress> {
+        let public_key_hash = sha256_ripemd(public_key.compressed().as_slice());
+        let key_hash =
+            H160::try_from(public_key_hash.as_slice()).expect("sha256_ripemd returns 20 bytes");
+        let address_str = Self::encode(&hrp, CashAddressType::P2PKH, &key_hash)?;
+        Ok(CashAddress {
+            hrp,
+            ty: CashAddressType::P2PKH,
+            key_hash: H160::try_from(public_key_hash.as_slice())
+                .expect("sha256_ripemd returns 20 bytes"),
+            address_str,
+        })
+    }
+
+    pub fn from_str_with_coin_and_hrp(
+        coin: &dyn CoinContext,
+        address_str: &str,
+        expected_hrp: Option<&str>,
+    ) -> AddressResult<Self> {
+        let expected_hrp = match expected_hrp {
+            Some(hrp) => hrp.to_string(),
+            None => coin.hrp().ok_or(AddressError::InvalidRegistry)?,
+        };
+
+        Self::from_str_with_hrp(address_str, expected_hrp)
+    }
+
+    pub fn from_str_with_hrp(address_str: &str, expected_hrp: String) -> AddressResult<Self> {
+        unchecked::UncheckedCashAddress::from_str(address_str)?.checked_with_prefix(expected_hrp)
+    }
+
+    pub fn from_str_unchecked(address_str: &str) -> AddressResult<Self> {
+        unchecked::UncheckedCashAddress::from_str(address_str)?.partly_checked()
+    }
+
+    pub fn to_legacy(&self, p2pkh_prefix: u8, p2sh_prefix: u8) -> AddressResult<LegacyAddress> {
+        match self.ty {
+            CashAddressType::P2PKH => LegacyAddress::new(p2pkh_prefix, self.key_hash.as_slice()),
+            CashAddressType::P2SH => LegacyAddress::new(p2sh_prefix, self.key_hash.as_slice()),
+        }
+    }
+
+    fn encode(hrp: &str, ty: CashAddressType, key_hash: &H160) -> AddressResult<String> {
+        let mut payload = Vec::with_capacity(1 + H160::LEN + checksum::CHECKSUM_LEN);
+        payload.push(Self::version_byte(ty));
+        payload.extend_from_slice(key_hash.as_slice());
+
+        let payload_u5 = {
+            let from = 8;
+            let to = 5;
+            let pad = true;
+            bech32::convert_bits(&payload, from, to, pad).map_err(|_| AddressError::InvalidInput)?
+        };
+
+        let payload_with_checksum = checksum::cacl_and_append_checksum(hrp, &payload_u5);
+        let encoded_payload =
+            cash_base32::encode(&payload_with_checksum).map_err(|_| AddressError::InvalidInput)?;
+        Ok(format!("{hrp}:{encoded_payload}"))
+    }
+
+    fn version_byte(ty: CashAddressType) -> u8 {
+        let en_address_type: u8 = match ty {
+            CashAddressType::P2PKH => 0,
+            CashAddressType::P2SH => 1,
+        };
+
+        // Please note we always serialize the key hash length as 0 here,
+        // as the length is always 20 (160 bits).
+        // https://github.com/bitcoincashorg/bitcoincash.org/blob/master/spec/cashaddr.md#version-byte
+        let serialized_hash_len = 0;
+
+        let mut version_byte = en_address_type;
+        version_byte <<= 3;
+        version_byte |= serialized_hash_len;
+
+        version_byte
+    }
+}
+
+impl CoinAddress for CashAddress {
+    #[inline]
+    fn data(&self) -> Data {
+        self.key_hash.to_vec()
+    }
+}
+
+impl fmt::Display for CashAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.address_str)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[track_caller]
+    fn test_address_from_str_impl(s: &str, expected: CashAddress) {
+        let actual = CashAddress::from_str_with_hrp(s, expected.hrp.clone()).unwrap();
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_cash_address_from_str() {
+        test_address_from_str_impl(
+            "bitcoincash:pq4ql3ph6738xuv2cycduvkpu4rdwqge5q2uxdfg6f",
+            CashAddress {
+                hrp: "bitcoincash".to_string(),
+                ty: CashAddressType::P2SH,
+                key_hash: H160::from("2a0fc437d7a273718ac130de32c1e546d70119a0"),
+                address_str: "bitcoincash:pq4ql3ph6738xuv2cycduvkpu4rdwqge5q2uxdfg6f".to_string(),
+            },
+        );
+
+        test_address_from_str_impl(
+            "qrplwyx7kueqkrh6dmd3fclta6u32hafp5tnpkchx2",
+            CashAddress {
+                hrp: "bitcoincash".to_string(),
+                ty: CashAddressType::P2PKH,
+                key_hash: H160::from("c3f710deb7320b0efa6edb14e3ebeeb9155fa90d"),
+                address_str: "bitcoincash:qrplwyx7kueqkrh6dmd3fclta6u32hafp5tnpkchx2".to_string(),
+            },
+        );
+
+        test_address_from_str_impl(
+            "BitCoinCash:QRPLWYX7KUEQKRH6DMD3FCLTA6U32HAFP5TNPKCHX2",
+            CashAddress {
+                hrp: "bitcoincash".to_string(),
+                ty: CashAddressType::P2PKH,
+                key_hash: H160::from("c3f710deb7320b0efa6edb14e3ebeeb9155fa90d"),
+                address_str: "bitcoincash:qrplwyx7kueqkrh6dmd3fclta6u32hafp5tnpkchx2".to_string(),
+            },
+        );
+
+        test_address_from_str_impl(
+            "bchtest:qqjr7yu573z4faxw8ltgvjwpntwys08fysk07zmvce",
+            CashAddress {
+                hrp: "bchtest".to_string(),
+                ty: CashAddressType::P2PKH,
+                key_hash: H160::from("243f1394f44554f4ce3fd68649c19adc483ce924"),
+                address_str: "bchtest:qqjr7yu573z4faxw8ltgvjwpntwys08fysk07zmvce".to_string(),
+            },
+        );
+    }
+
+    struct AddressToLegacyTest<'a> {
+        p2pkh_prefix: u8,
+        p2sh_prefixes: u8,
+        hrp: &'a str,
+        address: &'a str,
+        legacy: &'a str,
+    }
+
+    #[track_caller]
+    fn test_address_to_legacy_impl(input: AddressToLegacyTest) {
+        let cash = CashAddress::from_str_with_hrp(input.address, input.hrp.to_string()).unwrap();
+        let legacy = cash
+            .to_legacy(input.p2pkh_prefix, input.p2sh_prefixes)
+            .unwrap();
+        assert_eq!(legacy.to_string(), input.legacy);
+    }
+
+    #[test]
+    fn test_cash_address_to_legacy() {
+        // P2PKH
+        test_address_to_legacy_impl(AddressToLegacyTest {
+            p2pkh_prefix: 0,
+            p2sh_prefixes: 5,
+            hrp: "bitcoincash",
+            address: "bitcoincash:qpm2qsznhks23z7629mms6s4cwef74vcwvy22gdx6a",
+            legacy: "1BpEi6DfDAUFd7GtittLSdBeYJvcoaVggu",
+        });
+
+        // P2PKH
+        test_address_to_legacy_impl(AddressToLegacyTest {
+            p2pkh_prefix: 0,
+            p2sh_prefixes: 5,
+            hrp: "bitcoincash",
+            address: "qr95sy3j9xwd2ap32xkykttr4cvcu7as4y0qverfuy",
+            legacy: "1KXrWXciRDZUpQwQmuM1DbwsKDLYAYsVLR",
+        });
+
+        // P2SH
+        test_address_to_legacy_impl(AddressToLegacyTest {
+            p2pkh_prefix: 0,
+            p2sh_prefixes: 5,
+            hrp: "bitcoincash",
+            address: "bitcoincash:pqq3728yw0y47sqn6l2na30mcw6zm78dzq5ucqzc37",
+            legacy: "31nwvkZwyPdgzjBJZXfDmSWsC4ZLKpYyUw",
+        });
+
+        // P2PKH testnet
+        test_address_to_legacy_impl(AddressToLegacyTest {
+            p2pkh_prefix: 111,
+            p2sh_prefixes: 196,
+            hrp: "bchtest",
+            address: "bchtest:qpcgc96kles6v35a2525dppaapzk2htdkv72dv08qf",
+            legacy: "mqn3oF7tcju9uqoG1H1AZt4M6CP1PTaELo",
+        });
+    }
+}
diff --git a/rust/chains/tw_bitcoincash/src/cash_address/unchecked.rs b/rust/chains/tw_bitcoincash/src/cash_address/unchecked.rs
new file mode 100644
index 00000000000..9a4a0d5c7fa
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/src/cash_address/unchecked.rs
@@ -0,0 +1,147 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::cash_address::checksum::{calculate_checksum, CHECKSUM_LEN};
+use crate::cash_address::{cash_base32, CashAddress, CashAddressType};
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::{AddressError, AddressResult};
+use tw_encoding::bech32;
+use tw_hash::H160;
+use tw_memory::Data;
+
+/// BitcoinCash address may or may not have a prefix.
+struct CashAddressParts {
+    prefix: Option<String>,
+    payload: String,
+}
+
+impl FromStr for CashAddressParts {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let address_str = s.to_lowercase();
+        let tokens: Vec<&str> = address_str.split(':').collect();
+
+        if tokens.len() == 1 {
+            Ok(CashAddressParts {
+                prefix: None,
+                payload: tokens[0].to_string(),
+            })
+        } else if tokens.len() == 2 {
+            Ok(CashAddressParts {
+                prefix: Some(tokens[0].to_string()),
+                payload: tokens[1].to_string(),
+            })
+        } else {
+            Err(AddressError::InvalidInput)
+        }
+    }
+}
+
+impl fmt::Display for CashAddressParts {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self.prefix {
+            Some(ref prefix) => write!(f, "{prefix}:{}", self.payload),
+            None => write!(f, "{}", self.payload),
+        }
+    }
+}
+
+/// BitcoinCash address with an unchecked checksum and prefix.
+/// Consider using [`CashAddress`] directly instead.
+pub struct UncheckedCashAddress {
+    parts: CashAddressParts,
+    ty: CashAddressType,
+    key_hash: H160,
+    /// Original 5-bit packed array decoded from base32.
+    /// Used to validate the checksum along with a prefix.
+    unchecked_payload_with_checksum: Data,
+}
+
+impl UncheckedCashAddress {
+    /// Checks whether the address has an expected prefix, and verifies the address checksum.
+    pub fn checked_with_prefix(self, expected_prefix: String) -> AddressResult<CashAddress> {
+        // Validate the prefix if it was present.
+        if let Some(ref prefix) = self.parts.prefix {
+            if *prefix != expected_prefix {
+                return Err(AddressError::InvalidHrp);
+            }
+        }
+
+        // Ensure the checksum is zero when decoding.
+        let checksum = calculate_checksum(&expected_prefix, &self.unchecked_payload_with_checksum);
+        if checksum != 0 {
+            return Err(AddressError::InvalidChecksum);
+        }
+
+        let address_str = format!("{expected_prefix}:{}", self.parts.payload);
+        Ok(CashAddress {
+            hrp: expected_prefix,
+            ty: self.ty,
+            key_hash: self.key_hash,
+            address_str,
+        })
+    }
+
+    /// Tries to verify the address checksum if it contains a prefix, otherwise do not verify at all.
+    /// Please note this method doesn't validate if the prefix belongs to a network.
+    ///
+    /// Consider using [`UncheckedCashAddress::checked_with_prefix`] instead.
+    pub fn partly_checked(self) -> AddressResult<CashAddress> {
+        match self.parts.prefix.clone() {
+            Some(prefix) => self.checked_with_prefix(prefix),
+            // Do not check validity of the address and return as is.
+            None => Ok(CashAddress {
+                hrp: String::default(),
+                ty: self.ty,
+                key_hash: self.key_hash,
+                address_str: self.parts.to_string(),
+            }),
+        }
+    }
+}
+
+impl FromStr for UncheckedCashAddress {
+    type Err = AddressError;
+
+    fn from_str(address_str: &str) -> Result<Self, Self::Err> {
+        let address_parts = CashAddressParts::from_str(address_str)?;
+
+        let payload_with_checksum =
+            cash_base32::decode(&address_parts.payload).map_err(|_| AddressError::InvalidInput)?;
+
+        // Get the payload without the checksum.
+        let payload_u5 = &payload_with_checksum[..payload_with_checksum.len() - CHECKSUM_LEN];
+
+        let payload_data = {
+            let from = 5;
+            let to = 8;
+            let pad = false;
+            bech32::convert_bits(payload_u5, from, to, pad)
+                .map_err(|_| AddressError::InvalidInput)?
+        };
+
+        let version_byte = payload_data[0];
+        let ty = get_address_type(version_byte)?;
+        let key_hash =
+            H160::try_from(&payload_data[1..]).map_err(|_| AddressError::InvalidInput)?;
+
+        // `encoded_payload` is checked already, and it contains the valid checksum at the end.
+        Ok(UncheckedCashAddress {
+            parts: address_parts,
+            ty,
+            key_hash,
+            unchecked_payload_with_checksum: payload_with_checksum,
+        })
+    }
+}
+
+fn get_address_type(version_byte: u8) -> AddressResult<CashAddressType> {
+    match version_byte & 8 {
+        0 => Ok(CashAddressType::P2PKH),
+        8 => Ok(CashAddressType::P2SH),
+        _ => Err(AddressError::UnexpectedAddressPrefix),
+    }
+}
diff --git a/rust/chains/tw_bitcoincash/src/context.rs b/rust/chains/tw_bitcoincash/src/context.rs
new file mode 100644
index 00000000000..9190ff463e6
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/src/context.rs
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use tw_coin_entry::error::prelude::*;
+use tw_utxo::context::{AddressPrefixes, UtxoContext};
+use tw_utxo::script::Script;
+
+#[derive(Default)]
+pub struct BitcoinCashContext;
+
+impl UtxoContext for BitcoinCashContext {
+    type Address = Address;
+
+    fn addr_to_script_pubkey(
+        addr: &Self::Address,
+        prefixes: AddressPrefixes,
+    ) -> SigningResult<Script> {
+        match addr {
+            Address::Cash(cash) => cash
+                .to_legacy(prefixes.p2pkh_prefix, prefixes.p2sh_prefix)
+                .into_tw()
+                .context("Error converting 'CashAddress' to 'LegacyAddress'")?
+                .to_script_pubkey(prefixes.p2pkh_prefix, prefixes.p2sh_prefix),
+            Address::Legacy(legacy) => {
+                legacy.to_script_pubkey(prefixes.p2pkh_prefix, prefixes.p2sh_prefix)
+            },
+        }
+    }
+}
diff --git a/rust/chains/tw_bitcoincash/src/entry.rs b/rust/chains/tw_bitcoincash/src/entry.rs
new file mode 100644
index 00000000000..92dee76a81c
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/src/entry.rs
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::context::BitcoinCashContext;
+use std::str::FromStr;
+use tw_bitcoin::modules::compiler::BitcoinCompiler;
+use tw_bitcoin::modules::planner::BitcoinPlanner;
+use tw_bitcoin::modules::signer::BitcoinSigner;
+use tw_bitcoin::modules::transaction_util::BitcoinTransactionUtil;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::BitcoinBase58Prefix;
+use tw_keypair::tw::PublicKey;
+use tw_proto::BitcoinV2::Proto;
+
+pub struct BitcoinCashEntry;
+
+impl CoinEntry for BitcoinCashEntry {
+    // TODO `BitcoinCash` should probably have its own prefix enum with Cash and Base58 prefixes.
+    type AddressPrefix = BitcoinBase58Prefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = Proto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = BitcoinPlanner<BitcoinCashContext>;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = BitcoinTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str_with_coin_and_prefix(coin, address, prefix)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let public_key = public_key
+            .to_secp256k1()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        Address::p2pkh_with_coin_and_prefix(coin, public_key, prefix)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        BitcoinSigner::<BitcoinCashContext>::sign(coin, &input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        BitcoinCompiler::<BitcoinCashContext>::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        BitcoinCompiler::<BitcoinCashContext>::compile(coin, input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn plan_builder(&self) -> Option<Self::PlanBuilder> {
+        Some(BitcoinPlanner::<BitcoinCashContext>::default())
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(BitcoinTransactionUtil)
+    }
+}
diff --git a/rust/chains/tw_bitcoincash/src/lib.rs b/rust/chains/tw_bitcoincash/src/lib.rs
new file mode 100644
index 00000000000..0ad18c84e8d
--- /dev/null
+++ b/rust/chains/tw_bitcoincash/src/lib.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod cash_address;
+pub mod context;
+pub mod entry;
diff --git a/rust/chains/tw_cosmos/Cargo.toml b/rust/chains/tw_cosmos/Cargo.toml
new file mode 100644
index 00000000000..cbeae311ec3
--- /dev/null
+++ b/rust/chains/tw_cosmos/Cargo.toml
@@ -0,0 +1,13 @@
+[package]
+name = "tw_cosmos"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_proto = { path = "../../tw_proto" }
+
+[dev-dependencies]
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk", features = ["test-utils"] }
diff --git a/rust/chains/tw_cosmos/src/entry.rs b/rust/chains/tw_cosmos/src/entry.rs
new file mode 100644
index 00000000000..f77d8ea8991
--- /dev/null
+++ b/rust/chains/tw_cosmos/src/entry.rs
@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_cosmos_sdk::address::{Address, Bech32Prefix};
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::modules::compiler::tw_compiler::TWTransactionCompiler;
+use tw_cosmos_sdk::modules::signer::tw_signer::TWSigner;
+use tw_cosmos_sdk::modules::transaction_util::CosmosTransactionUtil;
+use tw_keypair::tw;
+use tw_proto::Cosmos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct CosmosEntry;
+
+impl CoinEntry for CosmosEntry {
+    type AddressPrefix = Bech32Prefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = CosmosTransactionUtil<StandardCosmosContext>;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str_with_coin_and_prefix(coin, address.to_string(), prefix)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: tw::PublicKey,
+        _derivation: Derivation,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::with_public_key_coin_context(coin, &public_key, prefix)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        TWSigner::<StandardCosmosContext>::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        TWTransactionCompiler::<StandardCosmosContext>::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        TWTransactionCompiler::<StandardCosmosContext>::compile(
+            coin,
+            input,
+            signatures,
+            public_keys,
+        )
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(CosmosTransactionUtil::<StandardCosmosContext>::default())
+    }
+}
diff --git a/rust/chains/tw_cosmos/src/lib.rs b/rust/chains/tw_cosmos/src/lib.rs
new file mode 100644
index 00000000000..c080f3da3cf
--- /dev/null
+++ b/rust/chains/tw_cosmos/src/lib.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod entry;
diff --git a/rust/chains/tw_ethereum/Cargo.toml b/rust/chains/tw_ethereum/Cargo.toml
new file mode 100644
index 00000000000..6a3cbe0ebd8
--- /dev/null
+++ b/rust/chains/tw_ethereum/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "tw_ethereum"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_evm = { path = "../../tw_evm" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_proto = { path = "../../tw_proto" }
+
+[dev-dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry", features = ["test-utils"] }
+tw_encoding = { path = "../../tw_encoding" }
+tw_number = { path = "../../tw_number", features = ["helpers"] }
diff --git a/rust/chains/tw_ethereum/src/entry.rs b/rust/chains/tw_ethereum/src/entry.rs
new file mode 100644
index 00000000000..2b72e1c374c
--- /dev/null
+++ b/rust/chains/tw_ethereum/src/entry.rs
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_evm::address::Address;
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::evm_entry::EvmEntry;
+use tw_evm::modules::compiler::Compiler;
+use tw_evm::modules::message_signer::EthMessageSigner;
+use tw_evm::modules::signer::Signer;
+use tw_evm::modules::transaction_util::EvmTransactionUtil;
+use tw_keypair::tw::PublicKey;
+use tw_proto::Ethereum::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct EthereumEntry;
+
+impl CoinEntry for EthereumEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = EthMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = EvmTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let public_key = public_key
+            .to_secp256k1()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        Ok(Address::with_secp256k1_pubkey(public_key))
+    }
+
+    #[inline]
+    fn sign(&self, _coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        Signer::<StandardEvmContext>::sign_proto(input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        Compiler::<StandardEvmContext>::preimage_hashes(input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        Compiler::<StandardEvmContext>::compile(input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn message_signer(&self) -> Option<Self::MessageSigner> {
+        Some(EthMessageSigner)
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(EvmTransactionUtil)
+    }
+}
+
+impl EvmEntry for EthereumEntry {
+    type Context = StandardEvmContext;
+}
diff --git a/rust/chains/tw_ethereum/src/lib.rs b/rust/chains/tw_ethereum/src/lib.rs
new file mode 100644
index 00000000000..c080f3da3cf
--- /dev/null
+++ b/rust/chains/tw_ethereum/src/lib.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod entry;
diff --git a/rust/chains/tw_ethereum/tests/compiler.rs b/rust/chains/tw_ethereum/tests/compiler.rs
new file mode 100644
index 00000000000..7d88e7279e2
--- /dev/null
+++ b/rust/chains/tw_ethereum/tests/compiler.rs
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::coin_entry_ext::CoinEntryExt;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_encoding::hex;
+use tw_ethereum::entry::EthereumEntry;
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::tw;
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_external_signature_sign() {
+    let coin = TestCoinContext::default();
+
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(1_000_000_000_000_000_000),
+        data: Cow::default(),
+    };
+    let input = Proto::SigningInput {
+        nonce: U256::encode_be_compact(11),
+        chain_id: U256::encode_be_compact(1),
+        gas_price: U256::encode_be_compact(20_000_000_000),
+        gas_limit: U256::encode_be_compact(21_000),
+        to_address: "0x3535353535353535353535353535353535353535".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 1: Obtain preimage hash
+    let input_data = serialize(&input).unwrap();
+    let preimage_data = EthereumEntry
+        .preimage_hashes(&coin, &input_data)
+        .expect("!preimage_hashes");
+    let preimage: CompilerProto::PreSigningOutput =
+        deserialize(&preimage_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(preimage.error, SigningErrorType::OK);
+    assert!(preimage.error_message.is_empty());
+    assert_eq!(
+        hex::encode(&preimage.data_hash, false),
+        "15e180a6274b2f6a572b9b51823fce25ef39576d10188ecdcd7de44526c47217"
+    );
+
+    // Simulate signature, normally obtained from signature server
+    let public_key = secp256k1::PublicKey::try_from("044bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ce28cab79ad7119ee1ad3ebcdb98a16805211530ecc6cfefa1b88e6dff99232a").unwrap();
+    let public_key = tw::PublicKey::Secp256k1Extended(public_key);
+    let signature = hex::decode("360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c9796677900").unwrap();
+
+    // Verify signature (pubkey & hash & signature)
+    assert!(public_key.verify(&signature, &preimage.data_hash));
+
+    // Step 2: Compile transaction info
+    let input_data = serialize(&input).unwrap();
+    let output_data = EthereumEntry
+        .compile(
+            &coin,
+            &input_data,
+            vec![signature],
+            vec![public_key.to_bytes()],
+        )
+        .expect("!compile");
+    let output: Proto::SigningOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    let expected_encoded = "f86c0b8504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a0360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07ba053bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c97966779";
+    assert_eq!(hex::encode(output.encoded, false), expected_encoded);
+
+    // Double check: check if simple signature process gives the same result. Note that private
+    // keys were not used anywhere up to this point.
+    let input = Proto::SigningInput {
+        private_key: Cow::from(
+            hex::decode("4646464646464646464646464646464646464646464646464646464646464646")
+                .unwrap(),
+        ),
+        ..input
+    };
+
+    let input_data = serialize(&input).unwrap();
+    let output_data = EthereumEntry
+        .sign(&coin, &input_data)
+        .expect("!output_data");
+    let output: Proto::SigningOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+    assert_eq!(hex::encode(output.encoded, false), expected_encoded);
+}
diff --git a/rust/chains/tw_ethereum/tests/signer.rs b/rust/chains/tw_ethereum/tests/signer.rs
new file mode 100644
index 00000000000..06b6af14507
--- /dev/null
+++ b/rust/chains/tw_ethereum/tests/signer.rs
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_entry_ext::CoinEntryExt;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_encoding::hex::DecodeHex;
+use tw_ethereum::entry::EthereumEntry;
+
+#[test]
+fn test_sign_json() {
+    let coin = TestCoinContext::default();
+
+    let input_json = r#"{"chainId":"AQ==","gasPrice":"1pOkAA==","gasLimit":"Ugg=","toAddress":"0x7d8bf18C7cE84b3E175b339c4Ca93aEd1dD166F1","transaction":{"transfer":{"amount":"A0i8paFgAA=="}}})"#;
+    let private_key = "17209af590a86462395d5881e60d11c7fa7d482cfb02b5a01b93c2eeef243543"
+        .decode_hex()
+        .unwrap();
+
+    EthereumEntry
+        .sign_json(&coin, input_json, private_key)
+        .expect_err("'EthEntry::sign_json' is not supported yet");
+
+    // Expected result - "f86a8084d693a400825208947d8bf18c7ce84b3e175b339c4ca93aed1dd166f1870348bca5a160008025a0fe5802b49e04c6b1705088310e133605ed8b549811a18968ad409ea02ad79f21a05bf845646fb1e1b9365f63a7fd5eb5e984094e3ed35c3bed7361aebbcbf41f10"
+}
diff --git a/rust/chains/tw_greenfield/Cargo.toml b/rust/chains/tw_greenfield/Cargo.toml
new file mode 100644
index 00000000000..ab4ee6f224f
--- /dev/null
+++ b/rust/chains/tw_greenfield/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "tw_greenfield"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_evm = { path = "../../tw_evm" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_misc = { path = "../../tw_misc" }
+tw_number = { path = "../../tw_number" }
+tw_proto = { path = "../../tw_proto" }
+
+[dev-dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry", features = ["test-utils"] }
+tw_misc = { path = "../../tw_misc", features = ["test-utils"] }
diff --git a/rust/chains/tw_greenfield/fuzz/.gitignore b/rust/chains/tw_greenfield/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/chains/tw_greenfield/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/chains/tw_greenfield/fuzz/Cargo.toml b/rust/chains/tw_greenfield/fuzz/Cargo.toml
new file mode 100644
index 00000000000..fbc0f5790cc
--- /dev/null
+++ b/rust/chains/tw_greenfield/fuzz/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "tw_greenfield-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+tw_any_coin = { path = "../../../tw_any_coin", features = ["test-utils"] }
+tw_coin_registry = { path = "../../../tw_coin_registry" }
+tw_proto = { path = "../../../tw_proto", features = ["fuzz"] }
+
+[dependencies.tw_greenfield]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "sign"
+path = "fuzz_targets/sign.rs"
+test = false
+doc = false
diff --git a/rust/chains/tw_greenfield/fuzz/fuzz_targets/sign.rs b/rust/chains/tw_greenfield/fuzz/fuzz_targets/sign.rs
new file mode 100644
index 00000000000..f27808e5e42
--- /dev/null
+++ b/rust/chains/tw_greenfield/fuzz/fuzz_targets/sign.rs
@@ -0,0 +1,11 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_proto::Greenfield::Proto;
+
+fuzz_target!(|input: Proto::SigningInput<'_>| {
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let _ = signer.sign(CoinType::Greenfield, input);
+});
diff --git a/rust/chains/tw_greenfield/src/address.rs b/rust/chains/tw_greenfield/src/address.rs
new file mode 100644
index 00000000000..94b9565b17a
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/address.rs
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Serialize;
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::address::CosmosAddress;
+use tw_evm::address::Address as EthereumAddress;
+use tw_keypair::ecdsa::secp256k1;
+use tw_memory::Data;
+
+#[derive(Clone, Serialize)]
+pub struct GreenfieldAddress(EthereumAddress);
+
+impl GreenfieldAddress {
+    /// Initializes an address with a `secp256k1` public key.
+    pub fn with_secp256k1_pubkey(pubkey: &secp256k1::PublicKey) -> GreenfieldAddress {
+        GreenfieldAddress(EthereumAddress::with_secp256k1_pubkey(pubkey))
+    }
+}
+
+impl CosmosAddress for GreenfieldAddress {}
+
+impl CoinAddress for GreenfieldAddress {
+    #[inline]
+    fn data(&self) -> Data {
+        self.0.data()
+    }
+}
+
+impl FromStr for GreenfieldAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        EthereumAddress::from_str(s).map(GreenfieldAddress)
+    }
+}
+
+impl fmt::Display for GreenfieldAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/compiler.rs b/rust/chains/tw_greenfield/src/compiler.rs
new file mode 100644
index 00000000000..e9db4725199
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/compiler.rs
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::GreenfieldContext;
+use crate::modules::eip712_signer::{Eip712Signer, Eip712TxPreimage};
+use crate::modules::tx_builder::TxBuilder;
+use crate::public_key::GreenfieldPublicKey;
+use crate::signature::GreenfieldSignature;
+use std::borrow::Cow;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::common::compile_input::SingleSignaturePubkey;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_cosmos_sdk::modules::broadcast_msg::{BroadcastMode, BroadcastMsg};
+use tw_cosmos_sdk::modules::serializer::json_serializer::JsonSerializer;
+use tw_cosmos_sdk::modules::serializer::protobuf_serializer::ProtobufSerializer;
+use tw_cosmos_sdk::public_key::CosmosPublicKey;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Greenfield::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct GreenfieldCompiler;
+
+impl GreenfieldCompiler {
+    /// Please note that [`Proto::SigningInput::public_key`] must be set.
+    /// If the public key should be derived from a private key, please do it before this method is called.
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let unsigned = TxBuilder::unsigned_tx_from_proto(coin, &input)?;
+        let Eip712TxPreimage { eip712_tx, tx_hash } = Eip712Signer::preimage_hash(&unsigned)?;
+
+        Ok(CompilerProto::PreSigningOutput {
+            data: Cow::from(eip712_tx.to_vec()),
+            data_hash: Cow::from(tx_hash.to_vec()),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    pub(crate) fn compile_impl(
+        coin: &dyn CoinContext,
+        mut input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let SingleSignaturePubkey {
+            signature: raw_signature,
+            public_key,
+        } = SingleSignaturePubkey::from_sign_pubkey_list(signatures, public_keys)?;
+
+        let public_key_params = None;
+        let public_key = GreenfieldPublicKey::from_bytes(coin, &public_key, public_key_params)
+            .into_tw()
+            .context("Invalid provided public key")?;
+        let signature = GreenfieldSignature::try_from(raw_signature.as_slice())
+            .into_tw()
+            .context("Invalid provided signature")?;
+        let signature_bytes = signature.to_vec();
+
+        // Set the public key. It will be used to construct a signer info.
+        input.public_key = Cow::from(public_key.to_bytes());
+        let unsigned = TxBuilder::unsigned_tx_from_proto(coin, &input)?;
+
+        let signed_tx = unsigned.into_signed(signature);
+        let signed_tx_raw = ProtobufSerializer::<GreenfieldContext>::build_signed_tx(&signed_tx)?;
+
+        let broadcast_mode = Self::broadcast_mode(input.mode);
+        let broadcast_tx = BroadcastMsg::raw(broadcast_mode, &signed_tx_raw).to_json_string();
+
+        let signature_json = JsonSerializer::<GreenfieldContext>::serialize_signature(
+            &public_key,
+            signature_bytes.clone(),
+        );
+        let signature_json = serde_json::to_string(&[signature_json])
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing signatures as JSON")?;
+
+        Ok(Proto::SigningOutput {
+            signature: Cow::from(signature_bytes),
+            signature_json: Cow::from(signature_json),
+            serialized: Cow::from(broadcast_tx),
+            ..Proto::SigningOutput::default()
+        })
+    }
+
+    fn broadcast_mode(input: Proto::BroadcastMode) -> BroadcastMode {
+        match input {
+            Proto::BroadcastMode::SYNC => BroadcastMode::Sync,
+            Proto::BroadcastMode::ASYNC => BroadcastMode::Async,
+        }
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/context.rs b/rust/chains/tw_greenfield/src/context.rs
new file mode 100644
index 00000000000..888147cde48
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/context.rs
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::GreenfieldAddress;
+use crate::public_key::GreenfieldPublicKey;
+use tw_cosmos_sdk::context::CosmosContext;
+use tw_cosmos_sdk::private_key::secp256k1::Secp256PrivateKey;
+use tw_cosmos_sdk::signature::secp256k1::Secp256k1Signature;
+use tw_hash::hasher::Hasher;
+
+pub struct GreenfieldContext;
+
+impl CosmosContext for GreenfieldContext {
+    type Address = GreenfieldAddress;
+    type PrivateKey = Secp256PrivateKey;
+    type PublicKey = GreenfieldPublicKey;
+    type Signature = Secp256k1Signature;
+
+    /// Greenfield uses EIP712 message signing algorithm built upon `keccak256` hash.
+    fn default_tx_hasher() -> Hasher {
+        Hasher::Keccak256
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/eip712_types.rs b/rust/chains/tw_greenfield/src/eip712_types.rs
new file mode 100644
index 00000000000..3bf8f103d52
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/eip712_types.rs
@@ -0,0 +1,319 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::GreenfieldFee;
+use core::fmt;
+use serde::{Serialize, Serializer};
+use serde_json::Value as Json;
+use std::collections::BTreeMap;
+use tw_cosmos_sdk::transaction::message::JsonMessage;
+use tw_cosmos_sdk::transaction::Coin;
+use tw_evm::abi::param_type::constructor::TypeConstructor;
+use tw_evm::message::eip712::message_types::MessageTypesBuilder;
+use tw_evm::message::eip712::property::PropertyType;
+use tw_number::U256;
+
+const DOMAIN_NAME: &str = "Greenfield Tx";
+const DOMAIN_VERSION: &str = "1.0.0";
+const DOMAIN_VERIFY_CONTRACT: &str = "greenfield";
+const DOMAIN_SALT: &str = "0";
+
+#[derive(Debug, Eq, Ord, PartialEq, PartialOrd)]
+pub struct MsgPropertyName(pub usize);
+
+impl fmt::Display for MsgPropertyName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "msg{}", self.0)
+    }
+}
+
+pub struct MsgPropertyType(pub usize);
+
+impl fmt::Display for MsgPropertyType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "Msg{}", self.0)
+    }
+}
+
+impl Serialize for MsgPropertyName {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        self.to_string().serialize(serializer)
+    }
+}
+
+/// # EIP712 type
+///
+/// ```json
+/// {
+///     "EIP712Domain": [
+///         {
+///             "name": "chainId",
+///             "type": "uint256"
+///         },
+///         {
+///             "name": "name",
+///             "type": "string"
+///         },
+///         {
+///             "name": "salt",
+///             "type": "string"
+///         },
+///         {
+///             "name": "verifyingContract",
+///             "type": "string"
+///         },
+///         {
+///             "name": "version",
+///             "type": "string"
+///         }
+///     ]
+/// }
+/// ```
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+pub struct Eip712Domain {
+    pub name: String,
+    pub version: String,
+    #[serde(serialize_with = "U256::as_decimal_str")]
+    pub chain_id: U256,
+    pub verifying_contract: String,
+    pub salt: String,
+}
+
+impl Eip712Domain {
+    const TYPE_NAME: &'static str = "EIP712Domain";
+
+    /// Returns a Serializable data of the `EIP712Domain` type.
+    /// https://github.com/bnb-chain/greenfield-cosmos-sdk/blob/b48770f5e210b28536f92734b6228913666d4da1/x/auth/tx/eip712.go#L35-L40
+    pub fn new(chain_id: U256) -> Eip712Domain {
+        Eip712Domain {
+            name: DOMAIN_NAME.to_string(),
+            version: DOMAIN_VERSION.to_string(),
+            chain_id,
+            verifying_contract: DOMAIN_VERIFY_CONTRACT.to_string(),
+            salt: DOMAIN_SALT.to_string(),
+        }
+    }
+
+    pub fn declare_eip712_types(&self, builder: &mut MessageTypesBuilder) {
+        if let Some(mut domain_builder) = builder.add_custom_type(Self::TYPE_NAME.to_string()) {
+            domain_builder
+                .add_property("chainId", PropertyType::Uint)
+                .add_property("name", PropertyType::String)
+                .add_property("salt", PropertyType::String)
+                .add_property("verifyingContract", PropertyType::String)
+                .add_property("version", PropertyType::String);
+        }
+    }
+}
+
+/// # EIP712 type
+///
+/// ```json
+/// {
+///     "Coin": [
+///         {
+///             "name": "amount",
+///             "type": "uint256"
+///         },
+///         {
+///             "name": "denom",
+///             "type": "string"
+///          }
+///     ]
+/// }
+/// ```
+pub struct Eip712Coin;
+
+impl Eip712Coin {
+    const TYPE_NAME: &'static str = "Coin";
+
+    pub fn declare_eip712_types(builder: &mut MessageTypesBuilder) {
+        if let Some(mut coin_builder) = builder.add_custom_type(Self::TYPE_NAME.to_string()) {
+            coin_builder
+                .add_property("amount", PropertyType::Uint)
+                .add_property("denom", PropertyType::String);
+        }
+    }
+}
+
+/// # EIP712 type
+///
+/// ```json
+/// {
+///     "Fee": [
+///         {
+///             "name": "amount",
+///             "type": "Coin[]"
+///         },
+///         {
+///             "name": "gas_limit",
+///             "type": "uint256"
+///         },
+///         {
+///             "name": "granter",
+///             "type": "string"
+///         },
+///         {
+///             "name": "payer",
+///             "type": "string"
+///         }
+///     ]
+/// }
+/// ```
+#[derive(Serialize)]
+pub struct Eip712Fee {
+    pub amount: Vec<Coin>,
+    #[serde(serialize_with = "U256::as_decimal_str")]
+    pub gas_limit: U256,
+    pub payer: String,
+    pub granter: String,
+}
+
+impl Eip712Fee {
+    const TYPE_NAME: &'static str = "Fee";
+
+    pub fn declare_eip712_types(builder: &mut MessageTypesBuilder) {
+        // `Tx` depends on `Coin` and `Fee` custom types.
+        Eip712Coin::declare_eip712_types(builder);
+
+        if let Some(mut fee_builder) = builder.add_custom_type(Self::TYPE_NAME.to_string()) {
+            let amount_type = PropertyType::Custom(Eip712Coin::TYPE_NAME.to_string());
+            fee_builder
+                .add_property("amount", PropertyType::array(amount_type))
+                .add_property("gas_limit", PropertyType::Uint)
+                .add_property("granter", PropertyType::String)
+                .add_property("payer", PropertyType::String);
+        }
+    }
+}
+
+impl From<GreenfieldFee> for Eip712Fee {
+    fn from(fee: GreenfieldFee) -> Self {
+        let payer = fee
+            .payer
+            .as_ref()
+            .map(|addr| addr.to_string())
+            .unwrap_or_default();
+        let granter = fee
+            .granter
+            .as_ref()
+            .map(|addr| addr.to_string())
+            .unwrap_or_default();
+
+        Eip712Fee {
+            amount: fee.amounts.clone(),
+            gas_limit: U256::from(fee.gas_limit),
+            payer,
+            granter,
+        }
+    }
+}
+
+#[derive(Clone, Serialize)]
+pub struct Eip712TypedMsg {
+    #[serde(rename = "type")]
+    pub msg_type: String,
+    #[serde(flatten)]
+    pub value: Json,
+}
+
+impl From<JsonMessage> for Eip712TypedMsg {
+    fn from(msg: JsonMessage) -> Self {
+        Eip712TypedMsg {
+            msg_type: msg.msg_type,
+            value: msg.value,
+        }
+    }
+}
+
+/// # EIP712 type
+///
+/// ```json
+/// {
+///     "Tx": [
+///         {
+///             "name": "account_number",
+///             "type": "uint256"
+///         },
+///         {
+///             "name": "chain_id",
+///             "type": "uint256"
+///         },
+///         {
+///             "name": "fee",
+///             "type": "Fee"
+///         },
+///         {
+///             "name": "memo",
+///             "type": "string"
+///         },
+///         {
+///             "name": "msg1",
+///             "type": "Msg1"
+///         },
+///         {
+///             "name": "sequence",
+///             "type": "uint256"
+///         },
+///         {
+///             "name": "timeout_height",
+///             "type": "uint256"
+///         }
+///     ]
+/// }
+/// ```
+#[derive(Serialize)]
+pub struct Eip712Transaction {
+    #[serde(serialize_with = "U256::as_decimal_str")]
+    pub account_number: U256,
+    #[serde(serialize_with = "U256::as_decimal_str")]
+    pub chain_id: U256,
+    pub fee: Eip712Fee,
+    pub memo: String,
+    /// Will be flatten as `"msg1": { ... }, "msg2": { ... }`.
+    #[serde(flatten)]
+    pub msgs: BTreeMap<MsgPropertyName, Eip712TypedMsg>,
+    #[serde(serialize_with = "U256::as_decimal_str")]
+    pub sequence: U256,
+    #[serde(serialize_with = "U256::as_decimal_str")]
+    pub timeout_height: U256,
+}
+
+impl Eip712Transaction {
+    /// cbindgen::ignore
+    pub const TYPE_NAME: &'static str = "Tx";
+
+    pub fn declare_eip712_types(&self, builder: &mut MessageTypesBuilder) {
+        Eip712Fee::declare_eip712_types(builder);
+
+        let Some(mut tx_builder) = builder.add_custom_type(Self::TYPE_NAME.to_string()) else {
+            return;
+        };
+
+        tx_builder
+            .add_property("account_number", PropertyType::Uint)
+            .add_property("chain_id", PropertyType::Uint)
+            .add_property(
+                "fee",
+                PropertyType::Custom(Eip712Fee::TYPE_NAME.to_string()),
+            )
+            .add_property("memo", PropertyType::String)
+            .add_property("sequence", PropertyType::Uint)
+            .add_property("timeout_height", PropertyType::Uint);
+
+        for (msg_property_name, _msg) in self.msgs.iter() {
+            let msg_property_type = MsgPropertyType(msg_property_name.0).to_string();
+            let msg_property_type = PropertyType::Custom(msg_property_type.to_string());
+
+            let msg_property_name = msg_property_name.to_string();
+            tx_builder.add_property(&msg_property_name, msg_property_type);
+        }
+
+        tx_builder.sort_by_names();
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/entry.rs b/rust/chains/tw_greenfield/src/entry.rs
new file mode 100644
index 00000000000..8a5d0e9f681
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/entry.rs
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::GreenfieldAddress;
+use crate::compiler::GreenfieldCompiler;
+use crate::signer::GreenfieldSigner;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::transaction_util::NoTransactionUtil;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_keypair::tw::PublicKey;
+use tw_proto::Greenfield::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct GreenfieldEntry;
+
+impl CoinEntry for GreenfieldEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = GreenfieldAddress;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = NoTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        GreenfieldAddress::from_str(address)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        GreenfieldAddress::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let public_key = public_key
+            .to_secp256k1()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        Ok(GreenfieldAddress::with_secp256k1_pubkey(public_key))
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        GreenfieldSigner::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        GreenfieldCompiler::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        GreenfieldCompiler::compile(coin, input, signatures, public_keys)
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/lib.rs b/rust/chains/tw_greenfield/src/lib.rs
new file mode 100644
index 00000000000..02e2d565253
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/lib.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod compiler;
+pub mod context;
+pub mod eip712_types;
+pub mod entry;
+pub mod modules;
+pub mod public_key;
+pub mod signature;
+pub mod signer;
+pub mod transaction;
diff --git a/rust/chains/tw_greenfield/src/modules/eip712_signer.rs b/rust/chains/tw_greenfield/src/modules/eip712_signer.rs
new file mode 100644
index 00000000000..c5ead1f19de
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/modules/eip712_signer.rs
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::eip712_types::{
+    Eip712Domain, Eip712Fee, Eip712Transaction, Eip712TypedMsg, MsgPropertyName,
+};
+use crate::transaction::GreenfieldUnsignedTransaction;
+use std::collections::BTreeMap;
+use tw_coin_entry::error::prelude::*;
+use tw_evm::message::eip712::eip712_message::Eip712Message;
+use tw_evm::message::eip712::message_types::MessageTypesBuilder;
+use tw_evm::message::{to_signing, EthMessage};
+use tw_hash::H256;
+use tw_number::U256;
+
+pub struct Eip712TxPreimage {
+    pub eip712_tx: String,
+    pub tx_hash: H256,
+}
+
+pub struct Eip712Signer;
+
+impl Eip712Signer {
+    pub fn preimage_hash(
+        unsigned: &GreenfieldUnsignedTransaction,
+    ) -> SigningResult<Eip712TxPreimage> {
+        // `types_builder` will be used to declare all custom types like `Tx`, `Fee`, `Msg1` etc.
+        let mut types_builder = MessageTypesBuilder::default();
+
+        // Step 1: Convert all [`TxBody::messages`] to a map of `msg1: GreenfieldTypedMsg`, `msg2: GreenfieldTypedMsg`.
+        // at the same time, declare the message custom types.
+        let mut msgs = BTreeMap::new();
+        for (msg_idx, msg) in unsigned.tx_body.messages.iter().enumerate() {
+            // Index of the transaction messages starts from 1.
+            let msg_idx = msg_idx + 1;
+
+            let property_name = MsgPropertyName(msg_idx);
+            let property_value = Eip712TypedMsg::from(msg.to_json()?);
+
+            msgs.insert(property_name, property_value);
+
+            // Declare message custom types like `Msg1`, `TypeMsg1Amount`, etc.
+            msg.declare_eip712_type(msg_idx, &mut types_builder);
+        }
+
+        // Step 2: Generate `Tx` and `Domain` objects - the main parts of the EIP712 message.
+        let tx_to_sign = Eip712Transaction {
+            account_number: U256::from(unsigned.account_number),
+            chain_id: unsigned.eth_chain_id,
+            fee: Eip712Fee::from(unsigned.fee.clone()),
+            memo: unsigned.tx_body.memo.clone(),
+            msgs,
+            sequence: U256::from(unsigned.signer.sequence),
+            timeout_height: U256::zero(),
+        };
+        let domain = Eip712Domain::new(unsigned.eth_chain_id);
+
+        // Step 3: Declare `Tx`, `Domain` and all types they depend on.
+        tx_to_sign.declare_eip712_types(&mut types_builder);
+        domain.declare_eip712_types(&mut types_builder);
+
+        // Step 4: Generate EIP712 message with all declared custom types, `Domain` and `Tx`,
+        // and compute the EIP712 message hash.
+        let msg_to_sign = Eip712Message {
+            types: types_builder.build(),
+            domain: serde_json::to_value(domain)
+                .tw_err(|_| SigningErrorType::Error_internal)
+                .context("Error serializing EIP712Domain as JSON")?,
+            primary_type: Eip712Transaction::TYPE_NAME.to_string(),
+            message: serde_json::to_value(tx_to_sign)
+                .tw_err(|_| SigningErrorType::Error_internal)
+                .context("Error serializing EIP712 message payload as JSON")?,
+        };
+
+        let tx_hash = msg_to_sign.hash().map_err(to_signing)?;
+        let eip712_tx =
+            serde_json::to_string(&msg_to_sign).tw_err(|_| SigningErrorType::Error_internal)?;
+
+        Ok(Eip712TxPreimage { eip712_tx, tx_hash })
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/modules/mod.rs b/rust/chains/tw_greenfield/src/modules/mod.rs
new file mode 100644
index 00000000000..a9eed00576a
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/modules/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod eip712_signer;
+pub mod tx_builder;
diff --git a/rust/chains/tw_greenfield/src/modules/tx_builder.rs b/rust/chains/tw_greenfield/src/modules/tx_builder.rs
new file mode 100644
index 00000000000..6a12bb2aa6e
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/modules/tx_builder.rs
@@ -0,0 +1,182 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::GreenfieldAddress;
+use crate::public_key::GreenfieldPublicKey;
+use crate::transaction::message::GreenfieldMessageBox;
+use crate::transaction::{
+    GreenfieldFee, GreenfieldSignMode, GreenfieldSignerInfo, GreenfieldTxBody,
+    GreenfieldUnsignedTransaction,
+};
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::public_key::CosmosPublicKey;
+use tw_cosmos_sdk::transaction::{Coin, SignerInfo};
+use tw_misc::traits::OptionalEmpty;
+use tw_number::U256;
+use tw_proto::Greenfield::Proto;
+
+const DEFAULT_TIMEOUT_HEIGHT: u64 = 0;
+
+/// [`TxBuilder`] is used to build `UnsignedTransaction`
+/// from the `TW::Greenfield::Proto::SigningInput` protobuf message.
+pub struct TxBuilder;
+
+impl TxBuilder {
+    /// Please note that [`Proto::SigningInput::public_key`] must be set.
+    /// If the public key should be derived from a private key, please do it before this method is called.
+    pub fn unsigned_tx_from_proto(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput<'_>,
+    ) -> SigningResult<GreenfieldUnsignedTransaction> {
+        let signer = Self::signer_info_from_proto(coin, input)?;
+
+        let fee = input
+            .fee
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_wrong_fee)
+            .context("No 'fee' specified")?;
+        let fee = Self::fee_from_proto(fee, &signer)?;
+
+        let eth_chain_id = U256::from_str(&input.eth_chain_id)
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid ETH chain ID")?;
+
+        Ok(GreenfieldUnsignedTransaction {
+            signer,
+            fee,
+            cosmos_chain_id: input.cosmos_chain_id.to_string(),
+            eth_chain_id,
+            account_number: input.account_number,
+            tx_body: Self::tx_body_from_proto(input)?,
+        })
+    }
+
+    pub fn signer_info_from_proto(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+    ) -> SigningResult<GreenfieldSignerInfo> {
+        let public_key_params = None;
+        let public_key =
+            GreenfieldPublicKey::from_bytes(coin, &input.public_key, public_key_params)?;
+        let sign_mode = match input.signing_mode {
+            Proto::SigningMode::Eip712 => GreenfieldSignMode::Eip712,
+        };
+        Ok(SignerInfo {
+            public_key,
+            sequence: input.sequence,
+            sign_mode: sign_mode.into(),
+        })
+    }
+
+    fn fee_from_proto(
+        input: &Proto::Fee,
+        signer: &GreenfieldSignerInfo,
+    ) -> SigningResult<GreenfieldFee> {
+        let payer = GreenfieldAddress::with_secp256k1_pubkey(&signer.public_key.0);
+
+        let amounts = input
+            .amounts
+            .iter()
+            .map(Self::coin_from_proto)
+            .collect::<SigningResult<_>>()?;
+        Ok(GreenfieldFee {
+            amounts,
+            gas_limit: input.gas,
+            payer: Some(payer),
+            granter: None,
+        })
+    }
+
+    fn coin_from_proto(input: &Proto::Amount<'_>) -> SigningResult<Coin> {
+        let amount = U256::from_str(&input.amount)
+            .into_tw()
+            .context("Invalid amount: expected uint256 decimal-string")?;
+        Ok(Coin {
+            amount,
+            denom: input.denom.to_string(),
+        })
+    }
+
+    fn tx_body_from_proto(input: &Proto::SigningInput<'_>) -> SigningResult<GreenfieldTxBody> {
+        if input.messages.is_empty() {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No transaction messages provided");
+        }
+
+        let messages = input
+            .messages
+            .iter()
+            .map(Self::tx_message_from_proto)
+            .collect::<SigningResult<_>>()?;
+
+        Ok(GreenfieldTxBody {
+            messages,
+            memo: input.memo.to_string(),
+            timeout_height: DEFAULT_TIMEOUT_HEIGHT,
+        })
+    }
+
+    pub fn tx_message_from_proto(input: &Proto::Message) -> SigningResult<GreenfieldMessageBox> {
+        use Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+        match input.message_oneof {
+            MessageEnum::send_coins_message(ref send) => Self::send_msg_from_proto(send),
+            MessageEnum::bridge_transfer_out(ref transfer_out) => {
+                Self::bridge_transfer_out_from_proto(transfer_out)
+            },
+            MessageEnum::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No message type provided"),
+        }
+    }
+
+    pub fn send_msg_from_proto(
+        send: &Proto::mod_Message::Send<'_>,
+    ) -> SigningResult<GreenfieldMessageBox> {
+        use crate::transaction::message::send_order::GreenfieldSendMessage;
+        use tw_cosmos_sdk::transaction::message::cosmos_bank_message::SendMessage;
+
+        let amounts = send
+            .amounts
+            .iter()
+            .map(Self::coin_from_proto)
+            .collect::<SigningResult<_>>()?;
+        let msg = SendMessage {
+            custom_type_prefix: send.type_prefix.to_string().empty_or_some(),
+            from_address: GreenfieldAddress::from_str(&send.from_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            to_address: GreenfieldAddress::from_str(&send.to_address)
+                .into_tw()
+                .context("Invalid recipient address")?,
+            amount: amounts,
+        };
+        Ok(Box::new(GreenfieldSendMessage(msg)))
+    }
+
+    pub fn bridge_transfer_out_from_proto(
+        transfer_out: &Proto::mod_Message::BridgeTransferOut<'_>,
+    ) -> SigningResult<GreenfieldMessageBox> {
+        use crate::transaction::message::transfer_out::GreenfieldTransferOut;
+
+        let amount = transfer_out
+            .amount
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("No transfer amount specified")?;
+
+        let msg = GreenfieldTransferOut {
+            custom_type_prefix: transfer_out.type_prefix.to_string().empty_or_some(),
+            amount: Self::coin_from_proto(amount)?,
+            from: GreenfieldAddress::from_str(&transfer_out.from_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            to: GreenfieldAddress::from_str(&transfer_out.to_address)
+                .into_tw()
+                .context("Invalid recipient address")?,
+        };
+        Ok(Box::new(msg))
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/public_key.rs b/rust/chains/tw_greenfield/src/public_key.rs
new file mode 100644
index 00000000000..41f4a3cced6
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/public_key.rs
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_cosmos_sdk::public_key::{
+    CosmosPublicKey, JsonPublicKey, ProtobufPublicKey, PublicKeyParams,
+};
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::{tw, KeyPairError, KeyPairResult};
+use tw_memory::Data;
+use tw_proto::{google, to_any};
+
+pub struct GreenfieldPublicKey(pub secp256k1::PublicKey);
+
+impl JsonPublicKey for GreenfieldPublicKey {
+    fn public_key_type(&self) -> String {
+        "/cosmos.crypto.eth.ethsecp256k1.PubKey".to_string()
+    }
+}
+
+impl ProtobufPublicKey for GreenfieldPublicKey {
+    fn to_proto(&self) -> google::protobuf::Any {
+        let proto = tw_cosmos_sdk::proto::cosmos::crypto::eth::ethsecp256k1::PubKey {
+            key: self.0.compressed().to_vec(),
+        };
+        to_any(&proto)
+    }
+}
+
+impl CosmosPublicKey for GreenfieldPublicKey {
+    fn from_private_key(
+        _coin: &dyn CoinContext,
+        private_key: &tw::PrivateKey,
+        // Ignore custom public key parameters.
+        _params: Option<PublicKeyParams>,
+    ) -> KeyPairResult<Self> {
+        let public_key = private_key
+            .get_public_key_by_type(tw::PublicKeyType::Secp256k1)?
+            .to_secp256k1()
+            .ok_or(KeyPairError::InvalidPublicKey)?
+            .clone();
+        Ok(GreenfieldPublicKey(public_key))
+    }
+
+    fn from_bytes(
+        _coin: &dyn CoinContext,
+        public_key_bytes: &[u8],
+        // Ignore custom public key parameters.
+        _params: Option<PublicKeyParams>,
+    ) -> KeyPairResult<Self> {
+        secp256k1::PublicKey::try_from(public_key_bytes).map(GreenfieldPublicKey)
+    }
+
+    fn to_bytes(&self) -> Data {
+        self.0.compressed().to_vec()
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/signature.rs b/rust/chains/tw_greenfield/src/signature.rs
new file mode 100644
index 00000000000..bc2094edb67
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/signature.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_cosmos_sdk::signature::CosmosSignature;
+use tw_evm::message::signature::{MessageSignature, SignatureType};
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::KeyPairError;
+use tw_misc::traits::ToBytesVec;
+
+/// secp256k1 signature with the legacy ETH replay protection.
+#[derive(Clone)]
+pub struct GreenfieldSignature(MessageSignature);
+
+impl TryFrom<secp256k1::Signature> for GreenfieldSignature {
+    type Error = KeyPairError;
+
+    fn try_from(sign: secp256k1::Signature) -> Result<Self, Self::Error> {
+        MessageSignature::prepared(sign, SignatureType::Legacy).map(GreenfieldSignature)
+    }
+}
+
+impl CosmosSignature for GreenfieldSignature {}
+
+/// [`GreenfieldSignature::try_from`] tries to parse a standard secp256k1 signature from the given bytes,
+/// and applies the legacy ETH replay protection.
+impl<'a> TryFrom<&'a [u8]> for GreenfieldSignature {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let standard_sign = secp256k1::Signature::try_from(bytes)?;
+        GreenfieldSignature::try_from(standard_sign)
+    }
+}
+
+impl ToBytesVec for GreenfieldSignature {
+    fn to_vec(&self) -> Vec<u8> {
+        self.0.to_bytes().to_vec()
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/signer.rs b/rust/chains/tw_greenfield/src/signer.rs
new file mode 100644
index 00000000000..afde1ed2747
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/signer.rs
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::compiler::GreenfieldCompiler;
+use crate::modules::eip712_signer::{Eip712Signer, Eip712TxPreimage};
+use crate::modules::tx_builder::TxBuilder;
+use std::borrow::Cow;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Greenfield::Proto;
+
+pub struct GreenfieldSigner;
+
+impl GreenfieldSigner {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_impl(
+        coin: &dyn CoinContext,
+        mut input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let key_pair = secp256k1::KeyPair::try_from(input.private_key.as_ref())?;
+        let public_key = key_pair.public().compressed().to_vec();
+
+        // Set the public key. It will be used to construct a signer info.
+        input.public_key = Cow::from(public_key.clone());
+        let unsigned_tx = TxBuilder::unsigned_tx_from_proto(coin, &input)?;
+
+        let Eip712TxPreimage { tx_hash, .. } = Eip712Signer::preimage_hash(&unsigned_tx)?;
+        // Get the standard secp256k1 signature. It will be EIP155 protected at the `GreenfieldCompiler::compile_impl`.
+        let signature = key_pair.sign(tx_hash)?;
+
+        let signatures = vec![signature.to_vec()];
+        let public_keys = vec![public_key];
+
+        GreenfieldCompiler::compile_impl(coin, input, signatures, public_keys)
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/transaction/message/mod.rs b/rust/chains/tw_greenfield/src/transaction/message/mod.rs
new file mode 100644
index 00000000000..7921931c696
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/transaction/message/mod.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::eip712_types::MsgPropertyType;
+use tw_cosmos_sdk::transaction::message::{CosmosMessage, CosmosMessageBox};
+use tw_evm::message::eip712::message_types::MessageTypesBuilder;
+
+pub mod send_order;
+pub mod transfer_out;
+pub mod type_msg_amount;
+
+pub type GreenfieldMessageBox = Box<dyn GreenfieldMessage>;
+
+pub trait GreenfieldMessage: CosmosMessage {
+    fn eip712_type(&self, msg_idx: usize) -> String {
+        MsgPropertyType(msg_idx).to_string()
+    }
+
+    fn declare_eip712_type(&self, msg_idx: usize, message_types: &mut MessageTypesBuilder);
+
+    fn to_cosmos_message(&self) -> CosmosMessageBox;
+}
diff --git a/rust/chains/tw_greenfield/src/transaction/message/send_order.rs b/rust/chains/tw_greenfield/src/transaction/message/send_order.rs
new file mode 100644
index 00000000000..7733629ba9d
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/transaction/message/send_order.rs
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::GreenfieldAddress;
+use crate::transaction::message::type_msg_amount::TypeMsgAmount;
+use crate::transaction::message::GreenfieldMessage;
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::proto::cosmos as CosmosProto;
+use tw_cosmos_sdk::transaction::message::cosmos_bank_message::SendMessage;
+use tw_cosmos_sdk::transaction::message::{
+    message_to_json, CosmosMessage, CosmosMessageBox, JsonMessage, ProtobufMessage,
+};
+use tw_evm::abi::param_type::constructor::TypeConstructor;
+use tw_evm::message::eip712::message_types::MessageTypesBuilder;
+use tw_evm::message::eip712::property::PropertyType;
+use tw_proto::type_url;
+
+/// cosmos.bank.v1beta1.MsgSend
+///
+/// # EIP712 custom types
+///
+/// ```json
+/// {
+///     "TypeMsg<IDX>Amount": [
+///         {
+///             "name": "amount",
+///             "type": "string"
+///         },
+///         {
+///             "name": "denom",
+///             "type": "string"
+///         }
+///     ],
+///     "Msg<IDX>": [
+///         {
+///             "name": "amount",
+///             "type": "TypeMsg<IDX>Amount[]"
+///         },
+///         {
+///             "name": "from_address",
+///             "type": "string"
+///         },
+///         {
+///             "name": "to_address",
+///             "type": "string"
+///         },
+///         {
+///             "name": "type",
+///             "type": "string"
+///         }
+///     ]
+/// }
+/// ```
+#[derive(Clone)]
+pub struct GreenfieldSendMessage(pub SendMessage<GreenfieldAddress>);
+
+impl CosmosMessage for GreenfieldSendMessage {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        self.0.to_proto()
+    }
+
+    /// [`GreenfieldSendMessage::to_json`] implementation differs from the original [`SendMessage::to_json`]:
+    /// * [`JsonMessage::msg_type`] should be "cosmos.bank.v1beta1.MsgSend" if other is not specified.
+    /// * [`JsonMessage::value`] is the same.
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        let msg_type = self
+            .0
+            .custom_type_prefix
+            .clone()
+            .unwrap_or_else(type_url::<CosmosProto::bank::v1beta1::MsgSend>);
+        message_to_json(&msg_type, &self.0)
+    }
+}
+
+impl GreenfieldMessage for GreenfieldSendMessage {
+    fn declare_eip712_type(&self, msg_idx: usize, message_types: &mut MessageTypesBuilder) {
+        let this_msg_type_name = self.eip712_type(msg_idx);
+
+        TypeMsgAmount::declare_eip712_type(msg_idx, message_types);
+
+        if let Some(mut builder) = message_types.add_custom_type(this_msg_type_name) {
+            let amount_msg_type = PropertyType::Custom(TypeMsgAmount::eip712_type(msg_idx));
+            builder
+                .add_property("amount", PropertyType::array(amount_msg_type))
+                .add_property("from_address", PropertyType::String)
+                .add_property("to_address", PropertyType::String)
+                .add_property("type", PropertyType::String);
+        }
+    }
+
+    fn to_cosmos_message(&self) -> CosmosMessageBox {
+        Box::new(self.clone())
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/transaction/message/transfer_out.rs b/rust/chains/tw_greenfield/src/transaction/message/transfer_out.rs
new file mode 100644
index 00000000000..00a01116db5
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/transaction/message/transfer_out.rs
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::GreenfieldAddress;
+use crate::transaction::message::type_msg_amount::TypeMsgAmount;
+use crate::transaction::message::GreenfieldMessage;
+use serde::Serialize;
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::modules::serializer::protobuf_serializer::build_coin;
+use tw_cosmos_sdk::proto::greenfield as GreenfieldProto;
+use tw_cosmos_sdk::transaction::message::{
+    message_to_json, CosmosMessage, CosmosMessageBox, JsonMessage, ProtobufMessage,
+};
+use tw_cosmos_sdk::transaction::Coin;
+use tw_evm::message::eip712::message_types::MessageTypesBuilder;
+use tw_evm::message::eip712::property::PropertyType;
+use tw_proto::{to_any, type_url};
+
+/// greenfield.bridge.MsgTransferOut
+///
+/// # EIP712 custom types
+///
+/// ```json
+/// {
+///     "TypeMsg<IDX>Amount": [
+///         {
+///             "name": "amount",
+///             "type": "string"
+///         },
+///         {
+///             "name": "denom",
+///             "type": "string"
+///         }
+///     ],
+///     "Msg<IDX>": [
+///         {
+///             "name": "amount",
+///             "type": "TypeMsg<IDX>Amount"
+///         },
+///         {
+///             "name": "from",
+///             "type": "string"
+///         },
+///         {
+///             "name": "to",
+///             "type": "string"
+///         },
+///         {
+///             "name": "type",
+///             "type": "string"
+///         }
+///     ]
+/// }
+/// ```
+#[derive(Clone, Serialize)]
+pub struct GreenfieldTransferOut {
+    #[serde(skip)]
+    pub custom_type_prefix: Option<String>,
+    pub amount: Coin,
+    pub from: GreenfieldAddress,
+    pub to: GreenfieldAddress,
+}
+
+impl CosmosMessage for GreenfieldTransferOut {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let msg = GreenfieldProto::bridge::MsgTransferOut {
+            from: self.from.to_string(),
+            to: self.to.to_string(),
+            amount: Some(build_coin(&self.amount)),
+        };
+        Ok(to_any(&msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        let msg_type = self
+            .custom_type_prefix
+            .clone()
+            .unwrap_or_else(type_url::<GreenfieldProto::bridge::MsgTransferOut>);
+        message_to_json(&msg_type, self)
+    }
+}
+
+impl GreenfieldMessage for GreenfieldTransferOut {
+    fn declare_eip712_type(&self, msg_idx: usize, message_types: &mut MessageTypesBuilder) {
+        let this_msg_type_name = self.eip712_type(msg_idx);
+
+        TypeMsgAmount::declare_eip712_type(msg_idx, message_types);
+
+        if let Some(mut builder) = message_types.add_custom_type(this_msg_type_name) {
+            let amount_msg_type = PropertyType::Custom(TypeMsgAmount::eip712_type(msg_idx));
+            builder
+                .add_property("amount", amount_msg_type)
+                .add_property("from", PropertyType::String)
+                .add_property("to", PropertyType::String)
+                .add_property("type", PropertyType::String);
+        }
+    }
+
+    fn to_cosmos_message(&self) -> CosmosMessageBox {
+        Box::new(self.clone())
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/transaction/message/type_msg_amount.rs b/rust/chains/tw_greenfield/src/transaction/message/type_msg_amount.rs
new file mode 100644
index 00000000000..e635367220b
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/transaction/message/type_msg_amount.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_evm::message::eip712::message_types::MessageTypesBuilder;
+use tw_evm::message::eip712::property::PropertyType;
+
+/// Represents an amount type that belongs to a particular order.
+pub struct TypeMsgAmount;
+
+impl TypeMsgAmount {
+    pub fn eip712_type(msg_idx: usize) -> String {
+        format!("TypeMsg{msg_idx}Amount")
+    }
+
+    pub fn declare_eip712_type(msg_idx: usize, message_types: &mut MessageTypesBuilder) {
+        let type_msg_amount_type = Self::eip712_type(msg_idx);
+        if let Some(mut builder) = message_types.add_custom_type(type_msg_amount_type) {
+            builder.add_property("amount", PropertyType::String);
+            builder.add_property("denom", PropertyType::String);
+        }
+    }
+}
diff --git a/rust/chains/tw_greenfield/src/transaction/mod.rs b/rust/chains/tw_greenfield/src/transaction/mod.rs
new file mode 100644
index 00000000000..80f08f72da3
--- /dev/null
+++ b/rust/chains/tw_greenfield/src/transaction/mod.rs
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::GreenfieldAddress;
+use crate::context::GreenfieldContext;
+use crate::public_key::GreenfieldPublicKey;
+use crate::signature::GreenfieldSignature;
+use crate::transaction::message::GreenfieldMessageBox;
+use tw_cosmos_sdk::transaction::{
+    Fee, SignMode, SignedTransaction, SignerInfo, TxBody, UnsignedTransaction,
+};
+use tw_misc::traits::ToBytesVec;
+use tw_number::U256;
+
+pub type GreenfieldSignerInfo = SignerInfo<GreenfieldPublicKey>;
+pub type GreenfieldFee = Fee<GreenfieldAddress>;
+pub type GreenfieldSignedTransaction = SignedTransaction<GreenfieldContext>;
+
+pub mod message;
+
+pub enum GreenfieldSignMode {
+    Eip712,
+}
+
+impl From<GreenfieldSignMode> for SignMode {
+    fn from(mode: GreenfieldSignMode) -> Self {
+        use tw_cosmos_sdk::proto::cosmos::signing::v1beta1 as signing_proto;
+
+        match mode {
+            GreenfieldSignMode::Eip712 => {
+                SignMode::Other(signing_proto::SignMode::SIGN_MODE_EIP_712 as i32)
+            },
+        }
+    }
+}
+
+pub struct GreenfieldTxBody {
+    pub messages: Vec<GreenfieldMessageBox>,
+    pub memo: String,
+    pub timeout_height: u64,
+}
+
+impl GreenfieldTxBody {
+    fn into_cosmos_tx_body(self) -> TxBody {
+        TxBody {
+            messages: self
+                .messages
+                .into_iter()
+                .map(|greenfield_msg| greenfield_msg.to_cosmos_message())
+                .collect(),
+            memo: self.memo,
+            timeout_height: self.timeout_height,
+        }
+    }
+}
+
+pub struct GreenfieldUnsignedTransaction {
+    pub signer: GreenfieldSignerInfo,
+    pub fee: GreenfieldFee,
+    pub cosmos_chain_id: String,
+    pub eth_chain_id: U256,
+    pub account_number: u64,
+    pub tx_body: GreenfieldTxBody,
+}
+
+impl GreenfieldUnsignedTransaction {
+    pub fn into_signed(self, signature: GreenfieldSignature) -> GreenfieldSignedTransaction {
+        self.into_cosmos_unsigned().into_signed(signature.to_vec())
+    }
+
+    fn into_cosmos_unsigned(self) -> UnsignedTransaction<GreenfieldContext> {
+        UnsignedTransaction {
+            signer: self.signer,
+            fee: self.fee,
+            chain_id: self.cosmos_chain_id,
+            account_number: self.account_number,
+            tx_body: self.tx_body.into_cosmos_tx_body(),
+        }
+    }
+}
diff --git a/rust/chains/tw_greenfield/tests/data/send_order_eip712.json b/rust/chains/tw_greenfield/tests/data/send_order_eip712.json
new file mode 100644
index 00000000000..01f861be82b
--- /dev/null
+++ b/rust/chains/tw_greenfield/tests/data/send_order_eip712.json
@@ -0,0 +1,149 @@
+{
+    "types": {
+        "Coin": [
+            {
+                "name": "amount",
+                "type": "uint256"
+            },
+            {
+                "name": "denom",
+                "type": "string"
+            }
+        ],
+        "EIP712Domain": [
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "salt",
+                "type": "string"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            }
+        ],
+        "Fee": [
+            {
+                "name": "amount",
+                "type": "Coin[]"
+            },
+            {
+                "name": "gas_limit",
+                "type": "uint256"
+            },
+            {
+                "name": "granter",
+                "type": "string"
+            },
+            {
+                "name": "payer",
+                "type": "string"
+            }
+        ],
+        "Msg1": [
+            {
+                "name": "amount",
+                "type": "TypeMsg1Amount[]"
+            },
+            {
+                "name": "from_address",
+                "type": "string"
+            },
+            {
+                "name": "to_address",
+                "type": "string"
+            },
+            {
+                "name": "type",
+                "type": "string"
+            }
+        ],
+        "Tx": [
+            {
+                "name": "account_number",
+                "type": "uint256"
+            },
+            {
+                "name": "chain_id",
+                "type": "uint256"
+            },
+            {
+                "name": "fee",
+                "type": "Fee"
+            },
+            {
+                "name": "memo",
+                "type": "string"
+            },
+            {
+                "name": "msg1",
+                "type": "Msg1"
+            },
+            {
+                "name": "sequence",
+                "type": "uint256"
+            },
+            {
+                "name": "timeout_height",
+                "type": "uint256"
+            }
+        ],
+        "TypeMsg1Amount": [
+            {
+                "name": "amount",
+                "type": "string"
+            },
+            {
+                "name": "denom",
+                "type": "string"
+            }
+        ]
+    },
+    "primaryType": "Tx",
+    "domain": {
+        "name": "Greenfield Tx",
+        "version": "1.0.0",
+        "chainId": "5600",
+        "verifyingContract": "greenfield",
+        "salt": "0"
+    },
+    "message": {
+        "account_number": "15560",
+        "chain_id": "5600",
+        "fee": {
+            "amount": [
+                {
+                    "amount": "2000000000000000",
+                    "denom": "BNB"
+                }
+            ],
+            "gas_limit": "200000",
+            "granter": "",
+            "payer": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1"
+        },
+        "memo": "",
+        "msg1": {
+            "amount": [
+                {
+                    "amount": "1000000000000000",
+                    "denom": "BNB"
+                }
+            ],
+            "from_address": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1",
+            "to_address": "0x280b27f3676db1C4475EE10F75D510Eb527fd155",
+            "type": "/cosmos.bank.v1beta1.MsgSend"
+        },
+        "sequence": "2",
+        "timeout_height": "0"
+    }
+}
diff --git a/rust/chains/tw_greenfield/tests/data/transfer_out_eip712.json b/rust/chains/tw_greenfield/tests/data/transfer_out_eip712.json
new file mode 100644
index 00000000000..c17ecd1bea2
--- /dev/null
+++ b/rust/chains/tw_greenfield/tests/data/transfer_out_eip712.json
@@ -0,0 +1,147 @@
+{
+    "types": {
+        "Coin": [
+            {
+                "name": "amount",
+                "type": "uint256"
+            },
+            {
+                "name": "denom",
+                "type": "string"
+            }
+        ],
+        "EIP712Domain": [
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "salt",
+                "type": "string"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            }
+        ],
+        "Fee": [
+            {
+                "name": "amount",
+                "type": "Coin[]"
+            },
+            {
+                "name": "gas_limit",
+                "type": "uint256"
+            },
+            {
+                "name": "granter",
+                "type": "string"
+            },
+            {
+                "name": "payer",
+                "type": "string"
+            }
+        ],
+        "Msg1": [
+            {
+                "name": "amount",
+                "type": "TypeMsg1Amount"
+            },
+            {
+                "name": "from",
+                "type": "string"
+            },
+            {
+                "name": "to",
+                "type": "string"
+            },
+            {
+                "name": "type",
+                "type": "string"
+            }
+        ],
+        "Tx": [
+            {
+                "name": "account_number",
+                "type": "uint256"
+            },
+            {
+                "name": "chain_id",
+                "type": "uint256"
+            },
+            {
+                "name": "fee",
+                "type": "Fee"
+            },
+            {
+                "name": "memo",
+                "type": "string"
+            },
+            {
+                "name": "msg1",
+                "type": "Msg1"
+            },
+            {
+                "name": "sequence",
+                "type": "uint256"
+            },
+            {
+                "name": "timeout_height",
+                "type": "uint256"
+            }
+        ],
+        "TypeMsg1Amount": [
+            {
+                "name": "amount",
+                "type": "string"
+            },
+            {
+                "name": "denom",
+                "type": "string"
+            }
+        ]
+    },
+    "primaryType": "Tx",
+    "domain": {
+        "name": "Greenfield Tx",
+        "version": "1.0.0",
+        "chainId": "5600",
+        "verifyingContract": "greenfield",
+        "salt": "0"
+    },
+    "message": {
+        "account_number": "15560",
+        "chain_id": "5600",
+        "fee": {
+            "amount": [
+                {
+                    "amount": "2000000000000000",
+                    "denom": "BNB"
+                }
+            ],
+            "gas_limit": "200000",
+            "granter": "",
+            "payer": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1"
+        },
+        "memo": "",
+        "msg1": {
+            "amount": {
+                "amount": "1000000000000000",
+                "denom": "BNB"
+            },
+            "from": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1",
+            "to": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1",
+            "type": "/greenfield.bridge.MsgTransferOut"
+        },
+        "sequence": "2",
+        "timeout_height": "0"
+    }
+}
\ No newline at end of file
diff --git a/rust/chains/tw_greenfield/tests/eip712_signer.rs b/rust/chains/tw_greenfield/tests/eip712_signer.rs
new file mode 100644
index 00000000000..e20ab3b48fb
--- /dev/null
+++ b/rust/chains/tw_greenfield/tests/eip712_signer.rs
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_greenfield::modules::eip712_signer::{Eip712Signer, Eip712TxPreimage};
+use tw_greenfield::modules::tx_builder::TxBuilder;
+use tw_misc::assert_eq_json;
+use tw_proto::Greenfield::Proto;
+use Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+const SEND_ORDER_EIP712: &str = include_str!("data/send_order_eip712.json");
+const TRANSFER_OUT_EIP712: &str = include_str!("data/transfer_out_eip712.json");
+
+const PUBLIC_KEY_15560: &str = "0279ef34064da10db0463c70480616ba020703ec3a45026def7bebd2082f5d6fc8";
+
+fn make_amount<'a>(denom: &'a str, amount: &'a str) -> Proto::Amount<'a> {
+    Proto::Amount {
+        denom: denom.into(),
+        amount: amount.into(),
+    }
+}
+
+/// Testnet transaction:
+/// https://greenfieldscan.com/tx/0x9f895cf2dd64fb1f428cefcf2a6585a813c3540fc9fe1ef42db1da2cb1df55ab
+#[test]
+fn test_eip712_signer_encode_send() {
+    let coin = TestCoinContext::default();
+
+    let send_order = Proto::mod_Message::Send {
+        from_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        to_address: "0x280b27f3676db1C4475EE10F75D510Eb527fd155".into(),
+        amounts: vec![make_amount("BNB", "1000000000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 15560,
+        eth_chain_id: "5600".into(),
+        cosmos_chain_id: "greenfield_5600-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "2000000000000000")],
+            gas: 200000,
+        }),
+        sequence: 2,
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::send_coins_message(send_order),
+        }],
+        public_key: PUBLIC_KEY_15560.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let unsigned_tx = TxBuilder::unsigned_tx_from_proto(&coin, &input)
+        .expect("Error on generating an unsigned transaction");
+
+    let Eip712TxPreimage { eip712_tx, tx_hash } =
+        Eip712Signer::preimage_hash(&unsigned_tx).expect("Error on TX preimage");
+
+    assert_eq_json!(eip712_tx, SEND_ORDER_EIP712);
+    assert_eq!(
+        tx_hash.to_hex(),
+        "b8c62654582ca96b37ca94966199682bf70ed934e740d2f874ff54675a0ac344"
+    );
+}
+
+#[test]
+fn test_eip712_signer_encode_transfer_out() {
+    let coin = TestCoinContext::default();
+
+    let send_order = Proto::mod_Message::BridgeTransferOut {
+        from_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        to_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        amount: Some(make_amount("BNB", "1000000000000000")),
+        ..Proto::mod_Message::BridgeTransferOut::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 15560,
+        eth_chain_id: "5600".into(),
+        cosmos_chain_id: "greenfield_5600-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "2000000000000000")],
+            gas: 200000,
+        }),
+        sequence: 2,
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::bridge_transfer_out(send_order),
+        }],
+        public_key: PUBLIC_KEY_15560.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let unsigned_tx = TxBuilder::unsigned_tx_from_proto(&coin, &input)
+        .expect("Error on generating an unsigned transaction");
+
+    let Eip712TxPreimage { eip712_tx, tx_hash } =
+        Eip712Signer::preimage_hash(&unsigned_tx).expect("Error on TX preimage");
+
+    assert_eq_json!(eip712_tx, TRANSFER_OUT_EIP712);
+    assert_eq!(
+        tx_hash.to_hex(),
+        "ea7731461041f5f652ab424bb767c670e484cfe1f4a85179deba8a6596873af4"
+    );
+}
diff --git a/rust/chains/tw_internet_computer/Cargo.toml b/rust/chains/tw_internet_computer/Cargo.toml
new file mode 100644
index 00000000000..fda55e71f69
--- /dev/null
+++ b/rust/chains/tw_internet_computer/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "tw_internet_computer"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+quick-protobuf = "0.8.1"
+serde = { version = "1.0", features = ["derive"] }
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
+
+[build-dependencies]
+pb-rs = "0.10.0"
diff --git a/rust/chains/tw_internet_computer/build.rs b/rust/chains/tw_internet_computer/build.rs
new file mode 100644
index 00000000000..1b8ee954b23
--- /dev/null
+++ b/rust/chains/tw_internet_computer/build.rs
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use pb_rs::types::FileDescriptor;
+use pb_rs::ConfigBuilder;
+use std::path::{Path, PathBuf};
+use std::{env, fs};
+
+fn main() {
+    let proto_ext = Some(Path::new("proto").as_os_str());
+
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()).join("proto");
+
+    let proto_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("src")
+        .join("transactions")
+        .join("proto");
+    let proto_dir_str = proto_dir.to_str().expect("Invalid proto directory path");
+    // Re-run this build.rs if the `proto` directory has been changed (i.e. a new file is added).
+    println!("cargo:rerun-if-changed={}", proto_dir_str);
+
+    let protos: Vec<_> = fs::read_dir(&proto_dir)
+        .expect("Expected a valid directory with proto files")
+        .filter_map(|file| {
+            let file = file.ok()?;
+            if file.path().extension() != proto_ext {
+                return None;
+            }
+
+            let path = file.path();
+            let path_str = path.to_str().expect("Invalid Proto file name");
+            println!("cargo:rerun-if-changed={}", path_str);
+            Some(path)
+        })
+        .collect();
+
+    // Delete all old generated files before re-generating new ones
+    if out_dir.exists() {
+        fs::remove_dir_all(&out_dir).expect("Error removing out directory");
+    }
+    fs::DirBuilder::new()
+        .create(&out_dir)
+        .expect("Error creating out directory");
+
+    let out_protos = ConfigBuilder::new(&protos, None, Some(&out_dir), &[proto_dir])
+        .expect("Error configuring pb-rs builder")
+        .dont_use_cow(true)
+        .owned(true)
+        .build();
+    FileDescriptor::run(&out_protos).expect("Error generating proto files");
+}
diff --git a/rust/chains/tw_internet_computer/fuzz/.gitignore b/rust/chains/tw_internet_computer/fuzz/.gitignore
new file mode 100644
index 00000000000..1a45eee7760
--- /dev/null
+++ b/rust/chains/tw_internet_computer/fuzz/.gitignore
@@ -0,0 +1,4 @@
+target
+corpus
+artifacts
+coverage
diff --git a/rust/chains/tw_internet_computer/fuzz/Cargo.lock b/rust/chains/tw_internet_computer/fuzz/Cargo.lock
new file mode 100644
index 00000000000..887d622e7ea
--- /dev/null
+++ b/rust/chains/tw_internet_computer/fuzz/Cargo.lock
@@ -0,0 +1,1595 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "ansi_term"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "arbitrary"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d098ff73c1ca148721f37baad5ea6a465a13f9573aba8641fbbbae8164a54e"
+dependencies = [
+ "derive_arbitrary",
+]
+
+[[package]]
+name = "ark-ff"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba"
+dependencies = [
+ "ark-ff-asm",
+ "ark-ff-macros",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+ "digest 0.10.7",
+ "itertools",
+ "num-bigint",
+ "num-traits",
+ "paste",
+ "rustc_version",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ff-asm"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ed4aa4fe255d0bc6d79373f7e31d2ea147bcf486cba1be5ba7ea85abdb92348"
+dependencies = [
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-ff-macros"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7abe79b0e4288889c4574159ab790824d0033b9fdcb2a112a3182fac2e514565"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "ark-serialize"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
+dependencies = [
+ "ark-std",
+ "digest 0.10.7",
+ "num-bigint",
+]
+
+[[package]]
+name = "ark-std"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
+dependencies = [
+ "num-traits",
+ "rand",
+]
+
+[[package]]
+name = "arrayvec"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+
+[[package]]
+name = "atty"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "base16ct"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"
+
+[[package]]
+name = "base64ct"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
+
+[[package]]
+name = "bigdecimal"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "serde",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "blake-hash"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94d1988118c887f61418940e322d574e8a2dd67165f1f1556eaae22e4019c6af"
+dependencies = [
+ "block-buffer 0.9.0",
+ "digest 0.9.0",
+ "ppv-lite86",
+]
+
+[[package]]
+name = "blake2"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a4e37d16930f5459780f5621038b6382b9bb37c19016f39fb6b5808d831f174"
+dependencies = [
+ "crypto-mac",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
+[[package]]
+name = "blake2b-ref"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "294d17c72e0ba59fad763caa112368d0672083779cdebbb97164f4bb4c1e339a"
+
+[[package]]
+name = "block-buffer"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4152116fd6e9dadb291ae18fc1ec3575ed6d84c29642d97890f4b4a3417297e4"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "bs58"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3"
+
+[[package]]
+name = "bumpalo"
+version = "3.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1"
+
+[[package]]
+name = "byte-slice-cast"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c"
+
+[[package]]
+name = "byteorder"
+version = "1.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
+
+[[package]]
+name = "cc"
+version = "1.0.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
+dependencies = [
+ "jobserver",
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "ciborium"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926"
+dependencies = [
+ "ciborium-io",
+ "ciborium-ll",
+ "serde",
+]
+
+[[package]]
+name = "ciborium-io"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656"
+
+[[package]]
+name = "ciborium-ll"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b"
+dependencies = [
+ "ciborium-io",
+ "half",
+]
+
+[[package]]
+name = "clap"
+version = "2.34.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
+dependencies = [
+ "ansi_term",
+ "atty",
+ "bitflags",
+ "strsim",
+ "textwrap",
+ "unicode-width",
+ "vec_map",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28c122c3980598d243d63d9a704629a2d748d101f278052ff068be5a4423ab6f"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crunchy"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
+
+[[package]]
+name = "crypto-bigint"
+version = "0.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "740fe28e594155f10cfc383984cbefd529d7396050557148f79cb0f621204124"
+dependencies = [
+ "generic-array",
+ "rand_core 0.6.4",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "crypto-mac"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
+dependencies = [
+ "generic-array",
+ "subtle",
+]
+
+[[package]]
+name = "curve25519-dalek"
+version = "3.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61"
+dependencies = [
+ "byteorder",
+ "digest 0.9.0",
+ "rand_core 0.5.1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308"
+
+[[package]]
+name = "der"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fffa369a668c8af7dbf8b5e56c9f744fbd399949ed171606040001947de40b1c"
+dependencies = [
+ "const-oid",
+ "zeroize",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_arbitrary"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53e0efad4403bfc52dc201159c4b842a246a14b98c64b55dfd0f2d89729dfeb8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.31",
+]
+
+[[package]]
+name = "digest"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer 0.10.4",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "ecdsa"
+version = "0.16.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4b1e0c257a9e9f25f90ff76d7a68360ed497ee519c8e428d1825ef0000799d4"
+dependencies = [
+ "der",
+ "digest 0.10.7",
+ "elliptic-curve",
+ "rfc6979",
+ "signature",
+ "spki",
+]
+
+[[package]]
+name = "either"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
+
+[[package]]
+name = "elliptic-curve"
+version = "0.13.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "968405c8fdc9b3bf4df0a6638858cc0b52462836ab6b1c87377785dd09cf1c0b"
+dependencies = [
+ "base16ct",
+ "crypto-bigint",
+ "digest 0.10.7",
+ "ff",
+ "generic-array",
+ "group",
+ "hkdf",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sec1",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36"
+dependencies = [
+ "atty",
+ "humantime",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
+
+[[package]]
+name = "ff"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
+dependencies = [
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "fixed-hash"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
+dependencies = [
+ "byteorder",
+ "rand",
+ "rustc-hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
+dependencies = [
+ "typenum",
+ "version_check",
+ "zeroize",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "groestl"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "343cfc165f92a988fd60292f7a0bfde4352a5a0beff9fbec29251ca4e9676e4d"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "group"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
+dependencies = [
+ "ff",
+ "rand_core 0.6.4",
+ "subtle",
+]
+
+[[package]]
+name = "half"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
+
+[[package]]
+name = "hashbrown"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
+
+[[package]]
+name = "hermit-abi"
+version = "0.1.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hkdf"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "791a029f6b9fc27657f6f188ec6e5e43f6911f6f878e0dc5501396e09809d437"
+dependencies = [
+ "hmac",
+]
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "humantime"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f"
+dependencies = [
+ "quick-error",
+]
+
+[[package]]
+name = "impl-codec"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba6a270039626615617f3f36d15fc827041df3b78c439da2cadfa47455a77f2f"
+dependencies = [
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "impl-trait-for-tuples"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11d7a9f6330b71fea57921c9b61c47ee6e84f72d394754eff6163ae67e7395eb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5477fe2230a79769d8dc68e0eabf5437907c0457a5614a9e8dddb67f65eb65d"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+
+[[package]]
+name = "jobserver"
+version = "0.1.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "936cfd212a0155903bcbc060e316fb6cc7cbf2e1907329391ebadc1fe0ce77c2"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
+dependencies = [
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "k256"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cadb76004ed8e97623117f3df85b17aaa6626ab0b0831e6573f104df16cd1bcc"
+dependencies = [
+ "cfg-if",
+ "ecdsa",
+ "elliptic-curve",
+ "once_cell",
+ "sha2 0.10.7",
+ "signature",
+]
+
+[[package]]
+name = "keccak"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f6d5ed8676d904364de097082f4e7d240b571b67989ced0240f08b7f966f940"
+dependencies = [
+ "cpufeatures",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
+[[package]]
+name = "libc"
+version = "0.2.147"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+
+[[package]]
+name = "libfuzzer-sys"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a96cfd5557eb82f2b83fed4955246c988d331975a002961b07c81584d107e7f7"
+dependencies = [
+ "arbitrary",
+ "cc",
+ "once_cell",
+]
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "memchr"
+version = "2.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+dependencies = [
+ "autocfg",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+
+[[package]]
+name = "opaque-debug"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
+
+[[package]]
+name = "p256"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c9863ad85fa8f4460f9c48cb909d38a0d689dba1f6f6988a5e3e0d31071bcd4b"
+dependencies = [
+ "ecdsa",
+ "elliptic-curve",
+ "primeorder",
+ "sha2 0.10.7",
+]
+
+[[package]]
+name = "parity-scale-codec"
+version = "3.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d640b40e81625f53b59f9c5812d3fb9e7ce11971d3fb34268eb7a83adf98051"
+dependencies = [
+ "arrayvec",
+ "bitvec",
+ "byte-slice-cast",
+ "impl-trait-for-tuples",
+ "parity-scale-codec-derive",
+ "serde",
+]
+
+[[package]]
+name = "parity-scale-codec-derive"
+version = "3.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ac464815d51fff2f64d690bf6ea4442d365e53495d50737685cfecfa3dd3f62"
+dependencies = [
+ "proc-macro-crate",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "paste"
+version = "1.0.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+
+[[package]]
+name = "pb-rs"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "354a34df9c65b596152598001c0fe3393379ec2db03ae30b9985659422e2607e"
+dependencies = [
+ "clap",
+ "env_logger",
+ "log",
+ "nom",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "spki",
+]
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+
+[[package]]
+name = "primeorder"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c2fcef82c0ec6eefcc179b978446c399b3cdf73c392c35604e399eee6df1ee3"
+dependencies = [
+ "elliptic-curve",
+]
+
+[[package]]
+name = "primitive-types"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f3486ccba82358b11a77516035647c34ba167dfa53312630de83b12bd4f3d66"
+dependencies = [
+ "fixed-hash",
+ "impl-codec",
+ "uint",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quick-error"
+version = "1.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+
+[[package]]
+name = "quick-protobuf"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d6da84cc204722a989e01ba2f6e1e276e190f22263d0cb6ce8526fcdb0d2e1f"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.33"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.10",
+]
+
+[[package]]
+name = "regex"
+version = "1.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
+
+[[package]]
+name = "rfc6979"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
+dependencies = [
+ "hmac",
+ "subtle",
+]
+
+[[package]]
+name = "ripemd"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd124222d17ad93a644ed9d011a40f4fb64aa54275c08cc216524a9ea82fb09f"
+dependencies = [
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "rustc-hex"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6"
+
+[[package]]
+name = "rustc_version"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+dependencies = [
+ "semver",
+]
+
+[[package]]
+name = "ryu"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+
+[[package]]
+name = "sec1"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3e97a565f76233a6003f9f5c54be1d9c5bdfa3eccfb189469f11ec4901c47dc"
+dependencies = [
+ "base16ct",
+ "der",
+ "generic-array",
+ "pkcs8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918"
+
+[[package]]
+name = "serde"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.188"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.31",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693151e1ac27563d6dbcec9dee9fbd5da8539b20fa14ad3752b2e6d363ace360"
+dependencies = [
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f04293dc80c3993519f2d7f6f511707ee7094fe0c6d3406feb330cdb3540eba3"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha2"
+version = "0.9.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800"
+dependencies = [
+ "block-buffer 0.9.0",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.9.0",
+ "opaque-debug",
+]
+
+[[package]]
+name = "sha2"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479fb9d862239e610720565ca91403019f2f00410f1864c5aa7479b950a76ed8"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
+[[package]]
+name = "sha3"
+version = "0.10.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75872d278a8f37ef87fa0ddbda7802605cb18344497949862c0d4dcb291eba60"
+dependencies = [
+ "digest 0.10.7",
+ "keccak",
+]
+
+[[package]]
+name = "signature"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e1788eed21689f9cf370582dfc467ef36ed9c707f073528ddafa8d83e3b8500"
+dependencies = [
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "spki"
+version = "0.7.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d1e996ef02c474957d681f1b05213dfb0abab947b446a62d37770b23500184a"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "starknet-crypto"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "693e6362f150f9276e429a910481fb7f3bcb8d6aa643743f587cfece0b374874"
+dependencies = [
+ "crypto-bigint",
+ "hex",
+ "hmac",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "rfc6979",
+ "sha2 0.10.7",
+ "starknet-crypto-codegen",
+ "starknet-curve 0.3.0",
+ "starknet-ff",
+ "zeroize",
+]
+
+[[package]]
+name = "starknet-crypto-codegen"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af6527b845423542c8a16e060ea1bc43f67229848e7cd4c4d80be994a84220ce"
+dependencies = [
+ "starknet-curve 0.4.0",
+ "starknet-ff",
+ "syn 2.0.31",
+]
+
+[[package]]
+name = "starknet-curve"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "252610baff59e4c4332ce3569f7469c5d3f9b415a2240d698fb238b2b4fc0942"
+dependencies = [
+ "starknet-ff",
+]
+
+[[package]]
+name = "starknet-curve"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a68a0d87ae56572abf83ddbfd44259a7c90dbeeee1629a1ffe223e7f9a8f3052"
+dependencies = [
+ "starknet-ff",
+]
+
+[[package]]
+name = "starknet-ff"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2cb1d9c0a50380cddab99cb202c6bfb3332728a2769bd0ca2ee80b0b390dd4"
+dependencies = [
+ "ark-ff",
+ "bigdecimal",
+ "crypto-bigint",
+ "getrandom 0.2.10",
+ "hex",
+ "serde",
+]
+
+[[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 = "subtle"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "718fa2415bcb8d8bd775917a1bf12a7931b6dfa890753378538118181e0cb398"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "termcolor"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "textwrap"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+dependencies = [
+ "unicode-width",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap",
+ "toml_datetime",
+ "winnow",
+]
+
+[[package]]
+name = "tw_coin_entry"
+version = "0.1.0"
+dependencies = [
+ "serde_json",
+ "tw_keypair",
+ "tw_memory",
+ "tw_misc",
+ "tw_number",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_encoding"
+version = "0.1.0"
+dependencies = [
+ "bs58",
+ "ciborium",
+ "data-encoding",
+ "hex",
+ "serde",
+ "tw_memory",
+]
+
+[[package]]
+name = "tw_hash"
+version = "0.1.0"
+dependencies = [
+ "blake-hash",
+ "blake2b-ref",
+ "digest 0.10.7",
+ "groestl",
+ "hmac",
+ "ripemd",
+ "serde",
+ "sha1",
+ "sha2 0.10.7",
+ "sha3",
+ "tw_encoding",
+ "tw_memory",
+ "zeroize",
+]
+
+[[package]]
+name = "tw_internet_computer"
+version = "0.1.0"
+dependencies = [
+ "pb-rs",
+ "quick-protobuf",
+ "serde",
+ "tw_coin_entry",
+ "tw_encoding",
+ "tw_hash",
+ "tw_keypair",
+ "tw_memory",
+ "tw_proto",
+]
+
+[[package]]
+name = "tw_internet_computer-fuzz"
+version = "0.0.0"
+dependencies = [
+ "libfuzzer-sys",
+ "tw_internet_computer",
+ "tw_keypair",
+]
+
+[[package]]
+name = "tw_keypair"
+version = "0.1.0"
+dependencies = [
+ "blake2",
+ "curve25519-dalek",
+ "der",
+ "digest 0.9.0",
+ "ecdsa",
+ "k256",
+ "lazy_static",
+ "p256",
+ "pkcs8",
+ "rfc6979",
+ "serde",
+ "sha2 0.9.9",
+ "starknet-crypto",
+ "starknet-ff",
+ "tw_encoding",
+ "tw_hash",
+ "tw_memory",
+ "tw_misc",
+ "zeroize",
+]
+
+[[package]]
+name = "tw_memory"
+version = "0.1.0"
+
+[[package]]
+name = "tw_misc"
+version = "0.1.0"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "tw_number"
+version = "0.1.0"
+dependencies = [
+ "primitive-types",
+ "tw_hash",
+ "tw_memory",
+]
+
+[[package]]
+name = "tw_proto"
+version = "0.1.0"
+dependencies = [
+ "pb-rs",
+ "quick-protobuf",
+ "tw_encoding",
+ "tw_memory",
+]
+
+[[package]]
+name = "typenum"
+version = "1.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497961ef93d974e23eb6f433eb5fe1b7930b659f06d12dec6fc44a8f554c0bba"
+
+[[package]]
+name = "uint"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f64bba2c53b04fcab63c01a7d7427eadc821e3bc48c34dc9ba29c501164b52"
+dependencies = [
+ "byteorder",
+ "crunchy",
+ "hex",
+ "static_assertions",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+
+[[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"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
+dependencies = [
+ "cfg-if",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
+dependencies = [
+ "bumpalo",
+ "log",
+ "once_cell",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.31",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.31",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.87"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178"
+dependencies = [
+ "winapi",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "winnow"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c2e3184b9c4e92ad5167ca73039d0c42476302ab603e2fec4487511f38ccefc"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
+dependencies = [
+ "zeroize_derive",
+]
+
+[[package]]
+name = "zeroize_derive"
+version = "1.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.31",
+]
diff --git a/rust/chains/tw_internet_computer/fuzz/Cargo.toml b/rust/chains/tw_internet_computer/fuzz/Cargo.toml
new file mode 100644
index 00000000000..a31848778a8
--- /dev/null
+++ b/rust/chains/tw_internet_computer/fuzz/Cargo.toml
@@ -0,0 +1,31 @@
+[package]
+name = "tw_internet_computer-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
+
+[dependencies.tw_internet_computer]
+path = ".."
+
+
+[dependencies.tw_keypair]
+path = "../../tw_keypair"
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "tw_internet_computer_transfer"
+path = "fuzz_targets/tw_internet_computer_transfer.rs"
+test = false
+doc = false
diff --git a/rust/chains/tw_internet_computer/fuzz/fuzz_targets/tw_internet_computer_transfer.rs b/rust/chains/tw_internet_computer/fuzz/fuzz_targets/tw_internet_computer_transfer.rs
new file mode 100644
index 00000000000..568b15610b2
--- /dev/null
+++ b/rust/chains/tw_internet_computer/fuzz/fuzz_targets/tw_internet_computer_transfer.rs
@@ -0,0 +1,71 @@
+#![no_main]
+
+use libfuzzer_sys::{arbitrary, fuzz_target};
+use tw_internet_computer::{
+    address::AccountIdentifier,
+    protocol::principal::Principal,
+    transactions::transfer::{transfer, TransferArgs},
+};
+use tw_keypair::ecdsa::secp256k1;
+
+#[derive(Debug, arbitrary::Arbitrary)]
+struct ArbitraryTransferArgs {
+    memo: u64,
+    amount: u64,
+    max_fee: Option<u64>,
+    #[arbitrary(with = arbitrary_to_field)]
+    to: String,
+    current_timestamp_nanos: u64,
+    permitted_drift: Option<u64>,
+}
+
+fn arbitrary_to_field(u: &mut arbitrary::Unstructured) -> arbitrary::Result<String> {
+    let mut buf = [0; 29];
+    u.fill_buffer(&mut buf)?;
+    let principal = Principal::from_slice(&buf);
+    let account_identifier = AccountIdentifier::new(&principal);
+    Ok(account_identifier.to_hex())
+}
+
+impl From<&ArbitraryTransferArgs> for TransferArgs {
+    fn from(prev: &ArbitraryTransferArgs) -> TransferArgs {
+        TransferArgs {
+            memo: prev.memo,
+            amount: prev.amount,
+            max_fee: prev.max_fee,
+            to: prev.to.clone(),
+            current_timestamp_nanos: prev.current_timestamp_nanos,
+        }
+    }
+}
+
+#[derive(Debug, arbitrary::Arbitrary)]
+struct TWInternetComputerTransactionsTransferInput {
+    #[arbitrary(with = arbitrary_private_key)]
+    private: Vec<u8>,
+    #[arbitrary(with = arbitrary_canister_id)]
+    canister_id: Principal,
+    args: ArbitraryTransferArgs,
+}
+
+fn arbitrary_private_key(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Vec<u8>> {
+    let mut buf = [0; 32];
+    u.fill_buffer(&mut buf)?;
+    Ok(Vec::from(buf.as_slice()))
+}
+
+fn arbitrary_canister_id(u: &mut arbitrary::Unstructured) -> arbitrary::Result<Principal> {
+    let mut buf = [0; 29];
+    u.fill_buffer(&mut buf)?;
+    let principal = Principal::from_slice(&buf);
+    Ok(principal)
+}
+
+fuzz_target!(|input: TWInternetComputerTransactionsTransferInput| {
+    let Ok(private_key) = secp256k1::PrivateKey::try_from(input.private.as_slice()) else {
+        return;
+    };
+
+    let args = TransferArgs::from(&input.args);
+    transfer(private_key, input.canister_id, args).ok();
+});
diff --git a/rust/chains/tw_internet_computer/src/address.rs b/rust/chains/tw_internet_computer/src/address.rs
new file mode 100644
index 00000000000..e439b573a9d
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/address.rs
@@ -0,0 +1,181 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::{coin_entry::CoinAddress, error::prelude::*};
+use tw_encoding::hex;
+use tw_hash::{crc32::crc32, sha2::sha224, H256};
+use tw_keypair::ecdsa::secp256k1::PublicKey;
+
+use crate::protocol::principal::Principal;
+
+pub trait IcpAddress: std::str::FromStr<Err = AddressError> + Into<AccountIdentifier> {
+    fn from_str_optional(s: &str) -> AddressResult<Option<Self>> {
+        if s.is_empty() {
+            return Ok(None);
+        }
+
+        Self::from_str(s).map(Some)
+    }
+}
+
+/// The ICP ledger keeps track of accounts using account identifiers.
+/// An account identifier is created by `SHA-224` hashing:
+/// * \x0Aaccount-id
+/// * the owner's principal ID
+/// * subaccount (32-bytes)
+///
+/// Then,
+/// * CRC32 the SHA-224 hash
+/// * Prepend the CRC32 to the SHA-224.
+///
+/// https://internetcomputer.org/docs/current/references/ledger/#_accounts
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct AccountIdentifier {
+    bytes: H256,
+}
+
+impl AccountIdentifier {
+    /// Create a default account identifier from the given principal owner.
+    pub fn new(owner: &Principal) -> Self {
+        let mut input = vec![];
+        input.extend_from_slice(b"\x0Aaccount-id");
+        input.extend_from_slice(owner.as_slice());
+        input.extend_from_slice(&H256::new()[..]);
+
+        let hash = sha224(&input);
+        let crc32_bytes = crc32(&hash).to_be_bytes();
+
+        let mut bytes = H256::new();
+        bytes[0..4].copy_from_slice(&crc32_bytes);
+        bytes[4..32].copy_from_slice(&hash);
+        Self { bytes }
+    }
+
+    /// Return the textual-encoded account identifier.
+    pub fn to_hex(&self) -> String {
+        hex::encode(self.bytes, false)
+    }
+
+    /// Instantiate an account identifier from a hex-encoded string.
+    pub fn from_hex(hex_str: &str) -> AddressResult<Self> {
+        if hex_str.len() != 64 {
+            return Err(AddressError::FromHexError);
+        }
+
+        let hex = H256::try_from(
+            hex::decode(hex_str)
+                .map_err(|_| AddressError::FromHexError)?
+                .as_slice(),
+        )
+        .map_err(|_| AddressError::FromHexError)?;
+
+        if !is_check_sum_valid(hex) {
+            return Err(AddressError::FromHexError);
+        }
+
+        Ok(Self { bytes: hex })
+    }
+}
+
+impl From<&PublicKey> for AccountIdentifier {
+    /// Takes a Secp256k1 public key, DER-encodes the public key,
+    /// and creates a principal from the encoding.
+    fn from(public_key: &PublicKey) -> Self {
+        let principal = Principal::from(public_key);
+        AccountIdentifier::new(&principal)
+    }
+}
+
+impl std::str::FromStr for AccountIdentifier {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        AccountIdentifier::from_hex(s).map_err(|_| AddressError::FromHexError)
+    }
+}
+
+impl std::fmt::Display for AccountIdentifier {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.to_hex())
+    }
+}
+
+impl CoinAddress for AccountIdentifier {
+    fn data(&self) -> tw_memory::Data {
+        self.bytes.into_vec()
+    }
+}
+
+impl IcpAddress for AccountIdentifier {}
+
+impl AsRef<[u8]> for AccountIdentifier {
+    fn as_ref(&self) -> &[u8] {
+        self.bytes.as_slice()
+    }
+}
+
+fn is_check_sum_valid(hash: H256) -> bool {
+    let found_checksum = &hash[0..4];
+    let expected_checksum = crc32(&hash[4..]).to_be_bytes();
+    found_checksum == expected_checksum
+}
+
+#[cfg(test)]
+mod test {
+    use tw_keypair::ecdsa::secp256k1::PublicKey;
+
+    use super::*;
+
+    const VALID_ADDRESSES: [&str; 10] = [
+        "fb257577279ecac604d4780214af95aa6adc3a814f6f3d6d7ac844d1deca500a",
+        "e90c48d54847f4758f1d6b589a1db2500757a49a6722d4f775e050107b4b752d",
+        "a7c5baf393aed527ef6fb3869fbf84dd4e562edf9b04bd8f9bfbd6b8e6a22776",
+        "4cb2ca5cfcfa1d952f8cd7f0ec46c96e1023ab057b83a2c7ce236b9e71ccca0b",
+        "a93fff2708a6305e8946a0a06cbf559da01a758da58a615d404037b08ea96181",
+        "6e66c78a45cec01bcd0efd6dd142a82dc63b1a591c4ccb3c5877cd4d667747b4",
+        "c4ca697b46bb89ebf19eef3ad7b5e7bfa73315c0433a68a12a67f60fe017b9ad",
+        "7c513ec0de7347555b75cfefe29e56689de36636321fb0c8addf24a4f934ff0b",
+        "f61e15cdcaf0325bbaeb9a23a9f49d5447b33e6feee9763c2fdfe3a986142912",
+        "bb3357cba483f268d044d4bbd4639f82c16028a76eebdf62c51bc11fc918d278",
+    ];
+
+    const TOO_SHORT_ADDRESS: &str =
+        "3357cba483f268d044d4bbd4639f82c16028a76eebdf62c51bc11fc918d278b";
+    const TOO_LONG_ADDRESS: &str =
+        "3357cba483f268d044d4bbd4639f82c16028a76eebdf62c51bc11fc918d278bce";
+    const INVALID_CHECKSUM_ADDRESS: &str =
+        "553357cba483f268d044d4bbd4639f82c16028a76eebdf62c51bc11fc918d278";
+
+    const PUBLIC_KEY_HEX: &str = "048542e6fb4b17d6dfcac3948fe412c00d626728815ee7cc70509603f1bc92128a6e7548f3432d6248bc49ff44a1e50f6389238468d17f7d7024de5be9b181dbc8";
+
+    #[test]
+    fn from_hex() {
+        assert!(VALID_ADDRESSES
+            .iter()
+            .all(|s| AccountIdentifier::from_hex(s).is_ok()));
+
+        assert!(
+            AccountIdentifier::from_hex(TOO_SHORT_ADDRESS).is_err(),
+            "Address is too short"
+        );
+        assert!(
+            AccountIdentifier::from_hex(TOO_LONG_ADDRESS).is_err(),
+            "Address is too long"
+        );
+        assert!(
+            AccountIdentifier::from_hex(INVALID_CHECKSUM_ADDRESS).is_err(),
+            "Invalid checksum"
+        );
+    }
+
+    #[test]
+    fn from_public_key() {
+        let public_key = PublicKey::try_from(PUBLIC_KEY_HEX).expect("Failed to populate key");
+        let address = AccountIdentifier::from(&public_key);
+        assert_eq!(
+            address.to_hex(),
+            "2f25874478d06cf68b9833524a6390d0ba69c566b02f46626979a3d6a4153211"
+        );
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/context.rs b/rust/chains/tw_internet_computer/src/context.rs
new file mode 100644
index 00000000000..41cee32fb86
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/context.rs
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{
+    address::{AccountIdentifier, IcpAddress},
+    protocol::principal::Principal,
+};
+
+pub trait InternetComputerContext {
+    type Address: IcpAddress;
+
+    fn get_canister_id() -> Principal;
+}
+
+#[derive(Default)]
+pub struct StandardInternetComputerContext;
+
+impl InternetComputerContext for StandardInternetComputerContext {
+    type Address = AccountIdentifier;
+
+    fn get_canister_id() -> Principal {
+        // ICP Ledger Canister
+        Principal::from_text("ryjl3-tyaaa-aaaaa-aaaba-cai").unwrap()
+    }
+}
+
+#[cfg(test)]
+mod test {
+
+    use std::marker::PhantomData;
+
+    use tw_coin_entry::error::prelude::*;
+
+    use super::*;
+
+    const TEST_OWNER_PRINCIPAL_ID: &str =
+        "t4u4z-y3dur-j63pk-nw4rv-yxdbt-agtt6-nygn7-ywh6y-zm2f4-sdzle-3qe";
+    const TEST_TEXTUAL_ICP_ADDRESS: &str =
+        "943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a";
+    const TEXTUAL_ICP_LEDGER_CANISTER_ID: &str = "ryjl3-tyaaa-aaaaa-aaaba-cai";
+
+    pub struct ContextTest<Context: InternetComputerContext> {
+        _phantom: PhantomData<Context>,
+    }
+
+    impl<Context: InternetComputerContext> ContextTest<Context> {
+        fn get_canister_id() -> Principal {
+            Context::get_canister_id()
+        }
+
+        fn account_identifier_optional(s: &str) -> AddressResult<Option<Context::Address>> {
+            Context::Address::from_str_optional(s)
+        }
+    }
+
+    #[test]
+    fn standard_internet_computer_context_canister_address() {
+        let owner = Principal::from_text(TEST_OWNER_PRINCIPAL_ID).unwrap();
+        let expected_account_identifier = AccountIdentifier::new(&owner);
+        let account_identifier =
+            ContextTest::<StandardInternetComputerContext>::account_identifier_optional(
+                TEST_TEXTUAL_ICP_ADDRESS,
+            )
+            .unwrap()
+            .unwrap();
+        assert_eq!(expected_account_identifier, account_identifier);
+    }
+
+    #[test]
+    fn standard_internet_computer_context_canister_type() {
+        let ledger_canister_id = ContextTest::<StandardInternetComputerContext>::get_canister_id();
+        assert_eq!(ledger_canister_id.to_text(), TEXTUAL_ICP_LEDGER_CANISTER_ID);
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/entry.rs b/rust/chains/tw_internet_computer/src/entry.rs
new file mode 100644
index 00000000000..592b9edf052
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/entry.rs
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::transaction_util::NoTransactionUtil;
+use tw_coin_entry::{
+    coin_context::CoinContext,
+    coin_entry::CoinEntry,
+    error::prelude::*,
+    modules::{
+        json_signer::NoJsonSigner, message_signer::NoMessageSigner, plan_builder::NoPlanBuilder,
+        wallet_connector::NoWalletConnector,
+    },
+    prefix::NoPrefix,
+    signing_output_error,
+};
+use tw_proto::{
+    Common::Proto::SigningError as CommonError, InternetComputer::Proto,
+    TxCompiler::Proto as CompilerProto,
+};
+
+use crate::{address::AccountIdentifier, context::StandardInternetComputerContext, signer::Signer};
+
+pub struct InternetComputerEntry;
+
+impl CoinEntry for InternetComputerEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = AccountIdentifier;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = NoTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Self::Address::from_str(address)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Self::Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        _coin: &dyn tw_coin_entry::coin_context::CoinContext,
+        public_key: tw_keypair::tw::PublicKey,
+        _derivation: tw_coin_entry::derivation::Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let secp256k1_public_key = public_key
+            .to_secp256k1()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        Ok(Self::Address::from(secp256k1_public_key))
+    }
+
+    #[inline]
+    fn sign(
+        &self,
+        _coin: &dyn tw_coin_entry::coin_context::CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::SigningOutput {
+        Signer::<StandardInternetComputerContext>::sign_proto(input)
+    }
+
+    fn preimage_hashes(
+        &self,
+        _coin: &dyn tw_coin_entry::coin_context::CoinContext,
+        _input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        signing_output_error!(
+            CompilerProto::PreSigningOutput,
+            SigningError::new(CommonError::Error_not_supported)
+        )
+    }
+
+    fn compile(
+        &self,
+        _coin: &dyn tw_coin_entry::coin_context::CoinContext,
+        _input: Self::SigningInput<'_>,
+        _signatures: Vec<tw_coin_entry::coin_entry::SignatureBytes>,
+        _public_keys: Vec<tw_coin_entry::coin_entry::PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        signing_output_error!(
+            Proto::SigningOutput,
+            SigningError::new(CommonError::Error_not_supported)
+        )
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/lib.rs b/rust/chains/tw_internet_computer/src/lib.rs
new file mode 100644
index 00000000000..acef6a64209
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/lib.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod context;
+pub mod entry;
+pub mod protocol;
+pub mod signer;
+pub mod transactions;
diff --git a/rust/chains/tw_internet_computer/src/protocol/envelope.rs b/rust/chains/tw_internet_computer/src/protocol/envelope.rs
new file mode 100644
index 00000000000..c9627d53e1b
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/protocol/envelope.rs
@@ -0,0 +1,235 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::collections::BTreeMap;
+
+use serde::{Serialize, Serializer};
+
+use super::{
+    principal::Principal,
+    request_id::{hash_of_map, RawHttpRequestVal, RequestId},
+};
+
+pub trait RepresentationHashable {
+    fn request_id(&self) -> RequestId;
+}
+
+#[derive(Debug, Clone, Serialize)]
+pub struct Envelope<C: RepresentationHashable> {
+    pub content: C,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sender_pubkey: Option<Vec<u8>>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub sender_sig: Option<Vec<u8>>,
+}
+
+/// A replicated call to a canister method, whether update or query.
+#[derive(Debug, Clone, Serialize)]
+#[serde(tag = "request_type", rename = "call")]
+pub struct EnvelopeCallContent {
+    /// A random series of bytes to uniquely identify this message.
+    #[serde(
+        default,
+        skip_serializing_if = "Option::is_none",
+        serialize_with = "serialize_nonce"
+    )]
+    pub nonce: Option<Vec<u8>>,
+    /// A nanosecond timestamp after which this request is no longer valid.
+    pub ingress_expiry: u64,
+    /// The principal that is sending this request.
+    pub sender: Principal,
+    /// The ID of the canister to be called.
+    pub canister_id: Principal,
+    /// The name of the canister method to be called.
+    pub method_name: String,
+    /// The argument to pass to the canister method.
+    #[serde(serialize_with = "serialize_arg")]
+    pub arg: Vec<u8>,
+}
+
+impl RepresentationHashable for EnvelopeCallContent {
+    fn request_id(&self) -> RequestId {
+        let mut map = vec![
+            (
+                "request_type".to_string(),
+                RawHttpRequestVal::String("call".to_string()),
+            ),
+            (
+                "canister_id".to_string(),
+                RawHttpRequestVal::Bytes(self.canister_id.as_slice().to_vec()),
+            ),
+            (
+                "method_name".to_string(),
+                RawHttpRequestVal::String(self.method_name.to_string()),
+            ),
+            (
+                "arg".to_string(),
+                RawHttpRequestVal::Bytes(self.arg.clone()),
+            ),
+            (
+                "ingress_expiry".to_string(),
+                RawHttpRequestVal::U64(self.ingress_expiry),
+            ),
+            (
+                "sender".to_string(),
+                RawHttpRequestVal::Bytes(self.sender.as_slice().to_vec()),
+            ),
+        ]
+        .into_iter()
+        .collect::<BTreeMap<_, _>>();
+
+        if let Some(some_nonce) = &self.nonce {
+            map.insert(
+                "nonce".to_string(),
+                RawHttpRequestVal::Bytes(some_nonce.clone()),
+            );
+        }
+        RequestId(hash_of_map(&map))
+    }
+}
+
+/// A request for information from the [IC state tree](https://internetcomputer.org/docs/current/references/ic-interface-spec#state-tree).
+#[derive(Debug, Clone, Serialize)]
+#[serde(tag = "request_type", rename = "read_state")]
+pub struct EnvelopeReadStateContent {
+    /// A nanosecond timestamp after which this request is no longer valid.
+    pub ingress_expiry: u64,
+    /// The principal that is sending this request.
+    pub sender: Principal,
+    /// A list of paths within the state tree to fetch.
+    pub paths: Vec<Vec<Label>>,
+}
+
+impl RepresentationHashable for EnvelopeReadStateContent {
+    fn request_id(&self) -> RequestId {
+        let map = vec![
+            (
+                "request_type".to_string(),
+                RawHttpRequestVal::String("read_state".to_string()),
+            ),
+            (
+                "ingress_expiry".to_string(),
+                RawHttpRequestVal::U64(self.ingress_expiry),
+            ),
+            (
+                "paths".to_string(),
+                RawHttpRequestVal::Array(
+                    self.paths
+                        .iter()
+                        .map(|p| {
+                            RawHttpRequestVal::Array(
+                                p.iter()
+                                    .map(|b| RawHttpRequestVal::Bytes(b.as_slice().to_vec()))
+                                    .collect(),
+                            )
+                        })
+                        .collect(),
+                ),
+            ),
+            (
+                "sender".to_string(),
+                RawHttpRequestVal::Bytes(self.sender.as_slice().to_vec()),
+            ),
+        ]
+        .into_iter()
+        .collect::<BTreeMap<_, _>>();
+
+        RequestId(hash_of_map(&map))
+    }
+}
+
+fn serialize_arg<S>(arg: &[u8], s: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    s.serialize_bytes(arg)
+}
+
+fn serialize_nonce<S>(nonce: &Option<Vec<u8>>, s: S) -> Result<S::Ok, S::Error>
+where
+    S: Serializer,
+{
+    match nonce {
+        Some(nonce) => s.serialize_bytes(nonce),
+        None => s.serialize_none(),
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct Label(Vec<u8>);
+
+impl Label {
+    #[inline]
+    pub fn as_slice(&self) -> &[u8] {
+        self.0.as_slice()
+    }
+}
+
+impl From<&str> for Label {
+    fn from(value: &str) -> Self {
+        Label(value.as_bytes().to_vec())
+    }
+}
+
+impl From<RequestId> for Label {
+    fn from(value: RequestId) -> Self {
+        Label(value.0.as_slice().to_vec())
+    }
+}
+
+// Serialization
+impl serde::Serialize for Label {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        serializer.serialize_bytes(self.0.as_slice())
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use super::*;
+
+    #[test]
+    fn representation_independent_hash_call_or_query() {
+        let content = EnvelopeCallContent {
+            ingress_expiry: 1685570400000000000,
+            sender: Principal::anonymous(),
+            canister_id: Principal::from_slice(&[0, 0, 0, 0, 0, 0, 4, 210]),
+            method_name: "hello".to_string(),
+            arg: b"DIDL\x00\xFD*".to_vec(),
+            nonce: None,
+        };
+
+        assert_eq!(
+            tw_encoding::hex::encode(content.request_id().0, false),
+            "1d1091364d6bb8a6c16b203ee75467d59ead468f523eb058880ae8ec80e2b101"
+        );
+    }
+
+    #[test]
+    fn representation_independent_hash_read_state() {
+        let content = EnvelopeCallContent {
+            ingress_expiry: 1685570400000000000,
+            sender: Principal::anonymous(),
+            canister_id: Principal::from_slice(&[0, 0, 0, 0, 0, 0, 4, 210]),
+            method_name: "hello".to_string(),
+            arg: b"DIDL\x00\xFD*".to_vec(),
+            nonce: None,
+        };
+        let update_request_id = content.request_id();
+
+        let content = EnvelopeReadStateContent {
+            ingress_expiry: 1685570400000000000,
+            sender: Principal::anonymous(),
+            paths: vec![vec![
+                Label::from("request_status"),
+                Label::from(update_request_id),
+            ]],
+        };
+        let request_id = content.request_id();
+        assert_eq!(
+            tw_encoding::hex::encode(request_id.0, false),
+            "3cde0f14a953c3afbe1335f22e861bb62389f1449beca02707ab197e6829c2a3"
+        );
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/protocol/identity.rs b/rust/chains/tw_internet_computer/src/protocol/identity.rs
new file mode 100644
index 00000000000..b97e0308ec2
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/protocol/identity.rs
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_hash::H256;
+use tw_keypair::{ecdsa::secp256k1::PrivateKey, traits::SigningKeyTrait, KeyPairError};
+
+use super::principal::Principal;
+
+#[derive(Debug)]
+pub enum SigningError {
+    Failed(KeyPairError),
+}
+
+/// Contains the signature and the associated DER-encoded public key from a call to
+/// [Identity::sign].
+pub struct IdentitySignature {
+    pub signature: Vec<u8>,
+    pub public_key: Vec<u8>,
+}
+
+/// An identity is a simple way to abstract away signing for envelopes.
+/// When creating a request to the IC, the sender and signature are required
+/// for authentication purposes. The sender is derived from a DER-encode public key
+/// and the signature is created using the private key.
+pub struct Identity {
+    private_key: PrivateKey,
+    der_encoded_public_key: Vec<u8>,
+}
+
+impl Identity {
+    /// Gets the public key and DER-encodes it and returns an Identity.
+    pub fn new(private_key: PrivateKey) -> Self {
+        let public_key = private_key.public();
+        let der_encoded_public_key = public_key.der_encoded();
+
+        Self {
+            private_key,
+            der_encoded_public_key,
+        }
+    }
+
+    /// Returns the principal of the private key.
+    /// Sender represents who is sending the request.
+    pub fn sender(&self) -> Principal {
+        Principal::self_authenticating(&self.der_encoded_public_key)
+    }
+
+    /// Signs the given content with the private key.
+    /// The signatures are encoded as the concatenation of the 32-byte big endian
+    /// encodings of the two values r and s.
+    ///
+    /// See: https://internetcomputer.org/docs/current/references/ic-interface-spec#ecdsa
+    pub fn sign(&self, content: H256) -> Result<IdentitySignature, SigningError> {
+        let signature = self
+            .private_key
+            .sign(content)
+            .map_err(SigningError::Failed)?;
+
+        let r = signature.r();
+        let s = signature.s();
+        let mut bytes = [0u8; 64];
+        bytes[..32].clone_from_slice(r.as_slice());
+        bytes[32..].clone_from_slice(s.as_slice());
+
+        let signature = IdentitySignature {
+            public_key: self.der_encoded_public_key.clone(),
+            signature: bytes.to_vec(), //Signature bytes
+        };
+
+        Ok(signature)
+    }
+}
+
+#[cfg(test)]
+mod test {
+
+    use tw_encoding::hex;
+
+    use super::*;
+
+    /// Test that the sender is derived from the private key.
+    #[test]
+    fn sender() {
+        let private_key = PrivateKey::try_from(
+            "227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be",
+        )
+        .unwrap();
+        let identity = Identity::new(private_key);
+        let sender = identity.sender();
+        assert_eq!(
+            sender.to_text(),
+            "hpikg-6exdt-jn33w-ndty3-fc7jc-tl2lr-buih3-cs3y7-tftkp-sfp62-gqe"
+        )
+    }
+
+    /// Test signing with the identity.
+    #[test]
+    fn sign() {
+        let private_key = PrivateKey::try_from(
+            "227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be",
+        )
+        .unwrap();
+        let der_encoded_public_key = private_key.public().der_encoded();
+        let identity = Identity::new(private_key);
+        let content = H256::new();
+        let signature = identity.sign(content).unwrap();
+        assert_eq!(
+            hex::encode(signature.signature, false),
+            "17c0974ee2ae621099389a5e4d0f960925d2e0e23658df03069308fb8edcb7bb120a338ada3e2ede7f41f6ed2f424a8a4f2c8fb68260f27d4f1bf96d19094b9f"
+        );
+        assert_eq!(der_encoded_public_key, signature.public_key);
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/protocol/mod.rs b/rust/chains/tw_internet_computer/src/protocol/mod.rs
new file mode 100644
index 00000000000..5d1f0380c38
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/protocol/mod.rs
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod envelope;
+pub mod identity;
+pub mod principal;
+pub mod request_id;
+pub mod rosetta;
+
+use std::time::Duration;
+
+/// This constant defines the maximum amount of time an ingress message can wait
+/// to start executing after submission before it is expired.  Hence, if an
+/// ingress message is submitted at time `t` and it has not been scheduled for
+/// execution till time `t+MAX_INGRESS_TTL`, it will be expired.
+///
+/// At the time of writing, this constant is also used to control how long the
+/// status of a completed ingress message (IngressStatus ∈ [Completed, Failed])
+/// is maintained by the IC before it is deleted from the ingress history.
+const MAX_INGRESS_TTL: Duration = Duration::from_secs(5 * 60);
+
+/// An upper limit on the validity of the request, expressed in nanoseconds since 1970-01-01.
+pub fn get_ingress_expiry(
+    current_timestamp_duration: Duration,
+    permitted_drift_in_seconds: Option<u64>,
+) -> u64 {
+    let permitted_drift = permitted_drift_in_seconds
+        .map(Duration::from_secs)
+        .unwrap_or(Duration::from_secs(60));
+
+    current_timestamp_duration
+        .saturating_add(MAX_INGRESS_TTL)
+        .saturating_sub(permitted_drift)
+        .as_nanos() as u64
+}
diff --git a/rust/chains/tw_internet_computer/src/protocol/principal.rs b/rust/chains/tw_internet_computer/src/protocol/principal.rs
new file mode 100644
index 00000000000..905739a86b8
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/protocol/principal.rs
@@ -0,0 +1,254 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+/// Taken from candid crate and modified to rely upon built-in crc32 and SHA224 functionality.
+use std::fmt::Write;
+
+use tw_hash::{crc32::crc32, sha2::sha224};
+use tw_keypair::ecdsa::secp256k1::PublicKey;
+
+/// An error happened while encoding, decoding or serializing a [`Principal`].
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum PrincipalError {
+    BytesTooLong,
+    InvalidBase32,
+    TextTooShort,
+    TextTooLong,
+    CheckSequenceNotMatch,
+    AbnormalGrouped(Principal),
+}
+
+/// Generic ID on Internet Computer.
+///
+/// Principals are generic identifiers for canisters, users
+/// and possibly other concepts in the future.
+/// As far as most uses of the IC are concerned they are
+/// opaque binary blobs with a length between 0 and 29 bytes,
+/// and there is intentionally no mechanism to tell canister ids and user ids apart.
+///
+/// Note a principal is not necessarily tied with a public key-pair,
+/// yet we need at least a key-pair of a related principal to sign
+/// requests.
+///
+/// A Principal can be serialized to a byte array ([`Vec<u8>`]) or a text
+/// representation, but the inner structure of the byte representation
+/// is kept private.
+#[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash)]
+pub struct Principal {
+    /// Length.
+    len: u8,
+
+    /// The content buffer. When returning slices this should always be sized according to
+    /// `len`.
+    bytes: [u8; Self::MAX_LENGTH_IN_BYTES],
+}
+
+impl Principal {
+    const MAX_LENGTH_IN_BYTES: usize = 29;
+    const CRC_LENGTH_IN_BYTES: usize = 4;
+
+    const SELF_AUTHENTICATING_TAG: u8 = 2;
+    const ANONYMOUS_TAG: u8 = 4;
+
+    /// Construct a [`Principal`] of the IC management canister
+    pub const fn management_canister() -> Self {
+        Self {
+            len: 0,
+            bytes: [0; Self::MAX_LENGTH_IN_BYTES],
+        }
+    }
+
+    /// Construct a self-authenticating ID from public key
+    pub fn self_authenticating<P: AsRef<[u8]>>(public_key: P) -> Self {
+        let public_key = public_key.as_ref();
+        let hash = sha224(public_key);
+        let mut bytes = [0; Self::MAX_LENGTH_IN_BYTES];
+        bytes[..Self::MAX_LENGTH_IN_BYTES - 1].copy_from_slice(hash.as_slice());
+        bytes[Self::MAX_LENGTH_IN_BYTES - 1] = Self::SELF_AUTHENTICATING_TAG;
+
+        Self {
+            len: Self::MAX_LENGTH_IN_BYTES as u8,
+            bytes,
+        }
+    }
+
+    /// Construct an anonymous ID.
+    pub const fn anonymous() -> Self {
+        let mut bytes = [0; Self::MAX_LENGTH_IN_BYTES];
+        bytes[0] = Self::ANONYMOUS_TAG;
+        Self { len: 1, bytes }
+    }
+
+    /// Construct a [`Principal`] from a slice of bytes.
+    ///
+    /// # Panics
+    ///
+    /// Panics if the slice is longer than 29 bytes.
+    pub fn from_slice(slice: &[u8]) -> Self {
+        match Self::try_from_slice(slice) {
+            Ok(v) => v,
+            _ => panic!("slice length exceeds capacity"),
+        }
+    }
+
+    /// Construct a [`Principal`] from a slice of bytes.
+    pub fn try_from_slice(slice: &[u8]) -> Result<Self, PrincipalError> {
+        const MAX_LENGTH_IN_BYTES: usize = Principal::MAX_LENGTH_IN_BYTES;
+        if slice.len() > MAX_LENGTH_IN_BYTES {
+            return Err(PrincipalError::BytesTooLong);
+        }
+
+        let mut bytes = [0; MAX_LENGTH_IN_BYTES];
+        bytes[0..slice.len()].copy_from_slice(slice);
+
+        Ok(Self {
+            len: slice.len() as u8,
+            bytes,
+        })
+    }
+
+    /// Parse a [`Principal`] from text representation.
+    pub fn from_text<S: AsRef<str>>(text: S) -> Result<Self, PrincipalError> {
+        // Strategy: Parse very liberally, then pretty-print and compare output
+        // This is both simpler and yields better error messages
+
+        let mut s = text.as_ref().to_string();
+        s.make_ascii_uppercase();
+        s.retain(|c| c != '-');
+
+        let bytes = tw_encoding::base32::decode(&s, None, false)
+            .map_err(|_| PrincipalError::InvalidBase32)?;
+
+        if bytes.len() < Self::CRC_LENGTH_IN_BYTES {
+            return Err(PrincipalError::TextTooShort);
+        }
+
+        let crc_bytes = &bytes[..Self::CRC_LENGTH_IN_BYTES];
+        let data_bytes = &bytes[Self::CRC_LENGTH_IN_BYTES..];
+        if data_bytes.len() > Self::MAX_LENGTH_IN_BYTES {
+            return Err(PrincipalError::TextTooLong);
+        }
+
+        if crc32(data_bytes).to_be_bytes() != crc_bytes {
+            return Err(PrincipalError::CheckSequenceNotMatch);
+        }
+
+        // Already checked data_bytes.len() <= MAX_LENGTH_IN_BYTES
+        // safe to unwrap here
+        let result = Self::try_from_slice(data_bytes).unwrap();
+        let expected = format!("{result}");
+
+        // In the Spec:
+        // The textual representation is conventionally printed with lower case letters,
+        // but parsed case-insensitively.
+        if text.as_ref().to_ascii_lowercase() != expected {
+            return Err(PrincipalError::AbnormalGrouped(result));
+        }
+        Ok(result)
+    }
+
+    /// Convert [`Principal`] to text representation.
+    pub fn to_text(&self) -> String {
+        format!("{self}")
+    }
+
+    /// Return the [`Principal`]'s underlying slice of bytes.
+    #[inline]
+    pub fn as_slice(&self) -> &[u8] {
+        &self.bytes[..self.len as usize]
+    }
+}
+
+impl std::str::FromStr for Principal {
+    type Err = PrincipalError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Principal::from_text(s)
+    }
+}
+
+impl From<&PublicKey> for Principal {
+    /// Takes a Secp256k1 public key, DER-encodes the public key,
+    /// and creates a principal from the encoding.
+    fn from(public_key: &PublicKey) -> Self {
+        Self::self_authenticating(public_key.der_encoded())
+    }
+}
+
+impl std::fmt::Display for Principal {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        let blob: &[u8] = self.as_slice();
+
+        // calc checksum
+        let checksum = crc32(blob);
+
+        // combine blobs
+        let mut bytes = vec![];
+        bytes.extend_from_slice(&checksum.to_be_bytes());
+        bytes.extend_from_slice(blob);
+
+        // base32
+        let mut s =
+            tw_encoding::base32::encode(&bytes, None, false).map_err(|_| std::fmt::Error)?;
+        s.make_ascii_lowercase();
+
+        // write out string with dashes
+        let mut s = s.as_str();
+        while s.len() > 5 {
+            f.write_str(&s[..5])?;
+            f.write_char('-')?;
+            s = &s[5..];
+        }
+        f.write_str(s)
+    }
+}
+
+impl TryFrom<&str> for Principal {
+    type Error = PrincipalError;
+
+    fn try_from(s: &str) -> Result<Self, Self::Error> {
+        Principal::from_text(s)
+    }
+}
+
+impl TryFrom<Vec<u8>> for Principal {
+    type Error = PrincipalError;
+
+    fn try_from(bytes: Vec<u8>) -> Result<Self, Self::Error> {
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl TryFrom<&Vec<u8>> for Principal {
+    type Error = PrincipalError;
+
+    fn try_from(bytes: &Vec<u8>) -> Result<Self, Self::Error> {
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl TryFrom<&[u8]> for Principal {
+    type Error = PrincipalError;
+
+    fn try_from(bytes: &[u8]) -> Result<Self, Self::Error> {
+        Self::try_from_slice(bytes)
+    }
+}
+
+impl AsRef<[u8]> for Principal {
+    fn as_ref(&self) -> &[u8] {
+        self.as_slice()
+    }
+}
+
+// Serialization
+impl serde::Serialize for Principal {
+    fn serialize<S: serde::Serializer>(&self, serializer: S) -> Result<S::Ok, S::Error> {
+        if serializer.is_human_readable() {
+            self.to_text().serialize(serializer)
+        } else {
+            serializer.serialize_bytes(self.as_slice())
+        }
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/protocol/request_id.rs b/rust/chains/tw_internet_computer/src/protocol/request_id.rs
new file mode 100644
index 00000000000..ecc48a5a17f
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/protocol/request_id.rs
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::collections::BTreeMap;
+
+use serde::{Deserialize, Serialize};
+use tw_hash::{sha2::sha256, H256};
+
+const DOMAIN_IC_REQUEST: &[u8; 11] = b"\x0Aic-request";
+
+/// When signing requests or querying the status of a request
+/// (see Request status) in the state tree, the user identifies
+/// the request using a request id, which is the
+/// representation-independent hash of the content map of the
+/// original request. A request id must have length of 32 bytes.
+pub struct RequestId(pub(crate) H256);
+
+impl RequestId {
+    /// Create the prehash from the request ID.
+    /// See: https://internetcomputer.org/docs/current/references/ic-interface-spec#envelope-authentication
+    pub fn sig_data(&self) -> H256 {
+        let mut sig_data = vec![];
+        sig_data.extend_from_slice(DOMAIN_IC_REQUEST);
+        sig_data.extend_from_slice(self.0.as_slice());
+        H256::try_from(sha256(&sig_data).as_slice()).unwrap_or_else(|_| H256::new())
+    }
+}
+
+/// The different types of values supported in `RawHttpRequest`.
+#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq, Hash)]
+pub enum RawHttpRequestVal {
+    Bytes(#[serde(serialize_with = "serialize_bytes")] Vec<u8>),
+    String(String),
+    U64(u64),
+    Array(Vec<RawHttpRequestVal>),
+}
+
+fn serialize_bytes<S>(bytes: &[u8], s: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    s.serialize_bytes(bytes)
+}
+
+fn hash_string(value: String) -> Vec<u8> {
+    sha256(value.as_bytes())
+}
+
+fn hash_bytes(value: Vec<u8>) -> Vec<u8> {
+    sha256(value.as_slice())
+}
+
+fn hash_u64(value: u64) -> Vec<u8> {
+    // We need at most ⌈ 64 / 7 ⌉ = 10 bytes to encode a 64 bit
+    // integer in LEB128.
+    let mut buf = [0u8; 10];
+    let mut n = value;
+    let mut i = 0;
+
+    loop {
+        let byte = (n & 0x7f) as u8;
+        n >>= 7;
+
+        if n == 0 {
+            buf[i] = byte;
+            break;
+        } else {
+            buf[i] = byte | 0x80;
+            i += 1;
+        }
+    }
+
+    hash_bytes(buf[..=i].to_vec())
+}
+
+// arrays, encoded as the concatenation of the hashes of the encodings of the
+// array elements.
+fn hash_array(elements: Vec<RawHttpRequestVal>) -> Vec<u8> {
+    let mut buffer = vec![];
+    elements
+        .into_iter()
+        // Hash the encoding of all the array elements.
+        .for_each(|e| {
+            let mut hashed_val = hash_val(e);
+            buffer.append(&mut hashed_val);
+        });
+    sha256(&buffer)
+}
+
+fn hash_val(val: RawHttpRequestVal) -> Vec<u8> {
+    match val {
+        RawHttpRequestVal::String(string) => hash_string(string),
+        RawHttpRequestVal::Bytes(bytes) => hash_bytes(bytes),
+        RawHttpRequestVal::U64(integer) => hash_u64(integer),
+        RawHttpRequestVal::Array(elements) => hash_array(elements),
+    }
+}
+
+fn hash_key_val(key: String, val: RawHttpRequestVal) -> Vec<u8> {
+    let mut key_hash = hash_string(key);
+    let mut val_hash = hash_val(val);
+    key_hash.append(&mut val_hash);
+    key_hash
+}
+
+/// Describes `hash_of_map` as specified in the public spec.
+/// See: https://internetcomputer.org/docs/current/references/ic-interface-spec#hash-of-map
+pub fn hash_of_map<S: ToString>(map: &BTreeMap<S, RawHttpRequestVal>) -> H256 {
+    let mut hashes: Vec<Vec<u8>> = Vec::new();
+    for (key, val) in map.iter() {
+        hashes.push(hash_key_val(key.to_string(), val.clone()));
+    }
+
+    // Computes hash by first sorting by "field name" hash, which is the
+    // same as sorting by concatenation of H(field name) · H(field value)
+    // (although in practice it's actually more stable in the presence of
+    // duplicated field names).  Then concatenate all the hashes.
+    hashes.sort();
+
+    let buffer = hashes.into_iter().flatten().collect::<Vec<_>>();
+    let hash = sha256(&buffer);
+
+    H256::try_from(hash.as_slice()).unwrap_or_else(|_| H256::new())
+}
diff --git a/rust/chains/tw_internet_computer/src/protocol/rosetta.rs b/rust/chains/tw_internet_computer/src/protocol/rosetta.rs
new file mode 100644
index 00000000000..a929a4f5f15
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/protocol/rosetta.rs
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::envelope::{Envelope, EnvelopeCallContent, EnvelopeReadStateContent};
+use serde::Serialize;
+
+/// The types of requests that are available from the Rosetta node.
+/// This enum is truncated to include support only for the
+/// operations that this crate can currently perform.
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+pub enum RequestType {
+    // Aliases for backwards compatibility
+    #[serde(rename = "TRANSACTION")]
+    #[serde(alias = "Send")]
+    Send,
+}
+
+/// The type (encoded as CBOR) returned by the Rosetta node's
+/// /construction/combine endpoint. It contains the
+/// IC calls to submit the transaction and to check the result.
+pub type SignedTransaction = Vec<Request>;
+
+/// A vector of update/read-state calls for different ingress windows
+/// of the same call.
+pub type Request = (RequestType, Vec<EnvelopePair>);
+
+#[derive(Debug, Clone)]
+pub enum EnvelopePairError {
+    InvalidUpdateEnvelope,
+    InvalidReadStateEnvelope,
+}
+
+/// A signed IC update call and the corresponding read-state call for
+/// a particular ingress window.
+#[derive(Debug, Clone, Serialize)]
+pub struct EnvelopePair {
+    update: Envelope<EnvelopeCallContent>,
+    read_state: Envelope<EnvelopeReadStateContent>,
+}
+
+impl EnvelopePair {
+    pub fn new(
+        update_envelope: Envelope<EnvelopeCallContent>,
+        read_state_envelope: Envelope<EnvelopeReadStateContent>,
+    ) -> Result<Self, EnvelopePairError> {
+        Ok(Self {
+            update: update_envelope,
+            read_state: read_state_envelope,
+        })
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/signer.rs b/rust/chains/tw_internet_computer/src/signer.rs
new file mode 100644
index 00000000000..ee4a39a76de
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/signer.rs
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::marker::PhantomData;
+
+use tw_coin_entry::{error::prelude::*, signing_output_error};
+use tw_keypair::ecdsa::secp256k1;
+use tw_proto::{Common::Proto::SigningError as CommonError, InternetComputer::Proto};
+
+use crate::{
+    context::InternetComputerContext,
+    protocol::identity,
+    transactions::{self, sign_transaction},
+};
+
+impl From<transactions::SignTransactionError> for SigningError {
+    fn from(error: transactions::SignTransactionError) -> Self {
+        match error {
+            transactions::SignTransactionError::InvalidArguments => {
+                SigningError::new(CommonError::Error_invalid_params)
+            },
+            transactions::SignTransactionError::Identity(identity_error) => match identity_error {
+                identity::SigningError::Failed(_) => SigningError::new(CommonError::Error_signing),
+            },
+            transactions::SignTransactionError::InvalidEnvelopePair
+            | transactions::SignTransactionError::EncodingArgsFailed => {
+                SigningError::new(CommonError::Error_internal)
+            },
+            transactions::SignTransactionError::InvalidToAccountIdentifier => {
+                SigningError::new(CommonError::Error_invalid_address)
+            },
+            transactions::SignTransactionError::InvalidAmount => {
+                SigningError::new(CommonError::Error_invalid_requested_token_amount)
+            },
+        }
+    }
+}
+
+pub struct Signer<Context: InternetComputerContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: InternetComputerContext> Signer<Context> {
+    #[inline]
+    pub fn sign_proto(input: Proto::SigningInput<'_>) -> Proto::SigningOutput<'static> {
+        Self::sign_proto_impl(input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_proto_impl(
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let private_key = secp256k1::PrivateKey::try_from(input.private_key.as_ref())?;
+
+        let Some(ref transaction) = input.transaction else {
+            return SigningError::err(CommonError::Error_invalid_params);
+        };
+
+        let canister_id = Context::get_canister_id();
+        let signed_transaction =
+            sign_transaction(private_key, canister_id, &transaction.transaction_oneof)?;
+
+        let cbor_encoded_signed_transaction = tw_encoding::cbor::encode(&signed_transaction)
+            .tw_err(|_| CommonError::Error_internal)?;
+
+        Ok(Proto::SigningOutput {
+            signed_transaction: cbor_encoded_signed_transaction.into(),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/transactions/mod.rs b/rust/chains/tw_internet_computer/src/transactions/mod.rs
new file mode 100644
index 00000000000..e0c21697c1d
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/transactions/mod.rs
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod transfer;
+
+pub mod proto {
+    include!(concat!(env!("OUT_DIR"), "/proto/mod.rs"));
+}
+
+use tw_keypair::ecdsa::secp256k1::PrivateKey;
+use tw_proto::InternetComputer::Proto::mod_Transaction::OneOftransaction_oneof as Tx;
+
+use crate::protocol::{identity, principal::Principal, rosetta};
+
+#[derive(Debug)]
+pub enum SignTransactionError {
+    InvalidAmount,
+    InvalidArguments,
+    Identity(identity::SigningError),
+    EncodingArgsFailed,
+    InvalidToAccountIdentifier,
+    InvalidEnvelopePair,
+}
+
+pub fn sign_transaction(
+    private_key: PrivateKey,
+    canister_id: Principal,
+    transaction: &Tx,
+) -> Result<rosetta::SignedTransaction, SignTransactionError> {
+    match transaction {
+        Tx::transfer(transfer_args) => transfer::transfer(
+            private_key,
+            canister_id,
+            transfer::TransferArgs {
+                memo: transfer_args.memo,
+                amount: transfer_args.amount,
+                max_fee: None,
+                to: transfer_args.to_account_identifier.to_string(),
+                current_timestamp_nanos: transfer_args.current_timestamp_nanos,
+                permitted_drift: if transfer_args.permitted_drift > 0 {
+                    Some(transfer_args.permitted_drift)
+                } else {
+                    None
+                },
+            },
+        ),
+        Tx::None => Err(SignTransactionError::InvalidArguments),
+    }
+}
diff --git a/rust/chains/tw_internet_computer/src/transactions/proto/ledger.proto b/rust/chains/tw_internet_computer/src/transactions/proto/ledger.proto
new file mode 100644
index 00000000000..59858bbf2ea
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/transactions/proto/ledger.proto
@@ -0,0 +1,313 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+// -*- c-basic-offset: 2 -*-
+// Source: https://github.com/dfinity/ic/blob/master/rs/rosetta-api/icp_ledger/proto/ic_ledger/pb/v1/types.proto
+// Commit Hash: 703eb96fea44ad2c82740e4360a526a2a127a960
+// Striped annotations related to the use of hardware wallets.
+
+syntax = "proto3";
+
+package ic_ledger.pb.v1;
+
+import "./types.proto";
+
+// Annotations related to the use of hardware wallets. The annotated messages are
+// parsed on hardware wallets and marked fields are displayed in a trusted user
+// interface (TUI). We must not, for instance, add fields that would change the
+// semantics of the message such that old hardware wallets would not display
+// appropriate information to users.
+
+// ** LEDGER CANISTER ENDPOINTS
+
+// Initialise the ledger canister
+message LedgerInit {
+  AccountIdentifier minting_account = 1;
+  repeated Account initial_values = 2;
+  ic_base_types.pb.v1.PrincipalId archive_canister = 3;
+  uint32 max_message_size_bytes = 4;
+}
+
+// The format of values serialized to/from the stable memory during and upgrade
+message LedgerUpgrade {}
+
+// Make a payment
+message SendRequest {
+  Memo memo = 1;
+  Payment payment = 2;
+  Tokens max_fee = 3;
+  Subaccount from_subaccount = 4;
+  AccountIdentifier to = 5;
+  BlockIndex created_at = 6;
+  TimeStamp created_at_time = 7;
+}
+
+message SendResponse {
+  BlockIndex resulting_height = 1;
+}
+
+// Notify a canister that it has received a payment
+message NotifyRequest {
+  BlockIndex block_height = 1;
+  Tokens max_fee = 2;
+  Subaccount from_subaccount = 3;
+  ic_base_types.pb.v1.PrincipalId to_canister = 4;
+  Subaccount to_subaccount = 5;
+}
+
+message NotifyResponse {}
+
+message TransactionNotificationRequest {
+  ic_base_types.pb.v1.PrincipalId from = 1;
+  Subaccount from_subaccount = 2;
+  ic_base_types.pb.v1.PrincipalId to = 3;
+  Subaccount to_subaccount = 4;
+  BlockIndex block_height = 5;
+  Tokens amount = 6;
+  Memo memo = 7;
+}
+
+message TransactionNotificationResponse {
+  bytes response = 1;
+}
+
+message CyclesNotificationResponse {
+  oneof response {
+    ic_base_types.pb.v1.PrincipalId created_canister_id = 1;
+    Refund refund = 2;
+    ToppedUp topped_up = 3;
+  }
+}
+
+// Get the balance of an account
+message AccountBalanceRequest {
+  AccountIdentifier account = 1;
+}
+
+message AccountBalanceResponse {
+  Tokens balance = 1;
+}
+
+// Get the length of the chain with a certification
+message TipOfChainRequest {}
+
+message TipOfChainResponse {
+  Certification certification = 1;
+  BlockIndex chain_length = 2;
+}
+
+// How many Tokens are there not in the minting account
+message TotalSupplyRequest {}
+
+message TotalSupplyResponse {
+  Tokens total_supply = 1;
+}
+
+// Archive any blocks older than this
+message LedgerArchiveRequest {
+  TimeStamp timestamp = 1;
+}
+
+// * Shared Endpoints *
+
+// Get a single block
+message BlockRequest {
+  uint64 block_height = 1;
+}
+
+message EncodedBlock {
+  bytes block = 1;
+}
+
+message BlockResponse {
+  oneof block_content {
+    EncodedBlock block = 1;
+    ic_base_types.pb.v1.PrincipalId canister_id = 2;
+  }
+}
+
+// Get a set of blocks
+message GetBlocksRequest {
+  uint64 start = 1;
+  uint64 length = 2;
+}
+
+message Refund {
+  BlockIndex refund = 2;
+  string error = 3;
+}
+
+message ToppedUp {}
+
+message EncodedBlocks {
+  repeated EncodedBlock blocks = 1;
+}
+
+message GetBlocksResponse {
+  oneof get_blocks_content {
+    EncodedBlocks blocks = 1;
+    string error = 2;
+  }
+}
+
+// Iterate through blocks
+message IterBlocksRequest {
+  uint64 start = 1;
+  uint64 length = 2;
+}
+
+message IterBlocksResponse {
+  repeated EncodedBlock blocks = 1;
+}
+
+message ArchiveIndexEntry {
+  uint64 height_from = 1;
+  uint64 height_to = 2;
+  ic_base_types.pb.v1.PrincipalId canister_id = 3;
+}
+
+message ArchiveIndexResponse {
+  repeated ArchiveIndexEntry entries = 1;
+}
+
+// ** ARCHIVE CANISTER ENDPOINTS **
+
+// * Archive canister *
+// Init the archive canister
+message ArchiveInit {
+  uint32 node_max_memory_size_bytes = 1;
+  uint32 max_message_size_bytes = 2;
+}
+
+// Add blocks to the archive canister
+message ArchiveAddRequest {
+  repeated Block blocks = 1;
+}
+
+message ArchiveAddResponse {}
+
+// Fetch a list of all of the archive nodes
+message GetNodesRequest {}
+
+message GetNodesResponse {
+  repeated ic_base_types.pb.v1.PrincipalId nodes = 1;
+}
+
+// ** BASIC TYPES **
+message Tokens {
+  uint64 e8s = 1;
+}
+
+message Payment {
+  Tokens receiver_gets = 1;
+}
+
+message BlockIndex {
+  uint64 height = 1;
+}
+
+// This is the
+message Block {
+  Hash parent_hash = 1;
+  TimeStamp timestamp = 2;
+  Transaction transaction = 3;
+}
+
+message Hash {
+  bytes hash = 1;
+}
+
+message Account {
+  AccountIdentifier identifier = 1;
+  Tokens balance = 2;
+}
+
+message Transaction {
+  oneof transfer {
+    Burn burn = 1;
+    Mint mint = 2;
+    Send send = 3;
+  }
+  Memo memo = 4;
+  Icrc1Memo icrc1_memo = 7;
+  BlockIndex created_at = 5; // obsolete
+  TimeStamp created_at_time = 6;
+}
+
+message Send {
+  // The meaning of the [from] field depends on the transaction type:
+  //   - Transfer: [from] is the source account.
+  //   - TransferFrom: [from] is the approver.
+  //   - Approve: [from] is the approver.
+  AccountIdentifier from = 1;
+  // The meaning of the [to] field depends on the transaction type:
+  //   - Transfer: [to] is the destination account.
+  //   - TransferFrom: [to] is the destination account.
+  //   - Approve: [to] is the default account id of the approved principal.
+  AccountIdentifier to = 2;
+  // If the transaction type is Approve, the amount must be zero.
+  Tokens amount = 3;
+  Tokens max_fee = 4;
+
+  // We represent metadata of new operation types as submessages for
+  // backward compatibility with old clients.
+  oneof extension {
+    Approve approve = 5;
+    TransferFrom transfer_from = 6;
+  }
+}
+
+message TransferFrom {
+  // The default account id of the principal who sent the transaction.
+  AccountIdentifier spender = 1;
+}
+
+message Approve {
+  Tokens allowance = 1;
+  TimeStamp expires_at = 2;
+  Tokens expected_allowance = 3;
+}
+
+message Mint {
+  AccountIdentifier to = 2;
+  Tokens amount = 3;
+}
+
+message Burn {
+  AccountIdentifier from = 1;
+  Tokens amount = 3;
+}
+
+message AccountIdentifier {
+  // Can contain either:
+  //  * the 32 byte identifier (4 byte checksum + 28 byte hash)
+  //  * the 28 byte hash
+  bytes hash = 1;
+}
+
+message Subaccount {
+  bytes sub_account = 1;
+}
+
+message Memo {
+  uint64 memo = 1;
+}
+
+message Icrc1Memo {
+  bytes memo = 1;
+}
+
+message TimeStamp {
+  uint64 timestamp_nanos = 1;
+}
+
+message Certification {
+  bytes certification = 1;
+}
+
+message TransferFeeRequest {}
+
+message TransferFeeResponse {
+  Tokens transfer_fee = 1;
+}
\ No newline at end of file
diff --git a/rust/chains/tw_internet_computer/src/transactions/proto/types.proto b/rust/chains/tw_internet_computer/src/transactions/proto/types.proto
new file mode 100644
index 00000000000..f869c11ccc3
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/transactions/proto/types.proto
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+// Source: https://github.com/dfinity/ic/blob/master/rs/rosetta-api/icp_ledger/proto/ic_ledger/pb/v1/types.proto
+// Commit Hash: 703eb96fea44ad2c82740e4360a526a2a127a960
+// Striped annotations related to the use of hardware wallets.
+
+syntax = "proto3";
+
+package ic_base_types.pb.v1;
+
+// A PB container for a PrincipalId, which uniquely identifies
+// a principal.
+message PrincipalId {
+  bytes serialized_id = 1;
+}
\ No newline at end of file
diff --git a/rust/chains/tw_internet_computer/src/transactions/transfer.rs b/rust/chains/tw_internet_computer/src/transactions/transfer.rs
new file mode 100644
index 00000000000..7cc846f3b53
--- /dev/null
+++ b/rust/chains/tw_internet_computer/src/transactions/transfer.rs
@@ -0,0 +1,248 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::time::Duration;
+
+use tw_keypair::ecdsa::secp256k1::PrivateKey;
+
+use crate::{
+    address::AccountIdentifier,
+    protocol::{
+        envelope::{
+            Envelope, EnvelopeCallContent, EnvelopeReadStateContent, Label, RepresentationHashable,
+        },
+        get_ingress_expiry,
+        identity::Identity,
+        principal::Principal,
+        request_id::RequestId,
+        rosetta,
+    },
+    transactions::proto::ic_ledger::pb::v1::{
+        AccountIdentifier as ProtoAccountIdentifier, Memo, Payment, SendRequest, TimeStamp, Tokens,
+    },
+};
+
+use super::SignTransactionError;
+
+/// Arguments to be used with [transfer] to create a signed transaction enveloper pair.
+#[derive(Clone, Debug)]
+pub struct TransferArgs {
+    /// The memo field is used as a method to help identify the transaction.
+    pub memo: u64,
+    /// The amount of ICP to send as e8s.
+    pub amount: u64,
+    /// The maximum fee will to be paid to complete the transfer.
+    /// If not provided, the minimum fee will be applied to the transaction. Currently 10_000 e8s (0.00010000 ICP).
+    pub max_fee: Option<u64>,
+    /// The address to send the amount to.
+    pub to: String,
+    /// The current timestamp in nanoseconds.
+    pub current_timestamp_nanos: u64,
+    /// The duration to tune up ingress expiry in seconds.
+    pub permitted_drift: Option<u64>,
+}
+
+impl TryFrom<TransferArgs> for SendRequest {
+    type Error = SignTransactionError;
+
+    fn try_from(args: TransferArgs) -> Result<Self, Self::Error> {
+        let current_timestamp_duration = Duration::from_nanos(args.current_timestamp_nanos);
+        let timestamp_nanos = current_timestamp_duration.as_nanos() as u64;
+
+        let to_account_identifier = AccountIdentifier::from_hex(&args.to)
+            .map_err(|_| SignTransactionError::InvalidToAccountIdentifier)?;
+        let to_hash = to_account_identifier.as_ref().to_vec();
+
+        let request = Self {
+            memo: Some(Memo { memo: args.memo }),
+            payment: Some(Payment {
+                receiver_gets: Some(Tokens { e8s: args.amount }),
+            }),
+            max_fee: args.max_fee.map(|fee| Tokens { e8s: fee }),
+            from_subaccount: None,
+            to: Some(ProtoAccountIdentifier { hash: to_hash }),
+            created_at: None,
+            created_at_time: Some(TimeStamp { timestamp_nanos }),
+        };
+        Ok(request)
+    }
+}
+
+/// The endpoint on the ledger canister that is used to make transfers.
+const METHOD_NAME: &str = "send_pb";
+
+/// Given a secp256k1 private key, the canister ID of an ICP-based ledger canister, and the actual transfer args,
+/// this function creates a signed transaction to be sent to a Rosetta API node.
+pub fn transfer(
+    private_key: PrivateKey,
+    canister_id: Principal,
+    args: TransferArgs,
+) -> Result<rosetta::SignedTransaction, SignTransactionError> {
+    if args.amount < 1 {
+        return Err(SignTransactionError::InvalidAmount);
+    }
+
+    let current_timestamp_duration = Duration::from_nanos(args.current_timestamp_nanos);
+    let ingress_expiry = get_ingress_expiry(current_timestamp_duration, args.permitted_drift);
+    let identity = Identity::new(private_key);
+
+    // Encode the arguments for the ledger `send_pb` endpoint.
+    let send_request = SendRequest::try_from(args)?;
+    let arg =
+        tw_proto::serialize(&send_request).map_err(|_| SignTransactionError::EncodingArgsFailed)?;
+    // Create the update envelope.
+    let (request_id, update_envelope) =
+        create_update_envelope(&identity, canister_id, arg, ingress_expiry)?;
+
+    // Create the read state envelope.
+    let (_, read_state_envelope) =
+        create_read_state_envelope(&identity, request_id, ingress_expiry)?;
+
+    // Create a new EnvelopePair with the update call and read_state envelopes.
+    let envelope_pair = rosetta::EnvelopePair::new(update_envelope, read_state_envelope)
+        .map_err(|_| SignTransactionError::InvalidEnvelopePair)?;
+
+    // Create a signed transaction containing the envelope pair.
+    let request: rosetta::Request = (rosetta::RequestType::Send, vec![envelope_pair]);
+    Ok(vec![request])
+}
+
+#[inline]
+fn create_update_envelope(
+    identity: &Identity,
+    canister_id: Principal,
+    arg: Vec<u8>,
+    ingress_expiry: u64,
+) -> Result<(RequestId, Envelope<EnvelopeCallContent>), SignTransactionError> {
+    let sender = identity.sender();
+    let content = EnvelopeCallContent {
+        nonce: None,
+        ingress_expiry,
+        sender,
+        canister_id,
+        method_name: METHOD_NAME.to_string(),
+        arg,
+    };
+
+    let request_id = content.request_id();
+    let signature = identity
+        .sign(request_id.sig_data())
+        .map_err(SignTransactionError::Identity)?;
+
+    let env = Envelope {
+        content,
+        sender_pubkey: Some(signature.public_key),
+        sender_sig: Some(signature.signature),
+    };
+    Ok((request_id, env))
+}
+
+#[inline]
+fn create_read_state_envelope(
+    identity: &Identity,
+    update_request_id: RequestId,
+    ingress_expiry: u64,
+) -> Result<(RequestId, Envelope<EnvelopeReadStateContent>), SignTransactionError> {
+    let sender = identity.sender();
+
+    let content = EnvelopeReadStateContent {
+        ingress_expiry,
+        sender,
+        paths: vec![vec![
+            Label::from("request_status"),
+            Label::from(update_request_id),
+        ]],
+    };
+
+    let request_id = content.request_id();
+    let signature = identity
+        .sign(request_id.sig_data())
+        .map_err(SignTransactionError::Identity)?;
+
+    let env = Envelope {
+        content,
+        sender_pubkey: Some(signature.public_key),
+        sender_sig: Some(signature.signature),
+    };
+    Ok((request_id, env))
+}
+
+#[cfg(test)]
+mod test {
+    use tw_encoding::hex;
+
+    use crate::address::AccountIdentifier;
+
+    use super::*;
+
+    pub const SIGNED_TRANSACTION: &str = "81826b5452414e53414354494f4e81a266757064617465a367636f6e74656e74a66c726571756573745f747970656463616c6c6e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d026b63616e69737465725f69644a000000000000000201016b6d6574686f645f6e616d656773656e645f706263617267583b0a0012070a050880c2d72f2a220a20943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a3a0a088090caa5a3a78abd176d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f736967984013186f18b9181c189818b318a8186518b2186118d418971618b1187d18eb185818e01826182f1873183b185018cb185d18ef18d81839186418b3183218da1824182f184e18a01880182718c0189018c918a018fd18c418d9189e189818b318ef1874183b185118e118a51864185918e718ed18c71889186c1822182318ca6a726561645f7374617465a367636f6e74656e74a46c726571756573745f747970656a726561645f73746174656e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d0265706174687381824e726571756573745f7374617475735820e8fbc2d5b0bf837b3a369249143e50d4476faafb2dd620e4e982586a51ebcf1e6d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f7369679840182d182718201888188618ce187f0c182a187a18d718e818df18fb18d318d41118a5186a184b18341842185318d718e618e8187a1828186c186a183618461418f3183318bd18a618a718bc18d918c818b7189d186e1865188418ff18fd18e418e9187f181b18d705184818b21872187818d6181c161833184318a2";
+
+    fn make_transfer_args() -> TransferArgs {
+        let current_timestamp_nanos = Duration::from_secs(1_691_709_940).as_nanos() as u64;
+        let owner =
+            Principal::from_text("t4u4z-y3dur-j63pk-nw4rv-yxdbt-agtt6-nygn7-ywh6y-zm2f4-sdzle-3qe")
+                .unwrap();
+        let to_account_identifier = AccountIdentifier::new(&owner);
+
+        TransferArgs {
+            memo: 0,
+            amount: 100_000_000,
+            max_fee: None,
+            to: to_account_identifier.to_hex(),
+            current_timestamp_nanos,
+            permitted_drift: None,
+        }
+    }
+
+    #[test]
+    fn transfer_successful() {
+        let private_key = PrivateKey::try_from(
+            "227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be",
+        )
+        .unwrap();
+        let canister_id = Principal::from_text("ryjl3-tyaaa-aaaaa-aaaba-cai").unwrap();
+        let transfer_args = make_transfer_args();
+
+        let signed_transaction = transfer(private_key, canister_id, transfer_args).unwrap();
+        // Encode the signed transaction.
+        let cbor_encoded_signed_transaction =
+            tw_encoding::cbor::encode(&signed_transaction).unwrap();
+        let hex_encoded_signed_transaction = hex::encode(&cbor_encoded_signed_transaction, false);
+        assert_eq!(hex_encoded_signed_transaction, SIGNED_TRANSACTION);
+    }
+
+    #[test]
+    fn transfer_invalid_amount() {
+        let private_key = PrivateKey::try_from(
+            "227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be",
+        )
+        .unwrap();
+        let canister_id = Principal::from_text("ryjl3-tyaaa-aaaaa-aaaba-cai").unwrap();
+        let mut transfer_args = make_transfer_args();
+        transfer_args.amount = 0;
+
+        let signed_transaction = transfer(private_key, canister_id, transfer_args);
+        assert!(matches!(
+            signed_transaction,
+            Err(SignTransactionError::InvalidAmount)
+        ));
+    }
+
+    #[test]
+    fn transfer_invalid_to_account_identifier() {
+        let private_key = PrivateKey::try_from(
+            "227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be",
+        )
+        .unwrap();
+        let canister_id = Principal::from_text("ryjl3-tyaaa-aaaaa-aaaba-cai").unwrap();
+        let mut transfer_args = make_transfer_args();
+        transfer_args.to = "invalid".to_string();
+
+        let signed_transaction = transfer(private_key, canister_id, transfer_args);
+        assert!(matches!(
+            signed_transaction,
+            Err(SignTransactionError::InvalidToAccountIdentifier)
+        ));
+    }
+}
diff --git a/rust/chains/tw_native_evmos/Cargo.toml b/rust/chains/tw_native_evmos/Cargo.toml
new file mode 100644
index 00000000000..87137a252cc
--- /dev/null
+++ b/rust/chains/tw_native_evmos/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "tw_native_evmos"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
+
+[dev-dependencies]
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk", features = ["test-utils"] }
diff --git a/rust/chains/tw_native_evmos/src/context.rs b/rust/chains/tw_native_evmos/src/context.rs
new file mode 100644
index 00000000000..abebb7cd8f9
--- /dev/null
+++ b/rust/chains/tw_native_evmos/src/context.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ethermint_public_key::EthermintEthSecp256PublicKey;
+use tw_cosmos_sdk::address::Address;
+use tw_cosmos_sdk::context::CosmosContext;
+use tw_cosmos_sdk::private_key::secp256k1::Secp256PrivateKey;
+use tw_cosmos_sdk::signature::secp256k1::Secp256k1Signature;
+use tw_hash::hasher::Hasher;
+
+pub struct NativeEvmosContext;
+
+impl CosmosContext for NativeEvmosContext {
+    type Address = Address;
+    type PrivateKey = Secp256PrivateKey;
+    type PublicKey = EthermintEthSecp256PublicKey;
+    type Signature = Secp256k1Signature;
+
+    fn default_tx_hasher() -> Hasher {
+        Hasher::Keccak256
+    }
+}
diff --git a/rust/chains/tw_native_evmos/src/entry.rs b/rust/chains/tw_native_evmos/src/entry.rs
new file mode 100644
index 00000000000..61cec2c5f7e
--- /dev/null
+++ b/rust/chains/tw_native_evmos/src/entry.rs
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::NativeEvmosContext;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::transaction_util::NoTransactionUtil;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_cosmos_sdk::address::{Address, Bech32Prefix};
+use tw_cosmos_sdk::modules::compiler::tw_compiler::TWTransactionCompiler;
+use tw_cosmos_sdk::modules::signer::tw_signer::TWSigner;
+use tw_keypair::tw;
+use tw_proto::Cosmos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct NativeEvmosEntry;
+
+impl CoinEntry for NativeEvmosEntry {
+    type AddressPrefix = Bech32Prefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = NoTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str_with_coin_and_prefix(coin, address.to_string(), prefix)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: tw::PublicKey,
+        _derivation: Derivation,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::with_public_key_coin_context(coin, &public_key, prefix)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        TWSigner::<NativeEvmosContext>::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        TWTransactionCompiler::<NativeEvmosContext>::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        TWTransactionCompiler::<NativeEvmosContext>::compile(coin, input, signatures, public_keys)
+    }
+}
diff --git a/rust/chains/tw_native_evmos/src/ethermint_public_key.rs b/rust/chains/tw_native_evmos/src/ethermint_public_key.rs
new file mode 100644
index 00000000000..c2bf2d8f0ad
--- /dev/null
+++ b/rust/chains/tw_native_evmos/src/ethermint_public_key.rs
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_cosmos_sdk::proto::ethermint;
+use tw_cosmos_sdk::public_key::secp256k1::Secp256PublicKey;
+use tw_cosmos_sdk::public_key::{
+    CosmosPublicKey, JsonPublicKey, ProtobufPublicKey, PublicKeyParams,
+};
+use tw_keypair::{tw, KeyPairResult};
+use tw_memory::Data;
+use tw_proto::{google, type_url};
+
+const ETHERMINT_SECP256K1_PUBLIC_KEY_TYPE: &str = "ethermint/PubKeyEthSecp256k1";
+
+pub struct EthermintEthSecp256PublicKey(Secp256PublicKey);
+
+impl EthermintEthSecp256PublicKey {
+    fn default_public_key_params() -> PublicKeyParams {
+        PublicKeyParams {
+            // `NativeEvmos` requires the public key to be compressed,
+            // however the uncompressed public key is used to generate an address.
+            public_key_type: tw::PublicKeyType::Secp256k1,
+            json_type: ETHERMINT_SECP256K1_PUBLIC_KEY_TYPE.to_string(),
+            protobuf_type_url: type_url::<ethermint::crypto::v1::ethsecp256k1::PubKey>(),
+        }
+    }
+}
+
+impl CosmosPublicKey for EthermintEthSecp256PublicKey {
+    fn from_bytes(
+        coin: &dyn CoinContext,
+        public_key_bytes: &[u8],
+        maybe_params: Option<PublicKeyParams>,
+    ) -> KeyPairResult<Self> {
+        // Use default Ethermint public key parameters if otherwise is not specified,
+        // however the uncompressed public key is used to generate an address.
+        let params = maybe_params.unwrap_or_else(Self::default_public_key_params);
+        Secp256PublicKey::from_bytes(coin, public_key_bytes, Some(params))
+            .map(EthermintEthSecp256PublicKey)
+    }
+
+    fn to_bytes(&self) -> Data {
+        self.0.to_bytes()
+    }
+}
+
+impl JsonPublicKey for EthermintEthSecp256PublicKey {
+    fn public_key_type(&self) -> String {
+        self.0.public_key_type()
+    }
+}
+
+impl ProtobufPublicKey for EthermintEthSecp256PublicKey {
+    fn to_proto(&self) -> google::protobuf::Any {
+        self.0.to_proto()
+    }
+}
diff --git a/rust/chains/tw_native_evmos/src/lib.rs b/rust/chains/tw_native_evmos/src/lib.rs
new file mode 100644
index 00000000000..0c7068cba6f
--- /dev/null
+++ b/rust/chains/tw_native_evmos/src/lib.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod context;
+pub mod entry;
+pub mod ethermint_public_key;
diff --git a/rust/chains/tw_native_injective/Cargo.toml b/rust/chains/tw_native_injective/Cargo.toml
new file mode 100644
index 00000000000..b8d8a0bcb50
--- /dev/null
+++ b/rust/chains/tw_native_injective/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "tw_native_injective"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
+
+[dev-dependencies]
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk", features = ["test-utils"] }
diff --git a/rust/chains/tw_native_injective/src/context.rs b/rust/chains/tw_native_injective/src/context.rs
new file mode 100644
index 00000000000..c50dff8c44a
--- /dev/null
+++ b/rust/chains/tw_native_injective/src/context.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::injective_public_key::InjectiveEthSecp256PublicKey;
+use tw_cosmos_sdk::address::Address;
+use tw_cosmos_sdk::context::CosmosContext;
+use tw_cosmos_sdk::private_key::secp256k1::Secp256PrivateKey;
+use tw_cosmos_sdk::signature::secp256k1::Secp256k1Signature;
+use tw_hash::hasher::Hasher;
+
+pub struct NativeInjectiveContext;
+
+impl CosmosContext for NativeInjectiveContext {
+    type Address = Address;
+    type PrivateKey = Secp256PrivateKey;
+    type PublicKey = InjectiveEthSecp256PublicKey;
+    type Signature = Secp256k1Signature;
+
+    fn default_tx_hasher() -> Hasher {
+        Hasher::Keccak256
+    }
+}
diff --git a/rust/chains/tw_native_injective/src/entry.rs b/rust/chains/tw_native_injective/src/entry.rs
new file mode 100644
index 00000000000..e9d2ec3ad4d
--- /dev/null
+++ b/rust/chains/tw_native_injective/src/entry.rs
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::NativeInjectiveContext;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::transaction_util::NoTransactionUtil;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_cosmos_sdk::address::{Address, Bech32Prefix};
+use tw_cosmos_sdk::modules::compiler::tw_compiler::TWTransactionCompiler;
+use tw_cosmos_sdk::modules::signer::tw_signer::TWSigner;
+use tw_keypair::tw;
+use tw_proto::Cosmos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct NativeInjectiveEntry;
+
+impl CoinEntry for NativeInjectiveEntry {
+    type AddressPrefix = Bech32Prefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = NoTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str_with_coin_and_prefix(coin, address.to_string(), prefix)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: tw::PublicKey,
+        _derivation: Derivation,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::with_public_key_coin_context(coin, &public_key, prefix)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        TWSigner::<NativeInjectiveContext>::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        TWTransactionCompiler::<NativeInjectiveContext>::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        TWTransactionCompiler::<NativeInjectiveContext>::compile(
+            coin,
+            input,
+            signatures,
+            public_keys,
+        )
+    }
+}
diff --git a/rust/chains/tw_native_injective/src/injective_public_key.rs b/rust/chains/tw_native_injective/src/injective_public_key.rs
new file mode 100644
index 00000000000..c405867f6e8
--- /dev/null
+++ b/rust/chains/tw_native_injective/src/injective_public_key.rs
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_cosmos_sdk::proto::injective;
+use tw_cosmos_sdk::public_key::secp256k1::Secp256PublicKey;
+use tw_cosmos_sdk::public_key::{
+    CosmosPublicKey, JsonPublicKey, ProtobufPublicKey, PublicKeyParams,
+};
+use tw_keypair::KeyPairResult;
+use tw_memory::Data;
+use tw_proto::{google, type_url};
+
+/// https://github.com/cosmostation/cosmostation-chrome-extension/blob/e2fd27d71a17993f8eef07ce30f7a04a32e52788/src/constants/cosmos.ts#L4
+const INJECTIVE_SECP256K1_PUBLIC_KEY_TYPE: &str = "injective/PubKeyEthSecp256k1";
+
+pub struct InjectiveEthSecp256PublicKey(Secp256PublicKey);
+
+impl InjectiveEthSecp256PublicKey {
+    fn default_public_key_params(coin: &dyn CoinContext) -> PublicKeyParams {
+        PublicKeyParams {
+            // `NativeInjective` uses the same public key type as specified in `registry.json`.
+            public_key_type: coin.public_key_type(),
+            json_type: INJECTIVE_SECP256K1_PUBLIC_KEY_TYPE.to_string(),
+            protobuf_type_url: type_url::<injective::crypto::v1beta1::ethsecp256k1::PubKey>(),
+        }
+    }
+}
+
+impl CosmosPublicKey for InjectiveEthSecp256PublicKey {
+    fn from_bytes(
+        coin: &dyn CoinContext,
+        public_key_bytes: &[u8],
+        maybe_params: Option<PublicKeyParams>,
+    ) -> KeyPairResult<Self> {
+        // Use default Ethermint public key parameters if otherwise is not specified,
+        // however the uncompressed public key is used to generate an address.
+        let params = maybe_params.unwrap_or_else(|| Self::default_public_key_params(coin));
+        Secp256PublicKey::from_bytes(coin, public_key_bytes, Some(params))
+            .map(InjectiveEthSecp256PublicKey)
+    }
+
+    fn to_bytes(&self) -> Data {
+        self.0.to_bytes()
+    }
+}
+
+impl JsonPublicKey for InjectiveEthSecp256PublicKey {
+    fn public_key_type(&self) -> String {
+        self.0.public_key_type()
+    }
+}
+
+impl ProtobufPublicKey for InjectiveEthSecp256PublicKey {
+    fn to_proto(&self) -> google::protobuf::Any {
+        self.0.to_proto()
+    }
+}
diff --git a/rust/chains/tw_native_injective/src/lib.rs b/rust/chains/tw_native_injective/src/lib.rs
new file mode 100644
index 00000000000..fb550eba23b
--- /dev/null
+++ b/rust/chains/tw_native_injective/src/lib.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod context;
+pub mod entry;
+pub mod injective_public_key;
diff --git a/rust/chains/tw_pactus/Cargo.toml b/rust/chains/tw_pactus/Cargo.toml
new file mode 100644
index 00000000000..105b0aa7679
--- /dev/null
+++ b/rust/chains/tw_pactus/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "tw_pactus"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bech32 = "0.9.1"
+byteorder = "1.4"
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
+tw_hash = { path = "../../tw_hash" }
+tw_encoding = { path = "../../tw_encoding" }
+
+[dev-dependencies]
+tw_encoding = { path = "../../tw_encoding" }
+
diff --git a/rust/chains/tw_pactus/src/compiler.rs b/rust/chains/tw_pactus/src/compiler.rs
new file mode 100644
index 00000000000..3433b77d6e2
--- /dev/null
+++ b/rust/chains/tw_pactus/src/compiler.rs
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_keypair::ed25519;
+use tw_proto::Pactus::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+use crate::modules::tx_builder::TxBuilder;
+
+pub struct PactusCompiler;
+
+impl PactusCompiler {
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let trx = TxBuilder::from_proto(&input)?;
+        let sign_bytes = trx.sign_bytes()?;
+
+        let output = CompilerProto::PreSigningOutput {
+            data_hash: trx.id().into(),
+            data: sign_bytes.into(),
+            ..CompilerProto::PreSigningOutput::default()
+        };
+
+        Ok(output)
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn compile_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let signature_bytes = signatures
+            .first()
+            .or_tw_err(SigningErrorType::Error_signatures_count)?;
+        let public_key_bytes = public_keys
+            .first()
+            .or_tw_err(SigningErrorType::Error_signatures_count)?;
+
+        let public_key = ed25519::sha512::PublicKey::try_from(public_key_bytes.as_slice())?;
+        let signature = ed25519::Signature::try_from(signature_bytes.as_slice())?;
+
+        let mut trx = TxBuilder::from_proto(&input)?;
+        trx.set_signatory(public_key.to_owned(), signature.to_owned());
+
+        let data = trx.to_bytes()?;
+
+        let output = Proto::SigningOutput {
+            transaction_id: trx.id().into(),
+            signed_transaction_data: data.into(),
+            signature: signature.to_bytes().to_vec().into(),
+            ..Proto::SigningOutput::default()
+        };
+
+        Ok(output)
+    }
+}
diff --git a/rust/chains/tw_pactus/src/encoder/decode.rs b/rust/chains/tw_pactus/src/encoder/decode.rs
new file mode 100644
index 00000000000..f9e2ef80edf
--- /dev/null
+++ b/rust/chains/tw_pactus/src/encoder/decode.rs
@@ -0,0 +1,138 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_hash::Hash;
+use tw_keypair::ed25519::{sha512::PublicKey, Signature};
+
+use super::error::Error;
+use crate::encoder::var_int::VarInt;
+use crate::encoder::Decodable;
+
+pub(crate) fn decode_var_slice(r: &mut dyn std::io::Read) -> Result<Vec<u8>, Error> {
+    let len = *VarInt::decode(r)?;
+    let mut buf = vec![0; len as usize];
+    r.read_exact(&mut buf)?;
+
+    Ok(buf)
+}
+
+pub(crate) fn decode_fix_slice<const N: usize>(
+    r: &mut dyn std::io::Read,
+) -> Result<[u8; N], Error> {
+    let mut buf: [u8; N] = [0; N];
+    r.read_exact(&mut buf)?;
+
+    Ok(buf)
+}
+
+impl Decodable for Vec<u8> {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        decode_var_slice(r)
+    }
+}
+
+impl Decodable for String {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        let data = decode_var_slice(r)?;
+        String::from_utf8(data).map_err(|_| self::Error::ParseFailed("Invalid String"))
+    }
+}
+
+impl Decodable for PublicKey {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        let data = decode_fix_slice::<{ PublicKey::LEN }>(r)?;
+        PublicKey::try_from(data.as_slice())
+            .map_err(|_| self::Error::ParseFailed("Invalid Public Key"))
+    }
+}
+
+impl Decodable for Signature {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        let data = decode_fix_slice::<{ Signature::LEN }>(r)?;
+        Signature::try_from(data.as_slice())
+            .map_err(|_| self::Error::ParseFailed("Invalid Signature"))
+    }
+}
+
+impl<const N: usize> Decodable for Hash<N> {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        let data = decode_fix_slice::<N>(r)?;
+        Hash::try_from(data.as_slice()).map_err(|_| self::Error::ParseFailed("Invalid Hash"))
+    }
+}
+
+macro_rules! impl_decodable_for_int {
+    ($int:ty, $size:literal) => {
+        impl Decodable for $int {
+            #[inline]
+            fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+                let mut buf = [0; $size];
+                r.read_exact(&mut buf[..])?;
+                Ok(<$int>::from_le_bytes(buf))
+            }
+        }
+    };
+}
+
+impl_decodable_for_int!(u8, 1);
+impl_decodable_for_int!(i32, 4);
+impl_decodable_for_int!(i64, 8);
+impl_decodable_for_int!(u16, 2);
+impl_decodable_for_int!(u32, 4);
+impl_decodable_for_int!(u64, 8);
+
+#[cfg(test)]
+mod tests {
+    use std::io::Cursor;
+
+    use tw_encoding::hex::DecodeHex;
+
+    use super::*;
+    use crate::encoder::deserialize;
+
+    #[test]
+    fn test_decode_var_slice() {
+        let expected = vec![1, 2, 3, 4];
+        let mut cursor = Cursor::new("0401020304".decode_hex().unwrap());
+        let slice = decode_var_slice(&mut cursor).unwrap();
+
+        assert_eq!(expected, slice);
+    }
+
+    #[test]
+    fn test_decode_fix_slice() {
+        let expected = vec![1, 2, 3, 4];
+        let mut cursor = Cursor::new("01020304".decode_hex().unwrap());
+        let slice = decode_fix_slice::<4>(&mut cursor).unwrap();
+
+        assert_eq!(expected, slice);
+    }
+
+    #[test]
+    fn test_encode_numbers() {
+        let data = vec![1_u8, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0];
+        let mut cursor = Cursor::new(data);
+
+        assert_eq!(1u8, u8::decode(&mut cursor).unwrap());
+        assert_eq!(2u16, u16::decode(&mut cursor).unwrap());
+        assert_eq!(3u32, u32::decode(&mut cursor).unwrap());
+        assert_eq!(4u64, u64::decode(&mut cursor).unwrap());
+    }
+
+    #[test]
+    fn test_decode_bytes() {
+        let expected = "0145".decode_hex().unwrap();
+        let bytes = "020145".decode_hex().unwrap();
+
+        assert_eq!(expected, deserialize::<Vec<u8>>(&bytes).unwrap());
+    }
+
+    #[test]
+    fn test_encode_string() {
+        let expected = "hello".to_string();
+        let bytes = "0568656c6c6f056844656c6c6e".decode_hex().unwrap();
+
+        assert_eq!(expected, deserialize::<String>(&bytes).unwrap());
+    }
+}
diff --git a/rust/chains/tw_pactus/src/encoder/encode.rs b/rust/chains/tw_pactus/src/encoder/encode.rs
new file mode 100644
index 00000000000..9840c1873a8
--- /dev/null
+++ b/rust/chains/tw_pactus/src/encoder/encode.rs
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use byteorder::{LittleEndian, WriteBytesExt};
+use tw_hash::Hash;
+use tw_keypair::ed25519::{sha512::PublicKey, Signature};
+
+use super::error::Error;
+use crate::encoder::var_int::VarInt;
+use crate::encoder::Encodable;
+
+pub(crate) fn encode_var_slice(data: &[u8], w: &mut dyn std::io::Write) -> Result<(), Error> {
+    VarInt::from(data.len()).encode(w)?;
+    w.write_all(data)?;
+
+    Ok(())
+}
+
+pub(crate) fn encode_fix_slice(data: &[u8], w: &mut dyn std::io::Write) -> Result<(), Error> {
+    w.write_all(data)?;
+
+    Ok(())
+}
+
+impl Encodable for Vec<u8> {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        encode_var_slice(self, w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        VarInt::from(self.len()).encoded_size() + self.len()
+    }
+}
+
+impl Encodable for String {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        encode_var_slice(self.as_bytes(), w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        VarInt::from(self.len()).encoded_size() + self.len()
+    }
+}
+
+impl Encodable for PublicKey {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        encode_fix_slice(self.as_slice(), w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        PublicKey::LEN
+    }
+}
+
+impl Encodable for Signature {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        encode_fix_slice(self.to_bytes().as_slice(), w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        Signature::LEN
+    }
+}
+
+impl<const N: usize> Encodable for Hash<N> {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        encode_fix_slice(self.as_slice(), w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        N
+    }
+}
+
+impl Encodable for u8 {
+    #[inline]
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        w.write_u8(*self)?;
+
+        Ok(())
+    }
+
+    #[inline]
+    fn encoded_size(&self) -> usize {
+        1
+    }
+}
+
+macro_rules! impl_encodable_for_int {
+    ($int:ty, $size:literal, $write_fn:tt) => {
+        impl Encodable for $int {
+            #[inline]
+            fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+                w.$write_fn::<LittleEndian>(*self)?;
+
+                Ok(())
+            }
+
+            #[inline]
+            fn encoded_size(&self) -> usize {
+                $size
+            }
+        }
+    };
+}
+
+impl_encodable_for_int!(i32, 4, write_i32);
+impl_encodable_for_int!(i64, 8, write_i64);
+impl_encodable_for_int!(u16, 2, write_u16);
+impl_encodable_for_int!(u32, 4, write_u32);
+impl_encodable_for_int!(u64, 8, write_u64);
+
+#[cfg(test)]
+mod tests {
+    use tw_encoding::hex::DecodeHex;
+
+    use super::*;
+    use crate::encoder::serialize;
+
+    #[test]
+    fn test_encode_var_slice() {
+        let expected = "0401020304".decode_hex().unwrap();
+        let slice = vec![1, 2, 3, 4];
+        let mut w = Vec::new();
+        encode_var_slice(&slice, &mut w).unwrap();
+
+        assert_eq!(expected, w.to_vec());
+    }
+
+    #[test]
+    fn test_encode_fix_slice() {
+        let expected = "01020304".decode_hex().unwrap();
+        let slice = vec![1, 2, 3, 4];
+        let mut w = Vec::new();
+        encode_fix_slice(&slice, &mut w).unwrap();
+
+        assert_eq!(expected, w.to_vec());
+    }
+
+    #[test]
+    fn test_encode_numbers() {
+        let mut w = Vec::new();
+
+        1u8.encode(&mut w).unwrap();
+        2u16.encode(&mut w).unwrap();
+        3u32.encode(&mut w).unwrap();
+        4u64.encode(&mut w).unwrap();
+
+        let expected = vec![1_u8, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0];
+        assert_eq!(w.to_vec(), expected);
+    }
+
+    #[test]
+    fn test_encode_bytes() {
+        let expected = "020145".decode_hex().unwrap();
+        let bytes = "0145".decode_hex().unwrap();
+
+        assert_eq!(expected, serialize(&bytes).unwrap());
+        assert_eq!(expected.len(), bytes.encoded_size());
+    }
+
+    #[test]
+    fn test_encode_string() {
+        let expected = "0568656c6c6f".decode_hex().unwrap();
+        let msg = "hello".to_string();
+
+        assert_eq!(expected, serialize(&msg).unwrap());
+        assert_eq!(expected.len(), msg.encoded_size());
+    }
+}
diff --git a/rust/chains/tw_pactus/src/encoder/error.rs b/rust/chains/tw_pactus/src/encoder/error.rs
new file mode 100644
index 00000000000..b3643854a90
--- /dev/null
+++ b/rust/chains/tw_pactus/src/encoder/error.rs
@@ -0,0 +1,20 @@
+use tw_coin_entry::error::prelude::{SigningError, SigningErrorType};
+
+/// Errors encountered when encoding or decoding data.
+#[derive(Debug)]
+pub enum Error {
+    IoError(std::io::Error),
+    ParseFailed(&'static str),
+}
+
+impl From<std::io::Error> for Error {
+    fn from(err: std::io::Error) -> Self {
+        Error::IoError(err)
+    }
+}
+
+impl From<Error> for SigningError {
+    fn from(_: Error) -> Self {
+        SigningError::new(SigningErrorType::Error_input_parse)
+    }
+}
diff --git a/rust/chains/tw_pactus/src/encoder/mod.rs b/rust/chains/tw_pactus/src/encoder/mod.rs
new file mode 100644
index 00000000000..506c3baec67
--- /dev/null
+++ b/rust/chains/tw_pactus/src/encoder/mod.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::io::Cursor;
+
+use error::Error;
+
+pub mod decode;
+pub mod encode;
+pub mod error;
+pub mod var_int;
+
+pub fn serialize<T: Encodable>(t: &T) -> Result<Vec<u8>, Error> {
+    let mut writer = Vec::with_capacity(t.encoded_size());
+    t.encode(&mut writer)?;
+
+    Ok(writer.to_vec())
+}
+
+pub fn deserialize<T: Decodable>(data: &[u8]) -> Result<T, Error> {
+    let mut cursor = Cursor::new(data);
+    T::decode(&mut cursor)
+}
+
+/// Trait for encoding an object into a consistent byte sequence.
+pub trait Encodable {
+    /// Encode the object in consistent and deterministic way.
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error>;
+
+    /// Determine the size of serialized object.
+    fn encoded_size(&self) -> usize;
+}
+
+/// Trait for decoding an object from a byte sequence.
+pub trait Decodable: Sized {
+    /// Decode the object in consistent and deterministic way.
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error>;
+}
diff --git a/rust/chains/tw_pactus/src/encoder/var_int.rs b/rust/chains/tw_pactus/src/encoder/var_int.rs
new file mode 100644
index 00000000000..aba98f95f4f
--- /dev/null
+++ b/rust/chains/tw_pactus/src/encoder/var_int.rs
@@ -0,0 +1,198 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::ops::Deref;
+
+use byteorder::ReadBytesExt;
+
+use super::{error::Error, Decodable};
+use crate::encoder::Encodable;
+
+/// A type of variable-length integer used in the Pactus blockchain to serialize a variable-length integer.
+#[derive(Default, Debug, Clone, Copy, PartialEq)]
+pub struct VarInt(u64);
+
+impl From<usize> for VarInt {
+    fn from(value: usize) -> Self {
+        VarInt(value as u64)
+    }
+}
+
+impl Deref for VarInt {
+    type Target = u64;
+
+    fn deref(&self) -> &u64 {
+        &self.0
+    }
+}
+
+impl Encodable for VarInt {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        let mut val = self.0;
+        // Make sure that there is one after this
+        while val >= 0x80 {
+            let n = (val as u8 & 0x7f) | 0x80;
+            w.write_all(&[n])?;
+            val >>= 7; // It should be in multiples of 7, this should just get the next part
+        }
+
+        w.write_all(&[val as u8])?;
+
+        Ok(())
+    }
+
+    fn encoded_size(&self) -> usize {
+        match self.0 {
+            val if val >= 0x8000000000000000 => 10,
+            val if val >= 0x100000000000000 => 9,
+            val if val >= 0x2000000000000 => 8,
+            val if val >= 0x40000000000 => 7,
+            val if val >= 0x800000000 => 6,
+            val if val >= 0x10000000 => 5,
+            val if val >= 0x200000 => 4,
+            val if val >= 0x4000 => 3,
+            val if val >= 0x80 => 2,
+            _ => 1,
+        }
+    }
+}
+
+impl Decodable for VarInt {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        let mut res: Vec<u8> = vec![];
+        loop {
+            let n = r.read_u8()?;
+            // Zero in any position other than the first is invalid
+            // since it is not the shortest encoding.
+            if n == 0 && !res.is_empty() {
+                return Err(Error::ParseFailed("VarInt has a zero in a position other than the first. This is not the shortest encoding."));
+            }
+            res.push(n & 0b0111_1111);
+            if n & 0b1000_0000 == 0 {
+                break;
+            }
+        }
+        let mut int = 0u64;
+        res.reverse();
+        let (last, arr) = res.split_last().unwrap();
+        for bits in arr {
+            int |= *bits as u64;
+            int = if int.leading_zeros() >= 7 {
+                int << 7
+            } else {
+                return Err(Error::ParseFailed("VarInt overflows u64"));
+            };
+        }
+        int |= *last as u64;
+        Ok(VarInt(int))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+
+    use super::*;
+    use crate::encoder::deserialize;
+
+    #[test]
+    fn test_var_int_encode_data() {
+        let mut w = Vec::new();
+
+        VarInt::from(0x00_usize).encode(&mut w).unwrap();
+        VarInt::from(0xfc_usize).encode(&mut w).unwrap();
+        VarInt::from(0xfd_usize).encode(&mut w).unwrap();
+        VarInt::from(0xffff_usize).encode(&mut w).unwrap();
+        VarInt::from(0x01_0000_usize).encode(&mut w).unwrap();
+        VarInt::from(0xffff_ffff_usize).encode(&mut w).unwrap();
+        VarInt(0x01_0000_0000_u64).encode(&mut w).unwrap();
+
+        let expected = vec![
+            0x00, // 0x00
+            0xfc, 0x01, // 0xfc
+            0xfd, 0x01, // 0xfd
+            0xff, 0xff, 0x03, // 0xffff
+            0x80, 0x80, 0x04, // 0x01_0000
+            0xff, 0xff, 0xff, 0xff, 0x0f, // 0xffff_ffff
+            0x80, 0x80, 0x80, 0x80, 0x10, // 0x01_0000_0000
+        ];
+
+        assert_eq!(w.to_vec(), expected);
+    }
+
+    // Define the common test cases as a constant
+    const VARINT_TEST_CASES: &[(u64, &[u8])] = &[
+        (0x0u64, &[0x00u8]),
+        (0xffu64, &[0xff, 0x01]),
+        (0x7fffu64, &[0xff, 0xff, 0x01]),
+        (0x3fffffu64, &[0xff, 0xff, 0xff, 0x01]),
+        (0x1fffffffu64, &[0xff, 0xff, 0xff, 0xff, 0x01]),
+        (0xfffffffffu64, &[0xff, 0xff, 0xff, 0xff, 0xff, 0x01]),
+        (
+            0x7ffffffffffu64,
+            &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01],
+        ),
+        (
+            0x3ffffffffffffu64,
+            &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01],
+        ),
+        (
+            0x1ffffffffffffffu64,
+            &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01],
+        ),
+        (
+            0xffffffffffffffffu64,
+            &[0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01],
+        ),
+        (0x200u64, &[0x80, 0x04]),
+        (0x027fu64, &[0xff, 0x04]),
+        (0xff00000000u64, &[0x80, 0x80, 0x80, 0x80, 0xf0, 0x1f]),
+        (0xffffffffu64, &[0xff, 0xff, 0xff, 0xff, 0x0f]),
+        (0x100000000u64, &[0x80, 0x80, 0x80, 0x80, 0x10]),
+        (0x7ffffffffu64, &[0xff, 0xff, 0xff, 0xff, 0x7f]),
+        (0x800000000u64, &[0x80, 0x80, 0x80, 0x80, 0x80, 0x01]),
+    ];
+
+    #[test]
+    fn test_var_int_encode() {
+        for (i, (value, encoded)) in VARINT_TEST_CASES.iter().enumerate() {
+            let mut w = Vec::new();
+            let var_int = VarInt(*value);
+            let encoded_size = var_int.encoded_size();
+            var_int.encode(&mut w).unwrap();
+            let out = w.as_slice();
+
+            assert_eq!(out, *encoded, "Test {i} failed: data mismatch");
+            assert_eq!(
+                encoded_size,
+                out.len(),
+                "Test {i} failed: encoded size mismatch"
+            );
+        }
+    }
+
+    #[test]
+    fn test_var_int_decode() {
+        for (i, (value, data)) in VARINT_TEST_CASES.iter().enumerate() {
+            let var_int = deserialize::<VarInt>(data).unwrap();
+
+            assert_eq!(*value, *var_int, "Test {i} failed: value mismatch");
+        }
+    }
+
+    #[test]
+    fn test_var_int_parse_error() {
+        // varint must be shortest encoding
+        let res = deserialize::<VarInt>(&[0x98, 0]);
+        assert!(matches!(res.unwrap_err(), Error::ParseFailed(_)));
+
+        // If the last number is not a 0, it will error with an IO error (UnexpectedEof)
+        let res = deserialize::<VarInt>(&[0xff; 1]);
+        assert!(matches!(res.unwrap_err(), Error::IoError(_)));
+
+        let res = deserialize::<VarInt>(&[
+            0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 1u8,
+        ]);
+        assert!(matches!(res.unwrap_err(), Error::ParseFailed(_)));
+    }
+}
diff --git a/rust/chains/tw_pactus/src/entry.rs b/rust/chains/tw_pactus/src/entry.rs
new file mode 100644
index 00000000000..e9d12f3ac8c
--- /dev/null
+++ b/rust/chains/tw_pactus/src/entry.rs
@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_keypair::tw::PublicKey;
+use tw_proto::Pactus::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+use crate::compiler::PactusCompiler;
+use crate::modules::transaction_util::PactusTransactionUtil;
+use crate::signer::PactusSigner;
+use crate::types::Address;
+
+pub struct PactusEntry;
+
+impl CoinEntry for PactusEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+    type TransactionUtil = PactusTransactionUtil;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let public_key = public_key
+            .to_ed25519()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        Address::from_public_key(public_key)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        PactusSigner::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        PactusCompiler::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        PactusCompiler::compile(coin, input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(PactusTransactionUtil)
+    }
+}
diff --git a/rust/chains/tw_pactus/src/lib.rs b/rust/chains/tw_pactus/src/lib.rs
new file mode 100644
index 00000000000..938d9bba25a
--- /dev/null
+++ b/rust/chains/tw_pactus/src/lib.rs
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod compiler;
+pub mod encoder;
+pub mod entry;
+pub mod modules;
+pub mod signer;
+pub mod transaction;
+pub mod types;
diff --git a/rust/chains/tw_pactus/src/modules/mod.rs b/rust/chains/tw_pactus/src/modules/mod.rs
new file mode 100644
index 00000000000..b09e92443b1
--- /dev/null
+++ b/rust/chains/tw_pactus/src/modules/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod transaction_util;
+pub mod tx_builder;
diff --git a/rust/chains/tw_pactus/src/modules/transaction_util.rs b/rust/chains/tw_pactus/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..a28e72b8f35
--- /dev/null
+++ b/rust/chains/tw_pactus/src/modules/transaction_util.rs
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_util::TransactionUtil;
+use tw_encoding::hex;
+
+use crate::encoder::deserialize;
+use crate::transaction::Transaction;
+
+pub struct PactusTransactionUtil;
+
+impl TransactionUtil for PactusTransactionUtil {
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        Self::calc_tx_hash_impl(coin, encoded_tx)
+    }
+}
+
+impl PactusTransactionUtil {
+    fn calc_tx_hash_impl(_coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        let trx_bytes = hex::decode(encoded_tx).map_err(|_| SigningErrorType::Error_input_parse)?;
+
+        let trx = deserialize::<Transaction>(&trx_bytes)?;
+
+        Ok(hex::encode(trx.id(), false))
+    }
+}
diff --git a/rust/chains/tw_pactus/src/modules/tx_builder.rs b/rust/chains/tw_pactus/src/modules/tx_builder.rs
new file mode 100644
index 00000000000..e9e2449be96
--- /dev/null
+++ b/rust/chains/tw_pactus/src/modules/tx_builder.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::payload::{BondPayload, Payload, TransferPayload};
+use crate::transaction::Transaction;
+use crate::types::{Address, Amount, ValidatorPublicKey};
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::Pactus;
+
+pub struct TxBuilder;
+
+impl TxBuilder {
+    pub fn from_proto(input: &Pactus::Proto::SigningInput) -> SigningResult<Transaction> {
+        match &input.transaction {
+            None => SigningError::err(SigningErrorType::Error_invalid_params),
+            Some(trx) => {
+                let payload: Box<dyn Payload> = match &trx.payload {
+                    Pactus::Proto::mod_TransactionMessage::OneOfpayload::transfer(pld) => {
+                        let sender = Address::from_str(&pld.sender)?;
+                        let receiver = Address::from_str(&pld.receiver)?;
+                        Box::new(TransferPayload::new(sender, receiver, Amount(pld.amount)))
+                    },
+                    Pactus::Proto::mod_TransactionMessage::OneOfpayload::bond(pld) => {
+                        let sender = Address::from_str(&pld.sender)?;
+                        let receiver = Address::from_str(&pld.receiver)?;
+                        let public_key = if !pld.public_key.is_empty() {
+                            Some(ValidatorPublicKey::from_str(&pld.public_key)?)
+                        } else {
+                            None
+                        };
+
+                        Box::new(BondPayload::new(
+                            sender,
+                            receiver,
+                            Amount(pld.stake),
+                            public_key,
+                        ))
+                    },
+                    Pactus::Proto::mod_TransactionMessage::OneOfpayload::None => {
+                        return SigningError::err(SigningErrorType::Error_invalid_params)
+                    },
+                };
+
+                Ok(Transaction::new(
+                    trx.lock_time,
+                    Amount(trx.fee),
+                    trx.memo.to_string(),
+                    payload,
+                ))
+            },
+        }
+    }
+}
diff --git a/rust/chains/tw_pactus/src/signer.rs b/rust/chains/tw_pactus/src/signer.rs
new file mode 100644
index 00000000000..baf4f0a068b
--- /dev/null
+++ b/rust/chains/tw_pactus/src/signer.rs
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_keypair::ed25519;
+use tw_keypair::traits::KeyPairTrait;
+use tw_proto::Pactus::Proto;
+
+use crate::modules::tx_builder::TxBuilder;
+
+pub struct PactusSigner;
+
+impl PactusSigner {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let mut trx = TxBuilder::from_proto(&input)?;
+        let key_pair = ed25519::sha512::KeyPair::try_from(input.private_key.as_ref())?;
+        let signature = trx.sign(key_pair.private())?;
+
+        let data = trx.to_bytes()?;
+
+        let output = Proto::SigningOutput {
+            transaction_id: trx.id().into(),
+            signed_transaction_data: data.into(),
+            signature: signature.to_bytes().to_vec().into(),
+            ..Proto::SigningOutput::default()
+        };
+
+        Ok(output)
+    }
+}
diff --git a/rust/chains/tw_pactus/src/transaction/mod.rs b/rust/chains/tw_pactus/src/transaction/mod.rs
new file mode 100644
index 00000000000..6e00ff37699
--- /dev/null
+++ b/rust/chains/tw_pactus/src/transaction/mod.rs
@@ -0,0 +1,274 @@
+pub mod payload;
+
+use std::fmt::Debug;
+
+use payload::{BondPayload, Payload, PayloadType, TransferPayload};
+use tw_coin_entry::error::prelude::SigningResult;
+use tw_hash::blake2::blake2_b;
+use tw_keypair::ed25519::sha512::{PrivateKey, PublicKey};
+use tw_keypair::ed25519::Signature;
+use tw_keypair::traits::SigningKeyTrait;
+
+use crate::encoder::error::Error as EncoderError;
+use crate::encoder::{deserialize, Decodable, Encodable};
+use crate::types::Amount;
+
+const VERSION_LATEST: u8 = 1;
+const FLAG_NOT_SIGNED: u8 = 0x02;
+
+#[derive(Debug)]
+pub struct Transaction {
+    flags: u8,
+    version: u8,
+    lock_time: u32,
+    fee: Amount,
+    memo: String,
+    payload: Box<dyn Payload>,
+    signature: Option<Signature>,
+    public_key: Option<PublicKey>,
+}
+
+impl Transaction {
+    pub fn new(lock_time: u32, fee: Amount, memo: String, payload: Box<dyn Payload>) -> Self {
+        Transaction {
+            flags: FLAG_NOT_SIGNED,
+            version: VERSION_LATEST,
+            lock_time,
+            fee,
+            memo,
+            payload,
+            public_key: None,
+            signature: None,
+        }
+    }
+
+    pub fn from_bytes(input: &[u8]) -> SigningResult<Self> {
+        Ok(deserialize::<Transaction>(input)?)
+    }
+
+    pub fn sign(&mut self, private_key: &PrivateKey) -> SigningResult<Signature> {
+        let sign_bytes = self.sign_bytes()?;
+        let signature = private_key.sign(sign_bytes)?;
+
+        self.set_signatory(private_key.public(), signature.clone());
+
+        Ok(signature)
+    }
+
+    pub fn set_signatory(&mut self, public_key: PublicKey, signature: Signature) {
+        // Unset "Not Signed" flag
+        self.flags &= !FLAG_NOT_SIGNED;
+
+        self.public_key = Some(public_key);
+        self.signature = Some(signature);
+    }
+
+    pub fn id(&self) -> Vec<u8> {
+        blake2_b(&self.sign_bytes().unwrap_or_default(), 32).unwrap_or_default()
+    }
+
+    pub fn to_bytes(&self) -> SigningResult<Vec<u8>> {
+        let mut w = Vec::with_capacity(self.encoded_size());
+
+        self.encode(&mut w)?;
+
+        Ok(w.to_vec())
+    }
+
+    pub fn sign_bytes(&self) -> SigningResult<Vec<u8>> {
+        let mut w = Vec::new();
+        self.encode_with_no_signatory(&mut w)?;
+        let mut sign_bytes = w.to_vec();
+        sign_bytes.remove(0); // Remove flags
+
+        Ok(sign_bytes)
+    }
+
+    fn encode_with_no_signatory(&self, w: &mut dyn std::io::Write) -> Result<(), EncoderError> {
+        self.flags.encode(w)?;
+        self.version.encode(w)?;
+        self.lock_time.encode(w)?;
+        self.fee.encode(w)?;
+        self.memo.encode(w)?;
+        self.payload.payload_type().encode(w)?;
+        self.payload.encode(w)?;
+
+        Ok(())
+    }
+
+    fn is_signed(&self) -> bool {
+        self.flags & FLAG_NOT_SIGNED == 0
+    }
+}
+
+impl Encodable for Transaction {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), EncoderError> {
+        self.encode_with_no_signatory(w)?;
+
+        if let Some(sig) = &self.signature {
+            sig.encode(w)?;
+        }
+
+        if let Some(pub_key) = &self.public_key {
+            pub_key.encode(w)?;
+        }
+
+        Ok(())
+    }
+
+    fn encoded_size(&self) -> usize {
+        let mut len = self.flags.encoded_size()
+            + self.version.encoded_size()
+            + self.lock_time.encoded_size()
+            + self.payload.payload_type().encoded_size()
+            + self.fee.encoded_size()
+            + self.memo.encoded_size()
+            + self.payload.encoded_size();
+
+        if let Some(sig) = &self.signature {
+            len += sig.encoded_size();
+        }
+
+        if let Some(pub_key) = &self.public_key {
+            len += pub_key.encoded_size();
+        }
+
+        len
+    }
+}
+
+impl Decodable for Transaction {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, EncoderError> {
+        let flags = u8::decode(r)?;
+        let version = u8::decode(r)?;
+        let lock_time = u32::decode(r)?;
+        let fee = Amount::decode(r)?;
+        let memo = String::decode(r)?;
+        let payload_type = PayloadType::decode(r)?;
+        let payload: Box<dyn Payload> = match payload_type {
+            PayloadType::Transfer => Box::new(TransferPayload::decode(r)?),
+            PayloadType::Bond => Box::new(BondPayload::decode(r)?),
+            _ => return Err(EncoderError::ParseFailed("Unsupported payload")),
+        };
+
+        let mut trx = Transaction {
+            flags,
+            version,
+            lock_time,
+            fee,
+            memo,
+            payload,
+            public_key: None,
+            signature: None,
+        };
+
+        if !trx.is_signed() {
+            return Ok(trx);
+        }
+
+        let signature = Signature::decode(r)?;
+        let public_key = PublicKey::decode(r)?;
+
+        trx.signature = Some(signature);
+        trx.public_key = Some(public_key);
+
+        Ok(trx)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use std::str::FromStr;
+
+    use tw_encoding::hex::DecodeHex;
+
+    use crate::types::Address;
+
+    use super::*;
+
+    #[test]
+    fn test_payload_type_encoding() {
+        let mut stream = Vec::new();
+
+        let payload = PayloadType::Unbond;
+        payload.encode(&mut stream).unwrap();
+        assert_eq!(stream.to_vec(), &[4]);
+    }
+
+    const TRANSACTION_NOT_SIGNED: &str = concat!(
+        "02",                                         // Flags
+        "01",                                         // Version
+        "01020300",                                   // LockTime
+        "e807",                                       // Fee
+        "0474657374",                                 // Memo
+        "01",                                         // PayloadType
+        "037098338e0b6808119dfd4457ab806b9c2059b89b", // Sender
+        "037a14ae24533816e7faaa6ed28fcdde8e55a7df21", // Receiver
+        "a09c01"                                      // Amount
+    );
+
+    const TRANSACTION_SIGNED: &str = concat!(
+        "00",                                                               // Flags
+        "01",                                                               // Version
+        "01020300",                                                         // LockTime
+        "e807",                                                             // Fee
+        "0474657374",                                                       // Memo
+        "01",                                                               // PayloadType
+        "037098338e0b6808119dfd4457ab806b9c2059b89b",                       // Sender
+        "037a14ae24533816e7faaa6ed28fcdde8e55a7df21",                       // Receiver
+        "a09c01",                                                           // Amount
+        "50ac25c7125271489b0cd230549257c93fb8c6265f2914a988ba7b81c1bc47ff", // Signature
+        "f027412dd59447867911035ff69742d171060a1f132ac38b95acc6e39ec0bd09",
+        "95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa" // PublicKey
+    );
+
+    const TX_ID: &str = "34cd4656a98f7eb996e83efdc384cefbe3a9c52dca79a99245b4eacc0b0b4311";
+
+    #[test]
+    fn test_sign_signature() {
+        let expected_data = TRANSACTION_SIGNED.decode_hex().unwrap();
+        let expected_id = TX_ID.decode_hex().unwrap();
+
+        let sender = Address::from_str("pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr").unwrap();
+        let receiver = Address::from_str("pc1r0g22ufzn8qtw0742dmfglnw73e260hep0k3yra").unwrap();
+        let payload = Box::new(TransferPayload::new(sender, receiver, Amount(20000)));
+        let mut trx = Transaction::new(0x00030201, Amount(1000), "test".to_string(), payload);
+
+        let private_key_data = "4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6"
+            .decode_hex()
+            .unwrap();
+        let private_key = PrivateKey::try_from(private_key_data.as_slice()).unwrap();
+        trx.sign(&private_key).unwrap();
+
+        assert_eq!(expected_data, trx.to_bytes().unwrap());
+        assert_eq!(expected_id, trx.id());
+    }
+
+    #[test]
+    fn test_encoding_not_signed() {
+        let data = TRANSACTION_NOT_SIGNED.decode_hex().unwrap();
+        let trx = Transaction::from_bytes(&data).unwrap();
+        let expected_id = TX_ID.decode_hex().unwrap();
+
+        let encoded_data = trx.to_bytes().unwrap();
+
+        assert_eq!(encoded_data, data);
+        assert_eq!(expected_id, trx.id());
+        assert_eq!(trx.encoded_size(), data.len());
+        assert!(!trx.is_signed());
+    }
+
+    #[test]
+    fn test_encoding_signed() {
+        let data = TRANSACTION_SIGNED.decode_hex().unwrap();
+        let trx = Transaction::from_bytes(&data).unwrap();
+        let expected_id = TX_ID.decode_hex().unwrap();
+
+        let encoded_data = trx.to_bytes().unwrap();
+
+        assert_eq!(encoded_data, data);
+        assert_eq!(expected_id, trx.id());
+        assert_eq!(trx.encoded_size(), data.len());
+        assert!(trx.is_signed());
+    }
+}
diff --git a/rust/chains/tw_pactus/src/transaction/payload/bond.rs b/rust/chains/tw_pactus/src/transaction/payload/bond.rs
new file mode 100644
index 00000000000..152fa5a6a7b
--- /dev/null
+++ b/rust/chains/tw_pactus/src/transaction/payload/bond.rs
@@ -0,0 +1,100 @@
+use crate::encoder::error::Error as EncoderError;
+use crate::{
+    encoder::{Decodable, Encodable},
+    types::{Address, Amount, ValidatorPublicKey},
+};
+
+use super::{Payload, PayloadType};
+
+pub const BLS_PUBLIC_KEY_SIZE: usize = 96;
+
+#[derive(Debug)]
+pub struct BondPayload {
+    sender: Address,
+    receiver: Address,
+    stake: Amount,
+    public_key: Option<ValidatorPublicKey>,
+}
+
+impl BondPayload {
+    pub fn new(
+        sender: Address,
+        receiver: Address,
+        stake: Amount,
+        public_key: Option<ValidatorPublicKey>,
+    ) -> Self {
+        BondPayload {
+            sender,
+            receiver,
+            stake,
+            public_key,
+        }
+    }
+}
+
+impl Encodable for BondPayload {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), EncoderError> {
+        self.sender.encode(w)?;
+        self.receiver.encode(w)?;
+
+        match self.public_key {
+            Some(ref public_key) => {
+                (BLS_PUBLIC_KEY_SIZE as u8).encode(w)?;
+                public_key.encode(w)?;
+            },
+            None => {
+                0u8.encode(w)?;
+            },
+        }
+
+        self.stake.encode(w)?;
+        Ok(())
+    }
+
+    fn encoded_size(&self) -> usize {
+        self.sender.encoded_size()
+            + self.receiver.encoded_size()
+            + self.stake.encoded_size()
+            + match self.public_key {
+                Some(ref public_key) => 1 + public_key.encoded_size(),
+                None => 1,
+            }
+    }
+}
+
+impl Decodable for BondPayload {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, EncoderError> {
+        let sender = Address::decode(r)?;
+        let receiver = Address::decode(r)?;
+
+        let mut public_key = None;
+        let public_key_size: u8 = u8::decode(r)?;
+
+        if public_key_size == BLS_PUBLIC_KEY_SIZE as u8 {
+            public_key = Some(ValidatorPublicKey::decode(r)?);
+        } else if public_key_size != 0 {
+            return Err(EncoderError::ParseFailed("invalid public key size"));
+        }
+
+        let stake = Amount::decode(r)?;
+
+        Ok(BondPayload {
+            sender,
+            receiver,
+            stake,
+            public_key,
+        })
+    }
+}
+
+impl Payload for BondPayload {
+    fn signer(&self) -> &Address {
+        &self.sender
+    }
+    fn value(&self) -> Amount {
+        self.stake.clone()
+    }
+    fn payload_type(&self) -> PayloadType {
+        PayloadType::Bond
+    }
+}
diff --git a/rust/chains/tw_pactus/src/transaction/payload/mod.rs b/rust/chains/tw_pactus/src/transaction/payload/mod.rs
new file mode 100644
index 00000000000..110155033dd
--- /dev/null
+++ b/rust/chains/tw_pactus/src/transaction/payload/mod.rs
@@ -0,0 +1,60 @@
+mod bond;
+mod transfer;
+
+pub use bond::BondPayload;
+pub use transfer::TransferPayload;
+
+use std::fmt::Debug;
+
+use crate::encoder::error::Error as EncoderError;
+use crate::{
+    encoder::{Decodable, Encodable},
+    types::{Address, Amount},
+};
+
+#[derive(Debug, Clone, Copy)]
+#[repr(u8)]
+pub enum PayloadType {
+    Transfer = 1,
+    Bond = 2,
+    Sortition = 3,
+    Unbond = 4,
+    Withdraw = 5,
+}
+
+impl TryFrom<u8> for PayloadType {
+    type Error = EncoderError;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            1 => Ok(PayloadType::Transfer),
+            2 => Ok(PayloadType::Bond),
+            3 => Ok(PayloadType::Sortition),
+            4 => Ok(PayloadType::Unbond),
+            5 => Ok(PayloadType::Withdraw),
+            _ => Err(EncoderError::ParseFailed("Invalid PayloadType value")),
+        }
+    }
+}
+
+impl Encodable for PayloadType {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), EncoderError> {
+        (*self as u8).encode(w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        1
+    }
+}
+
+impl Decodable for PayloadType {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, EncoderError> {
+        PayloadType::try_from(u8::decode(r)?)
+    }
+}
+
+pub trait Payload: Debug + Encodable {
+    fn signer(&self) -> &Address;
+    fn value(&self) -> Amount;
+    fn payload_type(&self) -> PayloadType;
+}
diff --git a/rust/chains/tw_pactus/src/transaction/payload/transfer.rs b/rust/chains/tw_pactus/src/transaction/payload/transfer.rs
new file mode 100644
index 00000000000..a39854c0429
--- /dev/null
+++ b/rust/chains/tw_pactus/src/transaction/payload/transfer.rs
@@ -0,0 +1,64 @@
+use crate::encoder::error::Error as EncoderError;
+use crate::{
+    encoder::{Decodable, Encodable},
+    types::{Address, Amount},
+};
+
+use super::{Payload, PayloadType};
+
+#[derive(Debug)]
+pub struct TransferPayload {
+    sender: Address,
+    receiver: Address,
+    amount: Amount,
+}
+
+impl TransferPayload {
+    pub fn new(sender: Address, receiver: Address, amount: Amount) -> Self {
+        TransferPayload {
+            sender,
+            receiver,
+            amount,
+        }
+    }
+}
+
+impl Encodable for TransferPayload {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), EncoderError> {
+        self.sender.encode(w)?;
+        self.receiver.encode(w)?;
+        self.amount.encode(w)?;
+
+        Ok(())
+    }
+
+    fn encoded_size(&self) -> usize {
+        self.sender.encoded_size() + self.receiver.encoded_size() + self.amount.encoded_size()
+    }
+}
+
+impl Decodable for TransferPayload {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, EncoderError> {
+        let sender = Address::decode(r)?;
+        let receiver = Address::decode(r)?;
+        let amount = Amount::decode(r)?;
+
+        Ok(TransferPayload {
+            sender,
+            receiver,
+            amount,
+        })
+    }
+}
+
+impl Payload for TransferPayload {
+    fn signer(&self) -> &Address {
+        &self.sender
+    }
+    fn value(&self) -> Amount {
+        self.amount.clone()
+    }
+    fn payload_type(&self) -> PayloadType {
+        PayloadType::Transfer
+    }
+}
diff --git a/rust/chains/tw_pactus/src/types/address.rs b/rust/chains/tw_pactus/src/types/address.rs
new file mode 100644
index 00000000000..785e82c6639
--- /dev/null
+++ b/rust/chains/tw_pactus/src/types/address.rs
@@ -0,0 +1,335 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::fmt;
+use std::str::FromStr;
+
+use bech32::{FromBase32, ToBase32};
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::blake2::blake2_b;
+use tw_hash::ripemd::ripemd_160;
+use tw_hash::H160;
+use tw_keypair::ed25519::sha512::PublicKey;
+use tw_memory::Data;
+
+use crate::encoder::error::Error;
+use crate::encoder::{Decodable, Encodable};
+
+const ADDRESS_HRP: &str = "pc";
+const TREASURY_ADDRESS_STRING: &str = "000000000000000000000000000000000000000000";
+
+/// Enum for Pactus address types.
+#[derive(Debug, Clone, PartialEq)]
+pub enum AddressType {
+    Treasury = 0,
+    Validator = 1,
+    BlsAccount = 2,
+    Ed25519Account = 3,
+}
+
+impl TryFrom<u8> for AddressType {
+    type Error = AddressError;
+
+    fn try_from(value: u8) -> Result<Self, Self::Error> {
+        match value {
+            0 => Ok(AddressType::Treasury),
+            1 => Ok(AddressType::Validator),
+            2 => Ok(AddressType::BlsAccount),
+            3 => Ok(AddressType::Ed25519Account),
+            _ => Err(AddressError::Unsupported),
+        }
+    }
+}
+
+impl Encodable for AddressType {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        (self.clone() as u8).encode(w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        1
+    }
+}
+
+impl Decodable for AddressType {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        AddressType::try_from(u8::decode(r)?)
+            .map_err(|_| Error::ParseFailed("Invalid address type"))
+    }
+}
+
+/// Pactus addresses are 21 bytes long.
+/// The first byte indicates the address type, and the remaining 20 bytes
+/// represent the hash of the public key.
+/// The hash is computed as RIPEMD160(Blake2b(public key)).
+#[derive(Debug, Clone, PartialEq)]
+pub struct Address {
+    addr_type: AddressType,
+    pub_hash: H160,
+}
+
+impl Address {
+    pub fn from_public_key(public_key: &PublicKey) -> Result<Self, AddressError> {
+        let pud_data = public_key.to_bytes();
+        let pub_hash_data =
+            ripemd_160(&blake2_b(pud_data.as_ref(), 32).map_err(|_| AddressError::Internal)?);
+        let pub_hash = Address::vec_to_pub_hash(pub_hash_data)?;
+
+        Ok(Address {
+            addr_type: AddressType::Ed25519Account,
+            pub_hash,
+        })
+    }
+
+    pub fn is_treasury(&self) -> bool {
+        self.addr_type == AddressType::Treasury && self.pub_hash.is_zero()
+    }
+
+    pub fn vec_to_pub_hash(vec: Vec<u8>) -> Result<H160, AddressError> {
+        H160::try_from(vec.as_slice()).map_err(|_| AddressError::Internal)
+    }
+}
+
+impl CoinAddress for Address {
+    #[inline]
+    fn data(&self) -> Data {
+        let mut data = Vec::with_capacity(21);
+        data.push(self.addr_type.clone() as u8);
+        data.extend_from_slice(self.pub_hash.as_ref());
+
+        data
+    }
+}
+
+// Pactus addresses are encoded into a string format using the Bech32m encoding scheme.
+impl fmt::Display for Address {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.is_treasury() {
+            return f.write_str(TREASURY_ADDRESS_STRING);
+        }
+
+        let mut b32 = Vec::with_capacity(33);
+
+        b32.push(bech32::u5::try_from_u8(self.addr_type.clone() as u8).map_err(|_| fmt::Error)?);
+        b32.extend_from_slice(&self.pub_hash.to_vec().to_base32());
+        bech32::encode_to_fmt(f, ADDRESS_HRP, &b32, bech32::Variant::Bech32m)
+            .map_err(|_| fmt::Error)?
+    }
+}
+
+impl Encodable for Address {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        self.addr_type.encode(w)?;
+
+        if self.is_treasury() {
+            return Ok(());
+        }
+
+        self.pub_hash.encode(w)?;
+
+        Ok(())
+    }
+
+    fn encoded_size(&self) -> usize {
+        if self.is_treasury() {
+            return 1;
+        }
+
+        21
+    }
+}
+
+impl Decodable for Address {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        let addr_type = AddressType::decode(r)?;
+        if addr_type == AddressType::Treasury {
+            return Ok(Address {
+                addr_type,
+                pub_hash: H160::new(),
+            });
+        }
+
+        let pub_hash = H160::decode(r)?;
+        Ok(Address {
+            addr_type,
+            pub_hash,
+        })
+    }
+}
+
+impl FromStr for Address {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, AddressError> {
+        if s == TREASURY_ADDRESS_STRING {
+            return Ok(Address {
+                addr_type: AddressType::Treasury,
+                pub_hash: H160::new(),
+            });
+        }
+
+        let (hrp, b32, _variant) = bech32::decode(s).map_err(|_| AddressError::FromBech32Error)?;
+
+        if hrp != ADDRESS_HRP {
+            return Err(AddressError::InvalidHrp);
+        }
+
+        if b32.len() != 33 {
+            return Err(AddressError::InvalidInput);
+        }
+
+        let addr_type = AddressType::try_from(b32[0].to_u8())?;
+        let b8 = Vec::<u8>::from_base32(&b32[1..]).map_err(|_| AddressError::InvalidInput)?;
+        let pub_hash = Address::vec_to_pub_hash(b8)?;
+
+        Ok(Address {
+            addr_type,
+            pub_hash,
+        })
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use tw_encoding::hex::{DecodeHex, ToHex};
+    use tw_keypair::ed25519::sha512::PrivateKey;
+
+    use super::*;
+    use crate::encoder::{deserialize, Encodable};
+
+    #[test]
+    fn test_treasury_address_encoding() {
+        let addr = Address::from_str(TREASURY_ADDRESS_STRING).unwrap();
+        assert!(addr.is_treasury());
+
+        let mut w = Vec::new();
+        addr.encode(&mut w).unwrap();
+        assert_eq!(w.to_vec(), [0x00]);
+        assert_eq!(addr.encoded_size(), 1);
+    }
+
+    #[test]
+    fn test_treasury_address_decoding() {
+        let data = vec![0u8];
+
+        let addr = deserialize::<Address>(&data).unwrap();
+        assert!(addr.is_treasury());
+        assert_eq!(addr.to_string(), TREASURY_ADDRESS_STRING);
+    }
+
+    #[test]
+    fn test_address_encoding() {
+        let addr = Address::from_str("pc1rqqqsyqcyq5rqwzqfpg9scrgwpuqqzqsr36kkra").unwrap();
+        assert!(!addr.is_treasury());
+
+        let mut w = Vec::new();
+        addr.encode(&mut w).unwrap();
+        assert_eq!(
+            w.to_vec(),
+            "03000102030405060708090a0b0c0d0e0f00010203"
+                .decode_hex()
+                .unwrap()
+        );
+        assert_eq!(addr.encoded_size(), 21);
+    }
+
+    #[test]
+    fn test_address_decoding() {
+        let data = "03000102030405060708090a0b0c0d0e0f00010203"
+            .decode_hex()
+            .unwrap();
+
+        let addr = deserialize::<Address>(&data).unwrap();
+        assert!(!addr.is_treasury());
+        assert_eq!(
+            addr.to_string(),
+            "pc1rqqqsyqcyq5rqwzqfpg9scrgwpuqqzqsr36kkra"
+        );
+    }
+
+    #[test]
+    fn test_address_string() {
+        struct TestCase<'a> {
+            name: &'a str,
+            addr_type: AddressType,
+            pub_hash: &'a str,
+            expected_addr: &'a str,
+        }
+
+        // Define a list of test cases for encoding and decoding
+        let test_cases = vec![
+            TestCase {
+                name: "Type Treasury (0)",
+                addr_type: AddressType::Treasury,
+                pub_hash: "0000000000000000000000000000000000000000",
+                expected_addr: TREASURY_ADDRESS_STRING,
+            },
+            TestCase {
+                name: "Type Validator (1)",
+                addr_type: AddressType::Validator,
+                pub_hash: "000102030405060708090a0b0c0d0e0f00010203",
+                expected_addr: "pc1pqqqsyqcyq5rqwzqfpg9scrgwpuqqzqsr803qet",
+            },
+            TestCase {
+                name: "Type BLS-Account (2)",
+                addr_type: AddressType::BlsAccount,
+                pub_hash: "000102030405060708090a0b0c0d0e0f00010203",
+                expected_addr: "pc1zqqqsyqcyq5rqwzqfpg9scrgwpuqqzqsr6ypawk",
+            },
+            TestCase {
+                name: "Type Secp256k1-Account (3)",
+                addr_type: AddressType::Ed25519Account,
+                pub_hash: "000102030405060708090a0b0c0d0e0f00010203",
+                expected_addr: "pc1rqqqsyqcyq5rqwzqfpg9scrgwpuqqzqsr36kkra",
+            },
+        ];
+
+        for case in test_cases {
+            let pub_hash_data = case.pub_hash.decode_hex().unwrap();
+            let addr = Address {
+                addr_type: case.addr_type,
+                pub_hash: Address::vec_to_pub_hash(pub_hash_data).unwrap(),
+            };
+
+            let addr_str = addr.to_string();
+            assert_eq!(addr_str, case.expected_addr, "test {} failed", case.name);
+        }
+    }
+
+    #[test]
+    fn test_encodable() {
+        let expected_data = "03b281dee7850ca2272d9ba95b16d48030821aaf27"
+            .decode_hex()
+            .unwrap();
+        let private_key = PrivateKey::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let address = Address::from_public_key(&private_key.public()).unwrap();
+        let mut w = Vec::new();
+
+        address.encode(&mut w).unwrap();
+
+        assert_eq!(expected_data, w.to_vec(),);
+        assert_eq!(expected_data.len(), address.encoded_size());
+    }
+
+    #[test]
+    fn test_address_from_private_key() {
+        let private_key_data = "4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6"
+            .decode_hex()
+            .unwrap();
+        let private_key = PrivateKey::try_from(private_key_data.as_slice()).unwrap();
+        let public_key = private_key.public();
+        let address = Address::from_public_key(&public_key).unwrap();
+
+        let expected_public_key =
+            "95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa";
+        let expected_address = "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr";
+
+        assert_eq!(public_key.to_bytes().to_hex(), expected_public_key);
+        assert_eq!(address.to_string(), expected_address);
+    }
+}
diff --git a/rust/chains/tw_pactus/src/types/amount.rs b/rust/chains/tw_pactus/src/types/amount.rs
new file mode 100644
index 00000000000..84c9e156e6a
--- /dev/null
+++ b/rust/chains/tw_pactus/src/types/amount.rs
@@ -0,0 +1,20 @@
+use crate::encoder::{error::Error, var_int::VarInt, Decodable, Encodable};
+
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub struct Amount(pub i64);
+
+impl Encodable for Amount {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        VarInt::from(self.0 as usize).encode(w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        VarInt::from(self.0 as usize).encoded_size()
+    }
+}
+
+impl Decodable for Amount {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        Ok(Amount(*VarInt::decode(r)? as i64))
+    }
+}
diff --git a/rust/chains/tw_pactus/src/types/mod.rs b/rust/chains/tw_pactus/src/types/mod.rs
new file mode 100644
index 00000000000..ff66b91c4f4
--- /dev/null
+++ b/rust/chains/tw_pactus/src/types/mod.rs
@@ -0,0 +1,7 @@
+pub mod address;
+pub mod amount;
+pub mod validator_public_key;
+
+pub use address::Address;
+pub use amount::Amount;
+pub use validator_public_key::ValidatorPublicKey;
diff --git a/rust/chains/tw_pactus/src/types/validator_public_key.rs b/rust/chains/tw_pactus/src/types/validator_public_key.rs
new file mode 100644
index 00000000000..84425774143
--- /dev/null
+++ b/rust/chains/tw_pactus/src/types/validator_public_key.rs
@@ -0,0 +1,105 @@
+use crate::encoder::error::Error;
+use crate::encoder::{decode::decode_fix_slice, encode::encode_fix_slice};
+use crate::encoder::{Decodable, Encodable};
+use bech32::FromBase32;
+use std::str::FromStr;
+use tw_keypair::KeyPairError;
+
+pub const BLS_PUBLIC_KEY_SIZE: usize = 96;
+pub const PUBLIC_KEY_HRP: &str = "public";
+
+#[derive(Debug)]
+pub struct ValidatorPublicKey(pub [u8; BLS_PUBLIC_KEY_SIZE]);
+
+impl Encodable for ValidatorPublicKey {
+    fn encode(&self, w: &mut dyn std::io::Write) -> Result<(), Error> {
+        encode_fix_slice(&self.0, w)
+    }
+
+    fn encoded_size(&self) -> usize {
+        BLS_PUBLIC_KEY_SIZE
+    }
+}
+
+impl Decodable for ValidatorPublicKey {
+    fn decode(r: &mut dyn std::io::Read) -> Result<Self, Error> {
+        Ok(ValidatorPublicKey(decode_fix_slice::<BLS_PUBLIC_KEY_SIZE>(
+            r,
+        )?))
+    }
+}
+
+impl FromStr for ValidatorPublicKey {
+    type Err = KeyPairError;
+
+    fn from_str(s: &str) -> Result<Self, KeyPairError> {
+        let (hrp, b32, _variant) = bech32::decode(s).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        if hrp != PUBLIC_KEY_HRP {
+            return Err(KeyPairError::InvalidPublicKey);
+        }
+
+        let b8 = Vec::<u8>::from_base32(&b32[1..]).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        let pub_data = b8.try_into().map_err(|_| KeyPairError::InvalidPublicKey)?;
+
+        Ok(ValidatorPublicKey(pub_data))
+    }
+}
+
+#[cfg(test)]
+mod test {
+    use std::str::FromStr;
+
+    use tw_encoding::hex::DecodeHex;
+
+    use crate::types::ValidatorPublicKey;
+
+    #[test]
+    fn test_public_key_string() {
+        struct TestCase<'a> {
+            name: &'a str,
+            pub_key_str: &'a str,
+            pub_key_data: &'a str,
+        }
+
+        // Define a list of test cases for encoding and decoding
+        let test_cases = vec![
+            TestCase {
+                name: "invalid checksum",
+                pub_key_str: "public1p4u8hfytl2pj6l9rj0t54gxcdmna4hq52ncqkkqjf3arha5mlk3x4mzpyjkhmdl20jae7f65aamjrvqcvf4sudcapz52ctcwc8r9wz3z2gwxs38880cgvfy49ta5ssyjut05myd4zgmjqstggmetyuyg7v5jhx470",
+                pub_key_data: "",
+            },
+            TestCase {
+                name: "invalid length: 95",
+                pub_key_str: "public1p4u8hfytl2pj6l9rj0t54gxcdmna4hq52ncqkkqjf3arha5mlk3x4mzpyjkhmdl20jae7f65aamjrvqcvf4sudcapz52ctcwc8r9wz3z2gwxs38880cgvfy49ta5ssyjut05myd4zgmjqstggmetyuyg73y98kl",
+                pub_key_data: "",
+            },
+            TestCase {
+                name: "invalid HRP",
+                pub_key_str: "xxx1p4u8hfytl2pj6l9rj0t54gxcdmna4hq52ncqkkqjf3arha5mlk3x4mzpyjkhmdl20jae7f65aamjrvqcvf4sudcapz52ctcwc8r9wz3z2gwxs38880cgvfy49ta5ssyjut05myd4zgmjqstggmetyuyg7v5evslaq",
+                pub_key_data: "",
+            },
+            TestCase {
+                name: "OK",
+                pub_key_str: "public1p4u8hfytl2pj6l9rj0t54gxcdmna4hq52ncqkkqjf3arha5mlk3x4mzpyjkhmdl20jae7f65aamjrvqcvf4sudcapz52ctcwc8r9wz3z2gwxs38880cgvfy49ta5ssyjut05myd4zgmjqstggmetyuyg7v5jhx47a",
+                pub_key_data: "af0f74917f5065af94727ae9541b0ddcfb5b828a9e016b02498f477ed37fb44d5d882495afb6fd4f9773e4ea9deee436030c4d61c6e3a1151585e1d838cae1444a438d089ce77e10c492a55f6908125c5be9b236a246e4082d08de564e111e65",
+            },
+       ];
+
+        for case in test_cases {
+            let pub_key_data = case.pub_key_data.decode_hex().unwrap().to_vec();
+            let test_result = ValidatorPublicKey::from_str(case.pub_key_str);
+
+            if pub_key_data.is_empty() {
+                assert!(test_result.is_err());
+            } else {
+                assert!(test_result.is_ok());
+                assert_eq!(
+                    test_result.unwrap().0.to_vec(),
+                    pub_key_data,
+                    "test {} failed",
+                    case.name
+                );
+            }
+        }
+    }
+}
diff --git a/rust/chains/tw_ronin/Cargo.toml b/rust/chains/tw_ronin/Cargo.toml
new file mode 100644
index 00000000000..fadcf48ebab
--- /dev/null
+++ b/rust/chains/tw_ronin/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "tw_ronin"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_evm = { path = "../../tw_evm" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
+
+[dev-dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry", features = ["test-utils"] }
+tw_encoding = { path = "../../tw_encoding" }
+tw_number = { path = "../../tw_number", features = ["helpers"] }
diff --git a/rust/chains/tw_ronin/src/address.rs b/rust/chains/tw_ronin/src/address.rs
new file mode 100644
index 00000000000..73bdaf91624
--- /dev/null
+++ b/rust/chains/tw_ronin/src/address.rs
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_evm::address::{Address as EthAddress, EvmAddress};
+use tw_keypair::ecdsa::secp256k1;
+use tw_memory::Data;
+
+/// cbindgen:ignore
+const RONIN_PREFIX: &str = "ronin:";
+
+#[derive(Debug)]
+pub struct Address(EthAddress);
+
+impl Address {
+    /// Initializes an address with a `secp256k1` public key.
+    #[inline]
+    pub fn with_secp256k1_pubkey(pubkey: &secp256k1::PublicKey) -> Address {
+        Address(EthAddress::with_secp256k1_pubkey(pubkey))
+    }
+}
+
+impl EvmAddress for Address {}
+
+impl From<Address> for EthAddress {
+    #[inline]
+    fn from(addr: Address) -> Self {
+        addr.0
+    }
+}
+
+impl FromStr for Address {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        // Accept both Ronin and standard addresses.
+        let standard = match s.strip_prefix(RONIN_PREFIX) {
+            Some(ronin_no_prefix) => format!("0x{ronin_no_prefix}"),
+            None => s.to_string(),
+        };
+        EthAddress::from_str(&standard).map(Address)
+    }
+}
+
+impl fmt::Display for Address {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let standard_prefixed = self.0.to_string();
+        // Strip the `0x` prefix.
+        let standard_no_prefix = standard_prefixed
+            .strip_prefix("0x")
+            .unwrap_or(&standard_prefixed);
+        write!(f, "{RONIN_PREFIX}{standard_no_prefix}")
+    }
+}
+
+impl CoinAddress for Address {
+    #[inline]
+    fn data(&self) -> Data {
+        self.0.data()
+    }
+}
diff --git a/rust/chains/tw_ronin/src/entry.rs b/rust/chains/tw_ronin/src/entry.rs
new file mode 100644
index 00000000000..3905a521517
--- /dev/null
+++ b/rust/chains/tw_ronin/src/entry.rs
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::ronin_context::RoninContext;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::transaction_util::NoTransactionUtil;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_evm::evm_entry::EvmEntry;
+use tw_evm::modules::compiler::Compiler;
+use tw_evm::modules::message_signer::EthMessageSigner;
+use tw_evm::modules::signer::Signer;
+use tw_keypair::tw::PublicKey;
+use tw_proto::Ethereum::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct RoninEntry;
+
+impl CoinEntry for RoninEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = EthMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = NoTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let public_key = public_key
+            .to_secp256k1()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        Ok(Address::with_secp256k1_pubkey(public_key))
+    }
+
+    #[inline]
+    fn sign(&self, _coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        Signer::<RoninContext>::sign_proto(input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        Compiler::<RoninContext>::preimage_hashes(input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        Compiler::<RoninContext>::compile(input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn message_signer(&self) -> Option<Self::MessageSigner> {
+        Some(EthMessageSigner)
+    }
+}
+
+impl EvmEntry for RoninEntry {
+    type Context = RoninContext;
+}
diff --git a/rust/chains/tw_ronin/src/lib.rs b/rust/chains/tw_ronin/src/lib.rs
new file mode 100644
index 00000000000..615f3566671
--- /dev/null
+++ b/rust/chains/tw_ronin/src/lib.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod entry;
+pub mod ronin_context;
diff --git a/rust/chains/tw_ronin/src/ronin_context.rs b/rust/chains/tw_ronin/src/ronin_context.rs
new file mode 100644
index 00000000000..e30475a9f1f
--- /dev/null
+++ b/rust/chains/tw_ronin/src/ronin_context.rs
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use tw_evm::evm_context::EvmContext;
+
+#[derive(Default)]
+pub struct RoninContext;
+
+impl EvmContext for RoninContext {
+    type Address = Address;
+}
diff --git a/rust/chains/tw_ronin/tests/address.rs b/rust/chains/tw_ronin/tests/address.rs
new file mode 100644
index 00000000000..4a97ee560cc
--- /dev/null
+++ b/rust/chains/tw_ronin/tests/address.rs
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+use tw_ronin::address::Address;
+
+#[test]
+fn test_ronin_address_valid() {
+    let normalized = "ronin:EC49280228b0D05Aa8e8b756503254e1eE7835ab";
+    let valid = [
+        normalized,
+        "ronin:ec49280228b0d05aa8e8b756503254e1ee7835ab",
+        "0xEC49280228b0D05Aa8e8b756503254e1eE7835ab",
+        "ronin:0xEC49280228b0D05Aa8e8b756503254e1eE7835ab",
+    ];
+
+    for test in valid {
+        let addr = Address::from_str(test).unwrap();
+        assert_eq!(addr.to_string(), normalized);
+    }
+}
+
+#[test]
+fn test_ronin_address_invalid() {
+    let invalid = [
+        "EC49280228b0D05Aa8e8b756503254e1eE7835ab", // no prefix
+        "ec49280228b0d05aa8e8b756503254e1ee7835ab", // no prefix
+        "roni:EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
+        "ronin=EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
+        "0xronin:EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
+        "EC49280228b0D05Aa8e8b756503254e1eE7835",   // too short
+        "ronin:EC49280228b0D05Aa8e8b756503254e1eE7835", // too short
+        "ronin:ec49280228b0d05aa8e8b756503254e1ee7835", // too short
+        "",                                         // empty
+    ];
+
+    for test in invalid {
+        Address::from_str(test).unwrap_err();
+    }
+}
diff --git a/rust/chains/tw_ronin/tests/compiler.rs b/rust/chains/tw_ronin/tests/compiler.rs
new file mode 100644
index 00000000000..18d55a3fd92
--- /dev/null
+++ b/rust/chains/tw_ronin/tests/compiler.rs
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::coin_entry_ext::CoinEntryExt;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::tw;
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use tw_proto::{deserialize, serialize};
+use tw_ronin::entry::RoninEntry;
+
+#[test]
+fn test_ronin_preimage_hashes_and_compile() {
+    let coin = TestCoinContext::default();
+
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(1_000_000_000_000_000_000),
+        data: Cow::default(),
+    };
+    let input = Proto::SigningInput {
+        nonce: U256::encode_be_compact(11),
+        chain_id: U256::encode_be_compact(1),
+        gas_price: U256::encode_be_compact(20_000_000_000),
+        gas_limit: U256::encode_be_compact(21_000),
+        to_address: "ronin:3535353535353535353535353535353535353535".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        ..Proto::SigningInput::default()
+    };
+
+    let input_data = serialize(&input).unwrap();
+
+    let res = RoninEntry
+        .preimage_hashes(&coin, &input_data)
+        .expect("!preimage_hashes");
+    let preimage: CompilerProto::PreSigningOutput =
+        deserialize(res.as_slice()).expect("Coin entry returned an invalid output");
+
+    assert_eq!(preimage.error, SigningErrorType::OK);
+    assert!(preimage.error_message.is_empty());
+    assert_eq!(
+        preimage.data_hash.to_hex(),
+        "15e180a6274b2f6a572b9b51823fce25ef39576d10188ecdcd7de44526c47217"
+    );
+
+    // Simulate signature, normally obtained from signature server
+    let public_key = secp256k1::PublicKey::try_from("044bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ce28cab79ad7119ee1ad3ebcdb98a16805211530ecc6cfefa1b88e6dff99232a").unwrap();
+    let public_key = tw::PublicKey::Secp256k1Extended(public_key);
+    let signature = "360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c9796677900".decode_hex().unwrap();
+
+    // Verify signature (pubkey & hash & signature)
+    assert!(public_key.verify(&signature, &preimage.data_hash));
+
+    // Step 3: Compile transaction info
+    let output_data = RoninEntry
+        .compile(
+            &coin,
+            &input_data,
+            vec![signature],
+            vec![public_key.to_bytes()],
+        )
+        .expect("!compile");
+    let output: Proto::SigningOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    let expected_encoded = "f86c0b8504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a0360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07ba053bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c97966779";
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+}
diff --git a/rust/chains/tw_ronin/tests/rlp.rs b/rust/chains/tw_ronin/tests/rlp.rs
new file mode 100644
index 00000000000..d3d9548fd7b
--- /dev/null
+++ b/rust/chains/tw_ronin/tests/rlp.rs
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::ToHex;
+use tw_evm::evm_entry::EvmEntryExt;
+use tw_proto::EthereumRlp::Proto as RlpProto;
+use tw_proto::{deserialize, serialize};
+use tw_ronin::entry::RoninEntry;
+use RlpProto::mod_RlpItem::OneOfitem as Item;
+
+#[test]
+fn test_rlp_encode_ronin_address() {
+    let ronin_addr = "ronin:6b175474e89094c44da98b954eedeac495271d0f";
+    let input = RlpProto::EncodingInput {
+        item: Some(RlpProto::RlpItem {
+            item: Item::address(Cow::from(ronin_addr)),
+        }),
+    };
+    let input_data = serialize(&input).unwrap();
+    let output_data = RoninEntry.encode_rlp(&input_data).unwrap();
+    let output: RlpProto::EncodingOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(
+        output.encoded.to_hex(),
+        "946b175474e89094c44da98b954eedeac495271d0f"
+    );
+}
diff --git a/rust/chains/tw_ronin/tests/signer.rs b/rust/chains/tw_ronin/tests/signer.rs
new file mode 100644
index 00000000000..309592e9278
--- /dev/null
+++ b/rust/chains/tw_ronin/tests/signer.rs
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::coin_entry_ext::CoinEntryExt;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+use tw_proto::{deserialize, serialize};
+use tw_ronin::entry::RoninEntry;
+
+/// https://explorer.roninchain.com/tx/0xf13a2c4421700f8782ca73eaf16bb8baf82bcf093e23570a1ff062cdd8dbf6c3
+#[test]
+fn test_ronin_signing() {
+    let coin = TestCoinContext::default();
+
+    let private = "0x4646464646464646464646464646464646464646464646464646464646464646"
+        .decode_hex()
+        .unwrap();
+
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(276_447),
+        data: Cow::default(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(2020),
+        nonce: U256::encode_be_compact(0),
+        gas_price: U256::encode_be_compact(1_000_000_000),
+        gas_limit: U256::encode_be_compact(21_000),
+        to_address: "ronin:c36edf48e21cf395b206352a1819de658fd7f988".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        private_key: private.into(),
+        ..Proto::SigningInput::default()
+    };
+    let input_data = serialize(&input).unwrap();
+
+    let output_data = RoninEntry.sign(&coin, &input_data).expect("!sign");
+    let output: Proto::SigningOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "f86880843b9aca0082520894c36edf48e21cf395b206352a1819de658fd7f988830437df80820feca0442aa06b0d0465bfecf84b28e2ce614a32a1ccc12735dc03a5799517d6659d7aa004e1bf2efa30743f1b6d49dbec2671e9fb5ead1e7da15e352ca1df6fb86a8ba7";
+    assert_eq!(output.encoded.to_hex(), expected);
+}
+
+#[test]
+fn test_sign_json() {
+    let coin = TestCoinContext::default();
+
+    let input_json = r#"{"chainId":"B+Q=","nonce":"AA==","gasPrice":"O5rKAA==","gasLimit":"Ugg=","toAddress":"ronin:c36edf48e21cf395b206352a1819de658fd7f988","privateKey":"RkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkZGRkY=","transaction":{"transfer":{"amount":"BDff"}}}"#;
+    let private_key = "0x4646464646464646464646464646464646464646464646464646464646464646"
+        .decode_hex()
+        .unwrap();
+
+    RoninEntry
+        .sign_json(&coin, input_json, private_key)
+        .expect_err("'EthEntry::sign_json' is not supported yet");
+
+    // Expected result - "f86880843b9aca0082520894c36edf48e21cf395b206352a1819de658fd7f988830437df80820feca0442aa06b0d0465bfecf84b28e2ce614a32a1ccc12735dc03a5799517d6659d7aa004e1bf2efa30743f1b6d49dbec2671e9fb5ead1e7da15e352ca1df6fb86a8ba7"
+}
diff --git a/rust/chains/tw_solana/Cargo.toml b/rust/chains/tw_solana/Cargo.toml
new file mode 100644
index 00000000000..99c893b081e
--- /dev/null
+++ b/rust/chains/tw_solana/Cargo.toml
@@ -0,0 +1,17 @@
+[package]
+name = "tw_solana"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bincode = "1.3.3"
+borsh = { version = "1.3.1", features = ["derive"] }
+lazy_static = "1.4.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
diff --git a/rust/chains/tw_solana/src/address.rs b/rust/chains/tw_solana/src/address.rs
new file mode 100644
index 00000000000..cb2051be84c
--- /dev/null
+++ b/rust/chains/tw_solana/src/address.rs
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::SOLANA_ALPHABET;
+use serde::de::Error as DeError;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base58;
+use tw_hash::{as_byte_sequence, sha2, H256};
+use tw_keypair::{ed25519, tw};
+use tw_memory::Data;
+
+pub const MAX_SEEDS: usize = 16;
+pub const MAX_SEED_LEN: usize = H256::LEN;
+const PDA_MARKER: &[u8; 21] = b"ProgramDerivedAddress";
+
+#[derive(Clone, Copy, Default, Eq, Hash, Ord, PartialEq, PartialOrd)]
+pub struct SolanaAddress {
+    bytes: H256,
+}
+
+impl SolanaAddress {
+    pub fn with_public_key(public_key: &tw::PublicKey) -> AddressResult<SolanaAddress> {
+        let bytes = public_key
+            .to_ed25519()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?
+            .to_bytes();
+        Ok(SolanaAddress { bytes })
+    }
+
+    pub fn with_public_key_ed25519(public_key: &ed25519::sha512::PublicKey) -> SolanaAddress {
+        SolanaAddress {
+            bytes: public_key.to_bytes(),
+        }
+    }
+
+    pub fn with_public_key_bytes(bytes: H256) -> SolanaAddress {
+        SolanaAddress { bytes }
+    }
+
+    pub fn bytes(&self) -> H256 {
+        self.bytes
+    }
+
+    /// Find a valid [program derived address][pda] and its corresponding bump seed.
+    ///
+    /// [pda]: https://solana.com/docs/core/cpi#program-derived-addresses
+    ///
+    /// Program derived addresses (PDAs) are account keys that only the program,
+    /// `program_id`, has the authority to sign. The address is of the same form
+    /// as a Solana `Pubkey`, except they are ensured to not be on the ed25519
+    /// curve and thus have no associated private key. When performing
+    /// cross-program invocations the program can "sign" for the key by calling
+    /// [`invoke_signed`] and passing the same seeds used to generate the
+    /// address, along with the calculated _bump seed_, which this function
+    /// returns as the second tuple element. The runtime will verify that the
+    /// program associated with this address is the caller and thus authorized
+    /// to be the signer.
+    pub fn find_program_address(
+        seeds: &[&[u8]],
+        program_id: SolanaAddress,
+    ) -> Option<SolanaAddress> {
+        let mut bump_seed = [u8::MAX];
+        for _ in 0..u8::MAX {
+            let mut seeds_with_bump = seeds.to_vec();
+            seeds_with_bump.push(&bump_seed);
+            match Self::create_program_address(&seeds_with_bump, program_id) {
+                Ok(Some(address)) => return Some(address),
+                // Try to re-compute the program address with a different seed.
+                Ok(None) => (),
+                Err(_) => return None,
+            }
+            // Try to re-compute the program address with a different seed.
+            bump_seed[0] -= 1;
+        }
+        None
+    }
+
+    /// Create a valid [program derived address][pda] without searching for a bump seed.
+    ///
+    /// [pda]: https://solana.com/docs/core/cpi#program-derived-addresses
+    ///
+    /// Because this function does not create a bump seed, it may unpredictably
+    /// return an error for any given set of seeds and is not generally suitable
+    /// for creating program derived addresses.
+    ///
+    /// However, it can be used for efficiently verifying that a set of seeds plus
+    /// bump seed generated by [`find_program_address`] derives a particular
+    /// address as expected. See the example for details.
+    ///
+    /// See the documentation for [`find_program_address`] for a full description
+    /// of program derived addresses and bump seeds.
+    ///
+    /// [`find_program_address`]: Pubkey::find_program_address
+    pub fn create_program_address(
+        seeds: &[&[u8]],
+        program_id: SolanaAddress,
+    ) -> AddressResult<Option<SolanaAddress>> {
+        if seeds.len() > MAX_SEEDS {
+            return Err(AddressError::Internal);
+        }
+        if seeds.iter().any(|seed| seed.len() > MAX_SEED_LEN) {
+            return Err(AddressError::Internal);
+        }
+
+        let mut data_to_hash = Vec::new();
+
+        // concatenate seeds
+        for seed in seeds {
+            data_to_hash.extend_from_slice(seed);
+        }
+        // Append `program_id`.
+        data_to_hash.extend_from_slice(program_id.bytes.as_slice());
+        data_to_hash.extend_from_slice(PDA_MARKER);
+
+        let hash = H256::try_from(sha2::sha256(&data_to_hash).as_slice())
+            .expect("sha256 must return 32 bytes");
+
+        // The given hash (aka new public key) must not be on the ed25519 elliptic curve.
+        match ed25519::sha512::PublicKey::try_from(hash.as_slice()) {
+            Ok(_) => Ok(None),
+            Err(_) => Ok(Some(SolanaAddress::with_public_key_bytes(hash))),
+        }
+    }
+}
+
+impl CoinAddress for SolanaAddress {
+    #[inline]
+    fn data(&self) -> Data {
+        self.bytes.to_vec()
+    }
+}
+
+impl FromStr for SolanaAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let bytes =
+            base58::decode(s, SOLANA_ALPHABET).map_err(|_| AddressError::FromBase58Error)?;
+        let bytes = H256::try_from(bytes.as_slice()).map_err(|_| AddressError::InvalidInput)?;
+        Ok(SolanaAddress { bytes })
+    }
+}
+
+impl From<&'static str> for SolanaAddress {
+    fn from(s: &'static str) -> Self {
+        SolanaAddress::from_str(s).unwrap()
+    }
+}
+
+impl fmt::Debug for SolanaAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self)
+    }
+}
+
+impl fmt::Display for SolanaAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let encoded = base58::encode(self.bytes.as_slice(), SOLANA_ALPHABET);
+        write!(f, "{}", encoded)
+    }
+}
+
+impl Serialize for SolanaAddress {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        if serializer.is_human_readable() {
+            return self.to_string().serialize(serializer);
+        }
+        as_byte_sequence::serialize(&self.bytes(), serializer)
+    }
+}
+
+impl<'de> Deserialize<'de> for SolanaAddress {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        if deserializer.is_human_readable() {
+            let addr_str = String::deserialize(deserializer)?;
+            return SolanaAddress::from_str(&addr_str)
+                .map_err(|e| DeError::custom(format!("{e:?}")));
+        }
+        let bytes = as_byte_sequence::deserialize(deserializer)?;
+        Ok(SolanaAddress { bytes })
+    }
+}
diff --git a/rust/chains/tw_solana/src/blockhash.rs b/rust/chains/tw_solana/src/blockhash.rs
new file mode 100644
index 00000000000..1cfe0a92fa5
--- /dev/null
+++ b/rust/chains/tw_solana/src/blockhash.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::SOLANA_ALPHABET;
+use serde::Deserialize;
+use std::fmt;
+use std::str::FromStr;
+use tw_encoding::base58::{self, as_base58_bitcoin};
+use tw_encoding::EncodingError;
+use tw_hash::H256;
+
+#[derive(Clone, Copy, Default, Deserialize)]
+pub struct Blockhash(#[serde(with = "as_base58_bitcoin")] H256);
+
+impl Blockhash {
+    pub fn with_bytes(bytes: H256) -> Blockhash {
+        Blockhash(bytes)
+    }
+
+    pub fn to_bytes(&self) -> H256 {
+        self.0
+    }
+}
+
+impl fmt::Display for Blockhash {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", base58::encode(self.0.as_slice(), SOLANA_ALPHABET))
+    }
+}
+
+impl FromStr for Blockhash {
+    type Err = EncodingError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let bytes = base58::decode(s, SOLANA_ALPHABET)?;
+        let bytes = H256::try_from(bytes.as_slice()).map_err(|_| EncodingError::InvalidInput)?;
+        Ok(Blockhash(bytes))
+    }
+}
diff --git a/rust/chains/tw_solana/src/compiler.rs b/rust/chains/tw_solana/src/compiler.rs
new file mode 100644
index 00000000000..818f04a8ce9
--- /dev/null
+++ b/rust/chains/tw_solana/src/compiler.rs
@@ -0,0 +1,116 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::modules::message_builder::MessageBuilder;
+use crate::modules::proto_builder::ProtoBuilder;
+use crate::modules::tx_signer::TxSigner;
+use crate::SOLANA_ALPHABET;
+use std::borrow::Cow;
+use std::collections::HashMap;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_encoding::base58;
+use tw_encoding::base64::{self, STANDARD};
+use tw_keypair::ed25519;
+use tw_keypair::traits::VerifyingKeyTrait;
+use tw_proto::Solana::Proto;
+
+pub struct SolanaCompiler;
+
+impl SolanaCompiler {
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::PreSigningOutput<'static>> {
+        let builder = MessageBuilder::new(input);
+        let unsigned_msg = builder.build()?;
+        let data_to_sign = TxSigner::preimage_versioned(&unsigned_msg)?;
+
+        let signers: Vec<_> = unsigned_msg
+            .signers()
+            .map(|addr| Cow::from(addr.to_string().into_bytes()))
+            .collect();
+
+        Ok(Proto::PreSigningOutput {
+            signers,
+            data: Cow::from(data_to_sign),
+            ..Proto::PreSigningOutput::default()
+        })
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn compile_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let encode = move |data| match input.tx_encoding {
+            Proto::Encoding::Base58 => base58::encode(data, SOLANA_ALPHABET),
+            Proto::Encoding::Base64 => base64::encode(data, STANDARD),
+        };
+
+        if signatures.len() != public_keys.len() {
+            return SigningError::err(SigningErrorType::Error_signatures_count)
+                .context("Expected the same number of signatures and public keys");
+        }
+
+        let builder = MessageBuilder::new(input);
+        let unsigned_msg = builder.build()?;
+        let data_to_sign = TxSigner::preimage_versioned(&unsigned_msg)?;
+
+        // Verify the given signatures and collect the key-signature map.
+        let mut key_signs = HashMap::default();
+        for (sign, pubkey) in signatures.iter().zip(public_keys.iter()) {
+            let signature = ed25519::Signature::try_from(sign.as_slice())?;
+            let pubkey = ed25519::sha512::PublicKey::try_from(pubkey.as_slice())?;
+
+            if !pubkey.verify(signature.clone(), data_to_sign.clone())
+                && !signature.to_bytes().is_zero()
+            {
+                return SigningError::err(SigningErrorType::Error_signing)
+                    .context("Error verifying the given signature");
+            }
+
+            key_signs.insert(SolanaAddress::with_public_key_ed25519(&pubkey), signature);
+        }
+
+        let signed_tx = TxSigner::compile_versioned(unsigned_msg, key_signs)?;
+
+        let signed_encoded = bincode::serialize(&signed_tx)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing signed transaction")?;
+        let signed_encoded = encode(&signed_encoded);
+        let unsigned_encoded = encode(&data_to_sign);
+
+        Ok(Proto::SigningOutput {
+            encoded: Cow::from(signed_encoded),
+            unsigned_tx: Cow::from(unsigned_encoded),
+            signatures: ProtoBuilder::build_signatures(&signed_tx),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_solana/src/defined_addresses.rs b/rust/chains/tw_solana/src/defined_addresses.rs
new file mode 100644
index 00000000000..f7e663ef1f4
--- /dev/null
+++ b/rust/chains/tw_solana/src/defined_addresses.rs
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use lazy_static::lazy_static;
+
+macro_rules! define {
+    ($name:ident = $s:literal) => {
+        lazy_static! {
+            pub static ref $name: SolanaAddress = SolanaAddress::from($s);
+        }
+    };
+}
+
+define!(SYSTEM_PROGRAM_ID_ADDRESS = "11111111111111111111111111111111");
+define!(STAKE_PROGRAM_ID_ADDRESS = "Stake11111111111111111111111111111111111111");
+define!(TOKEN_PROGRAM_ID_ADDRESS = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
+define!(TOKEN_2022_PROGRAM_ID_ADDRESS = "TokenzQdBNbLqP5VEhdkAS6EPFLC1PHnBqCXEpPxuEb");
+define!(ASSOCIATED_TOKEN_PROGRAM_ID_ADDRESS = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
+define!(SYSVAR_RENT_ID_ADDRESS = "SysvarRent111111111111111111111111111111111");
+define!(SYSVAR_CLOCK_ID_ADDRESS = "SysvarC1ock11111111111111111111111111111111");
+define!(STAKE_CONFIG_ID_ADDRESS = "StakeConfig11111111111111111111111111111111");
+define!(NULL_ID_ADDRESS = "11111111111111111111111111111111");
+define!(SYSVAR_STAKE_HISTORY_ID_ADDRESS = "SysvarStakeHistory1111111111111111111111111");
+define!(MEMO_PROGRAM_ID_ADDRESS = "MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr");
+define!(SYSVAR_RECENT_BLOCKHASHS_ADDRESS = "SysvarRecentB1ockHashes11111111111111111111");
+define!(COMPUTE_BUDGET_ADDRESS = "ComputeBudget111111111111111111111111111111");
diff --git a/rust/chains/tw_solana/src/entry.rs b/rust/chains/tw_solana/src/entry.rs
new file mode 100644
index 00000000000..c2a6b46f24f
--- /dev/null
+++ b/rust/chains/tw_solana/src/entry.rs
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::compiler::SolanaCompiler;
+use crate::modules::transaction_decoder::SolanaTransactionDecoder;
+use crate::modules::transaction_util::SolanaTransactionUtil;
+use crate::modules::wallet_connect::connector::SolanaWalletConnector;
+use crate::signer::SolanaSigner;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_keypair::tw::PublicKey;
+use tw_proto::Solana::Proto;
+
+pub struct SolanaEntry;
+
+impl CoinEntry for SolanaEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = SolanaAddress;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = Proto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = SolanaWalletConnector;
+    type TransactionDecoder = SolanaTransactionDecoder;
+    type TransactionUtil = SolanaTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        SolanaAddress::from_str(address)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        SolanaAddress::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        SolanaAddress::with_public_key(&public_key)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        SolanaSigner::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        SolanaCompiler::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        SolanaCompiler::compile(coin, input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn wallet_connector(&self) -> Option<Self::WalletConnector> {
+        Some(SolanaWalletConnector)
+    }
+
+    #[inline]
+    fn transaction_decoder(&self) -> Option<Self::TransactionDecoder> {
+        Some(SolanaTransactionDecoder)
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(SolanaTransactionUtil)
+    }
+}
diff --git a/rust/chains/tw_solana/src/instruction.rs b/rust/chains/tw_solana/src/instruction.rs
new file mode 100644
index 00000000000..fee1928163b
--- /dev/null
+++ b/rust/chains/tw_solana/src/instruction.rs
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use borsh::BorshSerialize;
+use serde::{Deserialize, Serialize};
+use tw_memory::Data;
+
+pub struct Instruction {
+    /// Pubkey of the program that executes this instruction.
+    pub program_id: SolanaAddress,
+    /// Metadata describing accounts that should be passed to the program.
+    pub accounts: Vec<AccountMeta>,
+    /// Opaque data passed to the program for its own interpretation.
+    pub data: Data,
+}
+
+impl Instruction {
+    /// Create a new instruction from a value, encoded with [`bincode`].
+    ///
+    /// [`bincode`]: https://docs.rs/bincode/latest/bincode/
+    ///
+    /// `program_id` is the address of the program that will execute the instruction.
+    /// `accounts` contains a description of all accounts that may be accessed by the program.
+    pub fn new_with_bincode<T: Serialize>(
+        program_id: SolanaAddress,
+        data: T,
+        accounts: Vec<AccountMeta>,
+    ) -> Self {
+        let data = bincode::serialize(&data).expect("Error serializing bincode");
+        Self {
+            program_id,
+            accounts,
+            data,
+        }
+    }
+
+    /// Create a new instruction from a value, encoded with [`borsh`].
+    ///
+    /// [`borsh`]: https://docs.rs/borsh/latest/borsh/
+    ///
+    /// `program_id` is the address of the program that will execute the instruction.
+    /// `accounts` contains a description of all accounts that may be accessed by the program.
+    pub fn new_with_borsh<T: BorshSerialize>(
+        program_id: SolanaAddress,
+        data: &T,
+        accounts: Vec<AccountMeta>,
+    ) -> Self {
+        let data = borsh::to_vec(data).expect("Error serializing borsh");
+        Self {
+            program_id,
+            accounts,
+            data,
+        }
+    }
+
+    pub fn new(program_id: SolanaAddress, data: Data, accounts: Vec<AccountMeta>) -> Self {
+        Self {
+            program_id,
+            accounts,
+            data,
+        }
+    }
+
+    pub fn with_references<I: IntoIterator<Item = SolanaAddress>>(mut self, references: I) -> Self {
+        for reference in references {
+            self.accounts.push(AccountMeta::readonly(reference, false));
+        }
+        self
+    }
+}
+
+#[derive(Debug, Default, PartialEq, Eq, Clone, Serialize, Deserialize)]
+pub struct AccountMeta {
+    /// An account's public key.
+    pub pubkey: SolanaAddress,
+    /// True if an `Instruction` requires a `Transaction` signature matching `pubkey`.
+    pub is_signer: bool,
+    /// True if the account data or metadata may be mutated during program execution.
+    pub is_writable: bool,
+}
+
+impl AccountMeta {
+    /// Construct metadata for a writable account.
+    pub fn new(pubkey: SolanaAddress, is_signer: bool) -> Self {
+        Self {
+            pubkey,
+            is_signer,
+            is_writable: true,
+        }
+    }
+
+    /// Construct metadata for a read-only account.
+    pub fn readonly(pubkey: SolanaAddress, is_signer: bool) -> Self {
+        Self {
+            pubkey,
+            is_signer,
+            is_writable: false,
+        }
+    }
+}
diff --git a/rust/chains/tw_solana/src/lib.rs b/rust/chains/tw_solana/src/lib.rs
new file mode 100644
index 00000000000..5bf3b779386
--- /dev/null
+++ b/rust/chains/tw_solana/src/lib.rs
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::base58::Alphabet;
+
+pub mod address;
+pub mod blockhash;
+pub mod compiler;
+pub mod defined_addresses;
+pub mod entry;
+pub mod instruction;
+pub mod modules;
+pub mod program;
+pub mod signer;
+pub mod transaction;
+
+// cbindgen:ignore
+pub const SOLANA_ALPHABET: Alphabet = Alphabet::Bitcoin;
diff --git a/rust/chains/tw_solana/src/modules/compiled_instructions.rs b/rust/chains/tw_solana/src/modules/compiled_instructions.rs
new file mode 100644
index 00000000000..28b0f30cd6b
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/compiled_instructions.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::instruction::Instruction;
+use crate::transaction::CompiledInstruction;
+use tw_coin_entry::error::prelude::*;
+
+pub fn compile_instructions(
+    ixs: &[Instruction],
+    keys: &[SolanaAddress],
+) -> SigningResult<Vec<CompiledInstruction>> {
+    ixs.iter().map(|ix| compile_instruction(ix, keys)).collect()
+}
+
+fn position(keys: &[SolanaAddress], key: &SolanaAddress) -> SigningResult<u8> {
+    keys.iter()
+        .position(|k| k == key)
+        .map(|k| k as u8)
+        .or_tw_err(SigningErrorType::Error_internal)
+}
+
+/// https://github.com/solana-labs/solana/blob/4b65cc8eef6ef79cb9b9cbc534a99b4900e58cf7/sdk/program/src/message/legacy.rs#L72-L84
+pub(crate) fn compile_instruction(
+    ix: &Instruction,
+    keys: &[SolanaAddress],
+) -> SigningResult<CompiledInstruction> {
+    let accounts = ix
+        .accounts
+        .iter()
+        .map(|account_meta| position(keys, &account_meta.pubkey))
+        .collect::<SigningResult<Vec<_>>>()
+        .context("Cannot build account metas")?;
+
+    Ok(CompiledInstruction {
+        program_id_index: position(keys, &ix.program_id)
+            .context("Program ID account is not provided")?,
+        data: ix.data.clone(),
+        accounts,
+    })
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::instruction::AccountMeta;
+    use crate::SOLANA_ALPHABET;
+    use std::str::FromStr;
+    use tw_encoding::base58;
+    use tw_keypair::ed25519;
+
+    #[test]
+    fn test_compile_instruction() {
+        let public_0 = base58::decode(
+            "GymAh18wHuFTytfSJWi8eYTA9x5S3sNb9CJSGBWoPRE3",
+            SOLANA_ALPHABET,
+        )
+        .unwrap();
+        let public_0 = ed25519::sha512::PublicKey::try_from(public_0.as_slice()).unwrap();
+        let address_0 = SolanaAddress::with_public_key_ed25519(&public_0);
+
+        let public_1 = base58::decode(
+            "2oKoYSAHgveX91917v4DUEuN8BNKXDg8KJWpaGyEay9V",
+            SOLANA_ALPHABET,
+        )
+        .unwrap();
+        let public_1 = ed25519::sha512::PublicKey::try_from(public_1.as_slice()).unwrap();
+        let address_1 = SolanaAddress::with_public_key_ed25519(&public_1);
+
+        let program_id = SolanaAddress::from_str("11111111111111111111111111111111").unwrap();
+
+        let addresses = vec![address_0, address_1, program_id];
+        let ixs_addresses = vec![
+            AccountMeta::new(address_1, false),
+            AccountMeta::new(address_0, false),
+            AccountMeta::new(program_id, false),
+            AccountMeta::new(address_1, false),
+            AccountMeta::new(address_0, false),
+        ];
+        let data = vec![0_u8, 1, 2, 4];
+        let instruction = Instruction::new(program_id, data.clone(), ixs_addresses);
+
+        let compiled_ix = compile_instruction(&instruction, &addresses).unwrap();
+        let expected = CompiledInstruction {
+            program_id_index: 2,
+            accounts: vec![1, 0, 2, 1, 0],
+            data,
+        };
+        assert_eq!(compiled_ix, expected);
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/compiled_keys.rs b/rust/chains/tw_solana/src/modules/compiled_keys.rs
new file mode 100644
index 00000000000..8f46866f2f7
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/compiled_keys.rs
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/solana-labs/solana/blob/4b65cc8eef6ef79cb9b9cbc534a99b4900e58cf7/sdk/program/src/message/compiled_keys.rs
+
+use crate::address::SolanaAddress;
+use crate::instruction::Instruction;
+use crate::transaction::MessageHeader;
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+use tw_coin_entry::error::prelude::*;
+
+pub fn try_into_u8(num: usize) -> SigningResult<u8> {
+    u8::try_from(num)
+        .tw_err(|_| SigningErrorType::Error_tx_too_big)
+        .context("There are too many accounts in the transaction")
+}
+
+#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
+struct CompiledKeyMeta {
+    is_signer: bool,
+    is_writable: bool,
+}
+
+#[derive(Debug, Default, Clone, PartialEq, Eq)]
+pub(crate) struct CompiledKeys {
+    ordered_keys: Vec<SolanaAddress>,
+    key_meta_map: HashMap<SolanaAddress, CompiledKeyMeta>,
+}
+
+impl CompiledKeys {
+    pub fn with_fee_payer(fee_payer: SolanaAddress) -> Self {
+        let mut selfi = Self::default();
+
+        selfi.key_meta_map.insert(
+            fee_payer,
+            CompiledKeyMeta {
+                is_signer: true,
+                is_writable: true,
+            },
+        );
+        // Fee payer must be the first account in the keys list.
+        selfi.ordered_keys.push(fee_payer);
+
+        selfi
+    }
+
+    pub fn compile(mut self, instructions: &[Instruction]) -> Self {
+        for ix in instructions {
+            for account_meta in &ix.accounts {
+                let meta_entry = self.key_meta_map.entry(account_meta.pubkey);
+                if matches!(meta_entry, Entry::Vacant(_)) {
+                    self.ordered_keys.push(account_meta.pubkey);
+                }
+
+                let meta = meta_entry.or_default();
+                meta.is_signer |= account_meta.is_signer;
+                meta.is_writable |= account_meta.is_writable;
+            }
+        }
+
+        // add programIds (read-only, at end)
+        for ix in instructions {
+            let meta_entry = self.key_meta_map.entry(ix.program_id);
+            if matches!(meta_entry, Entry::Vacant(_)) {
+                self.ordered_keys.push(ix.program_id);
+            }
+            meta_entry.or_default();
+        }
+
+        self
+    }
+
+    pub fn try_into_message_components(self) -> SigningResult<(MessageHeader, Vec<SolanaAddress>)> {
+        let Self {
+            ordered_keys,
+            key_meta_map,
+        } = self;
+
+        let filter = |account, is_signer: bool, is_writable: bool| -> Option<SolanaAddress> {
+            let meta = key_meta_map.get(account).copied().unwrap_or_default();
+            (meta.is_signer == is_signer && meta.is_writable == is_writable).then_some(*account)
+        };
+
+        let writable_signer_keys: Vec<SolanaAddress> = ordered_keys
+            .iter()
+            .filter_map(|key| filter(key, true, true))
+            .collect();
+        let readonly_signer_keys: Vec<SolanaAddress> = ordered_keys
+            .iter()
+            .filter_map(|key| filter(key, true, false))
+            .collect();
+        let writable_non_signer_keys: Vec<SolanaAddress> = ordered_keys
+            .iter()
+            .filter_map(|key| filter(key, false, true))
+            .collect();
+        let readonly_non_signer_keys: Vec<SolanaAddress> = ordered_keys
+            .iter()
+            .filter_map(|key| filter(key, false, false))
+            .collect();
+
+        let signers_len = writable_signer_keys
+            .len()
+            .saturating_add(readonly_signer_keys.len());
+
+        let header = MessageHeader {
+            num_required_signatures: try_into_u8(signers_len)
+                .context("Too many signatures required")?,
+            num_readonly_signed_accounts: try_into_u8(readonly_signer_keys.len())
+                .context("Too many accounts in the transaction")?,
+            num_readonly_unsigned_accounts: try_into_u8(readonly_non_signer_keys.len())
+                .context("Too many accounts in the transaction")?,
+        };
+
+        let static_account_keys: Vec<_> = std::iter::empty()
+            .chain(writable_signer_keys)
+            .chain(readonly_signer_keys)
+            .chain(writable_non_signer_keys)
+            .chain(readonly_non_signer_keys)
+            .collect();
+
+        Ok((header, static_account_keys))
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/insert_instruction.rs b/rust/chains/tw_solana/src/modules/insert_instruction.rs
new file mode 100644
index 00000000000..22643e349ce
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/insert_instruction.rs
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::modules::compiled_keys::try_into_u8;
+use crate::transaction::v0::MessageAddressTableLookup;
+use crate::transaction::{CompiledInstruction, MessageHeader};
+use std::iter;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+
+pub trait InsertInstruction {
+    /// Pushes a simple instruction that doesn't have accounts.
+    fn push_simple_instruction(
+        &mut self,
+        program_id: SolanaAddress,
+        data: Data,
+    ) -> SigningResult<()> {
+        let insert_at = self.instructions_mut().len();
+        self.insert_simple_instruction(insert_at, program_id, data)
+    }
+
+    /// Inserts a simple instruction that doesn't have accounts at the given `insert_at` index.
+    fn insert_simple_instruction(
+        &mut self,
+        insert_at: usize,
+        program_id: SolanaAddress,
+        data: Data,
+    ) -> SigningResult<()> {
+        if insert_at > self.instructions_mut().len() {
+            return SigningError::err(SigningErrorType::Error_internal)
+                .context(format!("Unable to add '{program_id}' instruction at the '{insert_at}' index. Number of existing instructions: {}", self.instructions_mut().len()));
+        }
+
+        // Step 1 - find or add the `program_id` in the accounts list.
+        let program_id_index = match self
+            .account_keys_mut()
+            .iter()
+            .position(|acc| *acc == program_id)
+        {
+            Some(pos) => try_into_u8(pos)?,
+            None => self.push_readonly_unsigned_account(program_id)?,
+        };
+
+        // Step 2 - Create a `CompiledInstruction` based on the `program_id` index and instruction `data`.
+        let new_compiled_ix = CompiledInstruction {
+            program_id_index,
+            accounts: Vec::default(),
+            data,
+        };
+
+        // Step 3 - Insert the created instruction at the given `insert_at` index.
+        self.instructions_mut().insert(insert_at, new_compiled_ix);
+
+        Ok(())
+    }
+
+    fn push_readonly_unsigned_account(&mut self, account: SolanaAddress) -> SigningResult<u8> {
+        debug_assert!(
+            !self.account_keys_mut().contains(&account),
+            "Account must not be in the account list yet"
+        );
+
+        self.account_keys_mut().push(account);
+        self.message_header_mut().num_readonly_unsigned_accounts += 1;
+
+        let account_added_at = try_into_u8(self.account_keys_mut().len() - 1)?;
+
+        // There is no need to update instruction account ids that point to [`Message::account_keys`] list
+        // as we pushed the account to the end of the list.
+        // But we must update it in case if there are instruction account ids that point to [`address_table_lookups`].
+
+        match self.address_table_lookups() {
+            Some(lookups) if !lookups.is_empty() => (),
+            // No address table lookups, no need to update the indexes.
+            _ => return Ok(account_added_at),
+        }
+
+        self.instructions_mut()
+            .iter_mut()
+            .flat_map(|ix| {
+                ix.accounts
+                    .iter_mut()
+                    .chain(iter::once(&mut ix.program_id_index))
+            })
+            // Update every instruction account id that points to the address table lookups.
+            .filter(|ix_account_id| **ix_account_id >= account_added_at)
+            .for_each(|ix_account_id| *ix_account_id += 1);
+
+        Ok(account_added_at)
+    }
+
+    /// Returns ALT (Address Lookup Tables) if supported by the message version.
+    fn address_table_lookups(&self) -> Option<&[MessageAddressTableLookup]>;
+
+    fn account_keys_mut(&mut self) -> &mut Vec<SolanaAddress>;
+
+    fn message_header_mut(&mut self) -> &mut MessageHeader;
+
+    fn instructions_mut(&mut self) -> &mut Vec<CompiledInstruction>;
+}
diff --git a/rust/chains/tw_solana/src/modules/instruction_builder/compute_budget_instruction.rs b/rust/chains/tw_solana/src/modules/instruction_builder/compute_budget_instruction.rs
new file mode 100644
index 00000000000..2b3ee7fa267
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/instruction_builder/compute_budget_instruction.rs
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::defined_addresses::COMPUTE_BUDGET_ADDRESS;
+use crate::instruction::Instruction;
+use borsh::{BorshDeserialize, BorshSerialize};
+use tw_encoding::{EncodingError, EncodingResult};
+
+pub type UnitLimit = u32;
+pub type UnitPrice = u64;
+
+#[derive(BorshDeserialize, BorshSerialize)]
+pub enum ComputeBudgetInstruction {
+    Unused,
+    RequestHeapFrame(u32),
+    SetComputeUnitLimit(UnitLimit),
+    SetComputeUnitPrice(UnitPrice),
+    SetLoadedAccountsDataSizeLimit(u32),
+}
+
+impl ComputeBudgetInstruction {
+    pub fn try_from_borsh(data: &[u8]) -> EncodingResult<Self> {
+        borsh::from_slice(data).map_err(|_| EncodingError::InvalidInput)
+    }
+}
+
+pub struct ComputeBudgetInstructionBuilder;
+
+impl ComputeBudgetInstructionBuilder {
+    /// Create a `ComputeBudgetInstruction::SetComputeUnitLimit` `Instruction`
+    pub fn set_compute_unit_limit(units: UnitLimit) -> Instruction {
+        let account_metas = vec![];
+        Instruction::new_with_borsh(
+            *COMPUTE_BUDGET_ADDRESS,
+            &ComputeBudgetInstruction::SetComputeUnitLimit(units),
+            account_metas,
+        )
+    }
+
+    /// Create a `ComputeBudgetInstruction::SetComputeUnitPrice` `Instruction`
+    pub fn set_compute_unit_price(micro_lamports: UnitPrice) -> Instruction {
+        let account_metas = vec![];
+        Instruction::new_with_borsh(
+            *COMPUTE_BUDGET_ADDRESS,
+            &ComputeBudgetInstruction::SetComputeUnitPrice(micro_lamports),
+            account_metas,
+        )
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/instruction_builder/mod.rs b/rust/chains/tw_solana/src/modules/instruction_builder/mod.rs
new file mode 100644
index 00000000000..9a4da04d11d
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/instruction_builder/mod.rs
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::instruction::Instruction;
+
+pub mod compute_budget_instruction;
+pub mod stake_instruction;
+pub mod system_instruction;
+pub mod token_instruction;
+
+use compute_budget_instruction::ComputeBudgetInstructionBuilder;
+use system_instruction::SystemInstructionBuilder;
+
+#[derive(Default)]
+pub struct InstructionBuilder {
+    instructions: Vec<Instruction>,
+}
+
+impl InstructionBuilder {
+    /// Adds an `advance_nonce` instruction if the nonce account provided.
+    pub fn maybe_advance_nonce(
+        &mut self,
+        nonce_account: Option<SolanaAddress>,
+        authorized_account: SolanaAddress,
+    ) -> &mut Self {
+        if let Some(nonce_account) = nonce_account {
+            self.instructions
+                .push(SystemInstructionBuilder::advance_nonce_account(
+                    nonce_account,
+                    authorized_account,
+                ));
+        }
+        self
+    }
+
+    /// Adds a `memo` instruction if it is not empty.
+    pub fn maybe_memo(&mut self, memo: &str) -> &mut Self {
+        if !memo.is_empty() {
+            self.instructions.push(SystemInstructionBuilder::memo(memo));
+        }
+        self
+    }
+
+    /// Adds a `priority_fee` instruction if it is provided.
+    pub fn maybe_priority_fee_price(&mut self, micro_lamports: Option<u64>) -> &mut Self {
+        if let Some(micro_lamports) = micro_lamports {
+            let ix = ComputeBudgetInstructionBuilder::set_compute_unit_price(micro_lamports);
+            self.instructions.push(ix);
+        }
+        self
+    }
+
+    /// Adds a `fee_limit` instruction if it is provided.
+    pub fn maybe_priority_fee_limit(&mut self, units: Option<u32>) -> &mut Self {
+        if let Some(units) = units {
+            let ix = ComputeBudgetInstructionBuilder::set_compute_unit_limit(units);
+            self.instructions.push(ix);
+        }
+        self
+    }
+
+    pub fn add_instruction(&mut self, instruction: Instruction) -> &mut Self {
+        self.instructions.push(instruction);
+        self
+    }
+
+    pub fn add_instructions<I>(&mut self, instructions: I) -> &mut Self
+    where
+        I: IntoIterator<Item = Instruction>,
+    {
+        self.instructions.extend(instructions);
+        self
+    }
+
+    pub fn output(self) -> Vec<Instruction> {
+        self.instructions
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/instruction_builder/stake_instruction.rs b/rust/chains/tw_solana/src/modules/instruction_builder/stake_instruction.rs
new file mode 100644
index 00000000000..ad02414ec72
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/instruction_builder/stake_instruction.rs
@@ -0,0 +1,401 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::blockhash::Blockhash;
+use crate::defined_addresses::*;
+use crate::instruction::{AccountMeta, Instruction};
+use crate::modules::instruction_builder::system_instruction::SystemInstructionBuilder;
+use crate::program::stake_program::StakeProgram;
+use serde::{Deserialize, Serialize};
+
+type UnixTimestamp = i64;
+type Epoch = u64;
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+pub struct Authorized {
+    pub staker: SolanaAddress,
+    pub withdrawer: SolanaAddress,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq, Clone)]
+pub struct Lockup {
+    /// UnixTimestamp at which this stake will allow withdrawal, unless the
+    /// transaction is signed by the custodian
+    pub unix_timestamp: UnixTimestamp,
+    /// epoch height at which this stake will allow withdrawal, unless the
+    /// transaction is signed by the custodian
+    pub epoch: Epoch,
+    /// custodian signature on a transaction exempts the operation from
+    /// lockup constraints
+    pub custodian: SolanaAddress,
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+pub enum StakeAuthorize {
+    Staker,
+    Withdrawer,
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+pub struct LockupArgs {
+    pub unix_timestamp: Option<UnixTimestamp>,
+    pub epoch: Option<Epoch>,
+    pub custodian: Option<SolanaAddress>,
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+pub enum StakeInstruction {
+    /// Initialize a stake with lockup and authorization information
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Uninitialized stake account
+    ///   1. `[]` Rent sysvar
+    ///
+    /// Authorized carries pubkeys that must sign staker transactions
+    ///   and withdrawer transactions.
+    /// Lockup carries information about withdrawal restrictions
+    Initialize(Authorized, Lockup),
+
+    /// Authorize a key to manage stake or withdrawal
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Stake account to be updated
+    ///   1. `[]` Clock sysvar
+    ///   2. `[SIGNER]` The stake or withdraw authority
+    ///   3. Optional: `[SIGNER]` Lockup authority, if updating StakeAuthorize::Withdrawer before
+    ///      lockup expiration
+    Authorize(SolanaAddress, StakeAuthorize),
+
+    /// Delegate a stake to a particular vote account
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Initialized stake account to be delegated
+    ///   1. `[]` Vote account to which this stake will be delegated
+    ///   2. `[]` Clock sysvar
+    ///   3. `[]` Stake history sysvar that carries stake warmup/cooldown history
+    ///   4. `[]` Address of config account that carries stake config
+    ///   5. `[SIGNER]` Stake authority
+    ///
+    /// The entire balance of the staking account is staked.  DelegateStake
+    ///   can be called multiple times, but re-delegation is delayed
+    ///   by one epoch
+    DelegateStake,
+
+    /// Split u64 tokens and stake off a stake account into another stake account.
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Stake account to be split; must be in the Initialized or Stake state
+    ///   1. `[WRITE]` Uninitialized stake account that will take the split-off amount
+    ///   2. `[SIGNER]` Stake authority
+    Split(u64),
+
+    /// Withdraw unstaked lamports from the stake account
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Stake account from which to withdraw
+    ///   1. `[WRITE]` Recipient account
+    ///   2. `[]` Clock sysvar
+    ///   3. `[]` Stake history sysvar that carries stake warmup/cooldown history
+    ///   4. `[SIGNER]` Withdraw authority
+    ///   5. Optional: `[SIGNER]` Lockup authority, if before lockup expiration
+    ///
+    /// The u64 is the portion of the stake account balance to be withdrawn,
+    ///    must be `<= StakeAccount.lamports - staked_lamports`.
+    Withdraw(u64),
+
+    /// Deactivates the stake in the account
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Delegated stake account
+    ///   1. `[]` Clock sysvar
+    ///   2. `[SIGNER]` Stake authority
+    Deactivate,
+
+    /// Set stake lockup
+    ///
+    /// If a lockup is not active, the withdraw authority may set a new lockup
+    /// If a lockup is active, the lockup custodian may update the lockup parameters
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Initialized stake account
+    ///   1. `[SIGNER]` Lockup authority or withdraw authority
+    SetLockup {
+        unix_timestamp: Option<UnixTimestamp>,
+        epoch: Option<Epoch>,
+        custodian: Option<SolanaAddress>,
+    },
+
+    /// Merge two stake accounts.
+    ///
+    /// Both accounts must have identical lockup and authority keys. A merge
+    /// is possible between two stakes in the following states with no additional
+    /// conditions:
+    ///
+    /// * two deactivated stakes
+    /// * an inactive stake into an activating stake during its activation epoch
+    ///
+    /// For the following cases, the voter pubkey and vote credits observed must match:
+    ///
+    /// * two activated stakes
+    /// * two activating accounts that share an activation epoch, during the activation epoch
+    ///
+    /// All other combinations of stake states will fail to merge, including all
+    /// "transient" states, where a stake is activating or deactivating with a
+    /// non-zero effective stake.
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Destination stake account for the merge
+    ///   1. `[WRITE]` Source stake account for to merge.  This account will be drained
+    ///   2. `[]` Clock sysvar
+    ///   3. `[]` Stake history sysvar that carries stake warmup/cooldown history
+    ///   4. `[SIGNER]` Stake authority
+    Merge,
+
+    /// Authorize a key to manage stake or withdrawal with a derived key
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Stake account to be updated
+    ///   1. `[SIGNER]` Base key of stake or withdraw authority
+    ///   2. `[]` Clock sysvar
+    ///   3. Optional: `[SIGNER]` Lockup authority, if updating StakeAuthorize::Withdrawer before
+    ///      lockup expiration
+    AuthorizeWithSeed {
+        new_authorized_pubkey: SolanaAddress,
+        stake_authorize: StakeAuthorize,
+        authority_seed: String,
+        authority_owner: SolanaAddress,
+    },
+
+    /// Initialize a stake with authorization information
+    ///
+    /// This instruction is similar to `Initialize` except that the withdraw authority
+    /// must be a signer, and no lockup is applied to the account.
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Uninitialized stake account
+    ///   1. `[]` Rent sysvar
+    ///   2. `[]` The stake authority
+    ///   3. `[SIGNER]` The withdraw authority
+    ///
+    InitializeChecked,
+
+    /// Authorize a key to manage stake or withdrawal
+    ///
+    /// This instruction behaves like `Authorize` with the additional requirement that the new
+    /// stake or withdraw authority must also be a signer.
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Stake account to be updated
+    ///   1. `[]` Clock sysvar
+    ///   2. `[SIGNER]` The stake or withdraw authority
+    ///   3. `[SIGNER]` The new stake or withdraw authority
+    ///   4. Optional: `[SIGNER]` Lockup authority, if updating StakeAuthorize::Withdrawer before
+    ///      lockup expiration
+    AuthorizeChecked(StakeAuthorize),
+
+    /// Authorize a key to manage stake or withdrawal with a derived key
+    ///
+    /// This instruction behaves like `AuthorizeWithSeed` with the additional requirement that
+    /// the new stake or withdraw authority must also be a signer.
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Stake account to be updated
+    ///   1. `[SIGNER]` Base key of stake or withdraw authority
+    ///   2. `[]` Clock sysvar
+    ///   3. `[SIGNER]` The new stake or withdraw authority
+    ///   4. Optional: `[SIGNER]` Lockup authority, if updating StakeAuthorize::Withdrawer before
+    ///      lockup expiration
+    AuthorizeCheckedWithSeed {
+        stake_authorize: StakeAuthorize,
+        authority_seed: String,
+        authority_owner: SolanaAddress,
+    },
+
+    /// Set stake lockup
+    ///
+    /// This instruction behaves like `SetLockup` with the additional requirement that
+    /// the new lockup authority also be a signer.
+    ///
+    /// If a lockup is not active, the withdraw authority may set a new lockup
+    /// If a lockup is active, the lockup custodian may update the lockup parameters
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Initialized stake account
+    ///   1. `[SIGNER]` Lockup authority or withdraw authority
+    ///   2. Optional: `[SIGNER]` New lockup authority
+    SetLockupChecked {
+        unix_timestamp: Option<UnixTimestamp>,
+        epoch: Option<Epoch>,
+    },
+
+    /// Get the minimum stake delegation, in lamports
+    ///
+    /// # Account references
+    ///   None
+    ///
+    /// Returns the minimum delegation as a little-endian encoded u64 value.
+    /// Programs can use the [`get_minimum_delegation()`] helper function to invoke and
+    /// retrieve the return value for this instruction.
+    ///
+    /// [`get_minimum_delegation()`]: super::tools::get_minimum_delegation
+    GetMinimumDelegation,
+
+    /// Deactivate stake delegated to a vote account that has been delinquent for at least
+    /// `MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION` epochs.
+    ///
+    /// No signer is required for this instruction as it is a common good to deactivate abandoned
+    /// stake.
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Delegated stake account
+    ///   1. `[]` Delinquent vote account for the delegated stake account
+    ///   2. `[]` Reference vote account that has voted at least once in the last
+    ///      `MINIMUM_DELINQUENT_EPOCHS_FOR_DEACTIVATION` epochs
+    DeactivateDelinquent,
+
+    /// Redelegate activated stake to another vote account.
+    ///
+    /// Upon success:
+    ///   * the balance of the delegated stake account will be reduced to the undelegated amount in
+    ///     the account (rent exempt minimum and any additional lamports not part of the delegation),
+    ///     and scheduled for deactivation.
+    ///   * the provided uninitialized stake account will receive the original balance of the
+    ///     delegated stake account, minus the rent exempt minimum, and scheduled for activation to
+    ///     the provided vote account. Any existing lamports in the uninitialized stake account
+    ///     will also be included in the re-delegation.
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Delegated stake account to be redelegated. The account must be fully
+    ///      activated and carry a balance greater than or equal to the minimum delegation amount
+    ///      plus rent exempt minimum
+    ///   1. `[WRITE]` Uninitialized stake account that will hold the redelegated stake
+    ///   2. `[]` Vote account to which this stake will be re-delegated
+    ///   3. `[]` Address of config account that carries stake config
+    ///   4. `[SIGNER]` Stake authority
+    ///
+    Redelegate,
+}
+
+pub struct DepositStakeArgs {
+    pub sender: SolanaAddress,
+    pub validator: SolanaAddress,
+    pub stake_account: Option<SolanaAddress>,
+    pub recent_blockhash: Blockhash,
+    pub lamports: u64,
+    pub space: u64,
+}
+
+pub struct StakeInstructionBuilder;
+
+impl StakeInstructionBuilder {
+    /// Creates an Initialize Stake instruction.
+    pub fn stake_initialize(
+        stake_pubkey: SolanaAddress,
+        authorized: Authorized,
+        lockup: Lockup,
+    ) -> Instruction {
+        Instruction::new_with_bincode(
+            *STAKE_PROGRAM_ID_ADDRESS,
+            StakeInstruction::Initialize(authorized, lockup),
+            vec![
+                AccountMeta::new(stake_pubkey, false),
+                AccountMeta::readonly(*SYSVAR_RENT_ID_ADDRESS, false),
+            ],
+        )
+    }
+
+    pub fn withdraw(
+        stake_pubkey: SolanaAddress,
+        withdrawer_pubkey: SolanaAddress,
+        to_pubkey: SolanaAddress,
+        lamports: u64,
+        custodian_pubkey: Option<SolanaAddress>,
+    ) -> Instruction {
+        let mut account_metas = vec![
+            AccountMeta::new(stake_pubkey, false),
+            AccountMeta::new(to_pubkey, false),
+            AccountMeta::readonly(*SYSVAR_CLOCK_ID_ADDRESS, false),
+            AccountMeta::readonly(*SYSVAR_STAKE_HISTORY_ID_ADDRESS, false),
+            AccountMeta::readonly(withdrawer_pubkey, true),
+        ];
+
+        if let Some(custodian_pubkey) = custodian_pubkey {
+            account_metas.push(AccountMeta::readonly(custodian_pubkey, true));
+        }
+
+        Instruction::new_with_bincode(
+            *STAKE_PROGRAM_ID_ADDRESS,
+            StakeInstruction::Withdraw(lamports),
+            account_metas,
+        )
+    }
+
+    pub fn delegate(
+        stake_pubkey: SolanaAddress,
+        vote_pubkey: SolanaAddress,
+        authorized_pubkey: SolanaAddress,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(stake_pubkey, false),
+            AccountMeta::readonly(vote_pubkey, false),
+            AccountMeta::readonly(*SYSVAR_CLOCK_ID_ADDRESS, false),
+            AccountMeta::readonly(*SYSVAR_STAKE_HISTORY_ID_ADDRESS, false),
+            AccountMeta::readonly(*STAKE_CONFIG_ID_ADDRESS, false),
+            AccountMeta::readonly(authorized_pubkey, true),
+        ];
+        Instruction::new_with_bincode(
+            *STAKE_PROGRAM_ID_ADDRESS,
+            StakeInstruction::DelegateStake,
+            account_metas,
+        )
+    }
+
+    /// 0. `[WRITE]` Delegated stake account
+    /// 1. `[]` Clock sysvar
+    /// 2. `[SIGNER]` Stake authority
+    pub fn deactivate(
+        stake_pubkey: SolanaAddress,
+        authorized_pubkey: SolanaAddress,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(stake_pubkey, false),
+            AccountMeta::readonly(*SYSVAR_CLOCK_ID_ADDRESS, false),
+            AccountMeta::new(authorized_pubkey, true),
+        ];
+        Instruction::new_with_bincode(
+            *STAKE_PROGRAM_ID_ADDRESS,
+            StakeInstruction::Deactivate,
+            account_metas,
+        )
+    }
+
+    /// The function represents "stake delegation" operation that consists of several small instructions.
+    pub fn deposit_stake(args: DepositStakeArgs) -> Vec<Instruction> {
+        let stake_addr = args.stake_account.unwrap_or_else(|| {
+            // no stake address specified, generate a new unique
+            StakeProgram::address_from_recent_blockhash(&args.sender, &args.recent_blockhash)
+        });
+        let seed = StakeProgram::recent_blockhash_as_seed(&args.recent_blockhash);
+
+        let authorized = Authorized {
+            staker: args.sender,
+            withdrawer: args.sender,
+        };
+        let lockup = Lockup::default();
+
+        vec![
+            SystemInstructionBuilder::create_account_with_seed(
+                args.sender,
+                stake_addr,
+                args.sender,
+                seed,
+                args.lamports,
+                args.space,
+            ),
+            StakeInstructionBuilder::stake_initialize(stake_addr, authorized, lockup),
+            StakeInstructionBuilder::delegate(stake_addr, args.validator, args.sender),
+        ]
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/instruction_builder/system_instruction.rs b/rust/chains/tw_solana/src/modules/instruction_builder/system_instruction.rs
new file mode 100644
index 00000000000..3897d78b6ea
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/instruction_builder/system_instruction.rs
@@ -0,0 +1,344 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::defined_addresses::*;
+use crate::instruction::{AccountMeta, Instruction};
+use serde::{Deserialize, Serialize};
+use tw_encoding::{EncodingError, EncodingResult};
+
+/// An instruction to the system program.
+#[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq)]
+pub enum SystemInstruction {
+    /// Create a new account
+    ///
+    /// # Account references
+    ///   0. `[WRITE, SIGNER]` Funding account
+    ///   1. `[WRITE, SIGNER]` New account
+    CreateAccount {
+        /// Number of lamports to transfer to the new account
+        lamports: u64,
+
+        /// Number of bytes of memory to allocate
+        space: u64,
+
+        /// Address of program that will own the new account
+        owner: SolanaAddress,
+    },
+
+    /// Assign account to a program
+    ///
+    /// # Account references
+    ///   0. `[WRITE, SIGNER]` Assigned account public key
+    Assign {
+        /// Owner program account
+        owner: SolanaAddress,
+    },
+
+    /// Transfer lamports
+    ///
+    /// # Account references
+    ///   0. `[WRITE, SIGNER]` Funding account
+    ///   1. `[WRITE]` Recipient account
+    Transfer { lamports: u64 },
+
+    /// Create a new account at an address derived from a base pubkey and a seed
+    ///
+    /// # Account references
+    ///   0. `[WRITE, SIGNER]` Funding account
+    ///   1. `[WRITE]` Created account
+    ///   2. `[SIGNER]` (optional) Base account; the account matching the base SolanaAddress below must be
+    ///                          provided as a signer, but may be the same as the funding account
+    ///                          and provided as account 0
+    CreateAccountWithSeed {
+        /// Base public key
+        base: SolanaAddress,
+
+        /// String of ASCII chars, no longer than `SolanaAddress::MAX_SEED_LEN`
+        seed: String,
+
+        /// Number of lamports to transfer to the new account
+        lamports: u64,
+
+        /// Number of bytes of memory to allocate
+        space: u64,
+
+        /// Owner program account address
+        owner: SolanaAddress,
+    },
+
+    /// Consumes a stored nonce, replacing it with a successor
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Nonce account
+    ///   1. `[]` RecentBlockhashes sysvar
+    ///   2. `[SIGNER]` Nonce authority
+    AdvanceNonceAccount,
+
+    /// Withdraw funds from a nonce account
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Nonce account
+    ///   1. `[WRITE]` Recipient account
+    ///   2. `[]` RecentBlockhashes sysvar
+    ///   3. `[]` Rent sysvar
+    ///   4. `[SIGNER]` Nonce authority
+    ///
+    /// The `u64` parameter is the lamports to withdraw, which must leave the
+    /// account balance above the rent exempt reserve or at zero.
+    WithdrawNonceAccount(u64),
+
+    /// Drive state of Uninitialized nonce account to Initialized, setting the nonce value
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Nonce account
+    ///   1. `[]` RecentBlockhashes sysvar
+    ///   2. `[]` Rent sysvar
+    ///
+    /// The `SolanaAddress` parameter specifies the entity authorized to execute nonce
+    /// instruction on the account
+    ///
+    /// No signatures are required to execute this instruction, enabling derived
+    /// nonce account addresses
+    InitializeNonceAccount(SolanaAddress),
+
+    /// Change the entity authorized to execute nonce instructions on the account
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Nonce account
+    ///   1. `[SIGNER]` Nonce authority
+    ///
+    /// The `SolanaAddress` parameter identifies the entity to authorize
+    AuthorizeNonceAccount(SolanaAddress),
+
+    /// Allocate space in a (possibly new) account without funding
+    ///
+    /// # Account references
+    ///   0. `[WRITE, SIGNER]` New account
+    Allocate {
+        /// Number of bytes of memory to allocate
+        space: u64,
+    },
+
+    /// Allocate space for and assign an account at an address
+    ///    derived from a base public key and a seed
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Allocated account
+    ///   1. `[SIGNER]` Base account
+    AllocateWithSeed {
+        /// Base public key
+        base: SolanaAddress,
+
+        /// String of ASCII chars, no longer than `pubkey::MAX_SEED_LEN`
+        seed: String,
+
+        /// Number of bytes of memory to allocate
+        space: u64,
+
+        /// Owner program account
+        owner: SolanaAddress,
+    },
+
+    /// Assign account to a program based on a seed
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Assigned account
+    ///   1. `[SIGNER]` Base account
+    AssignWithSeed {
+        /// Base public key
+        base: SolanaAddress,
+
+        /// String of ASCII chars, no longer than `pubkey::MAX_SEED_LEN`
+        seed: String,
+
+        /// Owner program account
+        owner: SolanaAddress,
+    },
+
+    /// Transfer lamports from a derived address
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Funding account
+    ///   1. `[SIGNER]` Base for funding account
+    ///   2. `[WRITE]` Recipient account
+    TransferWithSeed {
+        /// Amount to transfer
+        lamports: u64,
+
+        /// Seed to use to derive the funding account address
+        from_seed: String,
+
+        /// Owner to use to derive the funding account address
+        from_owner: SolanaAddress,
+    },
+
+    /// One-time idempotent upgrade of legacy nonce versions in order to bump
+    /// them out of chain blockhash domain.
+    ///
+    /// # Account references
+    ///   0. `[WRITE]` Nonce account
+    UpgradeNonceAccount,
+}
+
+impl SystemInstruction {
+    pub fn try_from_bincode(data: &[u8]) -> EncodingResult<Self> {
+        bincode::deserialize(data).map_err(|_| EncodingError::InvalidInput)
+    }
+}
+
+pub struct SystemInstructionBuilder;
+
+impl SystemInstructionBuilder {
+    pub fn memo(memo: &str) -> Instruction {
+        let account_metas = Vec::default();
+        let data = memo.as_bytes().to_vec();
+        Instruction::new(*MEMO_PROGRAM_ID_ADDRESS, data, account_metas)
+    }
+
+    pub fn create_account(
+        from_pubkey: SolanaAddress,
+        to_pubkey: SolanaAddress,
+        lamports: u64,
+        space: u64,
+        owner: SolanaAddress,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(from_pubkey, true),
+            AccountMeta::new(to_pubkey, true),
+        ];
+        Instruction::new_with_bincode(
+            *SYSTEM_PROGRAM_ID_ADDRESS,
+            SystemInstruction::CreateAccount {
+                lamports,
+                space,
+                owner,
+            },
+            account_metas,
+        )
+    }
+
+    pub fn transfer(
+        from_pubkey: SolanaAddress,
+        to_pubkey: SolanaAddress,
+        lamports: u64,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(from_pubkey, true),
+            AccountMeta::new(to_pubkey, false),
+        ];
+        Instruction::new_with_bincode(
+            *SYSTEM_PROGRAM_ID_ADDRESS,
+            SystemInstruction::Transfer { lamports },
+            account_metas,
+        )
+    }
+
+    /// Please note `to_pubkey` must match `create_with_seed(base, seed, owner)`.
+    pub fn create_account_with_seed(
+        from_pubkey: SolanaAddress,
+        to_pubkey: SolanaAddress,
+        base: SolanaAddress,
+        seed: String,
+        lamports: u64,
+        space: u64,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(from_pubkey, true),
+            AccountMeta::new(to_pubkey, false),
+            AccountMeta::readonly(base, true),
+        ];
+
+        Instruction::new_with_bincode(
+            *SYSTEM_PROGRAM_ID_ADDRESS,
+            SystemInstruction::CreateAccountWithSeed {
+                base,
+                seed,
+                lamports,
+                space,
+                owner: *STAKE_PROGRAM_ID_ADDRESS,
+            },
+            account_metas,
+        )
+    }
+
+    /// Advance the value of a durable transaction nonce.
+    ///
+    /// # Required signers
+    ///
+    /// The `authorized_pubkey` signer must sign the transaction.
+    pub fn advance_nonce_account(
+        nonce_pubkey: SolanaAddress,
+        authorized_pubkey: SolanaAddress,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(nonce_pubkey, false),
+            AccountMeta::readonly(*SYSVAR_RECENT_BLOCKHASHS_ADDRESS, false),
+            AccountMeta::readonly(authorized_pubkey, true),
+        ];
+        Instruction::new_with_bincode(
+            *SYSTEM_PROGRAM_ID_ADDRESS,
+            SystemInstruction::AdvanceNonceAccount,
+            account_metas,
+        )
+    }
+
+    /// Create an account containing a durable transaction nonce.
+    pub fn init_nonce_account(
+        nonce_pubkey: SolanaAddress,
+        authority: SolanaAddress,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(nonce_pubkey, false),
+            AccountMeta::readonly(*SYSVAR_RECENT_BLOCKHASHS_ADDRESS, false),
+            AccountMeta::readonly(*SYSVAR_RENT_ID_ADDRESS, false),
+        ];
+        Instruction::new_with_bincode(
+            *SYSTEM_PROGRAM_ID_ADDRESS,
+            SystemInstruction::InitializeNonceAccount(authority),
+            account_metas,
+        )
+    }
+
+    /// Withdraw lamports from a durable transaction nonce account.
+    pub fn withdraw_nonce_account(
+        nonce_pubkey: SolanaAddress,
+        authorized_pubkey: SolanaAddress,
+        to_pubkey: SolanaAddress,
+        lamports: u64,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(nonce_pubkey, false),
+            AccountMeta::new(to_pubkey, false),
+            AccountMeta::readonly(*SYSVAR_RECENT_BLOCKHASHS_ADDRESS, false),
+            AccountMeta::readonly(*SYSVAR_RENT_ID_ADDRESS, false),
+            AccountMeta::readonly(authorized_pubkey, true),
+        ];
+        Instruction::new_with_bincode(
+            *SYSTEM_PROGRAM_ID_ADDRESS,
+            SystemInstruction::WithdrawNonceAccount(lamports),
+            account_metas,
+        )
+    }
+
+    /// The function represents "create nonce account" operation that consists of several small instructions.
+    pub fn create_nonce_account(
+        signer: SolanaAddress,
+        new_nonce_account: SolanaAddress,
+        rent: u64,
+        space: u64,
+    ) -> Vec<Instruction> {
+        let program_id = *SYSTEM_PROGRAM_ID_ADDRESS;
+        vec![
+            SystemInstructionBuilder::create_account(
+                signer,
+                new_nonce_account,
+                rent,
+                space,
+                program_id,
+            ),
+            SystemInstructionBuilder::init_nonce_account(new_nonce_account, signer),
+        ]
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/instruction_builder/token_instruction.rs b/rust/chains/tw_solana/src/modules/instruction_builder/token_instruction.rs
new file mode 100644
index 00000000000..cc5a47957e3
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/instruction_builder/token_instruction.rs
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::defined_addresses::*;
+use crate::instruction::{AccountMeta, Instruction};
+use std::mem::size_of;
+use tw_memory::Data;
+
+/// Instructions supported by the token program.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum TokenInstruction {
+    /// Transfers tokens from one account to another either directly or via a
+    /// delegate.  If this account is associated with the native mint then equal
+    /// amounts of SOL and Tokens will be transferred to the destination
+    /// account.
+    ///
+    /// This instruction differs from Transfer in that the token mint and
+    /// decimals value is checked by the caller.  This may be useful when
+    /// creating transactions offline or within a hardware wallet.
+    ///
+    /// Accounts expected by this instruction:
+    ///
+    ///   * Single owner/delegate
+    ///   0. `[writable]` The source account.
+    ///   1. `[]` The token mint.
+    ///   2. `[writable]` The destination account.
+    ///   3. `[signer]` The source account's owner/delegate.
+    ///
+    ///   * Multisignature owner/delegate
+    ///   0. `[writable]` The source account.
+    ///   1. `[]` The token mint.
+    ///   2. `[writable]` The destination account.
+    ///   3. `[]` The source account's multisignature owner/delegate.
+    ///   4. ..4+M `[signer]` M signer accounts.
+    TransferChecked {
+        /// The amount of tokens to transfer.
+        amount: u64,
+        /// Expected number of base 10 digits to the right of the decimal place.
+        decimals: u8,
+    },
+}
+
+impl TokenInstruction {
+    /// Packs a [TokenInstruction](enum.TokenInstruction.html) into a byte
+    /// buffer.
+    ///
+    /// # Important
+    ///
+    /// This serialization method differs from [`bincode::serialize`]:
+    /// It needs to serialize enum `type` as u8 (1 byte), but [`bincode::serialize`] serializes the type as u32 (4 bytes).
+    pub fn pack(&self) -> Vec<u8> {
+        let mut buf = Vec::with_capacity(size_of::<Self>());
+        match self {
+            &Self::TransferChecked { amount, decimals } => {
+                // https://github.com/solana-labs/solana-program-library/blob/5418cf9b90d5c9ff5bff9f55fd17651f66c98902/token/program-2022/src/instruction.rs#L334-L339
+                // https://github.com/trustwallet/wallet-core/blob/cd5a27481d2181e63362cb57e2b2160506cce163/src/Solana/Instruction.h#L37
+                buf.push(12);
+                buf.extend_from_slice(&amount.to_le_bytes());
+                buf.push(decimals);
+            },
+        };
+        buf
+    }
+}
+
+pub struct TokenInstructionBuilder;
+
+impl TokenInstructionBuilder {
+    // `create_associated_token_account()` solana-program-library/associated-token-account/program/src/lib.rs
+    pub fn create_account(
+        funding_pubkey: SolanaAddress,
+        other_main_pubkey: SolanaAddress,
+        token_mint_pubkey: SolanaAddress,
+        token_pubkey: SolanaAddress,
+        token_program_id: SolanaAddress,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(funding_pubkey, true),
+            AccountMeta::new(token_pubkey, false),
+            AccountMeta::readonly(other_main_pubkey, false),
+            AccountMeta::readonly(token_mint_pubkey, false),
+            AccountMeta::readonly(*SYSTEM_PROGRAM_ID_ADDRESS, false),
+            AccountMeta::readonly(token_program_id, false),
+            AccountMeta::readonly(*SYSVAR_RENT_ID_ADDRESS, false),
+        ];
+        let data = Data::default();
+        Instruction::new(*ASSOCIATED_TOKEN_PROGRAM_ID_ADDRESS, data, account_metas)
+    }
+
+    /// transfer_checked() solana-program-library/token/program/src/instruction.rs
+    pub fn transfer_checked(
+        sender_token_pubkey: SolanaAddress,
+        token_mint_pubkey: SolanaAddress,
+        recipient_token_pubkey: SolanaAddress,
+        signer: SolanaAddress,
+        amount: u64,
+        decimals: u8,
+        token_program_id: SolanaAddress,
+    ) -> Instruction {
+        let account_metas = vec![
+            AccountMeta::new(sender_token_pubkey, false),
+            AccountMeta::readonly(token_mint_pubkey, false),
+            AccountMeta::new(recipient_token_pubkey, false),
+            AccountMeta::new(signer, true),
+        ];
+
+        let data = TokenInstruction::TransferChecked { amount, decimals }.pack();
+        Instruction::new(token_program_id, data, account_metas)
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/message_builder.rs b/rust/chains/tw_solana/src/modules/message_builder.rs
new file mode 100644
index 00000000000..c4852154b1f
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/message_builder.rs
@@ -0,0 +1,782 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::blockhash::Blockhash;
+use crate::defined_addresses::{TOKEN_2022_PROGRAM_ID_ADDRESS, TOKEN_PROGRAM_ID_ADDRESS};
+use crate::instruction::Instruction;
+use crate::modules::compiled_instructions::compile_instructions;
+use crate::modules::compiled_keys::CompiledKeys;
+use crate::modules::instruction_builder::compute_budget_instruction::{UnitLimit, UnitPrice};
+use crate::modules::instruction_builder::stake_instruction::{
+    DepositStakeArgs, StakeInstructionBuilder,
+};
+use crate::modules::instruction_builder::system_instruction::SystemInstructionBuilder;
+use crate::modules::instruction_builder::token_instruction::TokenInstructionBuilder;
+use crate::modules::instruction_builder::InstructionBuilder;
+use crate::modules::PubkeySignatureMap;
+use crate::transaction::versioned::VersionedMessage;
+use crate::transaction::{legacy, v0, CompiledInstruction, MessageHeader, Signature};
+use std::borrow::Cow;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::ed25519;
+use tw_keypair::traits::KeyPairTrait;
+use tw_proto::Solana::Proto;
+use Proto::mod_SigningInput::OneOftransaction_type as ProtoTransactionType;
+
+const DEFAULT_SPACE: u64 = 200;
+const DEFAULT_CREATE_NONCE_SPACE: u64 = 80;
+
+pub struct MessageBuilder<'a> {
+    input: Proto::SigningInput<'a>,
+}
+
+impl<'a> MessageBuilder<'a> {
+    pub fn new(input: Proto::SigningInput<'a>) -> Self {
+        MessageBuilder { input }
+    }
+
+    pub fn signing_keys(&self) -> SigningResult<Vec<ed25519::sha512::KeyPair>> {
+        let mut signing_keys = Vec::default();
+        if !self.input.fee_payer_private_key.is_empty() {
+            let fee_payer_private_key =
+                ed25519::sha512::KeyPair::try_from(self.input.fee_payer_private_key.as_ref())
+                    .into_tw()
+                    .context("Invalid fee payer private key")?;
+            signing_keys.push(fee_payer_private_key);
+        }
+
+        signing_keys.push(self.signer_key()?);
+
+        // Consider matching other transaction types if they may contain other private keys.
+        if let ProtoTransactionType::create_nonce_account(ref nonce) = self.input.transaction_type {
+            let nonce_private_key =
+                ed25519::sha512::KeyPair::try_from(nonce.nonce_account_private_key.as_ref())
+                    .into_tw()
+                    .context("Invalid nonce account private key")?;
+            signing_keys.push(nonce_private_key);
+        }
+
+        Ok(signing_keys)
+    }
+
+    pub fn external_signatures(&self) -> SigningResult<PubkeySignatureMap> {
+        match self.input.raw_message {
+            Some(ref raw_message) => RawMessageBuilder::external_signatures(raw_message),
+            None => Ok(PubkeySignatureMap::default()),
+        }
+    }
+
+    pub fn build(self) -> SigningResult<VersionedMessage> {
+        if let Some(ref raw_message) = self.input.raw_message {
+            return RawMessageBuilder::build(raw_message);
+        }
+
+        let instructions = self.build_instructions()?;
+
+        // Please note the fee payer can be different from the actual signer.
+        let (message_header, account_keys) = CompiledKeys::with_fee_payer(self.fee_payer()?)
+            .compile(&instructions)
+            .try_into_message_components()?;
+
+        let compiled_instructions = compile_instructions(&instructions, &account_keys)?;
+
+        if self.input.v0_msg {
+            Ok(VersionedMessage::V0(v0::Message {
+                header: message_header,
+                account_keys,
+                recent_blockhash: self.recent_blockhash()?.to_bytes(),
+                instructions: compiled_instructions,
+                address_table_lookups: Vec::default(),
+            }))
+        } else {
+            Ok(VersionedMessage::Legacy(legacy::Message {
+                header: message_header,
+                account_keys,
+                recent_blockhash: self.recent_blockhash()?.to_bytes(),
+                instructions: compiled_instructions,
+            }))
+        }
+    }
+
+    /// Please note that this method can add [`MessageBuilder::signer_keys`] if necessary.
+    fn build_instructions(&self) -> SigningResult<Vec<Instruction>> {
+        match self.input.transaction_type {
+            ProtoTransactionType::transfer_transaction(ref transfer) => {
+                self.transfer_from_proto(transfer)
+            },
+            ProtoTransactionType::delegate_stake_transaction(ref delegate) => {
+                self.delegate_stake_from_proto(delegate)
+            },
+            ProtoTransactionType::deactivate_stake_transaction(ref deactivate) => {
+                self.deactivate_stake_from_proto(deactivate)
+            },
+            ProtoTransactionType::deactivate_all_stake_transaction(ref deactivate_all) => {
+                self.deactivate_all_stake_from_proto(deactivate_all)
+            },
+            ProtoTransactionType::withdraw_transaction(ref withdraw) => {
+                self.withdraw_from_proto(withdraw)
+            },
+            ProtoTransactionType::withdraw_all_transaction(ref withdraw_all) => {
+                self.withdraw_all_from_proto(withdraw_all)
+            },
+            ProtoTransactionType::create_token_account_transaction(ref create_token_acc) => {
+                self.create_token_account_from_proto(create_token_acc)
+            },
+            ProtoTransactionType::token_transfer_transaction(ref token_transfer) => {
+                self.token_transfer_from_proto(token_transfer)
+            },
+            ProtoTransactionType::create_and_transfer_token_transaction(
+                ref create_and_transfer,
+            ) => self.create_and_transfer_token_from_proto(create_and_transfer),
+            ProtoTransactionType::create_nonce_account(ref create_nonce) => {
+                self.create_nonce_account_from_proto(create_nonce)
+            },
+            ProtoTransactionType::withdraw_nonce_account(ref withdraw_nonce) => {
+                self.withdraw_nonce_from_proto(withdraw_nonce)
+            },
+            ProtoTransactionType::advance_nonce_account(ref advance_nonce) => {
+                self.advance_nonce_from_proto(advance_nonce)
+            },
+            ProtoTransactionType::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No transaction type specified"),
+        }
+    }
+
+    fn transfer_from_proto(
+        &self,
+        transfer: &Proto::Transfer<'_>,
+    ) -> SigningResult<Vec<Instruction>> {
+        let from = self.signer_address()?;
+        let to = SolanaAddress::from_str(&transfer.recipient)
+            .into_tw()
+            .context("Invalid recipient address")?;
+
+        let references = Self::parse_references(&transfer.references)?;
+
+        let transfer_ix = SystemInstructionBuilder::transfer(from, to, transfer.value)
+            .with_references(references);
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, from)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .maybe_memo(transfer.memo.as_ref())
+            .add_instruction(transfer_ix);
+        Ok(builder.output())
+    }
+
+    fn delegate_stake_from_proto(
+        &self,
+        delegate: &Proto::DelegateStake,
+    ) -> SigningResult<Vec<Instruction>> {
+        let sender = self.signer_address()?;
+        let validator = SolanaAddress::from_str(delegate.validator_pubkey.as_ref())
+            .into_tw()
+            .context("Invalid validator address")?;
+
+        let stake_account = if delegate.stake_account.is_empty() {
+            None
+        } else {
+            let stake_account = SolanaAddress::from_str(&delegate.stake_account)
+                .into_tw()
+                .context("Invalid stake account")?;
+            Some(stake_account)
+        };
+
+        let deposit_ixs = StakeInstructionBuilder::deposit_stake(DepositStakeArgs {
+            sender,
+            validator,
+            stake_account,
+            recent_blockhash: self.recent_blockhash()?,
+            lamports: delegate.value,
+            space: DEFAULT_SPACE,
+        });
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, sender)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instructions(deposit_ixs);
+        Ok(builder.output())
+    }
+
+    fn deactivate_stake_from_proto(
+        &self,
+        deactivate: &Proto::DeactivateStake,
+    ) -> SigningResult<Vec<Instruction>> {
+        let sender = self.signer_address()?;
+        let stake_account = SolanaAddress::from_str(&deactivate.stake_account)
+            .into_tw()
+            .context("Invalid stake account")?;
+
+        let deactivate_ix = StakeInstructionBuilder::deactivate(stake_account, sender);
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, sender)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instruction(deactivate_ix);
+        Ok(builder.output())
+    }
+
+    fn deactivate_all_stake_from_proto(
+        &self,
+        deactivate_all: &Proto::DeactivateAllStake,
+    ) -> SigningResult<Vec<Instruction>> {
+        let sender = self.signer_address()?;
+        let deactivate_ixs = deactivate_all
+            .stake_accounts
+            .iter()
+            .map(|stake_account| {
+                let stake_account = SolanaAddress::from_str(stake_account.as_ref())?;
+                Ok(StakeInstructionBuilder::deactivate(stake_account, sender))
+            })
+            .collect::<SigningResult<Vec<_>>>()
+            .context("Invalid stake account(s)")?;
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, sender)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instructions(deactivate_ixs);
+        Ok(builder.output())
+    }
+
+    fn withdraw_from_proto(
+        &self,
+        withdraw: &Proto::WithdrawStake,
+    ) -> SigningResult<Vec<Instruction>> {
+        let sender = self.signer_address()?;
+        let stake_account = SolanaAddress::from_str(withdraw.stake_account.as_ref())
+            .into_tw()
+            .context("Invalid stake account")?;
+
+        let custodian_account = None;
+
+        let withdraw_ix = StakeInstructionBuilder::withdraw(
+            stake_account,
+            sender,
+            sender,
+            withdraw.value,
+            custodian_account,
+        );
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, sender)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instruction(withdraw_ix);
+        Ok(builder.output())
+    }
+
+    fn withdraw_all_from_proto(
+        &self,
+        withdraw_all: &Proto::WithdrawAllStake,
+    ) -> SigningResult<Vec<Instruction>> {
+        let sender = self.signer_address()?;
+
+        let withdraw_ixs = withdraw_all
+            .stake_accounts
+            .iter()
+            .map(|withdraw| {
+                let stake_account = SolanaAddress::from_str(withdraw.stake_account.as_ref())
+                    .into_tw()
+                    .context("Invalid stake account")?;
+
+                let custodian_account = None;
+                Ok(StakeInstructionBuilder::withdraw(
+                    stake_account,
+                    sender,
+                    sender,
+                    withdraw.value,
+                    custodian_account,
+                ))
+            })
+            .collect::<SigningResult<Vec<_>>>()?;
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, sender)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instructions(withdraw_ixs);
+        Ok(builder.output())
+    }
+
+    fn create_token_account_from_proto(
+        &self,
+        create_token_acc: &Proto::CreateTokenAccount,
+    ) -> SigningResult<Vec<Instruction>> {
+        let funding_account = self.signer_address()?;
+        let other_main_address = SolanaAddress::from_str(create_token_acc.main_address.as_ref())
+            .into_tw()
+            .context("Invalid main address")?;
+
+        let token_mint_address =
+            SolanaAddress::from_str(create_token_acc.token_mint_address.as_ref())
+                .into_tw()
+                .context("Invalid token mint address")?;
+
+        let token_address = SolanaAddress::from_str(create_token_acc.token_address.as_ref())
+            .into_tw()
+            .context("Invalid token address to be created")?;
+
+        let instruction = TokenInstructionBuilder::create_account(
+            funding_account,
+            other_main_address,
+            token_mint_address,
+            token_address,
+            match_program_id(create_token_acc.token_program_id),
+        );
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, funding_account)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instruction(instruction);
+        Ok(builder.output())
+    }
+
+    fn token_transfer_from_proto(
+        &self,
+        token_transfer: &Proto::TokenTransfer,
+    ) -> SigningResult<Vec<Instruction>> {
+        let signer = self.signer_address()?;
+        let sender_token_address =
+            SolanaAddress::from_str(token_transfer.sender_token_address.as_ref())
+                .into_tw()
+                .context("Invalid sender token address")?;
+
+        let token_mint_address =
+            SolanaAddress::from_str(token_transfer.token_mint_address.as_ref())
+                .into_tw()
+                .context("Invalid token mint address")?;
+
+        let recipient_token_address =
+            SolanaAddress::from_str(token_transfer.recipient_token_address.as_ref())
+                .into_tw()
+                .context("Invalid recipient token address")?;
+
+        let decimals = token_transfer
+            .decimals
+            .try_into()
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid token decimals. Expected lower than 256")?;
+
+        let references = Self::parse_references(&token_transfer.references)?;
+        let transfer_instruction = TokenInstructionBuilder::transfer_checked(
+            sender_token_address,
+            token_mint_address,
+            recipient_token_address,
+            signer,
+            token_transfer.amount,
+            decimals,
+            match_program_id(token_transfer.token_program_id),
+        )
+        .with_references(references);
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, signer)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .maybe_memo(token_transfer.memo.as_ref())
+            .add_instruction(transfer_instruction);
+        Ok(builder.output())
+    }
+
+    fn create_and_transfer_token_from_proto(
+        &self,
+        create_and_transfer: &Proto::CreateAndTransferToken,
+    ) -> SigningResult<Vec<Instruction>> {
+        let signer = self.signer_address()?;
+        let fee_payer = self.fee_payer()?;
+
+        let sender_token_address =
+            SolanaAddress::from_str(create_and_transfer.sender_token_address.as_ref())
+                .into_tw()
+                .context("Invalid sender token address")?;
+
+        let token_mint_address =
+            SolanaAddress::from_str(create_and_transfer.token_mint_address.as_ref())
+                .into_tw()
+                .context("Invalid token mint address")?;
+
+        let recipient_main_address =
+            SolanaAddress::from_str(create_and_transfer.recipient_main_address.as_ref())
+                .into_tw()
+                .context("Invalid recipient main address")?;
+
+        let recipient_token_address =
+            SolanaAddress::from_str(create_and_transfer.recipient_token_address.as_ref())
+                .into_tw()
+                .context("Invalid recipient token address")?;
+
+        let references = Self::parse_references(&create_and_transfer.references)?;
+
+        let decimals = create_and_transfer
+            .decimals
+            .try_into()
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid token decimals. Expected lower than 256")?;
+
+        let create_account_instruction = TokenInstructionBuilder::create_account(
+            // Can be different from the actual signer.
+            fee_payer,
+            recipient_main_address,
+            token_mint_address,
+            recipient_token_address,
+            match_program_id(create_and_transfer.token_program_id),
+        );
+        let transfer_instruction = TokenInstructionBuilder::transfer_checked(
+            sender_token_address,
+            token_mint_address,
+            recipient_token_address,
+            signer,
+            create_and_transfer.amount,
+            decimals,
+            match_program_id(create_and_transfer.token_program_id),
+        )
+        .with_references(references);
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, signer)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instruction(create_account_instruction)
+            // Optional memo. Order: before transfer, as per documentation.
+            .maybe_memo(create_and_transfer.memo.as_ref())
+            .add_instruction(transfer_instruction);
+        Ok(builder.output())
+    }
+
+    fn create_nonce_account_from_proto(
+        &self,
+        create_nonce: &Proto::CreateNonceAccount,
+    ) -> SigningResult<Vec<Instruction>> {
+        let signer = self.signer_address()?;
+        let prev_nonce_account = self.nonce_account()?;
+
+        let new_nonce_account = if create_nonce.nonce_account.is_empty() {
+            let nonce_key =
+                ed25519::sha512::KeyPair::try_from(create_nonce.nonce_account_private_key.as_ref())
+                    .into_tw()
+                    .context("Invalid nonce account private key")?;
+            SolanaAddress::with_public_key_ed25519(nonce_key.public())
+        } else {
+            SolanaAddress::from_str(create_nonce.nonce_account.as_ref())
+                .into_tw()
+                .context("Invalid nonce account")?
+        };
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(prev_nonce_account, signer)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instructions(SystemInstructionBuilder::create_nonce_account(
+                signer,
+                new_nonce_account,
+                create_nonce.rent,
+                DEFAULT_CREATE_NONCE_SPACE,
+            ));
+        Ok(builder.output())
+    }
+
+    fn withdraw_nonce_from_proto(
+        &self,
+        withdraw_nonce: &Proto::WithdrawNonceAccount,
+    ) -> SigningResult<Vec<Instruction>> {
+        let signer = self.signer_address()?;
+        let withdraw_from_nonce = SolanaAddress::from_str(withdraw_nonce.nonce_account.as_ref())
+            .into_tw()
+            .context("Invalid nonce account")?;
+
+        let recipient = SolanaAddress::from_str(withdraw_nonce.recipient.as_ref())
+            .into_tw()
+            .context("Invalid recipient")?;
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(self.nonce_account()?, signer)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit())
+            .add_instruction(SystemInstructionBuilder::withdraw_nonce_account(
+                withdraw_from_nonce,
+                signer,
+                recipient,
+                withdraw_nonce.value,
+            ));
+        Ok(builder.output())
+    }
+
+    fn advance_nonce_from_proto(
+        &self,
+        advance_nonce: &Proto::AdvanceNonceAccount,
+    ) -> SigningResult<Vec<Instruction>> {
+        let signer = self.signer_address()?;
+        let nonce_account = SolanaAddress::from_str(advance_nonce.nonce_account.as_ref())
+            .into_tw()
+            .context("Invalid nonce account")?;
+
+        let mut builder = InstructionBuilder::default();
+        builder
+            .maybe_advance_nonce(Some(nonce_account), signer)
+            .maybe_priority_fee_price(self.priority_fee_price())
+            .maybe_priority_fee_limit(self.priority_fee_limit());
+        Ok(builder.output())
+    }
+
+    fn nonce_account(&self) -> SigningResult<Option<SolanaAddress>> {
+        if self.input.nonce_account.is_empty() {
+            Ok(None)
+        } else {
+            SolanaAddress::from_str(&self.input.nonce_account)
+                .map(Some)
+                .map_err(SigningError::from)
+                .context("Invalid nonce account")
+        }
+    }
+
+    fn signer_address(&self) -> SigningResult<SolanaAddress> {
+        if self.input.private_key.is_empty() {
+            SolanaAddress::from_str(&self.input.sender)
+                .map_err(SigningError::from)
+                .context("Sender address is either not set or invalid")
+        } else {
+            Ok(SolanaAddress::with_public_key_ed25519(
+                self.signer_key()?.public(),
+            ))
+        }
+    }
+
+    /// Returns a fee payer of the transaction.
+    /// Please note it can be different the transaction signer if [`Proto::SigningInput::fee_payer`] is set.
+    pub fn fee_payer(&self) -> SigningResult<SolanaAddress> {
+        if !self.input.fee_payer_private_key.is_empty() {
+            let fee_payer_key =
+                ed25519::sha512::KeyPair::try_from(self.input.fee_payer_private_key.as_ref())
+                    .into_tw()
+                    .context("Invalid fee payer private key")?;
+            return Ok(SolanaAddress::with_public_key_ed25519(
+                fee_payer_key.public(),
+            ));
+        }
+        if !self.input.fee_payer.is_empty() {
+            return SolanaAddress::from_str(self.input.fee_payer.as_ref())
+                .map_err(SigningError::from)
+                .context("Invalid fee payer address");
+        }
+        self.signer_address()
+    }
+
+    fn recent_blockhash(&self) -> SigningResult<Blockhash> {
+        Blockhash::from_str(&self.input.recent_blockhash)
+            .map_err(SigningError::from)
+            .context("Invalid recent blockhash")
+    }
+
+    fn signer_key(&self) -> SigningResult<ed25519::sha512::KeyPair> {
+        ed25519::sha512::KeyPair::try_from(self.input.private_key.as_ref())
+            .map_err(SigningError::from)
+            .context("Invalid signer key")
+    }
+
+    fn priority_fee_price(&self) -> Option<UnitPrice> {
+        self.input
+            .priority_fee_price
+            .as_ref()
+            .map(|proto| proto.price)
+    }
+
+    fn priority_fee_limit(&self) -> Option<UnitLimit> {
+        self.input
+            .priority_fee_limit
+            .as_ref()
+            .map(|proto| proto.limit)
+    }
+
+    fn parse_references(refs: &[Cow<'_, str>]) -> SigningResult<Vec<SolanaAddress>> {
+        refs.iter()
+            .map(|addr| SolanaAddress::from_str(addr).map_err(SigningError::from))
+            .collect::<SigningResult<Vec<_>>>()
+            .context("Invalid transaction reference(s)")
+    }
+}
+
+pub struct RawMessageBuilder;
+
+impl RawMessageBuilder {
+    pub fn build(raw_message: &Proto::RawMessage) -> SigningResult<VersionedMessage> {
+        use Proto::mod_RawMessage::OneOfmessage as RawMessageType;
+
+        match raw_message.message {
+            RawMessageType::legacy(ref legacy) => Self::build_legacy(legacy),
+            RawMessageType::v0(ref v0) => Self::build_v0(v0),
+            RawMessageType::None => SigningError::err(SigningErrorType::Error_invalid_params),
+        }
+    }
+
+    pub fn external_signatures(
+        raw_message: &Proto::RawMessage,
+    ) -> SigningResult<PubkeySignatureMap> {
+        let mut key_signs = PubkeySignatureMap::with_capacity(raw_message.signatures.len());
+        for entry in raw_message.signatures.iter() {
+            let pubkey = SolanaAddress::from_str(entry.pubkey.as_ref())
+                .into_tw()
+                .context("Invalid 'PubkeySignature::public'")?;
+
+            let signature = Signature::from_str(entry.signature.as_ref())
+                .context("Invalid 'PubkeySignature::signature'")?;
+
+            let ed25519_signature = ed25519::Signature::try_from(signature.0.as_slice())
+                .into_tw()
+                .context("Invalid 'PubkeySignature::signature'")?;
+
+            key_signs.insert(pubkey, ed25519_signature);
+        }
+        Ok(key_signs)
+    }
+
+    fn build_legacy(
+        legacy: &Proto::mod_RawMessage::MessageLegacy,
+    ) -> SigningResult<VersionedMessage> {
+        let header = Self::build_message_header(&legacy.header)?;
+        let account_keys = Self::build_account_keys(&legacy.account_keys)?;
+        let recent_blockhash = Blockhash::from_str(legacy.recent_blockhash.as_ref())
+            .into_tw()
+            .context("Invalid recent blockhash")?;
+
+        let instructions: Vec<_> = Self::build_instructions(&legacy.instructions)?;
+
+        Ok(VersionedMessage::Legacy(legacy::Message {
+            header,
+            account_keys,
+            recent_blockhash: recent_blockhash.to_bytes(),
+            instructions,
+        }))
+    }
+
+    fn build_v0(v0: &Proto::mod_RawMessage::MessageV0) -> SigningResult<VersionedMessage> {
+        let header = Self::build_message_header(&v0.header)?;
+        let account_keys = Self::build_account_keys(&v0.account_keys)?;
+        let recent_blockhash = Blockhash::from_str(v0.recent_blockhash.as_ref())
+            .into_tw()
+            .context("Invalid recent blockhash")?;
+
+        let instructions: Vec<_> = Self::build_instructions(&v0.instructions)?;
+        let address_table_lookups = v0
+            .address_table_lookups
+            .iter()
+            .map(Self::build_address_lookup_table)
+            .collect::<SigningResult<Vec<_>>>()?;
+
+        Ok(VersionedMessage::V0(v0::Message {
+            header,
+            account_keys,
+            recent_blockhash: recent_blockhash.to_bytes(),
+            instructions,
+            address_table_lookups,
+        }))
+    }
+
+    fn build_message_header(
+        raw_header: &Option<Proto::mod_RawMessage::MessageHeader>,
+    ) -> SigningResult<MessageHeader> {
+        let raw_header = raw_header
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("No message header provided")?;
+
+        Ok(MessageHeader {
+            num_required_signatures: try_into_u8(raw_header.num_required_signatures)?,
+            num_readonly_signed_accounts: try_into_u8(raw_header.num_readonly_signed_accounts)?,
+            num_readonly_unsigned_accounts: try_into_u8(raw_header.num_readonly_unsigned_accounts)?,
+        })
+    }
+
+    fn build_account_keys(raw_keys: &[Cow<'_, str>]) -> SigningResult<Vec<SolanaAddress>> {
+        raw_keys
+            .iter()
+            .map(|s| SolanaAddress::from_str(s.as_ref()))
+            .collect::<AddressResult<Vec<_>>>()
+            .map_err(SigningError::from)
+            .context("Cannot build account keys")
+    }
+
+    fn build_instructions(
+        ixs: &[Proto::mod_RawMessage::Instruction],
+    ) -> SigningResult<Vec<CompiledInstruction>> {
+        ixs.iter().map(Self::build_instruction).collect()
+    }
+
+    fn build_instruction(
+        ix: &Proto::mod_RawMessage::Instruction,
+    ) -> SigningResult<CompiledInstruction> {
+        let accounts = ix
+            .accounts
+            .iter()
+            .map(|idx| try_into_u8(*idx))
+            .collect::<SigningResult<Vec<_>>>()
+            .context("Cannot build account metas")?;
+
+        Ok(CompiledInstruction {
+            program_id_index: try_into_u8(ix.program_id).context("Invalid program ID")?,
+            accounts,
+            data: ix.program_data.to_vec(),
+        })
+    }
+
+    fn build_address_lookup_table(
+        lookup: &Proto::mod_RawMessage::MessageAddressTableLookup,
+    ) -> SigningResult<v0::MessageAddressTableLookup> {
+        let account_key = SolanaAddress::from_str(lookup.account_key.as_ref())
+            .into_tw()
+            .context("Invalid lookup's account key")?;
+
+        let writable_indexes = lookup
+            .writable_indexes
+            .iter()
+            .copied()
+            .map(try_into_u8)
+            .collect::<SigningResult<Vec<_>>>()
+            .context("Invalid writable index(s)")?;
+
+        let readonly_indexes = lookup
+            .readonly_indexes
+            .iter()
+            .copied()
+            .map(try_into_u8)
+            .collect::<SigningResult<Vec<_>>>()
+            .context("Invalid readonly index(s)")?;
+
+        Ok(v0::MessageAddressTableLookup {
+            account_key,
+            writable_indexes,
+            readonly_indexes,
+        })
+    }
+}
+
+fn try_into_u8<T>(num: T) -> SigningResult<u8>
+where
+    u8: TryFrom<T>,
+{
+    u8::try_from(num).tw_err(|_| SigningErrorType::Error_tx_too_big)
+}
+
+fn match_program_id(program_id: Proto::TokenProgramId) -> SolanaAddress {
+    match program_id {
+        Proto::TokenProgramId::TokenProgram => *TOKEN_PROGRAM_ID_ADDRESS,
+        Proto::TokenProgramId::Token2022Program => *TOKEN_2022_PROGRAM_ID_ADDRESS,
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/message_decompiler.rs b/rust/chains/tw_solana/src/modules/message_decompiler.rs
new file mode 100644
index 00000000000..d74e6393785
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/message_decompiler.rs
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::transaction::versioned::VersionedMessage;
+use crate::transaction::CompiledInstruction;
+use tw_coin_entry::error::prelude::{OrTWError, ResultContext, SigningErrorType, SigningResult};
+use tw_memory::Data;
+
+/// [`Instruction`] without `accounts` field.
+pub struct InstructionWithoutAccounts {
+    /// Pubkey of the program that executes this instruction.
+    pub program_id: SolanaAddress,
+    /// Opaque data passed to the program for its own interpretation.
+    pub data: Data,
+}
+
+pub struct MessageDecompiler;
+
+impl MessageDecompiler {
+    pub fn decompile_partly(
+        message: &VersionedMessage,
+    ) -> SigningResult<Vec<InstructionWithoutAccounts>> {
+        match message {
+            VersionedMessage::Legacy(legacy) => {
+                Self::decompile_partly_impl(&legacy.instructions, &legacy.account_keys)
+            },
+            VersionedMessage::V0(v0) => {
+                Self::decompile_partly_impl(&v0.instructions, &v0.account_keys)
+            },
+        }
+    }
+
+    fn decompile_partly_impl(
+        instructions: &[CompiledInstruction],
+        account_keys: &[SolanaAddress],
+    ) -> SigningResult<Vec<InstructionWithoutAccounts>> {
+        instructions
+            .iter()
+            .map(|ix| Self::decompile_instruction_partly(ix, account_keys))
+            .collect()
+    }
+
+    fn decompile_instruction_partly(
+        ix: &CompiledInstruction,
+        account_keys: &[SolanaAddress],
+    ) -> SigningResult<InstructionWithoutAccounts> {
+        // Program ID should always be in the transaction's accounts list even if AddressLookupTable is used:
+        // https://solana.stackexchange.com/questions/16122/using-program-ids-in-address-lookup-tables-missing-documentation-about-luts
+        let program_id = *account_keys
+            .get(ix.program_id_index as usize)
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("Program ID not found in the accounts list")?;
+        Ok(InstructionWithoutAccounts {
+            program_id,
+            data: ix.data.clone(),
+        })
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/mod.rs b/rust/chains/tw_solana/src/modules/mod.rs
new file mode 100644
index 00000000000..8a8d8c61a74
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/mod.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use std::collections::HashMap;
+use tw_keypair::ed25519;
+
+pub mod compiled_instructions;
+pub mod compiled_keys;
+pub mod insert_instruction;
+pub mod instruction_builder;
+pub mod message_builder;
+pub mod message_decompiler;
+pub mod proto_builder;
+pub mod transaction_decoder;
+pub mod transaction_util;
+pub mod tx_signer;
+pub mod utils;
+pub mod wallet_connect;
+
+pub type PubkeySignatureMap = HashMap<SolanaAddress, ed25519::Signature>;
diff --git a/rust/chains/tw_solana/src/modules/proto_builder.rs b/rust/chains/tw_solana/src/modules/proto_builder.rs
new file mode 100644
index 00000000000..d40ff7ca664
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/proto_builder.rs
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::v0;
+use crate::transaction::versioned::{VersionedMessage, VersionedTransaction};
+use std::borrow::Cow;
+use tw_proto::Solana::Proto::{self, mod_RawMessage::OneOfmessage as ProtoMessageType};
+
+pub struct ProtoBuilder;
+
+impl ProtoBuilder {
+    pub fn build_from_tx(tx: &VersionedTransaction) -> Proto::RawMessage<'static> {
+        let message_header = Proto::mod_RawMessage::MessageHeader {
+            num_required_signatures: tx.message.header().num_required_signatures as u32,
+            num_readonly_signed_accounts: tx.message.header().num_readonly_signed_accounts as u32,
+            num_readonly_unsigned_accounts: tx.message.header().num_readonly_unsigned_accounts
+                as u32,
+        };
+
+        let account_keys: Vec<_> = tx
+            .message
+            .account_keys()
+            .iter()
+            .map(|acc| Cow::from(acc.to_string()))
+            .collect();
+
+        let recent_blockhash = Cow::from(tx.message.recent_blockhash().to_string());
+
+        let instructions = tx
+            .message
+            .instructions()
+            .iter()
+            .map(|ix| Proto::mod_RawMessage::Instruction {
+                program_id: ix.program_id_index as u32,
+                accounts: vec_u8_to_u32(&ix.accounts),
+                program_data: Cow::from(ix.data.clone()),
+            })
+            .collect();
+
+        let message = match tx.message {
+            VersionedMessage::Legacy(_) => {
+                ProtoMessageType::legacy(Proto::mod_RawMessage::MessageLegacy {
+                    header: Some(message_header),
+                    account_keys,
+                    recent_blockhash,
+                    instructions,
+                })
+            },
+            VersionedMessage::V0(ref v0) => {
+                let address_table_lookups =
+                    Self::build_address_table_lookups(&v0.address_table_lookups);
+                ProtoMessageType::v0(Proto::mod_RawMessage::MessageV0 {
+                    header: Some(message_header),
+                    account_keys,
+                    recent_blockhash,
+                    instructions,
+                    address_table_lookups,
+                })
+            },
+        };
+
+        Proto::RawMessage {
+            signatures: Self::build_signatures(tx),
+            message,
+        }
+    }
+
+    fn build_address_table_lookups(
+        lookups: &[v0::MessageAddressTableLookup],
+    ) -> Vec<Proto::mod_RawMessage::MessageAddressTableLookup<'static>> {
+        lookups
+            .iter()
+            .map(|lookup| Proto::mod_RawMessage::MessageAddressTableLookup {
+                account_key: Cow::from(lookup.account_key.to_string()),
+                writable_indexes: vec_u8_to_u32(&lookup.writable_indexes),
+                readonly_indexes: vec_u8_to_u32(&lookup.readonly_indexes),
+            })
+            .collect()
+    }
+
+    pub fn build_signatures(tx: &VersionedTransaction) -> Vec<Proto::PubkeySignature<'static>> {
+        tx.message
+            .account_keys()
+            .iter()
+            .zip(tx.signatures.iter())
+            .map(|(pubkey, signature)| Proto::PubkeySignature {
+                pubkey: Cow::from(pubkey.to_string()),
+                signature: Cow::from(signature.to_string()),
+            })
+            .collect()
+    }
+}
+
+fn vec_u8_to_u32(v: &[u8]) -> Vec<u32> {
+    v.iter().map(|num| *num as u32).collect()
+}
diff --git a/rust/chains/tw_solana/src/modules/transaction_decoder.rs b/rust/chains/tw_solana/src/modules/transaction_decoder.rs
new file mode 100644
index 00000000000..02a441a464a
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/transaction_decoder.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::proto_builder::ProtoBuilder;
+use crate::transaction::versioned::VersionedTransaction;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_decoder::TransactionDecoder;
+use tw_coin_entry::signing_output_error;
+use tw_proto::Solana::Proto;
+
+pub struct SolanaTransactionDecoder;
+
+impl TransactionDecoder for SolanaTransactionDecoder {
+    type Output = Proto::DecodingTransactionOutput<'static>;
+
+    fn decode_transaction(&self, coin: &dyn CoinContext, tx: &[u8]) -> Self::Output {
+        Self::decode_transaction_impl(coin, tx)
+            .unwrap_or_else(|e| signing_output_error!(Proto::DecodingTransactionOutput, e))
+    }
+}
+
+impl SolanaTransactionDecoder {
+    pub(crate) fn decode_transaction_impl(
+        _coin: &dyn CoinContext,
+        tx: &[u8],
+    ) -> SigningResult<Proto::DecodingTransactionOutput<'static>> {
+        let decoded_tx: VersionedTransaction = bincode::deserialize(tx)
+            .tw_err(|_| SigningErrorType::Error_input_parse)
+            .context("Error decoding transaction as 'bincode'")?;
+        let transaction = ProtoBuilder::build_from_tx(&decoded_tx);
+
+        Ok(Proto::DecodingTransactionOutput {
+            transaction: Some(transaction),
+            ..Proto::DecodingTransactionOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/transaction_util.rs b/rust/chains/tw_solana/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..fdde5d6952c
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/transaction_util.rs
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::transaction_decoder::SolanaTransactionDecoder;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_util::TransactionUtil;
+use tw_encoding::base64;
+use tw_encoding::base64::STANDARD;
+
+pub struct SolanaTransactionUtil;
+
+impl TransactionUtil for SolanaTransactionUtil {
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        Self::calc_tx_hash_impl(coin, encoded_tx)
+    }
+}
+
+impl SolanaTransactionUtil {
+    fn calc_tx_hash_impl(coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        // Solana signed transactions can be encoded in either base64 or base58. For more information, see: https://solana.com/docs/rpc/http/sendtransaction
+        // Currently, this function only accepts base64 encoding.
+        let tx_bytes = base64::decode(encoded_tx, STANDARD)?;
+        let decoded_tx_output = SolanaTransactionDecoder::decode_transaction_impl(coin, &tx_bytes)?;
+
+        let first_sig = decoded_tx_output
+            .transaction
+            .as_ref()
+            .and_then(|tx| tx.signatures.first())
+            .or_tw_err(SigningErrorType::Error_input_parse)
+            .context("There is no transaction signatures. Looks like it hasn't been signed yet")?;
+
+        // Tx hash is the first signature
+        Ok(first_sig.signature.to_string())
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/tx_signer.rs b/rust/chains/tw_solana/src/modules/tx_signer.rs
new file mode 100644
index 00000000000..5fb421e6876
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/tx_signer.rs
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::modules::PubkeySignatureMap;
+use crate::transaction::{versioned, Signature};
+use std::collections::HashMap;
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::ed25519;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_memory::Data;
+
+pub struct TxSigner;
+
+impl TxSigner {
+    pub fn sign_versioned(
+        unsigned_msg: versioned::VersionedMessage,
+        keys: &[ed25519::sha512::KeyPair],
+        external_signatures: &PubkeySignatureMap,
+    ) -> SigningResult<versioned::VersionedTransaction> {
+        let mut key_signs = HashMap::default();
+
+        let message_encoded = Self::preimage_versioned(&unsigned_msg)?;
+
+        // Add external signatures first, so they can be overriden if corresponding private keys are specified.
+        key_signs.extend(external_signatures.clone());
+
+        // Sign the message with all given private keys.
+        for private_key in keys {
+            let signing_pubkey =
+                SolanaAddress::with_public_key_bytes(private_key.public().to_bytes());
+            let ed25519_signature = private_key.sign(message_encoded.clone())?;
+
+            key_signs.insert(signing_pubkey, ed25519_signature);
+        }
+
+        Self::compile_versioned(unsigned_msg, key_signs)
+    }
+
+    pub fn compile_versioned(
+        unsigned_msg: versioned::VersionedMessage,
+        key_signs: HashMap<SolanaAddress, ed25519::Signature>,
+    ) -> SigningResult<versioned::VersionedTransaction> {
+        let mut tx = versioned::VersionedTransaction::unsigned(unsigned_msg);
+
+        let actual_signatures = key_signs.len();
+        let expected_signatures = tx.message.num_required_signatures();
+        if actual_signatures != expected_signatures {
+            return SigningError::err(SigningErrorType::Error_signatures_count)
+                .with_context(|| format!("Expected '{expected_signatures}' signatures, provided '{actual_signatures}'"));
+        }
+
+        for (signing_pubkey, ed25519_signature) in key_signs {
+            // Find an index of the corresponding account.
+            let account_index = tx
+                .message
+                .get_account_index(signing_pubkey)
+                .or_tw_err(SigningErrorType::Error_missing_private_key)
+                .with_context(|| {
+                    format!("Provided a signature for an unexpected account: {signing_pubkey}")
+                })?;
+            let signature_to_reassign = tx
+                .signatures
+                .get_mut(account_index)
+                .or_tw_err(SigningErrorType::Error_signatures_count)
+                .context("Internal error: invalid number of Tx.signatures[]")?;
+            *signature_to_reassign = Signature(ed25519_signature.to_bytes());
+        }
+
+        Ok(tx)
+    }
+
+    pub fn preimage_versioned(msg: &versioned::VersionedMessage) -> SigningResult<Data> {
+        bincode::serialize(&msg)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing Solana Message as 'bincode'")
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/utils.rs b/rust/chains/tw_solana/src/modules/utils.rs
new file mode 100644
index 00000000000..da19b9d17d8
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/utils.rs
@@ -0,0 +1,194 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::defined_addresses::{COMPUTE_BUDGET_ADDRESS, SYSTEM_PROGRAM_ID_ADDRESS};
+use crate::modules::insert_instruction::InsertInstruction;
+use crate::modules::instruction_builder::compute_budget_instruction::{
+    ComputeBudgetInstruction, ComputeBudgetInstructionBuilder, UnitLimit, UnitPrice,
+};
+use crate::modules::instruction_builder::system_instruction::SystemInstruction;
+use crate::modules::message_decompiler::{InstructionWithoutAccounts, MessageDecompiler};
+use crate::modules::proto_builder::ProtoBuilder;
+use crate::modules::tx_signer::TxSigner;
+use crate::modules::PubkeySignatureMap;
+use crate::transaction::versioned::VersionedTransaction;
+use crate::SOLANA_ALPHABET;
+use std::borrow::Cow;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_encoding::base58;
+use tw_encoding::base64::{self, STANDARD};
+use tw_hash::H256;
+use tw_keypair::{ed25519, KeyPairResult};
+use tw_memory::Data;
+use tw_proto::Solana::Proto;
+
+pub struct SolanaTransaction;
+
+impl SolanaTransaction {
+    pub fn update_blockhash_and_sign(
+        encoded_tx: &str,
+        recent_blockhash: &str,
+        private_keys: &[Data],
+    ) -> Proto::SigningOutput<'static> {
+        Self::update_blockhash_and_sign_impl(encoded_tx, recent_blockhash, private_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn update_blockhash_and_sign_impl(
+        encoded_tx: &str,
+        recent_blockhash: &str,
+        private_keys: &[Data],
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let tx_bytes = base64::decode(encoded_tx, STANDARD)?;
+
+        let tx_to_sign: VersionedTransaction =
+            bincode::deserialize(&tx_bytes).map_err(|_| SigningErrorType::Error_input_parse)?;
+        let mut msg_to_sign = tx_to_sign.message;
+
+        let new_blockchain_hash = base58::decode(recent_blockhash, SOLANA_ALPHABET)?;
+        let new_blockchain_hash = H256::try_from(new_blockchain_hash.as_slice())
+            .tw_err(|_| SigningErrorType::Error_invalid_params)?;
+
+        // Update the transaction's blockhash and re-sign it.
+        msg_to_sign.set_recent_blockhash(new_blockchain_hash);
+
+        let unsigned_encoded = TxSigner::preimage_versioned(&msg_to_sign)?;
+
+        // Do not sign the transaction if there is no private keys, but set zeroed signatures.
+        // It's needed to estimate the transaction fee with an updated blockhash without using real private keys.
+        let signed_tx = if private_keys.is_empty() {
+            VersionedTransaction::unsigned(msg_to_sign)
+        } else {
+            let private_keys = private_keys
+                .iter()
+                .map(|pk| ed25519::sha512::KeyPair::try_from(pk.as_slice()))
+                .collect::<KeyPairResult<Vec<_>>>()?;
+
+            let external_signatures = PubkeySignatureMap::default();
+            TxSigner::sign_versioned(msg_to_sign, &private_keys, &external_signatures)?
+        };
+
+        let unsigned_encoded = base64::encode(&unsigned_encoded, STANDARD);
+        let signed_encoded =
+            bincode::serialize(&signed_tx).tw_err(|_| SigningErrorType::Error_internal)?;
+        let signed_encoded = base64::encode(&signed_encoded, STANDARD);
+
+        Ok(Proto::SigningOutput {
+            encoded: Cow::from(signed_encoded),
+            unsigned_tx: Cow::from(unsigned_encoded),
+            signatures: ProtoBuilder::build_signatures(&signed_tx),
+            ..Proto::SigningOutput::default()
+        })
+    }
+
+    pub fn get_compute_unit_price(encoded_tx: &str) -> SigningResult<Option<UnitPrice>> {
+        let tx = VersionedTransaction::from_base64(encoded_tx)?;
+        let instructions = MessageDecompiler::decompile_partly(&tx.message)?;
+        Ok(instructions
+            .iter()
+            .find_map(try_instruction_as_set_unit_price))
+    }
+
+    pub fn get_compute_unit_limit(encoded_tx: &str) -> SigningResult<Option<UnitLimit>> {
+        let tx = VersionedTransaction::from_base64(encoded_tx)?;
+        let instructions = MessageDecompiler::decompile_partly(&tx.message)?;
+        Ok(instructions
+            .iter()
+            .find_map(try_instruction_as_set_unit_limit))
+    }
+
+    pub fn set_compute_unit_price(encoded_tx: &str, price: UnitPrice) -> SigningResult<String> {
+        let tx_bytes = base64::decode(encoded_tx, STANDARD)?;
+        let mut tx: VersionedTransaction =
+            bincode::deserialize(&tx_bytes).map_err(|_| SigningErrorType::Error_input_parse)?;
+        let instructions = MessageDecompiler::decompile_partly(&tx.message)?;
+
+        let set_price_ix = ComputeBudgetInstructionBuilder::set_compute_unit_price(price);
+
+        // First, try to find a `ComputeBudgetInstruction::SetComputeUnitPrice` instruction.
+        let ix_position = instructions
+            .iter()
+            .position(|ix| try_instruction_as_set_unit_price(ix).is_some());
+        // If it presents already, it's enough to update the instruction data only.
+        if let Some(pos) = ix_position {
+            tx.message.instructions_mut()[pos].data = set_price_ix.data;
+            return tx.to_base64().tw_err(|_| SigningErrorType::Error_internal);
+        }
+
+        // `ComputeBudgetInstruction::SetComputeUnitPrice` can be pushed to the end of the instructions list.
+        tx.message
+            .push_simple_instruction(set_price_ix.program_id, set_price_ix.data)?;
+
+        tx.to_base64().tw_err(|_| SigningErrorType::Error_internal)
+    }
+
+    pub fn set_compute_unit_limit(encoded_tx: &str, limit: UnitLimit) -> SigningResult<String> {
+        let tx_bytes = base64::decode(encoded_tx, STANDARD)?;
+        let mut tx: VersionedTransaction =
+            bincode::deserialize(&tx_bytes).map_err(|_| SigningErrorType::Error_input_parse)?;
+        let instructions = MessageDecompiler::decompile_partly(&tx.message)?;
+
+        let set_limit_ix = ComputeBudgetInstructionBuilder::set_compute_unit_limit(limit);
+
+        // First, try to find a `ComputeBudgetInstruction::SetComputeUnitLimit` instruction.
+        let ix_position = instructions
+            .iter()
+            .position(|ix| try_instruction_as_set_unit_limit(ix).is_some());
+        // If it presents already, it's enough to update the instruction data only.
+        if let Some(pos) = ix_position {
+            tx.message.instructions_mut()[pos].data = set_limit_ix.data;
+            return tx.to_base64().tw_err(|_| SigningErrorType::Error_internal);
+        }
+
+        // `ComputeBudgetInstruction::SetComputeUnitLimit` should be at the beginning of the instructions list.
+        // However `SystemInstruction::AdvanceNonceAccount` must be the first instruction.
+        // So in case if the advance nonce instruction presents, we should insert unit limit as the second instruction.
+        let insert_at = match instructions.first() {
+            Some(first_ix) if is_instruction_advance_nonce_account(first_ix) => 1,
+            _ => 0,
+        };
+
+        tx.message.insert_simple_instruction(
+            insert_at,
+            set_limit_ix.program_id,
+            set_limit_ix.data,
+        )?;
+
+        tx.to_base64().tw_err(|_| SigningErrorType::Error_internal)
+    }
+}
+
+fn try_instruction_as_compute_budget(
+    ix: &InstructionWithoutAccounts,
+) -> Option<ComputeBudgetInstruction> {
+    if ix.program_id != *COMPUTE_BUDGET_ADDRESS {
+        return None;
+    }
+    ComputeBudgetInstruction::try_from_borsh(&ix.data).ok()
+}
+
+fn try_instruction_as_set_unit_price(ix: &InstructionWithoutAccounts) -> Option<UnitPrice> {
+    match try_instruction_as_compute_budget(ix)? {
+        ComputeBudgetInstruction::SetComputeUnitPrice(price) => Some(price),
+        _ => None,
+    }
+}
+
+fn try_instruction_as_set_unit_limit(ix: &InstructionWithoutAccounts) -> Option<UnitLimit> {
+    match try_instruction_as_compute_budget(ix)? {
+        ComputeBudgetInstruction::SetComputeUnitLimit(limit) => Some(limit),
+        _ => None,
+    }
+}
+
+fn is_instruction_advance_nonce_account(ix: &InstructionWithoutAccounts) -> bool {
+    if ix.program_id != *SYSTEM_PROGRAM_ID_ADDRESS {
+        return false;
+    }
+    let Ok(system_ix) = SystemInstruction::try_from_bincode(&ix.data) else {
+        return false;
+    };
+    system_ix == SystemInstruction::AdvanceNonceAccount
+}
diff --git a/rust/chains/tw_solana/src/modules/wallet_connect/connector.rs b/rust/chains/tw_solana/src/modules/wallet_connect/connector.rs
new file mode 100644
index 00000000000..041d50012ac
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/wallet_connect/connector.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::proto_builder::ProtoBuilder;
+use crate::modules::wallet_connect::request::SignTransactionRequest;
+use crate::transaction::versioned::VersionedTransaction;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::wallet_connector::WalletConnector;
+use tw_coin_entry::signing_output_error;
+use tw_proto::Solana::Proto;
+use tw_proto::WalletConnect::Proto::{
+    self as WCProto, mod_ParseRequestOutput::OneOfsigning_input_oneof as SigningInputEnum,
+};
+
+pub struct SolanaWalletConnector;
+
+impl WalletConnector for SolanaWalletConnector {
+    fn parse_request(
+        &self,
+        coin: &dyn CoinContext,
+        request: WCProto::ParseRequestInput<'_>,
+    ) -> WCProto::ParseRequestOutput<'static> {
+        Self::parse_request_impl(coin, request)
+            .unwrap_or_else(|e| signing_output_error!(WCProto::ParseRequestOutput, e))
+    }
+}
+
+impl SolanaWalletConnector {
+    fn parse_request_impl(
+        coin: &dyn CoinContext,
+        request: WCProto::ParseRequestInput<'_>,
+    ) -> SigningResult<WCProto::ParseRequestOutput<'static>> {
+        match request.method {
+            WCProto::Method::SolanaSignTransaction => {
+                Self::parse_sign_transaction_request(coin, request)
+            },
+            _ => SigningError::err(SigningErrorType::Error_not_supported)
+                .context("Unknown WalletConnect method"),
+        }
+    }
+
+    pub fn parse_sign_transaction_request(
+        _coin: &dyn CoinContext,
+        request: WCProto::ParseRequestInput<'_>,
+    ) -> SigningResult<WCProto::ParseRequestOutput<'static>> {
+        let sign_req: SignTransactionRequest = serde_json::from_str(&request.payload)
+            .tw_err(|_| SigningErrorType::Error_input_parse)
+            .context("Error parsing WalletConnect signing request as JSON")?;
+
+        let transaction: VersionedTransaction = bincode::deserialize(&sign_req.transaction.0)
+            .tw_err(|_| SigningErrorType::Error_input_parse)
+            .context("Error deserializing Solana transaction as 'bincode'")?;
+
+        let signing_input = Proto::SigningInput {
+            raw_message: Some(ProtoBuilder::build_from_tx(&transaction)),
+            ..Proto::SigningInput::default()
+        };
+
+        Ok(WCProto::ParseRequestOutput {
+            signing_input_oneof: SigningInputEnum::solana(signing_input),
+            ..WCProto::ParseRequestOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_solana/src/modules/wallet_connect/mod.rs b/rust/chains/tw_solana/src/modules/wallet_connect/mod.rs
new file mode 100644
index 00000000000..6a72d9528b8
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/wallet_connect/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod connector;
+pub mod request;
diff --git a/rust/chains/tw_solana/src/modules/wallet_connect/request.rs b/rust/chains/tw_solana/src/modules/wallet_connect/request.rs
new file mode 100644
index 00000000000..603de8e1045
--- /dev/null
+++ b/rust/chains/tw_solana/src/modules/wallet_connect/request.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+use tw_encoding::base64::Base64Encoded;
+
+/// `solana_signTransaction` request payload without legacy fields.
+/// https://docs.walletconnect.com/advanced/rpc-reference/solana-rpc#solana_signtransaction
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct SignTransactionRequest {
+    pub transaction: Base64Encoded,
+}
diff --git a/rust/chains/tw_solana/src/program/mod.rs b/rust/chains/tw_solana/src/program/mod.rs
new file mode 100644
index 00000000000..bd0451b533b
--- /dev/null
+++ b/rust/chains/tw_solana/src/program/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod stake_program;
diff --git a/rust/chains/tw_solana/src/program/stake_program.rs b/rust/chains/tw_solana/src/program/stake_program.rs
new file mode 100644
index 00000000000..e70a9a2fe3b
--- /dev/null
+++ b/rust/chains/tw_solana/src/program/stake_program.rs
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::blockhash::Blockhash;
+use crate::defined_addresses::*;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::sha2::sha256;
+use tw_hash::H256;
+
+pub const MAX_SEED_LEN: usize = 32;
+
+pub struct StakeProgram;
+
+impl StakeProgram {
+    pub fn recent_blockhash_as_seed(recent_blockhash: &Blockhash) -> String {
+        recent_blockhash
+            .to_string()
+            .chars()
+            .take(MAX_SEED_LEN)
+            .collect()
+    }
+
+    pub fn address_from_recent_blockhash(
+        from: &SolanaAddress,
+        recent_blockhash: &Blockhash,
+    ) -> SolanaAddress {
+        let mut seed = from.bytes().to_vec();
+        seed.extend_from_slice(Self::recent_blockhash_as_seed(recent_blockhash).as_bytes());
+        seed.extend_from_slice(STAKE_PROGRAM_ID_ADDRESS.bytes().as_slice());
+        let bytes =
+            H256::try_from(sha256(&seed).as_slice()).expect("sha256 expected to return 32 bytes");
+        SolanaAddress::with_public_key_bytes(bytes)
+    }
+
+    /// https://github.com/solana-labs/solana-program-library/blob/master/associated-token-account/program/src/lib.rs#L35
+    pub fn get_associated_token_address(
+        main_address: SolanaAddress,
+        token_program_id: SolanaAddress,
+        token_mint_address: SolanaAddress,
+    ) -> AddressResult<SolanaAddress> {
+        SolanaAddress::find_program_address(
+            &[
+                main_address.bytes().as_slice(),
+                token_program_id.bytes().as_slice(),
+                token_mint_address.bytes().as_slice(),
+            ],
+            *ASSOCIATED_TOKEN_PROGRAM_ID_ADDRESS,
+        )
+        .ok_or(AddressError::InvalidInput)
+    }
+}
diff --git a/rust/chains/tw_solana/src/signer.rs b/rust/chains/tw_solana/src/signer.rs
new file mode 100644
index 00000000000..caa552aa4da
--- /dev/null
+++ b/rust/chains/tw_solana/src/signer.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::message_builder::MessageBuilder;
+use crate::modules::proto_builder::ProtoBuilder;
+use crate::modules::tx_signer::TxSigner;
+use crate::SOLANA_ALPHABET;
+use std::borrow::Cow;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_encoding::base58;
+use tw_encoding::base64::{self, STANDARD};
+use tw_proto::Solana::Proto;
+
+pub struct SolanaSigner;
+
+impl SolanaSigner {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let encode = move |data| match input.tx_encoding {
+            Proto::Encoding::Base58 => base58::encode(data, SOLANA_ALPHABET),
+            Proto::Encoding::Base64 => base64::encode(data, STANDARD),
+        };
+
+        let builder = MessageBuilder::new(input);
+        let signing_keys = builder.signing_keys()?;
+        let external_signatures = builder.external_signatures()?;
+        let unsigned_msg = builder.build()?;
+
+        let encoded_unsigned = bincode::serialize(&unsigned_msg)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing Solana Message as 'bincode'")?;
+        let encoded_unsigned = encode(&encoded_unsigned);
+
+        let signed_tx =
+            TxSigner::sign_versioned(unsigned_msg, &signing_keys, &external_signatures)?;
+
+        let encoded_tx = bincode::serialize(&signed_tx)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing Solana Transaction as 'bincode'")?;
+        let encoded_tx = encode(&encoded_tx);
+
+        Ok(Proto::SigningOutput {
+            encoded: Cow::from(encoded_tx),
+            unsigned_tx: Cow::from(encoded_unsigned),
+            signatures: ProtoBuilder::build_signatures(&signed_tx),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_solana/src/transaction/legacy.rs b/rust/chains/tw_solana/src/transaction/legacy.rs
new file mode 100644
index 00000000000..7ed32200058
--- /dev/null
+++ b/rust/chains/tw_solana/src/transaction/legacy.rs
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::modules::insert_instruction::InsertInstruction;
+use crate::transaction::v0::MessageAddressTableLookup;
+use crate::transaction::{short_vec, CompiledInstruction, MessageHeader, Signature};
+use serde::{Deserialize, Serialize};
+use tw_hash::{as_byte_sequence, H256};
+
+#[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct Message {
+    /// The message header, identifying signed and read-only `account_keys`.
+    // NOTE: Serialization-related changes must be paired with the direct read at sigverify.
+    pub header: MessageHeader,
+
+    /// All the account keys used by this transaction.
+    #[serde(with = "short_vec")]
+    pub account_keys: Vec<SolanaAddress>,
+
+    /// The id of a recent ledger entry.
+    #[serde(with = "as_byte_sequence")]
+    pub recent_blockhash: H256,
+
+    /// Programs that will be executed in sequence and committed in one atomic transaction if all
+    /// succeed.
+    #[serde(with = "short_vec")]
+    pub instructions: Vec<CompiledInstruction>,
+}
+
+impl InsertInstruction for Message {
+    fn address_table_lookups(&self) -> Option<&[MessageAddressTableLookup]> {
+        None
+    }
+
+    fn account_keys_mut(&mut self) -> &mut Vec<SolanaAddress> {
+        &mut self.account_keys
+    }
+
+    fn message_header_mut(&mut self) -> &mut MessageHeader {
+        &mut self.header
+    }
+
+    fn instructions_mut(&mut self) -> &mut Vec<CompiledInstruction> {
+        &mut self.instructions
+    }
+}
+
+#[derive(Debug, PartialEq, Default, Eq, Clone, Serialize, Deserialize)]
+pub struct Transaction {
+    /// A set of signatures of a serialized [`Message`], signed by the first
+    /// keys of the `Message`'s [`account_keys`], where the number of signatures
+    /// is equal to [`num_required_signatures`] of the `Message`'s
+    /// [`MessageHeader`].
+    ///
+    /// [`account_keys`]: Message::account_keys
+    /// [`MessageHeader`]: crate::message::MessageHeader
+    /// [`num_required_signatures`]: crate::message::MessageHeader::num_required_signatures
+    // NOTE: Serialization-related changes must be paired with the direct read at sigverify.
+    #[serde(with = "short_vec")]
+    pub signatures: Vec<Signature>,
+
+    /// The message to sign.
+    pub message: Message,
+}
diff --git a/rust/chains/tw_solana/src/transaction/mod.rs b/rust/chains/tw_solana/src/transaction/mod.rs
new file mode 100644
index 00000000000..a37cdc75963
--- /dev/null
+++ b/rust/chains/tw_solana/src/transaction/mod.rs
@@ -0,0 +1,202 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::SOLANA_ALPHABET;
+use serde::{Deserialize, Serialize};
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base58;
+use tw_hash::{as_byte_sequence, H512};
+
+pub mod legacy;
+pub mod short_vec;
+pub mod v0;
+pub mod versioned;
+
+#[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone, Copy)]
+#[serde(rename_all = "camelCase")]
+pub struct MessageHeader {
+    /// The number of signatures required for this message to be considered
+    /// valid. The signers of those signatures must match the first
+    /// `num_required_signatures` of [`Message::account_keys`].
+    // NOTE: Serialization-related changes must be paired with the direct read at sigverify.
+    pub num_required_signatures: u8,
+
+    /// The last `num_readonly_signed_accounts` of the signed keys are read-only
+    /// accounts.
+    pub num_readonly_signed_accounts: u8,
+
+    /// The last `num_readonly_unsigned_accounts` of the unsigned keys are
+    /// read-only accounts.
+    pub num_readonly_unsigned_accounts: u8,
+}
+
+#[derive(Serialize, Deserialize, Debug, PartialEq, Eq, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct CompiledInstruction {
+    /// Index into the transaction keys array indicating the program account that executes this instruction.
+    pub program_id_index: u8,
+    /// Ordered indices into the transaction keys array indicating which accounts to pass to the program.
+    #[serde(with = "short_vec")]
+    pub accounts: Vec<u8>,
+    /// The program input data.
+    #[serde(with = "short_vec")]
+    pub data: Vec<u8>,
+}
+
+#[derive(Serialize, Deserialize, Debug, Default, Clone, Copy, Eq, PartialEq, Hash)]
+pub struct Signature(#[serde(with = "as_byte_sequence")] pub H512);
+
+impl FromStr for Signature {
+    type Err = SigningError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let data = base58::decode(s, SOLANA_ALPHABET)
+            .tw_err(|_| SigningErrorType::Error_input_parse)
+            .context("Error decoding Solana Signature from base58")?;
+        H512::try_from(data.as_slice())
+            .map(Signature)
+            .tw_err(|_| SigningErrorType::Error_input_parse)
+            .context("Solana Signature must be 64 byte length")
+    }
+}
+
+impl fmt::Display for Signature {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", base58::encode(self.0.as_slice(), SOLANA_ALPHABET))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::address::SolanaAddress;
+    use crate::transaction::v0::MessageAddressTableLookup;
+    use crate::transaction::versioned::{VersionedMessage, VersionedTransaction};
+    use crate::SOLANA_ALPHABET;
+    use tw_encoding::base58;
+    use tw_encoding::base64::{self, STANDARD};
+    use tw_encoding::hex::ToHex;
+    use tw_hash::H256;
+    use tw_memory::Data;
+
+    fn base58_decode(s: &'static str) -> Data {
+        base58::decode(s, SOLANA_ALPHABET).unwrap()
+    }
+
+    fn base58_decode_h256(s: &'static str) -> H256 {
+        let bytes = base58::decode(s, SOLANA_ALPHABET).unwrap();
+        H256::try_from(bytes.as_slice()).unwrap()
+    }
+
+    #[test]
+    fn test_rango_transaction_ser_de() {
+        let serialized = base64::decode("AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAHEIoR5xuWyrvjIW4xU7CWlPOfyFAiy8B295hGo6tNjBmRCgUkQaFYTleMcAX2p74eBXQZd1dwDyQZAPJfSv2KGc5kcFLJj5qd2BVMaSNGVPfVBm74GbLwUq5/U1Ccdqc2gokZQxRDpMq7aeToP3nRaWIP4RXMxN+LJetccXMPq/QumgOqt7kkqk07cyPCKgYoQ4fQtOqqZn5sEqjWHYj3CDS5ha48uggePWu090s1ff4yoCjAvULeZ+cqYFn+Adk5Teyfw71W3u/F6VTnLQEPW96gJr5Kcm3bGi08n224JyF++PTko52VL0CIM2xtl0WkvNslD6Wawxr7yd9HYllN4Lz8lFwXilWGgyJdOq1qqBuZbE49glHeCO/sJHNnIHC0BgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAEedVb8jHAbu50xW7OaBUH/bGy3qP0jlECsc2iVrwTjwbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpjJclj04kifG7PRApFI4NgwtaE5na/xCEBI572Nvp+Fm0P/on9df2SnTAmx8pWHneSwmrNt/J3VFLMhqns4zl6OL4d+g9rsaIj0Orta57MRu3jDSWCJf85ae4LBbiD/GXvOojZjsHekJrpRUuPggLJr943hDVD5UareeEucjCvaoHCgAFAsBcFQAKAAkDBBcBAAAAAAANBgAGACMJDAEBCQIABgwCAAAAAMqaOwAAAAAMAQYBEQs1DA8ABgEFAiMhCwsOCx0MDxoBGQcYBAgDJBscDB4PBwUQEhEfFR8UFwcFISITHw8MDCAfFgstwSCbM0HWnIEAAwAAABEBZAABCh0BAyZHAQMAypo7AAAAAJaWFAYAAAAAMgAADAMGAAABCQPZoILFk7gfE2y5bt3AC+g/4OwNzdiHKBhIbdeYvYFEjQPKyMkExMUkx0R25UNa/g5KsG0vfUwdUJ8e8HecK/Jkd3qm9XefBOB0BaD1+J+dBJz09vfyGuRYZH09HfdE/kL8v6Ql+H03+tO+9lMmmVg8O1c6gAN6eX0Cbn4=", STANDARD).unwrap();
+        let actual: VersionedTransaction = bincode::deserialize(&serialized).unwrap();
+
+        let expected = VersionedTransaction {
+            signatures: vec![Signature(H512::default())],
+            message: VersionedMessage::V0(v0::Message {
+                header: MessageHeader {
+                    num_required_signatures: 1,
+                    num_readonly_signed_accounts: 0,
+                    num_readonly_unsigned_accounts: 7,
+                },
+                account_keys: vec![
+                    SolanaAddress::from("AHy6YZA8BsHgQfVkk7MbwpAN94iyN7Nf1zN4nPqUN32Q"),
+                    SolanaAddress::from("g7dD1FHSemkUQrX1Eak37wzvDjscgBW2pFCENwjLdMX"),
+                    SolanaAddress::from("7m57LBTxtzhWn6WdFxKtnoJLBQXyNERLYebebXLVaKy3"),
+                    SolanaAddress::from("AEBCPtV8FFkWFAKxrz7mbYvobpkZuWaRWQCyJVRaheUD"),
+                    SolanaAddress::from("BND2ehwWVeHVA5EtMm2b7Vu51AT8f2PNWusS9KQX5moy"),
+                    SolanaAddress::from("DVCeozFGbe6ew3eWTnZByjHeYqTq1cvbrB7JJhkLxaRJ"),
+                    SolanaAddress::from("GvgWmk8iPACw1AEMt47WzkuTkKoSGbn4Xk3aLM8vdbJD"),
+                    SolanaAddress::from("HkphEpUqnFBxBuCPEq5j1HA9L8EwmsmRT6UcFKziptM1"),
+                    SolanaAddress::from("Hzxx6b5a7dmmJeDXLQzr4dTrc2HGK9ar5YRakZgr3ZZ7"),
+                    SolanaAddress::from("11111111111111111111111111111111"),
+                    SolanaAddress::from("ComputeBudget111111111111111111111111111111"),
+                    SolanaAddress::from("JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4"),
+                    SolanaAddress::from("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"),
+                    SolanaAddress::from("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"),
+                    SolanaAddress::from("D8cy77BBepLMngZx6ZukaTff5hCt1HrWyKk3Hnd9oitf"),
+                    SolanaAddress::from("GGztQqQ6pCPaJQnNpXBgELr5cs3WwDakRbh1iEMzjgSJ"),
+                ],
+                recent_blockhash: base58_decode_h256(
+                    "DiSimxK2z1cRa6yD4goqte3rDMmghJAD8WDUZEab2CzD",
+                ),
+                instructions: vec![
+                    CompiledInstruction {
+                        program_id_index: 10,
+                        accounts: vec![],
+                        data: base58_decode("K1FDJ7"),
+                    },
+                    CompiledInstruction {
+                        program_id_index: 10,
+                        accounts: vec![],
+                        data: base58_decode("3E9ErJ5MrzbZ"),
+                    },
+                    CompiledInstruction {
+                        program_id_index: 13,
+                        accounts: vec![0, 6, 0, 35, 9, 12],
+                        data: base58_decode("2"),
+                    },
+                    CompiledInstruction {
+                        program_id_index: 9,
+                        accounts: vec![0, 6],
+                        data: base58_decode("3Bxs3zzLZLuLQEYX"),
+                    },
+                    CompiledInstruction {
+                        program_id_index: 12,
+                        accounts: vec![6],
+                        data: base58_decode("J"),
+                    },
+                    CompiledInstruction {
+                        program_id_index: 11,
+                        accounts: vec![
+                            12, 15, 0, 6, 1, 5, 2, 35, 33, 11, 11, 14, 11, 29, 12, 15, 26, 1, 25,
+                            7, 24, 4, 8, 3, 36, 27, 28, 12, 30, 15, 7, 5, 16, 18, 17, 31, 21, 31,
+                            20, 23, 7, 5, 33, 34, 19, 31, 15, 12, 12, 32, 31, 22, 11,
+                        ],
+                        data: base58_decode(
+                            "5n9zLuyvSGkuf4iDD6PfDvzvzehUkDghmApUkZSXSx57jF9RGSH5Y23tzFJDG3",
+                        ),
+                    },
+                    CompiledInstruction {
+                        program_id_index: 12,
+                        accounts: vec![6, 0, 0],
+                        data: base58_decode("A"),
+                    },
+                ],
+                address_table_lookups: vec![
+                    MessageAddressTableLookup {
+                        account_key: SolanaAddress::from(
+                            "FeXRmSWmwChZbB2EC7Qjw9XKk28yBrPj3k3nzT1DKfak",
+                        ),
+                        writable_indexes: vec![202, 200, 201],
+                        readonly_indexes: vec![196, 197, 36, 199],
+                    },
+                    MessageAddressTableLookup {
+                        account_key: SolanaAddress::from(
+                            "5cFsmTCEfmvpBUBHqsWZnf9n5vTWLYH2LT8X7HdShwxP",
+                        ),
+                        writable_indexes: vec![160, 245, 248, 159, 157],
+                        readonly_indexes: vec![156, 244, 246, 247],
+                    },
+                    MessageAddressTableLookup {
+                        account_key: SolanaAddress::from(
+                            "HJ5StCvsDU4JsvK39VcsHjaoTRTtQU749MQ9qUsJaG1m",
+                        ),
+                        writable_indexes: vec![122, 121, 125],
+                        readonly_indexes: vec![110, 126],
+                    },
+                ],
+            }),
+        };
+
+        assert_eq!(actual, expected);
+
+        let serialized_again = bincode::serialize(&actual).unwrap();
+        assert_eq!(serialized_again.to_hex(), serialized.to_hex());
+    }
+}
diff --git a/rust/chains/tw_solana/src/transaction/short_vec.rs b/rust/chains/tw_solana/src/transaction/short_vec.rs
new file mode 100644
index 00000000000..5001a942902
--- /dev/null
+++ b/rust/chains/tw_solana/src/transaction/short_vec.rs
@@ -0,0 +1,386 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Compact serde-encoding of vectors with small length.
+//! Source code: https://github.com/solana-labs/solana/blob/a16f982169eb197fad0eb8c58c307fb069f69d8f/sdk/program/src/short_vec.rs
+
+#![allow(clippy::arithmetic_side_effects)]
+use serde::{
+    de::{self, Deserializer, SeqAccess, Visitor},
+    ser::{self, SerializeTuple, Serializer},
+    Deserialize, Serialize,
+};
+use std::{convert::TryFrom, fmt, marker::PhantomData};
+
+/// Same as u16, but serialized with 1 to 3 bytes. If the value is above
+/// 0x7f, the top bit is set and the remaining value is stored in the next
+/// bytes. Each byte follows the same pattern until the 3rd byte. The 3rd
+/// byte, if needed, uses all 8 bits to store the last byte of the original
+/// value.
+pub struct ShortU16(pub u16);
+
+impl Serialize for ShortU16 {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        // Pass a non-zero value to serialize_tuple() so that serde_json will
+        // generate an open bracket.
+        let mut seq = serializer.serialize_tuple(1)?;
+
+        let mut rem_val = self.0;
+        loop {
+            let mut elem = (rem_val & 0x7f) as u8;
+            rem_val >>= 7;
+            if rem_val == 0 {
+                seq.serialize_element(&elem)?;
+                break;
+            } else {
+                elem |= 0x80;
+                seq.serialize_element(&elem)?;
+            }
+        }
+        seq.end()
+    }
+}
+
+enum VisitStatus {
+    Done(u16),
+    More(u16),
+}
+
+#[derive(Debug)]
+enum VisitError {
+    TooLong(usize),
+    TooShort(usize),
+    Overflow(u32),
+    Alias,
+    ByteThreeContinues,
+}
+
+impl VisitError {
+    fn into_de_error<'de, A>(self) -> A::Error
+    where
+        A: SeqAccess<'de>,
+    {
+        match self {
+            VisitError::TooLong(len) => de::Error::invalid_length(len, &"three or fewer bytes"),
+            VisitError::TooShort(len) => de::Error::invalid_length(len, &"more bytes"),
+            VisitError::Overflow(val) => de::Error::invalid_value(
+                de::Unexpected::Unsigned(val as u64),
+                &"a value in the range [0, 65535]",
+            ),
+            VisitError::Alias => de::Error::invalid_value(
+                de::Unexpected::Other("alias encoding"),
+                &"strict form encoding",
+            ),
+            VisitError::ByteThreeContinues => de::Error::invalid_value(
+                de::Unexpected::Other("continue signal on byte-three"),
+                &"a terminal signal on or before byte-three",
+            ),
+        }
+    }
+}
+
+type VisitResult = Result<VisitStatus, VisitError>;
+
+const MAX_ENCODING_LENGTH: usize = 3;
+fn visit_byte(elem: u8, val: u16, nth_byte: usize) -> VisitResult {
+    if elem == 0 && nth_byte != 0 {
+        return Err(VisitError::Alias);
+    }
+
+    let val = u32::from(val);
+    let elem = u32::from(elem);
+    let elem_val = elem & 0x7f;
+    let elem_done = (elem & 0x80) == 0;
+
+    if nth_byte >= MAX_ENCODING_LENGTH {
+        return Err(VisitError::TooLong(nth_byte.saturating_add(1)));
+    } else if nth_byte == MAX_ENCODING_LENGTH.saturating_sub(1) && !elem_done {
+        return Err(VisitError::ByteThreeContinues);
+    }
+
+    let shift = u32::try_from(nth_byte)
+        .unwrap_or(u32::MAX)
+        .saturating_mul(7);
+    let elem_val = elem_val.checked_shl(shift).unwrap_or(u32::MAX);
+
+    let new_val = val | elem_val;
+    let val = u16::try_from(new_val).map_err(|_| VisitError::Overflow(new_val))?;
+
+    if elem_done {
+        Ok(VisitStatus::Done(val))
+    } else {
+        Ok(VisitStatus::More(val))
+    }
+}
+
+struct ShortU16Visitor;
+
+impl<'de> Visitor<'de> for ShortU16Visitor {
+    type Value = ShortU16;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a ShortU16")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<ShortU16, A::Error>
+    where
+        A: SeqAccess<'de>,
+    {
+        // Decodes an unsigned 16 bit integer one-to-one encoded as follows:
+        // 1 byte  : 0xxxxxxx                   => 00000000 0xxxxxxx :      0 -    127
+        // 2 bytes : 1xxxxxxx 0yyyyyyy          => 00yyyyyy yxxxxxxx :    128 - 16,383
+        // 3 bytes : 1xxxxxxx 1yyyyyyy 000000zz => zzyyyyyy yxxxxxxx : 16,384 - 65,535
+        let mut val: u16 = 0;
+        for nth_byte in 0..MAX_ENCODING_LENGTH {
+            let elem: u8 = seq.next_element()?.ok_or_else(|| {
+                VisitError::TooShort(nth_byte.saturating_add(1)).into_de_error::<A>()
+            })?;
+            match visit_byte(elem, val, nth_byte).map_err(|e| e.into_de_error::<A>())? {
+                VisitStatus::Done(new_val) => return Ok(ShortU16(new_val)),
+                VisitStatus::More(new_val) => val = new_val,
+            }
+        }
+
+        Err(VisitError::ByteThreeContinues.into_de_error::<A>())
+    }
+}
+
+impl<'de> Deserialize<'de> for ShortU16 {
+    fn deserialize<D>(deserializer: D) -> Result<ShortU16, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_tuple(3, ShortU16Visitor)
+    }
+}
+
+/// If you don't want to use the ShortVec newtype, you can do ShortVec
+/// serialization on an ordinary vector with the following field annotation:
+///
+/// #[serde(with = "short_vec")]
+///
+pub fn serialize<S: Serializer, T: Serialize>(
+    elements: &[T],
+    serializer: S,
+) -> Result<S::Ok, S::Error> {
+    // Pass a non-zero value to serialize_tuple() so that serde_json will
+    // generate an open bracket.
+    let mut seq = serializer.serialize_tuple(1)?;
+
+    let len = elements.len();
+    if len > u16::MAX as usize {
+        return Err(ser::Error::custom("length larger than u16"));
+    }
+    let short_len = ShortU16(len as u16);
+    seq.serialize_element(&short_len)?;
+
+    for element in elements {
+        seq.serialize_element(element)?;
+    }
+    seq.end()
+}
+
+struct ShortVecVisitor<T> {
+    _t: PhantomData<T>,
+}
+
+impl<'de, T> Visitor<'de> for ShortVecVisitor<T>
+where
+    T: Deserialize<'de>,
+{
+    type Value = Vec<T>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        formatter.write_str("a Vec with a multi-byte length")
+    }
+
+    fn visit_seq<A>(self, mut seq: A) -> Result<Vec<T>, A::Error>
+    where
+        A: SeqAccess<'de>,
+    {
+        let short_len: ShortU16 = seq
+            .next_element()?
+            .ok_or_else(|| de::Error::invalid_length(0, &self))?;
+        let len = short_len.0 as usize;
+
+        let mut result = Vec::with_capacity(len);
+        for i in 0..len {
+            let elem = seq
+                .next_element()?
+                .ok_or_else(|| de::Error::invalid_length(i, &self))?;
+            result.push(elem);
+        }
+        Ok(result)
+    }
+}
+
+/// If you don't want to use the ShortVec newtype, you can do ShortVec
+/// deserialization on an ordinary vector with the following field annotation:
+///
+/// #[serde(with = "short_vec")]
+///
+pub fn deserialize<'de, D, T>(deserializer: D) -> Result<Vec<T>, D::Error>
+where
+    D: Deserializer<'de>,
+    T: Deserialize<'de>,
+{
+    let visitor = ShortVecVisitor { _t: PhantomData };
+    deserializer.deserialize_tuple(usize::MAX, visitor)
+}
+
+pub struct ShortVec<T>(pub Vec<T>);
+
+impl<T: Serialize> Serialize for ShortVec<T> {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serialize(&self.0, serializer)
+    }
+}
+
+impl<'de, T: Deserialize<'de>> Deserialize<'de> for ShortVec<T> {
+    fn deserialize<D>(deserializer: D) -> Result<ShortVec<T>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserialize(deserializer).map(ShortVec)
+    }
+}
+
+/// Return the decoded value and how many bytes it consumed.
+#[allow(clippy::result_unit_err)]
+pub fn decode_shortu16_len(bytes: &[u8]) -> Result<(usize, usize), ()> {
+    let mut val = 0;
+    for (nth_byte, byte) in bytes.iter().take(MAX_ENCODING_LENGTH).enumerate() {
+        match visit_byte(*byte, val, nth_byte).map_err(|_| ())? {
+            VisitStatus::More(new_val) => val = new_val,
+            VisitStatus::Done(new_val) => {
+                return Ok((usize::from(new_val), nth_byte.saturating_add(1)));
+            },
+        }
+    }
+    Err(())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use bincode::{deserialize, serialize};
+
+    /// Return the serialized length.
+    fn encode_len(len: u16) -> Vec<u8> {
+        bincode::serialize(&ShortU16(len)).unwrap()
+    }
+
+    fn assert_len_encoding(len: u16, bytes: &[u8]) {
+        assert_eq!(encode_len(len), bytes, "unexpected usize encoding");
+        assert_eq!(
+            decode_shortu16_len(bytes).unwrap(),
+            (usize::from(len), bytes.len()),
+            "unexpected usize decoding"
+        );
+    }
+
+    #[test]
+    fn test_short_vec_encode_len() {
+        assert_len_encoding(0x0, &[0x0]);
+        assert_len_encoding(0x7f, &[0x7f]);
+        assert_len_encoding(0x80, &[0x80, 0x01]);
+        assert_len_encoding(0xff, &[0xff, 0x01]);
+        assert_len_encoding(0x100, &[0x80, 0x02]);
+        assert_len_encoding(0x7fff, &[0xff, 0xff, 0x01]);
+        assert_len_encoding(0xffff, &[0xff, 0xff, 0x03]);
+    }
+
+    fn assert_good_deserialized_value(value: u16, bytes: &[u8]) {
+        assert_eq!(value, deserialize::<ShortU16>(bytes).unwrap().0);
+    }
+
+    fn assert_bad_deserialized_value(bytes: &[u8]) {
+        assert!(deserialize::<ShortU16>(bytes).is_err());
+    }
+
+    #[test]
+    fn test_deserialize() {
+        assert_good_deserialized_value(0x0000, &[0x00]);
+        assert_good_deserialized_value(0x007f, &[0x7f]);
+        assert_good_deserialized_value(0x0080, &[0x80, 0x01]);
+        assert_good_deserialized_value(0x00ff, &[0xff, 0x01]);
+        assert_good_deserialized_value(0x0100, &[0x80, 0x02]);
+        assert_good_deserialized_value(0x07ff, &[0xff, 0x0f]);
+        assert_good_deserialized_value(0x3fff, &[0xff, 0x7f]);
+        assert_good_deserialized_value(0x4000, &[0x80, 0x80, 0x01]);
+        assert_good_deserialized_value(0xffff, &[0xff, 0xff, 0x03]);
+
+        // aliases
+        // 0x0000
+        assert_bad_deserialized_value(&[0x80, 0x00]);
+        assert_bad_deserialized_value(&[0x80, 0x80, 0x00]);
+        // 0x007f
+        assert_bad_deserialized_value(&[0xff, 0x00]);
+        assert_bad_deserialized_value(&[0xff, 0x80, 0x00]);
+        // 0x0080
+        assert_bad_deserialized_value(&[0x80, 0x81, 0x00]);
+        // 0x00ff
+        assert_bad_deserialized_value(&[0xff, 0x81, 0x00]);
+        // 0x0100
+        assert_bad_deserialized_value(&[0x80, 0x82, 0x00]);
+        // 0x07ff
+        assert_bad_deserialized_value(&[0xff, 0x8f, 0x00]);
+        // 0x3fff
+        assert_bad_deserialized_value(&[0xff, 0xff, 0x00]);
+
+        // too short
+        assert_bad_deserialized_value(&[]);
+        assert_bad_deserialized_value(&[0x80]);
+
+        // too long
+        assert_bad_deserialized_value(&[0x80, 0x80, 0x80, 0x00]);
+
+        // too large
+        // 0x0001_0000
+        assert_bad_deserialized_value(&[0x80, 0x80, 0x04]);
+        // 0x0001_8000
+        assert_bad_deserialized_value(&[0x80, 0x80, 0x06]);
+    }
+
+    #[test]
+    fn test_short_vec_u8() {
+        let vec = ShortVec(vec![4u8; 32]);
+        let bytes = serialize(&vec).unwrap();
+        assert_eq!(bytes.len(), vec.0.len() + 1);
+
+        let vec1: ShortVec<u8> = deserialize(&bytes).unwrap();
+        assert_eq!(vec.0, vec1.0);
+    }
+
+    #[test]
+    fn test_short_vec_u8_too_long() {
+        let vec = ShortVec(vec![4u8; u16::MAX as usize]);
+        assert!(matches!(serialize(&vec), Ok(_)));
+
+        let vec = ShortVec(vec![4u8; u16::MAX as usize + 1]);
+        assert!(matches!(serialize(&vec), Err(_)));
+    }
+
+    #[test]
+    fn test_short_vec_json() {
+        let vec = ShortVec(vec![0, 1, 2]);
+        let s = serde_json::to_string(&vec).unwrap();
+        assert_eq!(s, "[[3],0,1,2]");
+    }
+
+    #[test]
+    fn test_short_vec_aliased_length() {
+        let bytes = [
+            0x81, 0x80, 0x00, // 3-byte alias of 1
+            0x00,
+        ];
+        assert!(deserialize::<ShortVec<u8>>(&bytes).is_err());
+    }
+}
diff --git a/rust/chains/tw_solana/src/transaction/v0.rs b/rust/chains/tw_solana/src/transaction/v0.rs
new file mode 100644
index 00000000000..319be784bb8
--- /dev/null
+++ b/rust/chains/tw_solana/src/transaction/v0.rs
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SolanaAddress;
+use crate::modules::insert_instruction::InsertInstruction;
+use crate::transaction::{short_vec, CompiledInstruction, MessageHeader};
+use serde::{Deserialize, Serialize};
+use tw_hash::{as_byte_sequence, H256};
+
+#[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct MessageAddressTableLookup {
+    /// Address lookup table account key
+    pub account_key: SolanaAddress,
+    /// List of indexes used to load writable account addresses
+    #[serde(with = "short_vec")]
+    pub writable_indexes: Vec<u8>,
+    /// List of indexes used to load readonly account addresses
+    #[serde(with = "short_vec")]
+    pub readonly_indexes: Vec<u8>,
+}
+
+#[derive(Serialize, Deserialize, Default, Debug, PartialEq, Eq, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct Message {
+    /// The message header, identifying signed and read-only `account_keys`.
+    /// Header values only describe static `account_keys`, they do not describe
+    /// any additional account keys loaded via address table lookups.
+    pub header: MessageHeader,
+
+    /// List of accounts loaded by this transaction.
+    #[serde(with = "short_vec")]
+    pub account_keys: Vec<SolanaAddress>,
+
+    /// The blockhash of a recent block.
+    #[serde(with = "as_byte_sequence")]
+    pub recent_blockhash: H256,
+
+    /// Instructions that invoke a designated program, are executed in sequence,
+    /// and committed in one atomic transaction if all succeed.
+    ///
+    /// # Notes
+    ///
+    /// Program indexes must index into the list of message `account_keys` because
+    /// program id's cannot be dynamically loaded from a lookup table.
+    ///
+    /// Account indexes must index into the list of addresses
+    /// constructed from the concatenation of three key lists:
+    ///   1) message `account_keys`
+    ///   2) ordered list of keys loaded from `writable` lookup table indexes
+    ///   3) ordered list of keys loaded from `readable` lookup table indexes
+    #[serde(with = "short_vec")]
+    pub instructions: Vec<CompiledInstruction>,
+
+    /// List of address table lookups used to load additional accounts
+    /// for this transaction.
+    #[serde(with = "short_vec")]
+    pub address_table_lookups: Vec<MessageAddressTableLookup>,
+}
+
+impl InsertInstruction for Message {
+    fn address_table_lookups(&self) -> Option<&[MessageAddressTableLookup]> {
+        Some(&self.address_table_lookups)
+    }
+
+    fn account_keys_mut(&mut self) -> &mut Vec<SolanaAddress> {
+        &mut self.account_keys
+    }
+
+    fn message_header_mut(&mut self) -> &mut MessageHeader {
+        &mut self.header
+    }
+
+    fn instructions_mut(&mut self) -> &mut Vec<CompiledInstruction> {
+        &mut self.instructions
+    }
+}
diff --git a/rust/chains/tw_solana/src/transaction/versioned.rs b/rust/chains/tw_solana/src/transaction/versioned.rs
new file mode 100644
index 00000000000..18b81a81576
--- /dev/null
+++ b/rust/chains/tw_solana/src/transaction/versioned.rs
@@ -0,0 +1,305 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Source code: https://github.com/solana-labs/solana/blob/a16f982169eb197fad0eb8c58c307fb069f69d8f/sdk/program/src/message/versions/mod.rs
+
+use crate::address::SolanaAddress;
+use crate::blockhash::Blockhash;
+use crate::modules::insert_instruction::InsertInstruction;
+use crate::transaction::v0::MessageAddressTableLookup;
+use crate::transaction::{legacy, short_vec, v0, CompiledInstruction, MessageHeader, Signature};
+use serde::de::{SeqAccess, Unexpected, Visitor};
+use serde::ser::SerializeTuple;
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt;
+use tw_encoding::base64::STANDARD;
+use tw_encoding::{base64, EncodingError, EncodingResult};
+use tw_hash::{as_byte_sequence, H256};
+
+/// Bit mask that indicates whether a serialized message is versioned.
+pub const MESSAGE_VERSION_PREFIX: u8 = 0x80;
+
+// NOTE: Serialization-related changes must be paired with the direct read at sigverify.
+/// An atomic transaction
+#[derive(Debug, PartialEq, Eq, Clone, Serialize, Deserialize)]
+pub struct VersionedTransaction {
+    /// List of signatures
+    #[serde(with = "short_vec")]
+    pub signatures: Vec<Signature>,
+    /// Message to sign.
+    pub message: VersionedMessage,
+}
+
+impl VersionedTransaction {
+    pub fn unsigned(message: VersionedMessage) -> VersionedTransaction {
+        VersionedTransaction {
+            signatures: vec![Signature::default(); message.num_required_signatures()],
+            message,
+        }
+    }
+
+    pub fn from_base64(s: &str) -> EncodingResult<VersionedTransaction> {
+        let tx_bytes = base64::decode(s, STANDARD)?;
+        bincode::deserialize(&tx_bytes).map_err(|_| EncodingError::InvalidInput)
+    }
+
+    pub fn to_base64(&self) -> EncodingResult<String> {
+        let tx_bytes = bincode::serialize(self).map_err(|_| EncodingError::InvalidInput)?;
+        Ok(base64::encode(&tx_bytes, STANDARD))
+    }
+}
+
+/// Either a legacy message or a v0 message.
+///
+/// # Serialization
+///
+/// If the first bit is set, the remaining 7 bits will be used to determine
+/// which message version is serialized starting from version `0`. If the first
+/// is bit is not set, all bytes are used to encode the legacy `Message`
+/// format.
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub enum VersionedMessage {
+    Legacy(legacy::Message),
+    V0(v0::Message),
+}
+
+impl VersionedMessage {
+    pub fn header(&self) -> &MessageHeader {
+        match self {
+            VersionedMessage::Legacy(legacy) => &legacy.header,
+            VersionedMessage::V0(v0) => &v0.header,
+        }
+    }
+
+    pub fn account_keys(&self) -> &[SolanaAddress] {
+        match self {
+            VersionedMessage::Legacy(legacy) => &legacy.account_keys,
+            VersionedMessage::V0(v0) => &v0.account_keys,
+        }
+    }
+
+    pub fn signers(&self) -> impl Iterator<Item = &SolanaAddress> {
+        let signatures_count = self.num_required_signatures();
+        match self {
+            VersionedMessage::Legacy(legacy) => &legacy.account_keys,
+            VersionedMessage::V0(v0) => &v0.account_keys,
+        }
+        .iter()
+        .take(signatures_count)
+    }
+
+    pub fn recent_blockhash(&self) -> Blockhash {
+        match self {
+            VersionedMessage::Legacy(legacy) => Blockhash::with_bytes(legacy.recent_blockhash),
+            VersionedMessage::V0(v0) => Blockhash::with_bytes(v0.recent_blockhash),
+        }
+    }
+
+    pub fn instructions(&self) -> &[CompiledInstruction] {
+        match self {
+            VersionedMessage::Legacy(legacy) => &legacy.instructions,
+            VersionedMessage::V0(v0) => &v0.instructions,
+        }
+    }
+
+    pub fn num_required_signatures(&self) -> usize {
+        match self {
+            VersionedMessage::Legacy(legacy) => legacy.header.num_required_signatures as usize,
+            VersionedMessage::V0(v0) => v0.header.num_required_signatures as usize,
+        }
+    }
+
+    pub fn get_account_index(&self, account: SolanaAddress) -> Option<usize> {
+        let account_keys = match self {
+            VersionedMessage::Legacy(legacy) => &legacy.account_keys,
+            VersionedMessage::V0(v0) => &v0.account_keys,
+        };
+        account_keys.iter().position(|pk| *pk == account)
+    }
+
+    pub fn set_recent_blockhash(&mut self, recent_blockhash: H256) {
+        match self {
+            VersionedMessage::Legacy(legacy) => legacy.recent_blockhash = recent_blockhash,
+            VersionedMessage::V0(v0) => v0.recent_blockhash = recent_blockhash,
+        }
+    }
+}
+
+impl Serialize for VersionedMessage {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self {
+            Self::Legacy(message) => {
+                let mut seq = serializer.serialize_tuple(1)?;
+                seq.serialize_element(message)?;
+                seq.end()
+            },
+            Self::V0(message) => {
+                let mut seq = serializer.serialize_tuple(2)?;
+                seq.serialize_element(&MESSAGE_VERSION_PREFIX)?;
+                seq.serialize_element(message)?;
+                seq.end()
+            },
+        }
+    }
+}
+
+impl InsertInstruction for VersionedMessage {
+    fn address_table_lookups(&self) -> Option<&[MessageAddressTableLookup]> {
+        match self {
+            VersionedMessage::Legacy(legacy) => legacy.address_table_lookups(),
+            VersionedMessage::V0(v0) => v0.address_table_lookups(),
+        }
+    }
+
+    fn account_keys_mut(&mut self) -> &mut Vec<SolanaAddress> {
+        match self {
+            VersionedMessage::Legacy(legacy) => legacy.account_keys_mut(),
+            VersionedMessage::V0(v0) => v0.account_keys_mut(),
+        }
+    }
+
+    fn message_header_mut(&mut self) -> &mut MessageHeader {
+        match self {
+            VersionedMessage::Legacy(legacy) => legacy.message_header_mut(),
+            VersionedMessage::V0(v0) => v0.message_header_mut(),
+        }
+    }
+
+    fn instructions_mut(&mut self) -> &mut Vec<CompiledInstruction> {
+        match self {
+            VersionedMessage::Legacy(legacy) => legacy.instructions_mut(),
+            VersionedMessage::V0(v0) => v0.instructions_mut(),
+        }
+    }
+}
+
+enum MessagePrefix {
+    Legacy(u8),
+    Versioned(u8),
+}
+
+impl<'de> Deserialize<'de> for MessagePrefix {
+    fn deserialize<D>(deserializer: D) -> Result<MessagePrefix, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct PrefixVisitor;
+
+        impl<'de> Visitor<'de> for PrefixVisitor {
+            type Value = MessagePrefix;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("message prefix byte")
+            }
+
+            // Serde's integer visitors bubble up to u64 so check the prefix
+            // with this function instead of visit_u8. This approach is
+            // necessary because serde_json directly calls visit_u64 for
+            // unsigned integers.
+            fn visit_u64<E: de::Error>(self, value: u64) -> Result<MessagePrefix, E> {
+                if value > u8::MAX as u64 {
+                    Err(de::Error::invalid_type(Unexpected::Unsigned(value), &self))?;
+                }
+
+                let byte = value as u8;
+                if byte & MESSAGE_VERSION_PREFIX != 0 {
+                    Ok(MessagePrefix::Versioned(byte & !MESSAGE_VERSION_PREFIX))
+                } else {
+                    Ok(MessagePrefix::Legacy(byte))
+                }
+            }
+        }
+
+        deserializer.deserialize_u8(PrefixVisitor)
+    }
+}
+
+impl<'de> Deserialize<'de> for VersionedMessage {
+    fn deserialize<D>(deserializer: D) -> Result<VersionedMessage, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct MessageVisitor;
+
+        impl<'de> Visitor<'de> for MessageVisitor {
+            type Value = VersionedMessage;
+
+            fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+                formatter.write_str("message bytes")
+            }
+
+            fn visit_seq<A>(self, mut seq: A) -> Result<VersionedMessage, A::Error>
+            where
+                A: SeqAccess<'de>,
+            {
+                let prefix: MessagePrefix = seq
+                    .next_element()?
+                    .ok_or_else(|| de::Error::invalid_length(0, &self))?;
+
+                match prefix {
+                    MessagePrefix::Legacy(num_required_signatures) => {
+                        // The remaining fields of the legacy Message struct after the first byte.
+                        #[derive(Serialize, Deserialize)]
+                        struct RemainingLegacyMessage {
+                            pub num_readonly_signed_accounts: u8,
+                            pub num_readonly_unsigned_accounts: u8,
+                            #[serde(with = "short_vec")]
+                            pub account_keys: Vec<SolanaAddress>,
+                            #[serde(with = "as_byte_sequence")]
+                            pub recent_blockhash: H256,
+                            #[serde(with = "short_vec")]
+                            pub instructions: Vec<CompiledInstruction>,
+                        }
+
+                        let message: RemainingLegacyMessage =
+                            seq.next_element()?.ok_or_else(|| {
+                                // will never happen since tuple length is always 2
+                                de::Error::invalid_length(1, &self)
+                            })?;
+
+                        Ok(VersionedMessage::Legacy(legacy::Message {
+                            header: MessageHeader {
+                                num_required_signatures,
+                                num_readonly_signed_accounts: message.num_readonly_signed_accounts,
+                                num_readonly_unsigned_accounts: message
+                                    .num_readonly_unsigned_accounts,
+                            },
+                            account_keys: message.account_keys,
+                            recent_blockhash: message.recent_blockhash,
+                            instructions: message.instructions,
+                        }))
+                    },
+                    MessagePrefix::Versioned(version) => {
+                        match version {
+                            0 => {
+                                Ok(VersionedMessage::V0(seq.next_element()?.ok_or_else(
+                                    || {
+                                        // will never happen since tuple length is always 2
+                                        de::Error::invalid_length(1, &self)
+                                    },
+                                )?))
+                            },
+                            127 => {
+                                // 0xff is used as the first byte of the off-chain messages
+                                // which corresponds to version 127 of the versioned messages.
+                                // This explicit check is added to prevent the usage of version 127
+                                // in the runtime as a valid transaction.
+                                Err(de::Error::custom("off-chain messages are not accepted"))
+                            },
+                            _ => Err(de::Error::invalid_value(
+                                de::Unexpected::Unsigned(version as u64),
+                                &"a valid transaction message version",
+                            )),
+                        }
+                    },
+                }
+            }
+        }
+
+        deserializer.deserialize_tuple(2, MessageVisitor)
+    }
+}
diff --git a/rust/chains/tw_solana/tests/get_default_token_address.rs b/rust/chains/tw_solana/tests/get_default_token_address.rs
new file mode 100644
index 00000000000..4f075dde885
--- /dev/null
+++ b/rust/chains/tw_solana/tests/get_default_token_address.rs
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+use tw_solana::address::SolanaAddress;
+use tw_solana::blockhash::Blockhash;
+use tw_solana::defined_addresses::TOKEN_PROGRAM_ID_ADDRESS;
+use tw_solana::program::stake_program::StakeProgram;
+
+fn test_get_default_token_address_impl(
+    main_address: &str,
+    token_mint_address: &str,
+    expected: &str,
+) {
+    let main_address = SolanaAddress::from_str(main_address).unwrap();
+    let token_mint_address = SolanaAddress::from_str(token_mint_address).unwrap();
+    let expected = SolanaAddress::from_str(expected).unwrap();
+
+    let actual = StakeProgram::get_associated_token_address(
+        main_address,
+        *TOKEN_PROGRAM_ID_ADDRESS,
+        token_mint_address,
+    )
+    .expect("!get_associated_token_address");
+    assert_eq!(actual, expected);
+}
+
+#[test]
+fn test_get_default_token_address() {
+    test_get_default_token_address_impl(
+        "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V",
+        "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt",
+        "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP",
+    );
+    test_get_default_token_address_impl(
+        "FtsZbVDYGBUw4R5Rcy8p58RAdYRFUJcAiBRdQAona7t1",
+        "FQYWEccPpAVR5Q16FKoTFUa6z8BWzdK5eh3D586fdQbM",
+        "2XGUJePx3CJSYQvAQcSgLf7xpjCdMUgx8LNaSCUhE2LS",
+    );
+    test_get_default_token_address_impl(
+        "74nsHsFivzUPLEygULuZLs193MnDNZfnKrSEkgA4qkY7",
+        "FQYWEccPpAVR5Q16FKoTFUa6z8BWzdK5eh3D586fdQbM",
+        "823YRj6GozU23rwSyd1f78vPopVoQPCeK79ppWCu5SYQ",
+    );
+    test_get_default_token_address_impl(
+        "HBYC51YrGFAZ8rM7Sj8e9uqKggpSrDYrinQDZzvMtqQp",
+        "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt",
+        "6X4X1Ae24mkoWeCEpktevySVG9jzeCufut5vtUW3wFrD",
+    );
+    test_get_default_token_address_impl(
+        "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ",
+        "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt",
+        "ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf",
+    );
+}
+
+fn test_address_from_recent_blockhash_impl(main_address: &str, blockhash: &str, expected: &str) {
+    let main_address = SolanaAddress::from_str(main_address).unwrap();
+    let expected = SolanaAddress::from_str(expected).unwrap();
+    let blockhash = Blockhash::from_str(blockhash).unwrap();
+
+    let actual = StakeProgram::address_from_recent_blockhash(&main_address, &blockhash);
+    assert_eq!(actual, expected);
+}
+
+#[test]
+fn test_address_from_recent_blockhash() {
+    test_address_from_recent_blockhash_impl(
+        "zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu",
+        "11111111111111111111111111111111",
+        "GQDDc5EVGJZFC7AvpEJ8eoCQ75Yy4gr7eu17frCjvQRQ",
+    );
+    test_address_from_recent_blockhash_impl(
+        "zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu",
+        "9ipJh5xfyoyDaiq8trtrdqQeAhQbQkWy2eANizKvx75K",
+        "2Kos1xJRBq3Ae1GnVNBx7HgJhq8KvdUe2bXE4QGdNaXb",
+    );
+    test_address_from_recent_blockhash_impl(
+        "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V",
+        "AfzzEC8NVXoxKoHdjXLDVzqwqvvZmgPuqyJqjuHiPY1D",
+        "Fxhhm82PZVuXEwycT28vGqknUEnVeoHh4UWEnJNQUDbv",
+    );
+}
diff --git a/rust/chains/tw_solana/tests/update_blockhash_and_sign.rs b/rust/chains/tw_solana/tests/update_blockhash_and_sign.rs
new file mode 100644
index 00000000000..5521e7069af
--- /dev/null
+++ b/rust/chains/tw_solana/tests/update_blockhash_and_sign.rs
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base58;
+use tw_solana::modules::utils::SolanaTransaction;
+use tw_solana::SOLANA_ALPHABET;
+
+#[test]
+fn test_update_recent_blockhash_and_sign() {
+    // base64 encoded
+    let encoded_tx = "AQPWaOi7dMdmQpXi8HyQQKwiqIftrg1igGQxGtZeT50ksn4wAnyH4DtDrkkuE0fqgx80LTp4LwNN9a440SrmoA8BAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA=";
+    // base58 encoded
+    let new_blockhash = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg";
+    let private_key = base58::decode(
+        "A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr",
+        SOLANA_ALPHABET,
+    )
+    .unwrap();
+
+    let output =
+        SolanaTransaction::update_blockhash_and_sign(encoded_tx, new_blockhash, &[private_key]);
+    assert_eq!(output.error, SigningErrorType::OK);
+    let expected = "AdQl49kO1FxfkAnAuK9KSQEGLzxHNYLqBrYGFN711q7aT/qyrzYMn/7/IdFBy6yMhjOA1CkwZsgmqmbu+XKvVAUBAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAseKSLpOE0fdq67Jk9Ckme2c3SYD//nqcykr/oci67zEBAgIAAQwCAAAAKgAAAAAAAAA=";
+    assert_eq!(output.encoded, expected);
+}
diff --git a/rust/chains/tw_sui/Cargo.toml b/rust/chains/tw_sui/Cargo.toml
new file mode 100644
index 00000000000..1aa3d7cabb3
--- /dev/null
+++ b/rust/chains/tw_sui/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "tw_sui"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+indexmap = "2.0"
+move-core-types = { git = "https://github.com/move-language/move", rev = "ea70797099baea64f05194a918cebd69ed02b285", features = ["address32"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_repr = "0.1"
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
diff --git a/rust/chains/tw_sui/fuzz/.gitignore b/rust/chains/tw_sui/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/chains/tw_sui/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/chains/tw_sui/fuzz/Cargo.toml b/rust/chains/tw_sui/fuzz/Cargo.toml
new file mode 100644
index 00000000000..32ce151dfaa
--- /dev/null
+++ b/rust/chains/tw_sui/fuzz/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "tw_sui-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+tw_any_coin = { path = "../../../tw_any_coin", features = ["test-utils"] }
+tw_coin_registry = { path = "../../../tw_coin_registry" }
+tw_proto = { path = "../../../tw_proto", features = ["fuzz"] }
+
+[dependencies.tw_sui]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "sign"
+path = "fuzz_targets/sign.rs"
+test = false
+doc = false
diff --git a/rust/chains/tw_sui/fuzz/fuzz_targets/sign.rs b/rust/chains/tw_sui/fuzz/fuzz_targets/sign.rs
new file mode 100644
index 00000000000..bf0158d275f
--- /dev/null
+++ b/rust/chains/tw_sui/fuzz/fuzz_targets/sign.rs
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_proto::Sui::Proto;
+
+fuzz_target!(|input: Proto::SigningInput<'_>| {
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let _ = signer.sign(CoinType::Sui, input);
+});
diff --git a/rust/chains/tw_sui/src/address.rs b/rust/chains/tw_sui/src/address.rs
new file mode 100644
index 00000000000..063418906dc
--- /dev/null
+++ b/rust/chains/tw_sui/src/address.rs
@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use move_core_types::account_address::AccountAddress;
+use serde::{Deserialize, Serialize};
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex;
+use tw_hash::blake2::blake2_b;
+use tw_keypair::ed25519;
+use tw_memory::Data;
+
+#[repr(u8)]
+pub enum Scheme {
+    Ed25519 = 0,
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub struct SuiAddress(AccountAddress);
+
+impl SuiAddress {
+    pub const LENGTH: usize = AccountAddress::LENGTH;
+
+    /// Initializes an address with a `ed25519` public key.
+    pub fn with_ed25519_pubkey(pubkey: &ed25519::sha512::PublicKey) -> AddressResult<Self> {
+        const CAPACITY: usize = ed25519::sha512::PublicKey::LEN + 1;
+
+        let mut to_hash = Vec::with_capacity(CAPACITY);
+        to_hash.push(Scheme::Ed25519 as u8);
+        to_hash.extend_from_slice(pubkey.as_slice());
+        let hashed =
+            blake2_b(to_hash.as_slice(), SuiAddress::LENGTH).map_err(|_| AddressError::Internal)?;
+
+        AccountAddress::from_bytes(hashed)
+            .map(SuiAddress)
+            .map_err(|_| AddressError::Internal)
+    }
+
+    pub fn into_inner(self) -> AccountAddress {
+        self.0
+    }
+}
+
+impl FromStr for SuiAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let bytes = hex::decode(s).map_err(|_| AddressError::FromHexError)?;
+        AccountAddress::from_bytes(bytes)
+            .map(SuiAddress)
+            .map_err(|_| AddressError::InvalidInput)
+    }
+}
+
+impl fmt::Display for SuiAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let prefixed = true;
+        write!(f, "{}", hex::encode(self.0.as_ref(), prefixed))
+    }
+}
+
+impl CoinAddress for SuiAddress {
+    #[inline]
+    fn data(&self) -> Data {
+        self.0.to_vec()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_keypair::ed25519::sha512::PrivateKey;
+
+    #[test]
+    fn test_from_public_key() {
+        let private = PrivateKey::try_from(
+            "088baa019f081d6eab8dff5c447f9ce2f83c1babf3d03686299eaf6a1e89156e",
+        )
+        .unwrap();
+        let public = private.public();
+        let addr = SuiAddress::with_ed25519_pubkey(&public).unwrap();
+        assert_eq!(
+            addr.to_string(),
+            "0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015"
+        );
+    }
+
+    /// https://github.com/trustwallet/wallet-core/issues/3837
+    #[test]
+    fn test_sui_address_str_with_leading_zero() {
+        let s = "0x0cf10169225a251113b3198dc81d15ba72286f73353a8212f03bad10bd0f0a99";
+        let addr = SuiAddress::from_str(s).unwrap();
+        assert_eq!(addr.to_string(), s);
+    }
+}
diff --git a/rust/chains/tw_sui/src/compiler.rs b/rust/chains/tw_sui/src/compiler.rs
new file mode 100644
index 00000000000..1da7236a8f3
--- /dev/null
+++ b/rust/chains/tw_sui/src/compiler.rs
@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::tx_builder::{TWTransaction, TWTransactionBuilder};
+use crate::modules::tx_signer::{TransactionPreimage, TxSigner};
+use crate::signature::SuiSignatureInfo;
+use std::borrow::Cow;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::common::compile_input::SingleSignaturePubkey;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_encoding::base64::{self, STANDARD};
+use tw_keypair::ed25519;
+use tw_proto::Sui::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct SuiCompiler;
+
+impl SuiCompiler {
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let builder = TWTransactionBuilder::new(input);
+        let tx_to_sign = builder.build()?;
+
+        let TransactionPreimage {
+            tx_data_to_sign,
+            tx_hash_to_sign,
+            ..
+        } = match tx_to_sign {
+            TWTransaction::Transaction(tx) => TxSigner::preimage(&tx)?,
+            TWTransaction::SignDirect(tx_data) => TxSigner::preimage_direct(tx_data)?,
+        };
+
+        Ok(CompilerProto::PreSigningOutput {
+            data: Cow::from(tx_data_to_sign),
+            data_hash: Cow::from(tx_hash_to_sign.to_vec()),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn compile_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let builder = TWTransactionBuilder::new(input);
+        let tx_to_sign = builder.build()?;
+
+        let TransactionPreimage {
+            unsigned_tx_data, ..
+        } = match tx_to_sign {
+            TWTransaction::Transaction(tx) => TxSigner::preimage(&tx),
+            TWTransaction::SignDirect(tx_data) => TxSigner::preimage_direct(tx_data),
+        }?;
+
+        let SingleSignaturePubkey {
+            signature: raw_signature,
+            public_key: public_key_bytes,
+        } = SingleSignaturePubkey::from_sign_pubkey_list(signatures, public_keys)?;
+
+        let signature = ed25519::Signature::try_from(raw_signature.as_slice())?;
+        let public_key = ed25519::sha512::PublicKey::try_from(public_key_bytes.as_slice())?;
+
+        let signature_info = SuiSignatureInfo::ed25519(&signature, &public_key);
+
+        let unsigned_tx = base64::encode(&unsigned_tx_data, STANDARD);
+        Ok(Proto::SigningOutput {
+            unsigned_tx: Cow::from(unsigned_tx),
+            signature: Cow::from(signature_info.to_base64()),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_sui/src/constants.rs b/rust/chains/tw_sui/src/constants.rs
new file mode 100644
index 00000000000..35c5d525f3e
--- /dev/null
+++ b/rust/chains/tw_sui/src/constants.rs
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::sui_types::{ObjectID, SequenceNumber};
+use move_core_types::account_address::AccountAddress;
+use move_core_types::ident_str;
+use move_core_types::identifier::IdentStr;
+
+pub const OBJECT_START_VERSION: SequenceNumber = SequenceNumber(1);
+
+/// 0x5: hardcoded object ID for the singleton sui system state object.
+pub const SUI_SYSTEM_STATE_ADDRESS: AccountAddress = address_from_single_byte(5);
+pub const SUI_SYSTEM_STATE_OBJECT_ID: ObjectID = ObjectID(SUI_SYSTEM_STATE_ADDRESS);
+pub const SUI_SYSTEM_STATE_OBJECT_SHARED_VERSION: SequenceNumber = OBJECT_START_VERSION;
+
+/// 0x3-- account address where sui system modules are stored
+/// Same as the ObjectID
+pub const SUI_SYSTEM_ADDRESS: AccountAddress = address_from_single_byte(3);
+pub const SUI_SYSTEM_PACKAGE_ID: ObjectID = ObjectID(SUI_SYSTEM_ADDRESS);
+
+pub const SUI_SYSTEM_MODULE_NAME: &IdentStr = ident_str!("sui_system");
+pub const ADD_STAKE_MUL_COIN_FUN_NAME: &IdentStr = ident_str!("request_add_stake_mul_coin");
+pub const WITHDRAW_STAKE_FUN_NAME: &IdentStr = ident_str!("request_withdraw_stake");
+
+const fn address_from_single_byte(b: u8) -> AccountAddress {
+    let mut addr = [0u8; AccountAddress::LENGTH];
+    addr[AccountAddress::LENGTH - 1] = b;
+    AccountAddress::new(addr)
+}
diff --git a/rust/chains/tw_sui/src/entry.rs b/rust/chains/tw_sui/src/entry.rs
new file mode 100644
index 00000000000..5c0539c9e29
--- /dev/null
+++ b/rust/chains/tw_sui/src/entry.rs
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SuiAddress;
+use crate::compiler::SuiCompiler;
+use crate::modules::transaction_util::SuiTransactionUtil;
+use crate::signer::SuiSigner;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_keypair::tw::PublicKey;
+use tw_proto::Sui::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct SuiEntry;
+
+impl CoinEntry for SuiEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = SuiAddress;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = SuiTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        SuiAddress::from_str(address)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        SuiAddress::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let ed25519_public = public_key
+            .to_ed25519()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        SuiAddress::with_ed25519_pubkey(ed25519_public)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        SuiSigner::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        SuiCompiler::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        SuiCompiler::compile(coin, input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(SuiTransactionUtil)
+    }
+}
diff --git a/rust/chains/tw_sui/src/lib.rs b/rust/chains/tw_sui/src/lib.rs
new file mode 100644
index 00000000000..9a2411b8058
--- /dev/null
+++ b/rust/chains/tw_sui/src/lib.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod compiler;
+pub mod constants;
+pub mod entry;
+pub mod modules;
+pub mod signature;
+pub mod signer;
+pub mod transaction;
diff --git a/rust/chains/tw_sui/src/modules/mod.rs b/rust/chains/tw_sui/src/modules/mod.rs
new file mode 100644
index 00000000000..32f928c8ec3
--- /dev/null
+++ b/rust/chains/tw_sui/src/modules/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod transaction_util;
+pub mod tx_builder;
+pub mod tx_signer;
diff --git a/rust/chains/tw_sui/src/modules/transaction_util.rs b/rust/chains/tw_sui/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..f2ad4ff585f
--- /dev/null
+++ b/rust/chains/tw_sui/src/modules/transaction_util.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_util::TransactionUtil;
+use tw_encoding::base58::{self, Alphabet};
+use tw_encoding::base64::{self, STANDARD};
+use tw_hash::blake2::blake2_b;
+use tw_hash::H256;
+
+pub struct SuiTransactionUtil;
+
+impl TransactionUtil for SuiTransactionUtil {
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        Self::calc_tx_hash_impl(coin, encoded_tx)
+    }
+}
+
+// See: https://github.com/mofalabs/sui/blob/74908b3ad8b82e5e401d5017fed4fa7dc2361569/lib/builder/hash.dart#L7
+fn hash_typed_data(type_tag: &str, data: &[u8]) -> Result<Vec<u8>, tw_hash::Error> {
+    let type_tag_bytes: Vec<u8> = format!("{}::", type_tag).into_bytes();
+
+    let mut data_with_tag = Vec::with_capacity(type_tag_bytes.len() + data.len());
+    data_with_tag.extend_from_slice(&type_tag_bytes);
+    data_with_tag.extend_from_slice(data);
+
+    blake2_b(&data_with_tag, H256::LEN)
+}
+
+impl SuiTransactionUtil {
+    fn calc_tx_hash_impl(_coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        let tx = base64::decode(encoded_tx, STANDARD)?;
+        let tx_hash = hash_typed_data("TransactionData", &tx)
+            .map_err(|_| SigningErrorType::Error_input_parse)?;
+
+        Ok(base58::encode(&tx_hash, Alphabet::Bitcoin))
+    }
+}
diff --git a/rust/chains/tw_sui/src/modules/tx_builder.rs b/rust/chains/tw_sui/src/modules/tx_builder.rs
new file mode 100644
index 00000000000..301f9f3cde4
--- /dev/null
+++ b/rust/chains/tw_sui/src/modules/tx_builder.rs
@@ -0,0 +1,222 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SuiAddress;
+use crate::transaction::sui_types::{ObjectDigest, ObjectID, ObjectRef, SequenceNumber};
+use crate::transaction::transaction_builder::TransactionBuilder;
+use crate::transaction::transaction_data::TransactionData;
+use std::borrow::Cow;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base64::{self, STANDARD};
+use tw_keypair::ed25519;
+use tw_keypair::traits::KeyPairTrait;
+use tw_memory::Data;
+use tw_proto::Sui::Proto;
+use tw_proto::Sui::Proto::mod_SigningInput::OneOftransaction_payload as TransactionType;
+
+pub enum TWTransaction {
+    Transaction(TransactionData),
+    SignDirect(Data),
+}
+
+pub struct TWTransactionBuilder<'a> {
+    input: Proto::SigningInput<'a>,
+}
+
+impl<'a> TWTransactionBuilder<'a> {
+    pub fn new(input: Proto::SigningInput<'a>) -> Self {
+        TWTransactionBuilder { input }
+    }
+
+    pub fn signer_key(&self) -> SigningResult<ed25519::sha512::KeyPair> {
+        ed25519::sha512::KeyPair::try_from(self.input.private_key.as_ref())
+            .map_err(SigningError::from)
+    }
+
+    pub fn build(self) -> SigningResult<TWTransaction> {
+        let tx_data = match self.input.transaction_payload {
+            TransactionType::sign_direct_message(ref direct) => {
+                let raw_data = self.sign_direct_from_proto(direct)?;
+                return Ok(TWTransaction::SignDirect(raw_data));
+            },
+            TransactionType::pay_sui(ref pay_sui) => self.pay_sui_from_proto(pay_sui),
+            TransactionType::pay_all_sui(ref pay_all_sui) => {
+                self.pay_all_sui_from_proto(pay_all_sui)
+            },
+            TransactionType::pay(ref pay) => self.pay_from_proto(pay),
+            TransactionType::request_add_stake(ref stake) => self.stake_from_proto(stake),
+            TransactionType::request_withdraw_stake(ref withdraw) => {
+                self.withdraw_from_proto(withdraw)
+            },
+            TransactionType::transfer_object(ref transfer_obj) => {
+                self.transfer_object_from_proto(transfer_obj)
+            },
+            TransactionType::None => SigningError::err(SigningErrorType::Error_invalid_params),
+        }?;
+        Ok(TWTransaction::Transaction(tx_data))
+    }
+
+    fn sign_direct_from_proto(&self, sign_direct: &Proto::SignDirect<'_>) -> SigningResult<Data> {
+        base64::decode(&sign_direct.unsigned_tx_msg, STANDARD)
+            .tw_err(|_| SigningErrorType::Error_input_parse)
+            .context("Error parsing Raw Unsigned TX message as base64")
+    }
+
+    fn pay_sui_from_proto(&self, pay_sui: &Proto::PaySui<'_>) -> SigningResult<TransactionData> {
+        let signer = self.signer_address()?;
+        let input_coins = Self::build_coins(&pay_sui.input_coins)?;
+        let recipients = Self::parse_addresses(&pay_sui.recipients)
+            .context("Invalid one of the recipients addresses")?;
+
+        TransactionBuilder::pay_sui(
+            signer,
+            input_coins,
+            recipients,
+            pay_sui.amounts.clone(),
+            self.input.gas_budget,
+            self.input.reference_gas_price,
+        )
+    }
+
+    fn pay_all_sui_from_proto(
+        &self,
+        pay_all_sui: &Proto::PayAllSui<'_>,
+    ) -> SigningResult<TransactionData> {
+        let signer = self.signer_address()?;
+        let input_coins = Self::build_coins(&pay_all_sui.input_coins)?;
+        let recipient = SuiAddress::from_str(&pay_all_sui.recipient)
+            .into_tw()
+            .context("Invalid recipient address")?;
+
+        TransactionBuilder::pay_all_sui(
+            signer,
+            input_coins,
+            recipient,
+            self.input.gas_budget,
+            self.input.reference_gas_price,
+        )
+    }
+
+    fn pay_from_proto(&self, pay: &Proto::Pay<'_>) -> SigningResult<TransactionData> {
+        let signer = self.signer_address()?;
+        let input_coins = Self::build_coins(&pay.input_coins)?;
+        let recipients = Self::parse_addresses(&pay.recipients)
+            .context("Invalid one of the recipients addresses")?;
+        let gas = Self::require_coin(&pay.gas).context("No 'gas' coin specified")?;
+
+        TransactionBuilder::pay(
+            signer,
+            input_coins,
+            recipients,
+            pay.amounts.clone(),
+            gas,
+            self.input.gas_budget,
+            self.input.reference_gas_price,
+        )
+    }
+
+    fn stake_from_proto(
+        &self,
+        stake: &Proto::RequestAddStake<'_>,
+    ) -> SigningResult<TransactionData> {
+        let signer = self.signer_address()?;
+
+        let input_coins = Self::build_coins(&stake.coins)?;
+        let amount = stake.amount.as_ref().map(|a| a.amount);
+        let validator = SuiAddress::from_str(stake.validator.as_ref())
+            .into_tw()
+            .context("Invalid validator address")?;
+        let gas = Self::require_coin(&stake.gas).context("No 'gas' coin specified")?;
+
+        TransactionBuilder::request_add_stake(
+            signer,
+            input_coins,
+            amount,
+            validator,
+            gas,
+            self.input.gas_budget,
+            self.input.reference_gas_price,
+        )
+    }
+
+    fn withdraw_from_proto(
+        &self,
+        withdraw: &Proto::RequestWithdrawStake<'_>,
+    ) -> SigningResult<TransactionData> {
+        let signer = self.signer_address()?;
+
+        let staked_sui =
+            Self::require_coin(&withdraw.staked_sui).context("No 'staked_sui' coin specified")?;
+        let gas = Self::require_coin(&withdraw.gas).context("No 'gas' coin specified")?;
+
+        TransactionBuilder::request_withdraw_stake(
+            signer,
+            staked_sui,
+            gas,
+            self.input.gas_budget,
+            self.input.reference_gas_price,
+        )
+    }
+
+    fn transfer_object_from_proto(
+        &self,
+        transfer_obj: &Proto::TransferObject<'_>,
+    ) -> SigningResult<TransactionData> {
+        let signer = self.signer_address()?;
+
+        let recipient = SuiAddress::from_str(&transfer_obj.recipient)
+            .into_tw()
+            .context("Invalid recipient address")?;
+        let object = Self::require_coin(&transfer_obj.object).context("No 'object' specified")?;
+        let gas = Self::require_coin(&transfer_obj.gas).context("No 'gas' coin specified")?;
+
+        TransactionBuilder::transfer_object(
+            signer,
+            object,
+            recipient,
+            gas,
+            self.input.gas_budget,
+            self.input.reference_gas_price,
+        )
+    }
+
+    fn signer_address(&self) -> SigningResult<SuiAddress> {
+        if self.input.private_key.is_empty() {
+            SuiAddress::from_str(&self.input.signer)
+                .into_tw()
+                .context("Invalid signer address")
+        } else {
+            let keypair = self.signer_key()?;
+            SuiAddress::with_ed25519_pubkey(keypair.public()).map_err(SigningError::from)
+        }
+    }
+
+    fn build_coins(coins: &[Proto::ObjectRef]) -> SigningResult<Vec<ObjectRef>> {
+        coins.iter().map(Self::build_coin).collect()
+    }
+
+    fn require_coin(maybe_coin: &Option<Proto::ObjectRef>) -> SigningResult<ObjectRef> {
+        let coin = maybe_coin
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)?;
+        Self::build_coin(coin)
+    }
+
+    fn build_coin(coin: &Proto::ObjectRef) -> SigningResult<ObjectRef> {
+        let object_id = ObjectID::from_str(coin.object_id.as_ref()).context("Invalid Object ID")?;
+        let version = SequenceNumber(coin.version);
+        let object_digest = ObjectDigest::from_str(coin.object_digest.as_ref())?;
+
+        Ok((object_id, version, object_digest))
+    }
+
+    fn parse_addresses(addresses: &[Cow<'_, str>]) -> SigningResult<Vec<SuiAddress>> {
+        let mut res = Vec::with_capacity(addresses.len());
+        for addr in addresses {
+            res.push(SuiAddress::from_str(addr.as_ref())?);
+        }
+        Ok(res)
+    }
+}
diff --git a/rust/chains/tw_sui/src/modules/tx_signer.rs b/rust/chains/tw_sui/src/modules/tx_signer.rs
new file mode 100644
index 00000000000..34eb476f48b
--- /dev/null
+++ b/rust/chains/tw_sui/src/modules/tx_signer.rs
@@ -0,0 +1,142 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SuiAddress;
+use crate::signature::SuiSignatureInfo;
+use crate::transaction::transaction_data::TransactionData;
+use serde::Serialize;
+use serde_repr::Serialize_repr;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::bcs;
+use tw_hash::blake2::blake2_b;
+use tw_hash::H256;
+use tw_keypair::ed25519;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_memory::Data;
+
+/// This enums specifies the intent scope.
+#[derive(Serialize_repr)]
+#[repr(u8)]
+pub enum IntentScope {
+    /// Used for a user signature on a transaction data.
+    TransactionData = 0,
+}
+
+/// The version here is to distinguish between signing different versions of the struct
+/// or enum. Serialized output between two different versions of the same struct/enum
+/// might accidentally (or maliciously on purpose) match.
+#[derive(Serialize_repr)]
+#[repr(u8)]
+pub enum IntentVersion {
+    V0 = 0,
+}
+
+/// This enums specifies the application ID. Two intents in two different applications
+/// (i.e., Narwhal, Sui, Ethereum etc) should never collide, so that even when a signing
+/// key is reused, nobody can take a signature designated for app_1 and present it as a
+/// valid signature for an (any) intent in app_2.
+#[derive(Serialize_repr)]
+#[repr(u8)]
+pub enum AppId {
+    Sui = 0,
+}
+
+/// An intent is a compact struct serves as the domain separator for a message that a signature commits to.
+/// It consists of three parts: [enum IntentScope] (what the type of the message is),
+/// [enum IntentVersion], [enum AppId] (what application that the signature refers to).
+/// It is used to construct [struct IntentMessage] that what a signature commits to.
+///
+/// The serialization of an Intent is a 3-byte array where each field is represented by a byte.
+#[derive(Serialize)]
+pub struct Intent {
+    pub scope: IntentScope,
+    pub version: IntentVersion,
+    pub app_id: AppId,
+}
+
+/// Intent Message is a wrapper around a message with its intent. The message can
+/// be any type that implements [trait Serialize]. *ALL* signatures in Sui must commits
+/// to the intent message, not the message itself. This guarantees any intent
+/// message signed in the system cannot collide with another since they are domain
+/// separated by intent.
+///
+/// The serialization of an IntentMessage is compact: it only appends three bytes
+/// to the message itself.
+#[derive(Serialize)]
+pub struct IntentMessage<T> {
+    pub intent: Intent,
+    pub value: T,
+}
+
+pub struct TransactionPreimage {
+    /// Transaction `bcs` encoded representation.
+    pub unsigned_tx_data: Data,
+    /// [`TransactionPreimage::unsigned_tx_data`] extended with the `IntentMessage`.
+    pub tx_data_to_sign: Data,
+    /// Hash of the [`TransactionPreimage::tx_data_to_sign`].
+    pub tx_hash_to_sign: H256,
+}
+
+pub struct TxSigner;
+
+impl TxSigner {
+    pub fn sign(
+        tx: &TransactionData,
+        signer_key: &ed25519::sha512::KeyPair,
+    ) -> SigningResult<(TransactionPreimage, SuiSignatureInfo)> {
+        let public_key = signer_key.public();
+        let signer_address = SuiAddress::with_ed25519_pubkey(public_key)?;
+        if signer_address != tx.sender() {
+            return SigningError::err(SigningErrorType::Error_missing_private_key)
+                .context("Given private key does not belong to the sender address");
+        }
+
+        let unsigned_tx_data = bcs::encode(tx)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing TransactionData")?;
+        Self::sign_direct(unsigned_tx_data, signer_key)
+    }
+
+    pub fn sign_direct(
+        unsigned_tx_data: Data,
+        signer_key: &ed25519::sha512::KeyPair,
+    ) -> SigningResult<(TransactionPreimage, SuiSignatureInfo)> {
+        let preimage = Self::preimage_direct(unsigned_tx_data)?;
+        let signature = signer_key.sign(preimage.tx_hash_to_sign.into_vec())?;
+        let signature_info = SuiSignatureInfo::ed25519(&signature, signer_key.public());
+        Ok((preimage, signature_info))
+    }
+
+    pub fn preimage(tx: &TransactionData) -> SigningResult<TransactionPreimage> {
+        let unsigned_tx_data = bcs::encode(tx)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing TransactionData")?;
+        Self::preimage_direct(unsigned_tx_data)
+    }
+
+    pub fn preimage_direct(unsigned_tx_data: Data) -> SigningResult<TransactionPreimage> {
+        let intent = Intent {
+            scope: IntentScope::TransactionData,
+            version: IntentVersion::V0,
+            app_id: AppId::Sui,
+        };
+        let intent_data = bcs::encode(&intent)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing Intent message")?;
+
+        let tx_data_to_sign: Data = intent_data
+            .into_iter()
+            .chain(unsigned_tx_data.iter().copied())
+            .collect();
+        let tx_hash_to_sign = blake2_b(&tx_data_to_sign, H256::LEN)
+            .and_then(|hash| H256::try_from(hash.as_slice()))
+            .tw_err(|_| SigningErrorType::Error_internal)?;
+
+        Ok(TransactionPreimage {
+            unsigned_tx_data,
+            tx_data_to_sign,
+            tx_hash_to_sign,
+        })
+    }
+}
diff --git a/rust/chains/tw_sui/src/signature.rs b/rust/chains/tw_sui/src/signature.rs
new file mode 100644
index 00000000000..e03aacad05f
--- /dev/null
+++ b/rust/chains/tw_sui/src/signature.rs
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::base64::{self, STANDARD};
+use tw_hash::{H256, H512};
+use tw_keypair::ed25519;
+use tw_memory::Data;
+
+#[derive(Clone, Copy)]
+#[repr(u8)]
+pub enum SignatureScheme {
+    ED25519 = 0,
+}
+
+pub struct SuiSignatureInfo {
+    scheme: SignatureScheme,
+    signature: H512,
+    public_key: H256,
+}
+
+impl SuiSignatureInfo {
+    pub fn ed25519(
+        signature: &ed25519::Signature,
+        public_key: &ed25519::sha512::PublicKey,
+    ) -> SuiSignatureInfo {
+        SuiSignatureInfo {
+            scheme: SignatureScheme::ED25519,
+            signature: signature.to_bytes(),
+            public_key: public_key.to_bytes(),
+        }
+    }
+
+    pub fn to_vec(&self) -> Data {
+        let mut scheme: Data = Vec::with_capacity(H512::LEN + H256::LEN + 1);
+        scheme.push(self.scheme as u8);
+        scheme.extend_from_slice(self.signature.as_slice());
+        scheme.extend_from_slice(self.public_key.as_slice());
+        scheme
+    }
+
+    pub fn to_base64(&self) -> String {
+        base64::encode(&self.to_vec(), STANDARD)
+    }
+}
diff --git a/rust/chains/tw_sui/src/signer.rs b/rust/chains/tw_sui/src/signer.rs
new file mode 100644
index 00000000000..4cf4df45514
--- /dev/null
+++ b/rust/chains/tw_sui/src/signer.rs
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::tx_builder::{TWTransaction, TWTransactionBuilder};
+use crate::modules::tx_signer::TxSigner;
+use std::borrow::Cow;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_encoding::base64::{self, STANDARD};
+use tw_proto::Sui::Proto;
+
+pub struct SuiSigner;
+
+impl SuiSigner {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let builder = TWTransactionBuilder::new(input);
+        let signer_key = builder.signer_key()?;
+        let tx_to_sign = builder.build()?;
+
+        let (preimage, signature) = match tx_to_sign {
+            TWTransaction::Transaction(tx) => TxSigner::sign(&tx, &signer_key)?,
+            TWTransaction::SignDirect(tx_data) => TxSigner::sign_direct(tx_data, &signer_key)?,
+        };
+
+        let unsigned_tx = base64::encode(&preimage.unsigned_tx_data, STANDARD);
+        Ok(Proto::SigningOutput {
+            unsigned_tx: Cow::from(unsigned_tx),
+            signature: Cow::from(signature.to_base64()),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_sui/src/transaction/command.rs b/rust/chains/tw_sui/src/transaction/command.rs
new file mode 100644
index 00000000000..533c0be3df2
--- /dev/null
+++ b/rust/chains/tw_sui/src/transaction/command.rs
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::sui_types::ObjectID;
+use move_core_types::identifier::Identifier;
+use move_core_types::language_storage::TypeTag;
+use serde::{Deserialize, Serialize};
+
+/// A single command in a programmable transaction.
+#[derive(Debug, Deserialize, Serialize)]
+pub enum Command {
+    /// A call to either an entry or a public Move function
+    MoveCall(Box<ProgrammableMoveCall>),
+    /// `(Vec<forall T:key+store. T>, address)`
+    /// It sends n-objects to the specified address. These objects must have store
+    /// (public transfer) and either the previous owner must be an address or the object must
+    /// be newly created.
+    TransferObjects(Vec<Argument>, Argument),
+    /// `(&mut Coin<T>, Vec<u64>)` -> `Vec<Coin<T>>`
+    /// It splits off some amounts into a new coins with those amounts
+    SplitCoins(Argument, Vec<Argument>),
+    /// `(&mut Coin<T>, Vec<Coin<T>>)`
+    /// It merges n-coins into the first coin
+    MergeCoins(Argument, Vec<Argument>),
+    /// Publishes a Move package. It takes the package bytes and a list of the package's transitive
+    /// dependencies to link against on-chain.
+    Publish(Vec<Vec<u8>>, Vec<ObjectID>),
+    /// `forall T: Vec<T> -> vector<T>`
+    /// Given n-values of the same type, it constructs a vector. For non objects or an empty vector,
+    /// the type tag must be specified.
+    MakeMoveVec(Option<TypeTag>, Vec<Argument>),
+}
+
+impl Command {
+    pub fn move_call(
+        package: ObjectID,
+        module: Identifier,
+        function: Identifier,
+        type_arguments: Vec<TypeTag>,
+        arguments: Vec<Argument>,
+    ) -> Self {
+        Command::MoveCall(Box::new(ProgrammableMoveCall {
+            package,
+            module,
+            function,
+            type_arguments,
+            arguments,
+        }))
+    }
+}
+
+/// The command for calling a Move function, either an entry function or a public
+/// function (which cannot return references).
+#[derive(Debug, Deserialize, Serialize)]
+pub struct ProgrammableMoveCall {
+    /// The package containing the module and function.
+    pub package: ObjectID,
+    /// The specific module in the package containing the function.
+    pub module: Identifier,
+    /// The function to be called.
+    pub function: Identifier,
+    /// The type arguments to the function.
+    pub type_arguments: Vec<TypeTag>,
+    /// The arguments to the function.
+    pub arguments: Vec<Argument>,
+}
+
+/// An argument to a programmable transaction command
+#[derive(Clone, Copy, Debug, Deserialize, Serialize)]
+pub enum Argument {
+    /// The gas coin. The gas coin can only be used by-ref, except for with
+    /// `TransferObjects`, which can use it by-value.
+    GasCoin,
+    /// One of the input objects or primitive values (from
+    /// `ProgrammableTransaction` inputs)
+    Input(u16),
+    /// The result of another command (from `ProgrammableTransaction` commands)
+    Result(u16),
+    /// Like a `Result` but it accesses a nested result. Currently, the only usage
+    /// of this is to access a value from a Move call with multiple return values.
+    NestedResult(u16, u16),
+}
diff --git a/rust/chains/tw_sui/src/transaction/mod.rs b/rust/chains/tw_sui/src/transaction/mod.rs
new file mode 100644
index 00000000000..46b7c4a5cf0
--- /dev/null
+++ b/rust/chains/tw_sui/src/transaction/mod.rs
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod command;
+pub mod programmable_transaction;
+pub mod sui_types;
+pub mod transaction_builder;
+pub mod transaction_data;
diff --git a/rust/chains/tw_sui/src/transaction/programmable_transaction.rs b/rust/chains/tw_sui/src/transaction/programmable_transaction.rs
new file mode 100644
index 00000000000..82445cae86e
--- /dev/null
+++ b/rust/chains/tw_sui/src/transaction/programmable_transaction.rs
@@ -0,0 +1,249 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SuiAddress;
+use crate::transaction::command::{Argument, Command};
+use crate::transaction::sui_types::{CallArg, ObjectArg, ObjectID, ObjectRef};
+use indexmap::IndexMap;
+use move_core_types::identifier::Identifier;
+use move_core_types::language_storage::TypeTag;
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::bcs;
+
+/// A series of commands where the results of one command can be used in future
+/// commands
+#[derive(Debug, Deserialize, Serialize)]
+pub struct ProgrammableTransaction {
+    /// Input objects or primitive values
+    pub inputs: Vec<CallArg>,
+    /// The commands to be executed sequentially. A failure in any command will
+    /// result in the failure of the entire transaction.
+    pub commands: Vec<Command>,
+}
+
+#[derive(Eq, Hash, PartialEq)]
+enum BuilderArg {
+    Object(ObjectID),
+    Pure(Vec<u8>),
+    ForcedNonUniquePure(usize),
+}
+
+#[derive(Default)]
+pub struct ProgrammableTransactionBuilder {
+    inputs: IndexMap<BuilderArg, CallArg>,
+    commands: Vec<Command>,
+}
+
+impl ProgrammableTransactionBuilder {
+    pub fn finish(self) -> ProgrammableTransaction {
+        let Self { inputs, commands } = self;
+        let inputs = inputs.into_values().collect();
+        ProgrammableTransaction { inputs, commands }
+    }
+
+    /// Will fail to generate if recipients and amounts do not have the same lengths.
+    /// Or if coins is empty
+    pub fn pay(
+        &mut self,
+        coins: Vec<ObjectRef>,
+        recipients: Vec<SuiAddress>,
+        amounts: Vec<u64>,
+    ) -> SigningResult<()> {
+        let mut coins = coins.into_iter();
+        let Some(coin) = coins.next() else {
+            // coins vector is empty
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No coins provided");
+        };
+        let coin_arg = self.obj(ObjectArg::ImmOrOwnedObject(coin))?;
+        let merge_args: Vec<_> = coins
+            .map(|c| self.obj(ObjectArg::ImmOrOwnedObject(c)))
+            .collect::<Result<_, _>>()?;
+        if !merge_args.is_empty() {
+            self.command(Command::MergeCoins(coin_arg, merge_args));
+        }
+        self.pay_impl(recipients, amounts, coin_arg)
+    }
+
+    /// Will fail to generate if recipients and amounts do not have the same lengths
+    pub fn pay_sui(&mut self, recipients: Vec<SuiAddress>, amounts: Vec<u64>) -> SigningResult<()> {
+        self.pay_impl(recipients, amounts, Argument::GasCoin)
+    }
+
+    pub fn pay_all_sui(&mut self, recipient: SuiAddress) {
+        let rec_arg = self.pure(recipient).unwrap();
+        self.command(Command::TransferObjects(vec![Argument::GasCoin], rec_arg));
+    }
+
+    pub fn transfer_object(
+        &mut self,
+        recipient: SuiAddress,
+        object_ref: ObjectRef,
+    ) -> SigningResult<()> {
+        let rec_arg = self.pure(recipient).unwrap();
+        let obj_arg = self.obj(ObjectArg::ImmOrOwnedObject(object_ref));
+        self.commands
+            .push(Command::TransferObjects(vec![obj_arg?], rec_arg));
+        Ok(())
+    }
+
+    /// Will fail to generate if given an empty ObjVec
+    pub fn move_call(
+        &mut self,
+        package: ObjectID,
+        module: Identifier,
+        function: Identifier,
+        type_arguments: Vec<TypeTag>,
+        call_args: Vec<CallArg>,
+    ) -> SigningResult<()> {
+        let arguments = call_args
+            .into_iter()
+            .map(|a| self.input(a))
+            .collect::<SigningResult<_>>()?;
+        self.command(Command::move_call(
+            package,
+            module,
+            function,
+            type_arguments,
+            arguments,
+        ));
+        Ok(())
+    }
+
+    pub fn input(&mut self, call_arg: CallArg) -> SigningResult<Argument> {
+        match call_arg {
+            CallArg::Pure(bytes) => {
+                let force_separate = false;
+                Ok(self.pure_bytes(bytes, force_separate))
+            },
+            CallArg::Object(obj) => self.obj(obj),
+        }
+    }
+
+    pub fn pure_bytes(&mut self, bytes: Vec<u8>, force_separate: bool) -> Argument {
+        let arg = if force_separate {
+            BuilderArg::ForcedNonUniquePure(self.inputs.len())
+        } else {
+            BuilderArg::Pure(bytes.clone())
+        };
+        let (i, _) = self.inputs.insert_full(arg, CallArg::Pure(bytes));
+        Argument::Input(i as u16)
+    }
+
+    pub fn pure<T: Serialize>(&mut self, value: T) -> SigningResult<Argument> {
+        let force_separate = false;
+        Ok(self.pure_bytes(bcs::encode(&value)?, force_separate))
+    }
+
+    pub fn obj(&mut self, obj_arg: ObjectArg) -> SigningResult<Argument> {
+        let id = obj_arg.id();
+        let obj_arg = if let Some(old_value) = self.inputs.get(&BuilderArg::Object(id)) {
+            let old_obj_arg = match old_value {
+                CallArg::Pure(_) => {
+                    return SigningError::err(SigningErrorType::Error_internal)
+                        .context("Expected Object, found Pure")
+                },
+                CallArg::Object(arg) => arg,
+            };
+            match (old_obj_arg, obj_arg) {
+                (
+                    ObjectArg::SharedObject {
+                        id: id1,
+                        initial_shared_version: v1,
+                        mutable: mut1,
+                    },
+                    ObjectArg::SharedObject {
+                        id: id2,
+                        initial_shared_version: v2,
+                        mutable: mut2,
+                    },
+                ) if v1 == &v2 => {
+                    if id1 != &id2 || id != id2 {
+                        // "invariant violation! object has id does not match call arg"
+                        return SigningError::err(SigningErrorType::Error_internal)
+                            .context("invariant violation! object has id does not match call arg");
+                    }
+                    ObjectArg::SharedObject {
+                        id,
+                        initial_shared_version: v2,
+                        mutable: *mut1 || mut2,
+                    }
+                },
+                (old_obj_arg, obj_arg) => {
+                    if old_obj_arg != &obj_arg {
+                        return SigningError::err(SigningErrorType::Error_internal)
+                            .with_context(|| format!("Mismatched Object argument kind for object {id:?}. {old_value:?} is not compatible with {obj_arg:?}"));
+                    }
+                    obj_arg
+                },
+            }
+        } else {
+            obj_arg
+        };
+        let (i, _) = self
+            .inputs
+            .insert_full(BuilderArg::Object(id), CallArg::Object(obj_arg));
+        Ok(Argument::Input(i as u16))
+    }
+
+    pub fn make_obj_vec(
+        &mut self,
+        objs: impl IntoIterator<Item = ObjectArg>,
+    ) -> SigningResult<Argument> {
+        let make_vec_args = objs
+            .into_iter()
+            .map(|obj| self.obj(obj))
+            .collect::<SigningResult<_>>()?;
+        Ok(self.command(Command::MakeMoveVec(None, make_vec_args)))
+    }
+
+    pub fn command(&mut self, command: Command) -> Argument {
+        let i = self.commands.len();
+        self.commands.push(command);
+        Argument::Result(i as u16)
+    }
+
+    fn pay_impl(
+        &mut self,
+        recipients: Vec<SuiAddress>,
+        amounts: Vec<u64>,
+        coin: Argument,
+    ) -> SigningResult<()> {
+        if recipients.len() != amounts.len() {
+            // "Recipients and amounts mismatch. Got {} recipients but {} amounts"
+            return SigningError::err(SigningErrorType::Error_invalid_params).with_context(|| {
+                let recipients_num = recipients.len();
+                let amounts_num = amounts.len();
+                format!("Recipients and amounts mismatch. Got {recipients_num} recipients but {amounts_num} amounts")
+            });
+        }
+        if amounts.is_empty() {
+            return Ok(());
+        }
+
+        // collect recipients in the case where they are non-unique in order
+        // to minimize the number of transfers that must be performed
+        let mut recipient_map: IndexMap<SuiAddress, Vec<usize>> = IndexMap::new();
+        let mut amt_args = vec![];
+        for (i, (recipient, amount)) in recipients.into_iter().zip(amounts).enumerate() {
+            recipient_map.entry(recipient).or_default().push(i);
+            amt_args.push(self.pure(amount)?);
+        }
+        let Argument::Result(split_primary) = self.command(Command::SplitCoins(coin, amt_args))
+        else {
+            return SigningError::err(SigningErrorType::Error_internal)
+                .context("self.command should always give an Argument::Result");
+        };
+        for (recipient, split_secondaries) in recipient_map {
+            let rec_arg = self.pure(recipient).unwrap();
+            let coins = split_secondaries
+                .into_iter()
+                .map(|j| Argument::NestedResult(split_primary, j as u16))
+                .collect();
+            self.command(Command::TransferObjects(coins, rec_arg));
+        }
+        Ok(())
+    }
+}
diff --git a/rust/chains/tw_sui/src/transaction/sui_types.rs b/rust/chains/tw_sui/src/transaction/sui_types.rs
new file mode 100644
index 00000000000..1948789adf9
--- /dev/null
+++ b/rust/chains/tw_sui/src/transaction/sui_types.rs
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SuiAddress;
+use crate::constants::{SUI_SYSTEM_STATE_OBJECT_ID, SUI_SYSTEM_STATE_OBJECT_SHARED_VERSION};
+use move_core_types::account_address::AccountAddress;
+use serde::{Deserialize, Serialize};
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base58::{self, Alphabet};
+use tw_hash::{as_bytes, H256};
+use tw_memory::Data;
+
+pub type ObjectRef = (ObjectID, SequenceNumber, ObjectDigest);
+pub type EpochId = u64;
+
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
+pub struct SequenceNumber(pub u64);
+
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub struct ObjectID(pub AccountAddress);
+
+impl FromStr for ObjectID {
+    type Err = SigningError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let addr = SuiAddress::from_str(s)
+            .into_tw()
+            .context("Invalid Object ID")?;
+        Ok(ObjectID(addr.into_inner()))
+    }
+}
+
+#[derive(Clone, Copy, Debug, Deserialize, Eq, Hash, PartialEq, Serialize)]
+pub struct ObjectDigest(#[serde(with = "as_bytes")] pub H256);
+
+impl FromStr for ObjectDigest {
+    type Err = SigningError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let bytes = base58::decode(s, Alphabet::Bitcoin)
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid Object Digest: expected valid base58 string")?;
+        H256::try_from(bytes.as_slice())
+            .map(ObjectDigest)
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid Object Digest: expected exactly 32 bytes")
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub enum CallArg {
+    // contains no structs or objects
+    Pure(Data),
+    // an object
+    Object(ObjectArg),
+}
+
+impl CallArg {
+    pub const SUI_SYSTEM_MUT: Self = Self::Object(ObjectArg::SUI_SYSTEM_MUT);
+}
+
+#[derive(Debug, Deserialize, PartialEq, Serialize)]
+pub enum ObjectArg {
+    // A Move object, either immutable, or owned mutable.
+    ImmOrOwnedObject(ObjectRef),
+    // A Move object that's shared.
+    // SharedObject::mutable controls whether caller asks for a mutable reference to shared object.
+    SharedObject {
+        id: ObjectID,
+        initial_shared_version: SequenceNumber,
+        mutable: bool,
+    },
+}
+
+impl ObjectArg {
+    pub const SUI_SYSTEM_MUT: Self = Self::SharedObject {
+        id: SUI_SYSTEM_STATE_OBJECT_ID,
+        initial_shared_version: SUI_SYSTEM_STATE_OBJECT_SHARED_VERSION,
+        mutable: true,
+    };
+
+    pub fn id(&self) -> ObjectID {
+        match self {
+            ObjectArg::ImmOrOwnedObject((id, _, _)) | ObjectArg::SharedObject { id, .. } => *id,
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct GasData {
+    pub payment: Vec<ObjectRef>,
+    pub owner: SuiAddress,
+    pub price: u64,
+    pub budget: u64,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub enum TransactionExpiration {
+    /// The transaction has no expiration
+    None,
+    /// Validators wont sign a transaction unless the expiration Epoch
+    /// is greater than or equal to the current epoch
+    Epoch(EpochId),
+}
diff --git a/rust/chains/tw_sui/src/transaction/transaction_builder.rs b/rust/chains/tw_sui/src/transaction/transaction_builder.rs
new file mode 100644
index 00000000000..3c7309013fb
--- /dev/null
+++ b/rust/chains/tw_sui/src/transaction/transaction_builder.rs
@@ -0,0 +1,186 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SuiAddress;
+use crate::constants::{
+    ADD_STAKE_MUL_COIN_FUN_NAME, SUI_SYSTEM_MODULE_NAME, SUI_SYSTEM_PACKAGE_ID,
+    WITHDRAW_STAKE_FUN_NAME,
+};
+use crate::transaction::command::Command;
+use crate::transaction::programmable_transaction::ProgrammableTransactionBuilder;
+use crate::transaction::sui_types::{CallArg, ObjectArg, ObjectRef};
+use crate::transaction::transaction_data::{TransactionData, TransactionKind};
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::bcs;
+
+pub struct TransactionBuilder;
+
+impl TransactionBuilder {
+    pub fn request_add_stake(
+        signer: SuiAddress,
+        coins: Vec<ObjectRef>,
+        amount: Option<u64>,
+        validator: SuiAddress,
+        gas: ObjectRef,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<TransactionData> {
+        let obj_vec: Vec<_> = coins.into_iter().map(ObjectArg::ImmOrOwnedObject).collect();
+
+        let pt = {
+            let mut builder = ProgrammableTransactionBuilder::default();
+            let arguments = vec![
+                builder.input(CallArg::SUI_SYSTEM_MUT).unwrap(),
+                builder.make_obj_vec(obj_vec)?,
+                builder.input(CallArg::Pure(bcs::encode(&amount)?)).unwrap(),
+                builder
+                    .input(CallArg::Pure(bcs::encode(&validator)?))
+                    .unwrap(),
+            ];
+            builder.command(Command::move_call(
+                SUI_SYSTEM_PACKAGE_ID,
+                SUI_SYSTEM_MODULE_NAME.to_owned(),
+                ADD_STAKE_MUL_COIN_FUN_NAME.to_owned(),
+                vec![],
+                arguments,
+            ));
+            builder.finish()
+        };
+        Ok(TransactionData::new_programmable(
+            signer,
+            vec![gas],
+            pt,
+            gas_budget,
+            gas_price,
+        ))
+    }
+
+    pub fn request_withdraw_stake(
+        signer: SuiAddress,
+        staked_sui: ObjectRef,
+        gas: ObjectRef,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<TransactionData> {
+        TransactionData::new_move_call(
+            signer,
+            SUI_SYSTEM_PACKAGE_ID,
+            SUI_SYSTEM_MODULE_NAME.to_owned(),
+            WITHDRAW_STAKE_FUN_NAME.to_owned(),
+            vec![],
+            gas,
+            vec![
+                CallArg::SUI_SYSTEM_MUT,
+                CallArg::Object(ObjectArg::ImmOrOwnedObject(staked_sui)),
+            ],
+            gas_budget,
+            gas_price,
+        )
+    }
+
+    /// Send `Coin<T>` to a list of addresses, where T can be any coin type, following a list of amounts.
+    /// The object specified in the gas field will be used to pay the gas fee for the transaction.
+    /// The gas object can not appear in input_coins.
+    /// https://docs.sui.io/sui-api-ref#unsafe_pay
+    #[allow(clippy::too_many_arguments)]
+    pub fn pay(
+        signer: SuiAddress,
+        input_coins: Vec<ObjectRef>,
+        recipients: Vec<SuiAddress>,
+        amounts: Vec<u64>,
+        gas: ObjectRef,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<TransactionData> {
+        if input_coins.iter().any(|coin| coin.0 == gas.0) {
+            return SigningError::err(SigningErrorType::Error_invalid_params).context(
+                "Gas coin is in input coins of Pay transaction, use PaySui transaction instead!",
+            );
+        }
+
+        TransactionData::new_pay(
+            signer,
+            input_coins,
+            recipients,
+            amounts,
+            gas,
+            gas_budget,
+            gas_price,
+        )
+    }
+
+    /// Send SUI coins to a list of addresses, following a list of amounts.
+    /// This is for SUI coin only and does not require a separate gas coin object.
+    /// https://docs.sui.io/sui-api-ref#unsafe_paysui
+    pub fn pay_sui(
+        signer: SuiAddress,
+        mut input_coins: Vec<ObjectRef>,
+        recipients: Vec<SuiAddress>,
+        amounts: Vec<u64>,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<TransactionData> {
+        if input_coins.is_empty() {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Empty input coins for Pay related transaction");
+        }
+
+        let gas_object_ref = input_coins.remove(0);
+        TransactionData::new_pay_sui(
+            signer,
+            input_coins,
+            recipients,
+            amounts,
+            gas_object_ref,
+            gas_budget,
+            gas_price,
+        )
+    }
+
+    /// Send all SUI coins to one recipient.
+    /// This is for SUI coin only and does not require a separate gas coin object.
+    /// https://docs.sui.io/sui-api-ref#unsafe_payallsui
+    pub fn pay_all_sui(
+        signer: SuiAddress,
+        mut input_coins: Vec<ObjectRef>,
+        recipient: SuiAddress,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<TransactionData> {
+        if input_coins.is_empty() {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Empty input coins for Pay related transaction");
+        }
+
+        let gas_object_ref = input_coins.remove(0);
+        Ok(TransactionData::new_pay_all_sui(
+            signer,
+            input_coins,
+            recipient,
+            gas_object_ref,
+            gas_budget,
+            gas_price,
+        ))
+    }
+
+    pub fn transfer_object(
+        signer: SuiAddress,
+        object: ObjectRef,
+        recipient: SuiAddress,
+        gas: ObjectRef,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<TransactionData> {
+        let mut builder = ProgrammableTransactionBuilder::default();
+        builder.transfer_object(recipient, object)?;
+
+        Ok(TransactionData::new(
+            TransactionKind::ProgrammableTransaction(builder.finish()),
+            signer,
+            gas,
+            gas_budget,
+            gas_price,
+        ))
+    }
+}
diff --git a/rust/chains/tw_sui/src/transaction/transaction_data.rs b/rust/chains/tw_sui/src/transaction/transaction_data.rs
new file mode 100644
index 00000000000..bfe18fa4e3a
--- /dev/null
+++ b/rust/chains/tw_sui/src/transaction/transaction_data.rs
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::SuiAddress;
+use crate::transaction::programmable_transaction::{
+    ProgrammableTransaction, ProgrammableTransactionBuilder,
+};
+use crate::transaction::sui_types::{CallArg, GasData, ObjectID, ObjectRef, TransactionExpiration};
+use move_core_types::identifier::Identifier;
+use move_core_types::language_storage::TypeTag;
+use serde::{Deserialize, Serialize};
+use tw_coin_entry::error::prelude::*;
+
+#[derive(Debug, Deserialize, Serialize)]
+pub enum TransactionData {
+    V1(TransactionDataV1),
+}
+
+impl TransactionData {
+    #[inline]
+    pub fn new(
+        kind: TransactionKind,
+        sender: SuiAddress,
+        gas_payment: ObjectRef,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> Self {
+        TransactionData::V1(TransactionDataV1 {
+            kind,
+            sender,
+            gas_data: GasData {
+                price: gas_price,
+                owner: sender,
+                payment: vec![gas_payment],
+                budget: gas_budget,
+            },
+            expiration: TransactionExpiration::None,
+        })
+    }
+
+    #[inline]
+    pub fn new_programmable(
+        sender: SuiAddress,
+        gas_payment: Vec<ObjectRef>,
+        pt: ProgrammableTransaction,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> Self {
+        Self::new_programmable_allow_sponsor(sender, gas_payment, pt, gas_budget, gas_price, sender)
+    }
+
+    #[inline]
+    pub fn new_programmable_allow_sponsor(
+        sender: SuiAddress,
+        gas_payment: Vec<ObjectRef>,
+        pt: ProgrammableTransaction,
+        gas_budget: u64,
+        gas_price: u64,
+        sponsor: SuiAddress,
+    ) -> Self {
+        let kind = TransactionKind::ProgrammableTransaction(pt);
+        Self::new_with_gas_coins_allow_sponsor(
+            kind,
+            sender,
+            gas_payment,
+            gas_budget,
+            gas_price,
+            sponsor,
+        )
+    }
+
+    #[inline]
+    pub fn new_with_gas_coins_allow_sponsor(
+        kind: TransactionKind,
+        sender: SuiAddress,
+        gas_payment: Vec<ObjectRef>,
+        gas_budget: u64,
+        gas_price: u64,
+        gas_sponsor: SuiAddress,
+    ) -> Self {
+        TransactionData::V1(TransactionDataV1 {
+            kind,
+            sender,
+            gas_data: GasData {
+                price: gas_price,
+                owner: gas_sponsor,
+                payment: gas_payment,
+                budget: gas_budget,
+            },
+            expiration: TransactionExpiration::None,
+        })
+    }
+
+    pub fn new_pay(
+        sender: SuiAddress,
+        coins: Vec<ObjectRef>,
+        recipients: Vec<SuiAddress>,
+        amounts: Vec<u64>,
+        gas_payment: ObjectRef,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<Self> {
+        let pt = {
+            let mut builder = ProgrammableTransactionBuilder::default();
+            builder.pay(coins, recipients, amounts)?;
+            builder.finish()
+        };
+        Ok(Self::new_programmable(
+            sender,
+            vec![gas_payment],
+            pt,
+            gas_budget,
+            gas_price,
+        ))
+    }
+
+    pub fn new_pay_sui(
+        sender: SuiAddress,
+        mut coins: Vec<ObjectRef>,
+        recipients: Vec<SuiAddress>,
+        amounts: Vec<u64>,
+        gas_payment: ObjectRef,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<Self> {
+        coins.insert(0, gas_payment);
+        let pt = {
+            let mut builder = ProgrammableTransactionBuilder::default();
+            builder.pay_sui(recipients, amounts)?;
+            builder.finish()
+        };
+        Ok(Self::new_programmable(
+            sender, coins, pt, gas_budget, gas_price,
+        ))
+    }
+
+    pub fn new_pay_all_sui(
+        sender: SuiAddress,
+        mut coins: Vec<ObjectRef>,
+        recipient: SuiAddress,
+        gas_payment: ObjectRef,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> Self {
+        coins.insert(0, gas_payment);
+        let pt = {
+            let mut builder = ProgrammableTransactionBuilder::default();
+            builder.pay_all_sui(recipient);
+            builder.finish()
+        };
+        Self::new_programmable(sender, coins, pt, gas_budget, gas_price)
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_move_call(
+        sender: SuiAddress,
+        package: ObjectID,
+        module: Identifier,
+        function: Identifier,
+        type_arguments: Vec<TypeTag>,
+        gas_payment: ObjectRef,
+        arguments: Vec<CallArg>,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<Self> {
+        Self::new_move_call_with_gas_coins(
+            sender,
+            package,
+            module,
+            function,
+            type_arguments,
+            vec![gas_payment],
+            arguments,
+            gas_budget,
+            gas_price,
+        )
+    }
+
+    #[allow(clippy::too_many_arguments)]
+    pub fn new_move_call_with_gas_coins(
+        sender: SuiAddress,
+        package: ObjectID,
+        module: Identifier,
+        function: Identifier,
+        type_arguments: Vec<TypeTag>,
+        gas_payment: Vec<ObjectRef>,
+        arguments: Vec<CallArg>,
+        gas_budget: u64,
+        gas_price: u64,
+    ) -> SigningResult<Self> {
+        let pt = {
+            let mut builder = ProgrammableTransactionBuilder::default();
+            builder.move_call(package, module, function, type_arguments, arguments)?;
+            builder.finish()
+        };
+        Ok(Self::new_programmable(
+            sender,
+            gas_payment,
+            pt,
+            gas_budget,
+            gas_price,
+        ))
+    }
+
+    pub fn sender(&self) -> SuiAddress {
+        match self {
+            TransactionData::V1(v1) => v1.sender,
+        }
+    }
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct TransactionDataV1 {
+    pub kind: TransactionKind,
+    pub sender: SuiAddress,
+    pub gas_data: GasData,
+    pub expiration: TransactionExpiration,
+}
+
+#[derive(Debug, Deserialize, Serialize)]
+pub enum TransactionKind {
+    /// A transaction that allows the interleaving of native commands and Move calls
+    ProgrammableTransaction(ProgrammableTransaction),
+}
diff --git a/rust/chains/tw_sui/tests/decode_transaction.rs b/rust/chains/tw_sui/tests/decode_transaction.rs
new file mode 100644
index 00000000000..4b2c8c4a370
--- /dev/null
+++ b/rust/chains/tw_sui/tests/decode_transaction.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+use tw_encoding::base64::{self, STANDARD};
+use tw_encoding::bcs;
+use tw_encoding::hex::DecodeHex;
+use tw_sui::address::SuiAddress;
+use tw_sui::transaction::command::{Argument, Command};
+use tw_sui::transaction::programmable_transaction::ProgrammableTransaction;
+use tw_sui::transaction::sui_types::{
+    CallArg, GasData, ObjectDigest, ObjectID, SequenceNumber, TransactionExpiration,
+};
+use tw_sui::transaction::transaction_data::{TransactionData, TransactionDataV1, TransactionKind};
+
+#[test]
+fn test_decode_transfer_tx() {
+    let programmable = ProgrammableTransaction {
+        inputs: vec![
+            CallArg::Pure("1027000000000000".decode_hex().unwrap()),
+            CallArg::Pure(
+                "259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015"
+                    .decode_hex()
+                    .unwrap(),
+            ),
+        ],
+        commands: vec![
+            Command::SplitCoins(Argument::GasCoin, vec![Argument::Input(0)]),
+            Command::TransferObjects(vec![Argument::NestedResult(0, 0)], Argument::Input(1)),
+        ],
+    };
+
+    let v1 = TransactionDataV1 {
+        kind: TransactionKind::ProgrammableTransaction(programmable),
+        sender: SuiAddress::from_str(
+            "0xd575ad7f18e948462a5cf698f564ef394a752a71fec62493af8a055c012c0d50",
+        )
+        .unwrap(),
+        gas_data: GasData {
+            payment: vec![(
+                ObjectID(
+                    SuiAddress::from_str(
+                        "0x06f2c2c8c1d8964df1019d6616e9705719bebabd931da2755cb948ceb7e68964",
+                    )
+                    .unwrap()
+                    .into_inner(),
+                ),
+                SequenceNumber(748),
+                ObjectDigest::from_str("7UoYeVzREVT17ZyYbRTsKzRCec5xJWm6FMh8AKaDPdDx").unwrap(),
+            )],
+            owner: SuiAddress::from_str(
+                "0xd575ad7f18e948462a5cf698f564ef394a752a71fec62493af8a055c012c0d50",
+            )
+            .unwrap(),
+            price: 1,
+            budget: 2000,
+        },
+        expiration: TransactionExpiration::None,
+    };
+    let data = TransactionData::V1(v1);
+
+    let bytes = base64::encode(&bcs::encode(&data).unwrap(), STANDARD);
+    // Successfully broadcasted https://explorer.sui.io/txblock/HkPo6rYPyDY53x1MBszvSZVZyixVN7CHvCJGX381czAh?network=devnet
+    assert_eq!(bytes, "AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA");
+}
diff --git a/rust/chains/tw_thorchain/Cargo.toml b/rust/chains/tw_thorchain/Cargo.toml
new file mode 100644
index 00000000000..a39bc4d7c80
--- /dev/null
+++ b/rust/chains/tw_thorchain/Cargo.toml
@@ -0,0 +1,14 @@
+[package]
+name = "tw_thorchain"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_proto = { path = "../../tw_proto" }
+
+[dev-dependencies]
+tw_cosmos_sdk = { path = "../../tw_cosmos_sdk", features = ["test-utils"] }
diff --git a/rust/chains/tw_thorchain/src/compiler.rs b/rust/chains/tw_thorchain/src/compiler.rs
new file mode 100644
index 00000000000..7e3e81ad090
--- /dev/null
+++ b/rust/chains/tw_thorchain/src/compiler.rs
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::signing_input::ThorchainSigningInput;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::modules::compiler::tw_compiler::TWTransactionCompiler;
+use tw_proto::Cosmos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct ThorchainCompiler;
+
+impl ThorchainCompiler {
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        mut input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        ThorchainSigningInput::prepare_signing_input(&mut input);
+        TWTransactionCompiler::<StandardCosmosContext>::preimage_hashes(coin, input)
+    }
+
+    pub fn compile(
+        coin: &dyn CoinContext,
+        mut input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        ThorchainSigningInput::prepare_signing_input(&mut input);
+        TWTransactionCompiler::<StandardCosmosContext>::compile(
+            coin,
+            input,
+            signatures,
+            public_keys,
+        )
+    }
+}
diff --git a/rust/chains/tw_thorchain/src/entry.rs b/rust/chains/tw_thorchain/src/entry.rs
new file mode 100644
index 00000000000..5baa749c894
--- /dev/null
+++ b/rust/chains/tw_thorchain/src/entry.rs
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::compiler::ThorchainCompiler;
+use crate::signer::ThorchainSigner;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::transaction_util::NoTransactionUtil;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_cosmos_sdk::address::{Address, Bech32Prefix};
+use tw_keypair::tw;
+use tw_proto::Cosmos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct ThorchainEntry;
+
+impl CoinEntry for ThorchainEntry {
+    type AddressPrefix = Bech32Prefix;
+    type Address = Address;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = NoTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::from_str_with_coin_and_prefix(coin, address.to_string(), prefix)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        Address::from_str(address)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: tw::PublicKey,
+        _derivation: Derivation,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        Address::with_public_key_coin_context(coin, &public_key, prefix)
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        ThorchainSigner::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        ThorchainCompiler::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        ThorchainCompiler::compile(coin, input, signatures, public_keys)
+    }
+}
diff --git a/rust/chains/tw_thorchain/src/lib.rs b/rust/chains/tw_thorchain/src/lib.rs
new file mode 100644
index 00000000000..9abacf4dfac
--- /dev/null
+++ b/rust/chains/tw_thorchain/src/lib.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod compiler;
+pub mod entry;
+pub mod signer;
+pub mod signing_input;
diff --git a/rust/chains/tw_thorchain/src/signer.rs b/rust/chains/tw_thorchain/src/signer.rs
new file mode 100644
index 00000000000..7346be163af
--- /dev/null
+++ b/rust/chains/tw_thorchain/src/signer.rs
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::signing_input::ThorchainSigningInput;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::modules::signer::tw_signer::TWSigner;
+use tw_proto::Cosmos::Proto;
+
+pub struct ThorchainSigner;
+
+impl ThorchainSigner {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        mut input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        ThorchainSigningInput::prepare_signing_input(&mut input);
+        TWSigner::<StandardCosmosContext>::sign(coin, input)
+    }
+}
diff --git a/rust/chains/tw_thorchain/src/signing_input.rs b/rust/chains/tw_thorchain/src/signing_input.rs
new file mode 100644
index 00000000000..429a62a6434
--- /dev/null
+++ b/rust/chains/tw_thorchain/src/signing_input.rs
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+const THORCHAIN_PREFIX_MSG_SEND: &str = "thorchain/MsgSend";
+
+pub struct ThorchainSigningInput;
+
+impl ThorchainSigningInput {
+    pub fn prepare_signing_input(input: &mut Proto::SigningInput) {
+        for message in input.messages.iter_mut() {
+            if let MessageEnum::send_coins_message(ref mut msg_send) = message.message_oneof {
+                msg_send.type_prefix = Cow::from(THORCHAIN_PREFIX_MSG_SEND);
+            }
+        }
+    }
+}
diff --git a/rust/chains/tw_ton/Cargo.toml b/rust/chains/tw_ton/Cargo.toml
new file mode 100644
index 00000000000..076a7d84f61
--- /dev/null
+++ b/rust/chains/tw_ton/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "tw_ton"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+lazy_static = "1.4.0"
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_number = { path = "../../tw_number" }
+tw_misc = { path = "../../tw_misc" }
+tw_proto = { path = "../../tw_proto" }
+tw_ton_sdk = { path = "../../frameworks/tw_ton_sdk" }
diff --git a/rust/chains/tw_ton/fuzz/.gitignore b/rust/chains/tw_ton/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/chains/tw_ton/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/chains/tw_ton/fuzz/Cargo.toml b/rust/chains/tw_ton/fuzz/Cargo.toml
new file mode 100644
index 00000000000..671fc399a02
--- /dev/null
+++ b/rust/chains/tw_ton/fuzz/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "tw_ton-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+tw_any_coin = { path = "../../../tw_any_coin", features = ["test-utils"] }
+tw_coin_registry = { path = "../../../tw_coin_registry" }
+tw_proto = { path = "../../../tw_proto", features = ["fuzz"] }
+
+[dependencies.tw_ton]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "sign"
+path = "fuzz_targets/sign.rs"
+test = false
+doc = false
diff --git a/rust/chains/tw_ton/fuzz/fuzz_targets/sign.rs b/rust/chains/tw_ton/fuzz/fuzz_targets/sign.rs
new file mode 100644
index 00000000000..4c2a190be6a
--- /dev/null
+++ b/rust/chains/tw_ton/fuzz/fuzz_targets/sign.rs
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_proto::TheOpenNetwork::Proto;
+
+fuzz_target!(|input: Proto::SigningInput<'_>| {
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let _ = signer.sign(CoinType::TON, input);
+});
diff --git a/rust/chains/tw_ton/resources/wallet/wallet_v4r2.code b/rust/chains/tw_ton/resources/wallet/wallet_v4r2.code
new file mode 100644
index 00000000000..e1d04cde08a
--- /dev/null
+++ b/rust/chains/tw_ton/resources/wallet/wallet_v4r2.code
@@ -0,0 +1 @@
+te6cckECFAEAAtQAART/APSkE/S88sgLAQIBIAIDAgFIBAUE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8QERITAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNBgcCASAICQB4AfoA9AQw+CdvIjBQCqEhvvLgUIIQcGx1Z4MesXCAGFAEywUmzxZY+gIZ9ADLaRfLH1Jgyz8gyYBA+wAGAIpQBIEBCPRZMO1E0IEBQNcgyAHPFvQAye1UAXKwjiOCEGRzdHKDHrFwgBhQBcsFUAPPFiP6AhPLassfyz/JgED7AJJfA+ICASAKCwBZvSQrb2omhAgKBrkPoCGEcNQICEekk30pkQzmkD6f+YN4EoAbeBAUiYcVnzGEAgFYDA0AEbjJftRNDXCx+AA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYAIBIA4PABmtznaiaEAga5Drhf/AABmvHfaiaEAQa5DrhY/AAG7SB/oA1NQi+QAFyMoHFcv/ydB3dIAYyMsFywIizxZQBfoCFMtrEszMyXP7AMhAFIEBCPRR8qcCAHCBAQjXGPoA0z/IVCBHgQEI9FHyp4IQbm90ZXB0gBjIywXLAlAGzxZQBPoCFMtqEssfyz/Jc/sAAgBsgQEI1xj6ANM/MFIkgQEI9Fnyp4IQZHN0cnB0gBjIywXLAlAFzxZQA/oCE8tqyx8Syz/Jc/sAAAr0AMntVGliJeU=
\ No newline at end of file
diff --git a/rust/chains/tw_ton/resources/wallet/wallet_v5r1.code b/rust/chains/tw_ton/resources/wallet/wallet_v5r1.code
new file mode 100644
index 00000000000..586cfc39e88
--- /dev/null
+++ b/rust/chains/tw_ton/resources/wallet/wallet_v5r1.code
@@ -0,0 +1 @@
+te6cckECFAEAAoEAART/APSkE/S88sgLAQIBIAINAgFIAwQC3NAg10nBIJFbj2Mg1wsfIIIQZXh0br0hghBzaW50vbCSXwPgghBleHRuuo60gCDXIQHQdNch+kAw+kT4KPpEMFi9kVvg7UTQgQFB1yH0BYMH9A5voTGRMOGAQNchcH/bPOAxINdJgQKAuZEw4HDiEA8CASAFDAIBIAYJAgFuBwgAGa3OdqJoQCDrkOuF/8AAGa8d9qJoQBDrkOuFj8ACAUgKCwAXsyX7UTQcdch1wsfgABGyYvtRNDXCgCAAGb5fD2omhAgKDrkPoCwBAvIOAR4g1wsfghBzaWduuvLgin8PAeaO8O2i7fshgwjXIgKDCNcjIIAg1yHTH9Mf0x/tRNDSANMfINMf0//XCgAK+QFAzPkQmiiUXwrbMeHywIffArNQB7Dy0IRRJbry4IVQNrry4Ib4I7vy0IgikvgA3gGkf8jKAMsfAc8Wye1UIJL4D95w2zzYEAP27aLt+wL0BCFukmwhjkwCIdc5MHCUIccAs44tAdcoIHYeQ2wg10nACPLgkyDXSsAC8uCTINcdBscSwgBSMLDy0InXTNc5MAGk6GwShAe78uCT10rAAPLgk+1V4tIAAcAAkVvg69csCBQgkXCWAdcsCBwS4lIQseMPINdKERITAJYB+kAB+kT4KPpEMFi68uCR7UTQgQFB1xj0BQSdf8jKAEAEgwf0U/Lgi44UA4MH9Fvy4Iwi1woAIW4Bs7Dy0JDiyFADzxYS9ADJ7VQAcjDXLAgkji0h8uCS0gDtRNDSAFETuvLQj1RQMJExnAGBAUDXIdcKAPLgjuLIygBYzxbJ7VST8sCN4gAQk1vbMeHXTNC01sNe
\ No newline at end of file
diff --git a/rust/chains/tw_ton/src/address.rs b/rust/chains/tw_ton/src/address.rs
new file mode 100644
index 00000000000..3175a4cab0b
--- /dev/null
+++ b/rust/chains/tw_ton/src/address.rs
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::resources::{BASE_WORKCHAIN, MASTER_WORKCHAIN};
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H256;
+use tw_memory::Data;
+use tw_ton_sdk::address::address_data::AddressData;
+use tw_ton_sdk::address::raw_address::RawAddress;
+use tw_ton_sdk::address::user_friendly_address::UserFriendlyAddress;
+
+pub const DEFAULT_BOUNCEABLE: bool = false;
+pub const DEFAULT_TESTNET: bool = false;
+
+/// User-friendly, base64 URL-safe **by default** encoded TON address.
+/// Please note it also supports raw (hex) and user-friendly base64 standard representations as well.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct TonAddress(UserFriendlyAddress);
+
+impl TonAddress {
+    pub const NULL: TonAddress = TonAddress::null();
+
+    pub const fn null() -> TonAddress {
+        TonAddress(UserFriendlyAddress::with_flags(
+            AddressData::null(),
+            DEFAULT_BOUNCEABLE,
+            DEFAULT_TESTNET,
+        ))
+    }
+
+    pub fn new(workchain: i32, hash_part: H256) -> Self {
+        let data = AddressData::new(workchain, hash_part);
+        TonAddress(UserFriendlyAddress::with_flags(
+            data,
+            DEFAULT_BOUNCEABLE,
+            DEFAULT_TESTNET,
+        ))
+    }
+
+    pub fn from_hex_str(s: &str) -> AddressResult<TonAddress> {
+        let raw_address = RawAddress::from_str(s)?;
+        let user_friendly_address = UserFriendlyAddress::with_flags(
+            raw_address.into_data(),
+            DEFAULT_BOUNCEABLE,
+            DEFAULT_TESTNET,
+        );
+        Ok(TonAddress(user_friendly_address))
+    }
+
+    #[inline]
+    pub fn from_base64_url(s: &str) -> AddressResult<TonAddress> {
+        UserFriendlyAddress::from_base64_url(s).map(TonAddress)
+    }
+
+    #[inline]
+    pub fn from_base64_std(s: &str) -> AddressResult<TonAddress> {
+        UserFriendlyAddress::from_base64_std(s).map(TonAddress)
+    }
+
+    #[inline]
+    pub fn with_address_data(data: AddressData) -> TonAddress {
+        TonAddress(UserFriendlyAddress::with_flags(
+            data,
+            DEFAULT_BOUNCEABLE,
+            DEFAULT_TESTNET,
+        ))
+    }
+
+    /// Normalizes the TON address according to the best wallet practice:
+    /// https://docs.ton.org/learn/overviews/addresses#bounceable-vs-non-bounceable-addresses
+    ///
+    /// Returns error if the address workchain is unexpected.
+    #[inline]
+    pub fn normalize(self) -> AddressResult<Self> {
+        let workchain = self.0.as_ref().workchain;
+        if workchain != MASTER_WORKCHAIN && workchain != BASE_WORKCHAIN {
+            return Err(AddressError::UnexpectedAddressPrefix);
+        }
+
+        Ok(self
+            .set_bounceable(DEFAULT_BOUNCEABLE)
+            .set_testnet(DEFAULT_TESTNET))
+    }
+
+    #[inline]
+    pub fn set_bounceable(self, bounceable: bool) -> Self {
+        TonAddress(self.0.set_bounceable(bounceable))
+    }
+
+    #[inline]
+    pub fn set_testnet(self, testnet: bool) -> Self {
+        TonAddress(self.0.set_testnet(testnet))
+    }
+
+    #[inline]
+    pub fn bounceable(&self) -> bool {
+        self.0.bounceable()
+    }
+}
+
+impl AsRef<AddressData> for TonAddress {
+    fn as_ref(&self) -> &AddressData {
+        self.0.as_ref()
+    }
+}
+
+impl CoinAddress for TonAddress {
+    #[inline]
+    fn data(&self) -> Data {
+        self.0.as_ref().hash_part.to_vec()
+    }
+}
+
+impl FromStr for TonAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if s.len() != 48 {
+            return TonAddress::from_hex_str(s);
+        }
+
+        // Some form of base64 address, check which one
+        if s.contains('-') || s.contains('_') {
+            TonAddress::from_base64_url(s)
+        } else {
+            TonAddress::from_base64_std(s)
+        }
+    }
+}
+
+impl fmt::Display for TonAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0.to_base64_url())
+    }
+}
diff --git a/rust/chains/tw_ton/src/compiler.rs b/rust/chains/tw_ton/src/compiler.rs
new file mode 100644
index 00000000000..2bcea271351
--- /dev/null
+++ b/rust/chains/tw_ton/src/compiler.rs
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::signing_request::builder::SigningRequestBuilder;
+use crate::signing_request::cell_creator::ExternalMessageCreator;
+use std::borrow::Cow;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_keypair::ed25519::Signature;
+use tw_proto::TheOpenNetwork::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use tw_ton_sdk::boc::BagOfCells;
+use tw_ton_sdk::error::cell_to_signing_error;
+
+pub(crate) const HAS_CRC32: bool = true;
+
+pub struct TheOpenNetworkCompiler;
+
+impl TheOpenNetworkCompiler {
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let signing_request = SigningRequestBuilder::build(&input)?;
+
+        let external_message =
+            ExternalMessageCreator::create_external_message_to_sign(&signing_request)
+                .map_err(cell_to_signing_error)?;
+
+        Ok(CompilerProto::PreSigningOutput {
+            data: Cow::from(external_message.cell_hash().to_vec()),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn compile_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        _public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        if signatures.len() != 1 {
+            return TWError::err(SigningErrorType::Error_signatures_count)
+                .context("Expected exactly one signature");
+        }
+        let signature = Signature::try_from(signatures[0].as_slice())?;
+
+        let signing_request = SigningRequestBuilder::build(&input)?;
+
+        let external_message =
+            ExternalMessageCreator::create_external_message_to_sign(&signing_request)
+                .map_err(cell_to_signing_error)?;
+
+        let signed_external_message = signing_request
+            .wallet
+            .compile_signed_external_message(external_message, signature)?;
+
+        // Whether to add 'StateInit' reference.
+        let state_init = signing_request.seqno == 0;
+        let signed_tx = signing_request
+            .wallet
+            .compile_transaction(signed_external_message, state_init)
+            .context("Error compiling an external message")?
+            .build()
+            .context("Error generating signed message cell")
+            .map_err(cell_to_signing_error)?;
+
+        let signed_tx_hash = signed_tx.cell_hash();
+        let signed_tx_encoded = BagOfCells::from_root(signed_tx)
+            .to_base64(HAS_CRC32)
+            .context("Error serializing signed transaction as BoC")
+            .map_err(cell_to_signing_error)?;
+
+        Ok(Proto::SigningOutput {
+            encoded: signed_tx_encoded.into(),
+            hash: signed_tx_hash.to_vec().into(),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_ton/src/entry.rs b/rust/chains/tw_ton/src/entry.rs
new file mode 100644
index 00000000000..efc0fc8995c
--- /dev/null
+++ b/rust/chains/tw_ton/src/entry.rs
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use crate::compiler::TheOpenNetworkCompiler;
+use crate::modules::transaction_util::TonTransactionUtil;
+use crate::signer::TheOpenNetworkSigner;
+use crate::wallet::{wallet_v4, VersionedTonWallet};
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{CoinEntry, PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::json_signer::NoJsonSigner;
+use tw_coin_entry::modules::message_signer::NoMessageSigner;
+use tw_coin_entry::modules::plan_builder::NoPlanBuilder;
+use tw_coin_entry::modules::transaction_decoder::NoTransactionDecoder;
+use tw_coin_entry::modules::wallet_connector::NoWalletConnector;
+use tw_coin_entry::prefix::NoPrefix;
+use tw_keypair::tw::PublicKey;
+use tw_proto::TheOpenNetwork::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct TheOpenNetworkEntry;
+
+impl CoinEntry for TheOpenNetworkEntry {
+    type AddressPrefix = NoPrefix;
+    type Address = TonAddress;
+    type SigningInput<'a> = Proto::SigningInput<'a>;
+    type SigningOutput = Proto::SigningOutput<'static>;
+    type PreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+
+    // Optional modules:
+    type JsonSigner = NoJsonSigner;
+    type PlanBuilder = NoPlanBuilder;
+    type MessageSigner = NoMessageSigner;
+    type WalletConnector = NoWalletConnector;
+    type TransactionDecoder = NoTransactionDecoder;
+    type TransactionUtil = TonTransactionUtil;
+
+    #[inline]
+    fn parse_address(
+        &self,
+        _coin: &dyn CoinContext,
+        address: &str,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        // TODO consider checking whether the transaction is on testnet.
+        TonAddress::from_str(address).and_then(TonAddress::normalize)
+    }
+
+    #[inline]
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address> {
+        TonAddress::from_str(address).and_then(TonAddress::normalize)
+    }
+
+    #[inline]
+    fn derive_address(
+        &self,
+        _coin: &dyn CoinContext,
+        public_key: PublicKey,
+        _derivation: Derivation,
+        _prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address> {
+        let ed25519_pubkey = public_key
+            .to_ed25519()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+        // Currently, we use the V4R2 wallet
+        let wallet = VersionedTonWallet::V4R2(
+            wallet_v4::WalletV4R2::std_with_public_key(ed25519_pubkey.clone())
+                .map_err(|_| AddressError::Internal)?,
+        );
+        Ok(wallet.address().clone())
+    }
+
+    #[inline]
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput {
+        TheOpenNetworkSigner::sign(coin, input)
+    }
+
+    #[inline]
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput {
+        TheOpenNetworkCompiler::preimage_hashes(coin, input)
+    }
+
+    #[inline]
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput {
+        TheOpenNetworkCompiler::compile(coin, input, signatures, public_keys)
+    }
+
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        Some(TonTransactionUtil)
+    }
+}
diff --git a/rust/chains/tw_ton/src/lib.rs b/rust/chains/tw_ton/src/lib.rs
new file mode 100644
index 00000000000..7e35d3bc165
--- /dev/null
+++ b/rust/chains/tw_ton/src/lib.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod compiler;
+pub mod entry;
+pub mod message;
+pub mod modules;
+pub mod resources;
+pub mod signer;
+pub mod signing_request;
+pub mod transaction;
+pub mod wallet;
diff --git a/rust/chains/tw_ton/src/message/external_message/mod.rs b/rust/chains/tw_ton/src/message/external_message/mod.rs
new file mode 100644
index 00000000000..88c077ae30c
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/external_message/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod wallet_v4;
+pub mod wallet_v5;
diff --git a/rust/chains/tw_ton/src/message/external_message/wallet_v4.rs b/rust/chains/tw_ton/src/message/external_message/wallet_v4.rs
new file mode 100644
index 00000000000..d23d0090de9
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/external_message/wallet_v4.rs
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::message::internal_message::InternalMessage;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::CellResult;
+
+pub struct ExternalMessageWalletV4 {
+    pub wallet_id: i32,
+    pub expire_at: u32,
+    pub seqno: u32,
+    pub internal_messages: Vec<InternalMessage>,
+}
+
+impl ExternalMessageWalletV4 {
+    pub fn build(&self) -> CellResult<Cell> {
+        let mut builder = CellBuilder::new();
+        builder
+            .store_i32(32, self.wallet_id)?
+            .store_u32(32, self.expire_at)?
+            .store_u32(32, self.seqno)?;
+        builder.store_u8(8, 0)?; // has op
+        for internal_message in self.internal_messages.iter() {
+            builder.store_u8(8, internal_message.mode)?;
+            builder.store_reference(&internal_message.message)?;
+        }
+        builder.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/external_message/wallet_v5.rs b/rust/chains/tw_ton/src/message/external_message/wallet_v5.rs
new file mode 100644
index 00000000000..af4a2863323
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/external_message/wallet_v5.rs
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::message::out_list::build_out_list;
+use crate::message::out_list::out_action::OutAction;
+use tw_coin_entry::error::prelude::ResultContext;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::{CellError, CellErrorType, CellResult};
+
+const SEND_MODE_IGNORE_ACTION_PHASE_ERRORS: u8 = 0x02;
+
+pub enum V5R1OpCode {
+    // Currently, only AuthSignedExternal is supported. AuthSignedInternal/AuthExtension are not supported.
+    AuthSignedExternal,
+}
+
+impl V5R1OpCode {
+    // See https://github.com/ton-blockchain/wallet-contract-v5/blob/88557ebc33047a95207f6e47ac8aadb102dff744/contracts/wallet_v5.fc#L33
+    pub fn to_ser_tag(&self) -> u32 {
+        match self {
+            V5R1OpCode::AuthSignedExternal => 0x7369676e,
+        }
+    }
+}
+
+pub struct ExternalMessageWalletV5 {
+    pub opcode: V5R1OpCode,
+    pub wallet_id: i32,
+    pub expire_at: u32,
+    pub seqno: u32,
+    /// Currently, only basic actions are supported. Extended actions are not supported.
+    pub basic_actions: Vec<OutAction>,
+}
+
+impl ExternalMessageWalletV5 {
+    /// Build the external message for wallet v5.
+    pub fn build(&self) -> CellResult<Cell> {
+        // Check the number of basic actions
+        if self.basic_actions.len() > 255 {
+            return CellError::err(CellErrorType::InternalError)
+                .context("Maximum number of actions in a single request is 255");
+        }
+
+        let mut builder = CellBuilder::new();
+        match self.opcode {
+            V5R1OpCode::AuthSignedExternal => {
+                builder.store_u32(32, self.opcode.to_ser_tag())?;
+
+                // Make sure +2 flag (ignore errors send mode) is set for all external send messages
+                // See https://github.com/ton-blockchain/wallet-contract-v5/blob/88557ebc33047a95207f6e47ac8aadb102dff744/contracts/wallet_v5.fc#L82
+                for action in &self.basic_actions {
+                    if (action.mode & SEND_MODE_IGNORE_ACTION_PHASE_ERRORS) == 0 {
+                        return CellError::err(CellErrorType::InternalError)
+                            .context("External send message must have ignore errors send mode");
+                    }
+                }
+            },
+        }
+        builder
+            .store_i32(32, self.wallet_id)?
+            .store_u32(32, self.expire_at)?
+            .store_u32(32, self.seqno)?;
+        builder.store_bit(true)?; // true means basic actions is stored in reference
+
+        let mut basic_actions = self.basic_actions.clone();
+        basic_actions.reverse();
+
+        builder.store_child(build_out_list(&basic_actions)?)?;
+        builder.store_bit(false)?; // false means no extended actions
+        builder.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/internal_message/mod.rs b/rust/chains/tw_ton/src/message/internal_message/mod.rs
new file mode 100644
index 00000000000..87516a8f068
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/internal_message/mod.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_ton_sdk::cell::{Cell, CellArc};
+
+pub mod transfer;
+
+pub struct InternalMessage {
+    /// https://docs.ton.org/develop/smart-contracts/messages#message-modes
+    pub mode: u8,
+    pub message: CellArc,
+}
+
+impl InternalMessage {
+    pub fn new(mode: u8, message: Cell) -> InternalMessage {
+        InternalMessage {
+            mode,
+            message: message.into_arc(),
+        }
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/internal_message/transfer.rs b/rust/chains/tw_ton/src/message/internal_message/transfer.rs
new file mode 100644
index 00000000000..3da99cc0f09
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/internal_message/transfer.rs
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use tw_number::U256;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::{Cell, CellArc};
+use tw_ton_sdk::error::CellResult;
+
+const BIT_0: bool = false;
+const IHR_DISABLED: bool = true;
+const BOUNCED: bool = false;
+const CURRENCY_COLLECTIONS: bool = false;
+const CREATED_LT: u64 = 0;
+const CREATED_AT: u32 = 0;
+const IHR_FEES: U256 = U256::ZERO;
+const FWD_FEES: U256 = U256::ZERO;
+
+/// Standard Internal message - transfer TON.
+pub struct TransferInternalMessage {
+    pub dest: TonAddress,
+    pub value: U256,
+    /// Deploy a smart contract different from the sender's wallet contract.
+    /// For example, to deploy a chatbot Doge: https://github.com/LaDoger/doge.fc
+    ///
+    /// Note consider using [`ExternalMessage::state_init`] to deploy the sender's wallet contract.
+    pub state_init: Option<CellArc>,
+    pub data: Option<CellArc>,
+}
+
+impl TransferInternalMessage {
+    pub fn new(dest: TonAddress, value: U256) -> Self {
+        TransferInternalMessage {
+            dest,
+            value,
+            state_init: None,
+            data: None,
+        }
+    }
+
+    pub fn with_data(&mut self, data: CellArc) -> &mut Self {
+        self.data = Some(data);
+        self
+    }
+
+    pub fn with_state_init(&mut self, state_init: CellArc) -> &mut Self {
+        self.state_init = Some(state_init);
+        self
+    }
+
+    pub fn build(&self) -> CellResult<Cell> {
+        let mut builder = CellBuilder::new();
+        builder.store_bit(BIT_0)?; // bit0
+        builder.store_bit(IHR_DISABLED)?; // ihr_disabled
+        builder.store_bit(self.dest.bounceable())?; // bounce
+        builder.store_bit(BOUNCED)?; // bounced
+        builder.store_address(&TonAddress::NULL)?; // src_addr
+        builder.store_address(&self.dest)?; // dest_addr
+        builder.store_coins(&self.value)?; // value
+        builder.store_bit(CURRENCY_COLLECTIONS)?; // currency_collections
+        builder.store_coins(&IHR_FEES)?; // ihr_fees
+        builder.store_coins(&FWD_FEES)?; // fwd_fees
+        builder.store_u64(64, CREATED_LT)?; // created_lt
+        builder.store_u32(32, CREATED_AT)?; // created_at
+
+        // (Maybe (Either StateInit ^StateInit))
+        builder.store_bit(self.state_init.is_some())?; // state_init?
+        if let Some(state_init) = self.state_init.as_ref() {
+            builder.store_bit(true)?; // store state_init as a reference, not inline
+            builder.store_reference(state_init)?;
+        }
+
+        // (Either X ^X) = Message X
+        builder.store_bit(self.data.is_some())?; // data?
+        if let Some(data) = self.data.as_ref() {
+            builder.store_reference(data)?;
+        }
+
+        builder.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/mod.rs b/rust/chains/tw_ton/src/message/mod.rs
new file mode 100644
index 00000000000..0996f7b8276
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/mod.rs
@@ -0,0 +1,5 @@
+pub mod external_message;
+pub mod internal_message;
+pub mod out_list;
+pub mod payload;
+pub mod signed_message;
diff --git a/rust/chains/tw_ton/src/message/out_list/mod.rs b/rust/chains/tw_ton/src/message/out_list/mod.rs
new file mode 100644
index 00000000000..85f6df623d8
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/out_list/mod.rs
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::message::out_list::out_action::OutAction;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::CellResult;
+
+pub mod out_action;
+
+pub fn build_out_list(actions: &[OutAction]) -> CellResult<Cell> {
+    let cell = actions
+        .iter()
+        .fold(CellBuilder::new().build(), |acc, action| {
+            let mut builder = CellBuilder::new();
+            builder.store_child(acc?)?;
+            builder.store_cell(&action.build()?)?;
+            builder.build()
+        });
+
+    let mut builder = CellBuilder::new();
+    builder.store_cell(&cell?)?;
+    builder.build()
+}
diff --git a/rust/chains/tw_ton/src/message/out_list/out_action.rs b/rust/chains/tw_ton/src/message/out_list/out_action.rs
new file mode 100644
index 00000000000..bf270c307b2
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/out_list/out_action.rs
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::{Cell, CellArc};
+use tw_ton_sdk::error::CellResult;
+
+#[derive(Clone)]
+pub enum OutActionType {
+    // Currently, only SendMsg is supported. SetCode is not supported.
+    SendMsg,
+}
+
+impl OutActionType {
+    // See https://ton.org/tblkch.pdf 4.4.11. Serialization of output actions
+    pub fn to_ser_tag(&self) -> u32 {
+        match self {
+            OutActionType::SendMsg => 0x0ec3c86d,
+        }
+    }
+}
+
+#[derive(Clone)]
+pub struct OutAction {
+    pub typ: OutActionType,
+    pub mode: u8,
+    pub data: CellArc, // out msg (SendMsg) or new code (SetCode)
+}
+
+impl OutAction {
+    pub fn new(typ: OutActionType, mode: u8, out_msg: CellArc) -> Self {
+        OutAction {
+            typ,
+            mode,
+            data: out_msg,
+        }
+    }
+
+    pub fn build(&self) -> CellResult<Cell> {
+        match self.typ {
+            OutActionType::SendMsg => self.build_out_action_send_msg(),
+        }
+    }
+
+    fn build_out_action_send_msg(&self) -> CellResult<Cell> {
+        let mut builder = CellBuilder::new();
+        builder
+            .store_u32(32, self.typ.to_ser_tag())?
+            .store_u8(8, self.mode)?
+            .store_reference(&self.data)?;
+        builder.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/payload/comment.rs b/rust/chains/tw_ton/src/message/payload/comment.rs
new file mode 100644
index 00000000000..64176ae1d15
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/payload/comment.rs
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::CellResult;
+
+/// Transaction payload the consists of an arbitrary comment only.
+pub struct CommentPayload {
+    comment: String,
+}
+
+impl CommentPayload {
+    pub fn new(comment: String) -> Self {
+        CommentPayload { comment }
+    }
+
+    pub fn build(&self) -> CellResult<Cell> {
+        let mut builder = CellBuilder::new();
+        builder.store_u32(32, 0)?.store_string(&self.comment)?;
+        builder.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/payload/empty.rs b/rust/chains/tw_ton/src/message/payload/empty.rs
new file mode 100644
index 00000000000..724cad0592e
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/payload/empty.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::CellResult;
+
+/// Empty transaction payload.
+pub struct EmptyPayload;
+
+impl EmptyPayload {
+    pub fn build(&self) -> CellResult<Cell> {
+        CellBuilder::new().build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/payload/jetton_transfer.rs b/rust/chains/tw_ton/src/message/payload/jetton_transfer.rs
new file mode 100644
index 00000000000..82b552c6b2b
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/payload/jetton_transfer.rs
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use tw_coin_entry::error::prelude::ResultContext;
+use tw_number::U256;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::{Cell, CellArc};
+use tw_ton_sdk::error::{CellError, CellErrorType, CellResult};
+
+pub const JETTON_TRANSFER: u32 = 0x0f8a7ea5;
+
+/// Jetton transfer message payload with an optional comment.
+#[derive(Debug)]
+pub struct JettonTransferPayload {
+    /// Arbitrary request number.
+    query_id: u64,
+    /// Amount of transferred jettons in elementary units.
+    jetton_amount: U256,
+    /// Address of the new owner of the jettons.
+    destination: TonAddress,
+    /// Address where to send a response with confirmation of a successful transfer and the rest of the incoming message Toncoins.
+    response_destination: TonAddress,
+    /// Optional custom data (which is used by either sender or receiver jetton wallet for inner logic).
+    custom_payload: Option<CellArc>,
+    /// Amount of nanotons to be sent to the destination address.
+    forward_ton_amount: U256,
+    /// Optional custom data that should be sent to the destination address.
+    /// At WalletCore, we do not use `forward_payload` at the moment.
+    #[allow(dead_code)]
+    forward_payload: Option<CellArc>,
+    /// Optional transfer comment.
+    comment: Option<String>,
+}
+
+impl JettonTransferPayload {
+    pub fn new(destination: TonAddress, jetton_amount: U256) -> Self {
+        JettonTransferPayload {
+            query_id: 0,
+            jetton_amount,
+            destination,
+            response_destination: TonAddress::null(),
+            custom_payload: None,
+            forward_ton_amount: U256::zero(),
+            forward_payload: None,
+            comment: None,
+        }
+    }
+
+    pub fn with_query_id(&mut self, query_id: u64) -> &mut Self {
+        self.query_id = query_id;
+        self
+    }
+
+    pub fn with_response_destination(&mut self, response_destination: TonAddress) -> &mut Self {
+        self.response_destination = response_destination;
+        self
+    }
+
+    pub fn with_comment(&mut self, comment: String) -> &mut Self {
+        self.comment = Some(comment);
+        self
+    }
+
+    pub fn with_custom_payload(&mut self, custom_payload: Option<CellArc>) -> &mut Self {
+        self.custom_payload = custom_payload;
+        self
+    }
+
+    pub fn with_forward_ton_amount(&mut self, forward_ton_amount: U256) -> &mut Self {
+        self.forward_ton_amount = forward_ton_amount;
+        self
+    }
+
+    pub fn build(&self) -> CellResult<Cell> {
+        if self.forward_ton_amount.is_zero() && self.forward_payload.is_some() {
+            return CellError::err(CellErrorType::CellBuilderError)
+                .context("Forward_ton_amount must be positive when specifying forward_payload");
+        }
+
+        let mut message = CellBuilder::new();
+        message.store_u32(32, JETTON_TRANSFER)?;
+        message.store_u64(64, self.query_id)?;
+        message.store_coins(&self.jetton_amount)?;
+        message.store_address(&self.destination)?;
+        message.store_address(&self.response_destination)?;
+
+        if let Some(ref cp) = self.custom_payload {
+            message.store_bit(true)?;
+            message.store_reference(cp)?;
+        } else {
+            message.store_bit(false)?;
+        }
+
+        message.store_coins(&self.forward_ton_amount)?;
+
+        if let Some(ref fp) = self.forward_payload {
+            message.store_bit(true)?;
+            message.store_reference(fp)?;
+        } else {
+            message.store_bit(false)?;
+        }
+
+        if let Some(ref comment) = self.comment {
+            message.store_u32(32, 0)?;
+            message.store_string(comment)?;
+        }
+
+        message.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/payload/mod.rs b/rust/chains/tw_ton/src/message/payload/mod.rs
new file mode 100644
index 00000000000..8b50715cd12
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/payload/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod comment;
+pub mod empty;
+pub mod jetton_transfer;
diff --git a/rust/chains/tw_ton/src/message/signed_message/mod.rs b/rust/chains/tw_ton/src/message/signed_message/mod.rs
new file mode 100644
index 00000000000..cfe3788fe74
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/signed_message/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod signed_message_v4;
+pub mod signed_message_v5;
diff --git a/rust/chains/tw_ton/src/message/signed_message/signed_message_v4.rs b/rust/chains/tw_ton/src/message/signed_message/signed_message_v4.rs
new file mode 100644
index 00000000000..4b624b247f0
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/signed_message/signed_message_v4.rs
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_hash::H512;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::*;
+
+pub struct SignedMessageV4 {
+    pub signature: H512,
+    pub external_message: Cell,
+}
+
+impl SignedMessageV4 {
+    pub fn build(&self) -> CellResult<Cell> {
+        let mut body_builder = CellBuilder::new();
+
+        // In the case of WALLET_V4_R2, the signature is stored before the external message.
+        body_builder.store_slice(self.signature.as_slice())?;
+        body_builder.store_cell(&self.external_message)?;
+
+        body_builder.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/message/signed_message/signed_message_v5.rs b/rust/chains/tw_ton/src/message/signed_message/signed_message_v5.rs
new file mode 100644
index 00000000000..932fafa9894
--- /dev/null
+++ b/rust/chains/tw_ton/src/message/signed_message/signed_message_v5.rs
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_hash::H512;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::*;
+
+pub struct SignedMessageV5 {
+    pub signature: H512,
+    pub external_message: Cell,
+}
+
+impl SignedMessageV5 {
+    pub fn build(&self) -> CellResult<Cell> {
+        let mut body_builder = CellBuilder::new();
+
+        // In the case of WALLET_V5_R1, the signature is stored after the external message.
+        body_builder.store_cell(&self.external_message)?;
+        body_builder.store_slice(self.signature.as_slice())?;
+
+        body_builder.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/modules/address_converter.rs b/rust/chains/tw_ton/src/modules/address_converter.rs
new file mode 100644
index 00000000000..733524140af
--- /dev/null
+++ b/rust/chains/tw_ton/src/modules/address_converter.rs
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use tw_coin_entry::error::prelude::ResultContext;
+use tw_ton_sdk::boc::BagOfCells;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::CellResult;
+
+const HAS_CRC32: bool = true;
+
+pub struct AddressConverter;
+
+impl AddressConverter {
+    /// Converts a TON user address into a single root Cell.
+    pub fn convert_to_cell(addr: &TonAddress) -> CellResult<Cell> {
+        let mut builder = CellBuilder::new();
+        builder
+            .store_address(addr)
+            .context("Error storing given address to CellBuilder")?;
+        builder.build()
+    }
+
+    /// Converts a TON user address into a Bag of Cells (BoC) with a single root Cell.
+    /// The function is mostly used to request a Jetton user address via `get_wallet_address` RPC.
+    /// https://docs.ton.org/develop/dapps/asset-processing/jettons#retrieving-jetton-wallet-addresses-for-a-given-user
+    pub fn convert_to_boc(addr: &TonAddress) -> CellResult<BagOfCells> {
+        Self::convert_to_cell(addr).map(BagOfCells::from_root)
+    }
+
+    /// Converts a TON user address into a Bag of Cells (BoC) with a single root Cell.
+    /// The function is mostly used to request a Jetton user address via `get_wallet_address` RPC.
+    /// https://docs.ton.org/develop/dapps/asset-processing/jettons#retrieving-jetton-wallet-addresses-for-a-given-user
+    pub fn convert_to_boc_base64(addr: &TonAddress) -> CellResult<String> {
+        Self::convert_to_boc(addr).and_then(|boc| boc.to_base64(HAS_CRC32))
+    }
+
+    /// Parses a TON address from a single root Cell.
+    pub fn parse_from_cell(cell: &Cell) -> CellResult<TonAddress> {
+        cell.parse_fully(|parser| parser.load_address())
+            .map(TonAddress::with_address_data)
+    }
+
+    /// Parses a TON address from a Bag of Cells (BoC) with a single root Cell.
+    /// The function is mostly used to parse a Jetton user address received on `get_wallet_address` RPC.
+    /// https://docs.ton.org/develop/dapps/asset-processing/jettons#retrieving-jetton-wallet-addresses-for-a-given-user
+    pub fn parse_from_boc(boc: &BagOfCells) -> CellResult<TonAddress> {
+        boc.single_root()
+            .and_then(|cell| Self::parse_from_cell(cell))
+    }
+
+    /// Parses a TON address from a Bag of Cells (BoC) with a single root Cell.
+    /// The function is mostly used to parse a Jetton user address received on `get_wallet_address` RPC.
+    /// https://docs.ton.org/develop/dapps/asset-processing/jettons#retrieving-jetton-wallet-addresses-for-a-given-user
+    pub fn parse_from_boc_base64(boc: &str) -> CellResult<TonAddress> {
+        BagOfCells::parse_base64(boc).and_then(|boc| Self::parse_from_boc(&boc))
+    }
+}
diff --git a/rust/chains/tw_ton/src/modules/mod.rs b/rust/chains/tw_ton/src/modules/mod.rs
new file mode 100644
index 00000000000..95d32dc4847
--- /dev/null
+++ b/rust/chains/tw_ton/src/modules/mod.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address_converter;
+pub mod personal_message_signer;
+pub mod transaction_util;
+pub mod wallet_provider;
diff --git a/rust/chains/tw_ton/src/modules/personal_message_signer.rs b/rust/chains/tw_ton/src/modules/personal_message_signer.rs
new file mode 100644
index 00000000000..fad7a7a023d
--- /dev/null
+++ b/rust/chains/tw_ton/src/modules/personal_message_signer.rs
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_hash::sha2::sha512;
+use tw_keypair::ed25519::sha512::PrivateKey;
+use tw_keypair::ed25519::Signature;
+use tw_keypair::traits::SigningKeyTrait;
+use tw_keypair::KeyPairResult;
+
+pub const TON_PERSONAL_MESSAGE_PREFIX: &str = "ton-safe-sign-magic";
+
+pub struct PersonalMessageSigner;
+
+impl PersonalMessageSigner {
+    /// Signs an arbitrary message.
+    /// https://www.openmask.app/docs/api-reference/rpc-api#ton_personalsign
+    /// https://github.com/OpenProduct/openmask-extension/blob/7566ceb2772fed7a3a27d2a67bd34bf89e862557/src/view/screen/notifications/sign/api.ts#L21-L48
+    pub fn sign(private_key: &PrivateKey, msg: &str) -> KeyPairResult<Signature> {
+        let msg_hash = sha512(msg.as_bytes());
+
+        let mut msg_to_sign = vec![0xff_u8, 0xff];
+        msg_to_sign.extend_from_slice(TON_PERSONAL_MESSAGE_PREFIX.as_bytes());
+        msg_to_sign.extend_from_slice(msg_hash.as_slice());
+
+        private_key.sign(msg_to_sign)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_hash::H512;
+
+    #[test]
+    fn test_sign_personal_message() {
+        // The private key has been derived by using [ton-mnemonic](https://www.npmjs.com/package/tonweb-mnemonic/v/0.0.2)
+        // from the following mnemonic:
+        // document shield addict crime broom point story depend suit satisfy test chicken valid tail speak fortune sound drill seek cube cheap body music recipe
+        let private_key = PrivateKey::try_from(
+            "112d4e2e700a468f1eae699329202f1ee671d6b665caa2d92dea038cf3868c18",
+        )
+        .unwrap();
+
+        let signature = PersonalMessageSigner::sign(&private_key, "Hello world").unwrap();
+        // The following signature has been computed by calling `window.ton.send("ton_personalSign", { data: "Hello world" });`.
+        let expected_sig = "2490fbaa72aec0b77b19162bbbe0b0e3f7afd42cc9ef469f0494cd4a366a4bf76643300cd5991f66bce6006336742b8d1d435d541d244dcc013d428472e89504";
+        assert_eq!(signature.to_bytes(), H512::from(expected_sig));
+    }
+}
diff --git a/rust/chains/tw_ton/src/modules/transaction_util.rs b/rust/chains/tw_ton/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..47200e82187
--- /dev/null
+++ b/rust/chains/tw_ton/src/modules/transaction_util.rs
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_util::TransactionUtil;
+use tw_ton_sdk::boc::BagOfCells;
+
+pub struct TonTransactionUtil;
+
+impl TransactionUtil for TonTransactionUtil {
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        Self::calc_tx_hash_impl(coin, encoded_tx)
+    }
+}
+
+impl TonTransactionUtil {
+    // In the TON blockchain, there are both message hashes and transaction hashes.
+    // Strictly speaking, this function returns the message hash, not the transaction hash,
+    // because we often use the TON message hash to track transaction status.
+    // The transaction hash is unknown until the transaction is included in a block.
+    fn calc_tx_hash_impl(_coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        let boc = BagOfCells::parse_base64(encoded_tx)
+            .map_err(|_| SigningErrorType::Error_input_parse)?;
+        let root_cell_hash = boc
+            .roots
+            .first()
+            .ok_or(SigningErrorType::Error_input_parse)?
+            .cell_hash();
+
+        // The message hash in TON can be encoded in base64, base64url, or hex.
+        // Here, we return the message hash in hex encoding.
+        Ok(root_cell_hash.to_string())
+    }
+}
diff --git a/rust/chains/tw_ton/src/modules/wallet_provider.rs b/rust/chains/tw_ton/src/modules/wallet_provider.rs
new file mode 100644
index 00000000000..ed09e7f93df
--- /dev/null
+++ b/rust/chains/tw_ton/src/modules/wallet_provider.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::wallet::{wallet_v4, wallet_v5};
+use tw_keypair::ed25519::sha512::PublicKey;
+use tw_ton_sdk::boc::BagOfCells;
+use tw_ton_sdk::error::CellResult;
+
+const HAS_CRC32: bool = true;
+
+/// TON Wallet common functionality.
+pub struct WalletProvider;
+
+impl WalletProvider {
+    /// Constructs a TON Wallet V4R2 stateInit encoded as BoC (BagOfCells) for the given `public_key`.
+    pub fn v4r2_state_init(
+        public_key: PublicKey,
+        workchain: i32,
+        wallet_id: i32,
+    ) -> CellResult<String> {
+        let state_init = wallet_v4::WalletV4R2::with_public_key(workchain, public_key, wallet_id)?
+            .state_init()?
+            .to_cell()?;
+        BagOfCells::from_root(state_init).to_base64(HAS_CRC32)
+    }
+
+    /// Constructs a TON Wallet V5R1 stateInit encoded as BoC (BagOfCells) for the given `public_key`.
+    pub fn v5r1_state_init(
+        public_key: PublicKey,
+        workchain: i32,
+        wallet_id: i32,
+    ) -> CellResult<String> {
+        let state_init = wallet_v5::WalletV5R1::with_public_key(workchain, public_key, wallet_id)?
+            .state_init()?
+            .to_cell()?;
+        BagOfCells::from_root(state_init).to_base64(HAS_CRC32)
+    }
+}
diff --git a/rust/chains/tw_ton/src/resources.rs b/rust/chains/tw_ton/src/resources.rs
new file mode 100644
index 00000000000..04a1ad37c81
--- /dev/null
+++ b/rust/chains/tw_ton/src/resources.rs
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use lazy_static::lazy_static;
+use tw_ton_sdk::boc::BagOfCells;
+
+pub const DEFAULT_WALLET_ID: i32 = 0x29a9a317;
+/// The wallet id 2147483409 comes from: https://github.com/ton-org/ton/blob/f9842909ac0e7d6f66d055dd18a4c41ec3416c02/src/wallets/v5r1/WalletV5R1WalletId.ts#L21C22-L21C32
+/// The V5R1 wallet id differs between the mainnet and testnet. We support V5R1 only on the mainnet.
+pub const WALLET_ID_V5R1_TON_MAINNET: i32 = 2147483409;
+/// https://docs.ton.org/develop/howto/step-by-step#1-smart-contract-addresses
+pub const BASE_WORKCHAIN: i32 = 0;
+pub const MASTER_WORKCHAIN: i32 = -1;
+
+lazy_static! {
+    pub static ref WALLET_V4R2_CODE: BagOfCells = {
+        let code = include_str!("../resources/wallet/wallet_v4r2.code");
+        BagOfCells::parse_base64(code).expect("Cannot decode wallet_v4r2.code")
+    };
+    pub static ref WALLET_V5R1_CODE: BagOfCells = {
+        let code = include_str!("../resources/wallet/wallet_v5r1.code");
+        BagOfCells::parse_base64(code).expect("Cannot decode wallet_v5r1.code")
+    };
+}
diff --git a/rust/chains/tw_ton/src/signer.rs b/rust/chains/tw_ton/src/signer.rs
new file mode 100644
index 00000000000..44306434b73
--- /dev/null
+++ b/rust/chains/tw_ton/src/signer.rs
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::compiler::HAS_CRC32;
+use crate::signing_request::builder::SigningRequestBuilder;
+use crate::signing_request::cell_creator::ExternalMessageCreator;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::TheOpenNetwork::Proto;
+use tw_ton_sdk::boc::BagOfCells;
+use tw_ton_sdk::error::cell_to_signing_error;
+
+pub struct TheOpenNetworkSigner;
+
+impl TheOpenNetworkSigner {
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_impl(
+        _coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let signing_request = SigningRequestBuilder::build(&input)?;
+
+        let external_message =
+            ExternalMessageCreator::create_external_message_to_sign(&signing_request)
+                .map_err(cell_to_signing_error)?;
+
+        // Whether to add 'StateInit' reference.
+        let state_init = signing_request.seqno == 0;
+        let signed_tx = signing_request
+            .wallet
+            .sign_transaction(external_message, state_init)
+            .context("Error signing/wrapping an external message")?
+            .build()
+            .context("Error generating signed message cell")
+            .map_err(cell_to_signing_error)?;
+
+        let signed_tx_hash = signed_tx.cell_hash();
+        let signed_tx_encoded = BagOfCells::from_root(signed_tx)
+            .to_base64(HAS_CRC32)
+            .context("Error serializing signed transaction as BoC")
+            .map_err(cell_to_signing_error)?;
+
+        Ok(Proto::SigningOutput {
+            encoded: signed_tx_encoded.into(),
+            hash: signed_tx_hash.to_vec().into(),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/chains/tw_ton/src/signing_request/builder.rs b/rust/chains/tw_ton/src/signing_request/builder.rs
new file mode 100644
index 00000000000..2291e4479ba
--- /dev/null
+++ b/rust/chains/tw_ton/src/signing_request/builder.rs
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use crate::signing_request::{
+    JettonTransferRequest, SigningRequest, TransferPayload, TransferRequest,
+};
+use crate::wallet::{wallet_v4, wallet_v5, VersionedTonWallet};
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::ed25519::sha512::{KeyPair, PublicKey};
+use tw_number::U256;
+use tw_proto::TheOpenNetwork::Proto;
+use tw_ton_sdk::error::cell_to_signing_error;
+use Proto::mod_Transfer::OneOfpayload as PayloadType;
+
+const STATE_INIT_EXPIRE_AT: u32 = 0xffffffff;
+
+pub struct SigningRequestBuilder;
+
+impl SigningRequestBuilder {
+    pub fn build(input: &Proto::SigningInput) -> SigningResult<SigningRequest> {
+        let wallet = Self::wallet(input)?;
+
+        let messages = input
+            .messages
+            .iter()
+            .map(Self::transfer_request)
+            .collect::<SigningResult<Vec<_>>>()?;
+
+        let expire_at = if input.sequence_number == 0 {
+            STATE_INIT_EXPIRE_AT
+        } else if input.expire_at == 0 {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("'expire_at' must be set");
+        } else {
+            input.expire_at
+        };
+
+        Ok(SigningRequest {
+            wallet,
+            messages,
+            expire_at,
+            seqno: input.sequence_number,
+        })
+    }
+
+    /// Currently, V4R2 and V5R1 wallets supported.
+    fn wallet(input: &Proto::SigningInput) -> SigningResult<VersionedTonWallet> {
+        if !input.private_key.is_empty() {
+            let key_pair = KeyPair::try_from(input.private_key.as_ref())
+                .into_tw()
+                .context("Invalid private key")?;
+
+            return match input.wallet_version {
+                Proto::WalletVersion::WALLET_V4_R2 => Ok(VersionedTonWallet::V4R2(
+                    wallet_v4::WalletV4R2::std_with_key_pair(&key_pair)
+                        .map_err(cell_to_signing_error)?,
+                )),
+                Proto::WalletVersion::WALLET_V5_R1 => Ok(VersionedTonWallet::V5R1(
+                    wallet_v5::WalletV5R1::std_with_key_pair(&key_pair)
+                        .map_err(cell_to_signing_error)?,
+                )),
+                _ => SigningError::err(SigningErrorType::Error_not_supported)
+                    .context("Wallet version not supported"),
+            };
+        }
+
+        let public_key = PublicKey::try_from(input.public_key.as_ref())
+            .into_tw()
+            .context("Expected either 'private_key' or 'public_key' to be set")?;
+
+        match input.wallet_version {
+            Proto::WalletVersion::WALLET_V4_R2 => Ok(VersionedTonWallet::V4R2(
+                wallet_v4::WalletV4R2::std_with_public_key(public_key)
+                    .map_err(cell_to_signing_error)?,
+            )),
+            Proto::WalletVersion::WALLET_V5_R1 => Ok(VersionedTonWallet::V5R1(
+                wallet_v5::WalletV5R1::std_with_public_key(public_key)
+                    .map_err(cell_to_signing_error)?,
+            )),
+            _ => SigningError::err(SigningErrorType::Error_not_supported)
+                .context("Wallet version not supported"),
+        }
+    }
+
+    fn transfer_request(input: &Proto::Transfer) -> SigningResult<TransferRequest> {
+        let dest = TonAddress::from_str(input.dest.as_ref())
+            .into_tw()
+            .context("Invalid 'dest' address")?
+            // Set the 'bounceable' flag explicitly as specified in the Protobuf.
+            .set_bounceable(input.bounceable);
+
+        let comment = if input.comment.is_empty() {
+            None
+        } else {
+            Some(input.comment.to_string())
+        };
+
+        let state_init = if input.state_init.is_empty() {
+            None
+        } else {
+            Some(input.state_init.to_string())
+        };
+
+        let mode = u8::try_from(input.mode)
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("'mode' must fit uint8")?;
+
+        let payload = match input.payload {
+            PayloadType::jetton_transfer(ref jetton) => {
+                Some(Self::jetton_transfer_request(jetton)?)
+            },
+            PayloadType::custom_payload(ref custom) => Some(Self::custom_request(custom)?),
+            PayloadType::None => None,
+        };
+
+        Ok(TransferRequest {
+            dest,
+            ton_amount: U256::from(input.amount),
+            mode,
+            comment,
+            state_init,
+            payload,
+        })
+    }
+
+    fn jetton_transfer_request(input: &Proto::JettonTransfer) -> SigningResult<TransferPayload> {
+        let dest = TonAddress::from_str(input.to_owner.as_ref())
+            .into_tw()
+            .context("Invalid 'dest' address")?;
+
+        let response_address = TonAddress::from_str(input.response_address.as_ref())
+            .into_tw()
+            .context("Invalid 'response_address' address")?;
+
+        let custom_payload = if input.custom_payload.is_empty() {
+            None
+        } else {
+            Some(input.custom_payload.to_string())
+        };
+
+        let jetton_payload = JettonTransferRequest {
+            query_id: input.query_id,
+            jetton_amount: U256::from(input.jetton_amount),
+            dest,
+            response_address,
+            custom_payload,
+            forward_ton_amount: U256::from(input.forward_amount),
+        };
+
+        Ok(TransferPayload::JettonTransfer(jetton_payload))
+    }
+
+    fn custom_request(input: &str) -> SigningResult<TransferPayload> {
+        Ok(TransferPayload::Custom(input.to_string()))
+    }
+}
diff --git a/rust/chains/tw_ton/src/signing_request/cell_creator.rs b/rust/chains/tw_ton/src/signing_request/cell_creator.rs
new file mode 100644
index 00000000000..20c7f7fb10c
--- /dev/null
+++ b/rust/chains/tw_ton/src/signing_request/cell_creator.rs
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::message::internal_message::transfer::TransferInternalMessage;
+use crate::message::internal_message::InternalMessage;
+use crate::message::payload::comment::CommentPayload;
+use crate::message::payload::empty::EmptyPayload;
+use crate::message::payload::jetton_transfer::JettonTransferPayload;
+use crate::signing_request::{
+    JettonTransferRequest, SigningRequest, TransferPayload, TransferRequest,
+};
+use std::sync::Arc;
+use tw_coin_entry::error::prelude::ResultContext;
+use tw_ton_sdk::boc::BagOfCells;
+use tw_ton_sdk::cell::{Cell, CellArc};
+use tw_ton_sdk::error::{CellError, CellErrorType, CellResult};
+
+pub struct InternalMessageCreator;
+
+impl InternalMessageCreator {
+    pub fn create_internal_message(
+        transfer_request: &TransferRequest,
+    ) -> CellResult<InternalMessage> {
+        let mut transfer_message = TransferInternalMessage::new(
+            transfer_request.dest.clone(),
+            transfer_request.ton_amount,
+        );
+
+        // Store a custom contract StateInit Cell if it's provided.
+        if let Some(state_init) = Self::maybe_custom_state_init(transfer_request)? {
+            transfer_message.with_state_init(state_init);
+        }
+        // In WalletCore, we always store the transfer data even if it's an empty Cell.
+        transfer_message.with_data(Self::transfer_payload(transfer_request)?);
+
+        let transfer_message_cell = transfer_message
+            .build()
+            .context("Error generating 'Transfer' internal message cell")?;
+
+        Ok(InternalMessage::new(
+            transfer_request.mode,
+            transfer_message_cell,
+        ))
+    }
+
+    fn transfer_payload(transfer_request: &TransferRequest) -> CellResult<CellArc> {
+        match transfer_request.payload {
+            Some(TransferPayload::JettonTransfer(ref jetton)) => {
+                Self::jetton_transfer_payload(jetton, transfer_request.comment.clone())
+            },
+            Some(TransferPayload::Custom(ref custom)) => Self::custom_payload(custom),
+            // Otherwise, this is an ordinary TON transfer with an optional comment.
+            None => Self::maybe_comment_payload(transfer_request.comment.clone()),
+        }
+    }
+
+    fn maybe_comment_payload(comment: Option<String>) -> CellResult<CellArc> {
+        match comment {
+            Some(comment) => CommentPayload::new(comment)
+                .build()
+                .context("Error generating Transfer's comment payload"),
+            None => EmptyPayload
+                .build()
+                .context("Error generating Transfer's empty payload"),
+        }
+        .map(Cell::into_arc)
+    }
+
+    fn jetton_transfer_payload(
+        jetton: &JettonTransferRequest,
+        comment: Option<String>,
+    ) -> CellResult<CellArc> {
+        let custom_payload_cell = if let Some(ref custom_payload) = jetton.custom_payload {
+            Some(
+                BagOfCells::parse_base64(custom_payload)
+                    .context("Error parsing JettonTransfer custom_payload")?
+                    .single_root()
+                    .map(Arc::clone)
+                    .context("custom_payload must contain only one single root")?,
+            )
+        } else {
+            None
+        };
+
+        let mut payload = JettonTransferPayload::new(jetton.dest.clone(), jetton.jetton_amount);
+        payload
+            .with_query_id(jetton.query_id)
+            .with_response_destination(jetton.response_address.clone())
+            .with_custom_payload(custom_payload_cell)
+            .with_forward_ton_amount(jetton.forward_ton_amount);
+
+        if let Some(comment) = comment {
+            payload.with_comment(comment);
+        }
+
+        payload
+            .build()
+            .map(Cell::into_arc)
+            .context("Error generating Jetton Transfer payload")
+    }
+
+    fn custom_payload(payload: &str) -> CellResult<CellArc> {
+        BagOfCells::parse_base64(payload)
+            .context("Error parsing custom Transfer payload")?
+            .single_root()
+            .map(Arc::clone)
+            .context("Custom Transfer payload must contain only one single root")
+    }
+
+    fn maybe_custom_state_init(request: &TransferRequest) -> CellResult<Option<CellArc>> {
+        let Some(ref state_init) = request.state_init else {
+            return Ok(None);
+        };
+
+        let state_init_cell = BagOfCells::parse_base64(state_init)
+            .context("Error parsing Transfer stateInit")?
+            .single_root()
+            .map(Arc::clone)
+            .context("stateInit must contain only one single root")?;
+        Ok(Some(state_init_cell))
+    }
+}
+
+pub struct ExternalMessageCreator;
+
+impl ExternalMessageCreator {
+    pub fn create_external_message_to_sign(request: &SigningRequest) -> CellResult<Cell> {
+        if request.messages.is_empty() {
+            return CellError::err(CellErrorType::CellBuilderError)
+                .context("There must be at least one Transfer message");
+        }
+
+        let internal_messages = request
+            .messages
+            .iter()
+            .map(InternalMessageCreator::create_internal_message)
+            .collect::<CellResult<Vec<_>>>()?;
+
+        request
+            .wallet
+            .create_external_body(request.expire_at, request.seqno, internal_messages)
+            .context("Error generating an external message cell")
+    }
+}
diff --git a/rust/chains/tw_ton/src/signing_request/mod.rs b/rust/chains/tw_ton/src/signing_request/mod.rs
new file mode 100644
index 00000000000..e9eca9c07ca
--- /dev/null
+++ b/rust/chains/tw_ton/src/signing_request/mod.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use crate::wallet::VersionedTonWallet;
+use tw_number::U256;
+
+pub mod builder;
+pub mod cell_creator;
+
+pub enum TransferPayload {
+    /// Jetton Transfer message payload.
+    JettonTransfer(JettonTransferRequest),
+    /// Custom Transfer message payload.
+    Custom(String),
+}
+
+pub struct TransferRequest {
+    /// TON recipient address.
+    /// Also determines whether the transaction is bounceable or not.
+    pub dest: TonAddress,
+    /// Amount to send in nanotons.
+    pub ton_amount: U256,
+    /// Send mode.
+    /// https://ton.org/docs/develop/func/stdlib#send_raw_message
+    pub mode: u8,
+    /// Transfer comment message.
+    pub comment: Option<String>,
+    /// Raw one-cell BoC encoded in Base64. Can be used to deploy a smart contract.
+    pub state_init: Option<String>,
+    /// Transfer payload.
+    pub payload: Option<TransferPayload>,
+}
+
+pub struct JettonTransferRequest {
+    /// Arbitrary request number.
+    pub query_id: u64,
+    /// Amount of transferred jettons in elementary integer units.
+    /// The real value transferred is `jetton_amount` multiplied by ten to the power of token decimal precision.
+    pub jetton_amount: U256,
+    /// Address of the new owner of the jettons.
+    pub dest: TonAddress,
+    /// Address where to send a response with confirmation of a successful transfer and the rest of the incoming message Toncoins.
+    /// Usually the sender should get back their toncoins.
+    pub response_address: TonAddress,
+    /// Optional custom payload. Can be used for mintless jetton transfers.
+    pub custom_payload: Option<String>,
+    /// Amount in nanotons to forward to recipient. Basically minimum amount - 1 nanoton should be used.
+    pub forward_ton_amount: U256,
+}
+
+pub struct SigningRequest {
+    /// Wallet initialized with the user's key-pair or public key.
+    pub wallet: VersionedTonWallet,
+    pub messages: Vec<TransferRequest>,
+    /// External message counter.
+    /// https://ton.org/docs/develop/smart-contracts/guidelines/external-messages
+    pub seqno: u32,
+    /// Expiration UNIX timestamp.
+    pub expire_at: u32,
+}
diff --git a/rust/chains/tw_ton/src/transaction.rs b/rust/chains/tw_ton/src/transaction.rs
new file mode 100644
index 00000000000..1fdf8e8d925
--- /dev/null
+++ b/rust/chains/tw_ton/src/transaction.rs
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use tw_number::U256;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::*;
+use tw_ton_sdk::message::state_init::StateInit;
+
+/// See an example at https://docs.ton.org/develop/smart-contracts/tutorials/wallet#contract-deployment-via-wallet
+pub const INCOMING_EXTERNAL_TRANSACTION: u8 = 0b10;
+
+pub struct SignedTransaction {
+    pub src_address: TonAddress,
+    pub dest_address: TonAddress,
+    pub import_fee: U256,
+    /// Created via `StateInit`.
+    pub state_init: Option<StateInit>,
+    pub signed_body: Cell,
+}
+
+impl SignedTransaction {
+    pub fn build(&self) -> CellResult<Cell> {
+        let mut wrap_builder = CellBuilder::new();
+        wrap_builder
+            .store_u8(2, INCOMING_EXTERNAL_TRANSACTION)? // incoming external transaction
+            .store_address(&self.src_address)? // src
+            .store_address(&self.dest_address)? // dest
+            .store_coins(&self.import_fee)?; // import fee
+
+        if let Some(ref state_init) = self.state_init {
+            wrap_builder.store_bit(true)?; // state init present
+            wrap_builder.store_bit(true)?; // state init in ref
+            wrap_builder.store_child(state_init.to_cell()?)?; // state init
+        } else {
+            wrap_builder.store_bit(false)?; // state init absent
+        }
+
+        wrap_builder.store_bit(true)?; // signed_body is always defined
+        wrap_builder.store_child(self.signed_body.clone())?; // Signed body
+
+        wrap_builder.build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/wallet/mod.rs b/rust/chains/tw_ton/src/wallet/mod.rs
new file mode 100644
index 00000000000..8b4a01311b7
--- /dev/null
+++ b/rust/chains/tw_ton/src/wallet/mod.rs
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use crate::message::internal_message::InternalMessage;
+use crate::message::signed_message::signed_message_v4::SignedMessageV4;
+use crate::message::signed_message::signed_message_v5::SignedMessageV5;
+use crate::transaction::SignedTransaction;
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::ed25519::Signature;
+use tw_keypair::traits::SigningKeyTrait;
+use tw_number::U256;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::{cell_to_signing_error, CellResult};
+use tw_ton_sdk::message::state_init::StateInit;
+
+pub mod wallet_v4;
+pub mod wallet_v5;
+
+/// Notes: Rust specialization for generic code is not completed. See https://github.com/rust-lang/rust/issues/31844
+/// Currently, we use a workaround to implement the versioned TonWallet struct.
+/// After the Rust specialization feature is finished, maybe we can remove this workaround.
+pub enum VersionedTonWallet {
+    V4R2(wallet_v4::WalletV4R2),
+    V5R1(wallet_v5::WalletV5R1),
+}
+
+impl VersionedTonWallet {
+    pub fn address(&self) -> &TonAddress {
+        match self {
+            Self::V4R2(wallet_v4r2) => &wallet_v4r2.address,
+            Self::V5R1(wallet_v5r1) => &wallet_v5r1.address,
+        }
+    }
+
+    pub fn state_init(&self) -> CellResult<StateInit> {
+        match self {
+            Self::V4R2(wallet_v4r2) => wallet_v4r2.state_init(),
+            Self::V5R1(wallet_v5r1) => wallet_v5r1.state_init(),
+        }
+    }
+
+    pub fn create_external_body(
+        &self,
+        expire_at: u32,
+        seqno: u32,
+        internal_messages: Vec<InternalMessage>,
+    ) -> CellResult<Cell> {
+        match self {
+            Self::V4R2(wallet_v4r2) => {
+                wallet_v4r2.create_external_body(expire_at, seqno, internal_messages)
+            },
+            Self::V5R1(wallet_v5r1) => {
+                wallet_v5r1.create_external_body(expire_at, seqno, internal_messages)
+            },
+        }
+    }
+
+    pub fn sign_external_message(&self, external_message: Cell) -> SigningResult<Cell> {
+        let message_hash = external_message.cell_hash();
+        let sig = match self {
+            Self::V4R2(wallet_v4r2) => wallet_v4r2.private_key.as_ref(),
+            Self::V5R1(wallet_v5r1) => wallet_v5r1.private_key.as_ref(),
+        }
+        .or_tw_err(SigningErrorType::Error_internal)
+        .context("'TonWallet' should be initialized with a key-pair to be able to sign a message")?
+        .sign(message_hash.to_vec())?;
+
+        self.compile_signed_external_message(external_message, sig)
+    }
+
+    pub fn compile_signed_external_message(
+        &self,
+        external_message: Cell,
+        sig: Signature,
+    ) -> SigningResult<Cell> {
+        match self {
+            Self::V4R2(_) => Ok(SignedMessageV4 {
+                signature: sig.to_bytes(),
+                external_message,
+            }
+            .build()
+            .map_err(cell_to_signing_error)?),
+
+            Self::V5R1(_) => Ok(SignedMessageV5 {
+                signature: sig.to_bytes(),
+                external_message,
+            }
+            .build()
+            .map_err(cell_to_signing_error)?),
+        }
+    }
+
+    pub fn sign_transaction(
+        &self,
+        external_message: Cell,
+        state_init: bool,
+    ) -> SigningResult<SignedTransaction> {
+        let signed_external_message = self.sign_external_message(external_message.clone())?;
+        self.compile_transaction(signed_external_message, state_init)
+    }
+
+    pub fn compile_transaction(
+        &self,
+        signed_external_message: Cell,
+        state_init: bool,
+    ) -> SigningResult<SignedTransaction> {
+        let state_init = if state_init {
+            let state_init = self.state_init().map_err(cell_to_signing_error)?;
+            Some(state_init)
+        } else {
+            None
+        };
+
+        Ok(SignedTransaction {
+            src_address: TonAddress::null(),
+            // The wallet contract address.
+            dest_address: self.address().clone(),
+            import_fee: U256::zero(),
+            state_init,
+            signed_body: signed_external_message,
+        })
+    }
+}
diff --git a/rust/chains/tw_ton/src/wallet/wallet_v4.rs b/rust/chains/tw_ton/src/wallet/wallet_v4.rs
new file mode 100644
index 00000000000..2ecb279a1e1
--- /dev/null
+++ b/rust/chains/tw_ton/src/wallet/wallet_v4.rs
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use crate::message::external_message::wallet_v4::ExternalMessageWalletV4;
+use crate::message::internal_message::InternalMessage;
+use crate::resources::{BASE_WORKCHAIN, DEFAULT_WALLET_ID, WALLET_V4R2_CODE};
+use std::sync::Arc;
+use tw_keypair::ed25519::sha512::{KeyPair, PrivateKey, PublicKey};
+use tw_keypair::traits::KeyPairTrait;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::CellResult;
+use tw_ton_sdk::message::state_init::StateInit;
+
+pub struct WalletV4R2 {
+    pub public_key: PublicKey,
+    pub(crate) private_key: Option<PrivateKey>,
+    /// TON address derived from the [`TonWallet::public_key`].
+    pub address: TonAddress,
+    pub wallet_id: i32,
+}
+
+impl WalletV4R2 {
+    /// Creates a standard TON wallet from the given public key.
+    /// Please note when created with public key only, wallet cannot be used to sign messages.
+    pub fn std_with_public_key(public_key: PublicKey) -> CellResult<Self> {
+        let wallet_id = DEFAULT_WALLET_ID;
+        Self::with_public_key(BASE_WORKCHAIN, public_key, wallet_id)
+    }
+
+    /// Creates a standard TON wallet from the given key-pair.
+    pub fn std_with_key_pair(key_pair: &KeyPair) -> CellResult<Self> {
+        let wallet_id = DEFAULT_WALLET_ID;
+        Self::with_key_pair(BASE_WORKCHAIN, key_pair, wallet_id)
+    }
+
+    /// Creates a TON wallet from the given public key.
+    /// Please note when created with public key only, wallet cannot be used to sign messages.
+    pub(crate) fn with_public_key(
+        workchain: i32,
+        public_key: PublicKey,
+        wallet_id: i32,
+    ) -> CellResult<Self> {
+        Self::new(workchain, public_key, None, wallet_id)
+    }
+
+    /// Creates a TON wallet from the given key-pair.
+    fn with_key_pair(workchain: i32, key_pair: &KeyPair, wallet_id: i32) -> CellResult<Self> {
+        let public = key_pair.public().clone();
+        let private = key_pair.private().clone();
+        Self::new(workchain, public, Some(private), wallet_id)
+    }
+
+    /// Private function to create the VersionedTonWallet with the given public and optional private keys.
+    /// Do not make it public as the function caller can provide unrelated keys.
+    fn new(
+        workchain: i32,
+        public_key: PublicKey,
+        private_key: Option<PrivateKey>,
+        wallet_id: i32,
+    ) -> CellResult<Self> {
+        let state_init_hash = Self::state_init_impl(&public_key, wallet_id)?.create_account_id()?;
+        let address = TonAddress::new(workchain, state_init_hash);
+
+        Ok(Self {
+            public_key,
+            private_key,
+            address,
+            wallet_id,
+        })
+    }
+
+    /// Return the stateInit for the wallet.
+    pub fn state_init(&self) -> CellResult<StateInit> {
+        Self::state_init_impl(&self.public_key, self.wallet_id)
+    }
+
+    fn state_init_impl(public_key: &PublicKey, wallet_id: i32) -> CellResult<StateInit> {
+        let seqno = 0;
+
+        let mut builder = CellBuilder::new();
+        builder
+            .store_u32(32, seqno)?
+            .store_i32(32, wallet_id)?
+            .store_slice(public_key.as_slice())?
+            // empty plugin dict
+            .store_bit(false)?;
+
+        let initial_data = builder.build()?.into_arc();
+        let code = WALLET_V4R2_CODE.single_root().map(Arc::clone)?;
+
+        Ok(StateInit::default().set_code(code).set_data(initial_data))
+    }
+
+    pub(crate) fn create_external_body(
+        &self,
+        expire_at: u32,
+        seqno: u32,
+        internal_messages: Vec<InternalMessage>,
+    ) -> CellResult<Cell> {
+        ExternalMessageWalletV4 {
+            wallet_id: self.wallet_id,
+            expire_at,
+            seqno,
+            internal_messages,
+        }
+        .build()
+    }
+}
diff --git a/rust/chains/tw_ton/src/wallet/wallet_v5.rs b/rust/chains/tw_ton/src/wallet/wallet_v5.rs
new file mode 100644
index 00000000000..98a45b6a94e
--- /dev/null
+++ b/rust/chains/tw_ton/src/wallet/wallet_v5.rs
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::TonAddress;
+use crate::message::external_message::wallet_v5::{ExternalMessageWalletV5, V5R1OpCode};
+use crate::message::internal_message::InternalMessage;
+use crate::message::out_list::out_action::{OutAction, OutActionType};
+use crate::resources::{BASE_WORKCHAIN, WALLET_ID_V5R1_TON_MAINNET, WALLET_V5R1_CODE};
+use std::sync::Arc;
+use tw_keypair::ed25519::sha512::{KeyPair, PrivateKey, PublicKey};
+use tw_keypair::traits::KeyPairTrait;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+use tw_ton_sdk::error::CellResult;
+use tw_ton_sdk::message::state_init::StateInit;
+
+pub struct WalletV5R1 {
+    pub public_key: PublicKey,
+    pub(crate) private_key: Option<PrivateKey>,
+    /// TON address derived from the [`TonWallet::public_key`].
+    pub address: TonAddress,
+    pub wallet_id: i32,
+}
+
+impl WalletV5R1 {
+    /// Creates a standard TON wallet from the given public key.
+    /// Please note when created with public key only, wallet cannot be used to sign messages.
+    pub fn std_with_public_key(public_key: PublicKey) -> CellResult<Self> {
+        let wallet_id = WALLET_ID_V5R1_TON_MAINNET;
+        Self::with_public_key(BASE_WORKCHAIN, public_key, wallet_id)
+    }
+
+    /// Creates a standard TON wallet from the given key-pair.
+    pub fn std_with_key_pair(key_pair: &KeyPair) -> CellResult<Self> {
+        let wallet_id = WALLET_ID_V5R1_TON_MAINNET;
+        Self::with_key_pair(BASE_WORKCHAIN, key_pair, wallet_id)
+    }
+
+    /// Creates a TON wallet from the given public key.
+    /// Please note when created with public key only, wallet cannot be used to sign messages.
+    pub(crate) fn with_public_key(
+        workchain: i32,
+        public_key: PublicKey,
+        wallet_id: i32,
+    ) -> CellResult<Self> {
+        Self::new(workchain, public_key, None, wallet_id)
+    }
+
+    /// Creates a TON wallet from the given key-pair.
+    fn with_key_pair(workchain: i32, key_pair: &KeyPair, wallet_id: i32) -> CellResult<Self> {
+        let public = key_pair.public().clone();
+        let private = key_pair.private().clone();
+        Self::new(workchain, public, Some(private), wallet_id)
+    }
+
+    /// Private function to create the VersionedTonWallet with the given public and optional private keys.
+    /// Do not make it public as the function caller can provide unrelated keys.
+    fn new(
+        workchain: i32,
+        public_key: PublicKey,
+        private_key: Option<PrivateKey>,
+        wallet_id: i32,
+    ) -> CellResult<Self> {
+        let state_init_hash = Self::state_init_impl(&public_key, wallet_id)?.create_account_id()?;
+        let address = TonAddress::new(workchain, state_init_hash);
+
+        Ok(Self {
+            public_key,
+            private_key,
+            address,
+            wallet_id,
+        })
+    }
+
+    /// Return the stateInit for the wallet.
+    pub(crate) fn state_init(&self) -> CellResult<StateInit> {
+        Self::state_init_impl(&self.public_key, self.wallet_id)
+    }
+
+    fn state_init_impl(public_key: &PublicKey, wallet_id: i32) -> CellResult<StateInit> {
+        let seqno = 0;
+
+        let mut builder = CellBuilder::new();
+        builder
+            .store_bit(true)? // signature auth allowed
+            .store_u32(32, seqno)?
+            .store_i32(32, wallet_id)?
+            .store_slice(public_key.as_slice())?
+            // empty plugin dict
+            .store_bit(false)?;
+
+        let initial_data = builder.build()?.into_arc();
+        let code = WALLET_V5R1_CODE.single_root().map(Arc::clone)?;
+
+        Ok(StateInit::default().set_code(code).set_data(initial_data))
+    }
+
+    pub(crate) fn create_external_body(
+        &self,
+        expire_at: u32,
+        seqno: u32,
+        internal_messages: Vec<InternalMessage>,
+    ) -> CellResult<Cell> {
+        // Convert internal_messages to basic_actions
+        let basic_actions: Vec<OutAction> = internal_messages
+            .into_iter()
+            .map(|msg| OutAction {
+                typ: OutActionType::SendMsg,
+                mode: msg.mode,
+                data: msg.message,
+            })
+            .collect();
+
+        ExternalMessageWalletV5 {
+            opcode: V5R1OpCode::AuthSignedExternal,
+            wallet_id: self.wallet_id,
+            expire_at,
+            seqno,
+            basic_actions,
+        }
+        .build()
+    }
+}
diff --git a/rust/chains/tw_ton/tests/address.rs b/rust/chains/tw_ton/tests/address.rs
new file mode 100644
index 00000000000..fb99cd0c008
--- /dev/null
+++ b/rust/chains/tw_ton/tests/address.rs
@@ -0,0 +1,39 @@
+use tw_keypair::ed25519::sha512::KeyPair;
+use tw_keypair::traits::KeyPairTrait;
+use tw_ton::wallet::wallet_v5;
+
+/// Tests for TON V5R1 address.
+///
+/// Note: These tests should move to rust/tw_any_coin/tests/chains/ton/ton_address.rs after we define
+/// a new Derivation for the TON V5R1 address.
+#[test]
+fn test_ton_v5r1_address_derive() {
+    let test_cases = [(
+        "3570e35f54cfb843f2cfaf2b8cae7ceeb7b32225d7dbbd86f611056d74d9073e", // private key
+        "UQAU3o5-Sp1MYRpw3U7b_wmARxqI49LxiFhEoVCxpUKjTYXk", // V5R1 address on the mainnet
+    )];
+
+    for test_case in test_cases.iter() {
+        let private_key_hex = test_case.0;
+        let expected_address = test_case.1;
+
+        // Decode the private key from hex
+        let private_key_bytes =
+            tw_encoding::hex::decode(private_key_hex).expect("Invalid hex string");
+
+        // Create a KeyPair from the private key bytes
+        let key_pair =
+            KeyPair::try_from(private_key_bytes.as_slice()).expect("Failed to create key pair");
+
+        // Extract the public key from the KeyPair
+        let public_key = key_pair.public().clone();
+
+        // Create the VersionedTonWallet using the public key
+        let wallet = wallet_v5::WalletV5R1::std_with_public_key(public_key)
+            .expect("Failed to create wallet");
+
+        let actual_address = wallet.address.to_string();
+
+        assert_eq!(actual_address, expected_address);
+    }
+}
diff --git a/rust/coverage.stats b/rust/coverage.stats
new file mode 100644
index 00000000000..fd6ae261616
--- /dev/null
+++ b/rust/coverage.stats
@@ -0,0 +1 @@
+94.0
\ No newline at end of file
diff --git a/rust/frameworks/tw_ton_sdk/Cargo.toml b/rust/frameworks/tw_ton_sdk/Cargo.toml
new file mode 100644
index 00000000000..c8544bef84b
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/Cargo.toml
@@ -0,0 +1,21 @@
+[package]
+name = "tw_ton_sdk"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bitreader = "0.3.8"
+bitstream-io = "2.5.0"
+crc = "3"
+lazy_static = "1.4.0"
+num-bigint = "0.4"
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_hash = { path = "../../tw_hash" }
+tw_memory = { path = "../../tw_memory" }
+tw_number = { path = "../../tw_number" }
+
+[dev-dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
diff --git a/rust/frameworks/tw_ton_sdk/fuzz/.gitignore b/rust/frameworks/tw_ton_sdk/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/frameworks/tw_ton_sdk/fuzz/Cargo.toml b/rust/frameworks/tw_ton_sdk/fuzz/Cargo.toml
new file mode 100644
index 00000000000..2536b143a70
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/fuzz/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "tw_ton_sdk-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+
+[dependencies.tw_ton_sdk]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "boc_encode"
+path = "fuzz_targets/boc_encode.rs"
+test = false
+doc = false
diff --git a/rust/frameworks/tw_ton_sdk/fuzz/fuzz_targets/boc_encode.rs b/rust/frameworks/tw_ton_sdk/fuzz/fuzz_targets/boc_encode.rs
new file mode 100644
index 00000000000..fd178943d78
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/fuzz/fuzz_targets/boc_encode.rs
@@ -0,0 +1,8 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_ton_sdk::boc::BagOfCells;
+
+fuzz_target!(|data: &[u8]| {
+    let _ = BagOfCells::parse(data);
+});
diff --git a/rust/frameworks/tw_ton_sdk/src/address/address_data.rs b/rust/frameworks/tw_ton_sdk/src/address/address_data.rs
new file mode 100644
index 00000000000..73784543467
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/address/address_data.rs
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_hash::H256;
+
+const WORKCHAIN_MASK: i32 = 0xff;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct AddressData {
+    pub workchain: i32,
+    pub hash_part: H256,
+}
+
+impl AddressData {
+    pub const NULL: AddressData = AddressData::null();
+
+    pub const fn null() -> AddressData {
+        AddressData {
+            workchain: 0,
+            hash_part: H256::new(),
+        }
+    }
+
+    pub fn new(workchain: i32, hash_part: H256) -> AddressData {
+        AddressData {
+            workchain,
+            hash_part,
+        }
+    }
+
+    pub fn workchain_byte(&self) -> u8 {
+        (self.workchain & WORKCHAIN_MASK) as u8
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/address/mod.rs b/rust/frameworks/tw_ton_sdk/src/address/mod.rs
new file mode 100644
index 00000000000..0a9b80e7d60
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/address/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address_data;
+pub mod raw_address;
+pub mod user_friendly_address;
diff --git a/rust/frameworks/tw_ton_sdk/src/address/raw_address.rs b/rust/frameworks/tw_ton_sdk/src/address/raw_address.rs
new file mode 100644
index 00000000000..37c18357c4d
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/address/raw_address.rs
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::address_data::AddressData;
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::AddressError;
+use tw_encoding::hex;
+use tw_hash::H256;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct RawAddress(AddressData);
+
+impl RawAddress {
+    #[inline]
+    pub fn into_data(self) -> AddressData {
+        self.0
+    }
+}
+
+impl AsRef<AddressData> for RawAddress {
+    #[inline]
+    fn as_ref(&self) -> &AddressData {
+        &self.0
+    }
+}
+
+impl From<AddressData> for RawAddress {
+    #[inline]
+    fn from(value: AddressData) -> Self {
+        RawAddress(value)
+    }
+}
+
+impl FromStr for RawAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let mut it = s.split(':');
+
+        let workchain = it
+            .next()
+            .ok_or(AddressError::MissingPrefix)?
+            .parse::<i32>()
+            .map_err(|_| AddressError::InvalidInput)?;
+
+        let hash_hex = it.next().ok_or(AddressError::InvalidInput)?;
+        let decoded_hash_part = hex::decode(hash_hex).map_err(|_| AddressError::FromHexError)?;
+
+        let hash_part =
+            H256::try_from(decoded_hash_part.as_slice()).map_err(|_| AddressError::InvalidInput)?;
+
+        // Expected only 2 parts of the hex-encoded address.
+        if it.next().is_some() {
+            return Err(AddressError::InvalidInput);
+        }
+
+        Ok(RawAddress(AddressData::new(workchain, hash_part)))
+    }
+}
+
+impl fmt::Display for RawAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let prefixed = false;
+        write!(
+            f,
+            "{}:{}",
+            self.0.workchain,
+            hex::encode(self.0.hash_part, prefixed)
+        )
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/address/user_friendly_address.rs b/rust/frameworks/tw_ton_sdk/src/address/user_friendly_address.rs
new file mode 100644
index 00000000000..b1723e108d1
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/address/user_friendly_address.rs
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::address_data::AddressData;
+use crate::crc::CRC_16_XMODEM;
+use tw_coin_entry::error::prelude::{AddressError, AddressResult};
+use tw_encoding::base64;
+use tw_encoding::base64::{NO_PAD, URL_NO_PAD};
+use tw_hash::{H256, H288};
+
+const BASE64_ADDRESS_LEN: usize = 48;
+const CHECKSUM_MASK: u16 = 0xff;
+
+const BOUNCEABLE: u8 = 0x11;
+const NON_BOUNCEABLE: u8 = 0x51;
+const BOUNCEABLE_TESTNET: u8 = 0x91;
+const NON_BOUNCEABLE_TESTNET: u8 = 0xD1;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct UserFriendlyAddress {
+    data: AddressData,
+    bounceable: bool,
+    testnet: bool,
+}
+
+impl UserFriendlyAddress {
+    #[inline]
+    pub const fn with_flags(data: AddressData, bounceable: bool, testnet: bool) -> Self {
+        UserFriendlyAddress {
+            data,
+            bounceable,
+            testnet,
+        }
+    }
+
+    #[inline]
+    pub fn into_data(self) -> AddressData {
+        self.data
+    }
+
+    #[inline]
+    pub fn bounceable(&self) -> bool {
+        self.bounceable
+    }
+
+    #[inline]
+    pub fn testnet(&self) -> bool {
+        self.testnet
+    }
+
+    #[inline]
+    pub fn set_bounceable(self, bounceable: bool) -> Self {
+        UserFriendlyAddress { bounceable, ..self }
+    }
+
+    #[inline]
+    pub fn set_testnet(self, testnet: bool) -> Self {
+        UserFriendlyAddress { testnet, ..self }
+    }
+
+    /// Parses url-safe base64 representation of an address
+    ///
+    /// # Returns
+    /// the address, non-bounceable flag, non-production flag.
+    pub fn from_base64_url(s: &str) -> AddressResult<Self> {
+        Self::from_base64_with_config(s, URL_NO_PAD)
+    }
+
+    /// Parses standard base64 representation of an address
+    ///
+    /// # Returns
+    /// the address, bounceable flag, testnet flag.
+    pub fn from_base64_std(s: &str) -> AddressResult<Self> {
+        Self::from_base64_with_config(s, NO_PAD)
+    }
+
+    /// Parses base64 representation of an address with encoding config.
+    ///
+    /// # Returns
+    /// the address, non-bounceable flag, non-production flag.
+    fn from_base64_with_config(s: &str, config: base64::Config) -> AddressResult<Self> {
+        if s.len() != BASE64_ADDRESS_LEN {
+            return Err(AddressError::InvalidInput);
+        }
+        let bytes = base64::decode(s, config).map_err(|_| AddressError::FromBase64Error)?;
+        // Address length has been checked already.
+        let slice = H288::try_from(bytes.as_slice()).map_err(|_| AddressError::Internal)?;
+        Self::from_base64_bytes(slice)
+    }
+
+    /// Parses decoded base64 representation of an address
+    ///
+    /// # Returns
+    /// the address, bounceable flag, testnet flag.
+    fn from_base64_bytes(bytes: H288) -> AddressResult<Self> {
+        let (bounceable, testnet) = match bytes[0] {
+            BOUNCEABLE => (true, false),
+            NON_BOUNCEABLE => (false, false),
+            BOUNCEABLE_TESTNET => (true, true),
+            NON_BOUNCEABLE_TESTNET => (false, true),
+            _ => return Err(AddressError::InvalidInput),
+        };
+
+        let workchain = bytes[1] as i8 as i32;
+
+        let calc_crc = CRC_16_XMODEM.checksum(&bytes[0..34]);
+        let addr_crc = ((bytes[34] as u16) << 8) | bytes[35] as u16;
+        if calc_crc != addr_crc {
+            return Err(AddressError::InvalidChecksum);
+        }
+
+        let hash_part = H256::try_from(&bytes[2..34]).expect("Expected exactly 32 bytes");
+        let data = AddressData::new(workchain, hash_part);
+        Ok(UserFriendlyAddress {
+            data,
+            bounceable,
+            testnet,
+        })
+    }
+
+    pub fn to_base64_url(&self) -> String {
+        self.to_base64_with_config(URL_NO_PAD)
+    }
+
+    pub fn to_base64_std(&self) -> String {
+        self.to_base64_with_config(NO_PAD)
+    }
+
+    fn to_base64_with_config(&self, config: base64::Config) -> String {
+        let bytes = self.to_base64_bytes();
+        base64::encode(bytes.as_slice(), config)
+    }
+
+    fn to_base64_bytes(&self) -> H288 {
+        let mut bytes = H288::default();
+        let tag: u8 = match (self.bounceable, self.testnet) {
+            (false, false) => NON_BOUNCEABLE,
+            (true, false) => BOUNCEABLE,
+            (false, true) => NON_BOUNCEABLE_TESTNET,
+            (true, true) => BOUNCEABLE_TESTNET,
+        };
+        bytes[0] = tag;
+        bytes[1] = self.data.workchain_byte();
+        bytes[2..34].clone_from_slice(self.data.hash_part.as_slice());
+        let crc = CRC_16_XMODEM.checksum(&bytes[0..34]);
+        bytes[34] = ((crc >> 8) & CHECKSUM_MASK) as u8;
+        bytes[35] = (crc & CHECKSUM_MASK) as u8;
+
+        bytes
+    }
+}
+
+impl AsRef<AddressData> for UserFriendlyAddress {
+    #[inline]
+    fn as_ref(&self) -> &AddressData {
+        &self.data
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/boc/binary_reader.rs b/rust/frameworks/tw_ton_sdk/src/boc/binary_reader.rs
new file mode 100644
index 00000000000..5ae28069164
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/boc/binary_reader.rs
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::error::{CellErrorType, CellResult};
+use bitstream_io::{BigEndian, ByteRead, ByteReader};
+use std::io::Cursor;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+
+pub struct BinaryReader<'a> {
+    reader: ByteReader<Cursor<&'a [u8]>, BigEndian>,
+}
+
+#[allow(dead_code)]
+impl<'a> BinaryReader<'a> {
+    pub fn new(data: &'a [u8]) -> Self {
+        let cursor = Cursor::new(data);
+        BinaryReader {
+            reader: ByteReader::new(cursor),
+        }
+    }
+
+    pub fn read_u8(&mut self) -> CellResult<u8> {
+        self.reader
+            .read::<u8>()
+            .tw_err(|_| CellErrorType::BagOfCellsDeserializationError)
+    }
+
+    pub fn read_u32(&mut self) -> CellResult<u32> {
+        self.reader
+            .read::<u32>()
+            .tw_err(|_| CellErrorType::BagOfCellsDeserializationError)
+    }
+
+    pub fn read_bytes(&mut self, buf: &mut [u8]) -> CellResult<()> {
+        self.reader
+            .read_bytes(buf)
+            .tw_err(|_| CellErrorType::BagOfCellsDeserializationError)
+    }
+
+    pub fn read_to_vec(&mut self, num_bytes: usize) -> CellResult<Data> {
+        self.reader
+            .read_to_vec(num_bytes)
+            .tw_err(|_| CellErrorType::BagOfCellsDeserializationError)
+    }
+
+    pub fn read_var_size(&mut self, num_bytes: usize) -> CellResult<usize> {
+        let mut bytes = vec![0; num_bytes];
+        self.read_bytes(&mut bytes)?;
+
+        let mut result = 0;
+        for &byte in &bytes {
+            result <<= 8;
+            result |= usize::from(byte);
+        }
+        Ok(result)
+    }
+
+    pub fn skip(&mut self, num_bytes: u32) -> CellResult<()> {
+        self.reader
+            .skip(num_bytes)
+            .tw_err(|_| CellErrorType::BagOfCellsDeserializationError)
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/boc/binary_writer.rs b/rust/frameworks/tw_ton_sdk/src/boc/binary_writer.rs
new file mode 100644
index 00000000000..688d71f4e18
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/boc/binary_writer.rs
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::error::{CellErrorType, CellResult};
+use bitstream_io::{BigEndian, BitWrite, BitWriter, Numeric};
+use tw_coin_entry::error::prelude::{MapTWError, OrTWError, ResultContext};
+use tw_memory::Data;
+
+pub struct BinaryWriter {
+    writer: BitWriter<Data, BigEndian>,
+}
+
+impl BinaryWriter {
+    pub fn with_capacity(capacity: usize) -> BinaryWriter {
+        BinaryWriter {
+            writer: BitWriter::new(Vec::with_capacity(capacity)),
+        }
+    }
+
+    pub fn write_bit(&mut self, bit: bool) -> CellResult<&mut Self> {
+        self.writer
+            .write_bit(bit)
+            .tw_err(|_| CellErrorType::BagOfCellsSerializationError)?;
+        Ok(self)
+    }
+
+    pub fn write<V>(&mut self, bits: u32, val: V) -> CellResult<&mut Self>
+    where
+        V: Numeric,
+    {
+        self.writer
+            .write(bits, val)
+            .tw_err(|_| CellErrorType::BagOfCellsSerializationError)?;
+        Ok(self)
+    }
+
+    pub fn write_bytes(&mut self, bytes: &[u8]) -> CellResult<&mut Self> {
+        self.writer
+            .write_bytes(bytes)
+            .tw_err(|_| CellErrorType::BagOfCellsSerializationError)?;
+        Ok(self)
+    }
+
+    /// TODO the function doesn't count `bit_len / 8` count of bytes.
+    /// Original code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell.rs#L507-L526
+    pub(crate) fn write_bits(&mut self, data: &[u8], bit_len: usize) -> CellResult<()> {
+        let data_len = data.len();
+        let rest_bits = bit_len % 8;
+        let full_bytes = rest_bits == 0;
+
+        if full_bytes {
+            self.write_bytes(data)?;
+        } else {
+            self.write_bytes(&data[..data_len - 1])?;
+            let last_byte = data[data_len - 1];
+            let l = last_byte | 1 << (8 - rest_bits - 1);
+            self.write(8, l)?;
+        }
+
+        Ok(())
+    }
+
+    pub fn bytes_if_aligned(&mut self) -> CellResult<&[u8]> {
+        self.writer
+            .writer()
+            .map(|vec| vec.as_slice())
+            .or_tw_err(CellErrorType::BagOfCellsSerializationError)
+            .context("Stream is not byte-aligned")
+    }
+
+    /// Pads the stream with 0 bits until it is aligned at a whole byte.
+    /// Does nothing if the stream is already aligned.
+    /// Returns the number of trailing zero bits required to align the Cell.
+    pub fn align(&mut self) -> CellResult<usize> {
+        let mut trailing_zeros = 0;
+        while !self.writer.byte_aligned() {
+            self.write_bit(false)?;
+            trailing_zeros += 1;
+        }
+        Ok(trailing_zeros)
+    }
+
+    pub fn finish(mut self) -> CellResult<Data> {
+        self.bytes_if_aligned().map(|slice| slice.to_vec())
+    }
+}
+
+impl Default for BinaryWriter {
+    fn default() -> Self {
+        BinaryWriter {
+            writer: BitWriter::new(Vec::default()),
+        }
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/boc/boc_to_raw_boc.rs b/rust/frameworks/tw_ton_sdk/src/boc/boc_to_raw_boc.rs
new file mode 100644
index 00000000000..c3f4e3d60e0
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/boc/boc_to_raw_boc.rs
@@ -0,0 +1,162 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell/raw_boc_from_boc.rs
+
+use crate::boc::raw::{RawBagOfCells, RawCell};
+use crate::boc::BagOfCells;
+use crate::cell::{Cell, CellArc};
+use crate::error::{CellErrorType, CellResult};
+use std::cell::RefCell;
+use std::collections::BTreeMap;
+use std::sync::Arc;
+use tw_coin_entry::error::prelude::{OrTWError, ResultContext};
+use tw_hash::H256;
+
+type IndexedCellRef = RefCell<IndexedCell>;
+type CellsByHash = BTreeMap<H256, IndexedCellRef>;
+
+#[derive(Debug, Clone)]
+struct IndexedCell {
+    index: usize,
+    cell: CellArc,
+}
+
+pub(crate) fn convert_to_raw_boc(boc: &BagOfCells) -> CellResult<RawBagOfCells> {
+    let cells_by_hash = build_and_verify_index(&boc.roots);
+
+    // Sort indexed cells by their index value.
+    let mut index_slice: Vec<_> = cells_by_hash.values().collect();
+    index_slice.sort_unstable_by(|a, b| a.borrow().index.cmp(&b.borrow().index));
+
+    // Remove gaps in indices.
+    index_slice
+        .iter()
+        .enumerate()
+        .for_each(|(real_index, indexed_cell)| indexed_cell.borrow_mut().index = real_index);
+
+    let cells_iter = index_slice
+        .into_iter()
+        .map(|indexed_cell| indexed_cell.borrow().cell.clone());
+    let raw_cells = raw_cells_from_cells(cells_iter, &cells_by_hash)?;
+    let root_indices = root_indices(&boc.roots, &cells_by_hash)?;
+
+    Ok(RawBagOfCells {
+        cells: raw_cells,
+        roots: root_indices,
+    })
+}
+
+fn build_and_verify_index(roots: &[CellArc]) -> CellsByHash {
+    let mut current_cells: Vec<_> = roots.iter().map(Arc::clone).collect();
+    let mut new_hash_index = 0;
+
+    // The Bag of Cells serialization process is not deterministic,
+    // and these uncertainties make it difficult to write test cases.
+    // Therefore, we use a BTreeMap instead of a HashMap to remove the uncertainty.
+    let mut cells_by_hash = BTreeMap::new();
+
+    // Process cells to build the initial index.
+    while !current_cells.is_empty() {
+        let mut next_cells = Vec::with_capacity(current_cells.len() * 4);
+        for cell in current_cells.iter() {
+            let hash = cell.cell_hash();
+
+            if cells_by_hash.contains_key(&hash) {
+                continue; // Skip if already indexed.
+            }
+
+            cells_by_hash.insert(
+                hash,
+                RefCell::new(IndexedCell {
+                    cell: Arc::clone(cell),
+                    index: new_hash_index,
+                }),
+            );
+
+            new_hash_index += 1;
+            next_cells.extend(cell.references().iter().map(Arc::clone)); // Add referenced cells for the next iteration.
+        }
+
+        current_cells = next_cells;
+    }
+
+    // Ensure indices are in the correct order based on cell references.
+    let mut verify_order = true;
+    while verify_order {
+        verify_order = false;
+
+        for index_cell in cells_by_hash.values() {
+            for reference in index_cell.borrow().cell.references().iter() {
+                let ref_hash = reference.cell_hash();
+                if let Some(id_ref) = cells_by_hash.get(&ref_hash) {
+                    if id_ref.borrow().index < index_cell.borrow().index {
+                        id_ref.borrow_mut().index = new_hash_index;
+                        new_hash_index += 1;
+                        verify_order = true; // Reverify if an index was updated.
+                    }
+                }
+            }
+        }
+    }
+
+    cells_by_hash
+}
+
+fn root_indices(roots: &[CellArc], cells_dict: &CellsByHash) -> CellResult<Vec<usize>> {
+    roots
+        .iter()
+        .map(|root_cell| root_cell.cell_hash())
+        .map(|root_cell_hash| {
+            cells_dict
+                .get(&root_cell_hash)
+                .map(|index_record| index_record.borrow().index)
+                .or_tw_err(CellErrorType::BagOfCellsSerializationError)
+                .with_context(|| {
+                    format!(
+                        "Couldn't find cell with hash {root_cell_hash} while searching for roots"
+                    )
+                })
+        })
+        .collect()
+}
+
+fn raw_cells_from_cells(
+    cells: impl Iterator<Item = CellArc>,
+    cells_by_hash: &CellsByHash,
+) -> CellResult<Vec<RawCell>> {
+    cells
+        .map(|cell| raw_cell_from_cell(&cell, cells_by_hash))
+        .collect()
+}
+
+fn raw_cell_from_cell(cell: &Cell, cells_by_hash: &CellsByHash) -> CellResult<RawCell> {
+    raw_cell_reference_indices(cell, cells_by_hash).map(|reference_indices| {
+        RawCell::new(
+            cell.data().to_vec(),
+            cell.bit_len(),
+            reference_indices,
+            cell.get_level_mask(),
+            cell.is_exotic(),
+        )
+    })
+}
+
+fn raw_cell_reference_indices(cell: &Cell, cells_by_hash: &CellsByHash) -> CellResult<Vec<usize>> {
+    cell.references()
+        .iter()
+        .map(|cell| {
+            cells_by_hash
+                .get(&cell.cell_hash())
+                .or_tw_err(CellErrorType::BagOfCellsSerializationError)
+                .with_context(|| {
+                    format!(
+                        "Couldn't find cell with hash {:?} while searching for references",
+                        cell.cell_hash()
+                    )
+                })
+                .map(|cell| cell.borrow().index)
+        })
+        .collect()
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/boc/mod.rs b/rust/frameworks/tw_ton_sdk/src/boc/mod.rs
new file mode 100644
index 00000000000..b0d4a9f2be1
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/boc/mod.rs
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell/bag_of_cells.rs
+
+use crate::boc::raw::RawBagOfCells;
+use crate::cell::{Cell, CellArc};
+use crate::error::{CellError, CellErrorType, CellResult};
+use std::sync::Arc;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base64::{self, STANDARD};
+use tw_memory::Data;
+
+pub mod binary_reader;
+pub mod binary_writer;
+pub mod boc_to_raw_boc;
+pub mod raw;
+
+use boc_to_raw_boc::convert_to_raw_boc;
+
+#[derive(PartialEq, Eq, Debug, Clone, Hash)]
+pub struct BagOfCells {
+    pub roots: Vec<CellArc>,
+}
+
+impl BagOfCells {
+    pub fn from_root(root: Cell) -> BagOfCells {
+        BagOfCells {
+            roots: vec![root.into_arc()],
+        }
+    }
+
+    pub fn single_root(&self) -> CellResult<&CellArc> {
+        let root_count = self.roots.len();
+        if root_count == 1 {
+            Ok(&self.roots[0])
+        } else {
+            CellError::err(CellErrorType::CellParserError)
+                .context(format!("Single root expected, got {root_count}"))
+        }
+    }
+
+    pub fn parse(serial: &[u8]) -> CellResult<BagOfCells> {
+        let raw = RawBagOfCells::parse(serial)?;
+        let num_cells = raw.cells.len();
+        let mut cells: Vec<CellArc> = Vec::with_capacity(num_cells);
+
+        for (cell_index, raw_cell) in raw.cells.into_iter().enumerate().rev() {
+            let mut references = Vec::with_capacity(raw_cell.references.len());
+            for ref_index in &raw_cell.references {
+                if *ref_index <= cell_index {
+                    return CellError::err(CellErrorType::BagOfCellsDeserializationError)
+                        .context("References to previous cells are not supported");
+                }
+                let cell_ref_idx = (num_cells - 1)
+                    .checked_sub(*ref_index)
+                    .or_tw_err(CellErrorType::BagOfCellsDeserializationError)
+                    .context("Cell references to an out-of-bound cell")?;
+                references.push(cells[cell_ref_idx].clone());
+            }
+
+            let cell = Cell::new(
+                raw_cell.data,
+                raw_cell.bit_len,
+                references,
+                raw_cell.is_exotic,
+            )
+            .tw_err(|_| CellErrorType::BagOfCellsDeserializationError)?;
+            cells.push(cell.into_arc());
+        }
+
+        if num_cells < raw.roots.len() {
+            return CellError::err(CellErrorType::BagOfCellsDeserializationError)
+                .context("BagOfCells contains more roots than cells");
+        }
+        let roots = raw
+            .roots
+            .into_iter()
+            .map(|r| {
+                let cell_idx = (num_cells - 1)
+                    .checked_sub(r)
+                    .or_tw_err(CellErrorType::BagOfCellsDeserializationError)
+                    .context("Root index doesn't correspond to a Cell")?;
+                Ok(Arc::clone(&cells[cell_idx]))
+            })
+            .collect::<CellResult<Vec<_>>>()?;
+
+        Ok(BagOfCells { roots })
+    }
+
+    pub fn parse_base64(base64: &str) -> CellResult<BagOfCells> {
+        let bin = base64::decode(base64, STANDARD)
+            .tw_err(|_| CellErrorType::BagOfCellsDeserializationError)
+            .context("Expected base64 encoded BagOfCells")?;
+        Self::parse(&bin)
+    }
+
+    pub fn serialize(&self, has_crc32: bool) -> CellResult<Data> {
+        let raw = convert_to_raw_boc(self)?;
+        raw.serialize(has_crc32)
+    }
+
+    pub fn to_base64(&self, has_crc32: bool) -> CellResult<String> {
+        let encoded = self.serialize(has_crc32)?;
+        Ok(base64::encode(&encoded, STANDARD))
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/boc/raw.rs b/rust/frameworks/tw_ton_sdk/src/boc/raw.rs
new file mode 100644
index 00000000000..3b02a02d415
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/boc/raw.rs
@@ -0,0 +1,277 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell/raw.rs
+
+use crate::boc::binary_reader::BinaryReader;
+use crate::boc::binary_writer::BinaryWriter;
+use crate::cell::level_mask::LevelMask;
+use crate::crc::CRC_32_ISCSI;
+use crate::error::{CellError, CellErrorType, CellResult};
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+
+const GENERIC_BOC_MAGIC: u32 = 0xb5ee9c72;
+/// The max number of cells in a BoC.
+const MAX_CELLS: usize = 4096;
+
+/// Raw representation of Cell.
+///
+/// References are stored as indices in BagOfCells.
+#[derive(PartialEq, Eq, Debug, Clone, Hash)]
+pub(crate) struct RawCell {
+    pub(crate) data: Data,
+    pub(crate) bit_len: usize,
+    pub(crate) references: Vec<usize>,
+    pub(crate) is_exotic: bool,
+    level_mask: u32,
+}
+
+impl RawCell {
+    pub(crate) fn new(
+        data: Vec<u8>,
+        bit_len: usize,
+        references: Vec<usize>,
+        level_mask: u32,
+        is_exotic: bool,
+    ) -> Self {
+        Self {
+            data,
+            bit_len,
+            references,
+            level_mask: level_mask & 7,
+            is_exotic,
+        }
+    }
+}
+
+/// Raw representation of BagOfCells.
+///
+/// `cells` must be topologically sorted.
+#[derive(PartialEq, Eq, Debug, Clone, Hash)]
+pub(crate) struct RawBagOfCells {
+    pub(crate) cells: Vec<RawCell>,
+    pub(crate) roots: Vec<usize>,
+}
+
+impl RawBagOfCells {
+    pub(crate) fn parse(serial: &[u8]) -> CellResult<RawBagOfCells> {
+        let mut reader = BinaryReader::new(serial);
+
+        // serialized_boc#b5ee9c72
+        let magic = reader.read_u32()?;
+
+        let (has_idx, has_crc32c, _has_cache_bits, size) = match magic {
+            GENERIC_BOC_MAGIC => {
+                // has_idx:(## 1) has_crc32c:(## 1) has_cache_bits:(## 1) flags:(## 2) { flags = 0 }
+                let header = reader.read_u8()?;
+                let has_idx = (header >> 7) & 1 == 1;
+                let has_crc32c = (header >> 6) & 1 == 1;
+                let has_cache_bits = (header >> 5) & 1 == 1;
+                // size:(## 3) { size <= 4 }
+                let size = header & 0b0000_0111;
+
+                (has_idx, has_crc32c, has_cache_bits, size)
+            },
+            magic => {
+                return CellError::err(CellErrorType::BagOfCellsDeserializationError)
+                    .context(format!("Unsupported cell magic number: {:#}", magic));
+            },
+        };
+        //   off_bytes:(## 8) { off_bytes <= 8 }
+        let off_bytes = reader.read_u8()?;
+        //cells:(##(size * 8))
+        let cells = reader.read_var_size(size as usize)?;
+        if cells > MAX_CELLS {
+            return CellError::err(CellErrorType::BagOfCellsDeserializationError).context(format!(
+                "Max number of cells is '{MAX_CELLS}', but given '{cells}' Cells"
+            ));
+        }
+
+        //   roots:(##(size * 8)) { roots >= 1 }
+        let roots = reader.read_var_size(size as usize)?;
+        if roots > MAX_CELLS {
+            return CellError::err(CellErrorType::BagOfCellsDeserializationError).context(format!(
+                "Max number of cells is '{MAX_CELLS}', but given '{roots}' root Cells"
+            ));
+        }
+
+        //   absent:(##(size * 8)) { roots + absent <= cells }
+        let _absent = reader.read_var_size(size as usize)?;
+        //   tot_cells_size:(##(off_bytes * 8))
+        let _tot_cells_size = reader.read_var_size(off_bytes as usize)?;
+        //   root_list:(roots * ##(size * 8))
+        let mut root_list = vec![];
+        for _ in 0..roots {
+            root_list.push(reader.read_var_size(size as usize)?)
+        }
+        //   index:has_idx?(cells * ##(off_bytes * 8))
+        let mut index = vec![];
+        if has_idx {
+            for _ in 0..cells {
+                index.push(reader.read_var_size(off_bytes as usize)?)
+            }
+        }
+        //   cell_data:(tot_cells_size * [ uint8 ])
+        let mut cell_vec = Vec::with_capacity(cells);
+
+        for _ in 0..cells {
+            let cell = read_cell(&mut reader, size)?;
+            cell_vec.push(cell);
+        }
+        //   crc32c:has_crc32c?uint32
+        let _crc32c = if has_crc32c { reader.read_u32()? } else { 0 };
+        // TODO: Check crc32
+
+        Ok(RawBagOfCells {
+            cells: cell_vec,
+            roots: root_list,
+        })
+    }
+
+    pub(crate) fn serialize(&self, has_crc32: bool) -> CellResult<Data> {
+        // Based on https://github.com/toncenter/tonweb/blob/c2d5d0fc23d2aec55a0412940ce6e580344a288c/src/boc/Cell.js#L198
+
+        let root_count = self.roots.len();
+        let num_ref_bits = 32 - (self.cells.len() as u32).leading_zeros();
+        let num_ref_bytes = (num_ref_bits + 7) / 8;
+        let has_idx = false;
+
+        let mut full_size = 0u32;
+
+        for cell in &self.cells {
+            full_size += raw_cell_size(cell, num_ref_bytes);
+        }
+
+        let num_offset_bits = 32 - full_size.leading_zeros();
+        let num_offset_bytes = (num_offset_bits + 7) / 8;
+
+        let total_size = 4 + // magic
+            1 + // flags and s_bytes
+            1 + // offset_bytes
+            3 * num_ref_bytes + // cells_num, roots, complete
+            num_offset_bytes + // full_size
+            num_ref_bytes + // root_idx
+            (if has_idx { self.cells.len() as u32 * num_offset_bytes } else { 0 }) +
+            full_size +
+            (if has_crc32 { 4 } else { 0 });
+
+        let mut writer = BinaryWriter::with_capacity(total_size as usize);
+
+        writer.write(32, GENERIC_BOC_MAGIC)?;
+
+        //write flags byte
+        let has_cache_bits = false;
+        let flags: u8 = 0;
+        writer.write_bit(has_idx)?;
+        writer.write_bit(has_crc32)?;
+        writer.write_bit(has_cache_bits)?;
+        writer.write(2, flags)?;
+        writer.write(3, num_ref_bytes)?;
+        writer.write(8, num_offset_bytes)?;
+        writer.write(8 * num_ref_bytes, self.cells.len() as u32)?;
+        writer.write(8 * num_ref_bytes, root_count as u32)?;
+        writer.write(8 * num_ref_bytes, 0)?; // Complete BOCs only
+        writer.write(8 * num_offset_bytes, full_size)?;
+        for &root in &self.roots {
+            writer.write(8 * num_ref_bytes, root as u32)?;
+        }
+
+        for cell in &self.cells {
+            write_raw_cell(&mut writer, cell, num_ref_bytes)?;
+        }
+
+        if has_crc32 {
+            let bytes = writer.bytes_if_aligned()?;
+            let cs = CRC_32_ISCSI.checksum(bytes);
+            writer.write_bytes(cs.to_le_bytes().as_slice())?;
+        }
+        writer.align()?;
+        writer.finish()
+    }
+}
+
+fn read_cell(reader: &mut BinaryReader, size: u8) -> CellResult<RawCell> {
+    let d1 = reader.read_u8()?;
+    let d2 = reader.read_u8()?;
+
+    let ref_num = d1 & 0b111;
+    let is_exotic = (d1 & 0b1000) != 0;
+    let has_hashes = (d1 & 0b10000) != 0;
+    let level_mask = (d1 >> 5) as u32;
+    let data_size = ((d2 >> 1) + (d2 & 1)).into();
+    let full_bytes = (d2 & 0x01) == 0;
+
+    if has_hashes {
+        let hash_count = LevelMask::new(level_mask).hash_count();
+        let skip_size = hash_count * (32 + 2);
+
+        // TODO: check depth and hashes
+        reader.skip(skip_size as u32)?;
+    }
+
+    let mut data = reader.read_to_vec(data_size)?;
+
+    let data_len = data.len();
+    let padding_len = if data_len > 0 && !full_bytes {
+        // Fix last byte,
+        // see https://github.com/toncenter/tonweb/blob/c2d5d0fc23d2aec55a0412940ce6e580344a288c/src/boc/BitString.js#L302
+        let num_zeros = data[data_len - 1].trailing_zeros();
+        if num_zeros >= 8 {
+            return CellError::err(CellErrorType::BagOfCellsDeserializationError)
+                .context("Last byte of binary must not be zero if full_byte flag is not set");
+        }
+        data[data_len - 1] &= !(1 << num_zeros);
+        num_zeros + 1
+    } else {
+        0
+    };
+    let bit_len = data.len() * 8 - padding_len as usize;
+    let mut references: Vec<usize> = Vec::new();
+    for _ in 0..ref_num {
+        references.push(reader.read_var_size(size as usize)?);
+    }
+    let cell = RawCell::new(data, bit_len, references, level_mask, is_exotic);
+    Ok(cell)
+}
+
+fn raw_cell_size(cell: &RawCell, ref_size_bytes: u32) -> u32 {
+    let data_len = (cell.bit_len + 7) / 8;
+    2 + data_len as u32 + cell.references.len() as u32 * ref_size_bytes
+}
+
+fn write_raw_cell(
+    writer: &mut BinaryWriter,
+    cell: &RawCell,
+    ref_size_bytes: u32,
+) -> CellResult<()> {
+    let level = cell.level_mask;
+    let is_exotic = cell.is_exotic as u32;
+    let num_refs = cell.references.len() as u32;
+    let d1 = num_refs + is_exotic * 8 + level * 32;
+
+    let padding_bits = cell.bit_len % 8;
+    let full_bytes = padding_bits == 0;
+    let data = cell.data.as_slice();
+    let data_len_bytes = (cell.bit_len + 7) / 8;
+    // data_len_bytes <= 128 by spec, but d2 must be u8 by spec as well
+    let d2 = (data_len_bytes * 2 - if full_bytes { 0 } else { 1 }) as u8; //subtract 1 if the last byte is not full
+
+    writer.write(8, d1)?;
+    writer.write(8, d2)?;
+    if !full_bytes {
+        writer.write_bytes(&data[..data_len_bytes - 1])?;
+        let last_byte = data[data_len_bytes - 1];
+        let l = last_byte | 1 << (8 - padding_bits - 1);
+        writer.write(8, l)?;
+    } else {
+        writer.write_bytes(data)?;
+    }
+
+    for r in cell.references.as_slice() {
+        writer.write(8 * ref_size_bytes, *r as u32)?;
+    }
+
+    Ok(())
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/cell/cell_builder.rs b/rust/frameworks/tw_ton_sdk/src/cell/cell_builder.rs
new file mode 100644
index 00000000000..99d394ca169
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/cell/cell_builder.rs
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell/builder.rs
+
+use crate::address::address_data::AddressData;
+use crate::boc::binary_writer::BinaryWriter;
+use crate::cell::cell_parser::CellParser;
+use crate::cell::{Cell, CellArc};
+use crate::error::{CellError, CellErrorType, CellResult};
+use bitstream_io::Numeric;
+use std::sync::Arc;
+use tw_coin_entry::error::prelude::{MapTWError, ResultContext};
+use tw_number::U256;
+
+const MAX_CELL_BITS: usize = 1023;
+const MAX_CELL_REFERENCES: usize = 4;
+
+#[derive(Default)]
+pub struct CellBuilder {
+    bit_writer: BinaryWriter,
+    references: Vec<CellArc>,
+    is_cell_exotic: bool,
+}
+
+impl CellBuilder {
+    pub fn new() -> CellBuilder {
+        CellBuilder::default()
+    }
+
+    pub fn store_bit(&mut self, val: bool) -> CellResult<&mut Self> {
+        self.bit_writer.write_bit(val)?;
+        Ok(self)
+    }
+
+    pub fn store_byte(&mut self, val: u8) -> CellResult<&mut Self> {
+        self.store_u8(8, val)
+    }
+
+    pub fn store_u8(&mut self, bit_len: usize, val: u8) -> CellResult<&mut Self> {
+        self.store_numeric(bit_len, val)
+    }
+
+    pub fn store_u32(&mut self, bit_len: usize, val: u32) -> CellResult<&mut Self> {
+        self.store_numeric(bit_len, val)
+    }
+
+    pub fn store_i32(&mut self, bit_len: usize, val: i32) -> CellResult<&mut Self> {
+        self.store_numeric(bit_len, val)
+    }
+
+    pub fn store_u64(&mut self, bit_len: usize, val: u64) -> CellResult<&mut Self> {
+        self.store_numeric(bit_len, val)
+    }
+
+    pub fn store_uint(&mut self, bit_len: usize, val: &U256) -> CellResult<&mut Self> {
+        if val.bits() > bit_len {
+            return CellError::err(CellErrorType::CellBuilderError).context(format!(
+                "Value {val} doesn't fit in {bit_len} bits (takes {} bits)",
+                val.bits()
+            ));
+        }
+        // example: bit_len=13, val=5. 5 = 00000101, we must store 0000000000101
+        // leading_zeros_bits = 10
+        // leading_zeros_bytes = 10 / 8 = 1
+        let leading_zero_bits = bit_len - val.bits();
+        let leading_zeros_bytes = leading_zero_bits / 8;
+        for _ in 0..leading_zeros_bytes {
+            self.store_byte(0)?;
+        }
+        // we must align high byte of val to specified bit_len, 00101 in our case
+        let extra_zeros = leading_zero_bits % 8;
+        for _ in 0..extra_zeros {
+            self.store_bit(false)?;
+        }
+        // and then store val's high byte in minimum number of bits
+        let val_bytes = val.to_big_endian_compact();
+        let high_bits_cnt = {
+            let cnt = val.bits() % 8;
+            if cnt == 0 {
+                8
+            } else {
+                cnt
+            }
+        };
+        let high_byte = val_bytes[0];
+        for i in 0..high_bits_cnt {
+            self.store_bit(high_byte & (1 << (high_bits_cnt - i - 1)) != 0)?;
+        }
+        // store the rest of val
+        for byte in val_bytes.iter().skip(1) {
+            self.store_byte(*byte)?;
+        }
+        Ok(self)
+    }
+
+    pub fn store_slice(&mut self, slice: &[u8]) -> CellResult<&mut Self> {
+        for val in slice {
+            self.store_byte(*val)?;
+        }
+        Ok(self)
+    }
+
+    pub fn store_string(&mut self, val: &str) -> CellResult<&mut Self> {
+        self.store_slice(val.as_bytes())
+    }
+
+    pub fn store_coins(&mut self, val: &U256) -> CellResult<&mut Self> {
+        if val.is_zero() {
+            self.store_u8(4, 0)
+        } else {
+            let num_bytes = (val.bits() + 7) / 8;
+            self.store_u8(4, num_bytes as u8)?;
+            self.store_uint(num_bytes * 8, val)
+        }
+    }
+
+    /// Stores address without optimizing hole address.
+    pub fn store_raw_address<A>(&mut self, val: A) -> CellResult<&mut Self>
+    where
+        A: AsRef<AddressData>,
+    {
+        let val = val.as_ref();
+
+        self.store_u8(2, 0b10_u8)?;
+        self.store_bit(false)?;
+        self.store_u8(8, val.workchain_byte())?;
+        self.store_slice(val.hash_part.as_slice())?;
+        Ok(self)
+    }
+
+    /// Stores address optimizing hole address two to bits
+    pub fn store_address<A>(&mut self, val: A) -> CellResult<&mut Self>
+    where
+        A: AsRef<AddressData>,
+    {
+        if val.as_ref() == &AddressData::NULL {
+            self.store_u8(2, 0)?;
+        } else {
+            self.store_raw_address(val)?;
+        }
+        Ok(self)
+    }
+
+    /// Adds reference to an existing `Cell`.
+    ///
+    /// The reference is passed as `ArcCell` so it might be references from other cells.
+    pub fn store_reference(&mut self, cell: &CellArc) -> CellResult<&mut Self> {
+        let ref_count = self.references.len() + 1;
+        if ref_count > MAX_CELL_REFERENCES {
+            return CellError::err(CellErrorType::CellBuilderError).context(format!(
+                "Cell must contain at most 4 references, got {ref_count}"
+            ));
+        }
+        self.references.push(Arc::clone(cell));
+        Ok(self)
+    }
+
+    pub fn store_references(&mut self, refs: &[CellArc]) -> CellResult<&mut Self> {
+        for r in refs {
+            self.store_reference(r)?;
+        }
+        Ok(self)
+    }
+
+    /// Adds a reference to a newly constructed `Cell`.
+    ///
+    /// The cell is wrapped it the `Arc`.
+    pub fn store_child(&mut self, cell: Cell) -> CellResult<&mut Self> {
+        self.store_reference(&cell.into_arc())
+    }
+
+    pub fn store_remaining_bits(&mut self, parser: &mut CellParser) -> CellResult<&mut Self> {
+        let num_full_bytes = parser.remaining_bits() / 8;
+        let bytes = parser.load_bytes(num_full_bytes)?;
+        self.store_slice(bytes.as_slice())?;
+        let num_bits = parser.remaining_bits() % 8;
+        let tail = parser.load_u8(num_bits)?;
+        self.store_u8(num_bits, tail)?;
+        Ok(self)
+    }
+
+    pub fn store_cell_data(&mut self, cell: &Cell) -> CellResult<&mut Self> {
+        let mut parser = cell.parser();
+        self.store_remaining_bits(&mut parser)?;
+        Ok(self)
+    }
+
+    pub fn store_cell(&mut self, cell: &Cell) -> CellResult<&mut Self> {
+        self.store_cell_data(cell)?;
+        self.store_references(cell.references.as_slice())?;
+        Ok(self)
+    }
+
+    pub fn build(mut self) -> CellResult<Cell> {
+        let trailing_zeros = self.bit_writer.align()?;
+
+        let vec = self
+            .bit_writer
+            .finish()
+            .tw_err(|_| CellErrorType::InternalError)
+            .context("Stream must be byte-aligned already")?;
+
+        let bit_len = vec.len() * 8 - trailing_zeros;
+        if bit_len > MAX_CELL_BITS {
+            return CellError::err(CellErrorType::CellBuilderError).context(format!(
+                "Cell must contain at most {MAX_CELL_BITS} bits, got {bit_len}",
+            ));
+        }
+        let ref_count = self.references.len();
+        if ref_count > MAX_CELL_REFERENCES {
+            return CellError::err(CellErrorType::CellBuilderError).context(format!(
+                "Cell must contain at most 4 references, got {ref_count}",
+            ));
+        }
+
+        Cell::new(vec, bit_len, self.references.clone(), self.is_cell_exotic)
+    }
+
+    fn store_numeric<V: Numeric>(&mut self, bit_len: usize, val: V) -> CellResult<&mut Self> {
+        self.bit_writer.write(bit_len as u32, val)?;
+        Ok(self)
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/cell/cell_parser.rs b/rust/frameworks/tw_ton_sdk/src/cell/cell_parser.rs
new file mode 100644
index 00000000000..e7143ded0a3
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/cell/cell_parser.rs
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell/parser.rs
+
+use crate::address::address_data::AddressData;
+use crate::error::{CellError, CellErrorType, CellResult};
+use bitreader::BitReader;
+use num_bigint::BigUint;
+use tw_coin_entry::error::prelude::{MapTWError, ResultContext};
+use tw_hash::H256;
+use tw_memory::Data;
+use tw_number::U256;
+
+pub struct CellParser<'a> {
+    bit_reader: BitReader<'a>,
+}
+
+impl<'a> CellParser<'a> {
+    pub fn new(data: &'a [u8], bit_len: usize) -> Self {
+        CellParser {
+            bit_reader: BitReader::new(data).relative_reader_atmost(bit_len as u64),
+        }
+    }
+
+    pub fn remaining_bits(&self) -> usize {
+        self.bit_reader.remaining() as usize
+    }
+
+    pub fn load_bit(&mut self) -> CellResult<bool> {
+        self.bit_reader
+            .read_bool()
+            .tw_err(|_| CellErrorType::CellParserError)
+    }
+
+    pub fn load_u8(&mut self, bit_len: usize) -> CellResult<u8> {
+        self.bit_reader
+            .read_u8(bit_len as u8)
+            .tw_err(|_| CellErrorType::CellParserError)
+    }
+
+    pub fn load_u32(&mut self, bit_len: usize) -> CellResult<u32> {
+        self.bit_reader
+            .read_u32(bit_len as u8)
+            .tw_err(|_| CellErrorType::CellParserError)
+    }
+
+    pub fn load_u64(&mut self, bit_len: usize) -> CellResult<u64> {
+        self.bit_reader
+            .read_u64(bit_len as u8)
+            .tw_err(|_| CellErrorType::CellParserError)
+    }
+
+    pub fn load_uint(&mut self, bit_len: usize) -> CellResult<U256> {
+        let num_words = (bit_len + 31) / 32;
+        let high_word_bits = if bit_len % 32 == 0 { 32 } else { bit_len % 32 };
+        let mut words: Vec<u32> = vec![0; num_words];
+        let high_word = self.load_u32(high_word_bits)?;
+        words[num_words - 1] = high_word;
+        for i in (0..num_words - 1).rev() {
+            let word = self.load_u32(32)?;
+            words[i] = word;
+        }
+        let big_uint = BigUint::new(words);
+        let uint = U256::from_big_endian_slice(&big_uint.to_bytes_be())
+            .tw_err(|_| CellErrorType::CellParserError)
+            .context("Expected up to 32 bytes of uint")?;
+        Ok(uint)
+    }
+
+    pub fn load_slice(&mut self, slice: &mut [u8]) -> CellResult<()> {
+        self.bit_reader
+            .read_u8_slice(slice)
+            .tw_err(|_| CellErrorType::CellParserError)
+    }
+
+    pub fn load_bytes(&mut self, num_bytes: usize) -> CellResult<Data> {
+        let mut res = vec![0; num_bytes];
+        self.load_slice(res.as_mut_slice())?;
+        Ok(res)
+    }
+
+    pub fn load_string(&mut self, num_bytes: usize) -> CellResult<String> {
+        let bytes = self.load_bytes(num_bytes)?;
+        String::from_utf8(bytes).tw_err(|_| CellErrorType::CellParserError)
+    }
+
+    pub fn load_coins(&mut self) -> CellResult<U256> {
+        let num_bytes = self.load_u8(4)?;
+        if num_bytes == 0 {
+            Ok(U256::zero())
+        } else {
+            self.load_uint((num_bytes * 8) as usize)
+        }
+    }
+
+    pub fn load_address(&mut self) -> CellResult<AddressData> {
+        let tp = self.load_u8(2)?;
+        match tp {
+            0 => Ok(AddressData::null()),
+            2 => {
+                let _res1 = self.load_u8(1)?;
+                let wc = self.load_u8(8)?;
+                let mut hash_part = H256::default();
+                self.load_slice(hash_part.as_mut_slice())?;
+                Ok(AddressData::new(wc as i32, hash_part))
+            },
+            _ => CellError::err(CellErrorType::CellParserError)
+                .context(format!("Invalid address type: {tp}")),
+        }
+    }
+
+    pub fn ensure_empty(&self) -> CellResult<()> {
+        let remaining = self.remaining_bits();
+        if remaining == 0 {
+            Ok(())
+        } else {
+            CellError::err(CellErrorType::CellParserError)
+                .context(format!("{remaining} unread bits left"))
+        }
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/cell/cell_type.rs b/rust/frameworks/tw_ton_sdk/src/cell/cell_type.rs
new file mode 100644
index 00000000000..3effee51a1d
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/cell/cell_type.rs
@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell/cell_type.rs
+
+use crate::cell::level_mask::LevelMask;
+use crate::cell::{Cell, CellArc};
+use crate::error::{CellError, CellErrorType, CellResult};
+use bitstream_io::{BigEndian, ByteRead, ByteReader};
+use std::io::Cursor;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H256;
+
+struct Pruned {
+    hash: H256,
+    depth: u16,
+}
+
+pub(crate) struct HashesAndDepths {
+    pub hashes: [H256; 4],
+    pub depths: [u16; 4],
+}
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub(crate) enum CellType {
+    Ordinary,
+    PrunedBranch,
+    Library,
+    MerkleProof,
+    MerkleUpdate,
+}
+
+impl CellType {
+    pub(crate) fn determine_exotic_cell_type(data: &[u8]) -> CellResult<Self> {
+        let Some(type_byte) = data.first() else {
+            return CellError::err(CellErrorType::InvalidExoticCell)
+                .context("Not enough data to determine exotic cell type");
+        };
+
+        let cell_type = match type_byte {
+            1 => CellType::PrunedBranch,
+            2 => CellType::Library,
+            3 => CellType::MerkleProof,
+            4 => CellType::MerkleUpdate,
+            cell_type => {
+                return CellError::err(CellErrorType::InvalidExoticCell).context(format!(
+                    "Invalid first byte in exotic cell data: {cell_type}"
+                ));
+            },
+        };
+        Ok(cell_type)
+    }
+
+    pub(crate) fn validate(
+        &self,
+        _data: &[u8],
+        _bit_len: usize,
+        _references: impl AsRef<[CellArc]>,
+    ) -> CellResult<()> {
+        // TODO consider implementing data validation according to the cell type.
+        // match self {
+        //     CellType::Ordinary => Ok(()),
+        //     CellType::PrunedBranch => self.validate_exotic_pruned(data, bit_len, references),
+        //     CellType::Library => self.validate_library(bit_len),
+        //     CellType::MerkleProof => self.validate_merkle_proof(data, bit_len, references),
+        //     CellType::MerkleUpdate => self.validate_merkle_update(data, bit_len, references),
+        // }
+        Ok(())
+    }
+
+    pub(crate) fn level_mask(
+        &self,
+        cell_data: &[u8],
+        cell_data_bit_len: usize,
+        references: &[CellArc],
+    ) -> CellResult<LevelMask> {
+        let ensure_ref_at_least = |at_least_count: usize| {
+            if references.len() < at_least_count {
+                return CellError::err(CellErrorType::CellParserError)
+                    .context("Invalid number of Cell references to get level_mask");
+            }
+            Ok(())
+        };
+
+        let result = match self {
+            CellType::Ordinary => references
+                .iter()
+                .fold(LevelMask::new(0), |level_mask, reference| {
+                    level_mask.apply_or(reference.level_mask)
+                }),
+            CellType::PrunedBranch => self.pruned_level_mask(cell_data, cell_data_bit_len)?,
+            CellType::Library => LevelMask::new(0),
+            CellType::MerkleProof => {
+                ensure_ref_at_least(1)?;
+                references[0].level_mask.shift_right()
+            },
+            CellType::MerkleUpdate => {
+                ensure_ref_at_least(2)?;
+                references[0]
+                    .level_mask
+                    .apply_or(references[1].level_mask)
+                    .shift_right()
+            },
+        };
+
+        Ok(result)
+    }
+
+    pub(crate) fn child_depth(&self, child: &Cell, level: u8) -> u16 {
+        if matches!(self, CellType::MerkleProof | CellType::MerkleUpdate) {
+            child.get_depth(level + 1)
+        } else {
+            child.get_depth(level)
+        }
+    }
+
+    pub(crate) fn resolve_hashes_and_depths(
+        &self,
+        hashes: Vec<H256>,
+        depths: Vec<u16>,
+        data: &[u8],
+        bit_len: usize,
+        level_mask: LevelMask,
+    ) -> CellResult<HashesAndDepths> {
+        let mut resolved_hashes = [H256::default(); 4];
+        let mut resolved_depths = [0; 4];
+
+        for i in 0..4 {
+            let hash_index = level_mask.apply(i).hash_index();
+
+            let (hash, depth) = if self == &CellType::PrunedBranch {
+                let this_hash_index = level_mask.hash_index();
+                if hash_index != this_hash_index {
+                    let pruned = self.pruned(data, bit_len, level_mask)?;
+                    (pruned[hash_index].hash, pruned[hash_index].depth)
+                } else {
+                    (hashes[0], depths[0])
+                }
+            } else {
+                (hashes[hash_index], depths[hash_index])
+            };
+
+            resolved_hashes[i as usize] = hash;
+            resolved_depths[i as usize] = depth;
+        }
+
+        Ok(HashesAndDepths {
+            hashes: resolved_hashes,
+            depths: resolved_depths,
+        })
+    }
+
+    fn pruned_level_mask(&self, data: &[u8], bit_len: usize) -> CellResult<LevelMask> {
+        if data.len() < 5 {
+            return CellError::err(CellErrorType::InvalidExoticCell).context(format!(
+                "Pruned Branch cell date can't be shorter than 5 bytes, got {}",
+                data.len()
+            ));
+        }
+
+        let level_mask = if self.is_config_proof(bit_len) {
+            LevelMask::new(1)
+        } else {
+            let mask_byte = data[1];
+            LevelMask::new(mask_byte as u32)
+        };
+
+        Ok(level_mask)
+    }
+
+    fn pruned(
+        &self,
+        data: &[u8],
+        bit_len: usize,
+        level_mask: LevelMask,
+    ) -> CellResult<Vec<Pruned>> {
+        type RawCellHash = [u8; H256::LEN];
+
+        let current_index = if self.is_config_proof(bit_len) { 1 } else { 2 };
+
+        let cursor = Cursor::new(&data[current_index..]);
+        let mut reader = ByteReader::endian(cursor, BigEndian);
+
+        let level = level_mask.level() as usize;
+        let hashes = (0..level)
+            .map(|_| reader.read::<RawCellHash>().map(H256::from))
+            .collect::<Result<Vec<_>, _>>()
+            .tw_err(|_| CellErrorType::CellBuilderError)?;
+        let depths = (0..level)
+            .map(|_| reader.read::<u16>())
+            .collect::<Result<Vec<_>, _>>()
+            .tw_err(|_| CellErrorType::CellBuilderError)?;
+
+        let result = hashes
+            .into_iter()
+            .zip(depths)
+            .map(|(hash, depth)| Pruned { hash, depth })
+            .collect();
+
+        Ok(result)
+    }
+
+    /// Special case for config proof
+    /// This test proof is generated in the moment of voting for a slashing
+    /// it seems that tools generate it incorrectly and therefore doesn't have mask in it
+    /// so we need to hardcode it equal to 1 in this case
+    fn is_config_proof(&self, bit_len: usize) -> bool {
+        self == &CellType::PrunedBranch && bit_len == 280
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/cell/level_mask.rs b/rust/frameworks/tw_ton_sdk/src/cell/level_mask.rs
new file mode 100644
index 00000000000..18075a49368
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/cell/level_mask.rs
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell/level_mask.rs
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
+pub struct LevelMask {
+    mask: u32,
+}
+
+impl LevelMask {
+    pub fn new(new_mask: u32) -> Self {
+        Self { mask: new_mask }
+    }
+
+    pub fn mask(&self) -> u32 {
+        self.mask
+    }
+
+    pub fn level(&self) -> u8 {
+        32 - self.mask.leading_zeros() as u8
+    }
+
+    pub fn hash_index(&self) -> usize {
+        self.mask.count_ones() as usize
+    }
+
+    pub fn hash_count(&self) -> usize {
+        self.hash_index() + 1
+    }
+
+    pub fn apply(&self, level: u8) -> Self {
+        LevelMask {
+            mask: self.mask & ((1u32 << level) - 1),
+        }
+    }
+
+    pub fn apply_or(&self, other: Self) -> Self {
+        LevelMask {
+            mask: self.mask | other.mask,
+        }
+    }
+
+    pub fn shift_right(&self) -> Self {
+        LevelMask {
+            mask: self.mask >> 1,
+        }
+    }
+
+    pub fn is_significant(&self, level: u8) -> bool {
+        level == 0 || ((self.mask >> (level - 1)) % 2 != 0)
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/cell/mod.rs b/rust/frameworks/tw_ton_sdk/src/cell/mod.rs
new file mode 100644
index 00000000000..c6edaf7adfb
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/cell/mod.rs
@@ -0,0 +1,359 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Original source code: https://github.com/ston-fi/tonlib-rs/blob/b96a5252df583261ed755656292930af46c2039a/src/cell.rs
+
+use crate::boc::binary_writer::BinaryWriter;
+use crate::cell::cell_parser::CellParser;
+use std::fmt;
+use std::sync::Arc;
+use tw_coin_entry::error::prelude::{MapTWError, OrTWError, ResultContext};
+use tw_encoding::base64::{self, URL_NO_PAD};
+use tw_encoding::hex::ToHex;
+use tw_hash::sha2::sha256;
+use tw_hash::H256;
+use tw_memory::Data;
+
+pub mod cell_builder;
+pub mod cell_parser;
+pub mod cell_type;
+pub mod level_mask;
+
+use crate::cell::cell_type::{CellType, HashesAndDepths};
+use crate::cell::level_mask::LevelMask;
+use crate::error::{CellError, CellErrorType, CellResult};
+
+const MAX_LEVEL: u8 = 3;
+
+pub type CellArc = Arc<Cell>;
+
+#[derive(PartialEq, Eq, Clone, Hash)]
+pub struct Cell {
+    data: Data,
+    bit_len: usize,
+    references: Vec<CellArc>,
+    cell_type: CellType,
+    level_mask: LevelMask,
+    hashes: [H256; 4],
+    depths: [u16; 4],
+}
+
+impl Cell {
+    pub fn new(
+        data: Data,
+        bit_len: usize,
+        references: Vec<CellArc>,
+        is_exotic: bool,
+    ) -> CellResult<Self> {
+        let cell_type = if is_exotic {
+            CellType::determine_exotic_cell_type(&data)?
+        } else {
+            CellType::Ordinary
+        };
+
+        cell_type.validate(&data, bit_len, &references)?;
+        let level_mask = cell_type.level_mask(&data, bit_len, &references)?;
+        let HashesAndDepths { hashes, depths } =
+            calculate_hashes_and_depths(cell_type, &data, bit_len, &references, level_mask)?;
+
+        let result = Self {
+            data,
+            bit_len,
+            references,
+            level_mask,
+            cell_type,
+            hashes,
+            depths,
+        };
+
+        Ok(result)
+    }
+
+    pub fn into_arc(self) -> CellArc {
+        Arc::new(self)
+    }
+
+    pub fn data(&self) -> &[u8] {
+        self.data.as_slice()
+    }
+
+    pub fn bit_len(&self) -> usize {
+        self.bit_len
+    }
+
+    pub fn references(&self) -> &[CellArc] {
+        &self.references
+    }
+
+    pub(crate) fn get_level_mask(&self) -> u32 {
+        self.level_mask.mask()
+    }
+
+    pub fn is_exotic(&self) -> bool {
+        self.cell_type != CellType::Ordinary
+    }
+
+    pub fn cell_hash(&self) -> H256 {
+        self.get_hash(MAX_LEVEL)
+    }
+
+    pub fn cell_hash_base64(&self) -> String {
+        base64::encode(self.cell_hash().as_slice(), URL_NO_PAD)
+    }
+
+    pub fn get_hash(&self, level: u8) -> H256 {
+        self.hashes[level.min(3) as usize]
+    }
+
+    pub fn get_depth(&self, level: u8) -> u16 {
+        self.depths[level.min(3) as usize]
+    }
+
+    pub fn parser(&self) -> CellParser {
+        CellParser::new(&self.data, self.bit_len)
+    }
+
+    pub fn parse_fully<F, T>(&self, parse: F) -> Result<T, CellError>
+    where
+        F: FnOnce(&mut CellParser) -> CellResult<T>,
+    {
+        let mut reader = self.parser();
+        let res = parse(&mut reader);
+        reader.ensure_empty()?;
+        res
+    }
+
+    fn fmt_debug(&self, f: &mut fmt::Formatter<'_>, depth: usize) -> fmt::Result {
+        for _ in 0..depth {
+            write!(f, "\t")?;
+        }
+        // Append Cell IDX.
+        if depth == 0 {
+            write!(f, "Cell(root)")?;
+        } else {
+            write!(f, "-> Cell(ref {depth})")?;
+        }
+
+        let maybe_exotic_type = if matches!(self.cell_type, CellType::Ordinary) {
+            "".to_string()
+        } else {
+            format!("exotic={:?} ", self.cell_type)
+        };
+
+        write!(
+            f,
+            " {{ data={}, bit_len={} {maybe_exotic_type}}}",
+            self.data.to_hex(),
+            self.bit_len,
+        )?;
+
+        writeln!(f)?;
+        let ref_depth = depth + 1;
+        for reference in self.references() {
+            reference.fmt_debug(f, ref_depth)?;
+        }
+        Ok(())
+    }
+}
+
+impl fmt::Debug for Cell {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let root_depth = 0;
+        self.fmt_debug(f, root_depth)
+    }
+}
+
+fn get_repr_for_data(
+    (original_data, original_data_bit_len): (&[u8], usize),
+    (data, data_bit_len): (&[u8], usize),
+    refs: &[CellArc],
+    level_mask: LevelMask,
+    level: u8,
+    cell_type: CellType,
+) -> CellResult<Data> {
+    // Allocate
+    let data_len = data.len();
+    // descriptors + data + (hash + depth) * refs_count
+    let buffer_len = 2 + data_len + (32 + 2) * refs.len();
+
+    let mut writer = BinaryWriter::with_capacity(buffer_len);
+    let d1 = get_refs_descriptor(cell_type, refs, level_mask.apply(level).mask())?;
+    let d2 = get_bits_descriptor(original_data, original_data_bit_len)?;
+
+    // Write descriptors
+    writer.write(8, d1)?;
+    writer.write(8, d2)?;
+    // Write main data
+    writer.write_bits(data, data_bit_len)?;
+    // Write ref data
+    write_ref_depths(&mut writer, refs, cell_type, level)?;
+    write_ref_hashes(&mut writer, refs, cell_type, level)?;
+
+    writer.bytes_if_aligned().map(|b| b.to_vec())
+}
+
+/// This function replicates unknown logic of resolving cell data
+/// https://github.com/ton-blockchain/ton/blob/24dc184a2ea67f9c47042b4104bbb4d82289fac1/crypto/vm/cells/DataCell.cpp#L214
+fn calculate_hashes_and_depths(
+    cell_type: CellType,
+    data: &[u8],
+    bit_len: usize,
+    references: &[CellArc],
+    level_mask: LevelMask,
+) -> CellResult<HashesAndDepths> {
+    let hash_count = if cell_type == CellType::PrunedBranch {
+        1
+    } else {
+        level_mask.hash_count()
+    };
+
+    let total_hash_count = level_mask.hash_count();
+    let hash_i_offset = total_hash_count - hash_count;
+
+    let mut depths: Vec<u16> = Vec::with_capacity(hash_count);
+    let mut hashes: Vec<H256> = Vec::with_capacity(hash_count);
+
+    // Iterate through significant levels
+    for (hash_i, level_i) in (0..=level_mask.level())
+        .filter(|&i| level_mask.is_significant(i))
+        .enumerate()
+    {
+        if hash_i < hash_i_offset {
+            continue;
+        }
+
+        let (current_data, current_bit_len) = if hash_i == hash_i_offset {
+            (data, bit_len)
+        } else {
+            let previous_hash = hashes
+                .get(hash_i - hash_i_offset - 1)
+                .or_tw_err(CellErrorType::InternalError)
+                .context("Can't get right hash")?;
+            (previous_hash.as_slice(), 256)
+        };
+
+        // Calculate Depth
+        let depth = if references.is_empty() {
+            0
+        } else {
+            let max_ref_depth = references.iter().fold(0, |max_depth, reference| {
+                let child_depth = cell_type.child_depth(reference, level_i);
+                max_depth.max(child_depth)
+            });
+
+            max_ref_depth
+                .checked_add(1)
+                .or_tw_err(CellErrorType::CellParserError)
+                .with_context(|| format!("max_ref_depth is too large: {max_ref_depth}"))?
+        };
+
+        // Calculate Hash
+        let repr = get_repr_for_data(
+            (data, bit_len),
+            (current_data, current_bit_len),
+            references,
+            level_mask,
+            level_i,
+            cell_type,
+        )?;
+        let hash = sha256(&repr);
+        let hash = H256::try_from(hash.as_slice()).expect("Expected 32 bytes hash");
+
+        depths.push(depth);
+        hashes.push(hash);
+    }
+
+    cell_type.resolve_hashes_and_depths(hashes, depths, data, bit_len, level_mask)
+}
+
+/// `references.len() as u8 + 8 * cell_type_var + level_mask as u8 * 32`
+fn get_refs_descriptor(
+    cell_type: CellType,
+    references: &[CellArc],
+    level_mask: u32,
+) -> CellResult<u8> {
+    let cell_type_var = (cell_type != CellType::Ordinary) as u8;
+    let references_len: u8 = references
+        .len()
+        .try_into()
+        .tw_err(|_| CellErrorType::CellParserError)
+        .with_context(|| format!("Got too much Cell references: {}", references.len()))?;
+    let level_mask_u8: u8 = level_mask
+        .try_into()
+        .tw_err(|_| CellErrorType::CellParserError)
+        .with_context(|| format!("Cell level_mask is too large: {level_mask}"))?;
+
+    level_mask_u8
+        .checked_mul(32)
+        .and_then(|v| v.checked_add(8 * cell_type_var))
+        .and_then(|v| v.checked_add(references_len))
+        .or_tw_err(CellErrorType::CellParserError)
+        .context("!get_refs_descriptor")
+}
+
+fn get_bits_descriptor(data: &[u8], bit_len: usize) -> CellResult<u8> {
+    let rest_bits = bit_len % 8;
+    let full_bytes = rest_bits == 0;
+
+    let double_len = data
+        .len()
+        .try_into()
+        .ok()
+        .and_then(|len: u8| len.checked_mul(2))
+        .or_tw_err(CellErrorType::CellParserError)
+        .context("!get_bits_descriptor()")?;
+
+    let inverted_full_bytes = !full_bytes as u8;
+
+    // subtract 1 if the last byte is not full
+    double_len
+        .checked_sub(inverted_full_bytes)
+        .or_tw_err(CellErrorType::CellParserError)
+        .context("!get_bits_descriptor()")
+}
+
+fn write_ref_depths(
+    writer: &mut BinaryWriter,
+    refs: &[CellArc],
+    parent_cell_type: CellType,
+    level: u8,
+) -> CellResult<()> {
+    for reference in refs {
+        let child_depth = if matches!(
+            parent_cell_type,
+            CellType::MerkleProof | CellType::MerkleUpdate
+        ) {
+            reference.get_depth(level + 1)
+        } else {
+            reference.get_depth(level)
+        };
+
+        writer.write(8, child_depth / 256)?;
+        writer.write(8, child_depth % 256)?;
+    }
+
+    Ok(())
+}
+
+fn write_ref_hashes(
+    writer: &mut BinaryWriter,
+    refs: &[CellArc],
+    parent_cell_type: CellType,
+    level: u8,
+) -> CellResult<()> {
+    for reference in refs {
+        let child_hash = if matches!(
+            parent_cell_type,
+            CellType::MerkleProof | CellType::MerkleUpdate
+        ) {
+            reference.get_hash(level + 1)
+        } else {
+            reference.get_hash(level)
+        };
+
+        writer.write_bytes(child_hash.as_slice())?;
+    }
+
+    Ok(())
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/crc.rs b/rust/frameworks/tw_ton_sdk/src/crc.rs
new file mode 100644
index 00000000000..fcd860b6b0e
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/crc.rs
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crc::Crc;
+use lazy_static::lazy_static;
+
+lazy_static! {
+    pub static ref CRC_32_ISCSI: Crc<u32> = Crc::<u32>::new(&crc::CRC_32_ISCSI);
+    pub static ref CRC_16_XMODEM: Crc<u16> = Crc::<u16>::new(&crc::CRC_16_XMODEM);
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/error.rs b/rust/frameworks/tw_ton_sdk/src/error.rs
new file mode 100644
index 00000000000..0994ba2a614
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/error.rs
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+
+pub type CellResult<T> = Result<T, CellError>;
+pub type CellError = TWError<CellErrorType>;
+
+#[derive(Debug)]
+pub enum CellErrorType {
+    BagOfCellsDeserializationError,
+    BagOfCellsSerializationError,
+    CellBuilderError,
+    CellParserError,
+    InvalidAddressType,
+    InvalidExoticCell,
+    NonEmptyReader,
+    InternalError,
+}
+
+pub fn cell_to_signing_error(cell_err: CellError) -> SigningError {
+    cell_err.map_err(|cell_ty| match cell_ty {
+        CellErrorType::BagOfCellsDeserializationError
+        | CellErrorType::CellParserError
+        | CellErrorType::InvalidExoticCell
+        | CellErrorType::NonEmptyReader => SigningErrorType::Error_input_parse,
+        CellErrorType::BagOfCellsSerializationError | CellErrorType::CellBuilderError => {
+            SigningErrorType::Error_internal
+        },
+        CellErrorType::InvalidAddressType => SigningErrorType::Error_invalid_address,
+        CellErrorType::InternalError => SigningErrorType::Error_internal,
+    })
+}
diff --git a/rust/frameworks/tw_ton_sdk/src/lib.rs b/rust/frameworks/tw_ton_sdk/src/lib.rs
new file mode 100644
index 00000000000..7224847dd6b
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/lib.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod boc;
+pub mod cell;
+pub mod crc;
+pub mod error;
+pub mod message;
diff --git a/rust/frameworks/tw_ton_sdk/src/message/mod.rs b/rust/frameworks/tw_ton_sdk/src/message/mod.rs
new file mode 100644
index 00000000000..2558269f38c
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/message/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod state_init;
diff --git a/rust/frameworks/tw_ton_sdk/src/message/state_init.rs b/rust/frameworks/tw_ton_sdk/src/message/state_init.rs
new file mode 100644
index 00000000000..a0d8a9d1630
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/src/message/state_init.rs
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::cell::cell_builder::CellBuilder;
+use crate::cell::{Cell, CellArc};
+use crate::error::CellResult;
+use tw_hash::H256;
+
+#[derive(Default)]
+pub struct StateInit {
+    code: Option<CellArc>,
+    data: Option<CellArc>,
+}
+
+impl StateInit {
+    pub fn set_code(mut self, code: CellArc) -> Self {
+        self.code = Some(code);
+        self
+    }
+
+    pub fn set_data(mut self, data: CellArc) -> Self {
+        self.data = Some(data);
+        self
+    }
+
+    pub fn create_account_id(&self) -> CellResult<H256> {
+        Ok(self.to_cell()?.cell_hash())
+    }
+
+    pub fn to_cell(&self) -> CellResult<Cell> {
+        let split_depth = false;
+        let tick_tock = false;
+        let library = false;
+
+        let mut builder = CellBuilder::new();
+        builder
+            .store_bit(split_depth)?
+            .store_bit(tick_tock)?
+            .store_bit(self.code.is_some())?
+            .store_bit(self.data.is_some())?
+            .store_bit(library)?;
+        if let Some(ref code) = self.code {
+            builder.store_reference(code)?;
+        }
+        if let Some(ref data) = self.data {
+            builder.store_reference(data)?;
+        }
+        builder.build()
+    }
+}
diff --git a/rust/frameworks/tw_ton_sdk/tests/address.rs b/rust/frameworks/tw_ton_sdk/tests/address.rs
new file mode 100644
index 00000000000..8e84bf301b8
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/tests/address.rs
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+use tw_hash::H256;
+use tw_ton_sdk::address::address_data::AddressData;
+use tw_ton_sdk::address::raw_address::RawAddress;
+use tw_ton_sdk::address::user_friendly_address::UserFriendlyAddress;
+
+const WORKCHAIN: i32 = 0;
+const ADDRESS_BYTES: &str = "e4d954ef9f4e1250a26b5bbad76a1cdd17cfd08babad6f4c23e372270aef6f76";
+
+const RAW_ADDRESS: &str = "0:e4d954ef9f4e1250a26b5bbad76a1cdd17cfd08babad6f4c23e372270aef6f76";
+const BOUNCEABLE_URL_ADDRESS: &str = "EQDk2VTvn04SUKJrW7rXahzdF8_Qi6utb0wj43InCu9vdjrR";
+const BOUNCEABLE_ADDRESS: &str = "EQDk2VTvn04SUKJrW7rXahzdF8/Qi6utb0wj43InCu9vdjrR";
+
+fn addr_data() -> AddressData {
+    let bytes = H256::from_str(ADDRESS_BYTES).unwrap();
+    AddressData::new(WORKCHAIN, bytes)
+}
+
+#[test]
+fn test_raw_address_from_to_string() {
+    let actual = RawAddress::from_str(RAW_ADDRESS).unwrap();
+    let expected = RawAddress::from(addr_data());
+    assert_eq!(actual, expected);
+    let actual_encoded = actual.to_string();
+    assert_eq!(actual_encoded, RAW_ADDRESS);
+}
+
+#[test]
+fn test_user_friendly_address_from_to_url_string() {
+    let actual = UserFriendlyAddress::from_base64_url(BOUNCEABLE_URL_ADDRESS).unwrap();
+    let expected = UserFriendlyAddress::with_flags(addr_data(), true, false);
+    assert_eq!(actual, expected);
+    let actual_encoded = actual.to_base64_url();
+    assert_eq!(actual_encoded, BOUNCEABLE_URL_ADDRESS);
+}
+
+#[test]
+fn test_user_friendly_address_from_to_std_string() {
+    let actual = UserFriendlyAddress::from_base64_std(BOUNCEABLE_ADDRESS).unwrap();
+    let expected = UserFriendlyAddress::with_flags(addr_data(), true, false);
+    assert_eq!(actual, expected);
+    let actual_encoded = actual.to_base64_std();
+    assert_eq!(actual_encoded, BOUNCEABLE_ADDRESS);
+}
diff --git a/rust/frameworks/tw_ton_sdk/tests/boc_encode.rs b/rust/frameworks/tw_ton_sdk/tests/boc_encode.rs
new file mode 100644
index 00000000000..6c4a9dcf2ae
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/tests/boc_encode.rs
@@ -0,0 +1,187 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+use serde_json::{json, Value as Json};
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_ton_sdk::boc::BagOfCells;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::cell::Cell;
+
+#[derive(Deserialize)]
+struct ExpectedCell {
+    data: String,
+    bit_len: usize,
+    references: Vec<ExpectedCell>,
+}
+
+struct TestCase {
+    input_encoded: &'static str,
+    expected: Json,
+    expected_hash: &'static str,
+    /// Expected encoded can be different from the original [`TestCase::input_encoded`]
+    /// since same Cell can be BoC encoded differently.
+    expected_encoded: &'static str,
+}
+
+/// Takes a JSON object that will be deserialized as `ExpectedCell`.
+/// It's done to allow the function caller to use `json!` macro for readability.
+#[track_caller]
+fn test_boc_encode_decode(input: TestCase) {
+    let boc_decoded = BagOfCells::parse_base64(input.input_encoded).unwrap();
+    let root_cell = boc_decoded
+        .single_root()
+        .expect("Expected single root Cell");
+
+    let expected: ExpectedCell = serde_json::from_value(input.expected)
+        .expect("Error deserializing `ExpectedCell` from JSON");
+    assert_eq_cell(root_cell, expected);
+
+    let actual_hash = root_cell.cell_hash_base64();
+    assert_eq!(actual_hash, input.expected_hash);
+
+    // Wrap the Cell to the BoC again.
+    let boc_encoded = BagOfCells::from_root(root_cell.as_ref().clone())
+        .to_base64(true)
+        .unwrap();
+    assert_eq!(boc_encoded, input.expected_encoded);
+}
+
+#[track_caller]
+fn assert_eq_cell(cell: &Cell, expected: ExpectedCell) {
+    assert_eq!(cell.data().to_hex(), expected.data, "Invalid Cell.data");
+    assert_eq!(cell.bit_len(), expected.bit_len, "Invalid Cell.bit_len");
+    for (cell_ref, expected_ref) in cell.references().iter().zip(expected.references) {
+        assert_eq_cell(cell_ref, expected_ref);
+    }
+}
+
+#[test]
+fn test_boc_encode_jetton_transfer_tx() {
+    let expected = json!({
+        "data": "8800b4510655c8136d4ff5be8ea40a9e161ab0f88321d4969cd828d453f22c7c4b2a08",
+        "bit_len": 277,
+        "references": [{
+            "data": "688595a2c8b55e7bde026a06f72d3f98f78d52a52eec663bea675b44069578d78338f0e58793370446f6ea491ce97a180de915eb4a3688ea1b37e4c64bbea30529a9a3176a8e07f6000000010003",
+            "bit_len": 624,
+            "references": [{
+                "data": "620031341f879da9b83ede2949836e1a9fb5ae1c75431117aeb6531a77cf3aae83f3202faf080000000000000000000000000001",
+                "bit_len": 416,
+                "references": [{
+                    "data": "0f8a7ea5000000000000000041dcd65008000b8196730b5e1d033e99c42857e699fa6c827758d8a9489ac210b3bb131d133900168a20cab9026da9feb7d1d48153c2c3561f10643a92d39b051a8a7e458f89654202000000007465737420636f6d6d656e74",
+                    "bit_len": 808,
+                    "references": []
+                }]
+            }]
+        }]
+    });
+
+    // The same Cell can be BoC encoded differently.
+    // Try to decode the original encoded transaction: https://testnet.tonviewer.com/transaction/12bfe84f947740aec3faa54f04a50690900e3aae9ac9596cfa6804a61a48f429
+    test_boc_encode_decode(TestCase {
+        input_encoded: "te6ccgICAAQAAQAAARgAAAFFiAC0UQZVyBNtT/W+jqQKnhYasPiDIdSWnNgo1FPyLHxLKgwAAQGcaIWVosi1XnveAmoG9y0/mPeNUqUu7GY76mdbRAaVeNeDOPDlh5M3BEb26kkc6XoYDekV60o2iOobN+TGS76jBSmpoxdqjgf2AAAAAQADAAIBaGIAMTQfh52puD7eKUmDbhqfta4cdUMRF662Uxp3zzqug/MgL68IAAAAAAAAAAAAAAAAAAEAAwDKD4p+pQAAAAAAAAAAQdzWUAgAC4GWcwteHQM+mcQoV+aZ+myCd1jYqUiawhCzuxMdEzkAFoogyrkCban+t9HUgVPCw1YfEGQ6ktObBRqKfkWPiWVCAgAAAAB0ZXN0IGNvbW1lbnQ=",
+        expected: expected.clone(),
+        expected_hash: "yYwgXI3TfZpqtdthYvW503zvoGfeJKdlFUpet6NZ8i8",
+        expected_encoded: "te6cckECBAEAARUAAUWIALRRBlXIE21P9b6OpAqeFhqw+IMh1Jac2CjUU/IsfEsqDAEBnGiFlaLItV573gJqBvctP5j3jVKlLuxmO+pnW0QGlXjXgzjw5YeTNwRG9upJHOl6GA3pFetKNojqGzfkxku+owUpqaMXao4H9gAAAAEAAwIBaGIAMTQfh52puD7eKUmDbhqfta4cdUMRF662Uxp3zzqug/MgL68IAAAAAAAAAAAAAAAAAAEDAMoPin6lAAAAAAAAAABB3NZQCAALgZZzC14dAz6ZxChX5pn6bIJ3WNipSJrCELO7Ex0TOQAWiiDKuQJtqf630dSBU8LDVh8QZDqS05sFGop+RY+JZUICAAAAAHRlc3QgY29tbWVudG/bd5c=",
+    });
+
+    // Try to decode with same encoded data.
+    test_boc_encode_decode(TestCase {
+        input_encoded: "te6cckECBAEAARUAAUWIALRRBlXIE21P9b6OpAqeFhqw+IMh1Jac2CjUU/IsfEsqDAEBnGiFlaLItV573gJqBvctP5j3jVKlLuxmO+pnW0QGlXjXgzjw5YeTNwRG9upJHOl6GA3pFetKNojqGzfkxku+owUpqaMXao4H9gAAAAEAAwIBaGIAMTQfh52puD7eKUmDbhqfta4cdUMRF662Uxp3zzqug/MgL68IAAAAAAAAAAAAAAAAAAEDAMoPin6lAAAAAAAAAABB3NZQCAALgZZzC14dAz6ZxChX5pn6bIJ3WNipSJrCELO7Ex0TOQAWiiDKuQJtqf630dSBU8LDVh8QZDqS05sFGop+RY+JZUICAAAAAHRlc3QgY29tbWVudG/bd5c=",
+        expected,
+        expected_hash: "yYwgXI3TfZpqtdthYvW503zvoGfeJKdlFUpet6NZ8i8",
+        expected_encoded: "te6cckECBAEAARUAAUWIALRRBlXIE21P9b6OpAqeFhqw+IMh1Jac2CjUU/IsfEsqDAEBnGiFlaLItV573gJqBvctP5j3jVKlLuxmO+pnW0QGlXjXgzjw5YeTNwRG9upJHOl6GA3pFetKNojqGzfkxku+owUpqaMXao4H9gAAAAEAAwIBaGIAMTQfh52puD7eKUmDbhqfta4cdUMRF662Uxp3zzqug/MgL68IAAAAAAAAAAAAAAAAAAEDAMoPin6lAAAAAAAAAABB3NZQCAALgZZzC14dAz6ZxChX5pn6bIJ3WNipSJrCELO7Ex0TOQAWiiDKuQJtqf630dSBU8LDVh8QZDqS05sFGop+RY+JZUICAAAAAHRlc3QgY29tbWVudG/bd5c=",
+    });
+}
+
+#[test]
+fn test_wallet_code_hashes() {
+    let wallet_v3r1_code = BagOfCells::parse_base64("te6cckEBAQEAYgAAwP8AIN0gggFMl7qXMO1E0NcLH+Ck8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVD++buA=").unwrap();
+    assert_eq!(
+        wallet_v3r1_code.single_root().unwrap().cell_hash_base64(),
+        "thBBpYp5gLlG6PueGY48kE0keZ_6NldOpCUcQaVm9YE"
+    );
+
+    let wallet_v3r2_code = BagOfCells::parse_base64("te6cckEBAQEAcQAA3v8AIN0gggFMl7ohggEznLqxn3Gw7UTQ0x/THzHXC//jBOCk8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVBC9ba0=").unwrap();
+    assert_eq!(
+        wallet_v3r2_code.single_root().unwrap().cell_hash_base64(),
+        "hNr6RJ-Ypph3ibojI1gHK8D3bcRSQAKl0JGLmnXS1Zk"
+    );
+
+    let wallet_v4r2_code = BagOfCells::parse_base64("te6cckECFAEAAtQAART/APSkE/S88sgLAQIBIAIDAgFIBAUE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8QERITAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNBgcCASAICQB4AfoA9AQw+CdvIjBQCqEhvvLgUIIQcGx1Z4MesXCAGFAEywUmzxZY+gIZ9ADLaRfLH1Jgyz8gyYBA+wAGAIpQBIEBCPRZMO1E0IEBQNcgyAHPFvQAye1UAXKwjiOCEGRzdHKDHrFwgBhQBcsFUAPPFiP6AhPLassfyz/JgED7AJJfA+ICASAKCwBZvSQrb2omhAgKBrkPoCGEcNQICEekk30pkQzmkD6f+YN4EoAbeBAUiYcVnzGEAgFYDA0AEbjJftRNDXCx+AA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYAIBIA4PABmtznaiaEAga5Drhf/AABmvHfaiaEAQa5DrhY/AAG7SB/oA1NQi+QAFyMoHFcv/ydB3dIAYyMsFywIizxZQBfoCFMtrEszMyXP7AMhAFIEBCPRR8qcCAHCBAQjXGPoA0z/IVCBHgQEI9FHyp4IQbm90ZXB0gBjIywXLAlAGzxZQBPoCFMtqEssfyz/Jc/sAAgBsgQEI1xj6ANM/MFIkgQEI9Fnyp4IQZHN0cnB0gBjIywXLAlAFzxZQA/oCE8tqyx8Syz/Jc/sAAAr0AMntVGliJeU=").unwrap();
+    assert_eq!(
+        wallet_v4r2_code.single_root().unwrap().cell_hash_base64(),
+        "_rX_aCDi_w2Ug-fg1iyBfYRniftK5YDIeIZtlZ2r1cA"
+    );
+}
+
+#[test]
+fn test_boc_encode_cell_builder() {
+    let leaf = {
+        let mut builder = CellBuilder::new();
+        builder.store_byte(10).unwrap();
+        builder.build().unwrap()
+    };
+    let inter = {
+        let mut builder = CellBuilder::new();
+        builder.store_byte(20).unwrap().store_child(leaf).unwrap();
+        builder.build().unwrap()
+    };
+    let root = {
+        let mut builder = CellBuilder::new();
+        builder.store_byte(30).unwrap().store_child(inter).unwrap();
+        builder.build().unwrap()
+    };
+
+    let boc = BagOfCells::from_root(root);
+    assert_eq!(
+        boc.to_base64(true).unwrap(),
+        "te6cckEBAwEACwABAh4BAQIUAgACCjHga8U="
+    );
+}
+
+fn typical_boc_test(boc_base64: &str, expected_hash: &str) {
+    let boc = BagOfCells::parse_base64(boc_base64).unwrap();
+    let root_cell = boc.single_root().unwrap();
+    let hash = root_cell.cell_hash();
+    assert_eq!(hash.to_string(), expected_hash);
+
+    let boc_base64_again = boc.to_base64(false).unwrap();
+    assert_eq!(boc_base64_again, boc_base64);
+}
+
+#[test]
+fn test_boc_encode_pruned_block() {
+    let boc = "te6ccgEBBAEArwAJRgPIr248LcbQSSCsDD5Rb27WLhRGYiTEGG+uChgAAXoNHAAIASJxwAtrH/x8t+GjDO5/X/f1fk4Rw3oYx+9S1gRE8vya04qzwiyFkEMdYglgAAAaNN8fbBluIJfFw9NAAgMoSAEB/rX/aCDi/w2Ug+fg1iyBfYRniftK5YDIeIZtlZ2r1cAAByhIAQEg0z54hgTX/ohMEnHs6qluCydagWgxQoxSyLwK8qfAOQAA";
+    let hash = "a6f4b8afa43a9ee61f6d89050d665d164c94c5eca658ddb6c2ab34b4118ab34c";
+    typical_boc_test(boc, hash);
+}
+
+/// Checks whether BoC encoding doesn't panic because of invalid input.
+#[test]
+fn test_boc_decode_invalid() {
+    #[track_caller]
+    fn test_invalid(input_hex: &str) {
+        let input = input_hex.decode_hex().unwrap();
+        BagOfCells::parse(&input).unwrap_err();
+    }
+
+    test_invalid("b5ee9c725e0000030000000000000000000000000000000000005e");
+
+    // Errors in `BagOfCells::parse()`.
+    test_invalid("b5ee9c72c9000001000000000000100000000000000000ff20d1fffe20000052180000001926");
+    test_invalid("b5ee9c7201000001000056600000000c000c0cff5e0000005eb5ee9c72ca0c0c0c0c0c0c00");
+    test_invalid("b5ee9c72ca0000010000560c0c130c0c0c0c0c0c0c0c000c0c0c5e5e0c0c00b5ee0c5e5e");
+
+    // Errors in `cell::get_bit_descriptor()`.
+    test_invalid("b5ee9c72ca0000010000560c0c130c0c0c0c0c0c0c0c000c0c0c5e5e0c0c00b5ee0c5e5e");
+    test_invalid("b5ee9c72ca0000230000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0000000c000c0cffffffffffff0000000000000000000000000000000000000000000600080c");
+
+    // Error in `cell::get_refs_descriptor()`.
+    test_invalid("b5ee9c72d1000c0c0c0c20260cba5e0900002a2600000000000000090909090909090909090909090909090909090909091f1f1f1f090909090909090909090971ee31310909090909090909090200000900090909090901680909090909090909090909090909090909090909090000000000000000000000000c88f3");
+    // Errors in `CellType::level_mask()`.
+    test_invalid("b5ee9c72ca0000180000250125000000000000000b0b0b0b0b0b0404040404040404030404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040404040408080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808080808040404040c04040404040404040404040404040404040404040404040404040404040404040404040404270404040404040404040404040404040404040400005204040404040404040404000404040404040404040404040404040403fb04040404040404040404040404040404040404040404040400002501250b4b0b0800ca00250c00000c000c100c0c0c26");
+    // Error in `cell::calculate_hashes_and_depths()`.
+    test_invalid("b5ee9c72d1000a000000000000000008860101ff041cffff000100000000000010081c01000000000000000000000000000000000000b5ee00000000ff9c72d1000a0000000000000000000000ac0000000006060606060606060606060606000008d60104ff031cff530000002e0000080000000000000000b0504f4f4ab0b0b0b0b0b0b0b0b00f00b00500000f0000000000030053a900002f00000000000000feffffffff0000000000009ce4ee6100000000000000000000000000000886fc00ff041cffff00000000000063000000000000eeee9c72069c720606060000060600");
+}
diff --git a/rust/frameworks/tw_ton_sdk/tests/cell.rs b/rust/frameworks/tw_ton_sdk/tests/cell.rs
new file mode 100644
index 00000000000..0baf948a31b
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/tests/cell.rs
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_ton_sdk::boc::BagOfCells;
+
+#[test]
+fn test_cell_format() {
+    let boc = BagOfCells::parse_base64(
+        "te6ccgEBAgEALQABDv8AiNDtHtgBCEIC5wowbAAnJ5YkP1ac4Mko6kz8nxtlxbAGbjghWfXoDfU=",
+    )
+    .unwrap();
+    let cell = boc.single_root().unwrap();
+
+    let actual_fmt = format!("{cell:?}");
+    let expected =
+"Cell(root) { data=ff0088d0ed1ed8, bit_len=56 }
+	-> Cell(ref 1) { data=02e70a306c00272796243f569ce0c928ea4cfc9f1b65c5b0066e382159f5e80df5, bit_len=264 exotic=Library }
+";
+    assert_eq!(actual_fmt, expected);
+}
diff --git a/rust/frameworks/tw_ton_sdk/tests/cell_parser.rs b/rust/frameworks/tw_ton_sdk/tests/cell_parser.rs
new file mode 100644
index 00000000000..445e3842a3d
--- /dev/null
+++ b/rust/frameworks/tw_ton_sdk/tests/cell_parser.rs
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_number::U256;
+use tw_ton_sdk::address::address_data::AddressData;
+use tw_ton_sdk::address::user_friendly_address::UserFriendlyAddress;
+use tw_ton_sdk::boc::BagOfCells;
+
+/// In this test we parse a TON internal transfer message encoded as BoC.
+#[test]
+fn test_cell_parse_internal_transfer_message() {
+    let boc = BagOfCells::parse_base64(
+        "te6cckEBAQEAOgAAcGIARUMTww0u7LZO2ecEA9iRbS9qOcmmc6tFLaWOGw5dlFdEAAAAAAAAAAAAAAAAAAAAAAAAAAAAfRXk0w==",
+    )
+    .unwrap();
+    let cell = boc.single_root().unwrap();
+    let mut parser = cell.parser();
+
+    let bit_0 = parser.load_bit().unwrap();
+    let ihr_disabled = parser.load_bit().unwrap();
+    let bounce = parser.load_bit().unwrap();
+    let bounced = parser.load_bit().unwrap();
+    let src_addr = parser.load_address().unwrap();
+    let dest_addr = parser.load_address().unwrap();
+    let value = parser.load_coins().unwrap();
+    let currency_collections = parser.load_bit().unwrap();
+    let ihr_fees = parser.load_coins().unwrap();
+    let fwd_fees = parser.load_coins().unwrap();
+    let created_lt = parser.load_u64(64).unwrap();
+    let created_at = parser.load_u32(32).unwrap();
+    let contains_state_init = parser.load_bit().unwrap();
+    let contains_data = parser.load_bit().unwrap();
+
+    parser.ensure_empty().expect("Must be read fully");
+
+    let expected_dest_addr =
+        UserFriendlyAddress::from_base64_url("EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorkdl")
+            .unwrap();
+    let expected_value = U256::from(9_223_372_036_854_775_808_u64);
+
+    assert_eq!(bit_0, false);
+    assert_eq!(ihr_disabled, true);
+    assert_eq!(bounce, true);
+    assert_eq!(bounced, false);
+    assert_eq!(src_addr, AddressData::NULL);
+    assert_eq!(dest_addr, expected_dest_addr.into_data());
+    assert_eq!(value, expected_value);
+    assert_eq!(currency_collections, false);
+    assert_eq!(ihr_fees, U256::ZERO);
+    assert_eq!(fwd_fees, U256::ZERO);
+    assert_eq!(created_lt, 0);
+    assert_eq!(created_at, 0);
+    assert_eq!(contains_state_init, false);
+    assert_eq!(contains_data, false);
+}
diff --git a/rust/frameworks/tw_utxo/Cargo.toml b/rust/frameworks/tw_utxo/Cargo.toml
new file mode 100644
index 00000000000..08009365f7f
--- /dev/null
+++ b/rust/frameworks/tw_utxo/Cargo.toml
@@ -0,0 +1,24 @@
+[package]
+name = "tw_utxo"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+bech32 = "0.9.1"
+bitcoin = { version = "0.30.0", features = ["rand-std"] }
+byteorder = "1.4"
+itertools = "0.10.5"
+secp256k1 = { version = "0.27.0", features = ["rand-std"] }
+strum_macros = "0.25"
+tw_base58_address = { path = "../../tw_base58_address" }
+tw_bech32_address = { path = "../../tw_bech32_address" }
+tw_coin_entry = { path = "../../tw_coin_entry" }
+tw_encoding = { path = "../../tw_encoding" }
+tw_hash = { path = "../../tw_hash" }
+tw_keypair = { path = "../../tw_keypair" }
+tw_memory = { path = "../../tw_memory" }
+tw_misc = { path = "../../tw_misc" }
+tw_proto = { path = "../../tw_proto" }
+
+[dev-dependencies]
+tw_coin_entry = { path = "../../tw_coin_entry", features = ["test-utils"] }
diff --git a/rust/frameworks/tw_utxo/src/address/derivation.rs b/rust/frameworks/tw_utxo/src/address/derivation.rs
new file mode 100644
index 00000000000..447d069f615
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/address/derivation.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::derivation::{ChildIndex, Derivation};
+
+pub const SEGWIT_DERIVATION_PATH_TYPE: ChildIndex = ChildIndex::Hardened(84);
+pub const TAPROOT_DERIVATION_PATH_TYPE: ChildIndex = ChildIndex::Hardened(86);
+
+pub enum BitcoinDerivation {
+    Legacy,
+    Segwit,
+    Taproot,
+}
+
+impl BitcoinDerivation {
+    /// TrustWallet derivation inherited from:
+    /// https://github.com/trustwallet/wallet-core/blob/b65adc4c86e49eb905f659ade025185a62e87ca9/src/Bitcoin/Entry.cpp#L67
+    pub fn tw_derivation(coin: &dyn CoinContext, derivation: Derivation) -> BitcoinDerivation {
+        match derivation {
+            // In case of a default derivation specified by the function caller,
+            // we should check the default derivation in the `coin`'s context.
+            // Please note that testnet derivation is no longer supported. Instead, use address prefix.
+            Derivation::Default | Derivation::Testnet => (),
+            Derivation::Segwit => return BitcoinDerivation::Segwit,
+            Derivation::Legacy => return BitcoinDerivation::Legacy,
+            Derivation::Taproot => return BitcoinDerivation::Taproot,
+        }
+
+        let Some(default_derivation) = coin.derivations().first() else {
+            return BitcoinDerivation::Legacy;
+        };
+        let derivation_path_type = default_derivation.path.path().first().copied();
+
+        match default_derivation.name {
+            Derivation::Segwit => BitcoinDerivation::Segwit,
+            Derivation::Taproot => BitcoinDerivation::Taproot,
+            Derivation::Default if derivation_path_type == Some(SEGWIT_DERIVATION_PATH_TYPE) => {
+                BitcoinDerivation::Segwit
+            },
+            Derivation::Default if derivation_path_type == Some(TAPROOT_DERIVATION_PATH_TYPE) => {
+                BitcoinDerivation::Taproot
+            },
+            Derivation::Default | Derivation::Legacy | Derivation::Testnet => {
+                BitcoinDerivation::Legacy
+            },
+        }
+    }
+
+    /// TrustWallet behaviour inherited from:
+    /// https://github.com/trustwallet/wallet-core/blob/b65adc4c86e49eb905f659ade025185a62e87ca9/src/Bitcoin/Entry.cpp#L14
+    pub fn tw_supports_segwit(coin: &dyn CoinContext) -> bool {
+        coin.derivations().iter().any(|der| {
+            der.name == Derivation::Segwit
+                || der.path.path().first().copied() == Some(SEGWIT_DERIVATION_PATH_TYPE)
+        })
+    }
+
+    pub fn tw_supports_taproot(coin: &dyn CoinContext) -> bool {
+        coin.derivations().iter().any(|der| {
+            der.name == Derivation::Taproot
+                || der.path.path().first().copied() == Some(TAPROOT_DERIVATION_PATH_TYPE)
+        })
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/address/legacy.rs b/rust/frameworks/tw_utxo/src/address/legacy.rs
new file mode 100644
index 00000000000..321cd8410ea
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/address/legacy.rs
@@ -0,0 +1,151 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::script::standard_script::conditions;
+use crate::script::Script;
+use std::fmt;
+use std::str::FromStr;
+use tw_base58_address::Base58Address;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::prefix::BitcoinBase58Prefix;
+use tw_encoding::base58::Alphabet;
+use tw_hash::hasher::{sha256_ripemd, Hasher};
+use tw_hash::H160;
+use tw_keypair::{ecdsa, tw};
+
+pub const BITCOIN_ADDRESS_SIZE: usize = 21;
+pub const BITCOIN_ADDRESS_CHECKSUM_SIZE: usize = 4;
+
+type BitcoinBase58Address = Base58Address<BITCOIN_ADDRESS_SIZE, BITCOIN_ADDRESS_CHECKSUM_SIZE>;
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct LegacyAddress(BitcoinBase58Address);
+
+impl LegacyAddress {
+    pub fn new(prefix: u8, data: &[u8]) -> AddressResult<LegacyAddress> {
+        let mut bytes = Vec::with_capacity(data.len() + 1);
+        // Insert the prefix to the beginning of the address bytes array.
+        bytes.push(prefix);
+        bytes.extend_from_slice(data);
+
+        BitcoinBase58Address::new(&bytes, Alphabet::Bitcoin, Hasher::Sha256d).map(LegacyAddress)
+    }
+
+    pub fn p2pkh_with_public_key(
+        p2pkh_prefix: u8,
+        public_key: &ecdsa::secp256k1::PublicKey,
+    ) -> AddressResult<LegacyAddress> {
+        let public_key_hash = sha256_ripemd(public_key.compressed().as_slice());
+        LegacyAddress::new(p2pkh_prefix, &public_key_hash)
+    }
+
+    /// Tries to parse a `LegacyAddress` and check if
+    pub fn p2pkh_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        public_key: &tw::PublicKey,
+        prefix: Option<BitcoinBase58Prefix>,
+    ) -> AddressResult<LegacyAddress> {
+        let p2pkh_prefix = match prefix {
+            Some(prefix) => prefix.p2pkh,
+            None => coin.p2pkh_prefix().ok_or(AddressError::InvalidRegistry)?,
+        };
+
+        let ecdsa_public_key = public_key
+            .to_secp256k1()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?;
+
+        LegacyAddress::p2pkh_with_public_key(p2pkh_prefix, ecdsa_public_key)
+    }
+
+    pub fn p2sh_with_prefix_byte(
+        redeem_script: &Script,
+        p2sh_prefix: u8,
+    ) -> AddressResult<LegacyAddress> {
+        let script_hash = sha256_ripemd(redeem_script.as_slice());
+        LegacyAddress::new(p2sh_prefix, &script_hash)
+    }
+
+    pub fn from_str_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        s: &str,
+        prefix: Option<BitcoinBase58Prefix>,
+    ) -> AddressResult<LegacyAddress> {
+        let base58_prefix = match prefix {
+            Some(base58_prefix) => base58_prefix,
+            None => {
+                let p2pkh = coin.p2pkh_prefix().ok_or(AddressError::InvalidRegistry)?;
+                let p2sh = coin.p2sh_prefix().ok_or(AddressError::InvalidRegistry)?;
+                BitcoinBase58Prefix { p2pkh, p2sh }
+            },
+        };
+
+        LegacyAddress::from_str_checked(s, base58_prefix.p2pkh, base58_prefix.p2sh)
+    }
+
+    pub fn from_str_checked(
+        s: &str,
+        p2pkh_prefix: u8,
+        p2sh_prefix: u8,
+    ) -> AddressResult<LegacyAddress> {
+        let addr = LegacyAddress::from_str(s)?;
+        if addr.prefix() == p2pkh_prefix || addr.prefix() == p2sh_prefix {
+            Ok(addr)
+        } else {
+            Err(AddressError::UnexpectedAddressPrefix)
+        }
+    }
+
+    pub fn prefix(&self) -> u8 {
+        self.0.as_ref()[0]
+    }
+
+    /// Address bytes excluding the prefix (skip first byte).
+    pub fn bytes(&self) -> &[u8] {
+        &self.0.as_ref()[1..]
+    }
+
+    pub fn payload(&self) -> H160 {
+        debug_assert_eq!(self.bytes().len(), H160::LEN);
+        H160::try_from(self.bytes()).expect("Legacy address must be exactly 20 bytes")
+    }
+
+    pub fn to_script_pubkey(&self, p2pkh_prefix: u8, p2sh_prefix: u8) -> SigningResult<Script> {
+        if p2pkh_prefix == self.prefix() {
+            // P2PKH
+            Ok(conditions::new_p2pkh(&self.payload()))
+        } else if p2sh_prefix == self.prefix() {
+            // P2SH
+            Ok(conditions::new_p2sh(&self.payload()))
+        } else {
+            // Unknown
+            SigningError::err(SigningErrorType::Error_invalid_address).context(format!(
+                "The given '{self}' address has unexpected prefix. Expected p2pkh={p2pkh_prefix} p2sh={p2sh_prefix}",
+            ))
+        }
+    }
+}
+
+impl FromStr for LegacyAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        BitcoinBase58Address::from_str_with_alphabet(s, Alphabet::Bitcoin, Hasher::Sha256d)
+            .map(LegacyAddress)
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for LegacyAddress {
+    type Error = AddressError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        BitcoinBase58Address::new(bytes, Alphabet::Bitcoin, Hasher::Sha256d).map(LegacyAddress)
+    }
+}
+
+impl fmt::Display for LegacyAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/address/mod.rs b/rust/frameworks/tw_utxo/src/address/mod.rs
new file mode 100644
index 00000000000..c7c4539b421
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/address/mod.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod derivation;
+pub mod legacy;
+pub mod segwit;
+pub mod standard_bitcoin;
+pub mod taproot;
+pub mod witness_program;
+
+type Bech32Prefix = tw_bech32_address::bech32_prefix::Bech32Prefix;
diff --git a/rust/frameworks/tw_utxo/src/address/segwit.rs b/rust/frameworks/tw_utxo/src/address/segwit.rs
new file mode 100644
index 00000000000..0083a98f2bc
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/address/segwit.rs
@@ -0,0 +1,230 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::Bech32Prefix;
+use crate::address::witness_program::{WitnessProgram, WITNESS_V0};
+use crate::script::standard_script::conditions;
+use crate::script::Script;
+use core::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::hasher::sha256_ripemd;
+use tw_hash::sha2::sha256;
+use tw_hash::{H160, H256};
+use tw_keypair::tw;
+use tw_memory::Data;
+
+/// Witness program sizes valid for V0 (Segwit).
+const WITNESS_V0_VALID_PROGRAM_SIZES: [usize; 2] = [H160::LEN, H256::LEN];
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct SegwitAddress {
+    inner: WitnessProgram,
+}
+
+impl SegwitAddress {
+    pub fn new(hrp: String, witness_program: Data) -> AddressResult<SegwitAddress> {
+        // Specific segwit v0 check. These addresses can never spend funds sent to them.
+        if !WITNESS_V0_VALID_PROGRAM_SIZES.contains(&witness_program.len()) {
+            return Err(AddressError::InvalidInput);
+        }
+
+        let inner = WitnessProgram::new(hrp, WITNESS_V0, witness_program, bech32::Variant::Bech32)?;
+        Ok(SegwitAddress { inner })
+    }
+
+    pub fn p2wpkh_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        public_key: &tw::PublicKey,
+        prefix: Option<Bech32Prefix>,
+    ) -> AddressResult<SegwitAddress> {
+        let hrp = match prefix {
+            Some(Bech32Prefix { hrp }) => hrp,
+            None => coin.hrp().ok_or(AddressError::InvalidRegistry)?,
+        };
+
+        let public_key_bytes = public_key
+            .to_secp256k1()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?
+            .compressed();
+        let public_key_hash = sha256_ripemd(public_key_bytes.as_slice());
+
+        Self::new(hrp, public_key_hash.to_vec())
+    }
+
+    pub fn p2wsh_with_hrp(redeem_script: &Script, hrp: String) -> AddressResult<SegwitAddress> {
+        let script_hash = sha256(redeem_script.as_slice());
+        Self::new(hrp, script_hash)
+    }
+
+    pub fn from_str_checked(s: &str, expected_hrp: &str) -> AddressResult<SegwitAddress> {
+        let address = Self::from_str(s)?;
+        if address.inner.hrp() != expected_hrp {
+            return Err(AddressError::InvalidHrp);
+        }
+        Ok(address)
+    }
+
+    pub fn from_str_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        s: &str,
+        prefix: Option<Bech32Prefix>,
+    ) -> AddressResult<SegwitAddress> {
+        let hrp = match prefix {
+            Some(Bech32Prefix { hrp }) => hrp,
+            None => coin.hrp().ok_or(AddressError::InvalidRegistry)?,
+        };
+        SegwitAddress::from_str_checked(s, &hrp)
+    }
+
+    pub fn witness_program(&self) -> &[u8] {
+        self.inner.witness_program()
+    }
+
+    pub fn to_script_pubkey(&self) -> SigningResult<Script> {
+        let witness_program = self.witness_program();
+        match witness_program.len() {
+            // P2WPKH
+            H160::LEN => {
+                let pubkey_hash = H160::try_from(witness_program)
+                    .expect("'witness_program' length must be checked already");
+                Ok(conditions::new_p2wpkh(&pubkey_hash))
+            },
+            // P2WSH
+            H256::LEN => {
+                let script_hash = H256::try_from(witness_program)
+                    .expect("'witness_program' length must be checked already");
+                Ok(conditions::new_p2wsh(&script_hash))
+            },
+            // Unknown
+            _ => SigningError::err(SigningErrorType::Error_invalid_address).context(format!(
+                "The given '{self}' segwit address should have 20 or 32 byte length witness program"
+            )),
+        }
+    }
+}
+
+impl FromStr for SegwitAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let inner = WitnessProgram::from_str_checked(
+            s,
+            WITNESS_V0,
+            bech32::Variant::Bech32,
+            &WITNESS_V0_VALID_PROGRAM_SIZES,
+        )?;
+        Ok(SegwitAddress { inner })
+    }
+}
+
+impl fmt::Display for SegwitAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.inner)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex::DecodeHex;
+
+    struct TestInputValid {
+        str: &'static str,
+        normalized: &'static str,
+        expected: SegwitAddress,
+    }
+
+    #[track_caller]
+    fn segwit_addr(hrp: &str, program: &str) -> SegwitAddress {
+        SegwitAddress::new(hrp.to_string(), program.decode_hex().unwrap())
+            .expect("Cannot construct a SegwitAddress from the input")
+    }
+
+    /// Tests if the given `s` string representation is converted from and to `expected` segwit address.
+    #[track_caller]
+    fn test_to_from_str_valid(input: TestInputValid) {
+        let actual = SegwitAddress::from_str(input.str).expect("Expected a valid address");
+        assert_eq!(actual, input.expected, "String -> SegwitAddress");
+
+        let actual_str = actual.to_string();
+        assert_eq!(actual_str, input.normalized, "SegwitAddress -> String");
+    }
+
+    #[track_caller]
+    fn test_from_str_invalid(str: &str) {
+        let _ = SegwitAddress::from_str(str).expect_err("Expected an invalid Segwit address");
+    }
+
+    #[test]
+    fn test_segwit_address_to_from_str() {
+        test_to_from_str_valid(TestInputValid {
+            str: "BC1QW508D6QEJXTDG4Y5R3ZARVARY0C5XW7KV8F3T4",
+            normalized: "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4",
+            expected: segwit_addr("bc", "751e76e8199196d454941c45d1b3a323f1433bd6"),
+        });
+
+        test_to_from_str_valid(TestInputValid {
+            str: "tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7",
+            normalized: "tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sl5k7",
+            expected: segwit_addr(
+                "tb",
+                "1863143c14c5166804bd19203356da136c985678cd4d27a1b8c6329604903262",
+            ),
+        });
+
+        test_to_from_str_valid(TestInputValid {
+            str: "tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy",
+            normalized: "tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy",
+            expected: segwit_addr(
+                "tb",
+                "000000c4a5cad46221b2a187905e5266362b99d5e91c6ce24d165dab93e86433",
+            ),
+        });
+
+        test_to_from_str_valid(TestInputValid {
+            str: "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8",
+            normalized: "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8",
+            expected: segwit_addr("bc", "0cb9f5c6b62c03249367bc20a90dd2425e6926af"),
+        });
+
+        test_to_from_str_valid(TestInputValid {
+            str: "bc1qm9jzmujvdqjj6y28hptk859zs3yyv78hpqqjfj",
+            normalized: "bc1qm9jzmujvdqjj6y28hptk859zs3yyv78hpqqjfj",
+            expected: segwit_addr("bc", "d9642df24c68252d1147b85763d0a284484678f7"),
+        });
+
+        test_to_from_str_valid(TestInputValid {
+            str: "tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy",
+            normalized: "tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy",
+            expected: segwit_addr(
+                "tb",
+                "000000c4a5cad46221b2a187905e5266362b99d5e91c6ce24d165dab93e86433",
+            ),
+        });
+    }
+
+    #[test]
+    fn test_segwit_address_from_str_invalid() {
+        // witness program size 38
+        test_from_str_invalid(
+            "bc1q0xlxvlhemja6c4dqv22uapctqupfhlxm0xlxvlhemja6c4dqv22uapctqupfkpvgusg",
+        );
+
+        // version 1
+        test_from_str_invalid("bc1ptmsk7c2yut2xah4pgflpygh2s7fh0cpfkrza9cjj29awapv53mrslgd5cf");
+
+        // version 1
+        test_from_str_invalid(
+            "bc1pw508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kt5nd6y",
+        );
+
+        // version 2
+        test_from_str_invalid("bc1zw508d6qejxtdg4y5r3zarvaryvaxxpcs");
+
+        // version 16
+        test_from_str_invalid("BC1SW50QGDZ25J");
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/address/standard_bitcoin.rs b/rust/frameworks/tw_utxo/src/address/standard_bitcoin.rs
new file mode 100644
index 00000000000..4bdabd6d642
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/address/standard_bitcoin.rs
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! This module contains a standard Bitcoin address enumeration each of these exist on the mainnet network.
+//! TODO consider moving the file to `tw_bitcoin`.
+
+use crate::address::derivation::BitcoinDerivation;
+use crate::address::legacy::LegacyAddress;
+use crate::address::segwit::SegwitAddress;
+use crate::address::taproot::TaprootAddress;
+use crate::address::Bech32Prefix;
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::prefix::{AddressPrefix, BitcoinBase58Prefix};
+use tw_keypair::tw;
+use tw_memory::Data;
+
+/// A standard set of Bitcoin address prefixes.
+/// The set of address prefixes can differ for Bitcoin forks.
+/// TODO add `TaprootBech32` enum variant.
+pub enum StandardBitcoinPrefix {
+    Base58(BitcoinBase58Prefix),
+    Bech32(Bech32Prefix),
+}
+
+impl TryFrom<AddressPrefix> for StandardBitcoinPrefix {
+    type Error = AddressError;
+
+    fn try_from(prefix: AddressPrefix) -> Result<Self, Self::Error> {
+        match prefix {
+            AddressPrefix::BitcoinBase58(base58) => Ok(StandardBitcoinPrefix::Base58(base58)),
+            AddressPrefix::Hrp(hrp) => Ok(StandardBitcoinPrefix::Bech32(Bech32Prefix { hrp })),
+        }
+    }
+}
+
+/// A standard set of Bitcoin address types.
+///
+/// The set of address types can differ for Bitcoin forks.
+/// For example, Zcash does not support segwit addresses.
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub enum StandardBitcoinAddress {
+    Legacy(LegacyAddress),
+    Segwit(SegwitAddress),
+    Taproot(TaprootAddress),
+}
+
+impl StandardBitcoinAddress {
+    /// Tries to parse one of the `BitcoinAddress` variants
+    /// and validates if the result address matches the given `prefix` address or belongs to the `coin` network.
+    pub fn from_str_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        s: &str,
+        prefix: Option<StandardBitcoinPrefix>,
+    ) -> AddressResult<StandardBitcoinAddress> {
+        match prefix {
+            Some(StandardBitcoinPrefix::Base58(base58)) => {
+                LegacyAddress::from_str_with_coin_and_prefix(coin, s, Some(base58))
+                    .map(StandardBitcoinAddress::Legacy)
+            },
+            Some(StandardBitcoinPrefix::Bech32(bech32)) => {
+                SegwitAddress::from_str_with_coin_and_prefix(coin, s, Some(bech32))
+                    .map(StandardBitcoinAddress::Segwit)
+            },
+            None => StandardBitcoinAddress::from_str_checked(coin, s),
+        }
+    }
+
+    /// Tries to parse one of the `BitcoinAddress` variants
+    /// and validates if the result address belongs to the `coin` network.
+    pub fn from_str_checked(
+        coin: &dyn CoinContext,
+        s: &str,
+    ) -> AddressResult<StandardBitcoinAddress> {
+        // Try to parse a Segwit address if the coin supports it.
+        if BitcoinDerivation::tw_supports_segwit(coin) {
+            if let Ok(segwit) = SegwitAddress::from_str_with_coin_and_prefix(coin, s, None) {
+                return Ok(StandardBitcoinAddress::Segwit(segwit));
+            }
+        }
+
+        // Try to parse a Taproot address if the coin supports it.
+        if BitcoinDerivation::tw_supports_taproot(coin) {
+            if let Ok(taproot) = TaprootAddress::from_str_with_coin_and_prefix(coin, s, None) {
+                return Ok(StandardBitcoinAddress::Taproot(taproot));
+            }
+        }
+
+        // Otherwise, try to parse a Legacy address.
+        if let Ok(legacy) = LegacyAddress::from_str_with_coin_and_prefix(coin, s, None) {
+            return Ok(StandardBitcoinAddress::Legacy(legacy));
+        }
+
+        Err(AddressError::InvalidInput)
+    }
+
+    /// TrustWallet derivation inherited from:
+    /// https://github.com/trustwallet/wallet-core/blob/b65adc4c86e49eb905f659ade025185a62e87ca9/src/Bitcoin/Entry.cpp#L67
+    pub fn derive_as_tw(
+        coin: &dyn CoinContext,
+        public_key: &tw::PublicKey,
+        derivation: Derivation,
+        maybe_prefix: Option<StandardBitcoinPrefix>,
+    ) -> AddressResult<StandardBitcoinAddress> {
+        match maybe_prefix {
+            Some(StandardBitcoinPrefix::Base58(prefix)) => {
+                return LegacyAddress::p2pkh_with_coin_and_prefix(coin, public_key, Some(prefix))
+                    .map(StandardBitcoinAddress::Legacy);
+            },
+            Some(StandardBitcoinPrefix::Bech32(prefix)) => {
+                return SegwitAddress::p2wpkh_with_coin_and_prefix(coin, public_key, Some(prefix))
+                    .map(StandardBitcoinAddress::Segwit);
+            },
+            // Derive an address as declared in registry.json.
+            None => (),
+        }
+
+        match BitcoinDerivation::tw_derivation(coin, derivation) {
+            BitcoinDerivation::Legacy => {
+                LegacyAddress::p2pkh_with_coin_and_prefix(coin, public_key, None)
+                    .map(StandardBitcoinAddress::Legacy)
+            },
+            BitcoinDerivation::Segwit => {
+                SegwitAddress::p2wpkh_with_coin_and_prefix(coin, public_key, None)
+                    .map(StandardBitcoinAddress::Segwit)
+            },
+            BitcoinDerivation::Taproot => {
+                let no_merkle_root = None;
+                TaprootAddress::p2tr_with_coin_and_prefix(coin, public_key, None, no_merkle_root)
+                    .map(StandardBitcoinAddress::Taproot)
+            },
+        }
+    }
+}
+
+impl FromStr for StandardBitcoinAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        if let Ok(legacy) = LegacyAddress::from_str(s) {
+            return Ok(StandardBitcoinAddress::Legacy(legacy));
+        }
+        if let Ok(segwit) = SegwitAddress::from_str(s) {
+            return Ok(StandardBitcoinAddress::Segwit(segwit));
+        }
+        if let Ok(taproot) = TaprootAddress::from_str(s) {
+            return Ok(StandardBitcoinAddress::Taproot(taproot));
+        }
+        Err(AddressError::InvalidInput)
+    }
+}
+
+impl fmt::Display for StandardBitcoinAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            StandardBitcoinAddress::Legacy(legacy) => write!(f, "{legacy}"),
+            StandardBitcoinAddress::Segwit(segwit) => write!(f, "{segwit}"),
+            StandardBitcoinAddress::Taproot(taproot) => write!(f, "{taproot}"),
+        }
+    }
+}
+
+impl CoinAddress for StandardBitcoinAddress {
+    fn data(&self) -> Data {
+        match self {
+            StandardBitcoinAddress::Legacy(legacy) => legacy.bytes().to_vec(),
+            StandardBitcoinAddress::Segwit(segwit) => segwit.witness_program().to_vec(),
+            StandardBitcoinAddress::Taproot(taproot) => taproot.witness_program().to_vec(),
+        }
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/address/taproot.rs b/rust/frameworks/tw_utxo/src/address/taproot.rs
new file mode 100644
index 00000000000..653c68787e1
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/address/taproot.rs
@@ -0,0 +1,261 @@
+use super::Bech32Prefix;
+use crate::address::witness_program::WitnessProgram;
+use crate::script::standard_script::conditions;
+use crate::script::Script;
+use bitcoin::key::TapTweak;
+use core::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{H256, H264};
+use tw_keypair::tw;
+use tw_memory::Data;
+use tw_misc::traits::ToBytesVec;
+
+/// cbindgen:ignore
+pub const WITNESS_V1: u8 = 1;
+/// Witness program sizes valid for V1 (Taproot).
+/// cbindgen:ignore
+pub const WITNESS_V1_VALID_PROGRAM_SIZES: [usize; 1] = [H256::LEN];
+
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct TaprootAddress {
+    inner: WitnessProgram,
+}
+
+impl TaprootAddress {
+    pub fn new(hrp: String, witness_program: Data) -> AddressResult<TaprootAddress> {
+        // Specific Taproot V1 check. These addresses can never spend funds sent to them.
+        if !WITNESS_V1_VALID_PROGRAM_SIZES.contains(&witness_program.len()) {
+            return Err(AddressError::InvalidInput);
+        }
+
+        let inner =
+            WitnessProgram::new(hrp, WITNESS_V1, witness_program, bech32::Variant::Bech32m)?;
+        Ok(TaprootAddress { inner })
+    }
+
+    /// Create a Taproot address from a public key and an optional merkle root.
+    /// Taproot transactions come in two variants:
+    ///
+    /// * P2TR key-path: which is used for "normal" balance transfers and is
+    ///   internally _tweaked_ with an empty (None) merkle root.
+    /// * P2TR script-path: which is used for complex scripts, such as
+    ///   Ordinals/BRC20, and is internally _tweaked_ with a merkle root of all
+    ///   possible spending conditions.
+    pub fn p2tr_with_public_key(
+        hrp: String,
+        internal_pubkey: &H264,
+        merkle_root: Option<&H256>,
+    ) -> AddressResult<TaprootAddress> {
+        // We're relying on the `bitcoin` crate to generate anything Taproot related.
+
+        // Convert the native `H256` to `TapNodeHash` from the `bitcoin` crate.
+        let merkle_root = merkle_root.map(|hash| {
+            let tap_hash =
+                <bitcoin::hashes::sha256t::Hash<_> as bitcoin::hashes::Hash>::from_slice(
+                    hash.as_slice(),
+                )
+                .expect("merkle_root length is 32 bytes");
+
+            bitcoin::taproot::TapNodeHash::from_raw_hash(tap_hash)
+        });
+
+        // Tweak the public key with the (empty) merkle root.
+        let pubkey = bitcoin::PublicKey::from_slice(internal_pubkey.as_slice()).unwrap();
+        let internal_key = bitcoin::secp256k1::XOnlyPublicKey::from(pubkey.inner);
+        let (output_key, _parity) =
+            internal_key.tap_tweak(&bitcoin::secp256k1::Secp256k1::new(), merkle_root);
+
+        Self::new(hrp, output_key.serialize().to_vec())
+    }
+
+    /// Create a Taproot address from a public key and an optional merkle root.
+    /// Taproot transactions come in two variants:
+    ///
+    /// * P2TR key-path: which is used for "normal" balance transfers and is
+    ///   internally _tweaked_ with an empty (None) merkle root.
+    /// * P2TR script-path: which is used for complex scripts, such as
+    ///   Ordinals/BRC20, and is internally _tweaked_ with a merkle root of all
+    ///   possible spending conditions.
+    pub fn p2tr_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        public_key: &tw::PublicKey,
+        prefix: Option<Bech32Prefix>,
+        merkle_root: Option<&H256>,
+    ) -> AddressResult<TaprootAddress> {
+        let hrp = match prefix {
+            Some(Bech32Prefix { hrp }) => hrp,
+            None => coin.hrp().ok_or(AddressError::InvalidRegistry)?,
+        };
+
+        let public_key_bytes = public_key
+            .to_secp256k1()
+            .ok_or(AddressError::PublicKeyTypeMismatch)?
+            .compressed();
+
+        Self::p2tr_with_public_key(hrp, &public_key_bytes, merkle_root)
+    }
+
+    pub fn from_str_checked(s: &str, expected_hrp: &str) -> AddressResult<TaprootAddress> {
+        let address = Self::from_str(s)?;
+        if address.inner.hrp() != expected_hrp {
+            return Err(AddressError::InvalidHrp);
+        }
+        Ok(address)
+    }
+
+    pub fn from_str_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        s: &str,
+        prefix: Option<Bech32Prefix>,
+    ) -> AddressResult<TaprootAddress> {
+        let hrp = match prefix {
+            Some(Bech32Prefix { hrp }) => hrp,
+            None => coin.hrp().ok_or(AddressError::InvalidRegistry)?,
+        };
+        TaprootAddress::from_str_checked(s, &hrp)
+    }
+
+    pub fn witness_program(&self) -> &[u8] {
+        self.inner.witness_program()
+    }
+
+    pub fn to_script_pubkey(&self) -> SigningResult<Script> {
+        let tweaked_pubkey_hash = H256::try_from(self.witness_program())
+            .tw_err(|_| SigningErrorType::Error_invalid_address)
+            .context("P2TR 'witness_program' should be 32-bytes array")?;
+        Ok(conditions::new_p2tr_dangerous_assume_tweaked(
+            &tweaked_pubkey_hash,
+        ))
+    }
+}
+
+impl FromStr for TaprootAddress {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let inner = WitnessProgram::from_str_checked(
+            s,
+            WITNESS_V1,
+            bech32::Variant::Bech32m,
+            &WITNESS_V1_VALID_PROGRAM_SIZES,
+        )?;
+        Ok(TaprootAddress { inner })
+    }
+}
+
+impl fmt::Display for TaprootAddress {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.inner)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_coin_entry::test_utils::test_context::TestCoinContext;
+    use tw_encoding::hex::DecodeHex;
+
+    struct TestInputValid {
+        str: &'static str,
+        normalized: &'static str,
+        expected: TaprootAddress,
+    }
+
+    #[track_caller]
+    fn taproot_addr(hrp: &str, program: &str) -> TaprootAddress {
+        TaprootAddress::new(hrp.to_string(), program.decode_hex().unwrap())
+            .expect("Cannot construct a TaprootAddress from the input")
+    }
+
+    /// Tests if the given `s` string representation is converted from and to `expected` segwit address.
+    #[track_caller]
+    fn test_to_from_str_valid(input: TestInputValid) {
+        let actual = TaprootAddress::from_str(input.str).expect("Expected a valid address");
+        assert_eq!(actual, input.expected, "String -> TaprootAddress");
+
+        let actual_str = actual.to_string();
+        assert_eq!(actual_str, input.normalized, "TaprootAddress -> String");
+    }
+
+    #[track_caller]
+    fn test_from_str_invalid(str: &str) {
+        let _ = TaprootAddress::from_str(str).expect_err("Expected an invalid Taproot address");
+    }
+
+    #[test]
+    fn test_segwit_address_to_from_str() {
+        test_to_from_str_valid(TestInputValid {
+            str: "bc1ptmsk7c2yut2xah4pgflpygh2s7fh0cpfkrza9cjj29awapv53mrslgd5cf",
+            normalized: "bc1ptmsk7c2yut2xah4pgflpygh2s7fh0cpfkrza9cjj29awapv53mrslgd5cf",
+            expected: taproot_addr(
+                "bc",
+                "5ee16f6144e2d46edea1427e1222ea879377e029b0c5d2e252517aee85948ec7",
+            ),
+        });
+
+        test_to_from_str_valid(TestInputValid {
+            str: "tb1pqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesf3hn0c",
+            normalized: "tb1pqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesf3hn0c",
+            expected: taproot_addr(
+                "tb",
+                "000000c4a5cad46221b2a187905e5266362b99d5e91c6ce24d165dab93e86433",
+            ),
+        });
+
+        test_to_from_str_valid(TestInputValid {
+            str: "bc1p0xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqzk5jj0",
+            normalized: "bc1p0xlxvlhemja6c4dqv22uapctqupfhlxm9h8z3k2e72q4k9hcz7vqzk5jj0",
+            expected: taproot_addr(
+                "bc",
+                "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
+            ),
+        });
+    }
+
+    #[test]
+    fn test_taproot_address_from_str_invalid() {
+        // version 0
+        test_from_str_invalid("tb1qqqqqp399et2xygdj5xreqhjjvcmzhxw4aywxecjdzew6hylgvsesrxh6hy");
+
+        // version 2
+        test_from_str_invalid("bc1zw508d6qejxtdg4y5r3zarvaryvaxxpcs");
+
+        // version 2
+        test_from_str_invalid("bc1zw508d6qejxtdg4y5r3zarvaryvaxxpcs");
+
+        // version 16
+        test_from_str_invalid("BC1SW50QGDZ25J");
+
+        // program size 40
+        test_from_str_invalid(
+            "bc1pw508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kt5nd6y",
+        );
+    }
+
+    #[test]
+    fn test_taproot_address_create_with_coin_and_prefix() {
+        let coin = TestCoinContext::default();
+        let hrp = "bc".to_string();
+        let merkle_root = None;
+
+        let public_key_bytes = "03cdf7e208a0146c3a35c181944a96a15b2a58256be69adad640a9a97d408b9b44"
+            .decode_hex()
+            .unwrap();
+        let public_key =
+            tw::PublicKey::new(public_key_bytes.clone(), tw::PublicKeyType::Secp256k1).unwrap();
+
+        let addr = TaprootAddress::p2tr_with_coin_and_prefix(
+            &coin,
+            &public_key,
+            Some(Bech32Prefix { hrp }),
+            merkle_root,
+        )
+        .unwrap();
+        assert_eq!(
+            addr.to_string(),
+            "bc1purekytqrqzfzdulufmll8a335jhvw9x4glhzp8fv76yxlsxeyptsfylq9h"
+        );
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/address/witness_program.rs b/rust/frameworks/tw_utxo/src/address/witness_program.rs
new file mode 100644
index 00000000000..ab0287f4276
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/address/witness_program.rs
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use bech32::FromBase32;
+use std::fmt;
+use std::ops::RangeInclusive;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+
+/// cbindgen:ignore
+pub const WITNESS_V0: u8 = 0;
+/// cbindgen:ignore
+pub const MAX_WITNESS_VERSION: u8 = 16;
+/// cbindgen:ignore
+pub const WITNESS_VERSIONS: RangeInclusive<u8> = WITNESS_V0..=MAX_WITNESS_VERSION;
+/// Witness program sizes valid for most of the witness versions.
+/// Please note that V0 is more constraint.
+/// cbindgen:ignore
+pub const WITNESS_VALID_PROGRAM_SIZES: RangeInclusive<usize> = 2..=40;
+
+/// A segwit address implementation that supports various program versions.
+/// For example:
+/// * witness V0 is Segwit address
+/// * witness V1 is Taproot address
+#[derive(Clone, Debug, Eq, PartialEq)]
+pub struct WitnessProgram {
+    hrp: String,
+    witness_version: u8,
+    witness_program: Data,
+    /// An address string created from this `hrp`, `witness_version` and `witness_program`.
+    address_str: String,
+    bech32_variant: bech32::Variant,
+}
+
+impl WitnessProgram {
+    pub fn new(
+        hrp: String,
+        witness_version: u8,
+        witness_program: Data,
+        bech32_variant: bech32::Variant,
+    ) -> AddressResult<WitnessProgram> {
+        if !WITNESS_VERSIONS.contains(&witness_version) {
+            return Err(AddressError::Unsupported);
+        }
+
+        if !WITNESS_VALID_PROGRAM_SIZES.contains(&witness_program.len()) {
+            return Err(AddressError::InvalidInput);
+        }
+
+        let address_str =
+            Self::fmt_internal(&hrp, witness_version, &witness_program, bech32_variant)?;
+        Ok(WitnessProgram {
+            hrp,
+            witness_version,
+            witness_program,
+            address_str,
+            bech32_variant,
+        })
+    }
+
+    pub fn witness_version(&self) -> u8 {
+        self.witness_version
+    }
+
+    pub fn witness_program(&self) -> &[u8] {
+        &self.witness_program
+    }
+
+    pub fn hrp(&self) -> &str {
+        &self.hrp
+    }
+
+    pub fn from_str_checked(
+        s: &str,
+        expected_version: u8,
+        expected_checksum_type: bech32::Variant,
+        valid_program_sizes: &[usize],
+    ) -> AddressResult<WitnessProgram> {
+        let (hrp, payload_u5, checksum_variant) =
+            bech32::decode(s).map_err(|_| AddressError::FromBech32Error)?;
+
+        if payload_u5.is_empty() {
+            return Err(AddressError::InvalidInput);
+        }
+
+        // Get the script version and program (converted from 5-bit to 8-bit)
+        let (version, program) = payload_u5.split_at(1);
+        let version = version[0].to_u8();
+        let program = Data::from_base32(program).map_err(|_| AddressError::FromBech32Error)?;
+
+        // Check witness version.
+        if version != expected_version {
+            return Err(AddressError::Unsupported);
+        }
+
+        // Check encoding.
+        if checksum_variant != expected_checksum_type {
+            return Err(AddressError::InvalidInput);
+        }
+
+        // Check witness program sizes.
+        if !valid_program_sizes.contains(&program.len()) {
+            return Err(AddressError::InvalidInput);
+        }
+
+        WitnessProgram::new(hrp, version, program, checksum_variant)
+    }
+
+    fn fmt_internal(
+        hrp: &str,
+        witness_version: u8,
+        witness_program: &[u8],
+        bech32_variant: bech32::Variant,
+    ) -> AddressResult<String> {
+        const STRING_CAPACITY: usize = 100;
+
+        let mut result_addr = String::with_capacity(STRING_CAPACITY);
+
+        let version_u5 =
+            bech32::u5::try_from_u8(witness_version).expect("WitnessVersion must be 0..=16");
+
+        {
+            let mut bech32_writer =
+                bech32::Bech32Writer::new(hrp, bech32_variant, &mut result_addr)
+                    .map_err(|_| AddressError::FromBech32Error)?;
+            bech32::WriteBase32::write_u5(&mut bech32_writer, version_u5)
+                .map_err(|_| AddressError::FromBech32Error)?;
+            bech32::ToBase32::write_base32(&witness_program, &mut bech32_writer)
+                .map_err(|_| AddressError::FromBech32Error)?;
+        }
+
+        Ok(result_addr)
+    }
+}
+
+impl fmt::Display for WitnessProgram {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.address_str)
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/constants.rs b/rust/frameworks/tw_utxo/src/constants.rs
new file mode 100644
index 00000000000..0a99f519fac
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/constants.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+/// A standard transaction is limited to 400k weight units (WU).
+/// https://bitcoin.stackexchange.com/questions/35570/what-is-the-maximum-number-of-inputs-outputs-a-transaction-can-have
+pub const MAX_TRANSACTION_WEIGHT: usize = 400_000;
diff --git a/rust/frameworks/tw_utxo/src/context.rs b/rust/frameworks/tw_utxo/src/context.rs
new file mode 100644
index 00000000000..f0fd5e7b109
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/context.rs
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::script::Script;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::{AddressError, SigningResult};
+
+pub struct AddressPrefixes {
+    pub p2pkh_prefix: u8,
+    pub p2sh_prefix: u8,
+}
+
+pub trait UtxoContext {
+    type Address: FromStr<Err = AddressError>;
+
+    fn addr_to_script_pubkey(
+        addr: &Self::Address,
+        prefixes: AddressPrefixes,
+    ) -> SigningResult<Script>;
+}
diff --git a/rust/frameworks/tw_utxo/src/dust/dust_filter.rs b/rust/frameworks/tw_utxo/src/dust/dust_filter.rs
new file mode 100644
index 00000000000..0d68ee106dc
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/dust/dust_filter.rs
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::dust::DustPolicy;
+use crate::script::standard_script::conditions;
+use crate::transaction::transaction_interface::{TransactionInterface, TxOutputInterface};
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+
+pub struct DustFilter<Transaction> {
+    dust_policy: DustPolicy,
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction: TransactionInterface> DustFilter<Transaction> {
+    pub fn new(dust_policy: DustPolicy) -> Self {
+        DustFilter {
+            dust_policy,
+            _phantom: PhantomData,
+        }
+    }
+
+    /// Filter dust UTXOs out.
+    /// Returns an error if there are no valid UTXOs.
+    pub fn filter_inputs(
+        &self,
+        mut transaction: UnsignedTransaction<Transaction>,
+    ) -> SigningResult<UnsignedTransaction<Transaction>> {
+        let dust_threshold = self.dust_policy.dust_threshold();
+
+        transaction.retain_inputs(|_utxo, utxo_args| utxo_args.amount >= dust_threshold)?;
+
+        Ok(transaction)
+    }
+
+    /// Checks if all transaction output amounts are greater or equal to a dust threshold.
+    pub fn check_outputs(
+        &self,
+        transaction: &UnsignedTransaction<Transaction>,
+    ) -> SigningResult<()> {
+        let dust_threshold = self.dust_policy.dust_threshold();
+
+        let has_dust_output = transaction.transaction().outputs().iter().any(|output| {
+            if conditions::is_op_return(output.script_pubkey()) {
+                // Ignore the OP_RETURN output value. It can (or even should) be 0.
+                return false;
+            }
+            output.value() < dust_threshold
+        });
+
+        if has_dust_output {
+            return SigningError::err(SigningErrorType::Error_dust_amount_requested);
+        }
+        Ok(())
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/dust/mod.rs b/rust/frameworks/tw_utxo/src/dust/mod.rs
new file mode 100644
index 00000000000..5e605ae241f
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/dust/mod.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::transaction_parts::Amount;
+
+pub mod dust_filter;
+
+/// Transaction dust amount calculator.
+/// Later, we plan to add support for `DynamicDust` policy with a `min_relay_fee` amount.
+#[derive(Clone, Copy)]
+pub enum DustPolicy {
+    FixedAmount(Amount),
+}
+
+impl DustPolicy {
+    pub fn dust_threshold(&self) -> Amount {
+        match self {
+            DustPolicy::FixedAmount(amount) => *amount,
+        }
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/encode/compact_integer.rs b/rust/frameworks/tw_utxo/src/encode/compact_integer.rs
new file mode 100644
index 00000000000..ec4e3ae9d2e
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/encode/compact_integer.rs
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::stream::Stream;
+use crate::encode::Encodable;
+use std::ops::RangeInclusive;
+
+const ONE_BYTE_RANGE: RangeInclusive<u64> = 0..=0xFC;
+const TWO_BYTES_RANGE: RangeInclusive<u64> = 0xFD..=0xFFFF;
+const FOUR_BYTES_RANGE: RangeInclusive<u64> = 0x10000..=0xFFFF_FFFF;
+
+const TWO_BYTES_FLAG: u8 = 0xFD_u8;
+const FOUR_BYTES_FLAG: u8 = 0xFE_u8;
+const EIGHT_BYTES_FLAG: u8 = 0xFF_u8;
+
+/// A type of variable-length integer commonly used in the Bitcoin P2P protocol and Bitcoin serialized data structures.
+#[derive(Default, Debug, Clone, Copy, PartialEq)]
+pub struct CompactInteger(u64);
+
+impl From<usize> for CompactInteger {
+    fn from(value: usize) -> Self {
+        CompactInteger(value as u64)
+    }
+}
+
+impl Encodable for CompactInteger {
+    fn encode(&self, stream: &mut Stream) {
+        let v = self.0;
+
+        if ONE_BYTE_RANGE.contains(&v) {
+            stream.append(&(v as u8));
+        } else if TWO_BYTES_RANGE.contains(&v) {
+            stream.append(&TWO_BYTES_FLAG).append(&(v as u16));
+        } else if FOUR_BYTES_RANGE.contains(&v) {
+            stream.append(&FOUR_BYTES_FLAG).append(&(v as u32));
+        } else {
+            stream.append(&EIGHT_BYTES_FLAG).append(&v);
+        }
+    }
+
+    fn encoded_size(&self) -> usize {
+        const BYTE_FLAG: usize = 1;
+
+        let v = self.0;
+        if ONE_BYTE_RANGE.contains(&v) {
+            BYTE_FLAG
+        } else if TWO_BYTES_RANGE.contains(&v) {
+            BYTE_FLAG + 2
+        } else if FOUR_BYTES_RANGE.contains(&v) {
+            BYTE_FLAG + 4
+        } else {
+            BYTE_FLAG + 8
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_compact_integer_stream() {
+        let mut stream = Stream::default();
+
+        stream
+            .append(&CompactInteger::from(0x00_usize))
+            .append(&CompactInteger::from(0xfc_usize))
+            .append(&CompactInteger::from(0xfd_usize))
+            .append(&CompactInteger::from(0xffff_usize))
+            .append(&CompactInteger::from(0x01_0000_usize))
+            .append(&CompactInteger::from(0xffff_ffff_usize))
+            .append(&CompactInteger(0x01_0000_0000_u64));
+
+        let expected = vec![
+            0x00, // 0x00
+            0xfc, // 0xfc
+            0xfd, 0xfd, 0x00, // 0xfd
+            0xfd, 0xff, 0xff, // 0xffff
+            0xfe, 0x00, 0x00, 0x01, 0x00, // 0x01_0000
+            0xfe, 0xff, 0xff, 0xff, 0xff, // 0xffff_ffff
+            0xff, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, // 0x01_0000_0000
+        ];
+
+        assert_eq!(stream.out(), expected);
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/encode/impls.rs b/rust/frameworks/tw_utxo/src/encode/impls.rs
new file mode 100644
index 00000000000..b21b1567cc1
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/encode/impls.rs
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::compact_integer::CompactInteger;
+use crate::encode::stream::Stream;
+use crate::encode::Encodable;
+use byteorder::{LittleEndian, WriteBytesExt};
+use tw_hash::Hash;
+use tw_memory::Data;
+
+impl Encodable for Data {
+    fn encode(&self, stream: &mut Stream) {
+        stream
+            .append(&CompactInteger::from(self.len()))
+            .append_raw_slice(self.as_slice());
+    }
+
+    fn encoded_size(&self) -> usize {
+        CompactInteger::from(self.len()).encoded_size() + self.len()
+    }
+}
+
+impl<const N: usize> Encodable for Hash<N> {
+    #[inline]
+    fn encode(&self, stream: &mut Stream) {
+        stream.append_raw_slice(self.as_slice());
+    }
+
+    #[inline]
+    fn encoded_size(&self) -> usize {
+        N
+    }
+}
+
+impl Encodable for u8 {
+    #[inline]
+    fn encode(&self, s: &mut Stream) {
+        s.write_u8(*self).unwrap();
+    }
+
+    #[inline]
+    fn encoded_size(&self) -> usize {
+        1
+    }
+}
+
+macro_rules! impl_encodable_for_int {
+    ($int:ty, $size:literal, $write_fn:tt) => {
+        impl Encodable for $int {
+            #[inline]
+            fn encode(&self, s: &mut Stream) {
+                s.$write_fn::<LittleEndian>(*self).unwrap();
+            }
+
+            #[inline]
+            fn encoded_size(&self) -> usize {
+                $size
+            }
+        }
+    };
+}
+
+impl_encodable_for_int!(i32, 4, write_i32);
+impl_encodable_for_int!(i64, 8, write_i64);
+impl_encodable_for_int!(u16, 2, write_u16);
+impl_encodable_for_int!(u32, 4, write_u32);
+impl_encodable_for_int!(u64, 8, write_u64);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::encode::encode;
+    use tw_encoding::hex::{DecodeHex, ToHex};
+
+    #[test]
+    fn test_stream_append() {
+        let mut stream = Stream::default();
+
+        stream
+            .append(&1u8)
+            .append(&2u16)
+            .append(&3u32)
+            .append(&4u64);
+
+        let expected = vec![1_u8, 2, 0, 3, 0, 0, 0, 4, 0, 0, 0, 0, 0, 0, 0];
+        assert_eq!(stream.out(), expected);
+    }
+
+    #[test]
+    fn test_bytes_serialize() {
+        let expected = "020145".decode_hex().unwrap();
+        let bytes = "0145".decode_hex().unwrap();
+        assert_eq!(expected, encode(&bytes));
+    }
+
+    #[test]
+    fn test_steam_append_slice() {
+        let mut slice = [0u8; 4];
+        slice[0] = 0x64;
+        let mut stream = Stream::default();
+        stream.append_raw_slice(&slice);
+        assert_eq!(stream.out().to_hex(), "64000000");
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/encode/mod.rs b/rust/frameworks/tw_utxo/src/encode/mod.rs
new file mode 100644
index 00000000000..14eaad21574
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/encode/mod.rs
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::stream::Stream;
+use tw_memory::Data;
+
+pub mod compact_integer;
+pub mod impls;
+pub mod stream;
+
+pub fn encode<T>(t: &T) -> Data
+where
+    T: Encodable,
+{
+    let mut stream = Stream::default();
+    stream.append(t);
+    stream.out()
+}
+
+pub trait Encodable {
+    /// Serialize the struct and appends it to the end of stream.
+    fn encode(&self, stream: &mut Stream);
+
+    /// Hint about the size of serialized struct.
+    fn encoded_size(&self) -> usize;
+}
diff --git a/rust/frameworks/tw_utxo/src/encode/stream.rs b/rust/frameworks/tw_utxo/src/encode/stream.rs
new file mode 100644
index 00000000000..566debfd62b
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/encode/stream.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::compact_integer::CompactInteger;
+use crate::encode::Encodable;
+use std::io;
+use std::io::Write;
+use tw_memory::Data;
+
+/// Stream used for serialization of Bitcoin structures
+#[derive(Default)]
+pub struct Stream {
+    buffer: Data,
+}
+
+impl Stream {
+    /// New stream
+    pub fn new() -> Self {
+        Stream {
+            buffer: Data::default(),
+        }
+    }
+
+    /// Serializes the struct and appends it to the end of stream.
+    pub fn append<T>(&mut self, t: &T) -> &mut Self
+    where
+        T: Encodable,
+    {
+        t.encode(self);
+        self
+    }
+
+    /// Appends raw bytes to the end of the stream.
+    pub fn append_raw_slice(&mut self, bytes: &[u8]) -> &mut Self {
+        // discard error for now, since we write to simple vector
+        self.buffer.write_all(bytes).unwrap();
+        self
+    }
+
+    /// Appends a list of serializable structs to the end of the stream.
+    pub fn append_list<T: Encodable>(&mut self, t: &[T]) -> &mut Self {
+        CompactInteger::from(t.len()).encode(self);
+        for i in t {
+            i.encode(self);
+        }
+        self
+    }
+
+    /// Full stream.
+    pub fn out(self) -> Data {
+        self.buffer
+    }
+}
+
+impl Write for Stream {
+    #[inline]
+    fn write(&mut self, buf: &[u8]) -> Result<usize, io::Error> {
+        self.buffer.write(buf)
+    }
+
+    #[inline]
+    fn flush(&mut self) -> Result<(), io::Error> {
+        self.buffer.flush()
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/lib.rs b/rust/frameworks/tw_utxo/src/lib.rs
new file mode 100644
index 00000000000..3e44914ac42
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/lib.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod constants;
+pub mod context;
+pub mod dust;
+pub mod encode;
+pub mod modules;
+pub mod script;
+pub mod sighash;
+pub mod signature;
+pub mod signing_mode;
+pub mod spending_data;
+pub mod transaction;
diff --git a/rust/frameworks/tw_utxo/src/modules/fee_estimator.rs b/rust/frameworks/tw_utxo/src/modules/fee_estimator.rs
new file mode 100644
index 00000000000..f6fc0242ffb
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/fee_estimator.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::transaction_interface::TransactionInterface;
+use crate::transaction::transaction_parts::Amount;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+
+pub struct FeeEstimator<Transaction> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction: TransactionInterface> FeeEstimator<Transaction> {
+    pub fn estimate_fee(tx: &Transaction, fee_rate: Amount) -> SigningResult<Amount> {
+        let vsize = tx.vsize();
+        Amount::try_from(vsize)
+            .ok()
+            .and_then(|vsize| vsize.checked_mul(fee_rate))
+            .or_tw_err(SigningErrorType::Error_wrong_fee)
+            .with_context(|| format!("feePerVByte is too large: '{vsize} * {fee_rate}' overflow"))
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/keys_manager.rs b/rust/frameworks/tw_utxo/src/modules/keys_manager.rs
new file mode 100644
index 00000000000..cb272d37529
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/keys_manager.rs
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::sighash_computer::TaprootTweak;
+use std::collections::HashMap;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H264;
+use tw_keypair::{ecdsa, schnorr};
+
+/// Standard Bitcoin keys manager.
+/// Supports ecdsa and schnorr private keys.
+#[derive(Default)]
+pub struct KeysManager {
+    /// Ecdsa public to private keys.
+    ecdsa_public_private_map: HashMap<H264, ecdsa::secp256k1::PrivateKey>,
+    /// Schnorr private keys.
+    schnorr_private_keys: Vec<schnorr::PrivateKey>,
+}
+
+impl KeysManager {
+    pub fn add_ecdsa_private(&mut self, private: ecdsa::secp256k1::PrivateKey) -> &mut Self {
+        self.ecdsa_public_private_map
+            .insert(private.public().compressed(), private);
+        self
+    }
+
+    pub fn add_schnorr_private(&mut self, private: schnorr::PrivateKey) -> &mut Self {
+        self.schnorr_private_keys.push(private);
+        self
+    }
+
+    pub fn get_ecdsa_private(
+        &self,
+        public: &ecdsa::secp256k1::PublicKey,
+    ) -> SigningResult<&ecdsa::secp256k1::PrivateKey> {
+        let pubkey_bytes = public.compressed();
+
+        self.ecdsa_public_private_map
+            .get(&pubkey_bytes)
+            .or_tw_err(SigningErrorType::Error_missing_private_key)
+            .with_context(|| format!("Cannot find a private key corresponding to the ecdsa public key: {pubkey_bytes}"))
+    }
+
+    /// Gets a schnorr private key by an either tweaked or untweaked x-only public key.
+    /// The function iterates over the private keys, tweaks them if specified in `taproot_tweak`,
+    /// and returns `Ok(schnorr::PrivateKey)` if found.
+    pub fn get_schnorr_private(
+        &self,
+        public: &schnorr::XOnlyPublicKey,
+        taproot_tweak: &Option<TaprootTweak>,
+    ) -> SigningResult<schnorr::PrivateKey> {
+        let pubkey_bytes = public.bytes();
+
+        for private_key in self.schnorr_private_keys.iter() {
+            match taproot_tweak {
+                Some(ref tweak) => {
+                    let tweaked_private = private_key.clone().tweak(tweak.merkle_root);
+                    if tweaked_private.public().x_only().bytes() == pubkey_bytes {
+                        return Ok(tweaked_private);
+                    }
+                    // Otherwise, continue searching for a private key.
+                },
+                None => {
+                    if private_key.public().x_only().bytes() == pubkey_bytes {
+                        return Ok(private_key.clone());
+                    }
+                    // Otherwise, continue searching for a private key.
+                },
+            }
+        }
+
+        SigningError::err(SigningErrorType::Error_missing_private_key)
+            .context(format!("Cannot find a private key corresponding to the x-only schnorr public key: {pubkey_bytes}"))
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/mod.rs b/rust/frameworks/tw_utxo/src/modules/mod.rs
new file mode 100644
index 00000000000..9d59f9124d1
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/mod.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod fee_estimator;
+pub mod keys_manager;
+pub mod sighash_computer;
+pub mod sighash_verifier;
+pub mod tx_compiler;
+pub mod tx_planner;
+pub mod tx_signer;
+pub mod utxo_selector;
diff --git a/rust/frameworks/tw_utxo/src/modules/sighash_computer.rs b/rust/frameworks/tw_utxo/src/modules/sighash_computer.rs
new file mode 100644
index 00000000000..0bcfb626960
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/sighash_computer.rs
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::script::Script;
+use crate::signing_mode::SigningMethod;
+use crate::transaction::transaction_interface::TransactionInterface;
+use crate::transaction::transaction_parts::Amount;
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use crate::transaction::{
+    TransactionPreimage, UtxoPreimageArgs, UtxoTaprootPreimageArgs, UtxoToSign,
+};
+use std::marker::PhantomData;
+use tw_coin_entry::coin_entry::PublicKeyBytes;
+use tw_coin_entry::error::prelude::SigningResult;
+use tw_hash::H256;
+
+#[derive(Debug, Clone)]
+pub struct TxPreimage {
+    /// Transaction signatures in the same order as the transaction UTXOs.
+    pub sighashes: Vec<UtxoSighash>,
+}
+
+#[derive(Debug, Clone)]
+pub struct UtxoSighash {
+    /// The signing method needs to be used for this sighash.
+    pub signing_method: SigningMethod,
+    pub sighash: H256,
+    pub signer_pubkey: PublicKeyBytes,
+    /// Taproot tweak if [`SigningMethod::Taproot`] signing method is used.
+    /// Empty if there is no need to tweak the private to sign the sighash.
+    pub taproot_tweak: Option<TaprootTweak>,
+}
+
+#[derive(Debug, Clone)]
+pub struct TaprootTweak {
+    /// 32 bytes merkle root of the script tree.
+    /// `None` if there are no scripts, and the private key should be tweaked without a merkle root.
+    pub merkle_root: Option<H256>,
+}
+
+/// Sighash Computer with a standard Bitcoin behaviour.
+///
+/// # Important
+///
+/// If needed to implement a custom logic, consider adding a different Sighash Computer.
+pub struct SighashComputer<Transaction> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction> SighashComputer<Transaction>
+where
+    Transaction: TransactionPreimage + TransactionInterface,
+{
+    /// Computes sighashes of [`SighashComputer::transaction`].
+    pub fn preimage_tx(
+        unsigned_tx: &UnsignedTransaction<Transaction>,
+    ) -> SigningResult<TxPreimage> {
+        unsigned_tx
+            .input_args()
+            .iter()
+            .enumerate()
+            .map(|(input_index, utxo)| {
+                let signing_method = utxo.signing_method;
+
+                let utxo_args = UtxoPreimageArgs {
+                    input_index,
+                    script_pubkey: utxo.script_pubkey.clone(),
+                    amount: utxo.amount,
+                    // TODO move `leaf_hash_code_separator` to `UtxoTaprootPreimageArgs`.
+                    leaf_hash_code_separator: utxo.leaf_hash_code_separator,
+                    sighash_ty: utxo.sighash_ty,
+                    tx_hasher: utxo.tx_hasher,
+                    signing_method,
+                };
+
+                let (sighash, taproot_tweak) = match signing_method {
+                    SigningMethod::Legacy | SigningMethod::Segwit => {
+                        let sighash = unsigned_tx.transaction().preimage_tx(&utxo_args)?;
+                        (sighash, None)
+                    },
+                    SigningMethod::Taproot => {
+                        // TODO Move `tr_spent_amounts` and `tr_spent_script_pubkeys` logic to `Transaction::preimage_taproot_tx()`.
+                        let tr_spent_amounts: Vec<Amount> = unsigned_tx
+                            .input_args()
+                            .iter()
+                            .map(|utxo| utxo.amount)
+                            .collect();
+
+                        let tr_spent_script_pubkeys: Vec<Script> = unsigned_tx
+                            .input_args()
+                            .iter()
+                            .map(|utxo| {
+                                if utxo.signing_method == SigningMethod::Taproot {
+                                    // Taproot UTXOs scriptPubkeys should be signed as is.
+                                    utxo.script_pubkey.clone()
+                                } else {
+                                    // Use the original scriptPubkey declared in the unspent output.
+                                    utxo.prevout_script_pubkey.clone()
+                                }
+                            })
+                            .collect();
+
+                        let tr = UtxoTaprootPreimageArgs {
+                            args: utxo_args,
+                            spent_amounts: tr_spent_amounts,
+                            spent_script_pubkeys: tr_spent_script_pubkeys.clone(),
+                        };
+
+                        let sighash = unsigned_tx.transaction().preimage_taproot_tx(&tr)?;
+                        let taproot_tweak = Self::get_taproot_tweak(utxo);
+
+                        (sighash, taproot_tweak)
+                    },
+                };
+
+                Ok(UtxoSighash {
+                    signing_method,
+                    sighash,
+                    signer_pubkey: utxo.spender_public_key.clone(),
+                    taproot_tweak,
+                })
+            })
+            // Collect the results as [`SigningResult<Vec<UtxoSighash>>`].
+            .collect::<SigningResult<Vec<_>>>()
+            .map(|sighashes: Vec<UtxoSighash>| TxPreimage { sighashes })
+    }
+
+    pub fn get_taproot_tweak(utxo: &UtxoToSign) -> Option<TaprootTweak> {
+        // Any empty leaf hash implies P2TR key-path (balance transfer)
+        if utxo.leaf_hash_code_separator.is_none() {
+            // Tweak keypair for P2TR key-path (ie. zeroed Merkle root).
+            let merkle_root = None;
+            Some(TaprootTweak { merkle_root })
+        } else {
+            None
+        }
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/sighash_verifier.rs b/rust/frameworks/tw_utxo/src/modules/sighash_verifier.rs
new file mode 100644
index 00000000000..c6513dbb520
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/sighash_verifier.rs
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::sighash_computer::{SighashComputer, UtxoSighash};
+use crate::signature::FromRawOrDerBytes;
+use crate::signing_mode::SigningMethod;
+use crate::transaction::transaction_interface::TransactionInterface;
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use crate::transaction::{TransactionPreimage, UtxoToSign};
+use std::marker::PhantomData;
+use tw_coin_entry::coin_entry::SignatureBytes;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::ToHex;
+use tw_keypair::traits::VerifyingKeyTrait;
+use tw_keypair::{ecdsa, schnorr};
+
+/// Sighash Verifier with a standard Bitcoin behaviour.
+///
+/// # Important
+///
+/// If needed to implement a custom logic, consider adding a different Sighash Verifier.
+pub struct SighashVerifier<Transaction> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction> SighashVerifier<Transaction>
+where
+    Transaction: TransactionPreimage + TransactionInterface,
+{
+    /// Validates if the given signatures and public keys match the actual [`SighashComputer::transaction`] inputs.
+    /// The method should be used to validate externally passed signatures before [`SighashComputer::compile`].
+    ///
+    /// # Hint
+    ///
+    /// Not required when [`SighashComputer::compile`] is called right after [`SighashComputer::preimage_tx`],
+    /// as this method is expensive in terms of computations.
+    pub fn verify_signatures(
+        unsigned_tx: &UnsignedTransaction<Transaction>,
+        signatures: &[SignatureBytes],
+    ) -> SigningResult<()> {
+        Self::check_signatures_number(unsigned_tx.inputs().len(), signatures.len())?;
+
+        // Compute transaction preimage and verify if all given signatures correspond to the result sighashes.
+        let tx_preimage = SighashComputer::preimage_tx(unsigned_tx)?;
+
+        for ((sighash, utxo_args), signature) in tx_preimage
+            .sighashes
+            .iter()
+            .zip(unsigned_tx.input_args())
+            .zip(signatures)
+        {
+            Self::verify_signature(sighash, utxo_args, signature)?;
+        }
+
+        Ok(())
+    }
+
+    pub fn verify_signature(
+        sighash: &UtxoSighash,
+        utxo_args: &UtxoToSign,
+        signature: &[u8],
+    ) -> SigningResult<()> {
+        match utxo_args.signing_method {
+            SigningMethod::Legacy | SigningMethod::Segwit => {
+                Self::verify_ecdsa_signature(sighash, &utxo_args.spender_public_key, signature)
+            },
+            SigningMethod::Taproot => {
+                Self::verify_schnorr_signature(sighash, &utxo_args.spender_public_key, signature)
+            },
+        }
+    }
+
+    pub fn verify_ecdsa_signature(
+        sighash: &UtxoSighash,
+        public_key: &[u8],
+        signature: &[u8],
+    ) -> SigningResult<()> {
+        let public_key = ecdsa::secp256k1::PublicKey::try_from(public_key)
+            .into_tw()
+            .with_context(|| format!("Error invalid ecdsa public key: {}", public_key.to_hex()))?;
+
+        let sign = ecdsa::secp256k1::VerifySignature::from_raw_or_der_bytes(signature)?;
+
+        if !public_key.verify(sign, sighash.sighash) {
+            return SigningError::err(SigningErrorType::Error_signing).context(format!(
+                "Error verifying ecdsa signature: sighash='{}', pubkey='{}', signature='{}'",
+                sighash.sighash,
+                public_key.compressed(),
+                signature.to_hex()
+            ));
+        }
+
+        Ok(())
+    }
+
+    /// Please note that the public key must be tweaked already if needed.
+    pub fn verify_schnorr_signature(
+        sighash: &UtxoSighash,
+        public_key: &[u8],
+        signature: &[u8],
+    ) -> SigningResult<()> {
+        let public_key = schnorr::XOnlyPublicKey::try_from(public_key)
+            .into_tw()
+            .with_context(|| {
+                format!(
+                    "Error invalid schnorr x-only public key: {}",
+                    public_key.to_hex()
+                )
+            })?;
+
+        let sign = schnorr::Signature::try_from(signature)
+            .into_tw()
+            .context("Given an invalid schnorr signature")?;
+
+        if !public_key.verify(sign, sighash.sighash) {
+            return SigningError::err(SigningErrorType::Error_signing).context(format!(
+                "Error verifying schnorr signature: sighash='{}', pubkey='{}', signature='{}'",
+                sighash.sighash,
+                public_key.bytes(),
+                signature.to_hex()
+            ));
+        }
+
+        Ok(())
+    }
+
+    pub(crate) fn check_signatures_number(
+        inputs_len: usize,
+        signatures_len: usize,
+    ) -> SigningResult<()> {
+        if inputs_len != signatures_len {
+            return SigningError::err(SigningErrorType::Error_signatures_count).context(format!(
+                "SighashComputer's error: there are '{inputs_len}' transaction inputs, but given '{signatures_len}' signatures",
+            ));
+        }
+        Ok(())
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/tx_compiler.rs b/rust/frameworks/tw_utxo/src/modules/tx_compiler.rs
new file mode 100644
index 00000000000..e74650d9ae6
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/tx_compiler.rs
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::sighash_verifier::SighashVerifier;
+use crate::sighash::SighashType;
+use crate::signature::{BitcoinEcdsaSignature, BitcoinSchnorrSignature, FromRawOrDerBytes};
+use crate::spending_data::{
+    EcdsaSpendingDataConstructor, SchnorrSpendingDataConstructor, SpendingData,
+    SpendingDataConstructor,
+};
+use crate::transaction::transaction_interface::{TransactionInterface, TxInputInterface};
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use crate::transaction::TransactionPreimage;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_entry::SignatureBytes;
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::{ecdsa, schnorr};
+
+/// Transaction Compiler with a standard Bitcoin behaviour.
+///
+/// # Important
+///
+/// If needed to implement a custom logic, consider adding a different Transaction Compiler.
+pub struct TxCompiler<Transaction> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction> TxCompiler<Transaction>
+where
+    Transaction: TransactionPreimage + TransactionInterface,
+{
+    /// Tries to compile an unsigned transaction with the given signatures.
+    ///
+    /// # Important
+    ///
+    /// The given signatures must be verified via [`SighashVerifier::verify_signatures`]
+    /// if they were provided by an external sighash signer (remotely, outside of the WalletCore library).
+    pub fn compile(
+        unsigned_tx: UnsignedTransaction<Transaction>,
+        signatures: &[SignatureBytes],
+    ) -> SigningResult<Transaction> {
+        SighashVerifier::<Transaction>::check_signatures_number(
+            unsigned_tx.inputs().len(),
+            signatures.len(),
+        )?;
+
+        let claims = unsigned_tx
+            .input_args()
+            .iter()
+            .zip(signatures)
+            .map(|(utxo, sign)| match utxo.spending_data_constructor {
+                SpendingDataConstructor::Ecdsa(ref ecdsa_constructor) => {
+                    Self::get_ecdsa_spending_data(ecdsa_constructor.as_ref(), sign, utxo.sighash_ty)
+                },
+                SpendingDataConstructor::Schnorr(ref schnorr_constructor) => {
+                    Self::get_schnorr_spending_data(
+                        schnorr_constructor.as_ref(),
+                        sign,
+                        utxo.sighash_ty,
+                    )
+                },
+            })
+            .collect::<SigningResult<_>>()?;
+
+        Self::compile_spending_data(unsigned_tx, claims)
+    }
+
+    /// Compiles the transaction with the given spending data.
+    pub fn compile_spending_data(
+        unsigned_tx: UnsignedTransaction<Transaction>,
+        claims: Vec<SpendingData>,
+    ) -> SigningResult<Transaction> {
+        SighashVerifier::<Transaction>::check_signatures_number(
+            unsigned_tx.inputs().len(),
+            claims.len(),
+        )?;
+
+        let mut signed_tx = unsigned_tx.into_transaction();
+
+        // Add the claiming script (scriptSig or Witness) to the transaction inputs.
+        for (utxo, claim) in signed_tx.inputs_mut().iter_mut().zip(claims.into_iter()) {
+            if claim.script_sig.is_empty() && claim.witness.is_empty() {
+                return SigningError::err(SigningErrorType::Error_invalid_params).context(
+                    "Either scriptSig or witness must be provided to compile a transaction",
+                );
+            }
+
+            utxo.set_script_sig(claim.script_sig);
+            utxo.set_witness(claim.witness);
+        }
+
+        Ok(signed_tx)
+    }
+
+    fn get_ecdsa_spending_data(
+        ecdsa_constructor: &dyn EcdsaSpendingDataConstructor,
+        sign: &[u8],
+        sighash_ty: SighashType,
+    ) -> SigningResult<SpendingData> {
+        let ecdsa_sign = ecdsa::secp256k1::VerifySignature::from_raw_or_der_bytes(sign)?;
+        let der_sign = ecdsa_sign
+            .to_der()
+            .into_tw()
+            .context("Error getting ASN.1 DER-encoded signature")?;
+
+        let signature = BitcoinEcdsaSignature::new(der_sign, sighash_ty)?;
+        Ok(ecdsa_constructor.get_spending_data(&signature))
+    }
+
+    fn get_schnorr_spending_data(
+        schnorr_constructor: &dyn SchnorrSpendingDataConstructor,
+        sign: &[u8],
+        sighash_ty: SighashType,
+    ) -> SigningResult<SpendingData> {
+        let schnorr_sign = schnorr::Signature::try_from(sign)
+            .into_tw()
+            .context("Invalid schnorr signature")?;
+
+        let signature = BitcoinSchnorrSignature::new(schnorr_sign, sighash_ty)?;
+        Ok(schnorr_constructor.get_spending_data(&signature))
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/tx_planner.rs b/rust/frameworks/tw_utxo/src/modules/tx_planner.rs
new file mode 100644
index 00000000000..25caa59f7a7
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/tx_planner.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::dust::dust_filter::DustFilter;
+use crate::dust::DustPolicy;
+use crate::modules::utxo_selector::exact_selector::ExactInputSelector;
+use crate::modules::utxo_selector::max_selector::MaxInputSelector;
+use crate::modules::utxo_selector::{InputSelector, SelectResult};
+use crate::transaction::transaction_interface::TransactionInterface;
+use crate::transaction::transaction_parts::Amount;
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+
+/// For now, restrict the transaction size to be up to 100kb, i.e `max_block_size / 10`.
+pub const MAX_TRANSACTION_SIZE: usize = 100 * 1024;
+
+/// Standard Plan request.
+///
+/// # Important
+///
+/// If needed to add chain specific parameters, consider adding a different Request struct.
+pub struct PlanRequest<Transaction: TransactionInterface> {
+    pub ty: RequestType<Transaction>,
+    pub dust_policy: DustPolicy,
+    pub fee_per_vbyte: Amount,
+}
+
+pub enum RequestType<Transaction: TransactionInterface> {
+    SendMax {
+        unsigned_tx: UnsignedTransaction<Transaction>,
+    },
+    SendExact {
+        unsigned_tx: UnsignedTransaction<Transaction>,
+        change_output: Option<Transaction::Output>,
+        input_selector: InputSelector,
+    },
+}
+
+/// Transaction Planner with a standard Bitcoin behaviour.
+///
+/// # Important
+///
+/// If needed to implement a custom logic, consider adding a different Transaction Planner.
+pub struct TxPlanner<Transaction> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction> TxPlanner<Transaction>
+where
+    Transaction: TransactionInterface,
+{
+    /// * Filters dust UTXOs
+    /// * Checks if all outputs are not dust
+    /// * Select UTXOs as specified in the request
+    pub fn plan(request: PlanRequest<Transaction>) -> SigningResult<SelectResult<Transaction>> {
+        let dust_filter = DustFilter::new(request.dust_policy);
+
+        let select_result = match request.ty {
+            RequestType::SendMax { unsigned_tx } => {
+                let unsigned_tx = dust_filter
+                    .filter_inputs(unsigned_tx)
+                    .context("Error filtering dust UTXOs")?;
+
+                MaxInputSelector::new(unsigned_tx)
+                    .select_max(request.fee_per_vbyte, request.dust_policy)
+            },
+            RequestType::SendExact {
+                unsigned_tx,
+                change_output,
+                input_selector,
+            } => {
+                let unsigned_tx = dust_filter
+                    .filter_inputs(unsigned_tx)
+                    .context("Error filtering dust UTXOs")?;
+
+                ExactInputSelector::new(unsigned_tx)
+                    .maybe_change_output(change_output)
+                    .select_inputs(request.dust_policy, input_selector, request.fee_per_vbyte)
+            },
+        }
+        .context("Error selecting UTXOs")?;
+
+        // Check outputs after all manipulations are done, as there could `change` or `max` amounts be less than `dust`.
+        dust_filter
+            .check_outputs(&select_result.unsigned_tx)
+            .context("There are dust output amounts")?;
+
+        Ok(select_result)
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/tx_signer.rs b/rust/frameworks/tw_utxo/src/modules/tx_signer.rs
new file mode 100644
index 00000000000..1005864f049
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/tx_signer.rs
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::keys_manager::KeysManager;
+use crate::modules::sighash_computer::{SighashComputer, TxPreimage, UtxoSighash};
+use crate::modules::tx_compiler::TxCompiler;
+use crate::signing_mode::SigningMethod;
+use crate::transaction::transaction_interface::TransactionInterface;
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use crate::transaction::TransactionPreimage;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_entry::SignatureBytes;
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::traits::SigningKeyTrait;
+use tw_keypair::{ecdsa, schnorr};
+use tw_misc::traits::ToBytesVec;
+
+/// Transaction Signer with a standard Bitcoin behaviour.
+///
+/// # Important
+///
+/// If needed to implement a custom logic, consider adding a different Transaction Signer.
+pub struct TxSigner<Transaction> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction> TxSigner<Transaction>
+where
+    Transaction: TransactionPreimage + TransactionInterface,
+{
+    pub fn sign_tx(
+        unsigned_tx: UnsignedTransaction<Transaction>,
+        keys_manager: &KeysManager,
+    ) -> SigningResult<Transaction> {
+        let TxPreimage { sighashes } =
+            SighashComputer::preimage_tx(&unsigned_tx).context("Error sighash pre-imaging")?;
+
+        let signatures: Vec<_> = sighashes
+            .iter()
+            .map(|sighash| match sighash.signing_method {
+                SigningMethod::Legacy | SigningMethod::Segwit => {
+                    Self::sign_legacy_sighash(keys_manager, sighash)
+                },
+                SigningMethod::Taproot => Self::sign_taproot_sighash(keys_manager, sighash),
+            })
+            .collect::<SigningResult<_>>()?;
+
+        TxCompiler::compile(unsigned_tx, &signatures)
+    }
+
+    pub fn sign_legacy_sighash(
+        keys_manager: &KeysManager,
+        sighash: &UtxoSighash,
+    ) -> SigningResult<SignatureBytes> {
+        let public_key = ecdsa::secp256k1::PublicKey::try_from(sighash.signer_pubkey.as_slice())
+            .into_tw()
+            .context("Signing error: expected a valid signer ecdsa secp256k1 public key")?;
+
+        let private_key = keys_manager.get_ecdsa_private(&public_key)?;
+        let signature = private_key
+            .sign(sighash.sighash)
+            .into_tw()
+            .context("Error signing sighash with a secp256k1 private key")?;
+
+        Ok(signature.to_vec())
+    }
+
+    pub fn sign_taproot_sighash(
+        keys_manager: &KeysManager,
+        sighash: &UtxoSighash,
+    ) -> SigningResult<SignatureBytes> {
+        let x_only_pubkey = schnorr::XOnlyPublicKey::try_from(sighash.signer_pubkey.as_slice())
+            .into_tw()
+            .context("Signing error: expected a valid signer schnorr x-only public key")?;
+
+        let private_key =
+            keys_manager.get_schnorr_private(&x_only_pubkey, &sighash.taproot_tweak)?;
+        let signature = private_key
+            .sign(sighash.sighash)
+            .into_tw()
+            .context("Error signing sighash with a schnorr private key")?;
+
+        Ok(signature.to_vec())
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/utxo_selector/exact_selector.rs b/rust/frameworks/tw_utxo/src/modules/utxo_selector/exact_selector.rs
new file mode 100644
index 00000000000..9212b846bdd
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/utxo_selector/exact_selector.rs
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::constants::MAX_TRANSACTION_WEIGHT;
+use crate::dust::DustPolicy;
+use crate::modules::fee_estimator::FeeEstimator;
+use crate::modules::utxo_selector::{InputSelector, SelectPlan, SelectResult};
+use crate::script::{Script, Witness};
+use crate::transaction::transaction_interface::{
+    TransactionInterface, TxInputInterface, TxOutputInterface,
+};
+use crate::transaction::transaction_parts::Amount;
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use crate::transaction::UtxoToSign;
+use tw_coin_entry::error::prelude::*;
+
+/// UTXO selector used to send the exact amounts specified in outputs.
+pub struct ExactInputSelector<Transaction: TransactionInterface> {
+    unsigned_tx: UnsignedTransaction<Transaction>,
+    change_output: Option<Transaction::Output>,
+}
+
+impl<Transaction> ExactInputSelector<Transaction>
+where
+    Transaction: TransactionInterface,
+{
+    pub fn new(unsigned_tx: UnsignedTransaction<Transaction>) -> Self {
+        ExactInputSelector {
+            unsigned_tx,
+            change_output: None,
+        }
+    }
+
+    pub fn maybe_change_output(mut self, output: Option<Transaction::Output>) -> Self {
+        self.change_output = output;
+        self
+    }
+
+    pub fn select_inputs(
+        mut self,
+        dust_policy: DustPolicy,
+        selector: InputSelector,
+        fee_rate: Amount,
+    ) -> SigningResult<SelectResult<Transaction>> {
+        let mut estimated_tx = self.unsigned_tx.estimate_transaction();
+
+        // Calculate the total output amount.
+        let mut total_out = self.unsigned_tx.total_output()?;
+
+        if let Some(ref change_output) = self.change_output {
+            // Push the change output to the temporary "estimated" transaction only to get the most max possible fee.
+            // Later, if the result change amount is not dust (> dustThreshold),
+            // the change output will be pushed to the result unsigned transaction.
+            estimated_tx.push_output(change_output.clone());
+        }
+
+        // Prepare the available UTXOs.
+        // Please note all the Transaction inputs contain estimated script sigs.
+        let mut utxos: Vec<(Transaction::Input, &UtxoToSign)> = estimated_tx
+            .inputs()
+            .iter()
+            .cloned()
+            .zip(self.unsigned_tx.input_args())
+            .collect();
+
+        // Sort the UTXOs.
+        match selector {
+            // Nothing to do.
+            InputSelector::UseAll | InputSelector::InOrder => (),
+            InputSelector::Ascending => {
+                utxos.sort_by(|(_, a), (_, b)| a.amount.cmp(&b.amount));
+            },
+            InputSelector::Descending => {
+                utxos.sort_by(|(_, a), (_, b)| b.amount.cmp(&a.amount));
+            },
+        }
+
+        // Select the UTXOs to cover all the outputs and the fee.
+        let mut total_in = 0;
+        let mut tx_fee = 0;
+        let mut selected_utxos = Vec::with_capacity(utxos.len());
+        let mut selected_utxo_args = Vec::with_capacity(utxos.len());
+
+        let mut total_covered = false;
+        for (input, arg) in utxos {
+            // Estimated script_sig or witness MUST be set.
+            debug_assert!(input.has_witness() || input.has_script_sig());
+
+            // Update total input amount.
+            total_in += arg.amount;
+
+            // Track the selected UTXOs.
+            selected_utxos.push(input.clone());
+            selected_utxo_args.push(arg.clone());
+
+            // Update the transaction with (all) the selected in UTXOs.
+            estimated_tx.replace_inputs(selected_utxos.clone());
+
+            // Check the transaction weight.
+            if estimated_tx.weight() > MAX_TRANSACTION_WEIGHT {
+                return SigningError::err(SigningErrorType::Error_tx_too_big)
+                    .context("Too many UTXOs required to send the requested amounts");
+            }
+
+            // Estimate the transaction fee.
+            tx_fee = FeeEstimator::estimate_fee(&estimated_tx, fee_rate)?;
+
+            // Check if the total input amount covers the total output amount
+            // and the fee.
+            if total_in >= total_out + tx_fee {
+                total_covered = true;
+
+                // Unless we're told to use all inputs, we can stop here.
+                if InputSelector::UseAll != selector {
+                    break;
+                }
+            }
+        }
+
+        if !total_covered {
+            // Insufficient funds.
+            return SigningError::err(SigningErrorType::Error_not_enough_utxos)
+                .context(format!("Insufficient funds to generate a transaction. Available '{total_in}', required '{total_out}' + fee '{tx_fee}'"));
+        }
+
+        // Calculate the change amount.
+        debug_assert!(
+            total_in >= total_out + tx_fee,
+            "All amounts must be checked already"
+        );
+        let mut change = total_in - total_out - tx_fee;
+
+        let dust_threshold = dust_policy.dust_threshold();
+        match self.change_output {
+            Some(mut change_output) if change >= dust_threshold => {
+                change_output.set_value(change);
+                self.unsigned_tx.push_output(change_output);
+                total_out += change;
+            },
+            // Either not specified or the change amount is dust.
+            _ => change = 0,
+        }
+
+        // Clear script_sig's and witnesses before updating the result transaction.
+        for utxo in selected_utxos.iter_mut() {
+            utxo.set_script_sig(Script::default());
+            utxo.set_witness(Witness::default());
+        }
+
+        self.unsigned_tx
+            .set_inputs(selected_utxos, selected_utxo_args)?;
+
+        debug_assert!(total_out <= total_in);
+        let fee_estimate = total_in - total_out;
+
+        let plan = SelectPlan {
+            total_spend: total_in,
+            total_send: total_out,
+            // vsize may also include the change output even if it was not included due to the dust amount.
+            // This was made for simplicity. Consider fixing this later.
+            vsize_estimate: estimated_tx.vsize(),
+            fee_estimate,
+            change,
+        };
+        Ok(SelectResult {
+            unsigned_tx: self.unsigned_tx,
+            plan,
+        })
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/utxo_selector/max_selector.rs b/rust/frameworks/tw_utxo/src/modules/utxo_selector/max_selector.rs
new file mode 100644
index 00000000000..b1cea1e4a50
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/utxo_selector/max_selector.rs
@@ -0,0 +1,124 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::constants::MAX_TRANSACTION_WEIGHT;
+use crate::dust::DustPolicy;
+use crate::modules::fee_estimator::FeeEstimator;
+use crate::modules::utxo_selector::{SelectPlan, SelectResult};
+use crate::script::{Script, Witness};
+use crate::transaction::transaction_interface::{
+    TransactionInterface, TxInputInterface, TxOutputInterface,
+};
+use crate::transaction::transaction_parts::Amount;
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use crate::transaction::UtxoToSign;
+use itertools::Itertools;
+use tw_coin_entry::error::prelude::*;
+
+pub struct MaxInputSelector<Transaction> {
+    unsigned_tx: UnsignedTransaction<Transaction>,
+}
+
+impl<Transaction> MaxInputSelector<Transaction>
+where
+    Transaction: TransactionInterface,
+{
+    pub fn new(unsigned_tx: UnsignedTransaction<Transaction>) -> Self {
+        MaxInputSelector { unsigned_tx }
+    }
+
+    pub fn select_max(
+        mut self,
+        fee_rate: Amount,
+        dust_policy: DustPolicy,
+    ) -> SigningResult<SelectResult<Transaction>> {
+        if self.unsigned_tx.transaction().outputs().len() != 1 {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("Expected exactly one transaction output when sending max amount");
+        }
+
+        let mut estimated_tx = self.unsigned_tx.estimate_transaction();
+        let mut total_in = self.unsigned_tx.total_input()?;
+
+        // Sort the transaction inputs and their arguments in descending order.
+        // Please note all the Transaction inputs contain estimated script sigs.
+        let (mut selected_utxos, mut selected_utxo_args): (
+            Vec<Transaction::Input>,
+            Vec<UtxoToSign>,
+        ) = estimated_tx
+            .inputs()
+            .iter()
+            .cloned()
+            .zip(self.unsigned_tx.input_args().iter().cloned())
+            // Sort the UTXOs in the descending order (largest first).
+            .sorted_by(|(_, a), (_, b)| b.amount.cmp(&a.amount))
+            .unzip();
+
+        // Remove transaction inputs from lower to higher until we have a transaction
+        // with a normal weight (less or equal to `MAX_TRANSACTION_WEIGHT`).
+        while !selected_utxos.is_empty() {
+            // Put all the utxos to the estimated transaction in the descending order.
+            estimated_tx.replace_inputs(selected_utxos.clone());
+
+            // Check the transaction weight.
+            if estimated_tx.weight() <= MAX_TRANSACTION_WEIGHT {
+                break;
+            }
+
+            // Remove the most lower UTXO.
+            selected_utxos.pop();
+            let removed_arg = selected_utxo_args
+                .pop()
+                .expect("!selected_utxos.is_empty() must be checked already");
+            debug_assert!(total_in >= removed_arg.amount);
+            total_in -= removed_arg.amount;
+        }
+
+        // At this moment we have either a transaction with a normal weight, or an empty list of UTXOs.
+        // If the list of UTXOs is empty, [`UnsignedTransaction::set_inputs`] will return an error.
+
+        // Clear script_sig's and witnesses before updating the result transaction.
+        for utxo in selected_utxos.iter_mut() {
+            utxo.set_script_sig(Script::default());
+            utxo.set_witness(Witness::default());
+        }
+
+        // Update the result transaction.
+        self.unsigned_tx
+            .set_inputs(selected_utxos, selected_utxo_args)?;
+
+        let tx_fee = FeeEstimator::estimate_fee(&estimated_tx, fee_rate)?;
+        let dust_threshold = dust_policy.dust_threshold();
+
+        // Check if the total input amount covers the fee, and the remaining amount is not dust.
+        if total_in < tx_fee + dust_threshold {
+            // Insufficient funds.
+            return SigningError::err(SigningErrorType::Error_not_enough_utxos).context(format!(
+                "Insufficient funds to generate a transaction. Available '{total_in}' amount is not enough to cover transaction fee '{tx_fee}', or the remaining amount is dust"
+            ));
+        }
+
+        // Set the output amount.
+        let max_to_send = total_in - tx_fee;
+        debug_assert!(max_to_send >= dust_threshold);
+
+        self.unsigned_tx
+            .outputs_mut()
+            .first_mut()
+            .expect("Transaction output length must be checked already")
+            .set_value(max_to_send);
+
+        let plan = SelectPlan {
+            total_spend: total_in,
+            total_send: max_to_send,
+            vsize_estimate: estimated_tx.vsize(),
+            fee_estimate: tx_fee,
+            change: 0,
+        };
+        Ok(SelectResult {
+            unsigned_tx: self.unsigned_tx,
+            plan,
+        })
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/modules/utxo_selector/mod.rs b/rust/frameworks/tw_utxo/src/modules/utxo_selector/mod.rs
new file mode 100644
index 00000000000..01f42e5fe8c
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/modules/utxo_selector/mod.rs
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::transaction_parts::Amount;
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+
+pub mod exact_selector;
+pub mod max_selector;
+
+#[non_exhaustive]
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum InputSelector {
+    // Use all the inputs provided in the given order.
+    UseAll,
+    // Automatically select enough inputs in an ascending order to cover the
+    // outputs of the transaction.
+    Ascending,
+    // Automatically select enough inputs in an descending order to cover the
+    // outputs of the transaction.
+    Descending,
+    // Automatically select enough inputs in the given order to cover the
+    // outputs of the transaction.
+    InOrder,
+}
+
+pub struct SelectPlan {
+    // Maximum available amount in all the transaction input UTXOs.
+    // That is an amount that will be spent by the transaction.
+    pub total_spend: Amount,
+    /// Total sending amount in all the transaction outputs.
+    /// That is an amount that will be sent (including change output if applied).
+    pub total_send: Amount,
+    /// The estimated `vsize` in `vbytes`.
+    /// It is used to compare how much blockweight needs to be allocated to confirm a transaction.
+    /// For non-segwit transactions, `vsize` = `size`.
+    pub vsize_estimate: usize,
+    /// The estimated fees of the transaction in satoshis.
+    pub fee_estimate: Amount,
+    // Remaining change.
+    // Zero if not applied.
+    pub change: Amount,
+}
+
+pub struct SelectResult<Transaction> {
+    pub unsigned_tx: UnsignedTransaction<Transaction>,
+    pub plan: SelectPlan,
+}
diff --git a/rust/frameworks/tw_utxo/src/script/mod.rs b/rust/frameworks/tw_utxo/src/script/mod.rs
new file mode 100644
index 00000000000..7600a1e5ba8
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/script/mod.rs
@@ -0,0 +1,211 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::compact_integer::CompactInteger;
+use crate::encode::stream::Stream;
+use crate::encode::Encodable;
+use standard_script::opcodes::*;
+use tw_memory::Data;
+
+pub mod standard_script;
+
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct Script {
+    bytes: Data,
+}
+
+impl Encodable for Script {
+    fn encode(&self, stream: &mut Stream) {
+        stream.append(&self.bytes);
+    }
+
+    fn encoded_size(&self) -> usize
+    where
+        Self: Sized,
+    {
+        self.bytes.encoded_size()
+    }
+}
+
+impl Script {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn with_capacity(capacity: usize) -> Self {
+        Script {
+            bytes: Data::with_capacity(capacity),
+        }
+    }
+
+    pub fn len(&self) -> usize {
+        self.bytes.len()
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.bytes.is_empty()
+    }
+
+    /// Pushes the given opcode to the end of the script.
+    pub fn push(&mut self, code: u8) {
+        self.bytes.push(code);
+    }
+
+    /// Pushes the given data with an OP_PUSHDATA opcode and a length indicator
+    /// as prefix to the end of the script.
+    ///
+    /// # Panics
+    ///
+    /// Panics if `data.len() >= 2^32`
+    pub fn push_slice(&mut self, data: &[u8]) {
+        // Push the length indicator of the data.
+        match data.len() {
+            n if n <= 75 => {
+                // Interpreted as OP_PUSHBYTES_0..=OP_PUSHBYTES_75
+                self.push(n as u8);
+            },
+            n if n <= 255 => {
+                self.push(OP_PUSHDATA1);
+                self.push(n as u8);
+            },
+            n if n <= 65535 => {
+                self.push(OP_PUSHDATA2);
+                self.push((n % 0x100) as u8);
+                self.push((n / 0x100) as u8);
+            },
+            n if n <= 4294967295 => {
+                self.push(OP_PUSHDATA4);
+                self.push((n % 0x100) as u8);
+                self.push(((n / 0x100) % 0x100) as u8);
+                self.push(((n / 0x10000) % 0x100) as u8);
+                self.push((n / 0x1000000) as u8);
+            },
+            // Not expected to ever happen in practice
+            _ => panic!("unsupported data length"),
+        }
+
+        // Finally, push the data itself.
+        self.bytes.extend_from_slice(data);
+    }
+
+    /// Appends the given data to the end of the script as-is.
+    pub fn append(&mut self, data: &[u8]) {
+        self.bytes.extend_from_slice(data);
+    }
+
+    pub fn as_slice(&self) -> &[u8] {
+        &self.bytes
+    }
+
+    pub fn to_vec(&self) -> Data {
+        self.bytes.clone()
+    }
+}
+
+impl From<Script> for Data {
+    fn from(value: Script) -> Self {
+        value.bytes
+    }
+}
+
+impl From<Data> for Script {
+    fn from(bytes: Data) -> Self {
+        Script { bytes }
+    }
+}
+
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct Witness {
+    items: Vec<Script>,
+}
+
+impl Encodable for Witness {
+    fn encode(&self, stream: &mut Stream) {
+        stream.append_list(&self.items);
+    }
+
+    fn encoded_size(&self) -> usize {
+        CompactInteger::from(self.items.len()).encoded_size()
+            + self.items.iter().map(Script::encoded_size).sum::<usize>()
+    }
+}
+
+impl Witness {
+    pub fn new() -> Self {
+        Self::default()
+    }
+
+    pub fn push_item(&mut self, item: Script) {
+        self.items.push(item);
+    }
+
+    pub fn as_items(&self) -> &[Script] {
+        &self.items
+    }
+
+    pub fn is_empty(&self) -> bool {
+        self.items.is_empty()
+    }
+
+    pub fn clear(&mut self) {
+        self.items.clear();
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex::{DecodeHex, ToHex};
+
+    #[test]
+    fn test_script_push_long_data_1() {
+        let data1 = "304402202457e78cc1b7f50d0543863c27de75d07982bde8359b9e3316adec0aec165f2f02200203fd331c4e4a4a02f48cf1c291e2c0d6b2f7078a784b5b3649fca41f8794d401";
+        let data2 = "552103244e602b46755f24327142a0517288cebd159eccb6ccf41ea6edf1f601e9af952103bbbacc302d19d29dbfa62d23f37944ae19853cf260c745c2bea739c95328fcb721039227e83246bd51140fe93538b2301c9048be82ef2fb3c7fc5d78426ed6f609ad210229bf310c379b90033e2ecb07f77ecf9b8d59acb623ab7be25a0caed539e2e6472103703e2ed676936f10b3ce9149fa2d4a32060fb86fa9a70a4efe3f21d7ab90611921031e9b7c6022400a6bb0424bbcde14cff6c016b91ee3803926f3440abf5c146d05210334667f975f55a8455d515a2ef1c94fdfa3315f12319a14515d2a13d82831f62f57ae";
+
+        let mut script = Script::new();
+        script.push(OP_PUSHBYTES_0);
+        script.push_slice(&data1.decode_hex().unwrap());
+        script.push(OP_PUSHBYTES_0);
+        script.push_slice(&data2.decode_hex().unwrap());
+
+        // OP_0
+        // OP_PUSHBYTES_71
+        // 304402202457e78cc1b7f50d0543863c27de75d07982bde8359b9e3316adec0aec165f2f02200203fd331c4e4a4a02f48cf1c291e2c0d6b2f7078a784b5b3649fca41f8794d401
+        // OP_0
+        // OP_PUSHDATA1
+        // 552103244e602b46755f24327142a0517288cebd159eccb6ccf41ea6edf1f601e9af952103bbbacc302d19d29dbfa62d23f37944ae19853cf260c745c2bea739c95328fcb721039227e83246bd51140fe93538b2301c9048be82ef2fb3c7fc5d78426ed6f609ad210229bf310c379b90033e2ecb07f77ecf9b8d59acb623ab7be25a0caed539e2e6472103703e2ed676936f10b3ce9149fa2d4a32060fb86fa9a70a4efe3f21d7ab90611921031e9b7c6022400a6bb0424bbcde14cff6c016b91ee3803926f3440abf5c146d05210334667f975f55a8455d515a2ef1c94fdfa3315f12319a14515d2a13d82831f62f57ae
+        assert_eq!(
+            script.bytes.to_hex(),
+            "0047304402202457e78cc1b7f50d0543863c27de75d07982bde8359b9e3316adec0aec165f2f02200203fd331c4e4a4a02f48cf1c291e2c0d6b2f7078a784b5b3649fca41f8794d401004cf1552103244e602b46755f24327142a0517288cebd159eccb6ccf41ea6edf1f601e9af952103bbbacc302d19d29dbfa62d23f37944ae19853cf260c745c2bea739c95328fcb721039227e83246bd51140fe93538b2301c9048be82ef2fb3c7fc5d78426ed6f609ad210229bf310c379b90033e2ecb07f77ecf9b8d59acb623ab7be25a0caed539e2e6472103703e2ed676936f10b3ce9149fa2d4a32060fb86fa9a70a4efe3f21d7ab90611921031e9b7c6022400a6bb0424bbcde14cff6c016b91ee3803926f3440abf5c146d05210334667f975f55a8455d515a2ef1c94fdfa3315f12319a14515d2a13d82831f62f57ae"
+        );
+    }
+
+    #[test]
+    fn test_script_push_long_data_2() {
+        // Don't use fixed (on stack) byte array
+        // because it causes (signal: 10, SIGBUS: access to undefined memory) in WASM.
+        let data1 = vec![1; 65_530];
+        let data2 = vec![2; 70_000];
+
+        let mut script = Script::new();
+        script.push(OP_PUSHBYTES_0);
+        script.push_slice(&data1);
+        script.push(OP_PUSHBYTES_0);
+        script.push_slice(&data2);
+
+        let mut data_buf1 = bitcoin::script::PushBytesBuf::new();
+        data_buf1.extend_from_slice(&data1).unwrap();
+        let mut data_buf2 = bitcoin::script::PushBytesBuf::new();
+        data_buf2.extend_from_slice(&data2).unwrap();
+
+        let bitcoin_script = bitcoin::script::Script::builder()
+            .push_opcode(bitcoin::opcodes::OP_0)
+            .push_slice(data_buf1)
+            .push_opcode(bitcoin::opcodes::OP_0)
+            .push_slice(data_buf2)
+            .into_bytes();
+
+        assert_eq!(script.bytes.to_hex(), bitcoin_script.to_hex());
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/script/standard_script/claims.rs b/rust/frameworks/tw_utxo/src/script/standard_script/claims.rs
new file mode 100644
index 00000000000..02533f44c22
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/script/standard_script/claims.rs
@@ -0,0 +1,111 @@
+use tw_hash::H264;
+
+use crate::script::Witness;
+use crate::signature::{BitcoinEcdsaSignature, BitcoinSchnorrSignature};
+
+use super::Script;
+
+/// Creates a script to claim a P2PK spending condition (_scriptSig_).
+///
+/// ```txt
+/// <sig>
+/// ```
+pub fn new_p2pk(sig: &BitcoinEcdsaSignature) -> Script {
+    let mut s = Script::with_capacity(35);
+    s.push_slice(&sig.serialize());
+    s
+}
+
+// TODO next iteration.
+// /// Creates script items to claim a P2SH spending condition.
+// /// (_witness_).
+// ///
+// /// ```txt
+// /// <push><item_1><push><item_2><push><redeem_script>
+// /// ```
+// pub fn new_p2sh(items: Vec<Script>, redeem_script: Script) -> Script {
+//     let mut s = Script::new();
+//     for item in items {
+//         s.push_slice(item.as_slice());
+//     }
+//     s.push_slice(redeem_script.as_slice());
+//     s
+// }
+
+/// Creates a script to claim a P2PKH spending condition (_scriptSig_).
+/// See [`tw_keypair::ecdsa::der::Signature::der_bytes`].
+///
+/// ```txt
+/// <push><sig><push><pubkey>
+/// ```
+pub fn new_p2pkh(sig: &BitcoinEcdsaSignature, pubkey: &H264) -> Script {
+    let mut s = Script::with_capacity(100);
+    s.push_slice(&sig.serialize());
+    s.push_slice(pubkey.as_slice());
+    s
+}
+
+// TODO next iteration.
+// /// Creates witness script items to claim a P2WSH spending condition
+// /// (_witness_).
+// ///
+// /// ```txt
+// /// <witness_item_1>
+// /// <witness_item_2>
+// /// ...
+// /// <redeem_script>
+// /// ```
+// pub fn new_p2wsh(items: Vec<Script>, redeem_script: Script) -> Witness {
+//     let mut w = Witness::new();
+//     for item in items {
+//         w.push_item(item.clone());
+//     }
+//     w.push_item(redeem_script);
+//     w
+// }
+
+/// Creates witness script items to claim a P2WPKH spending condition
+/// (_witness_).
+///
+/// ```txt
+/// <sig>
+/// <pubkey>
+/// ```
+pub fn new_p2wpkh(sig: &BitcoinEcdsaSignature, pubkey: H264) -> Witness {
+    let mut w = Witness::new();
+    w.push_item(Script::from(sig.serialize()));
+    w.push_item(Script::from(pubkey.into_vec()));
+    w
+}
+
+/// Creates witness script items to claim a P2TR spending condition
+/// (_witness_).
+///
+/// ```txt
+/// <sig>
+/// ```
+pub fn new_p2tr_key_path(sig: Vec<u8>) -> Witness {
+    let mut w = Witness::new();
+    w.push_item(Script::from(sig));
+    w
+}
+
+/// Creates witness script items to claim a P2TR complex Taproot transaction
+/// (_witness_).
+///
+/// ```txt
+/// <sig>
+/// <payload>
+/// <control_block>
+/// ```
+pub fn new_p2tr_script_path(
+    sig: &BitcoinSchnorrSignature,
+    payload: Script,
+    control_block: Vec<u8>,
+) -> Witness {
+    let mut w = Witness::new();
+    w.push_item(Script::from(sig.serialize()));
+    w.push_item(payload);
+    w.push_item(Script::from(control_block));
+    w
+}
diff --git a/rust/frameworks/tw_utxo/src/script/standard_script/conditions.rs b/rust/frameworks/tw_utxo/src/script/standard_script/conditions.rs
new file mode 100644
index 00000000000..d16c21c4dd5
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/script/standard_script/conditions.rs
@@ -0,0 +1,217 @@
+use bitcoin::hashes::Hash;
+use bitcoin::key::TweakedPublicKey;
+use secp256k1::XOnlyPublicKey;
+use tw_hash::H160;
+use tw_hash::H256;
+use tw_hash::H264;
+use tw_memory::Data;
+use tw_misc::traits::ToBytesVec;
+
+use super::opcodes::*;
+use super::Script;
+use super::SEGWIT_VERSION;
+
+/// Creates a P2SH spending condition (_scriptPubkey_).
+///
+/// ```txt
+/// OP_HASH160 <push><script_hash> OP_EQUAL
+/// ```
+pub fn new_p2sh(script_hash: &H160) -> Script {
+    let mut s = Script::with_capacity(23);
+    s.push(OP_HASH160);
+    s.push_slice(script_hash.as_slice());
+    s.push(OP_EQUAL);
+    s
+}
+
+/// Creates a P2PK spending condition (_scriptPubkey_).
+///
+/// ```txt
+/// <push><pubkey> OP_CHECKSIG
+/// ```
+pub fn new_p2pk(pubkey: &H264) -> Script {
+    let mut s = Script::with_capacity(35);
+    s.push_slice(pubkey.as_slice());
+    s.push(OP_CHECKSIG);
+    s
+}
+
+/// Creates a P2PKH spending condition (_scriptPubkey_).
+///
+/// ```txt
+/// OP_DUP OP_HASH160 <push><pubkey_hash> OP_EQUALVERIFY OP_CHECKSIG
+/// ```
+pub fn new_p2pkh(pubkey_hash: &H160) -> Script {
+    let mut s = Script::with_capacity(25);
+    s.push(OP_DUP);
+    s.push(OP_HASH160);
+    s.push_slice(pubkey_hash.as_slice());
+    s.push(OP_EQUALVERIFY);
+    s.push(OP_CHECKSIG);
+    s
+}
+
+/// Creates a P2WSH spending condition (_scriptPubkey_).
+///
+/// ```txt
+/// 0 <push><script_hash>
+/// ```
+pub fn new_p2wsh(redeem_hash: &H256) -> Script {
+    let mut s = Script::with_capacity(34);
+    s.push(SEGWIT_VERSION);
+    s.push_slice(redeem_hash.as_slice());
+    s
+}
+
+/// Creates a P2WPKH spending condition (_scriptPubkey_).
+///
+/// ```txt
+/// 0 <push><pubkey_hash>
+/// ```
+pub fn new_p2wpkh(pubkey_hash: &H160) -> Script {
+    let mut s = Script::with_capacity(22);
+    s.push(SEGWIT_VERSION);
+    s.push_slice(pubkey_hash.as_slice());
+    s
+}
+
+pub fn new_p2tr_key_path(pubkey: &H264) -> Script {
+    // We're relying on the `bitcoin` crate to generate anything Taproot related.
+    let pubkey = bitcoin::PublicKey::from_slice(pubkey.as_slice()).unwrap();
+    let internal_key = XOnlyPublicKey::from(pubkey.inner);
+
+    let script = bitcoin::ScriptBuf::new_v1_p2tr(&secp256k1::Secp256k1::new(), internal_key, None);
+    Script::from(script.to_vec())
+}
+
+pub fn new_p2tr_dangerous_assume_tweaked(xonly: &H256) -> Script {
+    // We're relying on the `bitcoin` crate to generate anything Taproot related.
+    let internal_key = XOnlyPublicKey::from_slice(xonly.as_slice()).unwrap();
+    let output_key = TweakedPublicKey::dangerous_assume_tweaked(internal_key);
+
+    let script = bitcoin::ScriptBuf::new_v1_p2tr_tweaked(output_key);
+    Script::from(script.to_vec())
+}
+
+pub fn new_p2tr_script_path(pubkey: &H264, merkle_root: &H256) -> Script {
+    // We're relying on the `bitcoin` crate to generate anything Taproot related.
+    let pubkey = bitcoin::PublicKey::from_slice(pubkey.as_slice()).unwrap();
+    let internal_key = XOnlyPublicKey::from(pubkey.inner);
+
+    let hash = bitcoin::hashes::sha256t::Hash::<_>::from_slice(merkle_root.as_slice()).unwrap();
+    let merkle_root = bitcoin::taproot::TapNodeHash::from_raw_hash(hash);
+
+    let script = bitcoin::ScriptBuf::new_v1_p2tr(
+        &secp256k1::Secp256k1::new(),
+        internal_key,
+        Some(merkle_root),
+    );
+    Script::from(script.to_vec())
+}
+
+pub fn new_op_return(data: &[u8]) -> Script {
+    let mut s = Script::with_capacity(83);
+    s.push(OP_RETURN);
+    s.push_slice(data);
+    s
+}
+
+pub fn is_p2sh(s: &Script) -> bool {
+    let b = s.as_slice();
+    b.len() == 23 && b[0] == OP_HASH160 && b[1] == OP_PUSHBYTES_20 && b[22] == OP_EQUAL
+}
+
+pub fn is_p2pkh(s: &Script) -> bool {
+    let b = s.as_slice();
+    b.len() == 25
+        && b[0] == OP_DUP
+        && b[1] == OP_HASH160
+        && b[2] == OP_PUSHBYTES_20
+        && b[23] == OP_EQUALVERIFY
+        && b[24] == OP_CHECKSIG
+}
+
+pub fn is_p2wsh(s: &Script) -> bool {
+    let b = s.as_slice();
+    b.len() == 34 && b[0] == SEGWIT_VERSION && b[1] == OP_PUSHBYTES_32
+}
+
+pub fn is_p2wpkh(s: &Script) -> bool {
+    let b = s.as_slice();
+    b.len() == 22 && b[0] == SEGWIT_VERSION && b[1] == OP_PUSHBYTES_20
+}
+
+pub fn is_p2tr(s: &Script) -> bool {
+    let b = s.as_slice();
+    let taproot_version_op_code = OP_PUSHNUM_1;
+    b.len() == 34 && b[0] == taproot_version_op_code && b[1] == OP_PUSHBYTES_32
+}
+
+pub fn is_op_return(s: &Script) -> bool {
+    let b = s.as_slice();
+    !b.is_empty() && b[0] == OP_RETURN
+}
+
+/// Returns either a compressed or uncompressed public key data if matched.
+pub fn match_p2pk(s: &Script) -> Option<&[u8]> {
+    let b = s.as_slice();
+    match s.len() {
+        67 if b[0] == OP_PUSHBYTES_65 && b[66] == OP_CHECKSIG => Some(&b[1..66]),
+        35 if b[0] == OP_PUSHBYTES_33 && b[34] == OP_CHECKSIG => Some(&b[1..34]),
+        _ => None,
+    }
+}
+
+/// Returns a public key hash if matched.
+pub fn match_p2pkh(s: &Script) -> Option<H160> {
+    if is_p2pkh(s) {
+        Some(H160::try_from(&s.as_slice()[3..23]).expect("is_p2pkh checks the length"))
+    } else {
+        None
+    }
+}
+
+/// Returns a script hash if matched.
+pub fn match_p2sh(s: &Script) -> Option<H160> {
+    if is_p2sh(s) {
+        Some(H160::try_from(&s.as_slice()[2..22]).expect("is_p2sh checks the length"))
+    } else {
+        None
+    }
+}
+
+/// Returns a public key hash if matched.
+pub fn match_p2wpkh(s: &Script) -> Option<H160> {
+    if is_p2wpkh(s) {
+        Some(H160::try_from(&s.as_slice()[2..]).expect("is_p2wpkh checks the length"))
+    } else {
+        None
+    }
+}
+
+/// Returns a script hash if matched.
+pub fn match_p2wsh(s: &Script) -> Option<H256> {
+    if is_p2wsh(s) {
+        Some(H256::try_from(&s.as_slice()[2..]).expect("is_p2wsh checks the length"))
+    } else {
+        None
+    }
+}
+
+/// Returns a tweaked schnorr public key if matched.
+pub fn match_p2tr(s: &Script) -> Option<H256> {
+    if is_p2tr(s) {
+        Some(H256::try_from(&s.as_slice()[2..]).expect("is_p2tr checks the length"))
+    } else {
+        None
+    }
+}
+
+/// Returns an OP_RETURN payload.
+pub fn match_op_return(s: &Script) -> Option<Data> {
+    if is_op_return(s) {
+        Some(s.as_slice()[1..].to_vec())
+    } else {
+        None
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/script/standard_script/mod.rs b/rust/frameworks/tw_utxo/src/script/standard_script/mod.rs
new file mode 100644
index 00000000000..f2cbed23900
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/script/standard_script/mod.rs
@@ -0,0 +1,7 @@
+use super::Script;
+
+pub mod claims;
+pub mod conditions;
+pub mod opcodes;
+
+const SEGWIT_VERSION: u8 = 0;
diff --git a/rust/frameworks/tw_utxo/src/script/standard_script/opcodes.rs b/rust/frameworks/tw_utxo/src/script/standard_script/opcodes.rs
new file mode 100644
index 00000000000..027f0e9142a
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/script/standard_script/opcodes.rs
@@ -0,0 +1,256 @@
+pub const OP_PUSHBYTES_0: u8 = 0x00;
+pub const OP_PUSHBYTES_1: u8 = 0x01;
+pub const OP_PUSHBYTES_2: u8 = 0x02;
+pub const OP_PUSHBYTES_3: u8 = 0x03;
+pub const OP_PUSHBYTES_4: u8 = 0x04;
+pub const OP_PUSHBYTES_5: u8 = 0x05;
+pub const OP_PUSHBYTES_6: u8 = 0x06;
+pub const OP_PUSHBYTES_7: u8 = 0x07;
+pub const OP_PUSHBYTES_8: u8 = 0x08;
+pub const OP_PUSHBYTES_9: u8 = 0x09;
+pub const OP_PUSHBYTES_10: u8 = 0x0a;
+pub const OP_PUSHBYTES_11: u8 = 0x0b;
+pub const OP_PUSHBYTES_12: u8 = 0x0c;
+pub const OP_PUSHBYTES_13: u8 = 0x0d;
+pub const OP_PUSHBYTES_14: u8 = 0x0e;
+pub const OP_PUSHBYTES_15: u8 = 0x0f;
+pub const OP_PUSHBYTES_16: u8 = 0x10;
+pub const OP_PUSHBYTES_17: u8 = 0x11;
+pub const OP_PUSHBYTES_18: u8 = 0x12;
+pub const OP_PUSHBYTES_19: u8 = 0x13;
+pub const OP_PUSHBYTES_20: u8 = 0x14;
+pub const OP_PUSHBYTES_21: u8 = 0x15;
+pub const OP_PUSHBYTES_22: u8 = 0x16;
+pub const OP_PUSHBYTES_23: u8 = 0x17;
+pub const OP_PUSHBYTES_24: u8 = 0x18;
+pub const OP_PUSHBYTES_25: u8 = 0x19;
+pub const OP_PUSHBYTES_26: u8 = 0x1a;
+pub const OP_PUSHBYTES_27: u8 = 0x1b;
+pub const OP_PUSHBYTES_28: u8 = 0x1c;
+pub const OP_PUSHBYTES_29: u8 = 0x1d;
+pub const OP_PUSHBYTES_30: u8 = 0x1e;
+pub const OP_PUSHBYTES_31: u8 = 0x1f;
+pub const OP_PUSHBYTES_32: u8 = 0x20;
+pub const OP_PUSHBYTES_33: u8 = 0x21;
+pub const OP_PUSHBYTES_34: u8 = 0x22;
+pub const OP_PUSHBYTES_35: u8 = 0x23;
+pub const OP_PUSHBYTES_36: u8 = 0x24;
+pub const OP_PUSHBYTES_37: u8 = 0x25;
+pub const OP_PUSHBYTES_38: u8 = 0x26;
+pub const OP_PUSHBYTES_39: u8 = 0x27;
+pub const OP_PUSHBYTES_40: u8 = 0x28;
+pub const OP_PUSHBYTES_41: u8 = 0x29;
+pub const OP_PUSHBYTES_42: u8 = 0x2a;
+pub const OP_PUSHBYTES_43: u8 = 0x2b;
+pub const OP_PUSHBYTES_44: u8 = 0x2c;
+pub const OP_PUSHBYTES_45: u8 = 0x2d;
+pub const OP_PUSHBYTES_46: u8 = 0x2e;
+pub const OP_PUSHBYTES_47: u8 = 0x2f;
+pub const OP_PUSHBYTES_48: u8 = 0x30;
+pub const OP_PUSHBYTES_49: u8 = 0x31;
+pub const OP_PUSHBYTES_50: u8 = 0x32;
+pub const OP_PUSHBYTES_51: u8 = 0x33;
+pub const OP_PUSHBYTES_52: u8 = 0x34;
+pub const OP_PUSHBYTES_53: u8 = 0x35;
+pub const OP_PUSHBYTES_54: u8 = 0x36;
+pub const OP_PUSHBYTES_55: u8 = 0x37;
+pub const OP_PUSHBYTES_56: u8 = 0x38;
+pub const OP_PUSHBYTES_57: u8 = 0x39;
+pub const OP_PUSHBYTES_58: u8 = 0x3a;
+pub const OP_PUSHBYTES_59: u8 = 0x3b;
+pub const OP_PUSHBYTES_60: u8 = 0x3c;
+pub const OP_PUSHBYTES_61: u8 = 0x3d;
+pub const OP_PUSHBYTES_62: u8 = 0x3e;
+pub const OP_PUSHBYTES_63: u8 = 0x3f;
+pub const OP_PUSHBYTES_64: u8 = 0x40;
+pub const OP_PUSHBYTES_65: u8 = 0x41;
+pub const OP_PUSHBYTES_66: u8 = 0x42;
+pub const OP_PUSHBYTES_67: u8 = 0x43;
+pub const OP_PUSHBYTES_68: u8 = 0x44;
+pub const OP_PUSHBYTES_69: u8 = 0x45;
+pub const OP_PUSHBYTES_70: u8 = 0x46;
+pub const OP_PUSHBYTES_71: u8 = 0x47;
+pub const OP_PUSHBYTES_72: u8 = 0x48;
+pub const OP_PUSHBYTES_73: u8 = 0x49;
+pub const OP_PUSHBYTES_74: u8 = 0x4a;
+pub const OP_PUSHBYTES_75: u8 = 0x4b;
+pub const OP_PUSHDATA1: u8 = 0x4c;
+pub const OP_PUSHDATA2: u8 = 0x4d;
+pub const OP_PUSHDATA4: u8 = 0x4e;
+pub const OP_PUSHNUM_NEG1: u8 = 0x4f;
+pub const OP_RESERVED: u8 = 0x50;
+pub const OP_PUSHNUM_1: u8 = 0x51;
+pub const OP_PUSHNUM_2: u8 = 0x52;
+pub const OP_PUSHNUM_3: u8 = 0x53;
+pub const OP_PUSHNUM_4: u8 = 0x54;
+pub const OP_PUSHNUM_5: u8 = 0x55;
+pub const OP_PUSHNUM_6: u8 = 0x56;
+pub const OP_PUSHNUM_7: u8 = 0x57;
+pub const OP_PUSHNUM_8: u8 = 0x58;
+pub const OP_PUSHNUM_9: u8 = 0x59;
+pub const OP_PUSHNUM_10: u8 = 0x5a;
+pub const OP_PUSHNUM_11: u8 = 0x5b;
+pub const OP_PUSHNUM_12: u8 = 0x5c;
+pub const OP_PUSHNUM_13: u8 = 0x5d;
+pub const OP_PUSHNUM_14: u8 = 0x5e;
+pub const OP_PUSHNUM_15: u8 = 0x5f;
+pub const OP_PUSHNUM_16: u8 = 0x60;
+pub const OP_NOP: u8 = 0x61;
+pub const OP_VER: u8 = 0x62;
+pub const OP_IF: u8 = 0x63;
+pub const OP_NOTIF: u8 = 0x64;
+pub const OP_VERIF: u8 = 0x65;
+pub const OP_VERNOTIF: u8 = 0x66;
+pub const OP_ELSE: u8 = 0x67;
+pub const OP_ENDIF: u8 = 0x68;
+pub const OP_VERIFY: u8 = 0x69;
+pub const OP_RETURN: u8 = 0x6a;
+pub const OP_TOALTSTACK: u8 = 0x6b;
+pub const OP_FROMALTSTACK: u8 = 0x6c;
+pub const OP_2DROP: u8 = 0x6d;
+pub const OP_2DUP: u8 = 0x6e;
+pub const OP_3DUP: u8 = 0x6f;
+pub const OP_2OVER: u8 = 0x70;
+pub const OP_2ROT: u8 = 0x71;
+pub const OP_2SWAP: u8 = 0x72;
+pub const OP_IFDUP: u8 = 0x73;
+pub const OP_DEPTH: u8 = 0x74;
+pub const OP_DROP: u8 = 0x75;
+pub const OP_DUP: u8 = 0x76;
+pub const OP_NIP: u8 = 0x77;
+pub const OP_OVER: u8 = 0x78;
+pub const OP_PICK: u8 = 0x79;
+pub const OP_ROLL: u8 = 0x7a;
+pub const OP_ROT: u8 = 0x7b;
+pub const OP_SWAP: u8 = 0x7c;
+pub const OP_TUCK: u8 = 0x7d;
+pub const OP_CAT: u8 = 0x7e;
+pub const OP_SUBSTR: u8 = 0x7f;
+pub const OP_LEFT: u8 = 0x80;
+pub const OP_RIGHT: u8 = 0x81;
+pub const OP_SIZE: u8 = 0x82;
+pub const OP_INVERT: u8 = 0x83;
+pub const OP_AND: u8 = 0x84;
+pub const OP_OR: u8 = 0x85;
+pub const OP_XOR: u8 = 0x86;
+pub const OP_EQUAL: u8 = 0x87;
+pub const OP_EQUALVERIFY: u8 = 0x88;
+pub const OP_RESERVED1: u8 = 0x89;
+pub const OP_RESERVED2: u8 = 0x8a;
+pub const OP_1ADD: u8 = 0x8b;
+pub const OP_1SUB: u8 = 0x8c;
+pub const OP_2MUL: u8 = 0x8d;
+pub const OP_2DIV: u8 = 0x8e;
+pub const OP_NEGATE: u8 = 0x8f;
+pub const OP_ABS: u8 = 0x90;
+pub const OP_NOT: u8 = 0x91;
+pub const OP_0NOTEQUAL: u8 = 0x92;
+pub const OP_ADD: u8 = 0x93;
+pub const OP_SUB: u8 = 0x94;
+pub const OP_MUL: u8 = 0x95;
+pub const OP_DIV: u8 = 0x96;
+pub const OP_MOD: u8 = 0x97;
+pub const OP_LSHIFT: u8 = 0x98;
+pub const OP_RSHIFT: u8 = 0x99;
+pub const OP_BOOLAND: u8 = 0x9a;
+pub const OP_BOOLOR: u8 = 0x9b;
+pub const OP_NUMEQUAL: u8 = 0x9c;
+pub const OP_NUMEQUALVERIFY: u8 = 0x9d;
+pub const OP_NUMNOTEQUAL: u8 = 0x9e;
+pub const OP_LESSTHAN: u8 = 0x9f;
+pub const OP_GREATERTHAN: u8 = 0xa0;
+pub const OP_LESSTHANOREQUAL: u8 = 0xa1;
+pub const OP_GREATERTHANOREQUAL: u8 = 0xa2;
+pub const OP_MIN: u8 = 0xa3;
+pub const OP_MAX: u8 = 0xa4;
+pub const OP_WITHIN: u8 = 0xa5;
+pub const OP_RIPEMD160: u8 = 0xa6;
+pub const OP_SHA1: u8 = 0xa7;
+pub const OP_SHA256: u8 = 0xa8;
+pub const OP_HASH160: u8 = 0xa9;
+pub const OP_HASH256: u8 = 0xaa;
+pub const OP_CODESEPARATOR: u8 = 0xab;
+pub const OP_CHECKSIG: u8 = 0xac;
+pub const OP_CHECKSIGVERIFY: u8 = 0xad;
+pub const OP_CHECKMULTISIG: u8 = 0xae;
+pub const OP_CHECKMULTISIGVERIFY: u8 = 0xaf;
+pub const OP_NOP1: u8 = 0xb0;
+pub const OP_CLTV: u8 = 0xb1;
+pub const OP_CSV: u8 = 0xb2;
+pub const OP_NOP4: u8 = 0xb3;
+pub const OP_NOP5: u8 = 0xb4;
+pub const OP_NOP6: u8 = 0xb5;
+pub const OP_NOP7: u8 = 0xb6;
+pub const OP_NOP8: u8 = 0xb7;
+pub const OP_NOP9: u8 = 0xb8;
+pub const OP_NOP10: u8 = 0xb9;
+pub const OP_CHECKSIGADD: u8 = 0xba;
+pub const OP_RETURN_187: u8 = 0xbb;
+pub const OP_RETURN_188: u8 = 0xbc;
+pub const OP_RETURN_189: u8 = 0xbd;
+pub const OP_RETURN_190: u8 = 0xbe;
+pub const OP_RETURN_191: u8 = 0xbf;
+pub const OP_RETURN_192: u8 = 0xc0;
+pub const OP_RETURN_193: u8 = 0xc1;
+pub const OP_RETURN_194: u8 = 0xc2;
+pub const OP_RETURN_195: u8 = 0xc3;
+pub const OP_RETURN_196: u8 = 0xc4;
+pub const OP_RETURN_197: u8 = 0xc5;
+pub const OP_RETURN_198: u8 = 0xc6;
+pub const OP_RETURN_199: u8 = 0xc7;
+pub const OP_RETURN_200: u8 = 0xc8;
+pub const OP_RETURN_201: u8 = 0xc9;
+pub const OP_RETURN_202: u8 = 0xca;
+pub const OP_RETURN_203: u8 = 0xcb;
+pub const OP_RETURN_204: u8 = 0xcc;
+pub const OP_RETURN_205: u8 = 0xcd;
+pub const OP_RETURN_206: u8 = 0xce;
+pub const OP_RETURN_207: u8 = 0xcf;
+pub const OP_RETURN_208: u8 = 0xd0;
+pub const OP_RETURN_209: u8 = 0xd1;
+pub const OP_RETURN_210: u8 = 0xd2;
+pub const OP_RETURN_211: u8 = 0xd3;
+pub const OP_RETURN_212: u8 = 0xd4;
+pub const OP_RETURN_213: u8 = 0xd5;
+pub const OP_RETURN_214: u8 = 0xd6;
+pub const OP_RETURN_215: u8 = 0xd7;
+pub const OP_RETURN_216: u8 = 0xd8;
+pub const OP_RETURN_217: u8 = 0xd9;
+pub const OP_RETURN_218: u8 = 0xda;
+pub const OP_RETURN_219: u8 = 0xdb;
+pub const OP_RETURN_220: u8 = 0xdc;
+pub const OP_RETURN_221: u8 = 0xdd;
+pub const OP_RETURN_222: u8 = 0xde;
+pub const OP_RETURN_223: u8 = 0xdf;
+pub const OP_RETURN_224: u8 = 0xe0;
+pub const OP_RETURN_225: u8 = 0xe1;
+pub const OP_RETURN_226: u8 = 0xe2;
+pub const OP_RETURN_227: u8 = 0xe3;
+pub const OP_RETURN_228: u8 = 0xe4;
+pub const OP_RETURN_229: u8 = 0xe5;
+pub const OP_RETURN_230: u8 = 0xe6;
+pub const OP_RETURN_231: u8 = 0xe7;
+pub const OP_RETURN_232: u8 = 0xe8;
+pub const OP_RETURN_233: u8 = 0xe9;
+pub const OP_RETURN_234: u8 = 0xea;
+pub const OP_RETURN_235: u8 = 0xeb;
+pub const OP_RETURN_236: u8 = 0xec;
+pub const OP_RETURN_237: u8 = 0xed;
+pub const OP_RETURN_238: u8 = 0xee;
+pub const OP_RETURN_239: u8 = 0xef;
+pub const OP_RETURN_240: u8 = 0xf0;
+pub const OP_RETURN_241: u8 = 0xf1;
+pub const OP_RETURN_242: u8 = 0xf2;
+pub const OP_RETURN_243: u8 = 0xf3;
+pub const OP_RETURN_244: u8 = 0xf4;
+pub const OP_RETURN_245: u8 = 0xf5;
+pub const OP_RETURN_246: u8 = 0xf6;
+pub const OP_RETURN_247: u8 = 0xf7;
+pub const OP_RETURN_248: u8 = 0xf8;
+pub const OP_RETURN_249: u8 = 0xf9;
+pub const OP_RETURN_250: u8 = 0xfa;
+pub const OP_RETURN_251: u8 = 0xfb;
+pub const OP_RETURN_252: u8 = 0xfc;
+pub const OP_RETURN_253: u8 = 0xfd;
+pub const OP_RETURN_254: u8 = 0xfe;
+pub const OP_INVALIDOPCODE: u8 = 0xff;
diff --git a/rust/frameworks/tw_utxo/src/sighash.rs b/rust/frameworks/tw_utxo/src/sighash.rs
new file mode 100644
index 00000000000..1c7c79729e6
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/sighash.rs
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+
+const ANYONE_CAN_PAY_FLAG: u32 = 0x80;
+const FORK_ID_FLAG: u32 = 0x40;
+const BASE_FLAG: u32 = 0x1f;
+const DEFAULT_TAPROOT_SIGHASH_TYPE: u8 = 0;
+
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+#[repr(u32)]
+pub enum SighashBase {
+    /// Sign all inputs and outputs (default) - 0x01
+    All = 1,
+    /// Sign all inputs but no outputs, anyone can choose the destination - 0x02
+    None = 2,
+    /// Sign the output whose index matches this inputs index - 0x03
+    Single = 3,
+}
+
+/// Signature hash type.
+/// https://en.bitcoin.it/wiki/OP_CHECKSIG#Procedure_for_Hashtype_SIGHASH_SINGLE
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub struct SighashType {
+    /// Original raw sighash type.
+    raw_sighash: u32,
+    /// Sighash base type.
+    base: SighashBase,
+}
+
+impl SighashType {
+    /// Creates Sighash from any u32.
+    pub fn from_u32(u: u32) -> SigningResult<Self> {
+        let base = match u & BASE_FLAG {
+            0 | 1 => SighashBase::All,
+            2 => SighashBase::None,
+            3 => SighashBase::Single,
+            _ => {
+                return SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("Invalid sighash uint32 representation")
+            },
+        };
+        Ok(SighashType {
+            raw_sighash: u,
+            base,
+        })
+    }
+
+    /// Returns a raw sighash type.
+    pub fn raw_sighash(&self) -> u32 {
+        self.raw_sighash
+    }
+
+    /// Returns a raw sighash type as u8 if possible.
+    pub fn serialize(&self) -> SigningResult<u8> {
+        self.raw_sighash
+            .try_into()
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("sighashType must fit uint8")
+    }
+
+    /// Returns a serialized raw sighash type, where `All` sighash is serialized as 0x00 (`Default`).
+    /// The 0x00 variant is only supported in Taproot transactions,
+    /// not in Legacy or Segwit transactions.
+    pub fn serialize_as_taproot(&self) -> SigningResult<u8> {
+        if self.is_default_taproot_sighash() {
+            Ok(DEFAULT_TAPROOT_SIGHASH_TYPE)
+        } else {
+            self.raw_sighash
+                .try_into()
+                .tw_err(|_| SigningErrorType::Error_invalid_params)
+                .context("Taproot sighashType must fit uint8")
+        }
+    }
+
+    /// Whether the sighash type is `Default` Taproot, i.e will be serialized as 0x00.
+    /// The 0x00 variant is only supported in Taproot transactions,
+    /// not in Legacy or Segwit transactions.
+    pub fn is_default_taproot_sighash(&self) -> bool {
+        self.raw_sighash == DEFAULT_TAPROOT_SIGHASH_TYPE as u32
+            || self.raw_sighash == SighashBase::All as u32
+    }
+
+    pub fn base_type(&self) -> SighashBase {
+        self.base
+    }
+
+    /// Whether anyone can pay.
+    pub fn anyone_can_pay(&self) -> bool {
+        (self.raw_sighash & ANYONE_CAN_PAY_FLAG) == ANYONE_CAN_PAY_FLAG
+    }
+
+    /// Whether a fork chain.
+    pub fn fork_id(&self) -> bool {
+        (self.raw_sighash & FORK_ID_FLAG) == FORK_ID_FLAG
+    }
+}
+
+impl Default for SighashType {
+    fn default() -> Self {
+        SighashType {
+            raw_sighash: SighashBase::All as u32,
+            base: SighashBase::All,
+        }
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/signature.rs b/rust/frameworks/tw_utxo/src/signature.rs
new file mode 100644
index 00000000000..573fb7b08e0
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/signature.rs
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::sighash::SighashType;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H512;
+use tw_keypair::ecdsa::der;
+use tw_keypair::{ecdsa, schnorr};
+use tw_memory::Data;
+
+/// Use the max value of the u8 type to avoid potential serialization optimizations (like ASN.1 DER).
+const ESTIMATION_DEFAULT_BYTE: u8 = u8::MAX;
+
+/// A Bitcoin ECDSA signature with a sighash type, which must be serialzed
+/// occordingly in the scriptSig/Witness data to spend an output.
+pub struct BitcoinEcdsaSignature {
+    /// ECDSA signature serialized as DER. See [`der::Signature`].
+    der_sig: Data,
+    sighash_ty: u8,
+}
+
+impl BitcoinEcdsaSignature {
+    // The max size of the serialized signature including sighash type.
+    const SER_SIZE: usize = 73;
+
+    pub fn new(sig: der::Signature, sighash_ty: SighashType) -> SigningResult<Self> {
+        let der_sig = sig.der_bytes();
+        let sighash_ty = sighash_ty.serialize()?;
+        Ok(BitcoinEcdsaSignature {
+            der_sig,
+            sighash_ty,
+        })
+    }
+
+    pub fn estimated() -> Self {
+        BitcoinEcdsaSignature {
+            der_sig: vec![ESTIMATION_DEFAULT_BYTE; Self::SER_SIZE - 1],
+            sighash_ty: ESTIMATION_DEFAULT_BYTE,
+        }
+    }
+
+    pub fn serialize(&self) -> Data {
+        let mut ser = Vec::with_capacity(Self::SER_SIZE);
+        ser.extend_from_slice(self.der_sig.as_slice());
+        ser.push(self.sighash_ty);
+        debug_assert!(ser.len() <= Self::SER_SIZE);
+        ser
+    }
+}
+
+pub struct BitcoinSchnorrSignature {
+    sig: H512,
+    sighash_ty: u8,
+}
+
+impl BitcoinSchnorrSignature {
+    pub fn new(
+        sig: schnorr::Signature,
+        sighash_ty: SighashType,
+    ) -> SigningResult<BitcoinSchnorrSignature> {
+        Ok(BitcoinSchnorrSignature {
+            sig: sig.bytes(),
+            sighash_ty: sighash_ty.serialize_as_taproot()?,
+        })
+    }
+
+    pub fn estimated() -> BitcoinSchnorrSignature {
+        BitcoinSchnorrSignature {
+            sig: H512::from([ESTIMATION_DEFAULT_BYTE; H512::LEN]),
+            sighash_ty: ESTIMATION_DEFAULT_BYTE,
+        }
+    }
+
+    pub fn serialize(&self) -> Vec<u8> {
+        let mut ser = Vec::with_capacity(65);
+        ser.extend_from_slice(self.sig.as_slice());
+        if self.sighash_ty != 0 {
+            ser.push(self.sighash_ty)
+        }
+        ser
+    }
+}
+
+pub trait FromRawOrDerBytes: Sized {
+    fn from_raw_or_der_bytes(bytes: &[u8]) -> SigningResult<Self>;
+}
+
+impl FromRawOrDerBytes for ecdsa::secp256k1::VerifySignature {
+    /// Tries to create a secp256k1 verify signature from either a raw bytes (64-65 length)
+    /// or ASN.1 DER bytes (70-72 length).
+    fn from_raw_or_der_bytes(bytes: &[u8]) -> SigningResult<Self> {
+        if ecdsa::secp256k1::Signature::VERIFY_SIGNATURE_LEN_RANGE.contains(&bytes.len()) {
+            return ecdsa::secp256k1::VerifySignature::try_from(bytes)
+                .into_tw()
+                .context("Given an invalid ecdsa signature");
+        }
+
+        der::Signature::from_bytes(bytes)
+            .and_then(ecdsa::secp256k1::VerifySignature::from_der)
+            .into_tw()
+            .context("Given an invalid ASN.1 DER signature")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex::DecodeHex;
+
+    #[test]
+    fn test_verify_signature_from_raw_or_der_bytes() {
+        struct TestCase {
+            bytes: &'static str,
+            expected: &'static str,
+        }
+
+        #[track_caller]
+        fn test_impl(input: TestCase) {
+            let bytes = input.bytes.decode_hex().unwrap();
+            let sign = ecdsa::secp256k1::VerifySignature::from_raw_or_der_bytes(&bytes).unwrap();
+            assert_eq!(sign.to_bytes().to_string(), input.expected);
+        }
+
+        // From DER 70 bytes.
+        test_impl(TestCase {
+            bytes: "304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a40",
+            expected: "1857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b3490a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a40",
+        });
+        // From DER 71 bytes.
+        test_impl(TestCase {
+            bytes: "3045022100b2b31575f8536b284410d01217f688be3a9faf4ba0ba3a9093f983e40d630ec7022022a7a25b01403cff0d00b3b853d230f8e96ff832b15d4ccc75203cb65896a2d5",
+            expected: "b2b31575f8536b284410d01217f688be3a9faf4ba0ba3a9093f983e40d630ec722a7a25b01403cff0d00b3b853d230f8e96ff832b15d4ccc75203cb65896a2d5",
+        });
+        // From DER 72 bytes.
+        test_impl(TestCase {
+            bytes: "3046022100db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495da022100ff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1",
+            expected: "db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495daff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1",
+        });
+        // From ECDSA 64 bytes.
+        test_impl(TestCase {
+            bytes: "db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495daff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1",
+            expected: "db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495daff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1",
+        });
+        // From ECDSA 65 bytes.
+        test_impl(TestCase {
+            bytes: "8720a46b5b3963790d94bcc61ad57ca02fd153584315bfa161ed3455e336ba624d68df010ed934b8792c5b6a57ba86c3da31d039f9612b44d1bf054132254de901",
+            expected: "8720a46b5b3963790d94bcc61ad57ca02fd153584315bfa161ed3455e336ba624d68df010ed934b8792c5b6a57ba86c3da31d039f9612b44d1bf054132254de9",
+        });
+    }
+
+    #[test]
+    fn test_verify_signature_from_raw_or_der_bytes_error() {
+        // 63 byte array is not a valid verify signature.
+        let bytes = "8720a46b5b3963790d94bcc61ad57ca02fd153584315bfa161ed3455e336ba624d68df010ed934b8792c5b6a57ba86c3da31d039f9612b44d1bf054132254d".decode_hex().unwrap();
+        assert!(
+            ecdsa::secp256k1::VerifySignature::from_raw_or_der_bytes(&bytes).is_err(),
+            "Expected an error"
+        );
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/signing_mode.rs b/rust/frameworks/tw_utxo/src/signing_mode.rs
new file mode 100644
index 00000000000..b5c7579ae89
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/signing_mode.rs
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum SigningMethod {
+    /// Used for P2SH and P2PKH.
+    Legacy,
+    /// Used for P2WSH and P2WPKH.
+    Segwit,
+    /// Used for P2TR key-path and P2TR script-paty.
+    Taproot,
+}
diff --git a/rust/frameworks/tw_utxo/src/spending_data/mod.rs b/rust/frameworks/tw_utxo/src/spending_data/mod.rs
new file mode 100644
index 00000000000..2246d6cca19
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/spending_data/mod.rs
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::script::{Script, Witness};
+use crate::signature::{BitcoinEcdsaSignature, BitcoinSchnorrSignature};
+use std::fmt;
+use std::rc::Rc;
+
+pub mod standard_constructor;
+
+#[derive(Debug, Clone)]
+pub struct SpendingData {
+    pub script_sig: Script,
+    pub witness: Witness,
+}
+
+pub trait EcdsaSpendingDataConstructor: fmt::Debug {
+    fn get_spending_data(&self, sig: &BitcoinEcdsaSignature) -> SpendingData;
+}
+
+pub trait SchnorrSpendingDataConstructor: fmt::Debug {
+    fn get_spending_data(&self, sig: &BitcoinSchnorrSignature) -> SpendingData;
+}
+
+/// A UTXO `SpendingData` constructor.
+/// Each enum variant differs with a signature type it expects to construct `SpendingData`.
+/// TODO consider adding a `UtxoContext` with a `UtxoContext::SpendingDataConstructor: Clone` associated type.
+#[derive(Clone, Debug)]
+pub enum SpendingDataConstructor {
+    Ecdsa(Rc<dyn EcdsaSpendingDataConstructor>),
+    Schnorr(Rc<dyn SchnorrSpendingDataConstructor>),
+}
+
+impl SpendingDataConstructor {
+    pub fn ecdsa<T: EcdsaSpendingDataConstructor + 'static>(constructor: T) -> Self {
+        SpendingDataConstructor::Ecdsa(Rc::new(constructor))
+    }
+
+    pub fn schnorr<T: SchnorrSpendingDataConstructor + 'static>(constructor: T) -> Self {
+        SpendingDataConstructor::Schnorr(Rc::new(constructor))
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/spending_data/standard_constructor.rs b/rust/frameworks/tw_utxo/src/spending_data/standard_constructor.rs
new file mode 100644
index 00000000000..1553fdc3e93
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/spending_data/standard_constructor.rs
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::script::standard_script::claims;
+use crate::script::{Script, Witness};
+use crate::signature::{BitcoinEcdsaSignature, BitcoinSchnorrSignature};
+use crate::spending_data::{
+    EcdsaSpendingDataConstructor, SchnorrSpendingDataConstructor, SpendingData,
+};
+use tw_hash::H264;
+use tw_memory::Data;
+
+#[derive(Clone, Debug)]
+pub struct P2PKH {
+    pub pubkey: H264,
+}
+
+impl EcdsaSpendingDataConstructor for P2PKH {
+    fn get_spending_data(&self, sig: &BitcoinEcdsaSignature) -> SpendingData {
+        SpendingData {
+            script_sig: claims::new_p2pkh(sig, &self.pubkey),
+            witness: Witness::default(),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct P2PK;
+
+impl EcdsaSpendingDataConstructor for P2PK {
+    fn get_spending_data(&self, sig: &BitcoinEcdsaSignature) -> SpendingData {
+        SpendingData {
+            script_sig: claims::new_p2pk(sig),
+            witness: Witness::default(),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct P2WPKH {
+    pub pubkey: H264,
+}
+
+impl EcdsaSpendingDataConstructor for P2WPKH {
+    fn get_spending_data(&self, sig: &BitcoinEcdsaSignature) -> SpendingData {
+        SpendingData {
+            script_sig: Script::default(),
+            witness: claims::new_p2wpkh(sig, self.pubkey),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct P2TRKeyPath;
+
+impl SchnorrSpendingDataConstructor for P2TRKeyPath {
+    fn get_spending_data(&self, sig: &BitcoinSchnorrSignature) -> SpendingData {
+        SpendingData {
+            script_sig: Script::default(),
+            witness: claims::new_p2tr_key_path(sig.serialize()),
+        }
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct P2TRScriptPath {
+    pub payload: Script,
+    pub control_block: Data,
+}
+
+impl SchnorrSpendingDataConstructor for P2TRScriptPath {
+    fn get_spending_data(&self, sig: &BitcoinSchnorrSignature) -> SpendingData {
+        SpendingData {
+            script_sig: Script::default(),
+            witness: claims::new_p2tr_script_path(
+                sig,
+                self.payload.clone(),
+                self.control_block.clone(),
+            ),
+        }
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/asset/brc20.rs b/rust/frameworks/tw_utxo/src/transaction/asset/brc20.rs
new file mode 100644
index 00000000000..e98371822f3
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/asset/brc20.rs
@@ -0,0 +1,80 @@
+use super::ordinal::OrdinalsInscription;
+use bitcoin::hashes::Hash;
+use std::ops::Deref;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{H256, H264};
+
+#[derive(Debug, Clone)]
+pub struct Brc20Ticker(String);
+
+impl Brc20Ticker {
+    pub fn new(string: String) -> SigningResult<Self> {
+        // Brc20Ticker must be a 4-letter identifier.
+        if string.len() != 4 {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("BRC20 ticker must be exactly 4 bytes length");
+        }
+
+        Ok(Brc20Ticker(string))
+    }
+}
+
+const BRC20_PROTOCOL_ID: &str = "brc-20";
+const BRC20_MIME: &[u8] = b"text/plain;charset=utf-8";
+
+pub struct BRC20TransferInscription(OrdinalsInscription);
+
+impl Deref for BRC20TransferInscription {
+    type Target = OrdinalsInscription;
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl BRC20TransferInscription {
+    pub fn new(
+        recipient: &H264,
+        ticker: &Brc20Ticker,
+        value: &str,
+    ) -> SigningResult<BRC20TransferInscription> {
+        let payload = format!(
+            "{{\"p\":\"{protocol}\",\"op\":\"transfer\",\"tick\":\"{ticker}\",\"amt\":\"{amt}\"}}",
+            protocol = BRC20_PROTOCOL_ID,
+            ticker = ticker.0,
+            amt = value
+        );
+
+        let inscription = OrdinalsInscription::new(BRC20_MIME, payload.as_bytes(), recipient)?;
+        Ok(BRC20TransferInscription(inscription))
+    }
+
+    pub fn merkle_root(&self) -> SigningResult<H256> {
+        self.spend_info
+            .merkle_root()
+            .map(|root| H256::from(root.to_byte_array()))
+            .or_tw_err(SigningErrorType::Error_internal)
+            .context("No merkle root of the BRC20 Transfer spend info")
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn brc20_ticker_validity() {
+        // Must be four characters.
+        let ticker = Brc20Ticker::new("invalid".to_string());
+        assert!(ticker.is_err());
+
+        let ticker = Brc20Ticker::new("asdf".to_string());
+        assert!(ticker.is_ok());
+
+        // Cover clone implemenation.
+        let ticker = ticker.unwrap();
+
+        let _cloned = ticker.clone();
+        let _ticker = ticker;
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/asset/mod.rs b/rust/frameworks/tw_utxo/src/transaction/asset/mod.rs
new file mode 100644
index 00000000000..cad6aa85a58
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/asset/mod.rs
@@ -0,0 +1,2 @@
+pub mod brc20;
+pub mod ordinal;
diff --git a/rust/frameworks/tw_utxo/src/transaction/asset/ordinal.rs b/rust/frameworks/tw_utxo/src/transaction/asset/ordinal.rs
new file mode 100644
index 00000000000..c716f5084ab
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/asset/ordinal.rs
@@ -0,0 +1,131 @@
+use crate::script::Script;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H264;
+
+pub struct OrdinalsInscription {
+    pub script: bitcoin::ScriptBuf,
+    pub spend_info: bitcoin::taproot::TaprootSpendInfo,
+}
+
+impl OrdinalsInscription {
+    /// Creates a new Ordinals Inscription ("commit stage").
+    pub fn new(mime: &[u8], data: &[u8], recipient: &H264) -> SigningResult<OrdinalsInscription> {
+        // Create the envelope, containing the inscription content.
+        let (script, spend_info) = create_envelope(mime, data, recipient)?;
+
+        Ok(OrdinalsInscription { script, spend_info })
+    }
+
+    pub fn taproot_program(&self) -> Script {
+        Script::from(self.script.as_script().as_bytes().to_vec())
+    }
+}
+
+/// Creates an [Ordinals Inscription](https://docs.ordinals.com/inscriptions.html).
+/// This function is used for two purposes:
+///
+/// 1. It creates the spending condition for the given `internal_key`. This
+///    associates the public key of the recipient with the Merkle root of the
+///    Inscription on-chain, but it does not actually reveal the script to
+///    anyone ("commit stage").
+/// 2. The same function can then be used by the spender/claimer to actually
+///    transfer the Inscripion by sending a transaction with the Inscription
+///    script in the Witness ("reveal stage").
+///
+/// Do note that the `internal_key` can be different for each stage, but it
+/// could also be the same entity. Stage one, the `internal_key` is the
+/// recipient. Stage two, the `internal_key` is the claimer of the transaction
+/// (where the Inscription script is available in the Witness).
+fn create_envelope(
+    mime: &[u8],
+    data: &[u8],
+    pubkey: &H264,
+) -> SigningResult<(bitcoin::ScriptBuf, bitcoin::taproot::TaprootSpendInfo)> {
+    use bitcoin::opcodes::all::*;
+    use bitcoin::opcodes::*;
+
+    // Create MIME buffer.
+    let mut mime_buf = bitcoin::script::PushBytesBuf::new();
+    mime_buf
+        .extend_from_slice(mime)
+        .tw_err(|_| SigningErrorType::Error_invalid_params)
+        .context("Given Ordinals mime is too long")?;
+
+    // Create an Ordinals Inscription.
+    let mut builder = bitcoin::ScriptBuf::builder()
+        .push_opcode(OP_FALSE)
+        .push_opcode(OP_IF)
+        .push_slice(b"ord")
+        // Separator.
+        .push_opcode(OP_PUSHBYTES_1)
+        // MIME types require this addtional push. It seems that the original
+        // creator inadvertently used `push_slice(&[1])`, which leads to
+        // `<1><1>`, which denotes a length prefix followed by the value. On the
+        // other hand, for the data, `push_slice(&[])` is used, producing `<0>`.
+        // This denotes a length prefix followed by no data, as opposed to
+        // '<1><0>', which would be a reasonable assumption. While this appears
+        // inconsistent, it's the current requirement.
+        .push_opcode(OP_PUSHBYTES_1)
+        // MIME type identifying the data
+        .push_slice(mime_buf.as_push_bytes())
+        // Separator.
+        .push_opcode(OP_PUSHBYTES_0);
+
+    // Push the actual data in chunks.
+    for chunk in data.chunks(520) {
+        // Create data buffer.
+        let mut data_buf = bitcoin::script::PushBytesBuf::new();
+        data_buf
+            .extend_from_slice(chunk)
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Ordinals payload is too long")?;
+
+        // Push buffer
+        builder = builder.push_slice(data_buf);
+    }
+
+    // Finalize scripts.
+    let script = builder.push_opcode(OP_ENDIF).into_script();
+
+    // The internal key.
+    let xonly = bitcoin::secp256k1::XOnlyPublicKey::from(
+        bitcoin::PublicKey::from_slice(pubkey.as_slice())
+            .tw_err(|_| SigningErrorType::Error_invalid_params)
+            .context("Invalid public key")?
+            .inner,
+    );
+
+    // Generate the necessary spending information. As mentioned in the
+    // documentation of this function at the top, this serves two purposes;
+    // setting the spending condition and actually claiming the spending
+    // condition.
+    let spend_info = bitcoin::taproot::TaprootBuilder::new()
+        .add_leaf(0, script.clone())
+        .expect("Ordinals Inscription spending info must always build")
+        .finalize(&secp256k1::Secp256k1::new(), xonly)
+        .expect("Ordinals Inscription spending info must always build");
+
+    Ok((script, spend_info))
+}
+
+pub struct OrdinalNftInscription(OrdinalsInscription);
+
+impl OrdinalNftInscription {
+    // Constructs an [Ordinal inscription] with a given MIME type. Common MIME
+    // types are:
+    // * "application/json",
+    // * "application/pdf",
+    // * "image/gif",
+    // * "image/jpeg",
+    // * "image/png",
+    // * "text/plain;charset=utf-8"
+    // * ...
+    //
+    // [Ordinal inscription]: https://docs.ordinals.com/inscriptions.html
+    pub fn new(mime_type: &[u8], data: &[u8], recipient: &H264) -> SigningResult<Self> {
+        OrdinalsInscription::new(mime_type, data, recipient).map(OrdinalNftInscription)
+    }
+    pub fn inscription(&self) -> &OrdinalsInscription {
+        &self.0
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/mod.rs b/rust/frameworks/tw_utxo/src/transaction/mod.rs
new file mode 100644
index 00000000000..fa45ea8c312
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/mod.rs
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::script::Script;
+use crate::sighash::SighashType;
+use crate::signing_mode::SigningMethod;
+use crate::spending_data::SpendingDataConstructor;
+use crate::transaction::transaction_parts::Amount;
+use tw_coin_entry::error::prelude::SigningResult;
+use tw_hash::hasher::Hasher;
+use tw_hash::H256;
+use tw_memory::Data;
+
+pub mod asset;
+// TODO move the module to `tw_bitcoin`.
+pub mod standard_transaction;
+pub mod transaction_hashing;
+pub mod transaction_interface;
+pub mod transaction_parts;
+pub mod transaction_sighash;
+pub mod unsigned_transaction;
+
+pub trait TransactionPreimage {
+    /// Preimages a transaction for a specific UTXO signing.
+    fn preimage_tx(&self, args: &UtxoPreimageArgs) -> SigningResult<H256>;
+    fn preimage_taproot_tx(&self, args: &UtxoTaprootPreimageArgs) -> SigningResult<H256>;
+}
+
+/// UTXO (unspent transaction output) preimage arguments.
+/// It provides an index of the UTXO to be signed and other required options.
+pub struct UtxoPreimageArgs {
+    pub input_index: usize,
+    /// Script for claiming [`UtxoPreimageArgs::input_index`] UTXO.
+    pub script_pubkey: Script,
+    pub amount: Amount,
+    pub sighash_ty: SighashType,
+    pub leaf_hash_code_separator: Option<(H256, u32)>,
+    pub tx_hasher: Hasher,
+    /// Signing method needs to be used to sign the [`UtxoPreimageArgs::input_index`] index.
+    pub signing_method: SigningMethod,
+}
+
+pub struct UtxoTaprootPreimageArgs {
+    pub args: UtxoPreimageArgs,
+    pub spent_amounts: Vec<Amount>,
+    pub spent_script_pubkeys: Vec<Script>,
+}
+
+/// UTXO signing arguments contain all info required to sign a UTXO (Unspent Transaction Output).
+#[derive(Clone)]
+pub struct UtxoToSign {
+    /// Original `scriptPubkey` specified in the unspent transaction output.
+    /// May be the same or different from [`UtxoToSign::script_pubkey`].
+    pub prevout_script_pubkey: Script,
+    /// `scriptPubkey` with which the UTXO needs to be signed.
+    /// For example, if [`UtxoToSign::original_script_pubkey`] is P2WPKH, then [`UtxoToSign::script_pubkey`] will be P2PKH.
+    pub script_pubkey: Script,
+    pub signing_method: SigningMethod,
+    pub spending_data_constructor: SpendingDataConstructor,
+    pub spender_public_key: Data,
+    pub amount: Amount,
+    /// Taproot UTXO specific argument.
+    /// TODO add `TaprootUtxoSignArgs`.
+    pub leaf_hash_code_separator: Option<(H256, u32)>,
+    pub tx_hasher: Hasher,
+    pub sighash_ty: SighashType,
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/mod.rs b/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/mod.rs
new file mode 100644
index 00000000000..2c5e367b113
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/mod.rs
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::{Transaction, TransactionInput, TransactionOutput};
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H256;
+
+mod output;
+mod utxo;
+
+use crate::transaction::unsigned_transaction::UnsignedTransaction;
+use crate::transaction::UtxoToSign;
+pub use output::OutputBuilder;
+pub use utxo::UtxoBuilder;
+
+pub fn txid_from_str(txid: &str) -> SigningResult<H256> {
+    H256::from_str(txid)
+        .tw_err(|_| SigningErrorType::Error_invalid_params)
+        .context("Invalid txid")
+}
+
+pub fn txid_from_str_and_rev(txid: &str) -> SigningResult<H256> {
+    txid_from_str(txid).map(H256::rev)
+}
+
+/// Transaction builder for standard Bitcoin transaction only.
+/// It parses `BitcoinV2::Proto::SigningInput` as the standard [`super::Transaction`].
+pub struct TransactionBuilder {
+    version: u32,
+    inputs: Vec<TransactionInput>,
+    outputs: Vec<TransactionOutput>,
+    locktime: u32,
+    utxo_args: Vec<UtxoToSign>,
+}
+
+impl TransactionBuilder {
+    pub fn new() -> Self {
+        TransactionBuilder {
+            version: 2,
+            inputs: Vec::new(),
+            outputs: Vec::new(),
+            locktime: 0,
+            utxo_args: Vec::default(),
+        }
+    }
+
+    pub fn version(&mut self, version: u32) -> &mut Self {
+        self.version = version;
+        self
+    }
+
+    pub fn lock_time(&mut self, locktime: u32) -> &mut Self {
+        self.locktime = locktime;
+        self
+    }
+
+    pub fn push_input(&mut self, input: TransactionInput, arg: UtxoToSign) -> &mut Self {
+        self.inputs.push(input);
+        self.utxo_args.push(arg);
+        self
+    }
+
+    pub fn push_output(&mut self, out: TransactionOutput) -> &mut Self {
+        self.outputs.push(out);
+        self
+    }
+
+    pub fn build(self) -> SigningResult<UnsignedTransaction<Transaction>> {
+        let transaction = Transaction {
+            version: self.version as i32,
+            inputs: self.inputs,
+            outputs: self.outputs,
+            locktime: self.locktime,
+        };
+        UnsignedTransaction::new(transaction, self.utxo_args)
+    }
+}
+
+impl Default for TransactionBuilder {
+    fn default() -> Self {
+        TransactionBuilder::new()
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/output.rs b/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/output.rs
new file mode 100644
index 00000000000..fe54cb41e9e
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/output.rs
@@ -0,0 +1,150 @@
+use super::TransactionOutput;
+use crate::{
+    script::{standard_script::conditions, Script},
+    transaction::{
+        asset::brc20::{BRC20TransferInscription, Brc20Ticker},
+        transaction_parts::Amount,
+    },
+};
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{ripemd::bitcoin_hash_160, sha2::sha256, H160, H256};
+use tw_keypair::{ecdsa, schnorr};
+
+pub const OP_RETURN_DATA_LIMIT: usize = 80;
+
+pub struct OutputBuilder {
+    amount: Amount,
+}
+
+impl OutputBuilder {
+    pub fn new(amount: Amount) -> Self {
+        OutputBuilder { amount }
+    }
+
+    pub fn custom_script_pubkey(&self, script_pubkey: Script) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey,
+        }
+    }
+
+    pub fn p2sh(self, redeem_script: &[u8]) -> TransactionOutput {
+        let h = bitcoin_hash_160(redeem_script);
+        let redeem_hash: H160 = h
+            .as_slice()
+            .try_into()
+            .expect("hash length must be 20 bytes");
+
+        self.p2sh_from_hash(&redeem_hash)
+    }
+
+    pub fn p2sh_from_hash(self, redeem_hash: &H160) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_p2sh(redeem_hash),
+        }
+    }
+
+    pub fn p2pk(self, pubkey: &ecdsa::secp256k1::PublicKey) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_p2pk(&pubkey.compressed()),
+        }
+    }
+
+    pub fn p2pkh(self, pubkey: &ecdsa::secp256k1::PublicKey) -> TransactionOutput {
+        let h = bitcoin_hash_160(pubkey.compressed().as_slice());
+        let pubkey_hash: H160 = h
+            .as_slice()
+            .try_into()
+            .expect("hash length must be 20 bytes");
+
+        self.p2pkh_from_hash(&pubkey_hash)
+    }
+
+    pub fn p2pkh_from_hash(self, pubkey_hash: &H160) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_p2pkh(pubkey_hash),
+        }
+    }
+
+    pub fn p2wsh(self, redeem_script: &Script) -> TransactionOutput {
+        let h = sha256(redeem_script.as_slice());
+        let redeem_hash: H256 = h.as_slice().try_into().expect("hash length is 32 bytes");
+
+        self.p2wsh_from_hash(&redeem_hash)
+    }
+
+    pub fn p2wsh_from_hash(self, redeem_hash: &H256) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_p2wsh(redeem_hash),
+        }
+    }
+
+    pub fn p2wpkh(self, pubkey: &ecdsa::secp256k1::PublicKey) -> TransactionOutput {
+        let h = bitcoin_hash_160(pubkey.compressed().as_slice());
+        let pubkey_hash: H160 = h.as_slice().try_into().expect("hash length is 20 bytes");
+
+        self.p2wpkh_from_hash(&pubkey_hash)
+    }
+
+    pub fn p2wpkh_from_hash(self, pubkey_hash: &H160) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_p2wpkh(pubkey_hash),
+        }
+    }
+
+    pub fn p2tr_key_path(self, pubkey: &schnorr::PublicKey) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_p2tr_key_path(&pubkey.compressed()),
+        }
+    }
+
+    pub fn p2tr_dangerous_assume_tweaked(self, xonly: &H256) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_p2tr_dangerous_assume_tweaked(xonly),
+        }
+    }
+
+    pub fn p2tr_script_path(
+        self,
+        pubkey: &schnorr::PublicKey,
+        merkle_root: H256,
+    ) -> TransactionOutput {
+        TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_p2tr_script_path(&pubkey.compressed(), &merkle_root),
+        }
+    }
+
+    pub fn brc20_transfer(
+        self,
+        pubkey: &schnorr::PublicKey,
+        ticker: String,
+        value: String,
+    ) -> SigningResult<TransactionOutput> {
+        let pubkey_data = pubkey.compressed();
+        let ticker = Brc20Ticker::new(ticker)?;
+        let transfer = BRC20TransferInscription::new(&pubkey_data, &ticker, &value)?;
+        let merkle_root = transfer.merkle_root()?;
+        Ok(self.p2tr_script_path(pubkey, merkle_root))
+    }
+
+    pub fn op_return(self, data: &[u8]) -> SigningResult<TransactionOutput> {
+        if data.len() > OP_RETURN_DATA_LIMIT {
+            return SigningError::err(SigningErrorType::Error_invalid_memo).context(format!(
+                "OP_RETURN data can be up to {OP_RETURN_DATA_LIMIT} bytes"
+            ));
+        }
+
+        Ok(TransactionOutput {
+            value: self.amount,
+            script_pubkey: conditions::new_op_return(data),
+        })
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/utxo.rs b/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/utxo.rs
new file mode 100644
index 00000000000..a8590915a0b
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/standard_transaction/builder/utxo.rs
@@ -0,0 +1,374 @@
+use super::TransactionInput;
+use crate::sighash::SighashType;
+use crate::spending_data::{standard_constructor, SpendingDataConstructor};
+use crate::transaction::UtxoToSign;
+use crate::{
+    script::{standard_script::conditions, Script, Witness},
+    signing_mode::SigningMethod,
+    transaction::asset::brc20::{BRC20TransferInscription, Brc20Ticker},
+    transaction::transaction_parts::{Amount, OutPoint},
+};
+use bitcoin::hashes::Hash;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{hasher::Hasher, ripemd::bitcoin_hash_160, H160, H256};
+use tw_keypair::{ecdsa, schnorr};
+use tw_memory::Data;
+use tw_misc::traits::ToBytesVec;
+
+pub const DEFAULT_TX_HASHER: Hasher = Hasher::Sha256d;
+
+pub struct UtxoBuilder {
+    input: TransactionInput,
+    prev_txid: Option<H256>,
+    prev_index: Option<u32>,
+    amount: Option<Amount>,
+    sighash_ty: Option<SighashType>,
+}
+
+impl UtxoBuilder {
+    pub fn new() -> Self {
+        UtxoBuilder {
+            input: TransactionInput {
+                previous_output: OutPoint::default(),
+                script_sig: Script::new(),
+                sequence: u32::MAX,
+                witness: Witness::new(),
+            },
+            prev_txid: None,
+            prev_index: None,
+            amount: None,
+            sighash_ty: None,
+        }
+    }
+
+    pub fn prev_txid(mut self, txid: H256) -> Self {
+        self.prev_txid = Some(txid);
+        self
+    }
+
+    pub fn prev_index(mut self, index: u32) -> Self {
+        self.prev_index = Some(index);
+        self
+    }
+
+    pub fn sequence(mut self, sequence: u32) -> Self {
+        self.input.sequence = sequence;
+        self
+    }
+
+    pub fn amount(mut self, amount: Amount) -> Self {
+        self.amount = Some(amount);
+        self
+    }
+
+    pub fn sighash_type(mut self, sighash_ty: SighashType) -> Self {
+        self.sighash_ty = Some(sighash_ty);
+        self
+    }
+
+    fn finalize_out_point(&mut self) -> SigningResult<()> {
+        // Populate the input with the previous output.
+        self.input.previous_output.hash = self
+            .prev_txid
+            .or_tw_err(SigningErrorType::Error_internal)
+            .context("'UtxoBuilder::prev_txid' is not set")?;
+        self.input.previous_output.index = self
+            .prev_index
+            .or_tw_err(SigningErrorType::Error_internal)
+            .context("'UtxoBuilder::prev_index' is not set")?;
+
+        Ok(())
+    }
+
+    fn finalize_amount(&self) -> SigningResult<Amount> {
+        self.amount
+            .or_tw_err(SigningErrorType::Error_internal)
+            .context("'UtxoBuilder::amount' is not set")
+    }
+
+    fn finalize_sighash_type(&self) -> SigningResult<SighashType> {
+        self.sighash_ty
+            .or_tw_err(SigningErrorType::Error_internal)
+            .context("'UtxoBuilder::sighash_ty' is not set")
+    }
+
+    // TODO next iteration.
+    // pub fn p2sh(self, redeem_script: Script) -> SigningResult<(TransactionInput, UtxoToSign)> {
+    //     let h = bitcoin_hash_160(redeem_script.as_slice());
+    //     let redeem_hash: H160 = h.as_slice().try_into().expect("hash length is 20 bytes");
+    //
+    //     self.p2sh_with_hash(redeem_hash)
+    // }
+    //
+    // pub fn p2sh_with_hash(
+    //     mut self,
+    //     redeem_hash: H160,
+    // ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+    //     self.finalize_out_point()?;
+    //     let amount = self.finalize_amount()?;
+    //
+    //     Ok((
+    //         self.input,
+    //         UtxoToSign {
+    //             script_pubkey: conditions::new_p2sh(&redeem_hash),
+    //             // P2SH output can be spent by a legacy address only.
+    //             signing_method: SigningMethod::Legacy,
+    //             amount,
+    //             ..Default::default()
+    //         },
+    //     ))
+    // }
+
+    pub fn p2pk(
+        mut self,
+        pubkey: &ecdsa::secp256k1::PublicKey,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        self.finalize_out_point()?;
+        let amount = self.finalize_amount()?;
+        let sighash_ty = self.finalize_sighash_type()?;
+
+        // The scriptPubkey for signing is the same as declared at the unspent output.
+        let script_pubkey = conditions::new_p2pk(&pubkey.compressed());
+
+        Ok((
+            self.input,
+            UtxoToSign {
+                prevout_script_pubkey: script_pubkey.clone(),
+                script_pubkey,
+                // P2PK output can be spent by a legacy address only.
+                signing_method: SigningMethod::Legacy,
+                // When the sighash is signed, build a P2PK script_sig.
+                spending_data_constructor: SpendingDataConstructor::ecdsa(
+                    standard_constructor::P2PK,
+                ),
+                spender_public_key: pubkey.compressed().to_vec(),
+                amount,
+                leaf_hash_code_separator: None,
+                tx_hasher: DEFAULT_TX_HASHER,
+                sighash_ty,
+            },
+        ))
+    }
+
+    pub fn p2pkh(
+        mut self,
+        pubkey: &ecdsa::secp256k1::PublicKey,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let h = bitcoin_hash_160(pubkey.compressed().as_slice());
+        let pubkey_hash: H160 = h.as_slice().try_into().expect("hash length is 20 bytes");
+
+        self.finalize_out_point()?;
+        let amount = self.finalize_amount()?;
+        let sighash_ty = self.finalize_sighash_type()?;
+
+        // The scriptPubkey for signing is the same as declared at the unspent output.
+        let script_pubkey = conditions::new_p2pkh(&pubkey_hash);
+
+        Ok((
+            self.input,
+            UtxoToSign {
+                prevout_script_pubkey: script_pubkey.clone(),
+                script_pubkey,
+                // P2PK output can be spent by a legacy address only.
+                signing_method: SigningMethod::Legacy,
+                // When the sighash is signed, build a P2PKH script_sig.
+                spending_data_constructor: SpendingDataConstructor::ecdsa(
+                    standard_constructor::P2PKH {
+                        pubkey: pubkey.compressed(),
+                    },
+                ),
+                spender_public_key: pubkey.compressed().to_vec(),
+                amount,
+                leaf_hash_code_separator: None,
+                tx_hasher: DEFAULT_TX_HASHER,
+                sighash_ty,
+            },
+        ))
+    }
+
+    // TODO next iteration.
+    // pub fn p2wsh(mut self, redeem_script: Script) -> SigningResult<(TransactionInput, UtxoToSign)> {
+    //     let h = sha256(redeem_script.as_slice());
+    //     let redeem_hash: H256 = h.as_slice().try_into().expect("hash length is 32 bytes");
+    //
+    //     self.finalize_out_point()?;
+    //     let amount = self.finalize_amount()?;
+    //     let sighash_ty = self.finalize_sighash_type()?;
+    //
+    //     Ok((
+    //         self.input,
+    //         UtxoToSign {
+    //             script_pubkey: conditions::new_p2wsh(&redeem_hash),
+    //             // P2WSH output can be spent by a legacy address only.
+    //             signing_method: SigningMethod::Segwit,
+    //             spending_data_constructor: SpendingDataConstructor::ecdsa(todo!()),
+    //             amount,
+    //             leaf_hash_code_separator: None,
+    //             tx_hasher: DEFAULT_TX_HASHER,
+    //             sighash_ty,
+    //         },
+    //     ))
+    // }
+
+    pub fn p2wpkh(
+        mut self,
+        pubkey: &ecdsa::secp256k1::PublicKey,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let h = bitcoin_hash_160(pubkey.compressed().as_slice());
+        let pubkey_hash: H160 = h.as_slice().try_into().expect("hash length is 20 bytes");
+
+        self.finalize_out_point()?;
+        let amount = self.finalize_amount()?;
+        let sighash_ty = self.finalize_sighash_type()?;
+
+        Ok((
+            self.input,
+            UtxoToSign {
+                // Original P2WPKH scriptPubkey.
+                prevout_script_pubkey: conditions::new_p2wpkh(&pubkey_hash),
+                // To spend a P2WPKH UTXO, we need to sign the transaction with a corresponding P2PKH UTXO.
+                // Then the result script_sig will be published as a witness.
+                // Generating special scriptPubkey for P2WPKH.
+                script_pubkey: conditions::new_p2pkh(&pubkey_hash),
+                // When the sighash is signed, build a P2WPKH witness.
+                spending_data_constructor: SpendingDataConstructor::ecdsa(
+                    standard_constructor::P2WPKH {
+                        pubkey: pubkey.compressed(),
+                    },
+                ),
+                spender_public_key: pubkey.compressed().to_vec(),
+                // P2WPKH output can be spent by a Witness (eg "bc1") address only.
+                signing_method: SigningMethod::Segwit,
+                amount,
+                leaf_hash_code_separator: None,
+                tx_hasher: DEFAULT_TX_HASHER,
+                sighash_ty,
+            },
+        ))
+    }
+
+    pub fn p2tr_key_path(
+        self,
+        pubkey: &schnorr::PublicKey,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let tweaked_pubkey = pubkey.tweak(None);
+        self.p2tr_key_path_with_tweaked_pubkey(&tweaked_pubkey.x_only())
+    }
+
+    pub fn p2tr_key_path_with_tweaked_pubkey(
+        mut self,
+        tweaked_pubkey: &schnorr::XOnlyPublicKey,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        self.finalize_out_point()?;
+        let amount = self.finalize_amount()?;
+        let sighash_ty = self.finalize_sighash_type()?;
+
+        // The scriptPubkey for signing is the same as declared at the unspent output.
+        let script_pubkey = conditions::new_p2tr_dangerous_assume_tweaked(&tweaked_pubkey.bytes());
+
+        Ok((
+            self.input,
+            UtxoToSign {
+                prevout_script_pubkey: script_pubkey.clone(),
+                script_pubkey,
+                // P2TR output can be spent by a Witness (eg "bc1") address only.
+                signing_method: SigningMethod::Taproot,
+                // When the sighash is signed, build a P2TR witness.
+                spending_data_constructor: SpendingDataConstructor::schnorr(
+                    standard_constructor::P2TRKeyPath,
+                ),
+                spender_public_key: tweaked_pubkey.bytes().to_vec(),
+                amount,
+                leaf_hash_code_separator: None,
+                // Note that we don't use the default double-hasher.
+                tx_hasher: Hasher::Sha256,
+                sighash_ty,
+            },
+        ))
+    }
+
+    pub fn p2tr_script_path(
+        mut self,
+        internal_pubkey: &schnorr::PublicKey,
+        payload: Script,
+        control_block: Data,
+        merkle_root: &H256,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        // Construct the leaf hash.
+        let script_buf = bitcoin::ScriptBuf::from_bytes(payload.to_vec());
+        let leaf_hash = bitcoin::taproot::TapLeafHash::from_script(
+            &script_buf,
+            bitcoin::taproot::LeafVersion::TapScript,
+        );
+
+        // Convert to native.
+        let leaf_hash: H256 = H256::from(leaf_hash.to_byte_array());
+
+        self.finalize_out_point()?;
+        let amount = self.finalize_amount()?;
+        let sighash_ty = self.finalize_sighash_type()?;
+
+        // Restore the original scriptPubkey declared at the unspent P2TR output.
+        let prevout_script_pubkey =
+            conditions::new_p2tr_script_path(&internal_pubkey.compressed(), merkle_root);
+
+        Ok((
+            self.input,
+            UtxoToSign {
+                prevout_script_pubkey,
+                // We use the full (revealed) script as scriptPubkey here.
+                script_pubkey: payload.clone(),
+                signing_method: SigningMethod::Taproot,
+                spending_data_constructor: SpendingDataConstructor::schnorr(
+                    standard_constructor::P2TRScriptPath {
+                        payload,
+                        control_block,
+                    },
+                ),
+                // Taproot ScriptPath input should be signed with a non-tweaked private key.
+                spender_public_key: internal_pubkey.compressed().to_vec(),
+                amount,
+                leaf_hash_code_separator: Some((leaf_hash, u32::MAX)),
+                // Note that we don't use the default double-hasher.
+                tx_hasher: Hasher::Sha256,
+                sighash_ty,
+            },
+        ))
+    }
+
+    pub fn brc20_transfer(
+        self,
+        pubkey: &schnorr::PublicKey,
+        ticker: String,
+        value: String,
+    ) -> SigningResult<(TransactionInput, UtxoToSign)> {
+        let ticker = Brc20Ticker::new(ticker).unwrap();
+        let transfer =
+            BRC20TransferInscription::new(&pubkey.compressed(), &ticker, &value).unwrap();
+
+        let control_block = transfer
+            .spend_info
+            .control_block(&(
+                transfer.script.to_owned(),
+                bitcoin::taproot::LeafVersion::TapScript,
+            ))
+            .or_tw_err(SigningErrorType::Error_internal)
+            .context("'TaprootSpendInfo::control_block' is None")?;
+
+        let merkle_root = transfer.merkle_root()?;
+        let transfer_payload = Script::from(transfer.script.to_bytes());
+
+        self.p2tr_script_path(
+            pubkey,
+            transfer_payload,
+            control_block.serialize(),
+            &merkle_root,
+        )
+    }
+}
+
+impl Default for UtxoBuilder {
+    fn default() -> Self {
+        UtxoBuilder::new()
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/standard_transaction/mod.rs b/rust/frameworks/tw_utxo/src/transaction/standard_transaction/mod.rs
new file mode 100644
index 00000000000..d9afd0fbb9d
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/standard_transaction/mod.rs
@@ -0,0 +1,360 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::compact_integer::CompactInteger;
+use crate::encode::stream::Stream;
+use crate::encode::Encodable;
+use crate::script::{Script, Witness};
+use crate::signing_mode::SigningMethod;
+use crate::transaction::transaction_interface::{
+    TransactionInterface, TxInputInterface, TxOutputInterface,
+};
+use crate::transaction::transaction_parts::{Amount, OutPoint};
+use crate::transaction::transaction_sighash::fork_id_sighash::ForkIdSighash;
+use crate::transaction::transaction_sighash::legacy_sighash::LegacySighash;
+use crate::transaction::transaction_sighash::witness0_sighash::Witness0Sighash;
+use crate::transaction::{TransactionPreimage, UtxoPreimageArgs};
+use tw_coin_entry::error::prelude::{ResultContext, SigningError, SigningErrorType, SigningResult};
+use tw_hash::hasher::sha256_d;
+use tw_hash::H256;
+
+use super::transaction_sighash::taproot1_sighash::Taproot1Sighash;
+use super::UtxoTaprootPreimageArgs;
+
+pub mod builder;
+
+/// Must be zero.
+const WITNESS_MARKER: u8 = 0;
+/// Must be nonzero.
+const WITNESS_FLAG: u8 = 1;
+
+// Sizes of various transaction fields.
+const WITNESS_FLAG_MARKER: usize = 2;
+
+// The Segwit scale factor (witnesses are deducted).
+const SEGWIT_SCALE_FACTOR: usize = 4;
+
+/// A standard Bitcoin transaction.
+///
+/// # Important
+///
+/// Do not add chain specific fields to the standard Bitcoin [`Transaction`].
+/// Otherwise, consider adding a new type of transaction that implements the [`UnsignedTransaction`] trait.
+#[derive(Clone, Debug)]
+pub struct Transaction {
+    /// Transaction data format version (note, this is signed).
+    pub version: i32,
+    /// Unsigned transaction inputs.
+    pub inputs: Vec<TransactionInput>,
+    /// Transaction outputs.
+    pub outputs: Vec<TransactionOutput>,
+    /// The block number or timestamp at which this transaction is unlocked.
+    ///
+    /// | Value          | Description
+    /// |----------------|------------
+    /// |  0             | Not locked
+    /// | < 500000000    | Block number at which this transaction is unlocked
+    /// | >= 500000000   | UNIX timestamp at which this transaction is unlocked
+    ///
+    /// If all inputs have final (`0xffffffff`) sequence numbers then `lockTime` is irrelevant.
+    /// Otherwise, the transaction may not be added to a block until after `lockTime`.
+    pub locktime: u32,
+}
+
+impl TransactionInterface for Transaction {
+    type Input = TransactionInput;
+    type Output = TransactionOutput;
+
+    fn version(&self) -> i32 {
+        self.version
+    }
+
+    fn inputs(&self) -> &[Self::Input] {
+        &self.inputs
+    }
+
+    fn inputs_mut(&mut self) -> &mut [Self::Input] {
+        &mut self.inputs
+    }
+
+    fn replace_inputs(&mut self, inputs: Vec<Self::Input>) {
+        self.inputs = inputs;
+    }
+
+    fn outputs(&self) -> &[Self::Output] {
+        &self.outputs
+    }
+
+    fn outputs_mut(&mut self) -> &mut [Self::Output] {
+        &mut self.outputs
+    }
+
+    fn replace_outputs(&mut self, outputs: Vec<Self::Output>) {
+        self.outputs = outputs;
+    }
+
+    fn push_output(&mut self, output: Self::Output) {
+        self.outputs.push(output);
+    }
+
+    fn has_witness(&self) -> bool {
+        self.inputs.iter().any(|input| input.has_witness())
+    }
+
+    fn locktime(&self) -> u32 {
+        self.locktime
+    }
+
+    fn vsize(&self) -> usize {
+        (self.weight() + 3) / SEGWIT_SCALE_FACTOR // ceil(weight / 4)
+    }
+
+    fn weight(&self) -> usize {
+        self.base_size() * 3 + self.total_size()
+    }
+}
+
+impl Transaction {
+    /// TODO move to the `TransactionInterface` trait.
+    pub fn txid(&self) -> Vec<u8> {
+        let encoded = self.without_witness().encode_out();
+        let mut tx_hash = sha256_d(&encoded);
+        tx_hash.reverse();
+        tx_hash
+    }
+
+    /// Returns the same transaction with [`TransactionInput::script_witness`] being empty.
+    /// It's mostly used to calculate transaction hash (aka TXID).
+    pub fn without_witness(&self) -> Transaction {
+        let mut without_witness = self.clone();
+        for input in without_witness.inputs.iter_mut() {
+            input.set_witness(Witness::default());
+        }
+        without_witness
+    }
+
+    pub fn encode_out(&self) -> Vec<u8> {
+        let mut stream = Stream::new();
+        self.encode(&mut stream);
+        stream.out()
+    }
+
+    pub fn size(&self) -> usize {
+        self.total_size()
+    }
+
+    /// Base transaction size.
+    ///
+    /// Base transaction size is the size of the transaction serialized with the witness data stripped.
+    fn base_size(&self) -> usize {
+        let mut s = self.version.encoded_size();
+
+        s += CompactInteger::from(self.inputs.len()).encoded_size();
+        s += self.inputs.iter().map(|i| i.base_size()).sum::<usize>();
+
+        s += CompactInteger::from(self.outputs.len()).encoded_size();
+        s += self.outputs.iter().map(|o| o.encoded_size()).sum::<usize>();
+
+        s + self.locktime.encoded_size()
+    }
+
+    /// Total transaction size.
+    ///
+    /// Total transaction size is the transaction size in bytes serialized as described in BIP144,
+    /// including base data and witness data.
+    fn total_size(&self) -> usize {
+        let has_witness = self.has_witness();
+
+        let mut s = self.version.encoded_size();
+
+        // Consider extended format in case witnesses are to be serialized.
+        if has_witness {
+            s += WITNESS_FLAG_MARKER;
+        }
+
+        let get_input_size = |i: &TransactionInput| {
+            if has_witness {
+                return i.size_with_witness();
+            }
+            i.base_size()
+        };
+
+        s += CompactInteger::from(self.inputs.len()).encoded_size();
+        s += self.inputs.iter().map(get_input_size).sum::<usize>();
+
+        s += CompactInteger::from(self.outputs.len()).encoded_size();
+        s += self.outputs.iter().map(|o| o.encoded_size()).sum::<usize>();
+
+        s + self.locktime.encoded_size()
+    }
+}
+
+impl Encodable for Transaction {
+    fn encode(&self, stream: &mut Stream) {
+        stream.append(&self.version);
+
+        let encode_witness = self.has_witness();
+        if encode_witness {
+            // Use extended format in case witnesses are to be serialized.
+            stream.append(&WITNESS_MARKER).append(&WITNESS_FLAG);
+        }
+
+        stream.append_list(&self.inputs).append_list(&self.outputs);
+
+        // Encode witness if they present.
+        if encode_witness {
+            for input in &self.inputs {
+                stream.append(&input.witness);
+            }
+        }
+
+        stream.append(&self.locktime);
+    }
+
+    fn encoded_size(&self) -> usize {
+        self.total_size()
+    }
+}
+
+impl TransactionPreimage for Transaction {
+    fn preimage_tx(&self, args: &UtxoPreimageArgs) -> SigningResult<H256> {
+        match args.signing_method {
+            SigningMethod::Legacy if args.sighash_ty.fork_id() => {
+                ForkIdSighash::<Self>::sighash_tx(self, args)
+            },
+            SigningMethod::Legacy => LegacySighash::<Self>::sighash_tx(self, args),
+            SigningMethod::Segwit => Witness0Sighash::<Self>::sighash_tx(self, args),
+            SigningMethod::Taproot => SigningError::err(SigningErrorType::Error_internal).context(
+                "'TransactionPreimage::preimage_tx' is called with Taproot signing method",
+            ),
+        }
+    }
+
+    fn preimage_taproot_tx(&self, tr: &UtxoTaprootPreimageArgs) -> SigningResult<H256> {
+        match tr.args.signing_method {
+            SigningMethod::Legacy | SigningMethod::Segwit => {
+                SigningError::err(SigningErrorType::Error_internal).context(format!(
+                    "'TransactionPreimage::preimage_taproot_tx' is called with {:?} signing method",
+                    tr.args.signing_method
+                ))
+            },
+            SigningMethod::Taproot => Taproot1Sighash::<Self>::sighash_tx(self, tr),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq)]
+// TODO: We should consider having two of those types, one for the preimage
+// generation (ie. no script_sig and no witness), and one for the actual
+// transaction (ie. with script_sig and witness).
+pub struct TransactionInput {
+    /// Reference to the previous transaction's output.
+    pub previous_output: OutPoint,
+    /// Transaction version as defined by the sender.
+    ///
+    /// Intended for "replacement" of transactions when information is updated
+    /// before inclusion into a block.
+    pub sequence: u32,
+    /// Computational Script for confirming transaction authorization.
+    pub script_sig: Script,
+    /// Witness stack.
+    pub witness: Witness,
+}
+
+impl TransactionInput {
+    pub fn base_size(&self) -> usize {
+        self.previous_output.encoded_size()
+            + self.script_sig.encoded_size()
+            + self.sequence.encoded_size()
+    }
+
+    pub fn size_with_witness(&self) -> usize {
+        self.base_size() + self.witness.encoded_size()
+    }
+}
+
+impl TxInputInterface for TransactionInput {
+    fn previous_output(&self) -> &OutPoint {
+        &self.previous_output
+    }
+
+    fn sequence(&self) -> u32 {
+        self.sequence
+    }
+
+    fn set_sequence(&mut self, sequence: u32) {
+        self.sequence = sequence;
+    }
+
+    fn set_script_sig(&mut self, script_sig: Script) {
+        self.script_sig = script_sig;
+    }
+
+    fn set_witness(&mut self, witness: Witness) {
+        self.witness = witness;
+    }
+
+    fn has_script_sig(&self) -> bool {
+        !self.script_sig.is_empty()
+    }
+
+    fn has_witness(&self) -> bool {
+        !self.witness.is_empty()
+    }
+}
+
+impl Encodable for TransactionInput {
+    fn encode(&self, stream: &mut Stream) {
+        stream
+            .append(&self.previous_output)
+            .append(&self.script_sig)
+            .append(&self.sequence);
+    }
+
+    fn encoded_size(&self) -> usize {
+        self.base_size()
+    }
+}
+
+#[derive(Clone, Debug)]
+pub struct TransactionOutput {
+    /// Transaction amount.
+    pub value: Amount,
+    /// Usually contains the public key as a Bitcoin script setting up
+    /// conditions to claim this output.
+    pub script_pubkey: Script,
+}
+
+impl Default for TransactionOutput {
+    fn default() -> Self {
+        TransactionOutput {
+            value: -1,
+            script_pubkey: Script::default(),
+        }
+    }
+}
+
+impl TxOutputInterface for TransactionOutput {
+    fn value(&self) -> Amount {
+        self.value
+    }
+
+    fn set_value(&mut self, value: Amount) {
+        self.value = value;
+    }
+
+    fn script_pubkey(&self) -> &Script {
+        &self.script_pubkey
+    }
+}
+
+impl Encodable for TransactionOutput {
+    fn encode(&self, stream: &mut Stream) {
+        stream.append(&self.value).append(&self.script_pubkey);
+    }
+
+    fn encoded_size(&self) -> usize {
+        self.value.encoded_size() + self.script_pubkey.encoded_size()
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/transaction_hashing.rs b/rust/frameworks/tw_utxo/src/transaction/transaction_hashing.rs
new file mode 100644
index 00000000000..b3ec48e6eff
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/transaction_hashing.rs
@@ -0,0 +1,100 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::stream::Stream;
+
+use crate::sighash::SighashBase;
+use crate::transaction::transaction_interface::{TransactionInterface, TxInputInterface};
+use crate::transaction::UtxoPreimageArgs;
+use std::marker::PhantomData;
+use tw_hash::hasher::Hasher;
+use tw_memory::Data;
+
+use super::UtxoTaprootPreimageArgs;
+
+/// A helper structure that hashes some parts of the transaction.
+pub struct TransactionHasher<Transaction> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction: TransactionInterface> TransactionHasher<Transaction> {
+    /// Computes a hash of all [`SignedUtxo::previour_output`].
+    pub fn prevout_hash(tx: &Transaction, tx_hasher: Hasher) -> Data {
+        let mut stream = Stream::default();
+        for input in tx.inputs() {
+            stream.append(input.previous_output());
+        }
+        tx_hasher.hash(&stream.out())
+    }
+
+    /// Returns a zero hash if [`UtxoPreimageArgs::sighash::anyone_can_pay`] is true,
+    /// otherwise returns a hash of all [`TransactionInput::previour_output`].
+    pub fn preimage_prevout_hash(tx: &Transaction, args: &UtxoPreimageArgs) -> Data {
+        if args.sighash_ty.anyone_can_pay() {
+            return args.tx_hasher.zero_hash();
+        }
+        Self::prevout_hash(tx, args.tx_hasher)
+    }
+
+    /// Computes a hash of all `spent_amounts`. Required for TapSighash.
+    pub fn spent_amount_hash(tr: &UtxoTaprootPreimageArgs) -> Data {
+        let mut stream = Stream::default();
+        for amount in &tr.spent_amounts {
+            stream.append(amount);
+        }
+        tr.args.tx_hasher.hash(&stream.out())
+    }
+
+    /// Computes a hash of all `script_pubkeys`. Required for TapSighash.
+    pub fn spent_script_pubkeys(tr: &UtxoTaprootPreimageArgs) -> Data {
+        let mut stream = Stream::default();
+        for script in &tr.spent_script_pubkeys {
+            stream.append(script);
+        }
+        tr.args.tx_hasher.hash(&stream.out())
+    }
+
+    /// Computes a hash of all [`SignedUtxo::sequence`].
+    pub fn sequence_hash(tx: &Transaction, tx_hasher: Hasher) -> Data {
+        let mut stream = Stream::default();
+        for input in tx.inputs() {
+            stream.append(&input.sequence());
+        }
+        tx_hasher.hash(&stream.out())
+    }
+
+    /// Returns a zero hash if [`UtxoPreimageArgs::sighash`] requires it (see the code below),
+    /// otherwise returns a hash of all [`TransactionInput::sequence`].
+    pub fn preimage_sequence_hash(tx: &Transaction, args: &UtxoPreimageArgs) -> Data {
+        let single_or_none = matches!(
+            args.sighash_ty.base_type(),
+            SighashBase::Single | SighashBase::None
+        );
+        if args.sighash_ty.anyone_can_pay() || single_or_none {
+            return args.tx_hasher.zero_hash();
+        }
+        Self::sequence_hash(tx, args.tx_hasher)
+    }
+
+    /// Returns a hash of required [`TransactionOutput`] according to the [`UtxoPreimageArgs::sighash`].
+    /// Please note the function can return a zero hash if necessary.
+    pub fn preimage_outputs_hash(tx: &Transaction, args: &UtxoPreimageArgs) -> Data {
+        let outputs = tx.outputs();
+        match args.sighash_ty.base_type() {
+            SighashBase::All => {
+                let mut stream = Stream::default();
+                for output in outputs {
+                    stream.append(output);
+                }
+                args.tx_hasher.hash(&stream.out())
+            },
+            SighashBase::Single if args.input_index < outputs.len() => {
+                let mut stream = Stream::default();
+                stream.append(&outputs[args.input_index]);
+                args.tx_hasher.hash(&stream.out())
+            },
+            _ => args.tx_hasher.zero_hash(),
+        }
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/transaction_interface.rs b/rust/frameworks/tw_utxo/src/transaction/transaction_interface.rs
new file mode 100644
index 00000000000..7a705dbcc5f
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/transaction_interface.rs
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::Encodable;
+
+use crate::script::{Script, Witness};
+use crate::transaction::transaction_parts::OutPoint;
+
+use super::transaction_parts::Amount;
+
+/// An interface of the Bitcoin transaction.
+pub trait TransactionInterface: Clone + Encodable {
+    type Input: TxInputInterface;
+    type Output: TxOutputInterface;
+
+    fn version(&self) -> i32;
+
+    fn inputs(&self) -> &[Self::Input];
+
+    fn inputs_mut(&mut self) -> &mut [Self::Input];
+
+    fn replace_inputs(&mut self, inputs: Vec<Self::Input>);
+
+    fn outputs(&self) -> &[Self::Output];
+
+    fn outputs_mut(&mut self) -> &mut [Self::Output];
+
+    fn replace_outputs(&mut self, outputs: Vec<Self::Output>);
+
+    fn push_output(&mut self, output: Self::Output);
+
+    fn has_witness(&self) -> bool;
+
+    fn locktime(&self) -> u32;
+
+    /// The `vsize` in `vbytes` refers to a transaction's weighted size under segwit's rules.
+    /// It is used to compare how much blockweight needs to be allocated to confirm a transaction.
+    /// For non-segwit transactions, `vsize` = `size`.
+    fn vsize(&self) -> usize;
+
+    fn weight(&self) -> usize;
+}
+
+pub trait TxInputInterface: Clone {
+    fn previous_output(&self) -> &OutPoint;
+
+    fn sequence(&self) -> u32;
+
+    fn set_sequence(&mut self, sequence: u32);
+
+    fn set_script_sig(&mut self, script_sig: Script);
+
+    fn set_witness(&mut self, witness: Witness);
+
+    fn has_script_sig(&self) -> bool;
+
+    fn has_witness(&self) -> bool;
+}
+
+pub trait TxOutputInterface: Clone + Default + Encodable {
+    fn value(&self) -> Amount;
+
+    fn set_value(&mut self, value: Amount);
+
+    fn script_pubkey(&self) -> &Script;
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/transaction_parts.rs b/rust/frameworks/tw_utxo/src/transaction/transaction_parts.rs
new file mode 100644
index 00000000000..f260088e910
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/transaction_parts.rs
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::stream::Stream;
+use crate::encode::Encodable;
+use tw_hash::H256;
+
+/// Amount in satoshis (Can be negative) in rare cases.
+/// https://github.com/bitcoin/bitcoin/blob/bd5d1688b4311e21c0e0ff89a3ae02ef7d0543b8/src/consensus/amount.h#L11-L12
+pub type Amount = i64;
+
+#[derive(Clone, Copy, Debug, Default, Eq, Hash, PartialEq)]
+pub struct OutPoint {
+    pub hash: H256,
+    pub index: u32,
+}
+
+impl Encodable for OutPoint {
+    fn encode(&self, stream: &mut Stream) {
+        stream.append(&self.hash).append(&self.index);
+    }
+
+    fn encoded_size(&self) -> usize {
+        self.hash.encoded_size() + self.index.encoded_size()
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/fork_id_sighash.rs b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/fork_id_sighash.rs
new file mode 100644
index 00000000000..53aa18db9ca
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/fork_id_sighash.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::transaction_interface::TransactionInterface;
+use crate::transaction::transaction_sighash::witness0_sighash::Witness0Sighash;
+use crate::transaction::UtxoPreimageArgs;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::SigningResult;
+use tw_hash::H256;
+
+/// `ForkSighash`is used to calculate a preimage hash of a P2PKH unspent output on Bitcoin fork chains
+/// (if `sighash_ty` has `SIGHASH_FORK_ID` flag).
+pub struct ForkIdSighash<Transaction: TransactionInterface> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction: TransactionInterface> ForkIdSighash<Transaction> {
+    pub fn sighash_tx(tx: &Transaction, args: &UtxoPreimageArgs) -> SigningResult<H256> {
+        Witness0Sighash::sighash_tx(tx, args)
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/legacy_sighash.rs b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/legacy_sighash.rs
new file mode 100644
index 00000000000..192d1d01c23
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/legacy_sighash.rs
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::stream::Stream;
+use crate::script::{Script, Witness};
+use crate::sighash::SighashBase;
+use crate::transaction::transaction_interface::{TransactionInterface, TxInputInterface};
+use crate::transaction::UtxoPreimageArgs;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H256;
+
+/// `LegacySighash` is used to calculate a preimage hash of a P2PK, P2PKH or P2SH unspent output.
+pub struct LegacySighash<Transaction: std::fmt::Debug + TransactionInterface> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction: std::fmt::Debug + TransactionInterface> LegacySighash<Transaction> {
+    pub fn sighash_tx(tx: &Transaction, args: &UtxoPreimageArgs) -> SigningResult<H256> {
+        let mut tx_preimage = tx.clone();
+
+        tx_preimage.replace_inputs(Self::inputs_for_preimage(tx, args)?);
+        tx_preimage.replace_outputs(Self::outputs_for_preimage(tx, args));
+
+        let mut stream = Stream::default();
+        stream
+            // Encode the transaction preimage as a normal tx.
+            .append(&tx_preimage)
+            // Append the sighash type.
+            .append(&args.sighash_ty.raw_sighash());
+
+        let hash = args.tx_hasher.hash(&stream.out());
+        H256::try_from(hash.as_slice())
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Bitcoin sighash must be H256")
+    }
+
+    /// Select and prepare transaction inputs according to the preimage settings.
+    pub fn inputs_for_preimage(
+        tx: &Transaction,
+        args: &UtxoPreimageArgs,
+    ) -> SigningResult<Vec<Transaction::Input>> {
+        let original_inputs = tx.inputs();
+        // Get an input needs to be signed.
+        let input_to_sign = original_inputs
+            .get(args.input_index)
+            .or_tw_err(SigningErrorType::Error_internal)
+            .context("Legacy sighash error: input_index is out of bounds")?;
+
+        if args.sighash_ty.anyone_can_pay() {
+            let mut input_preimage = input_to_sign.clone();
+            input_preimage.set_script_sig(args.script_pubkey.clone());
+            input_preimage.set_witness(Witness::default());
+            return Ok(vec![input_preimage]);
+        }
+
+        let selected_inputs = original_inputs
+            .iter()
+            .enumerate()
+            .map(|(n, input)| {
+                let is_this_input = n == args.input_index;
+
+                let mut input_preimage = input.clone();
+                input_preimage.set_script_sig(if is_this_input {
+                    args.script_pubkey.clone()
+                } else {
+                    Script::default()
+                });
+
+                let single_or_none = matches!(
+                    args.sighash_ty.base_type(),
+                    SighashBase::Single | SighashBase::None
+                );
+                // Override the value with zero if necessary.
+                if !is_this_input && single_or_none {
+                    input_preimage.set_sequence(0);
+                }
+                input_preimage.set_witness(Witness::default());
+                input_preimage
+            })
+            .collect();
+        Ok(selected_inputs)
+    }
+
+    /// Selects transaction outputs according to the preimage settings.
+    pub fn outputs_for_preimage(
+        tx: &Transaction,
+        args: &UtxoPreimageArgs,
+    ) -> Vec<Transaction::Output> {
+        match args.sighash_ty.base_type() {
+            // Hash all the transaction outputs.
+            SighashBase::All => tx.outputs().to_vec(),
+            SighashBase::Single => tx
+                .outputs()
+                .iter()
+                .take(args.input_index + 1)
+                .enumerate()
+                .map(|(n, out)| {
+                    if n == args.input_index {
+                        out.clone()
+                    } else {
+                        // `standard_transaction::TransactionOutput` defaults to `-1`.
+                        Transaction::Output::default()
+                    }
+                })
+                .collect(),
+            SighashBase::None => Vec::default(),
+        }
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/mod.rs b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/mod.rs
new file mode 100644
index 00000000000..d388bc138de
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/mod.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod fork_id_sighash;
+pub mod legacy_sighash;
+pub mod taproot1_sighash;
+pub mod witness0_sighash;
diff --git a/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/taproot1_sighash.rs b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/taproot1_sighash.rs
new file mode 100644
index 00000000000..32fe4d3985d
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/taproot1_sighash.rs
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::stream::Stream;
+use crate::sighash::SighashBase;
+use crate::transaction::transaction_hashing::TransactionHasher;
+use crate::transaction::transaction_interface::TransactionInterface;
+use crate::transaction::UtxoTaprootPreimageArgs;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::hasher::tapsighash;
+use tw_hash::H256;
+
+/// `Taproot1Sighash`is used to calculate a preimage hash of a P2WPKH or P2WSH unspent output.
+pub struct Taproot1Sighash<Transaction: TransactionInterface> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction: TransactionInterface> Taproot1Sighash<Transaction> {
+    pub fn sighash_tx(tx: &Transaction, tr: &UtxoTaprootPreimageArgs) -> SigningResult<H256> {
+        // TODO if anyone_can_pay flag is set, there is no need to append these hashes.
+        // See https://github.com/rust-bitcoin/rust-bitcoin/blob/b0870634f0e4bd4c36e7ab0b7c9c7deb23ae62bf/bitcoin/src/crypto/sighash.rs#L608-L622
+        let prevout_hash = TransactionHasher::<Transaction>::preimage_prevout_hash(tx, &tr.args);
+        let sequence_hash = TransactionHasher::<Transaction>::preimage_sequence_hash(tx, &tr.args);
+        let outputs_hash = TransactionHasher::<Transaction>::preimage_outputs_hash(tx, &tr.args);
+        let spent_amounts_hash = TransactionHasher::<Transaction>::spent_amount_hash(tr);
+        let raw_sighash = tr.args.sighash_ty.serialize_as_taproot()?;
+
+        let spent_script_pubkeys_hash = TransactionHasher::<Transaction>::spent_script_pubkeys(tr);
+
+        let mut stream = Stream::default();
+
+        stream
+            .append(&0u8) // epoch
+            .append(&raw_sighash)
+            .append(&tx.version())
+            .append(&tx.locktime())
+            .append_raw_slice(&prevout_hash)
+            .append_raw_slice(&spent_amounts_hash)
+            .append_raw_slice(&spent_script_pubkeys_hash)
+            .append_raw_slice(&sequence_hash)
+            // TODO: Double check behavior or `Single`
+            // TODO: What about `NonePlusAnyoneCanPay`?.
+            .append_raw_slice(&outputs_hash);
+
+        let mut spend_type = 0u8;
+
+        if tr.args.leaf_hash_code_separator.is_some() {
+            spend_type |= 2u8;
+        }
+
+        stream.append(&spend_type);
+
+        if tr.args.sighash_ty.anyone_can_pay() {
+            return SigningError::err(SigningErrorType::Error_not_supported)
+                .context("'anyone can pay' sighash type is not supported for Taproot yet");
+        } else {
+            stream.append(&(tr.args.input_index as u32));
+        }
+
+        if tr.args.sighash_ty.base_type() == SighashBase::Single {
+            return SigningError::err(SigningErrorType::Error_not_supported)
+                .context("'single' sighash type is not supported for Taproot yet");
+        }
+
+        if let Some((leaf_hash, separator)) = tr.args.leaf_hash_code_separator {
+            stream
+                .append_raw_slice(leaf_hash.as_slice())
+                .append(&0u8) // key-version 0
+                .append(&separator);
+        }
+
+        let hash = tapsighash(&stream.out());
+        H256::try_from(hash.as_slice())
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Taproot sighash must be H256")
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/witness0_sighash.rs b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/witness0_sighash.rs
new file mode 100644
index 00000000000..40c9e94c377
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/transaction_sighash/witness0_sighash.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::encode::stream::Stream;
+use crate::transaction::transaction_hashing::TransactionHasher;
+use crate::transaction::transaction_interface::{TransactionInterface, TxInputInterface};
+use crate::transaction::UtxoPreimageArgs;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H256;
+
+/// `Witness0Sighash`is used to calculate a preimage hash of a P2WPKH or P2WSH unspent output.
+pub struct Witness0Sighash<Transaction: TransactionInterface> {
+    _phantom: PhantomData<Transaction>,
+}
+
+impl<Transaction: TransactionInterface> Witness0Sighash<Transaction> {
+    pub fn sighash_tx(tx: &Transaction, args: &UtxoPreimageArgs) -> SigningResult<H256> {
+        let input = tx
+            .inputs()
+            .get(args.input_index)
+            .or_tw_err(SigningErrorType::Error_internal)
+            .context("Witness sighash error: input_index is out of bounds")?;
+
+        let prevout_hash = TransactionHasher::<Transaction>::preimage_prevout_hash(tx, args);
+        let sequence_hash = TransactionHasher::<Transaction>::preimage_sequence_hash(tx, args);
+        let outputs_hash = TransactionHasher::<Transaction>::preimage_outputs_hash(tx, args);
+
+        let mut stream = Stream::default();
+
+        stream
+            .append(&tx.version())
+            .append_raw_slice(&prevout_hash)
+            .append_raw_slice(&sequence_hash);
+
+        // The input being signed (replacing the scriptSig with scriptCode + amount)
+        // The prevout may already be contained in hashPrevout, and the nSequence
+        // may already be contained in hashSequence.
+        stream
+            .append(input.previous_output())
+            .append(&args.script_pubkey)
+            .append(&args.amount)
+            .append(&input.sequence())
+            .append_raw_slice(&outputs_hash)
+            .append(&tx.locktime())
+            // This also includes 24-bit fork id. For example, 0 for BitcoinCash.
+            .append(&args.sighash_ty.raw_sighash());
+
+        let hash = args.tx_hasher.hash(&stream.out());
+        H256::try_from(hash.as_slice())
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Bitcoin sighash must be H256")
+    }
+}
diff --git a/rust/frameworks/tw_utxo/src/transaction/unsigned_transaction.rs b/rust/frameworks/tw_utxo/src/transaction/unsigned_transaction.rs
new file mode 100644
index 00000000000..d001f6b81ec
--- /dev/null
+++ b/rust/frameworks/tw_utxo/src/transaction/unsigned_transaction.rs
@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::signature::{BitcoinEcdsaSignature, BitcoinSchnorrSignature};
+use crate::spending_data::SpendingDataConstructor;
+use crate::transaction::transaction_interface::{
+    TransactionInterface, TxInputInterface, TxOutputInterface,
+};
+use crate::transaction::transaction_parts::Amount;
+use crate::transaction::UtxoToSign;
+use tw_coin_entry::error::prelude::*;
+
+pub struct UnsignedTransaction<Transaction> {
+    transaction: Transaction,
+    utxo_args: Vec<UtxoToSign>,
+}
+
+impl<Transaction> UnsignedTransaction<Transaction>
+where
+    Transaction: TransactionInterface,
+{
+    pub fn new(transaction: Transaction, utxo_args: Vec<UtxoToSign>) -> SigningResult<Self> {
+        if transaction.outputs().is_empty() {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No transaction Outputs provided");
+        }
+
+        check_utxo_args_number(transaction.inputs().len(), utxo_args.len())?;
+        Ok(UnsignedTransaction {
+            transaction,
+            utxo_args,
+        })
+    }
+
+    pub fn transaction(&self) -> &Transaction {
+        &self.transaction
+    }
+
+    pub fn into_transaction(self) -> Transaction {
+        self.transaction
+    }
+
+    pub fn inputs(&self) -> &[Transaction::Input] {
+        self.transaction.inputs()
+    }
+
+    pub fn input_args(&self) -> &[UtxoToSign] {
+        &self.utxo_args
+    }
+
+    pub fn outputs(&self) -> &[Transaction::Output] {
+        self.transaction.outputs()
+    }
+
+    pub fn outputs_mut(&mut self) -> &mut [Transaction::Output] {
+        self.transaction.outputs_mut()
+    }
+
+    pub fn push_output(&mut self, output: Transaction::Output) {
+        self.transaction.push_output(output);
+    }
+
+    pub fn estimate_transaction(&self) -> Transaction {
+        let mut estimated_tx = self.transaction.clone();
+
+        debug_assert_eq!(self.transaction.inputs().len(), self.utxo_args.len());
+
+        for (utxo_args, utxo) in self.utxo_args.iter().zip(estimated_tx.inputs_mut()) {
+            let estimated_spending = match utxo_args.spending_data_constructor {
+                SpendingDataConstructor::Ecdsa(ref ecdsa_constructor) => {
+                    let estimated_sig = BitcoinEcdsaSignature::estimated();
+                    ecdsa_constructor.get_spending_data(&estimated_sig)
+                },
+                SpendingDataConstructor::Schnorr(ref schnorr_constructor) => {
+                    let estimated_sig = BitcoinSchnorrSignature::estimated();
+                    schnorr_constructor.get_spending_data(&estimated_sig)
+                },
+            };
+
+            utxo.set_script_sig(estimated_spending.script_sig);
+            utxo.set_witness(estimated_spending.witness);
+        }
+
+        estimated_tx
+    }
+
+    pub fn set_inputs(
+        &mut self,
+        utxos: Vec<Transaction::Input>,
+        utxo_args: Vec<UtxoToSign>,
+    ) -> SigningResult<()> {
+        check_utxo_args_number(utxos.len(), utxo_args.len())?;
+
+        self.utxo_args = utxo_args;
+        self.transaction.replace_inputs(utxos);
+        Ok(())
+    }
+
+    /// Retains only the transaction inputs specified by the predicate.
+    /// Returns an error if there are no more UTXOs.
+    pub fn retain_inputs<F>(&mut self, f: F) -> SigningResult<()>
+    where
+        for<'a> F: Fn(&'a Transaction::Input, &'a UtxoToSign) -> bool,
+    {
+        let (utxos, utxo_args) = self
+            .transaction
+            .inputs()
+            .iter()
+            .zip(self.utxo_args.iter())
+            .filter_map(|(utxo, utxo_args)| {
+                if f(utxo, utxo_args) {
+                    Some((utxo.clone(), utxo_args.clone()))
+                } else {
+                    None
+                }
+            })
+            .unzip();
+
+        self.set_inputs(utxos, utxo_args)
+    }
+
+    pub fn total_input(&self) -> SigningResult<Amount> {
+        self.utxo_args
+            .iter()
+            .try_fold(0i64, |total_in, utxo_args| {
+                total_in.checked_add(utxo_args.amount)
+            })
+            .or_tw_err(SigningErrorType::Error_tx_too_big)
+            .context("Sum of Transaction UTXO amounts is too big")
+    }
+
+    pub fn total_output(&self) -> SigningResult<Amount> {
+        self.transaction
+            .outputs()
+            .iter()
+            .try_fold(0i64, |total_out, output| {
+                total_out.checked_add(output.value())
+            })
+            .or_tw_err(SigningErrorType::Error_tx_too_big)
+            .context("Sum of Transaction output amounts is too big")
+    }
+
+    /// Calculates the unsigned transaction fee by the formula:
+    /// `sum(input) - sum(output)`
+    pub fn fee(&self) -> SigningResult<Amount> {
+        self.total_input()?
+            .checked_sub(self.total_output()?)
+            .or_tw_err(SigningErrorType::Error_not_enough_utxos)
+            .context("sum(input) < sum(output)")
+    }
+}
+
+fn check_utxo_args_number(inputs_len: usize, utxo_args: usize) -> SigningResult<()> {
+    if inputs_len != utxo_args {
+        return SigningError::err(SigningErrorType::Error_internal)
+            .context("There must be the same number of UTXOs and UtxoToSign arguments");
+    }
+
+    if inputs_len == 0 {
+        return SigningError::err(SigningErrorType::Error_missing_input_utxos).context(
+            "Transaction must have at least one valid input (UTXO). \
+                All UTXOs are either filtered (have dust amount) or not UTXOs are specified",
+        );
+    }
+    Ok(())
+}
diff --git a/rust/frameworks/tw_utxo/tests/build_tx.rs b/rust/frameworks/tw_utxo/tests/build_tx.rs
new file mode 100644
index 00000000000..9e3f73272b9
--- /dev/null
+++ b/rust/frameworks/tw_utxo/tests/build_tx.rs
@@ -0,0 +1,376 @@
+use tw_encoding::hex;
+
+use tw_keypair::ecdsa::secp256k1::PrivateKey;
+use tw_keypair::traits::SigningKeyTrait;
+use tw_keypair::{ecdsa, schnorr};
+use tw_misc::traits::ToBytesVec;
+use tw_utxo::modules::fee_estimator::FeeEstimator;
+use tw_utxo::modules::sighash_computer::SighashComputer;
+use tw_utxo::modules::tx_compiler::TxCompiler;
+use tw_utxo::sighash::SighashType;
+
+use tw_utxo::transaction::standard_transaction::builder::txid_from_str_and_rev;
+use tw_utxo::transaction::standard_transaction::builder::OutputBuilder;
+use tw_utxo::transaction::standard_transaction::builder::TransactionBuilder;
+use tw_utxo::transaction::standard_transaction::builder::UtxoBuilder;
+use tw_utxo::transaction::transaction_interface::TransactionInterface;
+
+const SATS_PER_VBYTE: i64 = 20;
+
+#[track_caller]
+fn verify_fee<Transaction: TransactionInterface>(
+    tx: &Transaction,
+    fee_per_vbyte: i64,
+    expected: i64,
+) {
+    let actual = FeeEstimator::estimate_fee(tx, fee_per_vbyte).unwrap();
+    assert_eq!(actual, expected);
+}
+
+#[test]
+fn build_tx_input_legacy_output_legacy() {
+    let alice_private_key =
+        hex::decode("56429688a1a6b00b90ccd22a0de0a376b6569d8684022ae92229a28478bfb657").unwrap();
+    let alice_pubkey =
+        hex::decode("036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536").unwrap();
+    let bob_pubkey =
+        hex::decode("037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf").unwrap();
+
+    let alice_private_key = PrivateKey::try_from(alice_private_key.as_slice()).unwrap();
+    let alice_ecdsa_pubkey =
+        ecdsa::secp256k1::PublicKey::try_from(alice_pubkey.as_slice()).unwrap();
+    let bob_ecdsa_pubkey = ecdsa::secp256k1::PublicKey::try_from(bob_pubkey.as_slice()).unwrap();
+
+    let txid =
+        txid_from_str_and_rev("1e1cdc48aa990d7e154a161d5b5f1cad737742e97d2712ab188027bb42e6e47b")
+            .unwrap();
+
+    let (utxo1, arg1) = UtxoBuilder::new()
+        .prev_txid(txid)
+        .prev_index(0)
+        .amount(50 * 100_000_000)
+        .sighash_type(SighashType::default())
+        .p2pkh(&alice_ecdsa_pubkey)
+        .unwrap();
+
+    let output1 = OutputBuilder::new(50 * 100_000_000 - 1_000_000).p2pkh(&bob_ecdsa_pubkey);
+
+    let mut builder = TransactionBuilder::new();
+    builder.push_input(utxo1, arg1).push_output(output1);
+    let unsigned_tx = builder.build().unwrap();
+
+    // Compute the primage.
+    let preimage = SighashComputer::preimage_tx(&unsigned_tx).unwrap();
+
+    // Sign the sighash.
+    let sighash = preimage.sighashes.into_iter().next().unwrap().sighash;
+    let sig = alice_private_key.sign(sighash).unwrap();
+
+    let tx = TxCompiler::compile(unsigned_tx, &[sig.to_vec()]).unwrap();
+
+    assert_eq!(tx.size(), 191);
+    assert_eq!(tx.vsize(), 191); // No witness data
+    assert_eq!(tx.weight(), 191 * 4);
+    assert_eq!(tx.weight(), 764);
+    verify_fee(&tx, SATS_PER_VBYTE, 191 * SATS_PER_VBYTE);
+
+    let encoded = hex::encode(tx.encode_out(), false);
+    assert_eq!(encoded, "02000000017be4e642bb278018ab12277de9427773ad1c5f5b1d164a157e0d99aa48dc1c1e000000006a473044022078eda020d4b86fcb3af78ef919912e6d79b81164dbbb0b0b96da6ac58a2de4b102201a5fd8d48734d5a02371c4b5ee551a69dca3842edbf577d863cf8ae9fdbbd4590121036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536ffffffff01c0aff629010000001976a9145eaaa4f458f9158f86afcba08dd7448d27045e3d88ac00000000");
+}
+
+#[test]
+fn build_tx_input_legacy_output_segwit() {
+    let alice_private_key =
+        hex::decode("57a64865bce5d4855e99b1cce13327c46171434f2d72eeaf9da53ee075e7f90a").unwrap();
+    let alice_pubkey =
+        hex::decode("028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28f").unwrap();
+    let bob_pubkey =
+        hex::decode("025a0af1510f0f24d40dd00d7c0e51605ca504bbc177c3e19b065f373a1efdd22f").unwrap();
+
+    let alice_private_key = PrivateKey::try_from(alice_private_key.as_slice()).unwrap();
+    let alice_ecdsa_pubkey =
+        ecdsa::secp256k1::PublicKey::try_from(alice_pubkey.as_slice()).unwrap();
+    let bob_ecdsa_pubkey = ecdsa::secp256k1::PublicKey::try_from(bob_pubkey.as_slice()).unwrap();
+
+    let txid =
+        txid_from_str_and_rev("181c84965c9ea86a5fac32fdbd5f73a21a7a9e749fb6ab97e273af2329f6b911")
+            .unwrap();
+
+    let (utxo1, arg1) = UtxoBuilder::new()
+        .prev_txid(txid)
+        .prev_index(0)
+        .amount(50 * 100_000_000)
+        .sighash_type(SighashType::default())
+        .p2pkh(&alice_ecdsa_pubkey)
+        .unwrap();
+
+    let output1 = OutputBuilder::new(50 * 100_000_000 - 1_000_000).p2wpkh(&bob_ecdsa_pubkey);
+
+    let mut builder = TransactionBuilder::new();
+    builder.push_input(utxo1, arg1).push_output(output1);
+    let unsigned_tx = builder.build().unwrap();
+
+    // Compute the primage.
+    let preimage = SighashComputer::preimage_tx(&unsigned_tx).unwrap();
+
+    // Sign the sighash.
+    let sighash = preimage.sighashes.into_iter().next().unwrap().sighash;
+    let sig = alice_private_key.sign(sighash).unwrap();
+
+    let tx = TxCompiler::compile(unsigned_tx, &[sig.to_vec()]).unwrap();
+
+    assert_eq!(tx.size(), 189);
+    assert_eq!(tx.vsize(), 189); // No witness data
+    assert_eq!(tx.weight(), 189 * 4);
+    assert_eq!(tx.weight(), 756);
+    verify_fee(&tx, SATS_PER_VBYTE, 189 * SATS_PER_VBYTE);
+    let encoded = hex::encode(tx.encode_out(), false);
+    assert_eq!(encoded, "020000000111b9f62923af73e297abb69f749e7a1aa2735fbdfd32ac5f6aa89e5c96841c18000000006b483045022100df9ed0b662b759e68b89a42e7144cddf787782a7129d4df05642dd825930e6e6022051a08f577f11cc7390684bbad2951a6374072253ffcf2468d14035ed0d8cd6490121028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28fffffffff01c0aff629010000001600140d0e1cec6c2babe8badde5e9b3dea667da90036d00000000")
+}
+
+#[test]
+fn build_tx_input_segwit_output_segwit() {
+    let alice_pubkey =
+        hex::decode("028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28f").unwrap();
+    let bob_private_key =
+        hex::decode("05dead4689ec7d55de654771120866be83bf1b8e25c9a1b77fc58a336e1cd1a3").unwrap();
+    let bob_pubkey =
+        hex::decode("025a0af1510f0f24d40dd00d7c0e51605ca504bbc177c3e19b065f373a1efdd22f").unwrap();
+
+    let alice_ecdsa_pubkey =
+        ecdsa::secp256k1::PublicKey::try_from(alice_pubkey.as_slice()).unwrap();
+    let bob_private_key = PrivateKey::try_from(bob_private_key.as_slice()).unwrap();
+    let bob_ecdsa_pubkey = ecdsa::secp256k1::PublicKey::try_from(bob_pubkey.as_slice()).unwrap();
+
+    let txid =
+        txid_from_str_and_rev("858e450a1da44397bde05ca2f8a78510d74c623cc2f69736a8b3fbfadc161f6e")
+            .unwrap();
+
+    let (utxo1, arg1) = UtxoBuilder::new()
+        .prev_txid(txid)
+        .prev_index(0)
+        .amount(50 * 100_000_000 - 1_000_000)
+        .sighash_type(SighashType::default())
+        .p2wpkh(&bob_ecdsa_pubkey)
+        .unwrap();
+
+    let output1 =
+        OutputBuilder::new(50 * 100_000_000 - 1_000_000 - 1_000_000).p2wpkh(&alice_ecdsa_pubkey);
+
+    let mut builder = TransactionBuilder::new();
+    builder.push_input(utxo1, arg1).push_output(output1);
+    let unsigned_tx = builder.build().unwrap();
+
+    // Compute the primage.
+    let preimage = SighashComputer::preimage_tx(&unsigned_tx).unwrap();
+
+    // Sign the sighash.
+    let sighash = preimage.sighashes.into_iter().next().unwrap().sighash;
+    let sig = bob_private_key.sign(sighash).unwrap();
+
+    let tx = TxCompiler::compile(unsigned_tx, &[sig.to_vec()]).unwrap();
+
+    assert_eq!(tx.size(), 192);
+    assert_eq!(tx.vsize(), 110); // Witness data discounted
+    assert_eq!(tx.weight(), 438);
+    verify_fee(&tx, SATS_PER_VBYTE, 110 * SATS_PER_VBYTE);
+
+    let encoded = hex::encode(tx.encode_out(), false);
+    assert_eq!(encoded, "020000000001016e1f16dcfafbb3a83697f6c23c624cd71085a7f8a25ce0bd9743a41d0a458e850000000000ffffffff01806de7290100000016001460cda7b50f14c152d7401c28ae773c698db9237302483045022100a9b517de5a5e036d7133df499b5b751db6f9a01576a6c5dc38229ec08b6c45cd02200e42c9f8c707c9bf0ceab4f739ec8d683dc1f1f29e195a8da9bc183584d624a60121025a0af1510f0f24d40dd00d7c0e51605ca504bbc177c3e19b065f373a1efdd22f00000000")
+}
+
+#[test]
+fn build_tx_input_legacy_output_taproot() {
+    let alice_private_key =
+        hex::decode("12ce558df23528f1aa86f1f51ac7e13a197a06bda27610fa89e13b04c40ee999").unwrap();
+    let alice_pubkey =
+        hex::decode("0351e003fdc48e7f31c9bc94996c91f6c3273b7ef4208a1686021bedf7673bb058").unwrap();
+    let bob_pubkey =
+        hex::decode("02c0938cf377023dfde55e9c96b3cff4ca8894fb6b5d2009006bd43c0bff69cac9").unwrap();
+
+    let alice_private_key = PrivateKey::try_from(alice_private_key.as_slice()).unwrap();
+    let alice_ecdsa_pubkey =
+        ecdsa::secp256k1::PublicKey::try_from(alice_pubkey.as_slice()).unwrap();
+    let bob_schnorr_pubkey = schnorr::PublicKey::try_from(bob_pubkey.as_slice()).unwrap();
+
+    let txid =
+        txid_from_str_and_rev("c50563913e5a838f937c94232f5a8fc74e58b629fae41dfdffcc9a70f833b53a")
+            .unwrap();
+
+    let (utxo1, arg1) = UtxoBuilder::new()
+        .prev_txid(txid)
+        .prev_index(0)
+        .amount(50 * 100_000_000)
+        .sighash_type(SighashType::default())
+        .p2pkh(&alice_ecdsa_pubkey)
+        .unwrap();
+
+    let output1 =
+        OutputBuilder::new(50 * 100_000_000 - 1_000_000).p2tr_key_path(&bob_schnorr_pubkey);
+
+    let mut builder = TransactionBuilder::new();
+    builder.push_input(utxo1, arg1).push_output(output1);
+    let unsigned_tx = builder.build().unwrap();
+
+    // Compute the primage.
+    let preimage = SighashComputer::preimage_tx(&unsigned_tx).unwrap();
+
+    // Sign the sighash.
+    let sighash = preimage.sighashes.into_iter().next().unwrap().sighash;
+    let sig = alice_private_key.sign(sighash).unwrap();
+
+    let tx = TxCompiler::compile(unsigned_tx, &[sig.to_vec()]).unwrap();
+
+    //assert_eq!(tx.size(), 191);
+    //assert_eq!(tx.vsize(), 110); // Witness data discounted
+    //assert_eq!(tx.weight(), 110 * 4);
+    //assert_eq!(tx.weight(), 440);
+    //assert_eq!(tx.fee(SATS_PER_VBYTE), 110 * SATS_PER_VBYTE);
+    //assert_eq!(tx.fee(SATS_PER_VBYTE), 2200);
+
+    let encoded = hex::encode(tx.encode_out(), false);
+    assert_eq!(encoded, "02000000013ab533f8709accfffd1de4fa29b6584ec78f5a2f23947c938f835a3e916305c5000000006b48304502210086ab2c2192e2738529d6cd9604d8ee75c5b09b0c2f4066a5c5fa3f87a26c0af602202afc7096aaa992235c43e712146057b5ed6a776d82b9129620bc5a21991c0a5301210351e003fdc48e7f31c9bc94996c91f6c3273b7ef4208a1686021bedf7673bb058ffffffff01c0aff62901000000225120e01cfdd05da8fa1d71f987373f3790d45dea9861acb0525c86656fe50f4397a600000000")
+}
+
+#[test]
+fn build_tx_input_taproot_output_taproot() {
+    let bob_private_key =
+        hex::decode("26c2566adcc030a1799213bfd546e615f6ab06f72085ec6806ff1761da48d227").unwrap();
+    let alice_pubkey =
+        hex::decode("0351e003fdc48e7f31c9bc94996c91f6c3273b7ef4208a1686021bedf7673bb058").unwrap();
+
+    let alice_schnorr_pubkey = schnorr::PublicKey::try_from(alice_pubkey.as_slice()).unwrap();
+    let bob_private_key = schnorr::PrivateKey::try_from(bob_private_key.as_slice()).unwrap();
+    let bob_pubkey = bob_private_key.public();
+
+    let txid =
+        txid_from_str_and_rev("9a582032f6a50cedaff77d3d5604b33adf8bc31bdaef8de977c2187e395860ac")
+            .unwrap();
+
+    let (utxo1, arg1) = UtxoBuilder::new()
+        .prev_txid(txid)
+        .prev_index(0)
+        .amount(50 * 100_000_000 - 1_000_000)
+        .sighash_type(SighashType::default())
+        .p2tr_key_path(&bob_pubkey)
+        .unwrap();
+
+    let output1 = OutputBuilder::new(50 * 100_000_000 - 1_000_000 - 1_000_000)
+        .p2tr_key_path(&alice_schnorr_pubkey);
+
+    let mut builder = TransactionBuilder::new();
+    builder.push_input(utxo1, arg1).push_output(output1);
+    let unsigned_tx = builder.build().unwrap();
+
+    // Compute the primage.
+    let preimage = SighashComputer::preimage_tx(&unsigned_tx).unwrap();
+
+    // Sign the sighash.
+    let sighash = preimage.sighashes.into_iter().next().unwrap().sighash;
+    let tweaked = bob_private_key.tweak(None).no_aux_rand();
+    let sig = tweaked.sign(sighash).unwrap();
+
+    let tx = TxCompiler::compile(unsigned_tx, &[sig.to_vec()]).unwrap();
+
+    let encoded = hex::encode(tx.encode_out(), false);
+    assert_eq!(encoded, "02000000000101ac6058397e18c277e98defda1bc38bdf3ab304563d7df7afed0ca5f63220589a0000000000ffffffff01806de72901000000225120a5c027857e359d19f625e52a106b8ac6ca2d6a8728f6cf2107cd7958ee0787c20140ec2d3910d41506b60aaa20520bb72f15e2d2cbd97e3a8e26ee7bad5f4c56b0f2fb0ceaddac33cb2813a33ba017ba6b1d011bab74a0426f12a2bcf47b4ed5bc8600000000")
+}
+
+#[test]
+fn build_tx_input_segwit_output_brc20_transfer_commit() {
+    let alice_private_key =
+        hex::decode("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129").unwrap();
+    let alice_pubkey =
+        hex::decode("030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb").unwrap();
+
+    let alice_private_key = PrivateKey::try_from(alice_private_key.as_slice()).unwrap();
+    let alice_ecdsa_pubkey =
+        ecdsa::secp256k1::PublicKey::try_from(alice_pubkey.as_slice()).unwrap();
+    let alice_schnorr_pubkey = schnorr::PublicKey::try_from(alice_pubkey.as_slice()).unwrap();
+
+    let txid =
+        txid_from_str_and_rev("8ec895b4d30adb01e38471ca1019bfc8c3e5fbd1f28d9e7b5653260d89989008")
+            .unwrap();
+
+    let (utxo1, arg1) = UtxoBuilder::new()
+        .prev_txid(txid)
+        .prev_index(1)
+        .amount(26_400)
+        .sighash_type(SighashType::default())
+        .p2wpkh(&alice_ecdsa_pubkey)
+        .unwrap();
+
+    let output1 = OutputBuilder::new(7_000)
+        .brc20_transfer(&alice_schnorr_pubkey, "oadf".into(), "20".into())
+        .unwrap();
+
+    let output2 = OutputBuilder::new(16_400).p2wpkh(&alice_ecdsa_pubkey);
+
+    let mut builder = TransactionBuilder::new();
+    builder
+        .push_input(utxo1, arg1.clone())
+        .push_output(output1)
+        .push_output(output2);
+    let unsigned_tx = builder.build().unwrap();
+
+    // Compute the primage.
+    let preimage = SighashComputer::preimage_tx(&unsigned_tx).unwrap();
+
+    // Sign the sighash.
+    let sighash = preimage.sighashes.into_iter().next().unwrap().sighash;
+
+    // Tweak the private key with the Taproot script leaf hash.
+    let sig = alice_private_key.sign(sighash).unwrap();
+
+    let tx = TxCompiler::compile(unsigned_tx, &[sig.to_vec()]).unwrap();
+
+    let encoded = hex::encode(tx.encode_out(), false);
+    assert_eq!(encoded, "02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000")
+}
+
+#[test]
+fn build_tx_input_brc20_transfer_commit_output_brc20_transfer_reveal() {
+    let alice_private_key =
+        hex::decode("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129").unwrap();
+    let alice_pubkey =
+        hex::decode("030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb").unwrap();
+
+    let alice_ecdsa_pubkey =
+        ecdsa::secp256k1::PublicKey::try_from(alice_pubkey.as_slice()).unwrap();
+    let alice_private_key = schnorr::PrivateKey::try_from(alice_private_key.as_slice())
+        .unwrap()
+        .no_aux_rand();
+    let alice_pubkey = alice_private_key.public();
+
+    let txid =
+        txid_from_str_and_rev("797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1")
+            .unwrap();
+
+    let (utxo1, arg1) = UtxoBuilder::new()
+        .prev_txid(txid)
+        .prev_index(0)
+        .amount(7_000)
+        .sighash_type(SighashType::default())
+        .brc20_transfer(&alice_pubkey, "oadf".into(), "20".into())
+        .unwrap();
+
+    let output1 = OutputBuilder::new(546).p2wpkh(&alice_ecdsa_pubkey);
+
+    let mut builder = TransactionBuilder::new();
+    builder.push_input(utxo1, arg1.clone()).push_output(output1);
+    let unsigned_tx = builder.build().unwrap();
+
+    // Compute the primage.
+    let preimage = SighashComputer::preimage_tx(&unsigned_tx).unwrap();
+
+    // Sign the sighash.
+    let sighash = preimage.sighashes.into_iter().next().unwrap().sighash;
+
+    // Tweak the private key with the Taproot script leaf hash.
+    let sig = alice_private_key.sign(sighash).unwrap();
+
+    let tx = TxCompiler::compile(unsigned_tx, &[sig.to_vec()]).unwrap();
+
+    let encoded = hex::encode(tx.encode_out(), false);
+    assert_eq!(encoded, "02000000000101b11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790000000000ffffffff012202000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d03406a35548b8fa4620028e021a944c1d3dc6e947243a7bfc901bf63fefae0d2460efa149a6440cab51966aa4f09faef2d1e5efcba23ab4ca6e669da598022dbcfe35b0063036f7264010118746578742f706c61696e3b636861727365743d7574662d3800377b2270223a226272632d3230222c226f70223a227472616e73666572222c227469636b223a226f616466222c22616d74223a223230227d6821c00f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000")
+}
diff --git a/rust/frameworks/tw_utxo/tests/common.rs b/rust/frameworks/tw_utxo/tests/common.rs
new file mode 100644
index 00000000000..c8b65535cab
--- /dev/null
+++ b/rust/frameworks/tw_utxo/tests/common.rs
@@ -0,0 +1,23 @@
+#![allow(dead_code)]
+
+use bitcoin::key::UntweakedPublicKey;
+use bitcoin::{PubkeyHash, PublicKey, WPubkeyHash};
+use secp256k1::{hashes::Hash, XOnlyPublicKey};
+use tw_encoding::hex;
+
+pub fn pubkey_hash_from_hex(hex: &str) -> PubkeyHash {
+    PubkeyHash::from_byte_array(hex::decode(hex).unwrap().try_into().unwrap())
+}
+
+pub fn witness_pubkey_hash(hex: &str) -> WPubkeyHash {
+    WPubkeyHash::from_byte_array(hex::decode(hex).unwrap().try_into().unwrap())
+}
+
+pub fn untweaked_pubkey(hex: &str) -> UntweakedPublicKey {
+    let pubkey = PublicKey::from_slice(&hex::decode(hex).unwrap()).unwrap();
+    XOnlyPublicKey::from(pubkey.inner)
+}
+
+pub fn txid_rev(hex: &str) -> Vec<u8> {
+    hex::decode(hex).unwrap().into_iter().rev().collect()
+}
diff --git a/rust/rustfmt.toml b/rust/rustfmt.toml
new file mode 100644
index 00000000000..e2204cc0dec
--- /dev/null
+++ b/rust/rustfmt.toml
@@ -0,0 +1,7 @@
+# Put a trailing comma after a block based match arm (non-block arms are not affected)
+# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#match_block_trailing_comma
+match_block_trailing_comma = true
+
+# Use field initialize shorthand if possible.
+# https://github.com/rust-lang/rustfmt/blob/master/Configurations.md#use_field_init_shorthand
+use_field_init_shorthand = true
diff --git a/rust/tw_any_coin/Cargo.toml b/rust/tw_any_coin/Cargo.toml
new file mode 100644
index 00000000000..a62b4ae9ef6
--- /dev/null
+++ b/rust/tw_any_coin/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "tw_any_coin"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+tw_coin_entry = { path = "../tw_coin_entry" }
+tw_coin_registry = { path = "../tw_coin_registry" }
+tw_encoding = { path = "../tw_encoding" }
+tw_hash = { path = "../tw_hash" }
+tw_keypair = { path = "../tw_keypair" }
+tw_memory = { path = "../tw_memory" }
+tw_misc = { path = "../tw_misc" }
+tw_proto = { path = "../tw_proto", optional = true }
+
+[features]
+test-utils = [
+    "tw_keypair/test-utils",
+    "tw_memory/test-utils",
+    "tw_misc/test-utils",
+    "tw_proto"
+]
diff --git a/rust/tw_any_coin/src/any_address.rs b/rust/tw_any_coin/src/any_address.rs
new file mode 100644
index 00000000000..01306025711
--- /dev/null
+++ b/rust/tw_any_coin/src/any_address.rs
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::prefix::AddressPrefix;
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::coin_dispatcher;
+use tw_keypair::tw::PublicKey;
+use tw_memory::Data;
+use tw_misc::try_or_false;
+
+/// Represents an address in Rust for almost any blockchain.
+#[derive(Debug, PartialEq)]
+pub struct AnyAddress {
+    coin: CoinType,
+    address: String,
+}
+
+impl AnyAddress {
+    /// Determines if the string is a valid Any address.
+    #[inline]
+    pub fn is_valid(coin: CoinType, address: &str, prefix: Option<AddressPrefix>) -> bool {
+        let (ctx, entry) = try_or_false!(coin_dispatcher(coin));
+        entry.validate_address(&ctx, address, prefix).is_ok()
+    }
+
+    /// Creates an address from a string representation and a coin type.
+    #[inline]
+    pub fn with_string(
+        coin: CoinType,
+        address: &str,
+        prefix: Option<AddressPrefix>,
+    ) -> AddressResult<AnyAddress> {
+        let (ctx, entry) = coin_dispatcher(coin).map_err(|_| AddressError::UnknownCoinType)?;
+        let address = entry.normalize_address(&ctx, address, prefix)?;
+        Ok(AnyAddress { coin, address })
+    }
+
+    /// Creates an address from a string representation and a coin type.
+    /// Please note that his function does not validate if the address belongs to the given chain.
+    pub(crate) fn with_string_unchecked(
+        coin: CoinType,
+        address: &str,
+    ) -> AddressResult<AnyAddress> {
+        let (_ctx, entry) = coin_dispatcher(coin).map_err(|_| AddressError::UnknownCoinType)?;
+        let address = entry.normalize_address_unchecked(address)?;
+        Ok(AnyAddress { coin, address })
+    }
+
+    /// Creates an address from a public key, derivation and prefix option.
+    #[inline]
+    pub fn with_public_key(
+        coin: CoinType,
+        public_key: PublicKey,
+        derivation: Derivation,
+        prefix: Option<AddressPrefix>,
+    ) -> AddressResult<AnyAddress> {
+        let (ctx, entry) = coin_dispatcher(coin).map_err(|_| AddressError::UnknownCoinType)?;
+        let address = entry.derive_address(&ctx, public_key, derivation, prefix)?;
+        Ok(AnyAddress { coin, address })
+    }
+
+    /// Returns underlying data (public key or key hash).
+    #[inline]
+    pub fn get_data(&self) -> AddressResult<Data> {
+        let (_ctx, entry) =
+            coin_dispatcher(self.coin).map_err(|_| AddressError::UnknownCoinType)?;
+        entry.address_to_data(&self.address)
+    }
+
+    /// Returns the address string representation.
+    #[inline]
+    pub fn description(&self) -> &str {
+        &self.address
+    }
+}
diff --git a/rust/tw_any_coin/src/any_signer.rs b/rust/tw_any_coin/src/any_signer.rs
new file mode 100644
index 00000000000..014e8a0c736
--- /dev/null
+++ b/rust/tw_any_coin/src/any_signer.rs
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::coin_dispatcher;
+use tw_memory::Data;
+
+/// Represents a signer to sign transactions for any blockchain.
+pub struct AnySigner;
+
+impl AnySigner {
+    /// Signs a transaction specified by the signing input and coin type.
+    #[inline]
+    pub fn sign(input: &[u8], coin: CoinType) -> SigningResult<Data> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry.sign(&ctx, input).map_err(SigningError::from)
+    }
+
+    /// Planning, for UTXO chains, in preparation for signing
+    /// It is optional, only UTXO chains need it, default impl. leaves empty result.
+    #[inline]
+    pub fn plan(input: &[u8], coin: CoinType) -> SigningResult<Data> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry.plan(&ctx, input)
+    }
+}
diff --git a/rust/tw_any_coin/src/ffi/mod.rs b/rust/tw_any_coin/src/ffi/mod.rs
new file mode 100644
index 00000000000..698f616468f
--- /dev/null
+++ b/rust/tw_any_coin/src/ffi/mod.rs
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod tw_any_address;
+pub mod tw_any_signer;
+pub mod tw_message_signer;
+pub mod tw_transaction_compiler;
+pub mod tw_transaction_decoder;
+pub mod tw_transaction_util;
+pub mod tw_wallet_connect_request;
diff --git a/rust/tw_any_coin/src/ffi/tw_any_address.rs b/rust/tw_any_coin/src/ffi/tw_any_address.rs
new file mode 100644
index 00000000000..dc94948e479
--- /dev/null
+++ b/rust/tw_any_coin/src/ffi/tw_any_address.rs
@@ -0,0 +1,239 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::any_address::AnyAddress;
+use tw_coin_entry::derivation::Derivation;
+use tw_coin_entry::prefix::{AddressPrefix, BitcoinBase58Prefix};
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::tw_derivation::TWDerivation;
+use tw_keypair::ffi::pubkey::TWPublicKey;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::tw_string::TWString;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::{try_or_else, try_or_false};
+
+/// Represents an address in Rust for almost any blockchain.
+pub struct TWAnyAddress(AnyAddress);
+
+impl RawPtrTrait for TWAnyAddress {}
+
+/// Determines if the string is a valid Any address.
+///
+/// \param string address to validate.
+/// \param coin coin type of the address.
+/// \return bool indicating if the address is valid.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_is_valid(string: *const TWString, coin: u32) -> bool {
+    let string = try_or_false!(TWString::from_ptr_as_ref(string));
+    let string = try_or_false!(string.as_str());
+    let coin = try_or_false!(CoinType::try_from(coin));
+
+    AnyAddress::is_valid(coin, string, None)
+}
+
+/// Determines if the string is a valid Any address with the given hrp.
+///
+/// \param string address to validate.
+/// \param coin coin type of the address.
+/// \param hrp explicit given hrp of the given address.
+/// \return bool indicating if the address is valid.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_is_valid_bech32(
+    string: *const TWString,
+    coin: u32,
+    hrp: *const TWString,
+) -> bool {
+    let string = try_or_false!(TWString::from_ptr_as_ref(string));
+    let string = try_or_false!(string.as_str());
+
+    let hrp = try_or_false!(TWString::from_ptr_as_ref(hrp));
+    let hrp = try_or_false!(hrp.as_str());
+
+    let coin = try_or_false!(CoinType::try_from(coin));
+
+    let prefix = AddressPrefix::Hrp(hrp.to_string());
+    AnyAddress::is_valid(coin, string, Some(prefix))
+}
+
+/// Determines if the string is a valid Any address with the given Base58 prefixes.
+///
+/// \param string address to validate.
+/// \param coin coin type of the address.
+/// \param p2pkh pay-to-public-key-hash address prefix.
+/// \param p2sh pay-to-script-hash address prefix.
+/// \return bool indicating if the address is valid.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_is_valid_base58(
+    string: *const TWString,
+    coin: u32,
+    p2pkh: u8,
+    p2sh: u8,
+) -> bool {
+    let string = try_or_false!(TWString::from_ptr_as_ref(string));
+    let string = try_or_false!(string.as_str());
+
+    let coin = try_or_false!(CoinType::try_from(coin));
+
+    let prefix = AddressPrefix::BitcoinBase58(BitcoinBase58Prefix { p2pkh, p2sh });
+    AnyAddress::is_valid(coin, string, Some(prefix))
+}
+
+/// Creates an address from a string representation and a coin type. Must be deleted with `TWAnyAddressDelete` after use.
+///
+/// \param string address to create.
+/// \param coin coin type of the address.
+/// \return `TWAnyAddress` pointer or nullptr if address and coin are invalid.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_create_with_string(
+    string: *const TWString,
+    coin: u32,
+) -> *mut TWAnyAddress {
+    let string = try_or_else!(TWString::from_ptr_as_ref(string), std::ptr::null_mut);
+    let string = try_or_else!(string.as_str(), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    AnyAddress::with_string(coin, string, None)
+        .map(|any_address| TWAnyAddress(any_address).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Creates an address from a public key and derivation option.
+///
+/// \param public_key derivates the address from the public key.
+/// \param coin coin type of the address.
+/// \param derivation the custom derivation to use.
+/// \return `TWAnyAddress` pointer or nullptr if public key is invalid.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_create_with_public_key_derivation(
+    public_key: *mut TWPublicKey,
+    coin: u32,
+    derivation: u32,
+) -> *mut TWAnyAddress {
+    let public_key = try_or_else!(TWPublicKey::from_ptr_as_ref(public_key), std::ptr::null_mut);
+    let derivation = try_or_else!(TWDerivation::from_repr(derivation), std::ptr::null_mut);
+    let derivation = Derivation::from(derivation);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    AnyAddress::with_public_key(coin, public_key.as_ref().clone(), derivation, None)
+        .map(|any_address| TWAnyAddress(any_address).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Creates an bech32 address from a public key and a given hrp.
+///
+/// \param public_key derivates the address from the public key.
+/// \param coin coin type of the address.
+/// \param hrp hrp of the address.
+/// \return TWAnyAddress pointer or nullptr if public key is invalid.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_create_bech32_with_public_key(
+    public_key: *mut TWPublicKey,
+    coin: u32,
+    hrp: *const TWString,
+) -> *mut TWAnyAddress {
+    let public_key = try_or_else!(TWPublicKey::from_ptr_as_ref(public_key), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    let hrp = try_or_else!(TWString::from_ptr_as_ref(hrp), std::ptr::null_mut);
+    let hrp = try_or_else!(hrp.as_str(), std::ptr::null_mut);
+
+    let prefix = AddressPrefix::Hrp(hrp.to_string());
+    AnyAddress::with_public_key(
+        coin,
+        public_key.as_ref().clone(),
+        Derivation::default(),
+        Some(prefix),
+    )
+    .map(|any_address| TWAnyAddress(any_address).into_ptr())
+    .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Creates an Base58 Bitcoin address from a public key and a given hrp.
+///
+/// \param public_key derivates the address from the public key.
+/// \param coin coin type of the address.
+/// \param p2pkh pay-to-public-key-hash address prefix.
+/// \param p2sh pay-to-script-hash address prefix.
+/// \return TWAnyAddress pointer or nullptr if public key is invalid.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_create_base58_with_public_key(
+    public_key: *mut TWPublicKey,
+    coin: u32,
+    p2pkh: u8,
+    p2sh: u8,
+) -> *mut TWAnyAddress {
+    let public_key = try_or_else!(TWPublicKey::from_ptr_as_ref(public_key), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    let prefix = AddressPrefix::BitcoinBase58(BitcoinBase58Prefix { p2pkh, p2sh });
+    AnyAddress::with_public_key(
+        coin,
+        public_key.as_ref().clone(),
+        Derivation::default(),
+        Some(prefix),
+    )
+    .map(|any_address| TWAnyAddress(any_address).into_ptr())
+    .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Deletes an address.
+///
+/// \param address address to delete.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_delete(address: *mut TWAnyAddress) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = TWAnyAddress::from_ptr(address);
+}
+
+/// Returns the address string representation.
+///
+/// \param address address to get the string representation of.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_description(address: *const TWAnyAddress) -> *mut TWString {
+    // Take the ownership back to rust and drop the owner.
+    let address = try_or_else!(TWAnyAddress::from_ptr_as_ref(address), std::ptr::null_mut);
+
+    let description = address.0.description().to_string();
+    TWString::from(description).into_ptr()
+}
+
+/// Returns underlying data (public key or key hash)
+///
+/// \param address address to get the data of.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_data(address: *const TWAnyAddress) -> *mut TWData {
+    // Take the ownership back to rust and drop the owner.
+    let address = try_or_else!(TWAnyAddress::from_ptr_as_ref(address), std::ptr::null_mut);
+
+    let data = try_or_else!(address.0.get_data(), std::ptr::null_mut);
+    TWData::from(data).into_ptr()
+}
+
+/// Creates an address from a string representation and a coin type. Must be deleted with `TWAnyAddressDelete` after use.
+/// This function does not check if the address belongs to the given chain.
+///
+/// \param string address to create.
+/// \param coin coin type of the address.
+/// \return `TWAnyAddress` pointer or nullptr if address and coin are invalid.
+///
+/// # Warning
+///
+/// This function should only be used when address prefix is unavailable to be passed to this function.
+/// Consider using `tw_any_address_create_<PREFIX>_with_string` if the prefix is known.
+/// Please note that this function should be removed when all chains are migrated to Rust.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_address_create_with_string_unchecked(
+    string: *const TWString,
+    coin: u32,
+) -> *mut TWAnyAddress {
+    let string = try_or_else!(TWString::from_ptr_as_ref(string), std::ptr::null_mut);
+    let string = try_or_else!(string.as_str(), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    AnyAddress::with_string_unchecked(coin, string)
+        .map(|any_address| TWAnyAddress(any_address).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/tw_any_coin/src/ffi/tw_any_signer.rs b/rust/tw_any_coin/src/ffi/tw_any_signer.rs
new file mode 100644
index 00000000000..8f6c8c4cea6
--- /dev/null
+++ b/rust/tw_any_coin/src/ffi/tw_any_signer.rs
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::any_signer::AnySigner;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+
+/// Signs a transaction specified by the signing input and coin type.
+///
+/// \param input The serialized data of a signing input (e.g. TW.Bitcoin.Proto.SigningInput).
+/// \param coin The given coin type to sign the transaction for.
+/// \return The serialized data of a `SigningOutput` proto object. (e.g. TW.Bitcoin.Proto.SigningOutput).
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_signer_sign(input: *const TWData, coin: u32) -> *mut TWData {
+    let input = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    AnySigner::sign(input.as_slice(), coin)
+        .map(|output| TWData::from(output).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Plans a transaction (for UTXO chains only).
+///
+/// \param input The serialized data of a signing input
+/// \param coin The given coin type to plan the transaction for.
+/// \return The serialized data of a `TransactionPlan` proto object.
+#[no_mangle]
+pub unsafe extern "C" fn tw_any_signer_plan(input: *const TWData, coin: u32) -> *mut TWData {
+    let input = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    AnySigner::plan(input.as_slice(), coin)
+        .map(|output| TWData::from(output).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/tw_any_coin/src/ffi/tw_message_signer.rs b/rust/tw_any_coin/src/ffi/tw_message_signer.rs
new file mode 100644
index 00000000000..1bc3d4227d8
--- /dev/null
+++ b/rust/tw_any_coin/src/ffi/tw_message_signer.rs
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::message_signer::MessageSigner;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::{try_or_else, try_or_false};
+
+/// Signs a message for the given blockchain.
+///
+/// \param input The serialized data of a signing input (e.g. TW.Ethereum.Proto.MessageSigningInput).
+/// \param coin The given coin type to sign the transaction for.
+/// \return The serialized data of a `SigningOutput` proto object. (e.g. TW.Ethereum.Proto.MessageSigningOutput).
+#[no_mangle]
+pub unsafe extern "C" fn tw_message_signer_sign(input: *const TWData, coin: u32) -> *mut TWData {
+    let input = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    MessageSigner::sign_message(input.as_slice(), coin)
+        .map(|output| TWData::from(output).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Verifies a signature for a message.
+///
+/// \param input The serialized data of a signing input (e.g. TW.Ethereum.Proto.MessageSigningInput).
+/// \param coin The given coin type to sign the transaction for.
+/// \return The serialized data of a `SigningOutput` proto object. (e.g. TW.Ethereum.Proto.MessageSigningOutput).
+#[no_mangle]
+pub unsafe extern "C" fn tw_message_signer_verify(input: *const TWData, coin: u32) -> bool {
+    let input = try_or_false!(TWData::from_ptr_as_ref(input));
+    let coin = try_or_false!(CoinType::try_from(coin));
+    MessageSigner::verify_message(input.as_slice(), coin).unwrap_or_default()
+}
+
+/// Computes preimage hashes of a message.
+///
+/// \param input The serialized data of a signing input (e.g. TW.Ethereum.Proto.MessageSigningInput).
+/// \param coin The given coin type to sign the transaction for.
+/// \return The serialized data of TW.TxCompiler.PreSigningOutput.
+#[no_mangle]
+pub unsafe extern "C" fn tw_message_signer_pre_image_hashes(
+    input: *const TWData,
+    coin: u32,
+) -> *mut TWData {
+    let input = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    MessageSigner::message_preimage_hashes(input.as_slice(), coin)
+        .map(|output| TWData::from(output).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/tw_any_coin/src/ffi/tw_transaction_compiler.rs b/rust/tw_any_coin/src/ffi/tw_transaction_compiler.rs
new file mode 100644
index 00000000000..5c18816e1d9
--- /dev/null
+++ b/rust/tw_any_coin/src/ffi/tw_transaction_compiler.rs
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::transaction_compiler::TransactionCompiler;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::tw_data_vector::TWDataVector;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+
+/// Obtains pre-signing hashes of a transaction.
+///
+/// We provide a default `PreSigningOutput` in TransactionCompiler.proto.
+/// For some special coins, such as bitcoin, we will create a custom `PreSigningOutput` object in its proto file.
+/// \param coin coin type.
+/// \param input The serialized data of a signing input
+/// \return serialized data of a proto object `PreSigningOutput` includes hash.
+#[no_mangle]
+pub unsafe extern "C" fn tw_transaction_compiler_pre_image_hashes(
+    coin: u32,
+    input: *const TWData,
+) -> *mut TWData {
+    let input = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    TransactionCompiler::preimage_hashes(coin, input.as_slice())
+        .map(|output| TWData::from(output).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Compiles a complete transaction with one or more external signatures.
+///
+/// Puts together from transaction input and provided public keys and signatures. The signatures must match the hashes
+/// returned by `TWTransactionCompilerPreImageHashes`, in the same order. The publicKeyHash attached
+/// to the hashes enable identifying the private key needed for signing the hash.
+/// \param coin coin type.
+/// \param input The serialized data of a signing input.
+/// \param signatures signatures to compile, using `TWDataVector`.
+/// \param public_keys public keys for signers to match private keys, using `TWDataVector`.
+/// \return serialized data of a proto object `SigningOutput`.
+#[no_mangle]
+pub unsafe extern "C" fn tw_transaction_compiler_compile(
+    coin: u32,
+    input: *const TWData,
+    signatures: *const TWDataVector,
+    public_keys: *const TWDataVector,
+) -> *mut TWData {
+    let input = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let signatures_ref = try_or_else!(
+        TWDataVector::from_ptr_as_ref(signatures),
+        std::ptr::null_mut
+    );
+    let public_keys_ref = try_or_else!(
+        TWDataVector::from_ptr_as_ref(public_keys),
+        std::ptr::null_mut
+    );
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    TransactionCompiler::compile(
+        coin,
+        input.as_slice(),
+        signatures_ref.to_data_vec(),
+        public_keys_ref.to_data_vec(),
+    )
+    .map(|output| TWData::from(output).into_ptr())
+    .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/tw_any_coin/src/ffi/tw_transaction_decoder.rs b/rust/tw_any_coin/src/ffi/tw_transaction_decoder.rs
new file mode 100644
index 00000000000..d5beb6d6a64
--- /dev/null
+++ b/rust/tw_any_coin/src/ffi/tw_transaction_decoder.rs
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::transaction_decoder::TransactionDecoder;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+
+/// Decodes a transaction from a binary representation.
+///
+/// \param coin coin type.
+/// \param tx encoded transaction data.
+/// \return serialized protobuf message specific for the given coin.
+#[no_mangle]
+pub unsafe extern "C" fn tw_transaction_decoder_decode(
+    coin: u32,
+    tx: *const TWData,
+) -> *mut TWData {
+    let tx = try_or_else!(TWData::from_ptr_as_ref(tx), std::ptr::null_mut);
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    TransactionDecoder::decode_transaction(coin, tx.as_slice())
+        .map(|output| TWData::from(output).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/tw_any_coin/src/ffi/tw_transaction_util.rs b/rust/tw_any_coin/src/ffi/tw_transaction_util.rs
new file mode 100644
index 00000000000..7dd7acbf382
--- /dev/null
+++ b/rust/tw_any_coin/src/ffi/tw_transaction_util.rs
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::transaction_util::TransactionUtil;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::ffi::tw_string::TWString;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+
+/// Calculate the TX hash of a transaction.
+///
+/// \param coin coin type.
+/// \param encoded_tx encoded transaction data.
+/// \return The TX hash of a transaction, If the input is invalid or the chain is unsupported, null is returned.
+#[no_mangle]
+pub unsafe extern "C" fn tw_transaction_util_calc_tx_hash(
+    coin: u32,
+    encoded_tx: *const TWString,
+) -> *mut TWString {
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+
+    let encoded_tx = try_or_else!(TWString::from_ptr_as_ref(encoded_tx), std::ptr::null_mut);
+    let encoded_tx = try_or_else!(encoded_tx.as_str(), std::ptr::null_mut);
+
+    TransactionUtil::calc_tx_hash(coin, encoded_tx)
+        .map(|output| TWString::from(output).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/tw_any_coin/src/ffi/tw_wallet_connect_request.rs b/rust/tw_any_coin/src/ffi/tw_wallet_connect_request.rs
new file mode 100644
index 00000000000..1bde2cffa77
--- /dev/null
+++ b/rust/tw_any_coin/src/ffi/tw_wallet_connect_request.rs
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::wallet_connect_request::WalletConnectRequest;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+
+/// Parses the WalletConnect signing request as a `SigningInput`.
+///
+/// \param coin The given coin type to plan the transaction for.
+/// \param input The serialized data of a `WalletConnect::Proto::ParseRequestInput` proto object.
+/// \return The serialized data of `WalletConnect::Proto::ParseRequestOutput` proto object.
+#[no_mangle]
+pub unsafe extern "C" fn tw_wallet_connect_request_parse(
+    coin: u32,
+    input: *const TWData,
+) -> *mut TWData {
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+    let input = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+
+    WalletConnectRequest::parse(coin, input.as_slice())
+        .map(|output| TWData::from(output).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/tw_any_coin/src/lib.rs b/rust/tw_any_coin/src/lib.rs
new file mode 100644
index 00000000000..be2b4c4909e
--- /dev/null
+++ b/rust/tw_any_coin/src/lib.rs
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod any_address;
+pub mod any_signer;
+pub mod ffi;
+pub mod message_signer;
+pub mod transaction_compiler;
+pub mod transaction_decoder;
+pub mod wallet_connect_request;
+
+#[cfg(feature = "test-utils")]
+pub mod test_utils;
+pub mod transaction_util;
diff --git a/rust/tw_any_coin/src/message_signer.rs b/rust/tw_any_coin/src/message_signer.rs
new file mode 100644
index 00000000000..89297a59680
--- /dev/null
+++ b/rust/tw_any_coin/src/message_signer.rs
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::coin_dispatcher;
+use tw_memory::Data;
+
+/// Represents a message signer to sign regular or typed structured data for any blockchain.
+pub struct MessageSigner;
+
+impl MessageSigner {
+    /// Signs a message.
+    #[inline]
+    pub fn sign_message(input: &[u8], coin: CoinType) -> SigningResult<Data> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry.sign_message(&ctx, input)
+    }
+
+    /// Computes preimage hashes of a message.
+    #[inline]
+    pub fn message_preimage_hashes(input: &[u8], coin: CoinType) -> SigningResult<Data> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry.message_preimage_hashes(&ctx, input)
+    }
+
+    /// Verifies a signature for a message.
+    #[inline]
+    pub fn verify_message(input: &[u8], coin: CoinType) -> SigningResult<bool> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry.verify_message(&ctx, input)
+    }
+}
diff --git a/rust/tw_any_coin/src/test_utils/address_utils.rs b/rust/tw_any_coin/src/test_utils/address_utils.rs
new file mode 100644
index 00000000000..b7e896d2664
--- /dev/null
+++ b/rust/tw_any_coin/src/test_utils/address_utils.rs
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_any_address::{
+    tw_any_address_create_base58_with_public_key, tw_any_address_create_bech32_with_public_key,
+    tw_any_address_create_with_public_key_derivation, tw_any_address_create_with_string,
+    tw_any_address_data, tw_any_address_delete, tw_any_address_description,
+    tw_any_address_is_valid, tw_any_address_is_valid_base58, tw_any_address_is_valid_bech32,
+    TWAnyAddress,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::registry::get_coin_item;
+use tw_coin_registry::tw_derivation::TWDerivation;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_keypair::ffi::privkey::tw_private_key_get_public_key_by_type;
+use tw_keypair::test_utils::tw_private_key_helper::TWPrivateKeyHelper;
+use tw_keypair::test_utils::tw_public_key_helper::TWPublicKeyHelper;
+use tw_keypair::tw::PublicKeyType;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+use tw_memory::test_utils::tw_wrapper::{TWWrapper, WithDestructor};
+
+pub type TWAnyAddressHelper = TWWrapper<TWAnyAddress>;
+
+impl WithDestructor for TWAnyAddress {
+    fn destructor() -> unsafe extern "C" fn(*mut Self) {
+        tw_any_address_delete
+    }
+}
+
+pub fn test_address_derive(coin: CoinType, private_key: &str, address: &str) {
+    test_address_derive_with_derivation(coin, private_key, address, TWDerivation::Default)
+}
+
+pub fn test_address_derive_with_derivation(
+    coin: CoinType,
+    private_key: &str,
+    address: &str,
+    derivation: TWDerivation,
+) {
+    let coin_item = get_coin_item(coin).unwrap();
+
+    let private_key = TWPrivateKeyHelper::with_hex(private_key);
+    let public_key = TWPublicKeyHelper::wrap(unsafe {
+        tw_private_key_get_public_key_by_type(private_key.ptr(), coin_item.public_key_type as u32)
+    });
+
+    let any_address = TWAnyAddressHelper::wrap(unsafe {
+        tw_any_address_create_with_public_key_derivation(
+            public_key.ptr(),
+            coin as u32,
+            derivation as u32,
+        )
+    });
+
+    let actual = TWStringHelper::wrap(unsafe { tw_any_address_description(any_address.ptr()) });
+    assert_eq!(actual.to_string().unwrap(), address);
+}
+
+pub fn test_address_normalization(coin: CoinType, denormalized: &str, normalized: &str) {
+    let expected = normalized;
+    let denormalized = TWStringHelper::create(denormalized);
+
+    let any_address = TWAnyAddressHelper::wrap(unsafe {
+        tw_any_address_create_with_string(denormalized.ptr(), coin as u32)
+    });
+
+    let normalized = TWStringHelper::wrap(unsafe { tw_any_address_description(any_address.ptr()) });
+
+    assert_eq!(normalized.to_string(), Some(expected.to_string()));
+}
+
+pub fn test_address_valid(coin: CoinType, address: &str) {
+    let addr = TWStringHelper::create(address);
+    assert!(
+        unsafe { tw_any_address_is_valid(addr.ptr(), coin as u32) },
+        "'{}' expected to be valid",
+        address
+    );
+}
+
+pub fn test_address_invalid(coin: CoinType, address: &str) {
+    let addr = TWStringHelper::create(address);
+    assert!(
+        !unsafe { tw_any_address_is_valid(addr.ptr(), coin as u32) },
+        "'{}' expected to be invalid",
+        address
+    );
+}
+
+pub fn test_address_get_data(coin: CoinType, address: &str, data_hex: &str) {
+    let address_str = TWStringHelper::create(address);
+    let any_address = TWAnyAddressHelper::wrap(unsafe {
+        tw_any_address_create_with_string(address_str.ptr(), coin as u32)
+    });
+
+    let actual_data = TWDataHelper::wrap(unsafe { tw_any_address_data(any_address.ptr()) })
+        .to_vec()
+        .unwrap_or_else(|| panic!("!tw_any_address_data"));
+    assert_eq!(
+        actual_data.to_hex(),
+        // Decode and encode again to allow to use `0x` and non-prefixed data hexes.
+        data_hex.decode_hex().unwrap().to_hex()
+    );
+}
+
+pub struct AddressCreateBech32WithPublicKey<'a> {
+    pub coin: CoinType,
+    pub private_key: &'a str,
+    pub public_key_type: PublicKeyType,
+    pub hrp: &'a str,
+    pub expected: &'a str,
+}
+
+pub fn test_address_create_bech32_with_public_key(input: AddressCreateBech32WithPublicKey<'_>) {
+    let private_key = TWPrivateKeyHelper::with_hex(input.private_key);
+    let public_key = TWPublicKeyHelper::wrap(unsafe {
+        tw_private_key_get_public_key_by_type(private_key.ptr(), input.public_key_type as u32)
+    });
+    let hrp = TWStringHelper::create(input.hrp);
+
+    let any_address = TWAnyAddressHelper::wrap(unsafe {
+        tw_any_address_create_bech32_with_public_key(public_key.ptr(), input.coin as u32, hrp.ptr())
+    });
+
+    let actual = TWStringHelper::wrap(unsafe { tw_any_address_description(any_address.ptr()) });
+    assert_eq!(actual.to_string(), Some(input.expected.to_string()));
+}
+
+pub struct AddressBech32IsValid<'a> {
+    pub coin: CoinType,
+    pub address: &'a str,
+    pub hrp: &'a str,
+}
+
+pub fn test_address_bech32_is_valid(input: AddressBech32IsValid<'_>) {
+    let address_str = TWStringHelper::create(input.address);
+    let hrp = TWStringHelper::create(input.hrp);
+    // Should be valid even though Osmosis chain has `osmo` default hrp.
+    let result =
+        unsafe { tw_any_address_is_valid_bech32(address_str.ptr(), input.coin as u32, hrp.ptr()) };
+    assert!(result);
+}
+
+pub struct AddressCreateBase58WithPublicKey<'a> {
+    pub coin: CoinType,
+    pub public_key: &'a str,
+    pub public_key_type: PublicKeyType,
+    pub p2pkh: u8,
+    pub p2sh: u8,
+    pub expected: &'a str,
+}
+
+pub fn test_address_create_base58_with_public_key(input: AddressCreateBase58WithPublicKey<'_>) {
+    let public_key = TWPublicKeyHelper::with_hex(input.public_key, input.public_key_type);
+
+    let any_address = TWAnyAddressHelper::wrap(unsafe {
+        tw_any_address_create_base58_with_public_key(
+            public_key.ptr(),
+            input.coin as u32,
+            input.p2pkh,
+            input.p2sh,
+        )
+    });
+
+    let actual = TWStringHelper::wrap(unsafe { tw_any_address_description(any_address.ptr()) });
+    assert_eq!(actual.to_string(), Some(input.expected.to_string()));
+}
+
+pub struct AddressBase58IsValid<'a> {
+    pub coin: CoinType,
+    pub address: &'a str,
+    pub p2pkh: u8,
+    pub p2sh: u8,
+}
+
+pub fn test_address_base58_is_valid(input: AddressBase58IsValid<'_>) {
+    // First, check if the address is valid.
+    let addr_str = TWStringHelper::create(input.address);
+    let is_valid = unsafe {
+        tw_any_address_is_valid_base58(addr_str.ptr(), input.coin as u32, input.p2pkh, input.p2sh)
+    };
+    assert!(is_valid, "!tw_any_address_is_valid_base58");
+}
diff --git a/rust/tw_any_coin/src/test_utils/mod.rs b/rust/tw_any_coin/src/test_utils/mod.rs
new file mode 100644
index 00000000000..19ddedaf441
--- /dev/null
+++ b/rust/tw_any_coin/src/test_utils/mod.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address_utils;
+pub mod plan_utils;
+pub mod sign_utils;
+pub mod transaction_calc_tx_hash_utils;
+pub mod transaction_decode_utils;
+pub mod wallet_connect_utils;
diff --git a/rust/tw_any_coin/src/test_utils/plan_utils.rs b/rust/tw_any_coin/src/test_utils/plan_utils.rs
new file mode 100644
index 00000000000..26afc81d8da
--- /dev/null
+++ b/rust/tw_any_coin/src/test_utils/plan_utils.rs
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_any_signer::tw_any_signer_plan;
+use std::marker::PhantomData;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::Data;
+use tw_proto::{deserialize, serialize, MessageRead, MessageWrite};
+
+#[derive(Default)]
+pub struct AnyPlannerHelper<'a, Output: MessageRead<'a>> {
+    output_data: Data,
+    _output_type: PhantomData<&'a Output>,
+}
+
+impl<'a, Output: MessageRead<'a>> AnyPlannerHelper<'a, Output> {
+    pub fn plan<Input: MessageWrite>(&'a mut self, coin_type: CoinType, input: Input) -> Output {
+        let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+        self.output_data =
+            TWDataHelper::wrap(unsafe { tw_any_signer_plan(input_data.ptr(), coin_type as u32) })
+                .to_vec()
+                .expect("!tw_any_signer_plan returned nullptr");
+
+        let output: Output = deserialize(&self.output_data).unwrap();
+        output
+    }
+}
diff --git a/rust/tw_any_coin/src/test_utils/sign_utils.rs b/rust/tw_any_coin/src/test_utils/sign_utils.rs
new file mode 100644
index 00000000000..fa34ec0c415
--- /dev/null
+++ b/rust/tw_any_coin/src/test_utils/sign_utils.rs
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_any_signer::tw_any_signer_sign;
+use crate::ffi::tw_transaction_compiler::{
+    tw_transaction_compiler_compile, tw_transaction_compiler_pre_image_hashes,
+};
+use std::marker::PhantomData;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_data_vector_helper::TWDataVectorHelper;
+use tw_memory::Data;
+use tw_proto::{deserialize, serialize, MessageRead, MessageWrite};
+
+#[derive(Default)]
+pub struct AnySignerHelper<'a, Output: MessageRead<'a>> {
+    output_data: Data,
+    _output_type: PhantomData<&'a Output>,
+}
+
+impl<'a, Output: MessageRead<'a>> AnySignerHelper<'a, Output> {
+    pub fn sign<Input: MessageWrite>(&'a mut self, coin_type: CoinType, input: Input) -> Output {
+        let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+        self.output_data =
+            TWDataHelper::wrap(unsafe { tw_any_signer_sign(input_data.ptr(), coin_type as u32) })
+                .to_vec()
+                .expect("!tw_any_signer_sign returned nullptr");
+
+        let output: Output = deserialize(&self.output_data).unwrap();
+        output
+    }
+}
+
+#[derive(Default)]
+pub struct PreImageHelper<'a, Output: MessageRead<'a>> {
+    output_data: Data,
+    _output_type: PhantomData<&'a Output>,
+}
+
+impl<'a, Output: MessageRead<'a>> PreImageHelper<'a, Output> {
+    pub fn pre_image_hashes<Input: MessageWrite>(
+        &'a mut self,
+        coin_type: CoinType,
+        input: &Input,
+    ) -> Output {
+        let input_data = TWDataHelper::create(serialize(input).unwrap());
+
+        self.output_data = TWDataHelper::wrap(unsafe {
+            tw_transaction_compiler_pre_image_hashes(coin_type as u32, input_data.ptr())
+        })
+        .to_vec()
+        .expect("!tw_transaction_compiler_pre_image_hashes returned nullptr");
+
+        let output: Output = deserialize(&self.output_data).unwrap();
+        output
+    }
+}
+
+#[derive(Default)]
+pub struct CompilerHelper<'a, Output: MessageRead<'a>> {
+    output_data: Data,
+    _output_type: PhantomData<&'a Output>,
+}
+
+impl<'a, Output: MessageRead<'a>> CompilerHelper<'a, Output> {
+    pub fn compile<Input: MessageWrite>(
+        &'a mut self,
+        coin_type: CoinType,
+        input: &Input,
+        signatures: Vec<Data>,
+        public_keys: Vec<Data>,
+    ) -> Output {
+        let input_data = TWDataHelper::create(serialize(input).unwrap());
+
+        let signatures = TWDataVectorHelper::create(signatures);
+        let public_keys = TWDataVectorHelper::create(public_keys);
+
+        self.output_data = TWDataHelper::wrap(unsafe {
+            tw_transaction_compiler_compile(
+                coin_type as u32,
+                input_data.ptr(),
+                signatures.ptr(),
+                public_keys.ptr(),
+            )
+        })
+        .to_vec()
+        .expect("!tw_transaction_compiler_compile returned nullptr");
+
+        let output: Output = deserialize(&self.output_data).unwrap();
+        output
+    }
+}
diff --git a/rust/tw_any_coin/src/test_utils/transaction_calc_tx_hash_utils.rs b/rust/tw_any_coin/src/test_utils/transaction_calc_tx_hash_utils.rs
new file mode 100644
index 00000000000..269104a37e1
--- /dev/null
+++ b/rust/tw_any_coin/src/test_utils/transaction_calc_tx_hash_utils.rs
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_transaction_util::tw_transaction_util_calc_tx_hash;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+
+pub struct TransactionUtilHelper;
+
+impl TransactionUtilHelper {
+    pub fn calc_tx_hash(coin_type: CoinType, tx: &str) -> String {
+        let tx_data = TWStringHelper::create(tx);
+
+        TWStringHelper::wrap(unsafe {
+            tw_transaction_util_calc_tx_hash(coin_type as u32, tx_data.ptr())
+        })
+        .to_string()
+        .expect("!tw_transaction_util_calc_tx_hash returned nullptr")
+    }
+}
diff --git a/rust/tw_any_coin/src/test_utils/transaction_decode_utils.rs b/rust/tw_any_coin/src/test_utils/transaction_decode_utils.rs
new file mode 100644
index 00000000000..7e232ce14f9
--- /dev/null
+++ b/rust/tw_any_coin/src/test_utils/transaction_decode_utils.rs
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_transaction_decoder::tw_transaction_decoder_decode;
+use std::marker::PhantomData;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::Data;
+use tw_proto::{deserialize, MessageRead};
+
+#[derive(Default)]
+pub struct TransactionDecoderHelper<'a, Output: MessageRead<'a>> {
+    output_data: Data,
+    _output_type: PhantomData<&'a Output>,
+}
+
+impl<'a, Output: MessageRead<'a>> TransactionDecoderHelper<'a, Output> {
+    pub fn decode(&'a mut self, coin_type: CoinType, tx: Data) -> Output {
+        let tx_data = TWDataHelper::create(tx);
+
+        self.output_data = TWDataHelper::wrap(unsafe {
+            tw_transaction_decoder_decode(coin_type as u32, tx_data.ptr())
+        })
+        .to_vec()
+        .expect("!tw_transaction_decoder_decode returned nullptr");
+
+        let output: Output = deserialize(&self.output_data).unwrap();
+        output
+    }
+}
diff --git a/rust/tw_any_coin/src/test_utils/wallet_connect_utils.rs b/rust/tw_any_coin/src/test_utils/wallet_connect_utils.rs
new file mode 100644
index 00000000000..a4323bf9b95
--- /dev/null
+++ b/rust/tw_any_coin/src/test_utils/wallet_connect_utils.rs
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_wallet_connect_request::tw_wallet_connect_request_parse;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::Data;
+use tw_proto::{deserialize, serialize, WalletConnect::Proto as WCProto};
+
+#[derive(Default)]
+pub struct WalletConnectRequestHelper {
+    output_data: Data,
+}
+
+impl WalletConnectRequestHelper {
+    pub fn parse<'a>(
+        &'a mut self,
+        coin_type: CoinType,
+        input: &WCProto::ParseRequestInput,
+    ) -> WCProto::ParseRequestOutput<'a> {
+        let input_data = TWDataHelper::create(serialize(input).unwrap());
+
+        self.output_data = TWDataHelper::wrap(unsafe {
+            tw_wallet_connect_request_parse(coin_type as u32, input_data.ptr())
+        })
+        .to_vec()
+        .expect("!tw_wallet_connect_request_parse returned nullptr");
+
+        deserialize(&self.output_data).unwrap()
+    }
+}
diff --git a/rust/tw_any_coin/src/transaction_compiler.rs b/rust/tw_any_coin/src/transaction_compiler.rs
new file mode 100644
index 00000000000..d20e9ee1cef
--- /dev/null
+++ b/rust/tw_any_coin/src/transaction_compiler.rs
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::coin_dispatcher;
+use tw_memory::Data;
+
+/// Non-core transaction utility methods, like building a transaction using an external signature.
+pub struct TransactionCompiler;
+
+impl TransactionCompiler {
+    /// Obtains pre-signing hashes of a transaction.
+    #[inline]
+    pub fn preimage_hashes(coin: CoinType, input: &[u8]) -> SigningResult<Data> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry
+            .preimage_hashes(&ctx, input)
+            .map_err(SigningError::from)
+    }
+
+    /// Compiles a complete transaction with one or more external signatures.
+    #[inline]
+    pub fn compile(
+        coin: CoinType,
+        input: &[u8],
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Data> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry
+            .compile(&ctx, input, signatures, public_keys)
+            .map_err(SigningError::from)
+    }
+}
diff --git a/rust/tw_any_coin/src/transaction_decoder.rs b/rust/tw_any_coin/src/transaction_decoder.rs
new file mode 100644
index 00000000000..13c40fd7512
--- /dev/null
+++ b/rust/tw_any_coin/src/transaction_decoder.rs
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::coin_dispatcher;
+use tw_memory::Data;
+
+pub struct TransactionDecoder;
+
+impl TransactionDecoder {
+    /// Decodes a transaction from a binary representation.
+    #[inline]
+    pub fn decode_transaction(coin: CoinType, tx: &[u8]) -> SigningResult<Data> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry.decode_transaction(&ctx, tx)
+    }
+}
diff --git a/rust/tw_any_coin/src/transaction_util.rs b/rust/tw_any_coin/src/transaction_util.rs
new file mode 100644
index 00000000000..09032126f70
--- /dev/null
+++ b/rust/tw_any_coin/src/transaction_util.rs
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::coin_dispatcher;
+
+pub struct TransactionUtil;
+
+impl TransactionUtil {
+    /// Calculate the TX hash of a transaction.
+    #[inline]
+    pub fn calc_tx_hash(coin: CoinType, encoded_tx: &str) -> SigningResult<String> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry.calc_tx_hash(&ctx, encoded_tx)
+    }
+}
diff --git a/rust/tw_any_coin/src/wallet_connect_request.rs b/rust/tw_any_coin/src/wallet_connect_request.rs
new file mode 100644
index 00000000000..22099edad58
--- /dev/null
+++ b/rust/tw_any_coin/src/wallet_connect_request.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::coin_dispatcher;
+use tw_memory::Data;
+
+/// Represents a signer to sign transactions for any blockchain.
+pub struct WalletConnectRequest;
+
+impl WalletConnectRequest {
+    /// Parses the WalletConnect signing request as a `SigningInput`.
+    /// It is optional. Returns an error if the chain does not support WalletConnect signing.
+    #[inline]
+    pub fn parse(coin: CoinType, input: &[u8]) -> SigningResult<Data> {
+        let (ctx, entry) = coin_dispatcher(coin)?;
+        entry
+            .wallet_connect_parse_request(&ctx, input)
+            .map_err(SigningError::from)
+    }
+}
diff --git a/rust/tw_base58_address/Cargo.toml b/rust/tw_base58_address/Cargo.toml
new file mode 100644
index 00000000000..5a66c5ba6de
--- /dev/null
+++ b/rust/tw_base58_address/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "tw_base58_address"
+version = "0.1.0"
+edition = "2021"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+tw_coin_entry = { path = "../tw_coin_entry" }
+tw_encoding = { path = "../tw_encoding" }
+tw_hash = { path = "../tw_hash" }
diff --git a/rust/tw_base58_address/src/lib.rs b/rust/tw_base58_address/src/lib.rs
new file mode 100644
index 00000000000..80552ff6635
--- /dev/null
+++ b/rust/tw_base58_address/src/lib.rs
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use core::fmt;
+use std::convert::TryFrom;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base58;
+use tw_encoding::base58::Alphabet;
+use tw_hash::hasher::Hasher;
+
+#[derive(Debug, Clone, Eq, Hash, PartialEq)]
+pub struct Base58Address<const SIZE: usize, const CHECKSUM_SIZE: usize> {
+    pub bytes: [u8; SIZE],
+    pub address_str: String,
+    _phantom: PhantomData<[(); CHECKSUM_SIZE]>,
+}
+
+impl<const SIZE: usize, const CHECKSUM_SIZE: usize> Base58Address<SIZE, CHECKSUM_SIZE> {
+    pub fn from_str_with_alphabet(
+        s: &str,
+        alphabet: Alphabet,
+        hasher: Hasher,
+    ) -> AddressResult<Self> {
+        let bytes = base58::decode(s, alphabet).map_err(|_| AddressError::FromBase58Error)?;
+
+        if bytes.len() != SIZE + CHECKSUM_SIZE {
+            return Err(AddressError::InvalidChecksum);
+        }
+        let (addr_bytes, checksum) = bytes.split_at(SIZE);
+
+        // Validate the checksum.
+        if checksum != calculate_checksum::<CHECKSUM_SIZE>(addr_bytes, hasher)? {
+            return Err(AddressError::InvalidChecksum);
+        }
+
+        Self::new(addr_bytes, alphabet, hasher)
+    }
+
+    pub fn new(bytes: &[u8], alphabet: Alphabet, hasher: Hasher) -> AddressResult<Self> {
+        let bytes: [u8; SIZE] = TryFrom::try_from(bytes).map_err(|_| AddressError::InvalidInput)?;
+        let checksum = calculate_checksum::<CHECKSUM_SIZE>(&bytes, hasher)?;
+
+        let mut bytes_with_checksum = Vec::with_capacity(SIZE + CHECKSUM_SIZE);
+        bytes_with_checksum.extend_from_slice(&bytes);
+        bytes_with_checksum.extend_from_slice(&checksum);
+        let address_str = base58::encode(&bytes_with_checksum, alphabet);
+
+        Ok(Base58Address {
+            bytes,
+            address_str,
+            _phantom: PhantomData,
+        })
+    }
+
+    pub fn has_prefix(&self, prefix: &[u8]) -> bool {
+        self.bytes.starts_with(prefix)
+    }
+}
+
+impl<const SIZE: usize, const CHECKSUM_SIZE: usize> AsRef<[u8]>
+    for Base58Address<SIZE, CHECKSUM_SIZE>
+{
+    fn as_ref(&self) -> &[u8] {
+        &self.bytes
+    }
+}
+
+impl<const SIZE: usize, const CHECKSUM_SIZE: usize> fmt::Display
+    for Base58Address<SIZE, CHECKSUM_SIZE>
+{
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.address_str)
+    }
+}
+
+// impl<const SIZE: usize, const CHECKSUM_SIZE: usize> Serialize
+//     for Base58Address<SIZE, CHECKSUM_SIZE>
+// {
+//     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+//     where
+//         S: Serializer,
+//     {
+//         self.to_string().serialize(serializer)
+//     }
+// }
+
+// /// Deserializes a `Base58Address<SIZE>` with Bitcoin alphabet.
+// pub fn deserialize_with_bitcoin_alph<'de, const SIZE: usize, const CHECKSUM_SIZE: usize, D>(
+//     deserializer: D,
+// ) -> Result<Base58Address<SIZE, CHECKSUM_SIZE>, D::Error>
+// where
+//     D: Deserializer<'de>,
+// {
+//     let s = String::deserialize(deserializer)?;
+//     Base58Address::<SIZE, CHECKSUM_SIZE>::from_str_with_alphabet(
+//         &s,
+//         Alphabet::Bitcoin,
+//         Hasher::Sha256d,
+//     )
+//     .map_err(|e| DeError::custom(format!("{e:?}")))
+// }
+
+pub fn calculate_checksum<const CHECKSUM_SIZE: usize>(
+    bytes: &[u8],
+    hasher: Hasher,
+) -> AddressResult<[u8; CHECKSUM_SIZE]> {
+    let checksum = hasher.hash(bytes);
+    TryFrom::try_from(&checksum[..CHECKSUM_SIZE]).map_err(|_| AddressError::InvalidChecksum)
+}
diff --git a/rust/tw_bech32_address/Cargo.toml b/rust/tw_bech32_address/Cargo.toml
new file mode 100644
index 00000000000..8650363cf9e
--- /dev/null
+++ b/rust/tw_bech32_address/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "tw_bech32_address"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+tw_coin_entry = { path = "../tw_coin_entry" }
+tw_encoding = { path = "../tw_encoding" }
+tw_hash = { path = "../tw_hash" }
+tw_keypair = { path = "../tw_keypair" }
+tw_memory = { path = "../tw_memory" }
diff --git a/rust/tw_bech32_address/src/bech32_prefix.rs b/rust/tw_bech32_address/src/bech32_prefix.rs
new file mode 100644
index 00000000000..f9e74351264
--- /dev/null
+++ b/rust/tw_bech32_address/src/bech32_prefix.rs
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::prefix::AddressPrefix;
+
+pub struct Bech32Prefix {
+    pub hrp: String,
+}
+
+impl TryFrom<AddressPrefix> for Bech32Prefix {
+    type Error = AddressError;
+
+    fn try_from(prefix: AddressPrefix) -> Result<Self, Self::Error> {
+        match prefix {
+            AddressPrefix::Hrp(hrp) => Ok(Bech32Prefix { hrp }),
+            _ => Err(AddressError::UnexpectedAddressPrefix),
+        }
+    }
+}
diff --git a/rust/tw_bech32_address/src/lib.rs b/rust/tw_bech32_address/src/lib.rs
new file mode 100644
index 00000000000..220fe1a1b77
--- /dev/null
+++ b/rust/tw_bech32_address/src/lib.rs
@@ -0,0 +1,465 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::bech32_prefix::Bech32Prefix;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::bech32;
+use tw_hash::hasher::Hasher;
+use tw_hash::H160;
+use tw_keypair::tw::{PrivateKey, PublicKey, PublicKeyType};
+use tw_memory::Data;
+
+pub mod bech32_prefix;
+
+#[derive(PartialEq)]
+pub struct Bech32Address {
+    hrp: String,
+    key_hash: Data,
+    /// An address string created from this `hrp` and `key_hash`.
+    address_str: String,
+}
+
+impl Bech32Address {
+    pub fn new(hrp: String, key_hash: Data) -> AddressResult<Bech32Address> {
+        let address_str = bech32::encode(&hrp, &key_hash).map_err(|_| AddressError::InvalidHrp)?;
+        Ok(Bech32Address {
+            hrp,
+            key_hash,
+            address_str,
+        })
+    }
+
+    pub fn with_public_key_hasher(
+        hrp: String,
+        public_key: &PublicKey,
+        hasher: Hasher,
+    ) -> AddressResult<Bech32Address> {
+        let public_key_bytes = match public_key.public_key_type() {
+            // If the public key is extended, skips the first byte (Evmos specific).
+            // https://github.com/trustwallet/wallet-core/blob/d67078daa580b37063c97be66a625aaee9664882/src/Bech32Address.cpp#L61-L64
+            PublicKeyType::Secp256k1Extended => public_key
+                .to_secp256k1()
+                .ok_or(AddressError::PublicKeyTypeMismatch)?
+                .uncompressed_without_prefix()
+                .to_vec(),
+            _ => public_key.to_bytes(),
+        };
+
+        let public_key_hash = hasher.hash(&public_key_bytes);
+        if public_key_hash.len() < H160::LEN {
+            return Err(AddressError::UnexpectedHasher);
+        }
+
+        let (_skipped_bytes, key_bytes) =
+            public_key_hash.split_at(public_key_hash.len() - H160::LEN);
+        Bech32Address::new(hrp, key_bytes.to_vec())
+    }
+
+    pub fn with_public_key_coin_context(
+        coin: &dyn CoinContext,
+        public_key: &PublicKey,
+        prefix: Option<Bech32Prefix>,
+    ) -> AddressResult<Bech32Address> {
+        let hrp = match prefix {
+            Some(Bech32Prefix { hrp }) => hrp,
+            None => coin.hrp().ok_or(AddressError::InvalidHrp)?,
+        };
+        let address_hasher = coin
+            .address_hasher()
+            .ok_or(AddressError::UnexpectedHasher)?;
+        Self::with_public_key_hasher(hrp, public_key, address_hasher)
+    }
+
+    pub fn with_private_key_coin_context(
+        coin: &dyn CoinContext,
+        private_key: &PrivateKey,
+    ) -> AddressResult<Bech32Address> {
+        let hrp = coin.hrp().ok_or(AddressError::InvalidHrp)?;
+        let public_key_type = coin.public_key_type();
+        let public_key = private_key
+            .get_public_key_by_type(public_key_type)
+            .map_err(|_| AddressError::PublicKeyTypeMismatch)?;
+        let address_hasher = coin
+            .address_hasher()
+            .ok_or(AddressError::UnexpectedHasher)?;
+        Bech32Address::with_public_key_hasher(hrp, &public_key, address_hasher)
+    }
+
+    pub fn from_str_checked<I>(
+        possible_hrps: I,
+        address_str: String,
+    ) -> AddressResult<Bech32Address>
+    where
+        I: IntoIterator<Item = String>,
+    {
+        let bech32::Decoded { hrp, bytes } =
+            bech32::decode(&address_str).map_err(|_| AddressError::InvalidInput)?;
+        // Try to find at least one hrp matches the actual value.
+        // Copied from the legacy Bech32Address.cpp:
+        // https://github.com/trustwallet/wallet-core/blob/d67078daa580b37063c97be66a625aaee9664882/src/Bech32Address.cpp#L21
+        if !possible_hrps
+            .into_iter()
+            .any(|possible_hrp| hrp.starts_with(&possible_hrp))
+        {
+            return Err(AddressError::InvalidHrp);
+        }
+        Ok(Bech32Address {
+            hrp,
+            key_hash: bytes,
+            address_str,
+        })
+    }
+
+    pub fn from_str_with_coin_and_prefix(
+        coin: &dyn CoinContext,
+        address_str: String,
+        prefix: Option<Bech32Prefix>,
+    ) -> AddressResult<Bech32Address> {
+        let hrp = match prefix {
+            Some(Bech32Prefix { hrp }) => hrp,
+            None => coin.hrp().ok_or(AddressError::InvalidHrp)?,
+        };
+        Self::from_str_checked([hrp], address_str)
+    }
+
+    pub fn from_key_hash_with_coin(
+        coin: &dyn CoinContext,
+        key_hash: Data,
+    ) -> AddressResult<Bech32Address> {
+        let hrp = coin.hrp().ok_or(AddressError::InvalidHrp)?;
+        Bech32Address::new(hrp, key_hash)
+    }
+
+    pub fn key_hash(&self) -> &[u8] {
+        &self.key_hash
+    }
+
+    pub fn hrp(&self) -> &str {
+        &self.hrp
+    }
+}
+
+impl CoinAddress for Bech32Address {
+    fn data(&self) -> Data {
+        self.key_hash.to_vec()
+    }
+}
+
+impl FromStr for Bech32Address {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let bech32::Decoded { hrp, bytes } =
+            bech32::decode(s).map_err(|_| AddressError::InvalidInput)?;
+        Ok(Bech32Address {
+            hrp,
+            key_hash: bytes,
+            address_str: s.to_string(),
+        })
+    }
+}
+
+impl fmt::Display for Bech32Address {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.address_str)
+    }
+}
+
+impl fmt::Debug for Bech32Address {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{self}")
+    }
+}
+
+impl<'de> Deserialize<'de> for Bech32Address {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        use serde::de::Error as DeError;
+
+        let address_str = String::deserialize(deserializer)?;
+        Bech32Address::from_str(&address_str).map_err(|e| DeError::custom(format!("{e:?}")))
+    }
+}
+
+impl Serialize for Bech32Address {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&self.to_string())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex::{DecodeHex, ToHex};
+
+    struct FromPublicKeyTestInput<'a> {
+        hrp: &'a str,
+        private_key: &'a str,
+        public_key_type: PublicKeyType,
+        hasher: Hasher,
+        expected: &'a str,
+    }
+
+    fn test_from_public_key(input: FromPublicKeyTestInput<'_>) {
+        let private_key = PrivateKey::new(input.private_key.decode_hex().unwrap()).unwrap();
+        let public_key = private_key
+            .get_public_key_by_type(input.public_key_type)
+            .unwrap();
+        let actual =
+            Bech32Address::with_public_key_hasher(input.hrp.to_string(), &public_key, input.hasher)
+                .unwrap();
+        assert_eq!(actual.to_string(), input.expected);
+    }
+
+    #[test]
+    fn test_address_from_str_checked_valid() {
+        fn test_impl(addr: &str, hrp: &str) {
+            Bech32Address::from_str_checked([hrp.to_string()], addr.to_string())
+                .unwrap_or_else(|e| panic!("ERROR={:?}: hrp={} addr={}", e, hrp, addr));
+        }
+
+        test_impl("bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2", "bnb");
+
+        test_impl("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02", "cosmos");
+        test_impl(
+            "cosmospub1addwnpepqftjsmkr7d7nx4tmhw4qqze8w39vjq364xt8etn45xqarlu3l2wu2n7pgrq",
+            "cosmos",
+        );
+        test_impl(
+            "cosmosvaloper1sxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08",
+            "cosmos",
+        );
+        test_impl(
+            "cosmosvalconspub1zcjduepqjnnwe2jsywv0kfc97pz04zkm7tc9k2437cde2my3y5js9t7cw9mstfg3sa",
+            "cosmos",
+        );
+
+        test_impl("one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe", "one");
+        test_impl("one1tp7xdd9ewwnmyvws96au0e7e7mz6f8hjqr3g3p", "one");
+
+        test_impl("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j", "io");
+
+        test_impl("zil1fwh4ltdguhde9s7nysnp33d5wye6uqpugufkz7", "zil");
+
+        test_impl(
+            "erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz",
+            "erd",
+        );
+        test_impl(
+            "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35r",
+            "erd",
+        );
+        test_impl(
+            "erd19nu5t7hszckwah5nlcadmk5rlchtugzplznskffpwecygcu0520s9tnyy0",
+            "erd",
+        );
+
+        // uppercase version
+        test_impl("BNB1GRPF0955H0YKZQ3AR5NMUM7Y6GDFL6LXFN46H2", "bnb");
+    }
+
+    #[test]
+    fn test_address_from_str_checked_invalid() {
+        fn test_impl(addr: &str, hrp: &str) {
+            Bech32Address::from_str_checked([hrp.to_string()], addr.to_string())
+                .expect_err(&format!("hrp={} addr={}", hrp, addr));
+        }
+
+        // 1-char diff
+        test_impl("bnb1grpf0955h0ykzq3ar6nmum7y6gdfl6lxfn46h2", "bnb");
+        // mixed case
+        test_impl("bnb1grPF0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2", "bnb");
+
+        test_impl("cosmos1xsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02", "cosmos");
+        test_impl(
+            "cosmospub1xddwnpepqftjsmkr7d7nx4tmhw4qqze8w39vjq364xt8etn45xqarlu3l2wu2n7pgrq",
+            "cosmos",
+        );
+        test_impl(
+            "cosmosvaloper1xxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08",
+            "cosmos",
+        );
+        test_impl(
+            "cosmosvalconspub1xcjduepqjnnwe2jsywv0kfc97pz04zkm7tc9k2437cde2my3y5js9t7cw9mstfg3sa",
+            "cosmos",
+        );
+
+        test_impl("one1a50tun737ulcvwy0yvve0pe", "one");
+        test_impl("oe1tp7xdd9ewwnmyvws96au0ee7e7mz6f8hjqr3g3p", "one");
+
+        test_impl("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8", "io");
+        test_impl("io187wzp08vnhjpkydnr97qlh8kh0dpkkytfam8j", "io");
+        test_impl("it187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j", "io");
+
+        test_impl("", "erd");
+        test_impl(
+            "erd1cux02zersde0l7hhklzhywcxk4u9n4py5tdxyx7vrvhnza2r4gmq4vw35!",
+            "erd",
+        );
+        test_impl(
+            "xerd19nu5t7hszckwah5nlcadmk5rlchtugzplznskffpwecygcu0520s9tnyy0",
+            "erd",
+        );
+    }
+
+    #[test]
+    fn test_decode() {
+        fn test_impl(addr: &str, hrp: &str, expected_hash: &str) {
+            let actual =
+                Bech32Address::from_str_checked([hrp.to_string()], addr.to_string()).unwrap();
+            assert_eq!(actual.key_hash.to_hex(), expected_hash);
+        }
+
+        test_impl(
+            "one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe",
+            "one",
+            "ed1ebe4fd1f73f86388f231997859ca42c07da5d",
+        );
+
+        test_impl(
+            "io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j",
+            "io",
+            "3f9c20bcec9de520d88d98cbe07ee7b5ded0dac4",
+        );
+    }
+
+    #[test]
+    fn test_from_hrp_and_hash() {
+        fn test_impl(hrp: &str, key_hash: &str, expected_addr: &str) {
+            let actual =
+                Bech32Address::new(hrp.to_string(), key_hash.decode_hex().unwrap()).unwrap();
+            assert_eq!(actual.to_string(), expected_addr);
+        }
+
+        test_impl(
+            "bnb",
+            "b6561dcc104130059a7c08f48c64610c1f6f9064",
+            "bnb1ketpmnqsgycqtxnupr6gcerpps0klyryuudz05",
+        );
+        test_impl(
+            "one",
+            "587c66b4b973a7b231d02ebbc7e7d9f6c5a49ef2",
+            "one1tp7xdd9ewwnmyvws96au0e7e7mz6f8hjqr3g3p",
+        );
+        test_impl(
+            "zil",
+            "0x91cdDcEBE846ce4d47712287EEe53cF17c2cfB77",
+            "zil1j8xae6lggm8y63m3y2r7aefu797ze7mhzulnqg",
+        );
+        test_impl(
+            "zil",
+            "1d19918a737306218b5cbb3241fcdcbd998c3a72",
+            "zil1r5verznnwvrzrz6uhveyrlxuhkvccwnju4aehf",
+        );
+    }
+
+    #[test]
+    fn test_from_hrp_and_public_key_hasher() {
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "bnb",
+            private_key: "95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832",
+            public_key_type: PublicKeyType::Secp256k1,
+            hasher: Hasher::Sha256ripemd,
+            expected: "bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2",
+        });
+
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "cosmos",
+            private_key: "80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005",
+            public_key_type: PublicKeyType::Secp256k1,
+            hasher: Hasher::Sha256ripemd,
+            expected: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02",
+        });
+
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "one",
+            private_key: "e2f88b4974ae763ca1c2db49218802c2e441293a09eaa9ab681779e05d1b7b94",
+            public_key_type: PublicKeyType::Secp256k1Extended,
+            hasher: Hasher::Keccak256,
+            expected: "one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe",
+        });
+
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "io",
+            private_key: "0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f",
+            public_key_type: PublicKeyType::Secp256k1Extended,
+            hasher: Hasher::Keccak256,
+            expected: "io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j",
+        });
+
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "zil",
+            private_key: "3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6",
+            public_key_type: PublicKeyType::Secp256k1,
+            hasher: Hasher::Sha256,
+            expected: "zil1j8xae6lggm8y63m3y2r7aefu797ze7mhzulnqg",
+        });
+    }
+
+    /// From same public key, but different hashes: different results.
+    #[test]
+    fn test_different_hashes() {
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "hrp",
+            private_key: "3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6",
+            public_key_type: PublicKeyType::Secp256k1,
+            hasher: Hasher::Sha256ripemd,
+            expected: "hrp186zwn9h0z9fyvwfqs4jl92cw3kexusm4xw6ptp",
+        });
+
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "hrp",
+            private_key: "3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6",
+            public_key_type: PublicKeyType::Secp256k1,
+            hasher: Hasher::Sha256,
+            expected: "hrp1j8xae6lggm8y63m3y2r7aefu797ze7mhgfetvu",
+        });
+
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "hrp",
+            private_key: "3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6",
+            public_key_type: PublicKeyType::Secp256k1Extended,
+            hasher: Hasher::Keccak256,
+            expected: "hrp17hff3s97m5uxpjcdq3nzqxxatt8cmumnsf03su",
+        });
+    }
+
+    /// From same public key, but different prefixes: different results (checksum).
+    #[test]
+    fn test_different_hrp() {
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "hrpone",
+            private_key: "3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6",
+            public_key_type: PublicKeyType::Secp256k1,
+            hasher: Hasher::Sha256ripemd,
+            expected: "hrpone186zwn9h0z9fyvwfqs4jl92cw3kexusm47das6p",
+        });
+
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "hrptwo",
+            private_key: "3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6",
+            public_key_type: PublicKeyType::Secp256k1,
+            hasher: Hasher::Sha256ripemd,
+            expected: "hrptwo186zwn9h0z9fyvwfqs4jl92cw3kexusm4qzr8p7",
+        });
+
+        test_from_public_key(FromPublicKeyTestInput {
+            hrp: "hrpthree",
+            private_key: "3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6",
+            public_key_type: PublicKeyType::Secp256k1,
+            hasher: Hasher::Sha256ripemd,
+            expected: "hrpthree186zwn9h0z9fyvwfqs4jl92cw3kexusm4wuqkvd",
+        });
+    }
+}
diff --git a/rust/tw_coin_entry/Cargo.toml b/rust/tw_coin_entry/Cargo.toml
new file mode 100644
index 00000000000..47e9c30a534
--- /dev/null
+++ b/rust/tw_coin_entry/Cargo.toml
@@ -0,0 +1,19 @@
+[package]
+name = "tw_coin_entry"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+derivation-path = "0.2"
+serde = "1.0"
+serde_json = "1.0"
+tw_encoding = { path = "../tw_encoding" }
+tw_hash = { path = "../tw_hash" }
+tw_keypair = { path = "../tw_keypair" }
+tw_memory = { path = "../tw_memory" }
+tw_misc = { path = "../tw_misc" }
+tw_number = { path = "../tw_number" }
+tw_proto = { path = "../tw_proto" }
+
+[features]
+test-utils = []
diff --git a/rust/tw_coin_entry/src/coin_context.rs b/rust/tw_coin_entry/src/coin_context.rs
new file mode 100644
index 00000000000..c9952aa4eb5
--- /dev/null
+++ b/rust/tw_coin_entry/src/coin_context.rs
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::derivation::DerivationWithPath;
+use tw_hash::hasher::Hasher;
+use tw_keypair::tw::PublicKeyType;
+
+/// Extend the trait with methods required for blockchain additions.
+pub trait CoinContext {
+    /// Necessary chain property.
+    fn public_key_type(&self) -> PublicKeyType;
+
+    /// Optional chain property.
+    fn address_hasher(&self) -> Option<Hasher>;
+
+    /// Optional chain property.
+    fn hrp(&self) -> Option<String>;
+
+    /// Optional p2pkh prefix (Bitcoin specific).
+    fn p2pkh_prefix(&self) -> Option<u8>;
+
+    /// Optional p2sh prefix (Bitcoin specific).
+    fn p2sh_prefix(&self) -> Option<u8>;
+
+    /// Returns coin derivations.
+    fn derivations(&self) -> &[DerivationWithPath];
+}
diff --git a/rust/tw_coin_entry/src/coin_entry.rs b/rust/tw_coin_entry/src/coin_entry.rs
new file mode 100644
index 00000000000..b3a23671893
--- /dev/null
+++ b/rust/tw_coin_entry/src/coin_entry.rs
@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use crate::derivation::Derivation;
+use crate::error::prelude::*;
+use crate::modules::json_signer::JsonSigner;
+use crate::modules::plan_builder::PlanBuilder;
+use crate::prefix::Prefix;
+use std::fmt;
+use tw_keypair::tw::PublicKey;
+use tw_memory::Data;
+use tw_proto::{MessageRead, MessageWrite};
+
+use crate::modules::message_signer::MessageSigner;
+use crate::modules::transaction_decoder::TransactionDecoder;
+use crate::modules::transaction_util::TransactionUtil;
+use crate::modules::wallet_connector::WalletConnector;
+pub use tw_proto::{ProtoError, ProtoResult};
+
+pub type PrivateKeyBytes = Data;
+pub type SignatureBytes = Data;
+pub type PublicKeyBytes = Data;
+
+pub trait CoinAddress: fmt::Display {
+    fn data(&self) -> Data;
+}
+
+/// The main coin entry trait. It is responsible for address management and the transaction signing.
+///
+/// # Maintaining
+///
+/// Please sync them with the code generator template if there is need to make any changes in this trait
+/// (e.g adding/deleting a method or an associated type):
+/// https://github.com/trustwallet/wallet-core/blob/master/codegen-v2/src/codegen/rust/templates/blockchain_crate/entry.rs
+pub trait CoinEntry {
+    /// Address prefix that is used to derive or validate an address for a different network.
+    /// It can be a Bech32 HRP prefix, or p2pkh/p2sh Base58 prefix, or even a set of different address prefixes.
+    /// **Optional**. Use `NoPrefix` if the blockchain does not support any address prefixes.
+    type AddressPrefix: Prefix;
+    /// Address type that should be parsable from a string and have other required methods.
+    type Address: CoinAddress;
+    /// Protobuf message that provides the information about a transaction to be generated and signed.
+    type SigningInput<'a>: MessageRead<'a> + MessageWrite;
+    /// Protobuf message - result of the request to sign or compile a transaction.
+    /// Contains a serialized transaction or an error if occurred.
+    type SigningOutput: MessageWrite;
+    /// Protobuf message - result of the request to obtain a transaction preimage hashes.
+    type PreSigningOutput: MessageWrite;
+
+    /// Not supported at this moment.
+    /// Use `NoJsonSigner`.
+    type JsonSigner: JsonSigner;
+    /// Transaction Planner - the module provides transaction planning functionality.
+    /// Used mostly in Bitcoin and UTXO-based chains.
+    ///
+    /// **Optional**. Use `NoPlanBuilder` if the blockchain does not support transaction planning.
+    type PlanBuilder: PlanBuilder;
+    /// Message Signer - the module provides regular message signing functionality.
+    ///
+    /// **Optional**. Use `NoMessageSigner` if the blockchain does not support message signing.
+    type MessageSigner: MessageSigner;
+    /// WalletConnect Connector - the module allows to parse transactions received in WalletConnect format.
+    ///
+    /// **Optional**. Use `NoWalletConnector` if the blockchain does not support WalletConnect transactions.
+    type WalletConnector: WalletConnector;
+    /// TransactionDecoder - the module allows to decode transactions from binary representation.
+    ///
+    /// **Optional**. Use `NoTransactionDecoder` if the blockchain does not support transaction decoding yet.
+    type TransactionDecoder: TransactionDecoder;
+
+    type TransactionUtil: TransactionUtil;
+
+    /// Tries to parse `Self::Address` from the given `address` string by `coin` type and address `prefix`.
+    fn parse_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address>;
+
+    /// Tries to parse `Self::Address` from the given `address` string by `coin` type.
+    /// Please note that this method does not check if the address belongs to the given chain.
+    fn parse_address_unchecked(&self, address: &str) -> AddressResult<Self::Address>;
+
+    /// Derives an address associated with the given `public_key` by `coin` context, `derivation` and address `prefix`.
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: PublicKey,
+        derivation: Derivation,
+        prefix: Option<Self::AddressPrefix>,
+    ) -> AddressResult<Self::Address>;
+
+    /// Signs a transaction declared as the given `input`.
+    fn sign(&self, coin: &dyn CoinContext, input: Self::SigningInput<'_>) -> Self::SigningOutput;
+
+    /// Returns hash(es) for signing, needed for external signing.
+    fn preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+    ) -> Self::PreSigningOutput;
+
+    /// Compiles a transaction with externally-supplied `signatures` and `public_keys`.
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Self::SigningOutput;
+
+    /// It is optional, Signing JSON input with private key.
+    /// Returns `Ok(None)` if the chain doesn't support signing JSON.
+    #[inline]
+    fn json_signer(&self) -> Option<Self::JsonSigner> {
+        None
+    }
+
+    /// Planning, for UTXO chains, in preparation for signing.
+    /// Returns an optional `Plan` builder. Only UTXO chains need it.
+    #[inline]
+    fn plan_builder(&self) -> Option<Self::PlanBuilder> {
+        None
+    }
+
+    /// It is optional, Signing regular messages.
+    /// Returns `Ok(None)` if the chain doesn't support regular message signing.
+    #[inline]
+    fn message_signer(&self) -> Option<Self::MessageSigner> {
+        None
+    }
+
+    /// It is optional, Parsing signing requests received through WalletConnect.
+    /// Returns `Ok(None)` if the blockchain does not support WalletConnect transactions.
+    #[inline]
+    fn wallet_connector(&self) -> Option<Self::WalletConnector> {
+        None
+    }
+
+    /// It is optional, Transaction decoding.
+    /// Returns `Ok(None)` if the blockchain does not support transaction decoding yet.
+    #[inline]
+    fn transaction_decoder(&self) -> Option<Self::TransactionDecoder> {
+        None
+    }
+
+    /// It is optional, Transaction util, for example, calculating the TX hash of a transaction.
+    /// Returns `Ok(None)` if the blockchain does not support transaction util yet.
+    #[inline]
+    fn transaction_util(&self) -> Option<Self::TransactionUtil> {
+        None
+    }
+}
diff --git a/rust/tw_coin_entry/src/coin_entry_ext.rs b/rust/tw_coin_entry/src/coin_entry_ext.rs
new file mode 100644
index 00000000000..05976df99ef
--- /dev/null
+++ b/rust/tw_coin_entry/src/coin_entry_ext.rs
@@ -0,0 +1,276 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use crate::coin_entry::{CoinAddress, CoinEntry, PublicKeyBytes, SignatureBytes};
+use crate::derivation::Derivation;
+use crate::error::prelude::*;
+use crate::modules::json_signer::JsonSigner;
+use crate::modules::message_signer::MessageSigner;
+use crate::modules::plan_builder::PlanBuilder;
+use crate::modules::transaction_decoder::TransactionDecoder;
+use crate::modules::transaction_util::TransactionUtil;
+use crate::modules::wallet_connector::WalletConnector;
+use crate::prefix::AddressPrefix;
+use tw_keypair::tw::{PrivateKey, PublicKey};
+use tw_memory::Data;
+use tw_proto::WalletConnect::Proto as WCProto;
+use tw_proto::{deserialize, serialize, ProtoResult};
+
+pub type PrivateKeyBytes = Data;
+
+/// The [`CoinEntry`] trait extension.
+pub trait CoinEntryExt {
+    fn validate_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<AddressPrefix>,
+    ) -> AddressResult<()>;
+
+    /// Validates and normalizes the given `address`.
+    fn normalize_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<AddressPrefix>,
+    ) -> AddressResult<String>;
+
+    /// Normalizes the given `address` without checking its belonging to the `coin` network.
+    fn normalize_address_unchecked(&self, address: &str) -> AddressResult<String>;
+
+    /// Derives an address associated with the given `public_key` by `coin` context, `derivation` and address `prefix`.
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: PublicKey,
+        derivation: Derivation,
+        prefix: Option<AddressPrefix>,
+    ) -> AddressResult<String>;
+
+    /// Returns underlying data (public key or key hash).
+    fn address_to_data(&self, address: &str) -> AddressResult<Data>;
+
+    /// Signs a transaction declared as the given `input`.
+    fn sign(&self, coin: &dyn CoinContext, input: &[u8]) -> ProtoResult<Data>;
+
+    /// Returns `true` if the chain supports JSON signing.
+    fn supports_json_signing(&self) -> bool;
+
+    /// Signs a transaction specified by the JSON representation of signing input and a private key.
+    /// Returns the JSON representation of the signing output if the blockchain supports JSON signing.
+    /// Checks [`CoinEntryExt::supports_json_signing`].
+    fn sign_json(
+        &self,
+        coin: &dyn CoinContext,
+        input_json: &str,
+        private_key: PrivateKeyBytes,
+    ) -> SigningResult<String>;
+
+    /// Returns hash(es) for signing, needed for external signing.
+    /// It will return a proto object named `PreSigningOutput` which will include hash.
+    /// We provide a default `PreSigningOutput` in TransactionCompiler.proto.
+    fn preimage_hashes(&self, coin: &dyn CoinContext, input: &[u8]) -> ProtoResult<Data>;
+
+    /// Compiles a transaction with externally-supplied `signatures` and `public_keys`.
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: &[u8],
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> ProtoResult<Data>;
+
+    /// Plans a transaction (for UTXO chains only).
+    fn plan(&self, coin: &dyn CoinContext, input: &[u8]) -> SigningResult<Data>;
+
+    /// Signs a message.
+    fn sign_message(&self, coin: &dyn CoinContext, input: &[u8]) -> SigningResult<Data>;
+
+    /// Computes preimage hashes of a message.
+    fn message_preimage_hashes(&self, coin: &dyn CoinContext, input: &[u8]) -> SigningResult<Data>;
+
+    /// Verifies a signature for a message.
+    fn verify_message(&self, coin: &dyn CoinContext, input: &[u8]) -> SigningResult<bool>;
+
+    /// Signs a transaction in WalletConnect format.
+    fn wallet_connect_parse_request(
+        &self,
+        coin: &dyn CoinContext,
+        input: &[u8],
+    ) -> SigningResult<Data>;
+
+    /// Decodes a transaction from binary representation.
+    fn decode_transaction(&self, coin: &dyn CoinContext, tx: &[u8]) -> SigningResult<Data>;
+
+    /// Calculate the TX hash of a transaction.
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String>;
+}
+
+impl<T> CoinEntryExt for T
+where
+    T: CoinEntry,
+{
+    fn validate_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<AddressPrefix>,
+    ) -> AddressResult<()> {
+        let prefix = prefix.map(T::AddressPrefix::try_from).transpose()?;
+        self.parse_address(coin, address, prefix).map(|_| ())
+    }
+
+    fn normalize_address(
+        &self,
+        coin: &dyn CoinContext,
+        address: &str,
+        prefix: Option<AddressPrefix>,
+    ) -> AddressResult<String> {
+        let prefix = prefix.map(T::AddressPrefix::try_from).transpose()?;
+        // Parse the address and display it.
+        // Please note that `Self::Address::to_string()` returns a normalize address.
+        <Self as CoinEntry>::parse_address(self, coin, address, prefix).map(|addr| addr.to_string())
+    }
+
+    fn normalize_address_unchecked(&self, address: &str) -> AddressResult<String> {
+        // Parse the address and display it.
+        // Please note that `Self::Address::to_string()` returns a normalize address.
+        <Self as CoinEntry>::parse_address_unchecked(self, address).map(|addr| addr.to_string())
+    }
+
+    fn derive_address(
+        &self,
+        coin: &dyn CoinContext,
+        public_key: PublicKey,
+        derivation: Derivation,
+        prefix: Option<AddressPrefix>,
+    ) -> AddressResult<String> {
+        let prefix = prefix
+            .map(<Self as CoinEntry>::AddressPrefix::try_from)
+            .transpose()?;
+        <Self as CoinEntry>::derive_address(self, coin, public_key, derivation, prefix)
+            .map(|addr| addr.to_string())
+    }
+
+    fn address_to_data(&self, address: &str) -> AddressResult<Data> {
+        self.parse_address_unchecked(address)
+            .map(|addr| addr.data())
+    }
+
+    fn sign(&self, coin: &dyn CoinContext, input: &[u8]) -> ProtoResult<Data> {
+        let input: T::SigningInput<'_> = deserialize(input)?;
+        let output = <Self as CoinEntry>::sign(self, coin, input);
+        serialize(&output)
+    }
+
+    fn supports_json_signing(&self) -> bool {
+        self.json_signer().is_some()
+    }
+
+    fn sign_json(
+        &self,
+        coin: &dyn CoinContext,
+        input_json: &str,
+        private_key: PrivateKeyBytes,
+    ) -> SigningResult<String> {
+        let Some(json_signer) = self.json_signer() else {
+            return TWError::err(SigningErrorType::Error_not_supported);
+        };
+
+        let private_key = PrivateKey::new(private_key)?;
+        json_signer.sign_json(coin, input_json, &private_key)
+    }
+
+    fn preimage_hashes(&self, coin: &dyn CoinContext, input: &[u8]) -> ProtoResult<Data> {
+        let input: T::SigningInput<'_> = deserialize(input)?;
+        let output = <Self as CoinEntry>::preimage_hashes(self, coin, input);
+        serialize(&output)
+    }
+
+    fn compile(
+        &self,
+        coin: &dyn CoinContext,
+        input: &[u8],
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> ProtoResult<Data> {
+        let input: T::SigningInput<'_> = deserialize(input)?;
+        let output = self.compile(coin, input, signatures, public_keys);
+        serialize(&output)
+    }
+
+    fn plan(&self, coin: &dyn CoinContext, input: &[u8]) -> SigningResult<Data> {
+        let Some(plan_builder) = self.plan_builder() else {
+            return TWError::err(SigningErrorType::Error_not_supported);
+        };
+
+        let input: <T::PlanBuilder as PlanBuilder>::SigningInput<'_> = deserialize(input)?;
+        let output = plan_builder.plan(coin, &input);
+        serialize(&output).map_err(SigningError::from)
+    }
+
+    fn sign_message(&self, coin: &dyn CoinContext, input: &[u8]) -> SigningResult<Data> {
+        let Some(message_signer) = self.message_signer() else {
+            return TWError::err(SigningErrorType::Error_not_supported);
+        };
+
+        let input: <T::MessageSigner as MessageSigner>::MessageSigningInput<'_> =
+            deserialize(input)?;
+        let output = message_signer.sign_message(coin, input);
+        serialize(&output).map_err(SigningError::from)
+    }
+
+    fn message_preimage_hashes(&self, coin: &dyn CoinContext, input: &[u8]) -> SigningResult<Data> {
+        let Some(message_signer) = self.message_signer() else {
+            return TWError::err(SigningErrorType::Error_not_supported);
+        };
+
+        let input: <T::MessageSigner as MessageSigner>::MessageSigningInput<'_> =
+            deserialize(input)?;
+        let output = message_signer.message_preimage_hashes(coin, input);
+        serialize(&output).map_err(SigningError::from)
+    }
+
+    fn verify_message(&self, coin: &dyn CoinContext, input: &[u8]) -> SigningResult<bool> {
+        let Some(message_signer) = self.message_signer() else {
+            return TWError::err(SigningErrorType::Error_not_supported);
+        };
+
+        let input: <T::MessageSigner as MessageSigner>::MessageVerifyingInput<'_> =
+            deserialize(input)?;
+        Ok(message_signer.verify_message(coin, input))
+    }
+
+    fn wallet_connect_parse_request(
+        &self,
+        coin: &dyn CoinContext,
+        input: &[u8],
+    ) -> SigningResult<Data> {
+        let Some(wc_connector) = self.wallet_connector() else {
+            return TWError::err(SigningErrorType::Error_not_supported);
+        };
+
+        let input: WCProto::ParseRequestInput = deserialize(input)?;
+        let output = wc_connector.parse_request(coin, input);
+        serialize(&output).map_err(SigningError::from)
+    }
+
+    fn decode_transaction(&self, coin: &dyn CoinContext, tx: &[u8]) -> SigningResult<Data> {
+        let Some(tx_decoder) = self.transaction_decoder() else {
+            return TWError::err(SigningErrorType::Error_not_supported);
+        };
+
+        let output = tx_decoder.decode_transaction(coin, tx);
+        serialize(&output).map_err(SigningError::from)
+    }
+
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        let Some(tx_util) = self.transaction_util() else {
+            return TWError::err(SigningErrorType::Error_not_supported);
+        };
+
+        tx_util.calc_tx_hash(coin, encoded_tx)
+    }
+}
diff --git a/rust/tw_coin_entry/src/common/compile_input.rs b/rust/tw_coin_entry/src/common/compile_input.rs
new file mode 100644
index 00000000000..27ce0318844
--- /dev/null
+++ b/rust/tw_coin_entry/src/common/compile_input.rs
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_entry::{PublicKeyBytes, SignatureBytes};
+use crate::error::prelude::*;
+
+pub struct SingleSignaturePubkey {
+    pub signature: SignatureBytes,
+    pub public_key: PublicKeyBytes,
+}
+
+impl SingleSignaturePubkey {
+    pub fn from_sign_pubkey_list(
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Self> {
+        if signatures.len() > 1 || public_keys.len() > 1 {
+            return TWError::err(SigningErrorType::Error_no_support_n2n)
+                .context("Expected exactly one signature and public key");
+        }
+
+        let signature = signatures
+            .into_iter()
+            .next()
+            .or_tw_err(SigningErrorType::Error_signatures_count)
+            .context("Expected exactly one signature and public key")?;
+        let public_key = public_keys
+            .into_iter()
+            .next()
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("Expected exactly one signature and public key")?;
+
+        Ok(SingleSignaturePubkey {
+            signature,
+            public_key,
+        })
+    }
+
+    pub fn from_sign_list(signatures: Vec<SignatureBytes>) -> SigningResult<Self> {
+        if signatures.len() > 1 {
+            return TWError::err(SigningErrorType::Error_no_support_n2n)
+                .context("Expected exactly one signature");
+        }
+
+        let signature = signatures
+            .into_iter()
+            .next()
+            .or_tw_err(SigningErrorType::Error_signatures_count)
+            .context("Expected exactly one signature")?;
+
+        Ok(SingleSignaturePubkey {
+            signature,
+            public_key: PublicKeyBytes::default(),
+        })
+    }
+}
diff --git a/rust/tw_coin_entry/src/common/mod.rs b/rust/tw_coin_entry/src/common/mod.rs
new file mode 100644
index 00000000000..f333903f3b8
--- /dev/null
+++ b/rust/tw_coin_entry/src/common/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod compile_input;
diff --git a/rust/tw_coin_entry/src/derivation.rs b/rust/tw_coin_entry/src/derivation.rs
new file mode 100644
index 00000000000..708880f4a2d
--- /dev/null
+++ b/rust/tw_coin_entry/src/derivation.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::de::Error as DeError;
+use serde::{Deserialize, Deserializer};
+use std::str::FromStr;
+
+pub use derivation_path::{ChildIndex, DerivationPath};
+
+#[derive(Clone, Deserialize)]
+pub struct DerivationWithPath {
+    #[serde(default)]
+    pub name: Derivation,
+    #[serde(deserialize_with = "deserialize_der_path")]
+    pub path: DerivationPath,
+}
+
+/// Extend this enum.
+#[derive(Clone, Copy, Default, Deserialize, Eq, PartialEq)]
+#[serde(rename_all = "lowercase")]
+pub enum Derivation {
+    Segwit,
+    Legacy,
+    Testnet,
+    Taproot,
+    /// Default derivation.
+    #[default]
+    #[serde(other)]
+    Default,
+}
+
+fn deserialize_der_path<'de, D>(deserializer: D) -> Result<DerivationPath, D::Error>
+where
+    D: Deserializer<'de>,
+{
+    let path = String::deserialize(deserializer)?;
+    DerivationPath::from_str(&path).map_err(|e| DeError::custom(e.to_string()))
+}
diff --git a/rust/tw_coin_entry/src/error/address_error.rs b/rust/tw_coin_entry/src/error/address_error.rs
new file mode 100644
index 00000000000..d49f307dada
--- /dev/null
+++ b/rust/tw_coin_entry/src/error/address_error.rs
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub type AddressResult<T> = Result<T, AddressError>;
+
+#[derive(Copy, Clone, Debug, Eq, PartialEq)]
+pub enum AddressError {
+    UnknownCoinType,
+    Unsupported,
+    MissingPrefix,
+    FromHexError,
+    FromBase58Error,
+    FromBase64Error,
+    FromBech32Error,
+    PublicKeyTypeMismatch,
+    UnexpectedAddressPrefix,
+    UnexpectedHasher,
+    InvalidHrp,
+    InvalidRegistry,
+    InvalidInput,
+    InvalidChecksum,
+    InvalidWitnessProgram,
+    Internal,
+}
diff --git a/rust/tw_coin_entry/src/error/impl_from.rs b/rust/tw_coin_entry/src/error/impl_from.rs
new file mode 100644
index 00000000000..12d95dddd82
--- /dev/null
+++ b/rust/tw_coin_entry/src/error/impl_from.rs
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::error::address_error::AddressError;
+use crate::error::prelude::*;
+use tw_encoding::EncodingError;
+use tw_keypair::KeyPairError;
+use tw_number::NumberError;
+use tw_proto::ProtoError;
+
+impl From<NumberError> for SigningError {
+    #[inline]
+    fn from(_err: NumberError) -> Self {
+        TWError::new(SigningErrorType::Error_invalid_params)
+    }
+}
+
+impl From<AddressError> for SigningError {
+    #[inline]
+    fn from(_err: AddressError) -> Self {
+        TWError::new(SigningErrorType::Error_invalid_address)
+    }
+}
+
+impl From<serde_json::Error> for SigningError {
+    fn from(_value: serde_json::Error) -> Self {
+        TWError::new(SigningErrorType::Error_input_parse)
+    }
+}
+
+impl From<EncodingError> for SigningError {
+    fn from(_e: EncodingError) -> Self {
+        TWError::new(SigningErrorType::Error_input_parse)
+    }
+}
+
+impl From<KeyPairError> for SigningError {
+    fn from(err: KeyPairError) -> Self {
+        match err {
+            KeyPairError::InvalidSecretKey => {
+                TWError::new(SigningErrorType::Error_invalid_private_key)
+            },
+            KeyPairError::InvalidPublicKey
+            | KeyPairError::InvalidSignature
+            | KeyPairError::InvalidSignMessage
+            | KeyPairError::SignatureVerifyError
+            | KeyPairError::InvalidEncryptedMessage => {
+                TWError::new(SigningErrorType::Error_invalid_params)
+            },
+            KeyPairError::SigningError => TWError::new(SigningErrorType::Error_signing),
+            KeyPairError::InternalError => TWError::new(SigningErrorType::Error_internal),
+        }
+    }
+}
+
+impl From<ProtoError> for SigningError {
+    fn from(_e: ProtoError) -> Self {
+        TWError::new(SigningErrorType::Error_input_parse)
+    }
+}
diff --git a/rust/tw_coin_entry/src/error/mod.rs b/rust/tw_coin_entry/src/error/mod.rs
new file mode 100644
index 00000000000..3202011e149
--- /dev/null
+++ b/rust/tw_coin_entry/src/error/mod.rs
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod address_error;
+mod impl_from;
+mod tw_error;
+mod tw_result;
+
+pub mod prelude {
+    pub use super::address_error::*;
+    pub use super::tw_error::*;
+    pub use super::tw_result::*;
+
+    pub type SigningErrorType = tw_proto::Common::Proto::SigningError;
+    pub type SigningError = TWError<SigningErrorType>;
+    pub type SigningResult<T> = Result<T, SigningError>;
+}
+
+#[macro_export]
+macro_rules! signing_output_error {
+    ($output:ty, $error:expr) => {{
+        let err = $error;
+
+        let mut output = <$output>::default();
+        output.error = *TWError::error_type(&err);
+        output.error_message = std::borrow::Cow::from(err.to_string());
+
+        output
+    }};
+}
+
+#[cfg(test)]
+mod tests {
+    use super::prelude::*;
+
+    fn function_signing_error_type() -> Result<(), SigningErrorType> {
+        Err(SigningErrorType::Error_internal)
+    }
+
+    fn function_address_error() -> AddressResult<()> {
+        Err(AddressError::Internal)
+    }
+
+    /// Test `AddressError` -> `TWError<SigningErrorType>` conversion via [`Result::context`].
+    #[test]
+    fn test_error_convert_via_context() {
+        let err: SigningError = function_address_error()
+            .into_tw()
+            .context("!test_error_convert_via_context")
+            .unwrap_err();
+
+        let expected = r#"A provided address (e.g. destination address) is invalid
+Context:
+0. !test_error_convert_via_context"#;
+        assert_eq!(err.to_string(), expected);
+    }
+
+    /// Test `AddressError` -> `TWError<SigningErrorType>` conversion via [`Result::into_tw`].
+    #[test]
+    fn test_error_convert_via_into_tw() {
+        let err: SigningError = function_signing_error_type().into_tw().unwrap_err();
+
+        let expected = r#"Internal error"#;
+        assert_eq!(err.to_string(), expected);
+    }
+
+    /// Test error chaining.
+    #[test]
+    fn test_error_chaining() {
+        let res: SigningResult<()> = SigningError::err(SigningErrorType::Error_internal)
+            .context("First context")
+            .context("Second context");
+
+        let expected = r#"Internal error
+Context:
+0. First context
+1. Second context"#;
+        assert_eq!(res.unwrap_err().to_string(), expected);
+    }
+}
diff --git a/rust/tw_coin_entry/src/error/tw_error.rs b/rust/tw_coin_entry/src/error/tw_error.rs
new file mode 100644
index 00000000000..55dc3b3f901
--- /dev/null
+++ b/rust/tw_coin_entry/src/error/tw_error.rs
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::error::tw_result::TWResult;
+use std::fmt;
+
+/// The wrapper over the `Common::TWErrorKindType` error for convenient use.
+pub struct TWError<E> {
+    error: E,
+    context: Vec<String>,
+}
+
+impl<E> TWError<E> {
+    /// Converts `PrevE` into `E` and wraps it as [`TWError<E>`].
+    pub fn new<PrevE>(error: PrevE) -> Self
+    where
+        E: From<PrevE>,
+    {
+        TWError {
+            error: E::from(error),
+            context: Vec::default(),
+        }
+    }
+
+    /// Converts `PrevE` into `E` and wraps it as [`Err(TWError<E>)`].
+    pub fn err<T, PrevE>(error: PrevE) -> TWResult<T, E>
+    where
+        E: From<PrevE>,
+    {
+        Err(TWError::new(error))
+    }
+
+    /// Adds an error context.
+    pub fn context<C>(mut self, context: C) -> Self
+    where
+        C: fmt::Display,
+    {
+        self.context.push(context.to_string());
+        self
+    }
+
+    /// Returns an inner error type.
+    pub fn error_type(&self) -> &E {
+        &self.error
+    }
+
+    /// Converts [`TWError<E>`] into [`TWError<NewE>`].
+    pub fn map_err<F, NewE>(self, f: F) -> TWError<NewE>
+    where
+        F: FnOnce(E) -> NewE,
+    {
+        TWError {
+            error: f(self.error),
+            context: self.context,
+        }
+    }
+
+    fn format_context(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        if self.context.is_empty() {
+            return Ok(());
+        }
+        writeln!(f)?;
+        writeln!(f, "Context:")?;
+        for (i, context) in self.context.iter().enumerate() {
+            write!(f, "{i}. {context}")?;
+            if i < self.context.len() - 1 {
+                writeln!(f)?;
+            }
+        }
+        Ok(())
+    }
+}
+
+impl<E> From<E> for TWError<E> {
+    fn from(inner: E) -> Self {
+        TWError::new(inner)
+    }
+}
+
+impl<E: fmt::Display> fmt::Display for TWError<E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.error)?;
+        self.format_context(f)
+    }
+}
+
+impl<E: fmt::Debug> fmt::Debug for TWError<E> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{:?}", self.error)?;
+        self.format_context(f)
+    }
+}
diff --git a/rust/tw_coin_entry/src/error/tw_result.rs b/rust/tw_coin_entry/src/error/tw_result.rs
new file mode 100644
index 00000000000..01390b58ad1
--- /dev/null
+++ b/rust/tw_coin_entry/src/error/tw_result.rs
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::error::prelude::TWError;
+use std::fmt;
+
+pub type TWResult<T, E> = Result<T, TWError<E>>;
+
+pub trait ResultContext {
+    /// Wraps the error value with additional context.
+    fn context<C>(self, context: C) -> Self
+    where
+        C: fmt::Display;
+
+    /// Wraps the error value with additional context that is evaluated lazily
+    /// only once an error does occur.
+    fn with_context<C, F>(self, f: F) -> Self
+    where
+        C: fmt::Display,
+        F: FnOnce() -> C;
+}
+
+pub trait IntoTWError<T, E> {
+    /// Wraps the inner `E` error into [`TWError<E>`].
+    fn into_tw(self) -> TWResult<T, E>;
+}
+
+pub trait MapTWError<T, E, PrevE> {
+    /// Maps `PrevE` into [`TWError<E>`] with an `F` mapper.
+    fn tw_err<F>(self, f: F) -> TWResult<T, E>
+    where
+        F: FnOnce(PrevE) -> E;
+}
+
+pub trait OrTWError<T, E> {
+    /// Transforms the [`Option<T>`] into a [`Result<T, TWError<E>>`], mapping [`Some(v)`] to
+    /// [`Ok(v)`] and [`None`] to [`Err(TWError<E>)`].
+    fn or_tw_err(self, error: E) -> TWResult<T, E>;
+}
+
+impl<T, E> ResultContext for TWResult<T, E> {
+    fn context<C>(self, context: C) -> Self
+    where
+        C: fmt::Display,
+    {
+        self.map_err(|e| e.context(context))
+    }
+
+    fn with_context<C, F>(self, f: F) -> Self
+    where
+        C: fmt::Display,
+        F: FnOnce() -> C,
+    {
+        self.map_err(|e| e.context(f()))
+    }
+}
+
+impl<T, E, PrevE> IntoTWError<T, E> for Result<T, PrevE>
+where
+    TWError<E>: From<PrevE>,
+{
+    fn into_tw(self) -> TWResult<T, E> {
+        self.map_err(TWError::from)
+    }
+}
+
+impl<T, E, PrevE> MapTWError<T, E, PrevE> for Result<T, PrevE> {
+    fn tw_err<F>(self, f: F) -> TWResult<T, E>
+    where
+        F: FnOnce(PrevE) -> E,
+    {
+        self.map_err(|e| TWError::new(f(e)))
+    }
+}
+
+impl<T, E> OrTWError<T, E> for Option<T> {
+    fn or_tw_err(self, error: E) -> TWResult<T, E> {
+        self.ok_or(TWError::new(error))
+    }
+}
diff --git a/rust/tw_coin_entry/src/lib.rs b/rust/tw_coin_entry/src/lib.rs
new file mode 100644
index 00000000000..11b456c305d
--- /dev/null
+++ b/rust/tw_coin_entry/src/lib.rs
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod coin_context;
+pub mod coin_entry;
+pub mod coin_entry_ext;
+pub mod common;
+pub mod derivation;
+pub mod error;
+pub mod modules;
+pub mod prefix;
+
+#[cfg(feature = "test-utils")]
+pub mod test_utils;
diff --git a/rust/tw_coin_entry/src/modules/json_signer.rs b/rust/tw_coin_entry/src/modules/json_signer.rs
new file mode 100644
index 00000000000..9dda8728048
--- /dev/null
+++ b/rust/tw_coin_entry/src/modules/json_signer.rs
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use crate::error::prelude::*;
+use tw_keypair::tw::PrivateKey;
+
+pub trait JsonSigner {
+    /// Signs the given JSON input with the private key.
+    fn sign_json(
+        &self,
+        coin: &dyn CoinContext,
+        input_json: &str,
+        key: &PrivateKey,
+    ) -> SigningResult<String>;
+}
+
+/// `NoJsonSigner` can't be created since there are no enum variants.
+pub enum NoJsonSigner {}
+
+impl JsonSigner for NoJsonSigner {
+    fn sign_json(
+        &self,
+        _coin: &dyn CoinContext,
+        _input_json: &str,
+        _key: &PrivateKey,
+    ) -> SigningResult<String> {
+        panic!("`NoJsonSigner` should never be constructed and used")
+    }
+}
diff --git a/rust/tw_coin_entry/src/modules/message_signer.rs b/rust/tw_coin_entry/src/modules/message_signer.rs
new file mode 100644
index 00000000000..39b7df6cf7a
--- /dev/null
+++ b/rust/tw_coin_entry/src/modules/message_signer.rs
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use tw_proto::{DummyMessage, MessageRead, MessageWrite, NoMessage};
+
+pub trait MessageSigner {
+    type MessageSigningInput<'a>: MessageRead<'a>;
+    type MessagePreSigningOutput: MessageWrite;
+    type MessageSigningOutput: MessageWrite;
+    type MessageVerifyingInput<'a>: MessageRead<'a>;
+
+    /// Returns hash(es) for signing, needed for external signing.
+    fn message_preimage_hashes(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::MessageSigningInput<'_>,
+    ) -> Self::MessagePreSigningOutput;
+
+    /// Signs a message.
+    fn sign_message(
+        &self,
+        coin: &dyn CoinContext,
+        input: Self::MessageSigningInput<'_>,
+    ) -> Self::MessageSigningOutput;
+
+    /// Verifies signature.
+    fn verify_message(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::MessageVerifyingInput<'_>,
+    ) -> bool;
+}
+
+/// `NoMessageSigner` can't be created since there are no enum variants.
+pub enum NoMessageSigner {}
+
+impl MessageSigner for NoMessageSigner {
+    type MessageSigningInput<'a> = DummyMessage;
+    type MessagePreSigningOutput = NoMessage;
+    type MessageSigningOutput = NoMessage;
+    type MessageVerifyingInput<'a> = DummyMessage;
+
+    fn message_preimage_hashes(
+        &self,
+        _coin: &dyn CoinContext,
+        _input: Self::MessageSigningInput<'_>,
+    ) -> Self::MessagePreSigningOutput {
+        panic!("`NoMessageSigner` should never be constructed and used")
+    }
+
+    fn sign_message(
+        &self,
+        _coin: &dyn CoinContext,
+        _input: Self::MessageSigningInput<'_>,
+    ) -> Self::MessageSigningOutput {
+        panic!("`NoMessageSigner` should never be constructed and used")
+    }
+
+    fn verify_message(
+        &self,
+        _coin: &dyn CoinContext,
+        _input: Self::MessageVerifyingInput<'_>,
+    ) -> bool {
+        panic!("`NoMessageSigner` should never be constructed and used")
+    }
+}
diff --git a/rust/tw_coin_entry/src/modules/mod.rs b/rust/tw_coin_entry/src/modules/mod.rs
new file mode 100644
index 00000000000..89a93030d4b
--- /dev/null
+++ b/rust/tw_coin_entry/src/modules/mod.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! This directory contains optional modules that some chain may or may not implement.
+
+pub mod json_signer;
+pub mod message_signer;
+pub mod plan_builder;
+pub mod transaction_decoder;
+pub mod transaction_util;
+pub mod wallet_connector;
diff --git a/rust/tw_coin_entry/src/modules/plan_builder.rs b/rust/tw_coin_entry/src/modules/plan_builder.rs
new file mode 100644
index 00000000000..30dac70d22c
--- /dev/null
+++ b/rust/tw_coin_entry/src/modules/plan_builder.rs
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use tw_proto::{DummyMessage, MessageRead, MessageWrite, NoMessage};
+
+pub trait PlanBuilder {
+    type SigningInput<'a>: MessageRead<'a>;
+    type Plan<'a>: MessageWrite;
+
+    /// Planning, for UTXO chains, in preparation for signing.
+    fn plan<'a>(&self, coin: &dyn CoinContext, input: &Self::SigningInput<'a>) -> Self::Plan<'a>;
+}
+
+/// `NoInputBuilder` can't be created since there are no enum variants.
+pub enum NoPlanBuilder {}
+
+impl PlanBuilder for NoPlanBuilder {
+    type SigningInput<'a> = DummyMessage;
+    type Plan<'a> = NoMessage;
+
+    /// [`PlanBuilder::plan`] should never be called.
+    fn plan<'a>(&self, _coin: &dyn CoinContext, _input: &Self::SigningInput<'a>) -> Self::Plan<'a> {
+        panic!("`NoPlanBuilder` should never be constructed and used")
+    }
+}
diff --git a/rust/tw_coin_entry/src/modules/transaction_decoder.rs b/rust/tw_coin_entry/src/modules/transaction_decoder.rs
new file mode 100644
index 00000000000..238afd006bc
--- /dev/null
+++ b/rust/tw_coin_entry/src/modules/transaction_decoder.rs
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use tw_proto::{MessageWrite, NoMessage};
+
+pub trait TransactionDecoder {
+    type Output: MessageWrite;
+
+    /// Parses a signing request received through Wallet Connect.
+    fn decode_transaction(&self, coin: &dyn CoinContext, tx: &[u8]) -> Self::Output;
+}
+
+/// `NoTransactionDecoder` can't be created since there are no enum variants.
+pub enum NoTransactionDecoder {}
+
+impl TransactionDecoder for NoTransactionDecoder {
+    type Output = NoMessage;
+
+    fn decode_transaction(&self, _coin: &dyn CoinContext, _tx: &[u8]) -> Self::Output {
+        panic!("`NoTransactionDecoder` should never be constructed and used")
+    }
+}
diff --git a/rust/tw_coin_entry/src/modules/transaction_util.rs b/rust/tw_coin_entry/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..122216f5137
--- /dev/null
+++ b/rust/tw_coin_entry/src/modules/transaction_util.rs
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use crate::error::prelude::*;
+
+pub trait TransactionUtil {
+    /// Calculate the TX hash of a transaction.
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String>;
+}
+
+/// `NoTransactionUtil` can't be created since there are no enum variants.
+pub enum NoTransactionUtil {}
+
+impl TransactionUtil for NoTransactionUtil {
+    fn calc_tx_hash(&self, _coin: &dyn CoinContext, _encoded_tx: &str) -> SigningResult<String> {
+        panic!("`NoTransactionUtil` should never be constructed and used")
+    }
+}
diff --git a/rust/tw_coin_entry/src/modules/wallet_connector.rs b/rust/tw_coin_entry/src/modules/wallet_connector.rs
new file mode 100644
index 00000000000..194ba6826e1
--- /dev/null
+++ b/rust/tw_coin_entry/src/modules/wallet_connector.rs
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use tw_proto::WalletConnect::Proto as WCProto;
+
+pub trait WalletConnector {
+    /// Parses a signing request received through Wallet Connect.
+    fn parse_request(
+        &self,
+        coin: &dyn CoinContext,
+        request: WCProto::ParseRequestInput<'_>,
+    ) -> WCProto::ParseRequestOutput<'static>;
+}
+
+/// `NoWalletConnector` can't be created since there are no enum variants.
+pub enum NoWalletConnector {}
+
+impl WalletConnector for NoWalletConnector {
+    fn parse_request(
+        &self,
+        _coin: &dyn CoinContext,
+        _request: WCProto::ParseRequestInput<'_>,
+    ) -> WCProto::ParseRequestOutput<'static> {
+        panic!("`NoWalletConnector` should never be constructed and used")
+    }
+}
diff --git a/rust/tw_coin_entry/src/prefix.rs b/rust/tw_coin_entry/src/prefix.rs
new file mode 100644
index 00000000000..059a8c57a8f
--- /dev/null
+++ b/rust/tw_coin_entry/src/prefix.rs
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::error::prelude::*;
+
+/// An address prefix. It can contain a bech32 prefix that can be used by `Cosmos` based chains.
+/// Extend when adding new blockchains.
+#[derive(Clone)]
+pub enum AddressPrefix {
+    Hrp(String),
+    BitcoinBase58(BitcoinBase58Prefix),
+}
+
+/// A blockchain's address prefix should be convertable from an `AddressPrefix`.
+pub trait Prefix: TryFrom<AddressPrefix, Error = AddressError> {}
+
+impl<T> Prefix for T where T: TryFrom<AddressPrefix, Error = AddressError> {}
+
+/// There is no way to create an instance of the `NoPrefix` enum as it doesn't has variants.
+#[derive(Debug)]
+pub enum NoPrefix {}
+
+impl TryFrom<AddressPrefix> for NoPrefix {
+    type Error = AddressError;
+
+    #[inline]
+    fn try_from(_: AddressPrefix) -> Result<Self, Self::Error> {
+        Err(AddressError::UnexpectedAddressPrefix)
+    }
+}
+
+#[derive(Clone, Copy)]
+pub struct BitcoinBase58Prefix {
+    pub p2pkh: u8,
+    pub p2sh: u8,
+}
+
+impl TryFrom<AddressPrefix> for BitcoinBase58Prefix {
+    type Error = AddressError;
+
+    fn try_from(value: AddressPrefix) -> Result<Self, Self::Error> {
+        match value {
+            AddressPrefix::BitcoinBase58(base58) => Ok(base58),
+            _ => Err(AddressError::UnexpectedAddressPrefix),
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_no_prefix() {
+        NoPrefix::try_from(AddressPrefix::Hrp("".to_string())).unwrap_err();
+    }
+}
diff --git a/rust/tw_coin_entry/src/test_utils/mod.rs b/rust/tw_coin_entry/src/test_utils/mod.rs
new file mode 100644
index 00000000000..a3d7c1feff5
--- /dev/null
+++ b/rust/tw_coin_entry/src/test_utils/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod test_context;
diff --git a/rust/tw_coin_entry/src/test_utils/test_context.rs b/rust/tw_coin_entry/src/test_utils/test_context.rs
new file mode 100644
index 00000000000..9bc467a1138
--- /dev/null
+++ b/rust/tw_coin_entry/src/test_utils/test_context.rs
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::coin_context::CoinContext;
+use crate::derivation::DerivationWithPath;
+use tw_hash::hasher::Hasher;
+use tw_keypair::tw::PublicKeyType;
+
+/// Test coin context that panics on any `CoinContext` method call.
+#[derive(Default)]
+pub struct TestCoinContext {
+    pub public_key_type: Option<PublicKeyType>,
+    pub address_hasher: Option<Hasher>,
+    pub hrp: Option<String>,
+    pub p2pkh: Option<u8>,
+    pub p2sh: Option<u8>,
+}
+
+impl TestCoinContext {
+    pub fn with_public_key_type(mut self, public_key_type: PublicKeyType) -> TestCoinContext {
+        self.public_key_type = Some(public_key_type);
+        self
+    }
+
+    pub fn with_hrp(mut self, hrp: &str) -> TestCoinContext {
+        self.hrp = Some(hrp.to_string());
+        self
+    }
+}
+
+impl CoinContext for TestCoinContext {
+    fn public_key_type(&self) -> PublicKeyType {
+        self.public_key_type
+            .expect("EmptyCoinContext::public_key_type was not set")
+    }
+
+    fn address_hasher(&self) -> Option<Hasher> {
+        self.address_hasher
+    }
+
+    fn hrp(&self) -> Option<String> {
+        self.hrp.clone()
+    }
+
+    fn p2pkh_prefix(&self) -> Option<u8> {
+        self.p2pkh
+    }
+
+    fn p2sh_prefix(&self) -> Option<u8> {
+        self.p2sh
+    }
+
+    fn derivations(&self) -> &[DerivationWithPath] {
+        unimplemented!()
+    }
+}
diff --git a/rust/tw_coin_registry/Cargo.toml b/rust/tw_coin_registry/Cargo.toml
new file mode 100644
index 00000000000..7bff39d1ea0
--- /dev/null
+++ b/rust/tw_coin_registry/Cargo.toml
@@ -0,0 +1,39 @@
+[package]
+name = "tw_coin_registry"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+lazy_static = "1.4.0"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+strum = "0.25"
+strum_macros = "0.25"
+tw_aptos = { path = "../chains/tw_aptos" }
+tw_binance = { path = "../chains/tw_binance" }
+tw_bitcoin = { path = "../chains/tw_bitcoin" }
+tw_bitcoincash = { path = "../chains/tw_bitcoincash" }
+tw_coin_entry = { path = "../tw_coin_entry" }
+tw_cosmos = { path = "../chains/tw_cosmos" }
+tw_ethereum = { path = "../chains/tw_ethereum" }
+tw_evm = { path = "../tw_evm" }
+tw_greenfield = { path = "../chains/tw_greenfield" }
+tw_hash = { path = "../tw_hash" }
+tw_internet_computer = { path = "../chains/tw_internet_computer" }
+tw_keypair = { path = "../tw_keypair" }
+tw_memory = { path = "../tw_memory" }
+tw_misc = { path = "../tw_misc" }
+tw_native_evmos = { path = "../chains/tw_native_evmos" }
+tw_native_injective = { path = "../chains/tw_native_injective" }
+tw_pactus = { path = "../chains/tw_pactus" }
+tw_ronin = { path = "../chains/tw_ronin" }
+tw_solana = { path = "../chains/tw_solana" }
+tw_sui = { path = "../chains/tw_sui" }
+tw_thorchain = { path = "../chains/tw_thorchain" }
+tw_ton = { path = "../chains/tw_ton" }
+tw_utxo = { path = "../frameworks/tw_utxo" }
+
+[build-dependencies]
+itertools = "0.10.5"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
diff --git a/rust/tw_coin_registry/build.rs b/rust/tw_coin_registry/build.rs
new file mode 100644
index 00000000000..f2bb771216f
--- /dev/null
+++ b/rust/tw_coin_registry/build.rs
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use itertools::Itertools;
+use serde::Deserialize;
+use std::io::Write;
+use std::path::PathBuf;
+use std::{env, fs};
+
+/// We're only interested in `id` and `name` of the coin to generate `CoinType` enum.
+#[derive(Deserialize)]
+struct CoinItem {
+    #[serde(rename = "coinId")]
+    coin_id: u64,
+    name: String,
+}
+
+/// Transforms a coin name to a Rust name.
+/// https://github.com/trustwallet/wallet-core/blob/3769f31b7d0c75126b2f426bb065364429aaa379/codegen/lib/coin_skeleton_gen.rb#L15-L22
+fn format_name(name: &str) -> String {
+    name.replace([' ', '.', '-'], "")
+}
+
+fn generate_coin_type(coins: &[CoinItem]) -> String {
+    const RAW_TYPE: &str = "u32";
+    const ENUM_NAME: &str = "CoinType";
+
+    let coin_types_variants = coins
+        .iter()
+        .map(|coin| format!("\t{} = {},\n", format_name(&coin.name), coin.coin_id))
+        .join("");
+
+    format!(
+        r#"#[allow(non_camel_case_types)]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
+#[derive(strum_macros::EnumIter, strum_macros::FromRepr)]
+#[repr({RAW_TYPE})]
+pub enum CoinType {{
+{coin_types_variants}
+}}
+
+impl {ENUM_NAME} {{
+    pub fn iter() -> impl IntoIterator<Item = {ENUM_NAME}> {{
+        use strum::IntoEnumIterator;
+
+        <Self as IntoEnumIterator>::iter()
+    }}
+}}
+
+impl TryFrom<{RAW_TYPE}> for {ENUM_NAME} {{
+    type Error = ();
+
+    fn try_from(num: {RAW_TYPE}) -> Result<{ENUM_NAME}, ()> {{
+        {ENUM_NAME}::from_repr(num).ok_or(())
+    }}
+}}
+
+impl<'de> serde::Deserialize<'de> for {ENUM_NAME} {{
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::de::Deserializer<'de>,
+    {{
+        let num_value: {RAW_TYPE} = {RAW_TYPE}::deserialize(deserializer)?;
+        {ENUM_NAME}::try_from(num_value).map_err(|_| serde::de::Error::custom("Invalid `CoinType` value"))
+    }}
+}}
+"#
+    )
+}
+
+fn generate_and_write_coin_type(coins: &[CoinItem]) {
+    let coin_type_path = PathBuf::from(env::var("OUT_DIR").unwrap()).join("coin_type.rs");
+
+    let coin_type_content = generate_coin_type(coins);
+
+    let mut file = fs::OpenOptions::new()
+        .create(true)
+        .write(true)
+        .truncate(true)
+        .open(coin_type_path)
+        .expect("Error creating/opening coin_type.rs");
+    file.write_all(coin_type_content.as_bytes())
+        .expect("Error writing coin_type.rs");
+}
+
+fn main() {
+    let registry_path = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("..")
+        .join("..")
+        .join("registry.json");
+    let registry_path_str = registry_path.to_str().unwrap();
+
+    // Re-run this build.rs if the `proto` directory has been changed (i.e. a new file is added).
+    println!("cargo:rerun-if-changed={registry_path_str}");
+
+    let registry_bytes = fs::read(registry_path).expect("Error reading registry.json");
+
+    let coins: Vec<CoinItem> =
+        serde_json::from_slice(&registry_bytes).expect("registry.json expected to be valid");
+
+    generate_and_write_coin_type(&coins);
+}
diff --git a/rust/tw_coin_registry/src/blockchain_type.rs b/rust/tw_coin_registry/src/blockchain_type.rs
new file mode 100644
index 00000000000..cde37c58cde
--- /dev/null
+++ b/rust/tw_coin_registry/src/blockchain_type.rs
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+
+/// Blockchain implementation type.
+/// Extend this enum when adding new blockchains.
+#[derive(Copy, Clone, Debug, Deserialize, PartialEq)]
+pub enum BlockchainType {
+    // start_of_blockchain_type - USED TO GENERATE CODE
+    Aptos,
+    Binance,
+    Bitcoin,
+    BitcoinCash,
+    Cosmos,
+    Ethereum,
+    Greenfield,
+    InternetComputer,
+    NativeEvmos,
+    NativeInjective,
+    Pactus,
+    Ronin,
+    Solana,
+    Sui,
+    TheOpenNetwork,
+    Thorchain,
+    // end_of_blockchain_type - USED TO GENERATE CODE
+    #[serde(other)]
+    Unsupported,
+}
+
+impl BlockchainType {
+    pub fn is_supported(&self) -> bool {
+        !matches!(self, BlockchainType::Unsupported)
+    }
+}
diff --git a/rust/tw_coin_registry/src/coin_context.rs b/rust/tw_coin_registry/src/coin_context.rs
new file mode 100644
index 00000000000..f06cdf57ebc
--- /dev/null
+++ b/rust/tw_coin_registry/src/coin_context.rs
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::registry::CoinItem;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::derivation::DerivationWithPath;
+use tw_hash::hasher::Hasher;
+use tw_keypair::tw::PublicKeyType;
+
+pub struct CoinRegistryContext {
+    item: &'static CoinItem,
+}
+
+impl CoinRegistryContext {
+    #[inline]
+    pub fn with_coin_item(item: &'static CoinItem) -> CoinRegistryContext {
+        CoinRegistryContext { item }
+    }
+}
+
+impl CoinContext for CoinRegistryContext {
+    #[inline]
+    fn public_key_type(&self) -> PublicKeyType {
+        self.item.public_key_type
+    }
+
+    #[inline]
+    fn address_hasher(&self) -> Option<Hasher> {
+        self.item.address_hasher
+    }
+
+    #[inline]
+    fn hrp(&self) -> Option<String> {
+        self.item.hrp.clone()
+    }
+
+    #[inline]
+    fn p2pkh_prefix(&self) -> Option<u8> {
+        self.item.p2pkh_prefix
+    }
+
+    #[inline]
+    fn p2sh_prefix(&self) -> Option<u8> {
+        self.item.p2sh_prefix
+    }
+
+    #[inline]
+    fn derivations(&self) -> &[DerivationWithPath] {
+        &self.item.derivation
+    }
+}
diff --git a/rust/tw_coin_registry/src/dispatcher.rs b/rust/tw_coin_registry/src/dispatcher.rs
new file mode 100644
index 00000000000..d08784ccd56
--- /dev/null
+++ b/rust/tw_coin_registry/src/dispatcher.rs
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::blockchain_type::BlockchainType;
+use crate::coin_context::CoinRegistryContext;
+use crate::coin_type::CoinType;
+use crate::error::{RegistryError, RegistryResult};
+use crate::registry::get_coin_item;
+use tw_aptos::entry::AptosEntry;
+use tw_binance::entry::BinanceEntry;
+use tw_bitcoin::entry::BitcoinEntry;
+use tw_bitcoincash::entry::BitcoinCashEntry;
+use tw_coin_entry::coin_entry_ext::CoinEntryExt;
+use tw_cosmos::entry::CosmosEntry;
+use tw_ethereum::entry::EthereumEntry;
+use tw_evm::evm_entry::EvmEntryExt;
+use tw_greenfield::entry::GreenfieldEntry;
+use tw_internet_computer::entry::InternetComputerEntry;
+use tw_native_evmos::entry::NativeEvmosEntry;
+use tw_native_injective::entry::NativeInjectiveEntry;
+use tw_pactus::entry::PactusEntry;
+use tw_ronin::entry::RoninEntry;
+use tw_solana::entry::SolanaEntry;
+use tw_sui::entry::SuiEntry;
+use tw_thorchain::entry::ThorchainEntry;
+use tw_ton::entry::TheOpenNetworkEntry;
+
+pub type CoinEntryExtStaticRef = &'static dyn CoinEntryExt;
+pub type EvmEntryExtStaticRef = &'static dyn EvmEntryExt;
+
+// start_of_blockchain_entries - USED TO GENERATE CODE
+const APTOS: AptosEntry = AptosEntry;
+const BINANCE: BinanceEntry = BinanceEntry;
+const BITCOIN: BitcoinEntry = BitcoinEntry;
+const BITCOIN_CASH: BitcoinCashEntry = BitcoinCashEntry;
+const COSMOS: CosmosEntry = CosmosEntry;
+const ETHEREUM: EthereumEntry = EthereumEntry;
+const GREENFIELD: GreenfieldEntry = GreenfieldEntry;
+const INTERNET_COMPUTER: InternetComputerEntry = InternetComputerEntry;
+const NATIVE_EVMOS: NativeEvmosEntry = NativeEvmosEntry;
+const NATIVE_INJECTIVE: NativeInjectiveEntry = NativeInjectiveEntry;
+const PACTUS: PactusEntry = PactusEntry;
+const RONIN: RoninEntry = RoninEntry;
+const SOLANA: SolanaEntry = SolanaEntry;
+const SUI: SuiEntry = SuiEntry;
+const THE_OPEN_NETWORK: TheOpenNetworkEntry = TheOpenNetworkEntry;
+const THORCHAIN: ThorchainEntry = ThorchainEntry;
+// end_of_blockchain_entries - USED TO GENERATE CODE
+
+pub fn blockchain_dispatcher(blockchain: BlockchainType) -> RegistryResult<CoinEntryExtStaticRef> {
+    match blockchain {
+        // start_of_blockchain_dispatcher - USED TO GENERATE CODE
+        BlockchainType::Aptos => Ok(&APTOS),
+        BlockchainType::Binance => Ok(&BINANCE),
+        BlockchainType::Bitcoin => Ok(&BITCOIN),
+        BlockchainType::BitcoinCash => Ok(&BITCOIN_CASH),
+        BlockchainType::Cosmos => Ok(&COSMOS),
+        BlockchainType::Ethereum => Ok(&ETHEREUM),
+        BlockchainType::Greenfield => Ok(&GREENFIELD),
+        BlockchainType::InternetComputer => Ok(&INTERNET_COMPUTER),
+        BlockchainType::NativeEvmos => Ok(&NATIVE_EVMOS),
+        BlockchainType::NativeInjective => Ok(&NATIVE_INJECTIVE),
+        BlockchainType::Pactus => Ok(&PACTUS),
+        BlockchainType::Ronin => Ok(&RONIN),
+        BlockchainType::Solana => Ok(&SOLANA),
+        BlockchainType::Sui => Ok(&SUI),
+        BlockchainType::TheOpenNetwork => Ok(&THE_OPEN_NETWORK),
+        BlockchainType::Thorchain => Ok(&THORCHAIN),
+        // end_of_blockchain_dispatcher - USED TO GENERATE CODE
+        BlockchainType::Unsupported => Err(RegistryError::Unsupported),
+    }
+}
+
+pub fn coin_dispatcher(
+    coin: CoinType,
+) -> RegistryResult<(CoinRegistryContext, CoinEntryExtStaticRef)> {
+    let item = get_coin_item(coin)?;
+    let coin_entry = blockchain_dispatcher(item.blockchain)?;
+    let coin_context = CoinRegistryContext::with_coin_item(item);
+    Ok((coin_context, coin_entry))
+}
+
+pub fn evm_dispatcher(coin: CoinType) -> RegistryResult<EvmEntryExtStaticRef> {
+    let item = get_coin_item(coin)?;
+    match item.blockchain {
+        BlockchainType::Ethereum => Ok(&ETHEREUM),
+        BlockchainType::Ronin => Ok(&RONIN),
+        _ => Err(RegistryError::Unsupported),
+    }
+}
diff --git a/rust/tw_coin_registry/src/error.rs b/rust/tw_coin_registry/src/error.rs
new file mode 100644
index 00000000000..ee8f91eaefe
--- /dev/null
+++ b/rust/tw_coin_registry/src/error.rs
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+
+pub type RegistryResult<T> = Result<T, RegistryError>;
+
+#[derive(Debug)]
+pub enum RegistryError {
+    UnknownCoinType,
+    Unsupported,
+}
+
+impl From<RegistryError> for SigningError {
+    #[inline]
+    fn from(e: RegistryError) -> Self {
+        match e {
+            RegistryError::UnknownCoinType => {
+                SigningError::new(SigningErrorType::Error_invalid_params)
+                    .context("Unknown coin type")
+            },
+            RegistryError::Unsupported => SigningError::new(SigningErrorType::Error_internal)
+                .context("Requested coin type is not supported in Rust yet"),
+        }
+    }
+}
diff --git a/rust/tw_coin_registry/src/lib.rs b/rust/tw_coin_registry/src/lib.rs
new file mode 100644
index 00000000000..2c32db61300
--- /dev/null
+++ b/rust/tw_coin_registry/src/lib.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod blockchain_type;
+pub mod coin_context;
+pub mod dispatcher;
+pub mod error;
+pub mod registry;
+pub mod tw_derivation;
+
+pub mod coin_type {
+    include!(concat!(env!("OUT_DIR"), "/coin_type.rs"));
+}
diff --git a/rust/tw_coin_registry/src/registry.rs b/rust/tw_coin_registry/src/registry.rs
new file mode 100644
index 00000000000..29825f4c58e
--- /dev/null
+++ b/rust/tw_coin_registry/src/registry.rs
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::blockchain_type::BlockchainType;
+use crate::coin_type::CoinType;
+use crate::error::{RegistryError, RegistryResult};
+use lazy_static::lazy_static;
+use serde::Deserialize;
+use std::collections::HashMap;
+use tw_coin_entry::derivation::DerivationWithPath;
+use tw_hash::hasher::Hasher;
+use tw_keypair::tw::PublicKeyType;
+
+type RegistryMap = HashMap<CoinType, CoinItem>;
+
+/// cbindgen:ignore
+pub const REGISTRY_JSON: &str =
+    include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../registry.json"));
+
+lazy_static! {
+    static ref REGISTRY: RegistryMap = parse_registry_json();
+}
+
+/// Extend this structure according to `registry.json`.
+#[derive(Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct CoinItem {
+    pub id: String,
+    pub name: String,
+    pub coin_id: CoinType,
+    pub blockchain: BlockchainType,
+    pub derivation: Vec<DerivationWithPath>,
+    pub public_key_type: PublicKeyType,
+    pub address_hasher: Option<Hasher>,
+    pub hrp: Option<String>,
+    pub p2pkh_prefix: Option<u8>,
+    pub p2sh_prefix: Option<u8>,
+}
+
+#[inline]
+pub fn get_coin_item(coin: CoinType) -> RegistryResult<&'static CoinItem> {
+    REGISTRY.get(&coin).ok_or(RegistryError::UnknownCoinType)
+}
+
+#[inline]
+pub fn registry_iter() -> impl Iterator<Item = &'static CoinItem> {
+    REGISTRY.iter().map(|(_coin_type, item)| item)
+}
+
+#[inline]
+pub fn supported_coin_items() -> impl Iterator<Item = &'static CoinItem> {
+    registry_iter().filter(|item| !matches!(item.blockchain, BlockchainType::Unsupported))
+}
+
+#[inline]
+pub fn coin_items_by_blockchain(
+    blockchain: BlockchainType,
+) -> impl Iterator<Item = &'static CoinItem> {
+    registry_iter().filter(move |item| item.blockchain == blockchain)
+}
+
+fn parse_registry_json() -> RegistryMap {
+    let items: Vec<CoinItem> =
+        serde_json::from_str(REGISTRY_JSON).expect("registry.json expected to be valid");
+    items.into_iter().map(|item| (item.coin_id, item)).collect()
+}
diff --git a/rust/tw_coin_registry/src/tw_derivation.rs b/rust/tw_coin_registry/src/tw_derivation.rs
new file mode 100644
index 00000000000..67436f91371
--- /dev/null
+++ b/rust/tw_coin_registry/src/tw_derivation.rs
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::derivation::Derivation;
+
+/// Extend this enum.
+/// TODO generate like `CoinType`.
+#[derive(Default, strum_macros::FromRepr)]
+#[repr(u32)]
+pub enum TWDerivation {
+    // Do not touch and use it!
+    Custom = 1,
+    BitcoinSegwit = 2,
+    BitcoinLegacy = 3,
+    BitcoinTestnet = 4,
+    LitecoinLegacy = 5,
+    SolanaSolana = 6,
+    StratisSegwit = 7,
+    BitcoinTaproot = 8,
+    // end_of_derivation_enum - USED TO GENERATE CODE
+    #[default]
+    Default = 0,
+}
+
+impl From<TWDerivation> for Derivation {
+    fn from(derivation: TWDerivation) -> Self {
+        match derivation {
+            TWDerivation::Default | TWDerivation::Custom => Derivation::Default,
+            TWDerivation::BitcoinSegwit | TWDerivation::StratisSegwit => Derivation::Segwit,
+            TWDerivation::BitcoinLegacy | TWDerivation::LitecoinLegacy => Derivation::Legacy,
+            TWDerivation::BitcoinTestnet => Derivation::Testnet,
+            TWDerivation::SolanaSolana => Derivation::Default,
+            TWDerivation::BitcoinTaproot => Derivation::Taproot,
+        }
+    }
+}
diff --git a/rust/tw_cosmos_sdk/Cargo.toml b/rust/tw_cosmos_sdk/Cargo.toml
new file mode 100644
index 00000000000..ffd6abf455b
--- /dev/null
+++ b/rust/tw_cosmos_sdk/Cargo.toml
@@ -0,0 +1,29 @@
+[package]
+name = "tw_cosmos_sdk"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+test-utils = []
+
+[dependencies]
+quick-protobuf = "0.8.1"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+tw_bech32_address = { path = "../tw_bech32_address" }
+tw_coin_entry = { path = "../tw_coin_entry" }
+tw_encoding = { path = "../tw_encoding" }
+tw_hash = { path = "../tw_hash" }
+tw_keypair = { path = "../tw_keypair" }
+tw_memory = { path = "../tw_memory" }
+tw_misc = { path = "../tw_misc" }
+tw_number = { path = "../tw_number" }
+tw_proto = { path = "../tw_proto" }
+
+[dev-dependencies]
+tw_coin_entry = { path = "../tw_coin_entry", features = ["test-utils"] }
+tw_cosmos_sdk = { path = "./", features = ["test-utils"] }
+tw_misc = { path = "../tw_misc", features = ["test-utils"] }
+
+[build-dependencies]
+pb-rs = "0.10.0"
diff --git a/src/Cosmos/Protobuf/authz_tx.proto b/rust/tw_cosmos_sdk/Protobuf/authz_tx.proto
similarity index 100%
rename from src/Cosmos/Protobuf/authz_tx.proto
rename to rust/tw_cosmos_sdk/Protobuf/authz_tx.proto
diff --git a/src/Cosmos/Protobuf/bank_tx.proto b/rust/tw_cosmos_sdk/Protobuf/bank_tx.proto
similarity index 100%
rename from src/Cosmos/Protobuf/bank_tx.proto
rename to rust/tw_cosmos_sdk/Protobuf/bank_tx.proto
diff --git a/src/Cosmos/Protobuf/coin.proto b/rust/tw_cosmos_sdk/Protobuf/coin.proto
similarity index 100%
rename from src/Cosmos/Protobuf/coin.proto
rename to rust/tw_cosmos_sdk/Protobuf/coin.proto
diff --git a/src/Cosmos/Protobuf/cosmwasm_wasm_v1_tx.proto b/rust/tw_cosmos_sdk/Protobuf/cosmwasm_wasm_v1_tx.proto
similarity index 100%
rename from src/Cosmos/Protobuf/cosmwasm_wasm_v1_tx.proto
rename to rust/tw_cosmos_sdk/Protobuf/cosmwasm_wasm_v1_tx.proto
diff --git a/src/Cosmos/Protobuf/crypto_multisig.proto b/rust/tw_cosmos_sdk/Protobuf/crypto_multisig.proto
similarity index 100%
rename from src/Cosmos/Protobuf/crypto_multisig.proto
rename to rust/tw_cosmos_sdk/Protobuf/crypto_multisig.proto
diff --git a/src/Cosmos/Protobuf/crypto_secp256k1_keys.proto b/rust/tw_cosmos_sdk/Protobuf/crypto_secp256k1_keys.proto
similarity index 100%
rename from src/Cosmos/Protobuf/crypto_secp256k1_keys.proto
rename to rust/tw_cosmos_sdk/Protobuf/crypto_secp256k1_keys.proto
diff --git a/rust/tw_cosmos_sdk/Protobuf/distribution_tx.proto b/rust/tw_cosmos_sdk/Protobuf/distribution_tx.proto
new file mode 100644
index 00000000000..36a8c7df74b
--- /dev/null
+++ b/rust/tw_cosmos_sdk/Protobuf/distribution_tx.proto
@@ -0,0 +1,18 @@
+syntax = "proto3";
+package cosmos.distribution.v1beta1;
+
+// Src: https://github.com/cosmos/cosmos-sdk/blob/master/proto/cosmos/distribution/v1beta1/tx.proto
+
+// MsgSetWithdrawAddress sets the withdraw address for
+// a delegator (or validator self-delegation).
+message MsgSetWithdrawAddress {
+  string delegator_address = 1;
+  string withdraw_address = 2;
+}
+
+// MsgWithdrawDelegatorReward represents delegation withdrawal to a delegator
+// from a single validator.
+message MsgWithdrawDelegatorReward {
+  string delegator_address = 1;
+  string validator_address = 2;
+}
diff --git a/src/Cosmos/Protobuf/ethermint_keys.proto b/rust/tw_cosmos_sdk/Protobuf/ethermint_keys.proto
similarity index 100%
rename from src/Cosmos/Protobuf/ethermint_keys.proto
rename to rust/tw_cosmos_sdk/Protobuf/ethermint_keys.proto
diff --git a/rust/tw_cosmos_sdk/Protobuf/gov_tx.proto b/rust/tw_cosmos_sdk/Protobuf/gov_tx.proto
new file mode 100644
index 00000000000..4f018a37e93
--- /dev/null
+++ b/rust/tw_cosmos_sdk/Protobuf/gov_tx.proto
@@ -0,0 +1,24 @@
+// Since: cosmos-sdk 0.43
+syntax = "proto3";
+package cosmos.gov.v1beta1;
+
+// VoteOption enumerates the valid vote options for a given governance proposal.
+enum VoteOption {
+  // VOTE_OPTION_UNSPECIFIED defines a no-op vote option.
+  VOTE_OPTION_UNSPECIFIED = 0;
+  // VOTE_OPTION_YES defines a yes vote option.
+  VOTE_OPTION_YES = 1;
+  // VOTE_OPTION_ABSTAIN defines an abstain vote option.
+  VOTE_OPTION_ABSTAIN = 2;
+  // VOTE_OPTION_NO defines a no vote option.
+  VOTE_OPTION_NO = 3;
+  // VOTE_OPTION_NO_WITH_VETO defines a no with veto vote option.
+  VOTE_OPTION_NO_WITH_VETO = 4;
+}
+
+// MsgVote defines a message to cast a vote.
+message MsgVote {
+  uint64     proposal_id = 1;
+  string     voter       = 2;
+  VoteOption option      = 3;
+}
diff --git a/rust/tw_cosmos_sdk/Protobuf/greenfield_ethsecp256k1.proto b/rust/tw_cosmos_sdk/Protobuf/greenfield_ethsecp256k1.proto
new file mode 100644
index 00000000000..104cd2793e3
--- /dev/null
+++ b/rust/tw_cosmos_sdk/Protobuf/greenfield_ethsecp256k1.proto
@@ -0,0 +1,10 @@
+syntax = "proto3";
+package cosmos.crypto.eth.ethsecp256k1;
+
+// PubKey defines a type alias for an ecdsa.PublicKey that implements
+// Tendermint's PubKey interface. It represents the 33-byte compressed public
+// key format.
+// Original: https://github.com/bnb-chain/greenfield-cosmos-sdk/blob/master/proto/cosmos/crypto/eth/ethsecp256k1/keys.proto
+message PubKey {
+    bytes key = 1;
+}
diff --git a/rust/tw_cosmos_sdk/Protobuf/greenfield_tx.proto b/rust/tw_cosmos_sdk/Protobuf/greenfield_tx.proto
new file mode 100644
index 00000000000..28f78238cd7
--- /dev/null
+++ b/rust/tw_cosmos_sdk/Protobuf/greenfield_tx.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+package greenfield.bridge;
+
+import "coin.proto";
+
+// MsgTransferOut is the Msg/TransferOut request type.
+// Original: https://github.com/bnb-chain/greenfield/blob/f1183e57caeb1ba0d28836b4ed2e64d693d2364d/proto/greenfield/bridge/tx.proto
+message MsgTransferOut {
+    // from address
+    string from = 1;
+    // to address
+    string to = 2;
+    // transfer token amount
+    cosmos.base.v1beta1.Coin amount = 3;
+}
\ No newline at end of file
diff --git a/src/Cosmos/Protobuf/ibc_applications_transfer_tx.proto b/rust/tw_cosmos_sdk/Protobuf/ibc_applications_transfer_tx.proto
similarity index 100%
rename from src/Cosmos/Protobuf/ibc_applications_transfer_tx.proto
rename to rust/tw_cosmos_sdk/Protobuf/ibc_applications_transfer_tx.proto
diff --git a/src/Cosmos/Protobuf/ibc_core_client.proto b/rust/tw_cosmos_sdk/Protobuf/ibc_core_client.proto
similarity index 100%
rename from src/Cosmos/Protobuf/ibc_core_client.proto
rename to rust/tw_cosmos_sdk/Protobuf/ibc_core_client.proto
diff --git a/rust/tw_cosmos_sdk/Protobuf/injective_keys.proto b/rust/tw_cosmos_sdk/Protobuf/injective_keys.proto
new file mode 100644
index 00000000000..bc11f94d667
--- /dev/null
+++ b/rust/tw_cosmos_sdk/Protobuf/injective_keys.proto
@@ -0,0 +1,6 @@
+syntax = "proto3";
+package injective.crypto.v1beta1.ethsecp256k1;
+
+message PubKey {
+  bytes key = 1;
+}
diff --git a/src/Cosmos/Protobuf/staking_tx.proto b/rust/tw_cosmos_sdk/Protobuf/staking_tx.proto
similarity index 100%
rename from src/Cosmos/Protobuf/staking_tx.proto
rename to rust/tw_cosmos_sdk/Protobuf/staking_tx.proto
diff --git a/rust/tw_cosmos_sdk/Protobuf/stride_liquid_staking.proto b/rust/tw_cosmos_sdk/Protobuf/stride_liquid_staking.proto
new file mode 100644
index 00000000000..5409daf9184
--- /dev/null
+++ b/rust/tw_cosmos_sdk/Protobuf/stride_liquid_staking.proto
@@ -0,0 +1,15 @@
+syntax = "proto3";
+package stride.stakeibc;
+
+message MsgLiquidStake {
+  string creator = 1;
+  string amount = 2;
+  string host_denom = 3;
+}
+
+message MsgRedeemStake {
+  string creator = 1;
+  string amount = 2;
+  string host_zone = 3;
+  string receiver = 4;
+}
diff --git a/src/Cosmos/Protobuf/terra_wasm_v1beta1_tx.proto b/rust/tw_cosmos_sdk/Protobuf/terra_wasm_v1beta1_tx.proto
similarity index 100%
rename from src/Cosmos/Protobuf/terra_wasm_v1beta1_tx.proto
rename to rust/tw_cosmos_sdk/Protobuf/terra_wasm_v1beta1_tx.proto
diff --git a/rust/tw_cosmos_sdk/Protobuf/thorchain_bank_tx.proto b/rust/tw_cosmos_sdk/Protobuf/thorchain_bank_tx.proto
new file mode 100644
index 00000000000..c9697d13a82
--- /dev/null
+++ b/rust/tw_cosmos_sdk/Protobuf/thorchain_bank_tx.proto
@@ -0,0 +1,38 @@
+syntax = "proto3";
+package types;
+
+// Src: https://gitlab.com/thorchain/thornode/-/blob/develop/proto/thorchain/v1/x/thorchain/types/msg_send.proto
+// Cosmos original: https://github.com/cosmos/cosmos-sdk/blob/master/proto/cosmos/bank/v1beta1/tx.proto
+
+import "coin.proto";
+
+// Original: https://gitlab.com/thorchain/thornode/-/blob/develop/proto/thorchain/v1/common/common.proto
+message Asset {
+    string chain = 1;
+    string symbol = 2;
+    string ticker = 3;
+    bool synth = 4;
+}
+
+// Original: https://gitlab.com/thorchain/thornode/-/blob/develop/proto/thorchain/v1/common/common.proto
+message Coin {
+    Asset asset = 1;
+    string amount = 2;
+    int64 decimals = 3;
+}
+
+// MsgSend represents a message to send coins from one account to another.
+message MsgSend {
+    bytes    from_address             = 1;
+    bytes    to_address               = 2;
+    repeated cosmos.base.v1beta1.Coin amount = 3;
+}
+
+// MsgDeposit represents a message to deposit coins from the `signer` account.
+// The message is used to swap $RUNE -> $ASSET: https://dev.thorchain.org/thorchain-dev/concepts/sending-transactions#thorchain
+// Original: https://gitlab.com/thorchain/thornode/-/blob/develop/proto/thorchain/v1/x/thorchain/types/msg_deposit.proto
+message MsgDeposit {
+    repeated Coin coins = 1;
+    string memo = 2;
+    bytes signer = 3;
+}
diff --git a/src/Cosmos/Protobuf/tx.proto b/rust/tw_cosmos_sdk/Protobuf/tx.proto
similarity index 99%
rename from src/Cosmos/Protobuf/tx.proto
rename to rust/tw_cosmos_sdk/Protobuf/tx.proto
index b7973cda4bf..74e17ba25d7 100644
--- a/src/Cosmos/Protobuf/tx.proto
+++ b/rust/tw_cosmos_sdk/Protobuf/tx.proto
@@ -1,5 +1,5 @@
 syntax = "proto3";
-package cosmos;
+package cosmos.tx.v1beta1;
 
 // Src: https://github.com/cosmos/cosmos-sdk/blob/master/proto/cosmos/tx/v1beta1/tx.proto
 
diff --git a/src/Cosmos/Protobuf/tx_signing.proto b/rust/tw_cosmos_sdk/Protobuf/tx_signing.proto
similarity index 93%
rename from src/Cosmos/Protobuf/tx_signing.proto
rename to rust/tw_cosmos_sdk/Protobuf/tx_signing.proto
index 8eb22240548..70215c2d2a2 100644
--- a/src/Cosmos/Protobuf/tx_signing.proto
+++ b/rust/tw_cosmos_sdk/Protobuf/tx_signing.proto
@@ -34,6 +34,11 @@ enum SignMode {
     // SIGN_MODE_LEGACY_AMINO_JSON is a backwards compatibility mode which uses
     // Amino JSON and will be removed in the future.
     SIGN_MODE_LEGACY_AMINO_JSON = 127;
+
+    // Greenfield specific signing mode.
+    // SIGN_MODE_EIP_712 specifies the sign mode for EIP 712 signing on the Cosmos
+    // SDK. Ref: https://eips.ethereum.org/EIPS/eip-712
+    SIGN_MODE_EIP_712 = 712;
 }
 
 // SignatureDescriptors wraps multiple SignatureDescriptor's.
diff --git a/rust/tw_cosmos_sdk/build.rs b/rust/tw_cosmos_sdk/build.rs
new file mode 100644
index 00000000000..830293ac58a
--- /dev/null
+++ b/rust/tw_cosmos_sdk/build.rs
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use pb_rs::types::FileDescriptor;
+use pb_rs::ConfigBuilder;
+use std::path::{Path, PathBuf};
+use std::{env, fs};
+
+fn main() {
+    let cargo_manifest_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap());
+    let proto_ext = Some(Path::new("proto").as_os_str());
+
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()).join("proto");
+
+    let proto_dir = cargo_manifest_dir.join("Protobuf");
+    let proto_dir_str = proto_dir.to_str().expect("Invalid proto directory path");
+    // Re-run this build.rs if the `proto` directory has been changed (i.e. a new file is added).
+    println!("cargo:rerun-if-changed={}", proto_dir_str);
+
+    let protos: Vec<_> = fs::read_dir(&proto_dir)
+        .expect("Expected a valid directory with proto files")
+        .filter_map(|file| {
+            let file = file.ok()?;
+            if file.path().extension() != proto_ext {
+                return None;
+            }
+
+            let path = file.path();
+            let path_str = path.to_str().expect("Invalid Proto file name");
+            println!("cargo:rerun-if-changed={}", path_str);
+            Some(path)
+        })
+        .collect();
+
+    // Delete all old generated files before re-generating new ones
+    if out_dir.exists() {
+        fs::remove_dir_all(&out_dir).expect("Error removing out directory");
+    }
+    fs::DirBuilder::new()
+        .create(&out_dir)
+        .expect("Error creating out directory");
+
+    // `tw_proto/common_proto` contains google.protobuf proto files that are used in Cosmos protocol.
+    let common_proto_dir = cargo_manifest_dir
+        .join("..")
+        .join("tw_proto")
+        .join("src")
+        .join("common")
+        .canonicalize()
+        .expect("Cannot find common proto directory");
+
+    let out_protos = ConfigBuilder::new(
+        &protos,
+        None,
+        Some(&out_dir),
+        &[common_proto_dir, proto_dir],
+    )
+    .expect("Error configuring pb-rs builder")
+    .gen_info(true)
+    .dont_use_cow(true)
+    .build();
+    FileDescriptor::run(&out_protos).expect("Error generating proto files");
+}
diff --git a/rust/tw_cosmos_sdk/fuzz/.gitignore b/rust/tw_cosmos_sdk/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/tw_cosmos_sdk/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/tw_cosmos_sdk/fuzz/Cargo.toml b/rust/tw_cosmos_sdk/fuzz/Cargo.toml
new file mode 100644
index 00000000000..519510a0a49
--- /dev/null
+++ b/rust/tw_cosmos_sdk/fuzz/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "tw_cosmos_sdk-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+tw_coin_entry = { path = "../../tw_coin_entry", features = ["test-utils"] }
+tw_keypair = { path = "../../tw_keypair" }
+tw_proto = { path = "../../tw_proto", features = ["fuzz"] }
+
+[dependencies.tw_cosmos_sdk]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "sign"
+path = "fuzz_targets/sign.rs"
+test = false
+doc = false
diff --git a/rust/tw_cosmos_sdk/fuzz/fuzz_targets/sign.rs b/rust/tw_cosmos_sdk/fuzz/fuzz_targets/sign.rs
new file mode 100644
index 00000000000..af6f1bca403
--- /dev/null
+++ b/rust/tw_cosmos_sdk/fuzz/fuzz_targets/sign.rs
@@ -0,0 +1,16 @@
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::modules::signer::tw_signer::TWSigner;
+use tw_keypair::tw::PublicKeyType;
+use tw_proto::Cosmos::Proto;
+
+fuzz_target!(|input: Proto::SigningInput<'_>| {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let _ = TWSigner::<StandardCosmosContext>::sign(&coin, input);
+});
diff --git a/rust/tw_cosmos_sdk/src/address.rs b/rust/tw_cosmos_sdk/src/address.rs
new file mode 100644
index 00000000000..f860be7ed31
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/address.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Serialize;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+
+pub type Address = tw_bech32_address::Bech32Address;
+pub type Bech32Prefix = tw_bech32_address::bech32_prefix::Bech32Prefix;
+
+pub trait CosmosAddress: FromStr<Err = AddressError> + Serialize + ToString {}
+
+impl CosmosAddress for Address {}
diff --git a/rust/tw_cosmos_sdk/src/context.rs b/rust/tw_cosmos_sdk/src/context.rs
new file mode 100644
index 00000000000..077c8c1ede4
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/context.rs
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::{Address, CosmosAddress};
+use crate::private_key::secp256k1::Secp256PrivateKey;
+use crate::private_key::CosmosPrivateKey;
+use crate::public_key::secp256k1::Secp256PublicKey;
+use crate::public_key::CosmosPublicKey;
+use crate::signature::secp256k1::Secp256k1Signature;
+use crate::signature::CosmosSignature;
+use tw_hash::hasher::Hasher;
+
+pub trait CosmosContext {
+    type Address: CosmosAddress;
+    type PrivateKey: CosmosPrivateKey;
+    type PublicKey: CosmosPublicKey;
+    type Signature: CosmosSignature;
+
+    fn default_tx_hasher() -> Hasher;
+}
+
+#[derive(Default)]
+pub struct StandardCosmosContext;
+
+impl CosmosContext for StandardCosmosContext {
+    type Address = Address;
+    type PrivateKey = Secp256PrivateKey;
+    type PublicKey = Secp256PublicKey;
+    type Signature = Secp256k1Signature;
+
+    fn default_tx_hasher() -> Hasher {
+        Hasher::Sha256
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/lib.rs b/rust/tw_cosmos_sdk/src/lib.rs
new file mode 100644
index 00000000000..a0a49da4057
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/lib.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod context;
+pub mod modules;
+pub mod private_key;
+pub mod public_key;
+pub mod signature;
+pub mod transaction;
+
+#[cfg(feature = "test-utils")]
+pub mod test_utils;
+
+#[allow(non_snake_case)]
+#[rustfmt::skip]
+pub mod proto {
+    use tw_proto::google;
+
+    include!(concat!(env!("OUT_DIR"), "/proto/mod.rs"));
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/broadcast_msg.rs b/rust/tw_cosmos_sdk/src/modules/broadcast_msg.rs
new file mode 100644
index 00000000000..a268e3d7876
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/broadcast_msg.rs
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use quick_protobuf::MessageWrite;
+use serde::Serialize;
+use serde_json::Value as Json;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base64::Base64Encoded;
+use tw_proto::serialize;
+
+pub enum BroadcastMode {
+    Block,
+    Async,
+    Sync,
+}
+
+#[derive(Serialize)]
+#[serde(untagged)]
+pub enum BroadcastMsg {
+    /// Binary representation of the transaction.
+    Raw {
+        mode: String,
+        tx_bytes: Base64Encoded,
+    },
+    /// JSON encoded transaction.
+    Json { mode: String, tx: Json },
+}
+
+impl BroadcastMsg {
+    pub fn raw<Tx: MessageWrite>(mode: BroadcastMode, tx: &Tx) -> BroadcastMsg {
+        let mode = match mode {
+            BroadcastMode::Block => "BROADCAST_MODE_BLOCK",
+            BroadcastMode::Async => "BROADCAST_MODE_ASYNC",
+            BroadcastMode::Sync => "BROADCAST_MODE_SYNC",
+        }
+        .to_string();
+        let tx_bytes = Base64Encoded(serialize(tx).expect("Error on serializing transaction"));
+        BroadcastMsg::Raw { mode, tx_bytes }
+    }
+
+    pub fn json<Tx: Serialize>(mode: BroadcastMode, tx: Tx) -> SigningResult<BroadcastMsg> {
+        let mode = match mode {
+            BroadcastMode::Block => "block",
+            BroadcastMode::Async => "async",
+            BroadcastMode::Sync => "sync",
+        }
+        .to_string();
+        let tx = serde_json::to_value(tx)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing transaction to sign as JSON")?;
+        Ok(BroadcastMsg::Json { mode, tx })
+    }
+
+    pub fn to_json_string(&self) -> String {
+        // It's safe to unwrap here because `BroadcastMsg` consists of checked fields only.
+        serde_json::to_string(self).expect("Unexpected error on serializing a BroadcastMsg")
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/compiler/json_preimager.rs b/rust/tw_cosmos_sdk/src/modules/compiler/json_preimager.rs
new file mode 100644
index 00000000000..9e2a372dcd5
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/compiler/json_preimager.rs
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use crate::modules::serializer::json_serializer::JsonSerializer;
+use crate::public_key::JsonPublicKey;
+use crate::transaction::UnsignedTransaction;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::hasher::Hasher;
+use tw_memory::Data;
+
+pub struct JsonTxPreimage {
+    pub encoded_tx: String,
+    pub tx_hash: Data,
+}
+
+pub struct JsonPreimager<Context: CosmosContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: CosmosContext> JsonPreimager<Context>
+where
+    Context::PublicKey: JsonPublicKey,
+{
+    pub fn preimage_hash(
+        unsigned: &UnsignedTransaction<Context>,
+        hasher: Hasher,
+    ) -> SigningResult<JsonTxPreimage> {
+        let tx_to_sign = JsonSerializer::build_unsigned_tx(unsigned)?;
+        let encoded_tx = serde_json::to_string(&tx_to_sign)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing transaction to sign as JSON")?;
+        let tx_hash = hasher.hash(encoded_tx.as_bytes());
+
+        Ok(JsonTxPreimage {
+            encoded_tx,
+            tx_hash,
+        })
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/compiler/mod.rs b/rust/tw_cosmos_sdk/src/modules/compiler/mod.rs
new file mode 100644
index 00000000000..e91eafedb72
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/compiler/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod json_preimager;
+pub mod protobuf_preimager;
+pub mod tw_compiler;
diff --git a/rust/tw_cosmos_sdk/src/modules/compiler/protobuf_preimager.rs b/rust/tw_cosmos_sdk/src/modules/compiler/protobuf_preimager.rs
new file mode 100644
index 00000000000..57f9aea9116
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/compiler/protobuf_preimager.rs
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use crate::modules::serializer::protobuf_serializer::{ProtobufSerializer, SignDirectArgs};
+use crate::transaction::UnsignedTransaction;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::hasher::Hasher;
+use tw_memory::Data;
+use tw_proto::serialize;
+
+pub struct ProtobufTxPreimage {
+    pub encoded_tx: Data,
+    pub tx_hash: Data,
+}
+
+pub struct ProtobufPreimager<Context: CosmosContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: CosmosContext> ProtobufPreimager<Context> {
+    pub fn preimage_hash(
+        unsigned: &UnsignedTransaction<Context>,
+        hasher: Hasher,
+    ) -> SigningResult<ProtobufTxPreimage> {
+        let tx_to_sign = ProtobufSerializer::build_sign_doc(unsigned)?;
+        let encoded_tx = serialize(&tx_to_sign)?;
+        let tx_hash = hasher.hash(&encoded_tx);
+
+        Ok(ProtobufTxPreimage {
+            encoded_tx,
+            tx_hash,
+        })
+    }
+
+    pub fn preimage_hash_direct(
+        args: &SignDirectArgs,
+        hasher: Hasher,
+    ) -> SigningResult<ProtobufTxPreimage> {
+        let tx_to_sign = ProtobufSerializer::<Context>::build_direct_sign_doc(args);
+        let encoded_tx = serialize(&tx_to_sign)?;
+        let tx_hash = hasher.hash(&encoded_tx);
+
+        Ok(ProtobufTxPreimage {
+            encoded_tx,
+            tx_hash,
+        })
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/compiler/tw_compiler.rs b/rust/tw_cosmos_sdk/src/modules/compiler/tw_compiler.rs
new file mode 100644
index 00000000000..544933f3964
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/compiler/tw_compiler.rs
@@ -0,0 +1,209 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use crate::modules::broadcast_msg::{BroadcastMode, BroadcastMsg};
+use crate::modules::compiler::json_preimager::JsonPreimager;
+use crate::modules::compiler::protobuf_preimager::ProtobufPreimager;
+use crate::modules::serializer::json_serializer::JsonSerializer;
+use crate::modules::serializer::protobuf_serializer::ProtobufSerializer;
+use crate::modules::tx_builder::TxBuilder;
+use crate::public_key::CosmosPublicKey;
+use std::borrow::Cow;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::common::compile_input::SingleSignaturePubkey;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Cosmos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct TWTransactionCompiler<Context: CosmosContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: CosmosContext> TWTransactionCompiler<Context> {
+    #[inline]
+    pub fn preimage_hashes(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    #[inline]
+    pub fn compile(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(coin, input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    #[inline]
+    pub(crate) fn preimage_hashes_impl(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        match input.signing_mode {
+            Proto::SigningMode::JSON => Self::preimage_hashes_as_json(coin, input),
+            Proto::SigningMode::Protobuf => Self::preimage_hashes_as_protobuf(coin, input),
+        }
+    }
+
+    pub(crate) fn preimage_hashes_as_protobuf(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let tx_hasher = TxBuilder::<Context>::tx_hasher_from_proto(&input);
+        let preimage = match TxBuilder::<Context>::try_sign_direct_args(&input) {
+            // If there was a `SignDirect` message in the signing input, generate the tx preimage directly.
+            Ok(Some(sign_direct_args)) => {
+                ProtobufPreimager::<Context>::preimage_hash_direct(&sign_direct_args, tx_hasher)?
+            },
+            // Otherwise, generate the tx preimage by using `TxBuilder`.
+            _ => {
+                // Please note the [`Proto::SigningInput::public_key`] should be set already.
+                let unsigned_tx = TxBuilder::<Context>::unsigned_tx_from_proto(coin, &input)?;
+                ProtobufPreimager::<Context>::preimage_hash(&unsigned_tx, tx_hasher)?
+            },
+        };
+
+        Ok(CompilerProto::PreSigningOutput {
+            data: Cow::from(preimage.encoded_tx),
+            data_hash: Cow::from(preimage.tx_hash),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    pub(crate) fn preimage_hashes_as_json(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        // Please note the [`Proto::SigningInput::public_key`] should be set already.
+        let unsigned_tx = TxBuilder::<Context>::unsigned_tx_from_proto(coin, &input)?;
+        let tx_hasher = TxBuilder::<Context>::tx_hasher_from_proto(&input);
+        let preimage = JsonPreimager::preimage_hash(&unsigned_tx, tx_hasher)?;
+
+        Ok(CompilerProto::PreSigningOutput {
+            data: Cow::from(preimage.encoded_tx.as_bytes().to_vec()),
+            data_hash: Cow::from(preimage.tx_hash),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    #[inline]
+    pub(crate) fn compile_impl(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        match input.signing_mode {
+            Proto::SigningMode::JSON => Self::compile_as_json(coin, input, signatures, public_keys),
+            Proto::SigningMode::Protobuf => {
+                Self::compile_as_protobuf(coin, input, signatures, public_keys)
+            },
+        }
+    }
+
+    pub(crate) fn compile_as_protobuf(
+        coin: &dyn CoinContext,
+        mut input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let SingleSignaturePubkey {
+            signature,
+            public_key,
+        } = SingleSignaturePubkey::from_sign_pubkey_list(signatures, public_keys)?;
+        let signature = Context::Signature::try_from(&signature)?;
+
+        let params = TxBuilder::<Context>::public_key_params_from_proto(&input);
+        let public_key = Context::PublicKey::from_bytes(coin, &public_key, params)?;
+
+        let signed_tx_raw = match TxBuilder::<Context>::try_sign_direct_args(&input) {
+            // If there was a `SignDirect` message in the signing input, generate the `TxRaw` directly.
+            Ok(Some(sign_direct_args)) => ProtobufSerializer::<Context>::build_direct_signed_tx(
+                &sign_direct_args,
+                signature.to_vec(),
+            ),
+            // Otherwise, generate the `TxRaw` by using `TxBuilder`.
+            _ => {
+                // Set the public key. It will be used to construct a signer info.
+                input.public_key = Cow::from(public_key.to_bytes());
+                let unsigned_tx = TxBuilder::<Context>::unsigned_tx_from_proto(coin, &input)?;
+                let signed_tx = unsigned_tx.into_signed(signature.to_vec());
+
+                ProtobufSerializer::build_signed_tx(&signed_tx)?
+            },
+        };
+
+        let broadcast_mode = Self::broadcast_mode(input.mode);
+        let broadcast_tx = BroadcastMsg::raw(broadcast_mode, &signed_tx_raw).to_json_string();
+
+        let signature_json =
+            JsonSerializer::<Context>::serialize_signature(&public_key, signature.to_vec());
+        let signature_json = serde_json::to_string(&[signature_json])
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing signatures as JSON")?;
+
+        Ok(Proto::SigningOutput {
+            signature: Cow::from(signature.to_vec()),
+            signature_json: Cow::from(signature_json),
+            serialized: Cow::from(broadcast_tx),
+            ..Proto::SigningOutput::default()
+        })
+    }
+
+    pub(crate) fn compile_as_json(
+        coin: &dyn CoinContext,
+        mut input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let SingleSignaturePubkey {
+            signature,
+            public_key,
+        } = SingleSignaturePubkey::from_sign_pubkey_list(signatures, public_keys)?;
+        let signature = Context::Signature::try_from(&signature)?;
+
+        let params = TxBuilder::<Context>::public_key_params_from_proto(&input);
+        let public_key = Context::PublicKey::from_bytes(coin, &public_key, params)?;
+
+        // Set the public key. It will be used to construct a signer info.
+        input.public_key = Cow::from(public_key.to_bytes());
+        let unsigned_tx = TxBuilder::<Context>::unsigned_tx_from_proto(coin, &input)?;
+        let signed_tx = unsigned_tx.into_signed(signature.to_vec());
+
+        let signed_tx_json = JsonSerializer::build_signed_tx(&signed_tx)?;
+
+        let broadcast_mode = Self::broadcast_mode(input.mode);
+        let broadcast_tx = BroadcastMsg::json(broadcast_mode, &signed_tx_json)?.to_json_string();
+
+        let signature_json = serde_json::to_string(&signed_tx_json.signatures)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing signatures as JSON")?;
+
+        Ok(Proto::SigningOutput {
+            signature: Cow::from(signature.to_vec()),
+            signature_json: Cow::from(signature_json),
+            json: Cow::from(broadcast_tx),
+            ..Proto::SigningOutput::default()
+        })
+    }
+
+    fn broadcast_mode(input: Proto::BroadcastMode) -> BroadcastMode {
+        match input {
+            Proto::BroadcastMode::BLOCK => BroadcastMode::Block,
+            Proto::BroadcastMode::SYNC => BroadcastMode::Sync,
+            Proto::BroadcastMode::ASYNC => BroadcastMode::Async,
+        }
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/mod.rs b/rust/tw_cosmos_sdk/src/modules/mod.rs
new file mode 100644
index 00000000000..78d55f5dedd
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/mod.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod broadcast_msg;
+pub mod compiler;
+pub mod serializer;
+pub mod signer;
+pub mod transaction_util;
+pub mod tx_builder;
diff --git a/rust/tw_cosmos_sdk/src/modules/serializer/json_serializer.rs b/rust/tw_cosmos_sdk/src/modules/serializer/json_serializer.rs
new file mode 100644
index 00000000000..f38d8e5d9db
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/serializer/json_serializer.rs
@@ -0,0 +1,145 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use crate::private_key::SignatureData;
+use crate::public_key::{CosmosPublicKey, JsonPublicKey};
+use crate::transaction::{Coin, Fee, SignedTransaction, UnsignedTransaction};
+use serde::Serialize;
+use serde_json::Value as Json;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::base64::Base64Encoded;
+
+#[derive(Serialize)]
+pub struct SignedTxJson {
+    pub fee: FeeJson,
+    pub memo: String,
+    pub msg: Vec<AnyMsg<Json>>,
+    pub signatures: Vec<SignatureJson>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(default)]
+    pub timeout_height: Option<String>,
+}
+
+#[derive(Serialize)]
+pub struct UnsignedTxJson {
+    pub account_number: String,
+    pub chain_id: String,
+    pub fee: FeeJson,
+    pub memo: String,
+    pub msgs: Vec<AnyMsg<Json>>,
+    pub sequence: String,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    #[serde(default)]
+    pub timeout_height: Option<String>,
+}
+
+#[derive(Serialize)]
+pub struct FeeJson {
+    pub amount: Vec<Coin>,
+    pub gas: String,
+}
+
+#[derive(Clone, Serialize)]
+pub struct AnyMsg<Value> {
+    #[serde(rename = "type")]
+    pub msg_type: String,
+    pub value: Value,
+}
+
+#[derive(Clone, Serialize)]
+pub struct SignatureJson {
+    pub pub_key: AnyMsg<Base64Encoded>,
+    pub signature: Base64Encoded,
+}
+
+/// `JsonSerializer` serializes transaction to JSON in Cosmos specific way.
+pub struct JsonSerializer<Context: CosmosContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context> JsonSerializer<Context>
+where
+    Context: CosmosContext,
+    Context::PublicKey: JsonPublicKey,
+{
+    pub fn build_signed_tx(signed: &SignedTransaction<Context>) -> SigningResult<SignedTxJson> {
+        let msg = signed
+            .tx_body
+            .messages
+            .iter()
+            .map(|msg| msg.to_json())
+            .collect::<SigningResult<_>>()?;
+        let signature =
+            Self::serialize_signature(&signed.signer.public_key, signed.signature.clone());
+
+        let convert = |value: u64| {
+            if value == 0 {
+                None
+            } else {
+                Some(value.to_string())
+            }
+        };
+        Ok(SignedTxJson {
+            fee: Self::build_fee(&signed.fee),
+            memo: signed.tx_body.memo.clone(),
+            msg,
+            signatures: vec![signature],
+            timeout_height: convert(signed.tx_body.timeout_height),
+        })
+    }
+
+    pub fn build_unsigned_tx(
+        unsigned: &UnsignedTransaction<Context>,
+    ) -> SigningResult<UnsignedTxJson> {
+        let msgs = unsigned
+            .tx_body
+            .messages
+            .iter()
+            .map(|msg| msg.to_json())
+            .collect::<SigningResult<_>>()?;
+
+        let convert = |value: u64| {
+            if value == 0 {
+                None
+            } else {
+                Some(value.to_string())
+            }
+        };
+        Ok(UnsignedTxJson {
+            account_number: unsigned.account_number.to_string(),
+            chain_id: unsigned.chain_id.clone(),
+            fee: Self::build_fee(&unsigned.fee),
+            memo: unsigned.tx_body.memo.clone(),
+            msgs,
+            sequence: unsigned.signer.sequence.to_string(),
+            timeout_height: convert(unsigned.tx_body.timeout_height),
+        })
+    }
+
+    pub fn serialize_signature(
+        public_key: &Context::PublicKey,
+        signature: SignatureData,
+    ) -> SignatureJson {
+        SignatureJson {
+            pub_key: Self::serialize_public_key(public_key),
+            signature: Base64Encoded(signature),
+        }
+    }
+
+    pub fn serialize_public_key(public_key: &Context::PublicKey) -> AnyMsg<Base64Encoded> {
+        AnyMsg {
+            msg_type: public_key.public_key_type(),
+            value: Base64Encoded(public_key.to_bytes()),
+        }
+    }
+
+    pub fn build_fee(fee: &Fee<Context::Address>) -> FeeJson {
+        FeeJson {
+            gas: fee.gas_limit.to_string(),
+            amount: fee.amounts.clone(),
+        }
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/serializer/mod.rs b/rust/tw_cosmos_sdk/src/modules/serializer/mod.rs
new file mode 100644
index 00000000000..7b18b177500
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/serializer/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod json_serializer;
+pub mod protobuf_serializer;
diff --git a/rust/tw_cosmos_sdk/src/modules/serializer/protobuf_serializer.rs b/rust/tw_cosmos_sdk/src/modules/serializer/protobuf_serializer.rs
new file mode 100644
index 00000000000..91141c2e1f1
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/serializer/protobuf_serializer.rs
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use crate::proto::cosmos::base::v1beta1 as base_proto;
+use crate::proto::cosmos::signing::v1beta1 as signing_proto;
+use crate::proto::cosmos::tx::v1beta1 as tx_proto;
+use crate::public_key::ProtobufPublicKey;
+use crate::transaction::{
+    Coin, Fee, SignMode, SignedTransaction, SignerInfo, TxBody, UnsignedTransaction,
+};
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+use tw_proto::serialize;
+
+pub fn build_coin(coin: &Coin) -> base_proto::Coin {
+    base_proto::Coin {
+        amount: coin.amount.to_string(),
+        denom: coin.denom.clone(),
+    }
+}
+
+/// `ProtobufSerializer` serializes Cosmos specific Protobuf messages.
+pub struct ProtobufSerializer<Context> {
+    _phantom: PhantomData<Context>,
+}
+
+pub struct SignDirectArgs {
+    pub tx_body: Data,
+    pub auth_info: Data,
+    pub chain_id: String,
+    pub account_number: u64,
+}
+
+impl<Context: CosmosContext> ProtobufSerializer<Context> {
+    /// Serializes a signed transaction into the Cosmos [`tx_proto::TxRaw`] message.
+    /// [`tx_proto::TxRaw`] can be broadcasted to the network.
+    pub fn build_signed_tx(signed: &SignedTransaction<Context>) -> SigningResult<tx_proto::TxRaw> {
+        let tx_body = Self::build_tx_body(&signed.tx_body)?;
+        let body_bytes = serialize(&tx_body).expect("Unexpected error on tx_body serialization");
+
+        let auth_info = Self::build_auth_info(&signed.signer, &signed.fee);
+        let auth_info_bytes =
+            serialize(&auth_info).expect("Unexpected error on auth_info serialization");
+
+        Ok(tx_proto::TxRaw {
+            body_bytes,
+            auth_info_bytes,
+            signatures: vec![signed.signature.clone()],
+        })
+    }
+
+    pub fn build_direct_signed_tx(args: &SignDirectArgs, signature: Data) -> tx_proto::TxRaw {
+        tx_proto::TxRaw {
+            body_bytes: args.tx_body.clone(),
+            auth_info_bytes: args.auth_info.clone(),
+            signatures: vec![signature],
+        }
+    }
+
+    /// Serializes an unsigned transaction into the Cosmos [`tx_proto::SignDoc`] message.
+    /// [`tx_proto::SignDoc`] is used to generate a transaction prehash and sign it.
+    pub fn build_sign_doc(
+        unsigned: &UnsignedTransaction<Context>,
+    ) -> SigningResult<tx_proto::SignDoc> {
+        let tx_body = Self::build_tx_body(&unsigned.tx_body)?;
+        let body_bytes = serialize(&tx_body).expect("Unexpected error on tx_body serialization");
+
+        let auth_info = Self::build_auth_info(&unsigned.signer, &unsigned.fee);
+        let auth_info_bytes =
+            serialize(&auth_info).expect("Unexpected error on auth_info serialization");
+
+        Ok(tx_proto::SignDoc {
+            body_bytes,
+            auth_info_bytes,
+            chain_id: unsigned.chain_id.clone(),
+            account_number: unsigned.account_number,
+        })
+    }
+
+    pub fn build_direct_sign_doc(args: &SignDirectArgs) -> tx_proto::SignDoc {
+        tx_proto::SignDoc {
+            body_bytes: args.tx_body.clone(),
+            auth_info_bytes: args.auth_info.clone(),
+            chain_id: args.chain_id.clone(),
+            account_number: args.account_number,
+        }
+    }
+
+    pub fn build_auth_info(
+        signer: &SignerInfo<Context::PublicKey>,
+        fee: &Fee<Context::Address>,
+    ) -> tx_proto::AuthInfo {
+        tx_proto::AuthInfo {
+            signer_infos: vec![Self::build_signer_info(signer)],
+            fee: Some(Self::build_fee(fee)),
+            // At this moment, we do not support transaction tip.
+            tip: None,
+        }
+    }
+
+    pub fn build_tx_body(tx_body: &TxBody) -> SigningResult<tx_proto::TxBody> {
+        let messages: Vec<_> = tx_body
+            .messages
+            .iter()
+            .map(|msg| msg.to_proto())
+            .collect::<SigningResult<_>>()?;
+
+        Ok(tx_proto::TxBody {
+            messages,
+            memo: tx_body.memo.clone(),
+            timeout_height: tx_body.timeout_height,
+            extension_options: Vec::default(),
+            non_critical_extension_options: Vec::default(),
+        })
+    }
+
+    pub fn build_signer_info(signer: &SignerInfo<Context::PublicKey>) -> tx_proto::SignerInfo {
+        use tx_proto::mod_ModeInfo::{self as mode_info, OneOfsum as SumEnum};
+
+        // Single is the mode info for a single signer. It is structured as a message
+        // to allow for additional fields such as locale for SIGN_MODE_TEXTUAL in the future.
+        let mode_info = tx_proto::ModeInfo {
+            sum: SumEnum::single(mode_info::Single {
+                mode: Self::build_sign_mode(signer.sign_mode),
+            }),
+        };
+
+        tx_proto::SignerInfo {
+            public_key: Some(signer.public_key.to_proto()),
+            mode_info: Some(mode_info),
+            sequence: signer.sequence,
+        }
+    }
+
+    fn build_fee(fee: &Fee<Context::Address>) -> tx_proto::Fee {
+        tx_proto::Fee {
+            amount: fee.amounts.iter().map(build_coin).collect(),
+            gas_limit: fee.gas_limit,
+            // Ignore `payer` and `granter` even if they set.
+            payer: String::default(),
+            granter: String::default(),
+        }
+    }
+
+    fn build_sign_mode(sign_mode: SignMode) -> signing_proto::SignMode {
+        match sign_mode {
+            SignMode::Direct => signing_proto::SignMode::SIGN_MODE_DIRECT,
+            SignMode::Other(other) => signing_proto::SignMode::from(other),
+        }
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/signer/mod.rs b/rust/tw_cosmos_sdk/src/modules/signer/mod.rs
new file mode 100644
index 00000000000..20b32a4f88d
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/signer/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod tw_signer;
diff --git a/rust/tw_cosmos_sdk/src/modules/signer/tw_signer.rs b/rust/tw_cosmos_sdk/src/modules/signer/tw_signer.rs
new file mode 100644
index 00000000000..5908ae38efa
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/signer/tw_signer.rs
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use crate::modules::compiler::tw_compiler::TWTransactionCompiler;
+use crate::modules::tx_builder::TxBuilder;
+use crate::private_key::CosmosPrivateKey;
+use crate::public_key::CosmosPublicKey;
+use std::borrow::Cow;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_proto::Cosmos::Proto;
+
+pub struct TWSigner<Context> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: CosmosContext> TWSigner<Context> {
+    #[inline]
+    pub fn sign(
+        coin: &dyn CoinContext,
+        input: Proto::SigningInput<'_>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::sign_impl(coin, input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_impl(
+        coin: &dyn CoinContext,
+        mut input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let private_key = Context::PrivateKey::try_from(&input.private_key)?;
+
+        let params = TxBuilder::<Context>::public_key_params_from_proto(&input);
+        let public_key = Context::PublicKey::from_private_key(coin, private_key.as_ref(), params)?;
+
+        // Set the public key. It will be used to construct a signer info.
+        input.public_key = Cow::from(public_key.to_bytes());
+
+        let preimage_output =
+            TWTransactionCompiler::<Context>::preimage_hashes_impl(coin, input.clone())?;
+
+        let signature_data = private_key.sign_tx_hash(&preimage_output.data_hash)?;
+        TWTransactionCompiler::<Context>::compile_impl(
+            coin,
+            input,
+            vec![signature_data],
+            vec![public_key.to_bytes()],
+        )
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/transaction_util.rs b/rust/tw_cosmos_sdk/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..44ed31dcf34
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/transaction_util.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_util::TransactionUtil;
+use tw_encoding::base64;
+use tw_encoding::base64::STANDARD;
+use tw_encoding::hex::encode;
+
+pub struct CosmosTransactionUtil<Context: CosmosContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: CosmosContext> Default for CosmosTransactionUtil<Context> {
+    fn default() -> Self {
+        Self {
+            _phantom: PhantomData,
+        }
+    }
+}
+
+impl<Context: CosmosContext> TransactionUtil for CosmosTransactionUtil<Context> {
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        Self::calc_tx_hash_impl(coin, encoded_tx)
+    }
+}
+
+impl<Context: CosmosContext> CosmosTransactionUtil<Context> {
+    fn calc_tx_hash_impl(_coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        let tx = base64::decode(encoded_tx, STANDARD)?;
+
+        let tx_hash = Context::default_tx_hasher().hash(&tx);
+
+        Ok(encode(&tx_hash, false).to_uppercase())
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/modules/tx_builder.rs b/rust/tw_cosmos_sdk/src/modules/tx_builder.rs
new file mode 100644
index 00000000000..519b4b89dae
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/modules/tx_builder.rs
@@ -0,0 +1,760 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::context::CosmosContext;
+use crate::modules::serializer::protobuf_serializer::SignDirectArgs;
+use crate::public_key::{CosmosPublicKey, PublicKeyParams};
+use crate::transaction::message::cosmos_generic_message::JsonRawMessage;
+use crate::transaction::message::{CosmosMessage, CosmosMessageBox};
+use crate::transaction::{Coin, Fee, SignMode, SignerInfo, TxBody, UnsignedTransaction};
+use std::marker::PhantomData;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::hasher::Hasher;
+use tw_keypair::tw;
+use tw_misc::traits::{OptionalEmpty, ToBytesVec};
+use tw_number::U256;
+use tw_proto::Cosmos::Proto;
+use tw_proto::{google, serialize};
+
+pub struct TxBuilder<Context> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context> TxBuilder<Context>
+where
+    Context: CosmosContext,
+{
+    /// Please note that [`Proto::SigningInput::public_key`] must be set.
+    /// If the public key should be derived from a private key, please do it before this method is called.
+    pub fn unsigned_tx_from_proto(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput<'_>,
+    ) -> SigningResult<UnsignedTransaction<Context>> {
+        let fee = input
+            .fee
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_wrong_fee)
+            .context("No fee specified")?;
+        let signer = Self::signer_info_from_proto(coin, input)?;
+
+        Ok(UnsignedTransaction {
+            signer,
+            fee: Self::fee_from_proto(fee)?,
+            chain_id: input.chain_id.to_string(),
+            account_number: input.account_number,
+            tx_body: Self::tx_body_from_proto(coin, input)?,
+        })
+    }
+
+    pub fn signer_info_from_proto(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput,
+    ) -> SigningResult<SignerInfo<Context::PublicKey>> {
+        let params = Self::public_key_params_from_proto(input);
+        let public_key = Context::PublicKey::from_bytes(coin, &input.public_key, params)?;
+
+        Ok(SignerInfo {
+            public_key,
+            sequence: input.sequence,
+            // At this moment, we support the Direct signing mode only.
+            sign_mode: SignMode::Direct,
+        })
+    }
+
+    pub fn public_key_params_from_proto(input: &Proto::SigningInput) -> Option<PublicKeyParams> {
+        input.signer_info.clone().map(|params| PublicKeyParams {
+            public_key_type: match params.public_key_type {
+                Proto::SignerPublicKeyType::Secp256k1 => tw::PublicKeyType::Secp256k1,
+                Proto::SignerPublicKeyType::Secp256k1Extended => {
+                    tw::PublicKeyType::Secp256k1Extended
+                },
+            },
+            json_type: params.json_type.to_string(),
+            protobuf_type_url: params.protobuf_type.to_string(),
+        })
+    }
+
+    pub fn tx_hasher_from_proto(input: &Proto::SigningInput) -> Hasher {
+        match input.tx_hasher {
+            Proto::TxHasher::UseDefault => Context::default_tx_hasher(),
+            Proto::TxHasher::Sha256 => Hasher::Sha256,
+            Proto::TxHasher::Keccak256 => Hasher::Keccak256,
+        }
+    }
+
+    fn fee_from_proto(input: &Proto::Fee) -> SigningResult<Fee<Context::Address>> {
+        let amounts = input
+            .amounts
+            .iter()
+            .map(Self::coin_from_proto)
+            .collect::<SigningResult<_>>()?;
+        Ok(Fee {
+            amounts,
+            gas_limit: input.gas,
+            payer: None,
+            granter: None,
+        })
+    }
+
+    fn coin_from_proto(input: &Proto::Amount<'_>) -> SigningResult<Coin> {
+        let amount = U256::from_str(&input.amount)
+            .into_tw()
+            .context("Invalid amount, expected string decimal")?;
+        Ok(Coin {
+            amount,
+            denom: input.denom.to_string(),
+        })
+    }
+
+    fn tx_body_from_proto(
+        coin: &dyn CoinContext,
+        input: &Proto::SigningInput<'_>,
+    ) -> SigningResult<TxBody> {
+        if input.messages.is_empty() {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No TX messages provided");
+        }
+
+        let messages = input
+            .messages
+            .iter()
+            .map(|msg| Self::tx_message(coin, msg))
+            .collect::<SigningResult<_>>()?;
+
+        Ok(TxBody {
+            messages,
+            memo: input.memo.to_string(),
+            timeout_height: input.timeout_height,
+        })
+    }
+
+    pub fn try_sign_direct_args(
+        input: &Proto::SigningInput<'_>,
+    ) -> SigningResult<Option<SignDirectArgs>> {
+        use Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+        let Some(msg) = input.messages.first() else {
+            return Ok(None);
+        };
+
+        match msg.message_oneof {
+            MessageEnum::sign_direct_message(ref direct) => Ok(Some(SignDirectArgs {
+                tx_body: direct.body_bytes.to_vec(),
+                auth_info: direct.auth_info_bytes.to_vec(),
+                chain_id: input.chain_id.to_string(),
+                account_number: input.account_number,
+            })),
+            _ => Ok(None),
+        }
+    }
+
+    pub fn tx_message(
+        coin: &dyn CoinContext,
+        input: &Proto::Message,
+    ) -> SigningResult<CosmosMessageBox> {
+        use Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+        match input.message_oneof {
+            MessageEnum::send_coins_message(ref send) => Self::send_msg_from_proto(coin, send),
+            MessageEnum::transfer_tokens_message(ref transfer) => {
+                Self::transfer_tokens_msg_from_proto(coin, transfer)
+            },
+            MessageEnum::stake_message(ref delegate) => {
+                Self::delegate_msg_from_proto(coin, delegate)
+            },
+            MessageEnum::unstake_message(ref undelegate) => {
+                Self::undelegate_msg_from_proto(coin, undelegate)
+            },
+            MessageEnum::withdraw_stake_reward_message(ref withdraw) => {
+                Self::withdraw_reward_msg_from_proto(coin, withdraw)
+            },
+            MessageEnum::set_withdraw_address_message(ref set) => {
+                Self::set_withdraw_address_msg_from_proto(coin, set)
+            },
+            MessageEnum::restake_message(ref redelegate) => {
+                Self::redelegate_msg_from_proto(coin, redelegate)
+            },
+            MessageEnum::raw_json_message(ref raw_json) => {
+                Self::wasm_raw_msg_from_proto(coin, raw_json)
+            },
+            MessageEnum::wasm_terra_execute_contract_transfer_message(ref transfer) => {
+                Self::wasm_terra_execute_contract_transfer_msg_from_proto(coin, transfer)
+            },
+            MessageEnum::wasm_terra_execute_contract_send_message(ref send) => {
+                Self::wasm_terra_execute_contract_send_msg_from_proto(coin, send)
+            },
+            MessageEnum::thorchain_send_message(ref send) => {
+                Self::thorchain_send_msg_from_proto(coin, send)
+            },
+            MessageEnum::wasm_terra_execute_contract_generic(ref generic) => {
+                Self::wasm_terra_execute_contract_generic_msg_from_proto(coin, generic)
+            },
+            MessageEnum::wasm_execute_contract_transfer_message(ref transfer) => {
+                Self::wasm_execute_contract_transfer_msg_from_proto(coin, transfer)
+            },
+            MessageEnum::wasm_execute_contract_send_message(ref send) => {
+                Self::wasm_execute_contract_send_msg_from_proto(coin, send)
+            },
+            MessageEnum::wasm_execute_contract_generic(ref generic) => {
+                Self::wasm_execute_contract_generic_msg_from_proto(coin, generic)
+            },
+            MessageEnum::sign_direct_message(ref _sign) => {
+                // `SignDirect` message must be handled before this function is called.
+                // Consider using `Self::try_sign_direct_args` instead.
+                SigningError::err(SigningErrorType::Error_not_supported)
+                    .context("Consider using `Self::try_sign_direct_args` instead")
+            },
+            MessageEnum::auth_grant(ref grant) => Self::auth_grant_msg_from_proto(coin, grant),
+            MessageEnum::auth_revoke(ref revoke) => Self::auth_revoke_msg_from_proto(coin, revoke),
+            MessageEnum::msg_vote(ref vote) => Self::vote_msg_from_proto(coin, vote),
+            MessageEnum::msg_stride_liquid_staking_stake(ref stake) => {
+                Self::stride_stake_msg_from_proto(coin, stake)
+            },
+            MessageEnum::msg_stride_liquid_staking_redeem(ref redeem) => {
+                Self::stride_redeem_msg_from_proto(coin, redeem)
+            },
+            MessageEnum::thorchain_deposit_message(ref deposit) => {
+                Self::thorchain_deposit_msg_from_proto(coin, deposit)
+            },
+            MessageEnum::None => SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No TX message provided"),
+        }
+    }
+
+    pub fn send_msg_from_proto(
+        _coin: &dyn CoinContext,
+        send: &Proto::mod_Message::Send<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_bank_message::SendMessage;
+
+        let amounts = send
+            .amounts
+            .iter()
+            .map(Self::coin_from_proto)
+            .collect::<SigningResult<_>>()?;
+        let msg = SendMessage {
+            custom_type_prefix: send.type_prefix.to_string().empty_or_some(),
+            from_address: Address::from_str(&send.from_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            to_address: Address::from_str(&send.to_address)
+                .into_tw()
+                .context("Invalid receiver address")?,
+            amount: amounts,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn transfer_tokens_msg_from_proto(
+        _coin: &dyn CoinContext,
+        transfer: &Proto::mod_Message::Transfer<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::ibc_message::{Height, TransferTokensMessage};
+
+        let token = transfer
+            .token
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("No token specified")?;
+        let token = Self::coin_from_proto(token)?;
+        let height = transfer
+            .timeout_height
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("No timeout height specified")?;
+
+        let msg = TransferTokensMessage {
+            source_port: transfer.source_port.to_string(),
+            source_channel: transfer.source_channel.to_string(),
+            token,
+            sender: Address::from_str(&transfer.sender)
+                .into_tw()
+                .context("Invalid sender address")?,
+            receiver: Address::from_str(&transfer.receiver)
+                .into_tw()
+                .context("Invalid receiver address")?,
+            timeout_height: Height {
+                revision_number: height.revision_number,
+                revision_height: height.revision_height,
+            },
+            timeout_timestamp: transfer.timeout_timestamp,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn delegate_msg_from_proto(
+        _coin: &dyn CoinContext,
+        delegate: &Proto::mod_Message::Delegate<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_staking_message::DelegateMessage;
+
+        let amount = delegate
+            .amount
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("No amount specified")?;
+        let amount = Self::coin_from_proto(amount)?;
+        let msg = DelegateMessage {
+            custom_type_prefix: delegate.type_prefix.to_string().empty_or_some(),
+            amount,
+            delegator_address: Address::from_str(&delegate.delegator_address)
+                .into_tw()
+                .context("Invalid delegator address")?,
+            validator_address: Address::from_str(&delegate.validator_address)
+                .into_tw()
+                .context("Invalid validator address")?,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn undelegate_msg_from_proto(
+        _coin: &dyn CoinContext,
+        undelegate: &Proto::mod_Message::Undelegate<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_staking_message::UndelegateMessage;
+
+        let amount = undelegate
+            .amount
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("No amount specified")?;
+        let amount = Self::coin_from_proto(amount)?;
+
+        let msg = UndelegateMessage {
+            custom_type_prefix: undelegate.type_prefix.to_string().empty_or_some(),
+            amount,
+            delegator_address: Address::from_str(&undelegate.delegator_address)
+                .into_tw()
+                .context("Invalid delegator address")?,
+            validator_address: Address::from_str(&undelegate.validator_address)
+                .into_tw()
+                .context("Invalid validator address")?,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn withdraw_reward_msg_from_proto(
+        _coin: &dyn CoinContext,
+        withdraw: &Proto::mod_Message::WithdrawDelegationReward<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_staking_message::WithdrawDelegationRewardMessage;
+
+        let msg = WithdrawDelegationRewardMessage {
+            custom_type_prefix: withdraw.type_prefix.to_string().empty_or_some(),
+            delegator_address: Address::from_str(&withdraw.delegator_address)
+                .into_tw()
+                .context("Invalid delegator address")?,
+            validator_address: Address::from_str(&withdraw.validator_address)
+                .into_tw()
+                .context("Invalid validator address")?,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn set_withdraw_address_msg_from_proto(
+        _coin: &dyn CoinContext,
+        set: &Proto::mod_Message::SetWithdrawAddress<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_staking_message::SetWithdrawAddressMessage;
+
+        let msg = SetWithdrawAddressMessage {
+            custom_type_prefix: set.type_prefix.to_string().empty_or_some(),
+            delegator_address: Address::from_str(&set.delegator_address)
+                .into_tw()
+                .context("Invalid delegator address")?,
+            withdraw_address: Address::from_str(&set.withdraw_address)
+                .into_tw()
+                .context("Invalid withdraw address")?,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn redelegate_msg_from_proto(
+        _coin: &dyn CoinContext,
+        redelegate: &Proto::mod_Message::BeginRedelegate<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_staking_message::BeginRedelegateMessage;
+
+        let amount = redelegate
+            .amount
+            .as_ref()
+            .or_tw_err(SigningErrorType::Error_invalid_params)
+            .context("No amount specified")?;
+        let amount = Self::coin_from_proto(amount)?;
+        let validator_src_address = Address::from_str(&redelegate.validator_src_address)
+            .into_tw()
+            .context("Invalid source validator address")?;
+        let validator_dst_address = Address::from_str(&redelegate.validator_dst_address)
+            .into_tw()
+            .context("Invalid destination validator address")?;
+
+        let msg = BeginRedelegateMessage {
+            custom_type_prefix: redelegate.type_prefix.to_string().empty_or_some(),
+            amount,
+            delegator_address: Address::from_str(&redelegate.delegator_address)
+                .into_tw()
+                .context("Invalid delegator address")?,
+            validator_src_address,
+            validator_dst_address,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn wasm_raw_msg_from_proto(
+        _coin: &dyn CoinContext,
+        raw: &Proto::mod_Message::RawJSON<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        let value = serde_json::from_str(&raw.value)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error parsing raw JSON")?;
+
+        let msg = JsonRawMessage {
+            msg_type: raw.type_pb.to_string(),
+            value,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn wasm_terra_execute_contract_transfer_msg_from_proto(
+        _coin: &dyn CoinContext,
+        transfer: &Proto::mod_Message::WasmTerraExecuteContractTransfer<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::terra_wasm_message::TerraExecuteContractMessage;
+        use crate::transaction::message::wasm_message::{ExecuteMsg, WasmExecutePayload};
+
+        let execute_payload = WasmExecutePayload::Transfer {
+            amount: U256::from_big_endian_slice(&transfer.amount)
+                .into_tw()
+                .context("Expected U256 big-endian amount")?,
+            recipient: transfer.recipient_address.to_string(),
+        };
+
+        let msg = TerraExecuteContractMessage {
+            sender: Address::from_str(&transfer.sender_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            contract: Address::from_str(&transfer.contract_address)
+                .into_tw()
+                .context("Invalid contract address")?,
+            execute_msg: ExecuteMsg::json(execute_payload)?,
+            // Used in case you are sending native tokens along with this message.
+            coins: Vec::default(),
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn wasm_terra_execute_contract_send_msg_from_proto(
+        _coin: &dyn CoinContext,
+        send: &Proto::mod_Message::WasmTerraExecuteContractSend<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::terra_wasm_message::TerraExecuteContractMessage;
+        use crate::transaction::message::wasm_message::{ExecuteMsg, WasmExecutePayload};
+
+        let execute_payload = WasmExecutePayload::Send {
+            amount: U256::from_big_endian_slice(&send.amount)
+                .into_tw()
+                .context("Expected U256 big-endian amount")?,
+            contract: send.recipient_contract_address.to_string(),
+            msg: send.msg.to_string(),
+        };
+
+        let msg = TerraExecuteContractMessage {
+            sender: Address::from_str(&send.sender_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            contract: Address::from_str(&send.contract_address)
+                .into_tw()
+                .context("Invalid contract address")?,
+            execute_msg: ExecuteMsg::json(execute_payload)?,
+            // Used in case you are sending native tokens along with this message.
+            coins: Vec::default(),
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn wasm_terra_execute_contract_generic_msg_from_proto(
+        _coin: &dyn CoinContext,
+        generic: &Proto::mod_Message::WasmTerraExecuteContractGeneric<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::terra_wasm_message::TerraExecuteContractMessage;
+        use crate::transaction::message::wasm_message::ExecuteMsg;
+
+        let coins = generic
+            .coins
+            .iter()
+            .map(Self::coin_from_proto)
+            .collect::<SigningResult<_>>()?;
+
+        let msg = TerraExecuteContractMessage {
+            sender: Address::from_str(&generic.sender_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            contract: Address::from_str(&generic.contract_address)
+                .into_tw()
+                .context("Invalid contract address")?,
+            execute_msg: ExecuteMsg::String(generic.execute_msg.to_string()),
+            coins,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn wasm_execute_contract_transfer_msg_from_proto(
+        _coin: &dyn CoinContext,
+        transfer: &Proto::mod_Message::WasmExecuteContractTransfer<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::wasm_message::{
+            ExecuteMsg, WasmExecuteContractMessage, WasmExecutePayload,
+        };
+
+        let transfer_payload = WasmExecutePayload::Transfer {
+            amount: U256::from_big_endian_slice(&transfer.amount)
+                .into_tw()
+                .context("Expected U256 big-endian amount")?,
+            recipient: transfer.recipient_address.to_string(),
+        };
+
+        let msg = WasmExecuteContractMessage {
+            sender: Address::from_str(&transfer.sender_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            contract: Address::from_str(&transfer.contract_address)
+                .into_tw()
+                .context("Invalid contract address")?,
+            msg: ExecuteMsg::json(transfer_payload)?,
+            // Used in case you are sending native tokens along with this message.
+            coins: Vec::default(),
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn wasm_execute_contract_send_msg_from_proto(
+        _coin: &dyn CoinContext,
+        send: &Proto::mod_Message::WasmExecuteContractSend<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::wasm_message::{
+            ExecuteMsg, WasmExecuteContractMessage, WasmExecutePayload,
+        };
+
+        let execute_payload = WasmExecutePayload::Send {
+            amount: U256::from_big_endian_slice(&send.amount)
+                .into_tw()
+                .context("Expected U256 big-endian amount")?,
+            contract: send.recipient_contract_address.to_string(),
+            msg: send.msg.to_string(),
+        };
+
+        let msg = WasmExecuteContractMessage {
+            sender: Address::from_str(&send.sender_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            contract: Address::from_str(&send.contract_address)
+                .into_tw()
+                .context("Invalid contract address")?,
+            msg: ExecuteMsg::json(execute_payload)?,
+            // Used in case you are sending native tokens along with this message.
+            coins: Vec::default(),
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn wasm_execute_contract_generic_msg_from_proto(
+        _coin: &dyn CoinContext,
+        generic: &Proto::mod_Message::WasmExecuteContractGeneric<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::wasm_message::{ExecuteMsg, WasmExecuteContractMessage};
+
+        let coins = generic
+            .coins
+            .iter()
+            .map(Self::coin_from_proto)
+            .collect::<SigningResult<_>>()?;
+
+        let msg = WasmExecuteContractMessage {
+            sender: Address::from_str(&generic.sender_address)
+                .into_tw()
+                .context("Invalid sender address")?,
+            contract: Address::from_str(&generic.contract_address)
+                .into_tw()
+                .context("Invalid contract address")?,
+            msg: ExecuteMsg::String(generic.execute_msg.to_string()),
+            coins,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn thorchain_send_msg_from_proto(
+        _coin: &dyn CoinContext,
+        send: &Proto::mod_Message::THORChainSend<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::thorchain_message::ThorchainSendMessage;
+
+        let amount = send
+            .amounts
+            .iter()
+            .map(Self::coin_from_proto)
+            .collect::<SigningResult<_>>()?;
+
+        let msg = ThorchainSendMessage {
+            from_address: send.from_address.to_vec(),
+            to_address: send.to_address.to_vec(),
+            amount,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn auth_grant_msg_from_proto(
+        _coin: &dyn CoinContext,
+        auth: &Proto::mod_Message::AuthGrant<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_auth_message::AuthGrantMessage;
+        use Proto::mod_Message::mod_AuthGrant::OneOfgrant_type as ProtoGrantType;
+
+        const STAKE_AUTHORIZATION_MSG_TYPE: &str = "/cosmos.staking.v1beta1.StakeAuthorization";
+
+        let grant_msg = match auth.grant_type {
+            ProtoGrantType::grant_stake(ref stake) => google::protobuf::Any {
+                type_url: STAKE_AUTHORIZATION_MSG_TYPE.to_string(),
+                value: serialize(stake)
+                    .tw_err(|_| SigningErrorType::Error_invalid_params)
+                    .context("Error serializing Grant Stake Protobuf message")?,
+            },
+            ProtoGrantType::None => {
+                return SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("No Grant type specified");
+            },
+        };
+
+        let msg = AuthGrantMessage {
+            granter: Address::from_str(&auth.granter)
+                .into_tw()
+                .context("Invalid granter address")?,
+            grantee: Address::from_str(&auth.grantee)
+                .into_tw()
+                .context("Invalid grantee address")?,
+            grant_msg,
+            expiration_secs: auth.expiration,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn auth_revoke_msg_from_proto(
+        _coin: &dyn CoinContext,
+        auth: &Proto::mod_Message::AuthRevoke<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_auth_message::AuthRevokeMessage;
+
+        let msg = AuthRevokeMessage {
+            granter: Address::from_str(&auth.granter)
+                .into_tw()
+                .context("Invalid granter address")?,
+            grantee: Address::from_str(&auth.grantee)
+                .into_tw()
+                .context("Invalid grantee address")?,
+            msg_type_url: auth.msg_type_url.to_string(),
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn vote_msg_from_proto(
+        _coin: &dyn CoinContext,
+        vote: &Proto::mod_Message::MsgVote<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::cosmos_gov_message::{VoteMessage, VoteOption};
+        use Proto::mod_Message::VoteOption as ProtoVoteOption;
+
+        let option = match vote.option {
+            ProtoVoteOption::_UNSPECIFIED => VoteOption::Unspecified,
+            ProtoVoteOption::YES => VoteOption::Yes,
+            ProtoVoteOption::ABSTAIN => VoteOption::Abstain,
+            ProtoVoteOption::NO => VoteOption::No,
+            ProtoVoteOption::NO_WITH_VETO => VoteOption::NoWithVeto,
+        };
+
+        let msg = VoteMessage {
+            proposal_id: vote.proposal_id,
+            voter: Address::from_str(&vote.voter)
+                .into_tw()
+                .context("Invalid voter address")?,
+            option,
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn stride_stake_msg_from_proto(
+        _coin: &dyn CoinContext,
+        stake: &Proto::mod_Message::MsgStrideLiquidStakingStake<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::stride_message::StrideLiquidStakeMessage;
+
+        let msg = StrideLiquidStakeMessage {
+            creator: Address::from_str(&stake.creator)
+                .into_tw()
+                .context("Invalid creator address")?,
+            amount: U256::from_str(&stake.amount)
+                .into_tw()
+                .context("Expected U256 big-endian amount")?,
+            host_denom: stake.host_denom.to_string(),
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn stride_redeem_msg_from_proto(
+        _coin: &dyn CoinContext,
+        redeem: &Proto::mod_Message::MsgStrideLiquidStakingRedeem<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::stride_message::StrideLiquidRedeemMessage;
+
+        let msg = StrideLiquidRedeemMessage {
+            creator: redeem.creator.to_string(),
+            amount: U256::from_str(&redeem.amount)
+                .into_tw()
+                .context("Expected U256 big-endian amount")?,
+            receiver: redeem.receiver.to_string(),
+            host_zone: redeem.host_zone.to_string(),
+        };
+        Ok(msg.into_boxed())
+    }
+
+    pub fn thorchain_deposit_msg_from_proto(
+        _coin: &dyn CoinContext,
+        deposit: &Proto::mod_Message::THORChainDeposit<'_>,
+    ) -> SigningResult<CosmosMessageBox> {
+        use crate::transaction::message::thorchain_message::{
+            ThorchainAsset, ThorchainCoin, ThorchainDepositMessage,
+        };
+
+        let mut coins = Vec::with_capacity(deposit.coins.len());
+        for coin_proto in deposit.coins.iter() {
+            let asset_proto = coin_proto
+                .asset
+                .as_ref()
+                .or_tw_err(SigningErrorType::Error_invalid_params)
+                .context("No Deposit Asset specified")?;
+
+            let asset = ThorchainAsset {
+                chain: asset_proto.chain.to_string(),
+                symbol: asset_proto.symbol.to_string(),
+                ticker: asset_proto.ticker.to_string(),
+                synth: asset_proto.synth,
+            };
+            coins.push(ThorchainCoin {
+                asset,
+                amount: U256::from_str(&coin_proto.amount)
+                    .into_tw()
+                    .context("Expected U256 big-endian Deposit amount")?,
+                decimals: coin_proto.decimals,
+            });
+        }
+
+        let msg = ThorchainDepositMessage {
+            coins,
+            memo: deposit.memo.to_string(),
+            signer: deposit.signer.to_vec(),
+        };
+        Ok(msg.into_boxed())
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/private_key/mod.rs b/rust/tw_cosmos_sdk/src/private_key/mod.rs
new file mode 100644
index 00000000000..7e60ed1dec9
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/private_key/mod.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::{tw, KeyPairError};
+use tw_memory::Data;
+use tw_misc::traits::FromSlice;
+
+pub mod secp256k1;
+
+pub type SignatureData = Data;
+
+pub trait CosmosPrivateKey: AsRef<tw::PrivateKey> + FromSlice<Error = KeyPairError> {
+    fn sign_tx_hash(&self, hash: &[u8]) -> SigningResult<SignatureData>;
+}
diff --git a/rust/tw_cosmos_sdk/src/private_key/secp256k1.rs b/rust/tw_cosmos_sdk/src/private_key/secp256k1.rs
new file mode 100644
index 00000000000..655b80d5a51
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/private_key/secp256k1.rs
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::private_key::CosmosPrivateKey;
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::tw;
+use tw_keypair::tw::Curve;
+use tw_keypair::KeyPairError;
+use tw_memory::Data;
+
+pub struct Secp256PrivateKey(tw::PrivateKey);
+
+impl AsRef<tw::PrivateKey> for Secp256PrivateKey {
+    fn as_ref(&self) -> &tw::PrivateKey {
+        &self.0
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for Secp256PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(value: &'a [u8]) -> Result<Self, Self::Error> {
+        tw::PrivateKey::new(value.to_vec()).map(Secp256PrivateKey)
+    }
+}
+
+impl CosmosPrivateKey for Secp256PrivateKey {
+    fn sign_tx_hash(&self, hash: &[u8]) -> SigningResult<Data> {
+        self.0
+            .sign(hash, Curve::Secp256k1)
+            .map_err(SigningError::from)
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/public_key/mod.rs b/rust/tw_cosmos_sdk/src/public_key/mod.rs
new file mode 100644
index 00000000000..746de80b584
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/public_key/mod.rs
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_keypair::{tw, KeyPairResult};
+use tw_memory::Data;
+use tw_proto::google;
+
+pub mod secp256k1;
+
+pub struct PublicKeyParams {
+    pub public_key_type: tw::PublicKeyType,
+    pub json_type: String,
+    pub protobuf_type_url: String,
+}
+
+pub trait CosmosPublicKey: JsonPublicKey + ProtobufPublicKey + Sized {
+    fn from_private_key(
+        coin: &dyn CoinContext,
+        private_key: &tw::PrivateKey,
+        params: Option<PublicKeyParams>,
+    ) -> KeyPairResult<Self> {
+        let public_key_type = match params {
+            Some(ref params) => params.public_key_type,
+            None => coin.public_key_type(),
+        };
+        let public_key = private_key.get_public_key_by_type(public_key_type)?;
+        Self::from_bytes(coin, &public_key.to_bytes(), params)
+    }
+
+    fn from_bytes(
+        coin: &dyn CoinContext,
+        public_key_bytes: &[u8],
+        params: Option<PublicKeyParams>,
+    ) -> KeyPairResult<Self>;
+
+    fn to_bytes(&self) -> Data;
+}
+
+pub trait ProtobufPublicKey {
+    fn to_proto(&self) -> google::protobuf::Any;
+}
+
+pub trait JsonPublicKey {
+    /// In most cases, [`JsonPublicKey::public_key_type`] returns a corresponding protobuf message type.
+    fn public_key_type(&self) -> String;
+}
diff --git a/rust/tw_cosmos_sdk/src/public_key/secp256k1.rs b/rust/tw_cosmos_sdk/src/public_key/secp256k1.rs
new file mode 100644
index 00000000000..6b147ed4238
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/public_key/secp256k1.rs
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::proto::cosmos;
+use crate::public_key::{CosmosPublicKey, JsonPublicKey, ProtobufPublicKey, PublicKeyParams};
+use tw_coin_entry::coin_context::CoinContext;
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::tw;
+use tw_keypair::{KeyPairError, KeyPairResult};
+use tw_memory::Data;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::{google, to_any_with_type_url, type_url};
+
+const DEFAULT_JSON_PUBLIC_KEY_TYPE: &str = "tendermint/PubKeySecp256k1";
+
+#[derive(Clone)]
+pub struct Secp256PublicKey {
+    public_key: Data,
+    json_type: String,
+    protobuf_type_url: String,
+}
+
+impl Secp256PublicKey {
+    pub fn from_secp256k1_public_key(
+        public_key_type: tw::PublicKeyType,
+        public_key: &secp256k1::PublicKey,
+    ) -> KeyPairResult<Self> {
+        let public_key =
+            prepare_secp256k1_public_key(public_key_type, public_key.compressed().as_slice())?;
+        Ok(Secp256PublicKey {
+            public_key,
+            json_type: DEFAULT_JSON_PUBLIC_KEY_TYPE.to_string(),
+            protobuf_type_url: type_url::<cosmos::crypto::secp256k1::PubKey>(),
+        })
+    }
+}
+
+impl CosmosPublicKey for Secp256PublicKey {
+    fn from_bytes(
+        coin: &dyn CoinContext,
+        public_key_bytes: &[u8],
+        maybe_params: Option<PublicKeyParams>,
+    ) -> KeyPairResult<Self> {
+        let params = maybe_params.unwrap_or_else(|| PublicKeyParams {
+            public_key_type: coin.public_key_type(),
+            json_type: DEFAULT_JSON_PUBLIC_KEY_TYPE.to_string(),
+            protobuf_type_url: type_url::<cosmos::crypto::secp256k1::PubKey>(),
+        });
+
+        let public_key = prepare_secp256k1_public_key(params.public_key_type, public_key_bytes)?;
+        Ok(Secp256PublicKey {
+            public_key,
+            json_type: params.json_type,
+            protobuf_type_url: params.protobuf_type_url,
+        })
+    }
+
+    fn to_bytes(&self) -> Data {
+        self.public_key.clone()
+    }
+}
+
+impl ProtobufPublicKey for Secp256PublicKey {
+    fn to_proto(&self) -> google::protobuf::Any {
+        let proto = cosmos::crypto::secp256k1::PubKey {
+            key: self.public_key.clone(),
+        };
+        to_any_with_type_url(&proto, self.protobuf_type_url.clone())
+    }
+}
+
+impl JsonPublicKey for Secp256PublicKey {
+    fn public_key_type(&self) -> String {
+        self.json_type.clone()
+    }
+}
+
+pub fn prepare_secp256k1_public_key(
+    public_key_type: tw::PublicKeyType,
+    public_key_bytes: &[u8],
+) -> KeyPairResult<Data> {
+    let public_key = secp256k1::PublicKey::try_from(public_key_bytes)?;
+    match public_key_type {
+        tw::PublicKeyType::Secp256k1 => Ok(public_key.compressed().to_vec()),
+        tw::PublicKeyType::Secp256k1Extended => Ok(public_key.uncompressed().to_vec()),
+        _ => Err(KeyPairError::InvalidPublicKey),
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/signature/mod.rs b/rust/tw_cosmos_sdk/src/signature/mod.rs
new file mode 100644
index 00000000000..573d46d61cc
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/signature/mod.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_keypair::KeyPairError;
+use tw_misc::traits::{FromSlice, ToBytesVec};
+
+pub mod secp256k1;
+
+pub trait CosmosSignature: FromSlice<Error = KeyPairError> + ToBytesVec {}
diff --git a/rust/tw_cosmos_sdk/src/signature/secp256k1.rs b/rust/tw_cosmos_sdk/src/signature/secp256k1.rs
new file mode 100644
index 00000000000..94b2be0d388
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/signature/secp256k1.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::signature::CosmosSignature;
+use tw_keypair::ecdsa::secp256k1;
+
+pub type Secp256k1Signature = secp256k1::VerifySignature;
+
+impl CosmosSignature for Secp256k1Signature {}
diff --git a/rust/tw_cosmos_sdk/src/test_utils/mod.rs b/rust/tw_cosmos_sdk/src/test_utils/mod.rs
new file mode 100644
index 00000000000..666af070a2c
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/test_utils/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod proto_utils;
+pub mod sign_utils;
diff --git a/rust/tw_cosmos_sdk/src/test_utils/proto_utils.rs b/rust/tw_cosmos_sdk/src/test_utils/proto_utils.rs
new file mode 100644
index 00000000000..8180be3feab
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/test_utils/proto_utils.rs
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+pub fn make_fee(gas: u64, amount: Proto::Amount<'_>) -> Proto::Fee<'_> {
+    Proto::Fee {
+        amounts: vec![amount],
+        gas,
+    }
+}
+
+pub fn make_fee_none(gas: u64) -> Proto::Fee<'static> {
+    Proto::Fee {
+        amounts: Vec::default(),
+        gas,
+    }
+}
+
+pub fn make_message(message_oneof: MessageEnum) -> Proto::Message {
+    Proto::Message { message_oneof }
+}
+
+pub fn make_amount<'a>(denom: &'a str, amount: &'a str) -> Proto::Amount<'a> {
+    Proto::Amount {
+        denom: denom.into(),
+        amount: amount.into(),
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/test_utils/sign_utils.rs b/rust/tw_cosmos_sdk/src/test_utils/sign_utils.rs
new file mode 100644
index 00000000000..88fb612fb00
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/test_utils/sign_utils.rs
@@ -0,0 +1,165 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use crate::modules::compiler::tw_compiler::TWTransactionCompiler;
+use crate::modules::signer::tw_signer::TWSigner;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Cosmos::Proto;
+
+#[derive(Clone)]
+pub struct TestInput<'a> {
+    pub coin: &'a dyn CoinContext,
+    pub input: Proto::SigningInput<'a>,
+    /// Stringified JSON object.
+    pub tx: &'a str,
+    /// Signature hex-encoded.
+    pub signature: &'a str,
+    /// Stringified signature JSON object.
+    pub signature_json: &'a str,
+}
+
+#[derive(Clone)]
+pub struct TestCompileInput<'a> {
+    pub coin: &'a dyn CoinContext,
+    pub input: Proto::SigningInput<'a>,
+    /// Either a stringified JSON object or a hex-encoded serialzied `SignDoc`.
+    pub tx_preimage: &'a str,
+    /// Expected transaction preimage hash.
+    pub tx_prehash: &'a str,
+    /// Stringified JSON object.
+    pub tx: &'a str,
+    /// Signature hex-encoded.
+    pub signature: &'a str,
+    /// Stringified signature JSON object.
+    pub signature_json: &'a str,
+}
+
+#[derive(Clone)]
+pub struct TestErrorInput<'a> {
+    pub coin: &'a dyn CoinContext,
+    pub input: Proto::SigningInput<'a>,
+    pub error: SigningErrorType,
+}
+
+#[track_caller]
+pub fn test_compile_protobuf<Context: CosmosContext>(mut test_input: TestCompileInput<'_>) {
+    test_input.input.signing_mode = Proto::SigningMode::Protobuf;
+    test_compile_impl::<Context>(test_input);
+}
+
+#[track_caller]
+pub fn test_compile_json<Context: CosmosContext>(mut test_input: TestCompileInput<'_>) {
+    test_input.input.signing_mode = Proto::SigningMode::JSON;
+    test_compile_impl::<Context>(test_input);
+}
+
+#[track_caller]
+pub fn test_sign_protobuf<Context: CosmosContext>(mut test_input: TestInput<'_>) {
+    test_input.input.signing_mode = Proto::SigningMode::Protobuf;
+    test_sign_impl::<Context>(test_input);
+}
+
+#[track_caller]
+pub fn test_sign_protobuf_error<Context: CosmosContext>(mut test_input: TestErrorInput<'_>) {
+    test_input.input.signing_mode = Proto::SigningMode::Protobuf;
+    let output = TWSigner::<Context>::sign(test_input.coin, test_input.input);
+    assert_eq!(output.error, test_input.error);
+}
+
+#[track_caller]
+pub fn test_sign_json<Context: CosmosContext>(mut test_input: TestInput<'_>) {
+    test_input.input.signing_mode = Proto::SigningMode::JSON;
+    test_sign_impl::<Context>(test_input);
+}
+
+#[track_caller]
+pub fn test_sign_json_error<Context: CosmosContext>(mut test_input: TestErrorInput<'_>) {
+    test_input.input.signing_mode = Proto::SigningMode::JSON;
+    let output = TWSigner::<Context>::sign(test_input.coin, test_input.input);
+    assert_eq!(output.error, test_input.error);
+}
+
+#[track_caller]
+fn test_sign_impl<Context: CosmosContext>(test_input: TestInput<'_>) {
+    let output = TWSigner::<Context>::sign(test_input.coin, test_input.input);
+    assert_eq!(output.error, SigningError::OK);
+    assert!(output.error_message.is_empty());
+
+    let result = if output.serialized.is_empty() {
+        output.json
+    } else {
+        output.serialized
+    };
+    assert_eq!(result, test_input.tx, "Unexpected result transaction");
+
+    assert_eq!(
+        output.signature.to_hex(),
+        test_input.signature,
+        "Unexpected signature"
+    );
+    assert_eq!(
+        output.signature_json, test_input.signature_json,
+        "Unexpected signature JSON"
+    );
+}
+
+#[track_caller]
+fn test_compile_impl<Context: CosmosContext>(test_input: TestCompileInput<'_>) {
+    // First step - generate the preimage hashes.
+    let preimage_output = TWTransactionCompiler::<Context>::preimage_hashes(
+        test_input.coin,
+        test_input.input.clone(),
+    );
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert!(preimage_output.error_message.is_empty());
+
+    let actual_str = match String::from_utf8(preimage_output.data.to_vec()) {
+        Ok(actual_tx) => actual_tx,
+        Err(_) => preimage_output.data.to_hex(),
+    };
+
+    assert_eq!(
+        actual_str, test_input.tx_preimage,
+        "Unexpected preimage transaction"
+    );
+    assert_eq!(
+        preimage_output.data_hash.to_hex(),
+        test_input.tx_prehash,
+        "Unexpected preimage hash"
+    );
+
+    // Second step - Compile the transaction.
+
+    let public_key = test_input.input.public_key.to_vec();
+    let compile_output = TWTransactionCompiler::<Context>::compile(
+        test_input.coin,
+        test_input.input,
+        vec![test_input.signature.decode_hex().unwrap()],
+        vec![public_key],
+    );
+
+    assert_eq!(compile_output.error, SigningError::OK);
+    assert!(compile_output.error_message.is_empty());
+
+    let result_tx = if compile_output.serialized.is_empty() {
+        compile_output.json
+    } else {
+        compile_output.serialized
+    };
+    assert_eq!(result_tx, test_input.tx, "Unexpected result transaction");
+
+    assert_eq!(
+        compile_output.signature.to_hex(),
+        test_input.signature,
+        "Unexpected signature"
+    );
+    assert_eq!(
+        compile_output.signature_json, test_input.signature_json,
+        "Unexpected signature JSON"
+    );
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/cosmos_auth_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_auth_message.rs
new file mode 100644
index 00000000000..32918948a7f
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_auth_message.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::CosmosAddress;
+use crate::proto::cosmos;
+use crate::transaction::message::{CosmosMessage, ProtobufMessage};
+use tw_coin_entry::error::prelude::*;
+use tw_proto::{google, to_any};
+
+/// Supports Protobuf serialization only.
+pub struct AuthGrantMessage<Address: CosmosAddress> {
+    pub granter: Address,
+    pub grantee: Address,
+    pub grant_msg: google::protobuf::Any,
+    pub expiration_secs: i64,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for AuthGrantMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let expiration = google::protobuf::Timestamp {
+            seconds: self.expiration_secs,
+            ..google::protobuf::Timestamp::default()
+        };
+        let grant = cosmos::authz::v1beta1::Grant {
+            authorization: Some(self.grant_msg.clone()),
+            expiration: Some(expiration),
+        };
+
+        let proto_msg = cosmos::authz::v1beta1::MsgGrant {
+            granter: self.granter.to_string(),
+            grantee: self.grantee.to_string(),
+            grant: Some(grant),
+        };
+        Ok(to_any(&proto_msg))
+    }
+}
+
+/// Supports Protobuf serialization only.
+pub struct AuthRevokeMessage<Address: CosmosAddress> {
+    pub granter: Address,
+    pub grantee: Address,
+    pub msg_type_url: String,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for AuthRevokeMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = cosmos::authz::v1beta1::MsgRevoke {
+            granter: self.granter.to_string(),
+            grantee: self.grantee.to_string(),
+            msg_type_url: self.msg_type_url.clone(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/cosmos_bank_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_bank_message.rs
new file mode 100644
index 00000000000..7b09ec52056
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_bank_message.rs
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::CosmosAddress;
+use crate::modules::serializer::protobuf_serializer::build_coin;
+use crate::proto::cosmos;
+use crate::transaction::message::{message_to_json, CosmosMessage, JsonMessage, ProtobufMessage};
+use crate::transaction::Coin;
+use serde::Serialize;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::to_any;
+
+const DEFAULT_JSON_SEND_TYPE: &str = "cosmos-sdk/MsgSend";
+
+/// cosmos-sdk/MsgSend
+#[derive(Clone, Serialize)]
+pub struct SendMessage<Address: CosmosAddress> {
+    #[serde(skip)]
+    pub custom_type_prefix: Option<String>,
+    pub from_address: Address,
+    pub to_address: Address,
+    pub amount: Vec<Coin>,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for SendMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = cosmos::bank::v1beta1::MsgSend {
+            from_address: self.from_address.to_string(),
+            to_address: self.to_address.to_string(),
+            amount: self.amount.iter().map(build_coin).collect(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        let msg_type = self
+            .custom_type_prefix
+            .as_deref()
+            .unwrap_or(DEFAULT_JSON_SEND_TYPE);
+        message_to_json(msg_type, self)
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/cosmos_generic_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_generic_message.rs
new file mode 100644
index 00000000000..584ea6e3a22
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_generic_message.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::transaction::message::{CosmosMessage, JsonMessage};
+use serde_json::Value as Json;
+use tw_coin_entry::error::prelude::*;
+
+/// Any raw JSON message.
+/// Supports JSON serialization only.
+pub struct JsonRawMessage {
+    pub msg_type: String,
+    pub value: Json,
+}
+
+impl CosmosMessage for JsonRawMessage {
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        Ok(JsonMessage {
+            msg_type: self.msg_type.clone(),
+            value: self.value.clone(),
+        })
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/cosmos_gov_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_gov_message.rs
new file mode 100644
index 00000000000..6c990c14fff
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_gov_message.rs
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::CosmosAddress;
+use crate::proto::cosmos;
+use crate::transaction::message::{CosmosMessage, ProtobufMessage};
+use tw_coin_entry::error::prelude::*;
+use tw_proto::to_any;
+
+pub enum VoteOption {
+    Unspecified,
+    Yes,
+    Abstain,
+    No,
+    NoWithVeto,
+}
+
+pub struct VoteMessage<Address: CosmosAddress> {
+    pub proposal_id: u64,
+    pub voter: Address,
+    pub option: VoteOption,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for VoteMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        use cosmos::gov::v1beta1::VoteOption as ProtoVoteOption;
+
+        let option = match self.option {
+            VoteOption::Unspecified => ProtoVoteOption::VOTE_OPTION_UNSPECIFIED,
+            VoteOption::Yes => ProtoVoteOption::VOTE_OPTION_YES,
+            VoteOption::Abstain => ProtoVoteOption::VOTE_OPTION_ABSTAIN,
+            VoteOption::No => ProtoVoteOption::VOTE_OPTION_NO,
+            VoteOption::NoWithVeto => ProtoVoteOption::VOTE_OPTION_NO_WITH_VETO,
+        };
+
+        let proto_msg = cosmos::gov::v1beta1::MsgVote {
+            proposal_id: self.proposal_id,
+            voter: self.voter.to_string(),
+            option,
+        };
+        Ok(to_any(&proto_msg))
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/cosmos_staking_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_staking_message.rs
new file mode 100644
index 00000000000..dc3c6238b9c
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/cosmos_staking_message.rs
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::CosmosAddress;
+use crate::modules::serializer::protobuf_serializer::build_coin;
+use crate::proto::cosmos;
+use crate::transaction::message::{message_to_json, CosmosMessage, JsonMessage, ProtobufMessage};
+use crate::transaction::Coin;
+use serde::Serialize;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::to_any;
+
+const DEFAULT_JSON_SET_WITHDRAW_ADDRESS_TYPE: &str = "cosmos-sdk/MsgSetWithdrawAddress";
+const DEFAULT_JSON_WITHDRAW_REWARDS_TYPE: &str = "cosmos-sdk/MsgWithdrawDelegationReward";
+const DEFAULT_JSON_BEGIN_REDELEGATE_TYPE: &str = "cosmos-sdk/MsgBeginRedelegate";
+const DEFAULT_JSON_UNDELEGATE_TYPE: &str = "cosmos-sdk/MsgUndelegate";
+const DEFAULT_JSON_DELEGATE_TYPE: &str = "cosmos-sdk/MsgDelegate";
+
+/// cosmos-sdk/MsgDelegate
+#[derive(Serialize)]
+pub struct DelegateMessage<Address: CosmosAddress> {
+    #[serde(skip)]
+    pub custom_type_prefix: Option<String>,
+    pub amount: Coin,
+    pub delegator_address: Address,
+    pub validator_address: Address,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for DelegateMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = cosmos::staking::v1beta1::MsgDelegate {
+            amount: Some(build_coin(&self.amount)),
+            delegator_address: self.delegator_address.to_string(),
+            validator_address: self.validator_address.to_string(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        let msg_type = self
+            .custom_type_prefix
+            .as_deref()
+            .unwrap_or(DEFAULT_JSON_DELEGATE_TYPE);
+        message_to_json(msg_type, self)
+    }
+}
+
+/// cosmos-sdk/MsgUndelegate
+#[derive(Serialize)]
+pub struct UndelegateMessage<Address: CosmosAddress> {
+    #[serde(skip)]
+    pub custom_type_prefix: Option<String>,
+    pub amount: Coin,
+    pub delegator_address: Address,
+    pub validator_address: Address,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for UndelegateMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = cosmos::staking::v1beta1::MsgUndelegate {
+            amount: Some(build_coin(&self.amount)),
+            delegator_address: self.delegator_address.to_string(),
+            validator_address: self.validator_address.to_string(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        let msg_type = self
+            .custom_type_prefix
+            .as_deref()
+            .unwrap_or(DEFAULT_JSON_UNDELEGATE_TYPE);
+        message_to_json(msg_type, self)
+    }
+}
+
+/// cosmos-sdk/MsgBeginRedelegate
+#[derive(Serialize)]
+pub struct BeginRedelegateMessage<Address: CosmosAddress> {
+    #[serde(skip)]
+    pub custom_type_prefix: Option<String>,
+    pub amount: Coin,
+    pub delegator_address: Address,
+    pub validator_src_address: Address,
+    pub validator_dst_address: Address,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for BeginRedelegateMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = cosmos::staking::v1beta1::MsgBeginRedelegate {
+            amount: Some(build_coin(&self.amount)),
+            delegator_address: self.delegator_address.to_string(),
+            validator_src_address: self.validator_src_address.to_string(),
+            validator_dst_address: self.validator_dst_address.to_string(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        let msg_type = self
+            .custom_type_prefix
+            .as_deref()
+            .unwrap_or(DEFAULT_JSON_BEGIN_REDELEGATE_TYPE);
+        message_to_json(msg_type, self)
+    }
+}
+
+/// cosmos-sdk/MsgWithdrawDelegationReward
+#[derive(Serialize)]
+pub struct WithdrawDelegationRewardMessage<Address: CosmosAddress> {
+    #[serde(skip)]
+    pub custom_type_prefix: Option<String>,
+    pub delegator_address: Address,
+    pub validator_address: Address,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for WithdrawDelegationRewardMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = cosmos::distribution::v1beta1::MsgWithdrawDelegatorReward {
+            delegator_address: self.delegator_address.to_string(),
+            validator_address: self.validator_address.to_string(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        let msg_type = self
+            .custom_type_prefix
+            .as_deref()
+            .unwrap_or(DEFAULT_JSON_WITHDRAW_REWARDS_TYPE);
+        message_to_json(msg_type, self)
+    }
+}
+
+/// cosmos-sdk/MsgSetWithdrawAddress
+#[derive(Serialize)]
+pub struct SetWithdrawAddressMessage<Address: CosmosAddress> {
+    #[serde(skip)]
+    pub custom_type_prefix: Option<String>,
+    pub delegator_address: Address,
+    pub withdraw_address: Address,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for SetWithdrawAddressMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = cosmos::distribution::v1beta1::MsgSetWithdrawAddress {
+            delegator_address: self.delegator_address.to_string(),
+            withdraw_address: self.withdraw_address.to_string(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        let msg_type = self
+            .custom_type_prefix
+            .as_deref()
+            .unwrap_or(DEFAULT_JSON_SET_WITHDRAW_ADDRESS_TYPE);
+        message_to_json(msg_type, self)
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/ibc_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/ibc_message.rs
new file mode 100644
index 00000000000..e3cb7ae29eb
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/ibc_message.rs
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::CosmosAddress;
+use crate::modules::serializer::protobuf_serializer::build_coin;
+use crate::proto::ibc;
+use crate::transaction::message::{CosmosMessage, ProtobufMessage};
+use crate::transaction::Coin;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::to_any;
+
+pub struct Height {
+    pub revision_number: u64,
+    pub revision_height: u64,
+}
+
+pub struct TransferTokensMessage<Address: CosmosAddress> {
+    /// IBC port, e.g. "transfer".
+    pub source_port: String,
+    /// IBC connection channel, e.g. "channel-141", see apis /ibc/applications/transfer/v1beta1/denom_traces (connections) or /node_info (own channel).
+    pub source_channel: String,
+    pub token: Coin,
+    pub sender: Address,
+    pub receiver: Address,
+    /// Timeout block height. Either timeout height or timestamp should be set.
+    /// Recommendation is to set height, to rev. 1 and block current + 1000 (see api /blocks/latest).
+    pub timeout_height: Height,
+    // Timeout timestamp (in nanoseconds) relative to the current block timestamp.  Either timeout height or timestamp should be set.
+    pub timeout_timestamp: u64,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for TransferTokensMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let height = ibc::core::client::v1::Height {
+            revision_number: self.timeout_height.revision_number,
+            revision_height: self.timeout_height.revision_height,
+        };
+
+        let proto_msg = ibc::applications::transfer::v1::MsgTransfer {
+            source_port: self.source_port.clone(),
+            source_channel: self.source_channel.clone(),
+            token: Some(build_coin(&self.token)),
+            sender: self.sender.to_string(),
+            receiver: self.receiver.to_string(),
+            timeout_height: Some(height),
+            timeout_timestamp: self.timeout_timestamp,
+        };
+        Ok(to_any(&proto_msg))
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/mod.rs b/rust/tw_cosmos_sdk/src/transaction/message/mod.rs
new file mode 100644
index 00000000000..0ecc466e1fc
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/mod.rs
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::serializer::json_serializer::AnyMsg;
+use serde::Serialize;
+use serde_json::Value as Json;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::google;
+
+pub mod cosmos_auth_message;
+pub mod cosmos_bank_message;
+pub mod cosmos_generic_message;
+pub mod cosmos_gov_message;
+pub mod cosmos_staking_message;
+pub mod ibc_message;
+pub mod stride_message;
+pub mod terra_wasm_message;
+pub mod thorchain_message;
+pub mod wasm_message;
+
+pub type ProtobufMessage = google::protobuf::Any;
+pub type CosmosMessageBox = Box<dyn CosmosMessage>;
+pub type JsonMessage = AnyMsg<Json>;
+
+pub trait CosmosMessage {
+    fn into_boxed(self) -> CosmosMessageBox
+    where
+        Self: 'static + Sized,
+    {
+        Box::new(self)
+    }
+
+    /// Override the method if the message can be represented as a Protobuf message.
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        SigningError::err(SigningErrorType::Error_not_supported)
+            .context("Message cannot be converted to Protobuf")
+    }
+
+    /// Override the method if the message can be represented as a JSON object.
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        SigningError::err(SigningErrorType::Error_not_supported)
+            .context("Message cannot be converted to JSON")
+    }
+}
+
+/// A standard implementation of the [`CosmosMessage::to_json`] method.
+/// This suits any message type that implements the `serialize` trait.
+pub fn message_to_json<T: Serialize>(msg_type: &str, msg: &T) -> SigningResult<JsonMessage> {
+    let value = serde_json::to_value(msg)
+        .tw_err(|_| SigningErrorType::Error_internal)
+        .context("Error serializing Cosmos message to JSON")?;
+    Ok(JsonMessage {
+        msg_type: msg_type.to_string(),
+        value,
+    })
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/stride_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/stride_message.rs
new file mode 100644
index 00000000000..1ef8e86eaec
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/stride_message.rs
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::CosmosAddress;
+use crate::proto::stride;
+use crate::transaction::message::{CosmosMessage, ProtobufMessage};
+use tw_coin_entry::error::prelude::*;
+use tw_number::U256;
+use tw_proto::to_any;
+
+pub struct StrideLiquidStakeMessage<Address: CosmosAddress> {
+    pub creator: Address,
+    pub amount: U256,
+    pub host_denom: String,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for StrideLiquidStakeMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = stride::stakeibc::MsgLiquidStake {
+            creator: self.creator.to_string(),
+            amount: self.amount.to_string(),
+            host_denom: self.host_denom.clone(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+}
+
+pub struct StrideLiquidRedeemMessage {
+    pub creator: String,
+    pub amount: U256,
+    pub receiver: String,
+    pub host_zone: String,
+}
+
+impl CosmosMessage for StrideLiquidRedeemMessage {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = stride::stakeibc::MsgRedeemStake {
+            creator: self.creator.clone(),
+            amount: self.amount.to_string(),
+            receiver: self.receiver.clone(),
+            host_zone: self.host_zone.clone(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/terra_wasm_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/terra_wasm_message.rs
new file mode 100644
index 00000000000..b74e6a01bd5
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/terra_wasm_message.rs
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::CosmosAddress;
+use crate::modules::serializer::protobuf_serializer::build_coin;
+use crate::proto::terra;
+use crate::transaction::message::wasm_message::ExecuteMsg;
+use crate::transaction::message::{CosmosMessage, JsonMessage, ProtobufMessage};
+use crate::transaction::Coin;
+use serde::Serialize;
+use serde_json::json;
+use tw_coin_entry::error::prelude::*;
+use tw_proto::to_any;
+
+const DEFAULT_JSON_MSG_TYPE: &str = "wasm/MsgExecuteContract";
+
+/// This method not only support token transfer, but also support all other types of contract call.
+/// https://docs.terra.money/Tutorials/Smart-contracts/Manage-CW20-tokens.html#interacting-with-cw20-contract
+#[derive(Serialize)]
+pub struct TerraExecuteContractMessage<Address: CosmosAddress> {
+    pub sender: Address,
+    pub contract: Address,
+    pub execute_msg: ExecuteMsg,
+    pub coins: Vec<Coin>,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for TerraExecuteContractMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = terra::wasm::v1beta1::MsgExecuteContract {
+            sender: self.sender.to_string(),
+            contract: self.contract.to_string(),
+            execute_msg: self.execute_msg.to_bytes(),
+            coins: self.coins.iter().map(build_coin).collect(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        // Don't use `message_to_json` because we need to try to convert [`ExecuteMsg::String`] to [`ExecuteMsg::Json`] if possible.
+        let value = json!({
+            "coins": self.coins,
+            "contract": self.contract,
+            "execute_msg": self.execute_msg.try_to_json(),
+            "sender": self.sender,
+        });
+        Ok(JsonMessage {
+            msg_type: DEFAULT_JSON_MSG_TYPE.to_string(),
+            value,
+        })
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/thorchain_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/thorchain_message.rs
new file mode 100644
index 00000000000..6158c4f5815
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/thorchain_message.rs
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::modules::serializer::protobuf_serializer::build_coin;
+use crate::proto::types;
+use crate::transaction::message::{CosmosMessage, ProtobufMessage};
+use crate::transaction::Coin;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+use tw_number::U256;
+use tw_proto::to_any;
+
+pub struct ThorchainAsset {
+    pub chain: String,
+    pub symbol: String,
+    pub ticker: String,
+    pub synth: bool,
+}
+
+impl ThorchainAsset {
+    pub fn to_proto(&self) -> types::Asset {
+        types::Asset {
+            chain: self.chain.clone(),
+            symbol: self.symbol.clone(),
+            ticker: self.ticker.clone(),
+            synth: self.synth,
+        }
+    }
+}
+
+pub struct ThorchainCoin {
+    pub asset: ThorchainAsset,
+    pub amount: U256,
+    pub decimals: i64,
+}
+
+impl ThorchainCoin {
+    pub fn to_proto(&self) -> types::Coin {
+        types::Coin {
+            asset: Some(self.asset.to_proto()),
+            amount: self.amount.to_string(),
+            decimals: self.decimals,
+        }
+    }
+}
+
+pub struct ThorchainSendMessage {
+    pub from_address: Data,
+    pub to_address: Data,
+    pub amount: Vec<Coin>,
+}
+
+impl CosmosMessage for ThorchainSendMessage {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = types::MsgSend {
+            from_address: self.from_address.clone(),
+            to_address: self.to_address.clone(),
+            amount: self.amount.iter().map(build_coin).collect(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+}
+
+pub struct ThorchainDepositMessage {
+    pub coins: Vec<ThorchainCoin>,
+    pub memo: String,
+    pub signer: Data,
+}
+
+impl CosmosMessage for ThorchainDepositMessage {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = types::MsgDeposit {
+            coins: self.coins.iter().map(ThorchainCoin::to_proto).collect(),
+            memo: self.memo.clone(),
+            signer: self.signer.clone(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/message/wasm_message.rs b/rust/tw_cosmos_sdk/src/transaction/message/wasm_message.rs
new file mode 100644
index 00000000000..21163f691a3
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/message/wasm_message.rs
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::CosmosAddress;
+use crate::modules::serializer::protobuf_serializer::build_coin;
+use crate::proto::cosmwasm;
+use crate::transaction::message::{CosmosMessage, JsonMessage, ProtobufMessage};
+use crate::transaction::Coin;
+use serde::Serialize;
+use serde_json::{json, Value as Json};
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+use tw_number::U256;
+use tw_proto::to_any;
+
+const DEFAULT_JSON_MSG_TYPE: &str = "wasm/MsgExecuteContract";
+
+#[derive(Clone, Serialize)]
+#[serde(untagged)]
+pub enum ExecuteMsg {
+    /// Either a regular string or a stringified JSON object.
+    String(String),
+    /// JSON object with a type.
+    Json(Json),
+}
+
+impl ExecuteMsg {
+    /// Tries to convert [`ExecuteMsg::String`] to [`ExecuteMsg::Json`], otherwise returns the same object.
+    pub fn try_to_json(&self) -> ExecuteMsg {
+        if let ExecuteMsg::String(s) = self {
+            if let Ok(json) = serde_json::from_str(s) {
+                return ExecuteMsg::Json(json);
+            }
+        }
+        self.clone()
+    }
+
+    pub fn json<Payload: Serialize>(payload: Payload) -> SigningResult<ExecuteMsg> {
+        let payload = serde_json::to_value(payload)
+            .tw_err(|_| SigningErrorType::Error_internal)
+            .context("Error serializing message payload to JSON")?;
+        Ok(ExecuteMsg::Json(payload))
+    }
+
+    pub fn to_bytes(&self) -> Data {
+        match self {
+            ExecuteMsg::String(ref s) => s.as_bytes().to_vec(),
+            ExecuteMsg::Json(ref j) => j.to_string().as_bytes().to_vec(),
+        }
+    }
+}
+
+/// This method not only support token transfer, but also support all other types of contract call.
+#[derive(Serialize)]
+pub struct WasmExecuteContractMessage<Address: CosmosAddress> {
+    pub sender: Address,
+    pub contract: Address,
+    pub msg: ExecuteMsg,
+    pub coins: Vec<Coin>,
+}
+
+impl<Address: CosmosAddress> CosmosMessage for WasmExecuteContractMessage<Address> {
+    fn to_proto(&self) -> SigningResult<ProtobufMessage> {
+        let proto_msg = cosmwasm::wasm::v1::MsgExecuteContract {
+            sender: self.sender.to_string(),
+            contract: self.contract.to_string(),
+            msg: self.msg.to_bytes(),
+            funds: self.coins.iter().map(build_coin).collect(),
+        };
+        Ok(to_any(&proto_msg))
+    }
+
+    fn to_json(&self) -> SigningResult<JsonMessage> {
+        // Don't use `message_to_json` because we need to try to convert [`ExecuteMsg::String`] to [`ExecuteMsg::Json`] if possible.
+        let value = json!({
+            "coins": self.coins,
+            "contract": self.contract,
+            "msg": self.msg.try_to_json(),
+            "sender": self.sender,
+        });
+        Ok(JsonMessage {
+            msg_type: DEFAULT_JSON_MSG_TYPE.to_string(),
+            value,
+        })
+    }
+}
+
+#[derive(Serialize)]
+pub enum WasmExecutePayload {
+    #[serde(rename = "transfer")]
+    Transfer {
+        #[serde(serialize_with = "U256::as_decimal_str")]
+        amount: U256,
+        recipient: String,
+    },
+    #[serde(rename = "send")]
+    Send {
+        #[serde(serialize_with = "U256::as_decimal_str")]
+        amount: U256,
+        contract: String,
+        msg: String,
+    },
+}
diff --git a/rust/tw_cosmos_sdk/src/transaction/mod.rs b/rust/tw_cosmos_sdk/src/transaction/mod.rs
new file mode 100644
index 00000000000..bd36b92b25e
--- /dev/null
+++ b/rust/tw_cosmos_sdk/src/transaction/mod.rs
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::context::CosmosContext;
+use crate::private_key::SignatureData;
+use serde::Serialize;
+use tw_number::U256;
+
+pub mod message;
+
+use message::CosmosMessageBox;
+
+/// At this moment, TW only supports the Direct signing mode.
+#[derive(Clone, Copy)]
+pub enum SignMode {
+    Direct,
+    Other(i32),
+}
+
+#[derive(Clone, Serialize)]
+pub struct Fee<Address> {
+    pub amounts: Vec<Coin>,
+    pub gas_limit: u64,
+    pub payer: Option<Address>,
+    pub granter: Option<Address>,
+}
+
+#[derive(Clone, Serialize)]
+pub struct Coin {
+    #[serde(serialize_with = "U256::as_decimal_str")]
+    pub amount: U256,
+    pub denom: String,
+}
+
+pub struct SignerInfo<PublicKey> {
+    pub public_key: PublicKey,
+    pub sequence: u64,
+    pub sign_mode: SignMode,
+}
+
+pub struct TxBody {
+    pub messages: Vec<CosmosMessageBox>,
+    pub memo: String,
+    pub timeout_height: u64,
+}
+
+pub struct UnsignedTransaction<Context: CosmosContext> {
+    pub signer: SignerInfo<Context::PublicKey>,
+    pub fee: Fee<Context::Address>,
+    pub chain_id: String,
+    pub account_number: u64,
+    pub tx_body: TxBody,
+}
+
+impl<Context: CosmosContext> UnsignedTransaction<Context> {
+    pub fn into_signed(self, signature: SignatureData) -> SignedTransaction<Context> {
+        SignedTransaction {
+            signer: self.signer,
+            fee: self.fee,
+            tx_body: self.tx_body,
+            signature,
+        }
+    }
+}
+
+pub struct SignedTransaction<Context: CosmosContext> {
+    pub signer: SignerInfo<Context::PublicKey>,
+    pub fee: Fee<Context::Address>,
+    pub tx_body: TxBody,
+    pub signature: SignatureData,
+}
diff --git a/rust/tw_cosmos_sdk/tests/compile.rs b/rust/tw_cosmos_sdk/tests/compile.rs
new file mode 100644
index 00000000000..04569006937
--- /dev/null
+++ b/rust/tw_cosmos_sdk/tests/compile.rs
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_cosmos_sdk::test_utils::sign_utils::{
+    test_compile_json, test_compile_protobuf, TestCompileInput,
+};
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::tw::PublicKeyType;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+#[test]
+fn test_compile_with_signatures() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let send_msg = Proto::mod_Message::Send {
+        from_address: "cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx".into(),
+        to_address: "cosmos18s0hdnsllgcclweu9aymw4ngktr2k0rkygdzdp".into(),
+        amounts: vec![make_amount("uatom", "400000")],
+        ..Proto::mod_Message::Send::default()
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 546179,
+        chain_id: "cosmoshub-4".into(),
+        sequence: 0,
+        fee: Some(make_fee(200000, make_amount("uatom", "1000"))),
+        public_key: "02ecef5ce437a302c67f95468de4b31f36e911f467d7e6a52b41c1e13e1d563649"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        messages: vec![make_message(MessageEnum::send_coins_message(send_msg))],
+        ..Proto::SigningInput::default()
+    };
+
+    test_compile_protobuf::<StandardCosmosContext>(TestCompileInput {
+        coin: &coin,
+        input: input.clone(),
+        tx_preimage: "0a92010a8f010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126f0a2d636f736d6f73316d6b793639636e38656b74777930383435766563397570736470686b7478743033676b776c78122d636f736d6f733138733068646e736c6c6763636c7765753961796d77346e676b7472326b30726b7967647a64701a0f0a057561746f6d120634303030303012650a4e0a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a2102ecef5ce437a302c67f95468de4b31f36e911f467d7e6a52b41c1e13e1d56364912040a02080112130a0d0a057561746f6d12043130303010c09a0c1a0b636f736d6f736875622d342083ab21",
+        tx_prehash: "fa7990e1814c900efaedf1bdbedba22c22336675befe0ae39974130fc204f3de",
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseBItY29zbW9zMThzMGhkbnNsbGdjY2x3ZXU5YXltdzRuZ2t0cjJrMHJreWdkemRwGg8KBXVhdG9tEgY0MDAwMDASZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJEgQKAggBEhMKDQoFdWF0b20SBDEwMDAQwJoMGkCvvVE6d29P30cO9/lnXyGunWMPxNY12NuqDcCnFkNM0H4CUQdl1Gc9+ogIJbro5nyzZzlv9rl2/GsZox/JXoCX"}"#,
+        signature: "afbd513a776f4fdf470ef7f9675f21ae9d630fc4d635d8dbaa0dc0a716434cd07e02510765d4673dfa880825bae8e67cb367396ff6b976fc6b19a31fc95e8097",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJ"},"signature":"r71ROndvT99HDvf5Z18hrp1jD8TWNdjbqg3ApxZDTNB+AlEHZdRnPfqICCW66OZ8s2c5b/a5dvxrGaMfyV6Alw=="}]"#,
+    });
+
+    test_compile_json::<StandardCosmosContext>(TestCompileInput {
+        coin: &coin,
+        input: input.clone(),
+        tx_preimage: r#"{"account_number":"546179","chain_id":"cosmoshub-4","fee":{"amount":[{"amount":"1000","denom":"uatom"}],"gas":"200000"},"memo":"","msgs":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"400000","denom":"uatom"}],"from_address":"cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx","to_address":"cosmos18s0hdnsllgcclweu9aymw4ngktr2k0rkygdzdp"}}],"sequence":"0"}"#,
+        tx_prehash: "0a31f6cd50f1a5c514929ba68a977e222a7df2dc11e8470e93118cc3545e6b37",
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"1000","denom":"uatom"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"400000","denom":"uatom"}],"from_address":"cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx","to_address":"cosmos18s0hdnsllgcclweu9aymw4ngktr2k0rkygdzdp"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJ"},"signature":"tTyOrburrHEHa14qiw78e9StoZyyGmoku98IxYrWCmtN8Qo5mTeKa0BKKDfgG4LmmNdwYcrXtqQQ7F4dL3c26g=="}]}}"#,
+        signature: "b53c8eadbbabac71076b5e2a8b0efc7bd4ada19cb21a6a24bbdf08c58ad60a6b4df10a3999378a6b404a2837e01b82e698d77061cad7b6a410ec5e1d2f7736ea",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJ"},"signature":"tTyOrburrHEHa14qiw78e9StoZyyGmoku98IxYrWCmtN8Qo5mTeKa0BKKDfgG4LmmNdwYcrXtqQQ7F4dL3c26g=="}]"#,
+    });
+}
+
+#[test]
+fn test_compile_with_signatures_direct() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let body_bytes = "0a89010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412690a2d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b796778306570683664643032122d636f736d6f73317a743530617a7570616e716c66616d356166687633686578777975746e756b656834633537331a090a046d756f6e120131".decode_hex().unwrap();
+    let auth_info_bytes = "0a500a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a210257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc512040a020801180812110a0b0a046d756f6e120332303010c09a0c".decode_hex().unwrap();
+    let sign_direct = Proto::mod_Message::SignDirect {
+        body_bytes: Cow::from(body_bytes),
+        auth_info_bytes: Cow::from(auth_info_bytes),
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        public_key: "0257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc5"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        messages: vec![make_message(MessageEnum::sign_direct_message(sign_direct))],
+        ..Proto::SigningInput::default()
+    };
+
+    // real-world tx: https://www.mintscan.io/cosmos/txs/817101F3D96314AD028733248B28BAFAD535024D7D2C8875D3FE31DC159F096B
+    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "Cr4BCr...1yKOU=", "mode": "BROADCAST_MODE_BLOCK"}' https://api.cosmos.network/cosmos/tx/v1beta1/txs
+    // also similar TX: BCDAC36B605576C8182C2829C808B30A69CAD4959D5ED1E6FF9984ABF280D603
+    test_compile_protobuf::<StandardCosmosContext>(TestCompileInput {
+        coin: &coin,
+        input: input.clone(),
+        tx_preimage: "0a8c010a89010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412690a2d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b796778306570683664643032122d636f736d6f73317a743530617a7570616e716c66616d356166687633686578777975746e756b656834633537331a090a046d756f6e12013112650a500a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a210257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc512040a020801180812110a0b0a046d756f6e120332303010c09a0c1a0a676169612d3133303033208d08",
+        tx_prehash: "8a6e6f74625fd39707843360120874853cc0c1d730b087f3939f4b187c75b907",
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H"}"#,
+        signature: "f9e1f4001657a42009c4eb6859625d2e41e961fc72efd2842909c898e439fc1f549916e4ecac676ee353c7d54c5ae30a29b4210b8bff0ebfdcb375e105002f47",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"+eH0ABZXpCAJxOtoWWJdLkHpYfxy79KEKQnImOQ5/B9UmRbk7KxnbuNTx9VMWuMKKbQhC4v/Dr/cs3XhBQAvRw=="}]"#,
+    });
+}
diff --git a/rust/tw_cosmos_sdk/tests/sign.rs b/rust/tw_cosmos_sdk/tests/sign.rs
new file mode 100644
index 00000000000..8b703393ff3
--- /dev/null
+++ b/rust/tw_cosmos_sdk/tests/sign.rs
@@ -0,0 +1,423 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::modules::tx_builder::TxBuilder;
+use tw_cosmos_sdk::test_utils::sign_utils::{
+    test_sign_json, test_sign_json_error, test_sign_protobuf, test_sign_protobuf_error,
+    TestErrorInput, TestInput,
+};
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_keypair::tw::PublicKeyType;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+fn account_1037_private_key() -> Cow<'static, [u8]> {
+    "80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn account_546179_private_key() -> Cow<'static, [u8]> {
+    "8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn account_1366160_private_key() -> Cow<'static, [u8]> {
+    "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn make_fee(gas: u64, amount: Proto::Amount<'_>) -> Proto::Fee<'_> {
+    Proto::Fee {
+        amounts: vec![amount],
+        gas,
+    }
+}
+
+fn make_message(message_oneof: MessageEnum) -> Proto::Message {
+    Proto::Message { message_oneof }
+}
+
+fn make_amount<'a>(denom: &'a str, amount: &'a str) -> Proto::Amount<'a> {
+    Proto::Amount {
+        denom: denom.into(),
+        amount: amount.into(),
+    }
+}
+
+fn make_height(revision_number: u64, revision_height: u64) -> Proto::Height {
+    Proto::Height {
+        revision_number,
+        revision_height,
+    }
+}
+
+#[test]
+fn test_sign_coin_send() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let send_msg = Proto::mod_Message::Send {
+        from_address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02".into(),
+        to_address: "cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573".into(),
+        amounts: vec![make_amount("muon", "1")],
+        ..Proto::mod_Message::Send::default()
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 8,
+        fee: Some(make_fee(200000, make_amount("muon", "200"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::send_coins_message(send_msg))],
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H"}"#,
+        signature: "f9e1f4001657a42009c4eb6859625d2e41e961fc72efd2842909c898e439fc1f549916e4ecac676ee353c7d54c5ae30a29b4210b8bff0ebfdcb375e105002f47",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"+eH0ABZXpCAJxOtoWWJdLkHpYfxy79KEKQnImOQ5/B9UmRbk7KxnbuNTx9VMWuMKKbQhC4v/Dr/cs3XhBQAvRw=="}]"#,
+    });
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}]}}"#,
+        signature: "fc3ef899d206c88077fec42f21ba0b4df4bd3fd115fdf606ae01d9136fef363f57e9e33a7b9ec6ddab658cd07e3c0067470de94e4e75b979a1085a29f0efd926",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}]"#,
+    });
+}
+
+#[test]
+fn test_sign_raw_json() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let raw_json_msg = Proto::mod_Message::RawJSON {
+        type_pb: "test".into(),
+        value: r#"{"test":"hello"}"#.into(),
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 8,
+        fee: Some(make_fee(200000, make_amount("muon", "200"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::raw_json_message(raw_json_msg))],
+        ..Proto::SigningInput::default()
+    };
+
+    // `RawJSON` doesn't support Protobuf serialization and signing.
+    test_sign_protobuf_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input: input.clone(),
+        error: SigningError::Error_not_supported,
+    });
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"test","value":{"test":"hello"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"qhxxCOMiVhP7e7Mx+98HUZI0t5DNOFXwzIqNQz+fT6hDKR/ebW0uocsYnE5CiBNEalmBcs5gSIJegNkHhgyEmA=="}]}}"#,
+        signature: "aa1c7108e3225613fb7bb331fbdf07519234b790cd3855f0cc8a8d433f9f4fa843291fde6d6d2ea1cb189c4e428813446a598172ce6048825e80d907860c8498",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"qhxxCOMiVhP7e7Mx+98HUZI0t5DNOFXwzIqNQz+fT6hDKR/ebW0uocsYnE5CiBNEalmBcs5gSIJegNkHhgyEmA=="}]"#,
+    });
+}
+
+#[test]
+fn test_sign_raw_json_with_timeout() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let raw_json_msg = Proto::mod_Message::RawJSON {
+        type_pb: "osmosis/poolmanager/split-amount-in".into(),
+        value: r#"{
+        "routes": [
+          {
+            "pools": [
+              {
+                "pool_id": "463",
+                "token_out_denom": "ibc/1DC495FCEFDA068A3820F903EDBD78B942FBD204D7E93D3BA2B432E9669D1A59"
+              },
+              {
+                "pool_id": "916",
+                "token_out_denom": "ibc/573FCD90FACEE750F55A8864EF7D38265F07E5A9273FA0E8DAFD39951332B580"
+              }
+            ],
+            "token_in_amount": "70000"
+          },
+          {
+            "pools": [
+              {
+                "pool_id": "907",
+                "token_out_denom": "ibc/573FCD90FACEE750F55A8864EF7D38265F07E5A9273FA0E8DAFD39951332B580"
+              }
+            ],
+            "token_in_amount": "30000"
+          }
+        ],
+        "sender": "osmo1qr7dhmvcqm4fnleaqel3gel4u20nk5rp9rwsae",
+        "token_in_denom": "uosmo",
+        "token_out_min_amount": "885297"
+    }"#.into(),
+    };
+    let input = Proto::SigningInput {
+        account_number: 24139,
+        chain_id: "osmosis-1".into(),
+        sequence: 191,
+        fee: Some(make_fee(617438, make_amount("uosmo", "1853"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::raw_json_message(raw_json_msg))],
+        timeout_height: 13692007,
+        ..Proto::SigningInput::default()
+    };
+
+    // `RawJSON` doesn't support Protobuf serialization and signing.
+    test_sign_protobuf_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input: input.clone(),
+        error: SigningError::Error_not_supported,
+    });
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"1853","denom":"uosmo"}],"gas":"617438"},"memo":"","msg":[{"type":"osmosis/poolmanager/split-amount-in","value":{"routes":[{"pools":[{"pool_id":"463","token_out_denom":"ibc/1DC495FCEFDA068A3820F903EDBD78B942FBD204D7E93D3BA2B432E9669D1A59"},{"pool_id":"916","token_out_denom":"ibc/573FCD90FACEE750F55A8864EF7D38265F07E5A9273FA0E8DAFD39951332B580"}],"token_in_amount":"70000"},{"pools":[{"pool_id":"907","token_out_denom":"ibc/573FCD90FACEE750F55A8864EF7D38265F07E5A9273FA0E8DAFD39951332B580"}],"token_in_amount":"30000"}],"sender":"osmo1qr7dhmvcqm4fnleaqel3gel4u20nk5rp9rwsae","token_in_denom":"uosmo","token_out_min_amount":"885297"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"7gMxXwqzZDe5+h1i16q7A7CgGUtLl2+Q8/YaUZCeYvp8kISbBwD2SlNTpJtz1RLskzF2uNcDebo61HbcVn9dAw=="}],"timeout_height":"13692007"}}"#,
+        signature: "ee03315f0ab36437b9fa1d62d7aabb03b0a0194b4b976f90f3f61a51909e62fa7c90849b0700f64a5353a49b73d512ec933176b8d70379ba3ad476dc567f5d03",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"7gMxXwqzZDe5+h1i16q7A7CgGUtLl2+Q8/YaUZCeYvp8kISbBwD2SlNTpJtz1RLskzF2uNcDebo61HbcVn9dAw=="}]"#,
+    });
+}
+
+#[test]
+fn test_sign_ibc_transfer() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let transfer_tokens = Proto::mod_Message::Transfer {
+        source_port: "transfer".into(),
+        source_channel: "channel-141".into(),
+        token: Some(make_amount("uatom", "100000")),
+        sender: "cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx".into(),
+        receiver: "osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn".into(),
+        timeout_height: Some(make_height(1, 8800000)),
+        ..Proto::mod_Message::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        account_number: 546179,
+        chain_id: "cosmoshub-4".into(),
+        sequence: 2,
+        fee: Some(make_fee(500000, make_amount("uatom", "12500"))),
+        private_key: account_546179_private_key(),
+        messages: vec![make_message(MessageEnum::transfer_tokens_message(
+            transfer_tokens,
+        ))],
+        ..Proto::SigningInput::default()
+    };
+
+    // real-world tx: https://www.mintscan.io/cosmos/txs/817101F3D96314AD028733248B28BAFAD535024D7D2C8875D3FE31DC159F096B
+    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "Cr4BCr...1yKOU=", "mode": "BROADCAST_MODE_BLOCK"}' https://api.cosmos.network/cosmos/tx/v1beta1/txs
+    // also similar TX: BCDAC36B605576C8182C2829C808B30A69CAD4959D5ED1E6FF9984ABF280D603
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"Cr4BCrsBCikvaWJjLmFwcGxpY2F0aW9ucy50cmFuc2Zlci52MS5Nc2dUcmFuc2ZlchKNAQoIdHJhbnNmZXISC2NoYW5uZWwtMTQxGg8KBXVhdG9tEgYxMDAwMDAiLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseCorb3NtbzE4czBoZG5zbGxnY2Nsd2V1OWF5bXc0bmdrdHIyazBya3ZuN2ptbjIHCAEQgI6ZBBJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEC7O9c5DejAsZ/lUaN5LMfNukR9GfX5qUrQcHhPh1WNkkSBAoCCAEYAhIUCg4KBXVhdG9tEgUxMjUwMBCgwh4aQK0HIWdFMk+C6Gi1KG/vELe1ffcc1aEWUIqz2t/ZhwqNNHxUUSp27wteiugHEMVTEIOBhs84t2gIcT/nD/1yKOU="}"#,
+        signature: "ad07216745324f82e868b5286fef10b7b57df71cd5a116508ab3dadfd9870a8d347c54512a76ef0b5e8ae80710c55310838186cf38b76808713fe70ffd7228e5",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJ"},"signature":"rQchZ0UyT4LoaLUob+8Qt7V99xzVoRZQirPa39mHCo00fFRRKnbvC16K6AcQxVMQg4GGzzi3aAhxP+cP/XIo5Q=="}]"#,
+    });
+    // `Transfer` doesn't support JSON serialization and signing.
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
+
+#[test]
+fn test_sign_direct() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let body_bytes = "0a89010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412690a2d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b796778306570683664643032122d636f736d6f73317a743530617a7570616e716c66616d356166687633686578777975746e756b656834633537331a090a046d756f6e120131".decode_hex().unwrap();
+    let auth_info_bytes = "0a500a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a210257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc512040a020801180812110a0b0a046d756f6e120332303010c09a0c".decode_hex().unwrap();
+    let sign_direct = Proto::mod_Message::SignDirect {
+        body_bytes: Cow::from(body_bytes),
+        auth_info_bytes: Cow::from(auth_info_bytes),
+    };
+    let mut input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::sign_direct_message(sign_direct))],
+        ..Proto::SigningInput::default()
+    };
+
+    // real-world tx: https://www.mintscan.io/cosmos/txs/817101F3D96314AD028733248B28BAFAD535024D7D2C8875D3FE31DC159F096B
+    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "Cr4BCr...1yKOU=", "mode": "BROADCAST_MODE_BLOCK"}' https://api.cosmos.network/cosmos/tx/v1beta1/txs
+    // also similar TX: BCDAC36B605576C8182C2829C808B30A69CAD4959D5ED1E6FF9984ABF280D603
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H"}"#,
+        signature: "f9e1f4001657a42009c4eb6859625d2e41e961fc72efd2842909c898e439fc1f549916e4ecac676ee353c7d54c5ae30a29b4210b8bff0ebfdcb375e105002f47",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"+eH0ABZXpCAJxOtoWWJdLkHpYfxy79KEKQnImOQ5/B9UmRbk7KxnbuNTx9VMWuMKKbQhC4v/Dr/cs3XhBQAvRw=="}]"#,
+    });
+
+    // `Transfer` doesn't support JSON serialization and signing.
+    // Set the default fee to get `SigningError::Error_not_supported`.
+    input.fee = Some(Proto::Fee::default());
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
+
+#[test]
+fn test_sign_direct_0a90010a() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    // Transaction body has the following content:
+    // https://github.com/trustwallet/wallet-core/blob/1382e3c8ac6d8e956e25c0475039f6c3988f9355/tests/chains/Cosmos/SignerTests.cpp#L327-L340
+    let body_bytes = "0a90010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412700a2d636f736d6f7331706b707472653766646b6c366766727a6c65736a6a766878686c63337234676d6d6b38727336122d636f736d6f7331717970717870713971637273737a673270767871367273307a716733797963356c7a763778751a100a0575636f736d120731323334353637".decode_hex().unwrap();
+    let auth_info_bytes = "0a0a0a0012040a020801180112130a0d0a0575636f736d12043230303010c09a0c"
+        .decode_hex()
+        .unwrap();
+    let sign_direct = Proto::mod_Message::SignDirect {
+        body_bytes: Cow::from(body_bytes),
+        auth_info_bytes: Cow::from(auth_info_bytes),
+    };
+    let mut input = Proto::SigningInput {
+        account_number: 1,
+        chain_id: "cosmoshub-4".into(),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::sign_direct_message(sign_direct))],
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLWNvc21vczFwa3B0cmU3ZmRrbDZnZnJ6bGVzamp2aHhobGMzcjRnbW1rOHJzNhItY29zbW9zMXF5cHF4cHE5cWNyc3N6ZzJwdnhxNnJzMHpxZzN5eWM1bHp2N3h1GhAKBXVjb3NtEgcxMjM0NTY3EiEKCgoAEgQKAggBGAESEwoNCgV1Y29zbRIEMjAwMBDAmgwaQEgXmSAlm4M5bz+OX1GtvvZ3fBV2wrZrp4A/Imd55KM7ASivB/siYJegmYiOKzQ82uwoEmFalNnG2BrHHDwDR2Y="}"#,
+        signature: "48179920259b83396f3f8e5f51adbef6777c1576c2b66ba7803f226779e4a33b0128af07fb226097a099888e2b343cdaec2812615a94d9c6d81ac71c3c034766",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"SBeZICWbgzlvP45fUa2+9nd8FXbCtmungD8iZ3nkozsBKK8H+yJgl6CZiI4rNDza7CgSYVqU2cbYGsccPANHZg=="}]"#,
+    });
+
+    // `Transfer` doesn't support JSON serialization and signing.
+    // Set the default fee to get `SigningError::Error_not_supported`.
+    input.fee = Some(Proto::Fee::default());
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
+
+#[test]
+fn test_sign_vote() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let vote_msg = Proto::mod_Message::MsgVote {
+        proposal_id: 77,
+        voter: "cosmos1mry47pkga5tdswtluy0m8teslpalkdq07pswu4".into(),
+        option: Proto::mod_Message::VoteOption::YES,
+    };
+    let input = Proto::SigningInput {
+        account_number: 1366160,
+        chain_id: "cosmoshub-4".into(),
+        sequence: 0,
+        fee: Some(make_fee(97681, make_amount("uatom", "2418"))),
+        private_key: account_1366160_private_key(),
+        messages: vec![make_message(MessageEnum::msg_vote(vote_msg))],
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted https://www.mintscan.io/cosmos/txs/2EFA054B842B1641B131137B13360F95164C6C1D51BB4A4AC6DE8F75F504AA4C
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+            coin: &coin,
+            input: input.clone(),
+            tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"ClQKUgobL2Nvc21vcy5nb3YudjFiZXRhMS5Nc2dWb3RlEjMITRItY29zbW9zMW1yeTQ3cGtnYTV0ZHN3dGx1eTBtOHRlc2xwYWxrZHEwN3Bzd3U0GAESZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAsv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarlEgQKAggBEhMKDQoFdWF0b20SBDI0MTgQkfsFGkA+Nb3NULc38quGC1x+8ZXry4w9mMX3IA7wUjFboTv7kVOwPlleIc8UqIsjVvKTUFnUuW8dlGQzNR1KkvbvZ1NA"}"#,
+            signature: "3e35bdcd50b737f2ab860b5c7ef195ebcb8c3d98c5f7200ef052315ba13bfb9153b03e595e21cf14a88b2356f2935059d4b96f1d946433351d4a92f6ef675340",
+            signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Asv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarl"},"signature":"PjW9zVC3N/KrhgtcfvGV68uMPZjF9yAO8FIxW6E7+5FTsD5ZXiHPFKiLI1byk1BZ1LlvHZRkMzUdSpL272dTQA=="}]"#,
+        });
+
+    // `MsgVote` doesn't support JSON serialization and signing.
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
+
+#[test]
+fn test_vote_payload() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let mut vote_msg = Proto::mod_Message::MsgVote {
+        proposal_id: 123,
+        voter: "cosmos1mry47pkga5tdswtluy0m8teslpalkdq07pswu4".into(),
+        option: Proto::mod_Message::VoteOption::_UNSPECIFIED,
+    };
+
+    let tests = [
+        (Proto::mod_Message::VoteOption::ABSTAIN, "087b122d636f736d6f73316d72793437706b67613574647377746c7579306d387465736c70616c6b6471303770737775341802"),
+        (Proto::mod_Message::VoteOption::NO, "087b122d636f736d6f73316d72793437706b67613574647377746c7579306d387465736c70616c6b6471303770737775341803"),
+        (Proto::mod_Message::VoteOption::NO_WITH_VETO, "087b122d636f736d6f73316d72793437706b67613574647377746c7579306d387465736c70616c6b6471303770737775341804"),
+        (Proto::mod_Message::VoteOption::_UNSPECIFIED, "087b122d636f736d6f73316d72793437706b67613574647377746c7579306d387465736c70616c6b647130377073777534"),
+    ];
+
+    for (option, expected) in tests {
+        vote_msg.option = option;
+        let payload =
+            TxBuilder::<StandardCosmosContext>::vote_msg_from_proto(&coin, &vote_msg).unwrap();
+        let actual = payload.to_proto().unwrap();
+        assert_eq!(actual.value.to_hex(), expected);
+    }
+}
+
+#[test]
+fn test_error_missing_message() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 8,
+        fee: Some(make_fee(200000, make_amount("muon", "200"))),
+        private_key: account_1037_private_key(),
+        messages: Vec::default(),
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input: input.clone(),
+        error: SigningError::Error_invalid_params,
+    });
+
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_invalid_params,
+    });
+}
diff --git a/rust/tw_cosmos_sdk/tests/sign_staking.rs b/rust/tw_cosmos_sdk/tests/sign_staking.rs
new file mode 100644
index 00000000000..47e1f9c5dfd
--- /dev/null
+++ b/rust/tw_cosmos_sdk/tests/sign_staking.rs
@@ -0,0 +1,416 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_cosmos_sdk::test_utils::sign_utils::{
+    test_sign_json, test_sign_json_error, test_sign_protobuf, TestErrorInput, TestInput,
+};
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::tw::PublicKeyType;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+fn account_1037_private_key() -> Cow<'static, [u8]> {
+    "80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn account_1290826_private_key() -> Cow<'static, [u8]> {
+    "c7764249cdf77f8f1d840fa8af431579e5e41cf1af937e1e23afa22f3f4f0ccc"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn account_1932898_private_key() -> Cow<'static, [u8]> {
+    "d142e036ceebe70c4e61e3909d6c16bab518edfeac8bdf91000463ce0b4a6156"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+#[test]
+fn test_staking_compounding_authz() {
+    use Proto::mod_Message::mod_AuthGrant::OneOfgrant_type as ProtoGrantType;
+    use Proto::mod_Message::mod_StakeAuthorization::OneOfvalidators as ProtoValidatorsType;
+
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let allow_list = Proto::mod_Message::mod_StakeAuthorization::Validators {
+        address: vec!["cosmosvaloper1gjtvly9lel6zskvwtvlg5vhwpu9c9waw7sxzwx".into()],
+    };
+    let stake_authorization = Proto::mod_Message::StakeAuthorization {
+        authorization_type: Proto::mod_Message::AuthorizationType::DELEGATE,
+        validators: ProtoValidatorsType::allow_list(allow_list),
+        ..Proto::mod_Message::StakeAuthorization::default()
+    };
+    let auth_grant = Proto::mod_Message::AuthGrant {
+        granter: "cosmos13k0q0l7lg2kr32kvt7ly236ppldy8v9dzwh3gd".into(),
+        grantee: "cosmos1fs7lu28hx5m9akm7rp0c2422cn8r2f7gurujhf".into(),
+        grant_type: ProtoGrantType::grant_stake(stake_authorization),
+        expiration: 1692309600,
+    };
+    let input = Proto::SigningInput {
+        account_number: 1290826,
+        chain_id: "cosmoshub-4".into(),
+        sequence: 5,
+        fee: Some(make_fee(96681, make_amount("uatom", "2418"))),
+        private_key: account_1290826_private_key(),
+        messages: vec![make_message(MessageEnum::auth_grant(auth_grant))],
+        ..Proto::SigningInput::default()
+    };
+
+    // Original test: https://github.com/trustwallet/wallet-core/blob/a60033f797e33628e557af7c66be539c8d78bc61/tests/chains/Cosmos/StakingTests.cpp#L18-L52
+    // Please note the signature has been updated according to the serialization of the `StakeAuthorization` message.
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        // Previous: CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjoSNgo0Y29zbW9zdmFsb3BlcjFnanR2bHk5bGVsNnpza3Z3dHZsZzV2aHdwdTljOXdhdzdzeHp3eCABEgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQIFyfuijGKf87Hz61ZqxasfLI1PZnNge4RDq/tRyB/tZI6p80iGRqHecoV6+84EQkc9GTlNRQOSlApRCsivT9XI=
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjogARI2CjRjb3Ntb3N2YWxvcGVyMWdqdHZseTlsZWw2enNrdnd0dmxnNXZod3B1OWM5d2F3N3N4end4EgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQEAN1nIfDawlHnep2bNEm14w+g7tYybJJT3htcGVS6s9D7va3ed1OUEIk9LZoc3G//VenJ+KLw26SRVBaRukgVI="}"#,
+        // Previous: 81727ee8a318a7fcec7cfad59ab16ac7cb2353d99cd81ee110eafed47207fb5923aa7cd22191a8779ca15ebef3811091cf464e535140e4a5029442b22bd3f572
+        signature: "400dd6721f0dac251e77a9d9b3449b5e30fa0eed6326c9253de1b5c1954bab3d0fbbdadde77539410893d2d9a1cdc6fff55e9c9f8a2f0dba491541691ba48152",
+        // Previous: gXJ+6KMYp/zsfPrVmrFqx8sjU9mc2B7hEOr+1HIH+1kjqnzSIZGod5yhXr7zgRCRz0ZOU1FA5KUClEKyK9P1cg==
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1K"},"signature":"QA3Wch8NrCUed6nZs0SbXjD6Du1jJsklPeG1wZVLqz0Pu9rd53U5QQiT0tmhzcb/9V6cn4ovDbpJFUFpG6SBUg=="}]"#,
+    });
+
+    // `AuthGrant` doesn't support JSON serialization and signing.
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
+
+#[test]
+fn test_staking_compounding_authz_f355e659() {
+    use Proto::mod_Message::mod_AuthGrant::OneOfgrant_type as ProtoGrantType;
+    use Proto::mod_Message::mod_StakeAuthorization::OneOfvalidators as ProtoValidatorsType;
+
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let allow_list = Proto::mod_Message::mod_StakeAuthorization::Validators {
+        address: vec!["cosmosvaloper1gjtvly9lel6zskvwtvlg5vhwpu9c9waw7sxzwx".into()],
+    };
+    let stake_authorization = Proto::mod_Message::StakeAuthorization {
+        authorization_type: Proto::mod_Message::AuthorizationType::DELEGATE,
+        validators: ProtoValidatorsType::allow_list(allow_list),
+        ..Proto::mod_Message::StakeAuthorization::default()
+    };
+    let auth_grant = Proto::mod_Message::AuthGrant {
+        granter: "cosmos1wd0hdkzq68nmwzpprcugx82msj3l2y3wh8g5vv".into(),
+        grantee: "cosmos1fs7lu28hx5m9akm7rp0c2422cn8r2f7gurujhf".into(),
+        grant_type: ProtoGrantType::grant_stake(stake_authorization),
+        expiration: 1733011200,
+    };
+    let input = Proto::SigningInput {
+        account_number: 1932898,
+        chain_id: "cosmoshub-4".into(),
+        sequence: 0,
+        fee: Some(make_fee(96681, make_amount("uatom", "2418"))),
+        private_key: account_1932898_private_key(),
+        messages: vec![make_message(MessageEnum::auth_grant(auth_grant))],
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted https://www.mintscan.io/cosmos/tx/F355E659CBB8C0191213415E8F3EC6FD0AD1541F96FF192855147F6C0872A98B?height=17879293
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input,
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczF3ZDBoZGt6cTY4bm13enBwcmN1Z3g4Mm1zajNsMnkzd2g4ZzV2dhItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjogARI2CjRjb3Ntb3N2YWxvcGVyMWdqdHZseTlsZWw2enNrdnd0dmxnNXZod3B1OWM5d2F3N3N4end4EgYIgM6uugYSZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA1yVadHrd1uQDhwasOzMBbg6zarM8PjyhRmDVY97HiX5EgQKAggBEhMKDQoFdWF0b20SBDI0MTgQqfMFGkCcDzlVwE+RUkWhjH0PiBrKDzqGgIczmj9fuMI0umrOFTqmKm/IQGol0eo4XZOIcahSYlqJ+1MOptAZM8Csqoay"}"#,
+        signature: "9c0f3955c04f915245a18c7d0f881aca0f3a868087339a3f5fb8c234ba6ace153aa62a6fc8406a25d1ea385d938871a852625a89fb530ea6d01933c0acaa86b2",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A1yVadHrd1uQDhwasOzMBbg6zarM8PjyhRmDVY97HiX5"},"signature":"nA85VcBPkVJFoYx9D4gayg86hoCHM5o/X7jCNLpqzhU6pipvyEBqJdHqOF2TiHGoUmJaiftTDqbQGTPArKqGsg=="}]"#,
+    });
+}
+
+#[test]
+fn test_staking_remove_compounding_authz() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let auth_revoke = Proto::mod_Message::AuthRevoke {
+        granter: "cosmos13k0q0l7lg2kr32kvt7ly236ppldy8v9dzwh3gd".into(),
+        grantee: "cosmos1fs7lu28hx5m9akm7rp0c2422cn8r2f7gurujhf".into(),
+        msg_type_url: "/cosmos.staking.v1beta1.MsgDelegate".into(),
+    };
+    let input = Proto::SigningInput {
+        account_number: 1290826,
+        chain_id: "cosmoshub-4".into(),
+        sequence: 4,
+        fee: Some(make_fee(87735, make_amount("uatom", "2194"))),
+        private_key: account_1290826_private_key(),
+        messages: vec![make_message(MessageEnum::auth_revoke(auth_revoke))],
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted:  https://www.mintscan.io/cosmos/txs/E3218F634BB6A1BE256545EBE38275D5B02D41E88F504A43F97CD9CD2B624D44
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CqoBCqcBCh8vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnUmV2b2tlEoMBCi1jb3Ntb3MxM2swcTBsN2xnMmtyMzJrdnQ3bHkyMzZwcGxkeTh2OWR6d2gzZ2QSLWNvc21vczFmczdsdTI4aHg1bTlha203cnAwYzI0MjJjbjhyMmY3Z3VydWpoZhojL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuTXNnRGVsZWdhdGUSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAQSEwoNCgV1YXRvbRIEMjE5NBC3rQUaQI7K+W7MMBoD6FbFZxRBqs9VTjErztjWTy57+fvrLaTCIZ+eBs7CuaKqfUZdSN8otjubSHVTQID3k9DpPAX0yDo="}"#,
+        signature: "8ecaf96ecc301a03e856c5671441aacf554e312bced8d64f2e7bf9fbeb2da4c2219f9e06cec2b9a2aa7d465d48df28b63b9b4875534080f793d0e93c05f4c83a",
+        // Previous: gXJ+6KMYp/zsfPrVmrFqx8sjU9mc2B7hEOr+1HIH+1kjqnzSIZGod5yhXr7zgRCRz0ZOU1FA5KUClEKyK9P1cg==
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1K"},"signature":"jsr5bswwGgPoVsVnFEGqz1VOMSvO2NZPLnv5++stpMIhn54GzsK5oqp9Rl1I3yi2O5tIdVNAgPeT0Ok8BfTIOg=="}]"#,
+    });
+
+    // `AuthRevoke` doesn't support JSON serialization and signing.
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
+
+#[test]
+fn test_staking_delegate() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let delegate = Proto::mod_Message::Delegate {
+        delegator_address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02".into(),
+        validator_address: "cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp".into(),
+        amount: Some(make_amount("muon", "10")),
+        ..Proto::mod_Message::Delegate::default()
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 7,
+        fee: Some(make_fee(101721, make_amount("muon", "1018"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::stake_message(delegate))],
+        mode: Proto::BroadcastMode::ASYNC,
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_ASYNC","tx_bytes":"CpsBCpgBCiMvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dEZWxlZ2F0ZRJxCi1jb3Ntb3MxaHNrNmpyeXlxamZocDVkaGM1NXRjOWp0Y2t5Z3gwZXBoNmRkMDISNGNvc21vc3ZhbG9wZXIxemt1cHI4M2hyemtuM3VwNWVsa3R6Y3EzdHVmdDhueHNtd2RxZ3AaCgoEbXVvbhICMTASZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAcSEgoMCgRtdW9uEgQxMDE4ENmaBhpA8O9Jm/kL6Za2I3poDs5vpMowYJgNvYCJBRU/vxAjs0lNZYsq40qpTbwOTbORjJA5UjQ6auc40v6uCFT4q4z+uA=="}"#,
+        signature: "f0ef499bf90be996b6237a680ece6fa4ca3060980dbd808905153fbf1023b3494d658b2ae34aa94dbc0e4db3918c903952343a6ae738d2feae0854f8ab8cfeb8",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"8O9Jm/kL6Za2I3poDs5vpMowYJgNvYCJBRU/vxAjs0lNZYsq40qpTbwOTbORjJA5UjQ6auc40v6uCFT4q4z+uA=="}]"#,
+    });
+
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"async","tx":{"fee":{"amount":[{"amount":"1018","denom":"muon"}],"gas":"101721"},"memo":"","msg":[{"type":"cosmos-sdk/MsgDelegate","value":{"amount":{"amount":"10","denom":"muon"},"delegator_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","validator_address":"cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"wIvfbCsLRCjzeXXoXTKfHLGXRbAAmUp0O134HVfVc6pfdVNJvvzISMHRUHgYcjsSiFlLyR32heia/yLgMDtIYQ=="}]}}"#,
+        signature: "c08bdf6c2b0b4428f37975e85d329f1cb19745b000994a743b5df81d57d573aa5f755349befcc848c1d1507818723b1288594bc91df685e89aff22e0303b4861",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"wIvfbCsLRCjzeXXoXTKfHLGXRbAAmUp0O134HVfVc6pfdVNJvvzISMHRUHgYcjsSiFlLyR32heia/yLgMDtIYQ=="}]"#,
+    });
+}
+
+#[test]
+fn test_staking_delegate_custom_msg_type() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let delegate = Proto::mod_Message::Delegate {
+        delegator_address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02".into(),
+        validator_address: "cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp".into(),
+        amount: Some(make_amount("muon", "10")),
+        type_prefix: "unreal/MsgDelegate".into(),
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 7,
+        fee: Some(make_fee(101721, make_amount("muon", "1018"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::stake_message(delegate))],
+        mode: Proto::BroadcastMode::ASYNC,
+        ..Proto::SigningInput::default()
+    };
+
+    // This transaction hasn't been broadcasted.
+    // Check if the custom type_prefix doesn't affect Protobuf serialization.
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_ASYNC","tx_bytes":"CpsBCpgBCiMvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dEZWxlZ2F0ZRJxCi1jb3Ntb3MxaHNrNmpyeXlxamZocDVkaGM1NXRjOWp0Y2t5Z3gwZXBoNmRkMDISNGNvc21vc3ZhbG9wZXIxemt1cHI4M2hyemtuM3VwNWVsa3R6Y3EzdHVmdDhueHNtd2RxZ3AaCgoEbXVvbhICMTASZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAcSEgoMCgRtdW9uEgQxMDE4ENmaBhpA8O9Jm/kL6Za2I3poDs5vpMowYJgNvYCJBRU/vxAjs0lNZYsq40qpTbwOTbORjJA5UjQ6auc40v6uCFT4q4z+uA=="}"#,
+        signature: "f0ef499bf90be996b6237a680ece6fa4ca3060980dbd808905153fbf1023b3494d658b2ae34aa94dbc0e4db3918c903952343a6ae738d2feae0854f8ab8cfeb8",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"8O9Jm/kL6Za2I3poDs5vpMowYJgNvYCJBRU/vxAjs0lNZYsq40qpTbwOTbORjJA5UjQ6auc40v6uCFT4q4z+uA=="}]"#,
+    });
+
+    // This transaction hasn't been broadcasted.
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"async","tx":{"fee":{"amount":[{"amount":"1018","denom":"muon"}],"gas":"101721"},"memo":"","msg":[{"type":"unreal/MsgDelegate","value":{"amount":{"amount":"10","denom":"muon"},"delegator_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","validator_address":"cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"D9OufIm3RGkoGU/OO7eNHe17Yg4q0OBU0pHnqtULWXIm3J1eSUxsVI6OCbGAMYEqHUB9i5b1YGrueaDYFOH9xQ=="}]}}"#,
+        signature: "0fd3ae7c89b7446928194fce3bb78d1ded7b620e2ad0e054d291e7aad50b597226dc9d5e494c6c548e8e09b18031812a1d407d8b96f5606aee79a0d814e1fdc5",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"D9OufIm3RGkoGU/OO7eNHe17Yg4q0OBU0pHnqtULWXIm3J1eSUxsVI6OCbGAMYEqHUB9i5b1YGrueaDYFOH9xQ=="}]"#,
+    });
+}
+
+#[test]
+fn test_staking_undelegate() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let undelegate = Proto::mod_Message::Undelegate {
+        delegator_address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02".into(),
+        validator_address: "cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp".into(),
+        amount: Some(make_amount("muon", "10")),
+        ..Proto::mod_Message::Undelegate::default()
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 7,
+        fee: Some(make_fee(101721, make_amount("muon", "1018"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::unstake_message(undelegate))],
+        mode: Proto::BroadcastMode::SYNC,
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_SYNC","tx_bytes":"Cp0BCpoBCiUvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dVbmRlbGVnYXRlEnEKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBoKCgRtdW9uEgIxMBJmClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYBxISCgwKBG11b24SBDEwMTgQ2ZoGGkBhlxHFnjBERxLtjLbMCKXcrDctaSZ9djtWCa3ely1bpV6m+6aAFjpr8aEZH+q2AtjJSEdgpQRJxP+9/gQsRTnZ"}"#,
+        signature: "619711c59e30444712ed8cb6cc08a5dcac372d69267d763b5609adde972d5ba55ea6fba680163a6bf1a1191feab602d8c9484760a50449c4ffbdfe042c4539d9",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"YZcRxZ4wREcS7Yy2zAil3Kw3LWkmfXY7Vgmt3pctW6VepvumgBY6a/GhGR/qtgLYyUhHYKUEScT/vf4ELEU52Q=="}]"#,
+    });
+
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"sync","tx":{"fee":{"amount":[{"amount":"1018","denom":"muon"}],"gas":"101721"},"memo":"","msg":[{"type":"cosmos-sdk/MsgUndelegate","value":{"amount":{"amount":"10","denom":"muon"},"delegator_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","validator_address":"cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"j4WpUVohGIHa6/s0bCvuyjq1wtQGqbOtQCz92qPQjisTN44Tz++Ozx1lAP6F0M4+eTA03XerqQ8hZCeAfL/3nw=="}]}}"#,
+        signature: "8f85a9515a211881daebfb346c2beeca3ab5c2d406a9b3ad402cfddaa3d08e2b13378e13cfef8ecf1d6500fe85d0ce3e793034dd77aba90f216427807cbff79f",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"j4WpUVohGIHa6/s0bCvuyjq1wtQGqbOtQCz92qPQjisTN44Tz++Ozx1lAP6F0M4+eTA03XerqQ8hZCeAfL/3nw=="}]"#,
+    });
+}
+
+#[test]
+fn test_staking_restake() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let redelegate = Proto::mod_Message::BeginRedelegate {
+        delegator_address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02".into(),
+        validator_src_address: "cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp".into(),
+        validator_dst_address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02".into(),
+        amount: Some(make_amount("muon", "10")),
+        ..Proto::mod_Message::BeginRedelegate::default()
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 7,
+        fee: Some(make_fee(101721, make_amount("muon", "1018"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::restake_message(redelegate))],
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CtIBCs8BCiovY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dCZWdpblJlZGVsZWdhdGUSoAEKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBotY29zbW9zMWhzazZqcnl5cWpmaHA1ZGhjNTV0YzlqdGNreWd4MGVwaDZkZDAyIgoKBG11b24SAjEwEmYKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJXKG7D830zVXu7qgALJ3RKyQI6qZZ8rnWhgdH/kfqdxRIECgIIARgHEhIKDAoEbXVvbhIEMTAxOBDZmgYaQJ52qO5xdtBkNUeFeWrnqUXkngyHFKCXnOPPClyVI0HrULdp5jbwGra2RujEOn4BrbFCb3JFnpc2o1iuLXbKQxg="}"#,
+        signature: "9e76a8ee7176d064354785796ae7a945e49e0c8714a0979ce3cf0a5c952341eb50b769e636f01ab6b646e8c43a7e01adb1426f72459e9736a358ae2d76ca4318",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"nnao7nF20GQ1R4V5auepReSeDIcUoJec488KXJUjQetQt2nmNvAatrZG6MQ6fgGtsUJvckWelzajWK4tdspDGA=="}]"#,
+    });
+
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"1018","denom":"muon"}],"gas":"101721"},"memo":"","msg":[{"type":"cosmos-sdk/MsgBeginRedelegate","value":{"amount":{"amount":"10","denom":"muon"},"delegator_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","validator_dst_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","validator_src_address":"cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"5k03Yb0loovvzagMCg4gjQJP2woriZVRcOZaXF1FSros6B1X4B8MEm3lpZwrWBJMEJVgyYA9ZaF6FLVI3WxQ2w=="}]}}"#,
+        signature: "e64d3761bd25a28befcda80c0a0e208d024fdb0a2b89955170e65a5c5d454aba2ce81d57e01f0c126de5a59c2b58124c109560c9803d65a17a14b548dd6c50db",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"5k03Yb0loovvzagMCg4gjQJP2woriZVRcOZaXF1FSros6B1X4B8MEm3lpZwrWBJMEJVgyYA9ZaF6FLVI3WxQ2w=="}]"#,
+    });
+}
+
+#[test]
+fn test_staking_withdraw_rewards() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let withdraw = Proto::mod_Message::WithdrawDelegationReward {
+        delegator_address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02".into(),
+        validator_address: "cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp".into(),
+        ..Proto::mod_Message::WithdrawDelegationReward::default()
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 7,
+        fee: Some(make_fee(101721, make_amount("muon", "1018"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::withdraw_stake_reward_message(
+            withdraw,
+        ))],
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CqMBCqABCjcvY29zbW9zLmRpc3RyaWJ1dGlvbi52MWJldGExLk1zZ1dpdGhkcmF3RGVsZWdhdG9yUmV3YXJkEmUKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBJmClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYBxISCgwKBG11b24SBDEwMTgQ2ZoGGkBW1Cd+0pNfMPEVXQtqG1VIijDjZP2UOiDlvUF478axnxlF8PaOAsY0S5OdUE3Wz7+nu8YVmrLZQS/8mlqLaK05"}"#,
+        signature: "56d4277ed2935f30f1155d0b6a1b55488a30e364fd943a20e5bd4178efc6b19f1945f0f68e02c6344b939d504dd6cfbfa7bbc6159ab2d9412ffc9a5a8b68ad39",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"VtQnftKTXzDxFV0LahtVSIow42T9lDog5b1BeO/GsZ8ZRfD2jgLGNEuTnVBN1s+/p7vGFZqy2UEv/Jpai2itOQ=="}]"#,
+    });
+
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"1018","denom":"muon"}],"gas":"101721"},"memo":"","msg":[{"type":"cosmos-sdk/MsgWithdrawDelegationReward","value":{"delegator_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","validator_address":"cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"VG8NZzVvavlM+1qyK5dOSZwzEj8sLCkvTw5kh44Oco9GQxBf13FVC+s/I3HwiICqo4+o8jNMEDp3nx2C0tuY1g=="}]}}"#,
+        signature: "546f0d67356f6af94cfb5ab22b974e499c33123f2c2c292f4f0e64878e0e728f4643105fd771550beb3f2371f08880aaa38fa8f2334c103a779f1d82d2db98d6",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"VG8NZzVvavlM+1qyK5dOSZwzEj8sLCkvTw5kh44Oco9GQxBf13FVC+s/I3HwiICqo4+o8jNMEDp3nx2C0tuY1g=="}]"#,
+    });
+}
+
+#[test]
+fn test_staking_set_withdraw_address() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("cosmos");
+
+    let set_address = Proto::mod_Message::SetWithdrawAddress {
+        delegator_address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02".into(),
+        withdraw_address: "cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp".into(),
+        ..Proto::mod_Message::SetWithdrawAddress::default()
+    };
+    let input = Proto::SigningInput {
+        account_number: 1037,
+        chain_id: "gaia-13003".into(),
+        sequence: 7,
+        fee: Some(make_fee(101721, make_amount("muon", "1018"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::set_withdraw_address_message(
+            set_address,
+        ))],
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"Cp4BCpsBCjIvY29zbW9zLmRpc3RyaWJ1dGlvbi52MWJldGExLk1zZ1NldFdpdGhkcmF3QWRkcmVzcxJlCi1jb3Ntb3MxaHNrNmpyeXlxamZocDVkaGM1NXRjOWp0Y2t5Z3gwZXBoNmRkMDISNGNvc21vc3ZhbG9wZXIxemt1cHI4M2hyemtuM3VwNWVsa3R6Y3EzdHVmdDhueHNtd2RxZ3ASZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAcSEgoMCgRtdW9uEgQxMDE4ENmaBhpAkm2TJLw4FcIwN5bkqVaGbmAgkTSHeYD8sUkIyJHLa89cPvThkFO/lKlxBMl2UAMs06hL6cYcl4Px+B6rpFdBpA=="}"#,
+        signature: "926d9324bc3815c2303796e4a956866e60209134877980fcb14908c891cb6bcf5c3ef4e19053bf94a97104c97650032cd3a84be9c61c9783f1f81eaba45741a4",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"km2TJLw4FcIwN5bkqVaGbmAgkTSHeYD8sUkIyJHLa89cPvThkFO/lKlxBMl2UAMs06hL6cYcl4Px+B6rpFdBpA=="}]"#,
+    });
+
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"1018","denom":"muon"}],"gas":"101721"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSetWithdrawAddress","value":{"delegator_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","withdraw_address":"cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"Is+87DPQbtQmIyZASdEdb7hlZhA9ViGiOxREAi6xqs46B5ChxGtIwCGGiWFtr5f5mucsNYmWYgXeRbVxlPutog=="}]}}"#,
+        signature: "22cfbcec33d06ed42623264049d11d6fb86566103d5621a23b1444022eb1aace3a0790a1c46b48c0218689616daf97f99ae72c3589966205de45b57194fbada2",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"Is+87DPQbtQmIyZASdEdb7hlZhA9ViGiOxREAi6xqs46B5ChxGtIwCGGiWFtr5f5mucsNYmWYgXeRbVxlPutog=="}]"#,
+    });
+}
diff --git a/rust/tw_cosmos_sdk/tests/sign_stride.rs b/rust/tw_cosmos_sdk/tests/sign_stride.rs
new file mode 100644
index 00000000000..a34c4767f38
--- /dev/null
+++ b/rust/tw_cosmos_sdk/tests/sign_stride.rs
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_cosmos_sdk::test_utils::sign_utils::{
+    test_sign_json_error, test_sign_protobuf, TestErrorInput, TestInput,
+};
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::tw::PublicKeyType;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+fn account_136412_private_key() -> Cow<'static, [u8]> {
+    "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+#[test]
+fn test_stride_liquid_staking_stake() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("stride");
+
+    let stake = Proto::mod_Message::MsgStrideLiquidStakingStake {
+        creator: "stride1mry47pkga5tdswtluy0m8teslpalkdq0a2sjge".into(),
+        amount: "100000".into(),
+        host_denom: "uatom".into(),
+    };
+    let input = Proto::SigningInput {
+        account_number: 136412,
+        chain_id: "stride-1".into(),
+        sequence: 0,
+        fee: Some(make_fee(500000, make_amount("ustrd", "0"))),
+        private_key: account_136412_private_key(),
+        messages: vec![make_message(MessageEnum::msg_stride_liquid_staking_stake(
+            stake,
+        ))],
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted: https://www.mintscan.io/stride/txs/48E51A2571D99453C4581B30CECA2A1156C0D1EBACCD3619729B5A35AD67CC94?height=3485243
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CmMKYQofL3N0cmlkZS5zdGFrZWliYy5Nc2dMaXF1aWRTdGFrZRI+Ci1zdHJpZGUxbXJ5NDdwa2dhNXRkc3d0bHV5MG04dGVzbHBhbGtkcTBhMnNqZ2USBjEwMDAwMBoFdWF0b20SYgpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAsv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarlEgQKAggBEhAKCgoFdXN0cmQSATAQoMIeGkCDaZHV5/Z3CAQC5DXkaHmF6OKUiS5XKDsl3ZnBaaVuJjlSWV2vA7MPwGbC17P6jbVJt58ZLcxIWFt76UO3y1ix"}"#,
+        signature: "836991d5e7f677080402e435e4687985e8e294892e57283b25dd99c169a56e263952595daf03b30fc066c2d7b3fa8db549b79f192dcc48585b7be943b7cb58b1",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Asv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarl"},"signature":"g2mR1ef2dwgEAuQ15Gh5hejilIkuVyg7Jd2ZwWmlbiY5UlldrwOzD8Bmwtez+o21SbefGS3MSFhbe+lDt8tYsQ=="}]"#,
+    });
+
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
+
+#[test]
+fn test_stride_liquid_staking_redeem() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("stride");
+
+    let redeem = Proto::mod_Message::MsgStrideLiquidStakingRedeem {
+        creator: "stride1mry47pkga5tdswtluy0m8teslpalkdq0a2sjge".into(),
+        amount: "40000".into(),
+        receiver: "cosmos1mry47pkga5tdswtluy0m8teslpalkdq07pswu4".into(),
+        host_zone: "cosmoshub-4".into(),
+    };
+    let input = Proto::SigningInput {
+        account_number: 136412,
+        chain_id: "stride-1".into(),
+        sequence: 1,
+        fee: Some(make_fee(1000000, make_amount("ustrd", "0"))),
+        private_key: account_136412_private_key(),
+        messages: vec![make_message(MessageEnum::msg_stride_liquid_staking_redeem(
+            redeem,
+        ))],
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted: https://www.mintscan.io/stride/txs/B3D3A92A2FFB92A480A4B547A4303E6932204972A965D687DB4FB6B4E16B2C42?height=3485343
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpgBCpUBCh8vc3RyaWRlLnN0YWtlaWJjLk1zZ1JlZGVlbVN0YWtlEnIKLXN0cmlkZTFtcnk0N3BrZ2E1dGRzd3RsdXkwbTh0ZXNscGFsa2RxMGEyc2pnZRIFNDAwMDAaC2Nvc21vc2h1Yi00Ii1jb3Ntb3MxbXJ5NDdwa2dhNXRkc3d0bHV5MG04dGVzbHBhbGtkcTA3cHN3dTQSZApQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAsv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarlEgQKAggBGAESEAoKCgV1c3RyZBIBMBDAhD0aQKf84TYoPqwnXw22r0dok2fYplUFu003TlIfpoT+wqTZF1lHPC+RTAoJob6x50CnfvGlgJFBEQYPD+Ccv659VVA="}"#,
+        signature: "a7fce136283eac275f0db6af47689367d8a65505bb4d374e521fa684fec2a4d91759473c2f914c0a09a1beb1e740a77ef1a580914111060f0fe09cbfae7d5550",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Asv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarl"},"signature":"p/zhNig+rCdfDbavR2iTZ9imVQW7TTdOUh+mhP7CpNkXWUc8L5FMCgmhvrHnQKd+8aWAkUERBg8P4Jy/rn1VUA=="}]"#,
+    });
+
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
diff --git a/rust/tw_cosmos_sdk/tests/sign_terra_wasm.rs b/rust/tw_cosmos_sdk/tests/sign_terra_wasm.rs
new file mode 100644
index 00000000000..9ce7d2ed39a
--- /dev/null
+++ b/rust/tw_cosmos_sdk/tests/sign_terra_wasm.rs
@@ -0,0 +1,270 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde_json::json;
+use std::borrow::Cow;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::modules::tx_builder::TxBuilder;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_cosmos_sdk::test_utils::sign_utils::{test_sign_json, test_sign_protobuf, TestInput};
+use tw_encoding::base64::{self, STANDARD};
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::tw::PublicKeyType;
+use tw_number::U256;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+fn account_3407705_private_key() -> Cow<'static, [u8]> {
+    "cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+#[test]
+fn test_terra_wasm_transfer_protobuf_9ff3f0() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let transfer = Proto::mod_Message::WasmTerraExecuteContractTransfer {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        // ANC
+        contract_address: "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76".into(),
+        amount: U256::encode_be_compact(250000),
+        recipient_address: "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp".into(),
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 3407705,
+        chain_id: "columbus-5".into(),
+        sequence: 3,
+        fee: Some(make_fee(200000, make_amount("uluna", "3000"))),
+        private_key: account_3407705_private_key(),
+        messages: vec![make_message(
+            MessageEnum::wasm_terra_execute_contract_transfer_message(transfer),
+        )],
+        ..Proto::SigningInput::default()
+    };
+
+    // https://finder.terra.money/mainnet/tx/9FF3F0A16879254C22EB90D8B4D6195467FE5014381FD36BD3C23CA6698FE94B
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CucBCuQBCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBK5AQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2Glt7InRyYW5zZmVyIjp7ImFtb3VudCI6IjI1MDAwMCIsInJlY2lwaWVudCI6InRlcnJhMWpsZ2FxeTludm4yaGY1dDJzcmE5eWN6OHM3N3duZjlsMGttZ2NwIn19EmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQNwZjrHsPmJKW/rXOWfukpQ1+lOHOJW3/IlFFnKLNmsABIECgIIARgDEhMKDQoFdWx1bmESBDMwMDAQwJoMGkAaprIEMLPH2HmFdwFGoaipb2GIyhXt6ombz+WMnG2mORBI6gFt0M+IymYgzZz6w1SW52R922yafDnn7yXfutRw"}"#,
+        signature: "1aa6b20430b3c7d87985770146a1a8a96f6188ca15edea899bcfe58c9c6da6391048ea016dd0cf88ca6620cd9cfac35496e7647ddb6c9a7c39e7ef25dfbad470",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"GqayBDCzx9h5hXcBRqGoqW9hiMoV7eqJm8/ljJxtpjkQSOoBbdDPiMpmIM2c+sNUludkfdtsmnw55+8l37rUcA=="}]"#,
+    });
+}
+
+#[test]
+fn test_terra_wasm_transfer_json_078e90() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let transfer = Proto::mod_Message::WasmTerraExecuteContractTransfer {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        // ANC
+        contract_address: "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76".into(),
+        amount: U256::encode_be_compact(250000),
+        recipient_address: "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp".into(),
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 3407705,
+        chain_id: "columbus-5".into(),
+        sequence: 2,
+        fee: Some(make_fee(200000, make_amount("uluna", "3000"))),
+        private_key: account_3407705_private_key(),
+        messages: vec![make_message(
+            MessageEnum::wasm_terra_execute_contract_transfer_message(transfer),
+        )],
+        ..Proto::SigningInput::default()
+    };
+
+    // https://finder.terra.money/mainnet/tx/078E90458061611F6FD8B708882B55FF5C1FFB3FCE61322107A0A0DE39FC0F3E
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"3000","denom":"uluna"}],"gas":"200000"},"memo":"","msg":[{"type":"wasm/MsgExecuteContract","value":{"coins":[],"contract":"terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76","execute_msg":{"transfer":{"amount":"250000","recipient":"terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp"}},"sender":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"BjETdtbA97Wv1zvcsCV1tM+bdYKC8O3uGTk4mMRv6pBJB2y/Ds7qoS7s/zrkhYak1YChklQetHsI30XRXzGIkg=="}]}}"#,
+        signature: "06311376d6c0f7b5afd73bdcb02575b4cf9b758282f0edee19393898c46fea9049076cbf0eceeaa12eecff3ae48586a4d580a192541eb47b08df45d15f318892",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"BjETdtbA97Wv1zvcsCV1tM+bdYKC8O3uGTk4mMRv6pBJB2y/Ds7qoS7s/zrkhYak1YChklQetHsI30XRXzGIkg=="}]"#,
+    });
+}
+
+#[test]
+fn test_terra_wasm_generic() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let generic = Proto::mod_Message::WasmTerraExecuteContractGeneric {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        // ANC
+        contract_address: "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76".into(),
+        execute_msg: r#"{"transfer": { "amount": "250000", "recipient": "terra1d7048csap4wzcv5zm7z6tdqem2agyp9647vdyj" } }"#.into(),
+        coins: Vec::default(),
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 3407705,
+        chain_id: "columbus-5".into(),
+        sequence: 7,
+        fee: Some(make_fee(200000, make_amount("uluna", "3000"))),
+        private_key: account_3407705_private_key(),
+        messages: vec![make_message(
+            MessageEnum::wasm_terra_execute_contract_generic(generic),
+        )],
+        ..Proto::SigningInput::default()
+    };
+
+    // https://finder.terra.money/mainnet/tx/EC4F8532847E4D6AF016E6F6D3F027AE7FB6FF0B533C5132B01382D83B214A6F
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"Cu4BCusBCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBLAAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2GmJ7InRyYW5zZmVyIjogeyAiYW1vdW50IjogIjI1MDAwMCIsICJyZWNpcGllbnQiOiAidGVycmExZDcwNDhjc2FwNHd6Y3Y1em03ejZ0ZHFlbTJhZ3lwOTY0N3ZkeWoiIH0gfRJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYBxITCg0KBXVsdW5hEgQzMDAwEMCaDBpAkPsS7xlSng2LMc9KiD1soN5NLaDcUh8I9okPmsdJN3le1B7yxRGNB4aQfhaRl/8Z0r5vitRT0AWuxDasd8wcFw=="}"#,
+        signature: "90fb12ef19529e0d8b31cf4a883d6ca0de4d2da0dc521f08f6890f9ac74937795ed41ef2c5118d0786907e169197ff19d2be6f8ad453d005aec436ac77cc1c17",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"kPsS7xlSng2LMc9KiD1soN5NLaDcUh8I9okPmsdJN3le1B7yxRGNB4aQfhaRl/8Z0r5vitRT0AWuxDasd8wcFw=="}]"#,
+    });
+
+    // This transaction hasn't been broadcasted.
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"3000","denom":"uluna"}],"gas":"200000"},"memo":"","msg":[{"type":"wasm/MsgExecuteContract","value":{"coins":[],"contract":"terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76","execute_msg":{"transfer":{"amount":"250000","recipient":"terra1d7048csap4wzcv5zm7z6tdqem2agyp9647vdyj"}},"sender":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"2Ph/0CdoT/lUn4fvQUp0mN+uhQ80W/9YWS6B8gmwWP5pgdFWDvkvWB4ytGRQ5M8XxJnLi32qZvsPW3Nbv9YElw=="}]}}"#,
+        signature: "d8f87fd027684ff9549f87ef414a7498dfae850f345bff58592e81f209b058fe6981d1560ef92f581e32b46450e4cf17c499cb8b7daa66fb0f5b735bbfd60497",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"2Ph/0CdoT/lUn4fvQUp0mN+uhQ80W/9YWS6B8gmwWP5pgdFWDvkvWB4ytGRQ5M8XxJnLi32qZvsPW3Nbv9YElw=="}]"#,
+    });
+}
+
+#[test]
+fn test_terra_wasm_generic_with_coins() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let generic = Proto::mod_Message::WasmTerraExecuteContractGeneric {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        // ANC Market
+        contract_address: "terra1sepfj7s0aeg5967uxnfk4thzlerrsktkpelm5s".into(),
+        execute_msg: r#"{ "deposit_stable": {} }"#.into(),
+        coins: vec![make_amount("uusd", "1000")],
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 3407705,
+        chain_id: "columbus-5".into(),
+        sequence: 9,
+        fee: Some(make_fee(600000, make_amount("uluna", "7000"))),
+        private_key: account_3407705_private_key(),
+        messages: vec![make_message(
+            MessageEnum::wasm_terra_execute_contract_generic(generic),
+        )],
+        ..Proto::SigningInput::default()
+    };
+
+    // https://finder.terra.money/mainnet/tx/6651FCE0EE5C6D6ACB655CC49A6FD5E939FB082862854616EA0642475BCDD0C9
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CrIBCq8BCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBKEAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMXNlcGZqN3MwYWVnNTk2N3V4bmZrNHRoemxlcnJza3RrcGVsbTVzGhh7ICJkZXBvc2l0X3N0YWJsZSI6IHt9IH0qDAoEdXVzZBIEMTAwMBJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYCRITCg0KBXVsdW5hEgQ3MDAwEMDPJBpAGyi7f1ioY8XV6pjFq1s86Om4++CIUnd3rLHif2iopCcYvX0mLkTlQ6NUERg8nWTYgXcj6fOTO/ptgPuAtv0NWg=="}"#,
+        signature: "1b28bb7f58a863c5d5ea98c5ab5b3ce8e9b8fbe088527777acb1e27f68a8a42718bd7d262e44e543a35411183c9d64d8817723e9f3933bfa6d80fb80b6fd0d5a",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"Gyi7f1ioY8XV6pjFq1s86Om4++CIUnd3rLHif2iopCcYvX0mLkTlQ6NUERg8nWTYgXcj6fOTO/ptgPuAtv0NWg=="}]"#,
+    });
+
+    // This transaction hasn't been broadcasted.
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"7000","denom":"uluna"}],"gas":"600000"},"memo":"","msg":[{"type":"wasm/MsgExecuteContract","value":{"coins":[{"amount":"1000","denom":"uusd"}],"contract":"terra1sepfj7s0aeg5967uxnfk4thzlerrsktkpelm5s","execute_msg":{"deposit_stable":{}},"sender":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"mmfWOFq/9WaQ3PfZZ3C2dgU6S7PH+p/WzVruTpx9UPEHA8dwlTm5rk47YwUbhwKWmpQoUq0fON+GR1VE+rFHqA=="}]}}"#,
+        signature: "9a67d6385abff56690dcf7d96770b676053a4bb3c7fa9fd6cd5aee4e9c7d50f10703c7709539b9ae4e3b63051b8702969a942852ad1f38df86475544fab147a8",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"mmfWOFq/9WaQ3PfZZ3C2dgU6S7PH+p/WzVruTpx9UPEHA8dwlTm5rk47YwUbhwKWmpQoUq0fON+GR1VE+rFHqA=="}]"#,
+    });
+}
+
+#[test]
+fn test_terra_wasm_send() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let encoded_msg = base64::encode(r#"{"some_message":{}}"#.as_bytes(), STANDARD);
+    assert_eq!(encoded_msg, "eyJzb21lX21lc3NhZ2UiOnt9fQ==");
+
+    let send = Proto::mod_Message::WasmTerraExecuteContractSend {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        // ANC
+        contract_address: "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76".into(),
+        amount: U256::encode_be_compact(250000),
+        recipient_contract_address: "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp".into(),
+        msg: encoded_msg.into(),
+        coin: Vec::default(),
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 3407705,
+        chain_id: "columbus-5".into(),
+        sequence: 4,
+        fee: Some(make_fee(200000, make_amount("uluna", "3000"))),
+        private_key: account_3407705_private_key(),
+        messages: vec![make_message(
+            MessageEnum::wasm_terra_execute_contract_send_message(send),
+        )],
+        ..Proto::SigningInput::default()
+    };
+
+    // https://finder.terra.money/mainnet/tx/9FF3F0A16879254C22EB90D8B4D6195467FE5014381FD36BD3C23CA6698FE94B
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CocCCoQCCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBLZAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2Gnt7InNlbmQiOnsiYW1vdW50IjoiMjUwMDAwIiwiY29udHJhY3QiOiJ0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcCIsIm1zZyI6ImV5SnpiMjFsWDIxbGMzTmhaMlVpT250OWZRPT0ifX0SZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awAEgQKAggBGAQSEwoNCgV1bHVuYRIEMzAwMBDAmgwaQL6NByKeRZsyq5g6CTMdmPqiM77nOe9uLO8FjpetFgkBFiG3Le7ieZZ+4vCMhD1bcFgMwSHibFI/uPil847U/+g="}"#,
+        signature: "be8d07229e459b32ab983a09331d98faa233bee739ef6e2cef058e97ad1609011621b72deee279967ee2f08c843d5b70580cc121e26c523fb8f8a5f38ed4ffe8",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"vo0HIp5FmzKrmDoJMx2Y+qIzvuc5724s7wWOl60WCQEWIbct7uJ5ln7i8IyEPVtwWAzBIeJsUj+4+KXzjtT/6A=="}]"#,
+    });
+
+    // This transaction hasn't been broadcasted.
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"3000","denom":"uluna"}],"gas":"200000"},"memo":"","msg":[{"type":"wasm/MsgExecuteContract","value":{"coins":[],"contract":"terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76","execute_msg":{"send":{"amount":"250000","contract":"terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp","msg":"eyJzb21lX21lc3NhZ2UiOnt9fQ=="}},"sender":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"17wYg45V0rjwCxMdlvcKliFnPdE7LcBoN83lfZaHB3R4XxaBqUv3IGEl3wrIjGo2OBf5SD1HkQywloPvoI6ENA=="}]}}"#,
+        signature: "d7bc18838e55d2b8f00b131d96f70a9621673dd13b2dc06837cde57d96870774785f1681a94bf7206125df0ac88c6a363817f9483d47910cb09683efa08e8434",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"17wYg45V0rjwCxMdlvcKliFnPdE7LcBoN83lfZaHB3R4XxaBqUv3IGEl3wrIjGo2OBf5SD1HkQywloPvoI6ENA=="}]"#,
+    });
+}
+
+#[test]
+fn test_terra_transfer_payload() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let transfer = Proto::mod_Message::WasmTerraExecuteContractTransfer {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        // ANC
+        contract_address: "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76".into(),
+        recipient_address: "recipient=address".into(),
+        amount: U256::encode_be_compact(250000),
+    };
+
+    let payload =
+        TxBuilder::<StandardCosmosContext>::wasm_terra_execute_contract_transfer_msg_from_proto(
+            &coin, &transfer,
+        )
+        .unwrap();
+    let actual = payload.to_json().unwrap();
+    let expected = json!({
+        "coins": [],
+        "contract": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
+        "execute_msg": {
+            "transfer": {
+                "amount": "250000",
+                "recipient": "recipient=address"
+            }
+        },
+        "sender": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"
+    });
+    assert_eq!(actual.value, expected);
+}
diff --git a/rust/tw_cosmos_sdk/tests/sign_thorchain.rs b/rust/tw_cosmos_sdk/tests/sign_thorchain.rs
new file mode 100644
index 00000000000..4783d235747
--- /dev/null
+++ b/rust/tw_cosmos_sdk/tests/sign_thorchain.rs
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use std::str::FromStr;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_cosmos_sdk::address::Address;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_fee_none, make_message};
+use tw_cosmos_sdk::test_utils::sign_utils::{
+    test_sign_json_error, test_sign_protobuf, TestErrorInput, TestInput,
+};
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::tw::PublicKeyType;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+fn account_593_private_key() -> Cow<'static, [u8]> {
+    "7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn account_75247_private_key() -> Cow<'static, [u8]> {
+    "2659e41d54ebd449d68b9d58510d8eeeb837ee00d6ecc760b7a731238d8c3113"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn address_to_key_hash(addr: &str) -> Cow<'static, [u8]> {
+    Address::from_str(addr).unwrap().key_hash().to_vec().into()
+}
+
+fn make_thorchain_coin<'a>(
+    amount: &str,
+    decimals: i64,
+    asset: Proto::THORChainAsset<'a>,
+) -> Proto::THORChainCoin<'a> {
+    Proto::THORChainCoin {
+        amount: amount.to_string().into(),
+        decimals,
+        asset: Some(asset),
+    }
+}
+
+#[test]
+fn test_thorchain_send() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("thor");
+
+    let send = Proto::mod_Message::THORChainSend {
+        from_address: address_to_key_hash("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r"),
+        to_address: address_to_key_hash("thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"),
+        amounts: vec![make_amount("rune", "38000000")],
+    };
+    let input = Proto::SigningInput {
+        account_number: 593,
+        chain_id: "thorchain-mainnet-v1".into(),
+        sequence: 21,
+        fee: Some(make_fee(2500000, make_amount("rune", "200"))),
+        private_key: account_593_private_key(),
+        messages: vec![make_message(MessageEnum::thorchain_send_message(send))],
+        ..Proto::SigningInput::default()
+    };
+
+    // https://viewblock.io/thorchain/tx/7E480FA163F6C6AFA17593F214C7BBC218F69AE3BC72366E39042AF381BFE105
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"ClIKUAoOL3R5cGVzLk1zZ1NlbmQSPgoUFSLnZ9tusZcIsAOAKb+9YHvJvQ4SFMqGRZ+wBVHH30JUDF54aRksgzrbGhAKBHJ1bmUSCDM4MDAwMDAwEmYKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQPtmX45bPQpL1/OWkK7pBWZzNXZbjExVKfJ6nBJ3jF8dxIECgIIARgVEhIKCwoEcnVuZRIDMjAwEKDLmAEaQKZtS3ATa26OOGvqdKm14ZbHeNfkPtIajXi5MkZ5XaX2SWOeX+YnCPZ9TxF9Jj5cVIo71m55xq4hVL3yDbRe89g="}"#,
+        signature: "a66d4b70136b6e8e386bea74a9b5e196c778d7e43ed21a8d78b93246795da5f649639e5fe62708f67d4f117d263e5c548a3bd66e79c6ae2154bdf20db45ef3d8",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"},"signature":"pm1LcBNrbo44a+p0qbXhlsd41+Q+0hqNeLkyRnldpfZJY55f5icI9n1PEX0mPlxUijvWbnnGriFUvfINtF7z2A=="}]"#,
+    });
+
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
+
+#[test]
+fn test_thorchain_deposit() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("thor");
+
+    let deposit = Proto::mod_Message::THORChainDeposit {
+        memo: "=:DOGE.DOGE:DNhRF1h8J4ZnB1bxp9kaqhVLYetkx1nSJ5::tr:0".into(),
+        signer: address_to_key_hash("thor14j5lwl8ulexrqp5x39kmkctv2937694z3jn2dz"),
+        coins: vec![make_thorchain_coin(
+            "150000000",
+            0,
+            Proto::THORChainAsset {
+                chain: "THOR".into(),
+                symbol: "RUNE".into(),
+                ticker: "RUNE".into(),
+                ..Proto::THORChainAsset::default()
+            },
+        )],
+    };
+    let input = Proto::SigningInput {
+        account_number: 75247,
+        chain_id: "thorchain-mainnet-v1".into(),
+        sequence: 7,
+        fee: Some(make_fee_none(50000000)),
+        private_key: account_75247_private_key(),
+        messages: vec![make_message(MessageEnum::thorchain_deposit_message(
+            deposit,
+        ))],
+        ..Proto::SigningInput::default()
+    };
+
+    // https://viewblock.io/thorchain/tx/0162213E7F9D85965B1C57FA3BF9603C655B542F358318303A7B00661AE42510
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CoUBCoIBChEvdHlwZXMuTXNnRGVwb3NpdBJtCh8KEgoEVEhPUhIEUlVORRoEUlVORRIJMTUwMDAwMDAwEjQ9OkRPR0UuRE9HRTpETmhSRjFoOEo0Wm5CMWJ4cDlrYXFoVkxZZXRreDFuU0o1Ojp0cjowGhSsqfd8/P5MMAaGiW27YWxRY+0WohJZClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDuZVDlIFW3DtSEBa6aUBJ0DrQHlQ+2g7lIt5ekAM25SkSBAoCCAEYBxIFEIDh6xcaQAxKMZMKbM8gdLwn23GDXfbwyCkgqWzFMFlnrqFm0u54F8T32wmsoJQAdoLIyOskYmi7nb1rhryfabeeULwRhiw="}"#,
+        signature: "0c4a31930a6ccf2074bc27db71835df6f0c82920a96cc5305967aea166d2ee7817c4f7db09aca094007682c8c8eb246268bb9dbd6b86bc9f69b79e50bc11862c",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A7mVQ5SBVtw7UhAWumlASdA60B5UPtoO5SLeXpADNuUp"},"signature":"DEoxkwpszyB0vCfbcYNd9vDIKSCpbMUwWWeuoWbS7ngXxPfbCayglAB2gsjI6yRiaLudvWuGvJ9pt55QvBGGLA=="}]"#,
+    });
+
+    test_sign_json_error::<StandardCosmosContext>(TestErrorInput {
+        coin: &coin,
+        input,
+        error: SigningError::Error_not_supported,
+    });
+}
diff --git a/rust/tw_cosmos_sdk/tests/sign_wasm_contract.rs b/rust/tw_cosmos_sdk/tests/sign_wasm_contract.rs
new file mode 100644
index 00000000000..b80f2b8100c
--- /dev/null
+++ b/rust/tw_cosmos_sdk/tests/sign_wasm_contract.rs
@@ -0,0 +1,251 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde_json::json;
+use std::borrow::Cow;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_cosmos_sdk::context::StandardCosmosContext;
+use tw_cosmos_sdk::modules::tx_builder::TxBuilder;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_cosmos_sdk::test_utils::sign_utils::{test_sign_json, test_sign_protobuf, TestInput};
+use tw_encoding::base64::{self, STANDARD};
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::tw::PublicKeyType;
+use tw_number::U256;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+fn account_336_private_key() -> Cow<'static, [u8]> {
+    "37f0af5bc20adb6832d39368a15492cd1e9e0cc1556d4317a5f75f9ccdf525ee"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn account_3407705_private_key() -> Cow<'static, [u8]> {
+    "cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+/// Airdrop Neutron
+#[test]
+fn test_wasm_execute_generic() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("neutron");
+
+    let execute_msg = r#"{"claim":{"address":"neutron19h42zjnls2tpmg6yylcg6nr56cjxcx35q6xt57", "proof":["404ae2093edcca979ccb6ae4a36689cebc9c2c6a2b00b106c5396b079bf6dcf5","282fee30a25a60904f54d4f74aee8fcf8dd2822799c43be733e18e15743d4ece","e10de4202fe6532329d0d463d9669f1b659920868b9ea87d6715bfd223a86a40","564b4122c6f98653153d8e09d5a5f659fa7ebea740aa6b689c94211f8a11cc4b"], "amount":"2000000"}}"#;
+    let contract = Proto::mod_Message::WasmExecuteContractGeneric {
+        sender_address: "neutron19h42zjnls2tpmg6yylcg6nr56cjxcx35q6xt57".into(),
+        // ANC
+        contract_address: "neutron1465d8udjudl6cd8kgdlh2s37p7q0cf9x7yveumqwqk6ng94qwnmq7n79qn"
+            .into(),
+        execute_msg: execute_msg.into(),
+        ..Proto::mod_Message::WasmExecuteContractGeneric::default()
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 336,
+        chain_id: "pion-1".into(),
+        sequence: 0,
+        fee: Some(make_fee(666666, make_amount("untrn", "1000"))),
+        private_key: account_336_private_key(),
+        messages: vec![make_message(MessageEnum::wasm_execute_contract_generic(
+            contract,
+        ))],
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted: https://explorer.rs-testnet.polypore.xyz/pion-1/tx/28F25164B1E2556844C227819B1D5437960B7E91181B37460EC6792588FF7E4E
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpQECpEECiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QS6AMKLm5ldXRyb24xOWg0MnpqbmxzMnRwbWc2eXlsY2c2bnI1NmNqeGN4MzVxNnh0NTcSQm5ldXRyb24xNDY1ZDh1ZGp1ZGw2Y2Q4a2dkbGgyczM3cDdxMGNmOXg3eXZldW1xd3FrNm5nOTRxd25tcTduNzlxbhrxAnsiY2xhaW0iOnsiYWRkcmVzcyI6Im5ldXRyb24xOWg0MnpqbmxzMnRwbWc2eXlsY2c2bnI1NmNqeGN4MzVxNnh0NTciLCAicHJvb2YiOlsiNDA0YWUyMDkzZWRjY2E5NzljY2I2YWU0YTM2Njg5Y2ViYzljMmM2YTJiMDBiMTA2YzUzOTZiMDc5YmY2ZGNmNSIsIjI4MmZlZTMwYTI1YTYwOTA0ZjU0ZDRmNzRhZWU4ZmNmOGRkMjgyMjc5OWM0M2JlNzMzZTE4ZTE1NzQzZDRlY2UiLCJlMTBkZTQyMDJmZTY1MzIzMjlkMGQ0NjNkOTY2OWYxYjY1OTkyMDg2OGI5ZWE4N2Q2NzE1YmZkMjIzYTg2YTQwIiwiNTY0YjQxMjJjNmY5ODY1MzE1M2Q4ZTA5ZDVhNWY2NTlmYTdlYmVhNzQwYWE2YjY4OWM5NDIxMWY4YTExY2M0YiJdLCAiYW1vdW50IjoiMjAwMDAwMCJ9fRJlCk4KRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECqPwhojhpWpB3vDr8R+qyUnDkcK3BPxS35F8OrHPq5WwSBAoCCAESEwoNCgV1bnRybhIEMTAwMBCq2CgaQMIEXC8zyuuXWuIeX7dZBBzxMjmheOP1ONitBrVZdwmuQUgClmwhOdW0JwRe8CJ5NUKqtDYZjKFAPKGEWQ2veDs="}"#,
+        signature: "c2045c2f33caeb975ae21e5fb759041cf13239a178e3f538d8ad06b5597709ae414802966c2139d5b427045ef022793542aab436198ca1403ca184590daf783b",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Aqj8IaI4aVqQd7w6/EfqslJw5HCtwT8Ut+RfDqxz6uVs"},"signature":"wgRcLzPK65da4h5ft1kEHPEyOaF44/U42K0GtVl3Ca5BSAKWbCE51bQnBF7wInk1Qqq0NhmMoUA8oYRZDa94Ow=="}]"#,
+    });
+
+    // This transaction hasn't been broadcasted.
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"1000","denom":"untrn"}],"gas":"666666"},"memo":"","msg":[{"type":"wasm/MsgExecuteContract","value":{"coins":[],"contract":"neutron1465d8udjudl6cd8kgdlh2s37p7q0cf9x7yveumqwqk6ng94qwnmq7n79qn","msg":{"claim":{"address":"neutron19h42zjnls2tpmg6yylcg6nr56cjxcx35q6xt57","amount":"2000000","proof":["404ae2093edcca979ccb6ae4a36689cebc9c2c6a2b00b106c5396b079bf6dcf5","282fee30a25a60904f54d4f74aee8fcf8dd2822799c43be733e18e15743d4ece","e10de4202fe6532329d0d463d9669f1b659920868b9ea87d6715bfd223a86a40","564b4122c6f98653153d8e09d5a5f659fa7ebea740aa6b689c94211f8a11cc4b"]}},"sender":"neutron19h42zjnls2tpmg6yylcg6nr56cjxcx35q6xt57"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Aqj8IaI4aVqQd7w6/EfqslJw5HCtwT8Ut+RfDqxz6uVs"},"signature":"R0zmQ4RCZ+UL+dTxgCHjK3IRklnLDWIRn6ZYDT9CZzUThcJdxlwxog0zCAAWhzH6HDv1T6LvdATlm7p93o+jzA=="}]}}"#,
+        signature: "474ce643844267e50bf9d4f18021e32b72119259cb0d62119fa6580d3f4267351385c25dc65c31a20d330800168731fa1c3bf54fa2ef7404e59bba7dde8fa3cc",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Aqj8IaI4aVqQd7w6/EfqslJw5HCtwT8Ut+RfDqxz6uVs"},"signature":"R0zmQ4RCZ+UL+dTxgCHjK3IRklnLDWIRn6ZYDT9CZzUThcJdxlwxog0zCAAWhzH6HDv1T6LvdATlm7p93o+jzA=="}]"#,
+    });
+}
+
+/// TerraV2 DepositStable
+#[test]
+fn test_wasm_execute_generic_with_coins() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let execute_msg = r#"{ "deposit_stable": {} }"#;
+    let contract = Proto::mod_Message::WasmExecuteContractGeneric {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        contract_address: "terra1sepfj7s0aeg5967uxnfk4thzlerrsktkpelm5s".into(),
+        execute_msg: execute_msg.into(),
+        coins: vec![make_amount("uusd", "1000")],
+        ..Proto::mod_Message::WasmExecuteContractGeneric::default()
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 3407705,
+        chain_id: "phoenix-1".into(),
+        sequence: 9,
+        fee: Some(make_fee(600000, make_amount("uluna", "7000"))),
+        private_key: account_3407705_private_key(),
+        messages: vec![make_message(MessageEnum::wasm_execute_contract_generic(
+            contract,
+        ))],
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CrABCq0BCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QShAEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTFzZXBmajdzMGFlZzU5Njd1eG5mazR0aHpsZXJyc2t0a3BlbG01cxoYeyAiZGVwb3NpdF9zdGFibGUiOiB7fSB9KgwKBHV1c2QSBDEwMDASZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awAEgQKAggBGAkSEwoNCgV1bHVuYRIENzAwMBDAzyQaQEDA2foXegF+rslj6o8bX2HPJfn+q/6Ezbq2iAd0SFOTQqS8aAyywQkdZJRToXcaby1HOYL1WvmsMPgrFzChiY4="}"#,
+        signature: "40c0d9fa177a017eaec963ea8f1b5f61cf25f9feabfe84cdbab688077448539342a4bc680cb2c1091d649453a1771a6f2d473982f55af9ac30f82b1730a1898e",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"QMDZ+hd6AX6uyWPqjxtfYc8l+f6r/oTNuraIB3RIU5NCpLxoDLLBCR1klFOhdxpvLUc5gvVa+aww+CsXMKGJjg=="}]"#,
+    });
+
+    // This transaction hasn't been broadcasted.
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"7000","denom":"uluna"}],"gas":"600000"},"memo":"","msg":[{"type":"wasm/MsgExecuteContract","value":{"coins":[{"amount":"1000","denom":"uusd"}],"contract":"terra1sepfj7s0aeg5967uxnfk4thzlerrsktkpelm5s","msg":{"deposit_stable":{}},"sender":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"ohL3xBbHumPGwz7nCyocMmS9n08bq27bOlV3hRSduNZzwsaxq5IktzizeYTRmv5uLvAhKHsrsMwWvJWU0J0nvw=="}]}}"#,
+        signature: "a212f7c416c7ba63c6c33ee70b2a1c3264bd9f4f1bab6edb3a557785149db8d673c2c6b1ab9224b738b37984d19afe6e2ef021287b2bb0cc16bc9594d09d27bf",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"ohL3xBbHumPGwz7nCyocMmS9n08bq27bOlV3hRSduNZzwsaxq5IktzizeYTRmv5uLvAhKHsrsMwWvJWU0J0nvw=="}]"#,
+    });
+}
+
+/// TerraV2 Transfer
+#[test]
+fn test_wasm_execute_transfer() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let transfer = Proto::mod_Message::WasmExecuteContractTransfer {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        // ANC
+        contract_address: "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76".into(),
+        recipient_address: "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp".into(),
+        amount: U256::encode_be_compact(250000),
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 3407705,
+        chain_id: "phoenix-1".into(),
+        sequence: 3,
+        fee: Some(make_fee(200000, make_amount("uluna", "3000"))),
+        private_key: account_3407705_private_key(),
+        messages: vec![make_message(
+            MessageEnum::wasm_execute_contract_transfer_message(transfer),
+        )],
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CuUBCuIBCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QSuQEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3NhpbeyJ0cmFuc2ZlciI6eyJhbW91bnQiOiIyNTAwMDAiLCJyZWNpcGllbnQiOiJ0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcCJ9fRJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYAxITCg0KBXVsdW5hEgQzMDAwEMCaDBpAiBGbQaj+jsXE6/FssD3fC77QOxpli9GqsPea+KoNyMIEgVj89Hii+oU1bAEQS4qV0SaE2V6RNy24uCcFTIRbcQ=="}"#,
+        signature: "88119b41a8fe8ec5c4ebf16cb03ddf0bbed03b1a658bd1aab0f79af8aa0dc8c2048158fcf478a2fa85356c01104b8a95d12684d95e91372db8b827054c845b71",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"iBGbQaj+jsXE6/FssD3fC77QOxpli9GqsPea+KoNyMIEgVj89Hii+oU1bAEQS4qV0SaE2V6RNy24uCcFTIRbcQ=="}]"#,
+    });
+
+    // This transaction hasn't been broadcasted.
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"3000","denom":"uluna"}],"gas":"200000"},"memo":"","msg":[{"type":"wasm/MsgExecuteContract","value":{"coins":[],"contract":"terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76","msg":{"transfer":{"amount":"250000","recipient":"terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp"}},"sender":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"fuuH43BvZGyTHb7Eaw0QDSbnOm11qRWj7HljhEmvKbFJztaSpLJ0cDmENksmt4lmPtIE26EZ1SZ6XriGX6LS0A=="}]}}"#,
+        signature: "7eeb87e3706f646c931dbec46b0d100d26e73a6d75a915a3ec79638449af29b149ced692a4b274703984364b26b789663ed204dba119d5267a5eb8865fa2d2d0",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"fuuH43BvZGyTHb7Eaw0QDSbnOm11qRWj7HljhEmvKbFJztaSpLJ0cDmENksmt4lmPtIE26EZ1SZ6XriGX6LS0A=="}]"#,
+    });
+}
+
+/// TerraV2 Transfer
+#[test]
+fn test_wasm_execute_send() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let encoded_msg = base64::encode(r#"{"some_message":{}}"#.as_bytes(), STANDARD);
+    let send = Proto::mod_Message::WasmExecuteContractSend {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        contract_address: "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76".into(),
+        recipient_contract_address: "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp".into(),
+        amount: U256::encode_be_compact(250000),
+        msg: encoded_msg.into(),
+        coin: Vec::default(),
+    };
+
+    let input = Proto::SigningInput {
+        account_number: 3407705,
+        chain_id: "phoenix-1".into(),
+        sequence: 4,
+        fee: Some(make_fee(200000, make_amount("uluna", "3000"))),
+        private_key: account_3407705_private_key(),
+        messages: vec![make_message(
+            MessageEnum::wasm_execute_contract_send_message(send),
+        )],
+        ..Proto::SigningInput::default()
+    };
+
+    test_sign_protobuf::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input: input.clone(),
+        tx: r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CoUCCoICCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QS2QEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3Nhp7eyJzZW5kIjp7ImFtb3VudCI6IjI1MDAwMCIsImNvbnRyYWN0IjoidGVycmExamxnYXF5OW52bjJoZjV0MnNyYTl5Y3o4czc3d25mOWwwa21nY3AiLCJtc2ciOiJleUp6YjIxbFgyMWxjM05oWjJVaU9udDlmUT09In19EmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQNwZjrHsPmJKW/rXOWfukpQ1+lOHOJW3/IlFFnKLNmsABIECgIIARgEEhMKDQoFdWx1bmESBDMwMDAQwJoMGkBKJbW1GDrv9j2FIckm7MtpDZzP2RjgDjU84oYmOHNHsxEBPLjtt3YAjsKWBCAsjbnbVoJ3s2XFG08nxQXS9xBK"}"#,
+        signature: "4a25b5b5183aeff63d8521c926eccb690d9ccfd918e00e353ce28626387347b311013cb8edb776008ec29604202c8db9db568277b365c51b4f27c505d2f7104a",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"SiW1tRg67/Y9hSHJJuzLaQ2cz9kY4A41POKGJjhzR7MRATy47bd2AI7ClgQgLI2521aCd7NlxRtPJ8UF0vcQSg=="}]"#,
+    });
+
+    // This transaction hasn't been broadcasted.
+    test_sign_json::<StandardCosmosContext>(TestInput {
+        coin: &coin,
+        input,
+        tx: r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"3000","denom":"uluna"}],"gas":"200000"},"memo":"","msg":[{"type":"wasm/MsgExecuteContract","value":{"coins":[],"contract":"terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76","msg":{"send":{"amount":"250000","contract":"terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp","msg":"eyJzb21lX21lc3NhZ2UiOnt9fQ=="}},"sender":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"EXQcMfD4507CcIKeOgkPWY92EUpQ7NJ802bf1IoMfgk69iUs6iEYucTo0MJo/Igys0yfbIHiLt4oJMetwNpqmA=="}]}}"#,
+        signature: "11741c31f0f8e74ec270829e3a090f598f76114a50ecd27cd366dfd48a0c7e093af6252cea2118b9c4e8d0c268fc8832b34c9f6c81e22ede2824c7adc0da6a98",
+        signature_json: r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"},"signature":"EXQcMfD4507CcIKeOgkPWY92EUpQ7NJ802bf1IoMfgk69iUs6iEYucTo0MJo/Igys0yfbIHiLt4oJMetwNpqmA=="}]"#,
+    });
+}
+
+#[test]
+fn test_terra_transfer_payload() {
+    let coin = TestCoinContext::default()
+        .with_public_key_type(PublicKeyType::Secp256k1)
+        .with_hrp("terra");
+
+    let transfer = Proto::mod_Message::WasmExecuteContractTransfer {
+        sender_address: "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf".into(),
+        // ANC
+        contract_address: "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76".into(),
+        recipient_address: "recipient=address".into(),
+        amount: U256::encode_be_compact(250000),
+    };
+
+    let payload =
+        TxBuilder::<StandardCosmosContext>::wasm_execute_contract_transfer_msg_from_proto(
+            &coin, &transfer,
+        )
+        .unwrap();
+    let actual = payload.to_json().unwrap();
+    let expected = json!({
+        "coins": [],
+        "contract": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
+        "msg": {
+            "transfer": {
+                "amount": "250000",
+                "recipient": "recipient=address"
+            }
+        },
+        "sender": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"
+    });
+    assert_eq!(actual.value, expected);
+}
diff --git a/rust/tw_encoding/Cargo.toml b/rust/tw_encoding/Cargo.toml
new file mode 100644
index 00000000000..f36c1580246
--- /dev/null
+++ b/rust/tw_encoding/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "tw_encoding"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+arbitrary = { version = "1", features = ["derive"], optional = true }
+bcs = "0.1.6"
+bech32 = "0.9.1"
+bs58 = "0.4.0"
+ciborium = "0.2.1"
+data-encoding = "2.3.3"
+hex = "0.4.3"
+serde = { version = "1.0", features = ["derive"] }
+tw_memory = { path = "../tw_memory" }
+
+[dev-dependencies]
+serde_bytes = "0.11.12"
\ No newline at end of file
diff --git a/rust/tw_encoding/fuzz/.gitignore b/rust/tw_encoding/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/tw_encoding/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/tw_encoding/fuzz/Cargo.toml b/rust/tw_encoding/fuzz/Cargo.toml
new file mode 100644
index 00000000000..2bcec734cf5
--- /dev/null
+++ b/rust/tw_encoding/fuzz/Cargo.toml
@@ -0,0 +1,42 @@
+[package]
+name = "tw_encoding-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_bytes = "0.11.12"
+
+[dependencies.tw_encoding]
+path = ".."
+features = ["arbitrary"]
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "base_encode"
+path = "fuzz_targets/base_encode.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "base_decode"
+path = "fuzz_targets/base_decode.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "cbor_encode_decode"
+path = "fuzz_targets/cbor_encode_decode.rs"
+test = false
+doc = false
diff --git a/rust/tw_encoding/fuzz/fuzz_targets/base_decode.rs b/rust/tw_encoding/fuzz/fuzz_targets/base_decode.rs
new file mode 100644
index 00000000000..cb98cd89186
--- /dev/null
+++ b/rust/tw_encoding/fuzz/fuzz_targets/base_decode.rs
@@ -0,0 +1,18 @@
+#![no_main]
+
+use libfuzzer_sys::{arbitrary, fuzz_target};
+use tw_encoding::{base32, base58, base64, ffi::Base58Alphabet};
+
+#[derive(arbitrary::Arbitrary, Debug)]
+struct BaseDecodeInput<'a> {
+    data: &'a str,
+    alphabet_base58: Base58Alphabet,
+    padding: bool,
+    is_url: bool,
+}
+
+fuzz_target!(|input: BaseDecodeInput<'_>| {
+    base32::decode(input.data, None, input.padding).ok();
+    base58::decode(input.data, input.alphabet_base58.into()).ok();
+    base64::decode(input.data, input.is_url).ok();
+});
diff --git a/rust/tw_encoding/fuzz/fuzz_targets/base_encode.rs b/rust/tw_encoding/fuzz/fuzz_targets/base_encode.rs
new file mode 100644
index 00000000000..6819fe6a852
--- /dev/null
+++ b/rust/tw_encoding/fuzz/fuzz_targets/base_encode.rs
@@ -0,0 +1,24 @@
+#![no_main]
+
+use libfuzzer_sys::{arbitrary, fuzz_target};
+use tw_encoding::{base32, base58, base64, ffi::Base58Alphabet};
+
+#[derive(arbitrary::Arbitrary, Debug)]
+struct BaseEncodeInput<'a> {
+    data: &'a [u8],
+    alphabet_base58: Base58Alphabet,
+    padding: bool,
+    is_url: bool,
+}
+
+fuzz_target!(|input: BaseEncodeInput<'_>| {
+    base32::encode(input.data, None, input.padding).ok();
+    base58::encode(input.data, input.alphabet_base58.into());
+    base64::encode(
+        input.data,
+        base64::Config {
+            url: input.is_url,
+            padding: input.padding,
+        },
+    );
+});
diff --git a/rust/tw_encoding/fuzz/fuzz_targets/cbor_encode_decode.rs b/rust/tw_encoding/fuzz/fuzz_targets/cbor_encode_decode.rs
new file mode 100644
index 00000000000..6c79c61db3c
--- /dev/null
+++ b/rust/tw_encoding/fuzz/fuzz_targets/cbor_encode_decode.rs
@@ -0,0 +1,23 @@
+#![no_main]
+
+use libfuzzer_sys::{arbitrary, fuzz_target};
+
+use serde::{Deserialize, Serialize};
+
+use tw_encoding::cbor::{decode, encode};
+
+#[derive(arbitrary::Arbitrary, Serialize, Deserialize, PartialEq, Debug)]
+struct User {
+    name: String,
+    age: u64,
+    friends: Vec<String>,
+    #[serde(with = "serde_bytes")]
+    address: Vec<u8>,
+    key: Vec<u8>,
+}
+
+fuzz_target!(|se_user: User| {
+    let serialized = encode(&se_user).unwrap();
+    let de_user = decode::<User>(&serialized).unwrap();
+    assert_eq!(se_user, de_user);
+});
diff --git a/rust/tw_encoding/src/base32.rs b/rust/tw_encoding/src/base32.rs
new file mode 100644
index 00000000000..665e40229cb
--- /dev/null
+++ b/rust/tw_encoding/src/base32.rs
@@ -0,0 +1,146 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{EncodingError, EncodingResult};
+use data_encoding::{Encoding, Specification};
+use std::cell::RefCell;
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+
+/// cbindgen:ignore
+const ALPHABET_RFC4648: &str = "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";
+
+type EncodingMap = HashMap<EncodingParams, Encoding>;
+
+thread_local! {
+    /// Cache the encodings to avoid parsing already handled alphabets on each operation.
+    static ENCODINGS: RefCell<EncodingMap> = RefCell::new(HashMap::new());
+}
+
+#[derive(Debug, Clone, Eq, Hash, PartialEq)]
+struct EncodingParams {
+    alphabet: String,
+    padding: bool,
+}
+
+pub fn encode(input: &[u8], alphabet: Option<String>, padding: bool) -> EncodingResult<String> {
+    let encoding = get_encoding(alphabet, padding)?;
+    Ok(encoding.encode(input))
+}
+
+pub fn decode(input: &str, alphabet: Option<String>, padding: bool) -> EncodingResult<Vec<u8>> {
+    let encoding = get_encoding(alphabet, padding)?;
+    encoding
+        .decode(input.as_bytes())
+        .map_err(|_| EncodingError::InvalidInput)
+}
+
+fn get_encoding(alphabet: Option<String>, padding: bool) -> EncodingResult<Encoding> {
+    let alphabet = alphabet.unwrap_or_else(|| ALPHABET_RFC4648.to_string());
+    let encoding_params = EncodingParams { alphabet, padding };
+
+    ENCODINGS.with(
+        |encodings| match encodings.borrow_mut().entry(encoding_params.clone()) {
+            Entry::Occupied(ready) => Ok(ready.get().clone()),
+            Entry::Vacant(vacant) => {
+                let new_encoding = create_encoding(encoding_params)?;
+                Ok(vacant.insert(new_encoding).clone())
+            },
+        },
+    )
+}
+
+fn create_encoding(params: EncodingParams) -> EncodingResult<Encoding> {
+    let mut specification = Specification::new();
+    specification.symbols = params.alphabet;
+    if params.padding {
+        specification.padding = Some('=');
+    }
+
+    specification
+        .encoding()
+        .map_err(|_| EncodingError::InvalidAlphabet)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_base32_encode() {
+        let data = b"Hello, world!";
+        let expected = "JBSWY3DPFQQHO33SNRSCC";
+
+        let result = encode(data, None, false).unwrap();
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_base32_encode_padding() {
+        let data = b"Hello, world!";
+        let expected = "JBSWY3DPFQQHO33SNRSCC===";
+
+        let result = encode(data, None, true).unwrap();
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_base32_encode_filecoin() {
+        let alphabet = "abcdefghijklmnopqrstuvwxyz234567";
+        let data = b"7uoq6tp427uzv7fztkbsnn64iwotfrristwpryy";
+        let expected = "g52w64jworydimrxov5hmn3gpj2gwyttnzxdmndjo5xxiztsojuxg5dxobzhs6i";
+        let result = encode(data, Some(alphabet.to_string()), false).unwrap();
+        assert_eq!(result, expected);
+
+        let invalid_alphabet = "invalidalphabet";
+        let result = encode(data, Some(invalid_alphabet.to_string()), false);
+        assert_eq!(result, Err(EncodingError::InvalidAlphabet));
+    }
+
+    #[test]
+    fn test_base32_decode() {
+        let data = "JBSWY3DPFQQHO33SNRSCC";
+        let expected = b"Hello, world!";
+
+        let result = decode(data, None, false).unwrap();
+        assert_eq!(result.as_slice(), expected);
+    }
+
+    #[test]
+    fn test_base32_decode_padding() {
+        let data = "JBSWY3DPFQQHO33SNRSCC===";
+        let expected = b"Hello, world!";
+
+        let result = decode(data, None, true).unwrap();
+        assert_eq!(result.as_slice(), expected);
+
+        let data = "JBSWY3DPFQQHO33SNRSCC";
+        decode(data, None, true).expect_err("No padding while it's required");
+    }
+
+    #[test]
+    fn test_base32_decode_filecoin() {
+        let alphabet = "abcdefghijklmnopqrstuvwxyz234567";
+        let data = "g52w64jworydimrxov5hmn3gpj2gwyttnzxdmndjo5xxiztsojuxg5dxobzhs6i";
+        let expected = b"7uoq6tp427uzv7fztkbsnn64iwotfrristwpryy";
+
+        let result = decode(data, Some(alphabet.to_string()), false).unwrap();
+        assert_eq!(result.as_slice(), expected);
+    }
+
+    #[test]
+    fn test_decode_invalid() {
+        const BASE32_ALPHABET_FILECOIN: &str = "abcdefghijklmnopqrstuvwxyz234567";
+
+        decode("+-", None, false).unwrap_err();
+        decode("A", None, false).unwrap_err();
+        decode("ABC", None, false).unwrap_err();
+        decode(
+            "rw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxykz",
+            Some(BASE32_ALPHABET_FILECOIN.to_string()),
+            false,
+        )
+        .unwrap_err();
+    }
+}
diff --git a/rust/tw_encoding/src/base58.rs b/rust/tw_encoding/src/base58.rs
new file mode 100644
index 00000000000..681b70ae0fd
--- /dev/null
+++ b/rust/tw_encoding/src/base58.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{EncodingError, EncodingResult};
+use bs58::decode::Error;
+use tw_memory::Data;
+
+pub const CHECKSUM_LEN: usize = 4;
+
+impl From<Error> for EncodingError {
+    fn from(_: Error) -> Self {
+        EncodingError::InvalidInput
+    }
+}
+
+#[derive(Debug, Clone, Copy, Eq, Hash, PartialEq)]
+pub enum Alphabet {
+    Bitcoin,
+    Ripple,
+}
+
+impl From<Alphabet> for &'static bs58::Alphabet {
+    fn from(alphabet: Alphabet) -> Self {
+        match alphabet {
+            Alphabet::Bitcoin => bs58::Alphabet::BITCOIN,
+            Alphabet::Ripple => bs58::Alphabet::RIPPLE,
+        }
+    }
+}
+
+pub fn encode(input: &[u8], alphabet: Alphabet) -> String {
+    bs58::encode(input)
+        .with_alphabet(alphabet.into())
+        .into_string()
+}
+
+pub fn decode(input: &str, alphabet: Alphabet) -> EncodingResult<Data> {
+    bs58::decode(input)
+        .with_alphabet(alphabet.into())
+        .into_vec()
+        .map_err(EncodingError::from)
+}
+
+pub mod as_base58_bitcoin {
+    use super::*;
+    use serde::de::Error;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+
+    /// Serializes the `value` as base58.
+    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: AsRef<[u8]>,
+        S: Serializer,
+    {
+        encode(value.as_ref(), Alphabet::Bitcoin).serialize(serializer)
+    }
+
+    /// Serializes the `value` as base58.
+    pub fn deserialize<'de, D, T>(deserializer: D) -> Result<T, D::Error>
+    where
+        D: Deserializer<'de>,
+        T: for<'a> TryFrom<&'a [u8]>,
+    {
+        let s = String::deserialize(deserializer)?;
+        let data = decode(&s, Alphabet::Bitcoin).map_err(|e| Error::custom(format!("{e:?}")))?;
+        T::try_from(&data).map_err(|_| Error::custom("Unexpected bytes length"))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_base58_encode() {
+        let data = b"Hello, world!";
+        let expected = "72k1xXWG59wUsYv7h2";
+
+        let result = encode(data, Alphabet::Bitcoin);
+        assert_eq!(result, expected);
+    }
+
+    #[test]
+    fn test_base58_decode() {
+        let data = "72k1xXWG59wUsYv7h2";
+        let expected = b"Hello, world!";
+
+        let result = decode(data, Alphabet::Bitcoin).unwrap();
+        assert_eq!(result, expected.to_vec());
+    }
+}
diff --git a/rust/tw_encoding/src/base64.rs b/rust/tw_encoding/src/base64.rs
new file mode 100644
index 00000000000..78723360a66
--- /dev/null
+++ b/rust/tw_encoding/src/base64.rs
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{EncodingError, EncodingResult};
+use serde::de::Error as DeError;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use tw_memory::Data;
+
+pub const STANDARD: Config = Config {
+    url: false,
+    pad: true,
+};
+
+pub const NO_PAD: Config = Config {
+    url: false,
+    pad: true,
+};
+
+pub const URL_SAFE: Config = Config {
+    url: true,
+    pad: true,
+};
+
+pub const URL_NO_PAD: Config = Config {
+    url: true,
+    pad: false,
+};
+
+#[derive(Clone, Copy)]
+pub struct Config {
+    /// Whether URL safe.
+    pub url: bool,
+    /// Whether '=' padded.
+    pub pad: bool,
+}
+
+impl Config {
+    fn as_encoding(&self) -> data_encoding::Encoding {
+        match (self.url, self.pad) {
+            (false, false) => data_encoding::BASE64_NOPAD,
+            (false, true) => data_encoding::BASE64,
+            (true, false) => data_encoding::BASE64URL_NOPAD,
+            (true, true) => data_encoding::BASE64URL,
+        }
+    }
+}
+
+pub fn encode(data: &[u8], config: Config) -> String {
+    config.as_encoding().encode(data)
+}
+
+pub fn decode(data: &str, config: Config) -> EncodingResult<Vec<u8>> {
+    config
+        .as_encoding()
+        .decode(data.as_bytes())
+        .map_err(|_| EncodingError::InvalidInput)
+}
+
+#[derive(Clone, Debug)]
+pub struct Base64Encoded(pub Data);
+
+impl Serialize for Base64Encoded {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&encode(&self.0, STANDARD))
+    }
+}
+
+impl<'de> Deserialize<'de> for Base64Encoded {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s = String::deserialize(deserializer)?;
+        decode(&s, STANDARD)
+            .map(Base64Encoded)
+            .map_err(|e| DeError::custom(format!("{e:?}")))
+    }
+}
diff --git a/rust/tw_encoding/src/bcs.rs b/rust/tw_encoding/src/bcs.rs
new file mode 100644
index 00000000000..8ed8257e43c
--- /dev/null
+++ b/rust/tw_encoding/src/bcs.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{EncodingError, EncodingResult};
+use serde::de::DeserializeOwned;
+use serde::Serialize;
+use tw_memory::Data;
+
+pub fn encode<T>(value: &T) -> EncodingResult<Data>
+where
+    T: ?Sized + Serialize,
+{
+    bcs::to_bytes(value).map_err(|_| EncodingError::InvalidInput)
+}
+
+pub fn decode<T>(bytes: &[u8]) -> EncodingResult<T>
+where
+    T: DeserializeOwned,
+{
+    bcs::from_bytes(bytes).map_err(|_| EncodingError::InvalidInput)
+}
diff --git a/rust/tw_encoding/src/bech32.rs b/rust/tw_encoding/src/bech32.rs
new file mode 100644
index 00000000000..97e184e5513
--- /dev/null
+++ b/rust/tw_encoding/src/bech32.rs
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use bech32::{FromBase32, ToBase32, Variant};
+use tw_memory::Data;
+
+pub use bech32::{convert_bits, CheckBase32, Error as Bech32Error};
+
+pub type Bech32Result<T> = Result<T, Bech32Error>;
+
+pub struct Decoded {
+    pub hrp: String,
+    pub bytes: Data,
+}
+
+pub fn encode(hrp: &str, data: &[u8]) -> Bech32Result<String> {
+    bech32::encode(hrp, data.to_base32(), Variant::Bech32)
+}
+
+pub fn decode(s: &str) -> Bech32Result<Decoded> {
+    let (hrp, base32_bytes, variant) = bech32::decode(s)?;
+    let bytes = Data::from_base32(&base32_bytes)?;
+
+    if matches!(variant, Variant::Bech32) {
+        return Ok(Decoded { hrp, bytes });
+    }
+    Err(Bech32Error::InvalidChecksum)
+}
diff --git a/rust/tw_encoding/src/cbor.rs b/rust/tw_encoding/src/cbor.rs
new file mode 100644
index 00000000000..4f5e954fd62
--- /dev/null
+++ b/rust/tw_encoding/src/cbor.rs
@@ -0,0 +1,69 @@
+use ciborium::{de, ser};
+use serde::{de::DeserializeOwned, Serialize};
+
+type CborResult<T> = Result<T, String>;
+
+pub fn encode<S: Serialize>(message: &S) -> CborResult<Vec<u8>> {
+    let mut bytes = vec![];
+    ser::into_writer(message, &mut bytes).map_err(|e| e.to_string())?;
+    Ok(bytes)
+}
+
+pub fn decode<D: DeserializeOwned>(data: &[u8]) -> CborResult<D> {
+    de::from_reader(data).map_err(|e| e.to_string())
+}
+
+#[cfg(test)]
+mod test {
+    use serde::{Deserialize, Serialize};
+
+    use super::{decode, encode};
+
+    const SERIALIZED: [u8; 70] = [
+        165, 100, 110, 97, 109, 101, 101, 65, 108, 105, 99, 101, 99, 97, 103, 101, 24, 42, 103,
+        102, 114, 105, 101, 110, 100, 115, 131, 99, 66, 111, 98, 101, 67, 97, 114, 111, 108, 100,
+        68, 97, 118, 101, 103, 97, 100, 100, 114, 101, 115, 115, 68, 0, 1, 2, 3, 99, 107, 101, 121,
+        138, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0,
+    ];
+
+    #[derive(Serialize, Deserialize, PartialEq, Debug)]
+    struct User {
+        name: String,
+        age: u64,
+        friends: Vec<String>,
+        #[serde(with = "serde_bytes")]
+        address: Vec<u8>,
+        key: Vec<u8>,
+    }
+
+    fn test_user() -> User {
+        User {
+            name: "Alice".to_string(),
+            age: 42,
+            friends: vec!["Bob".to_string(), "Carol".to_string(), "Dave".to_string()],
+            address: vec![0, 1, 2, 3],
+            key: vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 0],
+        }
+    }
+
+    #[test]
+    fn test_serialize() {
+        let user = test_user();
+        let serialized = encode(&user).unwrap();
+        assert_eq!(serialized, SERIALIZED);
+    }
+
+    #[test]
+    fn test_deserialize() {
+        let user = decode::<User>(&SERIALIZED).unwrap();
+        assert_eq!(user, test_user());
+    }
+
+    #[test]
+    fn test_serialize_deserialize() {
+        let se_user = test_user();
+        let serialized = encode(&se_user).unwrap();
+        let de_user = decode::<User>(&serialized).unwrap();
+        assert_eq!(se_user, de_user);
+    }
+}
diff --git a/rust/tw_encoding/src/ffi.rs b/rust/tw_encoding/src/ffi.rs
new file mode 100644
index 00000000000..0f58c984ec4
--- /dev/null
+++ b/rust/tw_encoding/src/ffi.rs
@@ -0,0 +1,226 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::{base32, base58, base64, hex, EncodingError};
+use std::ffi::{c_char, CStr, CString};
+use tw_memory::ffi::c_byte_array::{CByteArray, CByteArrayResult};
+use tw_memory::ffi::c_result::{CStrMutResult, ErrorCode};
+
+#[repr(C)]
+pub enum CEncodingCode {
+    Ok = 0,
+    InvalidInput = 1,
+    InvalidAlphabet = 2,
+    Internal = 3,
+}
+
+impl From<EncodingError> for CEncodingCode {
+    fn from(error: EncodingError) -> Self {
+        match error {
+            EncodingError::InvalidInput => CEncodingCode::InvalidInput,
+            EncodingError::InvalidAlphabet => CEncodingCode::InvalidAlphabet,
+            EncodingError::Internal => CEncodingCode::Internal,
+        }
+    }
+}
+
+impl From<hex::FromHexError> for CEncodingCode {
+    fn from(_error: hex::FromHexError) -> Self {
+        CEncodingCode::InvalidInput
+    }
+}
+
+impl From<CEncodingCode> for ErrorCode {
+    fn from(error: CEncodingCode) -> Self {
+        error as ErrorCode
+    }
+}
+
+#[repr(C)]
+#[derive(Debug, PartialEq)]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+pub enum Base58Alphabet {
+    Bitcoin = 1,
+    Ripple = 2,
+}
+
+impl From<Base58Alphabet> for base58::Alphabet {
+    fn from(value: Base58Alphabet) -> Self {
+        match value {
+            Base58Alphabet::Bitcoin => base58::Alphabet::Bitcoin,
+            Base58Alphabet::Ripple => base58::Alphabet::Ripple,
+        }
+    }
+}
+
+/// Encodes the `input` data as base32.
+/// \param input *non-null* byte array.
+/// \param alphabet *optional* C-compatible, nul-terminated string.
+///                `ALPHABET_RFC4648` is used by default if `alphabet` is null.
+/// \param padding whether the padding bytes should be included.
+/// \return C-compatible result with a C-compatible, nul-terminated string.
+#[no_mangle]
+pub unsafe extern "C" fn encode_base32(
+    input: *const u8,
+    input_len: usize,
+    alphabet: *const c_char,
+    padding: bool,
+) -> CStrMutResult {
+    let input = unsafe { std::slice::from_raw_parts(input, input_len) };
+
+    let alphabet = match get_alphabet(alphabet) {
+        Ok(alphabet) => alphabet,
+        Err(e) => return CStrMutResult::error(e),
+    };
+
+    base32::encode(input, alphabet, padding)
+        .map(|result| CString::new(result).unwrap().into_raw())
+        .map_err(CEncodingCode::from)
+        .into()
+}
+
+/// Decodes the base32 `input` string.
+/// \param input *non-null* C-compatible, nul-terminated string.
+/// \param alphabet *optional* C-compatible, nul-terminated string.
+///                `ALPHABET_RFC4648` is used by default if `alphabet` is null.
+/// \param padding whether the padding bytes should be trimmed when decoding.
+/// \return C-compatible result with a C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn decode_base32(
+    input: *const c_char,
+    alphabet: *const c_char,
+    padding: bool,
+) -> CByteArrayResult {
+    let input = match CStr::from_ptr(input).to_str() {
+        Ok(input) => input,
+        Err(_) => return CByteArrayResult::error(CEncodingCode::InvalidInput),
+    };
+    let alphabet = match get_alphabet(alphabet) {
+        Ok(alphabet) => alphabet,
+        Err(e) => return CByteArrayResult::error(e),
+    };
+
+    base32::decode(input, alphabet, padding)
+        .map(CByteArray::from)
+        .map_err(CEncodingCode::from)
+        .into()
+}
+
+/// Encodes the `input` data as base58.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \param alphabet alphabet type.
+/// \return *non-null* C-compatible, nul-terminated string.
+#[no_mangle]
+pub unsafe extern "C" fn encode_base58(
+    input: *const u8,
+    input_len: usize,
+    alphabet: Base58Alphabet,
+) -> *mut c_char {
+    let input = unsafe { std::slice::from_raw_parts(input, input_len) };
+    CString::new(base58::encode(input, alphabet.into()))
+        .unwrap()
+        .into_raw()
+}
+
+/// Decodes the base58 `input` string.
+/// \param input *non-null* C-compatible, nul-terminated string.
+/// \param alphabet alphabet type.
+/// \return C-compatible result with a C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn decode_base58(
+    input: *const c_char,
+    alphabet: Base58Alphabet,
+) -> CByteArrayResult {
+    let input = match CStr::from_ptr(input).to_str() {
+        Ok(input) => input,
+        Err(_) => return CByteArrayResult::error(CEncodingCode::InvalidInput),
+    };
+
+    base58::decode(input, alphabet.into())
+        .map(CByteArray::from)
+        .map_err(CEncodingCode::from)
+        .into()
+}
+
+/// Encodes the `data` data as a padded, base64 string.
+/// \param data *non-null* byte array.
+/// \param len - the length of the `data` array.
+/// \param is_url whether to use the [URL safe alphabet](https://www.rfc-editor.org/rfc/rfc3548#section-4).
+/// \return *non-null* C-compatible, nul-terminated string.
+#[no_mangle]
+pub unsafe extern "C" fn encode_base64(data: *const u8, len: usize, is_url: bool) -> *mut c_char {
+    let data = std::slice::from_raw_parts(data, len);
+    let config = base64::Config {
+        url: is_url,
+        pad: true,
+    };
+    let encoded = base64::encode(data, config);
+    CString::new(encoded).unwrap().into_raw()
+}
+
+/// Decodes the base64 `data` string.
+/// \param data *optional* C-compatible, nul-terminated string.
+/// \param is_url whether to use the [URL safe alphabet](https://www.rfc-editor.org/rfc/rfc3548#section-4).
+/// \return C-compatible result with a C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn decode_base64(data: *const c_char, is_url: bool) -> CByteArrayResult {
+    if data.is_null() {
+        return CByteArrayResult::error(CEncodingCode::InvalidInput);
+    }
+    let str_slice = match CStr::from_ptr(data).to_str() {
+        Ok(input) => input,
+        Err(_) => return CByteArrayResult::error(CEncodingCode::InvalidInput),
+    };
+    let config = base64::Config {
+        url: is_url,
+        pad: true,
+    };
+    base64::decode(str_slice, config)
+        .map(CByteArray::from)
+        .map_err(CEncodingCode::from)
+        .into()
+}
+
+/// Decodes the hex `data` string.
+/// \param data *optional* C-compatible, nul-terminated string.
+/// \return C-compatible result with a C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn decode_hex(data: *const c_char) -> CByteArrayResult {
+    if data.is_null() {
+        return CByteArrayResult::error(CEncodingCode::InvalidInput);
+    }
+    let hex_string = match CStr::from_ptr(data).to_str() {
+        Ok(input) => input,
+        Err(_) => return CByteArrayResult::error(CEncodingCode::InvalidInput),
+    };
+
+    hex::decode(hex_string)
+        .map(CByteArray::from)
+        .map_err(CEncodingCode::from)
+        .into()
+}
+
+/// Encodes the octets `data` as a hex string using lowercase characters.
+/// \param data *non-null* byte array.
+/// \param len the length of the `data` array.
+/// \param prefixed whether to add `0x` prefix.
+/// \return *non-null* C-compatible, nul-terminated string.
+#[no_mangle]
+pub unsafe extern "C" fn encode_hex(data: *const u8, len: usize, prefixed: bool) -> *mut c_char {
+    let data = std::slice::from_raw_parts(data, len);
+    let encoded = hex::encode(data, prefixed);
+    CString::new(encoded).unwrap().into_raw()
+}
+
+fn get_alphabet(alphabet: *const c_char) -> Result<Option<String>, CEncodingCode> {
+    if alphabet.is_null() {
+        return Ok(None);
+    }
+    unsafe { CStr::from_ptr(alphabet).to_str() }
+        .map(|alphabet| Some(alphabet.to_string()))
+        .map_err(|_| CEncodingCode::InvalidAlphabet)
+}
diff --git a/rust/tw_encoding/src/hex.rs b/rust/tw_encoding/src/hex.rs
new file mode 100644
index 00000000000..5db6e8038a3
--- /dev/null
+++ b/rust/tw_encoding/src/hex.rs
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub use hex::FromHexError;
+use tw_memory::Data;
+
+pub type FromHexResult<T> = Result<T, FromHexError>;
+
+pub trait ToHex {
+    fn to_hex(&self) -> String;
+
+    fn to_hex_prefixed(&self) -> String;
+}
+
+impl<T> ToHex for T
+where
+    T: AsRef<[u8]>,
+{
+    fn to_hex(&self) -> String {
+        encode(self, false)
+    }
+
+    fn to_hex_prefixed(&self) -> String {
+        encode(self, true)
+    }
+}
+
+pub trait DecodeHex {
+    fn decode_hex(&self) -> FromHexResult<Data>;
+}
+
+impl<'a> DecodeHex for &'a str {
+    fn decode_hex(&self) -> FromHexResult<Data> {
+        decode(self)
+    }
+}
+
+/// Decodes the given hexadecimal string.
+pub fn decode(data: &str) -> FromHexResult<Data> {
+    let hex_string = data.trim_start_matches("0x");
+    hex::decode(hex_string)
+}
+
+/// Decodes the given hexadecimal string leniently allowing to pass odd number of chars.
+/// For example, `0x0` is extended to `0x00`, `0x123` is extended to `0x0123`.
+pub fn decode_lenient(data: &str) -> FromHexResult<Data> {
+    let hex_string = data.trim_start_matches("0x");
+    if hex_string.len() % 2 == 0 {
+        hex::decode(hex_string)
+    } else {
+        // Insert a leading 0.
+        let standard_hex = format!("0{hex_string}");
+        hex::decode(standard_hex)
+    }
+}
+
+pub fn encode<T: AsRef<[u8]>>(data: T, prefixed: bool) -> String {
+    let encoded = hex::encode(data.as_ref());
+    if prefixed {
+        return format!("0x{encoded}");
+    }
+    encoded
+}
+
+pub mod as_hex {
+    use super::*;
+    use serde::de::Error;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+    use std::fmt;
+
+    /// Serializes the `value` as a hex.
+    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: ToHex,
+        S: Serializer,
+    {
+        value.to_hex().serialize(serializer)
+    }
+
+    pub fn deserialize<'de, D, T, E>(deserializer: D) -> Result<T, D::Error>
+    where
+        D: Deserializer<'de>,
+        T: for<'a> TryFrom<&'a [u8], Error = E>,
+        E: fmt::Debug,
+    {
+        let s = String::deserialize(deserializer)?;
+        let data = decode(&s).map_err(|e| Error::custom(format!("{e:?}")))?;
+        T::try_from(&data).map_err(|e| Error::custom(format!("Error parsing from bytes: {e:?}")))
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_vec_encode_prefixed() {
+        let v: &[u8] = &[
+            45, 181, 0, 172, 145, 156, 221, 227, 81, 172, 54, 227, 113, 29, 131, 44, 109, 185, 118,
+            105,
+        ];
+        assert_eq!(
+            encode(v, true),
+            "0x2db500ac919cdde351ac36e3711d832c6db97669"
+        );
+    }
+
+    #[test]
+    fn test_vec_decode_prefixed() {
+        let expected = vec![
+            45, 181, 0, 172, 145, 156, 221, 227, 81, 172, 54, 227, 113, 29, 131, 44, 109, 185, 118,
+            105,
+        ];
+        assert_eq!(
+            decode("0x2db500ac919cdde351ac36e3711d832c6db97669"),
+            Ok(expected)
+        );
+    }
+}
diff --git a/rust/tw_encoding/src/lib.rs b/rust/tw_encoding/src/lib.rs
new file mode 100644
index 00000000000..b9eb5f096af
--- /dev/null
+++ b/rust/tw_encoding/src/lib.rs
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod base32;
+pub mod base58;
+pub mod base64;
+pub mod bcs;
+pub mod bech32;
+pub mod cbor;
+pub mod ffi;
+pub mod hex;
+
+pub type EncodingResult<T> = Result<T, EncodingError>;
+
+#[derive(Debug, PartialEq)]
+pub enum EncodingError {
+    InvalidInput,
+    InvalidAlphabet,
+    Internal,
+}
diff --git a/rust/tw_encoding/tests/base32_ffi_tests.rs b/rust/tw_encoding/tests/base32_ffi_tests.rs
new file mode 100644
index 00000000000..dd0906a596c
--- /dev/null
+++ b/rust/tw_encoding/tests/base32_ffi_tests.rs
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::ffi::CString;
+use tw_encoding::ffi::{decode_base32, encode_base32};
+
+/// Checks if the encoded `input` with the given `alphabet` and `padding` parameters
+/// equals to `expected`.
+#[track_caller]
+fn test_base32_encode_helper(input: &[u8], expected: &str, alphabet: Option<&str>, padding: bool) {
+    let alphabet = alphabet
+        .map(|alphabet| CString::new(alphabet).unwrap().into_raw())
+        .unwrap_or_else(std::ptr::null_mut);
+
+    let result_ptr =
+        unsafe { encode_base32(input.as_ptr(), input.len(), alphabet, padding) }.unwrap();
+    let result = unsafe { CString::from_raw(result_ptr) };
+    assert_eq!(result.to_str().unwrap(), expected);
+}
+
+/// Checks if the decoded `input` with the given `alphabet` and `padding` parameters
+/// equals to `expected`.
+#[track_caller]
+fn test_base32_decode_helper(input: &str, expected: &[u8], alphabet: Option<&str>, padding: bool) {
+    let input = CString::new(input).unwrap();
+    let alphabet = alphabet
+        .map(|alphabet| CString::new(alphabet).unwrap().into_raw())
+        .unwrap_or_else(std::ptr::null_mut);
+
+    let decoded = unsafe {
+        decode_base32(input.as_ptr(), alphabet, padding)
+            .unwrap()
+            .into_vec()
+    };
+    assert_eq!(decoded, expected);
+}
+
+#[test]
+fn test_base32_encode() {
+    let input = b"Hello, world!";
+    let alphabet = "abcdefghijklmnopqrstuvwxyz234567";
+
+    test_base32_encode_helper(input, "JBSWY3DPFQQHO33SNRSCC", None, false);
+    test_base32_encode_helper(input, "jbswy3dpfqqho33snrscc===", Some(alphabet), true);
+    test_base32_encode_helper(input, "JBSWY3DPFQQHO33SNRSCC===", None, true);
+    test_base32_encode_helper(input, "jbswy3dpfqqho33snrscc", Some(alphabet), false);
+}
+
+#[test]
+fn test_base32_decode() {
+    let expected = b"Hello, world!";
+    let alphabet = "abcdefghijklmnopqrstuvwxyz234567";
+
+    test_base32_decode_helper("JBSWY3DPFQQHO33SNRSCC===", expected, None, true);
+    test_base32_decode_helper("JBSWY3DPFQQHO33SNRSCC", expected, None, false);
+    test_base32_decode_helper("jbswy3dpfqqho33snrscc===", expected, Some(alphabet), true);
+    test_base32_decode_helper("jbswy3dpfqqho33snrscc", expected, Some(alphabet), false);
+}
diff --git a/rust/tw_encoding/tests/base58_ffi_tests.rs b/rust/tw_encoding/tests/base58_ffi_tests.rs
new file mode 100644
index 00000000000..1302f23ec38
--- /dev/null
+++ b/rust/tw_encoding/tests/base58_ffi_tests.rs
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::ffi::CString;
+use tw_encoding::ffi::{decode_base58, encode_base58, Base58Alphabet};
+
+#[test]
+fn test_base58_encode() {
+    let data = b"Hello, world!";
+    let expected = "72k1xXWG59wUsYv7h2";
+
+    let result_ptr = unsafe { encode_base58(data.as_ptr(), data.len(), Base58Alphabet::Bitcoin) };
+    let result = unsafe { CString::from_raw(result_ptr) };
+    assert_eq!(result.to_str().unwrap(), expected);
+}
+
+#[test]
+fn test_base58_decode() {
+    let data = "72k1xXWG59wUsYv7h2";
+    let expected = b"Hello, world!";
+
+    let input = CString::new(data).unwrap();
+    let decoded = unsafe {
+        decode_base58(input.as_ptr(), Base58Alphabet::Bitcoin)
+            .unwrap()
+            .into_vec()
+    };
+    assert_eq!(decoded, expected);
+}
diff --git a/rust/tw_encoding/tests/base64_ffi_tests.rs b/rust/tw_encoding/tests/base64_ffi_tests.rs
new file mode 100644
index 00000000000..1677a929a32
--- /dev/null
+++ b/rust/tw_encoding/tests/base64_ffi_tests.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::ffi::{CStr, CString};
+use tw_encoding::ffi::{decode_base64, encode_base64};
+
+#[test]
+fn test_encode_base64() {
+    let data = b"hello world";
+    let encoded = unsafe { CStr::from_ptr(encode_base64(data.as_ptr(), data.len(), false)) };
+    let expected = "aGVsbG8gd29ybGQ=";
+    assert_eq!(encoded.to_str().unwrap(), expected);
+}
+
+#[test]
+fn test_encode_base64_url() {
+    let data = b"+'?ab";
+    let encoded = unsafe { CStr::from_ptr(encode_base64(data.as_ptr(), data.len(), true)) };
+    let expected = "Kyc_YWI=";
+    assert_eq!(encoded.to_str().unwrap(), expected);
+}
+
+#[test]
+fn test_decode_base64_url() {
+    let encoded = "Kyc_YWI=";
+    let expected = b"+'?ab";
+
+    let encoded_c_str = CString::new(encoded).unwrap();
+    let encoded_ptr = encoded_c_str.as_ptr();
+
+    let decoded = unsafe { decode_base64(encoded_ptr, true).unwrap().into_vec() };
+    assert_eq!(decoded, expected);
+}
+
+#[test]
+fn test_decode_base64() {
+    let encoded = "aGVsbG8gd29ybGQh";
+    let expected = b"hello world!";
+
+    let encoded_c_str = CString::new(encoded).unwrap();
+    let encoded_ptr = encoded_c_str.as_ptr();
+
+    let decoded = unsafe { decode_base64(encoded_ptr, false).unwrap().into_vec() };
+    assert_eq!(decoded, expected);
+}
+
+#[test]
+fn test_decode_base64_invalid() {
+    let invalid_encoded = "_This_is_an_invalid_base64_";
+    let encoded_c_str = CString::new(invalid_encoded).unwrap();
+    let encoded_ptr = encoded_c_str.as_ptr();
+    let res = unsafe { decode_base64(encoded_ptr, false) };
+    assert!(res.is_err());
+}
diff --git a/rust/tw_encoding/tests/hex_ffi_tests.rs b/rust/tw_encoding/tests/hex_ffi_tests.rs
new file mode 100644
index 00000000000..d0b259f94a9
--- /dev/null
+++ b/rust/tw_encoding/tests/hex_ffi_tests.rs
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::ffi::{CStr, CString};
+use tw_encoding::ffi::{decode_hex, encode_hex};
+
+#[test]
+fn test_encode_hex_without_prefix() {
+    let data = b"hello world";
+    let encoded = unsafe { CStr::from_ptr(encode_hex(data.as_ptr(), data.len(), false)) };
+    let expected = "68656c6c6f20776f726c64";
+    assert_eq!(encoded.to_str().unwrap(), expected);
+}
+
+#[test]
+fn test_encode_hex_with_prefix() {
+    let data = b"hello world";
+    let encoded = unsafe { CStr::from_ptr(encode_hex(data.as_ptr(), data.len(), true)) };
+    let expected = "0x68656c6c6f20776f726c64";
+    assert_eq!(encoded.to_str().unwrap(), expected);
+}
+
+#[test]
+fn test_decode_hex() {
+    let encoded = "68656c6c6f20776f726c64";
+
+    let encoded_c_str = CString::new(encoded).unwrap();
+    let encoded_ptr = encoded_c_str.as_ptr();
+
+    let decoded: Vec<_> = unsafe { decode_hex(encoded_ptr).unwrap().into_vec() };
+    assert_eq!(decoded, b"hello world");
+}
+
+#[test]
+fn test_decode_hex_with_prefix() {
+    let encoded = "0x68656c6c6f20776f726c64";
+
+    let encoded_c_str = CString::new(encoded).unwrap();
+    let encoded_ptr = encoded_c_str.as_ptr();
+
+    let decoded: Vec<_> = unsafe { decode_hex(encoded_ptr).unwrap().into_vec() };
+    assert_eq!(decoded, b"hello world");
+}
diff --git a/rust/tw_evm/Cargo.toml b/rust/tw_evm/Cargo.toml
new file mode 100644
index 00000000000..857a8f1bd5a
--- /dev/null
+++ b/rust/tw_evm/Cargo.toml
@@ -0,0 +1,22 @@
+[package]
+name = "tw_evm"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+itertools = "0.10.5"
+lazy_static = "1.4.0"
+rlp = "0.5.2"
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+tw_coin_entry = { path = "../tw_coin_entry" }
+tw_encoding = { path = "../tw_encoding" }
+tw_hash = { path = "../tw_hash" }
+tw_keypair = { path = "../tw_keypair" }
+tw_memory = { path = "../tw_memory" }
+tw_misc = { path = "../tw_misc" }
+tw_number = { path = "../tw_number" }
+tw_proto = { path = "../tw_proto" }
+
+[dev-dependencies]
+tw_coin_entry = { path = "../tw_coin_entry", features = ["test-utils"] }
diff --git a/rust/tw_evm/fuzz/.gitignore b/rust/tw_evm/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/tw_evm/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/tw_evm/fuzz/Cargo.toml b/rust/tw_evm/fuzz/Cargo.toml
new file mode 100644
index 00000000000..e008ae78164
--- /dev/null
+++ b/rust/tw_evm/fuzz/Cargo.toml
@@ -0,0 +1,54 @@
+[package]
+name = "tw_evm-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
+serde_json = "1.0"
+tw_number = { path = "../../tw_number" }
+tw_proto = { path = "../../tw_proto", features = ["fuzz"] }
+
+[dependencies.tw_evm]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "abi_encode_function"
+path = "fuzz_targets/abi_encode_function.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "abi_decode_value"
+path = "fuzz_targets/abi_decode_value.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "abi_function_decode_input"
+path = "fuzz_targets/abi_function_decode_input.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "rlp_encode"
+path = "fuzz_targets/rlp_encode.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "sign"
+path = "fuzz_targets/sign.rs"
+test = false
+doc = false
diff --git a/rust/tw_evm/fuzz/fuzz_targets/abi_decode_value.rs b/rust/tw_evm/fuzz/fuzz_targets/abi_decode_value.rs
new file mode 100644
index 00000000000..bedc03a4ed6
--- /dev/null
+++ b/rust/tw_evm/fuzz/fuzz_targets/abi_decode_value.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::abi_encoder::AbiEncoder;
+use tw_proto::EthereumAbi::Proto;
+
+fuzz_target!(|input: Proto::ValueDecodingInput<'_>| {
+    let _ = AbiEncoder::<StandardEvmContext>::decode_value(input);
+});
diff --git a/rust/tw_evm/fuzz/fuzz_targets/abi_encode_function.rs b/rust/tw_evm/fuzz/fuzz_targets/abi_encode_function.rs
new file mode 100644
index 00000000000..d98471509bd
--- /dev/null
+++ b/rust/tw_evm/fuzz/fuzz_targets/abi_encode_function.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::abi_encoder::AbiEncoder;
+use tw_proto::EthereumAbi::Proto;
+
+fuzz_target!(|input: Proto::FunctionEncodingInput<'_>| {
+    let _ = AbiEncoder::<StandardEvmContext>::encode_contract_call(input);
+});
diff --git a/rust/tw_evm/fuzz/fuzz_targets/abi_function_decode_input.rs b/rust/tw_evm/fuzz/fuzz_targets/abi_function_decode_input.rs
new file mode 100644
index 00000000000..86c46abed44
--- /dev/null
+++ b/rust/tw_evm/fuzz/fuzz_targets/abi_function_decode_input.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::abi_encoder::AbiEncoder;
+use tw_proto::EthereumAbi::Proto;
+
+fuzz_target!(|input: Proto::ParamsDecodingInput<'_>| {
+    let _ = AbiEncoder::<StandardEvmContext>::decode_params(input);
+});
diff --git a/rust/tw_evm/fuzz/fuzz_targets/rlp_encode.rs b/rust/tw_evm/fuzz/fuzz_targets/rlp_encode.rs
new file mode 100644
index 00000000000..c9265e6e23d
--- /dev/null
+++ b/rust/tw_evm/fuzz/fuzz_targets/rlp_encode.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::rlp_encoder::RlpEncoder;
+use tw_proto::EthereumRlp::Proto;
+
+fuzz_target!(|input: Proto::EncodingInput<'_>| {
+    let _ = RlpEncoder::<StandardEvmContext>::encode_with_proto(input);
+});
diff --git a/rust/tw_evm/fuzz/fuzz_targets/sign.rs b/rust/tw_evm/fuzz/fuzz_targets/sign.rs
new file mode 100644
index 00000000000..84d5d0522c3
--- /dev/null
+++ b/rust/tw_evm/fuzz/fuzz_targets/sign.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::fuzz_target;
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::signer::Signer;
+use tw_proto::Ethereum::Proto;
+
+fuzz_target!(|input: Proto::SigningInput<'_>| {
+    let _ = Signer::<StandardEvmContext>::sign_proto(input);
+});
diff --git a/rust/tw_evm/src/abi/contract.rs b/rust/tw_evm/src/abi/contract.rs
new file mode 100644
index 00000000000..f2ade089792
--- /dev/null
+++ b/rust/tw_evm/src/abi/contract.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::function::Function;
+use crate::abi::{AbiErrorKind, AbiResult};
+use serde::{Deserialize, Deserializer};
+use std::collections::BTreeMap;
+use tw_coin_entry::error::prelude::*;
+
+/// API building calls to contracts ABI.
+/// Consider adding missing field such as `errors`, `events` etc.
+#[derive(Clone, Debug, Default)]
+pub struct Contract {
+    pub functions: BTreeMap<String, Vec<Function>>,
+}
+
+impl Contract {
+    /// Get the function named `name`, the first if there are overloaded versions of the same function.
+    pub fn function(&self, name: &str) -> AbiResult<&Function> {
+        self.functions
+            .get(name)
+            .into_iter()
+            .flatten()
+            .next()
+            .or_tw_err(AbiErrorKind::Error_abi_mismatch)
+            .with_context(|| format!("The given Smart Contract does not have '{name}' function"))
+    }
+}
+
+impl<'de> Deserialize<'de> for Contract {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        /// Consider adding missing field such as `errors`, `events` etc.
+        #[derive(Deserialize)]
+        #[serde(tag = "type", rename_all = "snake_case")]
+        enum Operation {
+            Function(Function),
+            #[serde(other)]
+            Unsupported,
+        }
+
+        let operations: Vec<Operation> = Vec::deserialize(deserializer)?;
+
+        let mut result = Contract {
+            functions: BTreeMap::default(),
+        };
+        for operation in operations {
+            match operation {
+                Operation::Function(fun) => result
+                    .functions
+                    .entry(fun.name.clone())
+                    .or_default()
+                    .push(fun),
+                Operation::Unsupported => (),
+            }
+        }
+        Ok(result)
+    }
+}
diff --git a/rust/tw_evm/src/abi/decode.rs b/rust/tw_evm/src/abi/decode.rs
new file mode 100644
index 00000000000..51165749d70
--- /dev/null
+++ b/rust/tw_evm/src/abi/decode.rs
@@ -0,0 +1,908 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::non_empty_array::{NonEmptyArray, NonEmptyBytes};
+use crate::abi::param::Param;
+use crate::abi::param_token::NamedToken;
+use crate::abi::param_type::ParamType;
+use crate::abi::token::Token;
+use crate::abi::{AbiError, AbiErrorKind, AbiResult};
+use crate::address::Address;
+use lazy_static::lazy_static;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{H160, H256};
+use tw_number::{I256, U256};
+
+const WORD_LEN: usize = 32;
+
+lazy_static! {
+    // 0x0000000000000000000000000000000000000000000000000000000000000020
+    static ref DEFAULT_DYNAMIC_OFFSET: [u8; U256::BYTES] = U256::from(WORD_LEN).to_big_endian().take();
+}
+
+pub fn decode_params(params: &[Param], data: &[u8]) -> AbiResult<Vec<NamedToken>> {
+    let param_types: Vec<_> = params.iter().map(|param| param.kind.clone()).collect();
+    let decoded_tokens = decode_params_impl(&param_types, data)?;
+
+    let named_tokens: Vec<_> = params
+        .iter()
+        .zip(decoded_tokens)
+        .map(|(param, value)| NamedToken::with_param_and_token(param, value))
+        .collect();
+    Ok(named_tokens)
+}
+
+pub fn decode_value(param_type: &ParamType, data: &[u8]) -> AbiResult<Token> {
+    let offset = 0;
+
+    let decoded = if param_type.is_dynamic() {
+        // If the token is dynamic, we need to append a dynamic offset that points to the `data`.
+        let mut encoded = Vec::with_capacity(DEFAULT_DYNAMIC_OFFSET.len() + data.len());
+        encoded.extend_from_slice(&DEFAULT_DYNAMIC_OFFSET[..]);
+        encoded.extend_from_slice(data);
+
+        decode_param(param_type, &encoded, offset)?
+    } else {
+        decode_param(param_type, data, offset)?
+    };
+
+    Ok(decoded.token)
+}
+
+#[derive(Debug)]
+struct DecodeResult {
+    token: Token,
+    new_offset: usize,
+}
+
+/// Decodes ABI compliant vector of bytes into vector of tokens described by types param.
+/// Returns ok, even if some data left to decode
+fn decode_params_impl(types: &[ParamType], data: &[u8]) -> AbiResult<Vec<Token>> {
+    decode_offset(types, data).map(|(tokens, _)| tokens)
+}
+
+fn decode_offset(types: &[ParamType], data: &[u8]) -> AbiResult<(Vec<Token>, usize)> {
+    // We don't support empty `FixedBytes` or `FixedArray` collections.
+    if data.is_empty() {
+        return AbiError::err(AbiErrorKind::Error_decoding_data)
+            .context("Empty `FixedBytes` or `FixedArray` collections are not allowed");
+    }
+
+    let mut tokens = vec![];
+    let mut offset = 0;
+
+    for param in types {
+        let res = decode_param(param, data, offset)?;
+        offset = res.new_offset;
+        tokens.push(res.token);
+    }
+
+    Ok((tokens, offset))
+}
+
+fn decode_param(param: &ParamType, data: &[u8], offset: usize) -> AbiResult<DecodeResult> {
+    match param {
+        ParamType::Address => {
+            let slice = peek_32_bytes(data, offset)
+                .with_context(|| format!("Error decoding Address parameter at {offset}"))?;
+            let mut address = H160::default();
+            address.copy_from_slice(&slice[12..]);
+            let result = DecodeResult {
+                token: Token::Address(Address::from_bytes(address)),
+                new_offset: offset + WORD_LEN,
+            };
+            Ok(result)
+        },
+        ParamType::Int { bits } => {
+            let slice = peek_32_bytes(data, offset)
+                .with_context(|| format!("Error decoding Int parameter at {offset}"))?;
+            let result = DecodeResult {
+                token: Token::Int {
+                    int: I256::from_big_endian(slice),
+                    bits: *bits,
+                },
+                new_offset: offset + WORD_LEN,
+            };
+            Ok(result)
+        },
+        ParamType::Uint { bits } => {
+            let slice = peek_32_bytes(data, offset)
+                .with_context(|| format!("Error decoding Uint parameter at {offset}"))?;
+            let result = DecodeResult {
+                token: Token::Uint {
+                    uint: U256::from_big_endian(slice),
+                    bits: *bits,
+                },
+                new_offset: offset + WORD_LEN,
+            };
+            Ok(result)
+        },
+        ParamType::Bool => {
+            let b = peek_32_bytes(data, offset)
+                .and_then(as_bool)
+                .with_context(|| format!("Error decoding Bool parameter at {offset}"))?;
+            let result = DecodeResult {
+                token: Token::Bool(b),
+                new_offset: offset + WORD_LEN,
+            };
+            Ok(result)
+        },
+        ParamType::FixedBytes { len } => {
+            // FixedBytes is anything from bytes1 to bytes32. These values
+            // are padded with trailing zeros to fill 32 bytes.
+            let bytes = take_bytes(data, offset, len.get())
+                .with_context(|| format!("Error decoding FixedBytes parameter at {offset}"))?;
+            let checked_bytes = NonEmptyBytes::new(bytes)
+                .context("Empty `FixedBytes` collection is not allowed")?;
+            let result = DecodeResult {
+                token: Token::FixedBytes(checked_bytes),
+                new_offset: offset + WORD_LEN,
+            };
+            Ok(result)
+        },
+        ParamType::Bytes => {
+            let dynamic_offset = peek_32_bytes(data, offset)
+                .and_then(as_usize)
+                .with_context(|| format!("Error decoding Bytes dynamic offset at {offset}"))?;
+            let bytes_offset = add_checked(dynamic_offset, WORD_LEN)
+                .with_context(|| format!("Dynamic offset is too big at {offset}"))?;
+
+            let len = peek_32_bytes(data, dynamic_offset)
+                .and_then(as_usize)
+                .with_context(|| format!("Error decoding Bytes length at {dynamic_offset}"))?;
+            let bytes = take_bytes(data, bytes_offset, len)
+                .with_context(|| format!("Error decoding bytes at {bytes_offset}"))?;
+            let result = DecodeResult {
+                token: Token::Bytes(bytes),
+                new_offset: offset + WORD_LEN,
+            };
+            Ok(result)
+        },
+        ParamType::String => {
+            let dynamic_offset = peek_32_bytes(data, offset)
+                .and_then(as_usize)
+                .with_context(|| format!("Error decoding String dynamic offset at {offset}"))?;
+            let bytes_offset = add_checked(dynamic_offset, WORD_LEN)
+                .with_context(|| format!("Dynamic offset is too big at {offset}"))?;
+
+            let len = peek_32_bytes(data, dynamic_offset)
+                .and_then(as_usize)
+                .with_context(|| format!("Error decoding String length at {dynamic_offset}"))?;
+            let bytes = take_bytes(data, bytes_offset, len)
+                .with_context(|| format!("Error decoding String parameter at {bytes_offset}"))?;
+            let result = DecodeResult {
+                // NOTE: We're decoding strings using lossy UTF-8 decoding to
+                // prevent invalid strings written into contracts by either users or
+                // Solidity bugs from causing graph-node to fail decoding event
+                // data.
+                token: Token::String(String::from_utf8_lossy(&bytes).into()),
+                new_offset: offset + WORD_LEN,
+            };
+            Ok(result)
+        },
+        ParamType::Array { kind } => {
+            let len_offset = peek_32_bytes(data, offset)
+                .and_then(as_usize)
+                .with_context(|| format!("Error decoding Array length offset at {offset}"))?;
+            let len = peek_32_bytes(data, len_offset)
+                .and_then(as_usize)
+                .with_context(|| format!("Error decoding Array length at {len_offset}"))?;
+
+            let tail_offset = add_checked(len_offset, WORD_LEN)
+                .with_context(|| format!("Array length offset is too big: {len_offset}"))?;
+            let tail = &data[tail_offset..];
+
+            let mut tokens = vec![];
+            let mut new_offset = 0;
+
+            for elem_idx in 0..len {
+                let res = decode_param(kind, tail, new_offset)
+                    .with_context(|| format!("Error decoding '{elem_idx}' Array element"))?;
+                new_offset = res.new_offset;
+                tokens.push(res.token);
+            }
+
+            let result = DecodeResult {
+                token: Token::Array {
+                    kind: kind.as_ref().clone(),
+                    arr: tokens,
+                },
+                new_offset: offset + WORD_LEN,
+            };
+
+            Ok(result)
+        },
+        ParamType::FixedArray { kind, len } => {
+            let is_dynamic = param.is_dynamic();
+
+            let (tail, mut new_offset) = if is_dynamic {
+                let offset = peek_32_bytes(data, offset)
+                    .and_then(as_usize)
+                    .with_context(|| {
+                        format!("Error decoding FixedArray dynamic offset at {offset}")
+                    })?;
+                if offset > data.len() {
+                    return AbiError::err(AbiErrorKind::Error_decoding_data)
+                        .context("FixedArray dynamic offset is out of bounds");
+                }
+                (&data[offset..], 0)
+            } else {
+                (data, offset)
+            };
+
+            let mut tokens = vec![];
+
+            for elem_idx in 0..len.get() {
+                let res = decode_param(kind, tail, new_offset)
+                    .with_context(|| format!("Error decoding '{elem_idx}' FixedArray element"))?;
+                new_offset = res.new_offset;
+                tokens.push(res.token);
+            }
+
+            let checked_tokens = NonEmptyArray::new(tokens)
+                .context("Empty `FixedBytes` collection is not allowed")?;
+            let result = DecodeResult {
+                token: Token::FixedArray {
+                    arr: checked_tokens,
+                    kind: kind.as_ref().clone(),
+                },
+                new_offset: if is_dynamic {
+                    offset + WORD_LEN
+                } else {
+                    new_offset
+                },
+            };
+
+            Ok(result)
+        },
+        ParamType::Tuple { params } => {
+            let is_dynamic = param.is_dynamic();
+
+            // The first element in a dynamic Tuple is an offset to the Tuple's data
+            // For a static Tuple the data begins right away
+            let (tail, mut new_offset) = if is_dynamic {
+                let offset = peek_32_bytes(data, offset)
+                    .and_then(as_usize)
+                    .with_context(|| format!("Error decoding Tuple dynamic offset at {offset}"))?;
+                if offset > data.len() {
+                    return AbiError::err(AbiErrorKind::Error_decoding_data)
+                        .context("Tuple dynamic offset is out of bounds");
+                }
+                (&data[offset..], 0)
+            } else {
+                (data, offset)
+            };
+
+            let mut named_tokens = Vec::with_capacity(params.len());
+            for (elem_idx, param) in params.iter().enumerate() {
+                let res = decode_param(&param.kind, tail, new_offset)
+                    .with_context(|| format!("Error decoding '{elem_idx}' Tuple element"))?;
+                new_offset = res.new_offset;
+                named_tokens.push(NamedToken {
+                    name: param.name.clone(),
+                    value: res.token,
+                    internal_type: param.internal_type.clone(),
+                });
+            }
+
+            // The returned new_offset depends on whether the Tuple is dynamic
+            // dynamic Tuple -> follows the prefixed Tuple data offset element
+            // static Tuple  -> follows the last data element
+            let result = DecodeResult {
+                token: Token::Tuple {
+                    params: named_tokens,
+                },
+                new_offset: if is_dynamic {
+                    offset + WORD_LEN
+                } else {
+                    new_offset
+                },
+            };
+
+            Ok(result)
+        },
+    }
+}
+
+fn as_usize(slice: H256) -> AbiResult<usize> {
+    if !slice[..28].iter().all(|x| *x == 0) {
+        return AbiError::err(AbiErrorKind::Error_decoding_data);
+    }
+
+    let result = ((slice[28] as usize) << 24)
+        + ((slice[29] as usize) << 16)
+        + ((slice[30] as usize) << 8)
+        + (slice[31] as usize);
+
+    Ok(result)
+}
+
+fn as_bool(slice: H256) -> AbiResult<bool> {
+    if !slice[..31].iter().all(|x| *x == 0) {
+        return AbiError::err(AbiErrorKind::Error_decoding_data);
+    }
+
+    Ok(slice[31] == 1)
+}
+
+fn peek(data: &[u8], offset: usize, len: usize) -> AbiResult<&[u8]> {
+    let end = add_checked(offset, len)?;
+    if end > data.len() {
+        AbiError::err(AbiErrorKind::Error_decoding_data)
+    } else {
+        Ok(&data[offset..end])
+    }
+}
+
+fn peek_32_bytes(data: &[u8], offset: usize) -> AbiResult<H256> {
+    peek(data, offset, WORD_LEN).map(|x| {
+        let mut out = H256::default();
+        out.copy_from_slice(&x[0..WORD_LEN]);
+        out
+    })
+}
+
+fn take_bytes(data: &[u8], offset: usize, len: usize) -> AbiResult<Vec<u8>> {
+    let end = add_checked(offset, len)?;
+    if end > data.len() {
+        AbiError::err(AbiErrorKind::Error_decoding_data)
+    } else {
+        Ok(data[offset..end].to_vec())
+    }
+}
+
+fn add_checked(left: usize, right: usize) -> AbiResult<usize> {
+    left.checked_add(right)
+        .or_tw_err(AbiErrorKind::Error_decoding_data)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::abi::non_empty_array::NonZeroLen;
+    use tw_encoding::hex::DecodeHex;
+
+    fn address(byte: u8) -> Token {
+        let data = H160::from([byte; 20]);
+        Token::Address(Address::from_bytes(data))
+    }
+
+    fn u256(byte: u8) -> Token {
+        let data = H256::from([byte; WORD_LEN]);
+        Token::u256(U256::from_big_endian(data))
+    }
+
+    #[test]
+    fn decode_from_empty_byte_slice() {
+        // these can NOT be decoded from empty byte slice
+        assert!(decode_params_impl(&[ParamType::Address], &[]).is_err());
+        assert!(decode_params_impl(&[ParamType::Bytes], &[]).is_err());
+        assert!(decode_params_impl(&[ParamType::i256()], &[]).is_err());
+        assert!(decode_params_impl(&[ParamType::Bool], &[]).is_err());
+        assert!(decode_params_impl(&[ParamType::String], &[]).is_err());
+        let kind = Box::new(ParamType::Bool);
+        assert!(decode_params_impl(&[ParamType::Array { kind }], &[]).is_err());
+        let len = NonZeroLen::new(1).unwrap();
+        assert!(decode_params_impl(&[ParamType::FixedBytes { len }], &[]).is_err());
+        let kind = Box::new(ParamType::Bool);
+        let len = NonZeroLen::new(1).unwrap();
+        assert!(decode_params_impl(&[ParamType::FixedArray { kind, len }], &[]).is_err());
+    }
+
+    #[test]
+    fn decode_static_tuple_of_addresses_and_uints() {
+        let encoded = concat!(
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "1111111111111111111111111111111111111111111111111111111111111111"
+        )
+        .decode_hex()
+        .unwrap();
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(address(0x11_u8)),
+                NamedToken::with_token(address(0x22_u8)),
+                NamedToken::with_token(u256(0x11_u8)),
+            ],
+        };
+        let expected = vec![tuple];
+
+        let tuple_type = ParamType::Tuple {
+            params: vec![
+                Param::with_type(ParamType::Address),
+                Param::with_type(ParamType::Address),
+                Param::with_type(ParamType::u256()),
+            ],
+        };
+        let decoded = decode_params_impl(&[tuple_type], &encoded).unwrap();
+        assert_eq!(decoded, expected);
+    }
+
+    #[test]
+    fn decode_dynamic_tuple() {
+        let encoded = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000"
+        )
+        .decode_hex()
+        .unwrap();
+        let string1 = Token::String("gavofyork".to_owned());
+        let string2 = Token::String("gavofyork".to_owned());
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(string1),
+                NamedToken::with_token(string2),
+            ],
+        };
+        let decoded = decode_params_impl(
+            &[ParamType::Tuple {
+                params: vec![
+                    Param::with_type(ParamType::String),
+                    Param::with_type(ParamType::String),
+                ],
+            }],
+            &encoded,
+        )
+        .unwrap();
+        let expected = vec![tuple];
+        assert_eq!(decoded, expected);
+    }
+
+    #[test]
+    fn decode_nested_tuple() {
+        let encoded = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "00000000000000000000000000000000000000000000000000000000000000c0",
+            "0000000000000000000000000000000000000000000000000000000000000100",
+            "0000000000000000000000000000000000000000000000000000000000000004",
+            "7465737400000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000006",
+            "6379626f72670000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000060",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "00000000000000000000000000000000000000000000000000000000000000e0",
+            "0000000000000000000000000000000000000000000000000000000000000005",
+            "6e69676874000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000003",
+            "6461790000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000004",
+            "7765656500000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000008",
+            "66756e7465737473000000000000000000000000000000000000000000000000"
+        )
+        .decode_hex()
+        .unwrap();
+        let string1 = Token::String("test".to_owned());
+        let string2 = Token::String("cyborg".to_owned());
+        let string3 = Token::String("night".to_owned());
+        let string4 = Token::String("day".to_owned());
+        let string5 = Token::String("weee".to_owned());
+        let string6 = Token::String("funtests".to_owned());
+        let bool = Token::Bool(true);
+        let deep_tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(string5),
+                NamedToken::with_token(string6),
+            ],
+        };
+        let inner_tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(string3),
+                NamedToken::with_token(string4),
+                NamedToken::with_token(deep_tuple),
+            ],
+        };
+        let outer_tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(string1),
+                NamedToken::with_token(bool),
+                NamedToken::with_token(string2),
+                NamedToken::with_token(inner_tuple),
+            ],
+        };
+        let expected = vec![outer_tuple];
+
+        let inner_tuple_type = ParamType::Tuple {
+            params: vec![
+                Param::with_type(ParamType::String),
+                Param::with_type(ParamType::String),
+                Param::with_type(ParamType::Tuple {
+                    params: vec![
+                        Param::with_type(ParamType::String),
+                        Param::with_type(ParamType::String),
+                    ],
+                }),
+            ],
+        };
+        let decoded = decode_params_impl(
+            &[ParamType::Tuple {
+                params: vec![
+                    Param::with_type(ParamType::String),
+                    Param::with_type(ParamType::Bool),
+                    Param::with_type(ParamType::String),
+                    Param::with_type(inner_tuple_type),
+                ],
+            }],
+            &encoded,
+        )
+        .unwrap();
+        assert_eq!(decoded, expected);
+    }
+
+    #[test]
+    fn decode_complex_tuple_of_dynamic_and_static_types() {
+        let encoded = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "1111111111111111111111111111111111111111111111111111111111111111",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        let string = Token::String("gavofyork".to_owned());
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(u256(0x11_u8)),
+                NamedToken::with_token(string),
+                NamedToken::with_token(address(0x11_u8)),
+                NamedToken::with_token(address(0x22_u8)),
+            ],
+        };
+        let expected = vec![tuple];
+
+        let tuple_type = ParamType::Tuple {
+            params: vec![
+                Param::with_type(ParamType::u256()),
+                Param::with_type(ParamType::String),
+                Param::with_type(ParamType::Address),
+                Param::with_type(ParamType::Address),
+            ],
+        };
+        let decoded = decode_params_impl(&[tuple_type], &encoded).unwrap();
+        assert_eq!(decoded, expected);
+    }
+
+    #[test]
+    fn decode_params_containing_dynamic_tuple() {
+        let encoded = concat!(
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000003333333333333333333333333333333333333333",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000000000060",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "7370616365736869700000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000006",
+            "6379626f72670000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        let bool1 = Token::Bool(true);
+        let string1 = Token::String("spaceship".to_owned());
+        let string2 = Token::String("cyborg".to_owned());
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(bool1),
+                NamedToken::with_token(string1),
+                NamedToken::with_token(string2),
+            ],
+        };
+        let bool2 = Token::Bool(false);
+        let expected = vec![
+            address(0x22_u8),
+            tuple,
+            address(0x33_u8),
+            address(0x44_u8),
+            bool2,
+        ];
+        let decoded = decode_params_impl(
+            &[
+                ParamType::Address,
+                ParamType::Tuple {
+                    params: vec![
+                        Param::with_type(ParamType::Bool),
+                        Param::with_type(ParamType::String),
+                        Param::with_type(ParamType::String),
+                    ],
+                },
+                ParamType::Address,
+                ParamType::Address,
+                ParamType::Bool,
+            ],
+            &encoded,
+        )
+        .unwrap();
+        assert_eq!(decoded, expected);
+    }
+
+    #[test]
+    fn decode_params_containing_static_tuple() {
+        let encoded = concat!(
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000003333333333333333333333333333333333333333",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+        )
+        .decode_hex()
+        .unwrap();
+        let bool1 = Token::Bool(true);
+        let bool2 = Token::Bool(false);
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(address(0x22_u8)),
+                NamedToken::with_token(bool1),
+                NamedToken::with_token(bool2),
+            ],
+        };
+
+        let expected = vec![address(0x11_u8), tuple, address(0x33_u8), address(0x44_u8)];
+        let decoded = decode_params_impl(
+            &[
+                ParamType::Address,
+                ParamType::Tuple {
+                    params: vec![
+                        Param::with_type(ParamType::Address),
+                        Param::with_type(ParamType::Bool),
+                        Param::with_type(ParamType::Bool),
+                    ],
+                },
+                ParamType::Address,
+                ParamType::Address,
+            ],
+            &encoded,
+        )
+        .unwrap();
+        assert_eq!(decoded, expected);
+    }
+
+    #[test]
+    fn decode_data_with_size_that_is_not_a_multiple_of_32() {
+        let encoded = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000000000000000000000000000000000000000000152",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "000000000000000000000000000000000000000000000000000000000054840d",
+            "0000000000000000000000000000000000000000000000000000000000000092",
+            "3132323033393637623533326130633134633938306235616566666231373034",
+            "3862646661656632633239336139353039663038656233633662306635663866",
+            "3039343265376239636337366361353163636132366365353436393230343438",
+            "6533303866646136383730623565326165313261323430396439343264653432",
+            "3831313350373230703330667073313678390000000000000000000000000000",
+            "0000000000000000000000000000000000103933633731376537633061363531",
+            "3761",
+        )
+        .decode_hex()
+        .unwrap();
+
+        let types = [
+            ParamType::u256(),
+            ParamType::String,
+            ParamType::String,
+            ParamType::u256(),
+            ParamType::u256(),
+        ];
+        let expected = [
+            Token::u256(U256::default()),
+            Token::String(String::from("12203967b532a0c14c980b5aeffb17048bdfaef2c293a9509f08eb3c6b0f5f8f0942e7b9cc76ca51cca26ce546920448e308fda6870b5e2ae12a2409d942de428113P720p30fps16x9")),
+            Token::String(String::from("93c717e7c0a6517a")),
+            Token::u256(U256::from(1_u64)),
+            Token::u256(U256::from(5538829_u64)),
+        ];
+        assert_eq!(decode_params_impl(&types, &encoded,).unwrap(), expected);
+    }
+
+    #[test]
+    fn decode_after_fixed_bytes_with_less_than_32_bytes() {
+        let encoded = concat!(
+            "0000000000000000000000008497afefdc5ac170a664a231f6efb25526ef813f",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "000000000000000000000000000000000000000000000000000000000000000a",
+            "3078303030303030314600000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+
+        let types = [
+            ParamType::Address,
+            ParamType::FixedBytes {
+                len: NonZeroLen::new(32).unwrap(),
+            },
+            ParamType::FixedBytes {
+                len: NonZeroLen::new(4).unwrap(),
+            },
+            ParamType::String,
+        ];
+
+        let expected = [
+            Token::Address(Address::from("0x8497afefdc5ac170a664a231f6efb25526ef813f")),
+            Token::FixedBytes(NonEmptyBytes::new(vec![0u8; 32]).unwrap()),
+            Token::FixedBytes(NonEmptyBytes::new(vec![0u8; 4]).unwrap()),
+            Token::String("0x0000001F".into()),
+        ];
+        assert_eq!(decode_params_impl(&types, &encoded,).unwrap(), &expected);
+    }
+
+    #[test]
+    fn decode_broken_utf8() {
+        let encoded = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000004",
+            "e4b88de500000000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+
+        assert_eq!(
+            decode_params_impl(&[ParamType::String,], &encoded).unwrap(),
+            &[Token::String("不�".into())]
+        );
+    }
+
+    #[test]
+    fn decode_corrupted_dynamic_array() {
+        // line 1 at 0x00 =   0: tail offset of array
+        // line 2 at 0x20 =  32: length of array
+        // line 3 at 0x40 =  64: first word
+        // line 4 at 0x60 =  96: second word
+        let encoded = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "00000000000000000000000000000000000000000000000000000000ffffffff",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+        )
+        .decode_hex()
+        .unwrap();
+
+        let types = [ParamType::Array {
+            kind: Box::new(ParamType::u256()),
+        }];
+        assert!(decode_params_impl(&types, &encoded).is_err());
+    }
+
+    #[test]
+    fn decode_corrupted_nested_array_tuple() {
+        let input = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            //
+            "00000000000000000000000000000000000000000000000000000000000002a0",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            //
+            "00000000000000000000000000000000fffffffffffffffffffffffffffffffe",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            //
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            //
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "000000000000000000000000000000000000000000000000ffffffffffffffff",
+            //
+            "0008000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000020000000000000000",
+            //
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000001000000000000000000000000000000000000",
+            //
+            "000000000000000000000000000000000000000000000000000000000000053a",
+            "0100000000000000000000000000000000000000000000000000000000000000",
+            //
+            "0000000000000010000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            //
+            "0000000000000000000000000000000000000000000000000000000002000000",
+            "0000000000000000000000000000000000000000000000000000000000100000",
+            //
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+            //
+            "0000000000000000000000000000000000000000000000000000000000000006",
+            "00000000000000000000000000000000000000000000000000000000000000c0",
+            //
+            "0000000000000000000000000000000000000000000000000000000000002ce0",
+            "0000000000000000000000000000000000000000000000000000000000005880",
+            //
+            "0000000000000000000000000000000000000000000000000000000000008280",
+            "000000000000000000000000000000000000000000000000000000000000acc0",
+            //
+            "000000000000000000000000000000000000000000000000000000000000d6e0",
+            "0000000000000000000000000000000000000000020000000000000000000000",
+            //
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            //
+            "0000000000000000000000000000000000000000000000000000000000000120",
+            "0000000000000000000000000000000000000000000000000000000000000720",
+            //
+            "0000000000000000000000000000000000000000000000000000000000000b80",
+            "0000000000000000000000000000000000000000000000000000000000000fe0",
+        )
+        .decode_hex()
+        .unwrap();
+
+        let types = [
+            ParamType::Array {
+                kind: Box::new(ParamType::Tuple {
+                    params: vec![
+                        Param::with_type(ParamType::u256()),
+                        Param::with_type(ParamType::u256()),
+                    ],
+                }),
+            },
+            ParamType::Array {
+                kind: Box::new(ParamType::Tuple {
+                    params: vec![
+                        Param::with_type(ParamType::u256()),
+                        Param::with_type(ParamType::Array {
+                            kind: Box::new(ParamType::Tuple {
+                                params: vec![
+                                    Param::with_type(ParamType::u256()),
+                                    Param::with_type(ParamType::Array {
+                                        kind: Box::new(ParamType::String),
+                                    }),
+                                ],
+                            }),
+                        }),
+                    ],
+                }),
+            },
+        ];
+
+        assert!(decode_params_impl(&types, &input).is_err());
+    }
+
+    #[test]
+    fn decode_corrupted_fixed_array_of_strings() {
+        let input = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000001000040",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000008",
+            "5445535454455354000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000008",
+            "5445535454455354000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+
+        let types = [
+            ParamType::u256(),
+            ParamType::FixedArray {
+                len: NonZeroLen::new(2).unwrap(),
+                kind: Box::new(ParamType::String),
+            },
+        ];
+        assert!(decode_params_impl(&types, &input).is_err());
+    }
+
+    #[test]
+    fn decode_whole_addresses() {
+        let input = concat!(
+            "0000000000000000000000000000000000000000000000000000000000012345",
+            "0000000000000000000000000000000000000000000000000000000000054321",
+        )
+        .decode_hex()
+        .unwrap();
+        assert!(decode_params_impl(&[ParamType::Address], &input).is_ok());
+    }
+}
diff --git a/rust/tw_evm/src/abi/encode.rs b/rust/tw_evm/src/abi/encode.rs
new file mode 100644
index 00000000000..5ab9acd7068
--- /dev/null
+++ b/rust/tw_evm/src/abi/encode.rs
@@ -0,0 +1,1086 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::token::Token;
+use tw_hash::H256;
+use tw_memory::Data;
+
+pub fn encode_tokens(tokens: &[Token]) -> Data {
+    let mediates = tokens.iter().map(mediate_token).collect::<Vec<_>>();
+
+    encode_head_tail(&mediates)
+        .into_iter()
+        .flat_map(H256::take)
+        .collect()
+}
+
+#[derive(Debug)]
+enum Mediate<'a> {
+    // head
+    Raw(u32, &'a Token),
+    RawArray(Vec<Mediate<'a>>),
+
+    // head + tail
+    Prefixed(u32, &'a Token),
+    PrefixedArray(Vec<Mediate<'a>>),
+    PrefixedArrayWithLength(Vec<Mediate<'a>>),
+}
+
+impl Mediate<'_> {
+    fn head_len(&self) -> u32 {
+        match self {
+            Mediate::Raw(len, _) => 32 * len,
+            Mediate::RawArray(ref mediates) => {
+                mediates.iter().map(|mediate| mediate.head_len()).sum()
+            },
+            Mediate::Prefixed(_, _)
+            | Mediate::PrefixedArray(_)
+            | Mediate::PrefixedArrayWithLength(_) => 32,
+        }
+    }
+
+    fn tail_len(&self) -> u32 {
+        match self {
+            Mediate::Raw(_, _) | Mediate::RawArray(_) => 0,
+            Mediate::Prefixed(len, _) => 32 * len,
+            Mediate::PrefixedArray(ref mediates) => mediates
+                .iter()
+                .fold(0, |acc, m| acc + m.head_len() + m.tail_len()),
+            Mediate::PrefixedArrayWithLength(ref mediates) => mediates
+                .iter()
+                .fold(32, |acc, m| acc + m.head_len() + m.tail_len()),
+        }
+    }
+
+    fn head_append(&self, acc: &mut Vec<H256>, suffix_offset: u32) {
+        match *self {
+            Mediate::Raw(_, raw) => encode_token_append(acc, raw),
+            Mediate::RawArray(ref raw) => {
+                raw.iter().for_each(|mediate| mediate.head_append(acc, 0))
+            },
+            Mediate::Prefixed(_, _)
+            | Mediate::PrefixedArray(_)
+            | Mediate::PrefixedArrayWithLength(_) => acc.push(pad_u32(suffix_offset)),
+        }
+    }
+
+    fn tail_append(&self, acc: &mut Vec<H256>) {
+        match *self {
+            Mediate::Raw(_, _) | Mediate::RawArray(_) => {},
+            Mediate::Prefixed(_, raw) => encode_token_append(acc, raw),
+            Mediate::PrefixedArray(ref mediates) => encode_head_tail_append(acc, mediates),
+            Mediate::PrefixedArrayWithLength(ref mediates) => {
+                // + 32 added to offset represents len of the array prepended to tail
+                acc.push(pad_u32(mediates.len() as u32));
+                encode_head_tail_append(acc, mediates);
+            },
+        };
+    }
+}
+
+fn encode_head_tail(mediates: &[Mediate]) -> Vec<H256> {
+    let (heads_len, tails_len) = mediates.iter().fold((0, 0), |(head_acc, tail_acc), m| {
+        (head_acc + m.head_len(), tail_acc + m.tail_len())
+    });
+
+    let mut result = Vec::with_capacity((heads_len + tails_len) as usize);
+    encode_head_tail_append(&mut result, mediates);
+
+    result
+}
+
+fn encode_head_tail_append(acc: &mut Vec<H256>, mediates: &[Mediate]) {
+    let heads_len = mediates
+        .iter()
+        .fold(0, |head_acc, m| head_acc + m.head_len());
+
+    let mut offset = heads_len;
+    for mediate in mediates {
+        mediate.head_append(acc, offset);
+        offset += mediate.tail_len();
+    }
+
+    mediates.iter().for_each(|m| m.tail_append(acc));
+}
+
+fn mediate_token(token: &Token) -> Mediate {
+    match token {
+        Token::Address(_) => Mediate::Raw(1, token),
+        Token::Bytes(bytes) => Mediate::Prefixed(pad_bytes_len(bytes), token),
+        Token::String(s) => Mediate::Prefixed(pad_bytes_len(s.as_bytes()), token),
+        Token::FixedBytes(bytes) => Mediate::Raw(fixed_bytes_len(bytes), token),
+        Token::Int { .. } | Token::Uint { .. } | Token::Bool(_) => Mediate::Raw(1, token),
+        Token::Array { arr, .. } => {
+            let mediates = arr.iter().map(mediate_token).collect();
+            Mediate::PrefixedArrayWithLength(mediates)
+        },
+        Token::FixedArray { arr, .. } => {
+            let mediates = arr.iter().map(mediate_token).collect();
+            if token.is_dynamic() {
+                Mediate::PrefixedArray(mediates)
+            } else {
+                Mediate::RawArray(mediates)
+            }
+        },
+        Token::Tuple { params } => {
+            let mediates = params
+                .iter()
+                .map(|param| mediate_token(&param.value))
+                .collect();
+            if token.is_dynamic() {
+                Mediate::PrefixedArray(mediates)
+            } else {
+                Mediate::RawArray(mediates)
+            }
+        },
+    }
+}
+
+fn encode_token_append(data: &mut Vec<H256>, token: &Token) {
+    match token {
+        Token::Address(address) => {
+            let mut padded = H256::default();
+            padded[12..].copy_from_slice(address.as_slice());
+            data.push(padded);
+        },
+        Token::Bytes(bytes) => pad_bytes_append(data, bytes),
+        Token::String(s) => pad_bytes_append(data, s.as_bytes()),
+        Token::FixedBytes(bytes) => fixed_bytes_append(data, bytes),
+        Token::Int { int, .. } => data.push(int.to_big_endian()),
+        Token::Uint { uint, .. } => data.push(uint.to_big_endian()),
+        Token::Bool(b) => {
+            let mut value = H256::default();
+            if *b {
+                value[31] = 1;
+            }
+            data.push(value);
+        },
+        Token::FixedArray { .. } | Token::Array { .. } | Token::Tuple { .. } => {
+            debug_assert!(false, "Unhandled nested token: {:?}", token)
+        },
+    }
+}
+
+/// Converts a u32 to a right aligned array of 32 bytes.
+pub fn pad_u32(value: u32) -> H256 {
+    let mut padded = H256::default();
+    padded[28..32].copy_from_slice(&value.to_be_bytes());
+    padded
+}
+
+fn pad_bytes_len(bytes: &[u8]) -> u32 {
+    // "+ 1" because len is also appended
+    ((bytes.len() + 31) / 32) as u32 + 1
+}
+
+fn pad_bytes_append(data: &mut Vec<H256>, bytes: &[u8]) {
+    data.push(pad_u32(bytes.len() as u32));
+    fixed_bytes_append(data, bytes);
+}
+
+fn fixed_bytes_len(bytes: &[u8]) -> u32 {
+    ((bytes.len() + 31) / 32) as u32
+}
+
+fn fixed_bytes_append(result: &mut Vec<H256>, bytes: &[u8]) {
+    let len = (bytes.len() + 31) / 32;
+    for i in 0..len {
+        let mut padded = H256::default();
+
+        let to_copy = match i == len - 1 {
+            false => 32,
+            true => match bytes.len() % 32 {
+                0 => 32,
+                x => x,
+            },
+        };
+
+        let offset = 32 * i;
+        padded[..to_copy].copy_from_slice(&bytes[offset..offset + to_copy]);
+        result.push(padded);
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::abi::non_empty_array::{NonEmptyArray, NonEmptyBytes};
+    use crate::abi::param::Param;
+    use crate::abi::param_token::NamedToken;
+    use crate::abi::param_type::constructor::TypeConstructor;
+    use crate::abi::param_type::ParamType;
+    use tw_encoding::hex::DecodeHex;
+    use tw_number::{I256, U256};
+
+    #[test]
+    fn encode_address() {
+        let address = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let encoded = encode_tokens(&[address]);
+        let expected = "0000000000000000000000001111111111111111111111111111111111111111"
+            .decode_hex()
+            .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_array_of_addresses() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let addresses = Token::Array {
+            arr: vec![address1, address2],
+            kind: ParamType::Address,
+        };
+        let encoded = encode_tokens(&[addresses]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_fixed_array_of_addresses() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let addresses = {
+            let arr = NonEmptyArray::new(vec![address1, address2]).unwrap();
+            let kind = ParamType::Address;
+            Token::FixedArray { arr, kind }
+        };
+
+        let encoded = encode_tokens(&[addresses]);
+        let expected = concat!(
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_two_addresses() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let encoded = encode_tokens(&[address1, address2]);
+        let expected = concat!(
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_fixed_array_of_dynamic_array_of_addresses() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let address3 = Token::Address("0x3333333333333333333333333333333333333333".into());
+        let address4 = Token::Address("0x4444444444444444444444444444444444444444".into());
+        let array0 = Token::Array {
+            arr: vec![address1, address2],
+            kind: ParamType::Address,
+        };
+        let array1 = Token::Array {
+            arr: vec![address3, address4],
+            kind: ParamType::Address,
+        };
+        let fixed = Token::FixedArray {
+            arr: NonEmptyArray::new(vec![array0, array1]).unwrap(),
+            kind: ParamType::array(ParamType::Address),
+        };
+        let encoded = encode_tokens(&[fixed]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000003333333333333333333333333333333333333333",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_array_of_fixed_array_of_addresses() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let address3 = Token::Address("0x3333333333333333333333333333333333333333".into());
+        let address4 = Token::Address("0x4444444444444444444444444444444444444444".into());
+        let array0 = Token::FixedArray {
+            arr: NonEmptyArray::new(vec![address1, address2]).unwrap(),
+            kind: ParamType::Address,
+        };
+        let array1 = Token::FixedArray {
+            arr: NonEmptyArray::new(vec![address3, address4]).unwrap(),
+            kind: ParamType::Address,
+        };
+        let dynamic = Token::Array {
+            arr: vec![array0, array1],
+            kind: ParamType::fixed_array(2, ParamType::Address).unwrap(),
+        };
+        let encoded = encode_tokens(&[dynamic]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "0000000000000000000000003333333333333333333333333333333333333333",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_array_of_dynamic_arrays() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let array0 = Token::Array {
+            arr: vec![address1],
+            kind: ParamType::Address,
+        };
+        let array1 = Token::Array {
+            arr: vec![address2],
+            kind: ParamType::Address,
+        };
+        let dynamic = Token::Array {
+            arr: vec![array0, array1],
+            kind: ParamType::array(ParamType::Address),
+        };
+        let encoded = encode_tokens(&[dynamic]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_array_of_dynamic_arrays2() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let address3 = Token::Address("0x3333333333333333333333333333333333333333".into());
+        let address4 = Token::Address("0x4444444444444444444444444444444444444444".into());
+        let array0 = Token::Array {
+            arr: vec![address1, address2],
+            kind: ParamType::Address,
+        };
+        let array1 = Token::Array {
+            arr: vec![address3, address4],
+            kind: ParamType::Address,
+        };
+        let dynamic = Token::Array {
+            arr: vec![array0, array1],
+            kind: ParamType::array(ParamType::Address),
+        };
+        let encoded = encode_tokens(&[dynamic]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000003333333333333333333333333333333333333333",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_fixed_array_of_fixed_arrays() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let address3 = Token::Address("0x3333333333333333333333333333333333333333".into());
+        let address4 = Token::Address("0x4444444444444444444444444444444444444444".into());
+        let array0 = Token::FixedArray {
+            arr: NonEmptyArray::new(vec![address1, address2]).unwrap(),
+            kind: ParamType::Address,
+        };
+        let array1 = Token::FixedArray {
+            arr: NonEmptyArray::new(vec![address3, address4]).unwrap(),
+            kind: ParamType::Address,
+        };
+        let fixed = Token::FixedArray {
+            arr: NonEmptyArray::new(vec![array0, array1]).unwrap(),
+            kind: ParamType::fixed_array(2, ParamType::fixed_array(2, ParamType::Address).unwrap())
+                .unwrap(),
+        };
+        let encoded = encode_tokens(&[fixed]);
+        let expected = concat!(
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "0000000000000000000000003333333333333333333333333333333333333333",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_fixed_array_of_static_tuples_followed_by_dynamic_type() {
+        let tuple1 = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(Token::u256(93523141_u64.into())),
+                NamedToken::with_token(Token::u256(352332135_u64.into())),
+                NamedToken::with_token(Token::Address(
+                    "0x4444444444444444444444444444444444444444".into(),
+                )),
+            ],
+        };
+        let tuple2 = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(Token::u256(12411_u64.into())),
+                NamedToken::with_token(Token::u256(451_u64.into())),
+                NamedToken::with_token(Token::Address(
+                    "0x2222222222222222222222222222222222222222".into(),
+                )),
+            ],
+        };
+        let fixed = Token::FixedArray {
+            arr: NonEmptyArray::new(vec![tuple1, tuple2]).unwrap(),
+            kind: ParamType::Tuple {
+                params: vec![
+                    Param::with_type(ParamType::u256()),
+                    Param::with_type(ParamType::u256()),
+                    Param::with_type(ParamType::Address),
+                ],
+            },
+        };
+        let s = Token::String("gavofyork".to_owned());
+        let encoded = encode_tokens(&[fixed, s]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000005930cc5",
+            "0000000000000000000000000000000000000000000000000000000015002967",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+            "000000000000000000000000000000000000000000000000000000000000307b",
+            "00000000000000000000000000000000000000000000000000000000000001c3",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "00000000000000000000000000000000000000000000000000000000000000e0",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_empty_array() {
+        // Empty arrays
+        let encoded = encode_tokens(&[
+            Token::Array {
+                arr: vec![],
+                kind: ParamType::Bool,
+            },
+            Token::Array {
+                arr: vec![],
+                kind: ParamType::Address,
+            },
+        ]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000060",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+
+        // Nested empty arrays
+        let encoded = encode_tokens(&[
+            Token::Array {
+                arr: vec![Token::Array {
+                    arr: vec![],
+                    kind: ParamType::i256(),
+                }],
+                kind: ParamType::array(ParamType::i256()),
+            },
+            Token::Array {
+                arr: vec![Token::Array {
+                    arr: vec![],
+                    kind: ParamType::String,
+                }],
+                kind: ParamType::array(ParamType::String),
+            },
+        ]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_bytes() {
+        let bytes = Token::Bytes(vec![0x12, 0x34]);
+        let encoded = encode_tokens(&[bytes]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "1234000000000000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_fixed_bytes() {
+        let bytes = Token::FixedBytes(NonEmptyBytes::new(vec![0x12, 0x34]).unwrap());
+        let encoded = encode_tokens(&[bytes]);
+        let expected = "1234000000000000000000000000000000000000000000000000000000000000"
+            .decode_hex()
+            .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_string() {
+        let s = Token::String("gavofyork".to_owned());
+        let encoded = encode_tokens(&[s]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_bytes2() {
+        let bytes = Token::Bytes(
+            "10000000000000000000000000000000000000000000000000000000000002"
+                .decode_hex()
+                .unwrap(),
+        );
+        let encoded = encode_tokens(&[bytes]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "000000000000000000000000000000000000000000000000000000000000001f",
+            "1000000000000000000000000000000000000000000000000000000000000200",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_bytes3() {
+        let bytes = Token::Bytes(
+    		"10000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000".decode_hex().unwrap()
+        );
+        let encoded = encode_tokens(&[bytes]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "1000000000000000000000000000000000000000000000000000000000000000",
+            "1000000000000000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_two_bytes() {
+        let bytes1 = Token::Bytes(
+            "10000000000000000000000000000000000000000000000000000000000002"
+                .decode_hex()
+                .unwrap(),
+        );
+        let bytes2 = Token::Bytes(
+            "0010000000000000000000000000000000000000000000000000000000000002"
+                .decode_hex()
+                .unwrap(),
+        );
+        let encoded = encode_tokens(&[bytes1, bytes2]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "000000000000000000000000000000000000000000000000000000000000001f",
+            "1000000000000000000000000000000000000000000000000000000000000200",
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0010000000000000000000000000000000000000000000000000000000000002",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_uint() {
+        let mut uint = H256::default();
+        uint[31] = 4;
+        let encoded = encode_tokens(&[Token::u256(U256::from_big_endian(uint))]);
+        let expected = "0000000000000000000000000000000000000000000000000000000000000004"
+            .decode_hex()
+            .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_int() {
+        let mut int = H256::default();
+        int[31] = 4;
+        let encoded = encode_tokens(&[Token::i256(I256::from_big_endian(int))]);
+        let expected = "0000000000000000000000000000000000000000000000000000000000000004"
+            .decode_hex()
+            .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_bool() {
+        let encoded = encode_tokens(&[Token::Bool(true)]);
+        let expected = "0000000000000000000000000000000000000000000000000000000000000001"
+            .decode_hex()
+            .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_bool2() {
+        let encoded = encode_tokens(&[Token::Bool(false)]);
+        let expected = "0000000000000000000000000000000000000000000000000000000000000000"
+            .decode_hex()
+            .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn comprehensive_test() {
+        let bytes = concat!(
+            "131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b",
+            "131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b",
+        )
+        .decode_hex()
+        .unwrap();
+        let encoded = encode_tokens(&[
+            Token::i256(5_u64.into()),
+            Token::Bytes(bytes.clone()),
+            Token::i256(3_u64.into()),
+            Token::Bytes(bytes),
+        ]);
+
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000005",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000003",
+            "00000000000000000000000000000000000000000000000000000000000000e0",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b",
+            "131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b",
+            "131a3afc00d1b1e3461b955e53fc866dcf303b3eb9f4c16f89e388930f48134b",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn test_pad_u32() {
+        // this will fail if endianess is not supported
+        assert_eq!(pad_u32(0x1)[31], 1);
+        assert_eq!(pad_u32(0x100)[30], 1);
+    }
+
+    #[test]
+    fn comprehensive_test2() {
+        let encoded = encode_tokens(&vec![
+            Token::i256(1_u64.into()),
+            Token::String("gavofyork".to_owned()),
+            Token::i256(2_u64.into()),
+            Token::i256(3_u64.into()),
+            Token::i256(4_u64.into()),
+            Token::Array {
+                arr: vec![
+                    Token::i256(5_u64.into()),
+                    Token::i256(6_u64.into()),
+                    Token::i256(7_u64.into()),
+                ],
+                kind: ParamType::i256(),
+            },
+        ]);
+
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "00000000000000000000000000000000000000000000000000000000000000c0",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000000000000000000000000000000000000000000003",
+            "0000000000000000000000000000000000000000000000000000000000000004",
+            "0000000000000000000000000000000000000000000000000000000000000100",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000003",
+            "0000000000000000000000000000000000000000000000000000000000000005",
+            "0000000000000000000000000000000000000000000000000000000000000006",
+            "0000000000000000000000000000000000000000000000000000000000000007",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_array_of_bytes() {
+        let bytes = "019c80031b20d5e69c8093a571162299032018d913930d93ab320ae5ea44a4218a274f00d607"
+            .decode_hex()
+            .unwrap();
+        let encoded = encode_tokens(&[Token::Array {
+            arr: vec![Token::Bytes(bytes.to_vec())],
+            kind: ParamType::Bytes,
+        }]);
+
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000026",
+            "019c80031b20d5e69c8093a571162299032018d913930d93ab320ae5ea44a421",
+            "8a274f00d6070000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_array_of_bytes2() {
+        let bytes = "4444444444444444444444444444444444444444444444444444444444444444444444444444"
+            .decode_hex()
+            .unwrap();
+        let bytes2 = "6666666666666666666666666666666666666666666666666666666666666666666666666666"
+            .decode_hex()
+            .unwrap();
+        let encoded = encode_tokens(&[Token::Array {
+            arr: vec![Token::Bytes(bytes.to_vec()), Token::Bytes(bytes2.to_vec())],
+            kind: ParamType::Bytes,
+        }]);
+
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000000000000000000000000000000000000000000026",
+            "4444444444444444444444444444444444444444444444444444444444444444",
+            "4444444444440000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000026",
+            "6666666666666666666666666666666666666666666666666666666666666666",
+            "6666666666660000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_static_tuple_of_addresses() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let encoded = encode_tokens(&[Token::Tuple {
+            params: vec![
+                NamedToken::with_token(address1),
+                NamedToken::with_token(address2),
+            ],
+        }]);
+
+        let expected = concat!(
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_tuple() {
+        let string1 = Token::String("gavofyork".to_owned());
+        let string2 = Token::String("gavofyork".to_owned());
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(string1),
+                NamedToken::with_token(string2),
+            ],
+        };
+        let encoded = encode_tokens(&[tuple]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_tuple_of_bytes2() {
+        let bytes = "4444444444444444444444444444444444444444444444444444444444444444444444444444"
+            .decode_hex()
+            .unwrap();
+        let bytes2 = "6666666666666666666666666666666666666666666666666666666666666666666666666666"
+            .decode_hex()
+            .unwrap();
+        let encoded = encode_tokens(&[Token::Tuple {
+            params: vec![
+                NamedToken::with_token(Token::Bytes(bytes.to_vec())),
+                NamedToken::with_token(Token::Bytes(bytes2.to_vec())),
+            ],
+        }]);
+
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000000000000000000000000000000000000000000026",
+            "4444444444444444444444444444444444444444444444444444444444444444",
+            "4444444444440000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000026",
+            "6666666666666666666666666666666666666666666666666666666666666666",
+            "6666666666660000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_complex_tuple() {
+        let uint_data =
+            H256::from("1111111111111111111111111111111111111111111111111111111111111111");
+        let uint = Token::u256(U256::from_big_endian(uint_data));
+        let string = Token::String("gavofyork".to_owned());
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(uint),
+                NamedToken::with_token(string),
+                NamedToken::with_token(address1),
+                NamedToken::with_token(address2),
+            ],
+        };
+        let encoded = encode_tokens(&[tuple]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "1111111111111111111111111111111111111111111111111111111111111111",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "6761766f66796f726b0000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_nested_tuple() {
+        let string1 = Token::String("test".to_owned());
+        let string2 = Token::String("cyborg".to_owned());
+        let string3 = Token::String("night".to_owned());
+        let string4 = Token::String("day".to_owned());
+        let string5 = Token::String("weee".to_owned());
+        let string6 = Token::String("funtests".to_owned());
+        let bool = Token::Bool(true);
+        let deep_tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(string5),
+                NamedToken::with_token(string6),
+            ],
+        };
+        let inner_tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(string3),
+                NamedToken::with_token(string4),
+                NamedToken::with_token(deep_tuple),
+            ],
+        };
+        let outer_tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(string1),
+                NamedToken::with_token(bool),
+                NamedToken::with_token(string2),
+                NamedToken::with_token(inner_tuple),
+            ],
+        };
+        let encoded = encode_tokens(&[outer_tuple]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "00000000000000000000000000000000000000000000000000000000000000c0",
+            "0000000000000000000000000000000000000000000000000000000000000100",
+            "0000000000000000000000000000000000000000000000000000000000000004",
+            "7465737400000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000006",
+            "6379626f72670000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000060",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "00000000000000000000000000000000000000000000000000000000000000e0",
+            "0000000000000000000000000000000000000000000000000000000000000005",
+            "6e69676874000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000003",
+            "6461790000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000040",
+            "0000000000000000000000000000000000000000000000000000000000000080",
+            "0000000000000000000000000000000000000000000000000000000000000004",
+            "7765656500000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000008",
+            "66756e7465737473000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_params_containing_dynamic_tuple() {
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let address3 = Token::Address("0x3333333333333333333333333333333333333333".into());
+        let address4 = Token::Address("0x4444444444444444444444444444444444444444".into());
+        let bool1 = Token::Bool(true);
+        let string1 = Token::String("spaceship".to_owned());
+        let string2 = Token::String("cyborg".to_owned());
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(bool1),
+                NamedToken::with_token(string1),
+                NamedToken::with_token(string2),
+            ],
+        };
+        let bool2 = Token::Bool(false);
+        let encoded = encode_tokens(&[address2, tuple, address3, address4, bool2]);
+        let expected = concat!(
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000003333333333333333333333333333333333333333",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000000000060",
+            "00000000000000000000000000000000000000000000000000000000000000a0",
+            "0000000000000000000000000000000000000000000000000000000000000009",
+            "7370616365736869700000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000006",
+            "6379626f72670000000000000000000000000000000000000000000000000000",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_params_containing_static_tuple() {
+        let address1 = Token::Address("0x1111111111111111111111111111111111111111".into());
+        let address2 = Token::Address("0x2222222222222222222222222222222222222222".into());
+        let address3 = Token::Address("0x3333333333333333333333333333333333333333".into());
+        let address4 = Token::Address("0x4444444444444444444444444444444444444444".into());
+        let bool1 = Token::Bool(true);
+        let bool2 = Token::Bool(false);
+        let tuple = Token::Tuple {
+            params: vec![
+                NamedToken::with_token(address2),
+                NamedToken::with_token(bool1),
+                NamedToken::with_token(bool2),
+            ],
+        };
+        let encoded = encode_tokens(&[address1, tuple, address3, address4]);
+        let expected = concat!(
+            "0000000000000000000000001111111111111111111111111111111111111111",
+            "0000000000000000000000002222222222222222222222222222222222222222",
+            "0000000000000000000000000000000000000000000000000000000000000001",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000003333333333333333333333333333333333333333",
+            "0000000000000000000000004444444444444444444444444444444444444444",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+
+    #[test]
+    fn encode_dynamic_tuple_with_nested_static_tuples() {
+        let uint1 = Token::u256(0x777_u64.into());
+        let uint2 = Token::u256(0x42_u64.into());
+        let uint3 = Token::u256(0x1337_u64.into());
+        let token = {
+            Token::Tuple {
+                params: vec![
+                    NamedToken::with_token(Token::Tuple {
+                        params: vec![NamedToken::with_token(Token::Tuple {
+                            params: vec![
+                                NamedToken::with_token(Token::Bool(false)),
+                                NamedToken::with_token(uint1),
+                            ],
+                        })],
+                    }),
+                    NamedToken::with_token(Token::Array {
+                        arr: vec![uint2, uint3],
+                        kind: ParamType::u256(),
+                    }),
+                ],
+            }
+        };
+        let encoded = encode_tokens(&[token]);
+        let expected = concat!(
+            "0000000000000000000000000000000000000000000000000000000000000020",
+            "0000000000000000000000000000000000000000000000000000000000000000",
+            "0000000000000000000000000000000000000000000000000000000000000777",
+            "0000000000000000000000000000000000000000000000000000000000000060",
+            "0000000000000000000000000000000000000000000000000000000000000002",
+            "0000000000000000000000000000000000000000000000000000000000000042",
+            "0000000000000000000000000000000000000000000000000000000000001337",
+        )
+        .decode_hex()
+        .unwrap();
+        assert_eq!(encoded, expected);
+    }
+}
diff --git a/rust/tw_evm/src/abi/function.rs b/rust/tw_evm/src/abi/function.rs
new file mode 100644
index 00000000000..8bb098625eb
--- /dev/null
+++ b/rust/tw_evm/src/abi/function.rs
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::decode::decode_params;
+use crate::abi::encode::encode_tokens;
+use crate::abi::param::Param;
+use crate::abi::param_token::NamedToken;
+use crate::abi::signature::short_signature;
+use crate::abi::token::Token;
+use crate::abi::{AbiError, AbiErrorKind, AbiResult};
+use itertools::Itertools;
+use serde::Deserialize;
+use tw_coin_entry::error::prelude::*;
+use tw_memory::Data;
+
+#[derive(Clone, Debug, Default, Deserialize)]
+pub struct Function {
+    /// Function name.
+    pub name: String,
+    /// Function input.
+    pub inputs: Vec<Param>,
+    /// Function output.
+    pub outputs: Vec<Param>,
+}
+
+impl Function {
+    /// Returns a signature that uniquely identifies this function.
+    ///
+    /// Examples:
+    /// - `functionName()`
+    /// - `functionName():(uint256)`
+    /// - `functionName(bool):(uint256,string)`
+    /// - `functionName(uint256,bytes32):(string,uint256)`
+    pub fn signature(&self) -> String {
+        let inputs = self.inputs.iter().map(|p| p.kind.to_type_long()).join(",");
+
+        let outputs = self.outputs.iter().map(|p| p.kind.to_type_long()).join(",");
+
+        match (inputs.len(), outputs.len()) {
+            (_, 0) => format!("{}({inputs})", self.name),
+            (_, _) => format!("{}({inputs}):({outputs})", self.name),
+        }
+    }
+
+    /// Parses the ABI function input to a list of tokens.
+    pub fn decode_input(&self, data: &[u8]) -> AbiResult<Vec<NamedToken>> {
+        decode_params(&self.inputs, data)
+    }
+
+    /// Encodes function input to Eth ABI binary.
+    pub fn encode_input(&self, tokens: &[Token]) -> AbiResult<Data> {
+        // Check if the given tokens match `Self::inputs` ABI.
+        let input_param_types: Vec<_> =
+            self.inputs.iter().map(|param| param.kind.clone()).collect();
+        for (token_idx, (token, kind)) in tokens.iter().zip(input_param_types.iter()).enumerate() {
+            let actual_kind = token.to_param_type();
+            if actual_kind != *kind {
+                return AbiError::err(AbiErrorKind::Error_abi_mismatch).with_context(|| {
+                    format!(
+                        "Expected {kind:?} type parameter at {token_idx}, found {actual_kind:?}"
+                    )
+                });
+            }
+        }
+
+        let signed = short_signature(&self.name, &input_param_types);
+        let encoded = encode_tokens(tokens);
+        Ok(signed.into_iter().chain(encoded).collect())
+    }
+}
diff --git a/rust/tw_evm/src/abi/mod.rs b/rust/tw_evm/src/abi/mod.rs
new file mode 100644
index 00000000000..dd59d3c6370
--- /dev/null
+++ b/rust/tw_evm/src/abi/mod.rs
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+
+pub mod contract;
+pub mod decode;
+pub mod encode;
+pub mod function;
+pub mod non_empty_array;
+pub mod param;
+pub mod param_token;
+pub mod param_type;
+pub mod prebuild;
+pub mod signature;
+pub mod token;
+pub mod uint;
+
+#[macro_export]
+macro_rules! abi_output_error {
+    ($output:ty, $error:expr) => {{
+        let err = $error;
+
+        let mut output = <$output>::default();
+        output.error = *TWError::error_type(&err);
+        output.error_message = std::borrow::Cow::from(err.to_string());
+
+        output
+    }};
+}
+
+pub type AbiErrorKind = tw_proto::EthereumAbi::Proto::AbiError;
+pub type AbiError = TWError<AbiErrorKind>;
+pub type AbiResult<T> = Result<T, AbiError>;
+
+pub fn abi_to_signing_error(abi: AbiError) -> SigningError {
+    abi.map_err(|abi_kind| match abi_kind {
+        AbiErrorKind::OK => SigningErrorType::OK,
+        AbiErrorKind::Error_internal => SigningErrorType::Error_internal,
+        _ => SigningErrorType::Error_invalid_params,
+    })
+}
diff --git a/rust/tw_evm/src/abi/non_empty_array.rs b/rust/tw_evm/src/abi/non_empty_array.rs
new file mode 100644
index 00000000000..5b1c803dca5
--- /dev/null
+++ b/rust/tw_evm/src/abi/non_empty_array.rs
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::{AbiError, AbiErrorKind, AbiResult};
+use core::fmt;
+use std::num::NonZeroUsize;
+use std::ops::Deref;
+use tw_coin_entry::error::prelude::*;
+
+pub type NonEmptyBytes = NonEmptyArray<u8>;
+
+/// A convenient wrapper over `NonZeroUsize`.
+#[derive(Copy, Clone, PartialEq)]
+pub struct NonZeroLen(NonZeroUsize);
+
+impl NonZeroLen {
+    pub fn new(len: usize) -> AbiResult<NonZeroLen> {
+        NonZeroUsize::new(len)
+            .or_tw_err(AbiErrorKind::Error_invalid_param_type)
+            .map(NonZeroLen)
+    }
+
+    pub fn get(&self) -> usize {
+        self.0.get()
+    }
+}
+
+impl fmt::Debug for NonZeroLen {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{self}")
+    }
+}
+
+impl fmt::Display for NonZeroLen {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0.get())
+    }
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct NonEmptyArray<T>(Vec<T>);
+
+impl<T> NonEmptyArray<T> {
+    pub fn new(elements: Vec<T>) -> AbiResult<NonEmptyArray<T>> {
+        if elements.is_empty() {
+            return AbiError::err(AbiErrorKind::Error_empty_type);
+        }
+        Ok(NonEmptyArray(elements))
+    }
+
+    pub fn len(&self) -> NonZeroLen {
+        NonZeroLen::new(self.0.len()).expect("`NonEmptyArray` must have at least one element")
+    }
+
+    pub fn into_vec(self) -> Vec<T> {
+        self.0
+    }
+}
+
+impl<T> IntoIterator for NonEmptyArray<T> {
+    type Item = T;
+    type IntoIter = std::vec::IntoIter<T>;
+
+    fn into_iter(self) -> Self::IntoIter {
+        self.0.into_iter()
+    }
+}
+
+impl<T> Deref for NonEmptyArray<T> {
+    type Target = [T];
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl AsRef<[u8]> for NonEmptyArray<u8> {
+    fn as_ref(&self) -> &[u8] {
+        &self.0
+    }
+}
diff --git a/rust/tw_evm/src/abi/param.rs b/rust/tw_evm/src/abi/param.rs
new file mode 100644
index 00000000000..ba58d999f5b
--- /dev/null
+++ b/rust/tw_evm/src/abi/param.rs
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::param_type::ParamType;
+use serde::de::{MapAccess, Visitor};
+use serde::{de::Error as DeError, Deserialize, Deserializer};
+use std::fmt::Formatter;
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct Param {
+    /// Param name.
+    pub name: Option<String>,
+    /// Param type.
+    pub kind: ParamType,
+    /// Additional Internal type.
+    pub internal_type: Option<String>,
+}
+
+impl Param {
+    /// Should be used in tests only.
+    #[cfg(test)]
+    pub(crate) fn with_type(kind: ParamType) -> Param {
+        Param {
+            name: None,
+            kind,
+            internal_type: None,
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for Param {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        deserializer.deserialize_any(ParamVisitor)
+    }
+}
+
+struct ParamVisitor;
+
+impl<'a> Visitor<'a> for ParamVisitor {
+    type Value = Param;
+
+    fn expecting(&self, formatter: &mut Formatter) -> std::fmt::Result {
+        write!(formatter, "a valid event parameter spec")
+    }
+
+    // The method implementation is inspired by
+    // https://github.com/rust-ethereum/ethabi/blob/b1710adc18f5b771d2d2519c87248b1ba9430778/ethabi/src/param.rs#L59-L103
+    //
+    // The only difference is that tuple parameters have names.
+    fn visit_map<V>(self, mut map: V) -> Result<Self::Value, V::Error>
+    where
+        V: MapAccess<'a>,
+    {
+        macro_rules! handle_map_key {
+            ($key_name:literal, $value:expr) => {{
+                if $value.is_some() {
+                    return Err(DeError::duplicate_field($key_name));
+                }
+                $value = Some(map.next_value()?);
+            }};
+        }
+
+        let mut name = None;
+        let mut kind = None;
+        let mut internal_type = None;
+        let mut components = None;
+
+        while let Some(ref key) = map.next_key::<String>()? {
+            match key.as_ref() {
+                "name" => handle_map_key!("name", name),
+                "type" => handle_map_key!("kind", kind),
+                "internalType" => handle_map_key!("internalType", internal_type),
+                "components" => handle_map_key!("components", components),
+                // Skip unknown field.
+                _ => {},
+            }
+        }
+
+        let mut kind = kind.ok_or_else(|| DeError::missing_field("kind"))?;
+        set_tuple_components::<V::Error>(&mut kind, components)?;
+
+        Ok(Param {
+            name,
+            kind,
+            internal_type,
+        })
+    }
+}
+
+/// Set tuple components if:
+/// 1) `kind` is `tuple` or `tuple[]` or `tuple[][]`, etc.
+/// 2) `components` is `Some`.
+fn set_tuple_components<E: DeError>(
+    kind: &mut ParamType,
+    components: Option<Vec<Param>>,
+) -> Result<(), E> {
+    if let Some(tuple_components) = inner_tuple_mut(kind) {
+        *tuple_components = components.ok_or_else(|| E::missing_field("components"))?;
+        if tuple_components.is_empty() {
+            return Err(DeError::custom("'components' cannot be empty"));
+        }
+    }
+    Ok(())
+}
+
+/// Returns a mutable reference to the tuple components if `param` is `tuple` or `tuple[]` or `tuple[][]`, etc.
+fn inner_tuple_mut(mut param: &mut ParamType) -> Option<&mut Vec<Param>> {
+    loop {
+        match param {
+            ParamType::Array { kind: elem_kind } => param = elem_kind.as_mut(),
+            ParamType::FixedArray {
+                kind: elem_kind, ..
+            } => param = elem_kind.as_mut(),
+            ParamType::Tuple { params } => return Some(params),
+            _ => return None,
+        }
+    }
+}
diff --git a/rust/tw_evm/src/abi/param_token.rs b/rust/tw_evm/src/abi/param_token.rs
new file mode 100644
index 00000000000..aafe7877656
--- /dev/null
+++ b/rust/tw_evm/src/abi/param_token.rs
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::param::Param;
+use crate::abi::token::Token;
+use serde::ser::SerializeMap;
+use serde::{Serialize, Serializer};
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct NamedToken {
+    /// Optional param name.
+    pub name: Option<String>,
+    /// Parameter value.
+    pub value: Token,
+    /// Additional Internal type.
+    pub internal_type: Option<String>,
+}
+
+impl NamedToken {
+    pub fn with_param_and_token(param: &Param, value: Token) -> NamedToken {
+        NamedToken {
+            name: param.name.clone(),
+            value,
+            internal_type: param.internal_type.clone(),
+        }
+    }
+
+    pub fn to_param(&self) -> Param {
+        Param {
+            name: self.name.clone(),
+            kind: self.value.to_param_type(),
+            internal_type: self.internal_type.clone(),
+        }
+    }
+
+    #[cfg(test)]
+    pub fn with_token(value: Token) -> NamedToken {
+        NamedToken {
+            name: None,
+            value,
+            internal_type: None,
+        }
+    }
+}
+
+impl Serialize for NamedToken {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        const NUMBER_OF_ENTRIES: usize = 3;
+
+        let mut serde_struct = serializer.serialize_map(Some(NUMBER_OF_ENTRIES))?;
+        serde_struct.serialize_entry("name", &self.name)?;
+        serde_struct.serialize_entry("type", &self.value.type_short())?;
+
+        if self.value.to_param_type().has_tuple_components() {
+            serde_struct.serialize_entry("components", &self.value)?;
+        } else {
+            serde_struct.serialize_entry("value", &self.value)?;
+        }
+        serde_struct.end()
+    }
+}
diff --git a/rust/tw_evm/src/abi/param_type/constructor.rs b/rust/tw_evm/src/abi/param_type/constructor.rs
new file mode 100644
index 00000000000..52ee258735f
--- /dev/null
+++ b/rust/tw_evm/src/abi/param_type/constructor.rs
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::non_empty_array::NonZeroLen;
+use crate::abi::param_type::ParamType;
+use crate::abi::uint::UintBits;
+use crate::abi::{AbiError, AbiErrorKind, AbiResult};
+use tw_coin_entry::error::prelude::*;
+
+pub trait TypeConstructor: Sized {
+    fn address() -> Self;
+
+    fn bytes() -> Self;
+
+    fn fixed_bytes(len: usize) -> AbiResult<Self> {
+        let checked_len = NonZeroLen::new(len)?;
+        Ok(Self::fixed_bytes_checked(checked_len))
+    }
+
+    fn fixed_bytes_checked(len: NonZeroLen) -> Self;
+
+    fn int(bits: usize) -> AbiResult<Self> {
+        let checked_bits = UintBits::new(bits)?;
+        Ok(Self::int_checked(checked_bits))
+    }
+
+    fn int_checked(bits: UintBits) -> Self;
+
+    fn uint(bits: usize) -> AbiResult<Self> {
+        let checked_bits = UintBits::new(bits)?;
+        Ok(Self::uint_checked(checked_bits))
+    }
+
+    fn uint_checked(bits: UintBits) -> Self;
+
+    fn bool() -> Self;
+
+    fn string() -> Self;
+
+    fn array(element_type: Self) -> Self;
+
+    fn fixed_array(len: usize, element_type: Self) -> AbiResult<Self> {
+        let checked_len = NonZeroLen::new(len)?;
+        Ok(Self::fixed_array_checked(checked_len, element_type))
+    }
+
+    fn fixed_array_checked(len: NonZeroLen, element_type: Self) -> Self;
+
+    fn empty_tuple() -> AbiResult<Self>;
+
+    fn custom(s: &str) -> AbiResult<Self>;
+}
+
+impl TypeConstructor for ParamType {
+    fn address() -> Self {
+        ParamType::Address
+    }
+
+    fn bytes() -> Self {
+        ParamType::Bytes
+    }
+
+    fn fixed_bytes_checked(len: NonZeroLen) -> Self {
+        ParamType::FixedBytes { len }
+    }
+
+    fn int_checked(bits: UintBits) -> Self {
+        ParamType::Int { bits }
+    }
+
+    fn uint_checked(bits: UintBits) -> Self {
+        ParamType::Uint { bits }
+    }
+
+    fn bool() -> Self {
+        ParamType::Bool
+    }
+
+    fn string() -> Self {
+        ParamType::String
+    }
+
+    fn array(element_type: Self) -> Self {
+        ParamType::Array {
+            kind: Box::new(element_type),
+        }
+    }
+
+    fn fixed_array_checked(len: NonZeroLen, element_type: Self) -> Self {
+        ParamType::FixedArray {
+            kind: Box::new(element_type),
+            len,
+        }
+    }
+
+    fn empty_tuple() -> AbiResult<Self> {
+        Ok(ParamType::Tuple {
+            params: Vec::default(),
+        })
+    }
+
+    fn custom(s: &str) -> AbiResult<Self> {
+        AbiError::err(AbiErrorKind::Error_invalid_param_type)
+            .with_context(|| format!("`ParamType` doesn't support custom types like '{s}'"))
+    }
+}
diff --git a/rust/tw_evm/src/abi/param_type/mod.rs b/rust/tw_evm/src/abi/param_type/mod.rs
new file mode 100644
index 00000000000..ca83a262dc4
--- /dev/null
+++ b/rust/tw_evm/src/abi/param_type/mod.rs
@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::non_empty_array::NonZeroLen;
+use crate::abi::param::Param;
+use crate::abi::uint::UintBits;
+use crate::abi::AbiResult;
+use serde::{de::Error as DeError, Deserialize, Deserializer};
+
+pub mod constructor;
+pub mod reader;
+pub mod writer;
+
+use reader::Reader;
+use writer::Writer;
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum ParamType {
+    /// Address.
+    ///
+    /// solidity name: address
+    /// Encoded to left padded [0u8; 32].
+    Address,
+    /// Vector of bytes with known size.
+    ///
+    /// solidity name eg.: bytes8, bytes32, bytes64, bytes1024
+    /// Encoded to right padded [0u8; ((N + 31) / 32) * 32].
+    FixedBytes { len: NonZeroLen },
+    /// Vector of bytes of unknown size.
+    ///
+    /// solidity name: bytes
+    /// Encoded in two parts.
+    /// Init part: offset of 'closing part`.
+    /// Closing part: encoded length followed by encoded right padded bytes.
+    Bytes,
+    /// Signed integer.
+    ///
+    /// solidity name: int
+    Int { bits: UintBits },
+    /// Unsigned integer.
+    ///
+    /// solidity name: uint
+    Uint { bits: UintBits },
+    /// Boolean value.
+    ///
+    /// solidity name: bool
+    /// Encoded as left padded [0u8; 32], where last bit represents boolean value.
+    Bool,
+    /// String.
+    ///
+    /// solidity name: string
+    /// Encoded in the same way as bytes. Must be utf8 compliant.
+    String,
+    /// Array with known size.
+    ///
+    /// solidity name eg.: int[3], bool[3], address[][8]
+    /// Encoding of array is equal to encoding of consecutive elements of array.
+    FixedArray {
+        kind: Box<ParamType>,
+        len: NonZeroLen,
+    },
+    /// Array of params with unknown size.
+    ///
+    /// solidity name eg. int[], bool[], address[5][]
+    Array { kind: Box<ParamType> },
+    /// Tuple of params of variable types.
+    ///
+    /// solidity name: tuple
+    Tuple { params: Vec<Param> },
+}
+
+impl ParamType {
+    pub fn i256() -> ParamType {
+        ParamType::Int {
+            bits: UintBits::default(),
+        }
+    }
+
+    pub fn u256() -> ParamType {
+        ParamType::Uint {
+            bits: UintBits::default(),
+        }
+    }
+
+    /// Tuples will be represented as list of inner types in parens, for example `(int256,bool)`.
+    pub fn to_type_long(&self) -> String {
+        let serialize_tuple_contents = true;
+        Writer::write_for_abi(self, serialize_tuple_contents)
+    }
+
+    /// Tuples will be represented as keyword `tuple`.
+    pub fn to_type_short(&self) -> String {
+        let serialize_tuple_contents = false;
+        Writer::write_for_abi(self, serialize_tuple_contents)
+    }
+
+    /// returns whether a ParamType is dynamic
+    /// used to decide how the ParamType should be encoded
+    pub fn is_dynamic(&self) -> bool {
+        match self {
+            ParamType::Bytes | ParamType::String | ParamType::Array { .. } => true,
+            ParamType::FixedArray { kind, .. } => kind.is_dynamic(),
+            ParamType::Tuple { params } => params.iter().any(|param| param.kind.is_dynamic()),
+            _ => false,
+        }
+    }
+}
+
+impl ParamType {
+    pub fn try_from_type_short(type_short: &str) -> AbiResult<ParamType> {
+        Reader::parse_type(type_short)
+    }
+
+    pub(crate) fn has_tuple_components(&self) -> bool {
+        let mut inner_type = self;
+        loop {
+            match inner_type {
+                ParamType::Array { kind } | ParamType::FixedArray { kind, .. } => inner_type = kind,
+                ParamType::Tuple { .. } => return true,
+                _ => return false,
+            }
+        }
+    }
+}
+
+impl<'de> Deserialize<'de> for ParamType {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let identifier = String::deserialize(deserializer)?;
+        ParamType::try_from_type_short(&identifier).map_err(|e| DeError::custom(format!("{e:?}")))
+    }
+}
diff --git a/rust/tw_evm/src/abi/param_type/reader.rs b/rust/tw_evm/src/abi/param_type/reader.rs
new file mode 100644
index 00000000000..da7ee184428
--- /dev/null
+++ b/rust/tw_evm/src/abi/param_type/reader.rs
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::non_empty_array::NonZeroLen;
+use crate::abi::param_type::constructor::TypeConstructor;
+use crate::abi::uint::UintBits;
+use crate::abi::{AbiError, AbiErrorKind, AbiResult};
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+
+pub struct Reader;
+
+impl Reader {
+    /// Doesn't accept tuple types with specified parameters, e.g `(uint32, address)`.
+    pub fn parse_type<T: TypeConstructor>(s: &str) -> AbiResult<T> {
+        // Array
+        if let Some(remaining) = s.strip_suffix(']') {
+            let Some((element_type_str, len_str)) = remaining.rsplit_once('[') else {
+                return AbiError::err(AbiErrorKind::Error_invalid_param_type)
+                    .with_context(|| format!("Invalid array type: {s}"));
+            };
+
+            let element_type = Reader::parse_type::<T>(element_type_str)
+                .with_context(|| format!("Error parsing inner array type: {element_type_str}"))?;
+            if let Some(len) = parse_len(len_str)
+                .with_context(|| format!("Error parsing fixed_array length: {len_str}"))?
+            {
+                return Ok(T::fixed_array_checked(len, element_type));
+            }
+            return Ok(T::array(element_type));
+        }
+
+        let all_alphanumeric = s.chars().all(|ch| ch.is_ascii_alphanumeric());
+        if s.is_empty() || !all_alphanumeric {
+            return AbiError::err(AbiErrorKind::Error_invalid_param_type)
+                .with_context(|| format!("Expected an alpha-numeric string type: {s}"));
+        }
+
+        if s.contains(['[', ']']) {
+            return AbiError::err(AbiErrorKind::Error_invalid_param_type);
+        }
+
+        // uint, uint32, ...
+        if let Some(len_str) = s.strip_prefix("uint") {
+            let bits = parse_uint_bits(len_str)
+                .with_context(|| format!("Error parsing uint bits: {len_str}"))?
+                .unwrap_or_default();
+            return Ok(T::uint_checked(bits));
+        }
+
+        // int, int32, ...
+        if let Some(len_str) = s.strip_prefix("int") {
+            let bits = parse_uint_bits(len_str)
+                .with_context(|| format!("Error parsing int bits: {len_str}"))?
+                .unwrap_or_default();
+            return Ok(T::int_checked(bits));
+        }
+
+        // bytes, bytes32, ...
+        if let Some(len_str) = s.strip_prefix("bytes") {
+            if let Some(len) = parse_len(len_str)
+                .with_context(|| format!("Error parsing fixed_bytes length: {len_str}"))?
+            {
+                // Fixed-len bytes.
+                return Ok(T::fixed_bytes_checked(len));
+            }
+            // Otherwise, dynamic-len bytes.
+            return Ok(T::bytes());
+        }
+
+        // Handle other types.
+        match s {
+            "address" => Ok(T::address()),
+            "bool" => Ok(T::bool()),
+            "string" => Ok(T::string()),
+            "tuple" => T::empty_tuple(),
+            custom => T::custom(custom),
+        }
+    }
+}
+
+fn parse_len(len_str: &str) -> AbiResult<Option<NonZeroLen>> {
+    match parse_usize(len_str)? {
+        Some(u) => {
+            let len = NonZeroLen::new(u)?;
+            Ok(Some(len))
+        },
+        None => Ok(None),
+    }
+}
+
+fn parse_uint_bits(bits_str: &str) -> AbiResult<Option<UintBits>> {
+    match parse_usize(bits_str)? {
+        Some(u) => {
+            let bits = UintBits::new(u)?;
+            Ok(Some(bits))
+        },
+        None => Ok(None),
+    }
+}
+
+fn parse_usize(usize_str: &str) -> AbiResult<Option<usize>> {
+    if usize_str.is_empty() {
+        return Ok(None);
+    }
+    if usize_str.starts_with('0') {
+        return AbiError::err(AbiErrorKind::Error_invalid_param_type)
+            .context("Number cannot start with 0");
+    }
+    usize::from_str(usize_str)
+        .map(Some)
+        .tw_err(|_| AbiErrorKind::Error_invalid_param_type)
+        .with_context(|| format!("Expected a decimal string: {usize_str}"))
+}
diff --git a/rust/tw_evm/src/abi/param_type/writer.rs b/rust/tw_evm/src/abi/param_type/writer.rs
new file mode 100644
index 00000000000..d0ddcf64af4
--- /dev/null
+++ b/rust/tw_evm/src/abi/param_type/writer.rs
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::param_type::ParamType;
+
+/// Output formatter for param type.
+pub struct Writer;
+
+impl Writer {
+    /// Returns string which is a formatted represenation of param.
+    pub fn write(param: &ParamType) -> String {
+        Writer::write_for_abi(param, true)
+    }
+
+    /// If `serialize_tuple_contents` is `true`, tuples will be represented
+    /// as list of inner types in parens, for example `(int256,bool)`.
+    /// If it is `false`, tuples will be represented as keyword `tuple`.
+    pub fn write_for_abi(param: &ParamType, serialize_tuple_contents: bool) -> String {
+        match param {
+            ParamType::Address => "address".to_owned(),
+            ParamType::Bytes => "bytes".to_owned(),
+            ParamType::FixedBytes { len } => format!("bytes{len}"),
+            ParamType::Int { bits } => format!("int{bits}"),
+            ParamType::Uint { bits } => format!("uint{bits}"),
+            ParamType::Bool => "bool".to_owned(),
+            ParamType::String => "string".to_owned(),
+            ParamType::FixedArray { kind, len } => {
+                format!(
+                    "{}[{len}]",
+                    Writer::write_for_abi(kind, serialize_tuple_contents)
+                )
+            },
+            ParamType::Array { ref kind } => {
+                format!(
+                    "{}[]",
+                    Writer::write_for_abi(kind, serialize_tuple_contents)
+                )
+            },
+            ParamType::Tuple { ref params } => {
+                if serialize_tuple_contents {
+                    let formatted = params
+                        .iter()
+                        .map(|t| Writer::write_for_abi(&t.kind, serialize_tuple_contents))
+                        .collect::<Vec<String>>()
+                        .join(",");
+                    format!("({formatted})")
+                } else {
+                    "tuple".to_owned()
+                }
+            },
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::abi::non_empty_array::NonZeroLen;
+    use crate::abi::param::Param;
+    use crate::abi::param_type::constructor::TypeConstructor;
+
+    #[test]
+    fn test_write_param() {
+        assert_eq!(Writer::write(&ParamType::Address), "address");
+        assert_eq!(Writer::write(&ParamType::Bytes), "bytes");
+        assert_eq!(
+            Writer::write(&ParamType::FixedBytes {
+                len: NonZeroLen::new(32).unwrap()
+            }),
+            "bytes32"
+        );
+        assert_eq!(Writer::write(&ParamType::u256()), "uint256");
+        assert_eq!(Writer::write(&ParamType::int(64).unwrap()), "int64");
+        assert_eq!(Writer::write(&ParamType::Bool), "bool");
+        assert_eq!(Writer::write(&ParamType::String), "string");
+        assert_eq!(Writer::write(&ParamType::array(ParamType::Bool)), "bool[]");
+        assert_eq!(
+            Writer::write(&ParamType::fixed_array(2, ParamType::String).unwrap()),
+            "string[2]"
+        );
+        assert_eq!(
+            Writer::write(&ParamType::fixed_array(2, ParamType::array(ParamType::Bool)).unwrap()),
+            "bool[][2]"
+        );
+        assert_eq!(
+            Writer::write(&ParamType::array(ParamType::Tuple {
+                params: vec![
+                    Param::with_type(ParamType::array(ParamType::Tuple {
+                        params: vec![
+                            Param::with_type(ParamType::int(256).unwrap()),
+                            Param::with_type(ParamType::uint(256).unwrap())
+                        ]
+                    })),
+                    Param::with_type(ParamType::fixed_bytes(32).unwrap()),
+                ]
+            })),
+            "((int256,uint256)[],bytes32)[]"
+        );
+
+        assert_eq!(
+            Writer::write_for_abi(
+                &ParamType::array(ParamType::Tuple {
+                    params: vec![
+                        Param::with_type(ParamType::array(ParamType::i256())),
+                        Param::with_type(ParamType::fixed_bytes(32).unwrap()),
+                    ]
+                }),
+                false
+            ),
+            "tuple[]"
+        );
+    }
+}
diff --git a/rust/tw_evm/src/abi/prebuild/erc1155.rs b/rust/tw_evm/src/abi/prebuild/erc1155.rs
new file mode 100644
index 00000000000..f3a9bda65da
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/erc1155.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::contract::Contract;
+use crate::abi::token::Token;
+use crate::abi::AbiResult;
+use crate::address::Address;
+use lazy_static::lazy_static;
+use tw_memory::Data;
+use tw_number::U256;
+
+/// Generated via https://remix.ethereum.org
+/// Solidity: https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.2/contracts/token/ERC1155/IERC1155.sol
+const ERC1155_ABI: &str = include_str!("resource/erc1155.abi.json");
+
+lazy_static! {
+    static ref ERC1155: Contract = serde_json::from_str(ERC1155_ABI).unwrap();
+}
+
+pub struct Erc1155;
+
+impl Erc1155 {
+    pub fn encode_safe_transfer_from(
+        from: Address,
+        to: Address,
+        token_id: U256,
+        value: U256,
+        data: Data,
+    ) -> AbiResult<Data> {
+        let func = ERC1155.function("safeTransferFrom")?;
+        func.encode_input(&[
+            Token::Address(from),
+            Token::Address(to),
+            Token::u256(token_id),
+            Token::u256(value),
+            Token::Bytes(data),
+        ])
+    }
+}
diff --git a/rust/tw_evm/src/abi/prebuild/erc20.rs b/rust/tw_evm/src/abi/prebuild/erc20.rs
new file mode 100644
index 00000000000..55e937e7f83
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/erc20.rs
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::contract::Contract;
+use crate::abi::token::Token;
+use crate::abi::AbiResult;
+use crate::address::Address;
+use lazy_static::lazy_static;
+use tw_memory::Data;
+use tw_number::U256;
+
+/// Generated via https://remix.ethereum.org
+/// https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.2/contracts/token/ERC20/IERC20.sol
+const ERC20_ABI: &str = include_str!("resource/erc20.abi.json");
+
+lazy_static! {
+    static ref ERC20: Contract = serde_json::from_str(ERC20_ABI).unwrap();
+}
+
+pub struct Erc20;
+
+impl Erc20 {
+    pub fn transfer(recipient: Address, amount: U256) -> AbiResult<Data> {
+        let func = ERC20.function("transfer")?;
+        func.encode_input(&[Token::Address(recipient), Token::u256(amount)])
+    }
+
+    pub fn approve(spender: Address, amount: U256) -> AbiResult<Data> {
+        let func = ERC20.function("approve")?;
+        func.encode_input(&[Token::Address(spender), Token::u256(amount)])
+    }
+}
diff --git a/rust/tw_evm/src/abi/prebuild/erc4337.rs b/rust/tw_evm/src/abi/prebuild/erc4337.rs
new file mode 100644
index 00000000000..c6ef8eb76a2
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/erc4337.rs
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::contract::Contract;
+use crate::abi::param_type::ParamType;
+use crate::abi::token::Token;
+use crate::abi::AbiResult;
+use crate::address::Address;
+use lazy_static::lazy_static;
+use tw_memory::Data;
+use tw_number::U256;
+
+/// Generated via https://remix.ethereum.org
+/// https://github.com/eth-infinitism/account-abstraction/blob/develop/contracts/samples/SimpleAccount.sol
+const ERC4337_SIMPLE_ACCOUNT_ABI: &str = include_str!("resource/erc4337.simple_account.abi.json");
+
+lazy_static! {
+    static ref ERC4337_SIMPLE_ACCOUNT: Contract =
+        serde_json::from_str(ERC4337_SIMPLE_ACCOUNT_ABI).unwrap();
+}
+
+pub struct ExecuteArgs {
+    pub to: Address,
+    pub value: U256,
+    pub data: Data,
+}
+
+pub struct Erc4337SimpleAccount;
+
+impl Erc4337SimpleAccount {
+    pub fn encode_execute(args: ExecuteArgs) -> AbiResult<Data> {
+        let func = ERC4337_SIMPLE_ACCOUNT.function("execute")?;
+        func.encode_input(&[
+            Token::Address(args.to),
+            Token::u256(args.value),
+            Token::Bytes(args.data),
+        ])
+    }
+
+    pub fn encode_execute_batch<I>(args: I) -> AbiResult<Data>
+    where
+        I: IntoIterator<Item = ExecuteArgs>,
+    {
+        let func = ERC4337_SIMPLE_ACCOUNT.function("executeBatch")?;
+
+        let args = args.into_iter();
+        let capacity = {
+            let (lower, upper) = args.size_hint();
+            upper.unwrap_or(lower)
+        };
+
+        let mut addresses = Vec::with_capacity(capacity);
+        let mut values = Vec::with_capacity(capacity);
+        let mut datas = Vec::with_capacity(capacity);
+
+        for arg in args {
+            addresses.push(Token::Address(arg.to));
+            values.push(Token::u256(arg.value));
+            datas.push(Token::Bytes(arg.data));
+        }
+
+        func.encode_input(&[
+            Token::array(ParamType::Address, addresses),
+            Token::array(ParamType::u256(), values),
+            Token::array(ParamType::Bytes, datas),
+        ])
+    }
+}
diff --git a/rust/tw_evm/src/abi/prebuild/erc721.rs b/rust/tw_evm/src/abi/prebuild/erc721.rs
new file mode 100644
index 00000000000..2f806921b71
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/erc721.rs
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::contract::Contract;
+use crate::abi::token::Token;
+use crate::abi::AbiResult;
+use crate::address::Address;
+use lazy_static::lazy_static;
+use tw_memory::Data;
+use tw_number::U256;
+
+/// Generated via https://remix.ethereum.org
+/// Solidity: https://github.com/OpenZeppelin/openzeppelin-contracts/blob/v4.9.2/contracts/token/ERC721/IERC721.sol
+const ERC721_ABI: &str = include_str!("resource/erc721.abi.json");
+
+lazy_static! {
+    static ref ERC721: Contract = serde_json::from_str(ERC721_ABI).unwrap();
+}
+
+pub struct Erc721;
+
+impl Erc721 {
+    pub fn encode_transfer_from(from: Address, to: Address, token_id: U256) -> AbiResult<Data> {
+        let func = ERC721.function("transferFrom")?;
+        func.encode_input(&[
+            Token::Address(from),
+            Token::Address(to),
+            Token::u256(token_id),
+        ])
+    }
+}
diff --git a/rust/tw_evm/src/abi/prebuild/mod.rs b/rust/tw_evm/src/abi/prebuild/mod.rs
new file mode 100644
index 00000000000..134b2430973
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/mod.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod erc1155;
+pub mod erc20;
+pub mod erc4337;
+pub mod erc721;
diff --git a/rust/tw_evm/src/abi/prebuild/resource/erc1155.abi.json b/rust/tw_evm/src/abi/prebuild/resource/erc1155.abi.json
new file mode 100644
index 00000000000..db16ea84248
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/resource/erc1155.abi.json
@@ -0,0 +1,295 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
+      }
+    ],
+    "name": "ApprovalForAll",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256[]",
+        "name": "ids",
+        "type": "uint256[]"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256[]",
+        "name": "values",
+        "type": "uint256[]"
+      }
+    ],
+    "name": "TransferBatch",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "TransferSingle",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "string",
+        "name": "value",
+        "type": "string"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      }
+    ],
+    "name": "URI",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address[]",
+        "name": "accounts",
+        "type": "address[]"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "ids",
+        "type": "uint256[]"
+      }
+    ],
+    "name": "balanceOfBatch",
+    "outputs": [
+      {
+        "internalType": "uint256[]",
+        "name": "",
+        "type": "uint256[]"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      }
+    ],
+    "name": "isApprovedForAll",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "ids",
+        "type": "uint256[]"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "values",
+        "type": "uint256[]"
+      },
+      {
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "safeBatchTransferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "id",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
+      }
+    ],
+    "name": "setApprovalForAll",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes4",
+        "name": "interfaceId",
+        "type": "bytes4"
+      }
+    ],
+    "name": "supportsInterface",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_evm/src/abi/prebuild/resource/erc20.abi.json b/rust/tw_evm/src/abi/prebuild/resource/erc20.abi.json
new file mode 100644
index 00000000000..06e0d938333
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/resource/erc20.abi.json
@@ -0,0 +1,185 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      }
+    ],
+    "name": "allowance",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "spender",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "account",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "totalSupply",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "transfer",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_evm/src/abi/prebuild/resource/erc4337.simple_account.abi.json b/rust/tw_evm/src/abi/prebuild/resource/erc4337.simple_account.abi.json
new file mode 100644
index 00000000000..c965a66a789
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/resource/erc4337.simple_account.abi.json
@@ -0,0 +1,529 @@
+[
+  {
+    "inputs": [
+      {
+        "internalType": "contract IEntryPoint",
+        "name": "anEntryPoint",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "constructor"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "previousAdmin",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "address",
+        "name": "newAdmin",
+        "type": "address"
+      }
+    ],
+    "name": "AdminChanged",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "beacon",
+        "type": "address"
+      }
+    ],
+    "name": "BeaconUpgraded",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": false,
+        "internalType": "uint8",
+        "name": "version",
+        "type": "uint8"
+      }
+    ],
+    "name": "Initialized",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "contract IEntryPoint",
+        "name": "entryPoint",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      }
+    ],
+    "name": "SimpleAccountInitialized",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "implementation",
+        "type": "address"
+      }
+    ],
+    "name": "Upgraded",
+    "type": "event"
+  },
+  {
+    "inputs": [],
+    "name": "addDeposit",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "entryPoint",
+    "outputs": [
+      {
+        "internalType": "contract IEntryPoint",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "dest",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "value",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "func",
+        "type": "bytes"
+      }
+    ],
+    "name": "execute",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address[]",
+        "name": "dest",
+        "type": "address[]"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "value",
+        "type": "uint256[]"
+      },
+      {
+        "internalType": "bytes[]",
+        "name": "func",
+        "type": "bytes[]"
+      }
+    ],
+    "name": "executeBatch",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getDeposit",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "getNonce",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "anOwner",
+        "type": "address"
+      }
+    ],
+    "name": "initialize",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "",
+        "type": "uint256[]"
+      },
+      {
+        "internalType": "uint256[]",
+        "name": "",
+        "type": "uint256[]"
+      },
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "name": "onERC1155BatchReceived",
+    "outputs": [
+      {
+        "internalType": "bytes4",
+        "name": "",
+        "type": "bytes4"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      },
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "name": "onERC1155Received",
+    "outputs": [
+      {
+        "internalType": "bytes4",
+        "name": "",
+        "type": "bytes4"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "name": "onERC721Received",
+    "outputs": [
+      {
+        "internalType": "bytes4",
+        "name": "",
+        "type": "bytes4"
+      }
+    ],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "owner",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [],
+    "name": "proxiableUUID",
+    "outputs": [
+      {
+        "internalType": "bytes32",
+        "name": "",
+        "type": "bytes32"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes4",
+        "name": "interfaceId",
+        "type": "bytes4"
+      }
+    ],
+    "name": "supportsInterface",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      },
+      {
+        "internalType": "bytes",
+        "name": "",
+        "type": "bytes"
+      }
+    ],
+    "name": "tokensReceived",
+    "outputs": [],
+    "stateMutability": "pure",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "newImplementation",
+        "type": "address"
+      }
+    ],
+    "name": "upgradeTo",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "newImplementation",
+        "type": "address"
+      },
+      {
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "upgradeToAndCall",
+    "outputs": [],
+    "stateMutability": "payable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "components": [
+          {
+            "internalType": "address",
+            "name": "sender",
+            "type": "address"
+          },
+          {
+            "internalType": "uint256",
+            "name": "nonce",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes",
+            "name": "initCode",
+            "type": "bytes"
+          },
+          {
+            "internalType": "bytes",
+            "name": "callData",
+            "type": "bytes"
+          },
+          {
+            "internalType": "uint256",
+            "name": "callGasLimit",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "verificationGasLimit",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "preVerificationGas",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "maxFeePerGas",
+            "type": "uint256"
+          },
+          {
+            "internalType": "uint256",
+            "name": "maxPriorityFeePerGas",
+            "type": "uint256"
+          },
+          {
+            "internalType": "bytes",
+            "name": "paymasterAndData",
+            "type": "bytes"
+          },
+          {
+            "internalType": "bytes",
+            "name": "signature",
+            "type": "bytes"
+          }
+        ],
+        "internalType": "struct UserOperation",
+        "name": "userOp",
+        "type": "tuple"
+      },
+      {
+        "internalType": "bytes32",
+        "name": "userOpHash",
+        "type": "bytes32"
+      },
+      {
+        "internalType": "uint256",
+        "name": "missingAccountFunds",
+        "type": "uint256"
+      }
+    ],
+    "name": "validateUserOp",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "validationData",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address payable",
+        "name": "withdrawAddress",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "amount",
+        "type": "uint256"
+      }
+    ],
+    "name": "withdrawDepositTo",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "stateMutability": "payable",
+    "type": "receive"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_evm/src/abi/prebuild/resource/erc721.abi.json b/rust/tw_evm/src/abi/prebuild/resource/erc721.abi.json
new file mode 100644
index 00000000000..d0526f5a9d5
--- /dev/null
+++ b/rust/tw_evm/src/abi/prebuild/resource/erc721.abi.json
@@ -0,0 +1,287 @@
+[
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "approved",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "Approval",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "indexed": false,
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
+      }
+    ],
+    "name": "ApprovalForAll",
+    "type": "event"
+  },
+  {
+    "anonymous": false,
+    "inputs": [
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "indexed": true,
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "Transfer",
+    "type": "event"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "approve",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      }
+    ],
+    "name": "balanceOf",
+    "outputs": [
+      {
+        "internalType": "uint256",
+        "name": "balance",
+        "type": "uint256"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "getApproved",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      }
+    ],
+    "name": "isApprovedForAll",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "ownerOf",
+    "outputs": [
+      {
+        "internalType": "address",
+        "name": "owner",
+        "type": "address"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      },
+      {
+        "internalType": "bytes",
+        "name": "data",
+        "type": "bytes"
+      }
+    ],
+    "name": "safeTransferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "operator",
+        "type": "address"
+      },
+      {
+        "internalType": "bool",
+        "name": "approved",
+        "type": "bool"
+      }
+    ],
+    "name": "setApprovalForAll",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "bytes4",
+        "name": "interfaceId",
+        "type": "bytes4"
+      }
+    ],
+    "name": "supportsInterface",
+    "outputs": [
+      {
+        "internalType": "bool",
+        "name": "",
+        "type": "bool"
+      }
+    ],
+    "stateMutability": "view",
+    "type": "function"
+  },
+  {
+    "inputs": [
+      {
+        "internalType": "address",
+        "name": "from",
+        "type": "address"
+      },
+      {
+        "internalType": "address",
+        "name": "to",
+        "type": "address"
+      },
+      {
+        "internalType": "uint256",
+        "name": "tokenId",
+        "type": "uint256"
+      }
+    ],
+    "name": "transferFrom",
+    "outputs": [],
+    "stateMutability": "nonpayable",
+    "type": "function"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_evm/src/abi/signature.rs b/rust/tw_evm/src/abi/signature.rs
new file mode 100644
index 00000000000..d7d3e8d3446
--- /dev/null
+++ b/rust/tw_evm/src/abi/signature.rs
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::param_type::ParamType;
+use tw_hash::sha3::keccak256;
+use tw_hash::{H256, H32};
+
+/// Returns the first four bytes of the Keccak-256 hash of the signature of the given params.
+pub fn short_signature(name: &str, params: &[ParamType]) -> H32 {
+    let mut result = H32::default();
+    fill_signature(name, params, result.as_mut());
+    result
+}
+
+/// Returns the full Keccak-256 hash of the signature of the given params.
+pub fn long_signature(name: &str, params: &[ParamType]) -> H256 {
+    let mut result = H256::default();
+    fill_signature(name, params, result.as_mut());
+    result
+}
+
+fn fill_signature(name: &str, params: &[ParamType], result: &mut [u8]) {
+    let types = params
+        .iter()
+        .map(ParamType::to_type_long)
+        .collect::<Vec<String>>()
+        .join(",");
+
+    let data: Vec<u8> = From::from(format!("{name}({types})").as_str());
+
+    result.copy_from_slice(&keccak256(&data)[..result.len()])
+}
diff --git a/rust/tw_evm/src/abi/token.rs b/rust/tw_evm/src/abi/token.rs
new file mode 100644
index 00000000000..c7e45c621be
--- /dev/null
+++ b/rust/tw_evm/src/abi/token.rs
@@ -0,0 +1,219 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::non_empty_array::{NonEmptyArray, NonEmptyBytes};
+use crate::abi::param_token::NamedToken;
+use crate::abi::param_type::ParamType;
+use crate::abi::uint::UintBits;
+use crate::abi::AbiResult;
+use crate::address::Address;
+use serde::{Serialize, Serializer};
+use std::fmt;
+use tw_encoding::hex::ToHex;
+use tw_memory::Data;
+use tw_number::{I256, U256};
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum Token {
+    /// Address.
+    ///
+    /// solidity name: address
+    /// Encoded to left padded [0u8; 32].
+    Address(Address),
+    /// Vector of bytes with known size.
+    ///
+    /// solidity name eg.: bytes8, bytes32, bytes64, bytes1024
+    /// Encoded to right padded [0u8; ((N + 31) / 32) * 32].
+    FixedBytes(NonEmptyBytes),
+    /// Vector of bytes of unknown size.
+    ///
+    /// solidity name: bytes
+    /// Encoded in two parts.
+    /// Init part: offset of 'closing part`.
+    /// Closing part: encoded length followed by encoded right padded bytes.
+    Bytes(Data),
+    /// Signed integer.
+    ///
+    /// solidity name: int
+    Int { int: I256, bits: UintBits },
+    /// Unsigned integer.
+    ///
+    /// solidity name: uint
+    Uint { uint: U256, bits: UintBits },
+    /// Boolean value.
+    ///
+    /// solidity name: bool
+    /// Encoded as left padded [0u8; 32], where last bit represents boolean value.
+    Bool(bool),
+    /// String.
+    ///
+    /// solidity name: string
+    /// Encoded in the same way as bytes. Must be utf8 compliant.
+    String(String),
+    /// Array with known size.
+    ///
+    /// solidity name eg.: int[3], bool[3], address[][8]
+    /// Encoding of array is equal to encoding of consecutive elements of array.
+    FixedArray {
+        arr: NonEmptyArray<Token>,
+        kind: ParamType,
+    },
+    /// Array of params with unknown size.
+    ///
+    /// solidity name eg. int[], bool[], address[5][]
+    Array { arr: Vec<Token>, kind: ParamType },
+    /// Tuple of params of variable types.
+    ///
+    /// solidity name: tuple
+    Tuple { params: Vec<NamedToken> },
+}
+
+impl fmt::Display for Token {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        /// Formats the given element of a tuple or array.
+        fn format_sequence_token(token: &Token) -> String {
+            // Check if the parameter value should be quoted.
+            match token {
+                Token::Address(_) | Token::FixedBytes(_) | Token::Bytes(_) | Token::String(_) => {
+                    format!(r#""{token}""#)
+                },
+                _ => format!("{token}"),
+            }
+        }
+
+        match self {
+            Token::Address(addr) => write!(f, "{addr}"),
+            Token::Bytes(bytes) => {
+                write!(f, "{}", bytes.to_hex_prefixed())
+            },
+            Token::FixedBytes(bytes) => {
+                write!(f, "{}", bytes.to_hex_prefixed())
+            },
+            Token::Int { int, .. } => write!(f, "{int}"),
+            Token::Uint { uint, .. } => write!(f, "{uint}"),
+            Token::Bool(bool) => write!(f, "{bool}"),
+            Token::String(str) => write!(f, "{str}"),
+            Token::Array { arr, .. } => {
+                let s = arr
+                    .iter()
+                    .map(format_sequence_token)
+                    .collect::<Vec<String>>()
+                    .join(",");
+                write!(f, "[{s}]")
+            },
+            Token::FixedArray { arr, .. } => {
+                let s = arr
+                    .iter()
+                    .map(format_sequence_token)
+                    .collect::<Vec<String>>()
+                    .join(",");
+                write!(f, "[{s}]")
+            },
+            Token::Tuple { params } => {
+                let s = params
+                    .iter()
+                    .map(|param| format_sequence_token(&param.value))
+                    .collect::<Vec<String>>()
+                    .join(",");
+                write!(f, "({s})")
+            },
+        }
+    }
+}
+
+impl Serialize for Token {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        match self {
+            Token::Address(addr) => addr.serialize(serializer),
+            Token::FixedBytes(bytes) => bytes.to_hex_prefixed().serialize(serializer),
+            Token::Bytes(bytes) => bytes.to_hex_prefixed().serialize(serializer),
+            Token::Int { int, .. } => int.as_decimal_str(serializer),
+            Token::Uint { uint, .. } => uint.as_decimal_str(serializer),
+            Token::Bool(bool) => bool.serialize(serializer),
+            Token::String(str) => str.serialize(serializer),
+            Token::FixedArray { arr, .. } => arr.serialize(serializer),
+            Token::Array { arr, .. } => arr.serialize(serializer),
+            Token::Tuple { params } => params.serialize(serializer),
+        }
+    }
+}
+
+impl Token {
+    pub fn u256(uint: U256) -> Token {
+        Token::Uint {
+            bits: UintBits::default(),
+            uint,
+        }
+    }
+
+    pub fn i256(int: I256) -> Token {
+        Token::Int {
+            bits: UintBits::default(),
+            int,
+        }
+    }
+
+    pub fn uint<UInt: Into<U256>>(bits: usize, uint: UInt) -> AbiResult<Token> {
+        let bits = UintBits::new(bits)?;
+        Ok(Token::Uint {
+            uint: uint.into(),
+            bits,
+        })
+    }
+
+    pub fn int<Int: Into<I256>>(bits: usize, int: Int) -> AbiResult<Token> {
+        let bits = UintBits::new(bits)?;
+        Ok(Token::Int {
+            int: int.into(),
+            bits,
+        })
+    }
+
+    pub fn array(element_kind: ParamType, elements: Vec<Token>) -> Token {
+        Token::Array {
+            kind: element_kind,
+            arr: elements,
+        }
+    }
+
+    pub fn type_short(&self) -> String {
+        self.to_param_type().to_type_short()
+    }
+
+    /// Check if the token is a dynamic type resulting in prefixed encoding.
+    pub fn is_dynamic(&self) -> bool {
+        match self {
+            Token::Bytes(_) | Token::String(_) | Token::Array { .. } => true,
+            Token::FixedArray { arr, .. } => arr.iter().any(|token| token.is_dynamic()),
+            Token::Tuple { params } => params.iter().any(|token| token.value.is_dynamic()),
+            _ => false,
+        }
+    }
+
+    pub(crate) fn to_param_type(&self) -> ParamType {
+        match self {
+            Token::Address(_) => ParamType::Address,
+            Token::Bytes(_) => ParamType::Bytes,
+            Token::Int { bits, .. } => ParamType::Int { bits: *bits },
+            Token::Uint { bits, .. } => ParamType::Uint { bits: *bits },
+            Token::Bool(_) => ParamType::Bool,
+            Token::String(_) => ParamType::String,
+            Token::Array { kind, .. } => ParamType::Array {
+                kind: Box::new(kind.clone()),
+            },
+            Token::FixedBytes(bytes) => ParamType::FixedBytes { len: bytes.len() },
+            Token::FixedArray { arr, kind } => ParamType::FixedArray {
+                kind: Box::new(kind.clone()),
+                len: arr.len(),
+            },
+            Token::Tuple { params } => {
+                let params = params.iter().map(|param| param.to_param()).collect();
+                ParamType::Tuple { params }
+            },
+        }
+    }
+}
diff --git a/rust/tw_evm/src/abi/uint.rs b/rust/tw_evm/src/abi/uint.rs
new file mode 100644
index 00000000000..245cd25d466
--- /dev/null
+++ b/rust/tw_evm/src/abi/uint.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::{AbiError, AbiErrorKind, AbiResult};
+use std::fmt;
+use tw_coin_entry::error::prelude::*;
+use tw_number::U256;
+
+#[derive(Clone, Copy, PartialEq)]
+pub struct UintBits(usize);
+
+impl Default for UintBits {
+    fn default() -> Self {
+        UintBits::new(U256::BITS).expect("U256::BITS must be a valid number of bits")
+    }
+}
+
+impl UintBits {
+    pub fn new(bits: usize) -> AbiResult<UintBits> {
+        check_uint_bits(bits)?;
+        Ok(UintBits(bits))
+    }
+
+    pub fn get(&self) -> usize {
+        self.0
+    }
+}
+
+impl fmt::Display for UintBits {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl fmt::Debug for UintBits {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+impl From<UintBits> for usize {
+    fn from(value: UintBits) -> Self {
+        value.0
+    }
+}
+
+// https://docs.soliditylang.org/en/latest/abi-spec.html#types
+pub fn check_uint_bits(bits: usize) -> AbiResult<()> {
+    if bits % 8 != 0 || bits == 0 || bits > 256 {
+        return AbiError::err(AbiErrorKind::Error_invalid_uint_value)
+            .with_context(|| format!("Unexpected Uint bits: {bits}"));
+    }
+    Ok(())
+}
diff --git a/rust/tw_evm/src/address.rs b/rust/tw_evm/src/address.rs
new file mode 100644
index 00000000000..8cff9fb514d
--- /dev/null
+++ b/rust/tw_evm/src/address.rs
@@ -0,0 +1,230 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::de::Error as SerdeError;
+use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt::{Display, Formatter};
+use std::ops::{RangeFrom, RangeInclusive};
+use std::str::FromStr;
+use tw_coin_entry::coin_entry::CoinAddress;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex;
+use tw_hash::{sha3::keccak256, H160, H256};
+use tw_keypair::ecdsa::secp256k1;
+use tw_memory::Data;
+
+pub trait EvmAddress: FromStr<Err = AddressError> + Into<Address> {
+    /// Tries to parse an address from the string representation.
+    /// Returns `Ok(None)` if the given `s` string is empty.
+    #[inline]
+    fn from_str_optional(s: &str) -> AddressResult<Option<Self>> {
+        if s.is_empty() {
+            return Ok(None);
+        }
+
+        Self::from_str(s).map(Some)
+    }
+}
+
+/// Represents an Ethereum address.
+#[derive(Clone, Copy, Debug, Default, PartialEq)]
+pub struct Address {
+    bytes: H160,
+}
+
+/// cbindgen:ignore
+impl Address {
+    pub const LEN: usize = 20;
+
+    /// Initializes an address with a `secp256k1` public key.
+    pub fn with_secp256k1_pubkey(pubkey: &secp256k1::PublicKey) -> Address {
+        /// `keccak256` returns 32 bytes, but Ethereum address is the last 20 bytes of the hash.
+        const ADDRESS_HASH_STARTS_AT: usize = H256::len() - H160::len();
+        const ADDRESS_HASH_RANGE: RangeFrom<usize> = ADDRESS_HASH_STARTS_AT..;
+
+        let pubkey_bytes = pubkey.uncompressed_without_prefix();
+        let hash = keccak256(pubkey_bytes.as_slice());
+        assert_eq!(hash.len(), H256::len());
+
+        let bytes = H160::try_from(&hash[ADDRESS_HASH_RANGE]).expect("Expected 20 byte array");
+
+        Address { bytes }
+    }
+
+    /// Constructs an address from the 20-length byte array.
+    pub fn from_bytes(bytes: H160) -> Address {
+        Address { bytes }
+    }
+
+    /// Displays the address in mixed-case checksum form
+    /// https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md
+    fn into_checksum_address(self) -> String {
+        const UPPER_RANGE_1: RangeInclusive<char> = '8'..='9';
+        const UPPER_RANGE_2: RangeInclusive<char> = 'a'..='f';
+
+        let prefixed = false;
+        let addr_hex = hex::encode(self.bytes, prefixed);
+        let addr_hash = hex::encode(keccak256(addr_hex.as_bytes()), prefixed);
+
+        let payload_chars = addr_hex.chars().zip(addr_hash.chars()).map(|(a, h)| {
+            if a.is_ascii_digit() {
+                a
+            } else if UPPER_RANGE_1.contains(&h) || UPPER_RANGE_2.contains(&h) {
+                a.to_ascii_uppercase()
+            } else {
+                a.to_ascii_lowercase()
+            }
+        });
+
+        "0x".chars().chain(payload_chars).collect()
+    }
+
+    /// Returns bytes of the address.
+    #[inline]
+    pub fn bytes(&self) -> H160 {
+        self.bytes
+    }
+
+    /// Returns bytes as a slice of the address.
+    #[inline]
+    pub fn as_slice(&self) -> &[u8] {
+        self.bytes.as_slice()
+    }
+}
+
+impl CoinAddress for Address {
+    #[inline]
+    fn data(&self) -> Data {
+        self.bytes.to_vec()
+    }
+}
+
+impl FromStr for Address {
+    type Err = AddressError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let addr_hex = s.strip_prefix("0x").ok_or(AddressError::MissingPrefix)?;
+        let addr_hash = H160::from_str(addr_hex).map_err(|_| AddressError::FromHexError)?;
+        Ok(Address { bytes: addr_hash })
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for Address {
+    type Error = AddressError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let bytes = H160::try_from(bytes).map_err(|_| AddressError::InvalidInput)?;
+        Ok(Address { bytes })
+    }
+}
+
+impl EvmAddress for Address {}
+
+/// Implement `str` -> `PrivateKey` conversion for test purposes.
+impl From<&'static str> for Address {
+    #[inline]
+    fn from(addr: &'static str) -> Self {
+        Address::from_str(addr).expect("Expected a valid Ethereum address")
+    }
+}
+
+impl Display for Address {
+    #[inline]
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        write!(f, "{}", self.into_checksum_address())
+    }
+}
+
+impl<'de> Deserialize<'de> for Address {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let s: &str = Deserialize::deserialize(deserializer)?;
+        Address::from_str(s).map_err(|e| SerdeError::custom(format!("{e:?}")))
+    }
+}
+
+impl Serialize for Address {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_str(&self.to_string())
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_keypair::ecdsa::secp256k1::PrivateKey;
+
+    struct Eip55Test {
+        test: &'static str,
+        mixedcase: &'static str,
+    }
+
+    #[test]
+    fn test_to_from_string() {
+        let tests = [
+            Eip55Test {
+                test: "0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed",
+                mixedcase: "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed",
+            },
+            Eip55Test {
+                test: "0x5AAEB6053F3E94C9b9A09f33669435E7Ef1BEAED",
+                mixedcase: "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed",
+            },
+            Eip55Test {
+                test: "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359",
+                mixedcase: "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359",
+            },
+            Eip55Test {
+                test: "0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB",
+                mixedcase: "0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB",
+            },
+            Eip55Test {
+                test: "0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb",
+                mixedcase: "0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb",
+            },
+        ];
+
+        for test in tests {
+            let addr: Address = test.test.parse().unwrap();
+
+            let expected_payload = H160::from(test.test);
+            assert_eq!(addr.bytes, expected_payload);
+
+            let mixed = addr.to_string();
+            assert_eq!(mixed, test.mixedcase);
+        }
+    }
+
+    #[test]
+    fn test_from_string_invalid() {
+        let tests = [
+            "abc",
+            "0xabc",
+            "0xaaeb60f3e94c9b9a09f33669435e7ef1beaed",
+            "fB6916095ca1df60bB79Ce92cE3Ea74c37c5d359",
+        ];
+        for test in tests {
+            Address::from_str(test).unwrap_err();
+        }
+    }
+
+    #[test]
+    fn test_from_public_key() {
+        let private = PrivateKey::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let public = private.public();
+        let addr = Address::with_secp256k1_pubkey(&public);
+        assert_eq!(
+            addr.to_string(),
+            "0xAc1ec44E4f0ca7D172B7803f6836De87Fb72b309"
+        );
+    }
+}
diff --git a/rust/tw_evm/src/evm_context.rs b/rust/tw_evm/src/evm_context.rs
new file mode 100644
index 00000000000..ebd14a8d8e5
--- /dev/null
+++ b/rust/tw_evm/src/evm_context.rs
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::{Address, EvmAddress};
+
+/// EVM compatible chain specific.
+pub trait EvmContext {
+    type Address: EvmAddress;
+}
+
+#[derive(Default)]
+pub struct StandardEvmContext;
+
+impl EvmContext for StandardEvmContext {
+    type Address = Address;
+}
diff --git a/rust/tw_evm/src/evm_entry.rs b/rust/tw_evm/src/evm_entry.rs
new file mode 100644
index 00000000000..70a83a374e9
--- /dev/null
+++ b/rust/tw_evm/src/evm_entry.rs
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::evm_context::EvmContext;
+use crate::modules::abi_encoder::AbiEncoder;
+use crate::modules::rlp_encoder::RlpEncoder;
+use tw_memory::Data;
+use tw_proto::EthereumAbi::Proto as AbiProto;
+use tw_proto::EthereumRlp::Proto as RlpProto;
+use tw_proto::{deserialize, serialize, ProtoResult};
+
+/// An EVM-compatible chain entry.
+pub trait EvmEntry {
+    type Context: EvmContext;
+
+    /// Encodes an item or a list of items as Eth RLP binary format.
+    #[inline]
+    fn encode_rlp(input: RlpProto::EncodingInput<'_>) -> RlpProto::EncodingOutput<'static> {
+        RlpEncoder::<Self::Context>::encode_with_proto(input)
+    }
+
+    /// Decodes function call data to human readable json format, according to input abi json.
+    #[inline]
+    fn decode_abi_contract_call(
+        input: AbiProto::ContractCallDecodingInput<'_>,
+    ) -> AbiProto::ContractCallDecodingOutput<'static> {
+        AbiEncoder::<Self::Context>::decode_contract_call(input)
+    }
+
+    /// Decodes a function input or output data according to a given ABI.
+    #[inline]
+    fn decode_abi_params(
+        input: AbiProto::ParamsDecodingInput<'_>,
+    ) -> AbiProto::ParamsDecodingOutput {
+        AbiEncoder::<Self::Context>::decode_params(input)
+    }
+
+    /// Decodes an Eth ABI value according to a given type.
+    #[inline]
+    fn decode_abi_value(
+        input: AbiProto::ValueDecodingInput<'_>,
+    ) -> AbiProto::ValueDecodingOutput<'static> {
+        AbiEncoder::<Self::Context>::decode_value(input)
+    }
+
+    /// Returns the function type signature, of the form "baz(int32,uint256)".
+    #[inline]
+    fn get_abi_function_signature(input: AbiProto::FunctionGetTypeInput<'_>) -> String {
+        AbiEncoder::<Self::Context>::get_function_signature(input)
+    }
+
+    // Encodes function inputs to Eth ABI binary.
+    #[inline]
+    fn encode_abi_function(
+        input: AbiProto::FunctionEncodingInput<'_>,
+    ) -> AbiProto::FunctionEncodingOutput<'static> {
+        AbiEncoder::<Self::Context>::encode_contract_call(input)
+    }
+}
+
+/// The [`EvmEntry`] trait extension.
+pub trait EvmEntryExt {
+    /// Encodes an item or a list of items as Eth RLP binary format.
+    fn encode_rlp(&self, input: &[u8]) -> ProtoResult<Data>;
+
+    /// Decodes function call data to human readable json format, according to input abi json.
+    fn decode_abi_contract_call(&self, input: &[u8]) -> ProtoResult<Data>;
+
+    /// Decodes a function input or output data according to a given ABI.
+    fn decode_abi_params(&self, input: &[u8]) -> ProtoResult<Data>;
+
+    /// Returns the function type signature, of the form "baz(int32,uint256)".
+    fn get_abi_function_signature(&self, input: &[u8]) -> ProtoResult<String>;
+
+    /// Encodes function inputs to Eth ABI binary.
+    fn encode_abi_function(&self, input: &[u8]) -> ProtoResult<Data>;
+
+    /// Decodes an Eth ABI value according to a given type.
+    fn decode_abi_value(&self, input: &[u8]) -> ProtoResult<Data>;
+}
+
+impl<T> EvmEntryExt for T
+where
+    T: EvmEntry,
+{
+    fn encode_rlp(&self, input: &[u8]) -> ProtoResult<Data> {
+        let input = deserialize(input)?;
+        let output = <Self as EvmEntry>::encode_rlp(input);
+        serialize(&output)
+    }
+
+    fn decode_abi_contract_call(&self, input: &[u8]) -> ProtoResult<Data> {
+        let input = deserialize(input)?;
+        let output = <Self as EvmEntry>::decode_abi_contract_call(input);
+        serialize(&output)
+    }
+
+    fn decode_abi_params(&self, input: &[u8]) -> ProtoResult<Data> {
+        let input = deserialize(input)?;
+        let output = <Self as EvmEntry>::decode_abi_params(input);
+        serialize(&output)
+    }
+
+    fn get_abi_function_signature(&self, input: &[u8]) -> ProtoResult<String> {
+        let input = deserialize(input)?;
+        Ok(<Self as EvmEntry>::get_abi_function_signature(input))
+    }
+
+    fn encode_abi_function(&self, input: &[u8]) -> ProtoResult<Data> {
+        let input = deserialize(input)?;
+        let output = <Self as EvmEntry>::encode_abi_function(input);
+        serialize(&output)
+    }
+
+    fn decode_abi_value(&self, input: &[u8]) -> ProtoResult<Data> {
+        let input = deserialize(input)?;
+        let output = <Self as EvmEntry>::decode_abi_value(input);
+        serialize(&output)
+    }
+}
diff --git a/rust/tw_evm/src/lib.rs b/rust/tw_evm/src/lib.rs
new file mode 100644
index 00000000000..42425782979
--- /dev/null
+++ b/rust/tw_evm/src/lib.rs
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod abi;
+pub mod address;
+pub mod evm_context;
+pub mod evm_entry;
+pub mod message;
+pub mod modules;
+pub mod rlp;
+pub mod signature;
+pub mod transaction;
diff --git a/rust/tw_evm/src/message/eip191.rs b/rust/tw_evm/src/message/eip191.rs
new file mode 100644
index 00000000000..ed532f6cc2e
--- /dev/null
+++ b/rust/tw_evm/src/message/eip191.rs
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::message::{EthMessage, MessageSigningResult};
+use tw_encoding::hex;
+use tw_hash::sha3::keccak256;
+use tw_hash::H256;
+
+/// cbindgen:ignore
+pub const ETHEREUM_PREFIX: u8 = 0x19;
+/// cbindgen:ignore
+pub const ETHEREUM_MESSAGE_PREFIX: &str = "Ethereum Signed Message:\n";
+
+pub struct Eip191Message {
+    user_message: String,
+}
+
+impl Eip191Message {
+    pub fn new<S: Into<String>>(user_message: S) -> Eip191Message {
+        Eip191Message {
+            user_message: user_message.into(),
+        }
+    }
+
+    fn data_to_sign(&self) -> Vec<u8> {
+        let mut data = Vec::with_capacity(self.user_message.len() * 2);
+
+        data.push(ETHEREUM_PREFIX);
+        data.extend_from_slice(ETHEREUM_MESSAGE_PREFIX.as_bytes());
+
+        let mut do_extend = |bytes: &[u8]| {
+            data.extend_from_slice(bytes.len().to_string().as_bytes());
+            data.extend_from_slice(bytes);
+        };
+
+        match hex::decode(&self.user_message) {
+            // Handle the message as hex-encoded.
+            Ok(raw_msg) => do_extend(&raw_msg),
+            // Handle as a regular string.
+            Err(_) => do_extend(self.user_message.as_bytes()),
+        }
+
+        data
+    }
+}
+
+impl EthMessage for Eip191Message {
+    fn hash(&self) -> MessageSigningResult<H256> {
+        let hash = keccak256(&self.data_to_sign());
+        Ok(H256::try_from(hash.as_slice()).expect("Expected 32 byte hash"))
+    }
+}
diff --git a/rust/tw_evm/src/message/eip712/eip712_message.rs b/rust/tw_evm/src/message/eip712/eip712_message.rs
new file mode 100644
index 00000000000..0d26ad22b1b
--- /dev/null
+++ b/rust/tw_evm/src/message/eip712/eip712_message.rs
@@ -0,0 +1,432 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::encode::encode_tokens;
+use crate::abi::non_empty_array::NonEmptyBytes;
+use crate::abi::token::Token;
+use crate::address::Address;
+use crate::message::eip712::message_types::CustomTypes;
+use crate::message::eip712::property::PropertyType;
+use crate::message::{
+    EthMessage, MessageSigningError, MessageSigningErrorKind, MessageSigningResult,
+};
+use itertools::Itertools;
+use serde::{Deserialize, Serialize};
+use serde_json::Value as Json;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::{self, DecodeHex};
+use tw_hash::sha3::keccak256;
+use tw_hash::{H160, H256};
+use tw_memory::Data;
+use tw_number::{I256, U256};
+
+/// EIP-191 compliant.
+/// cbindgen:ignore
+const PREFIX: &[u8; 2] = b"\x19\x01";
+/// cbindgen:ignore
+const EIP712_DOMAIN: &str = "EIP712Domain";
+
+#[derive(Debug, Deserialize, Serialize)]
+pub struct Eip712Message {
+    pub types: CustomTypes,
+    pub domain: Json,
+    #[serde(rename = "primaryType")]
+    pub primary_type: String,
+    pub message: Json,
+}
+
+impl Eip712Message {
+    /// Tries to construct an EIP712 message from the given string.
+    pub fn new<S: AsRef<str>>(message_to_sign: S) -> MessageSigningResult<Eip712Message> {
+        let eip712_msg: Eip712Message = serde_json::from_str(message_to_sign.as_ref())
+            .tw_err(|_| MessageSigningErrorKind::TypeValueMismatch)
+            .context("Error deserializing EIP712 message as JSON")?;
+
+        // Check if the given message is actually EIP712.
+        if !eip712_msg.types.contains_key(EIP712_DOMAIN) {
+            return MessageSigningError::err(MessageSigningErrorKind::TypeValueMismatch)
+                .context("EIP712 message does not contain domain info");
+        }
+        Ok(eip712_msg)
+    }
+
+    pub fn new_checked<S: AsRef<str>>(
+        message_to_sign: S,
+        expected_chain_id: U256,
+    ) -> MessageSigningResult<Eip712Message> {
+        let msg = Eip712Message::new(message_to_sign)?;
+
+        // Check if `domain.chainId` is expected.
+        let chain_id_value = msg.domain["chainId"].clone();
+        let chain_id = U256::from_u64_or_decimal_str(chain_id_value)
+            .tw_err(|_| MessageSigningErrorKind::TypeValueMismatch)
+            .context("Invalid chainId")?;
+        if chain_id != expected_chain_id {
+            return MessageSigningError::err(MessageSigningErrorKind::InvalidChainId).with_context(
+                || format!("Expected '{expected_chain_id}' chainId, found '{chain_id}'"),
+            );
+        }
+
+        Ok(msg)
+    }
+}
+
+impl EthMessage for Eip712Message {
+    fn hash(&self) -> MessageSigningResult<H256> {
+        let domain_hash = encode_data(
+            &self.types,
+            PropertyType::Custom(EIP712_DOMAIN.to_string()),
+            &self.domain,
+        )
+        .context("Error encoding EIP712Domain")?;
+
+        let primary_data_hash = encode_data(
+            &self.types,
+            PropertyType::Custom(self.primary_type.clone()),
+            &self.message,
+        )
+        .context("Error encoding primary type")?;
+
+        let concat = [
+            PREFIX.as_slice(),
+            domain_hash.as_slice(),
+            primary_data_hash.as_slice(),
+        ]
+        .concat();
+
+        let hash_data = keccak256(&concat);
+        Ok(H256::try_from(hash_data.as_slice()).expect("Expected 32-byte hash"))
+    }
+}
+
+fn encode_data(
+    custom_types: &CustomTypes,
+    data_type: PropertyType,
+    data: &Json,
+) -> MessageSigningResult<Vec<u8>> {
+    match data_type {
+        PropertyType::Bool => encode_bool(data).context("Error encoding 'bool' parameter"),
+        PropertyType::String => encode_string(data).context("Error encoding 'string' parameter"),
+        PropertyType::Int => encode_i256(data).context("Error encoding 'i256' parameter"),
+        PropertyType::Uint => encode_u256(data).context("Error encoding 'u256' parameter"),
+        PropertyType::Address => encode_address(data).context("Error encoding 'address' parameter"),
+        PropertyType::FixBytes { len } => {
+            encode_fix_bytes(data, len.get()).context("Error encoding 'bytes[N]' parameter")
+        },
+        PropertyType::Bytes => encode_bytes(data).context("Error encoding 'bytes' parameter"),
+        PropertyType::Custom(custom) => encode_custom(custom_types, &custom, data)
+            .with_context(|| format!("Error encoding '{custom}' custom parameter")),
+        PropertyType::Array(element_type) => encode_array(custom_types, *element_type, data, None)
+            .context("Error encoding 'array' parameter"),
+        PropertyType::FixArray { len, element_type } => {
+            encode_array(custom_types, *element_type, data, Some(len.get()))
+                .context("Error encoding 'array[N]' parameter")
+        },
+    }
+}
+
+fn encode_bool(value: &Json) -> MessageSigningResult<Data> {
+    let bin = value
+        .as_bool()
+        .or_tw_err(MessageSigningErrorKind::InvalidParameterValue)?;
+    Ok(encode_tokens(&[Token::Bool(bin)]))
+}
+
+fn encode_string(value: &Json) -> MessageSigningResult<Data> {
+    let string = value
+        .as_str()
+        .or_tw_err(MessageSigningErrorKind::InvalidParameterValue)?;
+    let hash = keccak256(string.as_bytes());
+    let checked_bytes = NonEmptyBytes::new(hash).expect("`hash` must not be empty");
+    Ok(encode_tokens(&[Token::FixedBytes(checked_bytes)]))
+}
+
+fn encode_u256(value: &Json) -> MessageSigningResult<Data> {
+    let uint = U256::from_u64_or_decimal_str(value.clone())
+        .tw_err(|_| MessageSigningErrorKind::InvalidParameterValue)?;
+    Ok(encode_tokens(&[Token::u256(uint)]))
+}
+
+fn encode_i256(value: &Json) -> MessageSigningResult<Data> {
+    let int = I256::from_i64_or_decimal_str(value.clone())
+        .tw_err(|_| MessageSigningErrorKind::InvalidParameterValue)?;
+    Ok(encode_tokens(&[Token::i256(int)]))
+}
+
+fn encode_address(value: &Json) -> MessageSigningResult<Data> {
+    let addr_str = value
+        .as_str()
+        .or_tw_err(MessageSigningErrorKind::InvalidParameterValue)?;
+    // H160 doesn't require the string to be `0x` prefixed.
+    let addr_data =
+        H160::from_str(addr_str).tw_err(|_| MessageSigningErrorKind::InvalidParameterValue)?;
+
+    let addr = Address::from_bytes(addr_data);
+    Ok(encode_tokens(&[Token::Address(addr)]))
+}
+
+fn encode_fix_bytes(value: &Json, expected_len: usize) -> MessageSigningResult<Data> {
+    let str = value
+        .as_str()
+        .or_tw_err(MessageSigningErrorKind::InvalidParameterValue)?;
+    let fix_bytes =
+        hex::decode_lenient(str).tw_err(|_| MessageSigningErrorKind::InvalidParameterValue)?;
+
+    let actual_len = fix_bytes.len();
+    if actual_len > expected_len {
+        return MessageSigningError::err(MessageSigningErrorKind::TypeValueMismatch)
+            .with_context(|| format!("Expected '{expected_len}' bytes, found '{actual_len}'"));
+    }
+    let checked_bytes = NonEmptyBytes::new(fix_bytes)
+        .tw_err(|_| MessageSigningErrorKind::InvalidParameterValue)
+        .context("Empty 'FixBytes' is not allowed")?;
+    Ok(encode_tokens(&[Token::FixedBytes(checked_bytes)]))
+}
+
+fn encode_bytes(value: &Json) -> MessageSigningResult<Data> {
+    let str = value
+        .as_str()
+        .or_tw_err(MessageSigningErrorKind::InvalidParameterValue)?;
+    let bytes = str
+        .decode_hex()
+        .tw_err(|_| MessageSigningErrorKind::InvalidParameterValue)?;
+
+    let hash = keccak256(&bytes);
+    let checked_bytes = NonEmptyBytes::new(hash).expect("`hash` must not be empty");
+    Ok(encode_tokens(&[Token::FixedBytes(checked_bytes)]))
+}
+
+fn encode_array(
+    custom_types: &CustomTypes,
+    element_type: PropertyType,
+    data: &Json,
+    expected_len: Option<usize>,
+) -> MessageSigningResult<Data> {
+    let elements = data
+        .as_array()
+        .or_tw_err(MessageSigningErrorKind::InvalidParameterValue)?;
+
+    // Check if the type definition actually matches the length of items to be encoded.
+    let actual_elements = elements.len();
+    if expected_len.is_some() && Some(actual_elements) != expected_len {
+        return MessageSigningError::err(MessageSigningErrorKind::TypeValueMismatch).with_context(
+            || format!("Expected '{expected_len:?}' array elements, found '{actual_elements}'"),
+        );
+    }
+
+    let mut encoded_items = vec![];
+    for (item_idx, item) in elements.iter().enumerate() {
+        let mut encoded = encode_data(custom_types, element_type.clone(), item)
+            .with_context(|| format!("Error encoding '{item_idx}' array element"))?;
+        encoded_items.append(&mut encoded);
+    }
+
+    Ok(keccak256(&encoded_items))
+}
+
+fn encode_custom(
+    custom_types: &CustomTypes,
+    data_ident: &str,
+    data: &Json,
+) -> MessageSigningResult<Data> {
+    let data_properties = custom_types
+        .get(data_ident)
+        .or_tw_err(MessageSigningErrorKind::TypeValueMismatch)
+        .with_context(|| format!("'{data_ident}' custom type is not specified"))?;
+
+    let type_hash = encode_custom_type::type_hash(data_ident, custom_types)?;
+    let checked_bytes =
+        NonEmptyBytes::new(type_hash).tw_err(|_| MessageSigningErrorKind::InvalidParameterValue)?;
+    let mut encoded_tokens = encode_tokens(&[Token::FixedBytes(checked_bytes)]);
+
+    for (field_idx, field) in data_properties.iter().enumerate() {
+        let field_value = &data[&field.name];
+        let field_property = PropertyType::from_str(&field.property_type)
+            .with_context(|| format!("Error encoding '{field_idx}' field"))?;
+        let mut encoded = encode_data(custom_types, field_property, field_value)?;
+        encoded_tokens.append(&mut encoded);
+    }
+
+    Ok(keccak256(&encoded_tokens))
+}
+
+mod encode_custom_type {
+    use super::*;
+    use std::collections::HashSet;
+
+    pub(super) fn type_hash(
+        data_type: &str,
+        custom_types: &CustomTypes,
+    ) -> MessageSigningResult<Data> {
+        let encoded_type = encode_type(custom_types, data_type)?;
+        Ok(keccak256(encoded_type.as_bytes()))
+    }
+
+    pub(super) fn encode_type(
+        custom_types: &CustomTypes,
+        data_type: &str,
+    ) -> MessageSigningResult<String> {
+        let deps = {
+            let mut temp = build_dependencies(data_type, custom_types)
+                .or_tw_err(MessageSigningErrorKind::TypeValueMismatch)
+                .with_context(|| {
+                    format!("Error building '{data_type}' custom type dependencies")
+                })?;
+            temp.remove(data_type);
+            let mut temp = temp.into_iter().collect::<Vec<_>>();
+            temp.sort_unstable();
+            temp.insert(0, data_type);
+            temp
+        };
+
+        let encoded = deps
+            .into_iter()
+            .filter_map(|dep| {
+                custom_types.get(dep).map(|field_types| {
+                    let types = field_types
+                        .iter()
+                        .map(|value| format!("{} {}", value.property_type, value.name))
+                        .join(",");
+                    format!("{}({})", dep, types)
+                })
+            })
+            .collect::<Vec<_>>()
+            .concat();
+        Ok(encoded)
+    }
+
+    /// Given a type and the set of custom types.
+    /// Returns a `HashSet` of dependent types of the given type.
+    pub(super) fn build_dependencies<'a>(
+        data_type: &'a str,
+        custom_types: &'a CustomTypes,
+    ) -> Option<HashSet<&'a str>> {
+        custom_types.get(data_type)?;
+
+        let mut types_stack = Vec::new();
+        types_stack.push(data_type);
+        let mut deps = HashSet::new();
+
+        while let Some(item) = types_stack.pop() {
+            if let Some(fields) = custom_types.get(item) {
+                deps.insert(item);
+
+                for field in fields.iter() {
+                    // check if this field is an array type
+                    let field_type = if let Some(index) = field.property_type.find('[') {
+                        &field.property_type[..index]
+                    } else {
+                        &field.property_type
+                    };
+                    // Seen this type before? or not a custom type - skip
+                    if !deps.contains(field_type) || custom_types.contains_key(field_type) {
+                        types_stack.push(field_type);
+                    }
+                }
+            }
+        }
+
+        Some(deps)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::collections::HashSet;
+    use tw_encoding::hex::ToHex;
+
+    #[test]
+    fn test_build_dependencies() {
+        let custom_types = r#"{
+			"EIP712Domain": [
+				{ "name": "name", "type": "string" },
+				{ "name": "version", "type": "string" },
+				{ "name": "chainId", "type": "uint256" },
+				{ "name": "verifyingContract", "type": "address" }
+			],
+			"Person": [
+				{ "name": "name", "type": "string" },
+				{ "name": "wallet", "type": "address" }
+			],
+			"Mail": [
+				{ "name": "from", "type": "Person" },
+				{ "name": "to", "type": "Person" },
+				{ "name": "contents", "type": "string" }
+			]
+		}"#;
+
+        let custom_types: CustomTypes = serde_json::from_str(custom_types).unwrap();
+
+        let mail = "Mail";
+        let person = "Person";
+
+        let expected = {
+            let mut temp = HashSet::new();
+            temp.insert(mail);
+            temp.insert(person);
+            temp
+        };
+        assert_eq!(
+            encode_custom_type::build_dependencies(mail, &custom_types),
+            Some(expected)
+        );
+    }
+
+    #[test]
+    fn test_encode_type() {
+        let custom_types = r#"{
+			"EIP712Domain": [
+				{ "name": "name", "type": "string" },
+				{ "name": "version", "type": "string" },
+				{ "name": "chainId", "type": "uint256" },
+				{ "name": "verifyingContract", "type": "address" }
+			],
+			"Person": [
+				{ "name": "name", "type": "string" },
+				{ "name": "wallet", "type": "address" }
+			],
+			"Mail": [
+				{ "name": "from", "type": "Person" },
+				{ "name": "to", "type": "Person" },
+				{ "name": "contents", "type": "string" }
+			]
+		}"#;
+
+        let custom_types: CustomTypes = serde_json::from_str(custom_types).expect("alas error!");
+        assert_eq!(
+            "Mail(Person from,Person to,string contents)Person(string name,address wallet)",
+            encode_custom_type::encode_type(&custom_types, "Mail").expect("alas error!")
+        )
+    }
+
+    #[test]
+    fn test_encode_type_hash() {
+        let custom_types = r#"{
+			"EIP712Domain": [
+				{ "name": "name", "type": "string" },
+				{ "name": "version", "type": "string" },
+				{ "name": "chainId", "type": "uint256" },
+				{ "name": "verifyingContract", "type": "address" }
+			],
+			"Person": [
+				{ "name": "name", "type": "string" },
+				{ "name": "wallet", "type": "address" }
+			],
+			"Mail": [
+				{ "name": "from", "type": "Person" },
+				{ "name": "to", "type": "Person" },
+				{ "name": "contents", "type": "string" }
+			]
+		}"#;
+
+        let custom_types = serde_json::from_str::<CustomTypes>(custom_types).expect("alas error!");
+        let hash = encode_custom_type::type_hash("Mail", &custom_types).expect("alas error!");
+        assert_eq!(
+            hash.to_hex(),
+            "a0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2"
+        );
+    }
+}
diff --git a/rust/tw_evm/src/message/eip712/message_types.rs b/rust/tw_evm/src/message/eip712/message_types.rs
new file mode 100644
index 00000000000..4a0d8f0aeae
--- /dev/null
+++ b/rust/tw_evm/src/message/eip712/message_types.rs
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::message::eip712::property::{Property, PropertyType};
+use std::collections::hash_map::Entry;
+use std::collections::HashMap;
+
+pub type CustomTypes = HashMap<String, Vec<Property>>;
+
+pub trait DeclareCustomType {
+    /// A custom type may also depend on other custom types.
+    fn declare_custom_type(&self, builder: &mut MessageTypesBuilder);
+}
+
+#[derive(Default)]
+pub struct MessageTypesBuilder {
+    types: CustomTypes,
+}
+
+impl MessageTypesBuilder {
+    pub fn add_custom_type(&mut self, type_name: String) -> Option<CustomTypeBuilder> {
+        match self.types.entry(type_name) {
+            Entry::Vacant(entry) => {
+                let type_properties = entry.insert(Vec::default());
+                Some(CustomTypeBuilder { type_properties })
+            },
+            Entry::Occupied(_) => None,
+        }
+    }
+
+    pub fn build(self) -> CustomTypes {
+        self.types
+    }
+}
+
+pub struct CustomTypeBuilder<'a> {
+    type_properties: &'a mut Vec<Property>,
+}
+
+impl<'a> CustomTypeBuilder<'a> {
+    pub fn add_property(&mut self, name: &str, property_type: PropertyType) -> &mut Self {
+        self.type_properties.push(Property {
+            name: name.to_string(),
+            property_type: property_type.to_string(),
+        });
+        self
+    }
+
+    pub fn sort_by_names(&mut self) {
+        self.type_properties.sort_by(|x, y| x.name.cmp(&y.name));
+    }
+}
diff --git a/rust/tw_evm/src/message/eip712/mod.rs b/rust/tw_evm/src/message/eip712/mod.rs
new file mode 100644
index 00000000000..6da281e9169
--- /dev/null
+++ b/rust/tw_evm/src/message/eip712/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod eip712_message;
+pub mod message_types;
+pub mod property;
diff --git a/rust/tw_evm/src/message/eip712/property.rs b/rust/tw_evm/src/message/eip712/property.rs
new file mode 100644
index 00000000000..fa9dfae8dae
--- /dev/null
+++ b/rust/tw_evm/src/message/eip712/property.rs
@@ -0,0 +1,214 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::non_empty_array::NonZeroLen;
+use crate::abi::param_type::constructor::TypeConstructor;
+use crate::abi::param_type::reader::Reader;
+use crate::abi::uint::UintBits;
+use crate::abi::{AbiError, AbiErrorKind, AbiResult};
+use crate::message::{MessageSigningError, MessageSigningErrorKind};
+use serde::{Deserialize, Serialize};
+use std::fmt;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct Property {
+    pub name: String,
+    #[serde(rename = "type")]
+    pub property_type: String,
+}
+
+#[derive(Clone, Debug, PartialEq)]
+pub enum PropertyType {
+    Bool,
+    String,
+    Int,
+    Uint,
+    Address,
+    FixBytes {
+        len: NonZeroLen,
+    },
+    Bytes,
+    Custom(String),
+    Array(Box<PropertyType>),
+    FixArray {
+        len: NonZeroLen,
+        element_type: Box<PropertyType>,
+    },
+}
+
+impl TypeConstructor for PropertyType {
+    fn address() -> Self {
+        PropertyType::Address
+    }
+
+    fn bytes() -> Self {
+        PropertyType::Bytes
+    }
+
+    fn fixed_bytes_checked(len: NonZeroLen) -> Self {
+        PropertyType::FixBytes { len }
+    }
+
+    fn int_checked(_bits: UintBits) -> Self {
+        PropertyType::Int
+    }
+
+    fn uint_checked(_bits: UintBits) -> Self {
+        PropertyType::Uint
+    }
+
+    fn bool() -> Self {
+        PropertyType::Bool
+    }
+
+    fn string() -> Self {
+        PropertyType::String
+    }
+
+    fn array(element_type: Self) -> Self {
+        PropertyType::Array(Box::new(element_type))
+    }
+
+    fn fixed_array_checked(len: NonZeroLen, element_type: Self) -> Self {
+        PropertyType::FixArray {
+            len,
+            element_type: Box::new(element_type),
+        }
+    }
+
+    fn empty_tuple() -> AbiResult<Self> {
+        AbiError::err(AbiErrorKind::Error_invalid_param_type)
+            .context("`PropertyType` doesn't support tuples")
+    }
+
+    fn custom(s: &str) -> AbiResult<Self> {
+        Ok(PropertyType::Custom(s.to_string()))
+    }
+}
+
+impl fmt::Display for PropertyType {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            PropertyType::Bool => write!(f, "bool"),
+            PropertyType::String => write!(f, "string"),
+            PropertyType::Int => write!(f, "int256"),
+            PropertyType::Uint => write!(f, "uint256"),
+            PropertyType::Address => write!(f, "address"),
+            PropertyType::FixBytes { len } => write!(f, "bytes{len}"),
+            PropertyType::Bytes => write!(f, "bytes"),
+            PropertyType::Custom(custom) => write!(f, "{custom}"),
+            PropertyType::Array(element_type) => {
+                write!(f, "{element_type}[]")
+            },
+            PropertyType::FixArray { len, element_type } => {
+                write!(f, "{element_type}[{len}]")
+            },
+        }
+    }
+}
+
+impl FromStr for PropertyType {
+    type Err = MessageSigningError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        Reader::parse_type(s).tw_err(|_| MessageSigningErrorKind::InvalidParameterType)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_parse_int() {
+        let ints = ["int", "int8", "int256"];
+        for int in ints {
+            assert_eq!(PropertyType::from_str(int).unwrap(), PropertyType::Int);
+        }
+    }
+
+    #[test]
+    fn test_parse_uint() {
+        let ints = ["uint", "uint8", "uint256"];
+        for int in ints {
+            assert_eq!(PropertyType::from_str(int).unwrap(), PropertyType::Uint);
+        }
+    }
+
+    #[test]
+    fn test_parse_bytes() {
+        assert_eq!(
+            PropertyType::from_str("bytes").unwrap(),
+            PropertyType::Bytes
+        );
+        assert_eq!(
+            PropertyType::from_str("bytes8").unwrap(),
+            PropertyType::FixBytes {
+                len: NonZeroLen::new(8).unwrap()
+            }
+        );
+        assert_eq!(
+            PropertyType::from_str("bytes31").unwrap(),
+            PropertyType::FixBytes {
+                len: NonZeroLen::new(31).unwrap()
+            }
+        );
+    }
+
+    #[test]
+    fn test_parse_types() {
+        assert_eq!(PropertyType::from_str("bool").unwrap(), PropertyType::Bool);
+        assert_eq!(
+            PropertyType::from_str("string").unwrap(),
+            PropertyType::String
+        );
+        assert_eq!(
+            PropertyType::from_str("address").unwrap(),
+            PropertyType::Address
+        );
+        assert_eq!(
+            PropertyType::from_str("Unknown").unwrap(),
+            PropertyType::Custom("Unknown".to_string())
+        );
+    }
+
+    #[test]
+    fn test_parse_nested_arrays() {
+        fn array(kind: PropertyType) -> PropertyType {
+            PropertyType::Array(Box::new(kind))
+        }
+
+        fn fix_array<const N: usize>(kind: PropertyType) -> PropertyType {
+            PropertyType::FixArray {
+                len: NonZeroLen::new(N).unwrap(),
+                element_type: Box::new(kind),
+            }
+        }
+
+        let source = "bytes[][][7][]";
+        let actual = PropertyType::from_str(source).unwrap();
+        let expected = array(fix_array::<7>(array(array(PropertyType::Bytes))));
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_malformed_array_type() {
+        let inputs = [
+            "string[[]][]",
+            "string[7[]][]",
+            "string[7[]uint][]",
+            "string][",
+            "[]string",
+            "[string]",
+            "[]",
+            "string[]uint",
+        ];
+
+        for input in inputs {
+            assert_eq!(PropertyType::from_str(input).is_err(), true, "{}", input);
+        }
+    }
+}
diff --git a/rust/tw_evm/src/message/mod.rs b/rust/tw_evm/src/message/mod.rs
new file mode 100644
index 00000000000..44b27d428ab
--- /dev/null
+++ b/rust/tw_evm/src/message/mod.rs
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H256;
+
+pub mod eip191;
+pub mod eip712;
+pub mod signature;
+
+pub type EthMessageBoxed = Box<dyn EthMessage>;
+pub type MessageSigningResult<T> = Result<T, MessageSigningError>;
+pub type MessageSigningError = TWError<MessageSigningErrorKind>;
+
+#[derive(Debug)]
+pub enum MessageSigningErrorKind {
+    InvalidParameterType,
+    InvalidParameterValue,
+    TypeValueMismatch,
+    InvalidChainId,
+    Internal,
+}
+
+pub fn to_signing(msg_err: MessageSigningError) -> SigningError {
+    match msg_err.error_type() {
+        MessageSigningErrorKind::InvalidParameterType
+        | MessageSigningErrorKind::InvalidParameterValue
+        | MessageSigningErrorKind::TypeValueMismatch
+        | MessageSigningErrorKind::InvalidChainId => {
+            SigningError::new(SigningErrorType::Error_invalid_params)
+        },
+        MessageSigningErrorKind::Internal => SigningError::new(SigningErrorType::Error_internal),
+    }
+}
+
+pub trait EthMessage {
+    fn into_boxed(self) -> EthMessageBoxed
+    where
+        Self: 'static + Sized,
+    {
+        Box::new(self)
+    }
+
+    /// Returns hash of the message.
+    fn hash(&self) -> MessageSigningResult<H256>;
+}
diff --git a/rust/tw_evm/src/message/signature.rs b/rust/tw_evm/src/message/signature.rs
new file mode 100644
index 00000000000..8d3f7c81506
--- /dev/null
+++ b/rust/tw_evm/src/message/signature.rs
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::signature::{
+    eip155_replay_protection, legacy_replay_protection, remove_replay_protection,
+};
+use std::str::FromStr;
+use tw_encoding::hex::DecodeHex;
+use tw_hash::{H256, H520};
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::{KeyPairError, KeyPairResult};
+use tw_number::U256;
+
+pub enum SignatureType {
+    Standard,
+    Legacy,
+    Eip155 { chain_id: U256 },
+}
+
+#[derive(Clone)]
+pub struct MessageSignature {
+    r: H256,
+    s: H256,
+    v: u8,
+}
+
+impl MessageSignature {
+    /// The length of the binary representation.
+    /// cbindgen:ignore
+    pub const LEN: usize = secp256k1::Signature::LEN;
+
+    pub fn prepared(sign: secp256k1::Signature, sign_type: SignatureType) -> KeyPairResult<Self> {
+        let v = match sign_type {
+            SignatureType::Standard => U256::from(sign.v()),
+            SignatureType::Legacy => {
+                legacy_replay_protection(sign.v()).map_err(|_| KeyPairError::InvalidSignature)?
+            },
+            SignatureType::Eip155 { chain_id } => eip155_replay_protection(chain_id, sign.v())
+                .map_err(|_| KeyPairError::InvalidSignature)?,
+        };
+        Ok(MessageSignature {
+            r: sign.r(),
+            s: sign.s(),
+            v: v.low_u8(),
+        })
+    }
+
+    pub fn to_bytes(&self) -> H520 {
+        let mut bytes = Vec::with_capacity(H520::LEN);
+        bytes.extend_from_slice(self.r.as_slice());
+        bytes.extend_from_slice(self.s.as_slice());
+        bytes.push(self.v);
+
+        H520::try_from(bytes.as_slice()).expect("'bytes' is 130 byte array")
+    }
+
+    pub fn to_secp256k1_signature(&self) -> KeyPairResult<secp256k1::Signature> {
+        let v = remove_replay_protection(self.v);
+        secp256k1::Signature::try_from_parts(self.r, self.s, v)
+    }
+}
+
+impl FromStr for MessageSignature {
+    type Err = KeyPairError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let bytes = s.decode_hex().map_err(|_| KeyPairError::InvalidSignature)?;
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for MessageSignature {
+    type Error = KeyPairError;
+
+    fn try_from(data: &'a [u8]) -> Result<Self, Self::Error> {
+        if data.len() != Self::LEN {
+            return Err(KeyPairError::InvalidSignature);
+        }
+
+        let r = H256::try_from(&data[secp256k1::Signature::R_RANGE])
+            .expect("Expected 'r' 32 byte length array");
+        let s = H256::try_from(&data[secp256k1::Signature::S_RANGE])
+            .expect("Expected 's' 32 byte length array");
+        let v = data[secp256k1::Signature::RECOVERY_LAST];
+        Ok(MessageSignature { r, s, v })
+    }
+}
diff --git a/rust/tw_evm/src/modules/abi_encoder.rs b/rust/tw_evm/src/modules/abi_encoder.rs
new file mode 100644
index 00000000000..4849bf6a735
--- /dev/null
+++ b/rust/tw_evm/src/modules/abi_encoder.rs
@@ -0,0 +1,500 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::decode::{decode_params, decode_value};
+use crate::abi::function::Function;
+use crate::abi::param::Param;
+use crate::abi::param_token::NamedToken;
+use crate::abi::param_type::ParamType;
+use crate::abi::token::Token;
+use crate::abi::{AbiError, AbiErrorKind, AbiResult};
+use crate::abi_output_error;
+use crate::address::Address;
+use crate::evm_context::EvmContext;
+use serde::Deserialize;
+use serde::Serialize;
+use std::borrow::Cow;
+use std::collections::HashMap;
+use std::marker::PhantomData;
+use std::str::FromStr;
+use tw_encoding::hex::as_hex;
+use tw_hash::H32;
+use tw_misc::traits::ToBytesVec;
+use tw_number::{I256, U256};
+use tw_proto::EthereumAbi::Proto;
+
+use crate::abi::non_empty_array::{NonEmptyArray, NonEmptyBytes, NonZeroLen};
+use crate::abi::uint::UintBits;
+use tw_coin_entry::error::prelude::*;
+use Proto::mod_ParamType::OneOfparam as ProtoParamType;
+use Proto::mod_ParamsDecodingInput::OneOfabi as AbiEnum;
+use Proto::mod_Token::OneOftoken as TokenEnum;
+
+pub struct AbiEncoder<Context: EvmContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: EvmContext> AbiEncoder<Context> {
+    #[inline]
+    pub fn decode_contract_call(
+        input: Proto::ContractCallDecodingInput,
+    ) -> Proto::ContractCallDecodingOutput<'static> {
+        Self::decode_contract_call_impl(input)
+            .unwrap_or_else(|err| abi_output_error!(Proto::ContractCallDecodingOutput, err))
+    }
+
+    #[inline]
+    pub fn decode_params(
+        input: Proto::ParamsDecodingInput<'_>,
+    ) -> Proto::ParamsDecodingOutput<'static> {
+        Self::decode_params_impl(input)
+            .unwrap_or_else(|err| abi_output_error!(Proto::ParamsDecodingOutput, err))
+    }
+
+    #[inline]
+    pub fn decode_value(
+        input: Proto::ValueDecodingInput<'_>,
+    ) -> Proto::ValueDecodingOutput<'static> {
+        Self::decode_value_impl(input)
+            .unwrap_or_else(|err| abi_output_error!(Proto::ValueDecodingOutput, err))
+    }
+
+    #[inline]
+    pub fn get_function_signature(input: Proto::FunctionGetTypeInput<'_>) -> String {
+        Self::get_function_signature_impl(input)
+    }
+
+    #[inline]
+    pub fn encode_contract_call(
+        input: Proto::FunctionEncodingInput<'_>,
+    ) -> Proto::FunctionEncodingOutput<'static> {
+        Self::encode_contract_call_impl(input)
+            .unwrap_or_else(|err| abi_output_error!(Proto::FunctionEncodingOutput, err))
+    }
+
+    fn decode_contract_call_impl(
+        input: Proto::ContractCallDecodingInput,
+    ) -> AbiResult<Proto::ContractCallDecodingOutput<'static>> {
+        if input.encoded.len() < H32::len() {
+            return AbiError::err(AbiErrorKind::Error_decoding_data)
+                .context("Encoded Contract Call bytes too short");
+        }
+        let short_signature = &input.encoded[0..H32::len()];
+        let short_signature =
+            H32::try_from(short_signature).expect("The length expected to be checked above");
+        let encoded_data = &input.encoded[H32::len()..];
+
+        let mut abi_json: SmartContractCallAbiJson =
+            serde_json::from_str(&input.smart_contract_abi_json)
+                .tw_err(|_| AbiErrorKind::Error_invalid_abi)
+                .context("Error deserializing Smart Contract ABI as JSON")?;
+
+        let function = abi_json
+            .map
+            .get_mut(&ContractCallSignature(short_signature))
+            .or_tw_err(AbiErrorKind::Error_abi_mismatch)
+            .with_context(|| {
+                format!(
+                    "Contract Call ABI does not have a function with {short_signature} signature"
+                )
+            })?;
+
+        let decoded_tokens = function.decode_input(encoded_data)?;
+
+        // Clear the `outputs` to avoid adding them to the signature.
+        // This is a requirement that comes from legacy ABI implementation.
+        function.outputs.clear();
+        let function_signature = function.signature();
+
+        // Serialize the `decoded_json` result.
+        let decoded_res = SmartContractCallDecodedInputJson {
+            function: function_signature,
+            inputs: &decoded_tokens,
+        };
+        let decoded_json = serde_json::to_string(&decoded_res)
+            .tw_err(|_| AbiErrorKind::Error_internal)
+            .context("Error serializing Smart Contract Input as JSON")?;
+
+        // Serialize the Proto parameters.
+        let decoded_protos = decoded_tokens
+            .into_iter()
+            .map(Self::named_token_to_proto)
+            .collect();
+
+        Ok(Proto::ContractCallDecodingOutput {
+            decoded_json: Cow::Owned(decoded_json),
+            tokens: decoded_protos,
+            ..Proto::ContractCallDecodingOutput::default()
+        })
+    }
+
+    fn decode_params_impl(
+        input: Proto::ParamsDecodingInput<'_>,
+    ) -> AbiResult<Proto::ParamsDecodingOutput<'static>> {
+        let abi = match input.abi {
+            AbiEnum::abi_json(abi_json) => serde_json::from_str(&abi_json)
+                .tw_err(|_| AbiErrorKind::Error_invalid_abi)
+                .context("Error deserializing ABI as JSON")?,
+            AbiEnum::abi_params(abi_params) => abi_params
+                .params
+                .into_iter()
+                .map(Self::param_from_proto)
+                .collect::<AbiResult<Vec<_>>>()?,
+            AbiEnum::None => {
+                return AbiError::err(AbiErrorKind::Error_invalid_abi).context("No ABI specified")
+            },
+        };
+
+        let decoded_tokens = decode_params(&abi, &input.encoded)?;
+        // Serialize the Proto parameters.
+        let decoded_protos = decoded_tokens
+            .into_iter()
+            .map(Self::named_token_to_proto)
+            .collect();
+
+        Ok(Proto::ParamsDecodingOutput {
+            tokens: decoded_protos,
+            ..Proto::ParamsDecodingOutput::default()
+        })
+    }
+
+    fn decode_value_impl(
+        input: Proto::ValueDecodingInput<'_>,
+    ) -> AbiResult<Proto::ValueDecodingOutput<'static>> {
+        let param_type = DecodingValueType::from_str(&input.param_type)
+            .context("Invalid parameter type")?
+            .0;
+        let token = decode_value(&param_type, &input.encoded)?;
+        let token_str = token.to_string();
+        Ok(Proto::ValueDecodingOutput {
+            token: Some(Self::token_to_proto(token)),
+            param_str: token_str.into(),
+            ..Proto::ValueDecodingOutput::default()
+        })
+    }
+
+    fn get_function_signature_impl(input: Proto::FunctionGetTypeInput<'_>) -> String {
+        let function_inputs = input
+            .inputs
+            .into_iter()
+            .map(Self::param_from_proto)
+            .collect::<AbiResult<Vec<_>>>()
+            .unwrap_or_default();
+
+        let fun = Function {
+            name: input.function_name.to_string(),
+            inputs: function_inputs,
+            ..Function::default()
+        };
+        fun.signature()
+    }
+
+    fn encode_contract_call_impl(
+        input: Proto::FunctionEncodingInput<'_>,
+    ) -> AbiResult<Proto::FunctionEncodingOutput<'static>> {
+        let mut tokens = Vec::with_capacity(input.tokens.len());
+        let mut input_types = Vec::with_capacity(input.tokens.len());
+
+        for token in input.tokens {
+            let named_token = Self::named_token_from_proto(token)?;
+            input_types.push(named_token.to_param());
+            tokens.push(named_token.value);
+        }
+
+        let fun = Function {
+            name: input.function_name.to_string(),
+            inputs: input_types,
+            ..Function::default()
+        };
+
+        let encoded = fun.encode_input(&tokens)?;
+        Ok(Proto::FunctionEncodingOutput {
+            function_type: fun.signature().into(),
+            encoded: encoded.into(),
+            ..Proto::FunctionEncodingOutput::default()
+        })
+    }
+
+    pub fn param_to_proto(param: Param) -> Proto::Param<'static> {
+        Proto::Param {
+            name: Cow::Owned(param.name.unwrap_or_default()),
+            param: Some(Self::param_type_to_proto(param.kind)),
+        }
+    }
+
+    fn param_from_proto(param: Proto::Param<'_>) -> AbiResult<Param> {
+        let name = if param.name.is_empty() {
+            None
+        } else {
+            Some(param.name.to_string())
+        };
+
+        let proto_param_type = param
+            .param
+            .or_tw_err(AbiErrorKind::Error_missing_param_type)
+            .context("Missing parameter type")?;
+        let kind = Self::param_type_from_proto(proto_param_type)?;
+
+        Ok(Param {
+            name,
+            kind,
+            internal_type: None,
+        })
+    }
+
+    fn named_token_from_proto(named_token: Proto::Token<'_>) -> AbiResult<NamedToken> {
+        Ok(NamedToken {
+            name: Some(named_token.name.clone().into()),
+            value: Self::token_from_proto(named_token)?,
+            internal_type: None,
+        })
+    }
+
+    fn token_from_proto(token: Proto::Token<'_>) -> AbiResult<Token> {
+        match token.token {
+            TokenEnum::boolean(bool) => Ok(Token::Bool(bool)),
+            TokenEnum::number_uint(u) => {
+                let uint = Self::u_number_n_from_proto(&u.value)?;
+                Token::uint(u.bits as usize, uint)
+            },
+            TokenEnum::number_int(i) => {
+                let int = Self::s_number_n_from_proto(&i.value)?;
+                Token::int(i.bits as usize, int)
+            },
+            TokenEnum::string_value(str) => Ok(Token::String(str.to_string())),
+            TokenEnum::address(addr) => {
+                let addr = Address::from_str(&addr)
+                    .tw_err(|_| AbiErrorKind::Error_invalid_address_value)?;
+                Ok(Token::Address(addr))
+            },
+            TokenEnum::byte_array(bytes) => Ok(Token::Bytes(bytes.to_vec())),
+            TokenEnum::byte_array_fix(bytes) => {
+                let checked_bytes = NonEmptyBytes::new(bytes.to_vec())
+                    .context("Empty `FixedBytes` collection is not allowed")?;
+                Ok(Token::FixedBytes(checked_bytes))
+            },
+            TokenEnum::array(arr) => {
+                let (arr, kind) = Self::array_from_proto(arr)?;
+                Ok(Token::Array { arr, kind })
+            },
+            TokenEnum::fixed_array(arr) => {
+                let (arr, kind) = Self::array_from_proto(arr)?;
+                let arr = NonEmptyArray::new(arr)
+                    .context("Empty `FixedArray` collection is not allowed")?;
+                Ok(Token::FixedArray { arr, kind })
+            },
+            TokenEnum::tuple(Proto::TupleParam { params }) => {
+                let params = params
+                    .into_iter()
+                    .map(Self::named_token_from_proto)
+                    .collect::<AbiResult<Vec<_>>>()?;
+                Ok(Token::Tuple { params })
+            },
+            TokenEnum::None => AbiError::err(AbiErrorKind::Error_missing_param_value),
+        }
+    }
+
+    fn array_from_proto(array: Proto::ArrayParam<'_>) -> AbiResult<(Vec<Token>, ParamType)> {
+        let element_type = array
+            .element_type
+            .or_tw_err(AbiErrorKind::Error_missing_param_type)?;
+        let element_type = Self::param_type_from_proto(element_type)?;
+
+        let mut array_tokens = Vec::with_capacity(array.elements.len());
+        for proto_token in array.elements {
+            let token = Self::token_from_proto(proto_token)?;
+            let token_type = token.to_param_type();
+
+            // Check if all tokens are the same as declared in `ArrayParam::element_type`.
+            if token_type != element_type {
+                return AbiError::err(AbiErrorKind::Error_invalid_param_type).with_context(|| {
+                    format!("Expected '{element_type:?}' array element type, found {token_type:?}")
+                });
+            }
+            array_tokens.push(token);
+        }
+
+        Ok((array_tokens, element_type))
+    }
+
+    fn param_type_to_proto(param_type: ParamType) -> Proto::ParamType<'static> {
+        let param = match param_type {
+            ParamType::Address => ProtoParamType::address(Proto::AddressType {}),
+            ParamType::FixedBytes { len } => {
+                let size = len.get() as u64;
+                ProtoParamType::byte_array_fix(Proto::ByteArrayFixType { size })
+            },
+            ParamType::Bytes => ProtoParamType::byte_array(Proto::ByteArrayType {}),
+            ParamType::Int { bits } => ProtoParamType::number_int(Proto::NumberNType {
+                bits: bits.get() as u32,
+            }),
+            ParamType::Uint { bits } => ProtoParamType::number_uint(Proto::NumberNType {
+                bits: bits.get() as u32,
+            }),
+            ParamType::Bool => ProtoParamType::boolean(Proto::BoolType {}),
+            ParamType::String => ProtoParamType::string_param(Proto::StringType {}),
+            ParamType::FixedArray { kind, len } => {
+                let size = len.get() as u64;
+                let element_type = Some(Box::new(Self::param_type_to_proto(*kind)));
+                ProtoParamType::fixed_array(Box::new(Proto::FixedArrayType { size, element_type }))
+            },
+            ParamType::Array { kind } => {
+                let element_type = Some(Box::new(Self::param_type_to_proto(*kind)));
+                ProtoParamType::array(Box::new(Proto::ArrayType { element_type }))
+            },
+            ParamType::Tuple { params } => {
+                let params: Vec<_> = params.into_iter().map(Self::param_to_proto).collect();
+                ProtoParamType::tuple(Proto::TupleType { params })
+            },
+        };
+        Proto::ParamType { param }
+    }
+
+    fn param_type_from_proto(param_type: Proto::ParamType<'_>) -> AbiResult<ParamType> {
+        match param_type.param {
+            ProtoParamType::boolean(_) => Ok(ParamType::Bool),
+            ProtoParamType::number_int(i) => {
+                let bits = UintBits::new(i.bits as usize)?;
+                Ok(ParamType::Int { bits })
+            },
+            ProtoParamType::number_uint(u) => {
+                let bits = UintBits::new(u.bits as usize)?;
+                Ok(ParamType::Uint { bits })
+            },
+            ProtoParamType::string_param(_) => Ok(ParamType::String),
+            ProtoParamType::address(_) => Ok(ParamType::Address),
+            ProtoParamType::byte_array(_) => Ok(ParamType::Bytes),
+            ProtoParamType::byte_array_fix(bytes) => {
+                let len = NonZeroLen::new(bytes.size as usize)
+                    .context("Expected non-zero 'FixByteArray' length")?;
+                Ok(ParamType::FixedBytes { len })
+            },
+            ProtoParamType::array(arr) => {
+                let element_type = arr
+                    .element_type
+                    .or_tw_err(AbiErrorKind::Error_missing_param_type)?;
+                let kind = Self::param_type_from_proto(*element_type)?;
+                Ok(ParamType::Array {
+                    kind: Box::new(kind),
+                })
+            },
+            ProtoParamType::fixed_array(arr) => {
+                let element_type = arr
+                    .element_type
+                    .or_tw_err(AbiErrorKind::Error_missing_param_type)?;
+                let kind = Box::new(Self::param_type_from_proto(*element_type)?);
+                let len = NonZeroLen::new(arr.size as usize)?;
+                Ok(ParamType::FixedArray { kind, len })
+            },
+            ProtoParamType::tuple(tuple) => {
+                let params = tuple
+                    .params
+                    .into_iter()
+                    .map(Self::param_from_proto)
+                    .collect::<AbiResult<Vec<_>>>()?;
+                if params.is_empty() {
+                    return AbiError::err(AbiErrorKind::Error_invalid_abi)
+                        .context("Empty 'Tuple' collection is not allowed");
+                }
+                Ok(ParamType::Tuple { params })
+            },
+            ProtoParamType::None => AbiError::err(AbiErrorKind::Error_missing_param_type),
+        }
+    }
+
+    fn named_token_to_proto(token: NamedToken) -> Proto::Token<'static> {
+        Proto::Token {
+            name: Cow::Owned(token.name.unwrap_or_default()),
+            ..Self::token_to_proto(token.value)
+        }
+    }
+
+    pub fn token_to_proto(token: Token) -> Proto::Token<'static> {
+        let value = match token {
+            Token::Address(addr) => TokenEnum::address(Cow::Owned(addr.to_string())),
+            Token::FixedBytes(bytes) => TokenEnum::byte_array_fix(Cow::Owned(bytes.into_vec())),
+            Token::Bytes(bytes) => TokenEnum::byte_array(Cow::Owned(bytes)),
+            Token::Int { int, bits } => TokenEnum::number_int(Self::s_number_n_proto(int, bits)),
+            Token::Uint { uint, bits } => {
+                TokenEnum::number_uint(Self::u_number_n_proto(uint, bits))
+            },
+            Token::Bool(bool) => TokenEnum::boolean(bool),
+            Token::String(str) => TokenEnum::string_value(Cow::Owned(str)),
+            Token::FixedArray { kind, arr } => {
+                TokenEnum::fixed_array(Self::array_to_proto(kind, arr.into_vec()))
+            },
+            Token::Array { kind, arr, .. } => TokenEnum::array(Self::array_to_proto(kind, arr)),
+            Token::Tuple { params } => TokenEnum::tuple(Self::tuple_to_proto(params)),
+        };
+        Proto::Token {
+            name: "".into(),
+            token: value,
+        }
+    }
+
+    fn s_number_n_from_proto(encoded: &[u8]) -> AbiResult<I256> {
+        I256::from_big_endian_slice(encoded).tw_err(|_| AbiErrorKind::Error_invalid_uint_value)
+    }
+
+    fn u_number_n_from_proto(encoded: &[u8]) -> AbiResult<U256> {
+        U256::from_big_endian_slice(encoded).tw_err(|_| AbiErrorKind::Error_invalid_uint_value)
+    }
+
+    fn s_number_n_proto(i: I256, bits: UintBits) -> Proto::NumberNParam<'static> {
+        Proto::NumberNParam {
+            bits: bits.get() as u32,
+            value: Cow::Owned(i.to_big_endian_compact()),
+        }
+    }
+
+    fn u_number_n_proto(u: U256, bits: UintBits) -> Proto::NumberNParam<'static> {
+        Proto::NumberNParam {
+            bits: bits.get() as u32,
+            value: Cow::Owned(u.to_big_endian_compact()),
+        }
+    }
+
+    fn array_to_proto(kind: ParamType, arr: Vec<Token>) -> Proto::ArrayParam<'static> {
+        Proto::ArrayParam {
+            elements: arr.into_iter().map(Self::token_to_proto).collect(),
+            element_type: Some(Self::param_type_to_proto(kind)),
+        }
+    }
+
+    fn tuple_to_proto(params: Vec<NamedToken>) -> Proto::TupleParam<'static> {
+        let params = params.into_iter().map(Self::named_token_to_proto).collect();
+        Proto::TupleParam { params }
+    }
+}
+
+#[derive(Deserialize)]
+struct SmartContractCallAbiJson {
+    #[serde(flatten)]
+    map: HashMap<ContractCallSignature, Function>,
+}
+
+#[derive(Eq, Deserialize, Hash, PartialEq, Serialize)]
+struct ContractCallSignature(#[serde(with = "as_hex")] H32);
+
+#[derive(Serialize)]
+struct SmartContractCallDecodedInputJson<'a> {
+    function: String,
+    inputs: &'a [NamedToken],
+}
+
+/// A value type used on [`AbiEncoder::decode_value`].
+/// Please note [`AbiEncoder::decode_value`] doesn't support `ParamType::Tuple` for decoding.
+struct DecodingValueType(ParamType);
+
+impl FromStr for DecodingValueType {
+    type Err = AbiError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let param_type = ParamType::try_from_type_short(s)?;
+        if param_type.has_tuple_components() {
+            return AbiError::err(AbiErrorKind::Error_invalid_param_type);
+        }
+        Ok(DecodingValueType(param_type))
+    }
+}
diff --git a/rust/tw_evm/src/modules/compiler.rs b/rust/tw_evm/src/modules/compiler.rs
new file mode 100644
index 00000000000..6dcac772299
--- /dev/null
+++ b/rust/tw_evm/src/modules/compiler.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::evm_context::EvmContext;
+use crate::modules::tx_builder::TxBuilder;
+use std::borrow::Cow;
+use std::marker::PhantomData;
+use tw_coin_entry::coin_entry::{PublicKeyBytes, SignatureBytes};
+use tw_coin_entry::common::compile_input::SingleSignaturePubkey;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_keypair::ecdsa::secp256k1;
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+pub struct Compiler<Context: EvmContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: EvmContext> Compiler<Context> {
+    #[inline]
+    pub fn preimage_hashes(
+        input: Proto::SigningInput<'_>,
+    ) -> CompilerProto::PreSigningOutput<'static> {
+        Self::preimage_hashes_impl(input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    #[inline]
+    pub fn compile(
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        public_keys: Vec<PublicKeyBytes>,
+    ) -> Proto::SigningOutput<'static> {
+        Self::compile_impl(input, signatures, public_keys)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn preimage_hashes_impl(
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let chain_id = U256::from_big_endian_slice(&input.chain_id)
+            .into_tw()
+            .context("Invalid chain ID")?;
+
+        let unsigned = TxBuilder::<Context>::tx_from_proto(&input)?;
+        let prehash = unsigned.pre_hash(chain_id);
+        let preimage_data = unsigned.encode(chain_id);
+
+        Ok(CompilerProto::PreSigningOutput {
+            data: Cow::from(preimage_data),
+            data_hash: Cow::from(prehash.to_vec()),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    fn compile_impl(
+        input: Proto::SigningInput<'_>,
+        signatures: Vec<SignatureBytes>,
+        _: Vec<PublicKeyBytes>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let SingleSignaturePubkey {
+            signature,
+            public_key: _,
+        } = SingleSignaturePubkey::from_sign_list(signatures)?;
+        let signature = secp256k1::Signature::from_bytes(&signature)?;
+
+        let chain_id = U256::from_big_endian_slice(&input.chain_id)
+            .into_tw()
+            .context("Invalid chain ID")?;
+
+        let unsigned = TxBuilder::<Context>::tx_from_proto(&input)?;
+
+        let pre_hash = unsigned.pre_hash(chain_id);
+
+        let signed = unsigned.try_into_signed(signature, chain_id)?;
+
+        let eth_signature = signed.signature();
+
+        Ok(Proto::SigningOutput {
+            encoded: signed.encode().into(),
+            v: eth_signature.v().to_big_endian_compact().into(),
+            r: eth_signature.r().to_big_endian_compact().into(),
+            s: eth_signature.s().to_big_endian_compact().into(),
+            data: signed.payload().into(),
+            pre_hash: pre_hash.to_vec().into(),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/tw_evm/src/modules/message_signer.rs b/rust/tw_evm/src/modules/message_signer.rs
new file mode 100644
index 00000000000..a67a60fb5ac
--- /dev/null
+++ b/rust/tw_evm/src/modules/message_signer.rs
@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::message::eip191::Eip191Message;
+use crate::message::eip712::eip712_message::Eip712Message;
+use crate::message::signature::{MessageSignature, SignatureType};
+use crate::message::{to_signing, EthMessage, EthMessageBoxed};
+use std::borrow::Cow;
+use std::str::FromStr;
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::message_signer::MessageSigner;
+use tw_coin_entry::signing_output_error;
+use tw_encoding::hex::ToHex;
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::ecdsa::signature::VerifySignature;
+use tw_keypair::traits::{SigningKeyTrait, VerifyingKeyTrait};
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+#[derive(Default)]
+pub struct EthMessageSigner;
+
+impl MessageSigner for EthMessageSigner {
+    type MessageSigningInput<'a> = Proto::MessageSigningInput<'a>;
+    type MessagePreSigningOutput = CompilerProto::PreSigningOutput<'static>;
+    type MessageSigningOutput = Proto::MessageSigningOutput<'static>;
+    type MessageVerifyingInput<'a> = Proto::MessageVerifyingInput<'a>;
+
+    fn message_preimage_hashes(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::MessageSigningInput<'_>,
+    ) -> Self::MessagePreSigningOutput {
+        Self::message_preimage_hashes_impl(input)
+            .unwrap_or_else(|e| signing_output_error!(CompilerProto::PreSigningOutput, e))
+    }
+
+    fn sign_message(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::MessageSigningInput<'_>,
+    ) -> Self::MessageSigningOutput {
+        Self::sign_message_impl(input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::MessageSigningOutput, e))
+    }
+
+    fn verify_message(
+        &self,
+        _coin: &dyn CoinContext,
+        input: Self::MessageVerifyingInput<'_>,
+    ) -> bool {
+        Self::verify_message_impl(input).unwrap_or_default()
+    }
+}
+
+impl EthMessageSigner {
+    fn message_preimage_hashes_impl(
+        input: Proto::MessageSigningInput<'_>,
+    ) -> SigningResult<CompilerProto::PreSigningOutput<'static>> {
+        let msg = Self::message_from_proto(input)?;
+        let hash = msg.hash().map_err(to_signing)?.to_vec();
+        Ok(CompilerProto::PreSigningOutput {
+            data: Cow::Owned(hash.clone()),
+            data_hash: Cow::Owned(hash),
+            ..CompilerProto::PreSigningOutput::default()
+        })
+    }
+
+    fn sign_message_impl(
+        input: Proto::MessageSigningInput<'_>,
+    ) -> SigningResult<Proto::MessageSigningOutput<'static>> {
+        let private_key = secp256k1::PrivateKey::try_from(input.private_key.as_ref())?;
+        let signature_type =
+            Self::signature_type_from_proto(input.message_type, input.chain_id.clone());
+
+        let msg = Self::message_from_proto(input)?;
+
+        let hash_to_sign = msg.hash().map_err(to_signing)?;
+        let secp_sign = private_key.sign(hash_to_sign)?;
+        let prepared_sign = MessageSignature::prepared(secp_sign, signature_type)?;
+
+        Ok(Proto::MessageSigningOutput {
+            signature: Cow::Owned(prepared_sign.to_bytes().to_hex()),
+            ..Proto::MessageSigningOutput::default()
+        })
+    }
+
+    fn verify_message_impl(input: Proto::MessageVerifyingInput<'_>) -> SigningResult<bool> {
+        let public_key = secp256k1::PublicKey::try_from(input.public_key.as_ref())?;
+
+        let msg_hash = Self::message_from_str(&input.message)?
+            .hash()
+            .map_err(to_signing)?;
+        let secp_signature =
+            MessageSignature::from_str(&input.signature)?.to_secp256k1_signature()?;
+
+        let actual_public_key = secp256k1::PublicKey::recover(secp_signature.clone(), msg_hash)?;
+        let valid = actual_public_key == public_key
+            && public_key.verify(VerifySignature::from(secp_signature), msg_hash);
+
+        Ok(valid)
+    }
+
+    fn message_from_proto(input: Proto::MessageSigningInput<'_>) -> SigningResult<EthMessageBoxed> {
+        match input.message_type {
+            Proto::MessageType::MessageType_legacy
+            | Proto::MessageType::MessageType_eip155
+            | Proto::MessageType::MessageType_immutable_x => {
+                Ok(Eip191Message::new(input.message).into_boxed())
+            },
+            Proto::MessageType::MessageType_typed
+            | Proto::MessageType::MessageType_typed_eip155 => match input.chain_id {
+                Some(expected_chain_id) => {
+                    let expected_chain_id = U256::from(expected_chain_id.chain_id);
+                    Ok(Eip712Message::new_checked(input.message, expected_chain_id)
+                        .map_err(to_signing)?
+                        .into_boxed())
+                },
+                None => Ok(Eip712Message::new(input.message)
+                    .map_err(to_signing)?
+                    .into_boxed()),
+            },
+        }
+    }
+
+    fn message_from_str(user_message: &str) -> SigningResult<EthMessageBoxed> {
+        match Eip712Message::new(user_message) {
+            Ok(typed_data) => Ok(typed_data.into_boxed()),
+            Err(_) => Ok(Eip191Message::new(user_message).into_boxed()),
+        }
+    }
+
+    fn signature_type_from_proto(
+        msg_type: Proto::MessageType,
+        maybe_chain_id: Option<Proto::MaybeChainId>,
+    ) -> SignatureType {
+        match msg_type {
+            Proto::MessageType::MessageType_immutable_x => SignatureType::Standard,
+            Proto::MessageType::MessageType_legacy | Proto::MessageType::MessageType_typed => {
+                SignatureType::Legacy
+            },
+            Proto::MessageType::MessageType_eip155
+            | Proto::MessageType::MessageType_typed_eip155 => {
+                let chain_id = U256::from(maybe_chain_id.unwrap_or_default().chain_id);
+                SignatureType::Eip155 { chain_id }
+            },
+        }
+    }
+}
diff --git a/rust/tw_evm/src/modules/mod.rs b/rust/tw_evm/src/modules/mod.rs
new file mode 100644
index 00000000000..fb246766ac1
--- /dev/null
+++ b/rust/tw_evm/src/modules/mod.rs
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod abi_encoder;
+pub mod compiler;
+pub mod message_signer;
+pub mod rlp_encoder;
+pub mod signer;
+pub mod transaction_util;
+pub mod tx_builder;
diff --git a/rust/tw_evm/src/modules/rlp_encoder.rs b/rust/tw_evm/src/modules/rlp_encoder.rs
new file mode 100644
index 00000000000..a935a719102
--- /dev/null
+++ b/rust/tw_evm/src/modules/rlp_encoder.rs
@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::evm_context::EvmContext;
+use crate::rlp::buffer::RlpBuffer;
+use crate::rlp::list::RlpList;
+use crate::rlp::RlpEncode;
+use std::borrow::Cow;
+use std::marker::PhantomData;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_memory::Data;
+use tw_number::U256;
+use tw_proto::EthereumRlp::Proto;
+
+/// cbindgen:ignore
+pub const RECURSION_LIMIT: usize = 10;
+
+pub struct RlpEncoder<Context: EvmContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: EvmContext> RlpEncoder<Context> {
+    pub fn encode<T>(val: &T) -> Data
+    where
+        T: RlpEncode + ?Sized,
+    {
+        let mut buf = RlpBuffer::new();
+        val.rlp_append(&mut buf);
+        buf.finish()
+    }
+
+    pub fn encode_with_proto(input: Proto::EncodingInput<'_>) -> Proto::EncodingOutput<'static> {
+        Self::encode_with_proto_impl(input)
+            .unwrap_or_else(|err| signing_output_error!(Proto::EncodingOutput, err))
+    }
+
+    fn encode_with_proto_impl(
+        input: Proto::EncodingInput<'_>,
+    ) -> SigningResult<Proto::EncodingOutput<'static>> {
+        let Some(rlp_item) = input.item else {
+            return SigningError::err(SigningErrorType::Error_invalid_params)
+                .context("No RLP item provided");
+        };
+
+        let initial_depth = 0;
+        let encoded = Self::encode_proto_item(initial_depth, rlp_item)?;
+        Ok(Proto::EncodingOutput {
+            encoded: Cow::from(encoded.as_slice().to_vec()),
+            ..Proto::EncodingOutput::default()
+        })
+    }
+
+    fn encode_proto_item(depth: usize, rlp_item: Proto::RlpItem) -> SigningResult<Data> {
+        use Proto::mod_RlpItem::OneOfitem as Item;
+
+        if depth >= RECURSION_LIMIT {
+            return SigningError::err(SigningErrorType::Error_invalid_params).with_context(|| {
+                format!("Allowed complex types with the {RECURSION_LIMIT} maximum depth")
+            });
+        }
+
+        let encoded_item = match rlp_item.item {
+            Item::string_item(str) => RlpEncoder::<Context>::encode(str.as_ref()),
+            Item::number_u64(num) => RlpEncoder::<Context>::encode(&U256::from(num)),
+            Item::number_u256(num_be) => {
+                let num = U256::from_big_endian_slice(num_be.as_ref())
+                    .into_tw()
+                    .context("Invalid U256 number")?;
+                RlpEncoder::<Context>::encode(&num)
+            },
+            Item::address(addr_s) => {
+                let addr = Context::Address::from_str(addr_s.as_ref())?;
+                RlpEncoder::<Context>::encode(&addr.into())
+            },
+            Item::data(data) => RlpEncoder::<Context>::encode(data.as_ref()),
+            Item::list(proto_nested_list) => {
+                let mut rlp_nested_list = RlpList::new();
+                let new_depth = depth + 1;
+
+                for proto_nested_list in proto_nested_list.items {
+                    let encoded_item = Self::encode_proto_item(new_depth, proto_nested_list)?;
+                    rlp_nested_list.append_raw_encoded(encoded_item.as_slice());
+                }
+                rlp_nested_list.finish()
+            },
+            // Pass the `raw_encoded` item as it is.
+            Item::raw_encoded(encoded) => encoded.to_vec(),
+            Item::None => {
+                return SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("No RLP item specified")
+            },
+        };
+        Ok(encoded_item)
+    }
+}
diff --git a/rust/tw_evm/src/modules/signer.rs b/rust/tw_evm/src/modules/signer.rs
new file mode 100644
index 00000000000..e136d2df1ec
--- /dev/null
+++ b/rust/tw_evm/src/modules/signer.rs
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::evm_context::EvmContext;
+use crate::modules::tx_builder::TxBuilder;
+use std::borrow::Cow;
+use std::marker::PhantomData;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::signing_output_error;
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::traits::SigningKeyTrait;
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+
+const SIGNATURE_V_MIN_LEN: usize = 1;
+
+pub struct Signer<Context: EvmContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: EvmContext> Signer<Context> {
+    #[inline]
+    pub fn sign_proto(input: Proto::SigningInput<'_>) -> Proto::SigningOutput<'static> {
+        Self::sign_proto_impl(input)
+            .unwrap_or_else(|e| signing_output_error!(Proto::SigningOutput, e))
+    }
+
+    fn sign_proto_impl(
+        input: Proto::SigningInput<'_>,
+    ) -> SigningResult<Proto::SigningOutput<'static>> {
+        let chain_id = U256::from_big_endian_slice(&input.chain_id)
+            .into_tw()
+            .context("Invalid chain ID")?;
+        let private_key = secp256k1::PrivateKey::try_from(input.private_key.as_ref())?;
+
+        let unsigned = TxBuilder::<Context>::tx_from_proto(&input)?;
+
+        let pre_hash = unsigned.pre_hash(chain_id);
+        let signature = private_key.sign(pre_hash)?;
+
+        let signed = unsigned.try_into_signed(signature, chain_id)?;
+
+        let eth_signature = signed.signature();
+
+        let v = eth_signature
+            .v()
+            .to_big_endian_compact_min_len(SIGNATURE_V_MIN_LEN);
+
+        Ok(Proto::SigningOutput {
+            encoded: Cow::from(signed.encode()),
+            v: Cow::from(v),
+            r: Cow::from(eth_signature.r().to_big_endian().to_vec()),
+            s: Cow::from(eth_signature.s().to_big_endian().to_vec()),
+            data: Cow::from(signed.payload()),
+            pre_hash: Cow::from(pre_hash.to_vec()),
+            ..Proto::SigningOutput::default()
+        })
+    }
+}
diff --git a/rust/tw_evm/src/modules/transaction_util.rs b/rust/tw_evm/src/modules/transaction_util.rs
new file mode 100644
index 00000000000..632634653d8
--- /dev/null
+++ b/rust/tw_evm/src/modules/transaction_util.rs
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::coin_context::CoinContext;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::transaction_util::TransactionUtil;
+use tw_encoding::hex::{decode, encode};
+use tw_hash::sha3::keccak256;
+
+pub struct EvmTransactionUtil;
+
+impl TransactionUtil for EvmTransactionUtil {
+    fn calc_tx_hash(&self, coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        Self::calc_tx_hash_impl(coin, encoded_tx)
+    }
+}
+
+impl EvmTransactionUtil {
+    fn calc_tx_hash_impl(_coin: &dyn CoinContext, encoded_tx: &str) -> SigningResult<String> {
+        let tx = decode(encoded_tx).map_err(|_| SigningErrorType::Error_input_parse)?;
+
+        Ok(encode(keccak256(&tx), true))
+    }
+}
diff --git a/rust/tw_evm/src/modules/tx_builder.rs b/rust/tw_evm/src/modules/tx_builder.rs
new file mode 100644
index 00000000000..830189a08f1
--- /dev/null
+++ b/rust/tw_evm/src/modules/tx_builder.rs
@@ -0,0 +1,359 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::abi_to_signing_error;
+use crate::abi::prebuild::erc1155::Erc1155;
+use crate::abi::prebuild::erc20::Erc20;
+use crate::abi::prebuild::erc4337::{Erc4337SimpleAccount, ExecuteArgs};
+use crate::abi::prebuild::erc721::Erc721;
+use crate::address::{Address, EvmAddress};
+use crate::evm_context::EvmContext;
+use crate::transaction::access_list::{Access, AccessList};
+use crate::transaction::transaction_eip1559::TransactionEip1559;
+use crate::transaction::transaction_non_typed::TransactionNonTyped;
+use crate::transaction::user_operation::UserOperation;
+use crate::transaction::UnsignedTransactionBox;
+use std::marker::PhantomData;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::H256;
+use tw_memory::Data;
+use tw_number::U256;
+use tw_proto::Common::Proto::SigningError as CommonError;
+use tw_proto::Ethereum::Proto;
+
+pub struct TxBuilder<Context: EvmContext> {
+    _phantom: PhantomData<Context>,
+}
+
+impl<Context: EvmContext> TxBuilder<Context> {
+    pub fn tx_from_proto(
+        input: &Proto::SigningInput<'_>,
+    ) -> SigningResult<Box<dyn UnsignedTransactionBox>> {
+        use Proto::mod_Transaction::OneOftransaction_oneof as Tx;
+        use Proto::TransactionMode as TxMode;
+
+        let Some(ref transaction) = input.transaction else {
+            return SigningError::err(CommonError::Error_invalid_params)
+                .context("No transaction specified");
+        };
+
+        let (eth_amount, payload, to) = match transaction.transaction_oneof {
+            Tx::transfer(ref transfer) => {
+                let amount = U256::from_big_endian_slice(&transfer.amount)
+                    .into_tw()
+                    .context("Invalid amount")?;
+
+                let to_address = Self::parse_address(&input.to_address)
+                    .context("Invalid destination address")?;
+
+                (amount, transfer.data.to_vec(), Some(to_address))
+            },
+            Tx::erc20_transfer(ref erc20_transfer) => {
+                let token_to_address = Self::parse_address(&erc20_transfer.to)
+                    .context("Invalid destination address")?;
+
+                let token_amount = U256::from_big_endian_slice(&erc20_transfer.amount)
+                    .into_tw()
+                    .context("Invalid amount")?;
+
+                let contract_address =
+                    Self::parse_address(&input.to_address).context("Invalid Contract address")?;
+
+                let payload = Erc20::transfer(token_to_address, token_amount)
+                    .map_err(abi_to_signing_error)?;
+                (U256::zero(), payload, Some(contract_address))
+            },
+            Tx::erc20_approve(ref erc20_approve) => {
+                let spender = Self::parse_address(&erc20_approve.spender)
+                    .context("Invalid sender address")?;
+
+                let token_amount = U256::from_big_endian_slice(&erc20_approve.amount)
+                    .into_tw()
+                    .context("Invalid amount")?;
+
+                let contract_address =
+                    Self::parse_address(&input.to_address).context("Invalid Contract address")?;
+
+                let payload =
+                    Erc20::approve(spender, token_amount).map_err(abi_to_signing_error)?;
+                (U256::zero(), payload, Some(contract_address))
+            },
+            Tx::erc721_transfer(ref erc721_transfer) => {
+                let from =
+                    Self::parse_address(&erc721_transfer.from).context("Invalid sender address")?;
+                let token_to_address = Self::parse_address(&erc721_transfer.to)
+                    .context("Invalid destination address")?;
+
+                let token_id = U256::from_big_endian_slice(&erc721_transfer.token_id)
+                    .into_tw()
+                    .context("Invalid token ID")?;
+
+                let contract_address =
+                    Self::parse_address(&input.to_address).context("Invalid Contract address")?;
+
+                let payload = Erc721::encode_transfer_from(from, token_to_address, token_id)
+                    .map_err(abi_to_signing_error)?;
+                (U256::zero(), payload, Some(contract_address))
+            },
+            Tx::erc1155_transfer(ref erc1155_transfer) => {
+                let from = Self::parse_address(&erc1155_transfer.from)
+                    .context("Invalid sender address")?;
+
+                let to = Self::parse_address(&erc1155_transfer.to)
+                    .context("Invalid destination address")?;
+
+                let token_id = U256::from_big_endian_slice(&erc1155_transfer.token_id)
+                    .into_tw()
+                    .context("Invalid token ID")?;
+
+                let value = U256::from_big_endian_slice(&erc1155_transfer.value)
+                    .into_tw()
+                    .context("Invalid value")?;
+
+                let data = erc1155_transfer.data.to_vec();
+                let contract_address =
+                    Self::parse_address(&input.to_address).context("Invalid Contract address")?;
+
+                let payload = Erc1155::encode_safe_transfer_from(from, to, token_id, value, data)
+                    .map_err(abi_to_signing_error)?;
+                (U256::zero(), payload, Some(contract_address))
+            },
+            Tx::contract_generic(ref contract_generic) => {
+                let amount = U256::from_big_endian_slice(&contract_generic.amount)
+                    .into_tw()
+                    .context("Invalid amount")?;
+
+                let payload = contract_generic.data.to_vec();
+                // `to_address` can be omitted for the generic contract call.
+                // For example, on creating a new smart contract.
+                let to_address = Self::parse_address_optional(&input.to_address)
+                    .context("Invalid destination address")?;
+
+                (amount, payload, to_address)
+            },
+            Tx::batch(ref batch) => {
+                if input.tx_mode != TxMode::UserOp {
+                    return SigningError::err(SigningErrorType::Error_invalid_params)
+                        .context("Transaction batch can be used in User Operation mode only");
+                }
+
+                // Payload should match ERC4337 standard.
+                let calls: Vec<_> = batch
+                    .calls
+                    .iter()
+                    .map(Self::erc4337_execute_call_from_proto)
+                    .collect::<Result<Vec<_>, _>>()?;
+                let payload = Erc4337SimpleAccount::encode_execute_batch(calls)
+                    .map_err(abi_to_signing_error)?;
+
+                return Self::user_operation_from_proto(input, payload)
+                    .map(UserOperation::into_boxed);
+            },
+            Tx::None => {
+                return SigningError::err(SigningErrorType::Error_invalid_params)
+                    .context("No transaction specified")
+            },
+        };
+
+        let tx = match input.tx_mode {
+            TxMode::Legacy => {
+                Self::transaction_non_typed_from_proto(input, eth_amount, payload, to)?.into_boxed()
+            },
+            TxMode::Enveloped => {
+                Self::transaction_eip1559_from_proto(input, eth_amount, payload, to)?.into_boxed()
+            },
+            TxMode::UserOp => {
+                let to = to
+                    .or_tw_err(SigningErrorType::Error_invalid_address)
+                    .context("No contract/destination address specified")?;
+                // Payload should match the ERC4337 standard.
+                let payload = Erc4337SimpleAccount::encode_execute(ExecuteArgs {
+                    to,
+                    value: eth_amount,
+                    data: payload,
+                })
+                .map_err(abi_to_signing_error)?;
+
+                Self::user_operation_from_proto(input, payload)?.into_boxed()
+            },
+        };
+        Ok(tx)
+    }
+
+    #[inline]
+    fn erc4337_execute_call_from_proto(
+        call: &Proto::mod_Transaction::mod_Batch::BatchedCall,
+    ) -> SigningResult<ExecuteArgs> {
+        let to = Self::parse_address(&call.address)
+            .context("Invalid 'BatchedCall' destination address")?;
+        let value = U256::from_big_endian_slice(&call.amount)
+            .into_tw()
+            .context("Invalid 'BatchedCall' amount")?;
+        Ok(ExecuteArgs {
+            to,
+            value,
+            data: call.payload.to_vec(),
+        })
+    }
+
+    #[inline]
+    fn transaction_non_typed_from_proto(
+        input: &Proto::SigningInput,
+        eth_amount: U256,
+        payload: Data,
+        to_address: Option<Address>,
+    ) -> SigningResult<TransactionNonTyped> {
+        let nonce = U256::from_big_endian_slice(&input.nonce)
+            .into_tw()
+            .context("Invalid nonce")?;
+
+        let gas_price = U256::from_big_endian_slice(&input.gas_price)
+            .into_tw()
+            .context("Invalid gas price")?;
+
+        let gas_limit = U256::from_big_endian_slice(&input.gas_limit)
+            .into_tw()
+            .context("Invalid gas limit")?;
+
+        Ok(TransactionNonTyped {
+            nonce,
+            gas_price,
+            gas_limit,
+            to: to_address,
+            amount: eth_amount,
+            payload,
+        })
+    }
+
+    #[inline]
+    fn transaction_eip1559_from_proto(
+        input: &Proto::SigningInput,
+        eth_amount: U256,
+        payload: Data,
+        to_address: Option<Address>,
+    ) -> SigningResult<TransactionEip1559> {
+        let nonce = U256::from_big_endian_slice(&input.nonce)
+            .into_tw()
+            .context("Invalid nonce")?;
+
+        let gas_limit = U256::from_big_endian_slice(&input.gas_limit)
+            .into_tw()
+            .context("Invalid gas limit")?;
+
+        let max_inclusion_fee_per_gas =
+            U256::from_big_endian_slice(&input.max_inclusion_fee_per_gas)
+                .into_tw()
+                .context("Invalid max inclusion fee per gas")?;
+
+        let max_fee_per_gas = U256::from_big_endian_slice(&input.max_fee_per_gas)
+            .into_tw()
+            .context("Invalid max fee per gas")?;
+
+        let access_list =
+            Self::parse_access_list(&input.access_list).context("Invalid access list")?;
+
+        Ok(TransactionEip1559 {
+            nonce,
+            max_inclusion_fee_per_gas,
+            max_fee_per_gas,
+            gas_limit,
+            to: to_address,
+            amount: eth_amount,
+            payload,
+            access_list,
+        })
+    }
+
+    fn user_operation_from_proto(
+        input: &Proto::SigningInput,
+        erc4337_payload: Data,
+    ) -> SigningResult<UserOperation> {
+        let Some(ref user_op) = input.user_operation else {
+            return SigningError::err(CommonError::Error_invalid_params)
+                .context("No user operation specified");
+        };
+
+        let nonce = U256::from_big_endian_slice(&input.nonce)
+            .into_tw()
+            .context("Invalid nonce")?;
+
+        let gas_limit = U256::from_big_endian_slice(&input.gas_limit)
+            .into_tw()
+            .context("Invalid gas limit")?;
+
+        let max_inclusion_fee_per_gas =
+            U256::from_big_endian_slice(&input.max_inclusion_fee_per_gas)
+                .into_tw()
+                .context("Invalid max inclusion fee per gas")?;
+
+        let max_fee_per_gas = U256::from_big_endian_slice(&input.max_fee_per_gas)
+            .into_tw()
+            .context("Invalid max fee per gas")?;
+
+        let entry_point =
+            Self::parse_address(user_op.entry_point.as_ref()).context("Invalid entry point")?;
+
+        let sender = Self::parse_address(user_op.sender.as_ref())
+            .context("Invalid User Operation sender")?;
+
+        let verification_gas_limit = U256::from_big_endian_slice(&user_op.verification_gas_limit)
+            .into_tw()
+            .context("Invalid verification gas limit")?;
+
+        let pre_verification_gas = U256::from_big_endian_slice(&user_op.pre_verification_gas)
+            .into_tw()
+            .context("Invalid pre-verification gas")?;
+
+        Ok(UserOperation {
+            nonce,
+            entry_point,
+            sender,
+            init_code: user_op.init_code.to_vec(),
+            gas_limit,
+            verification_gas_limit,
+            max_fee_per_gas,
+            max_inclusion_fee_per_gas,
+            pre_verification_gas,
+            paymaster_and_data: user_op.paymaster_and_data.to_vec(),
+            payload: erc4337_payload,
+        })
+    }
+
+    fn parse_address(addr: &str) -> SigningResult<Address> {
+        Context::Address::from_str(addr)
+            .map(Context::Address::into)
+            .map_err(SigningError::from)
+    }
+
+    fn parse_address_optional(addr: &str) -> SigningResult<Option<Address>> {
+        match Context::Address::from_str_optional(addr) {
+            Ok(Some(addr)) => Ok(Some(addr.into())),
+            Ok(None) => Ok(None),
+            Err(e) => Err(SigningError::from(e)),
+        }
+    }
+
+    fn parse_access_list(list_proto: &[Proto::Access]) -> SigningResult<AccessList> {
+        let mut access_list = AccessList::default();
+        for access_proto in list_proto.iter() {
+            access_list.add_access(Self::parse_access(access_proto)?);
+        }
+        Ok(access_list)
+    }
+
+    fn parse_access(access_proto: &Proto::Access) -> SigningResult<Access> {
+        let addr =
+            Self::parse_address(access_proto.address.as_ref()).context("Invalid access address")?;
+
+        let mut access = Access::new(addr);
+        for key_proto in access_proto.stored_keys.iter() {
+            let storage_key = H256::try_from(key_proto.as_ref())
+                .tw_err(|_| SigningErrorType::Error_invalid_params)
+                .context("Invalid storage key")?;
+            access.add_storage_key(storage_key);
+        }
+        Ok(access)
+    }
+}
diff --git a/rust/tw_evm/src/rlp/buffer.rs b/rust/tw_evm/src/rlp/buffer.rs
new file mode 100644
index 00000000000..c29d7d376aa
--- /dev/null
+++ b/rust/tw_evm/src/rlp/buffer.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_memory::Data;
+
+#[derive(Default)]
+pub struct RlpBuffer {
+    stream: rlp::RlpStream,
+}
+
+impl RlpBuffer {
+    /// cbindgen:ignore
+    const NO_ITEMS: usize = 0;
+    /// cbindgen:ignore
+    const ONE_ITEM: usize = 1;
+
+    /// Creates `RlpBuffer` with a default capacity.
+    pub fn new() -> RlpBuffer {
+        RlpBuffer::default()
+    }
+
+    /// Begins an RLP list.
+    /// Please note that it should be finalized using [`RlpBuffer::finalize_list`].
+    pub(crate) fn begin_list(&mut self) {
+        self.stream.begin_unbounded_list();
+    }
+
+    /// Appends an item by its `bytes` representation.
+    /// This method is usually called from [`RlpEncode::rlp_append`].
+    pub fn append_data(&mut self, bytes: &[u8]) {
+        self.stream.encoder().encode_value(bytes)
+    }
+
+    /// Appends an empty list.
+    pub(crate) fn append_empty_list(&mut self) {
+        self.stream.begin_list(Self::NO_ITEMS);
+    }
+
+    /// Appends an already encoded with all required headers value.
+    pub(crate) fn append_raw_encoded(&mut self, bytes: &[u8]) {
+        self.stream.append_raw(bytes, Self::ONE_ITEM);
+    }
+
+    /// Finalize the list.
+    ///
+    /// # Panic
+    ///
+    /// The method may panic if [`RlpBuffer::begin_list`] hasn't been called before.
+    pub(crate) fn finalize_list(&mut self) {
+        self.stream.finalize_unbounded_list();
+    }
+
+    /// Streams out encoded bytes.
+    ///
+    /// # Panic
+    ///
+    /// Tte method panic if [`RlpBuffer::begin_list`] has been called without [`RlpBuffer::finalize_list`].
+    pub fn finish(self) -> Data {
+        self.stream.out().into()
+    }
+}
diff --git a/rust/tw_evm/src/rlp/impls.rs b/rust/tw_evm/src/rlp/impls.rs
new file mode 100644
index 00000000000..371a3a7b47e
--- /dev/null
+++ b/rust/tw_evm/src/rlp/impls.rs
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::rlp::buffer::RlpBuffer;
+use crate::rlp::RlpEncode;
+use tw_hash::H256;
+use tw_number::U256;
+
+impl RlpEncode for U256 {
+    fn rlp_append(&self, buf: &mut RlpBuffer) {
+        buf.append_data(&self.to_big_endian_compact())
+    }
+}
+
+impl RlpEncode for H256 {
+    fn rlp_append(&self, buf: &mut RlpBuffer) {
+        buf.append_data(self.as_slice())
+    }
+}
+
+impl RlpEncode for Address {
+    fn rlp_append(&self, buf: &mut RlpBuffer) {
+        buf.append_data(self.as_slice())
+    }
+}
+
+impl RlpEncode for Option<Address> {
+    fn rlp_append(&self, buf: &mut RlpBuffer) {
+        match self {
+            Some(ref addr) => addr.rlp_append(buf),
+            None => buf.append_data(&[]),
+        }
+    }
+}
+
+impl RlpEncode for [u8] {
+    fn rlp_append(&self, buf: &mut RlpBuffer) {
+        buf.append_data(self)
+    }
+}
+
+impl RlpEncode for str {
+    fn rlp_append(&self, buf: &mut RlpBuffer) {
+        buf.append_data(self.as_bytes())
+    }
+}
diff --git a/rust/tw_evm/src/rlp/list.rs b/rust/tw_evm/src/rlp/list.rs
new file mode 100644
index 00000000000..65a568e35c5
--- /dev/null
+++ b/rust/tw_evm/src/rlp/list.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::rlp::buffer::RlpBuffer;
+use crate::rlp::RlpEncode;
+use tw_memory::Data;
+
+/// An RLP list of items.
+pub struct RlpList {
+    buf: RlpBuffer,
+}
+
+impl Default for RlpList {
+    fn default() -> Self {
+        RlpList::new()
+    }
+}
+
+impl RlpList {
+    /// Creates a default `RlpList`.
+    pub fn new() -> RlpList {
+        let mut buf = RlpBuffer::new();
+        buf.begin_list();
+        RlpList { buf }
+    }
+
+    /// Appends an item.
+    pub fn append<T>(&mut self, item: &T) -> &mut Self
+    where
+        T: RlpEncode + ?Sized,
+    {
+        item.rlp_append(&mut self.buf);
+        self
+    }
+
+    /// Appends a sublist.
+    pub fn append_list(&mut self, list: RlpList) -> &mut Self {
+        let encoded_list = list.finish();
+        self.buf.append_data(encoded_list.as_ref());
+        self
+    }
+
+    /// Appends an empty sublist.
+    pub fn append_empty_list(&mut self) -> &mut Self {
+        self.buf.append_empty_list();
+        self
+    }
+
+    /// Appends an already encoded with all required headers value.
+    pub fn append_raw_encoded(&mut self, encoded: &[u8]) -> &mut Self {
+        self.buf.append_raw_encoded(encoded);
+        self
+    }
+
+    /// Finalizes the RLP list buffer. Returns encoded RLP list with a header.
+    #[must_use]
+    pub fn finish(mut self) -> Data {
+        self.buf.finalize_list();
+        self.buf.finish()
+    }
+}
diff --git a/rust/tw_evm/src/rlp/mod.rs b/rust/tw_evm/src/rlp/mod.rs
new file mode 100644
index 00000000000..3ddea753237
--- /dev/null
+++ b/rust/tw_evm/src/rlp/mod.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::rlp::buffer::RlpBuffer;
+
+pub mod buffer;
+pub mod impls;
+pub mod list;
+
+/// The trait should be implemented for all types that need to be encoded in RLP.
+pub trait RlpEncode {
+    fn rlp_append(&self, buf: &mut RlpBuffer);
+}
diff --git a/rust/tw_evm/src/signature.rs b/rust/tw_evm/src/signature.rs
new file mode 100644
index 00000000000..c3097c197a8
--- /dev/null
+++ b/rust/tw_evm/src/signature.rs
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::ops::BitXor;
+use tw_number::{NumberResult, U256};
+
+/// EIP155 Eth encoding of V, of the form 27+v, or 35+chainID*2+v.
+/// cbindgin:ignore
+pub const ETHEREUM_SIGNATURE_V_OFFSET: u8 = 27;
+
+/// Embeds `chain_id` in `v` param, for replay protection, legacy or EIP155.
+#[inline]
+pub fn replay_protection(chain_id: U256, v: u8) -> NumberResult<U256> {
+    if chain_id.is_zero() {
+        legacy_replay_protection(v)
+    } else {
+        eip155_replay_protection(chain_id, v)
+    }
+}
+
+/// Embeds `chain_id` in `v` param, for replay protection, legacy.
+#[inline]
+pub fn legacy_replay_protection(v: u8) -> NumberResult<U256> {
+    U256::from(v).checked_add(ETHEREUM_SIGNATURE_V_OFFSET)
+}
+
+/// Embeds `chain_id` in `v` param, for replay protection, EIP155.
+#[inline]
+pub fn eip155_replay_protection(chain_id: U256, v: u8) -> NumberResult<U256> {
+    // chain_id + chain_id + 35u8 + v
+    chain_id
+        .checked_add(chain_id)?
+        .checked_add(35_u64)?
+        .checked_add(v)
+}
+
+/// Removes EIP155 or legacy replay protection.
+#[inline]
+pub fn remove_replay_protection(v: u8) -> u8 {
+    const BIT_MASK: u8 = 0x01;
+    if v >= ETHEREUM_SIGNATURE_V_OFFSET {
+        return (v & BIT_MASK).bitxor(BIT_MASK);
+    }
+    v
+}
diff --git a/rust/tw_evm/src/transaction/access_list.rs b/rust/tw_evm/src/transaction/access_list.rs
new file mode 100644
index 00000000000..191eee1ab75
--- /dev/null
+++ b/rust/tw_evm/src/transaction/access_list.rs
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::rlp::buffer::RlpBuffer;
+use crate::rlp::RlpEncode;
+use tw_hash::H256;
+
+/// A list of addresses and storage keys that the transaction plans to access.
+pub struct Access {
+    pub address: Address,
+    pub storage_keys: Vec<H256>,
+}
+
+impl Access {
+    #[inline]
+    pub fn new(address: Address) -> Self {
+        Access {
+            address,
+            storage_keys: Vec::default(),
+        }
+    }
+
+    #[inline]
+    pub fn add_storage_key(&mut self, key: H256) -> &mut Self {
+        self.storage_keys.push(key);
+        self
+    }
+}
+
+impl RlpEncode for Access {
+    fn rlp_append(&self, buf: &mut RlpBuffer) {
+        buf.begin_list();
+        self.address.rlp_append(buf);
+
+        // append the list of keys
+        {
+            buf.begin_list();
+            for storage_key in self.storage_keys.iter() {
+                storage_key.rlp_append(buf);
+            }
+            buf.finalize_list();
+        }
+
+        buf.finalize_list();
+    }
+}
+
+/// [EIP-2930](https://eips.ethereum.org/EIPS/eip-2930) access list.
+#[derive(Default)]
+pub struct AccessList(Vec<Access>);
+
+impl AccessList {
+    #[inline]
+    pub fn add_access(&mut self, access: Access) -> &mut Self {
+        self.0.push(access);
+        self
+    }
+}
+
+impl RlpEncode for AccessList {
+    fn rlp_append(&self, buf: &mut RlpBuffer) {
+        buf.begin_list();
+
+        for access in self.0.iter() {
+            access.rlp_append(buf);
+        }
+
+        buf.finalize_list();
+    }
+}
diff --git a/rust/tw_evm/src/transaction/mod.rs b/rust/tw_evm/src/transaction/mod.rs
new file mode 100644
index 00000000000..9d4ba81b32b
--- /dev/null
+++ b/rust/tw_evm/src/transaction/mod.rs
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! Transactions can be:
+//! - Non-typed (legacy, pre-EIP2718) transactions:
+//!   - simple ETH transfer
+//!   - others with payload, function call, e.g. ERC20 transfer
+//! - Typed transactions (enveloped, EIP2718), with specific type and transaction payload
+//! - User operations (EIP4337)
+
+use crate::transaction::signature::EthSignature;
+use tw_coin_entry::error::prelude::*;
+use tw_hash::{sha3::keccak256, H256};
+use tw_keypair::ecdsa::secp256k1;
+use tw_memory::Data;
+use tw_number::U256;
+
+pub mod access_list;
+pub mod signature;
+pub mod transaction_eip1559;
+pub mod transaction_non_typed;
+pub mod user_operation;
+
+pub trait TransactionCommon {
+    fn payload(&self) -> Data;
+}
+
+pub trait UnsignedTransaction: TransactionCommon {
+    type SignedTransaction: SignedTransaction + 'static;
+
+    fn pre_hash(&self, chain_id: U256) -> H256 {
+        let hash = keccak256(&self.encode(chain_id));
+        H256::try_from(hash.as_slice()).expect("keccak256 returns 32 bytes")
+    }
+
+    fn encode(&self, chain_id: U256) -> Data;
+
+    fn try_into_signed(
+        self,
+        signature: secp256k1::Signature,
+        chain_id: U256,
+    ) -> SigningResult<Self::SignedTransaction>;
+}
+
+pub trait SignedTransaction: TransactionCommon {
+    type Signature: EthSignature;
+
+    fn encode(&self) -> Data;
+
+    fn signature(&self) -> &Self::Signature;
+}
+
+pub trait UnsignedTransactionBox: TransactionCommon {
+    fn into_boxed(self) -> Box<dyn UnsignedTransactionBox + 'static>
+    where
+        Self: Sized + 'static,
+    {
+        Box::new(self)
+    }
+
+    fn pre_hash(&self, chain_id: U256) -> H256;
+
+    fn encode(&self, chain_id: U256) -> Data;
+
+    fn try_into_signed(
+        self: Box<Self>,
+        signature: secp256k1::Signature,
+        chain_id: U256,
+    ) -> SigningResult<Box<dyn SignedTransactionBox>>;
+}
+
+impl<T> UnsignedTransactionBox for T
+where
+    T: UnsignedTransaction,
+{
+    fn pre_hash(&self, chain_id: U256) -> H256 {
+        <Self as UnsignedTransaction>::pre_hash(self, chain_id)
+    }
+
+    fn encode(&self, chain_id: U256) -> Data {
+        <Self as UnsignedTransaction>::encode(self, chain_id)
+    }
+
+    fn try_into_signed(
+        self: Box<Self>,
+        signature: secp256k1::Signature,
+        chain_id: U256,
+    ) -> SigningResult<Box<dyn SignedTransactionBox>> {
+        let signed = <Self as UnsignedTransaction>::try_into_signed(*self, signature, chain_id)?;
+        Ok(Box::new(signed))
+    }
+}
+
+pub trait SignedTransactionBox: TransactionCommon {
+    fn encode(&self) -> Data;
+
+    fn signature(&self) -> &dyn EthSignature;
+}
+
+impl<T> SignedTransactionBox for T
+where
+    T: SignedTransaction,
+{
+    fn encode(&self) -> Data {
+        <Self as SignedTransaction>::encode(self)
+    }
+
+    fn signature(&self) -> &dyn EthSignature {
+        <Self as SignedTransaction>::signature(self)
+    }
+}
diff --git a/rust/tw_evm/src/transaction/signature.rs b/rust/tw_evm/src/transaction/signature.rs
new file mode 100644
index 00000000000..a6a8f4cf2ff
--- /dev/null
+++ b/rust/tw_evm/src/transaction/signature.rs
@@ -0,0 +1,182 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::signature::replay_protection;
+use tw_hash::H520;
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::{KeyPairError, KeyPairResult};
+use tw_number::U256;
+
+pub trait EthSignature {
+    fn v(&self) -> U256;
+
+    fn r(&self) -> U256;
+
+    fn s(&self) -> U256;
+}
+
+/// R-S-V Signature values.
+pub struct Signature {
+    v: U256,
+    r: U256,
+    s: U256,
+    rsv: H520,
+}
+
+impl Signature {
+    #[inline]
+    pub fn new(sign: secp256k1::Signature) -> Self {
+        Signature {
+            v: U256::from(sign.v()),
+            r: U256::from_big_endian(sign.r()),
+            s: U256::from_big_endian(sign.s()),
+            rsv: sign.to_bytes(),
+        }
+    }
+
+    #[inline]
+    pub fn to_rsv_bytes(&self) -> H520 {
+        self.rsv
+    }
+}
+
+impl EthSignature for Signature {
+    #[inline]
+    fn v(&self) -> U256 {
+        self.v
+    }
+
+    #[inline]
+    fn r(&self) -> U256 {
+        self.r
+    }
+
+    #[inline]
+    fn s(&self) -> U256 {
+        self.s
+    }
+}
+
+/// R-S-V Signature values EIP115.
+pub struct SignatureEip155 {
+    v: U256,
+    r: U256,
+    s: U256,
+}
+
+impl SignatureEip155 {
+    #[inline]
+    pub fn new(sign: secp256k1::Signature, chain_id: U256) -> KeyPairResult<Self> {
+        let v =
+            replay_protection(chain_id, sign.v()).map_err(|_| KeyPairError::InvalidSignature)?;
+        Ok(SignatureEip155 {
+            v,
+            r: U256::from_big_endian(sign.r()),
+            s: U256::from_big_endian(sign.s()),
+        })
+    }
+}
+
+impl EthSignature for SignatureEip155 {
+    #[inline]
+    fn v(&self) -> U256 {
+        self.v
+    }
+
+    #[inline]
+    fn r(&self) -> U256 {
+        self.r
+    }
+
+    #[inline]
+    fn s(&self) -> U256 {
+        self.s
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex;
+    use tw_hash::H256;
+
+    #[test]
+    fn test_signature_no_eip155() {
+        let secp_bytes = hex::decode("d93fc9ae934d4f72db91cb149e7e84b50ca83b5a8a7b873b0fdb009546e3af47786bfaf31af61eea6471dbb1bec7d94f73fb90887e4f04d0e9b85676c47ab02a00").unwrap();
+        let secp_sign = secp256k1::Signature::from_bytes(secp_bytes.as_slice()).unwrap();
+
+        let eth_sign = Signature::new(secp_sign);
+
+        let r = H256::from("d93fc9ae934d4f72db91cb149e7e84b50ca83b5a8a7b873b0fdb009546e3af47");
+        let s = H256::from("786bfaf31af61eea6471dbb1bec7d94f73fb90887e4f04d0e9b85676c47ab02a");
+        let v = hex::decode("00").unwrap();
+
+        assert_eq!(eth_sign.r(), U256::from_big_endian(r));
+        assert_eq!(eth_sign.s(), U256::from_big_endian(s));
+        assert_eq!(
+            eth_sign.v(),
+            U256::from_big_endian_slice(v.as_slice()).unwrap()
+        );
+    }
+
+    #[test]
+    fn test_signature_eip155_legacy() {
+        let secp_bytes = hex::decode("d93fc9ae934d4f72db91cb149e7e84b50ca83b5a8a7b873b0fdb009546e3af47786bfaf31af61eea6471dbb1bec7d94f73fb90887e4f04d0e9b85676c47ab02a00").unwrap();
+        let secp_sign = secp256k1::Signature::from_bytes(secp_bytes.as_slice()).unwrap();
+
+        let chain_id = U256::zero();
+        let eth_sign = SignatureEip155::new(secp_sign, chain_id).unwrap();
+
+        let r = H256::from("d93fc9ae934d4f72db91cb149e7e84b50ca83b5a8a7b873b0fdb009546e3af47");
+        let s = H256::from("786bfaf31af61eea6471dbb1bec7d94f73fb90887e4f04d0e9b85676c47ab02a");
+        let v = hex::decode("1b").unwrap();
+
+        assert_eq!(eth_sign.r(), U256::from_big_endian(r));
+        assert_eq!(eth_sign.s(), U256::from_big_endian(s));
+        assert_eq!(
+            eth_sign.v(),
+            U256::from_big_endian_slice(v.as_slice()).unwrap()
+        );
+    }
+
+    #[test]
+    fn test_signature_eip155_v0() {
+        let secp_bytes = hex::decode("d93fc9ae934d4f72db91cb149e7e84b50ca83b5a8a7b873b0fdb009546e3af47786bfaf31af61eea6471dbb1bec7d94f73fb90887e4f04d0e9b85676c47ab02a00").unwrap();
+        let secp_sign = secp256k1::Signature::from_bytes(secp_bytes.as_slice()).unwrap();
+
+        let chain_id = U256::from(1_u64);
+        let eth_sign = SignatureEip155::new(secp_sign, chain_id).unwrap();
+
+        let r = H256::from("d93fc9ae934d4f72db91cb149e7e84b50ca83b5a8a7b873b0fdb009546e3af47");
+        let s = H256::from("786bfaf31af61eea6471dbb1bec7d94f73fb90887e4f04d0e9b85676c47ab02a");
+        let v = hex::decode("25").unwrap();
+
+        assert_eq!(eth_sign.r(), U256::from_big_endian(r));
+        assert_eq!(eth_sign.s(), U256::from_big_endian(s));
+        assert_eq!(
+            eth_sign.v(),
+            U256::from_big_endian_slice(v.as_slice()).unwrap()
+        );
+    }
+
+    #[test]
+    fn test_signature_eip155_v1() {
+        let secp_bytes = hex::decode("42556c4f2a3f4e4e639cca524d1da70e60881417d4643e5382ed110a52719eaf172f591a2a763d0bd6b13d042d8c5eb66e87f129c9dc77ada66b6041012db2b301").unwrap();
+        let secp_sign = secp256k1::Signature::from_bytes(secp_bytes.as_slice()).unwrap();
+
+        let chain_id = U256::from(1_u64);
+        let eth_sign = SignatureEip155::new(secp_sign, chain_id).unwrap();
+
+        let r = H256::from("42556c4f2a3f4e4e639cca524d1da70e60881417d4643e5382ed110a52719eaf");
+        let s = H256::from("172f591a2a763d0bd6b13d042d8c5eb66e87f129c9dc77ada66b6041012db2b3");
+        let v = hex::decode("26").unwrap();
+
+        assert_eq!(eth_sign.r(), U256::from_big_endian(r));
+        assert_eq!(eth_sign.s(), U256::from_big_endian(s));
+        assert_eq!(
+            eth_sign.v(),
+            U256::from_big_endian_slice(v.as_slice()).unwrap()
+        );
+    }
+}
diff --git a/rust/tw_evm/src/transaction/transaction_eip1559.rs b/rust/tw_evm/src/transaction/transaction_eip1559.rs
new file mode 100644
index 00000000000..66b59b0f16b
--- /dev/null
+++ b/rust/tw_evm/src/transaction/transaction_eip1559.rs
@@ -0,0 +1,174 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::rlp::list::RlpList;
+use crate::transaction::access_list::AccessList;
+use crate::transaction::signature::{EthSignature, Signature};
+use crate::transaction::{SignedTransaction, TransactionCommon, UnsignedTransaction};
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::ecdsa::secp256k1;
+use tw_memory::Data;
+use tw_number::U256;
+
+const EIP1559_TX_TYPE: u8 = 0x02;
+
+/// EIP1559 transaction.
+pub struct TransactionEip1559 {
+    pub nonce: U256,
+    pub max_inclusion_fee_per_gas: U256,
+    pub max_fee_per_gas: U256,
+    pub gas_limit: U256,
+    pub to: Option<Address>,
+    pub amount: U256,
+    pub payload: Data,
+    pub access_list: AccessList,
+}
+
+impl TransactionCommon for TransactionEip1559 {
+    #[inline]
+    fn payload(&self) -> Data {
+        self.payload.clone()
+    }
+}
+
+impl UnsignedTransaction for TransactionEip1559 {
+    type SignedTransaction = SignedTransactionEip1559;
+
+    #[inline]
+    fn encode(&self, chain_id: U256) -> Data {
+        encode_transaction(self, chain_id, None)
+    }
+
+    #[inline]
+    fn try_into_signed(
+        self,
+        signature: secp256k1::Signature,
+        chain_id: U256,
+    ) -> SigningResult<Self::SignedTransaction> {
+        Ok(SignedTransactionEip1559 {
+            unsigned: self,
+            signature: Signature::new(signature),
+            chain_id,
+        })
+    }
+}
+
+pub struct SignedTransactionEip1559 {
+    unsigned: TransactionEip1559,
+    signature: Signature,
+    chain_id: U256,
+}
+
+impl TransactionCommon for SignedTransactionEip1559 {
+    #[inline]
+    fn payload(&self) -> Data {
+        self.unsigned.payload.clone()
+    }
+}
+
+impl SignedTransaction for SignedTransactionEip1559 {
+    type Signature = Signature;
+
+    #[inline]
+    fn encode(&self) -> Data {
+        encode_transaction(&self.unsigned, self.chain_id, Some(&self.signature))
+    }
+
+    #[inline]
+    fn signature(&self) -> &Self::Signature {
+        &self.signature
+    }
+}
+
+fn encode_transaction(
+    tx: &TransactionEip1559,
+    chain_id: U256,
+    signature: Option<&Signature>,
+) -> Data {
+    let mut list = RlpList::new();
+    list.append(&chain_id)
+        .append(&tx.nonce)
+        .append(&tx.max_inclusion_fee_per_gas)
+        .append(&tx.max_fee_per_gas)
+        .append(&tx.gas_limit)
+        .append(&tx.to)
+        .append(&tx.amount)
+        .append(tx.payload.as_slice())
+        .append(&tx.access_list);
+
+    if let Some(signature) = signature {
+        list.append(&signature.v());
+        list.append(&signature.r());
+        list.append(&signature.s());
+    }
+
+    let tx_encoded = list.finish();
+
+    let mut envelope = Vec::with_capacity(tx_encoded.len() + 1);
+    envelope.push(EIP1559_TX_TYPE);
+    envelope.extend_from_slice(tx_encoded.as_slice());
+    envelope
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::transaction::access_list::Access;
+    use tw_encoding::hex;
+    use tw_hash::H256;
+
+    #[test]
+    fn test_encode_transaction_eip1559() {
+        let tx = TransactionEip1559 {
+            nonce: U256::from(6_u64),
+            max_inclusion_fee_per_gas: U256::from(2_000_000_000_u64),
+            max_fee_per_gas: U256::from(3_000_000_000_u64),
+            gas_limit: U256::from(21100_u64),
+            to: Some(Address::from("0x6b175474e89094c44da98b954eedeac495271d0f")),
+            amount: U256::zero(),
+            payload: hex::decode("a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1").unwrap(),
+            access_list: AccessList::default(),
+        };
+        let chain_id = U256::from(10u64);
+        let actual = tx.encode(chain_id);
+
+        let expected = "02f86c0a06847735940084b2d05e0082526c946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1c0";
+        assert_eq!(hex::encode(actual, false), expected);
+    }
+
+    #[test]
+    fn test_encode_transaction_eip1559_with_access_list() {
+        let mut access = Access::new(Address::from("0xdAC17F958D2ee523a2206206994597C13D831ec7"));
+
+        #[rustfmt::skip]
+        access
+            .add_storage_key(H256::from("0x76c8f33bcdf467e4f1313522c10a40512a867cdcd34f2b898232ad4669200764"))
+            .add_storage_key(H256::from("0x000000000000000000000000000000000000000000000000000000000000000a"))
+            .add_storage_key(H256::from("0x0000000000000000000000000000000000000000000000000000000000000003"))
+            .add_storage_key(H256::from("0x0000000000000000000000000000000000000000000000000000000000000004"))
+            .add_storage_key(H256::from("0xb12459e057d0da4389f95b7ff0ce45a52ad71b02913a5466ffaab252e7ce918a"))
+            .add_storage_key(H256::from("0x1bba044274699cc8c429fbe84bdad5d5a49519e29430f25309cbbab31dc63043"))
+            .add_storage_key(H256::from("0x0000000000000000000000000000000000000000000000000000000000000000"));
+
+        let mut access_list = AccessList::default();
+        access_list.add_access(access);
+
+        let tx = TransactionEip1559 {
+            nonce: U256::from(1u64),
+            max_inclusion_fee_per_gas: U256::from(2_000_000_000_u64),
+            max_fee_per_gas: U256::from(3_000_000_000_u64),
+            gas_limit: U256::from(100_000_u64),
+            to: Some(Address::from("0xdAC17F958D2ee523a2206206994597C13D831ec7")),
+            amount: U256::zero(),
+            payload: hex::decode("a9059cbb000000000000000000000000b2fb4372e663b2e53da97d98100433d1fd06ca5500000000000000000000000000000000000000000000000000000000000f4240").unwrap(),
+            access_list,
+        };
+        let chain_id = U256::from(1_u64);
+        let actual = tx.encode(chain_id);
+
+        let expected = "02f9016f0101847735940084b2d05e00830186a094dac17f958d2ee523a2206206994597c13d831ec780b844a9059cbb000000000000000000000000b2fb4372e663b2e53da97d98100433d1fd06ca5500000000000000000000000000000000000000000000000000000000000f4240f90100f8fe94dac17f958d2ee523a2206206994597c13d831ec7f8e7a076c8f33bcdf467e4f1313522c10a40512a867cdcd34f2b898232ad4669200764a0000000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000003a00000000000000000000000000000000000000000000000000000000000000004a0b12459e057d0da4389f95b7ff0ce45a52ad71b02913a5466ffaab252e7ce918aa01bba044274699cc8c429fbe84bdad5d5a49519e29430f25309cbbab31dc63043a00000000000000000000000000000000000000000000000000000000000000000";
+        assert_eq!(hex::encode(actual, false), expected);
+    }
+}
diff --git a/rust/tw_evm/src/transaction/transaction_non_typed.rs b/rust/tw_evm/src/transaction/transaction_non_typed.rs
new file mode 100644
index 00000000000..437a27fc158
--- /dev/null
+++ b/rust/tw_evm/src/transaction/transaction_non_typed.rs
@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::address::Address;
+use crate::rlp::list::RlpList;
+use crate::transaction::signature::{EthSignature, SignatureEip155};
+use crate::transaction::{SignedTransaction, TransactionCommon, UnsignedTransaction};
+use tw_coin_entry::error::prelude::*;
+use tw_keypair::ecdsa::secp256k1;
+use tw_memory::Data;
+use tw_number::U256;
+
+/// Original transaction format, with no explicit type, legacy as pre-EIP2718.
+pub struct TransactionNonTyped {
+    pub nonce: U256,
+    pub gas_price: U256,
+    pub gas_limit: U256,
+    pub to: Option<Address>,
+    pub amount: U256,
+    pub payload: Data,
+}
+
+impl TransactionCommon for TransactionNonTyped {
+    #[inline]
+    fn payload(&self) -> Data {
+        self.payload.to_vec()
+    }
+}
+
+impl UnsignedTransaction for TransactionNonTyped {
+    type SignedTransaction = SignedTransactionNonTyped;
+
+    #[inline]
+    fn encode(&self, chain_id: U256) -> Data {
+        encode_transaction(self, chain_id, None)
+    }
+
+    #[inline]
+    fn try_into_signed(
+        self,
+        signature: secp256k1::Signature,
+        chain_id: U256,
+    ) -> SigningResult<Self::SignedTransaction> {
+        Ok(SignedTransactionNonTyped {
+            unsigned: self,
+            signature: SignatureEip155::new(signature, chain_id)?,
+            chain_id,
+        })
+    }
+}
+
+pub struct SignedTransactionNonTyped {
+    unsigned: TransactionNonTyped,
+    signature: SignatureEip155,
+    chain_id: U256,
+}
+
+impl TransactionCommon for SignedTransactionNonTyped {
+    #[inline]
+    fn payload(&self) -> Data {
+        self.unsigned.payload.clone()
+    }
+}
+
+impl SignedTransaction for SignedTransactionNonTyped {
+    type Signature = SignatureEip155;
+
+    #[inline]
+    fn encode(&self) -> Data {
+        encode_transaction(&self.unsigned, self.chain_id, Some(&self.signature))
+    }
+
+    #[inline]
+    fn signature(&self) -> &Self::Signature {
+        &self.signature
+    }
+}
+
+fn encode_transaction(
+    tx: &TransactionNonTyped,
+    chain_id: U256,
+    signature: Option<&SignatureEip155>,
+) -> Data {
+    let mut list = RlpList::new();
+    list.append(&tx.nonce)
+        .append(&tx.gas_price)
+        .append(&tx.gas_limit)
+        .append(&tx.to)
+        .append(&tx.amount)
+        .append(tx.payload.as_slice());
+
+    let (v, r, s) = match signature {
+        Some(sign) => (sign.v(), sign.r(), sign.s()),
+        None => (chain_id, U256::zero(), U256::zero()),
+    };
+    list.append(&v).append(&r).append(&s);
+    list.finish()
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex;
+
+    #[test]
+    fn test_encode_unsigned_non_typed_zero() {
+        let tx = TransactionNonTyped {
+            nonce: U256::zero(),
+            gas_price: U256::zero(),
+            gas_limit: U256::zero(),
+            to: Some(Address::default()),
+            amount: U256::zero(),
+            payload: Vec::new(),
+        };
+        let chain_id = U256::zero();
+        let actual = tx.encode(chain_id);
+
+        let expected = "dd8080809400000000000000000000000000000000000000008080808080";
+        assert_eq!(hex::encode(actual, false), expected);
+    }
+
+    #[test]
+    fn test_encode_unsigned_non_typed() {
+        let tx = TransactionNonTyped {
+            nonce: U256::zero(),
+            gas_price: U256::from(42_000_000_000_u64),
+            gas_limit: U256::from(78009_u32),
+            to: Some(Address::from("0x6b175474e89094c44da98b954eedeac495271d0f")),
+            amount: U256::zero(),
+            payload: hex::decode("a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000").unwrap(),
+        };
+        let chain_id = U256::from(10_u8);
+        let actual = tx.encode(chain_id);
+
+        let expected = "f86a808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec800000a8080";
+        assert_eq!(hex::encode(actual, false), expected);
+    }
+
+    #[test]
+    fn test_encode_unsigned_non_typed_pre_hash() {
+        let tx = TransactionNonTyped {
+            nonce: U256::from(9_u64),
+            gas_price: U256::from(20_000_000_000_u64),
+            gas_limit: U256::from(21_000_u64),
+            to: Some(Address::from("0x3535353535353535353535353535353535353535")),
+            amount: U256::from(1_000_000_000_000_000_000_u64),
+            payload: Vec::default(),
+        };
+        let chain_id = U256::from(1_u64);
+        let actual = tx.pre_hash(chain_id);
+
+        let expected = "daf5a779ae972f972197303d7b574746c7ef83eadac0f2791ad23db92e4c8e53";
+        assert_eq!(hex::encode(actual, false), expected);
+    }
+}
diff --git a/rust/tw_evm/src/transaction/user_operation.rs b/rust/tw_evm/src/transaction/user_operation.rs
new file mode 100644
index 00000000000..3f55658bb57
--- /dev/null
+++ b/rust/tw_evm/src/transaction/user_operation.rs
@@ -0,0 +1,201 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::abi::encode::encode_tokens;
+use crate::abi::non_empty_array::NonEmptyBytes;
+use crate::abi::token::Token;
+use crate::address::Address;
+use crate::transaction::signature::Signature;
+use crate::transaction::{SignedTransaction, TransactionCommon, UnsignedTransaction};
+use serde::Serialize;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex;
+use tw_hash::sha3::keccak256;
+use tw_hash::H256;
+use tw_memory::Data;
+use tw_number::U256;
+
+/// EIP4337 UserOperation
+/// https://github.com/ethereum/EIPs/blob/3fd65b1a782912bfc18cb975c62c55f733c7c96e/EIPS/eip-4337.md#specification
+pub struct UserOperation {
+    pub nonce: U256,
+    pub entry_point: Address,
+    pub sender: Address,
+    pub init_code: Data,
+    pub gas_limit: U256,
+    pub verification_gas_limit: U256,
+    pub max_fee_per_gas: U256,
+    pub max_inclusion_fee_per_gas: U256,
+    pub pre_verification_gas: U256,
+    pub paymaster_and_data: Data,
+    pub payload: Data,
+}
+
+impl TransactionCommon for UserOperation {
+    #[inline]
+    fn payload(&self) -> Data {
+        self.payload.clone()
+    }
+}
+
+impl UnsignedTransaction for UserOperation {
+    type SignedTransaction = SignedUserOperation;
+
+    fn pre_hash(&self, chain_id: U256) -> H256 {
+        let encode_hash = keccak256(&self.encode(chain_id));
+        let encode_hash =
+            NonEmptyBytes::new(encode_hash).expect("keccak256 must not return an empty hash");
+
+        let tokens = [
+            Token::FixedBytes(encode_hash),
+            Token::Address(self.entry_point),
+            Token::u256(chain_id),
+        ];
+        let encoded = encode_tokens(&tokens);
+        let pre_hash = keccak256(&encoded);
+        H256::try_from(pre_hash.as_slice()).expect("keccak256 returns 32 bytes")
+    }
+
+    fn encode(&self, _chain_id: U256) -> Data {
+        let init_code_hash = keccak256(&self.init_code);
+        let init_code_hash =
+            NonEmptyBytes::new(init_code_hash).expect("keccak256 must not return an empty hash");
+
+        let payload_hash = keccak256(&self.payload);
+        let payload_hash =
+            NonEmptyBytes::new(payload_hash).expect("keccak256 must not return an empty hash");
+
+        let paymaster_and_data_hash = keccak256(&self.paymaster_and_data);
+        let paymaster_and_data_hash = NonEmptyBytes::new(paymaster_and_data_hash)
+            .expect("keccak256 must not return an empty hash");
+
+        let tokens = [
+            Token::Address(self.sender),
+            Token::u256(self.nonce),
+            Token::FixedBytes(init_code_hash),
+            Token::FixedBytes(payload_hash),
+            Token::u256(self.gas_limit),
+            Token::u256(self.verification_gas_limit),
+            Token::u256(self.pre_verification_gas),
+            Token::u256(self.max_fee_per_gas),
+            Token::u256(self.max_inclusion_fee_per_gas),
+            Token::FixedBytes(paymaster_and_data_hash),
+        ];
+
+        encode_tokens(&tokens)
+    }
+
+    #[inline]
+    fn try_into_signed(
+        self,
+        signature: tw_keypair::ecdsa::secp256k1::Signature,
+        _chain_id: U256,
+    ) -> SigningResult<Self::SignedTransaction> {
+        Ok(SignedUserOperation {
+            unsigned: self,
+            signature: Signature::new(signature),
+        })
+    }
+}
+
+pub struct SignedUserOperation {
+    unsigned: UserOperation,
+    signature: Signature,
+}
+
+impl TransactionCommon for SignedUserOperation {
+    #[inline]
+    fn payload(&self) -> Data {
+        self.unsigned.payload.clone()
+    }
+}
+
+impl SignedTransaction for SignedUserOperation {
+    type Signature = Signature;
+
+    fn encode(&self) -> Data {
+        let mut signature = self.signature.to_rsv_bytes();
+        signature[64] += 27;
+
+        let prefix = true;
+        let tx = SignedUserOperationSerde {
+            call_data: hex::encode(&self.unsigned.payload, prefix),
+            call_gas_limit: self.unsigned.gas_limit.to_string(),
+            init_code: hex::encode(&self.unsigned.init_code, prefix),
+            max_fee_per_gas: self.unsigned.max_fee_per_gas.to_string(),
+            max_priority_fee_per_gas: self.unsigned.max_inclusion_fee_per_gas.to_string(),
+            nonce: self.unsigned.nonce.to_string(),
+            paymaster_and_data: hex::encode(&self.unsigned.paymaster_and_data, prefix),
+            pre_verification_gas: self.unsigned.pre_verification_gas.to_string(),
+            sender: self.unsigned.sender.to_string(),
+            signature: hex::encode(signature.as_slice(), prefix),
+            verification_gas_limit: self.unsigned.verification_gas_limit.to_string(),
+        };
+        serde_json::to_string(&tx)
+            .expect("Simple structure should never fail on serialization")
+            .into_bytes()
+    }
+
+    #[inline]
+    fn signature(&self) -> &Self::Signature {
+        &self.signature
+    }
+}
+
+#[derive(Serialize)]
+#[serde(rename_all = "camelCase")]
+struct SignedUserOperationSerde {
+    call_data: String,
+    call_gas_limit: String,
+    init_code: String,
+    max_fee_per_gas: String,
+    max_priority_fee_per_gas: String,
+    nonce: String,
+    paymaster_and_data: String,
+    pre_verification_gas: String,
+    sender: String,
+    signature: String,
+    verification_gas_limit: String,
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::abi::prebuild::erc4337::{Erc4337SimpleAccount, ExecuteArgs};
+
+    #[test]
+    fn test_encode_user_operation() {
+        let chain_id = U256::from(97u64);
+
+        let execute_args = ExecuteArgs {
+            to: Address::from("0x61061fCAE11fD5461535e134EfF67A98CFFF44E9"),
+            value: U256::from(0x2_386f_26fc_10000u64),
+            data: Vec::default(),
+        };
+        let payload = Erc4337SimpleAccount::encode_execute(execute_args).unwrap();
+
+        let user_op = UserOperation {
+            nonce: U256::from(2u64),
+            entry_point: Address::from("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"),
+            sender: Address::from("0xb16Db98B365B1f89191996942612B14F1Da4Bd5f"),
+            init_code: Vec::default(),
+            gas_limit: U256::from(0x186a0u64),
+            verification_gas_limit: U256::from(0x186a0u64),
+            max_fee_per_gas: U256::from(0x1_a339_c9e9u64),
+            max_inclusion_fee_per_gas: U256::from(0x1_a339_c9e9u64),
+            pre_verification_gas: U256::from(0xb708u64),
+            paymaster_and_data: Vec::default(),
+            payload,
+        };
+
+        let encoded = hex::encode(user_op.encode(chain_id), false);
+        let expected = "000000000000000000000000b16db98b365b1f89191996942612b14f1da4bd5f0000000000000000000000000000000000000000000000000000000000000002c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470fbec3c1db0378685d954edd265aa6eb11e8474d828e6bda151810263838e457000000000000000000000000000000000000000000000000000000000000186a000000000000000000000000000000000000000000000000000000000000186a0000000000000000000000000000000000000000000000000000000000000b70800000000000000000000000000000000000000000000000000000001a339c9e900000000000000000000000000000000000000000000000000000001a339c9e9c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470";
+        assert_eq!(encoded, expected);
+
+        let pre_hash = user_op.pre_hash(chain_id);
+        let expected_pre_hash =
+            H256::from("2d37191a8688f69090451ed90a0a9ba69d652c2062ee9d023b3ebe964a3ed2ae");
+        assert_eq!(pre_hash, expected_pre_hash);
+    }
+}
diff --git a/rust/tw_evm/tests/abi_encoder.rs b/rust/tw_evm/tests/abi_encoder.rs
new file mode 100644
index 00000000000..64feb710531
--- /dev/null
+++ b/rust/tw_evm/tests/abi_encoder.rs
@@ -0,0 +1,687 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde_json::{json, Value as Json};
+use std::borrow::Cow;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_evm::abi::AbiErrorKind;
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::abi_encoder::AbiEncoder;
+use tw_number::{I256, U256};
+use tw_proto::EthereumAbi::Proto;
+
+use Proto::mod_ParamType::OneOfparam as ParamTypeEnum;
+use Proto::mod_ParamsDecodingInput::OneOfabi as AbiEnum;
+use Proto::mod_Token::OneOftoken as TokenEnum;
+
+const SWAP_V2_ABI: &str = include_str!("data/swap_v2.json");
+const SWAP_V2_DECODED: &str = include_str!("data/swap_v2_decoded.json");
+
+fn param(name: &str, kind: ParamTypeEnum<'static>) -> Proto::Param<'static> {
+    Proto::Param {
+        name: name.to_string().into(),
+        param: Some(Proto::ParamType { param: kind }),
+    }
+}
+
+fn named_token(name: &str, token: TokenEnum<'static>) -> Proto::Token<'static> {
+    Proto::Token {
+        name: Cow::Owned(name.to_string()),
+        token,
+    }
+}
+
+fn u_number_n<const BITS: u32>(value: u64) -> TokenEnum<'static> {
+    TokenEnum::number_uint(Proto::NumberNParam {
+        bits: BITS,
+        value: U256::encode_be_compact(value),
+    })
+}
+
+fn s_number_n<const BITS: u32>(value: i64) -> TokenEnum<'static> {
+    TokenEnum::number_int(Proto::NumberNParam {
+        bits: BITS,
+        value: I256::encode_be_compact(value),
+    })
+}
+
+fn number_type_n<const BITS: u32>() -> Proto::NumberNType {
+    Proto::NumberNType { bits: BITS }
+}
+
+fn array(
+    element_type: ParamTypeEnum<'static>,
+    values: Vec<TokenEnum<'static>>,
+) -> Proto::ArrayParam<'static> {
+    let elements = values
+        .into_iter()
+        .map(|token| Proto::Token {
+            name: "".into(),
+            token,
+        })
+        .collect();
+    let element_type = Some(Proto::ParamType {
+        param: element_type,
+    });
+    Proto::ArrayParam {
+        element_type,
+        elements,
+    }
+}
+
+fn array_type(element_type: ParamTypeEnum<'static>) -> Box<Proto::ArrayType<'static>> {
+    Box::new(Proto::ArrayType {
+        element_type: Some(Box::new(Proto::ParamType {
+            param: element_type,
+        })),
+    })
+}
+
+fn tuple<I>(params: I) -> TokenEnum<'static>
+where
+    I: IntoIterator<Item = Proto::Token<'static>>,
+{
+    TokenEnum::tuple(Proto::TupleParam {
+        params: params.into_iter().collect(),
+    })
+}
+
+fn test_encode_contract_call_impl(
+    function_name: &str,
+    tokens: Vec<Proto::Token<'_>>,
+    expected_call: &str,
+) {
+    let input = Proto::FunctionEncodingInput {
+        function_name: function_name.into(),
+        tokens,
+    };
+
+    let output = AbiEncoder::<StandardEvmContext>::encode_contract_call(input);
+    assert_eq!(output.error, AbiErrorKind::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(output.encoded.to_hex(), expected_call);
+}
+
+fn test_decode_params_impl(
+    encoded: &str,
+    expected_tokens: Vec<Proto::Token<'_>>,
+    abi: AbiEnum<'_>,
+) {
+    let input = Proto::ParamsDecodingInput {
+        encoded: encoded.decode_hex().unwrap().into(),
+        abi,
+    };
+
+    let output = AbiEncoder::<StandardEvmContext>::decode_params(input);
+    assert_eq!(output.error, AbiErrorKind::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(output.tokens, expected_tokens);
+}
+
+fn test_decode_contract_call_impl(
+    encoded: &str,
+    abi_json: &str,
+    decoded_json: &str,
+    expected_tokens: Vec<Proto::Token<'_>>,
+) {
+    let input = Proto::ContractCallDecodingInput {
+        encoded: encoded.decode_hex().unwrap().into(),
+        smart_contract_abi_json: Cow::Borrowed(abi_json),
+    };
+
+    let output = AbiEncoder::<StandardEvmContext>::decode_contract_call(input);
+    assert_eq!(output.error, AbiErrorKind::OK);
+    assert!(output.error_message.is_empty());
+
+    let actual_json: Json = serde_json::from_str(&output.decoded_json).unwrap();
+    let expected_json: Json = serde_json::from_str(decoded_json).unwrap();
+    assert_eq!(actual_json, expected_json);
+    assert_eq!(output.tokens, expected_tokens);
+}
+
+mod swap_v2 {
+    use super::*;
+
+    const FUNCTION_NAME: &str = "callBridgeCall";
+    const ENCODED_CALL: &str = "846a1bc6000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000470de4df82000000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000740000000000000000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000000000820000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b300000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f00000000000000000000000000000000000000000000000000470de4df820000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000046000000000000000000000000000000000000000000000000000000000000003840651cb35000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000bebc44782c7db0a1a60cb6fe97d0b483032ff1c7000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df8200000000000000000000000000000000000000000000000000000000298ce42936ed0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ce16f69375520ab01377ce7b88f5ba8c48f8d66600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045553444300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000762696e616e636500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a307863653136463639333735353230616230313337376365374238386635424138433438463844363636000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000005a0000000000000000000000000000000000000000000000000000000000000072000000000000000000000000000000000000000000000000000000000000009600000000000000000000000000000000000000000000000000000000000000ac000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000000000000000000000000000000000000000000010000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb1400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf3890000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000640000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7044000000000000000000000000000000000000000000000000000029a23529cf68000000000000000000000000000000000000000000005af4f3f913bd553d03b900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf30000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000100000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf38900000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000001f40000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7045000000000000000000000000000000000000000000005b527785e694f805bdd300000000000000000000000000000000000000000000005f935a1fa5c4a6ec61000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000242e1a7d4d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
+
+    fn calls_array_type() -> ParamTypeEnum<'static> {
+        ParamTypeEnum::tuple(Proto::TupleType {
+            params: vec![
+                param("callType", ParamTypeEnum::number_uint(number_type_n::<8>())),
+                param("target", ParamTypeEnum::address(Proto::AddressType {})),
+                param("value", ParamTypeEnum::number_uint(number_type_n::<256>())),
+                param(
+                    "callData",
+                    ParamTypeEnum::byte_array(Proto::ByteArrayType {}),
+                ),
+                param(
+                    "payload",
+                    ParamTypeEnum::byte_array(Proto::ByteArrayType {}),
+                ),
+            ],
+        })
+    }
+
+    fn token_values() -> Vec<Proto::Token<'static>> {
+        let call_data_1 = "0x095ea7b300000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f00000000000000000000000000000000000000000000000000470de4df820000".decode_hex().unwrap();
+        let call_data_2 = "0x0651cb35000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000bebc44782c7db0a1a60cb6fe97d0b483032ff1c7000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df8200000000000000000000000000000000000000000000000000000000298ce42936ed0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ce16f69375520ab01377ce7b88f5ba8c48f8d666".decode_hex().unwrap();
+
+        let calls = vec![
+            tuple(vec![
+                named_token("callType", u_number_n::<8>(0)),
+                named_token(
+                    "target",
+                    TokenEnum::address("0xdAC17F958D2ee523a2206206994597C13D831ec7".into()),
+                ),
+                named_token("value", u_number_n::<256>(0)),
+                named_token("callData", TokenEnum::byte_array(call_data_1.into())),
+                named_token("payload", TokenEnum::byte_array(Cow::default())),
+            ]),
+            tuple(vec![
+                named_token("callType", u_number_n::<8>(0)),
+                named_token(
+                    "target",
+                    TokenEnum::address("0x99a58482BD75cbab83b27EC03CA68fF489b5788f".into()),
+                ),
+                named_token("value", u_number_n::<256>(0)),
+                named_token("callData", TokenEnum::byte_array(call_data_2.into())),
+                named_token("payload", TokenEnum::byte_array(Cow::default())),
+            ]),
+        ];
+
+        let payload = "0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000005a0000000000000000000000000000000000000000000000000000000000000072000000000000000000000000000000000000000000000000000000000000009600000000000000000000000000000000000000000000000000000000000000ac000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000000000000000000000000000000000000000000010000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb1400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf3890000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000640000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7044000000000000000000000000000000000000000000000000000029a23529cf68000000000000000000000000000000000000000000005af4f3f913bd553d03b900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf30000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000100000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf38900000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000001f40000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7045000000000000000000000000000000000000000000005b527785e694f805bdd300000000000000000000000000000000000000000000005f935a1fa5c4a6ec61000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000242e1a7d4d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".decode_hex().unwrap();
+        vec![
+            named_token(
+                "token",
+                TokenEnum::address("0xdAC17F958D2ee523a2206206994597C13D831ec7".into()),
+            ),
+            named_token("amount", u_number_n::<256>(20000000000000000)),
+            named_token("calls", TokenEnum::array(array(calls_array_type(), calls))),
+            named_token("bridgedTokenSymbol", TokenEnum::string_value("USDC".into())),
+            named_token(
+                "destinationChain",
+                TokenEnum::string_value("binance".into()),
+            ),
+            named_token(
+                "destinationAddress",
+                TokenEnum::string_value("0xce16F69375520ab01377ce7B88f5BA8C48F8D666".into()),
+            ),
+            named_token("payload", TokenEnum::byte_array(payload.into())),
+            named_token(
+                "gasRefundRecipient",
+                TokenEnum::address("0xa140F413C63FBDA84E9008607E678258ffFbC76b".into()),
+            ),
+            named_token("enableExpress", TokenEnum::boolean(true)),
+        ]
+    }
+
+    #[test]
+    fn test_decode_contract_call_swap_v2() {
+        test_decode_contract_call_impl(ENCODED_CALL, SWAP_V2_ABI, SWAP_V2_DECODED, token_values());
+    }
+
+    #[test]
+    fn test_encode_contract_call_swap_v2() {
+        test_encode_contract_call_impl(FUNCTION_NAME, token_values(), ENCODED_CALL);
+    }
+}
+
+#[test]
+fn test_decode_params_with_abi_json() {
+    let abi_json = json!([
+        {
+            "internalType": "bytes32",
+            "name": "node",
+            "type": "bytes32"
+        },
+        {
+            "internalType": "address",
+            "name": "resolver",
+            "type": "address"
+        }
+    ]);
+    let abi_json = serde_json::to_string(&abi_json).unwrap();
+    let encoded = "e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f0000000000000000000000004976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41";
+
+    let node_bytes = "0xe71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f"
+        .decode_hex()
+        .unwrap();
+    let expected_tokens = vec![
+        named_token("node", TokenEnum::byte_array_fix(node_bytes.into())),
+        named_token(
+            "resolver",
+            TokenEnum::address("0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41".into()),
+        ),
+    ];
+
+    test_decode_params_impl(encoded, expected_tokens, AbiEnum::abi_json(abi_json.into()));
+}
+
+#[test]
+fn test_decode_params_with_abi_params() {
+    let encoded = "e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f0000000000000000000000004976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41";
+
+    let node_bytes = "0xe71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f"
+        .decode_hex()
+        .unwrap();
+    let expected_tokens = vec![
+        named_token("node", TokenEnum::byte_array_fix(node_bytes.into())),
+        named_token(
+            "resolver",
+            TokenEnum::address("0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41".into()),
+        ),
+    ];
+
+    let abi_params = vec![
+        param(
+            "node",
+            ParamTypeEnum::byte_array_fix(Proto::ByteArrayFixType { size: 32 }),
+        ),
+        param("resolver", ParamTypeEnum::address(Proto::AddressType {})),
+    ];
+
+    test_decode_params_impl(
+        encoded,
+        expected_tokens,
+        AbiEnum::abi_params(Proto::AbiParams { params: abi_params }),
+    );
+}
+
+mod dynamic_arguments {
+    use super::*;
+
+    const FUNCTION_NAME: &str = "f";
+    const ENCODED_CALL_WITH_SIGNATURE: &str = "47b941bf00000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000080313233343536373839300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000004560000000000000000000000000000000000000000000000000000000000000789000000000000000000000000000000000000000000000000000000000000000d48656c6c6f2c20776f726c642100000000000000000000000000000000000000";
+    const ENCODED_CALL: &str = "00000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000080313233343536373839300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000e0000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000004560000000000000000000000000000000000000000000000000000000000000789000000000000000000000000000000000000000000000000000000000000000d48656c6c6f2c20776f726c642100000000000000000000000000000000000000";
+
+    fn token_values() -> Vec<Proto::Token<'static>> {
+        let dynamic_array = array(
+            ParamTypeEnum::number_uint(number_type_n::<32>()),
+            vec![u_number_n::<32>(0x456), u_number_n::<32>(0x789)],
+        );
+        let byte_array = vec![0x31u8, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30];
+        vec![
+            named_token("", u_number_n::<256>(0x123)),
+            named_token("", TokenEnum::array(dynamic_array)),
+            named_token("", TokenEnum::byte_array_fix(byte_array.into())),
+            named_token("", TokenEnum::string_value("Hello, world!".into())),
+        ]
+    }
+
+    fn param_types() -> Vec<Proto::Param<'static>> {
+        vec![
+            param("", ParamTypeEnum::number_uint(number_type_n::<256>())),
+            param(
+                "",
+                ParamTypeEnum::array(array_type(
+                    ParamTypeEnum::number_uint(number_type_n::<32>()),
+                )),
+            ),
+            param(
+                "",
+                ParamTypeEnum::byte_array_fix(Proto::ByteArrayFixType { size: 10 }),
+            ),
+            param("", ParamTypeEnum::string_param(Proto::StringType {})),
+        ]
+    }
+
+    #[test]
+    fn test_encode_contract_call_with_dynamic_arguments() {
+        test_encode_contract_call_impl(FUNCTION_NAME, token_values(), ENCODED_CALL_WITH_SIGNATURE);
+    }
+
+    #[test]
+    fn test_decode_params_with_dynamic_arguments_case2() {
+        test_decode_params_impl(
+            ENCODED_CALL,
+            token_values(),
+            AbiEnum::abi_params(Proto::AbiParams {
+                params: param_types(),
+            }),
+        );
+    }
+}
+
+mod negative_integers {
+    use super::*;
+
+    const FUNCTION_NAME: &str = "approve";
+    const ENCODED_CALL_WITH_SIGNATURE: &str = "d4e12f2e0000000000000000000000005aaeb6053f3e94c9b9a09f33669435e7ef1beaedfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd";
+    const ENCODED_CALL: &str = "0000000000000000000000005aaeb6053f3e94c9b9a09f33669435e7ef1beaedfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd";
+
+    const ABI_JSON: &str = include_str!("data/abi_with_negative_int.json");
+    const DECODED_JSON: &str = include_str!("data/decoded_abi_with_negative_int.json");
+
+    fn token_values() -> Vec<Proto::Token<'static>> {
+        vec![
+            named_token(
+                "_spender",
+                TokenEnum::address("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed".into()),
+            ),
+            named_token("_value", s_number_n::<256>(-3)),
+        ]
+    }
+
+    fn param_types() -> Vec<Proto::Param<'static>> {
+        vec![
+            param("_spender", ParamTypeEnum::address(Proto::AddressType {})),
+            param("_value", ParamTypeEnum::number_int(number_type_n::<256>())),
+        ]
+    }
+
+    #[test]
+    fn test_encode_contract_call_with_negative_integer() {
+        test_encode_contract_call_impl(FUNCTION_NAME, token_values(), ENCODED_CALL_WITH_SIGNATURE);
+    }
+
+    #[test]
+    fn test_decode_params_with_negative_integer() {
+        test_decode_params_impl(
+            ENCODED_CALL,
+            token_values(),
+            AbiEnum::abi_params(Proto::AbiParams {
+                params: param_types(),
+            }),
+        );
+    }
+
+    #[test]
+    fn test_decode_contract_call_with_negative_integer() {
+        test_decode_contract_call_impl(
+            ENCODED_CALL_WITH_SIGNATURE,
+            ABI_JSON,
+            DECODED_JSON,
+            token_values(),
+        );
+    }
+}
+
+#[test]
+fn test_encode_params_monster() {
+    let byte_array = "3132333435".decode_hex().unwrap();
+
+    let u1 = u_number_n::<8>(1);
+    let u2 = u_number_n::<16>(2);
+    let u3 = u_number_n::<32>(3);
+    let u4 = u_number_n::<64>(4);
+    let u5 = u_number_n::<168>(0x123);
+    let u6 = u_number_n::<256>(0x123);
+
+    let u1t = ParamTypeEnum::number_uint(number_type_n::<8>());
+    let u2t = ParamTypeEnum::number_uint(number_type_n::<16>());
+    let u3t = ParamTypeEnum::number_uint(number_type_n::<32>());
+    let u4t = ParamTypeEnum::number_uint(number_type_n::<64>());
+    let u5t = ParamTypeEnum::number_uint(number_type_n::<168>());
+    let u6t = ParamTypeEnum::number_uint(number_type_n::<256>());
+
+    let i1 = s_number_n::<8>(1);
+    let i2 = s_number_n::<16>(2);
+    let i3 = s_number_n::<32>(3);
+    let i4 = s_number_n::<64>(4);
+    let i5 = s_number_n::<168>(0x123);
+    let i6 = s_number_n::<256>(0x123);
+
+    let i1t = ParamTypeEnum::number_int(number_type_n::<8>());
+    let i2t = ParamTypeEnum::number_int(number_type_n::<16>());
+    let i3t = ParamTypeEnum::number_int(number_type_n::<32>());
+    let i4t = ParamTypeEnum::number_int(number_type_n::<64>());
+    let i5t = ParamTypeEnum::number_int(number_type_n::<168>());
+    let i6t = ParamTypeEnum::number_int(number_type_n::<256>());
+
+    let b = TokenEnum::boolean(true);
+    let bt = ParamTypeEnum::boolean(Proto::BoolType {});
+    let s = TokenEnum::string_value("Hello, world!".into());
+    let st = ParamTypeEnum::string_param(Proto::StringType {});
+    let a = TokenEnum::address("0xf784682c82526e245f50975190ef0fff4e4fc077".into());
+    let at = ParamTypeEnum::address(Proto::AddressType {});
+    let bytes = TokenEnum::byte_array(byte_array.clone().into());
+    let bytes_t = ParamTypeEnum::byte_array(Proto::ByteArrayType {});
+    let fbytes = TokenEnum::byte_array_fix(byte_array.clone().into());
+    let fbytes_t = ParamTypeEnum::byte_array_fix(Proto::ByteArrayFixType {
+        size: byte_array.len() as u64,
+    });
+
+    let tokens = vec![
+        // Uint
+        named_token("u1", u1.clone()),
+        named_token("u2", u2.clone()),
+        named_token("u3", u3.clone()),
+        named_token("u4", u4.clone()),
+        named_token("u5", u5.clone()),
+        named_token("u6", u6.clone()),
+        // Int
+        named_token("i1", i1.clone()),
+        named_token("i2", i2.clone()),
+        named_token("i3", i3.clone()),
+        named_token("i4", i4.clone()),
+        named_token("i5", i5.clone()),
+        named_token("i6", i6.clone()),
+        // Single params
+        named_token("b", b.clone()),
+        named_token("s", s.clone()),
+        named_token("a", a.clone()),
+        named_token("bytes", bytes.clone()),
+        named_token("fbytes", fbytes.clone()),
+        // Array<Uint>
+        named_token("a_u1", TokenEnum::array(array(u1t, vec![u1]))),
+        named_token("a_u2", TokenEnum::array(array(u2t, vec![u2]))),
+        named_token("a_u3", TokenEnum::array(array(u3t, vec![u3]))),
+        named_token("a_u4", TokenEnum::array(array(u4t, vec![u4]))),
+        named_token("a_u5", TokenEnum::array(array(u5t, vec![u5]))),
+        named_token("a_u6", TokenEnum::array(array(u6t, vec![u6]))),
+        // Array<Int>
+        named_token("a_i1", TokenEnum::array(array(i1t, vec![i1]))),
+        named_token("a_i2", TokenEnum::array(array(i2t, vec![i2]))),
+        named_token("a_i3", TokenEnum::array(array(i3t, vec![i3]))),
+        named_token("a_i4", TokenEnum::array(array(i4t, vec![i4]))),
+        named_token("a_i5", TokenEnum::array(array(i5t, vec![i5]))),
+        named_token("a_i6", TokenEnum::array(array(i6t, vec![i6]))),
+        // Arrays with single params
+        named_token("a_b", TokenEnum::array(array(bt, vec![b]))),
+        named_token("a_s", TokenEnum::array(array(st, vec![s]))),
+        named_token("a_a", TokenEnum::array(array(at, vec![a]))),
+        named_token("a_bytes", TokenEnum::array(array(bytes_t, vec![bytes]))),
+        named_token("a_fbytes", TokenEnum::array(array(fbytes_t, vec![fbytes]))),
+    ];
+    let encoding_input = Proto::FunctionEncodingInput {
+        function_name: "monster".into(),
+        tokens,
+    };
+    let output = AbiEncoder::<StandardEvmContext>::encode_contract_call(encoding_input);
+
+    assert_eq!(output.error, AbiErrorKind::OK);
+    assert!(output.error_message.is_empty());
+
+    // let expected_encoded = "4061f075000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000002c0000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077000000000000000000000000000000000000000000000000000000000000030031323334350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000340000000000000000000000000000000000000000000000000000000000000038000000000000000000000000000000000000000000000000000000000000003c000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000440000000000000000000000000000000000000000000000000000000000000048000000000000000000000000000000000000000000000000000000000000004c00000000000000000000000000000000000000000000000000000000000000500000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000005c00000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000000d48656c6c6f2c20776f726c642100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000531323334350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000d48656c6c6f2c20776f726c6421000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000005313233343500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000013132333435000000000000000000000000000000000000000000000000000000";
+    let expected_encoded = "70efb5a500000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000012300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000012300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000440000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc0770000000000000000000000000000000000000000000000000000000000000480313233343500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000068000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000000740000000000000000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000088000000000000000000000000000000000000000000000000000000000000008c00000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000000000000000000000000000d48656c6c6f2c20776f726c642100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000531323334350000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000d48656c6c6f2c20776f726c6421000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000005313233343500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000013132333435000000000000000000000000000000000000000000000000000000";
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+}
+
+#[test]
+fn test_decode_value() {
+    struct TestInput {
+        encoded: &'static str,
+        kind: &'static str,
+        expected_value_str: &'static str,
+        expected_value_proto: TokenEnum<'static>,
+    }
+
+    let num1 = u_number_n::<8>(49);
+    let num2 = u_number_n::<8>(50);
+    let num3 = u_number_n::<8>(51);
+    let address1 = TokenEnum::address("0xF784682C82526e245F50975190EF0fff4E4fC077".into());
+    let address2 = TokenEnum::address("0x2e00CD222Cb42B616D86D037Cc494e8ab7F5c9a3".into());
+    let bytes1 = TokenEnum::byte_array("0x1011".decode_hex().unwrap().into());
+    let bytes2 = TokenEnum::byte_array("0x102222".decode_hex().unwrap().into());
+
+    let test_values = [
+        TestInput {
+            encoded: "0000000000000000000000000000000000000000000000000000091d0eb3e2af",
+            kind: "uint256",
+            expected_value_str: "10020405371567",
+            expected_value_proto: u_number_n::<256>(10020405371567),
+        },
+        TestInput {
+            encoded: "0000000000000000000000000000000000000000000000000000091d0eb3e2af0000000000000000000000000000000000000000000000000000000000000000",
+            kind: "int256",
+            expected_value_str: "10020405371567",
+            expected_value_proto: s_number_n::<256>(10020405371567),
+        },
+        TestInput {
+            encoded: "000000000000000000000000000000000000000000000000000000000000002a",
+            kind: "uint",
+            expected_value_str: "42",
+            expected_value_proto: u_number_n::<256>(42),
+        },
+        TestInput {
+            encoded: "0000000000000000000000000000000000000000000000000000000000000018",
+            kind: "uint8",
+            expected_value_str: "24",
+            expected_value_proto: u_number_n::<8>(24),
+        },
+        TestInput {
+            encoded: "0000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000003100000000000000000000000000000000000000000000000000000000000000320000000000000000000000000000000000000000000000000000000000000033",
+            kind: "uint8[]",
+            expected_value_str: "[49,50,51]",
+            expected_value_proto: TokenEnum::array(array(ParamTypeEnum::number_uint(number_type_n::<8>()), vec![num1, num2, num3])),
+        },
+        TestInput {
+            encoded: "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077",
+            kind: "address",
+            expected_value_str: "0xF784682C82526e245F50975190EF0fff4E4fC077",
+            expected_value_proto: TokenEnum::address(
+                "0xF784682C82526e245F50975190EF0fff4E4fC077".into(),
+            ),
+        },
+        TestInput {
+            encoded: "000000000000000000000000000000000000000000000000000000000000002c48656c6c6f20576f726c64212020202048656c6c6f20576f726c64212020202048656c6c6f20576f726c64210000000000000000000000000000000000000000",
+            kind: "string",
+            expected_value_str: "Hello World!    Hello World!    Hello World!",
+            expected_value_proto: TokenEnum::string_value(
+                "Hello World!    Hello World!    Hello World!".into(),
+            ),
+        },
+        TestInput {
+            encoded: "0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc0770000000000000000000000002e00cd222cb42b616d86d037cc494e8ab7f5c9a3",
+            kind: "address[]",
+            expected_value_str: r#"["0xF784682C82526e245F50975190EF0fff4E4fC077","0x2e00CD222Cb42B616D86D037Cc494e8ab7F5c9a3"]"#,
+            expected_value_proto: TokenEnum::array(
+                array(ParamTypeEnum::address(Proto::AddressType {}), vec![address1, address2])),
+        },
+        TestInput {
+            encoded: "3132333435363738393000000000000000000000000000000000000000000000",
+            kind: "bytes10",
+            expected_value_str: "0x31323334353637383930",
+            expected_value_proto: TokenEnum::byte_array_fix(
+                "0x31323334353637383930".decode_hex().unwrap().into(),
+            ),
+        },
+        TestInput {
+            encoded: "0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000002101100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000031022220000000000000000000000000000000000000000000000000000000000",
+            kind: "bytes[]",
+            expected_value_str: r#"["0x1011","0x102222"]"#,
+            expected_value_proto: TokenEnum::array(
+                array(ParamTypeEnum::byte_array(Proto::ByteArrayType {}), vec![bytes1, bytes2])
+            ),
+        },
+    ];
+
+    for test in test_values {
+        let input = Proto::ValueDecodingInput {
+            encoded: test.encoded.decode_hex().unwrap().into(),
+            param_type: test.kind.into(),
+        };
+        let output = AbiEncoder::<StandardEvmContext>::decode_value(input);
+        assert_eq!(output.error, AbiErrorKind::OK);
+        assert!(output.error_message.is_empty());
+
+        assert_eq!(output.token.unwrap().token, test.expected_value_proto);
+        assert_eq!(output.param_str, test.expected_value_str);
+    }
+}
+
+#[test]
+fn test_decode_value_error() {
+    #[track_caller]
+    fn test_decode_value_error_impl(kind: &str, encoded: &str) {
+        let input = Proto::ValueDecodingInput {
+            encoded: encoded.decode_hex().unwrap().into(),
+            param_type: kind.into(),
+        };
+        let output = AbiEncoder::<StandardEvmContext>::decode_value(input);
+        assert_ne!(output.error, AbiErrorKind::OK);
+        assert!(!output.error_message.is_empty());
+    }
+
+    test_decode_value_error_impl("tuple[7][][2][2]", "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000375696e742a6c");
+    test_decode_value_error_impl("bytes0[0][][2][6]", "0000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000375696e742a6c");
+}
+
+#[test]
+fn test_encode_params_invalid_address() {
+    struct TestInput {
+        token: TokenEnum<'static>,
+        error: AbiErrorKind,
+    }
+
+    let test_inputs = [
+        // No address '0x' prefix.
+        TestInput {
+            token: TokenEnum::address("f784682c82526e245f50975190ef0fff4e4fc077".into()),
+            error: AbiErrorKind::Error_invalid_address_value,
+        },
+        // There is no uint0.
+        TestInput {
+            token: u_number_n::<0>(0),
+            error: AbiErrorKind::Error_invalid_uint_value,
+        },
+        // There is no int7.
+        TestInput {
+            token: s_number_n::<7>(1),
+            error: AbiErrorKind::Error_invalid_uint_value,
+        },
+        // There is no uint512.
+        TestInput {
+            token: u_number_n::<512>(123),
+            error: AbiErrorKind::Error_invalid_uint_value,
+        },
+        // ArrayType::element_type and token mismatch.
+        TestInput {
+            token: TokenEnum::array(array(
+                ParamTypeEnum::number_uint(number_type_n::<8>()),
+                vec![u_number_n::<256>(1000)],
+            )),
+            error: AbiErrorKind::Error_invalid_param_type,
+        },
+    ];
+
+    for TestInput { token, error } in test_inputs {
+        let encoding_input = Proto::FunctionEncodingInput {
+            function_name: "NonExisting".into(),
+            tokens: vec![named_token("", token.clone())],
+        };
+
+        let output = AbiEncoder::<StandardEvmContext>::encode_contract_call(encoding_input);
+        assert_eq!(
+            output.error, error,
+            "Expected error on encoding {:?}",
+            token
+        );
+        assert!(!output.error_message.is_empty());
+    }
+}
+
+#[test]
+fn test_decode_contract_call_error() {
+    let encoded_input = "11223344000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000470de4df82000000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000740000000000000000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000000000820000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b300000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f00000000000000000000000000000000000000000000000000470de4df820000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000046000000000000000000000000000000000000000000000000000000000000003840651cb35000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000bebc44782c7db0a1a60cb6fe97d0b483032ff1c7000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df8200000000000000000000000000000000000000000000000000000000298ce42936ed0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ce16f69375520ab01377ce7b88f5ba8c48f8d66600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045553444300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000762696e616e636500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a307863653136463639333735353230616230313337376365374238386635424138433438463844363636000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000005a0000000000000000000000000000000000000000000000000000000000000072000000000000000000000000000000000000000000000000000000000000009600000000000000000000000000000000000000000000000000000000000000ac000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000000000000000000000000000000000000000000010000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb1400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf3890000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000640000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7044000000000000000000000000000000000000000000000000000029a23529cf68000000000000000000000000000000000000000000005af4f3f913bd553d03b900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf30000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000100000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf38900000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000001f40000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7045000000000000000000000000000000000000000000005b527785e694f805bdd300000000000000000000000000000000000000000000005f935a1fa5c4a6ec61000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000242e1a7d4d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000".decode_hex().unwrap();
+    let input = Proto::ContractCallDecodingInput {
+        encoded: Cow::Owned(encoded_input),
+        smart_contract_abi_json: Cow::Borrowed(SWAP_V2_ABI),
+    };
+
+    let output = AbiEncoder::<StandardEvmContext>::decode_contract_call(input);
+    assert_eq!(output.error, AbiErrorKind::Error_abi_mismatch);
+    assert!(!output.error_message.is_empty());
+}
diff --git a/rust/tw_evm/tests/barz.rs b/rust/tw_evm/tests/barz.rs
new file mode 100644
index 00000000000..2b4a250fd26
--- /dev/null
+++ b/rust/tw_evm/tests/barz.rs
@@ -0,0 +1,192 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex;
+use tw_evm::abi::prebuild::erc20::Erc20;
+use tw_evm::address::Address;
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::signer::Signer;
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+
+// https://testnet.bscscan.com/tx/0x43fc13dfdf06bbb09da8ce070953753764f1e43782d0c8b621946d8b45749419
+#[test]
+fn test_barz_transfer_account_deployed() {
+    let private_key =
+        hex::decode("0x3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483").unwrap();
+
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(0x23_86f2_6fc1_0000),
+        data: Cow::default(),
+    };
+    let user_op = Proto::UserOperation {
+        entry_point: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789".into(),
+        init_code: Cow::default(),
+        sender: "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f".into(),
+        pre_verification_gas: U256::encode_be_compact(0xb708),
+        verification_gas_limit: U256::encode_be_compact(0x186a0),
+        paymaster_and_data: Cow::default(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(97),
+        nonce: U256::encode_be_compact(2),
+        tx_mode: Proto::TransactionMode::UserOp,
+        gas_limit: U256::encode_be_compact(0x186A0),
+        max_fee_per_gas: U256::encode_be_compact(0x1_a339_c9e9),
+        max_inclusion_fee_per_gas: U256::encode_be_compact(0x1_a339_c9e9),
+        to_address: "0x61061fCAE11fD5461535e134EfF67A98CFFF44E9".into(),
+        private_key: private_key.into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        user_operation: Some(user_op),
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = r#"{"callData":"0xb61d27f600000000000000000000000061061fcae11fd5461535e134eff67a98cfff44e9000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000","callGasLimit":"100000","initCode":"0x","maxFeePerGas":"7033440745","maxPriorityFeePerGas":"7033440745","nonce":"2","paymasterAndData":"0x","preVerificationGas":"46856","sender":"0xb16Db98B365B1f89191996942612B14F1Da4Bd5f","signature":"0x80e84992ebf8d5f71180231163ed150a7557ed0aa4b4bcee23d463a09847e4642d0fbf112df2e5fa067adf4b2fa17fc4a8ac172134ba5b78e3ec9c044e7f28d71c","verificationGasLimit":"100000"}"#;
+    let actual = String::from_utf8(output.encoded.to_vec()).unwrap();
+    assert_eq!(actual, expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "2d37191a8688f69090451ed90a0a9ba69d652c2062ee9d023b3ebe964a3ed2ae"
+    );
+}
+
+// // https://testnet.bscscan.com/tx/0xea1f5cddc0653e116327cbcb3bc770360a642891176eff2ec69c227e46791c31
+#[test]
+fn test_barz_transfer_account_not_deployed() {
+    let private_key =
+        hex::decode("0x3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483").unwrap();
+
+    // TODO generate `init_code` with Barz when it's moved to Rust.
+    // See: https://github.com/trustwallet/wallet-core/blob/f266567e913a40bfee80b8ecdd4b74785cea2b32/tests/chains/Ethereum/BarzTests.cpp#L160
+    let init_code = hex::decode("3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000005034534efe9902779ed6ea6983f435c00f3bc51000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104b173a6a812025c40c38bac46343646bd0a8137c807aae6e04aac238cc24d2ad2116ca14d23d357588ff2aabd7db29d5976f4ecc8037775db86f67e873a306b1f00000000000000000000000000000000000000000000000000000000000000").unwrap();
+
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(0x23_86f2_6fc1_0000),
+        data: Cow::default(),
+    };
+    let user_op = Proto::UserOperation {
+        entry_point: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789".into(),
+        init_code: init_code.into(),
+        sender: "0x1392Ae041BfBdBAA0cFF9234a0C8F64df97B7218".into(),
+        pre_verification_gas: U256::encode_be_compact(0xb708),
+        verification_gas_limit: U256::encode_be_compact(0x2D_C6C0),
+        paymaster_and_data: Cow::default(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(97),
+        nonce: U256::encode_be_compact(0),
+        tx_mode: Proto::TransactionMode::UserOp,
+        gas_limit: U256::encode_be_compact(0x26_25A0),
+        max_fee_per_gas: U256::encode_be_compact(0x1_a339_c9e9),
+        max_inclusion_fee_per_gas: U256::encode_be_compact(0x1_a339_c9e9),
+        to_address: "0x61061fCAE11fD5461535e134EfF67A98CFFF44E9".into(),
+        private_key: private_key.into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        user_operation: Some(user_op),
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = r#"{"callData":"0xb61d27f600000000000000000000000061061fcae11fd5461535e134eff67a98cfff44e9000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000","callGasLimit":"2500000","initCode":"0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000005034534efe9902779ed6ea6983f435c00f3bc51000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104b173a6a812025c40c38bac46343646bd0a8137c807aae6e04aac238cc24d2ad2116ca14d23d357588ff2aabd7db29d5976f4ecc8037775db86f67e873a306b1f00000000000000000000000000000000000000000000000000000000000000","maxFeePerGas":"7033440745","maxPriorityFeePerGas":"7033440745","nonce":"0","paymasterAndData":"0x","preVerificationGas":"46856","sender":"0x1392Ae041BfBdBAA0cFF9234a0C8F64df97B7218","signature":"0xbf1b68323974e71ad9bd6dfdac07dc062599d150615419bb7876740d2bcf3c8909aa7e627bb0e08a2eab930e2e7313247c9b683c884236dd6ea0b6834fb2cb0a1b","verificationGasLimit":"3000000"}"#;
+    let actual = String::from_utf8(output.encoded.to_vec()).unwrap();
+    assert_eq!(actual, expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "548c13a0bb87981d04a3a24a78ad5e4ba8d0afbf3cfe9311250e07b54cd38937"
+    );
+}
+
+// // https://testnet.bscscan.com/tx/0xea1f5cddc0653e116327cbcb3bc770360a642891176eff2ec69c227e46791c31
+#[test]
+fn test_barz_batched_account_deployed() {
+    let private_key =
+        hex::decode("0x3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483").unwrap();
+
+    let contract_address = "0x03bBb5660B8687C2aa453A0e42dCb6e0732b1266";
+
+    let mut calls = Vec::with_capacity(2);
+
+    // ERC20 approve
+    {
+        let spender = Address::from("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789");
+        let amount = U256::from(0x8AC7_2304_89E8_0000_u64);
+        let payload = Erc20::approve(spender, amount).unwrap();
+
+        calls.push(Proto::mod_Transaction::mod_Batch::BatchedCall {
+            address: contract_address.into(),
+            amount: Cow::default(),
+            payload: payload.into(),
+        });
+    };
+
+    // ERC20 transfer
+    {
+        let recipient = Address::from("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789");
+        let amount = U256::from(0x8AC7_2304_89E8_0000_u64);
+        let payload = Erc20::transfer(recipient, amount).unwrap();
+
+        calls.push(Proto::mod_Transaction::mod_Batch::BatchedCall {
+            address: contract_address.into(),
+            amount: Cow::default(),
+            payload: payload.into(),
+        });
+    }
+
+    let user_op = Proto::UserOperation {
+        entry_point: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789".into(),
+        init_code: Cow::default(),
+        sender: "0x1e6c542ebc7c960c6a155a9094db838cef842cf5".into(),
+        pre_verification_gas: U256::encode_be_compact(0xDAFC),
+        verification_gas_limit: U256::encode_be_compact(0x07_F7C4),
+        paymaster_and_data: Cow::default(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(97),
+        nonce: U256::encode_be_compact(3),
+        tx_mode: Proto::TransactionMode::UserOp,
+        gas_limit: U256::encode_be_compact(0x01_5A61),
+        max_fee_per_gas: U256::encode_be_compact(0x02_540B_E400),
+        max_inclusion_fee_per_gas: U256::encode_be_compact(0x02_540B_E400),
+        to_address: contract_address.into(),
+        private_key: private_key.into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::batch(
+                Proto::mod_Transaction::Batch { calls },
+            ),
+        }),
+        user_operation: Some(user_op),
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = r#"{"callData":"0x47e1da2a000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000000200000000000000000000000003bbb5660b8687c2aa453a0e42dcb6e0732b126600000000000000000000000003bbb5660b8687c2aa453a0e42dcb6e0732b12660000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044a9059cbb0000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e8000000000000000000000000000000000000000000000000000000000000","callGasLimit":"88673","initCode":"0x","maxFeePerGas":"10000000000","maxPriorityFeePerGas":"10000000000","nonce":"3","paymasterAndData":"0x","preVerificationGas":"56060","sender":"0x1E6c542ebC7c960c6A155A9094DB838cEf842cf5","signature":"0x0747b665fe9f3a52407f95a35ac3e76de37c9b89483ae440431244e89a77985f47df712c7364c1a299a5ef62d0b79a2cf4ed63d01772275dd61f72bd1ad5afce1c","verificationGasLimit":"522180"}"#;
+    let actual = String::from_utf8(output.encoded.to_vec()).unwrap();
+    assert_eq!(actual, expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "84d0464f5a2b191e06295443970ecdcd2d18f565d0d52b5a79443192153770ab"
+    );
+}
diff --git a/rust/tw_evm/tests/data/abi_with_negative_int.json b/rust/tw_evm/tests/data/abi_with_negative_int.json
new file mode 100644
index 00000000000..c5b59d3e84d
--- /dev/null
+++ b/rust/tw_evm/tests/data/abi_with_negative_int.json
@@ -0,0 +1,20 @@
+{
+    "d4e12f2e": {
+        "constant": false,
+        "inputs": [
+            {
+                "name": "_spender",
+                "type": "address"
+            },
+            {
+                "name": "_value",
+                "type": "int256"
+            }
+        ],
+        "name": "approve",
+        "outputs": [],
+        "payable": false,
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/decoded_abi_with_negative_int.json b/rust/tw_evm/tests/data/decoded_abi_with_negative_int.json
new file mode 100644
index 00000000000..0165692cb82
--- /dev/null
+++ b/rust/tw_evm/tests/data/decoded_abi_with_negative_int.json
@@ -0,0 +1,15 @@
+{
+    "function": "approve(address,int256)",
+    "inputs": [
+        {
+            "name": "_spender",
+            "value": "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed",
+            "type": "address"
+        },
+        {
+            "name": "_value",
+            "value": "-3",
+            "type": "int256"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/eip712_case_1.json b/rust/tw_evm/tests/data/eip712_case_1.json
new file mode 100644
index 00000000000..22e6b14317f
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_case_1.json
@@ -0,0 +1,64 @@
+{
+    "primaryType": "Mail",
+    "domain": {
+        "name": "Ether Mail",
+        "version": "1",
+        "chainId": "0x1",
+        "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+    },
+    "message": {
+        "from": {
+            "name": "Cow",
+            "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+        },
+        "to": {
+            "name": "Bob",
+            "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+        },
+        "contents": "Hello, Bob!"
+    },
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            }
+        ],
+        "Person": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "wallet",
+                "type": "address"
+            }
+        ],
+        "Mail": [
+            {
+                "name": "from",
+                "type": "Person"
+            },
+            {
+                "name": "to",
+                "type": "Person"
+            },
+            {
+                "name": "contents",
+                "type": "string"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/eip712_case_2.json b/rust/tw_evm/tests/data/eip712_case_2.json
new file mode 100644
index 00000000000..3155577ea67
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_case_2.json
@@ -0,0 +1,83 @@
+{
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            }
+        ],
+        "Person": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "wallets",
+                "type": "address[]"
+            }
+        ],
+        "Mail": [
+            {
+                "name": "from",
+                "type": "Person"
+            },
+            {
+                "name": "to",
+                "type": "Person[]"
+            },
+            {
+                "name": "contents",
+                "type": "string"
+            }
+        ],
+        "Group": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "members",
+                "type": "Person[]"
+            }
+        ]
+    },
+    "domain": {
+        "name": "Ether Mail",
+        "version": "1",
+        "chainId": "0x1",
+        "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+    },
+    "primaryType": "Mail",
+    "message": {
+        "from": {
+            "name": "Cow",
+            "wallets": [
+                "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
+                "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"
+            ]
+        },
+        "to": [
+            {
+                "name": "Bob",
+                "wallets": [
+                    "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
+                    "0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57",
+                    "0xB0B0b0b0b0b0B000000000000000000000000000"
+                ]
+            }
+        ],
+        "contents": "Hello, Bob!"
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/eip712_case_3.json b/rust/tw_evm/tests/data/eip712_case_3.json
new file mode 100644
index 00000000000..1c1da8c9d85
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_case_3.json
@@ -0,0 +1,43 @@
+{
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            }
+        ],
+        "Person": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "wallet",
+                "type": "address"
+            }
+        ]
+    },
+    "primaryType": "Person",
+    "domain": {
+        "name": "Ether Person",
+        "version": "1",
+        "chainId": 0,
+        "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+    },
+    "message": {
+        "name": "Cow",
+        "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/eip712_different_bytes.json b/rust/tw_evm/tests/data/eip712_different_bytes.json
new file mode 100644
index 00000000000..27f166d60a5
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_different_bytes.json
@@ -0,0 +1,58 @@
+{
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            }
+        ],
+        "BytesTest": [
+            {
+                "name": "data_long",
+                "type": "bytes"
+            },
+            {
+                "name": "data_short",
+                "type": "bytes"
+            },
+            {
+                "name": "fix_data32",
+                "type": "bytes32"
+            },
+            {
+                "name": "fix_data32_short",
+                "type": "bytes32"
+            },
+            {
+                "name": "fix_data16",
+                "type": "bytes16"
+            },
+            {
+                "name": "fix_data16_short",
+                "type": "bytes16"
+            }
+        ]
+    },
+    "domain": {
+        "name": "Test",
+        "version": "0.0.0",
+        "verifyingContract": "0xb8d6eb2c8236ba373b40adfad4decb8e05ac9230"
+    },
+    "primaryType": "BytesTest",
+    "message": {
+        "data_long": "0xcb5a7173d109f8a59c23109189056c862d843808d00bac069e9b76ca7217d845a94d0ad600000000000000000000000000000000000000000000000000000000000000a07c1a7062fbf633885ae02e0919ec07020a96aa20bf9c79554d2ddcd013113c64579837cd54cb5f05c65c46c04fac9abe54f839a74fa3cc1c47fc9048db037a84000000000000000000000000000000000000000000000000000000000000001b0000000000000000000000000000000000000000000000000000000000000035697066733a2f2f516d61414e35575832525851385852374b5158475a6f726931517461597972356e3547537471456a71706a4e71640000000000000000000000",
+        "data_short": "0xcb5a71",
+        "fix_data32": "0xcb5a7173d109f8a59c23109189056c862d843808d00bac069e9b76ca7217d845",
+        "fix_data32_short": "0xcb5a71",
+        "fix_data16": "0xcb5a7173d109f8a59c23109189056c86",
+        "fix_data16_short": "0xcb5a71"
+    }
+}
\ No newline at end of file
diff --git a/tests/Ethereum/Data/eip712_cryptofights.json b/rust/tw_evm/tests/data/eip712_fixed_bytes.json
similarity index 100%
rename from tests/Ethereum/Data/eip712_cryptofights.json
rename to rust/tw_evm/tests/data/eip712_fixed_bytes.json
diff --git a/rust/tw_evm/tests/data/eip712_greenfield.json b/rust/tw_evm/tests/data/eip712_greenfield.json
new file mode 100644
index 00000000000..31382ae06ab
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_greenfield.json
@@ -0,0 +1,149 @@
+{
+    "types": {
+        "Coin": [
+            {
+                "name": "amount",
+                "type": "uint256"
+            },
+            {
+                "name": "denom",
+                "type": "string"
+            }
+        ],
+        "EIP712Domain": [
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "salt",
+                "type": "string"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            }
+        ],
+        "Fee": [
+            {
+                "name": "amount",
+                "type": "Coin[]"
+            },
+            {
+                "name": "gas_limit",
+                "type": "uint256"
+            },
+            {
+                "name": "granter",
+                "type": "string"
+            },
+            {
+                "name": "payer",
+                "type": "string"
+            }
+        ],
+        "Msg1": [
+            {
+                "name": "amount",
+                "type": "TypeMsg1Amount[]"
+            },
+            {
+                "name": "from_address",
+                "type": "string"
+            },
+            {
+                "name": "to_address",
+                "type": "string"
+            },
+            {
+                "name": "type",
+                "type": "string"
+            }
+        ],
+        "Tx": [
+            {
+                "name": "account_number",
+                "type": "uint256"
+            },
+            {
+                "name": "chain_id",
+                "type": "uint256"
+            },
+            {
+                "name": "fee",
+                "type": "Fee"
+            },
+            {
+                "name": "memo",
+                "type": "string"
+            },
+            {
+                "name": "msg1",
+                "type": "Msg1"
+            },
+            {
+                "name": "sequence",
+                "type": "uint256"
+            },
+            {
+                "name": "timeout_height",
+                "type": "uint256"
+            }
+        ],
+        "TypeMsg1Amount": [
+            {
+                "name": "amount",
+                "type": "string"
+            },
+            {
+                "name": "denom",
+                "type": "string"
+            }
+        ]
+    },
+    "primaryType": "Tx",
+    "domain": {
+        "name": "Greenfield Tx",
+        "version": "1.0.0",
+        "chainId": "0x15e0",
+        "verifyingContract": "greenfield",
+        "salt": "0"
+    },
+    "message": {
+        "sequence": "2",
+        "account_number": "15560",
+        "chain_id": "5600",
+        "memo": "",
+        "fee": {
+            "amount": [
+                {
+                    "amount": "2000000000000000",
+                    "denom": "BNB"
+                }
+            ],
+            "gas_limit": "200000",
+            "payer": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1",
+            "granter": ""
+        },
+        "timeout_height": "0",
+        "msg1": {
+            "from_address": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1",
+            "to_address": "0x280b27f3676db1C4475EE10F75D510Eb527fd155",
+            "amount": [
+                {
+                    "amount": "1000000000000000",
+                    "denom": "BNB"
+                }
+            ],
+            "type": "/cosmos.bank.v1beta1.MsgSend"
+        }
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/eip712_long_bytes.json b/rust/tw_evm/tests/data/eip712_long_bytes.json
new file mode 100644
index 00000000000..c39d82ac077
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_long_bytes.json
@@ -0,0 +1,63 @@
+{
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            }
+        ],
+        "ForwardRequest": [
+            {
+                "name": "info",
+                "type": "string"
+            },
+            {
+                "name": "from",
+                "type": "address"
+            },
+            {
+                "name": "to",
+                "type": "address"
+            },
+            {
+                "name": "value",
+                "type": "uint256"
+            },
+            {
+                "name": "gas",
+                "type": "uint256"
+            },
+            {
+                "name": "nonce",
+                "type": "uint256"
+            },
+            {
+                "name": "data",
+                "type": "bytes"
+            }
+        ]
+    },
+    "domain": {
+        "name": "MinimalForwarder",
+        "version": "0.0.2",
+        "verifyingContract": "0x65CDf66C6FDDCD0a43042F237Aa871414b724f4d"
+    },
+    "primaryType": "ForwardRequest",
+    "message": {
+        "info": "Please sign this message, so OwnerChip can send this transaction on your behalf.",
+        "from": "0xff7abfb4ad52ba6ec9af37955365a7691c8167b9",
+        "to": "0xb8d6eb2c8236ba373b40adfad4decb8e05ac9230",
+        "value": 0,
+        "gas": 500000,
+        "nonce": 228,
+        "data": "0xcb5a7173d109f8a59c23109189056c862d843808d00bac069e9b76ca7217d845a94d0ad600000000000000000000000000000000000000000000000000000000000000a07c1a7062fbf633885ae02e0919ec07020a96aa20bf9c79554d2ddcd013113c64579837cd54cb5f05c65c46c04fac9abe54f839a74fa3cc1c47fc9048db037a84000000000000000000000000000000000000000000000000000000000000001b0000000000000000000000000000000000000000000000000000000000000035697066733a2f2f516d61414e35575832525851385852374b5158475a6f726931517461597972356e3547537471456a71706a4e71640000000000000000000000"
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/eip712_unequal_array_lengths.json b/rust/tw_evm/tests/data/eip712_unequal_array_lengths.json
new file mode 100644
index 00000000000..b1279af8a31
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_unequal_array_lengths.json
@@ -0,0 +1,66 @@
+{
+    "primaryType": "Mail",
+    "domain": {
+        "name": "Ether Mail",
+        "version": "1",
+        "chainId": "0x1",
+        "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+    },
+    "message": {
+        "from": {
+            "name": "Cow",
+            "wallet": "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+        },
+        "to": [
+            {
+                "name": "Bob",
+                "wallet": "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
+            }
+        ],
+        "contents": "Hello, Bob!"
+    },
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            }
+        ],
+        "Person": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "wallet",
+                "type": "address"
+            }
+        ],
+        "Mail": [
+            {
+                "name": "from",
+                "type": "Person"
+            },
+            {
+                "name": "to",
+                "type": "Person[2]"
+            },
+            {
+                "name": "contents",
+                "type": "string"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/eip712_with_chain_id_string.json b/rust/tw_evm/tests/data/eip712_with_chain_id_string.json
new file mode 100644
index 00000000000..7d078cd3904
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_with_chain_id_string.json
@@ -0,0 +1,83 @@
+{
+    "domain": {
+        "chainId": "5600",
+        "name": "Ether Mail",
+        "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+        "version": "1"
+    },
+    "message": {
+        "contents": "Hello, Bob!",
+        "from": {
+            "name": "Cow",
+            "wallets": [
+                "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
+                "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"
+            ]
+        },
+        "to": [
+            {
+                "name": "Bob",
+                "wallets": [
+                    "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
+                    "0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57",
+                    "0xB0B0b0b0b0b0B000000000000000000000000000"
+                ]
+            }
+        ]
+    },
+    "primaryType": "Mail",
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            }
+        ],
+        "Group": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "members",
+                "type": "Person[]"
+            }
+        ],
+        "Mail": [
+            {
+                "name": "from",
+                "type": "Person"
+            },
+            {
+                "name": "to",
+                "type": "Person[]"
+            },
+            {
+                "name": "contents",
+                "type": "string"
+            }
+        ],
+        "Person": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "wallets",
+                "type": "address[]"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/eip712_with_custom_array.json b/rust/tw_evm/tests/data/eip712_with_custom_array.json
new file mode 100644
index 00000000000..116612888e1
--- /dev/null
+++ b/rust/tw_evm/tests/data/eip712_with_custom_array.json
@@ -0,0 +1,86 @@
+{
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            }
+        ],
+        "Person": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "wallets",
+                "type": "address[]"
+            }
+        ],
+        "Mail": [
+            {
+                "name": "from",
+                "type": "Person"
+            },
+            {
+                "name": "to",
+                "type": "Group"
+            },
+            {
+                "name": "contents",
+                "type": "string"
+            }
+        ],
+        "Group": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "members",
+                "type": "Person[]"
+            }
+        ]
+    },
+    "domain": {
+        "name": "Ether Mail",
+        "version": "1",
+        "chainId": "0x1",
+        "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+    },
+    "primaryType": "Mail",
+    "message": {
+        "from": {
+            "name": "Cow",
+            "wallets": [
+                "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
+                "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"
+            ]
+        },
+        "to": {
+            "name": "Farmers",
+            "members": [
+                {
+                    "name": "Bob",
+                    "wallets": [
+                        "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
+                        "0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57",
+                        "0xB0B0b0b0b0b0B000000000000000000000000000"
+                    ]
+                }
+            ]
+        },
+        "contents": "Hello, Bob!"
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/swap_v2.json b/rust/tw_evm/tests/data/swap_v2.json
new file mode 100644
index 00000000000..5794290fd00
--- /dev/null
+++ b/rust/tw_evm/tests/data/swap_v2.json
@@ -0,0 +1,69 @@
+{
+    "846a1bc6": {
+        "inputs": [
+            {
+                "name": "token",
+                "type": "address"
+            },
+            {
+                "name": "amount",
+                "type": "uint256"
+            },
+            {
+                "components": [
+                    {
+                        "name": "callType",
+                        "type": "uint8"
+                    },
+                    {
+                        "name": "target",
+                        "type": "address"
+                    },
+                    {
+                        "name": "value",
+                        "type": "uint256"
+                    },
+                    {
+                        "name": "callData",
+                        "type": "bytes"
+                    },
+                    {
+                        "name": "payload",
+                        "type": "bytes"
+                    }
+                ],
+                "name": "calls",
+                "type": "tuple[]"
+            },
+            {
+                "name": "bridgedTokenSymbol",
+                "type": "string"
+            },
+            {
+                "name": "destinationChain",
+                "type": "string"
+            },
+            {
+                "name": "destinationAddress",
+                "type": "string"
+            },
+            {
+                "name": "payload",
+                "type": "bytes"
+            },
+            {
+                "name": "gasRefundRecipient",
+                "type": "address"
+            },
+            {
+                "name": "enableExpress",
+                "type": "bool"
+            }
+        ],
+        "name": "callBridgeCall",
+        "outputs": [
+        ],
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/data/swap_v2_decoded.json b/rust/tw_evm/tests/data/swap_v2_decoded.json
new file mode 100644
index 00000000000..85bb0570a62
--- /dev/null
+++ b/rust/tw_evm/tests/data/swap_v2_decoded.json
@@ -0,0 +1,105 @@
+{
+    "function": "callBridgeCall(address,uint256,(uint8,address,uint256,bytes,bytes)[],string,string,string,bytes,address,bool)",
+    "inputs": [
+        {
+            "name": "token",
+            "type": "address",
+            "value": "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+        },
+        {
+            "name": "amount",
+            "type": "uint256",
+            "value": "20000000000000000"
+        },
+        {
+            "components": [
+                [
+                    {
+                        "name": "callType",
+                        "type": "uint8",
+                        "value": "0"
+                    },
+                    {
+                        "name": "target",
+                        "type": "address",
+                        "value": "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+                    },
+                    {
+                        "name": "value",
+                        "type": "uint256",
+                        "value": "0"
+                    },
+                    {
+                        "name": "callData",
+                        "type": "bytes",
+                        "value": "0x095ea7b300000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f00000000000000000000000000000000000000000000000000470de4df820000"
+                    },
+                    {
+                        "name": "payload",
+                        "type": "bytes",
+                        "value": "0x"
+                    }
+                ],
+                [
+                    {
+                        "name": "callType",
+                        "type": "uint8",
+                        "value": "0"
+                    },
+                    {
+                        "name": "target",
+                        "type": "address",
+                        "value": "0x99a58482BD75cbab83b27EC03CA68fF489b5788f"
+                    },
+                    {
+                        "name": "value",
+                        "type": "uint256",
+                        "value": "0"
+                    },
+                    {
+                        "name": "callData",
+                        "type": "bytes",
+                        "value": "0x0651cb35000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000bebc44782c7db0a1a60cb6fe97d0b483032ff1c7000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df8200000000000000000000000000000000000000000000000000000000298ce42936ed0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ce16f69375520ab01377ce7b88f5ba8c48f8d666"
+                    },
+                    {
+                        "name": "payload",
+                        "type": "bytes",
+                        "value": "0x"
+                    }
+                ]
+            ],
+            "name": "calls",
+            "type": "tuple[]"
+        },
+        {
+            "name": "bridgedTokenSymbol",
+            "type": "string",
+            "value": "USDC"
+        },
+        {
+            "name": "destinationChain",
+            "type": "string",
+            "value": "binance"
+        },
+        {
+            "name": "destinationAddress",
+            "type": "string",
+            "value": "0xce16F69375520ab01377ce7B88f5BA8C48F8D666"
+        },
+        {
+            "name": "payload",
+            "type": "bytes",
+            "value": "0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000005a0000000000000000000000000000000000000000000000000000000000000072000000000000000000000000000000000000000000000000000000000000009600000000000000000000000000000000000000000000000000000000000000ac000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000000000000000000000000000000000000000000010000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb1400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf3890000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000640000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7044000000000000000000000000000000000000000000000000000029a23529cf68000000000000000000000000000000000000000000005af4f3f913bd553d03b900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf30000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000100000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf38900000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000001f40000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7045000000000000000000000000000000000000000000005b527785e694f805bdd300000000000000000000000000000000000000000000005f935a1fa5c4a6ec61000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000242e1a7d4d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+        },
+        {
+            "name": "gasRefundRecipient",
+            "type": "address",
+            "value": "0xa140F413C63FBDA84E9008607E678258ffFbC76b"
+        },
+        {
+            "name": "enableExpress",
+            "type": "bool",
+            "value": true
+        }
+    ]
+}
\ No newline at end of file
diff --git a/rust/tw_evm/tests/message_signer.rs b/rust/tw_evm/tests/message_signer.rs
new file mode 100644
index 00000000000..447e48df6db
--- /dev/null
+++ b/rust/tw_evm/tests/message_signer.rs
@@ -0,0 +1,314 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_coin_entry::modules::message_signer::MessageSigner;
+use tw_coin_entry::test_utils::test_context::TestCoinContext;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_evm::modules::message_signer::EthMessageSigner;
+use tw_keypair::ecdsa::secp256k1;
+use tw_proto::Ethereum::Proto;
+
+const EIP712_CASE_1: &str = include_str!("data/eip712_case_1.json");
+const EIP712_CASE_2: &str = include_str!("data/eip712_case_2.json");
+const EIP712_CASE_3: &str = include_str!("data/eip712_case_3.json");
+const EIP712_WITH_CUSTOM_ARRAY: &str = include_str!("data/eip712_with_custom_array.json");
+const EIP712_UNEQUAL_ARRAY_LEN: &str = include_str!("data/eip712_unequal_array_lengths.json");
+const EIP712_WITH_CHAIN_ID_STR: &str = include_str!("data/eip712_with_chain_id_string.json");
+const EIP712_GREENFIELD: &str = include_str!("data/eip712_greenfield.json");
+const EIP712_FIXED_BYTES: &str = include_str!("data/eip712_fixed_bytes.json");
+const EIP712_LONG_BYTES: &str = include_str!("data/eip712_long_bytes.json");
+const EIP712_DIFFERENT_BYTES: &str = include_str!("data/eip712_different_bytes.json");
+
+struct SignVerifyTestInput {
+    private_key: &'static str,
+    msg: &'static str,
+    msg_type: Proto::MessageType,
+    chain_id: Option<u64>,
+    signature: &'static str,
+}
+
+fn test_message_signer_sign_verify(test_input: SignVerifyTestInput) {
+    let coin = TestCoinContext::default();
+
+    let private_key = test_input.private_key.decode_hex().unwrap();
+    let chain_id = test_input
+        .chain_id
+        .map(|chain_id| Proto::MaybeChainId { chain_id });
+    let signing_input = Proto::MessageSigningInput {
+        private_key: private_key.into(),
+        message: test_input.msg.into(),
+        message_type: test_input.msg_type,
+        chain_id,
+        ..Proto::MessageSigningInput::default()
+    };
+
+    let output = EthMessageSigner.sign_message(&coin, signing_input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(output.signature, test_input.signature);
+
+    let public_key = secp256k1::PrivateKey::try_from(test_input.private_key)
+        .unwrap()
+        .public();
+
+    let verifying_input = Proto::MessageVerifyingInput {
+        message: test_input.msg.into(),
+        public_key: public_key.compressed().to_vec().into(),
+        signature: test_input.signature.into(),
+    };
+    assert!(
+        EthMessageSigner.verify_message(&coin, verifying_input),
+        "!verify_message: {}",
+        test_input.signature
+    );
+}
+
+struct SignErrorTestInput {
+    private_key: &'static str,
+    msg: &'static str,
+    msg_type: Proto::MessageType,
+    chain_id: u64,
+    error: SigningErrorType,
+}
+
+fn test_message_signer_sign_err(test_input: SignErrorTestInput) {
+    let coin = TestCoinContext::default();
+
+    let private_key = test_input.private_key.decode_hex().unwrap();
+    let signing_input = Proto::MessageSigningInput {
+        private_key: private_key.into(),
+        message: test_input.msg.into(),
+        message_type: test_input.msg_type,
+        chain_id: Some(Proto::MaybeChainId {
+            chain_id: test_input.chain_id,
+        }),
+        ..Proto::MessageSigningInput::default()
+    };
+
+    let output = EthMessageSigner.sign_message(&coin, signing_input);
+    assert_eq!(output.error, test_input.error);
+}
+
+struct PreimageTestInput {
+    msg: &'static str,
+    msg_type: Proto::MessageType,
+    chain_id: u64,
+    data_hash: &'static str,
+}
+
+fn test_message_signer_preimage_hashes(test_input: PreimageTestInput) {
+    let coin = TestCoinContext::default();
+
+    let signing_input = Proto::MessageSigningInput {
+        message: test_input.msg.into(),
+        message_type: test_input.msg_type,
+        chain_id: Some(Proto::MaybeChainId {
+            chain_id: test_input.chain_id,
+        }),
+        ..Proto::MessageSigningInput::default()
+    };
+
+    let output = EthMessageSigner.message_preimage_hashes(&coin, signing_input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(output.data_hash.to_hex(), test_input.data_hash);
+}
+
+#[test]
+fn test_message_signer_sign_verify_legacy() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d",
+        msg: "Foo",
+        msg_type: Proto::MessageType::MessageType_legacy,
+        chain_id: None,
+        signature: "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be71101b",
+    });
+}
+
+/// https://github.com/trustwallet/wallet-core/issues/3831
+#[test]
+fn test_message_signer_sign_verify_legacy_hex() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        // 0x9d1d97adfcd324bbd603d3872bd78e04098510b1
+        private_key: "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0",
+        msg: "0xc0a96273d5c3fbe4d4000491f08daef9c17f88df846c1d6f57eb5f33c1fbd035",
+        msg_type: Proto::MessageType::MessageType_legacy,
+        chain_id: None,
+        signature: "b18a666ad08bf9bfcd39920b26b5a5d1486b67b45119810b3c7bda22e41e5c4c1bfbe0c932f6c14df4947a18ba310831a37b7307d724a3ac2a4935b99d7075141b",
+    });
+}
+
+#[test]
+fn test_message_signer_sign_verify_eip155() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d",
+        msg: "Foo",
+        msg_type: Proto::MessageType::MessageType_eip155,
+        chain_id: Some(0),
+        signature: "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be711023",
+    });
+}
+
+#[test]
+fn test_message_signer_sign_verify_immutable_x() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "3b0a61f46fdae924007146eacb6db6642de7a5603ad843ec58e10331d89d4b84",
+        msg:"Only sign this request if you’ve initiated an action with Immutable X.\n\nFor internal use:\nbd717ba31dca6e0f3f136f7c4197babce5f09a9f25176044c0b3112b1b6017a3",
+        msg_type: Proto::MessageType::MessageType_immutable_x,
+        chain_id: None,
+        signature: "32cd5a58f3419fc5db672e3d57f76199b853eda0856d491b38f557b629b0a0814ace689412bf354a1af81126d2749207dffae8ae8845160f33948a6b787e17ee01",
+    });
+}
+
+#[test]
+fn test_message_signer_hash_eip712_case_1() {
+    test_message_signer_preimage_hashes(PreimageTestInput {
+        msg: EIP712_CASE_1,
+        msg_type: Proto::MessageType::MessageType_typed,
+        chain_id: 1,
+        data_hash: "be609aee343fb3c4b28e1df9e632fca64fcfaede20f02e86244efddf30957bd2",
+    });
+}
+
+#[test]
+fn test_message_signer_hash_eip712_case_2() {
+    test_message_signer_preimage_hashes(PreimageTestInput {
+        msg: EIP712_CASE_2,
+        msg_type: Proto::MessageType::MessageType_typed,
+        chain_id: 1,
+        data_hash: "a85c2e2b118698e88db68a8105b794a8cc7cec074e89ef991cb4f5f533819cc2",
+    });
+}
+
+#[test]
+fn test_message_signer_hash_with_custom_array() {
+    test_message_signer_preimage_hashes(PreimageTestInput {
+        msg: EIP712_WITH_CUSTOM_ARRAY,
+        msg_type: Proto::MessageType::MessageType_typed_eip155,
+        chain_id: 1,
+        data_hash: "cd8b34cd09c541cfc0a2fcd147e47809b98b335649c2aa700db0b0c4501a02a0",
+    });
+}
+
+#[test]
+fn test_message_signer_hash_unequal_array_len() {
+    let coin = TestCoinContext::default();
+
+    let signing_input = Proto::MessageSigningInput {
+        message: EIP712_UNEQUAL_ARRAY_LEN.into(),
+        message_type: Proto::MessageType::MessageType_typed_eip155,
+        ..Proto::MessageSigningInput::default()
+    };
+
+    let output = EthMessageSigner.message_preimage_hashes(&coin, signing_input);
+    assert_eq!(output.error, SigningErrorType::Error_invalid_params);
+}
+
+#[test]
+fn test_message_signer_sign_and_verify_eip712_case_3() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d",
+        msg: EIP712_CASE_3,
+        msg_type: Proto::MessageType::MessageType_typed,
+        chain_id: Some(0),
+        signature: "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf3761c",
+    });
+}
+
+#[test]
+fn test_message_signer_sign_and_verify_eip712_case_3_eip155() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d",
+        msg: EIP712_CASE_3,
+        msg_type: Proto::MessageType::MessageType_typed_eip155,
+        chain_id: None,
+        signature: "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf37624",
+    });
+}
+
+#[test]
+fn test_message_signer_sign_and_verify_eip712_invalid_chain_id() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d",
+        msg: EIP712_CASE_3,
+        msg_type: Proto::MessageType::MessageType_typed_eip155,
+        chain_id: None,
+        signature: "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf37624",
+    });
+}
+
+#[test]
+fn test_message_signer_sign_eip712_invalid_chain_id() {
+    test_message_signer_sign_err(SignErrorTestInput {
+        private_key: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d",
+        msg: EIP712_CASE_3,
+        msg_type: Proto::MessageType::MessageType_typed_eip155,
+        // Actual value is 0.
+        chain_id: 1,
+        error: SigningErrorType::Error_invalid_params,
+    });
+}
+
+// Test `TWEthereumMessageSignerSignTypedMessageEip155` where `domain.chainId` is a base10 decimal string.
+// Generated by using https://metamask.github.io/test-dapp/
+#[test]
+fn test_message_signer_sign_verify_eip712_with_chain_id_string() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0",
+        msg: EIP712_WITH_CHAIN_ID_STR,
+        msg_type: Proto::MessageType::MessageType_typed_eip155,
+        // 5600
+        chain_id: Some(0x15e0),
+        signature: "248b45acf2920a9cef00d3b469a875482b5f0e8ce16f6290212d395aaec7f3be0645d6a5cb6fcdfdca9ecefbadd4e77dae656124094ecc984c5fcb9cb4384b05e3",
+    });
+}
+
+// The test checks if extra types are ordered correctly.
+// The typed message was used to sign a Greenfield transaction:
+// https://greenfieldscan.com/tx/9F895CF2DD64FB1F428CEFCF2A6585A813C3540FC9FE1EF42DB1DA2CB1DF55AB
+#[test]
+fn test_message_signer_sign_verify_eip712_greenfield() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0",
+        msg: EIP712_GREENFIELD,
+        msg_type: Proto::MessageType::MessageType_typed,
+        chain_id: None,
+        signature: "cb3a4684a991014a387a04a85b59227ebb79567c2025addcb296b4ca856e9f810d3b526f2a0d0fad6ad1b126b3b9516f8b3be020a7cca9c03ce3cf47f4199b6d1b",
+    });
+}
+
+// The test checks if `0x0` is a valid `bytes32` value.
+#[test]
+fn test_message_signer_sign_verify_eip712_fixed_bytes() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "c85ef7d79691fe79573b1a7064c19c1a9819ebdbd1faaab1a8ec92344438aaf4",
+        msg: EIP712_FIXED_BYTES,
+        msg_type: Proto::MessageType::MessageType_typed,
+        chain_id: None,
+        signature: "7ee9b54fedf355e40fa86bbe23e63b318ef797bd8fdbc5bb714edbace042d4cb60111912218234e856f2cf300b3b47c91383b98e263ecf69c6c10193fef6c9581b",
+    });
+}
+
+#[test]
+fn test_message_signer_sign_verify_eip712_long_bytes() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "6f96f3aa7e8052170f1864f72a9a53606ee9c0d185188266cab895512a4bcf84",
+        msg: EIP712_LONG_BYTES,
+        msg_type: Proto::MessageType::MessageType_typed,
+        chain_id: None,
+        signature: "3f78f5860dc9c38d3bf68fd0759c0e4963f104ba6c7fa44e915ed41a1575dbd50d6fd946919e6cfa7eecb869a5d90658b16b1d7b79ec6380acd1841fc21c77f71c",
+    });
+}
+
+#[test]
+fn test_message_signer_sign_verify_eip712_different_bytes() {
+    test_message_signer_sign_verify(SignVerifyTestInput {
+        private_key: "6f96f3aa7e8052170f1864f72a9a53606ee9c0d185188266cab895512a4bcf84",
+        msg: EIP712_DIFFERENT_BYTES,
+        msg_type: Proto::MessageType::MessageType_typed,
+        chain_id: None,
+        signature: "48dc667cd8a53beb58ea6b1745f98c21b12e1a57587ce28bae07689dba3600d40cef2685dc8a68028d38f3e63289891868ecdf05e8affc275fee3001e51d6c581c",
+    });
+}
diff --git a/rust/tw_evm/tests/rlp.rs b/rust/tw_evm/tests/rlp.rs
new file mode 100644
index 00000000000..490add080d1
--- /dev/null
+++ b/rust/tw_evm/tests/rlp.rs
@@ -0,0 +1,245 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use std::str::FromStr;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::rlp_encoder::{RlpEncoder, RECURSION_LIMIT};
+use tw_number::U256;
+use tw_proto::EthereumRlp::Proto as RlpProto;
+use RlpProto::mod_RlpItem::OneOfitem as Item;
+
+fn make_item(item: Item) -> RlpProto::RlpItem {
+    RlpProto::RlpItem { item }
+}
+
+#[track_caller]
+fn test_encode(item: Item, expected: &str) {
+    let input = RlpProto::EncodingInput {
+        item: Some(make_item(item)),
+    };
+    let output = RlpEncoder::<StandardEvmContext>::encode_with_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(output.encoded.to_hex(), expected);
+}
+
+#[test]
+fn test_encode_string() {
+    test_encode(Item::string_item(Cow::from("")), "80");
+    test_encode(Item::string_item(Cow::from("d")), "64");
+    test_encode(Item::string_item(Cow::from("dog")), "83646f67");
+}
+
+#[test]
+fn test_encode_number_u64() {
+    test_encode(Item::number_u64(0), "80");
+    test_encode(Item::number_u64(127), "7f");
+    test_encode(Item::number_u64(128), "8180");
+    test_encode(Item::number_u64(255), "81ff");
+    test_encode(Item::number_u64(256), "820100");
+    test_encode(Item::number_u64(1024), "820400");
+    test_encode(Item::number_u64(0xffff), "82ffff");
+    test_encode(Item::number_u64(0x010000), "83010000");
+    test_encode(Item::number_u64(0xffffff), "83ffffff");
+    test_encode(Item::number_u64(0xffffffff), "84ffffffff");
+    test_encode(Item::number_u64(0xffffffffffffff), "87ffffffffffffff");
+}
+
+#[test]
+fn test_ethereum_rlp_number_u256() {
+    macro_rules! test_encode_u256 {
+        ($num_str:literal => $expected:literal) => {
+            let num = U256::from_str($num_str).unwrap().to_big_endian_compact();
+            test_encode(Item::number_u256(Cow::from(num)), $expected);
+        };
+    }
+
+    test_encode_u256!("0" => "80");
+    test_encode_u256!("1" => "01");
+    test_encode_u256!("127" => "7f");
+    test_encode_u256!("128" => "8180");
+    test_encode_u256!("256" => "820100");
+    test_encode_u256!("1024" => "820400");
+
+    // 0xffffff
+    test_encode_u256!("16777215" => "83ffffff");
+    // 0xffffffff
+    test_encode_u256!("4294967295" => "84ffffffff");
+    // 0xffffffffffffff
+    test_encode_u256!("72057594037927935" => "87ffffffffffffff");
+    // 0x102030405060708090a0b0c0d0e0f2
+    test_encode_u256!("83729609699884896815286331701780722" => "8f102030405060708090a0b0c0d0e0f2");
+    // 0x0100020003000400050006000700080009000a000b000c000d000e01
+    test_encode_u256!("105315505618206987246253880190783558935785933862974822347068935681" => "9c0100020003000400050006000700080009000a000b000c000d000e01");
+    // 0x0100000000000000000000000000000000000000000000000000000000000000
+    test_encode_u256!("452312848583266388373324160190187140051835877600158453279131187530910662656" => "a00100000000000000000000000000000000000000000000000000000000000000");
+}
+
+#[test]
+fn test_ethereum_rlp_raw_encoded() {
+    let raw_encoded = "946b175474e89094c44da98b954eedeac495271d0f"
+        .decode_hex()
+        .unwrap();
+    test_encode(
+        Item::raw_encoded(Cow::from(raw_encoded)),
+        "946b175474e89094c44da98b954eedeac495271d0f",
+    );
+
+    let empty: &[u8] = &[];
+    test_encode(Item::raw_encoded(Cow::from(empty)), "");
+}
+
+#[test]
+fn test_ethereum_rlp_list() {
+    // Empty list.
+    let list = RlpProto::RlpList {
+        items: Vec::default(),
+    };
+    test_encode(Item::list(list), "c0");
+
+    // [1, 2, 3] list.
+    let list = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::number_u64(1)),
+            make_item(Item::number_u64(2)),
+            make_item(Item::number_u64(3)),
+        ],
+    };
+    test_encode(Item::list(list), "c3010203");
+
+    // ["a", "b"] list.
+    let list = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::string_item(Cow::from("a"))),
+            make_item(Item::string_item(Cow::from("b"))),
+        ],
+    };
+    test_encode(Item::list(list), "c26162");
+
+    // ["cat", "dog"] list.
+    let list = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::string_item(Cow::from("cat"))),
+            make_item(Item::string_item(Cow::from("dog"))),
+        ],
+    };
+    test_encode(Item::list(list), "c88363617483646f67");
+
+    // ["cat", "dog"] list.
+    let list = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::string_item(Cow::from("cat"))),
+            make_item(Item::string_item(Cow::from("dog"))),
+        ],
+    };
+    test_encode(Item::list(list), "c88363617483646f67");
+}
+
+#[test]
+fn test_ethereum_rlp_nested_list() {
+    let l11 = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::number_u64(1)),
+            make_item(Item::number_u64(2)),
+            make_item(Item::number_u64(3)),
+        ],
+    };
+    let l12 = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::string_item(Cow::from("apple"))),
+            make_item(Item::string_item(Cow::from("banana"))),
+            make_item(Item::string_item(Cow::from("cherry"))),
+        ],
+    };
+    let l21 = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::data(Cow::from("abcdef".decode_hex().unwrap()))),
+            make_item(Item::data(Cow::from(
+                "00010203040506070809".decode_hex().unwrap(),
+            ))),
+        ],
+    };
+    let l22 = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::string_item(Cow::from("bitcoin"))),
+            make_item(Item::string_item(Cow::from("beeenbee"))),
+            make_item(Item::string_item(Cow::from("eth"))),
+        ],
+    };
+    let l1 = RlpProto::RlpList {
+        items: vec![make_item(Item::list(l11)), make_item(Item::list(l12))],
+    };
+    let l2 = RlpProto::RlpList {
+        items: vec![make_item(Item::list(l21)), make_item(Item::list(l22))],
+    };
+    let list = RlpProto::RlpList {
+        items: vec![make_item(Item::list(l1)), make_item(Item::list(l2))],
+    };
+
+    // The value is checked by using https://codechain-io.github.io/rlp-debugger/
+    test_encode(
+        Item::list(list),
+        "f841d9c3010203d4856170706c658662616e616e6186636865727279e6cf83abcdef8a00010203040506070809d587626974636f696e88626565656e62656583657468"
+    );
+}
+
+#[test]
+fn test_ethereum_rlp_nested_list_recursion_limit() {
+    fn make_nested_list(nested_lists_to_create: usize) -> RlpProto::RlpList<'static> {
+        if nested_lists_to_create == 1 {
+            // This is the last call in the recursion.
+            return RlpProto::RlpList { items: Vec::new() };
+        }
+
+        let nested_list = make_nested_list(nested_lists_to_create - 1);
+        RlpProto::RlpList {
+            items: vec![make_item(Item::list(nested_list))],
+        }
+    }
+
+    let nested_list = make_nested_list(RECURSION_LIMIT + 10);
+    let input = RlpProto::EncodingInput {
+        item: Some(make_item(Item::list(nested_list))),
+    };
+
+    let output = RlpEncoder::<StandardEvmContext>::encode_with_proto(input);
+    assert_eq!(output.error, SigningErrorType::Error_invalid_params);
+}
+
+#[test]
+fn test_ethereum_rlp_list_eip1559() {
+    let chain_id = U256::encode_be_compact(10);
+    let nonce = U256::encode_be_compact(6);
+    let max_inclusion_fee_per_gas = 2_000_000_000;
+    let max_fee_per_gas = U256::encode_be_compact(3_000_000_000);
+    let gas_limit = U256::encode_be_compact(21_100);
+    let to = "0x6b175474e89094c44da98b954eedeac495271d0f";
+    let amount = 0;
+    let payload = "a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1".decode_hex().unwrap();
+
+    // Empty nested list.
+    let access_list = RlpProto::RlpList {
+        items: Vec::default(),
+    };
+    let list = RlpProto::RlpList {
+        items: vec![
+            make_item(Item::number_u256(chain_id)),
+            make_item(Item::number_u256(nonce)),
+            make_item(Item::number_u64(max_inclusion_fee_per_gas)),
+            make_item(Item::number_u256(max_fee_per_gas)),
+            make_item(Item::number_u256(gas_limit)),
+            make_item(Item::address(Cow::from(to))),
+            make_item(Item::number_u64(amount)),
+            make_item(Item::data(Cow::from(payload))),
+            make_item(Item::list(access_list)),
+        ],
+    };
+    test_encode(
+        Item::list(list),
+        "f86c0a06847735940084b2d05e0082526c946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1c0"
+    );
+}
diff --git a/rust/tw_evm/tests/signer.rs b/rust/tw_evm/tests/signer.rs
new file mode 100644
index 00000000000..15fec9df0cd
--- /dev/null
+++ b/rust/tw_evm/tests/signer.rs
@@ -0,0 +1,645 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::{self, ToHex};
+use tw_evm::evm_context::StandardEvmContext;
+use tw_evm::modules::signer::Signer;
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+use tw_proto::Ethereum::Proto::TransactionMode;
+
+fn parse_hex(key: &str) -> Cow<'_, [u8]> {
+    hex::decode(key).unwrap().into()
+}
+
+#[test]
+fn test_sign_transaction_non_typed_erc20_transfer() {
+    let private_key =
+        parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
+
+    let erc20_transfer = Proto::mod_Transaction::ERC20Transfer {
+        to: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        amount: U256::encode_be_compact(2_000_000_000_000_000_000),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(0x34),
+        tx_mode: TransactionMode::Legacy,
+        // 42000000000
+        gas_price: U256::encode_be_compact(0x09_c765_2400),
+        // 78009
+        gas_limit: U256::encode_be_compact(0x01_30B9),
+        // DAI
+        to_address: "0x6b175474e89094c44da98b954eedeac495271d0f".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc20_transfer(
+                erc20_transfer,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "f8ab808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000818ba0c34040ff76f6d5e397b54b47f7fa2b3a7213f3c2a39a750260211fa15249ae8aa01ac5061e9bcf05aebef461864662652f25c45ee99240e3bb91b31f456208a6cd";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "b3525019dc367d3ecac48905f9a95ff3550c25a24823db765f92cae2dec7ebfd"
+    );
+}
+
+#[test]
+fn test_sign_transaction_non_typed_native() {
+    let private_key =
+        parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
+
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(1_000_000_000_000_000_000),
+        data: Cow::default(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(9),
+        gas_price: U256::encode_be_compact(20_000_000_000),
+        gas_limit: U256::encode_be_compact(21_000),
+        to_address: "0x3535353535353535353535353535353535353535".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "f86c098504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a028ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276a067cbe9d8997f761aecb703304b3800ccf555c9f3dc64214b297fb1966a3b6d83";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.r, false),
+        "28ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276"
+    );
+    assert_eq!(
+        hex::encode(output.s, false),
+        "67cbe9d8997f761aecb703304b3800ccf555c9f3dc64214b297fb1966a3b6d83"
+    );
+    assert_eq!(hex::encode(output.v, false), "25");
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "daf5a779ae972f972197303d7b574746c7ef83eadac0f2791ad23db92e4c8e53"
+    );
+}
+
+#[test]
+fn test_sign_transaction_non_typed_erc20_approve() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    let approve = Proto::mod_Transaction::ERC20Approve {
+        // DAI
+        spender: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        amount: U256::encode_be_compact(2_000_000_000_000_000_000),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(0),
+        // 0x09c7652400
+        gas_price: U256::encode_be_compact(42_000_000_000),
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(78_009),
+        to_address: "0x6b175474e89094c44da98b954eedeac495271d0f".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc20_approve(
+                approve,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844095ea7b30000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0d8136d66da1e0ba8c7208d5c4f143167f54b89a0fe2e23440653bcca28b34dc1a049222a79339f1a9e4641cb4ad805c49c225ae704299ffc10627bf41c035c464a";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.r, false),
+        "d8136d66da1e0ba8c7208d5c4f143167f54b89a0fe2e23440653bcca28b34dc1"
+    );
+    assert_eq!(
+        hex::encode(output.s, false),
+        "49222a79339f1a9e4641cb4ad805c49c225ae704299ffc10627bf41c035c464a"
+    );
+    assert_eq!(hex::encode(output.v, false), "25");
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "fe34a2b97f583db2d4baca3753f105d70dcf2d9800ddd0247900a026b9de6183"
+    );
+}
+
+#[test]
+fn test_sign_transaction_non_typed_contract_generic() {
+    let private_key =
+        parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
+    let call_data = "60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161094b38038061094b83398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b5050505050506106da806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f357806318160ddd1461016857806323b872dd14610171578063313ce5671461025c57806354fd4d501461026857806370a08231146102c657806395d89b41146102f4578063a9059cbb14610352578063cae9ca51146103f7578063dd62ed3e146105be575b6105f2610002565b6040805160038054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6102e260025481565b610662600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101c4575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101d05750600082115b156106bf57600160a060020a0383811660008181526020818152604080832080548801905588851680845281842080548990039055600183528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060016106c3565b61067660045460ff1681565b6040805160068054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b6105f46005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03166000908152602081905260408120548290108015906103845750600082115b156106ca5733600160a060020a0390811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610162565b604080516020604435600481810135601f810184900484028501840190955284845261066294813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a03908116600081815260016020908152604080832094881680845294825280832087905580518781529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a383600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105965780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f19250505015156106d257610002565b6102e2600435602435600160a060020a03828116600090815260016020908152604080832093851683529290522054610162565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b6040805160ff9092168252519081900360200190f35b820191906000526020600020905b81548152906001019060200180831161069a57829003601f168201915b505050505081565b5060005b9392505050565b506000610162565b5060016106c35600000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000754204275636b73000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003544f540000000000000000000000000000000000000000000000000000000000";
+
+    let contract = Proto::mod_Transaction::ContractGeneric {
+        amount: U256::encode_be_compact(0),
+        data: parse_hex(call_data),
+    };
+
+    // `tx_mode` is not set, Legacy is the default.
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(11),
+        gas_price: U256::encode_be_compact(20_000_000_000),
+        gas_limit: U256::encode_be_compact(1_000_000),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::contract_generic(
+                contract,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "5d2556f7d0e629dc6ce9dbc8a205853a7b89c136791840a39765e34cb5e3466a"
+    );
+
+    let expected = "f90a9e0b8504a817c800830f42408080b90a4b60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161094b38038061094b83398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b5050505050506106da806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f357806318160ddd1461016857806323b872dd14610171578063313ce5671461025c57806354fd4d501461026857806370a08231146102c657806395d89b41146102f4578063a9059cbb14610352578063cae9ca51146103f7578063dd62ed3e146105be575b6105f2610002565b6040805160038054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6102e260025481565b610662600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101c4575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101d05750600082115b156106bf57600160a060020a0383811660008181526020818152604080832080548801905588851680845281842080548990039055600183528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060016106c3565b61067660045460ff1681565b6040805160068054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b6105f46005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03166000908152602081905260408120548290108015906103845750600082115b156106ca5733600160a060020a0390811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610162565b604080516020604435600481810135601f810184900484028501840190955284845261066294813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a03908116600081815260016020908152604080832094881680845294825280832087905580518781529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a383600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105965780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f19250505015156106d257610002565b6102e2600435602435600160a060020a03828116600090815260016020908152604080832093851683529290522054610162565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b6040805160ff9092168252519081900360200190f35b820191906000526020600020905b81548152906001019060200180831161069a57829003601f168201915b505050505081565b5060005b9392505050565b506000610162565b5060016106c35600000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000754204275636b73000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003544f54000000000000000000000000000000000000000000000000000000000026a042556c4f2a3f4e4e639cca524d1da70e60881417d4643e5382ed110a52719eafa0172f591a2a763d0bd6b13d042d8c5eb66e87f129c9dc77ada66b6041012db2b3";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(hex::encode(output.data, false), call_data);
+}
+
+// https://ropsten.etherscan.io/tx/0x14429509307efebfdaa05227d84c147450d168c68539351fbc01ed87c916ab2e
+#[test]
+fn test_sign_transaction_eip1559_native_transfer() {
+    let private_key = parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904");
+
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(543_210_987_654_321),
+        data: Cow::default(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(3),
+        nonce: U256::encode_be_compact(6),
+        tx_mode: TransactionMode::Enveloped,
+        gas_limit: U256::encode_be_compact(21_100),
+        max_inclusion_fee_per_gas: U256::encode_be_compact(2_000_000_000),
+        max_fee_per_gas: U256::encode_be_compact(3_000_000_000),
+        to_address: "0xB9F5771C27664bF2282D98E09D7F50cEc7cB01a7".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "02f8710306847735940084b2d05e0082526c94b9f5771c27664bf2282d98e09d7f50cec7cb01a78701ee0c29f50cb180c080a092c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c64a06487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        output.r.to_hex(),
+        "92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c64"
+    );
+    assert_eq!(
+        output.s.to_hex(),
+        "6487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58"
+    );
+    assert_eq!(output.v.to_hex(), "00");
+
+    assert_eq!(
+        output.pre_hash.to_hex(),
+        "6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155"
+    );
+}
+
+#[test]
+fn test_sign_transaction_eip1559_erc20_transfer() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    let erc20_transfer = Proto::mod_Transaction::ERC20Transfer {
+        to: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        amount: U256::encode_be_compact(2_000_000_000_000_000_000),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(0),
+        tx_mode: TransactionMode::Enveloped,
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(78_009),
+        // 0x77359400
+        max_inclusion_fee_per_gas: U256::encode_be_compact(2_000_000_000),
+        // 0xB2D05E00
+        max_fee_per_gas: U256::encode_be_compact(3_000_000_000),
+        // DAI
+        to_address: "0x6b175474e89094c44da98b954eedeac495271d0f".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc20_transfer(
+                erc20_transfer,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "02f8b00180847735940084b2d05e00830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000c080a0adfcfdf98d4ed35a8967a0c1d78b42adb7c5d831cf5a3272654ec8f8bcd7be2ea011641e065684f6aa476f4fd250aa46cd0b44eccdb0a6e1650d658d1998684cdf";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "aa0ec30afa12acb48a080aa7157254193eeb2a4d248538b0747535baab98141f"
+    );
+}
+
+#[test]
+fn test_sign_transaction_eip1559_erc20_transfer_with_access_list() {
+    // 0xa7e48D95882bd370Eb37aCB2f94a38Fb0c0ad66b
+    let private_key =
+        parse_hex("0x40dbed8d2ce4ba7d31b4edde7ecffc5177d5d32fdec3389b09c22ef67c9e7182");
+
+    let erc20_transfer = Proto::mod_Transaction::ERC20Transfer {
+        to: "0xb2Fb4372E663B2e53dA97D98100433d1fd06ca55".into(),
+        amount: U256::encode_be_compact(1_000_000),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(2),
+        tx_mode: TransactionMode::Enveloped,
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(100_000),
+        // 0x77359400
+        max_inclusion_fee_per_gas: U256::encode_be_compact(2_000_000_000),
+        // 0xB2D05E00
+        max_fee_per_gas: U256::encode_be_compact(3_000_000_000),
+        // USDT
+        to_address: "0xdAC17F958D2ee523a2206206994597C13D831ec7".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc20_transfer(
+                erc20_transfer,
+            ),
+        }),
+        private_key,
+        access_list: vec![Proto::Access {
+            address: "0xdAC17F958D2ee523a2206206994597C13D831ec7".into(),
+            stored_keys: vec![
+                parse_hex("0x76c8f33bcdf467e4f1313522c10a40512a867cdcd34f2b898232ad4669200764"),
+                parse_hex("0x000000000000000000000000000000000000000000000000000000000000000a"),
+                parse_hex("0x0000000000000000000000000000000000000000000000000000000000000003"),
+                parse_hex("0x0000000000000000000000000000000000000000000000000000000000000004"),
+                parse_hex("0xb12459e057d0da4389f95b7ff0ce45a52ad71b02913a5466ffaab252e7ce918a"),
+                parse_hex("0x1bba044274699cc8c429fbe84bdad5d5a49519e29430f25309cbbab31dc63043"),
+                parse_hex("0x0000000000000000000000000000000000000000000000000000000000000000"),
+            ],
+        }],
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    // Successfully broadcasted: https://etherscan.io/tx/0x66ba06527e766f2350eab17fe41a028c4257606b4678e987e47cee4bb4bfcdfc
+    let expected = "02f901b20102847735940084b2d05e00830186a094dac17f958d2ee523a2206206994597c13d831ec780b844a9059cbb000000000000000000000000b2fb4372e663b2e53da97d98100433d1fd06ca5500000000000000000000000000000000000000000000000000000000000f4240f90100f8fe94dac17f958d2ee523a2206206994597c13d831ec7f8e7a076c8f33bcdf467e4f1313522c10a40512a867cdcd34f2b898232ad4669200764a0000000000000000000000000000000000000000000000000000000000000000aa00000000000000000000000000000000000000000000000000000000000000003a00000000000000000000000000000000000000000000000000000000000000004a0b12459e057d0da4389f95b7ff0ce45a52ad71b02913a5466ffaab252e7ce918aa01bba044274699cc8c429fbe84bdad5d5a49519e29430f25309cbbab31dc63043a0000000000000000000000000000000000000000000000000000000000000000080a069c97777fa1f507e2a9097ec6304cb2b159df4837d3cfe59f514d023d4c33aa3a0574c0cac9d2dc3ad4eebc0e6aa1710f514fb91b1dfb6baec93b67d98e0751497";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "78f4f271a376c7a6fdf15d137028509a738eae1ea4b20d9a4bd6b796a3119679"
+    );
+}
+
+#[test]
+fn test_sign_transaction_eip1559_erc20_approve() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    let erc20_approve = Proto::mod_Transaction::ERC20Approve {
+        spender: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        amount: U256::encode_be_compact(2_000_000_000_000_000_000),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(0),
+        tx_mode: TransactionMode::Enveloped,
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(78_009),
+        // 0x77359400
+        max_inclusion_fee_per_gas: U256::encode_be_compact(2_000_000_000),
+        // 0xB2D05E00
+        max_fee_per_gas: U256::encode_be_compact(3_000_000_000),
+        // DAI
+        to_address: "0x6b175474e89094c44da98b954eedeac495271d0f".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc20_approve(
+                erc20_approve,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "02f8b00180847735940084b2d05e00830130b9946b175474e89094c44da98b954eedeac495271d0f80b844095ea7b30000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000c080a05a43dda3dc193480ee532a5ed67ba8fbd2e3afb9eee218f4fb955b415d592925a01300e5b5f51c8cd5bf80f018cea3fb347fae589e65355068ac44ffc996313c60";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "bed87d402cc536fac3dbb346eac221f5ee783e04f0a7e3713817e55a78d08065"
+    );
+}
+
+#[test]
+fn test_sign_transaction_eip1559_erc721_transfer() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    let erc20_approve = Proto::mod_Transaction::ERC721Transfer {
+        from: "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc".into(),
+        to: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        token_id: hex::decode("23c47ee5").unwrap().into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(0),
+        tx_mode: TransactionMode::Enveloped,
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(78_009),
+        // 0x77359400
+        max_inclusion_fee_per_gas: U256::encode_be_compact(2_000_000_000),
+        // 0xB2D05E00
+        max_fee_per_gas: U256::encode_be_compact(3_000_000_000),
+        to_address: "0x4e45e92ed38f885d39a733c14f1817217a89d425".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc721_transfer(
+                erc20_approve,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "02f8d00180847735940084b2d05e00830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b86423b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee5c080a0dbd591d1eac39bad62d7c158d5e1d55e7014d2218998f8980462e2f283f42d4aa05acadb904484a0fb5526a4c64b8addb8aac4f6548f90199e40eb787b79faed4a";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "6089b11574c558e717fd25fe84bb7525bc32408f7124c2f199e26dfb0845abdd"
+    );
+}
+
+#[test]
+fn test_sign_transaction_eip1559_erc1155_transfer() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    let erc1155_approve = Proto::mod_Transaction::ERC1155Transfer {
+        from: "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc".into(),
+        to: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        token_id: hex::decode("23c47ee5").unwrap().into(),
+        value: U256::encode_be_compact(2_000_000_000_000_000_000),
+        data: hex::decode("01020304").unwrap().into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(0),
+        tx_mode: TransactionMode::Enveloped,
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(78_009),
+        // 0x77359400
+        max_inclusion_fee_per_gas: U256::encode_be_compact(2_000_000_000),
+        // 0xB2D05E00
+        max_fee_per_gas: U256::encode_be_compact(3_000_000_000),
+        to_address: "0x4e45e92ed38f885d39a733c14f1817217a89d425".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc1155_transfer(
+                erc1155_approve,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "02f901500180847735940084b2d05e00830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b8e4f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000c080a0533df41dda5540c57257b7fe89c29cefff0155c333e063220df2bf9680fcc15aa036a844fd20de5a51de96ceaaf078558e87d86426a4a5d4b215ee1fd0fa397f8a";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "d18f2ac6b3bff71457bfed1fc897b42a5a4220b1589eadbbace8d3def656f914"
+    );
+}
+
+#[test]
+fn test_sign_transaction_non_typed_erc20_transfer_as_contract_generic() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    // payload: transfer(0x5322b34c88ed0691971bf52a7047448f0f4efc84, 2000000000000000000)
+    let contract_data = parse_hex("0xa9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000");
+    let contract = Proto::mod_Transaction::ContractGeneric {
+        amount: U256::encode_be_compact(0),
+        data: contract_data,
+    };
+
+    // `tx_mode` is not set, Legacy is the default.
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(0),
+        // 0x09c7652400
+        gas_price: U256::encode_be_compact(42_000_000_000),
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(78_009),
+        to_address: "0x6b175474e89094c44da98b954eedeac495271d0f".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::contract_generic(
+                contract,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0724c62ad4fbf47346b02de06e603e013f26f26b56fdc0be7ba3d6273401d98cea0032131cae15da7ddcda66963e8bef51ca0d9962bfef0547d3f02597a4a58c931";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "3a3fc6df8815e15874cc8d6c65f88ea0643b375e5b22726269d187035a5cb486"
+    );
+}
+
+#[test]
+fn test_sign_transaction_non_typed_erc20_transfer_invalid_address() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    let erc20_transfer = Proto::mod_Transaction::ERC20Transfer {
+        to: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        amount: U256::encode_be_compact(2_000_000_000_000_000_000),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        tx_mode: TransactionMode::Legacy,
+        // 42000000000
+        gas_price: U256::encode_be_compact(0x09_c765_2400),
+        // 78009
+        gas_limit: U256::encode_be_compact(0x01_30B9),
+        // DAI
+        to_address: "0xdeadbeef".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc20_transfer(
+                erc20_transfer,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::Error_invalid_address);
+    assert!(!output.error_message.is_empty());
+}
+
+#[test]
+fn test_sign_transaction_non_typed_erc721_transfer() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    let erc721_transfer = Proto::mod_Transaction::ERC721Transfer {
+        from: "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc".into(),
+        to: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        token_id: hex::decode("23c47ee5").unwrap().into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        tx_mode: TransactionMode::Legacy,
+        // 0x09c7652400
+        gas_price: U256::encode_be_compact(42_000_000_000),
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(78_009),
+        to_address: "0x4e45e92ed38f885d39a733c14f1817217a89d425".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc721_transfer(
+                erc721_transfer,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "f8ca808509c7652400830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b86423b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee526a0d38440a4dc140a4100d301eb49fcc35b64439e27d1d8dd9b55823dca04e6e659a03b5f56a57feabc3406f123d6f8198cd7d7e2ced7e2d58d375f076952ecd9ce88";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "5de6e2bc3a0e95a32c2a6075bec622feccb8e8dab8fa564de7468416b44eff32"
+    );
+
+    let expected_data = "23b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee5";
+    assert_eq!(hex::encode(output.data, false), expected_data);
+}
+
+#[test]
+fn test_sign_transaction_non_typed_erc1155_transfer() {
+    let private_key =
+        parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    let erc1155_transfer = Proto::mod_Transaction::ERC1155Transfer {
+        from: "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc".into(),
+        to: "0x5322b34c88ed0691971bf52a7047448f0f4efc84".into(),
+        token_id: parse_hex("23c47ee5"),
+        value: U256::encode_be_compact(2_000_000_000_000_000_000),
+        data: parse_hex("01020304"),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        tx_mode: TransactionMode::Legacy,
+        // 0x09c7652400
+        gas_price: U256::encode_be_compact(42_000_000_000),
+        // 0x130B9
+        gas_limit: U256::encode_be_compact(78_009),
+        to_address: "0x4e45e92ed38f885d39a733c14f1817217a89d425".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::erc1155_transfer(
+                erc1155_transfer,
+            ),
+        }),
+        private_key,
+        ..Proto::SigningInput::default()
+    };
+
+    let output = Signer::<StandardEvmContext>::sign_proto(input);
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "f9014a808509c7652400830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b8e4f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000004010203040000000000000000000000000000000000000000000000000000000026a010315488201ac801ce346bffd1570de147615462d7e7db3cf08cf558465c6b79a06643943b24593bc3904a9fda63bb169881730994c973ab80f07d66a698064573";
+    assert_eq!(hex::encode(output.encoded, false), expected);
+
+    assert_eq!(
+        hex::encode(output.pre_hash, false),
+        "d183270df1081772f867c9e6d16601028dd7faa6103e5d7286f1f5e4bde4f547"
+    );
+
+    let expected_data = "f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000";
+    assert_eq!(hex::encode(output.data, false), expected_data);
+}
diff --git a/rust/tw_hash/Cargo.toml b/rust/tw_hash/Cargo.toml
new file mode 100644
index 00000000000..c9b8ab18c42
--- /dev/null
+++ b/rust/tw_hash/Cargo.toml
@@ -0,0 +1,26 @@
+[package]
+name = "tw_hash"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+default = ["serde"]
+
+[dependencies]
+arbitrary = { version = "1", features = ["derive"], optional = true }
+blake-hash = "0.4.1"
+blake2b-ref = "0.3.1"
+digest = "0.10.6"
+groestl = "0.10.1"
+hmac = "0.12.1"
+ripemd = "0.1.3"
+serde = { version = "1.0", features = ["derive"], optional = true }
+sha1 = "0.10.5"
+sha2 = "0.10.6"
+sha3 = "0.10.6"
+tw_encoding = { path = "../tw_encoding" }
+tw_memory = { path = "../tw_memory" }
+zeroize = "1.8.1"
+
+[dev-dependencies]
+serde_json = "1.0"
diff --git a/rust/tw_hash/fuzz/.gitignore b/rust/tw_hash/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/tw_hash/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/tw_hash/fuzz/Cargo.toml b/rust/tw_hash/fuzz/Cargo.toml
new file mode 100644
index 00000000000..af42f8796a8
--- /dev/null
+++ b/rust/tw_hash/fuzz/Cargo.toml
@@ -0,0 +1,27 @@
+[package]
+name = "tw_hash-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
+
+[dependencies.tw_hash]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "hash_fuzz"
+path = "fuzz_targets/hash_fuzz.rs"
+test = false
+doc = false
diff --git a/rust/tw_hash/fuzz/fuzz_targets/hash_fuzz.rs b/rust/tw_hash/fuzz/fuzz_targets/hash_fuzz.rs
new file mode 100644
index 00000000000..eab6fcac0c8
--- /dev/null
+++ b/rust/tw_hash/fuzz/fuzz_targets/hash_fuzz.rs
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::{arbitrary, fuzz_target};
+
+#[derive(arbitrary::Arbitrary, Debug)]
+struct HashInput<'a> {
+    data: &'a [u8],
+    additional_data: &'a [u8],
+    hash_size: usize,
+}
+
+fuzz_target!(|input: HashInput<'_>| {
+    tw_hash::blake::blake_256(input.data);
+    tw_hash::blake2::blake2_b(input.data, input.hash_size).ok();
+    tw_hash::blake2::blake2_b_personal(input.data, input.hash_size, input.additional_data).ok();
+    tw_hash::crc32::crc32(input.data);
+    tw_hash::groestl::groestl_512(input.data);
+    tw_hash::hmac::hmac_sha256(input.additional_data, input.data);
+    tw_hash::ripemd::ripemd_160(input.data);
+    tw_hash::sha1::sha1(input.data);
+    tw_hash::sha2::sha256(input.data);
+    tw_hash::sha2::sha512(input.data);
+    tw_hash::sha2::sha512_256(input.data);
+    tw_hash::sha3::keccak256(input.data);
+    tw_hash::sha3::keccak512(input.data);
+    tw_hash::sha3::sha3_256(input.data);
+    tw_hash::sha3::sha3_512(input.data);
+});
diff --git a/rust/tw_hash/src/blake.rs b/rust/tw_hash/src/blake.rs
new file mode 100644
index 00000000000..8cf93d8e0cf
--- /dev/null
+++ b/rust/tw_hash/src/blake.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use blake_hash::{Blake256, Digest};
+
+pub fn blake_256(input: &[u8]) -> Vec<u8> {
+    let mut hasher = Blake256::new();
+    hasher.update(input);
+    let result = &hasher.finalize()[..];
+    result.to_vec()
+}
diff --git a/rust/tw_hash/src/blake2.rs b/rust/tw_hash/src/blake2.rs
new file mode 100644
index 00000000000..52af843d2eb
--- /dev/null
+++ b/rust/tw_hash/src/blake2.rs
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::Error;
+use blake2b_ref::Blake2bBuilder;
+use std::ops::RangeInclusive;
+
+const OUTPUT_HASH_LEN_RANGE: RangeInclusive<usize> = 1..=64;
+const PERSONAL_INPUT_MAX_LEN: usize = 16;
+
+pub fn blake2_b(input: &[u8], hash_size: usize) -> Result<Vec<u8>, Error> {
+    if !OUTPUT_HASH_LEN_RANGE.contains(&hash_size) {
+        return Err(Error::InvalidHashLength);
+    }
+
+    let mut hasher = Blake2bBuilder::new(hash_size).build();
+    hasher.update(input);
+    let mut buf = vec![0; hash_size];
+    hasher.finalize(&mut buf);
+    Ok(buf)
+}
+
+pub fn blake2_b_personal(
+    input: &[u8],
+    hash_size: usize,
+    personal_input: &[u8],
+) -> Result<Vec<u8>, Error> {
+    if !OUTPUT_HASH_LEN_RANGE.contains(&hash_size) {
+        return Err(Error::InvalidHashLength);
+    }
+    if personal_input.len() > PERSONAL_INPUT_MAX_LEN {
+        return Err(Error::InvalidArgument);
+    }
+
+    let mut output: Vec<u8> = vec![0; hash_size];
+    let mut blake2b = Blake2bBuilder::new(hash_size)
+        .personal(personal_input)
+        .build();
+    blake2b.update(input);
+    blake2b.finalize(&mut output);
+    Ok(output)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_blake2_b_invalid_hash_size() {
+        let input = b"Hello world";
+        blake2_b(input, 65).unwrap_err();
+    }
+
+    #[test]
+    fn test_blake2_b_personal_invalid_hash_size() {
+        let input = b"Hello world";
+        let personal_data = b"MyApp Files Hash";
+        blake2_b_personal(input, 65, personal_data).unwrap_err();
+    }
+
+    #[test]
+    fn test_blake2_b_personal_invalid_personal_data() {
+        let input = b"Hello world";
+        let personal_data = b"MyApp Files Hash ...";
+        blake2_b_personal(input, 64, personal_data).unwrap_err();
+    }
+}
diff --git a/rust/tw_hash/src/crc32.rs b/rust/tw_hash/src/crc32.rs
new file mode 100644
index 00000000000..76000454de9
--- /dev/null
+++ b/rust/tw_hash/src/crc32.rs
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+// Table taken from https://web.mit.edu/freebsd/head/sys/libkern/crc32.c (Public Domain code)
+// This table is used to speed up the crc calculation.
+const CRC32_TABLE: [u32; 256] = [
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f, 0xe963a535, 0x9e6495a3,
+    0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988, 0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91,
+    0x1db71064, 0x6ab020f2, 0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9, 0xfa0f3d63, 0x8d080df5,
+    0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172, 0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b,
+    0x35b5a8fa, 0x42b2986c, 0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423, 0xcfba9599, 0xb8bda50f,
+    0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924, 0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d,
+    0x76dc4190, 0x01db7106, 0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d, 0x91646c97, 0xe6635c01,
+    0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e, 0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457,
+    0x65b0d9c6, 0x12b7e950, 0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7, 0xa4d1c46d, 0xd3d6f4fb,
+    0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0, 0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9,
+    0x5005713c, 0x270241aa, 0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81, 0xb7bd5c3b, 0xc0ba6cad,
+    0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a, 0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683,
+    0xe3630b12, 0x94643b84, 0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb, 0x196c3671, 0x6e6b06e7,
+    0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc, 0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5,
+    0xd6d6a3e8, 0xa1d1937e, 0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55, 0x316e8eef, 0x4669be79,
+    0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236, 0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f,
+    0xc5ba3bbe, 0xb2bd0b28, 0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f, 0x72076785, 0x05005713,
+    0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38, 0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21,
+    0x86d3d2d4, 0xf1d4e242, 0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69, 0x616bffd3, 0x166ccf45,
+    0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2, 0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db,
+    0xaed16a4a, 0xd9d65adc, 0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693, 0x54de5729, 0x23d967bf,
+    0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94, 0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d,
+];
+
+// Algorithm inspired by this old-style C implementation:
+// https://web.mit.edu/freebsd/head/sys/libkern/crc32.c (Public Domain code)
+pub fn crc32(input: &[u8]) -> u32 {
+    let mut c = u32::MAX;
+    for b in input {
+        c = CRC32_TABLE[((c ^ (*b as u32)) & 0xFF) as usize] ^ (c >> 8);
+    }
+    !c
+}
diff --git a/rust/tw_hash/src/ffi.rs b/rust/tw_hash/src/ffi.rs
new file mode 100644
index 00000000000..08c4faf44b9
--- /dev/null
+++ b/rust/tw_hash/src/ffi.rs
@@ -0,0 +1,201 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::{blake, blake2, groestl, hmac, ripemd, sha1, sha2, sha3, Error};
+use tw_memory::ffi::c_byte_array::{CByteArray, CByteArrayResult};
+use tw_memory::ffi::c_result::ErrorCode;
+
+#[repr(C)]
+#[derive(Debug, PartialEq)]
+pub enum CHashingCode {
+    Ok = 0,
+    InvalidHashLength = 1,
+    InvalidArgument = 2,
+}
+
+impl From<Error> for CHashingCode {
+    fn from(e: Error) -> Self {
+        match e {
+            Error::FromHexError(_) | Error::InvalidArgument => CHashingCode::InvalidArgument,
+            Error::InvalidHashLength => CHashingCode::InvalidHashLength,
+        }
+    }
+}
+
+impl From<CHashingCode> for ErrorCode {
+    fn from(e: CHashingCode) -> Self {
+        e as ErrorCode
+    }
+}
+
+/// Computes the Blake-256 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn blake_256(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    blake::blake_256(input).into()
+}
+
+/// Computes the BLAKE2B hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \param hash_size the size of the output hash.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn blake2_b(
+    input: *const u8,
+    input_len: usize,
+    hash_size: usize,
+) -> CByteArrayResult {
+    let input = std::slice::from_raw_parts(input, input_len);
+    blake2::blake2_b(input, hash_size)
+        .map(CByteArray::from)
+        .map_err(CHashingCode::from)
+        .into()
+}
+
+/// Computes the personalized BLAKE2B hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \param hash_size the size of the output hash.
+/// \param personal_input *non-null* byte array.
+/// \param personal_len the length of the `personal_input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn blake2_b_personal(
+    input: *const u8,
+    input_len: usize,
+    hash_size: usize,
+    personal_input: *const u8,
+    personal_len: usize,
+) -> CByteArrayResult {
+    let input = std::slice::from_raw_parts(input, input_len);
+    let personal = std::slice::from_raw_parts(personal_input, personal_len);
+    blake2::blake2_b_personal(input, hash_size, personal)
+        .map(CByteArray::from)
+        .map_err(CHashingCode::from)
+        .into()
+}
+
+/// Computes the Groestl-512 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn groestl_512(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    groestl::groestl_512(input).into()
+}
+
+/// Hash-based Message Authentication Code (HMAC) using the SHA-256 hash function.
+/// \param key *non-null* byte array.
+/// \param key_len the length of the `key` array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn hmac__sha256(
+    key: *const u8,
+    key_len: usize,
+    input: *const u8,
+    input_len: usize,
+) -> CByteArray {
+    let key = std::slice::from_raw_parts(key, key_len);
+    let input = std::slice::from_raw_parts(input, input_len);
+    hmac::hmac_sha256(key, input).into()
+}
+
+/// Computes the RIPEMD-160 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn ripemd_160(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    ripemd::ripemd_160(input).into()
+}
+
+/// Computes the SHA-1 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn sha1(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    sha1::sha1(input).into()
+}
+
+/// Computes the SHA-256 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn sha256(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    sha2::sha256(input).into()
+}
+
+/// Computes the SHA-512 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn sha512(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    sha2::sha512(input).into()
+}
+
+/// Computes the SHA-512/256 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn sha512_256(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    sha2::sha512_256(input).into()
+}
+
+/// Computes the Keccak-256 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn keccak256(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    sha3::keccak256(input).into()
+}
+
+/// Computes the Keccak-512 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn keccak512(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    sha3::keccak512(input).into()
+}
+
+/// Computes the SHA-3-256 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn sha3__256(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    sha3::sha3_256(input).into()
+}
+
+/// Computes the SHA-3-512 hash of the `input` byte array.
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn sha3__512(input: *const u8, input_len: usize) -> CByteArray {
+    let input = std::slice::from_raw_parts(input, input_len);
+    sha3::sha3_512(input).into()
+}
diff --git a/rust/tw_hash/src/groestl.rs b/rust/tw_hash/src/groestl.rs
new file mode 100644
index 00000000000..30ec191cd62
--- /dev/null
+++ b/rust/tw_hash/src/groestl.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::hash_wrapper::hasher;
+use groestl::Groestl512;
+
+pub fn groestl_512(input: &[u8]) -> Vec<u8> {
+    hasher::<Groestl512>(input)
+}
diff --git a/rust/tw_hash/src/hash_array.rs b/rust/tw_hash/src/hash_array.rs
new file mode 100644
index 00000000000..936e02118f9
--- /dev/null
+++ b/rust/tw_hash/src/hash_array.rs
@@ -0,0 +1,409 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::Error;
+use std::fmt;
+use std::ops::{Deref, DerefMut};
+use std::str::FromStr;
+use tw_encoding::hex;
+use tw_encoding::hex::ToHex;
+use zeroize::DefaultIsZeroes;
+
+pub type H32 = Hash<4>;
+pub type H160 = Hash<20>;
+pub type H192 = Hash<24>;
+pub type H256 = Hash<32>;
+pub type H264 = Hash<33>;
+pub type H288 = Hash<36>;
+pub type H512 = Hash<64>;
+pub type H520 = Hash<65>;
+
+pub type SplitHash<const L: usize, const R: usize> = (Hash<L>, Hash<R>);
+
+/// Concatenates `left: Hash<L>` and `right: Hash<R>` into `Hash<N>`
+/// where `N = L + R` (statically checked).
+pub fn concat<const L: usize, const R: usize, const N: usize>(
+    left: Hash<L>,
+    right: Hash<R>,
+) -> Hash<N> {
+    // Ensure if `L + R == N` at compile time.
+    let _ = AssertSplit::<L, R, N>::VALID;
+
+    let mut res = Hash::new();
+    res[0..L].copy_from_slice(left.as_slice());
+    res[L..(L + R)].copy_from_slice(right.as_slice());
+
+    res
+}
+
+/// Represents a fixed-length byte array.
+#[derive(Debug, Clone, Copy, Eq, Hash, Ord, PartialEq, PartialOrd)]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+pub struct Hash<const N: usize>([u8; N]);
+
+impl<const N: usize> DefaultIsZeroes for Hash<N> {}
+
+/// cbindgen:ignore
+impl<const N: usize> Hash<N> {
+    pub const LEN: usize = N;
+
+    pub const fn new() -> Self {
+        Hash([0; N])
+    }
+
+    pub fn as_slice(&self) -> &[u8] {
+        &self.0
+    }
+
+    pub fn into_vec(self) -> Vec<u8> {
+        self.0.to_vec()
+    }
+
+    /// Splits the byte array into two pieces with `L` and `R` lengths accordingly,
+    /// where `N = L + R` (statically checked).
+    pub fn split<const L: usize, const R: usize>(&self) -> SplitHash<L, R> {
+        // Ensure if `L + R == N` at compile time.
+        let _ = AssertSplit::<L, R, N>::VALID;
+
+        let mut left: Hash<L> = Hash::default();
+        let mut right: Hash<R> = Hash::default();
+
+        left.copy_from_slice(&self.0[0..L]);
+        right.copy_from_slice(&self.0[L..]);
+
+        (left, right)
+    }
+
+    pub const fn take(self) -> [u8; N] {
+        self.0
+    }
+
+    pub const fn len() -> usize {
+        N
+    }
+
+    pub fn is_zero(&self) -> bool {
+        self.0.iter().all(|byte| *byte == 0)
+    }
+
+    /// Reverses the order of elements in the inner data, in place.
+    pub fn rev(mut self) -> Self {
+        self.0.reverse();
+        self
+    }
+}
+
+/// This is a [`Hash::split`] helper that ensures that `L + R == N` at compile time.
+/// Assertion example:
+/// ```ignore
+/// let hash = H256::default();
+/// let (left, right): (H128, H160) = hash.split();
+///
+/// // output:
+/// // error[E0080]: evaluation of `hash_array::AssertSplit::<16, 20, 32>::EQ` failed
+/// //   --> tw_hash/src/hash_array.rs:67:41
+/// //    |
+/// // 67 |     pub const EQ: usize = (R + L - N) + (N - (R + L));
+/// //    |                                         ^^^^^^^^^^^^^ attempt to compute `32_usize - 36_usize`, which would overflow
+/// ```
+///
+/// TODO remove once [feature(generic_const_exprs)](https://github.com/rust-lang/rust/issues/76560) is stable.
+struct AssertSplit<const L: usize, const R: usize, const N: usize>;
+
+/// cbindgen:ignore
+impl<const L: usize, const R: usize, const N: usize> AssertSplit<L, R, N> {
+    pub const VALID: usize = (R + L - N) + (N - (R + L));
+}
+
+/// Implement `str` -> `Hash<N>` conversion for test purposes.
+impl<const N: usize> From<&'static str> for Hash<N> {
+    fn from(hex: &'static str) -> Self {
+        hex.parse().expect("Expected a valid hex-encoded hash")
+    }
+}
+
+impl<const N: usize> From<[u8; N]> for Hash<N> {
+    fn from(data: [u8; N]) -> Self {
+        Hash(data)
+    }
+}
+
+impl<'a, const N: usize> TryFrom<&'a [u8]> for Hash<N> {
+    type Error = Error;
+
+    fn try_from(data: &'a [u8]) -> Result<Self, Self::Error> {
+        if data.len() != N {
+            return Err(Error::InvalidHashLength);
+        }
+
+        let mut dest = Hash::default();
+        dest.0.copy_from_slice(data);
+        Ok(dest)
+    }
+}
+
+impl<const N: usize> FromStr for Hash<N> {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let data = hex::decode(s)?;
+        Hash::try_from(data.as_slice())
+    }
+}
+
+impl<const N: usize> Default for Hash<N> {
+    fn default() -> Self {
+        Hash::new()
+    }
+}
+
+impl<const N: usize> AsRef<[u8]> for Hash<N> {
+    fn as_ref(&self) -> &[u8] {
+        &self.0
+    }
+}
+
+impl<const N: usize> Deref for Hash<N> {
+    type Target = [u8; N];
+
+    fn deref(&self) -> &Self::Target {
+        &self.0
+    }
+}
+
+impl<const N: usize> DerefMut for Hash<N> {
+    fn deref_mut(&mut self) -> &mut Self::Target {
+        &mut self.0
+    }
+}
+
+impl<const N: usize> fmt::Display for Hash<N> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.to_hex())
+    }
+}
+
+#[cfg(feature = "serde")]
+pub mod as_bytes {
+    use super::Hash;
+    use serde::de::Error;
+    use serde::{Deserialize, Deserializer, Serializer};
+    use tw_memory::Data;
+
+    pub fn deserialize<'de, const N: usize, D>(deserializer: D) -> Result<Hash<N>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let bytes = Data::deserialize(deserializer)?;
+        Hash::<N>::try_from(bytes.as_slice()).map_err(|e| Error::custom(format!("{e:?}")))
+    }
+
+    pub fn serialize<const N: usize, S>(hash: &Hash<N>, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_bytes(&hash.0)
+    }
+}
+
+#[cfg(feature = "serde")]
+pub mod as_byte_sequence {
+    use super::Hash;
+    use serde::de::{Error, SeqAccess, Visitor};
+    use serde::ser::SerializeTuple;
+    use serde::{Deserializer, Serializer};
+    use std::fmt;
+    use std::marker::PhantomData;
+
+    struct ByteArrayVisitor<const N: usize> {
+        _n: PhantomData<[u8; N]>,
+    }
+
+    impl<'de, const N: usize> Visitor<'de> for ByteArrayVisitor<N> {
+        type Value = Hash<N>;
+
+        fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+            formatter.write_str("struct Hash<N>")
+        }
+
+        fn visit_seq<A>(self, mut seq: A) -> Result<Hash<N>, A::Error>
+        where
+            A: SeqAccess<'de>,
+        {
+            let mut result = Hash::<N>::default();
+            for i in 0..N {
+                result[i] = seq
+                    .next_element()?
+                    .ok_or_else(|| Error::invalid_length(i, &self))?;
+            }
+            Ok(result)
+        }
+    }
+
+    pub fn deserialize<'de, const N: usize, D>(deserializer: D) -> Result<Hash<N>, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        let visitor = ByteArrayVisitor::<N> { _n: PhantomData };
+        deserializer.deserialize_tuple(N, visitor)
+    }
+
+    pub fn serialize<const N: usize, S>(hash: &Hash<N>, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        let mut tup = serializer.serialize_tuple(N)?;
+        for el in hash.0 {
+            tup.serialize_element(&el)?;
+        }
+
+        tup.end()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_hash_from_str() {
+        let actual = H256::from("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
+        let expected = [
+            175u8, 238, 252, 167, 77, 154, 50, 92, 241, 214, 182, 145, 29, 97, 166, 92, 50, 175,
+            168, 224, 43, 213, 231, 142, 46, 74, 194, 145, 11, 171, 69, 245,
+        ];
+        assert_eq!(actual.0[..], expected[..]);
+    }
+
+    #[test]
+    fn test_hash_display() {
+        let str = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+        assert_eq!(H256::from(str).to_string(), str);
+    }
+
+    #[test]
+    #[should_panic]
+    fn test_from_hex_literal_invalid() {
+        let _ = H256::from("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45x5");
+    }
+
+    #[test]
+    fn test_from_hex_invalid() {
+        let err =
+            H256::from_str("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45x5")
+                .unwrap_err();
+
+        match err {
+            Error::FromHexError(_) => (),
+            other => panic!("Expected 'FromHexError', found: {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_from_hex_invalid_len() {
+        let err = H256::from_str("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45")
+            .unwrap_err();
+
+        match err {
+            Error::InvalidHashLength => (),
+            other => panic!("Expected 'Error::InvalidHashLength', found: {other:?}"),
+        }
+    }
+
+    #[test]
+    fn test_hash_split_at() {
+        let hash =
+            Hash::<32>::from("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
+
+        let (left, right): (Hash<10>, Hash<22>) = hash.split();
+        assert_eq!(left, Hash::from("afeefca74d9a325cf1d6"));
+        assert_eq!(
+            right,
+            Hash::from("b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5")
+        );
+    }
+
+    #[test]
+    fn test_hash_concat() {
+        let left: Hash<10> = Hash::from("afeefca74d9a325cf1d6");
+        let right: Hash<22> = Hash::from("b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
+        let res: Hash<32> = concat(left, right);
+
+        let expected: Hash<32> =
+            Hash::from("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
+        assert_eq!(res, expected);
+    }
+}
+
+/// cbindgen:ignore
+#[cfg(all(test, feature = "serde"))]
+mod serde_tests {
+    use super::*;
+    use serde::{Deserialize, Serialize};
+    use serde_json::json;
+    use tw_encoding::hex::as_hex;
+
+    const BYTES_32: [u8; 32] = [
+        175u8, 238, 252, 167, 77, 154, 50, 92, 241, 214, 182, 145, 29, 97, 166, 92, 50, 175, 168,
+        224, 43, 213, 231, 142, 46, 74, 194, 145, 11, 171, 69, 245,
+    ];
+    const HEX_32: &str = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+
+    #[derive(Debug, Deserialize, Serialize)]
+    struct TestAsHex {
+        #[serde(with = "as_hex")]
+        data: Hash<32>,
+    }
+
+    #[derive(Debug, Deserialize, Serialize)]
+    struct TestAsByteSequence {
+        #[serde(with = "as_byte_sequence")]
+        data: Hash<32>,
+    }
+
+    #[test]
+    fn test_hash_deserialize_as_byte_sequence() {
+        let res: TestAsByteSequence = serde_json::from_value(json!({"data": BYTES_32})).unwrap();
+        assert_eq!(res.data.0, BYTES_32);
+    }
+
+    #[test]
+    fn test_hash_serialize_as_byte_sequence() {
+        let res = TestAsByteSequence {
+            data: Hash::<32>::from(BYTES_32),
+        };
+        assert_eq!(
+            serde_json::to_value(&res).unwrap(),
+            json!({"data": BYTES_32})
+        );
+    }
+
+    #[test]
+    fn test_hash_deserialize_as_hex() {
+        let unprefixed: TestAsHex = serde_json::from_value(json!({"data": HEX_32})).unwrap();
+
+        assert_eq!(unprefixed.data.0, BYTES_32);
+
+        let prefixed: TestAsHex =
+            serde_json::from_value(json!({"data": format!("0x{HEX_32}")})).unwrap();
+        assert_eq!(prefixed.data.0, BYTES_32);
+    }
+
+    #[test]
+    fn test_hash_deserialize_as_hex_error() {
+        serde_json::from_value::<TestAsHex>(
+            json!({"data": "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45"}),
+        )
+        .unwrap_err();
+    }
+
+    #[test]
+    fn test_hash_serialize_as_hex() {
+        let test = TestAsHex {
+            data: Hash::<32>::from(HEX_32),
+        };
+        let actual = serde_json::to_value(&test).unwrap();
+        assert_eq!(actual, json!({"data": HEX_32}));
+    }
+}
diff --git a/rust/tw_hash/src/hash_wrapper.rs b/rust/tw_hash/src/hash_wrapper.rs
new file mode 100644
index 00000000000..da8bda6154e
--- /dev/null
+++ b/rust/tw_hash/src/hash_wrapper.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use digest::Digest;
+
+pub fn hasher<D: Digest>(input: &[u8]) -> Vec<u8> {
+    let mut hasher = D::new();
+    hasher.update(input);
+    let result = &hasher.finalize()[..];
+    result.to_vec()
+}
diff --git a/rust/tw_hash/src/hasher.rs b/rust/tw_hash/src/hasher.rs
new file mode 100644
index 00000000000..52765a2d63e
--- /dev/null
+++ b/rust/tw_hash/src/hasher.rs
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ripemd::ripemd_160;
+use crate::sha2::sha256;
+use crate::sha3::keccak256;
+use crate::{H160, H256};
+use serde::Deserialize;
+use tw_memory::Data;
+
+/// ripemd hash of the SHA256 hash.
+pub fn sha256_ripemd(data: &[u8]) -> Data {
+    ripemd_160(&sha256(data))
+}
+
+/// SHA256 hash of the SHA256 hash.
+pub fn sha256_d(data: &[u8]) -> Data {
+    sha256(&sha256(data))
+}
+
+/// TapSighash, required for Bitcoin Taproot. This function computes
+/// `sha256(sha256("TapSighash") + sha256("TapSighash") + data)`.
+pub fn tapsighash(data: &[u8]) -> Data {
+    const TAPSIG_TAG_HASH: [u8; 32] = [
+        244, 10, 72, 223, 75, 42, 112, 200, 180, 146, 75, 242, 101, 70, 97, 237, 61, 149, 253, 102,
+        163, 19, 235, 135, 35, 117, 151, 198, 40, 228, 160, 49,
+    ];
+
+    debug_assert_eq!(TAPSIG_TAG_HASH, sha256(b"TapSighash").as_slice());
+
+    let mut t = Vec::with_capacity(TAPSIG_TAG_HASH.len() * 2 + data.len());
+    t.extend(TAPSIG_TAG_HASH);
+    t.extend(TAPSIG_TAG_HASH);
+    t.extend(data);
+
+    sha256(&t)
+}
+
+/// Enum selector for the supported hash functions.
+///
+/// Add hash types if necessary. For example, when add a new hasher to `registry.json`,
+/// otherwise use hash functions directly.
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq, Eq)]
+pub enum Hasher {
+    #[serde(rename = "sha256")]
+    Sha256,
+    #[serde(rename = "keccak256")]
+    Keccak256,
+    /// SHA256 hash of the SHA256 hash
+    #[serde(rename = "sha256d")]
+    Sha256d,
+    /// ripemd hash of the SHA256 hash
+    #[serde(rename = "sha256ripemd")]
+    Sha256ripemd,
+    #[serde(rename = "tapsighash")]
+    TapSighash,
+}
+
+impl Hasher {
+    pub fn hash(&self, data: &[u8]) -> Data {
+        match self {
+            Hasher::Sha256 => sha256(data),
+            Hasher::Keccak256 => keccak256(data),
+            Hasher::Sha256d => sha256_d(data),
+            Hasher::Sha256ripemd => sha256_ripemd(data),
+            Hasher::TapSighash => tapsighash(data),
+        }
+    }
+
+    /// Returns a zeroized hash with a corresponding len.
+    pub fn zero_hash(&self) -> Data {
+        vec![0; self.hash_len()]
+    }
+
+    /// Returns a corresponding hash len.
+    pub fn hash_len(&self) -> usize {
+        match self {
+            Hasher::Sha256 | Hasher::Keccak256 | Hasher::Sha256d => H256::len(),
+            Hasher::Sha256ripemd => H160::len(),
+            Hasher::TapSighash => H256::len(),
+        }
+    }
+}
diff --git a/rust/tw_hash/src/hmac.rs b/rust/tw_hash/src/hmac.rs
new file mode 100644
index 00000000000..475c5bbdb7f
--- /dev/null
+++ b/rust/tw_hash/src/hmac.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use hmac::{Hmac, Mac};
+use sha2::Sha256;
+
+type HmacSha256 = Hmac<Sha256>;
+
+pub fn hmac_sha256(key: &[u8], input: &[u8]) -> Vec<u8> {
+    let mut mac = HmacSha256::new_from_slice(key).unwrap();
+    mac.update(input);
+    let res = mac.finalize();
+    let code_bytes = res.into_bytes();
+    code_bytes.to_vec()
+}
diff --git a/rust/tw_hash/src/lib.rs b/rust/tw_hash/src/lib.rs
new file mode 100644
index 00000000000..2371346ee7a
--- /dev/null
+++ b/rust/tw_hash/src/lib.rs
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod blake;
+pub mod blake2;
+pub mod crc32;
+pub mod ffi;
+pub mod groestl;
+pub mod hasher;
+pub mod hmac;
+pub mod ripemd;
+pub mod sha1;
+pub mod sha2;
+pub mod sha3;
+
+mod hash_array;
+mod hash_wrapper;
+
+pub use hash_array::*;
+
+use tw_encoding::hex::FromHexError;
+
+pub type Result<T> = std::result::Result<T, Error>;
+
+#[derive(Debug)]
+pub enum Error {
+    FromHexError(FromHexError),
+    InvalidHashLength,
+    InvalidArgument,
+}
+
+impl From<FromHexError> for Error {
+    fn from(e: FromHexError) -> Self {
+        Error::FromHexError(e)
+    }
+}
diff --git a/rust/tw_hash/src/ripemd.rs b/rust/tw_hash/src/ripemd.rs
new file mode 100644
index 00000000000..1b5c1b9b1de
--- /dev/null
+++ b/rust/tw_hash/src/ripemd.rs
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::hash_wrapper::hasher;
+use ripemd::Ripemd160;
+use sha2::Sha256;
+
+pub fn ripemd_160(input: &[u8]) -> Vec<u8> {
+    hasher::<Ripemd160>(input)
+}
+
+/// Computes the Bitcoin "hash160" of the input data. Respectively, it first
+/// hashes the input with SHA256 and then finally with RIPEMD-160.
+/// TODO remove this function
+pub fn bitcoin_hash_160(input: &[u8]) -> Vec<u8> {
+    let hash = hasher::<Sha256>(input);
+    hasher::<Ripemd160>(&hash)
+}
diff --git a/rust/tw_hash/src/sha1.rs b/rust/tw_hash/src/sha1.rs
new file mode 100644
index 00000000000..95262c5ed77
--- /dev/null
+++ b/rust/tw_hash/src/sha1.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::hash_wrapper::hasher;
+use sha1::Sha1;
+
+pub fn sha1(input: &[u8]) -> Vec<u8> {
+    hasher::<Sha1>(input)
+}
diff --git a/rust/tw_hash/src/sha2.rs b/rust/tw_hash/src/sha2.rs
new file mode 100644
index 00000000000..dae77d8c8d8
--- /dev/null
+++ b/rust/tw_hash/src/sha2.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::hash_wrapper::hasher;
+use sha2::{Sha224, Sha256, Sha512, Sha512_256};
+
+pub fn sha224(input: &[u8]) -> Vec<u8> {
+    hasher::<Sha224>(input)
+}
+
+pub fn sha256(input: &[u8]) -> Vec<u8> {
+    hasher::<Sha256>(input)
+}
+
+pub fn sha512(input: &[u8]) -> Vec<u8> {
+    hasher::<Sha512>(input)
+}
+
+pub fn sha512_256(input: &[u8]) -> Vec<u8> {
+    hasher::<Sha512_256>(input)
+}
diff --git a/rust/tw_hash/src/sha3.rs b/rust/tw_hash/src/sha3.rs
new file mode 100644
index 00000000000..1ff8fd38719
--- /dev/null
+++ b/rust/tw_hash/src/sha3.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::hash_wrapper::hasher;
+use sha3::{Keccak256, Keccak512, Sha3_256, Sha3_512};
+
+pub fn keccak256(input: &[u8]) -> Vec<u8> {
+    hasher::<Keccak256>(input)
+}
+
+pub fn keccak512(input: &[u8]) -> Vec<u8> {
+    hasher::<Keccak512>(input)
+}
+
+pub fn sha3_256(input: &[u8]) -> Vec<u8> {
+    hasher::<Sha3_256>(input)
+}
+
+pub fn sha3_512(input: &[u8]) -> Vec<u8> {
+    hasher::<Sha3_512>(input)
+}
diff --git a/rust/tw_hash/tests/hash_ffi_tests.rs b/rust/tw_hash/tests/hash_ffi_tests.rs
new file mode 100644
index 00000000000..ccd2e8e952e
--- /dev/null
+++ b/rust/tw_hash/tests/hash_ffi_tests.rs
@@ -0,0 +1,232 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::hex;
+use tw_encoding::hex::FromHexError;
+use tw_hash::ffi::{
+    blake2_b, blake2_b_personal, blake_256, groestl_512, hmac__sha256, keccak256, keccak512,
+    ripemd_160, sha1, sha256, sha3__256, sha3__512, sha512, sha512_256, CHashingCode,
+};
+use tw_hash::Error;
+use tw_memory::ffi::c_byte_array::CByteArray;
+use tw_memory::ffi::c_result::ErrorCode;
+
+type ExternFn = unsafe extern "C" fn(*const u8, usize) -> CByteArray;
+
+#[track_caller]
+pub fn test_hash_helper(hash: ExternFn, input: &[u8], expected: &str) {
+    let decoded = unsafe { hash(input.as_ptr(), input.len()).into_vec() };
+    assert_eq!(hex::encode(decoded, false), expected);
+}
+
+#[test]
+fn test_blake2b() {
+    const HASH_SIZE: usize = 64;
+
+    /// Declare a `blake2_b` helper that forwards `HASH_SIZE`.
+    unsafe extern "C" fn blake2_b_hash(input: *const u8, input_len: usize) -> CByteArray {
+        blake2_b(input, input_len, HASH_SIZE).unwrap()
+    }
+
+    test_hash_helper(blake2_b_hash, b"Hello world", "6ff843ba685842aa82031d3f53c48b66326df7639a63d128974c5c14f31a0f33343a8c65551134ed1ae0f2b0dd2bb495dc81039e3eeb0aa1bb0388bbeac29183");
+    test_hash_helper(blake2_b_hash,b"Hello world",  "6ff843ba685842aa82031d3f53c48b66326df7639a63d128974c5c14f31a0f33343a8c65551134ed1ae0f2b0dd2bb495dc81039e3eeb0aa1bb0388bbeac29183");
+    test_hash_helper(blake2_b_hash,b"The quick brown fox jumps over the lazy dog", "a8add4bdddfd93e4877d2746e62817b116364a1fa7bc148d95090bc7333b3673f82401cf7aa2e4cb1ecd90296e3f14cb5413f8ed77be73045b13914cdcd6a918");
+}
+
+#[test]
+fn test_blake2b_personal() {
+    let personal_data = b"MyApp Files Hash";
+    let content = b"the same content";
+    let actual = unsafe {
+        blake2_b_personal(
+            content.as_ptr(),
+            content.len(),
+            32,
+            personal_data.as_ptr(),
+            personal_data.len(),
+        )
+        .unwrap()
+        .into_vec()
+    };
+    let expected = "20d9cd024d4fb086aae819a1432dd2466de12947831b75c5a30cf2676095d3b4";
+    assert_eq!(hex::encode(actual, false), expected);
+}
+
+#[test]
+fn test_blake_256() {
+    test_hash_helper(
+        blake_256,
+        b"hello world",
+        "4a6f552c9a404582b4eeff4364df2d5a0da9e3f7635c7b638bacab9f5d09bdb1",
+    );
+    test_hash_helper(
+        blake_256,
+        b"The quick brown fox jumps over the lazy dog",
+        "7576698ee9cad30173080678e5965916adbb11cb5245d386bf1ffda1cb26c9d7",
+    );
+}
+
+#[test]
+fn test_groestl_512() {
+    test_hash_helper(groestl_512,b"hello world", "0059e9c916018f0e5efbe6e9376f7562203eb4b2c9267ba30353f1f0cfd4a950e7ae68d9e7cda002432c7f3efdf2a4c0cd673ddb9109e7d846538414d4a72c36");
+    test_hash_helper(groestl_512,b"The quick brown fox jumps over the lazy dog", "badc1f70ccd69e0cf3760c3f93884289da84ec13c70b3d12a53a7a8a4a513f99715d46288f55e1dbf926e6d084a0538e4eebfc91cf2b21452921ccde9131718d");
+}
+
+#[test]
+fn test_hmac_sha256() {
+    let key =
+        hex::decode("531cbfcf12a168faff61af28bf437377397b4bf435ee732cf4ac95761a651f14").unwrap();
+    let key = key.as_slice();
+    let data =
+        hex::decode("f300888ca4f512cebdc0020ff0f7224c7f896315e90e172bed65d005138f224d").unwrap();
+    let data = data.as_slice();
+    let actual =
+        unsafe { hmac__sha256(key.as_ptr(), key.len(), data.as_ptr(), data.len()).into_vec() };
+    let expected = "a7301d5563614e3955750e4480aabf7753f44b4975308aeb8e23c31e114962ab".to_string();
+    assert_eq!(hex::encode(actual, false), expected);
+}
+
+#[test]
+fn test_ripemd160() {
+    test_hash_helper(
+        ripemd_160,
+        b"hello world",
+        "98c615784ccb5fe5936fbc0cbe9dfdb408d92f0f",
+    );
+    test_hash_helper(
+        ripemd_160,
+        b"The quick brown fox jumps over the lazy dog",
+        "37f332f68db77bd9d7edd4969571ad671cf9dd3b",
+    );
+}
+
+#[test]
+fn test_sha1() {
+    test_hash_helper(sha1, b"", "da39a3ee5e6b4b0d3255bfef95601890afd80709");
+    test_hash_helper(
+        sha1,
+        b"The quick brown fox jumps over the lazy dog",
+        "2fd4e1c67a2d28fced849ee1bb76e7391b93eb12",
+    );
+    test_hash_helper(
+        sha1,
+        b"The quick brown fox jumps over the lazy dog.",
+        "408d94384216f890ff7a0c3528e8bed1e0b01621",
+    );
+}
+
+#[test]
+fn test_sha256() {
+    test_hash_helper(
+        sha256,
+        b"hello world",
+        "b94d27b9934d3e08a52e52d7da7dabfac484efe37a5380ee9088f7ace2efcde9",
+    );
+    test_hash_helper(
+        sha256,
+        b"The quick brown fox jumps over the lazy dog",
+        "d7a8fbb307d7809469ca9abcb0082e4f8d5651e46d3cdb762d02d0bf37c9e592",
+    );
+}
+
+#[test]
+fn test_sha512() {
+    test_hash_helper(
+        sha512,
+        b"hello world",
+        "309ecc489c12d6eb4cc40f50c902f2b4d0ed77ee511a7c7a9bcd3ca86d4cd86f989dd35bc5ff499670da34255b45b0cfd830e81f605dcf7dc5542e93ae9cd76f",
+    );
+    test_hash_helper(
+        sha512,
+        b"The quick brown fox jumps over the lazy dog",
+        "07e547d9586f6a73f73fbac0435ed76951218fb7d0c8d788a309d785436bbb642e93a252a954f23912547d1e8a3b5ed6e1bfd7097821233fa0538f3db854fee6",
+    );
+}
+
+#[test]
+fn test_sha512_256() {
+    test_hash_helper(
+        sha512_256,
+        b"hello world",
+        "0ac561fac838104e3f2e4ad107b4bee3e938bf15f2b15f009ccccd61a913f017",
+    );
+    test_hash_helper(
+        sha512_256,
+        b"The quick brown fox jumps over the lazy dog",
+        "dd9d67b371519c339ed8dbd25af90e976a1eeefd4ad3d889005e532fc5bef04d",
+    );
+}
+
+#[test]
+fn test_keccak256() {
+    test_hash_helper(
+        keccak256,
+        b"hello world",
+        "47173285a8d7341e5e972fc677286384f802f8ef42a5ec5f03bbfa254cb01fad",
+    );
+    test_hash_helper(
+        keccak256,
+        b"The quick brown fox jumps over the lazy dog",
+        "4d741b6f1eb29cb2a9b9911c82f56fa8d73b04959d3d9d222895df6c0b28aa15",
+    );
+}
+
+#[test]
+fn test_keccak512() {
+    test_hash_helper(
+        keccak512,
+        b"hello world",
+        "3ee2b40047b8060f68c67242175660f4174d0af5c01d47168ec20ed619b0b7c42181f40aa1046f39e2ef9efc6910782a998e0013d172458957957fac9405b67d",
+    );
+    test_hash_helper(
+        keccak512,
+        b"The quick brown fox jumps over the lazy dog",
+        "d135bb84d0439dbac432247ee573a23ea7d3c9deb2a968eb31d47c4fb45f1ef4422d6c531b5b9bd6f449ebcc449ea94d0a8f05f62130fda612da53c79659f609",
+    );
+}
+
+#[test]
+fn test_sha3_256() {
+    test_hash_helper(
+        sha3__256,
+        b"hello world",
+        "644bcc7e564373040999aac89e7622f3ca71fba1d972fd94a31c3bfbf24e3938",
+    );
+    test_hash_helper(
+        sha3__256,
+        b"The quick brown fox jumps over the lazy dog",
+        "69070dda01975c8c120c3aada1b282394e7f032fa9cf32f4cb2259a0897dfc04",
+    );
+}
+
+#[test]
+fn test_sha3_512() {
+    test_hash_helper(
+        sha3__512,
+        b"hello world",
+        "840006653e9ac9e95117a15c915caab81662918e925de9e004f774ff82d7079a40d4d27b1b372657c61d46d470304c88c788b3a4527ad074d1dccbee5dbaa99a",
+    );
+    test_hash_helper(
+        sha3__512,
+        b"The quick brown fox jumps over the lazy dog",
+        "01dedd5de4ef14642445ba5f5b97c15e47b9ad931326e4b0727cd94cefc44fff23f07bf543139939b49128caf436dc1bdee54fcb24023a08d9403f9b4bf0d450",
+    );
+}
+
+#[test]
+fn test_c_hashing_error_convert() {
+    assert_eq!(ErrorCode::from(CHashingCode::Ok), 0);
+    assert_eq!(ErrorCode::from(CHashingCode::InvalidHashLength), 1);
+    assert_eq!(ErrorCode::from(CHashingCode::InvalidArgument), 2);
+
+    assert_eq!(
+        CHashingCode::InvalidArgument,
+        Error::FromHexError(FromHexError::OddLength).into(),
+    );
+    assert_eq!(CHashingCode::InvalidArgument, Error::InvalidArgument.into());
+    assert_eq!(
+        CHashingCode::InvalidHashLength,
+        Error::InvalidHashLength.into(),
+    );
+}
diff --git a/rust/tw_keypair/Cargo.toml b/rust/tw_keypair/Cargo.toml
new file mode 100644
index 00000000000..d0e223475da
--- /dev/null
+++ b/rust/tw_keypair/Cargo.toml
@@ -0,0 +1,43 @@
+[package]
+name = "tw_keypair"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+test-utils = []
+
+[dependencies]
+arbitrary = { version = "1", features = ["derive"], optional = true }
+lazy_static = "1.4.0"
+rand_core = "0.6.4"
+serde = { version = "1.0", features = ["derive"] }
+tw_encoding = { path = "../tw_encoding" }
+tw_hash = { path = "../tw_hash" }
+tw_memory = { path = "../tw_memory" }
+tw_misc = { path = "../tw_misc" }
+zeroize = "1.8.1"
+# ECDSA specific:
+ecdsa = "0.16.6"
+der = "0.7.3"
+k256 = { version = "0.13.0", features = ["ecdh", "ecdsa", "pkcs8", "schnorr", "std"], default-features = false }
+p256 = { version = "0.13.0", features = ["ecdsa", "std"], default-features = false }
+pkcs8 = "0.10.2"
+rfc6979 = "0.4.0"
+# ED25519 specific:
+blake2 = "0.10.6"
+curve25519-dalek = { version = "4.1", features = ["digest", "legacy_compatibility"] }
+digest = "0.10"
+sha2 = "0.10.6"
+# Bitcoin schnorr specific:
+bitcoin = { version = "0.30.0", features = ["rand-std"] }
+secp256k1 = { version = "0.27.0", features = ["global-context", "rand-std"] }
+# TON Session key-exchange specific:
+crypto_box = "0.9.1"
+# Starknet specific:
+starknet-crypto = "0.5.0"
+starknet-ff = "0.3.2"
+
+[dev-dependencies]
+serde_json = "1.0"
+tw_keypair = { path = "./", features = ["test-utils"] }
+tw_memory = { path = "../tw_memory", features = ["test-utils"] }
diff --git a/rust/tw_keypair/fuzz/.gitignore b/rust/tw_keypair/fuzz/.gitignore
new file mode 100644
index 00000000000..5c404b9583f
--- /dev/null
+++ b/rust/tw_keypair/fuzz/.gitignore
@@ -0,0 +1,5 @@
+target
+corpus
+artifacts
+coverage
+Cargo.lock
diff --git a/rust/tw_keypair/fuzz/Cargo.toml b/rust/tw_keypair/fuzz/Cargo.toml
new file mode 100644
index 00000000000..17da9d20ca1
--- /dev/null
+++ b/rust/tw_keypair/fuzz/Cargo.toml
@@ -0,0 +1,41 @@
+[package]
+name = "tw_keypair-fuzz"
+version = "0.0.0"
+publish = false
+edition = "2021"
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
+
+[dependencies.tw_keypair]
+path = ".."
+features = ["arbitrary"]
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+# https://github.com/rust-lang/rust/issues/95240
+[profile.release.package.curve25519-dalek]
+opt-level = 2
+
+[[bin]]
+name = "tw_private_sign"
+path = "fuzz_targets/tw_private_sign.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "tw_public_verify"
+path = "fuzz_targets/tw_public_verify.rs"
+test = false
+doc = false
+
+[[bin]]
+name = "tw_private_to_public"
+path = "fuzz_targets/tw_private_to_public.rs"
+test = false
+doc = false
diff --git a/rust/tw_keypair/fuzz/fuzz_targets/tw_private_sign.rs b/rust/tw_keypair/fuzz/fuzz_targets/tw_private_sign.rs
new file mode 100644
index 00000000000..166540310c3
--- /dev/null
+++ b/rust/tw_keypair/fuzz/fuzz_targets/tw_private_sign.rs
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::{arbitrary, fuzz_target};
+use tw_keypair::tw::{Curve, PrivateKey};
+
+#[derive(arbitrary::Arbitrary, Debug)]
+struct TWPrivateSignInput {
+    private: Vec<u8>,
+    hash: Vec<u8>,
+    curve: Curve,
+}
+
+fuzz_target!(|input: TWPrivateSignInput| {
+    if let Ok(private) = PrivateKey::new(input.private) {
+        private.sign(&input.hash, input.curve).ok();
+    }
+});
diff --git a/rust/tw_keypair/fuzz/fuzz_targets/tw_private_to_public.rs b/rust/tw_keypair/fuzz/fuzz_targets/tw_private_to_public.rs
new file mode 100644
index 00000000000..b92a417a617
--- /dev/null
+++ b/rust/tw_keypair/fuzz/fuzz_targets/tw_private_to_public.rs
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::{arbitrary, fuzz_target};
+use tw_keypair::tw::{PrivateKey, PublicKeyType};
+
+#[derive(arbitrary::Arbitrary, Debug)]
+struct TWPrivateToPublicInput {
+    private: Vec<u8>,
+    public_key_type: PublicKeyType,
+}
+
+fuzz_target!(|input: TWPrivateToPublicInput| {
+    if let Ok(private) = PrivateKey::new(input.private) {
+        private.get_public_key_by_type(input.public_key_type).ok();
+    }
+});
diff --git a/rust/tw_keypair/fuzz/fuzz_targets/tw_public_verify.rs b/rust/tw_keypair/fuzz/fuzz_targets/tw_public_verify.rs
new file mode 100644
index 00000000000..43a209ed7a4
--- /dev/null
+++ b/rust/tw_keypair/fuzz/fuzz_targets/tw_public_verify.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![no_main]
+
+use libfuzzer_sys::{arbitrary, fuzz_target};
+use tw_keypair::tw::{PublicKey, PublicKeyType};
+
+#[derive(arbitrary::Arbitrary, Debug)]
+struct TWPublicVerifyInput {
+    public: Vec<u8>,
+    hash: Vec<u8>,
+    signature: Vec<u8>,
+    pubkey_type: PublicKeyType,
+}
+
+fuzz_target!(|input: TWPublicVerifyInput| {
+    if let Ok(public) = PublicKey::new(input.public, input.pubkey_type) {
+        public.verify(&input.signature, &input.hash);
+    }
+});
diff --git a/rust/tw_keypair/src/ecdsa/canonical.rs b/rust/tw_keypair/src/ecdsa/canonical.rs
new file mode 100644
index 00000000000..e335ee5c7de
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/canonical.rs
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! This module is a Proof Of Concept that proves the possibility to implement the following in Rust:
+//! https://github.com/trustwallet/wallet-core/blob/d9e35ec485b1366dd10509192d02d9dbb6877ab3/src/PrivateKey.cpp#L253-L282
+//!
+//! # Warning
+//!
+//! **Not production ready**
+
+#![allow(dead_code)]
+
+use crate::ecdsa::signature::Signature;
+use crate::ecdsa::EcdsaCurve;
+use crate::{KeyPairError, KeyPairResult};
+use ecdsa::elliptic_curve::generic_array::ArrayLength;
+use ecdsa::elliptic_curve::subtle::{Choice, ConditionallySelectable, ConstantTimeEq};
+use ecdsa::elliptic_curve::{Curve, FieldBytesEncoding, PrimeField, Scalar};
+use ecdsa::hazmat::{bits2field, DigestPrimitive, SignPrimitive};
+use ecdsa::SigningKey;
+use k256::sha2::digest::crypto_common::BlockSizeUser;
+use k256::sha2::digest::{FixedOutput, FixedOutputReset};
+use k256::sha2::Digest;
+use rfc6979::{ByteArray, HmacDrbg};
+use tw_hash::H256;
+
+type CurveDigest<C> = <C as DigestPrimitive>::Digest;
+
+/// Implements https://github.com/trustwallet/wallet-core/blob/d9e35ec485b1366dd10509192d02d9dbb6877ab3/src/PrivateKey.cpp#L253-L282
+pub(crate) fn sign_with_canonical<C: EcdsaCurve, F>(
+    signing_key: &SigningKey<C>,
+    hash_to_sign: H256,
+    mut is_canonical: F,
+) -> KeyPairResult<Signature<C>>
+where
+    for<'a> F: FnMut(&'a Signature<C>) -> bool,
+    Scalar<C>: SignPrimitive<C>,
+    <C as Curve>::Uint: FieldBytesEncoding<C>,
+{
+    let priv_scalar = signing_key.as_nonzero_scalar();
+
+    let nonce =
+        bits2field::<C>(hash_to_sign.as_slice()).map_err(|_| KeyPairError::InvalidSignMessage)?;
+    let entropy_input = &priv_scalar.to_repr();
+    let n = &C::ORDER.encode_field_bytes();
+    let additional_data = &[];
+
+    let mut hmac_drbg = HmacDrbg::<CurveDigest<C>>::new(entropy_input, &nonce, additional_data);
+
+    for _ in 0..10000 {
+        // The `k` number is different on each iteration due to the `hmac_drbg` mutation.
+        let k = generate_k::<CurveDigest<C>, _>(&mut hmac_drbg, n);
+        let k_scalar = Scalar::<C>::from_repr(k).unwrap();
+
+        let (sig, r) = priv_scalar
+            .try_sign_prehashed(k_scalar, &nonce)
+            .map_err(|_| KeyPairError::SigningError)?;
+        let r = r.ok_or(KeyPairError::SigningError)?;
+
+        let signature = Signature::<C>::new(sig, r);
+        if is_canonical(&signature) {
+            return Ok(signature);
+        }
+    }
+
+    Err(KeyPairError::SigningError)
+}
+
+fn ct_eq<N: ArrayLength<u8>>(a: &ByteArray<N>, b: &ByteArray<N>) -> Choice {
+    let mut ret = Choice::from(1);
+
+    for (a, b) in a.iter().zip(b.iter()) {
+        ret.conditional_assign(&Choice::from(0), !a.ct_eq(b));
+    }
+
+    ret
+}
+
+pub(crate) fn ct_lt<N: ArrayLength<u8>>(a: &ByteArray<N>, b: &ByteArray<N>) -> Choice {
+    let mut borrow = 0;
+
+    // Perform subtraction with borrow a byte-at-a-time, interpreting a
+    // no-borrow condition as the less-than case
+    for (&a, &b) in a.iter().zip(b.iter()).rev() {
+        let c = (b as u16).wrapping_add(borrow >> (u8::BITS - 1));
+        borrow = (a as u16).wrapping_sub(c) >> u8::BITS as u8;
+    }
+
+    !borrow.ct_eq(&0)
+}
+
+pub(crate) fn generate_k<D, N>(hmac_drbg: &mut HmacDrbg<D>, n: &ByteArray<N>) -> ByteArray<N>
+where
+    D: Digest + BlockSizeUser + FixedOutput<OutputSize = N> + FixedOutputReset,
+    N: ArrayLength<u8>,
+{
+    loop {
+        let mut k = ByteArray::<N>::default();
+        hmac_drbg.fill_bytes(&mut k);
+
+        let k_is_zero = ct_eq(&k, &ByteArray::default());
+        if (!k_is_zero & ct_lt(&k, n)).into() {
+            return k;
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::ecdsa::secp256k1::{PrivateKey, Signature};
+    use tw_hash::H520;
+    use tw_misc::traits::ToBytesVec;
+
+    fn is_unsigned(byte: u8) -> bool {
+        byte & 0x80 == 0
+    }
+
+    fn fio_is_canonical(sig: &Signature) -> bool {
+        let sig = sig.to_vec();
+        is_unsigned(sig[0])
+            && !(sig[0] == 0 && is_unsigned(sig[1]))
+            && is_unsigned(sig[32])
+            && !(sig[32] == 0 && is_unsigned(sig[33]))
+    }
+
+    #[test]
+    fn test_sign_canonical() {
+        let private = PrivateKey::try_from(
+            "ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035",
+        )
+        .unwrap();
+        let hash_to_sign =
+            H256::from("71b7098e8150cde90f3ec00280815d3069f81c7cdb6d83bbe2b897b1afbe7cd6");
+
+        let actual = sign_with_canonical(&private.secret, hash_to_sign, fio_is_canonical).unwrap();
+        let expected = H520::from("42ceeaa4a3d0ea0429ab09e4d969abd812c65ad4efef9e95e3a19cc3c41be3770ad0222dac6aa1b350cf9273fa922801d11b6142cb0fe639e2fe3fd988e5aec400");
+        assert_eq!(actual.to_bytes(), expected);
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/der.rs b/rust/tw_keypair/src/ecdsa/der.rs
new file mode 100644
index 00000000000..96f22bc302f
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/der.rs
@@ -0,0 +1,214 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{KeyPairError, KeyPairResult};
+use der::asn1::UintRef;
+use der::{Decode, Encode, Reader};
+use tw_hash::{H256, H512};
+use tw_memory::Data;
+
+/// The standard binary signature representation length.
+/// RS, where R - 32 byte array, S - 32 byte array.
+const R_LENGTH: usize = H256::LEN;
+const S_LENGTH: usize = H256::LEN;
+
+pub type SignatureBytes = H512;
+
+/// ASN.1 DER-encoded signature as specified in [RFC5912 Appendix A]:
+///
+/// ```text
+/// ECDSA-Sig-Value ::= SEQUENCE {
+///   r  INTEGER,
+///   s  INTEGER
+/// }
+/// ```
+///
+/// [RFC5912 Appendix A]: https://www.rfc-editor.org/rfc/rfc5912#appendix-A
+#[derive(Debug)]
+pub struct Signature {
+    r: H256,
+    s: H256,
+    /// ASN.1 DER-encoded signature data.
+    der_bytes: Data,
+}
+
+impl Signature {
+    pub fn new(r: H256, s: H256) -> KeyPairResult<Signature> {
+        let der_bytes =
+            encode_der(r.as_slice(), s.as_slice()).map_err(|_| KeyPairError::InvalidSignature)?;
+        Ok(Signature { r, s, der_bytes })
+    }
+
+    /// Parses signature from DER-encoded bytes.
+    /// Source: https://github.com/RustCrypto/signatures/blob/ecb112aa25ac210d86946089cddf0a62a672ce14/ecdsa/src/der.rs#L83-L108
+    pub fn from_bytes(input: &[u8]) -> KeyPairResult<Signature> {
+        let (r, s) = decode_der(input).map_err(|_| KeyPairError::InvalidSignature)?;
+
+        if r.as_bytes().len() > R_LENGTH || s.as_bytes().len() > S_LENGTH {
+            return Err(KeyPairError::InvalidSignature);
+        }
+
+        let r_begin = R_LENGTH.saturating_sub(r.as_bytes().len());
+        let s_begin = S_LENGTH.saturating_sub(s.as_bytes().len());
+
+        let mut r_complete = H256::default();
+        r_complete[r_begin..].copy_from_slice(r.as_bytes());
+
+        let mut s_complete = H256::default();
+        s_complete[s_begin..].copy_from_slice(s.as_bytes());
+
+        Ok(Signature {
+            r: r_complete,
+            s: s_complete,
+            der_bytes: input.to_vec(),
+        })
+    }
+
+    /// Returns ASN.1 DER-encoded signature data.
+    pub fn der_bytes(&self) -> Data {
+        self.der_bytes.clone()
+    }
+
+    /// Get the `r` component of the signature.
+    pub fn r(&self) -> &[u8] {
+        self.r.as_slice()
+    }
+
+    /// Get the `s` component of the signature.
+    pub fn s(&self) -> &[u8] {
+        self.s.as_slice()
+    }
+
+    /// Returns the standard binary signature representation:
+    /// RS, where R - 32 byte array, S - 32 byte array.
+    pub fn to_bytes(&self) -> SignatureBytes {
+        let mut sign = SignatureBytes::default();
+
+        sign[0..R_LENGTH].copy_from_slice(self.r());
+        sign[R_LENGTH..].copy_from_slice(self.s());
+
+        sign
+    }
+
+    pub fn to_vec(&self) -> Vec<u8> {
+        self.to_bytes().to_vec()
+    }
+}
+
+/// Decode the `r` and `s` components of a DER-encoded ECDSA signature.
+/// Source: https://github.com/RustCrypto/signatures/blob/ecb112aa25ac210d86946089cddf0a62a672ce14/ecdsa/src/der.rs#L357C69-L370
+fn decode_der(der_bytes: &[u8]) -> der::Result<(UintRef<'_>, UintRef<'_>)> {
+    let mut reader = der::SliceReader::new(der_bytes)?;
+    let header = der::Header::decode(&mut reader)?;
+    header.tag.assert_eq(der::Tag::Sequence)?;
+
+    let ret = reader.read_nested(header.length, |reader| {
+        let r = UintRef::decode(reader)?;
+        let s = UintRef::decode(reader)?;
+        Ok((r, s))
+    })?;
+
+    reader.finish(ret)
+}
+
+/// Create an ASN.1 DER encoded signature from big endian `r` and `s` scalar components.
+/// Source: https://github.com/RustCrypto/signatures/blob/ecb112aa25ac210d86946089cddf0a62a672ce14/ecdsa/src/der.rs#L110-L128
+fn encode_der(r: &[u8], s: &[u8]) -> der::Result<Data> {
+    const DER_CAPACITY: usize = 100;
+
+    let r_uint = UintRef::new(r)?;
+    let s_uint = UintRef::new(s)?;
+
+    let mut bytes = [0u8; DER_CAPACITY];
+    let mut writer = der::SliceWriter::new(bytes.as_mut_slice());
+
+    writer.sequence((r_uint.encoded_len()? + s_uint.encoded_len()?)?, |seq| {
+        seq.encode(&r_uint)?;
+        seq.encode(&s_uint)
+    })?;
+
+    // Returns an actual der signature bytes.
+    Ok(writer.finish()?.to_vec())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use std::str::FromStr;
+    use tw_encoding::hex;
+    use tw_encoding::hex::ToHex;
+
+    #[test]
+    fn test_parse_ecdsa_signature() {
+        #[track_caller]
+        fn test_impl(encoded: &str, expected: &str) {
+            // Test decoding an ecdsa signature from der.
+            let encoded_bytes = hex::decode(encoded).unwrap();
+            let sign = Signature::from_bytes(&encoded_bytes).unwrap();
+            let actual = sign.to_bytes();
+            let expected_bytes = SignatureBytes::from_str(expected).expect("!decode");
+            assert_eq!(actual, expected_bytes, "!decode");
+
+            // Test encoding an ecdsa signature to der.
+            let new_signature = Signature::new(sign.r, sign.s).expect("!encode");
+            assert_eq!(new_signature.der_bytes().to_hex(), encoded, "!encode");
+        }
+
+        test_impl(
+            "3045022100b2b31575f8536b284410d01217f688be3a9faf4ba0ba3a9093f983e40d630ec7022022a7a25b01403cff0d00b3b853d230f8e96ff832b15d4ccc75203cb65896a2d5",
+            "b2b31575f8536b284410d01217f688be3a9faf4ba0ba3a9093f983e40d630ec722a7a25b01403cff0d00b3b853d230f8e96ff832b15d4ccc75203cb65896a2d5"
+        );
+        test_impl(
+            "304402200f5d5a9e5fc4b82a625312f3be5d3e8ad017d882de86c72c92fcefa924e894c102202071772a14201a3a0debf381b5e8dea39fadb9bcabdc02ee71ab018f55bf717f",
+            "0f5d5a9e5fc4b82a625312f3be5d3e8ad017d882de86c72c92fcefa924e894c12071772a14201a3a0debf381b5e8dea39fadb9bcabdc02ee71ab018f55bf717f"
+        );
+        test_impl(
+            "3046022100db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495da022100ff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1",
+            "db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495daff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1"
+        );
+        test_impl(
+            "3046022100b4877d788d3756399873fd0346765c5462ec07093e58360f5d29cd76bf7d390b022100de9c7ab3fd733d3385416a430b2976875e2a749e203cf5cc1bf0135d1a2ccbef",
+            "b4877d788d3756399873fd0346765c5462ec07093e58360f5d29cd76bf7d390bde9c7ab3fd733d3385416a430b2976875e2a749e203cf5cc1bf0135d1a2ccbef"
+        );
+        test_impl(
+            "3044022029acfd2df79350389e6a33ccddd845b7adb9eb7fe08d2ed05f141330e369b518022043989b824b1532e9d51d87253f0698afa9d1081f0609cc50ad4f3c46e7bdedcf",
+            "29acfd2df79350389e6a33ccddd845b7adb9eb7fe08d2ed05f141330e369b51843989b824b1532e9d51d87253f0698afa9d1081f0609cc50ad4f3c46e7bdedcf"
+        );
+        test_impl(
+            "3045022100c0b8b2992cf439ea37d8686cd0515c255381e58b7de4f2ba87cc24445f1efcc30220300262b0a687bc89e22ecb61fc85d70dd9d8f326c81694bbc6e505bcde3a2094",
+            "c0b8b2992cf439ea37d8686cd0515c255381e58b7de4f2ba87cc24445f1efcc3300262b0a687bc89e22ecb61fc85d70dd9d8f326c81694bbc6e505bcde3a2094"
+        );
+        test_impl(
+            "303d021d00f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f600000000021c70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf900000000",
+            "00000000f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6000000000000000070d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf900000000"
+        );
+        test_impl(
+            "3006020110020110",
+            "00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010"
+        );
+    }
+
+    #[test]
+    fn test_parse_ecdsa_signature_invalid() {
+        #[track_caller]
+        fn test_impl(encoded: &str) {
+            let encoded_bytes = hex::decode(encoded).unwrap();
+            Signature::from_bytes(&encoded_bytes).unwrap_err();
+        }
+
+        test_impl("");
+        test_impl(
+            "3046022100db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495da022100",
+        );
+        test_impl(
+            "3045022100B2B31575F8536B284410D01217F688BE3A9FAF4BA0BA3A9093F983E40D630EC7022022A7A25B01403CFF0D00B3B853D230F8E96FF832B15D4CCC75203CB65896A2"
+        );
+        test_impl(
+            "3045022100B2B31575F8536B284410D01217F688BE3A9FAF4BA0BA3A9093F983E40D630EC7022022A7A25B01403CFF0D00B3B853D230F8E96FF832B15D4CCC75203CB65896A2D5D5"
+        );
+        test_impl(
+            "3045022100B2B31575F8536B284410D01217F688BE3A9FAF4BA0BA3A9093F983E40D630EC7022022A7A25B01403CFF0D00B3B853D230F8E96FF832B15D4CCC75203CB65896A2D53045022100B2B31575F8536B284410D01217F688BE3A9FAF4BA0BA3A9093F983E40D630EC7022022A7A25B01403CFF0D00B3B853D230F8E96FF832B15D4CCC75203CB65896A2D5"
+        );
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/mod.rs b/rust/tw_keypair/src/ecdsa/mod.rs
new file mode 100644
index 00000000000..dae3dd5bb7e
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/mod.rs
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use ecdsa::elliptic_curve::bigint::U256;
+use ecdsa::elliptic_curve::consts::U32;
+use ecdsa::elliptic_curve::CurveArithmetic;
+use ecdsa::hazmat::DigestPrimitive;
+use ecdsa::PrimeCurve;
+
+mod canonical;
+pub mod der;
+pub mod nist256p1;
+pub mod secp256k1;
+pub mod signature;
+
+/// This is an alias used for convenience.
+pub trait EcdsaCurve:
+    PrimeCurve<FieldBytesSize = U32, Uint = U256> + CurveArithmetic + DigestPrimitive
+{
+}
+
+impl<T> EcdsaCurve for T where
+    T: PrimeCurve<FieldBytesSize = U32, Uint = U256> + CurveArithmetic + DigestPrimitive
+{
+}
diff --git a/rust/tw_keypair/src/ecdsa/nist256p1/keypair.rs b/rust/tw_keypair/src/ecdsa/nist256p1/keypair.rs
new file mode 100644
index 00000000000..9af364dd93c
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/nist256p1/keypair.rs
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::nist256p1::private::PrivateKey;
+use crate::ecdsa::nist256p1::public::PublicKey;
+use crate::ecdsa::nist256p1::{Signature, VerifySignature};
+use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use crate::{KeyPairError, KeyPairResult};
+use tw_encoding::hex;
+use tw_hash::H256;
+use zeroize::ZeroizeOnDrop;
+use zeroize::Zeroizing;
+
+/// Represents a pair of `nist256p1` private and public keys.
+#[derive(ZeroizeOnDrop)]
+pub struct KeyPair {
+    private: PrivateKey,
+    #[zeroize(skip)]
+    public: PublicKey,
+}
+
+impl KeyPairTrait for KeyPair {
+    type Private = PrivateKey;
+    type Public = PublicKey;
+
+    fn public(&self) -> &Self::Public {
+        &self.public
+    }
+
+    fn private(&self) -> &Self::Private {
+        &self.private
+    }
+}
+
+impl SigningKeyTrait for KeyPair {
+    type SigningMessage = H256;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        self.private.sign(message)
+    }
+}
+
+impl VerifyingKeyTrait for KeyPair {
+    type SigningMessage = H256;
+    type VerifySignature = VerifySignature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public.verify(signature, message)
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for KeyPair {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let private = PrivateKey::try_from(bytes)?;
+        let public = private.public();
+        Ok(KeyPair { private, public })
+    }
+}
+
+impl<'a> TryFrom<&'a str> for KeyPair {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/nist256p1/mod.rs b/rust/tw_keypair/src/ecdsa/nist256p1/mod.rs
new file mode 100644
index 00000000000..7e92a7b3dfc
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/nist256p1/mod.rs
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use p256::NistP256;
+
+mod keypair;
+mod private;
+mod public;
+
+pub use keypair::KeyPair;
+pub use private::PrivateKey;
+pub use public::PublicKey;
+
+pub type Signature = crate::ecdsa::signature::Signature<NistP256>;
+pub type VerifySignature = crate::ecdsa::signature::VerifySignature<NistP256>;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+    use tw_encoding::hex;
+    use tw_hash::sha3::keccak256;
+    use tw_hash::{H256, H264, H520};
+    use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
+
+    #[test]
+    fn test_key_pair() {
+        let secret =
+            hex::decode("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5")
+                .unwrap();
+        let key_pair = KeyPair::try_from(secret.as_slice()).unwrap();
+        assert_eq!(key_pair.private().to_zeroizing_vec().as_slice(), secret);
+        assert_eq!(
+            key_pair.public().uncompressed(),
+            H520::from("046d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab918b4fe46ccbf56701fb210d67d91c5779468f6b3fdc7a63692b9b62543f47ae")
+        );
+        assert_eq!(
+            key_pair.public().compressed(),
+            H264::from("026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab"),
+        );
+    }
+
+    #[test]
+    fn test_private_key_from() {
+        let hex = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+        let expected = hex::decode(hex).unwrap();
+
+        // Test `From<&'static str>`.
+        let private = PrivateKey::try_from(hex).unwrap();
+        assert_eq!(private.to_zeroizing_vec().as_slice(), expected);
+
+        // Test `From<&'a [u8]>`.
+        let private = PrivateKey::try_from(expected.as_slice()).unwrap();
+        assert_eq!(private.to_zeroizing_vec().as_slice(), expected);
+    }
+
+    #[test]
+    fn test_private_key_sign_verify() {
+        let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+        let keypair = KeyPair::try_from(secret).unwrap();
+
+        let hash_to_sign = keccak256(b"hello");
+        let hash_to_sign = H256::try_from(hash_to_sign.as_slice()).unwrap();
+        let signature = keypair.sign(hash_to_sign).unwrap();
+
+        let expected = H520::from("8859e63a0c0cc2fc7f788d7e78406157b288faa6f76f76d37c4cd1534e8d83c468f9fd6ca7dde378df594625dcde98559389569e039282275e3d87c26e36447401");
+        assert_eq!(signature.to_bytes(), expected);
+
+        let verify_signature = VerifySignature::from(signature);
+        assert!(keypair.verify(verify_signature, hash_to_sign));
+    }
+
+    #[test]
+    fn test_public_key_from() {
+        let compressed = "026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab";
+        let uncompressed = "046d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab918b4fe46ccbf56701fb210d67d91c5779468f6b3fdc7a63692b9b62543f47ae";
+        let expected_compressed = H264::from(compressed);
+        let expected_uncompressed = H520::from(uncompressed);
+
+        // From extended public key.
+        let public = PublicKey::try_from(uncompressed).unwrap();
+        assert_eq!(public.to_vec(), expected_compressed.into_vec());
+        assert_eq!(public.compressed(), expected_compressed);
+        assert_eq!(public.uncompressed(), expected_uncompressed);
+
+        // From compressed public key.
+        let public = PublicKey::try_from(compressed).unwrap();
+        assert_eq!(public.to_vec(), expected_compressed.into_vec());
+        assert_eq!(public.compressed(), expected_compressed);
+        assert_eq!(public.uncompressed(), expected_uncompressed);
+    }
+
+    #[test]
+    fn test_public_key_recover() {
+        let sign_bytes = H520::from("8859e63a0c0cc2fc7f788d7e78406157b288faa6f76f76d37c4cd1534e8d83c468f9fd6ca7dde378df594625dcde98559389569e039282275e3d87c26e36447401");
+        let sign = Signature::from_bytes(sign_bytes.as_slice()).unwrap();
+
+        let signed_hash = keccak256(b"hello");
+        let signed_hash = H256::try_from(signed_hash.as_slice()).unwrap();
+
+        let actual = PublicKey::recover(sign, signed_hash).unwrap();
+        let expected_compressed =
+            H264::from("026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab");
+        assert_eq!(actual.compressed(), expected_compressed);
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/nist256p1/private.rs b/rust/tw_keypair/src/ecdsa/nist256p1/private.rs
new file mode 100644
index 00000000000..0d2ede5bf83
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/nist256p1/private.rs
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::nist256p1::public::PublicKey;
+use crate::ecdsa::nist256p1::Signature;
+use crate::traits::SigningKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use p256::ecdsa::SigningKey;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesZeroizing;
+use zeroize::{ZeroizeOnDrop, Zeroizing};
+
+/// Represents a `nist256p1` private key.
+#[derive(ZeroizeOnDrop)]
+pub struct PrivateKey {
+    pub(crate) secret: SigningKey,
+}
+
+impl PrivateKey {
+    /// Returns an associated `nist256p1` public key.
+    pub fn public(&self) -> PublicKey {
+        PublicKey::new(*self.secret.verifying_key())
+    }
+}
+
+impl SigningKeyTrait for PrivateKey {
+    type SigningMessage = H256;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        let (signature, recovery_id) = self
+            .secret
+            .sign_prehash_recoverable(message.as_slice())
+            .map_err(|_| KeyPairError::SigningError)?;
+        Ok(Signature::new(signature, recovery_id))
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(data: &'a [u8]) -> Result<Self, Self::Error> {
+        let secret = SigningKey::from_slice(data).map_err(|_| KeyPairError::InvalidSecretKey)?;
+        Ok(PrivateKey { secret })
+    }
+}
+
+impl<'a> TryFrom<&'a str> for PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl ToBytesZeroizing for PrivateKey {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        let secret = Zeroizing::new(self.secret.to_bytes());
+        Zeroizing::new(secret.as_slice().to_vec())
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/nist256p1/public.rs b/rust/tw_keypair/src/ecdsa/nist256p1/public.rs
new file mode 100644
index 00000000000..6ac0ec429c7
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/nist256p1/public.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::nist256p1::{Signature, VerifySignature};
+use crate::traits::VerifyingKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use p256::ecdsa::signature::hazmat::PrehashVerifier;
+use p256::ecdsa::VerifyingKey;
+use tw_encoding::hex;
+use tw_hash::{H256, H264, H520};
+use tw_misc::traits::ToBytesVec;
+
+/// Represents a `nist256p1` public key.
+#[derive(Clone)]
+pub struct PublicKey {
+    pub(crate) public: VerifyingKey,
+}
+
+/// cbindgen:ignore
+impl PublicKey {
+    /// The number of bytes in a compressed public key.
+    pub const COMPRESSED: usize = H264::len();
+    /// The number of bytes in an uncompressed public key.
+    pub const UNCOMPRESSED: usize = H520::len();
+
+    /// Recover a [`PublicKey`] from the given `message` and the signature over that.
+    pub fn recover(sign: Signature, message: H256) -> KeyPairResult<Self> {
+        VerifyingKey::recover_from_prehash(message.as_slice(), &sign.signature, sign.v)
+            .map(|public| PublicKey { public })
+            .map_err(|_| KeyPairError::InvalidSignature)
+    }
+
+    /// Creates a public key from the given [`VerifyingKey`].
+    pub(crate) fn new(public: VerifyingKey) -> PublicKey {
+        PublicKey { public }
+    }
+
+    /// Returns the raw data of the compressed public key (33 bytes).
+    pub fn compressed(&self) -> H264 {
+        let compressed = true;
+        H264::try_from(self.public.to_encoded_point(compressed).as_bytes())
+            .expect("Expected 33 byte array Public Key")
+    }
+
+    /// Returns the raw data of the uncompressed public key (65 bytes).
+    pub fn uncompressed(&self) -> H520 {
+        let compressed = false;
+        H520::try_from(self.public.to_encoded_point(compressed).as_bytes())
+            .expect("Expected 65 byte array Public Key")
+    }
+}
+
+impl VerifyingKeyTrait for PublicKey {
+    type SigningMessage = H256;
+    type VerifySignature = VerifySignature;
+
+    fn verify(&self, sign: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public
+            .verify_prehash(message.as_slice(), &sign.signature)
+            .is_ok()
+    }
+}
+
+impl<'a> TryFrom<&'a str> for PublicKey {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = hex::decode(hex).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PublicKey {
+    type Error = KeyPairError;
+
+    /// Expected either `H264` or `H520` slice.
+    fn try_from(data: &'a [u8]) -> Result<Self, Self::Error> {
+        Ok(PublicKey {
+            public: VerifyingKey::from_sec1_bytes(data)
+                .map_err(|_| KeyPairError::InvalidPublicKey)?,
+        })
+    }
+}
+
+/// Return the compressed bytes representation by default.
+/// Consider using [`PublicKey::compressed`] or [`PublicKey::uncompressed`] instead.
+impl ToBytesVec for PublicKey {
+    fn to_vec(&self) -> Vec<u8> {
+        self.compressed().to_vec()
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/secp256k1/keypair.rs b/rust/tw_keypair/src/ecdsa/secp256k1/keypair.rs
new file mode 100644
index 00000000000..d609741cf0a
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/secp256k1/keypair.rs
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::secp256k1::private::PrivateKey;
+use crate::ecdsa::secp256k1::public::PublicKey;
+use crate::ecdsa::secp256k1::{Signature, VerifySignature};
+use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use crate::{KeyPairError, KeyPairResult};
+use tw_encoding::hex;
+use tw_hash::H256;
+use zeroize::{ZeroizeOnDrop, Zeroizing};
+
+/// Represents a pair of `secp256k1` private and public keys.
+#[derive(ZeroizeOnDrop)]
+pub struct KeyPair {
+    private: PrivateKey,
+    #[zeroize(skip)]
+    public: PublicKey,
+}
+
+impl KeyPairTrait for KeyPair {
+    type Private = PrivateKey;
+    type Public = PublicKey;
+
+    fn public(&self) -> &Self::Public {
+        &self.public
+    }
+
+    fn private(&self) -> &Self::Private {
+        &self.private
+    }
+}
+
+impl SigningKeyTrait for KeyPair {
+    type SigningMessage = H256;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        self.private.sign(message)
+    }
+}
+
+impl VerifyingKeyTrait for KeyPair {
+    type SigningMessage = H256;
+    type VerifySignature = VerifySignature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public.verify(signature, message)
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for KeyPair {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let private = PrivateKey::try_from(bytes)?;
+        let public = private.public();
+        Ok(KeyPair { private, public })
+    }
+}
+
+impl<'a> TryFrom<&'a str> for KeyPair {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/secp256k1/mod.rs b/rust/tw_keypair/src/ecdsa/secp256k1/mod.rs
new file mode 100644
index 00000000000..dcc76c801e0
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/secp256k1/mod.rs
@@ -0,0 +1,175 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use k256::Secp256k1;
+
+mod keypair;
+mod private;
+mod public;
+
+pub use keypair::KeyPair;
+pub use private::PrivateKey;
+pub use public::PublicKey;
+
+pub type Signature = crate::ecdsa::signature::Signature<Secp256k1>;
+pub type VerifySignature = crate::ecdsa::signature::VerifySignature<Secp256k1>;
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+    use tw_encoding::hex;
+    use tw_encoding::hex::ToHex;
+    use tw_hash::sha2::sha256;
+    use tw_hash::sha3::keccak256;
+    use tw_hash::{H256, H264, H520};
+    use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
+
+    #[test]
+    fn test_key_pair() {
+        let secret =
+            hex::decode("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5")
+                .unwrap();
+        let key_pair = KeyPair::try_from(secret.as_slice()).unwrap();
+        assert_eq!(key_pair.private().to_zeroizing_vec().as_slice(), secret);
+        assert_eq!(
+            key_pair.public().compressed(),
+            H264::from("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1")
+        );
+    }
+
+    #[test]
+    fn test_key_pair_sign() {
+        let key_pair =
+            KeyPair::try_from("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5")
+                .unwrap();
+
+        let hash_to_sign = keccak256(b"hello");
+        let hash_to_sign = H256::try_from(hash_to_sign.as_slice()).unwrap();
+        let signature = key_pair.sign(hash_to_sign).unwrap();
+
+        let expected = H520::from("8720a46b5b3963790d94bcc61ad57ca02fd153584315bfa161ed3455e336ba624d68df010ed934b8792c5b6a57ba86c3da31d039f9612b44d1bf054132254de901");
+        assert_eq!(signature.to_bytes(), expected);
+
+        let verify_signature = VerifySignature::from(signature);
+        assert!(key_pair.verify(verify_signature, hash_to_sign));
+    }
+
+    #[test]
+    fn test_private_key_from() {
+        let hex = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+        let expected = hex::decode(hex).unwrap();
+
+        // Test `From<&'static str>`.
+        let private = PrivateKey::try_from(hex).unwrap();
+        assert_eq!(private.to_zeroizing_vec().as_slice(), expected);
+
+        // Test `From<&'a [u8]>`.
+        let private = PrivateKey::try_from(expected.as_slice()).unwrap();
+        assert_eq!(private.to_zeroizing_vec().as_slice(), expected);
+    }
+
+    #[test]
+    fn test_private_key_sign_verify() {
+        let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+        let private = PrivateKey::try_from(secret).unwrap();
+        let public = private.public();
+
+        let hash_to_sign = keccak256(b"hello");
+        let hash_to_sign = H256::try_from(hash_to_sign.as_slice()).unwrap();
+        let signature = private.sign(hash_to_sign).unwrap();
+
+        let expected = H520::from("8720a46b5b3963790d94bcc61ad57ca02fd153584315bfa161ed3455e336ba624d68df010ed934b8792c5b6a57ba86c3da31d039f9612b44d1bf054132254de901");
+        assert_eq!(signature.to_bytes(), expected);
+
+        let verify_signature = VerifySignature::from(signature);
+        assert!(public.verify(verify_signature, hash_to_sign));
+    }
+
+    #[test]
+    fn test_public_key_sign_verify_as_der() {
+        let private_key = PrivateKey::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let public_key = private_key.public();
+
+        let msg_to_sign = "Hello";
+        let hash_to_sign = sha256(msg_to_sign.as_bytes());
+        let hash_to_sign = H256::try_from(hash_to_sign.as_slice()).unwrap();
+
+        let signature = private_key.sign(hash_to_sign).unwrap();
+        let signature_der = VerifySignature::from(signature).to_der().unwrap();
+
+        assert_eq!(signature_der.der_bytes().to_hex(), "304402200f5d5a9e5fc4b82a625312f3be5d3e8ad017d882de86c72c92fcefa924e894c102202071772a14201a3a0debf381b5e8dea39fadb9bcabdc02ee71ab018f55bf717f");
+
+        // Now convert the der signature to ecdsa.
+        let verify_signature = VerifySignature::from_der(signature_der).unwrap();
+        assert!(public_key.verify(verify_signature, hash_to_sign));
+    }
+
+    #[test]
+    fn test_public_key_from() {
+        let compressed = "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1";
+        let uncompressed = "0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91";
+        let expected_compressed = H264::from(compressed);
+        let expected_uncompressed = H520::from(uncompressed);
+
+        // From extended public key.
+        let public = PublicKey::try_from(uncompressed).unwrap();
+        assert_eq!(public.to_vec(), expected_compressed.into_vec());
+        assert_eq!(public.compressed(), expected_compressed);
+        assert_eq!(public.uncompressed(), expected_uncompressed);
+
+        // From compressed public key.
+        let public = PublicKey::try_from(compressed).unwrap();
+        assert_eq!(public.to_vec(), expected_compressed.into_vec());
+        assert_eq!(public.compressed(), expected_compressed);
+        assert_eq!(public.uncompressed(), expected_uncompressed);
+    }
+
+    #[test]
+    fn test_verify_invalid() {
+        let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+        let private = PrivateKey::try_from(secret).unwrap();
+
+        let signature_bytes  = H520::from("375df53b6a4931dcf41e062b1c64288ed4ff3307f862d5c1b1c71964ce3b14c99422d0fdfeb2807e9900a26d491d5e8a874c24f98eec141ed694d7a433a90f0801");
+        let verify_sig = VerifySignature::try_from(signature_bytes.as_slice()).unwrap();
+
+        let hash_to_sign = keccak256(b"hello");
+        let hash_to_sign = H256::try_from(hash_to_sign.as_slice()).unwrap();
+
+        assert!(!private.public().verify(verify_sig, hash_to_sign));
+    }
+
+    #[test]
+    fn test_shared_key_hash() {
+        let private = PrivateKey::try_from(
+            "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0",
+        )
+        .unwrap();
+        let public = PublicKey::try_from(
+            "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992",
+        )
+        .unwrap();
+        let actual = private.shared_key_hash(&public);
+        let expected =
+            H256::from("ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a");
+        assert_eq!(actual, expected);
+    }
+
+    #[test]
+    fn test_public_key_recover() {
+        let sign_bytes = H520::from("8720a46b5b3963790d94bcc61ad57ca02fd153584315bfa161ed3455e336ba624d68df010ed934b8792c5b6a57ba86c3da31d039f9612b44d1bf054132254de901");
+        let sign = Signature::from_bytes(sign_bytes.as_slice()).unwrap();
+
+        let signed_hash = keccak256(b"hello");
+        let signed_hash = H256::try_from(signed_hash.as_slice()).unwrap();
+
+        let actual = PublicKey::recover(sign, signed_hash).unwrap();
+        let expected_compressed =
+            H264::from("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1");
+        assert_eq!(actual.compressed(), expected_compressed);
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/secp256k1/private.rs b/rust/tw_keypair/src/ecdsa/secp256k1/private.rs
new file mode 100644
index 00000000000..ec80de8b098
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/secp256k1/private.rs
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::secp256k1::public::PublicKey;
+use crate::ecdsa::secp256k1::Signature;
+use crate::traits::SigningKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use k256::ecdsa::{SigningKey, VerifyingKey};
+use k256::elliptic_curve::sec1::ToEncodedPoint;
+use k256::{AffinePoint, ProjectivePoint};
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesZeroizing;
+use zeroize::{ZeroizeOnDrop, Zeroizing};
+
+/// Represents a `secp256k1` private key.
+#[derive(ZeroizeOnDrop)]
+pub struct PrivateKey {
+    pub(crate) secret: SigningKey,
+}
+
+impl PrivateKey {
+    /// Returns an associated `secp256k1` public key.
+    pub fn public(&self) -> PublicKey {
+        PublicKey::new(*self.secret.verifying_key())
+    }
+
+    /// Computes an EC Diffie-Hellman secret in constant time.
+    /// The method is ported from [TW::PrivateKey::getSharedKey](https://github.com/trustwallet/wallet-core/blob/830b1c5baaf90692196163999e4ee2063c5f4e49/src/PrivateKey.cpp#L175-L191).
+    pub fn shared_key_hash(&self, pubkey: &PublicKey) -> H256 {
+        let shared_secret = diffie_hellman(&self.secret, &pubkey.public);
+
+        // Get a compressed shared secret (33 bytes with a tag in front).
+        let compress = true;
+        let shared_secret_compressed = shared_secret.to_encoded_point(compress);
+
+        let shared_secret_hash = tw_hash::sha2::sha256(shared_secret_compressed.as_bytes());
+        H256::try_from(shared_secret_hash.as_slice()).expect("Expected 32 byte array sha256 hash")
+    }
+}
+
+/// This method is inspired by [elliptic_curve::ecdh::diffie_hellman](https://github.com/RustCrypto/traits/blob/f0dbe44fea56d4c17e625ababacb580fec842137/elliptic-curve/src/ecdh.rs#L60-L70)
+fn diffie_hellman(private: &SigningKey, public: &VerifyingKey) -> AffinePoint {
+    let public_point = ProjectivePoint::from(*public.as_affine());
+    let secret_scalar = private.as_nonzero_scalar().as_ref();
+    // Multiply the secret and public to get a shared secret affine point (x, y).
+    (public_point * secret_scalar).to_affine()
+}
+
+impl SigningKeyTrait for PrivateKey {
+    type SigningMessage = H256;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        let (signature, recovery_id) = self
+            .secret
+            .sign_prehash_recoverable(message.as_slice())
+            .map_err(|_| KeyPairError::SigningError)?;
+        Ok(Signature::new(signature, recovery_id))
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(data: &'a [u8]) -> Result<Self, Self::Error> {
+        let secret = SigningKey::from_slice(data).map_err(|_| KeyPairError::InvalidSecretKey)?;
+        Ok(PrivateKey { secret })
+    }
+}
+
+impl<'a> TryFrom<&'a str> for PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl ToBytesZeroizing for PrivateKey {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        let secret = Zeroizing::new(self.secret.to_bytes());
+        Zeroizing::new(secret.as_slice().to_vec())
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/secp256k1/public.rs b/rust/tw_keypair/src/ecdsa/secp256k1/public.rs
new file mode 100644
index 00000000000..73f61021069
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/secp256k1/public.rs
@@ -0,0 +1,121 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::secp256k1::{Signature, VerifySignature};
+use crate::traits::VerifyingKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use der::Document;
+use k256::ecdsa::signature::hazmat::PrehashVerifier;
+use k256::ecdsa::VerifyingKey;
+use tw_encoding::hex;
+use tw_hash::{Hash, H256, H264, H512, H520};
+use tw_misc::traits::ToBytesVec;
+
+/// Represents a `secp256k1` public key.
+#[derive(Clone, PartialEq)]
+pub struct PublicKey {
+    pub(crate) public: VerifyingKey,
+}
+
+/// cbindgen:ignore
+impl PublicKey {
+    /// The number of bytes in a compressed public key.
+    pub const COMPRESSED: usize = H264::len();
+    /// The number of bytes in an uncompressed public key.
+    pub const UNCOMPRESSED: usize = H520::len();
+
+    /// Recover a [`PublicKey`] from the given `message` and the signature over that.
+    pub fn recover(sign: Signature, message: H256) -> KeyPairResult<Self> {
+        VerifyingKey::recover_from_prehash(message.as_slice(), &sign.signature, sign.v)
+            .map(|public| PublicKey { public })
+            .map_err(|_| KeyPairError::InvalidSignature)
+    }
+
+    /// Creates a public key from the given [`VerifyingKey`].
+    pub(crate) fn new(public: VerifyingKey) -> PublicKey {
+        PublicKey { public }
+    }
+
+    /// Returns the raw data of the compressed public key (33 bytes).
+    pub fn compressed(&self) -> H264 {
+        let compressed = true;
+        H264::try_from(self.public.to_encoded_point(compressed).as_bytes())
+            .expect("Expected 33 byte array Public Key")
+    }
+
+    /// Returns the raw data of the uncompressed public key (65 bytes).
+    pub fn uncompressed(&self) -> H520 {
+        let compressed = false;
+        H520::try_from(self.public.to_encoded_point(compressed).as_bytes())
+            .expect("Expected 65 byte array Public Key")
+    }
+
+    /// Returns the raw data of the uncompressed public key without the tag prefix (64 bytes).
+    pub fn uncompressed_without_prefix(&self) -> H512 {
+        let (_prefix, public): (Hash<1>, H512) = self.uncompressed().split();
+        public
+    }
+
+    /// Returns the public key as DER-encoded bytes.
+    pub fn der_encoded(&self) -> Vec<u8> {
+        let compressed = false;
+        let public_key_bytes = self.public.to_encoded_point(compressed);
+        let subject_public_key =
+            der::asn1::BitStringRef::new(0, public_key_bytes.as_bytes()).unwrap();
+
+        let oid: pkcs8::ObjectIdentifier = pkcs8::ObjectIdentifier::new_unwrap("1.2.840.10045.2.1");
+        let associated_oid: pkcs8::ObjectIdentifier =
+            pkcs8::ObjectIdentifier::new_unwrap("1.3.132.0.10");
+        let spki = pkcs8::SubjectPublicKeyInfo {
+            algorithm: pkcs8::spki::AlgorithmIdentifier {
+                oid,
+                parameters: Some(associated_oid),
+            },
+            subject_public_key,
+        };
+
+        let doc = Document::try_from(&spki).unwrap();
+        doc.into_vec()
+    }
+}
+
+impl VerifyingKeyTrait for PublicKey {
+    type SigningMessage = H256;
+    type VerifySignature = VerifySignature;
+
+    fn verify(&self, sign: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public
+            .verify_prehash(message.as_slice(), &sign.signature)
+            .is_ok()
+    }
+}
+
+impl<'a> TryFrom<&'a str> for PublicKey {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = hex::decode(hex).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PublicKey {
+    type Error = KeyPairError;
+
+    /// Expected either `H264` or `H520` slice.
+    fn try_from(data: &'a [u8]) -> Result<Self, Self::Error> {
+        Ok(PublicKey {
+            public: VerifyingKey::from_sec1_bytes(data)
+                .map_err(|_| KeyPairError::InvalidPublicKey)?,
+        })
+    }
+}
+
+/// Return the compressed bytes representation by default.
+/// Consider using [`PublicKey::compressed`] or [`PublicKey::uncompressed`] instead.
+impl ToBytesVec for PublicKey {
+    fn to_vec(&self) -> Vec<u8> {
+        self.compressed().to_vec()
+    }
+}
diff --git a/rust/tw_keypair/src/ecdsa/signature.rs b/rust/tw_keypair/src/ecdsa/signature.rs
new file mode 100644
index 00000000000..e8fb8de263f
--- /dev/null
+++ b/rust/tw_keypair/src/ecdsa/signature.rs
@@ -0,0 +1,217 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::der;
+use crate::ecdsa::EcdsaCurve;
+use crate::{KeyPairError, KeyPairResult};
+use ecdsa::elliptic_curve::FieldBytes;
+use std::ops::{Range, RangeInclusive};
+use tw_hash::{concat, H256, H512, H520};
+use tw_misc::traits::ToBytesVec;
+
+/// Represents an ECDSA signature.
+#[derive(Clone, Debug, PartialEq)]
+pub struct Signature<C: EcdsaCurve> {
+    pub(crate) signature: ecdsa::Signature<C>,
+    pub(crate) v: ecdsa::RecoveryId,
+}
+
+/// cbindgen:ignore
+impl<C: EcdsaCurve> Signature<C> {
+    /// The number of bytes for a serialized signature representation.
+    pub const LEN: usize = 65;
+    pub const R_RANGE: Range<usize> = 0..32;
+    pub const S_RANGE: Range<usize> = 32..64;
+    pub const RECOVERY_LAST: usize = 64;
+    /// Expected signature with or without recovery byte in the end of the slice.
+    pub const VERIFY_SIGNATURE_LEN_RANGE: RangeInclusive<usize> = 64..=65;
+
+    /// Creates a `secp256k1` recoverable signature from the given [`k256::ecdsa::Signature`]
+    /// and the `v` recovery byte.
+    pub(crate) fn new(signature: ecdsa::Signature<C>, v: ecdsa::RecoveryId) -> Self {
+        Signature { signature, v }
+    }
+
+    /// Returns the number of bytes for a serialized signature representation.
+    pub const fn len() -> usize {
+        Self::LEN
+    }
+
+    /// Returns an r-coordinate as 32 byte array.
+    pub fn r(&self) -> H256 {
+        let (r, _s) = self.signature.split_bytes();
+        H256::try_from(r.as_slice()).expect("Expected 'r' 32 byte length array")
+    }
+
+    /// Returns an s-value as 32 byte array.
+    pub fn s(&self) -> H256 {
+        let (_, s) = self.signature.split_bytes();
+        H256::try_from(s.as_slice()).expect("Expected 's' 32 byte length array")
+    }
+
+    /// Returns a recovery ID.
+    pub fn v(&self) -> u8 {
+        self.v.to_byte()
+    }
+
+    /// Tries to create a Signature from the serialized representation.
+    pub fn from_bytes(sig: &[u8]) -> KeyPairResult<Self> {
+        if sig.len() != Self::len() {
+            return Err(KeyPairError::InvalidSignature);
+        }
+
+        let v = ecdsa::RecoveryId::from_byte(sig[Self::RECOVERY_LAST])
+            .ok_or(KeyPairError::InvalidSignature)?;
+
+        Ok(Signature {
+            signature: Self::signature_from_slices(&sig[Self::R_RANGE], &sig[Self::S_RANGE])?,
+            v,
+        })
+    }
+
+    /// Tries to create a Signature from the parts.
+    pub fn try_from_parts(r: H256, s: H256, v: u8) -> KeyPairResult<Self> {
+        Ok(Signature {
+            signature: Self::signature_from_slices(r.as_slice(), s.as_slice())?,
+            v: ecdsa::RecoveryId::from_byte(v).ok_or(KeyPairError::InvalidSignature)?,
+        })
+    }
+
+    /// Returns a standard binary signature representation:
+    /// RSV, where R - 32 byte array, S - 32 byte array, V - 1 byte.
+    pub fn to_bytes(&self) -> H520 {
+        let (r, s) = self.signature.split_bytes();
+
+        let mut dest = H520::default();
+        dest[Self::R_RANGE].copy_from_slice(r.as_slice());
+        dest[Self::S_RANGE].copy_from_slice(s.as_slice());
+        dest[Self::RECOVERY_LAST] = self.v.to_byte();
+        dest
+    }
+
+    pub fn to_der(&self) -> KeyPairResult<der::Signature> {
+        der::Signature::new(self.r(), self.s())
+    }
+
+    /// # Panic
+    ///
+    /// `r` and `s` must be 32 byte arrays, otherwise the function panics.
+    fn signature_from_slices(r: &[u8], s: &[u8]) -> KeyPairResult<ecdsa::Signature<C>> {
+        let r = FieldBytes::<C>::clone_from_slice(r);
+        let s = FieldBytes::<C>::clone_from_slice(s);
+
+        ecdsa::Signature::<C>::from_scalars(r, s).map_err(|_| KeyPairError::InvalidSignature)
+    }
+}
+
+impl<C: EcdsaCurve> ToBytesVec for Signature<C> {
+    fn to_vec(&self) -> Vec<u8> {
+        self.to_bytes().to_vec()
+    }
+}
+
+impl<'a, C: EcdsaCurve> TryFrom<&'a [u8]> for Signature<C> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        Signature::from_bytes(bytes)
+    }
+}
+
+/// To verify the signature, it's enough to check `r` and `s` parts without the recovery ID.
+pub struct VerifySignature<C: EcdsaCurve> {
+    pub(crate) signature: ecdsa::Signature<C>,
+}
+
+impl<C: EcdsaCurve> VerifySignature<C> {
+    pub fn from_der(der_signature: der::Signature) -> KeyPairResult<Self> {
+        let signature = Signature::signature_from_slices(der_signature.r(), der_signature.s())
+            .map_err(|_| KeyPairError::InvalidSignature)?;
+        Ok(VerifySignature { signature })
+    }
+
+    /// Returns a standard binary signature representation:
+    /// RS, where R - 32 byte array, S - 32 byte array.
+    pub fn to_bytes(&self) -> H512 {
+        let (r, s) = self.rs();
+        concat(r, s)
+    }
+
+    /// Returns an ASN.1 DER encoded signature.
+    pub fn to_der(&self) -> KeyPairResult<der::Signature> {
+        let (r, s) = self.rs();
+        der::Signature::new(r, s)
+    }
+
+    /// Returns R (32 byte array) and S (32 byte array) values.
+    pub fn rs(&self) -> (H256, H256) {
+        let (r, s) = self.signature.split_bytes();
+
+        let mut r_bytes = H256::default();
+        r_bytes.copy_from_slice(r.as_slice());
+
+        let mut s_bytes = H256::default();
+        s_bytes.copy_from_slice(s.as_slice());
+
+        (r_bytes, s_bytes)
+    }
+}
+
+impl<C: EcdsaCurve> ToBytesVec for VerifySignature<C> {
+    fn to_vec(&self) -> Vec<u8> {
+        self.to_bytes().to_vec()
+    }
+}
+
+impl<'a, C: EcdsaCurve> TryFrom<&'a [u8]> for VerifySignature<C> {
+    type Error = KeyPairError;
+
+    fn try_from(sig: &'a [u8]) -> Result<Self, Self::Error> {
+        if !Signature::<C>::VERIFY_SIGNATURE_LEN_RANGE.contains(&sig.len()) {
+            return Err(KeyPairError::InvalidSignature);
+        }
+
+        Ok(VerifySignature {
+            signature: Signature::signature_from_slices(
+                &sig[Signature::<C>::R_RANGE],
+                &sig[Signature::<C>::S_RANGE],
+            )?,
+        })
+    }
+}
+
+impl<C: EcdsaCurve> From<Signature<C>> for VerifySignature<C> {
+    fn from(sig: Signature<C>) -> Self {
+        VerifySignature {
+            signature: sig.signature,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use k256::Secp256k1;
+
+    #[test]
+    fn test_signature() {
+        let sign_bytes = H520::from("d93fc9ae934d4f72db91cb149e7e84b50ca83b5a8a7b873b0fdb009546e3af47786bfaf31af61eea6471dbb1bec7d94f73fb90887e4f04d0e9b85676c47ab02a00");
+        let sign = Signature::<Secp256k1>::from_bytes(sign_bytes.as_slice()).unwrap();
+        assert_eq!(
+            sign.r(),
+            H256::from("d93fc9ae934d4f72db91cb149e7e84b50ca83b5a8a7b873b0fdb009546e3af47")
+        );
+        assert_eq!(
+            sign.s(),
+            H256::from("786bfaf31af61eea6471dbb1bec7d94f73fb90887e4f04d0e9b85676c47ab02a")
+        );
+        assert_eq!(sign.v(), 0);
+        assert_eq!(sign.to_bytes(), sign_bytes);
+    }
+
+    #[test]
+    fn test_signature_from_invalid_bytes() {
+        Signature::<Secp256k1>::from_bytes(b"123").unwrap_err();
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/keypair.rs b/rust/tw_keypair/src/ed25519/keypair.rs
new file mode 100644
index 00000000000..3ac2ac1e1fa
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/keypair.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::{private::PrivateKey, public::PublicKey, signature::Signature, Hasher512};
+use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use crate::{KeyPairError, KeyPairResult};
+use tw_encoding::hex;
+use zeroize::Zeroizing;
+
+/// Represents a pair of `ed25519` private and public keys.
+#[derive(Debug)]
+pub struct KeyPair<H: Hasher512> {
+    private: PrivateKey<H>,
+    public: PublicKey<H>,
+}
+
+impl<H: Hasher512> KeyPairTrait for KeyPair<H> {
+    type Private = PrivateKey<H>;
+    type Public = PublicKey<H>;
+
+    fn public(&self) -> &Self::Public {
+        &self.public
+    }
+
+    fn private(&self) -> &Self::Private {
+        &self.private
+    }
+}
+
+impl<H: Hasher512> SigningKeyTrait for KeyPair<H> {
+    type SigningMessage = Vec<u8>;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        self.private().sign_with_public_key(self.public(), &message)
+    }
+}
+
+impl<H: Hasher512> VerifyingKeyTrait for KeyPair<H> {
+    type SigningMessage = Vec<u8>;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public().verify(signature, message)
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for KeyPair<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let private = PrivateKey::try_from(bytes)?;
+        let public = private.public();
+        Ok(KeyPair { private, public })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for KeyPair<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/mangle.rs b/rust/tw_keypair/src/ed25519/mangle.rs
new file mode 100644
index 00000000000..1ec1da750a6
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/mangle.rs
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+/// Clamps the scalar by:
+/// 1. clearing the 3 lower bits,
+/// 2. clearing the highest bit,
+/// 3. setting the second highest bit.
+///
+/// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/secret.rs#L277-L279C26
+pub fn mangle_scalar(scalar: &mut [u8; 32]) {
+    scalar[0] &= 0b1111_1000;
+    scalar[31] &= 0b0011_1111;
+    scalar[31] |= 0b0100_0000;
+}
diff --git a/rust/tw_keypair/src/ed25519/mod.rs b/rust/tw_keypair/src/ed25519/mod.rs
new file mode 100644
index 00000000000..3c34d4ff6ec
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/mod.rs
@@ -0,0 +1,263 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use digest::{consts::U64, Digest};
+
+mod keypair;
+mod mangle;
+mod modifications;
+mod private;
+mod public;
+mod secret;
+mod signature;
+
+pub use modifications::{cardano, waves};
+pub use signature::Signature;
+
+/// Standard `ed25519` implementation.
+pub mod sha512 {
+    use sha2::Sha512;
+
+    pub type KeyPair = crate::ed25519::keypair::KeyPair<Sha512>;
+    pub type PrivateKey = crate::ed25519::private::PrivateKey<Sha512>;
+    pub type PublicKey = crate::ed25519::public::PublicKey<Sha512>;
+}
+
+/// `ed25519` implementation using `BLAKE2B` hash function.
+pub mod blake2b {
+    use blake2::Blake2b512;
+
+    pub type KeyPair = crate::ed25519::keypair::KeyPair<Blake2b512>;
+    pub type PrivateKey = crate::ed25519::private::PrivateKey<Blake2b512>;
+    pub type PublicKey = crate::ed25519::public::PublicKey<Blake2b512>;
+}
+
+/// A hash function that returns 64 length output.
+pub trait Hasher512: Digest<OutputSize = U64> {
+    const OUTPUT_LEN: usize = 64;
+    const HALF_LEN: usize = 32;
+}
+
+impl<T> Hasher512 for T where T: Digest<OutputSize = U64> {}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+    use tw_encoding::hex;
+    use tw_hash::sha2::sha256;
+    use tw_hash::sha3::keccak256;
+    use tw_hash::{H256, H512};
+    use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
+
+    #[test]
+    fn test_private_from_bytes() {
+        let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+
+        let private = sha512::PrivateKey::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let actual = private.to_zeroizing_vec();
+        assert_eq!(actual.as_slice(), H256::from(secret).as_slice());
+    }
+
+    #[test]
+    fn test_private_to_public() {
+        let private = sha512::PrivateKey::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let public = private.public();
+
+        let expected =
+            H256::from("4870d56d074c50e891506d78faa4fb69ca039cc5f131eb491e166b975880e867");
+        assert_eq!(public.to_vec(), expected.into_vec());
+    }
+
+    #[test]
+    fn test_private_to_public_blake2b() {
+        let private = blake2b::PrivateKey::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let public = private.public();
+
+        let expected =
+            H256::from("b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9");
+        assert_eq!(public.to_bytes(), expected);
+    }
+
+    #[test]
+    fn test_keypair_sign_verify() {
+        let keypair = sha512::KeyPair::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let to_sign = sha256(b"Hello");
+        let actual = keypair.sign(to_sign.clone()).unwrap();
+
+        let expected = H512::from("42848abf2641a731e18b8a1fb80eff341a5acebdc56faeccdcbadb960aef775192842fccec344679446daa4d02d264259c8f9aa364164ebe0ebea218581e2e03");
+        assert_eq!(actual.to_bytes(), expected);
+
+        assert!(keypair.verify(actual, to_sign));
+    }
+
+    #[test]
+    fn test_signature_malleability() {
+        let orig_sign_bytes = hex::decode("ea85a47dcc18b512dfea7c209162abaea4808d77c1ec903dc7ba6e2afa3f9f07e7ed7a20a4e2fa1009db3d1443e937e6abb16ff3c3eaecb798faed7fbb40b008").unwrap();
+        Signature::try_from(orig_sign_bytes.as_slice()).unwrap();
+
+        let modified_sign_bytes = hex::decode("ea85a47dcc18b512dfea7c209162abaea4808d77c1ec903dc7ba6e2afa3f9f07d4c1707dbe450d69df7735b721e316fbabb16ff3c3eaecb798faed7fbb40b018").unwrap();
+        Signature::try_from(modified_sign_bytes.as_slice()).unwrap_err();
+    }
+
+    #[test]
+    fn test_keypair_sign_verify_blake2b() {
+        let keypair = blake2b::KeyPair::try_from(
+            "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+        )
+        .unwrap();
+        let to_sign = sha256(b"Hello");
+        let actual = keypair.sign(to_sign.clone()).unwrap();
+
+        let expected = H512::from("5c1473944cd0234ebc5a91b2966b9e707a33b936dadd149417a2e53b6b3fc97bef17b767b1690708c74d7b4c8fe48703fd44a6ef59d4cc5b9f88ba992db0a003");
+        assert_eq!(actual.to_bytes(), expected);
+
+        assert!(keypair.verify(actual, to_sign));
+    }
+
+    #[test]
+    fn test_keypair_sign_verify_waves() {
+        let keypair = waves::KeyPair::try_from(
+            "9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a",
+        )
+        .unwrap();
+        let to_sign = hex::decode("0402559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d00000000016372e852120000000005f5e1000000000005f5e10001570acc4110b78a6d38b34d879b5bba38806202ecf1732f8542000766616c6166656c").unwrap();
+        let actual = keypair.sign(to_sign.clone()).unwrap();
+
+        let expected = H512::from("af7989256f496e103ce95096b3f52196dd9132e044905fe486da3b829b5e403bcba95ab7e650a4a33948c2d05cfca2dce4d4df747e26402974490fb4c49fbe8f");
+        assert_eq!(actual.to_bytes(), expected);
+
+        assert!(keypair.verify(actual, to_sign));
+    }
+
+    #[test]
+    fn test_private_to_public_waves() {
+        let private = waves::PrivateKey::try_from(
+            "9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a",
+        )
+        .unwrap();
+        let actual = private.public();
+        let expected =
+            H256::from("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
+        assert_eq!(actual.to_vec().as_slice(), expected.as_slice());
+    }
+
+    #[test]
+    fn test_private_from_bytes_cardano() {
+        let secret = "b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71effbf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4\
+        639aadd8b6499ae39b78018b79255fbd8f585cbda9cbb9e907a72af86afb7a05d41a57c2dec9a6a19d6bf3b1fa784f334f3a0048d25ccb7b78a7b44066f9ba7bed7f28be986cbe06819165f2ee41b403678a098961013cf4a2f3e9ea61fb6c1a";
+
+        let private = cardano::ExtendedPrivateKey::try_from(secret).unwrap();
+        let actual = private.to_zeroizing_vec();
+        assert_eq!(actual.as_slice(), hex::decode(secret).unwrap());
+    }
+
+    #[test]
+    fn test_keypair_sign_verify_extended_cardano() {
+        let secret = "b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71effbf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4\
+        639aadd8b6499ae39b78018b79255fbd8f585cbda9cbb9e907a72af86afb7a05d41a57c2dec9a6a19d6bf3b1fa784f334f3a0048d25ccb7b78a7b44066f9ba7bed7f28be986cbe06819165f2ee41b403678a098961013cf4a2f3e9ea61fb6c1a";
+
+        let keypair = cardano::ExtendedKeyPair::try_from(secret).unwrap();
+
+        let message = keccak256(b"hello");
+        let actual = keypair.sign(message.clone()).unwrap();
+
+        let expected = H512::from("375df53b6a4931dcf41e062b1c64288ed4ff3307f862d5c1b1c71964ce3b14c99422d0fdfeb2807e9900a26d491d5e8a874c24f98eec141ed694d7a433a90f08");
+        assert_eq!(actual.to_bytes(), expected);
+
+        assert!(keypair.verify(actual, message));
+    }
+
+    #[test]
+    fn test_public_verify_invalid_waves() {
+        let invalid_sigs = [
+            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        ];
+
+        let public = waves::PublicKey::try_from(
+            "b60076cc30ffff5c29c65af9a13ce01c3affc231d09fccbcd1277319c7911634",
+        )
+        .unwrap();
+        let msg = vec![1, 2, 3];
+
+        for invalid_sig_hex in invalid_sigs {
+            let invalid_sig_bytes = hex::decode(invalid_sig_hex).unwrap();
+            let invalid_sig = waves::Signature::try_from(invalid_sig_bytes.as_slice()).unwrap();
+
+            public.verify(invalid_sig, msg.clone());
+        }
+    }
+
+    #[test]
+    fn test_private_to_public_extended_cardano() {
+        let secret = "e8c8c5b2df13f3abed4e6b1609c808e08ff959d7e6fc3d849e3f2880550b574437aa559095324d78459b9bb2da069da32337e1cc5da78f48e1bd084670107f3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fa\
+        e0d152bb611cb9ff34e945e4ff627e6fba81da687a601a879759cd76530b5744424db69a75edd4780a5fbc05d1a3c84ac4166ff8e424808481dd8e77627ce5f5bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276";
+
+        let private = cardano::ExtendedPrivateKey::try_from(secret).unwrap();
+        let public = private.public();
+
+        let expected = "fafa7eb4146220db67156a03a5f7a79c666df83eb31abbfbe77c85e06d40da3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fa\
+        f4b8d5201961e68f2e177ba594101f513ee70fe70a41324e8ea8eb787ffda6f4bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276";
+        assert_eq!(public.to_vec(), hex::decode(expected).unwrap());
+    }
+
+    #[test]
+    fn test_public_key_from_bytes_extended_cardano() {
+        let pubkey_hex = "fafa7eb4146220db67156a03a5f7a79c666df83eb31abbfbe77c85e06d40da3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fa\
+        f4b8d5201961e68f2e177ba594101f513ee70fe70a41324e8ea8eb787ffda6f4bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276";
+        let pubkey_bytes = hex::decode(pubkey_hex).unwrap();
+
+        let actual = cardano::ExtendedPublicKey::try_from(pubkey_bytes.as_slice()).unwrap();
+        assert_eq!(actual.to_vec(), pubkey_bytes);
+    }
+
+    #[test]
+    fn test_signature_from_bytes() {
+        let signature = "418aff0000000000000000000000000000000000000000000000f600000000000000000000000000000000000000000000000000000000000000000000000010";
+        let actual = Signature::try_from(hex::decode(signature).unwrap().as_slice()).unwrap();
+        assert_eq!(actual.to_bytes(), H512::from(signature));
+    }
+
+    #[test]
+    fn test_waves_signature_from_bytes() {
+        let sig_bytes = H512::from("af7989256f496e103ce95096b3f52196dd9132e044905fe486da3b829b5e403bcba95ab7e650a4a33948c2d05cfca2dce4d4df747e26402974490fb4c49fbe8f");
+        let signature = waves::Signature::try_from(sig_bytes.as_slice()).unwrap();
+        assert_eq!(signature.to_vec(), sig_bytes.into_vec());
+    }
+
+    #[test]
+    fn test_keypair_from_invalid_bytes() {
+        let invalid = [0; 1];
+        let _ = sha512::KeyPair::try_from(&invalid[..]).unwrap_err();
+        let _ = sha512::PrivateKey::try_from(&invalid[..]).unwrap_err();
+        let _ = sha512::PublicKey::try_from(&invalid[..]).unwrap_err();
+    }
+
+    #[test]
+    fn test_debug() {
+        let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+        let sign = H512::from("ea85a47dcc18b512dfea7c209162abaea4808d77c1ec903dc7ba6e2afa3f9f07e7ed7a20a4e2fa1009db3d1443e937e6abb16ff3c3eaecb798faed7fbb40b008");
+
+        let keypair = sha512::KeyPair::try_from(secret).unwrap();
+        let sign = Signature::try_from(sign.as_slice()).unwrap();
+
+        let _ = format!("{:?}", keypair);
+        let _ = format!("{:?}", keypair.private());
+        let _ = format!("{:?}", keypair.public());
+        let _ = format!("{:?}", sign);
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/modifications/cardano/extended_keypair.rs b/rust/tw_keypair/src/ed25519/modifications/cardano/extended_keypair.rs
new file mode 100644
index 00000000000..f746f12d6d1
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/cardano/extended_keypair.rs
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::modifications::cardano::{
+    extended_private::ExtendedPrivateKey, extended_public::ExtendedPublicKey,
+};
+use crate::ed25519::{signature::Signature, Hasher512};
+use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use crate::{KeyPairError, KeyPairResult};
+use tw_encoding::hex;
+use zeroize::Zeroizing;
+
+/// Represents an `ed25519` extended key pair that is used in Cardano blockchain.
+pub struct ExtendedKeyPair<H: Hasher512> {
+    private: ExtendedPrivateKey<H>,
+    public: ExtendedPublicKey<H>,
+}
+
+impl<H: Hasher512> KeyPairTrait for ExtendedKeyPair<H> {
+    type Private = ExtendedPrivateKey<H>;
+    type Public = ExtendedPublicKey<H>;
+
+    fn public(&self) -> &Self::Public {
+        &self.public
+    }
+
+    fn private(&self) -> &Self::Private {
+        &self.private
+    }
+}
+
+impl<H: Hasher512> SigningKeyTrait for ExtendedKeyPair<H> {
+    type SigningMessage = Vec<u8>;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        self.private()
+            .sign_with_public_key(self.public(), message.as_slice())
+    }
+}
+
+impl<H: Hasher512> VerifyingKeyTrait for ExtendedKeyPair<H> {
+    type SigningMessage = Vec<u8>;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public().verify(signature, message)
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for ExtendedKeyPair<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let private = ExtendedPrivateKey::try_from(bytes)?;
+        let public = private.public();
+        Ok(ExtendedKeyPair { private, public })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for ExtendedKeyPair<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/modifications/cardano/extended_private.rs b/rust/tw_keypair/src/ed25519/modifications/cardano/extended_private.rs
new file mode 100644
index 00000000000..f2fac1a0687
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/cardano/extended_private.rs
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::modifications::cardano::extended_public::{
+    ExtendedPublicKey, ExtendedPublicPart,
+};
+use crate::ed25519::public::PublicKey;
+use crate::ed25519::secret::ExpandedSecretKey;
+use crate::ed25519::signature::Signature;
+use crate::ed25519::Hasher512;
+use crate::traits::SigningKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use std::ops::Range;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesZeroizing;
+use zeroize::{ZeroizeOnDrop, Zeroizing};
+
+/// Represents an `ed25519` extended private key that is used in Cardano blockchain.
+pub struct ExtendedPrivateKey<H: Hasher512> {
+    /// The first half (96 bytes) of the extended secret.
+    key: ExtendedSecretPart<H>,
+    /// The second half (96 bytes) of the extended secret.
+    second_key: ExtendedSecretPart<H>,
+}
+
+/// cbindgen:ignore
+impl<H: Hasher512> ExtendedPrivateKey<H> {
+    /// The number of bytes in a serialized private key (192 bytes).
+    pub const LEN: usize = ExtendedSecretPart::<H>::LEN * 2;
+    const KEY_RANGE: Range<usize> = 0..ExtendedSecretPart::<H>::LEN;
+    const SECOND_KEY_RANGE: Range<usize> = ExtendedSecretPart::<H>::LEN..Self::LEN;
+
+    /// Returns an associated Cardano extended `ed25519` public key.
+    pub fn public(&self) -> ExtendedPublicKey<H> {
+        let key_public = PublicKey::with_expanded_secret_no_mangle(&self.key.expanded_key);
+        let second_key_public =
+            PublicKey::with_expanded_secret_no_mangle(&self.second_key.expanded_key);
+
+        let key = ExtendedPublicPart::new(key_public, self.key.chain_code);
+        let second_key = ExtendedPublicPart::new(second_key_public, self.second_key.chain_code);
+
+        ExtendedPublicKey::new(key, second_key)
+    }
+
+    /// `ed25519` signing uses a public key associated with the private key.
+    pub(crate) fn sign_with_public_key(
+        &self,
+        public: &ExtendedPublicKey<H>,
+        message: &[u8],
+    ) -> KeyPairResult<Signature> {
+        self.key
+            .expanded_key
+            .sign_with_pubkey(public.key_for_signing(), message)
+    }
+}
+
+impl<H: Hasher512> SigningKeyTrait for ExtendedPrivateKey<H> {
+    type SigningMessage = Vec<u8>;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        self.sign_with_public_key(&self.public(), message.as_slice())
+    }
+}
+
+impl<H: Hasher512> ToBytesZeroizing for ExtendedPrivateKey<H> {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        let mut res = self.key.to_zeroizing_vec();
+        res.extend_from_slice(self.second_key.to_zeroizing_vec().as_slice());
+        res
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for ExtendedPrivateKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        if bytes.len() != Self::LEN {
+            return Err(KeyPairError::InvalidSecretKey);
+        }
+        let key = ExtendedSecretPart::try_from(&bytes[Self::KEY_RANGE])?;
+        let second_key = ExtendedSecretPart::try_from(&bytes[Self::SECOND_KEY_RANGE])?;
+
+        Ok(ExtendedPrivateKey { key, second_key })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for ExtendedPrivateKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+#[derive(ZeroizeOnDrop)]
+struct ExtendedSecretPart<H: Hasher512> {
+    secret: H256,
+    extension: H256,
+    chain_code: H256,
+    /// An expanded secret key obtained from [`ExtendedSecretPart::secret`]
+    /// and [`ExtendedSecretPart::extension`].
+    /// It's used to generate a public key and sign messages.
+    expanded_key: ExpandedSecretKey<H>,
+}
+
+/// cbindgen:ignore
+impl<H: Hasher512> ExtendedSecretPart<H> {
+    const LEN: usize = 96;
+    const SECRET_RANGE: Range<usize> = 0..32;
+    const EXTENSION_RANGE: Range<usize> = 32..64;
+    const CHAIN_CODE_RANGE: Range<usize> = 64..96;
+}
+
+impl<H: Hasher512> ToBytesZeroizing for ExtendedSecretPart<H> {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        let mut res = Vec::with_capacity(H256::len() * 3);
+        res.extend_from_slice(self.secret.as_slice());
+        res.extend_from_slice(self.extension.as_slice());
+        res.extend_from_slice(self.chain_code.as_slice());
+        Zeroizing::new(res)
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for ExtendedSecretPart<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        if bytes.len() != Self::LEN {
+            return Err(KeyPairError::InvalidSecretKey);
+        }
+        let secret = H256::try_from(&bytes[Self::SECRET_RANGE])
+            .map_err(|_| KeyPairError::InvalidSecretKey)?;
+        let extension = H256::try_from(&bytes[Self::EXTENSION_RANGE])
+            .map_err(|_| KeyPairError::InvalidSecretKey)?;
+        let chain_code = H256::try_from(&bytes[Self::CHAIN_CODE_RANGE])
+            .map_err(|_| KeyPairError::InvalidSecretKey)?;
+
+        let expanded_key = ExpandedSecretKey::with_extended_secret(secret, extension);
+        Ok(ExtendedSecretPart {
+            secret,
+            extension,
+            chain_code,
+            expanded_key,
+        })
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/modifications/cardano/extended_public.rs b/rust/tw_keypair/src/ed25519/modifications/cardano/extended_public.rs
new file mode 100644
index 00000000000..d3d82dba764
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/cardano/extended_public.rs
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::public::PublicKey;
+use crate::ed25519::signature::Signature;
+use crate::ed25519::Hasher512;
+use crate::traits::VerifyingKeyTrait;
+use crate::KeyPairError;
+use std::ops::Range;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesVec;
+
+/// Represents an `ed25519` extended public key that is used in Cardano blockchain.
+#[derive(Clone)]
+pub struct ExtendedPublicKey<H: Hasher512> {
+    /// The first half of the public key (64 bytes).
+    key: ExtendedPublicPart<H>,
+    /// The second half of the public key (64 bytes).
+    second_key: ExtendedPublicPart<H>,
+}
+
+/// cbindgen:ignore
+impl<H: Hasher512> ExtendedPublicKey<H> {
+    /// The number of bytes in a serialized public key.
+    pub const LEN: usize = ExtendedPublicPart::<H>::LEN * 2;
+    const KEY_RANGE: Range<usize> = 0..ExtendedPublicPart::<H>::LEN;
+    const SECOND_KEY_RANGE: Range<usize> = ExtendedPublicPart::<H>::LEN..Self::LEN;
+
+    /// Creates a public key with the given [`ExtendedPublicPart`] first and second keys.
+    pub(crate) fn new(key: ExtendedPublicPart<H>, second_key: ExtendedPublicPart<H>) -> Self {
+        ExtendedPublicKey { key, second_key }
+    }
+
+    /// Returns a public key bytes (32 length) that is used in signing.
+    pub(crate) fn key_for_signing(&self) -> H256 {
+        self.key.public.to_bytes()
+    }
+}
+
+impl<H: Hasher512> VerifyingKeyTrait for ExtendedPublicKey<H> {
+    type SigningMessage = Vec<u8>;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.key.public.verify(signature, message)
+    }
+}
+
+impl<H: Hasher512> ToBytesVec for ExtendedPublicKey<H> {
+    fn to_vec(&self) -> Vec<u8> {
+        let mut res = self.key.to_vec();
+        res.extend_from_slice(self.second_key.to_vec().as_slice());
+        res
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for ExtendedPublicKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        if bytes.len() != Self::LEN {
+            return Err(KeyPairError::InvalidPublicKey);
+        }
+
+        let key = ExtendedPublicPart::try_from(&bytes[Self::KEY_RANGE])?;
+        let second_key = ExtendedPublicPart::try_from(&bytes[Self::SECOND_KEY_RANGE])?;
+
+        Ok(ExtendedPublicKey { key, second_key })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for ExtendedPublicKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = hex::decode(hex).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+#[derive(Clone)]
+pub(crate) struct ExtendedPublicPart<H: Hasher512> {
+    public: PublicKey<H>,
+    chain_code: H256,
+}
+
+/// cbindgen:ignore
+impl<H: Hasher512> ExtendedPublicPart<H> {
+    const LEN: usize = PublicKey::<H>::LEN + H256::len();
+    const PUBLIC_RANGE: Range<usize> = 0..32;
+    const CHAIN_CODE_RANGE: Range<usize> = 32..64;
+
+    pub(crate) fn new(public: PublicKey<H>, chain_code: H256) -> ExtendedPublicPart<H> {
+        ExtendedPublicPart { public, chain_code }
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for ExtendedPublicPart<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        if bytes.len() != Self::LEN {
+            return Err(KeyPairError::InvalidPublicKey);
+        }
+
+        let public = PublicKey::try_from(&bytes[Self::PUBLIC_RANGE])?;
+        let chain_code = H256::try_from(&bytes[Self::CHAIN_CODE_RANGE])
+            .map_err(|_| KeyPairError::InvalidPublicKey)?;
+
+        Ok(ExtendedPublicPart { public, chain_code })
+    }
+}
+
+impl<H: Hasher512> ToBytesVec for ExtendedPublicPart<H> {
+    fn to_vec(&self) -> Vec<u8> {
+        let mut res = Vec::with_capacity(H256::len() * 2);
+        res.extend_from_slice(self.public.as_slice());
+        res.extend_from_slice(self.chain_code.as_slice());
+        res
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/modifications/cardano/mod.rs b/rust/tw_keypair/src/ed25519/modifications/cardano/mod.rs
new file mode 100644
index 00000000000..1a9b99f1ba2
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/cardano/mod.rs
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use sha2::Sha512;
+
+mod extended_keypair;
+mod extended_private;
+mod extended_public;
+
+pub type ExtendedKeyPair = extended_keypair::ExtendedKeyPair<Sha512>;
+pub type ExtendedPrivateKey = extended_private::ExtendedPrivateKey<Sha512>;
+pub type ExtendedPublicKey = extended_public::ExtendedPublicKey<Sha512>;
diff --git a/rust/tw_keypair/src/ed25519/modifications/mod.rs b/rust/tw_keypair/src/ed25519/modifications/mod.rs
new file mode 100644
index 00000000000..555c1e3fd70
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod cardano;
+pub mod waves;
diff --git a/rust/tw_keypair/src/ed25519/modifications/waves/keypair.rs b/rust/tw_keypair/src/ed25519/modifications/waves/keypair.rs
new file mode 100644
index 00000000000..f1c2b270ef4
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/waves/keypair.rs
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::modifications::waves::private::PrivateKey;
+use crate::ed25519::modifications::waves::public::PublicKey;
+use crate::ed25519::modifications::waves::Signature;
+use crate::ed25519::Hasher512;
+use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use crate::{KeyPairError, KeyPairResult};
+use tw_encoding::hex;
+use zeroize::Zeroizing;
+
+/// Represents an `ed25519` key pair that is used in Waves blockchain.
+pub struct KeyPair<H: Hasher512> {
+    private: PrivateKey<H>,
+    public: PublicKey<H>,
+}
+
+impl<H: Hasher512> KeyPairTrait for KeyPair<H> {
+    type Private = PrivateKey<H>;
+    type Public = PublicKey<H>;
+
+    fn public(&self) -> &Self::Public {
+        &self.public
+    }
+
+    fn private(&self) -> &Self::Private {
+        &self.private
+    }
+}
+
+impl<H: Hasher512> SigningKeyTrait for KeyPair<H> {
+    type SigningMessage = Vec<u8>;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        self.private.sign(message)
+    }
+}
+
+impl<H: Hasher512> VerifyingKeyTrait for KeyPair<H> {
+    type SigningMessage = Vec<u8>;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public.verify(signature, message)
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for KeyPair<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let private = PrivateKey::try_from(bytes)?;
+        let public = private.public();
+        Ok(KeyPair { private, public })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for KeyPair<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidPublicKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/modifications/waves/mod.rs b/rust/tw_keypair/src/ed25519/modifications/waves/mod.rs
new file mode 100644
index 00000000000..c69cfeddbce
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/waves/mod.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use sha2::Sha512;
+
+mod keypair;
+mod private;
+mod public;
+mod signature;
+
+pub use signature::Signature;
+
+pub type KeyPair = keypair::KeyPair<Sha512>;
+pub type PrivateKey = private::PrivateKey<Sha512>;
+pub type PublicKey = public::PublicKey<Sha512>;
diff --git a/rust/tw_keypair/src/ed25519/modifications/waves/private.rs b/rust/tw_keypair/src/ed25519/modifications/waves/private.rs
new file mode 100644
index 00000000000..4c6c68f5e46
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/waves/private.rs
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::modifications::waves::public::PublicKey;
+use crate::ed25519::modifications::waves::signature::Signature;
+use crate::ed25519::{private::PrivateKey as StandardPrivateKey, Hasher512};
+use crate::traits::SigningKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use tw_encoding::hex;
+use tw_misc::traits::ToBytesZeroizing;
+use zeroize::Zeroizing;
+
+/// Represents an `ed25519` private key that is used in Waves blockchain.
+pub struct PrivateKey<H: Hasher512> {
+    standard_key: StandardPrivateKey<H>,
+}
+
+impl<H: Hasher512> PrivateKey<H> {
+    /// Returns an associated Waves `ed25519` public key.
+    pub fn public(&self) -> PublicKey<H> {
+        PublicKey::with_standard_pubkey(&self.standard_key.public())
+    }
+}
+
+impl<H: Hasher512> SigningKeyTrait for PrivateKey<H> {
+    type SigningMessage = Vec<u8>;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        let signature = self.standard_key.sign(message)?;
+        let standard_pubkey = self.standard_key.public();
+        Ok(Signature::new_mangling(&standard_pubkey, &signature))
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for PrivateKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let standard_key = StandardPrivateKey::try_from(bytes)?;
+        Ok(PrivateKey { standard_key })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for PrivateKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl<H: Hasher512> ToBytesZeroizing for PrivateKey<H> {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        self.standard_key.to_zeroizing_vec()
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/modifications/waves/public.rs b/rust/tw_keypair/src/ed25519/modifications/waves/public.rs
new file mode 100644
index 00000000000..1842f5e5cd3
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/waves/public.rs
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::modifications::waves::signature::Signature;
+use crate::ed25519::public::PublicKey as StandardPublicKey;
+use crate::ed25519::Hasher512;
+use crate::traits::VerifyingKeyTrait;
+use crate::KeyPairError;
+use curve25519_dalek::montgomery::MontgomeryPoint;
+use std::marker::PhantomData;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesVec;
+
+/// Represents an `ed25519` public key that is used in Waves blockchain.
+#[derive(Clone)]
+pub struct PublicKey<H: Hasher512> {
+    /// A public key that is calculated through converting
+    /// a standard [`curve25519_dalek::edwards::EdwardsPoint`] to [`MontgomeryPoint`].
+    curve25519_pk: H256,
+    _phantom: PhantomData<H>,
+}
+
+/// cbindgen:ignore
+impl<H: Hasher512> PublicKey<H> {
+    /// The number of bytes in a serialized public key.
+    pub const LEN: usize = H256::len();
+
+    /// Creates a public key from the given standard [`StandardPublicKey`].
+    pub(crate) fn with_standard_pubkey(standard: &StandardPublicKey<H>) -> PublicKey<H> {
+        let montgomery_point = standard.edwards_point().to_montgomery();
+        PublicKey {
+            curve25519_pk: H256::from(montgomery_point.0),
+            _phantom: PhantomData,
+        }
+    }
+
+    /// Returns the raw data of the public key (32 bytes).
+    pub fn to_bytes(&self) -> H256 {
+        self.curve25519_pk
+    }
+}
+
+impl<H: Hasher512> VerifyingKeyTrait for PublicKey<H> {
+    type SigningMessage = Vec<u8>;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        let Ok(standard_signature) = signature.to_standard_signature() else {
+            return false;
+        };
+
+        let montgomery_point = MontgomeryPoint(self.curve25519_pk.take());
+        let pubkey_sign = signature.get_pubkey_sign();
+
+        let Some(ed25519_pk) = montgomery_point.to_edwards(pubkey_sign) else {
+            return false;
+        };
+        let standard_public = StandardPublicKey::<H>::with_edwards_point(ed25519_pk);
+
+        standard_public.verify(standard_signature, message)
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for PublicKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let curve25519_pk = H256::try_from(bytes).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Ok(PublicKey {
+            curve25519_pk,
+            _phantom: PhantomData,
+        })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for PublicKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = hex::decode(hex).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl<H: Hasher512> ToBytesVec for PublicKey<H> {
+    fn to_vec(&self) -> Vec<u8> {
+        self.curve25519_pk.into_vec()
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/modifications/waves/signature.rs b/rust/tw_keypair/src/ed25519/modifications/waves/signature.rs
new file mode 100644
index 00000000000..39613316940
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/modifications/waves/signature.rs
@@ -0,0 +1,80 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::public::PublicKey as StandardPublicKey;
+use crate::ed25519::signature::Signature as StandardSignature;
+use crate::ed25519::Hasher512;
+use crate::{KeyPairError, KeyPairResult};
+use tw_hash::{H256, H512};
+use tw_misc::traits::ToBytesVec;
+
+/// cbindgen:ignore
+/// Equals to 0x80.
+const PUBKEY_SIGN_MASK: u8 = 0b1000_0000;
+
+/// cbindgen:ignore
+/// Equals to 127.
+const DROP_SIGN_BIT_MASK: u8 = 0b0111_1111;
+
+pub struct Signature {
+    bytes: H512,
+}
+
+impl Signature {
+    /// Creates a signature by mangling a standard [`StandardSignature`].
+    /// Ported: https://github.com/trustwallet/wallet-core/blob/3.1.31/src/PrivateKey.cpp#L225-L230
+    pub(crate) fn new_mangling<H: Hasher512>(
+        standard_pubkey: &StandardPublicKey<H>,
+        standard_sign: &StandardSignature,
+    ) -> Signature {
+        let pubkey_bytes: H256 = standard_pubkey.to_bytes();
+        let sign_bit = pubkey_bytes[31] & PUBKEY_SIGN_MASK;
+
+        let mut bytes = standard_sign.to_bytes();
+        bytes[63] &= DROP_SIGN_BIT_MASK;
+        bytes[63] |= sign_bit;
+
+        Signature { bytes }
+    }
+
+    /// Returns the signature data (64 bytes).
+    pub fn to_bytes(&self) -> H512 {
+        self.bytes
+    }
+
+    /// Tries to convert the signature to a standard `ed25519` representation by removing the sign bit.
+    /// Ported: https://github.com/trustwallet/wallet-core/blob/3.1.31/src/PublicKey.cpp#L159-L162
+    pub(crate) fn to_standard_signature(&self) -> KeyPairResult<StandardSignature> {
+        let mut bytes = self.bytes;
+        bytes[63] &= DROP_SIGN_BIT_MASK;
+        StandardSignature::try_from(bytes.as_slice())
+    }
+
+    /// Returns a public key sign bit.
+    /// Either `1` or `0`.
+    /// Ported: https://github.com/trustwallet/wallet-core/blob/3.1.31/src/PublicKey.cpp#L157
+    pub(crate) fn get_pubkey_sign(&self) -> u8 {
+        let sign_bit = self.bytes[63] & PUBKEY_SIGN_MASK;
+        if sign_bit == 0 {
+            0
+        } else {
+            1
+        }
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for Signature {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let bytes = H512::try_from(bytes).map_err(|_| KeyPairError::InvalidSignature)?;
+        Ok(Signature { bytes })
+    }
+}
+
+impl ToBytesVec for Signature {
+    fn to_vec(&self) -> Vec<u8> {
+        self.bytes.into_vec()
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/private.rs b/rust/tw_keypair/src/ed25519/private.rs
new file mode 100644
index 00000000000..984392393a6
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/private.rs
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::public::PublicKey;
+use crate::ed25519::secret::ExpandedSecretKey;
+use crate::ed25519::signature::Signature;
+use crate::ed25519::Hasher512;
+use crate::traits::SigningKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use std::fmt;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesZeroizing;
+use zeroize::{ZeroizeOnDrop, Zeroizing};
+
+/// Represents an `ed25519` private key.
+#[derive(Clone, ZeroizeOnDrop)]
+pub struct PrivateKey<H: Hasher512> {
+    secret: H256,
+    /// An expanded secret key obtained from [`PrivateKey::secret`].
+    /// It's used to generate a public key and sign messages.
+    expanded_key: ExpandedSecretKey<H>,
+}
+
+impl<H: Hasher512> fmt::Debug for PrivateKey<H> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("PrivateKey")
+            .field("secret", &self.secret)
+            .finish()
+    }
+}
+
+impl<H: Hasher512> PrivateKey<H> {
+    /// Returns an associated `ed25519` public key.
+    pub fn public(&self) -> PublicKey<H> {
+        PublicKey::with_expanded_secret(&self.expanded_key)
+    }
+
+    /// `ed25519` signing uses a public key associated with the private key.
+    pub(crate) fn sign_with_public_key(
+        &self,
+        public: &PublicKey<H>,
+        message: &[u8],
+    ) -> KeyPairResult<Signature> {
+        self.expanded_key
+            .sign_with_pubkey(public.to_bytes(), message)
+    }
+}
+
+impl<H: Hasher512> SigningKeyTrait for PrivateKey<H> {
+    type SigningMessage = Vec<u8>;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        self.sign_with_public_key(&self.public(), &message)
+    }
+}
+
+impl<H: Hasher512> TryFrom<&[u8]> for PrivateKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(data: &[u8]) -> Result<Self, Self::Error> {
+        let secret = H256::try_from(data).map_err(|_| KeyPairError::InvalidSecretKey)?;
+        let expanded_key = ExpandedSecretKey::<H>::with_secret(secret);
+        Ok(PrivateKey {
+            secret,
+            expanded_key,
+        })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for PrivateKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl<H: Hasher512> ToBytesZeroizing for PrivateKey<H> {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        Zeroizing::new(self.secret.to_vec())
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/public.rs b/rust/tw_keypair/src/ed25519/public.rs
new file mode 100644
index 00000000000..edee119dd0e
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/public.rs
@@ -0,0 +1,168 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::mangle::mangle_scalar;
+use crate::ed25519::secret::ExpandedSecretKey;
+use crate::ed25519::signature::Signature;
+use crate::ed25519::Hasher512;
+use crate::traits::VerifyingKeyTrait;
+use crate::KeyPairError;
+use curve25519_dalek::constants;
+use curve25519_dalek::edwards::{CompressedEdwardsY, EdwardsPoint};
+use curve25519_dalek::scalar::Scalar;
+use std::fmt;
+use std::marker::PhantomData;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesVec;
+use tw_misc::try_or_false;
+
+/// Represents an `ed25519` public key.
+#[derive(Clone, PartialEq)]
+pub struct PublicKey<H: Hasher512> {
+    compressed: CompressedEdwardsY,
+    point: EdwardsPoint,
+    _phantom: PhantomData<H>,
+}
+
+impl<H: Hasher512> fmt::Debug for PublicKey<H> {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("PublicKey")
+            .field("compressed", &self.as_slice())
+            .finish()
+    }
+}
+
+/// cbindgen:ignore
+impl<H: Hasher512> PublicKey<H> {
+    /// The number of bytes in a serialized public key.
+    pub const LEN: usize = H256::len();
+
+    /// Creates a public key with the given [`ExpandedSecretKey`].
+    pub(crate) fn with_expanded_secret(secret: &ExpandedSecretKey<H>) -> Self {
+        let bits = secret.key.to_bytes();
+
+        PublicKey::mangle_scalar_bits_and_multiply_by_basepoint_to_produce_public_key(bits)
+    }
+
+    /// Creates a public key with the given [`ExpandedSecretKey`].
+    ///
+    /// This function is useful when the given secret is mangled already.
+    /// For example, created via [`ExpandedSecretKey::with_extended_secret`].
+    pub(crate) fn with_expanded_secret_no_mangle(secret: &ExpandedSecretKey<H>) -> Self {
+        let bits = secret.key.to_bytes();
+
+        PublicKey::multiply_by_basepoint_to_produce_public_key(bits)
+    }
+
+    /// Creates a public key with the given [`EdwardsPoint`].
+    pub(crate) fn with_edwards_point(point: EdwardsPoint) -> Self {
+        let compressed = point.compress();
+        PublicKey {
+            compressed,
+            point,
+            _phantom: PhantomData,
+        }
+    }
+
+    /// Returns the raw data of the public key (32 bytes).
+    pub fn to_bytes(&self) -> H256 {
+        H256::from(self.compressed.to_bytes())
+    }
+
+    /// Returns the raw data of the data of the public key.
+    pub fn as_slice(&self) -> &[u8] {
+        self.compressed.as_bytes()
+    }
+
+    /// Returns a reference to the [`EdwardsPoint`].
+    pub(crate) fn edwards_point(&self) -> &EdwardsPoint {
+        &self.point
+    }
+
+    /// Internal utility function for mangling the bits of a (formerly
+    /// mathematically well-defined) "scalar" and multiplying it to produce a
+    /// public key.
+    ///
+    /// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/public.rs#L147-L161
+    fn mangle_scalar_bits_and_multiply_by_basepoint_to_produce_public_key(
+        mut bits: [u8; 32],
+    ) -> PublicKey<H> {
+        mangle_scalar(&mut bits);
+
+        Self::multiply_by_basepoint_to_produce_public_key(bits)
+    }
+
+    /// Internal utility function for multiplying the given bits to produce a public key.
+    ///
+    /// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/public.rs#L157-L160
+    fn multiply_by_basepoint_to_produce_public_key(bits: [u8; 32]) -> PublicKey<H> {
+        #[allow(deprecated)]
+        let point = &Scalar::from_bits(bits) * constants::ED25519_BASEPOINT_TABLE;
+        PublicKey::with_edwards_point(point)
+    }
+}
+
+impl<H: Hasher512> VerifyingKeyTrait for PublicKey<H> {
+    type SigningMessage = Vec<u8>;
+    type VerifySignature = Signature;
+
+    /// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/public.rs#L220-L319
+    #[allow(non_snake_case)]
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        let mut h = H::new();
+        let minus_A: EdwardsPoint = -self.point;
+
+        let signature_R = try_or_false!(signature.R.decompress());
+
+        // Logical OR is fine here as we're not trying to be constant time.
+        if signature_R.is_small_order() || self.point.is_small_order() {
+            return false;
+        }
+
+        h.update(signature.R.as_bytes());
+        h.update(self.as_slice());
+        h.update(&message);
+
+        let k = Scalar::from_hash(h);
+        let R = EdwardsPoint::vartime_double_scalar_mul_basepoint(&k, &(minus_A), &signature.s);
+
+        R == signature_R
+    }
+}
+
+impl<H: Hasher512> ToBytesVec for PublicKey<H> {
+    fn to_vec(&self) -> Vec<u8> {
+        self.as_slice().to_vec()
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a [u8]> for PublicKey<H> {
+    type Error = KeyPairError;
+
+    /// Inspired by: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/public.rs#L92-L145
+    fn try_from(pubkey: &'a [u8]) -> Result<Self, Self::Error> {
+        let pubkey = H256::try_from(pubkey).map_err(|_| KeyPairError::InvalidPublicKey)?;
+
+        let compressed = CompressedEdwardsY(pubkey.take());
+        let point = compressed
+            .decompress()
+            .ok_or(KeyPairError::InvalidPublicKey)?;
+
+        Ok(PublicKey {
+            compressed,
+            point,
+            _phantom: PhantomData,
+        })
+    }
+}
+
+impl<'a, H: Hasher512> TryFrom<&'a str> for PublicKey<H> {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = hex::decode(hex).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Self::try_from(bytes.as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/secret.rs b/rust/tw_keypair/src/ed25519/secret.rs
new file mode 100644
index 00000000000..895f788b15d
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/secret.rs
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ed25519::mangle::mangle_scalar;
+use crate::ed25519::signature::Signature;
+use crate::ed25519::Hasher512;
+use crate::KeyPairResult;
+use curve25519_dalek::constants;
+use curve25519_dalek::scalar::Scalar;
+use std::marker::PhantomData;
+use std::ops::DerefMut;
+use tw_hash::{H256, H512};
+use zeroize::ZeroizeOnDrop;
+
+/// Represents an "expanded" secret key produced by using a hash function
+/// with 512-bits output to digest a `PrivateKey`.
+///
+/// Represents [ed25519_extsk](https://github.com/trustwallet/wallet-core/blob/423f0e34725f69c0a9d535e1a32534c99682edea/trezor-crypto/crypto/ed25519-donna/ed25519.c#L23-L32).
+#[derive(Clone, ZeroizeOnDrop)]
+pub(crate) struct ExpandedSecretKey<H: Hasher512> {
+    /// 32 byte scalar. Represents `extsk[0..32]`.
+    pub key: Scalar,
+    /// 32 byte nonce. Represents `extsk[32..64]`.
+    pub nonce: H256,
+    _phantom: PhantomData<H>,
+}
+
+impl<H: Hasher512> ExpandedSecretKey<H> {
+    /// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/secret.rs#L246-L282
+    /// Ported: https://github.com/trustwallet/wallet-core/blob/423f0e34725f69c0a9d535e1a32534c99682edea/trezor-crypto/crypto/ed25519-donna/ed25519.c#L23-L32
+    pub(crate) fn with_secret(secret: H256) -> Self {
+        let mut h = H::new();
+        let mut hash = H512::default();
+
+        h.update(secret.as_slice());
+        hash.copy_from_slice(h.finalize().as_slice());
+
+        let (mut lower, upper): (H256, H256) = hash.split();
+        mangle_scalar(lower.deref_mut());
+
+        #[allow(deprecated)]
+        let key = Scalar::from_bits(lower.take());
+        ExpandedSecretKey {
+            key,
+            nonce: upper,
+            _phantom: PhantomData,
+        }
+    }
+
+    /// Ported: https://github.com/trustwallet/wallet-core/blob/423f0e34725f69c0a9d535e1a32534c99682edea/trezor-crypto/crypto/ed25519-donna/ed25519.c#L93-L94C30
+    ///
+    /// Here we use `Scalar::from_bytes_mod_order` instead of `Scalar::from_bits`
+    /// because `Scalar::from_bits` modifies the last 32th byte in some cases.
+    /// Although, `Scalar::from_bytes_mod_order` changes the given `secret` significantly,
+    /// but the result signature seems to be correct.
+    /// Unfortunately, there are no public functions to create `Scalar` without mangling the secret.
+    ///
+    /// TODO make sure if this is the right way to create an extended secret key (extsk).
+    pub(crate) fn with_extended_secret(secret: H256, extension: H256) -> Self {
+        let key = Scalar::from_bytes_mod_order(secret.take());
+        ExpandedSecretKey {
+            key,
+            nonce: extension,
+            _phantom: PhantomData,
+        }
+    }
+
+    /// Signs a message with this `ExpandedSecretKey`.
+    /// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/secret.rs#L389-L412
+    /// Ported: https://github.com/trustwallet/wallet-core/blob/423f0e34725f69c0a9d535e1a32534c99682edea/trezor-crypto/crypto/ed25519-donna/ed25519.c#L97-L130
+    #[allow(non_snake_case)]
+    pub(crate) fn sign_with_pubkey(
+        &self,
+        pubkey: H256,
+        message: &[u8],
+    ) -> KeyPairResult<Signature> {
+        let mut h = H::new();
+
+        h.update(self.nonce.as_slice());
+        h.update(message);
+
+        let r = Scalar::from_hash(h);
+        let R = (&r * constants::ED25519_BASEPOINT_TABLE).compress();
+
+        h = H::new();
+        h.update(R.as_bytes());
+        h.update(pubkey);
+        h.update(message);
+
+        let k = Scalar::from_hash(h);
+        let s = k * self.key + r;
+
+        Ok(Signature { R, s })
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use sha2::Sha512;
+    use tw_encoding::hex;
+
+    #[test]
+    fn test_ed25519_expanded_secret_from_extended_key() {
+        let secret = H256::from("b52a1a9f4ae3bff2d16a06e144bcdd4147a35aa9843cfd0edf458afdf5ba1a3b");
+        let nonce = H256::from("b33b86344897745b35bb3ef8ca8fe8a3758bd31a537280a6b8c60e42a1f3a00d");
+
+        let secret_key: ExpandedSecretKey<Sha512> =
+            ExpandedSecretKey::with_extended_secret(secret, nonce);
+
+        // In `trezor-crypto` implementation, `a = mod(secret)` has the following:
+        // https://github.com/trustwallet/wallet-core/blob/423f0e34725f69c0a9d535e1a32534c99682edea/trezor-crypto/crypto/ed25519-donna/ed25519.c#L109-L111
+        let expected_mod_a =
+            H256::from("eeae3808eee7222aee44f9013eaa33100347a31aa512f234eff05d24627fbd2e");
+        // On the other hand, [`ExpandedSecretKey::key`] represents the same `a` value.
+        // But it differs from that - `eeae3888fbb988ea4e941ff8a8ce400347a35aa9843cfd0edf458afdf5ba1a0b`.
+        // TODO probably, `secret_key.key.to_bytes()` should be the same as `expected_mod_a.take()`.
+        assert_ne!(secret_key.key.to_bytes(), expected_mod_a.take());
+
+        let public = H256::from("7950119e049a53a9eaa6ecfbfe354337287056ba0ea054130c1b0c97f1b69697");
+        let message = hex::decode("f0").unwrap();
+
+        // Anyway, the result signature has an expected value.
+        let sign = secret_key.sign_with_pubkey(public, &message).unwrap();
+        let expected = H512::from("ed55bce14a845a275e7a3a7242420ed1eeaba79dc3141bebf42ca0d12169e209a6e56b6981a336f711ae3aaea8d063b72b0e79a8808311d08cb42cabfdd0450d");
+        assert_eq!(sign.to_bytes(), expected);
+    }
+}
diff --git a/rust/tw_keypair/src/ed25519/signature.rs b/rust/tw_keypair/src/ed25519/signature.rs
new file mode 100644
index 00000000000..55592e50a6a
--- /dev/null
+++ b/rust/tw_keypair/src/ed25519/signature.rs
@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{KeyPairError, KeyPairResult};
+use curve25519_dalek::edwards::CompressedEdwardsY;
+use curve25519_dalek::scalar::Scalar;
+use tw_hash::{concat, H256, H512};
+use tw_misc::traits::ToBytesVec;
+
+/// Represents an `ed25519` signature.
+/// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/signature.rs#L22-L53
+#[allow(non_snake_case)]
+#[derive(Clone, Debug)]
+pub struct Signature {
+    /// `R` is an `EdwardsPoint`, formed by using an hash function with
+    /// 512-bits output to produce the digest of:
+    ///
+    /// - the nonce half of the `ExpandedSecretKey`, and
+    /// - the message to be signed.
+    ///
+    /// This digest is then interpreted as a `Scalar` and reduced into an
+    /// element in ℤ/lℤ.  The scalar is then multiplied by the distinguished
+    /// basepoint to produce `R`, and `EdwardsPoint`.
+    pub(crate) R: CompressedEdwardsY,
+
+    /// `s` is a `Scalar`, formed by using an hash function with 512-bits output
+    /// to produce the digest of:
+    ///
+    /// - the `r` portion of this `Signature`,
+    /// - the `PublicKey` which should be used to verify this `Signature`, and
+    /// - the message to be signed.
+    ///
+    /// This digest is then interpreted as a `Scalar` and reduced into an
+    /// element in ℤ/lℤ.
+    pub(crate) s: Scalar,
+}
+
+impl Signature {
+    /// cbindgen:ignore
+    pub const LEN: usize = H512::LEN;
+
+    /// Returns the signature data (64 bytes).
+    pub fn to_bytes(&self) -> H512 {
+        let left = H256::from(self.R.to_bytes());
+        let right = H256::from(self.s.to_bytes());
+        concat(left, right)
+    }
+}
+
+impl ToBytesVec for Signature {
+    fn to_vec(&self) -> Vec<u8> {
+        self.to_bytes().into_vec()
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for Signature {
+    type Error = KeyPairError;
+
+    /// Construct a `Signature` from a slice of bytes.
+    /// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/signature.rs#L115-L190
+    fn try_from(sign: &'a [u8]) -> Result<Self, Self::Error> {
+        let bytes = H512::try_from(sign).map_err(|_| KeyPairError::InvalidSignature)?;
+
+        let (lower, upper): (H256, H256) = bytes.split();
+
+        let s = get_scalar(upper)?;
+        Ok(Signature {
+            R: CompressedEdwardsY(lower.take()),
+            s,
+        })
+    }
+}
+
+/// Source: https://github.com/dalek-cryptography/ed25519-dalek/blob/1.0.1/src/signature.rs#L83-L102
+fn get_scalar(bytes: H256) -> KeyPairResult<Scalar> {
+    /// Equals to 240 decimal.
+    const SIGNIFICANT_BITS_MASK: u8 = 0b1111_0000;
+
+    // Since this is only used in signature deserialisation (i.e. upon
+    // verification), we can do a "succeed fast" trick by checking that the most
+    // significant 4 bits are unset.  If they are unset, we can succeed fast
+    // because we are guaranteed that the scalar is fully reduced.  However, if
+    // the 4th most significant bit is set, we must do the full reduction check,
+    // as the order of the basepoint is roughly a 2^(252.5) bit number.
+    //
+    // This succeed-fast trick should succeed for roughly half of all scalars.
+    let last_byte = bytes.last().expect("H256 is exactly 32 length");
+    if last_byte & SIGNIFICANT_BITS_MASK == 0 {
+        #[allow(deprecated)]
+        return Ok(Scalar::from_bits(bytes.take()));
+    }
+
+    match Scalar::from_canonical_bytes(bytes.take()).into() {
+        Some(x) => Ok(x),
+        None => Err(KeyPairError::InvalidSignature),
+    }
+}
diff --git a/rust/tw_keypair/src/ffi/asn.rs b/rust/tw_keypair/src/ffi/asn.rs
new file mode 100644
index 00000000000..7befaa9c10f
--- /dev/null
+++ b/rust/tw_keypair/src/ffi/asn.rs
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::ecdsa::der;
+use tw_memory::ffi::c_byte_array::{CByteArray, CByteArrayResult};
+use tw_memory::ffi::c_byte_array_ref::CByteArrayRef;
+use tw_memory::ffi::c_result::ErrorCode;
+
+#[repr(C)]
+pub enum CKeyPairError {
+    Ok = 0,
+    InvalidSignature = 1,
+}
+
+impl From<CKeyPairError> for ErrorCode {
+    fn from(e: CKeyPairError) -> Self {
+        e as ErrorCode
+    }
+}
+
+/// Parses the given ECDSA signature from ASN.1 DER encoded bytes.
+///
+/// \param encoded *non-null* byte array.
+/// \param encoded_len the length of the `encoded` array.
+/// \return C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn ecdsa_signature_from_asn_der(
+    encoded: *const u8,
+    encoded_len: usize,
+) -> CByteArrayResult {
+    let encoded_ref = CByteArrayRef::new(encoded, encoded_len);
+    let Some(encoded) = encoded_ref.to_vec() else {
+        return CByteArrayResult::error(CKeyPairError::InvalidSignature);
+    };
+
+    der::Signature::from_bytes(encoded.as_slice())
+        .map(|sign| CByteArray::from(sign.to_vec()))
+        .map_err(|_| CKeyPairError::InvalidSignature)
+        .into()
+}
diff --git a/rust/tw_keypair/src/ffi/crypto_box/mod.rs b/rust/tw_keypair/src/ffi/crypto_box/mod.rs
new file mode 100644
index 00000000000..dcf624c35af
--- /dev/null
+++ b/rust/tw_keypair/src/ffi/crypto_box/mod.rs
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::ffi::crypto_box::public_key::TWCryptoBoxPublicKey;
+use crate::ffi::crypto_box::secret_key::TWCryptoBoxSecretKey;
+use crate::nacl_crypto_box::CryptoBox;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+
+pub mod public_key;
+pub mod secret_key;
+
+/// Encrypts message using `my_secret` and `other_pubkey`.
+/// The output will have a randomly generated nonce prepended to it.
+/// The output will be Overhead + 24 bytes longer than the original.
+///
+/// \param my_secret *non-null* pointer to my secret key.
+/// \param other_pubkey *non-null* pointer to other's public key.
+/// \param message *non-null* pointer to the message to be encrypted.
+/// \return *nullable* pointer to the encrypted message with randomly generated nonce prepended to it.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_encrypt_easy(
+    my_secret: *const TWCryptoBoxSecretKey,
+    other_pubkey: *const TWCryptoBoxPublicKey,
+    message: *const TWData,
+) -> *mut TWData {
+    let my_secret = try_or_else!(
+        TWCryptoBoxSecretKey::from_ptr_as_ref(my_secret),
+        std::ptr::null_mut
+    );
+    let other_pubkey = try_or_else!(
+        TWCryptoBoxPublicKey::from_ptr_as_ref(other_pubkey),
+        std::ptr::null_mut
+    );
+    let message = try_or_else!(TWData::from_ptr_as_ref(message), std::ptr::null_mut);
+
+    CryptoBox::encrypt_easy(&my_secret.0, &other_pubkey.0, message.as_slice())
+        .map(TWData::from)
+        .map(TWData::into_ptr)
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Decrypts box produced by `TWCryptoBoxEncryptEasy`.
+/// We assume a 24-byte nonce is prepended to the encrypted text in box.
+///
+/// \param my_secret *non-null* pointer to my secret key.
+/// \param other_pubkey *non-null* pointer to other's public key.
+/// \param encrypted *non-null* pointer to the encrypted message with nonce prepended to it.
+/// \return *nullable* pointer to the decrypted message.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_decrypt_easy(
+    my_secret: *const TWCryptoBoxSecretKey,
+    other_pubkey: *const TWCryptoBoxPublicKey,
+    encrypted: *const TWData,
+) -> *mut TWData {
+    let my_secret = try_or_else!(
+        TWCryptoBoxSecretKey::from_ptr_as_ref(my_secret),
+        std::ptr::null_mut
+    );
+    let other_pubkey = try_or_else!(
+        TWCryptoBoxPublicKey::from_ptr_as_ref(other_pubkey),
+        std::ptr::null_mut
+    );
+    let encrypted = try_or_else!(TWData::from_ptr_as_ref(encrypted), std::ptr::null_mut);
+
+    CryptoBox::decrypt_easy(&my_secret.0, &other_pubkey.0, encrypted.as_slice())
+        .map(TWData::from)
+        .map(TWData::into_ptr)
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/tw_keypair/src/ffi/crypto_box/public_key.rs b/rust/tw_keypair/src/ffi/crypto_box/public_key.rs
new file mode 100644
index 00000000000..44caab07d63
--- /dev/null
+++ b/rust/tw_keypair/src/ffi/crypto_box/public_key.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::nacl_crypto_box::public_key::PublicKey;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::{try_or_else, try_or_false};
+
+/// Public key used in `crypto_box` cryptography.
+pub struct TWCryptoBoxPublicKey(pub(crate) PublicKey);
+
+impl RawPtrTrait for TWCryptoBoxPublicKey {}
+
+/// Determines if the given public key is valid or not.
+///
+/// \param data *non-null* byte array.
+/// \return true if the public key is valid, false otherwise.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_public_key_is_valid(data: *const TWData) -> bool {
+    let bytes_ref = try_or_false!(TWData::from_ptr_as_ref(data));
+    PublicKey::try_from(bytes_ref.as_slice()).is_ok()
+}
+
+/// Create a `crypto_box` public key with the given block of data.
+///
+/// \param data *non-null* byte array. Expected to have 32 bytes.
+/// \note Should be deleted with \tw_crypto_box_public_key_delete.
+/// \return Nullable pointer to Public Key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_public_key_create_with_data(
+    data: *const TWData,
+) -> *mut TWCryptoBoxPublicKey {
+    let bytes_ref = try_or_else!(TWData::from_ptr_as_ref(data), std::ptr::null_mut);
+    let pubkey = try_or_else!(
+        PublicKey::try_from(bytes_ref.as_slice()),
+        std::ptr::null_mut
+    );
+    TWCryptoBoxPublicKey(pubkey).into_ptr()
+}
+
+/// Delete the given public key.
+///
+/// \param public_key *non-null* pointer to public key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_public_key_delete(public_key: *mut TWCryptoBoxPublicKey) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = TWCryptoBoxPublicKey::from_ptr(public_key);
+}
+
+/// Returns the raw data of a given public-key.
+///
+/// \param public_key *non-null* pointer to a public key.
+/// \return C-compatible result with a C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_public_key_data(
+    public_key: *const TWCryptoBoxPublicKey,
+) -> *mut TWData {
+    let pubkey_ref = try_or_else!(
+        TWCryptoBoxPublicKey::from_ptr_as_ref(public_key),
+        std::ptr::null_mut
+    );
+    TWData::from(pubkey_ref.0.as_slice().to_vec()).into_ptr()
+}
diff --git a/rust/tw_keypair/src/ffi/crypto_box/secret_key.rs b/rust/tw_keypair/src/ffi/crypto_box/secret_key.rs
new file mode 100644
index 00000000000..c55503b9f88
--- /dev/null
+++ b/rust/tw_keypair/src/ffi/crypto_box/secret_key.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::ffi::crypto_box::public_key::TWCryptoBoxPublicKey;
+use crate::nacl_crypto_box::secret_key::SecretKey;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::traits::ToBytesZeroizing;
+use tw_misc::{try_or_else, try_or_false};
+
+/// Secret key used in `crypto_box` cryptography.
+pub struct TWCryptoBoxSecretKey(pub(crate) SecretKey);
+
+impl RawPtrTrait for TWCryptoBoxSecretKey {}
+
+/// Determines if the given secret key is valid or not.
+///
+/// \param data *non-null* byte array.
+/// \return true if the secret key is valid, false otherwise.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_secret_key_is_valid(data: *const TWData) -> bool {
+    let bytes_ref = try_or_false!(TWData::from_ptr_as_ref(data));
+    SecretKey::try_from(bytes_ref.as_slice()).is_ok()
+}
+
+/// Create a random secret key.
+///
+/// \note Should be deleted with \tw_crypto_box_secret_key_delete.
+/// \return Nullable pointer to Private Key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_secret_key_create() -> *mut TWCryptoBoxSecretKey {
+    TWCryptoBoxSecretKey(SecretKey::random()).into_ptr()
+}
+
+/// Create a `crypto_box` secret key with the given block of data.
+///
+/// \param data *non-null* byte array. Expected to have 32 bytes.
+/// \note Should be deleted with \tw_crypto_box_secret_key_delete.
+/// \return Nullable pointer to Secret Key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_secret_key_create_with_data(
+    data: *const TWData,
+) -> *mut TWCryptoBoxSecretKey {
+    let bytes_ref = try_or_else!(TWData::from_ptr_as_ref(data), std::ptr::null_mut);
+    let secret = try_or_else!(
+        SecretKey::try_from(bytes_ref.as_slice()),
+        std::ptr::null_mut
+    );
+    TWCryptoBoxSecretKey(secret).into_ptr()
+}
+
+/// Delete the given secret `key`.
+///
+/// \param key *non-null* pointer to secret key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_secret_key_delete(key: *mut TWCryptoBoxSecretKey) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = TWCryptoBoxSecretKey::from_ptr(key);
+}
+
+/// Returns the public key associated with the given `key`.
+///
+/// \param key *non-null* pointer to the private key.
+/// \return *non-null* pointer to the corresponding public key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_secret_key_get_public_key(
+    key: *mut TWCryptoBoxSecretKey,
+) -> *mut TWCryptoBoxPublicKey {
+    let secret = try_or_else!(
+        TWCryptoBoxSecretKey::from_ptr_as_ref(key),
+        std::ptr::null_mut
+    );
+    TWCryptoBoxPublicKey(secret.0.public_key()).into_ptr()
+}
+
+/// Returns the raw data of a given secret-key.
+///
+/// \param secret_key *non-null* pointer to a secret key.
+/// \return C-compatible result with a C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn tw_crypto_box_secret_key_data(
+    secret_key: *const TWCryptoBoxSecretKey,
+) -> *mut TWData {
+    let secret_ref = try_or_else!(
+        TWCryptoBoxSecretKey::from_ptr_as_ref(secret_key),
+        std::ptr::null_mut
+    );
+    TWData::from(secret_ref.0.to_zeroizing_vec().to_vec()).into_ptr()
+}
diff --git a/rust/tw_keypair/src/ffi/mod.rs b/rust/tw_keypair/src/ffi/mod.rs
new file mode 100644
index 00000000000..33cdc647905
--- /dev/null
+++ b/rust/tw_keypair/src/ffi/mod.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod asn;
+pub mod crypto_box;
+pub mod privkey;
+pub mod pubkey;
diff --git a/rust/tw_keypair/src/ffi/privkey.rs b/rust/tw_keypair/src/ffi/privkey.rs
new file mode 100644
index 00000000000..9d4efa7f8f4
--- /dev/null
+++ b/rust/tw_keypair/src/ffi/privkey.rs
@@ -0,0 +1,137 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::ffi::pubkey::TWPublicKey;
+use crate::tw::{Curve, PrivateKey, PublicKeyType};
+use tw_memory::ffi::c_byte_array::CByteArray;
+use tw_memory::ffi::c_byte_array_ref::CByteArrayRef;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::{try_or_else, try_or_false};
+
+pub struct TWPrivateKey(pub(crate) PrivateKey);
+
+impl RawPtrTrait for TWPrivateKey {}
+
+impl AsRef<PrivateKey> for TWPrivateKey {
+    fn as_ref(&self) -> &PrivateKey {
+        &self.0
+    }
+}
+
+/// Create a private key with the given block of data.
+///
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \note Should be deleted with \tw_private_key_delete.
+/// \return Nullable pointer to Private Key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_private_key_create_with_data(
+    input: *const u8,
+    input_len: usize,
+) -> *mut TWPrivateKey {
+    let bytes_ref = CByteArrayRef::new(input, input_len);
+    let bytes = try_or_else!(bytes_ref.to_vec(), std::ptr::null_mut);
+
+    PrivateKey::new(bytes)
+        .map(|private| TWPrivateKey(private).into_ptr())
+        // Return null if the private key is invalid.
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Delete the given private key.
+///
+/// \param key *non-null* pointer to private key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_private_key_delete(key: *mut TWPrivateKey) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = TWPrivateKey::from_ptr(key);
+}
+
+/// Determines if the given private key is valid or not.
+///
+/// \param key *non-null* byte array.
+/// \param key_len the length of the `key` array.
+/// \param curve Eliptic curve of the private key.
+/// \return true if the private key is valid, false otherwise.
+#[no_mangle]
+pub unsafe extern "C" fn tw_private_key_is_valid(
+    key: *const u8,
+    key_len: usize,
+    curve: u32,
+) -> bool {
+    let curve = try_or_false!(Curve::from_raw(curve));
+    let priv_key_slice = try_or_false!(CByteArrayRef::new(key, key_len).as_slice());
+    PrivateKey::is_valid(priv_key_slice, curve)
+}
+
+/// Signs a digest using ECDSA and given curve.
+///
+/// \param key *non-null* pointer to a Private key
+/// \param message *non-null* byte array.
+/// \param message_len the length of the `input` array.
+/// \param curve Eliptic curve.
+/// \return Signature as a C-compatible result with a C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn tw_private_key_sign(
+    key: *mut TWPrivateKey,
+    message: *const u8,
+    message_len: usize,
+    curve: u32,
+) -> CByteArray {
+    let curve = try_or_else!(Curve::from_raw(curve), CByteArray::default);
+    let private = try_or_else!(TWPrivateKey::from_ptr_as_ref(key), CByteArray::default);
+    let message_to_sign = try_or_else!(
+        CByteArrayRef::new(message, message_len).as_slice(),
+        CByteArray::default
+    );
+
+    // Return an empty signature if an error occurs.
+    let sig = private.0.sign(message_to_sign, curve).unwrap_or_default();
+    CByteArray::from(sig)
+}
+
+/// Returns the public key associated with the given pubkeyType and privateKey
+///
+/// \param key *non-null* pointer to the private key.
+/// \param pubkey_type type of the public key to return.
+/// \return *non-null* pointer to the corresponding public key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_private_key_get_public_key_by_type(
+    key: *mut TWPrivateKey,
+    pubkey_type: u32,
+) -> *mut TWPublicKey {
+    let ty = try_or_else!(PublicKeyType::from_raw(pubkey_type), std::ptr::null_mut);
+    let private = try_or_else!(TWPrivateKey::from_ptr_as_ref(key), std::ptr::null_mut);
+    private
+        .0
+        .get_public_key_by_type(ty)
+        .map(|public| TWPublicKey(public).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+// #[no_mangle]
+// pub unsafe extern "C" fn tw_private_key_get_shared_key(
+//     key: *mut TWPrivateKey,
+//     hash: *const u8,
+//     hash_len: usize,
+//     curve: u32,
+// ) -> CByteArray {
+//     let curve = match Curve::from_raw(curve) {
+//         Some(curve) => curve,
+//         None => return CByteArray::empty(),
+//     };
+//     let private = try_or_else!(TWPrivateKey::from_ptr_as_ref(key), CByteArray::empty);
+//
+//     let hash = CByteArrayRef::new(hash, hash_len);
+//     let hash_to_sign = match hash.as_slice() {
+//         Some(hash) => hash,
+//         None => return CByteArray::empty(),
+//     };
+//
+//     // Return an empty signature if an error occurs.
+//     let sig = private.sign(hash_to_sign, curve).unwrap_or_default();
+//     CByteArray::from(sig)
+// }
diff --git a/rust/tw_keypair/src/ffi/pubkey.rs b/rust/tw_keypair/src/ffi/pubkey.rs
new file mode 100644
index 00000000000..7f05f5f0fe9
--- /dev/null
+++ b/rust/tw_keypair/src/ffi/pubkey.rs
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use crate::tw::{PublicKey, PublicKeyType};
+use tw_memory::ffi::c_byte_array::CByteArray;
+use tw_memory::ffi::c_byte_array_ref::CByteArrayRef;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::{try_or_else, try_or_false};
+
+pub struct TWPublicKey(pub(crate) PublicKey);
+
+impl AsRef<PublicKey> for TWPublicKey {
+    fn as_ref(&self) -> &PublicKey {
+        &self.0
+    }
+}
+
+impl RawPtrTrait for TWPublicKey {}
+
+/// Create a public key with the given block of data and specified public key type.
+///
+/// \param input *non-null* byte array.
+/// \param input_len the length of the `input` array.
+/// \param ty type of the public key.
+/// \note Should be deleted with \tw_public_key_delete.
+/// \return Nullable pointer to the public key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_public_key_create_with_data(
+    input: *const u8,
+    input_len: usize,
+    ty: u32,
+) -> *mut TWPublicKey {
+    let bytes_ref = CByteArrayRef::new(input, input_len);
+    let bytes = try_or_else!(bytes_ref.to_vec(), std::ptr::null_mut);
+    let ty = try_or_else!(PublicKeyType::from_raw(ty), std::ptr::null_mut);
+    PublicKey::new(bytes, ty)
+        .map(|public| TWPublicKey(public).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Delete the given public key.
+///
+/// \param key *non-null* pointer to public key.
+#[no_mangle]
+pub unsafe extern "C" fn tw_public_key_delete(key: *mut TWPublicKey) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = TWPublicKey::from_ptr(key);
+}
+
+/// Verify the validity of a signature and a message using the given public key.
+///
+/// \param key *non-null* pointer to a Public key.
+/// \param sig *non-null* pointer to a block of data corresponding to the signature.
+/// \param sig_len the length of the `sig` array.
+/// \param msg *non-null* pointer to a block of data corresponding to the message.
+/// \param msg_len the length of the `msg` array.
+/// \return true if the signature and the message belongs to the given public key, otherwise false.
+#[no_mangle]
+pub unsafe extern "C" fn tw_public_key_verify(
+    key: *mut TWPublicKey,
+    sig: *const u8,
+    sig_len: usize,
+    msg: *const u8,
+    msg_len: usize,
+) -> bool {
+    let public = try_or_false!(TWPublicKey::from_ptr_as_ref(key));
+    let sig = try_or_false!(CByteArrayRef::new(sig, sig_len).as_slice());
+    let msg = try_or_false!(CByteArrayRef::new(msg, msg_len).as_slice());
+    public.0.verify(sig, msg)
+}
+
+/// Returns the raw data of a given public-key.
+///
+/// \param key *non-null* pointer to a public key.
+/// \return C-compatible result with a C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn tw_public_key_data(key: *mut TWPublicKey) -> CByteArray {
+    let public = try_or_else!(TWPublicKey::from_ptr_as_ref(key), CByteArray::default);
+    CByteArray::from(public.0.to_bytes())
+}
+
+// #[no_mangle]
+// pub unsafe extern "C" fn tw_public_key_is_valid(
+//     pubkey: *const u8,
+//     pubkey_len: usize,
+//     pubkey_type: u32,
+// ) -> bool {
+//     let ty = match TWPublicKeyType::from_raw(pubkey_type) {
+//         Some(ty) => ty,
+//         None => return false,
+//     };
+//
+//     let pubkey_slice = match CByteArrayRef::new(pubkey, pubkey_len).as_slice() {
+//         Some(pubkey) => pubkey,
+//         None => return false,
+//     };
+//
+//     TWPublicKey::is_valid(pubkey_slice, ty)
+// }
diff --git a/rust/tw_keypair/src/lib.rs b/rust/tw_keypair/src/lib.rs
new file mode 100644
index 00000000000..9a51090213d
--- /dev/null
+++ b/rust/tw_keypair/src/lib.rs
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! `tw_keypair` crate defines the keypairs, private and public keys that are used to sign messages,
+//! verify signatures and more.
+//!
+//! # Usage - Generic TW solution
+//!
+//! If you plan to work with different curves in the same app by using the same private key,
+//! consider using [`tw::PrivateKey`], [`tw::PublicKey`], [`tw::KeyPair`] (TODO).
+//!
+//! ```rust,ignore
+//! use tw_keypair::{tw::PrivateKey, Curve};
+//!
+//! let private = PrivateKey::try_from(YOUR_SECRET_BYTES).unwrap();
+//!
+//! // Sign an ETH transaction hash with the `private` key.
+//! let eth_signature = private.sign(ETH_TX_HASH, Curve::Secp256k1).unwrap();
+//! assert_eq(eth_signature.len(), 65);
+//!
+//! // Sign a SUI transaction hash with the same `private` key, but different `curve`.
+//! let sui_signature = private.sign(SUI_TX_HASH, Curve::Ed25519).unwrap();
+//! ```
+//!
+//! # Usage - Specific curve
+//!
+//! If you plan to work with only one curve, consider using a specific curve implementation.
+//! For example, if you work with ETH, therefore  the`secp256k1` curve:
+//!
+//! ```rust,ignore
+//! use tw_keypair::secp256k1::KeyPair;
+//!
+//! let keypair = KeyPair::try_from(YOUR_SECRET_BYTES).unwrap();
+//!
+//! // Sign an ETH transaction hash.
+//! // [`tw_keypair::secp256k1::KeyPair::sign`] returns a [`tw_keypair::secp256k1::Signature`].
+//! let eth_signature = private.sign(ETH_TX_HASH, Curve::Secp256k1).unwrap();
+//!
+//! assert_eq(eth_signature.r, H256::from(EXPECTED_R_HEX));
+//! assert_eq(eth_signature.s, H256::from(EXPECTED_S_HEX));
+//! assert_eq(eth_signature.v, H256::from(EXPECTED_V));
+//! ```
+
+pub mod ecdsa;
+pub mod ed25519;
+pub mod ffi;
+pub mod nacl_crypto_box;
+pub mod rand;
+pub mod schnorr;
+pub mod starkex;
+pub mod traits;
+pub mod tw;
+
+#[cfg(feature = "test-utils")]
+pub mod test_utils;
+
+pub type KeyPairResult<T> = Result<T, KeyPairError>;
+
+#[derive(Debug, PartialEq, Eq)]
+pub enum KeyPairError {
+    InvalidSecretKey,
+    InvalidPublicKey,
+    InvalidSignature,
+    InvalidSignMessage,
+    InvalidEncryptedMessage,
+    SignatureVerifyError,
+    SigningError,
+    InternalError,
+}
diff --git a/rust/tw_keypair/src/nacl_crypto_box/mod.rs b/rust/tw_keypair/src/nacl_crypto_box/mod.rs
new file mode 100644
index 00000000000..8763fdf2841
--- /dev/null
+++ b/rust/tw_keypair/src/nacl_crypto_box/mod.rs
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{KeyPairError, KeyPairResult};
+use crypto_box::aead::Aead;
+use tw_hash::H192;
+use tw_memory::Data;
+
+pub mod public_key;
+pub mod secret_key;
+
+use public_key::PublicKey;
+use secret_key::SecretKey;
+
+const NONCE_LEN: usize = H192::LEN;
+
+pub struct CryptoBox;
+
+impl CryptoBox {
+    /// Encrypts message using `other_pubkey` and `my_secret`.
+    /// The output will have a randomly generated nonce prepended to it.
+    /// The output will be Overhead + 24 bytes longer than the original.
+    pub fn encrypt_easy(
+        my_secret: &SecretKey,
+        other_pubkey: &PublicKey,
+        message: &[u8],
+    ) -> KeyPairResult<Data> {
+        use crate::rand::OsRng;
+        use crypto_box::aead::AeadCore;
+
+        let nonce = crypto_box::SalsaBox::generate_nonce(&mut OsRng);
+        let nonce = H192::try_from(nonce.as_slice()).map_err(|_| KeyPairError::InternalError)?;
+        let encrypted = Self::encrypt(my_secret, other_pubkey, message, nonce)?;
+
+        let ecrypted_with_nonce: Data = nonce
+            .as_slice()
+            .iter()
+            .chain(encrypted.iter())
+            .copied()
+            .collect();
+        Ok(ecrypted_with_nonce)
+    }
+
+    /// Encrypts message using `other_pubkey`, `my_secret` and explicit `nonce`.
+    pub fn encrypt(
+        my_secret: &SecretKey,
+        other_pubkey: &PublicKey,
+        message: &[u8],
+        nonce: H192,
+    ) -> KeyPairResult<Data> {
+        let nonce = crypto_box::Nonce::from(nonce.take());
+        let salsa_box = crypto_box::SalsaBox::new(other_pubkey.inner(), my_secret.inner());
+        salsa_box
+            .encrypt(&nonce, message)
+            .map_err(|_| KeyPairError::InternalError)
+    }
+
+    /// Decrypts box produced by [`CryptoBox::encrypt_easy`].
+    /// We assume a 24-byte nonce is prepended to the encrypted text in box.
+    pub fn decrypt_easy(
+        my_secret: &SecretKey,
+        other_pubkey: &PublicKey,
+        encrypted_with_nonce: &[u8],
+    ) -> KeyPairResult<Data> {
+        if encrypted_with_nonce.len() < NONCE_LEN {
+            return Err(KeyPairError::InvalidEncryptedMessage);
+        }
+
+        let nonce = H192::try_from(&encrypted_with_nonce[..NONCE_LEN])
+            .map_err(|_| KeyPairError::InternalError)?;
+        let encrypted = &encrypted_with_nonce[NONCE_LEN..];
+
+        Self::decrypt(my_secret, other_pubkey, encrypted, nonce)
+    }
+
+    /// Decrypts a box produced by [`CryptoBox::encrypt`] by using the same `nonce`.
+    pub fn decrypt(
+        my_secret: &SecretKey,
+        other_pubkey: &PublicKey,
+        encrypted: &[u8],
+        nonce: H192,
+    ) -> KeyPairResult<Data> {
+        let nonce = crypto_box::Nonce::from(nonce.take());
+        let salsa_box = crypto_box::SalsaBox::new(other_pubkey.inner(), my_secret.inner());
+        salsa_box
+            .decrypt(&nonce, encrypted)
+            .map_err(|_| KeyPairError::InvalidEncryptedMessage)
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use tw_encoding::hex::ToHex;
+    use tw_hash::H256;
+
+    /// This test uses values generated by using https://github.com/kevinburke/nacl library.
+    #[test]
+    fn test_encrypt_decrypt() {
+        let my_secret =
+            H256::from("d465226bebafda6bcd6e1783712e9f7fad6385ef2210630887b6564cb4f6e051");
+        let my_secret = SecretKey::try_from(my_secret.as_slice()).unwrap();
+        let my_public = my_secret.public_key();
+
+        let other_secret =
+            H256::from("dd87000d4805d6fbd89ae1352f5e4445648b79d5e901c92aebcb610e9be468e4");
+        let other_secret = SecretKey::try_from(other_secret.as_slice()).unwrap();
+        let other_public = other_secret.public_key();
+
+        // 7a7b9c8fee6e3c597512848c7d513e7131193cdfd410ff6611522fdeea99d7160873182019d7a18502f22c5e3644d26a2b669365
+        let nonce = H192::from("7a7b9c8fee6e3c597512848c7d513e7131193cdfd410ff66");
+        let message = b"Hello, world";
+
+        let encrypted = CryptoBox::encrypt(&my_secret, &other_public, message, nonce).unwrap();
+        assert_eq!(
+            encrypted.to_hex(),
+            "11522fdeea99d7160873182019d7a18502f22c5e3644d26a2b669365"
+        );
+
+        // Step 2. Make sure the Box can be decrypted by the other side.
+        let decrypted = CryptoBox::decrypt(&other_secret, &my_public, &encrypted, nonce).unwrap();
+        assert_eq!(
+            decrypted, message,
+            "Decrypted message differs from the original message"
+        );
+    }
+
+    #[test]
+    fn test_encrypt_decrypt_easy() {
+        let my_secret = SecretKey::random();
+        let my_public = my_secret.public_key();
+
+        let other_secret = SecretKey::random();
+        let other_public = other_secret.public_key();
+
+        let message = b"Test message to be encrypted";
+
+        let encrypted_with_nonce =
+            CryptoBox::encrypt_easy(&my_secret, &other_public, message).unwrap();
+
+        // Step 2. Make sure the Box can be decrypted by the other side.
+        let decrypted =
+            CryptoBox::decrypt_easy(&other_secret, &my_public, &encrypted_with_nonce).unwrap();
+        assert_eq!(
+            decrypted, message,
+            "Decrypted message differs from the original message"
+        );
+    }
+}
diff --git a/rust/tw_keypair/src/nacl_crypto_box/public_key.rs b/rust/tw_keypair/src/nacl_crypto_box/public_key.rs
new file mode 100644
index 00000000000..01cb765624c
--- /dev/null
+++ b/rust/tw_keypair/src/nacl_crypto_box/public_key.rs
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::KeyPairError;
+
+pub struct PublicKey {
+    public: crypto_box::PublicKey,
+}
+
+impl PublicKey {
+    pub(crate) fn with_inner(public: crypto_box::PublicKey) -> PublicKey {
+        PublicKey { public }
+    }
+
+    pub(crate) fn inner(&self) -> &crypto_box::PublicKey {
+        &self.public
+    }
+
+    pub fn as_slice(&self) -> &[u8] {
+        self.public.as_bytes()
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PublicKey {
+    type Error = KeyPairError;
+
+    fn try_from(value: &'a [u8]) -> Result<Self, Self::Error> {
+        let public =
+            crypto_box::PublicKey::from_slice(value).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Ok(PublicKey { public })
+    }
+}
diff --git a/rust/tw_keypair/src/nacl_crypto_box/secret_key.rs b/rust/tw_keypair/src/nacl_crypto_box/secret_key.rs
new file mode 100644
index 00000000000..1eca9f6f6bb
--- /dev/null
+++ b/rust/tw_keypair/src/nacl_crypto_box/secret_key.rs
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::nacl_crypto_box::public_key::PublicKey;
+use crate::rand::{CryptoRngCore, OsRng};
+use crate::KeyPairError;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesZeroizing;
+use zeroize::Zeroizing;
+
+pub struct SecretKey {
+    secret: crypto_box::SecretKey,
+}
+
+impl SecretKey {
+    pub fn random() -> SecretKey {
+        SecretKey::generate(&mut OsRng)
+    }
+
+    pub fn generate<T: CryptoRngCore>(rand: &mut T) -> SecretKey {
+        let secret = crypto_box::SecretKey::generate(rand);
+        SecretKey { secret }
+    }
+
+    pub fn public_key(&self) -> PublicKey {
+        PublicKey::with_inner(self.secret.public_key())
+    }
+
+    pub(crate) fn inner(&self) -> &crypto_box::SecretKey {
+        &self.secret
+    }
+
+    pub fn to_vec(&self) -> Zeroizing<H256> {
+        Zeroizing::new(H256::from(self.secret.to_bytes()))
+    }
+}
+
+impl ToBytesZeroizing for SecretKey {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        let bytes = Zeroizing::new(self.secret.to_bytes());
+        Zeroizing::new(bytes.to_vec())
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for SecretKey {
+    type Error = KeyPairError;
+
+    fn try_from(value: &'a [u8]) -> Result<Self, Self::Error> {
+        let secret =
+            crypto_box::SecretKey::from_slice(value).map_err(|_| KeyPairError::InvalidSecretKey)?;
+        Ok(SecretKey { secret })
+    }
+}
diff --git a/rust/tw_keypair/src/rand.rs b/rust/tw_keypair/src/rand.rs
new file mode 100644
index 00000000000..00484f30107
--- /dev/null
+++ b/rust/tw_keypair/src/rand.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub use rand_core::CryptoRngCore;
+pub use rand_core::OsRng;
diff --git a/rust/tw_keypair/src/schnorr/keypair.rs b/rust/tw_keypair/src/schnorr/keypair.rs
new file mode 100644
index 00000000000..2ad8c36717c
--- /dev/null
+++ b/rust/tw_keypair/src/schnorr/keypair.rs
@@ -0,0 +1,74 @@
+use tw_encoding::hex;
+use tw_hash::H256;
+use zeroize::Zeroizing;
+
+use crate::schnorr::private::PrivateKey;
+use crate::schnorr::public::PublicKey;
+use crate::schnorr::signature::Signature;
+use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use crate::KeyPairError;
+
+pub struct KeyPair {
+    private: PrivateKey,
+    public: PublicKey,
+}
+
+impl KeyPair {
+    /// Disable auxiliary random data when signing. ONLY recommended for testing.
+    pub fn no_aux_rand(self) -> KeyPair {
+        KeyPair {
+            private: self.private.no_aux_rand(),
+            public: self.public,
+        }
+    }
+}
+
+impl KeyPairTrait for KeyPair {
+    type Private = PrivateKey;
+    type Public = PublicKey;
+
+    fn public(&self) -> &Self::Public {
+        &self.public
+    }
+
+    fn private(&self) -> &Self::Private {
+        &self.private
+    }
+}
+
+impl SigningKeyTrait for KeyPair {
+    type SigningMessage = H256;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> crate::KeyPairResult<Self::Signature> {
+        self.private.sign(message)
+    }
+}
+
+impl VerifyingKeyTrait for KeyPair {
+    type SigningMessage = H256;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public.verify(signature, message)
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for KeyPair {
+    type Error = KeyPairError;
+
+    fn try_from(value: &'a [u8]) -> Result<Self, Self::Error> {
+        let private = PrivateKey::try_from(value)?;
+        let public = private.public();
+        Ok(KeyPair { private, public })
+    }
+}
+
+impl<'a> TryFrom<&'a str> for KeyPair {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/schnorr/mod.rs b/rust/tw_keypair/src/schnorr/mod.rs
new file mode 100644
index 00000000000..ca6b6e0ade3
--- /dev/null
+++ b/rust/tw_keypair/src/schnorr/mod.rs
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use bitcoin::hashes::Hash;
+
+mod keypair;
+mod private;
+mod public;
+mod signature;
+
+pub use keypair::KeyPair;
+pub use private::PrivateKey;
+pub use public::{PublicKey, XOnlyPublicKey};
+pub use signature::Signature;
+use tw_hash::H256;
+
+pub(crate) fn bitcoin_tweak(tweak: Option<H256>) -> Option<bitcoin::taproot::TapNodeHash> {
+    if let Some(tweak) = tweak {
+        let hash = bitcoin::hashes::sha256t::Hash::<_>::from_slice(tweak.as_slice())
+            .expect("Expected a valid sha256t tweak");
+        Some(bitcoin::taproot::TapNodeHash::from_raw_hash(hash))
+    } else {
+        None
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+    use tw_hash::sha3::keccak256;
+    use tw_hash::{H256, H512};
+    use tw_misc::traits::ToBytesVec;
+
+    const SECRET: &str = "ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035";
+    const MSG: &str = "71b7098e8150cde90f3ec00280815d3069f81c7cdb6d83bbe2b897b1afbe7cd6";
+
+    fn tweak_hash() -> H256 {
+        H256::try_from(keccak256(b"hello").as_slice()).unwrap()
+    }
+
+    #[test]
+    fn test_sign_verify() {
+        let key_pair = KeyPair::try_from(SECRET).unwrap().no_aux_rand();
+
+        let hash_to_sign = H256::from(MSG);
+
+        let actual = key_pair.sign(hash_to_sign).expect("Error schnorr signing");
+
+        let expected = H512::from("d0741ce9268e1312b41eed1a6780720ec9a9277c347ad477936b158e9e4a0effd16150cc87ee9b2efe19e3137408c62ec3e4c6a937f7825a1e1c8dfee8f1bb95");
+        assert_eq!(actual, Signature::try_from(expected.as_slice()).unwrap());
+
+        let public = key_pair.public();
+        assert!(public.verify(actual, hash_to_sign), "Invalid signature");
+    }
+
+    #[test]
+    fn test_sign_verify_aux_rand() {
+        let private_key = PrivateKey::try_from(SECRET).unwrap();
+
+        let hash_to_sign = H256::from(MSG);
+
+        let actual = private_key
+            .sign(hash_to_sign)
+            .expect("Error schnorr signing");
+
+        let expected_no_aux = H512::from("8c6d15c40465feef7b0b9dfa91656599efcef298cfa92742e4088bf1b5550cc2094ec9145187b219782ace4994e35e4b07f4162ffab82e9d3d1e588913908476");
+        // The given signature must be different from that when the auxiliary random is disabled.
+        assert_ne!(actual.to_vec(), expected_no_aux.as_slice());
+
+        let public = private_key.public();
+        assert!(public.verify(actual, hash_to_sign), "Invalid signature");
+    }
+
+    #[test]
+    fn test_sign_verify_tweaked() {
+        let tweaked_key_pair = PrivateKey::try_from(SECRET)
+            .unwrap()
+            .tweak(Some(tweak_hash()))
+            .no_aux_rand();
+
+        let hash_to_sign = H256::from(MSG);
+
+        let actual = tweaked_key_pair
+            .sign(hash_to_sign)
+            .expect("Error schnorr signing");
+
+        let expected = H512::from("69e51a936bf9327d3809930bf5966c52879327bda9d6dcc6c0fd57e5f7cfebe1e403a60215cc44eacce8742125669ac63e4b33269487100e6108a5232e642bdf");
+        assert_eq!(actual, Signature::try_from(expected.as_slice()).unwrap());
+
+        let public = tweaked_key_pair.public();
+        assert!(public.verify(actual, hash_to_sign), "Invalid signature");
+    }
+
+    #[test]
+    fn test_sign_verify_tweaked_no_hash() {
+        let tweaked_key_pair = PrivateKey::try_from(SECRET)
+            .unwrap()
+            .tweak(None)
+            .no_aux_rand();
+
+        let hash_to_sign = H256::from(MSG);
+
+        let actual = tweaked_key_pair
+            .sign(hash_to_sign)
+            .expect("Error schnorr signing");
+
+        let expected = H512::from("67d56124226a9fdaf5eb654164f92cc2c2333db09a555287cba82d49a10976469dd3c2fcd6421b5a7f809b8e8ed5d3f7475e6b316e93fc31e2c36b92a97a016f");
+        assert_eq!(actual, Signature::try_from(expected.as_slice()).unwrap());
+
+        let public = tweaked_key_pair.public();
+        assert!(public.verify(actual, hash_to_sign), "Invalid signature");
+    }
+
+    #[test]
+    fn test_public_key_tweak() {
+        let private_key = PrivateKey::try_from(SECRET).unwrap();
+        let public_key = private_key.public();
+
+        let tweaked_private = private_key.tweak(None);
+        let tweaked_public = tweaked_private.public();
+
+        assert_eq!(public_key.tweak(None), tweaked_public);
+    }
+}
diff --git a/rust/tw_keypair/src/schnorr/private.rs b/rust/tw_keypair/src/schnorr/private.rs
new file mode 100644
index 00000000000..17a78ea868e
--- /dev/null
+++ b/rust/tw_keypair/src/schnorr/private.rs
@@ -0,0 +1,107 @@
+use crate::schnorr::bitcoin_tweak;
+use crate::schnorr::public::PublicKey;
+use crate::schnorr::signature::Signature;
+use crate::traits::SigningKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use bitcoin::key::TapTweak;
+use secp256k1::SECP256K1;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
+use zeroize::{Zeroize, Zeroizing};
+
+/// Represents a `schnorr` private key.
+#[derive(Clone)]
+pub struct PrivateKey {
+    key_pair: secp256k1::KeyPair,
+    no_aux_rand: bool,
+}
+
+impl PrivateKey {
+    pub fn public(&self) -> PublicKey {
+        PublicKey {
+            public: self.key_pair.public_key(),
+        }
+    }
+
+    /// Tweak the private key with a given hash.
+    /// Note that the private key can be tweaked with a `None` value.
+    pub fn tweak(self, tweak: Option<H256>) -> PrivateKey {
+        let tweak = bitcoin_tweak(tweak);
+
+        // Tweak the private key.
+        let tweaked = self.key_pair.tap_tweak(SECP256K1, tweak);
+        PrivateKey {
+            key_pair: secp256k1::KeyPair::from(tweaked),
+            no_aux_rand: self.no_aux_rand,
+        }
+    }
+
+    /// Disable auxiliary random data when signing. ONLY recommended for testing.
+    pub fn no_aux_rand(mut self) -> PrivateKey {
+        self.no_aux_rand = true;
+        self
+    }
+}
+
+impl Zeroize for PrivateKey {
+    fn zeroize(&mut self) {
+        self.key_pair.non_secure_erase();
+    }
+}
+
+impl Drop for PrivateKey {
+    fn drop(&mut self) {
+        self.zeroize();
+    }
+}
+
+impl SigningKeyTrait for PrivateKey {
+    type SigningMessage = H256;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        // We fully rely on the `bitcoin` and `secp256k1` crates to generate Schnorr signatures.
+
+        // TODO consider checking `Utxo.leaf_hash` like at
+        // https://github.com/trustwallet/wallet-core/blob/43bf58c0c99d78789b5a11714ebc686b4268fa06/rust/tw_bitcoin/src/modules/signer.rs#L183
+
+        // Sign the message.
+        let msg = secp256k1::Message::from_slice(message.as_slice()).expect("");
+        let sig = if self.no_aux_rand {
+            SECP256K1.sign_schnorr_no_aux_rand(&msg, &self.key_pair)
+        } else {
+            SECP256K1.sign_schnorr(&msg, &self.key_pair)
+        };
+
+        Ok(Signature::from(sig))
+    }
+}
+
+impl ToBytesZeroizing for PrivateKey {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        Zeroizing::new(self.key_pair.secret_bytes().to_vec())
+    }
+}
+
+impl<'a> TryFrom<&'a str> for PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(s: &'a str) -> Result<Self, Self::Error> {
+        let bytes = hex::decode(s).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        PrivateKey::try_from(bytes.as_slice())
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(value: &'a [u8]) -> Result<Self, Self::Error> {
+        let key_pair = secp256k1::KeyPair::from_seckey_slice(SECP256K1, value)
+            .map_err(|_| KeyPairError::InvalidSecretKey)?;
+        Ok(PrivateKey {
+            key_pair,
+            no_aux_rand: false,
+        })
+    }
+}
diff --git a/rust/tw_keypair/src/schnorr/public.rs b/rust/tw_keypair/src/schnorr/public.rs
new file mode 100644
index 00000000000..751b7d5ee65
--- /dev/null
+++ b/rust/tw_keypair/src/schnorr/public.rs
@@ -0,0 +1,104 @@
+use crate::schnorr::{bitcoin_tweak, Signature};
+use crate::traits::VerifyingKeyTrait;
+use crate::KeyPairError;
+use bitcoin::key::TapTweak;
+use secp256k1::SECP256K1;
+use tw_hash::{H256, H264};
+use tw_misc::traits::ToBytesVec;
+
+#[derive(Clone, Debug, PartialEq)]
+pub struct PublicKey {
+    pub(crate) public: secp256k1::PublicKey,
+}
+
+impl PublicKey {
+    pub fn compressed(&self) -> H264 {
+        H264::from(self.public.serialize())
+    }
+
+    pub fn tweak(&self, tweak: Option<H256>) -> PublicKey {
+        let tweak = bitcoin_tweak(tweak);
+
+        let (x_only_pubkey, _parity) = self.public.x_only_public_key();
+        let (tweaked_pubkey, tweaked_parity) = x_only_pubkey.tap_tweak(SECP256K1, tweak);
+
+        PublicKey {
+            public: secp256k1::PublicKey::from_x_only_public_key(
+                tweaked_pubkey.to_inner(),
+                tweaked_parity,
+            ),
+        }
+    }
+
+    pub fn x_only(&self) -> XOnlyPublicKey {
+        let (x_only_pubkey, _parity) = self.public.x_only_public_key();
+        XOnlyPublicKey {
+            public: x_only_pubkey,
+        }
+    }
+}
+
+impl VerifyingKeyTrait for PublicKey {
+    type SigningMessage = H256;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.x_only().verify(signature, message)
+    }
+}
+
+impl ToBytesVec for PublicKey {
+    fn to_vec(&self) -> Vec<u8> {
+        self.public.serialize().to_vec()
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PublicKey {
+    type Error = KeyPairError;
+
+    fn try_from(value: &'a [u8]) -> Result<Self, Self::Error> {
+        let public =
+            secp256k1::PublicKey::from_slice(value).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Ok(PublicKey { public })
+    }
+}
+
+pub struct XOnlyPublicKey {
+    pub(crate) public: secp256k1::XOnlyPublicKey,
+}
+
+impl XOnlyPublicKey {
+    pub fn bytes(&self) -> H256 {
+        H256::from(self.public.serialize())
+    }
+}
+
+impl VerifyingKeyTrait for XOnlyPublicKey {
+    type SigningMessage = H256;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        let message = secp256k1::Message::from_slice(message.as_slice())
+            .expect("Expected a valid secp256k1 message");
+
+        signature.signature.verify(&message, &self.public).is_ok()
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for XOnlyPublicKey {
+    type Error = KeyPairError;
+
+    fn try_from(value: &'a [u8]) -> Result<Self, Self::Error> {
+        let x_only_slice = if value.len() == H264::LEN {
+            // Drop the first parity byte.
+            &value[1..]
+        } else {
+            // Otherwise it should be `H256::LEN`. It will be checked later at [`secp256k1::XOnlyPublicKey::from_slice`].
+            value
+        };
+
+        let public = secp256k1::XOnlyPublicKey::from_slice(x_only_slice)
+            .map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Ok(XOnlyPublicKey { public })
+    }
+}
diff --git a/rust/tw_keypair/src/schnorr/signature.rs b/rust/tw_keypair/src/schnorr/signature.rs
new file mode 100644
index 00000000000..9c90632c84c
--- /dev/null
+++ b/rust/tw_keypair/src/schnorr/signature.rs
@@ -0,0 +1,43 @@
+use crate::{KeyPairError, KeyPairResult};
+use tw_hash::H512;
+use tw_misc::traits::ToBytesVec;
+
+#[derive(Debug, PartialEq)]
+pub struct Signature {
+    pub(crate) signature: secp256k1::schnorr::Signature,
+}
+
+impl Signature {
+    pub const LEN: usize = secp256k1::constants::SCHNORR_SIGNATURE_SIZE;
+
+    pub fn from_bytes(sig: &[u8]) -> KeyPairResult<Self> {
+        Ok(Signature {
+            signature: secp256k1::schnorr::Signature::from_slice(sig)
+                .map_err(|_| KeyPairError::InvalidSignature)?,
+        })
+    }
+
+    pub fn bytes(&self) -> H512 {
+        H512::from(*self.signature.as_ref())
+    }
+}
+
+impl ToBytesVec for Signature {
+    fn to_vec(&self) -> Vec<u8> {
+        self.signature.as_ref().to_vec()
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for Signature {
+    type Error = KeyPairError;
+
+    fn try_from(sig: &'a [u8]) -> Result<Self, Self::Error> {
+        Signature::from_bytes(sig)
+    }
+}
+
+impl From<secp256k1::schnorr::Signature> for Signature {
+    fn from(sig: secp256k1::schnorr::Signature) -> Self {
+        Signature { signature: sig }
+    }
+}
diff --git a/rust/tw_keypair/src/starkex/keypair.rs b/rust/tw_keypair/src/starkex/keypair.rs
new file mode 100644
index 00000000000..cc278e08d92
--- /dev/null
+++ b/rust/tw_keypair/src/starkex/keypair.rs
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::starkex::private::PrivateKey;
+use crate::starkex::public::PublicKey;
+use crate::starkex::signature::Signature;
+use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use crate::{KeyPairError, KeyPairResult};
+use tw_encoding::hex;
+use zeroize::Zeroizing;
+
+/// Represents a pair of private and public keys that are used in `starknet` context.
+pub struct KeyPair {
+    private: PrivateKey,
+    public: PublicKey,
+}
+
+impl KeyPairTrait for KeyPair {
+    type Private = PrivateKey;
+    type Public = PublicKey;
+
+    fn public(&self) -> &Self::Public {
+        &self.public
+    }
+
+    fn private(&self) -> &Self::Private {
+        &self.private
+    }
+}
+
+impl SigningKeyTrait for KeyPair {
+    type SigningMessage = Vec<u8>;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        self.private.sign(message)
+    }
+}
+
+impl VerifyingKeyTrait for KeyPair {
+    type SigningMessage = Vec<u8>;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        self.public.verify(signature, message)
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for KeyPair {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let private = PrivateKey::try_from(bytes)?;
+        let public = private.public();
+        Ok(KeyPair { private, public })
+    }
+}
+
+impl<'a> TryFrom<&'a str> for KeyPair {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/starkex/mod.rs b/rust/tw_keypair/src/starkex/mod.rs
new file mode 100644
index 00000000000..75bf81ae009
--- /dev/null
+++ b/rust/tw_keypair/src/starkex/mod.rs
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod keypair;
+mod private;
+mod public;
+mod signature;
+
+pub use keypair::KeyPair;
+pub use private::PrivateKey;
+pub use public::PublicKey;
+pub use signature::Signature;
+use starknet_ff::FieldElement;
+
+fn field_element_from_bytes_be(bytes: &[u8]) -> Result<FieldElement, ()> {
+    const FIELD_ELEMENT_LEN: usize = 32;
+
+    if bytes.len() > FIELD_ELEMENT_LEN {
+        return Err(());
+    }
+    let mut buffer = [0u8; FIELD_ELEMENT_LEN];
+    buffer[(FIELD_ELEMENT_LEN - bytes.len())..].copy_from_slice(bytes);
+    FieldElement::from_bytes_be(&buffer).map_err(|_| ())
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+    use tw_encoding::hex;
+    use tw_hash::{H256, H512};
+    use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
+
+    #[test]
+    fn test_key_pair_sign_verify() {
+        let keypair =
+            KeyPair::try_from("0139fe4d6f02e666e86a6f58e65060f115cd3c185bd9e98bd829636931458f79")
+                .unwrap();
+
+        let hash_to_sign =
+            hex::decode("06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76")
+                .unwrap();
+        let actual = keypair.sign(hash_to_sign.clone()).unwrap();
+
+        let expected = H512::from("061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a");
+        assert_eq!(actual.to_vec(), expected.into_vec());
+
+        assert!(keypair.verify(actual, hash_to_sign));
+    }
+
+    #[test]
+    fn test_key_pair_get_private_public() {
+        let privkey_bytes =
+            hex::decode("058ab7989d625b1a690400dcbe6e070627adedceff7bd196e58d4791026a8afe")
+                .unwrap();
+        let pubkey_bytes =
+            hex::decode("02a4c7332c55d6c1c510d24272d1db82878f2302f05b53bcc38695ed5f78fffd")
+                .unwrap();
+
+        let keypair = KeyPair::try_from(privkey_bytes.as_slice()).unwrap();
+        assert_eq!(
+            keypair.private().to_zeroizing_vec().as_slice(),
+            privkey_bytes
+        );
+        assert_eq!(keypair.public().to_vec(), pubkey_bytes);
+    }
+
+    #[test]
+    fn test_field_element_from_bytes_be_invalid() {
+        let invalid_element =
+            hex::decode("00058ab7989d625b1a690400dcbe6e070627adedceff7bd196e58d4791026a8afe")
+                .unwrap();
+        field_element_from_bytes_be(&invalid_element).unwrap_err();
+    }
+
+    #[test]
+    fn test_private_key_to_from_bytes() {
+        let bytes = hex::decode("058ab7989d625b1a690400dcbe6e070627adedceff7bd196e58d4791026a8afe")
+            .unwrap();
+        let private = PrivateKey::try_from(bytes.as_slice()).unwrap();
+        assert_eq!(private.to_zeroizing_vec().as_slice(), bytes);
+    }
+
+    #[test]
+    fn test_public_key_to_from_bytes() {
+        let bytes = hex::decode("02a4c7332c55d6c1c510d24272d1db82878f2302f05b53bcc38695ed5f78fffd")
+            .unwrap();
+        let public = PublicKey::try_from(bytes.as_slice()).unwrap();
+        assert_eq!(public.to_vec(), bytes);
+    }
+
+    #[test]
+    fn test_signature_to_from_bytes() {
+        let bytes = hex::decode("061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a").unwrap();
+        let sign = Signature::try_from(bytes.as_slice()).unwrap();
+        assert_eq!(sign.to_vec(), bytes);
+
+        assert_eq!(
+            sign.r(),
+            H256::from("061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f")
+        );
+        assert_eq!(
+            sign.s(),
+            H256::from("04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a")
+        );
+    }
+
+    // https://github.com/xJonathanLEI/starknet-rs/issues/365
+    #[test]
+    fn test_verify_panic() {
+        let public =
+            PublicKey::try_from("03ee9bffffffffff26ffffffff60ffffffffffffffffffffffffffff004accff")
+                .unwrap();
+        let hash = hex::decode("06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76")
+            .unwrap();
+        let signature_bytes = hex::decode("06ffffffffffffffffffffffffffffffffffffffffffff06ffff5dffff9bffdf00ffffff9b9b9b9b9b9b9b9bbb9bff9b9bbb9bff9b9b9b9b9b9b9b9b9b9b9b33").unwrap();
+        let signature = Signature::try_from(signature_bytes.as_slice()).unwrap();
+
+        assert!(!public.verify(signature, hash));
+    }
+}
diff --git a/rust/tw_keypair/src/starkex/private.rs b/rust/tw_keypair/src/starkex/private.rs
new file mode 100644
index 00000000000..58343428536
--- /dev/null
+++ b/rust/tw_keypair/src/starkex/private.rs
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::starkex::field_element_from_bytes_be;
+use crate::starkex::public::PublicKey;
+use crate::starkex::signature::Signature;
+use crate::traits::SigningKeyTrait;
+use crate::{KeyPairError, KeyPairResult};
+use starknet_crypto::{
+    get_public_key, rfc6979_generate_k, sign, SignError, Signature as EcdsaSignature,
+};
+use starknet_ff::FieldElement;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesZeroizing;
+use zeroize::Zeroizing;
+
+/// The maximum number of attempts to sign a message.
+/// As the number is coming from `rfc6979_generate_k` so the probability is lower.
+const SIGN_RETRIES: usize = 5;
+
+/// Represents a private key that is used in `starknet` context.
+pub struct PrivateKey {
+    secret: FieldElement,
+}
+
+impl PrivateKey {
+    /// Returns an associated `starknet` public key.
+    pub fn public(&self) -> PublicKey {
+        let public_scalar = get_public_key(&self.secret);
+        PublicKey::from_scalar(public_scalar)
+    }
+}
+
+impl SigningKeyTrait for PrivateKey {
+    type SigningMessage = Vec<u8>;
+    type Signature = Signature;
+
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature> {
+        let hash_to_sign =
+            field_element_from_bytes_be(&message).map_err(|_| KeyPairError::InvalidSignMessage)?;
+        let signature =
+            ecdsa_sign(&self.secret, &hash_to_sign).map_err(|_| KeyPairError::SigningError)?;
+        Ok(Signature::new(signature))
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let bytes = H256::try_from(bytes).map_err(|_| KeyPairError::InvalidSecretKey)?;
+        let secret = FieldElement::from_bytes_be(&bytes.take())
+            .map_err(|_| KeyPairError::InvalidSecretKey)?;
+        Ok(PrivateKey { secret })
+    }
+}
+
+impl<'a> TryFrom<&'a str> for PrivateKey {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = Zeroizing::new(hex::decode(hex).map_err(|_| KeyPairError::InvalidSecretKey)?);
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl ToBytesZeroizing for PrivateKey {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>> {
+        let secret = Zeroizing::new(self.secret.to_bytes_be());
+        Zeroizing::new(secret.to_vec())
+    }
+}
+
+/// `starknet-core` depends on an out-dated `starknet-crypto` crate.
+/// We need to reimplement the same but using the latest `starknet-crypto` version.
+/// https://github.com/xJonathanLEI/starknet-rs/blob/0c78b365c2a7a7d4138553cba42fa69d695aa73d/starknet-core/src/crypto.rs#L34-L59
+pub fn ecdsa_sign(
+    private_key: &FieldElement,
+    message_hash: &FieldElement,
+) -> Result<EcdsaSignature, SignError> {
+    // Seed-retry logic ported from `cairo-lang`
+    let mut seed = None;
+    for _ in 0..SIGN_RETRIES {
+        let k = rfc6979_generate_k(message_hash, private_key, seed.as_ref());
+
+        match sign(private_key, message_hash, &k) {
+            Ok(sig) => {
+                return Ok(EcdsaSignature { r: sig.r, s: sig.s });
+            },
+            Err(SignError::InvalidMessageHash) => return Err(SignError::InvalidMessageHash),
+            Err(SignError::InvalidK) => {
+                // Bump seed and retry
+                seed = match seed {
+                    Some(prev_seed) => Some(prev_seed + FieldElement::ONE),
+                    None => Some(FieldElement::ONE),
+                };
+            },
+        };
+    }
+    Err(SignError::InvalidMessageHash)
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_starknet_sign_invalid_k() {
+        let private = PrivateKey {
+            secret: field_element_from_bytes_be(&[0; 32]).unwrap(),
+        };
+        let hash = vec![0; 32];
+
+        // Return value does not implement Debug, so we cannot unwrap here.
+        match private.sign(hash) {
+            Ok(_) => panic!("Retry limit expected"),
+            Err(err) => assert_eq!(err, KeyPairError::SigningError),
+        }
+    }
+}
diff --git a/rust/tw_keypair/src/starkex/public.rs b/rust/tw_keypair/src/starkex/public.rs
new file mode 100644
index 00000000000..dce6744e954
--- /dev/null
+++ b/rust/tw_keypair/src/starkex/public.rs
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::starkex::field_element_from_bytes_be;
+use crate::starkex::signature::Signature;
+use crate::traits::VerifyingKeyTrait;
+use crate::KeyPairError;
+use starknet_crypto::verify as ecdsa_verify;
+use starknet_ff::FieldElement;
+use tw_encoding::hex;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesVec;
+use tw_misc::try_or_false;
+
+#[derive(Clone)]
+pub struct PublicKey {
+    public: FieldElement,
+}
+
+impl PublicKey {
+    /// Creates a public key from the given [`FieldElement`].
+    pub(crate) fn from_scalar(public: FieldElement) -> PublicKey {
+        PublicKey { public }
+    }
+}
+
+impl VerifyingKeyTrait for PublicKey {
+    type SigningMessage = Vec<u8>;
+    type VerifySignature = Signature;
+
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool {
+        let hash = try_or_false!(field_element_from_bytes_be(&message));
+        let ecdsa_signature = signature.inner();
+        ecdsa_verify(&self.public, &hash, &ecdsa_signature.r, &ecdsa_signature.s)
+            .unwrap_or_default()
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for PublicKey {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        let bytes = H256::try_from(bytes).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        let public_scalar = FieldElement::from_bytes_be(&bytes.take())
+            .map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Ok(PublicKey::from_scalar(public_scalar))
+    }
+}
+
+impl<'a> TryFrom<&'a str> for PublicKey {
+    type Error = KeyPairError;
+
+    fn try_from(hex: &'a str) -> Result<Self, Self::Error> {
+        let bytes = hex::decode(hex).map_err(|_| KeyPairError::InvalidPublicKey)?;
+        Self::try_from(bytes.as_slice())
+    }
+}
+
+impl ToBytesVec for PublicKey {
+    fn to_vec(&self) -> Vec<u8> {
+        self.public.to_bytes_be().to_vec()
+    }
+}
diff --git a/rust/tw_keypair/src/starkex/signature.rs b/rust/tw_keypair/src/starkex/signature.rs
new file mode 100644
index 00000000000..a602d728e6c
--- /dev/null
+++ b/rust/tw_keypair/src/starkex/signature.rs
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::KeyPairError;
+use starknet_ff::FieldElement;
+use std::ops::Range;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesVec;
+
+/// cbindgen:ignore
+const R_RANGE: Range<usize> = 0..32;
+/// cbindgen:ignore
+const S_RANGE: Range<usize> = 32..64;
+
+/// Represents a `starknet` signature.
+pub struct Signature {
+    pub(crate) signature: starknet_crypto::Signature,
+}
+
+/// cbindgen:ignore
+impl Signature {
+    /// The number of bytes for a serialized signature representation.
+    pub const LEN: usize = 64;
+
+    /// Returns the number of bytes for a serialized signature representation.
+    pub const fn len() -> usize {
+        Self::LEN
+    }
+
+    /// Creates a `starknet` signature from the given [`starknet_crypto::Signature`].
+    pub(crate) fn new(signature: starknet_crypto::Signature) -> Signature {
+        Signature { signature }
+    }
+
+    /// Returns a reference to the inner [`starknet_crypto::Signature`].
+    pub(crate) fn inner(&self) -> &starknet_crypto::Signature {
+        &self.signature
+    }
+
+    /// Returns an r-coordinate as 32 byte array.
+    pub fn r(&self) -> H256 {
+        H256::from(self.signature.r.to_bytes_be())
+    }
+
+    /// Returns an s-value as 32 byte array.
+    pub fn s(&self) -> H256 {
+        H256::from(self.signature.s.to_bytes_be())
+    }
+}
+
+impl ToBytesVec for Signature {
+    fn to_vec(&self) -> Vec<u8> {
+        let mut to_return = Vec::with_capacity(Signature::len());
+        to_return.extend_from_slice(self.r().as_slice());
+        to_return.extend_from_slice(self.s().as_slice());
+        to_return
+    }
+}
+
+impl<'a> TryFrom<&'a [u8]> for Signature {
+    type Error = KeyPairError;
+
+    fn try_from(bytes: &'a [u8]) -> Result<Self, Self::Error> {
+        if bytes.len() != Signature::len() {
+            return Err(KeyPairError::InvalidSignature);
+        }
+
+        let r_bytes = H256::try_from(&bytes[R_RANGE]).expect("Expected a valid r range");
+        let s_bytes = H256::try_from(&bytes[S_RANGE]).expect("Expected a valid s range");
+
+        let r = FieldElement::from_bytes_be(&r_bytes.take())
+            .map_err(|_| KeyPairError::InvalidSignature)?;
+        let s = FieldElement::from_bytes_be(&s_bytes.take())
+            .map_err(|_| KeyPairError::InvalidSignature)?;
+
+        Ok(Signature {
+            signature: starknet_crypto::Signature { r, s },
+        })
+    }
+}
diff --git a/rust/tw_keypair/src/test_utils/mod.rs b/rust/tw_keypair/src/test_utils/mod.rs
new file mode 100644
index 00000000000..65c4f86c7fa
--- /dev/null
+++ b/rust/tw_keypair/src/test_utils/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod tw_crypto_box_helpers;
+pub mod tw_private_key_helper;
+pub mod tw_public_key_helper;
diff --git a/rust/tw_keypair/src/test_utils/tw_crypto_box_helpers.rs b/rust/tw_keypair/src/test_utils/tw_crypto_box_helpers.rs
new file mode 100644
index 00000000000..88b4a146003
--- /dev/null
+++ b/rust/tw_keypair/src/test_utils/tw_crypto_box_helpers.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::crypto_box::public_key::{tw_crypto_box_public_key_delete, TWCryptoBoxPublicKey};
+use crate::ffi::crypto_box::secret_key::{tw_crypto_box_secret_key_delete, TWCryptoBoxSecretKey};
+use tw_memory::test_utils::tw_wrapper::{TWWrapper, WithDestructor};
+
+pub type TWCryptoBoxSecretKeyHelper = TWWrapper<TWCryptoBoxSecretKey>;
+pub type TWCryptoBoxPublicKeyHelper = TWWrapper<TWCryptoBoxPublicKey>;
+
+impl WithDestructor for TWCryptoBoxSecretKey {
+    fn destructor() -> unsafe extern "C" fn(*mut Self) {
+        tw_crypto_box_secret_key_delete
+    }
+}
+
+impl WithDestructor for TWCryptoBoxPublicKey {
+    fn destructor() -> unsafe extern "C" fn(*mut Self) {
+        tw_crypto_box_public_key_delete
+    }
+}
diff --git a/rust/tw_keypair/src/test_utils/tw_private_key_helper.rs b/rust/tw_keypair/src/test_utils/tw_private_key_helper.rs
new file mode 100644
index 00000000000..6c3c3bfc629
--- /dev/null
+++ b/rust/tw_keypair/src/test_utils/tw_private_key_helper.rs
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::privkey::{tw_private_key_create_with_data, tw_private_key_delete, TWPrivateKey};
+use tw_encoding::hex;
+use tw_memory::ffi::c_byte_array::CByteArray;
+use tw_memory::Data;
+
+pub struct TWPrivateKeyHelper {
+    ptr: *mut TWPrivateKey,
+}
+
+impl TWPrivateKeyHelper {
+    pub fn with_bytes<T: Into<Data>>(bytes: T) -> TWPrivateKeyHelper {
+        let priv_key_raw = CByteArray::from(bytes.into());
+        let ptr =
+            unsafe { tw_private_key_create_with_data(priv_key_raw.data(), priv_key_raw.size()) };
+        TWPrivateKeyHelper { ptr }
+    }
+
+    pub fn with_hex(hex: &str) -> TWPrivateKeyHelper {
+        let priv_key_data = hex::decode(hex).unwrap();
+        TWPrivateKeyHelper::with_bytes(priv_key_data)
+    }
+
+    pub fn ptr(&self) -> *mut TWPrivateKey {
+        self.ptr
+    }
+
+    pub fn is_null(&self) -> bool {
+        self.ptr.is_null()
+    }
+}
+
+impl Drop for TWPrivateKeyHelper {
+    fn drop(&mut self) {
+        if self.ptr.is_null() {
+            return;
+        }
+        unsafe { tw_private_key_delete(self.ptr) };
+    }
+}
diff --git a/rust/tw_keypair/src/test_utils/tw_public_key_helper.rs b/rust/tw_keypair/src/test_utils/tw_public_key_helper.rs
new file mode 100644
index 00000000000..fdc7450642a
--- /dev/null
+++ b/rust/tw_keypair/src/test_utils/tw_public_key_helper.rs
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::pubkey::{tw_public_key_create_with_data, tw_public_key_delete, TWPublicKey};
+use crate::tw::PublicKeyType;
+use tw_encoding::hex;
+use tw_memory::ffi::c_byte_array::CByteArray;
+use tw_memory::Data;
+
+pub struct TWPublicKeyHelper {
+    ptr: *mut TWPublicKey,
+}
+
+impl TWPublicKeyHelper {
+    pub fn with_bytes<T: Into<Data>>(bytes: T, ty: PublicKeyType) -> TWPublicKeyHelper {
+        let public_key_raw = CByteArray::from(bytes.into());
+        let ptr = unsafe {
+            tw_public_key_create_with_data(public_key_raw.data(), public_key_raw.size(), ty as u32)
+        };
+        TWPublicKeyHelper { ptr }
+    }
+
+    pub fn with_hex(hex: &str, ty: PublicKeyType) -> TWPublicKeyHelper {
+        let priv_key_data = hex::decode(hex).unwrap();
+        TWPublicKeyHelper::with_bytes(priv_key_data, ty)
+    }
+
+    pub fn wrap(ptr: *mut TWPublicKey) -> TWPublicKeyHelper {
+        TWPublicKeyHelper { ptr }
+    }
+
+    pub fn ptr(&self) -> *mut TWPublicKey {
+        self.ptr
+    }
+
+    pub fn is_null(&self) -> bool {
+        self.ptr.is_null()
+    }
+}
+
+impl Drop for TWPublicKeyHelper {
+    fn drop(&mut self) {
+        if self.ptr.is_null() {
+            return;
+        }
+        unsafe { tw_public_key_delete(self.ptr) };
+    }
+}
diff --git a/rust/tw_keypair/src/traits.rs b/rust/tw_keypair/src/traits.rs
new file mode 100644
index 00000000000..5ac9e30c773
--- /dev/null
+++ b/rust/tw_keypair/src/traits.rs
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::KeyPairResult;
+use tw_misc::traits::{FromSlice, ToBytesVec, ToBytesZeroizing};
+
+pub trait KeyPairTrait: FromSlice + SigningKeyTrait + VerifyingKeyTrait {
+    type Private: FromSlice + ToBytesZeroizing;
+    type Public: FromSlice + ToBytesVec;
+
+    /// Returns the reference to the public key.
+    fn public(&self) -> &Self::Public;
+
+    /// Returns the reference to the private key.
+    fn private(&self) -> &Self::Private;
+}
+
+pub trait SigningKeyTrait {
+    type SigningMessage: FromSlice;
+    type Signature: ToBytesVec;
+
+    /// Signs the given `hash` using the private key.
+    fn sign(&self, message: Self::SigningMessage) -> KeyPairResult<Self::Signature>;
+}
+
+pub trait VerifyingKeyTrait {
+    type SigningMessage: FromSlice;
+    type VerifySignature: FromSlice;
+
+    /// Verifies if the given `hash` was signed using the private key.
+    fn verify(&self, signature: Self::VerifySignature, message: Self::SigningMessage) -> bool;
+}
diff --git a/rust/tw_keypair/src/tw/mod.rs b/rust/tw_keypair/src/tw/mod.rs
new file mode 100644
index 00000000000..3e590dd0ed2
--- /dev/null
+++ b/rust/tw_keypair/src/tw/mod.rs
@@ -0,0 +1,137 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+
+mod private;
+mod public;
+
+pub use private::PrivateKey;
+pub use public::PublicKey;
+
+pub type Signature = Vec<u8>;
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, PartialEq)]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+pub enum Curve {
+    Secp256k1 = 0,
+    Ed25519 = 1,
+    Ed25519Blake2bNano = 2,
+    /// Waves blockchain specific `curve25519`.
+    Curve25519Waves = 3,
+    Nist256p1 = 4,
+    /// Cardano blockchain specific `ed25519` extended key.
+    Ed25519ExtendedCardano = 5,
+    Starkex = 6,
+    Schnorr = 7,
+}
+
+impl Curve {
+    /// Returns `None` if the given curve is not supported in Rust yet.
+    pub fn from_raw(curve: u32) -> Option<Curve> {
+        match curve {
+            0 => Some(Curve::Secp256k1),
+            1 => Some(Curve::Ed25519),
+            2 => Some(Curve::Ed25519Blake2bNano),
+            3 => Some(Curve::Curve25519Waves),
+            4 => Some(Curve::Nist256p1),
+            5 => Some(Curve::Ed25519ExtendedCardano),
+            6 => Some(Curve::Starkex),
+            7 => Some(Curve::Schnorr),
+            _ => None,
+        }
+    }
+}
+
+#[repr(C)]
+#[derive(Clone, Copy, Debug, Deserialize, PartialEq)]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+#[non_exhaustive]
+pub enum PublicKeyType {
+    #[serde(rename = "secp256k1")]
+    Secp256k1 = 0,
+    #[serde(rename = "secp256k1Extended")]
+    Secp256k1Extended = 1,
+    #[serde(rename = "nist256p1")]
+    Nist256p1 = 2,
+    #[serde(rename = "nist256p1Extended")]
+    Nist256p1Extended = 3,
+    #[serde(rename = "ed25519")]
+    Ed25519 = 4,
+    #[serde(rename = "ed25519Blake2b")]
+    Ed25519Blake2b = 5,
+    /// Waves blockchain specific public key.
+    #[serde(rename = "curve25519")]
+    Curve25519Waves = 6,
+    /// Cardano blockchain specific extended public key.
+    #[serde(rename = "ed25519Cardano")]
+    Ed25519ExtendedCardano = 7,
+    #[serde(rename = "starkex")]
+    Starkex = 8,
+    #[serde(rename = "schnorr")]
+    Schnorr = 9,
+}
+
+impl PublicKeyType {
+    /// Returns `None` if the given pubkey type is not supported in Rust yet.
+    pub fn from_raw(ty: u32) -> Option<PublicKeyType> {
+        match ty {
+            0 => Some(PublicKeyType::Secp256k1),
+            1 => Some(PublicKeyType::Secp256k1Extended),
+            2 => Some(PublicKeyType::Nist256p1),
+            3 => Some(PublicKeyType::Nist256p1Extended),
+            4 => Some(PublicKeyType::Ed25519),
+            5 => Some(PublicKeyType::Ed25519Blake2b),
+            6 => Some(PublicKeyType::Curve25519Waves),
+            7 => Some(PublicKeyType::Ed25519ExtendedCardano),
+            8 => Some(PublicKeyType::Starkex),
+            9 => Some(PublicKeyType::Schnorr),
+            _ => None,
+        }
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_curve_from_raw() {
+        let tests = [
+            (0, Some(Curve::Secp256k1)),
+            (1, Some(Curve::Ed25519)),
+            (2, Some(Curve::Ed25519Blake2bNano)),
+            (3, Some(Curve::Curve25519Waves)),
+            (4, Some(Curve::Nist256p1)),
+            (5, Some(Curve::Ed25519ExtendedCardano)),
+            (6, Some(Curve::Starkex)),
+            (7, Some(Curve::Schnorr)),
+            (8, None),
+        ];
+        for (raw, expected) in tests {
+            assert_eq!(Curve::from_raw(raw), expected);
+        }
+    }
+
+    #[test]
+    fn test_public_key_type_from_raw() {
+        let tests = [
+            (0, Some(PublicKeyType::Secp256k1)),
+            (1, Some(PublicKeyType::Secp256k1Extended)),
+            (2, Some(PublicKeyType::Nist256p1)),
+            (3, Some(PublicKeyType::Nist256p1Extended)),
+            (4, Some(PublicKeyType::Ed25519)),
+            (5, Some(PublicKeyType::Ed25519Blake2b)),
+            (6, Some(PublicKeyType::Curve25519Waves)),
+            (7, Some(PublicKeyType::Ed25519ExtendedCardano)),
+            (8, Some(PublicKeyType::Starkex)),
+            (9, Some(PublicKeyType::Schnorr)),
+            (10, None),
+        ];
+        for (raw, expected) in tests {
+            assert_eq!(PublicKeyType::from_raw(raw), expected);
+        }
+    }
+}
diff --git a/rust/tw_keypair/src/tw/private.rs b/rust/tw_keypair/src/tw/private.rs
new file mode 100644
index 00000000000..0516f451798
--- /dev/null
+++ b/rust/tw_keypair/src/tw/private.rs
@@ -0,0 +1,205 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::{nist256p1, secp256k1};
+use crate::schnorr;
+use crate::traits::SigningKeyTrait;
+use crate::tw::{Curve, PublicKey, PublicKeyType};
+use crate::{ed25519, starkex, KeyPairError, KeyPairResult};
+use std::ops::Range;
+use tw_hash::H256;
+use tw_misc::traits::ToBytesVec;
+use zeroize::ZeroizeOnDrop;
+
+/// Represents a private key that can be used to sign messages with different elliptic curves.
+///
+/// TODO add `secp256k1: Once<each_curve::PrivateKey>` for each curve.
+#[derive(ZeroizeOnDrop)]
+pub struct PrivateKey {
+    bytes: Vec<u8>,
+}
+
+/// cbindgen:ignore
+impl PrivateKey {
+    /// The number of bytes in a private key.
+    const SIZE: usize = 32;
+    const CARDANO_SIZE: usize = ed25519::cardano::ExtendedPrivateKey::LEN;
+
+    const KEY_RANGE: Range<usize> = 0..Self::SIZE;
+    const EXTENDED_CARDANO_RANGE: Range<usize> = 0..Self::CARDANO_SIZE;
+
+    /// Validates the given `bytes` secret and creates a private key.
+    pub fn new(bytes: Vec<u8>) -> KeyPairResult<PrivateKey> {
+        if !Self::is_valid_general(&bytes) {
+            return Err(KeyPairError::InvalidSecretKey);
+        }
+        Ok(PrivateKey { bytes })
+    }
+
+    /// Returns the 32 byte array - the essential private key data.
+    pub fn key(&self) -> H256 {
+        assert!(
+            self.bytes.len() >= Self::SIZE,
+            "'PrivateKey::bytes' has an unexpected length"
+        );
+        H256::try_from(&self.bytes[Self::KEY_RANGE])
+            .expect("H256 and KEY_RANGE must be 32 byte length")
+    }
+
+    /// Returns the 192 byte array - the essential cardano extended private key data.
+    pub fn extended_cardano_key(&self) -> KeyPairResult<&[u8]> {
+        if self.bytes.len() != Self::CARDANO_SIZE {
+            return Err(KeyPairError::InvalidSecretKey);
+        }
+        Ok(&self.bytes[Self::EXTENDED_CARDANO_RANGE])
+    }
+
+    /// Checks if the given `bytes` secret is valid in general (without a concrete curve).
+    pub fn is_valid_general(bytes: &[u8]) -> bool {
+        if bytes.len() != Self::SIZE && bytes.len() != Self::CARDANO_SIZE {
+            return false;
+        }
+        // Check for zero address.
+        !bytes.iter().all(|byte| *byte == 0)
+    }
+
+    /// Checks if the given `bytes` secret is valid.
+    pub fn is_valid(bytes: &[u8], curve: Curve) -> bool {
+        if !Self::is_valid_general(bytes) {
+            return false;
+        }
+        match curve {
+            Curve::Secp256k1 => secp256k1::PrivateKey::try_from(&bytes[Self::KEY_RANGE]).is_ok(),
+            Curve::Ed25519 => {
+                ed25519::sha512::PrivateKey::try_from(&bytes[Self::KEY_RANGE]).is_ok()
+            },
+            Curve::Ed25519Blake2bNano => {
+                ed25519::blake2b::PrivateKey::try_from(&bytes[Self::KEY_RANGE]).is_ok()
+            },
+            Curve::Curve25519Waves => {
+                ed25519::waves::PrivateKey::try_from(&bytes[Self::KEY_RANGE]).is_ok()
+            },
+            Curve::Nist256p1 => nist256p1::PrivateKey::try_from(&bytes[Self::KEY_RANGE]).is_ok(),
+            Curve::Ed25519ExtendedCardano => {
+                ed25519::cardano::ExtendedPrivateKey::try_from(&bytes[Self::EXTENDED_CARDANO_RANGE])
+                    .is_ok()
+            },
+            Curve::Starkex => starkex::PrivateKey::try_from(&bytes[Self::KEY_RANGE]).is_ok(),
+            Curve::Schnorr => schnorr::PrivateKey::try_from(&bytes[Self::KEY_RANGE]).is_ok(),
+        }
+    }
+
+    /// Signs a `message` with using the given elliptic curve.
+    pub fn sign(&self, message: &[u8], curve: Curve) -> KeyPairResult<Vec<u8>> {
+        fn sign_impl<Key>(signing_key: Key, message: &[u8]) -> KeyPairResult<Vec<u8>>
+        where
+            Key: SigningKeyTrait,
+        {
+            let hash_to_sign = <Key as SigningKeyTrait>::SigningMessage::try_from(message)
+                .map_err(|_| KeyPairError::InvalidSignMessage)?;
+            signing_key.sign(hash_to_sign).map(|sig| sig.to_vec())
+        }
+
+        match curve {
+            Curve::Secp256k1 => sign_impl(self.to_secp256k1_privkey()?, message),
+            Curve::Ed25519 => sign_impl(self.to_ed25519()?, message),
+            Curve::Ed25519Blake2bNano => sign_impl(self.to_ed25519_blake2b()?, message),
+            Curve::Curve25519Waves => sign_impl(self.to_curve25519_waves()?, message),
+            Curve::Nist256p1 => sign_impl(self.to_nist256p1_privkey()?, message),
+            Curve::Ed25519ExtendedCardano => {
+                sign_impl(self.to_ed25519_extended_cardano()?, message)
+            },
+            Curve::Starkex => sign_impl(self.to_starkex_privkey()?, message),
+            Curve::Schnorr => sign_impl(self.to_schnorr_privkey()?, message),
+        }
+    }
+
+    /// Returns the public key associated with the `self` private key and `ty` public key type.
+    pub fn get_public_key_by_type(&self, ty: PublicKeyType) -> KeyPairResult<PublicKey> {
+        match ty {
+            PublicKeyType::Secp256k1 => {
+                let privkey = self.to_secp256k1_privkey()?;
+                Ok(PublicKey::Secp256k1(privkey.public()))
+            },
+            PublicKeyType::Secp256k1Extended => {
+                let privkey = self.to_secp256k1_privkey()?;
+                Ok(PublicKey::Secp256k1Extended(privkey.public()))
+            },
+            PublicKeyType::Nist256p1 => {
+                let privkey = self.to_nist256p1_privkey()?;
+                Ok(PublicKey::Nist256p1(privkey.public()))
+            },
+            PublicKeyType::Nist256p1Extended => {
+                let privkey = self.to_nist256p1_privkey()?;
+                Ok(PublicKey::Nist256p1Extended(privkey.public()))
+            },
+            PublicKeyType::Ed25519 => {
+                let privkey = self.to_ed25519()?;
+                Ok(PublicKey::Ed25519(privkey.public()))
+            },
+            PublicKeyType::Ed25519Blake2b => {
+                let privkey = self.to_ed25519_blake2b()?;
+                Ok(PublicKey::Ed25519Blake2b(privkey.public()))
+            },
+            PublicKeyType::Curve25519Waves => {
+                let privkey = self.to_curve25519_waves()?;
+                Ok(PublicKey::Curve25519Waves(privkey.public()))
+            },
+            PublicKeyType::Ed25519ExtendedCardano => {
+                let privkey = self.to_ed25519_extended_cardano()?;
+                Ok(PublicKey::Ed25519ExtendedCardano(Box::new(
+                    privkey.public(),
+                )))
+            },
+            PublicKeyType::Starkex => {
+                let privkey = self.to_starkex_privkey()?;
+                Ok(PublicKey::Starkex(privkey.public()))
+            },
+            PublicKeyType::Schnorr => {
+                let privkey = self.to_schnorr_privkey()?;
+                Ok(PublicKey::Schnorr(privkey.public()))
+            },
+        }
+    }
+
+    /// Tries to convert [`PrivateKey::key`] to [`secp256k1::PrivateKey`].
+    fn to_secp256k1_privkey(&self) -> KeyPairResult<secp256k1::PrivateKey> {
+        secp256k1::PrivateKey::try_from(self.key().as_slice())
+    }
+
+    /// Tries to convert [`PrivateKey::key`] to [`nist256p1::PrivateKey`].
+    fn to_nist256p1_privkey(&self) -> KeyPairResult<nist256p1::PrivateKey> {
+        nist256p1::PrivateKey::try_from(self.key().as_slice())
+    }
+
+    /// Tries to convert [`PrivateKey::key`] to [`ed25519::sha512::PrivateKey`].
+    fn to_ed25519(&self) -> KeyPairResult<ed25519::sha512::PrivateKey> {
+        ed25519::sha512::PrivateKey::try_from(self.key().as_slice())
+    }
+
+    /// Tries to convert [`PrivateKey::key`] to [`ed25519::blake2b::PrivateKey`].
+    fn to_ed25519_blake2b(&self) -> KeyPairResult<ed25519::blake2b::PrivateKey> {
+        ed25519::blake2b::PrivateKey::try_from(self.key().as_slice())
+    }
+
+    /// Tries to convert [`PrivateKey::key`] to [`ed25519::waves::PrivateKey`].
+    fn to_curve25519_waves(&self) -> KeyPairResult<ed25519::waves::PrivateKey> {
+        ed25519::waves::PrivateKey::try_from(self.key().as_slice())
+    }
+
+    /// Tries to convert [`PrivateKey::extended_cardano_key`] to [`ed25519::cardano::ExtendedPrivateKey`].
+    fn to_ed25519_extended_cardano(&self) -> KeyPairResult<ed25519::cardano::ExtendedPrivateKey> {
+        ed25519::cardano::ExtendedPrivateKey::try_from(self.extended_cardano_key()?)
+    }
+
+    /// Tries to convert [`PrivateKey::key`] to [`starkex::PrivateKey`].
+    fn to_starkex_privkey(&self) -> KeyPairResult<starkex::PrivateKey> {
+        starkex::PrivateKey::try_from(self.key().as_slice())
+    }
+
+    /// Tries to convert [`PrivateKey::key`] to [`schnorr::PrivateKey`].
+    fn to_schnorr_privkey(&self) -> KeyPairResult<schnorr::PrivateKey> {
+        schnorr::PrivateKey::try_from(self.key().as_slice())
+    }
+}
diff --git a/rust/tw_keypair/src/tw/public.rs b/rust/tw_keypair/src/tw/public.rs
new file mode 100644
index 00000000000..2ab54f8820a
--- /dev/null
+++ b/rust/tw_keypair/src/tw/public.rs
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ecdsa::{nist256p1, secp256k1};
+use crate::schnorr;
+use crate::traits::VerifyingKeyTrait;
+use crate::tw::PublicKeyType;
+use crate::{ed25519, starkex, KeyPairError, KeyPairResult};
+use tw_misc::traits::ToBytesVec;
+use tw_misc::try_or_false;
+
+/// Represents a public key that can be used to verify signatures and messages.
+#[derive(Clone)]
+#[non_exhaustive]
+pub enum PublicKey {
+    Secp256k1(secp256k1::PublicKey),
+    Secp256k1Extended(secp256k1::PublicKey),
+    Nist256p1(nist256p1::PublicKey),
+    Nist256p1Extended(nist256p1::PublicKey),
+    Ed25519(ed25519::sha512::PublicKey),
+    Ed25519Blake2b(ed25519::blake2b::PublicKey),
+    Curve25519Waves(ed25519::waves::PublicKey),
+    Ed25519ExtendedCardano(Box<ed25519::cardano::ExtendedPublicKey>),
+    Starkex(starkex::PublicKey),
+    Schnorr(schnorr::PublicKey),
+}
+
+impl PublicKey {
+    /// Validates the given `bytes` using the `ty` public key type and creates a public key from it.
+    pub fn new(bytes: Vec<u8>, ty: PublicKeyType) -> KeyPairResult<PublicKey> {
+        match ty {
+            PublicKeyType::Secp256k1 if secp256k1::PublicKey::COMPRESSED == bytes.len() => {
+                let pubkey = secp256k1::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Secp256k1(pubkey))
+            },
+            PublicKeyType::Secp256k1Extended
+                if secp256k1::PublicKey::UNCOMPRESSED == bytes.len() =>
+            {
+                let pubkey = secp256k1::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Secp256k1Extended(pubkey))
+            },
+            PublicKeyType::Nist256p1 if nist256p1::PublicKey::COMPRESSED == bytes.len() => {
+                let pubkey = nist256p1::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Nist256p1(pubkey))
+            },
+            PublicKeyType::Nist256p1Extended
+                if nist256p1::PublicKey::UNCOMPRESSED == bytes.len() =>
+            {
+                let pubkey = nist256p1::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Nist256p1Extended(pubkey))
+            },
+            PublicKeyType::Ed25519 if ed25519::sha512::PublicKey::LEN == bytes.len() => {
+                let pubkey = ed25519::sha512::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Ed25519(pubkey))
+            },
+            PublicKeyType::Ed25519Blake2b if ed25519::blake2b::PublicKey::LEN == bytes.len() => {
+                let pubkey = ed25519::blake2b::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Ed25519Blake2b(pubkey))
+            },
+            PublicKeyType::Curve25519Waves if ed25519::waves::PublicKey::LEN == bytes.len() => {
+                let pubkey = ed25519::waves::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Curve25519Waves(pubkey))
+            },
+            PublicKeyType::Ed25519ExtendedCardano
+                if ed25519::cardano::ExtendedPublicKey::LEN == bytes.len() =>
+            {
+                let pubkey = ed25519::cardano::ExtendedPublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Ed25519ExtendedCardano(Box::new(pubkey)))
+            },
+            PublicKeyType::Starkex => {
+                let pubkey = starkex::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Starkex(pubkey))
+            },
+            PublicKeyType::Schnorr => {
+                let pubkey = schnorr::PublicKey::try_from(bytes.as_slice())?;
+                Ok(PublicKey::Schnorr(pubkey))
+            },
+            _ => Err(KeyPairError::InvalidPublicKey),
+        }
+    }
+
+    /// Checks if the given `bytes` is valid using `ty` public key type.
+    pub fn is_valid(bytes: Vec<u8>, ty: PublicKeyType) -> bool {
+        PublicKey::new(bytes, ty).is_ok()
+    }
+
+    /// Verifies if the given `message` was signed using a private key associated with the public key.
+    pub fn verify(&self, sig: &[u8], message: &[u8]) -> bool {
+        fn verify_impl<Key>(verifying_key: &Key, sig: &[u8], message: &[u8]) -> bool
+        where
+            Key: VerifyingKeyTrait,
+        {
+            let verify_sig =
+                try_or_false!(<Key as VerifyingKeyTrait>::VerifySignature::try_from(sig));
+            let message = try_or_false!(<Key as VerifyingKeyTrait>::SigningMessage::try_from(
+                message
+            ));
+            verifying_key.verify(verify_sig, message)
+        }
+
+        match self {
+            PublicKey::Secp256k1(secp) | PublicKey::Secp256k1Extended(secp) => {
+                verify_impl(secp, sig, message)
+            },
+            PublicKey::Nist256p1(nist) | PublicKey::Nist256p1Extended(nist) => {
+                verify_impl(nist, sig, message)
+            },
+            PublicKey::Ed25519(ed) => verify_impl(ed, sig, message),
+            PublicKey::Ed25519Blake2b(blake) => verify_impl(blake, sig, message),
+            PublicKey::Curve25519Waves(waves) => verify_impl(waves, sig, message),
+            PublicKey::Ed25519ExtendedCardano(cardano) => {
+                verify_impl(cardano.as_ref(), sig, message)
+            },
+            PublicKey::Starkex(stark) => verify_impl(stark, sig, message),
+            PublicKey::Schnorr(schnorr) => verify_impl(schnorr, sig, message),
+        }
+    }
+
+    /// Returns the raw data of the public key.
+    pub fn to_bytes(&self) -> Vec<u8> {
+        match self {
+            PublicKey::Secp256k1(secp) => secp.compressed().into_vec(),
+            PublicKey::Secp256k1Extended(secp) => secp.uncompressed().into_vec(),
+            PublicKey::Nist256p1(nist) => nist.compressed().into_vec(),
+            PublicKey::Nist256p1Extended(nist) => nist.uncompressed().into_vec(),
+            PublicKey::Ed25519(ed) => ed.to_vec(),
+            PublicKey::Ed25519Blake2b(blake) => blake.to_vec(),
+            PublicKey::Curve25519Waves(waves) => waves.to_vec(),
+            PublicKey::Ed25519ExtendedCardano(cardano) => cardano.to_vec(),
+            PublicKey::Starkex(stark) => stark.to_vec(),
+            PublicKey::Schnorr(schnorr) => schnorr.to_vec(),
+        }
+    }
+
+    /// Returns a `secp256k1` public key if the key type is matched.
+    pub fn to_secp256k1(&self) -> Option<&secp256k1::PublicKey> {
+        match self {
+            PublicKey::Secp256k1(secp256k1) | PublicKey::Secp256k1Extended(secp256k1) => {
+                Some(secp256k1)
+            },
+            _ => None,
+        }
+    }
+
+    pub fn to_ed25519(&self) -> Option<&ed25519::sha512::PublicKey> {
+        match self {
+            PublicKey::Ed25519(ed25519) => Some(ed25519),
+            _ => None,
+        }
+    }
+
+    /// Returns a `schnorr` public key if the key type is matched.
+    pub fn to_schnorr(&self) -> Option<&schnorr::PublicKey> {
+        match self {
+            PublicKey::Schnorr(ref schnorr) => Some(schnorr),
+            _ => None,
+        }
+    }
+
+    /// Returns a public key type.
+    pub fn public_key_type(&self) -> PublicKeyType {
+        match self {
+            PublicKey::Secp256k1(_) => PublicKeyType::Secp256k1,
+            PublicKey::Secp256k1Extended(_) => PublicKeyType::Secp256k1Extended,
+            PublicKey::Nist256p1(_) => PublicKeyType::Nist256p1,
+            PublicKey::Nist256p1Extended(_) => PublicKeyType::Nist256p1Extended,
+            PublicKey::Ed25519(_) => PublicKeyType::Ed25519,
+            PublicKey::Ed25519Blake2b(_) => PublicKeyType::Ed25519Blake2b,
+            PublicKey::Curve25519Waves(_) => PublicKeyType::Curve25519Waves,
+            PublicKey::Ed25519ExtendedCardano(_) => PublicKeyType::Ed25519ExtendedCardano,
+            PublicKey::Starkex(_) => PublicKeyType::Starkex,
+            PublicKey::Schnorr(_) => PublicKeyType::Schnorr,
+        }
+    }
+}
diff --git a/rust/tw_keypair/tests/asn_parser_ffi_tests.rs b/rust/tw_keypair/tests/asn_parser_ffi_tests.rs
new file mode 100644
index 00000000000..dbe7586ef6e
--- /dev/null
+++ b/rust/tw_keypair/tests/asn_parser_ffi_tests.rs
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::hex;
+use tw_keypair::ffi::asn::ecdsa_signature_from_asn_der;
+use tw_memory::ffi::c_byte_array::CByteArray;
+
+#[test]
+fn test_ecdsa_signature_from_asn_der() {
+    let encoded = "3046022100db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495da022100ff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1";
+    let expected = "db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495daff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1";
+
+    let encoded = CByteArray::from(hex::decode(encoded).unwrap());
+    let actual = unsafe {
+        ecdsa_signature_from_asn_der(encoded.data(), encoded.size())
+            .unwrap()
+            .into_vec()
+    };
+
+    assert_eq!(actual, hex::decode(expected).unwrap());
+}
+
+#[test]
+fn test_ecdsa_signature_from_asn_der_invalid() {
+    let encoded = "3000022100db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495da022100ff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1";
+    let encoded = CByteArray::from(hex::decode(encoded).unwrap());
+    let res = unsafe { ecdsa_signature_from_asn_der(encoded.data(), encoded.size()) };
+    assert!(res.is_err());
+}
diff --git a/rust/tw_keypair/tests/crypto_box_ffi_tests.rs b/rust/tw_keypair/tests/crypto_box_ffi_tests.rs
new file mode 100644
index 00000000000..bf98b67b07e
--- /dev/null
+++ b/rust/tw_keypair/tests/crypto_box_ffi_tests.rs
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::ffi::crypto_box::public_key::{
+    tw_crypto_box_public_key_create_with_data, tw_crypto_box_public_key_data,
+    tw_crypto_box_public_key_is_valid,
+};
+use tw_keypair::ffi::crypto_box::secret_key::{
+    tw_crypto_box_secret_key_create, tw_crypto_box_secret_key_create_with_data,
+    tw_crypto_box_secret_key_data, tw_crypto_box_secret_key_get_public_key,
+    tw_crypto_box_secret_key_is_valid,
+};
+use tw_keypair::ffi::crypto_box::{tw_crypto_box_decrypt_easy, tw_crypto_box_encrypt_easy};
+use tw_keypair::test_utils::tw_crypto_box_helpers::{
+    TWCryptoBoxPublicKeyHelper, TWCryptoBoxSecretKeyHelper,
+};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_wrapper::TWWrapper;
+
+fn random_key_pair() -> (TWCryptoBoxSecretKeyHelper, TWCryptoBoxPublicKeyHelper) {
+    let secret = TWWrapper::wrap(unsafe { tw_crypto_box_secret_key_create() });
+    let pubkey = TWWrapper::wrap(unsafe { tw_crypto_box_secret_key_get_public_key(secret.ptr()) });
+    (secret, pubkey)
+}
+
+#[test]
+fn test_encrypt_decrypt_easy() {
+    let message = b"Well done is better than well said. -Benjamin Franklin";
+
+    let (my_secret, my_pubkey) = random_key_pair();
+    let (other_secret, other_pubkey) = random_key_pair();
+
+    let message_data = TWDataHelper::create(message.to_vec());
+
+    let encrypted = TWDataHelper::wrap(unsafe {
+        tw_crypto_box_encrypt_easy(my_secret.ptr(), other_pubkey.ptr(), message_data.ptr())
+    });
+
+    // Step 2. Make sure the Box can be decrypted by the other side.
+    let decrypted = TWDataHelper::wrap(unsafe {
+        tw_crypto_box_decrypt_easy(other_secret.ptr(), my_pubkey.ptr(), encrypted.ptr())
+    });
+
+    assert_eq!(decrypted.to_vec().unwrap(), message);
+}
+
+#[test]
+fn test_encrypt_decrypt_easy_error() {
+    let (my_secret, _my_pubkey) = random_key_pair();
+
+    let other_pubkey_data = TWDataHelper::create(
+        "afccabc5b28a8a1fd1cd880516f9c854ae2498d0d1b978b53a59f38e4ae55747"
+            .decode_hex()
+            .unwrap(),
+    );
+    let other_pubkey = TWWrapper::wrap(unsafe {
+        tw_crypto_box_public_key_create_with_data(other_pubkey_data.ptr())
+    });
+
+    // The given encrypted box cannot be decrypted by using `my_secret` and `other_pubkey`.
+    let invalid_encrypted = "7a7b9c8fee6e3c597512848c7d513e7131193cdfd410ff6611522fdeea99d7160873182019d7a18502f22c5e3644d26a2b669365".decode_hex().unwrap();
+    let invalid_encrypted_data = TWDataHelper::create(invalid_encrypted);
+
+    let decrypted = TWDataHelper::wrap(unsafe {
+        tw_crypto_box_decrypt_easy(
+            my_secret.ptr(),
+            other_pubkey.ptr(),
+            invalid_encrypted_data.ptr(),
+        )
+    });
+
+    assert!(decrypted.is_null());
+}
+
+#[test]
+fn test_public_key() {
+    let pubkey_bytes = "afccabc5b28a8a1fd1cd880516f9c854ae2498d0d1b978b53a59f38e4ae55747"
+        .decode_hex()
+        .unwrap();
+
+    let pubkey_data = TWDataHelper::create(pubkey_bytes.clone());
+    assert!(unsafe { tw_crypto_box_public_key_is_valid(pubkey_data.ptr()) });
+
+    let pubkey =
+        TWWrapper::wrap(unsafe { tw_crypto_box_public_key_create_with_data(pubkey_data.ptr()) });
+    let actual_data = TWDataHelper::wrap(unsafe { tw_crypto_box_public_key_data(pubkey.ptr()) });
+    assert_eq!(actual_data.to_vec().unwrap(), pubkey_bytes);
+}
+
+#[test]
+fn test_secret_key() {
+    let secret_bytes = "dd87000d4805d6fbd89ae1352f5e4445648b79d5e901c92aebcb610e9be468e4"
+        .decode_hex()
+        .unwrap();
+
+    let secret_data = TWDataHelper::create(secret_bytes.clone());
+    assert!(unsafe { tw_crypto_box_secret_key_is_valid(secret_data.ptr()) });
+
+    let pubkey =
+        TWWrapper::wrap(unsafe { tw_crypto_box_secret_key_create_with_data(secret_data.ptr()) });
+    let actual_data = TWDataHelper::wrap(unsafe { tw_crypto_box_secret_key_data(pubkey.ptr()) });
+    assert_eq!(actual_data.to_vec().unwrap(), secret_bytes);
+}
diff --git a/rust/tw_keypair/tests/ed25519_blake2b_sign.json b/rust/tw_keypair/tests/ed25519_blake2b_sign.json
new file mode 100644
index 00000000000..f8bed662a02
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_blake2b_sign.json
@@ -0,0 +1,1002 @@
+[
+  {
+    "msg": "",
+    "secret": "fda53a4f1f7f8361e79499b9c4614afb0810d609c9a379f6140e238623ad8d40",
+    "signature": "aba55cd80c67a7cbdb2a02872513bb6c17a3c1cf17c9ea6711a30dff872cc71a63ae40aea20a6823505187aec5f7a7c4c353da11bb7f0efd363453b907cd0d0e"
+  },
+  {
+    "msg": "dd",
+    "secret": "750e4878e05923801ab8cce8212539aceb09c96b0ce3b46c96e5fd7a53f9d95d",
+    "signature": "4de9e23f62f538408beceb48dc43c27e30cdd7bb65e2cfa1e876722db6017e525df94292f6222c71ee22e42818686a80634db61099f3aee4336d90f854ad930d"
+  },
+  {
+    "msg": "39ff",
+    "secret": "a816462a487a2c7276b36babb42cf795a6d1902471175daf8295c8141dd468f4",
+    "signature": "5de642c554a644880f1dfdc909f0749213a1f35f7cbad83f5c224126f91a567888e92446612dd632345d062186132c4ec2eae6da1330234446e4fc9ff4897c07"
+  },
+  {
+    "msg": "6dfc7b",
+    "secret": "f7073cc5544d056e1a34fbdefad229bac342cc96905d139476f70b2beafc5608",
+    "signature": "df409c4686d1da327a2f1ada96e672e4ba9c0430e0f229d7e48ba2d3a15118bca8e008b31a85212332d48c8dbba46750b2ef96c2736242d5a66b966597253705"
+  },
+  {
+    "msg": "62e7acf4",
+    "secret": "a9b2ea7114d55795488da696be343b0feb9585b979753a835b94880b55032db1",
+    "signature": "43232c680dc241380827b48367f3a4c4847fe462cbe92c2369ab1ffdb3492c151822e5c64781568a8a70c73ffe0623b8ca88c0f694c0eb84df75cb503edd490d"
+  },
+  {
+    "msg": "f5254c8d72",
+    "secret": "6721136b51d0dda9f68b97c1687aecfa4b78b80b80d9d4dbfa88ad0269d7d3ca",
+    "signature": "c0f1023054428b31a597826705fdb0ca8214e0718777e4db0b1442f7728adbaa5e4185b521d006f89837d1ec84888620c4d320ddcb554201f6a8869f24743a09"
+  },
+  {
+    "msg": "beb08b836c68",
+    "secret": "e45654103bd263dd7c25632b7bf8fad59dbe888d57a35ba0aaf68ea062abb144",
+    "signature": "3f665af8767484baf32e636d749a01fc496c1e1adc390197fc16030b834bf444e97dbef34aed083b58e81f76e1829a04d12c32e6e9974253bfe1691cd5d53605"
+  },
+  {
+    "msg": "e6d60266f8c3a0",
+    "secret": "edd10e2484b20ad3dbf7c4372736cf27ad78d7100d457efffe912690420dd701",
+    "signature": "5c8509c07ed1e02c63d8ac0b42b8bd81b086a136b8d246af41103b8588997da42b3c1595d397fd0877556d16d148b4d71f01ff7c1ffbfc4480fcf6fe43205b04"
+  },
+  {
+    "msg": "b82bc420aaba3c3f",
+    "secret": "4c295addb346646a2d14fa54f87e181c594b3c9d310cdc47d2d3610f99f6977f",
+    "signature": "9a50b76f6497ff29b483ea517fe46813fa31ba27efbcead4a5ec7da8a5aec513025397fc5d93264341a2bf0a3417f53ca14f4a5a56f841849cbaff6492974406"
+  },
+  {
+    "msg": "3c5c3a79b56ceb6b70",
+    "secret": "d14de53a47d7b125d897c23a2f99c483df7c80e45c951e7fa1007810835c383b",
+    "signature": "e3fcdfd7720dfa833c7941eb8ecc86f2a5a193784f0f8916e42a8b135701cd1950f52eaeb98455919a5e184e4efcae26113f05843bfe35ccfd104ec64149d001"
+  },
+  {
+    "msg": "aa688c4202d26d1ee9c8",
+    "secret": "906ac18066baeae8230bdc788e3e365cb2d2c67603d1a96c10a59b05baf5eeea",
+    "signature": "0542b5e24c611f2bfe8b837b4ee3c15891e18755888be5afb767f401d3a231269e2a292b7ccfcec5db5a7b25092556711f06fd289d8ae7c15e0741a1a1effc02"
+  },
+  {
+    "msg": "0c8bdec7564ed702770cd5",
+    "secret": "824e4e5a43d797727b76d079ef748f6969479cfee28471fec3d104f58888231e",
+    "signature": "b1e75b49235239013fd4044096bdbdce81c404cb6ac733feaa190e6a5bc5c6a5664676f236ef2d3c2a4e13dc120f507d917e2a38840ace2dcf107c8899d0df0b"
+  },
+  {
+    "msg": "099dc2d90d9c2d181859abbc",
+    "secret": "0665d6a654b04aa97be29fcb9468db8d738781cfa8ec6888f24216b713ec8338",
+    "signature": "215a701bc9cb2dd6322c02c008ca8279d404ffb70e50e07c2073eb5a8dc4e44d10cecebddee1614ed362d0cb02aa2e14f3da805e0d88153a7db148d7bce74a0b"
+  },
+  {
+    "msg": "de6e254e3bed4893b082b08932",
+    "secret": "c340a9557695fc9ad374c15e1cf46c5c1acaa548547f785469094fa41de28707",
+    "signature": "93ce56942b61557f464f4b64254d271d75cc51034065f8ab443286d41944906a5034d9d3422461c43d7b9f673aaf22f239b6f432dd35b787c4734402e96cf10d"
+  },
+  {
+    "msg": "baf997758807f1724bd1c9618950",
+    "secret": "fd3a9fc4c82523062dfb529167c131360463037ab4ef57922abc2edd316dd0b9",
+    "signature": "c8129ba6e45aa0f6930135261501e500d36c5033074a1f732618159c26ef69c00fcc49967101156b7dd32ee2b5b4cc365134ffe64d1b9ae81887c025ecce0800"
+  },
+  {
+    "msg": "55eef7db5c2a7d80f23512cc17bd53",
+    "secret": "91221539b17f92623bb38b5b8911d7e43b584191573d1243e5f3b88336c5b75e",
+    "signature": "360227427879255c1a4a5d02377085f3fd731b51c72ea51108302e7a98d557abb184587752390da90bec4b0e891f478679f5bd7a0db7adff4334b5c042eb1406"
+  },
+  {
+    "msg": "bdd1bb669e2fccca51ad2036b9600746",
+    "secret": "612054d8d7d81c537cd87d1c0484e3214e93ab7fff9e6e3af563c7b4b1cd775d",
+    "signature": "ead78e7a0fb3fe757ba291d3614757c7a58a8fc97e2ffbf540aaa5e74e473a4c7187ac365db87918a0c92dd9533faf17ec69ecbe39ab4acec4e0f0056d2f020c"
+  },
+  {
+    "msg": "d38763b90a01ae15946330bc25f6279b84",
+    "secret": "82143dd0a1a7cf8914aad078a7f7eb25f395ed39a71bf8fdf2425ca77dc783a8",
+    "signature": "25719a12f17f5e9b92d94e64f337fd4b3687889a1001dc8426d88d72917bb05745d951ad4d2c3da6bc6b6548a3b86fab3c1c1619075ba6aec2064a566b82630d"
+  },
+  {
+    "msg": "b5a9c5fee75c06a8ca275671884650b49c06",
+    "secret": "f4e8391d09b8379190621adf4906fb2dbb15e2c70b869204843fc1de280d7beb",
+    "signature": "e32efd63936ae162755911d594b9ff85e870615d451bb6e212ef27df7e56c2d4e1da511564824a23f6df1f69036cd287438f05ef47858620cc442f2222053101"
+  },
+  {
+    "msg": "475a79be6f5ecbb16c375a1011f7b23059a92b",
+    "secret": "eb9376f74ec402d86dee0eb419313b2427f434cacd89782ff1acffed08b89cff",
+    "signature": "18082aebbdd5bb8e819ff207cb32a2347bc2666f2acd1627ac7926471f46355b5bbf45ac8b33709a922c75029b5d2a3a97651b807bbbb748e10cf3bafe65f709"
+  },
+  {
+    "msg": "89b8565d6971c5eb6d1c618b02a81371eed8a035",
+    "secret": "9c5fc4e636a867fd6bebcbb5c91c571b05c1557880548da4770589a7249ddeab",
+    "signature": "a27915f2b0f323b0e780611dc44b5311a173e5cb905a8e5391d811232fd2ce5c7ce7e56db022b04357686868838d482850b57f0220b42b02ab03290b93521407"
+  },
+  {
+    "msg": "b166dc5d545da6a0c40c5efa4a6fbb9b662db684dc",
+    "secret": "488e113e78a940f04df5fc411132f6b41f1f99fb71505b62b939ea2f3a5bf787",
+    "signature": "ea1638e435aa44cbf1fd4e4b2bf86813af25be8f1b3db56b15c7c2ee9e5b3d5d0c545d2e317b2525b7ff39cb36fb06f7608650cd52df8b508ab24a0ff954d407"
+  },
+  {
+    "msg": "6fba6099d8e2245b30e38efd39b464a51fc6c0d845e3",
+    "secret": "a939dd49d3ce0d14401bc09490bed3500f29a28ad23076057e9814b9faea62f0",
+    "signature": "182ba7680551ab0bd8d2a881abdef961cb9a43b1d7ef6a3f8cc8ae4a7f0bb3022164d3a2f64c7a1814d5ee71838ec1b4599988a86dff2ea730e71fabcbfbcd06"
+  },
+  {
+    "msg": "aa4e0ff3fca92d3661815658a51ef9b85622ad6015a504",
+    "secret": "87f33c433bff439de255372af056b1360ef67b289ed3e054e2ffa827d7c5bce7",
+    "signature": "da4cca55fcf5d1f81c6cf260c7f161c9af5db66102f49b10a0479ea52c50efd03a57badab1750ef68436eb37324064c9d2b51f4100bf3b42aa65a7d8a91be106"
+  },
+  {
+    "msg": "ad6eedde28ff07393affe4cbbe72c4bbad275f3e892e37c5",
+    "secret": "3554acc8330edd0a7bbd17408b1dce9ac09a60b5f56c9c6f4e94cc43a0618da2",
+    "signature": "3a87a357bac8da376d8dc980a7f632431a6d8620246195face393c86c21ca911cf38885c69a3cded025217c192bd55c25b195ed72ced1a2334ad6d563afcc404"
+  },
+  {
+    "msg": "60bebfdeb03a0ca369e97eef25bb0f4cf3a2661ff8c9b7713c",
+    "secret": "2800fce83436536ebe1b622472a4a207beafbffa5b729d18f3e154f23f51125c",
+    "signature": "602bfca670c7ba82972539d545cf8140264cc9861601bdc392ff28080ec7a408f28a31b4ed002ea6490379178a7901b01ab4e1e9a81d1aee70d2a7dec0eb750f"
+  },
+  {
+    "msg": "76ad988c91c3e21dc03cd5fa37f8e7e213e2cc25558a9c3d6e48",
+    "secret": "24e07ee4bb95ee5133ef128a622e1dc6adb523f9e1a1a5aa1f5fcc1c869a0621",
+    "signature": "f80c2e504941a4de74d8a3ae7e1269c1a846b11c898cccae9a82bcc4aabed5423749578e659aaa0a8088c78af28647b49a728214411ae6947d49a7bce7bfd808"
+  },
+  {
+    "msg": "857b29b170ede8817b8d37fe56ee3a4b4103c22db1f41264d6044b",
+    "secret": "0c6f87d32fbbcad37a6693b9d8ed011bbc2d7aa60f6d835f807374a2a3521a55",
+    "signature": "d83e96de3ca39f8e8756ad7acd3d2a491661519605b68af0123ec5092c0a570951c856a5b7d4a833108d34b6623a8d91302f623f39b6a371448287b473ec8d0d"
+  },
+  {
+    "msg": "c36dd9e48f817428f37537c3d88a57eaab9a97e6f4a6d26901bd88a7",
+    "secret": "8d88e77647d10a0e014eda49e4a5a5fac88a5814da1bdb3a64b86cae9c47c7c7",
+    "signature": "1230bf7dc2f76bdef826e7f153605bcc5e2270e39d073febc5803f3c65a836f9e59eea3187a024ca34c04d9eb30622658ab1028bd372582bf2e179c02d491109"
+  },
+  {
+    "msg": "f798e56441150cd8085bbba8137a8293d4a3d25c9f3de900289505486e",
+    "secret": "9b7439917bf1ec65b7fc4a9618922c6b441bb14575dd27a9854aaaa31fcdb417",
+    "signature": "148ada5c9a12d96136696161105336e33eb95fd1169aa81cf0e77984b374819ecf4d36ec4680a6b4e14118acd70d4647ef0c284014630012155c954844787c01"
+  },
+  {
+    "msg": "80daf165cd68f723f31f33fc40776a907f416ca878ccbd4b76b8c0b9e1fb",
+    "secret": "2069a87ecca9c9d29a2095477949c127f8a1a70b4e1b4340640d16401af2ee8b",
+    "signature": "ffe92dc4edee96224f82e3e0ab6d79cfbde43a1a5a7eb103c98399716f950a5ecfb475ecd738c3471e0c7d787be737a711084d36da82fa14b2ef636c247c2300"
+  },
+  {
+    "msg": "ad94dd59e2d94feb1bf1f9cf7dedbc284681c7dfb6f8af7a2f06ce81b07c17",
+    "secret": "759c801eef52bbe4e680aa49aea0dfa1f5ec322847bf88eae72df6d0aa2aa063",
+    "signature": "8dda6f16d6f2144bdfa1a02ca9422b365ac468af254e6feb6e44a5643af6d03b2e1e94240aab7d7f77abe484e7ac0147098f129c2edb5d9cc41a8349b0225e00"
+  },
+  {
+    "msg": "79dea9acf45141f648ab86f2971ad4394d4f7a54df16ad4ab56ee17417a58784",
+    "secret": "45bec12dee32857ae9a70009e316882648e231cb747511fed2a728316da0491d",
+    "signature": "1ab6bb5ca12a059e462b340aab9e500c92e13be4437e547e99da723fa81fcc16813cf5d84dc10bfe7131688b2a9739679969b0861f38a05be666ab38d08e270f"
+  },
+  {
+    "msg": "8e78bc8c558c3aa9ebefd6678098ccd49327ab9209d8bdd8d011d67a0a10d4686c",
+    "secret": "5f497c44c327bf656fad471d8d2bb76040909f816fc9e70be75083fd7988ccce",
+    "signature": "60606f5addebfd182df43654724d08e8b99a5778ae9a333e8218ee87bb27d00aab28d918556879019f803d6c17fb9a8ff67aee917707ffebadcbfcf8440fc602"
+  },
+  {
+    "msg": "e28a6b53c78614ba7ae05865c2c695ec280d299afdb7dcd602788bf1147c85c562e8",
+    "secret": "4d96fc8f18dba850c6c5eb55de4ad9d2a5fd161e159b33261cb5238fb2fa4bc8",
+    "signature": "57baf0124b0964e5625faf548eeb9c2e3bc1995261e0c27c7967d39eb743f19003060009a7782c683ff1e3c4f46777ba399f83cc1582eaccf3ad63ac3504560e"
+  },
+  {
+    "msg": "11021bd7007dc3b3299b837fa43d9661e5c513b6e64cc59713441598cc08b9adc97e77",
+    "secret": "2e23ed6e663ceb5aea669f7bfec40774a333ef0945fa93fb40b6c36e55eef11a",
+    "signature": "f8277bd2957848f12c5b227316219c365f25afe862a9572de1943b26a8fa0562a9a2ab50bae3fd87adbaa8a8a510b718e6629cb4a34713b706797bf4563e6308"
+  },
+  {
+    "msg": "c6451d0d36c6650233f8e27b1d51909751349ca73b0bb2670983fdfcd01e571812e71093",
+    "secret": "7919086d46b9078ccff124d8e19a285c03e72a4d02650ef7843b8d3733f409ce",
+    "signature": "a18444e1e255c2530d283adeb151ded083b6a06bfed384f3cc759e1d93963cd371e8a14485928df1aebce7fc2f3ace62c5b9a073efa60e8d773845a142840c04"
+  },
+  {
+    "msg": "3e84b7645980295f9fbfba3c3d975240e2f5a6aae8d5386365901bac4da0c4d0cca0aaa394",
+    "secret": "8f1b5c1aa4ed5d06a4f42883af2e96c98e394e15f02a556a3b87b649c027e56f",
+    "signature": "487d3141ae45a2260c3604bf1c9cf918d64e097c0f61407dcfa1dbe56bc32b6a21c0ffb3c2217e4fa17acdbe85fffa174c27e7d93bbc42cf5a43550749029a01"
+  },
+  {
+    "msg": "a0877608dc1f76df885b16e6f394977b5df6c35d89776839dc8ca1dcba1b570e807cca1b7ba2",
+    "secret": "f1643ad34f54e089afc91ff06d6c19caa38ef7cd72eadbee3e3cd2054548fd5f",
+    "signature": "407b96a05da2aef298cfb045d1ed7545465f5cb4ca42a80c0e0bf372a81de26de2058fd01304a6730caa1a59d1121c65ccf1a047a0e3197bc27bd52c18e80a01"
+  },
+  {
+    "msg": "ac8b1331fed75c7ae8afefb2d84d5b8e504c880f82fe9b10c486172b08ac9766f0b8ad158c205c",
+    "secret": "47c4a61a557d476509b97f8a788602c49290988bad073fb86479deeb6bc15147",
+    "signature": "89d209692f43a918a2ae1582c4e87cd0a9d51edb7b556733ce898c1e14fdb542b9d5d6263423b6825a8ff3a16f0ac139e739168e03a176994a8d1c81f3ea3f0a"
+  },
+  {
+    "msg": "e70a019079527b552bb9bc0735f00d2bd863382e721b176dad9a9038dd728a5da371ce6234447165",
+    "secret": "18ef2c77e74f2cda45ba4b8e47c1f4303ca18c84f3983c98970005c50aeb2c29",
+    "signature": "391fd18d5e49052acec4ad33bad06ab44e1878a0df51df8c7a972fdf7ac0ba50e7d2fb5c73102a789d5922b67623eacfd5c19a8152575d244674806d9208ae0a"
+  },
+  {
+    "msg": "d3adff1fa99e5e4450c85c1103fd7a5ea881771dba9a2d40aec65fda6a3cf88442f5627839022bbc14",
+    "secret": "324a9b71f1507a05e80c9305d18ef3b1b31bb0ede7b90bc1c190b1b54af49fc2",
+    "signature": "8843cc02f99f7c1910d7cd3e42a9dfe8c8beb5e2e8715de18713b447487ca73ef54b79388e10afc1b59c21d3280cce2d7ffe59bbc2d4b79f4aa0d9be60d49a0a"
+  },
+  {
+    "msg": "2588486c5960831cf6b095309398b995e141af1043497d3c445f895d0cf0df638bcd625c63d1972db4c9",
+    "secret": "0cabad2998043b72074f5d043072eec6c647147f3c70b81dd56668dcb094c5de",
+    "signature": "0393155b8062587c95c98075f0ec9520104d0c8daaaeda776aaba8a4665347b4b57a47c0165734ab69f14ec6e6add928140708f49e3284b1bbe391c19d885808"
+  },
+  {
+    "msg": "4e5f0a551fa320669deb39c51be1f19f1974cf6ed36cfcd95df1c3ddfedcbf9fd4ea0456c9b5ffdd9f1688",
+    "secret": "8e691b297853d6f0678d70b3a8400be40a2ed6f1cf1124c119b0b853c0e09dd3",
+    "signature": "af1793849734dc4a2b179bf2f8b05498a44eea9777683dab2a6fbeec5d64c71ab4583689a8dbc78f563c2cece0601ece836643f99ef35acb723b105c3fd90409"
+  },
+  {
+    "msg": "918bb077a5bea3e9e2481dbe3b1b8a50e7cc9cd666f77310937ef05829805d1ea996b441fec992e1f4c8722d",
+    "secret": "44d7e4e0d3fce508408f47686f517ffa71d0c2e67a074bad4d50f9c618c1809d",
+    "signature": "19e0bc2e2116b2b4df4e899ade6adba9aae00f8be2aba47dd1dee77b46f49363f0a55e74ccd1d8f30cbac4e39b09012e81654ef275cb4f4d6658dd18dcc1de07"
+  },
+  {
+    "msg": "8f180dbe77eebb6edc353ac9af510608ce55e4c661d32ac1a3fc21b8e77e191478d95b7d115d5d30f33a64bc24",
+    "secret": "e4b2137b74520ba65090959711575340d4f0a0dd4c525746ea3109354b2394e8",
+    "signature": "4f84fdbc0ebf4831a024854f90c9797c0e260c0b8114b65ae293e49007a9663964dc568ba32d1544a282a58dd280b6d3dc10abef2c6b848c67a634869a01880c"
+  },
+  {
+    "msg": "d23a61d1ee186e3efa620a173a6372f64fd8ccf6f7a49c4506c27f736074ebd69466c35a15be0b1589a1d9d28b96",
+    "secret": "0a77612d779e49ab425f6b1f19232c95c72d703522086ae865af4f038f1098e7",
+    "signature": "d372138d762cd6cb5300521bcde7fdb12ae69c3808b26960b888342c78deb825bc34e03533dbb4bc5e86d5ad13c44e266907b832bd52e0d76784f59d86d3c001"
+  },
+  {
+    "msg": "c6aaef4bab3c28af36c05402863e9cf7fd029ed86509f78dd045d3aa1f3760fbc66588288fa42e402b8e7e323d44e4",
+    "secret": "ad5d2dc106e164495d142abea045ace165c9c01c19ef81afcbdc841dfdc4fa3f",
+    "signature": "fcad011d7f29fb324854edd8105cdd49b6cddba95b2919df162b46d36e4c4b924baebde53ca9bf698be59b6b7e7df1f88968e4333b8ae5640eb9bd462f348d0a"
+  },
+  {
+    "msg": "b00c76b0e166b376582e6694d505a423bd83e075a03c351bc3a73e768010713ddc442324e0e851fe79b16d60ff0ad78e",
+    "secret": "64b5997fed822631a0d7d36c13cdc10e4bac8def99320e5f4008adece4308f4b",
+    "signature": "13cce775f825c94bfa51d0e0ca221bb21be6b15056fdbce97f1b37e8ef39357bb42d3e0c0ac39a22750dfc8d9862ff9e86193b45424f29df5fc41d18ed28e502"
+  },
+  {
+    "msg": "3f5a761d6c51106f55af39ed5511dbde9ee07c5a5d517c3857e287d3a8fb4d87661b80efd522145063f4c56f8789742ab2",
+    "secret": "4671da9d0d339aa43d7da911fcbeb733b0184860b62135904d618ff54bcaa55b",
+    "signature": "d956ccfce30b505d386a733a3f4c5d44c234d91a6fa3c932060dd7321bc60e7e4106cac3ccb0add3693fbec18360fa389654a2b93f453a144021ced61603e507"
+  },
+  {
+    "msg": "bb15e2732919c7941d7e4bb5d9faf5951c9765fc761fbe9ae2ff308b44d40d4f17a02167fd2c3ff3732837db6611525c9eb4",
+    "secret": "b3441dcf5d2839c7ebc35d0aa977223fe94be8a98c8ff616eb88b787606ceadc",
+    "signature": "e4fa37751ef2d3b7a9b3848517c65bdb342dea2096be88d03831c8426073ccca06ea80f66f9b71db5316912e20328f9c36e3e29b1932ecc0ef956eaa4fefb801"
+  },
+  {
+    "msg": "09",
+    "secret": "425c7f124a2cee88d9446cb6f701f729aabef142ab032dc718163d216dddb4b6",
+    "signature": "6876cfb1472d54630230d5655e4ea0c957339abd0d3ca99ad76a379135db5a833eafba3ecbb58815ea0945a852bf2d90c9693b3e5a83f291a9e940f445bb0504"
+  },
+  {
+    "msg": "6ccc",
+    "secret": "7d58a0fa673f51e00e40d4aa4b21321681fa6edcb6f3e2f4b2a64392b1e8b1e4",
+    "signature": "549d947d2a2703afc91072638465fc63fc9f90a12e63f5fde5188647965e7c09b23eed1810c6be7f4d47a4192a414ae54fa89b003924c74ca771eb5ca287140b"
+  },
+  {
+    "msg": "fe20cc",
+    "secret": "dde5445994b45a6aa07ef2db44aeaca78ffa5454acffa22270e85f72bc3c718d",
+    "signature": "a04f533968be2be4e98a28c948651961f25440d20b226e622507019e0837d5a4bfcf38eccd6f45473975f53d7d61cb4e2ae2f4c041e85ec8ebedd97145820d04"
+  },
+  {
+    "msg": "ad2b1bf8",
+    "secret": "8a16d75784b5b7aa7d063f7bd5eaa0516a6c93104e13d8e98f4be590ab6e05d4",
+    "signature": "853ca2855f8f2c26f9e9b735056321677733b9d5a9cf7647f16b242d4e56f972a9703812a75974646d59aad5dbad9a3570d6c780af364def09b7b2c2026f8d0c"
+  },
+  {
+    "msg": "31cabd24c9",
+    "secret": "fe6b88bd90eb8866f17197819e75c6a18c450bd00cc1b16a6a1f5df2a90d4989",
+    "signature": "d6892c516a0e6540a96e6fa9a9bb4b75d85317aefd2c6aa82100db73ed6d8c3c396275c93d377d0d3fad9de16ab59e223f0cc5c9c6e078d1d6e4902163d41607"
+  },
+  {
+    "msg": "0419e6ee3416",
+    "secret": "c51dff716c97a680bbeeab2b9c235f1f9b8cf493858e3def87f4fba553d4c3c0",
+    "signature": "755659118fe54ac9488d2a330044458494a6161b86c0a1e76540286c8c911a82620383edaa83297541b16a0fbac42515cce4be86e3dccc05611791245f84c00a"
+  },
+  {
+    "msg": "00031c7010bb21",
+    "secret": "7a184761207b3448c46f2f54a2fc7094e616fec9be0d0e06cbf74e8ecf9ad458",
+    "signature": "91466f60b906a3235dc686e072a9244f9de090d9af23e5df180859227db6b031f7013c71bfc083884bbc49105b088938e4d8666753c2438538699db3fef4f304"
+  },
+  {
+    "msg": "9e97b1719062f239",
+    "secret": "1f3782573f9fe179ec2d1f6ad8c7b979d85ba24fb53ace751e46dbfef64ea4ba",
+    "signature": "01711a7cccfc540941b363410d353082a52eba46699e863e5ad69cd82f7d0aa0db1e04f63990d8f63759a6aa481800c5b110eab104645c7443139d1c4f1eb709"
+  },
+  {
+    "msg": "ef205ef7f7387b8abb",
+    "secret": "94d23732d8267966ad938f1767f87cdb4677e07b4b13254745ed0895aa3baf5c",
+    "signature": "7f81876fb67cc5bc25f79636f7a377939ef147eee8467ec2b41098a0fafecbf9b52ceb8adfc038c325900ef279fcbe44c494b1abffb5bfeb965a3f2514f21c00"
+  },
+  {
+    "msg": "f0cdb192b2a14023e2f6",
+    "secret": "f2cb1e404eea5d8ea9bfe729560b8bd2d57728f6b4aa52b4c111b14807258b85",
+    "signature": "e09d2b9689c4b25bf5875370d8ca5030b7ea695d6bb95265faa19aeb90bd38b2af301c1532e67de0352c6dc92a13393407aa0465e23d021cd96ee1d0ce6b620b"
+  },
+  {
+    "msg": "689db47e1f9d36191e3501",
+    "secret": "2f9dcd117c2b0dc7eb9bed41d2d19ba950c53d0b24249844956da28be497d948",
+    "signature": "9017f8567fde0bd6a85f9c3347b26b77c6cbe784ebb19a2bfe56251402b4039f0e9803a6b1a69d018765dc2a781887302591d4ca7301a83d95ed902ab084e602"
+  },
+  {
+    "msg": "263fa571ee3eb4e6f49b5f22",
+    "secret": "bdb192b5daa7db1955c7def70fbb0423ea7550f3cbae5a0997118f531d2863d9",
+    "signature": "407ebae7fe15f461dd9d7cc4430cc8662544cb76f2c332692cbd466b1316e3014b49a7244a067c6661d62e914203981e666f15eec348b3fbadb72b3720c5510f"
+  },
+  {
+    "msg": "f19b8c8ea3a001a60de324ca5d",
+    "secret": "ac16fcd231564a40f7b0d8eddddca79e28ae3b62ad73d3bbfff47f13cc00068f",
+    "signature": "0a05f1bb48552f8bc0e05bed94db39c70b34e8e8ace71825857bf70abb50bf47cf76bcf3c6d789e95cfc5914f860ac1fd4a924df2ece2dee556eeb9677a37200"
+  },
+  {
+    "msg": "8d3d5b30087ced930214e6db75a5",
+    "secret": "f1e9f5ea79a98e2aac6be31be7352e0d82bb232e95b70856d1611f2338325e1e",
+    "signature": "a457db77dcb2ec9f4ba59d23a220abcc7e37334514ddf79a4cab4ed9ae3369aebf99c8d5aaa0ef83ec503341df8c398642264742659390cc7f6c90376f821f04"
+  },
+  {
+    "msg": "120bde3bb0d3279487c79676301654",
+    "secret": "75c23a7cc7829d363b4d85dc86a823f6252f7641decce6923fc8aed6c7954aa1",
+    "signature": "1670d47bf9df18e3bb2ec4387ac2de7cbc4e670c8b4e2089cbf9929fe031dd6f8f218bd6e59bea521bf6bed0e05f5ae7ed0ee987aeadc7f192daecb8be74340f"
+  },
+  {
+    "msg": "7d58b0c0d0a3370fdf0e77f199e3150b",
+    "secret": "1ceb01711fcf728edc31dd45c1f36e6d99c0315a6c9f62d278d5959ce26151dd",
+    "signature": "68850838b0271ec376f80f4819c4e6f312cad8efae894dea2276f3e85aba7e4743f1ff1613469f5bd5dac8a1bdc4aa9ea1c330156d183c3671a0826a1580e609"
+  },
+  {
+    "msg": "41082316450f0174d8576e577fb8a72065",
+    "secret": "fab8682cc8fe0c4d9892cb7979db10fe22bdb83fd18bbe420aa19aebc26dd2fa",
+    "signature": "30aff36a2b088bf87f81e621a4b0aa04f4911b2ee2da882b8d06ac116588a1968994dbf98f659712c5dc5b0c21b1943752732761c55f70bacac1834632cccf02"
+  },
+  {
+    "msg": "92f5d8045cab4aefcd72fe818b5dbe3ecbc0",
+    "secret": "2d5e664ee4db6919e1de1e27361d2824ea9489babfc7950c98a994a6f25a6ccd",
+    "signature": "434e5cde5bd1288cce0d9a0847e28aec1d9d55fdb954e592c662fdbc52e2950a18a80025516742035b25e3838aef4f1f8c9b28ae8394cffd0de6da112d122c03"
+  },
+  {
+    "msg": "a79d909de16c1a0577df16eec9cfecdfda7bf1",
+    "secret": "eac99ebd16239c8b4b8fe01175f2c8a1d955874161b8517b8023cf4efd24f53b",
+    "signature": "8e1222cda5c610443060f2c7704bafeabbe2150ee8343e7e4b8325dcb764b1cb57497f044aa80e1edfeba1cd89b2b0f646004e321b892523a4f4919791951b07"
+  },
+  {
+    "msg": "11ec0e73f26cc7b28f4eb4f6130c3d38821c45a2",
+    "secret": "8dec565327c1d3f294027d108387ccdc8f8a32e7a54553d88e4e1bd5ceaa8cd2",
+    "signature": "711f0e64637ebee5a1d164dafa3d22e3aa322b420b75aac69d8ac090ddba33dc9f190c7cde2074301d0f692a961d1f9e4af033092dd783bbed6e3b0afebb6c07"
+  },
+  {
+    "msg": "a9b3b5b712f5cbcba41c43df6e7d8311be4d22809f",
+    "secret": "8c10dbe83fe9ce4734fd99c56275a0cf2b29a8a26de7ff6edff926c37c05102e",
+    "signature": "db402f386a70f8a81842cad19981f820ddf1e65be39e8b12df5aefccbd1f753b12f6b9a9f776efdf8f9bf8c940d7fdac3cd1250ebbddccae524636ba59e56c01"
+  },
+  {
+    "msg": "4444a413b3eba41e5f77184c43c214332c8a92d0529b",
+    "secret": "92de0794d99fb17a48408a11f6f8b7a0549424aca0d0c20df5a9f5dd5d84f00f",
+    "signature": "cb1553f6d37ae917d9ec51bcfbba8b4737530cbbb4ad10970eafe5f0a56db15857fbff4c8b0282d4ac75b050c854e0d071f8d8902fb906a9b635ff52a420b406"
+  },
+  {
+    "msg": "9c2911abf8f03afe1ec172d379099032949e6b72de6eef",
+    "secret": "42427b150c2fb03c372d624c17d16f07fed09e293e5b48d79848d2734138163f",
+    "signature": "5ee13d4c7d18a3abfac02bfe20fc5592d0d5664ebcb8569524fb61a18d4eba85c60f7a11f9314b42850d383cc1e8e939ad0a0df6e67d223d3855cdbedd319603"
+  },
+  {
+    "msg": "4dd24b5156bd4c17f59893a25da4b580094cbfdf4b5ba72d",
+    "secret": "75701135a80450980e423032c0d9a90dc1022f1a3cb56fad212d288d523cc7b6",
+    "signature": "ba55bee15094bc8cc4d38bec04e93e7431bc1729fb46ddd83c92b70982ac51904e93d8c6cbb39feed9e074680330ddd25c27411c637326f74d301b6a3b34e101"
+  },
+  {
+    "msg": "c135fb0cf523479dcf114ffc662553083cc9dbf911ea651472",
+    "secret": "65dbe47d6d2bbb5b770297537f40834d9d41b53cb7b81cacf4bfab2f5cd9cc21",
+    "signature": "51209851e39187313c58dca2a59895445fd682ee81165abd51f9144415bc70dbfff64414b66c6188bec70aee15cee31231c73a2ae4a182902620fbf4aade6208"
+  },
+  {
+    "msg": "41cf555f66bfa1ac45a44a8c58d58c1d26aaf6c67f048cf448c4",
+    "secret": "20ad7f07a1b73daf76525b12403c8f03d0b813d16cdc3c260fea9676eb2565cd",
+    "signature": "37a6eb5c396079cf113f7875fe31fa69936d479acecbb4cbd1a66dd59173ffe269b920b73a4898573fa75794466d3c7126f4a6890ef4c7ec8e99042dcecd2c01"
+  },
+  {
+    "msg": "ef047627fba787e3637a960320539ea467d73f1fc989999bbfb860",
+    "secret": "285060061709806df36712efd810490a35be932b7a7903b8955f77a99d2cf252",
+    "signature": "95e91347e4d2f7e046a4567d588dd73bd4583e1788c04942b87e354e3a870ed61a646a6421536179060c00c9e82a8f8f525898a96b42fe884832f459116e850d"
+  },
+  {
+    "msg": "accdaf34bfdc3e14a459c0015e2456f91d05ebb75c00cc10025aad27",
+    "secret": "ea6fc1023adb4149d76ca1311416c362095f679e2d073333f60568dbbb54f55d",
+    "signature": "d0a313051b4bc8fece3dde94e9a98e584b771c7a2bd488be0f366518add9178473acb188156f3a170f835f801adb7c773a540642a236982356c5fdd96a453c06"
+  },
+  {
+    "msg": "f6952a61326d0976013741bc54b66b844bdbe1e8382be9f71ba5b49c39",
+    "secret": "df3747aa2689e41bde810e20f1fb03a890d4f126e80a2b694613ae61ee96389e",
+    "signature": "6e9ef71b5753c0ca0aa03561d11f4a59da751db623202e7e63ba8cc7764c806019cab7b47065d339bda1edcd3be1be30b9b75ad647e9d7a69559cbbd6e3adf01"
+  },
+  {
+    "msg": "14abedd6d83d959a68fca5f85990001321d1b70ddf696c219f6250a6dc48",
+    "secret": "a2c136a31e0b25402f64251945a562e3a0214b0194fc6c1389df5480041be8f8",
+    "signature": "3d617d134f22070143776ed26478e8acea806cad784014ab36114f388c295b072e112bf4259c1dab5e8fc691a745837706ef5511e4483f95664d5a76568f0f05"
+  },
+  {
+    "msg": "1b32abec6a27d76a5259bf8dad7f4c9542c5751af5ea9c4eb1a90767d999cb",
+    "secret": "4845201cb48b7cce5b4157e97580da40d7d757cfb33414608ecd4e2f16341c9e",
+    "signature": "9bc26d1dea6ad0f85f87f3ec97d5fe9b9b7c7af5ed62940ab5625d8ccd3afb668f70d3ffbea713b62c1128cfcc52bf39446c12f08413a03c423c7be3d5fc6605"
+  },
+  {
+    "msg": "d08565d04b2e20723b1cf844d6a9c572a72687f3888b52d6fe9105a73721437b",
+    "secret": "7266e81ca4f78860441e2f0cad2b87734395a0e38c384af36e2db65f3cff3f85",
+    "signature": "167f63ff714212a2948aa536efd5c95f645848be19020bd7c0e513906108344ffeaef994a24c667841e81ad31c6efdf715d4b24e3c97354fdb9a9cf943bc1708"
+  },
+  {
+    "msg": "1422c58a7b0ddc50b8ba906f8908deb1aebc53d3087f5735ea8e307dda1be8ffe9",
+    "secret": "70194ac3dee1cf30a93b3d5ced53aa23eac41b9d36b493222e59be18c6492c35",
+    "signature": "c4a7fe00984487a86c0aa4e7dcec2f0aa3803107a6dfe084d7254e921ecb7e20303f371ca23677dbf7c91a07e2d8881d7dcdcc5655e3f353127ea02bdd1cbd02"
+  },
+  {
+    "msg": "9ad96b0dc9cdb7c2eccb0cfa8b497ba36260dd540cd5e0ac37548056fd37e9eabf4c",
+    "secret": "0abfda7daead06eac29db130e6936d85e8896ee7fd71fc3de40a3736546f134f",
+    "signature": "4e59e718690661cd7eb3d88ff599521f6fac1431a4c02c5c7c40066b51da9700bee6bc7e13cc7d442faa619e442d9ed34906b590c42690bab61edb2cf2ec0c08"
+  },
+  {
+    "msg": "e44ac974a8beebaea615385c2efba586ba2c0a465bf80d2949b56adbf4aa4afaf96c1b",
+    "secret": "f8e9ab423f1ca7532e483ad7a7de9f34671568b704bb37ac042f18ab3c0df7dc",
+    "signature": "38d9dad19cdaabd9f6fe757902a55fcbcd3fa9b5604b36bd45716b49632134ab922c23ba438b1819e4df91df8aec3c844bd6641e0f41db00ac426e67ad8ee108"
+  },
+  {
+    "msg": "d86313e5377157723f3ede8ab1e4c51423ca56dae002352efc29615c445b636b81cfd91b",
+    "secret": "87319d671ed78c2e7c24166771744738dd91f736e10c3cffa63b33a1e307d7c5",
+    "signature": "d63b56e5116f26f6ae91fe6ce6efa3c352bab893e4987e734f603cfb2d8ec8bf1c18fa21baaf0ceecc21f2157fdc3b108b51641bade4ab71412e37ffe12fc509"
+  },
+  {
+    "msg": "4eed93eba775affbabb2b58f2798120e6b0ec04ea4775eae0e1c57d069fbca6989dd2c1ee8",
+    "secret": "e7c4c8cf18f072fa054628c5d8be22102665a7d9f71183143433f2d012e47996",
+    "signature": "d368434fe1824034b85c2b9dd7858252fac10660a434be421cc0df1af8c66c7772e6d8f107fc8f0244f3be2a990df0d8121307c199ee4efee8a7857e423dd50a"
+  },
+  {
+    "msg": "5c05676ee455351f81973c9b4c1ec4d96c8af4b74986bfa0acee5b5106684f4df9a9a23bc12b",
+    "secret": "cc1de6ac3bf904e31ed7aa0319087c75b9110d78062eeae45594ef776a95da05",
+    "signature": "aa548bee20f1c4773fb8e75109472a3e73d88e270c317665ee5c316797943685e77697973b67852dda04c51288b7f41eb3f65a0e74ce46ff3284319816eb1906"
+  },
+  {
+    "msg": "8e090ae89ce9ab91cc1ba5edf066f9c447a837ea1df448783e957c9de704cc1d5f5cbb10347dca",
+    "secret": "441816f870c636be2c5056e0adbcf50bf79510c8fb7cbbe4d6d1bf33433902ae",
+    "signature": "51644382aa396c18d2f4476c70bb8214fe65773e6cde4f2d3cde837ed9fc02f608a6fc5bd593b6fc19c9160b357554a94c0baa8ff700a89ba3e02865cec4150f"
+  },
+  {
+    "msg": "dcabf3c0f91f347a0910de451177b85e67918349c790935c5b02724bbeb39b6de345727316d924b1",
+    "secret": "63a3f782413795e1f85e2792e0a232b407994cb2d53755fcc29d4aa7cdb4f9dd",
+    "signature": "067aee4382ae07f037b703b3cf6241fe1ba0e49a63946d8208e68f62da0cc8d085465b7a507a71d07dadbedd7ffa78a20f4db5936a2b45a127a7963e2215c607"
+  },
+  {
+    "msg": "5ecd05f55f9d7c8759c643c3cfb5bbcdb419f2aea2d20eb42c7fa608edeb0b98174a70939be407a3d8",
+    "secret": "6ca91dcf0fb234616ecf53075e5d8562a83b33baa7b5fd86a4b5a4ecfa1acdbf",
+    "signature": "4d6810113eeac878e7fce611b4b8ac083664c32ba73356af2512161b9ab556b375489fce565f09495b71603d251dacaf2786142330eb1a3613c2c631679a4008"
+  },
+  {
+    "msg": "46dd2959010b4c3f7ab4d58e11a00c42d85c95801d74425627b35afccf59ecda59ceb5f301694ad582c8",
+    "secret": "907825d15aafae6fb66e14e32da813ffaab707caae1d97479fd56dc97963f345",
+    "signature": "61c6b79d06501ad71d88736f665f50b3c81328a64cd9ab83fdd13fae3640832b88b8b1778291728ad575e91fde48b462609d5c5bc09c687cb7a154ba52ae340f"
+  },
+  {
+    "msg": "802095e38b664a0a671e8697d3c8f95257995272578c89f4803872eee9046cb6b1231f087af1b76cf8f33f",
+    "secret": "18f57880dddff966f6656d0c71bdc44c8da86bb9ffb7d2ea06cd6722e061a611",
+    "signature": "298231b3dd131bcb464cc2867c45783cbf39273b736762340b52aeb8db38109ee201bf9e77c832d35d1c182c109006c3f8b25c75c9eb59ac65c27908a5399e05"
+  },
+  {
+    "msg": "17aa19cd4079e1bff74cc08e0f7394a43f2b9f5bffcbe24a1239f58b652b601e707b7a30999da24549de740f",
+    "secret": "628973dc709961b3f654d1112d9bb5cee8b722ba1767fedbe47476288e5f963a",
+    "signature": "88452119fd9aab40f52438bfb96b55c880f8c44f9707b267ba21346db70b58e0730e40b3e8abf8ec7e095e313b63f09986d1489f253b645a943b3d7ca9940b0b"
+  },
+  {
+    "msg": "0825e24307cea8a7d592ac5ee95bd6c1195762ee48be6801379c955ca9241615e0614708baa1fca64be2bf4faf",
+    "secret": "4143614b2d7c40e45826aeca4fccfca798492014333f6955d73203e2513423dc",
+    "signature": "05b7a6cec0361d967e0b30e23470fcac2ceb93dd6f093ad3e161545edb6b773c89439f1f1174bf698d640350c90869931e8298017519665588f558a2a14ffd0a"
+  },
+  {
+    "msg": "4f67972a306263d9283e81f4933f9e93cb91701568062b801878178f7cc8b8db5754e3fa5884a7a3f5b534b33f48",
+    "secret": "dd12b27b2d8e2354f038129e8e32b943b0bfa2a18d3562e4e750254ffa6e341c",
+    "signature": "f5ff191aa06d4817cb9b891dc6cee60e27a1f68d46a5b4d8d31064cde81f3c4bf6e65a5c5348f2b1833156075d019cd18156e4f0c0fb8bef6eeec629a7560c04"
+  },
+  {
+    "msg": "0b38dc19a4961c5862dbd4a72360378eef5e74bef3f6f36e66186a6dae5d62d13b013d9c82d4bd3a03019734597309",
+    "secret": "4c6b3d5c6acaf2fe97f0821934448e68feb4acc6610a4d3b0f53a5612fcd6017",
+    "signature": "ad5d6390a9078473c334fb5db9e1291a99d2b73fadc66607cbcb9aac44a065d322a8aa553b8c8cf05ce9b5fb211a5b5a45b5799c38b1e60f1ae9572a3d3df009"
+  },
+  {
+    "msg": "06f29605ff7c3915238611911c42174ba60f518ffbd82fc7bda06e6ee0700b598f75d5eca702567192236656331722cd",
+    "secret": "1d05268763f655dd43cad53b90c9f1e076f6d5bfb25891b7adfc0db56e4ae367",
+    "signature": "fbc62aa456225505ed74fba70b91d9e71c98ba800a31787f5c53d31787dba203c843dfe779f703725deeaad49b60cf45f11bf162e6e3edad6f9c2fb470fb7103"
+  },
+  {
+    "msg": "2edf54337e62d84504fbf716c211123def11c593fbb82b5db140394f32bd7119daadd7ebebe9a582bb2962362187e92459",
+    "secret": "a5a0815594d0fb0ae7489aeb872a9f86e9c3cf5e4b3251cc5c742db20f9d9e60",
+    "signature": "475d7d8e0630b67b559e633f1e11890f85ad996ca368d28e1b483607d4be916626ad417ebd71f74429320bcdad24f2614534e3e46a42a0e875f18d3ef2a7c704"
+  },
+  {
+    "msg": "",
+    "secret": "2bc79b2c5e1f9da1b7e5ef4b0a63348abb7cd143096ed8b646091f110706a823",
+    "signature": "ffced1d14e3b15874d33e17b2a65f0baa5f430b819b06e387b9770aec2d4fea8bc45047c1ee666cef8a01c90735b470735df5a3f416760fbbe7b12cff947760c"
+  },
+  {
+    "msg": "15",
+    "secret": "005e9dfa7d924dfbf81f124967648f3511445d3c7785560b5c3c7300f00473ed",
+    "signature": "e94579da3c9c51294c82a5a2c3e2d976e206625381c5adc37207f792740b3d42d6aed03c17f76d5657ef0ac3a3fbb3d9d7d1601005ef59df54a46037d8163909"
+  },
+  {
+    "msg": "7700",
+    "secret": "77fbf59fcf9cd985141119093b069cc1dbbfcc87b3a7438a24bd5d5087d45b73",
+    "signature": "36f67c15aa0d8063b24bf1c7818153ccfff8956825de9320a8ee4b0764d3db2eb23edf55d6ea3276d639f0c1e9cfc2653d76c154589237e8c664920c0cc85d02"
+  },
+  {
+    "msg": "c6704e",
+    "secret": "8901e92efe1b85330050c097a4d86e5616d6584452c5d1b5d5674a31af24494b",
+    "signature": "3673621bdead6f25e7595afaa59fee21c3910923d35725e633b54b5cbda0de57a8637f12761d6e51abceb3615d42c5b20bcbb7973ec4c3c95a40195bd0ca1607"
+  },
+  {
+    "msg": "1268912c",
+    "secret": "551896b6d68b5343052f37df5b0fda391a1bd9092ae434b65c109e4a99ea8b0e",
+    "signature": "6a6671ab03eefe450affe619be0f7434b7627dae820333e24c906f0c835e741b4b8ed2bd42839e03e75916da80672e7e72cd3d28e1f960394f8f2a0519099f05"
+  },
+  {
+    "msg": "ea5ceab348",
+    "secret": "ac7c38cd8d69f7c167c6e0c41c465de2d58e361b2f90ee88abbd13acd0d38988",
+    "signature": "0766fbd2e35175bfd6e0979b744c9a5a3842b56e5a7fb3ff629e32d1dc6c58a353ef9e659394c0d5958b7b43a9eac3b0045d74c25b0bc023b6c63a792be85301"
+  },
+  {
+    "msg": "84b1b81db406",
+    "secret": "7d0ba62f80e1f29a9e4d48d09072cfe602ba0594b2a5b7ef4550c0202799c448",
+    "signature": "d3261db6eae8de661e232c0b09af93c15c852f285b835c4468f9dd5c7698b00ddf5cf534ac1c832eba9967c704129452a8daa0104decbd6feddac27fc5fc5f02"
+  },
+  {
+    "msg": "c5113fd8351885",
+    "secret": "bd352aaa7d54dfe3cb9f9a73fc03c612e206ee6bcf122e93d20bf39d85cea720",
+    "signature": "ff1d07ed55237deccd1501bab4b9db2de8a57aeca58be19905b2ab7431a06f81942169e84c34d50d9bc78c980727123d59b4d8a25fd5ea6f0a4c0d48e6f13706"
+  },
+  {
+    "msg": "ea3e8afbc7134e50",
+    "secret": "3e1102decde67e0523c55a37abea8091b7adeebc964c7787d80e2cd9d8a0b3d4",
+    "signature": "0fce5e6d2a70815122b62ca510c513f99a994fa27871165b8dc8b29df532929a0b25b29591435075d047701bf3397d2647fa764533b51c09141358c27672b205"
+  },
+  {
+    "msg": "8e546647aa4ddd302e",
+    "secret": "89afac616fcaac740e10e26da36dc99547cf6a080cf55611b261e7ab54f46d2c",
+    "signature": "931715e2b75bb0e0e741d4223556bc46090a9d1e07a53c0eaa6dfb4a9a0b1118957ff666031b4746bc1b96252c73425c81166ed2d0f57c03628cf8a180404b0b"
+  },
+  {
+    "msg": "5731f264d258bd6b470e",
+    "secret": "a35a6bc5261240d7184bd1fed2258d4104ea56405e464bb7cfd7ec2d3e3d32f5",
+    "signature": "6da44fbb0cd4608decc5b32277f8a9bb16f33a31efce58c47444791af87eca3a1c1ad972504c4b183883f8baece7203d62e20e0f05ed8ac4f5147a1523c62c07"
+  },
+  {
+    "msg": "837b91252ea4edadcb3cb6",
+    "secret": "eddc007c156544c257f290d535c99c6c28b8ebf2190915e77a086a5d85f20117",
+    "signature": "6c3f4043459f8fc3c294422cadcc497c241fea21e93e921e4326cc8dc0c0d8572659f1d79a070fba8bdde72d9778f25e0b3ab1afb74aa6df8f6db6dca077350c"
+  },
+  {
+    "msg": "6ed8180813e185b1e00cf00b",
+    "secret": "7ed2d142e76434a52ba3083a057ef39ed3f7fa1dab98fac26b6a4cb416cf40b6",
+    "signature": "ed12ae2dde8e3c14a2f8c432ecf55561cea069c380a2841c7e95b436031bd91b056bab4d726b72de65b86e31a15232b0800e8bda98b0cb0f126dc6d3e8fa5a0f"
+  },
+  {
+    "msg": "f91aadd09f46a84d58c22fe00e",
+    "secret": "198b6f5d7aca4e49229ff53b11d292563dda6b950f6bd23bf1d5a87d3778bbd6",
+    "signature": "c1fcfaf2ae741b3dcbd7b87af98b14f98afc98f260fda1f16b54215ba55ca73a0d8f3c99fe6ec867dcc4a9e0206cbc8f95e8d60b612e636d60dacbf5f7cb110b"
+  },
+  {
+    "msg": "b68aa81da8800755d4efb9d7defd",
+    "secret": "98d4d3ee424fc2d01f65bf60eed223862dbfd1efd8d5771f1f3ed6350e2ca30f",
+    "signature": "41a369ea3204548d7d09c7f5e9c3e8111448ca80527ce6818ae606e9f0b4f4ee693149ba349df4d98cad0e8a57f9e36ce880ba0eed374d5082b51271affda80f"
+  },
+  {
+    "msg": "9afd7016f4975f838e63f2fd6e7585",
+    "secret": "8236d0768b2a475907a8c747a4e7d83fc9690a49358531938c8022117feec2fd",
+    "signature": "92c5b4d63f064f90c2a6cdea5764f44ec3ba8cd9bcb986ad43ce92e2e058666ede07158ef3ac44c1da48b915381717d722211f196d83c3eb4a84acc0f1857205"
+  },
+  {
+    "msg": "b71a5af398fd5be3b4ecdae59f88fdee",
+    "secret": "547f853a4f8dea7de28f6d3af5c8c077c4287399839fd5a0e8816508f26116fd",
+    "signature": "028cd8f41ac0f8a0c51b43492cfc4b99d7e4884ed9031978b8a72fe18410d1af0034f3597765c777168ebb9908e1e01617da701dde4c3baeccffebb07747710e"
+  },
+  {
+    "msg": "ed6104a35130477175a0141885fa00833b",
+    "secret": "b21dfb61b16d96e78ddbf8db8044e04cb97f63b86010bef90ca3bfd83708578f",
+    "signature": "b646e23ce36ece52c893a40a709e6a8dd80dbe23ce66d1c86df315234337daa7f09493a3e1a27fd6b4a5b613d79ef3605fac93db07b6a3f692b15f01b8567909"
+  },
+  {
+    "msg": "388ee13864adc1ee643661ac250f07f81ede",
+    "secret": "a3d70d1b6668ff2070d07d6e2e58b0072ae76bf155124a650bf5f82307dbc022",
+    "signature": "3892e2538db569d39af09f15c40f6efa83ccbf4bc72f5560a667f382c62621b0daf6fba1d536b12b330e343b1ee0ad851a20660731e06139530f76d2941fea0a"
+  },
+  {
+    "msg": "1517844bfb0c0e58d7d4bccedd0b8b57b6032f",
+    "secret": "2042eae92fe7bc36b99f2c459c8a8418c9b238f31f827eaf5ee255d831c05c1f",
+    "signature": "3f75eb39d9db14fde28dce006f0750ca1abe62704100d3b0aa578777bc02ff770530079dbd6d5e31d5c48805af69e85cfe4eeaed55464cc4cc9ee2863afa8c00"
+  },
+  {
+    "msg": "d79f2e0f0a33013deb71cc2978ee1d7246251408",
+    "secret": "597b5ac93f03f85281d74b5f57450ee294159f5fe1da9aeea8477442594d5908",
+    "signature": "3392db1c13639c90fe1ed2fd69a125dda2beb15d3fc92aad1e32816c6bdca01b429505d307bf745adda1de0d9c8ab4d23fdf561858f54b7485fe2e866c747203"
+  },
+  {
+    "msg": "9e2e41a59d252efbd4b16e66d15b46b2bca120b6a3",
+    "secret": "cef558c5e37165c090cc354251e05e0e13e50451eb3ff3b675c236c19a29a378",
+    "signature": "c68dfd2283bb939441864180348375e9090cfec7fdd988715674428b2f8530cd7d65abd90d06983199c1b558078f4c80414da0a656fbf93be35d10097d56720e"
+  },
+  {
+    "msg": "4d9c3fd816935485e810517a79503b5d44e9e00fb914",
+    "secret": "a2b3f03c0a5c34444a814b0a399ad0fe65f4181fcff6a59f2d3ca061c53f452e",
+    "signature": "3a2bef91bc5fc230a7b99a5eaa88054497ca9644531857f7c7aa0ff99b3e9fdad01e12222d68810901e39739a1be89840f0b6b9fb72504e52115349af6d3a70e"
+  },
+  {
+    "msg": "b4d18e314a0649996388540bd0ce67d7cf4d890ad7f2c2",
+    "secret": "a3e1d7e3957039114f63db9b5a9ff7e38ce0c85c679096707dc6900441311c7c",
+    "signature": "3444c1a59a87a08de6d5da1fb8612f93ed4f6f9b5d61313769115a91265cad6a9006b85137b72c9aa64fb4c401cc075a3e884667cedb933f36617b2748046006"
+  },
+  {
+    "msg": "71524c8eb7ac5defb4812589ceafa852a33442832931ccde",
+    "secret": "829c2addc95af0a91a400b1414a4d7c8eeb310a50883f6aef12f429dddce422e",
+    "signature": "14d822257b811ecb3649624cf0078d9b05871c34612bcf84464a11d3d442a399142a5c574fbd9da392084dce2635a206465996c751bc14d819b5dcb74082e30c"
+  },
+  {
+    "msg": "083d009ccf4bcc9d562e6bfc34c515f0433426d5bc2aee6491",
+    "secret": "956dacf5ca973d8d0a80172bc87eccce6bab0de83f275b22b3b8b380c470f713",
+    "signature": "8c0d2c4fee7a5e24db678e4307294d13f79cdffdf6f59229a830206b404d6df53fb4918809b86a2f93a50f48b56a9e1de85bd5a8c8a75bc650b7d77f143f8a09"
+  },
+  {
+    "msg": "7d68a31eacd5a6de1fed51a6a78dacda4714095d4ead6b3803c5",
+    "secret": "54a63c9142170aa9b8cf664233d0a13e08e9d945f315b154e4dac2ca7f24e6c4",
+    "signature": "04f9b5a835997a94bb60516caa92e238931c23379bcdbfd7315d283312decfa4403a81a61109b20348507e9eb5026d266fa7e0b9f01513ccbc50301521e6a301"
+  },
+  {
+    "msg": "909d8cedd4dd6fd844ea48979bbf6d6eb1500ea35b0a1e03fe42f9",
+    "secret": "808dd5c5c6a09bc1999d563f61c11744d02e2db292dcca1d35b28b8e95b648d9",
+    "signature": "8bfb815806a6d537a130905161910264746ea4d3ae3f21d00241cb951a33ed37fb321767c0c0e99508785beedc7ebb1b70c0159a79ac52ba723768578f32f109"
+  },
+  {
+    "msg": "d8a90c2076459a6a3cb028454072304255b0160f111842edf3e86c9f",
+    "secret": "9e77296d4eab9b71ad1d0571d07062ae9e04e9ce7a82a5adcd501c234943f6c0",
+    "signature": "532af5836a18addbe867ec6d466b8236b72ef0442a39fbe757a4d92c39c3e42c68fbd405b4f2bfacf6716bc503bcb491398c4d7a53bceeff0b27c084445aba0b"
+  },
+  {
+    "msg": "75329831073147d0117e47ecc5f1f4d8350574d796fba818c202eb490f",
+    "secret": "d3885adf94b44b433e839997e0ea2bd75ae55577369983a81461c1ccdd132422",
+    "signature": "4996c2f686f3b4334115ed1b5a160e844038301ee8846c4bf8a775099966b6a0fde9f3bdd30d7fd5fe3ee3e2e28ea4082546ab14cbfa9d8ec6849d01539e1d0f"
+  },
+  {
+    "msg": "78dbe7ec4799ab24cc0d7e8e0bab374114e776e6ee381d6506ab830031cc",
+    "secret": "40fc403dd4f6657f3eb82db5f6c4320ccfd93550d2b8e056d0f290230527d62e",
+    "signature": "4f226823f2ff34b2f13bc7e0b88a2003581977d6537750e740d4d2bf2f7aba55fdfa730008e37bf083b54f6b8c19e889e4630c62b4f51517d364c979a86df10b"
+  },
+  {
+    "msg": "4cf9d398df60f62f40f1bbe2bea8bfbc44ba7c1a20d3958e4aad9b5c2514e8",
+    "secret": "a9dbcbe1df7cde66c8a39acb64ac2341acfd24c78ebb7ead74761c058531f4d0",
+    "signature": "726564c95dcb3d5aeb4bf82737a14eaf36b131d80e85da5580a0cfbd7aa24fe40c0326895b5188f574a3f22f9cd538ea933191e022214f6f3945e2ec57d56005"
+  },
+  {
+    "msg": "b0daf0583c1c08418b792b875860b6303fd5e2db999cd20c97121d0afc262c98",
+    "secret": "d9196bccc5dbab9e7ed0868224a97bab2bcfae7f9ec2cc2c27f8a44e1f1beb9e",
+    "signature": "ddc1bd980982953dae41f6ab3f7d329a15077b4fa6e43e50cbfb1c1b71a6866092ead5310927415d87061d2113dd045f436d51f5b0ab0810cb5eb7cc90faee09"
+  },
+  {
+    "msg": "0f5e53a2b993e88086c2cf2483ba61f3f700445b5e072e3aafdb19e6df792cddfe",
+    "secret": "fa09c12ad283dd16c3718842e4e6cb66a1826881465840de75c81c94c7d8a405",
+    "signature": "b6eb3f94efe53c85094b28c1137dcfc2bf3d4048f167ea1866158e2abbfa2951eba663d5c40e5b307ce33f827778bb4d5f77c1c29b229fd09788ca184e92a305"
+  },
+  {
+    "msg": "466e01d60ed15164a4496b66b71ebb12b1afc60d884bd593d61a33775284f9cd1f04",
+    "secret": "0f23759ea11f1d3c57d3f7f907dad7df618efdce665831b222f2032cfe24c6b4",
+    "signature": "c10af8c93621c0649d8813120a5b6647c4d489e9b61fe7956ca852baef4be3d44fe2e8f1e3e0d33c33bd972d388ae1a6752e578ec861cce8e98ac0c3b16b2601"
+  },
+  {
+    "msg": "06db42089304d50bc332c99a731c26b033a524ee38da75cba6f470bf495cb0a0304ad4",
+    "secret": "bf421b700b08935b93e3ad1e4220059dfaad973557cddc9d402404fa6e53b702",
+    "signature": "326f8fee62ac5997a173d8c2e5cb656c60324ed131998f8fb94e2488c2d3dc67af1eb85e617025074ac802240783443e66cdf1a6b808c497e99f6ab301cc1b02"
+  },
+  {
+    "msg": "2ab5bfbd471e5e75da553139481beb87f61a3b2ee06f481abf58f0468dc7eb1772606c2f",
+    "secret": "4dd19bd052722a23cd574e4ef20c39ec566376412e2c3ac7aae9233a7c0f81ea",
+    "signature": "ed66759652e3ecbcd57f5f51c91af39eb5c7ced908914cd41a9a56c7fba056752c9c7c3e1493ac49b3a6f93b4f22967c66ec585062ec6e197b2f69d8791d650d"
+  },
+  {
+    "msg": "491f9ebdfdc658f60eb2b4aecc2f6df16aea28e7d2faa2a8b4be4d51fb691560d46cfe1cbd",
+    "secret": "f9d806909f5073423bf3c99ac009a6da8377fcc98259ea1874b07729f8108d92",
+    "signature": "ee3b850319e01b1653e7ea8a27eca322d6bbc7205b77e0d3e68cb256d8ee655636bafb905e1267f6d893cf17d256438b843488de94663a4cdbc837dff5354e0a"
+  },
+  {
+    "msg": "661cb7fe373b0f4e406aa834f93f9cf65c97ecedfd6d5939654588439598ea0d3727aa48d2cb",
+    "secret": "23d4728dd86637edd7bc9c982ecdcb984ed49f6f3989bdd22b9bb5af418a89a2",
+    "signature": "9fb9cbaf8212d60cd72e114c269e1eb3fc82b2b44bc5fa8e06e99b10c52a34485eca7231b20955da442930108055791867dad4b9de4bbadb252fd3169c827c03"
+  },
+  {
+    "msg": "73c0f459d7e39a1d46be2be197e9ba966548ca96420505dfec30f17b62826bbc301853cc1d6fe8",
+    "secret": "d64389d6e08407220fe5c645950f9766ca4fb52268f0b1b351e77c55a42dd01a",
+    "signature": "200722ff51d30ba48be9b4bfc4a3f0aabd23de60ec02956ec8eedca838ce40452740e6e618d86cb4a18ce3e837e19fa005ed3b5efc5db5294eddb54fea7a6202"
+  },
+  {
+    "msg": "e88023331860527fd016ea9f506c965edce768176ef6a88cef284cd1716384b90da56012885e5796",
+    "secret": "5e664ae962b824fb28b44b4ee39add25555a65bb72da628cae3403c4727c4eb3",
+    "signature": "bc17cd458503d85e541521af3e4e41a2e94d2187259a538421714b62f165baec951bdb4e2f1a1d7b1474db031a36e0e7882decb5fef23069bb17eb486c8b560a"
+  },
+  {
+    "msg": "bd506994d55e6806331ce320c67116818c19f4166df82c6d81295a7ac8764a2523f8ed9eb52f6236e6",
+    "secret": "964afd25ff6ae08cd16dcc0f6c1d6fa2331fa5eb8e5aed2b531ead983cc4ba22",
+    "signature": "aa68839de2669dd52137d2e4fb2f27993815338fa97e82a828e21df9ecb0b7aa6487c6371b2b2017fd8399f3addd54435a4c207df89b219488cbc1ac32a10507"
+  },
+  {
+    "msg": "6165baf9695027057ddd5fc156e6a488ff50030485362d22c350d28de14dd70102d61ae79532cfe7e7ef",
+    "secret": "16b72253cb918177b3b4dbaaa42e5d6b9bebf8668b9b9cf923905e25ce15043a",
+    "signature": "2fe7563c0f7e8a942e265884b559803130eabb99d011ed41acd06690ee0ed22bb84cb8abe0c65e188b455e74656bd60128d73e41139de07288c5b11e74e04f07"
+  },
+  {
+    "msg": "1fd286cd7b8041eb8e95339df03817f1020ba73cc8399ce75b445d5e35542ba4c93cf7926e9844ef16327d",
+    "secret": "23b6be308e4b7254f41ea8990c27b4b2343361a6b724981e33eb9ad154a8d99a",
+    "signature": "c07c1c56c38a29b65810b32e9334dfccfe546ba231e1e261882ed96d9a2580f4d5e5aaa1f7cf579d4c497ebb4445b9e08096502414eb2e7088e031025eac6002"
+  },
+  {
+    "msg": "6cbbb7324fffab6d1ca6b519609ba79a28d25efbcfbfdb4fcd4bc8bca8845117349453002d0ffea0c7945e32",
+    "secret": "27295f928229ab3598bf59d90998d8c2fe267d546b587cfbf497951c8682342c",
+    "signature": "22e59619225c7c47d2588c986edb4a8a361987d217b71276e14acc88e8de5e2bc72b118750be6df94c8c394e4daee28a5ffc4710378789289d8f713b877a5000"
+  },
+  {
+    "msg": "d351b6b57e0b01444413ac3d9cf7ac1ebd42666fd66e8f08cbe06751143eb398892320057941dbc50d746d13d7",
+    "secret": "f69e27942f96b98d8b5c2d4ceb929806a07a9998e59f641157c24b5b20011c66",
+    "signature": "36ef3128044457272b67ba94bd3b2d9abe6fb40b54cec2948c7fff2830998aa16a0322c80f328d51ce64bf69f360d5543cdb731fa0b03c048ab7dc49de755408"
+  },
+  {
+    "msg": "0c02a3962a8f58057d938c66fb11d6ff7817feaeca84997a7b4dcdaeaf3929dae7f91de39584fdc9716ff526e3f5",
+    "secret": "03977d96781d00e529a68a3a701e00a41d72c7bac940a9a8f091e392da2da33c",
+    "signature": "8debb6e8f77121b9f020a6502e9cbe87987bca131dd8ca7b0da0b750653eb7e1e9c343ef4d0037d12a04155fe1776a9d1dcc3b25c82dc19d55f0edc4176e3f0b"
+  },
+  {
+    "msg": "6699d86e4118d0dc72eea758e89d7aaf123fd175e961b301f2045caf3e8702687ae1f4accd8be6189ee57336e6c47b",
+    "secret": "7449239585dcaad79afd0c0bdb31c50f6d06433b9f986916541a6d7951b4d718",
+    "signature": "203c2985541b5b4c4aa329c1ad6f3478a7fe8b339c439ed61fa4183c50d82d2405dbb2ed5574ae9e7120f6b7b6ee249a0fd950a2ad33f0a52506da935966180a"
+  },
+  {
+    "msg": "3f8ab7c71215ffafa2ecaa90909ec276be8214059f1f59d94dafd47aedca0ae27a744f4021f8d921e83fdf95b68d2d10",
+    "secret": "e14e9b9b05a74d78d3587c166c6bb42506b133b054c8fadf8be54fc10bfcc633",
+    "signature": "b02e85d9c61eb89feecff7012ec68b3367c701a07845e91c251f8c75fb06fd7e9f2ac5c40e5e47795c93b4e184726e51be13c28f971441bc0cd9cfae0069860b"
+  },
+  {
+    "msg": "3e1dae215aff8efac511316ed4363b2d4ddac813471bc7d43c6b8ebb58322d17ccf0db08fcecf4b1096e73bb46daf0687f",
+    "secret": "379bcf26e38f4d33e7d2218ad843a404710f8367269197626aab2727e03ff60b",
+    "signature": "487ab592c44a5dad6568802e820e6d6826bf72389516d6b6750cdbd39f1b98366b449375ac2ab94c8ca814ddb70b5e382fd74cff41e76786735316b72b9aed00"
+  },
+  {
+    "msg": "",
+    "secret": "3649ece8427b101cba77b060c3fe59a1976b24cf78e371dd759eafad7fa534d6",
+    "signature": "cd86fd686986233539ecd31f8cc7c929d4e048e1bb178be099ade8f582e83ac6801b3a4f0a55dc8ffb76d33f01702d507e05210ad8487bf07e91fe25583a8108"
+  },
+  {
+    "msg": "95",
+    "secret": "ca397e3535ef63bbf9de34bafc10bf39638eb7e33fef42d508747a8960574c18",
+    "signature": "51395032ed5558bb20d81f32c07eb890116013281192957802f8081c4373bdc70ba55af063e817e00c6891ad5287d232be474d385372663cc7b5e1a7790d420d"
+  },
+  {
+    "msg": "828a",
+    "secret": "7362747987cd6fc2782f5ffc37467b36a949bcf7c915211d32a58a8105e1b7dd",
+    "signature": "15d9a5ab247ac93e0ef69bdaf6e94a12054f1d80abd919afb2e87499f1598e853c6e40707cc50546f3ccb4b3345f66ca8d5077adb13ee48f7eb7fd53592fe307"
+  },
+  {
+    "msg": "715b1a",
+    "secret": "c04fbeab76614eae5c770886b3f8c93a62f7f1a1400ae8b25cffd74ec1c8ce48",
+    "signature": "d11c34ddef402522823b2e3abcba2b689ca52ea69d075747453c68524915df3acee345a38700395ec2d77d59c0d1b5d594af09acc30341ebebecf63263806602"
+  },
+  {
+    "msg": "2e3eb5ba",
+    "secret": "906ce921888483e5717f3ce44fb90a17333cdd474345ef39b8e5b59157862999",
+    "signature": "98c002e1fa2e2473f6ab2660e1a4db4e641b5a910bafc67f57a7ab7808a6ffc00eb215ed31227d7f82454809fc65551f1ec714075f9aadd449b8d5fdf163ed09"
+  },
+  {
+    "msg": "ef55e39330",
+    "secret": "7b7900fddb6b1559a8f1bc1b6a1e68af562300201709a95bccdab3a1d19a2cea",
+    "signature": "556cf6d9e15191741b2a6a213414180fb5355d752508052020aaf091db8839bc7e7f64aede395f7740857c31387c328e64a0f9977de28e70c5d2b01c3d5cd80e"
+  },
+  {
+    "msg": "c94f96d9c36d",
+    "secret": "1f3be56578589aee2805d73b66a89cb05b557b4a219a306a4c251ebe8cfe98f0",
+    "signature": "39258bc55e2847f683490e43a8a815aaed8ccfaa2689a6976df257d0b90442ab8e3bf08835046a57cd88278a8739488c3f2dcc0f00c5924b8514e5c128912f0e"
+  },
+  {
+    "msg": "2b5db387ca22e4",
+    "secret": "4b1b8a820c051473c82d609fbebcc62ef07492d9bab7c3e1af2911287cf373d4",
+    "signature": "64e4359507784f1fab477a16103d94cc0eeed69a326bc5d39f999a7b05e5be5d723da6bc737be1ec96410e1f4af2bf8390b9a64abf4bbdef9b2ecda12bc7760f"
+  },
+  {
+    "msg": "86b340ee9ff1062e",
+    "secret": "4c99aa0bddae4720d9b9d3f609c6c96b29b8f130f55349e76202e83713c6ea5c",
+    "signature": "51797279f8208fa0a58b8efd1249f364aa94f96b1f9abee2312e7564eff0b142a10c62fd9b1683307598bad3b6816e799dd41db87eb06f630e9e0a07e2ef8b0e"
+  },
+  {
+    "msg": "0e6fa0c7fb33910b43",
+    "secret": "412658bb90bff626f970210f002b85da4d5a57d21ccf3424d01ee7aaa5ef1f40",
+    "signature": "99bccd2c54e099f1ca64fc6b2cccf770ca8e1bd36e463b09939134450590751dae761d626ac0f0be9eb6688cbc938cb7c3bdfc88648a2b8d680be4854e55cf09"
+  },
+  {
+    "msg": "0eca84252317c176842f",
+    "secret": "c8465766268fa7075924d32a784e9c5401049290c0b792f283c89b73f7812c58",
+    "signature": "342c73e5894b9970d36a54f1aa20c2d9d7e35533b9c9a9e526b8ae1a3004f724b68cb8bddafa01644e00eb44b55e8cb0a5f519698854fc114804838f47bc0f08"
+  },
+  {
+    "msg": "3dc672063165fee87b210f",
+    "secret": "fc0c8e61d89ea2ec1b3484f34377d1fab75099325d16bd99595aebe2f3119e73",
+    "signature": "8c3630e8c0a0cb71474f940320a9785fa1d6bef5c57f0955d000aa6da97ddde7ddd414670bb74af2c20d6dd79153743315d830ef52f3e54b3a461f953b506c0d"
+  },
+  {
+    "msg": "ca6cf782a1d1829b891fb08c",
+    "secret": "378bf5829684cf4ab75e901068a36ec42140f469158c19c76abedf07f1105743",
+    "signature": "d0f0fcb2da1d9c719e5220a020c2f1cb679225fbe6a3a2de94514112ad05deb52b2b2fb8e6788780356b3b0633253eee7addd8bd9aa448679bf5d73eaecc5209"
+  },
+  {
+    "msg": "20214043a9a0c96613b916f76a",
+    "secret": "cacf0196a4a13245be33ccc846ac5837fd15a16d0f37d1333c55e79dbb3321d1",
+    "signature": "527c968a607106fb6eee7c2f9ad8372cc0824eed4e98ffac0b1a5c12fda58f9892d00adb920033a5b24f19102cdd07c93f2dae1aa65766b5ee8f52407f62c90d"
+  },
+  {
+    "msg": "5cad140587d642d883c6f016177b",
+    "secret": "6014714cde61671984639187a856c4e3d1af9c3160b8cee9a1bb0ee8179264b9",
+    "signature": "1582d6c3eb0f8bbfbac443e3497f3b830be63b7269e07c5a12e24db9d047041eb84f723191ea5b207d1bff6fe24971ada4a739d387bca29d4e1ee67df086b302"
+  },
+  {
+    "msg": "46fd983aa0e68c3c7055444a44e1b3",
+    "secret": "d27d0d674a7b89af80a1732c350991f5f6df709bc4f3d8b8d45ad31ac821e64e",
+    "signature": "22658b246b4032fae8411f0faf40006391193284ffee7229946965465e3c13c63ff939d8e631aaf81580d164e14014d9f55656975933526e301c5a0fb5fca10f"
+  },
+  {
+    "msg": "f057e7a602e42806c3ae99a1e84e7bbb",
+    "secret": "06d24f20c4799b8bfb14740f58faf6ee2ec6c62bf4ec2c704f2e033cb698d7b8",
+    "signature": "c9514c37616a12a06ca1b0197183dbae62ac84bcdf3e28e1865b66f1bc71e35153edd8fe22498b2202bd98b857c3ab3b6cf7abfb41199a90ad66e01535320202"
+  },
+  {
+    "msg": "75fb64579ad73047d611f8d75636b34a94",
+    "secret": "d6ea7f197b3ab202b2b5ec20c6dbe164cc074e107564e74035febf9b0e781451",
+    "signature": "ec3f26e245fe81ca8f264c7d28727e0280c39e9234cee5cd8ebe1dfec9c105eaccbfd09aa705a1133bab46c3bf97448d639e39d43caeb90d12c11c94c3733108"
+  },
+  {
+    "msg": "50dd064a197fa5ec6faf88c9e0853ff26c6e",
+    "secret": "36e3ab98d9707b36df670a24d036d719c4fc0879188f4e12e0377956e10f9366",
+    "signature": "f12a74e957d02e077639187abb87aa6dea410d332478e8293c107eb370ada6dc30cb2b22e21be7b272b08f73bee727f86f825cc55eeba96b508ac42628a2db00"
+  },
+  {
+    "msg": "655ae28d05b42fa1bffa4b49dfe2667898a003",
+    "secret": "9f7f9f81ffba51b119b7daa1edb65f35fe6030b37b59325af8e192febfbda15d",
+    "signature": "a618ee0708aa88380d7a3ffc0b1c897dcc58fbc7321f436740257242f71fd0370e37b0ac2d4869f775483616ae9f0becd12136f94b22ea3375d5d466f4083e05"
+  },
+  {
+    "msg": "2e81045378482d5cde1331839c7a96cc2f7d178a",
+    "secret": "7e8d31e42229138bd9cd42498c249333431c3cdae1da2b836c16bd168845e3eb",
+    "signature": "808b3625afc01aa5efa24ae12b416ecd671c946e666f01fcdad9c499f4a307266e0622ae659632cd6c60fd5a8ef3ef9bb415a8f0ed1f1e57e5d5db5de9231803"
+  },
+  {
+    "msg": "5032a7fd8965c879b80ef63afe838b9345d42085e6",
+    "secret": "485d73344925efc16ee233cbbcf01494472ff9735e3dae60d31fb79c01d0bfcd",
+    "signature": "9a93db7126b7df17d26677560ec4425a4b92e20ff436449879b3fa0f03dbcd6443cde8c88f89dc58dc22f9690d1544a87b7fc3e5384d97639c89bfba46f18008"
+  },
+  {
+    "msg": "8e9675bf7fd7d0b006463ba284413f71401be341ecc7",
+    "secret": "c04163e216b561dfeb6c0b595be01d9bcf02f82c9149c8d47922dfdc05571abf",
+    "signature": "7e09f1329141f6c8f808954e63ab13e60cd8b4cfded761cb3e418e854bd4df07f6900385efb79d701c0e0c108c6fd620f13b9acf228fc1dc489ccf10e47be70e"
+  },
+  {
+    "msg": "797602dbd67269f1299f5bcba576d336b6aec85bdda1ef",
+    "secret": "031789c76b54d41ce9708d92c390f103ddbed48ed303d79b11e8cbd6c3fd51d5",
+    "signature": "c1a620832f610664ddbcb02bec8ccb529afdb85f4d6a218cd8f5bba031008a5584d395d7051060b32f6cf2abe534f147048f05e3adeb62b175e7baf92cad0008"
+  },
+  {
+    "msg": "7f2cee6e1a865d64b74606784b1d4946773b8b8730d57816",
+    "secret": "6ab579119045a31c7a6251433a08209342d90bf68ce208a978b92607928cc5c8",
+    "signature": "2ba2c38288bab092a68a9bcd52363f1292e08a78fa02b8f6ee67900849ae342ef250f6e7b669fcb16484c5b277a48acaaa9fcc78b7e5e7c34af7665600779509"
+  },
+  {
+    "msg": "0e47bccd76bccb58de57960234fbfae391089bb949f36d82d0",
+    "secret": "692724dd8bccbe27fb007ffa85baba8e1c1641a1dced88c222e1d22d02179304",
+    "signature": "edc5d226107c1a6b6570c4be462395557d3ef65a1a761544b8bcfcb851eb74b6c9e787ee9b13bc723d297f445fdd02d7a640e079dee9fd05529c5874d4a88a05"
+  },
+  {
+    "msg": "55da20a51582e10981042d2c35cd1321a08b3eed09f0a19401fd",
+    "secret": "df2e78ddba0fb729ebc4fc2044fc35371dcffa20ac135021d4ec2c1f2db1e6c1",
+    "signature": "98316215a056c999c0775ebc215f7cb2c6ed75bcd6b2829c82cd752853beead57f35a7fe38800e84dde148459b5e3b6d280f75f258b494ff01fcf7fa2371c800"
+  },
+  {
+    "msg": "6a19b5041ce0cdbbaf2ccc252b202deba7f6a71a1cecdc51ef2aee",
+    "secret": "9864f612767dff80a0241b4fb56c7c625baf94c28c8026637dd2d3f7d3fc5573",
+    "signature": "9d9b5326283b0532ebdb5749acabc8948e29af7a2e80dca8b49d3bc26f5343e878eaf12babba5adf368db4f35677eb43794292d4037335455674d277d717fd0d"
+  },
+  {
+    "msg": "bc745a47275a853b281d7fdc1c059eca512549af2c18a228437bcc04",
+    "secret": "78afe3ef521a2088d7a56adb5ba43eca4fe651965fe61fe7d3a6e5970fccaf61",
+    "signature": "d9e324b313521798fc7dd3a14c891c8020d193fbb1333bf49c79fcbe57646a48fb4b16b3095cfdf7c5ad8ecc579dcc9fd7adb1d05cad254b6d17a83072a15c08"
+  },
+  {
+    "msg": "ec60035f58f56782d449f91200bf609823253e21975ae9d00cc10881a7",
+    "secret": "e783b58713de2b12a5ef4dea6b61fcac29012be1971e750bd283df935a7f7069",
+    "signature": "34c12faf8f6a56f6ad012d483e097da6a51a593b3938556f4636678e46e2d146d292537b8e775dbbedee366b8d1e2719dfeac6ea07082df57d65c3e7e2512a0d"
+  },
+  {
+    "msg": "2147fe43f82ddc3cf962b88b2de52dc6b8ea7c29160ccb06e14d42fdb298",
+    "secret": "7ac8a03385998286d377f75597dc52e26345a2baeebccb47d18c3e57a5d30f6c",
+    "signature": "1fdd00ee6eebed1a929d3a7243bb57938be5805880fbaab12aa369f96f3ab74a3250ccd553aeca3264cb91258e81c1efe492b367c4d151301242777a96f3cb05"
+  },
+  {
+    "msg": "5044b534715b70f6666fce3badabf7c6780d1862d2166b3d31b8adf1b9d7c9",
+    "secret": "943cda4bcc42b59fd8bbdca35fd6d193491d53f8ef90b9586aa45acbf512aed8",
+    "signature": "450c1de39da3ad136e96a0c68282477ae8ff2758d4cd906c939071748b0114791d3c2fbfa15f191a3669a35953a193340adcd11d86d47f32ebe569fb35a16008"
+  },
+  {
+    "msg": "d3dc1f82be80467cc3e0c8c511335d16e82271835f7d4977fa2669fce8d9aec0",
+    "secret": "ac729ec4905ba157d23e6610eed6aa2f0446cb270258d3210ec9f154c37b374e",
+    "signature": "d2a31b63fdcbfc3b57aa5211e632ae8f39d728ec32a063bccdf89a32683d43bc5b8980bb9c23fc9674486de9bce337ce3efba49b0b25d8df3d1727d28c063308"
+  },
+  {
+    "msg": "0d4ad4474e1adb9918c38bc10bcbf0887e5a660ab250597aa063ef1ac2dd50ba3f",
+    "secret": "9cef9c04420ba45c1a309326fb833173d254261ce96edcbfa17a20a4ec42a5ec",
+    "signature": "5f0004111ae819bd1c5c4d88cf223b61a1a62d97c88af9749c574485f1bd794800a99bf1ba715c2674cb459ba68e31092b850fa3e0193418fb5fc973b6f1da0f"
+  },
+  {
+    "msg": "ff03abd4ea9e74abf17dc5603f6f1eb98562f1a49fbe4f7ecec385e2529f23e02ced",
+    "secret": "f10016c5c4a4d3643b3093e1778dfbb13338ad66dcdec310c37d0f842f28f668",
+    "signature": "2c2bf167e05db1372bd1f7689ab2f482d035160f6e7784dbff53a4eb017531e56ac9a7278d8109e7dac5d60650a58d4cac15ac6f2c405e1801a2514627da070a"
+  },
+  {
+    "msg": "4a241aae0a7568b8e26256e38cbe15f700fa9ab7461550230649cfc6630c495febcb63",
+    "secret": "9d6c97933f01a446dd63ab7a3262c5773d394d45e90d77d25b59d15fa963564c",
+    "signature": "68f7bd28dfa0ba38bff4e9783b3293af1cbf47154897a1a8d5e576b1ee547d8fc9bf709a5c68145e7c7db419007292773523079a4a4d1c312cc4a7ae30903307"
+  },
+  {
+    "msg": "513a6af466a81178f592ae0ebccda8b6acabfbae735c63b20faa57b7f2995baca34d5841",
+    "secret": "169966f59f4c7c0e27883e24ef79ad20fb6452bd4a2ad2ba0b4b19643629fc35",
+    "signature": "8a4aed7c95f1a6ca9167873878074bb6525eaae04b1cf98053efa2fd76e070f58c9a44517ec40d6c888919a74ada8743fad674d5cc0471900b5ce36a282ca10f"
+  },
+  {
+    "msg": "b00a6c1eec3c750d1645a57bf9eddf494aa43ed666b69d4b8b8f3828bc972281b446171ff2",
+    "secret": "385b4f65e9e428233969c76134697f4c255993376254bc6ea1289f7ca1357e6d",
+    "signature": "37fb8005634cdfcadce7275a572013331f16ef39cb5c0f81236014dfa056d6d850d3213768988195f87319ba43612e2812c7fb8077b425498c784fe8aadce50f"
+  },
+  {
+    "msg": "f4fdca909fbe5500494e34ad8e018fd07b1fe5b0ea09248e45ee0b347460ee845b0df8bf7ae9",
+    "secret": "e3317d186766b0b917ef38af522b01fa0a5be0970cd67c4514270e9243520d54",
+    "signature": "41a2cb393536b5c0b31cce44312f64824f5ad63e8006a733790127ededcddb993910b9178b2a048e524cdcc6adcae8ea390746ab8be4941309ab95253de2040e"
+  },
+  {
+    "msg": "703176aecb5dfc64f2cc51086f20059bb2b1a3858aedc8406f34e41f6e0430853eef16c88566b8",
+    "secret": "22c60bd19ad06131fb3e1276da28e1d2e48284f91c84081d5ac889b43d8d337f",
+    "signature": "cbfa317cc757c98a09f6e0e1c38c389b59fb5861895d14208e6e35f2537aba5e118504f690f8e033241de3880ffcaf6bec76bf46eaef14bc7c97bd0ec9ed120b"
+  },
+  {
+    "msg": "f3bef8440e52fd71ab00c74eafad5c8db5e85de1ad253bf8e91983e560727df92ec825155721d839",
+    "secret": "5cfff124190b1139b2725d457f10b76a902a5faa77aff97b34afd0e1019207f2",
+    "signature": "a0569112807894b4ffd87b6eab44e30eef847282b8858817bcd33ef3aa64d4e0aace33200b766b14fea47d4e0ac68531e8e4b907a37a1e4752181d417a3a8c06"
+  },
+  {
+    "msg": "d2aab2d61aa063f1da2b81df1334457a75653463e70459a8a5928e3894055ece0af67aca436fdf96d4",
+    "secret": "3e41db85b3f75a718eca247abb0b8e49192a0fbd5da1fad6f05ce9a187905ea8",
+    "signature": "ec414a78385c1dcf6713e654c7f1ce21ba4e86f3d36fa1db4434379fd6f1e0e7d04cfe546308bc4e2aa548da8f33ce5d7b57006a176370c9574f8d5e8a7d670a"
+  },
+  {
+    "msg": "8003fcccae8cea89a2d1743cddddbfc195d771e94e3a489adc652ef3628e7e59ab9ff6b1401ae6809fdf",
+    "secret": "a4c9afede9a1cc2c14176e023bdbab6c02bc8c42042ab3b5752c14b5ac2d97ac",
+    "signature": "a7ea34bc04aba74c7ba2c53f6321483d892f635e5968321f04a5f581004109bf8e77f02ad33aaa51b48d3e2f68eb71d80d09ec16b3c5f3f7dbdc90430e953f02"
+  },
+  {
+    "msg": "79a06ef07dfa8f62a30d4c0d2f43681c3d45a5fde20ac78b24060ef855c760039fdad8fe6b06b16a205d05",
+    "secret": "3fc9ace4887e33425bcca94c80694beaa9d439e742c20ffaec8c811981c7db2f",
+    "signature": "bc5f6fa1a226a579184d006fd5ecb38834e57d68ab48f96f4a85ad03d9c1c7615cb1d56e75e7b110415ae136ee039471207395136b69b166659322658f55af01"
+  },
+  {
+    "msg": "c6813445e3a75857eb3ce49302f2f96fdedbd0987f1ecff702adafd1782180b165d990dbb2284d1b91cc9b1b",
+    "secret": "d3b72f6ccac077b4c64204903908e34a5378a51754a9d879c960e3bf4e7ce24a",
+    "signature": "a3f31207bf5fe1a473362ae0b590f87a8ba69f1654cd6c008ee6e39a1e7bddff4a58b11a8fb52291ce6a0ec60246360e858908790b914c4ef38d57aab99bbe00"
+  },
+  {
+    "msg": "022e8ceea7812f1c4981dd3adaf9bb5f48c94f9b1bae0b67a72c686656f41e0cc51d5e348154ee0605346c125b",
+    "secret": "c5e63ddd9e37830ae0a7a538dd631b34f3a11a7599d53ae0eb6ff540132a1380",
+    "signature": "00a94344a8c4fbc856cb1588454a2f69ab35708864885e49f21b4fd1d2df2ea84c2b37ae1f8f638c1cf6169c84943f48a23101d87389e63a780e299ff9c20e00"
+  },
+  {
+    "msg": "2457ca4eac6c3baae944ef3ac6415bdf60872cc704e526ae83be0167211818400a7a79d739e8d5bf732a5f9b11b5",
+    "secret": "d2e54e32c4428ec2e58c8abc6b3b396991256c63d9207b43e5eb0c2857c80590",
+    "signature": "708343246b46c238886dff519f04376fd979e76b2e87ba64b6634924413e5660eb73fb95d2954657b1695da2565879bfe1c53b141fbb34268c1684cf267f9701"
+  },
+  {
+    "msg": "20b8e01eec426b2337b8f2a89441b7f1fc9c38ee98bdacf24fa7c6f6dc6f8d0ea60ac6782f4dbf28bc085ae1e4267d",
+    "secret": "202a8a94ba2c24f2d48171bf86367ea5a7fa4a43faf70ea0f6f55f970a125595",
+    "signature": "5158ac5f594f2d84bda84afeef1d82c1fca10ce38618ce96eb66a5fc0729d5346cb08870636719c6d694944769cf4f1bcfb61a3562cef96a34ebf0f0d0e1c500"
+  },
+  {
+    "msg": "f72dd28acc422443eae91065dc54e9215c13cc30831878f07110a10231e0272fbe377ca390446965fff315c86d8efc4e",
+    "secret": "79def281b7781ddbf85cf3a22e2b6f9a2b70799287b54e823516bb0f62c737a7",
+    "signature": "470456951a4051943f81b7491ee1509cc30da74f0e33e493fccc4e9206198e3f224ef27d82185a99215bfa461f52fd259b1817937148541c33f49a0d975dd503"
+  },
+  {
+    "msg": "4f9bfc6d0726b96d4eb265d1a535eaa67ff43ff8b6f12e5e98424ca63a50d50e962b4b6a2e12954b49d89a77f30f1ab4d0",
+    "secret": "bc7c8e62731a566f79f3569dc1a245268fd2b97376b3ffda8f425de911f8fbaf",
+    "signature": "116a7a24e4c090de93318cd6773ed0f065e3ad4bc7974c96a91ceb51162d4b0122210be41d1996e071af83a1b755f5cb76791d83891313a38b47a41eeecf8604"
+  }
+]
diff --git a/rust/tw_keypair/tests/ed25519_blake2b_tests.rs b/rust/tw_keypair/tests/ed25519_blake2b_tests.rs
new file mode 100644
index 00000000000..a8f4cacb02e
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_blake2b_tests.rs
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+use tw_encoding::hex::{self, as_hex};
+use tw_hash::{H256, H512};
+use tw_keypair::ed25519::blake2b::KeyPair;
+use tw_keypair::traits::{SigningKeyTrait, VerifyingKeyTrait};
+
+/// The tests were generated in C++ using the `trezor-crypto` library.
+const ED25519_BLAKE2B_SIGN: &str = include_str!("ed25519_blake2b_sign.json");
+
+#[derive(Deserialize)]
+struct Ed255191SignTest {
+    #[serde(with = "as_hex")]
+    secret: H256,
+    msg: String,
+    #[serde(with = "as_hex")]
+    signature: H512,
+}
+
+#[test]
+fn test_ed25519_blake2b_sign_verify() {
+    let tests: Vec<Ed255191SignTest> = serde_json::from_str(ED25519_BLAKE2B_SIGN).unwrap();
+    for test in tests {
+        let msg = hex::decode(&test.msg).unwrap();
+
+        let keypair = KeyPair::try_from(test.secret.as_slice()).unwrap();
+        let actual = keypair.sign(msg.clone()).unwrap();
+        assert_eq!(actual.to_bytes(), test.signature);
+
+        assert!(keypair.verify(actual, msg));
+    }
+}
diff --git a/rust/tw_keypair/tests/ed25519_extended_cardano_priv_to_pub.json b/rust/tw_keypair/tests/ed25519_extended_cardano_priv_to_pub.json
new file mode 100644
index 00000000000..72dfa59ce6e
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_extended_cardano_priv_to_pub.json
@@ -0,0 +1,2002 @@
+[
+  {
+    "public": "a4db179c005d3d0906c67fba2af0b1b74af9d8c3856d4f47e7ef856e95ab906923b2cf101d0419123231f604cc80155614e5595257ef598fc94fd85637973c64b540f854650e5e32d0961a5bdb7c7ddf673006644514dea011ccee16e49f96a18d9decee025aab6deac1d9a227f28ada4f6bda9fc67c533e417388139d663f40",
+    "secret": "7608214e79fb386d3c48d96084f3af17684bda520feaee0c499961b28d7958cee5e1bd6cdfcce99e95a58a7234985e6c635974e757d45f04bda51c29de7e961623b2cf101d0419123231f604cc80155614e5595257ef598fc94fd85637973c64b1fc032a5d306bf973513f617868fefd019e089ec592a0b34ecf17c7a6f220cab697bc4963f5e6921d92ada9e67b9f1c4c0049995d38fbdc48b889ddc91df5e58d9decee025aab6deac1d9a227f28ada4f6bda9fc67c533e417388139d663f40"
+  },
+  {
+    "public": "3c5d1dcb1aad445aa88982d5a3fef525000e8ccc30b977828a55bd957ada9935ba2bbd8cfd270d193cfca4372febb15fd19c4cee26f94e0fb1b3d4f7287f044d97adf0f1b8ca9e67e93cfa86e47b53c653f3ff85506caf0a3851dbf3e43f90a30fd81b0c1148436956d5a546d45628a44c3dd6121499fb58478ed5a3038d4611",
+    "secret": "079a15370bda7ffca3962280b883ff55e9fafdfab3e7dcd449cab8baed4af498a60ec734f0bf50952d5b44d4edec0b91d53ac0e4b40768ce0d3b5f1f3227619dba2bbd8cfd270d193cfca4372febb15fd19c4cee26f94e0fb1b3d4f7287f044d4f53b7f9fbaa3ff066eacddfe19b1b81eb1d0dd65fde1fbe54a4b3c71d21951110da06966fbf2805dcc41d48e2265dd60bf45bdf1ed43a7c8f10d64bb83840680fd81b0c1148436956d5a546d45628a44c3dd6121499fb58478ed5a3038d4611"
+  },
+  {
+    "public": "76bcd96d0f2f0252046da32595883b99d66355c26e187f27c9954091123fa86747121ff8e1f7776d14e33efc86ca809236b1b74e9ae7d43d5ab94151a71f7e50606060f81b13c893510f56b6a9f9f8930b2fa99a7ad212939b0f7482ceaad48872fd21da6fda1faeb5b58f290de3806fc0b0a78f080f4703747d5678d713f587",
+    "secret": "253b79c87603aa98f84f1e3971e7343d24279e4a3ae2f1dfc16792d6bfad1db1960fcbac421d3b0e40abd4411aaaeb8dafd63e42cd7425d8ede60bda0685870347121ff8e1f7776d14e33efc86ca809236b1b74e9ae7d43d5ab94151a71f7e508cf878169ce4ba8e1b5d528b2b0ef7e102a11414d69913c2a71f2b68ea708a19a61283b962d6fdd1920374cd8e6799b8be732dfc4c0c692b956953fdd8389bb972fd21da6fda1faeb5b58f290de3806fc0b0a78f080f4703747d5678d713f587"
+  },
+  {
+    "public": "2f9ba2baadf9a8d71b5501d2d0863dded91d4dd603e2c52f82ba7f431ca07fd34728b8ce2bb8cc1dd7ac8b65b9df480e389fb4f9add088a54f4f973e373cc179eec81d7c8bec4070d3d32f59c597cafe37016782f74a4cf16227ab1db1a0ea90374d9c0bbcd257b6862c4cf7d45f4eb4268f480912a516d5e0182175bac9d7c5",
+    "secret": "ec8fedbbc03717de45108abdf0692ccd1ded071bc665c1412225afeb893447a9bbe0bcb48809634bbe7f46a992d008f01d14ad9e7cf2fa1b46760b82983a28c54728b8ce2bb8cc1dd7ac8b65b9df480e389fb4f9add088a54f4f973e373cc17992fd82917030497d9946de8cbe340989650bb93a3894c7cd44b933c40005f4f2ef5e3485be2e0955b17bd1ec40dd1240fd643fe9051432c0ee19615e9df5bf65374d9c0bbcd257b6862c4cf7d45f4eb4268f480912a516d5e0182175bac9d7c5"
+  },
+  {
+    "public": "d1a159d151aec2ff1228a1be62164bbd2f471d53051baacde86f44807a119d727bb9a0c01ba4e6bbb8fa78385507457e76067648f6d84b7c971fb03d388088923c773d97de236741129a464f72192461df8badada24bff1373233cd072003297c849f04f0ad8cddf49873291935f7c3180bbbf6d0366e4c1d2ef7c89db18b209",
+    "secret": "8b1010f9e926ffe7ab4f88a40b40c02e940df96d7990ae8776fa223202a3abe5966de461596b65fa23f80dbe1294721d340b319e3339095908140c981be0ccef7bb9a0c01ba4e6bbb8fa78385507457e76067648f6d84b7c971fb03d388088928765d2aeba3b2da4f2d21d739a01fcb67212c0e039248afc8e4d1374c976f064dd5bdde7eda17b7b26e55a7affc3cd085612c87d111f61cbc6e401ab109990a3c849f04f0ad8cddf49873291935f7c3180bbbf6d0366e4c1d2ef7c89db18b209"
+  },
+  {
+    "public": "9cb0af351ffbe327aedfddc00cb6b01ba289e88fe69d8834e1be93b2991375acedc9e7be7a8388c83384b6ae25b2acea01a85909f40b5917e901254903b6ba056f159d3ae4081ff7faa3943d991d616b1daa028b9f0a048a553cbb32b2683495867a60af436d78294f9484b5850cce58c1e277a42f23203a325ed5665947d1c8",
+    "secret": "fe2886d526c3c2bd0bb5d64d3afe4a38529fe02b954858540738fbdc36d14fd3ad8151e971a3476f609d2de2dfb8b9ca0d53bd4f56c88f361005a830e56fafecedc9e7be7a8388c83384b6ae25b2acea01a85909f40b5917e901254903b6ba059512b7fe3cf0ee4a2d5dd5b397bf117f714abc2ff7d67a5e101accd477cab07c13855fb4eb9bcd8dd517aea3fce10cbda2dc6405ea508e86eb985fe8cbbfeaae867a60af436d78294f9484b5850cce58c1e277a42f23203a325ed5665947d1c8"
+  },
+  {
+    "public": "ffeedf9ee09e6a8b6ba4c512f3ccc2b37146226953fb7a96fb4cc563331856cc1c46787c9f71a9b58af5e7175cdbd7c32e3bcc460d6d6ac5a84dfef5c4ffa116485f8ccf83fe0b02197b87db8758c113258c07772b52b6fde789fc2f46431e51b7203ca9aea19f573d4352d4717d33072d28ef5816333a48882d9da2ca9b52ac",
+    "secret": "999307b88fd8877a5cc242fb92ca6043e795fffac0e5bdc03b0f1a8ffbd0813f79ef180d35589a084a11a53cf9ee45b213c4fd185dcd5b3d64d06be6663d0a7b1c46787c9f71a9b58af5e7175cdbd7c32e3bcc460d6d6ac5a84dfef5c4ffa1163dcb9a92fe73fb3f11c773bff7f7c9b79ed15ee19a9b2e947dc63a0b49e5e44e1e9be37355ac800340b44dfe8d47583c1c193d8fe62520c123e01e30a3ba6204b7203ca9aea19f573d4352d4717d33072d28ef5816333a48882d9da2ca9b52ac"
+  },
+  {
+    "public": "5133b7c2815fca37ee132fb2294e2c61629bcfaac3bbf73af8a19106eef9d2edfe80c56e01c72325614bcf2c99a0124181669b8e0f0ebce8cb7716fa70efa67bea768ad0e46b5ec25692ee22669f7c974258ce2bf1a455669cf0365cdad5be3be9abcd6bcda70eeb633d8ef8c0ee588fea450869aa96de917ca636ca4d8d9f2d",
+    "secret": "86c27964f7ef60c847624b2e0ba25a22b5683e2ff2a4ea414f3c995888aff8b5d430a6a7d14826506dc8d63797677b9dd42d154b19ee311c2f429c0dd6ce2ffffe80c56e01c72325614bcf2c99a0124181669b8e0f0ebce8cb7716fa70efa67bc69740a9d95246a565b2e10ee7dc08faaac49556dc427a675743d087f3f5a0923c9ba780e1728f138c645069c2a907e73155986f04e9b5d239a1e8e335728dc4e9abcd6bcda70eeb633d8ef8c0ee588fea450869aa96de917ca636ca4d8d9f2d"
+  },
+  {
+    "public": "2d4ac77fa910fc3ccb69bb9f02a17e431ad3ff36f388a6b43714b3c7e6ca7aea57ab1f6ad1db8faf44cdeabaf9e1dec51ecdf32c1d22bfe926765fb410e467d5bedbbbacc12dde7eb384792ab08e22d6d665b1d2f06be7e15817cdb3dc04f45c717c3fb588db754f39ec9ddf2dd6e12c753a78b16020188c9bdabec1aef54975",
+    "secret": "609094888b49a3c54f2dd390e6f47e2ec7bf43dc85a0598f054bd4396eaf5d13c82f9cd1d03bf0ec10fda23639338283f6b7d5c179bb8fe0a20f7b9f4b10a43657ab1f6ad1db8faf44cdeabaf9e1dec51ecdf32c1d22bfe926765fb410e467d555f1a4303be749cdf69d5bd7b52cabbacfb2ad8ec2bc0b795e0f6ed4055d3b7eebe03cfe4f6ab0aa486b4da592b833d57d75395ddbc016972a714507a29894dc717c3fb588db754f39ec9ddf2dd6e12c753a78b16020188c9bdabec1aef54975"
+  },
+  {
+    "public": "4141541284b02fc2996fb4811b79e4a4b6ea1e969fdaf21fc27de4bec0847f1f1bfd6d7ab71faf9047dfd0e63ca5a3f10b4a1e5365a83726266d24223997b1dfb6e0269eaf8d39fd593926f6f9e2d74af017985fc34b060f91eb61f48c6d3820255dbaddf3c6cac8c2dc4d566cb78f9a0fb0d9997df930cc8cb8bdb9c51c1e6a",
+    "secret": "2a67660f17b088515cc8816d80250b727523dead57b548d053ddd76430b438274b123e7999866c18870221892f7f05a5446c23db0b2e8484755e92b4caffe54b1bfd6d7ab71faf9047dfd0e63ca5a3f10b4a1e5365a83726266d24223997b1dfad2760eb7ce9a6efd9decbe2fa1cdceef70b54bce2dce6762aa7e13555984ed5694004ba203ef5ebd168c3325133ce61a9e3c4af1cf28d941d075c79508fdf0e255dbaddf3c6cac8c2dc4d566cb78f9a0fb0d9997df930cc8cb8bdb9c51c1e6a"
+  },
+  {
+    "public": "b2ab866497d7307b5f466ace43b235f2117ab208dee2c8108742f51e874bf56723a267599e520726d2ce9482c8da43e5fc971d16e3e420c9b66be59e307296d798df2ae0af88b0ba957c49fc8cc35b5d7571d41586b55b9aa60b44167baaf069563d4f95bca71b6412518a0009420a1fea3a843d19ec01af4095c84cc79bd40f",
+    "secret": "a1ab8deb033197623bd15e29abbe454da1cc62ba05060d17197e4e3f5c5513c98068ba6237ff64093f4bd3f9444cc4439b22a3fcc9f19653b1d6e5a145cc773e23a267599e520726d2ce9482c8da43e5fc971d16e3e420c9b66be59e307296d719deca3c6f07f094acc037e345d5628476ef6802ca66d4ff4a74c00fd847a87ac687af64dc63a48bd1b3e5fe74ab6630637db2a1e9a531293a3143a8ba8d6b91563d4f95bca71b6412518a0009420a1fea3a843d19ec01af4095c84cc79bd40f"
+  },
+  {
+    "public": "9be81c1e9125d942a6de2be35ab74425fa5402e92610cc66562215db0acbc42df7d22c4ab153074a21be9ac4d2a588927139135d781401125323cc3334c4fe8074873677ce2d546d1050696fb301020ee12f8637b1d2ffa60c2d83f486ddd35732fcfc7bfec0f7b40f19d955dafc73e6b11da982c4d1b0e86ccd71bde3d7934f",
+    "secret": "45b6df9e20e35ba729ca7ab132da9f3d869ba835e3538b741f6ff4fcbb95313c31dc718aadd379b65d14b1e33f7bf4532f00dc1299c3c739d5743aa832218ef5f7d22c4ab153074a21be9ac4d2a588927139135d781401125323cc3334c4fe800b1be8e3d1e4cb49cd5210fb074b0015d4c201e6b8857b679bcd6f3b4030d2b7a3d0f2d8bc284b5af8f3968b00ec3b6810de49df60b220659d24e6c1c3d3481732fcfc7bfec0f7b40f19d955dafc73e6b11da982c4d1b0e86ccd71bde3d7934f"
+  },
+  {
+    "public": "02b5b6b07a4c1fc63299e2d9fb4cecd7447b652fa4dd4bd0c5513a731dad841b4ce355e694a25f83c84074c7fd7904876abc860e75716d88d86bed471a8df5851a252c893679eceac2c91c98ec476d921d239b56377348e86cf3f47b2dc320197ac7326b2c2529928de702cc8326b67fcda4f997d68a904a248a67199d6d2663",
+    "secret": "11ea783d020705cbdbb4b5c79657057ac46fea97bf53f706e75572e6e875be4ef2812830023ccd95e881ee84226e128e2f49c94661e62dadede3e41114236f714ce355e694a25f83c84074c7fd7904876abc860e75716d88d86bed471a8df585c30b8bec8b8939e5addb191d2018ed0be07785e36b78eb29c0a2207b76b28a93f5db7f73936ad2eb480674fb48f1deedbf56ec079c368679dc1b525b79886c5d7ac7326b2c2529928de702cc8326b67fcda4f997d68a904a248a67199d6d2663"
+  },
+  {
+    "public": "97b038f242449e321a338f689b8a31ea21f38a4e020132b61632e8124d92a6f4c2d3603cd357392d309b0751a9b4474ec80de38d41255b0fc93e47c9ca798b4b3d9f0720e903c825022cc03e862208302d0cb2aa79481b0b71572bd5975e7e07072525b013690baaf1c92197be78bf831fd8a9ebbb28302bc0f334223dcd04a0",
+    "secret": "c06ee098bd7476d9703cbfe9a7aa010efd502e5f9a5d8e3f057ccf5035d485ffa8a38a92d91d002ca5925af9f77144579e7d5768c6b5dad27601e19c5db7f35ec2d3603cd357392d309b0751a9b4474ec80de38d41255b0fc93e47c9ca798b4b2a4c3b83f3f1af450b0bcc70634e44a1324f799fcdf705b5a52524bad812673d4da293ad5b7d46c9a0538490ca1661ebfc9c6fd1a36ce740c62b3bc51be2d5ae072525b013690baaf1c92197be78bf831fd8a9ebbb28302bc0f334223dcd04a0"
+  },
+  {
+    "public": "990337d9d1048db27e4223a711b6cf76087b28d5ba01b446c1053eeda25cbf0c5ed5d37addf8f604b1063936a7a87d1cfb18c43fcce0eacdcf11bb0650fcbb013886b2bf35b1b74a9048bd4f4f7a9c5481783bb65b7c6c5407bddc6b6d6e3c0ba05f2082070d1b8d14411c14f1453088dc2720335cc87786fcdb6135eb978c5e",
+    "secret": "b8cfe20c037dd8301fd5762edd1a07a6cfb7ee0bf143bb3a123c6172274450563101bbc1bc36d63d3da6a4a8bc213540cdbcb6607286186e1b8a7b09bbb70c035ed5d37addf8f604b1063936a7a87d1cfb18c43fcce0eacdcf11bb0650fcbb0157efc45dd0961e9cf4260e4daeb748fe2a8642f355c1ff42e8674422dcf4a92f452ee93a9f0474b2a40ea8d351c9c5db52b40a3f314ab77ba407e10d12175d6aa05f2082070d1b8d14411c14f1453088dc2720335cc87786fcdb6135eb978c5e"
+  },
+  {
+    "public": "2e131d6c4a1d372a5408c8becc850a1a2e40c3a08fe543ab44ff6ae0be9177551e573204639e419891b4b2c8d50eefb41b31c983a66cecde960b158975a859464c29b8f8963ee4f154e82bf45aec0fc4b0f9faf197ab24e5120785434852553c0bc91f94c512d6b5c754e3603b57ea10e17e5423a40950955bf6d2bccc48314a",
+    "secret": "40afd4e82a58bc8ee7742e9d5cd91f49268f63905d50d5a8f77f178b21b366559a2a48f565bd66f96fb8121daf2a5854c53a96d89b9311eb8c18ca71bbde7ad21e573204639e419891b4b2c8d50eefb41b31c983a66cecde960b158975a859463355f8cd196b2343e692eefe8a9299518ebabe4f2d9ea39db40b559d6097fdd8593c7d0d0334a2aa7db8515d6681ff8bad1345b2b24b2028fb4e3c0a22a84ee20bc91f94c512d6b5c754e3603b57ea10e17e5423a40950955bf6d2bccc48314a"
+  },
+  {
+    "public": "0d27537d7fdb697503c65097b82366ccc1f58d09b8ceb9800187d42d60e118ea120fccad0fae858f9363d17841fc6b26a81bb874a4f150ed107ec8ec65787b5bbf229fa51d4710d87c8454218e91f305e1d52b707c4953039ff78c2768132f86cdbff438d4680cf77b3ed9bdde0d08b854bfe9b21a2fbf78e0b32cd617796a0d",
+    "secret": "abc2d745f632b2ea59546d439e5b3626d2247a4cfd561cfebce89e31cda36f7834697465ca16b80d077ba9bd1af908966eda2ad1d67bfb44ac64d10f935be7d6120fccad0fae858f9363d17841fc6b26a81bb874a4f150ed107ec8ec65787b5b765d99e46bb811edd0e54875a4b26de9c6b6aff63c1587a4dcaaa962ff41f858e20530895201d8e56e49e8403285706b122e0a6958b1f90198abc365d6b07f20cdbff438d4680cf77b3ed9bdde0d08b854bfe9b21a2fbf78e0b32cd617796a0d"
+  },
+  {
+    "public": "0bcb4c0034088a7ce210a9c8d3ac4ec8ca69bd1544c6e98c8d87d8ef3e0aff86b2c7128b5578acf5a1465a2eb3e00f3b50c7309ddde65b7d8f0cca903a6042e2c57b7a0553c9b04788e28f70c9c8a493a830c8ed4079666bc130f2bddf9f94f8a2f7cc426cb4c9ed786b875bd9f216245d408fabcb74bab4e9b69a5d3fef50db",
+    "secret": "f73815dd273a341fcf5d57de8c17b71978f55a397b89192b1e84f0bf55d25761fe343a25ec7ed424ccf13d68ff2e81f083df6cbf7031b61db3c5017e1f2fd384b2c7128b5578acf5a1465a2eb3e00f3b50c7309ddde65b7d8f0cca903a6042e2eb9c6e40628839ca499ae54585fb1dba308b3570da69690a06b9af2bcb7865c5584a23560c720e60489d2b5756617044463f99a050bf83ae2267bd3710f1ee05a2f7cc426cb4c9ed786b875bd9f216245d408fabcb74bab4e9b69a5d3fef50db"
+  },
+  {
+    "public": "344a831d6df5ca85abe3fe790fc4d093473bc49ccff0342ca46a95b4fada96950f4ce53d7530c5865faab0ce900579beb5952194c7f4de061734add0edefe4591e5ede2809b45d478c93f513abc1e3ce6a9b7ff0892b168c905252ce8dc0f945c7a642bf10b2bc63e7d9f988da01aebcfb8d239fcdf0ebde62bef9e7a487af28",
+    "secret": "18695ce7d39a71063a15c90c4f80373da9b4fd0f153613a31216b02bd28b9ca06ae4108523aa63938ed811c5e4e7b2001490d9879bbfe1bfe9df27cb027103740f4ce53d7530c5865faab0ce900579beb5952194c7f4de061734add0edefe4590f95a7fb01a2df7ba52850c1a7e3ddd4cbc0fb6ff91d2332c51ae2037f14f2e421313d160ca5cb2eb4fce1be1b9cceb5ff20f7372d898578b35352abc096ba8ec7a642bf10b2bc63e7d9f988da01aebcfb8d239fcdf0ebde62bef9e7a487af28"
+  },
+  {
+    "public": "720afd999e9f16c983c1aeaf2f6a5e1fda4eab529337ef5c24e92819f4a3a70a38a0f6a15ccffbee8a53cea5d2cc6d08a41d2412e14b7d09e2395f6e1ade8d7d4921616aae0fbe7952f8f1ac09ee22dc89cd358e6d1e02b60509e03571da1811edc3551909b88b46bee950f461d90412b1500fabdacb5e286428386e9da995a1",
+    "secret": "3314c0749f7ef58b1e283711b870b5ea8a56523a5fdc268bade23ef4e201d95f52e46e4bf0e64e9c91ab661a3c142453d3a66788ff392068cffdf84a9ddc2d5738a0f6a15ccffbee8a53cea5d2cc6d08a41d2412e14b7d09e2395f6e1ade8d7df53955b47285a9d164cafa1548ca6537892c767a29be8e8b9e70468c976fdcc20de05a999b1531d2292c28de6d722918fc1d1737f9279063d14ceaa9f420421eedc3551909b88b46bee950f461d90412b1500fabdacb5e286428386e9da995a1"
+  },
+  {
+    "public": "31e8d01fc6ce7b74e622a456d64821c8fccf7ac9f943aaa2a9203c89bbb9446a0f3c706e57ef54602c16ffef63ac872e67af43796020a2fbd701838b0af7521f089552b19758c6ab7fff56d7ebc0ddfdba79708fa2dcf406d64977f556433b8e4ca384ade31c9507ba64ab9c4fdd7f8f5fcfa74a1deed78bcd8821f31ed60e8b",
+    "secret": "c9f9b3bb3b7f3072051cd1b33aea7ef72dcb105ce5e393295a70bc376375812c9735832f61606918a9de7dbafcb76862f737e0bb00f66b119902d06fbe06b8d80f3c706e57ef54602c16ffef63ac872e67af43796020a2fbd701838b0af7521fa3223432e2cb9e514d70a4f7ae20c43d1bde03aa1c32f0bcc5dfd15b092b8eda2a074e005b21e6b1043c9b648a3674f4f76d1bb542c9648a3e1502a8bc56b7de4ca384ade31c9507ba64ab9c4fdd7f8f5fcfa74a1deed78bcd8821f31ed60e8b"
+  },
+  {
+    "public": "ed95592bd61d79635a4daca366d8dbb0fbae04447c0ad686cff205867c1ada2a6fbea3f11d74528ebbabdea1c4792ba400e810c33d8447476d319c0c44133ec01108386adee6a0f986aa10fab96e5d6d8900423474d7ee726d578a5349ca15574fe2eda1766de28c7942f79278e2666348c14aa51b976ad1582b611377d11ee5",
+    "secret": "67dd95a9c409e9c9c32a88a74bdae36faa7bece273ec19ef1e23874799cebb43f8cb528777e90628da5e6f3c4208829acc22fe43ee716c6f6b43585ab8b96c446fbea3f11d74528ebbabdea1c4792ba400e810c33d8447476d319c0c44133ec0dd790d46c94943f04203b9755fb9b850cb715d265d369cefb30b9276b849b5a1d6859ef966cb82623cab552f483917629903c8d9788dd63c90998a079f79ae2e4fe2eda1766de28c7942f79278e2666348c14aa51b976ad1582b611377d11ee5"
+  },
+  {
+    "public": "807e02d6fd3929a0bcbc09518a7c50a33138d8d12a677e26c610523c12483b6669284ef09bce3555df4d935913ac12d49d7074264eb922e7491cb2ad06ee66558ae4abda01a73d3dc68b59863e55d47b658cc80e3b6413d9240690d1e2f3bb308074284680b4b8b4cfb11d5b6e0ee5ab849fb51b492edc8ff5bccde4ef68e5da",
+    "secret": "5e12b1f2a1ae0bd257a2725dcb85645222469361cad14763128cf7beab71e9d95d58db52929d571b45e4b8b616a9d96bc30b626b7e417b5c9273aafa787929b769284ef09bce3555df4d935913ac12d49d7074264eb922e7491cb2ad06ee66554e38800b6f5682ae2f5ddb2330dda620c371461278891116caa1aba5d69044390fe1e4ff4da096a6e2a6ef137d271ddc40fbde753ae6deb3b55a89c5023c79a18074284680b4b8b4cfb11d5b6e0ee5ab849fb51b492edc8ff5bccde4ef68e5da"
+  },
+  {
+    "public": "a6e1882a92572bb33c00d0fcb0ae586a1dca09368507450be37814ef0bc9b6b1430b8948700785a383efd728a4bcf32441bd97a2ba6286dd3c3347a98e4bf695f115786883706a6be5998f39a11a67ed32d1d3b2a5757b9ce24c2affc71e650073a1124df5dbc6c895afdea52054924f70a6cc70093d9759066aeba6483e2b53",
+    "secret": "d5e3f79cbb05759ed6b64dd6309d792cfadfdf3d42dc39aaade6c048d93a362d756459a973c4ae7a45c16b6ddfa7006902dcfd1af8204e4652772b6706769896430b8948700785a383efd728a4bcf32441bd97a2ba6286dd3c3347a98e4bf6958bcf69ba9a3a0a96ffa76956a6510a31367073ca2d426074997d4920fd3ce612e36adf5e76b8fdba5573bbcd236e23db013336ffb3bc2480f1a06cba78e4132773a1124df5dbc6c895afdea52054924f70a6cc70093d9759066aeba6483e2b53"
+  },
+  {
+    "public": "734c62c6d2de5430d58ca1dcb31da7e8cbd7c6aa3fdfdbe8ee3056638080182b85f1c687e18ffc6f39865621debbed66d33bb5ac226d2d10f917614a9cc299c56b7de95eab38e49c1a666705a86015e578d89c7d65f5b8cd0761394e6cd18d4c8964e4ee7377268ea670371d0111fa6f1e289c9db096ba1a8a6093ae4694573f",
+    "secret": "ca9a817d47de153026782d4d806d4e3d60afeba01b1997efc99c91f63da725503e965ceb83d48b84afe9368d2cefadcb8a1d6bac766566c2a88665cc88fa249f85f1c687e18ffc6f39865621debbed66d33bb5ac226d2d10f917614a9cc299c5b6a43c8f55fe3c8fa2b938d9e7241796bb6ca63bf2afa941a8a6177da52c0a70118376267880dad955d8a79ef81d2841b810f5d263bbdbb22f1ec91ac9b491b28964e4ee7377268ea670371d0111fa6f1e289c9db096ba1a8a6093ae4694573f"
+  },
+  {
+    "public": "b2d16a70e1170704e24b8fd80826e73a1812a4c66b2db1557486541a6952aacba357a360fab2d57895eb262e31c1632008376e8a7bd3c657e3912023c48370f8895f2b12468414f76993b1d8e3d0ca23d6823967843b12540e2f5b8ed36447839fc8b75c50e82fb04234b05b9ee19147bb45ebc823ca96cabe76b81fc31ea15a",
+    "secret": "01118ef8e6b5d19a63e3a9364cfdd225fde83d389bc9bd75466fdfe843c362d5a496591b7de884914fb78c8760c1b25380b8e7e8345458400f5657a0bd0235d9a357a360fab2d57895eb262e31c1632008376e8a7bd3c657e3912023c48370f886b6b6c821bae1839eaf13fdad1e55703ea437a2e2a0e76e530066fe01a39568d2f1d59f55a08c3e98fbd22ceb27856d85e9ae5d2c743574ff57fad6877e6e259fc8b75c50e82fb04234b05b9ee19147bb45ebc823ca96cabe76b81fc31ea15a"
+  },
+  {
+    "public": "4f89c2d2b5bab4b26853f720151bc00e827d7102ff9c4cb5a357c5d36ae8e3c9447aa5bd0f722f366acce40c299f50e6b353a39bf3d730b36091043e5e76ef431120d0b0fe8a6262959fffd3ef81dc5d16002766c150eb23bc3fb314a94fbbf2bfddb89dfb2bc479252c40fc759798e66c135bd8299cf324e6802498e62d4cdd",
+    "secret": "ae047f4614a1fef5ffbb9482f6bb20d195157c53c278d4ecb78ca577cf4fb2b94034689437b68498482d006cfb33a943b1dd9e5397255aacfc4fae62dc1d19db447aa5bd0f722f366acce40c299f50e6b353a39bf3d730b36091043e5e76ef436346cd43879e8d2c4783d913848073c791e5512cc1da9ddf38461fc1aa8505ca6af1c51e5449b7d256c16815b4e36ae64ca637708c549418e245a644ebdcb9e8bfddb89dfb2bc479252c40fc759798e66c135bd8299cf324e6802498e62d4cdd"
+  },
+  {
+    "public": "6a5bbb3799f9e79abd6c290683b7e1962bb2bee6311ff4b0940137932d7d8ba9ccfc26d939380856f9c0b9aad904e7108f39286489da38d904196354ef6a28e8f6a6197ac2949f44c3654061f6dd54ac8da216ec0b178fc27e8a05bcc43aadfce0719fd94c5ca73b538bccaf6773ad6ff3344e22f1f962853b970d46ee5f78e3",
+    "secret": "75046d7dde06b6f58cb0b6d10259f91f753d03230af3930f0ffee0ce0d9cb7607bad4f19300dd29515c718d9197a808b8c94cad5258472d63bf6f167e4a457a0ccfc26d939380856f9c0b9aad904e7108f39286489da38d904196354ef6a28e856d40b25a519f1fdca25ea8480a1dcce18d9608483422a4260f183d470a765d4d6426ebdf569560040843569133310dd355502b035ecb6c0f4def984ef0b42dde0719fd94c5ca73b538bccaf6773ad6ff3344e22f1f962853b970d46ee5f78e3"
+  },
+  {
+    "public": "3ed7d7a55b2e7b7801aba7fe333c31fd522811f5adac3ccd674c1b532d37784e01f963ff16710d68543fd243efaee4e8d269a6957f8aac112f328b3a48f81c4dbf94cea5779ee5bcbaf595a30519a3649c3bbafeb36ea906290575166c45da9da0e7fd0063abfd6e662f0d6de79c3b7acba865b4648bf32bd831dd5d346c5324",
+    "secret": "650fc35f234b22bb3f711cfa8165306130831526e7232a27691071ab3b81c093e094dd17df93247527cf3b47a8d24779114f2a049ef87e1f8643a782200bad9d01f963ff16710d68543fd243efaee4e8d269a6957f8aac112f328b3a48f81c4dbf44922498b16f8e5497b74fdde67a5d2c2fb969056ef1842e810b7d70f3a11ccfb9659437f141813f4df9f146251540f71f06778de98463500751bbd25858c1a0e7fd0063abfd6e662f0d6de79c3b7acba865b4648bf32bd831dd5d346c5324"
+  },
+  {
+    "public": "858c3834be411da5907e2601666b47060cd5c4c7b72e628d14ff2cf7ec1a80a5efc97df8fd7badcc80e7672554ec8dd90cee1cd33be87ec5fff574f5da060e4b9dd9e10687ce6dca78c311b015a639cdd1cce8f85a9f141612f1f5d6b5a8fe6e83243b093c089442620387803808a4964bcfb2d17130fcf6bf4c02183fdd677d",
+    "secret": "f14a905bb7924823fd8cf867a3b84cb5603e26aa64266371bda3194aab99e9a199d82332fa773000c3b8aa886c279ef0b296f09d6bb563949acc62025eaa5e21efc97df8fd7badcc80e7672554ec8dd90cee1cd33be87ec5fff574f5da060e4b4038022484f2b96163187bd1a463a743185e6182bd31695f1bc28d3878f715b289d5ae4428ba023cae8483d0901b136ea5bd5e68653955b7f06712647aa79f9283243b093c089442620387803808a4964bcfb2d17130fcf6bf4c02183fdd677d"
+  },
+  {
+    "public": "02cc5f260b604e78243bcee01cbff8124249060b1a5d0954fb7e2c7fe1011b8d5ca8d8c28c4beae00aea6a150acda7e02d7024b5fcaf6300b744577c36b9739f4362729ed9f614890b02c1760f82b431411dbf13ec82c2189788d9b085ea8c71dc2739f02c4355d255865be9c516ad035ea0bdea1094489c5da0c39de493c4ea",
+    "secret": "065bae455d2ff5250a5066572713818a5bd80e314d428c8923e3ca6ee8e7ce4b85ae4b39ec8ce2dda2e65160ae151eecb6e20241c4ccd5c573e7331a3106c3e65ca8d8c28c4beae00aea6a150acda7e02d7024b5fcaf6300b744577c36b9739fa1886170504172850b1e00290af7cbc804c2a1862287772cf4c30148cd8bd54048a7aef8fffa0d0b5af58faf384c7ade4c2ff4fd11c9e36868fe2831cad2c35cdc2739f02c4355d255865be9c516ad035ea0bdea1094489c5da0c39de493c4ea"
+  },
+  {
+    "public": "f725bfdf52eef39d77c5d6023c5dad79dd859203430b5c22e110de7b4e7e7f4b31d9f056c4d77d9daf77967f8eb6faee870db4fd9f6c69a12bd307d97571d9123302ac8f8725f6e0741cfab41c9eb61edbe93b95462e7212e6009d08bcc184e04a0857b8a425c13572defd885a7dcf8b6540e903e40dc8e6ec7672110035feb9",
+    "secret": "0973adb948e73a7371e12c8af6589977c22dd7f777d6b2433b3626e9b3a88c263dabcda6ee43421738b7ddd0ea5905b870c197e0008f1eba148a6d03f9f4ef1d31d9f056c4d77d9daf77967f8eb6faee870db4fd9f6c69a12bd307d97571d912207b1ec2195ce7e116b0f7cd54b12d8de3e71584a048c33533f5d137d7f1c8c0323ca48da8798570f05d641235b0df3aa0f301790d555e671657dfb3fa6eca3a4a0857b8a425c13572defd885a7dcf8b6540e903e40dc8e6ec7672110035feb9"
+  },
+  {
+    "public": "401468112093b3824f9aba781246308a53c09e78cda248de622b6e285ef3ebf499a27002f29a85cc397ffff55d0ce80787763bda801e42ce92a2c1763c091ad6b7febcf35fce5eb37a8fd9677f9e1e6f127dbb3c8ff303ac6b949970750bda8877b2a67b9495d9a31a3d0dd7d93752edf9115ba6f6921625f111c329ca1a937a",
+    "secret": "fc34eef21f9e31a88abb50a643a4ff2d97946800074768a2a90fe7362065499ec9073f8388684e7feff5918972c5a390871af233a73c021d368eb5fa690e6fab99a27002f29a85cc397ffff55d0ce80787763bda801e42ce92a2c1763c091ad626ed47bc724af69966ed8e5fd57d646272f00b5f53d30f466c27157939f822a48fb0a1a27b4a9cf15592f59c5c58ebb27bfe5e02ae555d056bd794a62598bce877b2a67b9495d9a31a3d0dd7d93752edf9115ba6f6921625f111c329ca1a937a"
+  },
+  {
+    "public": "19921577c1c7349c15dd6b88009a393b5835be549c672a6fce8937769cf279179cbcc80655b818a4346fade491923e6a3b284627c9c17bce7dce249be2021eb933babd41cda8556d1e18e930f0cf49c95bb8c77d5a4d24bb0528d9a2bc9e4f9943c96da25c54813bd6ae98820728f1dbe0e31da361ded3c2614528d6b9efc6ec",
+    "secret": "ff9611a2ad96f2cc64cae2bb8a6b9dc3c520298b4d244dee2b5030b85277880df7b4987f24e42f5f4b62a835ce8ceea1ed2de6d8c1e32c363fe95c1dbd18fe889cbcc80655b818a4346fade491923e6a3b284627c9c17bce7dce249be2021eb9fea0fb1f02d747cea7f3cf41cde805ad8f6649f72c7a10c803e34277c38747778ef40aab3854c0254fb4ec28c5e6af3106eb77894f1d0dd00c62bb5220605dde43c96da25c54813bd6ae98820728f1dbe0e31da361ded3c2614528d6b9efc6ec"
+  },
+  {
+    "public": "7fe3aa867ac7af8ad6defcf7e52d0c1a925fc35eaa394f43178209510c045f202f9fd5008c272b2bc956e18b133cdab68dd615469971656f69a94b5bda5db14a4da7cb60b291236c81c1616bfc4c4feacb651c6cbe00b7ac86dd802200466a106e7160f6e421e05ab2ca854a5b31ee6e54e4f2b61bb6f432866608727f09ed63",
+    "secret": "4021946cd10820e21183ae9b3b6824a812b302a03d05ea8bcd1dca35cac163d1a97142c9c0349d4019bbb365a9a46d054cb0e2ce86c717a8367d76b44f5ca97c2f9fd5008c272b2bc956e18b133cdab68dd615469971656f69a94b5bda5db14a7ef747fb99e255e136433221006eb0429ea5f070a0f9131e0e2bbf4b5c24687987b87a4d70a87c48d199e3be1a005fc67f042921430972fb5f7a61a1c97ede616e7160f6e421e05ab2ca854a5b31ee6e54e4f2b61bb6f432866608727f09ed63"
+  },
+  {
+    "public": "29fff684e855644ea905c55038704a0ae2c347a5de2f42a6ed0f3b7e254579db71d60dd1f7affd09b11dbf4eebb4231e442769c8bff56b7f2f38d5d82c4446e0a53c5f24806ffcd72712594a2a505ea82d02c5ebf55ba3e50abc8d480049f199c54e682004ae2293046c7774fb987793d54d75a9a83c84e4b56b7fb8c9a1adc7",
+    "secret": "dcdc5d680216acfb7fe22d0d3b717fe775d7b1303d8eefb6d4430a8335dc3bd7320bfe6dbac9458f55e0429f0384f3be26dc58c2692b8042b4e9a159464a07e271d60dd1f7affd09b11dbf4eebb4231e442769c8bff56b7f2f38d5d82c4446e03f3177d6c475501a15ae9fb6f1808a088f502dcd807a23c679c289de364d400819e351fc1d1309f1d347e1ce316f5f5ff34009ea3a19f5da7f19395371277282c54e682004ae2293046c7774fb987793d54d75a9a83c84e4b56b7fb8c9a1adc7"
+  },
+  {
+    "public": "a02d48cf74b417fa155646b29ecac6af9bb4b2f942e06fb346d1f54774bb132f009a43536288081e94d1cb458065fca02ead0e24989fa9d275e03affe4615a44e36ed31fef9407ee819e48b5eb030f7f84f1d8e1b32252d826e92ec4578c033db3fda80eb7a0dc2fe6e8699c8cd35f0df19f0684e16df8c448f5ba0f359d046b",
+    "secret": "b27efd2dc998da5c8b12a9a92f68204e8647aa5c6c95f6abb8e0d3f930056c668f8921c3871311b2da97cbd7b28721de59f8a4ddbe50243cde7eb08163c04c5a009a43536288081e94d1cb458065fca02ead0e24989fa9d275e03affe4615a4433cb5967a83f4e219e9675331f6a435fce900f4c3b45b7b1277f545972a774bb95bf647281bbec96b73c9d51a9d43282da4c3c86069d5c92b708ababa30784efb3fda80eb7a0dc2fe6e8699c8cd35f0df19f0684e16df8c448f5ba0f359d046b"
+  },
+  {
+    "public": "9f0d592b3e4a0cab6ae68a481ea6d62bf2bfe20aecf7aaa491cff860b041cc0a6690410da62e97b50ef0258b77e50d94bd334e4f7b9a70e16bdd894ac65a3f6f0a6bfde25e8cbf830bd98ef022a4c5aea17630023cb57067a777e25eeb8a7d4970c7564eba4d86797cc135e08ce89d50f5d444e6a86f2d65dffc22a0ad276e96",
+    "secret": "712b24a05a4fce8d07b123a4647f6a5d9dfc111e79cc4c51522e64e796ee7082bb6f6bcb2d689dd597bdfc4f15c865e3e177e09ece518a23f55aeed59bf6c1eb6690410da62e97b50ef0258b77e50d94bd334e4f7b9a70e16bdd894ac65a3f6fecaef29343ebbdd3a073f7da60c016aeb71c18d3c7d54dee8056f8e08e9af11e901da3eb66f6264901b9b0591383508f67848b6c5fee018087a0e98630bc23c270c7564eba4d86797cc135e08ce89d50f5d444e6a86f2d65dffc22a0ad276e96"
+  },
+  {
+    "public": "b80c1bc693fb7aeb6495e19e0f2ae7d417b5bd368d16a20bbabec37a550c418943b075b1770cbf84f81d3f0289d620f9b78ee664f2906329a14ec6285395358020f3a43a21d63d77d45e3fcdfe0e8f24d1d13dcd002917550fcb1373658bcd6222ac90e1db7eebd936f07aad274b279a40f11d9c92675231935eeaca567f6b40",
+    "secret": "a1807a0ad24823e24dcba53872d3a190e125bb8856af1f7099651717704cba47ef0ba3dd5742a43828260ee200c672167f709b90d188644b2681e19d38f8fe3943b075b1770cbf84f81d3f0289d620f9b78ee664f2906329a14ec62853953580176733f06786c74d940826edf21d63b6b30f5f150d2edc95c2cd42a9181bfb19236b47d9c2da8668005109a7cf7caab91d28d6032af4fa5cc0e8a08e595b906c22ac90e1db7eebd936f07aad274b279a40f11d9c92675231935eeaca567f6b40"
+  },
+  {
+    "public": "5bc75e3d76b3bae80f5be1b6cf7297d15c70c8534eae9c62f6fdd2500aa1c7fa9716c0bd9bfc62932580167f716fa01b4d5d07ee0948989d7be25360a60cf0ab6423f8464f7fcd0516ee3023b1448f5425a0667c2cea6d5e02147fca277b0faf412ca0de50f7b1756f53160932064ddcbd5d56f8205c98f9b7ee6cca6005dd37",
+    "secret": "27b4ae2930aaa6ce4605210ec2b08214eab4325b1933962d58d368947d0b776b9728c7483dab6128f15611bf237fd7d2395341471fd62262d3bb9992199f74669716c0bd9bfc62932580167f716fa01b4d5d07ee0948989d7be25360a60cf0ab7de54ed0071380b934de9a17fa19f6e45f6cfc0885af603c0c804d5367418828f59f1dbfc199b310ab2fa43b707e07af64390f1d1590231068d473e9c2f0fda9412ca0de50f7b1756f53160932064ddcbd5d56f8205c98f9b7ee6cca6005dd37"
+  },
+  {
+    "public": "75ee884697c3fd78197fd9190d563b0f51652509fee8c8f86b320de08eb11960b725d47c9aa0587b17aedc30f1ba458345bb36e85e714978ae944a31402718524a39385bda61e4c02f8c68dd7baf4c0e6d6246fa86fea291aba4a7ecab9a8d21ca2db4a6723c321e4cfa5029e5be9fc1b06eef3d5f1b56763bd9f6a0395a741e",
+    "secret": "22a8b583a5f27f36c95939d5fae54dd9eb233fe5771398a899856fa997a913af1cbb8ce89fb5a95dbcc8500dfd8bc30450f670528070863e1533279f132a63b4b725d47c9aa0587b17aedc30f1ba458345bb36e85e714978ae944a3140271852f7f095a03eed14f2d82672d223b6e0a4c9cbe396daba886ecf2f92fb971db40965ac28028628f6e6b23f4dcd2d4d34d8ac2791f4a16b93eca6c9deacdd97a1e6ca2db4a6723c321e4cfa5029e5be9fc1b06eef3d5f1b56763bd9f6a0395a741e"
+  },
+  {
+    "public": "6392c9afe9469bd025cf5839cd0824f9a164013ba68d2a6ce15237b2dff295f828c1779165009dee8a91f6c307bc3ecab19bacef376bd681fe1220a44442b471592ee2afd3d1c5a1f908d4b87f02ed59741ffc3670d576aa2d468e76a6be5a3b37c8e514a46fbb84a7a69c9ec549656c9bc46e27be06ec6b3fca9644978b35da",
+    "secret": "15f038cc121a89d458ad55cf75260810adf0001e797ea5d98426fc7ea25c495760dd0c371b186e9c6faeb45dfde59fe8445d0ce5cc6073e20028b182113d309628c1779165009dee8a91f6c307bc3ecab19bacef376bd681fe1220a44442b47135b8965edb7658067bb57edcd40b427385a63ec379a1457d7076d5a99c2505254642646384df0dfef61c8f5ef3c8fd987f21144bb10316073457fea61850867137c8e514a46fbb84a7a69c9ec549656c9bc46e27be06ec6b3fca9644978b35da"
+  },
+  {
+    "public": "3342db472c6f1410d70e184b848b575d3c0bd9be7d429753b7eac80d72a7df60d8f5c92ed56964d80b6c628d250baa4fa9692fe1f5240262b3f4138c22204e99335d509364adbe595c40e0313aee504d93cc076d978b1c369c026328e9557b9f3abe9d54e33a7a409e715b53485d6b119d8125410fff5e1658a47996cff852df",
+    "secret": "cdc39f505a338f68802ae2e8ee56d64513112bfb58fa8c5177f4377bfede579f1c0caeff56ae86a8889d619b04731a5d58c370792a092e508118fa9c92292c3fd8f5c92ed56964d80b6c628d250baa4fa9692fe1f5240262b3f4138c22204e99a59d1ecd404bf6583ef91aa94f7a75e7a50d7c176d65e57c738844690d06b56d97582025675777ce58499d8c53bf62ab70676d10bacd4b5ab6adbb954d5ef80a3abe9d54e33a7a409e715b53485d6b119d8125410fff5e1658a47996cff852df"
+  },
+  {
+    "public": "d8a288c73a40f3728974a80dad55720f0b90a2e15d8ba543bf9866a9a61440c7baa5cdc1e7ae769cfc483bee9c39fe991d6d1f412ebac4a783f39c265cc8631a41250e3c3d7d706fd3db7be1cbe61b261966f60f6be40a7f4648738c5bca3206debff556b524ba1a412061c0420a0ad7958a2db9b44b306413590ba14b8bbe6f",
+    "secret": "73d155cd04ac9bab7475fb6e8f8e061435c83eb9514cfa6fd30ab49b1b9eed36360876a6837bd4610e699242ff17754c38949c59b0ced2d0cd60b10f22c0734bbaa5cdc1e7ae769cfc483bee9c39fe991d6d1f412ebac4a783f39c265cc8631ac50ff5a502885fb95a052d86d095b05b551a3604563cb5b8c2c598951fd5b648438b028a2535aed37aa24b62c77cece578b77bbcd699b1ebbdd26b47d9223699debff556b524ba1a412061c0420a0ad7958a2db9b44b306413590ba14b8bbe6f"
+  },
+  {
+    "public": "fbbc8d126b800e5853254b4dc1f18cbba6fe777cc13daf254f9a08f4b63a7a77edd7a4115745cf64c1751a361ee5adfff493696a7e631cfd64abba876e0d760a148eac6c805636594c1601e0a5ed5a3f86ece6a49fca4bf47884dd810ed0dc05bebdb4718a80b1920fad1dbce18c093757e60bd5a17d3c4f4c4b034be7acbe21",
+    "secret": "7e6ed95f37ad13409b1dcf1cb43083501f5937fd5687ff9d8604e29f5646df174dd3531913324bb69f9b4734a0b5086385b127b4fb90cae19b6616f018a7f8fbedd7a4115745cf64c1751a361ee5adfff493696a7e631cfd64abba876e0d760a68a05b97d73dcdf384434b95195ebb3aa14c3973f3bb0060c97cc451d21a55df3b7f38a1666ddb067ac857bdb4b07ce7eeebe576e7e7fd42469659b4666c3f0bbebdb4718a80b1920fad1dbce18c093757e60bd5a17d3c4f4c4b034be7acbe21"
+  },
+  {
+    "public": "2279d7c22321118a912f79459fbef18a4344a29e9807b50dc888ff74d5d852965bc52a1ed07991eef562c61593bfbb54b54049e5a06967ee55adb6fe87d6080286ef55550e8325be28dffe5c856f489720b062358a634877ccd4dc038797d2fbe30e6b788699d11bc34c88b70e42149e7667f30ddf8048e15c3fdcd7f44cf1df",
+    "secret": "ef6abc6def37ab4baec45643e32189d1838cdac3a9ad784b2c04e7c90b1b405d244daaf6e165b989a3a59a37a1d86fc292f4e8141a95104e5b1fa44f2b21aae55bc52a1ed07991eef562c61593bfbb54b54049e5a06967ee55adb6fe87d6080279302045e611f51d93bcbddcc456ff64bc7d0cc9a3dfcad64ae57008644a3c3b39c7c26849ef6495d6b3141cb3709417727dae7240888a7f8712b67b822c0d81e30e6b788699d11bc34c88b70e42149e7667f30ddf8048e15c3fdcd7f44cf1df"
+  },
+  {
+    "public": "f1b021f5f3f950712765fc809fdd2d1ba13eb3f29cf2e1f7741effdb66392dc6c10dae1edd5b6c4bb6b72d72d181e16ce17ab1c7b096417cc0fcf84ebd3a6719a36a109745651c1d607e845f0aa1487430f3b2286c2b54a7428fbf1fd2085d1b2a0b83bcf4aeedfb5a77317619d55f2c2d546791baa199f0713cb0716d22c290",
+    "secret": "675225521bec85c3e6ff5e117cb77fd06cadd419fc650c503909051fa2b6b9dc93777787cf0d01e7e04e0c86749eafd54c1cf149e83551c4be4e2e879a81e126c10dae1edd5b6c4bb6b72d72d181e16ce17ab1c7b096417cc0fcf84ebd3a6719b3c00bf1a282b5acacb2208264bfbabe27debb129be48fa3c7dcc56b07ed58817fd3a819cb134e7d8000f9055ad06fd4d915df2c63f5677fbd81b6b6845cf7902a0b83bcf4aeedfb5a77317619d55f2c2d546791baa199f0713cb0716d22c290"
+  },
+  {
+    "public": "ab6d25d6c9f942cdb20ca35306a65596b4c6f4f8f9b9bf8c660b7e41156a085a5d8da89bd37f09a6cf76b023f539acbfef70e115ea369172ace31d2da1c9d6f3e745e3671e8211dc51c5006e53798ae8345957f2caba22e8ecd0c65c5b8f769df05865bda9cf8cbd795b9dcf2eb2372bc2a361b9138735410f824e3b589a11f3",
+    "secret": "7dd1b3a777767da8983e8e9a895ff7d58d211e5889d2136a46efc6de7ea2aca23c7572e73ca51d3c1141fa473bbf88c74565f4129ea6b9188e0060a451c421935d8da89bd37f09a6cf76b023f539acbfef70e115ea369172ace31d2da1c9d6f3b3da5bc033e5d1ed69678567d92aee5c98e3f49f20b9dc48ef4171adcbb86b9098aeea9c8f289ffc69b069dfacbecf872c3d6faa3337b3c9ec94cffb13140869f05865bda9cf8cbd795b9dcf2eb2372bc2a361b9138735410f824e3b589a11f3"
+  },
+  {
+    "public": "7b446de3cf9f8d1505db41fdd8dffb8d91b93cdd6a24d9b9edae8a1c826b7f34fde29ffd6dc63004cdcc16b430881a114bb5623e6960dd612b2049d038a9e7c42d555d8b4ff7d14890c96e4fe983cdb43e37061ed479b74d315d5f6aa38056dc813d7f27a1f9f3170166da22f98403e6fcf7a9c371a125d8ea7cd011bc378c14",
+    "secret": "3a1c051aff0ca65447fbed0450a6b1f493c07058cba2b624c84bd391176f8a4202a4b143f22c0b7c669f3ddc6b89f5bdee38c8f4de64c746fdb1d463b9ef57bffde29ffd6dc63004cdcc16b430881a114bb5623e6960dd612b2049d038a9e7c46326aa76890c56272f2154ae75e8e0b0386b92a12370a8fdef06ec5a46cf4b2db80e37f96fe5cfa3f5b0567514bb9d7a7c6859b5736ee6bfe1f94fb15a8be400813d7f27a1f9f3170166da22f98403e6fcf7a9c371a125d8ea7cd011bc378c14"
+  },
+  {
+    "public": "58cdfaca51585dd64a63ab61c25792868e1c1ef2771548c1aef77dd7b07f2e5110ee701cefade4841c9761dde24171e2de52dfcbff42083596e271f9335b002526a2daa2a9c11924da2376cf123821727f79e8d7b361b8f784856a909778c9295d17a0f51692a47a222e2f6778698e8de146da4148b6bfe34e5487bad40f0ac9",
+    "secret": "86488ca527c5135d6e5974125257d2e418572238469774dd17edacc5c14121f92a25703f07e90f049c26bdb8b2f667408c136ff2dd56a4e8b7ee2ebc447a850810ee701cefade4841c9761dde24171e2de52dfcbff42083596e271f9335b00252ae04ebb5653dcffc116f5576e4c8fa98751d0366cb43930d80aca97c6519153fb909efc28e5472f5bf0fb603d3f61eec4a0a09e29809fb49c0a85d75893df465d17a0f51692a47a222e2f6778698e8de146da4148b6bfe34e5487bad40f0ac9"
+  },
+  {
+    "public": "709c934f9794da22e53181bfa9c61ba3e35a156d30b70523e40e44ac00329f62f41ac76e5f663b91b1224b2a18652c38233f4f0065d6cb44006977ef08305a67b6078bea86439b8e1af64538f0716c29d159d34b0793e7db1767b634169f9777dd0aaf744c1e222ce0f0df2e0f9368feb8c694e804a2748a77d70f5ce454ff64",
+    "secret": "39c708019fe30b9368cb99fbb389edfe46ea4a346db8b44ca26788ea6fc87ad2526731a36d9dab32687b7cc5bdad49e38577c8fe7ac985d32fcefd4b77f85794f41ac76e5f663b91b1224b2a18652c38233f4f0065d6cb44006977ef08305a67dfe38c000c3c151b7355da09fd7c0be260668ed2e915cf30c71596525830ea9ab35430a494998c39395d9de632908b82e9c107243628195a874c703ec9180c67dd0aaf744c1e222ce0f0df2e0f9368feb8c694e804a2748a77d70f5ce454ff64"
+  },
+  {
+    "public": "5b7433b98894fe1e975ec92445d0507e2fa1d7e8f7787ae51b7f65e5061dabb62d05db11a8601949de91b266cb8e942adeb58ece658ff5f6e38433eeac20b122788181888143dba953530c7642912a53ddf8368f123415793f511760b8d81b6411099c2aeeb19fae2018bcd5658e82cf15c7870714e860edd823d5f94e027c95",
+    "secret": "3470d0a641cb72532b32f22cc320862c0214b320602a794d56aeab74707a1ce97c1e0688f22f0e3996e2f7d78830a637738f882e67ce29d1cbdb4963da1c60fa2d05db11a8601949de91b266cb8e942adeb58ece658ff5f6e38433eeac20b12206206b1ec1bb9c2c04bd8e74d047668dfe095ba8629589d116e08d1b58827d0c2161b01c2120c32efcfa1d8af12659e92d18aea8e1dbd334a30ec34f57b8840311099c2aeeb19fae2018bcd5658e82cf15c7870714e860edd823d5f94e027c95"
+  },
+  {
+    "public": "2bc3716bf9529875b8a39fe41f40c2fc7fa802b7c1d6639ccf33026e2ebab4daaa496e4a411e745151e4e95021b98124ab0d1c92c76b64bb32d6414b829edbec8922d37cf03c2c6931d76ea8f1364e5b9382f8ed93c89c011d61fb94667d5b28e9c2072b2b96b2ae2407cfe1b9a25cbb562453dd20055ef9d50cf52e0b46ef4e",
+    "secret": "466a6d80ae831ffd0b3fe336c6acb5fc4609da585ee338f421a5ec34d236744204e1ac6008a4a72ab2ef9765c7a7361c5522d3ce93662e2bcf4d261c884a5ba2aa496e4a411e745151e4e95021b98124ab0d1c92c76b64bb32d6414b829edbec9816c4c8d20aa21b1a88d39ae3b1d9a3f6327852dab905f1925dba63bb54ed51f38d90b7fbaa497bdee6d0f738f5ab5a1dab85a7826c92bd84f210e63e2cd301e9c2072b2b96b2ae2407cfe1b9a25cbb562453dd20055ef9d50cf52e0b46ef4e"
+  },
+  {
+    "public": "6b09ed1612b9c156a5e55b8e990548bf7570fa1c719f6d0f9d18e9219bfc0f95daf97ce1c02c351274fc9397980e03ffcdc0945ff58ebce89e6a2cbdb107e58216a9ad62570d258d0a15783439f149d79980704493bc9edb8d1dfe7a872c3211d86c68aa4f4e1163c919083d16ce02467e8b4962df9dda77e854bca166f5c4d2",
+    "secret": "8ac9f332a30ee7e4b493047ec01217e3603422ec25cffa5c0dbcb21e74e15eb71a5cc39a65b76a0a904f37c6759a65229311f8422384b772f3adf3addf0f337fdaf97ce1c02c351274fc9397980e03ffcdc0945ff58ebce89e6a2cbdb107e582d79f6e805b374168d848089256efdb5bc6a09d25608da0548f97fca5f2af0ef38c7ea0c71d673c639a5db56e93090660ec679dc6f18c1186a8e6d348d1e1a243d86c68aa4f4e1163c919083d16ce02467e8b4962df9dda77e854bca166f5c4d2"
+  },
+  {
+    "public": "1d3cc69557b1cd6101210b030610822a21d6a569bbabd51d4b5e5d686267020a603991cf33cd2b3361e5efee06ad8c10185aad07be028476121528133d8c61a4b955b75d9e6c7baa854623ca188399439c6eea47efc78448387d5e9842804ad7893763d9960cfbb6b0a19f8381d836e77dd0e9462645d41c7be22b38dc6556a3",
+    "secret": "d4972231677129e772c5f9a95669b41e24ac3a1550683fc9e34f44f6b574af244b2ebeadd8a73005e3d0b2a7fb10f90096df2b9244a912ca3af96f51926bdff3603991cf33cd2b3361e5efee06ad8c10185aad07be028476121528133d8c61a4b484c3b5eef7d9a843fd452ad18153d0014589a3828f8c0c1507fccf0a13b3d3fcedd6bacd477dfd12c072fe4d8089a4f2339045dd8408ca8ba0b2d63dc4629b893763d9960cfbb6b0a19f8381d836e77dd0e9462645d41c7be22b38dc6556a3"
+  },
+  {
+    "public": "465bc7cdb5cda2f92d671c397f72b77cffc04288c965e2bbba5be4902cf80f574143c2bdc03975c3f90604b3207772356382229911f10f4bcce8fa488bb80659ce9c49b716913096fe880effdd670f2a1413be09932a914dd948a353752b7233bf6fc391daf49453f0c8f319c713ef5100428f70896954c45d4b6ffb294304a0",
+    "secret": "1205555922c86889672d0cf0a58eed5e5d70295cb8e4e83da20b66956c92d5c74815815ca34670c574acec817c9521537847b5466ca222935a465eb3e07e9e644143c2bdc03975c3f90604b3207772356382229911f10f4bcce8fa488bb80659e42fecc9351fd5d28b8b6531dd65aaf6a976525136bb5f0ad8a2e4c90644181b24bfe401ee17365bf6e10868141ca4bcf9b41585cc09d8bd5dc3518625058ea0bf6fc391daf49453f0c8f319c713ef5100428f70896954c45d4b6ffb294304a0"
+  },
+  {
+    "public": "8e3076caf35f95fb0d462ea1a4bc1447294472fb51ec71436d6aae35b1c6765670906276b4d01b14c4cd797f5e9864025cf7c18674e5f3972d4e8ce3afb94c5953a37257ba621a4369f7a46ddbc0ecb2c2b23900bd082075660cd4791c5f279cf74e040df332be4039a4104e27c31d78965638404ab930928f5c7736ae05a0a1",
+    "secret": "2d7ad3ca04e40df080e8764ec5e2850c6dc4e2cc52e95740cab66652e62b1748b333890bac28914d0ae620112b545aadfb9e6dad5a82d0199c57a4e510764cd370906276b4d01b14c4cd797f5e9864025cf7c18674e5f3972d4e8ce3afb94c59976723a251196a4c29fa299b40075af4c464d66bb7c35b2a6758f3673329a8fa338658cfa8d519a580df9158d043652ba81dfd4169ac0639d4fd6573a0cfee0bf74e040df332be4039a4104e27c31d78965638404ab930928f5c7736ae05a0a1"
+  },
+  {
+    "public": "9247ea5fe88d43e6296b336964c2bc43a868f353c96793f5cc68f2acdbdcf08dff89b1d3bf7eaefedf2df2c5f5346b4cb1eedc23a78939ce1134a140f60e91ea4d313da3e134b81bef8feb7e5c71bde6157d47c926eb04a769d7e17f019e38d9118c804b2da4e8eec16be02562472fdff21feb354f635fc2162ced3bef314eb4",
+    "secret": "701a02be629b1dbd9bfb87c62823d845b3a5095ee49e17de924696abf43724cc7685becf24990308dbacd7362a10320b6580793df8432a84270bf76eab45acb0ff89b1d3bf7eaefedf2df2c5f5346b4cb1eedc23a78939ce1134a140f60e91ea43151ba5b12f8f51ac8e6c4ac3a5840daddd14ed9e526f4c01a00ea6ba2fb37bdf9139006dcf05080845182ccaab78463ab511f6ca9ef0f079b78131b2a0f902118c804b2da4e8eec16be02562472fdff21feb354f635fc2162ced3bef314eb4"
+  },
+  {
+    "public": "40cc9214b05debfd0f6ac85253a93b9795b3405128d67cd95cfeae27cc1a0ceec5469552ad18903c69dbc0abffebf3add4becb38e8ce437ea13097cf3183325759c30e7190c737ac1fa00345854c6643d7c75210d9885dbfe755c0e2790a0868b17e1a47673ffd27fb9cd906f13b5937a63061e7a75b76e6bf37da37f5c999c9",
+    "secret": "02e1b4505fdce97f82876a71d4e9e983f985ff57b5199ccbfeb49ba5a5bb653222425968cf3641de2a2e1566263c24dbf131a27a311a9fc46e7ab1ff51b292aec5469552ad18903c69dbc0abffebf3add4becb38e8ce437ea13097cf31833257bf64013bbb542d9254997e9b61c797ffb2dc201484e6621359ef0cda4180685b0c2f2d32fa71b7dc6dfb14974af7682fa120ccd301800729751a2466ed06529db17e1a47673ffd27fb9cd906f13b5937a63061e7a75b76e6bf37da37f5c999c9"
+  },
+  {
+    "public": "94347f749ebc6d4a467e453932c5bb49e4c45b202a403a79732fce75cb9309a0838db6a8f8b743223209ad63ba2e4aff72cdf9da48eb73092e73b8fcd4cdb5ad3dd1070d8be62cd3830a7e84ca888d2571ce548ef4b09ec29c5039e6330671df422160aabb36d5c7521f54a58429086ca097f2db977ed084b03b86c7ec030ed2",
+    "secret": "acd7f428147d459af3ac01efc5006df3c1d0cf971cce85ac655fabff74c6dcc0ecb493fe192a572b227a2f341271c9c0b0dc8fe0c4a1032c5952a1fd8da4738c838db6a8f8b743223209ad63ba2e4aff72cdf9da48eb73092e73b8fcd4cdb5adffe09758b3c09da5e7d8fa09ac0de249c9b92e514ef3d9629fd23dbaca836117dd6094f805bfe8b8708db83a5c6df008b51b6adb0093bd039b3b7829291e60a4422160aabb36d5c7521f54a58429086ca097f2db977ed084b03b86c7ec030ed2"
+  },
+  {
+    "public": "e67be3cd0ba541dc742e5bdd003a79f2b43e3a04050a4ee7ab08d54b0f84dfbfd253b179749114250586acde58edf34d8f5b438791ad12868a865e72ffba3ce91acb8f2bdd27720efb5c5c89eda690bccacd2c4d3ff3d83c124d1331495724fe27b74a819a33f6bdf718355c8aabedae334a14e3bc1ad75719ef404d8847d29a",
+    "secret": "7b1aca9f38a4c5eb9b0a061602477c017b9aa7e3971f97da8c3b79fd2b4efd2c7fdf33245d1b951f0ecbb6c659275bdaa20a18cdfa3efb5c60b47de6a9507bf0d253b179749114250586acde58edf34d8f5b438791ad12868a865e72ffba3ce9539e7b48d22370c76836478976ff2322acaf26c86fe071d978c80c634ef49e2f621bf428485eb9a827d5ad822a16532e8486aa2897575a01c5c701c535e165c127b74a819a33f6bdf718355c8aabedae334a14e3bc1ad75719ef404d8847d29a"
+  },
+  {
+    "public": "33d85f3f67834bbc71c44524f646f586d4acb430454332e6b3f9c98db0d3326ced5f8daae648b232c5d8a9a5010baaa29e30a254ccf7bd2e5081cc6cdd2fabffe844b2aad81191ef43e584d62e4e01da31d9ddf36d8278e349b712e9d2680c712844a43e583399e6c82295f29680579f6077199a0df1c99f6f801e73052fc28e",
+    "secret": "5269bdf6a26f14cbc474f6e12e2052aa48a7508eff98967ce5a7b215ee521546f18e5d06de492d951d7cb8087cbfbb3dc032f832db70fa3154f9c35aee9cc76bed5f8daae648b232c5d8a9a5010baaa29e30a254ccf7bd2e5081cc6cdd2fabff221ebd18fca51a7f3c6d18e054c0da65748835a69200ffa9f9ab85a3cc2418526c6bca2dd0747759f171b6cff783e615f050d5eb5d7062b1f587b858f3137eb42844a43e583399e6c82295f29680579f6077199a0df1c99f6f801e73052fc28e"
+  },
+  {
+    "public": "10a00a2677607b95ddf45ba5c4567f790e1611a8de1449ce086f568a7792a439de77133c971427147eb78f927bd493de2493fc9a3eec10ac2d1d4ce4581c5ce64c16053a8e3c898901c62f9e681ec08ecd6eea5df17db74f89a61222bbe1ea5fdc0bf5f2c6167cd9e0f5b2da87e7c7a8b6135d1207265d27803799a67aa19ab7",
+    "secret": "8c41e665393f88c0b376abdf32f0203d480a9c5f9edc0b98cfdc2d063faf8c4576a6ebaf43abede503565f024c4111771ea59c1c8e2e7d75a3f779ab3f82ac81de77133c971427147eb78f927bd493de2493fc9a3eec10ac2d1d4ce4581c5ce606250fbd1cadabca9bb73f66d925ae15251d2ab61358cc33c6ad3f55fce64eb0cbc880ae5e6badbcd80c5208ba0d3b8a9b776b553d56eda237c9bed728da8e65dc0bf5f2c6167cd9e0f5b2da87e7c7a8b6135d1207265d27803799a67aa19ab7"
+  },
+  {
+    "public": "88bfccb4dd4215d5b881529e337f8513eeca7ed1268c4448094c5fbdc80dea5e2ffc3b80a034f9c579214856dec8fca4d0de7a213b928a00f7c5b5c9ad5dbf8f2079f1f192c9ada7d12b2a021fa51e24c4758def6fb4824394ad07c874becd4f6657edd55022a2111309cec0d50a8a12710d147c6224078c2137d732d1c7ca0c",
+    "secret": "b5c43bfcfa11d0affa07f126137ebbe1a3b33d65e39d9406b754ae53593c85d30c5b3de4c93e56bf8149892ed156b8675bb91875aedc745b09bca20efc3394612ffc3b80a034f9c579214856dec8fca4d0de7a213b928a00f7c5b5c9ad5dbf8fa0b85bd333ac47de79074bd44a5a9f039df6c528255a545ce7072df7fa42c8048865c7fe0912aae0c442b1a95da5d762091f550923189518fb1d005d6f5234776657edd55022a2111309cec0d50a8a12710d147c6224078c2137d732d1c7ca0c"
+  },
+  {
+    "public": "60b2498e5b200c3af95b9f90a6cd6a155f75cda57ef3cd76e1dcae6f32c0dd205316255905d8cd7d517e769b5f7d3b64ed3d52802923db90e4e2f62b9f350e670dc02ba3084df1d9a04321b5d58b2cc9eec7d149f6675df47b8fbef14c1c50a64d3a44b5834890cd05eb92137240d68186ae21fc392a18a76394edda892be10d",
+    "secret": "29a1c8cdce3986b4f5c0ed22a6e6e1aaf3523c669362c76225fda2e2f30ba2f4b16494a840d0a45b3ae459cba69147004d89c4b7bb8537e3312a9929fb39a8615316255905d8cd7d517e769b5f7d3b64ed3d52802923db90e4e2f62b9f350e67dc870f0c897fd031d4c94711d0b18d503fb7fa0152f4055649258722ecaab09105c8d16871f4af8e1b205760a5c8d163cd04ef777f15c72a606340ec8cfcec244d3a44b5834890cd05eb92137240d68186ae21fc392a18a76394edda892be10d"
+  },
+  {
+    "public": "9f596bb3a07e89d76bbc4af9d487676d25ac7af1aae1fe2e91e1589ed4b719d5b7a2e338549099d4cef34da4be68a35034e246fc6a4f1ccb46aa14eb029e46080aebaa962cccef4f8218ea526c2d572103aa62e55e7ab570e4b3c9ead2593f359e8d4fcf0b0178343f06d66c9e83076828564c4ddc48a2abb50932b91c40ef80",
+    "secret": "af3da16789014f93ebf6d9f2f2863afcdba7b16d7525b2f1c13c3b07e4738dd78b8af092408a5fc05e792a14a2cef762648f1233dd75b7e353d2ac833dcafb65b7a2e338549099d4cef34da4be68a35034e246fc6a4f1ccb46aa14eb029e46080c825933c32a337f743920ab41346d8fff0510a17a8a457a31734ab323d1deec6cf8d4f110b580ecae67139560cc227a1299c1a06f61223ab6cdd0a404b2df389e8d4fcf0b0178343f06d66c9e83076828564c4ddc48a2abb50932b91c40ef80"
+  },
+  {
+    "public": "862b4c24ed2fc08223e1ae173d670e1dc251d2693d866504981610ad424d0d7110ea47bc327c3a3dd2ed6ade54647dc48d05e8a856af51f5418681a71d903e3db159a4a68389138e7938e4f72cdb9912d592bc8452bfd4be9a20a59ee915310cd82a5c5ae294abd3097eaa00be420d3ce5bf4ba6f303c1fd52c2dc5f72318caf",
+    "secret": "e0a7eda48bf754c94fdd49e175204fd6236e630938c85e2ba5d9f3946433f3857aeae6162cce9ac472bca42dc5fe703f614192fbfd9bb871f76e1a8f1ad09a9210ea47bc327c3a3dd2ed6ade54647dc48d05e8a856af51f5418681a71d903e3d911c5a2615d607c9e56f264cea8c43667e56916f6c9b25a4bd4901602ffd66c49dc317f7312a146dedbaa34e63b5f105fcc208230ca3f09abe9f3c9662b15046d82a5c5ae294abd3097eaa00be420d3ce5bf4ba6f303c1fd52c2dc5f72318caf"
+  },
+  {
+    "public": "4749fc048895ea14232faee6b20b7942e2be0f89b5997ea5576758cd5252f57ad8393ce685eb74859db4e7fb18bcea10446901acc553b2674436c94cfd2555c450ee4995dbfcbea6fc6b6d6a786734184aafff3cf808f7fa0b41027dc28d2550252ba2a7dc798b1851dbfd84fc7ae5b02d5b637dfaac714c1aa41cba3641dc20",
+    "secret": "de9c5e8f18eba76dbbcbbe6ab6d8c8fc4893b35141a27541248d1efcdc3f4cca1b52f0c2d16ad91371d66f1cb35144befab18b8ea86dee9e3fa4f9212cbb073ad8393ce685eb74859db4e7fb18bcea10446901acc553b2674436c94cfd2555c4c7bf0fad6db92dd636fd02c04d16e3dd05f6cffb3fde1bb043cdd1f324010e30f5398b0b23082ae63b04c226bb0d2d789d281842c592d7c124877cdf0fc5b787252ba2a7dc798b1851dbfd84fc7ae5b02d5b637dfaac714c1aa41cba3641dc20"
+  },
+  {
+    "public": "5f98241b77f6ce99f7bc761b5da7d49bdcf1c9edd52ae1b2c37a779aa5201b12f78f766e5ddc13f81bd47e04b523e91a9a14f6bc70ca60c6ebd8d564935dcb4bac44c2b24b3fdbe75cfcf641e60b64b8a142e93cacb2be3d0e88aa2cd8de99cca6cbe0f8235e0a11de1f24095318cacd6f80c9a70c8001a869ee4487503f9d03",
+    "secret": "d34d32175e5d16a9972169f51abb60c07170c9660dae01b9ef1c8b65f285552b323f55fe3926c2666103fa49b6218de3b5b06347b2b55fe1d083811c6bab3cfcf78f766e5ddc13f81bd47e04b523e91a9a14f6bc70ca60c6ebd8d564935dcb4b62e5b200761b5ff15cd874146a9a8cdeea6a782950a7bf9c6e23d9b26a1b0e2b9e9b7c8450fe0510158af5f06e2a07fb5cd40c4fe358f71fac5312ae4597f0f9a6cbe0f8235e0a11de1f24095318cacd6f80c9a70c8001a869ee4487503f9d03"
+  },
+  {
+    "public": "8c51524faeb68ceec15ae67426f5bbd9f6dfac866b9e5499e57f574e0ad4b0e8754ddf16eefa806e865514a305e8f40e856626d818081cfac1d80d7cbe894a89fdd0940ed948b0160e92c30fc4544229e454ba6caa37e39da2c34ce557c01ff26245d31856cd5f648adbadbc7410ccb29c1f3c253643627cc00f287aa5c65afd",
+    "secret": "f26b14b48b136057d1b169706cbf182a49e24d18c396b96763a834259c78d73e3b8854dc25e72804ec0310fc2f7a43757628451f67666623b3915d15857691fd754ddf16eefa806e865514a305e8f40e856626d818081cfac1d80d7cbe894a89a22f7691cf1fe3e5fa5d426c7a95baf8905e97aefb9048cc2e3803415d99d6dd03dbd02f159d687dda4a0e510fcda6839d650c39b54618630d8f8a26e37347426245d31856cd5f648adbadbc7410ccb29c1f3c253643627cc00f287aa5c65afd"
+  },
+  {
+    "public": "e32544bd7e3d2e2751fb5557b6cc2a224067c2546bcef32193245d0b036d5bb7f267b5610bb07323d1df9b45bd58ad444bc5e472d7ac71bd07e23e941910e5e84b3a3368ed0a94cd12c03d8a40c17a40e7dba090312859f950cd86c2b2eabce82e71691f04c737981e45c409470045e3a2505d1d5a8c4cb1fa6e75d602ab6a6e",
+    "secret": "0047fd925f66beed48a2644b6586e46e0af3f958cd9efb9777fb3597d1459420fe3c3ad5a2cf70ab4ce3b41799205f09062cc7ae89952c49649ad2c0548de8b4f267b5610bb07323d1df9b45bd58ad444bc5e472d7ac71bd07e23e941910e5e822c52ac495105a12ed30eed7f08301bd1a53c2f4c6c2afa15833adcf09702114f5ec5b128670a0927e12b10f5a5f128bc988280b45f42259bbe5bc763e6b6f702e71691f04c737981e45c409470045e3a2505d1d5a8c4cb1fa6e75d602ab6a6e"
+  },
+  {
+    "public": "3009665e18de85cdb69d7c34b83abbc17587d479c49c01dc9ba0a57f59db87e02c080a5d437464edd6047aeaa2e1d3d2b67ceb19f8034848e30122ce2f1aacfc16ad28e8174b8510104008ba98408670a726d64276a0f407dc038d596791f434022347e39cf6ba7be74d6310bbac148d375343f47026f9f6e19d548818b05152",
+    "secret": "27a4ccbd6d49f3e042f5844efff7a1218f0e0fca3c3cfe5fc8699f99daef8d6a5c6008331c648c52a8a423abd28ec3bf0a85d240a984ec538da416b7e4e1d5932c080a5d437464edd6047aeaa2e1d3d2b67ceb19f8034848e30122ce2f1aacfca71f9da097e9e34f842653cdc071763ac87dd31b974af4361734d8e7a516cfa2e739a4911283519631cd244aa728e878e4f403602b57000c838c8fad66add122022347e39cf6ba7be74d6310bbac148d375343f47026f9f6e19d548818b05152"
+  },
+  {
+    "public": "a2139e2e4bf3c823b4200bd5ec3905687ed75860c40ee5cafe74e51fce17cec9ad84e929f8edeea613354fe129582888ba7eba175b3e9e6a4e73cb80617d7361be84152ec5cfc7d86a7ab55dde7582a5873c01003d9bb95d9a6d9c5260041a8ae56236295f0435aea91a97feaf688cef685ff4a9093820a2da28766f9ce90d7e",
+    "secret": "a0c08d223683e1081d68697d063b875cd6b329648235a888b2665be6b6897dbbf2a71cb0d56a84c47c80c7ed01a691474483b856923018e127eaaaa08506d576ad84e929f8edeea613354fe129582888ba7eba175b3e9e6a4e73cb80617d73612f81142c71d211f0ef2cb5d99c6b98e4edd2f6c664b64d6a6235a85784b5db53e9e8b2eb04bafe8263e07fe30ed2a6ff72fd33724f2b77dc9287a46fc21d8f61e56236295f0435aea91a97feaf688cef685ff4a9093820a2da28766f9ce90d7e"
+  },
+  {
+    "public": "8fb0deb4bc0f9a10b5dad40bfb33432b62bef91a8526e86b78c179ee1784d438d4fd3344094c0e8d0ccae1af56ac9f614a48011348f0962789eb21220b8bf195b146f621c1b2af98605c893c27b83369ee9d7ce2e5f7985cbc4ca51823a26a0c74fc2ab59001df5676bc3aa223e725f16e9cffe6798f7a38f68cade50e1055b4",
+    "secret": "4c11d2d456ae3fdec1a9c7e8dc609d335e10ff491e12e4949550addae3b15896ce08250b8304a1a5a666fb490baf66502e1ae52df64623577d1061b9a0e2fc07d4fd3344094c0e8d0ccae1af56ac9f614a48011348f0962789eb21220b8bf1956dbb144e8a30d8552767ba10c78fd1ff9dbaf2b14119d86ec596deb457ee00af151e5fbe3ba58b1142970cdba5ea06cbecc66b42d22f6c0b6e9c9236c8ba44ca74fc2ab59001df5676bc3aa223e725f16e9cffe6798f7a38f68cade50e1055b4"
+  },
+  {
+    "public": "838487b98dc8373c312bb8ff2376cd778be3c1e60e8da253e72d55ed80c015ffb522a1a0612e9260c5728b4838f08d2c5d35a44437d01bc708a9f5fdf5d6eb64d8a10100c8421ad01723ef9d9986084ee102932f9aee67650e8d632c89f36e75c159fde4ca6bdd9921a674090c2f06570c9fe988cd490d30d72a6464389a8a03",
+    "secret": "f2cd2029872238863a5bddb109b3a9ee3f2bb2e2c3da734662aa548442f8b189ff9008234034286bb5b670cb7d4a96ac10081f0aaf950d0d3b9afb3ceb95cb7fb522a1a0612e9260c5728b4838f08d2c5d35a44437d01bc708a9f5fdf5d6eb641bae6ecbc191c1883f171989591e4e466813d1f72702f82b5a99803afff6fa1fdc76881c46de1cfff0d65967f24cc8e3e6ce3e2cf4e5c6b0d517fe25728881dac159fde4ca6bdd9921a674090c2f06570c9fe988cd490d30d72a6464389a8a03"
+  },
+  {
+    "public": "c7f0c9fb6cc6c4e63fa836e3ed8dee913496ebd9dc12e40ead9b4d2393d78da38d1c47083fce7b525258d2706a416c4bb599fe3335ef4f6cffdcdae0f9b9c9cfe55e76d6be80754caca17f15fee2db4813d755ba2a1fcf789a566c3a6740eef5f2ad4b9ce54dc8e7920c1e351d7f1103fb03e6b7595a283f656f5dddb87f2d09",
+    "secret": "646a1a40256d8c6de6065451482193193bfd1d118c48fe1aeeec8a0c20820631ae497171ba402980480de1fe438f04b590e3df1881a812874251a83ff31befab8d1c47083fce7b525258d2706a416c4bb599fe3335ef4f6cffdcdae0f9b9c9cfe9823411eba49e05b1954929a875b3ceddab08a2e4843af823817bd57b8cb86ae59d6a7a7b8006ddc47b6a470d529dbf523d63272cb96a6cb046ac28be8b4966f2ad4b9ce54dc8e7920c1e351d7f1103fb03e6b7595a283f656f5dddb87f2d09"
+  },
+  {
+    "public": "84423871144430f107335e0210129f81bb3b58843f21d6a583e456ea89106221f9464d356fc6d55a5de0047b2d60ca5d1b3447b38b605b4d460a07cb1bb747d748c8bc6291fd252bbcb0e1249e224d078c6de87bb56e0a52eae9935f8ae3660064c2b3a5a6a5c14eb23bfc8376fbb1bd731ce08dd1ca2dd64fc48f62dfc4db04",
+    "secret": "6420f186b591d5e426eacdba2afa0c432acc2b7ab3ccb240d51b11bc679bb0c888c44b543dc2b1dbf1861b82ed44291c9bbbb22457e2eb709797965775e23ebcf9464d356fc6d55a5de0047b2d60ca5d1b3447b38b605b4d460a07cb1bb747d797942a93a4c2dc0b626991a197fd72c04fe5b871ce75ef540318904be85bf8e07084eb287c17c16edc9547aca96581d1e6568ce4abd57253f758635e357cc6ca64c2b3a5a6a5c14eb23bfc8376fbb1bd731ce08dd1ca2dd64fc48f62dfc4db04"
+  },
+  {
+    "public": "5a5e97d48337a8a418e80c4d0c2dbed8e28e7dedb38134b0d4c1f33313165a4c6da68f11b0c9adb80afa2ed9f7bf2ddf542c84e3ed10247554660b0f2461f4ef9504f5f3eebc208de657bca0bf20efb39fa76ec22a29e891d792254e98066b0084688f10087daeb11eeb4d0aa1e9a76bffc35ee4496a67cdcc690e448d815747",
+    "secret": "25e9d877c2fb4bbb8a5e1932863bca885faad3ac17d324302e9dffa7db49ac6dc70c30d833862be718e678ae8b186fa6b418c214d88cb55ae1054370bc706db66da68f11b0c9adb80afa2ed9f7bf2ddf542c84e3ed10247554660b0f2461f4ef44b25df16af520a05631187e6aa493393ca0964b4fdaba4cea4edf8905efc81291ab14f4cb986afd229c3c1555d6c371dc1655418a0354a50e72f2cc7fe127d984688f10087daeb11eeb4d0aa1e9a76bffc35ee4496a67cdcc690e448d815747"
+  },
+  {
+    "public": "5d384a38eb9afef6e0283c00f592a06e5a7833e51ffbe1bdd1fbbc4511bb5d1c31c430c6f8e7ffca1d80104282f260fe185b40f8d824079d090120787328c6974821b3a0028cad5016cf599522923591f66c9957920eb11c32de3731bdb407f240c87e0eb4db5ba8a90478f75b1933e2ebf7d227218b23b0f3f3b1f9c54929ab",
+    "secret": "0a53106e2667ea22413b2343a1cb69d6a715e84c6896f9c48340b3bb6ec2151d66916d4953dc000ddec28ad5997cf272a00886e8f0178fcad6110e40271c485c31c430c6f8e7ffca1d80104282f260fe185b40f8d824079d090120787328c697a94018a919dde568e98b5bccccf03bc21d993e98e539c22016734623604f7753e20d8a192397704411065c9ffcf8f5154b981862181403092c56672c559c9a9b40c87e0eb4db5ba8a90478f75b1933e2ebf7d227218b23b0f3f3b1f9c54929ab"
+  },
+  {
+    "public": "40f7fbfb0b5c1cb6899a05760735427d5fcf1343eb396cf24087d0337bb781f446422e0bc9fbf1be8cf056968ddc15c1470f9a361925f1080ae38be1550a870d1950e377918098f1bc113fb7330231a53126b73f9a126091673ad8d6801bf448b2cb3beb42c5cb52c231ade4a23d6046ded21f06c917610db8f2ba788a5dfd46",
+    "secret": "bfe39abd061d98ac32071028474e12c31132b86181a5c263ab064be099db0336f4571ba5db9550c58b8bf8bf94fa1636ca61a8259d4cba1d0b1335f327485cfd46422e0bc9fbf1be8cf056968ddc15c1470f9a361925f1080ae38be1550a870d98e2e4a14ba733c19eb0a10fa74dcb4aa3d816a00fe66de4da73ca5452a642366c0d5671e5be763383b30876c4628f66ed36837218a1c25141ba4201f37d4f87b2cb3beb42c5cb52c231ade4a23d6046ded21f06c917610db8f2ba788a5dfd46"
+  },
+  {
+    "public": "2260c90f67cc0a832269862eead82e93826fe1ef0a6a1271fdefb98e76950884c9271803a372835b2e9da0126f8283871106dd5af2f53dd08ca314ff09a4b56a69352c5cf3f79d06e412aff0599632ee6cd06599f4db0cf6e842cf1af7451d55db144f75b5667391d454e6a0b7400c615d970088cff0f71a4c3e2b2e7bc9ee6c",
+    "secret": "01f39c4280aff1a76871910fb1bf58f4f571c5958c636af2d688e7435e5f0aaa07f329c78d66b1af6d446ee5f37af1762b6f2bc42bbb957930d26bac97e4f841c9271803a372835b2e9da0126f8283871106dd5af2f53dd08ca314ff09a4b56af1ceac0d86e05968fdba1fb24e9f390b8d9ec90b8c461f5da8603ec6cfa9f4d21d31e8fcb1e044ceadd732fca1a0120a812051b63093a9ba015c9022632e314ddb144f75b5667391d454e6a0b7400c615d970088cff0f71a4c3e2b2e7bc9ee6c"
+  },
+  {
+    "public": "ac58613289ddb05994e3fd328c9fb43fac281a409d5d99d2764c733f13d17b77b8daec400d3d7fe4e7bf951bcaee364613258c737f6ecbd9acc5f950a7dce8836cefcdfab13453675a91ba71bfb8984589d47b8bd1b1d3ca71f7d0ca6a160d33764f6e125fcecf7157b6170bd9766549dd3bd1f6cf477b2e210b14a8b9039091",
+    "secret": "836411533d99f63713c639fbf900187e60ef5a9f2a2906f2a5bec97fa05f111bef90c6a61b940876809b2cd698c0426e0667cf1fa04e26c026ea1f9dd3a74cc2b8daec400d3d7fe4e7bf951bcaee364613258c737f6ecbd9acc5f950a7dce8835a6e7fea120d07b6035a1f493436b30f0b47683e642528cc40ec3d7b941db0bdb77d793775d060e15de7a8e0ab94e0e9661eaeded976a222eba813c6368847b9764f6e125fcecf7157b6170bd9766549dd3bd1f6cf477b2e210b14a8b9039091"
+  },
+  {
+    "public": "7eb029259d5ec8a075c66d6969ec09710d57324e55ff49dc8b4ea86dc0a2b3342cb2f8f8db8ff9969c3066c2624eed913357f978070625451daf01f14e635e101567fcc195318ee278165e557b24b7622c643097c8c57120bb5a492b2e1b4961133d0db40038e87fa58be86fd7fc3f564882ae7a6c312a0bb8f0085fba0a2dae",
+    "secret": "ed36ee5fc1860507be0e47c2216550d6361a3483e70c22e3ad70f43035f70cc5d432b4f621d76dc61ee7c44804c5ce17f38c8bada1617b7105043e0e5019bb152cb2f8f8db8ff9969c3066c2624eed913357f978070625451daf01f14e635e1055ad20f6934ea344563e96fa01bfd9ff3470725b2b73bbb374f4389ee73e67266956bec8b18bae6805a2766fbaae0ba5d3c06de9de62be434aef4f2d3b8aab5e133d0db40038e87fa58be86fd7fc3f564882ae7a6c312a0bb8f0085fba0a2dae"
+  },
+  {
+    "public": "b717b201a8f013e79ac89ec634a4a1be3270902cc8e71c19a32613db0bc2f67f1427ec05d2e2ff7a2ade48ffd72ed650d062ee07ed07cb089ed040737327f76f36f21596c08c66047f5d9e700bf791184088391476c5414e221204f1e3b43752bd8b56575cbc0fe5d00bbf22c5655ac4723ea2006593ab61bb1d00b24a0d6771",
+    "secret": "3d3cd39d13f5d0232735cb3dee8cdc2a4ead61aa5094e333b436d4f89f23e6f619df703bedb2d1a15c44f62fb70ecd8547b48d1bd27b3d7f5118c2c489c335461427ec05d2e2ff7a2ade48ffd72ed650d062ee07ed07cb089ed040737327f76f762646ec37d8fcd2cd877b38c1cd70da95116a499a5acaabbefcfdf613d13a4014ea0f2e22461832356d1d80670ce59bacc5b8da197b15b3cc5e0b5dcee7d0debd8b56575cbc0fe5d00bbf22c5655ac4723ea2006593ab61bb1d00b24a0d6771"
+  },
+  {
+    "public": "0d435bc0a9095fc61256d4457bf0fc6d15f002402e1fabc9342b55c9163a7ab5340893948e3a244122112aed68b945e4326621eddf727bcf642ef0897e7b805d1b56d624ba87f15311aa2147fb70651531f8abe54b0cdce6cde3f4ce056378f241977dfe57f0ba6c017afe09c319785183e0a1b1dd9d3211e224b38e249d7414",
+    "secret": "b771fe86283beb2f0a3e317ce7ef21ba9229f78dbb3888dd8fb2f952417b611b892bb857bcada11a62c8a0599e3dff67ae63b8c8bdd545aa5da613a67bc1eec5340893948e3a244122112aed68b945e4326621eddf727bcf642ef0897e7b805d9ff35dd62c612d6e9a1de2a7f06d6516c02527332d038530fb2e9ca25af2d53bf28267637ae55086cc4a0d066c7b820b12691b782bc73358407f936b0358298841977dfe57f0ba6c017afe09c319785183e0a1b1dd9d3211e224b38e249d7414"
+  },
+  {
+    "public": "e31e5eeb51e1f1602120d373937349a42e31b24580e726c27be2a38c672e6ea47a549cef532f3adce53a77e95d08c9d23ec7d3e284c26bab453bcd1392d83dd83193fc5dee5baa02d8ec7a798b484aca067c3efaedce970647ca9228a9b7d9e284a9b6318cad47a777bbef5eebcb67b07f8c80c684f52575dcacdfcb45e4d1e0",
+    "secret": "603fdde8a351a9da4a55e3921c2dfdc60c7814d02c452cc216ae6b41fa707770e0c9d89289b96e993b667e9cad34df4cd0eef01f4bb6be649f79fb533621f4b87a549cef532f3adce53a77e95d08c9d23ec7d3e284c26bab453bcd1392d83dd888d8020c50dc614b6ea784d1cca4f39e9fcd915c5eaaf307ea66613f08d060d80f70f219be19b1634bcc71b8f14e4f2c0370a853e249996b8e2dc8608bfee70984a9b6318cad47a777bbef5eebcb67b07f8c80c684f52575dcacdfcb45e4d1e0"
+  },
+  {
+    "public": "744a8ecf0692e4376081e88c02847a4f7fa9f15b7d374b8bf76e8769b21bd2d22d22dbc8f081bfca484a99e3d21dbbfc1a1b89ea3ab107437eb64ba4e6c12d164facbf78cd812aa0c23355ca2e2a641accfca1801e48bfb16fb67fe49b9f7197e48950fd9df6c56f120c5df28a206b4e7d6daa35310e34b171906f18c00c56af",
+    "secret": "ff4f1df9d65fd24e0302c8f206b1fc35c1ae95c332bd558a82b3ae57b7e8a56aba7a1065278e0f9ba83a6ee8afee63599669595d45005c288b302885a6c525312d22dbc8f081bfca484a99e3d21dbbfc1a1b89ea3ab107437eb64ba4e6c12d1660ea1922b425f44ae2faefa45fca122157ea46043b9800527dbe9d04085f132c4439587b230d0f528edce8f10fb85cd98fa4068c807e5aca6af90fc70f474af5e48950fd9df6c56f120c5df28a206b4e7d6daa35310e34b171906f18c00c56af"
+  },
+  {
+    "public": "805d485d02718d7639dfb1f9e82338cdd0e0154d90051daad684b37965a8ba8d932a8841eaae6581806f8aec8dae32808bc489ba4c5c3bbc8ea3caf846af2d46afe7e18686749f0fbefe84e034210424fbbf99c8739bb71a2e157184d55d6bf1d99829a194379f9a857524a035295a8c4e83f539599b58bd45097389d92895ea",
+    "secret": "de3d1961edf3167048a2036deec3bfb176cc133dde17b03eb7125313d7bbaf1d5c8d0201d05966485e5cc9a266ab33d7e55a7efd2dd4118cbee761e0b358e37f932a8841eaae6581806f8aec8dae32808bc489ba4c5c3bbc8ea3caf846af2d464b201781b9ebd39a51b9c8e1d40344afd8c56eaa740ecbb18360238b6317932bdb8172efef7fc37cbfa93c1256bf3785347c94d86d9051170b18b3a07cfc9f32d99829a194379f9a857524a035295a8c4e83f539599b58bd45097389d92895ea"
+  },
+  {
+    "public": "3ec546723ef6fdfa7706596da635d14ffd55052a4b6d6b8334a1d71756f9aca9f2b996931d792b9aae24428ef91c0d4148219c307bc6540f4af0a9bee452100070ecc63ea909bee274d98ff2271cb99e643c0850e7daae0c81a3ac8408d0898a48307372a42d11cc83a5d2d0a4a448ec59875f13dea44b0cc1c29c6f279f9487",
+    "secret": "5cdd110cde48c54eed00c1625169acd49983f67ec36059e0151501cb454c529712508e883c3426078112a0a10d522e4af7e6232c0574e657cd75724eb6f4f87df2b996931d792b9aae24428ef91c0d4148219c307bc6540f4af0a9bee45210001f5f3dddd56c52143019a13ef8238ce56e9a6a20a4cca884199d277fa1ddf861eb2f064f02838ddfc2faff5223a93d045a22bb76f0544a33db2504b8f006460748307372a42d11cc83a5d2d0a4a448ec59875f13dea44b0cc1c29c6f279f9487"
+  },
+  {
+    "public": "b7bedb81bc6dc525f2a358d4b883592a52c8a1cca38d7bacbd760410c1fb174eb736be9acf70ac3d7b4845f5a665f282333f6f5b87fc0f7f0799593ee3bf7f7f11e2b6de9e5c57e4b2e29f5c6294dfff076e1cd462547ca00f93a395cfadcfb176314d21f895eafbcd0863c0a812a14f7182939222bc27fe4fb5bff47587c38e",
+    "secret": "8ce53e2236a3734c696932e35b6aaf6ef07b706ce8ba99f9f7f0d8e235a7266a40d675cd133cadd16749f53f5ee99fda11c49514d1e69f112d43e0917e65799db736be9acf70ac3d7b4845f5a665f282333f6f5b87fc0f7f0799593ee3bf7f7f8aa7350abafafcda07cf93ac340b3efaa523e5f7b1ee8d630b61ed40201eea7db0654e71d4aac5efd1e32be68ef0d0d7c187f93680f614abde7aa9216f8001ad76314d21f895eafbcd0863c0a812a14f7182939222bc27fe4fb5bff47587c38e"
+  },
+  {
+    "public": "2dbaeabb63e4a8b3e6d929519bf989cbf5039dccd030097e0c9559b511c904c544fa6a7856c5abaa1f19b55fd61f0930e593cae0ab618f089f51dbaaa4aa0b05e5091be439a6c28c0adef798c3bfe93e560b6ed0a63ac0b6666bb976c8b0108fad2d189e3da3d928c0000ccd5381d5d4e303195df165492772260e2783830017",
+    "secret": "f0e9664a8aeb799e67ce1c497dc38604cabe623315df74edae9ec9bacb891545079c50745fe97b6520518f44fc7dfaa521bf4fb4c166ddb7fce9752f7b94bcf544fa6a7856c5abaa1f19b55fd61f0930e593cae0ab618f089f51dbaaa4aa0b05ee4a4cd695dd08261a308f80ef50b560d1a16c2b7a0eddba2d59c5e4ac1390e5e389efcdd99c7339013fc52c7816ce7fc394888d78a5f65f963ccd168d4f502fad2d189e3da3d928c0000ccd5381d5d4e303195df165492772260e2783830017"
+  },
+  {
+    "public": "e8ead06aeca54e7e207891c99ebe1e0d43dd1d68cf223c4171cbae7e108c9e73cff0fb0fe670fff21bac7cd3b32a891f99cbdf67451e4625895882bbe2a1bdd74245e1db8b8079fbc0028352fa71abac27e449c6c910d86bc21cf092f506c8cb8a467e03026ea129d186354e59479f1bf31ba0bfbd5c01c9363ba09b9d603cd2",
+    "secret": "a1653dd2a5be5f6115848fee826fef70e98d9949bbc90f6ec670424eac6120ccca91e599db9e6141b1184813ead88dc2c24ad0d1ea9460c185f35764c06ffe54cff0fb0fe670fff21bac7cd3b32a891f99cbdf67451e4625895882bbe2a1bdd74454b66f24ebd39488b889bc3a25346b8fcc7e6f6fd2a8d079caf65035f19d5b5fd0306b6173fc6a46a00415737b86360fb6a90ff562b5866f8b315759f770888a467e03026ea129d186354e59479f1bf31ba0bfbd5c01c9363ba09b9d603cd2"
+  },
+  {
+    "public": "952344f1a11200a672e37e05dac9915aacf9364f3143f82d573e0ce76a7901f5e3e6dd67c3afa193473b7ae890fe27dc43ee50773224800743012d1f38f84708eca08014eba03e852db828c6d06c28bd95a2871c346ddfc706d88a9eead39e0c73760f5dfa950596d494f255cb7fd07973f5fe2aa87e4caf54256b72ac27f0dd",
+    "secret": "5018cc002bef24518b147ae56a84262d5428baabc16bbb82bb6e35b17b131366897f89eb2cd2f380874760c7cd35ff26405c60e5eb4bccc41070511704e04731e3e6dd67c3afa193473b7ae890fe27dc43ee50773224800743012d1f38f84708f2714afb5f5e36fa447dfc9e6db074e406fda225be341be85cf2b788112554ee7260e8ce2e412d31f5826fb28d2df31e5aa0d5eeddc5a7ad42b3e47f3c3fa64773760f5dfa950596d494f255cb7fd07973f5fe2aa87e4caf54256b72ac27f0dd"
+  },
+  {
+    "public": "8b07ec70d9ed42fd01049e11ba410b508c5a42021ca009a1c46bd0bbe8c97ba93eb649502ba4fa44ec7338392a11ecf92ea3e7a8967e9244e72ec5cb257bda4cb252ab02d55c562a5e26c52b4252e1b16d6334b4984e5ae11d950fa02896a0d0fe3fb9ec5a8f88df07aa62d035aab10083fbd42295b441a6cfed0aa186a86b32",
+    "secret": "a3c42a9971b97f972589e745264b856d29725ccdb53552de9bfcb0dcab1834b7a84c4cf73c8a2102cce41f3ea56283d75cd30c3225b6eb046f032ae914592ec23eb649502ba4fa44ec7338392a11ecf92ea3e7a8967e9244e72ec5cb257bda4c23d1ccc62ff357aa61c1f758999a7bf1b974d85b433ee6d6a5021faac5780e11f80c9573682c3ed739b4aec44627bbfe718aac1e4d4a40eda3a26a2bd9cfcb91fe3fb9ec5a8f88df07aa62d035aab10083fbd42295b441a6cfed0aa186a86b32"
+  },
+  {
+    "public": "117e4b9399274a455aa6aa339011c4c4fe899c7268029a905a99b5ca86fe3a0ac66230621ffc06825ac6ffbd5dedba402b70039eaa4a24ab0e6357142c277898789cac4a7ff751727859b85335bca960f7aea3f74b8760b3488c1a6290c8728b30f06f96ceb85314063ad76bcf599cdb5cd52db1ae67da4729d6035409a45c72",
+    "secret": "52d111dec37b4dfe625f0884a7fda0632624f26f786a1e593c68df6761df2ca50d0405b4598c1e9e4b45c74c2f68a789738a44353630f1c2059c65725f243569c66230621ffc06825ac6ffbd5dedba402b70039eaa4a24ab0e6357142c277898f3c6dc2f847046a7d5c1254fbe54e2bc9dbd20bd161abc0542f8ea33826605b5ef7e18f77534b22bd792989b7f1244ce854bacc850510c229e1d03f81809db0330f06f96ceb85314063ad76bcf599cdb5cd52db1ae67da4729d6035409a45c72"
+  },
+  {
+    "public": "98518185a45b9cf53ef1f11b9e1cf84e8f3ca1388005935476de5167cbade7d4f586126a3c7c08379db063631cc4b0602421b51a108087193a28ee613bd3054eb095a027b82d715265b4fcd7bd244370c8d0052a12c6151b976f96703ded0b61ea26e53cf32ce660aed303d383ce339d13ce5a654fbaedea7672896c8e9b6d77",
+    "secret": "96c457661bfb3fc1af99978e8f3e36aad4148c9e2c588b25a958ebcd471728bccfa0bc998ac6349772eee3c18272ab5ae6b1973cccb2a63abbf40ed3c335abd8f586126a3c7c08379db063631cc4b0602421b51a108087193a28ee613bd3054ea7baee3160dfe29da0547951d9b81647594a642b88f99a39ec8f9e1b6e57fbf2a9fbe376b4847f26eb644537fcf03a8a5911b29c8c11ebf79bd1425ea50e3b76ea26e53cf32ce660aed303d383ce339d13ce5a654fbaedea7672896c8e9b6d77"
+  },
+  {
+    "public": "369e99b111112648543b3fd7ad8a59278d0da849789e854ef315393042a35218b848883d999a0bef7fa75a90fe779416d83f996edffa0762205303a29e93b29b27ceba94f89ab9dd0a1961c2f2ddda05e5e36cf97cffa83cb479df3ad923407b9c84024144fd25ebe1edf58e1a04ab031646d89cd0eebf09d5abfa853a06dcf6",
+    "secret": "6f43b50aec2b4b89e4cf4e6c68b4ecebdaeb64f6a99ca8081992f0df31b664dc25b30d6876cb45c9f4fb51abe0d0f64def84ff5f0b12140b42e86debde5e0f77b848883d999a0bef7fa75a90fe779416d83f996edffa0762205303a29e93b29bcdbdc2e81844bf90cadf62056e9a08ee9903e6156f2bcaf1262150e0ff2a6661d238bc10afd68fe8d382ec30f3e28c079cbfc104f684ca216c0d9a91eb93f5a49c84024144fd25ebe1edf58e1a04ab031646d89cd0eebf09d5abfa853a06dcf6"
+  },
+  {
+    "public": "194adf2ea19eecbe3a594def0df90950231592db1dcd92f20576393ced73cc1359a211a643e74daeb46d3ef133038f1a5715c50dbbe1a55dae5393cee6731c545d22ee009e8d214a7e62c65336f0f3be30dda7aa1a3a1e469b77786becab031610cd5fb5b4cecdf914c00d7c119ed5f44f8cdf27d1fa691a9c9306f407811e0b",
+    "secret": "7353b29e7a50007e9178adc242a84837e4fdfc6fdcbda640999302396ffca028b00dcf87306426d8b3b69447e2ec00b4ecaa7b91ceaa3ad31056b89bb516d6d359a211a643e74daeb46d3ef133038f1a5715c50dbbe1a55dae5393cee6731c54dc780e0d8a15cd59354c9d1ec68e6ebd0848eed7af5d74f7173fbb0cd0db05e6e4a746736a7c60e0b6fa55ad4fe70cbbecb1113f93244b36a58bf7dbc83b964910cd5fb5b4cecdf914c00d7c119ed5f44f8cdf27d1fa691a9c9306f407811e0b"
+  },
+  {
+    "public": "d3d415bfab13e061578d52cef6884c7ea61a793534a8ff232a93c1e698fff6a464049af40062d579b3ba06dc69bcae486aecaa730cd49612f4226a438a704f9d574623df7e3aa7dbc98a6bb9a5fa5469d3eeaa2a903c0b3699068af16e758676989a7883c38b5a362feab544b3549f48673f01f67b527971a4540ec70d3c58df",
+    "secret": "9e5575cfb5a68d81ebd2930e631858373114357c2a7e06ffb116feb395be41452c1d8917177e4a5ae42f0b0009e44bba48521c38dec248ea134064f1329b4d7b64049af40062d579b3ba06dc69bcae486aecaa730cd49612f4226a438a704f9d73e66f3d6b4e0ed76aadd35ad4eaaf34c418f129fed85965d002c2920cc8511c095265ba88c1c67f9f2aeb098f8301c2b205fee1ee2f70eb063a103f3a88f119989a7883c38b5a362feab544b3549f48673f01f67b527971a4540ec70d3c58df"
+  },
+  {
+    "public": "57e94f6587e59dd6875924d24698e70a6f8a121ab2fcfe5410fa0cfda6e50d6bda6af5bb117b0cd65a06e85cee87d4e44334dce129c5c8244a1f31d99bed35226a967fcbeab8eeb6f2af7c7377064c81262dd5468757b36ccedbd62160c9d6a57a55b96b1b9b2cfecb8e10210b9321df1095c886c18f493a0885f36bccf678fd",
+    "secret": "9d770522b0f53fe5ad34f990e7b75c0b618ee5909903d36e7c7e1f23775ac359068ee7c223633903ceb5834b804aeabdac35c669b5b0701d18fbf67b5a260681da6af5bb117b0cd65a06e85cee87d4e44334dce129c5c8244a1f31d99bed352214679a8e28949289eb623c0d3800419017aad1d89a32537a5e30cee93de550056376172bd4e7bd26e1b5501c7cd5b28aad2857d5463f50a342fc87325b3311c47a55b96b1b9b2cfecb8e10210b9321df1095c886c18f493a0885f36bccf678fd"
+  },
+  {
+    "public": "9a02cce2a2304063be6c02e431f0ecb74aa33b0d669fdac317eb602278d2ea6b373103a197c8637a30467c89850ffa449cc5077f7bb73b900b632741206a7dbf7d088db70c08c3fa9425361e998cbb37da196ffe3ba931ca9771a942c057222c106b8f0b75c6ad4971a545511e864027f2e855e7a84f7778afdfe23833d4c495",
+    "secret": "2243249c980c338411548bef7c88d444c214026579fc14c4c4435d6a4e1f00156348974ff1cae0229fc8f3a762c7fd3a3e5e8996b80165af6b9e42beeb98d7d5373103a197c8637a30467c89850ffa449cc5077f7bb73b900b632741206a7dbf41c1ed0a1879e8e490c3fd74fd8e873dd98af8c852844357f782ee5665d445a32d141d0466bf3360500e600ff143b0fb435bc95c58c312713fbf97f920fcadbd106b8f0b75c6ad4971a545511e864027f2e855e7a84f7778afdfe23833d4c495"
+  },
+  {
+    "public": "473ebffc232e5e32620cb645a679e7ba19d5ebc951b5fa41e31fe8dc01122c1b015cb6d016081c4cf9f13cfc7e77cdd7d43a620db97a66b97404df77d4657942427f88ebb56bf8e764edee9f432a3a1196716721dcde4c43125c1360c3d34d750fccde94ffe8c13fc836510cd11c02e6161e274f2a1943a6cb285a6e195d56e1",
+    "secret": "7eb81ba3e6532d062da017401dd2797b2d50223013e1c0012c131e46375bafc1af76b32547578b750e3d108f98373aac9d9b24d763155ba411c7745cfecc0253015cb6d016081c4cf9f13cfc7e77cdd7d43a620db97a66b97404df77d465794201fa77a2d53dbe066de0d4588c70b084c495d46d7b03d25c4b369ded8b6a481f41eb9e70cc0bb2c234e41445a30648b141421bcea638a32fefd8aa12b25fc6d00fccde94ffe8c13fc836510cd11c02e6161e274f2a1943a6cb285a6e195d56e1"
+  },
+  {
+    "public": "0cfad893173f2558ab86c09c1692d2df59733e5e9f69d25c96fdd4235a2bba8810b283081fdbdcb0ed4788741d46aeda7ba93a7ed03416b0a87c19807d096814860d9b4c16d5f6185355c49f94c4933dbcbbe3b1d8d2da521490f47f4da2949d8dd0d041d672ebbc763c3c96e4ce78cd78020d11c8900b4fd6aa26adbb5a257a",
+    "secret": "c326ff1d6c979bd4db85fc6b1cdd524bb8680b48a49ab33d1515d98abacad2f38c2d0d4be349670d6900e2b11f0580d0e30279f5daa9c519d51ec81e66f7ecb810b283081fdbdcb0ed4788741d46aeda7ba93a7ed03416b0a87c19807d096814c0cc37c1ed56f75f06c88a225644ee95bbca9a4ae4e959922e890db46d6d25cb43747be0133f64d9b157e5a2d5ec3b997fa877fed7a6c2c4d9ae2132b7a00fb18dd0d041d672ebbc763c3c96e4ce78cd78020d11c8900b4fd6aa26adbb5a257a"
+  },
+  {
+    "public": "6ce53df1bcb84e0f7689d5137a107765e0b37107b6c99b8643f31868ddef319f4d081f919aaa75bf57e78ca94738e8b6247021905e20eccc9e32b402d4aa03256b9786ec12e85b29d8dab54c214bba8f0e58f77fff057f9a2213532cdb57bf92598fbeeff890492811fa1e41ba43bc136d410c36fc07f5b7a141a58b78b4875c",
+    "secret": "ca1a2d55757cedf47f6a9f5d3781b007995a0fe7ab7f63da9c670ffb31a6e7edbe460a89c7e290acdcf1a8abc34ec733f11a867fee971aa1cbb2ff458017426e4d081f919aaa75bf57e78ca94738e8b6247021905e20eccc9e32b402d4aa0325975191a4c95a0e3e7b4deca40a908ad0d9dc4be82b3a3d4bfc96b830af2223aaafa45a96e8194653b52abd0528981aedd21c5ed88c5ed678007b2ecb9ecdc9a0598fbeeff890492811fa1e41ba43bc136d410c36fc07f5b7a141a58b78b4875c"
+  },
+  {
+    "public": "06ae73bee785f3b0da97a3a7eeccb7f761b9469748545fc6f9709dca86dcd6476fe553806c7ce16b0771de8eab86a16451d63bbe1c4d18d7176b93822d3ad9b3ecba9782d31f781bfe593823180b339b8f114186375d3ae963fefa7ed9d72a05460295f2a9f498f75f4dbc50ca15e8c9c332a78043ba71686d9318e245306019",
+    "secret": "2a54db99a205abdc30bba9634a2a0bc47fdadb1902a824953b86a66b25d8cf915fc63255af7c37b966927fd8422b6fce0a1414672af9d20882fdaafa4a6efdc76fe553806c7ce16b0771de8eab86a16451d63bbe1c4d18d7176b93822d3ad9b3a2fc92a891cb3fe70bd0ddfa629f530d0359c173c1c577e705cae5026ac37e47ae76fff8080a275073676586bee16fd57b7b9a56486579c925c30f8cb367c51d460295f2a9f498f75f4dbc50ca15e8c9c332a78043ba71686d9318e245306019"
+  },
+  {
+    "public": "f24a6fe9206115f41c5f4e31337f0de2fd81e1495d118de9a9258b26dc3a083b2d3885cbc9c6f5a4141f3c5948d4f62a028a4794fdcf1e1b64890798011ea395d1588d137553395d0963a2c634648802476edd7458aeec488532bba0107277409f92d48edc32a3676b4ee8a1ea24b0e6add9c8aa995aaffd1e3c151b97d54a53",
+    "secret": "e772b91ce82dbfa9d2477663b66a4ebd99d79ba7917c6345436f0e8941cac9c97f3dbbcbf19cfd847da776b0e005d36e4ac5cee92e210ec27f54f164baaac79d2d3885cbc9c6f5a4141f3c5948d4f62a028a4794fdcf1e1b64890798011ea395afa126b1cc325291bdfbb063e928c09cf9edb70079da49705084673902b0cadf3a3e6168161aee7895bf1a8a24cf2d5ba0293f1e882e81a8be3b85e6d47fbefb9f92d48edc32a3676b4ee8a1ea24b0e6add9c8aa995aaffd1e3c151b97d54a53"
+  },
+  {
+    "public": "03061858764a431b68e8ad948f2c42e10c502a2aa3d8f657436259f1a5207e9fdb01546343cadb1adcdbab52ebfd143924fdb37287b191329549a1812e86233e4d98b3d4f9b1ea6059a901c8a8ba8bba397879c12ae0cdc8e8329f678cc2381758fea53a8ac53949fe271f1e423ef46343c20285d8b4bea79c5dbe2461bc3d29",
+    "secret": "f72c908748d5c2a489a1f5785f347fb4f5a706fd3242614b0c10fd24078e9f9d771be4bfd166086386504c4e474857e7f76a04f384f1da3a86b27a3b938d11e4db01546343cadb1adcdbab52ebfd143924fdb37287b191329549a1812e86233ecf682a88fc2bea0097abaf435d301d49518cfd6d9f23f4cdefc00c4ae2d5a90a6704007d49bdb8d4c3461bb234f6365a968b31b13a2956c83d277224a1fa2edb58fea53a8ac53949fe271f1e423ef46343c20285d8b4bea79c5dbe2461bc3d29"
+  },
+  {
+    "public": "be7dd768614a452e3608daa0caeb17c66b02020b81597eea5bd360dcc5c43f529371b9a0ce6f9f0b89cf4de9857ef943d0727aa04574646c2089dab086ae29f3ee9c85805e836fd3f27598d7be5ad4f9e62cda141abeb79c3f8dcd525f6091948d13b47366b6f66743ceae1fa3d0ef6a86dcd41f3a12cfdaec2d9e6c365059a8",
+    "secret": "4838c7865bd0b0ce1e08aec9eee76546a801b3bcbbfc97e5f6bc2cd4a2998640c2eb3bbc48df0357e25821e5e957e1f6a02fe96060814b673c4aa1ab725819a79371b9a0ce6f9f0b89cf4de9857ef943d0727aa04574646c2089dab086ae29f3190cb51bc2ba50a2be1f113fa7167526cc2b3e34f9ead04823c49f4a65759f74ffbd456720893b39537151705b7562d65ae66303ab1cf37700bc79c156b57bdb8d13b47366b6f66743ceae1fa3d0ef6a86dcd41f3a12cfdaec2d9e6c365059a8"
+  },
+  {
+    "public": "2d40c1e9cff84863ee69cdd6398853b2639bbcb0c589f1e9fe585f85ed81a5a2219da0836be79d24d4e79cc4179a68cecc4d62365ad4cbb27e159d62d0a18dfa74d04c25281943a2103bbd626f83e475514f93cafc053107dddd9d6967c4dd5200720a28289658b37028b4430de7171770b4dd90669f2a18271f170aa3df2d26",
+    "secret": "260d468f1e911ffe67c6f061063ef26ded23397c2e9f12306bef7882cbf424b5a665e289cf1b6b70bddd7d94ca158ac3eb07e6617735f894926b351d3e897853219da0836be79d24d4e79cc4179a68cecc4d62365ad4cbb27e159d62d0a18dfaddff74807c214889e6bea209bd16115effddb850cbdb8c5ebc3b6b8f39221a077e87efbf88089a5b321b12d7dc8b3174446e38f1c4e2d94d615266342e29e7a400720a28289658b37028b4430de7171770b4dd90669f2a18271f170aa3df2d26"
+  },
+  {
+    "public": "968dd4338b8e5348e209aee079f12a22b76beeafd48e04d3d7d0468b3072e6fd5602614cbfe71dff088e1725b64ff267aa1b825d8041459285be5fe25a68b7cf0d719e63b43e26c05849bae087a16e82ec167ca03db6b5ea5fb874d3fcb57225bb4b4c7452b877774f82046a32d62f163f9d3674e705829cfa692a6cb615e9a6",
+    "secret": "799183d3835dbc7863c91f052da2f1b76e3d8b80d09b5719074d8d1246e64de231cbd8fb95000a3ec5d117cbbc216fca3d2646ad7959f369a0436253bd9189755602614cbfe71dff088e1725b64ff267aa1b825d8041459285be5fe25a68b7cf825bc14f86445a64add36d1cd53c053bce0a4e6663aceab3246bcf91efb48e97f9ec50285b819d98b308f475d8e7872c87c7aa1e7e248b8175d956d670a9cd6dbb4b4c7452b877774f82046a32d62f163f9d3674e705829cfa692a6cb615e9a6"
+  },
+  {
+    "public": "ae01f80b18d6ef4b3fe66f8b880a87f9ef65636903acc5d734330f10a82b44c7747bf148a802f13830c4becdd91f2cc3511c4f40cea97bc05401ba18ae3a09479ab472ba72b8046fd132ee8b2e9389bfb2f5c3dbdba07be0d939b83e05ca3d4606d62f8fc76896ac77c34f12e78b2bf476499ef44e72fabdc187919eef8384c0",
+    "secret": "b2d0885ceeea7f6ec936479c1419c878163b43e45d8b5dbb22f6ece60499f4b23612f2001236265b979c32b49c20c7987064ed4f16d6ab022c748885ab2d9b45747bf148a802f13830c4becdd91f2cc3511c4f40cea97bc05401ba18ae3a0947b39c52f3a1fa3b207d7cbff5f226abff14458d8dc11d7d241526d023b837ab6a2cee96be94843879e09fd500e6be3dbd23c60ef59dfb775d6505a389d4a7f31b06d62f8fc76896ac77c34f12e78b2bf476499ef44e72fabdc187919eef8384c0"
+  },
+  {
+    "public": "c53db6a2b148e8f2e384e6931ff0fc6483f639e6cf177a519332e16fd022009882e24263097bcccba584f62b62f7fc3822ea30a53b67f72ffff21c5d6a8535d8a7dc5a3542f2a9311d637a8800953f54304f463a69b07d049095fba83d1b8bd33d43bceb0655d52e995e9ffaada1f1ad88d275b5e0600c6a8500c2d2827dd9bd",
+    "secret": "d20be92103188c4e2674e3d0f29d72c077a7b8be937e8b175b704519442f3021faf3a7e6acd163c4afe7f1aea2db78cb7eca27b3395ae5d6ef75b46157e78c2e82e24263097bcccba584f62b62f7fc3822ea30a53b67f72ffff21c5d6a8535d84e4804c1dc3f9b5148d38914100c75f6bc7f93830b82ebda819ea887ad76ffd0662cb2799808e465923c86b59f2f643896eab0a5a436990e26ad2e0a1b78df2e3d43bceb0655d52e995e9ffaada1f1ad88d275b5e0600c6a8500c2d2827dd9bd"
+  },
+  {
+    "public": "700f6f49df738c0a4c3d840bad941dfe32020ff6e1a60c4024cc9408b2da7845b55e46f150a1cb60e8914e9f3ace6c8b44f562151c94580a0e2fa7b10aa930e9b6d04de36468137394403baafc0658fab1a2c8ef8c80603c715d1f9bfd7d5677abefab248b8f736ceb10ee8e23b4c2d32ce6d71de71de26d344ca9ac943d09f0",
+    "secret": "fe9b4f6b0db80612a5b9467a016c939904a5b5ac9ff07e268250da5e0327b8541ee04ba1c325c33bc879ed39828090578c95136ae517280371124a450e7a9bc6b55e46f150a1cb60e8914e9f3ace6c8b44f562151c94580a0e2fa7b10aa930e9bd28f1b5100b013bb51c2f80d91de3d7562fe1910ca56cfb084adfa5ad95f08c9df6ae179c5bca356038aef90622b96d34967f52d5353b6d1af3a8819abb9953abefab248b8f736ceb10ee8e23b4c2d32ce6d71de71de26d344ca9ac943d09f0"
+  },
+  {
+    "public": "9167f3e6a21c4665ec88d22732abd0a234235db60ef2a291a389dc00943c3ba48ba88cf06c9ec9cc50ff2d26b0a2ebaeb24aafe7b9c525f6c99363b295d8323029e0856d6118e2e5db9d6428eff40447cd75da9de36dd8018566d9f632919fb1b9b86d02573e446e8205af62a4282fd97f532502089b09234472cb907bcc240f",
+    "secret": "f46ee5d3b1d4d0d6ebfe7f8c1ab0973dc312f23a4d02c75dc85fdcee4d30af4ea7ef5ca6f0a102b371530ad90801828bb90ecd67fb1d478c1c511423f177ae3e8ba88cf06c9ec9cc50ff2d26b0a2ebaeb24aafe7b9c525f6c99363b295d83230f7a20818a648926088fbdbb0d2477379abaeed4bc0c26addc91dd6f2991889c202e48929ec9294b0c4b421800e3b421cb0ee49a6a8fe6f0ad2617cc81e83644cb9b86d02573e446e8205af62a4282fd97f532502089b09234472cb907bcc240f"
+  },
+  {
+    "public": "9872578e5d39ad912045c1b2b61c996b14d550a8c24fed13c7ef1861e54b40a9092e94f3b92bec971bce5c57e933ffb8e95cba2c2cf95cc5e24e5fef6b007bb5b56daf276879a25685035bb041a066c635d08dcb3fb65d6a6bd52c249f40019578c676733edbb94950e03fb9f0cd61e2d1091e73f8d52b7a1bc2080166090127",
+    "secret": "ef941b19bc57525fece9d371864f7fae6b06384eb0c35ed080b3ff6d6a8da76e49792716a188a2ebdc2d1975ad2b9de3a7212fcc3ed531db84227f81c1b41d53092e94f3b92bec971bce5c57e933ffb8e95cba2c2cf95cc5e24e5fef6b007bb5a22367abca4939d686434f2b602492e0fee1c8b973c0aba9fa8badaab2c97cdd7f71ee351b5a27e2b9d2a389db0b0740b49c39ffd45d9799d34221449944b54978c676733edbb94950e03fb9f0cd61e2d1091e73f8d52b7a1bc2080166090127"
+  },
+  {
+    "public": "5f5362dc070d1c176388cf8aa7384cb3afb050483ba3cda908e9ac3bfd20b6b570da20d5ad498cbfe5f40de6ebd3c44fe988b364d6ac1901d5ba63d7a9ce04c0982590300040b42c225699332e08396d3e065d7a3ebdad69a847651db586913264d9ac930a762de12045211d1631e4c04d32dacb1dc670281dec1daf6bc5955c",
+    "secret": "6c287acdf981de221b719b5e3a595348b41e87c9ce3c25ce8b5e7ef5d06e9d2fcea0cb248493379349df754de21e958c4b6b3595ba90f8ec4faf7331a5a8081770da20d5ad498cbfe5f40de6ebd3c44fe988b364d6ac1901d5ba63d7a9ce04c0fa532802fa7d1c1c784870aae4975dcf596ebb0922447eec66ca207b4efaff50e684721f89ac22e0e4d345f4b465559499d2148ea6c85c8e8faf781e6cfea8ca64d9ac930a762de12045211d1631e4c04d32dacb1dc670281dec1daf6bc5955c"
+  },
+  {
+    "public": "4c819765c16b0c0cab9ce2808bd50d51aab6353738d4e8824b7748c7f3d0102769c29ea2deae5c7b425c9c2fe6928994af6e6f9bb98fada6aecd6d3fb70c9f82d23d2b49cf46f27f86a1333b865b310145a71ec8411b09c89a60a550f6e2c2ba6f224ec0bdfe3299e979e86dbe552ea2af8516aab717827235cd146e5a3b13bb",
+    "secret": "ff9f8615a2701e2c15111a0a757b6eaec81eb3179df72a6785b21b2e81cb57911e50025de4679581126ab5044a8ddfa00efbecc4b9eb142acca0bcaa1288d5ba69c29ea2deae5c7b425c9c2fe6928994af6e6f9bb98fada6aecd6d3fb70c9f82ad2f187430b5d2092e8f933887fb5e8811c13699728ca67d7968878cb00ee768479566ada6a7ac513886b8693b6c77dcd4eb39449d128c6051fee6384f7fd7c36f224ec0bdfe3299e979e86dbe552ea2af8516aab717827235cd146e5a3b13bb"
+  },
+  {
+    "public": "9919af287561335d2a19ae7c5335c4383d658d1714f5ff62dd2fc30d0150f0b48da80603015cf29b74b9d7f6d248c3b1944160ba1637d91ea4f018b3d9b504bc947a366e053a1727f544538a56d022dbcb1d4174e4bd8b4e1f3375b6ef8c4ce6a5c172d839a6b82c30ec938abc652bb09ecf4c6ed8882b0853d1262efdd0e9a6",
+    "secret": "945585883c5c27234dee9b7ada9f04b30c4e82b77adb0e9fa3d077edc7fc10d95ab0116b4324e01167228aefa837c82f4dc2356591c528d86c19f2b32aa3d5728da80603015cf29b74b9d7f6d248c3b1944160ba1637d91ea4f018b3d9b504bcd192eba58eacd52c7bf6bb70a39809555417bce385e43ff48ce6103f6d4b4f3611551c8d38b964799e28a68efbb85c31ad24a8087d8857b6020a4a5763e6d4f6a5c172d839a6b82c30ec938abc652bb09ecf4c6ed8882b0853d1262efdd0e9a6"
+  },
+  {
+    "public": "97567eebc0ed433b3cc0040636f2f16635ec13f03605d172d0e7bc51ae259a6cc63c4ee29e9c73ea9963d35d80b1eaeb4f83f877158c4b7c2ca3cc9ce534a8fdbb20a79a0a5a433c0726f83be541dcb0a76990a2bffaed36ab3fc1823b329519446daa3f4ce8b572739b807ddaca078413d60a855ed58666036856debe3dd036",
+    "secret": "921e158313651c9c880c1e4d84268d7c872b2b615f3705722aa74b17080a4c3b1859e188fcd3f7dbb11778883cbb1c801fc87385ded81668e0669715bd2c3b8ec63c4ee29e9c73ea9963d35d80b1eaeb4f83f877158c4b7c2ca3cc9ce534a8fd2144a87038c7041135b6dbff9b20f372d471036a0155042b720bd1c84bed5fd2c3ff67ec2bd393f5f6b868c35dc97713899934610ff4af8ac3296cfa3cfba44b446daa3f4ce8b572739b807ddaca078413d60a855ed58666036856debe3dd036"
+  },
+  {
+    "public": "5057bbb90eb921f4db0cf9753d12c2dec3588b35b337293b643d6a9f086d508f1b242967d2f540fe263f882aed1ada06b64c7f85cb1692292ba90801936935656b0ffd621da3a09ba0699a20aa0014bad336c736fd092e5cb5b6abbc96aa17313445a75e59ab09297263236ff040d94c1e2c13645b77bc7fc40e091e8bb5ca94",
+    "secret": "a7dcef6392e0ea6ef2aafa2ea8bc0bbd096ed187dc0decd6c694481bff8106966512177073dda1dacf79532740a0e626f27c890967a2507f33784757b0aca78a1b242967d2f540fe263f882aed1ada06b64c7f85cb1692292ba9080193693565e8d5509aec3a2097978c70343973e0a455a9802b081425c1c224e6df78c00885eb5dcfb0cb8115562e6db912ae79c1ce3e4f2434441b4e13db3e0d6a2dad57093445a75e59ab09297263236ff040d94c1e2c13645b77bc7fc40e091e8bb5ca94"
+  },
+  {
+    "public": "71d91e90ed2dc81614d940aa222e0dcebf77776cac645cf16518ef56fbd85e15d9076aae5d438583fe1ad78636ef68363f685ccb3ee4562c542d71de8cccb6872e7ef4a9296cff56329f237a3fc3c6c1f7393dfdad3b685b7b1937e3c069dfe7d2699a6a55ee9872b52c51522d6104418455ab402cdfd05e8dffd8e0adbfd8a7",
+    "secret": "65860a37d510e06bd1b5cd69f3b667946e4f847b4771b897a88259400f3ab152e5bfffa9fee0aab93e639c239e3813e9af5dad1743bc582fcc960c36147741e9d9076aae5d438583fe1ad78636ef68363f685ccb3ee4562c542d71de8cccb6876bac4cd4aecfadc54122beaebd1e63ba5f9418f9c056986f1b98497176646cd4dfe43eafe4812f7a9e87745588d80164a1866f6284110baf1399e6b1c3f0398dd2699a6a55ee9872b52c51522d6104418455ab402cdfd05e8dffd8e0adbfd8a7"
+  },
+  {
+    "public": "fc5e39c9760407aaf094fa496ac0fc2a19b886fdb7af7bdd4ef911a93734afad87ada8443d350c9bafe46b1b570b8c8ac980018b2e0af2978382cf6144b0622b2c469baba42d7485f4b4926e889cfe426dad3980ed70b67f3a324fc6fa4bf401f719e84084fb0d47d29089fe8b6549ba5bfe65e2a4a8b0f3cef201ec382877e4",
+    "secret": "871129b42e5ec16fa4deec48f678bf060269c65009fed5ef1ec2aca267da5595826d1cc39cf9d8014199511b6d2c694f1c776a23e882b5d4328e5a76bd8eb35b87ada8443d350c9bafe46b1b570b8c8ac980018b2e0af2978382cf6144b0622ba98c99266e07083c6c083f005ac156db7bf1c88958f54f48246222ee7d9182ac93e31def50bbcbadb33e56c27ba037ee448214f445ad5898b2b4d9f7c8b720a3f719e84084fb0d47d29089fe8b6549ba5bfe65e2a4a8b0f3cef201ec382877e4"
+  },
+  {
+    "public": "73d7a15c7a45fdb05df32cdc65dc5bcf68c385ad292f082f8ff2e2ea9cef454c76a6a94c5476f20f1d4e808cf5c5ca30c12cde5b85746ea78b6e8625f2707e02bd917c4d334b04050ae62c27624cacdd74e5a377308c8ffdc7061a2f7a97f42d04f6e40b4977f05356fe1a63c9a0131b3d7a653481c83febf4fd3efb18c4ad74",
+    "secret": "f7095ab862de773f4914db0f794e1c9261bdfae247943b4d623a7187611e1911ce4eee4f5a5d6ed0e3bba6368bf9d190b6998f74e8bf26e844689badb302566976a6a94c5476f20f1d4e808cf5c5ca30c12cde5b85746ea78b6e8625f2707e020a1e54666b50bd41b849261f853983c403c56949d081855dc768424c2d3030ab3373f7d78f935b232ef2454dd105a5b6c7f76fda36adffa058eb2afb9f9bb9fa04f6e40b4977f05356fe1a63c9a0131b3d7a653481c83febf4fd3efb18c4ad74"
+  },
+  {
+    "public": "aba7aa170f37b423905493de59b2ecc3083d1ccaec663a800fdf187bcb38cfe6183da8484a1170b0e822f713779b25d7f193634ef494d12b31f934cacc9e79ee76c3d49944d6bae01aeec98bb291e90185b2048ae9944839c27019030cda5de4ace0ca6ba44ff8c26c9b8106a0aedace7194548c8e4760d5b8f20fc554acd8b2",
+    "secret": "0329f5e215210de13bea8ad59ff4db6222a67efd64e57ea0912d12c746a73d0ff9a7d4616013e42ab13e717e36516adfc6de6a701423dcc3387a8201ca165fe6183da8484a1170b0e822f713779b25d7f193634ef494d12b31f934cacc9e79ee0ceb8ea36b05091d225880ef92849e8e853286484345992a2b67041f9af30acb38b17f8347f8f29f07a2d7b959f34d5036787b9732516ef7bd770e31cf130b4dace0ca6ba44ff8c26c9b8106a0aedace7194548c8e4760d5b8f20fc554acd8b2"
+  },
+  {
+    "public": "566a626ff22416d2d02894573d06570192b9cf263ad82421a33aaf29b141c1c212e315b37f71dd39d9ba3529261ae8642d04df6fba4ac08478f3d397621cec9ddfe14e0b1a503ec7fd850a08d1c61442e00baa8c0a68915b231fdf4d9c5d09c21d049a1c73c995825b9a12445463adfcd5e50d9993ec5294169ff786b2689793",
+    "secret": "22dbe4a67d24d9e7fea026aff0033a7d2356bd1c3e150f0a5cbfd31f5db0a25c8e4aaabc50605ae46ccb69fe36bebd2045eea9ac2ce50d33e94e6f5aabad874b12e315b37f71dd39d9ba3529261ae8642d04df6fba4ac08478f3d397621cec9d981acff032aad2b8191b5e56f081e35e93d81625cc9b8f9d68ce8e1e407004af6c97d35ac91b0a88e5a6df86fc2d8e82539feb016befa8994b3b783cc73d35e71d049a1c73c995825b9a12445463adfcd5e50d9993ec5294169ff786b2689793"
+  },
+  {
+    "public": "b141a70668cb8533d40fd8fae3db8e786e0361c7f82e014be837036644c58dfc173c2ceecd803add099b6d3770812837c9b313e8198b675da5dcabfbcdc7876296c46c389bc489265b8b883936401ab4df2b23e0cd2209ec8c0383efb9dc4bac8c612f9def0c902db455d26affe8c32b523b16083b3d9e638541f3de050c7595",
+    "secret": "0c68ea877512a44b7c2e9c123effc31e7bf194d9cf440fc09550e6f69c6c6b395d562339ef8aa18c1fe82a7ff546b25c72ccad3f20de96b5ddf707d3d09e2cba173c2ceecd803add099b6d3770812837c9b313e8198b675da5dcabfbcdc78762ce66143f975a1dc24f0bb4a7b844450b9a30e61fb93ec7add929a6587497ab82b731699fdac3b2c58ed6846129bc8f45fc25ca0f704948a8d3e0c2f2a4ec24ff8c612f9def0c902db455d26affe8c32b523b16083b3d9e638541f3de050c7595"
+  },
+  {
+    "public": "e8846c74958315151ede7ca6584ce67dd657ae9f2105eb1ee416d8b16a641fdd7dc7118c3beb0d722c555eb87cac2536864bdfafdaba7b731a14e80d1121fe4a80da7f46af6f7b06344ff0d52aed2e20aa8e1440fe8bf4985c25e6acaf4ae8584071e263064d2b6d0aad4e52745aed1280387dca779cef4c724bcc0b91eec525",
+    "secret": "c49418990f2ecd5283dae8f77d6b9a2f5f2e8394765cbb927dc175cd5cd9028429e12b5d78ab8282d95842eb0ca75af302c90eb1b6c4c964f4a4942df38a251c7dc7118c3beb0d722c555eb87cac2536864bdfafdaba7b731a14e80d1121fe4ac03d0b94dfbb2bcaf82bd403520c722036c68d3edcc3bad5e51336444dd82a757b9503e9c7602cb71f02b2c7ef4c8a8e0689c153ca25c496aa3ea75ec31c893b4071e263064d2b6d0aad4e52745aed1280387dca779cef4c724bcc0b91eec525"
+  },
+  {
+    "public": "1e9f81494e5d65c707b44712507f3dea3e6a13bf4f229dad669be55910c6ea1e1bb9ab9e6fa0ea233793aad529a5b3ca844a87654693b4058f4aeb97422d946bb62942255ab95c5d3187f7d8f441eb118669cbb2e416a8d11680a56623bf9fdb2297e016f78942697a35c1613478597f41d9076cf8a0034e7a4370700e7240cc",
+    "secret": "80ac8cff66b8584dfa5f472884f35d16614e632247b302e20403b6b8570d4245ea532360b055bee1efbfc82aa8ed31fc649a768b1d18a7321c942c77b1efd2b61bb9ab9e6fa0ea233793aad529a5b3ca844a87654693b4058f4aeb97422d946bc0a2d05f833d53c442e22ee91994f9cfdbfdab98ccd826f666c5721528bbc2e87b5ee5bd8a19c104ab205edf4b70c022ef47afcb7d894bfa0a1d473185b8e8c42297e016f78942697a35c1613478597f41d9076cf8a0034e7a4370700e7240cc"
+  },
+  {
+    "public": "a12ecb4b2dc1a7e3a427a6dc54ff09f0d41152cb13c57b61ed2c039413a6e7c713b22f372ebf8e49c321c82ab3043af5400064dcdaed3f387440da5796a94b131020766ef528bbc4afa7489d24f1bf8efc67aed70a9644701efa4bce549e18863ce3ea501b16f30435a8ecee6940b75f42c8fa5cfcf26e5d6f75e9a1e5a5795e",
+    "secret": "331ef7211ba9c8e69e81b200c679eefe737cd087e18860d637b3c0369da4daf2a2a6355fa58fd94a6362f39944343ed81761ac79d7a373e72188aba9ac9928ac13b22f372ebf8e49c321c82ab3043af5400064dcdaed3f387440da5796a94b13a3471e18a580a1f86ee382c53b764a6789267cdac2ae7c098b34acc21f9dbe5fb403291c310c886579e136ff1c0f6aadb7ebe86f1772e017e0c2f0c9aaa5c1ae3ce3ea501b16f30435a8ecee6940b75f42c8fa5cfcf26e5d6f75e9a1e5a5795e"
+  },
+  {
+    "public": "7c2a777f622652b845452b35cbb567e22e9f7ef583c31a85c29895b2b0eb0271b867c3151c8a2cda9b7d1907d2f5b98f4e3d7626d5ed6310c1ac9d28fafb7bf2a9b76facaf4dd2027f5f22d8f0de6a33630686b121b1afe1e21be0b7269e7d4b55cafaf0f4c57b62f3af04a665a0f7b93fc5b6d7e70698b5f4668b774098ff2b",
+    "secret": "c0a98bf4ebbc5eb79dd83f814ca016ccc66a613e8bbfe44b25922e771f611a19a39f61bdfcbaad784bd54058eeea02817164eab9a6564382150f5b85013fae21b867c3151c8a2cda9b7d1907d2f5b98f4e3d7626d5ed6310c1ac9d28fafb7bf269edf6635147fe49a74c5267e0f3d751758f4f9be9127abb667e3251dcf65074fcf9ab3ef6961e63d984cf6bb15853de07425ffcf2bdf7adee2d0af133d2cb5e55cafaf0f4c57b62f3af04a665a0f7b93fc5b6d7e70698b5f4668b774098ff2b"
+  },
+  {
+    "public": "06a300d1cdc1ff65041f6711884bded571e6fa3947f62a8c04c1e5980ee776a432e5b51f9c7a4927f10dafbad204aa0833cf8286b052c3adc7873f15cca9758d69f3756e35c8a03865dab2b0447a75b5e743c87a95fd9ea9c40f9d82077f1bace8b2ce7bb586958e5379b9770b050ccfabf582b24e478ae5ad877fdf9c2b6334",
+    "secret": "97baef272e2d1c71bab9f05b1b567c5eab42462803b59f02672018bb71f494f51a8d21294e4ac2baece44cd60836cace98e1770629818cccd17b503f5f16554232e5b51f9c7a4927f10dafbad204aa0833cf8286b052c3adc7873f15cca9758dd359f40302387e554e425ef14a009df41c17dd5fbe4736d559a571ceabb85fef127819a21219117c135d43386010fac84051ebca29bbfb37c4184396b1803a4fe8b2ce7bb586958e5379b9770b050ccfabf582b24e478ae5ad877fdf9c2b6334"
+  },
+  {
+    "public": "ea4061bff68e5564218f910da7bcf95a092eab543be53c8d07015163f7c8eea110fab30b24de1003a409056f1627f945b86599f4b6a5defd65753b714b24119df9f60870ca79141dbc2f133676cf8464f4032689462d338dbc863bf45bf31ac4ca069230f829cc880f4411445c6defa3ae087110954de129a1d3eaec872d8fa5",
+    "secret": "f496e399edaefae95b47e17bef722f2b99f2d77ad54617bad5e865670addeda4a305ba978dde2b1f1035c22db870194d18b5423467179a9abe8516a8e8aac9d110fab30b24de1003a409056f1627f945b86599f4b6a5defd65753b714b24119d90fbd436bc5287d02330b2e283671f1a15abd40cdbe99abf528c29a8587737d68ea3ffd3e116a9c30e46b698540b0ac5361a6465728c9f8cbded701c48cf139aca069230f829cc880f4411445c6defa3ae087110954de129a1d3eaec872d8fa5"
+  },
+  {
+    "public": "0f6602041c4c829aec44c66b63718d113ae52bfb399372282591910bd30334de62dae694595848d528afda85b9a4461108d6ffbcee08f2d6e757d4a53d8e688f166dcf685c535bf1517cd88f18f718dfd7aa55facd325f97f22872457838221ecad6a040673afed50dccd9fd12eee18c3b1d9b1046dd41a1a026b0754329e61a",
+    "secret": "72e28cf583bcdfb885100497de0d83ddc094d1a8d899af90711b890fe906be20a3340d21356aee57f012886102de02dd8dcffbd3b535b4ca8cdd8ff4159cd2a662dae694595848d528afda85b9a4461108d6ffbcee08f2d6e757d4a53d8e688fb34d58bbd2e8b56da6d0a0166de3b3a575fc90501f55302540519893cea5fe2c70d6fbedf9ddf40eb4d468f533525f7573b6d74e4a59b642d06e2fc796080c26cad6a040673afed50dccd9fd12eee18c3b1d9b1046dd41a1a026b0754329e61a"
+  },
+  {
+    "public": "c4b66819e68410b5d167414961660d30e8d9b913c7e69e710041ffae0dd8fae818ff8f7a44c24670b76f8ad34b311a2f1596e590282181ae23592d1b91ff16cb7cc89880e3091132589c020906f78d6f116f5277027ade716090fbe1330321116c83edeedb652ebb8e15b27162139718192f4963ec10fdd915dbcdf65f0248aa",
+    "secret": "83ac4dc9a632b79e480a454e7b2aecc004955919d390ad72c75c46d194a5a01563a693fd491feefb79c4e485063ce30df57ced90c1d63d5569b19fb9314e53f218ff8f7a44c24670b76f8ad34b311a2f1596e590282181ae23592d1b91ff16cb876e22fd5b0d86461b71242215dd69bea1636c587cce269351be996a84d7578942e34b3a5571a2d6de6802a6a3aaaf83358b27113a4931759baa002d1e9ed6066c83edeedb652ebb8e15b27162139718192f4963ec10fdd915dbcdf65f0248aa"
+  },
+  {
+    "public": "66ad7b5af14c35c57b47aabf09b9de02f88ae8456947771ce65e1399d1777b6c8eeaeeccab567021ab61ee787baa12c0de9aaf094f92da0533ad2ac963d45b93456d75c8b0ac5f2605eb1bbdb936bc0b8f9ec71025b5f5843fcadbf3af97fd5dc7a279099c32ea88819a67b2f03ce99059333738ebc01432eceb3a604787bd37",
+    "secret": "b82ce3861a5f894568020da64ebc1748c09554d2ca72ec44cee63f4492adbb5b08602fd2bd292b58b80b6d14a7487fa098663246475fb952b5a77df836f8be7e8eeaeeccab567021ab61ee787baa12c0de9aaf094f92da0533ad2ac963d45b935fc66382ce91f52b14242b83bf4c9bee4210014376d358e29e6355f21f0f0b076671316ea87437f4794252966190d4edd419461d839f77e0d39f78ee7b5d7b5ec7a279099c32ea88819a67b2f03ce99059333738ebc01432eceb3a604787bd37"
+  },
+  {
+    "public": "0afb5456bd9220f32b8332901f831bf22ecaa2161e656d0da543ee28b752a00fd95f7ed05e5cf8931cc0a370061f9d8232cf754bf50564a9392a6f14852acf2cdd22906acf8ea93fcbcb73774878246ec951e75450b6a43a0ef4e274efa2a72830d5242628ba80e849b1fc3666f4a5b1fcb7688596cac43d3afb00f6b9104710",
+    "secret": "4bc2ce0648310faad57b157fd85e17de05ef4e99d352e71c237940c8e9c49676bbe39316f3e890f284f44bcf2e5b56d80c0810b3339503c632a7f9b33a3c9eecd95f7ed05e5cf8931cc0a370061f9d8232cf754bf50564a9392a6f14852acf2cef34d722d2488c00f531c34dd5af4ad04316ade02604951c67e7eeb534bfe9f7314946b1cf2c0a295a1bc6ae0ebc1feb61a743ee3659fd73e3cae5a557d3cc5230d5242628ba80e849b1fc3666f4a5b1fcb7688596cac43d3afb00f6b9104710"
+  },
+  {
+    "public": "96ffaea7739738f5f26b56d5988b1a83f0b963ca08890d13b2a09c288725734f55266bf7198415fccc54e0bc15ed5d33d9ea94bc0d44033902a73fb35f17d4e84a484e5be4f248a9f046ad5968715f251d4a2358430f8eb86217b214e66bab96f6fb38d7a3862ccf685ad2960d85f127938335ac9a4fbf8cffff6db336c85588",
+    "secret": "d20e64dcb78f602c2cfe66ba9bdb21da392114e7efdb195672a0c432648c096b4d8da732d454c4103b542180b86f28471021b04049637fa216e78c79acafca9d55266bf7198415fccc54e0bc15ed5d33d9ea94bc0d44033902a73fb35f17d4e881cb830de014948bb547c2054f89800db655c9d5c40e11e6808954daaa9f9a16be1863177dbc46095b7beb45f85b4c285131e19741dc4c663f0cdf0d704f968ef6fb38d7a3862ccf685ad2960d85f127938335ac9a4fbf8cffff6db336c85588"
+  },
+  {
+    "public": "bef84c82b265acb6593315f4ae3530e88ebddaa2dd2c60cc4163c1c91fa6df1eccbfb6f65686506be9616d7372d5292187fe9ac4ef1bc4c06d9f595ef7eb9b8744bacfc9085a5df302190402d1dc2b66eb97ceffcad1ede85604d31f03b8c96342d5f56b27a0ac52979eb9622224d476b7bbe525a26dcffb82c66dd66dcf01aa",
+    "secret": "58669f3c24e9737f70fb11e68f6b3cbeb279f81993e95b06929900608dd00df200880566fe4891916f061c6e8b1f51c27361c05211a5df40504773b0176ae967ccbfb6f65686506be9616d7372d5292187fe9ac4ef1bc4c06d9f595ef7eb9b87987a09ae4265d2e0ccc88afe4fa702062140bd6305cd637b329abccee2abae92699b257415e5c48a293d66a346ea0771e0eaad0b658a508bb21086fab75a371042d5f56b27a0ac52979eb9622224d476b7bbe525a26dcffb82c66dd66dcf01aa"
+  },
+  {
+    "public": "5adbb4498c1f86b69c29e01eb78a2e33c810b2f67af31bf766aa757a26acea2f640f18eb616aa7e7fa74b9aac43987c2379458d34750603f420f0ed95e890ebd5d6fc434352666b4f288edb6b7ef464bea4e638aa6c52e81f7e37af97c5c46d58c41cf3082275e5a3942085450549262ce99ca2b39a539ef2a82b779d7008720",
+    "secret": "ff913b4f2a002de1c411c1e205ef5f24ce9aeed88646f264d776a2f85f2d5f6e084d6a6d4b5a58909e41375a440f052b1884da8e68e098f429094a5faeb78ada640f18eb616aa7e7fa74b9aac43987c2379458d34750603f420f0ed95e890ebdb842a503736ccf5bdde9b433121807d1b92a6be77309bcf4399c51a50ed8be954546417434cff7468f9b6be5aabbacc7806a3f2c4f121e941b2e34db46b9277a8c41cf3082275e5a3942085450549262ce99ca2b39a539ef2a82b779d7008720"
+  },
+  {
+    "public": "57cdea78f8f13271f6eccc7b4685f3b80f246ef53a40f389d0fadf72484a1ccd0fc3efa1845678c15c909eb6bfd2689954c178d09a67970f84ed68676a2e13c2a01daf8657d2e58fac407dbce7fb8be2ebf536902092b8b712b02b46bf3af93414bf2b05deeb89df56177e223db7318ad8799e029d9fcc2f473e7349dcef939c",
+    "secret": "41334f40652fcd6f242746acc853a325f1b754e0424b3669c6956cf6aa3723f5a43b393171927ab80267ed347ab3db069753f1553c7fd57af228fd8ccf44450e0fc3efa1845678c15c909eb6bfd2689954c178d09a67970f84ed68676a2e13c21511afa27889b82a941d289703023e08db6bbdc67d75207a1f49bfef42933022f8f96a29aee2543bcf0198102870fa8b1f6c72d59262099f1d751490d5a6e72d14bf2b05deeb89df56177e223db7318ad8799e029d9fcc2f473e7349dcef939c"
+  },
+  {
+    "public": "dedcea4f037e09eb8a4f9a6821d52f3b400df5dfda86666aae45b59a7c9043be1b42d3b804059d5e189750a2632f9f1d76169fc9d22ef30c4d4a9d14ea79d3e4f9279b42259ae5da3f9e13d9c14daaec4592e617f09521ac7e07ab688b43bb7d9cf16315cc92378571151d922d33a831649e5ee44cc1acb76b3a8fd044d6de48",
+    "secret": "7aa2f7b9b59fa30ac688904da719c61ae071102854f0a3c97ba76f1018af14952d068907983219c45634ff8dcf90245c34633d64f6fc1e2ec8d8e5a66da1cfe91b42d3b804059d5e189750a2632f9f1d76169fc9d22ef30c4d4a9d14ea79d3e4640e1f331b3c5bb04e2aa6a632496ad94416b53713596630f9b1151bb190083bd7663feae44af632153deec4710a3c31b2542339240d5b7eb9f1a50df14d7e409cf16315cc92378571151d922d33a831649e5ee44cc1acb76b3a8fd044d6de48"
+  },
+  {
+    "public": "b6e00962d5ba70386b6e4db7e3b04b21658e130c3de397fc76e68c253350f78698723bbd415a42f1781944e88a2b595c890c3d6e794d4be3204d3ef7fcb7aedba9b80966778c13dc9d5592bde3568e4fa255ce299782d84e868d55b6131b7d3078592e0c2b622891b6613ed42ab1e071a822bdfe05ed9e86558edeab6cb984f5",
+    "secret": "a1b3597224d08c097a41f765ab4e40719f07f0b88c70ba46032d807d6ab595699363c012e205a4457dba2f144ee209fb4ac8fc644a50b8de801b4f6c002d61b298723bbd415a42f1781944e88a2b595c890c3d6e794d4be3204d3ef7fcb7aedb8280110cdf20d1d585ec057d42449a3dc698b2509cfc962482605ba3cb5e29d7e9299d88a72616f147a2ce50e14b675ee669ce72ad674b62aeabaec8b0be625578592e0c2b622891b6613ed42ab1e071a822bdfe05ed9e86558edeab6cb984f5"
+  },
+  {
+    "public": "b1af2c942fcf301f3293536b871ae8c9bed4929e4760af9075ab6d527ef01988c7c2bc92b7584b6409ff21d998f1fc965cf9a205acc65da1a8528e3fc7341988467a7e70d4116ff838ab42567fe4fa83441878ed2322a07e9843a3c041e91e6946eb9d2983d9635f51cc20f45edcd16c0a25b3f361502bf32c22a28b367368a8",
+    "secret": "254ae3c8d16b1e946c3ae445c8b04d382686c93faa59aac1b01ea6ec15c737ebc56b894a7a8ea46458979ba3e51f6e5cef5027469f865a7e4f62222dd0835cffc7c2bc92b7584b6409ff21d998f1fc965cf9a205acc65da1a8528e3fc734198855d1eeff2cbf4671bcf8c33e27ca9a986a5fe816422010e2b492293a96d250f9a4bf9474cd65e40f2129cf6d10dc27d5734da9feb6a9dfcf520bfc81b817003946eb9d2983d9635f51cc20f45edcd16c0a25b3f361502bf32c22a28b367368a8"
+  },
+  {
+    "public": "c293b68ada2fc3bbe6c8a71509d16c0771b9c7d2fffd230f3e18557d54ae6b5c9f0301394a8bfd8519ae5ac6507b73f8f97511bf6d17bc202166ffb35e11363219c155eb80383b332b200e6cf062871fc52b7ffadd3ea383673fa491dfeceab7cf955eb2cc7aa87ac3ef79188b35a4c60e17b2fd70decd8e5b921205d4f330b1",
+    "secret": "412f414350e558e5318e9ad7e1815e4c9346e0b091a9b09fca02af4e7479af37448fb0ede6f2ab53bbcfd0de19873a595cbc1a71ee8da62c538a94ce469f7f389f0301394a8bfd8519ae5ac6507b73f8f97511bf6d17bc202166ffb35e1136328bd5371863eda121164ec72fd1bb05be2e087b99f3150d61020d18fda338d76dceb7cd7ee5d16605408e29f146b2f20fef4994f16c27b07491501ace8a590eadcf955eb2cc7aa87ac3ef79188b35a4c60e17b2fd70decd8e5b921205d4f330b1"
+  },
+  {
+    "public": "158d86b020175c4d18ea446b0d3ed7b7cc9f2cc52ae42617ddbde3396a46590094b4c016c04575ce79cd95957a1b0dcb46621c979d28a1f72cbd2f92d2b750002649dd3894976b3a9ac427a840e1b4a897ef7a0700d9794824642fa0977aebfc3b0c6642cf588710892a0fdea10d06c40674fd046582337fee0834f3f1a80803",
+    "secret": "55538897e04787f89aa1caa6141377a0eb426b3c02e768ee6b7169ab5aed9b02f2a9041accf9394bf04a3993abd43295e67083e6a00320348d9ee11af837c2df94b4c016c04575ce79cd95957a1b0dcb46621c979d28a1f72cbd2f92d2b750007a246aa20e7454252e4b8dfb24c1b055c7e002dc233e9be09d0c55d5a9843153afe76a00f2c490e707fb861dfb173f23ba263992fdfce2540624e44553e1e1663b0c6642cf588710892a0fdea10d06c40674fd046582337fee0834f3f1a80803"
+  },
+  {
+    "public": "24de95ac44d2a34cafb13c6ef9d0e33fe11116fe3466d913de9eebb03fd43ecf3a7c6d0f2dee09ee24fbb159a9f217a956a91a28e79e6f2e8004035567b5c124ffe2fa8a9eecff9e5049ab925e4afe093c336bcc8f0e177c3c4e3d57afdc3f7c793eea8fb123c8b5781bb518256a1f578a011efbb8ddebd1c6347de987d841c6",
+    "secret": "3e77fb389047eca793d0a6d880336f2a55a8f8a71fbe8b6c29201ab6df1fdb5766b5dd08ccd57970a72642d9ebd879b8dd43d0ce7bfeefe4a43415ccb31765853a7c6d0f2dee09ee24fbb159a9f217a956a91a28e79e6f2e8004035567b5c124eea910b4a55afac1efe3e73e9bbf77dc8fff9373808943048ca5c88edfd6bd3d33ed102f5e21a108ea9dd8732dde442fa5957b1ffd48e2603a2ce18f423d0eea793eea8fb123c8b5781bb518256a1f578a011efbb8ddebd1c6347de987d841c6"
+  },
+  {
+    "public": "0666d281f12c1a4afb7da3ee522a5e49f2e6eb1ed55f9e9a61187312bfecdc110f1c4e9df274c6030c9af4abda14c1d36eb14294b0226778b9f3aa4ffcc831b63932b05727464c4fe45267e0e78d895016096f0b9dd1280734b9e455e5c3b2be57c67c1af4c860b8b77cedc8db6a6039f04f18903f7adf973c0b8e307e856913",
+    "secret": "bd7b9d7d5845b3901c3b4c9d57942b90b4f905ad4ed3f54a4dc7b8dec2b4fdf77320a1f559bf1848825cde5e164132711fd5b125ffbd6e5dda91687069f3cc170f1c4e9df274c6030c9af4abda14c1d36eb14294b0226778b9f3aa4ffcc831b699b58fe5f70bddc802c6f44d726fd54b2553077db66def6be960986b5a0cff666989f56cfa6a6d63042bd6e0531d935197f27e404b5570da6c490e8229974c1f57c67c1af4c860b8b77cedc8db6a6039f04f18903f7adf973c0b8e307e856913"
+  },
+  {
+    "public": "d86e65ccc986c0f475c922754db46fc7ec7b58760823f4e63c22cfbaf9002d2cfd4ef60db732e67ff99b188a6ca2b5220811d0c23d35c115fd045c1e214a8af58d5d61176273f16ceba5cdf3764ca4d7330471c567de39974711a3476f3330fcdf7a660e0b67432a73ffb4ea78f9317b2e77856beb2e056cbfb980cd697dabbe",
+    "secret": "79d2f43fd620ecad06d932d8118066858db84849d9e1faea1c65d947a9b034e41d3a598013dd9657d25c767367ea344833d70bb2b580b11092427f7cd645ad30fd4ef60db732e67ff99b188a6ca2b5220811d0c23d35c115fd045c1e214a8af5a7191b4a061e82b407f76b266da6b31ee1b9a642f18301961f66182060b6585f1226e4c7b7773fad495a1af9fc6874df90dac3b4e354077f9205d3bb9af1fd95df7a660e0b67432a73ffb4ea78f9317b2e77856beb2e056cbfb980cd697dabbe"
+  },
+  {
+    "public": "ba7277f35a4c7409e7461787d62f883b03740630d80a79713664302cb552cb792494f6647236dc2deeb0083842f5d28b22b01a7098dbc19994c44fe357f35281183cb735c5c6d12f97a9b3b22c8561489e01ec9b771c69724242ad9c92dd0e24cadcca046d29ef02a4d631b6b28222b257bd66e9e359f48ac7020fb97b4bd54d",
+    "secret": "fa8d5eb550b98b3f65ec0986461d940b47f2fa754b3c2c011634f296f41e5b5c9fb059fb5f1e7ba4e6736370664e1ceff7d255578a74b56062a63ca4cb5abadb2494f6647236dc2deeb0083842f5d28b22b01a7098dbc19994c44fe357f352811014286fa6902b54ec0f2bfe55baf693b748bfb5b02af94c2b74714e06b7be821a71717bff87a22c06309a37128e90900dabe163a60a3dcdf6862fb4dfc60fd6cadcca046d29ef02a4d631b6b28222b257bd66e9e359f48ac7020fb97b4bd54d"
+  },
+  {
+    "public": "866d071ec0acbe310c4c1fd59c31b9c44f69eb560fd767a255db9473fcb957be97242d5afe8d28d96417c1dc8a3d5d5e758885898ad1da2f75e560f76faeda939b2a4f00cd3297aab220c698d69229f204a518d980dc735dc51c6fe77f1c34cc9b1fdb49b2efbd765abc4fbcca58084c7befb246f8a1d68f1459b5ad2a1c72e0",
+    "secret": "aa9c61e2fcfc940cea6cd0a023ac85909819b470aacd470933ca62b5ff9d755911d810e4b552d0a67e46b77f494730de10a603bb828e7940563c71e71bb516af97242d5afe8d28d96417c1dc8a3d5d5e758885898ad1da2f75e560f76faeda93b3438687bf005c897245d3775765d42859097ad2d0fbd2edc3bf0ec0213179737a8f111d6916fba461afe0737b9393e7f5dbb0d00fb095cdfa1ad2005e8afe899b1fdb49b2efbd765abc4fbcca58084c7befb246f8a1d68f1459b5ad2a1c72e0"
+  },
+  {
+    "public": "5218160989aa2aed99d8700deaff2b339bd686b85d37724690cfcc5a7599ca56b207b5b78d9183b58d90a7c437ae192c4f7bcaded7e659c59e7ec5eca6318ef9db5a222b8f9f18d4088f16939d075f15753c7ba535a5c6a6e8cdc2ba8a5d0086c4e592f4604ddf99671847d8a142d0da2bedddea4ecd1efc8748b8fbd5498eb8",
+    "secret": "ede46da46d926323e71afe621f364dc3de3c4474a6d37a3c1b2609598d1d2b375222b44ab1892b58ffbac56b87dda25009db8003a5b83b0fd2575181958539cdb207b5b78d9183b58d90a7c437ae192c4f7bcaded7e659c59e7ec5eca6318ef94ec934e4860386f4de0aafe90eb1d8eff866fc496160c9da04e1a4fdceeaad3e0a414534681bb54885bee88b0b5b123cfce7132a2b3836e2da1d889b923e2e08c4e592f4604ddf99671847d8a142d0da2bedddea4ecd1efc8748b8fbd5498eb8"
+  },
+  {
+    "public": "a1d92d15d27b48ca61cf4a46c9e29da8a4fc3e407cd2b29dcb7fc3b6579a27b0b90140a7ae9752da37e370ca5e74a1e1313bc02e88381d8d25cfdd6200348aa6202774c0ad9d6ccc24d837b860403a095760af35793776d3e13cf83a840107fcc52fe2965f1023a837dd11b5039fc79077206ce9b45f6b1f06077b9cc0626b4b",
+    "secret": "ddea85074163db2f261670b9cf2f4cc065b9c8b1938972cf4594cc90c404c483a855265e7734ad2c9c0bec30b14694a809dbf7a6a0eb6889b67cf6fbc6892bedb90140a7ae9752da37e370ca5e74a1e1313bc02e88381d8d25cfdd6200348aa6fe9e636776c8bcb0adfa9b32a26178c0f2ceda9dc0d545f6ad11a9b4644106deb79366609fb3aeaaf7cd7925f3b89826531871d2913c4c8ee7df5550b13c8426c52fe2965f1023a837dd11b5039fc79077206ce9b45f6b1f06077b9cc0626b4b"
+  },
+  {
+    "public": "d90e1350345b0a2f06b48dc3ad39251739fec6c07b586e2579521d05813e598337579b92246450e34a761ebe1f7430834da1cf08e07f1e5fae3119c9419d279d66e7f7679b143c32d56eb8a84c5b13f9dd7d3fd774de828d96529d4a5dd9b1ef1b906937f8e1b270fa6bcdd040eb50bcdaacb7563c39b9f2ec4305c1478548f0",
+    "secret": "46975cf424f3d8f5272106e93e0661f748e6f897ae9b0dafe8858c3bdb54f7a1a6d399591c383e2f653f0f9d464ae468acb7b2997b5a96f1575ddff6793cb3ad37579b92246450e34a761ebe1f7430834da1cf08e07f1e5fae3119c9419d279d8c6ecfaf70f622ba114171940e843cb15d1c0bbf7c08c1f430bb4e9390f6f97a64536245eb823628bce83b5f3e0a190fd79597b63a7dff73563f399d9e0fc7141b906937f8e1b270fa6bcdd040eb50bcdaacb7563c39b9f2ec4305c1478548f0"
+  },
+  {
+    "public": "4eb4253b8d8c97aea13bc12997859dd493dbdfb4894e9c3157f3aab93db18dd8c4990b43b9cf9e1334c65583fd870c6d15fa438f13dad998e7afa24fb47db4b24c24146bb074bdf854b48d2b55c4327a084106e5c87725015b0e3e1a6f0a33e65641da2b3f0c099900c996393a595e3ecc40dab88cc19c5f3bd6e6742e2da8f1",
+    "secret": "c2dc49c6180d9d395a6e86271a4611b128437ad4a75784bb3ce0eae34565082964a96588294700e54be69bb5bcc145a6472a1be0b5e1bf1979026d1b5d7997aec4990b43b9cf9e1334c65583fd870c6d15fa438f13dad998e7afa24fb47db4b2ec8231845cac71a31e1a3837b4fd157e5af40089f4f95e8e86ca214a0987ca833cf6293662fd6142f74e0d92e9509bfaa3c6c2b432b0bf0c8ef850e5f95476225641da2b3f0c099900c996393a595e3ecc40dab88cc19c5f3bd6e6742e2da8f1"
+  },
+  {
+    "public": "3b00a2ded480b70ee238665f392c92ee1daafd2ac1633ff025097f08a73ccb8491b9fb324b0f406a45cb126116787477699cd8a0e078a782659210b861cf7f0f94e363e417e1b9c1a82d318f98094558baa1fc06d71a39ae97ce0d5929a6c4a7040f982ff2858c1a2c223072869d0265b344a269ea2de266190ed70f6ef8ad34",
+    "secret": "29f11e611a1eb255f312b44b31b9120df917ff6c812588c9a1086e5605787427e73d3f3741f416fb7eeff5d587240e026b782793b7053ca3285665c75b3231b391b9fb324b0f406a45cb126116787477699cd8a0e078a782659210b861cf7f0ff6595f7cbed2c5cacbc0b5e1aab6c018accb8ec3eb0639b350cb5e9aeee2f31abe465815dfec8e19e5d1e9ea17cfa7a8f16073cbeccd6059b655113073c69f97040f982ff2858c1a2c223072869d0265b344a269ea2de266190ed70f6ef8ad34"
+  },
+  {
+    "public": "eedfb935c57febdd02cd14a8f4f7a0681e9cd6c3b6150e6ae3a3527caceb44537e6d390280e7ce8ae7509a40d2a630582264a57334b4a3ba0616fe89bf6aadf12b5a550315cb593f7e61536dbdca108a1147a32bb33d135b6f0331209793e1cec15d09dc363eb96cc3bd2bb602c3986edae8c3191ff16c894951b3a057531b04",
+    "secret": "50f8dfd1bede3dc5ec99a1ff0b5301884a95b94aeccd1f44e70aaa7d31a7afded6095c4de4450dd495c1584f092266dce6c4406b3054f66630ea256567ec5cef7e6d390280e7ce8ae7509a40d2a630582264a57334b4a3ba0616fe89bf6aadf1dc646922b472cb135e186365134bb308e537e5872617d4391c005e3c2dc3a704b2d6212eb203126c17c979dd90bdb607f1e4993430474a7c7463e39db43e9be5c15d09dc363eb96cc3bd2bb602c3986edae8c3191ff16c894951b3a057531b04"
+  },
+  {
+    "public": "5c7d602eaf67e4e4cfbd0eb897b55839d2461d9ddd9189c8e005f7a230ef785b593328c94c7b65337d5cd1938d3f634efa9338ac65c1840ed9f720891d99dacc1be8ddf8791ec06ed8c6fd575c987aab9a2cc1947abd3b9a9ded9f26aa429c4a77796ab122ac3e423aa052b9995ee87372745a2817430441e2bc928b9676d83a",
+    "secret": "0dab8436ea26e79985cd1ce56bdb049ec9c7f350786660f6ff60cd83d7ccfc1d4984d79bb5a39f401c5f1ccd5b0ce47af7545703d8914187ee134f90a52e7530593328c94c7b65337d5cd1938d3f634efa9338ac65c1840ed9f720891d99daccc84ef4b88725a5f5566910711674396773b441c6248bf9e0691003c15edb2c5c1782f8f05eef54c5f5e13bbbc901a6301211a580ffd87f87dfa51c2b3cab329277796ab122ac3e423aa052b9995ee87372745a2817430441e2bc928b9676d83a"
+  },
+  {
+    "public": "ac41bae4c375e8327fcdda1d809a5c073da455e45864490f1a103c8ce23abb73f2786e5b8ffcb789b88507b498ec6162f1620a7d73604b6ce721f50d1d2f28d489c7632f6f2a9f0563dc2a7a67355bce5916d7f537cbe323ed0b9938b312910a575989c7b3f7a23f68bb66cc40e256706ecc1ed70bb03dbb8b44ef76e4cb0888",
+    "secret": "03980ba58b11d0488b0cb9b533655ce986d0fa590cd52e05f3979ef1c0472a44c175907b44ef0ef3ad89ced4b8ab58f730ee8aff7aba89e63b7b3c3ec49c3803f2786e5b8ffcb789b88507b498ec6162f1620a7d73604b6ce721f50d1d2f28d4a1c0f0e405b915ad9cfb0d03f4185bf27058a014e2892c6a96d6ab36374757eddd0be8be48eed7e3719c19c4f41e38f84500a8d01fc805f2cc839758dee6e390575989c7b3f7a23f68bb66cc40e256706ecc1ed70bb03dbb8b44ef76e4cb0888"
+  },
+  {
+    "public": "ac021e54392992ea4e56f4d20829cb4664a64949423cbab20380bf5bc608f4f3cb26c8e9862d0bdab93d8d7e6af688de7fcc0ede486b15ebd35b3528d1959ca639e9c3a01a71c97e231fe141e39f705535c4de0d3a2a0970d878d5a75af8070c39a251a1abfb2a705e2d1b1baaebb83c0c852b4f58d3112d62d75ac043feddb0",
+    "secret": "afc84bf19cb727e52455ab6c0ef105879a804a0d54af2d7feb21bd9be64dc9c6d65665d9d50ac74b586cb61c0c0bc9ee3b1edb9195735cbc003aa61a6a2076d9cb26c8e9862d0bdab93d8d7e6af688de7fcc0ede486b15ebd35b3528d1959ca65e131375efb950852ff244f8965560fbc791604d4bff67ec975aeacce88a7cfaa76e00eab034870e305b2b374884fc21465f35bc45165a373d2a690009e340bb39a251a1abfb2a705e2d1b1baaebb83c0c852b4f58d3112d62d75ac043feddb0"
+  },
+  {
+    "public": "689fe1faa248603cf6efbd77dc402568a693854ed0c238c6fcb80d36a7d95926cd46a2bfb66b797d54e9107dd4f6b98e62bd9344131432cfacc0dc09b12a323f40a9e58a5f97ce9798d33c7d4656feb3e4f03eee408d5a2f6a9ae8d61e06c55c6ff339a40b5ae71b62ab67592a9235084ea9da49d2c539bd88974ff75087cb1d",
+    "secret": "1dd0c6e1a02e1b97adae859be6db8d8e71a593b312898c9aa8cc544be3d77ed33d141566b7866a45a8cc466212cbed2854cf63fc2cc27e0ea6eb5c2438e5d1f5cd46a2bfb66b797d54e9107dd4f6b98e62bd9344131432cfacc0dc09b12a323feff4b0f60ef6f094e8ffe297fe02444126f5dda097c3b9ea46d22959573b6e8bbcdc52793c1389b4d583ef3af99b3de8c58339d3cf1905a9dd425f0d84da4b256ff339a40b5ae71b62ab67592a9235084ea9da49d2c539bd88974ff75087cb1d"
+  },
+  {
+    "public": "c390d0e8448f9711bb4e46e56fe79d6a087ee99c48c8027587db24cc687b7672403eeb1df484690844ed416073365d7e8221816240389114f6dc2d96f952b680b642ec4ce39fd1ae66cfebb29f252b108ae2c2a5229ba17de510e1fffe518fcae9a74e6743e682d1d4493f320d3762819a8e05b5b735b5480f7493d3a2295c2b",
+    "secret": "b854031bff22fdd88d41bf71f96f13a6ba8bd1a2fcdf7d1691f93fe9798625a40fbb3cef3469a3faaf6ba663a5c46ad50071457275b15ad70c221c35ada7ee3f403eeb1df484690844ed416073365d7e8221816240389114f6dc2d96f952b680244d94cdd783892b797df11cadf046fdcedc9176b5bfcba452313c3de6574f43a90d10f570adc637436c19a002defa8f93e58ef85581d87e9bf39edfa3812998e9a74e6743e682d1d4493f320d3762819a8e05b5b735b5480f7493d3a2295c2b"
+  },
+  {
+    "public": "a8c02aae86c64437adc26f10924429b199766dacb31d5fe638a1214b869091fc2eba0702fc6b3a363683d8f1e381ef2ac90a98a2f77beb6a30e36298a0817aa5862740b7504804b10c4000a212060e31cce1e4ef9de0675237a1095fad07caa6ee95bd2eb746b08950bdbfdab4f9dd0d195a9298b27eab6352138a3be4d341a9",
+    "secret": "295b611c5da64d8699a5e25e7e6cd7342ff52dfd8e3ff1a4980991ff3cd8366b03f34ac6596fc7c798ff304ed0a35e16346671e639c4aa5e42a3faf7fc35d3352eba0702fc6b3a363683d8f1e381ef2ac90a98a2f77beb6a30e36298a0817aa542d90d8d55f916d136dfa16f0acb1a339b8027db4fcb2c37713a3eb01d7c0038791b9d7d1f74f4bf967a4963f88821b3c3b17744c85fa3f67964bd55a3fc79c2ee95bd2eb746b08950bdbfdab4f9dd0d195a9298b27eab6352138a3be4d341a9"
+  },
+  {
+    "public": "5632bc745828f215c3af2be27b6940dd29725ccf19a9c6cd493ba297d40a5d871369ae61be49afcc6f6accdf1eed7a04334035e60b92f1587f7dc7480750c628d2e180eb783344fb18a3f51d59f61e3e4ee51841ac8a61237366623df8eccb5148d65e4a8bf00e2eded2c3e77676f4226eddc318997b70699bcb429f63fd1a5a",
+    "secret": "4b85160e4b0620a208cad14f038e66484c9a7e9ec41c778322b10a03105b7b643c991388f4ba5025d6786e22bff0f38d1e54d5db8fd09cdb4e4dd63c540995d91369ae61be49afcc6f6accdf1eed7a04334035e60b92f1587f7dc7480750c628ee2c0fc1c8405f6b5873451e6402562e920627c2775352c17d64c3354dfb64a618e98119ba88b8355126644a3930e182da2b61b56030f031814f7721a560c69b48d65e4a8bf00e2eded2c3e77676f4226eddc318997b70699bcb429f63fd1a5a"
+  },
+  {
+    "public": "7af99b9ff8204b60da9f1dca49bdf0abf8fbebc8be5d45201caed89cb7e7b76a8bedd2d5c57c4c741af474ad08f6be3fb4edaa21ca83c6ffd32d155a7fa2d51be91334c41ede61e05adb35417dc1cb99e67a2e2e26cbff9bd253937ab85acb45791c5976320b8eb56f16e320f05983cb53f4786d67752688618686ae24d44ab3",
+    "secret": "95535e504470a9ccd4c9d89365b3a0a44a18443469f866471cce4a33120b8cab29c9185235f9a83eb27500c14976f49562d60db83144717506caec841435dc618bedd2d5c57c4c741af474ad08f6be3fb4edaa21ca83c6ffd32d155a7fa2d51bbc6270e93a415b5643a82cfb83e4d6f38d8fa6c1c679f9fe4365695b81972f86defa70142f42cd8510212d5b76f1b5feb78e60a3efd9cf5128401165ff5cca4e791c5976320b8eb56f16e320f05983cb53f4786d67752688618686ae24d44ab3"
+  },
+  {
+    "public": "03663448f00733caf973457e7b7ed2c0cc9fa7f4f9215b6ac2349c2b04d96a8f1645d1357a0457464a2e9bab1b039621f19e0d61162f5a37311ce62336c138b5f863e37a9a4a637d3017654fd7f38cdf08a6081efb2f9a37b47ed358c1fb3dbf86ab5e0ad10a3cdbda1c451505eb1aae6377667d9672c1c48f100500ef062aaa",
+    "secret": "ea8ef02294164fdd63b1cf00a6f4dd59600e37eb82d3c957c4b0548c9b8ae8416c5c690057287a6d736e3d5c970fded509f4c38f7e59ab8f56000b20fef703331645d1357a0457464a2e9bab1b039621f19e0d61162f5a37311ce62336c138b5cf0b8a6a6d2ad6037a577be9c9d18051603b790884b4284aff273b0a3168ef54065c36d435d8c81e8f081811031f40612f50156fbbfe335d1574ff34372e070b86ab5e0ad10a3cdbda1c451505eb1aae6377667d9672c1c48f100500ef062aaa"
+  },
+  {
+    "public": "3dca205f50d70342d4978b5e9bf59077d7892a321f014a158bd373eaa7a58a5174379d5dfaa87d08cdd86e5cf4d89654c661221282f5af8503943acb91e260adb91d018e4448f215570cf4c6b009e3ee3c2889a9fee6f3a978b01dd223814b0c5109aa2d7983a812dfab98882528ff5b3abc73007e4105646d8caf32bd95a0ce",
+    "secret": "3fa930511acb5583dc3fe3378493d8ca9b75d72f37be5f46a5db623dce77deb3075503318c6a2dfaf188e15afb42ccf7508d5d06ea6c81730b9014987ac3808a74379d5dfaa87d08cdd86e5cf4d89654c661221282f5af8503943acb91e260ad354bd9aa1fdbd179b27f6a8fd3284f75ff031a9aaecbfccc87ca8a2813a2ae2c401807f66a8d89e0854672d7f199a6600d2003bfa6a1bb76e4d481821a02cdfc5109aa2d7983a812dfab98882528ff5b3abc73007e4105646d8caf32bd95a0ce"
+  },
+  {
+    "public": "d8d9740016aa2c6878a2146ee564f8c0adb36b26e2d4244f485adb6cf33c48720d4c65889e9917e5698a0467378ee758ab48deed04592d7235fd720576fe0c96c02f905f295d74e453fc4d209a0ffea22c107016fafbea75d47e6830905bce20057a413d0076fee417c63cc1f03aa0ef19aededdf4107891f1825909d876b774",
+    "secret": "18c065f7383af9d4c306d431ac2551fef88fc6532cefc222c7039d6d0bc84c3d42898772aac2178eb9ade8a463be8923ffcd0647ff9365bf97588c8712c4f8c50d4c65889e9917e5698a0467378ee758ab48deed04592d7235fd720576fe0c964a1038027f279683e1f7a0b2545e3ef52a824358a358ccb88b4566c1d313594e82449e9b97f984f773425ad7761fc7f64586215ed8529f988bf2d34c0e68b9f5057a413d0076fee417c63cc1f03aa0ef19aededdf4107891f1825909d876b774"
+  },
+  {
+    "public": "772e564ba34feeecbd83ff64d57bd260e796bdad11329a8e9dd9810cd1338b3d0690b5a2f221a1b16198789dd320c17d30b6267662ae4fdfd7f21b7d1432137ec1dc33a624dbd86246289ebf0106d84b7302bec3483c70743288a633e34eba82d6b2ba85f6fc69246471f2dbc8b82b369d2c2bc69d02a25107fa4392b8f28b5e",
+    "secret": "6ee406166ca1935f818ac4ea674f02b17d0d8ca3e3537e4d9034a82395877aee1a9b574a98fd36318b05c700bcc21e9103733361e6a435c536a1221f3e141dbc0690b5a2f221a1b16198789dd320c17d30b6267662ae4fdfd7f21b7d1432137e720cae15ebb67d5afd6c84dbab3e6f4f7b59b8d05b058cab5ec98c29e917ed9104234a0394fde4928ffec1821c4153bd4b0b0ccf694d7602501c79c81d11f51bd6b2ba85f6fc69246471f2dbc8b82b369d2c2bc69d02a25107fa4392b8f28b5e"
+  },
+  {
+    "public": "81deb232ce18936dabf437ff70eb24210c28350d2fa33f76ddeb9ce3ac5713e4c3472083e03443226589c52e08c306e799d778c30afc1d89257885a7d1fbd14f7cb259d8fdde08de5ecc646e38ee112e338e6ecf44770acaa64c98f983dbf0315bb940d58862de6a3b123ca15f75e29849084bbdd7bd93eb5b7fcdb331320b22",
+    "secret": "e411e96755452322bec09af7e018349571110cabdb1e57e6671a54afecec029e46482fa99b846057650eb351a38f2a70f1de77bae5733f9a385d2d9d88ed9470c3472083e03443226589c52e08c306e799d778c30afc1d89257885a7d1fbd14f6ccc8cd5274afec58707dc4915ef7a8598561228a7f442ce93d82b503c12c6fb65163f854b737f3d9a78d5f37a772e0489aa2b71c2e8573dc67cf7f05eb6bf605bb940d58862de6a3b123ca15f75e29849084bbdd7bd93eb5b7fcdb331320b22"
+  },
+  {
+    "public": "3100ee6e3f8d1c90b17a8f1c4a191c715b1c01482db07ab7e333b3e3133232b91bda3e0b52f20c4ea1e1365da491477621b828edaeff6faec2d36214811f60b89e0eb4800448bbcc0fd893c24467306b0c118505f0c575dded9e83e2ab767490f922a6b41463eee4c47c954522a91e596eea9796034ee7ea415ddb7ac69d4101",
+    "secret": "37d921bafcdef6bde76b9502edeb73d41bb3fd2f769d01e2f795e612d39992f4bd6ba6dc8c460745cc6d63c8a68aef25b884924b65192408324a12dc7042a89b1bda3e0b52f20c4ea1e1365da491477621b828edaeff6faec2d36214811f60b854d91952e2d5454f300043e342cec867ac3f174189f54dc6d09d6176abb0bd629823afa9269a01f14251d57f3f1b435ec7109cfc06cf4561f0f9415e7c83516ef922a6b41463eee4c47c954522a91e596eea9796034ee7ea415ddb7ac69d4101"
+  },
+  {
+    "public": "2e74d33290f2a41794440acb2fdec99efb979d2bc5450a0b5aef5c3c420eae1ebd2a0ed46e8ded86dc6a6147d0e5772f3c75f5d51bc8eaabf018016b3111708d613eec9acdb0019713fd42c4dbcb306c51fa5649666c24175032d97a7b2a79e92b7e62f6caddb030a879ee4a2f6acf2c918281e6115a316955a17b714c41f9d1",
+    "secret": "9a5a09f211e0717b16d526a9b582fa3012c8a8a497fe2fb400730260cbfc2facfca84f74f6948bc0f1bebb15bcc393b48bff3440dbf05a318d8e83e8e2feeb1fbd2a0ed46e8ded86dc6a6147d0e5772f3c75f5d51bc8eaabf018016b3111708dbe82830bd9195e916d44c53caae4b902d742bb7d4bf3e36710fc0d2fe7718a284738a7ee814da206a8f921915740405af3c9b078c5660b69e66493a9c9c1796a2b7e62f6caddb030a879ee4a2f6acf2c918281e6115a316955a17b714c41f9d1"
+  },
+  {
+    "public": "c8bcdc238e55c3493e74226f30c1043c6deadaf3365f021d95a815bcfd61a0ea5e18b64c0d4cede341a5d7b30262c12af5eb7cfdb77209f69f7fc21e2ea7dc1ae4e093be606a797c38703d38567f48c799227acb4cb6a83acf4e654260c476beb5529bf1dba4d28bf5b950e87312ad3196a0f337f46b0d13623bb9dae9f0cd51",
+    "secret": "70f4e8ef06a208a6fae5b4db55e7d9b68077fda51547a287012a7bd5f0ba3c64e26c0441186445f25367e936f5ab244ff0aa8c5c67eb21031778d22ceb9e4ecb5e18b64c0d4cede341a5d7b30262c12af5eb7cfdb77209f69f7fc21e2ea7dc1a1a36607b5e1e852085e5e8d0b3cc081b9f02312f2bef123e168d64edbc74bf49ef1835d619d41d9a77f36d90443bf56864caadd822e5f31ecc0b797681512a96b5529bf1dba4d28bf5b950e87312ad3196a0f337f46b0d13623bb9dae9f0cd51"
+  },
+  {
+    "public": "db2871ea7cda1013a17c8177c34153b8cac258eea8d9fcd10c32b899d59c3a151c5719ed8ad8f4bbbbafe59c56e2ba1451ff411f9587f3895f787a0c4138b76c4bd62bfdfbea930bad00d08f31941e1b3371e7116f68c5f106ede4d733b017ae2e8dbdf316ef10f5db1217c0a6b9c1eccab988993eaa09792e0639450f25d6d2",
+    "secret": "eb2af3b702172eb1bbd36b04c7088893a2d6a4160fc8bb566176651085b70e9cf2a1b79c305855b456be9d349a154c09d77696fadc2fc67d3b3cd0de37ae703a1c5719ed8ad8f4bbbbafe59c56e2ba1451ff411f9587f3895f787a0c4138b76cf83f028d14edc8f5132f1ef7b66086f5a4011a51e3aa5e17cf0c1adc732ed84b4bf498e9a0e421695942a57186f72688ce75d052bb3d463f85f565eecc8788f62e8dbdf316ef10f5db1217c0a6b9c1eccab988993eaa09792e0639450f25d6d2"
+  },
+  {
+    "public": "530749156685451eb96fec2d0c5ba4f09a81b850c29478b2e6b32ab4cf88033954d015040c0fbdc497cf3cd735cf2591cb6d4dd246db27038fd4e584d0e0bd2bdcad8055067cf4b1512df0013a8eb05f5251cbacaa42779d84c3eb5e64834ea726a56e30dc6a1bc83009c1567ef284a23e712944180a4ebac601715d8c660007",
+    "secret": "ed50a17b0cc991c15adbb1a431bbee539cbcfc9cc3e22339c49040abf6e0c0107c8d9e9a3795c3554a93bfe5a6a94b54673c6a90780a9e8159bf49dddc2092d554d015040c0fbdc497cf3cd735cf2591cb6d4dd246db27038fd4e584d0e0bd2be4f39b5a95a3509c48ea98595c1d26f34fda97f7db321352fafdfeb6923d041d8508c4274083b052ba474b04f32aa2f1dd9522137bee56a4fe13dc844c692fee26a56e30dc6a1bc83009c1567ef284a23e712944180a4ebac601715d8c660007"
+  },
+  {
+    "public": "733a7c1586e4adc62bf61d1ea5de89953d7c4cc0213436650f8249f1a83abc293b25fc947622c9660779ea7963be30b74fb83927b906c5a6c7122cc32337f3ba625e6457f45dbf801f54c7a9cd75c5717570cb9684c2c50f30be1003e161ea02428b8c42949774647bca891c0fa21e0e87b3c20e6b7a46879163898007c3fa98",
+    "secret": "25da02923c0cc89e52af956be7b4d5a0a26d366faa1e1e5d5e9556c3f0ff9da3fc073b3132a6b8fd118848855e0ebbdb57f9d4ee397bafddbe195c6bf3e640953b25fc947622c9660779ea7963be30b74fb83927b906c5a6c7122cc32337f3ba4f5a789cb0908811f2a84b38fe84165fa7b1bff81d9b3ddabd74cc56fc75f0c426c8824aca24742706f2341407aa6430eac6563b23de7dcfe512fef9a467f086428b8c42949774647bca891c0fa21e0e87b3c20e6b7a46879163898007c3fa98"
+  },
+  {
+    "public": "8d93ec3077e59d8d43ab30a1fa78aba5881208c1e587a9b4ecb85b7981f2b2bc0d949642160a3de3f895f54f0862321cbcf43ef9cbea43d2325544fe88610de0aae261113ac66dda9c25a2e03f300d61d5d8ea342bf2ebc1f3fc1183f6bcdd3edd01da03a6b15fe84c0fe561e0605ead872537586788065432bfa571de6cdc08",
+    "secret": "326f135802b25ccddf7a2f2c93010a17125416d871fa7883f342f4e0ee2616bfec0fc2d2e3f0772b0be07aee7748b8700b41ec5382d9859122ffa6ad662f30e10d949642160a3de3f895f54f0862321cbcf43ef9cbea43d2325544fe88610de085402078d727f2a15af5a586e3db106e6e2ad68b23cc11f7abfbac26e8c6fcbd218601ec0e6246fd7658832d229fe5a47961e5eabd0df1614616c1d26c913eefdd01da03a6b15fe84c0fe561e0605ead872537586788065432bfa571de6cdc08"
+  },
+  {
+    "public": "ee4df3787b320a9dda7dc8ae2146b0034efee34b13f3a8700702cba003dca5ff614bb1dc778f74fbca93ae9b0157f9ee46047060cdd8a06cdc4281c9850e183b8a37754bcd266ea93d536f1b28170dd069f34ab6bdad751ed37c44d06df2b3bae7213d56c58a46c0c7f51afa0819e0e73d22e579ebda25063aeb07e31cb7e3de",
+    "secret": "2c3e1d8917ad96c2c4b6e06ad86465fbc48dc4fb593ea54cf1d1db1098d97f71f708c4a071dc3a17f8734eb6fc3f481900742999b7815472ae52170d101daf37614bb1dc778f74fbca93ae9b0157f9ee46047060cdd8a06cdc4281c9850e183b1d92360873514ec19af0864beeed00d89902283b91262cf4eba4c3e69c3c9549dd4537f40c4997d2df1eb102b29682f641d59951ee6d04676fb619c099f170d7e7213d56c58a46c0c7f51afa0819e0e73d22e579ebda25063aeb07e31cb7e3de"
+  },
+  {
+    "public": "01d08a3c540989e4c94539410a03e8efd3367791e7a393ef117d5009328c0bd4fbe4b07e0c1c131bf8de235bc88a64d9f25db28aafc085c9f918f6543491ce4addace85c2342e4b6e8e0928adc03710cec7ffaaa450cf7f1d79ec91cbba3273a554dd9cbba75e3459e1193b322d6f63346d8ffe9fca66a6d44e4f019f26fb574",
+    "secret": "8c1444649940aecbd3adffe0c0bfd0764f1e11bbd22a3651f1e6a621d23a55242b0279dcb57a6876da5d95c1a7a6ded9845f6990667c5edd5a53843aed19a040fbe4b07e0c1c131bf8de235bc88a64d9f25db28aafc085c9f918f6543491ce4a6f195ce93b6e1c4bb70f37c0a704db245eea33071bf303d0b48edce281d7ca39b08bab40bc96574e63f350f61d65e598278617e6031623828490647605cc4c87554dd9cbba75e3459e1193b322d6f63346d8ffe9fca66a6d44e4f019f26fb574"
+  },
+  {
+    "public": "ddd0de4c7c30b009cab97ecd90d56bade3d21b1970ce1dae7f9a1db5e1ea6cf8c7f504dbae81c455363773ce626e36b3f59a0c9d6f5835b40ce492fc982f1ad09b770cd7561199c020b50f0c7544b20089cdf52f6e6dbe45ed95d0246b94f2699a1f17307e52e40800a75f0e107f6a1af601b010eddaa5a02a8abfa00aeb6b3f",
+    "secret": "b02ae94039a6a1acf431390e6e6395e0ce714635157e22b8b1ab6fe988cea32daa39966dbc850cb8436df9d8d65220641cd6cd9632cf64a5d93f380ce7a67cfdc7f504dbae81c455363773ce626e36b3f59a0c9d6f5835b40ce492fc982f1ad0000ab0a9fb84057f520ce54c2aa36176d7da311a748dc91b40beee3d2ddd3c889668da675bd9690000fe510ea5ca12328680b3bdc62fb37050548c7298a6b9ff9a1f17307e52e40800a75f0e107f6a1af601b010eddaa5a02a8abfa00aeb6b3f"
+  },
+  {
+    "public": "29c3c883788bfb8ea56e38cac294ad68281717340e7fe956050d73647ceca648eaf39c9bfd6508a6e22aa025bae02787ab981225ed89808aa1b09660f846d8d51d360d0bc1a6ddf78e280a39918cc79e0a937f6ef9e34b73b95b9fab361a8f3e915cede7da914dc01f53aa008e113e6bb35dc7cb272b4535826a5c0788c7bdd3",
+    "secret": "9a78ba72c19f0c2336b5ebd4a4d0a04689d9552c97823e28994f42d5db2fbfc0feba94ac96b9eb84aeb630da6612f0dd91c19dd6c284464e850f431d34904dbbeaf39c9bfd6508a6e22aa025bae02787ab981225ed89808aa1b09660f846d8d5cc0711583626c9d4a0296724b19952e43c384314ad4fd5a29ee2a9c541865daa726dc805e629bf9b088a9097a264f35bfb9fd78c3c797cfdfddbb37dd6dc42aa915cede7da914dc01f53aa008e113e6bb35dc7cb272b4535826a5c0788c7bdd3"
+  },
+  {
+    "public": "234388568f7aa4fb725d2cccf614beefcdc2a1d9204b3013c15a1428dba9f650be2e3ac9031f83e1683a9d82c4178ba9b4fe2bb3b514378b202dc84221a4a520ed3349c973e3f296e6bfb4c26d738a0eae83c28f76f5a1c3aec5024177cc64d570a5ce94da1f224c45fd9c507ba4d2dde590048524ae58ac9862294fb16d891e",
+    "secret": "9f52a62899ad10fc9342fb461caad2f1a903e3bc9cabd86e3a631ceb1235877658e0d6709109d91f6a0beffd242ecdaf576f0c9ba277a4e0f5dfbe62ea09d570be2e3ac9031f83e1683a9d82c4178ba9b4fe2bb3b514378b202dc84221a4a52070caebb50e9ea622a7a12a8fbddde3ee9ddf7bdea513c243bea607143490e62220be1eab53c84af207033dadb909ecd980b94f3aa4db17062baf1c7f2c03a69f70a5ce94da1f224c45fd9c507ba4d2dde590048524ae58ac9862294fb16d891e"
+  },
+  {
+    "public": "40b586d249c1df60b2995487952113dc1d8dfa68e9655cfbe44e9f8c03b9dfcdb8118ee78ff45a16149fb7bb414938a714fcf5a45b3255adac9ed9f4503f84efa864a66351ddc6fe8cdf4d7031676692538c888aa7610ba1aca6bff251c01e9035e25e74cbee195bb9ccf3d07916a9ce58d7d628f4a5495c5b8cb23f0ec61e74",
+    "secret": "0514b072f26251813e3d7c2e4c2e288e5e898d28a3b8455989f82d1b534395eb444e96bbd13f30c4f750b61f13768e2921175bfa4793f3108e4532081ac7bb94b8118ee78ff45a16149fb7bb414938a714fcf5a45b3255adac9ed9f4503f84ef656775047bc3ffa3dfeddfcc4c5d1bc323903c5f1b3e32a7c23d05d391ab48dd428faf7bad5b4fb740a015184d3d10ee00167ca5fbe4226d46eb25c5dc9567fd35e25e74cbee195bb9ccf3d07916a9ce58d7d628f4a5495c5b8cb23f0ec61e74"
+  },
+  {
+    "public": "d607b455a451340171630b64c5ff365647e25e317006baa56432de775b481544d8b564a28e9066be2406b8af1f7a650fa22a82982b6df4eeb50c061311ccd12c43c69561b78055798c05ea2fd7339fd8c4ded1f4734639ab73ac0b7bdf47e96bb37b94f425e2347b78c8216a51954c1b322a888bb41653b468a77318c59204c9",
+    "secret": "84e5a67e55722f33bfa44cac24164458b569b548e2abc1a619d9e0e8fb058ca3b109dd19305bcb552291072a1cf2ecbd2bc9c1ba7fe31fb2970e8a0b73f8eff2d8b564a28e9066be2406b8af1f7a650fa22a82982b6df4eeb50c061311ccd12c94d1a5333139c9361ebfc52cfabb6b951da9f0d21d0dfb6fe08351ab696cec8221c5dde9169bf65ad8fe4408bd7e5e55156db3595f923fc9968652da0b2432d2b37b94f425e2347b78c8216a51954c1b322a888bb41653b468a77318c59204c9"
+  },
+  {
+    "public": "15037c3c0bdc81a00d37300c1a726126a8fac4e2e5a5555a4368b141a5b2fbb3e416887f336ce513ed54493165ae970660b69a23e88efa1a780c9532e6f00a8c625548dce1343225effcc970d8d5ec8c9b9eca0f64f7bbc4c81ea519677c1f9619440463116c03a02ea292bcfbd1f840e4f7cf85b16a5b60b300910af2156798",
+    "secret": "2030830f044a8f95ffb20710846e42f2257fd56f9cbbecb2e1eff90f0c825e0f138748bb3637c0468a73d2e284a67ed379c063a9266d1a84d971bfc58615ec9fe416887f336ce513ed54493165ae970660b69a23e88efa1a780c9532e6f00a8c29a9532cdb41b40e7d6e3ecd297aa860d4d704e17dbb1b2433591617da5890e960f624a779a68fe589b047d9ee57d33004fea3e1e85303e0f05e613d042d215019440463116c03a02ea292bcfbd1f840e4f7cf85b16a5b60b300910af2156798"
+  },
+  {
+    "public": "6d732c36c902cb88ab88ca4494940726927a9969b758906297d2c34a692d4a236cc47c8f1fc31fdb80366466c9952faa8625448b4b977caf8dec23ab9aa37d2c00dcb4b133a7dc63253f9179829d78c535659f9608fe32835bea73f1350c0f13ab993b9ee8b4aef994022ff757146cc2369494d875d3841960695ec376b7f53d",
+    "secret": "6d37472e610271f3f4f868b4a003365c59c418a388abf6b9a826a977286afe05c04587c4c202b2efaeca30480c3ad8651b28da4f1338e5c952f2ada2b947bc8a6cc47c8f1fc31fdb80366466c9952faa8625448b4b977caf8dec23ab9aa37d2ca951ee31b5410303f6fb5e54163cb8c84bbf7a520f964c62be0f69c365ec4dd55d2d7517a8c3e8c1aa8c5a13003d408fd5fb02026cd2061a4d8cd0a261be52cfab993b9ee8b4aef994022ff757146cc2369494d875d3841960695ec376b7f53d"
+  },
+  {
+    "public": "a6c60936994b99aeffa2f6b9fe2c861a97fb4cae4ef37d228398ddd2f6ccbfaf776c7c6c10aea53ffe296d2ac39020a9eeb475ce3b9a606f85d8c3452d2c05f9cf49ab5c6962ff3d87e70da9d3fabc26707f5c6cdecedfad40b9b82ef4b76b6f9aaba6c9528695bd1a35c57fa2461302b1977e156d105e71019c4e9960e1d695",
+    "secret": "7103c2fbcff239507fb1279462115a129d316f54a911a21086add81fad0f1166f113bf9166d6ad4ed82d75d7fc95cb0540bd3af924490c27c0905b950ae6fc3e776c7c6c10aea53ffe296d2ac39020a9eeb475ce3b9a606f85d8c3452d2c05f9dc8f6971b0d61018115af79b7debb102d8085098e82787e2b458d3e7031227d9ba50ccaebdf570af1e02cf9c975a5f6413956c37eed0a91f35d5b535698e727b9aaba6c9528695bd1a35c57fa2461302b1977e156d105e71019c4e9960e1d695"
+  },
+  {
+    "public": "4b9a1e3dbc7f1925d22718abe7df938170fee19d329ba2a4c8a5908e889a6b31f21abb4a66cf641a50cb8d392c592c0dab615e2cdbf23a96386328041b70952c45476e00faf35186a14a0090dcae8ceb2b159909c417fa1aa32e3238c0661b8be8ee4fbc67da060586e8dfbb98b6025f07188efb26a5df6c02224a63b2762cd1",
+    "secret": "10835ce5fefa599fd1b359d8702912a3ca5364636df837e3bb24ce95ab7b8b77824c0f7b0a3225ce9f9c1330b2a817869337753c68a18e4477d19848e320179ff21abb4a66cf641a50cb8d392c592c0dab615e2cdbf23a96386328041b70952ccfe5d98cb09e489d862d2b33a2c97cfd806b8eb0da3385e6302121fdbe3f6cd8b209c22c02b6c72e966d23f0a47a6e5962f9413a260456da9718460a6b74a9a8e8ee4fbc67da060586e8dfbb98b6025f07188efb26a5df6c02224a63b2762cd1"
+  },
+  {
+    "public": "f9e3b2418d0d1917c490fbbd6bb68d1648b4a266ce6831a750fc2a4c509f4cc76c1339e3b7a23aacca2bab3514a667502041257475644c6920709e0370aebea39b0463131dd951fe4f3ad88bcef8762361fe565c03f89ce1030fc466e87bfd768df48e6b4c3c1a86a41fe2c6220f60f3764e058fde6e23c2f5be73150f7d5b47",
+    "secret": "25506056ed57a3b7c1e02f11f7e413f5d817e8f7b175d6bf7a18eb78b8bb54634934e67796b8330a19ce852abf62694b72b176d8365b3e686cd510a67581189b6c1339e3b7a23aacca2bab3514a667502041257475644c6920709e0370aebea3c4a4e93fac17b806399b07c998d1a8a585ed743f3063b3d36493659057978777ac1f1163d341cb7eba89fb85d63be56474e2d25e526a5a338faa4777496d3df88df48e6b4c3c1a86a41fe2c6220f60f3764e058fde6e23c2f5be73150f7d5b47"
+  },
+  {
+    "public": "6767393f05582ebf1658d1f62ed5afdd305ecc3d6b2fc5ab422e097d295485fdc44ea600084e5048b36f63d7fe2ed08168de7b78625dcc82aed56cf64a38c3c43e12c4da29cec2ec605f39677d44bf9b314f353d99356705878ed56d8f2340b4212e8e42795f50530289eff2a1949f5280fde1d1070c72f18e78f0fb3e7f31b6",
+    "secret": "49cc6945814706065932cac02b7eb32789f5a24be1378c3ff2a11873c082258e39f10fc87bb667e717db3cd95a5b1569fe1ce7c5700e0e1278bfdb8537304257c44ea600084e5048b36f63d7fe2ed08168de7b78625dcc82aed56cf64a38c3c479f4cb06c644ca8bf0a100e1c03159ea49554e350a15278296997e07184a717f0e6a973367d165d143b3d6f812412f201e64a1759ed77dc236ad6e0f94fefa3e212e8e42795f50530289eff2a1949f5280fde1d1070c72f18e78f0fb3e7f31b6"
+  },
+  {
+    "public": "01908de39a359b159b4575e653374883d745c91d75d3c0f62971039e3dba2967d0d1dd42276791fd55bbbbcedc8ad49bd2443234b9c75f96d00bfcfdbcff93b26c81fed2ffca715055801b40a026592504243797bd713354e041ae4990f2982479bb3bcb9b9b43b57734be15047c32f81b8e303535198842e6148ab405305b34",
+    "secret": "dd5ae49966cbf663ff97a68c96522357655cf2a0da79ed62d2a8078374d77e4fb09d1c0ff58e685562cd3b5f299e315a37752ae3d32d81a97963d23e99e41152d0d1dd42276791fd55bbbbcedc8ad49bd2443234b9c75f96d00bfcfdbcff93b297e23d43b5f15d5ccf8102f72d9266d84aedaf8dbf8c58f273ff028b16d85c185683511865f435be95ca5cbb38311bfa14023601e5c843555d53f052c075e9bc79bb3bcb9b9b43b57734be15047c32f81b8e303535198842e6148ab405305b34"
+  },
+  {
+    "public": "ccc4f1c0d066c9accf5881e40207bf166b810491a2a8ec146d993910b4769d1739b63a5ef03d06f7d4eb1d5b871db315f3eeb644edd71d711c8d233205eec2dc2f174462b7aa11e95e69f40d137443c2ea2f72583264f8cc42aacad7d02d9f5f0bcde1c6fad0913cd2fcec235564c210198e4965d67cab47704c7576f5cdb03b",
+    "secret": "81594e6139f7ed070ff978f6753dd01d8389df1b0697847bbac586a00fdfd36c4cdac14153e4b07abf9dd429580eea0aea6fe6f68c70d1853e68dbaa4591a95439b63a5ef03d06f7d4eb1d5b871db315f3eeb644edd71d711c8d233205eec2dc71d7b6ee4d875293c498957a8c80a2f8c982dec6604d7df7359462bf2ce4212921d82a66298bb34f6ae62b652d393ffc8f079df77aef3ae9ae6813d547e68c4c0bcde1c6fad0913cd2fcec235564c210198e4965d67cab47704c7576f5cdb03b"
+  },
+  {
+    "public": "ec89612c418f6edaa4d801e4569b57dcc2843d4259eb32a644882f301008c2392640430ff8a06ec50209ec8fec4ff33871dbbe0b165322140d3b2eb590b9fe0bef4432b5e81a1eb6ed4e67b75c122bff15235de7d234a38ed236e57641354cf8e7c390f86dfb3018c3e6e02bd62d7fee1511d6259aeb94bf1f60a274ab961641",
+    "secret": "4fac16a216da346f194b460803e8689e0aad395bed371eda5657c06191574a02ca01ec7761b018e050821fb8435b40f14f22fb3050fa004fb438504bef38428c2640430ff8a06ec50209ec8fec4ff33871dbbe0b165322140d3b2eb590b9fe0bbea9ab59246f551462267080ee6009ea23a1a51984ec9c04076379a1cff067bf522b77f1e3b2a4d49fa3659b874cf0c5827ad48d58050fa9611c6902a1faaf09e7c390f86dfb3018c3e6e02bd62d7fee1511d6259aeb94bf1f60a274ab961641"
+  },
+  {
+    "public": "c11c8c1cc3f35532d54abc2eeace474439c2ef2bb2d1ab6e618cc07677d0d86c68c39c2ed3088d170b147b2b78da4a7d5887bde82ba9879aa0880f62c1c2babaa562ab1931afec70354ad6937b124dbd3cc4c481ff7e33963a6979b1bc661e8a8e9bb1a14d5873e62ffeff12ac707c4382f24c5ff1fa5093ef52b14931647d9b",
+    "secret": "3139c5fade80c9abcaa1acb3394d66f32c82c5954f0247f6c8157f3bfa23ceb8f9f2e885f15192ac2b440653d87ecbe77a2fcd8fc073d8ee39613d3603fb519568c39c2ed3088d170b147b2b78da4a7d5887bde82ba9879aa0880f62c1c2baba70415ff4b879a415e113711299222c39ad13ff08ad645fa9d6e8b82223b85f35484fce1d45f53e8c7afeca8473eb6c26492c1a429bfc55843431d608d7b45e098e9bb1a14d5873e62ffeff12ac707c4382f24c5ff1fa5093ef52b14931647d9b"
+  },
+  {
+    "public": "cb352a4fa70a34b20d74baedc2992acf544cf0a28ff6568ab1cfce059882ef5d0a2cb70e979b6352e2ed49bca1b35f3520d5863ba4492b03695c06f128c505e9713367bf4f21c5f6a44e7f2ffc54d8f762996decaf3394d1a2c8fde4f518a35cbdcda42d21c450a99a4cb48ce2cec393b8ed9659163eea422b234d970f64b92b",
+    "secret": "e44941dcde099d77add9f5e930befaf05d8b3bae725eb9f5f1619eca89c7522077a10a2aa6e6b5aec86159a66a7b3764a1da9f537247ba7e311808bb218d39fa0a2cb70e979b6352e2ed49bca1b35f3520d5863ba4492b03695c06f128c505e9aa6dd2af996e52a843551e3ed5dd362629095e7267f4aa732c3940b0c1a120d7d6eab5d9e1a717356ad713dc910e374d720f5860e32d489b31c3acd9fe23fedfbdcda42d21c450a99a4cb48ce2cec393b8ed9659163eea422b234d970f64b92b"
+  },
+  {
+    "public": "3bf821e1efed92012981a6169a6ddf261409e3e5fa02249d8fd561874b9cac340e1d6a724ecf3ba308daf832c70a33c0c2603b8b91d4fdbd68aa136a94996e9bdd1ba231f9d2283de3c437c3f15434ad2083aaeef90dde62df2dc3ee73e7a0da4c6338b3957fbf0c54b9086c83a0ea569b51e881ee6ea48407ef2b1f3f474d28",
+    "secret": "91009fa5fd299facf0f20169363b06fadc5f70dfceafa6a8756f8149133a0b8d088deb978cf5627aed766b8666c383ce7eb9b2d49dec01eb077040c87faa22f50e1d6a724ecf3ba308daf832c70a33c0c2603b8b91d4fdbd68aa136a94996e9ba3b94075ba8fcaf642d6bcdbd306fa6a6e5775251150e53991e66a6ad8e693cebd0f730d180ca786ce61abd5f681482a05981d91f44b79a9ce2766425894c0384c6338b3957fbf0c54b9086c83a0ea569b51e881ee6ea48407ef2b1f3f474d28"
+  },
+  {
+    "public": "7b64d1b02e889ad3747f5b2a463895537ceb181fdac1b10a2dac27823069f771a4427863487845a205f6d1f2dd787a91d0513d1d2d3fdd433588c588775a4deb2620e896ffc00f207abb025ca4635a00bc7019d47eaff218c2f1302030e7ba3b4f9bfe5e514df3f7d68f3fc48c53b985400377cb9e11fb0573a1de16e10a1965",
+    "secret": "d2c7c4ad12564807663b8dea25dd6034e6aedb8a6d5de8e208dc1402bef67c83902431d3c4f5534e256ba384b9246447e815667ddc4a468c437934edee16305ba4427863487845a205f6d1f2dd787a91d0513d1d2d3fdd433588c588775a4debaaa73978c074ca6bb410099006169a96f8c74aeaf8bafc90925056beac476b58a9f10f45fa2fed3c5df9091f9d8e2bbe11b3d2051a9c1d36486ff6b50003e7bc4f9bfe5e514df3f7d68f3fc48c53b985400377cb9e11fb0573a1de16e10a1965"
+  },
+  {
+    "public": "96125c2f05ef4723f8212fee4db9f5ceffecfe0b849010bb3fdb28d37c463ecf2e99e8dfaa2877e852e7149dd3ffbeb5b0df2701e605c54bf301949dadf4c6b115333ba0fd7be07785bee33415fa18c1254b605e08431f237a784c48d20f0e48f4309388c9ed8848b61393ceef2277e4f8fbb821e144b0e7941231f860ae4916",
+    "secret": "529e50a43538d728ac5f28dccc6df9a550cb30b5fbbc208a1c27157867759270bb45ee3b425be1140b85c14d4a0355bbe9ac14af97424e8368ec94b686319c952e99e8dfaa2877e852e7149dd3ffbeb5b0df2701e605c54bf301949dadf4c6b174424fef8159d1ee276d670ed7d20952017df234b387055bb67fd453a9d427f6721c4918d56d78512a97292f4e782e25a5d798751b8603dfb4ea8f9d713350cef4309388c9ed8848b61393ceef2277e4f8fbb821e144b0e7941231f860ae4916"
+  },
+  {
+    "public": "ce16073d7ac4a6ed0afcb9f1364025127fc0726380e0e4198bbd2f6c155cea06c6aed7a8f5bcea9d57f2c46476367a5546fcd734da0a1ebc4283a532c16cc66859e34264c4f52aa3cff2c62b491a596f1bd057c5cba3281a7c5b59b4e54fbca990944bf49ef7836b204661a819ed9ecb2dc23fe8bb7c5047360d1bc8aa9a1ec2",
+    "secret": "f17c82bf5caf5aedc07e7a65f30c83febac7ed07f377029f0527c043a825d58c83167b209965869f3e0d25f8d94ce0fd7a4ecc5c32fedf8f4e6cf33bdc05bcadc6aed7a8f5bcea9d57f2c46476367a5546fcd734da0a1ebc4283a532c16cc668af90534095c07415cf9161aba91674db564e4bf2e94f63f0c7a67809aefc26c243705a798beea33715f42d04329ab87e34393e421c2cbb4c105bcd352d8c1d9f90944bf49ef7836b204661a819ed9ecb2dc23fe8bb7c5047360d1bc8aa9a1ec2"
+  },
+  {
+    "public": "508aba367d54e4ee349124147e5d9e5d14dd4bd366dfe4794a2620f14ca1ed7bb4cceb77db09778c8ed6b3ac98d9f65faf9989fc24dd984e02e431a84b24b5d6c70efdea56a2805c10fa28295c7cdd4da788d8256399c2f4a948c1499be76639bd635423b29d11a9095d98fc2d7ca006f21000a19b7bca238600e357dc2227ed",
+    "secret": "c113e2e9533a93b340a173708d9710243f37f9d01c3e639968c67a3f724cafa1d6e9d9977d5a1f0a0e0eb789c5aa82850f89379f90a1f5f98311f403f72db96fb4cceb77db09778c8ed6b3ac98d9f65faf9989fc24dd984e02e431a84b24b5d6dc69270780d0b2b2c9283adb882faf2ca6b6c7bfb3118a8cdf9cd9f4b519ca80b1a981c9df49099e33d53c397a4f023b4b503ec4f64dc09693b7e4072113a085bd635423b29d11a9095d98fc2d7ca006f21000a19b7bca238600e357dc2227ed"
+  },
+  {
+    "public": "cbe002f4039dc4368a455d60d83104fae2a6f831e19c02ab27fc48362e509d6a917dff6b9cf6e72349122d69036611f128ec80174535addc1587f2ac390b1f081603dd9f9af9d5c68fe6a3f8a450cb67ec2b136dee924dd060c46968e1c1bbf41454f6a5c4f7a15b54e3765a6b29f6edfcd443bbae89aa4f2a56cffccefd10c1",
+    "secret": "0f47f9fa65489c5e1c9a12f589543492c0af427b9c040c6f1b5788c056f94281bda1871ebd611583c6ecad41ae48ecc097c843b443e11157cc33784065cf7f52917dff6b9cf6e72349122d69036611f128ec80174535addc1587f2ac390b1f0877c4a31d9e4f9ce918ca7059d51762306ac11f79d575dc0df96259d7aa8094b0675453cecce792ad2dfd6c59f13c706742efff5ea3345203b2aad766d99a05aa1454f6a5c4f7a15b54e3765a6b29f6edfcd443bbae89aa4f2a56cffccefd10c1"
+  },
+  {
+    "public": "9af74aa260c926fe4e64ea6b21e54b77acfd145f6d08cb6205d253a88b7a92abbf09e87204e9b85db153f8c852df3edc75688031486745409080790a1e745e5280117a05e14aea6929c818009d0424ad98f6cceddaf28b1f2c87a32335925cc0f83211f60cc5e20a385451114158c85b21f3ddb3f8820859ad0f855f3b5527ce",
+    "secret": "a78aee9fdddbcb6f8567bc6701bd3353291c04cc7ffb7f090ae2049bb7401e0fcf4691a3a89e1bb72e5ac3209b8443820b031798842a76b4462023ff2386bcc7bf09e87204e9b85db153f8c852df3edc75688031486745409080790a1e745e521d6376b5ea43c15ab8aafc2b8291e83c4385e4752d0d2367ee6f52771b6e579ef60b03ae1b6b610c9b7cf73d1263642eb9007f3f7a3e69cf93a125e676f12683f83211f60cc5e20a385451114158c85b21f3ddb3f8820859ad0f855f3b5527ce"
+  },
+  {
+    "public": "b26c366df13e4125e2ca28ec5337ea398b41ef41daf7a23fd62af2d8ed036c4be2347f6c85dd25c8da6fdae9ce8b79fbee768214aa01582b9fcf6be9f0266a88b7709b49a4112c93f7aee5f48a7f2efbee784c68cb69290bcde9742c490e20b2af0b06fd7c88d61a9262ae5f126d792fa24f5ce07f4f2ff456d7097dc0e2ae64",
+    "secret": "8b49ce333c447774ab6c3d90815f9ee33049355e414a11f1d545a88bdb50a61f5aecb037c602817031af6c93fd56263fbfa5cd95904739de1f34706fd64c39a1e2347f6c85dd25c8da6fdae9ce8b79fbee768214aa01582b9fcf6be9f0266a88aa9588899252ff19d7c87bcd5c4c21b92b7377988846372c6b644dc49cda5abc21151e523bebb190c11882fe4f8fdd42ed7f1816a297c65046e6f4e53808fd5aaf0b06fd7c88d61a9262ae5f126d792fa24f5ce07f4f2ff456d7097dc0e2ae64"
+  },
+  {
+    "public": "60b96da99f2840abc8b89efe8403a4c876692e69cd515b55704227d6cc915b2c95c7e6e5a6d25962bc4bda37d75fd9b38bd9d25916413e4c547dc835b22d6515cf17da290c3ef7c18d3f80b0d4b8bc8042d08c9d3b9cfeb3cc22f0cbf15c24704e70dfc213f2e9e6b25c37477bdd6fbbdb0005a919954c5d4820c371f16ce6a3",
+    "secret": "5367436c96a551b1a7783fec2fb827efeca5a0f4df5d2bcaea8588fb5a95bcee948f4c7eda213cfbbfa7d5f99970b4cfb888cc66fe9aabc6d0da7fec44bd710d95c7e6e5a6d25962bc4bda37d75fd9b38bd9d25916413e4c547dc835b22d65153ed606082756825911b958433d7ec8e2f8eeebb69ab31c48463f7a1694630f1746e524cc1afea035ca4888d0e03bc8151ce7fbc7edcc2ceaff2470bc96eb1f574e70dfc213f2e9e6b25c37477bdd6fbbdb0005a919954c5d4820c371f16ce6a3"
+  },
+  {
+    "public": "6dc7322af1c4eb6d3e37385489bd25d1e6b2bcca579cf4934266914180ecce76a1cc9f79ea1f8002b84016bd3aa1955d42c61946a285e29d78cdfaf6af604ebc50fc0fd702b87a125dbbff1f0989e48a3738c4b0416207c252cadc045622c79ea061bb14982df1a019410a7c86d57b565402b1a7e3db6deeaeb2ac4e68c2c366",
+    "secret": "d3c15914c567f23d9e7a95228b2f607ea10554801ce6fb34b88207c9843b1aa7c7f30625e18e7f3c5f7e05c1b57553d717d913dec095a59d8de4d2de7d63729ea1cc9f79ea1f8002b84016bd3aa1955d42c61946a285e29d78cdfaf6af604ebc53e0d0d65df8f33eebe6d4afe7bd06d9ca924c851a66092e70ede37869891473ff066c37f703307e7ae89a1647b31baa9b2cb731ac80b43275fc85e024cde820a061bb14982df1a019410a7c86d57b565402b1a7e3db6deeaeb2ac4e68c2c366"
+  },
+  {
+    "public": "2672571541fc25ea0d19164dfcca02dc0ea222f0d3f9cd3e8d82945ba69b05936f58934d4e36331fb5c1b5a5aa222cc9bd51071ac806818d0f4b9bab5f09a536f14ada7f1c9c862189e974f0fbce9c6e3bbcdfcebb07a50fc0d2ecf84a24c4f17666f9be20707189a7bfc7a633c9c436b3bb7b5588e0e48d98869e1f10cd74dc",
+    "secret": "0a1f48b7b7c1a77e6e8db967015f44a2fa87f199c34b3fe2877143c5550f132a06a777afddd7242d7a9f0086d6b00360ec444b46a7b0be3961d61c990f1f60036f58934d4e36331fb5c1b5a5aa222cc9bd51071ac806818d0f4b9bab5f09a5361f7d52a3586d4350c9e554153e508785b37878561b0df4b3d8e61f01aa0392e99485527520cd2de305544eba2ffdabab1140896669517626a91f2011b315eae17666f9be20707189a7bfc7a633c9c436b3bb7b5588e0e48d98869e1f10cd74dc"
+  },
+  {
+    "public": "655159235fe3eb2887e954623f5adc8d5ad1ed46f056fd13cff56f40c57f432e9507768a4c2c787064ccc360a71fa22423c878528cf5756ce15481bef1dad3f766376ee9dcda054366a53ee7d36ca3f90ded86b0b2908c74496e047b9a508248745330a92881229da73790c97d20e3f759140a4e096d9a59ff6b5e02b7f8be8d",
+    "secret": "258e00cc21e2bab35ea5f8eb26f098fda043e2403676a88efea6048b5e29b53368f9c462aa4fee5d160cd4d9a0263876504e94c59159e067c1921d687d9afe789507768a4c2c787064ccc360a71fa22423c878528cf5756ce15481bef1dad3f728a309d5daa6daad872aef8b482355066cc48df16e992e23553a64ec5b4933eade7c2ccf6b09fbbaf7a6f0a2f3955f3fc2208128ab0ec644fcf1a8d2bae1ec0c745330a92881229da73790c97d20e3f759140a4e096d9a59ff6b5e02b7f8be8d"
+  },
+  {
+    "public": "cb539dc95eb142e52539458c1b8efcbe150d06a928b82a28ec7e608dc9d04a130860442b34bfb92e1e6800c27575efae27c5c5ce1f92c04095221da2639b09959d3b8a2615307d3031ae9a24655f45f3248fbde2b29205042b71f8dbed422df063bfa31cfb692191a984ffeccaff788e148014b47bd0e3b429f0fdeaf30926c3",
+    "secret": "972510a06103ebfa2a55ae74f5ed5a6d33412c805f4f44cf5f125290ed20cf76a60d7789cf64ba0d057b0a4a7a56fe5c5f65edfaf89776955a1307cfc8bc83560860442b34bfb92e1e6800c27575efae27c5c5ce1f92c04095221da2639b09956cefffa2fcd59a38f4ea199e672700b744196740aa580e4e9cd916a17c6809dfc6ebac0da26153e860c85d85cfca54f16c61418a7cd3e079af75517d1b75f3f263bfa31cfb692191a984ffeccaff788e148014b47bd0e3b429f0fdeaf30926c3"
+  },
+  {
+    "public": "66fd0678dbad2ece70528d6e0d622e9998eeca6a33e62559a60dfca30594bbd74130a0dec10ac36f797b16da91b1b10694ffe71574b5bf456c820e54fe1fed441ce67f48e2e911015f5051bb28fc39be46b77d512f1e868544d017974655ef30881ff7d04b0a045281082f27d71ba53cd76481f876736f164c05d14fda0b0162",
+    "secret": "3823d393a7b0a7766f5c85d0155de27c4455b4b1bc2d60bbaf7b268105c9f842a25377015f39fbac90d2d6ca6d04ac1399e02eb290861db77d4230f6c5dc8a5b4130a0dec10ac36f797b16da91b1b10694ffe71574b5bf456c820e54fe1fed4496a8130c29e337cc8c705e635967b7f1b7c348f5f0336965310f3206913e58da24c59c203ec0909ab0ebe0b08d68482cfce8be03276ef26ddde8b2a68554efd0881ff7d04b0a045281082f27d71ba53cd76481f876736f164c05d14fda0b0162"
+  },
+  {
+    "public": "c1b4e35c7e991fde90340b5b4fa86d0d9c9ad23a4c8c7f1bd5f92a3ec588384abe15d77345143401d0578926c2892ee2f68316aa4483c6d6e0a102c78c36fee53639299e21fbeafef5393a42769adf99d0fbfa167bba4d29afc7baa0d2bb17486bfac701f9d96fc970a5c702cba2cd46ce0d0aaec5045a5a4cf14c63344383d8",
+    "secret": "179ba138d7dcf7534706ba69741269462412972d94a6f08ba4afc3ca1e1d6455a4df588d476e316d888aacfdaff5f2f26d45f0f311d884ad2da26d4f1bf9ba03be15d77345143401d0578926c2892ee2f68316aa4483c6d6e0a102c78c36fee59db9b66dd2e2d6427730d8588ef9258e4f44f41b926b53670347f88ad749d00525a7724ce52960b85a4d8211191c069aec0189df5a86652d6ffae3d4868831e56bfac701f9d96fc970a5c702cba2cd46ce0d0aaec5045a5a4cf14c63344383d8"
+  },
+  {
+    "public": "1aa73dabd2feb815a0e678e68aec37bb8b1a8603b8161265747459783a833c8bbcc17c9a8b647b2468c5e7eb232fb651fe7eb3ed2f6fa71d9fc233487f219020da577acc36cd444d8f266912c7f9df5837ad45d2d54d5a29b177f476e0c07eddbcf0dc973b1872236c94d15626886f0b7bc9797bbb60026c2fb4aa534b8dad18",
+    "secret": "bb627ace8666b513bd2da2ec6d07395441e0ca8a5e33c91d5bb2a756fd486f48c36ccfea28f82175f6da0146ce7a2a44156bcb36f9a4ddaa88fba24ea7a8a6cabcc17c9a8b647b2468c5e7eb232fb651fe7eb3ed2f6fa71d9fc233487f21902016e1d69e89f7aa5dd6ce5558b3823a69fe42ae591378c58563b39040968cb19038197fa9bdfac675966e83b2da3896a802bdc76eceafe4659b0269d2e8a42525bcf0dc973b1872236c94d15626886f0b7bc9797bbb60026c2fb4aa534b8dad18"
+  },
+  {
+    "public": "11de017f8745c05d7a276a2445b7afdca4560cb320af32f01cf2bef061344d2644994850555f570622b98fbe7d2192e0f0c3e6624dcaf20ecc7a6e96c4cd1d2ebe78b61e669521927998a493aa255a2371734a96fe103b0ecfceeaf3cf9d0f82070859fc95d6d201fb0661271bd9ada74ebec6b3d2f8b1b094f1dd2aae9df883",
+    "secret": "c25b2855d9badeb75d64d52ebafacb655f8bcd4b0a3697f31c63132ae9e7d247d514731349f0abfdd67903cfe3f495fea0e736b0579452314e91d9c6964ca0fd44994850555f570622b98fbe7d2192e0f0c3e6624dcaf20ecc7a6e96c4cd1d2e11c10da143edfee0732b4713d14c7cf0481b61b299831dc9bb7ad5cde7fb3c54449a975611cb9000ef3a35cd8ffe5ec409f481258824f42ce02db8c751ebc423070859fc95d6d201fb0661271bd9ada74ebec6b3d2f8b1b094f1dd2aae9df883"
+  },
+  {
+    "public": "9cd80a661f99443ddb9c122d41807eadc5f456512089771e3dc33480f9de48584768e1555668a76c99062b48be4086eec27c4c052b29f4fa2a72c2e0a71ca22def9de288a03d064b19260a6f20d36826cc7be04136bedd3298295d8de58e0f9d8aeba458c7ff27e99a44fa95e5e58a6cde08821dbf486b774e1f8a3dff38ae67",
+    "secret": "c172ab7605a2b3ed4e2116417287abcde331e3d5ab2b8b821393120550998a5a8e8188f7cfd0e1ad4857a32c7e1054c863a305cdb457068ec18d0e53b56978054768e1555668a76c99062b48be4086eec27c4c052b29f4fa2a72c2e0a71ca22d39f07b4a68aa860555c0a64c9ff72025b7ade7880afac8b0473ae3540c840d612b99c9fd20919708a699af3c0cedae6e3fd6644cb74ef60a0fa7b1e2bb96ff8a8aeba458c7ff27e99a44fa95e5e58a6cde08821dbf486b774e1f8a3dff38ae67"
+  },
+  {
+    "public": "c03f33d738c4d3f3497a746ea23c0e5ee4c4a38f223f272a4253751b6c442de0c7598abb94efd9b4fdb1e435a420a2c00e981b27a9f02c72b23cd58cbc6d0160ee0b7b0993ef5d67b17fbe06140a302724edf31ca1e65b2c01f6e94298ec40321c998b9eec3df8d3135104f30951ebcfd5cbc160df8e027fa4838949d1aaf86b",
+    "secret": "1d3aa726d7d188ccd0fb8b2b5bd0a36cf3c94730d6dc564d558964f57428e46cecd1c56df1cb9afe38c3ef9ee706f6c858228659ff2e1f20bb2d34a241b1fee4c7598abb94efd9b4fdb1e435a420a2c00e981b27a9f02c72b23cd58cbc6d0160a5ba1726b024bb5f2029b159af991413b5e611cf8bcc26974fd7269ec23c297c18423e8fb85fea88c33368b5778a68b2921f5f34ade065cc15f6d71539e3848b1c998b9eec3df8d3135104f30951ebcfd5cbc160df8e027fa4838949d1aaf86b"
+  },
+  {
+    "public": "47b1b2d1f324a3692b59ffd80665f4412007a7eb16753e9cef4fe8b7fb9c2255e13eeeb931931e195f6b5a6faf4a7e0aea1568dd45e202b535e744511bad0dc9e1a6a14b88e7e64b5000fae1bdf6034449ce265138158b92c0942034486b4d186f327bc2be9c6a721e29d6a50167c780d6795dcd2661e477a43aa2737337b354",
+    "secret": "e7a0d702697813da450cc88e062eef0e96ecaa2fe199e040d57ffec4c2bd7128ad721b446021cd1aca303ef93e2401a09949d235d7e1c5f1e66db9ee770d614ae13eeeb931931e195f6b5a6faf4a7e0aea1568dd45e202b535e744511bad0dc97d30ed9951d0d6c788bd7c989e76260ae94e6c289e1bc5eb2a58954454c388573e837795050c81475385a3f23361c7a87fcf2a72646581c267c1f051b4559e696f327bc2be9c6a721e29d6a50167c780d6795dcd2661e477a43aa2737337b354"
+  },
+  {
+    "public": "d34ff5f1238a53ee310397b8ab80a192b6ac435f4079400ee6d2b469eba71c8070355fb9948101fd90c7e1c9ea105ad02397f346250f147df33bd3b5345d34c097341cf6f5078f0fe59ddb9e8cd411f1ee22a2b3276b7e0e4e302d89aec7e500dfae3fe1a389f1391249f4a2b4823420dacf9ebe39bd488837ea178aa56d31e1",
+    "secret": "9069374f07060734b73a77f74b9f3f1cd192d9f471719d9f76f1686f92714173f65d811311cf4df6044eea09bf09c8328058825f704f387a2ac7c6f88cbbc74d70355fb9948101fd90c7e1c9ea105ad02397f346250f147df33bd3b5345d34c0e7114418494bc8ad45988890fba81325962e1b65d1011fbb433e78e08db8ea04e6001aa2af2a997add566d5169e4bbb83982937856b2eb9d2dcdc94e9b99f4fadfae3fe1a389f1391249f4a2b4823420dacf9ebe39bd488837ea178aa56d31e1"
+  },
+  {
+    "public": "a3d1ab90193e04596293147efdd1478d10e4ca8f4650f41429535192d509fb6b387fcd869b341b28cb9b1f97b5d30e0ea8cf24a2971149825f96817e9c895b7d0acd92dedeb68ccb08450db8eb0fa1c7d15baeba0499949df80ea91aafead8a4ed779345d1782a0e1461aaa56c1ad87f61ebf8f24235f90e9764450eadc0db14",
+    "secret": "f520a6c8afa6d50357419ca38d7e4092731e2d97b7a01dd3872f655c76fea4621fe5b4c00ed9c59b756804e3c2bea1df22767ee13ab95753a3cd2f00751dcc99387fcd869b341b28cb9b1f97b5d30e0ea8cf24a2971149825f96817e9c895b7d1397025abc4e13f8e4fa7bf0008890acaa0d2db4e048fa79ab477526fc41ee41da3ee95140e6059564980e0bff4b3c1593b29b7da2d3d4650e8d2242470fe34fed779345d1782a0e1461aaa56c1ad87f61ebf8f24235f90e9764450eadc0db14"
+  },
+  {
+    "public": "93381b7bac8a92f92dca741188588b72288c401732b5b7a3b6d77e66fced4e84c977cb574c3ad5f91368908543b2251eafc844cf749ff783a7e0aa10998b1aeced5529227b8aa0d6d03fc66d69b92260530b853c93a65a8e030323478c63501d97969edd74a9d575fba8126c57e83fd621f2996a98c9c59ebb91d410190faff0",
+    "secret": "d019285df5c970a7c884ab6d89591ce7d7a147c5b8b4cc3dc0748229df72bdaf71490bdf2e1d56fe4521973cf2750fddbfe57ba5be318fe4173c3b8b0a3d1dd8c977cb574c3ad5f91368908543b2251eafc844cf749ff783a7e0aa10998b1aecc0436b94a436b9083dd69987df961a63458686c2d098e9dcc7f2531417e7a9db4da844053d37f9068de34e42f0c02cccd44e213ef341d60411bc443622f085d797969edd74a9d575fba8126c57e83fd621f2996a98c9c59ebb91d410190faff0"
+  },
+  {
+    "public": "7deb84597a999b5bc4d7aaa0ecab0e12c719434b0d671ca0130bba08eba8eadfa994f8cabeded792985a70249489f302387211220773f83a872741f3a97403d1dbbefd6085ca364b7e4bbd9d4ffad7ac4f380ed33f9582690a88bef8eb97452bd0d92d7d76eee8dee547bffd48b150fb6a427bcc50f5ebef2bcf1889caf0b28a",
+    "secret": "d12a3a2793ac87624a8ddfea19f633cf69e870238f75485ee869cc67bfc4b6fda4331221dc7ff4c4c441791a7c620f72a494b7e351869f1176e15c91967ed4ada994f8cabeded792985a70249489f302387211220773f83a872741f3a97403d1071bca257e279fe3a6bcbe27dff21dfda7e12f5a9188ffb11ed3ffab36e9745d46cae2ac64a59a60fb08d69f5241c742f964a76c4e6ba18ddc9af8ff365190b2d0d92d7d76eee8dee547bffd48b150fb6a427bcc50f5ebef2bcf1889caf0b28a"
+  },
+  {
+    "public": "61ae50fe84772c9b359b4f99e94c74715398506f545465323f306e93fbb0c5189654c1c3d24a33183c816fc394c7f935a1a259daed862cf01fabb56ee0a2f3bbdc05c54a5f3d0f3f115bea1c614a1c1cdd5fba111c726d6c367655ead4b76f43d8b42ca7b3e5d3a8465700a6171db890f7d3e9d98c6d16ef6b14178af307906c",
+    "secret": "6b88f8aa2b753f31b2caba39e18d0bf16deea7230f986c19bec7247d8a0efc100e8a1c96ae7602f1966500f65c7c7de3f2af8ea7c16372065d2d6b9b1fe1ba0a9654c1c3d24a33183c816fc394c7f935a1a259daed862cf01fabb56ee0a2f3bb0da7fa9c10fd447eb2ebaad7437cca74d39bf2492dbf2f6f52fe669fc743386f52b2992b45bd82f23f5d29f171f88c7f5d006ba5eab1ea77a573104085fd14b4d8b42ca7b3e5d3a8465700a6171db890f7d3e9d98c6d16ef6b14178af307906c"
+  },
+  {
+    "public": "e8cca6d919f09f4336b650a8fb26331239585cd4161857cae8815a1cb20989045f1893e88d4b586334b005872978f49f34c5152628def49a51e29655a9f59563d8251ea85392829cdc94a601b90d678181ab2788a862c9032a61fc7d588d89a1e52e8fcb7eefafdf5b407d2012e791818fb97caac6fc9f1aac90ad8b50776197",
+    "secret": "3b9e96eeee7749e9659b5d516854e49afaf0a0f2140a15d284c2f91d5dbf6801389d51275afd42501699221916c3c8daa085b71c3296851c694a8ba6430273f15f1893e88d4b586334b005872978f49f34c5152628def49a51e29655a9f59563a0025a9ddb4635b3f5ec5160a0bc3f2d6c370dd0a33cd4daf558285fcc27371d63686d9c879a8e606d4fb5c6af072014c785b60c35bd1b89cf45881dfe841823e52e8fcb7eefafdf5b407d2012e791818fb97caac6fc9f1aac90ad8b50776197"
+  },
+  {
+    "public": "8ccd36d72306599e5d6f2deeb848d9ca7e3c9089ca39c18d0643802762d17cecb1676c777508cdcf12e4fbff6db9785a815611e3bc2a8147483f1fcea75b5cbb15c3b84e065dd6a2deb197a4106f1c338127e24738987b7d56d5a0349479195d48a54662c84ebea106abced1e7889fc84c37c14beb249e0948864eea7d386d23",
+    "secret": "f6d92a04b138eb58e62739c04666b4f420dcac9f76c7adcbd055bf55363654512ef4a7664726a599151b8666176a18e894836d7668b35c7dd2341b56e5d72c2fb1676c777508cdcf12e4fbff6db9785a815611e3bc2a8147483f1fcea75b5cbb670871650435ef84b590a84b433a499888d12cba0e293f563b0ef3c1cf969bb85d3efe70f32b220aef6a0908dca2f1ba82fb138ef757cfb0233f761e7e86450a48a54662c84ebea106abced1e7889fc84c37c14beb249e0948864eea7d386d23"
+  },
+  {
+    "public": "40e1224caaa28af1b4591833cc8f0e7901f87e30e48aeb2552fea657e12e7a713c9b0beda7793e1291405eda80f4dac38d5caf16437aef01e90f132a510a0d20715160cb1b0804cf1dad74e33f6b7eb65d936a9cb0204f2ad5b0212537c920ac86378527982fc3352752b881b1c91f455f2398e1d027a9a7fd405727501f1e4c",
+    "secret": "d7a03f9a4d0cbf422129395a8c16136905865ede63c54da8a55946295fa5c79a3729a66c3b8897308303d97bee43bbedf33f034237af51a184cfdc0b6a5fa49e3c9b0beda7793e1291405eda80f4dac38d5caf16437aef01e90f132a510a0d20f08fc8ddb56ce63df075f33ecf52943af5c7cf28e19e4202af4cbc0607bdc21573783a94f04cbcd2b39ee5f4a31d81b6a825576eca857d17d278c711acd07c1886378527982fc3352752b881b1c91f455f2398e1d027a9a7fd405727501f1e4c"
+  },
+  {
+    "public": "614ea5c7de11d93fe95f2de38956794267f95ffca1cba7f86c7b1a05a16201a873e2f75d5b62fbca481e59ba1250fdf3fd681e1d7712fd6a18fc094c3389f7bad54aa40cc6269567f3d60421995f6e03952d678293dd0e4b17b30a3666ff5169a1b68f25de7027afbbb89c94ccf045ae6c029de77ae74e1aadbd63cd4a9985a4",
+    "secret": "41b85c6fa2adea8c91f87af1fa9ad04e8324d2a30128fce358681cc5d14cb66bece0841186b63512f4f1b1c6e8dd711b8002be7c21d06176bcb930f35c67905e73e2f75d5b62fbca481e59ba1250fdf3fd681e1d7712fd6a18fc094c3389f7ba905afaba266f9cf82e106440b3ffc3a761c1af7ef6bebc43cf51909a3490b8a2b8aab0b5ace5d6dc152348a8b12a8ec5ae27b3a0a95f58e41520d7a4203f26e1a1b68f25de7027afbbb89c94ccf045ae6c029de77ae74e1aadbd63cd4a9985a4"
+  },
+  {
+    "public": "4098b8c2ee9eb7ec3a726c47da9801bbfae0de82a5f1f47aad07fe2bd59927519dd65a1eaba4641a71895adc6fdde4779e89cbb868ed01774d3bee122d8c30960a8373db58645990ee4a1b6faff8deb1437d269bfb020f1b5c28550552fd47ca02e3d63ff10bae0e95e43b67fc69778906c0dddd0d677338ea9cd47b7fcde988",
+    "secret": "40ef887c1ffe6c5ab45f41156199aa89dabb750b2792eed2c14e348e26ea43a17745db7707d9e64ed67fc175dd58b860a8c746e6afdf9595a9357416816f70ee9dd65a1eaba4641a71895adc6fdde4779e89cbb868ed01774d3bee122d8c309654a4a64e3dce937c66e156c679fb6811c6979ad7caaff1e13b276ac70f4435bb96d83acdf5b10f5c41c5c57e0ade73b5855308c473c6a33fa3cf510eb3cae80f02e3d63ff10bae0e95e43b67fc69778906c0dddd0d677338ea9cd47b7fcde988"
+  },
+  {
+    "public": "72c0e54afd72cdfa394d1bf6d5dc8c8df907babf12ae63ae71d4348a54e5638f0c712d244cbe9ba919282572b123848c3805e0e82b6737e28948b5c4715ad1046b976c3e43d029630fc933e813e5b7b0ed83644f1327d6cfe36686f7e3714d560c0fcedb8bab4ea026ff58e1f859ca7a5ac7987ef4bb89aff4b3a95461c4bad3",
+    "secret": "30b142c5b3f16371bf67b5c1b59df1de8a694dff6fcc467e1b949c0d790cbef0301698b0ef1877655b9970cd42a14a73a680cb0678549caca133bd827d638f040c712d244cbe9ba919282572b123848c3805e0e82b6737e28948b5c4715ad104a0034d12c031eb8ed452fea296eb92e7ccd74a0ce086badd450d5c7367ac2db0a7a0e827ecf21010d0f2718e0ff99c8614c6902eb7900235f3cd10208cb2ae360c0fcedb8bab4ea026ff58e1f859ca7a5ac7987ef4bb89aff4b3a95461c4bad3"
+  },
+  {
+    "public": "84ce6ae628faacbc3b72c0e02f4acaffac504ca276a2fc37e161c35542d9ed43b1650c54441d0fec04b01b4ea6926f39b314d3b2113f80bc133c13dcdab2e6fd25648ae567b6548a3cc4f951f68f2797dd8b36841cba9d8d697d35e904945569719aa790cc8c1b232bc3a69fdd6fb6eeda9f115b0749d29df7163d1ddd9212a8",
+    "secret": "02bf5dd48eb47e2a70485936126eb32e8d71afc989f00b49dddda2960cb2105403fd2cea5ea6270e0da89626448d838706de30aa66213dc80d8bf086e0f478ecb1650c54441d0fec04b01b4ea6926f39b314d3b2113f80bc133c13dcdab2e6fd7743f0d2a5d5341df4e8f801b84833b1bb559a49b71943dd1d207708fb0ee3e25137f0be4594b1a613e834b854239cc38c22bcc6114119b2c838d9ae5e49b789719aa790cc8c1b232bc3a69fdd6fb6eeda9f115b0749d29df7163d1ddd9212a8"
+  },
+  {
+    "public": "68721dd942a4bc040f91778ca80f88c38587e20ea664782a2a34f8983c904c30a96902f9540caffa148ba21193d766d97bdae1a84e4a815526ae108d9e4818898419f85a76ab7bf2a3a8350e0fb8333488a581a1cc0e7c89bcda29d988a962a32204bebe6847b043f50a17a89d243decb55a64f734e16bd0f8f734ce5ae0926c",
+    "secret": "22f01dff45904cd6e1a341ea3c4c3b03c381675d943aec783baf06fdd8c4c384bd783f1d41216c2972ef82864e69c0a28017ce790ce0daaa1368bbb920dfb972a96902f9540caffa148ba21193d766d97bdae1a84e4a815526ae108d9e481889d0cb4297be81f4316d3d5853c9cebd5ae294d0b1c1121593532e48b7b56e54d93a7bd7c11941215d6ee8a88d11f9312cc83a262b0d5f4c25189b1a63e8f680bf2204bebe6847b043f50a17a89d243decb55a64f734e16bd0f8f734ce5ae0926c"
+  },
+  {
+    "public": "8114aa30bc4ffbe4db8015130df9649edfbadb291e443b8856c4fdc7f38c7c12a237a8c68c7266bbd929f3fc4fd705b75a0d00f9dd7812486a176d6f4163160022531d82f0799be1a12f1e98e141d816743615030fd56624cc01d033015ab10e375236f60f34475ca7845dd2930314ee126692b3706223b203252a5e10c0fe0d",
+    "secret": "b98b4924ef7ebcbd5d51bff93b75baeb5c8f2738d47455c80f2d22b88f2df5926fd2611173acbaf50da524ac44ba378de319871ada4bd3f7152af5b617dc68fea237a8c68c7266bbd929f3fc4fd705b75a0d00f9dd7812486a176d6f4163160072b738abbe7cc16b0a6fe83ada31f0712db548002ce517ce318d2a040e44d7d4ea7777372475c676d6b3ee599d12f537ee2c674b6e62fbe26f20330057a85cfb375236f60f34475ca7845dd2930314ee126692b3706223b203252a5e10c0fe0d"
+  },
+  {
+    "public": "94191a2d171c2d9d995cf6b4f09c2f300182339b693a68ad1cc0f049fa6b07bf0fddc4cd0fb710c4a1894234b865d8747fed168a294e511be639f1abd8c4eec94ff15a5f417929b8d20789ee81f7ffe5c86527cb19e74160a1ef4a24c7ee429565d242f281ebb5bb3ab85cc0387affb2ad461c4c75a8802b03b403c0dcb41d6c",
+    "secret": "c6798625e908d8933958b013820791b559ea6d71e2f1d192f7ecb1293e2a9385c86102a34f55151ec805d5bdc27f2010eca359df1c4092099cd546470308bbc60fddc4cd0fb710c4a1894234b865d8747fed168a294e511be639f1abd8c4eec9a7b64077fa4de42b697465cf4e7464b44a7d16e1134752ff690cac5bba0bd566668682dcff2c652759ced7c191c14beda65fc34ea38009d402ee2422b0f676fa65d242f281ebb5bb3ab85cc0387affb2ad461c4c75a8802b03b403c0dcb41d6c"
+  },
+  {
+    "public": "de7ad7e3de2622b119b810525cac92b70f2369875772def2b4167fd2fe2692952f823b56740b91368e138b3ca06d990429e0a3e9f3fbba7b5ca85c182b748652f22474cfa8c197a1580efaad4f5d96ca3aaff081125924f9a5116eb045bfb04649157cd790ca1830cb9bf09c55631ae50b79d36147eee06631c50b5625f3d396",
+    "secret": "26b77a0c937df289676800f1cfa1b8accc4439536830ff6c22b49e62a60af4c7f668be9b15cc4c31fbc7fcf29faad78284c6989112bee7fc7446f8d792e97d4e2f823b56740b91368e138b3ca06d990429e0a3e9f3fbba7b5ca85c182b7486527982e0272c1992b6fcf5c7d9ae7d0c37b3888a5fcb3838c707bc00439ea5f9b05261a2d86c8dca53fdc1283c9926f4080e98c2136247b159e30c3b8755bb1e3c49157cd790ca1830cb9bf09c55631ae50b79d36147eee06631c50b5625f3d396"
+  },
+  {
+    "public": "a62ea2ccb8ef6573841bff6f49089b9957c1bd18f4c7ec355474ba5a508381e8b38f39b30e572544fc5b8b26474638543c19529adc7e3f9f5fbb442cfbfe5c06121334eab1fb3cb4d9fa91d9b9680d45b644bf4d41a3d020d8b56ba414912c51b5300b31aaba79abf7674a81df0419a37352b2c3a6983c25d93cf4bbd02d8d1b",
+    "secret": "2df789224363d3dd804a06c2b76debf6174d1467a3db8c5320cecb994943050c5413eff066815f157a301924dbdb30713f3df0be78d331ff1ec7f8763d288fd1b38f39b30e572544fc5b8b26474638543c19529adc7e3f9f5fbb442cfbfe5c06fb60832f69404192a357e4446767013553bdb10791565a8698ddec806a18fefebe66389943035b737eaefd316e20d546169ad6299684e346ce324413af7e705cb5300b31aaba79abf7674a81df0419a37352b2c3a6983c25d93cf4bbd02d8d1b"
+  },
+  {
+    "public": "02ae9147c718dbe7de0ea095c5a4385b5429945a4c295e2beeba955fa5d7e838167c2911e39f6aa0fd847397ab4ecb4994af84a96323a462b86b0362be7dc9c8fcec6e06223825836f5778cf049907ab269646ced127443100180010af102fe9b8e8dddb032264cb1eae4ccfdf2362f50c3b9ce2d34333e765c5b0cd8fa9f48c",
+    "secret": "bdb017986d524d6ad7d365d6ac015714cd3ffdc58cee1926833cf4813698b24e0b3541b0379f5856ad0c206d96c922d2aae31972ded15ec459d4fda9a3e70247167c2911e39f6aa0fd847397ab4ecb4994af84a96323a462b86b0362be7dc9c8310845b135f3f304315ecee670dc9ab5c1b2e14dc0425fe3f5fc422fe672b91e3e7b2b6f964966da3227cbe026a0c7f5b7b1c7ce654bb8e8ac3bd5774dcecd59b8e8dddb032264cb1eae4ccfdf2362f50c3b9ce2d34333e765c5b0cd8fa9f48c"
+  },
+  {
+    "public": "a8b9590880c9e80ef0384d5b801e785395d81603bd7dfe7978e325680294705fef8ac9c895b83f3321e47778fbf65582e23322a173df5075933c08d51f12152e315d39b891f9411e69011ab2c70f5d341abe19a9a3d93cac3f1c64f4c9c7a0961728370bf72be225c0ee2d31133440d00d3811ce6af51e4a064e038b96535fc1",
+    "secret": "ec29ea584a65177d3c5957848a26d7f348bb079d95a3dad702efc56899221803fe88b4071fdaa16e26e8418fbd552c28be0438ed0e1c08560ac634d93e606092ef8ac9c895b83f3321e47778fbf65582e23322a173df5075933c08d51f12152e0dca85506f7a69bf08ffc8e6c0be98afcb3d73a3d47dec018e28044b21b80ff1825bfb861a728f10fbe896261996a97e8b3ce579317cfac17ab595ab24b419221728370bf72be225c0ee2d31133440d00d3811ce6af51e4a064e038b96535fc1"
+  },
+  {
+    "public": "00517da315cef2d02d09d69f80df76598ac81bdbbf6a48c2b92c511b6ea2cb4a13b00f0fae244ceb1f13a1bbbe4fcb9f4056b5632b8df667d3d42bb125e4343b76db2e55b6602a79a860874bf8014f08a6cd31f33d20dc6ca32ed72c8f1d6d8f8d58dd6c8a664250236de2d7b090c052af689237634a364a7a40595a13b43752",
+    "secret": "3f0acdf8a5623bda06dd72858d4318babe2a354008475fb1c320ea411e8e512bb0e32149d30e4a3702ccfc00cf4a7a823381b74b69f77a06f8957a1d44fb8df913b00f0fae244ceb1f13a1bbbe4fcb9f4056b5632b8df667d3d42bb125e4343b86dbde9d6178eb26d4bf9d8340baeddf45bff1ca07aab781a46c002349f83118530c8bd488138f4fea485c51e9d5dedcfdfc4bc9169eaea2d6f006fbc6afec3f8d58dd6c8a664250236de2d7b090c052af689237634a364a7a40595a13b43752"
+  },
+  {
+    "public": "031ab3c4812917c83adec898dbc193c66a9014458a7f0eb8e293d641a69da404ca7f0e2f232615a9fc236f43515bb46cd90019c16879223bc68b29dfbdc657427019184847457a3020232107ab2925e083cd45022d287609fb25c28020cbf913f64026856da3c987f7debd1f0f1f3e4a528f0b368c3a510414e7ca480e3b3b12",
+    "secret": "cb8788dc13a2ce448f60f40cfa2df59f44e62680fa8e9143043a01c8ff5e0bcf18a19861417a20492b1f1aec84669cf3d7a8892fe878e0b34e11920341a5e971ca7f0e2f232615a9fc236f43515bb46cd90019c16879223bc68b29dfbdc657421311fbfd6e0064b551319ad3c2390d6460137cc59c5d5348292d347f07e5cca48c8fce3ac1610c8a0bcf216026164a5bae65538b9b2cda71d8cecccad1a5a54ef64026856da3c987f7debd1f0f1f3e4a528f0b368c3a510414e7ca480e3b3b12"
+  },
+  {
+    "public": "70803f1b29171460324cff5e88d9f1b6f74e4312d94405042fa7b1e8ebb11d3925908f5167fccc24eb6bc37ebadabe7d44cd901e13495b551f6f2e6dcaeb768e944cd2caa1050506d692e48ebcec632231c39d6be116574529901981646728d360664448519c11373c5465970ea97b3c95817a5bfd65db21d8573063b3d0d8e4",
+    "secret": "dfe2071543c5a1acbfdbddc0455f41395a480a4c7f4e62a472569f1f9929064f46faea325f38482f0d2eb9de97598e83c0a3d9576656b7c7c736a7361d6d8af525908f5167fccc24eb6bc37ebadabe7d44cd901e13495b551f6f2e6dcaeb768e5374f3c981548e28d306223e879267939386b2e37eb09e66ea04bd431bede4b1192d351aed62f8ff9ee586d3502c697ae3c3134e0b6d3632e5a30627d821bfc960664448519c11373c5465970ea97b3c95817a5bfd65db21d8573063b3d0d8e4"
+  },
+  {
+    "public": "b4d295091b9d4bd029eee3edabd198b8dc793429925773a57bfbe3ee81b5551dd7fb55500482a4a7db730f757b7768ad7509a008acbd451c3b98a8bc384350a752c66dcc1b98c8aa95f588d5ed4639a8163533d74f84e2a82a3c4fd57f90a4d8b80588594e165c146408d06c37c3fa5dc2f1b4fd0a7795223948c79633afbf8d",
+    "secret": "300b6f3d6e53843545ecc2b7826ac1f143c177701572370415d268cd0c10ab9144a47a7552db0b47c2974a8bc4d15ca7b191c4304dd1ac77f9c3a9ab3599bd28d7fb55500482a4a7db730f757b7768ad7509a008acbd451c3b98a8bc384350a7ea800dd666444a2525134edacdd71ab6155e7c12af9fdfac91c6be1e8c15c0ad7b987f40d1e228fc5ebd7ae9f6b535fc0b55bc68b0f7d9f28d50855f2a5dee3ab80588594e165c146408d06c37c3fa5dc2f1b4fd0a7795223948c79633afbf8d"
+  },
+  {
+    "public": "d38f66d685b0ee6d63ad14e44108d0320b001566283cdfe793e40902c07f835162d095c336af33ab2838c28be360f89534f693008cafdb2c0bb9974b2378f405ff1df8cc3ae7df46135b15b80fa9b7800ee006e58479fe253ada693c2a5f98ba5ee2f8d99c83bb352f186bd117b133d8c0e70768f140b78cf6cc0521ec83182c",
+    "secret": "a985ef8341937af1c2feb2cfadee68da9bab6f0e5499d315862caf36817b8d71d80d25344b57c64b74f23d34fdb217d9af200de0334b19452b2917a99d5e296962d095c336af33ab2838c28be360f89534f693008cafdb2c0bb9974b2378f405af01ad2870584ef3f38e7aa41890a2e3d8d1e56771e90e213e1871c09bdef274299dd2db37b1b01abe4b0966303aa6c981fea9d9dc3de1689a6db9ab2c81c8c95ee2f8d99c83bb352f186bd117b133d8c0e70768f140b78cf6cc0521ec83182c"
+  },
+  {
+    "public": "6ebd76e8b5c21ef51244190c0e14312a1dcf785ad3a036f58eb189f37e1efc0ca453206633556f17ff0e3cdec032b60879b70883404a50e2a44c581a7ebe2fd510629018c62d9a903115b0e603b7c6ebd88004720d9cca2b08ecde6079b150762841b6bd2c990c8367b351aad42faf3b0e8e94bb2ec1b139d937fba0722537b4",
+    "secret": "fe68a0b9d2445f759b8c653fdc96fde6ad00f4a20b3d0e605cdd733e62d0d7f39c0b5c72ebe6c91ae5b369bcb93325a92171be7d197210e8cf84e801f8ab9a1aa453206633556f17ff0e3cdec032b60879b70883404a50e2a44c581a7ebe2fd5343537e941cd9fbfb5b66b4459ca4b7f19deecc3f507745accc69ff0983af199304d59ba6a73f462ad855355c4f91e02aeb97843acebebfddc7b2172d50952ff2841b6bd2c990c8367b351aad42faf3b0e8e94bb2ec1b139d937fba0722537b4"
+  },
+  {
+    "public": "cb10518a41a13d4c469853c952c15b71243d6fa7dc838cce91320f07902f2315e9472272e18e28697f8476bc3cfb20ef490476d215b5831ab6e99bf3405b9f7ee6dc31d81db98aa6d3cd3f9574efc1b1d6fca0a8d96dda511cdace7bb4af2e909a230b3a3a971aebc1112bdbbba48c80b2fc93f7eb914e97ce04a1aee8b1bf93",
+    "secret": "af857a89ae0974dea48bce3eadf641f624279ff3b66147c098f70a7f61d75be0d85991923464264f8036f1efd5f4855aab76808ebd8ce7bf31fb58d467a04d65e9472272e18e28697f8476bc3cfb20ef490476d215b5831ab6e99bf3405b9f7e55f1ac1f2f3376756fac7ea333a651a4b1c21f3d2d0767b84774b45b1a4fa2e82791861af211a5838129155527b260e0717a5ac9b61b4d6da23a268bc88f23a79a230b3a3a971aebc1112bdbbba48c80b2fc93f7eb914e97ce04a1aee8b1bf93"
+  },
+  {
+    "public": "12e688837265c8a96cd73dae41e128250c899996cb513b9a1bba13de42f79d3e8669bb6919d1e6ccae10aadd45ad6c79faedd70bd6170eef5f6a4068befac2c4d7853f5ecb9e58580a86bb8442d494c43fc6cb8f9501d6f65a69ad8c0cce15bc51fc738683b86a8e773c7021d4ed0908cd21da6cbb432d4adb046832f23839d6",
+    "secret": "d73a5517a7d6c826c99592ce2fabc3eb6e86f1f3f3d3c465bb10428cfcebe7c0407621315655061cb566db70057363be17717bf1a4f23f2f57e462ae0465ea5f8669bb6919d1e6ccae10aadd45ad6c79faedd70bd6170eef5f6a4068befac2c4e0360009dc29272ec88b446f062f38e48fe9ad7a40022bc609fcdd9e3e3133c03f44752851c71f53186a2e5561303e5a5aba8f51a00228510c14a6203359e80551fc738683b86a8e773c7021d4ed0908cd21da6cbb432d4adb046832f23839d6"
+  },
+  {
+    "public": "04d86563409dcb1f3aa3f8467b6f3326488b1a997682b42929c2bead2a9d3154c122226ba461abf37b141e175f5c8154b0e4df33f56463c7da8bc3fd6cd56db13aa6edb3727f2eab95778eb7044a9ea788f5bf6c60d2f020355fc2f5e5beb22323fa817bdd6479fdb482bdec508da7b4f73a918ada9d2debe70b88eb88ec6ad3",
+    "secret": "7585e6bb2e68433488888a9eff470d2c22dfb415fd1a2b067629376046066174c09dc6e2ee083f1857e5e82cea29df2c85488609a52b3f458daa6a02a9d544f1c122226ba461abf37b141e175f5c8154b0e4df33f56463c7da8bc3fd6cd56db1f6456d23c5ab3fa28a13cedf93d69e4e5d37498be2f26b06eafb224afc8256a486507d5a5cb4a4fea9800ce9038a867ae58d15bac79b4ddcfe91168f0d22842523fa817bdd6479fdb482bdec508da7b4f73a918ada9d2debe70b88eb88ec6ad3"
+  },
+  {
+    "public": "99a552328720f88686f71f87f18a25417c7e6dce28ee17ea585cb6ddd2f92f606759859a1b95048a0025da9eb5ab9d2113632904a80723e4de0f71381d4b6602dcdf2c8b4339b96390983dc5ae322dffc5decad8c46889562a04681534985e87473db3fef2b8dc1b716028f8bce2eed1ba40177e3119d61e7ae821520e5db1d0",
+    "secret": "54c7e3fdfaa47875fb163044dea6a3e86be92bd3b405654dcea3d009cccb4ef47aa8332069caf0c2559d18a75e6dc9064bc55fe0e5c6120b710f3bf91ab093356759859a1b95048a0025da9eb5ab9d2113632904a80723e4de0f71381d4b66020df55a4c8f76d5b0af859cb086bdfb741ebbffc9d96314c8a4d7b1d246b818d644187a30021cefc805514964b5a9cd6db32e2c8c0dc534b3af53187d727f2f8d473db3fef2b8dc1b716028f8bce2eed1ba40177e3119d61e7ae821520e5db1d0"
+  },
+  {
+    "public": "9e0deb59e505aba4cd431a69999dc4ae45c94e3a01f908bad82d25dd71d8635c9e9b4d92fc79035b4bbf4d817306d553eddb74e56091b0de2aafc23c349d552a787c5061dde1b5e1d41ba7490118c7010c330f2f5d2af1d15ab096ace65e35f77a30ca969cdf4dd92c7c39ed58283084e8b9a752a44a69dfdd516022565bb25c",
+    "secret": "a073975aa0d1d8a677a87e20c8f3ba3864a0b2979ab7a43eee4edec1e41788fe4f06e04c4362d717feeb26496e676ec54b1436322ae9d6ec15917045be6e1f949e9b4d92fc79035b4bbf4d817306d553eddb74e56091b0de2aafc23c349d552a772946567f217206f694b5225fb29a35b2850e8ddddd12e3d870825b0464bd40b9a2172b709df8f93c56183846e4696d88a9ac5be52528cc4e200ecc34bfb2227a30ca969cdf4dd92c7c39ed58283084e8b9a752a44a69dfdd516022565bb25c"
+  },
+  {
+    "public": "d43c8f7193b6a71762edca5eeb4e711c8ac9926b9089188efd1d675ef53667e3c9e689968c90bdeff8e1ffd58d47b856a8a809549947feb104e63be4f9c8f701ee7aaf549f8db6ed3cc594371b06ab0f5b2e8da3a041ca5b8cc2de8f16e4de523fc93bb33c0c9c433ac76732f6bd7e184084ebaaeeab0b5ad28d9d6e12bf5f1a",
+    "secret": "4f51cf2ec6cf6664e2857e3885fa87e6ebf45bd04b32118a39a753fe372e958db358ac35ad12205432b3a1b83882f9da118f278cf86807991a7b786f7152dc0ac9e689968c90bdeff8e1ffd58d47b856a8a809549947feb104e63be4f9c8f701d2bd5b985e6cb1e566a6013bd19b4b2f08fdfcaf50e171c4c9c921a75ac123dd65dbbf54e751944e0623b6f4a7fe86c8d4e480e044f43eb38364e6002cdb0ea43fc93bb33c0c9c433ac76732f6bd7e184084ebaaeeab0b5ad28d9d6e12bf5f1a"
+  },
+  {
+    "public": "ccb3c1079e9f7b517d29c27f560801e2007fdf2b8a35cced0375de52ac1dde9819272b1f84ae4879614b64239bbbb7760925d14a347954d3284ace475328e7e023ead8857a5e1627a9bf1651e5da35f426a6d16b4775805abb409d8c7e6de35979f52dbee37675af7dffa13faa4491a23cf3dd474fa928f00c598d8690353625",
+    "secret": "3b6bb2d508c988f61b1b743cea6969c9c1f23ceeba9aedd2617851d9ad20787e60dee214d99ab5fd11fce637ab11bdc11b56329c7e73d5deb4dcb092ddaf0fea19272b1f84ae4879614b64239bbbb7760925d14a347954d3284ace475328e7e01f2b9e032bda94020508164c01fb24a4714bda1f1546c53ebd1c49d0fcf059ee26c9951fb5fc997b7f45935bbe56d0744ce7282fc6aa464069b05c87c666a09d79f52dbee37675af7dffa13faa4491a23cf3dd474fa928f00c598d8690353625"
+  },
+  {
+    "public": "10a0939a69ba567bb5a99b41a69848ba826bf9db5aaff49de0dd8c46df6ed0c15f743c2756c6e4b870292eb8011bfb576c7f99636579555509db058c802735ebd446b850fa02eb3c580ef81c6a0d7492d8a508eee684b717bb0f98aacd07fd848f94c908957ccf1255c5c3281f691ef607c7d3b0682da72631ff634cad6a4d54",
+    "secret": "f49945321a84e6025bb39376e214831466f39fe18c215d839a7f49b52659ee48a359c309f03f0a53195cdcf7753a25777c5d0d060ce1cd06c33e89184818554c5f743c2756c6e4b870292eb8011bfb576c7f99636579555509db058c802735eb6d97701bd5b688375a9c5243f9eaec990a784ec3959b3305f2c11fe25658c746c91677a8d0e45595dd739b0cef8aa45c01a72d7cbd093dbc43cc2648a119a01a8f94c908957ccf1255c5c3281f691ef607c7d3b0682da72631ff634cad6a4d54"
+  },
+  {
+    "public": "7a6fd379a0facfd1581c9804247d3a2edbce73baa45366e3c88d9d86a657d764d6ce47eebee056e75bafb0299b71fb702198970f4ee143bb712948ea5ed4131f7c39edf24a9f68d35783df2e4a9044e84aadf93a989b08feb0dc70c91a7d8002d4059f2d0a6e66ad84cdcc5489f2da0f1b4d7a965ed8b0b34129f21443ae3172",
+    "secret": "e5a8ae97aa4879a3d846babe662188abfdc92c5aab2fc1856c051e22d8d1ead264e28dfbbce68470488f7ea4659fa65cec295bd08529e4c549ed01ed36ba4357d6ce47eebee056e75bafb0299b71fb702198970f4ee143bb712948ea5ed4131f43f5c5455f7826c4ed76c4a45b95cb598c267f72acda4ba1cb26d1cbf30095a93a9040c45d9cd1e161d1da530b6702c4720d026417e8e63ca592911fe44c4207d4059f2d0a6e66ad84cdcc5489f2da0f1b4d7a965ed8b0b34129f21443ae3172"
+  },
+  {
+    "public": "3e5e138ac9c37ff7cc718f0788a677ba3f8d7f1924ed0479d45e0544a50c7ab4da05cb0c2751be122df757f9dc8ab4962f468a4ff7c832f821d3b702d2eca50861bc725e3ebada7e34d1f26eff2c493080fe4c7caf50bf33f9ce4fe6f9f41a1c5cc312605c324ae51b2e7c90c567e4e95bc61633b9de3360696aaca87a240704",
+    "secret": "b18cf246090b72a7d32960f1d8eae184553d6379b0ebfa2c437ff5cf0d59a8932d23fe138c8dd5a482de162377185d8ba73cf32d3c2b12606925d48dbde7879dda05cb0c2751be122df757f9dc8ab4962f468a4ff7c832f821d3b702d2eca508329c5c56453c63f0823abf5cb88d5ead7a1c409103407c842d23a4aaa1752d396b7cb8f7f3fa641c23845824e120cdd7780ce66e873910cde395d6e67c5b668d5cc312605c324ae51b2e7c90c567e4e95bc61633b9de3360696aaca87a240704"
+  },
+  {
+    "public": "6b68a1da465ee3904bb4d360be48bf34315b64314ddd598165e1a771837d4543df048a50bbf6048deca50cf3c803d3f5a95cf37e0075538abd7b8eb8b66b13e6388e65b7a0644ac65b696e7596266acf0e7d807f3db8234b9094708b7fb9b26ebf8c33d4229e69311d1ac34f151229ea6f44f58f8c3bee4c4719446fc51000df",
+    "secret": "13fcbeed2fbb1eea511b7286c39b8b041204362dd27d942a7930108e969ea6b12b8c7193a9e0b1da86a4bd35ad94700debbefb46412061371fb5549047b8982adf048a50bbf6048deca50cf3c803d3f5a95cf37e0075538abd7b8eb8b66b13e618891332949e4da9a093f2a5012e784c425b237e71f77873c6d8677884f0aae467067b841ef9e060806291da428d290e1074c207b691ba76ae1dab821a120efbbf8c33d4229e69311d1ac34f151229ea6f44f58f8c3bee4c4719446fc51000df"
+  },
+  {
+    "public": "a6a68b394d81dbe70aaf4e8982d6e9c009d2af4553c4893b70c51d386f77315d0d85be743d6be5de764aac34229e678a72a78cedd89d3a294f81b135d6ee6be7a223cbd8adc56d0fb5107ae493040e8997f05b23bda8a0bb38bee86d2525ceea8646a7f3c74fe1018e35d452c4171c1d74adf058bb09239432534bede5b5d7b2",
+    "secret": "e350767e8ae42789c0e5dde678956ac7cf0ed91bf6f018b9862e423e98aec0284eba0ec4eaf9fc2ddd93501c4681709ee183b73b0d834e2f05c92d8eae7574c40d85be743d6be5de764aac34229e678a72a78cedd89d3a294f81b135d6ee6be7479622ac6d5f06a8bccba3156cb3e36c12de65b8f8a78e44e6e84e06d7212344dbc2dce3e07510f6bd5fac3af7777d015bc6ff038c646ce284c455359800f87e8646a7f3c74fe1018e35d452c4171c1d74adf058bb09239432534bede5b5d7b2"
+  },
+  {
+    "public": "2563b2a2bef4ac7e393aa5942738868515f9778faa58b28c3e227e3b239b1c43f091c0e22599b746ae17e19a9f7989cebfdf9b3f58a1a592ef992bf6dba366a88aa8d632e684f66048a1d5952f42ec7989495be1937727dd1b8f327103495b2c92fb9207da4c03f2f632564125709672de2d4c94c5b72a5f6694fddf7eeb6eac",
+    "secret": "5d540c71ad4a8abb5799abf1c467db2ce4a738b611a2c0c1e2be025a7b1171d945e8504e90446a6ac9c8a012fbdd84520458f7dca1e82ebb415664d7e9b08f88f091c0e22599b746ae17e19a9f7989cebfdf9b3f58a1a592ef992bf6dba366a8565d240f5e36c2cb26c731940c22eb7bd274d22f9b96deb7e753f745b266240b8ba05619d4562464f08d7c46b2e9fa327bf7b0977c5bf18bc1d0818b86a3230792fb9207da4c03f2f632564125709672de2d4c94c5b72a5f6694fddf7eeb6eac"
+  },
+  {
+    "public": "803116bce228a882f65a75a7ab56b95383c9970752cdd84e8d28f7963d83e67a60db0fff3ff97e64f3c392566bbbdba3bf80491bb24e444a0034a245d6f9351165c1fa7aada55ed3b1a29efe1c44c86030bfcf2bbbfa9911867b97c2ad1d078152574dc329afc4ee7b8e8583025af712146ff04935b4993c70fe58a6d6b64ad5",
+    "secret": "a009da1b430b7e3310ecdba614940434fbd15705d209d610655d4a9036726555a03dbf42ef9db8fb9dc753990a29aa1c6179c4c09bb54a4ea8774845ffecca7d60db0fff3ff97e64f3c392566bbbdba3bf80491bb24e444a0034a245d6f93511763aa871604fb5bd5d327e031a999685a13629ec966c950355703cf07de7ba4d88ad5f43d4982be3e94c7da278aaa6455ed7c233b0d3fd75652909ac3600703552574dc329afc4ee7b8e8583025af712146ff04935b4993c70fe58a6d6b64ad5"
+  },
+  {
+    "public": "f04196493328783711722a23a01ff7c3395c2a2eaca5f89d3c970349d7c4ec52811e329cd87294ce563a08f3f5e0f0c9fd29061a60d68ec27b7ab854cf7aa59fa422a103f1be6b615caa0b5993da1bf4c76144abde1bfc4cb916c3c2cc1afd9f3567d3ffa2dc978c336315c7a9816ac63d77738fbbeccdcc42e7accbd77d4155",
+    "secret": "b2ed5db2062facb13ef141a06d85c13d484b5880afdbb88e73fef53481522e2ab9605f52714b90312d6413612f6d40556adc2c68f0c83b4e600dc01b9087d3d9811e329cd87294ce563a08f3f5e0f0c9fd29061a60d68ec27b7ab854cf7aa59f7ed0d06ae4278402df6d7bc04a2cb044c4c271cc2fbdfe4ceee98ea109ab5591c520e9a8c58450691d752d27cf2ccf7c56379647228d9d6e5b38ba0cf861f8603567d3ffa2dc978c336315c7a9816ac63d77738fbbeccdcc42e7accbd77d4155"
+  },
+  {
+    "public": "ff36aadb162a7402afbfebab44f6c7497565de3a76a1d127a1fa90607b96b62a831964891adb7e17301c261ac84b4d100fa3f2bb8f028e354c09a1ca172279e6ba4d05eead74287996a8ed71cbea760e7dcd85cbb7a962749302c60dd1f12c9d21c1fe92fea22817e8ccd0a1f84517d82a3643716a8c45a3b2f95668e31f53ea",
+    "secret": "9f04e76f4f0bbe11455b113aed96542e3b7bc9c61b14e8b875f5890e2932d13097cf11120c521258c4c172b1d2d6013ccbffd41e29a1f1461c326db9e053bdc9831964891adb7e17301c261ac84b4d100fa3f2bb8f028e354c09a1ca172279e61b2b8e2cf6e2a37bf0768bde5242c19d8855f0e5ae73a7f58d9a2559c3ad05b76578da8c96ad496751b0156bc06d9e91c8fd409610ebdc372d99797e06f485a821c1fe92fea22817e8ccd0a1f84517d82a3643716a8c45a3b2f95668e31f53ea"
+  },
+  {
+    "public": "21e3bece4d5705c187ff39cd537f3bfa57122973a79cf7615b7dc4c6e2dfd7f150df7d53e2ab0f8e9331cfc9f1ca211011e9bb02f8b082e4a70e45e1adc7d543b3f629814460ad7bbb7a1845e48c70349639f6bb647b66fa9d9548326f8092a7501fc18dbcfc8730b4e57249ea5bb92312309d36b9300a1a105dc2fb1c8b4879",
+    "secret": "39d71144c0500b9543fe9696fe07cfcdcde4178a11907ab24c929f6b88d4647fd515331edaf90e23b00d45d5a085adaf96760424818846cb2b6362c46aae873250df7d53e2ab0f8e9331cfc9f1ca211011e9bb02f8b082e4a70e45e1adc7d54396c6821f9fab777d195f6dcce99ab1278441044f632bef5829d815cfa3698f86526884c2741ef3cb8483eaa7245eed8182d5248288b96e3ccd6b70e8a1c86b46501fc18dbcfc8730b4e57249ea5bb92312309d36b9300a1a105dc2fb1c8b4879"
+  },
+  {
+    "public": "baf10c4fb4aa517edc0af73671e5c8b7d232cfdf5529ae3be0ac866274c3f61a059f3df5793ae6dec2560d33ae19e2df1e5b3ab1c1aa4a6f42ee217e9483ec436184e5e63e0548e15d32e089e831fdd1465c4c9256f456f9325debfb05e37f24f209dc889e7173c5c310210290f22dd688d2c395ab7ee1a93078500dbc28121d",
+    "secret": "2a7d0347b612451d11fd101e18746456e6658eb5bc59b85f2a20699e953527af6a90c2712b36527f211578e22859e54aa12f305ca14faff19028ae208f29ac34059f3df5793ae6dec2560d33ae19e2df1e5b3ab1c1aa4a6f42ee217e9483ec43ae4172f80291f0391ef00826d8e1e549ad83645840c060700c5e2dd8c7eaedfb676f8171db0088afbba8b67586a8ee859e38d19d1fe4d7015ee0aedc9f0e35a2f209dc889e7173c5c310210290f22dd688d2c395ab7ee1a93078500dbc28121d"
+  },
+  {
+    "public": "71da7322bd1392f93721d7499c02ceb1f64fbbeee1792dd2c831f3d486c58308d8ef1cbcb1c2983dcbc7ddfd96a79a6867937a3170cdf3ec74408940173b7ba06d62260077f772af15f7090fa43d3cb697b09a0b8f8abf1b419c0acc60736424e4df3910fcc3f6b6418de8d6291828bcf03aab18f05163660e8fd18668b9ef6e",
+    "secret": "9f0440ee8cfde94a3d4788fb908a2da4616b79cdd9e5e0051223d07b0d5bed236ddfb99c2c684adb190a1c81698c19c7c77ca41b9cd889859edf679ae6c12860d8ef1cbcb1c2983dcbc7ddfd96a79a6867937a3170cdf3ec74408940173b7ba05ee0a585b0555cd3d588e144ea0e124667b96b37ded127f001f09c8244534d3b20a6c2da29b9c2d06aeaaa59b2bcb45d82048349931ef5ed5a2a4516bdb4da53e4df3910fcc3f6b6418de8d6291828bcf03aab18f05163660e8fd18668b9ef6e"
+  },
+  {
+    "public": "f228e252e684e97d4ea81343456a0a02cd78ae761f6290866d335ed5d5457446c5fcaaebd059de11817b6049daaabf557637525d6831654f4d2e461c38ff4db83511a310ef62d97da5e6e477fea919d84537fd9cc39ae3eb0609914e11427a0f386003b6633a1138f7ef4ff9f344ac7774942da5175602e949240b822a6efa75",
+    "secret": "52d5c01f22357005bc4761fe436f4f7c451b39f4b3ae9bc824350e3a61de45d9acf1a9c30fc7e01ab57bcaeb5758b1bf41f15aa70a9a6501da83054692515627c5fcaaebd059de11817b6049daaabf557637525d6831654f4d2e461c38ff4db8f9f222790d3908a630e227f803e5d111fc891d45e0fb77a98d001aff67a9f100099f1001de7f40dc6a0d695dad1712e2b94301d768e52b84bed4d8bae7f62eda386003b6633a1138f7ef4ff9f344ac7774942da5175602e949240b822a6efa75"
+  },
+  {
+    "public": "e38ee8603b4e6ae6314049470301dda05ab1c05f30a88076493e786e2cea0ec35d9de2be305beed10b502b801e89419fc19e25256598e6372dd29e6019dec5e86e675d3d8b1d58100f97474546c3ce282771cc4c07eb3c8b738cccd32d879c844bb7203370a849e6434b4b090794d3994e8edbd7cf1799aff53cbc7f2b58a602",
+    "secret": "18cefa7a98c6e49be1110df10515366c76fe6e1fba80253da26faab7e7f4273966129046dbdac4c140651973e6c3caf40981d0d13fe10fad44d8ede9faac1f095d9de2be305beed10b502b801e89419fc19e25256598e6372dd29e6019dec5e89dfcdfc92daba79849a7c406a81003aa07b6b94aed4a288a63941d8c62adb1a93672ced60679000256b1278ea4fb023b3353420aac136442af101a76de2f33924bb7203370a849e6434b4b090794d3994e8edbd7cf1799aff53cbc7f2b58a602"
+  },
+  {
+    "public": "35b291d6aa229ee5d5358f1075ee8ac68ea2201c9e77590a942a35666d573051ac72a54703d96763827d37f47b83da9a406070ce5dc9c9e5bc651e270deddf8f0d5a01b232671f555f5c410d52af0a774d73e71e36404601a5eac03f473bb2c9deecec980be496b499fadff1c6808952ba9fbe87bbf25c23a78c1ceafdc82b26",
+    "secret": "133a621ece1151c9b9ec5fc662a2b3076251ffc325b7dd6a738168af196f5bd787995c1f6db1b84408a14c9f25e7ab5021b1e45db33be1273d7254dcfb887355ac72a54703d96763827d37f47b83da9a406070ce5dc9c9e5bc651e270deddf8ff1d1b9152a0ee256d8f5a4bbfd026a8e7534240d27825e30a9a3f66daf154d40e5700ca0535da1cbce2b18e42a55fb0095a0e75042a10db3b0592eb04b8c1178deecec980be496b499fadff1c6808952ba9fbe87bbf25c23a78c1ceafdc82b26"
+  },
+  {
+    "public": "f64febf30c656b0945e4a66cd8cd413190fa5f9418fed8469c07233f2a0767a254428e40e4d55e2c8d88e342bd9acebd4e658f4c9c156006f6ed37dbec1a4485a4fa8ca1e4f0e20b8e2c88d2afd4c57f46080c5a68fda4b50a1d250c5c638c9b4bf481aa9b409b035c7ffa989508a94a2e3e39191e149cdf6a088eb1f73a8a4b",
+    "secret": "f024678625195822f9ed29a297966f524d835ce05ccd89a446cf9d0db88b4d847af24828b7164b94a68a65912499f99b97fc25e6b3d8cfbaf6aa91c04cee886654428e40e4d55e2c8d88e342bd9acebd4e658f4c9c156006f6ed37dbec1a44854c80bbd9b8855baa38e6292f9e8cd7dd359de18bc259af30eca91b975761922a4e06d6697b67b538aa27d4ca162147d19280da74c53520d211fb9960ba1d8c1b4bf481aa9b409b035c7ffa989508a94a2e3e39191e149cdf6a088eb1f73a8a4b"
+  },
+  {
+    "public": "1ecc6a6346596e4f438c427522800aef2d9e1dbeb45d2e6badc4e7405368fc3b967e2832dbee0e7eb4821c832eaa52cb6694df9dfd1f1d76b247f932accecb64ba2c70918bf5c28b2279fd352c99f06d4fa0baee5c8ae24c039c269b026ede8f690f825eb41e64e172e48ffb4d240b99131c66fd006e82887307960141071d96",
+    "secret": "a40cbbaa5f8fcf792b2367db42f402102d0121acaf5d9b41d41b5cfdc69b70f3d400b37dd71bb3ff2ac801ece7d976255412c9afe970fce5b29702fc6ae803c7967e2832dbee0e7eb4821c832eaa52cb6694df9dfd1f1d76b247f932accecb64e8da44ca110f7254a5165c32fde562c65e3e6b2c37182d5f73c998e50a72ac9ab95bc6ab1f4f95089fa1b5378d13525da0514cad7aa108a18ec5d43108524997690f825eb41e64e172e48ffb4d240b99131c66fd006e82887307960141071d96"
+  },
+  {
+    "public": "f26f48ad621060b321054e29346f795e0d39aff92156f766d59b284b1f0921674d4ca35f8a9fe27aa467debbb4a55caac2788f3ef2a0976aaa44154dfe59478da1e4517a67b480269eb893f50632e727be8a59e9b66c490693cc67407ec1be269a08915eafdfc66e05a26aab7a1799a3a3befb53020babc061aa210bebbd93ff",
+    "secret": "d928ed03046ad36cc57f82cf98d1faff717e568f81172b4672d4936264be2e40f170c6875de3397f5cf428d96a07da192a3a23f724b609b787644e05954d07594d4ca35f8a9fe27aa467debbb4a55caac2788f3ef2a0976aaa44154dfe59478dbcc7fbd035fa6a69310f935abc7780ea29f4f420f3be7c919f62080679e2d21a6d294273c5c2033a9c70163cc3cc3295c0e9c648e5a2b2162a4ff16666abf9079a08915eafdfc66e05a26aab7a1799a3a3befb53020babc061aa210bebbd93ff"
+  },
+  {
+    "public": "1e4ec591f7003feab7f374b024054a20d073e1ee710e7c1b638f7ec588bcfa8c81eac23411e4281414ae1ae0f44bfc3c7a33a4d2f6fb5bde2f6b6c188442f91a1f3f781d526b475ae61a52ca2d95c42bccaf949b4d008925a8e1ca81fa517c6caf19bbcb4bfb5b0048f69af5c44dcd7f4fb1fd0b5935ce89f79ac4cb629a822e",
+    "secret": "441515479e88b62b302f97dbaa17cddff02a16ae2b148731dd67cdbe093f7e9d13575a75416fffcaa66287f3a6827659a8b9972ec761c6fca44cb67a8869b16481eac23411e4281414ae1ae0f44bfc3c7a33a4d2f6fb5bde2f6b6c188442f91a020e3af6523ee81bc1695e9198e5120c5ae99a8581b845af2100797f3a5cefb808d0e25066d6e4d1b4caf7b420694635b616641d0887fd826d1f99c5546573e1af19bbcb4bfb5b0048f69af5c44dcd7f4fb1fd0b5935ce89f79ac4cb629a822e"
+  },
+  {
+    "public": "a03d1a6a4ee241c5ab392f05b0763db30416e6a6a99b754b426ca9c33b770a10fcdf88547464ea80da78ea0a76aea607395b26b51fbd2d048a995ac5b86a97877100f78e80e5d1c03f471449debb75a32374b676da34830e776fe2d8ba27f700c16bef347ef56c0998663919fd8a8e3f89376288fdb1dcb0e1f92a56073965c1",
+    "secret": "adaa9b5ee978daee505544ad70fef1da78ec67961fa10b19947b4b33ae89fcfa1cc70189586b30f8d46b27cea5c59662ee5035563cf7eaaa2b04b4bcf21d8da0fcdf88547464ea80da78ea0a76aea607395b26b51fbd2d048a995ac5b86a9787145af2506f73969c7a56e6a43b5b714ca6d0ac832217d61439b891baf0ceae4209a922d3d30eef4edc0b695adb738b713eca583dcd5890a006857b451e3762e3c16bef347ef56c0998663919fd8a8e3f89376288fdb1dcb0e1f92a56073965c1"
+  },
+  {
+    "public": "c6e217eebb6159f8eb1ce7fcc672015315a241f30e01b8c847ecb726adae2c30de503a1dcb08a176cea5bdf36e5da986aa9e298e8c1e91737935f5bfe4b72f61c6b820801988103f0c0cffad736fcee76e859138126131d3c6bbfa7f240ccbe404d5412324e3ac2853f0bc49b11f36dd7d97e1c8a3112a7f4defc9146afb791b",
+    "secret": "1aa4a860a3d8e7f603445f29a0d9e92686241ea211159f71c0bc8d2077097e6bfff002aa8a39ff0e1bd554ed06ea0008c0ff0439ed946fd72f78ca890832fa7fde503a1dcb08a176cea5bdf36e5da986aa9e298e8c1e91737935f5bfe4b72f612391bde8ca0d0f9e86cd420f41c4fced1b75bd149c637e3877766ec0ae4cd18d6a7a7d88e10811fe6f2d1a15103865cf086122a0ed4290934eee4b4a206dce2c04d5412324e3ac2853f0bc49b11f36dd7d97e1c8a3112a7f4defc9146afb791b"
+  },
+  {
+    "public": "1b373257f3fc76997167bd727449432e93bf1af9813e7e0c5ff1142f35107e07ec89c28e19684511b964f2027bafd362d038ff78bedc487b37c70e87d67cdfa4ec2ecc17a0b1f4b6273723482933897f4bac1576ca11612b35de4e3191253f51b5d2c68f1a871e29e39b41bca7173daa8472de7c69967c3039d95ea94995cab1",
+    "secret": "77b2679f6b381e97cd9ac05a11c8cc238ffee12ae3b0572d46d5a4d4c20e6aa2df931959a61196d4e4218e79c9852e754254831770be8531cae92f962eb45683ec89c28e19684511b964f2027bafd362d038ff78bedc487b37c70e87d67cdfa45fde1d659b0f60722c16508283fbc6503b96ee008970d127cfee6d1238eab262f815d8630ca3a3990695c541b23ed90341b42b1e227a39434062968b0dcad83eb5d2c68f1a871e29e39b41bca7173daa8472de7c69967c3039d95ea94995cab1"
+  },
+  {
+    "public": "21ca77ebe9d0a91e3f40cec4b8819b9acdb1456ebf4f24c9589b85f754b6361c1045e968034f0766d3cb11bba0b75c8919223fe75e02b57e365a67f0de3991cb44b2095fedfa1d9fb3b854f7043231b2e7552905cdf0b306564ce92769ba12a4d5b2d9a655019006f8cc3c352c007bd2c9aae107447145c5d6f5e1ed3ac8f163",
+    "secret": "c32f5a6f5e57fbfd8a8a66090c6abfe5da0406c7442cedb34618b76455c428a2495b7fcc26d6733b09487a671558f974cdecc84f29afb53f2420493753bbe0341045e968034f0766d3cb11bba0b75c8919223fe75e02b57e365a67f0de3991cb09471d34c93d57308b4d492e9de38dfcdeb7285393bc8f007189057b1afc8de6e7c0ba657b3f62612d450289d0af2f5c3af699327b6f081ad4bddf1b3feae479d5b2d9a655019006f8cc3c352c007bd2c9aae107447145c5d6f5e1ed3ac8f163"
+  },
+  {
+    "public": "8b23bad9384976de850cd2ba2cec29f918b75e30512ee8e626b38611b7c43bad625ded0ae4fd9d83b1d100a25b17c5f46dcf9e1a41b9a11bb572174daacd70aa903387d8ef9db4e7e82f95eddec209f44e0b2f9b07563a5bfb75be4c0f8284f179c7a29ef1b13606650d8ecb5644488e2877e0abda678cf70b0ba25b47e18b5b",
+    "secret": "f652c932339c9fcf723c64a4475bd6e4fbc21464b8a0e1de611d47c68596b8c717629d5894ac8d0da7b79b0167cfe015f271118d46029c992e4d7255c2559bf4625ded0ae4fd9d83b1d100a25b17c5f46dcf9e1a41b9a11bb572174daacd70aa1a680ef15a8f74533d7556a18dd65c6516c20a2cb62f13e9dbca5c35bcdaf247550a58599a7be9d6196614006c7287b77c58b4791edf1ece4b651728476c6ad179c7a29ef1b13606650d8ecb5644488e2877e0abda678cf70b0ba25b47e18b5b"
+  },
+  {
+    "public": "48af843c6bb121684f6d8a1bf30782a4c63ecf00f88ff28ea0ec3388e7a87822a0b8c58d99f0cb27c98250f9d8d74f4efe3300390af072c7c94ab0ffeba93783e8ea1483e48f179f9b420db26605ce94431d37e1184f899439ec9315e753985b50b3c7da116fd30c634e12f20d11f16b1e1a13cdc8f380f7b95ad7d20cab1278",
+    "secret": "33f70458e79c7693232afbd56970efacf6e1df042b8ef2c76c7ef3471dea1be0598b9e04eb6f7beed13b9f2129c3002c7d827f5e5077898fb67efcb88f84780ea0b8c58d99f0cb27c98250f9d8d74f4efe3300390af072c7c94ab0ffeba93783db5fb7a405e03a07f64a775e52df801d23814de9e5e9fd98092c56920d61f5ed96705761ced6ae34fcab6a2279e25d7a1a6af3944db8a47572713941c3c3437150b3c7da116fd30c634e12f20d11f16b1e1a13cdc8f380f7b95ad7d20cab1278"
+  },
+  {
+    "public": "571452e50043af12446a09098ab7fa009afc20b1ad5f66772e35bff3ab297fdff4408c83c6436031a426ef6eae6fc43854418a9199fd6ee76ef9e2ba2af7464d6b8494a33e22c4d3df121d45dff213e4e277ef438475e51e28e52a148506e1c2228889f5ae2cc55a52d13c4e956e8464699eeb4a263195256eab9c4dd2889ea7",
+    "secret": "02453700785c9d8d8b3d3e817d79f514225ccccc5b5b38c15a81cf0eb1ec35eb4e439cbe23f7732f44999b9e752a94571d2cb8fcb0297dfe785dcbe52eb4296bf4408c83c6436031a426ef6eae6fc43854418a9199fd6ee76ef9e2ba2af7464df11ad241f3f7f45bcbe404c9837cf41239f1b348d17933aca2d496f2303c512f79c382e97e456b673406ce5202c09069ddc4388005883fa71488ee6120ce53cb228889f5ae2cc55a52d13c4e956e8464699eeb4a263195256eab9c4dd2889ea7"
+  },
+  {
+    "public": "381d83c0527c079e90a7e4c51831c0c55c614d8310df3c6553d5584975f69e9e6aeedaa35954a442f3b27a05296582eccc71c9012bcfe10f19e2adf429e7d5b8215a71b9908e8f4cc76dd01621ee867ff9582030a8176e5dc4945d2727502be531e278861d30fb35c788b52d90db73a4a6b2a98a84f9ece6d566faa46d34dd36",
+    "secret": "dc2d2cc455a93f516b74c137875a0062f2bc6b459bb3abe67ee8ec70569e3b926c149b274447d95a42a6e7459a5404ee8f876791e03f027e96e63afd5b385fa56aeedaa35954a442f3b27a05296582eccc71c9012bcfe10f19e2adf429e7d5b8cb0d01113da272b3456909b76b1f5e11a00c296ae3a4e9e096d3b38c35ee2f3e42d33a553086adc327b95c17549ea1ab8f5c5bfbecc3e6bf930b382352cfb30531e278861d30fb35c788b52d90db73a4a6b2a98a84f9ece6d566faa46d34dd36"
+  },
+  {
+    "public": "e5fe3d6bb2970f09972a2adc43aafd83750123effead4610dd941adf181c9c83aefe40a5c8b494aa01ae23a0caa40618841f486242dd0dfbc9d11a8809603996fb62a9778cf4b11571e4b10c798f2de56a629c32d20bb283bbe20968e4bbe504462e8121e56b8ef7de7f068fe82b852acd149e4e3a9502d804ca52108616b83e",
+    "secret": "d111c1f1d6bb95e18b4567cd9e8e89a4e9352af1fb5a91a00c8558f4cebe714afd86086638d8cde0167d19cad69c838011b74abbb50accba30603668b7218ed1aefe40a5c8b494aa01ae23a0caa40618841f486242dd0dfbc9d11a8809603996785a3f4641e17f357e3092ce2fc1b2f21b77b4ba2bd3e04a5164b8c64ca3f8fd7bdae5f81c5a6ea65d9271efa5e4dce845a125e0efeb8f9aac9b71650ee31d36462e8121e56b8ef7de7f068fe82b852acd149e4e3a9502d804ca52108616b83e"
+  },
+  {
+    "public": "c7fd81fe3b2fb592a2df59ad90e6bbc35023f9574be8fb9fd85f6a6230d5ec95166fa29a38531a011764ca998e731afcca93b8387ccd3a34175bca956d26c7c919e883fa11363340535ae347f43886068288a81c79f07926dc06764e4dfe966fb57b8d776e27a52c51b89f206cc7dced846a0721907c6e4b5d32f3cee4647a78",
+    "secret": "aff01b985bfce8dfe0d5b34aa0f76c2632a8dfacac1888f8638a647c10dde1760567e20bab411caa8dfd0be5910027013ecc294c481a8557a288e55b4be9e452166fa29a38531a011764ca998e731afcca93b8387ccd3a34175bca956d26c7c9d643b4680241a2b7ae5d1447619ad04eee826c770698d4d514699418fcdacc96023cc310b152bad374dbaab9794197618d448f7e32655b9621a4cfecbc452d92b57b8d776e27a52c51b89f206cc7dced846a0721907c6e4b5d32f3cee4647a78"
+  },
+  {
+    "public": "11b7e285f7c3b649434180882123d6c7580beb0e28aee185188adfe389e89a391dbdd1e10fb94bec55b461bca947ba00a3d2f5057c684222b568b6270f68b626b78b94e1610fa7311f8e0079d034d5c9f1fb5ff5b60b4245ceb36616520174ec3d6e324b462db8f5ac97fab3c14c16f0b9415ee1b518d344420239e4fa521a59",
+    "secret": "05b58fcd30e6adfca19e09d6793e5e85852da3ee03aee8144f33b05777957d566be366ea0d117c48545bbcf47e3c18b593b86e3dba98d9f425ca882fb48963b01dbdd1e10fb94bec55b461bca947ba00a3d2f5057c684222b568b6270f68b6266dabe85760b9017c874dbeaa2b23a2f140133499b07f5557d8c06c5ad9bdc553fa5b2bfb747f517d5391be171f42de59bfd02273f0a76052c597d4fa1f04b67a3d6e324b462db8f5ac97fab3c14c16f0b9415ee1b518d344420239e4fa521a59"
+  },
+  {
+    "public": "f133feb6e1db15ed4cc89dcba8f73f9c7f956e13d07406eb96b1598f7cb613e1511e7e6f6014f68c5f7fa4fcae45c93ac4ee246e037660500ee0aa216261761586f2fdd25a094126d3c489d65eb15d1921abf7249b3850a2b30cdfb00157a1bd15aae3e2fa8a8e0d00312a95a41834161a7f3462b62bfec19766dd0e735d413e",
+    "secret": "50ac5169235e3044d457757e3f75cf448263e153ea046322a5e5d5614be02b8373d28fec8286e2a473ae4fb024470fd73b7ff2d0863bcf93753c8fecea7da94e511e7e6f6014f68c5f7fa4fcae45c93ac4ee246e037660500ee0aa21626176159aaa015c4d67d60b08d50efba795d82832582814783c8f5e6251b7264f6ecbc3a5cfffaa0e4be626d5d98d70f6810106cbcb7223c1b58f8afdffd82112ec80af15aae3e2fa8a8e0d00312a95a41834161a7f3462b62bfec19766dd0e735d413e"
+  },
+  {
+    "public": "81925a0d416195599a6123cd31198951038b7b12882055362f8dd8ba4210de1ba2595878f57efe63afd06c62e816f1480b0ce04e1a9957f2692409d4b05c9626ba05204cd09e90e34b8b042345b1b06cdccb2f125d7cde0517d9c3a1ea470cdd2d07f36fa6bc0a0f47d3d652c815927d97aad285c276112195e24b06f7a4bef2",
+    "secret": "ba8510769bf4ccd538b4fb8864daf1a1fc0b02fa7717b43f3bc122535ce60faf556d768d1a3214be52d0b03f105f6302389c55ab5d6c331c4407415bf494b4aba2595878f57efe63afd06c62e816f1480b0ce04e1a9957f2692409d4b05c962618e3a10e5cbc11dd383ee32be95423a07358edcf98e1e3e113225582fa0b68bf1aa540e8ecf8a06efd076c11cb72d8450e7b2d88a86c146ea2b5acd741cdfe682d07f36fa6bc0a0f47d3d652c815927d97aad285c276112195e24b06f7a4bef2"
+  },
+  {
+    "public": "b495e69c86331c46ea46a0a21b97aad933f9399e73dd794284e5074899328d07bb52077b0b3145f954a959edfdf5359c8b4d90dafd77cfc59f7910237de5ad889503e7a0f8723179840237b439124688741a3d38730845eb180f62d6deca8dba351171079b97001c2296137e7943008fa83f576e8d85fec836f6d1eaeaaa982f",
+    "secret": "ab3b797d235faf3c9ff5686ac65ff0e8d85c11bd8c05c0d88a64c21b6ee3264e90e43031f4ae235e4fee93189655e4670489f11c77cbab1bd32753cceb647133bb52077b0b3145f954a959edfdf5359c8b4d90dafd77cfc59f7910237de5ad88016e9e41e21c5efad887ead459feb367a3a0e280b63aa75f4caa2de28c45907337bfd8cc609fd0a1d75fb4b5d51bae30606da8b8dfa3e0fdea3338cfd125ab81351171079b97001c2296137e7943008fa83f576e8d85fec836f6d1eaeaaa982f"
+  },
+  {
+    "public": "d6c6d8f975950aad82cb0bbcd8bba5193b510e3a6af37f559c98eb666d3416283944182f665d6f83999bcedf9f94ae7bb599bcabfc3237217d3e5d0153e52ccc343973ac2d6f24873a3a76d839ca98726ab088fba860d18c1c22bceaf08fc69764ca7e74e68bb147663983f35bf29382d42a71298a6e393208d57f99f22c76f6",
+    "secret": "235f3d580282cccd29e582b44ded94a89a52d5d686d345f2d3424b69e2a170c8b9f5966c9ee69e221e06a3021eaf6908311abb83408fda36a65dfe223db813a03944182f665d6f83999bcedf9f94ae7bb599bcabfc3237217d3e5d0153e52cccb5602cc45f6fe314aced5bce704d070a117f2fad75f8b9995d3030d357974c39031d0acdcffccd8506c91910d3eecf4360c7d5885c78dcb9cdffb9e4f431eb1264ca7e74e68bb147663983f35bf29382d42a71298a6e393208d57f99f22c76f6"
+  },
+  {
+    "public": "6149f72b82566c2fdd48f2e9177604a9098b60b20c3b3e5a364d10f733611aa8bdaf12f9fc885141215441c701588814a565590b384b361c097bd0d8880dd045bc23537a35f85c8a5355c9a55c691424738809d2830f4a9bf624b06cb6d75cbc1fdc8547dee693072d4ee95c7a756f8c309c02e9c75a407a86d674d463f4ebb1",
+    "secret": "7c1068c543b22e66a00b25b3b04e28811bd95352ae314793d3b5535764d8024ce6b75fa1748a12e1b576b7a45bc075523929b5806d2c5566186e02b4d512a34fbdaf12f9fc885141215441c701588814a565590b384b361c097bd0d8880dd045b4af0fe36422fd029b88b9baede3aae363d9467ebb931c03fb38093909d39a37ef2499ff421a50ad1e52556e2f20a96eef0cab8d8bc8c0ca8f17e86ad0f26c3c1fdc8547dee693072d4ee95c7a756f8c309c02e9c75a407a86d674d463f4ebb1"
+  },
+  {
+    "public": "9c30062855d4593fadc327e951dbf833a7b00ea4da381343f3977a05d7877478a932b905d761f2ecd21caf2c4bb246db49342bcfd201e6dfce93c5c0b90c38b659c9747a8ad70b5f81a16b264cba9a786c21a012e431ce8f700bcce1fe21dcc4b343c813501bdbc0202c9fcd6e9a4644475acef905c86cf7e06c8ea59503d216",
+    "secret": "3c27465f0d1506e805ceeb8426b6d072b4c88f243e43036d26b03bc4a2043f80f4b057edb63e695642ed067aa08f0effd2fd35a3ccea9cacb3778b6a480883a7a932b905d761f2ecd21caf2c4bb246db49342bcfd201e6dfce93c5c0b90c38b669b379629fd2fc76fc485710f4cf2ddde3b289b8f334e50939c525a8b38f735cd32763e4d44daf9dc361652e4e86363ee3f8644bdd872ad57761527d98f57c20b343c813501bdbc0202c9fcd6e9a4644475acef905c86cf7e06c8ea59503d216"
+  },
+  {
+    "public": "0c5f5d35ac7add164f3d2f40f796041e664bd51bc43dc6a2722bdb909c8917a13bcfd5f6ce089b87cafa45074dfbe84aeed15275742e30a1ab4febdc1fed33e19316feb8421c0cd3d2df88d2ca119d785aab5dc8151069f4a14c5675334dcbebfcd69464d3bb52a03221a0e91528e2ae7bc9e57a7214949e28b8d50876c72674",
+    "secret": "a581e0ce91d58b87aa1c6af9045016d5dd191fc7c24d21d9a349ac594856daa7929e5b0bace9010566943502b4e6b687f2f8f00340faea1afc92f9cb29decbe23bcfd5f6ce089b87cafa45074dfbe84aeed15275742e30a1ab4febdc1fed33e1515dc8c7f8cad64dce4fd2ddadc1a2ed948ba5b4d9924e7381ce33ddfba3cc7703cc38ad93a03cdc412d263ceb7c015b66c35a5c1e77eced7b74a52400e68498fcd69464d3bb52a03221a0e91528e2ae7bc9e57a7214949e28b8d50876c72674"
+  },
+  {
+    "public": "55c45d813c01e442ce4eb32160fd215163a9e2922f48b296b80d633ce6497e75d7acdc78b088a68c005e68ae769222598ee14cd9491a911867b900cd5d0aff8b96bda3b2c0e88b2d552ef79472856b569f5a85aedb8c7ce23ab7514c8cb9b3b5b4cfc38eac2b55442709e9e74d49e77b67f4881425bcb99c7c0b650c3717869d",
+    "secret": "87e533f4bf8e5e56c12553e9c7c46f39b9eb9f343fdc268a25864789ec2f192f6e1aa3248be74fef811d0320743958d9b7b31e77fc1b8df41e78d1012a742677d7acdc78b088a68c005e68ae769222598ee14cd9491a911867b900cd5d0aff8b3a7c2e41aa98e4988c911fa47c96e9775b3a3ab1a5db44ea4b4340d3a619ec1b62414a40fb996187b70b645375d4ecfd37048e490d62000cf3927d0478e982b2b4cfc38eac2b55442709e9e74d49e77b67f4881425bcb99c7c0b650c3717869d"
+  },
+  {
+    "public": "88a1f742132460917ba9d0de19f9295e77069e943d550fa5ffa57fd16b18c1e4395dfd57bc17b9dc06a1dbf6f4c1c16efc053ec7315b8d6bf43e16e70b5cac087e692a7375d762ebaa745928f02d5d1998318b05ab97d8333e65838d39280047d457c0ff9d4ea4a2856f7802d1455dc9fb23ad327d4fe0eaca5b6927cf1810f8",
+    "secret": "f8a7d73548184228df32dc2feffa80acb9033d0f66e7f0dee1331360265891e77eefb4c61da09a57c9454d430658fd617443be27c9c800664d1c6cbd24f492f3395dfd57bc17b9dc06a1dbf6f4c1c16efc053ec7315b8d6bf43e16e70b5cac08cab71fff809abd7725082c23e322c6c4a12aca38b087a9f980d1c766fec6fe8392bb773dba7769d60d3019005d4426031d2a15d57dec710fdb2cde6198b2f7fbd457c0ff9d4ea4a2856f7802d1455dc9fb23ad327d4fe0eaca5b6927cf1810f8"
+  },
+  {
+    "public": "e5207a57729aac39d6267d9d91eef6a79936c49240ef83d1d6ce3e0de1d50448255a7e0f93f3ee688b001beb5c256e78c626bd8d88fc8d3c585cc3486556fca0406aba3ce2443919f1b71ae3ad9aec52158d20af41080b2b75fcfa9522ff2fbd38288f79e123558d68f6e3310cd70fa54d3754a88ba9c1e5f03eb376ddb79abd",
+    "secret": "bd66f4737497f954ab1ad19646f16ba6d4a05e299a3f39c030e5f367ebfa21b00068c0542f1f64c8aeb5a63302db87e4b59fb017d8fc08d6d8b84469ae0e2e63255a7e0f93f3ee688b001beb5c256e78c626bd8d88fc8d3c585cc3486556fca0d22852ee0ca55191520193cb94c3657651126b3589fcb42a3b7829a7184f3defe11b241a7df4ea18d7da4ed37066ba1e5e0f2844c875afdaad6ff087ced27c4538288f79e123558d68f6e3310cd70fa54d3754a88ba9c1e5f03eb376ddb79abd"
+  },
+  {
+    "public": "801245cf79e93bc485379973107b9f474240e068c25fdbc8b24b1e2a7180bff77cd91e71532faf9f7610366e3818069052bcd0b692d29a690abbc06ad7178cdcacf68728938c699b07a776373a3cf197fcfb29956b51b8d401ea24c6f801c42ff6ab5098c32ec126958f3bacba07173ea19194254992dd6cb6e1e8328dc0ca2c",
+    "secret": "33e9da4401c1e3d7ffb1749b637b790e019bb3be897e2d4bb62d9ada4805cbca624566422e15cc21186813c3c20b2b756b3511a743964bd0811d2c159ba63fbb7cd91e71532faf9f7610366e3818069052bcd0b692d29a690abbc06ad7178cdc3b18a5fb81150e533d51cc2c3ab28fc323acd10a7b91bb3286a622b2150ff451d0f4aded65b2e1a2ff2007b93cbc338bceab9d6148c636e701866fb3b9affe78f6ab5098c32ec126958f3bacba07173ea19194254992dd6cb6e1e8328dc0ca2c"
+  },
+  {
+    "public": "4758d50ce92d95d94c8e848ac0f825d96ace1462e596cb1a3e0259ea3271057defc21bc0cb245f0e4c8c65033ecfd05f1aaa0979aa283dba2a432ed3b80bd21172780dc515d8f36c341d0ff096ef5488dc90554c597e2c3c09bd5351813424b5327a8f3d9f2822d52ecb236e6aa2280877b1d2d473be862f00b55a4a53b399b5",
+    "secret": "bbb9a8e1de572adec63cf0f444e3185794eb6b01cc4df8bd2dd78e49141b796b28602a0313816053f41395d42af33de0fbd0019f18c632bdf07972fc7acb4a16efc21bc0cb245f0e4c8c65033ecfd05f1aaa0979aa283dba2a432ed3b80bd211ffa96a51f7a88441e1f96b1a79ae298ad272156f9be4cee317f36de4aa0eac1c9ae33554d03c2db8c075269a7c3c3232630f42cc5d9be06dcffb2b9de28e4d5e327a8f3d9f2822d52ecb236e6aa2280877b1d2d473be862f00b55a4a53b399b5"
+  },
+  {
+    "public": "69c9bf46662b91fb5f812fb25816d538198260270d8c4abda4cdfe5d8f019fb1eab4a236847cbb8cd0c5c95d5bbd3c52193494cd0574c3fc8800e9d2ff1ebbb29cf06181b2d533dc7f63c4f464fb39f2725f781e5acac6cb420e77a493e3bc40cfb38a36b678faa1899b46693606f0676414bd3676daecc1ea80593d4b5d4b2c",
+    "secret": "4cd6a5c9c53ccad1de97241ad642eddad8f07ba12c8210c7fb75d0539511c0d449d013258256d6e3791d1649b96ba0591466eeb331878fbfd7440124a4b85223eab4a236847cbb8cd0c5c95d5bbd3c52193494cd0574c3fc8800e9d2ff1ebbb2074fcc3c5b93f2b0f402acaa14cad9fd0d1968f3eedaf0308f5604e451d698318353f1e0b5a26400a549e9a596fc3d4f55f2b5f6333f834cff017c5b72b17468cfb38a36b678faa1899b46693606f0676414bd3676daecc1ea80593d4b5d4b2c"
+  },
+  {
+    "public": "4e7622665c1e827d2deb282fdb3a6a66c5a02bf68bf40f9eb2bc6fba7e8029b2040519f35dbc7ac0cfb70fa86f3348d41f9b94ea46c8620d162db7cef122f9bea160208b3454e05095b3711acde133b31c273aa5fa79a0efa17af2e8aea1ad59b070ca352094b51e5b46f921dec7f97a400298c1134cb01821b370810d5fd49b",
+    "secret": "0ebf0cf1bdff05fbdfec635a0038fd4a0d9eb198b33455cc9c5dc9d9e5f9faeed64cf14e6c0031ff9653991b988355106259349e1f1ae1621fc5f35d04f6ab44040519f35dbc7ac0cfb70fa86f3348d41f9b94ea46c8620d162db7cef122f9be5fed2c554322e89e006c407da0051ddf6c91dcd27abc8532b01cff3272707fb9e55f814499b58be2b13b318bdee849470cd4ece7d1781e7232c7ca15e3608828b070ca352094b51e5b46f921dec7f97a400298c1134cb01821b370810d5fd49b"
+  },
+  {
+    "public": "2b1e8f23bdfe152de7004054a9112fb302779be26be695e9c4ca7bec1c96fad6dcba8a9f4416f19336d36c83e6aacdc61b55c53b5c4924bc87c3fcef22a3651b5937df6df3491728555bdeff5e309fb842d1168183f3057153b4b7e3d585d20aa9c7f6ff1cc517954c9aad9e48df8fd67cd6608e5061dd057c9ce670fb0be655",
+    "secret": "6ba06860415b581aea456e383ecc529db159ae3750bb2f5738afa7fded839e86c6dc7963f978fc8813a245614dc8791ff4237461fa490bc57cd7281d73748eacdcba8a9f4416f19336d36c83e6aacdc61b55c53b5c4924bc87c3fcef22a3651bdce6a089232ecc81b9b13206ab958081b1836c8dc6720d7bad0fe94166c99fc6f3a13f643f9fb278d2242d28d1bf0394abe4da5e4705cf4dd98d80afdb24f6d3a9c7f6ff1cc517954c9aad9e48df8fd67cd6608e5061dd057c9ce670fb0be655"
+  },
+  {
+    "public": "644dae5e2aef883886309554d07d4409d56fa4071ea55273674a35e2ee8b642b833af1cb30ca77796199d7dbf215ef0415ce04bbd2748641f16f34f2fe44ee6d1cf00d649270a0642c7e2d244b80b9057c75575efed1d04e9def375e7b2e4455d60e4b209bfb1e0af94f3676de81c78c9159c6b8f92a938ccbbd8ded99ec91b9",
+    "secret": "13af589641360a792f05dea2e2ee7cae6e67fb63c26eaf6e5949554d396ab63d06bc19d58c819ff1b9f13c9121485dbe8ef1373cf41781e7db3415d7a8295876833af1cb30ca77796199d7dbf215ef0415ce04bbd2748641f16f34f2fe44ee6d68f3933c05bb774859c03745fc2a8926641aa151b3244baf55768506b04cd35ecfc66a484769b5d3e2e498ca72cfea5fe89cecff32d9c97aee22209d520329fcd60e4b209bfb1e0af94f3676de81c78c9159c6b8f92a938ccbbd8ded99ec91b9"
+  },
+  {
+    "public": "63c7abc2ff04ae74eba7f799c2e58523eae91248d785a44d960e4cc4dfc3f557dfdd039db3808447a901041ef08b1c1a778cf787a6b2c0d59714de3cd40bbd427778b3173396a2bf867bc937c4ee6e2083ea2850aa131f9222420531d13501f01e90c868a0e1418e11811335d3347821f4ec68705a419f4539c3057210adac15",
+    "secret": "fe1cccf34217dd3f1ad40989dd759ceb4c39a3c900c8262d1c5a56bbbc9c6545d8bc2a6e1152a687aea3f766d61fddf0a33a5e8c9703b242a739d61f3e3a9d40dfdd039db3808447a901041ef08b1c1a778cf787a6b2c0d59714de3cd40bbd42865b86784834b75cd87f3d438dab6960d689085f3a022dce7922e6493eca70ffdaf2344fb09f04cb387da74d1ace8d5783f4effefa1e041acbd9e8f22da6582c1e90c868a0e1418e11811335d3347821f4ec68705a419f4539c3057210adac15"
+  },
+  {
+    "public": "f903fa3a1d4eb1005cf0099fb8b03b79cafb97b0133cb87b77eca900a354cf14378716f70da45149a0610c0f0510bc67394f81a9073e75911b0dff5a9f5974c616d478924e0c714a0250ecf553b567658950792446ab679d9164d7c5cb6eb0f7c64048769922c515a5864823d9c162ab691c03a564f6163b59a05c1a3f71dbfe",
+    "secret": "0c742ea118d32647e87bb6b8850847ac3ef85e60311169f09b8ef05d0aaf239776e31a5eff390d5b7ba065ff64f98934b28d598e7052bd36aad772c45aeaa6cb378716f70da45149a0610c0f0510bc67394f81a9073e75911b0dff5a9f5974c697a056c3ba8139cc93e351ed7e2e9083b56e0823eeae8c9c17015a25f0e1876d24c8d65963dcfbb5a9f03c7ad85633f6890cc8d2e68f5d9f94e0451576b257c6c64048769922c515a5864823d9c162ab691c03a564f6163b59a05c1a3f71dbfe"
+  },
+  {
+    "public": "34f992dec97ba5c086a16d327550aff41d1b1ea8a5c71811d3d9b1510d96bbafcc72d604102c6c835c362a5b3f45f421ab6408060f7bed572ae030f478b0d80e21bbafd651e704bcb49673574cd414ff24ff34e0ccb7bcc8cd9e5471c178831bf62b4fd168bb31d474c825c31091bd640c5c0df9ee8445a87859ab74d68290e4",
+    "secret": "c1a006e2e4b672018b9566914a35b8e4c4844290a9a068bde0b47097b1e5e3f0459f6bed016876de2b0738f8a8e06a562bc636cbe224b126a736b098d30182cccc72d604102c6c835c362a5b3f45f421ab6408060f7bed572ae030f478b0d80efb5fddb7e4f72ff702e6d4edf4fb1632c3364d6e6f337fd8f2babc4a243ba354a36145df05d8e9c4f347ea5eb3c71d1356f254439d08927b2e33f8106afd13acf62b4fd168bb31d474c825c31091bd640c5c0df9ee8445a87859ab74d68290e4"
+  },
+  {
+    "public": "9a89ca8443fe5cc964813efcca21540ac2bfa2bf05f90b9d974b971df8dd3c78d067b9941beab729f708bae1c788a636a131d8afab523577b13d6803b93905a2669570df28426ba86c084d9ff5f87c6377691f7fb592be7f4cdb56817a64899f5fc16c97ead7e24651b918ec9950316de46eec19f278063c3c93640057619120",
+    "secret": "1faca721681785ccd2476e795c70ab6f8a9057528f274c282d350bf665206dbbe095c365df16a707d6c2605cbae5d6a67d89980284f422fe8949cca1bd1eb2bed067b9941beab729f708bae1c788a636a131d8afab523577b13d6803b93905a2c07b0ee64948d6f17811b5ec9e9eab918d9685466da6fa4ead59abc6f7da46768c3685b4dcc434a6fb0694537617955339dfae5ff0887cf7e6c3b23653a3dc765fc16c97ead7e24651b918ec9950316de46eec19f278063c3c93640057619120"
+  },
+  {
+    "public": "43e46baace1998bcc38abd07d522bfa50fd7ae830165aa4956344dbb8aea5069287ffb8af928a130d95d7116809c80463de8c2e5132b2cb28089f7ec4812f5bd00129cbc4f5dfe40f976fbf254b95cf6a80bee1932327f85a31b5cca12f11627968cd93dcdf024ca2f4b1d034bcf4a0ac4796190b65d737a7d13702f1187277c",
+    "secret": "70c56e8989610520d3445e731e4f9ca50658cf1b9af0100d19de6da0466d7771b4b00588af2ad63a01b502cd8b52dbbd423dbca55c0599e5473a33ad4867cc07287ffb8af928a130d95d7116809c80463de8c2e5132b2cb28089f7ec4812f5bdaadf91ed78c4586d58e5e2ef01a511d3dbc821a66569ebc4fd7855d97eebeb92e986b0da3fcfebd201baea39bc583b8656a723576772c0c2b0fc37ebcd133ff5968cd93dcdf024ca2f4b1d034bcf4a0ac4796190b65d737a7d13702f1187277c"
+  },
+  {
+    "public": "33668c864030570b4f01f1629dde40c65cc38c42b9769de9c4884b423c813ce76c05583bc172f54124d6958f94dd6039efee4d25d806809bc023ad13b7e28b68139db86d76504ef07efae9e2ca6d4238b6bd1dfbbee0bf1d25a7e27c376fce9574260c8c42e06b8ab533390cd5bdee3ac0c3f3fa414f4f4131fa52789708b836",
+    "secret": "1dd9ff8aba14992ad38d7e77d90c228075aeceeca061def1ae4b1e4b3b0bb1daa318341604089d1f6dd54eb132cb9f55bf6b064626b11425c8fcfce68bfef6fd6c05583bc172f54124d6958f94dd6039efee4d25d806809bc023ad13b7e28b68b068aa8bc7825d71854b7489400915e8222ca88d8f29ee92e5606b9555e118ca77b08b512ce4513f92024a7ab534c14a79a99dd7559704673969909d01f7819e74260c8c42e06b8ab533390cd5bdee3ac0c3f3fa414f4f4131fa52789708b836"
+  },
+  {
+    "public": "876b03ae009828a2e45a455ae6ae2002bd8033eddb9a01d0b5339737e383ea2cd7bc6a077fc312fca6844afaf0a29a8eaa4dd71a33d75c1a92f5dbc2a42315dad39542f25c2a10c8082b58827efb7758a862d4098862b92c5ea4fac1ae35a27c8bd2f4ad7dcbd18d5801b86b93cfcb62eaf18a94017635aa38c633015a9103ce",
+    "secret": "8d19943f3b15168ba74448870e489894cdba81d8818006beb2bb3d490e335a0603983723d9514e56fed562ae42edc7fd180944cf6cadc7c0aeb1560d719cf7d2d7bc6a077fc312fca6844afaf0a29a8eaa4dd71a33d75c1a92f5dbc2a42315da54c615ca17618b76e534114115a87f05673eb8f51998da4937628273492a86556c452605f9d9e3d54f59df3ea44fbf1b8d3abc9b2e3928912217e66adeea4a7d8bd2f4ad7dcbd18d5801b86b93cfcb62eaf18a94017635aa38c633015a9103ce"
+  },
+  {
+    "public": "0e33da85fa6d4a34cfbf1f60e5e6681fe2aa2f6089d8c08f3d6d0433a2e6720fdf01e633a44b0707fdb8fb63b630b5b9636a5d71c4b5646eaf00fb04caa0297a61f1626d07fe2b63a727d6137f10ffadb449e9395563e9b004605ba0e61ecc4677b8a7c489e5f1cd801ce8966f1110a9895f9a4f08805b37f1de374d38bd929c",
+    "secret": "35481e62db20172e955eb0ce3abd9c9dd8387323fd940aa683bbccac97eda727f22cd798d35a5245cc03d8547c5bdb0c8987cbeefead33fb6e42b7fe99374f58df01e633a44b0707fdb8fb63b630b5b9636a5d71c4b5646eaf00fb04caa0297a1b4411de0eb4bb067e57ae6197fc0f1d40607e89bcba4a7684b5285a8e8c0f3b0924fa53a02c4e45a5224ed551656fa7598a77fb1730960318ce826accc5eb9b77b8a7c489e5f1cd801ce8966f1110a9895f9a4f08805b37f1de374d38bd929c"
+  },
+  {
+    "public": "8300f563b76a9d120014a0a46ed5ed48f50288ab149738550685c15dba56acf562bdb79171ac447ca50e0e560f2589d2b5eaae1147e88c2c84caa43aade72d78d876d360dd2266dcf5cb26fb6b3e752602075615edd02270b441236fb8c1397668859511c545232460bb92cfaf3335dc28ad883b664c04e4299b747c90ccf888",
+    "secret": "12b339a62c8d561cd367b270da0377c689168de6b9bc1b6df799021c76aa83a18e77a1f08433628eff0eda9fab205bbaeebb55a4e1c0966fbf5ab34576fd8cd362bdb79171ac447ca50e0e560f2589d2b5eaae1147e88c2c84caa43aade72d780f1f1b627679c58eecdf9a2b092dc25d300bce3668b146c81acd4108a521ce053a96a811505c8fb47a7dba4a45cca70d5ac5e99b1da45c9b6f2a9f4b7f2e1d8f68859511c545232460bb92cfaf3335dc28ad883b664c04e4299b747c90ccf888"
+  },
+  {
+    "public": "4fa61f9a41190548ba33876d4f810fd7a9f708422091544f08ce07fb7896bce74d9d0056954088e94dcd80fc0bf447b473c69f0ded8ee56f89fed9aa438fe923c056e7a9d4081b98299c70a8b8fe67aad3184adab903d414668c1ea9d46ebcdf29e238ba11453a34dca8e6d16fa359869cd572535ebb67338ab228ba85739170",
+    "secret": "506e0d9edb20e4be9ae5000589b551420583970af89d2672cee56ba72ae0461b6595589d1d47de1a4294441ff073499ef7505c53fdd9ff54388220db72e91e764d9d0056954088e94dcd80fc0bf447b473c69f0ded8ee56f89fed9aa438fe923dea10bd6dc7ec2d3a15f83e46ce442c3c18bf870e78bfdf9533cc4ac28769660215c09156c8d5a4e81848a8a3cefb6f69bcd34b185aa72360d1b22cfd29c3f3729e238ba11453a34dca8e6d16fa359869cd572535ebb67338ab228ba85739170"
+  },
+  {
+    "public": "c8c803700357ef35f94d09c9383f8bea365b841dcdd60dbeddc935e6aca8ae687df72a85b6c3b80726a5a86228dce1c6b0fc8c4ceaa6c5afa832018cbb173957b4f276fa2a464396a39349aa5435f05ccd7d54c5267a23b230638cf6933ed5e43a24be0f17a3dad257badb5e3d0f8e6eed90993a6703cd814c0aa2beca1272b8",
+    "secret": "a34e37d0aa73555256117a0f83fccff14bbdbdc248a22c5447abb7211a739793712612bd2bfe6e0e786e095b7c31c2ef6b58e5d716cfa1f09a631dac0eae39827df72a85b6c3b80726a5a86228dce1c6b0fc8c4ceaa6c5afa832018cbb17395762356ae14b2139748c340051fc47417943b0784ca57f886e72e4bbac493b21c8880942b2e6c1088ca3ac366fa7cad080a278ceb24cd7cac1d31a618c4debff3b3a24be0f17a3dad257badb5e3d0f8e6eed90993a6703cd814c0aa2beca1272b8"
+  },
+  {
+    "public": "0dacd549e8a0bc93c36667c51c52f1a144ad62de4b09355dd58f24fae1c54329a7d2e64196680fbf71ba86e89b036d9e4b16e3b5bf51510fb7805300783234406ae95a9426c05ef99803daefa9d26edbe23b134c882a1792e514e100fbb1eeb5aea214efb3254618bc4a9941c42c8333a981b3580bbdff04fdd6fc866313f443",
+    "secret": "e1e2b32109869b0842979f076df173ee5e184bc44200f2159e18ba65ace00be45ee743214ebd78e7195975031a0fd08684d7897ed8a5a5c057a26aa19f4c0106a7d2e64196680fbf71ba86e89b036d9e4b16e3b5bf51510fb78053007832344056d48b89858db4388bd3cb3151078df237c8911afebe8c7ad53b4e35fa8904d8c91db503b500309349256aa6541701cf462973f08c77b63f15e1813128efdb47aea214efb3254618bc4a9941c42c8333a981b3580bbdff04fdd6fc866313f443"
+  },
+  {
+    "public": "dc2b66b1c2567be633132d0ef7244005adea9e3bfe3a2e264b6a499697d2ed734afb54a9b40fe34a613685ff4277f9cb77594fdbeed8ce71938db5bfab9dadf14b5f7e2e9f23b8f25425f093314fec83a83bd80d8b558e8e2c7423db17638f0d83f9b440d2627f053f1f5db40b267ffbdb260ab783d4c8850bb6ce0d738b9ab9",
+    "secret": "30b3985edd9c25a2d52156f84f0caa4608c5779ebde0805ed4ccd7c0b868803f336e69eacfd5486ceb59d8c4b1d6ddd59e2ae5ecf96cc291418bcc08033dad9b4afb54a9b40fe34a613685ff4277f9cb77594fdbeed8ce71938db5bfab9dadf1124e5a4e1bb71ba419fc618080e5c3b63a4a772a12b53283c5bac2d4ed160c3f99ca269003a5b685f08b79229bb416b9dc1c8467c9b5c5dce0565d35846bc78883f9b440d2627f053f1f5db40b267ffbdb260ab783d4c8850bb6ce0d738b9ab9"
+  },
+  {
+    "public": "89e13f8b99122558c00cfaf49c33fd062b8891062a07884a20b546ad3ecfcb683f51a339a89610feb3462db412f74f39db558065a8845f8509f8a0b7072df3dc6cb4409670122cab8597d18ba4764ecc4c771811bb939fd3b3f5c844be3f829c0030507bef10f045000968d4ad2380e1f4221577e1f76f171332acf286f6cbc8",
+    "secret": "d594b3a327fa3008c03438aa636ca5ca916c54f91e41cc29b5218b765ef3e27a3bd26f2a1777de20ab11736138f90af8dc5a0d3143dc9200431f982a57b499313f51a339a89610feb3462db412f74f39db558065a8845f8509f8a0b7072df3dc9ed60348c08db9807fb2665a2aaba4d13cd31de597ea9be6ab2935e815c5d07581e4f51acbff161d58a9c602fd3c0e170ea616cad42258cc5ff7da733ed22f8f0030507bef10f045000968d4ad2380e1f4221577e1f76f171332acf286f6cbc8"
+  },
+  {
+    "public": "0152b50586783ae703b3b7db9737b8a620c8ee025a8440c3dd3aacd646377a0277c83b9a04aafcf32fc408a0bfc9b12b4d64cd91654b85fa58ff7712c338d49fdb740817151ab48595e5a44d6b2b15e54399ac85f5eafb695b3bc5aef156bfe6ca60c7b39177ab5e8aa479d0858a863ffc373bd1515d258805f214d02896f5c7",
+    "secret": "4b728ec12014e930c4a0a0e0a6cd9405b593f1dce81af3921c7ee36a9b58fe15975a6935521786cb8ded5c8464cb62ac313070a9de30eb52202aa6f42b29548f77c83b9a04aafcf32fc408a0bfc9b12b4d64cd91654b85fa58ff7712c338d49f6dad0750af26c9d9f598b239571b38d3ddcfd84cd9b572404b605771119b9e4a8ed8a0ba218c4cb6585a43725516a0fa50fa54d6bfc1dc6314437498993caaf4ca60c7b39177ab5e8aa479d0858a863ffc373bd1515d258805f214d02896f5c7"
+  },
+  {
+    "public": "71586987c605e9f30354a5f7c3e928bfa0ade25679b9cd0f607a24987f578aad4c43d29f62a6d4bd3f9fc9bbf93e811a3f8fc2b57bc481656b1f3a9e72820a3af3ae5bb649ee797f610d2442cb3ffd6b285107331cd8b99d5d5127f66b077b60d95492cf3b8a0cb5bf47f329c18dcd42eb3959378f6c1214071b073cd33f01dc",
+    "secret": "5d7a5f599b23983710fe58441d47fdb2275721db37c606dd4fa27921d26fe8d9c4987df171f15c647d5cd17dfc179d0cde6f011f4dc89c277f2b3d347c33be314c43d29f62a6d4bd3f9fc9bbf93e811a3f8fc2b57bc481656b1f3a9e72820a3abdffff2c9cf2416b736a730d00590db483b034223a3bdd39954b9223a9aa6a7daf4fba0cccef1ce3734baf2bd6b443925e55d5828a7791b408d220dc059ec985d95492cf3b8a0cb5bf47f329c18dcd42eb3959378f6c1214071b073cd33f01dc"
+  },
+  {
+    "public": "e5b7d0b33ca7982fcb3ee09686f4564e98d89577f01cfeb3cda6f2db066d89c38ae8ef7214cbb1b069462ed1fcf6b05bb6c4e88f21ec47a0b3832a6bceec6f31e1bd68a797c4618b315380c3b7c84033c9dd95fb6a5d46c1dfea9b586fa06ea2fe088ac967f649ac3062929911283106d0b6e24c49786f674f6fc521bd01b59f",
+    "secret": "d9bcc367ec68c27414b7eb6bf3104365ad421af0c2107f642c5405c4c733451092ec8b0cf3f7ee5d22feb627a99c5801659857a18c61b7a9630693e10bbaaa398ae8ef7214cbb1b069462ed1fcf6b05bb6c4e88f21ec47a0b3832a6bceec6f31531e520fb81c308f19585142cbc512a8bec625220d98db5cdb09b2d3fa928cc21e823376a5221644f92e9a77fa3987edde523ed727258a51dcff0cb6444572edfe088ac967f649ac3062929911283106d0b6e24c49786f674f6fc521bd01b59f"
+  },
+  {
+    "public": "76f251d7caf61ccdad047c3a114d867fa0ea37a3ce09dc4d12542e348ee2ee20d5e6f822f2466efc0888a4682dbd07e3c448b6376afd86129db1bade0f604c95ecc7baa3003ec9a84934f06becc18296a50c54339ce1fb36b43b8ba92441d72bb61b0d7722646a3ad421111d759a98a2cf7774593130247a10fbf6f20e5010bb",
+    "secret": "f1c23c04bfe0d3984d32f1555010228fb60c1f330197c0608889eac10f34e785bc98bda6f542fbfbf52af23b6fd606ed3bf650782b4298ad2e1e3b4d0d97cd24d5e6f822f2466efc0888a4682dbd07e3c448b6376afd86129db1bade0f604c9529cd6cfae7b91cbf147dd58610faa9ac5ffbf21f8f36e0937b38ff98203178c9063184ab1905d90a78e17f790cd0731717f983ff191c02fb61460926e4d11508b61b0d7722646a3ad421111d759a98a2cf7774593130247a10fbf6f20e5010bb"
+  },
+  {
+    "public": "cbcc77c24ef19ea2673deb8bbf6cbe261d6ca50487fd46c4c6d25f9daf4edc09b182424b2f3da7f6c2cb83421dfc10f95ad839bb8d80281c021ce7121c12d1b793a4c735c547b68e4845ccc61365dc779239465e58d287d1176cbc392c2b75f6790fefb9ba1403e7a9ef531f1539028bc78f787e3d2870d1d04ce06c07548932",
+    "secret": "0a309017dcfe9f648bc242696fb8f3af67df8ff5e852e575833b84799fe8aeb84d0aa145cf14e8453013ae155ee1313c9113d3b9113743940cb9be231ee4b241b182424b2f3da7f6c2cb83421dfc10f95ad839bb8d80281c021ce7121c12d1b7a53d74a70de20b69ca3993db4d3a0bf61954663264345ada1413d1fb6a90a1b50b862eb55148c80d6f29f55ecf002e10fc6afc85125aac55431553c9edbfef54790fefb9ba1403e7a9ef531f1539028bc78f787e3d2870d1d04ce06c07548932"
+  },
+  {
+    "public": "9cb4ac1709a8525b98f2e36737c1cd0521eb0d1c3dc6f7e11edfaf5aa74fbaaed381fad65e26f14c94c0ae0bb7233d512cef44c590d71761fb4200ec7ebcdfea0b1a576c281ab780af11ea5d15b6b933ed0ced25a9fc5058e7b79da8f31fa0c363e3816066db090addafbf9b547bf3b4a45e2e1f7d2360388e3262cbab0f49a9",
+    "secret": "3badecfb2c9ac1b26a41f80175a4a2fac659b6e66434bf6afefcdf467e30f3e5d09ba3af9852a8ae0e311ce2483c6798405ff9a2d20c21fbb5c1cc8ac6c8380fd381fad65e26f14c94c0ae0bb7233d512cef44c590d71761fb4200ec7ebcdfea45a44483938ef7b50af76604bb92bb406e0f4d50c7c4d2c35254fb66fde74dd3235646e7b89cebc5cb8a834990919fac4a1bb40e6268c0f05097a3a20ed289bb63e3816066db090addafbf9b547bf3b4a45e2e1f7d2360388e3262cbab0f49a9"
+  },
+  {
+    "public": "86d51864492c3c7083197464775f48806b72f7310f01e3b7f4ef42d8d1faafc0d361bca6a1d305c7e59d629aa93ad1040dc1cb8af7613a1ce0f99a2e2a7e74faab0ffc5d8a2c2236be36c0eed1b2d06ea0019b82689a6de76a7daba0e3606d876b37e7fcf8c10388e8da9fac10a118effe4b93a8ec8bc25237d683d82f5a0e78",
+    "secret": "6adde60865674b4c66019f67adde018dc4aa6c23b8c576eebbbfcd7f44c00cc6e3d24a6b2e31b76d8bbcaab024b76be8d0b2ca5e7896386711d068b2e438d1dcd361bca6a1d305c7e59d629aa93ad1040dc1cb8af7613a1ce0f99a2e2a7e74fa08ee8b57ecea13f16a90c6bffd8d5643fea5c6316342823292740272f6e11dfaec5a6e8ffdc6996461c0d1a3bf300d1b7cd47eec8d37990be28d293e379eef766b37e7fcf8c10388e8da9fac10a118effe4b93a8ec8bc25237d683d82f5a0e78"
+  },
+  {
+    "public": "ddd07f999001833ab723ef8705b7d73e72d7779bbe835b27e8cd7db6a351ed80d59cfcca2bfed4a9684a9eb7d2dafeac7d2a025a64b0ff8c05d2684c513826e6b4a85482065d21312308442394fc5c28ae60db7a27581fec0c8a3d9330c2a78ecb0bb3460b252d8cf2035e4ac3cf1e58559afbb7f1fbc783f5aeaa5be65bfe50",
+    "secret": "0e20c71375664fe12b7dd056c6e4ead0e3f98e7148f763cfc080d7e349be65dfe575f4c7fefef5aa7ddb7dc91fa0841d41ad91e54c4369e33b3ba8fd5effc157d59cfcca2bfed4a9684a9eb7d2dafeac7d2a025a64b0ff8c05d2684c513826e6d2894ad20e71b643bb5fd98378e2299648c470220171e79bd94878660ada2013b169d660a000d16851d45fc55acca4c4ca445aa907bb87b70dbbe80ee06f3ea5cb0bb3460b252d8cf2035e4ac3cf1e58559afbb7f1fbc783f5aeaa5be65bfe50"
+  },
+  {
+    "public": "6fc84eccd21f7dd94e3a25ed1085853e2f12b2bc7403e3c5c01af9e5de6f9345c2b075719e3d8b6b06a1ad216614ebcd19e6fe8123952bffaa57aff896537775dbeb23c03dfbfec2bf97da17088357619a8f5900101b3d50840d105ad03cd7703daed9d935cb2fdd5d95b8380ae52d092ecfa0a630c8ed01a9575dc3a587b328",
+    "secret": "aa51791e2a1cdf70550851f5682b04472b16247834a11289e180ae05f128e74cbe5f8ab1fb77fb07b3f06867a87c4d00fa74c009a1c2714c96a818201f296ebac2b075719e3d8b6b06a1ad216614ebcd19e6fe8123952bffaa57aff89653777509eaccc86d9f0e922f5aa00873541c627a36db6211ac3b5f3d0876ea0d908040118155899efef3e094928e6a1d4058a15b7b30d1a93b93aa734962f64921c6193daed9d935cb2fdd5d95b8380ae52d092ecfa0a630c8ed01a9575dc3a587b328"
+  },
+  {
+    "public": "5aaddecba3c01ce3c03e18dea22c7443b76596201419a3f6265f82866ea760bcabaa5a651ef34121a5e566d7b06373dd509a7bc49ac346b7ab32dbf5c617e9423a1036b5ffaef22595f468e3d3705893c9efb9de86fb1300e1794d43f509292652a3cd8a46b87ecf77e61e49e4fae80116ec6d9849022142934301c7148a8a7d",
+    "secret": "0dcb2f7f4c55f4a7b51acaf7f0bc8f3e3830bc1446ed9adbb3ac28c519675d526c4fd185d1a8721be0e46008c1fb0962d59a0f994f6d52bfa64319bbf07fd9d3abaa5a651ef34121a5e566d7b06373dd509a7bc49ac346b7ab32dbf5c617e942bd31e8e982466c8650030a8d30b007c1aec8b6da632f8c9449e25109d94c08d44b0b297cc0c3dc9477c63c82cd2d9bc969de816e4c6b3fe15da1484fb0ef6a4652a3cd8a46b87ecf77e61e49e4fae80116ec6d9849022142934301c7148a8a7d"
+  },
+  {
+    "public": "45772a0288dac09d3a61a09eb523277252c6b503cdfa2c7e00a9df9b34119f2e49a8deca0dd6cddc8679096fddb1b0e93b31b0e74faac2a9dd57e6f03698460aa737c47c9b24c738e33d43f4c26ff0e0fafcdec5977d78e530a95176a69f6a2e151d9f855ac01755765b18fdef1944883c5c14fd62da7125af74ef30a8ad687a",
+    "secret": "e75f8a00f0a91374f47c87a145c05745c1386671ad1120d72a1f0b34663909a6220aab197257d29c6863441a038a796a3b3e5ebc189227af827147ca9410c54d49a8deca0dd6cddc8679096fddb1b0e93b31b0e74faac2a9dd57e6f03698460aa8eb265daca58cba6b726eaf748d345885c7e41bef2af7d46d2dc7b08c21badf5a0bead6d46a8b3671b68d9535b3698c9dd13b98c0530a949d717689ffdbdf0b151d9f855ac01755765b18fdef1944883c5c14fd62da7125af74ef30a8ad687a"
+  },
+  {
+    "public": "c759993fbeaaf2d46ae638201f12435b7a6afde750145a35725460481f47a8d11b7fb030f0f3fd08c98f0afb3f421904167562008cea3ee76821302afbba61c3372e85fcecf46f690a7b9372b9e970e1972139e489447a829072a1b6e94ff86c63a1f13b18747074d17713d7d44874124b57e74fd5ab13fd26262687bc2cbb87",
+    "secret": "cd1f34ff8c43493cdf870af655e3dde2d53234638820311bdb0906d27870195cedd1a576841ffa5bdb85e76be113b449b08c631fe9a5ebf4838a522d09a2dcd91b7fb030f0f3fd08c98f0afb3f421904167562008cea3ee76821302afbba61c3f9eacd0cece754a84738f081c6a80ae0c2612fdac9cede9068462a85955a51ef4e0bd147f98d516306c32ea5cd6d5787cd3f135c27b5cc9f28d2e6489303260263a1f13b18747074d17713d7d44874124b57e74fd5ab13fd26262687bc2cbb87"
+  },
+  {
+    "public": "844939f9313918a4b883fd9dbb82ef8c6f3a32951d0cdd9750eda3ca7005f04b9fbe8e9584b215a215bd384bdf2ab3301920bc1ba84df11f94991ffb61ec859438af08fa798cd782fb3b249ebc6780a3bedbc9cd74b0ba4050be4c3cb7f4587c26cc1f878687ce05c8c2b9c1826f3599a944239c0929f35c311c624b562dd1c3",
+    "secret": "6d115a832c252f85f74525fbe3fbb423066ce0114ee8694f6b3e16bf2097bd50c2697c1ab668ec35338aade1f3944d50cf7bf77ab69c50fbec6d3d390d4182679fbe8e9584b215a215bd384bdf2ab3301920bc1ba84df11f94991ffb61ec85947666369bab70764327a5ac9b94d609867f0f5d43918779e88671340b5a78bba7f3a59d95e56b769793a669a23d87461c705a681b89db5dba4ee35e0783c2437a26cc1f878687ce05c8c2b9c1826f3599a944239c0929f35c311c624b562dd1c3"
+  },
+  {
+    "public": "716ee445ddc1345e718ec696b315a6aa1e66d8363349341918dd30e75a86220a773f608868d1d5edfb2370fb55e18b67a18c0d299d838c5192d74a29b32f76177c0f840bbc51a89f15e29c479de8b0b7ce339ffe9bc71274bafa6cb8bb0b827c799ea74ef03eee8a8bc95c75fd0c814612365b4a874bfa72584bb909f24475e7",
+    "secret": "757cbcd3b4ce65cab1443b051f948f15477aa701bab5f0fe1f9ad4e2e3fcb0b7c56dcc71149743649e3f0ec9615c44ed130454e3021172273339e0cf8f6fdd63773f608868d1d5edfb2370fb55e18b67a18c0d299d838c5192d74a29b32f76178ea7c007dca16ad747c5f413bbc890477ca485a58b7d0f7a896b915a089733dde46cdf47dfdff34db89038b43b41a09c9f4ea9414a6a457350af0db5a048e6cf799ea74ef03eee8a8bc95c75fd0c814612365b4a874bfa72584bb909f24475e7"
+  },
+  {
+    "public": "833fe26cbb49c8059432a66a8909bf2a2b318740266017a06132170022f487707a66c2b2b769502ddd6f4d8eca29878cbc600f0ec7170a4714b4d3a87c816e25ec1c6660a7471689da122f93ce57af2d3dd545c5b1ea969c225119ce5d15292d14eee3b849a6a3d0b14cb06e43c2a2190c3b334385d35a2ed39b2801905eb51c",
+    "secret": "0965a8f47d5780c573f0ca038d7ab75354b5cea6d88d4406418103fb9e56f638e639f6bb55293cb1badd9da118d67c5a2e957b6735324601e04ef28ce3c142087a66c2b2b769502ddd6f4d8eca29878cbc600f0ec7170a4714b4d3a87c816e25b77d0b264578f8729440f8b89a9b175d667fef1ea23dc5698cc98e367ba2126cfe8f989dfb1362e533de018e996098aecd60a18f62d40167516cd48acb5f47be14eee3b849a6a3d0b14cb06e43c2a2190c3b334385d35a2ed39b2801905eb51c"
+  },
+  {
+    "public": "1af75a68f3a5799c16a10bb91c62d29642f3154e061296d3d2bd6625c6233af78e81f0f71251bacd60f60dd851db139e81e3f0fde34bdd4633c6168c20a8573cf37df5e5fa6f4739e878fef17a6cf99618a752e71f6a66a5a11dc6d5203a0bb41a0b419295d679c46c74d5d98c49b195dd792a830466d68edb016f8b57c3ccb0",
+    "secret": "e2dde1e54e8971164264e3ae7d1e7ebc177f2e76a09468ae7cfeb6025406e4c52399c86d4d1379dfc60751701a473073128073091d9ceda7613ae6de40fc7b858e81f0f71251bacd60f60dd851db139e81e3f0fde34bdd4633c6168c20a8573c2e27162406f53503e981dd57178e0344d8d9b0950c9508d5e9c915e29f9db78bdd57440680e673b8bdfa0c67685ea955f92204dab73033f491e7554f429ad75c1a0b419295d679c46c74d5d98c49b195dd792a830466d68edb016f8b57c3ccb0"
+  },
+  {
+    "public": "9fb67edff2ca3a35984024d9c5d401e50a411c9c17b00c514341bff987e1af4da18c003514b9fd5fdcae9e763de35451c718fcbd34880d367826f02a3e57d66cca66d399d12d5df14f38ff559d16f14f6b372ca1bc5d19f62c8da11c99dd7b39cf6a3e67c3f2383649738dc8359df4b1133bbdb2a4c57e69111c06b0b584d5f2",
+    "secret": "5d389ddf703578a6c58985a841a12a868afc8bfe65803a755b027be8eca9fa61f12bd6c24d9501b36269783b19640fa81bd107455ba5cce9097783e962061dcaa18c003514b9fd5fdcae9e763de35451c718fcbd34880d367826f02a3e57d66c6f9db08891f4ab08b87c372f8d2e8c015d7d52ffb70c0c4ce1a92aa4dd5c6b973096e562b0bee0e7368dd1c22a75fa3b2045fa59688b610558302005c54aabcfcf6a3e67c3f2383649738dc8359df4b1133bbdb2a4c57e69111c06b0b584d5f2"
+  },
+  {
+    "public": "24c06a8d48601668e8bfc58f88b297985f4c3b2f9c14a6e7e7c94e9154611638207bf05f8c19474752ee3017aff110d4af3a0fe4107bf055d9695f8562fcaf4b85ab0ec381d52d460dd5e3bc9f7dd0344e4ed996de995c401fc5f2ae6323e1b4ef9bf3d2d4847d58870d19b7e24da1ee9c5b9965938d5cb80f4f662c24cc5af4",
+    "secret": "cd84eaf61e184df2b9adf09579c8d23516cfe97a37c9833ce57faa77c74418b77629b11d0a60107bf283c48b29406575ba78628af0d4303270c47b0c59896b1c207bf05f8c19474752ee3017aff110d4af3a0fe4107bf055d9695f8562fcaf4b74e97dcdcd56991a953291712db9b303c9c52ec541b1dca9eaaae93775247f14a084ef393de710b432f44fabbf7cfde2d81fe67e3f508a997f22503f89f90f90ef9bf3d2d4847d58870d19b7e24da1ee9c5b9965938d5cb80f4f662c24cc5af4"
+  },
+  {
+    "public": "cf8a812888f6922061ac869d3f03dce721d086ae4f6837f6c12ca0b656c9e6eb5af9d15354b07e811c95ac0ccc91c48928a2f103e6c74845b4aa24f40f09894ab5e1255658c105c3e18edddb9de88854ec6190d52b14abbbc01dcccfedd2999b01e001de7299b1f54f2e8cc2a7edbfa7940be1b73ce31136f14d4dabba198273",
+    "secret": "9f1f26b96721e6d165e8635b6bb61e200d635a588fa76f7892c05d306b40675199ac6119e5f6b0c87c26e81356005cc6202d3a939ae9264ff997f829d7950a395af9d15354b07e811c95ac0ccc91c48928a2f103e6c74845b4aa24f40f09894af99181387d1e06f73863805958bf1edd15152ae7888e6981db7c80d129006e843fbda4b00fae22ba08bbec56e847f3c63914aeb6f1b575b39a4e751fc4b3407201e001de7299b1f54f2e8cc2a7edbfa7940be1b73ce31136f14d4dabba198273"
+  },
+  {
+    "public": "df20caa4575fd9f3a2f853aa0bcd95b6aeef7ea8537b755ab4a8f78b825435beb211a6b799c5676cba13f35aa3aed7e962814c29b240b2a78470e5fbf6c2afcd9417b6d78ffa36ecd7074a0b39fafd99d77014553566c53bc471a28bf3709e4e362108a8c9e9394ef255c9e6c202008d4d9e553ce4e494c8c25cc0d9c7854725",
+    "secret": "4f5888439a742314fdcbdb3bdc96833be8518400a3d4e4c6010c1ac68bcd5606014a884ed0fcc713c85e347b71ff352f39aeb9a3eefbd62b2df3621d02b6c927b211a6b799c5676cba13f35aa3aed7e962814c29b240b2a78470e5fbf6c2afcd6e5cebce031610396e4056e15131d774f20a4bcf3576a7a7f8679a65fc6f3d95345f8859aedbf96d2c740fdaf4e124bda56a85f695320fcb99d6ae0443b1f501362108a8c9e9394ef255c9e6c202008d4d9e553ce4e494c8c25cc0d9c7854725"
+  },
+  {
+    "public": "e70e8759c46114fda94e9170a8224995ddf6c53651931f17f02154cac30973ca7ca728de96906bb121af975afc213b609b86edb25e7ef29281de7f78262c69fa90ed8df2f7db293c523c1a895a7e67a17cece1a727d52c510646118addaff6a457007ffe08546c16a626243ebd16ded0a504bcd7d12d35203f2c29ee0abf1d9d",
+    "secret": "1e5a457675f555091d200294bbb1a17b3737b060c762767e7d1059655fe787b6e55bd794675f43748e5339d982364db1d342c896319a56fa39dcf081b39cfffd7ca728de96906bb121af975afc213b609b86edb25e7ef29281de7f78262c69fa938372cc9e48eaddde6da8b7b62c109eefa96ea96f53bc3cbdc07d57a28ada6612000eee2fbecd2e67baeaf41a7d5f9a66dc7355b4ab54b379d9ed35614287b957007ffe08546c16a626243ebd16ded0a504bcd7d12d35203f2c29ee0abf1d9d"
+  },
+  {
+    "public": "42bd119e805433a0fa4974cee2b9e10dc6f200f2f59479ae29bedb5ca60cd9b666f61cb4de4c64a0e2016617989398852b98a06a22a0da050c8c2764d13300a4174787cbaa34beb33d2da8c229eed203d9c539947bdc3c4b095f39f96ced7e28ff3ad9eceacfd5ce4e4a0a1c1fa2ca40f914c733138d04838e66c1bf2ffd0ae8",
+    "secret": "aeedf4bc4ae77e4e576f66dc5cd9fee5294c657e3b621b338d659c3d26a134802efdb9ab5646c881b67b5ce38e44359fdadee58f97c851ba4a40dac71c760f3966f61cb4de4c64a0e2016617989398852b98a06a22a0da050c8c2764d13300a4f69ff9f59fd862c869439b2f38009d6ccac8d61beebca85f8c2c708040e066366affe2103bf7bbefa6045523927a919d834518f2cc1cc8510a24f994e3c7b809ff3ad9eceacfd5ce4e4a0a1c1fa2ca40f914c733138d04838e66c1bf2ffd0ae8"
+  },
+  {
+    "public": "4ce4df8eb2793872c83b82d154022f73e8425b2f26c44c4fcc2637f0a90e4109124690540c8fcd211698a21737fd51a529516e3f4c3d54a817a92909845499b123e3c163383b883728f5ed98d609a0f343f58848f95cd1f3821b2005078df68ab5f706c2cf5b5c41107ed2c5c2eb74cf5726c4b7a929377b16fbea29c5c0791a",
+    "secret": "e6e8196532e0165ec13f40b8b9f1c4aeca4ec2f89655710f70e32e6c889ee39bfac496118396e053c5cd52391776fd3c8a5a13798057e0af789a7a542c05c038124690540c8fcd211698a21737fd51a529516e3f4c3d54a817a92909845499b1ea2c71a4eea70662c8bf46f1cba2ebdbad1bc1459f2d4409f6552b891ce5ef82d058b67b9df823c10abceaa87c3544abf2818005f4fe9653eab6843bdc7a7805b5f706c2cf5b5c41107ed2c5c2eb74cf5726c4b7a929377b16fbea29c5c0791a"
+  },
+  {
+    "public": "e91933f048e997d01ef67a3f8aafc7d5c9b3ad65b665a93300ab542a3e0a39b5db93642d6eaf48478549f67a4880ec86b63bfa4bf6deb9de18712676a5eb7513a3da87963bda01bad95c411be653c538af63e9ac9c8ff64a87366674d227efc3e51363709b20dcd26bf0c308f3da47b6f20a8b9961e41933bebe68877a8be600",
+    "secret": "8f15fed8f777391300125d6958650c3e759d0d85fce8aa930b927961bce0bb3e5f2a0c76b10a9ef908a73d6d5d78c42018842ad23652b6b92aea44b743d926bbdb93642d6eaf48478549f67a4880ec86b63bfa4bf6deb9de18712676a5eb75138eeee3220b3094d8f40b248c6c1bdf5f66e7d7820a205182f58a302fe70dc39be27fc3be89f44907e6194e3af7ab832c5743e9f248f0eab9c99533fd65c7b590e51363709b20dcd26bf0c308f3da47b6f20a8b9961e41933bebe68877a8be600"
+  },
+  {
+    "public": "84b18def2a7be6966747e6aae29dca39df40fd053ebe8bd683637bd1e172892dc6b926eca62ebadd937c8ada89763b3d40d98ac657d67db33baa093de43ff95a9f7f1b5563d6f1813ddbbffe33617875bfc1a21a1bc24ee4cb75aa3682b2df0570811f63a24931a754528b131f6022d19769b8f18a622b6bc0a220169bbac90b",
+    "secret": "3e9e0d029514e6fe2df5d40171631fddfd490f22825b960780e8f3b2dea5ec3db9c36ff7301574c1fdc4b8b53b21595c5e6ce1fd6355274d7aaa26ca5bb22277c6b926eca62ebadd937c8ada89763b3d40d98ac657d67db33baa093de43ff95a8e1c9be2cb236b0f17301f97f6e0ff4d60b869848bbc1e57fc5ec987db8ff0a1f2c3e79ae4534425d9cb90960174a3471a31170797beb8b80be5a0093ac5ea0870811f63a24931a754528b131f6022d19769b8f18a622b6bc0a220169bbac90b"
+  },
+  {
+    "public": "a6c980dacfd44deb811ac87788dea22217d211c81ce226b0912f73df22101718ec882db7e2cf67e02e426afbef4cab2917c83759924170027537a2d384228c94142f719c0722a5e245df79d562c302b7a13cf63ef348123a41ecf1eab2d77f6901f9950454ae73ba4b22774c53b9f7352127de1792fb0454994ffc953c0e357c",
+    "secret": "144599ceeaecca70d53b89b15d2855d82c93d980453727e49cb6c801ca228fbd6affa91de7236844d6080afffd61599d049a77022778d81eeab20625ad7bab4aec882db7e2cf67e02e426afbef4cab2917c83759924170027537a2d384228c9478ea98da91d9d145b378ba88effed2796c223c7868debce5c1d27586630e8f33dd8f9d431c3c12a75e153db14fefd1ece67dd9e8ec94844cd571f8739e034a2f01f9950454ae73ba4b22774c53b9f7352127de1792fb0454994ffc953c0e357c"
+  },
+  {
+    "public": "8944af814dd87d1c32277571d7a46b822597269abc563bf62a5835b2f34658fc5a8c43708a4f53c27981a40b0040117fdcfd644e773d3a65db3f58618b25220fdf555d62cf6bb6cbb6dff78408026a67f0817f42c01f02116c2c10cab18b2e45d802a3b5d1354c090e5b20cfc80d8d40892268d277c5059e0d04e600bdbf37d0",
+    "secret": "5d053f7a876fbd2d0e13430bc4a88b13c2e04e9e6157952d36599e41c75d8d1122867a4d86d53ca21925f85fd062cc120165c934f032bb0dce550ebc722f52ae5a8c43708a4f53c27981a40b0040117fdcfd644e773d3a65db3f58618b25220f2ab3866a9a34bd7033f7e152d05c1d4be63f1344e5ea88a4ccdcda09c89e3a8a4c094df855a69af56f56e4c435c5708bdf328b8018b7178e309af07ac6125a1cd802a3b5d1354c090e5b20cfc80d8d40892268d277c5059e0d04e600bdbf37d0"
+  },
+  {
+    "public": "f7247c6f34497e3d34cf77f251bb9ad14d636cc5ff4d577b72a6987834f4a85ae0357fd1f0ea8ca6c2c75ab662a74ec8771943106f7743c31ea0e28b4c973ea7c0d9d7f9bc2c1ddda5d0dced09fdd68859771168d06e21375b42140124a7d1d69a0d2c6f233cc86d9f9ed31c9bcac00936cadd62453ea65f083ed65ed0b52a9a",
+    "secret": "60f04b921aecdaf7aab738f068b519b3a9af0bc9f45328d7bbd781c3f5df77b540be4f61d5a128e34ec62626413c9fffe7aba415dbca5ea81b61727ef2407e98e0357fd1f0ea8ca6c2c75ab662a74ec8771943106f7743c31ea0e28b4c973ea7581fea29f04ac029a67522f421435ec0cf5c37fec088e00c2ba3742afff5294a61df3ad71459d2189acc33d21f703ff1b374e081ff792bef74c5bc481c7a82c89a0d2c6f233cc86d9f9ed31c9bcac00936cadd62453ea65f083ed65ed0b52a9a"
+  },
+  {
+    "public": "5dd6d231db5c0da05012031015a6491656d2f23c3b8a0e5b4fb78af58e555f1a78d7b73010a4a1fbb33077d4c87cb8332365eb9ac3ce9f696f3adc42419a4c8807caeb56ae68e5c9703ec07132946741bf819029a8883a6917225db9e7847a246ca3f4027745a3e790f5cf5a21c1650a68be15d8d5a478114ea7082f69f67612",
+    "secret": "8ac7a957b3f2b0c44ef470c3f2cb56018be012ecf5a4e6fb94f0ea38c3cd695a9868cfab572d843ae3f886ce0f45b9150fce4ce13499ca42c8772821a24cef5878d7b73010a4a1fbb33077d4c87cb8332365eb9ac3ce9f696f3adc42419a4c88771dff551b57908959e10c8a90e7dcf7ad138cae6f0ea20d905648755e3218eaecd77c5c5033236fcafc00ccc7148c0f1d34812e0e68dc76cfcb8c5a6a8cc0c16ca3f4027745a3e790f5cf5a21c1650a68be15d8d5a478114ea7082f69f67612"
+  },
+  {
+    "public": "ba3278fd51e1d771d0b352d6a94171111a745f6a4990ab571f00fb886cab9cbe8de4ef33a1f695c67999013101bebc5f2bcf3628d8530a410e758242b3ef3685b4cf627536f523ccebda770763dc005ea7fae7bea5e32d0d66e0e0c6dc6ec046c08762355260a8d8618697b5c846c05b7317ea68514b348bc739874ddf16e2fd",
+    "secret": "49b910776bc79dee73ba91fce8a06092c07d715c5c238cbdc50bc45118eb6d2f34c8bd5472fc1ccc8db955016757ed3098d1f3f3b2d98c80644f1210cc08dd178de4ef33a1f695c67999013101bebc5f2bcf3628d8530a410e758242b3ef368525cef43e317d2364d5d91a23af317b96411ad9c416c4af6b7d43125b77e7387dde35ba8883835a5ff8427c21a9403f6bf7deeeaaade70bd7a515633eb6f197eec08762355260a8d8618697b5c846c05b7317ea68514b348bc739874ddf16e2fd"
+  },
+  {
+    "public": "77b9083cf6a3fb41c52f7fe684f8b88137236531117cac0775f88edf5111f8c4ab60d7b1357a66915fe85471f3b4cdef9189b30f0eba882395d5b239250597503a88654103c4d036549a22c0c22d5c419de2a100ceaf60f2ceceaf124dc4a05d34e01857a82f0ad230a2089e69132ce0efbefb68a6adac494fdc21fcb460527b",
+    "secret": "2b55dd46260788dd4a5b3b8688ae29841378fa46936cedcca5bd4449dea758d03dbff4d2a52bbfcab4da4437be2c34f9df9b7f2d2f7df05f4cc6a3fca889814eab60d7b1357a66915fe85471f3b4cdef9189b30f0eba882395d5b23925059750e87fd87f753c59edc4f608152130f5ef53ed86c9ccbd488f6fe886358bafa4ee297f8cfa9acab126542c2b9bfb2bcdd0735b74d307f4183aedbf274f4e8eecd834e01857a82f0ad230a2089e69132ce0efbefb68a6adac494fdc21fcb460527b"
+  },
+  {
+    "public": "523ff71f40808cd2413a0f97e2253fa1cb1a81b732fe966aa9cf4547a1698657ef847e3388d9aa0daa63f380a2df0db7238c772c629fcce998babb7cfcf9a9300d5d02998890992043540ff00894731a75f6ca423400616b0ae37524ba0f8fb304b390cab0ab71a4cd0800d1883cae6cf685484f211175b2de1507a722e5ba42",
+    "secret": "248ecf80c53509120750eb550cba9741a75c4a59ca90a4a54ffe644c437a0298d8acfeab9a61a6f193cc0dba457deb9ac83fa74a7d1b83ec2ce89ac9b856cb67ef847e3388d9aa0daa63f380a2df0db7238c772c629fcce998babb7cfcf9a930cda7c6f26f842c94e78fc25683b41938da947d7c7376cbd8d2a47ed670b82138d6c324d1c457fcfcd37ffadeb51ea814cc005111692879a0ceb982b8da3e6fc904b390cab0ab71a4cd0800d1883cae6cf685484f211175b2de1507a722e5ba42"
+  },
+  {
+    "public": "6b69538dcd7f0d860428809dcc236ca7e926955bb110b76a246028ea323f4bbe8305d737a2c7d6d31c15df9aca2ccf3318c441f3c38d031680f9e1e9f330fad0c34846af9392cb1273f14202c9b43350e509a8b3d93d0b100f7824beb49216e345f8bf447cb927f3aa71e647252b0be1caaf7ddbd53c55d6570781ab5b6b734b",
+    "secret": "a07786da330ce3af5277ed7df85b2ad2f0f0aeb572d967727bc0e4203c9ead6190b500b8657a619af5d7078fb1247ebf08a8af3a26d6ab31a67d262076753b308305d737a2c7d6d31c15df9aca2ccf3318c441f3c38d031680f9e1e9f330fad0bdd5bd834a29eeefeb6cd0710aa33f1c84c658e739a68c515b02d249ab621dc69725e2c88cf7ef5c44ef29a5064c526e2adc09a1f8c9519b74eee581b5f628f345f8bf447cb927f3aa71e647252b0be1caaf7ddbd53c55d6570781ab5b6b734b"
+  },
+  {
+    "public": "ac7e1bbd2678499390661235348beccab2a727f1c13821b0ad9b017a97248f34255b93bded6516b30d8ee05b8f7d74bb28be2ea836602ee828d51455340fc5797df3f3bc7b1012e9b32aca86b632b02dc6d414bf24f11e11658c4ea00ec0b3a0cb36fa41a62039ddaf95f5f0834670d4aaf70054e9ef1b9f77ccfeae23f95ee2",
+    "secret": "cc5f877036f507111e99b59d05c837f6fb90afb3e9eb7461e7dd2ea3a8ce3bbd89a54bfe285957fc541e5d9b2477cebf9fa243c491276c5f733018f07eee12ed255b93bded6516b30d8ee05b8f7d74bb28be2ea836602ee828d51455340fc5798f3823fbed59128ec4e657c1045e5ee9716a2716694c4f5321b11eecd8ea214c381f3838d1cc8db9707d5287536b77212dd89b60bd26f9858f510647896b40bdcb36fa41a62039ddaf95f5f0834670d4aaf70054e9ef1b9f77ccfeae23f95ee2"
+  },
+  {
+    "public": "f05ef3d5507f81804e7ec32ad1e8e2b050bd5421d1c0a9ea5465ae4ab6a1a2a9238aa256ad2f81439feb3dab55296bbfb164aae2888031b783fa30dea167b43e255a8b2bb7f51d6c0f6990ce2c60f16b7f50a82ffff064fda7d9a5a228fe8f1abc9b5dfdefb44188a32c892be615a0e469a7a9827d29dd9e8e5b466b90181c67",
+    "secret": "812f1bf6b1b59fd3a300b0e7a612fc2fdd3af69d95e6727b98903e23a9d194ad1d37f173933d6ac386f8b634015c589306da8579829a922ce17821191579b061238aa256ad2f81439feb3dab55296bbfb164aae2888031b783fa30dea167b43e347b6e8e6f9e11ae0cb4551d1c89f894e0afefd2fa229c51511d94eebbf7c76d25f87daf739c882f1dddff8688da7e7535075a747ffddb2994be0e621bb6d172bc9b5dfdefb44188a32c892be615a0e469a7a9827d29dd9e8e5b466b90181c67"
+  },
+  {
+    "public": "4c8074c3d5d0dc11a0b04edcb77dc1d030e6d83e074ce553f98d835f0d37f40bf4b35ae379988de0bc718392f0c6a314fe087189bd5062deb92d98137ba3731b786d406c5216c220d26471bad59161316e4313376fe68e9ba3d3bde09de70cd6b19341419cf9173ab7f79030e67cb0a3e0723f4f7b21784c3a5ac790a838af73",
+    "secret": "c188fca3332811db818d001dfcf62b30bfdf071fed434650e9b7cd73b9bf5202ecd5087da2027830fcfffffc1b0418098337fa10877d436cb9032b793e289116f4b35ae379988de0bc718392f0c6a314fe087189bd5062deb92d98137ba3731b28d93797ed9a144421f7dac634ede58619090d96470e974c8f1756f69a4f24fc10de079756438d4652390f6ccbbd70a90b3981fc3b28ccdc4f14f648966c9b4cb19341419cf9173ab7f79030e67cb0a3e0723f4f7b21784c3a5ac790a838af73"
+  },
+  {
+    "public": "e7aa2af5889fc0fddea1f432263bd4549e1c235778c6b89a4a31b365d3cacbc671b02788204345100d5a938fa0682849a215cce6641c7ad7cb1305586d628264f0c0e69984a3d8d89522b8da4bb8e23e0caf4ec329bc8bd1cffd4d64a5ac5dd084969231b810ab0866cecc94d93bb8cd4447d62dce3d28c98e0b9daf25f218e6",
+    "secret": "36b23e9801c047e2726c4b6662eb1e98a607b549b19cddb5fd03a812b822bf1e9432b8f8563707d6755d0af92db0cbf1b29f36226a04d57fa54b5a950544469371b02788204345100d5a938fa0682849a215cce6641c7ad7cb1305586d62826480df4ed63a130414545bfdd6175f72c5fd01187eb7c5cbe51e4a812cb438441def797400cb7b069b327a43a7dcc91fc9c960eea7670b983f4fc8ffc4836d41f084969231b810ab0866cecc94d93bb8cd4447d62dce3d28c98e0b9daf25f218e6"
+  },
+  {
+    "public": "9ef075b540f0d912babb4bded94a263c02b28bf47123526ddb48d3df5cc782d0061f86228a0f0dfd61b7d675206c3b38f334d661362eb2b7097726c22645d12eae28465873d3ce8e231a79d5ad368af48f3524d236a2b962a706aaee2c192275f2c4d9e2d5272335d58226eabb70f1e14216c4fa860b6ebec76f3b2efde36b3e",
+    "secret": "cc6ac382946ea60932a2329d302bf853471e2278a2c29240dcbd76bdd45d3c59e7651b83138e1d8f4c820dbb7097d4e81ec92fcade7363114ac4e133bd0428f2061f86228a0f0dfd61b7d675206c3b38f334d661362eb2b7097726c22645d12e40cf7fbea891df8ba1e7222ba744d0f9782e234ef5f4e8b86ca139c6a2e256ed992b938ed098f1143f21977a5a053c3ab3230197dcc0868ad49b55bc30524d0af2c4d9e2d5272335d58226eabb70f1e14216c4fa860b6ebec76f3b2efde36b3e"
+  },
+  {
+    "public": "c7a964c96b33151d0609713b2faaa436f3934d29bac1762c5e6af7b8e3fbcf508f335c1f54cbef0d14645c226cf1704130efd56f328f48d2287d49cf30d2965fec7de2204660a3ee726db0f907f2f3e31da3c6ba00388782e0ce5c48ba4a01f45ee0176bfee1b5b88ad7f9a4558f3166eacbc621a21dcc29be06ad8124814c16",
+    "secret": "eb15c4c1a3c2d51ac237a4be2babe70eb9a40de9322fbf2030851a748757558613f7a35d861889f176a4c3778cc35efa0dd52ed2190f26dada3e26e09054bf1e8f335c1f54cbef0d14645c226cf1704130efd56f328f48d2287d49cf30d2965f842de026a36c270edf74e43ffd0d3e02db140f88885aa32b56291f45e84ff2c5322b7a21aa42a8017dd08eb3b92da8980273c29a4cc121b069e3c8bfcc7256565ee0176bfee1b5b88ad7f9a4558f3166eacbc621a21dcc29be06ad8124814c16"
+  },
+  {
+    "public": "4b85184148287c09cc8d48b6abbf171d9de09ee54d2fe6f104e7b9f2cdffbf9329a2243fd3562c20ffb970a22fcd7a5e29bcfdf82e71d0b38dee8aff2a3d4d743c33ec177013ef495cd554a58b1d3f2ad0382ca6eb13052601f8e8c422ee3ca6cf86cd3311992188e39b782db36efd274de4b910e0a128dbd128aa4c416fc38e",
+    "secret": "4ee307bcd31d1d031032b1f37559c3acc3d8c329dca872087b1792f58fed9633f2a446da53fa3c8294bcd9c4ac068215e48ff9fcf711543f26a60381772cc38429a2243fd3562c20ffb970a22fcd7a5e29bcfdf82e71d0b38dee8aff2a3d4d74c05356711d6bb940cc25c56eca778fda4cb708df35654ef32fbdad17ee2d74ae7b3dc3653f843c090e5bfa0fab1cee2d57cabba2cbadd11133c14c3cbf4f0eabcf86cd3311992188e39b782db36efd274de4b910e0a128dbd128aa4c416fc38e"
+  },
+  {
+    "public": "86c06e6060003aca1b8fe81b0f9a422b0c6260482500b4094ee543eb5afcac48fbbb4f7d1aa6601f52c2d3ba9d7a2abff7dc922461ad0882eae91c6bff8e61ffc4155546cffd160de27a135f249b9c367490eee952104855e3899979e7faeca1172b3aa674a8377722eb7a4e991705f4f1d230553d65aaca70b02058ffdd8420",
+    "secret": "a76072d7236285e82b5bd8b786291c0c2eb1c130f0f37d1512e12afac0923e1f64609e98a11823eaa7cf230fc8753a48c456fa131d20996cd888447ec2e3a8a2fbbb4f7d1aa6601f52c2d3ba9d7a2abff7dc922461ad0882eae91c6bff8e61ff86f821558d043ab3704e84598b64d03cc0aecf8ea3882a40f0614a234fed874cf712a99896f83154ce08a54fc8f51a7854e3da111a691ccdf4c392135e05fcef172b3aa674a8377722eb7a4e991705f4f1d230553d65aaca70b02058ffdd8420"
+  },
+  {
+    "public": "26aee49cb88931c50b389b909a89dfca975b0280ede9cb1a1132ea65ca254ea3a0d3b2f4daf929484c80b84de9f9255960ba10998602da4e13cbd23f3496944c0ad132297bb846fd6bb0055860d1f9bc21722f88b1202b1b507d47b1461190f86cf0831bac2db241bcaeea386882e4364a331a1a5c8a797ccb1d6f6a4db1490b",
+    "secret": "4b2aa172f2c2c844420211810de735cec4cd6095ed48af8ac9bc1b2b129357212489f158b62c0979a50df9845be7ed556a0fc857a27cd72534aa461e203649baa0d3b2f4daf929484c80b84de9f9255960ba10998602da4e13cbd23f3496944c07f1a933b2a2e87585a02a773abb03eeef3b192bd61a5dc1bdb9efc3035d10330d3e5f9608bf2c28e882f909039762bb3b1ba9fd3e927275ff5e40bee09ae62c6cf0831bac2db241bcaeea386882e4364a331a1a5c8a797ccb1d6f6a4db1490b"
+  },
+  {
+    "public": "4bc504fefdaadbd36afae10174c0b6e94159be8092e192acfdd9fc16c27876d069bcadf330b9c9b12b80917901b9f88aa8a56ab9d2f98d503ef1a611d69b70cc264964d9c9b9347e1f33c21d44d6e7a89b24097428ae50fd050c0b3b33013bfcd2e1071b08066377e80131451d43a8ac51c6f8be36fc3e8860e1ad51d84ae6c8",
+    "secret": "f5b9b85167a8cd792aa9ae13ae2a9018fb924e2fb2496ac0ab28d816ab0302eb78158885ac730b7e22557e30e4462d842980484de828873822b25afd966c5ce669bcadf330b9c9b12b80917901b9f88aa8a56ab9d2f98d503ef1a611d69b70cc8ddbb0ba0580a3a9cb619311c9e7700c456ad93b9ce02313c6d6958c48433cd15def0df490ce2513e25fdea62ee440e28933e804c5e5be0529a3cc7789ec70cdd2e1071b08066377e80131451d43a8ac51c6f8be36fc3e8860e1ad51d84ae6c8"
+  },
+  {
+    "public": "f661a138de27463fe67d1b95553f8ed6a877415c3a57ff0090bc24c7df3b28faff96286c28ceb8c6b87922eec834e8f1e49c8664dabc67f6528bf0ee8c2f606149ca75a91357a139b5ef11d4d20299ce197b995cff83cd24f77fe860c2233009f2243a2620f6a355a5af68cc91b9a1acf3af635fb25df657307bb12cc7071a94",
+    "secret": "0f46238754b9583c94bed293e246b8496cb89f4e095fa9161ede96430ec5a613c7893fbbb9cd8927d2944a6e6d15dae8c93e2811cf6fafedf8f685d1e9b47d7cff96286c28ceb8c6b87922eec834e8f1e49c8664dabc67f6528bf0ee8c2f6061bab23efd3036a73bd20bba1feb79fd1acecbe15345820e29245932466fd6b1aafe534265758d516a35c5471b9ce1b1e5162f4ec731d8e16d8e8ede2df5046372f2243a2620f6a355a5af68cc91b9a1acf3af635fb25df657307bb12cc7071a94"
+  },
+  {
+    "public": "29f3c8617d323994e3d443dfd9caf1fea6f5301171ed9dee287655b0ad8aee9b5c548f546fac50899585f56a54d67979c4eae060023d8386bf54e477a09acb82c2b82c41bf306e1cd88ee594d7f10d5a151b97e7d90d6069ed3923581bcf4c5378aa567abfede46a4334afde30691433a83f563cebb467f3183213fa7b542116",
+    "secret": "8c36b44447412b8363d059e205864b1ba68e085a19f4dbf492c4c4e59910bcc63e9c59d792964ccd2eaddaa34683c779ae78c70d02ec9169286462d953f0f2405c548f546fac50899585f56a54d67979c4eae060023d8386bf54e477a09acb82f0e08b693b466cf1ccc90c6631def39dbb9b7236762f1dafaca9ff816f6f66518646d5685fd4e4bdbca4c7931159edce6b44c54833b39982945846c57981cc8b78aa567abfede46a4334afde30691433a83f563cebb467f3183213fa7b542116"
+  },
+  {
+    "public": "8e5ec702f58f9d78a9c456d30c7c7bda7c9b4a5a6e2888b83236e911c0854b0c1127896cc9797d3daec8f327cec7f3d27fbb51e7ce3555bff02515dcdd85691740bb1d1871990d2771aa263472770b8f3ee10d59a57a1aabd26f722c4c11268f98f7c3174403053e13c114c35b315d86c41a1446d19ad7caebff3797cfcbe35d",
+    "secret": "5fb4c3c5fc9bbe1160beb7a7ffdb6b63631f9ad60109160291b2d52cbb6f8ee82dd2737e376bc82025dbb6214eead631e8729ff2a2478d90290a0c44f12a56b81127896cc9797d3daec8f327cec7f3d27fbb51e7ce3555bff02515dcdd856917e6e4362db3f15c552d0292218fb4b3d55ebc7f782307fa9fecd40d014b3e7c29b6cd0b0dcd48e3dbff906aea534e967af541a88c38b2e162d6cc0186c0201a4898f7c3174403053e13c114c35b315d86c41a1446d19ad7caebff3797cfcbe35d"
+  },
+  {
+    "public": "d19c0685d0b4246f31850fa59efbeb885d3eb52899cd3ea5ae1f3fd3bd9e702090837d3d1926e0b78d45d0910903902ca6c3b0408b202f95369d1762f873f0442ffe7d8e637c76fd47de02d5abdf877db0ec82ca93c51e547ea54ff54ba46b6c948bbbabbb53644c6ea9441dbe6371c3944cadc1667f42859b65e25bee99db92",
+    "secret": "66254a021a4769c94cac8360aea14478c99138409a78f8a380e6dfcd8fcd943eba1c262a16db53e9537ac24fb75e4c06b9c905d14616f123a8d33503aa59af8290837d3d1926e0b78d45d0910903902ca6c3b0408b202f95369d1762f873f0449264f41cde7e8ddad2d73fd778246d42696654c2bcc9fdbe8dd5ccd9652805e8de7e7701bd634dcfa3fca7dce53f1746be20e4abd73bd356e6cbed90c4c52df6948bbbabbb53644c6ea9441dbe6371c3944cadc1667f42859b65e25bee99db92"
+  },
+  {
+    "public": "4ec9c509f58aa0167af3a8bdb04ff7d726b97784fe0b434b627535541924ee30b718586fe70a2debac5e45075a63373be4a6964dcfaa98969821d328eed900e6a7fb7c8bc48080d185cafff196dea7fbf7f917a435018a9965e077d1af92c08cf4171795d446c90e02eeaddd1d7f739a3e729c6bde2c726bf385190a7bfb4d7c",
+    "secret": "78410adcc07764622d28c6452f1ee60ff714754b39062aaded169cbd9bd386b7c564fa1636898f498cafa184dfdea522c9aba987c039836c5c86e1cd206b3cf3b718586fe70a2debac5e45075a63373be4a6964dcfaa98969821d328eed900e6c139ef93280781c39d603c534926c42239c16d2bb36ac630b1e23bd9b76e05fa66b903f35fcf98b7d8081eb5588549c68a4eb84e988503caf69c2f357ddf5c6bf4171795d446c90e02eeaddd1d7f739a3e729c6bde2c726bf385190a7bfb4d7c"
+  },
+  {
+    "public": "3a262bc3e9fcba4451b0d9d81844d74412ec144bea9aa1e040235d188f00c217c9cfb9763b20b61a4c7fca4944dadcc12e20d48c8a6c42cca6c73754d078e17cf00914b18a35b5ab8bc0b0c6f19e6e7c3f4bf63503692e5838ab42c515431b87d40f6d0ca575d58a5d1008a2c7e2a901fa9a9464a3edd0fafd6cbdc435771a1f",
+    "secret": "960f297b9b1623c65f26d8c094324eff8287a5df6122548472590cafda3a7695d9a99cbed932f1a17aadd5a39aa5378883fdf0ef4ea6a5c0cea99a193676b384c9cfb9763b20b61a4c7fca4944dadcc12e20d48c8a6c42cca6c73754d078e17cb55ebdc568d0853997752d6ef17ecf4b2560f8400dbd22002ac633a535a08b746efd9b92632e29d19c6814c2a589b06b011a2615ca3c2a75f81f31bff4fa79afd40f6d0ca575d58a5d1008a2c7e2a901fa9a9464a3edd0fafd6cbdc435771a1f"
+  },
+  {
+    "public": "bbf0aa614d53f3ad1bdab20f2039624bf5d71c6b9f774ff997cb3e13d17ba9a79d10509f00daa9b3ff79d7f92c7c216843dbb45e5a606862076242c0daf2a9586745c246ecdef5398d64719e00d865b7616fd63478e8cee23d90d5e1d2ed1077ed6ff4e025a7e799e16b98410dad14172041694d18fc644af4cf6565ae3d64c8",
+    "secret": "60b721700d2ca2e6f412d8f560b6dbf76fdcdf8bafa0ae55edf530916d4133dbecf19d2c1c86a630e1c6dd9cfc5c83786d9b67412a669351caac17c8c49732fa9d10509f00daa9b3ff79d7f92c7c216843dbb45e5a606862076242c0daf2a958aa0a747b0b55875ec8c9ab569205e34c923456aa324c81d4460192b53e2401ab867314b754e59d00e7458271fe38a97d667f4f268fd287b5e0d2cafb091346d2ed6ff4e025a7e799e16b98410dad14172041694d18fc644af4cf6565ae3d64c8"
+  },
+  {
+    "public": "8a4f2d30cdb336deeb111fb0e5f100263dc90efd91428fab100f411e31443c5849026d76057fd019f03b5998dc96c20b640da6890478937ef7e1ce9d4e2040c3cd0e1fa0211120cae00622742e6a320ee545dade4ade77347bd6d634296fab2091eba53a8b6b90f177ec5fa0086099b29a45e9f02c0a67a223e3c1f3917b5a42",
+    "secret": "30adebd82a1ec6d962612bebe86360d548bed40a7d87a34bd375ad6e61ca479f638eb1990af5266e10b6bd336b815cada9ecc6f145a6d9b394ac14cddfde089049026d76057fd019f03b5998dc96c20b640da6890478937ef7e1ce9d4e2040c3eaab22486b499cd9146a73960d43489e7e8d7e05a633d891d1fe5eef9da3b687e1133ecadec31ab84f6e86a321da67a6b83667dabdb1da2fa94430a8c9c401ac91eba53a8b6b90f177ec5fa0086099b29a45e9f02c0a67a223e3c1f3917b5a42"
+  },
+  {
+    "public": "566cd08a043ce4c8897dc79db3764724aad562b7fe4130f6663e0d3c08dc756facb38b98bdbc5812c30c3cf8c16ae123d9132b86769608694ff6969422b119e063a02676f959b0bb81618487072658ff050b37a2cd96de10e2f075a3ae821d0e00ccc0ad2554f5694b6ba8a5e79e0a5f05750bf8e6f47d5bcef5f8fb808afa14",
+    "secret": "d9dd7a8908f62a835520ad83b591606fedaf5920cadc7ab954922172d0610553f17073e28642b78e8bfc984c29ed8e6f4c77ac6ac9293b992c65a8c66ad6bc9facb38b98bdbc5812c30c3cf8c16ae123d9132b86769608694ff6969422b119e0f6b90264bc10fce3e3c118c4d3b6eacf6c387056943f30cad947045186ef0c8b5f1ac1f757c94868b61d994b9b892052078d9620c05a6df6ed5b5c77ad2fc93100ccc0ad2554f5694b6ba8a5e79e0a5f05750bf8e6f47d5bcef5f8fb808afa14"
+  },
+  {
+    "public": "2fed74e5ce1c333f60f058fb0968fa2e87f682b1879aba3313a9784a157682974f38ad38164e1c79fcc1916add4c72f9adda7d0cb20041d9adb65f49c0e35b8d96d085a008d8f4dbfda0f8387bbe3209132db087b06c4dd911ffc8c9e9d44feb0feda9bb5b0e0ffef2921820eb0242aa554f6ceeff73b53b62cb4ebbe974354b",
+    "secret": "78ca3c59c756439e370c09aba83e1e31d359a6fe628f7ebb4da348c00450977d148db47cd5513b7970b3953df1a2cdd4be547bf67e853b6ad2c2f6e03fe8ce364f38ad38164e1c79fcc1916add4c72f9adda7d0cb20041d9adb65f49c0e35b8d2862b0c7c3ababf84cce11eecd73d2aa5ab07e28b77a4b193354a45d98b2f4fba4888fa8dc579fd6f90900610d2ec5cd0a8250492214a3a668c035837f7d5b640feda9bb5b0e0ffef2921820eb0242aa554f6ceeff73b53b62cb4ebbe974354b"
+  },
+  {
+    "public": "829322c0c62fddeb6a424d971888b7a579ef5d11244ec956b80c207b9724ad54f73e481fc544bebaeae2c3f64f333ca6fe4d270f4566c3048fc5cfb89bb1b60cd3e4697006b2fa125bd2c2515e38b6d03b2d0a92b1da158cf46d40eda3a34362f71e168f2f33d0c2903b675f69191f9968b6303d8a46d640b8dcfbb21a0342b0",
+    "secret": "eb59bc510de70099b9e5d801eecc4101110372c365049c0b025a34fcedeb0bc749c27bd71c91951ab294234405fdb77b1cc5eae36f42426da8ba0f0a748dbd0cf73e481fc544bebaeae2c3f64f333ca6fe4d270f4566c3048fc5cfb89bb1b60c3e847a7469289d05f1cc04e4445937d30003f6e7fb4fc289f895b3dfccad831aab809cac3cf521dfe81ea48d9422513062a66aeeb24cf19b528c3f304843ee9ef71e168f2f33d0c2903b675f69191f9968b6303d8a46d640b8dcfbb21a0342b0"
+  },
+  {
+    "public": "14d30173dad995eb8bd5d3a984000b42efd07651402389e2c1afeecd3d25cc74cf9b2c1da1affed4560b2ddd4e80cbf93aebf2a1cf6f385bc96707a2a3111f79b0ef061d1608719cd62aab6b6deeb4460a8dee13d144741f07db07f6a34eb3d087dbc6e72f0eb051ea1025d6af34703bbc572f60e11b0330ebaac332a83f7146",
+    "secret": "8df084da995473b3de4f0d19a3c316d7f59ef23fe901ae1810447c9655d10b77d0a65924bc3feeb001189cafba5927adcbc5588f0bd1661d81c23ad1602a368acf9b2c1da1affed4560b2ddd4e80cbf93aebf2a1cf6f385bc96707a2a3111f79c0f4e9def1ccff686ac2e5d45870bee324d8c44ffc8c26e8618ae1fced0567dbcb1186a3220c4958042b15da7871eae23d953754355c68aa733c4fde072566e487dbc6e72f0eb051ea1025d6af34703bbc572f60e11b0330ebaac332a83f7146"
+  },
+  {
+    "public": "7943e5deb0263465fe1dc61f5a123bff24ab3a405e5b0977836689a67273a25514d4863d69f19ae9f4c79630e1c2d95c3bb847d82355c3ed8b3d50df20d77c4fb0f1d9b53ee14f97c16b9bd5c7df625b6917622c29a4bfc67a5302e8e2055aedcc2d5b1fb383cd9947cf331ead3abe9988e29bf0e179bb8a94cb25f03bc9b1a8",
+    "secret": "f514c599df5056afb8dbe328bf30400723da39ae60275921b1bb923a48b0a9359effc8807a24ab3209e566538ced7a9a87e59b96dc554c7e9713b7e27d7f549f14d4863d69f19ae9f4c79630e1c2d95c3bb847d82355c3ed8b3d50df20d77c4f6a5fbf41ea81cc56a9a0aba16534d69aad99d588a9d4c4fc0cacdb0a9d2420b3725c3cfdea6bde99b84e50739b9ece36d7b9ce2e10fac128a7af81fd118d2c6ccc2d5b1fb383cd9947cf331ead3abe9988e29bf0e179bb8a94cb25f03bc9b1a8"
+  },
+  {
+    "public": "065224ab7929093aec3669eaf5015a5339ce16af39ccb9cee8b935d431abba11cd4d6d3dfd2f652fdda516f599cd2d4b383881fcd89699b9b71ab8b259b3c46051b90ccbaefadb5bcff887e2f31f3458117d91bb041131351ba950b5cc98f5848070cf20da4dcdb347b7ac67962324f90ce128b14ba4f2da47bfc1fa36850d41",
+    "secret": "12535cd7278db63c43a0874e58cc7e30f886294c939f445822e52d27f965f833babf6f194554fe4881a4c3d0dac8eed8fc703acb1bf4ac8748285a0b340acab3cd4d6d3dfd2f652fdda516f599cd2d4b383881fcd89699b9b71ab8b259b3c460177795a8f7b609b4fc919885b2766456e26aa56a3c19d680e9d9ec10c6ec169432ef9e3c7cac4bdabd536d2d312d3fc13be03ac4b39b92c22637d86fc459b3ed8070cf20da4dcdb347b7ac67962324f90ce128b14ba4f2da47bfc1fa36850d41"
+  },
+  {
+    "public": "5f1a27207074c50eb1e608f676434de8a950e2fbc14dceae2a0499a17ce6b89fa10a9df4f7eb8656f1e3a247612a4381b221622773faccf457049c06c5724f16454793b8198767a56ae0378c592ea76369064df631b9eb388263b77374d6523f33d1f4c24b3e86e5663b3ffba8abb5cb703ab9a8df90d7d3e89b704648c4923d",
+    "secret": "6fe91dead72d626e1ad311e57f4c20fc606d4307eb5c067be22a888ab81336936a82cb76af3d889d0afef6bf4b1939d318fe69797fb81c1724674901b6b9dacea10a9df4f7eb8656f1e3a247612a4381b221622773faccf457049c06c5724f1684e5fa289eb5903efa5d4d04fe4a0ac1e8437e57c06d17d01be6228fe8080ea6be34c040ff346e73d873e3a1c7cddddad0565b3c997b63cc9a861bcc8965a87c33d1f4c24b3e86e5663b3ffba8abb5cb703ab9a8df90d7d3e89b704648c4923d"
+  },
+  {
+    "public": "c151854a462d783ed03d11ad7f6db9098ec74cd02ba671b65af0608c454f9e0c60a0a566146e9d6409fd46237cd3fbec2618772fcb30f6ec39d7769278a7fcf4106e87535fe388254f707af13430c848d0aeaf7fbb045b6fdf2051ba906d98e57417c96119f111e41aaaa3db44c8d2668e852eabfecdb16a5e459f1f1cfafb75",
+    "secret": "1adfacb54f2b7308483a59ed52cd3aa4b438a83a18c1de2d7387efec90978807d5096065989f7af65dec3868c193bb0431e990c1f9493b0ee4051394f09376ba60a0a566146e9d6409fd46237cd3fbec2618772fcb30f6ec39d7769278a7fcf4419cbaeeb8182d0e5a60df190eefcf3e4e5031e361bfea81aca57bcd0d2b7f6e242f6ad597d58627d20df89bacbddf270fc8f24c71bbbd30b5779fbdb1518bc37417c96119f111e41aaaa3db44c8d2668e852eabfecdb16a5e459f1f1cfafb75"
+  },
+  {
+    "public": "480d642a20dc4ea3e374244f7d47bcc57dabf773c102224bd5611928276007fda184dcf49fb3a3c88faef615f85b97f58233f3b770541e3bc5a9a15f3a98368da66acebb61e1dd461e3653570691e9e82621cbe97b116d7c8f6cfc689d5622eade862261fd2b589141b4eae2c9ece6f4fc88f9a9e4aab654b94929c5b33b3ac2",
+    "secret": "456217fa6aa171be2ff0d8dcab5b26a36756b92f8f062592a7a9caa72103cf2814d749ab652323ca95b0ae5675ac9061723b8ad24c5f7144e75a37fc9add756ca184dcf49fb3a3c88faef615f85b97f58233f3b770541e3bc5a9a15f3a98368d82661a659cd7bd4bce28b86eb180624927f0b24215779a82487c0be9ed68342d0ea9ab2619b02d2047895338fc649138ad2a94f0b1d7dafee4caad5090485cbede862261fd2b589141b4eae2c9ece6f4fc88f9a9e4aab654b94929c5b33b3ac2"
+  },
+  {
+    "public": "ffbbe4955b210304fd24b47d83ca69970b60320aeafded7226ae331cc25ac66ff4e19bab73bd86745214a5fc85340b467002e7fd325b6e86659f9f70bd29c40598f754b32b5a5f4278ce1d40a8db9dd6f608e7ce13373be579dab7fa778d4e3326baf75705cd0c81f450bebe8098e226c66e9a8981ef8d0ecba32920b1039a93",
+    "secret": "573d45238ef650fad842bbe766e89faf1e50169e0ef342fc375700414f87c930a791c9d85c957d4f0169a2a42c7f59ea88c5bb4fa36caf0e08b405eeaa1e7970f4e19bab73bd86745214a5fc85340b467002e7fd325b6e86659f9f70bd29c405ae089a5ea8633bcfb289e50caad2efc15f00095f03c0b92f54015018dcfe8c43747444ca0444b405d2b8502cae26081618e2e4c146ad19eadd1fb956f0fb610926baf75705cd0c81f450bebe8098e226c66e9a8981ef8d0ecba32920b1039a93"
+  },
+  {
+    "public": "297196060a7ddc7d1ad95b124786b9b4256ae821e2cd825209a3c732766f64a019a1db3beafbe03c4601f4252ed3d5f621735952b635bb9b78c9c48324b08678ba130a3636cf9752b581b637e7f14c360f4119bb27375ee8882fef02983028c59ff019be897359c248c1e063ab66bf68392cd04469ee07b6c6fe2b74fafa5928",
+    "secret": "4793803767635bac4fa141ef726ca5e0a2bd7364ab419929e5b2eb922316d9da48f0dba96b8d133e3890acedd507c29f1cc23cca0f6360fe301aa422a1b169a319a1db3beafbe03c4601f4252ed3d5f621735952b635bb9b78c9c48324b0867887df33c3c62b7a13b65657babd4567e3f0ba27654d9c86142e1684ead0d0f5de03347ec4c871475b1714b84040a57053ef97f0ce620588f330cf7026e0edfa009ff019be897359c248c1e063ab66bf68392cd04469ee07b6c6fe2b74fafa5928"
+  },
+  {
+    "public": "8958a2712b3ca206e6607d1d58a4c75ccf35ef3ba0c5bd5e87efa1c5138fa6344e82a6053f1ff760a0241460326c1e52efde3861a058344d6ff8646eb305b2a9fb7fcbd87ed2da40955a30b334e02f6c08b9147765d2de08a769dde9f11c5eb7730d2e74532b25c923f331b6be268ba8f950cadd9d7db156d61be1271cf722cd",
+    "secret": "6f0438acab59b29c5b3c93adb62fc94b851703347041073726da3ac8d2d0e9390a12c321c43c95da99468938050db8d36e3c07d57e689ee3531fc844d4bf87dc4e82a6053f1ff760a0241460326c1e52efde3861a058344d6ff8646eb305b2a9c7ca44e8bbe2131d053bb8f7e41f1b38e1a23d26d430c5cfc771f6e5437fef43001bbecff5c73ed63e682753ddb7c26d3e7e503a2c8fca999d8d90f4293125e5730d2e74532b25c923f331b6be268ba8f950cadd9d7db156d61be1271cf722cd"
+  },
+  {
+    "public": "f1e352804b5b8f4039f22f881bd1aff4ef920a1e0f92659be941d5ce55dc787d3b9a3c873b54866e3f1673f5007d7967ce0b2909d3950647ae2bb055fa519969aadc14c353d2876c3c3130f96506018abcf721778715f0ca81423c87b1aa981c89ba42565c499b3ef1c3e1c402fa2b66ddaa131475884e0a897a22b73532312f",
+    "secret": "b9501c12f7db45d6c981b764f181a9a09a0ae961c3a405c21577cb59920b94f66ecdae92875a0228d317aa99c19e293a953eecd69dc135e364176dbb3bcb63043b9a3c873b54866e3f1673f5007d7967ce0b2909d3950647ae2bb055fa519969faa2af703e9f50dc6f6853729ae25939e0c3165e805fb8f6d9711abb7e74ae75ff5f91c16931802a2b48594c5aff663eabd6e758556ee8b30a747bc769389cdd89ba42565c499b3ef1c3e1c402fa2b66ddaa131475884e0a897a22b73532312f"
+  },
+  {
+    "public": "5e80b12257e845a7f508fcf162bbc65b42295a73883d5b30797845f147b3dc42f0c8fefa4401f6d3e214b66b19db559842686f528945cb2527d3d35e051c72bb4d33b603eb7e12c27dff6e8cf7dc468ab2e65e0b88d7302b79e0d19c7a3454565f0c1ad7e81c870dac50827a04ea65711e3c5e09fb8b9446fe4a92b71ae0bb6f",
+    "secret": "e01dd3d01f5b2faec7c03e951406b2f47192762f9979b553770822885b676e75420383ef3a1e4e9ec6e943426b43afca5953470f4ef70fdba1a6e88471da1b86f0c8fefa4401f6d3e214b66b19db559842686f528945cb2527d3d35e051c72bba03de3e574c9e6557c0498058dc907fc613ff6f6ef555fc539f42f163bd670cfcf691a41563de766c2550056ae4b07c4f53e6b6df1887174f6e03162487998c45f0c1ad7e81c870dac50827a04ea65711e3c5e09fb8b9446fe4a92b71ae0bb6f"
+  },
+  {
+    "public": "e7a6a93c87f74ef915d4402c333686c2f61b7316f5f2b1074655e85a736c53458c47fa8ba26e9d7b3822ad4796ea2a33d5894cf58c5fe8f2e18ad69609a011ee9bfb32c1bab65524b0110bece3e87733b3c84b3c840adaefe73fc58390637fedc6689ccc0327e0add9aa4862e1ff13d3f596cc6f287924b56c2fff826c41da5c",
+    "secret": "ef46b48fbbc241cc189b3690e8cabfdb6e0da5350c78cd4a8d012927ebf69e82f8cc4d439b9768abb2f6042c18550a70bc791d0d843c9e570e0c223d79e20a9c8c47fa8ba26e9d7b3822ad4796ea2a33d5894cf58c5fe8f2e18ad69609a011eee0091d923ec3e9c9663cb862c9f54aa034e8682ba5b86b3d9614c57da8d16d19ee82fca0b067d92ea8eb8269e4b8948bb1d5972fd9db398675441ac9328fd43ec6689ccc0327e0add9aa4862e1ff13d3f596cc6f287924b56c2fff826c41da5c"
+  },
+  {
+    "public": "6e03c8b96a510a28d14262ad90eed7b6d1e374af241256f93a7de4c53302850438c59a5589c26d57559f0a72c7c77856a0f1e1e39b5c32993c4a572631c7d574d0929d8be76f663cf4c153946da34f98f639d8a38e8fbfa123a5f61b7ad6c8323da732ceab8de40f1f071cb190a6dbdec80ce8d4c800d28edef86fc6a00d17e1",
+    "secret": "5be665a24f74118e38ebc4ccc9d35be265c533fa5b259fab7875b15905e1635cd7dfa3a8077c71113a96c0bcbca839fd370ff10b1985822302cd4ee1071e3ed738c59a5589c26d57559f0a72c7c77856a0f1e1e39b5c32993c4a572631c7d574449ac28cd5db7cf451e79c2dbcee2063cde69b1e8fe621c7e77c6f4587078be3d37b677e30f7f013f033862fadb60c1211ec032622b8051d2620bd42db2bb1283da732ceab8de40f1f071cb190a6dbdec80ce8d4c800d28edef86fc6a00d17e1"
+  },
+  {
+    "public": "8ea403c059acbf5cdcff7f642f2df3ba651983aabeff2de9e89147a6a635ea69267ffe9d1e067c142b73a68036bcbd3062d69c6e24ad6a862d96707218ca642a254b26c85b2aae4142d692a12f530b9ac3be54c4d9149aa92f7ee71c6cc4e3ca29cc98ab985ab4b79dfa25b4358d2417cc5504feba5ac41828df47b98099cd3d",
+    "secret": "35799d0716378c874faf40675b60ffbe4024faaf7d3c86d5cfe46c0e08d3ae490b4ef3d70572dd55b91bbf873a2562fb5ced02ddf30af02eb72fa64b63093a91267ffe9d1e067c142b73a68036bcbd3062d69c6e24ad6a862d96707218ca642a552949c8ab35c628cce99f81e571ca1689391cd3a4386a7b59949a71c8482d244487e4a1f474f8448f777580566a349e1dec293d71471801cf0ce698485c059629cc98ab985ab4b79dfa25b4358d2417cc5504feba5ac41828df47b98099cd3d"
+  },
+  {
+    "public": "cc93bdaff6dbb90a99ef238b41dd87d13138afb21c8764189309e2c8ec532d5dc3bae8d0e8b77e8291c2ed6b1292d56ac10fa03238bd5db329ab3bad95a7388d71adad294a0493a0d42424dc4e6b46a8261309e5babcaa991d0bd435127e28a07c6ee7b5292932a297cc29fb5b98eb0723553413d1cd82cec8f89bae1c123898",
+    "secret": "a587ab3c620b54cad516fd7b2c0baaacfc5288a2fd17e0db99450a0c4a3cb558bd9817169fad191b9e68287640ba0bf6759f1ccd9419199ece18b08436a05d45c3bae8d0e8b77e8291c2ed6b1292d56ac10fa03238bd5db329ab3bad95a7388d8a594a9901570de9e00f9c034fbc52bc323acc79803f334c1402f4f5cb3e37b227c57ed7abf9540c0a799c65fe149b77936fae34b9d234356192912010dac0f97c6ee7b5292932a297cc29fb5b98eb0723553413d1cd82cec8f89bae1c123898"
+  },
+  {
+    "public": "0e1f90960c251f27af8da1bb929be656de67f0e627fda305fafa5d47b63f656b5567a4d663db11e0a893f83c03e4decd011f545b4598211995681f90b1954c21a0e79e2b3fd0a6727575c1729461567bdc025019dd7ca2e1ca7d91b924b2781fdbb5a2a72ae1f2ec37bd2334e906d4d5a934cf908075e11a80138f28b9d868ad",
+    "secret": "73d6d49cb70e25476b3f418fcb2c08b622b50b701952656638c70b339240a6a4d81c39e69b103220718200739e009016f4fe34bcf4362d7bbdc949005eb5f2cd5567a4d663db11e0a893f83c03e4decd011f545b4598211995681f90b1954c21d3e97f86a7900459de8d6d88886b394f8eeb80f3adf26b7efa1bf8e6889d148e30096f3d26cd8cdc3ab84ab89a13f39589d7c2960dd4ec33bb638c9450bb17e2dbb5a2a72ae1f2ec37bd2334e906d4d5a934cf908075e11a80138f28b9d868ad"
+  },
+  {
+    "public": "0d1f263975489dfc839c8eb30a6fa3a7a49924723e266ee1e17fd1d96882162e89b81b72a6cd55725ad386ad09cb64e077471c168c3153827fe90197c47520ed6aedd84d1a5486600311916ce85b3eaf46c2f74cbf4412cc541c7759d17510673f0d7fa35561592f57cde87cec8536649c4b1450736b831072cc4e75bd5319bd",
+    "secret": "352cf38075e1020926adf1aacf93181fe30623f109cf8c6599894f358d4d0eafd664beb950579c7990450bc838e77122692f047f71974b74080935d8e52ed59089b81b72a6cd55725ad386ad09cb64e077471c168c3153827fe90197c47520ed89ab920f3cdb64368feb27fbb2e6da5d38c1b61b278091d644ff453793ecaf9da5ba437a1df8190bc5b687118471f939532007ac8c2673a7b1b9219b1d2fccd03f0d7fa35561592f57cde87cec8536649c4b1450736b831072cc4e75bd5319bd"
+  },
+  {
+    "public": "df34f779b69e8abad64eabe40ae7e31e43e63e5ef1fa0f26fb9159543b5a0883364b339b9055643d32591647a292bbc09bed144b0def97ab309dd1d00c18fdd1d72e1623b9fd87d7af12732fbf9f44540b3c3846f6f73f1c6b0c0e574f6a14970556c50c9fdad127831b1233f216031f372800bdc207eddf7fb5fdd270c5f204",
+    "secret": "24d89a780758a26633cc5cf21ddaa1e7c23f3d40861857d8ac978719842a523bf1ec8681da3dcae0ce9f77cf427cbde49ad107b5fe77bdac1824e7c036fc332c364b339b9055643d32591647a292bbc09bed144b0def97ab309dd1d00c18fdd19b7692c00f0f01d9d3801b1a29c5fc9130764fdb3f353a281ee1ef2d4f3a8b7e41acd7a2bf7415e501fbdfb4b8b58f777297ebc9c3db18dc53625a44fda904200556c50c9fdad127831b1233f216031f372800bdc207eddf7fb5fdd270c5f204"
+  },
+  {
+    "public": "d810d6437b09819e3aa090f6045ff3a561d9ef48bc124d5d457b7f679ab39a85e2af0b8c391ed3488b23802c033c0fd9bccb223d6552f27d5e856c21c6a1e3893e4fb9e801e61f0e89908e5d60506b32cb73bfc0f02d8499276c6fbc0817c560414637016278a40be2d5c50e7ebb0d7e11480984cf0154fcfd0ada3dddf49015",
+    "secret": "59b70127eace25ff873c6e00ef7be234c5a6f0daead34a2610e78371e9669817b9d63c7d4d89d1b37ab97a69d559038b31f1d4eca53b10202e30e5157a902677e2af0b8c391ed3488b23802c033c0fd9bccb223d6552f27d5e856c21c6a1e3890d15fc071fbb6ac13699cadc1bee5253cf537988f09aff6261d8f996da12656ceca71e50de313a1042069844f660fe193942f58cdf3f81144f3b94362bcaf49a414637016278a40be2d5c50e7ebb0d7e11480984cf0154fcfd0ada3dddf49015"
+  },
+  {
+    "public": "3b139b49782403e1c52a4d2fb7ab67495107b91d4384f981aed40b9c77c01713ab427ca71f13e991293df2dd05622be7488f6206e42f0fb31c7a018488323df8c0d4acb691d40bec49c55b1b0ccc5fe1bb052f80d631848694971f91109bf51b574e12846e67d6f348652246098634c3e31a7097c7d28a1d81a421d1b0dc4d82",
+    "secret": "7c01e2a6afdbc54f14b085032f0c9ccd91c27772177442edba314f740fe17c41b5416f1d7cee585081ffc9cdfade54072f71c15b5d4e1bfef93e7c9e90e77971ab427ca71f13e991293df2dd05622be7488f6206e42f0fb31c7a018488323df857f527c3f9471374047952612f73a07cafb359242f972f8e43d1b3fe2c781b171cce0caffab855025d529e1d56dffc5984aa7450eb5c332ef741de15de7097f0574e12846e67d6f348652246098634c3e31a7097c7d28a1d81a421d1b0dc4d82"
+  },
+  {
+    "public": "8f4741f76f2e7d6a03a50f86a7ea47fa38bc86bad5f7f030ad1f20d5dd8e067d48ab066c1ce96a4e74473ce90b21d589404cda89f39ecbc6ee4ffb0b351d6223b01110da649161bf84a5a96ef5235b2b909f148337944eef52771c82380bec084e54c6b1500a6e6077de9876ef650f5dbebbaaa72f9a69533f603a0b8e13d942",
+    "secret": "6c14f1f9680bf3d548fc0a2b07d326bba758ccfa88138e2a07aee5c1c3c7727f4bd16c498f596be880be18fc04dd61771a171ca4f97e1e7b2b5f904da1e4269048ab066c1ce96a4e74473ce90b21d589404cda89f39ecbc6ee4ffb0b351d6223b5bd25352f3adfc95653706cf25cd4428780dfeff4a2a9043360c5fa789adc6d3d0887decdb047362b10adeea436f42fc25e71fd9718e4ef604cd985d2f79eed4e54c6b1500a6e6077de9876ef650f5dbebbaaa72f9a69533f603a0b8e13d942"
+  },
+  {
+    "public": "1672d07ed8122bf4c63c0ac07b4877f800bec13b239f5c2b1bdd015244315e78490007c64b7ba972a9aeb4aa80da266988951fdab59e073e05facf13c3d2df1d380db560b95ae3e4566845d7bd9c78b567157b988ca670b67c5bd7d0e05c7c41927c0fa774715a3e86df637f8a53ffba9f0453d2e0a4bb67b9575b678903f042",
+    "secret": "148cc037ad297cd5c315da80b8a1bed7ad9d2989e46cafd72bd6608e8050e7fc6df4dc12a635d105f6c6ed42cf7df15890754a4489d95f500ebb198dc7d56ef9490007c64b7ba972a9aeb4aa80da266988951fdab59e073e05facf13c3d2df1df1d21a0c2ea0b7557b41981599eeb0b74053b1635d071255cf32d6844aba6800921d979e2de47bd06d2518b48cde7d9fc74dc8027732baa64c37d2bef2849f50927c0fa774715a3e86df637f8a53ffba9f0453d2e0a4bb67b9575b678903f042"
+  },
+  {
+    "public": "089272ab716c2594f34302012b115d9bb378f6c203447f0ea66208ff2ca1900796e4ac4d85d7e1a3aa342aceb20d9ad6b01fa8c49bb23a451e95db45261ae9c09130ec80700075f4a629901680f5ff60c0ae1ead68c5e081df9517acd7e6c35413c4b5f274ff1c12a63d4ce2cde8f5662d3f9c957b4d8a07a2232cecacf47375",
+    "secret": "24408c464f69ff165d2d46f153a60338d7a25febf324b26a27574d632477a3425ad12038f32406a458d10326e6a8d707b54fbc839d70b09ba8169ed4906dadaf96e4ac4d85d7e1a3aa342aceb20d9ad6b01fa8c49bb23a451e95db45261ae9c04006c276b412f3f59d195cb4175e36a18db22b0d5a1708a40f84027f90242e3f6b741339e56fde6d2f39b26800fddbb268773c80398c0af6423ea449588130c713c4b5f274ff1c12a63d4ce2cde8f5662d3f9c957b4d8a07a2232cecacf47375"
+  },
+  {
+    "public": "74d290f1d706a4b6a573762d25c76c4e2495cdb3823bd7ad4928fc860f217e81f2fc6c9b2827d93b6c3c662ef6a3519b0617782b1091053d564cc47153794636a0e1f2b280319af1ea10d55ad395badf4fd41b5d38e2a2cc82348c762e5e2d1380663062341186b30e64b63cc588a7274af998c897242f425db969b4e8df7c10",
+    "secret": "3f38e0a527505fe3f4317337cf2acb9358616def1ffc578e22708ff177abdb7850122eb7cc0bef16b9996aa2c7206fc4ffd304c64f29b1dce0930540b86b0d2cf2fc6c9b2827d93b6c3c662ef6a3519b0617782b1091053d564cc47153794636b1894880ee121df872a537eb8de2bf4731238eb6bb6fa6ff1bd0c023b65c641b11a67f36c799209db4f241b15c82454702049f2c2fbc1b4975ac6cadad524d0480663062341186b30e64b63cc588a7274af998c897242f425db969b4e8df7c10"
+  },
+  {
+    "public": "7c89c10eccde82ce5deface00351da81bab67c4982b432e6c44073acd5ec27fb6061208c76805bbc754deae73e3b1560a02b28b2d3095108ac05fb3097b3cb7c04cdef811eebf5f275a69d0727c4b0c83ec88d8cd47907758ad6dbb122db0145f9222793fbfc3d7c06082329ac78358188cae6999a1fe7a50e53d06c0905a05c",
+    "secret": "97475619d0d612b8e4e8d5109aca3b45301a48943d7401453327635e94603a59439dc3c942eb2c8b8354fccce8135e5993ebb41e120c80c96864a84565d65a3d6061208c76805bbc754deae73e3b1560a02b28b2d3095108ac05fb3097b3cb7cab1a29cbd7247ddd7dc8400194798e84d7e5dff654078772f78810e81e5db025eb38a2ecbc175433eee7f168212099be0389c76ca19bc5135405d3802099b050f9222793fbfc3d7c06082329ac78358188cae6999a1fe7a50e53d06c0905a05c"
+  },
+  {
+    "public": "5c78b782aca1cd37eba37e558db643d743b2fbd21e6bfa217f0d6c8e78a7c0d9e5b6c04e06014f6229b151f129e03c5cf8df617f4e770a7eb6cca0eb9a4314f740080834638edc2c0d8913c6654db0c403a5d1330c5a11c428f541e34c45ba393b52bd83af421f9015c61d48dba033ef657569e9e8d937fca5e9c9bad5bd3c72",
+    "secret": "755abaa49173dce1f0fcb986f77933ade2debd0d83fbc86b0ff46b4531c4d7499141af257595202d0d8102b453072eec1d1f38deac86aa1a440ed0649c19f793e5b6c04e06014f6229b151f129e03c5cf8df617f4e770a7eb6cca0eb9a4314f71c381f78d7ff4e9b2f609a1377eb1c6cbd1f7234ad8e7172e79acedcb457ada1658ae46497b76792813b4a084aa53628e263d394473e1d647841a2bba2679ee43b52bd83af421f9015c61d48dba033ef657569e9e8d937fca5e9c9bad5bd3c72"
+  },
+  {
+    "public": "8f70c89ecc64f183b6797c0f89afb2d16367ab9a2ef2869e076bd13feaf5cf0e668d252080a822415bf14c09d6a55a33c66dfa9ebef83d42a0a845ea62aaf4eb3492f39ef253cffa85a9b0ba3c452f1e7538573c5bc7d3ed001210934b3abfa1e7c94f39ca77c30023a0354d57900c0ae1eab90ce158bfbed1e7bb7fa0a5e32f",
+    "secret": "4437a3cce3935fcfa59cea346f7fc20905789e3a34f79eb61fccc86f34f0bb4895e282e51e9198160b48277ceff7a79f9323452e1b9499e3c41b5da9c5cff450668d252080a822415bf14c09d6a55a33c66dfa9ebef83d42a0a845ea62aaf4eb3810fbac6bffa7f16428bc28daf7ba4863a322c4dc296afa9d57821eb3972a9fdcc1f86fd23088f04180a08270af11e7eeb099e4d5459d06f85623694a0a08ade7c94f39ca77c30023a0354d57900c0ae1eab90ce158bfbed1e7bb7fa0a5e32f"
+  },
+  {
+    "public": "1ae288f857ebbbfa10cc172a966f8dfee5b0e222b0c7f233e6e5d0439d259b6adf2e2b2ea523d6c1c234aef6fd6c5556021ec3f64a183e0c55d12d6e33475a4907d8f0310501cd54a7023417f9f7e7b4824a116493c07d432bdec7bfc09ac94f4235770a3eccdbcbca825198e2d2672122643e20f5ec0900f54cb69df97a14da",
+    "secret": "1bbb812cad8b113c4b2fdf9683844d6b103606b0e26420db1b9624c71af05671ab79537254468812500b0540c75212a7636928c311608e0a1f5076cabb7581fbdf2e2b2ea523d6c1c234aef6fd6c5556021ec3f64a183e0c55d12d6e33475a498fc9ce95bf84ed6d6f5a147baf7f2f7265006bf5908372e0f8965b8f4cf18019dd3196745222c912c4cade05a539e7828b022ca5df42afa7e2d9afaf8a0cfa4a4235770a3eccdbcbca825198e2d2672122643e20f5ec0900f54cb69df97a14da"
+  },
+  {
+    "public": "35ec2d97ee6a83f96f432d0fea70cdaf1d4270897fb8001398928d720007c01bf5e81337ff24c796d6f8e25de608488d95e0e7a118227c04fd3187c5f14626b2a19dfb5067a39889499488d0d3d9367f574e3113694803067d2499aaf2b0309c567c810743ea2bd08618c076e3bfc9d96610263ccb0ee29253515f1bc5ee051a",
+    "secret": "fa4a3f2d18706911e64c7a465ecec77d10b2f0938ac236eabaf5d4eae50f8724c2ed93a8acab67135db87ee558d34a507220fe64ef982ea9d8c27d79d7c9d075f5e81337ff24c796d6f8e25de608488d95e0e7a118227c04fd3187c5f14626b23b69c530927b6861b25e0972aa1f01d3a8870735496d157125a6ed331c2889a75dfec7286db28837eb7041131a1935dd9d6dfe31c995511ac80b95955c1ba770567c810743ea2bd08618c076e3bfc9d96610263ccb0ee29253515f1bc5ee051a"
+  },
+  {
+    "public": "db0dab62d99b95501a0932c421f9c2a40d9345fb6236f7f033ada9cb79c43a112e5c6ba89c6ebb86ac7531a68b0b48db14224ea9c32f59d927a5603a84d590461d1585c5bc64dfd566f5be6d225f5f968b00aa385ed2909cbcb0ada29bc1c51f803bc3663424eea34702aa6d381bc749564372f4d1e6eced32f7fceb7972518f",
+    "secret": "38f33e1acfd3b456f962ab3458dad40aff7c4641215049d40b7c5227c7d72a46f7b96cc2702b8625c852dd368488f88a5f392f2d1455a9cd7b35d0c0cea0d0b32e5c6ba89c6ebb86ac7531a68b0b48db14224ea9c32f59d927a5603a84d590465aa3a4d3e0c60c45ac763d24a4a9e9458a2e14bd3b1cf80efc1bbcdc878750363a20480813597ea4175042f27ea6804fa9bb390a1bf5ef5234a4ff75bf8bc6c9803bc3663424eea34702aa6d381bc749564372f4d1e6eced32f7fceb7972518f"
+  },
+  {
+    "public": "982a0aaccd04e0e70a5a21cecfcd3d238aba03469458915c8ba2ee47f40c03d9a94c793834ba5eeaa0c26f15b15e034baa4b5757ec8c055fa94d9fa6bb67cf15cf66459ffe769aafe5d060e805fd372b19f38205626633cc71ca5fe8a0ac9110aa3c49e760c2986f61e041b7ba079598cc07ef501b78f34c448db29b9386e926",
+    "secret": "3c0ed26cf557278843925ecff046d9ef535bfe8f8e61b8139596dca0c25563adbd994b298d84ea544d3bb42b5d7400c37eb17907b2c2c533a66a697c0bc90591a94c793834ba5eeaa0c26f15b15e034baa4b5757ec8c055fa94d9fa6bb67cf15abf32059511cfeafbe9033d8d464d71b83b9bb1823f3bd40f447e676d06f724005105e4389a9499f1273fe09fba1e05a155c0b9d1b3e584f47adced450bac5a3aa3c49e760c2986f61e041b7ba079598cc07ef501b78f34c448db29b9386e926"
+  },
+  {
+    "public": "0d1547838648cf63035fb81a5b49995e5869dad2e2e4c5a283d45a382012e20a532798e1042499014452e985832e64edf226d8b8972c64c94737a67782f4bffd6815816d33512ab230ecf95d47aa3a0b1a4f4a22e237d1567f9cd7a5ce097977b0dbb8ffb269e397c1ef205a58480f480064cf3e07b2bad8f9fec403af75fc9f",
+    "secret": "90301a2c456a5d0ca03c2432bd3b656ef25ed283d7da86a9fd6960d76dc1c09ec4c84c3446c76ec3908254e7b6cb4480c7166c07f0f101e53d9dc546229b39b8532798e1042499014452e985832e64edf226d8b8972c64c94737a67782f4bffd5fda846d3592e3832c653d33b836acb5488fb1c0d5728b7840aeec0e20f504e4fa62d5c0302403fe1dda9b3ecbb33a8e7b5ee21c8f63d1f30d00e3beee30ce11b0dbb8ffb269e397c1ef205a58480f480064cf3e07b2bad8f9fec403af75fc9f"
+  },
+  {
+    "public": "a2b38ca189065db3df09005131ebf0a432c42dd31e5a4a5d67180edada1a446a246117f4c7eaa0adbcc26c179a99157c7b88a4d630eb171575021c58ea30f6e7c53964cbf62eefa50649ad6d346751b245a77b89cde4fb94e119cc682a17a988465ef7c99903cd4fd263a8ab295fd3c20aac7c2d9d8a7a39dec9aafa7f1fce3f",
+    "secret": "8b4a8671612845f54a19a98fdd08878da75d267358b923bdfc17b8a1ae0a831d75d5e19b0f61b9e53d3eae5309564d33a4a019985bc7e2492da276df941cde1a246117f4c7eaa0adbcc26c179a99157c7b88a4d630eb171575021c58ea30f6e7ebe7a30eca10003db8546a3dc1c585d37d5e67a6dc82ae073bd6818d00b098fb0b28617736e2fd69b1c60c07dc9eb7d91c3b1643c1bba7380bd9fa9d75f7172e465ef7c99903cd4fd263a8ab295fd3c20aac7c2d9d8a7a39dec9aafa7f1fce3f"
+  },
+  {
+    "public": "7fd6d4fb525b693840c00e1e6751f8194a0b00565b2f8ef94d437685105ec2445492154032db7653dd4cea002ba924799869847a6e060f4018b6e487596a5e4c69622d3fb82bcb07dc161ad8dcc29878672b668d97b0539611f7846f05eca7ee19640ad6031ef7ee5f42a7bb09bdb41b10df77ddb40bc93fe784ffaa7692844d",
+    "secret": "9438013148e3fe4eaab4e76d18af6cdc08e144e540f131b14c5038d6eff1887501448811254de149c424de48a9cfd5ef15c7b05bc43d08c3a2fec859549335ff5492154032db7653dd4cea002ba924799869847a6e060f4018b6e487596a5e4c3b99caf2bee397f5e715ed9e966c72424bc679a650230117b0f35cd4e8d0ff592bd6eb4b9b894c13affd8f8cd52c78ff1e184c97ee6e36683e872ec12af1971919640ad6031ef7ee5f42a7bb09bdb41b10df77ddb40bc93fe784ffaa7692844d"
+  },
+  {
+    "public": "7271034dd55c74592ae7c74b75a40ccbafb4474cc78bb272ff34152310e1bda2970f627fce9d09ea55ce23d9a44e9e4c7b3e9c7e7c932b5fe776f27d7b603e6b0ba0d0217f16606bf6765976b0ff2f67f39db6fa04d412ab6184cb690bc263b71515e9cb5769ed60b40b67111609bc1a2065f4686e2ee3b81812e5ccaa2b8e80",
+    "secret": "87f8b88653f93b75d46869c0ef5a731253dc9547fd16ce0b67615f750483323e31371b9ad5f2b7ba2c10b5ddd5936b15fa859ea25a47384ac3f546b3b543143b970f627fce9d09ea55ce23d9a44e9e4c7b3e9c7e7c932b5fe776f27d7b603e6b8dedf28f19c90a3d9634ad2b8baba08c83cba1838860a4d600ad8a2b60664ce1e89d80c2ce992152587483604242811fdcfdc808ef945f085af9f0e3b6f7ed4a1515e9cb5769ed60b40b67111609bc1a2065f4686e2ee3b81812e5ccaa2b8e80"
+  },
+  {
+    "public": "ed3ce8e79eca83a7136071573295dc1043e67fd3299f6a448b4d4f5a8771273223e5b4665ff8f2342ee39725fd20817bbf386f1e9ecdf08596fc987966365decfcada6e022620ae4950a9d4d02eee28272eedefba132e92e386fbda96c82a5956684cb77dcba18cba516f77e2f5bfecba1c3e9d84521877205209a3baaffe6e4",
+    "secret": "c64c75b1107bdbf1345322acb6050fcabe65d8aa8402fb1b427ae63cf4e56016af84d21f0438a7415b0d3b11b694c2278a911def7d0809beb0d9cc69bc4629c323e5b4665ff8f2342ee39725fd20817bbf386f1e9ecdf08596fc987966365dec9dfa07509b69c6eb8d2f66ce7a8d1dde8ba2e7dc12d4651d3fb666e2c476e7279422163fc1fb87722154975cfa60c6086078d9d57cb27d9c6f23bdf926345a906684cb77dcba18cba516f77e2f5bfecba1c3e9d84521877205209a3baaffe6e4"
+  },
+  {
+    "public": "fcf2ea652b0ca060bcd5b9d90730e3af389361faa5489f7ce38c90708098804a7fb360fc140ba1e788de2e283d937460efaa973c3bc49981ffa1911159046c7888d0f27a93ab9b81dd52702096ff8006ccf116e50162691ec7986263097986f48dbbc1eaf4aeb7a554a4e2dd72162d59bc8ae4af951166b8bd6d7bc9609386a5",
+    "secret": "38c98ec46704bea118eea8e0f7d46525f07732e6afb6233926e8764c4de7b302bfbc85aaeee0026694632a6d6fc5c00f6ae1cd87a5519c7b4e51e6b7995be1ba7fb360fc140ba1e788de2e283d937460efaa973c3bc49981ffa1911159046c78362f2d5f9e0eff1c5320df8f3c01fc604ebdf93206e8723bf5e7881d4139a0509cbc16a2d887af5bdce2156f8b5a30eb7d02bc1c6fee1a2ac7e79b8cd33b2b3c8dbbc1eaf4aeb7a554a4e2dd72162d59bc8ae4af951166b8bd6d7bc9609386a5"
+  },
+  {
+    "public": "65558f45fc9873e7ccdb4baf0dfb6d5e7c486f6f5a596389241aa0d47ab198e5e3c1a2581ef3bd6a75d2bdc34f4f782bcf52a2d8248203ae9559fba2304f9799b446872ffcfc6eac2a163984017c0a57988086191c70df3ba5d5e5452cf7e28fccaa9a6d385789cd02177f298501885ede6d40de51eae07ca803c17fae3be52f",
+    "secret": "70ddbf3e5c0ae2180739e62ddd61bc086bc8138ef07c987e8389e24d5342874e23b0ca26389faae9ba5a53e14bf6a4348adebce0c3f41e8816b98e9543503df2e3c1a2581ef3bd6a75d2bdc34f4f782bcf52a2d8248203ae9559fba2304f97999565b08ec46b78cb69ec6b4f484a394becbf6dd61ee3aa15404bbd81ddd43ab3a870e1f9b374583684f7edc1dc3f93883479eb3724e6191e8173ba6a1dc4e25eccaa9a6d385789cd02177f298501885ede6d40de51eae07ca803c17fae3be52f"
+  },
+  {
+    "public": "b5a7fa3f3a22ab4638551708ccc3615e9a76b205ed93c09463f9aae446e68a3ad210a8b95f11d19942d1b4b4f164cc022e3d0b886917cf4f546e9a6456ee465eee7b52edfdd84279e7ebcf078d80b20b6cc185a297abfc341307dbb6fe0106068024b63eeeb75b4ff165d5a83b4d75ddd2b9ff0c3fda3b9b8a7d90dee0d6a541",
+    "secret": "3221b0a65bbdf9253b6c2ee818170a242978ece8ee0f9eb6bc85b01f9986826edc02ce795b7f948e741e49500c2f4b56477506f4c72ac808b1cccd57c6eb013fd210a8b95f11d19942d1b4b4f164cc022e3d0b886917cf4f546e9a6456ee465ed4bca8da5e2c0b14d29dd606dd800e76b94fbaf00ffd35f94e93ce18a6b598b51c530b25e5101bb6927a2701a28e61e587945cd7e2ba4dc68245191ee4e4f2b58024b63eeeb75b4ff165d5a83b4d75ddd2b9ff0c3fda3b9b8a7d90dee0d6a541"
+  },
+  {
+    "public": "b92335716d74a3ee8b4c064deff017b23d2c0a00bc9a31d088150ea336cfadbfab278be0b714b0fe3de4ff8b7a011ec5cdd0bc7fa132a8af9d9cb6726efe0a2aa3b0e42aa553e0df914698481c5528fb1ef33a2eef9fc06564376756ee643b7eec1a500bb664a350d9658b1239be853a9dabccc01a439f0b94fb2566f4e229ef",
+    "secret": "563419d8ba2150edef50dca70c80c90ac2c1a33f9ce23ff787d757be0f03475460dfd7c1976546d24fb8c5cdb1755709d73859e5a0f50d637f6c1a8cd992858dab278be0b714b0fe3de4ff8b7a011ec5cdd0bc7fa132a8af9d9cb6726efe0a2afa6c32690962869600d0c1b68bc98781f32b8f1a09cd6db6f66339838f571b2a3ef53afa203d28739176baeaeeeb051107f179d3334db465b0761269b55ad2b9ec1a500bb664a350d9658b1239be853a9dabccc01a439f0b94fb2566f4e229ef"
+  },
+  {
+    "public": "136c83b716d89459457f36ab1e597325fbde68c529abf3b8c7b483ac8f50ab798e3dd3ba1fda544c6e3044b18707c8f163f183b7fa9efc76aa0a65210b6892debdf8cd139fb45f7bd4c49ad37f1ca60ba4cc09a50d9fef2ff86dd3efb449a82fb1c1a31b08043cb590a514b1d749237c6b3bd77a1d329b5af815bf93b8041b27",
+    "secret": "8d8689be437ec45e1645498e1823fcd9e55f9392add882bee8d0ddd1bf21c6a9d44f90caec6dd9db3e507e15b1a4a2a6affc46d80a75195ef7edd94777ccb2858e3dd3ba1fda544c6e3044b18707c8f163f183b7fa9efc76aa0a65210b6892de0b328e16937c4226fb23645df9bd776aca632bff7358b4f865949e2776a3d7ec4243717dd83eca8ee67a7ec9255ce7e4bc958e590bd21f12cd53e70159028598b1c1a31b08043cb590a514b1d749237c6b3bd77a1d329b5af815bf93b8041b27"
+  },
+  {
+    "public": "e9443f4998975797f4c73e3cf3a0fe69279c9834ca935312ed066092d79b95a5a7de9629972b74e1744cd171903f32a3da4e3fecb93108541cc5ed065f0cb705dc6decc1183c68ace9572bba18561158e1fff9029ab2af20609f1106fffd435feae8dfb39e9e1ab89da11bebf5cac6cb68ce31b2723c33fbae7797d37dc0f377",
+    "secret": "3702e0fa4e9b1b7bb341aa2b07390c171394c2a033a64972186987c68f0854826f1ccce7e63c014393673f11e1522541875a9b9ae0f40253d9c9a0b07627bd5fa7de9629972b74e1744cd171903f32a3da4e3fecb93108541cc5ed065f0cb705d826619deb97aa7fed308121d0ee2bf235af2efb0a6a103576e8ca72f945e084f46162c8e15f0db8b8aa2ef5d7f08ea66d074d6e22c17d0b92dc7ed0d0dea5e2eae8dfb39e9e1ab89da11bebf5cac6cb68ce31b2723c33fbae7797d37dc0f377"
+  },
+  {
+    "public": "fd106a25c827d23ab65064047bdb790cbc70e9617607791aca3bf6c503d1c660b99f429ba3591336c03f57b757a71f70a7401958c8670012aa33e3c45af684030a9da3a68c9eb7bf2b209504dda8e7ec2be9732a425bcb7aab0a12604b340f69d46366382a344f21f22d3d114d3eca0c17f168415c2767fa6fbbf821d63d4a0a",
+    "secret": "2bc0ed2468f5b9be25e31000957fa05830ee3e8f857c2d093ccac962ffe9da96f8035e1eb7c4bb02eec4b5703a87f9087919a0d12537b2bd2f8aa5719b8012fbb99f429ba3591336c03f57b757a71f70a7401958c8670012aa33e3c45af68403bfbe4adb45e499ff1b7a669d1ecbe4f0346fd23f5cad44039a714b10846afbbcab692a67c7bb2719c66cee7d3d826d766cb7220c968ad70c6a97ef4061e830c8d46366382a344f21f22d3d114d3eca0c17f168415c2767fa6fbbf821d63d4a0a"
+  },
+  {
+    "public": "ede3857db65380e127be94b9dd35a667e109162693d9dc121a1de24b187ac870942a09479a5d60c9dda37a646a37029fef6a7b0c8d32094bd49b9379afc820ac115ab2a16e9936756f7b9a8fc8b7cda65dcd15e3099efee4d5d6c38978188ad900009cb0ccd0d1658dfa7386262a976c6d2b72710df7f35ff1aef9ade8243764",
+    "secret": "fb577908a1bd270e8d7408c7ab9d008ed30340fbb63a745cd841255342526879af646578af4f97b9ca6f14dffc50b0ed15e5330607db11f8e9e3f8b646b1aad6942a09479a5d60c9dda37a646a37029fef6a7b0c8d32094bd49b9379afc820ac5639aa0c173d044ef3e2e5e37e77833cfe85ed444a65f72c1978afb93a9be39467b435db3dfe2beca60e0618e274916180e7f56dd7ec363f8afd6698eca46def00009cb0ccd0d1658dfa7386262a976c6d2b72710df7f35ff1aef9ade8243764"
+  },
+  {
+    "public": "6ab9d4371d311b94956254736b53a375be9d4ffac080a340545b82f16dd0620ede624ad18f37b0ed46e69e05407940abcd773bb4541d7d03fd825c85094b2487c54445c4e1105827c34c728320a61522f78f297c9ddc78eefda599f11b41486769bf166536c38935a22b942c5d92baf8c213fc02e82cb523d9ce9f594af2e895",
+    "secret": "bd0741af08334e65be027cc29f6642ab5ed576b4dd6a3535876573502a697b63b409026981066095eb1b10305ffa8755807b5c1b7f84d71b78c3a13c19bf5275de624ad18f37b0ed46e69e05407940abcd773bb4541d7d03fd825c85094b248758235b5417359fac81656b24ad19cf8021db069a4d96edd2d8bd554e9fcf6379b6bca93920df09a555a6510f2a9c49fae7f607b2888e7040c82443ef4f73d3c769bf166536c38935a22b942c5d92baf8c213fc02e82cb523d9ce9f594af2e895"
+  },
+  {
+    "public": "069f46766f3beaf40af6a9a8c831a2e96f2c212710d5644c4ec19fbd378262dd39073d7f98d56d6c189a2d6fec1946ecb822249c6b9751d01d179f8ee4aa3b0341276799425665e14c4f0c04518e76929274e9b5cc9e23f3f231bd12ac4075484e4d6349ba11755e139d2ab77620891ac4e360067865603b36bc1c13a331052c",
+    "secret": "5821835fe9d07ac9e3ac5b534c2e51ea149d8bb83972469045a891ae659bcc36d6c03b194a82025f231b7f824d5e85c239623d1b1c7081a6d949916d8421e9f939073d7f98d56d6c189a2d6fec1946ecb822249c6b9751d01d179f8ee4aa3b039c00087d5d01160e57bcc358df3ba02f8ce1d8c37246aac4d233d876c51f195611f16a223f57557fde950eaa8ccecca6b8d536acaf9dcb08bb96dfdf252be4424e4d6349ba11755e139d2ab77620891ac4e360067865603b36bc1c13a331052c"
+  },
+  {
+    "public": "d5eb784778f6c02b5825c872fed952a2652577fb1d8cdab93623a5b9d7b658c82f5a500a0ae0184d08d853320467f220b4f154d57844f3b0733634161894a21d4edacdcf4f79ebb1e57f48e67e6b61abe233aec1a6b0761277787612e392669a96378535bc65c55e36bdf23221bcc2d6f83cfb607b4fcb2eb57054033129e623",
+    "secret": "d8acfbbe668b95391230a2a890194dc5cef4187c3e835b5249e7408778059baa83f38d0d1022ab8ebd9af9439b100ffd25f3313023a5c525b1cb580e9bd2e9f02f5a500a0ae0184d08d853320467f220b4f154d57844f3b0733634161894a21d737edf0af8efaa6e9aa9ba88ea0bd8d417ce1822a137b96efd68350a51936f7edf0a5dac67cc38eebb3ac81b1727760ae110c2a9c8b99232d9822b7c67b6a46996378535bc65c55e36bdf23221bcc2d6f83cfb607b4fcb2eb57054033129e623"
+  },
+  {
+    "public": "721358935122c0458054181624e2bed00bfa67e73717d04d8381de70c6aa80e54592e08854db7fd640ecef6498438c2827c72c75e2232ad6c0019fc660a0c5813cb8079585e9031ca095b2cc7e3faec3c7dd980fcb87b057b672d0c2271cdbac81a2596f9fecd34402ee9755c926447978719f99fa20fbd419280da3c68abff3",
+    "secret": "95c630d5ea29517c78daf0615006e04dcafef52e85e4f58b07d2db4b78f923fb77eefa8f7ca0f67e06f37e3d5962a6d68ae36e80c1f87effc34d83de22e851a04592e08854db7fd640ecef6498438c2827c72c75e2232ad6c0019fc660a0c5815749c9b5710f39ff9326ff54e8c1785ab00f7285f2f1eccf268c24a16cb055973c37de28b135f136609a0d8a1fe2ac288f50e0ee76ca5d6c41d86ef713026b5881a2596f9fecd34402ee9755c926447978719f99fa20fbd419280da3c68abff3"
+  },
+  {
+    "public": "d7b6652e15e872689f14628c494186eeb8ad04f4e86fdef5e667a7f6a1d0b0f534a79774b55ef20c6bc5252d051b7350bccb73460b2e40112d4ff8697e14e8b9bfdc82f7c6c23d53c2774a5e8f62a2945127e85e00269e6d802a5e2fdcbcada9f7b65abdb441493932b25a79f97218a917d619e6529fa9b4bfd79206add388ee",
+    "secret": "b9a053a7abd68ab3194f31eaa5f774d8361d5ba55e47f39b913eb0e304ad5e15935523e90efee7b6ce0d49a0f4cc48a6e96a41293ccf2b55fc2e4e3472d202e534a79774b55ef20c6bc5252d051b7350bccb73460b2e40112d4ff8697e14e8b9c2daee98bd0165bf3939666e7c890426c87468e03e3f2f50e4973299efc96f399d49a924ef93eaf35731ea31b32c866fb1cf93c3a3328d6eff88a7308679f887f7b65abdb441493932b25a79f97218a917d619e6529fa9b4bfd79206add388ee"
+  },
+  {
+    "public": "da84aadabe2b618478b951fee663cb237566a8f4b05221421541785761b1d4689a845aa8caa0104ac13506a73f492d4139b32b8abeeb93ff1b287980c2c80417b2c29324ccdbd9e394b9f01b964e19b3d9f32702a2a98486f23410a1ca73881a66479a32efdfef25e80f740195184a0c30c5b7a3b7c0fe291ffc2bf5a8889f56",
+    "secret": "7f36176eec835dad7592438deab0435ea2a9fe19b614ce4bae5a21b5cbef742781ae662c92b3ecd17531c42e8ac70c8ba637e718e40ea869ee115483eb8a04029a845aa8caa0104ac13506a73f492d4139b32b8abeeb93ff1b287980c2c804174ae9983c8a6e41fc0620f42a1fc17ed1fd3a17349f9fe44825a8500e1b6bae20db7e5aac55441e0d1468303209937c6f1f57a5ae5e89c426d3a23094aaee0e6666479a32efdfef25e80f740195184a0c30c5b7a3b7c0fe291ffc2bf5a8889f56"
+  },
+  {
+    "public": "44d565cadecc14ea7ed8aab12d3e654f174d22a353c5ce3c365ae379cf7fdc9b79aa5981c12945a2359493ab9ac777c63496b25f6e3e3094cbcb7701102ef639c959c4345855ff442349f2d7e137132dcb72ca575ee4135b19fa73c55d8e92a76daa232236e19f9c0c958d4faff801ec78ff040148d3b77001795dfaaabc20a0",
+    "secret": "bff5af8e8460470f62fdbbc56ea41bf0465e20df0ba1832e014124dd2ce0f31207984e1df60dcc9830606e3ab2f391271be97ce0202255d4a5e35f50944d639b79aa5981c12945a2359493ab9ac777c63496b25f6e3e3094cbcb7701102ef639993e7130700f31551ecc87da814e8e6e9db67bbe6f7cf9ed0d98b1144c7ee21ce5ed8fd8da99a39482b5e68b327cb9dceffeb8835f98e88d5b857668be500db96daa232236e19f9c0c958d4faff801ec78ff040148d3b77001795dfaaabc20a0"
+  },
+  {
+    "public": "c26d72b2f6089805ef9e6de6b900f01f39a261dae437fe454d193065315d513e9c754861cbcdb884c975d219730bb50835879e129e3ad4292c5c655c426339398ebfa6677d91113b65c60e5b6b35a55164ab614c050a83ea214186d97be11f68146e07262e947fa52a9c3388e55023ab5c98099c4d7528046b51aa34a983e824",
+    "secret": "040a41b954905abaa5407a95284b445a194f26708e02e8188dde7b1e89d4d83a9e052b02ee4ed8de412126bb41b4426a45c93ef5ae97a8d8706866516448bee69c754861cbcdb884c975d219730bb50835879e129e3ad4292c5c655c4263393933830369b33fca8b93b8748ae660412ed9802ec0adfec7218bc8089de0aff319208a715315cc8db3a552c6cbbeea0ee006b6a81ad8291f223282242c9ce5911e146e07262e947fa52a9c3388e55023ab5c98099c4d7528046b51aa34a983e824"
+  },
+  {
+    "public": "669c814fcad9df4fdaeab8061c020e9fa08c5355521189ed1574472194a823ea567519bd10400aa689ddc674d1ccae8867335f73554d607298f8e521dcfd6ede3b2c6c0b103341accc2669b85ed647673dd76ddf877f60967a8367bfa10332d0173206dff2f83839485fff509c07f5d72bd8809d230cb9e83f61b67c6b37513b",
+    "secret": "094fac2711772ff795a4947c3c0c34cb98d2941bdbb9332389b3b3a18b930a6f63928a624cd99efb8d31ae26acb06eac277da61048624dd4b55892f4697d2bca567519bd10400aa689ddc674d1ccae8867335f73554d607298f8e521dcfd6ede7478047e4fae649048f59b5abde86298362951df49bd82f0b2746354ac4e89b1cbede591721e1bd7f7e6502f1962d5c923258d2888dc99575616a2d7720118d5173206dff2f83839485fff509c07f5d72bd8809d230cb9e83f61b67c6b37513b"
+  },
+  {
+    "public": "2a007942f85c95fefd9c60703a26260105391f1d5c195de4b413e2d385425c3ff21377ba73a9c87af8f283e7ac4fe957274902c637fa5258a0637f7e0340ad12ddd9fe5c76da41f6ef2beac2a606415d8eb828c22ca31bf4fa89bfd27d3fd592827588e95c7253f815a624244913be16472ee4129b99382b96baaa6c80e4458b",
+    "secret": "424b587b90e9178992e540af2857f156aef039c746893f8025a67cf8d0db98d26203dfd12b298aa8734f54b6a17e2eabc23b9a89bcc0f83b19daa6bc58c87cdff21377ba73a9c87af8f283e7ac4fe957274902c637fa5258a0637f7e0340ad128c2a5bcada918fdd0430549c7c4228c0459732c66827d21bcb7c82d87a6398660d9e40f0d2a88c871f18efe8a582ba6bcad630252a6028c19eb2ed94ecc3829d827588e95c7253f815a624244913be16472ee4129b99382b96baaa6c80e4458b"
+  },
+  {
+    "public": "f41e555cb15c05b61db6ded22811d5aa48185f7e6c31b38f777b427962ea1bce8d64b3a6b0f0121ae3a4e9610e2e354e674d2ee88c64f83045469e14155b764d3618b7bd0362ea7aacfcee42c22a89cecc090a6e34e07425762b4db021b46c8a9a39535ded2acb3825945430e2b01ac8bf7d5f976150e1fe4d7fe13023114042",
+    "secret": "a6eac09cfa8b6803b382bd38d59460802b1d88b26081f2fcf2e72593d691df88d87ff344275744c4218da633e2e5ffeb77f31d15706546048fdfd21fff9184248d64b3a6b0f0121ae3a4e9610e2e354e674d2ee88c64f83045469e14155b764d2d598255f8d90f6fbad3fd6d894645dbaa336057feca970980dcae1dc1f5d25ed94ac747f590de431296172a57b8c079bbed371af306a5a09425c8161ec152e19a39535ded2acb3825945430e2b01ac8bf7d5f976150e1fe4d7fe13023114042"
+  },
+  {
+    "public": "15a2abcace85cee23f212447d1830b485817a4dd94808792cd6a2f9379ec5386fe34b01d392ebaaaf2097d32694a9012a3986f9a906c32d2e934b5faf0adb8d399cb27db74bb4833a770e6faa0856a43c19d02861a0701620fb57896e330597181aba18b42a7395f74cedd78525b52d65590060b318e32035818bf5cde3bb61b",
+    "secret": "73ef2cb937bd9b7abf36d457e39cd9695ba5a4ff68c6eb7f26f8c43b410786daeb495170fc5a57dce70036cb9ad35b41eb7279700733da1c39478797e6ae4a5bfe34b01d392ebaaaf2097d32694a9012a3986f9a906c32d2e934b5faf0adb8d37c73a5d64615d2d5edfb0817f1a4ca64553706498c8edfc6a8f7eeaa8d4b73c6bdd9a89c0198c30d6264fff378c0b700b9f9cc65b601005068cb4b78e150249181aba18b42a7395f74cedd78525b52d65590060b318e32035818bf5cde3bb61b"
+  },
+  {
+    "public": "41ef40d94d5263890a8e3cafa7b674b6a3f170de806059fc44f61ab934a9b518f3a0f899cd310763bba683c1464a19f30e0c63a924bc4138d68393c94046e7fdd9051d76ea58a74d48fe7910df3257722c3abce464dbb2cf22818438cc623279f0b53f124b036e484b62ad8cbe98508b647849297b3a13d6c67d5b04897f1154",
+    "secret": "7f7cab090d5b1b6465a5e5212ad13f991a49693ab2b61e5e3a1fd3e7a56b5a039b403604bfa5c88a3d1567c799186f1805ca72f89d0acabcef02bff081697efff3a0f899cd310763bba683c1464a19f30e0c63a924bc4138d68393c94046e7fd35b175a3580d599308766e356c9acc927304ec327b20b43147265cb6438d002ae874d6330820b158613d77ecd20eac1d18a7fbad314dc3de0b0f3b04f07c6ce7f0b53f124b036e484b62ad8cbe98508b647849297b3a13d6c67d5b04897f1154"
+  },
+  {
+    "public": "cadf01cf3811469fb79fd98de289bce4ad6b6ab8ba503b62060460991bb746271a98042d8e7fb14809967d2c91f147ab7baa067c8b361b41d965408414fc17590282c2f3808f55fc9082cc9adc2a9d9e3263920feb8ee9b286c716e87ff3a9bfe428491d805844c45c501e83b867f7750a169cec3177b65e709b1704fdbbc93f",
+    "secret": "79ab3c62b6b9de5c2d9f263adb734831ae5522d1539c9c5e85b9a24cfddda149cf29567b65c3e66d640f1d40d7c1b15b5f05490f57588c50f287fb558f3251e01a98042d8e7fb14809967d2c91f147ab7baa067c8b361b41d965408414fc17598d5ee1d44e305c24c1c70fcc4ac70bd2218469d3ed6ed0df2754490f7df7bbe0472e3619da34fea946d41d3f2e0e19974ce0d4c67042d22345cc308267224e38e428491d805844c45c501e83b867f7750a169cec3177b65e709b1704fdbbc93f"
+  },
+  {
+    "public": "e299c7d11155bbdd9e826aa15624f0621675ab69bb9243b90fb4c1770b35a19cfbc8b12899b5a463c82fd828f36b697c86518e1706997521d0a2677906b10091a48a2d92a7943a3a20001aae3f5fbf70f5d9d51f4707305bab3f58f9b08939a685d6eb6a25921c744ec573ac7dad97cff9d003bf30b29db9152fc5936723dc31",
+    "secret": "f6e7a9286cd200dda82cefba1e30040b9a07596074dd217be147c35e5bc53492cc5b76bc27196c57c1bce7bd59f410a7794d8b4c56be16ae18d79f887bfc014dfbc8b12899b5a463c82fd828f36b697c86518e1706997521d0a2677906b10091857f112242719de708e0fa2e13b003489fe802633af2aadb9ca2411439b4209f517d9178382ffdb8cc58f6b75c1c9b50da4ee833650bc96031bca910eaacd38d85d6eb6a25921c744ec573ac7dad97cff9d003bf30b29db9152fc5936723dc31"
+  },
+  {
+    "public": "a0ccb0e10022cc8b688ccda14d8524dfbeb7a0c1d45e0b81b9de55950c55614680fce3b4abb8d412107a4508fd3b3e93293ff02792118c2472ced6e9c9d07dbcf241b053b924664d84e8a8d03a16da861057a54e9c7503bb492bb878faef7250afbb6b4d4c0b1f252ace2d2785cd3240345f30cf67dd628cc800d78a468709a9",
+    "secret": "0d0e5b949b35e4da15c694083eb3ba9228dd13432831742169aad15cdf8ef241a7b2096d8e700ced1e9631e4c79414551d1590f288fa40d4445831315b39b1b580fce3b4abb8d412107a4508fd3b3e93293ff02792118c2472ced6e9c9d07dbc338d327c0bee683ac16311918bd2e53d37e1a41f8fb9e63d7134d9e57298f36472ed44f5fd105db7a052e30e3f9bea2834de4c5220b4b7e54bd9546a4ff52f81afbb6b4d4c0b1f252ace2d2785cd3240345f30cf67dd628cc800d78a468709a9"
+  },
+  {
+    "public": "22eb3ca1ac8b010670823db79af589331641677908c6b8c990866344686a5f7e3eaff0058faab2cf170a3aaea520273d917f96208c87743584d6b9577bd739c4d8b44d2c40efcc517f16b8304e55f75038bda56f6152f2c21527c5fa3d432b5bdf414120c19b0d512573a9cb880608ed1297cb415e686d34c8829edbedbb4e92",
+    "secret": "55b2ec69ec8e277953d6e8f22c252c51e00e3b20b1fc9b48e5888cd29f93fd86fa1392294fc31d5ece44f9f114dbe4413e0aaedeabfdd9a47af8e2aa19e660f43eaff0058faab2cf170a3aaea520273d917f96208c87743584d6b9577bd739c4c72ec327edcb0398d7265e8c73a514a3c9216487344e79a3ec7ab9160d91cda6f1009273e709f65ebe033a8bdd2040d9a571490b47c3d665fe666f336a5cacf7df414120c19b0d512573a9cb880608ed1297cb415e686d34c8829edbedbb4e92"
+  },
+  {
+    "public": "e9896842ac49a7fb3b09d73356700668c302a8b9e3f7c1737238629bb74570b6237f46b5adc797ed3878efcb39bb182f52cbe1f949cca06e90723255d37b0b6cea251c95bbbd2b2dce376f746829c26f90771a497e0e6fe728c1cfd5849b7e95a273ad1d7f10e523e127a0dc3ac108e8f5c14aab6ebbf529c114af4dcd976cda",
+    "secret": "b55501b10623792e6795255e5e4c5a5eb5f04c15e56f6b26563efff2066d0e4c2c3240fb1f0a1f28a9d7e358749a06b13e4ff101fb9fd31a7a1d18023743eb58237f46b5adc797ed3878efcb39bb182f52cbe1f949cca06e90723255d37b0b6c8ff76cca1e1dd23d67b8899ebddbc44362c4a166153e5fefc15c28c3246ee2d62b704ba76803753b9122aae25130bfd8246274f8fb4bf953f890ebbd44f18429a273ad1d7f10e523e127a0dc3ac108e8f5c14aab6ebbf529c114af4dcd976cda"
+  },
+  {
+    "public": "21b1499889f888280574c98037defbf4803b28a5b40db65ad6fed0cfcccd43f82505fcb39796b29e1435b3110a0f2c708155055432625db2b5e843420dc7e558b840bb1fffe2e361fcbd1aa1b1eb80fb7cf772a6e9e3e432a8e8115a931dd98bab1498984f1219549151bbde43e7780af9cc5ab6d5ff75cbf9d3df501c138fed",
+    "secret": "19a16fedc8c9fcf9b828276262c81ef17620b37227dd38d0cd295d0a14008488728a61b7f40c65e62ccf202aa4b4e76d1651b2ea885bcb456dcdbb4768d0cfa72505fcb39796b29e1435b3110a0f2c708155055432625db2b5e843420dc7e558d24570373b84ce398a79643370d31cf44b15169086a1d69568e9c0ea19d6fbaca2456e4857f0f66cb7b2148c7e1fb122325dde4e0d41bab9d5ff8b289e3ca2bdab1498984f1219549151bbde43e7780af9cc5ab6d5ff75cbf9d3df501c138fed"
+  },
+  {
+    "public": "c59d85cc8b33477ffd28e3e7f6d9f6ef066f74e2879cc634a9edc8c8284e6f0a04411b5c03bdf6e9f15aa3d76c1689326eb99952adf72e03acba5bb1cac7b38ebedc4a380d054fc79ee5e10ceaa85cc3ce3a543ae7794f29363cec51c7423eba795f20adca50ab80adb47874670a78cc8fe1b63506d42f9848b35689b3779105",
+    "secret": "23a9ce00603b1187f7ce6057c95b4d219b9b2b7713d9e83acd257a17a5fab1d3d5185fe12ba1836e0bee44c3f6c773b302cdb51fd24208ef3844a18354b8ec5b04411b5c03bdf6e9f15aa3d76c1689326eb99952adf72e03acba5bb1cac7b38e28bc8ea17e45aab8d82d9dff86ad21ddc61ed9de032aac930e5f17cad7e705ddeeacdad3f20a6119c0287172bd900a8f8f6ade24cbf8913ff83497bb7b0f7650795f20adca50ab80adb47874670a78cc8fe1b63506d42f9848b35689b3779105"
+  },
+  {
+    "public": "2e484ee3653ffdbb22046a413d086c665030f95cb01b76949b2712b3b3a1e2a641db90d4d381d4f3d524d80fa6ad926632b5b8f981c76700fc4be7dba8d1980c3be23373e4fac84b838af02b752b91cc491226ec841fc0f32bbb051442b3a1b5eac1c9b47f4e3f7df3d9ae40cb142902defea9455c13fca953276cc7d2bc256c",
+    "secret": "b086e0fc2eb879239d9107c1a5fa1cd59690206b057f53eacd37e0f24714983f2a2d91f55e3128bf9c633743b7c26833c812424e644f531690302fffe81b061e41db90d4d381d4f3d524d80fa6ad926632b5b8f981c76700fc4be7dba8d1980ce2ab696ce667415fc9b0b16372fc5da597b950f13b4ad03567e8ee616fdf6c382d6c969d03c9369a70f8074a7577d5392c6dd6b93a60983e2200ff93eb6c77eeeac1c9b47f4e3f7df3d9ae40cb142902defea9455c13fca953276cc7d2bc256c"
+  },
+  {
+    "public": "e51f7d75d531f26644d3e81b0735541bd843737c7ee0fadc133926a76b5482ef0c65977a8486fa7e58b2bf05d038e99580ace4f00930f902a3488b803c2063629a055f820374997a01d6c9a6910843189c51a3047e1358f964953c9489cb629146b92d7315096cc9c86c47f126f4aadac5df2c9a17d23980a9fa2453e83e6741",
+    "secret": "f5d9c0280080c4ed2f3172b5980333773266b9f7da098b2402590a422513e27a6a2cad650207eeec34f590693a086cb8a1413176fe2ec54bf8a03816bd9bdc160c65977a8486fa7e58b2bf05d038e99580ace4f00930f902a3488b803c2063628f4342ac36a6e9ecc521f0b0526c26314e3f49b1a78e5c8147e0c0d80d91b44a9abca50287666f4aa069e2c9cc78250b456f5007238d688eb938d44062756a4046b92d7315096cc9c86c47f126f4aadac5df2c9a17d23980a9fa2453e83e6741"
+  },
+  {
+    "public": "dab2de48e36c6e4ff3e43eca3b0d4f88a92efe8c74fc9a917faddbf5a3de40a82c3a073df21376296d67980680ce3ac6f922d1a9710b1e133f53e97306118b371418e86741ac7768940cc6233a59d009e2a31b713a59a530091a7a1204bf83865ebbfcc832e448acf346d3de496d26086dd50d88191d596ca6d1cb524ac1a9a5",
+    "secret": "290d0953ef6b61bd75bd7426f8a6e1e9b3dbb13b852f14774cf140aeca8bef3da58a0f589b39eada14c93aa4f9116f9c78c1f7d06c4e37491b80aed26585c49a2c3a073df21376296d67980680ce3ac6f922d1a9710b1e133f53e97306118b37447dd8804eda50dbcacbe249ffeb8b151093194fdadae1c0e0a369359cb958d3feca5174711c1c6552ec881efb4a1d7078e000d7a2efff4a8f378779f827f6995ebbfcc832e448acf346d3de496d26086dd50d88191d596ca6d1cb524ac1a9a5"
+  },
+  {
+    "public": "8f04c1b6507836daca8ce4d16160f8f823749a7359856c1b81a82cb2bfbbcc62659afdb20f241be33762d2a09a0a7768e670ec0d540a7261138e7a5eee89a92422a69442e757d5f96bddaba97325a7e6085d88e82b2193931aa7ffef5cda214d2919dcf116f04d87352f8c215dc7090011b94a4432fc302caf9f9d6684989a36",
+    "secret": "ea5b6b6d46046b71b7727aec4e37d35529939087baa6d5eb4cf826c00b814dbffad287b63d6778ce5611922e66d106a08b817c70406723a29ec36b9cb8698d66659afdb20f241be33762d2a09a0a7768e670ec0d540a7261138e7a5eee89a92483f916e83b4e78d448f69d25c42e7671bb73c84ecf7bd142c10b4605473cd7a18f4b479c0106c6b5624ba57d27682eb2e143662e0e1464b60b161b7fb90fb5252919dcf116f04d87352f8c215dc7090011b94a4432fc302caf9f9d6684989a36"
+  },
+  {
+    "public": "1f800fcc0abd541de71ace9d633ebace431f833134f36b41e3d8960e5da959469bc6543c65b9e56b24d638b950e96404f1130ab1c98bb2236f98bb0b35d1766d472ae5ffb19ff36c070e1091626d0ddb4efb7a81cbf56384c744a25df8fe02ff3d4acc0338c2ae8f9423db968259e0c680622ea4d07b6da158a4db5af49ff580",
+    "secret": "fbabf4d76f9b4fc84e20aea674afe473a535880b38db0d36c175182a224110e91b7895ec4f5222a9890403525e4a1e8b61d0fc669550b2619c70b1b9bf03f4889bc6543c65b9e56b24d638b950e96404f1130ab1c98bb2236f98bb0b35d1766d99b8fae56a3dc36443f0eb856ac95e990fb955ce7ad5156e58f92127190e90c41f82477aec896b7356fbcea5df189141fb6a9b17eab3bbf1300a68aa7744d2123d4acc0338c2ae8f9423db968259e0c680622ea4d07b6da158a4db5af49ff580"
+  },
+  {
+    "public": "e8018473e9126fd565736a8afed9ab79bd7a4c047678163b8321cb2ecdf337f428ffe26d8d4914ce7f86f521ac9bd07bbd34e639fc5332e833b17559f4fb3f7293d3e52a0496622f7e1889007ddc268b456b4ff35b094f1ea4e4b5ceb3b60a11a2becf35382815d0f9318d4e41f59bf0895ff2ba8b04b20f413bb5fa2d2245d5",
+    "secret": "68cea38bc86bd21ee964488de7ba51171dde98b716eee062fbc103c178c50faa229381acb2b3938720a94c1c4574067563891c467d0493c4b4286dc136f4581d28ffe26d8d4914ce7f86f521ac9bd07bbd34e639fc5332e833b17559f4fb3f725bd591c1f95e7551f09c830df058021c2605ffede85a0605da62e31c762638b8251c1ad65c2b91720da31f9c8d507cf411aa4d23062653450ffca276e9f7c00aa2becf35382815d0f9318d4e41f59bf0895ff2ba8b04b20f413bb5fa2d2245d5"
+  },
+  {
+    "public": "fc0e3afa2aa6bb1d6c5851b91a6a5a704ecb603635f757658cffc8ad44ddb7f153b3add44ee2de1b12a316b974c8bae5720a9c5e5d7f34941eb1d2d6ddb21cc9a9459eb200791c5c7b288649954d2f1fab48eb7a1e89f50cdf18bd36de7aaf0e3f0c1cc805565094e7052e0b5bb3f0a1301c9107fd126a4e51babfd0e45a277b",
+    "secret": "336e1525de0606ce8db78137389159a835919b14ca2a5ab5bd887b7e7182bf5aca717abaa55e81b893d5ab8033f0a124d8190ce5952c005590449d0ed0a364d053b3add44ee2de1b12a316b974c8bae5720a9c5e5d7f34941eb1d2d6ddb21cc9a5740258f663a7e59fc0edd248b5a8af5ca634a40d75f1d2ca0c41bd4969b68fad742fa5c9f2e125a3c9df5d20e593066a59a11108d5ec3fd52ed20c05040a353f0c1cc805565094e7052e0b5bb3f0a1301c9107fd126a4e51babfd0e45a277b"
+  },
+  {
+    "public": "f211bc943104008e7ccd9a53d823b78e00572936665114e12293450f196f59e2621c5e27803d78f38f4a7f1e5ef6e2f0150b6574cb141b91aa9710b739d63b2683eb52bc1bce1734e52193acc84bad854f52619779cbcd6088c29efb74e41539b3a31d5dabde3c22921a9bf05c64cc6020d97b906c78541d59214527fe2a8e24",
+    "secret": "e7a4f7169bb2575a44cd76431f32b8d31238dea0c98add1ee1119e3797c34a8541add019aad2aba789b39be42e01c6b0e79f6a5eb0b5e2b0887398d864de7ee2621c5e27803d78f38f4a7f1e5ef6e2f0150b6574cb141b91aa9710b739d63b260531f22961c1decd5ce42888f3f34f7b20f18b47626cfd8bc91211adddd53be60591ba512616a71e8d83957ca31910d93250644eeff137710652cbd7afa02a5ab3a31d5dabde3c22921a9bf05c64cc6020d97b906c78541d59214527fe2a8e24"
+  },
+  {
+    "public": "c3ef1f2f5679ce64632a9a9e95f32d699193896cb04dd5a3d7766dc7a09d0923622ca30258a5fdf4db825f82b3d6e2b916e5e18dc51a057695f61c727b4a99b501b52aa531c1b92abfe0acae28eb8b9dc77f00069cd194d071b7b9bf1bd7c73979ba6fa22ce68e6e415e6aae3b59455aa6bcbb0ec4e2c8598f46ef73f99757ba",
+    "secret": "d629b3e590d205702ab350439cc82c48ff5b972627a2b4fc13c1dd63bbdd22e49ff7b5f480db49485d5eecac52ebc6089a1f44f0ac1cac0b15a5e993f1893b8a622ca30258a5fdf4db825f82b3d6e2b916e5e18dc51a057695f61c727b4a99b5b1d5cb1f27d2d1311d7b9a7d9d39dc0ef57afd83f42f8e50608d9a2b99aa449926b5f086f74acb995e9c76cbafe47a4a5d93b75fed6f813d7b7f1bf35615ff6c79ba6fa22ce68e6e415e6aae3b59455aa6bcbb0ec4e2c8598f46ef73f99757ba"
+  },
+  {
+    "public": "9ab68eb0a9e0fc9e61d6507b8fe2e35a76961185c97391c8efe459c1fa7d66cb5f60c691d8d0cfac418b5806cd16a61994c74c69a473bfc4ce7e5ebf61373750600ddc3c206a95481086d156f76311de9e5a876e9be5864782657446f5db4b7b81e702be8a9565f8cf2715bafa3a3a67c4d2a352ac1f80a8194c49debd0593b4",
+    "secret": "065339fd6a0f2cac0df79e0c56be6de62707bc41435a5e839c26f9a22ce255276417177e0bcaa47a1c9782906582d4c04bc78f039bd2d3967323c60a64b9267c5f60c691d8d0cfac418b5806cd16a61994c74c69a473bfc4ce7e5ebf61373750053210201a185fc3cb07d7498c7805c93346684f552d06d4d22f6df41e645200ddd75337558752bf7418f04a7411af34c0cd71ce84b6658c274eee355e498b5781e702be8a9565f8cf2715bafa3a3a67c4d2a352ac1f80a8194c49debd0593b4"
+  },
+  {
+    "public": "c8c5d99719d970fbe60f61062931f561b029f4366e54b6561ea7d16741162649f7b4a39c2b4f3ebe3509a68be6ca52b5052e3be4b66cb0d7cd9087818401774a668d8d3143ed730c8a28bb13c2c6366b34ea5b54f56acf7437696537fd7a13015953d6de2ca3378b2fa160213c0d18fbe4eed01bb445a1b0a75108c0968efb55",
+    "secret": "5a5bf991da7b02c035edb3c3122185ecdc28c5b06235f4b93468a5062a836b0d54d505d0e777d2ab073e9ad5c8dd8e39b68169340d35704faa86e7b7e5ffa09ff7b4a39c2b4f3ebe3509a68be6ca52b5052e3be4b66cb0d7cd9087818401774a75a3f12e2af7b35c02a6860c8b6c5e4dd842f19b9938145ed18daf1bb78655e4f3f1b53d306175582f8f31a4aec8d74614e60328b6ff1ec072d0094be9092a3a5953d6de2ca3378b2fa160213c0d18fbe4eed01bb445a1b0a75108c0968efb55"
+  },
+  {
+    "public": "7c59d5fe60e581cf6383377ac8541368947adf258685631af86f434d8c4b6b7fa0dee5df3c895f363e626620d5c916fcccfcb06aa63e778e954d7dc416e65900f54552b27c3d0f14db587e55ff3391615e1f78f71e30ccc125f894be1c2236757362e4d07258a08a6d1d3d14e826ddab9b5eb1317cb004911f747fb9369bb01e",
+    "secret": "c0f77d41af4ec2a0322e3f2914c20ae32fc5145aab75c223744213341a82e6f3c7ef4c8aef36cd5a5abc3bc6b1009c9291a04f779d5e805a2ff46534a74f5aaba0dee5df3c895f363e626620d5c916fcccfcb06aa63e778e954d7dc416e65900f252e8fcb2ed5f2bb13d737d738d6ca9f106b4cd7035c55c19d40f1851baef58af8f5306702b772b9f478b3345e62e95684b32dd64ea0f4820ee18c80861de047362e4d07258a08a6d1d3d14e826ddab9b5eb1317cb004911f747fb9369bb01e"
+  },
+  {
+    "public": "2b5fe0c5dbb5574668d29f8dd33e73f554a37b5680c8773e1ee5340660bcc8e27fafa7fcc75451113520859595e6776bc0623fd8bb865a4f4c8d025e3c78dbff5174d7f1512932743c6e1d89292c3aeebf70a0405de9a12e3305575284891b4b84738c57cb4d120eb5a0732e6e84675e687519d62853d7dc8a143908ff5cd732",
+    "secret": "62bcab6afe90063b9e9594f4a934dbfcb96deaf3f5861ca0f16844d9767271f8a07fd2d4fa273ba4c628b59d23de60663614522d2f02ea0b0392765642cad1227fafa7fcc75451113520859595e6776bc0623fd8bb865a4f4c8d025e3c78dbff3c7a13785266e8b0ed318a2228fe95c286d1039cf96aae106a0fee6c8df51eb67ed6adc8b4f721951dc205412684780a61c60aafa063f8b30a068a34d438e4a684738c57cb4d120eb5a0732e6e84675e687519d62853d7dc8a143908ff5cd732"
+  },
+  {
+    "public": "53a70f7d9715525cc2296d052c27cfe2aecd68999ea21c7d65b2766b375ca6118311bce34e0b0a1eab6dd274a6fdb7131d221ff995236876bbf9f13ba43a792184f55270a59e7a7dfb9afb056ca2a226fc0c37be30fd3e6bdbd7a9ad66b0240a8963ec99cae6dd7d82d3a5be8ab4eae4e2eeec1422ccaf32dadb673e12cf4b43",
+    "secret": "3be970f40b1f9f80c7687af5bf3fd339ac70ebca8c58ff620a5a6c266b6e08b8d855f09cd695211ca0a6c51452948a82bd448e847669021094f09cc67a7a185a8311bce34e0b0a1eab6dd274a6fdb7131d221ff995236876bbf9f13ba43a7921e028e67d5b83456e50b73a583eda3691de1044e4c31f3f2d8f442408e8950ee3ea83ca20dd969881ad37b9ebd16efded05839249df3c6858259882b6eac413cc8963ec99cae6dd7d82d3a5be8ab4eae4e2eeec1422ccaf32dadb673e12cf4b43"
+  },
+  {
+    "public": "286bc9494fbbc90df10edc1f950ffa2db24bd0b32de9ead53d366d51925a1d7f4e1f7d3803adf73a194e730ceab6c18e4d91887a680a0ae3803e6510e80d9ab54d2b4ddc848e6c8386254afe00780c392a37328949a6160bfccab1643c89c337257bc3b3074a94b9d94bf70254af684410a9442f611b2757efddf186bfa4b02a",
+    "secret": "91d57986b2a76904a7673ec12c22ec0dcf37a9faef6d78740fabe09f829ba577e1c1cc0dba9dc363f151853f9747afc168604c037a203957853fa5bd5ea65b614e1f7d3803adf73a194e730ceab6c18e4d91887a680a0ae3803e6510e80d9ab5404f5dea7957fc3c1b6cc901c4a3865fcc32f1b191f64906edced7b4f67d61df6db71ec351bf53b36dbf109c53bce4c5ae741b609dac8174f32b8fe98b3ded2c257bc3b3074a94b9d94bf70254af684410a9442f611b2757efddf186bfa4b02a"
+  },
+  {
+    "public": "b7c8c6a772b1d3359e38ef5ff2fe58c2521ecfd57f736f606111f5d2746d2d7273320c4468c7c93b4c4adc0daa51c74200b0cabb18404f9f7b05a546018ba2203c19a47065cebe74c897bdc1456c26323c905acabf88add63f13eec25223bed08e77feb1fa394427642de7d4b690c3b2a203889e2598801577ecf5b285150fdd",
+    "secret": "e2a869ce26400f1a3d8a00b821c52954279a87b3d9400562820b12a6caa34071cfb48b724c7194578c0e039b00792a58114b71c4344cadc393a2d5d0315abb5873320c4468c7c93b4c4adc0daa51c74200b0cabb18404f9f7b05a546018ba22039ba0057882b737a8eeb8787bef796f63f840f471a5c3543a289d70cebb9b53ccaa3e275b824838d4bcd82f1e049f39b194fddc4888b3dfe6fe2f09942267ab58e77feb1fa394427642de7d4b690c3b2a203889e2598801577ecf5b285150fdd"
+  },
+  {
+    "public": "7603fafad91c45ee3bf08f5b42bdb316064c33f2a6cc3f609d006d55887b69ea4ddeb736381dd4219216e2cdf3030836cb5adb59fdbbe97ad14c9565b44a62801097efefe12b4b37cd752e327c77869c5c959626af658b477650424a7732e066a9f3ee126386f606e1cf03a086e68b604268bc6c7904aad6e4a0bb914f5f1194",
+    "secret": "0ded4716a0fbce297475ea1b86f8cf7cb11b6cc0073ee2fd7da01599d4a3e0d1b546c0aef5397724b9a4bfd9795aa6bd52f486f502bf2c179bdf081a76900fe94ddeb736381dd4219216e2cdf3030836cb5adb59fdbbe97ad14c9565b44a62807988bc49926ded177bd28854e40e4261fe8d3949d205c414e2a000beee594736013773c1bb868c7e21dde7680d83ca18e2ca94059f33eea89c6292754f190fcba9f3ee126386f606e1cf03a086e68b604268bc6c7904aad6e4a0bb914f5f1194"
+  },
+  {
+    "public": "7b4ed462b30df059c3dce823adb376f156f03f43a3ff79eb02f2b62f880e7808f87119f0e27e45a3d53ed4ffabcbcfff6c6e0dad60f391758fee22f2cec1e0579af4a280de2ed52c6ed2c9f944e7c0261e4350191a7b6f3dd5ea201f4c84372c2f84ae498cb8f989bcf3180bbe8d3a086732b78e197edb0e00194f6769496862",
+    "secret": "83dfe76bca17140608b03d31f985e3a57dc33ae20cf81610dd97bdc42f20af0bb3af884661e577c50c3f869d91251673c76a5aa5ab6de65d84a1a668104ea719f87119f0e27e45a3d53ed4ffabcbcfff6c6e0dad60f391758fee22f2cec1e057842f77a47ef2b31bbc3127fe20a7db423c4533621a6128a62e6e87f5af79c8ec7b13966eca54656fde46a488ba04eefd8bdcaa4784abf60079bca07545bd6f952f84ae498cb8f989bcf3180bbe8d3a086732b78e197edb0e00194f6769496862"
+  },
+  {
+    "public": "6c2deb001c19bf959b95652cc677b6505eb1a7d311ba8555557baed4feb0d2ffc909259183c7f6130280c15cac1a54165ea2712d95830b28b3a3b68954606982ef156fc6d5d16cf0cb3bc40c0c215709b6cb4d7f4c86e3a98f93573c7c1280792ec9fd4dc070ded8af194ad63de40e5f796d95c6e526242b05c2b9f82eeb437a",
+    "secret": "2f874496b529a6165467a884b9dc24c525f36956c2145f84187d9d18bc1b7bf4c2f8a93878281d4449f84d92346c3f7f70dc0abdd3ff65cb79f4bf9b7773f33cc909259183c7f6130280c15cac1a54165ea2712d95830b28b3a3b68954606982a8f45705f5052ba54424496a3813825c686614c3a43904086c3c8074c6afa06a7385535812f48add3b96d6debe14e447b76fb43e16f6a42d052fc5e2cdd840f62ec9fd4dc070ded8af194ad63de40e5f796d95c6e526242b05c2b9f82eeb437a"
+  },
+  {
+    "public": "5d90bae1d9bd99283007bc0e34638a377c8ac59931b37671d2fa34b783c6a6e3773d8218c09a43b30e35ff88b6f05c8045137bf7579b4391a6f41a0a15b80d5b5de0463c2e3a35bb14ebce2b81306cde6ae82f954371bf7938368baac8d275c2c8c3b1abcec1eaf5f4fad3fef59c394f26beffbfb178c79e71a88c0fdc2b125d",
+    "secret": "1bef09b4f98525872acb5f3026b83f9982b225fd5489014cc39f4ba89e91e017d5ddc026772c51582934648194f464ac0290e5d761a0499ba7666d9072422de3773d8218c09a43b30e35ff88b6f05c8045137bf7579b4391a6f41a0a15b80d5b7f9a60b1ec85b7b9f03e1e27822d98bd8170511d06bfedecb67ea5731249ce6080a364d0625f5646dba270c51011275d17f73b5d4cc447e27b987c375cee7871c8c3b1abcec1eaf5f4fad3fef59c394f26beffbfb178c79e71a88c0fdc2b125d"
+  },
+  {
+    "public": "4f3e908bf64a2451e80c4800f61b7bfb83ce4f0a3a4607d2d282f6099bf8becfbf443799e96893ace6b86d8f5a339f01a5d4f078bf9eced6091c29cadb5aee0ec79e93aa84287d531ec8e3f269693a8c60c365eba4b590fedf3a9e3cc99fe99371e835e5203eaf33e6837888363f2553d1d7437903415a86e9f834ee9a96a7c3",
+    "secret": "1d38b5073325498bd8abba8c13f84d8b741eafa6a135fef5fc036d9e6eeaf835b752815a1051d5fa99c08a8708ea63f32eb5dcddaec99875169da3b8753736ddbf443799e96893ace6b86d8f5a339f01a5d4f078bf9eced6091c29cadb5aee0e5421be61556e6a58b02ca11181c03c4189f059b0b0cb00358a36ba244f944598dfa6ca184bd8a70fd685396441ca4a0a7812a0fd63ae66628bbb49e55345fb1571e835e5203eaf33e6837888363f2553d1d7437903415a86e9f834ee9a96a7c3"
+  },
+  {
+    "public": "911d09acd06a9c6de80f9587a7fea740694cf2f840202d14166dfd3b9ab04d659804c3e7f665cebd710be265a07af0dddb5a747c05720b3639b850f7790e53a5421e2be6c1acb5e145be33d94e7a523e2020f5d8866d0052bef0e9a0081d50cf377de14bb40e9552508e0120ee6d9f9aa6c3aed07266d1b879a22c098189655d",
+    "secret": "af19885de6c4481931d95b678e96c614a5533d14eff33ce589835dade35c66cdd3f3c126a4c3295488b09ae3b4b06766868caa8246a18e4bb11f68e343810efc9804c3e7f665cebd710be265a07af0dddb5a747c05720b3639b850f7790e53a56dae4bc3864c803a5d5ae47e5c8688dd263cae8f58add8a29c64fb2c120dbdb9e2d117fcb8b942d80b57696ec8131ca6682227ed74a44d68edac9cb227b69e77377de14bb40e9552508e0120ee6d9f9aa6c3aed07266d1b879a22c098189655d"
+  },
+  {
+    "public": "d62b6adaae2f520071380d52c74a69af7e60ec92a22ec3bb8521beb7770b2e56a090c8b6b839f3e83bd205dc605579c9d47d2c4d0210d3602b66ada62b52b3ede783a22fb3fcef035eab2643abf14855446c914d9044295a28ede9bc05874242128a5cde6ff181e62741559c82c21f226786e9bc15e7445eeaf6ad3dfef6f594",
+    "secret": "c6f5b841199dddb0851db132e87cc19412b4ee48a651e92f956713620f26383e2bf06b7c2afa7584e3ac87e6eeeb557a3716d420dd57b5f4fec6ead67c5f58b8a090c8b6b839f3e83bd205dc605579c9d47d2c4d0210d3602b66ada62b52b3ed1f8ecf735a599369bc587799d448899e0bf6056176a027dc06aca4eb2be9e60810c3ead1b26c89136c9c82434699bddad02908024c959c55b9f9d5112882b777128a5cde6ff181e62741559c82c21f226786e9bc15e7445eeaf6ad3dfef6f594"
+  },
+  {
+    "public": "844a0b77f7ed8e801713eb8247d436ded3662879852cbe352118c92509e1733ea2739ae684005634cfddee99868d98f394cc82a3e0812603ebb405820a3def9a88844c479dad4df327b65bf8eaf4a1daf44e2421fedd6cad66cb6853fef99e3e7a958e7aea3a4839dab88b81a58069dd13add31f4de0f4fced5b7d89972f3cef",
+    "secret": "c1ffa1c31d9acacebf6d3b88ae282e31f1fa0b89a30bfa306cc906a4da5093fb4e17180dc83eb8b890b01f1cd9acbadf7c4b12cd8f9153face0aec17b42b5813a2739ae684005634cfddee99868d98f394cc82a3e0812603ebb405820a3def9a40ec5ba532185fbe30b73a7e5bf0ad13c9e6d174c89316ddbf300f0e837f0e100dd5878870eb28c411dfca06e6500344bf35cb7239423b1c69e192748fd78b9d7a958e7aea3a4839dab88b81a58069dd13add31f4de0f4fced5b7d89972f3cef"
+  },
+  {
+    "public": "4ca57fea7817c6f7d55cb42784658c980d5966036b3f56020b03ad95190835b699933b8db3c660fd89289c36eadff693e44308b5b80093a914600addf7afd05473d2aedc002bb9a325df91e98863e42aad8861919b563148da773e78a23b15c0cf4cbe5f32de8b9a086c6db4af6edbe9a29e1ba5bf6fd6f8f8bb6258533efc3d",
+    "secret": "6699954cd479b5f69063becc78adcd5d8d12bf07f8b5e69b22a66f3df1667618433c0b52a1bde8248638b945cdf96ebbd2f946b10a759b2d520331167aab195099933b8db3c660fd89289c36eadff693e44308b5b80093a914600addf7afd0542ced0ce3930515132c8f6e077c1f83cde18ea93d33d05e278bb25704c1e5f5ae0eaa4ba180009ba425512578f9d4d3d3a24e5856e905c847fba3b083ee2a9a12cf4cbe5f32de8b9a086c6db4af6edbe9a29e1ba5bf6fd6f8f8bb6258533efc3d"
+  },
+  {
+    "public": "537e63e1de8d3146410c0fc1df71fc126f69e0b3f780b341300d791c18054f519a854462623db0babc9d8ad36f89bd3d6b25fda6d3f203c9ded913a32feaf53fadd803c1abc8f66396f26568ea70b021228099860c9d1759aa19f78160eb514bfcfd362b6728454e8a5b5cc292a619484c109a7597545872bff227384b96acf1",
+    "secret": "a89cebd4eb36342b8d77a354f529aa5531a7a0785292cc7e2b26506ca6faea48f9b574265aed1550496c3d81a31e13cfb8f0e748eaa0155c52c4ff8831d2b9629a854462623db0babc9d8ad36f89bd3d6b25fda6d3f203c9ded913a32feaf53ff3c39dd65dc636b9da8028c5e11628bf220494720135406d3978329bc0ade349a9299f456c84da3f5bd9dbcf2e8c7ca76fa7ad44ab585f8807ee635fb9133981fcfd362b6728454e8a5b5cc292a619484c109a7597545872bff227384b96acf1"
+  },
+  {
+    "public": "63daa600623b0727f8c0fab5dbc21e0328840d4a2fe15a7d3db8606c4db1bb5668510e3a47ed1f0660cb7387be7e07b53291901ec7f23df2d4d55a93eb0f2a11182de6cfc2bbe587ea5a6a658c1a501ee5273930e1a7f92e20d8c3b57193abb4e40acd8b0d78f212b0317ea459193e43b41f3400743b2f0a023415a3b5e977cc",
+    "secret": "aa43e19d4887e19a1f798c50cb2f665344a95d2a735f4a241d2bf0aa0c20ad27a558bcb60c45071d8a3178787f1158685bb5362ea3e2481699a896891a4441d368510e3a47ed1f0660cb7387be7e07b53291901ec7f23df2d4d55a93eb0f2a11cb49db5f25369787a02234c61ab63beae29d086dad6080e2d63ff06f3293c6323eebe9adaa98f1210e88fdc0b8f56b81a487074aeff0771663f4006ba3e2792ee40acd8b0d78f212b0317ea459193e43b41f3400743b2f0a023415a3b5e977cc"
+  },
+  {
+    "public": "22360c769ec9f20a0ad9499db5ebabd5dc91ba7894bbe92775228524ade01d8fe1647cefe92990a4215aebb9e39d3c04b87a8d60e1e87be4f7d247cf2395ecfe61043acdc9cf7b46080699a12c9115f0185e56ed5bc33e08ba970f17965621cf87c5d611181a231e952d6992ae5f5d18051b869467d3a964b278bae363b29f51",
+    "secret": "9b38bc7e846f6df6fa5b237d15d558a000e43a44962c4ef49a0e017ab71c1d3fb9121e8e222f35ed2691e24dad324369aa0fdb5bb0dc10f82240086b1dcdce46e1647cefe92990a4215aebb9e39d3c04b87a8d60e1e87be4f7d247cf2395ecfe51450cf0e94c14d62e5f5c2630a17f42391a0087f624e3a11faee4e4a9bbde74503d136ecf1e04dd18d8efc2627eb46b1084a27f142add9d37f260b8526caaed87c5d611181a231e952d6992ae5f5d18051b869467d3a964b278bae363b29f51"
+  },
+  {
+    "public": "9fc0f5c385512f82b31fe2bfbb7491b52a178d82998f976a7a178b455cdf73289d217d402e2596626d5be566a020f948ef398785c44315a587861fd1c6e8b4c6339eb69e08a5ced05be1a41005ed2c6604719f3269156bac28b84805331d76d2a29139bbdbfec664a451250440b7f04c39f58c0d5bc4338658a1f0bb16fafafe",
+    "secret": "ae323b1e2b2fd9e5fd2ec21daac1e017271e8c76c1430163d757e31016bb819e8b4c55cdfddfbf15bfda610876c148dfb96e2b1f45f311a66f6988e6ef5348fa9d217d402e2596626d5be566a020f948ef398785c44315a587861fd1c6e8b4c6a7c56f1de8b2852b1c9d55e19571d345cf803c1ac4324807fee55281adeb73bcbc43dd5714518e7f49e000ea6587353a3da8c93e53c5534b8c550fcd6141dce9a29139bbdbfec664a451250440b7f04c39f58c0d5bc4338658a1f0bb16fafafe"
+  },
+  {
+    "public": "fefd03f762f4cd277966caac9263465742dbc7d3556c1221bc3156596a45ac5673f71e0adf0233ea00470aaa2e72e0fce6c487e7bdf0b0983c7b0e8f6fe6ef95a1f2e160c81a4c7afdbe7827d4ec63e30b2ac93f68b377127599b9c961e3a46fba1e5a11e2775d591e9e2b4f4d2df1400986b8d42075acf4da34ca441ad37fd0",
+    "secret": "ba860558170072240966b9c0013ab9a2dc155700de3a84a8832bd5e358be59af275eead531cc900109c1de0916adb0f97d22ff545f0e6b709ff9462259de55d273f71e0adf0233ea00470aaa2e72e0fce6c487e7bdf0b0983c7b0e8f6fe6ef95d2c8dd675c8cf14cf5a69fce5ad29501c8180a5f77d19da0fb8c5ff6a176d0474ce2573a34344db0dd778049a794797da0ff681b60a8e3b5e4e369dbbc790976ba1e5a11e2775d591e9e2b4f4d2df1400986b8d42075acf4da34ca441ad37fd0"
+  },
+  {
+    "public": "87483f2d2f35e6c7357e6f884b7aedc405f696f0f23e7e76b1582ba51f826a5e83ea4088c26ee3d0a3489d7650bfe7cd2d378f50639e97f074681194daca8dbf7e1774fea005a4ee96e48e4af14d51e96d22980867d14993b2283b1e6b20e5ec899dc49cc1f8d005e2c98735a81eaad42b98c36566b21c958e032c1d4935c780",
+    "secret": "41acb1a61bd3daa1b71bcdc31bd5dd8891146d2c59288f27acaf0180a02d048568375d57f27880e0796365d04bde37dcb517863cdd7eac1b563ccc85c2bac32583ea4088c26ee3d0a3489d7650bfe7cd2d378f50639e97f074681194daca8dbf4055453c760e9463b6c30ddf9717c54fbb9e2ad0d782da168f82c51f8ef32010dcec669c12cb66567e79df33f273b8100bf771a2593a88afc15ee230dd608f3f899dc49cc1f8d005e2c98735a81eaad42b98c36566b21c958e032c1d4935c780"
+  },
+  {
+    "public": "6f9f420f372875df0ddfd848533bff68bc6fa3f2b7505172d691a74571004c32b439957e8fc56b17bb22e3a7d8780d913a59de8c339c1464d28ee5875f1018ef297ca59663fb1dde398f12eac2bbc732d683f54819df266c22e7e74404ff8006fdae1f55381b1991c37dbe7043476a1aa8c96ad79f6f2c5afae3f1e2a57c142f",
+    "secret": "d616ff9f65791e065da0a018287ffff6ade0b5b0ecc1f9e088190ff9bc4cf89314c8f613dc66a84d2a7c476f1c14439ae5cb7f46e36ca8ae956f65bfb4e8fe07b439957e8fc56b17bb22e3a7d8780d913a59de8c339c1464d28ee5875f1018ef298907936bd459273d6b6335d32c5202f9c8c32c6d3282ee530d9ea93d2c694500a6903283aca7323f8bb932c8f846efdca1b5b74ae06dc7d0cadff18e1fb8c5fdae1f55381b1991c37dbe7043476a1aa8c96ad79f6f2c5afae3f1e2a57c142f"
+  },
+  {
+    "public": "cb426f6c082b1fd44032516286c4db2054a317a4a21fe1230d7ea2ea28e054ab4258825b67f36a4f6929fa2c765fd466a597d1273e64ef7fb233c6024babffe91218c8c42f70fadb4814af10c7f45dbde51985ab7c83ed366fad130ef87c043c6fa2bbfaff849a497329374f639d09c2a76a132ffa171464b820867cc79ac892",
+    "secret": "c96c68bfff0fc23f4e9351cd1fa8de2fee855a16eb1cb2980f742baba4ffc2a9d6ee4a817b2722c087ed85b030bb30a13deb6398c86772bd70904ef2dbb03e3d4258825b67f36a4f6929fa2c765fd466a597d1273e64ef7fb233c6024babffe9e92274f4c357ad6988a4cc845c3e61cdce8241249b665b0237545fdebd3f04e9ea6522023c609413d9d9853a53d2053c88cfc786b5d6816a975d27457477e4e36fa2bbfaff849a497329374f639d09c2a76a132ffa171464b820867cc79ac892"
+  },
+  {
+    "public": "dfe4ce416fea53dfc26d2a420c667afe00e7e85c6667fd8b0618a7d7f344408cbd2025a87f06efac6ae4bb44d0d9af6e6f35ba3d202150b56acc962fd24de3211fb5070befbf0c663aa5e4f561bbbbea65ee87324b56f3f72fcc646e282c3a7a0fb5b6ad56c9b6c9de80a15c85e3ee4a3b0e43c16ac3c317b9829c3ad126a6bd",
+    "secret": "ecccf4385139845eff546d7e4dc123114eb6f482cada90aa9f6d7dd4e5f6a34d764217e16a50519e109eb74a55937df9e83c41c1449fd19bb0ee6bdf61658c61bd2025a87f06efac6ae4bb44d0d9af6e6f35ba3d202150b56acc962fd24de321ee3e4af91bc789b255070e6f0637b3fb8a4d39c5d422057034f2783e2806f04d3288998a2b2019ec40e3ca63759001c598d4761d04e0c1d8dd7a3d606a75f1470fb5b6ad56c9b6c9de80a15c85e3ee4a3b0e43c16ac3c317b9829c3ad126a6bd"
+  },
+  {
+    "public": "ace7cf700ea401dd9d741d1ee91b7cee5c666904c5aaf0de4e2fe840087aa19b6ad114caa13e2867827f041483a3e4a1dad91a2b4a61c46b796855f6f8a20cb6b8ee06cc2cb062067cc4411b1e04c017acd314e6f06217e04482a1010c6741a41c12fdd3384e45a329a9665de4f075d8b203342e2d3aa459bfe4cb9e309b0435",
+    "secret": "d823b0a60074a1aa97c1bd65845c15b7efc9910215f170907d536ac096d3f8207d1d7fa94f960f71f9cac7a8a2001d5f3ce95476363ec5fb77366359fe5f74d46ad114caa13e2867827f041483a3e4a1dad91a2b4a61c46b796855f6f8a20cb6f76b8f9733410a806b9f292d4966474e73fc20d10f0f5079610367a79b6d41ade9171d9f01b9447b27e4d2becca07ab61917e1d9384394b058900f35f250f6cf1c12fdd3384e45a329a9665de4f075d8b203342e2d3aa459bfe4cb9e309b0435"
+  },
+  {
+    "public": "5d18da3a745dd9c8cb7a91d6790ba04e4c7ec316ccb3931a19e45cbcf543edfca9b08e34f2d2aadcb01af6e2480947de527fce8375a4936fdb3dd8456314d786a0bd6c34cef38c66b864e4dcfc50d1ffb196dda878a63cfcb57bf0c349baab4a3996f1855256bdf3354395eab69f45a80b701c0f53831ad3a4ee0d1c9559c225",
+    "secret": "a967845e90cd22fb8315c82d85f33abd93f2a60f49c4c1cf90c3821f336b8ef044e4e94b6ac7fdda09de43919b32bde53c95b5b112f010762674b8f64e28d23aa9b08e34f2d2aadcb01af6e2480947de527fce8375a4936fdb3dd8456314d78621ef89d976bfbe7144bf8df36642df90dc9bb5feb0bde9d58fe7259e4e66a13e092c30a7f5b935b93ffccdabe60331f4861bf8b4859b76f21635852cb54bf3943996f1855256bdf3354395eab69f45a80b701c0f53831ad3a4ee0d1c9559c225"
+  },
+  {
+    "public": "c64ed7875dbf453c824bfe0b0ec817ca3963d3c3fa8b1ac42e7db863d3a9d4dfc1660e7e731ce8be17a9ba1b3818e1390c352da215a828fa717d30f9826b1859717630ed3ac9d29dd44d7f800c7e173eba427968eeae617d16d61400728c91edee387124b2b66eae5abeced5e1c97b44ceb966b0026cdc5bca8645af4da1d55e",
+    "secret": "686c58284b069a20cb104bbb6454ee48f380a6200a8ad63f8cf8662e60c1115fe102b3f305f28b773e4de908a0fbce771de4434bd632239e49b1f7c4cc302f50c1660e7e731ce8be17a9ba1b3818e1390c352da215a828fa717d30f9826b185921c75e52b8fd11062fb933b451624926c3b8fa9769e2d14fdd74f528166730156df6ab1164418e8812777703ce4c1f4be2f667b04e2d30e0f5ba33ac8d8e5d6fee387124b2b66eae5abeced5e1c97b44ceb966b0026cdc5bca8645af4da1d55e"
+  },
+  {
+    "public": "ef02f3cc08510f77fbd11c3025192f03135f15039d1963d24a8ead7f38525f0eee90e2353cc9a2ca2d8c0da955d326d030703aad88ad0b60c5eca04671cdf4b693d0b402c501b0a62a4c7abc32bb0dd3240456c3ab1563c33dbd763865d2b58b6102f6bfd97c9f2d105235bb56481aa83ef377b4c4368b2059eab2f42581f10f",
+    "secret": "8894bb0aed1615186c3486054072f83599922d5667398deee46de42ce2c1c3acb63cd87237fdd68581c8eb4871b4329583264f9374598f49ba0550c9051a8984ee90e2353cc9a2ca2d8c0da955d326d030703aad88ad0b60c5eca04671cdf4b6043d299e12bda6c9ecde6c206129640811b378de32d11f8c6be78c1225e426958a517cbff169f9a8dde5d7ee0d9887147934898e678e23fe6f14c929edf8ed706102f6bfd97c9f2d105235bb56481aa83ef377b4c4368b2059eab2f42581f10f"
+  },
+  {
+    "public": "67e6bfcbe52c0fb830d4e252a5e834ba95a98b7cb67b5bedb010a0f7c8d30d73a4d4e52420b04136864a51182ed220a577e490d198af66b4dbddb3c4e10012da8eeefa1120caa3d41ee0f2d1af9b4f49643cf188beabd6fef852a12d318224e57902fb3085f3b835068fbbd266279a79e3480ac97dc7f127c9fc90b7af10fb33",
+    "secret": "ec75c28f37c1eb692364a6c478e0c664c2bece0cc1a9ef04b1013c5bf0fe482c85b1c21ecb6f1448f9c3b9964293ec14e021813dad750537421e108adb4ed115a4d4e52420b04136864a51182ed220a577e490d198af66b4dbddb3c4e10012dab077033aadf77f3236a2a7da2b20ef710c91fe82fb1175fadde0f42e223c1d689e4ccf509e1016ee2013ad1f1bf806c599c468c55cc088faf5b2896b758b77d47902fb3085f3b835068fbbd266279a79e3480ac97dc7f127c9fc90b7af10fb33"
+  },
+  {
+    "public": "e8e619dc9b470817a2fcb3032f61a01cf35610ffa247b3cfbbe32aa0dcf6478ac739f4311853f5ab9a60021bf3d6f4d7ccf0ad36e21ecdb0ed4c9d4fc2bb5ba1216e0a3919c8705c3c7f6312e9ba13296d81a36408f8af08283095438411d5a70aac7ac4a553a7e00d9aa1050419f500e3c1fbe84171a67c91b9eabb66823139",
+    "secret": "c25f429c2bc8d40449665dafa6e167950eda3bad5d9354e4d5054d7ec22dec65dfd0e18fcc561d6f3ebb60cd8de81e9924d6b209674f97355df184738e9d7312c739f4311853f5ab9a60021bf3d6f4d7ccf0ad36e21ecdb0ed4c9d4fc2bb5ba15853f12bbf3cd6a934ca08db17295ada6d7ba697ba69324c0eee6e2b562f139edb23c7fabff2a6c7bcbab408856ee0110902c0fabaf7eab586f0353ddc0bd7e90aac7ac4a553a7e00d9aa1050419f500e3c1fbe84171a67c91b9eabb66823139"
+  },
+  {
+    "public": "5699e7d166a6a1703489867f59c6dd31ab83a311e1ff0cfed2f1972ec9b419f7ee78e9ef2c80ed693089db294f2d72c1c278d1b483dd469ac8f04a9b64ab566ae4b15c2f2353a8729fb052a4c80b73711045a27edb34d448681a3e66b6e3cbc8f0de60c7caa783ef6468ab4873c7b3145fda558757ab7d6871414e83a7fb5f44",
+    "secret": "86957af85cd8da06eb67eda66a0565a2792cb403bb8957eb4476f221a11aaff0e726876beb796d585e1e0bea2182a8001a0c855cecde03eeeb9a53e4e56ff789ee78e9ef2c80ed693089db294f2d72c1c278d1b483dd469ac8f04a9b64ab566ad52c52ba0912e8bd2ef6de169a201c31f9f905193234441a8ed07e8cfdb60d461385a4f386b2342cec10455cd2771baf8004227fafac7302ad1c967d762d01f0f0de60c7caa783ef6468ab4873c7b3145fda558757ab7d6871414e83a7fb5f44"
+  },
+  {
+    "public": "af8539775b2bd982a7d14a6be3b3269101235be6ab87cd10491112455b1db661b749340025f32b9b23499137c51cd8c59194f6b606bee80aafdc1c73cacf10a3b92ddcfde05042cbfa3ca009f205babb96d8f11a308373b8d0f87c63790019e703744505886d68edbaaa7b00f8378b85f8456a947f3a990dee104249eeb66191",
+    "secret": "3fdabb9eb716ce2a59e090460e62fa67d36c30f4207c3824d2beb9109b1c9561c9fd13868a9b832093c71f955f30dffb6f52c619b6f8ebfe0679d77948db287fb749340025f32b9b23499137c51cd8c59194f6b606bee80aafdc1c73cacf10a36976be78ef9577d98a8434d4dba9a3f8b8508344319b7fae78eec430a05b405d36c65beb3119bddb9783b5ab3b72a988e0dd252d08537f152a96efa6d9b449d903744505886d68edbaaa7b00f8378b85f8456a947f3a990dee104249eeb66191"
+  },
+  {
+    "public": "22b2b8f5ce84c4f10f3a2b69fb4c512831f66eb942c865acf8a7a8e6419921c21bdc5174bffd5f09c6451441df2a6487ec2a013a498d9751f752af6805f1f85d4683a23a21b21c15aa3791299631231e0d270f6f6be33ad243be9686f7febface62eba6a78a7e32317f8d31623053e846745c26f86f6e95afe002a63affb5d05",
+    "secret": "db498d334e5ec236e7c7b85d7250c46f86b7ad53cb02d030bcbf6cfd2788c5fbed8631b15d1b0118808d8adf65979acd469556c9edf1e8aa3946bb70e50455511bdc5174bffd5f09c6451441df2a6487ec2a013a498d9751f752af6805f1f85dbc805ffc87ba7bbb9a7e12ac432182fa3e7dfcf97391552b2dcfd40c3b50f9f2840cd8c4d317cc3df3a8a0ec70de333ea0022ccaf7ba39bd2c98a90622176d3be62eba6a78a7e32317f8d31623053e846745c26f86f6e95afe002a63affb5d05"
+  },
+  {
+    "public": "7de9fad0f50314ff05aec33f4563158b84df74fe1a1c68a0e613122c493a19e97c8668c81c23efe230143e1a32b7a1cfb11453d4e3ee77af9181278c09ee2d9fa947a8ed68774603c72cf0ba54cb4f7684c62c24845f343a9a7adb0126b041e850de685dcadcb4ef764449764025eef4e74cc988522cbd24bfa506ece7ea0b57",
+    "secret": "acb6c9f1c3ab411af1fe5f6e77fda427e53d92f0c4f6c2867842592ffca236562a17b9308044f2f844a056d25ef705344ae290ee57e41345bbc7411044476ff97c8668c81c23efe230143e1a32b7a1cfb11453d4e3ee77af9181278c09ee2d9fca59de7c380316b04932ed92dd1090ba57881dba788d5a4f3a6c91c2cfe65a836a6e16f81b7ed74e346ae6d50164bcb191d2b4e4951fdd134a2b01ca22cc007c50de685dcadcb4ef764449764025eef4e74cc988522cbd24bfa506ece7ea0b57"
+  },
+  {
+    "public": "6570fc392082d8e30faa5de8b90e86e1b64069294f94fb11d9b7765ac7022360f2a3e7b94fc638461e7c0cdb199faa4ca161eb70ec5bf22d363d2fe6cbec519d1f84a53efe630799874a1507ffbd1b2ffebc8aedbb758b4230c6783b34a17e1d7e063dde9817a57df052c715de041f92f56e4996bc3087d8c2bf514488b444fa",
+    "secret": "24507eb7fc4862a685d1f5f7a403137b5efd63a39eed84b08580182283f2b8237a0e78cbaec20dc75519eea55b371721152e10b71a9100e4005a574b4c55e355f2a3e7b94fc638461e7c0cdb199faa4ca161eb70ec5bf22d363d2fe6cbec519d294aa991744df1d0f585fe955cb4aa025582e832476131cca8b6179711c53ea3589ce0309d756a734d3c7f2188ca9b978cebe71c41f249ea45fb2dddde5f35ab7e063dde9817a57df052c715de041f92f56e4996bc3087d8c2bf514488b444fa"
+  },
+  {
+    "public": "1ba8c12b02fc2b33a7317eda88637ffcf0467778e06ba970cec9644365839d0b91a4aee5601d989e06e7c026ac3ef84f3cdbf666da42e1564c53c7163035eef0a63e011e2fc98da0d6b2e5aae3bff2552f4803863cb5c44f5becb7410b22b639f48f51839113ebf8bf162c31f62755851e3e6e68f01858373d2e13c7b5c96c48",
+    "secret": "a04dc93246245c9bd47139702636e64795af8639965c4bc2d76d7362064229058fc951af6277c8518d562f3bdeb88cbbbe6c5ae8cd6ffc290aa1076a29c32cfe91a4aee5601d989e06e7c026ac3ef84f3cdbf666da42e1564c53c7163035eef05a968b3fe366da47d2dae8ee418b9fe3c91eb5a9a49e88b47b88b6c814676ef7b85eccbd7f2da7ac064f908eafd2588686b4010d60973f426780181dc0055ae2f48f51839113ebf8bf162c31f62755851e3e6e68f01858373d2e13c7b5c96c48"
+  },
+  {
+    "public": "2127f4ded67b981d6e58ccc0cb1190d5354e9505d0b06034a818c76cbca4d776779a047152edac6798c9ccc48b277c599b7306047ad56e33b72d9708d9bbd3cb79571e9a409c10ea0f89d8b4e729bc94868eb2550b807fcf0830f3487a2d42245c82077ac19e39d7ad1a71ec288deb87f2c3e439e1f9a3e0ece516ca1654db2a",
+    "secret": "7fb6b460e4923fca09cc1b4ca805ee6a4007a324ff3f19b96db535055534735311044294a75063e98f70cce6a932394f30b70688cd68a1a5a2daa05459cfd241779a047152edac6798c9ccc48b277c599b7306047ad56e33b72d9708d9bbd3cbe37f961097812bb8f712a8ff452858dfac6365e5d7026ff09e929ebcf23b2932d5352593444123d6bc6b983bf8c5b569654befac2e53ee678f0747e931dd33de5c82077ac19e39d7ad1a71ec288deb87f2c3e439e1f9a3e0ece516ca1654db2a"
+  },
+  {
+    "public": "df2c11a924eeedd1198c1a6fed0356ab594c49ffa6be942396ffd4c575f403488a7f87fd513fe299f02e9fcd768960a32c2a5f85d5c6ed7956ee5518bb617010fa1e7986093620e0a1b764697b616ccedc4763bd72fc8236f4345e5dea757269732190743553ecfb5f09eef16b6d65ee61ca1540ff540b66ad261aa27b8786f8",
+    "secret": "0f619677f802c99d644fa872744abadd629ecc179c5b9d51dfd475b9bfdfe29037f4129f57a5058611d37eb73b1fdf1744cb3c3f6fef86e984c526f57df02cbf8a7f87fd513fe299f02e9fcd768960a32c2a5f85d5c6ed7956ee5518bb6170100b160aba76c228ebea3af9fbfedaa84f6739b96bb51fa97020cd40412caf9bac1e7f37f3eea5da60e1f1e3aa560b7499fa66d6eb5fb1c652b5a680a8f1e0e151732190743553ecfb5f09eef16b6d65ee61ca1540ff540b66ad261aa27b8786f8"
+  },
+  {
+    "public": "b97184a6f491f566c58f310b97d1995592a9f93880d3856e5ac83965ecf11d04bedbbdcf6392c05eab29c7717df222e07c6bfd34030801a0481a819a3d675a67766aac8dfd2573312d3ebe3b4e6336e1f87c02ad36fe348d0a6387d6badf11e656397b41bdc37027bb7943690612d0dfbb39afe9166f8d998124ff7e0cfa35af",
+    "secret": "265c5d9e43d564b71cb19c0430c63c5318d2d8306bb1d8504d278aec134102c9aef7b4b24ba2ca0e054bb1844493e4ec78c96c706764c0be98a4a11cb5720ceebedbbdcf6392c05eab29c7717df222e07c6bfd34030801a0481a819a3d675a67e9b769cd36c1396e5b695f8015839b3a009a45dc7315d1dd08af06730a060cec79a446d82833f4a154883346bb32536269a07a4dad3a01da1abdd8a9f8a7b66c56397b41bdc37027bb7943690612d0dfbb39afe9166f8d998124ff7e0cfa35af"
+  },
+  {
+    "public": "8cec36381bc13b52d726f963e618a176c166b5b15cae3ee0a3f71ba38044b2b0ae950a44debf5a9a0ed074c865f93f92272b20cdbfd37a1c56866098f0a742345cd4179649dd61c8c7d5be9413403848094f3f52747494fc99d5bcd0db36360979e8e7d154939367c958cb1fb8715d2b4ddd1c899939ee045a62294eee36dd90",
+    "secret": "11b40847fc3bbee98b8df5c6e566782bf4a145f3124a4ddad3c35c4bb1e993e058ae37ff7e23e760146e47d25a7fe57033d17481b1370fd50bfdc950756d0e2bae950a44debf5a9a0ed074c865f93f92272b20cdbfd37a1c56866098f0a74234f15d5882dedef72e08969635592ae8e5e2852f0021e26bbd9eb7192a224ff1d7f45b8ea0f58d99dc6e0c1ac686bda25271ac083599e865d29643eed96def049579e8e7d154939367c958cb1fb8715d2b4ddd1c899939ee045a62294eee36dd90"
+  },
+  {
+    "public": "36f3366349657acd58d935406fcf630a96399e4445e70fad6feb85ef27e22db791c840584c9ef00baa5f406e9f9fd138035abe9c8e955d7180f44673bd22d86a0fe95b217463f1b352e22e1f54eaa9abac37f6f173fa21be48ee285cbcf734d973f0459e7894715d3febaa681b8224917c106b52f752db326a09aae24d12ca36",
+    "secret": "c82b5ed3b72406ab97f95db66de33df70a33d2ae71699fa62e301a8682cf2dd7db5dffac09510d88fbe015e178e15e2abf156a27d11d4fb20f23bd0dcc92608191c840584c9ef00baa5f406e9f9fd138035abe9c8e955d7180f44673bd22d86a706941edba62ec1a54c150cb67e35eb5be0641684948b60d917c6380397b0eefbb0dc73b25f696b5c55bca9d65075d485bc135d522ca0168de955cbeb982449373f0459e7894715d3febaa681b8224917c106b52f752db326a09aae24d12ca36"
+  },
+  {
+    "public": "d585d2a09c7fa4a211d3289e46e503c8cd72b9cf29e8f17f12da616806eb1c03f581c805631564dc185948530bce9689a489c9b1d7e1bc5fdc92e8ec8e5cb29710e65b7dee7646fd56d1d03ad15acd181c7e855cfee87e10ba89b40b6214b8b02c0f85be420e27e8966066877808f9163743ed0410814805185cf7290efeca74",
+    "secret": "fd5a458427cb8b90dc5167d703992a83680ffec3bd3f5717f4ee591febc2550eb1491590a01d37313a810fcd67df04497f0fccdac66c8184ea3fd1c20cbd91a8f581c805631564dc185948530bce9689a489c9b1d7e1bc5fdc92e8ec8e5cb29772f8bd65f2f52cdfc41201912d7dbd13b53a6e643b841bce81e93f3d880554c7800448f21ee5ab55cf4ea06cfebf3dd42a40b6ce5ded8a6cba00ef93e1ecd16c2c0f85be420e27e8966066877808f9163743ed0410814805185cf7290efeca74"
+  },
+  {
+    "public": "ea23a0497b49385f61b8608c39b8a2315502e094e23eb639ff2908b12211f24403edfc943c855be6ed1025159f43626f4ec3b5a86945fd26ecb65edf5ecec79114c8bf9f68733188cb11c9ffa022a2564dd4a56f3c49eb5d89a8402ad178ff417845a1d1730d2886047dec99ec347be3f23c67edc383da012fba062cf7e0cb34",
+    "secret": "5faae616cb6c8ae34590fe1f01e79a4a2891602ccaa3556b718bcedb645734c16ef12efc7b143feea2142cccd61910b65ef82a99d2e6892911ef603c38c904be03edfc943c855be6ed1025159f43626f4ec3b5a86945fd26ecb65edf5ecec7910c9bce4ab66111b775081eee26196901a9ab5c24c9374c5240bfa5de9fd68f68b33d30b3f3de10c1946393405e6ddbaaad6cd54f725e81115690fe619bacecf87845a1d1730d2886047dec99ec347be3f23c67edc383da012fba062cf7e0cb34"
+  },
+  {
+    "public": "ffb7fc958d15edf21268467564f911722e690d10ac9a62f92b6d6f239faf9d08db4ae702fb75f1a2ee5f1a2e3b0ce9ff7d06c11ac3ff82b0bee23155c1fdad321cee714e7f9e11bc0091ef58d649fb107d8ce0b3b808a6a5669af2a3af8800097cca54e4085a0167ada6279d7892022f9dc8c90e10ec345395dd254d4a75c2f2",
+    "secret": "3043340c9c966c79b584cdc9bbcbb20e333a11f0ad3bec4288576b3e394957ad80659d8fdb3c671653570212069c53d78fb543dad3b61a622eda4218e50dd4bddb4ae702fb75f1a2ee5f1a2e3b0ce9ff7d06c11ac3ff82b0bee23155c1fdad32262c500278829705eadf0b16e775b6a66c19963f6948700e22252d87bb1ca578caf6f883bcaea55934196423a42187c79fe918a594bd5f59e2f7671c9f254aba7cca54e4085a0167ada6279d7892022f9dc8c90e10ec345395dd254d4a75c2f2"
+  },
+  {
+    "public": "4e7157efafa5a470eac3d4449e34d7e1db576c30d6081a13442d79f3e2ef46f176f6361098d2a2695279a8ba7eb69d818b5c5c1f6b984148117cb7a60cdfeaabd6a470d2562e00eca12c911815f3580523ca4bd30068b117c28b351af6180c7bcae9bf9ee0b5ca42a9b8bd27bc978d059460a8a96019a80e1315293f221b1738",
+    "secret": "bf641192357cfae70e7b7a94a0ba056371760dafe18708c9d539daa35b96d05fc2f443916cdb5a6f68f13b75f02a533be100d7d5b3ab3820fe22d8d93032b17476f6361098d2a2695279a8ba7eb69d818b5c5c1f6b984148117cb7a60cdfeaab913c5e1b36bcbd7f60e4f400dc2d11dbfeba0d3c535745810c5e9f6dfdd1db02ab1c295aedf69a9aadb5d15fb4f84117950f06d04f471e34b864f20370d4a53dcae9bf9ee0b5ca42a9b8bd27bc978d059460a8a96019a80e1315293f221b1738"
+  },
+  {
+    "public": "44fa479905493c5f2d8af7876d1125809c12cb3ab67778f329e93abadc97514a27f78444e2367ce0d2fee0a54020b031ed473f04699b4daeb5fddc6163a89c7bb5b369849b2cdd9674ba80aad4712f198e0518c226e419d8a04c52d20ee83453dee186cea0c7b46e202ee328c92fb76a4861d732c53d5de631747bea7be7d830",
+    "secret": "2e7c9f4fce8e948a4886ec9a2f5415abbe4f91746224b491595834eaeb0c09d8c428fa69b885d5aed76c9c4980f9066cda2f323d9e3136c40729eaa94980443027f78444e2367ce0d2fee0a54020b031ed473f04699b4daeb5fddc6163a89c7b2099638d2a29efaeae117faa5f12360aea434955af9d783c20076e54208b00f0aab5b4357e9fa91a31bef02ad8ecf3a1808f10719e328f5a2bffa9c69739c437dee186cea0c7b46e202ee328c92fb76a4861d732c53d5de631747bea7be7d830"
+  },
+  {
+    "public": "491de8a2c9c9f895b7ac62b091b2ef8c05866373127a822e143532f963130588e631b847f7d3f7f57d994750c713d94c21d7fe4e02d1d874ad3f1945766d5d46515dfb0aa6560f71dbe5bdc1c3a67f77f6687f8b2fd944e6f958bea743a01e4a4d3841065cb84b8a7f638fdc2f55dcbc3a61c0397901029e2b7625fa101a8bb2",
+    "secret": "7a5ca0a6c8025ab62914f650a636ff29bd8d2bd491d3cb1031318c8e1a67b621444659563b7c07f5d0510ff083b8997ba6cdcb54c84fd0b8dbb2054bf2854b69e631b847f7d3f7f57d994750c713d94c21d7fe4e02d1d874ad3f1945766d5d46d2eb03a42e824434591d2323bd3e095f3b297761cf519fc6dee6add1af3c0b15a2566e24789fb5e706e64f12e8a9c864fe54ee1649fe31fe056f4f1600dba9554d3841065cb84b8a7f638fdc2f55dcbc3a61c0397901029e2b7625fa101a8bb2"
+  },
+  {
+    "public": "1b085fd59b01925bd55f854ea07cb55c35198dcf75ca6d30e62733e10c681f86fc24268ce6b11dc4678f58b7107ec9561bd96f94c8942edf9031d6aaf202456de460fd97c368c840947a72d6fae3f185ae6352184e4499fb5dba752f0f6632553d252a41393cf4956440fed549bb2645ff4b0371d4611beffb8d1f17c437f3ba",
+    "secret": "dc938983287935b8fd3ea6e2829594b43b8d0ee7e0eb99e71e234dbb1648d3afc088673dc29e845c7b38a97ff82f7eb0a7ad8591886e0076cad4ec6d4ef16d5dfc24268ce6b11dc4678f58b7107ec9561bd96f94c8942edf9031d6aaf202456d6c7dc320cbfb3ba43129e584c1d39cb3028536372f3259377f642f9e9d8e1629974f36d7c1606f802b3cc2eb846884a20b9f0ae186a84af180086793a68662bd3d252a41393cf4956440fed549bb2645ff4b0371d4611beffb8d1f17c437f3ba"
+  },
+  {
+    "public": "f73654e3ccc6047cbdc4f43090e3b26f707835090ce4b81d1a6c7ff05fcc7687a64932432949d5a86bae99980289a776c9d01ad1405d5643fae3b753f32ccc46bfe0fe3bf6654b0c88c91908f8e40cd0874ae6dc394b1f0ca0a5f64123f0bc5e267ba2e6bb6eb3a939977be2a5a36d124543e971536dd6ffef613d5e93930272",
+    "secret": "14a2eaeab05a24a8b7815658cc06dfc3a765fb935eae8dec25e871b08dd5309005f948f832aadb6aad58576ff5a6f7c30b4b34b2c0949dc137da3d5ec6294fa5a64932432949d5a86bae99980289a776c9d01ad1405d5643fae3b753f32ccc4683bcce707019d21fadaa74431ca7c1709721f31b1c18a1f2758d641d906bc7e709912389428d6a460dc27ce3578bc0ce5596f53f542cc0f22e58722d67bac807267ba2e6bb6eb3a939977be2a5a36d124543e971536dd6ffef613d5e93930272"
+  },
+  {
+    "public": "938760a69afe2f09f94c9a0fa8216b103b8100fcc606a5e91742b0aac8253799f9982abfefd5f837f2fce4a4179772f97627f61811cd4c70d183f53ab995e610bf061e6661dd7a28bfbef01b256c002f447172e533051671163525cd9a63fc6400946a3c9fb979bb0954722ed29bb6b165de4de3bdbbe12432f694ccb60a3f72",
+    "secret": "f1bf4472c057b526d7a1810e4d818a7d75a31519170e04128c8db7de603de7a4e84fd84ebf9fd65252ebc38904076ab14ec630b9f5feee9ff9f6a96cc77a0b19f9982abfefd5f837f2fce4a4179772f97627f61811cd4c70d183f53ab995e6101a3af5fdf4cfeffd0d3f4fbd7b5f2d2819faad5208c9567e23870619e9a048d719cb3f5c3326aa19d56656b5252b55c12da68229ff67fcbbfd6725c149d59ded00946a3c9fb979bb0954722ed29bb6b165de4de3bdbbe12432f694ccb60a3f72"
+  },
+  {
+    "public": "404eb9a4dd44439198591de9973fcb8f6869cc6d443f87dd72d50704fb766040dbf3921cd1f784499fd49809d8b0169570f09a4665ec5984bb410ab28b2e5e7484f27df9f3474d3a9a66a14d7a95fed07773205b5e6c7a544ee63ac2f4d6504d764a1fef7cbe4fcc9e1c03d59edc7090e500b372367229265b77ad6d0586fa54",
+    "secret": "202cfa79636dedc2743c9e16c49f04a03f546300a5197b5ab5dd4fe6a99d269c200a3d6db8a790f6e4afd4f44244f596e26d87a359f5fe7a3f6180a0621c5e05dbf3921cd1f784499fd49809d8b0169570f09a4665ec5984bb410ab28b2e5e74bd1fb07bc8c20a51d78eee0c44647ef4e5839e3e0e15acc0d69a047219dc4fa64f352e35ba695e8803d2105b84ae0aef42c8f3b232c3cefa9f8927846e054e23764a1fef7cbe4fcc9e1c03d59edc7090e500b372367229265b77ad6d0586fa54"
+  },
+  {
+    "public": "58399bbc4caa3265cdcf11dcdc9e540bd16f2647ebd184a43513a83e5c5683138c7e7dfd3ca6ee551ea094e9feef61e2ab3b8c9c6e00ef51c85f2112edfab44808d09a915414c3d9e676f6a225348d8f892649fc8028a4e49af57a39b9c95fdb7008c2acb04fe5b2e62f6753a27f3742c3c0d847be42d1ea0c49fd030b0a0f0b",
+    "secret": "fef9cb6bbe02a72b51e032a01f18f6ab3f727ca9326f31c701cae408588eecf0226c860ef412633c59a09963e0d1f0c70da57f57c0085a17e47e5bcc7a3e40b38c7e7dfd3ca6ee551ea094e9feef61e2ab3b8c9c6e00ef51c85f2112edfab448d1a198fcf5108d0377bb7fc3d38ee78a40844e5692ff999d823e1bcf08cccaf21c438f85ba9cabff30869c95440691630d8419c5375bfc952136c449a85711107008c2acb04fe5b2e62f6753a27f3742c3c0d847be42d1ea0c49fd030b0a0f0b"
+  },
+  {
+    "public": "f70899758f6a835b28012799396c49f82337485f29c5f49e698d18073cba32e575be9607ac7e60476389f76b51e71fae6b9cc04c5e298211178b00e4596bedb36c590d3b30b5b91bccf47adef1660eb7234b6bb46c60b504a48510b6685a9bc14515a5b00536de24cf843d6bcc4d9ff81dd36984a50beaa29cfae70ae5a3d42b",
+    "secret": "bdea9f83e4490934e9618d5ffae69bd447528ff33751e59d93ceb194501da625f33c323b3d4b59038775d126d25f28403d6cff13ac397ed61b96bf082b87844f75be9607ac7e60476389f76b51e71fae6b9cc04c5e298211178b00e4596bedb31f6b0cd6526761e9308fe29449503926134dab65d21c767948a0b985b2dd7492679308ada09b6fb0cd3a33aab7732f372f7647322408827463e15dfcd81e317d4515a5b00536de24cf843d6bcc4d9ff81dd36984a50beaa29cfae70ae5a3d42b"
+  },
+  {
+    "public": "171728517511c5adc08012c023b1e3f2fccb370f64d73cd54023075e43c331d6c05870ea7cde07df9b6d0ef19ad2b9fcd4c2605f61fa68b395d24a176c42d120bbdcf4fef93e3ff2f854795e7c9d593ff7ff3f1deec3b2c760e5bc969c37e417844364c736d774aa7178116021247a5b9c4a18351f172c19f397c18c1ed75a45",
+    "secret": "335c48ba4c84df91cc656d723e1a76f08cc2ddec27845bc59763da156f08413abec8d24b3fc240634fb7f2af727f2d3662864d2ee8e9c570046ef971257ada28c05870ea7cde07df9b6d0ef19ad2b9fcd4c2605f61fa68b395d24a176c42d1207355357dd98180aba5b070a3a4d391c2a4149329582fdd647ffc1f16250ee9d75bd667ccb64e06adaf4cdfa3be8a81285cf33250ec653ebad007ea219b9a9d38844364c736d774aa7178116021247a5b9c4a18351f172c19f397c18c1ed75a45"
+  },
+  {
+    "public": "fad5f4e099d5266f7e872ad5b7697d4e2e7fbc8ed1b717b1203ef03ee196a350cbbfe67fe711690ad52aa7063b0ba21e743dc8b90eef0c524af2c6c4a4db1f40dbb78c74c42a5875b90afd65454a944a60524edb80cd367103ecba0bd9d27ea59c7fea0490857f2b6978861cbe55ec23aabb2ab054d7172e050964fff154be8d",
+    "secret": "da7de9b53081a544d922ac97b63545f7eaa84d8868e362d578ab27c633aef35c8dd497b8d7d7fb71cd73ceb04448143f5da427e3df574377e1c7d94e1dfd2e28cbbfe67fe711690ad52aa7063b0ba21e743dc8b90eef0c524af2c6c4a4db1f40a72eccd39602eb1e6d00310256c1df6a2a62ceeb8153a25bb643b6fc799f666f566ff0aa62bc1360242d59ac0d22a5621b677e06074b6ed79da8b5c406b84a219c7fea0490857f2b6978861cbe55ec23aabb2ab054d7172e050964fff154be8d"
+  },
+  {
+    "public": "21df657462542106308e2685da8f17409b8a3d619b65de9d6dcd27114722fc90d29b1c690a1265fbfd69f27f9e38729f5e79d4bc4b18c2833a3755321bc5e38e822efb36acd64ce5f5e6b898b7b222a9f4152b82f7a36a7d480c5e961f394a4f7e03e5edef7839582b6ca0304758b4ac844660f9842d6a33cdbb634b5d859fd7",
+    "secret": "40fddf63b8f7031c69ab8e217b548467ea6c9a150439b5c6e949ec9a5536d38384fff4a375e1032370f8b2eaaec7a5d42b59411f90b43ac07e783f2e461ca639d29b1c690a1265fbfd69f27f9e38729f5e79d4bc4b18c2833a3755321bc5e38e580daff60a2074e65d0ae92b41da077faab89458a4702aed9935b72c591cf056a893ee88168169f23439810f9d465d03e7fb26e98bf12c11b99a8ce2c80ff0be7e03e5edef7839582b6ca0304758b4ac844660f9842d6a33cdbb634b5d859fd7"
+  },
+  {
+    "public": "4670fb49ac8284cce293b5d458c7a0e0c38cb3ec9a599902c86b44418a15876201c25283bfd2c23cc4d7950f1c94ae864eb249df62203d82a297068f58ba6fe35a439e45fc8d10313162962291510b344870645d182307c50f9d5f7a545436c1ab2829ce765c51974c506ae84cd6d7fc22c992d5b565aab0c11b5b84c279f6ea",
+    "secret": "acadf9457fe9c416623ad185aba5ee57f8c7d8be554fb8e3a875f47d8cdf36323c8caf64cd6d8ac807d1f09cc7b73f67a7687be4827e01252f96014cc6a07a9501c25283bfd2c23cc4d7950f1c94ae864eb249df62203d82a297068f58ba6fe378e635f2555d8bb2f5d6f6cb87cd749e2d1e2100c82a97e2f71929d7f163e4500c26e42d1750315735667b0885ca31c25a6b1f9bb0488cac5ed9415a98e57fb5ab2829ce765c51974c506ae84cd6d7fc22c992d5b565aab0c11b5b84c279f6ea"
+  },
+  {
+    "public": "9d3a71a4e195eb29cbcdea3a063f9125cf5f1d89a6acbf59c939211a75b89b3c984f834c90dd1bea8b61c71952c9906fee8cd79eabd771eb04cac244247e1972b31fdcc15bdaf574e1414ea736ec6ab0a9ecc3adc73d7dd4764e0f9df0cfe51280e77d6f7bb04144252e51f74773a34c71d6f0bb3ebd1d3e3e4858ce564c82ec",
+    "secret": "22f248a2a3d484f935a8d6dd754ea5e5316dc5ce2ba3e471ed791264152a8203345d6a84711b8594b86a52207d31a9e0a12aaf6738bbde5ab432a6a6e12f7419984f834c90dd1bea8b61c71952c9906fee8cd79eabd771eb04cac244247e19726fb985d33174f963d19bcaffc17d0bc2c15e3d8c85da3220541e2d688475ea9302db54242bd970e22d031576fba5e41e466cffa87f1ad4b20c7d46b04e342eff80e77d6f7bb04144252e51f74773a34c71d6f0bb3ebd1d3e3e4858ce564c82ec"
+  },
+  {
+    "public": "de1425f55531a1df354f4b9995174ba588cc1ee6e16cce72e43b6a4317ae928c0d117fdb5b26cabe37e5809c3b1b6813aa6bebedf870fcf0582e8b6fe6359a750a33211a618474ee02ebf8db16c178bd9bd958c897a731c0f0d2208644bbe5164698d3064b0e3cc966c28e63218ca956cbb8db2b7afea1862adb1f45f73225c8",
+    "secret": "947f94b323449fb08b52075c6aa1efc957fb0d86540dc3a88acc6d2479b018cce6013b6bb28e418344982d573589c28ac6d7ee27ed8fdc82ec22c1c2967203470d117fdb5b26cabe37e5809c3b1b6813aa6bebedf870fcf0582e8b6fe6359a7510b3f1f55910fc9fb1fc54f9c6d6215416a19b3670a419863806cf5a7eada3d63a20f5c43b3dcc05f83803a7d1e9d277a68624ee9eb7c869d31c920baf4c67174698d3064b0e3cc966c28e63218ca956cbb8db2b7afea1862adb1f45f73225c8"
+  },
+  {
+    "public": "c0379e831761780ee6797632de6974fbc721e27cee066f2dd553e1eee7e385db289c796a1fa8eca16a7db0440571767aaedf3ef612493fe669e61e94c2ed22cc669554ad85e56bbe20991fab600abb9a068f40ea3f841444beabec0aa5946a895236cb1ea819ad943fd98ebdf3c1cc1a08d065c3762d0ab43ec481806f069133",
+    "secret": "7cddd56b1ecfc8865177ae8936b044aea89d24c676af375e3373be2de53ac94b2e452da46090c910b2920ca888b934749cfc78922f5f1cbfa3c5df126fc4d0ad289c796a1fa8eca16a7db0440571767aaedf3ef612493fe669e61e94c2ed22ccc7d63188f6611848f61fd02be75c0ff4576ff8711e67c8ea4002803800a737cbb2b4a68ed4746ac28b352fb837600bd4bac352e7c0b4fee6fd93f79811f190975236cb1ea819ad943fd98ebdf3c1cc1a08d065c3762d0ab43ec481806f069133"
+  },
+  {
+    "public": "263a9576730d8b6c5c3cd80840ca0fa831b6af9ecd8b38e8916d6c1a05004c514976afa53b3e92ba0772ee0f846c63ded8e1de5c81b9fcdab12af0483027596e09a955ac0025ae9954dba602e2cda9e5b99700208660cbb450879b0d6e781c3cbf7263c553586d247400a90395f3c11560150010082d85c37338fb928bd1fc6a",
+    "secret": "8181b24f6159db6dea1d079bdcf1395fa5d751bcdb58f8031fd42a6aa71d54f2cd6a90a11663fd7c7e909186e9d73aa3b4dbd08827ae0f436b22c6eded48363f4976afa53b3e92ba0772ee0f846c63ded8e1de5c81b9fcdab12af0483027596ea2009f7ea7e6e543fb7cceda523c8b9781a1744247b4a093f7d6d06f4db95845b50b8edd92959c706c550b2d643bf2feceb2a2e1f094e5f1f8dfa1ebf5e532e0bf7263c553586d247400a90395f3c11560150010082d85c37338fb928bd1fc6a"
+  },
+  {
+    "public": "a91f847a1c2248a63fcae2e5952c78d0e4f3f7c2453eedccfc966d8d473080124a950bed2176e7c7a0ed849c4685ec42038f4b53b127e70551ecc83328f61e0c50b37cda9a2d63495fe59fff1e137585e9f2928bc1058dbb2b77242949166b102017f5b70a6958f14c57b639b2aafecefda3b7629820a11abef4a14df88b7bdd",
+    "secret": "c2d9798b467e7f49478ed73b3e457c1858b02523b8ba5a6d820985e47a8a3448e287dc50a3be723078b9fc44c9b3b96452e06db6a1cfd56f7dd9b357642b3fa24a950bed2176e7c7a0ed849c4685ec42038f4b53b127e70551ecc83328f61e0cdef57398c3dbfd7aaf18cbf6baf815d236363640dadc7426ba662939855e9f9ca3ed4d39119fd600c66d01e604554cf6678174108da3be7be76e52a54de0fe3f2017f5b70a6958f14c57b639b2aafecefda3b7629820a11abef4a14df88b7bdd"
+  },
+  {
+    "public": "b9d0996c2feef7e9f9861d366e227ad15dbdadfd024755c71093d5ded5be2dd61480b321a933dde96a3f2248eb4f1d2461b3fdd140ae6e765e5084f7a7b3faf4ee3dc7921f6b454fb75e17fd88df1f0b368ac11b2963084680e84f1df9137d01befbf2fda270ba9d658176218b5c0f59556890109d5cda32ca1bbf94886dc514",
+    "secret": "8516cddb4f8a720fdca5f98eb6627691b7d847249ecc7d44846c81202ca1239fe485abb155046922a8fde840859771647a27b0de6ce6700761cbbf1ce9f2cc501480b321a933dde96a3f2248eb4f1d2461b3fdd140ae6e765e5084f7a7b3faf49b14f3e2b7890bfc077df9cc945a705b5ee46386c28e0112561b9d1e2720d81b33d2e81e2920bf059d5db1701125b7a96076d5273e5e4247b9e0e3bcf38e557cbefbf2fda270ba9d658176218b5c0f59556890109d5cda32ca1bbf94886dc514"
+  },
+  {
+    "public": "a32f8ec9c19f07872121aa74cb9c2540f97dd3927753f0ac52a18988da3b65f23a2d6942ffb35b528ddfb56ad50e88f4ae12276c0495c4233c8a64cd65ce58f7ed6321ea0ad594698147171d25e366ab4d1e27c32470f932bcca740f0e94e3c99f8e42a964b0c59265c2d55f20bcdaa866b8de739f1cc89bbb1160b2cbc88eb2",
+    "secret": "56d62f999a871137e1a69948cd92868420e93e3afe404a8bd6e2917f1809287aa910b35f05e1b0b6d7c69b9bd9b7d4644bfb62da4d0e6c74f6c03945427473b13a2d6942ffb35b528ddfb56ad50e88f4ae12276c0495c4233c8a64cd65ce58f76f52eb8896c0449d60574ba88fa7d044962cd6a04563026dd7d3570c3baf331dd87bff34fcf4e804500b0ce18a9d3358f3f6d1c78b821f05114062f6224309649f8e42a964b0c59265c2d55f20bcdaa866b8de739f1cc89bbb1160b2cbc88eb2"
+  },
+  {
+    "public": "053cdb830bc0f4fc244062666127ec55362dbfc615f8b0317d0e87f5b617b0cba3998e902035142fe1ffd876d31dc3b887eb56e8c2914a3ad39191b24503c139b5e84bdf0adf0bb0ae1121081eacbf1a44bae9dc1e60bfeb899c345f74bbe94df682b8923e390afd0f02e4c2473a9ca1df35fe82edf068bc48fa59f7ae558544",
+    "secret": "e8961fb8953ce90f02abe433c8a806b2f986449bd2854b4f60811c4040409f5459e3cfa4af7b5ca48aa044526af3b2f0968015319786c686db0e114e018dd39ca3998e902035142fe1ffd876d31dc3b887eb56e8c2914a3ad39191b24503c139fcc851a2a2b8742932642662137065c9a4dfb4e0806255f9bd88c6d8d3100e556ebb381cf7c1d1b2ebe1b13e2e4e92f47817dd5afaf6b92f9be8832aea894952f682b8923e390afd0f02e4c2473a9ca1df35fe82edf068bc48fa59f7ae558544"
+  },
+  {
+    "public": "dda001821efa5fd7f78968fcb12359113d4781b6c9a030ffbe0275947fed1f9ce022e1b1b681c7b49bd565cf5baef492ad29b9a2453694f557c8752093a933a346a565ffd0c0ada461653d9f08298e59e3be5a4dea42c043f54dce8436e047e534558f18fe9ded1dcf6ab1f9069bb94302f9b416a599600a23313561684086e3",
+    "secret": "815336d159b926f967b49608f06deeb377ac27c4edbf5c42f02fee911218e2a121857696a424488af4056fe5efd5569598b413e2c49a4c248d1cbe44991e8aefe022e1b1b681c7b49bd565cf5baef492ad29b9a2453694f557c8752093a933a38b10253fc85e90858be0bf37f42502de46856299ba6d39aa8b6ce0061f19982dcb4683436084da79234e92a29284ba82c80fb9dfeedafd14a59605a14e8c3fb634558f18fe9ded1dcf6ab1f9069bb94302f9b416a599600a23313561684086e3"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_keypair/tests/ed25519_extended_cardano_sign.json b/rust/tw_keypair/tests/ed25519_extended_cardano_sign.json
new file mode 100644
index 00000000000..b0731ed70c5
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_extended_cardano_sign.json
@@ -0,0 +1,1252 @@
+[
+  {
+    "msg": "",
+    "secret": "ed250655864a1e9a06213389c54b4c613ac81ec41b43f50d2e21839fa881535f1f2925bdb9bf244094d2884590971c126b11e10d0c91f49a34b9b90e54bd12defb71871ead7ec2cbd005010e66dcc4dcd9fe34a01b34a1c6d26027d09846ecaa5b5a54df16af9d9679b1f861da12aef0993f10bd1855670b2ca7933e34efb46fea3148c50dc26bd9f3b72ea41a1f0b058c1da97f0a7a156833fda32512f11a88cc58e676ade7c158a54b87fe39593b141a07405c031d71b71afbe792e35fbe76",
+    "signature": "9ff22239581685c79a6b041ea7bb92e6a863d6fbe49f40e28ce3e1ac86038c0352da29ceb85bd76cd49486f1ec103367163c3a91127ce05734933b6c33d9290b"
+  },
+  {
+    "msg": "dc",
+    "secret": "20c43540308293cf22324a2ff21504012cda04358f4b7f24e047da942ada8547e0ebfa3b9d9a35bf2289587c96e2c84c9c86cd994e4103f4f69ae8f47ba7acc03cb5fd5de2e9fc2605595486a7cdd15eb5bb21cf77b79b9a1b07b794e4815d7ea89489377e9fbe1d5106bcf8123c0113f0f1e56196c0afa3f3a97caa7b362f9b021bc9be635fabffad8623bde997b17c00c39f3e99fab838d4e7d75bff04b90fab12207ff62f97832dcbc474ffc797dce91f62bff247ca838f54f6a856b69155",
+    "signature": "130d0fe92ed86b8583a41da94c747eb1210d92c1dcedddb192f71d201c92298131019d46c1cc4dfaced0047118a2e9b04c7cb90726b0c05fb5d51cacd5181b04"
+  },
+  {
+    "msg": "e370",
+    "secret": "b959eef5999541074b8e457ba1d8624c2a019c022b12a57dc67c3cd3a321c5e22f309e8a60f5f1ef45488720a379c84884134531489b38195a5ba2aea9119e9d30a3d2d4ebb89bb98d8bae5163a66db7eca6cb56a8aa52d459b4737c4ba9ad7c2261a545afb37e6b4d63e425426e492e1521421593925659cd54be7acf880457af67fe08d0a7e65aa4fd1b32aa34f762913a69be4a886bbde1c437778f6969d22d68a36c150d28e3da816626fe0d329fe479f23f4cec1c3a28e1725e7deb37c7",
+    "signature": "a2ae583450dc797f5a71b6286e1348ebc1578ff4bda1f78ec14d8f515069313e3757f1f52765042afd72baec4d5d24541cb186f1b219ad920143eb2264021103"
+  },
+  {
+    "msg": "1de039",
+    "secret": "77168f24b6ffa37133365177eca5712c7c7e24778b88dfe4a90be9b521437e46a011bbcb46e82f89b1d14d5233da1ae29007efc7c220a8e768133421506ef811c2996bdc9170bb0d1005e8b3832343c11958f06fb46fee2f9129de834deaf1b78c24648e360f1774160945bffe4dc72b981eb7b0eff602099d23b53fb11b0791d38d3a14b94023548a3fc7815b12ea985896e40561c5bd242e927fbc6407486618a3348038cef8feae53d7f097434b61b926dc5098debbba71ac9090f62b8bcc",
+    "signature": "f50c99805aeab3c47043a9eb5a330219ee8f186cf7d755ff4828a271422e64a83cf497ab29580f377d5b1d98199f316c3f4d239f829e2fb7d853d3e6e4bf480c"
+  },
+  {
+    "msg": "0f835c4a",
+    "secret": "de00e0faec7d8e604e7ad2c42e07257af1eeda664ce634224470f96aa2279454cea1e161bba165d1482160738aa1850718881b8093cd1a72939893496f834de4a731b84b298da463431db29e2e96b0bf949cb5294e7a1b79b2c0f5e6d0ac0d11c267d014a51ce01bb3ba3b5db9ab5a2e9e2b61025d784016a619cdfb6081dd9c479ed89e9acd5611ae1854127dc15d9711becfef3087144cf264325e722125deb8406e7aa64f60f8e25fe564e9815d4bfa32493b5da6dae1b4aa18e32e662ec7",
+    "signature": "18fdeae3b0e813eb33552c4a53e9eda5e082134a5c4154bb839d1be39cd5f344c12b9bc24417dbbe6f1150f37b277750cc0425f51fd7d1935797cef708f97d0b"
+  },
+  {
+    "msg": "d47af195e5",
+    "secret": "99673a0f794f2c426e69d0ebab6d808d7fca935648e36b96297704225127b3f3e3eed9615cd442d34bdecfbdf464ec688804ebc09156ba7b204181dcfb8020c9bd6c2e8b37dea2ab102ec8d9fbc788b68dfc368d8c26076944d3104ab2132de863c0d68c265147f30c9d53d2c515397482ba4f520515e6b4ba25a41071fa306ef6dced9b349a0cdf78e6156a86a7552b7ee873ae3b98bb20ca09cf26710236618ef684f4aa2f40692fc436d521bac30f16e4f51ab8de67ea52e36dd543c60a1d",
+    "signature": "b6368152bf4e0110b49cadf0e828739949b2e4c7067e9166bdae4d62da755812e54dfc10406274a0b68b20849a0f58f76425648165128321773871ca4c3f1b09"
+  },
+  {
+    "msg": "096bd2b3c0e5",
+    "secret": "ec8a337d9e26f9a8656abba3b66c82ea8202395b4e779acd49bc24926ee98d799156791421ed50daa4ad71d75ad827a9ca2eb1de26d7ef8bc5f5872b89daa4d0adf098bd596673608529d2984858f158afa112a670293fea010e7209e3f9e44805b71a4c5edd507c3cf5dbf3a6234facadc1704395c08b4bb396a04ab9c71c4de4b19a50eaca45439e6792cc9a8c76f8f3529a2215cb345f5dd2263530aa9a5d69de2408c7da83185c9b11fc5b6dd76d3e3d10f5bf96d46fc05457f10a22275e",
+    "signature": "a68f4ad5b4a1961b9251cca0ae96ef6b4c3b37e00775850ae7b84529c2a738e19890ca666210efdee2fc830f2f47e3a8434100c81e71a9f6ceb02ea15a25f303"
+  },
+  {
+    "msg": "1c892685ef88b4",
+    "secret": "ab2c9494e05a05eef0aed319ebc2509aaa8eab3dbbc9ab501a5d54bda11dd62667f186fc0a8d5c7e7fbd79810ba5fbba26324c09c059d930b2df331028af55410163c416cc69abd2b61bf2af90a16cfcc01e0cca8ff462a227037653ee1185bb03a401370bdc4f7dc52131e0984f220c37ccfce3b83554742086bffcc51ec907f0808d4a3141d2de64ec2e9d3caa87380afcc4fc611bd87783a766979066b4660fd2ef0de90cc4c7d4a8566ffb1c159cd91761536a54e2318ada8dfaf364a85a",
+    "signature": "dc186be3f06a52adc45157d7aa7dccccc71806dce080207669cf407961252efea3cc0f9424bc1f59376e4543c0c0665d8f7cb52a6b49f55b6e5a2efb8828b108"
+  },
+  {
+    "msg": "31435f5af8c7d632",
+    "secret": "1efd4e59c42907ebe96b80a009c600c7b443a65b1d0819f75669cfacc4370db9cc91d5b8689f5756fd0e0d4d03fb69142400d314516cb5e2c7dd894125bacddebec7832a95e7f9bc125434754163af7de42a1c51bf531d07b4417f66d91583d241c0badbc65e75b6245e3f85b5cd10badef127f6af970782bcb94f485365e798ce0785c397f267adeb0aa2e0f1c53ce5c6d6189e804c29bf1baf312d3461c016aebfe9f86d4d974daa444cd667ebc2da12b485e40eb448e9090eabc93087edbe",
+    "signature": "6b56429e4f956a62a914d7dde1d91925239a3abab5b09eeb118cf27b1d483679b1196726c3a6ada658a2c6e29a6c577ba291d64e0ff39b194450ce2179f5a10b"
+  },
+  {
+    "msg": "91c4334bc8b30d6e53",
+    "secret": "0f82c1ed2e6cc831d757a1d813dbf52545a3fa0c6e0447ce4f15bcf477189329c9757cc7d5af7222e0b85dec3866a5075816be5fd95d9e47ce01b89be89547956c2634b82c682bc78321583333d5a9178e2bde87614dd6d6799bb26b2d1d098f240a25694bb3edbd4d727237561daed4de8cd3e5726dcfaab83ed5909fe29e9878e380babfedb4a586728e14c5455b9614d13ed8f0cf4c997da6795c02337dcf188d2f8e173cd0036f229995d0871003eadbde82611c6d700a727d9637fa0c55",
+    "signature": "d13f2dee2bdc8562f9de9c7be7dc288a0283f553cd2f47da13a3bd758976c0a76a2640cabe1eeae57e26a21d2da6126156a0dd44ea8627270b83f1394adf3100"
+  },
+  {
+    "msg": "baa303b23e270d368b70",
+    "secret": "fcf8c766baf7d8e28125903102b7f63e8a99674df87f6e5e45c1bcd6607d03026ad93b4254e2da29e7a61e752933031498b909bc8d2d414d89694b70e5179076f8cf273f8b0c00ef2875fa8bcb8816c699b51d2d9bc88c96131bb80471f568f35e711884a8caa9612a61557e611b56ceb678b377244faef401e2c989dd686f3827c4b8a589aedb765764ca259aac27a44bac0b38d519ed3d10fc76027e93b760d05b89784127a4ac5969b0563fb3414cb460939973bd7f36f183519938bfb699",
+    "signature": "4f235ddd8faa0c2c420054bfc71f9dfacf89f35e3837174ce125da428f154972a9ed12936952cb87b6484141bde6abc2f7693dd29892abd1cfd3161261e69402"
+  },
+  {
+    "msg": "1cd07d035f88df29d1c2a7",
+    "secret": "c58977ee94fc4095fc75930b5391003977670cfc57f93e6b51a97b052419905e06b00ba580e5191114e4e41fe47918392011c3bb0952c83f8b0669afbb44abf202bdb041587038b003e0b1a7ac4841d63423871ece9ed647c4dc59c3ef17cea432a417ac90e03b3441e0a1b5cfd74c7cc0a477d79a825d8ee5032be29abf7cd544e4cea319e1099bb4e875f782bacb29efdf29bdf599fc65840d4c1f79e0f2977fac12fa137c831ecd41fb54d14e95f0626bb53e2b8326222d002724f6f9c87d",
+    "signature": "9c3780381d5d59f6d00e8aa5f29b5910b371ec74475fe8de7fe36ec68ac09f4ad7a50dd742db1cd4145603521c320047e7c469dc5d695dbc538c65a9187c3905"
+  },
+  {
+    "msg": "08825f35ccbfa94568a1053e",
+    "secret": "92718c088ab4f58e74db26f0e9989d9008bd04127547bb6a1d42f526c0d68db55af70a09256432b10078595475b18b881ed403023ad9478a13e1d45a33ff43afe4175dfcc44c993a481e2c11b5c547d5be8c1de1c4a577dbac79db0511ac9226f052a4aad68be2fe30d32351aad674894ca8854ad48c2fb4d1e04a3a7317355e3c26738e41f12e265c1ba93b2516b8a89a4ebb3d04559fa08c9f5d25d5068906c6298df2280337ce6250649991ff331a38ad3f57037eef54f7b684a8ff76d9c0",
+    "signature": "d407e2f0a25deace7e93c03f5fe4138da6e6082c886d4b6919e25a43963ddd9238052bcfc3535848edb1a8844083d73158ec7cbec0874b9eb1a3ffcb9db75e0f"
+  },
+  {
+    "msg": "1e1effaf1e26fd98297018bbaf",
+    "secret": "858713b5710311becad715b07720fd7c60fbccd6bccc9105ec721df9cd2d1df1ba39aea58ba766604b9ad2348501fe9bdf131d7b44fc76ac06e07e047a8f9dda823cb6d3143c3450dee3f6a9c689d6b26f917bb45841d3e97e4960d11d811f8ab4156f2370400f1c2e045baa9b939ebc50255819a154054c1c7347043ddbb80132c1039d70bcff25c5012e885b3b83191da21a58f0d21fbfd7f79839502ab5fcd4152131b692d882c7c06a84132141f50051a2f250d96307099c9636f3121333",
+    "signature": "7fb8e4de26c7e0ea1f649658d96074bafce3dc29ca1f11301a13c8d4e3cd2e0546a75b92b0aa8e2f5ffc1e174e612dfc2c596932cc97a3518e0ac4b36b93000b"
+  },
+  {
+    "msg": "b10d1c3b7638ecc5aad8125a07bb",
+    "secret": "c3a7471feb887f06a308333b2e32992823f6fe21456c7a14ee5d7b5f6847ddb00812c16c85a37e042e18c03e9884156b2f5a9cbe187e7e95cc1bed76fc2c88aec2bb774b77303b78b0c17f3e87f7bc036a1a680f66fc34c2d32c915808f24bbeccc5261ea66abcd316925f5b9e7a76efef1b39394adb3801aa3ff23f975af7730e34253ef99fd54e21d389caec44cc701b66640a8564b680eebc6084324f3605367ed46df56a6aa097306ec47abc92799d8bfe4f2c52bb5c0cf3796d9a7f8d8a",
+    "signature": "8f4901cb39e22964e9c79908c1ada05d86a8566a9cdc3ae97a57185faa9f769958f23043a2b31dfc1a309398b193719a03f7d8e214bc5519b7ac6e365a68530a"
+  },
+  {
+    "msg": "d4b325b88ab1b06acb8cc0ac9c4c07",
+    "secret": "fa6c2bcf013529cdbe5edeec6c992a8cca30e71207fb5936224e8cace0647694340084658b3c438ffc01bdbfdd44311ead0ed85f8c4d9d9b943072ef9173c4d811d484a685b18eb57735ab5b2f2e8f576a2f5b95741e312db16c3683b8b98d2619b9fe58a57403a72d7e08da11872a72e55ad26d0f255ec6b029d2f20feec88ef3f6aec57cce1c65d6ecf891ee3d94a536160d67e5119abe780e5e70ea54218ed10a98861a2f17db790ef7d5826929c44807984dfa5ee448a17914fd868bb5fd",
+    "signature": "f91e0ea5e8ffa52291a2fab38c264b15f38faa9d95fab1af3b52b6500702172b775c10dc75acbdbcbb2583cc40ba3c3bf30ddd0e80b8e428e63b14820d68c90e"
+  },
+  {
+    "msg": "5c986263ff281b8f06f09b3c52ad12c2",
+    "secret": "0a9c99b8229af131119656e4d0953989ad4277c3d3c4e00ef719291986d0f6ede2029566a55d5be92a4878776e0e5212f9be306d06ef9e082743eeae1159dfb5cb4e8d68837f5e07c088affa09b21997e57c5bd68824791d2e554c094efd0a9649e92b1a729e297676a3197581ca70d16297911b8388e7478b30cd74c068321ebe71d1ea8a34a4e50c4502b9ffa35f3f09e33b6f9ef8fb03be809a1d0f93c29ada81c1008189cf976cf9713c5d752523f679ce139162219e4edec79901190d2d",
+    "signature": "593f57b86df9ee51f13ec48cb8ed517e6887d4f98e0eb7ddbc8974d335d6d824c2c0a41bcfcd53ea70cdc2efa48dbb78e73f3b523aac919cd4bd49ed00f1b00e"
+  },
+  {
+    "msg": "1a1c597139d69cf78ee1ee720c5b3f9cb8",
+    "secret": "559dbefeada3bb0370b491edfad2e7c86f169396c489a5880e63f773491463323d3ed9e6097b488986f8fd450c01aecb2c7637bcd8a54a312c12d52a26ee8372e1290704807e65b67ce4de3096edba2bee12b7101f71cc4634f6904a93ae4d8d6c5f15c01ec72bef4bdd4f6755dbb2dc9312c9602abf3f75974bcb414e75ffd9a3dd1799031d1014b0be5102efcd0d6ecebea16edbfd77d23de3d8be2ca0c56b5f25c050751f95bccef6132501f66d15a7607478c93300f76e929d41b3124f82",
+    "signature": "77e49f290ef40e131427b375743479b62d2c20fff1455bef12f702ddfe75f13e34d0303e6d0d5e778753dd04541509534b3ad2e370e511c95727c47865716207"
+  },
+  {
+    "msg": "10e14f3ff62252285230732146660d40e59f",
+    "secret": "c3c0c07a5300dbfb89a30bfbcdde4c901cf0d70794045739aaddd1a2e70dbc26bdad37fde7b2691fc28367234cb17c068a83844c333d50b8db7253a7db9d3fc1b25d56cf7a7f63a6a46df2849547092e0fa2fb613a65e9d50ecdc916e52d3c44d28e02c98bc455a4695934c567d991c2bdd1a878770557d3345d1516ebcb5c1c75ff51121cb00ff3998055db42b6bd05b29894e436900c9abfdaffc8ab8d35d58c68e89e455ce0b758bb3a27bfb91a4b786d60ca553f922877e32c022a0c858d",
+    "signature": "838b5c25d1c6239f44faa69e378021009847a9b26905ef62f48b64c3c9d6e57f1b123044059b51dc586f7371729f83acd298e86085638c503d82c01970664204"
+  },
+  {
+    "msg": "0dfa9197d7d90da1a0552713cb2de033bae3d6",
+    "secret": "bf9a92b7f37e017c8fa8b21dd5c7968ded44225a24e907e6ecd8488ea55c787fff9befe57ab309b81182a724d15218749ec6f92687a2b4745d17d6b111140270c0f64afd4c39343453e9cb2771d6a3e71a7572a1aa4930ac286fc73647b4581b0a5c581b6e445e21c506453fb4bc0f90867031b76e00ff3626c3f0252284c75ee71857274f3300bf953d4b3cf02ac9959dc84a118732a0fddbdb4e219ac6d3947d1ff84722d726b5998f8ebf5b97efe5945e6fd5193ed8d4ac9b9f4e4e70d54f",
+    "signature": "2d0fca2b11f0ddbda8ecc212c036714ae9abe7c60badc4f9bb2a766c447518dec1e986d7bbe73e6aeb9c210db39516823d2ac0d825d6d05f6ef029c673edef05"
+  },
+  {
+    "msg": "57f799a203b76beeecd0d9002b3e0f14d140dbd7",
+    "secret": "05ca57183afd83681287fdc2ae4b7b8b2007b154ed5ebf90aa38e714fa6bdcb66364de3a1e0a9e3ccd175ba36c2764e96ef9f9efaf4f6a635c3fa157363a718391c7ec841aad76aaf49e22a4186d9b9a9a8fab98b246dbe57954d5aacb11ed319e1859e2accfbdf3525a67fbe45254415721dfbc767d126a5d3399583e32724b11b42c1230141df7c878f5c506df6ee07838effa0d5ec4f8cffe8317889c58b240b09be743a5ca8281dd7520ae245fa1966ef302700199d161faba90ded800ca",
+    "signature": "3ab59f591e4db95f2fb5b6fe31bc98312b645f587980cdd8f47322f031c95d8796c9fe1b1a65175010ce2ac39ba8d6a33e5e757d9a69fab6c834ed3139241b00"
+  },
+  {
+    "msg": "61c33b635867f2db1e3ac6f71dba0ebb1415b1f240",
+    "secret": "7d0b6eab990f3c7743a5728bb67c5b77847ef6cb823e856376237ef00b6972d30b8a885c3f8343432e15784d0b88486eb952776886165ffe94f1dc7712a9d86dd28f3a4640962a4da2b331cc7a780ef6c276ecdce03f8f815e2c3e05fe8b5d5c99ab844a2391467ee52d51b6d8cdfa9732154ef8d8df4c13ee2d80584cdf768ce0acf8e60e63d3575f6958badc039129f17633d013a395cfeae908b8d097c54c9dd54a274bb23a109484365423afa49de45adfcfbe2a2c359fce76772fcb794d",
+    "signature": "4728108cb24ca1b9a8d525084edd872b8d6b66c0296273de8083d482a551b49b878b6d8d2ead9f7c9dc4a56e5b3d289b5c211597fb4ee0035bab1fbb9781ca0d"
+  },
+  {
+    "msg": "0af943aa1ba947c18566b216164fab0ad1fd5bbb3857",
+    "secret": "de5724550429379115f1d5d4d9b245ab1ed60112053acaa32b76128b9f9b16291053a9031226fc21792925879e41e2d9b859a37cd28572a068c1e5b2fc6ddf1e3bd5c1352b63147220399a64ae78dc6b3f64c5c0a2033e7af7c1c0b1032c691f9e89477b71cacecde58701df95cd292cc8fc4a8b2be7cd9dde8cd5d17ef738b515b5fa86a602709abd97666ca90b5146c20d46e94b71c87e060cfa1ebbd2230a7835b8f72581f1c2e9008072a8817b975f2dd52a22d6c71c7217f72ace0670c3",
+    "signature": "9dc5909e9467547c26b56aed4fce436528f74fdceb3169a3e9bb1b7d6be88f95620bf4f019298dc220d693c24881c69eb195aedbef85541200470fa784fc0904"
+  },
+  {
+    "msg": "5c65a398a56200872c0ca45c45132cdf9a3bd8b817dd18",
+    "secret": "4431e3f3c02f2ffeb04f3b12d821309e0c56f6e07e8e05cc4e852350ad2c3b3497844c7afc1b4438780ad506780b03827489ad6cc6185c24373759901d70a84e961308da9c154f2486efb30bb1de155d4668f467be08467a7e6ab377e16ae0c8ef64adac1677ac9962899a873193a438c38e33b8abe47431af7256b910c6f38a62192d8d6ece4b10fc57be46e8439ea4858c375ce64d95b89017b35b938874d0b2917d0bf920cc0a41f8c8c189135a83e88ef09fb7f5dc3dd03a5808e04e254b",
+    "signature": "8d27fe427bee08325ae404e67d6e895ed76b076cc99ab5d5b63fbb1c24bb30565a9daed01a1dc71ceedf02ea0748c147cbdf252b7ad438474de321d160fa1103"
+  },
+  {
+    "msg": "32ea9c5bc2b35be4326209e63f92a615fdf9f4fd0b8d9ab4",
+    "secret": "b9d3a544018c3d1f79e7edbf10898ba9077eafe822484cfb1bcac01d6f39a78608ba8aa3f763d3ca6c4926273198ce2e22f8228bc38bccedbc764d536ef946394adc30ac9dd8fcbcc3ccb7de9f8752e1ea2ad35e29fbded3ed3fc3c82b9509ac8dc1739a532b165cbc25134e9e9600fa118e4243a5d0e0d2825d403f4ef0bb9bce34d4afd995250000cb4ee210e688bd759464b28209973ac3c1f1acce3201f923e49953c91ba3b1ea2224bdc08207dd1db076211ca8b978a03b686219003278",
+    "signature": "9a91d8cad661fbebd4916797da631658619bcbc9f1bafbbc3fedb02209afb2efca054d4dcdb02b71ebf3f6e4450e6a8897033bb66bec8524c532076a0a51ab08"
+  },
+  {
+    "msg": "f1f00c976756033bc1eb9eb9aec39e686553e3f1e8aaf24b0c",
+    "secret": "8bd90a0de469940511531fc0807ac4b2668f580c04cdee065504ebd8111c9ae476cbd821999b609f39d493f7f6c3af240d94eea78b9c5f3a90db780bab73fcad84c274aa65206af7f14fdeb18bdd4d14e30fda5fba28ee5df6c177c4aeb858872f5b796d9ae4d71327f9db7a86e75440849358d2f00f7f89c08ac0f7baf82e8b3da65d564f7f7aa6121115fbd0eed6b40a68e717f7a7383a6cccc9905ac100908e58d127d9d52a3aa3153f4c5f6db588984024aea2728710a16f121f65456e1d",
+    "signature": "4d188f011793923eb01923573248446ccdab67a10705b86f7232f0a56f40ba4d37936a90cc8f3fe6ddb1d3aa921d33c78197d6a46a19c90fae3a4c21694a2702"
+  },
+  {
+    "msg": "a750a49c41f53114180cc8afebfd522bcb139f5e59d7c63fc3b3",
+    "secret": "172caf30126c6ddf1028851374c5ec7a66f3be82ef8729fbf58c9f0e68fd81cf54f0c4a711cc7931275a21a6824ea72965da13a3e0109496e5c5045ef368fff56b25c38dc04ffe5242852c4d957f5bdbb5a43d131e1cc456bceeb1b4a8fea1135a5268ef2f07395c397d187036ddbe8703eff542d35480a97570d5813116b70f265e93ceb6bd59a51eede574adf98fe80e80d5f57290472c42dbdbf7effd48172ee4c52a99cbe0fea50851fbe7e752034b75372deca98e5857ed01fdb5420de9",
+    "signature": "d0a0bb96e092b05382a29c5f61f2c8170b502d93285e7e9da680e0aa88ff622522e365e14bbd584dcc512ea7cb36ffeab3f66f49c5fc98a6d05d8a8868f4f30f"
+  },
+  {
+    "msg": "377335219ab373789c834914e61f4132fe3add7fd7f8045014c906",
+    "secret": "9f4eb59f9be1c6c4a14aaed985616df658ac15c9aa2eeb9a6e5ac1752595fb3e58ad0b06ee1583c0296dc547c34e67bc691e593dfac76966c7edbc720e390d31c7ecb62dd1dfb9f9ea5103ff0f67c74c5fc0644ecbbc36dacd30791a98e361d0658f684741f4dec829960cc600920ba752222721f13a53a4a24a090b6fabbb48a85f0ec72c573b08d26817e7393fbd8e73b9c1b6bf02c938491ff3f11bab8b09266fd907a2c44aafabca8cada70210d760bf456c7627232869cea28a2d13af63",
+    "signature": "a37b5a990faba13742863c143c6c033a84a722cf8d56a854aebd6224f3f0b15a9f0a4d6b4cccaf93a14e6df108865a319bdf045e23ad691993e0d712d61bc305"
+  },
+  {
+    "msg": "00ed421cf550f588517472901845132d027f2d3e589223b853fc8f3f",
+    "secret": "ac872d842b74d2a9236d3eac9b6c4a93399ebce7e705d6b1815d2a71adcabe1e14afeac95eab0a538fbeed352ce5ee4bab8f023811c287a8fbe6e4d81eb924f709c580299a0a88bc825232350ba18e9146967fa729348fc0af69e1fabdfdf170b4b7c19f85d18e8b098872559b4696bc32bfe8de00bc0319c3f2f298f3ea90f59a522045a736c1db1aad77792255df64415db1ab3ca817d30e0105285b9f0bbb585cfb0b4148abd582b2d0dbb7803f9b435d306d6ac4997c74545704326229d8",
+    "signature": "93c388e528126e805cf0bc87f39217ab4a6399f3d24ed9a0f9c807515d5015e8304d6da9797af3e508059027cd5c186d3beb5ea11850754ed2f71a1e25dff50a"
+  },
+  {
+    "msg": "a83579ddd3fab7b1f1dabc2afb9e0dd2058669864f81032cdf7b187f0d",
+    "secret": "8e41adf63c83d986313a879c7db81b4852f0291543f410cc6619b3233f3702e7b549e73abe52c917c419e0b44357d46b466ac813bd3cb0f874b6915e4f1fa701e04608e2a25da95d69970a3cba0caf50f46ae13115defeef36a51114f118235b47ed56f1a71ff6b97aca5c63688d7e0b3a67050db74a84f1373001c38d6df83049d6d212a72afb434acfcba26383fdfa8b1a44836fccd227a2b5b1c82699e21479a0e75ddbfb41a8abcb43ad0b08ce1736186c655cfde7be978aac09c9ae52e3",
+    "signature": "7ebcbfd9bf8287c98d25bcc19f37031cce6eded1e2ebae3bcbe621fa0bf93673091cf49deb9af0cc22ab35c13f35e22b0b4dae5716c4b72d95bb26e133f23e06"
+  },
+  {
+    "msg": "8e916afaf7a91c0d1699fb87aa1d155664b267c9a6b6bece533b8b0b00f3",
+    "secret": "eee00b0c665a6f3ec110575ae7581f0a52e28a6eb680ba346027d41db6dbd3cdc9d2420b5899ccd2f9570160f4db0f7b96fbcde967c1a611c74da1207dd6aea6d7c3d0f8a049cfa29895c8bdc0b517a7b0dc45c79762b7632130966ff9bafb264775f071bdfb4218e05694a5caf1ccde0538f560c2a74e751ce9fe4a718b6817627183981e46627d9788825eb5a20b13f07a7329b931a7e43dbfbc4f7ddba74ecc25ef9e902ef9137357cb973372f1bcf55c0d4b883bb8a95361d5d591abf656",
+    "signature": "81b55efff88064c91a4e7b6e53b2fa9fdfbf4bb4d667ccf372b9397f097680810ff1cce6596c87727f5ff612488733a2e1e2e475f6325546d2e9ee8d77a43d0b"
+  },
+  {
+    "msg": "0d828225943c42f8f4c52884ffdd66d945389add7c6650f43ce9eec1d01191",
+    "secret": "c2e19e318dd755d2b6b7cbb3a945cdc94cadc0a3bfe21e61a8730e7cab9b66787a396adb47125e778da24b45a9d5bf012343bcb989db4f21eb7c40b7f6e366294b901e898519a5c533781c82904bb1deb62a6f74482b1c1cb68b514bf264b0170b20c0137125618f789a66fae2406edd11ffc81e12a892abb19dc399c68ad9a9656221dda5a768af0b62ca1dffef438003a8bc6ea729d70cb33a9d41eb3ea973845a0eaeb4ee726df7a0c02b78b88c608e7ad8024244f64995dd9b02515149f8",
+    "signature": "17a51659742b15aeda331198a23fd734de661c0c24a74fc7a37b646ce4ac3d9adff4520c1b2d557fbc9b8e55e4a13ef362977e04b48a59fdd71bb70a672fe10a"
+  },
+  {
+    "msg": "84ca29cac060bbbe0b06d3289fa11e2d876038b3652241bf7c54af40065550a4",
+    "secret": "e2a9bed604160f6f5db3e27399ee7d2c48431832a553e71da3b774b52b84909ad9e9cef64c201f2a5f5865824b4c18be4636129899c386a68639fdd2dff36e538bfeb994c2ad42b0ab92d1a464115f9d69c7d388ae8f3f93d449292fc11f5d9cf0c816bc2c061e6e0d80d367be5a28caee0eb45beb8e32e8f5fea84e7212d4847a3685a83e6298a5f9d3958ac18bb65f99a717a86e88ffe0d9a4477868da849c9461b4d54c8f799899dc3ccc8217098a1b2c681e7079130c1bca8339e605ce6b",
+    "signature": "1980b9735515ae71f223d45b14a245acaa007ada96f9c006086e345fbf22a038caeda66aadd6ab49bdf2633beeebd7e316983b8758249fac5d4d3ad1bcbf0d0b"
+  },
+  {
+    "msg": "77cdb7cc037550f00298b09046c74014cee6025720754060bdc57162a101201906",
+    "secret": "be479f71db1c4efa3bd54fba1df6542d49d1e01ca8373806203bb8179791334a5bcfe55e2d35987fe906836d6be7dcf75e8001c5b925662e180a793fd299bf2f3bacdf5f51d4fa7e36fe01d67a359cd7c8aa505454ddb8f1fc04788f90fc7e37e27a424fdc04dd368d13412546902bac28fbf32ea244b9f6a98bb7c9fe37bfd5ed8de0ec272b4a88752f50c0361e511fb099520a36dbd910b50fa709cd56c18f71d582e26d197170a11f2711b564c4cec2ee2d71208c7fcfd1fe7aa5b59c2aa5",
+    "signature": "f96d996eca83d78db952a00cf938dbed47d86bdcf14b3db8563bf15055320c001d287111a8d5195f33d58f74e05c0d254aaac3988a621a13d717a8b961630a0e"
+  },
+  {
+    "msg": "6058fdb0cdb8dc26d8d14eaa20472357654ad5539525c6d78e4c21970cc84f6c0dce",
+    "secret": "3415ad3114f75c0a292674f30104d8280d89264262f8ec4a1ec8010a81f622bc54893f72aa9c5e09ad411867b0c7c2101b29f457c4f2f0d56c5963b1e0bde5a2aa4e1690b6fbb966bf568cd82ca672fd9a3e1f23c2c66ca2295dc30466d0da44b283735ecf9b9f6a7e92323733e4cbbaf02f6c5788f2ad0b15ae2a397167a5c1198cfa7c2ba75a23cf2c37f1e3dc1e83f89235257032300a1f53f06eb2a8ea7bac97979c82d26517300ba2152feb9cabc82ff5bbbac13dde141788b467eff404",
+    "signature": "3bd4bf8deefaf5c0c507a7051ae9e5fcd3d00af4f7127a7d97c33e442fc7feb308c64dee7aba2b10fa7881713fe27be8b21151888d9ca68ee264fba045c36c06"
+  },
+  {
+    "msg": "540dba0bb10071253c1134a67643009e9b25843fa0ade8367ee00859ce0e9871dac412",
+    "secret": "06f845c19f26e8f0f51944efda5bb412a2a076bd8a9c49aee30a4959161a7c75659af522fa1e4a2ca64527c57501faf1c3faade692a33e9f43cbafbf98d003e0ae370e48989f362cf4eb7f8741d4e93dae478f93f0dd3fc565c702a56748679121755c2fe9cb2560fd3ebdcbd98e1d4ae9580259d32f14a97cd260bdf33a67d53fcd8f633f4fd5aed85701350bd56c9f722fb27b3b2c1dab5972fc2ae24a0565a3d439826304cb776df12fd662aada1e9e6fc8d08434b5a51cfef7e31601072c",
+    "signature": "82ec709d67b05f26513d40e1dad2afaf7e649dc50ad88a51cb7cdffbb09a42090e1490eec56791ca6387ecfdbdfd53632a55adfd70bd5b3f11449eb859ea380a"
+  },
+  {
+    "msg": "3dcd91e937259856842629e72958e7087af405f9fc9b38e9e3a6c4853cbdbe482ebd2e0e",
+    "secret": "09a4c1a3d127715364884e99cf10682c0e601cf7b5d29662f3819696ab4bc8d676af39c949b9d8edccd986ecf5df24623dad8515b88a1243114c481a23b538e0c0cac744fba3a13b68cb42ab5a9ac7ac13beb85d1227037e5809cb55105ed2bbd0305a4006db452aa78cf22e750467c861d9549e252e76df8f2a737db224b98f588825d1b36dc9f830371e74893c024dff874f4aaea57b23fafd0887bcbc410585e554950ff503f754f3cb3613f7b76da6fcbf6352a210e8dbe34468fa7acafc",
+    "signature": "0e8677030bd08b533ceeebc82866903036aff78993090c1f82d46cb5a4e0643c969098db7cb5a35948f4f5a07389142065b8304ff2e3e035ed1cf1e0f3f34d04"
+  },
+  {
+    "msg": "98c786b8fb6a341975c36e52d5db2be27f0c37bde3a1c954b23ad50a46b8730575c6e21ca5",
+    "secret": "113012250e06d0f5b124368f3dda49691e2d5f131091035b94d2f11fcc2c5f8af82fd82d1642e18c57a00b33d82787433a6ccb0f9fa070e5d2b503bb4830428a6ef64ee6234963b9e2dacda022c221c0a30d1828f989ca96635d4b12d07a174a2ab47cebbe833a0ae787a24eb81a956e9506f1a1acf114600741cac4caf2d19b2e1ebea05275f5b9443caf877cfa2701c8577b6a30cb81383805a383a34b07860fb440088254f0d63b247510a052b449d78b786e3ff73d90952df4de7ba41ade",
+    "signature": "27ac3aa7a64b07e47fa4c1f029bd4edf3f00c22efc7dd2877f2d1fdf963e95feb7ba3e7152b83fb87e4aa16915059746b2129cf6366324ec980618a042795e0b"
+  },
+  {
+    "msg": "11a9eb5bd6423b92867c2990465c0d5fff23b38a402945892a13a4c083151c94c46de061547f",
+    "secret": "f68af0ffa72c8ee63283cd73218affadab28ebc63bfab74d71e4a807fc3f8c19b7203a2e2eafdc541f00e43a3e151153b347bd81a05278ab2163161f3eb58653ac18490c3852124d64c86019521fb7116b49059a19015a1027b4da6ae59ec145a5e23e19ff34fc6464f671618c414adf576433a710cf72ca462fe30e9687bc36265e11a943e4444d26ab22c5c4f79f0a0b28d57cc02e9a7808d360504cf4b009da784cff7400830aad210cd054d90f0567a29e59ea8ae0188be4a0a7b1052db5",
+    "signature": "db64286c0449f321a135716d35507b57ddce158f33910d0f82b1e869dbae1bdef84bf48d8753c8272ae9dbace0e89ff844c5186d421cdd749cd4f4ccc278b101"
+  },
+  {
+    "msg": "ffdb912456cab3e000e920c0dcaf3a1f8af720727949fe682fde2344ba3c732fd1179ff3ad0d8c",
+    "secret": "f6f260d3fa72bee5a39e42aa3df87f22bad96b23e2b722f936071aff255e7e4c607688663af30461e42bafc67fbf04b67e0afabb4b2816a8ac255bd8020549e57e36932b6d1588b549c05debe1d89e97d5bf0b226610e68d66691c82bca29fd4e98cfbfd8dec2eed000ca82672c5431304a6e5c7f4f83a213d17d2dcc0dd3b22ee85e7376c2fc25bf49eee9308fcc890c8ec684fc26624481ef1fa99612f890d6cd5fb4039d2e36f40d8e14a3076a6c6e59e7cb0a578d27de774ac8b36f7dabd",
+    "signature": "df9c9b2054fac67d7a7eda78633d59772b05233c1c08b42ae4a3e20ef445e9b6a39561689ddbf33bf2c535480f629acd5082cce72020d250aec182922d302604"
+  },
+  {
+    "msg": "3cccd89faeafcd07d321496ca75c5e4056c6615611d831032b95881a4c38adf0c0908d0c11f8d742",
+    "secret": "d9b95acb359da608f433a72ed3a7fabcb5c6f3e416880faf030e7cf0188990ef21742e8be22f883e7882a2e0443086ca050dfa246811f0bee602f2c409cb2148cdcbbec35ca1b9c8206f58b7d7fc1736d81b164af2fc06046c90a7ff6523ed9917ed244e176f0a8b32016566db1a04e1279b536ffee6200db00234127adee37bcc8e42f3196c60b627677c064028bfe20f5bce3a8c3c5253db629f0e9db3a0a78c7147a38a540b720890a92dac68882d23c100701dc662beb60759c018320945",
+    "signature": "0840f821fcdddfcd2bcd72bf265c512fe3b305bef8a37630e1fd1e0731f8e9e182096babb9f237774573b1e4b30dbd043ec06f0ef1682f767b22e80fce80c309"
+  },
+  {
+    "msg": "e38c34ef8d008e16029fa0a45b8157a9f122645fb102edc7c9d6e3a6edc6b516bbff2dbcca7732d0ff",
+    "secret": "93260e0cd490e4e19ed583490c8e4791dc8f73765cf4856b39b2886f07583a6090a813dd83233ec996dfc79f70d24c1275c4ad10c268769e926d7ef09d6fa9cffbc07699f31aa14cb434a4d22272d85169cb05a1acd276fd7c9392752d475957ae13f289856f55935483c156742f9604694dde232af09d1a214f21fe996077670e9a12d5b792b5a64554142c1a0b6e2cb746d03f033fc6e0b24850392f68ffd276dd07945b2ea5565443b350e09f5c22359bee9ef590eeb28451a0ee9e8f6ec1",
+    "signature": "9d1072cdf5f7d4ae2d9deb7595f61949b51e00e13362656b574d24b044edd3f6f3cd30c892dd4591543fac20211b0daf14e8769c7c57a4c5a5599de45d7a5e00"
+  },
+  {
+    "msg": "f97320053eecf1c5ed25e879aef482c2fc250cc5f73f28a07f9eb63ba646b116aad2e4933612ab471b26",
+    "secret": "dfbc0a6aabe54e60a03e8ad270abca79e77b02e578bc3a6efdac59d3d0e26f5bd5c87074970149a6900f012a8a401128416b9dfc171ec773ce788c2fd59d6977723fdf774589620ae999045aec39ddaa81d2b5fe102c500affc6ec7be7d3dea673958de6809ad821dc206a157224047cb160f6983503621572f3dd4c586a175f4f222a38090f4b80b066c03ad4df7d1c524c9285bc0ebdf52dcbf65173a5727848de231c6c38f2cc7df68ab4724f93af8c54d635bfdbacdc38f765f9eae37563",
+    "signature": "22bfd4267c82688d7fe4df0a5415bf4ee1915a7d645230d991274f28c75ffe092e649e99700be55ceb2556431f4f556e151c13132483291ba99a42925a983901"
+  },
+  {
+    "msg": "82cc1dc5100b550145332081b14a0c0a818971099a9ada9081c63e6b97e37b837aa6b1dd1bf64984e12fea",
+    "secret": "8b760380b168746c45b98c8746f87b76bc5b6a3e1d47e2a9c6a29943ae779758e8def748c32f0741bfb989c352eb82e40ad210c26bdb3124b5402368021e9a541ea5d295cb51e80bfd2b571d5ecaa4af3e8cbbc3133c2df10d5d342c8cde0bdcca48ec6d55e3a496edf3d668e3abfdf2eeb581e9a843e7fc2e79d8e23a60e3d7aba6b5ed2e43f198f551cd16d37c338c9dcbb22f7419d1ed27d90a54bd135506c0bdbbef03c0ee64990f6b9d2f142127fdcffad026da20f1c6ba5161c7c8a1c5",
+    "signature": "19a64cf1f6d10d79e16a46c4ab6a1efa826559ca22eccda281591feec08103d73e81ae77bd8faf0f6335abfc39c40462651a02d08f9ed9ad215f5b3f9ecef909"
+  },
+  {
+    "msg": "b3321056c477b29d01d33c4ecb7bdc7eb4e0465ce5baf893cd567f2e5e6903109ef2ff5d9dc3f72a09f33d60",
+    "secret": "50f14d305b5e2cce21bbfdc1e80d2c692ec3bd1fdf44c227cb54402ea2346257173984a5073e671842badb5feca063b89bea303ba38163a153a28e34dcc00aee670143dd5485b8fd238d0435ca8ac3e4beb5376a3521c8599bcbcdac8ab7f52fa494ddb204a33781c5aada6f7826a4b4387cedabb2fed36ce1d8a95f392a55224c4ab90a50d409fa6b56c82bd3f568bfdc70bc68495611bb6c1cf03bdcfa0dabdaa50e75c6e1c5a1892e1d11b52bffe1a354ca235d2c6237e49455ddabc8e877",
+    "signature": "354f0691195a4d3a4e4fc25ff9bb8bf9adeefafa401f4f169357fbc6c38465d4ad20d390381bc56d5c9c989b52bf4584e134d69b3dd657b0d994f0cd94553404"
+  },
+  {
+    "msg": "953ea314478c90cd3011113e67b1bfe2e97d595822756805d61452aafa4c37da2063c0dffca27e53a3ade5dcf5",
+    "secret": "878ebb00d13d5ac9bc7aa832cdb1f7da676323631fc06da6f5c241cbb0da9ea2cba0a45835bf322c07f43a366bc15d4edb667b290c5e02c311f6f452f96b6d72a1fcc4c0f0dbc93bfb8104a1816066c0800eee867a0c1bc6c6e218e4427aa3acbcc891a8a4a14f38ec9071e324588aee40fc76328f3848f701347b90c64baace691dd613fe867e6e6acf756fdcf0a03347df6e5b1514dfb4673a5c67ffcb0f83aa8a18ebb3ac67e574c7acb2e980f806af4c5a0afa6b1c1e4681ba3050441cfd",
+    "signature": "029a77d2933cd8b4e787c61e0c5338ae9100d4b563355d44c840ac59eb3eb8904bb5061499ffc7b3edbb20bd8b1001c23b19a5c3a2f2ac2c8ae95ef3e78aed00"
+  },
+  {
+    "msg": "8efa8f6a4ce297ee6736bbf315b08350cd4c301f8dc99b7fb1f33b9e6ab28de0343aeb60e802f8864794e2207312",
+    "secret": "cffb85b122672c792af8654935723236f937ee1950131132cbced90ef6217fe28778cd4053c4a9ee32424caffdbc04bc7a39f8185c4d4e55ba41063e9bfcdba304983c4c4c121373a4c0ef94ff51758545450804da495baffcd8ef54c63443cc5df775f4fbde59ade0206fdf350bfc4a2f9ae33040f0623b4f427c27ace1835b2f2a4d2756e254d6e409cd6c586511e2cb319333041fd4084f40fcdeb74c82ea554b756ad1d657a495d12f89a1947cf4bc09c461d4d5797a018a75bde6e51388",
+    "signature": "ea64399283c2599a0269b19f898d73ed86e6932744f4ba79c816500c40e9ea9d71e75500f482bf7dfebd0e47588d3fd5c848186eaa6a56ab7ba332136f3af205"
+  },
+  {
+    "msg": "df41b95d5e4843e0a34cc0c435a7c053e29f5ec26da0c67bd73018376aa55a71703347d19d3da0dd2fc9a8a08055d3",
+    "secret": "67e863a99f3d5dab91e241f7a8fe2d0de4539c7fdcaf03493597d657aac346e414ce9c3001336940dd48fec7bbab7aec1ad5c6a468bd3d18d5f743303de609cd74a6e166f8ffd6506f2c0f57b82c8b4b4756d964dd4cb518bf3069aa164e63fb6646e0db56dc000bf9fac8951369a39c9680ae7cd7ea212498577469f869049a4556d6cb8b971cc56c1b342f3527dca4fb437fc8dad78ab08a296faec512004529fa98f899671e3980673e86eab5df9a745d134582c6a1b5ad360d37c92fbe02",
+    "signature": "6d498c401d600a0c7a982192d643dea411f3a604607d522001c2a427184a7c4574cb9a3fce5a7c09750ece5f920d6f74616ae7c04bff7d3737a9bc0cff474309"
+  },
+  {
+    "msg": "f3af2cb265f829835ff1369f2ed88183feac528dbccb3aad4c01d1aa704780ebaa6c653a91fb691449540fd643b89585",
+    "secret": "a362637f88c3574ab95b0fd2c6a88362aa192ba54b5db894df8911043c37889a3d1e061bdfd7f0dc5d7653093220c65b07ea2221fca145e99e47163655afd9100a7a4603b9f38cfb87f436e22aef5cbc3ffdc7e01715b6bec645ad92e70be6aca41d6aac3a8a1af43ff5d08caf3ef3d86a92497d73f9a83f66739088eceac14ebbe8323083e4778a5b3e9a90e2ff6d84eec159d987fe452ddfb1ec07ca61c474cc7c0c698cf6115aaed40938ea3c9ba23b80637e90b1a47b7daa79e06e5f0053",
+    "signature": "7b8a7e8df6dd09345c8ab5beefa4ed18f2dfa92662c10f857a77e48e0e1e01d813bdbc836547101690a7b45220fb5a65eb9e3acefc1160b9723932619f952a0f"
+  },
+  {
+    "msg": "74c22a98fd5f4bbf713cfc702d9e112a0d2c2b1055f40f5b644c23f4755a49881b9a4af7099f63abbd860860f793e68ecc",
+    "secret": "0c2d2a4e2bfa0b22573092d57825d11db58cfcd4c7a57bf1f164bd6dc0dfdcc6c6a310acdf4dee06a09adac5b61f4206cfc2d04c964f26d98910437ad42c3a86576202010d59771f259fed7cf403ed0aca0ffc2a46f9c033ed8a7cc3a735e071c9183ffd7d33db1664e2c08db0e5b941c4ba53bd49f5734332582c2559f387bd6cabe13a1ce39917f38fb7a797215181435383a5661153166f096179947eaf2c212e3452aca225528b7b88114615aa8b9541afd068e73fca29d069b68b70614d",
+    "signature": "88d76a83c602995016d499f31c921388683cde0db444eed5ed400eda29f7bd6e8009358a528607f967c699391466ae53ffc26025b2f665335dd69bc931e7e101"
+  },
+  {
+    "msg": "0d621fc2fff96d2844a9509500a0005c315d41d436f748ac13172e0c87095db54d16a6ff07b05df8266ceec421a433d16c8a",
+    "secret": "7749512e04192e7755aa5b72600baeabd1d7ad13318dc149a17a7055e9220b12fcb669f5597762d7ba1a3cfb4a6059b71d1690004052e3e72d35db20104c26311e4097bf373f42b2c09797f27ec59fea8f23c97696a62c00cd71bcd41d6ee8c73f2360b894153249484841125fcdfaf09af2d8dfb5bc41c2a4c9167796a3a0664c8e0e397edf862acd504bd3b91d0bd3f54f390836b5dee402f9b90c1d398b77315d0a2941d07581d4671b409f737964078bb759210853bc9514e2ce63cf381a",
+    "signature": "2e30b313ddd6add786f83a30c52f78c8d25cbd6125cf1397754025d4973547cbb91222611d5af727b71f63d4cfc7ce0ceb0a35eda738392a15e48beea8050605"
+  },
+  {
+    "msg": "71",
+    "secret": "c2db8c7775e602050d524c59b2778e12cf5c0d4f763fa758889bdf21578a4055b1b9870630575b6effa9b2c3b6041147059de34584a65e2c90ccbc50831bc9d3fac4c6b730c610feb350606e63a479370cb3883dce85ead0727060ca86acb48712573327cfe541290dd1015851edf75ff8a5eb5e2c5f5058d3d1dc15ddd22412c6035c596ec6995469727d0d3b7045186037e72b21f5e3943151ac40683724e3aa6764bba9001dd38a63582857f19498c1eeef573ae21b0f9ffcdb184923d218",
+    "signature": "a9d4238318ce5ef9de09d8a40495f806408d0c77d915dcf934b22e46c9b14bd40f286ed5cb14b9142fa1c0167749dee11b637fe29526a2c923bd1bcb2318050a"
+  },
+  {
+    "msg": "7739",
+    "secret": "83edfaf292311889d226969f102923171badfeefae36e8e20908d41f025074b95b2a320d6bef56736825f3c36522ef1c98f7979d290482d2ebe16d7357d1049105e4f5bcfec5fcaf668d0c7bf6c870fd7f95bb31d06e7d15dcc9445011b2562437d2cc031d91cc1966849111f26f5c82ddf00a08bd381e45cebb86d40a0172b4743d3fe77c9db7d20198ca873c29063c7749d71fb2ae47337010766046d6e9fc4249ace4a5b727b5a25b9d8cbbf5e29359ea3c57377fbcb60b346c5b1d1bdf92",
+    "signature": "efbf431e7d13deb4a9f5daad9074daa9b0bc3cb4de66b954bec87eaa095164fdb6084adf3d8632ffe787c0dc280ef228360ef92a539e2bd893857537b1d6ab00"
+  },
+  {
+    "msg": "8a2b08",
+    "secret": "c5d64486a09074ab356dfee80338285d376ee5a6b1b82dabf10f08849b13e71f709e20409d6016193dd91af939dde920c14a9879cbb15c4496a7d2282743d32611da427cdd4fb875ecc463d09f023ea8589ffa12028f778c4f21fd712f05039aaec8a2ba453d5500edbb12f70a9171025505dbc9ba8205184c512ef0e411eeb351c6851a40973d9292ceb36be15a737835ee4359430bf32f3404fe9bbf3cc0acd82b469677a6e749d5c31e1c0014b260cc858d41b9e27df21683fdd3f12c7843",
+    "signature": "6bfa1e0f39bbc23d9e8eb0beb2577523b626a0156c920e44efafa2f85b7c49a2bbbd559dff8edf777cb3ebbfd6a25e87e2f8585e99a45a5de37c73318a5bdd0c"
+  },
+  {
+    "msg": "1d4497e6",
+    "secret": "4612daa53de0ed3b27ca80b5af41f6dde86b66f9b48c6d11f67ffa3fa36aac651e066fe699540ef43cfcc36f982cf3885974d06cf6fd52385d31d0eef42a1e0b9e078cc5c11d8038883b0e1e917c4d809d962585c1ae694c321b5b915831d4e3f546a16e29e9d9ff5ccaa270c98f9052be132ffac8c0910ab6cadbebc65e64f01526f69d632da7543a5e7cee6de38fdfbc2ddb77f971799315a04b7e94c6b963097b2abc1d6112efdd5219a505cde990bc41252f866501dc8a407e2356eba4ae",
+    "signature": "30e7f36a1ed0706ad312b4b3a02d8847f834665472fffb0966277b4614361fa48ba7f9f4c6c79bd933f208366b1995c8ba4eb56b9d658d25a08adfc049e4620d"
+  },
+  {
+    "msg": "4538573594",
+    "secret": "4f54ab932b4fc92791beffab44df12436b368d8581cba3804272c342d10c85a74e64a5128486b2f834b0a1a5c091a6a53447fa83fe279b6bc6709be520f8470d3f880036e308ba62b1e5f62efd6034b56d52a3ac886e6c42f87d8aff858a601ee6234b1b2ec999bce25b7f92db3c6ecc3f8aa943045843291483e7233be074acd2e16905940b9473380025197446897c60b102029c14df69106a5e6f73d08c3f1f22a2119e4a3e9123c3c508cb16b18041703148a4bf9865275b802d1c2aab36",
+    "signature": "60d683b609cee528c0564391a5f823f6da8f5f6c0825260cdc1e551dc437afd543c3d9eb41d86120f25124bd73b9eee8f597cfb666913a1035ec717311471509"
+  },
+  {
+    "msg": "5a95c9c22742",
+    "secret": "59b7cf6cf1ce659398773a69c5d29603c414a4b82c72b48d4d23e7e0589cda9dff4cca3dfeedd3608d45c0347fe5eba19a4fa7cd7c6e5a204070a9b3398ec09f62cf3796b1edf380eefecf480a14cf9d44268a2e9ebf16f989b07e0a636bce5cd660e556f6fecd2bbfd0b714bd058b885b134ad0ecc1011985e998eac2937411416ba68e2e96e64a47a9d437fb5a8187cd363be1f20a7a61edcbde51214209d2ce9338363243acfd6f280907c128fc1917d406d20a5c2e0aec693e8d6524ad00",
+    "signature": "cd5e515306653a1082202a34df46bb0287bc8dcc2f4cfe9fe30c5abfcfcce555d139d706ce9ef82e82c2bf6dface6b2c66cfaad411d95f8cda6cefae74476505"
+  },
+  {
+    "msg": "ae5c6259f8547a",
+    "secret": "f7b3b6a5fdd7744654af193cf2f63e6faa6468af348e2fb8f30e2a9d4926966c0fb4aa160aff1bbd3737ce6886167cc0181d81418ae0fa247a8ca491d61338982129244a333c1c6a60db4a290e83218fe4da5090518685dfcf57ea0cc4c887e84b608e736a74ac7679bb5285f45fdc332a296aa9955bbbc03a95d01c704b98a0bf3ca2fed707c09745957522b6beb7088a0ee7983d271bb73d7918d3d1be2d9a3192f94817fd5fe6e3d4e1bf3d0fa72622b90b04c326ec890a8cee8b6d5497a6",
+    "signature": "f944b9be4dfd5d23a44feac6d3b860b46c28e4e89d1242f5924d154955c57127c7356a29abb29a7b70749d2ab0045f226527ccb6615c37b9e50f180e45b7d503"
+  },
+  {
+    "msg": "556304c69e120dc8",
+    "secret": "2ff8a14c01c534654bb3d20a9d104e0458b1f5a710fc26cf6e2cb54df6c7720dc280a5e38bcebaa6de0e84d96839844ed3185f1f6d42dc7ab82865b850009f8edf95e410d4af063e6e703033ccf614fb5b7d3af81071267b697d94f21ae41d761fb51355ad1d804f3363f4f8df17d9acafaa07441c20a8266debf5f528b7c0bdf1202094e1e3fe051cc5bf1937de009724a57c48622473840948f375109718da74a643e52078447c20e8efccd297631a7892b29d091cb37ead0c521d45c04836",
+    "signature": "34412b82b463d1fb00da90c19f8deeb827a0fe546d64a8fbc969badae07bd8026e16025edfb09e5347918d843a302731a9ec5f8d6cebfa015b688045dc583c0f"
+  },
+  {
+    "msg": "ce94455c0831ee1bfc",
+    "secret": "192fd643b0cd48524ba4ddd29cc2a492a4a478a4c565a2d5b349a1b28300e3b440e7042490e106a0f2b8e3811a0a748e8e255c82579e257d6f5cc0b0570187ae3fbbf65b21764097d2ebed24cba4bb89efb56dd14e6a0b640b77c7e6ea5c620e30a0d2caec37fe828188536e8d0a404c712c8a587f091e4f70af7e1b71ea9020f02fc8dcb111d51b84e211a0ea6b5401c673c2cde7f174c6bffd571d0acffaf8157b52960e61da98e117280f5df2272b635768076b3d06a2bab96a6d6845c6bb",
+    "signature": "e3c932b02268c17f68644f8a5f93816728eaf7df696991452f588518b178fae37caf28df7811412334ae368481411544abe628d66b479814dd5072feb74aa10e"
+  },
+  {
+    "msg": "43318fd3af81be1bc766",
+    "secret": "f0a69d79a1cfca50e133882a58d22e56e857a658dcf76e413b25bac2ae33c9086af546dc6b942d46b4862fe7f4c917b94cdabfc162e4902f714374d72ee44c7931acd09a890a5883037bbffdcfc5aba5affea68576d9f6de355dda9abc20883be1797933ff1466e405b67a2726cfa4eace574712a364588c9315243397fb66f3670406880ffecf0545db84a440a15beb6e696dd11d798711913da54a70e78aa32647718902e03cd843e148c710f54f747e43584fb0f10eee7fe2800e9533d207",
+    "signature": "57d78cbcbb22124d79c7f092fd99f7130dfceb1e1747a650b3f13b2031d83e762e90ff55bad5e882f940f33406572a473c61e126227cc549ccbb9ecfae0ef406"
+  },
+  {
+    "msg": "91b97994f7d3f12880308e",
+    "secret": "c145875d318659aff4586fcc91a68abc82b3ce35f5921e7b1420a8735460a0ab46a7806e933cd256f235a8ca2bbd81c63c0023c2f4f2e35e07de7e0c021c093dc9b7cdea54ee519809eb0199c6e8c6f481aa5d932efb867bb300867f91d9800c0d1ec59b3359d64fd7df3b60c2e3667a4f66b76cee5b5bd21909ce32a0b905cc29c01710578a4e79c62497dc2f9e1b78fd3272398403abc1b0846a084a5417805a95a69d5308284b5a63063abccc757199d1d51a65634495e84accf5a2b900b5",
+    "signature": "76ce479e0039cddb072f21202436ef8de1ebd24bfd2048c3e5f674af53e236b8a343a6a104544451d12bdf2c31c4f8856edc96e8a5afd78b6f3f87e34492170d"
+  },
+  {
+    "msg": "2fd35849e7291d9b5fd86d09",
+    "secret": "c6ab6ca0a73cb406318e2585ae859fe0ef58edd0ad3a2c546ae8ac7a6bbd738d83fda6aacd67ee63e2b8aa9c173f87d5ca779dc3da22f1935dd828425010db99423d10bc0c8c88010a230e0b7b1f5f1d794b3eae968daa693efedd0db8403129c33ca776c458ebbf532e1a7541ba6fa341983321c6118db8a8609b45c62d09bca20a31a4e56226d304adda8609ad70a2089841489eba0f87f3ea61de363b2fcae48478a373d4765fab38b3ba9d61b162aad332ded8c2708d841ca0ada8ff999d",
+    "signature": "7b995c7ab14667215bd96a4ed4495f18a9445c0d7818e3830b512204887d2a101dd1f714b8d91cd7433165b51e182f7424501c5732a7df0555a81701621a9402"
+  },
+  {
+    "msg": "d48a2a925d7e24b4f8de65ef69",
+    "secret": "3730e65c56365ca52a6ee12fb82417582dcc8c27be55b529923fcd62b9dbd600db8c794a7bc2aafd8c113cf023c156b103ac19c5f075298f51108b223828b658f978e677a48ff9fcb24b543b4563c317252641bc7e18be57a69fdec7c541e4d8dded9ec11f43539e3ebab51441756c25f0d56ff71b03d8d4ce3c4bbfac8dc241baaa315dd2771b38f13df0bef09ba02e416d39f92ed3732116223779f74f635c7c0556fd14999af25f4079727792250412c473b8b158b6950779753d5e1862ba",
+    "signature": "5f8970fd922505a93aca9685e0dd6e791b114af6ee9bea92de085e11a797b9d7992b1f81f775769d24d26b7f42c5dce5ccb18dfd8a3bbbfae172365be21bd805"
+  },
+  {
+    "msg": "10e4b47bc4117e1c4f4ec327b346",
+    "secret": "0ccdb33c86e08332cc0f3b6a9e78bee88f080cc56b4bfa51f3ce6166d1246776c523507c3632e59d4844adaef3ebf3621cb7f656005a829ebd184827cf69b1c5ea8515c9336f495dbd3ee4f0ad204ae8f50ba9bcad0de08a75754749dc4c589289156a7fd6fca3479135f8cc85f790d95e65f6d2ab403a1c32d4ccd34a0ee0d903cb155b7971f54ac4e68f00c5611b00d904425a99d524944f19aebaaa95f5ffbcc24f896e9a9837ca6a6a4c3754dacd0e3c8d7ba67ba1beccb44d70822e460d",
+    "signature": "ca636a9bb6a86d400b4b8b3c2b79303f17bc6ee77f8ee0317a892db1a25f09b85d229c3a00c44e040acd2975b6baf3d9b5e879b0deec0fd47a6cc59904627f07"
+  },
+  {
+    "msg": "b5443507a1409355a720d4b4c03c44",
+    "secret": "a5b268e351cc2323a52a0e2be6c5726c2e511194c86366a9cc71cab71e716af72d588987d76bc8ea7647f7a874d812a3457e55ee92a3a3b65941756cefbecb637a3021f82f5308a6c3b657ca6ac56f4a314cada55ec7178a6ee922914f6a3e11baaa7cc944542bc6ab658b1a174e8369011b694f30ee4fcbd7141c5f6764c9f25cd5a55870175aef2a5fbda36f152b04f2b2995d5c6a4bec99335c0d7830c52e2246f4a9c4d660e937fd728855df93c7ea6e71ce2c80cfc492174d6ba9016c43",
+    "signature": "1edd65b799c7a9b0f76429c5934c6d8b71b8e8cca9058a59bfcae7849c11e6d3ff8fe13d4327d17e244d35d4eaa4dbdaa1d2797a6847445bec3ff306949d2704"
+  },
+  {
+    "msg": "555463c79fc5de710b2389a40437c542",
+    "secret": "547f16dfce04d0b3fb157de1b997216b371821d131fdb53160da51f66700d2478d12752dff3290f5811bb01a5b3ccdd7d1cdb7b9390de5ee1c7154793e3efd28b3d5b16d51718258234f3fa5c217ad794b309f2d5902f141440f6c0359eba9d29a840dd4d4b8281a50f37c9d66bc93d30ab9440c805c31f0b81463e8ff9d10380d46720a9fab9daca208e4c9263c3bbaa202f986899ff408f0471dd965e8378c60b3313ecac307e68d7a8bbd0660003cc265c7c6d26fe44f63a9cc981651d045",
+    "signature": "56392632b6446f4178f105012efd53cb352270cadab1df5bc0e0e2e470454872cdbd64a59593ff7fa939e9392ae2cc2ac1b212aa1103acf83095c7c8a9d1ae0d"
+  },
+  {
+    "msg": "fbfe4c28dd3d6dc626b81ba454caeba957",
+    "secret": "df2d9d1a11e6df8b3fe7419235702f59e0f5b80a837883b2e3f1d368313e6072824c1c98dbefb3ee6881c1ccec9e3ec0146e401c75a3cb1cff0f0f394f3518467fda3c79de356ff66f7827ccd248062a59c7dab94b2c627e58a7c6dd00aa71e4751e03444e5faf9f27be24f69fcf2fec32439bf994e2e715acdd5943d44696f10196afb7dc0e70b7c28856559c55a7fc6a5dad5a962166392395905a6490f7737282ec3e14e7f72d0e96f83a8e6a9f7736d1c9fb8ae5edd93ec6b9dbf073256f",
+    "signature": "68f676676877568557f304a518e05585359008264dc0bf2e2aa3e1f5e2f12f307d9546849d8a29f26c9bf45657721e27d9df96b3d38fd7ca8dcd6b44198b2a0e"
+  },
+  {
+    "msg": "355495c6f1fe5a79bcb9783a13bce1850b96",
+    "secret": "9a04bcb408e2ead9f04387fb0acb7573b1e545a24d7d22b15ad1183e7014f211ca1968f5880daad337e45182205014cce9f31de4a4e000e881d03fff5c9e4ea2d3865b07f886ae3a9907ee9929338c11c390bb4903e5e6df8b92d6d1dcecff6dae9dfdf8ed85b1f614e08c3f6c8678336021fcaf92e478eaffdb3ba53868e3d2c71ae8947f926b5e32d82de0acf4deda4b67e77f24b5782e7b61e9c1420df396b2389a62c104a87136ba674ffdfbc3411d9adf7b4e8013d433b7a0973106989f",
+    "signature": "cef6f4194b5556512c6fdc7f038f7348fe820f377c19e3a5889395e956f30a29dba5dfa9910832c83f0eef65c25ae257f6a226adbf8b2543c9d69bd34ec55007"
+  },
+  {
+    "msg": "ba2b818a9f2adafc8eb094c044518f6fa09549",
+    "secret": "0edc30262b8665b373424cc11e1b33476d1854b747900743edf22042048530acf54b48966caf7847a691b6dd42e4314ea5e6de6ebbf247b97a3ea3937154cd42c23842dd1f8fa68018329e634cf4275d874bc78348cc301985151011f5210d13581ecf1892c7f5ef76fcb0eb1e1a4094dc62a9c0b42b389fa23ad4a1c7966b60c6efed844c954d9ac2ebe6d918ec4ec24418e9c1d64e5ac4553350dab3e3380839b186433c7eda36f8773e3c41cbb4379154870f727f47e6a4231f6017fb99de",
+    "signature": "8d496d9f01e0723296362a7128f523e7aceaba327e7568b50e36f696fb51e7ba465a5c3c93592edb99ded2bb1a7aef2bb8500eb423d0e71f218018056acf8008"
+  },
+  {
+    "msg": "77ef81d099c4759cf87a12c2ab04f01ef76c386a",
+    "secret": "d10968bc5395a1a0be444a652163c9f4cdf6b98261572eb907dfc85a1cde26cf76b77eb143ba48542a16f688fd060bc3627fb14f3ce47ee6887eaac3a753f2af95f6d7388c55158c3dc13b394603604ba98c7b23e3f04067f226e8bd6786054df1e7755940f11eb254ee7395cd65fe40361e7702078a41fcd676acd2df7a6078dd99a6d3377b83416b8241a9055d2a40f9e6a6b77358f9b54b9a5102a1c12a57cf23e59787f97d64786a4fe00b7a97050ece0920b7c76f9fcbb3860e9e1d9e41",
+    "signature": "1c36555ee80f469c8f8011c34a1b01d5afb6d805b0243cfe966b692ea291880af0d7d2355af206dae81dc27d484af3fa7b2205a7d42b6b8a710ec8b94f871c0b"
+  },
+  {
+    "msg": "868fbd177d9aeb1fb3e91a9bec9d8435fa19aa472b",
+    "secret": "855fcf0c08494020d4bfa988bb7ba5c6b04ac18831f02e2a78eab82c8b58f76ddef71b6caf6778741d56ef1b28786b8f13ce6de9b202576d5c9a93e9354d095730474169c50fc49d8e60283916cf5e2bfb1113081c10a0b036fda98c8684fe564b826aecce147ce08ad3e284a9d601997205468fb0b0d126211716c835644a05571364071187f175e4f9de0c24b4016cf1ea14ab6e180b09d8a9ddb773cf15ef0cd4217f9a774ee5a739c4cd9fa1fbf8ea0029a4a24dd4ac4b8ee07d0d14b79b",
+    "signature": "4401075c99c0cbef08418a722ff3904b884b6097f08c964ff48bc9a4a16f41342c2daa614976be3d2a113fe8b339a55d30fcd8a8c543956226f3d55b8977ff05"
+  },
+  {
+    "msg": "c478614224585c4c6ffb63bee114b292f55165cbe067",
+    "secret": "f3bf74d75989a2583199392c8b7c2b309911220bbc4ea522499a916cee362f81ec4a3082a91e0839ec4aa7e42b9a77b90a906ec6e793a1a6a960ced3fd012aa4c260c32ce7c49da22710ac375e3b13bcadc6985e2c005030520afcefb592962f861c190bdc335332925383934d9acd10b1aa3070cbe486a263ae1ec7b492b4d118692e59f65333a93e823289b78a93af9839527af11c3a7f5b1996419fa698923e68a36e95bb4e34985734dff39e8bbc0f4dad8f3c55175ec9b93ce9746dc7ba",
+    "signature": "a75ac258e7ef4615b3dbde5464ee27acef9a3cd4f2cacd0f1755a700957adceedd08963f6d32ca276b8555e583d8119b7e0b62102acc67ec73ff08c2936d2403"
+  },
+  {
+    "msg": "f18dfa7bdbed965156cea46d836779681119939d8e6d9a",
+    "secret": "0f7239bbd47d0a61a20c640187ebf1b5ac0f1584ffd86f497ac1ce5109c9ba8dd320885dccd4588aa699b068a8c7ab017e036c55d793dba2c725e07a74eb91529ccda6d961a36fdddf1480a2611256d34f26eb4aef50b3d52be6361abf8e615568d29ca6b9f331ae5f8bdf05a7cbab637429daa2145592bfe0b3d22561a77302b42a92ad9121002a9d5894481b1b29db2d844c9e5b00e8c4adf4dfd970b6622a37268746059393799aa76309c5090c88c655e8bb1ff349deadf2e11290e91c99",
+    "signature": "d287033614ee807b40a921ae1241d21c506361ab46b4cfa158c6b45bf85af7aa4b6021e9ca73b2bf549d6aa28898678979a0eb2c5d9964bdd49274e303828903"
+  },
+  {
+    "msg": "1a1f2d1f0ea12d494f64d2121bf4b5fd904c881446826ccd",
+    "secret": "8e8942fbe6cdbfcb67e190672bfadddc327b33b7a8bce886b1bca70850bbadc5098b663543258908b01a7423b3765f23ebbc6790583c9500feb104f900cc84d35cc0f12e3c7598a1d3731883f742b8e3aed0ad15e8578b3c60acc663c34b3363c3ee915fb586d61f1af135fc0a9eb347d36542e31cd69b94c263231a7b4c495a333b7b5b38fcf8c45012437d275e3c90ae4b0a1d68cfdbe19b686bfb9f3b160a8ef0bd13dafbd39ce06ff4cd6392604c3890600f39aa080af31f6985807fca4a",
+    "signature": "f8361f79d140a9ce2807bcdcb1817e289107217d73561415cfbb605b912e638331e7231bd77c134f499cc7aee71f17e7340d930b1c09efa4bb642f8b250b8809"
+  },
+  {
+    "msg": "991567b764ccdc9acb6c2de20ea285e805fad514d7c5b69e50",
+    "secret": "2d8f9a6969541c3706cfdd002a9e76e5a0645c34faa168cb01eae7b8caeac0efb3739081c2e10d7ed17551dc94c9bd5e502ddcc897c95f652da784b80764acb233e5dfebdf96ac8c4230272df4ef0e546e1416c0088c10ac883aaaf744b2d8175a5f3e6d3ed603aaa526d510029ab7e6a4e286accfba125d0a0c8995228bd006092985b78bd8070746eb9b7731f01b4619202e5503658beb99db3a1a2fca90748deac6c6a4947d1cc34b8aea5a34bfc23c6c0cce9da17201386be45133a6256a",
+    "signature": "cca43a039fd0d3a134f7e8bca4f344fe9fbfed929fa602407bd565c42eaa9ea50a308ee21b482bafefaf9784199f5187ab7ea5c0f1a0f62523a40042c53f3d00"
+  },
+  {
+    "msg": "b6eec00c87f71a8005b24460ff8e07f6ef43045cb365ca654842",
+    "secret": "c003feff4d6586198a2818a547e6c6badc7a1f42b701051dd85f70bf39a880ef7c90345c28b358c56469aaa0d812e65429bf8424da5f791e08c9e5b4a038b616660321820474934f17a4e614a6de475cc5ccb0733fca7afabc45ab39357f09520dba7acd3cf6bdc6ca8f6b38271df765a0a0a29fc2d9b72e1a4bef2536455f75571e8118087180ee598cca9d0f7c697bb580181b13226104474ab073e3d3399c7675cbb55db14ab635415679eb7e32ee60647c8a9aa27a8ce139eec52ee15810",
+    "signature": "9d7704e3ab815270ad4cf6664d1643a04c4312d87445113d63a342649a9b368964240c1f11bb2018acc1451a44a3d5234ee142fd305af17a413a34ddaf822001"
+  },
+  {
+    "msg": "c3be3dbc4e1ff501f5d08efa5608d0ef9bd034ac6a27b3e29affed",
+    "secret": "17d1a76bb0711e19cf90ef8b552f7c857cdfc8be54c38c57917d11a7ec7811c5c204c62b6948a2268fffc21671079aed59691d250b9796f33ba6bd883ec760d7c74957ceba98d9e5b5c370bff8966c45ad0a290b14e6be90a2b2499a0270501b5778e147a83ec279e0e0c8202f4928cc94046d99a5280d89bc2b5073b1d26f44604c9896c6f2179a9cf66502c7de868cee3d2b94fd6b53b32365fd57f6fe238ed3f7ef4153a3d6ebf42d5fdfa2dbd17a94ba8c3c96b9ee88853acf4f60a7614c",
+    "signature": "246bc94d67f130660c591a9c92aab3bbc3465d249dca256e27c38ef0b22c142fdbf838b550534d7228d22064ef163524731bd5290bc6e0dd3324e7942693ea07"
+  },
+  {
+    "msg": "dd62aec4340f6779c1a02ad847a7f9f9e083bf66e9b06571f74130a7",
+    "secret": "d2445c9e947e13bcf56465628a3a848c134e06a0eec34f4a354596112f9400a4c386878660bb53b71bfa8173eb14fb863ea4477acf69efa036ac6bec3507a2ec070012da66b1d9d1a30d08a1977b971ca8d0e10c974ed3f45e75207e0cfeb4d8d64b2d13cfdb9a1bcb691c760dec71881c2c4a143c9991b9c15eff6887951ab32f27b9f1890335fd7d5a15edba0233bc24e8541591c90c32a7c752f2f7ce2f2281d984073096e222a3c7b6d7dbf0c39c21aba88b3bdd1493b18f1a814c4dc836",
+    "signature": "d9c4a50eb53653ef3868cc152613f0ccd18d6c8df2105acb92d26bdc6ad93df53f46bb484d8c601cd05e212d6d54fdd679176712f62477b3809e01d7d1888d0b"
+  },
+  {
+    "msg": "de7baa6efa3c463e75c619a1fb90dbe620a1f05b51417f1435994cb103",
+    "secret": "9b908f9b898743de60f1ac698325d7752450e3b9064fef83eb61b4d1cb676c25c63afa471d9ac819cbdde6b5d99a0fed0f3f1e5f20ff847bc13e32f966685f1248488aadf9aa32ed75a57d1917e1b86641455d0f0698acf3323c533fbf87c36b95e174ab94c927ea11df635f8a9ad6792c21dbaa4c51103f19d0cdfce07262c7ac4aefc307b50e662e75dd14bed9a964bc585922ae6528f822b8294b752e3c96613bfa5c59294a183ebc492c6ad1a2a7cd711d9ccc34346aa7fb1d5e1dc5652a",
+    "signature": "66357c114dcb010dda61641fa35e4a330eb77e5a3edbf03c88a0ed5c77bf952651a3d1d3b4acc500b4eefccfee0fb5ba66cc2fa57795e90bacd1f6992ec1c805"
+  },
+  {
+    "msg": "4c5d094a612b4fcb49a0f60c6468545af57743d0559fc8015cbacddfd663",
+    "secret": "e423dedf05abbde705f61e70cba7c19098938a6ea5c8b9cd6b9edbb7ff62484183e3a58c19d3841a6c3ea1c098bfc236d70403007b08393fe4cd605771c2e82874cbc919cc4023c0fe690bdee375a51cd71630671d7c64468138b4bc7349c1f9d98e4547d0ee518ea0e4a47f6493776ef7c72b3482beea61325cb2a0ba8be35512d7e08f70ab106a16f02f52340544aae0f5f4457e7c3ee0f9ec85b98cdfcc41fd2d1009e2f4615aba69f49f4b029207331568fa9e1e32faa9863897c44ffbab",
+    "signature": "e81104693a674b62a749e1c6a844ab67a18e6f3e44bb468fba312960083d07c9e720d34d42c33211b6108010cfc8979b960bc362023f703fadb07b321e4f3b02"
+  },
+  {
+    "msg": "c0458fde9616e6f9fbb7762995c04804c9d88d1fcdc2d509e19cbdb6935c9e",
+    "secret": "732f157190fa07497b6d244a8a06c3d32812359c731e64bb7084b8e6e1c9f890b4c11a9f8ffbb4af292de3212a4ed430df552c54f6bfc392b77f622e8d158410e0d0da9c481ceeca42ecda458b60270271f61fa1f61f83c8f18b81171d20c533566fb5ad2d89a888d0e28cdd106552f85bf2e82ad527b33473874b186d4f0f17cd4d31d7460e78b63655620f4bd9b2079150c50e59dfefc753478720f6f987064ac20c735adc8b91f90819f203c10ac7ba17b075ad4b6be31a111dcbfa14096d",
+    "signature": "04af494efaccbb631ec0247063cee85d164243826e0ac9b367cdc00d7e7c187522e8873349a2550545ce0cc9db606ab1e1db4810283d62c842a85debc42bc601"
+  },
+  {
+    "msg": "97f5efab9a3f1c26db8208cd53caab196411faba4cd972545f6f5963a88eb37e",
+    "secret": "ba48c5b8e83c2fd8cc9db8d97508c41d705e1fd0cb743ad201fece6930228cabeee06d435b098b0217971f12e09262bbc6c9f41239d628387b6a4fd1fde31446c2c10121358e76846a1f56e9494793e34846d274f9724afa4081eefa9844c670aac43081772d2504b3b08ead9a1e129f6ab27524218d8ec1d0eb93694aafccfde60a43a7c34f06b15f5da1f44bbf20d246f2eacfa8c61687288757c24635b8439eef35b409a58df0a500d871c75646ebb63c06d507a1f909ea9ea1d9c86650ae",
+    "signature": "fa4384d32c8e2e785abe874c8cfb7aa685586e1be02e175b34581170b4ced8e67b990f7279bf70b4fb12ea9d699013b726d5e0a9ac6152c927901ec94a359603"
+  },
+  {
+    "msg": "8bf9aa5ccfcac8c5c75d9a1b8bee05e2ad561567e05d840872efb1e04e5d19484a",
+    "secret": "665c4b87611e8e325c78f6515a3a7e03c4ba0c9c5ef7fec6f2bfe60abc3bbd1aff1da367d9e05acc7e22b606a4ebe87d25af5e242ddacf1dec4ac4ab1165f3e042270255cdb925d39d6bdc695a8aa92a8f305b2ab99fedb8fcf9233dce6bc84f16a23699eb89f24ac378e743247113c4afcec5ad0b14c48fa4d23ef6e262b17b91d74109c1cb648c92b765ef45f5e494ab4380e8e1e872762c3660462f490f8f1329048988cac6ea3216034e7012fde7825c9d4175600641b0c262ebd3449f7b",
+    "signature": "eab978bf84856f158de470fc6d8207ada951ad2130757c20b0e5b5867d47a867b1ba3e8f5eaf5879b3a8ab93cbb8770de2d2399b55451779ffbeec1c8a07890f"
+  },
+  {
+    "msg": "0cdbd7ec251c3d6011dba0eb769f2e43f5234c3c86476eb07e84a021cbccd1d13170",
+    "secret": "719cc0f5352d8797b1db01bf320c65042a2f48a7ba74502bc71086a81670c77f4574bf0bf8bfe91115744d542ea103d004900455464f2e67cb2f160f67c896b90b1d615ea9b69b0495b4590c26894cc4632896fa1db1fbe78faebc9728e446b85054d6e71efd6cc32c98abb08d9009a7fede52822c30a4d243e83935cb2448fd59a3e53ba140747a94bd6d3911998fde180fd899fab5ca4945aa1946f54750c4dfb89312c0b08c4acdddff0b77e306d5fcc3fe3183053ee0de0acacddd530aeb",
+    "signature": "94f0c4b85626a33fd1eab1ea81f60b3f77b47d80b3af9a12409bf289cff787cb32e8123c7b1eb615a00dcd85e9dd5be70f6fa2c2ecbbbb257d1fe2842aee850d"
+  },
+  {
+    "msg": "e0384662f0619bcba4b7b2116d603bd4082286e859ff8d06c1fd8634fb6188970e8b0e",
+    "secret": "797ecb6380722135d822224052909d25fe1d66a06658b092fc1c00d6aa74b91bbd90897656285b9b06ffefd10dd5642ff23b9383b1470a28b772927255746cc078ac4c429f422485d67ffa9904a63a867eee8af898a81a12366b22a8b2a61b9ea3861cb98e24e235735fece3c517751a1137e873b0b56b7ac3ec88814dcbe1ca6f231869cc9fcea72526e4d1e63fe3fd70d8d812bb95bb74cc396f6d2f03eb90e1105affd39503e606107d8341e1ff2678ddbfa1d4287b57ba28469c412d738a",
+    "signature": "45d19d29d8eb9e5980d5eb43514aa0c497692463fa060d5891856b621d43b8e2c46cb8ad05bd0e70978b759c612e36a836aff94b0c9ea262bd2aa64ae4f92101"
+  },
+  {
+    "msg": "17976f71f0e43017f6bb06c5d5fbf3317c7d6681b81ea455b2cfe4d600a60fa22e9aa037",
+    "secret": "c43f28e47d2916cbb36acc5de80be6a3827c070826718c99b266852593051a9ac21a3e769a86ce0d00e257dacbb31af970ea1e2d3c8144af823b94e0e3965ccad701c40a1b23d047a5acdeada6cd9fa9437fa770b7aaf1a4461cf780d9ef1914e71bdfdcc180cce5fec2cfe92483a6c905fb2ad1c7c929c1f6636e011b85e7ae7325ec32d50e3100d514792febb4a6558b98d761d6deabfada1272796e353f0e050d5b357fc214c538ac2db30c00ef1e86685a3b4bd992250987fc0f95b7365e",
+    "signature": "933da18435becfe9fcbb0467b6677380eb9278515176686b05bdcc50eb7522f913bd19f5f6176fc102383afc2736809d8e930575425ab9d7ca8de4c7961e6109"
+  },
+  {
+    "msg": "039c7594dd090b98dc126ec6fe1aca8e0dee43594a77cb8ee6a7e618e5ea05a84a1c9aaaf6",
+    "secret": "e782dd57e4bf3cb4e0a117a7138b7efb9820fbaa87182404e673a084c2b0b4875356ee6bdcba2a6f247e5bc6f6f4385b9693052291eda65210bf6ac73bfa4933c6fabb3e29870947c8c902683a7c8e1c45efc3abbae466b3904ab9bad4878433db691575831515df573c0579fd2ba293b85348ff7506a042a87f55f34914f4abf862ab6de32df23a426a3ab03ab96141cac06562b0b025c9c7030bfded26104c99056c3249e6a40cd85d0787f226215a020f4743edadb5e6642b6ba8da68976f",
+    "signature": "3435c309a326c4025c85f64824d36a5c6f6d0475f91c773f90f9ea9f820bb5039eb223159f37f928380fd5acbd5350eda00142e06a3c15106ca46f1d7f06d501"
+  },
+  {
+    "msg": "6942bd46b6b19086a3a1dde3a95f45519f54147f92676bcf9cc4390e7b0dbfa732809af990c0",
+    "secret": "a798ddc0b7dd65902a64fd6ee1c6106fbc2813246a8d0a88ec5fa0edb117457ce3aa5cbed8ba26af5f9aacc4a0a09323a5f1fdef9812d382c4cc46401c55d5642dcb23700bd687ff52a1c0d5e6e17d5cdbec742fa2dd0ff16ddc2812b27af0c976b7dbe91bf9c9e3183669912300b7cddbb0d72cde2de9bc1d35e46f67e4783fc35fc683720286bc850648d766dfaa2f8c046279772781b9a875ceb85747d75389ce078c1b738d463b221fb3e3c337f332e327c292d745c8193c3a5bb9e5aa38",
+    "signature": "274094d3662eeffb57937974ba171f5fc1149ee404d4a894654755e9f76b8e8f7802754cce6d92756d970eb9fd11dde19515a763adfd6ad5a8f0ab88b5a15300"
+  },
+  {
+    "msg": "702da967b4783e2616e962e5cdddea716003f6f26d8a8d51f7eae513a0fc489c8714637e7b2843",
+    "secret": "2d215cbef93b45050abe47a04e41820ea882e15478c80a61700dfe6629e000ed4b5d5f8c30309ef836d50d3153f1abc5acb70692dd95141532e0d9cb76979b761b3d5675471782b7eb5a4ca6ecf2a78333dd7d2525755c7c67bdd84e71a035fd59c884d6c9671930bbf6b7f49758701c1647e167e614dfb78cc1eb5b4e5cae1013e60aa37a9382e6d3028d3566c123cf94707dd28097632f4d381d6d92c9181a6bed954d413b671b4e98f0e962186e312a9f2af63194f6db679c2f6946bc0752",
+    "signature": "e18f78a9133e29091d77e7734d5c72484686d3b881aec092abfe9ed9a515c975e8eb7bf6361a61b846eedc7d1909000fc0c7b30f035d95d807965794ae0f4f05"
+  },
+  {
+    "msg": "1df0b454e43327764553d41fdb38c49dd0b6aba7a3a34eca48ac9b51d27723acdfbd2e53a11fc0cb",
+    "secret": "f29c5e214301a80456e0fdc1ce1057d1c64559140071405c9962efea0c41b4df9ed1165f29b5efd046a24c9cc9f1847858e56ae5713af4427a3dcee9e4e1bd15daca2a02d50fbf13c7b85f6da6f6516446c1e1588a45e5bbbda1df5e5491b9c278a9c11e16dfa316fad872dd85e253253477531e04fae81eb7cb32777ed41bb7f691cdc8f739424e7a562d1a65a159d69dbdc9b5de56830690ee9cd4c74e36421f66f66077b7e991beef93a04a0d4dea009253cbcc7f131ac2b3bf95a112fb87",
+    "signature": "56f102fc039d0ba0874d0a0dc5fa2e59db387a1f7bb08bd185b2a4f02fe184bf9f8f056cea8fa01bb823ae3870bbead77e0b985d9dfcdd6d3346f66730d7d900"
+  },
+  {
+    "msg": "6730edea852eb70f034b21ee848e286a5171895b4389a6322221098b42b8dd9725e10b5fb5caa5539b",
+    "secret": "67e981670154aa18d3399ca9aff90d7fb43fd188e3afb111416f2104e92476afd764e354fa634c3005bedacaaa4e4dabed52b691ad4530613740f5635366e9610b6f5ada70de3601ab9d026323fd00548b080c8c79ea5df26621bfa52634c4e618d514ea6d17ee9e1e94c822a0281134d1f840bc43599f9e6201b2ba2adfede0a9f8084d35b9c640219b35ed253f9b126f001878a942e5bf9ad90f46df9517f7ecaadb10f445c8135f2ff2086ce338c1b3a047b91918833cb430c133b0c73608",
+    "signature": "a90a69c46d05a10f3c5f6e4c5acac8e905f435b235224a75be3144e166d5bb814e4b70c8ddad099ff6a94cae2280df8f9e79f4d441798eb111d2793887a63d0b"
+  },
+  {
+    "msg": "c9ab90f5898d54c9d404c116129ea40bf2ef25f4b04ef579d8e682de5c6689ecc50a15069618a5d62d42",
+    "secret": "9c5be1acdb17e577c995c03e9d5003f5c36fd00d55f379484a28bd7eb1d5d2f76caf507f443b1fbfc1cce6c75d6eca2241a835352e1986f1571b07b9b5c32188fb70571745da40aaccb40c73e28f48ecad299afa81662468f066c21bc6d29e98b66ca73aa5583e0027d588ccdae4045aa821cbc8ebb2d91237c50b46f6401210eb6cfad5f9af177fe05b84a12dd97d9f27dc12213bb025726e5a186956b4d8da767fa378aa4c94dc9e1c722e3abc056af3e5c563d8fe551731ad9e4507e7cc53",
+    "signature": "a7209f24303da3a436a1cec37742743f4f6a7ec8dc165410452e81dd92ddf3379ba10fd1231f9e30a7752daa285a475e8553614379cee67caa798f1f78a98707"
+  },
+  {
+    "msg": "5bbcde7382836a1ec2800d6ff099d819073c7de4b1b335047f767a8314e85e613356c8181d9b7070108782",
+    "secret": "fcd5f264c3ef6ce0daabf14d246a7f2ea9c0cd42557054455ee16e5a2828deb5db0058319d014522d80b62b8c8905947086758c36bf43676d900d1955445002cbc0766071c438963a16b06c185c6b3e15a20c734d131dd794411b92d6a1af13ca20b8c26c0b789c54bfd8dc787ad0ce8d1b8ca95549f52317165d944e665b6c81e0cb062bf848cfb67ac2e7339309ef655de49227ff9c21db3563be10fde1f510e8dfa92c37b7f3ae1630b8d6cb8e45e1a045192afbb6cb4098b0c1aaf67d4ab",
+    "signature": "00a076b7f9922bee936b34a5401b867869c8857a16154afd30af2d46c49232285716ddf1d6ff55badb6d2373228caea1f6cbec05c5f85a8a6393c51db2557801"
+  },
+  {
+    "msg": "55c95b1c2341d92648a0292cc8ca91272897d880d049e3910021cfdb3fa93ab9edca4a33e90cd8792aa099f9",
+    "secret": "164b1ef0092a6cb908444ca14615a9f6d927f05e384e0f2300dba1ee710ea054f9ba6937e0b1ec9f4df1bc443b2c1d0d2ab4f4e101ec3c9852b47ba275be7abd93b75a9bb03fcafc39cd5fdc5e57d354496616d467ca58f4537d48005601198d56181236fc326e5b819b167f5083e45977ed3b5063b3bf5997b4533182f84488e1c80130dd74736c1f7ab39ebb96723bfca8892d4d0a81acba5c0a5663634517c91a1e70e1b9a62c4fcd41bcff71c140a37a6541b5e093f96605eeed64adcb18",
+    "signature": "a9cdf4e2c3cb174f11f4be60a26763c5136771c05aff665b4bdeda10b134b2c92d554a9ce930e8721e6fc313944023695203583221b01718073aa5fab2f4de0f"
+  },
+  {
+    "msg": "149bcd7323c0af5994d9f7f7e688d2a12551ebfdf4f747ad00d9a7a3a8de3a9072d3bf2cef800289e882c065ed",
+    "secret": "6e74b30c68e04365d044af24d65f27f1119aac5eb6218d37109a61388d1f0d5bda118261a1f08b194455454f92040887b49e1257a0495c9ddd892e246389d45fa0d970ea2900ea229650dbb452bf952a09bbf0bf0379a4561126045115b5c8495cd074599ec22b13fe84af63fe478c415611be4ec08c893df96d25a489cc8786c90ebc1c1b375936151b74cadd130df2b250dbf319a046e8da2da361a1a0ea99a23aa72b9603bdc6ab72c2707a1f79414a4fc8647d60bc33a3cd5109684f25b7",
+    "signature": "7c9a9fab3e76ec10aa4526e603d6370bc4e7fc3ea6e5b089d5f5f899f0bb8bd10f5aa29d4b76a7e987de5070c946a231d55d3de30bda32c48c4444879b09a204"
+  },
+  {
+    "msg": "07b841a0fe2b2723a0d1584bd74c3ddf2d9cdf0290c2b4973e8bcd31c49ed1f016ce2059d48dc425040cd53e2f0f",
+    "secret": "71b6e612883220962fa675e3302669f422e523d24b3aa9f84325b0a5888f0c3b8b785206865dde39d541fd899afb3453172f75e67893a6447f5ad03849d385d6ef216457556755ae299dae2b05e021b5bd3b0c86b75b192e66adeab8ffd2a1f48d55b504ad86c7af9c486ff1d9a1ad18f3e52a6dc0a23e494325c6bfdfa2a02f359ae87faa2bc67bdffa590b487e283ecca47e4ef763f1e5e358e268fdc809abc21b3c25fa865248e8724a452913328fc96a77d4727eaaca0d8c259e676d9ddd",
+    "signature": "ddfdd27c206b8a518813dde99dc9804ab9c37875a83a7f7fe426a12f06cdd4f1de49581eac0ab24cedd551b11928366c9996e1d1962fe880946a79c2db5d9d05"
+  },
+  {
+    "msg": "10f9c3223dab949dc0524ac80b1fbc30b5cfdd79a501199d51a3401af2685cc21fe75895f0e82dce5dd5cdf3a136fd",
+    "secret": "aed3ce91f957577ac7f38bce9fa83e624593e8222e43be96167c9404c6753a192643433c94ae29c33f204c74e74261a766ae54369160f20920ffa9d5839d285f0665f278c9718415c9eea3ad73fc767907d0e444eec2acb2afda3dbffc7eb42f845ac5cf6a0d27dd6ccd4ddab6f4c751ab799b7c9cfa5b382d880c66c9ba6dcbd67e1e555b143a5601dc4ffafe5eb9b6c4905a0109643ad27819de166b68b67d1c6810b0a6662bbc79390d3c896a0d7e004a78160a27b73446f06a240a5665f3",
+    "signature": "bd0312703cfb7980ce4877adc25f6503130db317ecf77fc2dafd27a115acf90b0e825d8613eea5cf8c8e6c766101ab7ab04abf7b300ba66810d630dceb42c608"
+  },
+  {
+    "msg": "35718573e877ca1e155e82a06ee0cd4392ea8c6ac7a1c1d2edf5bd2340c2d7704d475d21af86b02660371b95b590d05e",
+    "secret": "b94af5f87f946957046feef4b21b9ac798877af7b815c87c9d9efef55671204c3bd65ae6e608f74cbbb1067c99dd5c2fd319b9040c9f85e70d2c7aec7ffb7cf5f97bcc873dca0f75f414b5e4cf79d60abf61cd3e21b68e5c75444d6b6fe5653dd195149e4a5e23f427f1e30c91b369f1cda937e3c14217e7492159577648f726636c4fdccaa1d00b3d2a2f45bf3bc50b97576406c456e4de7168d577f8098962e1fe889ca7356fedd671e61bd4f88fb2f4ca9489476b5fd621be9cac219b3a5c",
+    "signature": "286fcb5add84493a16e770739f546eef81d45736d12d94a5aeba13e402ff7e7c63176f768b4279d740d621eecfda8464b58a877e939b1838b2d8e8a8bf4cae0a"
+  },
+  {
+    "msg": "ba4d9062d9f378d573ffd34ea72962bc6b9e85addbf6c5a5fcf12e8c0567bb20a07c64d7b8f6f0b09bb1bdfb1e11ceaf8a",
+    "secret": "95d5c46763f8f22fb6d168dd629c726ee3259ea19da14acb96b9755587b902d35e6df94c1e0777f5a3b730ba3f37cf49cfc7493cb2a10bbb368fccc3ffe4c072ceea80673b844f6c9ae8558d6056411e29bf6df7d63330cba79d9f17e143bc68c427be10588b965ea478a61d81d70e52aae0f7b63d87a2eb94e11eff07195aa57b00586c44b9927a4aaecff6fde6630c55995de13d4d075ae9603bbaca615bcafc070ca0c30d45a7971af5c9f1847f8eba688425b2e19ae4b87e298de1026500",
+    "signature": "4998e0dc515311ca2a20b04880bf2b77c2284d5a08636b449a0073d50fb4b5ab74226f207dfc7181b4b23b2278decd08e75e081346e4c23deab8aa978c5bd70c"
+  },
+  {
+    "msg": "",
+    "secret": "3ba0ea5db2ed03ae9634c61f014b842812e7e96f4c256ba05ddb83f5e83f0ed22ded2f38a935e6db3891c5ad98639afe0505a3b4ba525893e72d6ded7445ab0f50bb103fce9a4a533dd23287cb738fca81008d0995fd916f809589f76e9608c26e7f29bffdec661df3ae4815da4d09015638f57d1cbe36ad43cc84f54993a34e517362082e52ee08bb79be5ff113d24b341eb364caf9ba538adf8091fc3aa4e269819a516d26315a7a6bada532f6957a9b2d28aff2eeeccd578dffe63b4772af",
+    "signature": "2e38872da2b2e85eec400c9445e5ce4714657791a9dd032de609e6167beff1d16d22c93196469ab8fb31d00df3ae8eccec5d3443d9257b112976effc80c6e002"
+  },
+  {
+    "msg": "b2",
+    "secret": "a195420fecfabb5ad5a2223d588b3fcfb3c6fc5a1ffdb2073fb5b7f6c948a33ac3bc2981e3d1cb41bd63213298bda719353fa597fd611840b8390b792411416e14edca67a9f2a464667dfa45e9f075eff48204ae81a322c958b44dc86e68a979f389f46cee3b0277b45094a4ee9ce512a65aa06a0134f25a4b64af2e14e678746cef118a327766829c92185014745d1212604ad3220dc46fe2a3d25509eea96ed4ddf3ecf247e19fa04f798c5034ea762da57befc527119a964289d610b4d64c",
+    "signature": "d1e663325a65080b16e3dd99a25b8b2b1168ded8240a6bcc68da9b60770df6afff8b2e9e0eddeaa6f44005e1677b4d0fff57eeda28baf4b5762877600d0f2606"
+  },
+  {
+    "msg": "07d3",
+    "secret": "c5ebd2a7623954696aee29be91f0ec4043d5b63fb4dfd78c283b4c454efff1f7b360c914fc5850761f5670c43684214f419bd9ba38d8ea68a001a8cd84f7a39af1e88b40a58c8d2105c66dfd767fd2d9c0a7ee1b713170311e15239abeb72a73fb4af82f50bffc53e952a4551049c6aa1b981d0a41ee318bf81b458c3fe39d7c458fc086fab52e66c18615597c2273a5786bf0b1231838e66c5be19906c7a9c71568ba415a3c64adcc07a13d61d50ced31bc5438aa3f574ec7a5c1b762bd9316",
+    "signature": "2fa1b6d7133354ed5891586395824327ef9eaa5b0378afa312f06c89aef3b04914ec9879a1b0247df5dcd1cea9265ef2b86ddaf4899ea0f7213780aa7a9da102"
+  },
+  {
+    "msg": "02d111",
+    "secret": "88dcbfc5d67e414d5bd7509c5bbef65ec0b82b9d20007dd4973e146711c9deec3708b0a6bbeafbc8db485b91ac8a6a46493ac9c031083905de7cfce6d5295df3d3f5d3a7782d159fcaea9ca17959b8af1b086f9c163ac618a0dea5b369cf387254ea8da56769cc7a7831119c7c8b2585d21fcf131b7cb158324f75a5af3280ff37f4e15491753f6df12857bbed383b0555a1f7b44066a06451cc4e312c8eb04bee131c0ca6bc82e88b0415f54bc17adfb006d9941ac44997a3b3ffe3d7da6eb2",
+    "signature": "a0f4964745e93bfc307d3754bb7a4f41d865a82f87898203d23af0d3441eee550560f478c455d1d0ea4a21ddf09f9468c0795d81440bc16f457b91ffbe8f4807"
+  },
+  {
+    "msg": "9917eb08",
+    "secret": "27692eb4a3cdc9b03fc64d6ef0bb55a5c98fda73e1bd83c7155c10c246564352e5dea27f3f15fc75521cafb8c134d211a995abeebca035f9d9c2a1dd974e068a7bfdcee3095b90139a6a7bf3aec3b9c1e73083a4bd36c3cbedfc4f975dc4592d7a71d232acd21a2b0047c5dab4171a7bced3ca6af0e50e0090037ebcaf79272eed1d1fb2e2d5f2ba7f72cbdb7365196a01a604b61ac2d066f903e7d9f75ee14264477ba95be025f155b040632fbe92a5f30d3f1eb7069de0aa497db5b10ba2f9",
+    "signature": "89c0a87371f4b766a81652019687845e8067ef04daeb60a41e783e34d4ad6d6a57589dd0686e508001b9b721229ce2dc6ebf2b20358956d323f10574d22ba103"
+  },
+  {
+    "msg": "a93ae44df9",
+    "secret": "07492586f31d55776b660c5970575aea38d5702da28d66115b55629f290dfaf9f62a29a0d8ba8a1985c1268eed0d60e6c7a5d71fdc0a193bb8dfc8e2c405809fc2ccc5dbaf25e19a6bc2a6dd610ef4fcb8115e218b5b877f7bad472cbe764c0f5c4caf61db3662c69cd38daee329bde899fb3b789c7461cb252ab5dfc79daeac6bdd2ccf00e1c169368b1fe460737d2d2fe5b54ea89abb1dfe6bd4f042bccb0a08a360c3984e529207b37319f7330fee3e9c682f66c9738dd563515a7d7474f4",
+    "signature": "2a5fc751f5db366baec833bf218d7cbd4e66fb1310017ed9b1b7dd7d7ffefda62440e43178eab965565c3a5218197ad8fdd686420a3653de6959297f04b5fd04"
+  },
+  {
+    "msg": "55665bd054b8",
+    "secret": "fd3132f16b52d30859be067ba567a12dfda779391b99d608879faaf877c9f08d8b02d3df44a0732b33e4767b667b4274955d917e1c958e4ff913015ae248a61e9be8fbd50a12d7b22cf5735466520f8609cb87bd506d91ad838ae11ea05de32d10a783feba4c0a45c56b39dd816ec18820fb22ff212d26d6219b45693c3357bfc485e549c2bdecef8b756c6fd96bd0177f09443a867d006bf808aed80a80df4d815de889035a3cddf544601c641d2ee3ce845f45e17292e8c6d18d3feb34679b",
+    "signature": "2afaa08c15f4ce36062651d7b8a2ef7dfa1d33f197632dc83f9b3d75aef82d26ed3652684b6009ba9eb545e6b93df5f1f645479d194b924b376b7c1697ea340d"
+  },
+  {
+    "msg": "bf90d69cbee512",
+    "secret": "17771729e55f28ec2f0e25ff2225d04dedd03a72d8847ee4a1198bffc51a400dda3b5d6a7708e7d15b4429feb9d80d5360d88e0c8fda2ec2370fc696110ef394ae3c2cd76c871ed4c5e4baaf03fed268430347ade00eff9ab6c98a5de1ec7596f1b27a58ddfa40ea1be1952174ad42ffd3c5807538665b7a711b2da78dae7ff69baeabcd680a8bdbfcbf4d8529d11a8dd49e0b1f1eb151f64dc4e48e56d285494468a852efe353903234b64eefdc87c3be3efff0b2fa22fc676b7638c39de46f",
+    "signature": "91dcc09a1f5587308acf11c2d33956f34643eb4b5102bbd9ce59772cb13195771c06076650ff5c1ca6170f3008c7c2aad270a87e03c7a96c5e359664a509fd0e"
+  },
+  {
+    "msg": "a40e4085e038665b",
+    "secret": "826f9635ddff35bf34703aab952e592017bfe202fc05fadc61e983bed92edeee281c218451cfa5ac583ee244c26861cb3aa8b47d5e9de5799ee301856acc5b20507f72313b7764973fb62c91727154afbb054fd4eb8ac6416363d962e589de345aa1533808fa4e959b4668523beac083e785b3cdc62050c67f9cf694d0643f6b07e488d582afc333d3e41f39c8bcae3ff70b00d33b9d3241760792ebdddbf5610849f7de700e8a617b2ec2a400a6470561fe41b935d73f04dd0a4e82c6954d4f",
+    "signature": "343abb2275c8264c3913f85665c4e1fa0450b60940159e62c61cea0f803c8fac0ffe08b1e5a829a21d620229cb34747f9b929ccbb8071b1828c523edb44def04"
+  },
+  {
+    "msg": "1113c602387e2333f2",
+    "secret": "7d06abb11feb792c1d27920b46df9159fa51b5642ef41fe2e74b653b9acfce66e1a84ccf09b7a9e3f2488366de8472c92df0bec21200fbe39aa4ac1debdab131452ceced1ed7f216dfe8eb19fbb47d7380c71fe85cad485c608679b4adb0f5ac1407f1def67cf149297979ddba6acc3a6cd40c11bf6e681e281a07ee0bc3b1b0627d72681deec3496fee7a3e70007ef03227556d4aae0bd228ca8e72cfb23e4c167b879d0121da43a3cb7b11dbeb1f21dcd46ef8cdaa42788226cfcec8bc0422",
+    "signature": "4061bb04c99c2a5d22f077f492b7395fa6222509d597cc957310c81fe214f0a6c1fb37bf3ad14da0839b3fbab399b23854598bc4619642edeaf333fa9e639c02"
+  },
+  {
+    "msg": "04e97bc384df9ba92581",
+    "secret": "fbdfe4d74ba65537a7e875b8af768ee17009fe1d962fc82360e5304ed8e117d1e4d95db7cdb4beab99278e9c8d31b4a3edf208f824fc30c92d970f3a5e2ed9debef8ea7c8b57ef5d1c58f89d70fb29473cbafd3dab3a9820991a66a642affb942be42192117ef779729a775aaf99bb64dc5d60a6b5c4dcd34ddbe2413fc9b350e3d3417f4053e1690847c12e244245f8ca0573d209e1209dee50e420f3dc8888e4696e3f4645f62dc5b259b656b51908938ae9bf3373b7e2d7cd203a63e87a54",
+    "signature": "5995054ff52b238c6e10523f5f5d258758e3a1423e6599cd99f64c6a7e93cca89a38b13ac1a9db40c670915aa629aa97e690b59231cbbd9c45b8bb6969cdb90b"
+  },
+  {
+    "msg": "24c55e2e9956ceb3413553",
+    "secret": "ddfd0f60b652452c0426d7214f84cc68dc17ab385664f968a464728facf6d49116801942002ffdcf7510b3da05ff99a3f2095e45a585e8e78585e2c5ffcdee9d35367af9bae9da16222acc625f18dfe8bc5ba880d6958b6544c2fe47fe028e3a7941d55f49e4a31338d2f1915d66f5f3758e56a777cb29f399dafa2a757da7ec52d2f3fd3952398ffd22d8f0974aa5e04f6484bc5701b668d8a9f14e654b716a0d6329a9e72687f812544f4b0096e22a2df9c17dab9e981642cb1ebe84a35844",
+    "signature": "7ff8ae0b047e5495f3c0e30de704f80561ffdeaeed4046f231d3a40b93de00edbb11fd00a482e514369e9e76be26bb0a69dbc273b8bde3c786703cc543c39102"
+  },
+  {
+    "msg": "ef5c818d975ee4162d46442d",
+    "secret": "2a4dd4335294f9d3b23b3f489d46db4a6b4ecaaa025c4416ed1ff99a7ec5946c2f45ad8563979103a9855e43a5a7324028e6c1202991a3f9b5cc655d28ec4940732b045fdb7b96b1c25fc2ee25dc943003819fea0d16800c4afb90354400a44c5bd294ddca43c656c7966771bf9bd52c2c878640835d6a865b9276c320875c05692c7a20ebeef369c716a268725d926662cd3c4d6acd504cb4467476d1534f8e1147280d0b8abb06a16b73282c783d2367f6276deb3a9c4d702e50fb756e09d4",
+    "signature": "35618bd9283522e36720c11730dc0a4b903bd3b0867b0cf086716edab7ff5df3c0ea824870b2ef5c5cea3ed2a2f577e86e6884c7ca29241c3edaca4ddfc8330c"
+  },
+  {
+    "msg": "8df88409ca197f5bf4f292cbee",
+    "secret": "91f3c1ab651c961d1e176679a370d629900098efc731cbe0c81b925cd3983bd1c43f7858a88544cda15c27628cf1a47c49f3775bf73a01391f99c46a4366b14060b968d091d0bc5597772c38533ec4372b0ad55ddbd4434e554277a4659a8ca99ed9ebd7e9a64f92ba50d83a77b69eacdc304697052349e1ebc0bb6d03adc0e18a1771e0a6007a6761b48c6050ab880304b6d79ea80f50b4a4b9ffcf94292a73d2f363a8d38d8ca57fb35f6b7601d9252618a52129fa7edff4d35bd152da9fd8",
+    "signature": "a93c30fed4b28117993f4531e9b316f75adc2cd592dc92a794fd1727b1c86330f9fbc6711e90d14bd63cf01957675934b6986725967ffb6e542320ce99f2b900"
+  },
+  {
+    "msg": "7218c3e5c16a8478eabe83e29b58",
+    "secret": "ecbf3547d2b98a558b7eb2c417b174b4a75fbc17ded2b1f28457b3a8b15d413f31c996352a8b7461d59a27c76b914da045a0bd0efb2be44baefa331a38198a38c11d9736c2b59854ee3d41074d2aa810385ddff1eef3aa9a3856c9b3558f8c46d70061ba08c0ca3adbda33d9067d24d241e7b20c6939d1cc9c1be66620865268712c325610ce1a3b30655fced7f438df57e67200959cf9c6b602d68ffeacedc480e2fd845d31a770ac3432bef7bdc1d780830fa9992fbae98e101a2963db6d75",
+    "signature": "4ee9c581b8784a945eb7bd93744f86867344cdf135d2991c98f5764231747b6dfcb8b773dc9c71154981b78fa721ebfb9aea03cf84dfc680c155c9e118805d09"
+  },
+  {
+    "msg": "f4a625a1a31e3f61df2c15d7d1cf9c",
+    "secret": "c74d2838927971cbcdaed3a935aa4d72ba5d5551e04895c93313642f0d9f56a500ef72424a253d864466c0c3984032e646d1ce9ed1e1eda87fc1301246c151483bd2ee4925f4ee9a5159ba8324ddc1cb6cd782c79b59360f729fc90e3b5b485fece3b592317c11f95a9f4e6feb0b0a46716c22ad1c6d0058fca8abc6ee360983adf5972da7387f964a8746fb65f9c27d46d49db153839fc419c1317df54c1e5c19aa856da962f3c0b11d65246b1c3bacf1c60f30c1e86b2a716f87bdb3d7fa75",
+    "signature": "3b596cd6757f0242ebcb7aa14fd229c791ab653e0d25afd810055eb5f5a7c9268df4a27350f5c1406dbc8fa331d31bb471ee8aa54254825efe3aa271f8d3c208"
+  },
+  {
+    "msg": "548e5b96ff60025a3d5186f7075c3e2b",
+    "secret": "4e6bfdcb3be7119860d5b93eca0edd2cc89ecd64d5a7f558c228d217f0f8724bd13ae7c4e61018bd0e88c31d7fa9447646e673a64afc6dd31df4fac587b0c987de8e89bb26c9acf72f528d53f5145aa42b0c1ec2f18afed9950e3ef397babb912455fab3fc93f9584e5fcc10639e78c9269161a5db3356c221a8541bf9bba8dc10df9ce0e28d6c73c682f70cc2bd5fe6f22ca0057ed95f76695585bea94a18de16539d427d14aef6fa8f8902f90eb799bd7bcca7a6eb83c1e26469b75c5990c0",
+    "signature": "55ff55d13b3a9e966233c9a8b48116e9e2472e5310c29c8f0c33145d0cfd635783848031176270d155016c21c1e22ed79600e1d5aab52b3fc68249f4b39fcf0e"
+  },
+  {
+    "msg": "24282ea90f0552e31142a7a83124364dd0",
+    "secret": "be10978a583b4a2c5f0c3f6428ba938c07ece0eca8e3d728634b81f062b9b3fa22d9c0e65e719ea07428a92e79901fe28e9e6617b73ec8b23d85c605dcdf02b41ef0cd0bce01cacd35281e75db139ce83124de2ca13e015441dc5aef28b1b55db77ab8b24b9d2e162d61fcb0ad9363615d6c8bb053b90f3d97d08ee6063c5a91825aebc0fd2e46471a05c620e4147082dc6bdedaa6e4e9c435753bfb94bc481783f3f91c59b14119f2e034ae3583d628be69b608207b053762eaa5ee42a652af",
+    "signature": "a3e3125eed5a7e895b153826d7950170dd4a0f4ae45464910bc97dcf73602eaa92d0f231cecf1952072c8407ef192279b76df9ce8a4fa36cbbdf1eea86c8670a"
+  },
+  {
+    "msg": "86fabb9b4a134db1c204231c70ea38094815",
+    "secret": "0aed5a4799bda40892b4d471d4b0c087c7fc5d7a560f9dd3df750fcfa7823a93e778414d133d3ff0ffa434898ce5bc18e449e3b1fb9a27b44c6804965eb4d36a753fe1bfc7048d6abaa5d05e2e811020cfb05bf301f95b0ee265201bb77b2787bf117b2771b1d1faad04cf9f43ffce32a59f2ba1885411d7e80c8e255a4fae0764f1b9ae911286d2e8fbdb9571b06063847c6caaa83db9656555a079a9ebc8b95daeb2b94ef1d91c7c965546b7a1687e5a9e2932f4630b7c27490c04ffddbea7",
+    "signature": "2725ce0b82d1bedb3aeefff5aaa764f0b31b98895a132ef8e7d53f5062eea2c07dc1d12e1c13abbbcae50590dfef99bb9e687f142547a0360c71d1ad30083705"
+  },
+  {
+    "msg": "acd604e7f62a177a3d18a9534a85804ed8123e",
+    "secret": "737f29e9e0377c2b314b2f26c697d43b3969dd05cada1ccd44d8cf1e8e674472c28eebdec075efc5a119a5a44aed4be06dabd91bc172a3099cfcd461ed957005cf75ae9a5b342de6c16ec4a08cd7846558bc738c2e9a58a27cac144d7fbb1072d98cd616446757c367f868ecc354b3ad8706ba55522505eefe5ca2f6bc0a5ec3bbf63abe2bb3b0ca510a7e8b4867dc4df6bd20cc4bf505ba975d481a6c4fc8bf69daab5bfc3cc06367e09baa4bada40a7f9ef7cc79f1ddbfd7d2eea0b0ad3852",
+    "signature": "f57f645f672a17878c5e828aa067c74a818640e4b6e431e68de5dc6127d72947e5c02fda851f4a8ee364d53e1394ce570cf7ddbce1eb160e8f9e6d97bf6bd307"
+  },
+  {
+    "msg": "689d82c0a2e1db2be2e7011614db37293fe7898e",
+    "secret": "b87fda13a159a7d8a9475d87bc58065303ebc2e83287c47170cdb7e2f7fbdc88f18fe8782d32c2094abb3a37d662ddf33b4d9ee4f658d36cbb17c964283e373c37438314ec888dfe0e443415fbfa011f657c3f74896450d654b7996a5ce43213b3972911df0e36e8d2da5a6634cd2456ba93792d68517cb21b2f78a4f04020d52c353552891c3fd2f9f7a13d0af18ce578d22fb0655629accc1040f2d67ffb289bdc55125ba4d1e77224e9a6da2dfd55f80826526a7ea93f908db7ece4d15ac5",
+    "signature": "6f4e279836c911d295c1874a1fd6a49bd5bb68639ec0a94feffb532cf557429e4942f572b30aaa2146f3c66d1d0ccab820fc4ea48bb4c5ce7a7a744c0398ea05"
+  },
+  {
+    "msg": "9f066adb48675af8eb8d67bced6955633cf74c0f73",
+    "secret": "731dff33128bd0835dfdf8dc20ebb947af98843ccfe98472e6f5a02bd319c95a48d9d8032c3176301acab12acc237deb510da175a9e11cd3955786a73dfb9c50832d1afd4c6faa9683e769708009e73c2a2e91aab5ba9f7e5c08f9bb641769ef86b3c3fb88be766be32f60d2dc780a1f7dfe0821ec8671622a6117e0b730e6be00083162aac177f5c9528373296058b588b7da4e8a07e6b62a0011263ccbf787718366b8eb5dd3dee01635c5eb7c085d4a031035f527435c4887c3ed28af2118",
+    "signature": "a040955625362599498043cf6fead1ed39e2821953c04fad46cbf2cc6b05999014e6e9bb440b7edb09fb1e0be60211c7942d14a05d6152c5429c156400bb5c0f"
+  },
+  {
+    "msg": "e3383a02c47e8e72890ffcb24cd211018f69f9ab8c49",
+    "secret": "66cf25a5782b57aaaa99b20429c1145d9de562ed37fbbae5e4fcfcb1725d2db23514eaca76e737964c21537bfdb33754aa9910f605de9183482720d6030a265e62c84ab62d7a294803dbab41d15e3bb10446be65617540b490258facc4d1e74c9c23525d55f272774029af2ff12a0b6d8b8ec0c803cb849b40418a8ac00a51620e3c0b157d0e5330123f51536348576c993023ba6798377325110caa87c004aa74b32a1c28226be9b850cb5cfe26241c4c1450b04446f9c2e2b161fa1ffbdc2f",
+    "signature": "4642b353931d31cc8e3192b6f4815741e418e76af32b2d6f8707742e359e3780ac5f1e501daf9cba82158f35c810b11242ccb747700d1533683464d847815d0f"
+  },
+  {
+    "msg": "bd3828fcf6081ae1e063cb58c7771df439a75e4bb8952b",
+    "secret": "d5a62933530213a0ccb01dcf3d508bf048e2998cb8fa071afbb935e516e09d7c5e12830d5c0c2c300d887eae7cb422fd97ecac4bd8e6dbca68f75c7ac4f1696768bda06fc9358954235b47139fa62f3fb5c75dc332d54484a634dcc40ec311250c85b8f298391aa3dbfe295ff01fb378dff9ee3433370553781f01678ebe89360b4c7136321abe5814f918fe73a6623389418398f9d725bcfb22794934247edb9519aba807411e889c50838323de4e6aaa875db375b70576a1b906680eed5b4f",
+    "signature": "0e2bdee200b0016d1ab4d81f83d3fa62e3eb51399d2f7a134cf9def503b7c10716ca994d8b36c9acc0721d08c04518b2497a3f5440c1af914f44eac8e44ee10a"
+  },
+  {
+    "msg": "511d5e7857c70f1dfdb8a194bea846071e15031f702e47df",
+    "secret": "f53708340d2ac758b59cb7d6538fd9c860043ff3443f8cb27e6a1e70946c322a354ec27915bfab3897884a3c536f59274ca627d5dd21fe1e4841f12a31c6437a4e42525edbb11b40ddd685cdc415596b177d2594834b7b11fbb35c3b2c1de751fed3eec10f11f49e99de7ce72797cd47298530d89cec0d192d0d105d71506aca110a933ee15883edba920ed42cdfe42a88788c67c0e8a0b4fc2cf56865b59b785a68f6a2cc8d515d20f5b338d1df775f536a05544fea469685db4b8f7b2f950d",
+    "signature": "eb2210e0e85ab7226f37190116295b0bcec7e34583dc649b8715721a004281d0acbe9b282ab86beb0b6df2dd41e2aa8de9131150f2201da496d1caed45c38306"
+  },
+  {
+    "msg": "ffb0824d125bc5480b6e13a0350620e0a3cdfc3a9b199a95a8",
+    "secret": "1bdb38e077a9a5b7efe378edbc2c75cdf3b24055f38d724333d9bce20f4fb0ee4a7d7f4bf474929bbaec893d5ff8c4609048f3d92cf7c9a0999c54ae7819c0e3af997a14451d42df3878e9ccf1b28b6db07c7cda7b0d244943d0b6b86a60cea10476fdb5517ae909672fcd1ac44b8de8a8c69d17db0b6f7ead054d9671ddf85e3adc44102c0bb5c5fc090b49ba2385125d2c9968c880fd7ff3adaf3cf5f33d7ce4c9d7f6d91a24f08b839d10004e5268a5968dff0a92555c67701e274266b6d3",
+    "signature": "69398e981ae88a415310160c2735021c1ede52ae905a7f999373ef05abdb674c56b7747506b27b7c9b14775c703851a488b74d254b943f1d7fcba5797b4b3809"
+  },
+  {
+    "msg": "0a8eecde4e3c49a08197b5d4cf28b09d909025d960e5bf7f00cd",
+    "secret": "4dc77ebc9bc2619ac096eb094b4181b328914131f92c109fc0645c215c1dbc3e8a4945c6ca6150536b99d59d8fcad095e92c5b8a165cfb4fe0f4a31b8197e96ffada6eb106bb2419fe43c5be9be8e49c1733fe3f505c55482f33c42cbea5605119715515bc85748fd7a3057105ca6e022b958abeebe54cd603c28cc17232be9a23fee76ac701a634b186a1cdfeade860ed6a40072109953900eae878f6906cf5916bd7f0e705e80d171dd5b9b416b98cb2fd9a0e28962afb5cede82a5e1333db",
+    "signature": "c0396cc3de336bdd093754ae2cc250bc7c19a4f8c36f919111385db5810243ced023847e93cc97cd2ee99ede370a5e408a1e73c2cb4b110318493b592405e302"
+  },
+  {
+    "msg": "60afde19423e42cde9d69ee1f0d23d1d8621147ba6c06aabc58f82",
+    "secret": "e9aedf36869273dabc258b1ca1acfb4aa8c7de64f68c63db930d4e00dafd7989a4709acdbed8c2491ac0a653b1fc01a154a694cdd3bfbb06a1b4bf1684da2c6d925493ba79a249c132ff27a49abeba367839cadaa30ca2834cf6128b4d2696f9b72999a06c4b668de383fa5080f22b315856641ce4c15307786ef577b618caabcc655bd04d2aabc2331da51be8f10ddccdd4a105fa021cc9a3b8bb2b0135fd321e1ada1ce667e72f922d87f4652c9f1a1082ee87370e4d12f2feeaaa599d507a",
+    "signature": "7f274f68075feaf3b4627bbf078558a72848bbfd31610554913ca6dc26ac11b2e8856680d40f26561ca50c7c42804ba67f66a4a979f949baf96655c6b63c630e"
+  },
+  {
+    "msg": "46f0078e145ee40f6f37cc158c783b3947f237b31b65eab547c910f1",
+    "secret": "d1b579f4e4c4e53af4abad4709b5b4d15befe3017c6ced6a8961b55f0be9e4a6c77b905da44bb22632dbbe80e7544fc3fcd73ece17004d5e519b6d5c90bc847d95db378e113713d3b31b3e2c62aec9c77d72a907b5cae4ae9ae0b4653d8ad29fe270d04a79ed343c63506b91dcf5cb5f217a398adf06fc71839a319e0a14447251546cff21fc24d14f950aa6537b2dfcf99701a11f10d9527ae602c06f401622ca4f211d822e71af8f576b0e2fea289b2c09d09c99f2fac7880b67a1baf009f4",
+    "signature": "031215b491cfdaa056a892bada94ca0d8d03fdaca26cf6689a904e7b9b8099b321ad046c8f83cda13fce79e2ad83f5876765c941c5aa0156253ef1cf4d7ed001"
+  },
+  {
+    "msg": "39fd3596038d2bed3f46d85b23d51560ac1b39dbb14b33763a2fa60d6f",
+    "secret": "cc15a5e9b92de9227605cd5477e3ddc3131fcff1ba667052cae9baecbd1ef59c3163e987555016e11e1a05636aad1d0a3cb76e050bfd68e3246f8e5b817ad1c344e3681761e48a3a9ec868c0d8110c429298eb2b7b7469cfa2994e175c802f6442f51f6d3dc38a9f7d4e5cf02bc5c4d0dfde227fe381d0b419d6b2d2dd7955de558907b3b983f4c0ffd290844b59615ba86c6a225f8ea5badc27890db2022599c59f4e924c01124e0b502df3309c2e6bec8b8f888a87fd7c75e9701cad7dccac",
+    "signature": "35af05ed1d553f8bcad186f05dabfb2d3c4eb2761ae8f18b5f180338b59223d4e30d1b97828fe0b0aeef959b658f6f5561d76b201fe1132ccf3f16a9e29c1b0e"
+  },
+  {
+    "msg": "1c99a7764739f8e0c9aad738d682324634ef2537d7cd8b6ea7f851e18d6c",
+    "secret": "732a8a082a9519fd3dc9ffd40ee588c294464f17bbb1d7fa28b0366a9d050bbbc65ec86b3a980dc76c0fc5f0cb430a4482daac3632f424de772ced54b7cf35bda4162d4a6aeb43b0641d999f5bf4d9e00205b507b737f72d650c1a220b19039ce6d688ec9edd5aa75fb7e2e6aa15f43a79e511866f9af846119d5c37982cea8943a481064eb29eab2dc54111586f0262b0b2f792adfde5dcee321de8f3ebc84cf363e432069465b1b96da66fcd3be94bec1345608098c2304c8c324fe346d7db",
+    "signature": "42a14ef6a3cdfec49fd6c5cb20e951137aa765d2c83500115285880afb2a30439add3f5ff434cfcd3ddf93e78ee38daeba8c2ad0b7cdc0b248d2fbc457244c0f"
+  },
+  {
+    "msg": "64929e10df00f1aa90f9d0eda61e3e22debe6377a8be35157f85b7b0aee0c8",
+    "secret": "70719c9cdf2ac2394d78eb22ad181db2232238ec93742ffd44d4714bee563e6529bcd455297e28351ece33e1c06afa89f51812990280d4f28653c96a79575a6011dd84f75e32db5ea12daae4f6a02261c7a99f361b87ec8719d538c3e0bcb54361077895b7db8925b154e15d97830b6321d7bd62cb7af434de3459e624817355b5cba770be83ff783e4c7f99b7065e5bcff04a6a93c575781feecf6ba1b0d66209c92f008d726ca659dfe319f710a03001c7269442d4e96bd0e16856f5f58c0c",
+    "signature": "3bc1cd00cb2bb3187beb801f15eebe92740c90ffb11da86480ee2abb7fed56223c44630a814748324ba68c12ad376c898b9ae17f5bad33ee507052e8d83afb0c"
+  },
+  {
+    "msg": "af545990fd89df7049da9f3e8a1e2ad3482779f3499b6b86e978fe05061beaee",
+    "secret": "c14183eb17bf2772e365bed0085578aa08e1040b5f75b904ddab071506553653b09a7ccfdca66ae98ca14be37cab1df8de5abf83751fff7f5cdea7a1fc2f89cb4473295e48795beab231551ad47b55684cd3708146e2252ac285e8496a6a2d522e476c6dd77f920bb149a83780b945da50960154ce7e4f7167f0003a4f43d2278b2fb513f519a7992184301adc866e8a3d79e8b026bbbc843ea90aa1f335c599fcdbf2733abb8531aa293b2ca02ec88fe80936fb96de111c259c665a20a46199",
+    "signature": "ea39dd36920a0c806028baf6743ba2d35c5dde025ee52e25500cd1aebe7d627977b98d48f09b4953354897cc6d6a47b549e2b7ddf3387af9735ae5714c911405"
+  },
+  {
+    "msg": "a84f75e8afe27678f98db708390a51220837a4c7ee32b274e228445a8cb3956aef",
+    "secret": "99bd6256f2a98bd7cd331438bc0e6838803fffbf9f551848e7a724ace8eec0598e35c9c479af6a7a988ab9322a0c419af3190966241015755e041e8f6c00ddaf0004e1c634d566d71bbcc3d38567280972fe4ca57a67fa3abcc320dbca810aefe9a3d9ec8bff13b0e1dba87b44c90424a5c1f3ffc2b79090ba14c9b6d5b483bf528817b199bc59b1c615f6656e3d11f18f3ed14bdd4c78a961fe72ca12d49059f066c7c7ad0da7564ccdae34d173b1575e9dedd107bfdaa5e59eae98087a3f2e",
+    "signature": "4a9236c04919bf848480690b4588889b07149536e5da423df41d9cb953ba5cd8fbb8b60fb0f96de56995647eb3d752173d82559e48b09cc75dd6f7179bf24c01"
+  },
+  {
+    "msg": "b2069a1814a8bf1d317c5aaa80fe52e4574dcaa33d52e875fb04cc2dcf1e68d3e40e",
+    "secret": "42375e4b32bbd1a12ad31564576000ba77d961be083aad33d98bccedc754820a72b33f27b258abe636c72fbf1474ed6a587fbfc9b64d4b9123b4e3384a4914ef96359c927fcdf408e5d80273f0b474a1c73c67da072f214e7b325f35c432b47399c19159e3966b603c58819cdc394d149303bb1fd95794e3455381621b6a13136c567d6cdbadb6d95f8f43eff33b943424c7738ee53b0f5829c727b2396df6e61a1363c94ff0e62107ef8b0955cd6bc40e495a6aa1e1ca08276b9e703eea670c",
+    "signature": "b63207d5660dfb131dcd521c5894526f2828ba60a20ad3cca6f75f94800d2592d75fc58fd0ba3d81876683fdf941e9ac3d3248faddb20fc96f5be4888fdce505"
+  },
+  {
+    "msg": "ac48ea03b563a904b1267ed01ed1129de6588955cbab48690cc07b9d92db9c2412e379",
+    "secret": "6b3af10ad9b126f48ef9e673605755309233a556e2cf948df1e6113a4bdb90c056a85ef4c1e1fa90ece46820f8b2df3c107bee9920218ea0ef6b58de791943a2fea9ee8de42ab5d1ba39265b95f0a7523878ddc2166ebf864d6a2de8cf80b2a7a80a9fa45c0362c58c36d51248935b36a4a8495908a7235465ac71e8ef2d0b1022b3f21d6c7fd58e0f6f42a7f1b36346c77539760f61ee1b78ead10bb5e58084b3604e64f44dc4f96b162d853c1a27b0ac042698f33fd99ccac89097ba09da51",
+    "signature": "d9c4a2694db3a096fec94896bcca8277f32092d51b85d3bb441d180350896018681e78e26cd0fbb0857398238ac14c859cd05ea1ccdaba499d937e120ca83c0f"
+  },
+  {
+    "msg": "4b1433b262da3a22b52054d6cabb33becd556a3e27235db655b34141b87b39c4d779f5da",
+    "secret": "19813194683d3a28cc8658a62e911f82e8f132cfb259ef0b0a8288b2ece4a6dec3fa679cfb293966e5e964c97079cb0bafcec9b47390cd3a6b098c0ec0116cc351f85860a4c84bb9568983f864a0614fae9bc2fd83f97cf174f626952904aed3fdd1ef4f2b26436f6c99937e51ad94667b6b1e2d13fbe04ed7ef3c31879df21fe6ff5de3232e6f64dc24a8b8a28bb20d2280e80e85119e4884d151b27cba62fffc076cc03cd91c4bbe5107e9026e06384199c3bcac0e10a3ed71044cdcab9148",
+    "signature": "2f145af16a3d907f85f4b8d8093fff281463ee822a2c0c7c684a91e66a4fd073866442aab89ec4f50ca6cc5719d562149335f617ad4116a0c8bcf1fc56e33404"
+  },
+  {
+    "msg": "73cec893a58cb9b28315313d7545468099a13d9c02dc19b359cd05076dda945f43cc46e243",
+    "secret": "17dd82667de964450d6f709c4f750de26bfb7baa98bcb216159fb8d3943816c682da2a2c55ebbc2e55cda8ced6c937bd26134ed7bade58b70e9c591461b14a33ac723544627848c679be8f38149a45ffabc05b849b1e5636e251c937738754d2e9dde3148480e9bbcc8a2174639178da3400850a3a744d89630d49c1032bbddbd1c50cebe24a42a81a79e60b186afe1e0fc008d2ba2a5b33ad293d66bd6d2ba2d7938395eb9c1f40900567421b67027589db038066235e53225d7e72229fff05",
+    "signature": "80703df7bc962ebd021d99742c55fff0f47dd51203d6b0d76da6dffc50818a0cd85dd97c43006fda3f6620be5918b40a53066db9644a7dd907e37e222733ce01"
+  },
+  {
+    "msg": "6b06b11a97f37a65c4909555e3d70597a77a98441bc03cac1c52f48896ce0d77588c081889b4",
+    "secret": "aec065a55012a4c9650eeca7e273821289dfb76c7213a1a9a18b2cebdda4fb8bc4e8838c772bd3ef338649c96eae967645c67d8252899c1728ebf64081fbbffda94e5f1d9d4eb40baf2ecc5b6e81aedf7d24f42fc514f4fae90e28de72fb027f256e4ee792a16c80583a648b9544595a6539e409ea8488c23be5dbee2ebaf6a0e9dbcaf3778a84bed11d1807bdc1846edf58bb6f0f13b7f02094a3cf800293eb840d9a6f3895743b5d973f3f5c01924382c62324990989ef7e0be3f3d805179e",
+    "signature": "c58292e9cefd8512cbd5462bbc9a6aba3ac16d068f270b0639fc44f06a796f67c9ddf4e90b504c0a9caa5bd0328ace759f24372d266a14570851ccdeae0f4002"
+  },
+  {
+    "msg": "2da9dd67a5c4904167b44fef0440609ab9a88c145179d1e8b8867182f6779d94310ae2d3965997",
+    "secret": "39e31b24866c55b48c3a9a4121b000513f61da42c5147f17a38e7b1f6c97390eaae71fecf6184667bbad56581ea2752d7e21552f2c5680a6884d3f01e768f4d232d971cfac40bcc186003cc0485df6f0117bdde0311200cdd191f4a739a2ecc8d05a35f9f70bb92ae4c5f8a28bbbfd476b8eda3641cd72a85e1b97245e77fed1b6758023a1b95746436d58f877d867203a2a5a8750a31eadbb2023b9c6bfb7e9e4bc3d57db6023c0e4e33548ddba68fadcccb8e46218c1afc105d819782ff404",
+    "signature": "69f9d3ff05251995a64404f7dc45ad95eccfb796e7d2a945303d3f02dec0dd923049a8d51f2a013cd7b4d293deb4fc764128c01681d9081af0e5cf03360f9b01"
+  },
+  {
+    "msg": "282779a570a02a1cdedfc661b7eed3e62a571c582a7d945aa01f9974abafcd81869d7368c68b6311",
+    "secret": "07e539281f7a316bce5ab69c3baa1b7ddb2d9ffa10ca6d20e5be1a535be5f473f8bc5ccd98726bfa258d9f1b244cfa22f6682f5bcff19d012eae10dc8586a7a21268207a47273a642e726ade2add288d0e176d2858c3cf7c7b9d98124205bceb87a94db639b660379bc2d074755729838ce8b986146d0067329fde3898cfbdee9f3df1490de129ccaf0ead2faa1099cf6c9947743a215de01e89129c7a755b2777515eab14ba40e15e67483d1079fc9007a5ef02a217915af23368b8a952e153",
+    "signature": "bfa7bce02cf799d2ab552ad548a061e5f7e56a1253b1e6785c1b862957b76d1d5ff03dae21ae8c4ba774a114a446a8cc197746f56fbefd93294cc24b2e72130d"
+  },
+  {
+    "msg": "b0e53cd8e580a10690b806cd8bb1d9c1b3febdd7b7cbbc9dce6fe888808cff3336f0d06bd927175189",
+    "secret": "0a8f0041326083d62cd3487a18bcdf325c1d38353006c2e6ae37c3eb356d42e318c3bb551034b0eaa28aa9415f0a2c9fb265f2d62cb9e082844b295400bf953820b2f78cdcc77d2b48aefec01532f599891c3e1892b5f3d87fec6a400be734adedca0c2bcc6961023eeec08a31c5fb5cced39bec4c0b23c6c9ebc0e051a5d37937276d74d5a980cda990f3a8de847ea53c320fcc2130a3473bf4e934463f264b3e8b9401bfc60ce1e080ed277af3a353e9a089793d40106043cb8af2fcb62e82",
+    "signature": "fe71a2e9d5887ec180ae72cf937cad427cabaff09a59c5c8f26841c0d8d40706e5f69b952118736715658263da6a834ed9740ec944d0ea8f625f3954381edd07"
+  },
+  {
+    "msg": "2287b517352afc6e1c27a4279681aec462b63260c06e89ffa5a24305bd3ac653c6c9da7129b419a402d9",
+    "secret": "0c9f7abb2cc8e68ae0ff5a1708e921d7070763c207d6800477e6c8ef15338af1a3cfb868db8e7083cc6fe21e03ae8dd11e78a4db6927a8a99ca0ce198091cf21371f35ed07d4f3576ecd78e850284ebbb26b44b416826b5829f728248ca8b51c52d8018d0cd9469b9b4d22c0b6433525771edb180714b783484b72614e55e8ec00fcf8ad415b6f7af7ae99f04c8778d89e227d359df7619ec527d83e63a1a54fce2bbbe44e7b68196da78a5ad9e19e100dce8f90e502a76bc87097cd451354ca",
+    "signature": "a6b4951efc130b915fc0bb074f790765753a5bb136614c1777800035763071832685a30a4b886904ebb11c595fd7d9e1fe9b2a7126c31442762930f841ff220c"
+  },
+  {
+    "msg": "0072222efa9cff32c083f2abd8365863f36230718e51056e9fb8a45c0f4bbe0b08f38902500c564b97f974",
+    "secret": "93a1f51c5fd34c61570892656cb4f77ed03f1a377a299ab1a36167db5c521c6c84fa4529760f629bafded8648aa9b797241ff87547e077708e044b89e54be5eb757d46714f4d5a2705d0991d81015f6d66b3ef0ccb46c80edbdf2d57233e7b8bbd39939eaae8eb59e064ae7603e2795ef6cebececa592bcf932f9f90b429e4655c49787bf34b1df5f34da503a9820ba96d5d9f8c4d12c4de012723230e378db7506d349cca171d9a95d01a475f3196492cd49139b9db7a85d8811b0c88f2583e",
+    "signature": "36432a9abe725c277ac5e9786f25e55cde3b04975a774674c26cfa9a8c6f7cb5790324fd23d5c950e59e571a4f4041fc2ef9593b093443754fe80629887de507"
+  },
+  {
+    "msg": "f2c102343e1ca54f2b898345b43ad901e90afed6966ccd7c59ff65acf3b740de6e6b9022f3e8841bb86a61aa",
+    "secret": "0e8a7fb9697260a110f57272394150ade4ab01ae3663bad97c86f7d76fcda3142bf3466b48aeb38abab074e04d914d67e219c6bb54212c941c69cd82400ba14d24856e6156ea3a4f6974c133addb27ebefaaf41a759eb53fcb58dddfd93673739b48942b154110d2cb31a1de757cc870ad4e2098d5df5c08fe3bc5c2d5f9de25eff6769c0ec0a72373e760680d396695c57106915429934fcef3542a31e4331abd69a4540538a5bb15b8151f22cb376d052978bf893e58c2e600f828dd066d0d",
+    "signature": "566e5e2d249638300e0a51f00744e0ed5910a47726d7ddfb9912bc548b178afbcde25712827d7e76ce5bc7cf2e580c8ddf8492f1ad81bdcf0e5701d7b1c3cc0f"
+  },
+  {
+    "msg": "ee45fd7e94eadc778e69b35b10c718d973c942b3f6019db4d530186f86062532eca9fd15e94b4f2fc6bf52cf8e",
+    "secret": "7e34a377ee5b1e368d549b45e3844971e3ebce3541d8ddf9cead2f387e16da6dadb89079fec6cd1bdecacfa2d5fa17437c9584c2f6fb95310090b2f4545d28dd48d05d47f4743529dad67ea9952974ec26e9b0f314d2fd11b019baf8c1625d758974a2da253445c4ec240535b52676fea303058a17675798d7aaf0e66cc4b18aa24c11f92ba5ba643a3e614edbbebffca02cc3f651227d7296576d8fa19cb9c2902e13c9f7236b08327b4b13741e9bcd63428f55a550fffd1447b518ef2a7d51",
+    "signature": "7a45698aa21cf911ffa138db8ce83c331bcadd8d00bb02d01e2a1a8ef45a3d5caabfbb8c66f154cdd9aa51ec6c0acfc5131048022aecc74f679f073de0306601"
+  },
+  {
+    "msg": "ecbb0a52d487566ae56cfbe8718085140dfb63f3813b0647562fbdbda818cc0d14270e6134d448b38a64f5d97b7d",
+    "secret": "c4bd8743d9232e8fa2afd0273c6824f012e7b000f71c4a67874bfe822b680246e618f2744d30cf613d3186ab576c56207184b76bd7d7eab2c8eb63df0ad7bcb13bdd066a953c2e77a4e475f9b831ff9c8079b3d9bcc56f52c1e83b27024c91ea7b2bbc95fc769224c193f154c044cb21fd73d9a613dee6b940792f5693ca7b8fa994bd9b0c0235c2deb9191407f320a72d0335ee20d17dab935b389ff3d0d2f8f9a5ca75829d45b1dce76f8a5a00b06b9d859c211db3988695785569e08aed90",
+    "signature": "2d019062c9122bfe1669eb6316888fae604d75174ca351dc22f05fcd36c40f44d62fa672bf0185cafde175106c7812b9f66bcf43f16abccc2dd51efb9ce54605"
+  },
+  {
+    "msg": "77b7dbad2eec336deb6b65629ea532f0fcc89a709a69b94c2b7ee587e05c8d8b324b2f5be26b0f02012798cbc55e80",
+    "secret": "e124bb57d44a54ca7d3d7ed0be641893f6c06a99d71b6b0d79e3514924a3a6885940215ccce86de419bf76dcb730e5429b9e89273d5a3a1bdb321b15868693c1f72bae8d77ba185d3c9e7c2f7148a24471df3d09690462d8d4151506fcf2878cf497753140fa3c2c8b2c092578a3ec903452dee7ddf8914cf0f427c5b01ceaa170b295342ed3d82c4c6577ab17551d2c359861b3072e454bf6b9fd9191b92a8421ab782b434726e28ddcc3d063ac2c8730ae1cbb97a3627cbff3e8c2cf6b3877",
+    "signature": "c0804d9dc2642f8dbc6e68efbeb72e8f1daa9bf24308041476643462c9c4cb30af2846c44df9daf8cf3f57c0b369dbdf4e57dbfa817868f6c84ec24bc82ede04"
+  },
+  {
+    "msg": "b6128985e64c7b1bc3cd565f34559ee4157143eb4f68efa2fbd8611777a668cd7d42e4f002d73e64ac0c57c06514d7af",
+    "secret": "18abcae23dde9fc1a88f666fc0b00f6f77651863e776a4fe401d09afdd1f0f8fd03d1b7d3522a3d2393916717580e2ca013e181e1a51f2d629d7ba2178e601d0c6f32e8f59d86cb178ea682362ac1f5da6f3248a3b6846cf1bb021b7f50985a8f5b39aa5f2176c9357b022ccc2ae6a6c383ac1d1e021199203a5cd625bd49012954ca64ea4842549458bdc9b95fe63834f049e595ea8c2934bbf7c3482ed54b8f80c8498a607c9b1cb66f5a770b0f762eeeee2b4121df542f04ea9d4ad4abb8e",
+    "signature": "7140db908a8244bc5a4992e020df191679fde7d0d8a6ff691c6784e78d7e967120c371d217676a7f76259a6b765823dddac71914b8fe77882d55387fc94cd206"
+  },
+  {
+    "msg": "69fda1ca0ebeffcd9e33676e8fc3871c40f4272ac24bbb164d146bca138e2ebe9b6cf192d504c07260e92eb04e67f73bf8",
+    "secret": "3115f4a637963fc0164293c6eaa13c0f7fb8a33499cea3813814f9e3dea1a71fd7d3fd6c47201f75f716371ab1868a044b2d9e0f0ce07179ea8564f5dabb7bb6751a883a7f1047670397f0fc9d1dd46bd6e0877f12427c0e44687a59201c73a2a9094d28a73eaa99d98585649cb24378bfe1a3c0a296bb98a3d7dc748eee37ef475be9423a50aef2701e777e16126a6c8164d3960431494d0c478b468f9792d6e970a305015ad13f25818f5c9f30456ab1696210f50c66e5996c2e9efb228cd9",
+    "signature": "0aaf683aaab00187987b38a3a06d2a49310a7cd1e8c8e4bb3ea7455d99aa86cfb9935e605cf50babd4407579066e6ee830278fece828b8674c7f111887eafe07"
+  },
+  {
+    "msg": "",
+    "secret": "2e0aa5c85786add6b93988ec78178f8f3edb81043eb597682aec64c9daba491ef8c8124474dbc8fe6b0ec1ade58c9a8be5815666206b04f51a991ab8a3909cb79ff63a0ac6b217ec451aebda887fe10053f70b4c231e96b575f477429eb5cb1e5a0de55e3d06b3273ded396d28f10260a102b0b8eecdd9105209ad29c205eba07e80b9681aae204450cbf39f430eb1ba928bfa3b4826b3508b05c8544d61d00b856a6f8f12a7ea8981301b9a50e11a02d77057de5e4808fd6906c7d0040f5b90",
+    "signature": "6370200a73d3af797143fe7c755effe8e9a2c4e552273f10702adcc386df3b85c3b171beade6ed10054579c943d18f8ebc02ed87566cbb0fae8279c273822b01"
+  },
+  {
+    "msg": "c9",
+    "secret": "762fdc98538a23946913848b58ffb49e5eead4d955e2a194f3f7cf0c4e9bcbfb01996dbc652c8be86ac95710603558f872fa29e7296492fda9e9af4c4518113b52cc2acc2e582c41f2a4a6c5ef833a6bef6a87f17b1d99d122e69002ceb90d7d152a182dd98b43ceb424bb075eac8215f9359e1637285d2e7ffbe99ce45d2fd4193b2c66174c5ce96259f44a129f67541f6086d6b526aba03468cf2d63e763d5fc29f25512f649817c4d5aca3d4dd7dd5b6a40aeeeada01c39b680d747cddb38",
+    "signature": "8310ed56cb71c4d8b4c31f54f8ad5ba801df58be2ac68315cef7b5bb111da97cf95e32a9f8b43d5f80b09f208c2338f874f294d914ea4536acb338d18b1cc50e"
+  },
+  {
+    "msg": "b095",
+    "secret": "9dc9c56a4d97776593e98374cfb55f38b0936c09446a34d1eb9ed9b30408df7d806c3599b40d89d9cfefed6e17b2e5d92d1732a39f20743c1e5552ac83ef148e767a242aa3eff3d6aa8c5592056e410694e94b9e24fb8a76a5eae49fa4e5de6cb0f06019e00f6ababd62529403e64604e2baa603b01f2cd83138e38a61c06bb33fc11115caba8526e664a6d9be4718cb8e719b83829312bd2d5f5205c73a89c334b1b257f8bd7d2a43817596de784200a472b1f0786157e169afcbc7ef2de34a",
+    "signature": "7868d66a2d4b85010c6bf09d723166e72aed4ea7d44a7475c556b58a6141347302202c464e3f0cfec79d1ed6c440e647d5e9da63e5e2fd0b2823287c2ac8b701"
+  },
+  {
+    "msg": "196ae3",
+    "secret": "3841ea8e144bab3578c56b98fadc0be59e218d334fffd6d2ac96525692651d1d955e6e522da67f9156864534d76ea0e7a934d837708fad63a0d53abd3b6e30d64d55b7a103bbaa0000037916507830876c4989de7447829c446f7f9b7de17cdb4ed593160ed739403de39c5d178cd158fb6292e8138257420fa7dd36784390457cfe9ab15e98292bfeafc0678ab61770a200b1bf99db8989221eb66c5e5f433a37f47e2f9d8635e2ee169d249f38c501cb1877e8477bc1dda34f70a24a397ee3",
+    "signature": "4276f2732b59a075e87af55ae83dca4a371a37829e95d2b83eb413d17e2fc62199da50a59288cf39b9212559651893091d70fe73b75fc3d054b8cc86f094c20d"
+  },
+  {
+    "msg": "5d24a95c",
+    "secret": "6c9bb1a35d5c5b63a3e64ec07fe0195b012d644ed86bd88308ee9b7bcd2d4a7e8192fe5e107541554d45016f39bb42cf8c4af348d0fd07e53055af6f7e2c2ddafd5429f5bba4eda12ea0c3b3b20a3d2f0bb56c7f86d79a0d7dcf29b4f17f0ac5375af8a4ebf4ae378975504dbda95fd0b7b4a1dc1106ab5a1a624c22ce145fbb30bd36d6f37bcd7983d7ae111b3ea0f7e0b076ba65ce300fd354ab5dcf611b27fa489cbe170647095896755f51b164e196daa875723756529da503f31e5ccb2a",
+    "signature": "dd6fd7ea61050ef82703702a9cbeae39174978f4ee1a95ffc3d0a595a5f237a3614fcad04a61664276f2f949c62ef236f306137dfc1b3901a895aa69ae2dff05"
+  },
+  {
+    "msg": "b0c01450dc",
+    "secret": "f55c7d29adcd4ad3b719b60bbaee3b9d7f0c3aaf6584681ea1627390cd777d715e51541f1af9cfdfcef377c4902ea7006bef7246963ff989a903fc7c677b908a32f6f43de1fa010bd2653d8465211a969d62c51b9a126d827917bc979c8ad62b1ba68a1687b36e761d4cbcb48561ba900f6f27b0abc63cb1b82b6b7e5ba0e9bd9b8e4c4e2d239e4d1d67481307ec781b7c86f4166a138541942a3334003b862143afb71af929aaf3fb65113ba72bb3c9c40de73363aba1af00bc7d2e8cbfa55b",
+    "signature": "db0bcef857e31e69ec3c292ea4be5d38b19cf8873283bee237c1f421d058d1b20a66aca7f2b4258717ea2a461e4f59c95d7ba9278bdb3020b50b39925aaa2900"
+  },
+  {
+    "msg": "674b18fc5837",
+    "secret": "157fb34ea768cd649dca0f10a08c05abdcef0828896bb2599735bd1a8888b9ef86ef6eb8c75cc972bd84f3a83992e61a6737c689fed9239f31c892254b884e40fb52167b7b7d6c1a9f3eb86b392a0710ce672aa660fc232ef5079de0fee39d408696798c60ffdb725a64db825f2cbefd6fb2157e32ab30a762093e4049be25aa46ad0b7c108be7af7c3b0ac885436333365381cac181b4b3604d9644eb155baa52ea23b87a6747fd91dd09e166ae8baa7e58429e19a7f78bbc3e533a5ecd8c02",
+    "signature": "7e57845e6f8a2dc86183b1be0b1eb90bf59b95eaaa11f6fb3298fe451d221cd1817d860ef4f24eb397768f3670ffb026037f6e8eaa583bc6dd07b68d2356b205"
+  },
+  {
+    "msg": "584e50320bf724",
+    "secret": "ce329c2e233482d03a789f6ae58474ce4f8fb215947830c067a73ce8adf7f0d98e7aa38ecbc231dac6decc8bc86be59117b8bcbe7e859ee32c04b283a7ab83a4af75b08f2fdc938bb9b819ca1d74b27be29f2924316049cae54b4c4ed99d8bc6764ec9b9ceb18fdb02299781bef208632ec387dd675f60c8e641b23a5e67b7b3ce1eac3cd7a8b3077c6c88de7963ad06d20a0d2452c78a102d00adcacccbb2c72a0c35f9c90c5d52d1ce2cc6955559b67e41c7e7e3d86753e1acfd55b4a736a0",
+    "signature": "c0bf3679679cc840e19d8ad818f87c61009296260a58b6a9e90e90c863fa5ca36850ed0c2de90516c096d64dd2ddd71836049cbe9131b79f1dea6cd3a93c0300"
+  },
+  {
+    "msg": "8db6281949f6a9c4",
+    "secret": "cfe15ebfc10118b3a3f7eb7175f6bcbd3aca8ba7072908ac7f3d5b5b4d834edeb9e71578e41041286ce7306896fdc5e6d9563f6e51fbc5a46114d8349d858622b83cf079dd7e3ccf3d6d0e1d47b246c0440ff6d3932a15e32eaa4abf171123280b8e486e7661d0a3699328ff69208431ebc5f52b3c57fba1db41f011aba3896a8900d3a23422fc91996a4b18545100398c247a9cd1d79ede9f208b320212cf9903a78ccd3961e14306c0fb4d4c05dcd8a0e436041a275084feb850b756ef53b4",
+    "signature": "9ab234b6202cc4fde7253df116e68c707f0077ebd81bd858ced148d58ebae3110286b99f0b41d9d2ca218439c2b38afb7495ca85e803c1e36f60814295a37f0f"
+  },
+  {
+    "msg": "f29584baede793d105",
+    "secret": "bf9fcf6a399541f839d4320b00654fe95c74b9fc38a0f43f5a28cec9ed279f7637cbd6ef617a25d67336595b9ac0e83002d2c60bf5765a9580956300bdb83510e56a823ba7d7aa7b5974cf103b6236d45303bed7f021c1698b623af7f6ff8f9bd16f026fd93b2e2e310952509ec60d12e4fa918e8ca8be84b09331ee32d656a65dad3b8b4bda7f54d348e1f05ff041660d8bf6301b2a42c12ba6d2a9f642f0c491c2f7de7850894c703f6fc5e13420f5dba2acae7ee6a4fe3bdbf5fe8808b5c7",
+    "signature": "033f0829b98ebe8b1caf780f69535db0a8c147e7a11bf86b94726edf7051deb7e042b828c2ba5ec3cd9978a4038f66ef6232ca0f7099d38d70db2693fc377a07"
+  },
+  {
+    "msg": "dc99e47882a0f98da6b7",
+    "secret": "8536b1ce8b286a8b162da04a5780cfdf2914b736c06fef127911ef2cdf4500166019b2c636d43f33fdfa28f79c5e70e00163c1cc65a3aab05a16ee869d6edbd20b55b4bb2a82d26393a211c317d83eb1d007607f1364a970184e4ee4afd783cec7970ca36652f162ac1e75cb1b33345f05defdda40b563504afa7a6d93d9ab4a1568dcc19c0a58128eb7c44ad2a33491b7e61d4a4051ea42d9455fd9e10f7fbe33d823f38b4f3e711fa2b1d1334791c7c20b2b37514db14c44877ca4801d0c70",
+    "signature": "88bbc5ca9095d882d961e3a46f0f174327037e939d018b12f212f82df339c7101d96777c15c8609d3d45548064ef2393046f0e850ac1a47a66a1c8992dfaad08"
+  },
+  {
+    "msg": "fafb8f67fc6ca154c90c55",
+    "secret": "0b09c8f3077a2f44e7ab865ff97ede8f9a7fb2f274d659f9c2433d2da2f48a682643e4a5a6a49796777e32fbdf09d814695aaa244a6407436de9cbc0db9e592c43d8ab933477aa32580820e16a32db7e928370a0b6a9d42a5d62441d34416e903df6e0b991008a946d509a2d7f5f56331f8c62e3faa91494a3b5564c5984c42d4980816138cc612db4f35a892ed129c4219b5b94958b94d593d022685638bbdcb5aafadb5d9653fd5b5ee8a6dd1b4487d038fbc331e4700da8eeb25704e14630",
+    "signature": "e8fe6184aee965cda44b14732cb5685138c37b71b2a479cf7aa8e5fea0f0f631540d35ee4215fd6437ea20f780542b41036f2df05b0cd31a0fa6c7acb280f007"
+  },
+  {
+    "msg": "b8b8f2844602fef97b7b8279",
+    "secret": "fe438f5e81d634fad43d95185f751e97c28c10e2efdfeda9c17603eb653a9f4823557675b9e4a3bc6e82e338b3ac3de3f3d981cb58bba86339e6db21444c3186aadde1247cd7481922da1773cf26eeebc850ca1b5f648f9b60f9ee480a5c66e075770cd1831c255978d6f3e987fac70ef69616beb1c2134d28feaf987540c07d4f35240e64fdee50d0fa7513ee7d93117db734154e31408a8aa4f22491596143363b0e763932714c84c9a50ac4c25ab8ceebc9e4fcab43207694e710af1282ae",
+    "signature": "b9ba258747884685dc3d742286560176d0e156202154715baa5b329dca166e429db133a351a3b81afd4b96241e877979ea8b5fcb283931ed15ffe4d06943ad01"
+  },
+  {
+    "msg": "e5b17cf871d01be0f13dac0ed7",
+    "secret": "f504830132b2408be522fbb0358ac94d93a675fc96d42dacbe75024c0a112af63b5a849928f1e7c34bacbe390dc2cfb705a55f4b9c079a6dc14a68095c41a03cc0d66986625a5b42ce5063d3b89e64a6d996348e3543765114bb450e35a11f0bddb87ecf01a219c49dc878fe1ac0787eba986be29bd421e1a4f83e9e787017e22206ae96825b190c2b7bb06809d22b992e224cb10735796f02151a5b301f7bfb189ed147b7d6633987f5d082d0092f12813529516054a9b6e4971db870923d10",
+    "signature": "c38f2a1e25aa2c2a8e6ff47355b46cadd24c8b65909d253855a5d1bf9129c969383983edc3b1ffb41c2c4c6611b38f3ef0333dc6399452f1136ae775f2e71d04"
+  },
+  {
+    "msg": "a6165a07db77f23f596e16a66b9e",
+    "secret": "43923ac886bc99e799924038a698b5255b1e0978c9a300c67cb7bcae9c0e2c687c53511312ad80850dd6803e1afb2390ed5079d0531a689d921fb18325518a5265399d7e35523a4265510d4b18fcb41639aa55780cb45dedfe66fac077bf4df642076ae3ac1cf50ac0257f055a4ef5bd063dbb6ad3558994c83f6c68d70b7e0786f902fac6e8b6b3218d5458bda2daa30c94fb1b9782176754a1014e5404f81f1f58c49d81ca708c553b7b4ae507d711696cfcb44f76d3ee857863db47cb2e1e",
+    "signature": "d622c4eb02d492f4fe6f974e47777d6225942673ff128b6bc1514c1821fd4eb4f94e6d4bc5c53fe7969247f7994ed8da231b7cadd77c8a9f040a28009e4cae03"
+  },
+  {
+    "msg": "ccb64d1176faa56baf75cec8835bfd",
+    "secret": "f967f5eb8ebe18de5398488632243c1b96b0116b713dbf4f59b1303fc66a1890a0c476466669a6424511074b515d8d3e190c4ab18e7921790d29fb4521d7fefe9034290c793f2941f2c27fd546e783fef67061ee07cd4dff9ec7b5184de30474093a06ac5a68a1515361dc3f2ea6d48c52b66ef2f774a021539ee560570fdf92e127ceb50788d089980cc2607fe4f902aaf1a074cea64e824b7a61a4688a23648f8771e9700481fa669ad86a456adbda89a604cfe0f66707e9b360af5ccd37b4",
+    "signature": "acf17007ae1a3bdf0e29b41a47a56d9e8330092181243b3d2095c82b93b6941389d07ffa24bce9747210beeb2ff77ce80a1f8c58c62f6f26b975e618922abd05"
+  },
+  {
+    "msg": "d7536271fcdca65fc7d4b12b383b5b80",
+    "secret": "7ff7eafbc67ff90b8d5083375e494854e79c3e64739fbb04debd25942c6e9ddbfafcf366e42e52b49625989b0de1298ba5075e5ca2e6175feba72a48fcbc9d4d252a7ac3926b41c25eb0ab50a9126783a199e21271457857a486fb1aba1b522be922e2a15762978abb41c5e44c6e2848f2a7a1959c254d75b449efe0bb43a9a7249764f9a3d7d813726acddfd7c5a6333c42557fd488ffc2ff28e209b164d9342a7e602a1926752186623bf4d20b9dc9b2b37aad9676caa85c6549dc6b17ae7c",
+    "signature": "52af0bbb44329b2e22193ff599f9955f373c2523b20159ea23183d553ab1249c48e453bb73d3f223e4c44afda33ead095f14871d33e5c34e977d347e26cd6205"
+  },
+  {
+    "msg": "c9019d4f4c6ad1939500cdafe12adc7eb2",
+    "secret": "cb74adc08de414a19f7667f13de5dca5f56d3a9d0e5ab08916a2408641d3ff0fb305477d84407732b17550c958866b48a7de5d9670460f0c23c79c7ad961b6953d5dc0a0180de80604696c1aeeaf323e465f220fd0ade040675658b5c518ccdcf3ef9cc90b958d239f65a37900feb91469615c4b888f2d66eb214a41c425b3b84b32d729f2298bb3ce8c176bd8642b19c90134fd2fba31980cc06d23713b17c7d1204e7221c5a16c8cce5da1b8d3d021a7c75467a74fd43c4eb37b4ce07f9fd7",
+    "signature": "fa9429fd50d474ccd39ab6c75eafbcd9d6c11aa2fe4f0cf65003db216d8444da46c4348aa1bbca2decad648bafddd65fbfebe57fb509eda2a92c539774eb4d0e"
+  },
+  {
+    "msg": "ed862b5506367aa330f24a2afc4067efd9b5",
+    "secret": "f9c1cd80c01ed6a5ee54d94afd9643ced7f5de174123a73b9837a7d14fa8df7716865424c3d402d9fb50b3ead8fa89bc0ce41c60bdbf3a91dbb15620049f186b31ae45bdffa68f8ffb86ed89679d7ed431d9b017ff52a50e85df2cbf12cb35ed1ce1513435cbb8b3ca6c2f91f1db138d68c44c8264fc2d5f44f0df563e68cefb65ae9947a9fa72411cc8ecdafd42a5c65ce8ee9e364588979cfa5d130809b80c48252034c921a36dfeca9b1d8701b82261bfee45969d444bc690e714caeefb11",
+    "signature": "0b4cba15b1371bea85bffdf96fe27c16c10ac8e1e3c6c716b5b60781b05a4db45fb8fe481e8201e05aaefc69e4e2ba7f563edfbc8976bcdfb043ebc020e7210a"
+  },
+  {
+    "msg": "e810792e33f6fd36def8e8cc2e0836076a68d4",
+    "secret": "c32f41f50dc215528af2ba0f1f45fd2881b94b2d345a067c437da3053727fef9fe268ce0dc4f4234edaff993d5d55309bdd28dce037118893426beada98dbbd748bb586dbb4c9e3ecd91d839cf8e22ab443769ad9b41d143d84c59b1bcace87a6c0298b94cb466e47d0de4f83b4ce0d8a9602c3d43f2e4560a53ae812613dd1ff9f84ef624ba9aaa0baaf618342b9a1f1f19255856ae65f13e1239d0853493ffda1e26d0fa9c5a98eea81c32293ef0ef1a9773afba2806e36c238b9f11556217",
+    "signature": "089ea0e70356eb61fc80c9a198e6f15ac54b2561bb2cf1e70cf36101a92d273462087c8973d65122474bd12e9cbbfc0bf5681e1a9ce202bab28f3cecc097b80f"
+  },
+  {
+    "msg": "1e833124a6ea8fbdf454393e5793ab9149a76403",
+    "secret": "e437fda4026cb5adaa5e7ee9310c480c5faeeb068c4411650bcdfc57ba5aa3639ddedf87ff83d72197f8432ec47ecc3d2e2cc7d4da5f5d7cf00ef8a4f60d045b992e13236108dc627144a06c8085805bfd3b85e3434f676f470c85792eb899366d615f49cebdbcffd793a1d6dbbe6e745fa7d896b5e6b34d2b0357601a194809fc4d58839978d0ce30d19400e21a7bc4fdec53ccfcf43cbd67ef4436cb941beb18429a157b79737262f336d674edebf255bda8013e7e86dd27c96d37ed2dd4be",
+    "signature": "f0a988f89e2d8861653c99bfb7a392cc08a849772fefb38d3dc93e36f1c6b124b31a14ff4f55d6ce53898122e0acdda11904203f8af63defe50fe4dd1c8f2e0c"
+  },
+  {
+    "msg": "b27d5cc84e2ae4045b1663e58f305b3a49f6c862e3",
+    "secret": "ca596e2610328a4f5b7175f415c31dedc5f8df17050122fbbc7949c3d4bd2371447647a35ea924c37c496a1b614c965b3c07119b9ed04a8c4143e7b6a131fb531c379bb5b9c3fca3a7f0436ef91990e3d45d87fc995164e33621beb5299cb8be635c87a50177e9ab5b0ad7a1d3b9c9a60a6ec5faf03b7fa15a14f2268a706f3a694cd1bcaec8cfc676428ea6cc05bf29fc8e6346d912a1aa79ed159f7bd8b7477d6ad7d67afbf0e35d0cb5db863c0f541188b2b7bb8f48d9ead2bd37155a17b9",
+    "signature": "839962e5545c7cf5d9d5fdddc067561b17cc49c30b2ee25db717763e5fca70227633c126a026493cc375deeafb55be046224883a6a233c9c0103cd45b8eae70a"
+  },
+  {
+    "msg": "a5d9f5791c26dec2badfe42144d3f95dbc1231bdde64",
+    "secret": "9fe167ebc41b6ea2a6849a8b73da87d9a366cb0352d858259738c89e7f5d9bfb49026bde944f9bed4bc7246addea0c2fdcd68e0a105d3d967e74ff63ad047d20a0f197a1791931e893534ccaebe75fc8c6a6e51b142232ede4e4c26e77e129f631700a98410f7c743530b981f2958afb060a2aeabccc6c6567db62a88c23528681da2870b8062f834fde4fcef579e6eed2c2f0739f4bdf8c91cdec13351638db721bfa22ac71cee5c60b0883b4c9e6c2f4ed490f19b76f01e2e8629dd88a90ee",
+    "signature": "2374f5ed0f7569bd9847ce102a43eacee341a31e55840a823bb9de517ee88da2ed6e178dbe3a788c78be1af5c533a1c518b3414ab0a2d366de5224323a524306"
+  },
+  {
+    "msg": "87579e5c092eddbd1f91f32f0cc5b89e0f6eaf2cfd51dd",
+    "secret": "e0ec8367d19cd4e18502ab98878e8d68ace73eaab54cf55d9efc064830639365a09705f8f4805c8bcb342b455bef32fc5e4f7601a1c6b27f7159c05b22bd0cc046dbd898e6ede915816a394e3623139ff6317afc9a5aa092103b07d93a3854bbebf036193daa4169efa71247ce4b80e4fff70859c2ca6fafb19a216085746ad6a477056567837086af49665172fdb58e84b9f44fa4f938b464345cda58715043b67038b4cc6a66f99b47f4e32ca12eed9ba3d227e10c8bf720a46b33441ddc56",
+    "signature": "161c1f4c000093ab623a3bde7e6e40955645c8afc281c3997fc1a65eb037a24c4af541bbbc6293aba31c1074d9023d79a2110fa53b653fcd3eb0cd25a6315b05"
+  },
+  {
+    "msg": "11235f9a1bcb7984dfae6ec02770b1784ee46867ce0681bd",
+    "secret": "54daba1de7bcf7e81219d3952338254c74b45cd16279ac90fd6392cda88bda0724d72fb65a5496a584c77ebe9f8f31d5660fccd5d4e082d802b6e2ad212abb12c9608567837f1181829bf991d99b50cfb4234054d7b31773cae0204e68caa02349e35ace09493af3ee1ed30813aac85bb68165ca0f2659b1d74074b41ffeacd71c1c8c20f1f9b69847e2766c1a8bdb9288737c43d4b169ae745dfae9e92600387634241ae315f3703523f824452ae3299499ae34112cff300691063bd5c278e1",
+    "signature": "6497a69c115107759b35c8c03c0cd777776c805b47720e2b658e316ffb1316f3653d201305d80e1c1216c618a39ff34df973792b68f3b8d165a72cb8d4b4a908"
+  },
+  {
+    "msg": "751a67143b94db7e9953a1e40b253907a9d09c2d974ec0dccb",
+    "secret": "6edee25cde32d7c8d58c88ff5cbcee19d29591ae7d535415db076ef778adbafca0aa2e11e4d650f75d3ea15f7439f47a02d2b2efc008a211e5f7df0c4c9e51ca845b1ea9363a59bb881afdf134dd07019943e0bb67dbbb7e839cf5071639c23360410cf507f48231ce00dfad0b3bfafd174ee73be3efaf617e83150174cb0333b50f185382a77dd887aa2c4eab6a7b301000667dcbe993142160b40cf942d7853af2ef3a6915a954acf52da49794d2654e9d589ae1942e701a392c4b0bc12318",
+    "signature": "d15c08fd709a6990cc8c732e5995b5af4ad65a4a188704fe766f507351f5b464964f3f460a1bad46fc58231afedb469cc56e28d626b6f7d475841748d2fd8101"
+  },
+  {
+    "msg": "2aafe3554262ef9b2a39edc349d37dcd8e72fa7acf6ddf2d41d4",
+    "secret": "b27254eb11d1c5ffa03e1e2289a6e9d284086444b8d8c3b503a0de9af8fe475468bfdbdb365def8b5325beb27c63220b06b1880b9dabd83dc18d9cbaa2dca76aacbeb2ae90fa8b30b0fc57cd3de2a249c1acfe91640e5b47c33d4ef85e7f8c35bae3a76d32272ffcf5a03c955a5e4a8efe134540e7d95241b543bdb2d90ff6ec90964071c4903aa17cbfa87cb68b9da781d4535cfaa4aa2619bceb4f50230f1fca0a20a6fa36539768f090064563449c0af5a2486b25dd96857729c327d238d0",
+    "signature": "8c467daeec122a3039d3956729ae266854af12abb002721c1423e1bea56a8d886d2044754c6fef671fe1f39c9a361497844b8573a2b63d547312f59ffed44300"
+  },
+  {
+    "msg": "9bad5208a067223ffa12832ef6e069d9f7f69219d5cc702717ba1f",
+    "secret": "e8d64ae77805cc78e4a1029a31818773c698ef21a85fbc663b6799194c1dc33ecc18ae633d9a77bbb55184ecadb3beb40d81fffbf4f91680cba75e28dbd4a820a36f1c8d242d4ed271a44c8365e8a12555594b82c608d690c3366fbacab93e2d801dba3046bca4ce9d13b3ee00b4971280567736af8dd6b7fb148f16149c1e79f6534d7b6461208bd022ae4e0c5704a9951a99f8d1074930cabd821d59e46a798ea3936aca33b3262910d7a556471589918d650681e623d0dc7ba2837ce67e5a",
+    "signature": "621a11cd80d47b3edd352fc1950fba70242cf760da50da93d57371ee1767b7758013d29874b6722ee2b01e5aba525fc1799f7c5f13c15e355e307c9b3a9b7905"
+  },
+  {
+    "msg": "4e8d7a10d6e534303d1d67b38f75c3e2e395e98ec9a99b72c989a090",
+    "secret": "d5c08cb59a17f5e0b6aa7b7af6489d2aea1e4a1ff541bb37a1461631cc56b582b165f67e5fab2f07093949726757afe67473d54ef08219e69d2eadc1fe95378a85fa916b697c7b14bb85a15ee62ae7ed5dfba4a4037c8932f5743ba1ca17d49e71bb17cf6208fb157bd2d4e324770275f05e7eb33176d4931f4783f59fa96a1804df326fbff2be7a268cae0c89fc9acd77f2c369d640e18b8840c7fe2aa0f86e51c23fd506bbccb96a2728f9ecad43f3614af018faa4392b0ad5349bd7688e2e",
+    "signature": "c5b5690e5245811bc7dfa05750bd39dc37e768ac19a20b803e632fe3f41082110abe4c71e063a47208604a433a80c05655201d33fae12b83c67807ee19d48908"
+  },
+  {
+    "msg": "768bae838f0bc46a18def9affb16950d3788476489f56ec4346fc57919",
+    "secret": "220a02a36805d67eb0715beea873db984901eb47835da6b0c88a4d7efea92d5cf16e31cd4a5538c319cdd6ce2e92e7000a3185da198e6faa1eaa8ba22b36aec9bfbca6b4dd22fc13e13d01deef2d0f00287f310ab22f7bb1b9a7ff01fbc7183ebfc40150a624e02b5529ff99c0cc90558fd313e113d97e06b85355a37ea5c57d09cbb66359c26d3db1f2c74ae7e8f072a84257bfc00b905a2c9597eed0cb70b7c9f26d6e05859dfc6f38469fb0f95bca85b1ebeacb2804adc61291b971b8bf51",
+    "signature": "275ea8df4eff1604ac40db59bb9f45555503d7781debfff17eae590038de57dd21b9866a2fab7a382028426c0d52bfa0d80ca976bf42f6de9b49cf0494bc5f0a"
+  },
+  {
+    "msg": "a6c8359ae7d62a737e4d310d312738f11515e08efb7370c6e3e2ce740202",
+    "secret": "91bffb1f56f5465654360d8bfc65adfe4239b45f83a8905cbf1d38acb84fb7d1977713ceb848d6a5b9138b539227462cc05abbaa49b1c9b41f071d43ef079c1f589cdaac10bcec9d046545e6e8f43b792a3c97d0f8156a8dd271bae3bc4331d7e6be5000725f4b808a2328628f960d2d5e18c1f0a505274ceac7977efc5901284594104fe848f3625645399d2179e41938e237368ca8f577560461a8c053b770fd1a58851ee1f55e6d8c92f35d65f1396678bdcd5ee4b177c7ac46115ab62a4b",
+    "signature": "b9d9ac4bd686935a79a41288b92cfe8285271d36d9fbecc292528570a1b1028280fc44ff4932f206d77fe202c5bab49ec8f4d87ccaac4dd7e1d425686b83000b"
+  },
+  {
+    "msg": "3f8612623bae5380254c3ca2caed112b46e709c5d76071b040666679aeac43",
+    "secret": "4912c5d1db4dfb010238656cbfde9e36f4b8c184e590c80a87f44c8c134c70b78965bdbc3b0242f7b11e4354a58b9438901d1b091e2ac516733603c66c025812c691f37985dae241ad4ba1d0f08fd5523d55c917ef645f826d09349cb98687cfd9c48a65703c9b185c3e10bcc91a191ec0ac245b1a709826b33e65b9b64e7c74e13a5476b7edc943650fa81fa1f4d86ab4a67c9677aaf0a0ceab2b8eb5443c78af1dc82736981f3a10cdb29a7ae9c669a2a98c9e06c50c858afd8339adcc2833",
+    "signature": "0ed6171d3fb2357bb71437e5f9644f6fce5ac78c8f03a3c6b29ba0e0147b6fca4a0b9942e2b5d19c32b1afbe73f6bf4a2c9aabdd12694cd9e92f1b543974460b"
+  },
+  {
+    "msg": "b56ee57a284369590ab822eeb03d00f761bfa0d10a8a367d086dfadaf382e302",
+    "secret": "a961f4516f24121f0b32c6b1dac809ccc2884fa10a1be34ac7acbdbeeb0e99476ecf8b35448692d96214fe02a64bb7605b240bd54cc3dba9d53d562f5e5d5f3fb17f5820c8cebde3c65f564269ba7088b19b3ef7f4f8c256cce683233e30e131e3479b30ff50c2e5d092eef3067225dc4016a0aa798eec36587a5f358853b955d3cd1b7c0f697b2f0caa241f20e7d72233e60f0917de37342c63668717bfaa38bf19868c91fc3ecd3be9e0b973741f31179b2ccd6a2956889ad1157fa8e6e312",
+    "signature": "91d0bbb4a9df4f9c23e8066dc4ffe8e6aefbdead93cf6ce8066224ca47bfab55b9db6134736a61e3ee5b8282de3eb5606cfacbd48e0cc985c508b07ad9c85508"
+  },
+  {
+    "msg": "7856f8717163ff349c2872607c45dcfcc4a3b1540d23462fb018d6608c737d0eb3",
+    "secret": "572d7d5e452a7f4d25d941aae38b922e40908ff1b4217f2bb3bddcc9c1fd4fd73a3b1bc526af7ac98ca0bd6e05d0ac88893cdd36c4f9c6fa17bc934faee8ba36d7f679d9208ca4692794efb6e9ee957767ca08ac72fb21668de5c1440888914869d4002e204e78053e4749da7c9d817777b70d0b3d20e4b3d5ad84ca3bd6b7ee8f7aa65b68eefebcb0be7738be62ddb41dee83daabfac15ee05d2121f15007a67fa4ea41909362eeb61d223fc1bafe20de6f298d5e2952560fb294a290383825",
+    "signature": "09111de12109584f4b177511fd928f3766214fd0efc12ac1c970f4a48971cf4d153e6d293e991de384eeefab161dc3ed369262812bdf16043b5c77dd782bd204"
+  },
+  {
+    "msg": "53b9e1d1535137cd0407bdaf7c46358ccf50195959bbd1fc2f3521061fa2ba61e893",
+    "secret": "58b15ce561663637eccac501a74896ed6e1ed9d72eaf4af1d80296295c83af83c22bda769c519434390293c4340e2461eb7b830fe48431fff8010d0daa8f639a55e0faae82ebaddb4753138bc0e40a3b0ee747ac93bfa8cd12755ee9e8fbaac75591e72923485117925da924eabd73893ee7034cffc58ce31e75ceb4be9cfc89606d2aafd98dd8674db03027ed70e0468ee7bd03b602293f0c4b0ca297b37305c7751abb0047b0dd7702e65d8288aed41f2bf6b906515dbf272520b2c9c230d8",
+    "signature": "bfe8d910e153d7b5679f95d13107c52d6f04e7b1aacd7890870111dc01cdf08a856216f6d6bcff504de320c64408bf743398fdb27c857b57533305383f83af01"
+  },
+  {
+    "msg": "8b99bb4b8ac57cd70124ad463729dedb0902a254a0c3bb67bafb4d8f3fe1b98930cb7c",
+    "secret": "c3848a872d07d465bef5d24168954ea6c259be10dae4144883286181718ade82a6cc71a6f3ebeb5cdd29dfa60373603c4e36f9dfe8d915633b29fe81e666949a84f6929877248624b21022ce04e578442741a7bd9c011d360e3edc2b4a00a1368252ae301cb89e115b08cf8aeaf0e6ad3ee9b1f01803b165e494d663545bf7c99c0909d6c671612c3620ae1bee7ee8f5fc29c04792726a3c4ee852da5df805999de49dcb1a7a304695eb15374fb514cb62caf28ca60b4e8d4ec4f44bb5698e9f",
+    "signature": "97c4b15e5d8afa06dba52513bba2631c929d00227dc162260008ec9e6bca8d0046caa322bf882f83ce5a6dc5816021829566f888d0ae8ff70d5f9cc28da8ad03"
+  },
+  {
+    "msg": "f2c0f46efc1c29b555ad337093959e9cc654618d7ed5661af441cb7a55ed04cf08bb1a7f",
+    "secret": "015038b0f31cf1019211557198de1ab761789c0307b9318028040345dee89c2a54d00b7c9cdd9ce3fe738380b02badb1d18412e192dfed526131394e6f33d8e180193e7d56c5937160d91d1985e11ee2239d148bc130e51042d82ccd286ed6fefe0322149d215a847583ae73add9c991ca17a3e299d19371e0a61c4a1eef250a2df923ad92780ed2c414ecd41a7e11bb8adffa228399b57da2a870843eff1390ececa0146ce09bd3169a3c2e218d67a760235b8c7d7301826ff931f49234a737",
+    "signature": "9afbdc8f242ce2e75898b1c42e66493cc69799ddde503efd6b2c2213084b562ee42f1feb7e264d4151951984c03b4f95a9522418033b49dfd91d21230e3b0802"
+  },
+  {
+    "msg": "108b2dab73389271270335e1b4d90f53de0d8bbfa348c945580cfd41f821a0d293cc59b14d",
+    "secret": "ff822c5219fcc3bc6f8382ff1102d7ff8a2cf54f7cf54a6040e42dd054abb9a31130e89f5934c6aa463b6f7b81c8c4ed7e17d7cdf1281be298f2a9c7ff9bf92c879a37083101a0ff7386638e8373129d27b9bc6198ba3dc97a68e1f14d38041ae042c6d5c4912ca08fc0ec723f0a1eea32d7cd546f6b1ac5aec6bb86830b8a9f5e13440af2d78de2f5d0308a76fdd83564e9076ca9561354124d53473a07f572f3d11bbdc9b40e15449110867310e489bef13a1399d8d9f19da3374b859677ce",
+    "signature": "c0707c7ffa8ed24b268d1ab89317497cc8074e2ad63cb7fc1b13d8f91fb838ad924bbe88139e1d0bde735cd4999d1d20bafd16dc716b495b77f8573ed263d40b"
+  },
+  {
+    "msg": "46e879732ade4e2c332f808da6e50b27033554bcdf97063a947ea186274741918a9d3fc92e46",
+    "secret": "37c497476f7182a2ad19284576ac787566c4e68ae5327d318969b318c22734a35e60dd73dcf1456b5dae81395d9857ff65286e7f7931ba5d90105cf7aed6e9c45c60cb0e1c449a4a9ed82ba228f7bf655bdf236ce134f331cd2be2b034126d146516979cd5f5a067eb8c01272db9bc982db325a3794e51c3c9363262dac32f9f8a28edfccea80c0fc149c2fb3ee9804b81897b06d58c82a4e662e9f0f4290e824a2e1537dd944458d93e9ae9a4aafb1e55a45cf5f1bf9e04a61282c4d421f51b",
+    "signature": "f4ef72e195402528bf7d77eb727dab27d7d5b34c561c5ddb76698c7df62251eecc875c09faa360db2fa2c168ebb7d0b062cca3a0d6450f14e6d231052ead0d06"
+  },
+  {
+    "msg": "07887316bad2036fbf7a9adcae32290b8ab291efb9f41874a4699889b01783df4db42f8975923a",
+    "secret": "2a3db38560c60fe66eef269fb5d99caa36460bc14846606c754e3afefff38fd9f7a81aee17b52fe284adbeb3382ff24472690f8e69bc358f3103fa4bff11421f5f717da5dee652c9a8360a37cc0bdf633cf05da4b25de390f866acb850314c1c04823cc03cffb5aba018e27465736914b6bf47e82b89fe379b271030b86279162310e53c99aa84e9336f09a18300d9de900780c33e9736b502b93c6c0227e30bd21e7ea7ff7cbb29cbfed444bd63f8c42ee2e4c113c93c5369095ccb5e442b12",
+    "signature": "e8f6f4c29cbe6b5f256e06a333b0ca9c5ecd42fc19e4dec92bc482d88803c9a3992f2a36b52436a990cce98bf30a8e7e030f4ef30281127b5ca60a28c9e6ea09"
+  },
+  {
+    "msg": "3818a8e3cf632304fb93c982285e2ff5658aab0558767afa09b26338dace35f28e3fa36b33627cfa",
+    "secret": "b023d033d53a5813b7000b050dcece766d20a822391c4d6c65930681c83cd1b01f564012738761f01ce9e9133e27cd35b8cade7ff5457bae2fba85dce440c693ee76fe8e67c32767c151400e7bffd2ac4fc6a8adb99214215a18de761980a46d1420358b031d3cd7a97dc3673598f38680cfa63089a2f84272c25c23936b934cc7fc9b0ac1afe4ddfbc2a3db2807ec3a2f0fd23d5d9e7830bb4101d2c5bea3626c9b1ea466a5ccdbb316656c846eb4cf2027977c64118184f2e3e1d72669de06",
+    "signature": "7d7055882337f67899390b66c98cffcae4981d5890f5043bf2e4813e3f5b35a75f5d88a0e91cb15488a2ecb94d163cab82a2860fede7a20c4e5273fde18d7204"
+  },
+  {
+    "msg": "0fe04c64f078105907e72030d237ad885f62e8d818b04b4948eb30e06aa2e23253a6412fa63c177e41",
+    "secret": "d21708a11d62efca1b4d826bac250ce6128c0ed063ca23ce74d6c69442a9c0529dc0e0366b1cbf7f3363e582e603fb63730735c7cec509cb65ffc2d93e72e7aac2c59e1d6ae40c7765907db2efa694eece3ae093cda6fdf9104cb138557f8ec6f36ccf1e02d652aa1493db60290189aab5295cb3f4ea9672da8bfd6677057097cce31da2fb5e115619154c2c4b15eb77572869b3c0c9905a34bd5e7020b77232a57b05cf0c515421e33ed2f5a5ea861724db76bae296cc09feb6920f4177ede6",
+    "signature": "c030a2213bee079328169f09da34190559666bb83ac8d8a3846fd777aa56166edf9f99507d21b85966374a0cf709c8912addf403ffd056c22f0436e7418bb807"
+  },
+  {
+    "msg": "4c641d9841835e1fc2cc1024e084eebd9e9297f6bfdb244033a97cbd66df1d9ddcae75619abb1fb5872a",
+    "secret": "137123357aab6c25c1c1d49e339047abe50c995cf7a7e2f29ef4be9f80340bd7fb7b1f8c8bb75b9a8c1180ef9af6877cbf1d10aad19a8f2a7c6a3cb067375ef46c77d2e5ea80bd5e5800bc1506333678e3fae746c9285a5a25e967817ea9dae4b36aff7012aa84ca4938a426aabd460dd20ee8e6dbfe9b6a465bffb40a22c04a6f6898b9d2cb1770aaed84ca505da527d078daacf5e74730ae38067f03963a125e817a645090c5c5ed3e63883ac09c41ff8f632a6d06d5e45d7b5be0acb34980",
+    "signature": "e55d4d724b582a83c3a0b57d469355d3d7ff1aeab31ed4711d5f66dd8f988f213908c1ab1cff483daf1ed9ccc2192b76116c6ef390311e8a8c4891984323ec0a"
+  },
+  {
+    "msg": "55562cca8bf1a6f8a107900b0abad5cdafb6b37be4320003aa98007d392380d964d572c43af60f44b73c44",
+    "secret": "c6d15f49c920acf9dfa007973c11294534ce1a0b011a68f6041c9396858db0fe013bb210b9c395a75674b57c9cf68130ff95150bc746708df37ff001a7aaafc52f857434e6631519c3a9ceb88d8c163e84aa1788772009cb7d9ac3d91543195df35f2f7b48d1d04d82c8885c2f89d51c24c3327d6c063e22ac029af3820d53821a5fc9afc442ad6755ccb77dc0f6d02d18dee7085d43dfa22943808c655d81059a35b55196db3dc46cbf72dc28537e70e2817ede65d1434c3e00034271b1affe",
+    "signature": "0332eb7101def2b58f0d59593cde54b36d1a64654404603f656706fd2acc23a622d186d129b96fcc202eaf9f27cc5cab81e2120adb7782655c505a6ff81f3409"
+  },
+  {
+    "msg": "5a2fdf7563200996500a37dab893ff2ea7095984877310d301b07ade72b746ebb9e02a41a740d7111b8f591b",
+    "secret": "30788c4f50f21b2cce6a75738e7f48c286d15df2d300f0183b0d3c1eb15e66d7d0a6fe7d715335f98e5f7a682a8472688bd2376eef5bf1758f8b8288336e507cb785b786cab5c7762305a9759bdd66827b1632e2f36f5aac41c9d4b18dd0f301c74baaf5f49cd02a0b5059b3130167d3ae8d23785a99b1f770d6ec05731e02aa1353247d381100f9e55e58a9c2fc048f8435d4a6866da2b8f49ac02931fd48a55417cfdad8d423e09a997f094448c4ffadd269e9f831a11114a6a3794eeee491",
+    "signature": "16803aadeef8eb7fe0127ea2a212646ca774f1065a6a81e495188c0a14c2f48cb8b043a0b90a6be54500cf0dce2d4115ab19ba4b54545f21bb17008c54c2d508"
+  },
+  {
+    "msg": "4b680720b1a0595ee2be72e5de4c50633390dcf77eec07f1d4e472166cf33af9e78506f8b6644021a225792456",
+    "secret": "504ab3fa5fd0929da987044f182bbec693e2c3e36afffd92c148a1318326f98ab39369f343d903189a7fcf1c6e78968ba26412593f3d9530499432c30581e81356e1f3a74cbb6c55a8a1bd4a235f761db7533418f15f90922a7045637e8baa42ee9e18fdc809236ed4fbca499e5f3e1ba9ca9665fb184ec92caee61bc24df3fd3cc8c078ea382e2fe7d31b59911777d287c8b346a9354390f7f16ad48d7467ca84f07b99983347077880cfd9ead567026cdb48a797e7e34a03c9798c1ebeaaa7",
+    "signature": "1e45ab548e871480dd09c9f8da63156e2b0111a562b1364eed490646c843d127af8ae26c6c57996644d92aaddca9d463adcf0c9f9e5e8688b5ddf0f920312e00"
+  },
+  {
+    "msg": "23b6820724d6baf31b7d3d63ee2b1ec25a015db6c5a31b540315d6f87f99ef39239f3ed39f9ed51bb6e1452e00fd",
+    "secret": "f5ed74b5ac5b3f6b4bbbd0e3dfbf84bd359ac8327ead8dde776996040de6dc893193df5f480a3784279c38220a4cd3eaac13447a96cb60d154b58632331e355f039a39db42af711a8132ade75d3035293c9921a8bad471cd04e1b7ea31f1fe474910e1eda214449c60aeca8fe1908702a574dde5981ecf02c0473e37b913b14fc6d77df452b99d0981c0fcbf7a9b9772627ba9e9c8fbc76281889d86988a8ae7c28558fdd9a4174cbf9a5cae26a24e5e5f9a52b29288270153c14ced1cc79962",
+    "signature": "29e428123aacbacdbd2630f423656f15d6f8676b84e3661f7d77fc399c056c78289da0570eb6ef8d78fcd5d6a9822678d1f0728238b06cfaba50b5bc2d06cf0a"
+  },
+  {
+    "msg": "6ccdb49f0b759ad8991465406ab943e497bb0fd9abfac4709c703b98b18e3e114eff01e4455f6be76f5f100fa0af8c",
+    "secret": "cb7d348bf471045822e6a5c51afaf9b758ba021320bca8d52cc2117d99cda103a98d497a17cfd4f4b076e7b09d496507a31389f61da8cb9f262015fbfaae7c9ac964185695323879656360a97f2b9fa2dcc2fb93b3b3a0f7cc92d52701cc2a3135f37cdd64d5a04882c5607238a041848a6fe0cbfab9ea4b0404d463a2145c8833e52912dceb6af540daf7ecc36eefd6601768712663ec8e05da8a1148376dc080d90f5a165b0a1fef0ee4fc7e9e0b1899fc093201b6709ba785e4b0a204b020",
+    "signature": "4b559efde2e70cf4cd01260830c957353ed1ef75b97dbb52d07ca41f79aadbe3234bd7740997494eaec426e2a133ed9b6b1f9dbd3f7a38adb8a961f1f2bdb009"
+  },
+  {
+    "msg": "32d82beefcde2b010f6288c05de8ded0513eb5d8726e4237eb1385067cebd844a5ac72fde64c5b5c341aa6b738b66ffc",
+    "secret": "6da1fb40bde4e86a3e86feee59b3fc1208fa85b69c8d22914bcc54293e8ccfa9d25140a3ad0201e41ab94b7fe43353b760373e637bcebacd658df5bfd12634f02671f6264aaeb4703e8fd99a587ade60cf00d75400eb4b81bde5fe69c501a3f1e5176f9c43d8bbca604672460b49a1622e1fbb3ddafe18fd9b147207bf0ee1574d557e60206731141a3818692c05eb1d408d30844100c5d48f502216c374fa359c74cbfa7942608ef4e65c4c11cb5d462ef757dd9676f8b24a5e58f1d59f4bff",
+    "signature": "9abb210a7a2e5dedb84cba728686a8035c33dc1069ebd4609e6ca9b3d23d70e002e839e58cd05841222e2c66a0a5bd558c3933dab12f4bf2f15211add719900b"
+  },
+  {
+    "msg": "df0b1b4bf17a300d8ac3743e710fa7cdfb4d37c8c9caccc870e232e96b87fb661f586f542aed5c885c71d6874711b458bb",
+    "secret": "bbde4e1f485eb562641f8bb1623ed9905ab11a208991953ad9fce1490763bd267edd302b84cf10799561dd1fccba59d66be9f02141a0465de17baf6768741e905f1dc35d65b262f4fbc416c6db33de19d1071c7889f700b057461775544dfb7cb3670a0719dbbc7cc42e4ee509d1a4515ab5e4259878f05b6bb5c1205e7bc34841c36d52f17fecc916748a6879751370b2b1c5cf5d5d04592fc48a7dd8068135aefcd174719c6ba720cc0714c599b6ab6e3c8724152b14c7ea2ea37c51db5349",
+    "signature": "ca19678146db4221b3a5978c0b3898192b6e209ee9122f05bbf13955283dbec1b774f367ba23a20223d8f27b419f84b21a7b298840c8a72a96c995d1d7109b0f"
+  },
+  {
+    "msg": "",
+    "secret": "a8d01cfb7876d15f5b62c0a4766f9c6380d28ab5e47fea14c1b6908eb73311202f32d503d7cdbb32bf9201dea3ec544ceaa0e4b53fbd855686b0512ca4a8aef02f3ed741a78fa20f0e4e93db03b98047924cc8fbd1061f9f60eaa7393811ba790442e1716dd85e3e8fdd894a2fc88b31cd47a86e2a538a66d56827be604d07aee4c9cac544d72c1c52c51545a895035d89f9894e1817aedaf363d52ccc30cef31e7c35b9368c430434cb222ec1cd2354da920b2478dff532904b3f9482da55e0",
+    "signature": "be9d4325caae49d7b5f7682b1a2024d458d010918b1bf445a528fabbb81ad8ec5130cecf14f5c7eceae68811751d33335b93cc4d19eb05fec509b7173b1a6c0f"
+  },
+  {
+    "msg": "a9",
+    "secret": "20b1801f0f5838e764079bdee6a6215ded32534492a9361275d0e2bc8278c4a373c853d301bdeefaca3f1a3f62330e52011bd3ae47d34efa271ed48fe1c934e9022ffb02650e14c30e83293251a0c13ecb22524813577d2c480cce49a56021be57a243211cbf7aaa9369a39b19ebec7e2f8528f31d87b51cbd01b1e4ae1f999fece3bb8a01f95e5d3f1254dc68ec414744b62b80be4db298c63642cfb13847dee35d454b709343ea54db679b816ea735e801d414a9fd5c6b96a5a2593530eaca",
+    "signature": "ec302a75a5618fd6b35314a774dc41031f069bf3c8d4a3bce75cbeba8894de3e4f0cb72d65db4e82c56ed8e099846e781cd07ea6924d1713d261906373693903"
+  },
+  {
+    "msg": "c97c",
+    "secret": "7236c9db5f02bb3c1b5c248ba9ec9eeb1d28430df8e8ac65c82666840284bf06b1ad8bf10ac63db6b7b8cb51b25593e5f3cb0132fe10c915e1043ff1a16f2073ca497510ee0195ccf8afd8657b7bb21419a6acf3d9de7e1e2e40274b90d635a80029368d6ef79f6e78176da0b5d25a763f242e5066ac6fd9672e1ecebc0e9f3a3a39e5f083cddf497aeff540f736b71d26cd0adb827169699869057444b58eecdc68ecdbda98228858623af51ddc575136ac70963365a8bfe753d1d90553548f",
+    "signature": "a407d8eed252ac5b351a2d5f726d637bac6ab400d8513f1ef1d1e70f9fe5fec07719d18fd02a52497c88282b9f04c49143b09db6b5ae8a3de246d57d7513d70a"
+  },
+  {
+    "msg": "4cab09",
+    "secret": "0d6a6e065691b3d83150b1ead638f7605d166dd3ceab9dc641134529c58f57d63f469dc4efde9d0f4e881863858208747178c5bf4cf135f16a41df9531b449525083cebbdf2d084db7d11f1d53ec07aaed45b88c959a19d1c039a86c3cc6f22fdda09228bb78a59c4ee393821f7c2fdd63eda40f7450bed8a52a9389d4afbf44ce8cb6b9a8c7adce6d93e1cd738e5b43791ea4df8fd649f5d2a38c79f13c218706ea9118a921960a9a6c64f9d3b3ee719a0aaf7e276938bac654561d12985aeb",
+    "signature": "02573562c88c156d0c6fa236d72673465940eda787019ba398ab8a5991f4a7d38da2648da60ef9e5bdb18c39cd1a5f491195321940b3a13f7d60a973c803f900"
+  },
+  {
+    "msg": "8b931b7c",
+    "secret": "bfa7fc6ad48ec458d713dee4650de23b5b4ad2f96fa109c3e934a4c911810ab82dbb5725b8d6aa7acdb8ce5b1a157dea015c903789a66d13023fb2e7fbf055448cb9ccdd48d36773e40cb5fdb5a1a4a3eb5fe1f5bfb7137f3ad50942c661562b221b2d68c116f7ad5d21058d898c6aa03415a1224b95002a9d6459ebd25d788aa9a9af508e0167495e14d51d2f780cd28c29a18447a882c872cabde8f01c7ac24afdd16c7ac6ec6edfa6cb738090c164f75f7d7b8b61624077685a184c92dd7a",
+    "signature": "e780eb3d712a960229164143723c1d1438fb46ac81e7fa2bca52f8035dd68aa88e1ab7d9017f4d04c7d13a73708c9255faeaf26883b664f3d3e155e2c85ec30e"
+  },
+  {
+    "msg": "86f790be7a",
+    "secret": "36fb426b68453982cba6c20c8a228c438821a235ca5968854a9f8ed7fe2725e03c73c9bdc1eb08954072b5f58b2ab364ef4f3183a3f421ec2b2036c8e1599a95c8c642e9f460d15ac8c4817d6bce832916af99e163effe51cefb056225e02f9996f29d0292111caf372ec14467c2bbf561ae5198c577820ca8a61210e4d7018afa7bbcec396c0494c14d3f11f49e0758b2345fb0aba90a6d291d320cc073a4827d714a6702d4c281492998aec1749853bd2023c473b4d85b40e8d1b84501e062",
+    "signature": "830a2ada61d86ecb37d2c94af017249a6518a624948513a47cb69a6bde67ef30c1fd19a3e505f94cb14af1b9d3552a19005b93c8b6877be8e4e8c72be3e7ad0c"
+  },
+  {
+    "msg": "bea477732cf8",
+    "secret": "2337f9fabf72d2aa6aa739f26aa02ae98d642d2357af13d13878d11ffce779225633c671d0f2290d8779545d2db7d6f23b05333e0fe526c6cbe8b4e0f2b13d554766016a9385f76d22b5df1ced288e61caa1293bd4c52fdad263ba36e25ad12c54ac282d39ab94b7632db4bbd8bf944438a258fb8334958fe619a4b18f3b515e2c0c27a39744972438a0952d7eb9c2f82ed348757387349c00e3b0196efa7bd9dc75a169a11f00fe9fba0b7a1db841f0505f66d2d47c777c40a51804d007888d",
+    "signature": "2c782fb7284bdc04c7cbffb92809ff9135a037a98d04e30f47ec53842a85add630889c9a2aa93df7ece8c5f17be9d4d3339e61197506535354dac187c23aec03"
+  },
+  {
+    "msg": "f010c6ebae848d",
+    "secret": "ab43923fc2459dac5b457d29ff690d318b6f4c5ff1529d643c9949deaa9d3b846705bdded2cea28cbbedcc5b97cb9ff0d5f91134cfbc89a178cb783ef9e0cb8b2b3f5971dbbcf81c68304e75bb7a4dc7d0368d00f49180bc738aecff0a78175193c2394005e8c5730437b72f68b4a8e0c76185cc380053afedce381c3c908513c650989da1ca4bfb65ad80550f5225b407974e28fefd15ebbfed2f33e68f109a0cc8a2509a0387214a53b7927a7446203a7a81997065f4b7cdcc5c0484fd9acb",
+    "signature": "91906afc1e7e69c87a4f5ae0290b0317db33514eacf3b5d9a792b5d53883168dae8713f285018e27eaae82a1b9b3e96c99866c6ee8a7f1dea787f5652d49e502"
+  },
+  {
+    "msg": "922eaa2ae657dba0",
+    "secret": "c9e6c5248932f306efac7711ae0852a924324bc03350bc6545c49b8a8a5021b3b4427e8fc5923b54ff29f0d53bfc0982d30b73a7063584243b6acb1c73d1246f40e63fd72525c7b873bccb6f0a4fc7751d6663dd4fe5624c12f2d55d10dfb6481735813eda95c6ea7ddc675deabd5eb0732bee0aa38f590e95ffc8a605c5202162b114e9455a02e30590141bf6fbf41127286659d13b0b308e3089090b067709cbb1740003e02294107ebbd9e12f9012056a73008fcf6d7858c9b4dad892a40d",
+    "signature": "319f65b371305a0a0f175f0782cc51abf0930c079a64f026a1a4a50f25699f41c3741ab6769ebf60c91b117268cf96fd0d562ec7d2cd5e803716f6db113dc60a"
+  },
+  {
+    "msg": "7850f57cf9095c58b6",
+    "secret": "77d6f071e2273f5d43b17174ef803cbfb2c448353121bb8dba819b3fbbb2c13a1df356b7cf340baf54f8b79085ffc7239551c9be6a941cdf2ddc15c1e9a8489a91814f3eb0c45b9e6cc3c09e2580c46addffbd0832162a2afc55ca6166951810917aa2233b37e2934ae2388d95fad91f1d33e75b1c991bfadd559f1731e97678c517a4c29b896d98d308599beaf011b7d4d7abb7ef5cbe982bc50987cbc117b78088eae2f711da4baaa9b9fca394756b8fe801a7c8b61039a17d61214ab915af",
+    "signature": "7406da5caa09b4b676c810fa01542b09cc27113ae45612e2cca9d7a283aa78915d5542639bba11b4829b981e606ce8a95cfeff93e5cb04e92feea386d0c66801"
+  },
+  {
+    "msg": "91fdf398ccfc9df4ebf4",
+    "secret": "5e48201d43df5027ae155d9c5433c5f133fc537307d5c09fcf8ecb5d0ad6c6c136a2ad282f6d09b33abecc09d046cbe8eeb15aa122b99933e3d287f5bfb9a57b51c79331578d3f5ead9eb7c9050c3284beacb4a4292e6d13207211a8dca5ea197f143d37bc0c0be1943eafbc0b9f5c412a82dd92d2a3a2b163af5270e3dbf1dbfe6c9b606bc0c16b841a9dcfbc8bc2e1f41ca1cd9ca28aace9af34330513926dc06ecceadfa0f8ed023ceb82cd268b64d8c82d91f8c3ac13fe32d1c5888f1539",
+    "signature": "8261793320fe8fa4b4b14a5b8811215984d99aa6d8e05ad43a12a6026621afecfafbed7b9885c254fa34a2f59824c06c373f1fe5fbd8202c4e1080d4ad2d810f"
+  },
+  {
+    "msg": "f8a2cd15d1c62a3848fd1e",
+    "secret": "9291e14b71689fdefe68c8638a6a83e00e28682b332af6df6272f80d0fbbbf5c9ecb82fbc7588b5a1096bd07c69b01bcdaa48c6621ef94779e3212737593b56e9b47cc26a99bf36890b865d3c291d3fc3d373c830781857b31d8e72e438ea3b4281fd8856118f3a7c1cfe53bd5939eb09278cfb055133abfbc290598187736fd49b59ebc17abc21d639cc8394ff290a7bc156f42f9efb71b7d1d4a50ce1a699534e85b57fa7930dab81f9a260a5b5aac74238b2df884e4d3dd4094c536d059c9",
+    "signature": "9bd1fa4386d646e1a4d7f55bbc0d7acae355d2487704667a12a11f221fb23eed70cdedf5d171e9081562dd776ee36af89a46ed8d330df45b8a12e9dbf02fa00b"
+  },
+  {
+    "msg": "bcf513ce24c7ffc7d384edc0",
+    "secret": "cb544bd2a37241387f94839de3e001e0a1e3b214713123b55748a47ad6c73b5e0aa9222a2029158fd950053e12cdfbeb4f29b6abe69f2f941d9e58b5da76917ebc9e1aac756f288afc60c7a60ee3819c46e0724bea072de769f8a748fdf553249619966046112085a8f50da3c56827bde3712e105b4493545142a2347c957fd243a10f0d977a6232d6e39058218431517c47daf43ceeea1da1c959c984bbd195cd90a0990f7b89360f60b8288069e8a73a48fa6df5851851271bfac68e17812f",
+    "signature": "f3119a323126e33d04dce0418ca1a092607102a6b7280b9ca18578911bf9f57546a0c0370a0586bb9a0a4e6dcff1e47d63dc69e62564745782006b3920fbe400"
+  },
+  {
+    "msg": "fbe55fdef48015bd8d33f6daf9",
+    "secret": "d3f054d148b6fd2e1b26a747c380dd0f26af9cc793763d32e4b42c980e7b6a91975c58b117c54ee48681edc69910a0f611b49e97e77c4dbd4cc3f9e3890cddf807158424c06cdbe48f2fbe9aee503c233d5072950669133f55f40d7a3ced9551101c220d1fee227307039cb929ca8c5cf673d5a2ddeb22893451b06e9efc0f91e8927f9a62a1b7f200ad19c598a25d08ecaf56c8597d711befde8d2c66f19045f279a6132cd50db577addb284c483fb70a9f9436e59c22cc1238fd5869b8c58a",
+    "signature": "081c392eabbfed9fd8867c03e6dc750d1cbccb0ba6af60635ae2b913e73e3a03635462b5918347a352c3fdf8d392ebc06921143b16097a4a1688703878552e07"
+  },
+  {
+    "msg": "e851d8bf9d41d441e3db9c66c094",
+    "secret": "a101446e8105299d72de305a371dae7ee83ccda6b28458d8f40c2987c3ea60c3b5e5207b2a02a267234b9d90f7cd84ee4126280d3fc1a21332a167d64d0bce7f488d4edef4a83c06262832042615872d4e080f76e6902767fd4a3a542e696f3288670bd60e1f1083e9b956b6762b04c493d95c75cc6661e3d5380fdba03425cb6892fc601ba613f302c8947757b541d90e9f2bd08390289af794073d5e11f401c4aaa0bb71f60c509af5162e06ac8606ad111321c523d6433f25a64d80d568ab",
+    "signature": "60f2b6d7b7034a6ca7abc289fa286aa7c16d746cddf2f11296cd2923992cb648a835cd9df24db7d25419c4cd50d1e2ea4f79da6d2b24dc73fc69d0f08b2cab00"
+  },
+  {
+    "msg": "780812fae55fdcfe2635fbc367cb69",
+    "secret": "917c05ed4dc708284b50e024e930a94f2e8a7264d9ec615607c179fc77864910ad2b9bc5efcb6731279a0a20f5f7f341e9f22bc79ad2fc3f6aadce3f9d6a523649496a5c03c2cc1ebd0bc6135aa17f73ba0ed6c14e94f3929b8179ea7b2e8ea3d7035b255dff6afe8738f86109e2dbe8353062b2f23bf398f15b2159ecc3aa737246b0eb5729e626371a6425ff3c130e87c36cd2f4936de91700fdc5b24f0cfc998a9f292e0fc44be62a38afcfd201ffc8a152f88223ce5aa82e1c7c129f5e38",
+    "signature": "d7b2ebb5a2a840aa56f0e3d8c8b1966c64bcf38723d8db4350b92877cfa158447b084b4508c53eed9f08cfb2e39ec818225b744736b5b114291fbfae7da33c01"
+  },
+  {
+    "msg": "107165ff738bb612af6921c65232aac3",
+    "secret": "2d65ddeb2c0e1b4a7367f48a75558a1f845aa3a56db721e89d1adf55470a909bcff160c3cece6e51d6a320a286985c666eb52586c2c8adc0e83551748f3ae1406b9608ac34a13fc8aba6c0ea8e03fb7539c5e19ca9b27747f179210e1fd112e9fd37c5fce2c177ed19013b29b0bb1cc2fbd19071a33131cf19d1b778f0840187f5fce23ae74e362b254f78e97b1e4160b81a4a6971ea27b54a3ebdd5989ede7fabe98b073c47e2f98b9792d7aa1b8dd71e0f0263ff31085574a5042eb3d88229",
+    "signature": "746a5521def37b51cbcefd830443df40ca41423964895ef2a94992d02e28c9aaaf89d46a0ebaea6e16fc334f1a5a237db95104b8b60daca833e3bbe1f435e303"
+  },
+  {
+    "msg": "550a1cbea975f16127b5934aa11888a939",
+    "secret": "829baaf00005756d581137e5313526cc7040c66b7885dacf503f8a13c0d40170b3ce8f6dcb7beafb8d26319a0ae16551f773a8bc7bd9340c8f1c017ac92ae775ec2a2479249c35401b5dfd48fd9828e783c08c8febfa81c266d3d56efe9a711735c44b02bf9bd8973d1e21939bfb4131f0fdad9557581a0181613681c3ad864bc1c9ee237dfbd60ee1e16bd13a58bf481f4ce7157345ae98b37aad777d926960aee6aa69c0f0feecbf878d50b29949e60e9fd67f699dd89c5632439d121dac10",
+    "signature": "7173ae4ee1b71ca289ee2ed3bc8db884074da413449d32473eda8189b26b67f76a8ca1a331d32695070c25e98906ad7cdc607e80ab1487acd0b9b251a6d0420a"
+  },
+  {
+    "msg": "d50afd74b12fd0f92b33b6b10288e2e5be49",
+    "secret": "f0938ae2badd1574a707181cb24eaea9d7bc90837c602a5cabcd2201d1f56a02f45e375c07aecfb140e20a47221706ddc0c89af357a3862da6e0e4f732e0d7100cd3e0a2b89ed88341893f3a2830ebb1d3b1fc2d9dd230de49bf1bdfc8e5aa9ba53bff80da56af146fbdf7633190247ef443aad8dcb101feb5d40bcfc9e8cf636ffb25dcb9fcb01099be23cf703247560e5af865ca0c385f80849f7336766f7a9c234c92ddf49e7bf61636b735e59683a4755a893a0cfb9b55e0486e7c4b872d",
+    "signature": "7ecade303cb3ebd2f5b3cc7e7d0ba186a96b1c4c8778b8bcfbf69f735f48f0c5b70eed98075adc76c888cdf22efde5052caf29c635dc767bd33188d084d00f0a"
+  },
+  {
+    "msg": "0856facdcaae8d0a1910d88573616e5dcceed7",
+    "secret": "d5780692f494d450e5dd93bd9719d68e47445e0b36b6e1e3b3c6d823e2b71effa6e73d6c6e90810485cfe919bb837bc90e84dc6b605656870fa12d4bc052fece6d0a12dcdf206e90886439435991c4cb345785e3fd5cd2384d125e65665d5a3589ecbc40086ab208448bd92155c0c768403a99ed2d5caf23fa6eb3838fa9a4c7ec9b71c2085cf522531b7da5eb43dd98171c6927b9f1d071ca98f4fcb2999dcb06cc6cdb9703e8c33db2b2658cde41f94c7ec2cc139f7b615b258f3d4a963d6f",
+    "signature": "aaca14a602ea801c3dbbc78461153aa6e0f2324a3c71023fa27bf1366a4018e9ea8d67eb1fc801fa993d965f0730a9cd8e3650a23f56daf3d6c20c26ea24ec06"
+  },
+  {
+    "msg": "5b9e415a91fab5323909b1e261554e6c47f77c34",
+    "secret": "1c968b1c87f566d5885e126cb78ca9c03f3bfde0097454bdbdde3f694e1372f6f443d26f9e037e4627b7a20343e0f302d0652bff824a9f08f1e1f9736f282aad3c4c86d707c641f768600457d06c6b37b8527397777ae1332d4ec94f9ada39ef04e1a5895a951a7cd3ddf380e7d34306ae238f8eefcabafb7e90243e677f94c4ea6601f52bafab2dd3fd896c39d1cdbad5069739ff853a64d2fdbfd705a5eda3ea6b50c2a5d4f72329fff52343eda89ac435553bff5a876ea485fed5ebecc129",
+    "signature": "1c4f6a59d38022c71b81b8e460f6c40a880ecb474f973ab366453da652134e507290031a8147d71c511e38d98054bcf3d159e5592914340d81f41b44134fd30d"
+  },
+  {
+    "msg": "668174e03bbafdbb94401a377028fdc56c1bbe6194",
+    "secret": "f15b45a1d326a9e4414f83fda3434e8381dce9bb9277fbf38d3fc456dd79a57d92d53acbb388c99b2596d31445df3d67952439f37657a0062bcd6281b569c1f36f5215109b55aab25bbe6afce9ced642d752aa14a94ba32339d829824674aa873384ce0ed511bb1da0894e64ffa8424b2cbf22f536d61cb2d74c658103e3a80322f3da88f839b6129091e8b5a645085726674ab61731620452aeb1216e568d84bb4da5fbda065f30878e4143d369dd46adedf9321fd4dd18eed41f395b260c4a",
+    "signature": "04b853d023894e8602de90da189966674e959fa01501957da58d24c86eafa39b688d9c66712c1eccdfa8ddea5d2b6cc5d461fabc9bc356d2bd7822d0115ee507"
+  },
+  {
+    "msg": "d8f1931591cd7b1e14caae6b3993753c0dba71b2818a",
+    "secret": "eb5097d43af0b624e99ed26dbace0ea17b1c92e151400f2c041a3a296b0106615b80a808bc7986cc3027971be32ab1f61c779fbc039c7567093d1ac0c3b5037b44bda634d98dd07cc1ac1dccfa4378db343ef9fc905faf4b610601429a019d554dca3142afe4fb300e03d0b26d66ed6eb53c8514533220acf5b827c2bede1d51c64d17131b0e7465d41437cb46e72b5b9f1906110fb89190fd735cb9bc83a0863121c9a54a76a3531c074c23a6b26e14116d6513d57fdbfd7faaa87f08e7ae6d",
+    "signature": "ca5d633736ad577357a5f82123b95430bf735f9dfea3a64aafe4180c83b11cf6db2cf0129db51fc9221621f4b793a73f2fe240a2b2a985972279304785edc50a"
+  },
+  {
+    "msg": "6a438d306b1988bc913c97ca06d9dc271c17cc6a33531b",
+    "secret": "f326b716af7d10e3cc64a327c2742e1ac1fcc195734d8f84ddad73738c9cdb545c8a5744bc582fe3112fe3f1bd42882278e39dfa6c09231a7ab2589b77d74e56fb65f7bf95ec9ce63260628d6b4dd14aa65616c1ac60fa8c3d2307542ee05677eeea392c7e2539ab18f4d6b0f065064f59da35b8e5ff0b62eee5417adb1750747a7faa9a88547b10729f4f4c348e44b295bd86f2771e6d05ca139167a3f94d0ba961304fc3444d6f038041560eba68fe749a4b80620dc61c3a5027d124e9c911",
+    "signature": "b46c519f9d241f938c6baed47b8cc6097a998f561826607d910e5c91a7ae4122aa6554b992b7edc88902268ac207c69b741d336fc2bfbac630006f262c7f040e"
+  },
+  {
+    "msg": "04a45dde4c81dc636978196820b935443a45451cad41e827",
+    "secret": "7353d18f2d635a640a861532405ed589e2ca16163e6a4696622f937d6724fe6924c370ef8b86e836b5c0b4c3338472959faa5cb83bcd0abab427fca8da6fb07de2c01a8b72ec9cd01437beb54880c5cc581fc344de59e9deeec0128c5845f74c23f8ca3ab2c9d1c4398dc494b7d74121f92842684c84179b6916c9930215dcc110ae3768494dbcb10512b216410af02144c2b2caf7ccc11c129dc1ec7f18e86d96c397ca4ae24fab9e4b098eb67366d92ad86770922f29990fddab21072d28aa",
+    "signature": "46b667bbb3c33475835bb2a05d6c11033461d4812d3dae6426c214cd9d55a2bf1e3a6dd2496631c0c18457bf55f675ab2aa5000c1ba2aa92ced2e279d3fdd60b"
+  },
+  {
+    "msg": "1cda2d715263cfd20ee44aa5b3b118e1cc0f10442d7cc86067",
+    "secret": "3bd820d166a42fd7b74e7b8a5ce8a368758eece8a46054a1a3c6004c5a7545f2a99e942d38f1e928f35070a4036807df867fd0c9116c5ab14c37486516c038622e8bb532096b1b1c39c28297b82c89d4182caba6a285e4ff9c1a3f73b9efc391df14a2c56ebd2858f9e6340e3653f56e1f83e57637d36318f6e16a935c2fe96bb44198fe2ec4db6b6461c41f87f6ffe7b854951045cc9bcb24381029a8d357b78eb52d2b2c594c716d4c0b4b6416da353d818bafc2c114f137a44dfa932a615a",
+    "signature": "aa5ead9f659f9aa6266c4b63f1e5e48aebf1a158d851bc5b50ac7697a43e70d36b1b512166b1e105c888a85982c4601d017e78f3db53e2f356921d0075cb9803"
+  },
+  {
+    "msg": "ae3ff11bf8d155641f0964050866f0dd1ae4b2231c55267a7391",
+    "secret": "d24545096331e08049a4043583aa8adce08a9bc8973bef0719ea0342bf29abac37404255b20d12e86a0dc096600fc1bc5b6e2d755d8818b6a6041c7a09cdf9214f142f1eb8d2814dd9146fe10e25ad23bae60bacf02c3003e2e772a1f7dd848d2d0d9e8f36d3cf10e6014ee1355d544f79c33f96afe0f3dbe3d2d13d7b8104bc5b45e03bda8ed5dbc5ac64f5ba10edd314229143814483dc611fb3a39f5d526dbf5ad29b4ec9062052737cd617c7bafc524fb85422021fafe114e25e21193c81",
+    "signature": "8e9cc29bc290cbcf92f801814238132d17c79eea7924e2f93493ce07ecfeffdf545f1cd61bbdd4fea43f2af323dc83da8ed73abb275ccc69c06c7b146700d30a"
+  },
+  {
+    "msg": "b3d0bfcbadd7faa75fc7612a4be8519ef4d85beff169a8e9b902f1",
+    "secret": "846c5e198fde1d9fceb81781c1a126f2e93a9173a80ac245843e58e2d3b886d13749f59c4de2122b2a175f5b0f7be33723556250e078170b83fce2569f6bc86d4967672645312e0f915e6ad43dd892ab15b237c7946b1fcad7b38e9f3469ba0297a4f5a877114f184df580475ec17d04dec5b57a37c65ff044c3fc4ba58a230068e3cd848a5cc1e0235a764346f9e5c41eb2ac6fbe9341bc054dc19bf35ba72c441eb69c61a93fdf36bce5f98f0ae7c9644e7c5c3ad6bcb7ac214adf4f44a6b7",
+    "signature": "aa448ffde51cdda827c5222a650af2608033e924ff76b66cfbfeee65a1fbf9de85eb09e91d69077607b0e7755b479b0080859ef97540f5ad841e113c0c6fcf08"
+  },
+  {
+    "msg": "2b164d2e3bd95010bd8cb4b61d944b0d022f80a57a70fa84be97e399",
+    "secret": "0dcac71efec2df84bca76e49ce3531c79990bed5953e1fe13e99911ed6bde6e371ba9cb6910322e911816168700ac8e2f6250ea31ab9947cc8b11f8a603077b491a95f2aae23a43aacb2efef0d9e40161953afa8ab6284345b540e8775c59747667aa1a699e0ce073ffde284307b78540da8e559fdb8628967f45462f54eea45e38b453f2a61f2856b1e47bbd204844d18c57c3864a7e08b9397957448d22578dfbc1455e5ab909c511b23380c85559bb57358fa962ee11015c94374a5b4162e",
+    "signature": "fd2cd3678f4c42787bba16bc63af7c08d3058c0f5b16a35091e77691e546d5480b83d4b31b36627eba65ae45b6a1c38ed42761b7f39ad16e9e535e2acd610d07"
+  },
+  {
+    "msg": "18cee04e7c03d58bab320dc472ac7c89d70d5490a225f3d4fd73198dea",
+    "secret": "0d92d1bc9a72e314fff026c909aab6feadd0357c4f357c611acdc39d671af8688ccfeefa8665079ac1a1c310a70db3ef0b23c8e63f6f778ba9dccfbb2baaea526b7720a0ee8b9fb4c61dcb0cb74fd023d9b59681122f5fdd38020a139c569c5778598f54e89d07ccaf33a89c36dec1ab7f228acc51b79f0fbef045f63693d5cc287fbe88ff676af9d2242322fd06ac8c088accd191f28f700e12f741c393b91f381dd07d011a557177434ccff06555c3a767d2287f68de8578ba2302f78344dc",
+    "signature": "8a1616806a7f08b74c58418f2921a373069d3c5198e792c2c2ad86f2c2939e56237bad18c1657f597f15680857959168854f333af7456caa127fe5201d2a4e06"
+  },
+  {
+    "msg": "979a541b9b73f458d7a9b8819e331042e5f740f12f659070db86e4f1faba",
+    "secret": "88854fdc0c64075e124d15eea6ecdbdaefdb9a74436cf9c0ca7263b030d2387b8daeacfcd5fb911acf094b53b251d83539ba4cedff71a863f756c79aa6cae1df328ac58be1be7450bf82a699eed8701b062c7350e842ea7f25daf4326a5ff0cca93dc7730d89e7a5757574288999e89386ee927e6080ee46f7a31017de0b7db7d53f0cc0475b33a7c0d0512b114afb263af8e1f291886c7137789fda631a6408d196f91d61be9c8355fa90244fdeb799d7b048d40fa606fae22cc0a5b3c26aac",
+    "signature": "f3ee8537a465192e4249e3abc16addd85039c728a1f97e9480c089f9b79e5ee9c5bf1a8505e3e4ebe9c7baa195db919ba1395f6054399bf462f56381469e6a07"
+  },
+  {
+    "msg": "db4adf1dfbab008ecbd2212faf4acf81a59af197015c63863278cc5af2aabd",
+    "secret": "ed1fcfbba4cb10ab59db6a97776136c6bd7f8cb8f96984ea64738766cc741338678c9d93e82eaff5ed2508d97dee2234108f130636c6e6ca7488cc96dd57dc17e5f0761d728b03e9bc60e66d3238ab80e5e453cd4bf86e2fc65a3fe0957135da8769c2d3c01e0b506bc4cf36b5abd5ae25c50f73cb578cf37b713ce6aabf3a70f850701c12121d0f9e80abe3114a8c3dc0d06fb730bf907a230c37eb27ca8a6b5aad53a8019263f3985fa3026edcdca96c7dd0f5da26aafbfc6167a920c989c5",
+    "signature": "bc70822e169d830089d3194871f6718c7dd1886c41452bc8b1e815ee5a2397200bfe8bfe6b606582b7b7639ee88b852555d102531d990847db56524770032c0c"
+  },
+  {
+    "msg": "e01ae21265ddee0cdcd4dc350dbcee1d1fb8d3fbf545d0c5bee96e0668825c24",
+    "secret": "c45a677946f1511df8c01eef00884c53fffdf3de367146328531ea842bc9748a2affc42ffa29fed0501a6f22076f011dfc8ac058710e166c5805113c3e0e4dd523e814389a277f61e78141daf1d68bb4d024d7271d907b8f104360b532ad3c175ff0e34f7fe3f14258dbd36cff6c122d961385ae6c1457c3d6dedfa3e9bb7f994e1ea54934c9a3c9b6235f8bf49cb30e843da8457a194c692e8887702c3fa9e9e62dfa906af7c768f9fe9ae9b271d5c2cb6a53a9772694beff237c611de77342",
+    "signature": "90a89769fab368f723261fcbfe6f933e96a73b036e4f8f5880e0d474506936516c0a60879b49716af7897345c5b1a6e8a59c1bc41a8d9eac68e2d7f67b7a3b03"
+  },
+  {
+    "msg": "043e93ae76068e1185e4c0a4e2e60ac8d3e3bc686d05c47cc1d50b59600702f3ee",
+    "secret": "e8cd9ed7294fddd856a5b9cd6b1819a82e40bbb7125128c2018f515697d7725e597ec769b00edd11bb55b834bf825324335b0be6e2661399dc6334c0c441f749af83ea81f83c02d2a6d9c06dfe50bb198dba92f13e78b9022a51cb9aa67ef9bdba7c5cf3d27d92ad56bb08ef3204776b5be78224b7475158f0f8cd5b09d915cc4ee2e09f75b0b0847f66fe0e16b2841d6b6e3de36382695f54a4d9780bad43bd0d3be66a6bb4786cd2ec19f490c1fb165823b2e04e0721053c702d3dfbf975cd",
+    "signature": "0e228dbdf47fdbf663434a176603290e8a630154afa881dcc75240fc2b922c134711b110bdec5f2e810d02844d762a87aa9064a91da4cddf2a9e5c539cff0600"
+  },
+  {
+    "msg": "7eb387bf995b0fed1fde8d0af12d4ba6977a41bcd9bf979f5a2b03df86232994a0d3",
+    "secret": "64cab97eb0004cdce967216e1de2ec05470c90c70b854aaf9e858fffa617b3debad9710b2221831e1d920ca4a0d7a2fe5384cb364105209100feec9c3fb41d08b01b6697efb9811bc624ec9abab0b11038734364f5c91c97c02a292bec56e43ea6c9d3541af9ada3f452e1a18522a96d31d59813443bf405e36be3b8828a6f3818f2bf116ab65ffb96d4fdb040a643a01785de83088a5a8870ff81af59560106c737ee75a3da531393eb08d6009a21ed094647a7f7ee17c99625e7ebedc1828e",
+    "signature": "e7de90deb56181ac51b78b46a2a674a0f225cd88afd1e206ddaa2057df9d5b0a6c1ba826b7b1c3bfc42ee2898304399834f0c102a2a47ba5461f1ae01bcc430b"
+  },
+  {
+    "msg": "b580081385829a440a2cfb79125c4d47a06790bbcf6647b8749f994ca4e23d4a208267",
+    "secret": "ebd5559f57f4daf5077ff5b313154fd8904b4f41c0b1970dd92b6d29200ac8002eae20953bda520b2313a178e88a369e06ab400385e0e4f19a16fe8870cb08355b887632d6d08a09ad21a281bd8921003caeba1856051069d14010edc91289e5c132d537caf403d126b3c55b6f4cd255f4965d6c9fe4148dc5c3d949eb268d9e2421cc2c443b3b3c2a3cb64164ee4bf0a912f39466702f12224e4d492632974e351b763420811aaf13de2e005259deefa6f8c2128570393c2394a0c9ea9808cb",
+    "signature": "7fdbafbba0b703d0e4f2dc85874c184264416d9b409641ea6d3ddb501fcf5ee856ae2b7cb758bba5f6c97f3171f99969db05f3878a35153aaf5857b13c70350b"
+  },
+  {
+    "msg": "0eea76f04acb8c78ef3328dbf1cf8afa9764ac3677cb4c786ea4b9f23e43d5fabf5dda66",
+    "secret": "6d1419b45f23d1e9a07bb66ad2cfbb1fd6dff4b21902d94519ed47bab554149f27c9b10c5e062b5983a02814e91fe5552cdf810e1572e508db8f6a5839f2dae4d35d93c837208272a849c5b5a0a04c2898a2a2266584ee17950e15bb731e8b91844989ca79604d8eddad2c1d5dace0394c98e0d80264735b9c2b54eb4356ad51e066a7364e52d23caf59f83058beeda4b15d4d5ecaf9688aae7f5f55811997d97d39df88fc8b8ec83da0b6f1f439d1f290b97fd17f27611bdf33b83eace5f7d0",
+    "signature": "b7f0cf3af1af92cd69b95b2834f6e9fa4750af6705f3ad34282893f35878a53ec695155477f2d0a08f5992b56846ef16abe165935be7cf476433f053d85e2802"
+  },
+  {
+    "msg": "75839af085afb5285a5eda48e72bf10c91e4c1950888c11c7204466b67e828bed514a51b43",
+    "secret": "df348c3e6a72b2e05ec4504e326c62c0daab0d6ac56321bdfab9fbe6427fd4e53dda192df54c1c93a7716606f26827cd40d1f90edb5a7f72a5242f2ba7b32fc3e89e367e8113e903c762fb0d08a6e2b1609b0536177b5434fba923958786a462884e4d5465a04800eff6b1245c94b2bbad7f4ed736bcd3346fde2eae177efda8877fab7b80a68e97f03dae47194c4499cc07293ac90805fdc830dbbc820e5de0eb1c7b8c28aae533262231899cab18b032ec32b6da709bba39a76683dbab8af5",
+    "signature": "c26f562f1450f6de94ed97f3e712ff7695a0f8937a89f8e4abdff4c2ae3bdd5722be4eb0128c311719b2671fbfd46b9ae7ed017ed26fb9f3c024505a2175c209"
+  },
+  {
+    "msg": "4cce4a8af441f44557f9d95270ee6d51401f5aac363413e41bd2b6389421a0744e35755ce5d7",
+    "secret": "1744a6ac25c9abacf29b04743a9e15ba845fefd3884b1c60cb83700317fa9cb6a62de467fff5164cb617acacf9b8961769ecd7c1e91936d43a308a53f56eeaed1e17e92b04fa979c408e49bd300505cc4db5e4ae64d855d4b0d792d2c215588a72dd193be2df5e40cffba835395a218d7551f9f9550d63eb16bcb8a2250f59ac1c87601338eda6efe000aeed7fc16294b26a91dbe4525741af75f7b3545d12dfb6359ad11302f0d3ea4c2a67f091ab1db70c214c86e09a7b1de409baf76d849a",
+    "signature": "2bfe6c0966a045794fb528805bac5001b3085a2f4ba010ea68cd81cba28203f157238d3880761ff2b6ffbc21712a8642117b1eb80a755a4fbdf730be38a0ba01"
+  },
+  {
+    "msg": "c30d798c0352809e0453b2f55fc856b137ffdf36c043ecbf419427313229a5d67dcee42bd5724e",
+    "secret": "af63581ec85c6da16dbb9a2a5ff4611444141249737471e0b562df46752b9dbd220a9597cf8cb374a82a5dd22340c917c31dc2b4a18bad1b93d27d44ea1dae6ec6772136742f94bb34188614c1f98498448636500237adffc42578fa3f01d38168203a8c11ac40bbf973b5eeca8780e1b5186ea41ad28b8a7faf32a9dcb577ffad512df13ca7c318bb9f63cfa8d90718dfde97680169b4e33b9f01f9b827222bc2216ef7101f832058d01604dd6f83f65200d305547002db7c4f605b8f50e084",
+    "signature": "ebc44d960393c080e4e89cf899c3cdbcbb779ad6a9f074e4dccb943a05c4eb4d38e728703ea312d5c5bfbfe0d51297718b66ad11711410f6f8d4d6ef9051ec02"
+  },
+  {
+    "msg": "72c740ac0b2e7691747231d8c074fa1f166b648efda4c2286f382471561fc148a36cb892e384e4ec",
+    "secret": "bea36fe00a35e50c7a8f8292ba730d10cea9cb1d5f4863f9ce43ec57906173cc6fb5e6f68c0cc78ee9762d869ef40dd795588ee26ba5f78375d075194e72d66dfe6c641bc4c10e13fc0e4a62c8242bcd28d573aa146c85738f788f0c0414a1c317427209520cfa3f3727e8e3c09d5247bba75fb08fa43f77fc101849fb8bd29d85f66fb7b95dbf1ea1e985b67273cd8b9ede0dadc93e850bbed3cc965a4a1844cf9a128f849daa9ae9ff2f4794a64e5b5c69a9eefd2a3d88385969ac2fe8ba15",
+    "signature": "8b087947b837e2e40aee95aa16dc3520ea116215d66273cec2aed5ef5a7adc2c30ea50e698c8c8eae391d552bdbb3d0958911e9583badc88faf52073ee8a930e"
+  },
+  {
+    "msg": "928244fb8abfeaa716ae0e70a744caf4c9b769b2dbd2f0da4b25409d6e76fe4e6240aea0f175f6f9e2",
+    "secret": "0dc810122e52f727b5e51a0490a6ed94d4842a4053b1aff17e9c9c126d63c302684c27ca62583a5825b9c74f9ea4c1c0841264d65ff3b2532d892ac734bf6decf8d8af5aad4bd9890525590f2251123ee7d4637acee995aa08e649826adab7e02cc85a030be85bd99382c8cd43191cd073d586aa1b82530c5d0e2f14c051b128724b66fbbfa76340321a387628209f9c1f74f603b0ccc417073b191d12197585814a51117e57c3119b526c4421f2287f62d239157c1193c9177dfe70a5d4eacb",
+    "signature": "58916991017f8c73f350a1412161046a069963e419d019857db3410b4f610655db044586d341b22903e11838bba9616c83bb74f9341980c6bf84178a74753b09"
+  },
+  {
+    "msg": "62f9d109ee0baea4d31235eea68ccd276319fbda7ae94c7ffa1294a48b99f42a414720b146fa79f42ae8",
+    "secret": "0cdf6066a7274c735785ec3abf083f980f03fef1e76214191da99bfafba436318436a7e8b1952ca8a969e580d3cf6663fa8347b4e2574abd1899b9ac285a85f7894449fbef7dbbbf8e05b926e03ab38e8564626229d379d8386d14f56b92623fdf4c06fef3af9d7be22f5587e9aad6eea2573aaafb33956d76cb5fdc705dcf5964fc896931b85770c8c8676b10f3f79b97635468b5f3056cc84a332ad1a3c221d6796d37f85c3c511a89f7eb99b33903ab268a09ad0d82d2a475a031c63d0d5a",
+    "signature": "82cadc3b349ed1e95be4fe2f8f7516b775a125c95102015d0030b94dff5cd93963ef4fbb38ba415aa9377a59471d95bc4b3c9986e80c92d77d1b97458c29e40e"
+  },
+  {
+    "msg": "e4894c7009d533615e465b1a47ba59a0bf4c82cbc48843b6166740046dca27b9b983af09e5807fc6acfd6c",
+    "secret": "f3ac5bc39c6fcb6a06e468ce95c01370bf89f53ec3b3d754dbf9445d557176b0dc4752a458b2570f9c515b4e7fc985d8a105b00bd28bfe1f438ae0832e732baff94631846f4b745ef42a5fad2bab881568a4a29cf6632f2a17dfd791668ca71e666f5a1cb51f1213399c8197fdb631d2f977166e85acc2b1e4afe9190c41d9db5fd83e29d9eec336abc371ef87511a52801eb00587e4b4891049b2bd7cf3b160dc7d25b9838a8863ea3a0eebec7397514de93907854799bfeb508ccabe6c6419",
+    "signature": "533151b35349871991bc92ecda7ed46c9e938a36b131787168e7ba573edf8d25fb1574fdfb3607ed8c2fabf9d4427e5967ec2c14b3211f66e868b7aa5447960c"
+  },
+  {
+    "msg": "1cb95296ec68adc4a8f1e0a1e790750eff5caa1878b1c3b03230f7998605d350bc7ebeae8f0fdfe083a7a75e",
+    "secret": "5364f25c6067d44dbfc527795ee2323dc03581b2f612b22454236862833fa33dccea9188bb31deb0cbdf7e550ada6d813cf6baf88bd5b5710351760104d5066814e30c15a78c8beb5d74c2295ff1017f630e9c04fe032b66388e0881793c2ef9693b9bf9ff2e30ed0dcc71e9998b08600c6c6e240c45c0ca14f7fe0545ce168cc431409bc1114715bc12629add84b2669da3aa03fd547c0f4755427d3e062a072006a6ae6d45268dc353a844c89215287dd665215c66c1bf5792d353f40c6b64",
+    "signature": "bc729413fa8be229dc3b0a82c4311f0a65c462cd3cb40b66b8e376f01a84dea193dbccffaf102a53aedebbee0505012e22cd0b2ad4df7c868a84b2a8f2943d0c"
+  },
+  {
+    "msg": "486de8ffcb1496d7a0848535b66733ca6fec32dc318a3bed742877bb67cf482fe7d8c3a798deef7b1a856337bd",
+    "secret": "ac55d350d614cbe05f30fafd3f67e48b04ddb5361de4aac721488ae76e186c2af028c4b4ce6e997dec9dbffb66e289739a0a4e05db26519fa13f20b044615d74e7f665a815aebb81cd78f2dcee48cef23c5cf264dc41df8edab9e80f5c52261c1e3741ad8cdfd3256c5d4678aa853b936585e186b8dbc1f43dca9bdfff9811fd49589a1489c01269f6cedc55fdfb2bc192d2c7165703a8152d8e81fc5a4cb12a01edf66660d93ef9a904471c6e1af19e04958aaada6cf299a32fe98fe7b17071",
+    "signature": "8360ec7dba4771353ccf56fb2fd07680ef8b26f4ab3cf06c8d13d6fb1b46edde3a290832697f4b639660e3723ee4cbe0c7ca89673f7d905259cc2d406d6ad003"
+  },
+  {
+    "msg": "387aa45863af7e6cb00ac445c16458401456e722744dc6b8f28c9eac0d372b5421daf52a61b3594cc3f212ca606b",
+    "secret": "4b8e9316c2a489526aef496b5e65de5f98f9117f7f7fef0fa0e125ea8ee0832c763da8108a928aea39ce3d9dd08ef6cfad823147eac1c72b95d5845e028569a7847af74bb9e239b0d941591a0ca814d75a7ad742d9804b93285581fa141b8db849ea11fad7e531599c6c34c3688608260b198cde0084037e7f625f6e349c527763b55b1ce3e7556cf1b0ff150c96b02a701eee21eba18745a26d9ba3d24a3d465e3468646f7b183c8df2dc62db2a3539152a2df24cc1a877f4ab7fd3e5b2fb2f",
+    "signature": "0eda03cc37e1da479d0e39b42683f455d7dea89113b1547da682121640c217a25e424a67a84d6afcef5c55c820ab3cc436e68ff447e619bb91c3aca3781bf603"
+  },
+  {
+    "msg": "1098ec2a9b4c53757de09788b588aa9e4cc8b0c0bc201a287e98c933b1c1814eb75ceff13177f169685bf527863691",
+    "secret": "3ea317d8215d8aac9d60b0d5c4674ac3546c0e6a697d1e3ca417d04599a89aa892d379b6cdcef1c57a99991f62854f3b94a9f7837b9be3f9b9c10731804a0594a7ac3f89296c85b9293b16965574dadef97d481763d306090bfa4febb828e0c0783289468455124e813af3875e347d3252dfd884393665bf8977c777498b668d9d0c77190fe85a587155bb23bc479e33cae02c37088e9ac17dff8fb5432175ccb6262f9428cfb6cf2041a763d133b254f33fa3805a493cc8a9e3a09f950cd989",
+    "signature": "0da64030dce5a62c600ee0f6cf1c351d1d89bb25647c70d547897b7187718787c3816ff40c02eea713924fb30a741bb1370ee35d802b55819ad4c645f7017704"
+  },
+  {
+    "msg": "c98fadb1d5ca93cf2c8e42af954cb059fe3799f77d850d7cd631ba9a367e9dbef0482fa6e0c21e3ff439d1a5ad465db6",
+    "secret": "b4a75ff8eb908d096f7383766f0f2818d2235108c24e736ee450877919a3686189b7b0269201430b2bd50334d6a8784f7d346aeb017e695c0877a5c76f16e4652fb8383bc5be757834abf7d2d394ec643babdbf57603e252f51d2c78af32dd0077a9f736d927f5df646eade8558308bae859f86979d53298c32b398b18eefacc7b2e725846f827dfdab4071cf79c1474b3a9e8010498cbff891c78fd27d2df4ad28c0984ba6a27c2d6187d314c1aec13773b5e91d3d78d379cbb7ea95f54636b",
+    "signature": "334220c39b4f834d206df406d2c665b15040f4e456029a82c6532491b714aed8aa833bf6ce7dd54214d24683461e363d743a9f52bee1b9dc266649455efbec06"
+  },
+  {
+    "msg": "95510f10e9a15c261468bd3a4bd30d738844eeeafc10eb4b3f41255be4f666c37e43d0b6f1b8ed6ef2a8e124963ca06b63",
+    "secret": "17cee45611d1f0b86d0e758de69a256bb2bd84e7fca241006123b84a086bf18c1ebc58fc075b36e1b630c048d0a47b7ec4b75ed3dc4e2bca6cc7b8857cb183666a9eafb209faabb631221903f46c1d1ffd27e664474c1feb5f68e470f07e2eba8ce547a80843a6deed5db0ad97009c37684fa4e7e2a2646e67c156e5462f3a4d5e0391cdc02f4df15e53838b1ea39dea013ac01832ed5b082c414b3cf628be18be1d2360707ce78dc9611a12c4f5d7d58720ef00e5edbf83f6140fea47decb45",
+    "signature": "e705118a48a41e10271067295c9194a25a0dc0aea85813144ed4ae5ae42ad378ece5f2d317d1aacf4c776b118b54b8e3ac358b3371baa595e5227fc7f9987f05"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_keypair/tests/ed25519_extended_cardano_tests.rs b/rust/tw_keypair/tests/ed25519_extended_cardano_tests.rs
new file mode 100644
index 00000000000..ed2e021b961
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_extended_cardano_tests.rs
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+use tw_encoding::hex::{self, as_hex};
+use tw_hash::H512;
+use tw_keypair::ed25519::cardano::ExtendedKeyPair;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
+
+/// The tests were generated in C++ using the `trezor-crypto` library.
+const ED25519_EXTENDED_CARDANO_SIGN: &str = include_str!("ed25519_extended_cardano_sign.json");
+const ED25519_EXTENDED_CARDANO_PRIV_TO_PUB: &str =
+    include_str!("ed25519_extended_cardano_priv_to_pub.json");
+
+#[derive(Deserialize)]
+struct Ed255191ExtendedCardanoSignTest {
+    secret: String,
+    msg: String,
+    #[serde(with = "as_hex")]
+    signature: H512,
+}
+
+#[derive(Deserialize)]
+struct Ed255191ExtendedCardanoPrivToPub {
+    secret: String,
+    public: String,
+}
+
+#[test]
+fn test_ed25519_extended_cardano_sign() {
+    let tests: Vec<Ed255191ExtendedCardanoSignTest> =
+        serde_json::from_str(ED25519_EXTENDED_CARDANO_SIGN).unwrap();
+    for test in tests.into_iter() {
+        let msg = hex::decode(&test.msg).unwrap();
+        let secret = hex::decode(&test.secret).unwrap();
+
+        let keypair = ExtendedKeyPair::try_from(secret.as_slice()).unwrap();
+        let actual = keypair.sign(msg.clone()).unwrap();
+        assert_eq!(actual.to_bytes(), test.signature);
+
+        assert!(keypair.verify(actual, msg));
+    }
+}
+
+#[test]
+fn test_ed25519_extended_cardano_priv_to_pub() {
+    let tests: Vec<Ed255191ExtendedCardanoPrivToPub> =
+        serde_json::from_str(ED25519_EXTENDED_CARDANO_PRIV_TO_PUB).unwrap();
+
+    for test in tests.into_iter() {
+        let secret = hex::decode(&test.secret).unwrap();
+
+        let keypair = ExtendedKeyPair::try_from(secret.as_slice()).unwrap();
+        assert_eq!(keypair.private().to_zeroizing_vec().as_slice(), secret);
+
+        let public = keypair.public();
+        assert_eq!(hex::encode(public.to_vec(), false), test.public);
+    }
+}
diff --git a/rust/tw_keypair/tests/ed25519_priv_to_pub.json b/rust/tw_keypair/tests/ed25519_priv_to_pub.json
new file mode 100644
index 00000000000..f0cdcdfff09
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_priv_to_pub.json
@@ -0,0 +1,2002 @@
+[
+  {
+    "public": "84f3555539fd7a0287c45f6f6273249a736b268955874ccdf6b4bcf52e2a20de",
+    "secret": "f400c297a83a759bfc7ff89a079c04ab755dc90a51e32db794386ff7e14f3495"
+  },
+  {
+    "public": "5bf8e02201c8c08eea75616b1a9b26c0c254510aeff0f54385e5924ee6777bbc",
+    "secret": "aec5de8c25da6f177d4c8077912e06c793db1e23d62f37db39ca3738ebc0bb91"
+  },
+  {
+    "public": "aadc3f989f965876e545bac9db582bbe7eb636e8dced276e6f4866fde438e8d2",
+    "secret": "2b30069121856a5f510e0bd539f5e459a03ad2885d2e9607a9a38eb12af18f06"
+  },
+  {
+    "public": "d8121013f8852749a6fcfeef50312ba04e3f071e88b6b4462736c84238e029c1",
+    "secret": "35a6c3d0381e2e9cb38a7c21b912f4460e8e0144fb93cddecd5e76f9de63482a"
+  },
+  {
+    "public": "c28fd3c20493169bb8bbb5d46a58e993f62d618b73e526bf9e05a26f30ffd0e4",
+    "secret": "c5edfc7ce883bd7e47e616d1c8588283023459d3f374c0986f75e768bfb849af"
+  },
+  {
+    "public": "000d5f5a70a9f4b47d35167036d7e17d2e383287949eab3bce1d29fa107f180f",
+    "secret": "22eddd4711bbdaa2fd5329bba15d846db3b666b7d9d846277d362eb9e4551b4e"
+  },
+  {
+    "public": "7fc7d2f0246c036058bee1b6e6f43f47cca9a3eb3197da70f04fe27903644623",
+    "secret": "4d8c3c1816ec3ea58e7c6b6e10a337a69d75aa5dc48f6b0011d2258bd3c2523b"
+  },
+  {
+    "public": "5eeab191591df74d2111ad3aa5a79e70a2ea74cfae39bc182b72bad60d26b7d9",
+    "secret": "418585aece0df8119481adf9920775b1610a0ab52c9fae3f041e12653adb0d90"
+  },
+  {
+    "public": "74216e14110b646383b6477351645d6f0a97ac13d829dd0f689868669a110686",
+    "secret": "9d2f692df35683e94dde273fbf56a06ba76ecaf3b10c09fdeb8f9bdb0cc060c6"
+  },
+  {
+    "public": "7519d8de67fb297d881723958283c690a67af1ac6add4b21503b95b90dae19ec",
+    "secret": "527f9f6463a3d0b9a6c6b5b48d2909353766dc13423b685fe85c3d54377b734f"
+  },
+  {
+    "public": "ad1a584b9e7664f05582c130385a97d5ac73388643fa73150f0c99e288c37db7",
+    "secret": "5cb52219b1edbad73b2df614189267ecc41fa770ccd6bcc57b5b7b7809ef6701"
+  },
+  {
+    "public": "0b47ea97fccbc101ffab8f2b720dd1df5f8b4b91dbdcdf5ad35c1a7d3ca619df",
+    "secret": "9777eca69734023424c7ea8b21d9ae4159697fd8b5f40fdf3dc1434f4fbe3830"
+  },
+  {
+    "public": "d6d3058b0f53e0be3309213cf56522c439a6ba416d45a5f683802fd8d2ac7bd4",
+    "secret": "31be1707207b0a7c3025790bf950d686173479ed7dad7630c2dc132cfdcfa616"
+  },
+  {
+    "public": "4caf3948eed55c36f764529567d3cbb9e21d3f2bb29e83694be371044a2857a7",
+    "secret": "dff344b72d7455d225ddc7433d37ae9ba1b128877c00aad6b68cdbf15bbfc71c"
+  },
+  {
+    "public": "f7c607ae3f486f506573352c91bb9ec5839245bea2625dbf313f842a95aec569",
+    "secret": "fbaa0f3546b4871cd03ca1d95a1665b954b668d1854b734272cf4f6166695eaf"
+  },
+  {
+    "public": "21f01adb3b4b9dd201ff74a255e606bff1899ef51d49ff44bd8437b79b2ec642",
+    "secret": "951702b80e35c6d37f80da18eb4b643857922f88291adb7161f26789f3eb2229"
+  },
+  {
+    "public": "90c23fae5aa1e8618d73227031b6e19b053f166c5bc4a2c8321f6f9d464586ce",
+    "secret": "514cee2dea9c882080ae6e3a21cb0ac5b69b73c45c7eca59ed6cbef9e62facde"
+  },
+  {
+    "public": "27a4e0c809205a8da2a88493de35fb7d4375fb7a78ce5cba9b80c70705d831b5",
+    "secret": "862f65e095c7dca826c15e3e5895465b7baf656f004fb707bc4e016246385b4a"
+  },
+  {
+    "public": "e9bc0d472181d424c13f1edbfd2d6f1f52ad49ddc573627e7acb4c2de6bbdeed",
+    "secret": "7a0a37c98b89b92a640b85a094f37380e18a8b4d861305e1c25ea3e652254e56"
+  },
+  {
+    "public": "bdacb49fcd1c3f6fadada5a08d283ad710c72215ab33ce444ec15304634e1e1a",
+    "secret": "68c3fdc1ed94cd9a00442245893aadd614afb2e8583124034779c86126cfbef5"
+  },
+  {
+    "public": "efe1d4fef1f66242b0eee77287785bbb7cf3661c3139d65264b8ebc87376c9f5",
+    "secret": "1d5f19e050e9801d1ee1752deea21cf790c0ed518f5b4dd4eed18090e1faa063"
+  },
+  {
+    "public": "b2c87b7d663689a9e90d9de4314c17bb824af893167e596494e62953ab4f1ff0",
+    "secret": "4239ac869f7cd0421d611912d3afbd4a5bb0edd6fd77e0e2eb0e7c83aedbfb39"
+  },
+  {
+    "public": "4d36143eb4b5f244e099431078ada5256898b12269ebdeecd42f9158f1faa3c6",
+    "secret": "fe895bff5f431941abf6427d5ae03968c5a6bdfb49d8c802e729e06d5f508b13"
+  },
+  {
+    "public": "b2b7140c309f2eae5f4462f650ced07c07aa830f1b422c9b9f0fbab8ca445242",
+    "secret": "d7107c5878b34bbaecf7a1b3059a7da5618c4c26eccb39bab445894b7587ef4c"
+  },
+  {
+    "public": "ab87d8de2556d13567832f413ba5af5314a8cebfa8973ec5fa14b4170abd6ce9",
+    "secret": "4b7cfc999c4784fa894e685133f83a2beb48e058bbea3fa23f15b16e98dca2d0"
+  },
+  {
+    "public": "4b6797afb41a78e00e90a6eca1eb7ad0fcbffa61119150985c62e1fe0f2e0f8a",
+    "secret": "973021d2dc1c8949a397d05ac99caf8d745c721c054b9d59fb2252101bf6263e"
+  },
+  {
+    "public": "27acc7bfdd9beb9e37af70121893d9bca4669b79a2eb6d9aeb9cbe30c693019b",
+    "secret": "a86fe317f2087969cf622b87f3294d7a312340a0682989d4a8e1453eaae11a6b"
+  },
+  {
+    "public": "a193742ec16ccfcce9da1b2daf0827ea5e413b187944c3a346f426348c46a044",
+    "secret": "5bfa98563cc3eaf39c40806f271a0e8605683e35a9eb0e9f8f3d9e98657bdba0"
+  },
+  {
+    "public": "93c9fa3727c88a9fd64961642430c368afa8aa5212dce0e1781c1893ae72412c",
+    "secret": "a2779bb8a177aeffa87f1e507e0908c99f2f12d8236e3fa08f30f4f52caa5e7b"
+  },
+  {
+    "public": "0d3707fd6dc6f1e8e187b88a6f3ccfcd7bfc2464688a974f7034e1d24d67752a",
+    "secret": "896ffcb173d3abc1bae5ebd86a119fb996172cf9a70f46f9f0e0a6462f96147b"
+  },
+  {
+    "public": "3111251e9167235fc781522c914d79098d6df14112098e60c2660c0d7cc63c39",
+    "secret": "5f5528c40976dcd9406860812bd58901b219767763d4646e3a0c987d1031f714"
+  },
+  {
+    "public": "acc678dfa68cb3ee0c726f917b4465fd15000d45c240c410de8be36b0364965c",
+    "secret": "90768a5a1c5689965dbd38bb3c15f67a2f32b9b206a87a2aeed3323830727807"
+  },
+  {
+    "public": "f037e2b145ac7dfc26c191a451dcb4955fe59777db404a807ed9196bbb2c5f09",
+    "secret": "a43824ba5cc60fcec62c72d7dd10bded98e6f8e0cc2f8b75ace7e2f948964851"
+  },
+  {
+    "public": "860e0b15de1e8aa43e69ad7216e9764f32ef72798ad1b5dc65b8558a28ae336d",
+    "secret": "1c5e55460c753dbf1a5ddc5991fe6a5afc80141f5a0c4583e6aa764d45ec705a"
+  },
+  {
+    "public": "f390028b17f26a896fedf1a8bd8d12af67814f979b5d3adf662e666d236c7700",
+    "secret": "8043d6c98be18e5dfac47df5703b475bdb6ee429f6abd7e5c55e0327576f11e4"
+  },
+  {
+    "public": "72033bd969c6fd459944930ddb89c940cffa6153cef9ca0b0f05ebcb9f06ce04",
+    "secret": "55daf915e823ad4e8b564d9d54db970149fcba7acabc4e449bde3da8cdad7ce3"
+  },
+  {
+    "public": "68dd695c21397c1c76bdb8a1b9469be6310ec0e550cd99884cf48307c59c2098",
+    "secret": "b0598f4bfdc623290045ba9edbed613b54dff424495e37caacc1c9f513359196"
+  },
+  {
+    "public": "4d0cca88b31ca19cb380499062993f968ef7ad7c17d7db31204eb407b2f55a3c",
+    "secret": "eb8a8dd07904496e59ba2106a699808b8256ec15c04977563729911a21d66001"
+  },
+  {
+    "public": "d1ea442550480cde96282c934f010defc0f5a774b2ca0c4abbde5f24827b5d10",
+    "secret": "958c2cc0627b8df283e5b75936c717c87f19dfec3bad5d7702ed7413e16266dd"
+  },
+  {
+    "public": "635222508ac740a545ae3a2e1b531ae834dbc3b9ba2fb69a675e2835fac09e59",
+    "secret": "cb82a5aa6f02921cfe5997a7d8fbb9ac04d0123026ea02080461656283936fd0"
+  },
+  {
+    "public": "36ffc1a12dbe8d3b67c1285c33c1a60e0ef4feed15b23d5ece1c23f08997d381",
+    "secret": "ad3b1870bb1420b869740ccf8b5d872b9da79072c0dbcf637cff2fb12405668c"
+  },
+  {
+    "public": "a88b824107cbb11922171d1acc9018a432185c4a3e9c629c7ecf7ed0453751e1",
+    "secret": "fdb260e4086296c76b8dc27db3f844d67eff0e2c482b6fc4988b08db364f2b56"
+  },
+  {
+    "public": "a0b7d6353da9a7a176e0513fdbe428a7a08965141384f4210119be5e2de35cac",
+    "secret": "0abcc2ca67f3cf3bba047e5956b54db7c887fa546f039aa37b2b5f677029adfa"
+  },
+  {
+    "public": "5858d39e19433849c95be07fe9273b683c56198ba6e396f7b549a98ea8aaea4c",
+    "secret": "29527782410ce88624e2ceffec8dbdcfc135e04b228406a127d94968aa146858"
+  },
+  {
+    "public": "31ddfcda0ab66ba5d515238e2bd0cea57b73e9d36f9996e5b9671a59e66fb47a",
+    "secret": "9cde91a16cc82527b108304b9a45563f524d1ea1ff8c6db0849ebacecca9cf20"
+  },
+  {
+    "public": "64f1704e9a0d3526d1812df2cd90e7e9b54960d7389873eec48884d1a9c4fdbc",
+    "secret": "beb922414cbd021a4df2e9ae5635f37c96139dd9fdcdbe03042167aac21d6f7e"
+  },
+  {
+    "public": "992faed57684e050c325598f46bfe8c00521d61c1bfd1fec2a44a706105c16da",
+    "secret": "e40b9a5c9c6157fd55219a521ba076fdaba65db61bda660c03fc924423a0f94c"
+  },
+  {
+    "public": "309ee14771171e677d5e240d88bcb9d1c80920a0ad048aee25878f98a5075d05",
+    "secret": "98dc24e2cde873a8f3cfe3723191deea7f69b06f57879ef196154c7e350625ac"
+  },
+  {
+    "public": "dd228455a96281ee87e8d37a74afa232ea2652dde5b8edf0e60584b26a792b30",
+    "secret": "74a1eb437e170c0b5421bc0caa5919a2ffd5b636586f56ce749d17f2aba827dc"
+  },
+  {
+    "public": "2767c2f30b66791a352e168e85b900fc4322f6ff962c269ea61d38c13a5d2605",
+    "secret": "aa88a461c6231ec22f5d81e820d5f8966216a30670e54c92cf7701271be488a7"
+  },
+  {
+    "public": "b6ce0609ac4f3414193a3737621358b005c0271ab1f30a5144cd919f122a238b",
+    "secret": "d029db3e85761b79d76782dd5a206461b7632bebc4d1bf1807dad95670dc476c"
+  },
+  {
+    "public": "ee0a91723535b1e665f3622e85481e58fc0f2694944f3af03f9ddf73490cdff1",
+    "secret": "f806e9b7ed27e629a08ad81857e45edd29437f45e7371b0015165550dbc3445e"
+  },
+  {
+    "public": "210e1696b11739debe4e0d2a67c70eb9466f423dcb7bdf263a565a3fe5fd7db4",
+    "secret": "5d9875d708b104b55d4d00bca0c3d62eac4aaf81686c71d4e4e9886f120ea0b1"
+  },
+  {
+    "public": "205a1476a451baaf356e3d1749b1b965d2bc12039ed9594e1b0b52d75c52d562",
+    "secret": "b80e4082a35e55474fc925d2bde375c7c02e6c8c5d1e9656520526da75d8cedf"
+  },
+  {
+    "public": "824a592ec3ad92c21e06745adebe8d9788cf5751c98177b8ef842f9e4d151968",
+    "secret": "f904158d81fd1c5c14de708b92041ad611ea323e5400d6928234b3a919251121"
+  },
+  {
+    "public": "d92420a8118b141ff942b04791e6feb156aee7de9afa8b2ba7d55a0d39d31650",
+    "secret": "835f1e9898f4f6ef8933f91e25d3c58df24f04045d9e40626caed09b813e37c4"
+  },
+  {
+    "public": "8a18aecd24e50be11d9a71cc0d0ca5a7a0acc15035cf4bb4fb17f4f6a8104761",
+    "secret": "fd8e3072758d683f4d704892aff1213a70d2f533ba9414e47aa11670fe4aa934"
+  },
+  {
+    "public": "ad13b24afc50c5de27ddd0ec44a5f05f437da4cc7beff60755b48fe294e0683c",
+    "secret": "d5ef06ff7c86a0fe26744480474af9ed23a41b946c28e8997649139f959a4822"
+  },
+  {
+    "public": "ea616e17a8b7305ace349db45f22dbefef27cd9f8d22a715e7ac526230a4021f",
+    "secret": "84f39e92aeabba8dfebbc75aeb679fe64e054c542728c158306c60b7304e154d"
+  },
+  {
+    "public": "f65fdeaeace9bde8f7ebc87ee55af205309eb8add9a1ce71ff5f04d6bfda05f0",
+    "secret": "03d89f00868c68efc8d6366deda83f1b2e88eabba91e693797c3e72a8f88f48c"
+  },
+  {
+    "public": "51a5b62bf0bfb06dc3d1c80d585f8b7cd5cf08369777bcd3c2d3501de2a3e9c2",
+    "secret": "a3f7274b4e581f5046c9f7e2d4c6ff6df95b5cb158e874a9b7e27810a8c9f239"
+  },
+  {
+    "public": "30fb3953c75933098dd457f23e131dcec1790bdcd14d3756c7bbf7010d4398cb",
+    "secret": "fe2da0666f35787c11f0a13f560828a31813ce0c693ce1f94536556bd24064af"
+  },
+  {
+    "public": "08c61d07885bb0b40012c1055140a61fcd793c2f28621586e88d77241872c2d0",
+    "secret": "979c6563227739b56351cc34dd726f6ff5288ea1cbd2c62b970d3408c41c2e64"
+  },
+  {
+    "public": "8fb74969499cf2b2e45e835cd15f465e347b60bb63b4ea3884353254e8795cac",
+    "secret": "552c0bb73536e51ba48dd06a70a367b1b4aea90f0ea9a7cecfa8871101d7a048"
+  },
+  {
+    "public": "7c6d8a910269a1adb45ab69073597c04486adb033c4129e1f65d8ec85dd5f40b",
+    "secret": "d2f2130652e5aae6140d27f05c19cde4f157ed5740c5d41342846365bb6057cd"
+  },
+  {
+    "public": "55d54e1e3f2f6f143b68e0342d70812a41c143a1ff221494741b364adecca4cf",
+    "secret": "acc98122a7bd03146c971a6f42d2637e1df9a2719955917c218cedb8ca156a67"
+  },
+  {
+    "public": "f2417acc7db550e45419d1e7bcbc64e159fe74a388d0cba0b3b9db7147506f6e",
+    "secret": "ee683019e064e95379f391aa1a8c3bb03af0238d57f86d1669b8df334e962bdd"
+  },
+  {
+    "public": "0d006ab03e70a5921f8c62799ed5e690a0034ee6bc07e50df0a135eb846a1d6d",
+    "secret": "434868143c2fbd71e3e06dc1d71883766442d6382da6a24791fdf329a0ad9b72"
+  },
+  {
+    "public": "4d03079cc959e97f55c250ca80cef3973c307852bb22a9930668298350cbaccf",
+    "secret": "5874231e3a6e0a3ca29acfbc4d8b88fad5f15566412e9285a96a47bed9acaa50"
+  },
+  {
+    "public": "7ed28b2e6897e0246bab7ccf771e1cbc2dd716d94eda2c70c48c537239a0866b",
+    "secret": "bbbc68b2b2d564c0a713566e331757f5fa3d08563431279892f5ae4ac8f64387"
+  },
+  {
+    "public": "78e0a77470d5b61aee66eff5b831fd5f6b4eecc4a895928ffcebb1229b5c7dd0",
+    "secret": "47f979075df1bf0b944e827cb5d9b4718853dfae4eb7a9cd0fa228022f09f8e3"
+  },
+  {
+    "public": "6c9d6d3442c6a5982ffd9b96b2ec828ee85191c95b7b773e1b67f3e1857e8925",
+    "secret": "9ea903004bccf379b819177e6ca56779817340f8957ef6f9403300047f2aa822"
+  },
+  {
+    "public": "b026903d283d251236046643e695b782f3daf9a4d7bbea4b007567a2c2ceea6d",
+    "secret": "00512e0f6b6f4f8d7674407de53fa6b1e307412c4b36cd2594a2f15583707f3f"
+  },
+  {
+    "public": "f6584c29a31812d35b180156acb3e35b94721ee9aec71fac524dda3927f90848",
+    "secret": "113a58cb3ee6e951f65d3cddc4ecf79b83eb7252ea3d270f841d66cccd774f73"
+  },
+  {
+    "public": "c12c0ff07322ab294966b064361efe71772a3c90153f4a5fbcb0c76276074c94",
+    "secret": "d82bfd183553b32723ad988b0f00cf258bd78e29aabe38508cf3144c4cada63c"
+  },
+  {
+    "public": "9535384e1f5ac1e1bb9195ba7b1d42d0a1c65772b87aa7c81f526ab7699336f6",
+    "secret": "4315f753db1eee9158c4d403a62b3f2de5b56783b88ec99acb2a96e501d5d791"
+  },
+  {
+    "public": "86ea8574b55ac5e5449feec55bc625ab51b709324c6c1d873818f12026535af3",
+    "secret": "37d346987531c9580239c039adf1e5e3d41090e9a8eff8c6f2088df23507edba"
+  },
+  {
+    "public": "5e35cb913be094450566058fe5c5a61b181e9c2a0892e1bd2d831c93ef470b21",
+    "secret": "73c6689863032902f456ed9854750085798b4ee963dacb34219bd6b8307ebe84"
+  },
+  {
+    "public": "48e3d1fa5ddd4ef7df94475e0d2696fbeb5018fc5b3527f8f0347c3159a0c962",
+    "secret": "894825346dd6202a48475157967c5406d1bf0dc3400e1caee006e01a76c04566"
+  },
+  {
+    "public": "37c316dc53458dab34d6a54b21b7a9c82f783a614e2905b8d5cda5a426f4afcc",
+    "secret": "d61efde38f048ad5d634daec05b4a6c58988a3c32c4e380d096c181b0229e818"
+  },
+  {
+    "public": "d689984485436dcb7a159286a7d934beb706faeeb088e2e016af5c70cecc0a51",
+    "secret": "9ee3258f7525a6f812e754208571cb3adcd096679f8d8ab1230de74ac7b5b7c3"
+  },
+  {
+    "public": "1a74de65f689599432202dd28d7a1bccc0131629f61ffba16ac3c915beb3a201",
+    "secret": "15c58cffd7409065d7bfc9bcc42eda2dcf184e64ad799df3da81260961388558"
+  },
+  {
+    "public": "077660db09fe8f5633cd5259b2f0501750bf4afbe6fa690216da69c20b6c3b71",
+    "secret": "45f0e40b32cec47dc43ee1c62a5f490a1e2b73ee580ab37c6c769cd8282ac707"
+  },
+  {
+    "public": "afddd125f720d9eea185a52a0d8f182b571d2a5930763079c7501fa6cfe79b8c",
+    "secret": "1d79ecd13af75bdf98e86bdf3ae8b40d93efe3e2921b440981b837d85530ae61"
+  },
+  {
+    "public": "b06975ecf22d4819d445f62793cefd36f794f5499c47dfc11d9d6a3718ed98f7",
+    "secret": "42ee2757b2f9105e7b7bdcb0593be3cea4fa6cb2a91952663d732f17e5e60c40"
+  },
+  {
+    "public": "ba30e3fc9b02f222413e6d3d86f6e4d2c2aeb5595ad1ce9820453d955a390bee",
+    "secret": "4ae24666ee1c7eda9c262fc554bece6956eb733a3024a2992247703fe21ccbf9"
+  },
+  {
+    "public": "22c4d789d8999b6a0b25b39d0bee3d201ed50c52483f0683517640d7205a2f73",
+    "secret": "822f1047ff121976e5fea52605a0f9a94294106090b7b81319a93e546fc27edf"
+  },
+  {
+    "public": "3a77674342e4b72694fb35c1467ace0ccc83220ca49971fe2f56b197faa0ecb9",
+    "secret": "2038010528766ffa20c27d4ceac7d74b5e496670a14049ace05f4e831f7dcd7c"
+  },
+  {
+    "public": "89e74aa5387de4ab4639885233fc1c5eba82c986f41b0249680a1b31755fed08",
+    "secret": "7c222c2d5e36cce49e21b52ddd36ff73889318846f2f69096c9be2ce5680952b"
+  },
+  {
+    "public": "7c0c6b57a30316f325cf0846593923961dbc6e6336ae2e9003dd2260a8ccb834",
+    "secret": "cd5a74e9e861f62e05f447bd8342efdda403ce0c5047101c2ba89f70c21808c7"
+  },
+  {
+    "public": "5f8734cac055b3174b720f5fb0488e95bb8d30c914c53d2e9c7cbc359e78cc9d",
+    "secret": "46304ad4c56bc7fc7a4a55cbcd7677fcd5dfd968a61ef2d1f1f7b13e517a1feb"
+  },
+  {
+    "public": "5d6c0447eb19b81e9fb8293911ae6f910a75939e70e2b800b51233930cdeaa99",
+    "secret": "ff314af9ebb0fa59c0f8cb0670da269247ae793c79402b1f1a6f4b722c34155e"
+  },
+  {
+    "public": "2945b1e68ec9a9a129e7fa40a70ab3168cbc74d51d533d41bf09e889c87550cb",
+    "secret": "6327be47b7f2ab7f3e25d84b9b8cb0d173509d355760fd52c0c5de14d7027d6a"
+  },
+  {
+    "public": "3eb1832356a0eec3cf4da7a94f5a132789045edbb119d674434985c9f6d40462",
+    "secret": "32cb8055716b97082dc0208c7596159b8394bcf32659d61d742bfb0ffb4865d6"
+  },
+  {
+    "public": "6da67c23d20e87434830fdad59d9bab8b296684eaf69d82f68a3efe170d4f714",
+    "secret": "78994a0fae2bb2c2ad8ab795b34fe139c1aa00532593d07ca25e29002d51e868"
+  },
+  {
+    "public": "8a6bd5ccd2d01920b72f83cab25e9c6dfc591aa607b3672c93faf79b0c176af6",
+    "secret": "8fc6c4f0d7772a1361dbc2fb02be22e8507311b63431ec2799106043a81b01a2"
+  },
+  {
+    "public": "8ceabfe70b487633bdcd4ab3cde7129bc193bc32f699911f10f1ef9ed393bc86",
+    "secret": "186c826e2581f0d5932094f1211bcbe43532976ade9200e8f4d5694582f0a054"
+  },
+  {
+    "public": "1a8f79d3e38c3c91a67ca4959f84b6f1416cb0667bb7128f81c9191baa9de0bc",
+    "secret": "4e80a45f57b66608951dcb9a18d0c31ba8ba8c691904b58b26b040646e7eb8ce"
+  },
+  {
+    "public": "2d9aa629d138396fdd85cdfbf54fa9a03d1d4d9c7362b8d5dc8f613acd6a1e08",
+    "secret": "eb51c594fc1e3e2108ae0e1c35d7f2515f2f77377e3f05a9bd19c7b73ac1076f"
+  },
+  {
+    "public": "f5a2699aced98ca20675a386a3b23c51baea941d6e73588e5e9cd8be55252101",
+    "secret": "6ea021cdb91a051562d909de3a626878363758058fcf4b088a857a6b54bc08c2"
+  },
+  {
+    "public": "983f5486af410b230abe73d3ff30bb6a61aa4a9c7fd0f5ecd88ec731734adfd8",
+    "secret": "67d2b516bbb0b74530d1fc42b7f647c5c65d08617274c0172352aa7570cc6598"
+  },
+  {
+    "public": "a763d6977e93aa1fdd522cf529153f98be4e92a5627f7ddf93a777889cda9764",
+    "secret": "95008e91e514ec3270a915d7e4193569a0f60fd7c879781b9a3de8fb70a63840"
+  },
+  {
+    "public": "67a1527c699de15c96a6d3ebda2f26df275d70da91167b341a3b90672703ad65",
+    "secret": "4d81db4fe699e8af2424b8de0aa3978d3a1e79852d26127451ce528d8eeb2b34"
+  },
+  {
+    "public": "c3339e06699f44b8f7557da81b119720da94d640a05223e44bbeec639de357f8",
+    "secret": "852090448cc70d5f85b20ad418b4ad3fa9b09be3b53f115bc3827035e6888369"
+  },
+  {
+    "public": "41086c085f17961e30ca951c5f0b84aa12320ce216919e7a7c8e0f03e4251d84",
+    "secret": "e2bdb1cf7e6c70cdeb3cca86db1c1469ab9afc9f325d2db8264d66bec54190e7"
+  },
+  {
+    "public": "19b1627dfd4e1ecf7692cc39899c32bf1f4ec245194053b30326eb1f94bbfa8c",
+    "secret": "b742739b3f71e1a2fab131ab45f60d66c761b10219c8ed1b390fab37b2482b59"
+  },
+  {
+    "public": "53abfcc91bbc7814bcc959cb0e6d756e2bfa2161bac411d34b9577bb471d1756",
+    "secret": "5e0ce24dd053515dbeaa1878b44f42236dd473b9eb9e63d86dcb2d9460c45341"
+  },
+  {
+    "public": "ee95fbab3ec78caec349e5e643b7f2ed332af01626bdbe47f59ccb67ff315593",
+    "secret": "adeb85ac33201e21a3984656b7be9e01bd23ab9abb4acbcd6e7638b11202b689"
+  },
+  {
+    "public": "57850e5c08687662693942c6d421182e769f453216f6a21a3deb46d72aee0530",
+    "secret": "625a4f14479b8be40d9ab08edad23c18b55d23c1d0ae4fc93751a20c110e8c47"
+  },
+  {
+    "public": "94c7e9bcad48d4d7c9af0658011672c187e3bffabc0c1e8bb295900cebf3aa42",
+    "secret": "4001db50c3a9affee761f2bf2a5915e80797ea80da2f6de7ad9f40d650bc6542"
+  },
+  {
+    "public": "7bf756c31296975924daba47fb5c112452f6e1ce502bca9f4e2438a0189beee2",
+    "secret": "637bc973557303ee32e585fd420828f4850307c7db0a608aa76db2b0e44d95ad"
+  },
+  {
+    "public": "e6c82e8618f5cbb96a28723d4fb93cebc98d31166bd099b0c81d36bd52709df0",
+    "secret": "e6c3824eb48e58544f93e09a7eb21f2185680b6067d336b9f720f07402a0f07b"
+  },
+  {
+    "public": "b52d61b8c8bf194a583d2d5483c36a3829a7c415190fe8a17719db1dba895634",
+    "secret": "dd001fcbc596f38af088cc7ed6859b36f1b423e1c9b8803e5a47b3ef6f5d7c94"
+  },
+  {
+    "public": "96f33b90b1ad6dd7e67e26fd8830c48e4cf055b1cf73c02d90114256d2a76650",
+    "secret": "e3b75abd96734abb36e8631e0004369c05a2ef21e5e2b3064466e1be376c22c5"
+  },
+  {
+    "public": "87da366d523c91a072c0ad288fab3981499c0c54cf5ce5304e76f30393d6f8ef",
+    "secret": "6f01fe42df2001e5478d542c8fb58b1d83a91a716faa9c5cf709d3796f3fb0fc"
+  },
+  {
+    "public": "7bd1b46df87e8dd298cf983bfc0d0a59ea69883cbb319f6f86342349cc6ce83c",
+    "secret": "40aa01a315ca34decfd4ee6aea159e28ee2f9df33c0109a8f10b93762e9e38fa"
+  },
+  {
+    "public": "43d704b0f1e3c8c773d36b589366e7e535fbd3767431e8cfe9ae90177e857506",
+    "secret": "75369e2d4cebe8baeeef67f2c45945f70e9d6b6b2789e9ff68f18c41c0c39aec"
+  },
+  {
+    "public": "057ae7396ad478e798807498a283c38f7dbecf319fdef2fcb3e3c439ee2f54ea",
+    "secret": "1ea015f99d700ffa4322def1cf7528ec5395eb7c27e3bb000e34a2f4d248d14d"
+  },
+  {
+    "public": "591a0960727c16ae7c5a5fca343cb795555c2c44463c59f2dc05830478a6c51e",
+    "secret": "51bc74a870c2e9da8461fd4dd2d89222e5f97f29bcb414b4e0e9fc705fb5a48c"
+  },
+  {
+    "public": "9b5417d424302f973dcda1db9e35012c688f93af4440a0c6260b7f8894566de9",
+    "secret": "54b30150cc1d8a7a02e443bc0b5df80a8defad0d8d35d04d77d3bc3f948469f3"
+  },
+  {
+    "public": "c86278b1e4e768e1ba0accadee1932e55cf49fd7efdaed521ce8cbfe1a341a10",
+    "secret": "d17e4fd6be883dcb59a5de8681758459ac38a0aa1a14a4b2a1b21fd417512785"
+  },
+  {
+    "public": "0abf4a96c3ec75bd72734045f6b8c5431231a271166a09d7797cfede60993f39",
+    "secret": "f230791d9fa71b25a63faa0b184921187196ab6766b08e86e7df67bdd5f06349"
+  },
+  {
+    "public": "048250b263aff93aea4c3808c140f443cff094bb7fc8f9684b2b48951ebb8cb5",
+    "secret": "12cfe01fea4c12d67bf265f5230281751a731811cfe13d4cc0988221aa03227a"
+  },
+  {
+    "public": "ddc95ffba741677cc3d4f7f8d8fac35985356a90591695ae198b5fbbb0b4f727",
+    "secret": "28685af2dc1ffcdd2fc79e38660d162d5a5e5cb4d80cc2cb34952ce97e190534"
+  },
+  {
+    "public": "0fce9d961492e624ca2d4cc2d576a17325cae409ae21970e3a7b74dcdec94614",
+    "secret": "e2a3da34ddd8ce1a6bf86263cab4717d190dde5a4f19d29790d6a1e075fb6cdb"
+  },
+  {
+    "public": "ef19db113a4277575dfc95bb3ed188e6acefe3d4c88fa7e5236313bbe937152e",
+    "secret": "c7e6325e02350efb0c9d7eaefcc452020574d955844d35f4d78b37891942010a"
+  },
+  {
+    "public": "5b802bd732bf0ed0d98cfb32ec40ca4631997a66e75b2e160f2207f9748e12a6",
+    "secret": "8770b482a5bb6d2a031efc9de6d262f44cb1029a3307dfa1376f5408ba06f3a6"
+  },
+  {
+    "public": "120e33eb146b2f923db3f189b762ef0f4d9140d488e963347147c5578d31732d",
+    "secret": "75986569e290131acbf0fddc8a3b5f43ff641aff4810e91191612e189f0bb974"
+  },
+  {
+    "public": "acad50c1996590abb86142326fafc550cd9acd9c4f4770e44aebf5bff37002ef",
+    "secret": "04c96b627e91e5aa137f22d8ab05f05bd5a4a366a00bba579d34f71436fa8c5d"
+  },
+  {
+    "public": "aa3869cfb327cdc86d500c54e9fa8a6291cf3524cb17f5db75336120811112c4",
+    "secret": "284d5f59be2810274296b1b7f7a04bcb745b23993617fd923537c7753ce3bef7"
+  },
+  {
+    "public": "400fc613204daf2ab083c0f16e6b24f4f862be3d4f5912d2662a7d5cbd2d6a61",
+    "secret": "21c72972cd929c4cf8e5f24c0cf043b2903646eec04ef986d6a73dbf1a152ea0"
+  },
+  {
+    "public": "a2cbad8ed72f4f450e738ac4893cc40980f1a076a9b63bea78d10202b2743214",
+    "secret": "c2119be02acfc779cdf76ad5a820e433878c5bdbf5573233cd2689c18546cca8"
+  },
+  {
+    "public": "00e31d97420b0da03e7d510dc20c7fa539cb8ad31f81f01eb8da2f06e8662bda",
+    "secret": "7b060d03dd03ab52e268dab04ce9dd3e5a31351d11d8e841e3beee562a4c15ae"
+  },
+  {
+    "public": "2f2c64df73fb8c21e21f6866fa46283d6d48e1d6284b20f8c8b9434e7d05f50c",
+    "secret": "ed230e2ced38caaac4fae98075d35cb0bb8959daa2c371ebc2f42342e439cad0"
+  },
+  {
+    "public": "824bdcb6f88c35a124a7074ce5790961c47245a78e07342450a8588378a4f5eb",
+    "secret": "0e78a90e210e18870c21f057d253178375a182a40d2452934ee8cfdcfbc9afb6"
+  },
+  {
+    "public": "d793349ef0b5bc0404658706c014fffe49256dd83bd297ffda10e7b0dc650050",
+    "secret": "33ca66d1db746f709fd7a5538f1045d0633ea41e8a007fe31cb6d4bb2a595f0f"
+  },
+  {
+    "public": "d514f360d2060a08fcc5b9f185ef77df2eb0e677cd1d3a509ac811f286b11870",
+    "secret": "a99d1cab98448ed7ff1754c4eee2272de5585446746841620ac6b9870929285d"
+  },
+  {
+    "public": "78d778406068d98e8c2e726151e0d834cdace5e10dd1bbd7e37690a29fd51041",
+    "secret": "a4309c020262f11016cea49a6abb80e1f3c98580862676698a4366e7ffc14e4a"
+  },
+  {
+    "public": "6ba2ae3a8f27f1f7d2ad927825f1db4d71846534d679d4035ee1cfc81b21e61b",
+    "secret": "9cae8aeef9a0ef5775e4682c0a544545f0ee7835d71addb5394a43097feb4627"
+  },
+  {
+    "public": "ad6f9324f571dd3f3ee5565b48fd8a1118e1ca437881794f8606974e5457d810",
+    "secret": "7579fd8c239d03e7cf2d26fc032058c11f4a2f599e5a1f134a2fb5fa6af5c0e3"
+  },
+  {
+    "public": "85f88b42183e14d07a049c7d172258741a96376e648b2b44f5721348ba798d7e",
+    "secret": "5c1a94f456e5213c34edf44278992100d82568ff875f5a2f9ed94abce96fde0c"
+  },
+  {
+    "public": "0e5e25e9a46f00a3bf91e4a2162bf2c36e83a621d83297fc01ec1c419017d2ba",
+    "secret": "eaa714fcc14e804968e748c98883262d0d899032dd9579be6cb1a3f1f1324eca"
+  },
+  {
+    "public": "36bf532425a003d1720b39353094c9d7bd1c6592a7a64d4774fb3793fedb36d2",
+    "secret": "a976add6afb11fb96788fd8431d1d973bb8a02dc211942b0192f360407d7c60a"
+  },
+  {
+    "public": "634d9f2fe5a7086f6b498e1a5e0569a9dd05e93ea6923555960568f51599bdcf",
+    "secret": "0249977a3d9e61e27990dc69d2042e08dc1684d642abbe0f2d7a5e441d127d2c"
+  },
+  {
+    "public": "a6f61540bb2516934c275e8c9c35fba7cf2db95aeb98052a647def13dfeb1789",
+    "secret": "0b46f03c5230ba7001b10da617ef00f52d4eaa30b207fb9d3cd9085587e29cb4"
+  },
+  {
+    "public": "9fc37e05528017d01838a199f51789dace693de7696eab23b288bd64dba15b60",
+    "secret": "f25953d06d2a442a5b9bbbd33f58ef76bdec8af43f9d17f33589eb30ff99c062"
+  },
+  {
+    "public": "25cf2ba3a63568b67b008ca939768f77c4e6620a3dc9030ce76f5057f77084ae",
+    "secret": "f32f49b1ab1f6770d393e035dfa4625400b9ca17d25d98c64607927ef70840e1"
+  },
+  {
+    "public": "3a887e859deaaaacfc9ff7034ac8c235dd76dabc12d08e37a281a4d115f03f5c",
+    "secret": "469b215a43147de7b3a7715d78a3a3c1a2c407b7c3b822130104cfdae02dc39e"
+  },
+  {
+    "public": "1a3b2a6b43566639914a38d7bc95a557e999acb2d03202f2c3d4f7fd8fa93a23",
+    "secret": "e2468f03021978cb814568b515f294558bf124e261168c32a5925baf214939eb"
+  },
+  {
+    "public": "558384341aee91cf9b3ef0488928f747dcb167e63222700f0fccca4fc2e7eb8c",
+    "secret": "23370a4877fb453aa48ab833653e8bf27e6a974f67267b71d752294ab459c762"
+  },
+  {
+    "public": "c2fcb49b7730b577b08238a42407327436bb5ff1812602c6439f187708b46d1f",
+    "secret": "b5f5065f3e6e657d8e7ae8f5a7cbbb7129552741d0c435d141d68c881da3af68"
+  },
+  {
+    "public": "ae7a555cf333e642d303fbdbf03815123ecd6705d97811d3e4e674efc8343846",
+    "secret": "d1d62631d5728bc22c631cbce44b47a29df07757e59760a13723bb940b088422"
+  },
+  {
+    "public": "4def94818656a8c080dabd06a72a3741ab4a4e716d1ed5a6625526ad5a266f53",
+    "secret": "e4452c65ac06aa06ceea30eff7a6db8276e809dfc0d3c5453cfab9dc301396d9"
+  },
+  {
+    "public": "97a805d3b12649acbf9c1db69ed91e7f20b669cb917200826e91d1ee3d2bf47f",
+    "secret": "eda240f74f23d56ec1cb3e0158ec94f19eeb86e6050f751b0c4a32c2ad4f8234"
+  },
+  {
+    "public": "447d1d75b850c2c7f02058ef38c868ffe494df3f2fb00fd67eb7f38ba7d776f5",
+    "secret": "e183b14c9b6c3250c7ae892c21513bde73819443deff2c72f81cbd71a5c8a4f4"
+  },
+  {
+    "public": "f01ff315c36ba40d32616da88659aca0c43c52aa69cb9b4a1cce2894f781db21",
+    "secret": "8be6cfa6ebf4f73b4148ca36bfe904e930001ff7e2e06b5ba9ed71733aca7467"
+  },
+  {
+    "public": "2b211f5ef3526b0395a793a7f7b7917f7fb20958a95e54d0f53e197d882528c9",
+    "secret": "2e9fdfdfa885c5acd2411e0f0f86ff70e693d41af60b85aa28f0b73a665334c1"
+  },
+  {
+    "public": "132230301b41467209c3d9272e5b2019c65d6cd392886f01ed20cce131d283cd",
+    "secret": "c66cc2f557cc33e185b154496ac2bc2bff696fbf317b6e00254fe23fae3cd297"
+  },
+  {
+    "public": "8213f91ef030df32815deb30ddb9c01beaf8909176754ba77da2a5d6bce1d5fc",
+    "secret": "74e64481d61a7e59cf6e82b558abe69e83494bd39b9f86410f4cd2540eb5efe9"
+  },
+  {
+    "public": "d14214184e172154353d2d93fa3d6b226afff9c1912b40b72c7deedfe3c449ac",
+    "secret": "2344182b9f37c2c42342984ac5b8f8881debf2e19eb0ee7dcfa9986c8f814d0c"
+  },
+  {
+    "public": "7dffec32d1e4c56caa3c300498a5e934b8a210ac781b3734eb7caf47bfef4240",
+    "secret": "792547f88f4cb70eace09bb5c7b2b5bf49bccc8ad6f6755772032c886d294a35"
+  },
+  {
+    "public": "9fe266d2c934871500bb08dd3eea440c1c803d2759211993bf109ba2462b1189",
+    "secret": "2671bbd49bebdfa23c3a9d8ecacafb42988dec55a03d86a88f25107c86f3f651"
+  },
+  {
+    "public": "eb2fe1f4f76a6ed5725597342a7572c84e60587ce3f072ac403c149945fed10f",
+    "secret": "d3fbde35d3a6be5e5788a4f014f4d0cc2013a1105cb54cdea7a887a92bcc6e03"
+  },
+  {
+    "public": "bee7e5b9c22a51dcb65ac7ef717670152c38ed4b34a3ca47cfdcbc0f4679ede7",
+    "secret": "7aaffa3eb13da5baa30a4fe7ac3c1bec161393e50ae146ac7851af3628459109"
+  },
+  {
+    "public": "dacbed0fbd4f5bffffa6be6b650991a0351791034f3faf586eefcb3bc921cd7d",
+    "secret": "9e66966a404afde2f4c20747928f55d2831acd9d72019904afa9fbf9c5342068"
+  },
+  {
+    "public": "28d7821b3a6727d7449a80f471a4977c148e57e50a378bda32d45c72d7752c9c",
+    "secret": "538e34a667b7bfd00247d80cdad4a7de6472cacc890005c5503f940f185ed774"
+  },
+  {
+    "public": "373c2ac636467bc378a6346a1509459f06c0408bcc6129cdc0c6d0f397d9e1f1",
+    "secret": "d372c764f5319a2744da40dcfcc30b9a1dfa6f834832c4dcd6c4e166303bd977"
+  },
+  {
+    "public": "ad156eef21e06d1b281ec2f9fcdd393e0abf58573691f4993dc0166a9f9ac46c",
+    "secret": "124f23e95836085c389002af07bc5edc76f229a3cccd13cb2d5209c95f690de0"
+  },
+  {
+    "public": "b6370d0f1e56be7dd38e9eb587068e1d34a2cf8dbc138b53864604e8e5094c34",
+    "secret": "56fde18c6bfdf0a1b097e93d786257130dedd3a82f203fb77218b1256f482bfa"
+  },
+  {
+    "public": "3b9bba6e86205e128879ec09973af4494783597ad2941d838b66822879111d13",
+    "secret": "e77404b19332e7821f353497b2cc7af0e2130c674d4b82d74bfcfa408adfa9d2"
+  },
+  {
+    "public": "e7a7651f5cf13c46abd9775c3000dc51a2f39760ebc01075b06ddb4b5d83df59",
+    "secret": "5002745c441abc76d31f3fc90ebcde150986246ce6faa51af49d49331756df3d"
+  },
+  {
+    "public": "18ebffac8e39ca00ead3eb6c91769f56ed473c3c3f64685042c11a70538b3ea3",
+    "secret": "3a59bc523bdc002ce8b263bb7132bf0902f7c1b69e2101adbf198226a59bb180"
+  },
+  {
+    "public": "31d6df214c6244d944534b751c973555a63bceecb832a21eaf91f607d1322e27",
+    "secret": "60661d2351f05e9fd6b827df3034b8844a9b123d0a949b21bcb766bdae742141"
+  },
+  {
+    "public": "d85eaf57d00db006e571c1a3f24c53a3c8c4efc8698eda48f80a937358e519cf",
+    "secret": "65462b84a66b9899a04e2db4753acf7b84d35957336f43e72fc4a389a9a19ac2"
+  },
+  {
+    "public": "6138af0e8ec5042e5fca8ba8107224d6e8fc490285c779881c15440b813f8a0f",
+    "secret": "ae215bc331aaf9a9bf3079ca74d234079d45fc194b6e6fd5eb2ef0a5555d1f45"
+  },
+  {
+    "public": "2697cc15cb923cede7bdc396469cba1726bce780d9957dacde152a419eed6054",
+    "secret": "67f90959b2a6336c39573a170878e9a8545aa968bb2b3daf95e250243742494f"
+  },
+  {
+    "public": "ee52ac2741a8fd71dd0a281e4a59ab15bedfe2fd061c2dab268fd3a14f261780",
+    "secret": "3341891b2725236c33054dcad9060b5acdd4a3beb72f1f688b2eff2e5858a955"
+  },
+  {
+    "public": "38ccf066d0516c99a0f9c516b25873a3c45ae5a28c0b4ef5b0615ceeb2c689f6",
+    "secret": "f06d6baacff05f0f5bde61f9b7d4f1656f1ebf0d4f1e84e13e1b3cbcd12cf010"
+  },
+  {
+    "public": "d3c8e270a639970842c0014c371b44b6d09c723a64ae42fd6db66e9856fe2d6c",
+    "secret": "2b2d0a4764ef784f8a8040aea9bee908a54d7d325d496a887b7bb384bfd52edc"
+  },
+  {
+    "public": "0d4adae5ab23aea35c43ade2da1de0a5ec468c437608c432616748f7615a7585",
+    "secret": "c2a9d1aeb664dd70de3018932fe3bc94f67c27e6515e092fda191eff7a65898e"
+  },
+  {
+    "public": "9f60716a627a065ca68e9b262b8fdd0dd1dbae0e360e254514631b680c1060d6",
+    "secret": "dfedad30b5402125e14d50d1868b22212c93a0330e2e25647a10603acfe87ed4"
+  },
+  {
+    "public": "ed0cb6fc572386232c10dad68a480811e78b73b6f7c489a8a88e574f06790f71",
+    "secret": "748694b9b3607680e7e1fa09a2d17a3a8c21911a9c6e5c734bb54d835d5f6c56"
+  },
+  {
+    "public": "f173b30fa8784e006925b0a3a58efaecc08fe5bcb6c1f009f14986156d766aab",
+    "secret": "271e2e8e13f5767bec74a4bdb6e6f707ac841917a3c3396463048803abc4c481"
+  },
+  {
+    "public": "c70e6db7a78148d4bbdb164d5f212049f020980edfae8ccde7ecb984459fc977",
+    "secret": "baf1550d2ce100bc9c62992c61c37455f15b596216c30b24d92bca4ad26ec8c0"
+  },
+  {
+    "public": "35da7c7fd7e297fad2992c4151a41d2d7c78d4cb42b94389f55a0c53daad65ae",
+    "secret": "6d59306d9cf83ad3099254a805686ef429c3b8e5607ccd40852936a329612aa2"
+  },
+  {
+    "public": "4c7d78df12c3fbf0688ee25ad685dbdc9d704250b23d5bd1c8f38e87cb59e276",
+    "secret": "e6a00bc388abffba63f10be2c02f2f9ae52baaae54e8bfaba491171b0dd203f1"
+  },
+  {
+    "public": "e7dbb340d0e18e555a7c59d40109280daafad40aa4f8547d51c2c6540eb68bce",
+    "secret": "1814cc7e982a46970d9701c9746665de5169b97550b4b42344205b5ded696097"
+  },
+  {
+    "public": "7423f7279af918eed9199d366e5e5c2e49c8729b8f6128648a7b9bf7ab1fd1c5",
+    "secret": "5247298819104301d628ce09061371198e2b1b66024f2da83cee2870a5485570"
+  },
+  {
+    "public": "1667a59051edc3e646fc75f5ad6db0d415471820f289d99dc8610835e8d8fcf8",
+    "secret": "78d01cbfbb52ddebeebb2000c72ae37ad873302e845cf4da442947c8ba16a723"
+  },
+  {
+    "public": "e1265bfb04ef05a30bdca580593a26318ed688e6e29d382a3ef6dc421b225e51",
+    "secret": "1468c77a70daf4baf22ac1b1eb02b388fa5de8232d22934a7a87d373889ac0dc"
+  },
+  {
+    "public": "516f78ca725241f5447dabe1f34f58415ccced4bf721a8ee16c62b16b13d94d8",
+    "secret": "da877a57fa764ffc92acc5a3d7c6076bcdb6d82003410e2a800f0e2acc588176"
+  },
+  {
+    "public": "402e58ea563a3d085817603915b4222af11355678de231b0633026d51e1fef7c",
+    "secret": "6834344429bc6fb308d8b16f1e7f19d90aab1e80ad5beeeceb76394e62b02f10"
+  },
+  {
+    "public": "7ce0caf21aca02e21507dd3efefd906d68a9d4fe6e239a76064c8961bf46ef41",
+    "secret": "f406a50d4dd68c8cff6cf494c86687e3640a735bb3d06595bdd293fe90940db6"
+  },
+  {
+    "public": "9f2aad5b2add509e3318445a9b9385a5c1c0a647fb364b5820012759201e919e",
+    "secret": "506c0e1925dd5011d3d8e7f1e64159364c3aa5efb02e3d0a910e7c67d299d242"
+  },
+  {
+    "public": "09428832a3c0c2b977dc01698a7c657d1190c0de5ef43ba7206d8598b9cd5402",
+    "secret": "c4201d56481f8eec017e2c84bb24f328ccf89f38cdeca4356831dd34c5c870e4"
+  },
+  {
+    "public": "dddbe6eb344ddbdb5b60815de7f69ca367b2666e341ad02c5238a46eda04291a",
+    "secret": "c30cfe188d325b1a92f9e7ce0c951e0b6a068ac23f0fa2c6a602f6c386c9c964"
+  },
+  {
+    "public": "e3642b4e1ca24da5cb16e17c8bb89c6c05b219db9f25ea283be039dcdd63bed9",
+    "secret": "95eb9218e4879b514c33b7e869fae42658a04ec7e63ca771fd04479c66e6f99c"
+  },
+  {
+    "public": "5a3fb4e516e81bded9fea3b9f006c7f9fb13bf0d4c19b194315f7462c0faf3cc",
+    "secret": "af1a1cf89ebf817d7ec833e7313fd9eea947520f8ad407fbac61209a96ce9d39"
+  },
+  {
+    "public": "16de4cfb4c9e68578a03493ad66b12aa1f0ccac6edc1905872aad49706478226",
+    "secret": "99362261f0ac8557423b6f00406be0f25dff1b843ff4c95a21f9bc447b1fb4f9"
+  },
+  {
+    "public": "8993fffd074302047af1509ccb42759c2492508795cf511d064d9ab972ea9ff6",
+    "secret": "1972505da5cbb6442131f7c5a5818c9a59611145bc5266ac68de02e63917b3f0"
+  },
+  {
+    "public": "18ceba81b155310d6169d3a9ab49edcc212f0d8bd93ee97a542f6a097d382b1c",
+    "secret": "641b5ddbb40cdea25d28ea37e2eb18a21f5419c648a532ada23e2afcbfe4e6ce"
+  },
+  {
+    "public": "c6c50337a056d60a7fa9c75f4da3a456ce828cb3e4d8b9bc6ddbd2db2e0076ec",
+    "secret": "867b7709c14325aeac55f546f977829e886cd0b03f06eba629efbb7e9352ffef"
+  },
+  {
+    "public": "317d2c77afcbf2c8501614f04b7879599df0da7d14a2bbd223840eb4b0c4fcb4",
+    "secret": "7eed86bb9b3b6f9a351eaeb550b87ad09b2ce639d7b51cf042e66db216cd475c"
+  },
+  {
+    "public": "d56140b8655564de89cc5d781710258ba6d95a8c0abb3bf27f06e50b9506aed9",
+    "secret": "18e208ad29461dfa6eeb3c779080c0d1c7494f66e87758b3010edb0e58ce02da"
+  },
+  {
+    "public": "c87aa520a5d90ace080ccce15ccc34f76a680f78a349cff58dac21e0a8d3fb18",
+    "secret": "f440602261e9312c70460a57d81cbd6e88ab1d582b2b00847083aab2f92bdded"
+  },
+  {
+    "public": "99d0bbe1b1e6bbadd8412880b062c9ea08a508f2a02e68185971e467f1020518",
+    "secret": "f42517fee107adeac3a582b11c96fe35fb579f750d77d2c9f19d9a414efa4242"
+  },
+  {
+    "public": "114f2f9eda2f99f53540a9f70011e3e94769c3afea73668dbe6bc73d3c9e0f30",
+    "secret": "ed8d154ad87d0dedac8455d749651bca0d47260798778453b934cffd072ea4a5"
+  },
+  {
+    "public": "25ffd0cbd71564f731adf80459dd338854295e0c02d71348d754bf287736676d",
+    "secret": "7aaa1e190026d32628c48e662e7f3080a61f99f2e7988b255683f2e92be76e74"
+  },
+  {
+    "public": "8d024712ebccc2c332e5138a0803514d5e7663b24c7d387e8a57b73c9cf24a50",
+    "secret": "ddaf235b0c0d42927536d02f2d48ba47f5c26c546ffd7884d697ac4b88d111ca"
+  },
+  {
+    "public": "3b653ab6d944ca26e46bb7425a90dc26406f0c4f096831f649aae9745798c16a",
+    "secret": "d156418fe6e1c06617c90b6d7a2709622f9a1827dd5f3fa03913898cf65b9866"
+  },
+  {
+    "public": "71af084cc1e8c378a7956aaf770ca9f25da3cf225adf8aca58eb25501404742f",
+    "secret": "79c0ca726c41380d5945a308839cb0c70a12dc6dbe180f107bd1b7beb7bede78"
+  },
+  {
+    "public": "62c5dd699019628b6ca3fd9f7bda1bede4d44752335adc5c75c190579a66e7c2",
+    "secret": "fc30a39b8a88a5b79fdf904a43e7c181f01418f6cfe7fad14700f0293c5fa1b3"
+  },
+  {
+    "public": "7dbb48ad1d91afdbd119a141660a801686ff52ba6a61d5e37e3ab016adac74b4",
+    "secret": "bfc2a182920503713783ac2a73fe8f443baac7a8649e18e01a57e3593b3638f7"
+  },
+  {
+    "public": "2bc6827cf9dddbc5ca3074cce1d590d08f3d6de9c2e7bfde4bdc23ed854a0e2b",
+    "secret": "92ab80d16180f29b84d5076130c527a2551b54bfc6c3d884b71f106a682d6092"
+  },
+  {
+    "public": "17e8f51360445938f02441cc09e7ce7d3a9c6278643d68c1ffd446228bdc9aac",
+    "secret": "8fe20d8d6dff9c90515d268c8ee9a7cbcee70d1146dd2e9b3eb02d86362b2272"
+  },
+  {
+    "public": "3b4c5b8e662c3024248f19721ed19abe10c10b7eb1d8ef19f5a32d5634830ea0",
+    "secret": "27f8e6b04da3fee0a522cdd9761a31dcfb7f58fee470cf387010c5daa1a36183"
+  },
+  {
+    "public": "524e5a7181b41bb76797ff4bdd16a3850244080fc1a36ecee7950225b62d797f",
+    "secret": "d22b5b6e173a1121c832e9093240251066b33d18bc106f1284d27b561f58cfd3"
+  },
+  {
+    "public": "a1d458360090a16a8f43036a5e1c1e0774e75f906ee9f53afda140056abfebec",
+    "secret": "740418c953c6301e77071026fcf2ffa42407eb82fec80b514b2e13ae96eb5420"
+  },
+  {
+    "public": "aa688df90590dce696b84072074e1be9b6de33aac71123af0c60424f3c13eefa",
+    "secret": "8c070a6e6f217f0bf0e87c7b190475b7a5227ff0439b7962570a687bb57d87a4"
+  },
+  {
+    "public": "04c630ed2816c28b70ea87a5d164bddb4af81b4fb03c845abaf4f6d6970e3b59",
+    "secret": "23daa24d3bfb234f6198502ee8dbd0592137024e6b04183a781903b362cf9982"
+  },
+  {
+    "public": "715787e51b5bae42f7cf2990a0386a12f2d91cd02ef89207ad280a542ac6c9a5",
+    "secret": "51fdf3b693ae28feed83914ff4c1ee746d28738de191a40d13fd4e88708c7b49"
+  },
+  {
+    "public": "ab8322504c1f8c9fd3e70d180a66c13d6dd5cf10693e195eae6339545baf3316",
+    "secret": "180fc0ed844c79893a839bb122945534f26578d788f2a6b84ac7b9280c92ebe3"
+  },
+  {
+    "public": "8fe3769c35c4b63a5cc087f43cd401c8fb00959c8d454371b8de3f07795c2859",
+    "secret": "d16312938d77ed68377c30649cdff719a9b89cff1c1f0be12d2086041dd099b4"
+  },
+  {
+    "public": "4d2a4ec8635a13be9ed8b7de349ec40bca6a17a78582121d616949a070aa8b04",
+    "secret": "7e4f9be376dcbe4fc85e4ad55a874ce720a62e5423dee8f3474dd71329fb1d53"
+  },
+  {
+    "public": "920a458e17ad78f74dac7bc4ac3fa4bc8e1ef1e695d6e109128d657e49a0d619",
+    "secret": "6c7edca17f1e189d48d90b65572ecd63f43a3086c758c3bbf2e2aa228f5ca06b"
+  },
+  {
+    "public": "bd4a4d9b36ad4be451f1e4adcc46877e4cb5561ce9502fdcda94f9082e37ecd2",
+    "secret": "c90200b2f0aabe656007f58f665792439d467c7bffa244cfc76e015b21e16b7f"
+  },
+  {
+    "public": "b14b684ccbd84a93b10bd19ad693261de4b1baf56b3ba6860f885da2d2fbb9fc",
+    "secret": "69fe8aaa522e120c908cc60936ebe58e2f0727f72320afd334d4d71451fe632d"
+  },
+  {
+    "public": "c593ce514c50fc4fb277c565863ee1afeb2fb5ebaecd249e1b0679babaa459c9",
+    "secret": "a3463822104c9b9573a9403955eed1cc8309147b73d29f582410ef7351a31692"
+  },
+  {
+    "public": "21dcfd4c20a9824532f0f1ed27ff380946ef4378b0775f25f4449d23c6cf1fd6",
+    "secret": "48d50682911774b7fef95584af3a9560a68494a122b7ef2d97a96c1c6602585d"
+  },
+  {
+    "public": "25cf5d62b7d871b81d1111f853494d7ec822e86899e80f6917d083aec1484c9f",
+    "secret": "61b1157529b8e68e3195132aa30cdb636d7ac5af7381ef1830b19a2547a059ad"
+  },
+  {
+    "public": "4505d7ce2ae54e394aae10a1d49883166b5f80c59d865b561054d897473ff369",
+    "secret": "6ee6d6037a507752e3c453e8f06f0e3ab6646829711750727ca84b09e97f1a59"
+  },
+  {
+    "public": "9133e4ce8bdfdedf59d055808fd50a69e2a0dc69575fb13ecb4e5c245861dbc8",
+    "secret": "a768890be5cf76413108c760f398f08a41173d4108bb6f9a5f86f5da38b0c09d"
+  },
+  {
+    "public": "f0a4ea8fe6204fcb7be3e07f9c4dee94569807594f6c2d7396f4f3aa70132d27",
+    "secret": "9e186e47a8c11a2cb84006a48a4a469771aa846e0502d5330edb0f4c87e2da44"
+  },
+  {
+    "public": "16bb5c190cd009559020f9a35ee0a569cd934c4a18b14656559292c35b29a2f2",
+    "secret": "5629910b4799ac429aff93512462c6fe9e2f73d5fc5882dbad34b2bb90f599cb"
+  },
+  {
+    "public": "985106d3966ab9616620dad9d72cf0d57b0f3e4a7ecab51b16bdaf54e01cb59e",
+    "secret": "c73ec8267ee884a754b16ec368c45fb028d5e3b761167440e9948a8c93312dac"
+  },
+  {
+    "public": "c5dbe23a2f91fe93feae57ab60dd604af802254b2d8636197a0d0d0e0cebc0ed",
+    "secret": "d89932efd5254a105795c879f98fe657ce5fb689dd92e544739f7d27e61d8e0c"
+  },
+  {
+    "public": "1fde65fe328dd6ebb61d139548f465ce1de0ec5161c64bd32dac4d12a625a6e0",
+    "secret": "52721f640b55a539dfc7ef36126523cbc99a720a596024309ebccc9848a75bf4"
+  },
+  {
+    "public": "2b51d861a5dbfbe8b3aa566342f2391c3349a7a45da8d1df3e8109f774251e76",
+    "secret": "ab077f222429b2e62720fd43b471d727bb2a5b9a974f686d3bc97cf3b3dfc453"
+  },
+  {
+    "public": "f9f18b9eb56be945cd17149e9a95f9578daab1771d24ce7d96daf9343ee01bb0",
+    "secret": "0106d344362098cccc5396bd0f62b6b6719ae2973da3213882e915295ae2285d"
+  },
+  {
+    "public": "8d6db5e59cd29a8468ffedc544ad4aa98205a18ee2764ad3a03e6d8ac35bb624",
+    "secret": "89bafb93eee78ae1a01f67ad0701ca1ab51fbcccb5db62c11c0d3972e2a63cb2"
+  },
+  {
+    "public": "12076f7e321a2c37bd4622ac5c96733e45df983f5cdec136e755eb97d0504f6c",
+    "secret": "3b1cbbe4f041c7514caf2e62e3ac112b900c63eaf63580b20ff7029fa6ffbdd4"
+  },
+  {
+    "public": "7a993733184be08185226fd08432cabf7689fb065611bcc961ab1d8409d4930b",
+    "secret": "249bc0476998e9b9a1b176ff216aa750602b03e3433b98fe2f9b98dff3d389b9"
+  },
+  {
+    "public": "e448cb68dac457fa2970f89100ce00069b258f6c71867ea64123e316447eb2e8",
+    "secret": "ab390f49c1358cc201f49bada8cf8ea9079ee6df117849b40050e78c8cc79e4d"
+  },
+  {
+    "public": "2df97543f8c2546b9ec854be5f7f2e5518a153d6a0af739c9c987f411573c098",
+    "secret": "593292995510a4b2b3c5ee3df9ed6acc7c968ad52916d2d7193bdc825be32ea2"
+  },
+  {
+    "public": "7f84571e7dcafa9a062b91048821fb839739c46472a0a4583acc9834de49f939",
+    "secret": "125975aab2dbb1a3907d7bbc0a72b434fb658886a51e86b23aae57f148edfa28"
+  },
+  {
+    "public": "e39deee109f2c43fb80d028c50a70f77ae3fc00679df1c8144dce4fe95b7f157",
+    "secret": "7cc504de1eeab29e0cb891f2e0387874833fdb2a6a2e31113237effb6c91c85a"
+  },
+  {
+    "public": "bb5f2f5dacf0d1316d4b1a71d2818a165ad6dbb5afa7a1c40afa2f6f951769c6",
+    "secret": "ad7a7eb98d0bf9e2c9f780125b21c397c3d0e6ca0fabc52f4dbbac3eb8a605f9"
+  },
+  {
+    "public": "f9a043c6d20db193fbdb42e5cee3b79e8571f0c83ec62ddeb40dd0e8537b6b97",
+    "secret": "0ba287f9665b8e46ae129f718f25a2ba05c94ec038c13e2fc81cec953b477277"
+  },
+  {
+    "public": "e4cefffb2675b9e60b976af71ad775ec951e2ba94c613266bd61a809c1363e76",
+    "secret": "2c8280a87797e86d7196a9e56a214b538bee0e5ef22c694d2d7fb040f65aadcc"
+  },
+  {
+    "public": "0d3622a499ba3335184b68a271ec78f2599fb6d2edfa4dfd7b1f703a8c745402",
+    "secret": "0360ae4552301b295ce899d38602ae750052697fb900cecf8e99312bf113bca8"
+  },
+  {
+    "public": "dc36963d8cbbb99de07a86253c084ecb4be0ac0554e2d4b37d0eee43027b87ae",
+    "secret": "8138a79a9100ce550b41f77dfcf93dbaac26db94ac052b396c33bcf69891c190"
+  },
+  {
+    "public": "9ce33ac203f9a20c11cab1b054722886df325a9fa40717bed452b12d8ce561c5",
+    "secret": "0a1139a866885e681c73fa4bf320ca3db08e7cbdc8e70be3d395dfff90cd6c81"
+  },
+  {
+    "public": "6a4c30efa3318e23b712c6b641b7c6314d3856ae465a7c34c296cf76654b8dfc",
+    "secret": "fc241685830e450de334e644f6589d0efea6d1b59c5e6c70783146728550b112"
+  },
+  {
+    "public": "15fd03fdb91b2b2e5522eabe49f4178483630045ac5dc1096d38fac6a0216941",
+    "secret": "40038258cf50cc27c535a18ca0774db01fbcf56da5095f4f047cd64131b72def"
+  },
+  {
+    "public": "632dc8276dedf3b9b5e2353637ecfc69f6c450a72b0f196970fb0e44ad31afbd",
+    "secret": "201c51f68aa46d01bb06b6422028464faa063c789624c85df263b9c9ce33b0be"
+  },
+  {
+    "public": "9b8ace5447d582ce799635f8398d5afbaf3ed4b18ca4f87487a53407e149e7bf",
+    "secret": "2030d4dee699461bafd90028eb7c7a2a589ccf0fd27222ab5a5cff0b065f5251"
+  },
+  {
+    "public": "1b8e88cba351f15b29c8087c5d693ddaffa18972939970d77de2ade5882bea32",
+    "secret": "01afc4eb1fcef0dda07fdad833771ec708b60cdc115902d7162a2f3c4cbc6933"
+  },
+  {
+    "public": "c873b1e67fbf90fbead47faf86bb3b8eb2a3953c33339f1646b2dc7696eee51b",
+    "secret": "f686b88039bf48f07563d9441437ea4c63df333c0bd09e2b745f99b10cd33c1e"
+  },
+  {
+    "public": "33aad64b2ed6f8e5ea96245c88d78d342878d75463ed8891f37390cb6e48977f",
+    "secret": "e49f1acd8cdf7e96bcc509cd6fe1cfc151b9f2d54be5b047a23260807f4ac315"
+  },
+  {
+    "public": "592c2547b711047da89892e7423f293d8389d0bddc796436bab48f854b553084",
+    "secret": "34f73faa5d6219e4efa92020be4a914a2e963398972ebc985a4fc5731321ebe0"
+  },
+  {
+    "public": "6573f68aa7a06d2d70de392e13474e9f81d0a91a589a3d27b21426a0de8225b2",
+    "secret": "0bf78dbb40b68f2ac3095792ff12681627e432df3672413d30f0ca350cb040aa"
+  },
+  {
+    "public": "69131d5322b58fd023c3955057e68bfecf6ec758223906aeb8020ff5ca4bf9b4",
+    "secret": "672d7c4cab6a10af1aeec49a90ab1e8ca78d42bc3d36211c2cfa8d0bd73fcd94"
+  },
+  {
+    "public": "3ada6236e05f3b92526a8a45685d737d1b22ad551f96d32d80562917feb2fa24",
+    "secret": "3c8ec6d12dfb03cd9797d1e2b9d9981c9451fc2b280e4d846fb5856242f476ab"
+  },
+  {
+    "public": "384707d0e33cb614edb057200cb85c805eafad81ef0c879ca993da27df20e8af",
+    "secret": "009dcb17503d25a3f0b9334b87b280f14c5acd69f68aac2f7e42399526ab1025"
+  },
+  {
+    "public": "f61cc3c3ba9e91350bbf1fcc7cbefa56bcd4554ef46bd99ffa7b71b98f707d03",
+    "secret": "969017d4bb2f91a3009f6156ac43485524f78ecd1ccdfff33e470825e28fca72"
+  },
+  {
+    "public": "73aa7fda4687aa9397d3bf1d3fcd050734e5e30934a8587a8bf75c25ecce6849",
+    "secret": "37978e52bc8b7247d40390d07cb77e47cae8f88cdb6ce43c228b32b3f8113112"
+  },
+  {
+    "public": "6efb662d33ea0d347c6f2679d9976d92453d5c168e90477f57c654fd173da8b9",
+    "secret": "aec2ff545b6dfdbfb5e7fe98567652ca6032278b395068fdb15422aa82f3783c"
+  },
+  {
+    "public": "1832553df6c596990dead79409861ab3e428a45f6ec23eb39a3a1ead3a39bd3d",
+    "secret": "b8559cfa4a253ed6d08f9cd563587627d6c9696eb1ed2e5b23af8745dc0959e7"
+  },
+  {
+    "public": "0b2a803982a55bd02ecce3d32821b20b622c5ade803048d51f0df831589bb9a7",
+    "secret": "ab3fc4f30d6da9caeca5ec7bec1ac87661e982b066fa671c35056305b02fb4d1"
+  },
+  {
+    "public": "b7144bf18f85e69981ecb6243a27e25e8a10f79179ed04d1f67fab2f1ebd87ae",
+    "secret": "b1bd56e41045e0bead491e990c2db563349e615ca84122c2880c1a1da41b7c3a"
+  },
+  {
+    "public": "5fc5b6ad9cbe68eb522f080a634e4417fc48908c466001d84b725a976ef27764",
+    "secret": "ff9b1cd83392940ed2734d5fd0c1eeef30745fc365abd25aa7956a8f70819ad8"
+  },
+  {
+    "public": "3e81bf7f9b9e787f8e0e7142fd7be9a4cc732079f79d49bdfab735cf55d1e27c",
+    "secret": "fcd367665b9e3f05a56dfb67d9ae7d107cd5f68ffa2fdfcd222bc639bc6af959"
+  },
+  {
+    "public": "b8ba75a68a63bfd503e6fd2f4f83c232ace4bb37ad373bdb9353e24aa7705173",
+    "secret": "7606170a9a1fbb000ffba7257ce8903dd477621305fca1ccb84deda626570481"
+  },
+  {
+    "public": "6ad6eef3e6a471247a09047a7c977cb366c2263d90ed8fb55e5e2440f2d337cc",
+    "secret": "f7e4bb73e177325571d1151b9d791216294b69bdfad075b462a3a931dabd5bee"
+  },
+  {
+    "public": "77a0065d754c203bcc1fc83ed4efdc3afd680994a4dd713d9055c7046adfb1ef",
+    "secret": "becf3bed33187b9ae3a05c3f4dda8756e6d0246a5cff67c94d430daef768d910"
+  },
+  {
+    "public": "18137b3017ec776ec700e79c94c994344e603cd12ea216464b6f7dd474bc8b01",
+    "secret": "a3ff2cafb4bfd1265e83f8a7c2a344ea2db4b36bef4f244a7587c99302ed4b38"
+  },
+  {
+    "public": "ba61930621cf04e0a07cfffc49f6281d65dd8f5cabbb183e0c7cadc906b8fb09",
+    "secret": "4d0fc2a9daff402fe046b028cc7904b60705e41dcb9e34980bc2ec0663033466"
+  },
+  {
+    "public": "c418d4d95c972063acf51cd2bf89ab4b7d2df46d060517de0d81a2e7444f6af5",
+    "secret": "b497d108c70078f2bf2a4b56406d67141721f298f3488f6758c7caf00692da17"
+  },
+  {
+    "public": "95401ce76a364f9a6380c27fc16928dce9a3d4672aaffa6fd5c144c0c15c82b0",
+    "secret": "e69d584025ac87cbf7d81ae45910a669caf38917892d434647ef6fb018f21bb6"
+  },
+  {
+    "public": "99fa2e7c4205ac501548d147b623801cc194dc49ba4e512e9f833cee17001fd0",
+    "secret": "de4b12e94dc76f6316ca4cc344b7bc2b23f69ffd787195102d01d9310a06a7e3"
+  },
+  {
+    "public": "1cac9bd35b5a23ebbbc4201289c15cca2c437555002c9899aa1cd1e2b4bcc204",
+    "secret": "cbfc70c77012dc2a7f07260399ad8133d113063190457633c393c091cb606983"
+  },
+  {
+    "public": "7f47c5a09c679e00d7efcfe6f3d8d7dc27f2ed365c2ee905bf9879a0b02bde04",
+    "secret": "090b86b598882051b4123c262cb69c3b560a9e836c41827e6aecb92934306ec5"
+  },
+  {
+    "public": "2db06504fbcb7185f5476653d26108b91eeafe53563795a2e5f04d7f975c2689",
+    "secret": "d709f8a8858297de4c014a7b8a1143d93d3e9754c6db274ec67bedf1ecaef09c"
+  },
+  {
+    "public": "62891267f89c34d20939d0bf5f977cd0b12641677252126d1f6daf7d34f5bbfb",
+    "secret": "0bb037adb88f5e7f70fefd7546395038d9866c8ad6a7afb45f6aedbf302e244c"
+  },
+  {
+    "public": "c4a62613c2818aed6ffefb1115493f47786d71a5f6c0e13f4f5fbd2f2025ef95",
+    "secret": "5869846fe2dd0652a466650f0449373b3cbac9497d76bf0981f9958af05b5ea0"
+  },
+  {
+    "public": "bcbe517b5ca9250eb97f4b6111fff2e4c4ff023ec4eebca36c7b6ccecbef6039",
+    "secret": "5d2da9990b10c1bba3aed940246061d32d5923a076740d2f3195c754758d66b0"
+  },
+  {
+    "public": "b18b89236d5ed30f79b423ff03b1eaa3ef5754c6f0a6eb2027c3f6cdeeeb8d92",
+    "secret": "f2bc7855c992a72e83ff631065ced58a11384e8f22b5fe1d67867c76276ca9d2"
+  },
+  {
+    "public": "5e653eb275cf899cd1c32bffcc81f7e6e487c41c39dd2aafa6cdbf9d54fbde73",
+    "secret": "c2da33a82e88ca2a0a2243a791b21423136189efbbe77aa8ee46e893ce7a2061"
+  },
+  {
+    "public": "b8eb68b72cbebbc7f6b2a37791f4d6efa33ac6bf690e1e4164850ee215600688",
+    "secret": "b30541e29054e9573a573ada37414f06e84530276ef7407dbde033e54a9a1b0b"
+  },
+  {
+    "public": "9b30a715a1f80c1744d2391d6866437a155eb5615db02dc2aeb28c9c7298a65d",
+    "secret": "f07d46bccdebf7460a67a9a879b7254cb535fa641a98f58938abf52d1e81c8ae"
+  },
+  {
+    "public": "649b05fba0e159b5ffbff381e29e36a4222659664971f3b5b8d454aa4d8744c9",
+    "secret": "0489931b7dd8803dc974cd35ca092bfd8e2e0bb85bf88cec7b3d92e59100fb04"
+  },
+  {
+    "public": "069b9f8d37c8cfba2c7194e1eb366dce9fb103bb42eb630c6bc87b1f11146c50",
+    "secret": "a8d94d0f1032670fc995390c6c221033c50742bd715921853efc0c0800a015dd"
+  },
+  {
+    "public": "1a4f71ab1d3bc19e2398726de56c1e79e3600ae714266f517a89ca15d61a5478",
+    "secret": "ddae22e6453e3e7bcec475f72f412c28b79300f51e75f2609c375ea133c205b8"
+  },
+  {
+    "public": "67c05dad419879ccb18d42cad0f47dc4fd55aa567954fbe4231482a296f2a487",
+    "secret": "0a2588d17a432d575defbb484e2fed7c60ec9dbbdfefe516d9b2f16150d3a5bb"
+  },
+  {
+    "public": "caaa4731e4b800e187c87a9e9554cec86dd10dd7a7e9ef423208aa4a674ba6e3",
+    "secret": "29ad964e0e4c92c83b622651274b2e2d9e5cb7b4bc5d3e5886fb7ab2a27ecc63"
+  },
+  {
+    "public": "25d4e4d16d9ce1bf6a4cba50ef6e7544c34ef989628d63550199ebb5d0f5b6a3",
+    "secret": "30d2db194bf9b07a0dd0e8e4bd1e1ae7c44d936c1b0afd6f651b68ea4bd5f586"
+  },
+  {
+    "public": "f1a8cbed753f83a3cb3f3d261f58d62d08395cd60f3ea243919ad6207cdee44c",
+    "secret": "867282881315b031dcb910e56350ea18bf01e0705133c103695ea3b0fc189e05"
+  },
+  {
+    "public": "c5c62663210abbf436ef190afd7494f213d9ebd7059e0546eec0af4cf28d2db3",
+    "secret": "e5f55a19fb539dd37c86ffd63c8211ece504d64cfc751bfba6a9953c6a2c10f9"
+  },
+  {
+    "public": "e485234a319b7a12b16f61f120d79966ea7f6ccc755f787f85952dcbd4b87510",
+    "secret": "62d5934a91d32b0985ef7c3a1b9c75f84052fca55da0f8ae74f11023d4101eb7"
+  },
+  {
+    "public": "accdfb9ce40e7e5e8daa7cfeb768810eb1f1445bca1cc8ec26b28e72ec1f3eaf",
+    "secret": "88bd96b4dfbb2e2a4848e859056f21c4175437f41de749d1764d04d002596af4"
+  },
+  {
+    "public": "0e20b9d5309dc1310da053d550af3a8cdbaaadfda7db83180ecaaeca8361d8a9",
+    "secret": "3cd5067c2dab34e91b3c5d26d2028e45fe94f45c28b2847c4a100db3b9415476"
+  },
+  {
+    "public": "3f16dc2d08df21180663c083ccfb9ef74b1ff890aa11c838b44e0a483ea08693",
+    "secret": "a59785103d367ddb3b2f03bbe24637242ea7f1409d4d7be454816a0a59b1dbfc"
+  },
+  {
+    "public": "a3b3d38bbc8156559d0d534a6030fcf3e60ed721b1edaa14ce70916146203efa",
+    "secret": "f355cde485825e2d0ee771daa9cde8da584ffd09a62b7299b0523e7e7cbd857d"
+  },
+  {
+    "public": "229567a1730a8aeb5f01562c46f4e0d5bfb38329cefa3fe1f15f93a48010bd9f",
+    "secret": "b608f262ead0aa509a4a23ff760d5a51652931883973bee10c711921b9114423"
+  },
+  {
+    "public": "24a9a03b3e67fd479513ad9c2e610ed7909537130c05fc74cb2cb51732e2aec6",
+    "secret": "6de6966b730baa4480b26931c92063d675cbd13a8c5e7adc343fe3452de55e72"
+  },
+  {
+    "public": "5e36e18e7795e388f8109a01e2f8755c710000f08f4a20391c921b0ecaed0e81",
+    "secret": "c884e52f898baef4c64b6be05f88b768932ba3cbfa703f02538dd0a01910d44f"
+  },
+  {
+    "public": "f42b0d0bd6baa9b5cee60d91397ebc536df5d0f587b472163b96d00c45eaef54",
+    "secret": "c2ae4d1abbda1a7faf9c6eca50d3ed9b5dde173f48202cb831639902c0bffcf0"
+  },
+  {
+    "public": "99feec1184922c5125a5b04192a8bfffa9aa3934d3094961845044541e700b80",
+    "secret": "6a7e4af1b84823bffebf0589bc992d9404fa29a666ffd8ac548518cccd802375"
+  },
+  {
+    "public": "9c7a1ea3116379c3878d45d36918ad3bfbd17043f717bd6ef070beedb3bdd6d5",
+    "secret": "03d8fb7884232a6d074adc9bf69fe5c2d7e0b396ccef4a7bf81dea7ea9ffeb6c"
+  },
+  {
+    "public": "fb15fce868eb34a666f6f6e3f7df3c0cba3bb8243a327eb1eb7ed4b1a50a2306",
+    "secret": "9797b9ae444926aff4f4268193f4c5e650046d59e7b41e8997cd46f4da02d642"
+  },
+  {
+    "public": "59bcb84c869fe1a4f7056a72a9452774a4e4329d71b79daf25e561cc2e0a7012",
+    "secret": "816e88786a55ce7dc3b716b9de16c75b5d5c0f60bd3786b22d470407b3a04d03"
+  },
+  {
+    "public": "c14cf76ff42eb7546a618c10d6f982ffe16988992b420c0afb750a61b8f15137",
+    "secret": "56e4db4860ae4e25ba27c841f4de3179fe31befe8a716311d423db3e4f081070"
+  },
+  {
+    "public": "70248044a78c7e971885d193c0aef604307d81dd1aec9a9aff4a64ded4170aad",
+    "secret": "d4fb6d2277b6dd9be427e37fd17f8a0b6174bb709a7c4278d0c68ee2c648df1a"
+  },
+  {
+    "public": "8ecbd7aeb3d4c13d6c13db2c1d20d443b752fab510b84c67da285bc333ca43ce",
+    "secret": "2a1a49adaa428aa013ed78793310c52d32f6453211a3852b729ab54e383389c2"
+  },
+  {
+    "public": "f36f9ead2aa2a27ec8568d39cc601cb4c4bc6b4d85d7c12ea3eb0aa191fa13dd",
+    "secret": "be78469027e2720b5b13250535c616b4017306f7c94d085cbf00ea5941e59108"
+  },
+  {
+    "public": "bd84ebddad55176cbaf0a08edc54c6d57db77aec7ad54ca3f8c7e143fe7e9915",
+    "secret": "b23606554dd43a9569409c4b9b61a4c9f69347b82bb0b1355dc4b8345c7ba60a"
+  },
+  {
+    "public": "2c3a248a9453394bd4c7ac079133073c30b14bf6894bca0e4ecae72b88e105d8",
+    "secret": "b6fd1903ac7870e7fa19166cd04a79e6c58ad2f57a0907eff0e3f74e26fe8da3"
+  },
+  {
+    "public": "503694f324b6b44fb149eeeb8356c02bcc8dcbf6ef009a5c29d4c3ca9bddfa47",
+    "secret": "ec9339bd7e01c42a501c80181b537523f4deeab946e8d4efa0235f8a14dae8f0"
+  },
+  {
+    "public": "7902af447e250886d068313a63b41b661d7318b99558658112cf08693b74fe16",
+    "secret": "c4e53ac84088bb58ba05369ef811cae70d01b99c0108c33b3da6f786cf295d24"
+  },
+  {
+    "public": "c41c6be6b4d6d9f291e6ecce6ab7809582083b1bc1ebd7ad7b1dfd4394dad4f0",
+    "secret": "569d86d046480a0df1629add7179113dfc9f3889ccf72e697890b0f5c3bf400c"
+  },
+  {
+    "public": "a02c199004ba615cbd0c4f77263fb8b6cda9dbc1c24383fb4138ef39dc0a97b0",
+    "secret": "f74324aa36568253b771205de391d6cfa476cfb147ba3933b74126c104a4d9f1"
+  },
+  {
+    "public": "d0a8fe3b76432f15ca329ccbe1c9b0d4c58bebd2189c471459d810357cb4efd4",
+    "secret": "f2ef3158a6e49ebff0a4140e3a80c97b0085ec39c876a46e5b39c7522fc97d64"
+  },
+  {
+    "public": "e2a7631047223a3521210ce90537db258a7010be7494862d70a43d6a956bc005",
+    "secret": "c411b989dbd95cd371cfc7b332f585a48e9e0bd780d358b35c57163ac416d7a9"
+  },
+  {
+    "public": "ade328febc4105d21b4e5febe877dfebe6d9fc52f77c704fe4d81262ff45f3db",
+    "secret": "4bf73f355743152a0cb720c7e701c049900daf3cfae0f1f4443edfefa5fe0c90"
+  },
+  {
+    "public": "a3f1b75157a408a073d79300cf65679db1b928b902480e5768b2e8e79a03aea3",
+    "secret": "4b53fd422005ed4b5928583f125f1cd3a559832029ae8dd2a80e0ecec58d65f0"
+  },
+  {
+    "public": "650230d064dbceb328f798fa65804f29964beca010c3453129ded1eec8438503",
+    "secret": "d8287f21a4351065b8ab93691669360355049fd664b660630fa0311f8a262988"
+  },
+  {
+    "public": "661f3698409184c344bd7827deb6d307d6f9d353eb4934f46be974ee016212b4",
+    "secret": "e6d77209ea3b1663156c1b0bf17ab807354a4dc476301f8c739b274ec886e4d1"
+  },
+  {
+    "public": "f17f14feb44b525e046e9bda922d57fa86e1a84e8d2238c2b61b242d433bdf39",
+    "secret": "6972da9451a59222c6530bcfb0646758a3f59711c9220cce49535f63d518a7c6"
+  },
+  {
+    "public": "5b473895f24bab06d6ceb3383bedb42b9886bc193e2635f7f3efb6fd33c14cef",
+    "secret": "4e2a607cb334233052b856d441aafe608314526efbbfd41dde967e912c195ed3"
+  },
+  {
+    "public": "9711a56ac5c6097a71edbe13612d07e44fe671af31edfc4f7891d814dca49997",
+    "secret": "2cb88f5d63f3a2839d110e5171619f6d8ff4d1e0c51c2c7eca7138d646968764"
+  },
+  {
+    "public": "216fbb0e63aba856d85bf94a8d10c06f56066e9719aec860b2710fe7caac3163",
+    "secret": "a6cb5c8271d285b425e9fc208a14ab3338fa285155f6022def10f34072850b23"
+  },
+  {
+    "public": "05dc1ed27679e0417ada244adc262847be09f46010dd6fe3cb166373f8363716",
+    "secret": "912fc21c4291628006acb903716d0c87190ff4d32fb1115a78d0abb3403820c0"
+  },
+  {
+    "public": "de8546e1e80051d5db299d854529a01ee4f69734991efccb9713858485d39988",
+    "secret": "9eca54d7effa2d0554b0286bb14502e36d6b6503bd491f39e8eee2916723cb28"
+  },
+  {
+    "public": "941f191fae823dd1c242998d4c5db40c8afb49f32632f5081ea6e1e1e75177c7",
+    "secret": "994b29b96c8900fdf128b471e378201e835b70c45842941deefe4554a2c39e9e"
+  },
+  {
+    "public": "7f804cc37e31520038abceeb9cc3021b67374854e117d61af27532f7bb2fca6f",
+    "secret": "1d9672eb9d907e581932e90b56fb00db757ffaf26377c3ee6c7a0e1a4112f9bd"
+  },
+  {
+    "public": "ed1cd8e28140b0b54acb895832a360526be675f27905dee4b2748807d3087f1e",
+    "secret": "b733b37267a3851b0b07faedfda52c8f7c2c43662165356e63c92687a3de0da4"
+  },
+  {
+    "public": "916485b3eef865acf818bb9345fda749f7875245a7dc6f8e91cb0b71e090e0f4",
+    "secret": "6ee65789b0cbf0db72d925df0c95836a2c48475f916e56a5646e0a00d66ce92d"
+  },
+  {
+    "public": "26542938ed069a269a9aeace3d307e35358d292b32625dd254e3d210cd8f6047",
+    "secret": "bab61e87306722c5c2eee3af69f9fdba701c4c2d2ff98587b3f3949cae22f5a4"
+  },
+  {
+    "public": "20ddd63f58d86369330ad4f3f51ff50cc45d550eb3b1577ac350b4cb1e39d4a7",
+    "secret": "af8ecd3c99c1ceb26e53ef2355c771ee7326941a68971bea6d95e11be4ec30f4"
+  },
+  {
+    "public": "ab8e0beee090ba4ddb44d43b639ffc10941031d0388d184b42d47478d265f33c",
+    "secret": "3d9a15dddd6f69627c396341ede923679d665a84d979a9e4ddfe5da2530f1efc"
+  },
+  {
+    "public": "0fd27324574ef684a4529317fed63d64f18890251343a5f6a38876b955ddafa8",
+    "secret": "6856fe2b15e0a89315461b22b72835fd59a5b3015ea032d16a8c1f7a513073c0"
+  },
+  {
+    "public": "baada2d1bdbb5a1042e6440a7a13f66549763c35ceeefd502d05448fdd3bdbbf",
+    "secret": "85a21b5a8ad44365e83fadced92c89e2408c2ada17df17aed55371ddd1045ca4"
+  },
+  {
+    "public": "6af227a4dc2ac0d3c178f29f22395df46632f0d4036d01e122653a4014bae92b",
+    "secret": "a452af611572c509414df39e76259d05d40e4979e70e30b7d16fe1cf812c4b28"
+  },
+  {
+    "public": "adc6dafaaa23e975d763194d483f0359299e96bcb70bd44fe92a1801112e187b",
+    "secret": "8aa9e563c01a8251b8eacbc7f9bdc3c22a97b41c77a23cc08fe5b64fe9e6f663"
+  },
+  {
+    "public": "bc6c77ee3f0a625fbfb1012442305fa575a4d52ee0fe82e3ccbcfc1aa97bc917",
+    "secret": "9eff385b8907e357419c3bd49f2e6ba94c67fc53ca00ec9ad85c573d83a68005"
+  },
+  {
+    "public": "0c1d220e688c84238e55c6d166f4debe9a5edb26c8e784b3c18af273a51aaea6",
+    "secret": "5899192504ffe085bbca2562dc0cc18386da793cea45eedcd1d8d2f004ddc817"
+  },
+  {
+    "public": "3d8bdf8162d642140f9870cb84fd2c82cc706e83f5100123e31169381bae5a8c",
+    "secret": "ac40fef174c84f2cfb93bf7f59b9123c3ed2b2ec819b7554a7531984b8d2949d"
+  },
+  {
+    "public": "a3b38619c0982ef40b03a5da4d77411ae7532abb75133c184b3ac99ea58d46d6",
+    "secret": "d6ecb90b0f6400e20dce9c3bf7e704d0e4b0f64d89c77af27fff62bc43865d56"
+  },
+  {
+    "public": "219eaf6364ed6face38727b6eefd50336ae8b1c9f5817db20487b53dca1f50bf",
+    "secret": "df939a62031e205a510a33b3eb86e3af51b6bc7dd986b9eca4aa9f344eb94e3b"
+  },
+  {
+    "public": "691d869dbdf9c792cea1587b9b58155a68606f91f78f98003460cf103bcb6d5e",
+    "secret": "81b185d84419f263fa50d079badab8030febc3c7b7622c24977e166e3164c477"
+  },
+  {
+    "public": "9e34be21592e9260798252507d7f3cf27c57d1978cc432c25a7a8b8025758840",
+    "secret": "471244b7b426f1f4d4c4871e81d822c1a6177fbe6c477f6b72757699d21bc580"
+  },
+  {
+    "public": "efc778f02d2ab0e9932bcd4b9a30d439aa6764db066ac87ada8f096857d23f73",
+    "secret": "a8f28e766e3a0b61bcff3ea7f823b90e56549a8bf3dabd7157548e529c1fcc90"
+  },
+  {
+    "public": "3d4f4d61d3abff3e929098776160165bbaf966d15cb485457afdc2e32c6023a7",
+    "secret": "76bcbec85f0cc44d7cc0abe0c7f179770653ea15692516e4ab453e4676470951"
+  },
+  {
+    "public": "6052442f41bed488c2898579b86732b7d5a0aff77553bc2d45cf81e43f7194e0",
+    "secret": "1e463ab3315e8976e94b6e9459af6b803e1218e6b5c39a49d732ec37b8493403"
+  },
+  {
+    "public": "e472a6b87b00cb064838ffb4ebecdeeca0cd5e02e6fbe0c048945d86857bf583",
+    "secret": "316de265eb21cf51f04ac8490c23edd1d6140660b0192ed9dff2f4db50085d45"
+  },
+  {
+    "public": "2273f214bf665ab5ee37261530ccdc555f7325f9014ed8b4dffeafdda9859a7a",
+    "secret": "88c9a40af22e126d8943984b351d87024e33702381de16e3c10318a00a906923"
+  },
+  {
+    "public": "42a415be42e665a76fa0743bccddb8c916a7b0e06665f397a1be37c0e0520dd9",
+    "secret": "dc5b1998d9a67e7de464ff4a12b8e19102e5003cef3db5eae315eec416439348"
+  },
+  {
+    "public": "92649af7eac7639edc56bae7be728ee52e70c7586acceeefd57b3de9cd25e5d9",
+    "secret": "5a12a5249bccb4cacdc9a5f25d9d5b6205f2f6b80d312d4c25b18f690e8a7d45"
+  },
+  {
+    "public": "c4265d4031952b681a3c1a585b062b8b53a7cc496cd73fb638a59d2a434bf414",
+    "secret": "36c6adfc208da1534d915a458050a33aa428f50f73e4063b3beb4436d37bb612"
+  },
+  {
+    "public": "0a23bc24e4c7a372b369d8f70563a55a3f08a95c09e95d461bf10404d998ce37",
+    "secret": "bdb6595db6e28882b2bf6b3ebb5da67c95e8a1870ce7a36f79e3d3efbe349bbc"
+  },
+  {
+    "public": "dc9c0004e2c130e376420aa751fffcb379059f02df572f23b34e6868937408c8",
+    "secret": "88bd15ace8a28cec402892cf8276835be2e543ca32d7482d771e9c47dc99df8f"
+  },
+  {
+    "public": "3bd55135521f62c900b412be71d74012e92aba32ce4d13e15f66324d33e20951",
+    "secret": "8f3d49f968feaebff1fce647db5c854f6b08f5886c3d4e20dab250b40504c92c"
+  },
+  {
+    "public": "a187cf67ef7cfb12b4a395271e4391074ff8bfa3719a706514d0d56e8ba896ec",
+    "secret": "c2ec3e1c9bc9cbde66241aeed92122b71996ab5697603c390f7513dcf7b0574c"
+  },
+  {
+    "public": "0c0b9aeb2a9a5b3acacbc5d61621124cfc16855b353d747b3c7bf28eb87cbce1",
+    "secret": "05a39f10c36bf83d820951dd0e5b8eb9ee5ffae0f5e4687792afb44b5b8843fa"
+  },
+  {
+    "public": "d13e5d5da9b499ea62eef6c7034933a0fa53a231ae4cdd32e708d2520614fde6",
+    "secret": "4a43dcf616dff641f189e41b1390acd2309b99a950adef70a0777021e5ded448"
+  },
+  {
+    "public": "725197c7f63d344d8c1652817a3aa02be0a6de9d7a6309c4e3178761831f89cb",
+    "secret": "694439eb266485f424c90014d82d8ebb6ae166a1e9f33f2c7bbafea038a8fca6"
+  },
+  {
+    "public": "749c7c430527675e897c09a1fdb0bc4074476091f4532cf845fcaf031281cd52",
+    "secret": "33506e72242f4a773512475bce43228a5c50208fddb91aa41f423f46c513b481"
+  },
+  {
+    "public": "2e2198dc0ec511f983dcf1b85c725bc93c03d9c2c31381e693e1e8fe345740ed",
+    "secret": "4db9dcd015d5c5fd462edf8f02cae68e6c0c1c151bb47e1cfe3e351f6e982789"
+  },
+  {
+    "public": "cad95d73c528ad101398e30c01af612b08d4b432e6587be82da11ce02878fde3",
+    "secret": "e9864f1d63ca2c4063f99dbb23a29e808faf967b9bc3153ac451fc8ecfbadd49"
+  },
+  {
+    "public": "8854855d3e1f9908095554f16ec7f66c25a1623d28e0cc2d97a9c0732d084c12",
+    "secret": "247eda425f8ddd54e615e709422d4fb6f2eb60e80c6c8f5f208d705f917ff138"
+  },
+  {
+    "public": "7e38868aa49dfd9eff9d5a1aa2d679571271d92c306bd3c4daf5e2e1f97db212",
+    "secret": "7ef5f4d8d3c53d60983922c9e25f9c3b200f5e07fc624a6ed60133588e663abd"
+  },
+  {
+    "public": "3f7db925730d342c2f731ed1fbe0631952629c39ce2fac2fec2a566399e9e9a7",
+    "secret": "e7a1479a3b082e26ae12b6a1cdd6ebf373493955707ba6f80e6d346688ca1560"
+  },
+  {
+    "public": "8e53f71115d5e09ce8260412f5c16dad0c5fb0dbec251b96202540f6f013e25e",
+    "secret": "309ebb1527aa45a1f25b1b13dced51b6b85896f96ddd11c5ca34af7cdee67bd8"
+  },
+  {
+    "public": "08673563b3767053dc2e65e58dab959813af5c4801b9810bef27bbee95d471ba",
+    "secret": "8637903955725beb0aadd21a35014321b6014bf42704bcb9d5e67de9d7b13364"
+  },
+  {
+    "public": "10be59337f7508e5efd854e5f335591ea4d51a6393193f626607b71fad009df9",
+    "secret": "0b37ae35fe0d943e51f753b35daf3cfd1d63e56a37f2ed124947fd79a4cd77e2"
+  },
+  {
+    "public": "d9bbd9338603b8812d09c21adc7c0c9387515d92d70187831adc22e8f0555797",
+    "secret": "fbb0869bcaf70dc9aaebd2ec58e26a39ee21abff118f714d87e3fa483d34a853"
+  },
+  {
+    "public": "dec676e8e948f19990ebf4a4166c17ca89d2e08cc7d61e8e2641a5c929509cbe",
+    "secret": "26d96cf5df2939cbbbdadc2ffe25abe903770d99be789da6e751415c35abe981"
+  },
+  {
+    "public": "cdc790038d304cd52fddf9deddadf918c3f15dc2e64854cd761fc76e1b87738d",
+    "secret": "f557f040edf96277f1422933859cb5f2da6452c0c4af062dce804604243b843f"
+  },
+  {
+    "public": "3a15f9f968186c54daad69d6b270252d4c6e164301d82103a636a3e7f4070a6e",
+    "secret": "e65eb12789920d93f36b489656f063a955280f28f998fbad5ac3bf82f7735c35"
+  },
+  {
+    "public": "612cab795cb054b435b775461a5bba6e1081a25f7ab449c01cb5d97a2ccb19d3",
+    "secret": "c315e82e0cccc6f37574ded32e071409e77e6d849ca756995d78c01184f59a65"
+  },
+  {
+    "public": "ec66eb8d31950fa7f41a8d244a552e3f5fc57642cb838ffa200f8c0b6f3f9e84",
+    "secret": "750c6d0d0728cad57ca686b439729ac4237298c240bafd4060e0e4050f46a7c0"
+  },
+  {
+    "public": "174a3d6427661e491cd4be6060c884160de8bb759431996a20ac9a468bb6ab65",
+    "secret": "a3aee9bfebb11cbb1322155b1fa3529317a14ef24083a40ba6015f37d02cebff"
+  },
+  {
+    "public": "53dcca690add64af228d173545e74623423c65c08402f3fbb5c64b33f8c239c5",
+    "secret": "dd5c041ce81d9f243914b631a24ed4c016f7000a1b1cc4950c724302b0087d78"
+  },
+  {
+    "public": "3a15574985d9c060e023dca8592865f511db3d3fe8279591113e431340fb0474",
+    "secret": "1290044224e4f2dd35969b6beeb7d514a77b66c961c8885b8842a5df002f9835"
+  },
+  {
+    "public": "385cd08332f594078a7d970bd0700f9b1889e37c827cc3dea520ab4c4b8c4bd9",
+    "secret": "27d402cf67593c9021b391678c3bbb306f234c2cad2239ced2109ca29851161b"
+  },
+  {
+    "public": "2061291d9a0c41e4261dedd9a695b5a90d4b172bd1c0ab9f7f74caf6f75eb705",
+    "secret": "efbb306fb1f5855cb230718103118de1b6422ae36c3ffd2e1ef58323bd920e7b"
+  },
+  {
+    "public": "9a8e483f46224aaa0bf97975663b64e6c3c25c6e1f6712a408804067fe24363c",
+    "secret": "b27fa2c64fb388bb0dc824b758c4b6119bd1eaf117c7e4bdd621e6a7565c362e"
+  },
+  {
+    "public": "9492790b21ccb957ec1b5ddb2d4be27febc05dbf9c389bc2bc279287d91a19dc",
+    "secret": "5ba0c29a61cd2780201cc3dc4adad4b88f697f165397d40cab4478be23db103d"
+  },
+  {
+    "public": "5e0eaa499ad1e2425fd7cda4283adfc84f50aa7d474985597536689efcdece21",
+    "secret": "0db699da1da5c518850ba078cc2ad9c3d1d561f251fea7ffc1b30a40185be5bd"
+  },
+  {
+    "public": "e54faf50a0caf1d363247a45352182b516f6a126b584f024dfde8ab65b6716b4",
+    "secret": "e188fe3a436f9ad1dc58da31266778fac8f1db611578c200e2d32ddc0ba5db4c"
+  },
+  {
+    "public": "762de634fff79b996fdd726ec1d7a207d5298c151d83cb417d90ecce08b10e0e",
+    "secret": "6167236dfb7fdbcd67ad47f7819a315a3dbfdfa70215a8283b344cd4f58d814e"
+  },
+  {
+    "public": "657dae0d11b4c7694e4ba35a2fb0245afa0fa508bf9420272778379759c9fe53",
+    "secret": "3490e4a468f501778103196d564c04127b8a4aa7bf364afedd227e4b17a12fd9"
+  },
+  {
+    "public": "d5e4e34a002e3db3ee3f1c3cb9db7ce1350422c7744e310cb18b755b38e622f4",
+    "secret": "5ccb0dc602621510540c142e7a8f0d8def5cc41668c08f3a38fa5e31da182e3b"
+  },
+  {
+    "public": "6632fe5081b8d046b80017501bbd792db7c2eeeb746c1c8cce9120a1146b6c96",
+    "secret": "56f9cc1ea1f9e4d3c56cddcc6d06ad4527d80685ae3cdb29111b2a298642c92d"
+  },
+  {
+    "public": "a641986fbdfe5d14ffc507e15290d41dc5c6eedf39ab4751a1a65e4df4501da0",
+    "secret": "fc619ef5f19cc0eae6430c1fd1901854692f7b1933c448a01f014bca58bd8c2c"
+  },
+  {
+    "public": "955b4eaf92da8a354190d861a6c91d9ef5fdeca8353ce2cbdda853f517a79523",
+    "secret": "a7cc30d14fd676c7c2d7a76dde52203d212358f14f4b9d18b39103756e9452e4"
+  },
+  {
+    "public": "79aa94afbc52874a65c01dd8e66df803258e61d706c083fab0e1cb5f0be26377",
+    "secret": "fdc55dc028b1c0b507734c4cdc407d12f395c356f5f2f802661a026b42c01d6a"
+  },
+  {
+    "public": "c349eb27006d0ce9dd2d5df17cd8ddb6820d62689b3d1a888a1e48349366e3b4",
+    "secret": "dee7f34f55ba8c124bf2b7b9e2c2fb9c0600163b668a417511cbcc29fe620ed6"
+  },
+  {
+    "public": "f0631a6b85c7f40cfc2bd94f9f688618b4abb689cc7f6842cbcf08fdde669a34",
+    "secret": "2d5612093bde516e6b5262df51d42097d201bac9ce033318fc7b1a0c32c95b3f"
+  },
+  {
+    "public": "659cd6506da0ac4df50aee674bd776daf8363801f5da7e9bb512e609fb7dfb9d",
+    "secret": "572667ef63e0a13386fd8b5f5a25e654ae987c87900fef5e65ecb169ae5c958c"
+  },
+  {
+    "public": "269c4a800a1d818e125d63c5c498f6d1071e6304de1ca007e6549dc89e723c00",
+    "secret": "62dee6bff6a1c62a01cf8f260e47432c26b08c3c66188761770c844515f44477"
+  },
+  {
+    "public": "590b06990dbdf8421d7916fea9f1f4a438cbedbadc64ead8c92d3b332c32221a",
+    "secret": "37ff0d01480976a6775a366b2a1643c926ab497d27b2433520ce5f8159f4cd1a"
+  },
+  {
+    "public": "23a8872845111e9285acba5c69de5c6f53b16f982aa73e7a9e88c3a6c7199d86",
+    "secret": "5b62ab858fdd26ff73822b2e5a76d3d256ee03ccfc5ef72a7036d0e5e418be18"
+  },
+  {
+    "public": "5f13dd1dbcaac90a1fd9689afb7b54fe13ae87bc554bea89676248f7a36ad58c",
+    "secret": "87c2b1d348c6ba3576d1901ed1b86b086426db2314fd029948a9d8f25ac0f6e0"
+  },
+  {
+    "public": "623aaa8c4469e5e142f69404c371db31d0dd4275616c227d36651081eb83f981",
+    "secret": "f92e4d1d9e8037664430d8b05f3b2b0cf3f61f9104b551654a299f1f5e288182"
+  },
+  {
+    "public": "b37b5179f36731bd48fd20626d31b9d14622670e6a98a526a300a9cacfc81faf",
+    "secret": "4d18c1733a974d9e32c1cbeb2c2baf7ac8213e7a18d89ca7c6a77aa10a5d9ab0"
+  },
+  {
+    "public": "ff24838729e164a7a6e9282d4ddc7f8f9345b9a929e7b8b3df2d93dd455f7626",
+    "secret": "f8cd0f5c3a33fe6b84f1edda8c4d039a01861321981c002e95413069d1df06a5"
+  },
+  {
+    "public": "0e61cd26bc5b1fdf6d5b75dc8c3694cfe08df7b737b42a5fab00651fc95a2c35",
+    "secret": "70e36aca7e399bd2f8dccf1319637922e80a8a2d84893c5dc105ebfd680e825f"
+  },
+  {
+    "public": "9cd0d5f9b88560423c66867c3d832e0e82f708c893eca7a27b3488f65b9f2a9a",
+    "secret": "75bbc56f911a2dc0e31d96dd56c026c7986ee091f730099e4458ef24859a2582"
+  },
+  {
+    "public": "7e8c1eb6fa3c14d77d5967fe3d5bcdba5a9e7a6aa3411056a7593494cfd62166",
+    "secret": "7aee0e45ca6373522df27884ca79e00639829e40d3c039abedda019f8e0e441b"
+  },
+  {
+    "public": "65de9b14aad24e47dd8e5656b99cc207d23805ec1b2a594755b1a85620ca59aa",
+    "secret": "458c4599a5df8893d71932ab362faae0d2b3f737811c83e337c1aabef7b91f80"
+  },
+  {
+    "public": "89d9003228431cf666cd018a6a960eefe0222ff97114f532ad397530f38a5e78",
+    "secret": "a8adb637aaa6904c740a5c16cac4245e2a527245b94d45edad22a740d28f0b7a"
+  },
+  {
+    "public": "1073400df9f97549be6831c132e023112f611ce950b2fe9e16426abcbb351ad8",
+    "secret": "ea3d86cd44651aa2112ba6a789e12d60b35890c5e454cd59236e984277f8d8c8"
+  },
+  {
+    "public": "86dc06618c6a255d06fe2a48e6762a01aa2bef66ec6133c27a63e44ec7751121",
+    "secret": "529298fc9e0b84fdfbb47027721d35ca1cc943eadef1524fe16cc70a06098afb"
+  },
+  {
+    "public": "fcc74ddda3e6f256a2c9b12d1c8f373fb45601f6b05e417da966c798463524b1",
+    "secret": "76d01cfdf95d427f4b391d893a8c78267314754bc1755f8809e507c910db1dd3"
+  },
+  {
+    "public": "d48d626693774b0cea47f83abce88dc42286375a19c32fe71d7a9fafbacf7471",
+    "secret": "df84812be98a2e1804c61b8e472517615f67bdacd7685eb8c8c323c0dce93f40"
+  },
+  {
+    "public": "fe9e17edca76c43c0e7ecfb264dcdeb1fe97446d8b96f177f693d143f5302cc9",
+    "secret": "f26a662f0c70648334a8c841810c8f3b3fc95fe019a84d5bc88fb82a56f45b20"
+  },
+  {
+    "public": "cc5dc005be3e65ca700f45b7ca893749c35041f661f1845f1bfca29298ed0214",
+    "secret": "98dcfcf43648adb156b72307f63f9a54acf538272eb877e3e52a9fd867bbdf82"
+  },
+  {
+    "public": "0f2d5446416aa793cbc92ac25df1f7eb65b36ec3c0ac168eaba08c88488fcab1",
+    "secret": "1d7c38777560d42f8409436f961a69e3cb6aa858a0619750dedc3a123941f569"
+  },
+  {
+    "public": "215c881736c1fda44ff0995b9400af93f79b34cd11c70702651282c214c6b189",
+    "secret": "7cb77240ca7ef84e004af650868472c2faf405c79b4a3ef4f5eaabdede980671"
+  },
+  {
+    "public": "ecadbd70cecd262156606bf672188a703267ad0325482648be4891867b220826",
+    "secret": "98a5d709bf169fd1aa04e3b756188d7726726525bfe047b8cbff9b26114ba522"
+  },
+  {
+    "public": "bb61bd676e8a5d4c4b69b43de6b5e3bf716299ffa97d227ed1ea787c68c2293a",
+    "secret": "50182b75c8a930a452894856a741441454df515b21eb599ed99b623b56a941d7"
+  },
+  {
+    "public": "5c05ce4b0bbf47a909b48ad5001feeaebcea6238e5956a9a1eb9c886b68b8b72",
+    "secret": "5582ba833697b947735a104b06776bf8d32f19ff3b6ae693d5bdaa07359cfbdc"
+  },
+  {
+    "public": "a19c851db427a7aee055d633383178cc825fe005330361f74d42a85501fd3e88",
+    "secret": "e0f1be1213cbecd33a6131fb1b3cb392c18f30db59e9db99cd4e9534f5d0c1bf"
+  },
+  {
+    "public": "c1710ad6a09e3343526ca83084d5111af2ac89c965325782a2e4df7aa88f3c75",
+    "secret": "ff36b642c084749f123322cb3aa77e95f09a07bf968669de8edc38cb8eda52a9"
+  },
+  {
+    "public": "7f9e7de517cda6ef53f1ddcdecfbe5d6e04c4dbfa97515f6aa9c6fc2d3054280",
+    "secret": "67ab25c2476f1ab7cca69a8cc80380d7a78a54b4c2f19e4b0268a01e0d2a70be"
+  },
+  {
+    "public": "72b016a933e2b62a870f56778a277d6810f02a752bce7fe134e0c9840d9a37fa",
+    "secret": "034d74ebffc97db58c8c7e64439dc9b4142fb629bd4199456db885c719ddb67b"
+  },
+  {
+    "public": "07616e2c2eadc9be597ed9a1c823fb11f6fc4c59513cea0f414b4348b995d971",
+    "secret": "737d7614d0e2d2b5ad3f140d471c5fec21a779fe76c52c85bbf622e5e538cfc0"
+  },
+  {
+    "public": "b5214b37f2d3e055dcf72eb97fdee249e6db923f9f2317f280f7339b672ff0a4",
+    "secret": "535ac9dedbf881cae53ed59362140ad05c8297f0695f67cdc305ea8e87d725b5"
+  },
+  {
+    "public": "d4589033c919d9e04dc2d2e3e140c98f794136ff44c97006bd299b2b70508269",
+    "secret": "d55fe333822691cc6277ae49e70f19ef0c37ea6352a6417105574959f291231f"
+  },
+  {
+    "public": "bdd539a53e6d894be01cadbcefa28b0ae953768542e4f076573005bdd884b1ed",
+    "secret": "1f1b4690bb6d1896ba0e3bf2682a3555a42163fac5eb3f1415071a9a3745a4ed"
+  },
+  {
+    "public": "7729c6729fc864309b8d5d9cb80b3ce8eebfd48df349c52acb52bac1722da756",
+    "secret": "816a637d72df8636abf613969c16bf7593c7c1d91d5f0f2d616cc52114fb4dc2"
+  },
+  {
+    "public": "4c457da03f3522db8c1692884e0c49a79c51e5dcd685525dee5fa2c2cde6470e",
+    "secret": "a0ae1ced08213ef4ea6b758b1879f1eba4672a0162c3442e2d852807083607c3"
+  },
+  {
+    "public": "81bbd9552c7ef759d05a295fc4a1c9a3c863605737e34b038d937bef09f91416",
+    "secret": "b54370543db068d55e5b3764291ce888e24d24263e06669c56a1827e4e236892"
+  },
+  {
+    "public": "143e8929a85aa4e2864b15657115be9f930a34cc67a983833335a7dcac4185f0",
+    "secret": "a8fa71c66d3b4e2868a7b4f95bace9642563c30cf62560d930ce5fc752b3ec2d"
+  },
+  {
+    "public": "32f7d06090ab43bcf577722ea58b824df72f6c9ab79ac89e42232994654e506a",
+    "secret": "fdbcb3ebb07c872b992571a2c37d4d1db67b78860a5a630f41420eba58ced932"
+  },
+  {
+    "public": "84a9fa5405f6701df920e0e7d4e55504492661c41d901dab50471e047356a2fa",
+    "secret": "81f51462e0b1d5af397fee4c6cb432f063239b9276770fcab09d724a0e858167"
+  },
+  {
+    "public": "53517a27ac7bd44f02e3a374c4d0b8cc9d948b5def4f8c46de5c2545717a3171",
+    "secret": "37d0b134925c9a4eb102c796e56d032af95c986e76be421119324098c85b5efd"
+  },
+  {
+    "public": "8aad015568568fb4ddb0fe49e8b65f104397e353cab65ceee5148439fa1d5cfe",
+    "secret": "b971a1839a4cf5671f3e7eabd00c45f0d1c0de1f11127afa695c495c97678228"
+  },
+  {
+    "public": "e6fc3ac2a6b28ef75848ff53a84b3d0afc85f7d6c40aecf176469346b51aaa58",
+    "secret": "5a9dada3cdff05d10503128d29c0e827493b015c14a0fc792e91c9cafbe070a5"
+  },
+  {
+    "public": "b6ff7eb76a42ae86beaee6188fc3932aa231e67b49dda95016e411c996ca55f2",
+    "secret": "6e7fde96a0923df9ca412ecba5ba658d955639d64b9a8096e9c3b7229e7fd88d"
+  },
+  {
+    "public": "7a8a061e9d2fd6aafb1af68d7329d85242a5235ab32d3a26cf5b6fcd222e10f5",
+    "secret": "545e59e1edf5a931ff7353f393f0fd57ca9f4c76cb1171f09876a92737f5fc7b"
+  },
+  {
+    "public": "29754531b26081e612e3d427fcac713f328b3932eb1d6574a5ddc3c5f5ba6143",
+    "secret": "2b06680e7bec811659e93e5a0fcd62d39cafcd744fecc20e164d34c9c67a0c3f"
+  },
+  {
+    "public": "0a8a1b53025a6eea20b5d38cef87643f69a907f766c8397683ab96ac3da10bf4",
+    "secret": "f6d5fddf3399947b2b8b2f09065cde767eb4170af1f41335ce6b2311dda9ca76"
+  },
+  {
+    "public": "27a663691bbfea3745af32ac5d86c663f4256662cf9da72ded3c5d00915e53ea",
+    "secret": "b93a2749d4f51fc21fc53a03daf7ef0f0b8b24491e3e8887f2de2e5c429a992f"
+  },
+  {
+    "public": "54a4ea8c08bbdd2c835ff578e4971f9f910eddb4469392d8f45e8b09c459e8cb",
+    "secret": "26247e136924cc13743a59e702f264bf7e2edc107122e15f262d770ff5443ae1"
+  },
+  {
+    "public": "1d586be202b68595bbf506202c3a6982a97cb0a4b677be338af197f7ff9048e8",
+    "secret": "65bfb8e8c4f732076a2c28ca456b72faa43b14709f178270ff34cd7fa6c8dc5a"
+  },
+  {
+    "public": "e9eb4f552668f35c3a9851029b18b9fc531c2359fc802fd93e35e395387d7179",
+    "secret": "7f11095a5e5fd02b1c26c1472a286f54c2d3ee7d4cd831313c7f74d76dca0f7b"
+  },
+  {
+    "public": "a5faa44e1561305f9847b90b8fb8c939885733182fb6d726e6a7cd1c27afe968",
+    "secret": "552b7328447e74d07f2bb14f47f8f084164ef25e7845734c54da52f4a9d11aff"
+  },
+  {
+    "public": "93b9bc50d87e3acfba8590f55ed58533582481820e282dd7826be649aa4ba6f0",
+    "secret": "96b7d0fb4c5b7491602324f9ee0e669c36994edb9ecdfd9fc56318744d93fe9f"
+  },
+  {
+    "public": "427859a789f46bfc4824154b49ce4d15b1742b9175ad4fb5ceb6ae5ce631ced0",
+    "secret": "9cea6ae10d152ed554383915ee168a41f1a3b31e7857ee34c58e606928adeeee"
+  },
+  {
+    "public": "af53a7255dd5d1e10f7e51af077af640ceee32a24b027121e8493bdf30e7fd6e",
+    "secret": "157bd78ebbbae3e94ffb79d3b8a93a241a968b42345e8b180b6d4deb53d372ef"
+  },
+  {
+    "public": "321bc403a607bb4842c07bb78377ae8a2330ec0c39255762f146ed1ed7a62804",
+    "secret": "a1e2c8dd68a05925730ed382046933557588e14ea89648b80ad18b121b182b2c"
+  },
+  {
+    "public": "19c194a1a535aba2e9551bbb869f7359141a6c855f2d8183828af1b46153844f",
+    "secret": "0fcb84a191f5856632fcefbd709b4d5399fffcef97c480146b69ccfe9b88a8e4"
+  },
+  {
+    "public": "312f9319753a6fe544065ed1ca032d82bd655d63ed475f0ea3b83d1a06dae5dc",
+    "secret": "46239685c86b67b34e7dca94bf31a1fb974ae0c798f2976689df57ed4868c76e"
+  },
+  {
+    "public": "68a09f0a0dc98562e729ba456f8b4fd2611c3e9f96f3d45d5d77bb1578be02d7",
+    "secret": "535fd8b156af1ae4d0ac541b8fbb185f5c21389bc525154acc1f8062b6dbd71f"
+  },
+  {
+    "public": "90ffe82d532aceb9120d7e914e3bc86e6fa6b6172b24eb16ff36b2c61f826a39",
+    "secret": "4bdf76d07e424ded8d6e1b47e967a174eb03cc1b57d375d2679ef51923510a72"
+  },
+  {
+    "public": "b18ef56b9a7a56e975f708195243827eff3461552bc577c5e242eebd8aa56c84",
+    "secret": "296cf25998b7e71de5d949031f4937c62d84318ebe4d52e36b578ab100dbcfbb"
+  },
+  {
+    "public": "b0385b247948549ade2f48d9951c3356a1409d3e3a4a3cc8ad5476b72f3cbd20",
+    "secret": "f5808c0578c7af26f99f6ba2e184b5581b445fc05d01ba095275fe8aa9bee815"
+  },
+  {
+    "public": "1726faf7b152e20bbb82b7bfd9a9cabf31e936e9f07187fe4c9193e66258f5f8",
+    "secret": "c3e09f4a97f474464a1e40555189190cbc06902a17615028e82380728bdfd518"
+  },
+  {
+    "public": "6eb477cbe8ad162d1aa37ef2a8c980df69b8bfd6673ef075ec7f89a04c200e8f",
+    "secret": "564bf0d44703456742438b3fd6fafbe318891fdc387aa13c8cb316d0fe245be2"
+  },
+  {
+    "public": "24ae039379d51892227b045c9e9291899a577601a6fff5e61e7f400026e57b8d",
+    "secret": "46cdbc0de3be944cc06de5ea656a1768c2aea7bf80a91d1ae98f2dfd368a1117"
+  },
+  {
+    "public": "864d8bb3053f9df9d87b01c87a718a60ffdc90457176653c8961cfe948c3debf",
+    "secret": "8d2847c5fb86c059207143fcd5ab3245c2a22107ae023f9a720659f6524d176d"
+  },
+  {
+    "public": "15acd3556e6793867e51195de9edd612e9732f5215482c92d485124a49b20828",
+    "secret": "8e501459e7cf2cf4d14f6b210875273c20eeb21bcf56037c9f60d267c9f1e0c1"
+  },
+  {
+    "public": "42b5febf065ecfae1cf0a8a3344a31c1cbae5508de5e0b708bb958b1c592db98",
+    "secret": "0e6a9ae145bd5468526b4def913ede0d9a08e765274ce136e1b4cbfdf76e3ba1"
+  },
+  {
+    "public": "3ff8640d2f2c5842cdd5aa4d5726a1d30880957db814d61a11fe655ed416cf68",
+    "secret": "70ced9095b0b12bfdca34625325de783b00b0517ccbdf82f6f71ecc2afac092b"
+  },
+  {
+    "public": "87d56d004cb2baca4e5e643def333433fb21ddb363b8040fe909b9ee208734b8",
+    "secret": "54264e2b9a0e8096677d75dc9e5fe0def60c9340d18b59ff0bb931dbc166cbb5"
+  },
+  {
+    "public": "5ba509f00e4306961601a6a698a4debd4786d440f551cd4f1c594c351c57a6fc",
+    "secret": "bf139c257498393d6ce33d2f7a34baf1261b67ccc0633867c8d6f9a6c9fbad67"
+  },
+  {
+    "public": "82f1f0d2c125b35710a5c395b68db455063f3774a9ec67905e2c7f0c791258e2",
+    "secret": "836f14ecd683aae2ff76043ab36263f16e27b78fd9d55804ad024665b2aa21be"
+  },
+  {
+    "public": "fc0bad12b139600eb1fe6b84ca66f6162af37f563c4f6a58f197e9c6e9286acf",
+    "secret": "1784eef782477d186815c05417912aba81494610c9318873abfae265b039ee35"
+  },
+  {
+    "public": "dc70349adae6910642e54375f67531763cca61255a52301e9dc131d45e6bcce6",
+    "secret": "21a8f8f60e888b5c2f14f41ded7b2d38cc3b7c3f95eefb67effa489f72b1cad2"
+  },
+  {
+    "public": "9837fd2b707204b712bd586489b7355e65851064e19a3818bba695d4e836bb8b",
+    "secret": "7445b8aaf8a6838f068ad738f3ac1a1c74d3f34967c4fb61ffdc944ea25bad47"
+  },
+  {
+    "public": "f9ad6193ef3e28388b2b08b3a22eeff8bc559a7d4a94eefa0924e078b375a84d",
+    "secret": "c5da3bc44aa37ae74af5b7a8bf520c5dd7bd00655a1a3687bed3d2c1597973cf"
+  },
+  {
+    "public": "4992d3db99569861f1f914f2a138f6e86affa43253fffb4565bba9f88d53ad76",
+    "secret": "710edcab75608186050aa12a69f1af7036ec7f6a422fde8cd44f29ec6364c745"
+  },
+  {
+    "public": "b4000dfdcd793ec85d8deb3da7362b104506a8d378c72ec5af8690e22d071395",
+    "secret": "c79cb97b15480ed699de6081733c70842d87712d28564c70dce1d0c786ddbdf4"
+  },
+  {
+    "public": "b2198b51a665dc64ee9d8e9d2d5b1f27dc22eb9860fbab0a2073fd4b74ca0da4",
+    "secret": "a32b2f730c60f4ff11f67d6d07c1b34ff3f5c26ff18d7ff4cca451e972c64c4c"
+  },
+  {
+    "public": "fd9f10b09bdb1ad666d8a19806d802532d78c24f9c257a26a4aa6f2bebc63c9a",
+    "secret": "e343f1d9ca01685a4d2ae490852dbd658b11d399aa10affa16520647b222842f"
+  },
+  {
+    "public": "d4acd5d34f2e77aa6eb82c6f6afe064e6a0fe66bc00738f3add069a7890d28de",
+    "secret": "c4dd7bfeda011e6f08880909755c2096b500c3fa1c6793bcca6028c67c0a68a5"
+  },
+  {
+    "public": "bf6d5439446097c2a0642edb904bfdf57765f247677cc46f96b34e1665b1b62f",
+    "secret": "b32adad3f7faaddf4da5de27acffe2016a1aa8b839e96af5162742b360a7d045"
+  },
+  {
+    "public": "425b648cd939b6c43105a6bd55cc5266733feb925d90a51a839160d0e9711f72",
+    "secret": "7e0e4826fd82d78e75138187fef31793234feb7f799ff5bcd13b86c870218731"
+  },
+  {
+    "public": "1f7d3a2dfa397e800f84524f1181a9c5f5269e498219502373625a18de448680",
+    "secret": "9c4462d2c9129c7a102e88f44a46ba0c56cc3dc26680f43adb219ae5c31744ba"
+  },
+  {
+    "public": "1aea40445636b16d573d713458c0923f64d231c756257feff4efbc8fd3c3f196",
+    "secret": "80cec854516a2ea3880e36dbe539814fcefa1f1149e312faff84dbbec101261d"
+  },
+  {
+    "public": "1bf289a1ca52688365caa40828f035a155a0737c2da8c254412d411b0a219792",
+    "secret": "a701fd6f481db7ea75623097e9f01d936937cf5d400a161357a0188700037438"
+  },
+  {
+    "public": "2d8806d3878ed2dd8f1fd4503888a75fba89b33caedd8d4048734f011a3669e6",
+    "secret": "6c73d33182b04ff8268327eccae137dd4ded374ba26299047f2dad847b75bee7"
+  },
+  {
+    "public": "f152f38dcbe93d6c0c9a378555fb1d72ceae98e2c436c8de77aa50215df23362",
+    "secret": "07773316025c80ddd81d6f0ebdaf63add12bb6646329c87b866ba0f63a054f04"
+  },
+  {
+    "public": "883254f5c4fdd34accc4f84a093f5a871447d11e641ad1ba9ac0be35cc496abd",
+    "secret": "db3035c8594adc1dfccb3b23a33ed5168ef3efe3ec9878841a71ef2936592674"
+  },
+  {
+    "public": "402603e48ffca1449493b02ba742ead31935ed8007bae9a1ab1d7c96b474fe57",
+    "secret": "60083a3f4b5efb0e06bd80be5a7c202202320ef046f5326bd97a915e0ebdea8c"
+  },
+  {
+    "public": "7f49b5b27befd46acb865f93fe490a8210ba65efb1040884429bd65896af3ce2",
+    "secret": "9d600e73ed6844d701bfcf8173cb31615c6e5eb736d05c5530d8b3e2d509d597"
+  },
+  {
+    "public": "ace5807ee11b9b324d5ccebcf0e6098db465dad427481581ad9303767163eb41",
+    "secret": "3258fdd5e648ee3ba55ca34df3b8319244d43b2ab62e1f7436624d46a8c5bc2f"
+  },
+  {
+    "public": "ede389d3d2b1f3ec6160237d86e97ee73b7cda760211c98edfabfea64a11a7a7",
+    "secret": "891f2436fdeff49eea25bb6efe5c4feed7bbf3dc9da50ccefce112974cd8648f"
+  },
+  {
+    "public": "8b3338195c71962f67f5067adb4190cb1b569b501a841b43ac39720a0a918add",
+    "secret": "fe42e37aaa11ab4b4ad6f0b38b84b95517266e00340699a0778a38f628bdbb0d"
+  },
+  {
+    "public": "fd1b496101413f52b7b18c69430b4c5f2ef883c4010acbce9cde74861968628c",
+    "secret": "ab725fc0fa61e672d215603e017cdd181d8d770e03ad2ee040abdeda452e9e0e"
+  },
+  {
+    "public": "2ba11d1edc7e18f79a58aced050ec3e4e2f536be4cd6289fa96f3058b5c8c7a2",
+    "secret": "1d01a184af987ddc8d45bce815edbc5a879c3e76effcdfd90c1c50f1567da343"
+  },
+  {
+    "public": "0d3fd2da74378ddc5204fa69acf203415d5cff2948ab650d47149c7e561931b6",
+    "secret": "f56075df62cd4600799cb1ad00292edddbc234d921945dc8f8ed180d01ea9d25"
+  },
+  {
+    "public": "e0497ba379ca7fa0cd941d22b950f72e5471e1c03344e2c6b68bb78277e535e5",
+    "secret": "015dbb59bcff87b25c50e53c1b0c4a8790ca537f016fb876fb96ea1361a8595e"
+  },
+  {
+    "public": "ec885c6d757a0020fd5e03604998930eb4e5a781642f05b8d8368568c4d806f9",
+    "secret": "ebdba5ca4e9ce4bdd15cb38af79ff4077defa95a121bb92c2b4d5ef51090a626"
+  },
+  {
+    "public": "d9aa7e0fa9c7a3eeeec430976d1479ef31e6103a95245ee70089a338921626f6",
+    "secret": "a5ebdf2b20d6590982fa029df4f90ef527e7a2db100a54ae5b78fc0bf06851a6"
+  },
+  {
+    "public": "7b489e641ba959acb50bcb5dbb850a7722ab019177472132fb7a63bb83b2f71c",
+    "secret": "1cc1f25a812968353d6dd73ecdad4dac5f87f65b4136269ca7a04a1cf0388677"
+  },
+  {
+    "public": "95ee6338b6d4abcf5aee72fd691c4d9d1f422ad960bc9dacedfb2fe8ed6dd0de",
+    "secret": "3e06be7a28ff8c209e515d9cd8d738d3d89b167ecf70c11f79d4bc12cfce8ab8"
+  },
+  {
+    "public": "62383a166f76c0f20e69b1bc4a813cfa7e2e83f51a788e66f866bb967de4267e",
+    "secret": "6aad85049a0f0acef95419d32d432ed06e8f32befb21d161660ce91edbb054e7"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_keypair/tests/ed25519_sign.json b/rust/tw_keypair/tests/ed25519_sign.json
new file mode 100644
index 00000000000..e621c8b71d5
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_sign.json
@@ -0,0 +1,1002 @@
+[
+  {
+    "msg": "",
+    "secret": "8dd6ef33da06e96c722b1713d8fc37c433757f0a8e0473298e3b47626d7b6484",
+    "signature": "2a95145e7a7e1a8770ff6dd1afa0d022a5778e63ab456d3f43cc51e124208bdbbc8558dc882e31987b7c92cdea56e3844d6034fd7b8a6d1db066f931ab0f9e00"
+  },
+  {
+    "msg": "c6",
+    "secret": "cd2441869d0ec2861fbe9d4655c941d9f2af83d53397a12f48342d2e6edc9f6a",
+    "signature": "9ec01c5a24fcbdd97c1984493c5da4593efb8c70e1e404b44c7f7a5a6b6ada26f42a94d33dff3fad900520093001a00b2057acfe8f4ef946ee13830e62dd7a08"
+  },
+  {
+    "msg": "d016",
+    "secret": "04b6ea7d9bff177901a0cd4bb942d7b60de4eee9bf7eb3e90b954c8baa189c59",
+    "signature": "93cbc208ab2cabcf74e3582fcd0a2c1b6c0e65291a031ecf155ce66323130dc4b7159160a6af95d2d8036e30d7bed56726dfc9872f283fe23a0fd7076ee2e50c"
+  },
+  {
+    "msg": "25ea67",
+    "secret": "5b756ef685ebb266b8d12416cf7fb2b4e7059fe58c4acab14f350dc77edf0b69",
+    "signature": "88eba1f7022b62b18d796ac76f88747ca689871153f1889aa1058ce85a8c1def71e1f4239dcf235e126e5225deec1c348b120a6f9c9c93c7da287f7114e4a905"
+  },
+  {
+    "msg": "82b059da",
+    "secret": "e29fb6866116f07c05498b16498ce46f27a95498fa0d39c18f437abf413cf852",
+    "signature": "cc55ca7d0348a0f6262764fa2fae852825dccbe2e2b84bec21d81397a90f914c35f62ff3e02da08946114498fe5e12a4e26a0afa8ea12f09938f9c0eb1d45b0f"
+  },
+  {
+    "msg": "0a990a846e",
+    "secret": "7567121d546f346f1fe93af5bc07c0d49f3395227b09e745d96fe4d2c22f90db",
+    "signature": "80df17bed6eab0f86c7fce7cf1c5fa9e43175effb9a13433d7f5d5d39ca94f127ffb4f000f50f77b06a05e8b7170df7c0dc2054214438cfbe9bcb1c76125d602"
+  },
+  {
+    "msg": "f0ce777de23b",
+    "secret": "a5f7954b491df49c06360c409dbfc05026cbe8f07818ce55213ece305724a628",
+    "signature": "2a9905b9b1be17f2be27a66f78867dadede437ac878cef5dabddd8c52e1f5cf2a8fe7626935f2353cfa610fd3d46289b83cb7f87ce2abafdbe83de7c10f91407"
+  },
+  {
+    "msg": "62ee5f3e85697d",
+    "secret": "f4daa2ef4a3a3a9179b92fb707a0675bfa3a3791c0594159bdfa6040d7085dd7",
+    "signature": "ffe772729a0862b575368f48710b1b22d7936b9764f101ea3e236db236ba227169e808b758155bceeb3f1e8d96673bd8adfd0ff49b0447a54330059501816c0e"
+  },
+  {
+    "msg": "6c8859c7c376c1b0",
+    "secret": "64a5c2122e53f543318493133fd94fabc8e0892065c4a4f998c368386ab7f15b",
+    "signature": "b259e9a976ef5057e1336e0a20a01f8dbaf973844b40498a7ee3fc51296faf2c106c93cdb8528c6f78b49ae5c8a9789aa74b84a58105e49036599e29693c7f03"
+  },
+  {
+    "msg": "5c839bcb6e1d5554c8",
+    "secret": "319c5f0e55aeb30d0db40209a17cebea0b85e6e673dc3df48fbeeb0344c423a1",
+    "signature": "a6670b2fd23c712dcb2930b269cf8e2e0eb9c75c818cbf31c4ed08cf0a979a5d509939eddb7741606cc0d6ac8ccb5aa9370939837c10da1a16b44751a0663c02"
+  },
+  {
+    "msg": "0d2e1753ef5fd124abf8",
+    "secret": "63ba7c1fb49733d076f71ae349c985885c89cfd94bb8db238c35ffb4c0ebfe68",
+    "signature": "fa4a3a9e5ebcea816d91a94e303815af987601f8cd9e5e8310a1757c22233f21f3096327087f3a58931c98f34125646075f39e976880b6f5db29203163315a00"
+  },
+  {
+    "msg": "875f76161142c2b5f34a59",
+    "secret": "227ca4d42a516e15219f532f963d7ddeae54af93376c4834be00c26b9633af23",
+    "signature": "01927eebf7dd6726a010cb97ae7970b4e305e1375dba190a5b3e0c21553dcf348dc1a4706e94ce13d7ddb44a6e200cb6143ed4721400622137c9e215a2c0ff09"
+  },
+  {
+    "msg": "f750ad069452b4c14e2bc1e5",
+    "secret": "840b1abe5c185b7c2dc0a203a382b8c9053974984a106861a250add2082813ec",
+    "signature": "b05d29217e1b3d7269bfd3d64495ed613c59e11b2c17235cef77f26cea51ae862322a62491dc5f6213a1ed0b07d4b065b4ac1b86be79b56745691f55a2f1d70e"
+  },
+  {
+    "msg": "93c7676450a44f8524ff66ac7c",
+    "secret": "c3966cd28f6355945e663fbb24331ef6dd380db78118e183bd99107b7e3f755a",
+    "signature": "fb7855e6fd07ed15ad897fca00efeaf00469de5e48a02d7034ae945313323c7142405cbe53ffed871de7fc034e79694ddf6de9cb8fc7e54d53d4e7c856826a09"
+  },
+  {
+    "msg": "5a6d4d3bd03e43d28eca2890a930",
+    "secret": "51088d26617f8c64e39f14a5df91e15514099193995096a5ccdf0e83ecf5fc3e",
+    "signature": "b70af6f932f8daa0a0090d1228c5f7da23a185d233f8c6642d59ded06d0a5bba7a94851763ae2b9c9c6ac333a9e4e030f0c5489001ffea58008d73ff5069df0f"
+  },
+  {
+    "msg": "bf8ba4db0cb4af150912ea82711887",
+    "secret": "cdbe89fd5d96cee4ce468a103d9843dd8183aaebeac7d43b6fa872e1850086fa",
+    "signature": "0cff7eecf88b890368c5565d57c3d481f00f7744702bd517936423b297ce84713571d8032e41f3660eb8e0f032c369efab9ee61e6cba976952a112048ddf4101"
+  },
+  {
+    "msg": "f142f7ba1a7ed1de48e13ef40f30f192",
+    "secret": "82794fb0711321f9127d14e12c9e32cd28184fba3133c20fea858f8e3587e5ba",
+    "signature": "3bc71a6f81e9757ee19abf288478424c2fce64c31a517e4cb30eae98bb48dfd14ef437e11817ba5fa420d88f50372a02a36919f819c190e0ec8985348f5afd03"
+  },
+  {
+    "msg": "667b4898efef75fddf6d655ffcfadba0f4",
+    "secret": "bcf84795c05f515c4ff06605d9e28775c21ae83eccca11e80198de65fc54c0ad",
+    "signature": "cc1a8d06f196bd3c3bebaef63992b5dabc265114e92492e3d2b43da542ed9e9b620fc5948f1bd13a77ad364c9437b2df4fa34b9efcfa99a058030dc94ec40806"
+  },
+  {
+    "msg": "6b918baf8a8b3dc33be3c46a107e2c9aa12b",
+    "secret": "081a0a2fd3f63ee8a2f73f25965995cadd85d0972910f8e35136e709f24e2c86",
+    "signature": "92cd1e04aebe877577cff27218eb4f7a1b0c8e2ea5c6e794e0968bb79be4771bd71d0056c6d369e53fa063115be313ff9e6c05fd263c9e4059b1edd4a980fd00"
+  },
+  {
+    "msg": "4bf4b9ee844a1dcd330621a6a059312bce6a9a",
+    "secret": "e47b480a81a6c417ef4600f5fe34618f168db7a1c9fb1b6d5b08c02bac6ddc6d",
+    "signature": "af7aefc983c3c538bd831f85fba47266154c360ba05c7f4829f9c6bdbdbda78704f6a668c1ba14c96310ed06bb752d87ac2d994bef77b89ecbf9af478359f403"
+  },
+  {
+    "msg": "7df06dfbe5ab9f88fb522a1c7afed1659e88835f",
+    "secret": "0a9e7cb7f9eba40a4a6b439166ddd14bdf66a8072391cd3c7a44acb4597fa8cc",
+    "signature": "f45b24a08e445b67f2f69f1d0e7d287dc3076780b53b3d494f00549c645f7ebc640bf7b2663608604a19d1ee94da5a0aec031cb6078c576de91cceee72919206"
+  },
+  {
+    "msg": "2a51abf6178066a9260cf62342bf870fa73588286c",
+    "secret": "256652f61917d25d7d5724feadb1110c9bfddcdab3487e683ba1fc2dec4d1a1e",
+    "signature": "63a27b4dd63c5ef94dd44737e0d782c4fb58a4db68d3b4a966bc27eb72f493b4b529cb89f67145f98f4672b4746c9736fc8eefa853315b8383f6433f78dc260e"
+  },
+  {
+    "msg": "81683774ac57f8b8b03ca9d8683e328d3460ba8715d0",
+    "secret": "71c5b75467ae24601ad94a524e8d0c4ff13516a8e9f05bedb968872e897402d8",
+    "signature": "f5b27b056cef1db2fe3cc7c24799c38502d97fce0526d2abc0d5009003683d0e998b0594dba11f9a5d2e327716648c1ff215eeb84312c1da40ec4b4cd00ffe0a"
+  },
+  {
+    "msg": "eeba6aae127be29b546d39439a579058f64e0174a6430e",
+    "secret": "9fa9bcf42eb2c356bc961370505564bd1a4e918a642921c4e23af582c12dd341",
+    "signature": "c8a6bcf0384aa050b9f1b67ec08c5e8553beff7d6e512388c20e891878ecad23a1d29b90de4047d918d43379e6d3a6d93974ad2c0c8958fb9d2e52416f4bcc07"
+  },
+  {
+    "msg": "c0da7aad36b7216e9935d1e9658ff69495d34ade2a8c5849",
+    "secret": "2605d1a0339841eb2900c700376ce747a90d1768bf8ae1d577c5f10e807dd413",
+    "signature": "329887e0efe871cf73f79c1dd75404053c173196bab76d9e62cb070a0891ec34550f5d63e92a033358974a241353e1dfd1df8c3877bef31a4c5c46e06658a60d"
+  },
+  {
+    "msg": "8f6629b7de27da091032757831ae3dda4968e3b040bace8a87",
+    "secret": "3629760163454b0a0c04184e4c0d2f8a2cf25b60715e57593c240caae4cfa399",
+    "signature": "5a9a72a1d1cd467911afc9330769460fa6a8e586db33e7f10733b19c73ef0bc98a12dd29d719ea1101adc7f951ca2d255c7742b6656ec4b9b3e9d99edc7dab03"
+  },
+  {
+    "msg": "8942095c16e6c7bab7e4e5e61d07c72e79384169e0ae9c36bc6a",
+    "secret": "b365dc7797c0f0728509f33988b8ed9e25cb5a00355354b41eb9efa71a3497ef",
+    "signature": "e717114f89d3046c90fa87e4615216a8b7b7c0b9c472f259bb3d02cfd3487777b3cf6200d72e98ea7c54f18f2324e84a89ecbfdf51fa6964593c4fab540a610e"
+  },
+  {
+    "msg": "16d608210763c7bb39d3724cd35ff4b8fac44ed368403e5c6801be",
+    "secret": "0a295916f24c097a6b5d64e4269820a1b7ad1dad661d98d61095570c2db23ba9",
+    "signature": "b9690f5c96f1b7129ef9f472d99455c453f6398c5e5fe62f5a63942548dc55fe63a75070afa95addd001eaa15bddd34de7b20a83c4f2908b49d8fd359f152f0f"
+  },
+  {
+    "msg": "2ebfa288a5ec465ce7cd1b52a999620bc08998e1f0db12b5c68d7612",
+    "secret": "6ea5f0bf609a40f579893334dd028ce212cec192553834ab6ccf24abf6af205e",
+    "signature": "3358467a8ae6aa8b4c3c0dd7032a2bb1d0b245363fa1de5b06f24d87eb74ea287686060eb423b4fc8e710c3c0239d67e0b48302b05b2d094720291552108b605"
+  },
+  {
+    "msg": "7695f72447610e340471b13f65ee3b7d3b9c885d02ac7abcf3de551144",
+    "secret": "537ee6ccfabe4733404fb328e70c0088414a021b8972e3e6fb6656bc8dd7457c",
+    "signature": "35294b50523d9e5a2d67f56fa626ef91a5d19e376c2dbd5de5f7d3a61bc0045a02f2a5954040293b399b8125748919b1c3e78a239284b23701dc45655230b60c"
+  },
+  {
+    "msg": "0828b5242506ee27fc35d15401651429c47b77514908c51b3860eeb7f75e",
+    "secret": "376e36bb1901ad83d3c56f2406b8e1b0989522fbfc37b52c63e59149d0c3a5f9",
+    "signature": "8dc3b15ab6a95106ad66eb15990146498ee5acc648a5e2c3a2c36f97e5653e28ba833e97d2eedecabd5b85d10c22029029c82fb3378136b6a2ba0dc5f0a7110e"
+  },
+  {
+    "msg": "1cb41cc3b2afea37a6d2eece7e165a2637645465eab95621da83ed5bc2a55a",
+    "secret": "f3da9f295dc166e8e1246cff3433701de5a3a43f166935e474ccc9df008c4b72",
+    "signature": "b59b731561b0703826291e5d373c0eb19b65812d19866370defed730eb7b76b105061dcf3f2a92b4b7f70906d0f8278d4fac5f4df5a21246c7d0fa1e37bd790e"
+  },
+  {
+    "msg": "06414d0c258bcd528dbf1b94d2d5c3eb74835f5bcb7c76ec266a7e4a73fafa5e",
+    "secret": "3a489cabea2821fe32fb7e742fa17969c08ee19863b799e6468441c9f9172eef",
+    "signature": "47ef5b0e4ffca143df7cbc49a6d408140dc6f19ebef6f87f5b33738c4600468c121a3ced5f721b68cf57929a28d8857a082add82e66ad41aa1ab60c7a272d90f"
+  },
+  {
+    "msg": "8c0d0a5045dec601f8b43cdb01aab66a439b6061c8e4379aa160c54c5e67006285",
+    "secret": "2b2949d066b71c54e08a405f3600bd149bf7770ba938ea0e06f409e067b5fbd1",
+    "signature": "d2e4579a7eaf6620e36f789d521dc9c840a8326041a1b8c0d8db8892f8a25d8785f6e79ef867435314f28c2701d36a04ff75fb02ce15fb57589d602c5f0e8d00"
+  },
+  {
+    "msg": "bcb13904e8e67309d0a9d3323228c4c9401616c3039b7a68c438b7a67de5dda186be",
+    "secret": "85bf6f184e7fd19cae6e732c096fe15163c88c7f81763db971fdc98c2f9236e4",
+    "signature": "efaf4ea3e499a822f00d89873ca5040efb432b07120a3ff54438e685f8c1e9c0a6ac4309a21da90339fcfc5b32a0f08636b5df6c6f9e61aaabb34cf82af8750c"
+  },
+  {
+    "msg": "781bdaf0a6c9e715f92b89cdaa0452afaba3893196257eba17de9842eac2d7d8957e58",
+    "secret": "f97d5c2e8ee8504d1cc832d117bccb1551937bb154ce19e7ff58a7a9f56163da",
+    "signature": "22cf8194e6372b34aa0074edfb7cd615e25bc9e836a0485ad64520a1f377ce804aa7d37f5eb2cb90de065cbb5f453135da5eb2ed6735dce066d6a5ee888f6806"
+  },
+  {
+    "msg": "37e2f56df27983a2dd29a985807c91cf95c2214acee163baeadcafbfda4ffee2d819b278",
+    "secret": "3cb50f9f5b533c9704e63e405e1628ed44c121cd460729d33916a799072bed86",
+    "signature": "4ba2165c827288a2c5240dc441a47dda5b2e647a85665d291551012ecf4c5b3fab15303401ae0633b53e55e7a29f52b6f36aff0d5b7cdd7bf12038e22f84120b"
+  },
+  {
+    "msg": "73c5a4bfe16271284a47b824bbb3bdc6335b07e39129f2067be262a9386fa2b814bfeac0f0",
+    "secret": "fa3c3499a0302f5102ace36bedb0dbb0ddfd219a4dc4ab15d2e40c2db1249c95",
+    "signature": "8da03159ee33c146d2ab53d3d43772e888d4fa48f757894889ed3e1f72d822b093bfb03adb5b6c9ae24bfbb6df7f6164cdbe590e49f91c32f31b8df223b96c00"
+  },
+  {
+    "msg": "41caa617505f42c1fe1c176872eee594842ea18e56736eaa456f1a4c10c0dc48e9c6b01c3856",
+    "secret": "05b20a53f66f57c09afcab2ee77fa847b09c7412c411c9861bc8a2658174e6b6",
+    "signature": "c4e8dc971bbe6acb940585e3e5710cea371ced6ec5944aaf0d63f59d982658fc5f913f3db3d3f2b9acf4992271bbb18f5a726172d39471fc6de35dda8cc55d0d"
+  },
+  {
+    "msg": "011b110540b5fe4139111ad6ec80609c066f6cb5bda86edc90b0405afb90445368da7d93cdb556",
+    "secret": "18cf6cbc093a428f45ba21d1dd84895aa8a006cd81120e8fbb8268a535a44013",
+    "signature": "bd1a5f7826751f6aaa5988941f8b24c51a17411ad9f214ddf7430b0e7f4bc06ca88afc9fb6124384b4823a66d1b590519dbd96ed01fa2527da4064c97389770f"
+  },
+  {
+    "msg": "2280f940fa3977a43a0ec79962c54abda3c385c53092fa96473ddec16135b1e95276ee83d7eff433",
+    "secret": "ca4040dff4fdeaf19227e5a8dac943ed903e82403fb34cefdcb5f22f92299ba3",
+    "signature": "67a7f3cc6bc85d9f6f8a9ab098e636bf67db25a6b332ee34b844fcf78fa3d36b5190d3ee1d8abe5bbc779746c874f3160057b5c8a92d4e35ad3a4a8845b97405"
+  },
+  {
+    "msg": "c8a687a4c16b3f7ceb409ddb23266fb4e2b01c83fc749f46167a5b92060b13c96df5f210c9f1cf3018",
+    "secret": "a360f9fe7246ee3a7d77fb374d1354f09237ce7be187783b02c433fddada023f",
+    "signature": "9ca7fd0d092db2e787d3f1b1980cdaa76fd7c3b1bdc00d255bd5abb9e322a5eef97ff8a66089b4e52246ce8d253f5cf5e0dc79828f14b6da9650e733ca6ed00d"
+  },
+  {
+    "msg": "66bcda10b96fadf1d5b296d61791822830255bd46733c2036fd97270054da098cfeb65bb706c9ddd7756",
+    "secret": "68dc1dea4daff83e3fa7fe391fc641c0c97877a7069ae429af1c099164a913b9",
+    "signature": "eec7efba92fbe8048413b1d30da8f1be96f5175f95384f384ba92458777484576f7e0f01ea0ccc94ca743a85c89d7dff158e1a768ef0765fc2ebba4298ac0200"
+  },
+  {
+    "msg": "78098fae674987675e3cb14d8f99c1bc1be8337fddacc7beae03cd4afe8d096d6d507e12e4d1378d85e7df",
+    "secret": "8cf7fe80c7b47bf7314cb37758ecbae100e025accb727d0f3c13b0b4da857901",
+    "signature": "a3bc01f31c07d93fe5d9f83e9c1eac7b1c515c6f317b89bc8cf20809efa3539fc38325b11b4956e80a2c04018f44db5814ea3aa7f089b5633b8dd9b714d0170c"
+  },
+  {
+    "msg": "7db45788457232e289926f233075fd58a9cc6259c869d9b7c8901c17ade364246b2b20c35084b67fade6974f",
+    "secret": "318c522d5d435e45697197ed84c370b6d736f64099d0799db226629f6825b099",
+    "signature": "28753cab1a0696e1d69aac69a506c61daee218bda03e68192456b4f2230ff5f6149d421b74a5cdc72733d4fa42e4eaad56dd956100e60dd13d5f5c933e02f407"
+  },
+  {
+    "msg": "151ebf6e4db9ce55dbf57202be2336aa846927ea551659a8ebef2f558d47c8d6466255b21bc1345f1b0e6fea81",
+    "secret": "4b7208db8825c304c3c1f4b880321c8d71108fc1b959044caa626b75c8ad1274",
+    "signature": "ec867e996da0e0e75474b5e6e765786b05b0a735d00fbec0c3152f373f683064d8673a3fa48a2d87f1b5a24f1e269a9eb1b4982ea892b09855fcc2f1f306b50d"
+  },
+  {
+    "msg": "c246712c79cc804213faab3942f7d82d800f6d987c1be494ce0da4a0e978ba7f828dbce039527c41dc4b48a644ec",
+    "secret": "39ece05d86a5f1afa50013fe7b8a4fd2a106d4bdb32225afa8d629f79a316fd8",
+    "signature": "125256f67663cee6e5abf2bb8735a0673f7730ea576922f014556a20d35f3ae87c2fac84edced17d0d59120c6f2490b6ae10228c0d5c8672f9ce78d05dc21301"
+  },
+  {
+    "msg": "38badc92e0ad6d1f5e8e8ab18ba94bd780b241f732796df585f1845f53261840a8dcdcdc6563e8356f008209acf1e5",
+    "secret": "48f799a31d8ca682f716ca3761b85d778dab145e40b0dc0858f62f1ae7b6f6f5",
+    "signature": "09641c50f14e5485a843068159fae0ecf5bf12d0370309a2b1b173fc486004393f4b91229a14d8a359b1d14931d6219f487ceac38846982b0cb1222a8abced0d"
+  },
+  {
+    "msg": "db31b85435d449c945f31c79e62a7aa411e1b3a8e689d5fea52c0a3031db5e97cffaae524475f787f9d2f57c0d4297d4",
+    "secret": "b55fde1435d14c89734d2fe337c1ed7e59bf1c9bc86ca427a7eba44b9a7eb1a9",
+    "signature": "d7498c00aacdf16cc650ed728c2f2264f38c16f2425b455a60a9edc866b3bafce2cc6c1b28600235919454a70cbe0c6da079e7420a6e6d89d0b3fd6295cf7a0b"
+  },
+  {
+    "msg": "85c2d8d5cc2c2af471a43e4e748c1a101ff1b6304bd5ca9300b3f25a9745e4cb5975a954cb5867f759b1ae1aaf02b409e9",
+    "secret": "c3f0f18bc37abec83d8bd9440c214c87e550556c27f64e3a7a0d7c2153a979c5",
+    "signature": "8beb901d635fc81964858f9332294d42ed25da989024ba80f7e55e98c11a590fdfebd1827b0fcd3c9fb2636e71d2bd317c6c1fbf1468edfe7448d06db702020b"
+  },
+  {
+    "msg": "75ccf68a025bfe06077b60736ea0e9e0d98db383b08ed73c31e27a0476e81ca5a683e7a24465aaffb5b1d18cc66729388c54",
+    "secret": "678be044bfbca878fe43ac3e4dea0a265c27b1c178a6f398ae1e5ebd31c0dbe2",
+    "signature": "cb67d9700e610851425b360ac4ad78db451d3cc90601a73ab5f897aed9cc41e4cbfbef7756c0d80b77105416efd4e75247e9f7764f54eae01932ea65e1a56004"
+  },
+  {
+    "msg": "43",
+    "secret": "54d89ff3223995d76d1d798e50a81003d2c7dcc3c5e9bf508f1b77cd39e0e6a8",
+    "signature": "f0adb50c013eb43e44adc62bcd77a90951c7cdcabec08c51dc69477357fd98e372086ee3e5801a24b231a0e65cdeacf3ac7b609497b6dd68e0d3de06a7b57401"
+  },
+  {
+    "msg": "0364",
+    "secret": "23416d7d29e191cf20c2dd470193708bf55824e595079cc45e0ed9d2cd450191",
+    "signature": "bcb7351cabe1eabc978929ea77b70d575cd1fc120dd3ad78461d37b651807a25c0a6e9e60a8e35194582fcf93e2ad63b0e3d5ae0d8f6b5e25a06a50342194206"
+  },
+  {
+    "msg": "ca4bce",
+    "secret": "b63e2616056ae9b44f70e901acb2c4307e2f262c098102bd7a4713db856996b0",
+    "signature": "041d0864b49107406b0a5ce194260467098b69f04edfd23792f62ec02376d794d45b5adcc99f37a9fc269d182947350c3d5b8d05df1e101b616540324aaa1400"
+  },
+  {
+    "msg": "94c48be2",
+    "secret": "694acd5f627f2d855340c52074a10ba2c8c7c53e75868cf52db85f437625b052",
+    "signature": "13a3c48af63d023cf8937385af036f8f3730b622f77a97cc4a71452d27932b6c62f710c34c5161773090cf5269ee8cf515f8b0f34e1952f8f624380e0c3f850b"
+  },
+  {
+    "msg": "bfb861b909",
+    "secret": "a25499e66880ca20512ff445a6ca3cf16acd369b630196078cc75cf8e6cc9fe3",
+    "signature": "2bfbaea94bc1dee8a967a09df9e3fea87aab5ac1115ce1fd9a3890d5c2f3ce75359761b5740bf00bf613a42ca7b0cd93bf89dff9291e1bcbc1170103631dd501"
+  },
+  {
+    "msg": "9b3dccac151e",
+    "secret": "3466d9e35bc3b1135a563892624d08b3f6ee86b8461bb1209651634612e752e4",
+    "signature": "8c2272bea4c80e68a2daa33e636c353eb5e11b2f6c7b32ba7163755b5c7a07ccbdf36cb35e8c058f69a17a0d0203137aef38f3f5af61417fcfb48fefc30d7103"
+  },
+  {
+    "msg": "21e978916632c8",
+    "secret": "f2d9eef29244041afdea72c745d0ef18a440e4c7dc1b011a8532af0c701fbbb3",
+    "signature": "3509a8d235fa4c7160e439cfe7cf70f4b49a618a39902b49e6e19dc724bc7b3dae06e71ccfb72857e4461243d05b495fcc89cdac806c40d007bea9109bf6d60a"
+  },
+  {
+    "msg": "25fe15e7c3690a7f",
+    "secret": "a1249e96eaffc4befe10161e6c74f86c7fbb3a8f534f26adc4ed99e28a8b0950",
+    "signature": "fcdaf8b18ef85b3d0a38eb211ebd10cc70d8e7a41eba00c1db856ff6daddf570c85d5a55eeceed45de90b2e40d9f1544c6b77f964b845c6c3cc9856a84357e01"
+  },
+  {
+    "msg": "2dc63f311fd602e106",
+    "secret": "f8dd1ce11564789c3590560a7d48c01dd623ad5da81c19af2f2363fb75f9de5e",
+    "signature": "79b6db105a3190bc2c59c3c2c8a0cb035b68695667f71f7a660a8318d81eedd3d0680ad7ba0f14f1039dbfc3dfc3cfc4725bc061446464a560d9c091d7a1df06"
+  },
+  {
+    "msg": "4a0f07c45df858eb4a1d",
+    "secret": "a2447f54efb6e2849dd26335a4596bfd8eaa796a281c59ec0d3ab5906437e33c",
+    "signature": "62b659006e7c99c05963942585bdf2cdd0dbb55237ca97eb64938d3a7f93c521b0267ee8213047095957ade55f064305f150980833f49dcd6230830c373d2c0d"
+  },
+  {
+    "msg": "2a27f24b7df8a0a9a717dd",
+    "secret": "97d09512c54ab27a0164ee3a6b7f16280b1922b37a974cb5c247c71b549ad90e",
+    "signature": "aefcec59d7d79265e40ed9c8d039435b1e9562b986f03fa150d77bdde70ee820db5a1cd3ab781cf28aee95a57ddd183148e61d0c5830b998f2e13906929d1e01"
+  },
+  {
+    "msg": "74a38e91890d5fb09f11a29a",
+    "secret": "79b323adaca0bc86c1f1725f3b9da970c419fbc40f4ef8cc1d4de7cb1415653c",
+    "signature": "528956fe25ce87f4b2b91d4d44e7f19a8402d75aa8863a80c66dec01eaa92350a3fb4ae5006e46de527ecb6383d772d44dd1a49572592948a80ec21d76c9a903"
+  },
+  {
+    "msg": "709e7a14f9a3f4297adb78b6c1",
+    "secret": "011a262a6bd202363dad9f3fb901cdd474bce7c459b7c10c41330c35380e8612",
+    "signature": "5bcf214b4b18f08d9655d0f3a6daf708b28a18a68f882c52e85a9a13b3af26291acdda316dfb9c977007b648dfdbfd8675ebe41ac9e2ee01a3dcd1b15612e206"
+  },
+  {
+    "msg": "ae2f4fe6a5f6d374665f7f3b3fb8",
+    "secret": "3b1a8d1f2c0fe6baf87217b5d8d7be2efdb3190507c32da0c2789b48c2df31a1",
+    "signature": "407dac6b76b005d7cd637f16cc6feae4d0a18db2de05c024a03cde993d7b8fe8f97dca27f7a6c7d93589fe0385650ea5487f34092735f124becb1b417e9fd901"
+  },
+  {
+    "msg": "97c4063cb4ce9b3c09b780b8dbefbb",
+    "secret": "0c82fde63e277c4aa195779e372428d80bdab2f6a1f7bbd25cce0415f1530b9c",
+    "signature": "048597cff9613c1489b5276e2f84fc6e76a97a0be22d73a183ba61a5b089e11f578de0af29d638d44f52ed5e43dce4dbe52e2c3dfe9268700eae32f2003fcf0c"
+  },
+  {
+    "msg": "5cdcc41bb1149f30e2b74243fccb38b8",
+    "secret": "a67c59e72448b689d70af45c67409bd8a3b6ad8e969f516b437b33009d851c0f",
+    "signature": "7781bf3546c1744fa4c45f58afdff98635acb4b7eaf7e7aad67702b026079f3a16100bcdead6ceb6bc35ef521c5280527345bd8e4bbfdb1b54119e79e435e50e"
+  },
+  {
+    "msg": "c3c18779101e4eef980563fb6de790a391",
+    "secret": "44be64902fd6a48e6acabdc0a7c63a01a2a39835532be92e010dd07ab37dda7a",
+    "signature": "9dd86307d0babaa8c3a062ab9027d7f1a8443773428b554357cf618951738acd4e4cd373399b29d3efa9f8180bebe2484ae2184a2f70cd3da9af05c899742809"
+  },
+  {
+    "msg": "1d855ea0f6a73dc545b6bc7203ac25bd7ffb",
+    "secret": "35a2c0b046a97dcabaedc46e5cfdf8e02cfa6c17fd09460e99488e3bd090ee6a",
+    "signature": "86235249830c540e618c4f477283542133b05596023b648000ed56d73fd96aeec42adb644b3b2defcb46d48492373accecbcb24656eea9f0b6232f71a05f2405"
+  },
+  {
+    "msg": "a290dde5b399805ce944f23e19bda7296afdae",
+    "secret": "566c88432aa96d9418523afcde9522eb1cf6075e8fdb406ccf70247678951a73",
+    "signature": "e525d95a8cd4c8c75f78aae91d91c2c328137c044cb85d41715058186a89a0a090d76066d08d54a7f9f73d41ad3fe30df7425227a36b5aceb556a36180e55e00"
+  },
+  {
+    "msg": "2241151f49e6bbfa60fce184fbb437143906b8fe",
+    "secret": "bba27895cf0a248dc8f5348da5c4fe6ba24b22e2097e76b6b8b2d6481a69b0ca",
+    "signature": "a4ec13e88d48c960640c2460e8e6806a6f746506452150883c1f53be4b6e3719280cbb5b959cfad48fac808af68210adc269349c5a03feaebce1ed798aad1903"
+  },
+  {
+    "msg": "1b6c387dc3fab3a92e2355e202d901289d820a0876",
+    "secret": "08ffd4eafbbeedfd7e56132c3b7731f7808bf0cf622709427ec9c2c6509395fa",
+    "signature": "a4c02b88f62c81af9a60fa490a1c68cd06eb4e03a89c0b78d72d4bbf4766650662e05ac72f66ca62dfc1fb8246c0737f901453688e7566aef81ac8de7040ed0d"
+  },
+  {
+    "msg": "0d82a964cd3f161473bebb3d8655dbde6c8aecf1c23c",
+    "secret": "91979109d10fe33d89f0d2b978b3e0b387bc5aa2ffba452e59a7a817a14a7a6f",
+    "signature": "7de8f085adfe9b97d7520cc9b37f5a2658ddefa0b634320c0610587ea0ac5c429f9f086122fc0307cf287a4f5f1dced5c10fb6e26b859cc34ce4a3232e48fb02"
+  },
+  {
+    "msg": "1e1d6923cf04c20ac5a7860e8ca8a7116ed463f641be87",
+    "secret": "4b10236006c09a9d265d883c2f898afff749ec5ac9c9ac72196b5795f25d595e",
+    "signature": "a107b46ee77143259d1c39c8605376a37c12ed6282aed2e528dde2bad10ea690f48014a7fe1577a54f276e5d10288babba9989b7fe3eb4566e1642cee348560d"
+  },
+  {
+    "msg": "17ce2985c575c34c23b40b1382b921f7e6479b687174cb47",
+    "secret": "6302d80aeb5a49ce7d94e9fc1b889a38be53e6acd3aff95e18cc6175a8797aa3",
+    "signature": "46ff959a44b2b94c6728107369e13b4c0a1b29e68a99f3a4a7aee52853caa3ac3aaf15079d811233ab0145b5c4cce2e7c840a5ad713932b681d8fdb4450d400b"
+  },
+  {
+    "msg": "1649fc9f0aa3da92539b651fa296ecc2b6120a73cd1ec223eb",
+    "secret": "2ae3ab00387b456d7f60c59e9804346448b24d41628b268c817da82f67fdae17",
+    "signature": "8ebdf5eb775f604f58e5301c2b16e860b7283ec20d9d246ebedc024ffc6ab2f2e49901e29aefec015f23ba3db817b6a841c71ebfcff7c77ea94d8620b83ef80c"
+  },
+  {
+    "msg": "d75f6e80e1769db59e2bacad0fc81220e129b1e42b33327acb39",
+    "secret": "b5c669157b5b429a84ede94c3a75a0b90ec983cccc2f853f7e6364f53be8c506",
+    "signature": "9b5ef713706aeb97b9db048ab0e74092eda548a39693b103e5e635997a084f15b61113119ea62d984f403c60b3b422b847c0fe32e961e4bd109e2f845204de05"
+  },
+  {
+    "msg": "31abe8abcb2a78d6cf5517a51286274d391c988f181d11073686f0",
+    "secret": "f51c6e3008b764eb025de90e7882332c76dc69842af9e629c2e1afdfe64804ee",
+    "signature": "ed3d153c540b2d35bd6e64346e770ddd401adc634c1b953b4fdecad5fedcb2f79f0d7991e9d8e1d9698ae2e495ccb9f135df433b448a17f57aa5852382b9710d"
+  },
+  {
+    "msg": "c8ba60396421e4e3d1d7612974bbe1b3269beecb4c5a4275a69687e9",
+    "secret": "aa8b83d0b25819dfab81eaab6bd70600e435a877c82157ffe8f3c6e54e516cd2",
+    "signature": "0813bfb057df53d3fab832c7be7176bacd0d9adc6286ac69b5df6f767215de303206bd1e3b08f120e988fdd3798ec31a096b4673bc328f8858a7ee9e41b3480f"
+  },
+  {
+    "msg": "683dceca1a3c0344e8774c81011ddf069e1da61e45ac1fefc28f1ff1f3",
+    "secret": "18facbfc852be15e6aff08ea7f93457338c7413b4b943b42c5cb682b87760fbf",
+    "signature": "52227a344e114ad9ddae069a17236182ed52070979635d21063df95d69a204a8279bc9ac9887720ad219343896ba541ffc2a037e60a218c0a9735dc9ae74e702"
+  },
+  {
+    "msg": "6084879360af5aebb199d482159fd9a3d2150e2b381ec15cf9db8a4c5972",
+    "secret": "f32d51b3634fe9000ba4e2ab90ab16d153f1005a520e040c4a51a7027ca84cf2",
+    "signature": "50335df038d2812a40c9e528576c661069fac654e84a6e5c3181d8eb33e027c60611a182fd90d22dbe7638147af0fe9209bb06f1f761234b08e8b5637740d30e"
+  },
+  {
+    "msg": "4e20838ba703bf1502c7475e26ec14878797ef717ffb2d210353418bc8591a",
+    "secret": "14effd602de27a66a74ff7db1f6318f95dd75cae60f1fd93aaf83130d3c169cf",
+    "signature": "1f7b52f16f3d4195a266c50812048cd210d52846a3cbe81612f68e580b3e750075744df32ae436f2aab0c4a48f605d5ed69c7a1149d4df9a0ea4e6359c374007"
+  },
+  {
+    "msg": "35584956de0e934f616168725330b58e5fbded673ef6712e1e903f1a7b035c35",
+    "secret": "3a8bb3c33f88b0cd7591febb01cd479ae9fb28da0962e7484cb04cdd1c5c8631",
+    "signature": "4b7c2420f4596dfc04392d3ef1978ae3b5c3eb16fd1edface32501e14554a7af48b31cd28e18dccaa5d6920e6aed500bd4bd6727999ff62080f9feb1eaf72e00"
+  },
+  {
+    "msg": "1212a4547e1d6b339723cd767dcc8a0418a23fecd760e817c875702abe63511811",
+    "secret": "329973cd9426ec5600c2726449f49f9044555d20deb0d445e22e7afc6e45d6df",
+    "signature": "3d34d3f2b683c6ec21827168853aebd4edeadbf6b96a088436c6f3d373f292462aca7d40c5b3f32c488a4185e6afacebc9f277cd0208f7aa419421d516a99900"
+  },
+  {
+    "msg": "4a5b6cc4be03b76dc1cd1c30191e37b20656c4b3928d699474c7fcd7a477f74edc7a",
+    "secret": "bc6d545751e23f3ea638b8b09026513bd528f751eca0f2275cabeb9321bc32b1",
+    "signature": "8dde04efd3963222e82ca08af356f290fa3f64ae17fdde5cee4edd48a9891291f96d092a4504f1ee3d70dcaa90b3f22f19b4b8e7d0694cd77163092579207f05"
+  },
+  {
+    "msg": "5cc9a368fa85ac86f7acefcba10d101e9599d7500c952fce14000c698ff270ac16751c",
+    "secret": "2d03128f2c834a4a0d511acc63e262aba71da4a60a1ac5e21d7f5135bda323f2",
+    "signature": "901f95738693b10560c28801b1d8e53735f9379b1700adb3547cd9d3d5a0b7239c4d56bfcda5b198dda6112f4697f6013fe4e24de680ac8332ba25570e3bdd06"
+  },
+  {
+    "msg": "e5fac091939c429e9e0d6b0b512b5224e0bd041f33d5b643466f1a5daa0f04c0a75ea2a9",
+    "secret": "609963efe10c2607e597161da11611316be1549373a3c536b5c3105d45dd22e4",
+    "signature": "275cb11e15dffce85958c60537a3c2b77647f56322b5e5a37d3127978082c4765eb074d3399616ce8380f5bb2101dd4706970bf2308695ee9675b87d724f4407"
+  },
+  {
+    "msg": "8f5e527444f6178502f208038085a94fb2b5fbd1ff2080779ed75a6cba2eb00c4a38d90d8e",
+    "secret": "e2c35f95b722d20ecfe06d7ab354135d157f28674348808176b0f49e1e5f9c5c",
+    "signature": "611c756206df97e19f0a59c1baa3932488405fdff87a72927c03d48aa6ca87005220fd16d19b7d228926daabbdd0aa9c672027a14cee9ed33965175242fdde05"
+  },
+  {
+    "msg": "933d46836b7c3054e19831f8f5d06f8fbac86ff4a1a382f74aafffa99ad83927268942df956f",
+    "secret": "ce2566156ccf317f0c4785448157be7a1c236206607c134b4bb4c9a782ed530e",
+    "signature": "375771c2439fc8ade1955f39a3d371a21f9192bd61b7df8bb2eeece0d7e16097f1cf0c9f1007b90f8a8a1278bdf017c90a9313648e5ee9f8b6e793bdc6956f03"
+  },
+  {
+    "msg": "8892e4c591c168c0dc15b68e22448ebd39307f02e54b1069de807676f1e4df3c2b3faca58ee0c4",
+    "secret": "6eb5ca71acb24e7efa601ff2d4da6d717ac3c7b5198e31439ace31c51eba62a7",
+    "signature": "ef2465777d2409a8a34a7af709338956ca604a0c266b777a486a4f8f1786d1c56cb8732e83e9346ab8c42a7e4856020ee9d1d2d6e0c576bdb6f5be7c73f5ea03"
+  },
+  {
+    "msg": "10c607f95a8a3ffa8279333795759b6968893f22c5111d09426b9d2677961657f4e8e48cd2409bb9",
+    "secret": "6a7ab95b292ebbbf46b4d8b48773cb5d3c0c3e504b765e96c160c316450e038c",
+    "signature": "78780903535fe0ec5e8ee5a238f51938df251d0d048ead166ae271862debdb8c13e9db174a7a73090ceef86d243998566b5818cb435c912f3fde123abb50ad0b"
+  },
+  {
+    "msg": "b4f2255e6deafe7b9e1fcbc2876f76d8f620c245124d2624dc9d754cc631b2e173731f0c2a17d22b80",
+    "secret": "b7f1c7aabe8c8fb12038e2ab337ac1bac7fde354f80f68e55b2b6afde104913d",
+    "signature": "820ef0d1f67e7b103140f82f907d1095fc4ee1d48eb2fd273e66f8a8621daba538e0e9b4284b7cacf076f0e0b5cf9c44a7d4b8d732240a5bff5bc28244dea00e"
+  },
+  {
+    "msg": "0d1200b034bc24d0899aee8435ab1de854ffd9463153db6c5a8b7773595d12ad4a9d0587a276412974ca",
+    "secret": "ef3ad04e9b994d7b1c8abb014a7f62299261759a0bfc9e4d5fab4baa3f146e0c",
+    "signature": "a8c0008d15926efa804940dd6a4abf5617c82d8d79c4fe2035a5d3c7e585385eb88e7e8377d0fa41c3da6645278840e737c1b160a29ee072eaef0678d887bf0f"
+  },
+  {
+    "msg": "2a2b090f9ccdef34f35466e2bffa2a80a5a3b954775768710881bf69fcabd84a1ff0da325af2544d2ad101",
+    "secret": "9248804811f7610aa06dbae369f2dc4860c898ef53addff51b7eaea37f609551",
+    "signature": "379360498de7975a6d4f66dc2545d4018a2e358d7d869fc6386474d64645739888ceac07010e301b509d6b0976a4a1233db2bdaf280ad7153c8e8fe28ec20904"
+  },
+  {
+    "msg": "40de0c774355a0adff3f588b131e0abc9e5f5442dd9d8ee94cf9a85fe4fef07497de3026bc9bf832527632b5",
+    "secret": "4bd28661270ac2a4e78e20585c639a16ff6503afaa7e131ebc96cc6d239ae711",
+    "signature": "26c98cde5036dc23d24be0e7530796b5e2119759f8479ad3c145c2890199e26a9fdfa598e6102500d5576ca2cd2394680919479b0643cd607717d726c41ec309"
+  },
+  {
+    "msg": "49949d4610cdac321f71ebd62080edaa60ac4aecb2cfd84e0ccb584e1dd82ba4ea6b9591057e2460568c7aeb7f",
+    "secret": "874f509bfd0443301b8a23de7ac443d63273fcb87013d270aed8d1348fb04719",
+    "signature": "7745afadd5bca6150bf761c58ebd6bcd631bf9ad0e2043d785e430e68c4e5027a971e917e443875af78efac099a66f4e178ae733d7ab4332cd15852617fb2e05"
+  },
+  {
+    "msg": "85e26518fef4429847aa8046c26b062abe0b8a7d0449285f4deada0bc4bf91a2ae734fbdef83c4d48f1ab3980eab",
+    "secret": "aeb4112a121d60eb2a206434fbed7ab9e12f782a1bb324779093bf1cae68d581",
+    "signature": "56b02332c1ba9ca513299115f6b4c8730025a19cea3f961045e6d642a3f9da0c9ec47f645071c1ce243b96196c3114a8bea91ec98843e1d20e218763d2d43506"
+  },
+  {
+    "msg": "1ebe467f4ce2422a5bc59dd7ef90448715931f0ba7a82a95ebce48fe1009643dc468bb65a8723dfaa0b6926aad7185",
+    "secret": "58efc6b766abf761d7ab3bd30786f1ec6c6cdee534052c0bba38cff1339543a8",
+    "signature": "3e4e80ef141c1faf0898142dcd0a6d4e9b0bf9371ef9c7db48eaa80b8d7624d3f9330833c71476384890cbcd2c4e29d7cad67f16a772ccf33268d94cb6a4f40b"
+  },
+  {
+    "msg": "408082da564a04a5876cc8cf70568f3301687153c67c634bfef6b807d6dc59b84eaee895a089fcbc922220219a0b57c9",
+    "secret": "39997c7cbf0f532851b2e71a8f1ec42507b711d51935f266dee533d131960816",
+    "signature": "5223dfcec31f8c1321a08610e5d4a4d361aa4ffaf03c6f0716753f2c6c50d1aff204df2623f277e901ebb23b832fd34ea733ae35d9c2584ad7fcdab9f1479c0d"
+  },
+  {
+    "msg": "2170ded7931a6e696c76933e2425b6ec0132562425f7f237ea5c136903bc57b258830fd0631c981125eaa1dac38586c085",
+    "secret": "7bc957c383d940bfa3cb463c482c14561b74a8d653f89d3eb6d4b1bd3ef75919",
+    "signature": "f224aadc94343287db510698003466c8cf49d987ad5311670f23ad7c9b5938f396716157c22d4e43ee31f0b685364f053033808a717c2b6485b4f8795e823d04"
+  },
+  {
+    "msg": "",
+    "secret": "111e14994c181857e462c8f5efd16017936ab20717b995719ac6047a00312871",
+    "signature": "eee7b35bf5bea2402f0fe88bcc1b9eae9c0356f3c3104b164d0b1d88cd32afdbba15da591cdd4f3572c7c6aee09cc00f9711da0023b0b3f63f4019c6f9109107"
+  },
+  {
+    "msg": "b3",
+    "secret": "2e472b55c494ec05252562780ed642110e3317c59b04b18a325201bf28b97b05",
+    "signature": "ede536e013fc776896d185a95b6ce04bd6f523a7b46d78c4ca5253fe63028d6432678bb5e6cac6e8b2012676e6b1d6098c2f302838deee1fd19b18ff4aa51c0c"
+  },
+  {
+    "msg": "c31a",
+    "secret": "6a7e8bd46e216820b10ee964a6019fa3a02563202bd3fe7364141165d7de61ec",
+    "signature": "9e776316dbead6692cdb10e77ae8430473f467acaaea5efc59731d1f5c92ea683571dfb5a4a88e9b44620d12ca89fc04bc5c05e008c872d96802b6769026d400"
+  },
+  {
+    "msg": "dc61a1",
+    "secret": "dd2a8e9fb85e64271be4dd102d83d156c13225486ab92b1062af7929663f9113",
+    "signature": "1a7ff2756f51f4e040ae872526e628089da27bc5bd32fa23f9cf1a1546223c7f0e0bb0d8e209d569323d8ff31cea2b075b7ef19ed79789109d9d93e2eb2ff203"
+  },
+  {
+    "msg": "3cf0d640",
+    "secret": "361c35ec4a355b8b2b31e26cc9f9fad3a4ee1ec4fdeaf5febe25ee6eeceef90c",
+    "signature": "93302aeb60c46cbd6933dc525d32a07144f7dffd94958dcf63991f922da2d89269a4efce92334bbbae24f8389270d653a3b92f851f9772592b84b9839efd4004"
+  },
+  {
+    "msg": "d5b286e05a",
+    "secret": "577ce81849e0a697a83ee42107ee4243aaaa9f74aec2d5212711691d56e7ad3b",
+    "signature": "14ba3df8bad6285cc537e9f00e0463184bf6c523c0a4d0acf9c5fd89d516b59df7828957b97a5ef3b6b63ab9b7ee93388a08d50b33a52f1f6f1f970a46bb3c02"
+  },
+  {
+    "msg": "2015dde9f8aa",
+    "secret": "99bdadf9698c7bcb053ca93aea3a495ca0ab258ccec6ccf1dd9702bafac612e8",
+    "signature": "839acadd26832838c4142c51fcea397ae43b2d0b7f3d1a9b571ddfde8ee430d99c35159fe2e0109d6b83dd3b4d414d3fab17f697cc3a5bb80a885ba7a4132d0c"
+  },
+  {
+    "msg": "5aa1d370b4467e",
+    "secret": "682681f66af334085580a37467da20d83db3a904198a49f9f2ab527c5fca9bf5",
+    "signature": "ac7124dee38434c18a2d260bc0f2e88ba8a78a6ca82cae42ef8767c08bedaa666335c2bc78c11a66591babccead2e7937550cc759766ea57620c28ef1b325707"
+  },
+  {
+    "msg": "1dc9596a692509b3",
+    "secret": "8d9c723772ebb871270c13b2fc48e30fb8391b16be03668f1e42cfbfea0ee082",
+    "signature": "cf197346d7c91b348627954c3e8904b496280e1cb2804e0c80aee544912aab8a523d87d7752ec49c623fe12d67fdccc7ee2e9660d1b8fc38c56df2b88962d80f"
+  },
+  {
+    "msg": "adbb0c8eba5e1173ad",
+    "secret": "9ac5cc9df83e1aaa570e88fc70982b110a682d1e1ab45bc66242b9c789e96ade",
+    "signature": "f1916f31dfe5c06b61b4e22933cd8f1f2b1d65ae35f3e39c309647ee4520c0be94f0df9c9ea030b75447e02a6fed57299c01211a49096a60cd89cd7ae4f2c50d"
+  },
+  {
+    "msg": "7bf9ed806e428f67bf9e",
+    "secret": "75cd64eb36030f6d518a4e56c2a3b5f1d2eb2b672011a3ed7b64f31852b730af",
+    "signature": "47586780ad3eef0b04270b4eb53c9d08890dd05a907d7f797e8eb378c7fb8b931f3f10e320335df91c727383424a2fd6fefec8a1460c9db71512e881d8460e08"
+  },
+  {
+    "msg": "adefd075373818315bf8f8",
+    "secret": "5ec4a9d64464a98981e4ab957b07adc674961aee8da90656113e8234f1ade04f",
+    "signature": "f1abbd66d9beeb32b9e7b29f981af6dae339bb21d7223d0bacaccd63eb5a8d38940ba301243aa06baf631f355f2ab5423996cfac7a9dec86cc18329f243e8b03"
+  },
+  {
+    "msg": "b6a59787c1b80e10c6001736",
+    "secret": "46e3dada84c8cbf57d53bc2e5dc1710599678f212e991cf69a927ec117b723ad",
+    "signature": "ef51abd3e57f5606cfc9f341dd54f8aaaa333c8e6e85b3f543cdcb0ea53feaecf6a484097b552c0fd86b1371ade1b7052d31f947321c4769b6575d7ad7637b0f"
+  },
+  {
+    "msg": "735920eccd1ddd338c66862984",
+    "secret": "73a8e7f6c3666d9eef053f9f2f4951120e7c99e1ac455063fe5fc868bad96531",
+    "signature": "4380d306e2e78d3e2bd71c57c82533e58d456c901d0d092f78f21f191e3b2e695a2f81ce2fef0bcd17ee43c515871a55664c13ba1679558a3f042bb1b5777a00"
+  },
+  {
+    "msg": "196b7d1c2778399044eccd241561",
+    "secret": "a974df2aba456d5e4074d2862a5ca0e0acfb06d74635c9ac375561bc85113eee",
+    "signature": "752890822e69026dec43c90f47fa5b09b1fdfe53903e6201a846cdd73509f6aa0a46b3d814c5061e5164e9fdfc5ff8ed704efd1adbffc8b609571164e17ed703"
+  },
+  {
+    "msg": "fc4d37d6168e9bbd3ce1544bdcc9db",
+    "secret": "1a500a5562e709f78e01703fb486d24d6a0fb7ad7bc040d10087001840cead40",
+    "signature": "8e0c35ebdb270657224f6904e05856a537b908399642f0d869f54933be77cf0c7568f82b7292d7881c942c12e02c9d357063e1bbff2d98d8610a5e9b1d172b07"
+  },
+  {
+    "msg": "fe8a6977369c57648ec679ea67702fa9",
+    "secret": "dbc2d1331b041e067b020298b0ee0fa14f6b64bd0bc56a67c428d8b954f221f0",
+    "signature": "8b7636eea4300e9203e38cc4ea5534803a4c21f3ee5f12cac5dae1a42207687102eb34a16b6cc375fce9e5d1753d2399d1392e17cbb8d8c76f76512b6bcdaf0e"
+  },
+  {
+    "msg": "dc1f80b8761b435dacc1ffbbee6ad63a7c",
+    "secret": "1640b5cc5d85366d766e32ccf7745f8f33354fbd520d120d186bc07eb5c4663c",
+    "signature": "76eba95e2ce46b5e3291282883f547e0272e15786810857f58163b1c323c67de7417bb64f3d7d1f14b513e60527459ce47fadbb98aef5d20ff80c9fa2e659d0a"
+  },
+  {
+    "msg": "0c6905b4879ac416e4da55c41aeeba83dbb3",
+    "secret": "d507980ff35132c96d39e39807844540fd22514e7b5d804f8b136b5bc0f663fc",
+    "signature": "373b42ee13becf2dbc8967648d760b76c8b39762153892a20afe278da26fbbf68e984c0937a59cbe62366aea9384e23e8ff99b7c36431860b36743247917360a"
+  },
+  {
+    "msg": "66f715c904548ab07ff06408b55c1d1897460d",
+    "secret": "1c2ca1b98f5c0c78adc9b4b484d70ec13f51e51b936083501f73da9bb99fd0ce",
+    "signature": "0aa99f30dffea160a36c72f9a7018869958d6368bfedd40765d3b3dbff512d7811df838166532f76b82655fcccce2ee841da07ff076a824c2c269ec225f29305"
+  },
+  {
+    "msg": "4be6355582da270d6531e0b87a143aeb5b3ab5ff",
+    "secret": "0cc2c49260d8497cff7d6dcecc454b08e4640e0831895be02bab1a63f885b222",
+    "signature": "8abcd55c90bffe2d6f95c86a69f53e89bc6d4a14a3866a13dce9060cc90e31b07e76066872fa7b0fa03461fd976c68e9ccad4835d3f0b2edb0b5d2ddb7563e0f"
+  },
+  {
+    "msg": "5399e0c3585b53d6c99f19f5c9c0ac77a796cc86b2",
+    "secret": "f46f925de45b73214b4534d5bff2f2b5c46e8564cfb0f4e5d677567c18215bb5",
+    "signature": "78ef2ee42f36efd98485965b527b5b2d16703c730ab93b2bc1365e27f8574c3052db1cfa9f7aacad5707951783ffebb6c00a2ee1b964429cf4f44fa5192b5b0c"
+  },
+  {
+    "msg": "cfbc784d980669c638a8cd1642f9661e42512fda9915",
+    "secret": "f7ccbf0edd0c8a872cee1d553abf10e9bdf6ee54f0911857b99f2b7b5dea5fc6",
+    "signature": "637028c23d2d1b4e6b019e7d3093a258c92ba4f3493825778e9c19be0ef551b1f65bacc1c5e95bfc02bb76528af0b3bd1feac755bc064383a511a2aa58cdfd01"
+  },
+  {
+    "msg": "61e0b553b971c5d87994a451c5bc9934e0ba5f533e0f48",
+    "secret": "7c55c2aee1efa4373acfb1167bffb78f52d429718b974a8b105273f4be47a447",
+    "signature": "8b599eee24c9b80d8dead3f40b9130d3afb3d882154355f3dc00ee04f47c65397847b9ab288ca1bf3fbe9eb00b80d7a251a51617bd565223f4f0ad89b8b66904"
+  },
+  {
+    "msg": "13881c81f68a32fd66f1935ddaccc757b094b4ae8ae20f06",
+    "secret": "69bad9aa8d10be8e104a8790dd4ac920a10a0e2bd98cebfea0d646eba203de16",
+    "signature": "da1de039ee6708d1f6e37b8401bfe9beb42f7c40cefaf9818ae2299c0a64cc19a849ae0fd45dcc461e980fcb9124dee5bad55ca4749897961b6ffbe058cd5002"
+  },
+  {
+    "msg": "666b892681ea26b171dd8f42031a479c58a36789da03a7f292",
+    "secret": "b069a90b16d3bb83e6173ede0516d041e0c82573d6d854b70b16b334923a5ecb",
+    "signature": "80fac0d7bc15a44db4a60d3286d7b07f9798867063a13f65fc90350cf42f36102ee40c998b660f482b1aa67b2b962efd03bc9b003694d01e2d963134bb03a504"
+  },
+  {
+    "msg": "36df157bc571ebe7458cf9b32b2afe651bcfc7f660a154cac618",
+    "secret": "81a847292e5500af0e3c12794224523a8a7084508e942300ac1501dcf570c10f",
+    "signature": "4f2997106951dafb31a5151fbcb48db043799515769e3c08433afa2f199abbe7a887d419f9002db74d92a63f50ca655302491e23d68a22a315ac584404332503"
+  },
+  {
+    "msg": "307964ba0ecd089e65ab4b9c1ba389e480d70f21ba1abaa1505464",
+    "secret": "ff58c9c70f2645cfecbca7d8dd660f3ee96ac3d451e287c316a82b54ccc18f17",
+    "signature": "c9a8ad88afbca425d2cd7a320bb6eecac87b916ab4b81f6db367a37a9eb2da9ad23691252c6c7a5431a31a9530c05b8d8f853335d9ca3ae8c12126ddb86c7e0c"
+  },
+  {
+    "msg": "d6f5a521cd9301abadb5615c00a14a9b6aa8719a078d801499e67929",
+    "secret": "652eb6de06b731750e1e27f06380346e8056e8df85f81af644b76f4e66ba4711",
+    "signature": "f7461c65b3029658ba566200f1d84f6d3a15949d3a8beac77b4b39b64fb1abd11d8351b4aefcd48f77ac50dd62cd34750ecb5ff584d9cedf2078aeb3f819ae0e"
+  },
+  {
+    "msg": "25e6e178a86a8cfa1c1739343506873a070bf278509c0a326a632d1bdc",
+    "secret": "1f208ea1d3ea5da84c9055c646a796f8d143d0d0b10ca2ad2594677925403502",
+    "signature": "8d333f1a9bc22c9d0568e329e40c47ff8e05461fde1bf47f8f5ccc427fda9027e7da8abb7bebe752d2e78c0137cce21d03b7f4be9e647c61dd82ff5e4edc5b05"
+  },
+  {
+    "msg": "a091210ee30aaf258738ce291d3b7569a45bff032e1b7739135917ca7ece",
+    "secret": "963a11cfb394accdad675920a83d0e372f2444b7b588cb80b8a929f65b0c23ba",
+    "signature": "b1d419f1c56996293354687bcec39cc014ed01853d53dc763511ce7e309f15d6c7ebb609b3c0c5a1437921896cc8a8775124e21f0f3b70ca23838bb6f7aa4f09"
+  },
+  {
+    "msg": "8ee9f305d279c383e0eab81d25f816e77fb80fcb483aa637886093bf50e0b0",
+    "secret": "823d54aba73a9107f78ee65612639dfd7f6a33aab532340a3e5b0420f474df89",
+    "signature": "2c0a7a8ff3df926029d64df06620f05d5a57df3b2b1b9d140aed8879d1c2e4c20b1ef08ab103adc7bfc4af9dd9885b1a0ca2f146dcb0471b593d9a73c3628d01"
+  },
+  {
+    "msg": "b0b135f62c6e9012da8e721ab188d2381c5ff6f6b17eb1d33e69a86e16572630",
+    "secret": "dd040fa05f52fab66a0000836a882bae9fe86216fb94f25830508fa8c9d1a0a9",
+    "signature": "6131074ae1626d7e072de76c727a01cdc56373d18522997fdc9e339308732eb3892ad8663071efccc627e3bebbad971378ada7e65fb2206be3b5f559ddf0f505"
+  },
+  {
+    "msg": "b4c1485f42a28a996d2dfc16dbe2c6cfb3a5c2632f7a9ef9a961fecfe5cfb8e186",
+    "secret": "fd1a92681065c38a59895b3ff2c42d68a0da48741711eece4edc66c5185bfdbf",
+    "signature": "88581ef9758ca9514130411ff91a26e7b1d3c74e9e766f1919db93cad08c00ec20dc2f22e1d999c86f16cf005f6c45bbd0db2c47af988c42dfc94d74ba2a7700"
+  },
+  {
+    "msg": "9aa03dcef50c6a3a09df89c2a8fa8104136072465b682162fde936b1e9e17698929e",
+    "secret": "31d97c437aa1831cd9a070d68441d572635d3705ee4e02cc233cd426ba535807",
+    "signature": "c55766e0291795615fc0a1e34c4441f0bb74200b959489b221cea714cc03bf050821e2ff81da9ab6397f93b89b4b89e75e2cc2d63039a890656b977e81873000"
+  },
+  {
+    "msg": "7d72d3fab5e9438b0416ce6dfb99648215d52b8f7eab2354334870ef76972ff3d06de9",
+    "secret": "5e77c0b86b9e5fbd5a087585a2646ae609ef98c5919f11827cfe73a57534b557",
+    "signature": "ca5e1f1c81eb63b8cea12b2f02d7dde18342674ecf8010f154738a80b620e808aab5d1a592ff2a5299da59e219a417cc204dc63b5cac01ef2167046a2e034d04"
+  },
+  {
+    "msg": "00b1699880865c453d82771f5c1eca56426ea0358312ed0f71f466531d4f2d813707e413",
+    "secret": "bffec493b33ede55e56fcccad0d870f4bf3355e5e7958771c975fe9ebf4d89c3",
+    "signature": "3411ed44c392bfe443eda5d00bec5172ef1dc95b471997e7c165297b8a95efc0d3fa5716873f16a7dc7c029c846a439a7675ede0eff6e102084019ecc01de30d"
+  },
+  {
+    "msg": "c7674b2c3c05100af92e7ebc8177c1e0c38ac62f7950827779825585e46ae62366bb29c0ce",
+    "secret": "2766270285e01312cad1d6ad7abbdb4ed354b8d4cc2df3c9cc47a20e8ef9b041",
+    "signature": "058d85b408d6070aff0a36749a5c21c1a5828bc61cc6218a047c437bd1e7992f55bbccecd70a5e32aad6ff43a244e72009707ac99d337c43fe576e5367ed360d"
+  },
+  {
+    "msg": "588fbfbe17c6dc18299f576822501827be4697329c35146c1c0d3b8775e14745b245f54bbef8",
+    "secret": "4687cbff444dcabd6a14256c7a7b56fa4db89acbbdbd53b453a8f470af8e06b0",
+    "signature": "88ac052b7cca7d474940f2537785882ed2a6f5222f1781e9c9cfd13bdc4d9a4dfa2bdbac5dd38ed214a4df124011f0e5b5cb6fa64f69824b3b6de92e66eeb30e"
+  },
+  {
+    "msg": "1ad4bf84ffff40d90e74832abd1c163065d30f34862e7f844f2d730f67701fa1b0786922b93f54",
+    "secret": "3ff4d569d8b4370aa3ba00d6d106a4f84e5def4237ee7fe03cd6849d6986ecfa",
+    "signature": "5001f4f392aaf4a6458ea285b2bb6b9e90166fcb00ea097346bb4c50df73db788a934f9b8db4002705ace0a0b688974f5b769761f897554554e153327251730f"
+  },
+  {
+    "msg": "8ab4450fdb5db74e67780f5528d3f8ab1d22cbeccd3f9cab5f08a6557fbf6fe726fb4082aef95640",
+    "secret": "cc1952f8ba1b227aa5b06f160c84de61756d21a170f49e90c19136e01f4ed8a6",
+    "signature": "099c53ac3d1dfb17ef5f0e5354f15da48009a2f6885e44a8ee9a1bc7c8a1a3bc0d8a267413731f989c9ef3aa43529c2485145839c42a60ac8939fb602540da0c"
+  },
+  {
+    "msg": "a722206e79e288325083c6cabcec7103223311774378f9274b11bf314cc655b145ec126d33f2447ea9",
+    "secret": "531bd060f089f4a40b3e40d8104398dbd044c2eb1ccfa1eb53d20143e7a10eb8",
+    "signature": "764ff0fcf0e65389e3194531f2e30c274cbfab823f0533dab8b1043b64f7759ad0db0f27e3acbcb82a723d4ac26a85f4cb58a8eb31001b62d7348eeb9b4c3506"
+  },
+  {
+    "msg": "e011eb12ee7cb9a10cc75af21e34cfdbe4617d7fe44105135a627c77cc4003f406d43e966aff1c904704",
+    "secret": "7969fe890c3b6c7633dfcd6c58cbe58a93013223d63453b1c8cac09ed23645ca",
+    "signature": "54065c1f261818f8f074a0f7d39e4d17f36a99ce861b77ada519dab4f9bb00f7dce800f6ed68077c718538dcc7111d0bb0b1e70f71ae5f7a03dc764d806a3900"
+  },
+  {
+    "msg": "61d8da8b378a60f63fc0c398930492ad3a9d3995f4d7f7e95e91eb0741bb2e6e87d21988346a15b1a2640f",
+    "secret": "9711015a87a991d86d44995e176e29e76a31446695cd7b2c506f350bb0d3c19f",
+    "signature": "a29af183c2fa12c18496ab44d49b35b59461b3bc27e1bb3e85315f3957615ff0433410d5190723df1848f3e388f41673951ff4ec16743f863f218d9945eae701"
+  },
+  {
+    "msg": "31366906a392df9ec8b9d31862916b1b134db23a5163310be29387174b0c302d7b9b5a3e3a0272fec4e45604",
+    "secret": "63bc40363ba057c49c10040f2a87e168c7d20c0fefddf576d614205c434287eb",
+    "signature": "64cd5fef6e677099b1c3a90be88c02a040624191e6ffa028d9f0a2bb4be69e8994b1b43abb66f2c2c74b3287dee9684075a717cd9ec7f12f8fa6d6b19e17b707"
+  },
+  {
+    "msg": "e7f57d6f86d25186c37a33916c027aced8d7932f5c432125ce5d8519596c8da1b2dbe75e8d1b657a35e378d63a",
+    "secret": "a3e326b025a97d80fdc9c249ac2f14a7e2ffc8720b3293a2afb39d18acae9c8e",
+    "signature": "64819a237a51dae5b0ec1a9625a9008a7e408c8bb599163b0ecadd70f2048109708f6fcd0546f95428cdfe7cb6421612f4ecb25d570ae0f73c2fa5263aa7ac09"
+  },
+  {
+    "msg": "7d3adaf3d27e5218e8ebfca79210ec2e651f4642375a172f0c4a0b389caae31b113a278608c9252c54c0dfe6a0e4",
+    "secret": "039422ef16ac0b06d51c15b5a178c16c1ce58ea4ce7508a24fb9072a36297501",
+    "signature": "d3d6370628d22efea31ade188cf2f58e13abc2eb43b31b05458b52ccfaa8b049d52d83af56982fcf22ebaf26cc5c0e1e46354f4430bbe279630955f84e2ab605"
+  },
+  {
+    "msg": "aefaf5b2f7b797d2a7131a7b283d4dd8b22f5f21b92fa008c1cf7b75b63881a01ef01f0b4120da6a7d407f94218c1a",
+    "secret": "883f4dd9f31760e4ecd40240b0c5ddd31029960ae818b9c7896a5fe7f3ad38ff",
+    "signature": "aa299650226349efd2be147a684fe2791cff75cbfe4dd4bad7d85a370fc125f908da68ef3ca579f7bea47722280a95871b01d81369bc5e3ef7e8e3299a693f0d"
+  },
+  {
+    "msg": "75339838acdb16c412b46739a7cd6c0ac6be73da1bee9058b90a1cc5bb60a09ded06aa479c8c2e799dafbd163f27cae3",
+    "secret": "bc23a39a0c811210e0d28aacf90f34ef71f686bf91d2c4ce55d89d9b6826145d",
+    "signature": "8acaf1a395d37d8179802fc4b59efd5548260e0678c79f53cadbc881f7236615e5d25262e33a313d0fec220ab519a1cbbce91e049f4f1ea12aa100c992aae003"
+  },
+  {
+    "msg": "ceea301f4e4080cdde74bc22719fc8aa77026666efd4584c92c7f48317b4f7d46cd89dd683d61611f4c0a5d9c3b3f4607c",
+    "secret": "90bea9d16c860df2df45a2bcfe81a9af66c34871ff267de7ef907d7a9031b4bc",
+    "signature": "4f95738a5d93ab0965f4fa17a904a25e7af5e1a1903f3fef3263c6c08ef3a48be9f43030fe8eac29cb437ac7f4043fb9a0df50f734d3d123ccbae0e0ae86850e"
+  },
+  {
+    "msg": "",
+    "secret": "c9a533078f0feef1272995854b6050eae263a0c6ee3675600f75ef612309031b",
+    "signature": "810de26b679f450151db09da62e0548178dcc0c2d98f3a21282403ba6f40e903586aa2e480194f2edfbf5092fbd6b9faf40ef289cc278f2b89443a85cffe4304"
+  },
+  {
+    "msg": "8c",
+    "secret": "ce8b954763c8863201e4c7c5349082f4c601c0265c2e68d6acb35896764f7b95",
+    "signature": "cab7597b757154c22876a8ab557b1cd588352288cdf304ce7e71637bc9f1bfb7b22820f2f62340c74ff0b6eac95389a6f823a88f69c09e2526a67358f3f62e0d"
+  },
+  {
+    "msg": "0683",
+    "secret": "d9e94b7976b9543104e33755133eb00b4ecb761c9a5e842a95f359b810e4d37a",
+    "signature": "864ed88bee12f3023ce17e2264104e5a8e9711c1088fc7af60d392625a265076ce4b6e2fd9e7887e6f816c82398de9e13f58d2e7604b1034e619157a4339b40d"
+  },
+  {
+    "msg": "4e61f0",
+    "secret": "f53c664992310b11e8bb25e360937c525c9411f78c0a3cbd95c49e0cb7ec8cd4",
+    "signature": "cd75eec6ae69b093fc55d27e38e280fd2b73b661a83c1696a408eee8c984c23f4c2f31a49bbfcc0833d3253f27b63b1e66865762b05c7aac825bd6aa061d1f01"
+  },
+  {
+    "msg": "ac4eba7a",
+    "secret": "200bc205694e85392e246c9f46c238fb2e1afea3dc10c889a7fb47a383269c18",
+    "signature": "7f1a7409ebcddc887b45d986ad8b2b0833d8f80e18bc5e4090ec5a6c3cefa3aacb3ff1f3172e2eb678a0f881f7ed5c0f6c5131fd54ba20e22bfdcfb7192a0b01"
+  },
+  {
+    "msg": "62664890d0",
+    "secret": "6161f2beac0fe1d0e18709c46d4662228c5b8ea82185aa9e39a63dc0cbdde0ba",
+    "signature": "6ab711f7d7bfa2fd52838ec90fd9b766b61a49a1731980c804a704feee917d1e428612be0b9cb6e7771bf101558b9b7794b7d720a371fc9bb69d38d102973d0a"
+  },
+  {
+    "msg": "07e566631ab3",
+    "secret": "3fd16dbd92bb951cf2f154710d32349f07076de1f0565ace7e62fa128c1b5e60",
+    "signature": "2b79b752bfb19e57fc7a6f7bf052718256c6fea4e1d4ff96cf1c46c36495fdf98ab7686314d44a9d491d3a3ad30df139bf81dcbd9fbc012dffd861bdc9bb1c05"
+  },
+  {
+    "msg": "7f5aef1c8a729e",
+    "secret": "142b85a13da51034d2b377530bcdc8c5e68589f0e0fae1f91425bdfcfef84131",
+    "signature": "0865193203f895e7f053711839fa32214bc4b2c4e1860bc684574b8c2ab3b38b4a492ce202be6befdc870660c46479223805b9fbe61feba69b6f62a76e159d05"
+  },
+  {
+    "msg": "4f3b634a3e060b1b",
+    "secret": "ae4513a092524ecc9486a3be8cf8d64d2799cb77528424a08e9f5beb5ef19269",
+    "signature": "bc10de1ba91a260f99a371bf435d8105830e3d70fea355e14cc6a9d22cbb28e779c431fda41eb855f2e25c51f41c2f41196d83e4c4100bd9059d882e52a5e20a"
+  },
+  {
+    "msg": "ed00689338abea8824",
+    "secret": "46c7d6beb6b8d4c120ea85576b724812ed5f4bd79e55e51f93cace50177f2b64",
+    "signature": "47fd9343d17d937cb38539600f21437ab07989f0af345a9a0a073a70b6e37e5475be14c8d53d5227754f306c331066ae501de00793fa3871ec9342c286f5e107"
+  },
+  {
+    "msg": "846e4d1d3785d9838680",
+    "secret": "957ff5758a213fd0bfe220490b5ebf487ce3c031119627d3371def432966a5c2",
+    "signature": "088b45c9d66a9158f2fe0eba4e0fdee4dce49e7da005b2aa3b5fb1e1f7100ea9073e4fa3a7443b4d5e21260f114ceddcdf5649e729daf861649840c5b009b403"
+  },
+  {
+    "msg": "cf19050e08644291b50b2a",
+    "secret": "8e30c7290b0ae41d45da6339bb9f2fb443dcf347f4b92ffcb0b5c06d48a3fb3e",
+    "signature": "58f5998ca160a290edd16acad29056b402584c6c1a780a86e6dd2c7730e2443a32b395786af201087b98a9298f162519c8a33f37cb16624a619e40cfc9735a09"
+  },
+  {
+    "msg": "e6ea80d07a7a675cfae2c267",
+    "secret": "b3ddae3790c128d309394904753cffb2a258adfec7c011f996989dec7a764224",
+    "signature": "989a28d607643b253ec51afe5997040f54a762915b568fa2951908f7622a1f53bd3977343675a4054f7080e4b2426fb2692955c0b61b4e7ca45d8222f7a3b90c"
+  },
+  {
+    "msg": "4f9afff1da2d299b5a3d90a621",
+    "secret": "9369214336e9400cad431ac03b399e8654991b2f2a9ae06836e014c963005be5",
+    "signature": "495995f4f80c1d8ddc0925087564895e3fc6d81e02a8503d6a4f7534d5c00a82ac8e7a96711809662462ac944b56768de58834a16e79959f4d5686d92e3a9705"
+  },
+  {
+    "msg": "6006656d9e019e7cdbe7ce1d8897",
+    "secret": "b099666bcbdc2c35aef052d7ecaa1b0e7ad1bb92b2909e91a81a34b49d286b31",
+    "signature": "5175ef09a0941502847ab4d5cb924758e4651886f1639dfbc4910f9f8f9d157538d1d17f40626355866fa33d58e8cfb72ace00288ca22608f7fac3fa3e50fb0f"
+  },
+  {
+    "msg": "0434d9839209e3254afdb8d4c8b485",
+    "secret": "edb48f8e825ef2f98ad400d51254c15b73382d744444ac36a50acd8d924c8a75",
+    "signature": "e4c32a57f95fca87815a526d44ba7920a18fce8f2d7deec60f0068d765f1816c562c596766b7f22bd9ad65cbf724ce16db7b29db6ced1429845df528c55a2407"
+  },
+  {
+    "msg": "fe8cc4ca2c69163bad3fded90fc8fbaa",
+    "secret": "fa4f5465f5f8bd36b609fb189a2712c9756589fd006847d3344c6981da00ea39",
+    "signature": "f7dee912efda0a5951c60b28fbe699ca3d75e4869431e9ccbbd827ecc8260c1b9bd47b5e4b557e5654038fadda45aed600aedbd628bf1cb92cfb97be7c826301"
+  },
+  {
+    "msg": "71b4153374f6be9399697c9203570a3594",
+    "secret": "8f187d85e74a50166f52838df9a498d277f06b87977bc59b52cc5c4adb7c8678",
+    "signature": "02ff749205f81df9371ed24905835d264fe495508baca1e265494d3ba6b198fb4aba9ee09b03c2cab548c4fb9329f279902ce61834e3649b594b66f90517d30b"
+  },
+  {
+    "msg": "06add6ab8000496b120476920f8b9bd24271",
+    "secret": "57e1be3f303a65a8ee9ea0b6d8c8ecace5598f2216ce477bcfb04b82f326fb13",
+    "signature": "9fbacb8128308e0f7a885d25f0cf449f8632b5807c452ec597f11136d669ffe1f3130247bc06ce3e9e689f97c9d6706963d7bb8cef7ab397ca225b9a39636505"
+  },
+  {
+    "msg": "f05508bf660818e16f27aae5e0d61cade7238e",
+    "secret": "f7837de18068ba71896b1553d9c007b5abdf21b0091933dbf78eaf27b4c8e5c7",
+    "signature": "e1e3bca4a1dcfeb131e088bac0b24bf28069487e507d590ec943edb0924609558cdfb9dc5acfdbfb2848db164f7b656c85f32be71fc601a055ffdd25d646210a"
+  },
+  {
+    "msg": "75fb4e7116da17cdc6c2ca0c770db4d958b1ed40",
+    "secret": "d9fcf91c92bff0838066f5d26e771b39cbe41d9f3db61fc2ed787a4fa3db2b5b",
+    "signature": "9db85ce4111a02ec06f180c9d20ce7a992b9925a4d6f70963c28890d8f3f4ba6d0c00fd462137967af9c7152e842a553737f0efcaca3727af21af2254e13700c"
+  },
+  {
+    "msg": "07d177e86695059453c1d3b40f66270e38ac7cc9b7",
+    "secret": "7e6d753bf98fb728df4f6b811bba8c284d4f66941301fe6002e7479f182d8e4a",
+    "signature": "5fff8aa92cc2d046f28861dc2499accfc81ff5f75158e1c2ee2966d397f7892cabe4efc1e7b43978919be0f0febadd1c3089abbf3aa34bf4205cffbf59b1740f"
+  },
+  {
+    "msg": "d82d088e7706a702b2563abecb48cef9c01745321bb4",
+    "secret": "5a90c03b7c4aec9c678da8fbf25e2a8428f8a9d238fc101f4eb411285feffee7",
+    "signature": "3f6a004f452f038bfc4ce503e23acdd4b5226da84f0a1ca593ac8e2b3e6ac7bf55be8d50c30f9bdc495eb02a4b0ab77c7e28b008ff106e8c9d2e0b74e0885106"
+  },
+  {
+    "msg": "469c3f2b87ef6923cd3a83ef45ea97aa57f023bf6beee1",
+    "secret": "8086ca354b63792aedb65b954715fbb2af8280c379225f00fb5f8e8c897e5d7b",
+    "signature": "15d33c638c42713ff9291a7d463191f5adb9737ae03230f3ee26eb9b173c9a4c5916b6735f456fa094c75308bed6b73536fbc92b74b3ea9b8a982f2a6c529303"
+  },
+  {
+    "msg": "bbdb03ac8d6e13cd0d2a92222525fe2128dec0d14337ee66",
+    "secret": "9baeea7a4032550ce57a7df7294c2f2d2e9e12d93720253de5f59f21773e87da",
+    "signature": "6bf42e4c9e39d32f3c4af82a39b4107fd488d8ecd97cc9d060ee5f2c1202d44f5f8b2d2d6fccad03e401027ad43060557bc557a6ee8400136959a48e14baee03"
+  },
+  {
+    "msg": "f08b166c884da02b3a8b6c9cede812eaeb1286fcca9edd307c",
+    "secret": "3ba248f2589fc77874a5ec05b747a35cb378f1fb0c76724a0d755772354b638a",
+    "signature": "1e6b3c2a4dc28ef262076478dfb88b31471a973d1433d612684b3b5970ecb801a9f347ca091f62f0befc2d2709e1668df00179e204d8d70e06b8c859adb9d20e"
+  },
+  {
+    "msg": "e4aeaf535b143a0007cfa8b79fc4faa07f5971415bccbe1c7957",
+    "secret": "bffc28defcb2ca0b3956fa12deb025fe4ccb2a75234b6275714c3945bf20c4ac",
+    "signature": "132a2dc4b34558d4ffcd2bc5d152494c1ea36f119bdedecf801ba7e0f8b491c92baa39d2e64ac24b9ddf71894c867ce561167cf571bc04ad1a16a95ba4ca9c0f"
+  },
+  {
+    "msg": "6324af23179976ffe1322d915ec3778a888b1ccbfab233c2900456",
+    "secret": "895c7185f5822c0fee159a3c7a023caabf66f2b0c9d285da67f98dd565bb5c4e",
+    "signature": "4c0d00e8eb7c65b55d6d5e168bbddec40a52c684975dd8d71114d8006c0e0604d521a7b63c8d9e7c721e522225542d6c9faee1836cf6c79ef9eb0d768b511d00"
+  },
+  {
+    "msg": "b3701905bd835b886adf475938f530ff62d8a181b713f20118462680",
+    "secret": "08f2c0404a20bb5b785a95105fdea1b5b9ca2e707a79d4f2ee8bce72cb14284c",
+    "signature": "4530dbefb413ec7c331868db99cc20b0030bac55fd213b7c31d91222a26237898641a5c6aa48907f64819e9a887ebe80abbbaf79657bbef2e1a1d4b446f62b0b"
+  },
+  {
+    "msg": "f184f0833ecf1f949989653745ace851a331ead8087f83fb4992e2f795",
+    "secret": "efc4f432eb88cd31b87d1150da5bc44ee2aaee4b6978455818a8cb767b3b3a81",
+    "signature": "10bdc9a6bcdc4af71ec2757c9f7ddc5b48d4df50f2fef7e3657dcae13eb1f15951c6c899dcfef75cc824cfdaf6814dfbc12187258b408453dad6b13485c2040f"
+  },
+  {
+    "msg": "fa52f74dcb1fe1c0d0777ce76afe4a2b4ddd26c3313766264ffb9584ca66",
+    "secret": "b856d51a510bfa009750fedd49768d24b98b7b78c158b461979bb2e34cd81849",
+    "signature": "7c6aa5e93c6b89e6fa774b2756de09d0816da50aab7ad5d1d5b3b4e7c80b573bc24bf0753cf78b2a25d8360eb9968cf247cc70f4f0887bae4b2c58f8bb44fe01"
+  },
+  {
+    "msg": "a30fd00aa7313429a22a0fee7479527637aecc35828c154f2c10eb6dee789b",
+    "secret": "b03f0e36a6186276ac256a1a2f492251d5ba9f32189846c7df81703a9cc0c06d",
+    "signature": "6de719462d3a008c01dc23ba000254c3a6e960a577c428a100a5463010fa38f2a7faf4097dd04bf711e46d31fa038256089a8ef9a406e0c4178b76ac08d0a10b"
+  },
+  {
+    "msg": "965454bd800ea7c1591a51b20448914db80ff8b926b00e2a94ce5882c7415f8b",
+    "secret": "49dcbc967ffd4e14ee5a1a4cf85d027866c16b0b32980a0e293247f886c87063",
+    "signature": "a9ee29c16d4d17566c0946cb4f3ad801ae45f7aeb5af5c4fe647ac0212d606406c84f8e29216489e9095c1578f4b6e6b29c3a6a6c294aa3edb6a29cbb3f6b307"
+  },
+  {
+    "msg": "b12dfaeb884ffd8e2dcdf591a50b8ac5a1a305813924e5368a8a7b650ece600431",
+    "secret": "bf03d64b69634d5eedd4117e37e040280a6f10f1473bbdd72f742896bfe66492",
+    "signature": "2b3044f1ea12f52312710552c981f0468fdb686a7b7057a386220f5745b5d5b9409ed6b939d36c2816dcbb1dc3a47130708d6b04d4cc54efefc2f56e34143807"
+  },
+  {
+    "msg": "2bfdb07a4e1bcb7d5b426d91ed42af4e462ba86bd96283954a09bcb646ed48c0eb05",
+    "secret": "604cdce3a1ed456a4715eb0d98a8145dba3c3713d28d7f24e38e1d704fd1a828",
+    "signature": "66ecaa62e1e67b4cb2e3c3cfe8263cd9cb6661c13d8747db466adff93e2ba5ebc99a0f3c37fd9198aa071fee6619edd4ba1a7f6fb6c63bb5e6a50c04f159a80c"
+  },
+  {
+    "msg": "933de808cc094d50045ed34edf235bf3b3e9a4bbb790156e9e019c069e7a1321b65c0f",
+    "secret": "02c53f2f16b113f9b22410d45763ef5d472332ad05dbc12786348ccf53031cce",
+    "signature": "7c0cce151cce98ee6b445959b4e236669faf16494c353d456cafe7717d2f335eae392d5c1cdf63a95d51fc4138f2c2f4d123dafb44d70d50bae978788c22bc01"
+  },
+  {
+    "msg": "93d6eb620c36032d711424f6110a64ef3f274314bcbd35d2185154b1cd1f5c87d0719e93",
+    "secret": "c376522be00c8b8ab009c39bbceaf00c4ddffccc4ebe63d05c7524bb4f2064af",
+    "signature": "531e205f462f73521171022beeb58ee26296617843607869755d9093d24dbc5c3c4b23272f1d5560c72451e88c131aa1cc4b548c40430b8ecc3683e93c4fa204"
+  },
+  {
+    "msg": "eeba85768776b204335c36076f6b70eb204631dffb8dcb943d01d37fa890430ec50c0dbd8c",
+    "secret": "013946cd3d18c5b99791b357c79f69c2cf9e30789a2f31daa56da40e30b84a15",
+    "signature": "44c06aca33b853b7497fae449635c731b98b0872ca8c58679fa4c04f13af673d77a99e76205ae7b66e0de415417de6e31b417da4a1146cb60204bdd9e67dd701"
+  },
+  {
+    "msg": "3557700c2ef949c94c0e1de2c2ed4603f5d6e656a8d7b815cd37d3e44653e4d3dd769a4281ca",
+    "secret": "0cd4c07105059feb9fc4ec07a465c197878bc3e2e36e401bd386c2684c569933",
+    "signature": "7f56faba502580670d7c471ef0265d298b27e3de2972a0e10eaa21a677e79ae4548e31ad7d1e15e209f72f7b023e88d283d9d0fcb175722d0fad117f79702107"
+  },
+  {
+    "msg": "aceb03ee7e7047780bc3e7609a8df343b64dd60bf03540c23441831059807bd54d54b53aa7e7f7",
+    "secret": "68d8cfeeab816d61e22701dfc82efe9ccc176a25cda855d0190adec3fe4907f5",
+    "signature": "714c1d21cc511178ff5456141f3255f6de25d0e660ad5c87406e276356dacdbb58bff0e4361eaa0a2ca9dbc6a208308e9f778f6b4ab9507ec9fa457e36189f02"
+  },
+  {
+    "msg": "b77cc43e4e7fa8702a54efff56aa2cda0f91d12a243b0ac1ecdd256e30d0010892013e264c4a3c9c",
+    "secret": "7362ef7f879954d4c4bf84191ebe3c7d5a97fbeff14554724058e633f1ad08cb",
+    "signature": "8d8f61f1c233a347f24e9ecbfa24e96a77bbdf0a36ea0b9de163e0de0c3dfad5611428580bf05475e701ae9eb65ccaa9a8a86888fd682c7c3cb50debf0a5ea05"
+  },
+  {
+    "msg": "7bc681e6a5e413006963acfe0ee44f3001c4fc5aec726dff661542ae694e3783d4adc11b5551a4caca",
+    "secret": "0d89c70d537b96ecab7f88c6b5d75142e044cee54c5501a4c8dc07986f5fe0f4",
+    "signature": "3bdf04e326f8307876e88dcd816ce4723fb4b9c71b81cba82fc56d67f94de82e90f00e74d3b624cae611f727c7c5132abed7acdb31916a3b881893248bfe9003"
+  },
+  {
+    "msg": "4cd5516fb67fd4d0d0000b38150602ca204d533931d4b21487248c745893daa8943794307579eef4d94d",
+    "secret": "b1496b69c3a012cdbab3d5b5d5e2b326157af8bee763b79868345d03fa916ffe",
+    "signature": "543b9db48257a34ef85fa2bb842eb37e85e420df62c92d76692dae8b13b951e7eedbc564066dcc41eb0702ef73658966f99f288710fd348399d021a4f200c507"
+  },
+  {
+    "msg": "f899801f0dfaa82308b528012f4059129c1b6216202a2268dd9709a1d397de21dec766e978f1d1f446f012",
+    "secret": "98ba785268f53a49489b70a9084960344b2fac80df9c2a14e71d71430b94ed04",
+    "signature": "4f4476eab8fcf78fe6844dc42d4e43d6f368e0eb64353df66e73d05a3c331f0e1f3dc4afd3efe0ff0ed96c93b971f525ec99c62550bbd2a675377677fe1f7409"
+  },
+  {
+    "msg": "626349b5445f511da6a85c9accd8946f49ffab1949060a4a101c4484ae51541c4f1bc00c2a04d9f473f68332",
+    "secret": "56057dc5541f68373c75f22c30a4d2e26d9f84d962b84fadc51229b212234284",
+    "signature": "d126de60beb7cf1947c8d141c0dfddf56545ee96c4464bfd3ff90f91715488fae0d96b40d8bc89018fbaad5ad0f1664a5fd279f15c26416796ee1f94cba7ab0e"
+  },
+  {
+    "msg": "c42f493a8c96b2b4ea843eeac55597e339417aea1e6cef24ee12ea41a5abf97b55886025ce86f08040e2c51307",
+    "secret": "96afe869637a4b605b7cebf09db3f38bacb419457089e14e77ca002a1c14736c",
+    "signature": "7e3b0a8621c97e052570631238a6492900880ca46441ce9a2137ccda07d26194ffcf7f1e474b4cf7dc340ee64648eee03cd25ff74a9bd542d6e7112362b4350d"
+  },
+  {
+    "msg": "66f5a28905101ffb5228b70048c78af8122d0077c4064d9872406de572aff5617ab5a5ad8efce63cafab776890c3",
+    "secret": "2a4d7e0bc00e4c901c323c09b7f794dbd54b8d6ad82dc930c0d444b9005356c2",
+    "signature": "0fed47c6194540ab444796b72d89fcc6897ee80fe758a95106e892211769e0361e07804955268aac79df51b4bc2357a0c3024730d6cf9fb4393bc1331b896b07"
+  },
+  {
+    "msg": "64429319761032b34106b791f14b058fc95c386fe7292933b28e54591427eeeca77af43c71d29a6c8ab7c48899d06d",
+    "secret": "1ddefdbdd61f993799453467f39f650771898ff66c7f5e7c2be2d79486dd8380",
+    "signature": "6a28c677d63f940eac150f54fe6ed3a6b74bb0be9923a0d1cb8f1b4f042c32f658e87acd042291c043ea39ff3314d42737c3a4a14068eaa1916f604e600ef406"
+  },
+  {
+    "msg": "b9a098de375566b892911f61382cc4889fb49bb097852368f54b6907152cd3b3b45f9a943cdb11af9a137dca98df9f20",
+    "secret": "ad17bf8fa2fd4eb62c5aceb625860a266c6d5464cf39b0103d3af595d924db51",
+    "signature": "616e227b2e8b65d237286a004ec9ea619f3bbbbb59adb241fb8908aa8166503848414794a8e39a7e92f610b4ced4e9d831d24771a7fbfd514950574d317ed603"
+  },
+  {
+    "msg": "ded69414478078da94a0741416eeeead31308861ea18525ad8a5d81fe74dfbb8a25bc4390f366aa1f571f47efe3697cd90",
+    "secret": "e12553785d6e060ae57abad3f359b1bb14f378c16695d409b142dcaa0e13a202",
+    "signature": "b4b83f5e6ea1b3cde23fb63a09c58e6f8d24355854f3df5a6bdd73958b14198727ae3c1a60c82a0656399d30c8c2cee99657af3ff64e0e559502489110e14c0d"
+  }
+]
diff --git a/rust/tw_keypair/tests/ed25519_tests.rs b/rust/tw_keypair/tests/ed25519_tests.rs
new file mode 100644
index 00000000000..57dbe81c2e4
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_tests.rs
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+use tw_encoding::hex::{self, as_hex};
+use tw_hash::{H256, H512};
+use tw_keypair::ed25519::sha512::KeyPair;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use tw_misc::traits::ToBytesZeroizing;
+
+/// The tests were generated in C++ using the `trezor-crypto` library.
+const ED25519_SIGN: &str = include_str!("ed25519_sign.json");
+const ED25519_PRIV_TO_PUB: &str = include_str!("ed25519_priv_to_pub.json");
+
+#[derive(Deserialize)]
+struct Ed255191SignTest {
+    #[serde(with = "as_hex")]
+    secret: H256,
+    msg: String,
+    #[serde(with = "as_hex")]
+    signature: H512,
+}
+
+#[derive(Deserialize)]
+struct Ed255191PrivToPubTest {
+    #[serde(with = "as_hex")]
+    secret: H256,
+    #[serde(with = "as_hex")]
+    public: H256,
+}
+
+#[test]
+fn test_ed25519_sign_verify() {
+    let tests: Vec<Ed255191SignTest> = serde_json::from_str(ED25519_SIGN).unwrap();
+    for test in tests {
+        let msg = hex::decode(&test.msg).unwrap();
+
+        let keypair = KeyPair::try_from(test.secret.as_slice()).unwrap();
+        let actual = keypair.sign(msg.clone()).unwrap();
+        assert_eq!(actual.to_bytes(), test.signature);
+
+        assert!(keypair.verify(actual, msg));
+    }
+}
+
+#[test]
+fn test_ed25519_priv_to_pub() {
+    let tests: Vec<Ed255191PrivToPubTest> = serde_json::from_str(ED25519_PRIV_TO_PUB).unwrap();
+    for test in tests {
+        let keypair = KeyPair::try_from(test.secret.as_slice()).unwrap();
+        assert_eq!(
+            keypair.private().to_zeroizing_vec().as_slice(),
+            test.secret.as_slice()
+        );
+
+        let public = keypair.public();
+        assert_eq!(public.to_bytes(), test.public);
+    }
+}
diff --git a/rust/tw_keypair/tests/ed25519_waves_priv_to_pub.json b/rust/tw_keypair/tests/ed25519_waves_priv_to_pub.json
new file mode 100644
index 00000000000..40f25d9b378
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_waves_priv_to_pub.json
@@ -0,0 +1,2002 @@
+[
+  {
+    "public": "6994de65574377e0dc1c8812065ece52c540d67d1f7cab456f6220250f012b48",
+    "secret": "4a63e14a607a8a1d47b943b5979945d07241a45dd40406adf8ea2282148aba9e"
+  },
+  {
+    "public": "eb031e07e28e28a4ea1a6cc39cc98fba52e1521636f208aadca0053944983468",
+    "secret": "146d40891effd3b8280899d032a958627d9160e8cc08896a1e6b40964618591d"
+  },
+  {
+    "public": "b60076cc30ffff5c29c65af9a13ce01c3affc231d09fccbcd1277319c7911634",
+    "secret": "0778c7bf255eebced7a2e4fb0711f1c069ff4de1b888cc7274217d4aba93ac23"
+  },
+  {
+    "public": "00080f30de13a7ae491abb680c6260aca51aeb1ae0b57638f866366d53439959",
+    "secret": "dd2d31ce9ee8110c2c5de4915326fd8c4a01a85043b4940a17c41414b956f072"
+  },
+  {
+    "public": "d879de2b6efaf97f5df282ffc70eb4137b82830479d4371cf9d8de9870a4ba5a",
+    "secret": "f1177a06f3b1286dfc56cf5f3773b2bcadac8c059d9f609b6b25ad30233a6ddc"
+  },
+  {
+    "public": "3555525c9928e4b21e77d88c3aff9f97b8c036b9ca2ce00f46893b73314d7d1a",
+    "secret": "b31bcb19f19e195ace8aeea14fdb36ef21528a01c0c44755993038a75aa41a2c"
+  },
+  {
+    "public": "2364fac68900b071ba419e8ad166927ba2d213ee00e4ac909879453032530a5a",
+    "secret": "1eff1b1f7da431102d7630c4bebe8e27a8ce246d950f526ab0a13904035586cb"
+  },
+  {
+    "public": "c4611be6d5aa861e81719a97788723ba02390a9d45933c40a50d26f83ede5679",
+    "secret": "756a71c86d56256a2e5429a4ac2049fb2cfe1a3113f359dca09a62e0b92e787a"
+  },
+  {
+    "public": "a41a61a6535cd5159a859567520bd200c2bfa4a61a5c7e6d61c6ba43e7d52775",
+    "secret": "e5259d670828e56c62fcad7e227d98552e8b72e0de0e701013c1360217716200"
+  },
+  {
+    "public": "8f25ee46a015c582d29b6cee37c8e920548c542a107b01568fb601704bd15458",
+    "secret": "0a61418013eb7b7a6deb3153d3310509a40bd427b1e51f85afa987617649665d"
+  },
+  {
+    "public": "e071bc94bfba35614be26587a638f7d3fbd446a6f2505ca22b3e9ea015fa2107",
+    "secret": "327f248eb44940b3c3d6ea6c336718789554a25bb1a19d6d59b35083d151a1b2"
+  },
+  {
+    "public": "f3331bb6813827c6b4c710d8f54b1f5b8ad049e9ee5543556c7b76648ad5ad67",
+    "secret": "217327f9e1a353f5a1a2719df337e65e2dff5e1c3750c112f6cc407cc13c1e51"
+  },
+  {
+    "public": "e21fbe88b06356950f6a36ee015ea6442c00395d34b5c98e45b0b8143576891b",
+    "secret": "48ae7ed9b9d9224c6482f45b6c8bb0df6ad84d4b6c6dbd8abd7a52ca24c12b9c"
+  },
+  {
+    "public": "c52011c7ce403a4240314d99ef2e0bf738b4d479bc534f3d3f09fc99e21b245e",
+    "secret": "12161bb407ab94f151cec53b807e95e83f7e51cb81c5db2f92a1ca783b7e3daa"
+  },
+  {
+    "public": "378c133ee53dafb1938086a91399f4e500c575d9302d2a5d2ab88abe3bf59e0f",
+    "secret": "d844f6b866f95442c849809d5458b2f1ec87c45ae8bf1590aa857b72bd5f631c"
+  },
+  {
+    "public": "22af2609904da3b40cbdf7996ae2dafb2654b976646301695ce325e4f36d6850",
+    "secret": "6717d8125252add4aea6868f028f06d803352675aeac9e93df26d6687cd2e594"
+  },
+  {
+    "public": "a39a7e9e37e89090ac07e04c4d50072df9ab637a93e5d192cdb4dca5e9bae77d",
+    "secret": "7f7048ebb23194a2087bbb157e593bb9f6af60ef787a5d89287afe165b3332d8"
+  },
+  {
+    "public": "b4faab7ded2c3b0c7ce91e9862df23055d2bc26025506da643d919aed4e22b04",
+    "secret": "7e78a13ae3882b2f9dad87ff0bc193365a2068d656c6f037e10d5a7a6dcc9b87"
+  },
+  {
+    "public": "07f9d642dfc018fa2d91f5903ddf9a16e1b7f09a4d856496dcfae8d6ace4ce15",
+    "secret": "2fdbb4b3420104753e7589d11c7309f792cfc6b8cf4e9c9a04f0960d15868d7f"
+  },
+  {
+    "public": "3222dfc6d20a9bd692f7e461977c13b78c613674cc20af92833c999392721400",
+    "secret": "9a155f1ef3d654091707feb8902e712c5e7c652d91a04a730daf1b72e6a19a6e"
+  },
+  {
+    "public": "0fdc953e7980334d24a64afbf0a8a2d3005fdaf0233a2a4f3ce62c3e2ecb7e18",
+    "secret": "15cbe82dcb60918e0e1528fa13371cb39e908d3ab0d6b18652e7f246ab29a4bc"
+  },
+  {
+    "public": "6e000c3a8b47691cc72ec6d78f62fd18a2a7b6509f2715d7f611b96e55969019",
+    "secret": "a091b34a3aa6284b40a2cebf126e545489b221e4524b2f4db76ef397d0bbb114"
+  },
+  {
+    "public": "1b06509ea4abd77d40774c74741e529165ee1c036f0daf49edc91cbce31f1a28",
+    "secret": "a924417b82e6956a79bd5c51cfc5dd25615af884beb6c5a57c01a8e573918fb9"
+  },
+  {
+    "public": "d533a0e3379f5725212561037abb2b1fa7cb912c10f9e446d1b834be38266338",
+    "secret": "08b5c72057d8ec47da8b1d961a1b848d6f2cd410798cad9be6c640c4df2d35ed"
+  },
+  {
+    "public": "ef0b4b4893a58d595606328807888e7f76090e25a099b69eeafd126b073dd674",
+    "secret": "f80d075e27bbad3f2ceffb937fe8de5c1e594e5dbf21401fd6050f16386cc6fb"
+  },
+  {
+    "public": "359ad6381ad14c3957f3f6a124206b0d9667ca940f61c39551b8fb2c548c0d72",
+    "secret": "8e62b4cb288fed2bc4a6d3c64a854e9f2809c274247e6005cf6028d24d1f240e"
+  },
+  {
+    "public": "25ce79a6b088366d6967c10666d434699ce3990ccb06fceb5364bec1f3691926",
+    "secret": "5ea106e68780fbd264b1bf136fc2ec95f2c8cf1075907072133f1b5cefe51891"
+  },
+  {
+    "public": "1b53425f9151fd2bb1a7850c534059b49b0d220783bd1e8bd254c2b503d31e74",
+    "secret": "869fe363275776ce4b5df236c7563dc7cf237db74afe84babf1f8ef83d548858"
+  },
+  {
+    "public": "baef1c25a7190fa98ebd23cd4b359ba2246cfc2ab03bb88a885e7e9601ed9e14",
+    "secret": "d0fae9281ea5beb59108786398f8217b584a4d97b06b38b2fa340007a3f853cd"
+  },
+  {
+    "public": "43d37cc7e03f61b4e71a8afdb339d62d31c1b5c7b48a25bbbe15a9925cfe4e76",
+    "secret": "5670f149475f48790df6e0eba38a6252529bb71dfbfeb0f940389d9cf8fdc62d"
+  },
+  {
+    "public": "6080127306f6fa30ab8b027a1b66e8c87930303aea56dc18b8a72ae9b341ba36",
+    "secret": "5e2c241cf3cb68e8c8174e7b709ddc6728190d7506143da9af0a4468cd2930f2"
+  },
+  {
+    "public": "570b4211b5a40b9ade1f1b4d97614ad7646794482ffd2f9b7f251a44a890a003",
+    "secret": "be8914df5f3b353ac60c6afe19d5b91baab869f34550df053ff41372fe6ccaef"
+  },
+  {
+    "public": "c2729d6a22350ddf132224fc95e296bdc9c3e67a2434ec0669451e1d7870f200",
+    "secret": "0439d1e7e5a81c50d81b9ca935a9f68aa065abcaad4f285e8f5763f2c73af7fe"
+  },
+  {
+    "public": "d3a43c727fa5205ec1d9e97f8b3c7af93b671f59e6ca9620c918f9c310e6a36b",
+    "secret": "68a93a0bfadb63c68390ca92cdff51d96b221c93a7eec06432b007515facc1c9"
+  },
+  {
+    "public": "08cb5bc15edbdef8ebd108275193b32335d7ea217976449ebcb5f878cc950d2f",
+    "secret": "cde5864cfc4e494c582eae6410c156485d5e51469a27b0f0706b00ed19db277b"
+  },
+  {
+    "public": "fa6c653085fc1cf740e03419e9524fea51b237e822a56838d50c524f7abe1559",
+    "secret": "c32984d99bc2e1ef591f2e35197c0716628f2a0b994862f766188a83a04c3e2b"
+  },
+  {
+    "public": "5375f02b1a8643ff50dbb2f64ef29747e1ba1e19dd859459faac65c67854db37",
+    "secret": "5347ed6e4e9ca752f79126fb5f7097ace9f35bc11c4109e8ea677f44dfd0c5b8"
+  },
+  {
+    "public": "f7cf051dfb23d652ca73d5b25dba5a46e98534bdee51ad149a27f6e851754a22",
+    "secret": "0e3b3ae617869422fa58470cbfe7d24a1a055a064bec56d45e85aab6d31bc298"
+  },
+  {
+    "public": "f9e5953ecb3e231488f8580de0cf5d7f0191c2dd8a3eee9ee48ca63b174afa7d",
+    "secret": "dd34761880e0178c9e15c12b132dbe5779363b4a32a9aa40f1d6e29e9244a790"
+  },
+  {
+    "public": "056ca43fb3957363f6c8fbd4b76cb824af102bacadad4e247adba92409268937",
+    "secret": "c48fe13d525b3e3fd4f301d638230465300bcc97dc1b9fb7a5edf2ea5b6759a9"
+  },
+  {
+    "public": "fb8af5ac9f47ffed680d37d5a6ff17066d21eb5a5b08090ee6519600e00edc13",
+    "secret": "31a193031d5be1bb0a2a315d9d75712a9e65128d2869a7ec047df7a20431fec7"
+  },
+  {
+    "public": "c177a05bb3083acd81c2d6647c9fdad2788f32ae7d112fa44e5c808eaf54ec7a",
+    "secret": "64525189a50db2b9e83e6228dbf4d4425e8522063f3abda2c794f77ed5ba1304"
+  },
+  {
+    "public": "b8eea5eefe7f26cc8a99ce4d154119ef0c9526e5b60188d4fbdc8eaf4227e671",
+    "secret": "acf65da635b934e4e11e54d2123e85cf495e4eb1d80b51840ac93114e78d818f"
+  },
+  {
+    "public": "ca6a003239df6258f06be9a0b46474a6fc28d87a4722f97c98d275edadfab66e",
+    "secret": "b527b314156dbbe7feb67da76bfbbae1359def0ec9283487c0c59df0e66862aa"
+  },
+  {
+    "public": "4a23451208a2c9ed82c5fac741a75bf1395c401386ebb1adff36a72902f83873",
+    "secret": "d034964780b37264860ff98bc78fd6542e2cc1e9c8ce8ba8d4b83c6383696d6c"
+  },
+  {
+    "public": "59398ece5bc9a03267f218fa0849202426b4be1c185e95c3cebf5858bc1c042a",
+    "secret": "f13f614624dd1547df9127dc8c1d2c31ad81557eac71fb87d3a4878d7c1d4f90"
+  },
+  {
+    "public": "db32fd9235e3dcfd26d375b4462c3a76973db17c11fc5324f400118a79ad2a01",
+    "secret": "92da4b9bd167233323952ea95644ab0bd6c20e33c94da14c8c81a8e3ba27fd2b"
+  },
+  {
+    "public": "ab0428e769186de40ac24745ff56e8496cb77ba8c41ddf30924bd711b8cdd151",
+    "secret": "cc17419f1cf7ea1db93c338e3c061329e19de882479b0505703794af83d23587"
+  },
+  {
+    "public": "e6eca9ef0ce8d4f8306ddc2b513c40a72e38b5c6c0438a2dd4cf96765e42be03",
+    "secret": "443e7d230bae77f7ec9b3645ce79f5cbf5c1989aa33dfa83960ce593bf60ae67"
+  },
+  {
+    "public": "20174615d596e89d28be204a7f2dc6eb0b03e0abfc0f30ca2646f5d432aeb72f",
+    "secret": "a9b8cb1118ab181be9601aa9055e9223a09f43670639f0c401c21102fb6b3292"
+  },
+  {
+    "public": "05098ec559b11e4deee227e96d356b3104072cf62212c669c434dd988d1e8a5c",
+    "secret": "b12681e6a607b842cd2588e4ea0ad7efc7337192a8ea4ff8e06078d30fb2235c"
+  },
+  {
+    "public": "61124880383c36dd02352d14451965740a1fdae33e3df0dc073de133a7d6737b",
+    "secret": "76d5004df0acac33e1e2fe9807a9efcdbee48c7a61dab8fb10e2248083c4f75e"
+  },
+  {
+    "public": "2846826a02e01ff6903efbe47733a5d718b7293fba201a533fb7308793953b54",
+    "secret": "a4c5df999bc6bc4a8e077bce3b1aaaf48485a329b381b23820bfd0ca19fe87d7"
+  },
+  {
+    "public": "d4963b557f32d189507e26ad48b0f2f837dacdcfd67fffbf2af0928a5d5df447",
+    "secret": "0e3ef340811ec1d14f9a7ce8b4d4aa58144f2ebceddb58d97dfafa1621f0302e"
+  },
+  {
+    "public": "1d57a18696da3a8e9bcd580e2bb6098df79fd6cb89a3ba8b1d60cb9959d49027",
+    "secret": "8a70dba215618735397e62b4b0187b989e45ed4b43bb44b0a0a03b8e376b613b"
+  },
+  {
+    "public": "a59d0c2270a6eafa455e2b7bffbfbd49066d3c1959f26149a7edb41679b1cb0d",
+    "secret": "4ce2b583a2ba7c2acd59e236eac959a45eb137140eb9365ddc56fe060998fe8d"
+  },
+  {
+    "public": "7343ddc3a9d5de18513fd23fccd0c325805797c3d0bd648e83c97bbd99270a15",
+    "secret": "1dd790c74a9309502a5fe40e98009aff321b719f2972f57d3389c400b8ae143c"
+  },
+  {
+    "public": "d5d7f74b2881b7e8b2d96ff32e7576f56264bb83e22bd1e6f5d42940d5a29c12",
+    "secret": "132ee003a80ea46b698a0e26e6ff316ba5a516daba2694b52c87935fd44dc064"
+  },
+  {
+    "public": "5015354d15bde26e3255fee0b691fdf908908198412098f841a467587abfe93b",
+    "secret": "035d47b3461653309da0e10c4e8d5355b13ea946de9a7bfe9c8dd456583a2f1e"
+  },
+  {
+    "public": "e41b542dbed9cae38ff49f8318a35c19eae3473809563677cd07929f57284774",
+    "secret": "965f939df073ff64d393ea08654ad87c851adf5aebe790056bbc2d6c963cff19"
+  },
+  {
+    "public": "7d901e0e3c04a5f43c798bdf3f7ade4937caa3dba1de47926c70979b5ce3f12d",
+    "secret": "24e53c34a6c58ac662624aa64754fdcf8bbdc7c02faeb4067dcf534c35e97006"
+  },
+  {
+    "public": "adaa357d9536187bf7fb240ab05c4be28fdb07dd6cfebcf09b0840a853272b43",
+    "secret": "18096a25180f01fedd68f2925446d81af327cdf92781b7c5e073fc4e3c52a421"
+  },
+  {
+    "public": "f96a2cc551ab9829b8d18823a059fe433d194a28b6ca8305abd41f9022697e42",
+    "secret": "872e2d7a638c4c6d0bf35581cce8877cf6a44b7e2fab912f1719d56fc33fd5d4"
+  },
+  {
+    "public": "1bd5d20d362c845dcd84fbacdaa8accaab50b1683143b312d183b8a445766b14",
+    "secret": "db2a2b37b879401117f31584e8570089a6c0e50c94aaf6993cdd6e9dba8f6f66"
+  },
+  {
+    "public": "bf1df3934a0ca7b07e545c7669d9b6fe9dad431afab8826327dc422bd2cb7e5b",
+    "secret": "e0a661cfa2da179af2c9d217f99d92ace8f23e25d349a53a0e0603fc0b9e2357"
+  },
+  {
+    "public": "d6eae08d4e0c706a134c99ac66c09e5ae895a680349f7bf7248f240d3bddbe7d",
+    "secret": "0bc188e3d253c6ab33e850a4891d181ef781f43e84b6ce668fc67f8858b9ee3f"
+  },
+  {
+    "public": "cb3384aeb26dbeaacd1d342e34260e5e6bce02ed411ced681ee24bb9a581b322",
+    "secret": "2bae4828adfa1289916b9cc46b76d198ed18344e71d19fb8e54e328a307148da"
+  },
+  {
+    "public": "55a533610c16951c2859cb333ae19a011928183b996780e904f2540684d2660e",
+    "secret": "4605c62aa16d47dc96030435217e707be59b13181447171f5b2181d241009683"
+  },
+  {
+    "public": "20f84bd24dbf0546a07836a54a1d1262539793d27a423e6e122721054768d738",
+    "secret": "34e2de953abf5d6269ab686adce78dabf245de8d0cf9d368c35394c824885eec"
+  },
+  {
+    "public": "14ca2cd9f41da25069352068f8436d5619f3b0db0336c2fbf102a3abd158df24",
+    "secret": "7e41f3f288b809a204ca1845c78f6ca33ab806445b2181b30094bf8662121d0b"
+  },
+  {
+    "public": "0ca2a8c6e1204624f59b76a6fc126f1aa1007a62b9f7c2feadb08695c0d24265",
+    "secret": "2778f0e3ede0848807cf1bb4d002cbe31a063e6687f7325c3c9de9cb9d153156"
+  },
+  {
+    "public": "6d3709af567dea674296f4390d8b641801e5daaa0835f8983f9f22657bc4186b",
+    "secret": "3196df92dc5598113678f1699543c3aef7aef299a4bc8fb261b62e0aa5b15774"
+  },
+  {
+    "public": "4f32c9f4353ef981c7c5a9607cdba44e1e9aae3ac910c4c4471cf3fa2f0c0941",
+    "secret": "8b82fd5f8c72d0774bc2eba80466f9f07fc86d31948c9d3da5b37dd979d8c37b"
+  },
+  {
+    "public": "a3693d7b0e475cf1593da3d62ed047cec9f34e3f0ef42b9322dc77f96c7e1d73",
+    "secret": "ed830539c84deafea948832de39940a1335244b5e6887126d74ccbadb260b8ae"
+  },
+  {
+    "public": "02d4bf680cdf16bb26d91e0a6f666746e9222ba24f27735396f9831441d2b74a",
+    "secret": "6d9fd49aeac72b20a582089d24b901267e429338101efa67674ec4b0d41b0e27"
+  },
+  {
+    "public": "078c7216244ebe0a724bb3690d12a5af8e53ccc70e975484928916b9ddf7fe79",
+    "secret": "6240b9c4464fb01f3a4d3b1ca94d834deabaa02940584985680056d39c43fed2"
+  },
+  {
+    "public": "aba1f1255abc39f08d2748363bc3d8da7c678d9bba35d4c03ebf5553c2989811",
+    "secret": "6ca1ef32bb69e837a98e93fdb87b01ed3369bad33216dcdf68c874f38c9f648c"
+  },
+  {
+    "public": "cbff7bf5854ac68e3919dedbc39d964023c56ea85cecee1be8760d5033d07d2a",
+    "secret": "f1f025401266988bb31997bf0a84b2166526d19118fbe3986f01d3aff7ad1c30"
+  },
+  {
+    "public": "ef759fc660e65264b7dc1d8d179e29d556caf7285aa9156c3333679965ae565d",
+    "secret": "6f2a1c2fa336fa19c1089144c2dae8208277809675d46337e8b9d9e742c67436"
+  },
+  {
+    "public": "3709227e6374adca96a5e076866bf61cb1e6f3741cc3d125f770cad596875917",
+    "secret": "f6a163f9a3f9754e02e4418bb5bd5de0842709bb1af22d571e3a63cd258a73f5"
+  },
+  {
+    "public": "f0ed71083ce9c7d35576d74ad5236eed2e5f3924f364b4473a6f05b8b8fb5715",
+    "secret": "e6d6341893a1418e2f4dcd0664b5b95308f7a907592339bbb719c1c2db0ed819"
+  },
+  {
+    "public": "6a710148dbac02889cbb205805fc4ac59bd5bab0d03d86b3dc0705a4a26afd55",
+    "secret": "5a2ac4d1cb7797f493f621e6f3edd3bbfc47178c272598a6e206e553b5c6b4cf"
+  },
+  {
+    "public": "7a0c4baabcf16c4ef380bebb539f73431f4917aa62c2ac4fc655c9d4efeb7f07",
+    "secret": "f03ebafff8587eb9c153d6091263a40e9c459001af0a673bf337afba65931c96"
+  },
+  {
+    "public": "d8f9398472d39682c1940c2d0d6a6d5c50f82c1ba8e7f28cf015b24c95811b32",
+    "secret": "2dead0874da930142b011a1f8497d9630d8c5041ab9e93f558f29b44dc92f9b3"
+  },
+  {
+    "public": "e9a33d7a3162a388c91217880784da105c19cf1ec3fd6b39b029ef0179895833",
+    "secret": "db459e207f3d8fbe4690eff956530d4b85790dd11b0b86fdf20d08a8d2603939"
+  },
+  {
+    "public": "784a6e8727582e2968c1acaaad46df379622d2b03f182907ef847c39dfb2510b",
+    "secret": "ca7536f68f252fbc00086d768f19f621d8f14bf28b372c95815a5d76845d034f"
+  },
+  {
+    "public": "0fbe08ab1bb21d9b22c6040c07e01e73fd5b358dc75316e4b9ac6c688e55ab2a",
+    "secret": "667cd2f0cce04f241a427684911ce6384cf9d7b9aea4d0b1f4ab21a952584bec"
+  },
+  {
+    "public": "a55bedf307ff63ea89e8fe72c5e72b82e915bdd32720e5e5bdb65414ca398d0a",
+    "secret": "5330fd596c78f1c848b4735a506afe2c7fee89b78bae655d7159cb2188e25211"
+  },
+  {
+    "public": "6ea3b0f2730527007011343073cbd6ae137ca4c877db4a4b6734b2629095b446",
+    "secret": "741124ee85eeca84e90162011561ced350aa9213830578618c5088c30e6754c4"
+  },
+  {
+    "public": "f8f25013a3d96a5558f10e17fb3a621ab2fc4fdb5534ac96ad52c0c7eafd8031",
+    "secret": "17b5b505440e76edc6bf29d4f59b84654693add66b7532e538dc16e7a67bffa0"
+  },
+  {
+    "public": "38c63f26ecb6d76477d839436ac30c71273263752f5775807a21ea9aeb772710",
+    "secret": "5689a0beadb4e91f37c6fe3fc2faa08afc2b9e64dc8e7bd6ed07cd86e9179b4b"
+  },
+  {
+    "public": "1944b544c3a7b6908621d808668a93079d4f6359b643e40fcd84b6f35452b36e",
+    "secret": "ea4a221ef36a4dbc9e6e1ceb9ebdd72db36fe4d51b6557b1f11d982286ae97ae"
+  },
+  {
+    "public": "e41245f7ec196cb67d1fa3e50ed55cc522c04fd306274831f506c8f3540afe2e",
+    "secret": "e98611926124c5eb1564e889abdce5518b21ed7a0800ae463973812d395c5c21"
+  },
+  {
+    "public": "42fe2b9845b8f7ad1157231febf65c913ae321f952d66f4fa26351474b5c5d40",
+    "secret": "620830af6fbe28c6175aaf94e6f6337df5010f5e573104eea2845b39ba1d471e"
+  },
+  {
+    "public": "d0a3f7d5879f84edabcd2f6e4b0f1fac82f502fdcf4c56bb52815c6d1895af18",
+    "secret": "55a96821c2b96632f14f422231c56a8a106bcdec85001a43bb8245cea579268a"
+  },
+  {
+    "public": "a6380a7f0723e21ccae40932f44c28e5b26a8d695a0c68fd1466975d26d26f27",
+    "secret": "a25d23d4dedb46e9b03078fceb74627ffaf31ce86c065d41bb6e38d6f2bfe6d2"
+  },
+  {
+    "public": "ce974854024dfc1c9aaf2563740e20da0b552a451377583a74e647dec3db8e11",
+    "secret": "9882e4380f9f45603e7cadb01f93cc3a601920c461b5d93dfcebe4636270280e"
+  },
+  {
+    "public": "6bfb5e6b3a79b2accc9915083a68c9cf7065c2e992e1b71b9bee3ff5fe041e0f",
+    "secret": "d9c52a54ba1f93aae63638d9ef831d8dd991a85790f21998c2d2674f678d982c"
+  },
+  {
+    "public": "1c1e03d9d5702ad3f3112a29a84ba8d8706fcd5887de2cde340a7163f5ebad66",
+    "secret": "94b00bd613059399075f6b947b83dbcb6090723ddcbe720ee63457185a0a52ea"
+  },
+  {
+    "public": "7ae4b96dd87d9963ed17ffeb6dd1223c216271f6e7204f2457aa04f677750640",
+    "secret": "cd68d5cf9e99b93b5e43074a55c6e23e4340aab9f73caeaf720cb8e03600f95e"
+  },
+  {
+    "public": "0bb9a66e96bd6b8c0f21846c2c7bb5f9cf4527293f9cf097a59f73734e32fd09",
+    "secret": "78fadac3449567c0e4e4b05563c0be5dcccbb0d718f8925342db5383c6266eef"
+  },
+  {
+    "public": "72ff000fcc97869858c2e8fa765f14d06cb1f603e9f0081e01a08fababdac436",
+    "secret": "a5cdef938311f0c32142443e791b20c127a11c48144169427e6cda2f5b3af1b0"
+  },
+  {
+    "public": "4e2deb3c8a0f92933b5531704f7e715f6e34885ad370229deb9c34b7a9ebe61b",
+    "secret": "1075a77ee9f3e22cace2ff88eb56d93df2bcaefae2bdb40278c0b47ad2200507"
+  },
+  {
+    "public": "5669066eb3e11fce08d151e92b3e279bef5f3b7e0a24e01e1ee995947bcb3817",
+    "secret": "3de102544d8b1ff850809421a9a35a9f0739dfd8f89c8048c5b1c145e4e4a47b"
+  },
+  {
+    "public": "0ea3d7f905fcb20067871274e575fc5718bd804c50a7dadf098b7c2d3dd7a113",
+    "secret": "e88f380d8648bb007101e4430e50034c03ec3dd18c9e4efec9a8506ba72d99aa"
+  },
+  {
+    "public": "5eff5941e0cc179bd70ed01de103e8a7bb6f86b4852503e8cbf225933075e42a",
+    "secret": "4f0df8e1bdaa02bd03c8801b3c06bf8997b5753a5ba2bd7f9b4f93f65f492b5d"
+  },
+  {
+    "public": "bbf5a7586463d369589bf1ee6f02a041452e7d05a44342cfb0783be6cc4b0f1a",
+    "secret": "327375899539b7d4dd85bd39cd5f7ca5861ecef75c4e04c4faff34f06c2cba9d"
+  },
+  {
+    "public": "27e022b1d485bb59ca24745eeeb8eef94fb6778e2934e59eb3f3afc6dac6732f",
+    "secret": "4f3a4bff2c25580b7327d7c06c729e4936e58802a98cd6c7e986206e3b6df2ed"
+  },
+  {
+    "public": "ce0b75b43f3c7c30e28223393a929e6c254dd5e9b7d573d9f5ff01993b4b4257",
+    "secret": "2c783effce1639254c4057c1f7563af5a1d72e8dc55d6dfb7a184e290cadedfa"
+  },
+  {
+    "public": "c5a845918819aedb25d4b612250a139b35e43fa6240edc2569b4669531193336",
+    "secret": "4c273af47fbf8b08db2535b27013c8d05a646ef2f3ddeb0e11f97dfd3b291f7f"
+  },
+  {
+    "public": "0ff0eaf436dcfb69c3c6aa6d049c4c3fd2c38f2cc5658a5b556d54d5a8b3bd0e",
+    "secret": "557b8e1aa98d706653edca72562fa4f449caec8f977fe093f53643b278732141"
+  },
+  {
+    "public": "99657f18974ee55fb332b08fdcb0c33215187db27af681424f2a7f2718df0b18",
+    "secret": "49ab9030e9f9eb0e2c41e407a62fc708cc59959a669829b666e72cbca2042a1a"
+  },
+  {
+    "public": "1423b22532c6399218e67b4ed870720e2a8c6d2c2adb1b95fa60b5a67b40b014",
+    "secret": "caca0a38932751097012bcbd21634357c0d4ca8b1c7dcd2780c0b09d7651fe52"
+  },
+  {
+    "public": "3d8c29bd72a6a455242451daf30ee7cbf7888f179cb9cb245b72ded887995437",
+    "secret": "841dba6d20314bbea8ee049ba809dd14407ba3496b7e0c47642c09acb2267a15"
+  },
+  {
+    "public": "ae0c049c808f6509402d8dec8a9a5eda276006e3854ef415efd013b0a24b5935",
+    "secret": "e77f2842e8562ded1e740bf6616a5888db180fe7321fdc9b171392cdd94b2608"
+  },
+  {
+    "public": "a340b1c44d20e8678effc92d5732da2521024f3ac898448d54cb235c33535b3a",
+    "secret": "add5c4f7e57f65f6ec2ae40171250ed278b23d2ffc41868b82a7f782e1783108"
+  },
+  {
+    "public": "6ac0494a7571b3375016029a5a927eef9f223c3898d4bcafda6c36e480daf569",
+    "secret": "a39db787574e1410a539865227947418c184d3ccf30c95533a7438250893c8da"
+  },
+  {
+    "public": "3a6ea8cdd339f346672e81d3b7607241774b460eb71e5da90bb39225910a6c16",
+    "secret": "631f00e1b8ddc743c35915297e22a734661c650b75963fb4ea2198e6f3064718"
+  },
+  {
+    "public": "99ba6e97e7fba9b94cf85a8ee74969ba7e4e92b7204b173ec51ee1b163a0ba01",
+    "secret": "770aed7fac0e99d525766f2c959270998aeb35bd32cb5ffcb4ed96e71b7f1490"
+  },
+  {
+    "public": "f233c7fe6665dd524e2a18a628feece7bf370f99d075fd6d232d2c55269e8740",
+    "secret": "5883f1fca5e21322b6aeca51fe487de159a9935960d93b1f10ee4fedfab4f254"
+  },
+  {
+    "public": "0f24e6b97afa293d3d1a9d3bb1bd421117661d4aee6069453e465734ff535d7f",
+    "secret": "5c6dca2b8f7fd0c4cd22f4d40d8a9ac68cf72f56de9b6a8dd8028f09cd28f5fe"
+  },
+  {
+    "public": "94512c7a7381ee7b49760a173d1969dbb1bafcade35f677434b57f6399817660",
+    "secret": "73c0870018173c7cb556467d80007000d2318acf8c069a713b537ed090459852"
+  },
+  {
+    "public": "0fdcda990c8fd31559be0f8e5242b670a612ea83ba5ccae058475ab1afe1b462",
+    "secret": "0f2816f8d64dc4c60a9126279c43cead073bd845788436501f721d84f4928b96"
+  },
+  {
+    "public": "b12c450bdf7eb33d5f2a7f6927eb842a934c4b8fd2c9fad5da9c72bc4e900653",
+    "secret": "859a842ec9fafbf52962e55737a3eb5a93b1cfb2046442ff5708b6c03eb47599"
+  },
+  {
+    "public": "f779e0fd223fd3d080936152f9bc461ad6f96a41739c5ab3a761dd2e99ee197d",
+    "secret": "5412ce0afaf1a19eadc753fdcf0a3f5fe1f5b84f16ae0f2543c1d35e4c78e22b"
+  },
+  {
+    "public": "8e69b69ad08e1a155d563d6c61cebfdd8f60c4d0b9c1225053abf42023b8147d",
+    "secret": "ea16cb502797f5405606f5eb601cb47833e41d4603f780d67dee3cd89535da08"
+  },
+  {
+    "public": "81cc04f358b68531ae4be700454878675e7993e459e98634b1b0f85b4258921a",
+    "secret": "e7b2a429a65e0943df1a03e719b08e564ef6c27d8a0f3f4640b161a6ca3612ac"
+  },
+  {
+    "public": "43ca5dc394792d7609bd9173b14384d531a943cd11b86609f0a9a8a549b68e02",
+    "secret": "32936ccbc3dd27314bf6e272874b6a4a9e2b9586f40ebb3999fec15db26d88da"
+  },
+  {
+    "public": "0a149c5f2fd5477cd6cb85263faed3249c4d2ef4f39e54d26f7f8121bfdbb40c",
+    "secret": "4bb47cdca486cd97c59042016cb315f15cc3750302f34ae6d3c080aed2e1b94b"
+  },
+  {
+    "public": "765a0208ea8eeb2bb93d0f0d619111de7802951293b1bf73d312e422b3396c17",
+    "secret": "beb27638effe9784fb1ec62cd9cc4bc440a2f6b8838b9f97ff64f118c8e62040"
+  },
+  {
+    "public": "db856e8b163711e7a81729111ab1846ab6b30a601113475c136c370ca161ed79",
+    "secret": "c871f61c23561a6d5ade21f410694f1d63185942b991e2cc1035e3a66b608228"
+  },
+  {
+    "public": "1616a26e0d460fc9cf6e8c4a0a4fe1ccf2e42106d6bb69b9a78745978e29f415",
+    "secret": "a70b88316568db7b2bd7824b097a39db2cede20f118fe7bbeff4c1db4dd2d8dc"
+  },
+  {
+    "public": "c1a4d23e0410ddd90435358939cd1b77eb0dd6c925cfc310518110797190892c",
+    "secret": "fbda72a1a62b144fcb34e73fc0fd3f527c2e439b53c1d58b337584869d40be64"
+  },
+  {
+    "public": "5b100ae4253253850b2461471957cfdc414dab98fdae9b93f0aa7b1de8bee02c",
+    "secret": "20743c8f9120c97494a92122d65e67b7ed9445545fdeb436f4b26dcc311387ad"
+  },
+  {
+    "public": "fb22aac2b73c30e25489ba597d4e61100f1221465b43c373cffa5bf51a562a13",
+    "secret": "55b936f4a6947482e6f7d0f328c2614f0e50d930836296eec08075b504e75970"
+  },
+  {
+    "public": "3be71e616be62d226fe5330d14d4b7c44563ea48a0210105e008514d47f7df16",
+    "secret": "8221dd80f55d26db1a4b05bb846b5cb4a8f1e10fca3dc4aed9a3ae877a4f216f"
+  },
+  {
+    "public": "b57dfde4681c9d5bdf866a0b29840a62e4c142ae6734cbdd098c2663419afc66",
+    "secret": "df75bc00d9c2b8a4c0ff824c6a7c72f2867129675fabf9e76db2c76bdf786f5e"
+  },
+  {
+    "public": "fb456d54be21c49326392b5d94ff3239536438400fe5db48bde6554eda32473c",
+    "secret": "a2ed62555aba3d26a4b70bcfb867f8cd15788079935420a2f596c8c511a4b3d4"
+  },
+  {
+    "public": "4c17f3eae951c7a404f0a90eb4e61b3355c13a0e3ae45602183f8343a7ee0112",
+    "secret": "b838cc1490b1f0e8f1ebf9d282f7d7cad68bd3cc4f3eff1a57bd8edf1592374f"
+  },
+  {
+    "public": "6d43fe1fcd19ea1438ab7d9aae68f301236a02ab6ae12b2dfd658d25e34c4b14",
+    "secret": "e91b3c1da135e2e274896b2c709d9cd7e8b032679c6d70ae3c996fba5ac96382"
+  },
+  {
+    "public": "10dbb44ccfa38cb69346cba7ae28568c0e95917477bae57c35641122a916506d",
+    "secret": "9c235931bbacfe1adc4823faf65a41884745dde11b3b7728a8e16f52eb2d0fd8"
+  },
+  {
+    "public": "e70b009adb587f2ccdd59512f0dae96c9e9f15398aad88770f5c9406c9ca0d34",
+    "secret": "71874e6d2597864f06275760477f1bcf15635d6e231ec4b913a9a0fc1f75365e"
+  },
+  {
+    "public": "242b73fa8f7710506060036e4d0140f2f25f88527fa060414339d9e048b49963",
+    "secret": "eeff5d88eeba478a0c0f56519126d6b1ebd74df11dc78ba1e3f62ef910641014"
+  },
+  {
+    "public": "01fe9541c7f81f53d64e9993fad435b9ee29129051279ec6106f220b5988c451",
+    "secret": "bcff27c8bf20290b605b3aa4a07b707ed4d5c69182516899e7d675ca5c5f8464"
+  },
+  {
+    "public": "fb1e78bd678107e9cb8f9bc857adb6bca3bcfe772c660c62b984b09d07223c6a",
+    "secret": "5b25399139cd4e64f8a6286cddbfe607e02848df82c2b28b897263c0eeec3791"
+  },
+  {
+    "public": "4f0452a4c9e64e0bfbadedf8c52d68c74086becc7e7117f69a1d005caea83e17",
+    "secret": "566127f946c88e87a5f638d13e88361aa74c71258ef7cd7c4ea7d88edbb24cb3"
+  },
+  {
+    "public": "d4c7d8698ebd7a33a6af3eedb11f869bc60a4937f5209725db3720ceec959d1c",
+    "secret": "109064280670b364fa161105740388614afbca92832a955254246a5395693df4"
+  },
+  {
+    "public": "0557c44b7497b21987a20e13bac7d5aeb62be58f309dae8dfb03ed99fe173b7a",
+    "secret": "b429742f66e440d41860606be72b1c8cafba11c6ad18517e18849e187f1bad28"
+  },
+  {
+    "public": "fed8b07486f7ae733f154058c7b9939b7772e73504a86f49c3a27149adc16912",
+    "secret": "d333106729caedfb0a1f402f670a6559ef6c27ae7b7bff1a1a03939d6065e1da"
+  },
+  {
+    "public": "7461d91c29403eb29d1783f16ae8b4f73a04c057e8ec0bfe80bbab1fbef78b20",
+    "secret": "a6878097445d8da1c6b11fd0c94b7be6df441c13afaa3eb161a99001b363b4da"
+  },
+  {
+    "public": "81ccc8efa64d4201b75c07f66553f961cfedc96ac634708b918eca5bb7d7c32d",
+    "secret": "51ea675cfb7183af2840fa32c5cd9bbd8c96517b0cb9ce1289f49d09b76e7380"
+  },
+  {
+    "public": "084f5eea0eec63398fa0e050af41e3afb70b143c0791ec1b23ae2d69c7881774",
+    "secret": "d4cd00de03c8ca01809bf943c6e118783af6c5777c8c4df0779c198784b829e1"
+  },
+  {
+    "public": "a5814079094de679f4382ab5cd6d1ce4a2efa5ea07733f483c8695c2e75f4f30",
+    "secret": "34feda2f8b44825f4d7f01d156459d189f5f73d26d4fdbe078d311b22a47dd9f"
+  },
+  {
+    "public": "014c39493e244ea935735b1884f49f54fb5cc4f0848d9f65c543133af02f2827",
+    "secret": "dfd897b8bc7c39d8a702322fc430ac148be9f7e221b79da74eed11b2eaf85ead"
+  },
+  {
+    "public": "78366780afebd8555074024844e28e29dde9428c0723de5acb9eb9941003ee6e",
+    "secret": "c43334b46bc4794d9ac465abd73b00bef3b6f834848a8d6efb7a7092016f6052"
+  },
+  {
+    "public": "af2da2cefb1baf8d53bea4b9696aa56a1aa2ac6bd3df73a114f1ad127e392b74",
+    "secret": "84e303cd760df55e529d7fa60660305810ad7e4400c383f99b48e454b58958bd"
+  },
+  {
+    "public": "43c940b742b9a1a7dfef2ebea65b878e2a4e8a7b4a32004cc02242f9d49a983b",
+    "secret": "c1f497a832171bb71382bf182036c3554befadaa94bad5a065c3b75050f3ab46"
+  },
+  {
+    "public": "8d7e9e71653d6f96f900a1d890c8732f8ae66200ee2ce57079e693aadee0e164",
+    "secret": "eab3a84609111ca3072fbab3f59011cf575d66b46e802900fc78c84fd8b71e19"
+  },
+  {
+    "public": "d50b6655910afdab1ba2cef6d5184bfa8153e49f6119cf0aec65c9c9d4d20267",
+    "secret": "1802c190553935aa81a800147fc65c16f67da28d199a248f570528fbcfac5ba2"
+  },
+  {
+    "public": "0dcd9a8fd40cc007608844326f400bd897e8aad098bc1a010f7d4736383d5f3c",
+    "secret": "51fc61ef00cd01e11af7f2170376eacc7a66e5e0b4ba04d21f66defe2143ffdb"
+  },
+  {
+    "public": "98cba0836efeba5a1921b84339a9c2c4b52ea5f9269b15f27e2a1413f44e3221",
+    "secret": "5051705d39c7a52e407baecfa7a64acf3342f8cb08c8e4de7e58adb579eef9ac"
+  },
+  {
+    "public": "ad415c620b33e469d279e4052336eadf9601d934e7991a9e7ef41e5cf718d34c",
+    "secret": "6e46460f407256601064b0bd0a7918db5737613fc107fe9b67f82ffea844e911"
+  },
+  {
+    "public": "23943e772b4d1f00cc9a80d3125dd2b8146b8545a45499385ec939ac4de85c5e",
+    "secret": "ec55e8bb406f0f821045dc649c73de8346c8d7a87f4b236d0a83ab0b95d6628e"
+  },
+  {
+    "public": "b64c6380626fb775623acd604196159f8ac2b0b9a8d666022965186093b9de1e",
+    "secret": "da5a7876575cf8fec83b8f23600829037f09c55272effe24f5824a82ac7dcca7"
+  },
+  {
+    "public": "74df2a44fed9e23d8805c5cc84b99609975e4d445149d7029bbfc6a35bf76f22",
+    "secret": "d3ea6ceb22a23b1b05957ce3bef8918b8929246ba6e681e84cb8e02347ed181b"
+  },
+  {
+    "public": "d21a5e87b7b6f5b787783775ff7ceb7b176859eb4f29f5cf53ab42c085845373",
+    "secret": "871b8a1882464969b198a84e87b85d3c9c747691719333be097abdcfd547ae77"
+  },
+  {
+    "public": "17b7c7ce3ba2618acf496ab3005a59f7eea378e931933de2f304326abd7f0e5d",
+    "secret": "b5f0d78358600218ea1b69f150c29f7811bbb023bfe29c822ddb3b0415acd8f7"
+  },
+  {
+    "public": "81b438fd7e69d8c3e827c96aa6d1ebdc963dda816c7e89443ab675a18a211165",
+    "secret": "8e2fe876756355a6c7668f6a4f033adcf19ca89dbff0ff07bdc119b6ec574116"
+  },
+  {
+    "public": "489effc9ceb13319cbb8ddb75956ec1ec9a569d397d53b1709babb2819d4c96b",
+    "secret": "3cd6cfca013cabe84650233c85503de9937fdc324f89edd3ca5302d20f1947ae"
+  },
+  {
+    "public": "3f541ba487d34a312a7a9dde375eca9b00357afa56d1ead9cd0b2c4ff9302f59",
+    "secret": "9d9d60072b9ea339d723508c3dcc516c8c7803029531fc403b344e18ead6f09d"
+  },
+  {
+    "public": "ffe57c58512d8aa71206b80eebf8d80aa12b1a8e4fa19a6396fa003504ad2576",
+    "secret": "a69c78c08dba93ce290e1408dfc17127ef6049f8cc51c89d4f6a5cb023b64d0f"
+  },
+  {
+    "public": "fc33042293cad32006e3ac50117c73e6f7e128c24a68931f67d96a264f88427b",
+    "secret": "d219929f85c3f91916aa4a934d01a4dd996038e39645b23b90bee60d7d59556b"
+  },
+  {
+    "public": "46c5a9937776f685b15ec8a0576dae93273381432ce40e66e3b9fcd9fd713873",
+    "secret": "8af7d5d79e7b89f1e6cffbd65e122ca7eaec2c8812bd037901daa5d797ae3105"
+  },
+  {
+    "public": "920e10d29b86828f2a2566c942555e900c761e4228bbd5473eaca4ebae2a8237",
+    "secret": "4e9e160a35e3cb087e71576dc58073837512ad957a11c06df5d111d410dee6d8"
+  },
+  {
+    "public": "3aaa7c0d4879f9abd7b890bf2d10b5b2390ea66bcf6e6f6089587400fdf6fc6c",
+    "secret": "532802fba4c2a547a5ac567c17e629b209f8e849751b21b394520cc71a099045"
+  },
+  {
+    "public": "2b9260191e81149023e9ea899c18c2a677d58dbf50d24355b0d6d135eaed841b",
+    "secret": "b007f29defa29d462c21dafc280eaac8fbf8a115afba4fe688b647f58a9f3f8a"
+  },
+  {
+    "public": "e7fe900b47df3892b7bcfcaf4ac91ebdeddcdcc15eec0789d2c0a9644908b83e",
+    "secret": "f86b1eabc8157d9b38a8051600c35acce269b27b76a7ef254067463ca9905e93"
+  },
+  {
+    "public": "8ba5f7bd38311d8fd47481c2ca921d53736c5875e696aa7691edc1a0cd8ed63a",
+    "secret": "4ad8e7c2ecad61002d9f8954a8a9ca905ca52e7e6699497bd89e88a3f011b380"
+  },
+  {
+    "public": "f4789a2ad6ed1bf5b5cd84e76693435a8753c74997bbabefa6ae0da594fb3860",
+    "secret": "0ef09023a43bf6a02aefd3ec45f2fda3b040096aa668fe41abed6ed9d4ba1a11"
+  },
+  {
+    "public": "1cf2b06f55322e4112c4a783becec9d45d4b6a3cac772bc2dc0ea18cdfce595c",
+    "secret": "a9b282da6b74cd0ab0897e33d1e8d0c39a555f9d565e98c654743099dbdd508f"
+  },
+  {
+    "public": "5ce201879dab59872ac37de2a6a855cf739e197811ceeebd279ab13b877f7e1a",
+    "secret": "e0a127c2ee4fd27c552f3ebfd8ccaccdf26ce43686e5c4c11801fd06b4e58fbd"
+  },
+  {
+    "public": "b9d727f412851721e31f614816df3fe6edceed547479221646b2c5757868152b",
+    "secret": "83e5410bc0416e134810d24a243d213c8cd92de14027774df52a70a7ee7bdbd2"
+  },
+  {
+    "public": "70ebd9e8b827619207df4dd9fdc0f01b5e691df4675e09cbf2acb36f7bffb17d",
+    "secret": "927b2190e69e181545fda5606175b01653b0cdfa6237f7592b8289d3021f3820"
+  },
+  {
+    "public": "57bbdb2d7dee0999ea5d743098391e96cc7983a801e814966e4b949c5fcec455",
+    "secret": "5e25e6fcdbbc92f41167a574a4f75bf44e3111d01815f810bd1b6a20f7e8f1d0"
+  },
+  {
+    "public": "8d7cea0f0ab63fc0f6be354c305bb7448baf5f5037a0ce00e3ffd785131e2839",
+    "secret": "09647b21eceb7d83b67ef8748176d2a5ef3ce95de331aa73bfdd691571834608"
+  },
+  {
+    "public": "a287de77e069e222a3841dfe71711a2535939e62b1b27f70a5b45a0a3fa3ec69",
+    "secret": "4339beae000fb7283f94d4321213d1526d791985fe2c466f3ad55463915f6ec4"
+  },
+  {
+    "public": "855748f871778910b3086358acd24933fe63cb1317518fd8d69c46ce4bfeab4d",
+    "secret": "14141d5e085e64d2591b49ecc9b025a854bd6aa129a69d9859a3a923e77b5222"
+  },
+  {
+    "public": "9d6417f45af03d422345f1e325e5a0b7082ddd7e01baaabab9dba40f357ed210",
+    "secret": "34651ff9c9b965d34765c5f63a42caff1ca8996b0bed534514f61a9b89e19f44"
+  },
+  {
+    "public": "7eed3386950ae1576bbcb8212a4a3e06d0bff27ac18a53f98679f7845d96a524",
+    "secret": "27616f9a7b5bf9f708eb68f2aeb0a4f526cc19690e383cc6bd7a984c86fc483a"
+  },
+  {
+    "public": "1235e3b2333756341047dd619266118184195429b63ae22bc11b44df43b39400",
+    "secret": "f748209bd72275bc14e07b6a6cde7aeca7d716e0c52f65aaa029ebe6e8b71f6f"
+  },
+  {
+    "public": "73d04aad12479ee79a0c80be62c9b305bae9f2cf6f64eb0711964a985b44ec54",
+    "secret": "65b41595baf7952650ffd631bc7fedf27bd7df2212be42a07953b98dff646ee5"
+  },
+  {
+    "public": "40881125518dd9ec9c57c238baa168eaee4f7bdb4ae29732ab50adb87c1cd72e",
+    "secret": "9c5e81766bdeae41d1c0376461069bfa4b4ee93bd72b8cfef3088cb67dc460ef"
+  },
+  {
+    "public": "eaf8f42f98cbd3d1f93f6e772754c20bc6a7f0b85b317fc3418bc772da98d37a",
+    "secret": "9d15236267f9614b03a6a6cf3e7447fcf9de7a645285f56daa348e0fc10894f7"
+  },
+  {
+    "public": "621d8c9a3ac7c2313d0529d1fd55e3a98d5827b74ee22295a48d4cbb59c17a0a",
+    "secret": "35d5815a0a8dab2c3aa3fa83e68d7f626135ddb0c94e96af98432145373f5b11"
+  },
+  {
+    "public": "f95e915fd3bda2cc4c1d51cbbc5a05b6f304e282ec936e4ed8f4e17f3905c87e",
+    "secret": "177040b621b4ffc60bccb5aa4d4e5501b2d3a55cdd80cc5d64b93ca7a83db3e2"
+  },
+  {
+    "public": "6775f6c7985768c2ec722e816e1d9ff195aa41dfefeca2ea6f604addcbb8c726",
+    "secret": "06dec3c72a18b48a8a5617d030461009cfca45d5b8670dd1baf8c429aaa2c81e"
+  },
+  {
+    "public": "fc44ce8adaea08e06cb18791f686498910068f1efbaf71e7aa396d68ff0abc28",
+    "secret": "f1ca54696e925e0073523550a2198a49d81590df0aa5778ced19e486295289f1"
+  },
+  {
+    "public": "06ba36aa46827cf5aeeea0bf56e2e9e04d76248b0b33b5b72077ee1c36f7ba14",
+    "secret": "fcc53eaa920eda73d6d1c813022fc30ee472b3dc5ab2c0051e8866cb95dfc079"
+  },
+  {
+    "public": "86aef10342ed1e14b2fcc72c93866c6ad4d0424da9a83172b6c308b33116c07f",
+    "secret": "13fea5d1989ae32701d1dd27090ab2c5647ee9ca38f15d846fcc33391566d58f"
+  },
+  {
+    "public": "5d3aac592d5cd50d43fa263884704e2f2997f4d9e68bb597937fd243b716584e",
+    "secret": "4ef59312e76e1cc2923685c1c8b0dff7de5ea40f030cd03517286f1e22227935"
+  },
+  {
+    "public": "7b8392f148dd47623c4ecb9dd4685a105f282986735b4ea615b75ea19182c611",
+    "secret": "9681fa6951c9fec62b285eab591cee02e5c865d08e24f67c9ef72cf0c1e4421b"
+  },
+  {
+    "public": "e00624b93e378541d897b78c4331cde253986dc6e39a5c1b8d8574e89e055114",
+    "secret": "25aea5401695276d6e38dde3fb550e7f73120e4dc2dbc055bbe92487ce95fb13"
+  },
+  {
+    "public": "077fc3c568eb72dac6067ffd5806b6dffe34e580e07a754cc2e763c0d347270a",
+    "secret": "440cf93ccf20294225337611a11552558c10c4db14d9bb2945d3c75ebbba76b0"
+  },
+  {
+    "public": "7c7f46b58497c86edcfd39c6882445f6c827cfaade35b1ebe38fb75fdffdd046",
+    "secret": "ba07fb49a777788a62f16d3a1fad293d61301735498f4a73524a1e180cb5ec6a"
+  },
+  {
+    "public": "7c5a5d8e114ad5bed1618791ca5b22d93f872cee234c0c74e5dbbca0ca84650e",
+    "secret": "d952957ffdabbeb6253693291c47f72778785f17aa91cf9d464a3652da48a5fd"
+  },
+  {
+    "public": "b6360d66f4cb38903224fcb1cd0426dee32ac6c5eff3c677008a3f806c834c38",
+    "secret": "e7717faa9d3ce741cc3b2a145967b13be9edd66b61fde14e306a035755ddd076"
+  },
+  {
+    "public": "144bb206422fb10dcccffbf056e7285549055d7c0953faeb84b11690cff56274",
+    "secret": "73671261e735aa33f884d5c437e736f468fef0252d24e2c36cf26764da01a595"
+  },
+  {
+    "public": "37352d82aa24aee2f5637fd4defa9ebae87641c928e6bad3e16327c3c761b55f",
+    "secret": "8dc3e677569c8d0b071b7e583c2d0f0a5e2db379d630c27bdea65cff6f42cf29"
+  },
+  {
+    "public": "60309e7715dbe13b9fa25786911db79375597029fca24ef3f433cea450fa292a",
+    "secret": "dbd3bd2482be6ba69a9a345b576be08ac8462c01894478798970f8179604a1d9"
+  },
+  {
+    "public": "2f61a13cec9ce5f7e6aec3fc840bee39f438f4cc48ffc0b9db661d4086cb073a",
+    "secret": "b3a425442e99aa622f12bae44afb6a3cb8671613a5a6385e891dcf9f3bd95f66"
+  },
+  {
+    "public": "d5d5b9b3d64506f08f74ff741f521aa8e05e1d5c22b31f122b1eeb6020a44222",
+    "secret": "e11063fa7c740e6eb4430245e6d52700cb3029a0212b6b93aaf93bc908396ab1"
+  },
+  {
+    "public": "ee8735cb13f42a2fdd99c647e6d90c51211c06f6ae64793eddad67bd0f8c0322",
+    "secret": "f6681d46a6239978562e3e9b7c794f17ca87fbe31f80bf855e7c8a9fc0fbee2b"
+  },
+  {
+    "public": "b05bf971722ada9345b8108abc2b32e2ebd63558f2c375161a38f82658f95503",
+    "secret": "b8ae4de15ab23b467cd839bff0f3da8580dbfefbea534205085d50d7e12709b4"
+  },
+  {
+    "public": "d136bf21b6ce288dbb86b7ddddcf3a9ade093466f2a4f71620049840d22d7552",
+    "secret": "d5ea08ddd3b332a1f6c702d2d5aa25710fee1000f00a220d0b4ce5fcaac8ee25"
+  },
+  {
+    "public": "13888549083b332860888441f98ee5a8a65814ffaa7c30784c8206d743cb713c",
+    "secret": "bc823320946b4c507948249b4ac16b21cce121ce812ad51e131be91380c0c7c9"
+  },
+  {
+    "public": "4265d75743837a5b1e5f0c773ba82cdd0937aab39803c0e4374411cc921f4a44",
+    "secret": "8066428e1789edba02a8b4322f8af310313fc222176b12663e615d96bcab0472"
+  },
+  {
+    "public": "6c2711b6cbed33ee3323c7cde0ed30b2e9493a3468da4bd5018083c18390b40d",
+    "secret": "6b9dfa924b93df1c90f8ee52877552f6f0b60359dc1d9ac6cfa778c31d431ae3"
+  },
+  {
+    "public": "6a6f0bd1c60db7bff73744a1214e77cba95f7ab651673016cbb2124e9ee71b0a",
+    "secret": "ef6464b359b31c511b12d58d13969758fa4f0b2382860e93e8d2f82b152f0fec"
+  },
+  {
+    "public": "d57c72bf91228167bcded2e7ab20948f923815ae07c3b51ee0dd63f21392fd49",
+    "secret": "fda528da59a45ec48bdb6de1172a320c756bd8d8be1902c383d7f6977b6c9c8d"
+  },
+  {
+    "public": "804aa4d46d3c910069ebeb86ce8b535aed43b9dbf70a04cc0285c9c1f613f827",
+    "secret": "cb6ab59edca42fd9dfdb140a9ce346bef738142d2e7c09dfac0426ff0b7443e6"
+  },
+  {
+    "public": "04ceae37c29b70b10924e9cf541dadde24671a7a5094d0905e2883312ace6d3e",
+    "secret": "769df69b8da603d3ae75cda76d5b6b0d04b71f0415caa9742e5e8803540386ea"
+  },
+  {
+    "public": "6d1a6d6b626a513466c38f269a6285eab5e69feca09e1cfd3bb2d8244ba7c834",
+    "secret": "7dd9d9d2ec18ad181c28d161f75a38ac1c219427689d0fb512b0e55de71ddb2e"
+  },
+  {
+    "public": "a5f7d1bcaa7e336c6907cfff05d979374ff8deafe9587fda55950017d5acbd3e",
+    "secret": "b0b9d1cfcd08fd5780549c18caaa8ce3f2817912103e196038a561d921035562"
+  },
+  {
+    "public": "fda4d2451ce631121677efc088a0540655f1ce15d3d9d9910a9a0197ad20b538",
+    "secret": "0c7747cb369389baddc5b83a4a277b7afbe25083c5d25cdce7b8d2f9f0aea114"
+  },
+  {
+    "public": "589f85095f3273b1de05db1e00c53d2a34c47b57533c6f89657ee90ba8a8d478",
+    "secret": "fd9c1f185348a862c07da47d0c5aca5dceaa4c81bf4ffc7487800f2e12bde71c"
+  },
+  {
+    "public": "15aa7cef57863b0245069f553893cee448ec9b61a25c4a563cb28b36b239ce52",
+    "secret": "2bfa956b219b4a9ab578089509eda1168f2196f02f7a7760bd6e519a21cdbc26"
+  },
+  {
+    "public": "147255923e1a1982b73ddf032d8d51ba484f7653249df47510ef2f001cf99e42",
+    "secret": "68e9ea014fb450a6d81a7eb7ba43f309253861a61097dae59247ff608d9a7305"
+  },
+  {
+    "public": "6e21a15e1a9fa04504e02a2111e0d8f0d2fd4ad3f8a0bd3606dddcebd2969b79",
+    "secret": "26f26a0a0c0b573afa0e77f1413f805f5825d9a3c730abc7597569f9da311f9e"
+  },
+  {
+    "public": "7734cbd1d586bc77e867eb14b219f63974e9724b8ac37818c2d17add5603f83a",
+    "secret": "998bb150fb14d68ddc6e2c9467b8141b08ca1bb59a7a184052bc5d737c69b648"
+  },
+  {
+    "public": "3413300f46d28a7fd6492fef510a18df6ed6031346ac41c8250766c6d0544136",
+    "secret": "e3dd37744d595596f03204295682b73fcd24096d6c0832543407443b9f7337ae"
+  },
+  {
+    "public": "6cdcb0b4d73ec666845899e8500f4bb25795e2657abee79c434c8d3b8628cc01",
+    "secret": "6cb3d041b8978b878da9ecea6bf6b680272e292a1f9ec4f2f210bc68389ab104"
+  },
+  {
+    "public": "12db7f8c5c6db8c77d7b5682430d3d06a6e739b58b6e45e34639758d89276700",
+    "secret": "93784879b17b1184c65dd918dd06aae9cfcdd047e509e70b7749f9e11121d5c4"
+  },
+  {
+    "public": "69245c5247282b7845d6dd7c6841beb8136efb58a4b5891dc2d5641977a4ee68",
+    "secret": "19ebbc890d8601d2e7e0a044da4b03a13834ed4fed419c621004ebd4b3afcb85"
+  },
+  {
+    "public": "aeb014810c0f1bcc438f5a1169504e8935feca342f9dc8b5cba9c3884917a220",
+    "secret": "cbf28cc8663de65ea78e56af5f1353c25e77175b338059d814ee6591321afe38"
+  },
+  {
+    "public": "56975e687bce30b4417bcb0724cbdd345bf5f44140035ac55a7e8d25b1ed8e55",
+    "secret": "70caca8fa29c031c7784b5674cf09d330543392083b20bc6304cfc8f2743a16a"
+  },
+  {
+    "public": "54be305e1fda37224a58a5301fb04594e09adf1f4824121a170ea947ac5d9c05",
+    "secret": "4fb076d283c04f9a6e6d19aab3cefeffe7edca3556db179befa162ad36b9f043"
+  },
+  {
+    "public": "942caa62a801f1ffe906b994be8b186438133506069dcb70365d7b9812feaa26",
+    "secret": "5d9b1a1c1e468a881df1cb0754306821754963ca57abfaefc63d618bcbf03b0d"
+  },
+  {
+    "public": "bc3fd42006effeb4d66a6f15c403faba0ea5ef7090051badd7859d8bb0477f01",
+    "secret": "543e94729d0ca5085b4c25e1c760962fa81b5316d3d674f5108e3c85fc7d5489"
+  },
+  {
+    "public": "a80d0830960bc33e7ea8ae8239e5df686b6528b4628e21af8477e44453cc0a52",
+    "secret": "b3201630e31dc7ad5ba73017b0dc4171296fe72e4016e95c81853f775ae8bf9f"
+  },
+  {
+    "public": "f5f5cb181f046ea4c17ecd1b5eda992318a7194b3560bece88bb2de12d78a863",
+    "secret": "e6643b1f08f9287e91edc2b4c010a19f278cedb9aa127d9873c56859484962bf"
+  },
+  {
+    "public": "60eb4e500825774aff861e8d1ade23130a20e18246e2d6c443d987fddd272f31",
+    "secret": "f487bb3c271c48e9600538f7048ae95406efac16dd622669008ca91e741a7595"
+  },
+  {
+    "public": "5e7db7913618ab264e6e84604f77876ee5b54ed35cc5926a826773410a155f2b",
+    "secret": "bd544b317920e18a73ab7652684b57dad813da598a8c4d5429452e372f423b62"
+  },
+  {
+    "public": "5514e5e9bcfba7116cd4aa5b47c5071f29f0292915ef8da2c7020f353741221c",
+    "secret": "9334d4e82d6bd8fee304aa0543337e371beb0e36e6f2bd76a0f900f9c540765a"
+  },
+  {
+    "public": "dd2084da1ac4d31bd2aabc354544bf20364e597af5a9540f1b23302d8bed2d45",
+    "secret": "3d4bd068f26ac5156b9ce740c39b7e08641c32aac54a3532aea001cbb38acd49"
+  },
+  {
+    "public": "45e854af2994cf247cc8b60c6280d4f13c08f64217e028afa464883c57876650",
+    "secret": "9474425fb983085b9f437dfbc0af3c1714be0e41165d3120cb527bafed55c42d"
+  },
+  {
+    "public": "e860439e3e9084309857c6f3256cb320f004fd94d36ea39a5e3311514d108850",
+    "secret": "d560d0c796e682e61de7ee1d368a09956258041fad7d6c7dd6bb2688f19ba2e4"
+  },
+  {
+    "public": "9eeed3fe087ab3d3261d75a6cd82155ea1b63e9dc244fd7bc00e37de49e4a840",
+    "secret": "3e9f65e499ec39b91a68407e932c88280351c9c81861caa04d6688783333d5c2"
+  },
+  {
+    "public": "0ce81007dcefb2ed31954079b6eed84a273cd7d3f4b02be7dd2f4cf4356d4103",
+    "secret": "da41504e4dc1782cfe9e34a7c7f2c49b99f397ce182b0a4fd71cf7c295c1f474"
+  },
+  {
+    "public": "fa961ebfe7558c40a574338020be7891d7cd49a508d5fc69db694ebaf7148c6c",
+    "secret": "6692d3e6f708db945ab4f72c853416355e0a5738db8b59c89f402d3119414c3a"
+  },
+  {
+    "public": "241130a3eed3a7fdad6669716c84ee2e7a2047438ad6307930de3e5e96b92461",
+    "secret": "3ae9ced7b9529e8c6072be5caeee1f4110c1f30dcb1bb879a27639c8890fee73"
+  },
+  {
+    "public": "1d6e45f2a4fdfb3dae3d9acdafb2e591b693bfdfe4f58af46dadd822c7214924",
+    "secret": "386f99bacb84e2e5b460e5e49a02cff64053ccb4db3763bca3b78e8d45974790"
+  },
+  {
+    "public": "d1e1e13c7c71b33a525f8b37382b86c238a21cc8a02fe0bfa20b007be35f085a",
+    "secret": "5f20aa8e513eb3145f7d535f06a9b77ab2a8589e601fd556e772512f2823a8e9"
+  },
+  {
+    "public": "fc239a4ba46c68778dc874be3fa9e4fb54c340917528bf8585fc17af1b414c7a",
+    "secret": "1ab804f852495f5a1bcadf709a5cb9336e665e5f753afe51c05053681ebe46b7"
+  },
+  {
+    "public": "2c4e0874bbe36a11c45a2a7246fb15e8c95e085bf5590df560fb883ed5f34432",
+    "secret": "a83da2d8c0389b7c2c1191c57a802ec5b2f9677327148f1c03cbbfbbb8518d93"
+  },
+  {
+    "public": "c69204da6cea251e49a971e3794a7224ba66881ff20e07790c960b7cf8f99659",
+    "secret": "fb29b177210a02aa0ed2dba630371c971171e97d3377c9a1824466ee0c913fc5"
+  },
+  {
+    "public": "f06a73a35def28d22a1da371b6fab270dc747b29b0ecaa02a6b3b74113c6872d",
+    "secret": "9db5c9e0fe6216f1202534cb28c93a77db6e210a55f023d1fdb8dca3550d9c6f"
+  },
+  {
+    "public": "ea6461069da077c33a9fde81f1460ab3e9827fbd718b737d7ff18ed216d2094f",
+    "secret": "4ad71da558e79c3e4073bd8c54a6e0d14715f9fe85a591dc53f4304cf87e6e67"
+  },
+  {
+    "public": "006e26532f7785cab6a74c3fe93570e158282dccf7fb1a7468d9c66b686f5f54",
+    "secret": "ecd7c60c25dcf6e90bd85d08b4549874c530286f2a6c5c5275444e663de5dea2"
+  },
+  {
+    "public": "32c43164e1f1539f3b085a18deae0508d628cc578666cf9ef5952ad54aea1f5b",
+    "secret": "ac40bd5d5db20f54890bc8471c73aa6f969c210e08acdca317bf401d52641fb7"
+  },
+  {
+    "public": "55c2e656b6cdb4e023c1e298a09add41993dd2f88a70e98d586da9f0fa58ab47",
+    "secret": "05f2c35758acb44072eac62935ebcd6671716eca52b7c3b6ec776588c3c545cd"
+  },
+  {
+    "public": "8c365d2bc5ad8d2747c95cde82e662b4e3061b1c05c5b89308fb37d7a34a3217",
+    "secret": "5cbbf9eb991b81aa9ed94ea1993da93cdad786891955609188507e82d1cb40c4"
+  },
+  {
+    "public": "fb3493a292e45107df55a848cf47ea44f36342c4716700f0d48afba906965272",
+    "secret": "44b743c79839434987f4e2f92796cbec499de5764671ee2f9557d19267de30fe"
+  },
+  {
+    "public": "41569f7142dba53949e99a8ec51a09bd50fb8e37a34e2dee0aa8755659c5da5a",
+    "secret": "7498f97e5ad531056ad0f30be9c989c59d9da670a77ebdbcbab48f19248dc65c"
+  },
+  {
+    "public": "4bef3f7a31d21488f27efc67de130e3eb6c67ae96743b8bf80283fa599661318",
+    "secret": "01f0954a3c2b94c37e8715ef7e42d65340afe5633b3dcae729674798684e8f80"
+  },
+  {
+    "public": "e23769c2aede700f41d0c04922aa91b64b6280ed8aeb73c2c85ce9f3759fbc18",
+    "secret": "59d1318513703241a921dd1923a74d1864845ef3fac585c85228b475a45d1a5d"
+  },
+  {
+    "public": "c9b264dfa0e4f7e0fc20744d881267dd76d7dc118c600cec152aa2cd9d73594c",
+    "secret": "99edc62de7d9b4d979a33165d85e0787af48a5840481031869f40bce2527db84"
+  },
+  {
+    "public": "73f5aab6e4345bc67a32f1fdee50227c9a6ae0d1c506b845adb6c99042f3b64d",
+    "secret": "17a780c8099ceb98d50304dfa9381c7c27a1619236e8c6caab18c4a3004213e7"
+  },
+  {
+    "public": "64a3405b0d6af938271fefe89b1fa8ec24bf416eb3deb0dd9b7287bff9773e16",
+    "secret": "6e8bf7080a46adba9908d0f1b38e2bc2f17d6b95c5e392c7df53458f81abe6e6"
+  },
+  {
+    "public": "03fdb6d182903a68616f54342a39654717f078091613e9498f301268193e0a68",
+    "secret": "c320836d137c77b46442f90fcc6b493c00460c4fc380f384772f8de65b92b943"
+  },
+  {
+    "public": "21dca878a554dc6e27d9c9d39dccb6182dc89e9be3cbecf49701890da733af7c",
+    "secret": "52047454477994c320b17a4400c284f17aaba88029b942620c22ff4da9476a49"
+  },
+  {
+    "public": "042c0e805d7cc5cfaf959d8d68912715d4a06a4b975fa0d514348f81ccdcff67",
+    "secret": "5ae57e19a9274df2d69144a4b30bcd9e4244c8082057fcf67ea229d0c8caf75f"
+  },
+  {
+    "public": "a9122043318310e035f6aadc5d973f88107fa9178742ac6174691055931ff746",
+    "secret": "545a481334aa8814509c5c5eea83496aa1ec5a0f33257a1b0b30697431bfbecb"
+  },
+  {
+    "public": "6fc1619d2f950668e4f9326710f52363d09812e5acc89f002ac6e54a52243f13",
+    "secret": "e2f51c22ba8a50149286459c0884448d03e52cd00f448604b1e08ae0aba6790a"
+  },
+  {
+    "public": "acd15029368b32d118037f232a7e9a916d1c3bcd27a61f4cae7b3f7744ace571",
+    "secret": "6ffeafce4e6c453f6c15972f15b1ba2f1868b429b2372fafd48af32701eaf5b5"
+  },
+  {
+    "public": "5b3bcb49938b08872b9232e2257038d3e408201663ac284dcd3277a0f9290c5e",
+    "secret": "18e4ac7eab66ef92f604c839374d7ce1b0cef7722954d9455e735a69c0062348"
+  },
+  {
+    "public": "bbb5a0b5bd3ccd5f778730c5b680a9c0e8a2ee6528357b8cd36a4f6af3d19d04",
+    "secret": "f4fa6c58de0f0df421ad52fd171b966a2c26d258552a425c1c97b9fdb5c3073a"
+  },
+  {
+    "public": "8e44e590910df387d324684e0d8fae291e6b9ef85d6954b70dbcb3745890b160",
+    "secret": "12e7d34ebf29a60b0424be890a748b7611f226751062af79321c0fcf53e48178"
+  },
+  {
+    "public": "9b9619d756cbcd3afa8f369006b7646995ca35f77951268e8320b5ae14b2037a",
+    "secret": "3d2c9f37b8ad1de44a5fada4c872d56c4e73a67eb1dc5076d52e1ac2b68882ad"
+  },
+  {
+    "public": "5c30e2ef7b8fe46f5f8e2a0d1c5fa6563549fbd0846c4fd7c38b001bb62b535e",
+    "secret": "39cf0a6340d17a00767e3eafc44ac195fce1f6d8e6d8d7fd237c17f41e3b9bfd"
+  },
+  {
+    "public": "b51ac8562328c85a52fa20de7de6473fd5e5228e7cee8e466bf32dbe9c13647f",
+    "secret": "5d904793db3db3b4f56f61e1bf33aa99dc0f72e4edad40e35a867f0f7323b50b"
+  },
+  {
+    "public": "46b906a54f357d0a5c74a29e52be99eb980be9aad69c1542aa5d755a29e0ed5a",
+    "secret": "dc21e747658180205df09b53d7dfdf879771f3c9ef170d0bed2737b0e55d4ad6"
+  },
+  {
+    "public": "b653af87351e38a1ce4c58086e77aedf3c804ab1cd023c7d4b1d923011eede7c",
+    "secret": "ff4a000a18004271777d589422019d9d23778f3cbedc571a4d3af7eb9fa5c11a"
+  },
+  {
+    "public": "256c147671512c27369979d034b0cb9687e3532df253bf76d74f7133df9d6174",
+    "secret": "50cb6583cc112ae4fa210d4b0522711dccf16690bffcb0e9541b132fb8c5b8a7"
+  },
+  {
+    "public": "513906968b1002d2e64a82298c577a9c70fada420b87ed3599c93b25c2c22403",
+    "secret": "97b83bf153af4a0f435e2abe8684f379db34aba4be888f90ded9024eeb10ffbf"
+  },
+  {
+    "public": "db785ffd57270c22604cd943bb890b8c82f43e915db0befe98cd81c42df5135c",
+    "secret": "61455e486ccf1f3c40be2567f94f5dedc16922d1a760644baf2c371007418b41"
+  },
+  {
+    "public": "d8ad195616c5e825c4a2e3604c6e5acaca2137b4b51e05800edd9ab02c56fa73",
+    "secret": "8147d2e374cbb7e2f6fd35f4e6fb9a0b68ad79a1435d54dfcada5d56bf8dbe60"
+  },
+  {
+    "public": "88d7d389b6e05bea5255a7fb9ff2c3c26a9331563445a380e7f4216dea4c6260",
+    "secret": "07e98119bd6f7fa7ae2332e3533848c405925b8fe41c0878eede6c8f56f37752"
+  },
+  {
+    "public": "e91fbc64f4fcbd92ee01505e9be7d03364cb29f4f55b0a7d3ac105f451eb8d1c",
+    "secret": "9e0190fa55c6c9ef8bc83adc8241d1f6b8ebeec2d823239db46191d4131b7310"
+  },
+  {
+    "public": "ec44b62974b5f4ca0e2639423f008584dc0d662fb7ddebdf75e8f5a4e7eb2336",
+    "secret": "8fcd65341d62e0ee00f403715bc191b0ae55df7fd16c8db371088ee715c1ca3d"
+  },
+  {
+    "public": "b62d9236922b3083ac6b1fbf82e56378969f29c01c4369d5029a987c6bfc1811",
+    "secret": "285a74af5cd7ed5b06f7de50e7b5e07bddedfdb59a3771c966d4d6e3eaa54f21"
+  },
+  {
+    "public": "952350b6349d34990da4bd988afb47a1963c50685b0d66732c39e98ae169ba45",
+    "secret": "7ef3a3669f7a7cbc3f9c024710700aeab9ede21107ebc34199ae64377707835e"
+  },
+  {
+    "public": "c5c377d03b2ebe3134c2e2ac8a7250794f37a232f7f309e65daee8c1b9a2f734",
+    "secret": "a1bb4132f6bb7c86bab0780fb9f82b1fc80e8ab9b67eca387e9c76304940f557"
+  },
+  {
+    "public": "afdc9e47b50ffde40e0614291acf3ca59e548ebe5183448444f9b77661a1f32a",
+    "secret": "e279d2043d1ef090f05f60a9a5556a513d52e48a7aa7ea89bf8fe85ed986924a"
+  },
+  {
+    "public": "0164ff434ecad8ed5c2beaba9ce4c610c895b1ce54fc8293a954a0817407e109",
+    "secret": "8fc46f49ead6b7675f5f4018610b142957426b9f8f4ac9043d8216504546ca11"
+  },
+  {
+    "public": "17c05bb31a287d5cbb3b4c95c879bceacdf39152eee303f745bbcbc5ae1a1240",
+    "secret": "aa88473b318d1fc49037f2ef9cc9dbcc3dd18e545555c9c3349deebcdb54cdca"
+  },
+  {
+    "public": "2e725a8d05e1229b37efae480de4fba6191348fff88f98bcecb9c8dfda1ec81c",
+    "secret": "a7ec0952a486288276909bb235ae789e477437d32b70325b8db40f8f74e699c2"
+  },
+  {
+    "public": "5e9962807d967df7758f6bf1bc10edecf209927a203b98bfbc6087eebff99f1b",
+    "secret": "0d3becbcdf96933948f59f33395bc1012fe699cf1c7f98cd596d5ffd3ba3dc0e"
+  },
+  {
+    "public": "d89e97d6ee033b3272e25267ad552ef56c7b6745c734b15d6d1d7141701ad243",
+    "secret": "93bf0780ccd4714338b0cadeaf8d241fdc3acd9f346bf67ae58a7088c647ca88"
+  },
+  {
+    "public": "3718e5b8178d00e829f9d4fc9f9798a3eeff9d151c01c35bc3f49b81f7184265",
+    "secret": "4a7d9ccdd6de04ca37add1671630a438f5c06a14350cb5254ee93e5d6a76b551"
+  },
+  {
+    "public": "3668eab4ae67487312809487799be727363f0b685727c1c1f7fee315470fb778",
+    "secret": "9a4edd4171ddc2cd22f40992888fad9afa5b5eace9c0203cc191c7664a9a4571"
+  },
+  {
+    "public": "a73a9fb6fdcb788c30d14948b46420764e848b2a997989f5a4733649ff505677",
+    "secret": "e49d821d0f021fad289626bb88016d399af174e953ccce281c92504750ecf2ab"
+  },
+  {
+    "public": "59c39a45ba768fd47ad8d174b4e05c6e92379174bb18bd0b40d35d63818dda63",
+    "secret": "7943c5a4cc161198ce51e013c172971f981c16744ad2fc464f2637480b821e85"
+  },
+  {
+    "public": "aa0a94f992214a680f8b9b36796f32c29e788f45ec8dd8512155a2c0f304b926",
+    "secret": "49db0b7eac043592b6392b4db91e1cebfbce4cfc875d031a9666a5d309f3991a"
+  },
+  {
+    "public": "7bc1c24a2ba6c58b9186495ecb63c6400a86be099f379fb73b4bd9ce47636458",
+    "secret": "cdbf0e871d56f5ba22a8dad7d9b6b71a76ae537fafc07c2366c72a7a3949f2f6"
+  },
+  {
+    "public": "bb206715c5000425a202490adf30401d9d6bc4786b5ca3bdc69edce3cae74b5a",
+    "secret": "fbab6a6477e250d1eedeb7903af503a125f5d9e1ae1aa9dc1d9dde2793641ab3"
+  },
+  {
+    "public": "443cc2a2f9cc6107fb22f416fe7cfcc952c3a6dc9d08c1c81ae7615eb9ab5872",
+    "secret": "208cb7c796debcb14b1c3487e0a9ba6cb842850069ef13d735c627359e651dde"
+  },
+  {
+    "public": "a82ef97f2ec0489309e830070f7ce16b2df30237ce5eb6dce080eb3cad64f258",
+    "secret": "5fa525280d766b6a46464dfe5e905af3cbc2c2da323fb24fafe85604e4ddd2a2"
+  },
+  {
+    "public": "adf84eac414fbb87cfadf7cefad334a0ba370fe1ce73c5f8abda29ec1ce29f2c",
+    "secret": "68261af16d221e2eab1b46cb9894d23cdc3540d8a958e64521d246e1d8766ee7"
+  },
+  {
+    "public": "b58f8c4221db669518e849be76ebea6d2b6827918d365cb6be30fbb2c8bc762f",
+    "secret": "07169d161bb5695fe11edbcc86e9f1e07385908230bc9e8a8f7029963be5f445"
+  },
+  {
+    "public": "87983f5574fd51d9159fe3dcc16d12a90686f6eda4a69a48f72660d71a436455",
+    "secret": "670861eba4e12707984378081c62c50b79e98b1c322ce11835d274abb0a19103"
+  },
+  {
+    "public": "337c86409a95ff937dadec8aea07387933a399242e3fd2af3f4698dc68716c4b",
+    "secret": "d6b783445522a54e9c67535465309f3bcd2717226d26ccb53fcc749812645e88"
+  },
+  {
+    "public": "ed1f185c7dde509650da2406ee5f6f3959f391cd04a48d8d52a733c371f0337e",
+    "secret": "f40fcd14e8c26b07fd45c6493ae70d38deeece672f31ba9c30510bbe41bda71f"
+  },
+  {
+    "public": "fd57a224a89b1a63a6e414e0af940d59d9b9ccd7fc5298c2010d1a7b7b61d06f",
+    "secret": "94d8c086e2f3aacd18a895e18718b489e907e969885e54c828addc92ab04deb3"
+  },
+  {
+    "public": "d5d75fbe46e6f169992ade9f36e6362cadb2e57eb8efd8ee7d1d1531a12af703",
+    "secret": "e15a5593b1187da516162d294fe9bead3a519c7f5b2616c5208f60a5f8308f88"
+  },
+  {
+    "public": "1d90f6af69473c19cb9c4515c88dafe5f104acdcb8d62105c885bf32070eb133",
+    "secret": "e97e4a7a86be0a40861ec76ac8ae7ba4e0a90e53fa4cedf3d8c860b67905897f"
+  },
+  {
+    "public": "5842d29ee6a9f752bc0b5bdf7b614d65c5839b99dd20e532d7311addf75ce769",
+    "secret": "4941852b877820239d3899629ac728aa218ec2bf4a82cde477462381541ba134"
+  },
+  {
+    "public": "4b153687e29978f67ccf00c5f97f72de79c2c21a111be8e2f4e8d1e0461afd40",
+    "secret": "3061e7ead725f74ef42e286372eb06af700942d4a9b28f9faddbe438e48c39f6"
+  },
+  {
+    "public": "5431a01e0b625d9ac8a607919d286e2ff7b91627bbd94f591d4fb291459d2b72",
+    "secret": "3f13ff8ba6e19ef59bec324547dd2fac32ec73782ef1768eeab13822c4fc9f2f"
+  },
+  {
+    "public": "b6428323816d31873ec8d36d043d86f4bcd987e9f848a2014c360f9f60fe604e",
+    "secret": "b0c26c2ea1dd78368ca104f0c83d23293128e866900312f95339cf00425c6c6e"
+  },
+  {
+    "public": "f2f5427d404ec59790f4f254f773fffc84fc1073887faad0b8aaa624219b1d2c",
+    "secret": "d9b6992800e4ef14281c8f53fefb813028ba4a7e69a6f9a5afe468fbd206b7d4"
+  },
+  {
+    "public": "fa93bc82ade9dd90c45a27f4954a82914767d9a01625c140530ed0183805487a",
+    "secret": "73139ab0e5dede0cb93776c5e0cb9c5b2f15d92dc5d6ea068e8d5a13f1a17d3a"
+  },
+  {
+    "public": "51405ccac428d954ea9e0b61e924b54ed40c1519df1e21f205f65565c0550366",
+    "secret": "d192b23eb8cf49a02533935fdab6bee4aedff2e8f216d26aeb238569ef3fc20c"
+  },
+  {
+    "public": "dd24eab8c5e73ae9f3dc014baa9f078c11fa4fcb8cad695df54f6dacd42b8a6e",
+    "secret": "3ae90e576577db68926c6afae1a1cced00eb7df41bd916f245ad0fc8751d9015"
+  },
+  {
+    "public": "4efca589d1ea7a5222710bdfb9415ffc9b79be741a40681db47774fc7d3f9169",
+    "secret": "9c5b9c3bc4671763a005c6ffe2720eec9c90dab24d1e9ba9c2651ffdf152a11d"
+  },
+  {
+    "public": "2f9808bdde54bfe18f3916634890d2ca24a26abadcef024c3c0db6d5d70d513a",
+    "secret": "476e50f2f5938a878226d6399ee1c7cf99177bb1b5e92da27f890d32df05107e"
+  },
+  {
+    "public": "60e264ad2832ef69d29a2c4ae8da92b70e0617587bdb393440156ce25dd58a25",
+    "secret": "77184905738d29784b1f690fa2dec543990c7f95d8ac0d90b725730f58a3034c"
+  },
+  {
+    "public": "f1986d3ea6978424e9a5ad8d3ed90f4fd5f86af3c4c9dbf10c48757c7dccc745",
+    "secret": "45511fc17563ea10e6bc206591a09b085dd4def4bda9a4f3466ae192c3d16dbc"
+  },
+  {
+    "public": "72bfba6808c6c7d1f7f40a461e7d17f2f5f90f5f256d850a8a6ff28a04ec2262",
+    "secret": "c52b6544ec9dfbf3106b2edc72b87646cc6569b0ce687040bb0a88bd90e12a35"
+  },
+  {
+    "public": "906f5a2fcac3e5f3580b68bd748e8040a4c0a0c435a0f8857511146a9d03b355",
+    "secret": "72419c4b8c507a611d934869ceece3216364cb8b86bdb8362bd0e308caf3ab49"
+  },
+  {
+    "public": "9e91a7317669369c336d47e3870f9995a4a4b6d5492bd231f4b16963d6ea275f",
+    "secret": "48c7a65d250af497a7413a845faef1ff1561d0156f634975fc32d925aeb9a7d9"
+  },
+  {
+    "public": "94b965e06279730ef69f6a008af363b504e777c49e0ded42550ba5b1db4dad09",
+    "secret": "d9a2aa66b37f83345ed1d85eb7688a3cdde84af9ca13d61d89fe9d710d6626ee"
+  },
+  {
+    "public": "d9adac287709f3b58613007ec828266647e0754ca786b1edd62964cf351e694e",
+    "secret": "482d57571ebbafcd8419d90a6047e5d2e1db7092d19ee1463ff1490682ccca05"
+  },
+  {
+    "public": "1029e34ef3e8e922910d12ae0082367d55e7cac4b757fa63255f60a5bd769340",
+    "secret": "de0581a8322f28fe56b8b1aca7ddd0d56f1206e4e13f7dd74a9481eb212c6b97"
+  },
+  {
+    "public": "9794fedf8864bd663fde25678be0c7b667b733099f19e10e4239921defd75e18",
+    "secret": "66a748a24b7912b460d392665cc0774c99f164ee8dd66244be4e5e6450f2070f"
+  },
+  {
+    "public": "5c6da8a06ce7862738dea924a18c0091519b45a5c24fc55d73a6c8ea02af0059",
+    "secret": "c3c7d6ea3dbb5edb539336d7f8cfdbf514831571713da64941cb4920a535cc2e"
+  },
+  {
+    "public": "b8870ab38555f283da833ee9de07632f616aa3b9dab8df6267b67a771540b21a",
+    "secret": "1e110ee77cb361edd11fd0269a6e27e1929e57d68c902512062e8602ca8bf9d1"
+  },
+  {
+    "public": "a3c3468537ab8beeb2a136e17a6f809016da0c58533d9826318f56e95003a22d",
+    "secret": "37daebdd73568562cb81b9f30a53eb6ad1c5d6d8c9b1dcb47ae41ef3e084404b"
+  },
+  {
+    "public": "d9fcff74f709d373b84f968ad56a8acc030a937f8b115b9afd7b4c163a30e575",
+    "secret": "84063f7869c726f354104e4dba361bb47ae1284f6118fe2027df396856421dd1"
+  },
+  {
+    "public": "9cb54d794a31b7e250ed2df50093945f0dce5fb1541ff490938a57e28449750b",
+    "secret": "8f9a6531ebd8ff457dd64be69c10387ccf7f0b817456d6e15e6a2cf8a38a7914"
+  },
+  {
+    "public": "7a605856e745fb604b460cdf28e26f0899e37cf63c0a1e961c56e337ef8a504c",
+    "secret": "d0d9c11152fccec8338809115d30733d6ddde853f558ab9ce50548b741ff7bae"
+  },
+  {
+    "public": "05bb3de29cd75663ce49d7e84b5cb7e5f6acfe4d20428ff4e9055d7556b9520f",
+    "secret": "78b9cdbca8e3c9c55f9a17391fdd795dcb28b9b3d7513edc027c9b12c7b63f04"
+  },
+  {
+    "public": "dac1d230e8acd02f42e20a88434145f767a64298fef8ebc13151b121327af20a",
+    "secret": "5a3c8242ade73a8f11133c1ff70c69495fb348871ab017eaf7c7d5733c1709e5"
+  },
+  {
+    "public": "46f640a93512efc604f89d595f7be6c10eaa396ef284daabc898e0301882656b",
+    "secret": "c49b9931f0d9bbba1251716fd9a20b716bfbe9e1a1ef55a95550d7b530d33438"
+  },
+  {
+    "public": "df8325ebbfc599fba6a002fc93571d39e30eea179720e1bf5753dd54387f394e",
+    "secret": "980a2acbf3a9fa462409b7dbfe02eb1683fc0c40d1f3c9f148d30f45880c9024"
+  },
+  {
+    "public": "b7c65c98c3fe5f5f77e8f0ef21917660540a702438302672582a6e6fe2e1521f",
+    "secret": "a4f7c717f710a2a02921abb2b08226a2f475d8511a56bcb1be295e85c733f519"
+  },
+  {
+    "public": "cf12a1381a8a94399feaf3204cdd6e060da2dcc479bd35443c8b57981934423c",
+    "secret": "58bc0630b357bd415304a49fc4d7d80d911765b773c5e8a5335ef47d71e305cb"
+  },
+  {
+    "public": "b91d65ee431aa2028ac1b6d24a138049d6c7e9e6f86c3f0363472b50d5220c05",
+    "secret": "6c5ee9ae9f443968419e3e149f56005f3afe2bba8007ad2c409939693917d430"
+  },
+  {
+    "public": "f2be5b6c277268c2d1a28a892c30eb1cb243e881c19b85d7d0aeac22df9db747",
+    "secret": "e30af0127fa8c8742fa40faa9a17bd942f76cecdd892d5199c2f9032c8b10a61"
+  },
+  {
+    "public": "7d98d6b55413f8fb84bc0b3f97913670c8a8313932570c026d0f1d8d022cb353",
+    "secret": "b2112852f87cfead905aa6386606f7596e5cb94f606373b9e436602a29fa98f4"
+  },
+  {
+    "public": "f5bb951b2532646d7a71e01f6a30871fdbd3be0d70c89fbd71242a6758f86617",
+    "secret": "65454655f6d948611b7da33841943b42c9cd8c5222ad21d8dd9de5ea047f5a8d"
+  },
+  {
+    "public": "19e83555b4e23b389e1678acb9e659fe0bfb4fdb4a9e9120fd18caa4ea3ffc6b",
+    "secret": "8c84005843776c116487681768a8a2d3615747a0a044d38fc463dd0815a49418"
+  },
+  {
+    "public": "3e78938a089f0e58cfd5c40c4bedf9c7500327ac8df4558d56ca6e53bb73cd62",
+    "secret": "4d868e43c6052f78663834503f32a5047fe9cb73a7f86c67aa8e52025214ec03"
+  },
+  {
+    "public": "9b7dccbd2f93d2f234bd47d545e29a6d53c07c44eb500151a27ee1dd7b94e163",
+    "secret": "9f9d1fbaa0ef53d9634611baacc14caac02095b158352dcee6f0e7bd2831ec85"
+  },
+  {
+    "public": "fc95209f25f84abc4bb2fd389e2e007f3e9e6bae8092c203912f132937a5e76f",
+    "secret": "d2a2ef641ef26d612eb389a3347b2d5320e9f95a18737bed9932de73f41ee28e"
+  },
+  {
+    "public": "d7e699c2b49500e9ee1bbe11395ef5d6c9c929ee0b113f7c3e56f8879226c56e",
+    "secret": "c1fecbf17305da7977d401d8d80ce5dac896b262ac406fe88b578fb05437b72c"
+  },
+  {
+    "public": "e3a91c1d3012192ae10c141af64021444b1006c6b7fce45d55fcc815e8e6c210",
+    "secret": "b42abe02a85fe7912c0cf0f28ff04a3e32c17df39cebaa76d3b3b81446fd27a7"
+  },
+  {
+    "public": "380017297e099f40856bda6d44af723ecc67f9c691957913d7b71cfc1de50153",
+    "secret": "6d2f182df7c89e49f51f6a7363f1a95d4b3f582c91229842636e7e5ca242fd1a"
+  },
+  {
+    "public": "2ed1fa1246c0d6c19392d2cbd53b381718229732a08b73491df8f518981c3875",
+    "secret": "36ca45fdd5bfe34d4e72f525da9d11cee58ff1f3bb6f4aba6a32c88bd2091f02"
+  },
+  {
+    "public": "6e7e17e3bb4c9c50e9cc30818f880f0afb6ea4ed70b16ed39203084cccfed250",
+    "secret": "e68e37ecff39d2fa685572142fd465c394836d2f9b6a9f935653df5aa7553f5d"
+  },
+  {
+    "public": "15b82f4a5b4678e6bfc2ceefd663d5a1303425ffdacd3189b153801a75e5ff52",
+    "secret": "e876a8c0ccae06b31213c6c6468e21df58e307e73f3be004ca60d60894076f76"
+  },
+  {
+    "public": "9fbb1be82725e25b2ef5adcc85e1012e67866fe11523110cf269e1227c978378",
+    "secret": "4752c932669a323b0e920357c7aa9e4e41e753a944938e484885ba3a39ec4ed2"
+  },
+  {
+    "public": "33f0d32144def3c968930293c47b0cfb89a9a0e5342c1917c0e8471cdfbe323c",
+    "secret": "dbcc2c6b9872d42b25a47e4e80c850f14c0833df227dd1e98c02779bc1014804"
+  },
+  {
+    "public": "9339a978e8d1493d4bebcc4fe9fdc2789e91656e7d4e1c4142554da3e262d35a",
+    "secret": "b9245ff83f78c0d826c79517870f7f4f3211fe681bc9fa0669ccee9e663a7665"
+  },
+  {
+    "public": "c0c3bf1337fefdf7b379cfd79ad81b9f0adbe2106d3bbfe210e8cb27e98ada40",
+    "secret": "e6fe410ffcec3eb487513823e1d8165f11e4e50cb1a2b82ea78dd2d4352ba054"
+  },
+  {
+    "public": "ea8fa6cf1a5b6960d46ab00c63a3ae868f960640457e06dd38217da66d69b56c",
+    "secret": "91bd5135582279a4fa5e841db3a301589e4c090f1eefcd893d7267748e6c84ea"
+  },
+  {
+    "public": "cc1598d231b4495b770c3e69b009a935ab0df75a37f16dba65f96ffc69100032",
+    "secret": "f0b0b4d68360b86f18bacfed1ab41177ecef22e9a8b5a426d23ccdd653dc2b38"
+  },
+  {
+    "public": "127aa7ea814aef98c7a43c974e5b835b65ce806d7b83761356632c7e08c7ed2d",
+    "secret": "a4eae4b8b1e06ffe9d5d46c8faae741154b16f56ba843e357f18c5c145d145ce"
+  },
+  {
+    "public": "2dbc99e9d736a866f8b00a08264546d0a06810d2c338c98d7e32f4ca5611396f",
+    "secret": "83bfd4e9f89f624b8694a30c69cd52eabac3521b0e87375f744efd579ef0976b"
+  },
+  {
+    "public": "6cb16a4828736b751c4662ac02acf7e66a05145f4ceb93c2be597d87faf7db01",
+    "secret": "acdd322e2eeebe0670253d75c8d6afcb92d3035d5ee76d5400341e6e5bd3b1de"
+  },
+  {
+    "public": "43e1d1ef680f27ea9ab62b7581e7c302610a19578c63e4572b0625014aa6a56f",
+    "secret": "2d0a455bebe733e35f25a801892831862a67a036cd24d0eb825ee18d62723f26"
+  },
+  {
+    "public": "19fec283fdc037e1ea3fe3f0f18c82f4e7dff3afbad282e780604f6a0b3e022e",
+    "secret": "5ba08bfa044b6dfdb82955e01dcba5f87c33882364956f4c8cc62f05848c1b65"
+  },
+  {
+    "public": "8dede7dc25a230f57ba104d2c00a1ad792492b1762a968b3c5b17ebae8eb6a5b",
+    "secret": "25ca3c37e6e054b3735593d157fa050ae9f83e53fccd6aa4d0bce6fff604b105"
+  },
+  {
+    "public": "aded83353b2a45251ce75c38c8e5e0c711c0ddab6e705b1875e3d01b2ce6d750",
+    "secret": "4a4dd68dc6eabef00645825bb65211c2f77f8271beabf0535aa7a054b24d7bed"
+  },
+  {
+    "public": "a7b49cf00150f7f1b94aa54f4687e92ae0b4c1f5a0ef699c1a0733cbc87e013e",
+    "secret": "5269173273c866d1cb1f76bcb92c0d192c86a555da0a7f12dbb3fffe2a2b2922"
+  },
+  {
+    "public": "6f8d4f7f0abc9e6f6294886961a1f142fec8b6bff826bbe036331ae125c94a17",
+    "secret": "6f059622ecc8319a6f2b3bf507b45677baa321a9da92041f2adbd5e3e6e0e1dd"
+  },
+  {
+    "public": "2916c291c0ed597a7dd1e125fdaa06f5785b07a18b5a17af77668829f158657d",
+    "secret": "84a43d4c7d413a5ad762b130308b72ebeecaa72dbd90a02c1c04bc426a4ea469"
+  },
+  {
+    "public": "b07879b955cb2f948eb5af823a59c80ca36900d70f6b902781453bb878451341",
+    "secret": "7321df37797a88a6d9c724420d4befe80883b0225da9a42a03d260aa3eb75d81"
+  },
+  {
+    "public": "972a552fe6c313360b2f4b0990b9e3f499806dec7ba4a27a1d05b898c989bc1a",
+    "secret": "e16bd75ce73db2157c3063df0d3c624f09dc5dc07d07dc667a984526fed344f8"
+  },
+  {
+    "public": "bfc61d1978306a82bd6fb50e186ebf49e1dd61d96d9cf996d8fa288d2514ee02",
+    "secret": "cd02c7bf721f411c8668958e275f335a2b322f851cca93bd0c3e93456dd89234"
+  },
+  {
+    "public": "1dcb2f10db9495a42df898631eaf1f902b1659fc9b9ca6520ba46427c2ff6673",
+    "secret": "926d67b8b071168a115680887f9bc54fff8ae81c19c7b2f39714196aa5241dfe"
+  },
+  {
+    "public": "2e4ca61a73c5f7aa3f892470104a177701e98b4d926a0dc74eb47d923789a766",
+    "secret": "553016d7b1f3be8fa75053b7699d8fd6c96ad5679075b200b6bbacce0a5ea885"
+  },
+  {
+    "public": "34a41497a31e3156da3fd22149125f5c0c7e38d517504ccca0a77ff1a23f3a0a",
+    "secret": "e7ca8c2760ee6adc5964069471972304157ab9208ad72119634989832b6516a9"
+  },
+  {
+    "public": "977c274ddc7f3c87b18320e420e732f294430c8ed72b48ccff9cf5a8aa55e50c",
+    "secret": "5a338cbfce50b825600fdd47ea82414be2ccb01530379d416c43b869bcd3ca17"
+  },
+  {
+    "public": "816477abad3b19c4e47a775224eac2a9f96c8a4854fac6afa269b5ae4704ae25",
+    "secret": "a3d7b710396b26028c10c9a57aa4984e05bf722365a34dc54fe0f699d7c99492"
+  },
+  {
+    "public": "15d3d7f96c00f6778276b78a94b9526fd21d83c946ad97b0435ac2641c459867",
+    "secret": "27a8ffc3acf57b6dc491fada4e5099b3e49ef5614d9ca620435fd12b83e8a2ec"
+  },
+  {
+    "public": "077496fc1c9e2f0e1141bcf04784dae401bbad46b6257ffdb619ea373070427c",
+    "secret": "40e03ba9a01516ab728fd9491f4fb9743ff7ab3b5800c0d8138e913ee8dc63b4"
+  },
+  {
+    "public": "44212559b1051be914f8b7defe4032197d4c761db7decf0cee7c1730dd07fd6a",
+    "secret": "bb9fb5c30ca9a075fa3107a0fdb78f51ac975ef07c3b0dd7151c9256887b153d"
+  },
+  {
+    "public": "7fc995ff6bf288c68f1cc01153d4851520ab388ce23df5036deb8736f0584425",
+    "secret": "ee98f636de12ea9d6c93716225df3e1c1e0bdfbbca78d43668bb05f1cd766c11"
+  },
+  {
+    "public": "27ce8debe8fc65fc7103b4f833eecdc4238bddf75c364d046f03fa38410e003a",
+    "secret": "d7438279e505d88e631cbf19eecc51180e9509e34ad951e2cc77476bc124f6f4"
+  },
+  {
+    "public": "608c4146a9b5fc79904b11a8a9414582eb03d89a801983d387943e88ef3f0d0c",
+    "secret": "f79730968d0173d6c73c59915aef84212e3c5ca8558d17039eef9ac49ddc33d5"
+  },
+  {
+    "public": "03600982fae408dfa890afaf3de93947bf418e565a1308250d9ba86fc21e385c",
+    "secret": "737bbc8f730406aef5e383f75214a0ce2e9a3af6256432e1973837c96097e4eb"
+  },
+  {
+    "public": "7ba30408cae8222741f9d185dd4ef0d4d4e4bd5bbf10821611af5938aec68d0a",
+    "secret": "a23e479551895c4afe083f3989ec80cd52101e4e9fdbca856a0da8cb905cfab7"
+  },
+  {
+    "public": "643ad97b453e99b31e9175a612b78a783b0bcb3f871abb8acc22a892c7d16622",
+    "secret": "195a8d5f13e30541153626dde98e6f964cb0289c4dc669c0bdc84dca294d3546"
+  },
+  {
+    "public": "f43626eefc8bd1b8bd20bdc78bc5cd4df636a3bbe5650c9047061591f540280f",
+    "secret": "9f3c6b71b062bcaa3804c19b815d499d6947ea1d8787f99e8b7cfb92e0e198be"
+  },
+  {
+    "public": "254c6f56653a00437d9d83b795c7f44a997c94b36b9e460e08a5b71cdf9cbf74",
+    "secret": "9fa49810b1ac5bc521b2c022be2bc6de5c4e2830cb9469c6a553082f398d76c0"
+  },
+  {
+    "public": "4dcee0f9ce63856c44aecd7bad52d2e47fdfa2c7a89239929ed32c3b1ba70930",
+    "secret": "60ca466b4c3cea9d7691edbd4637fba4180f90d3067c74c6f08b0181369ce14a"
+  },
+  {
+    "public": "5da3ea208a65ec8c48ae8b737b86c5d0b4e2076b57f2aa3a6a2b4c63f913fe03",
+    "secret": "be313a7e8f825e4fdbd88509748c97236a512401c0101c0e1fa519df19f1c5cf"
+  },
+  {
+    "public": "c527f4807345363a4e992925b9f0714029a709e1d905389ac1d872995155b233",
+    "secret": "ffacf512e8ef8b85ceee04ff5d4320820276aa0de089cd5115242d56a8b77891"
+  },
+  {
+    "public": "40b3851710d0747e9c47ae5180fe55e5da0ae8c577b789201804846685c8680b",
+    "secret": "7239da93bafa6e565c9a288a9468793595befa703a735c23c08248301dd14186"
+  },
+  {
+    "public": "6dfa78e6b7de144e8ce48532b3d6867c6a66cb4bdb9fd72059808f17be3d6b0b",
+    "secret": "e03428f92ab389afa1faafd3187268d90cd9d59fbcabb34a5bb7c215ec3738ff"
+  },
+  {
+    "public": "79b8ab3e75d7b4c2d3bbbd7b11ad3775e160968a90263d2af37df542a39c6a5c",
+    "secret": "6054ddfd27163f621a07b727545e7bc79e9c10ea41fbcedb308883dfbcdfc9a9"
+  },
+  {
+    "public": "ab454823285ee2a51ce80bd8e487236e0effe950339f6531377e0d4733f3924c",
+    "secret": "70eb09cfc1275fdcfc603e115c5ce7e01037944f1767c0b19a2b97480cf04887"
+  },
+  {
+    "public": "5f4a41eab1b11cda023e4ba701c2804defe8ab20007c02f68b2e0f9135d88169",
+    "secret": "d598bcbc4660548870a0aecbf5db9f15ff40bd6d85c9256e6c883870ae583278"
+  },
+  {
+    "public": "8bd0e5f32de301933de6b2f2382fabdbef2251133f4f69e6af6c1b9f89749525",
+    "secret": "4c62778abdc39c18f872fe475d663a131aecd79dfe75eb069750eaebbdd3feab"
+  },
+  {
+    "public": "4779f06e7ffa740370f2214b091c7c9750b1167c6f418763155a04ec9db34664",
+    "secret": "cd432fb9445bd8eb844ae76b577d9a67f07f8275bf7c756bae905a5be84cc558"
+  },
+  {
+    "public": "54c4629d5fee8cc0ade21239184ee07b053d0711139a7ec820232baf0cf3ee3a",
+    "secret": "490fe7a8568ec6b8703f97c0a7596e5abede057844e1628a28407f96e34acea1"
+  },
+  {
+    "public": "bae4914c5d0b64069883015429e136f8881501dba8b1420a0c83678d7afda525",
+    "secret": "5bc78476150e4926be88b87825b83d1791351bf347f60cdf48bdad53bc540f14"
+  },
+  {
+    "public": "62b4977d6533be9cfa8e68c584e704aae8abeda1ae19c5c7642e7f7395b99e6a",
+    "secret": "30873e27fc3d2b4d1dc8c0cc95425fe9cf11f9582a3b2721e4766b910ac49526"
+  },
+  {
+    "public": "012134650df003167b7fee8df53bb8e706abbdbd7b7182825288975931f33208",
+    "secret": "06c6dcc0b74a548a536f7786a5f86f6cbaabd44aae71342bc760499dbec326b0"
+  },
+  {
+    "public": "707bc6108075be77306d693808eb1458f7f5c4a6601fadbd159a1a6da8aa9e46",
+    "secret": "cf083fa5da24fbebbb83d78d0a64624d65c4eb5e387b7de1c83d658fa470bae5"
+  },
+  {
+    "public": "a5925c286ac7f427327f4f21d16b5f8be08b7d49a24109bf7fb1b81a39951602",
+    "secret": "75fd69b011b1bc4442ff5b2bd041b91b3b9d223fffd77515110df2d1093180fa"
+  },
+  {
+    "public": "c0a3b673acac44661e18df2830c0f21209b013c7292d26a28343f02955371c68",
+    "secret": "6400f69185f075b480d59db51dba57c577fa150becbfd0d12266b3ce767e4bc5"
+  },
+  {
+    "public": "b5faa6e9e191e183b9e02522784726a60dc6dd58801b607ee80550dd5d7c9065",
+    "secret": "3185cfe81297d3723d6a6df4da388bc3dd38615a27e096688541a40aa353348c"
+  },
+  {
+    "public": "860df4af1d395dcad8e5a82035c34f20e259afcc7299c65924b250d00a4b9925",
+    "secret": "eb32f30301ba1480eb802604f10cdda5f44252b9fcf489526291ad99bc46779a"
+  },
+  {
+    "public": "e64f4bb5bd753902442c97d605abf678c3f4c008c837ce00ee2ddc574a0e8e6f",
+    "secret": "7e149e3fccac7f0ba8088e6ab36104379df0fc383d3a0341b224c2f73adc3d7f"
+  },
+  {
+    "public": "c1b75f0eed14f2dd6e293c55b4042c5d19ef7395af2674749f250cd79ec50531",
+    "secret": "63f598bf196d25beeb1b9f2bcdef375de126138d797876fcfe934354e43ebd26"
+  },
+  {
+    "public": "ae2487dc8c1add14fd3d231fb00ae77f8599a0fd611137434dbdde0f9d8b2c67",
+    "secret": "bc44104c0e70687d191dcd056578a5e7aec371cae50c0dd4c56ecdd2168f6c22"
+  },
+  {
+    "public": "1e16b7ddcd4159208ebfc7cb19db547065d911dbca06e1daeedbb715f5876221",
+    "secret": "0b128ba56abccc42ffbc11e0e2d84f8b7b624abf5783690bc4e6a876cb4519ce"
+  },
+  {
+    "public": "11f0ccaa27c32643aaf723b07ce167f5bc28f4f5e1a5864a7bc3738bfaea441c",
+    "secret": "0e8572277d6ce569b96390ae0793ac41df39f2265fe5b9eb5ec074a0062ee548"
+  },
+  {
+    "public": "7c8259bf772212f8084af8f4e728f83d3464b2bcc8a02c61ce3064d834b63230",
+    "secret": "6a3df55f5db4f76b5f7fd433400c4f9b181bc612cf00d335c063bba6803789e0"
+  },
+  {
+    "public": "9673e6d28e57053de66ad70f8585505b46850903501f1ae341e03928e1fdd935",
+    "secret": "e70a9952fad27963c89e3c7c09adc5d45730f9245a4b2bd60df9d321062a2be8"
+  },
+  {
+    "public": "e3d35bef7b962add6f34c76a36d90e2bc59477ae5afb62b8b16ce104f6cdc74a",
+    "secret": "48cdb84def8b157e74387755b901e7b11d0592bd8826a107b4e5226a3b699c5e"
+  },
+  {
+    "public": "058f1f58166cc3e5453bd30c8e6a169db262b3f389acade9ef9fd7e1b0f30d02",
+    "secret": "85cc52fba84054ee997394282624ba27d346b7e7ee9dc04ddeee32373144fe16"
+  },
+  {
+    "public": "342bfb842c2b0cfc58fa46f75c23fc0e16a4f2ee51e17da1ae44995ba481b34c",
+    "secret": "02862bf4116b187edcb77c9d167bc0ebb262a8c7266cf45858409b64671c2b93"
+  },
+  {
+    "public": "176fb80b6b8592e785c14b8427daf1c6f46f82904bf316e756ed44d468e97c01",
+    "secret": "c554fa7258e6d0a01cac988f8fbf575e31aaae236adb79c9a6fd2521ea26233a"
+  },
+  {
+    "public": "6418b8c20fb70e9c87a55860759847cd39d9881b0afd021d42d8d8d9b3b11409",
+    "secret": "47d57f9173fbe16717ebc301abb59826f2264b406c4620de5e57a99b2823e259"
+  },
+  {
+    "public": "c7e9a984635e22aefe918f9f00919db404f84934ec10a4ab0be2af56f532b920",
+    "secret": "dd910ffefcbf40c158b38737ac54f328707029c62a3d025a9978389da0e7cea0"
+  },
+  {
+    "public": "78524e2394c057ab62192d3ab62a55d40833448698ede9b90af6bfb546fdea3a",
+    "secret": "cbc4eae0c34c2a196e0bcef5fdfd7d86c0784f210cc0423a4d7169dca07e830f"
+  },
+  {
+    "public": "e6ee7da63fac3dbc9db63a48e5fbf9896e384609e46edbdd48d85da8120ade1c",
+    "secret": "c83254df25dfafc13f5d05e1af16b04a89fe8a7629f181ec563b9b6daabe6144"
+  },
+  {
+    "public": "1337ae0ec7c42dfe27331ad05630899976485d4665f7e0bcbaee263653896e7b",
+    "secret": "7e246512a5ccc6b975e2b1f4b5d1ab559fe10e881692aeab7efa0422895c93c5"
+  },
+  {
+    "public": "1aec21b387fc596d14957a6045fec2cc288e4a9b4723ef800c62a899f2976040",
+    "secret": "129d990952be3a18c8b9a3bda06d0d7e27ce30ba161ec8cc3c2ed4748b383c63"
+  },
+  {
+    "public": "9ddc810f7bfb741c7b3339b4f1445eadface2cf99abb4e687da10511c4fcab01",
+    "secret": "c01605ec43306219bca8ad845360e7bd18b3bbf1ef8ac6444121e0e3e110904e"
+  },
+  {
+    "public": "9e199620ae24fca08b1a0f2d003cae1751b21e60f028615cac2c0a59a3fe9c6b",
+    "secret": "eeb69a1966cf44260816b05d2ae2af00aa6f3276dd15aaedbd6bca2ba091473a"
+  },
+  {
+    "public": "504f2d3278600bbe525bc3a218c0c5e59764b2d931e6005f6f19d0bb6880b572",
+    "secret": "049c99d5550ea8e519c1109876e2902a128500eee8dd560ecface44fa4f61857"
+  },
+  {
+    "public": "396ff515283373dec40da680cd740cf94f7f112ba9a49ba2add93ee19e468e32",
+    "secret": "70d0a04961fa3b0a1beed3fe68634c28655c8dce7dc53acc96b09a8d730b6a82"
+  },
+  {
+    "public": "279e89806f469d79688b609050c4d73ba22f680d553c409d9db41fff5a9abc48",
+    "secret": "bacaf51740344af73b72858daa905714775dca302ca774557d25ef26b06aa624"
+  },
+  {
+    "public": "4dfa2d81bd123dda962b7c9b22c45d6d7c16e64d8410596d09674b3fae7f1e18",
+    "secret": "391a74bcb3c6dacc196bc149e8bba186eeb6f0b11bea79d335b1d1e95c1a1bb2"
+  },
+  {
+    "public": "87f0be75f3e6bb74bbda8657a0d6b52f25c772156e9d7ed190f3f638fa95a53c",
+    "secret": "535d269283e74c83551dd5cb51ac164bb03028650b103037032ab72f9502720d"
+  },
+  {
+    "public": "c72f543e512a7d8e21f520736e27bc4e5b2c34ff5c194de6d51d4c9b37897f6b",
+    "secret": "8db9111c44f91d501983cbf15534530b86b2f49463e67fcb888d3aeec47acfe6"
+  },
+  {
+    "public": "44c4f3465439b4dabf6dcc37dfc1febdaeef184703ce7b98b6432ae93dddd766",
+    "secret": "5d9fdfccdb29ed7c74ba112575630d6c3eee08d059fc881df36c43984aafc782"
+  },
+  {
+    "public": "8ed02b823d847bba459c6ef656d6e16a34ab8469997e8ed9569167a25a790567",
+    "secret": "ef682320078125cc6b56351fe25f3db45365322c6d6d69b39c90f5e52c539e24"
+  },
+  {
+    "public": "5065cc57755a699b05738a75ae29d16f67a80d786f3c7ab3dab06612ff331d30",
+    "secret": "51bec180043fe37985d3d1834296208b9e61b25a3e489555c285390023767714"
+  },
+  {
+    "public": "3c57418525d3a80da3e21a3696c6fe3c80b947d5e7845b53d36e183aae68bb36",
+    "secret": "d0a70772225e7e1e18d38761f5984be155a88294a5c8b7e826a8545f4f1e79e6"
+  },
+  {
+    "public": "f41cff8ea29ff89457756c6d6309c4412bee6941d578d89573b2d2917f7b1b5a",
+    "secret": "8428cc8f885fed2da8380885b7133e3eb95e8cbe028659b398a7a30d14b3cc81"
+  },
+  {
+    "public": "9fa244ce0d0569ff2771d7f95ef41ae7fb9f4a63652b8d453420f155fe571317",
+    "secret": "7f31dec347e847220170e3165a218d1b036806023b193f501d7a3d691829c2b2"
+  },
+  {
+    "public": "46c96b3960a11d3350158b0ea8ac7674dad503cb3e6372ae2d839f16e6c10e5e",
+    "secret": "062e876469d049b6d98c6160db989f90d4f08ebc267445036c5795289fe70676"
+  },
+  {
+    "public": "7abddca6ba53311a83d9211be1a0d4fab139344b7215d4b2eabfcc93829b2931",
+    "secret": "8e90259c907f2eac854075ecd2584caaa0a655be120e7f4028c17f3923cf37bf"
+  },
+  {
+    "public": "b0b9155f43cd802a0ff2a9106a06ff5cdc71f5479eee1490cb994f671400fc38",
+    "secret": "93cc064d51207e5dba18a93e8715e35d259006b49ce51446d4b6ed5c82b0b519"
+  },
+  {
+    "public": "b0d839cbff18a3e33f55c306b6ebc2b4e012de1b7507c67cb90133a11f2bcb53",
+    "secret": "5f18a84635a2b8d769ecf539e0ff439861f91604e2669e550732af546619017a"
+  },
+  {
+    "public": "c645784fbd63329594ab419f49e0ba5471cae3fdcaf4c6215b8232cae2764673",
+    "secret": "dba27fb75402f155485a3f2f665b29aff409671792668a2961f3ef753b6617da"
+  },
+  {
+    "public": "b0aedef77b0e090ab806c548564ba4e5660644d841c6fce4baa31f7a1df7b249",
+    "secret": "c99ae5c3f239cb7cbdac39e28a562e81bd89954f927cc1bb7cd5dc8e96f37a82"
+  },
+  {
+    "public": "ad3960c5d3d3ce598c0cfd20c6a43149edb55672b83be197f1f241de1102f07a",
+    "secret": "6e7801804001329e2893329c35b447debbb38819401fa1d66c87422b200117d7"
+  },
+  {
+    "public": "29546d58fc20e75463ce01a637de688083c6d40179beddbf1f5964621b4c5e23",
+    "secret": "f83dd4e54d2ee25a03ac86b5cabc625a4a409dea9a11dc0d3d8cbcf9746a3a42"
+  },
+  {
+    "public": "97842d246628673dd8584bf2ad998b352f517cb14d6d8063384bbdcc4e78c653",
+    "secret": "797ea9854898609eaeb32d523aa3996b99dc8fb65cbf54137bae7efe84d1cb3e"
+  },
+  {
+    "public": "4c2d282b50c1ef9e548e53e9fb1528e15757cf2dab1bc80a84aeea0547fce858",
+    "secret": "aaea5a10671ffb0fcb7f62d3b405fb6f9e0a557aaaf967ce073d4ffe4f1ad4e9"
+  },
+  {
+    "public": "4192fc263434cf7a5a5904d094977c2e9b0e16651ca3af7da4758bce0215cb06",
+    "secret": "5e669a2f59c2df795a9ead9fce0d7a27586ab8a0a55211ae2dfbdfce47dfba06"
+  },
+  {
+    "public": "7cdf481fe82029be654097a5e4518354a18d13736474324e2c927f5638569d6a",
+    "secret": "a21d44f9dd7f8ab2b5837a1f1eb102015d99f3a340032821a311ee782fd3920b"
+  },
+  {
+    "public": "4555f0ea6fdb9a743fa003b8c9b1d354fb369b53bf383002b6210db0de5a1a2d",
+    "secret": "b8a7c31984138bb9bc5b733f2b4c5d3e48d99e8dece2d19dadd3d1a0ce130dec"
+  },
+  {
+    "public": "9fc4119264e5a024d32d95e199cdc9178b4181ba2666711cd9e30644efc4a244",
+    "secret": "74c3378e38b5fe64386e8152001ac04be768ec9813cd9568b7b3c939cf970a6b"
+  },
+  {
+    "public": "28dd5103956b2d2381d384f977e1dd943d3a3c44306c7a569dfba744c0787e0b",
+    "secret": "285931d0e5acf76f9fa22972c002a2aa259c9b2ba2c3ee2b0ff2dc700f701a52"
+  },
+  {
+    "public": "09be14895739d859f0012a3bc927859172b83ad1e8277733aaaf1c96a6ffca27",
+    "secret": "7c81297ee997ca94df1d9d6a4715a46bb26177267c06b884bae510291677773c"
+  },
+  {
+    "public": "5619002b67246207c45706e0988c0fe4a2a0656fcdd1940c6904cc31f43f632c",
+    "secret": "b55b6d43bad1e204726dd272c82e54eb3cb84d679b7fd18a825c9f736c5379cc"
+  },
+  {
+    "public": "f8c07a47fcf089ef1b0ff7826b475628223dd1f6cfba99faa659528f1dfcb50f",
+    "secret": "c6a718225fa7eb1db796896922dede2257e7b89174b9e382b53d177880144207"
+  },
+  {
+    "public": "6ba6eb48233138bbe0ba3c4f805d3e8541ee60386e31285de5db43087288c51f",
+    "secret": "458c1248840e1c2615c734ba927e1a51c5d79a29d38b1101724b574c3492abbc"
+  },
+  {
+    "public": "fd05f84f98f40a6ed713213ad46abe0df251777c1c2982469c6d569db339fa13",
+    "secret": "47bffc1f4a57105971652d2b593c26e8171af4b6c8c67876155efc8a73209a5b"
+  },
+  {
+    "public": "8a3fe3e6f6cbca2c6434943a4a0be77534b5bc17a1700b4ae9baba52ee02452a",
+    "secret": "d484891ab5ef102b8dfb8866746ff39c9e1e295eaf2f7fe792c09c73f914711f"
+  },
+  {
+    "public": "a449a9e34aa7c21dc0911e80876a74e71357c72dd53c94453b6c1ed422acd56e",
+    "secret": "6b179bbd46696c2524c95586a273b797ed7aae84168de3d8e4157e9e82972073"
+  },
+  {
+    "public": "053a845e71df2ae3b709f57f7e4d5cf17e37268f92826a39d72a708090472974",
+    "secret": "af33513baf0664a7dce05bcfc55c156b70d976e135f94018ed837823e7152e97"
+  },
+  {
+    "public": "afecf8fb2283fc515e6505c3df847a7ac510fa005e24295db50c9bf3789a5b17",
+    "secret": "2ff1610a7e00f130eb2ae27dcbc6dfefa7f10614d4708a747a42803e06cb3358"
+  },
+  {
+    "public": "1e33a54984238b17d8b3f100d02284e2c1906c5f4dfb976e786aca4411530c52",
+    "secret": "d681aa827f10410d39fd3ca9f67e5ed7a20313f3a9a13b08419e93dbd6a3d644"
+  },
+  {
+    "public": "046451f6a092d7a6c51e017ffb4f139c4545ab6b33075a5833f11b982273525c",
+    "secret": "304cc5cbe39b90d4949d2d288e8ff9e578304ae46bb9f382503fe2e9f05bce0a"
+  },
+  {
+    "public": "64ab0aac56e192bb278634f9641df204bb6abfb5280b7aad66ef3a97628e4d1a",
+    "secret": "9814e635824ccae06de42264ee96cb5ef6a6a11bfc9c13647ff17685c3b5d207"
+  },
+  {
+    "public": "ba902fb04abb8e4f919dc696abbbc3e957521e05bd2f1e19a83bcbdf4d5ed75e",
+    "secret": "e9c6fc66f3c1da6018fd560d830ee95a8af88131c7db57d08e8141598cefbb4a"
+  },
+  {
+    "public": "c19b2cd9d15dd52d43d21968be7d8d6b6f3fcd8b0e40f656e4e823f126ae9759",
+    "secret": "2e5992082bd7aecbf34d9d7dce2c63a7c9725351e518277c39687174d1a1a518"
+  },
+  {
+    "public": "55a0ec68968fe771bebc634fc79b3fd3193e275bd2b3cde64529a46c864a1a4a",
+    "secret": "18cbfea946a844440e5a206955f251a13a00b073384803c7a9bcf98427f5d52c"
+  },
+  {
+    "public": "43f211b1880edcd9a76e60f67198ea38adf7127797d44e8466c01d4299bd865c",
+    "secret": "5729b0a143553034317e85e23ceef5a97be749621bc9d9d160bf9fd8fa5b87f0"
+  },
+  {
+    "public": "f8cf39fe5015d256f1692110584c82f449191e9273fa28f26d1c8bd1241c2407",
+    "secret": "80cfe70467f7995743e32421c93d5969ec317d4ae157ed2e3e735339bbbe141a"
+  },
+  {
+    "public": "b459d9e26a00314cd306bf70c3dd09fde56a75e99cd9d935d9fc25585c9c7027",
+    "secret": "79db1a2819d05a8f2e46284229c5365e070708f7a1073740f1f9325fba14d48c"
+  },
+  {
+    "public": "75b7ab71c120bdcdb2fd3243949204aaab7a4ae579e22c543be12822fea6d470",
+    "secret": "0dcaf98d5592da3392ec0259e6b7ecb07914ec359b107b8b2f9585d76a2577a1"
+  },
+  {
+    "public": "a03561c73194e1bbccdf29d0cbb4fefb40b0af1c536b3a46aed7443d5cdc9849",
+    "secret": "75b041ec699ca8aa2ffe963f2ef490f5f219dc0176ca9acee6390263563e4fb7"
+  },
+  {
+    "public": "0aea4dae7a7045f26ea7ec2dc9970fbc3f8a0df8bf7be67dd8ffa8e95195527c",
+    "secret": "fe9d576d8125d7b23efceee7d506b10b1665342b2160cf878fb99c8bb19dcaf9"
+  },
+  {
+    "public": "599c9c032d1e412bb4113d2ca06249bf256172d470cd0dfb80e09427fca9f256",
+    "secret": "33601324e9d0e3a2c8777a26d65e00500ba5895c5ca03aa3b0983b7ab2cd6e79"
+  },
+  {
+    "public": "36c278af300f2010a61d255dc7da0e3784f7879e2e3270fa020c83107882eb56",
+    "secret": "7bdbf01112a9742ea6d2f3bf7e9d311fde0200b1361a18ca06779b634e7be9c5"
+  },
+  {
+    "public": "8ed5d4c9a6f8ea362fe9e53471d599bfad18948e22804ecee7a06fca5c9b6b1e",
+    "secret": "3ff532fddcc015e5e9ba659159ee5bdc6564c2c4205800bb3877812da50cf3e3"
+  },
+  {
+    "public": "9985fc97f38ab764496e7f5803add0bcbb21dee53ba2de854e2cc28252554c58",
+    "secret": "8a3e801842210c96fe3f3b3e41be6867e91c810ecfe523190493ed52b7697713"
+  },
+  {
+    "public": "a85bed7485f23a330638cb56fff6a29b397dcc1879f4d39605394b5f10ad7566",
+    "secret": "cf86927d106a1fb2351250b9f60347daf60d5e3000d23daa615b79aeea3869f3"
+  },
+  {
+    "public": "fe1100a320ecb7ae707cd98212ee65f11e79775696f0ee043b6a371d7420e960",
+    "secret": "f4d61a86913d9afa3e699ded37ca51252cc46ebccbe449abd8367898be28f58c"
+  },
+  {
+    "public": "3b0a86e212ad877767d8b95424d06c9b7365438e6785e2bc6f54d92039eade10",
+    "secret": "01009cf1d93a970dca2034f839fe3868e3c2e6a157f55734c7b2ba68a76e6a21"
+  },
+  {
+    "public": "38b0ef4ffb7d2f66f41b83410df46b36de515537aa23bfd3ff86fabea43a9e02",
+    "secret": "b02935049a8250e80d190ec19810b6d03bd18713604ce8576500fb2b5933d79a"
+  },
+  {
+    "public": "bb056df37f48b26dcbd3ba804471635c82ed28acf9300a6f69f61c130347070a",
+    "secret": "b0153f90fdac2915923addb54592539863dbf96698eb56c95880f26cfa4122d5"
+  },
+  {
+    "public": "d778e9887d9cfdb4b331175904ac2b4ae5fec562f852d317514e76b13f6a1731",
+    "secret": "cf23efe160804c1dc1c24200d7ef88b682b5a7ba8ef43f40de43f36cd8ab35c4"
+  },
+  {
+    "public": "3567471b762737d860b07ee703ce4fd5ac6d95f60b66d15f1725a0e3ad212b3e",
+    "secret": "9688589b820b3e1d25c00a7fb2589d5b10428b982ed29b2085afdf41e158beea"
+  },
+  {
+    "public": "e5a98ac5799aa7f72b4be4d00a7cefef3325f6a919a874981eabd951dce92770",
+    "secret": "fb2aa3144f3aaf90f15118d3aadbac340fdb6f12dc82149b3249d58ed39f62c0"
+  },
+  {
+    "public": "6b11067cd69386c19c5b9f81346decb3f6913912b68a2b1f86e3576b110c211b",
+    "secret": "4b04c5e9f30ed5e1b3966d0cb8e40d3373cd74c4d1efa22f95701399c1c0501e"
+  },
+  {
+    "public": "bb38399d3c48397affa05527a5a481186377f43b5682248bf4d32134b70b247a",
+    "secret": "8cea48f704a5e33b093f46e9bccfb36f6f7dd44e922da4e0229aad1e7d1c72a1"
+  },
+  {
+    "public": "3dd6f381118ac5bf5f73098fdd31e77b2f7b7871e9d1ea08ac74b37fc4797175",
+    "secret": "dd223c41cd08dc7ed3761988f03bdb67a62b132907f12825369a61e7207ebc90"
+  },
+  {
+    "public": "d0d625bc67db6223843fb0b2e87d0409935f644eba159c024dab9325b0537f44",
+    "secret": "c8bac55d865d835913bd31008f788a766f54081df68314db32dd27322e5cf2f2"
+  },
+  {
+    "public": "4c5eba3f44b6a4aaf81b29f580dace3202708675745aaad3b45b6d0f3ab3d443",
+    "secret": "42bdd80006aaa7eca9c2ad89add60f104d52f2c0863daa316e9f744fbe81fcdc"
+  },
+  {
+    "public": "2062223114c38af310bf4dd9105cf4cf5cb1a34552af04d9107efd704c2cc37c",
+    "secret": "2fb90f2b26b0ed3c0bf4ba6f7aaf94298e82a07722f702d241a61102c2ab32cb"
+  },
+  {
+    "public": "74bbc65de7f2be199a6da9e1fac3314873205755a5b810d2e2fe10a29835d469",
+    "secret": "4b0314b5ef22858627c086e8cf0ec0c0b77744e33da3e77e76e86ff4324a5973"
+  }
+]
diff --git a/rust/tw_keypair/tests/ed25519_waves_sign.json b/rust/tw_keypair/tests/ed25519_waves_sign.json
new file mode 100644
index 00000000000..159ff07db78
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_waves_sign.json
@@ -0,0 +1,1002 @@
+[
+  {
+    "msg": "",
+    "secret": "29232a6d56e00bd21adc7ee8a12af33eea1da85e40510097cd9bdc6d0cd78dbb",
+    "signature": "14e0aa80a8b29ab3410ae8076a74fc55c355855bae3ebf1ba8a29589d412c59d5a5678ca6d194b0d7882affce54d8dfac7ae7347d19a67aa225bd6c6bbad7f07"
+  },
+  {
+    "msg": "fa",
+    "secret": "9f30057164620aca54ad586d63555861de9d7bdd1b694bb67de6f60c3aa4de29",
+    "signature": "099f28b68cc7b7605b4f98f63bb5aedc9127b760a3350d724c12148a4d74b786d6cb94d74f61403d0b2d09ec9c8ace493d7975da79e7fe41e11d1b5e36373189"
+  },
+  {
+    "msg": "9f9f",
+    "secret": "49f4a75001195504c907a35b9ab64d6920c1170e59117d7a6bf9364230d1e0aa",
+    "signature": "a98b0b5330c07f188f4683da961c345b4009aa0373a1dd9a5e205bf6a17645108f1928b3b31c6c1fc7477b5facb25d7a93907a5ee06b8ef7d650e2ce41011489"
+  },
+  {
+    "msg": "e6167d",
+    "secret": "c45d1ba60a5d929d228d1b69a8f91bd256262498e81d32b6411d6dac9a60ed3b",
+    "signature": "05db2483b8107187448e7f3d5581e48380a83338d53fe70c59e88b281b995216085518e5d331a2b698f2d0d387529dd94437157df88cb14be8d1925afbb6e80d"
+  },
+  {
+    "msg": "650b72d9",
+    "secret": "ec48169ce269fc98df8b721803f6498cfc813ee2d073bee23881295839443ac9",
+    "signature": "dcb846e1b571dd5ac6563a53320254efaa9b071e58391cb6b9ecaec50fb63896da4949cc1a3573576f7455ca5c6f27a8e46c8e8e2b7a455067883aa800eb4383"
+  },
+  {
+    "msg": "d60c3bc46a",
+    "secret": "1638f2146bfd99c8e0e67d21c7d3e411202e90377380fd85b846dfc3dd21aa36",
+    "signature": "7d3ca61e03bd298f2903efc365ce51e7809c43d7d1e8e0a135aa620d970a8ef0ed74223303b0282cd428a8e825db4cb3bdccfa85bda20854f1400d2e9106698e"
+  },
+  {
+    "msg": "96691bee184c",
+    "secret": "3c79edf897d7685b5382a1ecf54b4dea41b9066844f7afc7d8beac4b7f908782",
+    "signature": "5bdbf5816b7ff64e5ee2d7aa6fc27b7ec468c3417439e77fb49e0e9d82e64db497237da265b324d429a282e9a90af157a94ce5f891d70f2e2e0d8a7992d9e38c"
+  },
+  {
+    "msg": "c31191964e60ab",
+    "secret": "d1188370e98d2b1f35f6eddbd111f8144557ffe526f07a18af59cbd1601d53dd",
+    "signature": "2725204e2d214a2f2554867d150b097d79f7a5741e1c9328762dfc546f1c4e73f0fed5f2e2c76c3b43eadc5984da906270c27b0168afe2cd7514d8554919d384"
+  },
+  {
+    "msg": "780f3653c04c28eb",
+    "secret": "b0cb7c3f15ecf4462021c16b9bf7e4aad0edd1a00d52d517b1443aecd0f9067a",
+    "signature": "ed884b0d446911b75542218571e06ee09751bc637e7877a25aca3c3d06d0e88dcc78c11fc97e65c6fa91d1860fa8ca20a6afc216a4c6930dcb11988b65b74388"
+  },
+  {
+    "msg": "a231b7b9ab4bfffa24",
+    "secret": "f765ae39e8b990f7d59e08bca241f8d2851c6edaad9933d6cd27a769e22ee7fd",
+    "signature": "93f98182d1648ad37c156d529329d30f54b9f833878506ce7fa3dd3b545e3564c741c7b46fae6b8244c69def092d22d17e3666cc86cc42c231271a905ad2fe09"
+  },
+  {
+    "msg": "11bbf3d0be76b57ee344",
+    "secret": "fb5b2ea31515875641ee839611b9448b9632ce9cfa6c3d414289947138f70835",
+    "signature": "3195d0c694cbd150509dfd3071b35041496514b814287527ff248d0815659fe29622d098462f2a207de1ef60569dcace06fcb35133e2a71cfa798b788db7158d"
+  },
+  {
+    "msg": "44692e2d3f50b02e34ee54",
+    "secret": "4d82f350b75db7712615b783f6a8ef28b71fa87c3e7aeed9185ff36f88f7c28c",
+    "signature": "5d8dd314a9ba10a346dfe0bb5485924048f52402b32e794116fb91071b186d84e26ba7f6a04b0996e34d136d5d9c77bdfe78cd6538332a217a29998de412da0b"
+  },
+  {
+    "msg": "fb5cf6d2d1b4b1367ea88171",
+    "secret": "fd3882b4e8f253b02478c14f40644994a1df21d4b051185a49c27d940e63de05",
+    "signature": "6037e6d413250cb749f53bbd15560a447cc0fb781a41f083ca33f9951ee57b4a26e82deba91e8db04de07dc7344cc50e031b7d9e7f72c14580ff0d03cbe41f06"
+  },
+  {
+    "msg": "d0a7221b077d1a214208f37712",
+    "secret": "c877b864bccac3f12bf72369c736a6ea7d0771d769f8ed8d0c27141b774ae1a1",
+    "signature": "9499c3b4c093897890bf5f0446eeaa1d14fca3488cf2e6e30fd78f0cf1f6bae5ca8367ac186a5ac4ea1764b876d1ba945cf6162ba3ea79f57d14bceeffb6b400"
+  },
+  {
+    "msg": "a2243e5b69c71e58fc16644b3226",
+    "secret": "0b6cb29e64a1c3ac0cbc37b146a9462935dbad36dc23404288dbe4bda3f60a58",
+    "signature": "efa97a7fe683df736ca814b0b041e04c9329f560044f704e66360df449b5442f8137615c1cb1763063fbb803e515f20571cc9cff54cfc8a2b9613b468b9a5988"
+  },
+  {
+    "msg": "5a3be6c17021a8eaef9ad0d360e846",
+    "secret": "d552e0fbad11849488fd9c65491468c9c85c3b2d7d25f62d3f29498d9d783a6f",
+    "signature": "c33b72eff7cb6c86eef1405639d749c374273a2ff661c284f65a2bbb324c490a5be5358070f21ce39aead3e847d2ffc7a4e5b24d0f987cf0d2bd16fe78650e8e"
+  },
+  {
+    "msg": "898bc102c615e776d5f5f28c857b5072",
+    "secret": "df3424af05f797adcd90bdde28fb8b25141886749f5389aca801515c437faf95",
+    "signature": "f89b588decb88c6f87b9241bb118e4612b86dd4a0c0ec55b89421f954a0c9378d5838c7b0b5d87d0a416ac20dd702c37666392eee984206ebb7fc0eac7242402"
+  },
+  {
+    "msg": "199af157cb2e5ecd3dea9a169731209119",
+    "secret": "fb0bbfce58eee7b210812663ac16f46c77108772a0c8243844f606fffed5a5fa",
+    "signature": "e88b6111bc4a523427241c022dd675d26f68f4c143ba01b92158d4d9d4626cebb7ac6afac64e0e0be55b91c7c0e64903489b803d6c9690455a98543e0e0f3003"
+  },
+  {
+    "msg": "a31b4eecdc290e623bd1b8f29a78e557aff7",
+    "secret": "200462d51de53fbdfdce72fb0ff61d01b6a7c02b452ba8e2426d5234a2578989",
+    "signature": "0b4ff700df6b197e05141bc049547c969c5186b1ea646b972c9073b6cfa909c10d850b9f4d7e40dce35697012fb170c0988ed78723e85aa71b6f72293d323c8d"
+  },
+  {
+    "msg": "32b605977d59e9c7cd329589308cfba24b4987",
+    "secret": "a03784763e4ac33b29541730bd345cb98537795b7cfb31e2da89ba5fb230b937",
+    "signature": "82c0fed9c5b6bea4594139061a1fbb2a3d51642b612f90ee5e7ff5f7b4511603f8beba98dd946dbbdaf6376e4475378ce7c19f8e33e36388fe63c640f120ba82"
+  },
+  {
+    "msg": "a3c80a4b549f8ab9d8fbc3e3419660ca9c960ac8",
+    "secret": "c5aae1ddbdd4b738b92f810964990deb046cd665980b0cda313a8b6679dc99a0",
+    "signature": "28cc2ca611a33075c0f47cc744835d1221c711ca8a18403f4fb0278dbc962295754dc4d9a2e56cb2bd488119302cc37d29c3db8420c8cc47917c7b9f955c3385"
+  },
+  {
+    "msg": "23da4e835d454b2d942a2bedd2f8309bf06e9427aa",
+    "secret": "c80f63b32d8fe520c0a8b5afc5468d10f2b1644e6c366fd75710f8ed7552ce64",
+    "signature": "bbb7b9930f3d78670a43e38ac11bafb4e8850334d5a0a1ab607c9e10faffb7016ba347f60d1ab3037a613a8fd12f1d8f0aaa5294468385dc5ac19bd12680c500"
+  },
+  {
+    "msg": "995236037d1fc630e71b591dc5d9806d354d15f4591f",
+    "secret": "4037ab6879c0663d689589ebbe166e311b0f9e7ced54a99c5eb31d1ed805de29",
+    "signature": "1962e19a89a633c7e4aac0ccbbc63fc8d678c00c0da1d853527e140b18e63003703cff6e0cd3d7f5d0a67788354a1ba44c320f5e6c4acfb27d808f8c50b31582"
+  },
+  {
+    "msg": "5dd4c4bf64c159f27dd540be5b92bbe484c115ce9b265d",
+    "secret": "83df49e55453d3d0157f9675d0cf565bcaccd81a0f502fbf59cc556046502afb",
+    "signature": "19030afe2778fd92f4448adc97720b82b6ccf53b5958cf3c7ecf4bfaa1af2baeac6303f66f5e36a26943c76a2bd3e215d1015fce246f1041c0275207c49e7d0c"
+  },
+  {
+    "msg": "141fbf43ad3c9c937ee42cc6d7a379229c2b0580077e58e3",
+    "secret": "a047e28819e1bbe14ac006e0780ef6e69cc98f444d8a477a67b5dca4f3783a40",
+    "signature": "caef435a8a86764205235cec12a9e486bab2201d97682b48c280423b3d7e1a1bb5db7dc8e917cd9b8390b76f66f79ad89d59de03bbe06a0e8a99e2b8b666380a"
+  },
+  {
+    "msg": "1ee7aac8a07217e4cc226493f632711a75fc0ba44a79c1b30c",
+    "secret": "c12adcf996321dfe739d23b99d2546984e987dac4293a40b95ae8a59e71ffae2",
+    "signature": "7e1cb2b09c19310c2f87dfdcebe4d9cf8573cd806321bd083c18c7a71c2bc6356a42b0f071843503156f93f3fde709570f27a518b06892cf07e5ebb012481f0a"
+  },
+  {
+    "msg": "67ee20282a6c742059a7b7ae6cf01d50c454ea862276917d4e40",
+    "secret": "14a1eb6a5e2a12896deb99ed7ff63ca3b3e281b22ced567181be1ef970ae7ce9",
+    "signature": "76689ddddaa29f2143f9ad977b78ca55fb6f1a6aeee0a1f817902f9f565cd2cfa70aafab024a69f33a327886b4b7b9a9a7930765b39acac5b3e55e01d7c1f48c"
+  },
+  {
+    "msg": "bf217ae33b3ac20bec59fe343960cf8f6d5d173ca44832d9cc7364",
+    "secret": "b35cd84a3dc9123da2db79cc8fb37a1831fceb9a74cc3758255a5584b6ceb444",
+    "signature": "c0ce9cea86bdd756adca3a83db287bc2627e113dd7d1b18eda632ac8a11f085bbf07cfba666a3a9a435b4f4b6648a7fc3b51896d5709a5b7fcae61859eb39887"
+  },
+  {
+    "msg": "87449231eca450270a8d5b6b23be9e96e0a8952b116d9bd542b897ab",
+    "secret": "0ddd8bef156a4d804255da0ee705d3daa5aff1d374a473d6dd8e045042d63718",
+    "signature": "7909006534bd1f28de6c45d37d89295b2b788822d54a4dfd4102db0f399b99735df7cd2c511270807b08b1598ed85ddb4024293d962d84e12b088d74fd08be06"
+  },
+  {
+    "msg": "be8409225754b6c6dcfea6dedce44ae915a86cce07ce29d4363cd0309d",
+    "secret": "d796f00143d75f1a334a04c6490c9741782df209eabd5c6fb4c94161e8f03528",
+    "signature": "44ed443508d6c65fd5c1c1aada1b8592bda8caff9f6752997bb6e3b6a5364c8329a15cb02e51a7eb8cdc7ef93b2c48128282d348ebf7486ebd107f6e598fe485"
+  },
+  {
+    "msg": "b40b5fd7ca7eec6db6f80ecb72779b5338b96b7f60e8d1d1d628e0a9a7eb",
+    "secret": "0cb259f53a29913679225f3e8ee7189c8410bfae0279432f83fe7c96f36870ad",
+    "signature": "28e0aaf249eb5cd75f1c65608d2f2d8fc92e6d5fd9cfe6c8c7f4b6c35424571d966549958968c936a5e2bd1f3ce0329c91763d3c01545205784cc3cef7a0a486"
+  },
+  {
+    "msg": "1816f85bd01eb88bf833581c09cc8e188872b724b0354176d85b2654c656b4",
+    "secret": "fe688111153ad1b2eacbd98c161badf96d87c408ebe0937d52be3aff79beeb3f",
+    "signature": "eeec0a323175d54043fe75539c4300befbfbb6e70e350b30cac944a7bc078a6fe37e1fb6880179f0de60eeed33faf45b6e357f224c8b25aa62ac27d39168698a"
+  },
+  {
+    "msg": "dc095ff38e58492168ea37b8ba801971724447f0dc33b66dda5c5be89c42b126",
+    "secret": "20f1047fcb297f02d54b189e82d6f532d096c08c25c06da291c064463ff1df93",
+    "signature": "8c20477e4dad15d916f980ae1ee7cf037b7552442c4989246617e8f8f21e74abeb0cf940691cbb2d413b96e40a9f2a022e61cf98221253c60f720b7ed5129f01"
+  },
+  {
+    "msg": "2d49e9073db150967803fd570e5ee1d08f4136b840a287dfaa16d89d34ae7229bc",
+    "secret": "bf4a3d37a2d5368b0fa67f2311cb9640a4931348c8d279665c919471468f12e0",
+    "signature": "f49b855b8a457cc9a5c5d8289be8fb42a6faee4b88d56c2455370fb2b1080ca62386d3f16686d555b66d04c6d48960ab1b69fc6c159e218b07fec08cf71d2f0b"
+  },
+  {
+    "msg": "da0be27dea4c2ee3a8f08a456912e8c2867df53f3e662a673df76d1edc506b1530c5",
+    "secret": "d621d80a6a245226f47cd2684bc388ceed6732df1177c993ef1cc655b9105a9d",
+    "signature": "1a4111e7e1d14b5a7197035ee174023aee3955b7894fa83b9002c7db883607c6b26bce7df70de182bbc539df5cc49090cfdcb8712bff07f0f3fdbb109c160203"
+  },
+  {
+    "msg": "094a5561470d408f5978fc85ef18d2b4ab99ff78ba703df07b1d29947b65ebcb22162d",
+    "secret": "a1e8254850e7d53e33afc0130d9522af4974768831cc09f6d940272d47bf7422",
+    "signature": "e00602b5f36c542bb13e4b094f12e72f860ddeecf0f328a4c91bfa0cea1ea99991d4b9ca9386c5b3213f97299ed3387075ab5a08eb6a47775ef6df9186835607"
+  },
+  {
+    "msg": "5da30598f66844ab37032b5278f1ac196b9b9765fff0850ef237e31858c0c5aec6061fd4",
+    "secret": "0fc36a96280502fd9e89126e59aee354dd05f08fe8d281c05491abee83b84f3b",
+    "signature": "5beee46711e4c37fa173b15d2d1db445e3fc9bce09886e7de495ae17963ad832076d89f4671d4c027ab8af1251f923ffd0bd9f75c9ccd93850c581c7ef817208"
+  },
+  {
+    "msg": "32640e1999269491ee4b46fe9e52af94653cfbd8ab63bfb34db4faace4fa7caf9765e54347",
+    "secret": "81425fe5a3cf38f8515eb7a52dd3fd01cd507e43e44fe49fabbf1aa940dd4181",
+    "signature": "77d19c5fffe0ac8d1770e1dd3bafb65cc0d02244fdcd14f4266baad35182213b6ae2ecfcb610247cefa6eb0d38bb21d0de4425c9c55d2acf1dd91d9786559486"
+  },
+  {
+    "msg": "c0e00344d4ac446b72f4558165f208faf3ac173ac0d1dd731e8a2026c6c6d49df5c0897081e4",
+    "secret": "fe7297cf33e937ebd86cb31c0c6d42a376bb30120b848e3db0ef99fe4883d50e",
+    "signature": "99672e0f4e6a73a0a1bb6fade8ec6b8463ab71cc862156d1873cc8a01e65e321497a30740e321f223eeb884572c274c278e09423e7017f04956e84faec874d88"
+  },
+  {
+    "msg": "28fea738b342151461ce38a2b87bb178146c7aad663aa38e54f361b59a04e4335ce9a430244ea1",
+    "secret": "b6f5b1eb55fc3c7ba29adfef7bca50573acea4fdb203ce1f9be464c877c796cd",
+    "signature": "034492706b5157fefc825d43e251cc10d6fd4e22bd54482102026e7847f89f329e437f2dc5bcb9bd40f08436bb1a7bbbafcb966a61ef505673976be87e531489"
+  },
+  {
+    "msg": "5dff6da4086f6b533c19519f683fcf870bab20f3bd316da6df00c47023dde0de892acf76c4c163b5",
+    "secret": "21f9a003f845177b92835c0d764b0645a24716dff82a477008a3c99e73df3ae3",
+    "signature": "060beef7c25cbaad23be604fee10a1bec3f23005d02d237ca182b5341623bd7430afbbe0ffc01667dbd3437f0aa2927c433ca9094cffe72222a9d9ff1731b60f"
+  },
+  {
+    "msg": "4262a49ec4f480d508830499600f26ee1db77c7da5a00b0b3fa89d4ac58395ccc47f16393eeda1ad32",
+    "secret": "1347f3ff46b55dbf3aa9e3131054c4e01821469c46cb6333c4869494789c70f8",
+    "signature": "2b52c8c1033e780b6dc99dfdbe298fcbd8407820620964bf21078bc926747754ad143840e6d7b27256fc7a8056017f872ffa499deb5ec5726155c2123a9b8407"
+  },
+  {
+    "msg": "e4ebc6c1101daca21c181e9d95234db4aa927157b54f875b807974c3cd25e195790d79db6f848eb0bdf5",
+    "secret": "a8588d8140a5b01861f766cbd0af31d8a9aa2dfb32cfefcf3cfdd40a35b5bb59",
+    "signature": "f919d9ef90aa5dc8518fad92b4fcd80cae87dff76e1c7302a06d2e8fc2236eab68b9401f14f9400467f259af0377ac9e09afde2772f5a5665677969f6c166900"
+  },
+  {
+    "msg": "9b8c48268a95b0077cd1adf51b2c32c14bee6e8e68941d88c0f942bfdc5cd53fd6b848db4e565c3ca8704f",
+    "secret": "b90773e6c695196318fbf118c9dc377aa1e1de9fdb1eefe416a26a1f67471969",
+    "signature": "282899ed07c0f7bf965f6e4e8dd1c992c6f102a52f8ba4e9a586936dea461bdbbf6bff600d7d22fadfaf6704fea9cda9322e9093832ea42b6d3979cfa3ca8789"
+  },
+  {
+    "msg": "19116e3ec707dfdb484fd78850e5fdd4e18fe5b4cb07fe1e2f5ed5366bfb47274256182f8e92c9aea4b3bff0",
+    "secret": "ec2b1e5fc2a271a21fe51499b216a2e0a5b92958a1d77a52a40f2cb1a42ab178",
+    "signature": "3520211e967619a9142d84ab856e11e9af5be9d9a6b5175327c42b613a2f449a7d60b6834c9bea983a228770307eb8a04872352cd4e2dc4754b672925301298c"
+  },
+  {
+    "msg": "c216d06b5326b6d83febb7b927c2bdace9a816a1ab854e0403e52b4a1e31dfcf66621f238f806d2dfa44146adc",
+    "secret": "67e3cd7bc2bc04c1b1519f8004bd80c28da52b98a62af2a50279034e4273a168",
+    "signature": "8f83a46786b97239d03f0fc01c055e369b96965fa70e986bc0f44ac63fe052b6bc2fb88f95cb3feb3eafcffc30f4ccf2cea6bc53ce7d4ba542106a41ae125880"
+  },
+  {
+    "msg": "175d9bd6990d02db4412d0790dfe98fa17b2e5584c2c118525bc62078df71d496729bc2065c05f4189e35073b52a",
+    "secret": "8913c40b979c45af98a94b2bf42e7f0e89bda7d426f724279c5c6c0295182116",
+    "signature": "a5a1c3f9c816f24747770c288a83e06641deeb74aff8c76b201a22be9ddffdcbc490ade6965973a115c97a0ac264ca007e0420e0d1fa1af88fd43f836f333f8b"
+  },
+  {
+    "msg": "b60a18de7914ca143f6ffcf555da83c78a901fbfc4144efb2983b5070bd79440c31d89f721cafbea88f0bd9c555d58",
+    "secret": "fbda11b1076b94ee9cb03eca996226d5b0d0839b58369d12217b97850c996783",
+    "signature": "bb441458a9d790bb6e0e42b8066b3fcb14e17d516dade21e174375e379fef676a50741c27fd854c87e984af78953a22ad4cffd43196c91fef7689ecfb531a10d"
+  },
+  {
+    "msg": "33cbbb77a6e088bb922e4bb2042a21b54043c34e1736cbd75e9a9a7f86e6c4ce091c75046872f608fb44d8272665e796",
+    "secret": "9e47d4a4b0c1e6f6db876b0a67329e3a42e2727cc720d9c230e0ec5983861d50",
+    "signature": "06706f933e4f2892467ebd0da31394259416693ad0baeecadd49362d15d0dabc182e479234bab4dcc6815b594d59de6e158b8d8f459dad8c736ba7f17bfd5703"
+  },
+  {
+    "msg": "e9e0ebb3abfbea86731d8e5225aca6b1c2dd5f73824ce5d0b7f4ee99839c1f2becb2ba686893258bb8ffdc0b41bb954c80",
+    "secret": "925336eafcea668d49fa14d50640ebae7b3cc1bb05f6644234618086ba6dd5d8",
+    "signature": "c5c73de0523421f8c1858fd225799b3147c35367051ab3660beb0ef5b86753086810c74743ea3fda36e73e50f229745554645f2d6d1e5438317523d4c8542f8c"
+  },
+  {
+    "msg": "a14e2a8f543c3c5190d25a282af781335089296238ad754f29c9a08aaa7c71229aaa868199efa9f8911b203da6f4f0a6bd0d",
+    "secret": "9bad136270ac39145ee10fccf54da42d22d7de6ebc1d0bde5467f8fdf83c70af",
+    "signature": "54a66045d85c1429277357671e3fbec8fc5c77a97d1306d1ba9c74820ccf662e4358e5c015a2387b0fc55bfea61e337852ad6d48ee46070e29b1812c8d57670b"
+  },
+  {
+    "msg": "7a",
+    "secret": "1c5ed3920c40d967f065055cf6988c66520446f5df354da1b8ff87f64d6644c7",
+    "signature": "5a220ebe499bc12c3feb8184d258e7f07380b5c7ebac4c6378f56ab20aaf84abd7d53fcaefc5efb73dd1f863ba58931f87580e5bde14ca4a5ccf623d1bb30b80"
+  },
+  {
+    "msg": "db8d",
+    "secret": "9ee0f7ba52f241682cfdfbe5cf00e12651a7a94be24aed12910cdd21f34947e5",
+    "signature": "2303bd957a62b2ceaad2bba616c1eb2475eee033c57f32e7e2124a9dca45ca272195321c5e27f16c6d42d1c7b39b5f8a60330560569a969cbd5fe304ca097989"
+  },
+  {
+    "msg": "e61196",
+    "secret": "516ef0f80a479a93c6861f78e8fbff04b01ef8d6c65ab2d77d55b912257a4e0a",
+    "signature": "980147e841c8b3fd32b9d5b7c0a743850178133118b49c58b385648dd58814410f7f0fea0116bdf88bc6231cf7bce09ae46c2b5498f8c0f4a18b2af1d3c39f0f"
+  },
+  {
+    "msg": "b7adde6b",
+    "secret": "206f1ce13948ca499d1bdf13bc6811c2d154f055f9bd18f0f924f2d1719913e7",
+    "signature": "51fd7161e9356ffc4e73d4793e37afcd4583044292a3ec8ed76d2f3897d760ea303b564bff854b2e84763c76587dffa1242a53d38f1567e4cc60d606b1a1570e"
+  },
+  {
+    "msg": "42478f7914",
+    "secret": "c3b8feb9306753bd4037bea0b288b15facceb40dc565b377fc68ac38618e665c",
+    "signature": "a70c8daa236ab91823a7412ac15b7731a1398f52e2393447aabfebb7cc43736836d38a94100919d2e75f76ac2cb7485bf2fe6459b9f0922333882c105d1bef00"
+  },
+  {
+    "msg": "a8cee83b4840",
+    "secret": "3bf7e516d8c99f1efb437c0acb2bc44e86eaa6b44468ad9a6c56f5ff2474c153",
+    "signature": "540c2aa0466707a015fa7e9ede994beff92b41aee867b10b44a395303234ffe7894d8e7231509abd4185e4915a3482c0790bbfcf3b1618152be5314261cb8f86"
+  },
+  {
+    "msg": "5677cdc41f4522",
+    "secret": "ffa9ff1ab63e86df6c06196b3682b06987a42b5d815d40055157ae5040aab74b",
+    "signature": "4f87b42b96a1f78b85bead7b6c1c8f982f98f3cc71b02b6a1b68f52f2d22ebf95f0924328fcea5e388cfae3768ebf6e3b731b7984efb8d7a4b18e36fd6e26f83"
+  },
+  {
+    "msg": "4d4946dec740deea",
+    "secret": "3b335a4555a6dbe35642aa872d2c486d19f2f162e0d1bde235e1d7b48ab4311a",
+    "signature": "5892f36bfa7025373b372d596c73813dd048b021149126180e01865ac9ba3a5af7eaa535429c2b7a77beaf6ad339b6e39ad6f84ad1679a5d488f1a1e0a872083"
+  },
+  {
+    "msg": "736617d4b1403645c3",
+    "secret": "0331ab69b783b006008e363389bf361dd20c50a0028f046dcc1d0a93060498c3",
+    "signature": "7f205dcb3ab2c7ad36c4bd551863a6cc4a41a5c269b1dadf358e3bb9ba549073b019d82619214724cdc3ae8be39e0fb2a54f364c4a3f0f71cfd1d29a994e1e00"
+  },
+  {
+    "msg": "5606ab63e7a4a06af1c6",
+    "secret": "7e5c2c3bdca1593a92798a3e4c80c9ef3aa378a7b5c9e2163daa3bb62639dccf",
+    "signature": "5f076443ed0157aa4b7adc656aae8720d6e6403449700b3cbf64834eba15dfcbe3b4761710fa3aef0d41b42402f1d6ef5bdc095a5cdc1969c9951f9735162284"
+  },
+  {
+    "msg": "31fab344acf2280728e49b",
+    "secret": "41cff320af7721375acd59cf42075ae148f71e7da1f33dab28539e9deb03d62c",
+    "signature": "56cd2381d6f0c04407da267f5c63f9c47e5cf2d512f704f8a10405137b48c329cfe4ef12efedee980e51f4776178b90144bafe4919e950728612174562b4bf01"
+  },
+  {
+    "msg": "6362934904b564e6d3ae510e",
+    "secret": "092beb36a60e8dddb614fdb11ceb08b7bcc188c127fbd5e8466b63e646541a2e",
+    "signature": "c2b9b93d2165c0501e1e15304d7c269b3e19d0de108d911a5eba5575d30807a70ac23c61e68292c547c337fb3b970e0d6d2402446992ebd08c7151300f0e910d"
+  },
+  {
+    "msg": "7a35787ee60627af6da56ece24",
+    "secret": "413d16ef46977702171367684a1d63dcfe7f233e6376b3e64a5502c2d59ae718",
+    "signature": "fec51e61a508ecdaea7b919fc9ab3096c48268bc357dee9f8ea3062109a4f76ca1f04d16190c83642813d32adce0bca3fef0589b2f5d7d5f158b70529b2f080e"
+  },
+  {
+    "msg": "cbdbbae6cee1011b869f37c26b5b",
+    "secret": "ed621119723edfd74090e210b31f3a61fe488ecdbec55cb7558ccf3fbbb016e0",
+    "signature": "ffdd3f7db648ec9be5ecda745018eb5863c909cb20ff85f36ae2899875cd98c496a09a66eae1d2123d27b5e74d08177571767b4d16c8793227ea609a02630a82"
+  },
+  {
+    "msg": "27af0cd5b23facca51db775f222bca",
+    "secret": "716b80c33331d94650a248cddfa4eb9a1ff1f8024de5e525c29eef54ecf3d976",
+    "signature": "2b1f48ad2a3f2529364a54faf160cb7a07116a554e96a6f3ccb857952c49a1fff14fc469b79cf093dbe470c0b5b71bda839920229a92fea6aec90b5df58c3f88"
+  },
+  {
+    "msg": "795a0bf42e946278f2c98a16e43c52ec",
+    "secret": "6662a15a336d3fe6febd16732f2cbf9e4efe3fb6865fb6c6bac5710012db70e9",
+    "signature": "702b32b9ced97024c2e5583851caa75532b1e4400a7299045560a7a0e7c05478483d829dd006f4ae17830e924417b9cb6f6ab40d5d52c2e58fd0ce146ac4550b"
+  },
+  {
+    "msg": "b6c76b124b3c43ff7aae7e36df90a4db46",
+    "secret": "0d9686abc47d520acbd14d1641bee90ca4b2f1fad28393abad08870b59ac4e40",
+    "signature": "bfab672ede0ece424e96899ac8f8114ed654472ab576c2ed1abf06ed6945b28ab47bef95d94e0ab26f7655c82581f1deb38acda28bf67f0ec65deecac4f34c8b"
+  },
+  {
+    "msg": "c881c86343efe607a976948dfea1419a7272",
+    "secret": "67d84a7e211702040e945fd77799bf71650356f6d460146c3ed9641a1efe2e22",
+    "signature": "0bef6a4e326c7824b136c422aad12dddaf12f8ff5ec2a448d40fa16ef5566d3c69d4208efae3d2a0f78c27b271f66e7ab35ca94036b373c8fbce96a64b9df60b"
+  },
+  {
+    "msg": "bba6886e5f19f8e057b01ce75d72134fd1a2f8",
+    "secret": "9342c68c95be12a76fa43f8cc432250daa76eea5db5d79b011eb289613ac4685",
+    "signature": "33662e95cef048739b17687ced53e00913f3a425529d9e771b7a03b630aa4bde50eee98f7cd5af138a7f5c4920af484280eb4fa06bc6afa26e77137d663ea80a"
+  },
+  {
+    "msg": "261ba2bdbb29ad98f68964760d8d20262ffbab5c",
+    "secret": "2fcde88be6c346eac8e141e98d85839ad7663c4b4737d34195d23518d693ca8f",
+    "signature": "2e0570bdc9d93f5d67b046ef77657152bb6b06afe300b9c28e1f05094d1434429a275119d8bb5b4a366d27aed0de6f553abfb9d87083100664a59a538639da8a"
+  },
+  {
+    "msg": "500bb6a61350b268afd1a6dcdd1c4a06ed787644ec",
+    "secret": "af6891ab223baed9e45a0434512db31bcbd05e893771fd9e6bec33861b6f19b2",
+    "signature": "37ba5008f0c8a9f61ef464578f8cb588442f5fcac5c581a5adf448be6905be608e9db1530a5989646c71ce66a12580ba6eebe4431bad1975e003c26c32f18b07"
+  },
+  {
+    "msg": "39f44d6827306d6dded32773df8f3ac4ab9026a90cc4",
+    "secret": "6583ad059810997d37673725d4aa818edd7493c4adb8432e7591ed0856d9524d",
+    "signature": "e88e87f093aac536294c95ced2ae2707eec554c11ec218dcd34411d407ad8ba88ac8dcf332373a2a6caaee70e81d6f9755aebcedd57128182aedd2f2c094ba81"
+  },
+  {
+    "msg": "c37f9d3c4ddb8feceb09530d6cf7c94b63034d23dce9be",
+    "secret": "93fed124bf53258f0c11dfd04b8465abd917f67b745156b1a49cc83a9c28d904",
+    "signature": "01029f0f12015b395807b40b7dbcd6469b4b764d41c03b9c081768e896db09c539f6dfae09f5201f59ced1904a2d25234878238f2c2981b30682dac59220590a"
+  },
+  {
+    "msg": "f6f4ced6ef76c134006c2009846be5c58b5f077e66e1a302",
+    "secret": "e3fa72004f4bfb20cff8441dd74b277b37f60b849d0daaf57989b1b333b5d7e2",
+    "signature": "af7da63ccf78fb50610f114eebfee68ecc41fa87be32ac99395b71a3477c848302da6614284bb53e1eba90d6281d6d2ef993cfc4a23120b054522d297b49460e"
+  },
+  {
+    "msg": "af73146d2624fc49667ea43724fae9f56b5423d333009eba88",
+    "secret": "a2dbe25ca25accf875deb3890f7a616dfc8c54059562cac191f7c1eeb50e99bf",
+    "signature": "ca7b86d7356d803049400d9a40893045b604a7665c5c440bade874dbe6c747740bdf7e6b80359bfc46f79379fb540b83c266d035f11b2b34ba883cac7efa7482"
+  },
+  {
+    "msg": "776c62ea6bbe3e9cb8cbc0be1e0cf7b4963860eb4f30a096627b",
+    "secret": "012ebc002673ff2bbfe043dc18e5733883011406e57ba191e00a58bd36dc2eab",
+    "signature": "ac97e77f76562a31cfbcdba0d46118b3baf5dda4f22c3d79cc8309c6dfcd6db3b86f4bfa32f9121cf6f340aa3ee50f94ebbe7476f5a812115a4d48764920eb02"
+  },
+  {
+    "msg": "b20886bf163f4eb135f81e130504061fd2b3972f2d772ded86a47a",
+    "secret": "5efe8749fcccd48ae962276330ed9c0cf3358d15cfcfda639a4d0bd1e1d3da1f",
+    "signature": "87411311aa8eed98ab16fcaa214f80eb1db4b43f16202c97ab2175d8958e5f34de51f55ae2afc36f6c02d00d128f98f362116150b7408231de9ec7868140218f"
+  },
+  {
+    "msg": "f4ef2b3758f55b29144daa6473157cb99538468fc69e828249b193f5",
+    "secret": "45a318c6f1a5e4647f8e1938879e2c54c6fa6c1b974c7d911568ed947ea9d991",
+    "signature": "5c6e73b15166247c38a999ec3d1a5f1d89cc1f75be5b1baee2ca0f9bd4bdf08c8dc2f24f53ab7ca31e55ab62341220bf760f98119df50b7d1714d3c3aaee3d08"
+  },
+  {
+    "msg": "ffba6948f62a4e780e3189801d8f9030a5fa6502ddc2f52a9e4a041d66",
+    "secret": "58252fe77c2200ae306479e145cfcca042af6bff9a0461c3f3ae8271d1144247",
+    "signature": "197bff2fe14d3213aaee483579fe875a34144523d316665fc3d3ecc8cb9889dc84ba4d3f4ec847572624a2c8bdd305e34c62826e077133643f33b3bbc5d37007"
+  },
+  {
+    "msg": "5b4fcd1db10d48522b254d7f4fa5b02f816f85fc70dd41a699e957f89f4d",
+    "secret": "926a9c29047abbd916a5749f5362ed943b146256abebdcc5678cb402bd3331e1",
+    "signature": "ebc5471989dc9da3c9b4c49b2bed85d0455c8709c2ca0ab31a8b30d6a1268a65f222f1e237a8276d4884e82e7aa4cd2bd99411e4f9775a032c38d794a7495382"
+  },
+  {
+    "msg": "ee491c2d0d7d2e1f4da088ce5cb98697d29599779a44c608be42fe835795f6",
+    "secret": "9674b1850323130e3836969633edc8da34e9c432d77ece9c37318f34c6234496",
+    "signature": "6d8d8dd33738b3acac5c695c13414085728792c97946c6e3f0d08ab5876cae32baeebdf44465898eb82fc2836f3b2f0c1afae970ec96d93bc7ae8b78ee46e902"
+  },
+  {
+    "msg": "b319b6531a784c6cf505f33ab2bd7873e5bbfd6aa632a88ab1f6064e0b80b5e8",
+    "secret": "97dbddbcbfa4c4bcbe1eb49a03340da5812a31872da90c0781992d03500d626d",
+    "signature": "cc07e2723b9e0eb7acf1ce67cf862c7937328909354ccbd2db731ea20d7e0490b344945f787b1d8509de239601c6826d8a8c2e09dd8ba810dd27e9076c0a4906"
+  },
+  {
+    "msg": "fb47a9b0c3e6405736ed83d42b36918edd64c15b870ca8d296811dda0ce6a2851b",
+    "secret": "8a82d435f56908faa99ad6ee93e54df675b06298301c26ba8fe89a24b57ae994",
+    "signature": "04b60df2e2782dfbcb8704373500d5e082f73a01f257cb97880d093b8ae37af6eda97d94c20b76443cc7edaaf02ecae791e97704ea3e7b77947644ccf7165207"
+  },
+  {
+    "msg": "f36b0ee3f97410d6d6e8a0bec21ddf2b8e808241df8d1a0191e361b3d05e69accb22",
+    "secret": "d7335e194b7ac094bbf3e6cdde02b8ea1188d1b1aeb5a3dab0627eeb58d62231",
+    "signature": "a56cd9a5f1b9299e077e691f04323e275182972e76c886f0eb3f93a72dd7ad63f68d846f8090aee3b286ba3c13e51b552ccf65437f0679e6339f645411771388"
+  },
+  {
+    "msg": "91515014b066cd6c50322d63b00645ab0b52f9551703438e8755f221ca926f0b717dd3",
+    "secret": "55bc4a1c699e034fd1e00cbfa5b2d2ea622eef4bbb43e5dc0cae99338ce1a3a7",
+    "signature": "40fb7c229bd9591565a7b1e18a13aa36045991178f314b6c19c84f5c8750b4350d2556a027c85bcf024ea4af032df2c79d549874657791c497d77942f1e90c83"
+  },
+  {
+    "msg": "93bc1907ec72eb3a6d0a5cf5fc8e93ba10452a8145e1ddf2e86a9c1e4577a72dba36ba48",
+    "secret": "af69e89cde8c9486252f319a7d7bc88fb3364f5f585f7d629851fc759600ce0a",
+    "signature": "a794b8279f9fdf1dab2a88049f0381941c98c57548f5133c81a79d45c29887ed109c6e512e37f3d990f14781c789bf35cc971129b7d404e357946f0e06ca9b0a"
+  },
+  {
+    "msg": "1abb81edf8931d6b8085d424c9b74e1a2715c2ea5ec99a55cc14ba09ee17cb1007ee27f19a",
+    "secret": "773e6165372224d0eb686c0c5540accfbbf6ece8233417a7c4204d92ebb1ba52",
+    "signature": "00a00b71d6d65bcd3b95f175055c5f09c3bed7ccc3657b142466648aa499f38fce9dfdc19e10812c454c09590dd51b4becc728cfc5ca246f14e49333fc148c8e"
+  },
+  {
+    "msg": "beebab1d478d20241fb37679601eb98adb4b6bb7c64cc70540c0a688bd1b722a6c1d0bc3b407",
+    "secret": "7759065b59040d963cc3009848f265ba3387af5eabe71555c7e5a409135bf06d",
+    "signature": "674c310c4379764717911d7807656528bea2cd11dc19601d40889de2d6a2b2dbd2e08da1444304689d360be0b00e849f0c604841f17a2cbd7b9ddd06a1ca5f07"
+  },
+  {
+    "msg": "cc9612c390c119acfde30242d10730cff003bfac5ba0dd9f37e36c45c30d40d271bad31c7a2305",
+    "secret": "248565272867757ac86d0b145e3d42c831ea621b4654b6c7bc01ce8fab2cdd85",
+    "signature": "9524ebfd73f87a3e9d584d91f353cc8577cdd52783b124092cc9da26bf69df814f814e7c6d2e9bf1d82837b15ab16757af5d8050df2bed002d17c8e9b8d9eb85"
+  },
+  {
+    "msg": "2a7c473bef4c5b58ff770282e2d8d5202bcfde284638d218c8ac3cc512f95b3dd7ef5911aee345c0",
+    "secret": "544de634496c366b42968be09e0ef75b38b2506be711b31420dac2446c49004c",
+    "signature": "c469217d0eb59c142c84bf27e33477e8acaa8aafbf6a60bea1f022a83cc52abf1c028e0ac42279dd0d223bd009d445db2a46fe77a6e70f0e82b135e234600082"
+  },
+  {
+    "msg": "65e264479ae8ea8f3f01329299fbac89114b0638c3e0cb380652ff83e5f5e3273e56a0b656ee296fb4",
+    "secret": "3a7b3a080130af729a6f00b6e07d55c2f993ef683675353df661d1acdbc284c0",
+    "signature": "c49155d2117e47760cefb8b9f62232beb21c71ec2c5a375293348046d920979dd2e38df3ae47fd5a1240fdcc2a05c5d273cafae623121d674ddf045bdcbd7684"
+  },
+  {
+    "msg": "d97af1088a34e02c5c25a8f1d57221b253f02f1668ba51a0066eed62efcbeff5f762cac21c0eeeaeb323",
+    "secret": "4df0c5c2fc0acf93d6c80e8fcdd4ddef9dd45c39cdd47ec804a8996303f78b80",
+    "signature": "4e9d6ff7870eb9804a838de72007bcc9bb31d8251b2bf8e656d97935cfa367c5fb6c25486794456d1f93372c0214a3b6e7a8ac3cf89449854f31cddfdf368d8d"
+  },
+  {
+    "msg": "3797df681e11377d02039393da0d2f3de3672b5643fb7cc9782df03c1382475a939f67064455ec4e1f0fe4",
+    "secret": "eaa9ee3e8d948f85b8725bfe1cbdb2bedf22709e66568b1a28664f1a1f0efec3",
+    "signature": "5c43feebc50e32110233604ae8f6ecaa3f57adcf72484ef941d649c41cd163e5c8a0e2d1fe8333e297124a2b73c5a54d933a32404ad2aade321d5fb6f6a29e08"
+  },
+  {
+    "msg": "cf11cc198fd50d9861aa987157a8780bc7bfe6285f6416d38330ab224bef4cfa823548e34677317115215456",
+    "secret": "5649087dc80755c5c160a946f180959a6109a855f988140efde9be88a67b3664",
+    "signature": "883d5fdebe6a47b0e1192aee242cb722f9915c374783271fac6975dc394d218870adb66a79b99ad272953ba98f38626b0914649bdcec468d486c1b2a2a46a903"
+  },
+  {
+    "msg": "cc41184ab14cba951f23c9541a865c7ddb1e28428ad48a5ff470e378c458afde63fa4b3bfae4da6ab0d6901878",
+    "secret": "bc226a0c02009214e1e835eff8dc7bd2494410b3b50c60712a8c8a2956c00023",
+    "signature": "36541407a63bc57b09d2b3556aa5a7104fbf98f44aca0c2209a5cfcf98e69c82b347b7a68e359e5a11c20c94eef10c1c1059a25cbb4fe0befb4987ca057eac0a"
+  },
+  {
+    "msg": "6804dcfdd540b0453ad7da57f6792bb1f59b3a98780b41241ac73d1d7597fb884ee080ea20aff26032f2a5b7ffa4",
+    "secret": "11c45191beb0a0a25eb3c916898df26c189ad7a404b9426c59796937d16afcdc",
+    "signature": "2d2d20d93356a552d4bd5392679c12dd0f45da5a6660a99656b1cad06bd7e0cd6baf30226f81509d59a049a70ed310590725a0d54e70c2c777ecc85ef8881705"
+  },
+  {
+    "msg": "62edc5bf05bdf320fec3469e604504dd065c9c7c2578156dbb41a63f5818d347ceab8045cd63cf282338576a5c0662",
+    "secret": "b84797f691a3a5d1c1cb1b90c06722ce2153fa19eb9e806e7913affb277dbb6e",
+    "signature": "6e105779b75e92866fd6a91038528ea7f940d188a58e06c7d07744a58dd7724a03b97941732da8c629c9e2cb4633a6de8b42ef5159ced7b7231a12bcab691d07"
+  },
+  {
+    "msg": "ada410f2809bf3c063da562de951246ccc85c50a868985709acfb6d23ae1780716744524d5c5f4990ae97be8fa9e5ceb",
+    "secret": "6a02d3a3d345675771d02025beb27be22fefcee60b3524472d20469b0f797c21",
+    "signature": "56b3925ae143c218f74c6f8d90a65ecbd500a9dd63e35b5e7a4ec6710ab185f0b0810f177b609a36d9ff485c8ab9bb4c66a3088a6e5edd0fb00a127b89cbf002"
+  },
+  {
+    "msg": "6bf0c915303e9d053899c80802a42399f98d9464f780824d901206d7680f56999c732f0f487486109e93d9666d5bfcf52d",
+    "secret": "ec32d99a440f3d0af18cb8b3dae83a2e9c8cb39dd8c00efaa99bc1e06eeb7c77",
+    "signature": "c550d93e776cf963fbc5e5a00c24ef21902f71cf70d0dec6e9f0b780bd37e901e00f0ddcb0290005ec63fec5e29c1a239e469d585c06e65fc16ca896a1688087"
+  },
+  {
+    "msg": "",
+    "secret": "5954964ab744e524e7e70c43863d57d0c62e326d4ff1400d2cd0e2073e97759a",
+    "signature": "f66fe21afd43427b0e732baa3bed25345ddee1042afd33f188d0200dff34c90bd6d994a58f9654be780f9948c3e742b259f08ca6b18bb3475dee3fc619e85206"
+  },
+  {
+    "msg": "84",
+    "secret": "e38a64044e641b7cb073f286daab1e4bea645eb50778533030de6da960775877",
+    "signature": "fcc9b4455ee34a6094cbde6f69d276ce152bc8f0da78894f06b02439bdbf3361e18ee6068119375349a107865d2c56bf07c851ebb89660034758ad507ae99282"
+  },
+  {
+    "msg": "17b5",
+    "secret": "7e4325fa1b23c03398dfd1546f81dc2baba5486be2a96e00f5a4637c12945bbd",
+    "signature": "0b11160474e7938f26efda1642ecbf8370de377da9b94801cab8558ebaa98b48bff214f28b91b135009f12cf4a8a8a7863bfd9090f3a6d459998d6d2a74a6d07"
+  },
+  {
+    "msg": "5b59ae",
+    "secret": "41add8b922cafaebc33a9bdac3abafc93e9f81aa7d5b8c01604460c3a56f00fb",
+    "signature": "9e4ba3c89cc9d7633bba3f1f190af9aebb455e86e0144924add7d0224f68b37ace4af4c14d4820495864f07aa2e3031529085adcb64563d2269ac0a020d1a289"
+  },
+  {
+    "msg": "95134a6a",
+    "secret": "926ff83e06ebeb8de976151048f0af91f33b676530fa7ff3d0e6b06d143990c4",
+    "signature": "7099ade107f1340ed8655336526e21916ac9e179cd17a8082b8a87c5b00f350a616e7f574db785374aad9c665a122b33acf11a151e92fa8369ad1fb06086500b"
+  },
+  {
+    "msg": "05bbac3f83",
+    "secret": "92618a5cf675a7983ca590f81fc44a9ca6db3bc92f7a36ff89b1eaf11f13f45c",
+    "signature": "d3502d568e2a331816cb164120de6fc95b8ac59c5173941281e88d18d6f2f6368233d0cc3e218c8d68791ab7da84fa849cac483529459ab0d3b11c0cef73818d"
+  },
+  {
+    "msg": "cb5a0050dc17",
+    "secret": "8866243cd2ce307bf5a7a2fc80f322fcac36a5b03fc6ceecb84ba7adef621a41",
+    "signature": "178bfc2e2ea8f47f0401448bcbd85070050924794d547ec74d1e39b35c8ccf01345c321de1941a71f997f39dcf4e9c5b188d66101900c9518691b0080ee83f8a"
+  },
+  {
+    "msg": "5237c24e545477",
+    "secret": "55470981e0e80ce4c5df351f444a9ef7544e0d59c59c21be79d4ff11f7627d00",
+    "signature": "38658bd6c30275b12fe2401757e0f062edbd3de32b15e2e5304c844638719b128b97e211bbbeabf80ed60aecc3e65779c4b23043be1dae728e28ed731571388c"
+  },
+  {
+    "msg": "930cbace486e917e",
+    "secret": "ceafc7e3887a8e0faf63663d3dacba5b158507136f01e0b28da651e681c0ac41",
+    "signature": "3dae7f80287116740d29689eb0d752392e1324beb045e2eec8ee167bc3aeaeb7b290a179a73e42a34771bc0749dd35cc819955da2cb9f41bcdf3934873c2958f"
+  },
+  {
+    "msg": "badd61b029a9640d21",
+    "secret": "9305469f9050d4063a9a97c5470b8504c1bc9f88036a9af60829c028b2ad578d",
+    "signature": "26fd8a84cda417752449acd00c0032df1d96117a0cdd486c140686390a93af6b351acc7be472dc22b164d356141f17dabf8d0db541e976acd51bf5f7e0567f88"
+  },
+  {
+    "msg": "3ace90966c15263b90c5",
+    "secret": "b5ce6ec8691a365aecff7b9cc8b791ea3060d148b81bfe6aa1a3b6a04ab4e394",
+    "signature": "123d78c346427bae16e73670a9407575e6144a6918173a9701a64fd6e70357e2b793609ae131edca4c6ac0b1dfab9c593605d282521de6f3d8f36d446f5f888f"
+  },
+  {
+    "msg": "d8b8ad363d6f7573f5af39",
+    "secret": "a9091500aea33a446b9aad8932d22a9172fa70cab14f69fe3da2c6cacade7367",
+    "signature": "855bbb9487758f0bc681669db3fb36b779a46b829b76838794da4241a233bc7e2940d679f16f7c08d6dfd430a542464bb1491de4032aaf3224d2ccd2df0f1100"
+  },
+  {
+    "msg": "f564e2c21b31afe25bd890b7",
+    "secret": "fdad883e7ce792ba75a11000989041530912d4038825b0d783be7b0d31802f57",
+    "signature": "692f76c9c451af012b2781e8f2b9595d1d3593f4851f11b109c1b47ee67bbe70cdeb259aef123fb3ced81f6bd00294f574b2adfd905eaf98032f23fc93f7de0d"
+  },
+  {
+    "msg": "8b07e7bb83e09a8f30f021e688",
+    "secret": "ff286edda0e412c119505576178663aad6e72a898134baacb43cef90a4f605d8",
+    "signature": "76a09632f983e579982a0988ab015909d7f16c1e7b79181f1b7c61f034b2502943afae3d233b158ad67e8ead8e74bb16b2f0e7bfcbcbef595befdf5ec1aaa88c"
+  },
+  {
+    "msg": "f9ab048b3a052e4594d1efda5b69",
+    "secret": "fc5b461b8023215d50e3fcf0b40494551983683fae87391636e276f9b7f11550",
+    "signature": "da3ed31313ab8c590318a8af930e1c2284101800f2fa8a57bfbbc7ed3cc997c20dc1f18f2ebcf1f613246be4e0b219583f250551cc52ef610aea63867f4a298c"
+  },
+  {
+    "msg": "2c204fe4a5e681aa2509f132ac2fe8",
+    "secret": "0b5732bb442dbf9eb8d708631fe2b5f00c21ccafa7f0dd2ff72d8724a9ed2f73",
+    "signature": "8bb3d7bdc82e1741e89490fe2698fd62be7f0d8dd9af3bb8f21b98141b497b1a8cb46d1c7764c85ab9b194f15875bfd184e0a7732eea6fdb873d4d8f981b4c04"
+  },
+  {
+    "msg": "6ab989c06c024a67bdc7a4723a37ef80",
+    "secret": "ccc0420edba23a5d011a6039f06175d9e5f2a0beb46adb8d1b9b6911d4bc69ee",
+    "signature": "85c82417e47999774fe5a68b27dd8fc5036224925015bf48b663926461ddc359cbaaaf85f0d31124a79890d7360821f00f9995b94d03b3672a80a4425cb98802"
+  },
+  {
+    "msg": "6dc339870150719e5b53718af044f8c8d8",
+    "secret": "c6fb79bc37b10c93450eb66dc445c7978a6d00c9ee54d50adf48d68e2f1d99fa",
+    "signature": "50b75ce9db72f4d3c7d66bf0062a562ae1a2a025314fb5a279c352dd4d8a46c28692e13d60c010b7d1860318c7a5312f6db593e6fe66b28518101a7c4ece020f"
+  },
+  {
+    "msg": "50e912ff9fdee853f2bffad12f24c930569e",
+    "secret": "56bd451a4b6b55d916f5d36a9d600a98e010a6f56fa9db2bc0bbc76cf3bdedf0",
+    "signature": "b89844c003effc136a44d8529bd5af9e2066da3282b919889cf6b1b63546b48b87d8300a068c1d85dd6d50108bca9cfc5662bfbc4684460e0dc069d87542a305"
+  },
+  {
+    "msg": "9ce74a69077b5db3f6e4b7c96e43921d456497",
+    "secret": "35703bbbcdbe80c23cdd53cbb8f0e4eb271f1951b126f0576a0c430c620ba08f",
+    "signature": "727457b7fcd2d16aca7107d8ec697ac617c7d7f1f36b00928fd367128d24d179fbb36089dcbc8f8c924e00ec134d2b562a9176a71bbc8c82af20d1d064cdf301"
+  },
+  {
+    "msg": "57d039a1971cb501390d606379a369d8ba857291",
+    "secret": "1d368bafca4b53b008f65fea913e080b0296ee633e2811341c2a9f142d97989c",
+    "signature": "cb9a4a4f6442e5084ce0fc7d320484038557e79bb44b2ce8c59995fa21a134244348543121832fc6dd315505e636fe8946c8fe407da3a5fa35ebbfa5ae83d287"
+  },
+  {
+    "msg": "1b5f1ef10c47a9852185dd3e3cdf946aea3f01b69d",
+    "secret": "112be88e7a7a2ebf385d3c612bdd32eb7a45e1d6ede2fa27bf591ee2ab443583",
+    "signature": "e694e8c6fe848197165c1b7150d07f2a6a7ddc5ce636c8f7483dd9f87ada2eec7b91fec92f1c72d2713363410b5532157d3e9354126db2b7f92c4f28ade4000c"
+  },
+  {
+    "msg": "19f6d2338ae54b8f6a0a4ebe67e58e8c96ea7c6ab4dc",
+    "secret": "29c632b487429f1d1528ed428cb4ba3844c1b20fb784ba2990eab5230d8c1b4e",
+    "signature": "015704f124f9c7d3ad183d28d1a7f3278a9e1b2b160e334ca33fef7f0a5ec36fdb9f28634fd76021177333a8b307dd90bd3c45a3193ea7ab3cfa3905bd7b1101"
+  },
+  {
+    "msg": "e467c3d431cf0d90ea9c87800dfbf8ae87b1e9a6366347",
+    "secret": "3ddf2f29788846793b5a0ec97149b598cff609fd927efcc9a3238bc7fedebed3",
+    "signature": "bcfd384449591c68be8386f8aa0d24d1c381781c27a2b5aae9cecd65aba0cdb6ea437223d3581b2c54da969368cd93eb2d9fcb8bd4e86d53d3983fa5a5b5338a"
+  },
+  {
+    "msg": "d3c64c6610f2b3ea994a1bade14821779dbba54397176438",
+    "secret": "64a68d1fe3e22fbf6855379f9cc9172ba03e00d9a0f3501d102aedb4bc0a6e09",
+    "signature": "ed461114f3b314ac7234817143fff12eb63824ed68ff1773fea176488b9e0ae07f5b53280522c5f47521d28a6a1c9a892aef2fdbd8aac1f5e13d27b65ce4e587"
+  },
+  {
+    "msg": "128dcac7f65bffd50c70e5494284bca13866eb72a30224789c",
+    "secret": "edc9137c3215497dbcea39f4cb0147a4c8016a67087cd26747c12eca17f79243",
+    "signature": "8fde21e64db6639105a87dfbb9d510814c533b9823aa7d4afe0129638655170fbc0b65a7bca778fc18aceb92d4a02224f2c54f2064331579e1cb77a0064f998a"
+  },
+  {
+    "msg": "b44f8b0f690389d5e26018ab381b8eb1cd375d42efb2bd837abc",
+    "secret": "8e8e2f8e3ce960a0f41f48b7a823d8307ba8b0461230e58b499b91fb5e45f2a4",
+    "signature": "d802689b37773573f71a9c3c416e530011a3ee7974664d30227c2ea16d24cb56a186d57066f73b2592fd6c4e81529cbf399b3c052b217843664bef21a65d8181"
+  },
+  {
+    "msg": "b0326a0aff7b636e39a4fe0c9a03ef7651af899499f4d951b2bb0a",
+    "secret": "10686373082ccfb2b84e0ae72e4023eb9c13227e96426dcc8493259f6f6c7f31",
+    "signature": "4b3d8829d082f6d3b551e3311432216f8a649b26d7429126489bc59c0ad5125a1f3bbb3fdb20864547bc7733669c98e7b2b559c77cb6785116d09a8aa3f6d68a"
+  },
+  {
+    "msg": "83021c2d88d1a8901777a100a24433828924ce3b8643ce408349e1a9",
+    "secret": "475a0953ef7641a6115b963217900d7e7bc6f764d9d0a6543843b76daea45de3",
+    "signature": "6dd2b9cc733130f01630cfea33f7165750c839b68cd7cb7523e9a2920b5733a5ea5a475e51793280e4deab7c5bb27bc98c59511825202b78c8ed326ba8bcb783"
+  },
+  {
+    "msg": "9e89d3531e909882289afabeee580d6ed95c9bb97c2a0cb3e2df34c93f",
+    "secret": "0e714095c59a33103bef37e30133aef81d3d82f75f0c7abe6a5d98ad723104d6",
+    "signature": "416a8378a5435b1b476106dc38ff5c26343dd29459fb676f93a1590c9ff3ef06e1d85d942972b1dd6e17f27c4ba95dbdf5bbc398c7c554f05d6e685dc23f9106"
+  },
+  {
+    "msg": "dd09568afcb2ec0a88e7a952516911becf4422a9297ba5cfdc88717bcefe",
+    "secret": "f18e44c9c01042212bcab7db61da9a3275d7ca7b1c343cfc1e7c2b9229a3702c",
+    "signature": "e03dbdcd9933220f10e8ccd6ede6cff53637c61ed3373fc6a870ba67aa238dc29f46fa64dcc34a50a29791072a08b3f365f009e47bdb655d5ac9a35687098909"
+  },
+  {
+    "msg": "6f3763fc14780acca724b12b029b47ae0a54e42a89688cf944b2fee0fb4797",
+    "secret": "2ffed2c14f50d89205fd15374e5669368c343d0753329b0e533cf4421c2342c7",
+    "signature": "1208903c2ef03a44fd1c79f7fb34262c1070d12260eb31323db4b9bb572d13b93670fbfc4737a63482fced399c6d8a82161ec564114507061a465a416de83185"
+  },
+  {
+    "msg": "1ce6cadb4a3b52bb90239a81df908c0ae4a48da2a0bbe8e863b9f25b472c82dc",
+    "secret": "777500441cc9fff20e9f36bc1adcf0d6c83e649997f08ce25384e0fb0eba96c4",
+    "signature": "086d4215eca20c38c237464d890fee375f080d9cd2bc8076a19595ab6bee458466c4a2fb49fc9a3285ef788283ba9d2288037e7865000fc6f9bceeda2415ee82"
+  },
+  {
+    "msg": "8bc5924293714c0133d590d6ce9f1bbdeedc2d0a791e91fe389a250f75f7d61166",
+    "secret": "016d72a0bde83cb185d9b4bd4dda94ffd8a64ead53d6e0362bdc660f4260bc50",
+    "signature": "0ba54ff3b8d2721cfdaf40c0f8d0ff3b61e95dd96a4f3765afdb0894143f21bd525f93f8dc048edd31594558082b08588d918120eab5c72d165d2f419a3fa302"
+  },
+  {
+    "msg": "6f3cc5a91723ca14cb6b69c3190d55d8f61841dac3815c49974569dae5ad4a6545a0",
+    "secret": "989c8394b3eababfd1319d0fef27008b3fa2d22dd6a48b41154bf1fcf30e6949",
+    "signature": "966a60ec7ecf357244e1d30b57cddee8b05e1f5d9c48b50e49e1a854b95e58121c2f3a8607696d600a016fd717d229e5aac4e6e3a1c510f3bc43658af56d3787"
+  },
+  {
+    "msg": "814622df86918939ad17c5ed2d1d3f0325431dba84dfbe478763313feaad3971c48eea",
+    "secret": "839f411389e825a098cf9e2e5c0c5a0c89140908397526f27e9a605e49dec9e4",
+    "signature": "1f8e7339620bddadcab8b1efc1a0af83c65c674df2605d5869fea00855108e34b824dc4bb886640fdeaa0e14774e5cf00a454c0c5eddf2ff8d3834cb92042106"
+  },
+  {
+    "msg": "62fe25063ba5c01bb0eb6fee7654f231f9148c4b174b2164dd2c4e5c26a57e47289be2eb",
+    "secret": "98ce2dae6e0b610202c79e5673864b97cdff199280db8f0a5e7a5dd9b6985523",
+    "signature": "7d7cf3f6fd38a44ccf102f484cd7be66f867aa289e7a2afbb9e9311a90a615f9e3e3b55dae5b22e9dae661e4d9e8044e01844256598720788956e3e0a6a4aa8f"
+  },
+  {
+    "msg": "b5a94b9265bcfa5e3409f4ce3cfecf9d2b0fbb8dc69fe06b340b1f62d22c72100d7091fab6",
+    "secret": "3c25ab3bb51d1264ff0f0ce097814b9730752f2f50d0db18bc63ba5ce34957ba",
+    "signature": "b839c1c1c60c3b6aeffbc4ed7d85f92296fcc1314a835647936eaab78a40f02653eb91ffed505249cf9a224fd8681b63f7d81257367a12544ad01368a2b4d90e"
+  },
+  {
+    "msg": "d5d0ec861831a21bcce0fd21c6047046a41fe05cbc1f814dbd4a9619d7b0c3d234adccc49a01",
+    "secret": "b09c3eff741bc30e6926e9532c5e3a11e3f2cf74895c8ddad33dde741eb1a2c8",
+    "signature": "359f653df9d8d1b92f0c4d30c66e157273a8e8a40064085b5c3fa749cff88f4d9a68b5f902b4f668f924adf7579fa38a821220803a4095acffccfc2f55ad6a09"
+  },
+  {
+    "msg": "0d61fbc9ef233786c4aaacb6c362fe3a87e8385c5c76e76e96ac5201dec0ae622e4fbaaf225744",
+    "secret": "e3a1b545b4012b76e895a55f74258a479fcf04e88df4d058cbe8b61dab1d1e54",
+    "signature": "7016a0eba6d8c138b3de51abefa75cde2a9761235137ddaa0faabd97f7e78b189fe2bd9b820b78152fe5b952359a417c926810b287b178f36648a1bbd5e81888"
+  },
+  {
+    "msg": "c5477c6bfdba3feb7168853acf8823a1b5098a7f9dfcd403d1112612ddb9e8aaf7a99d390fdb16fd",
+    "secret": "746167c6147c97938efe87158d2e3824a25de8ab960a105c983c25a4012ded93",
+    "signature": "0fbf8c0f12f97e5a453194e2d3e280d188f5fffb191eb7da87249ae3103384b87873e50a5a6e4d47cfbeda3bdcf9a761a0bddb8eb543efe4bd31b28f5b89918f"
+  },
+  {
+    "msg": "43d92eca24690e1c8d85b2b46dda5dd1e615bead8cbae4180b50304fd9a467ecf1c0e87cc7e42eca61",
+    "secret": "ec749814f3cde0e2e2f99889736861dfb4763624c210bf494212ff57b6daaa2c",
+    "signature": "9c1efe672b9dbe555b77cdeb688b232fa881e9ec8868b3e5a36eebe5871078158278375eb5e316cf50e08c0c25b16437b1a3aa32641432c388a7623d7b263508"
+  },
+  {
+    "msg": "9a878845b6f681401eb92eba9de5063a39d4c2cb0c39e3c686880ce6cb2fd40eb73d53a31c4ceb6bb74b",
+    "secret": "784613c949005a766dac2513823f0f9ab72b15d2cb1c4071953788286765e9e2",
+    "signature": "a9ce22526480439100ee1761f35cb36b40f13cf5f87e38526a8d6564546b71451558225e768c6c002e72ac303e8ef2c37756e6c637a427913531f9c44fdb3a87"
+  },
+  {
+    "msg": "845c5026a61159fa82728fb46ca029dfd53dbc972162f094d0f4eca25bc2c12d43ca86243bbb62d4714a55",
+    "secret": "6c9ccd55504dea411cd3a6c6302e2925c5cee9e42ff22a04a9f68860f9172044",
+    "signature": "761cd67ec494be4d488c9fc09417a5f731026c5f58333582bef35b03d4730b07898bf895ce63372a23cfffc6c0f42bc088e54fec7681ccdc9b6a79c30202ab02"
+  },
+  {
+    "msg": "a28aa3e99881e8869dce7c70de94d477ae8b1e5a54f8eb9a31a6378f84aa7625cb54d9b6b30c2aaea242f6af",
+    "secret": "ef7c67749186c7cf0c80b2d4df8389c5067367c29b08f3b79b48e219861a3fce",
+    "signature": "da2b5a56b194fdfbc3f2adb215571c9d14c44118c91b237d44065aa32541facdd0ffc0eeedbc36bbf6d5182314895bd19adcbd0435c29287b22e0c68adf1e60a"
+  },
+  {
+    "msg": "79834ca280aaf20ea16d87836cc82f3a98ac213598921f6a9fd4362c2ed81d853a6fc473387acebc143d2ee316",
+    "secret": "ebaf8d312b6121fdaaf82a58b25a11540235b85d8fcd1fc59af9bc01f656027c",
+    "signature": "280aa451ea8857feac53db24bad528b2ab05349e34b59cd8b56aaa2a2356f952fb0d175d51b58df96edfec5b6a9539f659fe9e104193bc727611d96c8b7fc48d"
+  },
+  {
+    "msg": "b8cd45bda687ad49f9d102506b11adada0d6a989487ed9ac2fe12bf506c2a14b67e272cb75eb6850e2998eeb10c9",
+    "secret": "00f6f4a964eaf57a40639e250ebde475bb53329f2a90698660aca3cc0d88f963",
+    "signature": "b2c7334850ce5579ee6e56c86438f1f18e3a417e131378ba509c73f03c32e4f232a1fddf0fa229caba418e7a4993261f7e7823ac0c58bcbdb8c4082df22d2980"
+  },
+  {
+    "msg": "d926a3298b3080d3f3b7e328b3e637937ba28c978597269c93e7501c672049b41ee31557c32a5ef80b41570db93b26",
+    "secret": "c6460d47b201411428355e89636b0fac96ea4d89830b70c79f65beef04c1b2f5",
+    "signature": "b4d72baa6d1f55bae90dd7dd376b16c664a7f5b08044e076ee5c63f34aef691b7251bd86bdbba6ec8083b2b0bae4569ebdcc30f6e00428cca8a7b5c4a1a9cb04"
+  },
+  {
+    "msg": "730d3b4513ee24e886f7177b62a7c421deed0b39d17146985802e1906547b3f9a4a1020222d024551363f90b6e1119eb",
+    "secret": "b9dbd21bce5d28322ebe9e47566451f6d0c0eb40ee42fc148eb17b040beb05ae",
+    "signature": "6a3147bdf83f82745aeea9a793d0e6e31351f1129d5f4b7cb2536850770c4afb80d3a37d43ed5f60608965d9947a3900f1f2b824cc2990378dac773a8d8fbe06"
+  },
+  {
+    "msg": "75ffa0b27cd5b739fdd977bbd4d996eeac3398e57461ef844d89a8d07e4e300e40386a873516ae0a7d70031a22463a325b",
+    "secret": "9f267d7bf9d94f20dc3c23e4dff5384293ad3f8da71be821c99f284403237c0a",
+    "signature": "88abf01016e2075ba91624ab2d88bd3ff537cea3d6b212b37ed51abdb70c84670a28a886b3c6a628c21b3ab4a104cf96638594f8ebb22bf2768f83eef47edb8e"
+  },
+  {
+    "msg": "",
+    "secret": "93d472d99b2aceba55ca5fa26237c67ce5d7bcf1935755ec8e48d164f7d85dfc",
+    "signature": "d18b46368ae5dd75e4c4e0e2383dda980ce5510f7f7f4e66b0ddf33f00091992d39fc4a0b91f80357123b5b789bc284a2fce0b09b9c2c54f321c4c0267626a00"
+  },
+  {
+    "msg": "78",
+    "secret": "88a038f82111b66e84f622aa39498e0287d86bdc42e7ae1e5ec2ef9aabe6d536",
+    "signature": "404be946f2512839a739e42c415817d243379788bdfebf00d0a6bff8b21ebb80e95ea4f049f379912af10e4bcc83e581c3d36fb269423e18a6d4582d6eb6bf0d"
+  },
+  {
+    "msg": "fe49",
+    "secret": "f9f034faed81cd372ea36ed019d5361df6c3e1c2cbf120ef7320e67eb7959f1a",
+    "signature": "693e12e87ea244059fd5f92ff6627c007f50f42465a212bff4b7f8c73e7c44dc673e3c553e175d7289b1239694584e2af0b354d3a2c5768d952a91f32e847b02"
+  },
+  {
+    "msg": "1a3c63",
+    "secret": "ab3e872591009794a5e4fc8ba2813aec2fdb3b8e737285022ca92fb4fc941339",
+    "signature": "8f2ff78512f827dd4a0412f9a2aeb5f59075696cada4ca2728e4eef71d47afa539135ffd04a35b4a979b43a02ff094976ddf71e03a064c40a02d7b8d70e84508"
+  },
+  {
+    "msg": "8d1e3da5",
+    "secret": "9f90e4bcb6d8ed5eb6cb8a6d21244d7d175dfce2a3757be6d86ac627084b6ab3",
+    "signature": "2e6ea3eec80c8df51ef85cb82677496ea2a9036b7e6f65b74148f3e5fa3f2bd7ef0d5b8e5a8c092a7ee2a103bdfae1d2e90866d6c5eba4fb641cf90d6cd5e109"
+  },
+  {
+    "msg": "42ce78ede0",
+    "secret": "6698f52d0d1f74f2c0d022defefdf46697471c1ccbfd9b7a5c9506d51e1c6323",
+    "signature": "68d9139586d5ceaa87c1f1b4aebc6c1b9a4b763b3348fb6a4205926d0bbb8f434348c7c502a3d0bc499a55b66cc73072400b86246ee6fec13c7148231bef4b0e"
+  },
+  {
+    "msg": "df46e7aca8ea",
+    "secret": "803e0b485b471e147bc554196d9d8ad448f049bc92beb804611be25aa7e0ac9e",
+    "signature": "a314474d60781aedc84680367219ac1e4a2bed05565f25de4ba59029efb70ed50e474d44ec5edcd9feb177744a976a5f64a3830b98e91c9775815c2d5be41e0d"
+  },
+  {
+    "msg": "2869aedc718582",
+    "secret": "82d010e3d67d5ea6741e1dd211b76b4d6682ada52195119d3d4dc65740244001",
+    "signature": "fcc41e61a5dae75de9d5e9840b6e244f61af012abba11707b66410bd0826d5f5faa1467f3ecdb6b589a9319d73ab4f2a15d69b740b6e76aa3260b8cdd1eb170c"
+  },
+  {
+    "msg": "adb7514055ade786",
+    "secret": "13064c051e0f4c9dd939da9ef839a707e8b0d8605013c7fea9298140b200536a",
+    "signature": "370dab4d75514d32a08c5c274ca06d32d0d856fb49aacb7382f3ea51bf72780a669463a8c79683434ba1d13c236ebdac0454058c77b2d577383c6501456b3283"
+  },
+  {
+    "msg": "6c9ca3edf6eecc2627",
+    "secret": "dad999c83196d22a719028d5608c9c1cf2800050ccd48303742692b18bfa70df",
+    "signature": "5dd8aa0b6c77d7f58cdbc58fea6a8b4235d813b280ed3337adf5c2e6ec9b094e98d6c025843a2bafa973bffdd36cd63f6b6282cafc82f62e1b0bcc0c49032801"
+  },
+  {
+    "msg": "b6f6543206f2e093bae6",
+    "secret": "d53fee096c1324b79b5e105f3d97fcf596bc4cd7ee6187f168b34dddeae266b6",
+    "signature": "e425e51799cd5b51476589651c95efca931f6e1fddd6ecf72474e3e291a9643ea959dcc3d4ce2e4c1a14f031704c72c23febe2837a1f121c21b9d6f16c9b7680"
+  },
+  {
+    "msg": "4b95bfc2838c42d54a9f85",
+    "secret": "450daa8981088052c00470191ee2ee71541aaa9ebef00ac6ed0f67b62ccec0ea",
+    "signature": "f7a21a44a10addbdfda17f7fc5d7438a1ed7518211f72155118071a8e6992be86b5778860e7d1c1932bacb4b09deebcd6b7ff40800002a78f73a2578a72d1c07"
+  },
+  {
+    "msg": "f5a988f5f4d062d96d841cee",
+    "secret": "e7e6a7e9b432550734bb92119ae4d1c3a2bc91e972521918ba16a28be7b8bc2d",
+    "signature": "6bf703633ce3bf50f085c061d2d5e5c70649da96ec8db036b63c83d1f2fcf5a5ac0a9773339d98d38626a7c8aed1f4657a1def45fb5c23224977486bb9eac10a"
+  },
+  {
+    "msg": "f8fddb5ae4ace4fa510f882742",
+    "secret": "0213da3a2c17517becea5228ab181b43b5d6667b1ac97c41d6269326000e37e5",
+    "signature": "555da045b36f052ace2e12b5b77c4579f7f28b53b8cea0bab6b0975b4ebf7ba28d0c48c43c6f840c3e704623c671d77eefb8cd6e40d39745bd6b88d1939a8784"
+  },
+  {
+    "msg": "3da6296ba0db5ff7f0800008395f",
+    "secret": "587931cc89b2b996164f683c0b7f7a21cc5a32632f1b02c88b5ca29246a97b50",
+    "signature": "e08848223ee675332cf8c072f831b9cf53df2b36f158ede9cc8a4dd1a3649c34baad73469e088077412fa6083fc72b874c8cedad3ab88117e1d4d5dd73d65682"
+  },
+  {
+    "msg": "11b45e5f224fc1c7cb77ff9a2f2487",
+    "secret": "b7fe750dd550cd29b59a9b08a3004368f1988c837d19ac3bfeb98882dd535d20",
+    "signature": "bdaa348163e3acb8b4ced44cc3ac93e9ce928efe8bf7bb76d624d084596e5777c5e2c02e481ba4e71f0141da5b200e97ef08674b183df46c6796000cf43cc689"
+  },
+  {
+    "msg": "0e6cb07324cb4a5808c172dc147b805c",
+    "secret": "a924fdb5ed177c9ff0f36b88824a41ef080895c84b1d077db00f1a27acd2b55d",
+    "signature": "5e2f8b528bb1827fe6367ac8969e56a7764bcb806db90a7fe2afc793d779ff6fd35ca6b49da48cee12e4e6b82bd36ab9d7d960450da7f4f35fa62fbfbc046189"
+  },
+  {
+    "msg": "6a88459dfbe4089b9a4437f129df94ad5e",
+    "secret": "6ca34d1b35766d2b98eebcbf1402fd58e2f0c34921ce187ef9140a1146a10be6",
+    "signature": "3d11ba3ff09322083d966e2fc5e2e4e129545937323d429b50c45945c3065aaa1a1054bb770a5e82afe05715a08363fe4c47c3a5ca9541a5246c2280593d3208"
+  },
+  {
+    "msg": "b513688bd4fb3e9279ed44d42b210643a655",
+    "secret": "03acf149c034f4ac9dc79ca8b171cc894abf2fb0bf0cbc1f13278d3c3d89c68c",
+    "signature": "eec2ccc354befbd918bbad60cb59678b38ad65fb2a56f352e32e7202bec3534c91e3702a7e5449e17a00fa0c1f36c2a816528c323da5e7ef511f5a45b965698f"
+  },
+  {
+    "msg": "573d8769d60e4edba5947ac8df58abe190a2df",
+    "secret": "5565855a66ceae7ed93603ed5b6857cff5bff04caa3e73d1ece0fb9ea9627572",
+    "signature": "fbf8fcd09775c798cd628264369786202de8a1f6c82bfdda9c09ba867889f00ba68daeeab4699c2ec9af2cfb2e2b0970c7130f675f58e97bf4db4e2cc7716881"
+  },
+  {
+    "msg": "bd90233d25d8adee6a2e5a75e3028adc3782d770",
+    "secret": "86a1022129b57c42b2653b5616a3a78afe05bc2ae7bd0cf60362d188bf911575",
+    "signature": "6f8cc6f6f6250572c26a15992e4e72bf7b906ce631077f8c6e54974330cf52b09444cd5f6382e536f93a8751ddae4ddf9bc639cc47ebad657b8e7ef558ba1700"
+  },
+  {
+    "msg": "cfbede7797f686e21c1f9ee4b453639ccb3db02c60",
+    "secret": "45b15be6d6bc92170716ccad732e509ceef9ed52ca72ac43b38c0c0d77657fed",
+    "signature": "53772d89f7b17fbdbd46cb3d610a09955e30605478fe967fdde3233a84fc0df39af9823045e539f117a06713fda742865e606324a0f219b288678bb33a2b1e0e"
+  },
+  {
+    "msg": "d659051d35e1fa886da17188dacfe134c8fd4986bf12",
+    "secret": "e3a49f9b9b7587a36987fd8ff25d7ee184bcf68909ea2c9e8467cfb0d1d83433",
+    "signature": "d7b80c75738abe2c1eb31d8450ac80841031c2bed70be6e7bc276b3e707f71cc2bcb84e46f1094fba4a38310cafe2acd02e5e4c576ecf7ed518f2022eb9b8708"
+  },
+  {
+    "msg": "77fdb902fad9736b2f1c0a9470e6270c1b7b80c47fa7db",
+    "secret": "cbf6c8494e02b93d33802901756558db7a33fd5575c9e95ed64ca027387ac161",
+    "signature": "266f051f9c48dbf07d5115c510ac2a13acd3222c9a9d148be28a3d1e4f82bae01f73ea68765e7db1421407c8794f99da672b16bb339a65b8c53dc444d271dc06"
+  },
+  {
+    "msg": "798719340e6c9959be35ceb0f38ee8a81c971f214a41c4e3",
+    "secret": "2f033bb8b72c5e016e01c74623d6500f2d2e85ba7f4c07e684725e319fa82075",
+    "signature": "dc6458aefa87a454c94f250c360af1056cbccbd7ee29aa1c826cf7d9503eb1e9db4e886210c8c29b9962f791b9ca5f2f7559463c61a2e177a19d9d801c5c690c"
+  },
+  {
+    "msg": "ba0181e83fb8573506e337a21bbed3d94858e8f8bcdcee6178",
+    "secret": "22ae097e5e8ef789f35191a8c9610f12f3ebfb140f988566e965d1bda1ecb5e8",
+    "signature": "ba0c0fea15e5583bf180f81410c82eaa03bb043b5543f6d57d66f3970bb5c7a2cf12db353bd696327b35121c788d9c0ba4dcab0278570ac37e15e88aa2d94204"
+  },
+  {
+    "msg": "3ae814b6d430008d9d11aff370c8aba4e2965fc27a7b86db62fc",
+    "secret": "f454b23530a1fd27ee768f39b1c9c2a3126dfc15ad21395177e71905863efc85",
+    "signature": "bc0dbe63e5cb5425ae18a7332ee43193bc93db9c26868fa945e326c3598dcfc16556679237e653e39e335c1cf341b23466fd5637da230332e57f0162766a040b"
+  },
+  {
+    "msg": "e7e84bd583f45c9dff328197d11b9d2dec5069e9fa1226815b72e5",
+    "secret": "28598dca5598e9c56eb9ca7a26e6c4034fe272057410785373d77e4bfe0b676c",
+    "signature": "1c19b4d6ae6d94b6fb3ec58c97bd15cea3d54c21958699107d5e8b208f5ecb16f9d9f0b692ddef7d31c2ce396cffe4b48845cd3263b77ecd42b9a162c5fc078e"
+  },
+  {
+    "msg": "896d6f52e871962d5d27f579c5dd42df247fba2806a1de895098a9bb",
+    "secret": "1a803890243264e8da5613bf7ed9c17f7631a312ac2593585269c0c4e598977b",
+    "signature": "de9cc5224415f045d52376a6d04f43fbaf4dbe1fa60919ce7f950f98bc929ae93812db7a80673f29d4ce9220d81b55fb8cce5e57ed4b059b20ca28bd12a0e18d"
+  },
+  {
+    "msg": "add25a3ec36f9d8db4d7f3ebd1e23622f2c3db922863b779dfa92c5c32",
+    "secret": "eff034aabd45f1e665aead8b4f4942dd7297735c328e684e67e4c79d3dc717b8",
+    "signature": "b769f8a8edc7bcfb2ef4677f940e00e73489df5094f7066569eeb9101288cfb315917dbdb2bd03a20380f92db18110e01e3c31129e1fc159444f3cf6d34b9b05"
+  },
+  {
+    "msg": "8d1a6740e3c104dccf6d7424fa62ce481229786f3f3f795a43606f915236",
+    "secret": "13e2cc5a0fb17bc93272ae7c24d8e3a4ea79f9d2a28b4481bd868558133d6641",
+    "signature": "805e2cbf2bc32bc80e8f1c3cd6bb618fbe4539ed7094f7eb070161d0bff2e2eeb81393ec8e1e4581d1d214b5f5043d99745c66feb09f9b76c46512ef8908450f"
+  },
+  {
+    "msg": "820521fa473f8ee6ce557acfb13cfcfeb9e243c08ddafb69ed1ffb58248353",
+    "secret": "81888cb69c310d23160ba5a974cef269913d6b98d0854384b50f9e8e35d6155f",
+    "signature": "251f5bded93817f412e0faecc57fc2074a48e44c96840e0f978440c2fb7795fafb3ce6520a74052bf5f825ddaa8e2d8b18125ac4c5b028e9572569758947810a"
+  },
+  {
+    "msg": "1311f85113b83a220ee436383532405b991711f71796cffd34d247a2648862cd",
+    "secret": "2a1c74345b43fea7a72d115820d30afeb831ac742d4c02dfe1f12b8a73fd7579",
+    "signature": "ca4c6055b781676016283b4daa13576a1a13f784cafb1d4f1f0c97228ca2906e3ecdd7f0ca3a80ce71563c50474f9e997059006b934dc7c231018ec5f7b7c781"
+  },
+  {
+    "msg": "f30946d8f8bdf81d72fe263e1b86d9e3b7d7be93d6e7f78d596ea3a0dd18609e34",
+    "secret": "cc61aa0f0803b89f18c63a43a7d70310916109a66fcd30702ff4fc4acb845571",
+    "signature": "02a5adc8e122c6896ae3969dc6d3f6387805ab8502989f7b68dd69f477767fdecc2c6ed493a52814d44d967fb78fbe58744e3217680fb4cb1f6e5dddb3c0900b"
+  },
+  {
+    "msg": "38d5272ddeaf42b3b9862cc2651ee009cf1536996d96a3156455f6a9de3a0c841ea2",
+    "secret": "2d8eccd1c5d931f64bfe14dfd48afdb869f475a7c69cb43e420e5c7560836c12",
+    "signature": "e83dec5e15c8f6eccf7c3a906de5535d5869d4710882537be12936194028607c518181a846935574d2ed89bf536e76878e1bd7803dced59e7f590495d7f91703"
+  },
+  {
+    "msg": "05829e42135396ec56f370fb561ea3bc87385751421a68577a66c6081a0c4f93a8f331",
+    "secret": "c9beaa57cd3576949610f82873515943c9e7861ea211bb41c9b6b9055d62c79e",
+    "signature": "618fb9c6622d337df86173cbc3dbead7deee58f7f78768936e5a74ecd43b627e2ac3c94dc02a0a652016364743bbdf95c078d83895e89e6f13ff0f6c44095289"
+  },
+  {
+    "msg": "9a1b96b3b5eb5072f4ff5e7a424a50b31aa15103e4d068d90cf390c84236771b1ca5a989",
+    "secret": "69a74e3e7fc01807a1aead00c83ca88b2a8dc549411f015c6f1686dcda55d4cb",
+    "signature": "b4e6c80fe103ff33deacdfe9b04cb49c203b1b458e4aa344d9ab48b23e88601826a4010ebf52d679c662f95e9076ef87e24b8aff4c80f86dfc4559a1f292cf86"
+  },
+  {
+    "msg": "33531cd40fc2eb6f5d9f5948e524e503cccdc013017b306d9bae525e2a10b1eb39e4c12a31",
+    "secret": "8c929ddcd9037fdbf9da1f0ec105b4a293116a899a78b25d1cde601465cbb9d8",
+    "signature": "a3701b65d56ae44a3c0a05f33d40518c3524439740da196671cadc5eccd15a85dc5f51373cf62ba7856b16def0dc0d550afc65a4803ed79da492a848f8d2a58e"
+  },
+  {
+    "msg": "6e8f2e937a8f1b7b59cbfb962385c632e0e8870e5751a8842e55deb107a59cd89a33e9e35c18",
+    "secret": "3f60a93f820def17699629de09cb056f2c410c471f6e224c973c158611c7d50c",
+    "signature": "8dbe4130d2f6202e14e0289cadfef9f0ea5ed69da8b8a111c25e8b3824f00958fefdbdc5097fc9021e62cb1f958023c58bf5945502b5928b7f2627cd3b16a186"
+  },
+  {
+    "msg": "2f38d1c507897026aaa08a640517f1259ea462388695a6a3875c1c4f0c1c11b7331ae7df235cc9",
+    "secret": "e0c0abf8d46726b67dff6e39dde8d2431227f1720a16ef9a86c73962f00122b8",
+    "signature": "d60ed0e03970d3d679daf7bed525518888243b611e25cfd15a8926250eb80cb8160f706da67aff6c5ea86cae446cfb7c5c9154cc4ea53176dc043419c940e98c"
+  },
+  {
+    "msg": "113149bb8044b34e7864d73fa66c9693f95915514f4caaedf65c5c9578afba36e60937575fe2fc70",
+    "secret": "d8cd3640f6e81424038b3fde083fb68aba0c29671c33a7861233a3c2121084d8",
+    "signature": "c7fe83d54d915acc2db7f2824c9ff68bf8a708c926d5d6f6840639af7f658ef14ad21f7fc8a0f83571308e377043583bce6f57ec37bda65886ad21df7b908088"
+  },
+  {
+    "msg": "752d42cc7a5e3a8f5e62aef8082962c97c6c092c982777ad2ae3c5cd3f4bfa873a263f81a7686cadd7",
+    "secret": "7581fde1314d40147ef808aebfa59b05c8534afdc3483a41328c2e5c90a0f0ab",
+    "signature": "833cfacf30a15b63a63b5ff5c4e80c68a106b2aab1389d02b3865e409ae151f29977d7bb02b0c05c7e6b16d0e795d015972d752b41f5482747bde1655f87d181"
+  },
+  {
+    "msg": "4369e52ec32e945cceb12456e9bbdb4e862896dd458d7e600955a30748362e035cdab0ca8c3225d5955c",
+    "secret": "65ae26607c65e865d3486fdfa14251b0382d1296ac1d0101b9fc7171c93f7c88",
+    "signature": "e7171c9b6499ad9ae0257462948dcd71ac689b498cccad83be5a8e5f557df2a21a4008370accedfd4331c2746116bdba6e7f5fce889970b211f378e468a8f987"
+  },
+  {
+    "msg": "1868b4dd2ecff80a8dd77ac7a6993298eda5041cb697cb010e787b865f83c55cf08ebbcc9b28da57778ebc",
+    "secret": "0884e3bc726ca620a9134f02cbeeb192aa46c2e87d1711be7a9f12c369be0bb3",
+    "signature": "f01309b50fc5d14413781ca140f0e6809db6aaced860aae18030bdb6d59fbf3a283ccaa498ceab3b8532543a670763a436da8740e2d4bbe2375f55a3a07a4783"
+  },
+  {
+    "msg": "05364385e2571c470384048cff6dc3221c2e32070afda8ef0d8671dd7639ed7ffd13faae0b78520e1c486a41",
+    "secret": "28b5dcb3778a97e1932641c0db2840f320de3331b336843cc9b0a7d0847158ad",
+    "signature": "72b76239a28fcabeb1478defa972deebea2c95df0e6f6e5091b5bf768d7cf51742993d2ee188c50dc5a3e2dc3eeba2034fdd84c20b4d514d5444cdbc4b7ef08e"
+  },
+  {
+    "msg": "304fa9879bd94a4c92f4e6e03f8406b2876c0dc73b8f48f9cad5c3d66689d5771fe02dfd1172d14e1067085452",
+    "secret": "015d006506e5f57e91aee8f9ee5f499c37857c5a240e29852ac55c51d02a4979",
+    "signature": "0725920864233ffe0abb072fc8a34f5a869137b0789e53d0832f773af57b3774b1b1e39a5d61fdf7fe74c64d300b557ca8b034ae083e7a64ef6cdd30b65f4388"
+  },
+  {
+    "msg": "7ebbe4e55f8c0410709e3285a92ae21d272ca2189e9b1030b5e7f044dd547f40b0c3424c4c0567708d22d4ad471c",
+    "secret": "987d88133846c3ba8b5839f81c2364917cba01a156c27a75efbbb18d2b038410",
+    "signature": "675b0a86f65073c85e733c78a630207e9a5819b286e156a721e59db878ea270579359b53f3332ee0e7c86538c9f1313dfb597ca2cff89e0a6941e1056d58a408"
+  },
+  {
+    "msg": "1f77aec89a588dbbbf432622f1c4144685b41350ad7f1c116133264ccd69d5108cb8d51a554cb97bb269c4ee7ec3d3",
+    "secret": "fd75b28318a1f3038964cedd65d8abad03422aea7c8035cd818ba2ced4804a55",
+    "signature": "4afa0ab8963108a504e2da46f3f93d3ec7e818762a73b889669b4a98c24b3a8769200e59f75b1ca5b080b5d62d5b78dbb1955a9e5292101f1ba41919ea134487"
+  },
+  {
+    "msg": "fece86473bfa325ce4c51ee2abcad77d385adf304120a34ee9fa6ca862854ea1920668f90bdcc92b387722df228935de",
+    "secret": "ffa2490743f42aa3e78f54b1518054182a1ed7d40e0eb165f0cc6c9031fa5e8e",
+    "signature": "29c94c4541eee66abcc4f857f22f2125ae4a634abf7da2a4adabc14b6b4a1872101e995bc6213cfa975e53b25ba2ffa16a65ef082abb58bce3d06c502e9b3705"
+  },
+  {
+    "msg": "ce83e2e14ae7be44d3f601ed95118e1781fc991cd62541af4d6e587eb5ba04a4f8e32b22b3fef512fc4edf94793a641e80",
+    "secret": "f41a890c27142928ec1f3ba0ef6010a2dbff4affefa3e3379ad477daefd6e075",
+    "signature": "10b1a604f7d954fa2516969857f22b32f17c713ec596f23d89beb2e1fa32af98cc7f7757ee443fb0477986cfaf3353492d410cc4879f1f21daba08a61747c909"
+  }
+]
diff --git a/rust/tw_keypair/tests/ed25519_waves_tests.rs b/rust/tw_keypair/tests/ed25519_waves_tests.rs
new file mode 100644
index 00000000000..c231ee362b1
--- /dev/null
+++ b/rust/tw_keypair/tests/ed25519_waves_tests.rs
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+use tw_encoding::hex::{self, as_hex};
+use tw_hash::{H256, H512};
+use tw_keypair::ed25519::waves::KeyPair;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait, VerifyingKeyTrait};
+use tw_misc::traits::ToBytesZeroizing;
+
+/// The tests were generated in C++ using the `trezor-crypto` library.
+const ED25519_WAVES_SIGN: &str = include_str!("ed25519_waves_sign.json");
+const ED25519_WAVES_PRIV_TO_PUB: &str = include_str!("ed25519_waves_priv_to_pub.json");
+
+#[derive(Deserialize)]
+struct Ed255191WavesSignTest {
+    #[serde(with = "as_hex")]
+    secret: H256,
+    msg: String,
+    #[serde(with = "as_hex")]
+    signature: H512,
+}
+
+#[derive(Deserialize)]
+struct Ed255191WavesPrivToPubTest {
+    #[serde(with = "as_hex")]
+    secret: H256,
+    #[serde(with = "as_hex")]
+    public: H256,
+}
+
+#[test]
+fn test_ed25519_waves_sign() {
+    let tests: Vec<Ed255191WavesSignTest> = serde_json::from_str(ED25519_WAVES_SIGN).unwrap();
+    for test in tests.into_iter() {
+        let msg = hex::decode(&test.msg).unwrap();
+
+        let keypair = KeyPair::try_from(test.secret.as_slice()).unwrap();
+        let actual = keypair.sign(msg.clone()).unwrap();
+        assert_eq!(actual.to_bytes(), test.signature);
+
+        assert!(keypair.verify(actual, msg));
+    }
+}
+
+#[test]
+fn test_ed25519_waves_priv_to_pub() {
+    let tests: Vec<Ed255191WavesPrivToPubTest> =
+        serde_json::from_str(ED25519_WAVES_PRIV_TO_PUB).unwrap();
+
+    for test in tests.into_iter() {
+        let keypair = KeyPair::try_from(test.secret.as_slice()).unwrap();
+
+        let private = keypair.private();
+        assert_eq!(
+            private.to_zeroizing_vec().as_slice(),
+            test.secret.as_slice()
+        );
+
+        let public = keypair.public();
+        assert_eq!(public.to_bytes(), test.public);
+    }
+}
diff --git a/rust/tw_keypair/tests/nist256p1_priv_to_pub_compressed.json b/rust/tw_keypair/tests/nist256p1_priv_to_pub_compressed.json
new file mode 100644
index 00000000000..ce6a20f605e
--- /dev/null
+++ b/rust/tw_keypair/tests/nist256p1_priv_to_pub_compressed.json
@@ -0,0 +1,2002 @@
+[
+  {
+    "public": "02dfe31ef16b7c65b47d44a8c0c422d9ed9ffc599fbd529f85e931a90117d4c84f",
+    "secret": "ed9ef57bb1a39863e79561d35e479297275eae7d400d9a296abe8699a8ba237e"
+  },
+  {
+    "public": "03703d9bbad179672176410d68abb2705632d114d2377b6821858a6a802913d129",
+    "secret": "bca2a4e7db34577e1193d6b6312244a246832228598c91fd5123cba52c182979"
+  },
+  {
+    "public": "0253b7183b79ee74cb498c0153d3cd942bd17d4993c388ad7eba57de94d4b896ed",
+    "secret": "03750b5633bc1886819aa9674dab0cb86fc62795af2661015e1fbe4a60b3995b"
+  },
+  {
+    "public": "03b08e7f118a904b5818aa0b29abe6b447fa04733904d4d234a0734c867489afb4",
+    "secret": "00919591227121d8a75f49ca5a0884b0e98967314d8e56e35bc4c5ff1a20b543"
+  },
+  {
+    "public": "030d761d0225b983e4a0de15253bacc9f7c02ba8b549fa96aede56d4e32c2b8987",
+    "secret": "d9051640e11607b11e2f4d059afec950153db7acea11f1200e698b00de49e1c9"
+  },
+  {
+    "public": "039fb39dbd7de59971fa111273d5dd4911aedd3e3f122745144d1c39b50911207f",
+    "secret": "c58ff00d1749c72c6743f87be3714a1703a1217c8f702c2e460b8f0bda9552f4"
+  },
+  {
+    "public": "03aa64cc234b97e17bb873bf9644d1af0ce4a36922a2cff1feb4195300f9d79be2",
+    "secret": "7ed09f82a1fe14dabadf0f6a623cbcf461c9f51cc689e634dd2c950c484f9bb7"
+  },
+  {
+    "public": "02baca30ff26df6dda26cf9b6fef037824f27ee4f1c8bf2226bb50b18b981d3f0a",
+    "secret": "9043781fd8a9c17ea7b3c7ae8546c9efe9f089f1c7af0f0318c95f6bcf4cb575"
+  },
+  {
+    "public": "02f155c59d49f0ae4db7efa61ee473c8a024377f7c44e6f78b71b86a277c487ab6",
+    "secret": "d39c2cbde0a4ae92d066854372969236963e08b27eec3ccb4f08700c04949506"
+  },
+  {
+    "public": "03b68926809d4326ac459161f3d84ab5480c8dd3fba007d90c45629e5794eb4e27",
+    "secret": "a40185b5e0ec6da301cfbad30c418635269017e8d2c839d9a415d15bafd48ae2"
+  },
+  {
+    "public": "02f4939235dfc9f8b162c310b74ac6367419441dfe3e567a9a9aa4c52417d259ab",
+    "secret": "c20e4020f41393638c707e6aa09c059fc40b74bdec9553dfd011f9bda4b3d000"
+  },
+  {
+    "public": "0298595e656df719bec30828bf9f4a0ad516cf85ab6d8bfc8ae13ee17f5eed4d29",
+    "secret": "7436540a692de6ef33de2a6d7801176e4cad20c4da8149a28b32f4c375be60e7"
+  },
+  {
+    "public": "036e3a2be65b0a5d05939fa79d582f456d0861c4a2f31a28780debc827f23ac991",
+    "secret": "e23f18768a48dac770da04915fa328245b798fa93a26c2d8f219974a6c9af83c"
+  },
+  {
+    "public": "02a987cf9f5ef51d3cd68b43f0828938523f04fb27cd7131095db2cf95f5afceea",
+    "secret": "681c83f84f3da5f2e080ad0f5e551ee208a45d4e21189be6545e3d27931b52cc"
+  },
+  {
+    "public": "03f87fd94afcd1c25db431758b0c5e5e07767ca5137db16e608723f2614bc1ba3d",
+    "secret": "3c275be6f363a2f38aceaa07ebe69b8fc16374981200e2c6f5fcd674fb69e584"
+  },
+  {
+    "public": "036af4fd44051fc437d7c294d087a54430661c9ef22788fbcfa3d0cce9f635a4a5",
+    "secret": "3ad3b8e25774f0603982a6000b6f635e3a0927abd213c0999377e3727a469552"
+  },
+  {
+    "public": "02ee2c687ec9786e41ee84f3439ca867ffecfc3a8449e114ce760f5b8b18d9b506",
+    "secret": "60c7d4d27fc471df89094a8b46e7681a902414fa54c808a96b58de313168d4d6"
+  },
+  {
+    "public": "02daef6ab84ece15eee8fa39c7f089634411f1f5b79314271277a5866e237fa4ab",
+    "secret": "644ff7e768fd03063cb695c524449136aae637664dab255b094fcddf7a9a9d2c"
+  },
+  {
+    "public": "022c423f0bfc4302d4cf964d22247b98bae63b014e9d505a1d3c6ecc37aec1371d",
+    "secret": "e857fc8dad9db8022e22415be4e811d35dcfdcf733ef448f0e076f3b9331a4a8"
+  },
+  {
+    "public": "03779d2844b016f5e28e821a081671573888f2bf070d4eb3c4b254ad586fe5605a",
+    "secret": "95345497f847940a04d4a8a08a6d1bbd42cb87099b03b436e2fde1f0aa9b9d4a"
+  },
+  {
+    "public": "0313b5b6c9e03cbe397c5d5d4cf3b4d7f03fcf06fae50fd801b33724575bd19f26",
+    "secret": "43e7c2a816884051a5fd9d39afa859d4579be1351303dbc2b82c8d0542b635b3"
+  },
+  {
+    "public": "02547dd5270658bc9cccd19ee7c92f82da7e8b778e7c96a254983c8fbdce2f2335",
+    "secret": "c9c714d0a63b624476de4d6c6bb92e003f2abcbf2098827528e1bea27fb6113e"
+  },
+  {
+    "public": "030597f69c4cdcaeb1bcd690f3b957a3f2e4ea3c195bfbe125eec823907bedd2d2",
+    "secret": "b9b4efb24c1a10ede058b48d417d64e9f893f11ac18acda86a1b604989eecc07"
+  },
+  {
+    "public": "024c2f40d3765e64a77f17b46a8354bb993a669f3b91c5aea6b01775b1391e9a62",
+    "secret": "99d4f6f04baf38fff772e9dc9d1cd1457693173d9dd8a242585f8fa7f6c106cc"
+  },
+  {
+    "public": "03842e61840c044411f3324e06df9956e7c677b07fbfbabe803a93bacd21656a8a",
+    "secret": "b71e4edd221472a4afe53b934059068547d6e3cb96e8071a554eea8e497fdcad"
+  },
+  {
+    "public": "03e935514ef71e3226172656c4cdf1c2a99e2299b526b58dddfbc4048b6ce7eea1",
+    "secret": "46f1bb6607be17d89cf1a8774e4c09cee6cf494d97c960c61c5c3ba576f0f959"
+  },
+  {
+    "public": "037b56bd753c393bcef053779a632fdb8e95245ce4788ffa9479a272ad0d2cb27e",
+    "secret": "0b56dfb1a4debb0cca33a0702e19caa26d88f2d5203d52daaa495a39938558be"
+  },
+  {
+    "public": "02f6bbf29c2b1734dc270fb9ec43e34daee7530c56ef3caa291c842fdeeecee872",
+    "secret": "d27fd3993f6d7cff9ecc2323c38c80b93b29bdb08836dd34d6e4428b66f765b7"
+  },
+  {
+    "public": "024d245efeb280b0f2ab3bb6f0878cb2226504e20bea37d2b875bf83b1b8a4742a",
+    "secret": "976d82f71b8675f86833f12ae83160dd37c65d70a4e5b3583a20259a55651a43"
+  },
+  {
+    "public": "032096dd59a1b8365ab21936fda650f176cfa2281c6cf6d42b9930cbc33aab5e3d",
+    "secret": "c8a6312e153e33dc37df121a7c3043804cc23b16b1d1e540fc12553da1b25cbe"
+  },
+  {
+    "public": "0221b5a1c77eb33f09501bcbadfe1b39a05e91dae038fe1c4e765c855774157f0d",
+    "secret": "35f2a1f97979f44e1fd4115afcdc5aa9e8c54ea23b65a73c663d1cc4e79d329b"
+  },
+  {
+    "public": "0339d7a0d439d97443f7ac4fce88c78eb199531d1eeb2a3e5ce7553d3493d14c36",
+    "secret": "ab5a4ec44f2e97cbe76a2b54d50aff74a966d1c1b57fb174a8fe3867057a7240"
+  },
+  {
+    "public": "02c96a729995a923b71f2032e2d6b09a6e5922f66eba382f0f77a84395c97ae178",
+    "secret": "3594b104b848ea43a1d95212b628d7f0eaa71f1e3ec18840925070c46b62c38f"
+  },
+  {
+    "public": "02084a9eb9c0583f2770495ad8105498a1f22630c13f5449d3fc673ad0ba4df7fa",
+    "secret": "90901f1beb45fb08c3ce512171654538d39a9f4c56ae8fc684396a37885e896d"
+  },
+  {
+    "public": "03164166be41b4f5fec85343ae44d45ae6c73468438a4dce920729737f19e1b405",
+    "secret": "b5aa79625a305aa340b9fedf61118bd22ac02ed5aae4c6261cabdb2abe1524a9"
+  },
+  {
+    "public": "035817652447c4ed2e32ac28a53417bb5955a9cc3321d29621e69d7625c27b3c76",
+    "secret": "b0b9625228fb399e63e0f73cec09b0878a78d6493a3d50d43419e61beb1dd2c7"
+  },
+  {
+    "public": "03c31f7f7d2bb8565ec9902b8183b0799c0731ae2e2c73f6ce583cecfee385ce14",
+    "secret": "ed910281283f7c03e92ec473fd1d98f675356770c536bf83a5dde4fdc8c7808c"
+  },
+  {
+    "public": "029317038ee7a69ebafd89858b28fdfe84744be1231c42f3f4c41d82332849de8e",
+    "secret": "50b123abcae69a6fdc679bdddfb75bfa2a6ae45113e122b0a7cd5d7769fcd92a"
+  },
+  {
+    "public": "03449d4ccc49174c5f041831472beb25241abd743e41e91a01b777d062aaf16f16",
+    "secret": "07a3e1d1915bc1a88edd115419cf31ecb0f6d2826615914b1c464dd1769e0a0d"
+  },
+  {
+    "public": "03d2f0bc54a57c7a5e899b44fafc5c5098d351726dfcce089c64489d78e6b64ffe",
+    "secret": "697429f1456aa8c74332bb4467d7398c56a8ea92a0f409cf9936ef9ff35c36b0"
+  },
+  {
+    "public": "03769d8d209ec35edb8a327794215c1498274ad1963f0bd9f0eaa46835d2b5df77",
+    "secret": "a44cb1a2908b50ce1603da32392fff8e4f6f94e24780ad8b6e90c37087b241bf"
+  },
+  {
+    "public": "030b267cefb25d786122f2e9ca071da568ca1daddd6832f39d592b944820110d41",
+    "secret": "3a3734213d099f8aa4ba322c49a0db7c604463047a1889551042c5da291a49a3"
+  },
+  {
+    "public": "021491a530631f7d24b7434b0e71e374c481f930933ec99415b9b5509d64046052",
+    "secret": "d89064d6ed42b9294b32560b30fa4b47f740462b38e4bc5da291cc417e19d4a8"
+  },
+  {
+    "public": "02918de11ad3e4f51dfaf7220b24d3bd09cf7105db2deccade0bcbef96af8d7753",
+    "secret": "58e579bcd491f146ce9c1d6d15531ed43b2ecc908fab8aeebeba3fba00817966"
+  },
+  {
+    "public": "02f8bf8d4181695429bb35849cea493e07f52a934d57935483ff40fa56f70a3b27",
+    "secret": "4b45e5aea80f230f7fb298914ffd285431eed8717074e02180aab7665eb4c9c2"
+  },
+  {
+    "public": "03811a7e3f86aa62a10e4b0ea1225fae4885fe2b25b71339d6394a6356e83db9cd",
+    "secret": "ce13491d2a572c39f12b33bfcc904cc3d5ae8b2df7aa2addee560817e1e7217e"
+  },
+  {
+    "public": "02d645773a478c354a13444cea71a16c9b2778e190862d76864bb297a44174d648",
+    "secret": "6d740b071d56a09618585fc43ebc7d331a7f10fb662a3980f6ce864c6f8c587f"
+  },
+  {
+    "public": "02391f171c2f7018a9b80d3795330f42cfb66536ff17e116793b36450291851428",
+    "secret": "a1d409604d77dd84288f21233a523f8e07a31762b9a862d08f2ec1f993d9a281"
+  },
+  {
+    "public": "02071ec493e87bad56da4d8cc5a009b1f8757dd2474abe6c0128c3089e436aeb15",
+    "secret": "3b90a2596117d7f805f640a8deb23b739ac04f20885f6a8b0112e0db6c3a13cb"
+  },
+  {
+    "public": "038318bc7bf139a78ba30444044dc6607f41b1dc69186d88c5ee4cea292e1b7f43",
+    "secret": "b568066c67e691ff903e2341d032bed6039a1843fea33adedd9abf0a03e10a19"
+  },
+  {
+    "public": "02ded2c5ba02a7878df6d058a40b221f2fe95aa758554292e8bf86037e34c724b3",
+    "secret": "41b15dee1526341ebbeaf87d2995d2a70e12736233bf0793734d8d671d791487"
+  },
+  {
+    "public": "02414bf7b8d803a5cd75cdc6592b5f845e54546d5ed39f5ce3a2cc4655e292d300",
+    "secret": "cd9b3447ac7b22a821d3f7d3baa1a9b1c2f3505239efcdf2d74097f3151e22f1"
+  },
+  {
+    "public": "0213522b7f3b5a2abdc0a58d1d2e703c09a9ce30fe627c9e98d17cde61d02237f2",
+    "secret": "58eb7757cf6e191cf9280efabad76706693a6b7909b4230c52fc8cebefedd51c"
+  },
+  {
+    "public": "035cb615483aa47cc488274a92c9831872fac44c7d5a663b320da2d150b8ac1336",
+    "secret": "b1079fa040f54ace26357d587f9c807ba2da561b5524509589c410464cecd654"
+  },
+  {
+    "public": "0328b4588099936102cc2468e6c76469839d5213df843ef75347458772fee85d50",
+    "secret": "7dadc0f5be38adedd9236384bede70821d0e976faa161f38c32a8d77d9a1e8b3"
+  },
+  {
+    "public": "02bb8fbc81cc1dc1fedec5438fea066e9e0dbbf2ca36db0629017a4784590b4acb",
+    "secret": "f209980b7a9cc6c77ae4ca4dbc04235225cf1c88bd581bcc7964c31d2737d9ec"
+  },
+  {
+    "public": "032bdf34526fdd3990b9941a0ddbdd19be3e1a72746f9271c80e20a7be9ed7c715",
+    "secret": "5a96c4548eac8e78dfaef855a31e3b2f19f6447e22e5184514175a3181fdf980"
+  },
+  {
+    "public": "026014f6d3bcf788707718a4359e5ca82916fef261cb59e0fac41888e2d3716d7d",
+    "secret": "ac40b296c5d47882b763ea2b8e00619892228f259bf49cbb0dac7de5e19efe48"
+  },
+  {
+    "public": "0278252c2f7d455598cf495904fc49dc5a45334b4437a818903848407aa8446012",
+    "secret": "7dc88455f4dd10d193981e145f3ef455c7dd94fe73be2004b36f3e6957b3cfdb"
+  },
+  {
+    "public": "021fccdc2771b153f9c56af4240daafb328dab3c26c63184a33da69901465d252c",
+    "secret": "ffdc9d917aa7f510c9570ed338570ae759c659a821c46ecc84ecf2a2cf997481"
+  },
+  {
+    "public": "03c8cd6ce5493288c12e92515cda6e7d95acf91247d985ea3be9a285f9ea0b309e",
+    "secret": "8a3f1339e5d3e5eb4638ed5d067f2708c796912cf2db4d2df9a874443b94b19e"
+  },
+  {
+    "public": "03fd7902a17097e5666213abab7c468d4b4edded117665d7c485a705e74d3d6de8",
+    "secret": "db61083e9207353e7650d61b6eff556c6a1d186c479aebec80e78daf90181f99"
+  },
+  {
+    "public": "02566613da0055ccd808084eda9930bee7b9bd87d915fc3cd042818e4a06f9c9fa",
+    "secret": "bbd52d8f3b98eb8d652f6f58cf4ea217ab7967c173264cb28083692e22fbe7bd"
+  },
+  {
+    "public": "02b65210d52ca798d1297c4aa2dbb959507c815dc56d8883d7fee838f89b66ec28",
+    "secret": "39af8e6f5b809fb761ea372b54ef494f66d5cedc36fca08f7ceb9232c805422a"
+  },
+  {
+    "public": "023e7cae7127d0181c39d3184451c81470bcca12ff2a1100ff5dd36fe6c4cb726f",
+    "secret": "bd888e6cf25a10f2ef2639fc42356ffa8fff28cbf486144c1211242613a5b1f4"
+  },
+  {
+    "public": "03c2ea9be1ffd28f8dade240a710b56d85484b03d3db5660839606a24ee33c5d37",
+    "secret": "d23c9891eb59095189df84bc22750fbd27a7d9e9ac4f70873cf4979bb929162b"
+  },
+  {
+    "public": "0226491f0f7bcd46a90b9f8a10989140ba316d3d37bd5fb2a95a48ef35fe94bfe7",
+    "secret": "b97d3dab39df578003ee19f2c91aa3e507d11fc92d13de898c0304aa812a9077"
+  },
+  {
+    "public": "02044eb68e9106f19af2a78d64ca3de810894da129b6dddc7c702e978cbf9e5be9",
+    "secret": "344472fed56e6d7c3207ac397a43c36b090a8f9d12457bd63b12d44dea805922"
+  },
+  {
+    "public": "03ad394c02ea9b5b0b6a08add9c1ab4fa94080ad7983ad48b0ed043a6aa32401dc",
+    "secret": "e7a395c3ec3385e83e2ec2a1fc5c311e2b74ef5ccf4ac465f5ab0e780cd3fb7f"
+  },
+  {
+    "public": "036ebed918790c734e4d33ad6d1788ddbb24d7b646bc4d8234ed1dc090b7c56ea8",
+    "secret": "1725e3593f625434ad7467d755351f7d619726506ca6d7e935da2727815afb78"
+  },
+  {
+    "public": "021a5fb8fd4ecbef29ea4df79885b267f4df99c7bb02a9238f1fe35260fde8e2f7",
+    "secret": "4071e3e6cb4940f8955660359012f2c326dfe139ca9c9b7d28e9ff7879d5c836"
+  },
+  {
+    "public": "0216087af1622776e43e0977795f45ca41de5a71563b6fda7ddf65e83d0fcd1fe6",
+    "secret": "0df227db664cf0e38bc0ffdb46768c91db2efb26e850b1751e6e1b5675861add"
+  },
+  {
+    "public": "03b710f2bdbd5993789fe317be14abd6f6b81e620691a5722bc6e3e4b031b0973e",
+    "secret": "00a01051569714edda40d8cb2923b8124f4a1635102c96e3d41f305ebcc6b892"
+  },
+  {
+    "public": "02d526c195009bc260461123ec270c887e48ebe28fdf333938d80cecd85fd2d54e",
+    "secret": "4b97720dbfdad731ae54882f7c6f00c3ffeb6a74bd9c07ddf0affd91a7b7d3a6"
+  },
+  {
+    "public": "02d2188294a3c216cd363c54f37535e4c354a0e9e59210f310f25669e1f66240c0",
+    "secret": "b8d266dcc91788971792dbdb6a5006f7389ccd4d4e6403c17fdc286d1c1d5551"
+  },
+  {
+    "public": "03ae5d33a880f6559e39fc3962f3d2835ae5c6c873bed7f58cb13704c2c40977d4",
+    "secret": "80054a2700b28aab41c3d0159dcdbe4028363904f43aa1fbd72ce1d47f291dfa"
+  },
+  {
+    "public": "02094b891e293ddd5419ea5ec66a1fde26d0a7a8fc72afb185ef7808849684ab6a",
+    "secret": "670bc810d6d87744fba089280457898c0b495b3f36e51251ec1eb7b1525c900e"
+  },
+  {
+    "public": "0385090b0a36a4f4563eb7133e177268dcd1c20a70a4ed5e86239723e2e70a2edf",
+    "secret": "4fcc313e7c4b7292809d0945c68840d85d03d999a78f806724a295064d270321"
+  },
+  {
+    "public": "0218211dd231d217cbb0bc06276fdcb3626d7fcfed715a4288a2d753fb17627355",
+    "secret": "a5acfa5c2ba1cf24f6d9e704f2814f7d764c188519b816d471eb4cfa569a4cf7"
+  },
+  {
+    "public": "03aa36a3f9f0f35e9f752cded2739f8b69ccc108d726e8f28d43947a69d607c954",
+    "secret": "e95ace74c329bae92fa1f7fded5959609950bd82d1c3fbae29f3c04c647a0c7f"
+  },
+  {
+    "public": "03d3a36b9088d68dea5f75798483d172edeab7902ebe6c33be51af6594c4ca3c8c",
+    "secret": "dee9d868830320e8dd17d329cd548bc6ceb752a36e4caaca00af84930aa7437d"
+  },
+  {
+    "public": "02897bfa08bcc88211d1396a63b21a703e0e600fa2374fbd3fa2f852bb318e67b7",
+    "secret": "420cc2f574be5ba97d773324994e7c0d5abd0dbebdc977a85689b06106265698"
+  },
+  {
+    "public": "02e8cc38b83dbe186d83748cea7e46e458bf7925b4357e9e41f2ba561181049e06",
+    "secret": "ab7248c0e02335d73f2f28602d3c98291d1886a4f04eea71124fcb3e9418ed6c"
+  },
+  {
+    "public": "02b7d547a02135e0f6cdc905adf82827856104228e3830a83d9871a5d679462c6f",
+    "secret": "c31bb95375fef9b2ab999e4225538c8e74260c2698d8870372bbabf2fa051058"
+  },
+  {
+    "public": "02145ab06c412c90df3aec730faba92b5cd39b49bacd879845ae7921071f921418",
+    "secret": "9fa829edf72f2dacca814c8e5efa7c963be057d613f45e996acb9d0abd414074"
+  },
+  {
+    "public": "0283369c017411e8ac1efbe09540387de96375b0f768fa931e14499e9ecfea9d62",
+    "secret": "1a785bd0d956046ea2943e4440c63cbf780c0d65467ec5c1b64092de4c434f99"
+  },
+  {
+    "public": "0364bb1fff865f837ed630053c0fe738eb56962042a434904b78b74eea6b6254cf",
+    "secret": "08daf00188789e1cf7c8ffdbcccb622384d4819c690e2658bc5c1425df710327"
+  },
+  {
+    "public": "02c946cd73db0bf6898b01e4136d775dc95a8f2e4cbc5f96e7bbb93336ae39e278",
+    "secret": "5686e816095280cda36189bc663e4cbe69c0ab657251ac7be8c0831532640d24"
+  },
+  {
+    "public": "03a70158365b90674cacb94a4ec325f94fc8f242fc819786b6f0ede99f23d13033",
+    "secret": "ead0571a92d9b93058a775e82427f3f66f0ff719c25144a6d14bc05877e2d14f"
+  },
+  {
+    "public": "03fb7f59708f150ad38ddda5590ea8b2d1bda6cd9099c6ad28740ffbc9d768abe8",
+    "secret": "7c05f5517635ec51cc9f41ceaff58ee048002d8237f86543a0c95e906fbc5af1"
+  },
+  {
+    "public": "0297beb3679b0ff939d73075eb8c9ede94c659d7759519894dc113e0569831c95d",
+    "secret": "a8711b83d7751241ac5f536e6aea027de4a8b1689c3dd2fb850b9637204dc4bd"
+  },
+  {
+    "public": "02f458fe8e89b9d52bf583bb95bd9ddbe6480c8db36f1615949b42f3e9f690cb25",
+    "secret": "85cf92b99f7a0d1370cee3601ca3a7b18e2ea4657710f1b3cd003997e3e43d65"
+  },
+  {
+    "public": "02d937c2d9e4999ba038164acf94ae925277133a4bc7aebd27d5a1edb3a4b83d3d",
+    "secret": "32da7a91ac927b0e044d214fed8a790d36e8054fa039452f63a031b6e369c795"
+  },
+  {
+    "public": "02c2231ea46c01575bf5ec12290ee48a8f1178f7c4f425421ea53aab4379380f99",
+    "secret": "554df7f7a9e65d9d75c39dd6c65f250bc48a84c9256116c614ea4ab3f9a43771"
+  },
+  {
+    "public": "02c123e712cc4074587686377115808a034590a5717ffd6079af476c999ce85b23",
+    "secret": "1356ce15581d7d9378461be04131b7ed20e887c4cc5bd27b2cb86ae24e9fd2d4"
+  },
+  {
+    "public": "02038a8a078eef20925bca7e69af26fb5d3bb19d80c9e53999141cca01ec245a5f",
+    "secret": "1bad5743c432350fdfc7851c7502d3f41bb06544a36f666804df23532fc284b2"
+  },
+  {
+    "public": "037e03376ce55d62e0cc8c7f685dbdf9e5be4847707ff3fdc30b2eee703c6e7fb8",
+    "secret": "a062df60d6ff65509e4e3c35ac615e96163f68862b98f843564218c5932b501f"
+  },
+  {
+    "public": "03b32d2076effdfde44cef84e25bc16de6b42e5dc4f56d7c74af9d37aa32173c79",
+    "secret": "a487b31673820b5a192010339ac890fc666a7c821c8e2a2c0b58679806382dc5"
+  },
+  {
+    "public": "02de4ae52758f34998aca357779877ddd6f9a21fedea9ea945beddfd0efbc94a08",
+    "secret": "468fc4605d329c6f24da88ce7732cba734cc414c743dabf8e9926fe02463ddbd"
+  },
+  {
+    "public": "03770a8a94382c4d917508d8a12f5d05e6950ef3c6ce90dc9675c7ab62b97e2f6b",
+    "secret": "fc69a2100476f973c1e4571ba4db41e528bc6a8f69e45a4b5824ff39b8f22e53"
+  },
+  {
+    "public": "0322de013ba3d1807e66d9a2de22b8c0b4fb2628b1eef3a7c544dfcbeace1ec7ad",
+    "secret": "b6e4adc2b0d4ac96e61525d402a2ad5f23e32c46bcd15a86b14f3b523689f06b"
+  },
+  {
+    "public": "03ab9bec011f2f4c5370f2dc11b1dd06b4aaa86fa09baaa8e18d80a8c1cadd8213",
+    "secret": "cc8ddc499f07b63ba27fe62a9b209554ca6a6e7ee29cc92af5b5f7ebabd5b110"
+  },
+  {
+    "public": "02fddd321d1c2d58f74c71f028532d7e9a612934723824db73c74ca9befb77dca9",
+    "secret": "5d06d3eaa9dea8b3a9e72f63e6e1b1951709c049d6e9dc01ef97c75fe1c90eab"
+  },
+  {
+    "public": "039f299edb044d45216000d9212394356fefb917ac9c13bd37f5d0743880bfcba3",
+    "secret": "1675ecd9eedd75e3b6cf751876fcc688f605a88a25fc066dd208095709949005"
+  },
+  {
+    "public": "03b2b620c94bcc465c270b7eaeb363fc2e8527fa95a81bac6c555e0eaff9d827a0",
+    "secret": "0375120e57ce3ba926b98401ca77d14fcdbd12dfdb3aac10bf0533fb20551686"
+  },
+  {
+    "public": "035f65ae3be91059215c6073c08ea322476d607bee624ead58f0bd3adcddd05c4b",
+    "secret": "83c65362f1911e3ad95446cda0fa722d20cb375445cca3b92049682cb11f454d"
+  },
+  {
+    "public": "021f4e14b1ad204ffe56997aac67b052f2abda2f819d9f17796b4e8b55177c343a",
+    "secret": "a73a5d461701f515e2caa6a8948f5ab5b6f03d495729a5efbd263b95cf13d5ee"
+  },
+  {
+    "public": "023d5e4b79c2923f5678d16ad43c268c0c004a19921174d6323a24b8d1d629564e",
+    "secret": "2148da2f983591541719002a340c0c384255bedef2f003ba6c9b7fec22a31c14"
+  },
+  {
+    "public": "02741fbcff4d695e9aedf84880dfe8a5e9e8156cc65b3facc4b9c1a0ab2366c868",
+    "secret": "f0745267ea45d502537ff0bac53f54c11d9f8f3bbfd7d5da16eafe99f8c31634"
+  },
+  {
+    "public": "02efecbf50a5a9c32406854a37f967d47b3aa15e1223174af5789b064ebf532d6c",
+    "secret": "00149ac80dffa9a23697742f00cedb15e66b3e463ed1b06abf1f5e4a1f12810f"
+  },
+  {
+    "public": "02cc71b25c3780b2579dc9babbc991db340f6f55a7c17da34f4936f30ccb925db3",
+    "secret": "5c6e1b21348c1a35d6ff7287d8f87ff72497f1ba73cacfbd1c587b416038a7a6"
+  },
+  {
+    "public": "02fa94621d45f5bc1663c98ea177ac56adea13044d66a691d89e31b2ae5343e7de",
+    "secret": "229dcf37c5217de267d83971a330ea5a5a06b6c9ea49ef22a5c5981d98fe01ae"
+  },
+  {
+    "public": "03c33429d0f943887d082c2d92c4d2d8beced0138351957d99848f981edf9b697c",
+    "secret": "d907cf868c55cc305e6149d54e36565aaca0eaee6fdd0bf13728424171f789f6"
+  },
+  {
+    "public": "0342f1612dfaf6841a4a31f4d71b27aa57db60ecc3a54ffd341ba427740a0a513e",
+    "secret": "06ce1133faff03e8264a3ef90c660ddf84d8394ff58ff1daf8d2495b98459ded"
+  },
+  {
+    "public": "0305823c91928cc268a8b5cb131545996e6296733543c3377e1d05ade44953837e",
+    "secret": "330251f55d6411b64ceb78982a5b97cec197e946fd9ab26d9257f98b4cda187e"
+  },
+  {
+    "public": "03c1c1983acb49bab11de9fc62dae95d03cbfa5e51338f9890261de701b31094f0",
+    "secret": "b78fe70a5d18baf9a4633dd6b452977b692af9fe8f6d7e07e26c23044765971b"
+  },
+  {
+    "public": "022a868adc302b56b97ab75e2e03daaeb416bcabb009b4842e40bd2d12d5cd00e7",
+    "secret": "d06177495ad10d26b7ac4030e5eb2d8503153eb4b13c46a39dfff2bacb350b9b"
+  },
+  {
+    "public": "023f61bb5a927f28c3751904ff13feaefe33cc21fef2ad00a8b382b4ebe223d3d3",
+    "secret": "08474d986909714634060c4f0ae9014b7d275883d9061eaa2c74c710271bc217"
+  },
+  {
+    "public": "025aebb9eca8a3d69c350037c6f5f80d6030e238581c4ff50ae5a78333662733a0",
+    "secret": "a47d62ffe2f36ecc5ec3de21013dcd7288e08b046e4219a47043a7619b937b79"
+  },
+  {
+    "public": "0293b268a5b30ca8c15134cf98fe018ca35ef8190280b5a6e882da23cd6e78eca0",
+    "secret": "00dc43c1630a58b46894a34add8024145a1bbb4913f21dbbf16513819ac07eb1"
+  },
+  {
+    "public": "03036ae0f34fa098a6c4718755d28dd6b7b6a65cd8b2c126272032b08b51222580",
+    "secret": "d45957eddebc0d4fe46027324e6bdb83399d87c73b88fef98522b08198806cd0"
+  },
+  {
+    "public": "036b0edd9881e6fb65cea6416d94cb09d798071467b3ecd58dd75a410ab0d8fcca",
+    "secret": "041c78a47610730fd5400a0f4942d6550c54a4dd5cf8b155d77b510864e3c642"
+  },
+  {
+    "public": "038659b98de188909e183360a1e84a1db088a6775c0c678194aa2c07323546683e",
+    "secret": "4d663eec997b2765e7746aee1f601dbe9dd1174d8223135d35cdd1d48e6af7ae"
+  },
+  {
+    "public": "020f0b649f9cd41300f039a3aa4ae59c19d4ad0e72ec60c882c0f81399356b602e",
+    "secret": "6f5da6d383cde22bed6a3067c1194314316d0599e4b6e1d001272e5ccad3acc0"
+  },
+  {
+    "public": "03761694c76b291e65fd8dbe867cfdd34e0994d2172b49ef0524a40b3eedd845da",
+    "secret": "4830112c3746ee4116c07f0978a6952f80138ec86c494a7f63ef8b8ff218f269"
+  },
+  {
+    "public": "025d3f3bf8a486d43696ef6d178096d660a972ba1de0c8e0612f6d537f8a9528a3",
+    "secret": "91260a7ae742a34e092e8f03939abff246f90298dca5fe0ce194c6ab78b0e5db"
+  },
+  {
+    "public": "03dfc51caeb5cb49f97da1b17414b8811b4e75607554aacdfb756e1bce54aa1130",
+    "secret": "370a01a430d1272c252cc893b666ac581a3ff2c182ed6c7e19bed1de04ebc0ff"
+  },
+  {
+    "public": "0274c44bd1f4790504f474cecfaeebd7d8a313534b86fb2317ce512e5e12a43c67",
+    "secret": "4c0a8553debd8778b4b879b237c8069b7e827f5f02c4c3fe880e0ef4c8141ae0"
+  },
+  {
+    "public": "021845adc066183f623b645ed7320babec3287b6c384dc8c3ed7fd41c75ef2a0bd",
+    "secret": "33360e3c416e66bb6236ba4a9e863bc33d5b34137bc7a7c849ddc65b296ff1e6"
+  },
+  {
+    "public": "03dafcf6f3542fb51efc3a8a4f820550e8c957f94d8b9b407bc48d70751b58a5e1",
+    "secret": "e8920a8806c682ebc3738207add3349699237280998af88bbba4178a1668cf1a"
+  },
+  {
+    "public": "03c2ff338000d43a86416e816d7b020622e44a7812e7f568389f32db4dcd6bbc77",
+    "secret": "848031465e383cae8242bf514ae19208266a597afc781e4330bc88d274547f85"
+  },
+  {
+    "public": "0393b5864cacb3d5d58a436dd7e385b434df641bd83d432d6aec28024ec180b36b",
+    "secret": "c0f435a66fd80d607bc2a154276ec36c7debf4de8c570be5b2581a023ee3af2c"
+  },
+  {
+    "public": "03daf6dc688f29c13f56d5689ef6d400f4fd5a4bd18a3deb7037a64e23c39c4e5f",
+    "secret": "ee308620fcc11565aff225845737bfdcd1a4e37bf374c6dcbc8952a9c0c3d928"
+  },
+  {
+    "public": "029ff6b08fd406fecad7d3ac2a6b2f00b64585d297c789f82ecb994c2895203070",
+    "secret": "f520e34e47b3ad59435519d7ee8bd4054326f09627e328151e55c213bc9d2d84"
+  },
+  {
+    "public": "03ebb67e432a172d6dfde2b2c0412d1fae4674453a8f8c30100a02141d40115f31",
+    "secret": "f99b4fd58efe114210638b8a86f126e390a4909307a8cb637d055b1fa2aacb26"
+  },
+  {
+    "public": "02eefee7896cc495bdd7eca7d04ae8c4ca9687212ee2c0a7aa15c331107f767da1",
+    "secret": "1fd1c5a30a74dea3cb4bc70552e64b169dca1d2a33bb4a0952fa450f67e300f8"
+  },
+  {
+    "public": "031faa7ade433a598b6d95ebd7b188188fa003cef4c9c701bdac8cf8b2e6451115",
+    "secret": "f3cd014ac7eb75f7c2704a0dc462fb87de91fb229b63ddf01b06ce2b31cc2bc6"
+  },
+  {
+    "public": "036f96de9ff8f5af1bfd65a6e30b2c1ee4fc3b073789b33cbb67d43f6e6152ff12",
+    "secret": "80e2df85d296379865926fe3d26b3f66153171077b7d254e2e3ff9ca828e2f11"
+  },
+  {
+    "public": "03df75dca87d58512f396de3b178c9f72b65e2a805a2a49bd230cf99402078c123",
+    "secret": "a01cd994a55e9cda001260908e66bb3e58774e4d161b5281724f81dc4dca1320"
+  },
+  {
+    "public": "0240e81fb9ffaaa1142d72827f10cd4ae1daee86db174669092cd56918242544ca",
+    "secret": "972e33ff7e084a4714181e9a808cc3a78fb17e396a6f040718f7ecdb67260b62"
+  },
+  {
+    "public": "0228e31084194aed2c00d475c25c46759689fc43c477783d90aca0ce37f02961e9",
+    "secret": "620a98f079a02e7396af1204635e3a1ee8854764b7d4a8a2c501a39c3ea36f94"
+  },
+  {
+    "public": "0351a2556ad50fe5636dd52bfb3878df471513cda9c457872f4e5b8f19e2fa2815",
+    "secret": "ceb63ac1c6f86547fb9afd4e729644de9d7abe26b9b85e0a0bfca492973b24ce"
+  },
+  {
+    "public": "025ef1b80644768b05c69aad5dcc868947b114830b2c62b8e7126061f7257ece44",
+    "secret": "0119988d3ff25e793b21ab4558b3879351ab64eacdda1e8eb069c6f7ed50879b"
+  },
+  {
+    "public": "02c0724c4669360713f1fe5f8fc3e6b840a729e0fa69c2e0ea902b2426f583d8b1",
+    "secret": "11498edb61aefb830e42a72b3fe267687988f9d447e556aeff8e14039aeaca9f"
+  },
+  {
+    "public": "039df8d27212ee5b102a1c090388cc57d50a69c97957056d34ed35cc7f72402430",
+    "secret": "7817e15b90f9058c93df8843d7941fc974eb8f3acd87e9043cbfe49b6305fba5"
+  },
+  {
+    "public": "0285f2141fabafab325fb62f2217285bafaf98ab1ab30c06b051536a72799ab5f0",
+    "secret": "e2d8dd92399b7b13a3a0592947a2110e12529a597fb969c1557042d3c2c95135"
+  },
+  {
+    "public": "03a15d99bf1e6a5e18d2dd1e88b5c1121107472a3d94cd6449c3c6fe0150e0719b",
+    "secret": "50b84bf0b049e99254ee246c26e476ca8d638b02d42354a3928c9cc012e27223"
+  },
+  {
+    "public": "02e902c761454f8dc353eb454f31091d1bfa68d2012cfbcdad50c320f396805e6a",
+    "secret": "fc82ee21a751169573edf5cf0d2709c9dba0d80f7d3fbeec4a31b085f57a5786"
+  },
+  {
+    "public": "031ceac8d906d407be82c1d0204302c72c845c838d12d796b7874f24c08b2749d9",
+    "secret": "e1d69a12ffb11aaa0461c33d57c7e6cfa81a433e27ce68993bafe720e19ee878"
+  },
+  {
+    "public": "02db540a08ddb4d3fbee866941bd2be7c8a5780fe7375bb54abe293c647cc7c5aa",
+    "secret": "e9017aba32c1b6c1b239f44ad94e2b08e847572863c107aec1de965422913784"
+  },
+  {
+    "public": "03b64cc268e07aa1ed32b04b67f8e6c1d19d91b64f0186a0799d2193476516164c",
+    "secret": "635c2dd80c56e3c6b8208c10e6d48960275806d720124716eeed90dd0bf8815c"
+  },
+  {
+    "public": "022eddba9ba82412e818b0c63cafc3feb9c63a76774d0c5ab6db8aa09406f281b5",
+    "secret": "3c538857bb9965d292ecc68d2f824a12fb45ae4fb8be549ee4574bc8f6b16306"
+  },
+  {
+    "public": "0215be69e47bbc8eacdb67a8cfe34200b7a4ac88c8481eec2bf196197689c712f6",
+    "secret": "48a8b67448b3760caecd57af1da89b5ee80d78925d06565a8f032eadeae4050a"
+  },
+  {
+    "public": "03557b2a4c964db2f573a3c514f24cbc5070a9e339f5923b6240ad10204b7e43a2",
+    "secret": "fa230b561a6150e1d7085af43afb6f5bb8b81b44583f34b5d38a48eb17499a05"
+  },
+  {
+    "public": "03e47ee96a44c6eaec31b0213ea6acdf4cf53e3d8d2aa8efb4bbf6c3878bc95285",
+    "secret": "1ec8594f1db3a68a90aa0fdfe7b7224d8c0f8e3f4d0a2fe765d2e40becaa5562"
+  },
+  {
+    "public": "0218acb50a07a42b9688011cad405fa4b812bce24d9ad4bb28bf33d539ea262349",
+    "secret": "aad49a6962121ecf71f73f1675367559401258a74dcbdfe2296b12f50f39a19f"
+  },
+  {
+    "public": "03b382b530e29cd71f6f15cde59ed915d1a9e7de0e8eebf7b2334bb21864e99f50",
+    "secret": "d20f1e4a64a17aa63779fdcc0f3302fc357678aae06b94dac9c20809f811257e"
+  },
+  {
+    "public": "03a51c8aac57d2968f1f848304584e6ce009acdc1a62b9310fd9ffc0f0f8063d30",
+    "secret": "d6b1baa701b7e43c4a2fbed453c9d70850548cf0064ec448f076d5cac5da5b2d"
+  },
+  {
+    "public": "026d9908597b085fb1c51ab602ae0722f52f68be7c797132d77029b37d604cf4b0",
+    "secret": "7e8ad42ae65ce9dc237796fbd4f5b2947c3168297e95aafb54858d13c194a7e7"
+  },
+  {
+    "public": "0342936b575aaadc94c7edaf287076bb0dc1b082083ba97ceb70fece8cdc01ccfb",
+    "secret": "2974a7f4bdcf7bf096a1ae49b92914e4f50a3fa2bc59e8c0a3239c9cd9960314"
+  },
+  {
+    "public": "03587031c4d6cfdd301f6fe2846bb03f25f4af28e79e85e98d4fd49ae0f9ce6ec9",
+    "secret": "580fa2916f9137023f793d0d34774640f4762f911d21ccfdaaf3b78ebc69d464"
+  },
+  {
+    "public": "0228bdee236cf55ba43f0e8589e2de57a18c33cb905747bb4b23f478ced83e9a0f",
+    "secret": "6882f65e95f1b827c322b2e87c5bc4922cb3ad1e33393789a17acf091bb21f3a"
+  },
+  {
+    "public": "0362fa306b217357f27c92d40ef8810e06d0f0fbb2348a482f8de15689088ac1b9",
+    "secret": "ac26e61ecbcf7a748a6dc3964c11a8c9913257a9921a06f328baa5979fc81e8e"
+  },
+  {
+    "public": "02f72327e882e6388d5d6ce61b26f0f0d6b45baba8a6058d931f57f1ea1144a5f4",
+    "secret": "8576966f10de06e7a519499002c9cef7d72d5adbcc5f063e2e3829bf24fefd66"
+  },
+  {
+    "public": "023ab0c611210be948e1b1469acf09a1d19dc66f0138154f4edc2c534919213034",
+    "secret": "0b4a37b757feb5a35bafd455f8ae4046cc3e845cd258cd06b3b31670457bf531"
+  },
+  {
+    "public": "039012ab51b10c26690d94f24bcd6ccca2c669171ec8da69529f25c206233c7be4",
+    "secret": "23cf9d4bcb7068e6ea24f1119edc0d447c58fe3ccfaac60e8f27c2707bdc985d"
+  },
+  {
+    "public": "0347a931d318b37f5df33c8c639d443985ce9a4682a16f5cb414000fcdae025a97",
+    "secret": "ee63cc52a67b6a0504fab1e241a31e37a374f359051939cd0af8583c6085bb16"
+  },
+  {
+    "public": "03ab8b47003940cc06d86c1cbfa5851ffb16c7b2700b4581987a30463380def6a7",
+    "secret": "a43282c2229a4e72bbcaed06340addd43f4c0f93f3a54a803d3f93bb2e17d421"
+  },
+  {
+    "public": "032dd2eb86ae535d3cecea49501398f74355d17014251beabddd4aaececd418ab5",
+    "secret": "9929a3035f9e5a947ead6bfa97c5f00103e6856a45198168c9e2573d588502e7"
+  },
+  {
+    "public": "024565c5812d9b1d977144c9ce9ce78e3ba68c81dd881af3b70cf126f6c314a458",
+    "secret": "8d81fb207a42fdb515613d0bcfaa3d995509f9118c09459ddfa79b999f43cb63"
+  },
+  {
+    "public": "023f9afffbef9d62adbbb65bfc14a8c780589c25485dfae33869f93371c35274a1",
+    "secret": "ea92387ab240914cb9fb450a027d4979d28843a00f767f39257757185ab36b60"
+  },
+  {
+    "public": "034f526b796d8fb894550b6d2a03b8a421f92e68d29a5dd9e80fcb9382945fe833",
+    "secret": "1341ddbd5ef020e3ca054d504cfc368a90c74c71b72fe3b8da2f0ef3f7b438b2"
+  },
+  {
+    "public": "03ba378a40188e49cd011a147ab37ede7f8b9ae848325ccfcb3611f1e7996eabf3",
+    "secret": "126b0fe88eb6b7bbe53ee4e7ebc76ff616ec75c8be4a68da13bf38bf70352518"
+  },
+  {
+    "public": "02ed60170856c7d32e9e64a3e9438db07e525d55a9c9b03e5c99503794b686ca2b",
+    "secret": "97167ae109fbaa115d61c536be5c334754d5acc067261a97e9b05602484feb79"
+  },
+  {
+    "public": "02c2d54c3fe10d3d73af2af75a0356a446ac77922be898da76dd6e440e932f053b",
+    "secret": "7a6856b3e2c5e65d3ac34647e3259ecebf17dca1f39f0aa3e14e1cffd4c2cbb0"
+  },
+  {
+    "public": "0201150b97db44e2382e43a04f3c56738d0a2cf68cc8f31c9f1c6dfebc52fce88d",
+    "secret": "887fb1b70d369c8d1a03e7ad23bb619d295352d1dddab6bbc9d31491e1797dec"
+  },
+  {
+    "public": "03b17ce198a55281f3085a9eb99a19e99f5a43d188dd89e443adc056d52633a863",
+    "secret": "5cbdb726f5e1be4b0d22ae76e0392ab34ee27acfac4c4dc2c129127a14787a6b"
+  },
+  {
+    "public": "02e6e855eefc43664305cced1f78cc268a1d523aebee5e78c9bde7878ae494528a",
+    "secret": "8dfcd59aaadb8cd7d1e127aae2927326df3f299d03d3309ae2fcf691d2e5a63d"
+  },
+  {
+    "public": "03c4ffbb7361c2260b9796d146199019af4df0044007bb516d2a7b04fe54ce1ca0",
+    "secret": "325b1756c2e4e21e461d0de7605c84f1f259bbdf3cd1e059f8bd9be427eca69c"
+  },
+  {
+    "public": "03d8cd75b5099eaf8b6a0a78bfe88b81dd13d5677619eab3e4b3895c58702aee32",
+    "secret": "47c444b0d0fc235614f5e259c9ac434d43a3ab6940b1454127e24b04de43118f"
+  },
+  {
+    "public": "03692d15ba47562f82456634bb45dc555c679be769b42ae67b8a44ab0776e84418",
+    "secret": "cc5eb2566c40121516c8c75f37f710c83ce1bd86970e1afd2ccfc7bfce23ea58"
+  },
+  {
+    "public": "029006793b435ce871b20680bdd268dd8f61b73f3b6ddf01812472b4fed1b2c624",
+    "secret": "c2ba08ab437bb228824440516614fbfe7694cbe36d582597af16bd60a3a1612f"
+  },
+  {
+    "public": "03278845d3c3fd86aa93d5f83b2374b13895b322760263766913b645d9a961213e",
+    "secret": "28b4e61d0717259ebb99a941d8a48ba28d1cef3d7dd217200e1fffa31947209d"
+  },
+  {
+    "public": "022796d4677387b6791faa301312ed89fd3841f99c0fd3482c4e00cde4ff901cd4",
+    "secret": "9db0c4a6fdca097fbdd0b24ba543ae941e6ce0b9bda9429f56f880d25c6615f0"
+  },
+  {
+    "public": "022721c4da4e38a33c52df73abbab56a76d798ad67a80c332fa5734e2c3b6bf8ae",
+    "secret": "4568d345a18f111ef9034b9fed63b7be042f7c41e248f884be2bb77e978324e2"
+  },
+  {
+    "public": "02b9e83231f3cfd5e199c4c3958e83873751a2c8b040249142647414192b11ac81",
+    "secret": "876e91b95a66bc228fae79670a3eebd9375aa915936d34fb0ff90fa3f36b5807"
+  },
+  {
+    "public": "0374613394d1189cd1f0b4d14bde78b6ba5c3f37411ae16d7abd5a5b4177db6320",
+    "secret": "6328f66ee46fb89df7bf1fe317f65d745b53a8c7a6d7062691a9c50ac8d89ebc"
+  },
+  {
+    "public": "024216c5b152215591288c8cef9bc931156a89056aebf3885caebc4c2b751c2a3d",
+    "secret": "8712b964f91681c16d8d6e291ebec9b4b55d80b74e275d904f151c3bedfac109"
+  },
+  {
+    "public": "03337e0039e8792860466151bdad944a0670087befa7df2be3b6a763afec49d818",
+    "secret": "fc194b717318ba2eff35ecbf0e7c62e1a39214aa91aff6a08fc38373fb02c419"
+  },
+  {
+    "public": "02302b6265352fbd74ec49e9f83650b6993f7eb21d0c1ea7d2d82dd7b0d7b2ceb2",
+    "secret": "4133af8ac051768a8eb68b663aaf8955dc2a82e021081b5d46ee7b65b7c15437"
+  },
+  {
+    "public": "038a6e248ed91f65aa96cc821e445544894c1057f517aca0993c1bd3734f592a1e",
+    "secret": "971d7752efb0c6f3effe401784b322382d7546b3de5f1b4a0372e1638e0802b8"
+  },
+  {
+    "public": "0349dcd67323592c7649f91d5eab013d1f8e41dfebaddf3e9d0002a35d75ff7da0",
+    "secret": "61cdafafed5af201d39f7e10d20ad23f1e37ec7b12ad226958bf3d04b574aeb9"
+  },
+  {
+    "public": "0381001d0ea8a9d8a7ef1bf24ca57f69e4226e7d59f0b770723987c36117d94191",
+    "secret": "1f35712210d3a1e4561d04c0c3cf3ee8f7469e2aa5aa700555efe3c63ea51892"
+  },
+  {
+    "public": "02faf1087ce9f4c3481496359dd81973db97eb3b070d092a7d4e20648f90efca84",
+    "secret": "7fe2b65fb3ef9c3d8338987ba9bd7fd96fa946dc52fe5552d98872d904d37bbe"
+  },
+  {
+    "public": "0377b396c7301bd04ec51361b7c1366660544e693ee8481b0615acd4e357d61ed8",
+    "secret": "3293f7589cad8311364acfa8cda6122ce777dd167957086ec38f2431389b1811"
+  },
+  {
+    "public": "0288952936d813ec27a3199c18062b6be6348d4c5a478111e650a7130e37b7cb61",
+    "secret": "a5ecbefa4fb2d4c74bc57c1b51b22c87e03ee15652aac85644d4af91a3a3f5ad"
+  },
+  {
+    "public": "0337529ef779ddd57c141f83cb70b1f94d7e2fb5fdcdfc3b5c2538ae3c19407867",
+    "secret": "f60b118d1ff97282d8b513b6301592d0c5cbde1bd9df3cd451d5d0b7bee25e1b"
+  },
+  {
+    "public": "03514b2d4fa322e4220e03bfa4eff36996839c6e5f5a3db2d416ed7fbb8c848523",
+    "secret": "bc57429ee9b0eae3a05b92c91f11126795906a7f5d4bc852043015ca8daf5b8e"
+  },
+  {
+    "public": "02e75e1a095aa7951435f6b4c693a4ddda27187cc5cdfaef7fa95429e80dfef3ed",
+    "secret": "add85c8a3e90d76d80457817a0c348d0b98f6cb502fd3c44d8395570ca652d32"
+  },
+  {
+    "public": "0292a01e6805304eaecce3dd4a45c55f32a925eb221e272712743ffc0de7e535f9",
+    "secret": "e28fa4d284b12e87397d2ccf23210ba47b1f71fbc4d175aafd772dc94b4d6aa5"
+  },
+  {
+    "public": "0202c4ddf6da70c550b9e720c081886d5d48f7d9b3bcfe63b4c3f188e7f9ed9138",
+    "secret": "6460f46b7d4e83315363d014d34cc9c0b2b058249f74b6b1273c6f0a4b3fbeee"
+  },
+  {
+    "public": "03ad04afe8279d00c57cc57e0822749617e1135bb5e23d43349a68e63190f90746",
+    "secret": "8d936c905dfcf11f1ee52d82fb4b675d8ae8b3f9162874ae31e4e9b198795cb9"
+  },
+  {
+    "public": "025a1f1f38321f7f13aea2515e6b30c3770de198ba36734a5ae804a133cd933b7a",
+    "secret": "05e4f2fe0b3e208dbf73b422bb06b8b05e9078f194ac78bff602ca3a68688cfa"
+  },
+  {
+    "public": "03d8b005f1e177c7ad97a97ac3c2cc926d4514c69cde59dc3722b3fd98aec3b49f",
+    "secret": "4ac0bc9d7070550e257278ca53665ec6193a8475accd93b6a138ec3edb5aacac"
+  },
+  {
+    "public": "025450b28dbeb2aab1dca5986e17d0719d08bb7ac9475b7fe55b1f57fe73cae255",
+    "secret": "6fa2ace42cbc8aafb0cf5b70bd1a617b9f1d6fc382250ca24b20fdea5c6fa3eb"
+  },
+  {
+    "public": "027c65e2dbd5160047a92302a5b3c77c92059ecdf46296da6cdaeb6f2fd13b9502",
+    "secret": "52903e7360215ae9f8fd0f1a38128e327633021d63f25484ab7cd368343811f9"
+  },
+  {
+    "public": "029ce84c24e03583cbdd57b4e7ecb6eee64fa5d013f7a7c5f3047cdf158f628cc0",
+    "secret": "291cb37faef915bc101cd0eab995ed2f0844616f2684d6836bb40687755419b0"
+  },
+  {
+    "public": "0365fecd7094c29ed32e20a9eb8c88364fb8e461925c1c74c1a06acfd0fd6b7a49",
+    "secret": "03f1767d4d83fc61eada77445eb0df091903f0ad6d49f1cf46ace4f2e18cf7e4"
+  },
+  {
+    "public": "03727ced4ded5df755150c0d68dd5a94b0b29a1614581959e466fa658652341852",
+    "secret": "86854aeba99eae5c113d128a486504a28f49c731f5769bfa9d847509a33cbc91"
+  },
+  {
+    "public": "039eb04766c279dd330b728575481155e541b046e45fa1b1e24279c63e43f6a494",
+    "secret": "4f1cbcba8cef09407108ff7c7425f06e779e1b0245578a994bd2b934602ebcfd"
+  },
+  {
+    "public": "02011e91cd7775a521be05761ded7af54a966ccb39f7ad1d3a731b398eaad92709",
+    "secret": "8c083d4f920497bad44201fd68c12a5ea7f5042cb44dc0ea4fc2fafb67297b34"
+  },
+  {
+    "public": "02ce28e9a3e0b0e87b36aaaa6f10c5b2b8d7a193d427cc1b89e60173b2481ecc85",
+    "secret": "4ffb21045bd726f547b827571fb0d818f7825a5165a5762d406c2d923c409bc4"
+  },
+  {
+    "public": "02149b8db4520f5aa488c91075bf066228989de165b27cc7ca80abdc445df80ffe",
+    "secret": "bafe8fa54b972de2cd565ab2e5644f3b9c6004cf9e786ebf38755930cd3552e0"
+  },
+  {
+    "public": "03bd45993f9c8c8a6670fe9d66cc2a91ed814f826b44d50c6d0423ec0575e53f67",
+    "secret": "e86bc53ab49b9431ecebf0aa2afbdb0c15da169de5bde62e966193678b7eee22"
+  },
+  {
+    "public": "02b04320a9937856d6c78da7455a069412b5f560225811d78cda97f3d28fc6cc90",
+    "secret": "be1f8dde234ab0231eec1bd81bd15dd37efa53301ca84417b9c80d252d6aee03"
+  },
+  {
+    "public": "030371f19ea03c5b848954b186069ea3f0737c3ed863060184c3d3655ef399a333",
+    "secret": "1cfd1f7f8193d0564580ba07cbd48ea32e4664cfafbb18bda1e10436d7fe1337"
+  },
+  {
+    "public": "03e59fee4bbe872687e6239ae9ced7a5520888afdb84c48ea4d663af9e07ef97cd",
+    "secret": "0401ea170aabcc125f5885c3ebdf1b4b77ce5008d9e248e2b073bc14d16c5408"
+  },
+  {
+    "public": "02ed41d3fd4492664fe2d53856e2c91b0a025ffbc147c36188698aa5e83501a611",
+    "secret": "8b15a1d644b467c1395f04e61c581b9df1fd6e0c6bf26c93b7c97d21a60715a6"
+  },
+  {
+    "public": "0257a58af09968497007e8466c93e8b223968ba0afa250124401ab64dfb4e0812a",
+    "secret": "6a557aa06d88268ed71e3808f804ab67bab2bfafe3c9d5f5e7ebfe5c21f0c6a9"
+  },
+  {
+    "public": "02c9cca8a59da75c2cb6275736037e7f1ddad1f79894e60da7d4d447ce773ba3bc",
+    "secret": "015caec542647bf0c12c2a0864c9cc9faa443a646ba8f836a1bee656bf7ba3d7"
+  },
+  {
+    "public": "0384c7f2951c01d47ea6fde0c6772fea69325a16e7892137ccd1981f1cbf244b44",
+    "secret": "22c6578ca8422532dbdd3a74c71d7a4516d19826bbf773d196e5dcf614d93577"
+  },
+  {
+    "public": "02327a27188541ef28a60ce68475a2adc4e70ae60b197ae6bd861c6e7dc5a1b0e9",
+    "secret": "36e629d17a607a628a4856e87ddd230acb8060568bc3381518e08a99a0bc78d1"
+  },
+  {
+    "public": "0329b624bf66611be968e4a6ed467b2a27cd0889c2e9e723fdf29c30da52ce12d5",
+    "secret": "295d7b8a638b5670cc12b2f6744cecc54c2f2f4ec5aee00581db4f24933f17e9"
+  },
+  {
+    "public": "0223340154a63c65fca13b45bfea15f297257351a143b634597883737401241082",
+    "secret": "b180c7a10b48c16795edf29a822f90b203efdb8f4811c1b28e7f9effe25330cb"
+  },
+  {
+    "public": "0290c87728b3e866494f7271e9f461c028931578e0c38b64d0046482b23b7e5e9a",
+    "secret": "65f6c209dc38c5df331cd00fdd542762c610679a1392948caf582992a7e9aac0"
+  },
+  {
+    "public": "0377016dc7ca14b1dc52f189b8d9aea2a9a2cba260423866150d7941d39d9a4344",
+    "secret": "4a52733f0cd7204af26d3fce17d6429290d65e1d37c5e80b40d2e1de86d72891"
+  },
+  {
+    "public": "03bd9728d9db8c4aee45fbe9226721d4035cde50e25b80ca115958a6847d8dfbda",
+    "secret": "1d61da07ab06140d1d7591c0084a3c0473f67a31820eb0437bbd62dd779a792d"
+  },
+  {
+    "public": "02020bb0bbc4d67e4d858c59291e05f8c11e4c36373d66ba96a0cb529fc842bcb7",
+    "secret": "c750c44960434c2257e54e95c5dfa7c9c65477e0e90461f9dca34b784ad78d9a"
+  },
+  {
+    "public": "0331873be2872abb977522065b6666fbde8e939d1e4217fd35ed4b58fe3a071388",
+    "secret": "b72980be9c2962df3c6c3cd7032b624ea0dc808d21f2a754d594b35de62609cc"
+  },
+  {
+    "public": "024b006a61bfc501df3a364f44e078e9c99d939afe91b887fccf0cb07566436ef7",
+    "secret": "92244b5d210355ef97970320d8b0b418d21a99b2637412ddc56d07d5c4426a8e"
+  },
+  {
+    "public": "034f1516518c3f68b01bd94e9c15184ce721dbeaf75ee33af08ab5077ef309f394",
+    "secret": "2ae7f7fea911674e1338e4ad704784d11860251e3765de6fe05ff4025acc56c2"
+  },
+  {
+    "public": "034146ed7fe4f57261efd4ec29d5605b8dbe3a2bded226e4480933d31625b19ffb",
+    "secret": "6fa45479df9521372aebcf237e87d0101faecdaef2086353692608b89459b32c"
+  },
+  {
+    "public": "03df7497457b3e1819641cdfabde62417b4dbcca47155065ffcbdde3f7eb83bb04",
+    "secret": "d646e8c6e1434c9dac1f90f14e840c69cee83ca4894bdc848da6cc3464e41de9"
+  },
+  {
+    "public": "020f8a1f8817f3220270f0f0c8659e69f94c58019966097580a8dfaefd153ac9bf",
+    "secret": "204d72d6bf411301067bc1e117e89ca8cb74daa87b5a7ced37b010d69b08f627"
+  },
+  {
+    "public": "03dc7ead56167dbe951ebfe2475722c64407c12530946718fb8790a56d6cabd4f0",
+    "secret": "1ba08a1dffadb0047e37ea85bb31842603a99cae49ab17de71c98c32ed28d320"
+  },
+  {
+    "public": "03d49f266dc86be56100785451ec0910506fa74c64acc54e6092468789a595c2b3",
+    "secret": "1094d749d1ed0632a62e2d019d63f59c6dc76bd0a0fca0ab746d8eef2f6e47e8"
+  },
+  {
+    "public": "035e382db2f83cdaf1bb8b464dedc4ee66712d9b8aa4304d8c5464d7cbf1048986",
+    "secret": "080f8e3d934bd5ca6b3ce67b43910f19f14e44a36e0742c56ac9cbc16284b4ea"
+  },
+  {
+    "public": "02a2931fbb5335d03699c3b779b05a38b939aa49145106b97736cd3f7d71d6fbc5",
+    "secret": "22a9ff86b218b3aa99ca37ac29c9c5ac2c1755c25e81113280facc5ca9cdef02"
+  },
+  {
+    "public": "02519b78172b03c879189b1ee47772e9259bdfc28c72333927186b61d5367ec3a0",
+    "secret": "a862f2f887b3b72736873d48457968c3a4711e697177a743347d6c886d8ab722"
+  },
+  {
+    "public": "0363688ed3e56e5664f5992feff6d9e0d387db27e1ead02e78cdfd65e881e023e4",
+    "secret": "6a45049dd925d171ff7163af49dc74335ffb024fc29e56c48c77f1447a446edc"
+  },
+  {
+    "public": "023059de5081ff8e3648d4788db5555d4a0c62978d9e6978783c0b35115e5459d1",
+    "secret": "824e7f47fadc615a5b64453543e05df9e254552623460f3d36c4bcf5b8e104bb"
+  },
+  {
+    "public": "02658ca826da63394389f31613c12cd27c4c5a2a48349a08c3ed7712ded7799df3",
+    "secret": "b852b9262fae46786d8a30b0eac86f76a1857b4f0d06f8a3981c233374b449aa"
+  },
+  {
+    "public": "02fbcd10984523e9a0d0811afe7d339b4d007c3bd9ea8581ae779786f6f430cad1",
+    "secret": "d642edd3d2a10e05bc36183d4906db850681c2f0d9f9e6ad9be294328915ad2d"
+  },
+  {
+    "public": "02a4700229ddb2337a5afb96108e87e6d8f33837232040877f08e1f88909771d38",
+    "secret": "fe51943439fdc52509afd1a0a1c9eb0a7d944f1664b42d04e9c3bfb67f0e3ede"
+  },
+  {
+    "public": "025f6e04f118e974f92aa2abe68f3192fd5ce4de80daa89081295b66c714904191",
+    "secret": "36d259fd87b443f778372382cd2f3fa215496152535245919fddd22873aabfc2"
+  },
+  {
+    "public": "0232f55a65c7970c4e36912315c8dcaf5aba56f1db10c52fabcfaf1f1995d84009",
+    "secret": "43f223955174186175b061195855ab33ec463f793a2fc77432e1d66d7d002a7b"
+  },
+  {
+    "public": "02c2254655317e752cd872854465909c1fd6aca35c34dda1c9f54909b35290eeb6",
+    "secret": "b14d632a9f54230a54e4066cc22d36dbbce06f14f370b04503aa8b0c97fa518c"
+  },
+  {
+    "public": "029ec18218cecac443f6ec410faacf471291b780c5f82f55cf52772291fc13dbf9",
+    "secret": "afd4cb84847d27adfad8aebf0d15056ace09fe6abe8c4447838993e4dad71c9e"
+  },
+  {
+    "public": "035497bfeb18f0a43a59558344b986442f3da4b9fb15f62d3398deb5531f2c7d84",
+    "secret": "a3b5fea0c5953d1b7e783f53d9e2afd9d5e7fbe33ee7ab2deadbd0a5b57b65e0"
+  },
+  {
+    "public": "03a2c4f3e05c0e6052f99bcbc8f46a13a31c7999e4f85d8a8c1187902b0e5cbb17",
+    "secret": "5b8a66c09cc9e502e21c6677485f51468051d420de7471490bd19f17458da2b9"
+  },
+  {
+    "public": "02f43d82c482e42436c98cdb4fde6c987ec574f75fb6a60ab080b7ca1b2d55d462",
+    "secret": "867aea8ba2ad5405262c7e3311c250f4e3e104632b1dab4a81b342cc4afb365b"
+  },
+  {
+    "public": "02f99bdfda37597b62655033dc71523f35a064c2534c19ba3f7d0398ca6dd9920e",
+    "secret": "2ae64c9978c817eda6a60e72e5bb7385dfad37e3c740f01bddf787ba1b1527ef"
+  },
+  {
+    "public": "0337bdb54d7b13ce45614c43e8c8ed9d814d9664bf41429d95c78d578dc9517203",
+    "secret": "8b81a930cbe86644cbfcfd505dd5c843b5cc17ccede14257c0e9b80e49d0d3e3"
+  },
+  {
+    "public": "03a80f1c19a58fb9613826192518c00398d51c6a6b99d7aabd2cb6a36b633eb544",
+    "secret": "1ae36c5a3866034586cc41e8266e00bc7f620a297632fe3ee68956cf395ebd5b"
+  },
+  {
+    "public": "026ec014d87bdb73cf0dccbad954125275f5d9a4e3a20a1e6b1e7511108d73d877",
+    "secret": "e8b02b599a24a7b8b18bd167b0b215ee6d279a19addb516691ab0cd75dec48eb"
+  },
+  {
+    "public": "02b3e4cb3adf02328143203c99617117272de385610e4221c56b90c8b0ff36c140",
+    "secret": "eac6728a24479c99161a7ca99661fa3377ad748808e664b4d61744521bfd1f3f"
+  },
+  {
+    "public": "03921e61fde8204a59a47a4d44f6e826aa695a49f93f253900fae620ee4ca6f687",
+    "secret": "30b2f9db502c396281dcb613434fed52db7ed183fe296f548fc0e89cf2e6500f"
+  },
+  {
+    "public": "023b52dfe893e8653d78a4a9a28805a4f8c3e7d59c4b871c6a9ea2d88264536fd2",
+    "secret": "5102a9b52dcfc2c7dea66eb48509aab97a2d7f709c26d24744e5e9aec81983bc"
+  },
+  {
+    "public": "026b17ffc9dee1b7fe8033c04578a12e799a7adb6812caecf1a22a1b3f43773e17",
+    "secret": "5079dbfaf09e635640aeb8f513209d23bb3c9537f79f7e8709125fd15edf721b"
+  },
+  {
+    "public": "0230080a63a601a54561d0fa999c3c6e24b611e7097cb6eea01f863724340d667b",
+    "secret": "25692942d7e0b504befd456cce757b636e63bddd43f94783dc99d9719c6a258b"
+  },
+  {
+    "public": "02738854cb5aed2d06592fbacd44234e7bc1c5ed7c37a4d4bc95f56c214d58231b",
+    "secret": "d842ae9b6bf641a26987c542579b310f9489eaa7fcd2d6218621de505fb73664"
+  },
+  {
+    "public": "03af08361b121feca05c70a4be6179ec9dbb3599c6bff5722006bfadcbbde7d88b",
+    "secret": "da187a426dce79b25ac33521d1ed513cf96d4cfdbcaf28f05d90ec325830c096"
+  },
+  {
+    "public": "02a8d7affa14c4e45a604771e779c09ef7cbeb1cd2951adfa8367e56fd49bb1936",
+    "secret": "c9b197f1e26e57c4908903f0d2f846ddb899d0aa846b04eafeeedef75abb0efd"
+  },
+  {
+    "public": "0318798eea0227c9076c0af1e1bdca5d3ce0f995c26d55047d8cc776a39d633ea4",
+    "secret": "8b5e2babfe832bbfbea26eb928dd05fe530b4197cf6f6b5690b06196f2b23675"
+  },
+  {
+    "public": "024cef44aac093f57190cc6fb98a73b3af8e03ae53820be66e39ec270480dbcc8d",
+    "secret": "760ebb7e496941a89e26d7f524d569188860a75c7fc0a6e8ce29c8478901ba3c"
+  },
+  {
+    "public": "024d4bb52ec844a5d8557be11eb0d8e40465afb962d0352245339a1813d3d6a5ed",
+    "secret": "620fc9a9fa057fdb27c5aaec214ad3fa77d65278311ae6b9fffabf819aa25ce9"
+  },
+  {
+    "public": "02f0c8f6bd2253487dfb8a0338569e086eccdf27f3d7c3d1c3d254ecd44887ad66",
+    "secret": "ed3b7603a5ecd9e360b52c0319fe4afcf9aff24a8d3e9a0cde7b81bb38e77e44"
+  },
+  {
+    "public": "0288d6816c87eba46c1b6b5f0a21527ce97f5a30082d4d41dd2ebcb4f1494ceb97",
+    "secret": "1fc5f583890cf315e76c381ff4dcf974bef19cf6a3e8b196a55448973d7768f2"
+  },
+  {
+    "public": "036dc5cd8e0e396b2bd3010af534fd8628275c47a1e69eaef3795d3409ec9a51c3",
+    "secret": "2b7c6ef1bf86f23452367fcbd443cc54ddc99a4ffd087024fa2529ecac7a2189"
+  },
+  {
+    "public": "038af1a9ebe55182721a6f803fa1b0ddfd52f96d7b4319d7ed66ebe1f2037d89cf",
+    "secret": "27377a51c8dab4e3a75b99355b815d29d4a16078b4daee7e4bb23c8e595b3c5a"
+  },
+  {
+    "public": "0378863404bacf5a997c67671bdfd0a447ad3b7b7a8c7c8e94bc0be4cac3f1b668",
+    "secret": "774501762991c36be721a84cdaff3a3b1c22c404be6daf26d81b2984805383b1"
+  },
+  {
+    "public": "03ab47378ea0393ee3a24a5e8febed78f0f9dcf2059c9d1191a40356d73502bd62",
+    "secret": "c5c2a1e00cfbd1973d8129a7e6c7b9a9a5710880bea8d25fa0f7d925a80afa71"
+  },
+  {
+    "public": "0284739a0b5b51028eed87181583a75a396a710560c94554795dabbe0d53d66f62",
+    "secret": "3e2d02f86f8ce020b24d71c9f912e3587bdb1978e83ef96071b0e1459f075022"
+  },
+  {
+    "public": "02cbc6619377a3058ae96718c081ccea0e34103c01bf5653e166de12a14d2e9d8a",
+    "secret": "ca27d4d68a70d8bb6cfe671dd8e40a41eda66684b764034c33fd98433c868cd6"
+  },
+  {
+    "public": "02f90585b3f83cf0273d0698c04e804769e627642338860df3921c7d4fc72738d7",
+    "secret": "ba47e26e932cf30af4acf914a69746c210f819c2ede70f24ebadf1f87b423359"
+  },
+  {
+    "public": "03f33f1bdcadf7892222b5db52a92e2a39915c23e0b6fb94e57142e8b12ac9ca31",
+    "secret": "98ddb1de992c752a058b24dd4a41332276c24052464a186f83cedc0ac86a2bc0"
+  },
+  {
+    "public": "02387db97ef3e4f6f1383dd4377e06c6b9d92c8296e8cafe1431bffb98dcbc6588",
+    "secret": "9532bdf5aae12cd46c8093c7a8136992dd3bd5e928bc3280b7a3a756cd02c843"
+  },
+  {
+    "public": "0212dd23afdff7911d287fccf01906475469db6378ac00a47cb2c0ea7edd6beb10",
+    "secret": "995951ee9d3d56c215d8df2556b1869e6dd4536b50ffb34ab30642e9bb414428"
+  },
+  {
+    "public": "0212f714c076c37d1a06e3794f00cd1f54dd726fddb18c5661a276de04db623bb6",
+    "secret": "0019d6e3cfcc8ae738e5b0fe6c0d26e07ea3bea9f8a6ae6d6f85d5b980b41304"
+  },
+  {
+    "public": "03fad28f96d814f45ec1e09d1a9471cb413119ca603294508286e61bcee701c7c1",
+    "secret": "bd4881d599ee494a3c0d2ccba301727282aa4f5c68d8e8349a80e172b14ceb4e"
+  },
+  {
+    "public": "03045d69ac42a1c35ee677a2d001b459cd44ba2da1c30644d7973cbdefdf917bc7",
+    "secret": "c6545f099d6effe96edcd584e5cb98845ee756d6d9ad2a87e010afbaf5c60670"
+  },
+  {
+    "public": "023361338429360c13d56d633f99a74c7bbd83419a405bbd18d9118b31946cdf9f",
+    "secret": "61da2d2d2211b1ff9c3b8d771109da3da855ae27cc2c82fb7d3fe56af69a17d8"
+  },
+  {
+    "public": "02f3942e42022902d5d1ea01d5d6d3ae57bd0d05e76580f3c18996f20620f335d3",
+    "secret": "f03d4c4ab3abd036f5c1a0112e72a9ddab0842a0d90f2a70c7b1ff67018d163b"
+  },
+  {
+    "public": "02c5869f3c309df56096f408d21e1acf11b882b79a6f15bd4e0e0a944db0f95b1f",
+    "secret": "24182b54ec7fb735d6aad6f841486a2c19418715787854457cd3e38a755cc7cf"
+  },
+  {
+    "public": "037013990356d77cddfe95553672ec3489f5ebe5b1b3d7299d05b13b3ed4e01aa0",
+    "secret": "9fc9bbf52ba96f20f69ecc3bd08deef45545f07b6dadc33ddfaf0726fbef4a76"
+  },
+  {
+    "public": "029af59af633fa5c968595507fa84359c3b6f3f66fcc16f38247fe65daefe68cdc",
+    "secret": "e1669d5653aa217278fd688c745c22035739122f6ee693f14769aa42081ee41e"
+  },
+  {
+    "public": "03fa9353ccf2b4ad38a7b59a9578d048bed7069aebe4651d9d730449ff4cb003ce",
+    "secret": "a21c73d4ed3c8e7597fd33cae453296c31caf4efe94d97059e82bf71acbe27ab"
+  },
+  {
+    "public": "0367eab4da5dfecda9a2ba9067fe5fde358712aeff935db7a8a226d6ef75a0668b",
+    "secret": "7f9f4eef75892f0b21871f650eb94ca2d69865df459845592f7dfddfa42512ae"
+  },
+  {
+    "public": "038cc3aa0102934236ea55b71d46ae35acb6dce82f0eee1031bc94986f91346732",
+    "secret": "b99caac70ea985ce85cd922f6e2557653ef4cbff404892eba6847fb8f8084857"
+  },
+  {
+    "public": "031e91a8d59215d8cb367d53c3b807809008e11d3b5c378bc08911994f3ea9ca42",
+    "secret": "4bda9614a5031f0953af8c14151efa22f53a3fd97e34092b0503dcf7c87e17f7"
+  },
+  {
+    "public": "035d846f1318796c623e6e2d8b41af95a37491fa0e1730d67163421ae952e98d18",
+    "secret": "c212f3c5cd51122c827076af43d7d6f44c76e4c4088a6b53a5f8166f19baa779"
+  },
+  {
+    "public": "03a89536e27eb2c98fdcc77abdba971b323cb0b1552929b540950177067a90beb1",
+    "secret": "a286750f88a724d12d0c5810c559bd12d6058651e10b35d7264f98561335392a"
+  },
+  {
+    "public": "03d155335fa57bcef8ea4e139a6b8dee10935298d93cb03054ec295bf4f8df2746",
+    "secret": "c19e423957fff1504735c924713e2ae40ecfe1f43f24a7b6c271cd3968079c35"
+  },
+  {
+    "public": "025215514bcd97b94affe23aa4d00bfeeda56d446a6f9b162512faa3f7fafc75b4",
+    "secret": "9bc192a4888d51f2f3cb8420f62558ef09752251e657d4e72a83e4fccb6d82fc"
+  },
+  {
+    "public": "02c8b55ffaab5ca56909450b1929939aa4d0587cbe1d92c1f629183011ade8171c",
+    "secret": "4a5f07b68ade18a968b4f8c96e066a3fc80725881a1380be951125952644240e"
+  },
+  {
+    "public": "0366094633f8e241bf4cf2eadcae2276715489be91c08260a0eeb6595328b813fc",
+    "secret": "9d7b59c2ae0f969c89080ba7fbd7d5152ea9d5e8f02def48e5a48ce0c4d6b616"
+  },
+  {
+    "public": "03d418a480d778c8efca66d558afbc7f0a321a682899da7d2436c2f47ce29027b7",
+    "secret": "c5a44d4a367607356d13adb4c071c1d821e6f741ea480a6ab300677091173ced"
+  },
+  {
+    "public": "0322ca0229bc2e4cc6df1a49b19adbb935fa5effb7bb96a79b9a5f2e26d435d3cc",
+    "secret": "cc294a6f76a01f30377c779ed153da023511548d0917e98651a082145512e550"
+  },
+  {
+    "public": "037eb505d95f221504185d800d6c051756337784e508777feae1d772d97ee7fe36",
+    "secret": "ce95ed6ffc07f1444f1db87865a64fb12d752eac7f4e5a83f4cf80a807dabff1"
+  },
+  {
+    "public": "02cf8454d9d092166db8806c01c9b5c1889964343c522ce52f11477380eccb4f03",
+    "secret": "f3c70f5b7243eb6cb8f68376a6ef026ad3bbef04dc0f3262d25621cee4dac1b6"
+  },
+  {
+    "public": "027e5cbc3b7824ed15e3452c1767e923f17c38cc07d98ae81279b3f442767408c3",
+    "secret": "f6fe97ce9fc87ad979b3353a694e2d63ee7ebeb0c14a9a9d56385921cf58db8d"
+  },
+  {
+    "public": "03681dc8fef2c38df5b29cf90800eecf2c1de362e7373cee550b3dfdfec8dfb2fa",
+    "secret": "9c64b224a0abe8fc2d5632b8594018fac5b3c7b98088a97536d3dd969b2fbf3f"
+  },
+  {
+    "public": "03178f4f5d96bc852b1ca98f7b1c78456901a9397abd358981f5d5855bc776fdf0",
+    "secret": "32fdfcc9e3f05fc41f6815bfa0bb3946eb3a8a216fbccdbf8cfbf322d620b0de"
+  },
+  {
+    "public": "0288a6c657264c20fec3aa730410b7f935dbadfd5d056b901e02338626457e6cdc",
+    "secret": "acb1453ca6950f663d59391f2335c43d021b25702d92ef51901e6a4f7c9528c6"
+  },
+  {
+    "public": "0314ec878fb5291ad96a5a63ed76a5631f1a87d2127160187526fa0f89debf8069",
+    "secret": "eabf297d76c5d242c99f037bef8ecef9fada46a29169f1daa9a52f1c6ec07b49"
+  },
+  {
+    "public": "021d6ba3d1a2dff91c82e6e8126076081a8a046cfb5342e975271b48615e1ce3a2",
+    "secret": "ba9dd14c8db2352adc1cb617250d0ec8487db391cedb5bb13e57b3e5b053ff39"
+  },
+  {
+    "public": "02a9f40d8a3a9245043e4e8887a623f2da301238801a596057595763d3d7c572d0",
+    "secret": "aaea654c95217137c7b2e3dbde2b1e50e2df7e218f8658ee0bce2a3ffb0bdf64"
+  },
+  {
+    "public": "02f19c35bc1c9c75c8bc52fdd05064c7e92de14dbdb1bbe141943527d4a5034c86",
+    "secret": "40330a50b9981e22c9722b0ea660470689dc293b8773b701fb729ba6a9cabab6"
+  },
+  {
+    "public": "034442c7ade83e99556b1acd8c54cb4ee06a0cabc30750b3118a28836be5ec5432",
+    "secret": "00e9370af7d8ac8e1fa8bb207f2961d48cb4ced48d399daacf2d5b5c9d10e3ed"
+  },
+  {
+    "public": "039569a5ed2f2d0443106cc0d43d96afdaf04fc21192977cfae89c92a733344151",
+    "secret": "e51ec8b93ccbdbeb3de904c847d012daf4f4f5ed0d88d39b2f7c90a4490aea16"
+  },
+  {
+    "public": "021aa508c5b259f6e59f96e1b95843a5f14dcb4592f5d39b826e1d8d21d0dbab6a",
+    "secret": "3f495caf7a240e5c374cf5094fc80114a3e648254d460d0217baeb8dfdfbbf3b"
+  },
+  {
+    "public": "03413f39e0aabf71e2ff19e645e50711e389a7372079d340a2e6e6eca568d244d9",
+    "secret": "90c8b0f3f6a55f41fdc7b5a2edca07ce58369ee98d380b200390af21c53be84f"
+  },
+  {
+    "public": "036403c8cd68fb89e22bb3ff587250edf1d8aeeb3f70815e02574a6520fc0b99ff",
+    "secret": "e7a68f6d002734a8488fca43bf7ef960712556d5c61c84a3c2a0b5178509fcad"
+  },
+  {
+    "public": "0371ada899f5c153bac46c095b950ef01e682a5c027e9c2ab47aa68e7acb35c9f8",
+    "secret": "93bf75f49d95ad0d8c8c0d85c02bd719fdd80e46ee88373f47728fe0d6827c60"
+  },
+  {
+    "public": "03319eaf44cb8798d0317c2686bcfbc24f379f4ffcf391e36b7b74085a572eb471",
+    "secret": "bd80e617dcb56d412f240665be17297827278dc0a7d5a93535209bea11c64338"
+  },
+  {
+    "public": "03c162d4d901a979c8ef10a2cc929cfeeec17e2ce2a17b31bef11fc0b1b219d635",
+    "secret": "e4c0df129fae550a1432d894f83577abb56f21ee7e7827caca6aa953bcffe9a0"
+  },
+  {
+    "public": "029a52c2cae38f91ba463dc1c890406bbbfd742d9d35331dc1a5c7d71b01a935ef",
+    "secret": "347e1ced09eb386584091859195d084bcc0419abca0a558f52eb58561a633341"
+  },
+  {
+    "public": "02645995ac9bc769d977593083ef0d295c88d3ebbd01116b7d3ccc5fb3e97ad9ec",
+    "secret": "f66e5f6d0f5177d98b30a1e13da3c61324eb42a2cf5f1e055efd5b53e3b06836"
+  },
+  {
+    "public": "03ffd6ae62195f42a34b6c13d563d9b15ca7038357145bae14c1b8769fbe181868",
+    "secret": "1683765be0926c3d7fffcea40fd17d7b74d55c2b296f2be38b04eeb8a5f2c1d5"
+  },
+  {
+    "public": "03e9b0f0b8157a3716c78b9b55da2656fce8cf683e4930034920779632b4768c5e",
+    "secret": "27a0a68e1248e4e71612234e0f5ebd9a6eff7206f065f1491d05d12de037b2b3"
+  },
+  {
+    "public": "039bc48404275297c5b3163a8a0b12594d2db067b874c7d44732089de357d89c6a",
+    "secret": "ce3603e7f567f65aafe5d2d18fcd75363639e088e58fbbfa4e706a7e75aa7ae9"
+  },
+  {
+    "public": "0318e6704e0b335b691c37a07ae1137b35c27de78ed2b9c5b932ca8c1fe7962c0e",
+    "secret": "0849eef00cfd6e9bf4100628bf4753acee1f5001a9c3f70b8a7a3caffad4f22a"
+  },
+  {
+    "public": "03ef1f44e9c25b9c0fad95c5e6daaa956e7495662ba5d10490066fbe96fa14cb27",
+    "secret": "b6c157b710c54a24883be891727321ec67330da5d2eed080b70e7a3695a8ec61"
+  },
+  {
+    "public": "02662b846f34b43ed865644eea7648e537a924cbbc2841644459526fa90794ed7a",
+    "secret": "1a0a81c90bbf3e1f93d9f63424e672f0b578a9050a70725fbad07cdc1ae71392"
+  },
+  {
+    "public": "02c399b5c9c19229136b7a3b4ec724b95cd63b9eab5962d8f1ac5258aa3335b112",
+    "secret": "d7f2f13eae3b4b37c15fb33b752c1b11bc1c8a2fdf72e6557563e350ecc0f0c0"
+  },
+  {
+    "public": "039ae757a337f58c6d4f4ded2fb78d7f4ff054224786fee821a1793cd1fb17124b",
+    "secret": "f8fdd55f46335c391a179af0d0e5e6a4ab0db6801296fb6491b2ea69bbcb73fa"
+  },
+  {
+    "public": "03b69fac4b3a303b0e5b6ebeb707a04c9490f546db8174020a0debbd6dc3e5fc3d",
+    "secret": "2cf4dcc374e5b8550098915bdcab4867ae82640f2e724a0ed612eaba8103a62b"
+  },
+  {
+    "public": "02ba5f2a9dd19c8d23a918036bfe7794a073d4edefa26d79cdd42418a20e54d48e",
+    "secret": "cb43f8da85d4ab967be28d8987621338af82fbce72210fe123abe9152f237585"
+  },
+  {
+    "public": "035a20ccca67b2a04fafdc4e627c5faa30683359a8214ae4551234d8610e51f035",
+    "secret": "13af535bea92b53d481cc4d1ac9fd2a6a032925c56bff5ff0a30cfed8e8c74c4"
+  },
+  {
+    "public": "03b82d4372ae5b3bb7073d1cb9aeef279df0f9612bf8e0f8ea9642748c4539389e",
+    "secret": "57a8e301c388b32a19fdc9de863daf28fbf113280fa43a4329e8f055b84b1c9a"
+  },
+  {
+    "public": "038a293cfc29c01e6c29f04e6d470976ce38b4c844a1ae6754cfc295b374f79b46",
+    "secret": "80bff2902ce1d84956c5138ded00478d1b8c4696ee33df10deb48efd8ad4769b"
+  },
+  {
+    "public": "03dc283ff705a15c3507690bd52654c3c6fb7c025855906f3b4da52bcd423d9717",
+    "secret": "640419d7f064115041d3c9ca1de8d736355c7163104d8f107faa8e90fb71ec44"
+  },
+  {
+    "public": "03d84c6397fa2b8704701cec2b6edf3d734e8e1c9bfa74ae5bd3ac26df0dab2d33",
+    "secret": "f35c10a69e25cc99ad33461f556f479ab63d9602d469a13dcb20aa37e39b5cc6"
+  },
+  {
+    "public": "030c6ff1da272c92d99cdd73a9677c913c4ace1400e94c22d96ab348ba0975f45a",
+    "secret": "79062b54854f7ae03f50ded9dd4519b82dfab46609f082db898031ad96dad9f2"
+  },
+  {
+    "public": "03b05feb3c56cdbff2830a3d200d56464143d76e36b53959566c43a84ce58b09d0",
+    "secret": "2cdb7bd144d54bbe4966cd2d285b81733d5a5d15747d7ccaac059716fda48ffa"
+  },
+  {
+    "public": "02f1a6e5895c67f1f929eaca6bb6d63216f98178c75b5dd950a673c0c893ee3561",
+    "secret": "64541439a1d4889f33ecd2ffe93b7b9f9ef81faf4ffcf06d03998f189c8f8042"
+  },
+  {
+    "public": "026fa46c6a361c5bf4946190b0d982ced53bf926ec2136d6fdbfb4750198ce0c2f",
+    "secret": "891cacde96211f0b70efa8c84fc253ba2dbf0280fa02619b8816b58bdadd3be3"
+  },
+  {
+    "public": "035e86334cf8f455dc6760b1ab7dcc5cfb79c6187a7f0faf8b439a15013550c0af",
+    "secret": "7e64e1c40e413f8038a84b077843a8d3f092b05ffd573ff5eab8ba3dde57ac6c"
+  },
+  {
+    "public": "037fc066b8e6134abc5aae9f46a20e9f2e48b7b3f1af8fb009907dc1a7796405b2",
+    "secret": "4bea2618485f906b3e0055b6ebedcff5c3908191a3ce6bce2e84710537c7e8cc"
+  },
+  {
+    "public": "03bcea9c85ba75cb6ab32b957abdcbf80e02cb400cb496bb250a20a49bb578e2d4",
+    "secret": "c23bfb63ff711f0e0bad2f18776ccb8ea847519fc0b2bd7e1a640b593ad02d8c"
+  },
+  {
+    "public": "036685764c25a4b248f63f09bf3fcd4e54551b10aa63a01bcca89f233aca812547",
+    "secret": "c7a79817d7ca0449326e76c82ed80f87b9d2826e80f5c806e1060b6ee8bacfed"
+  },
+  {
+    "public": "024df9aab08d8c8aa7f62f3eeb9a874013744f2f7ab9646e63bfd5c67fe6dbd27a",
+    "secret": "de3e77755e133c72207cd76e8df4bf860a21777fa64181475eafcdf17ff1305e"
+  },
+  {
+    "public": "031c90a518b738065ad07f0a4b15c28b439a6d97b8ce80d14700b19bdc411d7ed8",
+    "secret": "9fd45c0127e2b1cf3fc8ebfac57bd5389f0ff3e1ccce1b87dbc77d2773b120c6"
+  },
+  {
+    "public": "022641517e31ef3e6fd8bc668a291d5606457edf9924d6c8a2d283063537db2def",
+    "secret": "e04855c24c9a7d8e1fd29a28ff98d43868cd8d325625e4e5ea301c15148b9bc4"
+  },
+  {
+    "public": "034187a061b91f3c27f39e79e4ce7387bc4cde5805ae03b76697724884a184ddef",
+    "secret": "257df91cd76c11ee5fa713b4bcce19cddd4f1795b519ebf7235713c390745b81"
+  },
+  {
+    "public": "0310d7016b936d2fdf05154b0de21baf174d36c8089c121ba41329bd9c8d7766ed",
+    "secret": "4abfff2bef18f0d02b8fdc267542006cc21d3e53c785ede4eb7ae45446447d1b"
+  },
+  {
+    "public": "03023b3606d96a9c4069892bc4a7ec22e714ab481d989a194ee69cfe7f2a0e9fc2",
+    "secret": "8abcdd0c7bbc7c0304774f5ceeea8c0d62c54cf2567f8f12df39d997e66ced58"
+  },
+  {
+    "public": "035dda27ad9896ab126b335c6bcc37d5f8b0ec33681678425459dd89ac40a68cb5",
+    "secret": "63e81539635eef5ec61e931cc5cfaccfc35033b926c8a381e9b9b5df980c975b"
+  },
+  {
+    "public": "021e96330e247dd7590a1c6fdfbee30ba10936be27409df8ac40162d9f01dc9b1c",
+    "secret": "fb775db0e539b3194e801bd83a1c072a11da5b9a78ff1cd8e15e3157597839ce"
+  },
+  {
+    "public": "0281a17a338318d32c96b4939de905fa07fdf16b41425e1c4668bc66ffcc6e4f8a",
+    "secret": "f424302468cf154b91d3acb74d1c134653dd015a0f9f1e9edffe71ef02a72f81"
+  },
+  {
+    "public": "0316a8f143c8136bf47c331b05105a898183f6b8f718f8f16e0090afb9cc11de06",
+    "secret": "f2a8bd6ff9cf03ae02b4d4e3628ecd25c8b0ab4dc2ed84f49ba8e2cee15f7326"
+  },
+  {
+    "public": "02d13eb98566c22a73664167203545b26273c48e08e7ffc97208f7b0f296683992",
+    "secret": "4e283c72c46098a23549112745a1d01964065d7972e17d12e250072d40e2d830"
+  },
+  {
+    "public": "0324cc05ea94cf4130e9071487ad4b3c8696f5b871a252714d00cc8a3f9eab12ba",
+    "secret": "7ce9e71cee76d18b9d6f8bb4ac0637518b357114c4ae57c2b0efbe0830fa76f6"
+  },
+  {
+    "public": "03e3d31458a1ff3bdc9122445301ee3c471949944771dca3f29c8f5e83610aafb6",
+    "secret": "b5044203d14903f9b1ee9f07047e155ff0049683b6c17752782b3d3b4ffb1672"
+  },
+  {
+    "public": "03b8a1559f63e7c8267f860c7d5a437468c982bb9661345121d3eac401d881c893",
+    "secret": "023b7804e840e74e60a7f8928a17264348418ff8e7f39822f6365010212f3516"
+  },
+  {
+    "public": "02018035261b11ac19d1ca0e02bfb1ff84c4e28f482d3e73bf84289777ab3a413e",
+    "secret": "2eecbddf300877fedeb37d9f9a45e80f7d197d570288db35bf556b95abbb90fa"
+  },
+  {
+    "public": "0365b09a11b7b415ec2dab8414b6dba8dd38f39c199f0a60f94614d40233e81641",
+    "secret": "5a8bf0dc70514dabd1e9d05bbb8bc653d85dd6e6488da17601395af9703bd66d"
+  },
+  {
+    "public": "02ce8794964a862827ca664c8dfa89561b0c170657affbb11314e9c7d5541e9010",
+    "secret": "089371f177096466ab45e3eb759c47fa1253a640f6c83108304582624b53fae5"
+  },
+  {
+    "public": "037639454a4d562e2e9f2dfb257f378d1dfd3157b19c6bee0d13e7a9e9b434bb28",
+    "secret": "2153ea4e503da01392ab38f8645cf445e7c2fd67a8e1629e3724dc9046af5c6c"
+  },
+  {
+    "public": "02c37a0c384514521174ccef6f49db2fdbf7779ecaf9afb9b5915af223901f4a19",
+    "secret": "485b00997884d4dac342b0fb357a324c9bf3ba4d8c1cf0faacdfdb7d53ea50d5"
+  },
+  {
+    "public": "03df2e3a82c41252b8f3eaf36271faaa8046da4c2afca3997315105bf946f9ad4d",
+    "secret": "7f16469b3d590e36618d653caa9de9bc88907b9bad2e2f1bb895894b2160d55d"
+  },
+  {
+    "public": "03d05cf435bbb9aa47051350577012464a4c56af1d53abe05cff393826058c9b59",
+    "secret": "762619ea7dd01115d22920076fa1514cb48180e59a09995b7bc3a1706d4c38b7"
+  },
+  {
+    "public": "031898107a97b1b8955a05b809f7beb6dc83d89e4098e7e2baeee89e58067c3c37",
+    "secret": "4c963ed553bbeb42e9a81416a58d7ac462d95d11f640c61f78c5ef7149660453"
+  },
+  {
+    "public": "02ad77d74fb04dae512ad515acfbc3de01615f51280778a3f99bfca82281842a77",
+    "secret": "ebb5c7ba498cd56105e81eb3aed91e31d1df68b04eff58361cb58ebe4d7bb575"
+  },
+  {
+    "public": "02322c38c5ed799b00c7c53ac45e2f175aa3a054d7a9ce153cc9774db3fd061a62",
+    "secret": "cbf4918909deec40c7625446c46da6181c15979b7d10d5e3cc5aa9a68c94571d"
+  },
+  {
+    "public": "02ae8af9f677c6e145b38bb5a2474211c8fc7beed08d936a80900c1f05656a0325",
+    "secret": "c47bb08853f4fc3f9b59c1787edec7f38e469c54a9fea9bc6c7de24a6d0527ae"
+  },
+  {
+    "public": "03d4cb54f3cbca657bcd22a20592ebd3c05d509bb23d6781df330dcc19645ec7d8",
+    "secret": "89b8d1f151c997b61dd14db49222e65ce2d4c308ba3ffbef1d6c386fb87e012a"
+  },
+  {
+    "public": "0221a39d27104cde35adb03b91b321213e2a168c0bab56e3de1b7db33c92980a5b",
+    "secret": "f36e4fc7ea52c00226ba5d18c7df70aa26b8bebae037cdbaa4d577ae2e27f67c"
+  },
+  {
+    "public": "02ca49be7e55768918409f7ab13a733ed8cbf9ca1af07d7eec56182f1deba7479d",
+    "secret": "25e6856c4c136f3cb7598fe1dec3be0560350ebff4382d677c0cd64b4f599a31"
+  },
+  {
+    "public": "029f5774ae34d1cde91f75d95f69f5e63a5d2c06eee8e410159c9740ddc7908613",
+    "secret": "594bdc0293e51d51a6cfdeac68d1a546d357965990c215aec5652416893f8e95"
+  },
+  {
+    "public": "02f0544d242633678897541b58cd76808a62197a49a2e724ac952e1820a3568806",
+    "secret": "a673c0e2a32bae6e8db64a9c7f5d7f67ced1e098971bd565eea2b9a991143fdb"
+  },
+  {
+    "public": "0390d6f70c7168122afe96466d182584b48325b432da5a164c2d9b6e8e183e1312",
+    "secret": "44a9b399339e8acca1b0e3097ed61fd8139b0e8f9f4e6763f4136d5e8f921d76"
+  },
+  {
+    "public": "0238a50e53d7a800d4bdbbdd7258650129bd74ad824b5f1d62451de6610df930df",
+    "secret": "2f246af52c80bf9edfba5b2a00944861cd5ddde02aadbcf8f775a59ac0209cbb"
+  },
+  {
+    "public": "032add8143960413f19ebb601748ea23cba5cd21187d6ab6d9d7109a95f6c34fb9",
+    "secret": "127e1a83e2d30bd30502f91e862e8ee996bb18f0f5059ba1893fbad2248a2a5f"
+  },
+  {
+    "public": "02fbacead3f2f33b68d8846204f42a318e415c2146fe730757116f70e3935b8ca2",
+    "secret": "0093a7161219c4e0ca92c547c240ead06f42f40e1dd48aec8254a5f440563800"
+  },
+  {
+    "public": "02cdbdff5009ecec7de0c9bec2059feff645d00be0b1c53a287ea9bf01a8626860",
+    "secret": "7d892deb6002a5e399bdd3265e1e5a6b25040ed46bbbb982f52b666a2aa40b86"
+  },
+  {
+    "public": "02531e5b7ab16d9f4584c1539c0d3457c223562eaf65a673b35e50a1df25391855",
+    "secret": "60fb83a9c35a821693e851acf2d28c22e5c9326239b2f529d5dae6fb809c963c"
+  },
+  {
+    "public": "02613e1052116f71714f15b8f06e35235e914b86e28b52193ed5e18f4c9f4b348a",
+    "secret": "7deb96d8013cbc4c61e8ea4a6622873de419bf3e14bc468df205ae6349a38d06"
+  },
+  {
+    "public": "02b7a861c3766e251cb76824873f3ab059b61ce33ca2e7a947781fbe8ed8d05818",
+    "secret": "000ca2e445d65d6266696247865412670f86a9799e5dc3d32d85a7febd1fae1d"
+  },
+  {
+    "public": "0294d942df66f3cc0548dc8f0e26d1f8a8e06d2d3bdf193be3fa27d627bdcf878a",
+    "secret": "d9c77fba6408c7c3d14725835c9516275a22f722d11a2ed977ad423b3ff8ef20"
+  },
+  {
+    "public": "02ca1e42331a1404e0a3fd8deeb2b456ac91f48bb21f2d90317c7bcb9799feb79b",
+    "secret": "8f8976da7a8ce04696e26e1ebd9a2fd8b0aef2fd766bb6dddb3a15e9f190cb78"
+  },
+  {
+    "public": "02acd07aca27bef56673837dfa5f4a3c7bf2a62f368381aba491cd01f449df0d08",
+    "secret": "db571922922024f3e32ae6b7addbe21952f949e084ea28d075a444e949ec3845"
+  },
+  {
+    "public": "027a8f49d1eaeb1f1101d99ce90655c833fab34262a09b2c6a7e40550df9a273cd",
+    "secret": "76b34c1cfc2a38de5e2d8880e03bf6c06a2c36401a3168dbbcab40f7d285c6b5"
+  },
+  {
+    "public": "026ada92df18c4fc501d396368ac3727a5cfb64485b2bd9cdcdb36f23fa2334f96",
+    "secret": "da026343486fa5e0d49b56aa4388bf7e4a36af7a9bbf0fccdb496e2758e6e5b4"
+  },
+  {
+    "public": "0284e4e753f36b0c970bdb1b0d01afe8c65329f5d2db39561df5dd5a0718fd54d8",
+    "secret": "1c7aad6e1660c65d3ab44cf3ee57e66547aa00d8e5ac8226eab89982e618dcf4"
+  },
+  {
+    "public": "03da1b2d423b003e51d2e30262668bd8f79bee79d9367e0d58620fbb9ba18e1fb7",
+    "secret": "f2ec7336a0f96a6339186f7cc55dab56e1e5f2b0175d5cb2f17e5b6778d2fdfe"
+  },
+  {
+    "public": "023d961a5528be4d2bb021c6e77629cfd1d137182c7fcaa159ee69cc73a1571830",
+    "secret": "c42912ecf9f3f0ae660766d9e73e68152bdf27a0bbc7dd80edd31f11bb229b20"
+  },
+  {
+    "public": "03d4ccd2f392e0692e8cfe2ff932ce55944a4e74411943d7657956ca15a84e50ef",
+    "secret": "516d1bd7a32cbd31bd19d3d3a9738554279b13874061456b60d6c9d826161211"
+  },
+  {
+    "public": "0250f86265a0e43a829936167674d35f48799e72a5acafe0f8fb23275a77fb4e6e",
+    "secret": "2f4b03d384d2e42f28823f4829baad23bfc8c39d4652e54812c0f298f1df52c4"
+  },
+  {
+    "public": "0333137ae3809bb90bcce4522d46d2cbd59d00ed356adff2f4cab5a998c2b5d063",
+    "secret": "31a34aa4f1183dab48c61caadeba3a7b615222c333a089cdc1c87461c3f9a0b6"
+  },
+  {
+    "public": "02a1d5ca53fda4356302ea7485243a93e4e24eeaca70d3bf10ad2589b8d1edaa90",
+    "secret": "1a109c7078757b85270cb1bf8db42c0cd784832215fd2d4e4572e96c094dc712"
+  },
+  {
+    "public": "0365d5a61964d9ce78ee27c3ddcf061ed748984e7715800ab246740a79448a82e9",
+    "secret": "19df40e18a9b48a019e3197179f94ff4c09b6ee53a70960bf16fb35c29bb3089"
+  },
+  {
+    "public": "02c4e4b67f356fc8b34995c425c54c041a9360de2243ac3fb0115529b88db51891",
+    "secret": "e1f5a89933b8836d4300eb090b130db5d9c58d73f8368f3425f8bbe3195ce5dc"
+  },
+  {
+    "public": "0212ef0c9f959a47f54dd4ff00a6465d0bb21d227d9914fcec2bd55a4c86da787e",
+    "secret": "e80ef8dbf68a194288820a18e07e5e241856c4307c39803234f9351d0bba8e2f"
+  },
+  {
+    "public": "03481517ca5f96d27cbfc0d5b336d9ccb5d4662ec30e97ec1ee9d6ee8610bcd30f",
+    "secret": "0a9d44969f267fbe5bb24f1b8f1f2586e336f73a0f051e2e328ae1c055e42b48"
+  },
+  {
+    "public": "03d81bc22a85aec3c759f91e0fb14000e053c1c79c04b645f804d6d4af3094bf5c",
+    "secret": "7153a7c8d753792cfb068c377f145539ea8b19aedb37e12db5230c8c925cc92d"
+  },
+  {
+    "public": "020e0a135582ed752f3dec3f196e5af792f16d028b8edcd7b92167a09fe996a3d7",
+    "secret": "2bb6a4d7442b4a2c1fca6a06a7fb1880a1a193da022d7a68d78bf48dad80625d"
+  },
+  {
+    "public": "03f6120bd65ac1a01e82e1c3019eccf7b575358b103ce9989313d6aeb98da197ee",
+    "secret": "041267a8d8718022d2422a0500620dbd96cecdef634d88ec2b4d8946cfe254d7"
+  },
+  {
+    "public": "022d47a4ed9fa5e7198338ad8cff333ee2d4fe647f9d6e5bbbb79424d5b69eca70",
+    "secret": "b2cfc5e140d97320a3d38daa11549ef64fc588528d767d8dae5832fff45257e4"
+  },
+  {
+    "public": "038bb22711e6c3ec43234ec1c43348d000c04e8cee2305143e2228a0134cf218b9",
+    "secret": "5f3d291eeaaaf2ccc7186c34d94cf95f74d9377460ecdb97d37bc256120fc880"
+  },
+  {
+    "public": "02c89a0915eb202b330dbf8a5269112b3cf8df1b7067a377c9263d1718f8b07dab",
+    "secret": "cddabe7a94e9612791f99c43242284bc7e7aafa15b119718263e8d8d39924eeb"
+  },
+  {
+    "public": "02c86849e4d589220b1afde3cf93aa8e44a6fe98e1667ea3128dd04371b7b03375",
+    "secret": "6b21ac71bd246245dabe127843c1107013e57eb075ce618909e6c8ae1a8979d1"
+  },
+  {
+    "public": "03ac7ae8b943c8123f59313c00bede40ccbe4a34fe2cda42925100bd61492f90d9",
+    "secret": "39bbb4542c906aa797a96cf76cceeeb64a37d998fe87c2b604e671b71046c978"
+  },
+  {
+    "public": "020781d8434d3c343a9abaaeb8ebebd4b3d38fca7004856189ef0c8ea1d2cfb318",
+    "secret": "ee2d1c29cf5c1b419938797dd5fe277c4a8c8faf267c1dbf5270776f8bd9884e"
+  },
+  {
+    "public": "037321f25bf6e7dfd711c3d389d41c3e4b5f5ac280707ed54db8780402c8b0638a",
+    "secret": "addbc334294266c2ba2637f0e80080599744761b7aa3cc59fb2e3bbfd8ae17d1"
+  },
+  {
+    "public": "030746addc962c772fa1e271ace7cd875bdcc2cdf80fff3cb1df1de4aa1647ab92",
+    "secret": "9490dde430ece02ccac2cc07b24a850ea29d009d9af3a72d30725e8818a6b461"
+  },
+  {
+    "public": "02208bf3c632bbd1696f4a2e3954ef65919900d615a5f95750d6c72496147e0dbc",
+    "secret": "230d5c5bc9217b166c32f65691567b694ae952ba521eb9b3e9a936e74d392c71"
+  },
+  {
+    "public": "02ce7e22448a0870afdca6e3727fe4acf3fafbfe6dee7bd6112745be1a0e3eb214",
+    "secret": "9829307c02964d68689ff5701a60dff4776fc2697f1dd16689a80f1c771d293d"
+  },
+  {
+    "public": "039dab9980e189a7fa4e7a644b02a24c30875bd697c2e4d20d9cd13ecdfaac011c",
+    "secret": "fadc27fc5c0c4d1f6adafcfa919f3816d9c0cac5fd1f3d1422ece65a3c7d37c5"
+  },
+  {
+    "public": "02e5ab7edadc71d30c3cc1c89953ce57ef5b85315e04376bbace196cfdc59eb237",
+    "secret": "cd2256b706dea2c1a9af344e7e11b9916162eb0700ed08ff01a89d5956c4acb5"
+  },
+  {
+    "public": "0335d2a137f80e64e31fcfa3e6632a5cba28df02fe4c8e0e833783d5eb8e87d821",
+    "secret": "9ec021b6359abde85c20837174c34dec0d887e98b470719eb3c8188580394907"
+  },
+  {
+    "public": "0371379ad86024642981706c29981b0cea3b33ef53a4ce335cbceb7865962ea5e3",
+    "secret": "75404cc6cd4357c50c00a665e0c57a1bfac930a568328951d9a24a820516041e"
+  },
+  {
+    "public": "02814f5e4a826a713cffaafe579fff6f6d6706817ce02ace266b69acb614f28a95",
+    "secret": "6d1f7a494ded6b61e3db7917b3799312164bc110bb877db36d2662865e86cd92"
+  },
+  {
+    "public": "02e4671fd72397cba3dda14b5e332421cfff2a613592a78b30604e617011114257",
+    "secret": "56277c6b50f0b3cf7cc3e27f2b8e49be99719f0f92859407dc58c8df9f02ec4e"
+  },
+  {
+    "public": "036f37506b331f1131e4a123a18e23f76c13a2cebb58dfdbbe14a62ac027fb3640",
+    "secret": "2690382500a731dc2f8a75953aef580f29d49d154c28ee2f12654bb298f4dd9b"
+  },
+  {
+    "public": "029a72834f0be3d6004483e8914e2c831252b219affe3bcf67498cd326abccbb92",
+    "secret": "ebe754c28d2bd009da817e87d5d1d2aabe3c0b31d83d6406efae31068d6e4ba4"
+  },
+  {
+    "public": "036dbb5d21b6d127f06c01aa81b17c78020f327c7e4c656b801c10fc03ed771a22",
+    "secret": "0951716ebd6987a3ffed61765e923e2261ba5028f9f57d07ac185a1b4ece95ea"
+  },
+  {
+    "public": "026c20ed6702e87a0e148e50b489fb7c24be79c6a86e6061f54932c4d8d0d805cd",
+    "secret": "44590f68415717a5a722c046e74079c94453338ff219925383cd69bb38dec152"
+  },
+  {
+    "public": "0368f158c78db6fee324bde3f0d0ceb7214ce8f8716795f36b239952b2fc0459d2",
+    "secret": "9dd8c46d7d9296ece9c65b553a1c1b0dd8917f77238a4030afbfb06ae9b5d530"
+  },
+  {
+    "public": "0254cd2e8bdb11c84e887323fe696c0fdcbcacbfd42705b41d6dcb98baa66eac42",
+    "secret": "41cc63d46c9903c4a98d780825afd522c64990eda08149e8c4ced9ea93294b73"
+  },
+  {
+    "public": "0217cb549059f2df69953a4f4e96da2129c3406ed70f4d87d4b66ac58576521ee8",
+    "secret": "2b7d8cd7d369f5c77ac432faaa4a1a6e58581abaf9df7ee47537916761621d69"
+  },
+  {
+    "public": "03e91cadb0277cbca2f5492148ec06ce158c945381bf21deb79456912399b8f80f",
+    "secret": "5e47064a951ac96990fbf0d9b6cdf7f8435ddaa126d8ae91c4e47079448173fc"
+  },
+  {
+    "public": "02b6dfc3336617876e514ca28f5bc037b7a5b7d1c7ee51391eadc2b87b8e3054ed",
+    "secret": "fd110f9adf35f43e253b1f17e47243b33ea589f51afb6516570648d22ca1d706"
+  },
+  {
+    "public": "026a9d3c5cfa3244dab529bcd88ef639bbee20e90579ba350f18fc118bf89c2321",
+    "secret": "1777326024e19eee0ca7bb977c98558f550b39714df0e1624dd0b061bd992964"
+  },
+  {
+    "public": "0251d8fdcc544f502bc00dcd0b65701fc032b3e6b87b63de538ea53ae7a383656d",
+    "secret": "592e88935b01b96405d94d04ccf6267f72357f4dda71503f88895aa77d437209"
+  },
+  {
+    "public": "039cd7f451bdf706b2407a28128f6edac102d3312ab3b5c3ee55a9be85898176a8",
+    "secret": "d25567e20c236d3912b03343915e443dded960df4eb70bdba1e392dafb26c672"
+  },
+  {
+    "public": "0384203ec4bac2107842209e170e1535335a94f574e7282ae6505aa3554005b104",
+    "secret": "965dfa8f09e76afd4867d27fe5ba7c9d79b44e477c4144ff8b9150d9f57632a6"
+  },
+  {
+    "public": "036a7ecc0c247df28ab0a7accae48373f5f9aeabdd0f154b618c22c86fa65fc4db",
+    "secret": "5bc79eb9e82d280c1ded48ed38554253fb7ea04d6339a049b6c1650ea6f40f1b"
+  },
+  {
+    "public": "038b58f310b82e88456d7dfea7c0c392b38715f91e6fae89eec817df4e3437f778",
+    "secret": "17fe86898db79b929d3ca5b7a055984a214223a8daf0fe8c3d8232fc800d9a09"
+  },
+  {
+    "public": "03f9052d75a63c8532d14994ce81dad480136faf94813b47ace54e38e08fc97b54",
+    "secret": "4cdf3c2aa3422c0ce8f81f781e414b24aff8a246910ac826cf652253367b1f31"
+  },
+  {
+    "public": "039e9b541bda0fd9dffd3edd59ddcf269155e04f6954f0f6bb21db16703f08f130",
+    "secret": "a87c4ee23fab65752c55c19a2a3e43a420a4db66663d6e8df8b5aa34f7cb12e4"
+  },
+  {
+    "public": "02134a3b0ba8899b4d09d314d472e9b6c7ba1d5722ed031e35536fdfb84234a5fd",
+    "secret": "1c6438db84b952320d3634a2375ebf5bfa77ea1c43f8f9d12d69d06798e5eabf"
+  },
+  {
+    "public": "030a0df6c44ff76c7a8165c9b287fb532fe736d6bc61c27f5ce2ef6c2f9bccd6b9",
+    "secret": "dfcc8fc735d49a97984c9117246044a60e845a92271bbf30dbaa391b58f549f2"
+  },
+  {
+    "public": "020eca1f6b62ae5aac6171ff29a6070748e485b2bb2e3c46b17bec9b0cbc642ae6",
+    "secret": "349020832833d2c90fad971a4f12559f193b326b5c9f3397adb73fc6dbbb9d46"
+  },
+  {
+    "public": "02068db4b2e7060f27edbe221a0974a54a9b29e198edfbb780ed2a410a2fbb2de8",
+    "secret": "9c0cb4595a9f89003e24e69369cb0491050926b43a01aa4735324dcf58b577bf"
+  },
+  {
+    "public": "036c7c2d40d1ff2e4d68f345ec00992e9808c58be98cf91445c257e7fb9dc96f64",
+    "secret": "d72afeb789d1cec33c7f24e15158ee3c514769313d90937473fba81cf5793dc0"
+  },
+  {
+    "public": "03558ad1cac71506255ed9cc7b0a3dc0909004ef23c944bb56ef40a4bddda025ce",
+    "secret": "c4dab8a22e7bb63f4f8e68c2b0236df52f222f3b819e9a6fdef985b774b8446f"
+  },
+  {
+    "public": "03e7d2614e71ab78d808c6244f4f25415d9fb64964a6599e24364c84a03cee94ff",
+    "secret": "ea31108e32a55a91ee62788e20da3956a2b6010cf4431bf65d57955df0341690"
+  },
+  {
+    "public": "03b2749206ab7a35f43ddb940d7f34695c8da485345cf9fafb68ef43ab998a96f3",
+    "secret": "7623c47d93f83485a16e6f8d7a216eeda19f69be9a4fa877f6980a0395e65af2"
+  },
+  {
+    "public": "021c8d57c032abd27234310dff86464215d06cfb864f8250235447a9e9fd669b93",
+    "secret": "4b5542c56fea30f19e8abb3ca81963a7c75f29d30cb96e14d362d0c047c4c6f1"
+  },
+  {
+    "public": "0339e0c2e84582b02cb7d07d054e71086306068f2850af6db7c856f6752e251540",
+    "secret": "a2c0048e96fb7f6e55dc7246b6b702c7fa029d8b78f7006faa5ddd8833b820f0"
+  },
+  {
+    "public": "037ce4fd2bfcdd5c8c8d3fae34aca3db3223a208da275f1912f04d1628b00cc964",
+    "secret": "223ea29215c65b0dabdefb5639476b19133db4a8b831c3dbc73727bc33038f7b"
+  },
+  {
+    "public": "039abfd07c4120518d322b839f144788512ce9a7ab84aa316573ba23d3eb39c3d7",
+    "secret": "077c4fc2b2cb0c95eaa7dec5a028d1bc39160f0369caf493499e43ba6936a545"
+  },
+  {
+    "public": "03627019487c9e847f71ab3e969939881698836d5675e71df113ace548df698eb1",
+    "secret": "f502e26db7a3d1067c8053edf562ed255255218777b36896295307c5433b445a"
+  },
+  {
+    "public": "02e3a703e64f579097eacbe0a829bc9fd3631a07ddd2494b47cee8bd18403dfc49",
+    "secret": "7f2ce44f8f766da1f8396902ffac1e556100870fa8266bfa61e2e1f3ee8651b5"
+  },
+  {
+    "public": "035bd62828eb1dc765306b76b6cdff08b00ebe5a63da843ac98173a50f57bc567a",
+    "secret": "c442fe421eb9e09f1e6e82ab1e5b75d9c901d3e18d0229c5f5b7161f6043e447"
+  },
+  {
+    "public": "0270a03fc149b19b7fec0f05a9e82071fd48cfd1a85cbf560fe1e40aab7bba40be",
+    "secret": "91c6486fa147a141622d3c99b4e01a22171a8a3aa3ba4777269b2f7514dbba23"
+  },
+  {
+    "public": "02d119b76952bcecf956b282d88d168d10ffe914708dfc46b46391ab1335b7c0ab",
+    "secret": "d462da8f1dc6aa09ed03d638a8f85a3b39112e4464b84171ff3d9e4fcfd46bf1"
+  },
+  {
+    "public": "03b15106387b5538dfdc572a2bf46ad603c0a3154fa755cf6f0dfcea14a1c5ef2a",
+    "secret": "ed2c28993c895c7b0503b469b5e6a90cb9dcfc27126f61016661a67e0e719c9a"
+  },
+  {
+    "public": "02464d8e233a25fd3eb8b4109d7e6792a8006a1947cc247bdb1ab0a53cc6eab16a",
+    "secret": "f74d87eaaba1349c31c4a3aea3c0b8862d2daa128291bedb95b252e005362ea8"
+  },
+  {
+    "public": "0306f427104a61bcbe5f68053c2b6f0195ea98aed335e47b62c81ece46555e7805",
+    "secret": "3047a50207d25d0729430f8a94559606c13bce462cff07f18ce584c6660620bb"
+  },
+  {
+    "public": "03c3ef468449c951a330134a1eb3b8da29f96bdb81aea15e1b44d3f45896c161aa",
+    "secret": "ac0f2295e74fa9730c7076d4e69bd5723afedcb55d431844547382cceb3ecf3a"
+  },
+  {
+    "public": "02439933cd7586cadb7ad4775fb5a435d5d2cedf620df0a5e15f56c29d1692e519",
+    "secret": "8a72326d6926c38655aa08ed76ec887a2a443cda129da10e3dfdc40128d0a55b"
+  },
+  {
+    "public": "035ee9665cdd8180856f7ad236528728f07c75e5de9546f72422981f3a071ab839",
+    "secret": "a0d2b3a2282fe673f966fbc2df363aef024d1466c7a758aff6e4e9644275867e"
+  },
+  {
+    "public": "0304888aa7ccf2c8e7b24b9dad11a4a2b6c6f83bd904a82a1dea7a3c5a518dffc8",
+    "secret": "cf04150ffbfdcd5a33b3c801ce9ba22a733d76f359106006e2f3df788035514c"
+  },
+  {
+    "public": "03223e9204a6cd4ddd3c4c1e8c204d64e78c8d922e7b83807d58029f99b9e480c3",
+    "secret": "97892fdba572720c6a6a26d758f5dad9627b1917b85da9f1103691314c26f6e7"
+  },
+  {
+    "public": "02c2b249e8556f27ff24bd346db9c2adf0ab0b89d671aaac9ead56990abc974cba",
+    "secret": "cd190b27794641e035d24aa12a0c52742e45b1f55ee5905fd5d8620f1866d569"
+  },
+  {
+    "public": "02fae519ae95e19cb8783ccbee45ad0b3d4b3b53ebaa524ad5dec657dfa638519d",
+    "secret": "4164e38437a786f5b8d48738b01771ec6feab7961061aa3370cb19532578d371"
+  },
+  {
+    "public": "02f1aba1a25f65e58397f6322c4d719988bd49abf5d8305b519f989b7a03d19126",
+    "secret": "62245e844fdff31ffcc6fa24f044ed7937e43ecac250d89b443ed7813d3b770f"
+  },
+  {
+    "public": "023b6d32391a493061f1db3f5f1fa3fb674b31ad5774774a56fbffed357d006139",
+    "secret": "e96f64cdd4e41444de7e91fc162c79fb230051c0c974ce197a6b89f42f81d57a"
+  },
+  {
+    "public": "03c9a6fca35bd6595471aa6e46b1e500dbd66e7be270b871e2dc2ab401cde3ef27",
+    "secret": "865f5862059addaba9292fa41687b2fe9fc88d7cd69e71e14e89f2cfb2aaef57"
+  },
+  {
+    "public": "02c73d3b8df2fb52c345b24004a35ddf6f57a3d7cdabe9f4b87f7a3a8d1520a5ea",
+    "secret": "ca23513f36e33ea8e033f48189bd11f823709f2ab17acd7d2b8580e98c501673"
+  },
+  {
+    "public": "035496862b9f30c9b4da31ccef7071bf26186f685dc5e9c9f72fe52bca8001d8ae",
+    "secret": "5b388c74773e76c7d14670aa80ed6bf98dfda6578c4fa63aa79b2140ec91e3ef"
+  },
+  {
+    "public": "021ec4d3e4496fe56bd6cc00122b97ec722787a8c001c0c40a2c0aebb74c6dabc3",
+    "secret": "f06ff358d629c6ba77695e765eb0bf880bb2274d013fa19c80e2409ac28eef99"
+  },
+  {
+    "public": "03ce5e8de866eadb173197936062acd7991047cb46b65a4521e1b093f191054986",
+    "secret": "01cf2942d384c0d74528676a0a858ef5093b682a5121af2985c70cea056a8834"
+  },
+  {
+    "public": "020442d9207a6a98c90915e8c1f639dbe75e8d7cb93219a95b05c49aaac3ce14c0",
+    "secret": "df3f20553cd4e1a298725b8a698738e82db524836685dc5499d4db026f0e523b"
+  },
+  {
+    "public": "034b24fc6f0798641094442b680c299e9afa01c05783dd1ccd16567ab3bc993af3",
+    "secret": "ea2bf30dc0fdc389821513b23289d50717e74b8558766964de53aa45e5f0ff9d"
+  },
+  {
+    "public": "030956fafe5044d2fc912c927ac7ea17af502379d7d2d723f22debee4df7bc4a63",
+    "secret": "c13eb8432d2bf6cd9938b6b73b38ee5c47b8b5ea57a0bf43cc8ba642de79ef1d"
+  },
+  {
+    "public": "028e4cebaac86966af581fe2c3aa69410e5c732d03e3b4a2ee1cd53131e02e48f2",
+    "secret": "baf8a4fd4755581864f7e9095fd41e529851821ed64b494b32cdc100d53e0b98"
+  },
+  {
+    "public": "02981c68c30392224a813cb00550fbd42dbbada526ab8be5e2b60d998b428e8da0",
+    "secret": "af9efcc2fdfa1f3356d502ec0901d9f6ad4cb87d890cebcd1a124f4232f2b15d"
+  },
+  {
+    "public": "035e645486a47848b8e728525451b89d7c5acbde5fb6e82f86371a6d89bc338173",
+    "secret": "33f867bd83a2e48f6f46dee0a4313f14fb381416a8ae32a20f8b9cba4835f5ee"
+  },
+  {
+    "public": "02dbae41a3e89f4d2d5bd3b05ba3c7501c7e8e43b8ea8a7d05931bd9f55b23207c",
+    "secret": "8e7ca41b47355678baa76933cf1c86a7a7f98a317df7aad5b310797505ff4fd5"
+  },
+  {
+    "public": "02f9b8f308250242e9e1e0a51b4b4170305e7d88f6f39d24d807b2e079454c61e5",
+    "secret": "c4937778129960c2c1c5aebfe11c1bcac21982484dd45e082d9e1b97796e20c4"
+  },
+  {
+    "public": "03924f9e8bc7df2072013596e49095ad090324b69972a1f453b99e02cfaddd10ce",
+    "secret": "67e9121ef801ae0bbae99ec4d9330e0f3c9026e33cfdce2c51f1f77a9133e2d2"
+  },
+  {
+    "public": "02d576a04d32658db50ad6907d8d60d5054ae1e329e03458e92051c4ddf077179a",
+    "secret": "77e6cfe349d366c611e226f1c30f6d20c399eae38bcb3b40b63d67c2ea8bac8b"
+  },
+  {
+    "public": "0395640d680d135c921bb27e39b7af05703097ddc7f0e79cf3373883ff140f0bed",
+    "secret": "c65e02236df8379ded21c124813330afdb88610e703fafa0898cb81c7f606299"
+  },
+  {
+    "public": "02672034f63d05f2dba97b4609b2bbb301b011ba1b63836ca749b51569eb505933",
+    "secret": "f2bc40f6c555b5bfbfbee6c155171ec175dbebbb7d1ef06071495abfc4047c24"
+  },
+  {
+    "public": "03602f1e425f80a4ba38e616d33619b0b2ab4961995af492dec63388cf932c1166",
+    "secret": "6526ed354b850dd135b235d34ad91834b6911f92cd0af2b37a58c6b2ff093ee2"
+  },
+  {
+    "public": "026747260b8ee8d0bf20cd5609da54339653b59a795a4cbb9e820becc1f4b36c04",
+    "secret": "897117a54b8ebb294cf7d299ba43632ed4d4d3ec925e791122694628e26411cb"
+  },
+  {
+    "public": "02b20d7e037f8cc574881225e767a2fd9bf5a21ecf438168273622f70b426ce22a",
+    "secret": "d3deafd2093258452b2ab3a329810943d3b1adf805d8a7b140c2cb37f2fffe18"
+  },
+  {
+    "public": "03e5402a7c6b1915527a2d94e746fa6fd6642c524d13c3e040377e9948786e9ad2",
+    "secret": "5488639cb8a83b8aa0551c0e17af9ac6bad1771dfc66798d4c2df3c7570d220f"
+  },
+  {
+    "public": "02cf6e2f3db6af81ff6408f9f67945d78045339caa4b0911140c3f40da90e4b9b3",
+    "secret": "6cc514697a9f25e6a120013fa734c3c708018aa0ed356110069d612cd34b3588"
+  },
+  {
+    "public": "03d4107ee5c9b3bf01e23f7723baadbba51cfbd96ecc1cd9e504c48b02081dfdb1",
+    "secret": "a0070aa7ba4632bd7c9993e7abf2aaf3ffe6d4a3cc92b51f30618211a0c7a294"
+  },
+  {
+    "public": "038a914c47a114eb2da81a7f3294f311f2ffef80b2de1f474805cf0f845837f95c",
+    "secret": "c71e794ecc69d8b659133821ab133bb9c632e9bcaa18508d938972a3f4e6ea2f"
+  },
+  {
+    "public": "03ae78ffce1837ddcea2800ccd6be892a907a267216978c7b21ec749f0d44b65ae",
+    "secret": "47c0e4aaaf5f1f0de52388107e5c4b882fede181933f0216d6c64640a1ec1714"
+  },
+  {
+    "public": "0204e303a235a67a8482b26365bdcb8b1f79c811772798b4131ca233f0b9209b4b",
+    "secret": "c55f3aa960479db0c174ce18c85934a6babb7e06b8b86aa6de69acf54a311705"
+  },
+  {
+    "public": "029d11f19c205b0cd07d760f53b02a4d8b0a2b7d3310ea92e1b5395d87f7bbb2b5",
+    "secret": "10451defd859bc1cf3070b418a7a110c4cf5eb77350e87b79cfe7da20c60def3"
+  },
+  {
+    "public": "02e7490b1c94ccc00287d5049a814fcde208cb5c71c1056ed7895f1f81ef62c614",
+    "secret": "a0304e73dc2f8933735cd565f5b84d513699ac1afa54645643f0e6d474150905"
+  },
+  {
+    "public": "031e938fac7f6ac24e229f7c4d7467361a606a5207c568ad873995a9f80c1ca54d",
+    "secret": "c763ec3b797e4db6ed8b85593c44a9dd8d518e52a5aa8420f0910795937a56bd"
+  },
+  {
+    "public": "02a3714ef6ecf36e9e9cf1afb676c4a7aefb3cac8475a55a08a63ecc8277e4c059",
+    "secret": "64d9fbf5b0b4d2f4f86c31bd34d48d00b9571177a0f7e111ed30a402fd0a956d"
+  },
+  {
+    "public": "03c6e6a4c1e05df3795e3e0483247604ca808e1c08c2fc8e95b34e0c0bc5ccef32",
+    "secret": "b4fc0e7501ac366de72e59ea95a505c7726e7773c19690d2ce0cde281e7331e4"
+  },
+  {
+    "public": "026062b4a89b4920c73fe4f25700a889ec4a79aeae1bd1b9a62353d62b103a0790",
+    "secret": "25bf5cd8849f3d08b82be180c664189f8ccb637bd0d29543f4c5c6c071890ab4"
+  },
+  {
+    "public": "03f2d532ebc65b25f632598e9b222e7ece13c140ca23f36ae1eedef2fc45d5d717",
+    "secret": "102f188330fc3e30804ef9eae2c90ac1a585e69e67e85026d992426acac374cd"
+  },
+  {
+    "public": "0232893bdeb942ca86f7381c973511285c7a38f6caa9f7d035cbc7b3089b63bbfe",
+    "secret": "171dfc15a5a0a677b304e40e398b1271799013b27113f8a0288d96e7860bbe47"
+  },
+  {
+    "public": "031995695433bec62dcfff0255010821f55ab12e28e6b03a58074ee70ef40383b3",
+    "secret": "66834c2e6a75670e0dd329a8c0f2bd36132334eaf863d8e58c5d3eb27fa9fa91"
+  },
+  {
+    "public": "03ed0f62e54c9435d6c4a0d3e1b1d34ee1067905f3b45a9302eab93d57ec978c10",
+    "secret": "f1aa5870c1daefb9ac47f65424a304b7a7a8a0b5bb178f448a3d2307a558b583"
+  },
+  {
+    "public": "0372610c580fc7e4716e326dc76396397326084b7fb832945f35d999f847814b29",
+    "secret": "0a39f8eab6fb7b7a8d8d67db847eb7f9dfe2afc31b7cc1746ad9ece60bf09957"
+  },
+  {
+    "public": "03d450e91388112e09fffae550d0b259b52363ec77f7391e3a6ef202e3ed661c4d",
+    "secret": "5637e46c8081c6fafda6aadf025feec97a8d3fd0827bf4a4cea2d9e7c245dc3d"
+  },
+  {
+    "public": "03cab2ab0397ef9a8b285b0be70eccbf6ee63a42357a30cfbfd438436f0f9bd293",
+    "secret": "82574afd35c9788c1a853a77a923df3204d75b005a323d5d00ed4a890e3e24ca"
+  },
+  {
+    "public": "0391e17b1abfdb4e61d964ad2df7d7d66fee3111181f8498cad0e7e08a16bd9580",
+    "secret": "a78c3ea501b4209923d27a55e6ce8ea8629376e13d814d2b27dac2a5052ecdcb"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_keypair/tests/nist256p1_tests.rs b/rust/tw_keypair/tests/nist256p1_tests.rs
new file mode 100644
index 00000000000..570f98d4fe0
--- /dev/null
+++ b/rust/tw_keypair/tests/nist256p1_tests.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+use tw_encoding::hex::as_hex;
+use tw_hash::{H256, H264, H520};
+use tw_keypair::ecdsa::nist256p1::{PrivateKey, PublicKey, VerifySignature};
+use tw_keypair::traits::VerifyingKeyTrait;
+
+/// The tests were generated in C++ using the `trezor-crypto` library.
+const NIST256P1_VERIFY: &str = include_str!("nist256p1_verify.json");
+const NIST256P1_PRIV_TO_PUB_COMPRESSED: &str =
+    include_str!("nist256p1_priv_to_pub_compressed.json");
+
+#[derive(Deserialize)]
+struct Nist256p1VerifyTest {
+    #[serde(with = "as_hex")]
+    public: H264,
+    #[serde(with = "as_hex")]
+    msg: H256,
+    #[serde(with = "as_hex")]
+    signature: H520,
+}
+
+#[derive(Deserialize)]
+struct Nist256p1PrivToPubCompressedTest {
+    #[serde(with = "as_hex")]
+    secret: H256,
+    #[serde(with = "as_hex")]
+    public: H264,
+}
+
+#[test]
+fn test_nist256p1_verify() {
+    let tests: Vec<Nist256p1VerifyTest> = serde_json::from_str(NIST256P1_VERIFY).unwrap();
+    for test in tests {
+        let public = PublicKey::try_from(test.public.as_slice()).unwrap();
+
+        let verify_sign = VerifySignature::try_from(test.signature.as_slice()).unwrap();
+        assert!(public.verify(verify_sign, test.msg));
+    }
+}
+
+#[test]
+fn test_nist256p1_priv_to_pub() {
+    let tests: Vec<Nist256p1PrivToPubCompressedTest> =
+        serde_json::from_str(NIST256P1_PRIV_TO_PUB_COMPRESSED).unwrap();
+    for test in tests {
+        let private = PrivateKey::try_from(test.secret.as_slice()).unwrap();
+        let actual_public = private.public().compressed();
+
+        assert_eq!(actual_public, test.public);
+    }
+}
diff --git a/rust/tw_keypair/tests/nist256p1_verify.json b/rust/tw_keypair/tests/nist256p1_verify.json
new file mode 100644
index 00000000000..be3e6b48bae
--- /dev/null
+++ b/rust/tw_keypair/tests/nist256p1_verify.json
@@ -0,0 +1,1002 @@
+[
+  {
+    "msg": "3fc3eff7f53bdacc4812a1197a1469c98c5c9d3f7f4885f1dde397ac0b34d745",
+    "public": "02bd5c3600089676a981d2cdfa0147a5e4abdd3b6f34319fe2b8ea6cd9569880b1",
+    "signature": "6395017ab93fa645130c21381f66229f0ad31ad50efa613e546b6b1e687362ff591661477e794337b971b466efbc6115d5f35b463cffb6f785dd438f3d9331f601"
+  },
+  {
+    "msg": "b3cabcaaec7ec718b59c9bb505eef38537c9d094d6f3ff71efc4836bec67c265",
+    "public": "03e1769d3203a68b05de51ebc9320752c76fdae6b2661ca80754a5f974dd97fc5a",
+    "signature": "6746a775588d74df8894f888cba28f1ab60b96b7750df10a8db724210d25787069984130ad944827082b13e53a96b64d1c5e776d8fafbf5985b714cb8b5cd5f301"
+  },
+  {
+    "msg": "b7d5145165f9a93480432896a9a778a524fc4f79f433c0effb5a75b051c7c568",
+    "public": "03e15210081adc36af63c47b690aa474bcd3704e3c532034c63722304b28d10142",
+    "signature": "6cc8a52ea475c5ab090bb91f62e1e3e9831450b6941d30ed0600a08acec014db65e7ecee3a3e1f95a53054a03f16f0e44f1d0aa3a44b87a4664819a0f5c0f38800"
+  },
+  {
+    "msg": "61e03b0d61ddb1c171e8d164bd2d0c1b5fc4e797b64668a5beab255d3e0fc71a",
+    "public": "03bcb0565985be22b287f1e5b38350e1b9c6c631fd6e63585041b24e148ec910eb",
+    "signature": "d3771f7602b46c4d12bd784d60aabe9eaeb40862750ddd5d49bbdf6697c34cf9377a7803f627f44f461378636322879efb8919654a2c69a280ab7efb5f2466a600"
+  },
+  {
+    "msg": "3bcd1aabe2a97aa8867b36aaac5a4b22c1296012aeffde0f8ad791b19f12b008",
+    "public": "02a9946591f8eb3d5c7160ce92f0b88b1d28fbfb1ce6bb39cc7746a93d2ce6a7ba",
+    "signature": "40be3646c364a142e7f07cce413db8270eba8c52a2b023ada2f89cc3cd5972c0547799bd6b5d8d447d7ffd850329504717da9305dae85645c54393a5035e9ee700"
+  },
+  {
+    "msg": "e2487f2d414d441de4b805f7ddc33974449fc4f02c8badf15377c72c92375c7d",
+    "public": "0352006d72237e24a93cc77444daea4bdd20944d5774a283c1636ac24acf6f377f",
+    "signature": "b2ebfa1cc565825c15012e7f0ee5404092aaa66a811c1c73e188133da9068e0a43295b7137f53bb47ea605a103f709b367d9d682f546dd4f43030023d93a615c01"
+  },
+  {
+    "msg": "1937c84233473b755ab2520c8803eeca90c7bd503557a9ce5443f1bf300e3d17",
+    "public": "03d7b1aec7fdacbbfe8c54a75fea07ab5cd2e0882e17edcfeb2f4f6782782b9b9e",
+    "signature": "f65c1e6f47c0a1c7224da6fc8aa0eea9449cae1abb32decd121f21e1241bf894374c2c6368585275b595ab18f4b754b6532920522fc821446771d5b721ca0edd00"
+  },
+  {
+    "msg": "0edee26db4d0d974c63311d3e9f5732bba946d7af2f32c70fc5965d7fcf1dcec",
+    "public": "02b80fbd6b8044b1a0dbb551be88426848280dbd8a2c5815a03bae9fa5b187c66b",
+    "signature": "dc2c74750ef6cbf3c66592815ccb3e3c64a6c28f3633da9a5c951c28094d5b9016e577dedc6a1d1e6d13438c7b8abfe2553b7d44597620755b87e68aecf51f2b01"
+  },
+  {
+    "msg": "91f9815b4b0a1f2257233d4d0485888a1f5d63498fc3a63c1fae47ed56e10c74",
+    "public": "032b48232a0edd6a126ff656866d7cf2313d9a15ab2165b975f04a1c68f184e822",
+    "signature": "c7dd5b50a2a5aa775b23a90b0dba80edc6a12d9f0bf87081cea8cb61e3de62e21afff84bb8c656bbf08e68a25f6a8e7ddb8f186f19e91008cafd08013a04432d01"
+  },
+  {
+    "msg": "d153b2e6928e837ca82d95c8220bc242d78961c07beb7f027406abf4555ab913",
+    "public": "038732fcdb97ce1516afb530ee6d65552ad3edbc5be837a7e679c52f8e23c06569",
+    "signature": "a7a4f7bd4990e28110d082da52c7eb68d16084ca36b27d57a235c463bfc2a2701cf453b26dce6cf37dadeea611969f440f4093a9e14be89417a355086cf5ed2e00"
+  },
+  {
+    "msg": "4abd48f6439581235e5e28d69100daf4b82068e8265bfb2cfa157b68b7e4b035",
+    "public": "036c55666ec34bb4007f81205dd0e7c729ff5b04ac84d9229fb232527d62c2f1dc",
+    "signature": "7b41a6c06d61460d71e889db7edbb3d8bb01b3567949075559d6a97019c897e5539d107b38cc72b73beaeb1a69f9898c9e64f643b22fdc06569d5a4a222e11da00"
+  },
+  {
+    "msg": "9f6864416087761a262d230c18f38f378f4740f74e65b6da2615fbaee0cd71e8",
+    "public": "032bfdb75624c4ae1f2a3955288dd8909dce93adf287225a5e320db948f0b22435",
+    "signature": "1c9195c7cc520448504a2a852fd5486734b73ff0f2afab8db1ecb12199a4b03c79a7f2c9ab686fec9bf24e6aeb2875de2e5faadcd27afd6f93e0291e3f1da60801"
+  },
+  {
+    "msg": "b1ba41975b2f4dc77dfcee85a9b72a3b8ba4dd96e35dcfd0bdbf53055ed398e1",
+    "public": "032ec852c9deeb23e560e13510c2c628d67b193df9e0452155aa71f5b578790793",
+    "signature": "e60260f176fb6acd22358eb962dcba83793ae0501cf87d5e57081a763bdc82cb6fabf7e84e8abd4e8957df72fbc69943d6b6bbc77e2a1969a3f79803be6694f201"
+  },
+  {
+    "msg": "0110cf18650bf4be0adafe1fea013bd8a09fc03f741e61d92741437cfee4f4b3",
+    "public": "02cfc31fc32508e5ed1b86cd43cb11de3b7bc2772c4eb8f079442b1e368c04eabd",
+    "signature": "6fd40f0b74d0e0801bf23cebdceb14d2da9a12d18a7790a48482804d5d39173b482630a66e052adeaebb96361c07568742398dd4589854d6b2ecdb32440ea08e01"
+  },
+  {
+    "msg": "32ed28b7fc122057c755a175ec9fbb90ec3853a44916716fd5dcde5e90b7dca0",
+    "public": "036dba0f232c63aad24085a0f7595169382bbb5842e1a451279b29cec85825df5f",
+    "signature": "a8b87d61a848e00c3d990313d0166e89c877d2dd9fe73f2821c2424d875df93d3a67678c89d2115f3b937ac3d31f6e0bdc908d44c77bb7eeebc0a68c2055fceb00"
+  },
+  {
+    "msg": "15a6ecbd1fd7c29a1767ec4e1d1d0d2af4c7bb88a020c9ba965c8e20d3593b78",
+    "public": "03fda85841b3444f7e2088a3974945e85be3c8271976bec13cdc0e69de7d79b3eb",
+    "signature": "63721b96d11c1c87e9ba9fa0a17fae8512ecb4bde9707c2713865942c8c68f2e77400ac8f4f395bc98567d6f1bbdedd3c5796103724e735712675f10a06f98c901"
+  },
+  {
+    "msg": "7a1dc6e41b5f92cd792a053eae2b0132533743e06577511df56a0c0b944a4539",
+    "public": "036aeb177cf9866d44cb178d90ea5167426ab4172afe652ebb94447bcafab8110f",
+    "signature": "2b65b981bc7394a1f3a30fe80a515b28d9a776ae575cade7e389f51f7a14548b5449b3ba65e794e8e78614273d0decded5ea7f08fa8ea8f5935aad0ac08ca0d600"
+  },
+  {
+    "msg": "a8b1447535b6ab857e224265c0e5383c2f7f73c545d034d1798df9888284ee6b",
+    "public": "02bdeb1540cecb3e32732becfc864eb4d8bc32ff9056f5d3b6876efbedf31e41f2",
+    "signature": "52642ce792cb100c6e4d90391d852556de043e2c766fb67b9edf677586b395783cedebe889e600435cf6899ba77888b286f23498d2f9ba97eaa605673f6b567b00"
+  },
+  {
+    "msg": "6d515e85dde7759b4b695f82aab2fc39b493d027615d6acee6f56fb98d3b2145",
+    "public": "028280bf538923014130e3af18ed49557010b9a36b2b1162758e77b187682b6797",
+    "signature": "2d80b2f9c7e29ce0387752d9f5ed018066fa75ab02f3dbcb4b670648c1afde877e2a5dc4118f776788adf16765ad7344728dfabb1ad148146f22a41d2009faec00"
+  },
+  {
+    "msg": "00269fa879e3db9d46467a407a969fea1e505b88fdb6b6e7218bb2849becef20",
+    "public": "035df9fb6043633059197e3f62c49f845b1c5d2cb7ed9cb07113acf245daa90ec3",
+    "signature": "1cf25dd1177165146e6dfae00eee4771f466e2c82b9f0b84e6e437cd5426eaa546da7e6db98a39df39f27ebd93b1cc3ef87a74f62d6d8ce4981f03980dcfa28201"
+  },
+  {
+    "msg": "9f0ea3a876fd07905f0966f89b8b84179babbda1dc1cabb0b2554f9d387800fb",
+    "public": "0299d233d1b0ec629bcf53a3ed3258b9ed2d3076c018103526399b617abe14702e",
+    "signature": "2399ba08f57b961640b59c04ea0d9eee4ba432271ac22b6706e8a4aa772bdfa04d3683a31fe24bf52c3a95bcd7f4f2b40cac2123c84d3be60354261e1300b1ea00"
+  },
+  {
+    "msg": "3ecbf5ae34bb1d6b6f077493e388dd1fd0401da4055d9c89adf5fa1f0f93ffaf",
+    "public": "021a4db4d76d6407831b9753c16be63759c7bb6e928691ea8200104ed55d555c50",
+    "signature": "2fbf7b63be3596dee0fdb1090e2e56019995a47a8038e61451e291d89b84cee658eb740ae1b463c3335f291ebfaf6c68cb89d05889240730d32b8e769f6957e700"
+  },
+  {
+    "msg": "974bd8323f0c7efdc0539ec16a4879742067f1f9052c97bc2547d21783923c85",
+    "public": "0306981738b4150e93dd2166fcba2c58c071136d6e882d8acb61ceeff5e3f54fff",
+    "signature": "7edeb9613910719ba0c0d52ba574158864842d511f1edc900ea1420e91a315c37c846b167e01ebb7af8b368cc0407d8ffd6a20633fcf68cdace05b7361dab1db00"
+  },
+  {
+    "msg": "aefe6faedb93a13872a4a4421587069c724d290af053c0af8cbb9da6d52f408f",
+    "public": "022f78d10160a00769fbe07658b7716aaa7cbde788729c9c2f5fd9630f3b9bec61",
+    "signature": "32efdcc36ddb3286bdd8f79464096d4e70db457dd4ef144555d55d6f4dee1d0e1a0aa3211be35c1666a4c8a90b2f9c4582b71012d2ff3ab00081abaaef9c1bd900"
+  },
+  {
+    "msg": "046c497c6003c9280bbe2665c5468b4500b89406c568ab8cd6517b641a93fc19",
+    "public": "0323dc4cdada0f44b441ffcbdacce62541c99a72fddd8d7a490af042ce2f16734f",
+    "signature": "f171ed4486177b9540eee1c4407212bbb187306dd8efe116901a1d8aa141113f05bed5d27e0da272631b3d485ca174fdf8a66e9a0faa2fc1f5256afd606617b401"
+  },
+  {
+    "msg": "65b8f1b63cdc4018902faa868c54d44f5a11ff1f761b9beb05416cd85d4ad3ca",
+    "public": "03d8cfd0f1293d35a883094f6a7edf6e7842371cb03952f6621b518ab3ff4edf38",
+    "signature": "cc7d33c9cced8e8851af21bbd67a6df71a63050de3116ae3c50a89433254c78f20e5ec4e930e4e3b1d7c059ea4f7b568e1e8042e4291216c7ee220317008838200"
+  },
+  {
+    "msg": "25467e135350ea79786eca6c59d7bae35618cfeebef9e5153ed2e073f2ee9b62",
+    "public": "0229939fe834e69da9c62012dd435eccc33505737452d8e3151850feebac2111a6",
+    "signature": "1b47d5cc524cb49b86d0e74603a75941a57712696f1146ef7f65769418c15b9c306ca8a3676534734bf731113622133cb5b913366a162e526ca0811181c3679600"
+  },
+  {
+    "msg": "d52391ecb02377e9eff37461be0ab53a78ae1a9471f9a6be2e89be9765a9dbff",
+    "public": "03075f93a73a5b190532efd4a09fe08e830ecbb5c1305a55382c4e4f905bd6a05b",
+    "signature": "e2fc7a1ebd5464ab071160a9b8b88d99f4c8aaf144eb184d4577fb03aa305ebb53005d92a2042dfac3c8219e1480e32abf1c69f03aca8021f4b9e5d1490c8bcd01"
+  },
+  {
+    "msg": "d8114ca952df7809f2382d65adabbab7beda7a25053513a71f6a8064983cbd5d",
+    "public": "039ed005dbab34510197e26da0e4bb107f8cb64b1b9e862c43ef0a86f05dc5d76b",
+    "signature": "5e3e3a7a1fba3b46bda2983ed5523c1ea69bfc8752bb88e54a31cc64bff2918111e2e30f8552cc8635c0802ded373875056325193ed9b8ad97b27e9e1e2e44f001"
+  },
+  {
+    "msg": "f26734f0d4f5105395115fa6839381c70d9816fa818fb9e605634a59a5ea9200",
+    "public": "03cb130e405ef4bc7441546a833e36a78284ef826b4fa0ecda66c330523dbf96f2",
+    "signature": "a14d1f583507e6ea09dfcb42f5762b08ce37337c95a07aa1eadcb02c1dc7e8cf241be4178f71dd14ed307665f0e4cb673d907ebf874882c0221f6ec6b128a6ca01"
+  },
+  {
+    "msg": "1ba610ee3629bf8bbcf1ba30c1ed9f4c4dea2ced0531af6a26ef7f2ee18aea16",
+    "public": "029832e3af9059871ed0905d44280c828e20cd25bd65c66bfbc3e7150c963ec099",
+    "signature": "25dec6ad1d408e978c265fb50c91ea880c8e4a1088ef460015d0c48434db61b7017cf33fbea390f584b69c92ff3c47c1e095d5a764f8892710aa20822bdf546000"
+  },
+  {
+    "msg": "596a17a1a27e7617ffa8e777a0006c21d903145dbc2644e290a33c6cefb51277",
+    "public": "022c2903fff6eae8b633366f301476b9106a8a0f70f541c19cdb9dbf2cca2b210f",
+    "signature": "d92d628ea518d56da346c97f444af5d9685274a118467fb0ab3c4070d7968ffd590f12fb0599e4042e37661b32a4534cda84792b394f1d432e1f02ee0e4d43aa01"
+  },
+  {
+    "msg": "ac2492c69d56aa433e07001673ceb19bf465ad2e18b55d07a1824e5593f51b05",
+    "public": "034ec5a7377fe20f714ca3eac79ed4629c53563daf59e4d89a6d0acda501b4f33b",
+    "signature": "71f89cadaf3d92a163267ede71a796923ef3c48a5e5f21d705a222a11164bcaf5efaab21bc657cc0f31d130e6256bcd36d7cdfa26fed351aa6a9fe209a976f9300"
+  },
+  {
+    "msg": "2b535e4a945059fadefa75b3b1f6b22f8b4100356a63c37f769645dc8c87c189",
+    "public": "02271cf2a6263bc94702c725ba4732ae041c300196cfa6dedbe5cb37f4c717fdfd",
+    "signature": "3b630d2965b2682c406ec57adbdc9c4866345517822f8ac53510e17632b27ca54302d88b6586a653b4a97a5f5981eba669a73de2a140e081c5fe52603695665c00"
+  },
+  {
+    "msg": "6cc3e765e85f30c1020e671083f7224bd1084649c568fabcf1ca1123bb8736f2",
+    "public": "03dac2cf067abf1b2d521730b85a65a79071e9c5ac9f2950ac5bd44e2e850d8278",
+    "signature": "138725f707643147214361cd5488782342e0a8a7110fdd329b920138bae2e06e4fe7c588a17f83094d7cd62f29562a7eb6c30d507232882e9e842312cf85ada600"
+  },
+  {
+    "msg": "0356c52fea3a008d8041d3f1d170c5bdc8a6d08c694b44e7e0d0a8fc6f230d73",
+    "public": "02a9228fb8f3e82801442e9b04482c5f9db4fc4f280da1c6870d5cd3d15196f13c",
+    "signature": "9a275425a2a2bc2c60de1eae59975bec0783b1a933718e6a1a48f919200858c71b12f70610a0d43b955c87be21b83e34ce02829dbb6335c34af674195ce00bcd00"
+  },
+  {
+    "msg": "6325bf73910d1c5f96010cec3c77115f59c7bc822ee4c8989549c26f1fab9127",
+    "public": "02d1b6d93b5bafb24ccbbab836cb86c2c69845b4c82219ad2950ef02113cbdefce",
+    "signature": "bfe8ccd383777e7bc4b92ba2bae37268a261072b62cb9a44935cdcd3eb1b26bb17eae6ef3f1563943b9e86e158c78a9915b1539c7da59b4a321d32622cd56c7501"
+  },
+  {
+    "msg": "246b49aa5e4df5ba1f72de7c1586a6f1bca3a333b167a8e784f8d970f93ad7a2",
+    "public": "038bdf68b59d6a9a971471363308fed7eeab3edf161a7a0ab5ca75dc45895519a9",
+    "signature": "d0b1740e9031fb6cc2ef5c6442753eec6fafe4720611f783eb998cd3ec41b0276e167a54f13fdf45ff4b95dfe7df151c682c4a1d605ea96479dab5cd288f9a3400"
+  },
+  {
+    "msg": "12fdc2e910238d41fd3310581ac3597c4700d62956199dad122b82296331c372",
+    "public": "038ea7c99a61b80f6c919548b636569e06a4994944a3278eeec476a22a9daadd92",
+    "signature": "61fab12d9952f5409ea7d39ca504a5fa3ed800669b9547dfd162257856e80f763afb00758dcea39f89388ea6dc5b62bd5f2aa9708cf6444287df7d3a6bd1d0ef01"
+  },
+  {
+    "msg": "1e8866b818eb815b08d97cbffe5f43d34c57362d703c9d84a7cbd919291c05d1",
+    "public": "02ed631d277945c7b67f1cb4c80d30a42e2e173384cf682526cb4a748dc6713944",
+    "signature": "eac977f9cb5ac1e48e8b654ba37139746a95e31fd8a0286d531867a7a68b2b0362d57a28d434428ff4692dbc78a58e602eed24cbdca4ed55e888c4254bfb7e0001"
+  },
+  {
+    "msg": "26fe270945afddef41c3b950e0881d87aa77982daed5694af80b84d51eff7b07",
+    "public": "031942a43382ced8c22119b6f1247f27881bf72e99386923f62836773cb6b62368",
+    "signature": "678bcb8f52a48f17c4e4a2cc77efd555b9e7ee3980f099cebdb61b676f9884c80310bbddc46aa8822d2ef8b0ad4d0cf535f06f841c0a117176c4bcd84800350c01"
+  },
+  {
+    "msg": "1e43fd1be84d7cd94b67565268eee393ddf6b05ad6e5b51c4f6ee230114e126f",
+    "public": "03979edad0c1d333d6635f3870ba4c138aef2fb973b7ba05f894824fba268ebb81",
+    "signature": "b168c3dbe98662e458f03c7a6eee6e026380185b201caa458d599267babe486622caf00f0e38468ca2f3ee4e710b33c14a50555d0abb2d17c56177eaf580b69101"
+  },
+  {
+    "msg": "12f297ca2b124fef4088eaea5b45c10e4ccd0fd25f3a92acd7c67a7f40036053",
+    "public": "03e9d39f299da31babea8a4e6d90e06248221c1c91a79049a856356b8e481a7060",
+    "signature": "4521499cda4daeeeed67909a6f6f527cc879be608cc5dd80ab21500c8c6997ff3e1eb47a861d5c64198d897833649ec8a7229f077000989256bddfa95ec50a6d00"
+  },
+  {
+    "msg": "04eb1bb739c3b0624234c7f1fa4503ef27ff7685f68864d83dddbef77fc9e9f8",
+    "public": "020e3b20515c80fddb5791d74559956dda0a2e64b34b22261b74065eac86564c72",
+    "signature": "1104b25f2ec935b2d9bce6c5ef6c3cb8081ec209b5a40b2b6c7907f4bc7b1ca3164cfc1dec4bb8d038c58438ba5f5592da90ffb34dfd639baae99d7419318e9c01"
+  },
+  {
+    "msg": "0324578f1b0a4ab5836c7a3bdf763790cc53727eadeb26cc46b72e7ac8e4d805",
+    "public": "030f65d4187fd1531b9a3c40303a9eb500d15c67645107c475c763b4e844632fbb",
+    "signature": "bff3bfc1a67326ff2e0f4eca75b792df1e0400f81b3dc916679676cbe02da5556c83c4dd7481b18eecd55870a0eb5db0c60a779a98c9f3fba55ba422cbb2c76901"
+  },
+  {
+    "msg": "958a4bdbf9068d1d5464fda8b4c6230e767a2ad1ab3c558d5c264df657995990",
+    "public": "02100ebb4188fb7217879958f725f8ecdcda2b4080e07641f17893cee6fe7beb38",
+    "signature": "e06abdcefbf288f7a7f22495fb6b97dbcc013d84d958e8dc429d3e53b2a9195f65eee8ff4513ac0524d6285c183c2fb8a66e30119e7e267f58b515f201d3cf2900"
+  },
+  {
+    "msg": "445fd9e57a60c2633a4b8b9a8c110acb191b357ace066f221fe8e7449b840210",
+    "public": "027ca4521ce6505deb2a602a7eb895db03bfbbbfccdc3e5a5be51df3f4b667c43a",
+    "signature": "7f184573a04b75e5f7c2910e7b27a0ba3902975a46d3f4d62d4555f682acfc6478f8676e9ea4a2d511efd9e0fbe3fad5f2a0c6da6452c78cc82dcde17dff80fb00"
+  },
+  {
+    "msg": "cb5126e7bcf90ac8fd8e16425be182b1bff823d4c9bf78bc15239ceff3652006",
+    "public": "02421807dc097b43cb1393e58381c2e034296b45d023ba6bd0e75a21dc3e85d0f8",
+    "signature": "96d68316fa1ff9d1cc22816b269476ad79df1540184c83008bf578914fdcb53d231031fdadfde32bfff363764ee02849b7c8f527b0f7f995b5364b5971a19d5000"
+  },
+  {
+    "msg": "b6d91681e95d5f0197ce9c6f665e4a7fe76a3735d9fc3563872b08dc107558f2",
+    "public": "03b33e7976f663d11f7a704c6e3ccfc70d3b5933dfc25ddb76b5188e878a284ee0",
+    "signature": "03b78ecb1335039becb02b4a45e4f21b7e3a3e1066022eea4338dad59b676d2d36d59af875db0759c3293c973c28811a04c6b64ef30df8e8c9c18c01a4c8d5ae00"
+  },
+  {
+    "msg": "9a31efa8f36c52c6c7da92fb2d1f55556ee2dd1bd3853cdaceeda95167f67336",
+    "public": "02596617a3f8cc872b91959fd8d4867f6ca1d2cd9a5e3ba9766a80a1f2c77982fc",
+    "signature": "233baaa28ea121de21cd8b4c6183291e3b539dc2f4a2c85d83aed406a499a00369314651312fb4a76cc7a50542d810bf4009ff2458589abf371d297cdc26c82e00"
+  },
+  {
+    "msg": "52ab0863b4f9462ee4736fb56d15c650f89993d62bcf714a162abaf39ef9efcc",
+    "public": "023186db1431fdfa794bea08caafe88de583b293b1be86fb17d31a0f0a5ed48f63",
+    "signature": "c1a1aa7b6b24928ddcb8f4819172347e58465c5876c743fdb90075674a234984549c8432977e3a4e6029311ccd9137ecec0dc4423cd490476a46a7e6249e212e01"
+  },
+  {
+    "msg": "c7ba381632e0b824d32ff392359c77cc3e6470903754c795b2e7cccaf94c5830",
+    "public": "0374c18faf24c8d348c04a7b38b06e4668d286526b53bd220d9d9f61c376cc946a",
+    "signature": "f9cd79cb37a012b28383a25e6a4a57c4df81c02fe4e2c63f0cfcacc7fbaf3362061a61e10b07a06c9269bd0d211d2115a6fb413f7086a48ed835c9463c2f955401"
+  },
+  {
+    "msg": "83ba7eb93c29a695c064c9ca3402c053076cff9fe5a69970c0eea8d5629a99fc",
+    "public": "034545e47fc15bcbbfa0946efe5d9f0ba8d36bf985e0d83652c2889246ffeebffc",
+    "signature": "b10e9a888646dbcc44600f76ea3d848b939e93bccf9ff385928604e478518a1e39f38441005f149d0b17cc3fcb8401b831e3a673cc5df83a15d17c47f1c9f9b600"
+  },
+  {
+    "msg": "7a7d76893d52f5651ce15095f8a2c9cd4164dd0b87352f4a9089d7603664fb3d",
+    "public": "028f307ae6d8228aa1fffe5ab5431d411581df74499c439b0b6dfdd66f00d9c7d1",
+    "signature": "a47a6d7145e88cb453a5b69023f338be9e46903f40d2c804c19aeb79a4b6c68f3f88a1079f42a7a3809c65666d9fbbe62ddd2baaa0fc8e5cd617c8ed85e4b2bf00"
+  },
+  {
+    "msg": "8322ab3cb08859f3d22432fae44686db628eb3dfdf96a5cf74db4f81295d3f6c",
+    "public": "02623a9c2b896fd8fb803992518862310ff2c5406c9ced7129e3db123cabdcb8fb",
+    "signature": "f539666bf63d1bff626af3f46d7075f223e72b43210fbcda6e4246d713b13108756dfeb7e4085bbf201baba3c2103c96a209445f7aea187c4994dea3a9d2e17f00"
+  },
+  {
+    "msg": "4fa29976bdeca39cdfcf4db96bf45b6c6b5e5a15b3c188ea7176d3f418f39d51",
+    "public": "034ff218bf704d7429c5193daaaaddadb6f1750837ca2c6c91a4c3d55fb21470e7",
+    "signature": "e41e02a928dcf470ef82467d4f82ad1054b3aeb478c703bc320097ad4cc6c1de4ae58dc297a3cce8b2ee7a292591e2469a1f3e138d7bb6c41fbfdf6a41bd8f8001"
+  },
+  {
+    "msg": "4ced4df2ef23a8b1826b28264d13de5808e48c60b0530642c6d4048801a75134",
+    "public": "03cbbda178c8df2840316e913cb2f8ef088e97c613343bd6cc4f8a5e6fb6c291cd",
+    "signature": "ed2c4e662b397259d1f4b8cacfefd663d69cceed1b42e5da589e9d130595a43e7343325e6b2bbd976c4f34d74e0624239167ffbb9ae3ced83c4c4ec7c203a32401"
+  },
+  {
+    "msg": "9c3437dd44a0df0ac7465740723eb8f35ca6203e560debfb8f195aba563e7e1e",
+    "public": "03253928f9484105b0652364165416fa9a5486f07cd1ba95233aa60cc087b3bdcd",
+    "signature": "ab78d6efa9cf6cac1dd99dcec9c76b6b48b51bbd1c8b9fa7549b60b550d9ee0e1de99f3437f1ba440b9861399fdb862a463cb762403053f5c9dd28dc966e4adf01"
+  },
+  {
+    "msg": "745525a42229775504361c878f44251d54e72fb65ff47d2d7f1eee3968f9f4a9",
+    "public": "0297171e016a5ede6b3393748a6f68f10b38fcaf4a85d547b4a089925528a0200b",
+    "signature": "69d2880009c1e98f9274c5b6e820291cb9d7d1e23d0b60cf846ffe298759e37702bfa506863316c332270403d2b7e46282379bc9093890004f8637ee54bff58300"
+  },
+  {
+    "msg": "a4ab6cf2aeb5e6541e915f24432b3d50c56be51f19ee56044b4a6892e1c19f7f",
+    "public": "02b9fd033daba6f286f66b9acb80b8c147de8b1fdbd25a8cb382fd5a85ab15182c",
+    "signature": "1f99bd3048e56900b19b28a9968bc7038fb69555ccd585c41d37c41b7cd90b240f6e743d5cc6d5f3ef3f8d37a3d409c699c9f4f760bea574bcb2af7b0af2e0bb01"
+  },
+  {
+    "msg": "738469509823c190072194bc6f9cd2f33805896d6917e6579b79eabc1c21f7d4",
+    "public": "02e91e4371a7489a21ae304184d0d054051baf11515be7d2c17af9efce261b235a",
+    "signature": "4c8234057e3d510179cea17dfcf120e1111192008b3e54304c97406552cf086a55b73a896ceef4ebdbd62b77c6b7b04affcdba537c98badcedddc186648999e301"
+  },
+  {
+    "msg": "c300aa5fb20aeb5596d3566ea834953cf183864968e3abf3bdbab814a7b2c8a9",
+    "public": "0223963e1f63eea649f1f353f83a76d1c04283a54a437718e006147b06c800dc82",
+    "signature": "727dec3fecdfa335e4960b2d4e34c09e8d44250c89bf37d558842273d7e5304d2c04af0b18f197dbff298c4c140beb5bd34a6ac0849c63ec7b9bc7f8cf3b767301"
+  },
+  {
+    "msg": "16e53ba6d754baa5aa5062211f299bb7a75c111361b96a429c0a07d75b68bfcc",
+    "public": "03446506ac0f5fc1cf53575935f12a5206edaeb37ba1e7d8cfd03a7e82c73e8012",
+    "signature": "f746494dab76acee6f8129921c1f0a4e84a95abef258462a236a69addbdd1dd765019b69a83bb3f9ddebeb93335ffedcb15dd9d7ad21c5becc087bd90ee259bf00"
+  },
+  {
+    "msg": "bc18bea21e2891b93ec98a0ed318e2b14360cf4b46294ff4cec272b411645b0b",
+    "public": "03bdbafee84f686c03f0035bc188804a53615487a0bf1c3319b82d9be05639a5e5",
+    "signature": "b6f1e22b1e1b0e243cb79f248d28db9d33dfa3a03c2e979b1f47780bba769d7246b253cf66025a3b1f8ae1deafcc99e60ddf9d3a99fed46434d775cd80ca3ca001"
+  },
+  {
+    "msg": "c339fef3e89a271229482bee60c34678f4cd39447159716a2172668bab0b6243",
+    "public": "0398bb95c5f55d5515fd401d2652b1afe872adcaa015613bcbc8188c80dbb3f2a6",
+    "signature": "d2cd7d2e692be077ee6a74a6308c34e94b2070451047644377aa6003f89c138e6cdf177bc30273e74b69de5e0f585b1d8dea3d88df44287249236685ed3980ab00"
+  },
+  {
+    "msg": "a47efec21a497c7901db94abb40e05bed3e62c6b051b4c1f5fc67fe56baa5810",
+    "public": "03c502add2d2d771b74156a4d168d1b56178b5325eba22e7e227913161eee98e6b",
+    "signature": "15372a39c3d8e9181ed583a9ad0535d11e7f8b6a965e09b03be91a8ba46662f106c5f84c7a7eb84b466698f00a7f8100e80f96345763b202bc401bae85a83c0d00"
+  },
+  {
+    "msg": "94833030239a0e64ab35a391ad05a42d7b28b22b7572594dbd8e3bc4cdbe930c",
+    "public": "03842965449136edcf38bd46a11a409fa45748479f6059de428ecd7ee449d59a1b",
+    "signature": "fa71c897519debe5f5f4084cb1288566b99e527188b440e5c5bb51db49280fc26e9c76d5b8d5be2cc766391e08ccb8dfa0e4e916bddc904a453799ef38f7a23b00"
+  },
+  {
+    "msg": "a05c4bbfa8845783a15c2690dfbcca9e03f0e3aa044126351ca78e6385cf46fe",
+    "public": "03441b1e30551ec2a5b5508d09b117b50f7b937eaf7f95edc2bee6144260a15a50",
+    "signature": "eeb5036392639c038ec38f4751386a6f4271805badf2170b02fac188a53957183f5ac281584068dd535e7ad2b5b2eba4e03c57d38950f6830e0d9296b1cb87cd00"
+  },
+  {
+    "msg": "f08c11d380837cad3d72b22a464559267e1261b9d3ab9488d87ba5347d3d2b9c",
+    "public": "03ae84d572ae6f36c6a3f1cdc629f5f91ce0ef478c9e19c0f96267c32ab88d6141",
+    "signature": "7a1b4c7a3fe09b127086bce0f41e5995a83534198624836b395c7dbef1c5b2ff1ad4c0e999b3243455a3637d25a1222504945889f126be37ce5fe37e917a508a00"
+  },
+  {
+    "msg": "7d41ad3cd3f270483ff066769cc3fd687e29ce4802cff89dc3c4fb2167375d6b",
+    "public": "0261074a43044b4cf5009ea56c4d2d55b2a4c1e58883755546f03ec356d23042de",
+    "signature": "5cf77ca9a3c071e41e66ec01630d5ff6fe21851a33c916d5a038dad02f5f456206493da5edd0d2e68e181bd6032ed13c6166b36581f1bbf4c6faa03c6281859501"
+  },
+  {
+    "msg": "164c895907451a070d7b96463be7d5d656b7d4e7a3dcbab60c61c4fd44f3680f",
+    "public": "02efe37cbc78550d5da1746c567dfc1f25698d05e3b5973ca8aa5c80a5aa04dd86",
+    "signature": "bb768a43b3c725211b48271c2c057c068be7ab0ab91e6811e555a9cc7609cfef4b353c22c3de5784757e735e6d6af5f8a5aa152404f76af089c831d98890b8b700"
+  },
+  {
+    "msg": "e18462a1eac0891c359bc8a5eb8b17cda65fba96a8b2bd9c67a95eab8e703586",
+    "public": "039f439e6e37a6ec6ffcffa694a0cc5ad5225ca5aaa0598081646782f44e6b0cc0",
+    "signature": "bab5bf26af49ef94b8071ad2092510fa5b480ca7396520da2e5b21fb622656234ad6d15472dbb7b5df4a3e8884b3c9177f4546aaf4a52add02885cc9bb22c68b00"
+  },
+  {
+    "msg": "7f00101af3cb669314371cdbf64e4fc7df938d8a15420997900a8f277c40a075",
+    "public": "033884a47014b9592152d2855c0026ee85f96f5e672eda3093598bcdb103815b5e",
+    "signature": "d18c022a0d2aa444529ec85058ff177a30c74be3e0784345d97d702142e2decb1bfa9b328a5917cf38a958ca7e6e97b195babcd15d45a22281f50ebd9ff738a900"
+  },
+  {
+    "msg": "a1d380fe9121aa80316f774e4d1d009f8918127c65a62e2723d8d41c9e9f4952",
+    "public": "02e9004374af450c60fd6c2be52f230b9451e38476ab82752a1d8fd6089af0e5f8",
+    "signature": "c2d551cda73f2f85306ce6ab5f62887fcf09a65c2793d5eb0f8843750ab6212911a55504844520f8183cffc29ad0ca8027d5f2793a5921edf5b0c261ae06735601"
+  },
+  {
+    "msg": "fce9c71cdf019ff3576191ac1dccf95a7b45907cd850413df60aa5875242680c",
+    "public": "023109d150cf515759983a54f59da9d20d8bc5c2bfaab5ccb2658449f9bf24d1a6",
+    "signature": "78568b8230691ab4e6b43a28b3aa95cbd4a368d82f9fc11fd17050092ad9f3db5e8d9b6b0057f76d1f91679936a0bba94edaaec9ae2749ab4910bf1ec533f2e100"
+  },
+  {
+    "msg": "52edf7e0aaf718bb1d4791cfcf1a6e3867ffe35016b78816be8e1cce3652376f",
+    "public": "02adbc5454569f0af4c5fa0c1bcc6b411c600d06265498702dd250a4b7ea51a0c1",
+    "signature": "295182a6931a3961d11ddddc7061046288768ea6669994fada6a8add08ea83de6dc610cad3ef29573b5a25d71b44707bc58b290a40c23df4d58b525a0324aef300"
+  },
+  {
+    "msg": "679af3abb13c4dea52e18202d7d1bef32922197a64a0d57e5ebaa71b33e85b15",
+    "public": "028fbf6b72bfa9723e019f0fbe99eec6baa73f9e3f83928ef72d094a126bad40e1",
+    "signature": "83ee54bd037ce225b8e5ebe7fb40c0289d3ee6dfc6c898d6102e7496cdf4dbae7e4d839a11e8b77e8d0859d6c57b8fa312957948be990dd69110744e4d5d84f901"
+  },
+  {
+    "msg": "cf47123f40d553e05cc4583fb3aea115d001b64bcdc51b6d414e23e4f0f1e174",
+    "public": "0228130059b895889dec3a6ae4a3e28a2bfa3fa907b32436cfcbfc7cacd62db729",
+    "signature": "1eb5e9b43bd48edc9cb878fe980c68615eff3ede4704907e76268b403c770ef60b1f0efbfd5eb2797d294b7348d678d353fa332a859be8c9db8f7b8acea9a18c00"
+  },
+  {
+    "msg": "1960f75f57e258682ebd79f105046e2bd46ff9fcacb8e22e9912034fef7c827d",
+    "public": "03e0bc5a7ab830686ad70f1163ba8fe78f303c47b7bbea383c2ca425b2862b653c",
+    "signature": "bfe67188d0947885bb5adf38be9d2350dc80433f82aad285b0cfe89ef8b4a3d26d7a7d758a73d7602da22722e1c0d2ee4cff40e4231adb6420ca473ddf8df29b00"
+  },
+  {
+    "msg": "926e804c36ada479d8ebaff00f966fcd4d1cc043b0ae0f107737f86a92d5f81e",
+    "public": "0390de70c32f27ef20ec94f07c580fac5d47b0d422a07c346a5e635b0473e588b2",
+    "signature": "b6adf78048d20e1eadb9709d069d106576d4b3c34b16e67d9638182303f73a7a0afa5e95633ac83d29c528f705944b6f3180fd96654aeb42e263281e57feb68900"
+  },
+  {
+    "msg": "3e450081494f59d063fb04e5e8f49a0f0f6edada3efae4dbe97c966167b75e10",
+    "public": "036b34461a70809d475eadbec9be7a015bdbdc18d2a4d0a3b805fe036b7e195521",
+    "signature": "1c7632ffc765c162560e9424b172f83fe3e8b0f63158bbe6b3fc767634f409200616bdd26bf3b0f9152875ba52ff0246be2d160acdbd01cd3bdff1bc2618080101"
+  },
+  {
+    "msg": "d93fce08e59fa8f1dbfb09c79226cdfee8c1f1b461a168074452477ff8e03e5e",
+    "public": "0289a06d50ee94e23086a20c1a06d30d0b75f92850fdbad79dbe9b87ad4d1a9548",
+    "signature": "6e8bdb887b54cc16186a3c3a82ec20e42e88505b561270c6b9b5acf672b73b1466319db312712c8eacfeac568e97aca8c5dc6a776df4cb1423c7f695bb8e29f300"
+  },
+  {
+    "msg": "ddd1f5c6be1e2116bdeeb1440ddf654cd4dab727c3ddce7a91733be7d1c3a6c4",
+    "public": "025f53e9d681ad31f5372e21e1084daa464e9fbed1a75d1717008ec5c3fe5c6ce9",
+    "signature": "aba9aad274bebae8d376a1fe3c65e80ddd5ef36e1539c69c04ed5c3d91757a471be76b11e1a066a8a146039d15491d1698483e4e6a055659503deae716e00e2401"
+  },
+  {
+    "msg": "19f0ce1f203d1f9eb946efa1e2f1cd64b2baa25a2350d5fba56e6304ccd678dc",
+    "public": "03218a7e8f36fad9d767a76fa210f4b96fb01e242659e9018c5375bbd11ecee3cf",
+    "signature": "a15108353a10377f5ef6da5cc6f9b0153b0fd39b55971e58c51d130dbf19979204180bbc1aef2172131e353cd14f2d036c7ee178d31d42252065062cbd2e10d700"
+  },
+  {
+    "msg": "22436e4853d30fd3aefefef4b98d67740fe2253325c29cc685efea5df0b9baee",
+    "public": "037af1932918cff245304b903b1b90865546e28c9b2c5e8029ea2df02cfe43deb8",
+    "signature": "7bfccd2afadb224dfff4fb70fa7804d68dab72abe6a3b9f1eb732830cf8702d035eababb6f8a146b37bd19c6948c991d1dfd703964bbe77dee3a6713741ef4c901"
+  },
+  {
+    "msg": "4fd33dd117315b01607a833e7c01a3c27f535f5a8e2c7934879255581cd5cbbc",
+    "public": "036b87f3e1b60398153016574802d98c6f184988135dc089e5b9fb0bc6dcb2cc82",
+    "signature": "2afb7af9ba44c9b1a654f998e3e29232f8b094ad9afc753daea8bb131c5af3e6146b0acc91f5872fa5e8d2e0ea0e1b8a39d76cac9eab0a4a0d41fc833dc83eaa01"
+  },
+  {
+    "msg": "7d485e9430416ca249f244327f62dda7abc163a6e6c0d20e6d9a74572399faf6",
+    "public": "03fa7e3904278ce777e81dd254b76ab2a108992c656561b8a43a2eece48c928046",
+    "signature": "874c889a41afaea6ef3784d02dbedf6d0f0c4130e003c6bd2981d4572ac84f0c5819dcac16daae8dd01232f0c68bf5a06700bd99f15f7a48d678a7dec0c8b1f800"
+  },
+  {
+    "msg": "bfac57e436c155db299144a8fcd216b5d694db3a1160fa3a6ae574d9389609f4",
+    "public": "0378b2c943f20677467941624cd63355103b11147a2d70e486832191126b348e6c",
+    "signature": "ef4ae9a5bd14b8d236b88163f42e11ea49d828008fb79212deb7d1568b1ad11d6075fa382e5b61318966781e4865449b81652be1e6240a587b96e96b5291880200"
+  },
+  {
+    "msg": "69c9bb3ae6974d1cafc56dbe04b1879dbdd17934afa59f5936d7af30073e70bd",
+    "public": "038a762606924c83031303f5f0ccce531583213ae04dc0f44d6bba06541aa1092b",
+    "signature": "771e724bc76a3f8d99758a5f9f24a3677ee8730b3c3dfda5deed03e9e37b7e2f706cbce8d279ab4266ecc432a2aab0219675d4eee5d3ca929158a1ac26d18b9601"
+  },
+  {
+    "msg": "c52225b22b8d542d8e6616f325b5c96041919bdde2ac447f9fe957570317ea3a",
+    "public": "03a20c2bccac5ac49668312b2da0145ed1eb92b1de2090c667e0c0d8cbbfbb6fa9",
+    "signature": "434febbc358c48cef3a4efbf1212242af07cd0939a5e810d9e65c464bf363d8d5ab67b179e067ccbd554253e9ffab425a84071f555ca76ca60cb8d65a098b1ca01"
+  },
+  {
+    "msg": "96b9ce54d0e85e7cc355c1bd727d45561d99ecaa1cb697ef2a1421ec764484cb",
+    "public": "03525d84aaf798c74909a17992003193166c07fb15585fd0d3b1b536b1b4a69d78",
+    "signature": "2f29105f779cbb92685dbdae22fca4728476c7d1c2061f3e64ee2357863a3634236b435de0e64684d5b291197ba02558818a0182cc3bb65311c49b538e736c6a01"
+  },
+  {
+    "msg": "6b5688fe036c8eb9428c42710454a3d1cdb32932fd2855ff8fccf1df33d510b7",
+    "public": "02833f9a790408bad18b5b02e1a2abc299d4e43412dba2d508e6d4dabdcd4af4b3",
+    "signature": "e6a14a348e88b5b88a5bfef99ff875bcb4e3c319f3a3e6d88fd62673e662d3f729b2be101723a507332f40827a296ee3c4b2efdf82c3d0fed1bd7f71fffca92301"
+  },
+  {
+    "msg": "5ad229445332b1b32883fa32362150241981378ed172f20de15ffbb4f61ce282",
+    "public": "02157cd2f9c5e10005694b8275321c96faf4fca2ccbb0d4899d1b9e0a2004948f8",
+    "signature": "852147d6bfc915734ce5045968b2b1f6f65ed68de9314be249fc3e9844dd2ace635e13fe5f7f850331b3394700315893cf241b2fb78734aa4a13257e4779fa4b00"
+  },
+  {
+    "msg": "d49f7799263d64165e501fa14556f130e45e9326ff7d5653ff97f78a341f3d7a",
+    "public": "036982b1c5a6976385fec62cd00277bacbe0c77640b0e950248d5eea71d3b155be",
+    "signature": "c85c84c700cf2e45deffb02710fffac594a3b33dd415e5e7de9725389b5e3d5f73dc40bc110154c813c195f83c55fa33096687ceff7e8554f4a2c188c659510500"
+  },
+  {
+    "msg": "3c5004b47789981a1da3db2140495fe19feaebbf3c826c9e9de3a2fe28ba0bc9",
+    "public": "03fc56103d4a480e78d0005888fa2ef7157d77498e3b9020792c87cc5b3def9de3",
+    "signature": "44f788b5b664d7d99f4cc2d0e6e6332514d1c91f20cedc1cf994973a1d8301555c551376d14eed7c171142f70a22b0b566bf64fc4458e0ebdde7dedf321c171c00"
+  },
+  {
+    "msg": "41bfe75c9172ff886b548d382994fe8aeae45aebd91f5e592baa2f421aa2096a",
+    "public": "03ad8c5fcf627e52b8bae873d1e3a0b519fcd339ce8e865843341b7482d3c87821",
+    "signature": "3fe4b20488103d94a1bbc8a58ced5142663dab8a1dd6db893a8a06353b3393834cf60178a7baf6f7204b827ab7d91858303f5646c5c9cce6de102e32ecb155ba00"
+  },
+  {
+    "msg": "89f50c90468973e4682535cdeda35c04de67a71df0309159774a1c4dd84b19b7",
+    "public": "027820e600dc174ac71e319fe0828183154a34c27c5ffc79fcf20acff1260af002",
+    "signature": "50b7543501bdcc9c93ba897c24f7af1fb815e46edba7e6be7be8a5170faf421f18ce5bcb9d707adef7522250b80c529b0166da10fa2872a153766889772a35fd01"
+  },
+  {
+    "msg": "4b09ada99a7a75b2aab3a3a42f67662d804dbb8b66aa3fd4700a8f7979c8b1c2",
+    "public": "026b481fa0bb6e8ba10e9111a5197038166f0a6f8fa8a61bd0e46b1eced4be799f",
+    "signature": "08a0324c0b7d6d311339e2a46e923f4902644d801edf99ada14bed497d595da46b2027680cb3e6dfdf790ae82d0d6ca9a4d7fe760476ce092fb5a7ea9e1c5c7d00"
+  },
+  {
+    "msg": "dc773edbd2177cb77b64a1a942ded630a2c1712bbb48b8a10349a5bed8d22807",
+    "public": "03f4d032cd68079b44e775d56703565224e5a94e277ca4055557a8f09ee14ec428",
+    "signature": "51894016718e4b8a279cb00a451f10853a1e74a10448922be297d6eb5050fee4680d6df8ebed164f5797a6ab2547e61683bd4f0c104ae2dbcce8028400ebc3f900"
+  },
+  {
+    "msg": "c6293b9694947257744622fd5425294933fd3512fc0574b75ad4da96b0b3a525",
+    "public": "0347fa429023909fbac3c32b67ee2b705ea7106ed9ae0bbfe2e35781146f6ab351",
+    "signature": "eaace7d9a0536f410fc8ed0ee59b620c99bddec0aee5b55fceebad3a839f76300bde708b0bba9a0fa663ac49043786b7c6d328536b0f8cd9bc732ed0819fe46801"
+  },
+  {
+    "msg": "5e98afdf4a518d715bad40dfd751f09c36ef762445be9cbd4c26799033837778",
+    "public": "030b18940240b7a9d06fd73c2ce2611de315126c2b2f5c8b93be2d5bdc02fe0e3c",
+    "signature": "374f1731b2f86452a6a88e2f7842bd18b6f8e2ba32ca168a85429e845f583c3e4ca70eac76b87974c10c61f22980b7806aa5e3321cc030c5b4a7e54dbc8e908501"
+  },
+  {
+    "msg": "94d239a1f39d9f62d248bdbf7de0ac05884a1ce2c6b119435127301f15c70136",
+    "public": "03d879c5a58bc2619b31143c5502a07ade0a73680761956d15bd4b456c80574957",
+    "signature": "88246dd3ebea2cfe956c7750fc9897520915a69d9c0a7bfc2eb991fbf8cc84b814de2e2118ff4909e344f9592d78663fbfbb9b7527a4a40669e9d6f099b7eb5200"
+  },
+  {
+    "msg": "c770ef59fffea0e9cc4acdc4d943e08c73d0700aac3e4087b825da7b0eb6f1de",
+    "public": "02b9f6fa9dc7c39b378a4d31f5d01f7b93c7397d45bc67b56e4c2616b264c7d144",
+    "signature": "f6f49ac0bc5b75f4f3f11ba325fd4841e6cc90cc2781054e56ce1467eff8082a47879e2275404720bba1bb337fcf07c14b14c41f9092800e87e373f91268215701"
+  },
+  {
+    "msg": "76dc6d34d093dfe1b1c1bbe794dc405d761f27127cdeaa3ef0e6aa829a81dec1",
+    "public": "03932e4c20eca4320a26d60eb3682b733067bb9842913c2e8dff11c7992e939199",
+    "signature": "0805d0eb47424994b76487edd5e01800176e573fc9906b27b0c671deb60edd092060aa7be791cc422b03c7e88d9e9425e68e1b183d224ce1fb944aff82c017e800"
+  },
+  {
+    "msg": "9dc93362931f5fb6195662d3277b4c92b1a2842eaab1d24c22fb138feadb74a3",
+    "public": "02f58a86c599be85e6a7b4103f4d2ef6f01b44bfda7493677d3201e92795e7641e",
+    "signature": "32a4e6c9683b3d45e05f18485bcf0c2047b26ea756c0b6a290021cfaf13f50a953d9427b89d19f21c6083fcf17a1962a12ed4fb4298561d820400786f5b727f901"
+  },
+  {
+    "msg": "c7db05cdf5af763077f13fe2e714a409896a7e4351120abb42dc0250a6e99d1d",
+    "public": "021419d903b1da308722df3553550c796ff0b79112820a422933490bac424ff432",
+    "signature": "7915b2de75d1bba17a81ac468ca4c41ff2668374a83ee25da216aff6db2f280c6c2e3c68e1943dbbcae24d5db15248685d2f16a27b2a9ec3255fedda6e11655701"
+  },
+  {
+    "msg": "93d39132bb5263f071ad4521eabb5839bb017e1bcd7b9ea55fbae7c79147f8e4",
+    "public": "0323a990aad046a4df424fc18b77e79a8ec75edc212a6b78624a9ae5aed8c79f29",
+    "signature": "1b36a13885734933ec6a34670b2a7ed413819ce8f2f16a718ba5794474f3dee56b8cca0962e3fdd71bfa0c6cf98bb47c55d5943d4935d5c7c4f429e98f2afe5e00"
+  },
+  {
+    "msg": "9ec2939da635d26604c9a677319456dc5dbd15558353255764279e5247ecb61b",
+    "public": "02ced242803f47a86555de266465899ff7ba279ad567109deef0675513f8367b9a",
+    "signature": "b2d9f9470bfcb03636d149790fbb9072135aea1d43478085e0aa78eafefe391d13650a4043a9fc98958553203e4b0ac8630fea75419a1573b1001bccf01b558401"
+  },
+  {
+    "msg": "025884d79596bb826a6f96346ff461aae6d48fb391ae0b59444a5708bfdb2518",
+    "public": "03eaab98b4e5791560dcb8b4de021fd7c89a92f5191395524d1737d46e3a6a7072",
+    "signature": "76f5af50171eb4c533d08aa027b17e1a6f0c9190f1595d5ed88263ad278b5c48103963250caafaa627eb0035fb6249357c6061ba63c9747bfb626c460a5460f200"
+  },
+  {
+    "msg": "c3e64dd0487f7d4ce65cd4b0bc5aeafdf8f9008fd29441a4aea50bb7a7f417fb",
+    "public": "0397a4c2176af8f993e3e46707db836704775f528a26c337721e7f56f43781ecc0",
+    "signature": "080ed37b79d046d487e905e9dbad2a7b5d471c8be0493a90459a9d54c3c1f3d77d7de97b55fde42374d2bd7237a8d69671b144335d71f6b318eaf464f1f4e11100"
+  },
+  {
+    "msg": "0ccf0788cdcb12810d0b1454f7c4c2bb0184eabe9a2cfe2531c6000053d49f06",
+    "public": "02a0cf8aa724756fa8522ff369b3fe96644d42f10a02e9f7c75aac6a416fbf689c",
+    "signature": "857ebc4c2a2e7be151e0d3f6dfa49b1c3f86cb0e6b74e3ac3420059f2f3c26313942c04819b6e5731ea7037ce9010933f3c73bebbcc13385ca6a7cca0e12b5c001"
+  },
+  {
+    "msg": "4c860154022eddb3883324f2d51d93b7ab741c4dd25b9c3bef799db0ae5344db",
+    "public": "03e6cb13eea9391f87e962399deb6445429aa5b8082edadb46041498f5b50afff0",
+    "signature": "88744628f0a48cd12de3d2d75085ec753c6790ad61eb1a1dcac1daeaa7f50efe568b8aeede479a12081a6e38e1b208ecda08ce81b0b5685f8f5254b6dcbd8f7a00"
+  },
+  {
+    "msg": "0113e04b61c67c5671e12c50a62b495685bfadb86c40b2c693cf4538de12e896",
+    "public": "023ae3efd821937e856110201ba21bc625499e37ac27041be02952d09190625ba1",
+    "signature": "5bbc2eb1e91a41f4b6dc6561667757169aecd36199ea349da6d0b5acc4d1ecaa77e5bcfaf2fd59f2338021528f9ec4efc76ee36fc6cb9ab3ae62d7f645f7a85000"
+  },
+  {
+    "msg": "b2a9f64d2d5fb589605efde5ddf5d92df6ebf5d734aaae43c160979f08ee9a54",
+    "public": "026146398a533cb1e4e05b74190202e6850f7a5dda9367d613755f34329a7d17c0",
+    "signature": "95218bc7c360753c59dae7ffb27ceb3e2639193412a8e2aa20d3f395c93473165ef48df73b0ab42921c8a7b350ee14af68da829faac9947cf9466e829eb9675401"
+  },
+  {
+    "msg": "5c2a3b4b726e51c3cef5e21419ab5dc056ca662ba0806cf9581491044eb13a4c",
+    "public": "02aa5ddba756ff435714c80d1a2a3f36b734a922c5d21978f6ac4c87955981a539",
+    "signature": "9eac9d57909bd07636f0a6d64361c2d277f588cee9741a4e221790535682044c1d2380844a98b37165eb1dd0fcdd691059a540a9be5b7de5beeb5a841f347cb600"
+  },
+  {
+    "msg": "0befb28775b8b678e1bed23cb3d6df6a696ef4b019915429ed9a84914beb45e5",
+    "public": "0267daf13e1a8f9a9be56351e5a370edf441bdf44ceeb07ee2fd89c5186f35730c",
+    "signature": "e2b46c68cf4f17f60976e6bc21906c6a8431503a45dbbf2819f0764363c69d3923ac379a3d1508aa8993507ec2d26de125c671aaebc787f64cf5c43352c5e4a801"
+  },
+  {
+    "msg": "ae5f4184a9d51956bfde709c0d5bfe0285dcddf75dfed7dbdabe37cb2c7c5dc4",
+    "public": "0275b2b37d6a8e02d2a383c01b3fc48300fc79fd6c4bfe5b1ceba73206a9c9f559",
+    "signature": "0c2e9e5126b7af7acbdbd88e34f446dd6a0e616aeecc6d1d79a0093a53f1c0c10fc309b368e745bb6dc589c508e28f3d0f3115a954d9c85ff422ba8d60b225bd00"
+  },
+  {
+    "msg": "d6dc458027dc5b0ac41464eb6cc3afddd04d60db7130829451c0b2980b08d5e8",
+    "public": "020a7c721a860ed02fae18746acbeee4b9509b23cffe0bb63ff655e78b6e74946c",
+    "signature": "f952c51906c56367d7f1fb7525300333ec056af52a5e84f52cba27025a6a23420707a32b622a323299128e26d15e5c50e55996c2fd9c5b22e106d9483cfcd1de00"
+  },
+  {
+    "msg": "04f12387e22c2dc381f32acf0b8313b327229af93ec59b4900eebf7739cc25f7",
+    "public": "022790ab589470a57dd2ad49d1aff25835d19cccbc5b7e636a51225cbb46a3353e",
+    "signature": "6b8d3980eae61a814d22adf2bca71b33c83f8532f506b0073e16cf7cfe8afd7e4c00d84f114388129605d4871de5370d60eb83f6c9050e9ef8334749999e504001"
+  },
+  {
+    "msg": "dcfc5cb615b41c0d66579dc6a4197fe66edeba028755948c354a826f7fc6620d",
+    "public": "03536a1d56ebf0dad8e7ec223adcdeac47acaa84dc660ad10f9325a65e34411a58",
+    "signature": "f185d2320b7b9ccaff26d971dc695115e956ec1629f207dbd7bd90fe5875fffd61adaec5700c7d725da91da671e995dced8d3dbd67d78a8981b8a515f862a8e101"
+  },
+  {
+    "msg": "a5db20dbaa5184cdd2e3017314df7f44481ca3cc991cb4fded693e7c8234c182",
+    "public": "03ac82fdcb9fc2b0a3d9428b4e789ac9da7f55d2ddcc50e7899f3d3ce115b42d3e",
+    "signature": "ec502b6cc06351eb1b66387b94c6996afe75a4d1fe24a6f1c3f1d89fac928df83fad94e5fbbe643b28fb444d582bde42880df6bc6ddd40db276f7388bb6b18f301"
+  },
+  {
+    "msg": "933848e70c2cbcacaab64661417a67f8f46f6ad4effbe38da473e2721ddcf8be",
+    "public": "02b86afe1bcb784e96016bb462873bf64c6459a25f3bed71e837c2d9fe7c7b2da9",
+    "signature": "356b5824c70847dc44e139582109cce7ebc0348e9e255f2e3edc27375b7a613f41f616fed2a7acbd3b123e64986857fb51dd3958acbd57f484f3333d247db18b00"
+  },
+  {
+    "msg": "c45524b8c421184b77c74f563f14a0a3238b9033271193084c47c1a5ae675cbf",
+    "public": "022ca9d5c56918eb4055e67e2fa8e9cc69bde096c5aa1bb0c8107805d86a866c03",
+    "signature": "61fcfc1a6459640df7e5219c652d17b2ba8bbe28eae8cc53b94724b0aadfeee3752e501ffd98c0618a2daf53a682b27f1f8d1ec827bf9a39655323a1e0f68c3501"
+  },
+  {
+    "msg": "ee709aaadec038c6ea52c564c160e2e2b55818ebbf478b63f5ca5a95b8745527",
+    "public": "03638856e9889eec9cc92557c1281cf7ad47afdfaf9c47b5d6816332fe061e5000",
+    "signature": "1730d3af72ab31f1e1becfa2811194c6ff1c7345583fb64d8357b9bc4ff9745f6aa310cc5ecdf951a6f58000ab9c65a32fdf6c0cf4a2c45d53831f80371b435101"
+  },
+  {
+    "msg": "286b2f3b2ac538a66d16a860d8a2ab3ee25c75da8f3b0ca68ab75285946ffd6b",
+    "public": "0285c87814cb6458a2859baea328d3a32e83b1800fb5bed8e47f8a5be9afb7f177",
+    "signature": "889dba688dc1bc8ca810093efaf2a87d997029bdce3b4a4b0cefb21464ad83282ab1d9a08af713bb65273e5daa6000829ed4ad8f8845a8af689161c49476d94f00"
+  },
+  {
+    "msg": "3386de44ae7abe91bf4ec476051d0f3d55b97c1c8d4d8b7a92d53935874e96de",
+    "public": "02b8fd730a823da73efebe11a7054ec0afe90e1ec00739e55648e486e95a894c39",
+    "signature": "14cad8e1eec609f64f43058a21a4b4a80017dc155d379fe8845344279481b0a46f9c9a1f7c122bdfdf321cf77d0b2df9a516f832e00891cd10c5cc263457012301"
+  },
+  {
+    "msg": "07e587cfc7fd5cd3342cdfa4d6774753372773582e990d2ecb077304f5adcec1",
+    "public": "03f556c5f8f8365b3f6f84c95e353695dc9e55d2a121d09c9669119f314aef170f",
+    "signature": "adb0d6e32ad324c19b2087a8ba5db60504d2b9162f1287cbc2109cbc6720fa6513de578eacf8441a7d6254b144ea47d077c4fad4077395ec31ce5a950e0509fe00"
+  },
+  {
+    "msg": "853a1f6d070021b7c85ce4460500b5d44ee38610249a2e0e1901acb390fe4ccb",
+    "public": "0389a36a6bfcd54af9e519fe4d3e7831835bd819af17546fdcf63a011c5c98b902",
+    "signature": "d190ac27ba07414f970f6307dc70bfd62d35a3c275048ed61e87dc0042631d294fe6d7d6e5d767a20b7862270c1fd1bbb4e92c844135517771efe72d7b5ee71100"
+  },
+  {
+    "msg": "1407379ad990df947fa6f68937d64edaf3a54ece6f3b38cbe01ca7234bc4304a",
+    "public": "03c5c8c88a198092929e78f11d486f48468c4b00c7cd968a6027db91473f3390ae",
+    "signature": "fb8b664702bdd29be4d6523505bea7da45d2e486a45e8cf54333c2b90682e59331090cd4639fcb2dafcc15b3da4d0bc3daee36b1635ab942f3fe3646753cf30000"
+  },
+  {
+    "msg": "c9683e514178398b2b2d2e42eeb007bdab290e978ee4d2dc436f5c45767fb272",
+    "public": "03d136db028b07a40d4d94d1b9679d22b60276016104f0be6fb439e3ce27d7ee45",
+    "signature": "6f6e4b846fc946b0089e24f27979889b47b6f83443f26464a16f5d1e9d816c0b329b4c29b9ec7c2e192a52c3188ff9c66885bb9bf3c54d8160699972e9842e3b01"
+  },
+  {
+    "msg": "1d849c1c2530a799af707957ed2b271939d4765d412880fa96473fdeb7cd2ad9",
+    "public": "0212b62cb9288d72aed1076b84e30a5b4625c2f01cbc2529fbfc6771859adc2910",
+    "signature": "11e22cb59dca2b574415094b0f042db9cbe4b6a2c54c9f693bd2b0b601fc9bc31f66b30ff63fe8496026cd4f039dd90b07db6aeb182f77d749ca39271ef1555900"
+  },
+  {
+    "msg": "9ab54651db79bb295e682764c4ecb923c2e237db451ed176ef0af7bbb21de1ba",
+    "public": "026c8e922f52cbe0b6ed9c92b5b5ddb6b65d194d035eb6d8a9778ea37fa4603f98",
+    "signature": "c5532f626356c235b94f7a1e0d2075ccb0b38300e24a9a56c7b6548b7cbbf9103e00846c0f3c3b8da0773a0ee6261e1432cfc72f30e9696ad5260bfc975e857901"
+  },
+  {
+    "msg": "bc02dc328a6a279122370599e8cfc2a8e01a9e453ddffb84b9408cbdf82c5f6f",
+    "public": "03a01795f2a337723d699ea1959affafb3c00169f5f76993a52fd2f3ddfdfb859d",
+    "signature": "065a0a24b7fad521ed6cbb8c6540904a6683c21e73e6216fa44b031dbc6b29d4069f6c02562ca547a1bcf3b75320b6eb944041113952d46979cb7d2e5a958da901"
+  },
+  {
+    "msg": "032a86fdd8a9a73d979f0433722f831ece0235d538bc08aef1e8a48705332402",
+    "public": "03a48a22cc332106f20207320693114fc1bd50cfeb6687c4ed5ae277bf3fab3351",
+    "signature": "a6c9dfae8d57c1d451fb48844e6e86775f6cc207b197a59369e988368d8e7c2151677e22bef5cbca142717b524a2d2f088cb366825597ad60992d7fc13953ac200"
+  },
+  {
+    "msg": "c4aba052904d82d06baa56ccac0c8d4560d91cc0fe390967d09f21ab19a825ff",
+    "public": "02686b0eb9c3a8c05220bd3833d1098e4403c40d9c44cda29f38338bcb0a6732ad",
+    "signature": "a7725043d2988330501e5bed3d278f325ab8e78333e697116f0c0ee626b6cb5264d8e58002b97ad0e7a50d64ff451db028dd7aade0b913fdcd415f33952f470900"
+  },
+  {
+    "msg": "de1f1838f64215becdcf6abe9848c065e43f36adbcb71fd942b7f7b7d4a83637",
+    "public": "03c2f8a402a81df49a9032e098424e256e6ac7d0aa2c30624edfeef779ffcb2ad9",
+    "signature": "cd8ec780d703262b2f08726082adce5670e3064b8918c9b7bfae2cd1de47689b641d4bff92924b2b01f3785a4ba2d130d199ece4e05268ba30788b6278708e0d00"
+  },
+  {
+    "msg": "b041cd62f589989af4a9ba2710898544f3b891d8a2831efee4710f1cd2e12f4d",
+    "public": "03724e0e6593a43c5778f71f02481eabcca8c2bd7259966df427d57e76fe9611df",
+    "signature": "de7d1314b8cf60e0e4f6953fdf06a1d0cf8b788c263694baf7fe3893341f3b86094ebfc4e26fe68b21fc884676e0d9886a5ba2e260911f78f0b9fa156e49a57200"
+  },
+  {
+    "msg": "1b7db2d3218ff8ab06e747aff00fb6b064ca2470fb72ee8048361038a75a5a22",
+    "public": "0337274e38041176819a3d3d9974b45b37e95131f0cf2e89db6693e3ffbf6f2239",
+    "signature": "511b00146f3f71c41cd777afe582c9a3f959123b36b11fc69f056e11e73355c1520de8723a532d887d0b02ef6846ca93084f82c74688a30285d64a43bba473a401"
+  },
+  {
+    "msg": "93f51b4f331b338c9248e43edc6695331a011d7f22213096c77d092ddd8aa379",
+    "public": "03aaa31287bf17fe5c55b8c3528a8f4debf154ee8972af92f1e357d28bb93a8a67",
+    "signature": "70ce706cc6047df9d2dc1758380b1670a879eea8a72379a4147a5dc2edb425aa3b34684a14f54115e36e9270ecce6ad44a2594a8c5aec09c2d68da83e815c28b00"
+  },
+  {
+    "msg": "31e42d26d74bbc7915678bceb4c8afac84b199d1db8894f660db59fdb1b84295",
+    "public": "037ca7676a70308c461509d0e02f81afc1708a2e0e6d8b6bd7d23f418c772dd167",
+    "signature": "54527fd21a1970764027b2a063a4a6f6067a073d0ff4b185a550e6c59f4eb29c2acca45978cabab73cb63516a4615e2508bba9cc3c55daeb5e17b4c2b2b7e7ee00"
+  },
+  {
+    "msg": "15dbd0da6716b1eec5b4b64d453967e6badaf94da86204e6283a832524ccf185",
+    "public": "03a055f06f9a0ab65f96a95128cdc2d835029583e1a107309e3572a7b1dcd57a7e",
+    "signature": "d388f75f368c787e293d23a9e02467e3610dfbf39e7bbeea3aa21ed269c6622b69b173ed0e9b09aca5179e6f215a3ed138b46a85ff4b7b7c1ba42d58eec87f6f00"
+  },
+  {
+    "msg": "ad7fc731d2f6f4ec93a44ba84be8219e5ebb89b8f125b201d7476b67e20156a0",
+    "public": "022b3ba1e116bfa297f880dfd1460f1942a2adc51f428a24d47fc8f13e6389a3b0",
+    "signature": "655c90c009643d0152878d21c0fe616196962cd80a89c92cda83ec02047e4ed4310aefb52eb9e99526d1523a3f106e19a5a731c24b003eead8ce9b8b91c5ed7600"
+  },
+  {
+    "msg": "9d9f11bafb363386b0f5a5931d9b2602f0132bfe12867030009d142a75f1780c",
+    "public": "03fdace9a987f2b7b03c82eab9d70585fc4df126e81274b0523b87021508cafa98",
+    "signature": "f234fd76b9648bee6831b3fc770aed902b199460cc80688605a51a9546d19058570935a6ca24ee0b80bba9cb10590fbf3e3033e387bd910629f21cacb579c1ac01"
+  },
+  {
+    "msg": "638509b6e3bc6c23f7e5dda3c0402d1f15e544ef71c233d7062ebfbd064e02e7",
+    "public": "038f9d6a94a697bce2786366a735858a9144b7415e11a7980592e0c79f0533fb8a",
+    "signature": "b6175f8032bf4e0aedba3d459f4779aee92c6cdb5808b70db1b7367ad5a6b6c137bffc4c977cc8a5e744e11ea68bc4a310b97d5f41b44fea4bf808285987d03100"
+  },
+  {
+    "msg": "a6a0069c8e12bf403d51c38a1118aac395bd9979a1a33b4daf84c5ba7482b970",
+    "public": "02fa879a673f860f28ef8431031639fa43772c3374c714be1b5f0dddb7dc0e93d9",
+    "signature": "391c80b0949b3df3ffc350225bbaf34bf92239dcc998efa8a810d17af6c3e18e5ae4b85160be6cd9bd0554d0d2349309747bbd55b901a5cb786c609b24a9be1a01"
+  },
+  {
+    "msg": "d3ded209637fa67fe6490ac2028488d3aa88d82fb6f538809a3544386e9339e9",
+    "public": "0226d232a4730d0ddd40cd12b0a5079999371b913a9f73f4d08ff92db600237ae2",
+    "signature": "ba59f24c5c696a1e88461befaef5b10f66c3aeae09bb24ec14b4508097668dff274b14d445c37dfe84fe52d19a05977b1c76c0341ff99933db2086cf9904b0a400"
+  },
+  {
+    "msg": "c1a69018668ec96c191e8cd3a0be8fe312938935edf9f07908c33d656c2b5496",
+    "public": "025e978f74992d9434d2b5d89b1f3729a4f974f00c869f82b2902afce67705d37c",
+    "signature": "fcc376c1ac54bfdf3523a1fe4be0cc2b3bbffaab1268881da4594c4c0aaa86370d903c0914259738efec172b19fd15da509a0028bc292c0f2c89af78bef11f1600"
+  },
+  {
+    "msg": "71a733853f250f18e12719ce54896768979dc3b8c5fc8797c9a8e0946f051943",
+    "public": "02afc1ad2a570ba37ef881f8661f2da86a3e60d9315aaf0b5a7d968deebdd209bd",
+    "signature": "42c4da5534204fd7989f1212e129aca62db4430fb55bcaf1d7ab0e3fc913fa9600ea8193dffdacd100141e3ca962d2364362581482448222801e1a4998ced1fb00"
+  },
+  {
+    "msg": "44dabd4f167123937d08a182a35dad7e74de17d8e1716bf15777b46b017eb6c4",
+    "public": "03a89b1525844d2f6f6a092591ebfeeba51c0f8127e676f3f8f2aff1d90efeeddb",
+    "signature": "a026bdbe7a209135e4fbb5d353304aef4ff7fe45413deb493186af31ca2fb0893098952cde4edd960bfd26d8b8ed7ba94ea5c5bc65088804c2b9b84f2be06d4200"
+  },
+  {
+    "msg": "640cb6fb7defd56c7bf8d4dc44de2d6e7837aa93f79ed1de7088301a4447ba19",
+    "public": "03b611f1a304682fccfd3ab2248fe10ae97c897b701b78ac9c066468fb2bd4493f",
+    "signature": "7c90909e29537ce8fc6d099a00093c7365ec1400739887224c503787de5350fe430ea3b7d80c82254f26cc40aaa03f713aab337ffd1aeba0b78e9454f92ed69e00"
+  },
+  {
+    "msg": "9554d3a89a1aa24cbefa13cbbe7bcb57e2b6bb668f99a2734a0539f778a6399c",
+    "public": "03fcb16f66edfc668e2a47447a35fed46d25ee3e54f2a67a774d974101abd6a03c",
+    "signature": "838f0d8621afb2ead38ed49306b43ec6219f32d5292dbc61b338d56663df02fe228e396e35ba9935729f38c16940894a1e34cc6dd21f639594ed8ae7ea9c1cbd00"
+  },
+  {
+    "msg": "7830c6494e4d78e40f3b921f65a09d2d473f4f3925dfdc59386c1f53f80a70ce",
+    "public": "032b86992498c182b23848cb78d963fa164261890a2609e27764251d7989d2be20",
+    "signature": "daae45a67ab6a49b2bea152045bc2f00d7af5f4dd39520a4ec7b3d1d20da353666f4fdb79dfd0db62472a5057192719cf3eb6f3883e33d349b6c85b33c8683b101"
+  },
+  {
+    "msg": "ead59e94a77a16366f9c2f1a6b6d13e128933df61dd358c494d66ff7ff15b2bc",
+    "public": "036667429c2e3474ae8bd90b703931e033dc74e71e4e7063ce487cf5ec150bbc4c",
+    "signature": "c92e4fa64b93c4b9c8dca5512c85ad4f86fd129fc961c58580e23c2e81b50b512211a729775ed4d4eb2c2d563436435c01ce49002175b84c93edfef356b84fdd01"
+  },
+  {
+    "msg": "4887e01f47e15782c1cd1854e6f9d35a4b7058208e8ba28d1eb3a1a7f0a48534",
+    "public": "02736c00acf2a700aeb019f50686ba33872b5da1c6bf2c0971e7271861d7a26a76",
+    "signature": "afc1dcb43fc30e365f2086aed106485b8e8b0a8f8b950229799416dcb56004856d10b7a2b81d7e117408ea18a287e95dccedac6222447f831f198d51a78f1e2d01"
+  },
+  {
+    "msg": "4139cdeb3da2e569059e32083f4dc334e9d8f57123bae99a42f9ed72469db2ac",
+    "public": "0253e98979b0aaa096bfd2c356513b1a319582379c75c6b959a1dcd1bcb5dbc35b",
+    "signature": "57abe21cd5fb48a1958ad6d343a2da588b01c896a7d8b8e57218180eab1b504c30e28ed102bfeb90f2323d1322c694f1ab0553ba02cb5eb34624805a02436d1e01"
+  },
+  {
+    "msg": "cfcbc6fc3e89c4b872f5d974965c468d04e8aee52ee5da9e4a43439e143efc4d",
+    "public": "02ff53bdf008de96d46f770d8d3b55d2ae3b4f407118181234ac6f464dd0a0c11f",
+    "signature": "8096e006b8c7ec91a5a8b1c395cb825a5aa7ba22c3bddbe4ccb7a822a239bb7b48d41db6b5eac534a7b955d64fca936d359eb6ecd3de75326d6c8390a9d9907200"
+  },
+  {
+    "msg": "70eaa7e052ab72438cbd1d214512d6f3f7f61670ff01db555fb7abe2811aaa3b",
+    "public": "0221f5c9e5da0357b8f97cbd56fb5f3ef973d76f145fc8d9eff78233df88200dd0",
+    "signature": "3fd1029a3c2c2fe299c4f6546870d03f76745a9d4af56e8bc6ba0ffe405702795a95dd0cde69801deefc721f4069ed106b1b5967768590d825b22c97f510550b01"
+  },
+  {
+    "msg": "29f97816f151119fdd90f9120eefecd34d2388ec8ba781861072720c52a0d17e",
+    "public": "03f552f0c96387cdbd390123aba84ab06ed01a327b983b8d2eff5a193bbc95da71",
+    "signature": "65674a756f23ae12282e5274cbfa57214c9157ef9552095e7794f09dbe377ccb0854efa0c0ab4e9f8a6196d349927f06119dfde257099c5082568b9fb76c1bf401"
+  },
+  {
+    "msg": "dd1a7bbe7b0be2891e1fe87d05d275cbc95ccd6b078f11ab167ca578221112c3",
+    "public": "036e369722ac3a6530024e955f165963ba755672f4c252768b3d930ad99dca28a5",
+    "signature": "d5b2536dd7dfb43d03e056d67a52989078d6835bbcf465527bf202769f1a58071c03643803b72c95b40f1541b60bcf6a91c22b2bb53482389b23691c0019b8ea00"
+  },
+  {
+    "msg": "edaaff3ac83e27c336e2e6149ef23c78c79582688c97c3665fc695af9fd81615",
+    "public": "02a5599c94a1458275e351bd8abc305e02d71e49fa5b076157ac3444dc9b27f40a",
+    "signature": "e2f3726f2799d8adb519c6917e46ddef5df9ba2314d6ac01d7d193fa099325877663f27184c7148a3e551304694b0cca8ac17427c48e8546e0b9a3a6b109943e01"
+  },
+  {
+    "msg": "5d074e3a702bfdf6633415fb6b64029cc4b6869b36134dafce4e3a7beb2c03ca",
+    "public": "02695a27576a29680d55fb975fc85109ebf1c6ea90cca7baa92cc5fbffa41ae8ed",
+    "signature": "932fcfbbbd8f3393780199a8bdffc11c0aa6623ae12ba934e698a2e5a9543a926dc7d7c1a16dade3ce303ed64e5f771b8d2c3e05f61620b8971173c0ab1d09ae00"
+  },
+  {
+    "msg": "c9a49945fed5087166d2dd110b1212230112be21a68442717209f6300c97e6a9",
+    "public": "02262ce2f806941fc69d31854954cc3e07d483cd57e67696e7a8ef1c3a547d77e7",
+    "signature": "6c586e57098b2b0b2ba9a83cb84771ea8a8ef2656a4df84e2363d019c0417da62c4273d89944a5b438f5f916663bf2cda854c6dfe94ae1d1cb5b868c4e847f0600"
+  },
+  {
+    "msg": "cc2a09e8b0944d5cf91725d8d5a3b87c968dfa3d0c5d3f22b0f77dd110bf9890",
+    "public": "036b05a4b49d3cbd8ba9301c3a4e0351fc19dbcedf37de190e6e54ffac9af1c9c0",
+    "signature": "371c064f1801b48e4d739ef3348ef086a4524e15c1605a99478e942f747058647f15e1d49aead9d3f345424f0a07ccd4d36628127782e2fa27b3333ce97e06da01"
+  },
+  {
+    "msg": "a1cfea85fda469414130156b7fb2f6efa8686bcb836d002c529ab8249842f41a",
+    "public": "03044976c1829ca459f5d400ddd6d6c756a12cbb9d1a00c9a2dc59a587d9c62b31",
+    "signature": "bc17fe41a937e9b2fcd1595f3962f4077c7a72a343f4f86fe335b8cc6a6db3ba473c32e9328ff81f08fc8c79e342f04196ef5e57fb6959de5e61137d649dea2201"
+  },
+  {
+    "msg": "d2991d9cde6be3718a2401ca13b17348c992e02672ea18a5203b948b4730e902",
+    "public": "0285c681ecfb3a07e50ffd807eaf1e84b3c780a279705ec57bcefab7562b953e92",
+    "signature": "a71d46c77a339ca3a1f3292edc292473f92a7fed07dc9e58413f3cfe63cc8d7f1c73b826c2be69076b3bfdebcb6bbde07f462d7d30f710afe38a8b62a781e69501"
+  },
+  {
+    "msg": "b07cc9c52fc2aee15cdd38fc5ae1cc3ae62c1fc8f104bdb06e88898e819a9db4",
+    "public": "0297a73d8b2c36895ecdb1989fb3d1b24eafecda6bf20e40d7a05ef6f97a11c1f8",
+    "signature": "4a34e31972f3a6fb8afbf32d893f9c3fb08c97e0aae2c1577bc9aa905ee7714722d3eede66eb55eb104a54650220953d94102e35480daf92d372816e31285b6d00"
+  },
+  {
+    "msg": "c926456121e620bafe4ca8de0837a50f2c0f1e365b71233bcbda870f24f78e91",
+    "public": "034c71da194d2abf16f1422bbbeb3b4103839e352aaf6aecb591eb57e8860b2b24",
+    "signature": "5d13b729f521b259c73535cce9ba7d013c6ad16b36d8dceddcca46751f02e6465d805a0762d5c4dd9d9cf56c89dbb88b82bf588fd6795114bcaa5b0208b6c5db00"
+  },
+  {
+    "msg": "cd6e8424d5a18e1974f09a584596e565399897edb345f8d56888225bd1f4f90b",
+    "public": "039f1dbfbfc119896a45a2864b451633785875d445c6a8d34fd94c7c743669b557",
+    "signature": "5895ed11c6f3688c8f5e7ad341af46e6b6dbe7de54618e02fc6d41c507eaedb02874b578c594427f1f826e50187ad0fb896f8348a2c2c3c7def1e8fe855d9c8c01"
+  },
+  {
+    "msg": "1b099a065ed5448c599a09966d804b7451a08a6a7f66ac0608f66fc958465604",
+    "public": "024f6464a3caad876d300c3a733441e0c9ec104d1503afa15d8c6b3d1b96c3b411",
+    "signature": "73b662a2c80ca75f54ca4dab84aebcdd8dd77131bd02be947a3e936b54bd263d1e4a53baedafd3e25c0a7902b0434aeb534625801dadfefb9b84cfa32d7b705601"
+  },
+  {
+    "msg": "5df9c4996c1f4db5972d75d963c08106cb1620cd51b6756734655764dfc49722",
+    "public": "03b6514ae0c0d7eaf2bd968573b375d751fc5aa5937cccefb9a81e47831549a7bb",
+    "signature": "4919015c4fef75648b24e870c9a05fdc2ea4835ffb846cca397694279b56a4e85b338a63b66cfada1cd8a9f4a43a7302c7ace1bb53c211b83e5e7f5849949d2100"
+  },
+  {
+    "msg": "c2a252397d9fad25d7eaa173fdd3b185620c3601263e19b2974f75d32d77c566",
+    "public": "03c84f9de9480fdeaa0ec28070b825e96a31a81206e4ea3e8db4b9881b03f1f477",
+    "signature": "1a85ce67a516c89a35e85e32e23d2229a026fab3f2a470a2b14420d9b969302f34485feae37a5d11a4ca28946fd469515a2f742ac5c0e55ba6890689c250c78200"
+  },
+  {
+    "msg": "aaba181ebf3d4e020710378d3a0525e9e90a858a6680a59777017dc4360a61d3",
+    "public": "0354f4be049e42e0a244ad3f0be1d406f0a53d6300f59f9a96272ab7ee27a950b9",
+    "signature": "1e56f54882d54cbd975c4ed963dbc717d6ae5fd0a5adc690fe85243ca69c6d6506a53a3b547497e335a20f835f54089977ba34d5360eca2eada2a818d5e7744800"
+  },
+  {
+    "msg": "74e7cd4dc90a51f3e7a24036f455eac8fac3a0ac122e5ec89e724d3d2a24c6e4",
+    "public": "022d2d32b9e2440b8c1775d0d61208942002a3839282f5c50fafd34ab47512406d",
+    "signature": "5f39d0a4edd6a4153fef5d6a718494862a14283ad7c5700260ccc86273f5af7537bd3a920b86356b0db81bf11daeb4592b1e878b30cd93576396657adca8adb101"
+  },
+  {
+    "msg": "e4203fed0e7eeccca4c7c0db5ab8c054c6b6562ae431dd027bb42f0bde51a8a8",
+    "public": "02fd3f9da44e91850f37264552966d28112b7f4ee58242d4a1dc7a694249aa36c2",
+    "signature": "bad8d91a1bb9fcf46c08a0441ec7de319a175a117d737a983bbd40ff159335c551ed0fdf5ca2db8727bec73b09113e319da4590105e1be1158a19bacc93e3b9400"
+  },
+  {
+    "msg": "7ebb53b846dee758813ddfaa80d1b352e8a5a404b4b99f3cc71611f18d1c9d17",
+    "public": "024363bba43a2ba7e524a58393f00e5dc59dc1aebdc1d03b4dc3e79b13b5478ae3",
+    "signature": "fdb3564389ae66755530055dca9c7c00ebcec3c20ed7562e09d81692cd244ea04e76fe615d9f677e1da81178e360136e67be49802589c3d8fbf2d3572e0e663401"
+  },
+  {
+    "msg": "0c5900e8335f0aa1ef3c50fad6f5d15fdf154188fe05428b1b36b0a564c3160b",
+    "public": "03742c266730be91b922933c2fb016292223c540999559f8ae744eb668d8cef93f",
+    "signature": "a577717ce057a1643e7cbd5d4262df5325475c541d44793690820a59dae775b750a610ab0a2a45e0cec3e17010ffb2e612ee1c055d15c8d2bb904ee284276a2401"
+  },
+  {
+    "msg": "cfa5c2bed201258ea8bec3f63caa83349fa9707b26223584d87b383e1a6b011b",
+    "public": "039fd9b76dddd5fce9ab07aaabc1a44d75f488e3df3328125fefb387230fcdca5c",
+    "signature": "948d6e20f634774e77d1fe5ccdcecfd46fc3290084f9528d1ed3c9155d9f9155274d2d93a17f4b3d6324eb0d97d36c9cd461182a3ac61147f3381203c72ee04700"
+  },
+  {
+    "msg": "9ad75cfe7e400ade47f8c608bb8f87b1fd3adf0fcb2bf93b9bc71d3e2f4c2ebc",
+    "public": "02a437757a6cd3f86aedf0eebde30247ada9f49c2006a101af919b37c871c2ca79",
+    "signature": "32ba9cf2b53cc809cd9d07a5b34660afb95550d9c1bcb8b08e0023fbe26fb573787458b92f2022e4e403a5c0d1ea0061cf595efa0666ffe4c1c2e446d09c592d00"
+  },
+  {
+    "msg": "79b20edf913b547f23f91ea6365bb1cba64757e6586a44efeac139f863a4e882",
+    "public": "021386b7c193235bab9c6d3abddc7a303d32f18a77e8c21ff54056b2ec035d8ae3",
+    "signature": "db22ca7125252deaf6505747bfe8f029699e978b83c0c4576f59a119ae681318407f3abb83b4955db429d8cce8fe7785c42507da0338fa98f07e2cc64c43713001"
+  },
+  {
+    "msg": "7fe4e9277997144b95cf3170c263fb2f995dde699f0f8267339e007cd38dd35b",
+    "public": "02dcc22860f9faf3a05ef478f9f79aab337cd2bdeb9ca726b5554960b7a587f781",
+    "signature": "c88a4da89205c15e56fc1929ffa4bd415756d013e6d20f22fdebf61fa8a3e6283b89311964bcf1777b2ec6f64caf3afe34b718ed0a375e7bdf3b58496505aee401"
+  },
+  {
+    "msg": "1b6da9500d3387cb95b0bfa612414e7ea7cea45dc4664f4965b94636a1e5133f",
+    "public": "030b06ad28c89798cb8910f4b5938ad4a14b0b1576e8c7381c8bbc09f45d5dfea5",
+    "signature": "13f72cf3428cbe4971b84718079948f3862042a04229809a3f1bad0ffbf542652db40fe879f354d3412c76631a7fce4d8c8c0f73b5f5fad4e0e7c6af33a03cd500"
+  },
+  {
+    "msg": "a427043ccb244f6a5d618a81fbc797cf380918ea2b50211a20a8b13804cc57b6",
+    "public": "0212961fd2d031323f6f100bd45777b393666676b6b8763f99b52d6aef4563a5f5",
+    "signature": "b9e9a08c2ca913f091c0257edacb524c17fe99fb8620d56aad2526db5436615a0c25b6e6f151f96e68d4a3a896415caef08a686b6ae6b9983d60627a872f1de500"
+  },
+  {
+    "msg": "aa3fd54da89092eb3661e293b62d0d21533d5494b4ba190132033130f8de6927",
+    "public": "0271b5826c54df70df8accea20767c67a1e2cbf3b387e1b3f9d76071bbe1bf8824",
+    "signature": "cf4265f4dd8c2a59c8a0d98daece29b90757e23272e297c81c633e9f22465b186cdb062352411ba4d4736533605a7125b55f1258f8d8fa14516c0d4a7dff8fa601"
+  },
+  {
+    "msg": "f6f902a83438757b667cd2caff21f87ca916e5f7068dd7ecef781992f31d2980",
+    "public": "03831409e8b3c894bf4a8a3cf5461642751a77fda4aa34836acf72a01505debd87",
+    "signature": "b32b0e2fa5c1312ce6257bfe30e5a7d1ae7b2bfe28da65116abf51aed4d66d7d323ff1dce58d438f6f3dbe164178ab2f44f08e2c967e54f186d9d5662465e57101"
+  },
+  {
+    "msg": "d3fd3c44ee37d86a45d95a3ab85f85334432f2dc207d819692a15b6ca0103899",
+    "public": "03ec2cc840c200b0282e23c1bcb3e34c319d56b29593792e0d595ef370fe266240",
+    "signature": "5c9efc97ba2fac911b3e36a336a847ed53bbeda85eb5f44b84609aef16a1bca72593465905e377e7a0183ecb35a6258aac79514716e888c93fcd3868ba1fe64b01"
+  },
+  {
+    "msg": "afeb30e2f4ebc983903610df2e874ce013e033ba77d02b6c93e2d3ca4236b572",
+    "public": "023355ee3cf4d8cc677d7aa47afa2c4a16b10f7f9925b8af4c847014769115abd6",
+    "signature": "0148a3eb23c4374f4bbaf5ac747c34f8c8d7e2050e4d8d8175ea3ec4160912a25e64303645c8c7739512ab2b7ddc63c833d1bcb8ea0e958c2e5de633948d1bb600"
+  },
+  {
+    "msg": "08ef80a7e1877311aa0d6165f4a0d6add54307e92b2bf8116c17ee36747e70b0",
+    "public": "03eb0e806bdaf027c57e2f0ed9537daef0a2320e38ba9c6f401cbdc69ce477e8cc",
+    "signature": "a7f69995eef81cfe65277458246a9bd4f35215f5096f67b5fb0e4f47742c98bd053a4d3d9b54c6beb11941b77a04de740a9f66d1b3f6c1c0545a47ee0b0e83d500"
+  },
+  {
+    "msg": "c31de17e163cb83444a631525f5e96b4bcac4e8ed62884b8c0c5e916bf5149cc",
+    "public": "02736f27236545a60767f86440436106ff8f4f8ca13c0483623679bdae813f08f4",
+    "signature": "28955e49d5259d388e817335aa49dd86b91d4ce948b44bbea9e407dfa984ebd0023f4306835d7b08f7fa0473b264c83b8c82192a05ace5758c1fd56bb744b5f800"
+  },
+  {
+    "msg": "e413c3499458047a321e25198e88a9e92938232f4c21abe8b810b54ea2ccfeac",
+    "public": "02ea60309fa72ba7040a56ebb02cc20ff88a7b586daca1b1af5d1d9f0cb5278c58",
+    "signature": "bfedcdf4639f26244730a6022c464c7d57ffe08b1b42539c3d06aeea6358cbde5ab2a9750390732c441194d2a81e56d5e1bfd0e7ea077d749f576019186c2d2f00"
+  },
+  {
+    "msg": "d970fd9c7142128ffb1bab8db0d053a1a382c29b11c9554d8e9863b54a82f310",
+    "public": "030f7b15dd1b9e0c1c698821f9672fdb369485f94257b4ec4ebe982f7fd49b0441",
+    "signature": "54ef9d78d1fd3a1df95bee9fb5b8606c08be12db26d8d119388bf29a659d20362b968c5e4622871036d6446e06929ddede65d26181a3994e455e4242fec7f90000"
+  },
+  {
+    "msg": "8c608f2b20474c24ab9506ad40d193d7596b79ed37fe71a94a15e2313f808a45",
+    "public": "03332c8a79698042e961a8d896a092186eb1da519d7816fa707d0ec215b7d628f5",
+    "signature": "af46e873dbaafcd798dd945d002e44b325d1f62fcb1e43709c86bb06415492154ba275cad180422552d718e6efb0b7cdc70294332f2168cf6a3a4439e17983ee00"
+  },
+  {
+    "msg": "6541cb0acf1d394a2c4de1d7651070003f56680d42f22c3ac9372862b4858637",
+    "public": "02773269d3c3160bc36c120508969d815d59648a92b11c76522cf4b391d70cb10e",
+    "signature": "70f57b1f35b8f9c3059f4892c774badfeeef7de98b622f1a90541fe85b273f363d2e9149aeb45ef4c6c561b27dc4a582284c9adbd497ed67dcab7731522c9b4d00"
+  },
+  {
+    "msg": "5157b4b9d2ea016981c24657332b0c6ab58bdd86bf4715a4ee4015a4c84be4a7",
+    "public": "02dcdd7b9c3ab33a2f38f0b072edf38a4d9d8c329b590f04bc6fee0e69317a0bdf",
+    "signature": "090fc815decb1703feceb0e4770b7dae4b966eb712c20409cd9ce0dfe78b9cb0015ece2b85aef0a5f7170016533ce29c525e6a9b62a4374f47e2e81d2000f41d01"
+  },
+  {
+    "msg": "3e38d8ef65935ff97c6f4bb8e1e26a2c83dfe54819f6a36013b6b2b390a28a37",
+    "public": "037af3e2f3315d6c2e19e2c3a78ecbce27d0d5bf651367421ee3e168ae728de75e",
+    "signature": "b14b95ed8833f3ef04d71c9e5bbef0e03d1b464015322ed9828528f014fa385931f23a017f6ecd201fe54b8f5b8dc2e907e226047296bca9207b25ff71a1225e01"
+  },
+  {
+    "msg": "262b95b3a45338fbf224aa641b28735bd714deda1637d2bad3cebf4b8f76afb1",
+    "public": "039f0236f9bcdbf1f6ff4d2f683efb0370c00a216e86fb1b27bebae2bf52449ef6",
+    "signature": "bb6a6c92c8aecd3ed8ec2936b78558f452ee2366f7152ba601f1e39fd8d4b12178c2b52e4aa7f7d98a8f7674e8564a8ca81a23a3320bd7f1b9f72be6f50b7d1300"
+  },
+  {
+    "msg": "d4e015addf1574b6afc6a42a37632fcab008e993506ef3313aba6bb7a976e056",
+    "public": "0204a85da62fecc3f902d84f920f6a1a71736df3c48d56e17ec43c71877a59cff8",
+    "signature": "4bf07f5c7e7228ca3a4a179e06590cf4eae89980d76a2d1b4f8859a870ca533b341df4b24fb991d993b6f26d5d62fe9071453690f6e25be6482ae1c8dc4c5c5200"
+  },
+  {
+    "msg": "c5e55894dcfae05f0a0caf0392a0307833cae1303936522fc60e80ff5a3bbbb9",
+    "public": "02185a34bba433a3691f27daf47b20a721c1c5c39fbf648417cbf4c4e8f0b1e38f",
+    "signature": "705d5d3570765b181434539cdc6d200c933b2f3fa786d879962f45ea71a8c1864e1d085e5b8c67e83253f064b2876928484e398922d2015ae78098d76af0698e00"
+  },
+  {
+    "msg": "b63d5ab659ea147e1bacde7a4595a8416822f9a32afda8305d7a0de28c80ae5a",
+    "public": "03bd1f84e3e9ef3db1447fd5f3d5dbf5a13049790bc94750e4c844e2cf618953b7",
+    "signature": "de0d6663be255ecd5ed52b2e21071833ba8455abe3667c3720aba72a0548d1c32a4bc7422758fd53492ccca1eb5acc0091f13af3f77ab9e29232350f4aa71a3700"
+  },
+  {
+    "msg": "dba2999a5578177f5b93468f404be90447b1633bd7626caaa1975e5cdb741e26",
+    "public": "0295934c21feb5c14635b3d0231b3def9a055eb459f4157103d0aca731ae79deca",
+    "signature": "5172095511225a04c7f27b29777f3908d3d9703481d56b703448776dc7bbae4f636ec4a62a84f3e8ee0b4e9021e71013b2827598fb8055003ac10f1bbb8a09c001"
+  },
+  {
+    "msg": "b767d4e5e8cb0b4a8db8d0730e89a8daafcb370316cea5b2ee201d11fde1bc92",
+    "public": "02812f641e155989a0479747194c849e6568b7ee22ff2cb3b5ce2ce6fb59832d92",
+    "signature": "8ab2c4c03eb2b56ec47519022e72128b12546c32794050aa57137d4507ea0d701cdab1b778a520304e51a2012a84d71a51adecf078c1f24f6bc13f36f31277fa01"
+  }
+]
diff --git a/rust/tw_keypair/tests/private_key_ffi_tests.rs b/rust/tw_keypair/tests/private_key_ffi_tests.rs
new file mode 100644
index 00000000000..8a03928ecfd
--- /dev/null
+++ b/rust/tw_keypair/tests/private_key_ffi_tests.rs
@@ -0,0 +1,249 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::hex;
+use tw_hash::sha2::sha256;
+use tw_hash::sha3::keccak256;
+use tw_hash::H256;
+use tw_keypair::ffi::privkey::{
+    tw_private_key_create_with_data, tw_private_key_get_public_key_by_type,
+    tw_private_key_is_valid, tw_private_key_sign,
+};
+use tw_keypair::ffi::pubkey::{tw_public_key_data, tw_public_key_delete, tw_public_key_verify};
+use tw_keypair::test_utils::tw_private_key_helper::TWPrivateKeyHelper;
+use tw_keypair::test_utils::tw_public_key_helper::TWPublicKeyHelper;
+use tw_keypair::tw::{Curve, PublicKeyType};
+use tw_memory::ffi::c_byte_array::CByteArray;
+
+fn test_sign(curve: Curve, secret: &str, msg: &str, expected_sign: &str) {
+    let tw_privkey = TWPrivateKeyHelper::with_hex(secret);
+    let msg = hex::decode(msg).unwrap();
+    let msg_raw = CByteArray::from(msg);
+    let actual = unsafe {
+        tw_private_key_sign(
+            tw_privkey.ptr(),
+            msg_raw.data(),
+            msg_raw.size(),
+            curve as u32,
+        )
+        .into_vec()
+    };
+    let expected = hex::decode(expected_sign).unwrap();
+    assert_eq!(actual, expected);
+}
+
+#[test]
+fn test_tw_private_key_create() {
+    let tw_privkey = TWPrivateKeyHelper::with_hex(
+        "ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a",
+    );
+    assert!(!tw_privkey.is_null());
+
+    // Invalid hex.
+    let tw_privkey = TWPrivateKeyHelper::with_bytes(*b"123");
+    assert!(tw_privkey.is_null());
+
+    // Zero private key.
+    let tw_privkey = TWPrivateKeyHelper::with_hex(
+        "0000000000000000000000000000000000000000000000000000000000000000",
+    );
+    assert!(tw_privkey.is_null());
+}
+
+#[test]
+fn test_tw_private_key_delete_null() {
+    unsafe { tw_private_key_create_with_data(std::ptr::null_mut(), 0) };
+}
+
+#[test]
+fn test_tw_private_key_sign_secp256k1() {
+    let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+    let msg = "1c8aff950685c2ed4bc3174f3472287b56d9517b9c948127319a09a7a36deac8";
+    let sign = "8720a46b5b3963790d94bcc61ad57ca02fd153584315bfa161ed3455e336ba624d68df010ed934b8792c5b6a57ba86c3da31d039f9612b44d1bf054132254de901";
+    test_sign(Curve::Secp256k1, secret, msg, sign);
+}
+
+#[test]
+fn test_tw_private_key_sign_ed25519() {
+    let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+    let msg = hex::encode(sha256(b"Hello"), false);
+    let sign = "42848abf2641a731e18b8a1fb80eff341a5acebdc56faeccdcbadb960aef775192842fccec344679446daa4d02d264259c8f9aa364164ebe0ebea218581e2e03";
+    test_sign(Curve::Ed25519, secret, &msg, sign);
+}
+
+#[test]
+fn test_tw_private_key_sign_ed25519_blake2b() {
+    let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+    let msg = hex::encode(sha256(b"Hello"), false);
+    let sign = "5c1473944cd0234ebc5a91b2966b9e707a33b936dadd149417a2e53b6b3fc97bef17b767b1690708c74d7b4c8fe48703fd44a6ef59d4cc5b9f88ba992db0a003";
+    test_sign(Curve::Ed25519Blake2bNano, secret, &msg, sign);
+}
+
+#[test]
+fn test_tw_private_key_sign_nist256p1() {
+    let secret = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+    let msg = hex::encode(keccak256(b"hello"), false);
+    let sign = "8859e63a0c0cc2fc7f788d7e78406157b288faa6f76f76d37c4cd1534e8d83c468f9fd6ca7dde378df594625dcde98559389569e039282275e3d87c26e36447401";
+    test_sign(Curve::Nist256p1, secret, &msg, sign);
+}
+
+#[test]
+fn test_tw_private_key_sign_curve25519_waves() {
+    let secret = "c45d1ba60a5d929d228d1b69a8f91bd256262498e81d32b6411d6dac9a60ed3b";
+    let msg = "e6167d";
+    let sign = "05db2483b8107187448e7f3d5581e48380a83338d53fe70c59e88b281b995216085518e5d331a2b698f2d0d387529dd94437157df88cb14be8d1925afbb6e80d";
+    test_sign(Curve::Curve25519Waves, secret, msg, sign);
+}
+
+#[test]
+fn test_tw_private_key_sign_ed25519_extended_cardano() {
+    let secret = "e8c8c5b2df13f3abed4e6b1609c808e08ff959d7e6fc3d849e3f2880550b574437aa559095324d78459b9bb2da069da32337e1cc5da78f48e1bd084670107f3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fa\
+        e0d152bb611cb9ff34e945e4ff627e6fba81da687a601a879759cd76530b5744424db69a75edd4780a5fbc05d1a3c84ac4166ff8e424808481dd8e77627ce5f5bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276";
+    let msg = hex::encode(sha256(b"Hello"), false);
+    let sign = "0a8c6e36f9afa324e9065d185cf5df2815c6b997b2e1627e8612ddba8097dcfc325ad6b2317cda2159407463cdd2706af97f299873e940f43f986951f8809108";
+    test_sign(Curve::Ed25519ExtendedCardano, secret, &msg, sign);
+}
+
+#[test]
+fn test_tw_private_key_sign_starkex() {
+    let secret = "0139fe4d6f02e666e86a6f58e65060f115cd3c185bd9e98bd829636931458f79";
+    let msg = "06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76";
+    let sign = "061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a";
+    test_sign(Curve::Starkex, secret, msg, sign);
+}
+
+#[test]
+fn test_tw_private_key_sign_invalid_hash() {
+    let tw_privkey = TWPrivateKeyHelper::with_hex(
+        "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+    );
+    let hash = hex::decode("0xf86a808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000808080").unwrap();
+    let hash_raw = CByteArray::from(hash);
+    let actual = unsafe {
+        tw_private_key_sign(
+            tw_privkey.ptr(),
+            hash_raw.data(),
+            hash_raw.size(),
+            Curve::Secp256k1 as u32,
+        )
+        .into_vec()
+    };
+    assert!(actual.is_empty());
+}
+
+#[test]
+fn test_tw_private_key_sign_null_hash() {
+    let tw_privkey = TWPrivateKeyHelper::with_hex(
+        "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+    );
+    let actual = unsafe {
+        tw_private_key_sign(
+            tw_privkey.ptr(),
+            std::ptr::null(),
+            0,
+            Curve::Secp256k1 as u32,
+        )
+        .into_vec()
+    };
+    assert!(actual.is_empty());
+}
+
+#[test]
+fn test_tw_private_key_get_public_key_by_type() {
+    #[track_caller]
+    fn test_get_public_key_data_hex(tw_privkey: &TWPrivateKeyHelper, ty: PublicKeyType) -> String {
+        let tw_pubkey =
+            unsafe { tw_private_key_get_public_key_by_type(tw_privkey.ptr(), ty as u32) };
+        assert!(!tw_pubkey.is_null());
+
+        let actual = unsafe { tw_public_key_data(tw_pubkey).into_vec() };
+        unsafe { tw_public_key_delete(tw_pubkey) };
+        hex::encode(actual, false)
+    }
+
+    let tw_privkey = TWPrivateKeyHelper::with_hex(
+        "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+    );
+    assert!(!tw_privkey.is_null());
+
+    // secp256k1 compressed
+    let actual = test_get_public_key_data_hex(&tw_privkey, PublicKeyType::Secp256k1);
+    assert_eq!(
+        actual,
+        "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1"
+    );
+
+    // secp256k1 uncompressed
+    let actual = test_get_public_key_data_hex(&tw_privkey, PublicKeyType::Secp256k1Extended);
+    assert_eq!(actual, "0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91");
+}
+
+#[test]
+fn test_tw_private_key_is_valid() {
+    fn is_valid(privkey_bytes: Vec<u8>) -> bool {
+        let privkey_raw = CByteArray::from(privkey_bytes);
+        unsafe {
+            tw_private_key_is_valid(
+                privkey_raw.data(),
+                privkey_raw.size(),
+                Curve::Secp256k1 as u32,
+            )
+        }
+    }
+
+    // Non-zero private key.
+    let privkey_bytes =
+        H256::from("0000000000000000000000000000000000000000000000000000000000000001");
+    assert!(is_valid(privkey_bytes.into_vec()));
+
+    // Cardano private key.
+    let privkey_bytes =
+        hex::decode("089b68e458861be0c44bf9f7967f05cc91e51ede86dc679448a3566990b7785bd48c330875b1e0d03caaed0e67cecc42075dce1c7a13b1c49240508848ac82f603391c68824881ae3fc23a56a1a75ada3b96382db502e37564e84a5413cfaf1290dbd508e5ec71afaea98da2df1533c22ef02a26bb87b31907d0b2738fb7785b38d53aa68fc01230784c9209b2b2a2faf28491b3b1f1d221e63e704bbd0403c4154425dfbb01a2c5c042da411703603f89af89e57faae2946e2a5c18b1c5ca0e").unwrap();
+    assert!(is_valid(privkey_bytes));
+
+    // Zero private key.
+    let privkey_bytes =
+        H256::from("0000000000000000000000000000000000000000000000000000000000000000");
+    assert!(!is_valid(privkey_bytes.into_vec()));
+}
+
+// `schnorr` generates unique signatures based on auxiliary random.
+#[test]
+fn test_tw_private_key_sign_schnorr() {
+    let secret = "0139fe4d6f02e666e86a6f58e65060f115cd3c185bd9e98bd829636931458f79";
+    let msg = "99b7098e8150cde90f3ec00280815d3069f81c7cdb6d83bbe2b897b1afbe7cd6";
+
+    let tw_privkey = TWPrivateKeyHelper::with_hex(secret);
+    let msg = hex::decode(msg).unwrap();
+    let msg_raw = CByteArray::from(msg);
+    let signature = unsafe {
+        tw_private_key_sign(
+            tw_privkey.ptr(),
+            msg_raw.data(),
+            msg_raw.size(),
+            Curve::Schnorr as u32,
+        )
+        .into_vec()
+    };
+
+    let signature_data = CByteArray::from(signature);
+
+    let tw_public_key = unsafe {
+        TWPublicKeyHelper::wrap(tw_private_key_get_public_key_by_type(
+            tw_privkey.ptr(),
+            PublicKeyType::Schnorr as u32,
+        ))
+    };
+
+    let is_valid = unsafe {
+        tw_public_key_verify(
+            tw_public_key.ptr(),
+            signature_data.data(),
+            signature_data.size(),
+            msg_raw.data(),
+            msg_raw.size(),
+        )
+    };
+    assert!(is_valid, "Error verifying a schnorr signature");
+}
diff --git a/rust/tw_keypair/tests/public_key_ffi_tests.rs b/rust/tw_keypair/tests/public_key_ffi_tests.rs
new file mode 100644
index 00000000000..9195ed66f5d
--- /dev/null
+++ b/rust/tw_keypair/tests/public_key_ffi_tests.rs
@@ -0,0 +1,122 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::hex;
+use tw_hash::sha2::sha256;
+use tw_hash::sha3::keccak256;
+use tw_keypair::ffi::pubkey::{tw_public_key_delete, tw_public_key_verify};
+use tw_keypair::test_utils::tw_public_key_helper::TWPublicKeyHelper;
+use tw_keypair::tw::PublicKeyType;
+use tw_memory::ffi::c_byte_array::CByteArray;
+
+fn test_verify(ty: PublicKeyType, public: &str, msg: &str, sign: &str) {
+    let tw_public = TWPublicKeyHelper::with_hex(public, ty);
+    assert!(!tw_public.is_null());
+
+    let signature_bytes = hex::decode(sign).unwrap();
+    let signature_raw = CByteArray::from(signature_bytes);
+    let msg = hex::decode(msg).unwrap();
+    let msg_raw = CByteArray::from(msg);
+
+    let valid = unsafe {
+        tw_public_key_verify(
+            tw_public.ptr(),
+            signature_raw.data(),
+            signature_raw.size(),
+            msg_raw.data(),
+            msg_raw.size(),
+        )
+    };
+    assert!(valid);
+}
+
+#[test]
+fn test_tw_public_key_create_by_type() {
+    let tw_public = TWPublicKeyHelper::with_hex(
+        "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992",
+        PublicKeyType::Secp256k1,
+    );
+    assert!(!tw_public.is_null());
+
+    // Compressed pubkey with '03' prefix.
+    let tw_public = TWPublicKeyHelper::with_hex(
+        "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1",
+        PublicKeyType::Secp256k1,
+    );
+    assert!(!tw_public.is_null());
+
+    let tw_public = TWPublicKeyHelper::with_hex(
+        "0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91",
+        PublicKeyType::Secp256k1Extended,
+    );
+    assert!(!tw_public.is_null());
+
+    // Pass an extended pubkey, but Secp256k1 type.
+    let tw_public = TWPublicKeyHelper::with_hex(
+        "0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91",
+        PublicKeyType::Secp256k1,
+    );
+    assert!(tw_public.is_null());
+
+    // Pass a compressed pubkey, but Secp256k1Extended type.
+    let tw_public = TWPublicKeyHelper::with_hex(
+        "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992",
+        PublicKeyType::Secp256k1Extended,
+    );
+    assert!(tw_public.is_null());
+}
+
+#[test]
+fn test_tw_public_key_delete_null() {
+    unsafe { tw_public_key_delete(std::ptr::null_mut()) };
+}
+
+#[test]
+fn test_tw_public_key_verify_secp256k1() {
+    let public = "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1";
+    let msg = hex::encode(keccak256(b"hello").as_slice(), false);
+    let sign = "8720a46b5b3963790d94bcc61ad57ca02fd153584315bfa161ed3455e336ba624d68df010ed934b8792c5b6a57ba86c3da31d039f9612b44d1bf054132254de901";
+    test_verify(PublicKeyType::Secp256k1, public, &msg, sign);
+}
+
+#[test]
+fn test_tw_public_key_verify_nist256p1() {
+    let public = "026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab";
+    let msg = hex::encode(keccak256(b"hello").as_slice(), false);
+    let sign = "8859e63a0c0cc2fc7f788d7e78406157b288faa6f76f76d37c4cd1534e8d83c468f9fd6ca7dde378df594625dcde98559389569e039282275e3d87c26e36447401";
+    test_verify(PublicKeyType::Nist256p1, public, &msg, sign);
+}
+
+#[test]
+fn test_tw_public_key_verify_ed25519() {
+    let public = "4870d56d074c50e891506d78faa4fb69ca039cc5f131eb491e166b975880e867";
+    let msg = hex::encode(sha256(b"Hello").as_slice(), false);
+    let sign = "42848abf2641a731e18b8a1fb80eff341a5acebdc56faeccdcbadb960aef775192842fccec344679446daa4d02d264259c8f9aa364164ebe0ebea218581e2e03";
+    test_verify(PublicKeyType::Ed25519, public, &msg, sign);
+}
+
+#[test]
+fn test_tw_public_key_verify_ed25519_blake2b() {
+    let public = "b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9";
+    let msg = hex::encode(sha256(b"Hello").as_slice(), false);
+    let sign = "5c1473944cd0234ebc5a91b2966b9e707a33b936dadd149417a2e53b6b3fc97bef17b767b1690708c74d7b4c8fe48703fd44a6ef59d4cc5b9f88ba992db0a003";
+    test_verify(PublicKeyType::Ed25519Blake2b, public, &msg, sign);
+}
+
+#[test]
+fn test_tw_public_key_verify_curve25519_waves() {
+    let public = "559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d";
+    let msg = "0402559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d00000000016372e852120000000005f5e1000000000005f5e10001570acc4110b78a6d38b34d879b5bba38806202ecf1732f8542000766616c6166656c";
+    let sign = "af7989256f496e103ce95096b3f52196dd9132e044905fe486da3b829b5e403bcba95ab7e650a4a33948c2d05cfca2dce4d4df747e26402974490fb4c49fbe8f";
+    test_verify(PublicKeyType::Curve25519Waves, public, msg, sign);
+}
+
+#[test]
+fn test_tw_public_key_verify_ed25519_extended_cardano() {
+    let public = "57fd54be7b38bb8952782c2f59aa276928a4dcbb66c8c62ce44f9d623ecd5a03bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4\
+    06465638ee0e1ca1a9f34d940a0c8c48bbaaa0db124107e4c1b12b872a67511fed7f28be986cbe06819165f2ee41b403678a098961013cf4a2f3e9ea61fb6c1a";
+    let msg = hex::encode(keccak256(b"hello").as_slice(), false);
+    let sign = "375df53b6a4931dcf41e062b1c64288ed4ff3307f862d5c1b1c71964ce3b14c99422d0fdfeb2807e9900a26d491d5e8a874c24f98eec141ed694d7a433a90f08";
+    test_verify(PublicKeyType::Ed25519ExtendedCardano, public, &msg, sign);
+}
diff --git a/rust/tw_keypair/tests/secp256k1_sign.json b/rust/tw_keypair/tests/secp256k1_sign.json
new file mode 100644
index 00000000000..42c29431309
--- /dev/null
+++ b/rust/tw_keypair/tests/secp256k1_sign.json
@@ -0,0 +1,502 @@
+[
+  {
+    "hash": "e47a0e9d0444a58e4aa423b92734280d9c754dbf05e488f69c496105236577ea",
+    "secret": "cc446e8442f76121d3fc366e0d0ab30920ad4d1f02010f2d715622ab261962a4",
+    "signature": "bc70bd3d2e8ffdb2dc6ca44e19696e505b3c4890d51963f5eb387b1d21b70d0605f22f354e81e9821c1ce5f6e26b88b3207b030ad455cd27079bea14b3fc7d8201"
+  },
+  {
+    "hash": "8b2f77ece11bab3cb3cd62c24a655af6399d87d3fd084e50c4d8aca31fe5e6c1",
+    "secret": "7057b3fa5dd6d46ffa291530630a14c79973efa3f3ae9b7393bfb40caf90887a",
+    "signature": "5305bc280335e1ac1de5814e7079810ad5f1ab6e26e9ca4aa1ff91454889ac495176bec4dc64967e90215a7e5b13adc2fee0c6914f27093ab3c27250d861101f01"
+  },
+  {
+    "hash": "1cbed9daf28b8baa54c91578cb81a7fc0149287ad78a392538a6ea34d382908f",
+    "secret": "36a45e08fae0b1bb715e2a187715343727359bee1a475f53f5f107d9b911f554",
+    "signature": "672a72b22ccb35129defdb671c2f3c11070e0c4fa912edfe2e30130640c3febe5ae9cacd0b44533a4492b3d56c276399f727fb4bd9c0f48cc91bb7cf464558f900"
+  },
+  {
+    "hash": "0a9f9273696da5bbbc45c169defaa5b67e1b907b0554400f28ff1134f2399f8b",
+    "secret": "b304f3a5467454e71141afb281565b1cbd45b56b719e77605b8cd9c28217eaf6",
+    "signature": "e62704eb552e0c188e15e1d67e2f4e707d3562ca72edd31a11967109923ed07c06f30297cf701e7a05e0873654274ce79aeb7de6355bf6577ca8d42f280c65d401"
+  },
+  {
+    "hash": "1e02ef222b0dad8126c3e67fb9e331953b2b7a838396eba93d7cb300dce250bd",
+    "secret": "d287cbca0ba0e5e595137c138e74cbe623173aab9b5d396307bdc396adab1ef8",
+    "signature": "34c7da02b40ad41c887581c4e0978d50fb9eabf9a7bb22d7cf3809de33f3ec737561f9965a315566fe0216b6b9a629af373c1ab897ab16bff0320550cddd3e1300"
+  },
+  {
+    "hash": "7016b6f5e3527de8353c8b7406683dd27e8afcfd7a132269d1bb1d3b6c2abece",
+    "secret": "20be2b599db8e62388a88e04eac527bf5b66924b1fc5ddee41bc76a2870115a9",
+    "signature": "2b2260a994488642b9c5c40630563b0f0adcbaccfeffe98e8bf4aeeac5c9722d15878d4df619bac21ce9bbecabcc185522bc4adbee5cdaa31e53a4e4c0a591ee00"
+  },
+  {
+    "hash": "ea2d778a76d19bfa4fef744485582291587e7c117c092055e0ec250b02a1dd82",
+    "secret": "2a8f9d590eee3785a12460029d16c7d324a1102e30af5183d77c70b3883354d9",
+    "signature": "9fdcd89858e8c376ec68c9099587370a6418beea052ea6562fe0ee7ee0532873620d0e3c6ab90ea0c0f675f11311e2ba509cd01d45ff4c775fc7197a85f35b2501"
+  },
+  {
+    "hash": "bf8a405154b95076dd08e0eae0e1cbde8addc8c03ee9685f8471b1d59b97c10e",
+    "secret": "50ef8cff6983498f713823b7c39b51ef75066badfca1ed6af1951ea5f3b0021a",
+    "signature": "11d811bac7a9a37dd84b1a5e5780775797c35f9b6f217d2d36bf2f28879441f60e304299405918a8e6ef9e7775557a2af30548e6af32b2561392d472bcba8a0e01"
+  },
+  {
+    "hash": "14a880275ab266a5ccad44c0a7330092beb2b6e355bb0800841abc7a22fec160",
+    "secret": "acfd831f61dac04c52edca91e62400764b58eea62876bd7491faa01be9955d18",
+    "signature": "dc9e5af5d74b7c09e0c2f8752296f5abe0103d7d77e48e769a3b75721dc8c41e109edb98d19ee4d635f1c56123f87ef4652d15fc9e1785c3955f286a5f599f0301"
+  },
+  {
+    "hash": "a2c9b0b7cdcf47e43bb1a0d55f29cc7bded2c20e3c278bb609315e771265b8d3",
+    "secret": "900a33439cc91e06f10ed016a9b77fb4a2bcb9c0b5f5d64e27f23b224326cb65",
+    "signature": "5acf06a23a4d7aa0efffb6d17f81aa3c95c2c4977cf44d72a962c98342e1bbb808f43a2a654dcbf64608537744c61ed2e910b07375df33867ea72d6e9f136e4800"
+  },
+  {
+    "hash": "6e00f7ac0f2ce58900b37a562313b526fcf35f0f2fe91b8b813876271a394231",
+    "secret": "67fb6806a97821affb20e960ba5dd57e9fe565cb419f92df85f03fcb6e353206",
+    "signature": "29ed122ff7f02cfdede11d3a5f817027f003bb94cde9b6a19361f3e4c49a150174614ed76ff575b909c835e7053776a35d593bd064373d8e2d682d1d1888cb0b00"
+  },
+  {
+    "hash": "63bcc7f35ec60b4660a4af4ac568ac7023c72b7b94cb69ea561bd0a51b533208",
+    "secret": "d5567b440186aadc79fb41bb9a5595a6d3e9ffd1b31de5f319a056c55c1a5180",
+    "signature": "0f8bf2b4f1c32829ea7b8ecdbc4b1d920c5ead58589f895445aa9db05a726096636b873e4f33327e19db035ef1037f2d7a46b325d72a961c34fe5bf49ef70d8401"
+  },
+  {
+    "hash": "b2bd1ed10c343ab83ac0183f3d03f87c4513e22337b07f31a69acd57614454b1",
+    "secret": "c6703284f87452cdd53e5224b4ff6afb8547f89f42e105c28d7aac35ddc0cfe3",
+    "signature": "5fb35b052aa058c673249c90161e9ff8690886ce3e7fbe158260fe3a0e0bbfed7171eaddc33251a4243fef892985bcfe05f94ebde202ae899284f7d72741001d01"
+  },
+  {
+    "hash": "76c0016f9efcfb0f3114e30f7e69497b6be26c9b17068f195ec085a981a021a7",
+    "secret": "be44fd4ec29b541947cd7b8e697dba1ac42fe1bfe879a726e8a1bce894f81251",
+    "signature": "af56b85d029a78b04aa720a4d7113d457f67d0de422288b817f4ef2e389933f227a29153c399a9a417d9506750c51fcc20b31b802e54acba141fe33fce2d165f00"
+  },
+  {
+    "hash": "a05f60c79781ee69ab3d656e2408c88fdfc96659ad16bca61091c435b3d7c33c",
+    "secret": "d7f53418f26ace9f24aa5fadb327f65fdd622f4b3bfd4638b713b50c362cc742",
+    "signature": "7dbbdb81fcf9cc8b963aa5e3d9cbd3863f99fbd048e81341ea006bbb6a7c4e5221bbd317baa74557129c35b2cd1443fec4dde78a2b5064fbc57e53c9d5b7d9d400"
+  },
+  {
+    "hash": "3fe350ed89da6946d9291dfdcde0a55febbdab3eebd9010e2804a3fd1ba9d647",
+    "secret": "a88c8001d825d7c0019ba16a0ce7c89941d4bffdbff4cba2a348fedf4f992f02",
+    "signature": "abd4cc167b48215c1e82a7dc25c8cfda5962ef8e4c3d71f16877fa1d0fedfe240039664a8442f3cb636a87564e700c92ddc06f33579e3277ec5edf8b2118b11000"
+  },
+  {
+    "hash": "ed9d574fd453b5fac1b0a93a80573d7df064b37e166b0c3e4a10c016ac6ecee0",
+    "secret": "9f75127c2d635a5fd27ef3b613ab5011db8b3f5e37537629cba43e37aa4d4489",
+    "signature": "7aaec22a07280b4425410d154f43223731d2c606a11282fffe6aeee84d8184ae7c0bf88fe4ca6c628c9488f67e45c3a4ad0c0edb4d50bfec3c0656a65b44938e01"
+  },
+  {
+    "hash": "2624913cb516d997d6d042e5d9d5b30a4131ba3c31f82a34d35018350e9ca68f",
+    "secret": "9d802bc343231cbb7004deedfc056372e6fa4b02b48ac56285941ed33761bcd4",
+    "signature": "6b02fdf137298bc5b6dcf9494cd6dfa7c369dbf7b3068a826abea8fad8cc65254bece3c0ce763f5fbf8b157cd9cbc295a63ec2c0d2bc24f5d9d0e024b01fe7a601"
+  },
+  {
+    "hash": "44b4a8ae135675846b8fa732eb2622f63f95fce5b2b10730d20283ee7a6aed63",
+    "secret": "bf9e6687a24727d2350a5da6211a43fb3d44a27ba81e1ad9c5d1b91526752963",
+    "signature": "4fa117306368df1170d7fcca01e80353f77f52db807619ad824e5c4898a0663d72af1dbead5f3930f377b92cb9b6a502fba73eae09baceff500a0a58b2325d4301"
+  },
+  {
+    "hash": "6f7878f3ad75aa55ec6c7599ad1400101b656fc73535c9e685ca602f8cd20a15",
+    "secret": "1532a5657dda80bda879f601d8a021607d381714256503ab616d2326b9941eb3",
+    "signature": "c46940f33634f37110d801358db10471b89be637fc082a0ce7da2fb6c8012a9622df557358ef2a766ad81381fa02182fdcd259e263452ffae50690bfc473920401"
+  },
+  {
+    "hash": "3c014d188be81a9c617625ae2d9bf67108b260858fc4a01e9b835630b1f0496d",
+    "secret": "2f5d0ecc962c457e148e2858a56faaf873ff86484f50ba73721edede01da6c37",
+    "signature": "1adffa5c92d00be99358ac30eaf77608f6c335594f7d2cb698c84675b7e5ab5b686a35dda6163fe469465a6e97e949d584906e6cf19f7786cc45269e38301bbf00"
+  },
+  {
+    "hash": "c294789679f2e887db22b0c7cb240b911468e3a2ab028878bec2d8357ae61900",
+    "secret": "10bc10b8a45e77c332dfab667e413f18ea3dca01af9a3d0f687d4158f2616e54",
+    "signature": "73cc844db97306c77cde84719815feb9a0f6758332956ee1fee809b69c4928845920e6c820d38445ad770a462444f23bda87f8b1c7a596617ed66f9c08975a4101"
+  },
+  {
+    "hash": "afdac9c303e05371802bd0054f0b01a90d5fbf0df8acd41659812eb0f0fbbf63",
+    "secret": "3ed0724a7874a3642c5a8956d5ee63bb1ecb683383af7cbcfbde3e6593d98e92",
+    "signature": "7a3bfe06618e30c936a42d9977955ec8b2ca9d5bb3ac64e05c963bef5f65a3e938f48fb000cdfe86a3c80161a272c8636d24e92fcb753735e0f209b8031489c501"
+  },
+  {
+    "hash": "f9d60b3db6cbf724a573180d7cbbacbac3f64da7b4490b73c1bb7e6b45ed13b8",
+    "secret": "f53c65f3da3171b9ad12edac26e56dcef4db8859a933c6b2a25d34c4c89ba8ab",
+    "signature": "0ffed06a951920df34e47d81f9cb2e22266a4d676dc62ab52eceb809688a5bfb0c8af3d4097ee1b73379fe0dd98b84d37f8e5a3e7cec51aab9ab207a2ef80c5101"
+  },
+  {
+    "hash": "c5ca565076b7e29aafe596bbb7fc62e35705dc15d6b9f4ca81a57e4049fd79fd",
+    "secret": "9f3953048042a019fa38eda94fd3a4551f27f7c9561b2172b026dee63a0c4733",
+    "signature": "c5b92f677aed396d95ccab20dc3dcdf138795faf895840f7fd487048aca2400c4616204d45c3974d917250cdb255979b7f81cb1366d6468d22ed5e4ab022180a00"
+  },
+  {
+    "hash": "dba0ffe77b1e38325881bb24fe9eb2cf997e1f6a14924e2b876f5238376175b8",
+    "secret": "4a8d2fb9a95a5d2371da8b0eda619acfc32f6f282992033b3ff445b51669ab70",
+    "signature": "443be5107a6a48f383a36330eb07ec8db9193314120b5bfaf31eaa79836a19381daeced7e560aeb4c2a568ad8d2389292ff51b8a8d3d368b399b755717c5ef1e00"
+  },
+  {
+    "hash": "4b18609c56d06e1797248e227f3c6bcabf117275d14afaf23980a7c12ca1bd68",
+    "secret": "178c69840aa469159e2c36d456a5074363e7092765177d1e363e9bafa66411ac",
+    "signature": "43414a346bac4c686fbc1c9dfab55ae91a4cc0c323e742d5bfaea3393f0e301c18d6be934769ec7f492cb0718e4d7fbe66a3afd5b0f0572cf49a0b72eee9e95601"
+  },
+  {
+    "hash": "04b09c6a84f7a6f2d307fc568a706e69544f5391a61656a0cdbc5531dc50ab0e",
+    "secret": "59f1f81572e13525f4bd23ffe8cc0d8a3f1e61b8eadcb8b7f4007ccc5014773a",
+    "signature": "77c3de54e7f3792b1f518ec687df2cbe578e732f47266cc6e5345792e07675bc696e2441cda375f5868e8e584db548fff218a8b66f6d56daad84128be0b6a3d300"
+  },
+  {
+    "hash": "8f9f8950a3c69ac371c1111a45b09f9c97b47eb298b78134b1c8f2061262f58a",
+    "secret": "d75c60c24f7ec9779f8e4784708e250b18c37feed155bdda66c39f43342b5edc",
+    "signature": "5e11734434c570813a6eec42226e4bcddf94c60829333fea8bdc89b802e912520ab53114e73c70f541079e833a483aca59a9c547f355c870d08312470ec759b500"
+  },
+  {
+    "hash": "fbe8b8c87551c171dea9aa9f1398d160652ea825339adbd6f85dfa0b58a86562",
+    "secret": "87818f8318b7b249a23f0719fee909d8431ff9e590c86497b1bd271efc3f79c6",
+    "signature": "64b9be5b2aa9a5325014e11366bcb13a06710ecc0d763044802c84939b8fa4ab6e895868df160b7ce836252600f3293309b7b4cb75dd7bd0194edb4d657937c100"
+  },
+  {
+    "hash": "3b3b081e02323e29f343d08848b43eb988cc76e0985d25e38e8929c7005b8158",
+    "secret": "7ec81368d0eb5a50a4d155558d0fc4f59e0b1469ce92cc8b607db929a6b08903",
+    "signature": "ed6583c58c9d3303340b2ce0b254d8cb105933c88a62ee222c60ffa14a44aa335d8a7db8cf17412c4c5383d65b5f7ca2e094baa0124da78ffa134f47acd6d68c00"
+  },
+  {
+    "hash": "72cc90e1a27aef0e63afae2e6b2d6adaee0d6cb749683f6a540082b718a611f1",
+    "secret": "3f7cf867ba530c11c2c913e61951bc81b0326eaa088561afd70d5c48ad34162f",
+    "signature": "51ecc9b8ceb5c699efbb1563e28879bb21800ab95224ad65a8b8680576c247b16da9ae06f2f36dbb714beaaf473db13c2363f5c26d449b2902ccf8d98c16e2d201"
+  },
+  {
+    "hash": "f9c6c5d2ae4e6546be1ce7de502ca88f2c4a187240963f967fa4a23a85991115",
+    "secret": "476b349bfdefb01e41779a96e8b1ebb2222be3ab19ce9fff5d128065f1b837d0",
+    "signature": "91b9f72f12b1616849badb127384ff8f4527490418706da39f15bca4d7bfc4b8564d82702ebcc2f70c07457d7b59240aaeed0919a95780fde6975dcb599b925b00"
+  },
+  {
+    "hash": "72d98ac91ff1d66f2e1009e61ba2b44c53b38d67b137e0a6128f68b6079054d7",
+    "secret": "99b5b03cf2dc0c3ad8517cba4186cbb286c77ce26bb71e23ff1b531021976202",
+    "signature": "1895371c41d18068a95d12503e45a58a00973892acc4289424728284a5f926e06da7cbc921529deaf85d5a148f730b842468f0d51c525b979f10dac638537f2e00"
+  },
+  {
+    "hash": "a5ec417f9eac2510c5443f21b50513bdc86ce6c4a66bc14359890dd5cc8a7b40",
+    "secret": "ce58ce540c3001a2fd28502e5ca892e7b7eb00f55c287062ec843ac7752fa6e2",
+    "signature": "4fe00b7b0ef1c0a9a8e057a512721bc3ca8052a06272c94010c266b22343678b31dc281f2edddebb9b64b0d174a97ed5611a7f7c12e6f4f06a151965f2f30e3e00"
+  },
+  {
+    "hash": "ca74b92c4e9cf5a3cf4de9268ac60bc9866e3238966232bc6f4e4d2f69a62885",
+    "secret": "b96f178ca927f5f8e8eaa6c45441db5060dcd1a09f272aeafda0bcf0c700cff5",
+    "signature": "7f12290968b60841be92af8e5d9e99ea4a7565eeb58130c2ec6b0ae4acd5466276d96e5806beeac99a25a67be8164e31eca830a5389d101a8c24e60aa06909e200"
+  },
+  {
+    "hash": "73c75c6d182eae3e423af7049e5b18f8240b635d9d1b694d12342da08f6777e5",
+    "secret": "826a2f08be69e49d8b09b29db3b4aa5779a6744332725fa5e1814110fa4cdb96",
+    "signature": "a2137c4d430546cb04cca3c0299d6938deffb9e78df6c5a36296cde6584cb02a42f2d6105700f1772752a1dfcaeb113582c6999a9f44da60d50f0ea8affc321901"
+  },
+  {
+    "hash": "77a033035f47a54614ab135b507e5f2989b2ffc62793ba59c662f744f3f7d1ee",
+    "secret": "e01a232ba20a238fa1725ae95a08d5d0ec15379f362ce1b0ef59ad209bcd06e8",
+    "signature": "e7945c17883124cc85134043842fb236510993134d9975c8e32eaf23e9877823255c257b86334488151dfbd65360bf534418f76d53050f9879ad04881f71394501"
+  },
+  {
+    "hash": "45a2c86962e9e408a81f9f687795fdb71b3a000b62731f438d12ee40d42cb374",
+    "secret": "9b8c1f300a7ff483e0f6d1d72cf87b88d10fe27461399df74ed9dd319848afd3",
+    "signature": "1a4452b0ccf856aa29ac2b56d7db74ac5bfbb9cde6fa71599717824c9d1305a23cfab403e7f59865f33dde626e220a3d59597c050723e0af44a57d360c2a19dc01"
+  },
+  {
+    "hash": "49c76133ced2492f275f0b6fb26067020b1919691c0956c9ddb0e4375bfdf4ff",
+    "secret": "6e6ed3ec4255c4194f479d05b3c7c2e1bed82ff1b7994d0692094dd2637c12a7",
+    "signature": "71d128694790c1dd91632b2866e6a6840c79b24420105e3b74913a37f799fc616a0b0d5dd4babea6bb01d11f823ea66a740ca249db6e19086565ee7279eb2db101"
+  },
+  {
+    "hash": "387eb0cf09c1a00c17a6ac8ece3119b34d116733e3960fb44e50056c4d0a0aaa",
+    "secret": "58e1ceb39789cb4fa05d3af6f9172cf6af53fb8679bf32979b28f4ebd173d72b",
+    "signature": "3228a0322861193e10664780df8c557267f5208904afacb9035524e2c16c7df166ed796dfefe493defc5c1348cbf9ce727f603c65a3c5e500da8a99f88abcd7201"
+  },
+  {
+    "hash": "bc8e5887ce6847ed67be2a781633b06dcdfb816038ca0739a105d0bc80a56d75",
+    "secret": "30b94c4c87c770bd21620791704408291b86b171e939c2e2a05ae618a6fe94b9",
+    "signature": "58e1821e5cc088e26980559a87da62b6fb9d5b0515f3a245fde860472dccdeb22e8d460802ce34174abe3f138f78ea7516fde8109f24a7c2efd5318e2240891001"
+  },
+  {
+    "hash": "c428d4f949aa6fdab3fa5a784451745bac85fd81c2a0d9c5ac6f521786cd56df",
+    "secret": "af86222312d73b593e911ba7a929f3e97d567043bd0078d443206b7d0f3f931f",
+    "signature": "0fdafcb6f9037865092a50ce95ab9891f9b478242aa206ef4ded9f8b61b86f2f0c22d2e545c8dbe7f24a1a5137e38e325fa926c7f17c15ccf962aae8d962db0d00"
+  },
+  {
+    "hash": "219f55f3012c0c7d16e0172c6ff1b21080bdf3d6e867d32196e3b79a5b4a6b7c",
+    "secret": "fbcbefbf81c033df501309e25f39ef3e15b22ec2061c97c3f8a5c784a7149b87",
+    "signature": "3d0a81e647abddc6d38fca85acadf483835471e5d8820ad51891ef19a65346ea6646b6f3d9d8556831c48e289a23b277b5169d9ccea6ad76c846b74e5ef38a6a01"
+  },
+  {
+    "hash": "1b8840a329ad8bcf2614a06c3d6bfb9385cbb22a58952fe6eea67310518f983e",
+    "secret": "a1632ce45d4025bff643ce1a0b36a3ca7a7298804602679eb49be6bfc6553c92",
+    "signature": "059d90136fd57f372dd12fc1e10f2d3a3700031c4f1e4f36459923e4fd3c5d6b6d83e3914a3eef24b951c38025092303eb91e786a2ef9a23750b54faadbb00c700"
+  },
+  {
+    "hash": "d17decd2a4b042738261d6e63ef012cc6867e729a3e6f8ba3e1bc79532bb463c",
+    "secret": "d2247583b85dd27f39ca9dc8893966364e8a12699753f6ef9928f2d9011f9cdc",
+    "signature": "f12be874105b61217869cf6b49239385cf1c3753b5551cfb1acd358dc297780765f0c591dcb24f142a5045ab0fca4e90bb9cbb4c08195a34483b8ad3bce9cc2d00"
+  },
+  {
+    "hash": "bafe579a79d46dc918dd15b6643f312e952ca60deb5bbfe2bb361c1eea9c4a4c",
+    "secret": "9fab92109e06a36d1d21002b020c1f9171003fd463105fa8896970496f56c13e",
+    "signature": "bda204f249f0c0d2a60ea4b4e87bee941d356224160f2a769881635d5363700963cae24a2bfeb616c3f72d4be2128bea3972ad14ffded72964a66546e8383cb200"
+  },
+  {
+    "hash": "eff6a8531bae03050f6a62f7652b6213e1755631191c363826ddcb185e2a43b9",
+    "secret": "fe756b78c5425405092aa198c7104069343e0c890998a1e699bc9f908c7cb264",
+    "signature": "853d656c1d293e04f7d425c13412b350582c23700d4975e302fdd761562bc9e00c0bf359d360a736089690e1e3f517fdb4db230f7e76489fc9e1eb58500f8f3e00"
+  },
+  {
+    "hash": "4917e9f4dc97968151de0bf71b5b2bc6ee2544b49b368b305d503dc781ca8cdb",
+    "secret": "6b3a552cd49db3aff943b090dfac7e41a820d8b6319fcb66e5b75c2e89dc4a8a",
+    "signature": "d571d17126ccab7734c7d3b348117fb105f45e6d1b6b6898a489cf8ef99e1ab95f0fdce993b33123cfddbbeb7c6788655829b6d9ddada341540a2629342f061000"
+  },
+  {
+    "hash": "738841a6a624805d5cc0670c9508c72f2bd3bd41e3a652efe536ae67da39525b",
+    "secret": "a5c50ca0b63ed744d10b3579fd187f2555da46350fdca74be052ef7f19ac2ac8",
+    "signature": "3d050cdb5a335a85907be4a660f153cce2a18f5db3e3db6671e2a76daf3d02935bbcc06971462f25409defa49250d30bdb55710cf69a5cd1a486926a7fe5ce3d01"
+  },
+  {
+    "hash": "44751c72517dfe4fcf5c09b84926f096d4ef69d6c131aab4d3d2af88798fd0ea",
+    "secret": "67f42cbc42437eb15d699848783c4295514c9fa8b57c5f4dc9284f1c421e3a0f",
+    "signature": "18bc8c522efd14dff80a0c5c68db20f0e3947d2040fc7235fdf60038769a6e8c099700104432dfa3292985b5f48939b36fe83d048835fd71b36f37b034d280fb01"
+  },
+  {
+    "hash": "ab3eb5d20f2b4a616e9b2a94b6bcd586bdaf485bb78e444505ea94f379e53892",
+    "secret": "73ed40023e40bbccc49e26497004c6e5347af9272382ac1d5a9a3f2f78f9bf23",
+    "signature": "b7c4af4bb53af7ec1abcdec919d344ba06f5d4623594eb380def2215d188b9c63c62b6cd1cc4eaf7967a3ff4e50364d2591e8966856c15bb4efd2fc8d75fa25c01"
+  },
+  {
+    "hash": "8d49d2d75ca11e719941259415524e2a2d8858a5e1c98431b0ca4036b0af6f27",
+    "secret": "d8a771b23524fb94766078c3f458939ad178a05caadfcc6cf5a9410dc2ca7cd0",
+    "signature": "3fe0f65840cc2795197740e3776ccbabbaa1c68111fb2250979889e7cd663a9141f997a117a30ef68164a8a57d3ba82f58d7684cd69658b47f267a93ac09807701"
+  },
+  {
+    "hash": "100de6c9ccec037ab289812462506507e615dd1e7ad4fb33c724af9f1eab1070",
+    "secret": "ed7fa7580d848a15ca06018acf288dfe7547e0e44e175d009f52a47e40e5cc17",
+    "signature": "c52016c525ed8d7f7b7345cb55c98ae9bce55afffb517a19c06a31b68bb7bfc77b580affb42618f30bdc7526d42e6439621311407bcaf12d3ea716bb4cb20bd101"
+  },
+  {
+    "hash": "0b629bac6290cb90bf375893c324f7e8b3e1dcb76c6defbe9be1b0953a5eae38",
+    "secret": "ef44bf690abde5c3226dda3aa133b77a81f0082542d9bb9b439645d63fa0003b",
+    "signature": "3e5a814d8e201cca69cdc570697fa8dccbe48c04ebfaaadaf8343749b5e7fe200a384ebfad0f54c8cef939a549a2a91d4039889eb9034f259648c0ea203fc4e701"
+  },
+  {
+    "hash": "98fa86a923ef8f905672122adf722a3c56ee0b8349fefa5b703b7d0381ccd421",
+    "secret": "8c9154788d4a19ad4e081cc243be741eafd48d166ac6fe110dfb3dfeeb10feae",
+    "signature": "803095e5097c048b12026e8d25b513ec7417bef26c3b1bf910c9773a2d37895e0dc1e184eea9ffbe7f8640e7c98d7b893512336f8125dc37f9e4b460f6f58cd000"
+  },
+  {
+    "hash": "976c107451a19191481fb3f413a42ff20066cc7e0d8a3809ee614cdb1728ecb9",
+    "secret": "64c008571f89e53d19491e7e63e6968ae08187a9dfa6bd99c6ff5c5f79f88004",
+    "signature": "7ca7c754521993153d08d0f22f65bfbfe69ede0900ce759e4ba7fbd5fffdde631b864769cd882c37e559af447b0d47121f32b8697d13d3fd3c504d687b4cbc2c00"
+  },
+  {
+    "hash": "d8887c6743c97980b503c9a69d0a43602db596094553661fa1df2a4a6ac18a53",
+    "secret": "c364018454d6ad29523a425e83ffed1d0b5d17e52fd16524e746d860a5634b92",
+    "signature": "a7c22af6a315bd946cb8f933a29dbdd6a80192c4147b4d208ef3a818e208edbf6058c36a51a31456b16e853eaa830d0d3cc075371b65188f07ba6220fc9c906801"
+  },
+  {
+    "hash": "e3590881f4b0b72083a8d7ec269d3c11ed8daf2a9a187348b04205f1bb036548",
+    "secret": "e1aa8dd19ac8b8bfb872d4340241ba096a16f44417f7425bc1dd1d20d5acd35b",
+    "signature": "731551bcd244e4a05f7cca7aca9a93f5029bfcf8f6cfae30e8ae610c569985f634a6c871a775033480f00263fb138b5260acdd8b93df9647db6e6b3cc20a4f6301"
+  },
+  {
+    "hash": "a43034b5cf06b3d905b376e178ea231208cb830aa4cc7679ec49e7720ef873a5",
+    "secret": "0d58f19d5eaa6c3e8659507395125ae60099cef7f1255a13c217cd61f2e6ae4d",
+    "signature": "f5bba2ef38972af254b97edc3b24982dd24a505ba1f339c18fe714f8fdbdb20b21f9efeb0a019ff2060d14b655687ef70b2c09e6e8596cadef183de4d6c5283200"
+  },
+  {
+    "hash": "1287ac880b34700a5689fe03ee7fcf6b13d988680e69e9272455d3fb38a5e246",
+    "secret": "0f91d900b120b9c6960878f8985772d8cf29ffae77748aff0889183ed2bcd618",
+    "signature": "c5bc42118301c8ff4631e652b4d6bef8c13b521bd404d5e7af710c9ab63c248048cfedfa380ca3d966a718a36fcf3c6a1f456c8f8b47b2fd83931fcb4f02d08e01"
+  },
+  {
+    "hash": "5c67aca884da5f738b1624c501bf4063540a2153d602aaff56ebac89e11dcd1c",
+    "secret": "81f54e72796d6a447bcff6b1022bf6cbf48b2b39160b9e2a4fa07116783c8bf9",
+    "signature": "0e322a34ce048d9497562c53cff8d3266e889513f489decccdbbcfce99ffd478796852b4b6fbb07e6f58651347d00b99c5a2c5633f03baeab5314aa6cb58ecba01"
+  },
+  {
+    "hash": "01133a236bba209b10a710a8f70a4fce5eb043306efa3ba74ae6bfe016e0b7de",
+    "secret": "ce469cba4dd74fff54257d98deb1ec0f4b4d92f13c22ccf88327729fb20a91a9",
+    "signature": "4e893c2de72f2b9bef8adc86ac6da301a0e774feb3ec10c6995262b3a554f209732bd0ae41bfe5fc1b863cb08d74ef15fa250264649030b30c8fe44e894c171601"
+  },
+  {
+    "hash": "c02ae83c3be29fb6e9ee687c4f01cea32ce8bedba3f5441a6cca28b38ae92c54",
+    "secret": "209eb71c8e9e5de35e67440e331d2f2f31aff08410baa2e0ca7eb29cf20fe003",
+    "signature": "882d92979f3fd4df2b19eecea6b4ca3104898774e83506d934736a80697a19366f4fde413d1fcf73adc00dd3938be427cea62a2aa166eab209703a3f63bd77fc00"
+  },
+  {
+    "hash": "f536d9eb429ba0bc5459fa7960c7693775004ea9e57d56e3e94c3b196c49bbb4",
+    "secret": "359484ee9ea253e1f791d1a17f790f79f6607bbe26146aa8ac542d8612858e1a",
+    "signature": "7c78ceba9be9ddf18f2b5bc4414d795d882564a768a78f28702570bb04d0a65e17184e9ef667a2ad8e689ae8c03c8eb73117436035653481f297cd84a1f67a9301"
+  },
+  {
+    "hash": "0a67a0dfdb30f0a6e5863a62b6b7659d0276c7b12c8a8ea87478fd921c3101c9",
+    "secret": "29aeae7ac718964988b35969113c14b39c81e2064794d92af09b4a1d27804267",
+    "signature": "63982045a58db529208243ddeab9b5835d7ce4d45cc557f9b7ecbfd1e9ceebe5567a65ad3f50a8e365146a7fc1490dc5bfd53bcb22e6256ec4c18047caaa4a1b00"
+  },
+  {
+    "hash": "a8a12969ea054930d0898b91184929ac78ad0fd313ac7e809deafc7e01b9a368",
+    "secret": "75b84e21a454b7e454a17e054d0657d1c9ccb801e8579f5b9cebe9249e020fe6",
+    "signature": "383cd3371af70ee93ddd440643196ef945a2c9918be5381f6c41052f6e0279730372f224b2d6be3fcc0f9fb1e2d974923e2ff6129a1dcce73d2ce2d3442d30d001"
+  },
+  {
+    "hash": "5ac6af499cb44bd57dfc9ceda8316c43e02627f14722e2ed6d0051e9539a2406",
+    "secret": "92292d68d69cc60544f58f51a947bf3b1b5c7f1015bc04a8a3b7ba93d74191c6",
+    "signature": "100380c86d1e6d552d5d940fb9670814b45ef2eb5818a69a6ede13e64aad9d7f36245f21b758aac79b46d3df520bdd96a62f052762fb371e56b5aa288c0b849e01"
+  },
+  {
+    "hash": "07497143b21ed20745359b553d106c25d77304995206d3df2d0248a8ddf23089",
+    "secret": "650ad13e7686f91d2c92f7b8fd1e8d61fc9143774d3bc1b7826b1642d39bd6b9",
+    "signature": "a77d5774655680c3920641003a86a5be888c45a9da3f8f40d28f08e2925409b119cdf82f7ad7f7b954123cc73c96256373461d949e6befb51da41290f79608ff01"
+  },
+  {
+    "hash": "06fd74e0d7c1d5337c6a370a8c6b7373449521af7cba1b7ef7959b23e711a054",
+    "secret": "d528eccaf41259f212192f4c02e2ac07f5caf759b927c7b012ea15639476fc3f",
+    "signature": "0bb24124b2eac1ce7f9acd56c40c8e1ebe46534ea6d2bc0f4383e11084ad2783772209e0343be1ad24e5dc2c5f57d301f1c73fd34cded83986321c4360a502cb01"
+  },
+  {
+    "hash": "883771ff758909a7599473c3fbf94c24244c8cda06c1bac871a18d293fce0bbf",
+    "secret": "e151f9e575c9e0540b68dc277a2223539a8344c3061d6727599c28363d3b233d",
+    "signature": "73fd11a7b59ddbaec26cd5bea43a54dca96dd5af9592ea953217e46354d4e3cf27bda4fdae1faed15039179f7c7bcd4cbbc513aaa6a9486f69219dd7f70219e101"
+  },
+  {
+    "hash": "0df5e39277381f18a0d775d5d286a764584c69dcbe32a9a5c7e507efaeb27e1f",
+    "secret": "00c4a04d39bb8c57322973905e3c8c4b18c87246cc848cf6a8cde7a0db70ca63",
+    "signature": "970b0bfeb72b54932915c8b435755af319bc2f06bc855eb2ea1b9d95651edf6b181e7972820bbc0baa82537a6ae223558e18476fbd0a01bdcd495f3955dc0c8300"
+  },
+  {
+    "hash": "6df9a6205bd51fd47b464010bed49292ce0c11ffa4b71dbf1d138ad085eb0259",
+    "secret": "2dc5614cd6016205763887255255caefe7d45fad6533af075923ebfd72826bef",
+    "signature": "3d662fff2fd66147b8d26126c0c733113f2e9d1d1538513c6f1fe1e24dc6acb73668517cdf18edabf93a8673837e15613f0f5e6908e374093bc3ab067bf976cd01"
+  },
+  {
+    "hash": "f3a83eba1d296ae5f2ee8187a3bafb895d1f2a15aa0aefb5f8e5369d2a37dbf4",
+    "secret": "41065f52afeceefe3f0c3cad6b17203c1588d467179c51be86b15a2aeba12abb",
+    "signature": "950ae774809cc3b55a36f1545340ac5e7a389b7f3a36f1a4f0a91b81518d748c47d9aeef9634f11296abea27336dbf36c5aeb515b497c6ceb8439a14238162b701"
+  },
+  {
+    "hash": "a7f45622b70ff8d2fd31dd7440cebbf75294ce9429da31ae167473a90f6d9fd0",
+    "secret": "6d5ec055def0492d9fa613b0fcfaf80f7ff01316bfd8a2e0a4b8caef80df2f5a",
+    "signature": "448a6aeeb7163b08fdc0b9a2a2f412ccf215feee8d98c76c84b157c3a204c52a041ba06ffe90dd39732ef07342fdc4c7f03a6d895036a9208455732cff6effe200"
+  },
+  {
+    "hash": "31ad8350e908b50fc1962b8d92fecf3d1ffee7d04a75545b1f4c5facd18cc6ed",
+    "secret": "408fd6b154cd826297934641614fd02327ec55ad86fb0440c170bfa82ab55025",
+    "signature": "7537f706fa6c98bb0e53d45d0531cea5ac2e3d92327fb867211a316ea15a2ea611e89049859edbbf78c0a9bd04de39bae265d6b23b4ae5df19c3529bed05be5801"
+  },
+  {
+    "hash": "1466a7f0f1836ff904e250cb68ea1780bb36f1f91b26fa0dc46cbe20607ba3af",
+    "secret": "b393312821e73f19eb762a8b4148977236eec4e62cd49b27d2d9de7d1290a2e5",
+    "signature": "8d94d905a984fc65e9ff50370c30f1eb8cce5dc373c4744d6e77ce8caad957cc06e2c895f32b5f14a63c71b78e25ac3454507bc5b709aa84bf80713bdac6ba1f01"
+  },
+  {
+    "hash": "b7b9eb14091e5b7c58275b94a7b18deab7e15511873e5e0446d0a7e33be29a03",
+    "secret": "21ad5b12aba0f73925faffa0dfdfd6a392e5fdc25e622c90be0a9e3996e875ca",
+    "signature": "8e56b3cbbaf6aa67590e1fbcf08998a0b5d224e90462b7fca645d4b16d056a7e20f8f4dacaa635c51b6ee3cfd71fa54e71ff25f167b35eafa1c6b91686274d3200"
+  },
+  {
+    "hash": "dcc962043b56a88c57829ff8711fe930aaf4d5b536a2a77d4ad5872d56951d9c",
+    "secret": "59d21db2cfa096c2f12fe6470331ed422f8b1523810a8602217b1e8b30f4c5e4",
+    "signature": "5a5ac663960d84b3e0432c6497d5b49c6e1852c839e19169ab48fd0aeeeda28f10b6a106119ca4a73328d264c301657d443b77d01ae19737f7cde37ce128a81501"
+  },
+  {
+    "hash": "ed80800e8c54311caa90f6500919e73c74e8fe63b274f77d1e0510c28ebbf794",
+    "secret": "0df0a1d3c6fc9c2998eca608d63a9227b345c3ca5d07b033ed270148b980c1ce",
+    "signature": "c59abb615cfe8e010afafbb5705b1a82017ef8804c423d17be59996476bfb14a108f77fcb6e1e591100055b36e5ac1932413f4c8eb696065b6a0f00c88ce1df101"
+  },
+  {
+    "hash": "625e6831a31ab003c8fc67f5966ccb4cfca04ea958cffa62da790cb9c709097c",
+    "secret": "112c9ca4426ae3c15bcd2bb09c29e9ed1fb84d3e01ef9fc9cf91d8eb02a29781",
+    "signature": "bfa82e403eb4b5d93f3dde39170975b3ba8df615b0fd81fd7963f32c1ae6fe976a43be2e74b17d4880da0f4a437ddc6a3aed938c988f096bfc321316caebd99900"
+  },
+  {
+    "hash": "297d4f7b3342a3379b6ceab7a00299cb62a57b1c1a242f26bb1029cd3330e834",
+    "secret": "47520e3ba5aba9384d865176422be4179bc800b95c620fb086b67adad7fbbfa3",
+    "signature": "0af9b607ca5c239449e6a61231e625f2b910d6e91f06b2c67fa53c3c005abb4528a982f4078b18b0b97ba9a63daef121059c8489116d9e815af65c18953d118a01"
+  },
+  {
+    "hash": "77e3814bd70a03368799cc5832e56c013c56b9c0b0bd3e2b567fcb71c32ed28e",
+    "secret": "20e5e49627e340c1b69bdbd341df97626968bfdc338e4e2e8761a4b95029c2b0",
+    "signature": "8aff739ee3e77f81c2fc8420c361d26dcbfd7721879a58b902866f8d3d40b2bf33793318ffeea1fde04ae92c62d115e9c9820d26b438ee3b1c4007794bb4432800"
+  },
+  {
+    "hash": "998a4f780984056368e0ed5594ae1baec3cea5a265f425d08147e6fa0574399e",
+    "secret": "00c1f966de7e9a697eee6285692c89405936050e5ca515e3dd215d45a9cb30db",
+    "signature": "31b0d5bb010ea160e52b3c4dc65330200af2ceebe84a36185caaf1d0fe3e5df22a9a71525a4e7ece31a280cb6c70256cbd397bb3b01350ab3cab0e1b9512b6c800"
+  },
+  {
+    "hash": "712acfad93cc8a23b6d2025f8e9fa7de633c757d62414b7cc1c9cdaf4145f014",
+    "secret": "3b3ed15fb5fce6ee908c674d3473c3b53d20486b449a6ced8c63b35134c558ab",
+    "signature": "95cbd1cff963ff5fb12ac9b88c5542d9e80b6598a78a6a483b8821cf461108b4208f482624a168bf446df32695d0460a6a699a12dc8a7b66f6b1d56b668d106b00"
+  },
+  {
+    "hash": "bf03271a3d3cac46a2f4af85ab4f28dc94b60845e8e97c5513cc26d33029c583",
+    "secret": "08b9e31e9593601e7cfca3418efe530b4780b525a08af0d7b0027ec8af3af148",
+    "signature": "6582629fbd61152183129c373519d0008384284928ebeccc367aa99aa1405cf821db10ada6fec1480de397fdedf924b7d845f318a3e01e1f40a2eaeb68f8815d01"
+  },
+  {
+    "hash": "0054212f799cbc36e84771c779dc23018b98ea415311428bd6b4788eaafbb24c",
+    "secret": "b66c1c37869c3033dc1d5f47a50bac9b0addc121b401bcf0b5a9113080711dbe",
+    "signature": "73c3aa168c21b93a8f126b008bb0abbeb5130ab50cd30195d0d2bdcfaa87031940dcad39d4e7b2fc93768eb218683ed9ca34ccc7556b3fad6aee45f1d79fd6bf01"
+  },
+  {
+    "hash": "f5e6eb9c9f0b22b2d86444c1ed8fea751ccb8b5de0ca90610380960198808301",
+    "secret": "a2af24e33b9995b4f2317c22094d7d564516d5a3b9d6613d988403d704ae2dae",
+    "signature": "5537b5fd15e0183565126b49799e87c5f322fdc40a4eb8bb96641961c86fe6557662a9478ec75b25617beb3f317b394d896eea6552c96a10b43ae08c2aaa56a001"
+  },
+  {
+    "hash": "df2655b91f9979e7ef9934f6d42c70506e9fdc4c9a631c219d5c2cbcc5b2fbf2",
+    "secret": "a582bfc617c3d71b8f1d36a78d5da56a263f2cd4402a8ac3d1407fa7570d49dd",
+    "signature": "1d0c768064da2f755ca3027070315cee087ecee60abe9552a0c88d8485fb440c65e837a2390a68389996bb24f7aa8ec1414c8d05721531b76cefac67a0b8bffb01"
+  },
+  {
+    "hash": "92a55da0a5a40ce354fcea2e1e19e423c4bc1918b27cb1da9a82bbd19739c656",
+    "secret": "54e3763bffdc23be470911b4a00cf1823402d60e6b3f05cb412eb743c710e6f0",
+    "signature": "ea15a3a4f3b394ae794f9011232b6475af40f70f4f0e56beaad1866080ddd064710d38451c93e451aa5e45e7bbba53a60d101a9ccecc8f81e1a450e8fca63e5c00"
+  },
+  {
+    "hash": "dc789ac9ee186b72ed75874ddfec75404a325ce715f4acf0e7f15716873d27a5",
+    "secret": "eed38ac3a51d0b3b30ca0ba931a2eccc581978287af8dfe83c8a13f18063e4b1",
+    "signature": "b723f6c7ca1ed1cb2ac085cf084596c507471de79300071f54e00d857e9b3e502ecb9449f8a9e2d5d9983197b28dbf80249357ee5335b5c2c973de474ac2966501"
+  },
+  {
+    "hash": "256bf871b80790aeeb3129684e6577094e892de32277d56335b6efa548c7760c",
+    "secret": "1d92a4d3e7702fc569e34b8c03a6002454d2a7b7ce1fb9e9e68fc1c22079b2a2",
+    "signature": "0cefc1979b394dc0ee569bdeb61e93abeeca083cddd1679a0216faaa5c2ee75136121fc441fa56eae40283ff8d9961deb8f12c2053f7e0d2a5e0e2b07398581800"
+  },
+  {
+    "hash": "135dac79c2c15df5df784efc77d01f37fae8391f744e0754b3c2ced4b1aa4f35",
+    "secret": "cc4a32d268af6bd954854cc7a566fbbad87014735355bf37ff9815a32ad711bb",
+    "signature": "76be7b98542d4201fb6841fb729e6d0c864826632b6f88ff3865a26c6a134e743508e6d2cf5fc314600e0af433d9feef330bc470d9facd032fed13c47ab84e7701"
+  },
+  {
+    "hash": "32dc1a4cacd866796365578fc9f34933d045181850fc595f308fce0b098179be",
+    "secret": "5d6353c5e80c2c8484a7fba5c8747acea369b3867e38202847d7412b9fffa3ec",
+    "signature": "3d4e87f439c79a4a41d2e3ae85012bb2be536e576f0d9b443e05dde31f6b764150d3890ba16d0831a161e0b46d953aa428da51ee32a0b4fdcee4a3474dbbdb5300"
+  },
+  {
+    "hash": "edb61c559d972631edfc038ed12ec70c4f7364edb160622e30af1e983b26f44c",
+    "secret": "eae7552961000ec6c486803e006c5e9c8a426df8d712844616dfbf27845297c3",
+    "signature": "354b81c1993efae290a52bfbe4bf0fe8b1bbb311e75315a450ae5459fc2559a304af37c0c47e96238f487444ec022c23245814d0af97691d1578caa043fc575800"
+  },
+  {
+    "hash": "3dc69be3da8b0c46ec7abb0b50d1232136ce3d2e5906d8714165ffc679145af0",
+    "secret": "1e10080c45b5b583072e1685f6afe98c357ed0d7dafb6c3aa63f06fbe47adcb2",
+    "signature": "9539625576b54478ac7bf94d107d1106a3ac9a0664080fb29fbaf3d0a8ce3882204faccb5b8b798b611e73d089326ff40e4fb497d50e563e649d5712c752c19600"
+  },
+  {
+    "hash": "d60d71d332ef3ea77188f8845182b78bbae330790cdef1f08689d5466405c675",
+    "secret": "a6971000bf7ce5b2ab4529f60836de2a818ec2f643294d438d3973443a014051",
+    "signature": "4dcbedef2023d1812b3fcbc87b692be63363382a470073e4ab4116920b8e93da6f8b5671f51b16d7437df976e080a4eea99c5d07452b74f64ff0f5d7c5de648701"
+  },
+  {
+    "hash": "2cc264741c237b61b59376c554424ad49ab4c92fa91fd0ed44dc27755525779e",
+    "secret": "b1aae3bf6f3a423291dc61dfc1a7d463a8e0d3823c243e99dd53228acf4d37f6",
+    "signature": "7f58d5e3289bb3e057789ed49841dc45ff5b94b31e1572d144c9544fe1bc30e21cb31301f2754e4ad6f471fd5610287245bdda11766038706b0e70bb1f46c38f00"
+  },
+  {
+    "hash": "bf50b828447a139678010329af94d718f026c8275646cb6aa3b88d0536edb278",
+    "secret": "9d92aa2dd3d49f846e399d820642eafde6e47341ed863643225ffb68d982f8cd",
+    "signature": "7d1f5708d69f77b0df5996604c2eca23c9c24e4c29929d3a2d012aec01e42f8a00fd2f5f9b4dee732c93bba18a6680c771487a42055498e217ad72f2b71c824a00"
+  },
+  {
+    "hash": "60eb03e7c48e7ce8cd7b9801957e97f15a4685441ab62e152294faed5f70447a",
+    "secret": "22cf83b25deb53cfe31c555fd0255b3272d7ab61f2aca1f19f36cc4bd82cea49",
+    "signature": "0aabd16e289762f9c363329e883b505f1c85c8fb0df7f383db2c7f651794ae2d6095285a7588187c78527d3b45438085bb69610c959dae58a08b1b43334f1d7b00"
+  }
+]
\ No newline at end of file
diff --git a/rust/tw_keypair/tests/secp256k1_tests.rs b/rust/tw_keypair/tests/secp256k1_tests.rs
new file mode 100644
index 00000000000..9e56c024862
--- /dev/null
+++ b/rust/tw_keypair/tests/secp256k1_tests.rs
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::Deserialize;
+use tw_encoding::hex::as_hex;
+use tw_hash::{H256, H520};
+use tw_keypair::ecdsa::secp256k1::{KeyPair, VerifySignature};
+use tw_keypair::traits::{SigningKeyTrait, VerifyingKeyTrait};
+
+/// The tests were generated in C++ using the `trezor-crypto` library.
+const SECP256K1_SIGN: &str = include_str!("secp256k1_sign.json");
+
+#[derive(Deserialize)]
+struct Secp256k1SignTest {
+    #[serde(with = "as_hex")]
+    secret: H256,
+    #[serde(with = "as_hex")]
+    hash: H256,
+    #[serde(with = "as_hex")]
+    signature: H520,
+}
+
+#[test]
+fn test_secp256k1_sign_verify() {
+    let tests: Vec<Secp256k1SignTest> = serde_json::from_str(SECP256K1_SIGN).unwrap();
+    for test in tests {
+        let keypair = KeyPair::try_from(test.secret.as_slice()).unwrap();
+        let actual = keypair.sign(test.hash).unwrap();
+        assert_eq!(actual.to_bytes(), test.signature);
+
+        let verify_sign = VerifySignature::from(actual);
+        assert!(keypair.verify(verify_sign, test.hash));
+    }
+}
diff --git a/rust/tw_keypair/tests/tw_keypair_starkex_tests.rs b/rust/tw_keypair/tests/tw_keypair_starkex_tests.rs
new file mode 100644
index 00000000000..9fe872ad797
--- /dev/null
+++ b/rust/tw_keypair/tests/tw_keypair_starkex_tests.rs
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::hex;
+use tw_hash::H512;
+use tw_keypair::tw::{Curve, PrivateKey, PublicKeyType};
+
+#[test]
+fn test_starkex_tw_private_key() {
+    let privkey_bytes =
+        hex::decode("058ab7989d625b1a690400dcbe6e070627adedceff7bd196e58d4791026a8afe").unwrap();
+    let pubkey_bytes =
+        hex::decode("02a4c7332c55d6c1c510d24272d1db82878f2302f05b53bcc38695ed5f78fffd").unwrap();
+
+    let privkey = PrivateKey::new(privkey_bytes.clone()).unwrap();
+    assert_eq!(privkey.key().into_vec(), privkey_bytes);
+
+    let public = privkey
+        .get_public_key_by_type(PublicKeyType::Starkex)
+        .unwrap();
+    assert_eq!(public.to_bytes(), pubkey_bytes);
+}
+
+#[test]
+fn test_starkex_tw_private_key_sign() {
+    let privkey_bytes =
+        hex::decode("0139fe4d6f02e666e86a6f58e65060f115cd3c185bd9e98bd829636931458f79").unwrap();
+    let hash_to_sign =
+        hex::decode("06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76").unwrap();
+
+    let privkey = PrivateKey::new(privkey_bytes).unwrap();
+    let actual = privkey.sign(&hash_to_sign, Curve::Starkex).unwrap();
+    let expected = H512::from("061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a");
+    assert_eq!(actual, expected.into_vec());
+}
diff --git a/rust/tw_memory/Cargo.toml b/rust/tw_memory/Cargo.toml
new file mode 100644
index 00000000000..2c7b443f83f
--- /dev/null
+++ b/rust/tw_memory/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "tw_memory"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+
+[features]
+test-utils = []
diff --git a/rust/tw_memory/src/ffi/c_byte_array.rs b/rust/tw_memory/src/ffi/c_byte_array.rs
new file mode 100644
index 00000000000..3f4c2d98724
--- /dev/null
+++ b/rust/tw_memory/src/ffi/c_byte_array.rs
@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#[repr(C)]
+pub struct CByteArrayResult {
+    pub code: i32,
+    pub result: CByteArray,
+}
+
+crate::impl_c_result!(CByteArrayResult, CByteArray, CByteArray::null());
+
+/// A C-compatible wrapper over a byte array allocated in Rust.
+#[repr(C)]
+#[derive(Debug)]
+pub struct CByteArray {
+    data: *mut u8,
+    size: usize,
+    capacity: usize,
+}
+
+impl Drop for CByteArray {
+    fn drop(&mut self) {
+        unsafe { self.release_if_allocated() };
+    }
+}
+
+impl From<Vec<u8>> for CByteArray {
+    fn from(mut mut_vec: Vec<u8>) -> Self {
+        let data = mut_vec.as_mut_ptr();
+        let size = mut_vec.len();
+        let capacity = mut_vec.capacity();
+        std::mem::forget(mut_vec);
+        CByteArray {
+            data,
+            size,
+            capacity,
+        }
+    }
+}
+
+impl Default for CByteArray {
+    fn default() -> Self {
+        CByteArray::new()
+    }
+}
+
+impl CByteArray {
+    /// Returns a null `CByteArray` instance.
+    pub fn null() -> CByteArray {
+        CByteArray {
+            data: std::ptr::null_mut(),
+            size: 0,
+            capacity: 0,
+        }
+    }
+
+    /// Returns an empty `CByteArray` instance.
+    pub fn new() -> CByteArray {
+        CByteArray::from(Vec::new())
+    }
+
+    /// Converts `CByteArray` into `Vec<u8>` without additional allocation.
+    ///
+    /// # Safe
+    ///
+    /// `data`, `size` and `capacity` must be valid and exactly the same as after [`CByteArray::new`].
+    pub unsafe fn into_vec(mut self) -> Vec<u8> {
+        let data = Vec::from_raw_parts(self.data, self.size, self.capacity);
+        // Set the self to null to avoid realising the memory on `CByteArray::drop`.
+        self.set_null();
+        data
+    }
+
+    /// Releases the memory if it was allocated previously and not released yet.
+    unsafe fn release_if_allocated(&mut self) {
+        // Do nothing if the memory has been released already or not allocated yet.
+        if self.data.is_null() {
+            return;
+        }
+
+        let _ = Vec::from_raw_parts(self.data, self.size, self.capacity);
+        self.set_null();
+    }
+
+    /// Set the pointer, size and capacity to the default values.
+    fn set_null(&mut self) {
+        self.data = std::ptr::null_mut();
+        self.size = 0;
+        self.capacity = 0;
+    }
+
+    /// Returns the const pointer to the data.
+    pub fn data(&self) -> *const u8 {
+        self.data.cast_const()
+    }
+
+    /// Returns the data length.
+    pub fn size(&self) -> usize {
+        self.size
+    }
+
+    /// Returns the data slice.
+    pub unsafe fn as_slice(&self) -> &[u8] {
+        std::slice::from_raw_parts(self.data, self.size)
+    }
+}
+
+/// Releases the memory previously allocated for the pointer to `CByteArray`.
+/// \param ptr *non-null* C-compatible byte array.
+#[no_mangle]
+pub unsafe extern "C" fn free_c_byte_array(ptr: *mut CByteArray) {
+    if ptr.is_null() {
+        return;
+    }
+    (*ptr).release_if_allocated();
+}
diff --git a/rust/tw_memory/src/ffi/c_byte_array_ref.rs b/rust/tw_memory/src/ffi/c_byte_array_ref.rs
new file mode 100644
index 00000000000..7f5e3e0b4a0
--- /dev/null
+++ b/rust/tw_memory/src/ffi/c_byte_array_ref.rs
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+/// A C-compatible wrapper over a byte array given as the FFI argument.
+#[repr(C)]
+#[derive(Debug)]
+pub struct CByteArrayRef {
+    data: *const u8,
+    size: usize,
+}
+
+impl CByteArrayRef {
+    /// Creates a new `CByteArrayRef` from the allocated byte array.
+    pub fn new(data: *const u8, size: usize) -> CByteArrayRef {
+        CByteArrayRef { data, size }
+    }
+
+    /// Clones the byte array as a `Vec<u8>`.
+    /// Returns `None` if `CByteArrayRef::data` is null.
+    ///
+    /// # Safety
+    ///
+    /// The inner data must be valid.
+    pub unsafe fn to_vec(&self) -> Option<Vec<u8>> {
+        self.as_slice().map(|data| data.to_vec())
+    }
+
+    /// Returns a slice.
+    /// Returns `None` if `CByteArrayRef::data` is null.
+    ///
+    /// # Safety
+    ///
+    /// The inner data must be valid.
+    pub unsafe fn as_slice(&self) -> Option<&'static [u8]> {
+        if self.data.is_null() {
+            return None;
+        }
+        Some(std::slice::from_raw_parts(self.data, self.size))
+    }
+}
diff --git a/rust/tw_memory/src/ffi/c_result.rs b/rust/tw_memory/src/ffi/c_result.rs
new file mode 100644
index 00000000000..a1db2322139
--- /dev/null
+++ b/rust/tw_memory/src/ffi/c_result.rs
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::ffi::c_char;
+
+pub const OK_CODE: ErrorCode = 0;
+pub const UNKNOWN_ERROR: ErrorCode = -1;
+
+pub type ErrorCode = i32;
+
+#[macro_export]
+macro_rules! impl_c_result {
+    ($name:ident, $result:ty, $default:expr) => {
+        impl $name {
+            pub fn ok(result: $result) -> $name {
+                $name {
+                    code: $crate::ffi::c_result::OK_CODE,
+                    result,
+                }
+            }
+
+            pub fn error<E>(code: E) -> $name
+            where
+                $crate::ffi::c_result::ErrorCode: From<E>,
+            {
+                let mut code = $crate::ffi::c_result::ErrorCode::from(code);
+                if (code == $crate::ffi::c_result::OK_CODE) {
+                    code = $crate::ffi::c_result::UNKNOWN_ERROR;
+                }
+                $name {
+                    code,
+                    result: $default,
+                }
+            }
+
+            pub fn is_ok(&self) -> bool {
+                self.code == $crate::ffi::c_result::OK_CODE
+            }
+
+            pub fn is_err(&self) -> bool {
+                !self.is_ok()
+            }
+
+            pub fn into_result(self) -> Result<$result, $crate::ffi::c_result::ErrorCode> {
+                if self.is_ok() {
+                    Ok(self.result)
+                } else {
+                    Err(self.code)
+                }
+            }
+
+            #[track_caller]
+            pub fn unwrap(self) -> $result {
+                if !self.is_ok() {
+                    panic!(
+                        "called `{}::unwrap()` on an error: {}",
+                        stringify!($name),
+                        self.code
+                    );
+                }
+                self.result
+            }
+        }
+
+        impl<E> From<core::result::Result<$result, E>> for $name
+        where
+            $crate::ffi::c_result::ErrorCode: From<E>,
+        {
+            fn from(res: core::result::Result<$result, E>) -> Self {
+                match res {
+                    Ok(ready) => $name::ok(ready),
+                    Err(error) => $name::error(error),
+                }
+            }
+        }
+    };
+}
+
+#[repr(C)]
+pub struct CStrResult {
+    pub code: i32,
+    pub result: *const c_char,
+}
+
+#[repr(C)]
+pub struct CStrMutResult {
+    pub code: i32,
+    pub result: *mut c_char,
+}
+
+#[repr(C)]
+pub struct CBoolResult {
+    pub code: i32,
+    pub result: bool,
+}
+
+#[repr(C)]
+pub struct CUInt8Result {
+    pub code: i32,
+    pub result: u8,
+}
+
+#[repr(C)]
+pub struct CUInt64Result {
+    pub code: i32,
+    pub result: u64,
+}
+
+impl_c_result!(CStrResult, *const c_char, core::ptr::null());
+impl_c_result!(CStrMutResult, *mut c_char, core::ptr::null_mut());
+impl_c_result!(CBoolResult, bool, false);
+impl_c_result!(CUInt8Result, u8, 0);
+impl_c_result!(CUInt64Result, u64, 0);
diff --git a/rust/tw_memory/src/ffi/mod.rs b/rust/tw_memory/src/ffi/mod.rs
new file mode 100644
index 00000000000..c69f1550a6a
--- /dev/null
+++ b/rust/tw_memory/src/ffi/mod.rs
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use std::ffi::{c_char, CString};
+
+pub mod c_byte_array;
+pub mod c_byte_array_ref;
+pub mod c_result;
+pub mod tw_data;
+pub mod tw_data_vector;
+pub mod tw_string;
+
+/// Releases the memory previously allocated for the `ptr` string.
+/// \param ptr *non-null* C-compatible, nul-terminated string.
+#[no_mangle]
+pub unsafe extern "C" fn free_string(ptr: *const c_char) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = CString::from_raw(ptr as *mut _);
+}
+
+pub trait RawPtrTrait: Sized {
+    fn into_ptr(self) -> *mut Self {
+        Box::into_raw(Box::new(self))
+    }
+
+    unsafe fn from_ptr(raw: *mut Self) -> Option<Self> {
+        if raw.is_null() {
+            return None;
+        }
+        Some(*Box::from_raw(raw))
+    }
+
+    unsafe fn from_ptr_as_ref(raw: *const Self) -> Option<&'static Self> {
+        if raw.is_null() {
+            return None;
+        }
+        Some(&*raw)
+    }
+
+    unsafe fn from_ptr_as_mut(raw: *mut Self) -> Option<&'static mut Self> {
+        if raw.is_null() {
+            return None;
+        }
+        Some(&mut *raw)
+    }
+
+    unsafe fn from_ptr_as_box(raw: *mut Self) -> Option<Box<Self>> {
+        if raw.is_null() {
+            return None;
+        }
+        Some(Box::from_raw(raw))
+    }
+}
diff --git a/rust/tw_memory/src/ffi/tw_data.rs b/rust/tw_memory/src/ffi/tw_data.rs
new file mode 100644
index 00000000000..7a573d8fe4b
--- /dev/null
+++ b/rust/tw_memory/src/ffi/tw_data.rs
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::c_byte_array_ref::CByteArrayRef;
+use crate::ffi::RawPtrTrait;
+use crate::Data;
+
+/// Defines a resizable block of data.
+///
+/// The implementation of these methods should be language-specific to minimize translation overhead.
+/// For instance it should be a `jbyteArray` for Java and an `NSData` for Swift.
+#[derive(Clone, Debug, Default)]
+pub struct TWData(Data);
+
+impl TWData {
+    /// Returns an empty `TWData` instance.
+    pub fn new() -> TWData {
+        TWData(Vec::new())
+    }
+
+    /// Creates a `TWData` from a raw byte array.
+    pub unsafe fn from_raw_data(bytes: *const u8, size: usize) -> Option<TWData> {
+        CByteArrayRef::new(bytes, size).to_vec().map(TWData)
+    }
+
+    /// Converts `TWData` into `Data` without additional allocation.
+    pub fn into_vec(self) -> Data {
+        self.0
+    }
+
+    /// Copies underlying data.
+    pub fn to_vec(&self) -> Data {
+        self.0.clone()
+    }
+
+    /// Returns the data slice.
+    pub fn as_slice(&self) -> &[u8] {
+        self.0.as_slice()
+    }
+
+    /// Returns a pointer to the data.
+    pub fn data(&self) -> *const u8 {
+        self.0.as_ptr()
+    }
+
+    /// Returns a length of the data.
+    pub fn size(&self) -> usize {
+        self.0.len()
+    }
+}
+
+impl From<Data> for TWData {
+    fn from(data: Data) -> Self {
+        TWData(data)
+    }
+}
+
+impl RawPtrTrait for TWData {}
+
+/// Creates a block of data from a byte array.
+///
+/// \param bytes Non-null raw bytes buffer
+/// \param size size of the buffer
+/// \return Non-null filled block of data.
+#[no_mangle]
+pub unsafe extern "C" fn tw_data_create_with_bytes(bytes: *const u8, size: usize) -> *mut TWData {
+    TWData::from_raw_data(bytes, size)
+        .map(|data| data.into_ptr())
+        .unwrap_or_else(std::ptr::null_mut)
+}
+
+/// Deletes a block of data created with a `TWDataCreate*` method.
+///
+/// \param data A non-null valid block of data
+#[no_mangle]
+pub unsafe extern "C" fn tw_data_delete(data: *mut TWData) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = TWData::from_ptr(data);
+}
+
+/// Returns the raw pointer to the contents of data.
+///
+/// \param data A non-null valid block of data
+/// \return the raw pointer to the contents of data
+#[no_mangle]
+pub unsafe extern "C" fn tw_data_bytes(data: *const TWData) -> *const u8 {
+    TWData::from_ptr_as_ref(data)
+        .map(TWData::data)
+        .unwrap_or_else(std::ptr::null)
+}
+
+/// Returns the size in bytes.
+///
+/// \param data A non-null valid block of data
+/// \return the size of the given block of data
+#[no_mangle]
+pub unsafe extern "C" fn tw_data_size(data: *const TWData) -> usize {
+    TWData::from_ptr_as_ref(data)
+        .map(|data| data.size())
+        .unwrap_or_default()
+}
diff --git a/rust/tw_memory/src/ffi/tw_data_vector.rs b/rust/tw_memory/src/ffi/tw_data_vector.rs
new file mode 100644
index 00000000000..f9dbe4c3f38
--- /dev/null
+++ b/rust/tw_memory/src/ffi/tw_data_vector.rs
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_data::TWData;
+use crate::ffi::RawPtrTrait;
+
+type Data = Vec<u8>;
+
+/// A vector of `TWData` byte arrays.
+#[derive(Default)]
+pub struct TWDataVector(Vec<TWData>);
+
+impl TWDataVector {
+    /// Returns an empty `TWDataVector` instance.
+    pub fn new() -> TWDataVector {
+        TWDataVector(Vec::new())
+    }
+
+    /// Adds an element to a vector of `TWData`.
+    pub fn push(&mut self, data: TWData) {
+        self.0.push(data);
+    }
+
+    /// Retrieves the number of elements.
+    pub fn size(&self) -> usize {
+        self.0.len()
+    }
+
+    /// Converts `Vec<TWData>` to `Vec<Data>` by cloning each element.
+    pub fn to_data_vec(&self) -> Vec<Data> {
+        self.0.iter().map(TWData::to_vec).collect()
+    }
+}
+
+impl RawPtrTrait for TWDataVector {}
+
+/// Creates a Vector of Data.
+///
+/// \note Must be deleted with \TWDataVectorDelete
+/// \return a non-null Vector of Data.
+#[no_mangle]
+pub unsafe extern "C" fn tw_data_vector_create() -> *mut TWDataVector {
+    TWDataVector::new().into_ptr()
+}
+
+/// Delete/Deallocate a Vector of Data
+///
+/// \param data_vector A non-null Vector of data
+#[no_mangle]
+pub unsafe extern "C" fn tw_data_vector_delete(data_vector: *mut TWDataVector) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = TWDataVector::from_ptr(data_vector);
+}
+
+/// Add an element to a Vector of Data. Element is cloned
+///
+/// \param data_vector A non-null Vector of data
+/// \param data A non-null valid block of data
+/// \note data input parameter must be deleted on its own
+#[no_mangle]
+pub unsafe extern "C" fn tw_data_vector_add(data_vector: *mut TWDataVector, data: *const TWData) {
+    let Some(data_vector) = TWDataVector::from_ptr_as_mut(data_vector) else {
+        return;
+    };
+
+    let Some(data_ref) = TWData::from_ptr_as_ref(data) else {
+        return;
+    };
+
+    data_vector.push(data_ref.clone());
+}
diff --git a/rust/tw_memory/src/ffi/tw_string.rs b/rust/tw_memory/src/ffi/tw_string.rs
new file mode 100644
index 00000000000..49932593f6c
--- /dev/null
+++ b/rust/tw_memory/src/ffi/tw_string.rs
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::c_byte_array_ref::CByteArrayRef;
+use crate::ffi::RawPtrTrait;
+use std::ffi::{c_char, CStr, CString};
+
+/// Defines a resizable string.
+///
+/// The implementation of these methods should be language-specific to minimize translation overhead.
+/// For instance it should be a `jstring` for Java and an `NSString` for Swift.
+/// Create allocates memory, the delete call should be called at the end to release memory.
+#[derive(Debug, Default)]
+pub struct TWString(CString);
+
+impl TWString {
+    pub unsafe fn is_utf8_string(bytes: *const u8, size: usize) -> bool {
+        let Some(bytes) = CByteArrayRef::new(bytes, size).to_vec() else {
+            return false;
+        };
+        String::from_utf8(bytes).is_ok()
+    }
+
+    /// Returns an empty `TWString` instance.
+    pub fn new() -> TWString {
+        TWString(CString::default())
+    }
+
+    /// Creates a `TWString` from a null-terminated UTF8 byte array.
+    pub unsafe fn from_c_str(ptr: *const c_char) -> Option<TWString> {
+        if ptr.is_null() {
+            return None;
+        }
+        let str = CStr::from_ptr(ptr);
+        Some(TWString(CString::from(str)))
+    }
+
+    /// Converts `TWString` into `String` without additional allocation.
+    pub fn into_string(self) -> Option<String> {
+        self.0.into_string().ok()
+    }
+
+    /// Returns a string slice.
+    pub fn as_str(&self) -> Option<&str> {
+        self.0.to_str().ok()
+    }
+
+    /// Returns the const pointer to the string.
+    pub fn as_c_char(&self) -> *const c_char {
+        self.0.as_ptr()
+    }
+}
+
+impl From<String> for TWString {
+    fn from(s: String) -> Self {
+        TWString(CString::new(s).expect("CString::new(String) should never fail"))
+    }
+}
+
+impl RawPtrTrait for TWString {}
+
+/// Creates a `TWString` from a null-terminated UTF8 byte array. It must be deleted at the end.
+/// \param bytes a null-terminated UTF8 byte array.
+#[no_mangle]
+pub unsafe extern "C" fn tw_string_create_with_utf8_bytes(bytes: *const c_char) -> *mut TWString {
+    TWString::from_c_str(bytes)
+        .map(TWString::into_ptr)
+        .unwrap_or_else(std::ptr::null_mut)
+}
+
+/// Returns the raw pointer to the string's UTF8 bytes (null-terminated).
+/// \param str a TWString pointer.
+#[no_mangle]
+pub unsafe extern "C" fn tw_string_utf8_bytes(str: *const TWString) -> *const c_char {
+    TWString::from_ptr_as_ref(str)
+        .map(|str| str.as_c_char())
+        .unwrap_or_else(std::ptr::null)
+}
+
+/// Checks whether the C byte array is a UTF8 string.
+/// \return true if the given C byte array is UTF-8 string, otherwise false.
+#[no_mangle]
+pub unsafe extern "C" fn tw_string_is_utf8_bytes(bytes: *const u8, size: usize) -> bool {
+    TWString::is_utf8_string(bytes, size)
+}
+
+/// Deletes a string created with a `TWStringCreate*` method and frees the memory.
+/// \param str a `TWString` pointer.
+#[no_mangle]
+pub unsafe extern "C" fn tw_string_delete(str: *mut TWString) {
+    let _ = TWString::from_ptr(str);
+}
diff --git a/rust/tw_memory/src/lib.rs b/rust/tw_memory/src/lib.rs
new file mode 100644
index 00000000000..b4431aacbd2
--- /dev/null
+++ b/rust/tw_memory/src/lib.rs
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::ffi::{c_char, CString};
+
+pub type Data = Vec<u8>;
+
+pub mod ffi;
+
+#[cfg(feature = "test-utils")]
+pub mod test_utils;
+
+pub fn c_string_standalone<S: Into<String>>(input: S) -> *const c_char {
+    let res = CString::new(input.into()).unwrap();
+    let p = res.as_ptr();
+    std::mem::forget(res);
+    p
+}
diff --git a/rust/tw_memory/src/test_utils/mod.rs b/rust/tw_memory/src/test_utils/mod.rs
new file mode 100644
index 00000000000..af59d951bce
--- /dev/null
+++ b/rust/tw_memory/src/test_utils/mod.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod tw_data_helper;
+pub mod tw_data_vector_helper;
+pub mod tw_string_helper;
+pub mod tw_wrapper;
diff --git a/rust/tw_memory/src/test_utils/tw_data_helper.rs b/rust/tw_memory/src/test_utils/tw_data_helper.rs
new file mode 100644
index 00000000000..ec404609f76
--- /dev/null
+++ b/rust/tw_memory/src/test_utils/tw_data_helper.rs
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_data::{
+    tw_data_bytes, tw_data_create_with_bytes, tw_data_delete, tw_data_size, TWData,
+};
+use crate::Data;
+
+pub struct TWDataHelper {
+    ptr: *mut TWData,
+}
+
+impl TWDataHelper {
+    pub fn create(bytes: Data) -> Self {
+        let ptr = unsafe { tw_data_create_with_bytes(bytes.as_ptr(), bytes.len()) };
+        assert!(!ptr.is_null());
+        TWDataHelper { ptr }
+    }
+
+    pub fn wrap(ptr: *mut TWData) -> Self {
+        TWDataHelper { ptr }
+    }
+
+    pub fn ptr(&self) -> *mut TWData {
+        self.ptr
+    }
+
+    pub fn is_null(&self) -> bool {
+        self.ptr.is_null()
+    }
+
+    pub fn to_vec(&self) -> Option<Data> {
+        if self.ptr.is_null() {
+            return None;
+        }
+        let bytes_ptr = unsafe { tw_data_bytes(self.ptr) };
+        let len = unsafe { tw_data_size(self.ptr) };
+
+        let bytes = unsafe { std::slice::from_raw_parts(bytes_ptr, len) }.to_vec();
+        Some(bytes)
+    }
+}
+
+impl Drop for TWDataHelper {
+    fn drop(&mut self) {
+        if self.ptr.is_null() {
+            return;
+        }
+        unsafe { tw_data_delete(self.ptr) }
+    }
+}
diff --git a/rust/tw_memory/src/test_utils/tw_data_vector_helper.rs b/rust/tw_memory/src/test_utils/tw_data_vector_helper.rs
new file mode 100644
index 00000000000..63f6287c137
--- /dev/null
+++ b/rust/tw_memory/src/test_utils/tw_data_vector_helper.rs
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_data_vector::{
+    tw_data_vector_add, tw_data_vector_create, tw_data_vector_delete, TWDataVector,
+};
+use crate::test_utils::tw_data_helper::TWDataHelper;
+
+type Data = Vec<u8>;
+
+pub struct TWDataVectorHelper {
+    ptr: *mut TWDataVector,
+}
+
+impl TWDataVectorHelper {
+    pub fn create<I>(vec: I) -> TWDataVectorHelper
+    where
+        I: IntoIterator<Item = Data>,
+    {
+        let ptr = unsafe { tw_data_vector_create() };
+        for data in vec {
+            let data = TWDataHelper::create(data);
+            unsafe { tw_data_vector_add(ptr, data.ptr()) };
+        }
+
+        TWDataVectorHelper { ptr }
+    }
+
+    pub fn ptr(&self) -> *mut TWDataVector {
+        self.ptr
+    }
+}
+
+impl Default for TWDataVectorHelper {
+    fn default() -> Self {
+        TWDataVectorHelper::create([])
+    }
+}
+
+impl Drop for TWDataVectorHelper {
+    fn drop(&mut self) {
+        if self.ptr.is_null() {
+            return;
+        }
+        unsafe { tw_data_vector_delete(self.ptr) }
+    }
+}
diff --git a/rust/tw_memory/src/test_utils/tw_string_helper.rs b/rust/tw_memory/src/test_utils/tw_string_helper.rs
new file mode 100644
index 00000000000..a797a475dd5
--- /dev/null
+++ b/rust/tw_memory/src/test_utils/tw_string_helper.rs
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::ffi::tw_string::{
+    tw_string_create_with_utf8_bytes, tw_string_delete, tw_string_utf8_bytes, TWString,
+};
+use std::ffi::{CStr, CString};
+
+pub struct TWStringHelper {
+    ptr: *mut TWString,
+}
+
+impl TWStringHelper {
+    pub fn create(s: &str) -> TWStringHelper {
+        let cstring = CString::new(s).unwrap();
+        let ptr = unsafe { tw_string_create_with_utf8_bytes(cstring.as_ptr()) };
+        assert!(!ptr.is_null());
+        TWStringHelper { ptr }
+    }
+
+    pub fn wrap(ptr: *mut TWString) -> Self {
+        TWStringHelper { ptr }
+    }
+
+    pub fn ptr(&self) -> *mut TWString {
+        self.ptr
+    }
+
+    pub fn to_string(&self) -> Option<String> {
+        if self.ptr.is_null() {
+            return None;
+        }
+        let c_str = unsafe { tw_string_utf8_bytes(self.ptr) };
+        let str = unsafe { CStr::from_ptr(c_str) }
+            .to_str()
+            .expect("Received an invalid c_str")
+            .to_string();
+        Some(str)
+    }
+}
+
+impl Drop for TWStringHelper {
+    fn drop(&mut self) {
+        if self.ptr.is_null() {
+            return;
+        }
+        unsafe { tw_string_delete(self.ptr) }
+    }
+}
diff --git a/rust/tw_memory/src/test_utils/tw_wrapper.rs b/rust/tw_memory/src/test_utils/tw_wrapper.rs
new file mode 100644
index 00000000000..448b16097e9
--- /dev/null
+++ b/rust/tw_memory/src/test_utils/tw_wrapper.rs
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub trait WithDestructor: Sized {
+    fn destructor() -> unsafe extern "C" fn(*mut Self);
+}
+
+pub struct TWWrapper<T: WithDestructor> {
+    ptr: *mut T,
+}
+
+impl<T: WithDestructor> TWWrapper<T> {
+    pub fn wrap(ptr: *mut T) -> Self {
+        TWWrapper { ptr }
+    }
+
+    pub fn ptr(&self) -> *mut T {
+        self.ptr
+    }
+}
+
+impl<T: WithDestructor> Drop for TWWrapper<T> {
+    fn drop(&mut self) {
+        if self.ptr.is_null() {
+            return;
+        }
+        unsafe { (T::destructor())(self.ptr) }
+    }
+}
diff --git a/rust/tw_memory/tests/c_byte_array_ffi_tests.rs b/rust/tw_memory/tests/c_byte_array_ffi_tests.rs
new file mode 100644
index 00000000000..1fd1655c653
--- /dev/null
+++ b/rust/tw_memory/tests/c_byte_array_ffi_tests.rs
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_memory::ffi::c_byte_array::{free_c_byte_array, CByteArray};
+
+#[test]
+fn test_free_c_byte_array() {
+    unsafe {
+        free_c_byte_array(std::ptr::null_mut());
+
+        let mut raw_array = CByteArray::from(vec![1, 2, 3]);
+        free_c_byte_array(&mut raw_array as *mut CByteArray);
+
+        // The following leads to an undefined behaviour.
+        // free_c_byte_array(raw_array);
+    }
+}
+
+#[test]
+fn test_drop_c_byte_array() {
+    // The memory must be released on `Drop::drop`.
+    let _ = CByteArray::from(vec![1, 2, 3]);
+}
+
+#[test]
+fn test_c_byte_array_into_vec() {
+    // The memory must be valid after `CByteArray::into_vec` and `CByteArray::drop`.
+    let data = unsafe { CByteArray::from(vec![1, 2, 3]).into_vec() };
+    assert_eq!(data, [1, 2, 3]);
+}
diff --git a/rust/tw_memory/tests/c_result_ffi_tests.rs b/rust/tw_memory/tests/c_result_ffi_tests.rs
new file mode 100644
index 00000000000..c4f6ec6ee3e
--- /dev/null
+++ b/rust/tw_memory/tests/c_result_ffi_tests.rs
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_memory::ffi::c_byte_array::{CByteArray, CByteArrayResult};
+use tw_memory::ffi::c_result::{OK_CODE, UNKNOWN_ERROR};
+
+#[test]
+fn test_c_result_unwrap() {
+    let c_res = CByteArrayResult::ok(CByteArray::from(vec![1, 2, 3]));
+    assert!(c_res.is_ok());
+    assert!(!c_res.is_err());
+
+    let actual = unsafe { c_res.unwrap().into_vec() };
+    assert_eq!(actual, [1, 2, 3]);
+}
+
+#[test]
+#[should_panic]
+fn test_c_result_unwrap_error() {
+    let c_res = CByteArrayResult::error(10);
+    // Should panic.
+    c_res.unwrap();
+}
+
+#[test]
+fn test_c_result_error_with_ok_code() {
+    let c_res = CByteArrayResult::error(OK_CODE);
+    assert!(!c_res.is_ok());
+    assert!(c_res.is_err());
+    assert_eq!(c_res.code, UNKNOWN_ERROR);
+}
+
+#[test]
+fn test_c_result_into_result() {
+    let c_res = CByteArrayResult::ok(CByteArray::from(vec![1, 2, 3]));
+    c_res.into_result().unwrap();
+
+    let c_res = CByteArrayResult::error(10);
+    c_res.into_result().unwrap_err();
+}
diff --git a/rust/tw_memory/tests/string_ffi_tests.rs b/rust/tw_memory/tests/string_ffi_tests.rs
new file mode 100644
index 00000000000..6fc739aba6b
--- /dev/null
+++ b/rust/tw_memory/tests/string_ffi_tests.rs
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_memory::c_string_standalone;
+use tw_memory::ffi::free_string;
+
+#[test]
+fn tests_ffi_string() {
+    unsafe {
+        free_string(c_string_standalone("foo"));
+    }
+}
diff --git a/rust/tw_misc/Cargo.toml b/rust/tw_misc/Cargo.toml
new file mode 100644
index 00000000000..49f5b9f0c5d
--- /dev/null
+++ b/rust/tw_misc/Cargo.toml
@@ -0,0 +1,12 @@
+[package]
+name = "tw_misc"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+test-utils = ["serde", "serde_json"]
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"], optional = true }
+serde_json = { version = "1.0", optional = true }
+zeroize = "1.8.1"
diff --git a/rust/tw_misc/src/lib.rs b/rust/tw_misc/src/lib.rs
new file mode 100644
index 00000000000..eeccb7e62b0
--- /dev/null
+++ b/rust/tw_misc/src/lib.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod macros;
+#[cfg(feature = "serde")]
+pub mod serde;
+#[cfg(feature = "test-utils")]
+pub mod test_utils;
+pub mod traits;
diff --git a/rust/tw_misc/src/macros.rs b/rust/tw_misc/src/macros.rs
new file mode 100644
index 00000000000..fb30a98b8d7
--- /dev/null
+++ b/rust/tw_misc/src/macros.rs
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#[macro_export]
+macro_rules! try_or_false {
+    ($exp:expr) => {{
+        match $crate::traits::IntoOption::into_option($exp) {
+            Some(res) => res,
+            None => return false,
+        }
+    }};
+}
+
+#[macro_export]
+macro_rules! try_or_else {
+    ($exp:expr, $or_else:expr) => {{
+        match $crate::traits::IntoOption::into_option($exp) {
+            Some(res) => res,
+            None => return $or_else(),
+        }
+    }};
+}
diff --git a/rust/tw_misc/src/serde.rs b/rust/tw_misc/src/serde.rs
new file mode 100644
index 00000000000..8e81ed4dd74
--- /dev/null
+++ b/rust/tw_misc/src/serde.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde::{Deserialize, Serialize};
+
+pub mod as_string {
+    use serde::de::Error as DeError;
+    use serde::{Deserialize, Deserializer, Serialize, Serializer};
+    use std::fmt;
+    use std::str::FromStr;
+
+    /// Serializes the `value` as a string.
+    pub fn serialize<T, S>(value: &T, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        T: ToString,
+        S: Serializer,
+    {
+        value.to_string().serialize(serializer)
+    }
+
+    /// Deserialize a value from a string.
+    pub fn deserialize<'de, T, D>(deserializer: D) -> Result<T, D::Error>
+    where
+        T: FromStr,
+        T::Err: fmt::Display,
+        D: Deserializer<'de>,
+    {
+        let str = String::deserialize(deserializer)?;
+        T::from_str(&str).map_err(DeError::custom)
+    }
+}
+
+#[derive(Deserialize, Serialize)]
+pub struct Typed<Value> {
+    #[serde(rename = "type")]
+    pub ty: String,
+    pub value: Value,
+}
diff --git a/rust/tw_misc/src/test_utils/json.rs b/rust/tw_misc/src/test_utils/json.rs
new file mode 100644
index 00000000000..06da9d7ed63
--- /dev/null
+++ b/rust/tw_misc/src/test_utils/json.rs
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde_json::Value as Json;
+use std::borrow::Cow;
+
+pub trait ToJson {
+    fn to_json(&self) -> Json;
+}
+
+impl ToJson for Json {
+    #[track_caller]
+    fn to_json(&self) -> Json {
+        self.clone()
+    }
+}
+
+impl<'a> ToJson for Cow<'a, str> {
+    #[track_caller]
+    fn to_json(&self) -> Json {
+        self.as_ref().to_json()
+    }
+}
+
+impl ToJson for String {
+    #[track_caller]
+    fn to_json(&self) -> Json {
+        self.as_str().to_json()
+    }
+}
+
+impl<'a> ToJson for &'a str {
+    #[track_caller]
+    fn to_json(&self) -> Json {
+        serde_json::from_str(self).expect("Error on deserializing JSON from string")
+    }
+}
+
+#[macro_export]
+macro_rules! assert_eq_json {
+    ($left:expr, $right:expr) => {{
+        use $crate::test_utils::json::ToJson;
+
+        let left = $left.to_json();
+        let right = $right.to_json();
+        assert_eq!(left, right);
+    }};
+}
diff --git a/rust/tw_misc/src/test_utils/mod.rs b/rust/tw_misc/src/test_utils/mod.rs
new file mode 100644
index 00000000000..0860fabfa5e
--- /dev/null
+++ b/rust/tw_misc/src/test_utils/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod json;
diff --git a/rust/tw_misc/src/traits.rs b/rust/tw_misc/src/traits.rs
new file mode 100644
index 00000000000..ab1624d5582
--- /dev/null
+++ b/rust/tw_misc/src/traits.rs
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use zeroize::Zeroizing;
+
+pub trait ToBytesVec {
+    fn to_vec(&self) -> Vec<u8>;
+}
+
+impl<T> ToBytesVec for T
+where
+    T: AsRef<[u8]>,
+{
+    fn to_vec(&self) -> Vec<u8> {
+        self.as_ref().to_vec()
+    }
+}
+
+pub trait ToBytesZeroizing {
+    fn to_zeroizing_vec(&self) -> Zeroizing<Vec<u8>>;
+}
+
+pub trait IntoOption<T> {
+    fn into_option(self) -> Option<T>;
+}
+
+impl<T, E> IntoOption<T> for Result<T, E> {
+    fn into_option(self) -> Option<T> {
+        self.ok()
+    }
+}
+
+impl<T> IntoOption<T> for Option<T> {
+    fn into_option(self) -> Option<T> {
+        self
+    }
+}
+
+pub trait FromSlice: for<'a> TryFrom<&'a [u8]> {}
+
+impl<T> FromSlice for T where for<'a> T: TryFrom<&'a [u8]> {}
+
+pub trait OptionalEmpty: Sized {
+    fn empty_or_some(self) -> Option<Self>;
+}
+
+impl OptionalEmpty for String {
+    fn empty_or_some(self) -> Option<Self> {
+        if self.is_empty() {
+            None
+        } else {
+            Some(self)
+        }
+    }
+}
diff --git a/rust/tw_number/Cargo.toml b/rust/tw_number/Cargo.toml
new file mode 100644
index 00000000000..6f32da2d9b1
--- /dev/null
+++ b/rust/tw_number/Cargo.toml
@@ -0,0 +1,20 @@
+[package]
+name = "tw_number"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+arbitrary = ["dep:arbitrary", "primitive-types/arbitrary"]
+default = ["helpers", "serde"]
+helpers = []
+
+[dependencies]
+arbitrary = { version = "1", features = ["derive"], optional = true }
+lazy_static = "1.4.0"
+primitive-types = "0.10.1"
+serde = { version = "1.0", features = ["derive"], optional = true }
+tw_hash = { path = "../tw_hash" }
+tw_memory = { path = "../tw_memory" }
+
+[dev-dependencies]
+tw_encoding = { path = "../tw_encoding" }
diff --git a/rust/tw_number/src/i256.rs b/rust/tw_number/src/i256.rs
new file mode 100644
index 00000000000..3f62160ba27
--- /dev/null
+++ b/rust/tw_number/src/i256.rs
@@ -0,0 +1,454 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{NumberError, NumberResult, Sign, U256};
+use lazy_static::lazy_static;
+use primitive_types::U256 as BaseU256;
+use std::borrow::Cow;
+use std::fmt;
+use std::str::FromStr;
+use tw_hash::H256;
+use tw_memory::Data;
+
+lazy_static! {
+    static ref NEGATIVE_BIT_MASK: BaseU256 = BaseU256::from(1u8) << 255u8;
+    static ref MAX_POSITIVE_ABS: BaseU256 = BaseU256::MAX / 2u64;
+    static ref MAX_NEGATIVE_ABS: BaseU256 = *MAX_POSITIVE_ABS + 1u64;
+}
+
+#[derive(Clone, PartialEq)]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+pub struct I256(BaseU256);
+
+// cbindgen:ignore
+impl I256 {
+    pub const BITS: usize = 256;
+
+    pub fn max() -> I256 {
+        I256(*MAX_POSITIVE_ABS)
+    }
+
+    pub fn min() -> I256 {
+        I256::try_from_sign_and_abs(Sign::Negative, *MAX_NEGATIVE_ABS)
+            .expect("Expected a valid negative abs value")
+    }
+
+    /// Converts the signed 256-bit number to an unsigned 256-bit representation.
+    /// Thus,
+    /// - `1` is [`U256::from(1)`]
+    /// - `0` is [`U256::zero()`]
+    /// - `-1` is [`U256::MAX`]
+    /// - `-2` is [`U256::MAX - 1`]
+    #[inline]
+    pub fn to_u256_repr(&self) -> U256 {
+        U256::from(self.0)
+    }
+
+    /// Constructs a signed 256-bit number from an unsigned 256-bit representation.
+    /// Thus,
+    /// - [`U256::from(1)`] is `1`
+    /// - [`U256::zero()`] is `0`
+    /// - [`U256::MAX`] is `-1`
+    /// - [`U256::MAX - 1`] is `-2`
+    #[inline]
+    pub fn from_u256_repr(unsigned: U256) -> I256 {
+        I256(unsigned.0)
+    }
+
+    /// Constructs a signed 256-bit number from a 256-bit big-endian representation.
+    #[inline]
+    pub fn from_big_endian(data: H256) -> I256 {
+        let inner = primitive_types::U256::from_big_endian(data.as_slice());
+        I256(inner)
+    }
+
+    #[inline]
+    pub fn from_big_endian_slice(data: &[u8]) -> NumberResult<I256> {
+        let u = U256::from_big_endian_slice(data)?;
+        Ok(I256::from_u256_repr(u))
+    }
+
+    #[inline]
+    pub fn to_big_endian(&self) -> H256 {
+        self.to_u256_repr().to_big_endian()
+    }
+
+    #[inline]
+    pub fn to_big_endian_compact(&self) -> Data {
+        self.to_u256_repr().to_big_endian_compact()
+    }
+
+    /// Returns the sign of the integer.
+    pub fn sign(&self) -> Sign {
+        let most_significant_bit = self.0 & *NEGATIVE_BIT_MASK;
+        if most_significant_bit.is_zero() {
+            Sign::Positive
+        } else {
+            Sign::Negative
+        }
+    }
+
+    fn try_from_sign_and_abs(sign: Sign, abs_value: BaseU256) -> NumberResult<Self> {
+        if abs_value.is_zero() {
+            return Ok(I256(abs_value));
+        }
+
+        match sign {
+            Sign::Positive if abs_value > *MAX_POSITIVE_ABS => Err(NumberError::Overflow),
+            Sign::Positive => Ok(I256(abs_value)),
+            Sign::Negative if abs_value > *MAX_NEGATIVE_ABS => Err(NumberError::Overflow),
+            Sign::Negative => {
+                let int = twos_complement(abs_value);
+                Ok(I256(int))
+            },
+        }
+    }
+
+    fn to_sign_and_abs(&self) -> (Sign, BaseU256) {
+        let sign = self.sign();
+        let abs = match sign {
+            Sign::Positive => self.0,
+            Sign::Negative => twos_complement(self.0),
+        };
+        (sign, abs)
+    }
+}
+
+#[cfg(feature = "helpers")]
+impl I256 {
+    #[inline]
+    pub fn encode_be_compact(num: i64) -> Cow<'static, [u8]> {
+        I256::from(num).to_big_endian_compact().into()
+    }
+}
+
+impl TryFrom<I256> for U256 {
+    type Error = NumberError;
+
+    fn try_from(i: I256) -> Result<Self, Self::Error> {
+        let (sign, abs) = i.to_sign_and_abs();
+        if sign.is_negative() {
+            return Err(NumberError::Overflow);
+        }
+        Ok(U256(abs))
+    }
+}
+
+impl TryFrom<U256> for I256 {
+    type Error = NumberError;
+
+    fn try_from(u: U256) -> Result<Self, Self::Error> {
+        I256::try_from_sign_and_abs(Sign::Positive, u.0)
+    }
+}
+
+impl FromStr for I256 {
+    type Err = NumberError;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let (sign, value_str) = match s.strip_prefix('-') {
+            Some(value_str) => (Sign::Negative, value_str),
+            None => (Sign::Positive, s),
+        };
+
+        let abs_value = BaseU256::from_dec_str(value_str)
+            .map_err(|_| NumberError::InvalidStringRepresentation)?;
+        I256::try_from_sign_and_abs(sign, abs_value)
+    }
+}
+
+impl fmt::Debug for I256 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "{self}")
+    }
+}
+
+impl fmt::Display for I256 {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let (sign, abs) = self.to_sign_and_abs();
+        write!(f, "{sign}{abs}")
+    }
+}
+
+#[cfg(feature = "serde")]
+mod impl_serde {
+    use super::I256;
+    use serde::de::Error as DeError;
+    use serde::{Deserialize, Deserializer, Serializer};
+    use std::str::FromStr;
+
+    impl I256 {
+        pub fn as_decimal_str<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            serializer.serialize_str(&self.to_string())
+        }
+
+        pub fn from_decimal_str<'de, D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            let s: &str = Deserialize::deserialize(deserializer)?;
+            I256::from_str(s).map_err(|e| DeError::custom(format!("{e:?}")))
+        }
+
+        pub fn from_i64_or_decimal_str<'de, D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            crate::serde_common::from_num_or_decimal_str::<'de, I256, i64, D>(deserializer)
+        }
+    }
+}
+
+macro_rules! impl_map_from_signed {
+    ($int:ty) => {
+        impl From<$int> for I256 {
+            fn from(int: $int) -> Self {
+                let sign = if int >= 0 {
+                    Sign::Positive
+                } else {
+                    Sign::Negative
+                };
+                let abs_value = match int.overflowing_abs() {
+                    (_, true) => BaseU256::from(<$int>::MAX) + 1u64,
+                    (abs_i, false) => BaseU256::from(abs_i),
+                };
+                I256::try_from_sign_and_abs(sign, abs_value).expect("Unexpected overflow")
+            }
+        }
+    };
+}
+
+macro_rules! impl_map_from_unsigned {
+    ($uint:ty) => {
+        impl From<$uint> for I256 {
+            fn from(uint: $uint) -> Self {
+                I256(BaseU256::from(uint))
+            }
+        }
+    };
+}
+
+impl_map_from_signed!(i8);
+impl_map_from_signed!(i16);
+impl_map_from_signed!(i32);
+impl_map_from_signed!(i64);
+
+impl_map_from_unsigned!(u8);
+impl_map_from_unsigned!(u16);
+impl_map_from_unsigned!(u32);
+impl_map_from_unsigned!(u64);
+
+/// Compute the [two's complement](https://en.wikipedia.org/wiki/Two%27s_complement) of this number.
+fn twos_complement(abs_value: BaseU256) -> BaseU256 {
+    let (value, _overflowed) = (!abs_value).overflowing_add(BaseU256::from(1u64));
+    value
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    fn test_i256_from_str_impl(dec_str: &str, expected: BaseU256) {
+        let i256 = I256::from_str(dec_str).unwrap();
+        assert_eq!(i256.0, expected, "{}", dec_str);
+    }
+
+    fn test_i256_display_impl(base_u: BaseU256, expected: &str) {
+        assert_eq!(I256(base_u).to_string(), expected);
+    }
+
+    fn test_i256_from_impl<I>(int: I, expected_base: BaseU256)
+    where
+        I256: From<I>,
+    {
+        assert_eq!(I256::from(int), I256(expected_base));
+    }
+
+    fn test_i256_to_u256<I>(int: I, expected: U256)
+    where
+        I256: From<I>,
+    {
+        assert_eq!(U256::try_from(I256::from(int)).unwrap(), expected);
+    }
+
+    #[track_caller]
+    fn test_i256_to_u256_error<I>(int: I)
+    where
+        I256: From<I>,
+    {
+        let int = I256::from(int);
+        U256::try_from(int).unwrap_err();
+    }
+
+    #[track_caller]
+    fn test_i256_from_u256(uint: BaseU256) {
+        let int = I256::try_from(U256::from(uint)).unwrap();
+        assert_eq!(int.0, uint);
+    }
+
+    #[track_caller]
+    fn test_i256_from_u256_error(uint: BaseU256) {
+        I256::try_from(U256::from(uint)).unwrap_err();
+    }
+
+    #[test]
+    fn test_i256_from_str() {
+        test_i256_from_str_impl(
+            "57896044618658097711785492504343953926634992332820282019728792003956564819967",
+            *MAX_POSITIVE_ABS,
+        );
+        test_i256_from_str_impl("2", BaseU256::from(2u8));
+        test_i256_from_str_impl("1", BaseU256::from(1u8));
+        test_i256_from_str_impl("0", BaseU256::zero());
+        test_i256_from_str_impl("-0", BaseU256::zero());
+        test_i256_from_str_impl("-1", BaseU256::MAX);
+        test_i256_from_str_impl("-2", BaseU256::MAX - 1);
+        test_i256_from_str_impl("-3", BaseU256::MAX - 2);
+        test_i256_from_str_impl(
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819967",
+            *MAX_NEGATIVE_ABS + 1,
+        );
+        test_i256_from_str_impl(
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819968",
+            *MAX_NEGATIVE_ABS,
+        );
+    }
+
+    #[test]
+    fn test_i256_from_str_negative() {
+        test_i256_from_str_impl("-0", BaseU256::zero());
+        test_i256_from_str_impl("-1", BaseU256::MAX);
+        test_i256_from_str_impl("-2", BaseU256::MAX - 1);
+        test_i256_from_str_impl("-3", BaseU256::MAX - 2);
+        test_i256_from_str_impl(
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819967",
+            *MAX_NEGATIVE_ABS + 1,
+        );
+        test_i256_from_str_impl(
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819968",
+            *MAX_NEGATIVE_ABS,
+        );
+    }
+
+    #[test]
+    fn test_i256_from_str_overflow() {
+        let invalid = [
+            "57896044618658097711785492504343953926634992332820282019728792003956564819968",
+            "57896044618658097711785492504343953926634992332820282019728792003956564819969",
+            "115792089237316195423570985008687907853269984665640564039457584007913129639935",
+        ];
+        for num_str in invalid {
+            I256::from_str(num_str).expect_err(num_str);
+        }
+    }
+
+    #[test]
+    fn test_i256_from_str_negative_overflow() {
+        let invalid = [
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819969",
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819970",
+            "-115792089237316195423570985008687907853269984665640564039457584007913129639935",
+        ];
+        for num_str in invalid {
+            I256::from_str(num_str).expect_err(num_str);
+        }
+    }
+
+    #[test]
+    fn test_i256_display() {
+        test_i256_display_impl(BaseU256::zero(), "0");
+        test_i256_display_impl(BaseU256::from(1u64), "1");
+        test_i256_display_impl(BaseU256::from(2u64), "2");
+        test_i256_display_impl(BaseU256::from(10u64), "10");
+        test_i256_display_impl(
+            *MAX_POSITIVE_ABS,
+            "57896044618658097711785492504343953926634992332820282019728792003956564819967",
+        );
+    }
+
+    #[test]
+    fn test_i256_display_negative() {
+        test_i256_display_impl(BaseU256::MAX, "-1");
+        test_i256_display_impl(BaseU256::MAX - 1, "-2");
+        test_i256_display_impl(BaseU256::MAX - 9, "-10");
+        test_i256_display_impl(
+            *MAX_NEGATIVE_ABS + 1,
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819967",
+        );
+        test_i256_display_impl(
+            *MAX_NEGATIVE_ABS,
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819968",
+        );
+    }
+
+    #[test]
+    fn test_i256_from_unsigned() {
+        test_i256_from_impl(0u16, BaseU256::zero());
+        test_i256_from_impl(1u16, BaseU256::from(1u64));
+        test_i256_from_impl(10u16, BaseU256::from(10u64));
+    }
+
+    #[test]
+    fn test_i256_from_positive() {
+        test_i256_from_impl(0i16, BaseU256::zero());
+        test_i256_from_impl(1i16, BaseU256::from(1u64));
+        test_i256_from_impl(10i16, BaseU256::from(10u64));
+        test_i256_from_impl(i16::MAX, BaseU256::from(i16::MAX as u64));
+    }
+
+    #[test]
+    fn test_i256_from_negative() {
+        test_i256_from_impl(-1i8, BaseU256::MAX);
+        test_i256_from_impl(-2i8, BaseU256::MAX - 1u64);
+        test_i256_from_impl(-10i8, BaseU256::MAX - 9u64);
+        test_i256_from_impl(i8::MIN + 1, BaseU256::MAX - i8::MAX + 1);
+        test_i256_from_impl(i8::MIN, BaseU256::MAX - i8::MAX);
+        test_i256_from_impl(i64::MIN + 1, BaseU256::MAX - i64::MAX + 1);
+        test_i256_from_impl(i64::MIN, BaseU256::MAX - i64::MAX);
+    }
+
+    #[test]
+    fn test_i256_try_to_u256() {
+        test_i256_to_u256(0i64, U256::from(0u64));
+        test_i256_to_u256(1i64, U256::from(1u64));
+        test_i256_to_u256(I256::max(), U256::from(BaseU256::MAX / 2));
+    }
+
+    #[test]
+    fn test_i256_try_to_u256_error() {
+        test_i256_to_u256_error(-1i64);
+        test_i256_to_u256_error(-10i64);
+        test_i256_to_u256_error(i64::MIN);
+    }
+
+    #[test]
+    fn test_i256_try_from_u256() {
+        test_i256_from_u256(BaseU256::zero());
+        test_i256_from_u256(BaseU256::from(1));
+        test_i256_from_u256(BaseU256::from(10));
+        test_i256_from_u256(BaseU256::MAX / 2);
+    }
+
+    #[test]
+    fn test_i256_try_from_u256_error() {
+        test_i256_from_u256_error(BaseU256::MAX - 1);
+        test_i256_from_u256_error(BaseU256::MAX / 2 + 1);
+        test_i256_from_u256_error(BaseU256::MAX);
+    }
+
+    #[test]
+    fn test_i256_max_min() {
+        assert_eq!(
+            I256::max().to_string(),
+            "57896044618658097711785492504343953926634992332820282019728792003956564819967"
+        );
+        assert_eq!(
+            I256::min().to_string(),
+            "-57896044618658097711785492504343953926634992332820282019728792003956564819968"
+        );
+    }
+}
diff --git a/rust/tw_number/src/lib.rs b/rust/tw_number/src/lib.rs
new file mode 100644
index 00000000000..0c8189ba13d
--- /dev/null
+++ b/rust/tw_number/src/lib.rs
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod i256;
+mod sign;
+mod u256;
+
+pub use i256::I256;
+pub use sign::Sign;
+pub use u256::U256;
+
+pub type NumberResult<T> = Result<T, NumberError>;
+
+#[derive(Debug, PartialEq)]
+pub enum NumberError {
+    IntegerOverflow,
+    InvalidBinaryRepresentation,
+    InvalidStringRepresentation,
+    Overflow,
+}
+
+#[cfg(feature = "serde")]
+pub(crate) mod serde_common {
+    use crate::NumberError;
+    use serde::de::Error as DeError;
+    use serde::{Deserialize, Deserializer};
+    use std::str::FromStr;
+
+    #[derive(Deserialize)]
+    #[serde(untagged)]
+    enum NumOrStr<Num> {
+        Num(Num),
+        Str(String),
+    }
+
+    pub(crate) fn from_num_or_decimal_str<'de, T, Num, D>(deserializer: D) -> Result<T, D::Error>
+    where
+        D: Deserializer<'de>,
+        T: From<Num> + FromStr<Err = NumberError>,
+        Num: Deserialize<'de>,
+    {
+        let num_or_str: NumOrStr<Num> = NumOrStr::deserialize(deserializer)?;
+        match num_or_str {
+            NumOrStr::Num(num) => Ok(T::from(num)),
+            NumOrStr::Str(s) => T::from_str(&s).map_err(|e| DeError::custom(format!("{e:?}"))),
+        }
+    }
+}
diff --git a/rust/tw_number/src/sign.rs b/rust/tw_number/src/sign.rs
new file mode 100644
index 00000000000..a6f70a9d4fd
--- /dev/null
+++ b/rust/tw_number/src/sign.rs
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::fmt;
+
+/// Represents a sign of an integer.
+pub enum Sign {
+    Positive,
+    Negative,
+}
+
+impl Sign {
+    /// Returns whether the sign is positive.
+    #[inline]
+    pub fn is_positive(&self) -> bool {
+        matches!(self, Sign::Positive)
+    }
+
+    /// Returns whether the sign is negative.
+    #[inline]
+    pub fn is_negative(&self) -> bool {
+        !self.is_positive()
+    }
+
+    /// Returns the sign character.
+    #[inline]
+    pub fn as_char(&self) -> char {
+        match self {
+            Sign::Positive => '+',
+            Sign::Negative => '-',
+        }
+    }
+}
+
+impl fmt::Display for Sign {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match (self, f.sign_plus()) {
+            (Self::Positive, false) => Ok(()),
+            _ => write!(f, "{}", self.as_char()),
+        }
+    }
+}
diff --git a/rust/tw_number/src/u256.rs b/rust/tw_number/src/u256.rs
new file mode 100644
index 00000000000..1b2d2df4c17
--- /dev/null
+++ b/rust/tw_number/src/u256.rs
@@ -0,0 +1,263 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::{NumberError, NumberResult};
+use std::borrow::Cow;
+use std::fmt;
+use std::fmt::Formatter;
+use std::ops::Add;
+use std::str::FromStr;
+use tw_hash::H256;
+use tw_memory::Data;
+
+#[derive(Copy, Clone, Debug, Default, PartialEq)]
+#[cfg_attr(feature = "arbitrary", derive(arbitrary::Arbitrary))]
+pub struct U256(pub(crate) primitive_types::U256);
+
+impl From<primitive_types::U256> for U256 {
+    #[inline]
+    fn from(num: primitive_types::U256) -> Self {
+        U256(num)
+    }
+}
+
+impl From<U256> for primitive_types::U256 {
+    #[inline]
+    fn from(num: U256) -> Self {
+        num.0
+    }
+}
+
+// cbindgen:ignore
+impl U256 {
+    pub const WORDS_COUNT: usize = 4;
+    pub const BYTES: usize = U256::WORDS_COUNT * 8;
+    pub const BITS: usize = 256;
+    pub const MAX: U256 = U256(primitive_types::U256::MAX);
+    pub const ZERO: U256 = U256::zero();
+
+    #[inline]
+    pub const fn zero() -> U256 {
+        U256(primitive_types::U256::zero())
+    }
+
+    #[inline]
+    pub fn from_little_endian(data: H256) -> U256 {
+        let inner = primitive_types::U256::from_little_endian(data.as_slice());
+        U256::from(inner)
+    }
+
+    #[inline]
+    pub fn from_big_endian(data: H256) -> U256 {
+        let inner = primitive_types::U256::from_big_endian(data.as_slice());
+        U256::from(inner)
+    }
+
+    #[inline]
+    pub fn from_big_endian_slice(data: &[u8]) -> NumberResult<U256> {
+        if data.len() > Self::BYTES {
+            return Err(NumberError::InvalidBinaryRepresentation);
+        }
+        let inner = primitive_types::U256::from_big_endian(data);
+        Ok(U256::from(inner))
+    }
+
+    #[inline]
+    pub fn from_little_endian_slice(data: &[u8]) -> NumberResult<U256> {
+        if data.len() > Self::BYTES {
+            return Err(NumberError::InvalidBinaryRepresentation);
+        }
+        let inner = primitive_types::U256::from_little_endian(data);
+        Ok(U256::from(inner))
+    }
+
+    #[inline]
+    pub fn to_little_endian(&self) -> H256 {
+        let mut res = H256::default();
+        self.0.to_little_endian(res.as_mut_slice());
+        res
+    }
+
+    pub fn to_little_endian_compact(&self) -> Data {
+        let leading_zero_bytes = self.leading_zero_bytes();
+        let zero_bytes_start_at = U256::BYTES - leading_zero_bytes;
+        let bytes = self.to_little_endian();
+        bytes[..zero_bytes_start_at].to_vec()
+    }
+
+    #[inline]
+    pub fn to_big_endian(&self) -> H256 {
+        let mut res = H256::default();
+        self.0.to_big_endian(res.as_mut_slice());
+        res
+    }
+
+    pub fn to_big_endian_compact(&self) -> Data {
+        let leading_zero_bytes = self.leading_zero_bytes();
+        let bytes = self.to_big_endian();
+        bytes[leading_zero_bytes..].to_vec()
+    }
+
+    pub fn to_big_endian_compact_min_len(&self, min_len: usize) -> Data {
+        let bytes = self.to_big_endian_compact();
+
+        if min_len > bytes.len() {
+            let mut output = vec![0; min_len];
+            let starts_at = min_len - bytes.len();
+            output[starts_at..min_len].copy_from_slice(bytes.as_slice());
+            return output;
+        }
+
+        bytes
+    }
+
+    #[inline]
+    pub fn is_zero(&self) -> bool {
+        self.0.is_zero()
+    }
+
+    #[inline]
+    pub fn bits(&self) -> usize {
+        self.0.bits()
+    }
+
+    #[inline]
+    pub fn low_u8(&self) -> u8 {
+        let lowest_byte_idx = 0;
+        self.0.byte(lowest_byte_idx)
+    }
+
+    /// Checked addition. Returns `NumberError::IntegerOverflow` if overflow occurred.
+    #[inline]
+    pub fn checked_add<T>(&self, rhs: T) -> NumberResult<U256>
+    where
+        T: Into<primitive_types::U256>,
+    {
+        let rhs = rhs.into();
+        self.0
+            .checked_add(rhs)
+            .map(U256)
+            .ok_or(NumberError::IntegerOverflow)
+    }
+
+    #[inline]
+    fn leading_zero_bytes(&self) -> usize {
+        U256::BYTES - (self.0.bits() + 7) / 8
+    }
+}
+
+#[cfg(feature = "helpers")]
+impl U256 {
+    #[inline]
+    pub fn encode_be_compact(num: u64) -> Cow<'static, [u8]> {
+        U256::from(num).to_big_endian_compact().into()
+    }
+}
+
+impl FromStr for U256 {
+    type Err = NumberError;
+
+    #[inline]
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        let inner = if s.starts_with("0x") {
+            primitive_types::U256::from_str(s)
+                .map_err(|_| NumberError::InvalidStringRepresentation)?
+        } else {
+            primitive_types::U256::from_dec_str(s)
+                .map_err(|_| NumberError::InvalidStringRepresentation)?
+        };
+        Ok(U256(inner))
+    }
+}
+
+impl fmt::Display for U256 {
+    #[inline]
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "{}", self.0)
+    }
+}
+
+/// Implements `Add<u8>`, `Add<u16>` etc for [U256].
+impl<T> Add<T> for U256
+where
+    T: Into<primitive_types::U256>,
+{
+    type Output = U256;
+
+    #[inline]
+    fn add(self, rhs: T) -> Self::Output {
+        U256(self.0 + rhs.into())
+    }
+}
+
+#[cfg(feature = "serde")]
+mod impl_serde {
+    use super::U256;
+    use serde::de::Error as DeError;
+    use serde::{Deserialize, Deserializer, Serializer};
+    use std::str::FromStr;
+
+    impl U256 {
+        pub fn as_decimal_str<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+        where
+            S: Serializer,
+        {
+            serializer.serialize_str(&self.to_string())
+        }
+
+        pub fn from_decimal_str<'de, D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            let s: &str = Deserialize::deserialize(deserializer)?;
+            U256::from_str(s).map_err(|e| DeError::custom(format!("{e:?}")))
+        }
+
+        pub fn from_u64_or_decimal_str<'de, D>(deserializer: D) -> Result<Self, D::Error>
+        where
+            D: Deserializer<'de>,
+        {
+            crate::serde_common::from_num_or_decimal_str::<'de, U256, u64, D>(deserializer)
+        }
+    }
+}
+
+macro_rules! impl_map_from {
+    ($u:ty, $int:ty) => {
+        impl From<$int> for $u {
+            fn from(int: $int) -> $u {
+                <$u>::from(primitive_types::U256::from(int))
+            }
+        }
+
+        impl TryFrom<$u> for $int {
+            type Error = NumberError;
+
+            fn try_from(u: $u) -> Result<Self, Self::Error> {
+                <$int>::try_from(u.0).map_err(|_| NumberError::IntegerOverflow)
+            }
+        }
+    };
+}
+
+impl_map_from!(U256, u8);
+impl_map_from!(U256, u16);
+impl_map_from!(U256, u32);
+impl_map_from!(U256, u64);
+impl_map_from!(U256, usize);
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn test_u256_from_str() {
+        assert_eq!(U256::from_str("0x0"), Ok(U256::zero()));
+        assert_eq!(U256::from_str("0x00"), Ok(U256::zero()));
+        assert_eq!(U256::from_str("0x01"), Ok(U256::from(1_u64)));
+        assert_eq!(U256::from_str("0x2"), Ok(U256::from(2_u64)));
+        assert_eq!(U256::from_str("0x0000a"), Ok(U256::from(10_u64)));
+        assert_eq!(U256::from_str("4"), Ok(U256::from(4_u64)));
+    }
+}
diff --git a/rust/tw_number/tests/u256.rs b/rust/tw_number/tests/u256.rs
new file mode 100644
index 00000000000..c411915cc5f
--- /dev/null
+++ b/rust/tw_number/tests/u256.rs
@@ -0,0 +1,206 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::str::FromStr;
+use tw_encoding::hex;
+use tw_encoding::hex::ToHex;
+use tw_hash::H256;
+use tw_number::U256;
+
+struct TestCase {
+    num_str: &'static str,
+    little_endian_compact: &'static str,
+    little_endian: &'static str,
+    big_endian_compact: &'static str,
+    big_endian: &'static str,
+}
+
+const TEST_CASES: &[TestCase] = &[
+    TestCase {
+        num_str: "0",
+        little_endian_compact: "",
+        little_endian: "0000000000000000000000000000000000000000000000000000000000000000",
+        big_endian_compact: "",
+        big_endian: "0000000000000000000000000000000000000000000000000000000000000000",
+    },
+    TestCase {
+        num_str: "1",
+        little_endian_compact: "01",
+        little_endian: "0100000000000000000000000000000000000000000000000000000000000000",
+        big_endian_compact: "01",
+        big_endian: "0000000000000000000000000000000000000000000000000000000000000001",
+    },
+    TestCase {
+        num_str: "7",
+        little_endian_compact: "07",
+        little_endian: "0700000000000000000000000000000000000000000000000000000000000000",
+        big_endian_compact: "07",
+        big_endian: "0000000000000000000000000000000000000000000000000000000000000007",
+    },
+    TestCase {
+        num_str: "100",
+        little_endian_compact: "64",
+        little_endian: "6400000000000000000000000000000000000000000000000000000000000000",
+        big_endian_compact: "64",
+        big_endian: "0000000000000000000000000000000000000000000000000000000000000064",
+    },
+    TestCase {
+        num_str: "255",
+        little_endian_compact: "ff",
+        little_endian: "ff00000000000000000000000000000000000000000000000000000000000000",
+        big_endian_compact: "ff",
+        big_endian: "00000000000000000000000000000000000000000000000000000000000000ff",
+    },
+    TestCase {
+        num_str: "256",
+        little_endian_compact: "0001",
+        little_endian: "0001000000000000000000000000000000000000000000000000000000000000",
+        big_endian_compact: "0100",
+        big_endian: "0000000000000000000000000000000000000000000000000000000000000100",
+    },
+    TestCase {
+        num_str: "1000000",
+        little_endian_compact: "40420f",
+        little_endian: "40420f0000000000000000000000000000000000000000000000000000000000",
+        big_endian_compact: "0f4240",
+        big_endian: "00000000000000000000000000000000000000000000000000000000000f4240",
+    },
+    TestCase {
+        num_str: "20000000000",
+        little_endian_compact: "00c817a804",
+        little_endian: "00c817a804000000000000000000000000000000000000000000000000000000",
+        big_endian_compact: "04a817c800",
+        big_endian: "00000000000000000000000000000000000000000000000000000004a817c800",
+    },
+    TestCase {
+        num_str: "1311768467463790320",
+        little_endian_compact: "f0debc9a78563412",
+        little_endian: "f0debc9a78563412000000000000000000000000000000000000000000000000",
+        big_endian_compact: "123456789abcdef0",
+        big_endian: "000000000000000000000000000000000000000000000000123456789abcdef0",
+    },
+    TestCase {
+        num_str: "94522879700260683142460330790866415",
+        little_endian_compact: "efcdab89674523f1debc9a78563412",
+        little_endian: "efcdab89674523f1debc9a785634120000000000000000000000000000000000",
+        big_endian_compact: "123456789abcdef123456789abcdef",
+        big_endian: "0000000000000000000000000000000000123456789abcdef123456789abcdef",
+    },
+    TestCase {
+        num_str: "91343852333181432387730302044767688728495783936",
+        little_endian_compact: "0000000000000000000000000000000000000010",
+        little_endian: "0000000000000000000000000000000000000010000000000000000000000000",
+        big_endian_compact: "1000000000000000000000000000000000000000",
+        big_endian: "0000000000000000000000001000000000000000000000000000000000000000",
+    },
+    TestCase {
+        num_str: "18515461264373351373200002665853028612451056578545711640558177340181847433846",
+        little_endian_compact: "766263aa200659e163ff713c5da1e1036086677553fe9521bc39d90b3461ef28",
+        little_endian: "766263aa200659e163ff713c5da1e1036086677553fe9521bc39d90b3461ef28",
+        big_endian_compact: "28ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276",
+        big_endian: "28ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276",
+    },
+];
+
+#[test]
+fn test_u256_big_endian_compact() {
+    for test in TEST_CASES {
+        let bytes = hex::decode(test.big_endian_compact).unwrap();
+        let num = U256::from_big_endian_slice(bytes.as_slice()).unwrap();
+
+        assert_eq!(num.to_string(), test.num_str);
+
+        let actual_hex_encoded = hex::encode(num.to_big_endian_compact(), false);
+        assert_eq!(actual_hex_encoded, test.big_endian_compact);
+    }
+}
+
+#[test]
+fn test_u256_big_endian() {
+    for test in TEST_CASES {
+        let bytes = H256::from_str(test.big_endian).unwrap();
+        let num = U256::from_big_endian(bytes);
+
+        assert_eq!(num.to_string(), test.num_str);
+
+        let actual_bytes = num.to_big_endian();
+        assert_eq!(actual_bytes, bytes);
+    }
+}
+
+#[test]
+fn test_u256_little_endian_compact() {
+    for test in TEST_CASES {
+        let bytes = hex::decode(test.little_endian_compact).unwrap();
+        let num = U256::from_little_endian_slice(bytes.as_slice()).unwrap();
+
+        assert_eq!(num.to_string(), test.num_str);
+
+        let actual_hex_encoded = hex::encode(num.to_little_endian_compact(), false);
+        assert_eq!(actual_hex_encoded, test.little_endian_compact);
+    }
+}
+
+#[test]
+fn test_u256_little_endian() {
+    for test in TEST_CASES {
+        let bytes = H256::from_str(test.little_endian).unwrap();
+        let num = U256::from_little_endian(bytes);
+
+        assert_eq!(num.to_string(), test.num_str);
+
+        let actual_bytes = num.to_little_endian();
+        assert_eq!(actual_bytes, bytes);
+    }
+}
+
+#[test]
+fn test_u256_from_str() {
+    for test in TEST_CASES {
+        let bytes = H256::from_str(test.little_endian).unwrap();
+        let num = U256::from_little_endian(bytes);
+
+        let actual = U256::from_str(test.num_str).unwrap();
+        assert_eq!(num, actual);
+    }
+}
+
+#[test]
+fn test_u256_big_endian_min_len() {
+    // 0x0100
+    let num = U256::from(256_u64);
+
+    let num_0 = num.to_big_endian_compact_min_len(0);
+    assert_eq!(hex::encode(num_0, false), "0100");
+
+    let num_1 = num.to_big_endian_compact_min_len(1);
+    assert_eq!(hex::encode(num_1, false), "0100");
+
+    let num_2 = num.to_big_endian_compact_min_len(2);
+    assert_eq!(hex::encode(num_2, false), "0100");
+
+    let num_3 = num.to_big_endian_compact_min_len(3);
+    assert_eq!(num_3.to_hex(), "000100");
+
+    let num_20 = num.to_big_endian_compact_min_len(20);
+    assert_eq!(num_20.to_hex(), "0000000000000000000000000000000000000100");
+
+    let num_32 = num.to_big_endian_compact_min_len(32);
+    assert_eq!(
+        num_32.to_hex(),
+        "0000000000000000000000000000000000000000000000000000000000000100"
+    );
+
+    let num_33 = num.to_big_endian_compact_min_len(33);
+    assert_eq!(
+        num_33.to_hex(),
+        "000000000000000000000000000000000000000000000000000000000000000100"
+    );
+
+    let num_64 = num.to_big_endian_compact_min_len(64);
+    assert_eq!(
+        num_64.to_hex(),
+        "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100"
+    );
+}
diff --git a/rust/tw_proto/Cargo.toml b/rust/tw_proto/Cargo.toml
new file mode 100644
index 00000000000..3e80de2c895
--- /dev/null
+++ b/rust/tw_proto/Cargo.toml
@@ -0,0 +1,15 @@
+[package]
+name = "tw_proto"
+version = "0.1.0"
+edition = "2021"
+
+[features]
+fuzz = ["arbitrary"]
+
+[dependencies]
+# Enable in fuzz tests only!
+arbitrary = { version = "1", features = ["derive"], optional = true }
+quick-protobuf = "0.8.1"
+
+[build-dependencies]
+pb-rs = "0.10.0"
diff --git a/rust/tw_proto/build.rs b/rust/tw_proto/build.rs
new file mode 100644
index 00000000000..83b73253681
--- /dev/null
+++ b/rust/tw_proto/build.rs
@@ -0,0 +1,103 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use pb_rs::types::FileDescriptor;
+use pb_rs::ConfigBuilder;
+#[cfg(feature = "fuzz")]
+use std::io::{self, Read, Write};
+use std::path::{Path, PathBuf};
+use std::{env, fs};
+
+fn main() {
+    let proto_ext = Some(Path::new("proto").as_os_str());
+
+    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap()).join("proto");
+
+    let proto_dir = PathBuf::from(env::var("CARGO_MANIFEST_DIR").unwrap())
+        .join("..")
+        .join("..")
+        .join("src")
+        .join("proto");
+    let proto_dir_str = proto_dir.to_str().expect("Invalid proto directory path");
+    // Re-run this build.rs if the `proto` directory has been changed (i.e. a new file is added).
+    println!("cargo:rerun-if-changed={}", proto_dir_str);
+
+    let protos: Vec<_> = fs::read_dir(&proto_dir)
+        .expect("Expected a valid directory with proto files")
+        .filter_map(|file| {
+            let file = file.ok()?;
+            if file.path().extension() != proto_ext {
+                return None;
+            }
+
+            let path = file.path();
+            let path_str = path.to_str().expect("Invalid Proto file name");
+            println!("cargo:rerun-if-changed={}", path_str);
+            Some(path)
+        })
+        .collect();
+
+    // Delete all old generated files before re-generating new ones
+    if out_dir.exists() {
+        fs::remove_dir_all(&out_dir).expect("Error removing out directory");
+    }
+    fs::DirBuilder::new()
+        .create(&out_dir)
+        .expect("Error creating out directory");
+
+    let out_protos = ConfigBuilder::new(&protos, None, Some(&out_dir), &[proto_dir])
+        .expect("Error configuring pb-rs builder")
+        .build();
+    FileDescriptor::run(&out_protos).expect("Error generating proto files");
+
+    #[cfg(feature = "fuzz")]
+    add_custom_derives(&out_dir, &["arbitrary::Arbitrary"])
+        .expect("Error on adding 'arbitrary::Arbitrary' derive");
+}
+
+/// Unfortunately, `pb-rs` does not provide a proper support of custom derives.
+/// [`ConfigBuilder::custom_struct_derive`] adds the derive macroses for structs only,
+/// however they should be added for enums too.
+/// Issues: https://github.com/tafia/quick-protobuf/issues/195, https://github.com/tafia/quick-protobuf/issues/212
+#[cfg(feature = "fuzz")]
+fn add_custom_derives(out_dir: &Path, custom_derives: &[&str]) -> io::Result<()> {
+    // Debug is derived for all generated types.
+    let pattern = "#[derive(Debug";
+    let replace_with = format!("#[derive(Debug, {}", custom_derives.join(", "));
+
+    let tw_dir = out_dir.join("TW");
+    for blockchain_dir in tw_dir.read_dir()? {
+        let blockchain_dir = blockchain_dir?.path();
+
+        // There can be `mod.rs` files. Skip them.
+        if !blockchain_dir.is_dir() {
+            continue;
+        }
+
+        let blockchain_proto = blockchain_dir.join("Proto.rs");
+        replace_proto_content(&blockchain_proto, pattern, &replace_with)?;
+    }
+
+    Ok(())
+}
+
+#[cfg(feature = "fuzz")]
+fn replace_proto_content(path_to_file: &Path, pattern: &str, replace_with: &str) -> io::Result<()> {
+    let proto_content = {
+        let mut proto_file = fs::File::open(path_to_file)?;
+
+        let mut proto_content = String::new();
+        proto_file.read_to_string(&mut proto_content)?;
+
+        proto_content
+    };
+
+    let upgraded_proto_content = proto_content.replace(pattern, &replace_with);
+
+    let mut file = fs::OpenOptions::new()
+        .write(true)
+        .truncate(true)
+        .open(&path_to_file)?;
+    file.write_all(upgraded_proto_content.as_bytes())
+}
diff --git a/rust/tw_proto/src/common/google/mod.rs b/rust/tw_proto/src/common/google/mod.rs
new file mode 100644
index 00000000000..11b986a38f3
--- /dev/null
+++ b/rust/tw_proto/src/common/google/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod protobuf;
diff --git a/rust/tw_proto/src/common/google/protobuf/any.proto b/rust/tw_proto/src/common/google/protobuf/any.proto
new file mode 100644
index 00000000000..c7aa5a0baa1
--- /dev/null
+++ b/rust/tw_proto/src/common/google/protobuf/any.proto
@@ -0,0 +1,169 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Source (any): https://github.com/protocolbuffers/protobuf/blob/8bf4fe924a924e0ee290bf883977c108fc12f28d/src/google/protobuf/any.proto
+// To recompile the file use the following command inside `wallet-core` directory:
+// ```
+// cargo install pb-rs
+// pb-rs --dont_use_cow --single-mod --output_directory rust/tw_proto/common_proto/google/protobuf/ rust/tw_proto/common_proto/google/protobuf/any.proto
+// ```
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option go_package = "google.golang.org/protobuf/types/known/anypb";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "AnyProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+
+// `Any` contains an arbitrary serialized protocol buffer message along with a
+// URL that describes the type of the serialized message.
+//
+// Protobuf library provides support to pack/unpack Any values in the form
+// of utility functions or additional generated methods of the Any type.
+//
+// Example 1: Pack and unpack a message in C++.
+//
+//     Foo foo = ...;
+//     Any any;
+//     any.PackFrom(foo);
+//     ...
+//     if (any.UnpackTo(&foo)) {
+//       ...
+//     }
+//
+// Example 2: Pack and unpack a message in Java.
+//
+//     Foo foo = ...;
+//     Any any = Any.pack(foo);
+//     ...
+//     if (any.is(Foo.class)) {
+//       foo = any.unpack(Foo.class);
+//     }
+//     // or ...
+//     if (any.isSameTypeAs(Foo.getDefaultInstance())) {
+//       foo = any.unpack(Foo.getDefaultInstance());
+//     }
+//
+//  Example 3: Pack and unpack a message in Python.
+//
+//     foo = Foo(...)
+//     any = Any()
+//     any.Pack(foo)
+//     ...
+//     if any.Is(Foo.DESCRIPTOR):
+//       any.Unpack(foo)
+//       ...
+//
+//  Example 4: Pack and unpack a message in Go
+//
+//      foo := &pb.Foo{...}
+//      any, err := anypb.New(foo)
+//      if err != nil {
+//        ...
+//      }
+//      ...
+//      foo := &pb.Foo{}
+//      if err := any.UnmarshalTo(foo); err != nil {
+//        ...
+//      }
+//
+// The pack methods provided by protobuf library will by default use
+// 'type.googleapis.com/full.type.name' as the type URL and the unpack
+// methods only use the fully qualified type name after the last '/'
+// in the type URL, for example "foo.bar.com/x/y.z" will yield type
+// name "y.z".
+//
+// JSON
+// ====
+// The JSON representation of an `Any` value uses the regular
+// representation of the deserialized, embedded message, with an
+// additional field `@type` which contains the type URL. Example:
+//
+//     package google.profile;
+//     message Person {
+//       string first_name = 1;
+//       string last_name = 2;
+//     }
+//
+//     {
+//       "@type": "type.googleapis.com/google.profile.Person",
+//       "firstName": <string>,
+//       "lastName": <string>
+//     }
+//
+// If the embedded message type is well-known and has a custom JSON
+// representation, that representation will be embedded adding a field
+// `value` which holds the custom JSON in addition to the `@type`
+// field. Example (for message [google.protobuf.Duration][]):
+//
+//     {
+//       "@type": "type.googleapis.com/google.protobuf.Duration",
+//       "value": "1.212s"
+//     }
+//
+message Any {
+    // A URL/resource name that uniquely identifies the type of the serialized
+    // protocol buffer message. This string must contain at least
+    // one "/" character. The last segment of the URL's path must represent
+    // the fully qualified name of the type (as in
+    // `path/google.protobuf.Duration`). The name should be in a canonical form
+    // (e.g., leading "." is not accepted).
+    //
+    // In practice, teams usually precompile into the binary all types that they
+    // expect it to use in the context of Any. However, for URLs which use the
+    // scheme `http`, `https`, or no scheme, one can optionally set up a type
+    // server that maps type URLs to message definitions as follows:
+    //
+    // * If no scheme is provided, `https` is assumed.
+    // * An HTTP GET on the URL must yield a [google.protobuf.Type][]
+    //   value in binary format, or produce an error.
+    // * Applications are allowed to cache lookup results based on the
+    //   URL, or have them precompiled into a binary to avoid any
+    //   lookup. Therefore, binary compatibility needs to be preserved
+    //   on changes to types. (Use versioned type names to manage
+    //   breaking changes.)
+    //
+    // Note: this functionality is not currently available in the official
+    // protobuf release, and it is not used for type URLs beginning with
+    // type.googleapis.com. As of May 2023, there are no widely used type server
+    // implementations and no plans to implement one.
+    //
+    // Schemes other than `http`, `https` (or the empty scheme) might be
+    // used with implementation specific semantics.
+    //
+    string type_url = 1;
+
+    // Must be a valid serialized protocol buffer of the above specified type.
+    bytes value = 2;
+}
diff --git a/rust/tw_proto/src/common/google/protobuf/any.rs b/rust/tw_proto/src/common/google/protobuf/any.rs
new file mode 100644
index 00000000000..743b9b93b94
--- /dev/null
+++ b/rust/tw_proto/src/common/google/protobuf/any.rs
@@ -0,0 +1,51 @@
+// Automatically generated rust module for 'any.proto' file
+
+#![allow(non_snake_case)]
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(unused_imports)]
+#![allow(unknown_lints)]
+#![allow(clippy::all)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
+
+
+use quick_protobuf::{MessageInfo, MessageRead, MessageWrite, BytesReader, Writer, WriterBackend, Result};
+use quick_protobuf::sizeofs::*;
+use super::*;
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct Any {
+    pub type_url: String,
+    pub value: Vec<u8>,
+}
+
+impl<'a> MessageRead<'a> for Any {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(10) => msg.type_url = r.read_string(bytes)?.to_owned(),
+                Ok(18) => msg.value = r.read_bytes(bytes)?.to_owned(),
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for Any {
+    fn get_size(&self) -> usize {
+        0
+        + if self.type_url == String::default() { 0 } else { 1 + sizeof_len((&self.type_url).len()) }
+        + if self.value.is_empty() { 0 } else { 1 + sizeof_len((&self.value).len()) }
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        if self.type_url != String::default() { w.write_with_tag(10, |w| w.write_string(&**&self.type_url))?; }
+        if !self.value.is_empty() { w.write_with_tag(18, |w| w.write_bytes(&**&self.value))?; }
+        Ok(())
+    }
+}
+
diff --git a/rust/tw_proto/src/common/google/protobuf/mod.rs b/rust/tw_proto/src/common/google/protobuf/mod.rs
new file mode 100644
index 00000000000..2bd49afe64d
--- /dev/null
+++ b/rust/tw_proto/src/common/google/protobuf/mod.rs
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod any;
+mod timestamp;
+
+pub use any::*;
+pub use timestamp::*;
diff --git a/rust/tw_proto/src/common/google/protobuf/timestamp.proto b/rust/tw_proto/src/common/google/protobuf/timestamp.proto
new file mode 100644
index 00000000000..353b1632497
--- /dev/null
+++ b/rust/tw_proto/src/common/google/protobuf/timestamp.proto
@@ -0,0 +1,151 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2008 Google Inc.  All rights reserved.
+// https://developers.google.com/protocol-buffers/
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+// Source: https://github.com/protocolbuffers/protobuf/blob/538a8e9a0d90b0bd8aea7b10f8e17ba76585b2e8/src/google/protobuf/timestamp.proto
+// To recompile the file use the following command inside `wallet-core` directory:
+// ```
+// cargo install pb-rs
+// pb-rs --dont_use_cow --single-mod --output_directory rust/tw_proto/common_proto/google/protobuf/ rust/tw_proto/common_proto/google/protobuf/any.proto
+// ```
+
+syntax = "proto3";
+
+package google.protobuf;
+
+option cc_enable_arenas = true;
+option go_package = "google.golang.org/protobuf/types/known/timestamppb";
+option java_package = "com.google.protobuf";
+option java_outer_classname = "TimestampProto";
+option java_multiple_files = true;
+option objc_class_prefix = "GPB";
+option csharp_namespace = "Google.Protobuf.WellKnownTypes";
+
+// A Timestamp represents a point in time independent of any time zone or local
+// calendar, encoded as a count of seconds and fractions of seconds at
+// nanosecond resolution. The count is relative to an epoch at UTC midnight on
+// January 1, 1970, in the proleptic Gregorian calendar which extends the
+// Gregorian calendar backwards to year one.
+//
+// All minutes are 60 seconds long. Leap seconds are "smeared" so that no leap
+// second table is needed for interpretation, using a [24-hour linear
+// smear](https://developers.google.com/time/smear).
+//
+// The range is from 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z. By
+// restricting to that range, we ensure that we can convert to and from [RFC
+// 3339](https://www.ietf.org/rfc/rfc3339.txt) date strings.
+//
+// # Examples
+//
+// Example 1: Compute Timestamp from POSIX `time()`.
+//
+//     Timestamp timestamp;
+//     timestamp.set_seconds(time(NULL));
+//     timestamp.set_nanos(0);
+//
+// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
+//
+//     struct timeval tv;
+//     gettimeofday(&tv, NULL);
+//
+//     Timestamp timestamp;
+//     timestamp.set_seconds(tv.tv_sec);
+//     timestamp.set_nanos(tv.tv_usec * 1000);
+//
+// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
+//
+//     FILETIME ft;
+//     GetSystemTimeAsFileTime(&ft);
+//     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
+//
+//     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
+//     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
+//     Timestamp timestamp;
+//     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
+//     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
+//
+// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
+//
+//     long millis = System.currentTimeMillis();
+//
+//     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
+//         .setNanos((int) ((millis % 1000) * 1000000)).build();
+//
+// Example 5: Compute Timestamp from Java `Instant.now()`.
+//
+//     Instant now = Instant.now();
+//
+//     Timestamp timestamp =
+//         Timestamp.newBuilder().setSeconds(now.getEpochSecond())
+//             .setNanos(now.getNano()).build();
+//
+// Example 6: Compute Timestamp from current time in Python.
+//
+//     timestamp = Timestamp()
+//     timestamp.GetCurrentTime()
+//
+// # JSON Mapping
+//
+// In JSON format, the Timestamp type is encoded as a string in the
+// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
+// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
+// where {year} is always expressed using four digits while {month}, {day},
+// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
+// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
+// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
+// is required. A proto3 JSON serializer should always use UTC (as indicated by
+// "Z") when printing the Timestamp type and a proto3 JSON parser should be
+// able to accept both UTC and other timezones (as indicated by an offset).
+//
+// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
+// 01:30 UTC on January 15, 2017.
+//
+// In JavaScript, one can convert a Date object to this format using the
+// standard
+// [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString)
+// method. In Python, a standard `datetime.datetime` object can be converted
+// to this format using
+// [`strftime`](https://docs.python.org/2/library/time.html#time.strftime) with
+// the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one can use
+// the Joda Time's [`ISODateTimeFormat.dateTime()`](
+// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime()
+// ) to obtain a formatter capable of generating timestamps in this format.
+//
+message Timestamp {
+    // Represents seconds of UTC time since Unix epoch
+    // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
+    // 9999-12-31T23:59:59Z inclusive.
+    int64 seconds = 1;
+
+    // Non-negative fractions of a second at nanosecond resolution. Negative
+    // second values with fractions must still have non-negative nanos values
+    // that count forward in time. Must be from 0 to 999,999,999
+    // inclusive.
+    int32 nanos = 2;
+}
diff --git a/rust/tw_proto/src/common/google/protobuf/timestamp.rs b/rust/tw_proto/src/common/google/protobuf/timestamp.rs
new file mode 100644
index 00000000000..2e073dbe982
--- /dev/null
+++ b/rust/tw_proto/src/common/google/protobuf/timestamp.rs
@@ -0,0 +1,51 @@
+// Automatically generated rust module for 'timestamp.proto' file
+
+#![allow(non_snake_case)]
+#![allow(non_upper_case_globals)]
+#![allow(non_camel_case_types)]
+#![allow(unused_imports)]
+#![allow(unknown_lints)]
+#![allow(clippy::all)]
+#![cfg_attr(rustfmt, rustfmt_skip)]
+
+
+use quick_protobuf::{MessageInfo, MessageRead, MessageWrite, BytesReader, Writer, WriterBackend, Result};
+use quick_protobuf::sizeofs::*;
+use super::*;
+
+#[allow(clippy::derive_partial_eq_without_eq)]
+#[derive(Debug, Default, PartialEq, Clone)]
+pub struct Timestamp {
+    pub seconds: i64,
+    pub nanos: i32,
+}
+
+impl<'a> MessageRead<'a> for Timestamp {
+    fn from_reader(r: &mut BytesReader, bytes: &'a [u8]) -> Result<Self> {
+        let mut msg = Self::default();
+        while !r.is_eof() {
+            match r.next_tag(bytes) {
+                Ok(8) => msg.seconds = r.read_int64(bytes)?,
+                Ok(16) => msg.nanos = r.read_int32(bytes)?,
+                Ok(t) => { r.read_unknown(bytes, t)?; }
+                Err(e) => return Err(e),
+            }
+        }
+        Ok(msg)
+    }
+}
+
+impl MessageWrite for Timestamp {
+    fn get_size(&self) -> usize {
+        0
+        + if self.seconds == 0i64 { 0 } else { 1 + sizeof_varint(*(&self.seconds) as u64) }
+        + if self.nanos == 0i32 { 0 } else { 1 + sizeof_varint(*(&self.nanos) as u64) }
+    }
+
+    fn write_message<W: WriterBackend>(&self, w: &mut Writer<W>) -> Result<()> {
+        if self.seconds != 0i64 { w.write_with_tag(8, |w| w.write_int64(*&self.seconds))?; }
+        if self.nanos != 0i32 { w.write_with_tag(16, |w| w.write_int32(*&self.nanos))?; }
+        Ok(())
+    }
+}
+
diff --git a/rust/tw_proto/src/common/mod.rs b/rust/tw_proto/src/common/mod.rs
new file mode 100644
index 00000000000..51f75bd9645
--- /dev/null
+++ b/rust/tw_proto/src/common/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod google;
diff --git a/rust/tw_proto/src/impls.rs b/rust/tw_proto/src/impls.rs
new file mode 100644
index 00000000000..73c07a97ae0
--- /dev/null
+++ b/rust/tw_proto/src/impls.rs
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::Common::Proto::SigningError;
+use crate::EthereumAbi::Proto::AbiError;
+use std::fmt;
+
+impl fmt::Display for SigningError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let err = match self {
+            SigningError::OK => "",
+            SigningError::Error_general => "Unknown error",
+            SigningError::Error_internal => "Internal error",
+            SigningError::Error_low_balance => "Low balance: the sender balance is not enough to cover the send and other auxiliary amount such as fee, deposit, or minimal balance",
+            SigningError::Error_zero_amount_requested => "Requested amount is zero, send of 0 makes no sense",
+            SigningError::Error_missing_private_key => "One required key is missing (too few or wrong keys are provided)",
+            SigningError::Error_invalid_private_key => "A private key provided is invalid (e.g. wrong size, usually should be 32 bytes)",
+            SigningError::Error_invalid_address => "A provided address (e.g. destination address) is invalid",
+            SigningError::Error_invalid_utxo => "A provided input UTXO is invalid",
+            SigningError::Error_invalid_utxo_amount => "The amount of an input UTXO is invalid",
+            SigningError::Error_wrong_fee => "Wrong fee is given, probably it is too low to cover minimal fee for the transaction",
+            SigningError::Error_signing => "General signing error",
+            SigningError::Error_tx_too_big => "Resulting transaction is too large",
+            SigningError::Error_missing_input_utxos => "No input UTXOs provided",
+            SigningError::Error_not_enough_utxos => "Not enough non-dust input UTXOs to cover requested amount (dust UTXOs are filtered out)",
+            SigningError::Error_script_redeem => "Missing required redeem script",
+            SigningError::Error_script_output => "Invalid required output script",
+            SigningError::Error_script_witness_program => "Unrecognized witness program",
+            SigningError::Error_invalid_memo => "Invalid memo",
+            SigningError::Error_input_parse => "Some input field cannot be parsed",
+            SigningError::Error_no_support_n2n => "Multi-input and multi-output transaction not supported",
+            SigningError::Error_signatures_count => "Incorrect count of signatures passed to compile",
+            SigningError::Error_invalid_params => "Incorrect input parameter",
+            SigningError::Error_invalid_requested_token_amount => "Invalid input token amount",
+            SigningError::Error_not_supported => "Operation not supported for the chain",
+            SigningError::Error_dust_amount_requested => "Requested amount is too low (less dust)",
+        };
+        write!(f, "{err}")
+    }
+}
+
+impl fmt::Display for AbiError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        let err = match self {
+            AbiError::OK => "",
+            AbiError::Error_internal => "Internal error",
+            AbiError::Error_abi_mismatch => "ABI mismatch",
+            AbiError::Error_invalid_abi => "Invalid ABI provided",
+            AbiError::Error_invalid_param_type => "Invalid parameter type",
+            AbiError::Error_invalid_address_value => "Invalid address",
+            AbiError::Error_invalid_uint_value => "Invalid Uint",
+            AbiError::Error_missing_param_type => "Missing one of the parameter types",
+            AbiError::Error_missing_param_value => "Missing one of the parameter values",
+            AbiError::Error_decoding_data => "Error decoding data",
+            AbiError::Error_empty_type => "Empty array/tuple not allowed",
+        };
+        write!(f, "{}", err)
+    }
+}
diff --git a/rust/tw_proto/src/lib.rs b/rust/tw_proto/src/lib.rs
new file mode 100644
index 00000000000..d5de0751f6b
--- /dev/null
+++ b/rust/tw_proto/src/lib.rs
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use quick_protobuf::{BytesReader, MessageInfo, Writer};
+
+#[allow(non_snake_case)]
+#[rustfmt::skip]
+mod common;
+mod impls;
+
+#[allow(non_snake_case)]
+#[rustfmt::skip]
+mod generated {
+    include!(concat!(env!("OUT_DIR"), "/proto/mod.rs"));
+}
+
+pub use common::google;
+pub use generated::TW::*;
+pub use quick_protobuf::{
+    deserialize_from_slice as deserialize_prefixed, serialize_into_vec as serialize_prefixed,
+    Error as ProtoError, MessageRead, MessageWrite, Result as ProtoResult,
+};
+
+/// Serializes a Protobuf message without the length prefix.
+/// Please note that [`quick_protobuf::serialize_into_vec`] appends a `varint32` length prefix.
+pub fn serialize<T: MessageWrite>(message: &T) -> ProtoResult<Vec<u8>> {
+    let len = message.get_size();
+    let mut v = Vec::with_capacity(quick_protobuf::sizeofs::sizeof_len(len));
+    let mut writer = Writer::new(&mut v);
+    message.write_message(&mut writer)?;
+    Ok(v)
+}
+
+/// Deserializes a Protobuf message from the given `data` bytes without the length prefix.
+/// Please note that [`quick_protobuf::deserialize_from_slice`] requires the data
+/// starts from a `varint32` length prefix.
+pub fn deserialize<'a, T: MessageRead<'a>>(data: &'a [u8]) -> ProtoResult<T> {
+    let mut reader = BytesReader::from_bytes(data);
+    T::from_reader(&mut reader, data)
+}
+
+pub fn to_any<T>(message: &T) -> google::protobuf::Any
+where
+    T: MessageInfo + MessageWrite,
+{
+    let value = serialize(message).expect("Protobuf serialization should never fail");
+    let type_url = type_url::<T>();
+    google::protobuf::Any { type_url, value }
+}
+
+pub fn to_any_with_type_url<T>(message: &T, type_url: String) -> google::protobuf::Any
+where
+    T: MessageInfo + MessageWrite,
+{
+    let value = serialize(message).expect("Protobuf serialization should never fail");
+    google::protobuf::Any { type_url, value }
+}
+
+pub fn type_url<T: MessageInfo>() -> String {
+    format!("/{}", T::PATH)
+}
+
+/// There is no way to create an instance of the `NoMessage` enum as it doesn't has variants.
+pub enum NoMessage {}
+
+impl MessageWrite for NoMessage {}
+
+/// `DummyMessage` has no effect on `MessageWrite` and `MessageRead`.
+pub struct DummyMessage;
+
+impl MessageWrite for DummyMessage {}
+
+impl<'a> MessageRead<'a> for DummyMessage {
+    fn from_reader(_r: &mut BytesReader, _bytes: &'a [u8]) -> ProtoResult<Self> {
+        Ok(DummyMessage)
+    }
+}
diff --git a/rust/tw_proto/tests/proto_tests.rs b/rust/tw_proto/tests/proto_tests.rs
new file mode 100644
index 00000000000..24e66fafad2
--- /dev/null
+++ b/rust/tw_proto/tests/proto_tests.rs
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_proto::{deserialize, deserialize_prefixed, serialize, serialize_prefixed, Ethereum};
+
+const SERIALIZED: [u8; 6] = [10, 1, 1, 18, 1, 11];
+const SERIALIZED_PREFIXED: [u8; 7] = [6, 10, 1, 1, 18, 1, 11];
+
+fn test_msg() -> Ethereum::Proto::SigningInput<'static> {
+    Ethereum::Proto::SigningInput {
+        chain_id: Cow::Owned(vec![1]),
+        nonce: Cow::Owned(vec![11]),
+        ..Ethereum::Proto::SigningInput::default()
+    }
+}
+
+#[test]
+fn test_serialize() {
+    let msg = test_msg();
+    let serialized = serialize(&msg).unwrap();
+    // Must not contain a prefix.
+    assert_eq!(serialized, SERIALIZED);
+}
+
+#[test]
+fn test_deserialize() {
+    let actual: Ethereum::Proto::SigningInput = deserialize(&SERIALIZED).unwrap();
+    assert_eq!(actual, test_msg());
+}
+
+#[test]
+fn test_serialize_prefixed() {
+    let msg = test_msg();
+    let serialized = serialize_prefixed(&msg).unwrap();
+    // Must not contain a prefix.
+    assert_eq!(serialized, SERIALIZED_PREFIXED);
+}
+
+#[test]
+fn test_deserialize_prefixed() {
+    let actual: Ethereum::Proto::SigningInput = deserialize_prefixed(&SERIALIZED_PREFIXED).unwrap();
+    assert_eq!(actual, test_msg());
+}
+
+#[test]
+fn test_serialize_deserialize() {
+    let serialized = [
+        10, 1, 1, 18, 1, 0, 34, 5, 9, 199, 101, 36, 0, 42, 3, 1, 48, 185, 66, 42, 48, 120, 54, 98,
+        49, 55, 53, 52, 55, 52, 101, 56, 57, 48, 57, 52, 99, 52, 52, 100, 97, 57, 56, 98, 57, 53,
+        52, 101, 101, 100, 101, 97, 99, 52, 57, 53, 50, 55, 49, 100, 48, 102, 74, 32, 96, 141, 203,
+        23, 66, 187, 63, 183, 174, 192, 2, 7, 78, 52, 32, 228, 250, 183, 208, 12, 206, 215, 156,
+        205, 172, 83, 237, 91, 39, 19, 129, 81, 82, 56, 18, 54, 10, 42, 48, 120, 53, 51, 50, 50,
+        98, 51, 52, 99, 56, 56, 101, 100, 48, 54, 57, 49, 57, 55, 49, 98, 102, 53, 50, 97, 55, 48,
+        52, 55, 52, 52, 56, 102, 48, 102, 52, 101, 102, 99, 56, 52, 18, 8, 27, 193, 109, 103, 78,
+        200, 0, 0,
+    ];
+    let privkey = [
+        96u8, 141, 203, 23, 66, 187, 63, 183, 174, 192, 2, 7, 78, 52, 32, 228, 250, 183, 208, 12,
+        206, 215, 156, 205, 172, 83, 237, 91, 39, 19, 129, 81,
+    ];
+
+    let expected_erc20 = Ethereum::Proto::mod_Transaction::ERC20Transfer {
+        to: Cow::from("0x5322b34c88ed0691971bf52a7047448f0f4efc84"),
+        amount: Cow::Borrowed(&[27u8, 193, 109, 103, 78, 200, 0, 0]),
+    };
+    let expected_tx = Ethereum::Proto::Transaction {
+        transaction_oneof: Ethereum::Proto::mod_Transaction::OneOftransaction_oneof::erc20_transfer(
+            expected_erc20,
+        ),
+    };
+    let expected = Ethereum::Proto::SigningInput {
+        chain_id: Cow::Borrowed(&[1]),
+        nonce: Cow::Borrowed(&[0]),
+        gas_price: Cow::Borrowed(&[9, 199, 101, 36, 0]),
+        gas_limit: Cow::Borrowed(&[1, 48, 185]),
+        to_address: Cow::from("0x6b175474e89094c44da98b954eedeac495271d0f"),
+        private_key: Cow::Borrowed(&privkey),
+        transaction: Some(expected_tx),
+        ..Ethereum::Proto::SigningInput::default()
+    };
+
+    let actual: Ethereum::Proto::SigningInput = deserialize(&serialized).unwrap();
+    assert_eq!(actual, expected);
+
+    let actual_serialized = serialize(&actual).unwrap();
+    assert_eq!(actual_serialized, serialized);
+}
diff --git a/rust/tw_tests/Cargo.toml b/rust/tw_tests/Cargo.toml
new file mode 100644
index 00000000000..3bc066b06bd
--- /dev/null
+++ b/rust/tw_tests/Cargo.toml
@@ -0,0 +1,25 @@
+[package]
+name = "tw_tests"
+version = "0.1.0"
+edition = "2021"
+
+[dev-dependencies]
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+tw_any_coin = { path = "../tw_any_coin", features = ["test-utils"] }
+tw_coin_entry = { path = "../tw_coin_entry", features = ["test-utils"] }
+tw_coin_registry = { path = "../tw_coin_registry" }
+tw_encoding = { path = "../tw_encoding" }
+tw_hash = { path = "../tw_hash" }
+tw_keypair = { path = "../tw_keypair", features = ["test-utils"] }
+tw_memory = { path = "../tw_memory" }
+tw_misc = { path = "../tw_misc" }
+tw_number = { path = "../tw_number" }
+tw_proto = { path = "../tw_proto" }
+wallet-core-rs = { path = "../wallet_core_rs" }
+# Chain specific:
+tw_cosmos_sdk = { path = "../tw_cosmos_sdk", features = ["test-utils"] }
+tw_solana = { path = "../chains/tw_solana" }
+tw_ton = { path = "../chains/tw_ton" }
+tw_ton_sdk = { path = "../frameworks/tw_ton_sdk" }
+tw_utxo = { path = "../frameworks/tw_utxo" }
diff --git a/rust/tw_tests/src/lib.rs b/rust/tw_tests/src/lib.rs
new file mode 100644
index 00000000000..7920eae86e8
--- /dev/null
+++ b/rust/tw_tests/src/lib.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+//! DO NOT WRITE ANY CODE WITHIN `tw_tests/src`.
diff --git a/rust/tw_tests/tests/chain_tests.rs b/rust/tw_tests/tests/chain_tests.rs
new file mode 100644
index 00000000000..4531f6d5665
--- /dev/null
+++ b/rust/tw_tests/tests/chain_tests.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod chains;
diff --git a/rust/tw_tests/tests/chains/aptos/aptos_address.rs b/rust/tw_tests/tests/chains/aptos/aptos_address.rs
new file mode 100644
index 00000000000..97a52410960
--- /dev/null
+++ b/rust/tw_tests/tests/chains/aptos/aptos_address.rs
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_aptos_address_normalization() {
+    test_address_normalization(
+        CoinType::Aptos,
+        "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+        "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+    );
+}
+
+#[test]
+fn test_aptos_address_is_valid() {
+    test_address_valid(CoinType::Aptos, "0x1");
+    test_address_valid(
+        CoinType::Aptos,
+        "0xeeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b",
+    );
+    test_address_valid(
+        CoinType::Aptos,
+        "eeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b",
+    );
+    test_address_valid(
+        CoinType::Aptos,
+        "19aadeca9388e009d136245b9a67423f3eee242b03142849eb4f81a4a409e59c",
+    );
+    test_address_valid(
+        CoinType::Aptos,
+        "0x777821c78442e17d82c3d7a371f42de7189e4248e529fe6eee6bca40ddbb",
+    );
+    test_address_valid(
+        CoinType::Aptos,
+        "0xeeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175",
+    );
+}
+
+#[test]
+fn test_aptos_address_invalid() {
+    // Empty
+    test_address_invalid(CoinType::Aptos, "");
+    // Invalid Hex
+    test_address_invalid(
+        CoinType::Aptos,
+        "Seff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b",
+    );
+    // Too long
+    test_address_invalid(
+        CoinType::Aptos,
+        "eeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175bb",
+    );
+    test_address_invalid(
+        CoinType::Aptos,
+        "0xSeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b",
+    );
+}
+
+#[test]
+fn test_aptos_address_get_data() {
+    test_address_get_data(
+        CoinType::Aptos,
+        "0x1",
+        "0000000000000000000000000000000000000000000000000000000000000001",
+    );
+}
diff --git a/rust/tw_tests/tests/chains/aptos/aptos_compile.rs b/rust/tw_tests/tests/chains/aptos/aptos_compile.rs
new file mode 100644
index 00000000000..d46b6db874f
--- /dev/null
+++ b/rust/tw_tests/tests/chains/aptos/aptos_compile.rs
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::aptos::test_cases::transfer_b4d62afd::{
+    aptos_sign_transfer_input, expected_json, DATA_TO_SIGN, ENCODED, PRIVATE_KEY, RAW_TXN,
+    SIGNATURE,
+};
+use crate::chains::aptos::APTOS_COIN_TYPE;
+use tw_any_coin::ffi::tw_transaction_compiler::{
+    tw_transaction_compiler_compile, tw_transaction_compiler_pre_image_hashes,
+};
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::ToHex;
+use tw_keypair::ed25519;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_data_vector_helper::TWDataVectorHelper;
+use tw_misc::assert_eq_json;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Aptos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_any_signer_compile_aptos() {
+    let input = aptos_sign_transfer_input();
+
+    // Step 2: Obtain preimage hash
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let preimage_data = TWDataHelper::wrap(unsafe {
+        tw_transaction_compiler_pre_image_hashes(APTOS_COIN_TYPE, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_transaction_compiler_pre_image_hashes returned nullptr");
+
+    let preimage: CompilerProto::PreSigningOutput =
+        deserialize(&preimage_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(preimage.error, SigningErrorType::OK);
+    assert!(preimage.error_message.is_empty());
+    assert_eq!(preimage.data.to_hex(), DATA_TO_SIGN);
+
+    // Step 3: Sign the data "externally"
+
+    let private_key = ed25519::sha512::KeyPair::try_from(PRIVATE_KEY).unwrap();
+    let public_key = private_key.public().to_vec();
+
+    let signature = private_key
+        .sign(preimage.data.to_vec())
+        .expect("Error signing data")
+        .to_vec();
+    assert_eq!(signature.to_hex(), SIGNATURE);
+
+    // Step 4: Compile transaction info
+
+    let signatures = TWDataVectorHelper::create([signature]);
+    let public_keys = TWDataVectorHelper::create([public_key]);
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_transaction_compiler_compile(
+            APTOS_COIN_TYPE,
+            input_data.ptr(),
+            signatures.ptr(),
+            public_keys.ptr(),
+        )
+    })
+    .to_vec()
+    .expect("!tw_transaction_compiler_compile returned nullptr");
+
+    let output: Proto::SigningOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let authenticator = output.authenticator.unwrap();
+    assert_eq!(authenticator.signature.to_hex(), SIGNATURE);
+    assert_eq!(output.raw_txn.to_hex(), RAW_TXN);
+    assert_eq!(output.encoded.to_hex(), ENCODED);
+
+    assert_eq_json!(output.json, expected_json());
+}
diff --git a/rust/tw_tests/tests/chains/aptos/aptos_sign.rs b/rust/tw_tests/tests/chains/aptos/aptos_sign.rs
new file mode 100644
index 00000000000..b5ca60631b1
--- /dev/null
+++ b/rust/tw_tests/tests/chains/aptos/aptos_sign.rs
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::aptos::test_cases::transfer_b4d62afd::{
+    aptos_sign_transfer_input, expected_json, ENCODED, PRIVATE_KEY, RAW_TXN, SIGNATURE,
+};
+use crate::chains::aptos::APTOS_COIN_TYPE;
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_coin_entry::error::prelude::*;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_misc::assert_eq_json;
+use tw_proto::Aptos::Proto;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_any_signer_sign_aptos() {
+    let input = Proto::SigningInput {
+        private_key: PRIVATE_KEY.decode_hex().unwrap().into(),
+        ..aptos_sign_transfer_input()
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output =
+        TWDataHelper::wrap(unsafe { tw_any_signer_sign(input_data.ptr(), APTOS_COIN_TYPE) })
+            .to_vec()
+            .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let authenticator = output.authenticator.unwrap();
+    assert_eq!(authenticator.signature.to_hex(), SIGNATURE);
+    assert_eq!(output.raw_txn.to_hex(), RAW_TXN);
+    assert_eq!(output.encoded.to_hex(), ENCODED);
+
+    assert_eq_json!(output.json, expected_json());
+}
diff --git a/rust/tw_tests/tests/chains/aptos/aptos_transaction_util.rs b/rust/tw_tests/tests/chains/aptos/aptos_transaction_util.rs
new file mode 100644
index 00000000000..8145d24935d
--- /dev/null
+++ b/rust/tw_tests/tests/chains/aptos/aptos_transaction_util.rs
@@ -0,0 +1,13 @@
+use tw_any_coin::test_utils::transaction_calc_tx_hash_utils::TransactionUtilHelper;
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_aptos_transaction_util_calc_tx_hash() {
+    let encoded_tx = "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01";
+    let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::Aptos, encoded_tx);
+
+    assert_eq!(
+        tx_hash,
+        "0xb4d62afd3862116e060dd6ad9848ccb50c2bc177799819f1d29c059ae2042467"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/aptos/mod.rs b/rust/tw_tests/tests/chains/aptos/mod.rs
new file mode 100644
index 00000000000..3b7b55c4d36
--- /dev/null
+++ b/rust/tw_tests/tests/chains/aptos/mod.rs
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod aptos_address;
+mod aptos_compile;
+mod aptos_sign;
+mod aptos_transaction_util;
+mod test_cases;
+
+const APTOS_COIN_TYPE: u32 = 637;
diff --git a/rust/tw_tests/tests/chains/aptos/test_cases.rs b/rust/tw_tests/tests/chains/aptos/test_cases.rs
new file mode 100644
index 00000000000..41af3a01603
--- /dev/null
+++ b/rust/tw_tests/tests/chains/aptos/test_cases.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde_json::{json, Value as Json};
+use tw_proto::Aptos::Proto;
+use tw_proto::Aptos::Proto::mod_SigningInput::OneOftransaction_payload as TransactionPayloadEnum;
+
+pub(super) mod transfer_b4d62afd {
+    use super::*;
+
+    /// Expected private key.
+    pub const PRIVATE_KEY: &str =
+        "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec";
+    pub const ENCODED: &str = "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01";
+    /// Expected `raw_txn`.
+    pub const RAW_TXN: &str = "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021";
+    /// Expected signature.
+    pub const SIGNATURE: &str = "5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01";
+    /// Expected preimage data to be signed.
+    pub const DATA_TO_SIGN: &str = "b5e97db07fa0bd0e5598aa3643a9bc6f6693bddc1a9fec9e674a461eaa00b19307968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021";
+
+    pub fn aptos_sign_transfer_input() -> Proto::SigningInput<'static> {
+        let transfer = Proto::TransferMessage {
+            to: "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30".into(),
+            amount: 1000,
+        };
+
+        Proto::SigningInput {
+            sender: "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30".into(),
+            sequence_number: 99,
+            max_gas_amount: 3296766,
+            gas_unit_price: 100,
+            expiration_timestamp_secs: 3664390082,
+            chain_id: 33,
+            any_encoded: Default::default(),
+            transaction_payload: TransactionPayloadEnum::transfer(transfer),
+            ..Proto::SigningInput::default()
+        }
+    }
+
+    pub fn expected_json() -> Json {
+        json!({
+            "expiration_timestamp_secs": "3664390082",
+            "gas_unit_price": "100",
+            "max_gas_amount": "3296766",
+            "payload": {
+                "arguments": ["0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30","1000"],
+                "function": "0x1::aptos_account::transfer",
+                "type": "entry_function_payload",
+                "type_arguments": []
+            },
+            "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+            "sequence_number": "99",
+            "signature": {
+                "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                "signature": "0x5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01",
+                "type": "ed25519_signature"
+            }
+        })
+    }
+}
diff --git a/rust/tw_tests/tests/chains/binance/binance_address.rs b/rust/tw_tests/tests/chains/binance/binance_address.rs
new file mode 100644
index 00000000000..706b4bae54f
--- /dev/null
+++ b/rust/tw_tests/tests/chains/binance/binance_address.rs
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_bech32_is_valid, test_address_get_data, test_address_invalid,
+    test_address_normalization, test_address_valid, AddressBech32IsValid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_binance_address_normalization() {
+    test_address_normalization(
+        CoinType::Binance,
+        "bnb1h8xf9htasu9aclra954dnnve8fgcda4ae7qfa8",
+        "bnb1h8xf9htasu9aclra954dnnve8fgcda4ae7qfa8",
+    );
+}
+
+#[test]
+fn test_binance_address_is_valid() {
+    test_address_valid(
+        CoinType::Binance,
+        "bnb1h8xf9htasu9aclra954dnnve8fgcda4ae7qfa8",
+    );
+    // Validator address.
+    test_address_valid(
+        CoinType::Binance,
+        "bva10npy5809y303f227g4leqw7vs3s6ep5ul26sq2",
+    );
+}
+
+#[test]
+fn test_binance_address_invalid() {
+    // Testnet address.
+    test_address_invalid(
+        CoinType::Binance,
+        "tbnb1x4hxmtdf7pwea9dghq73dufh3qspm8gp5qht9c",
+    );
+    // Unknown `bfa` hrp.
+    test_address_invalid(
+        CoinType::Binance,
+        "bfa10npy5809y303f227g4leqw7vs3s6ep5ul26sq2",
+    );
+}
+
+#[test]
+fn test_binance_address_get_data() {
+    test_address_get_data(
+        CoinType::Binance,
+        "bnb1h8xf9htasu9aclra954dnnve8fgcda4ae7qfa8",
+        "b9cc92dd7d870bdc7c7d2d2ad9cd993a5186f6bd",
+    );
+}
+
+#[test]
+fn test_binance_address_is_valid_bech32() {
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Binance,
+        address: "bva10npy5809y303f227g4leqw7vs3s6ep5ul26sq2",
+        hrp: "bva",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/binance/binance_compile.rs b/rust/tw_tests/tests/chains/binance/binance_compile.rs
new file mode 100644
index 00000000000..687390a28c5
--- /dev/null
+++ b/rust/tw_tests/tests/chains/binance/binance_compile.rs
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::binance::make_token;
+use tw_any_coin::test_utils::sign_utils::{CompilerHelper, PreImageHelper};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_encoding::hex::ToHex;
+use tw_proto::Binance::Proto;
+use tw_proto::Binance::Proto::mod_SigningInput::OneOforder_oneof as OrderType;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+#[test]
+fn test_binance_compile() {
+    // bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2
+    let from_address_key_hash = "40c2979694bbc961023d1d27be6fc4d21a9febe6";
+    // bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5
+    let to_address_key_hash = "bffe47abfaede50419c577f1074fee6dd1535cd1";
+
+    let send_order = Proto::SendOrder {
+        inputs: vec![Proto::mod_SendOrder::Input {
+            address: from_address_key_hash.decode_hex().unwrap().into(),
+            coins: vec![make_token("BNB", 1)],
+        }],
+        outputs: vec![Proto::mod_SendOrder::Output {
+            address: to_address_key_hash.decode_hex().unwrap().into(),
+            coins: vec![make_token("BNB", 1)],
+        }],
+    };
+    let input = Proto::SigningInput {
+        // testnet chainId
+        chain_id: "Binance-Chain-Nile".into(),
+        order_oneof: OrderType::send_order(send_order),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<CompilerProto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Binance, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "7b226163636f756e745f6e756d626572223a2230222c22636861696e5f6964223a2242696e616e63652d436861696e2d4e696c65222c2264617461223a6e756c6c2c226d656d6f223a22222c226d736773223a5b7b22696e70757473223a5b7b2261646472657373223a22626e623167727066303935356830796b7a71336172356e6d756d3779366764666c366c78666e34366832222c22636f696e73223a5b7b22616d6f756e74223a312c2264656e6f6d223a22424e42227d5d7d5d2c226f757470757473223a5b7b2261646472657373223a22626e6231686c6c7930326c3661686a7367787739776c6373776e6c776468673478687833387978706435222c22636f696e73223a5b7b22616d6f756e74223a312c2264656e6f6d223a22424e42227d5d7d5d7d5d2c2273657175656e6365223a2230222c22736f75726365223a2230227d"
+    );
+    assert_eq!(
+        preimage_output.data_hash.to_hex(),
+        "3f3fece9059e714d303a9a1496ddade8f2c38fa78fc4cc2e505c5dbb0ea678d1"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature = "1b1181faec30b60a2ddaa2804c253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5366bb8b041781a6771248550d04094c3d7a504f9e8310679";
+    let signature_bytes = signature.decode_hex().unwrap();
+    let public_key = "026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502"
+        .decode_hex()
+        .unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(
+        CoinType::Binance,
+        &input,
+        vec![signature_bytes],
+        vec![public_key],
+    );
+
+    assert_eq!(output.error, SigningError::OK);
+    let expected_tx = concat!(
+        "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001",
+        "121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35",
+        "920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212401b1181faec30b60a2ddaa2804c",
+        "253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5366bb8b041781a6771248550d04094c3d7a5",
+        "04f9e8310679",
+    );
+    assert_eq!(output.encoded.to_hex(), expected_tx);
+    assert_eq!(output.signature.to_hex(), signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Amo1kgCI2Yw4iMpoxT38k/RWRgJgbLuH8P5e5TPbOOUC"},"signature":"GxGB+uwwtgot2qKATCU88mTGkYDsMYFJKbXeYgiMDFpF6KgW0SCPxTZruLBBeBpncSSFUNBAlMPXpQT56DEGeQ=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
diff --git a/rust/tw_tests/tests/chains/binance/binance_sign.rs b/rust/tw_tests/tests/chains/binance/binance_sign.rs
new file mode 100644
index 00000000000..d45b6a75902
--- /dev/null
+++ b/rust/tw_tests/tests/chains/binance/binance_sign.rs
@@ -0,0 +1,843 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::binance::{
+    make_token, ACCOUNT_12_PRIVATE_KEY, ACCOUNT_15_PRIVATE_KEY, ACCOUNT_16_PRIVATE_KEY,
+    ACCOUNT_19_PRIVATE_KEY, ACCOUNT_91147_PRIVATE_KEY,
+};
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Binance::Proto;
+use tw_proto::Binance::Proto::mod_SigningInput::OneOforder_oneof as OrderEnum;
+use tw_proto::Common::Proto::SigningError;
+
+#[test]
+fn test_binance_sign_trade_order() {
+    // bnb1hgm0p7khfk85zpz5v0j8wnej3a90w709vhkdfu
+    let sender_key_hash = "ba36f0fad74d8f41045463e4774f328f4af779e5"
+        .decode_hex()
+        .unwrap();
+
+    let new_order = Proto::TradeOrder {
+        sender: sender_key_hash.into(),
+        id: "BA36F0FAD74D8F41045463E4774F328F4AF779E5-36".into(),
+        symbol: "NNB-338_BNB".into(),
+        ordertype: 2,
+        side: 1,
+        price: 136350000,
+        quantity: 100000000,
+        timeinforce: 1,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "chain-bnb".into(),
+        account_number: 12,
+        sequence: 35,
+        source: 1,
+        private_key: ACCOUNT_12_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::trade_order(new_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(
+        output.encoded.to_hex(),
+        "dc01f0625dee0a64ce6dc0430a14ba36f0fad74d8f41045463e4774f328f4af779e5122b424133364630464144373444384634313034353436334534373734463332384634414637373945352d33361a0b4e4e422d3333385f424e422002280130b09282413880c2d72f4001126e0a26eb5ae98721029729a52e4e3c2b4a4e52aa74033eedaf8ba1df5ab6d1f518fd69e67bbd309b0e12409123cb6906bb20aeb753f4a121d4d88ff0e9750ba75b0c4e10d76caee1e7d2481290fa3b9887a6225d6997f5f939ef834ea61d596a314237c48e560da9e17b5a180c20232001"
+    );
+
+    let expected_signature = "9123cb6906bb20aeb753f4a121d4d88ff0e9750ba75b0c4e10d76caee1e7d2481290fa3b9887a6225d6997f5f939ef834ea61d596a314237c48e560da9e17b5a";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"ApcppS5OPCtKTlKqdAM+7a+Lod9attH1GP1p5nu9MJsO"},"signature":"kSPLaQa7IK63U/ShIdTYj/DpdQunWwxOENdsruHn0kgSkPo7mIemIl1pl/X5Oe+DTqYdWWoxQjfEjlYNqeF7Wg=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_cancel_trade_order() {
+    // bnb1hgm0p7khfk85zpz5v0j8wnej3a90w709vhkdfu
+    let sender_key_hash = "ba36f0fad74d8f41045463e4774f328f4af779e5"
+        .decode_hex()
+        .unwrap();
+
+    let new_order = Proto::CancelTradeOrder {
+        sender: sender_key_hash.into(),
+        symbol: "NNB-338_BNB".into(),
+        refid: "BA36F0FAD74D8F41045463E4774F328F4AF779E5-36".into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "chain-bnb".into(),
+        account_number: 12,
+        sequence: 36,
+        source: 1,
+        private_key: ACCOUNT_12_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::cancel_trade_order(new_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(
+        output.encoded.to_hex(),
+        "cc01f0625dee0a54166e681b0a14ba36f0fad74d8f41045463e4774f328f4af779e5120b4e4e422d3333385f424e421a2b424133364630464144373444384634313034353436334534373734463332384634414637373945352d3336126e0a26eb5ae98721029729a52e4e3c2b4a4e52aa74033eedaf8ba1df5ab6d1f518fd69e67bbd309b0e12403df6603426b991f7040bce22ce0137c12137df01e1d4d425cf3d9104103aec6335ac05c825e08ba26b9f72aa4cc45aa75cacfb6082df86b00692fef9701eb0f5180c20242001"
+    );
+
+    let expected_signature = "3df6603426b991f7040bce22ce0137c12137df01e1d4d425cf3d9104103aec6335ac05c825e08ba26b9f72aa4cc45aa75cacfb6082df86b00692fef9701eb0f5";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"ApcppS5OPCtKTlKqdAM+7a+Lod9attH1GP1p5nu9MJsO"},"signature":"PfZgNCa5kfcEC84izgE3wSE33wHh1NQlzz2RBBA67GM1rAXIJeCLomufcqpMxFqnXKz7YILfhrAGkv75cB6w9Q=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_send_order() {
+    let amount = 1_001_000_000;
+    // bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2
+    let from_address_key_hash = "40c2979694bbc961023d1d27be6fc4d21a9febe6";
+    // bnb13zeh6hs97d5eu2s5qerguhv8ewwue6u4ywa6yf
+    let to_address_key_hash = "88b37d5e05f3699e2a1406468e5d87cb9dcceb95";
+
+    let send_order = Proto::SendOrder {
+        inputs: vec![Proto::mod_SendOrder::Input {
+            address: from_address_key_hash.decode_hex().unwrap().into(),
+            coins: vec![make_token("BNB", amount)],
+        }],
+        outputs: vec![Proto::mod_SendOrder::Output {
+            address: to_address_key_hash.decode_hex().unwrap().into(),
+            coins: vec![make_token("BNB", amount)],
+        }],
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "chain-bnb".into(),
+        account_number: 19,
+        sequence: 23,
+        source: 1,
+        memo: "test".into(),
+        private_key: ACCOUNT_19_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::send_order(send_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "cc01",
+        "f0625dee",
+        "0a4e",
+            "2a2c87fa",
+                "0a23", "0a1440c2979694bbc961023d1d27be6fc4d21a9febe6120b0a03424e4210c098a8dd03",
+                "1223", "0a1488b37d5e05f3699e2a1406468e5d87cb9dcceb95120b0a03424e4210c098a8dd03",
+            "126e",
+                "0a26",
+                "eb5ae987",
+                "21026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502",
+                "1240", "c65a13440f18a155bd971ee40b9e0dd58586f5bf344e12ec4c76c439aebca8c7789bab7bfbfb4ce89aadc4a02df225b6b6efc861c13bbeb5f7a3eea2d7ffc80f",
+                "1813",
+                "2017",
+            "1a04", "74657374",
+            "2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "c65a13440f18a155bd971ee40b9e0dd58586f5bf344e12ec4c76c439aebca8c7789bab7bfbfb4ce89aadc4a02df225b6b6efc861c13bbeb5f7a3eea2d7ffc80f";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Amo1kgCI2Yw4iMpoxT38k/RWRgJgbLuH8P5e5TPbOOUC"},"signature":"xloTRA8YoVW9lx7kC54N1YWG9b80ThLsTHbEOa68qMd4m6t7+/tM6JqtxKAt8iW2tu/IYcE7vrX3o+6i1//IDw=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_token_freeze_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+
+    let freeze_order = Proto::TokenFreezeOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        symbol: "NNB-338_BNB".into(),
+        amount: 1000000,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::freeze_order(freeze_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "a101f0625dee0a2b",
+        "e774b32d",
+        "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120b",
+        "4e4e422d3333385f424e42",
+        "18c0843d126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f",
+        "6b6a8fc71240e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162",
+        "722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"4wIgadiXv1v0hG01T80sDoWAcFO+ZDyLjIWWMGAD9zQNQ6FiciZz64SCWLBDWx9JmT0OddSuQ9A0U6OuV/5pkQ=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_token_unfreeze_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+
+    let unfreeze_order = Proto::TokenUnfreezeOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        symbol: "NNB-338_BNB".into(),
+        amount: 1000000,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::unfreeze_order(unfreeze_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "a101f0625dee0a2b",
+        "6515ff0d",
+        "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120b",
+        "4e4e422d3333385f424e42",
+        "18c0843d126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f",
+        "6b6a8fc71240e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162",
+        "722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"4wIgadiXv1v0hG01T80sDoWAcFO+ZDyLjIWWMGAD9zQNQ6FiciZz64SCWLBDWx9JmT0OddSuQ9A0U6OuV/5pkQ=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_token_issue_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+
+    let issue_order = Proto::TokenIssueOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        name: "NewBinanceToken".into(),
+        symbol: "NNB-338_BNB".into(),
+        total_supply: 1000000000,
+        mintable: true,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::issue_order(issue_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "b601f0625dee0a40",
+        "17efab80",
+        "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120f",
+        "4e657742696e616e6365546f6b656e",
+        "1a0b",
+        "4e4e422d3333385f424e42",
+        "208094ebdc032801126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc712401fbb993d643f03b3e8e757a502035f58c4c45aaaa6e107a3059ab7c6164283c10f1254e87feee21477c64c87b1a27d8481048533ae2f685b3ac0dc66e4edbc0b180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "1fbb993d643f03b3e8e757a502035f58c4c45aaaa6e107a3059ab7c6164283c10f1254e87feee21477c64c87b1a27d8481048533ae2f685b3ac0dc66e4edbc0b";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"H7uZPWQ/A7Po51elAgNfWMTEWqqm4QejBZq3xhZCg8EPElTof+7iFHfGTIexon2EgQSFM64vaFs6wNxm5O28Cw=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_token_mint_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+
+    let mint_order = Proto::TokenMintOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        symbol: "NNB-338_BNB".into(),
+        amount: 1000000,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::mint_order(mint_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "a101f0625dee0a2b",
+        "467e0829",
+        "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120b",
+        "4e4e422d3333385f424e42",
+        "18c0843d126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"4wIgadiXv1v0hG01T80sDoWAcFO+ZDyLjIWWMGAD9zQNQ6FiciZz64SCWLBDWx9JmT0OddSuQ9A0U6OuV/5pkQ=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_token_burn_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+
+    let burn_order = Proto::TokenBurnOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        symbol: "NNB-338_BNB".into(),
+        amount: 1000000,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::burn_order(burn_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "a101f0625dee0a2b",
+        "7ed2d2a0",
+        "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120b",
+        "4e4e422d3333385f424e42",
+        "18c0843d126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"4wIgadiXv1v0hG01T80sDoWAcFO+ZDyLjIWWMGAD9zQNQ6FiciZz64SCWLBDWx9JmT0OddSuQ9A0U6OuV/5pkQ=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_htlt_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+    let to_address_key_hash = "0153f11d6db7e69c7d51e771c697378018fb6c24";
+    let random_number_hash = "e8eae926261ab77d018202434791a335249b470246a7b02e28c3b2fb6ffad8f3";
+
+    let htlt_order = Proto::HTLTOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        to: to_address_key_hash.decode_hex().unwrap().into(),
+        random_number_hash: random_number_hash.decode_hex().unwrap().into(),
+        timestamp: 1_567_746_273,
+        amount: vec![make_token("BNB", 100000000)],
+        expected_income: "100000000:BTC-1DC".into(),
+        height_span: 400,
+        cross_chain: false,
+        ..Proto::HTLTOrder::default()
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 0,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::htlt_order(htlt_order),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "ee01f0625dee0a7ab33f9a240a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e112140153f11d6db7",
+        "e69c7d51e771c697378018fb6c242a20e8eae926261ab77d018202434791a335249b470246a7b02e28c3",
+        "b2fb6ffad8f330e1d1c7eb053a0a0a03424e421080c2d72f42113130303030303030303a4254432d3144",
+        "43489003126c0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f",
+        "6b6a8fc7124051439de2da19fe9fd22137c903cfc5dc87553bf05dca0bb202c0e07c47f9b51269efa272",
+        "43eb7b55888f5384a84ac1eac6d325c830d1be0ed042838e2dc0f6a9180f",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "51439de2da19fe9fd22137c903cfc5dc87553bf05dca0bb202c0e07c47f9b51269efa27243eb7b55888f5384a84ac1eac6d325c830d1be0ed042838e2dc0f6a9";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"UUOd4toZ/p/SITfJA8/F3IdVO/BdyguyAsDgfEf5tRJp76JyQ+t7VYiPU4SoSsHqxtMlyDDRvg7QQoOOLcD2qQ=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_deposit_htlt_order() {
+    let from_address_key_hash = "0153f11d6db7e69c7d51e771c697378018fb6c24";
+    let swap_id = "dd8fd4719741844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5";
+
+    let deposit_htlt = Proto::DepositHTLTOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        amount: vec![make_token("BTC-1DC", 100000000)],
+        swap_id: swap_id.decode_hex().unwrap().into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 16,
+        sequence: 0,
+        private_key: ACCOUNT_16_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::depositHTLT_order(deposit_htlt),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "c001f0625dee0a4c639864960a140153f11d6db7e69c7d51e771c697378018fb6c24120e0a074254432d",
+        "3144431080c2d72f1a20dd8fd4719741844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5",
+        "126c0a26eb5ae98721038df6960084e20b2d07d50e1422f94105c6241d9f1482a4eb79ce8bfd460f19e4",
+        "12400ca4144c6818e2836d09b4faf3161781d85f9adfc00badb2eaa0953174610a233b81413dafcf8471",
+        "6abad48a4ed3aeb9884d90eb8416eec5d5c0c6930ab60bd01810",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "0ca4144c6818e2836d09b4faf3161781d85f9adfc00badb2eaa0953174610a233b81413dafcf84716abad48a4ed3aeb9884d90eb8416eec5d5c0c6930ab60bd0";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A432lgCE4gstB9UOFCL5QQXGJB2fFIKk63nOi/1GDxnk"},"signature":"DKQUTGgY4oNtCbT68xYXgdhfmt/AC62y6qCVMXRhCiM7gUE9r8+EcWq61IpO0665iE2Q64QW7sXVwMaTCrYL0A=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_claim_htlt_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+    let swap_id = "dd8fd4719741844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5";
+    let random_number = "bda6933c7757d0ca428aa01fb9d0935a231f87bf2deeb9b409cea3f2d580a2cc";
+
+    let claim_htlt = Proto::ClaimHTLOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        swap_id: swap_id.decode_hex().unwrap().into(),
+        random_number: random_number.decode_hex().unwrap().into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::claimHTLT_order(claim_htlt),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "d401f0625dee0a5ec16653000a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e11220dd8fd4719741844d35",
+        "eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e51a20bda6933c7757d0ca428aa01fb9d0935a231f87bf",
+        "2deeb9b409cea3f2d580a2cc126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561a",
+        "ac993dbe0f6b6a8fc71240fa30ba50111aa31d8329dacb6d044c1c7d54f1cb782bc9aa2a50c3fabce02a4579d7",
+        "5b76ca69a9fab11b676d9da66b5af7aa4c9ad3d18e24fffeb16433be39fb180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "fa30ba50111aa31d8329dacb6d044c1c7d54f1cb782bc9aa2a50c3fabce02a4579d75b76ca69a9fab11b676d9da66b5af7aa4c9ad3d18e24fffeb16433be39fb";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"+jC6UBEaox2DKdrLbQRMHH1U8ct4K8mqKlDD+rzgKkV511t2ymmp+rEbZ22dpmta96pMmtPRjiT//rFkM745+w=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_refund_htlt_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+    let swap_id = "dd8fd4719741844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5";
+
+    let refund_htlt = Proto::RefundHTLTOrder {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        swap_id: swap_id.decode_hex().unwrap().into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::refundHTLT_order(refund_htlt),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "b201f0625dee0a3c3454a27c0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e11220dd8fd4719741",
+        "844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5126e0a26eb5ae9872103a9a55c040c8e",
+        "b8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240c9f36142534d16ec8ce656f8eb73",
+        "70b32206a2d15198b7165acf1e2a18952c9e4570b0f862e1ab7bb868c30781a42c9e3ec0ae08982e8d6c",
+        "91c55b83c71b7b1e180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "c9f36142534d16ec8ce656f8eb7370b32206a2d15198b7165acf1e2a18952c9e4570b0f862e1ab7bb868c30781a42c9e3ec0ae08982e8d6c91c55b83c71b7b1e";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"yfNhQlNNFuyM5lb463NwsyIGotFRmLcWWs8eKhiVLJ5FcLD4YuGre7howweBpCyePsCuCJgujWyRxVuDxxt7Hg=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_transfer_out_order() {
+    let from_address_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+    let to_address_data = "0x35552c16704d214347f29Fa77f77DA6d75d7C752";
+
+    let transfer_out = Proto::TransferOut {
+        from: from_address_key_hash.decode_hex().unwrap().into(),
+        to: to_address_data.decode_hex().unwrap().into(),
+        amount: Some(make_token("BNB", 100000000)),
+        expire_time: 12345678,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::transfer_out_order(transfer_out),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "b701f0625dee0a41800819c00a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1121435552c16704d",
+        "214347f29fa77f77da6d75d7c7521a0a0a03424e421080c2d72f20cec2f105126e0a26eb5ae9872103a9",
+        "a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc712407eda148e1167b1be12",
+        "71a788ccf4e3eade1c7e1773e9d2093982d7f802f8f85f35ef550049011728206e4eda1a272f9e96fd95",
+        "ef3983cad85a29cd14262c22e0180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "7eda148e1167b1be1271a788ccf4e3eade1c7e1773e9d2093982d7f802f8f85f35ef550049011728206e4eda1a272f9e96fd95ef3983cad85a29cd14262c22e0";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"ftoUjhFnsb4ScaeIzPTj6t4cfhdz6dIJOYLX+AL4+F8171UASQEXKCBuTtoaJy+elv2V7zmDythaKc0UJiwi4A=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_side_chain_delegate_order() {
+    let delegator_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+    // bva10npy5809y303f227g4leqw7vs3s6ep5ul26sq2
+    let validator_key_hash = "7cc24a1de5245f14a95e457f903bcc8461ac869c";
+
+    let side_delegate = Proto::SideChainDelegate {
+        delegator_addr: delegator_key_hash.decode_hex().unwrap().into(),
+        validator_addr: validator_key_hash.decode_hex().unwrap().into(),
+        delegation: Some(make_token("BNB", 200000000)),
+        chain_id: "chapel".into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::side_delegate_order(side_delegate),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "ba01f0625dee0a44e3a07fd20a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e112147cc24a1de524",
+        "5f14a95e457f903bcc8461ac869c1a0a0a03424e42108084af5f220663686170656c126e0a26eb5ae987",
+        "2103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc7124039302c9975fb",
+        "2a09ac2b6b6fb1d3b9fb5b4c03630d3d7a7da42b1c6736d6127142a3fcdca0b70a3d065da8d4f4df8b5d",
+        "9d8f46aeb3627a7d7aa901fe186af34c180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "39302c9975fb2a09ac2b6b6fb1d3b9fb5b4c03630d3d7a7da42b1c6736d6127142a3fcdca0b70a3d065da8d4f4df8b5d9d8f46aeb3627a7d7aa901fe186af34c";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"OTAsmXX7KgmsK2tvsdO5+1tMA2MNPXp9pCscZzbWEnFCo/zcoLcKPQZdqNT034tdnY9GrrNien16qQH+GGrzTA=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_side_chain_redelegate_order() {
+    let delegator_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+    // bva1echrty7p8r23cwx8g3ezwcza9azy4zq7ca0pzw
+    let validator_src_key_hash = "ce2e3593c138d51c38c7447227605d2f444a881e";
+    // bva1p7s26ervsmv3w83k5696glautc9sm5rchz5f5e
+    let validator_dst_key_hash = "0fa0ad646c86d9171e36a68ba47fbc5e0b0dd078";
+
+    let side_redelegate = Proto::SideChainRedelegate {
+        delegator_addr: delegator_key_hash.decode_hex().unwrap().into(),
+        validator_src_addr: validator_src_key_hash.decode_hex().unwrap().into(),
+        validator_dst_addr: validator_dst_key_hash.decode_hex().unwrap().into(),
+        amount: Some(make_token("BNB", 100000000)),
+        chain_id: "chapel".into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::side_redelegate_order(side_redelegate),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "d001f0625dee0a5ae3ced3640a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e11214ce2e3593c138",
+        "d51c38c7447227605d2f444a881e1a140fa0ad646c86d9171e36a68ba47fbc5e0b0dd078220a0a03424e",
+        "421080c2d72f2a0663686170656c126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08",
+        "af44ea561aac993dbe0f6b6a8fc71240114c6927423e95ecc831ec763b629b3a40db8feeb330528a941f",
+        "d74843c0d63b4271b23916770d4901988c1f56b20086e5768a12290ebec265e30a80f8f3d88e180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "114c6927423e95ecc831ec763b629b3a40db8feeb330528a941fd74843c0d63b4271b23916770d4901988c1f56b20086e5768a12290ebec265e30a80f8f3d88e";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"EUxpJ0I+lezIMex2O2KbOkDbj+6zMFKKlB/XSEPA1jtCcbI5FncNSQGYjB9WsgCG5XaKEikOvsJl4wqA+PPYjg=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_side_chain_undelegate_order() {
+    let delegator_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+    // bva1echrty7p8r23cwx8g3ezwcza9azy4zq7ca0pzw
+    let validator_key_hash = "ce2e3593c138d51c38c7447227605d2f444a881e";
+
+    let side_undelegate = Proto::SideChainUndelegate {
+        delegator_addr: delegator_key_hash.decode_hex().unwrap().into(),
+        validator_addr: validator_key_hash.decode_hex().unwrap().into(),
+        amount: Some(make_token("BNB", 100000000)),
+        chain_id: "chapel".into(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::side_undelegate_order(side_undelegate),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "ba01f0625dee0a44514f7e0e0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e11214ce2e3593c138",
+        "d51c38c7447227605d2f444a881e1a0a0a03424e421080c2d72f220663686170656c126e0a26eb5ae987",
+        "2103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240a622b7ca7a28",
+        "75e5eaa675a5ed976b2ec3b8ca055a2b05e7fb471d328bd04df854789437dd06407e41ebb1e5a345604c",
+        "93663dfb660e223800636c0b94c2e798180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "a622b7ca7a2875e5eaa675a5ed976b2ec3b8ca055a2b05e7fb471d328bd04df854789437dd06407e41ebb1e5a345604c93663dfb660e223800636c0b94c2e798";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"piK3ynoodeXqpnWl7ZdrLsO4ygVaKwXn+0cdMovQTfhUeJQ33QZAfkHrseWjRWBMk2Y9+2YOIjgAY2wLlMLnmA=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_side_chain_stake_migration_order() {
+    // Current staking delegator:
+    // tbnb1rr74uvz8rcvl5dqn43jkwdufx5aksp4zwzszvs
+    let refund_addr_key_hash = "18fd5e30471e19fa3413ac65673789353b6806a2";
+    // Where the staking amount will be re-delegated:
+    // 0xCAAc3DAf661b6cEFF18DB1C8fCC2C2fDA1B73893
+    let delegator_key_hash = "CAAc3DAf661b6cEFF18DB1C8fCC2C2fDA1B73893";
+    // BNB Beacon Chain - ARARAT validator has the following addresses:
+    // 1. bva1p7s26ervsmv3w83k5696glautc9sm5rchz5f5e (if using `bva` validator HRP);
+    // 2. tbnb1p7s26ervsmv3w83k5696glautc9sm5rcetua2v (if using `tbnb` testnet HRP).
+    let validator_src_key_hash = "0fa0ad646c86d9171e36a68ba47fbc5e0b0dd078";
+    // Binance Smart Chain - ARARAT validator has the following address:
+    // 0x341e228f22D4ec16297DD05A9d6347C74c125F66.
+    let validator_dst_key_hash = "0x341e228f22D4ec16297DD05A9d6347C74c125F66";
+
+    let stake_migration = Proto::SideChainStakeMigration {
+        delegator_addr: delegator_key_hash.decode_hex().unwrap().into(),
+        validator_src_addr: validator_src_key_hash.decode_hex().unwrap().into(),
+        validator_dst_addr: validator_dst_key_hash.decode_hex().unwrap().into(),
+        refund_addr: refund_addr_key_hash.decode_hex().unwrap().into(),
+        // 3.21 BNB
+        amount: Some(make_token("BNB", 321000000)),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "Binance-Chain-Ganges".into(),
+        account_number: 91147,
+        sequence: 11,
+        private_key: ACCOUNT_91147_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::side_stake_migration_order(stake_migration),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TBinance, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted tx hash: 94E2FC487D93F9744EB0C6BEED7AE1E5F5AF7D6B756B5EEE9AB1E6CB02C7D015
+    // Note it's not indexed by the explorer for some reason.
+    assert_eq!(output.encoded.to_hex(), "e101f0625dee0a69385891960a140fa0ad646c86d9171e36a68ba47fbc5e0b0dd0781214341e228f22d4ec16297dd05a9d6347c74c125f661a14caac3daf661b6ceff18db1c8fcc2c2fda1b73893221418fd5e30471e19fa3413ac65673789353b6806a22a0b0a03424e4210c0a488990112700a26eb5ae987210243107052476885baddb4fad4df3fa07f4df807eac64daf6035e25232180f8c6a124065a45c4001488121e8199c3d87bc3dbcf1612ba690f0c474cc94f9a060a9e1bc302943dca5cd9240bba1c78a1691700e23d538efad79cee856a34595247249b6188bc805200b");
+
+    let expected_signature = "65a45c4001488121e8199c3d87bc3dbcf1612ba690f0c474cc94f9a060a9e1bc302943dca5cd9240bba1c78a1691700e23d538efad79cee856a34595247249b6";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AkMQcFJHaIW63bT61N8/oH9N+Afqxk2vYDXiUjIYD4xq"},"signature":"ZaRcQAFIgSHoGZw9h7w9vPFhK6aQ8MR0zJT5oGCp4bwwKUPcpc2SQLuhx4oWkXAOI9U47615zuhWo0WVJHJJtg=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_time_lock_order() {
+    let from_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+
+    let time_lock = Proto::TimeLockOrder {
+        from_address: from_key_hash.decode_hex().unwrap().into(),
+        description: "Description locked for offer".into(),
+        amount: vec![make_token("BNB", 1000000)],
+        lock_time: 1600001371,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::time_lock_order(time_lock),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "bf01f0625dee0a49",
+        "07921531",
+        "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1121c4465736372697074696f6e206c6f636b656420666f72206f666665721a090a03424e4210c0843d20dbaaf8fa05126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240c270822b9515ba486c6a6b3472d388a5aea872ed960c0b53de0fafdc8682ef473a126f01e7dd2c00f04a0138a601b9540f54b14026846de362f7ab7f9fed948b180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "c270822b9515ba486c6a6b3472d388a5aea872ed960c0b53de0fafdc8682ef473a126f01e7dd2c00f04a0138a601b9540f54b14026846de362f7ab7f9fed948b";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"wnCCK5UVukhsams0ctOIpa6ocu2WDAtT3g+v3IaC70c6Em8B590sAPBKATimAblUD1SxQCaEbeNi96t/n+2Uiw=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_time_relock_order() {
+    let from_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+
+    let time_relock = Proto::TimeRelockOrder {
+        from_address: from_key_hash.decode_hex().unwrap().into(),
+        id: 333,
+        description: "Description locked for offer".into(),
+        amount: vec![make_token("BNB", 1000000)],
+        lock_time: 1600001371,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::time_relock_order(time_relock),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "c201f0625dee0a4c504711da0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e110cd021a1c446573",
+        "6372697074696f6e206c6f636b656420666f72206f6666657222090a03424e4210c0843d28dbaaf8fa05",
+        "126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc7",
+        "124086ddaa077c8ae551d402fa409cf7e91663982b0542200967c03c0b5876b181353250f689d342f221",
+        "7624a077b671ce7d09649187e29879f40abbbee9de7ab27c180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "86ddaa077c8ae551d402fa409cf7e91663982b0542200967c03c0b5876b181353250f689d342f2217624a077b671ce7d09649187e29879f40abbbee9de7ab27c";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"ht2qB3yK5VHUAvpAnPfpFmOYKwVCIAlnwDwLWHaxgTUyUPaJ00LyIXYkoHe2cc59CWSRh+KYefQKu77p3nqyfA=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+#[test]
+fn test_binance_sign_time_unlock_order() {
+    let from_key_hash = "08c7c918f6b72c3c0c21b7d08eb6fc66509998e1";
+
+    let time_unlock = Proto::TimeUnlockOrder {
+        from_address: from_key_hash.decode_hex().unwrap().into(),
+        id: 333,
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: "test-chain".into(),
+        account_number: 15,
+        sequence: 1,
+        private_key: ACCOUNT_15_PRIVATE_KEY.decode_hex().unwrap().into(),
+        order_oneof: OrderEnum::time_unlock_order(time_unlock),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Binance, input);
+
+    let expected_encoded = concat!(
+        "9301f0625dee0a1dc4050c6c0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e110cd02126e0a26eb",
+        "5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240da777b",
+        "fd2032834f59ec9fe69fd6eaa4aca24242dfbc5ec4ef8c435cb9da7eb05ab78e1b8ca9f109657cb77996",
+        "898f1b59137b3d8f1e00f842e409e18033b347180f2001",
+    );
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+
+    let expected_signature = "da777bfd2032834f59ec9fe69fd6eaa4aca24242dfbc5ec4ef8c435cb9da7eb05ab78e1b8ca9f109657cb77996898f1b59137b3d8f1e00f842e409e18033b347";
+    assert_eq!(output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6mlXAQMjrgSDz0bMhkyUIQcCK9E6lYarJk9vg9rao/H"},"signature":"2nd7/SAyg09Z7J/mn9bqpKyiQkLfvF7E74xDXLnafrBat44bjKnxCWV8t3mWiY8bWRN7PY8eAPhC5AnhgDOzRw=="}"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
diff --git a/rust/tw_tests/tests/chains/binance/binance_wallet_connect.rs b/rust/tw_tests/tests/chains/binance/binance_wallet_connect.rs
new file mode 100644
index 00000000000..109118da919
--- /dev/null
+++ b/rust/tw_tests/tests/chains/binance/binance_wallet_connect.rs
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::binance::{make_token, ACCOUNT_19_PRIVATE_KEY};
+use std::borrow::Cow;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_any_coin::test_utils::wallet_connect_utils::WalletConnectRequestHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Binance::Proto::{self, mod_SigningInput::OneOforder_oneof as MessageEnum};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::WalletConnect::Proto as WCProto;
+
+const WC_SIGN_REQUEST_CASE_1: &str = include_str!("data/wc_sign_request_case_1.json");
+
+#[test]
+fn test_binance_sign_wallet_connect_case_1() {
+    let input = WCProto::ParseRequestInput {
+        protocol: WCProto::Protocol::V2,
+        method: WCProto::Method::CosmosSignAmino,
+        payload: WC_SIGN_REQUEST_CASE_1.to_string().into(),
+    };
+
+    let mut parser = WalletConnectRequestHelper::default();
+    let parsing_output = parser.parse(CoinType::Binance, &input);
+
+    let mut signing_input = match parsing_output.signing_input_oneof {
+        WCProto::mod_ParseRequestOutput::OneOfsigning_input_oneof::binance(input) => input,
+        _ => unreachable!(),
+    };
+
+    // bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2
+    let expected_from_addr_key_hash = "40c2979694bbc961023d1d27be6fc4d21a9febe6";
+    // bnb13zeh6hs97d5eu2s5qerguhv8ewwue6u4ywa6yf
+    let expected_to_addr_key_hash = "88b37d5e05f3699e2a1406468e5d87cb9dcceb95";
+    let expected_send_order = Proto::SendOrder {
+        inputs: vec![Proto::mod_SendOrder::Input {
+            address: expected_from_addr_key_hash.decode_hex().unwrap().into(),
+            coins: vec![make_token("BNB", 1_001_000_000)],
+        }],
+        outputs: vec![Proto::mod_SendOrder::Output {
+            address: expected_to_addr_key_hash.decode_hex().unwrap().into(),
+            coins: vec![make_token("BNB", 1_001_000_000)],
+        }],
+    };
+    let expected_signing_input = Proto::SigningInput {
+        chain_id: "chain-bnb".into(),
+        account_number: 19,
+        sequence: 23,
+        source: 1,
+        memo: "".into(),
+        private_key: Cow::default(),
+        order_oneof: MessageEnum::send_order(expected_send_order),
+    };
+    assert_eq!(signing_input, expected_signing_input);
+
+    // Set missing private key.
+    signing_input.private_key = ACCOUNT_19_PRIVATE_KEY.decode_hex().unwrap().into();
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let signing_output = signer.sign(CoinType::Binance, signing_input);
+
+    assert_eq!(signing_output.error, SigningError::OK);
+    let expected_signature = "3c24c784c6bbf99d54ffabb153edcb6d3c4a774936df5c72a5d32897256f8e062f320fb4753302fb0a96f08c475974d20edfd1a27bbeeda73587f58ddc958975";
+    assert_eq!(signing_output.signature.to_hex(), expected_signature);
+    let expected_signature_json = r#"{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Amo1kgCI2Yw4iMpoxT38k/RWRgJgbLuH8P5e5TPbOOUC"},"signature":"PCTHhMa7+Z1U/6uxU+3LbTxKd0k231xypdMolyVvjgYvMg+0dTMC+wqW8IxHWXTSDt/Ronu+7ac1h/WN3JWJdQ=="}"#;
+    assert_eq!(signing_output.signature_json, expected_signature_json);
+}
diff --git a/rust/tw_tests/tests/chains/binance/data/wc_sign_request_case_1.json b/rust/tw_tests/tests/chains/binance/data/wc_sign_request_case_1.json
new file mode 100644
index 00000000000..3e070de9aef
--- /dev/null
+++ b/rust/tw_tests/tests/chains/binance/data/wc_sign_request_case_1.json
@@ -0,0 +1,37 @@
+{
+    "signerAddress": "bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2",
+    "signDoc": {
+        "account_number": "19",
+        "chain_id": "chain-bnb",
+        "memo": "",
+        "data": null,
+        "msgs": [
+            {
+                "inputs": [
+                    {
+                        "address": "bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2",
+                        "coins": [
+                            {
+                                "amount": 1001000000,
+                                "denom": "BNB"
+                            }
+                        ]
+                    }
+                ],
+                "outputs": [
+                    {
+                        "address": "bnb13zeh6hs97d5eu2s5qerguhv8ewwue6u4ywa6yf",
+                        "coins": [
+                            {
+                                "amount": 1001000000,
+                                "denom": "BNB"
+                            }
+                        ]
+                    }
+                ]
+            }
+        ],
+        "sequence": "23",
+        "source": "1"
+    }
+}
\ No newline at end of file
diff --git a/rust/tw_tests/tests/chains/binance/mod.rs b/rust/tw_tests/tests/chains/binance/mod.rs
new file mode 100644
index 00000000000..e86e4ed1056
--- /dev/null
+++ b/rust/tw_tests/tests/chains/binance/mod.rs
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_proto::Binance::Proto;
+
+mod binance_address;
+mod binance_compile;
+mod binance_sign;
+mod binance_wallet_connect;
+
+const ACCOUNT_12_PRIVATE_KEY: &str =
+    "90335b9d2153ad1a9799a3ccc070bd64b4164e9642ee1dd48053c33f9a3a05e9";
+const ACCOUNT_19_PRIVATE_KEY: &str =
+    "95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832";
+const ACCOUNT_15_PRIVATE_KEY: &str =
+    "eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d";
+const ACCOUNT_16_PRIVATE_KEY: &str =
+    "851fab89c14f4bbec0cc06f5e445ec065efc641068d78b308c67217d9bd5c88a";
+/// tbnb1rr74uvz8rcvl5dqn43jkwdufx5aksp4zwzszvs
+const ACCOUNT_91147_PRIVATE_KEY: &str =
+    "56b1253d944956c7f5b7668892509a44290f1fd149edecbe4fd44f69ba04b84c";
+
+fn make_token(denom: &str, amount: i64) -> Proto::mod_SendOrder::Token {
+    Proto::mod_SendOrder::Token {
+        denom: denom.into(),
+        amount,
+    }
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_address.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_address.rs
new file mode 100644
index 00000000000..7e6fa030411
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_address.rs
@@ -0,0 +1,186 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_base58_is_valid, test_address_bech32_is_valid,
+    test_address_create_base58_with_public_key, test_address_create_bech32_with_public_key,
+    test_address_derive, test_address_derive_with_derivation, test_address_get_data,
+    test_address_invalid, test_address_normalization, test_address_valid, AddressBase58IsValid,
+    AddressBech32IsValid, AddressCreateBase58WithPublicKey, AddressCreateBech32WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::tw_derivation::TWDerivation;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_bitcoin_address_derive() {
+    // Segwit address by default.
+    test_address_derive(
+        CoinType::Bitcoin,
+        "a26b7ffda8ad29cf3aba066cc43ce255cb13b3fba5fa9b638f4685333e3670fd",
+        "bc1qj7uu67l9zkajuhx976d8fvj2ylc29gnq3kjm3r",
+    );
+    // Explicit Legacy address.
+    test_address_derive_with_derivation(
+        CoinType::Bitcoin,
+        "a8212108f1f2a42b18b642c2dbe6e388e75de89ca7be9b6f7648bab06cdedabf",
+        "1JspsmYcHGLjRDavb62hodTb7BW8GGia7v",
+        TWDerivation::BitcoinLegacy,
+    );
+    // Explicit Segwit address.
+    test_address_derive_with_derivation(
+        CoinType::Bitcoin,
+        "a26b7ffda8ad29cf3aba066cc43ce255cb13b3fba5fa9b638f4685333e3670fd",
+        "bc1qj7uu67l9zkajuhx976d8fvj2ylc29gnq3kjm3r",
+        TWDerivation::BitcoinSegwit,
+    );
+
+    // Explicit Taproot addresses.
+    test_address_derive_with_derivation(
+        CoinType::Bitcoin,
+        "e5bbc9cab0ff9ec86889bcd84d79ca484b017763614cd4fa3bf4aa49ad9d55a9",
+        "bc1pkup60ng64cthqujp38l57y0eewkyqy35s86tmqjcc5yzgmz9l2gscz37tx",
+        TWDerivation::BitcoinTaproot,
+    );
+    test_address_derive_with_derivation(
+        CoinType::Bitcoin,
+        "ae39965b1e73944763eb8ddaeb126d9cbde772a5c141e3ad5791f8e7f094a089",
+        "bc1plvzy756f4t2p32n29jy9vrqcrj46g5yka7u7e89tkeufx5urgyss38y98d",
+        TWDerivation::BitcoinTaproot,
+    );
+    test_address_derive_with_derivation(
+        CoinType::Bitcoin,
+        "e0721275d0f94bf4d0f59bf0bef42179f680e38dfb306e1d0e3c13ab1d797d20",
+        "bc1puu933ez5v6w99w9dqsmwdeajpnrvknc65tlnrdx3xhxwd954mudsa39gum",
+        TWDerivation::BitcoinTaproot,
+    );
+}
+
+#[test]
+fn test_bitcoin_address_normalization() {
+    test_address_normalization(
+        CoinType::Bitcoin,
+        "19cAJn4Ms8jodBBGtroBNNpCZiHAWGAq7X",
+        "19cAJn4Ms8jodBBGtroBNNpCZiHAWGAq7X",
+    );
+}
+
+#[test]
+fn test_bitcoin_address_is_valid() {
+    // P2PKH
+    test_address_valid(CoinType::Bitcoin, "1MrZNGN7mfWZiZNQttrzHjfw72jnJC2JNx");
+    // P2WSH address: Witness V0, 32 bytes program
+    test_address_valid(
+        CoinType::Bitcoin,
+        "bc1qunq74p3h8425hr6wllevlvqqr6sezfxj262rff",
+    );
+    // P2TR address: Witness V1, 32 bytes program
+    test_address_valid(
+        CoinType::Bitcoin,
+        "bc1pwse34zfpvt344rvlt7tw0ngjtfh9xasc4q03avf0lk74jzjpzjuqaz7ks5",
+    );
+}
+
+#[test]
+fn test_bitcoin_address_is_valid_base58() {
+    // Litecoin P2PKH
+    test_address_base58_is_valid(AddressBase58IsValid {
+        coin: CoinType::Bitcoin,
+        address: "LW6HjAU6GL9fK2LZWUA6VZCzomTdrpx3nr",
+        p2pkh: 48,
+        p2sh: 50,
+    });
+    // Dogecoin P2SH
+    test_address_base58_is_valid(AddressBase58IsValid {
+        coin: CoinType::Bitcoin,
+        address: "AETZJzedcmLM2rxCM6VqCGF3YEMUjA3jMw",
+        p2pkh: 30,
+        p2sh: 22,
+    });
+}
+
+#[test]
+fn test_bitcoin_address_is_valid_bech32() {
+    // Litecoin P2WPKH.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Bitcoin,
+        address: "ltc1q3m3ujh350qrqdl33pv7pjw0d0m9qnm6qjcjpga",
+        hrp: "ltc",
+    });
+}
+
+#[test]
+fn test_bitcoin_address_invalid() {
+    test_address_invalid(
+        CoinType::Bitcoin,
+        "0xb16db98b365b1f89191996942612b14f1da4bd5f",
+    );
+    test_address_invalid(CoinType::Bitcoin, "");
+    // Litecoin P2PKH address is not valid without a prefix.
+    test_address_invalid(CoinType::Bitcoin, "LW6HjAU6GL9fK2LZWUA6VZCzomTdrpx3nr");
+    // Litecoin P2WPKH address is not valid without a prefix.
+    test_address_invalid(
+        CoinType::Bitcoin,
+        "ltc1q3m3ujh350qrqdl33pv7pjw0d0m9qnm6qjcjpga",
+    );
+}
+
+#[test]
+fn test_bitcoin_address_legacy_get_data() {
+    test_address_get_data(
+        CoinType::Bitcoin,
+        "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx",
+        "769bdff96a02f9135a1d19b749db6a78fe07dc90",
+    );
+}
+
+#[test]
+fn test_bitcoin_address_segwit_get_data() {
+    test_address_get_data(
+        CoinType::Bitcoin,
+        "bc1qunq74p3h8425hr6wllevlvqqr6sezfxj262rff",
+        "e4c1ea86373d554b8f4efff2cfb0001ea19124d2",
+    );
+}
+
+#[test]
+fn test_bitcoin_address_taproot_get_data() {
+    test_address_get_data(
+        CoinType::Bitcoin,
+        "bc1pwse34zfpvt344rvlt7tw0ngjtfh9xasc4q03avf0lk74jzjpzjuqaz7ks5",
+        "74331a892162e35a8d9f5f96e7cd125a6e537618a81f1eb12ffdbd590a4114b8",
+    );
+}
+
+#[test]
+fn test_bitcoin_address_create_base58_with_public_key() {
+    test_address_create_base58_with_public_key(AddressCreateBase58WithPublicKey {
+        coin: CoinType::Bitcoin,
+        public_key: "039d645d2ce630c2a9a6dbe0cbd0a8fcb7b70241cb8a48424f25593290af2494b9",
+        public_key_type: PublicKeyType::Secp256k1,
+        p2pkh: 0,
+        p2sh: 5,
+        expected: "12dNaXQtN5Asn2YFwT1cvciCrJa525fAe4",
+    });
+
+    test_address_create_base58_with_public_key(AddressCreateBase58WithPublicKey {
+        coin: CoinType::Bitcoin,
+        public_key: "03b49081a4d7ad24b20e209bc6fe10491aadb5607777baf0509a036cce96025db0",
+        public_key_type: PublicKeyType::Secp256k1,
+        p2pkh: 48,
+        p2sh: 50,
+        expected: "LW6HjAU6GL9fK2LZWUA6VZCzomTdrpx3nr",
+    });
+}
+
+#[test]
+fn test_bitcoin_address_create_bech32_with_public_key() {
+    test_address_create_bech32_with_public_key(AddressCreateBech32WithPublicKey {
+        coin: CoinType::Bitcoin,
+        private_key: "55f9cbb0376c422946fa28397c1219933ac60b312ede41bfacaf701ecd546625",
+        public_key_type: PublicKeyType::Secp256k1,
+        hrp: "ltc",
+        expected: "ltc1qytnqzjknvv03jwfgrsmzt0ycmwqgl0asjnaxwu",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/brc20.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/brc20.rs
new file mode 100644
index 00000000000..40f6a48aaec
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/brc20.rs
@@ -0,0 +1,171 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{
+    btc_info, compile, dust_threshold, input, output, preimage, TransactionOneof, DUST, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::ToHex;
+use tw_hash::H256;
+use tw_keypair::traits::SigningKeyTrait;
+use tw_keypair::{ecdsa, schnorr};
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+
+const BRC20_COMMIT_TX_ID: &str = "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1";
+const BRC20_REVEAL_TX_ID: &str = "7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca";
+
+#[test]
+fn test_bitcoin_compile_brc20_transfer_commit() {
+    let my_private_key = "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129";
+    let my_private_key = ecdsa::secp256k1::PrivateKey::try_from(my_private_key).unwrap();
+    let my_pubkey = my_private_key.public().compressed();
+    assert_eq!(
+        my_pubkey.to_hex(),
+        "030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb"
+    );
+
+    let available_amount = 26_400;
+    let tx_fee = 3_000;
+    let brc20_inscribe_amount = 7_000;
+    let change_amount = 26_400 - brc20_inscribe_amount - tx_fee;
+
+    // Create transaction with P2PKH as input and output.
+    let utxo_hash_0 = "8ec895b4d30adb01e38471ca1019bfc8c3e5fbd1f28d9e7b5653260d89989008";
+    let utxo_0 = Proto::Input {
+        out_point: input::out_point(utxo_hash_0, 1),
+        value: available_amount,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2wpkh(my_pubkey.to_vec()),
+        ..Default::default()
+    };
+
+    let out_0 = Proto::Output {
+        value: brc20_inscribe_amount,
+        to_recipient: output::brc20_inscribe(my_pubkey.to_vec(), "oadf", "20"),
+    };
+
+    let explicit_change_out = Proto::Output {
+        value: change_amount,
+        to_recipient: output::p2wpkh(my_pubkey.to_vec()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![utxo_0],
+        outputs: vec![out_0, explicit_change_out],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        public_keys: vec![my_pubkey.to_vec().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    let sighash_0 = H256::from("36dea9e58307a81b4adfa31f2cb8938270b5b16e345ccd3580c4451499260667");
+    preimage::BitcoinPreImageHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .add_expected_segwit(my_pubkey.to_vec(), sighash_0.to_vec())
+        .pre_image();
+
+    let signature_0 = my_private_key.sign(sighash_0).unwrap();
+    assert_eq!(
+        signature_0.to_vec().to_hex(),
+        "a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f31709769e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce00"
+    );
+
+    compile::BitcoinCompileHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .add_pubkey_sig(my_pubkey.to_vec(), signature_0.to_vec())
+        .compile(compile::Expected {
+            encoded: "02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000",
+            txid: BRC20_COMMIT_TX_ID,
+            inputs: vec![available_amount],
+            outputs: vec![brc20_inscribe_amount, change_amount],
+            vsize: 153,
+            weight: 610,
+            fee: tx_fee,
+        });
+}
+
+// There is only need to test if `TransactionCompiler` works with schnorr signatures.
+// Please find other transactions at `bitcoin_sign/brc20.rs`.
+#[test]
+fn test_bitcoin_compile_brc20_transfer_reveal() {
+    // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca
+
+    let my_private_key = "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129";
+    let my_private_key = schnorr::PrivateKey::try_from(my_private_key)
+        .unwrap()
+        // Disable aux rand for the test.
+        .no_aux_rand();
+    let my_pubkey = my_private_key.public().compressed();
+    assert_eq!(
+        my_pubkey.to_hex(),
+        "030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb"
+    );
+
+    let brc20_inscribed_amount = 7_000;
+    let tx_fee = brc20_inscribed_amount - DUST;
+
+    // Spend `797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1` BRC20 commit output.
+    let utxo_hash_0 = "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1";
+    let utxo_0 = Proto::Input {
+        out_point: input::out_point(utxo_hash_0, 0),
+        value: brc20_inscribed_amount,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::brc20_inscribe(my_pubkey.to_vec(), "oadf", "20"),
+        ..Default::default()
+    };
+
+    let out_0 = Proto::Output {
+        value: DUST,
+        // Reveal to my address.
+        to_recipient: output::p2wpkh(my_pubkey.to_vec()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![utxo_0],
+        outputs: vec![out_0],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        public_keys: vec![my_pubkey.to_vec().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    let sighash_0 = H256::from("3fd1a453f68dadba110a5b18798a06458e5f3d84dbb6f4f33334fa440a4a2530");
+    preimage::BitcoinPreImageHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .add_expected_taproot(my_pubkey.to_vec(), sighash_0.to_vec(), None)
+        .pre_image();
+
+    // Sign the given sighash with the non-tweaked private key.
+    let signature_0 = my_private_key.sign(sighash_0).unwrap();
+    assert_eq!(signature_0.to_vec().to_hex(), "6a35548b8fa4620028e021a944c1d3dc6e947243a7bfc901bf63fefae0d2460efa149a6440cab51966aa4f09faef2d1e5efcba23ab4ca6e669da598022dbcfe3");
+
+    // Compile the transaction.
+    compile::BitcoinCompileHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .add_pubkey_sig(my_pubkey.to_vec(), signature_0.to_vec())
+        .compile(compile::Expected {
+            encoded: "02000000000101b11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790000000000ffffffff012202000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d03406a35548b8fa4620028e021a944c1d3dc6e947243a7bfc901bf63fefae0d2460efa149a6440cab51966aa4f09faef2d1e5efcba23ab4ca6e669da598022dbcfe35b0063036f7264010118746578742f706c61696e3b636861727365743d7574662d3800377b2270223a226272632d3230222c226f70223a227472616e73666572222c227469636b223a226f616466222c22616d74223a223230227d6821c00f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000",
+            txid: BRC20_REVEAL_TX_ID,
+            inputs: vec![brc20_inscribed_amount],
+            outputs: vec![DUST],
+            vsize: 131,
+            weight: 522,
+            fee: tx_fee,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/compile_error.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/compile_error.rs
new file mode 100644
index 00000000000..bcb36dffa1d
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/compile_error.rs
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, TransactionOneof, DUST, MINER_FEE, ONE_BTC,
+    SIGHASH_ALL,
+};
+use tw_any_coin::test_utils::sign_utils::CompilerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_proto::BitcoinV2::Proto;
+use tw_proto::Common::Proto::SigningError;
+
+#[test]
+fn test_bitcoin_compile_p2pkh_error() {
+    let alice_pubkey = "036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536"
+        .decode_hex()
+        .unwrap();
+    let bob_pubkey = "037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf"
+        .decode_hex()
+        .unwrap();
+
+    // Create transaction with P2PKH as input and output.
+    let txid = "1e1cdc48aa990d7e154a161d5b5f1cad737742e97d2712ab188027bb42e6e47b";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: ONE_BTC * 50,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_pubkey.clone()),
+        ..Default::default()
+    };
+
+    let out1 = Proto::Output {
+        value: ONE_BTC * 50 - MINER_FEE,
+        to_recipient: output::p2pkh(bob_pubkey.clone()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        public_keys: vec![alice_pubkey.clone().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    let invalid_signature = "360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c9796677900"
+        .decode_hex()
+        .unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(
+        CoinType::Bitcoin,
+        &signing,
+        vec![invalid_signature],
+        vec![alice_pubkey],
+    );
+
+    assert_eq!(output.error, SigningError::Error_signing);
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/mod.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/mod.rs
new file mode 100644
index 00000000000..b0be1401505
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod brc20;
+mod compile_error;
+mod p2pkh;
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/p2pkh.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/p2pkh.rs
new file mode 100644
index 00000000000..68dc9cea741
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_compile/p2pkh.rs
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{
+    btc_info, compile, dust_threshold, input, output, preimage, TransactionOneof, DUST, MINER_FEE,
+    ONE_BTC, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_keypair::ecdsa;
+use tw_keypair::traits::SigningKeyTrait;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+
+/// Note this test contains a sample transaction that has never been broadcasted.
+#[test]
+fn test_bitcoin_compile_p2pkh() {
+    let alice_private_key = "56429688a1a6b00b90ccd22a0de0a376b6569d8684022ae92229a28478bfb657";
+    let alice_private_key = ecdsa::secp256k1::PrivateKey::try_from(alice_private_key).unwrap();
+    let alice_pubkey = alice_private_key.public().compressed();
+    assert_eq!(
+        alice_pubkey.to_hex(),
+        "036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536"
+    );
+    let bob_pubkey = "037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf"
+        .decode_hex()
+        .unwrap();
+
+    // Create transaction with P2PKH as input and output.
+    let txid = "1e1cdc48aa990d7e154a161d5b5f1cad737742e97d2712ab188027bb42e6e47b";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: ONE_BTC * 50,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_pubkey.to_vec()),
+        ..Default::default()
+    };
+
+    let out1 = Proto::Output {
+        value: ONE_BTC * 50 - MINER_FEE,
+        to_recipient: output::p2pkh(bob_pubkey.clone()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        public_keys: vec![alice_pubkey.to_vec().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    let sighash_1 = "6a0e072da66b141fdb448323d54765cafcaf084a06d2fa13c8aed0c694e50d18"
+        .decode_hex()
+        .unwrap();
+    preimage::BitcoinPreImageHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .add_expected_legacy(alice_pubkey.to_vec(), sighash_1.to_vec())
+        .pre_image();
+
+    let signature_1 = alice_private_key
+        .sign(sighash_1.as_slice().try_into().unwrap())
+        .unwrap();
+    assert_eq!(
+        signature_1.to_vec().to_hex(),
+        "78eda020d4b86fcb3af78ef919912e6d79b81164dbbb0b0b96da6ac58a2de4b11a5fd8d48734d5a02371c4b5ee551a69dca3842edbf577d863cf8ae9fdbbd45900"
+    );
+
+    compile::BitcoinCompileHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .add_pubkey_sig(alice_pubkey.to_vec(), signature_1.to_vec())
+        .compile(compile::Expected {
+            encoded: "02000000017be4e642bb278018ab12277de9427773ad1c5f5b1d164a157e0d99aa48dc1c1e000000006a473044022078eda020d4b86fcb3af78ef919912e6d79b81164dbbb0b0b96da6ac58a2de4b102201a5fd8d48734d5a02371c4b5ee551a69dca3842edbf577d863cf8ae9fdbbd4590121036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536ffffffff01c0aff629010000001976a9145eaaa4f458f9158f86afcba08dd7448d27045e3d88ac00000000",
+            txid: "c19f410bf1d70864220e93bca20f836aaaf8cdde84a46692616e9f4480d54885",
+            inputs: vec![ONE_BTC * 50],
+            outputs: vec![ONE_BTC * 50 - MINER_FEE],
+            vsize: 191,
+            weight: 764,
+            fee: MINER_FEE,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/mod.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/mod.rs
new file mode 100644
index 00000000000..953c7578968
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/mod.rs
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod plan_exact;
+mod plan_exact_error;
+mod plan_max;
+mod plan_max_error;
+mod plan_psbt;
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_exact.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_exact.rs
new file mode 100644
index 00000000000..29f75a6b99e
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_exact.rs
@@ -0,0 +1,272 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{plan, Amount, DUST};
+use tw_coin_registry::coin_type::CoinType;
+use tw_proto::BitcoinV2::Proto;
+
+#[test]
+fn test_exact_selector_with_change_1() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![1_000, 3_000, 4_000],
+        outputs: vec![1_000, 1_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectAscending,
+        fee_per_vb: 2,
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![1_000, 3_000],
+            outputs: vec![1_000, 1_000, 1_180],
+            vsize_estimate: 410,
+            // vsize * fee_rate
+            fee_estimate: 820,
+            change: 1_180,
+        });
+}
+
+#[test]
+fn test_exact_selector_with_change_2() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![4_000, 2_000, 6_000, 1_000, 11_000, 12_000],
+        outputs: vec![2_000, 1_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectAscending,
+        fee_per_vb: 4,
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![1_000, 2_000, 4_000],
+            outputs: vec![2_000, 1_000, 1764],
+            vsize_estimate: 559,
+            // vsize * fee_rate
+            fee_estimate: 2_236,
+            change: 1_764,
+        });
+}
+
+#[test]
+fn test_exact_selector_with_change_3() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![4_000, 2_000, 6_000, 1_000, 11_000, 12_000],
+        outputs: vec![2_000, 11_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectAscending,
+        fee_per_vb: 2,
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![1_000, 2_000, 4_000, 6_000, 11_000],
+            outputs: vec![2_000, 11_000, 9_286],
+            vsize_estimate: 857,
+            // vsize * fee_rate
+            fee_estimate: 1714,
+            change: 9_286,
+        });
+}
+
+#[test]
+fn test_exact_selector_with_change_3_desc() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![4_000, 2_000, 6_000, 1_000, 11_000, 12_000],
+        outputs: vec![2_000, 11_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 2,
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![12_000, 11_000],
+            outputs: vec![2_000, 11_000, 9_180],
+            vsize_estimate: 410,
+            // vsize * fee_rate
+            fee_estimate: 820,
+            change: 9_180,
+        });
+}
+
+#[test]
+fn test_exact_selector_with_and_without_change() {
+    const OUT: Amount = 66_240;
+    const FEE_PER_VB: Amount = 10;
+    const UTXO_1: Amount = 20_000;
+    const UTXO_2: Amount = 30_000;
+    const UTXO_3: Amount = 40_000;
+
+    const VSIZE_WITHOUT_CHANGE: u64 = 376;
+    const VSIZE_WITH_CHANGE: u64 = 525;
+    const FEE_WITHOUT_CHANGE: Amount = VSIZE_WITHOUT_CHANGE as Amount * FEE_PER_VB;
+    const FEE_WITH_CHANGE: Amount = VSIZE_WITH_CHANGE as Amount * FEE_PER_VB;
+
+    // Generate a transaction with 2 inputs and no change output.
+
+    // Therefore zero change, no change at all.
+    assert_eq!(UTXO_3 + UTXO_2, OUT + FEE_WITHOUT_CHANGE);
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![UTXO_1, UTXO_2, UTXO_3],
+        outputs: vec![OUT],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: FEE_PER_VB,
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![UTXO_3, UTXO_2],
+            outputs: vec![OUT],
+            vsize_estimate: VSIZE_WITHOUT_CHANGE,
+            // vsize * fee_rate
+            fee_estimate: FEE_WITHOUT_CHANGE,
+            change: 0,
+        });
+
+    // Now increase the output amount by 1 satoshi.
+    // Then UTXO_3 and UTXO_2 won't be enough to cover the target output + fee.
+    // Therefore will be used another one `UTXO_1` that will lead to a change.
+    let change = UTXO_3 + UTXO_2 + UTXO_1 - OUT - 1 - FEE_WITH_CHANGE;
+    assert_eq!(change, 18_509);
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![UTXO_1, UTXO_2, UTXO_3],
+        outputs: vec![OUT + 1],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: FEE_PER_VB,
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![UTXO_3, UTXO_2, UTXO_1],
+            outputs: vec![OUT + 1, change],
+            vsize_estimate: VSIZE_WITH_CHANGE,
+            // vsize * fee_rate
+            fee_estimate: FEE_WITH_CHANGE,
+            change,
+        });
+}
+
+#[test]
+fn test_exact_selector_with_change_many_utxos_900() {
+    let inputs: Vec<_> = (0..900).into_iter().map(|i| (i + 1) * 100).collect();
+    let sum_inputs: Amount = inputs.iter().sum();
+
+    let requested_amount = sum_inputs / 8;
+    assert_eq!(requested_amount, 5_068_125);
+
+    // Expected result: 60 utxos, with the largest amounts.
+    let expected_selected_inputs: Vec<_> = inputs.iter().rev().take(60).copied().collect();
+    let sum_expected_inputs: Amount = expected_selected_inputs.iter().sum();
+    assert_eq!(sum_expected_inputs, 5_223_000);
+
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs,
+        outputs: vec![requested_amount],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 10,
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: expected_selected_inputs,
+            outputs: vec![requested_amount, 64695],
+            vsize_estimate: 9018,
+            // vsize * fee_rate
+            fee_estimate: 90180,
+            change: 64695,
+        });
+}
+
+#[test]
+fn test_exact_selector_without_change_1() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![4_000, 2_000, 6_000, 1_000, 11_000, 12_000],
+        outputs: vec![34_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 2,
+    });
+    let dust_change = 36_000 - 34_000 - 1944;
+    assert!(dust_change < DUST);
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![12_000, 11_000, 6_000, 4_000, 2_000, 1_000],
+            outputs: vec![34_000],
+            // vsize also includes theoretical change output.
+            // This was made for simplicity. Consider fixing this later.
+            vsize_estimate: 972,
+            // vsize * fee_rate + dust_change
+            fee_estimate: 972 * 2 + dust_change,
+            change: 0,
+        });
+}
+
+#[test]
+fn test_exact_selector_filter_utxo_dust_with_change() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![3_000, 555, 8_000, 1_999],
+        outputs: vec![8_000],
+        change: true,
+        max: false,
+        dust_threshold: 2_000,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 2,
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![8_000, 3_000],
+            outputs: vec![8_000, 2_248],
+            vsize_estimate: 376,
+            // vsize * fee_rate
+            fee_estimate: 752,
+            change: 2_248,
+        });
+}
+
+#[test]
+fn test_exact_selector_filter_utxo_dust_without_change() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![3_000, 555, 8_000, 1_999],
+        outputs: vec![9_300],
+        change: true,
+        max: false,
+        dust_threshold: 2_000,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 2,
+    });
+    let dust_change = 948;
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![8_000, 3_000],
+            outputs: vec![9_300],
+            // vsize also includes theoretical change output.
+            // This was made for simplicity. Consider fixing this later.
+            vsize_estimate: 376,
+            // vsize * fee_rate + dust_change
+            fee_estimate: 376 * 2 + dust_change,
+            change: 0,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_exact_error.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_exact_error.rs
new file mode 100644
index 00000000000..046a531c960
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_exact_error.rs
@@ -0,0 +1,207 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{plan, Amount, DUST};
+use tw_any_coin::test_utils::plan_utils::AnyPlannerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_proto::BitcoinV2::Proto;
+use tw_proto::Common::Proto as CommonProto;
+
+#[test]
+fn test_exact_selector_insufficient() {
+    // Fee would be around 1200, so 16k is not enough to cover 15k + fee.
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![4_000, 4_000, 4_000, 4_000],
+        outputs: vec![15_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 2,
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(
+        plan.error,
+        CommonProto::SigningError::Error_not_enough_utxos
+    );
+}
+
+#[test]
+fn test_exact_selector_no_utxos_error() {
+    // Fee would be around 1200, so 16k is not enough to cover 15k + fee.
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![],
+        outputs: vec![15_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 1,
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(
+        plan.error,
+        CommonProto::SigningError::Error_missing_input_utxos
+    );
+}
+
+#[test]
+fn test_exact_selector_no_outputs_error() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![1_000],
+        outputs: vec![],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 1,
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(plan.error, CommonProto::SigningError::Error_invalid_params);
+}
+
+#[test]
+fn test_exact_selector_negative_utxo_error() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![-1_000],
+        outputs: vec![1_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 1,
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(
+        plan.error,
+        CommonProto::SigningError::Error_invalid_utxo_amount
+    );
+}
+
+#[test]
+fn test_exact_selector_negative_output_error() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![1_000],
+        outputs: vec![-1_000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 1,
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(plan.error, CommonProto::SigningError::Error_invalid_params);
+}
+
+#[test]
+fn test_exact_selector_insufficient_due_dust() {
+    // Transaction vsize would be 227, so if the first UTXO is not Dust, there could be enough to generate the tx.
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![DUST - 1, 100_000, 40],
+        outputs: vec![99_800],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectAscending,
+        fee_per_vb: 1,
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(
+        plan.error,
+        CommonProto::SigningError::Error_not_enough_utxos
+    );
+}
+
+#[test]
+fn test_exact_selector_tx_too_big_to_send_requested_amount() {
+    let inputs: Vec<_> = (0..1000).into_iter().map(|_| 10_000).collect();
+
+    let get_test_case = |requested_amount: Amount| {
+        plan::make_planning_input(plan::PlanArgs {
+            inputs: inputs.clone(),
+            outputs: vec![requested_amount],
+            change: true,
+            max: false,
+            dust_threshold: DUST,
+            order: Proto::InputSelector::SelectDescending,
+            fee_per_vb: 1,
+        })
+    };
+
+    // Total transaction weight does not exceed the max limit if there are 670 UTXOs.
+    let requested_amount = 10_000 * 660;
+    let input = get_test_case(requested_amount);
+    let expected_inputs: Vec<_> = inputs.iter().take(670).cloned().collect();
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: expected_inputs,
+            outputs: vec![requested_amount],
+            vsize_estimate: 99_910,
+            // vsize * fee_rate + fee
+            fee_estimate: 100_000,
+            change: 0,
+        });
+
+    // On the other hand, transaction weight limit will be reached when adding 671'st UTXO.
+    let input = get_test_case(10_000 * 661);
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(plan.error, CommonProto::SigningError::Error_tx_too_big);
+}
+
+#[test]
+fn test_exact_selector_tx_too_big_when_use_all() {
+    let inputs: Vec<_> = (0..1000).into_iter().map(|_| 10_000).collect();
+
+    // Even though one UTXO will be enough to send 1000 sats and cover the fee,
+    // `InputSelector::UseAll` requires us to generate a transaction with all provided UTXOs.
+    // However, the transaction will be too big.
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: inputs.clone(),
+        outputs: vec![1000],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::UseAll,
+        fee_per_vb: 1,
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(plan.error, CommonProto::SigningError::Error_tx_too_big);
+}
+
+#[test]
+fn test_exact_selector_dust_amount_requested() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![100_000, 40],
+        outputs: vec![DUST - 1],
+        change: true,
+        max: false,
+        dust_threshold: DUST,
+        order: Proto::InputSelector::SelectAscending,
+        fee_per_vb: 2,
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(
+        plan.error,
+        CommonProto::SigningError::Error_dust_amount_requested
+    );
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_max.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_max.rs
new file mode 100644
index 00000000000..01928f85388
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_max.rs
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{plan, Amount, DUST};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_max_selector_1() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![1_000, 3_000, 4_000],
+        max: true,
+        dust_threshold: DUST,
+        fee_per_vb: 2,
+        ..plan::PlanArgs::default()
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![4_000, 3_000, 1_000],
+            // sum(inputs) - fee
+            outputs: vec![7018],
+            vsize_estimate: 491,
+            // vsize * fee_rate
+            fee_estimate: 982,
+            change: 0,
+        });
+}
+
+#[test]
+fn test_max_selector_2() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![4_000, 2_000, 6_000, 1_000, 50_000, 120_000],
+        max: true,
+        dust_threshold: DUST,
+        fee_per_vb: 2,
+        ..plan::PlanArgs::default()
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![120_000, 50_000, 6_000, 4_000, 2_000, 1_000],
+            // sum(inputs) - fee
+            outputs: vec![181124],
+            vsize_estimate: 938,
+            // vsize * fee_rate
+            fee_estimate: 1876,
+            change: 0,
+        });
+}
+
+#[test]
+fn test_max_selector_3() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![4_000, 2_000, 6_000, 1_000, 50_000, 120_000],
+        max: true,
+        dust_threshold: DUST,
+        fee_per_vb: 2,
+        ..plan::PlanArgs::default()
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![120_000, 50_000, 6_000, 4_000, 2_000, 1_000],
+            // sum(inputs) - fee
+            outputs: vec![181124],
+            vsize_estimate: 938,
+            // vsize * fee_rate
+            fee_estimate: 1876,
+            change: 0,
+        });
+}
+
+#[test]
+fn test_max_selector_filter_dust() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![4_000, 2_000, 6_000, 1_000, 50_000, 1999],
+        max: true,
+        dust_threshold: 2_000,
+        fee_per_vb: 2,
+        ..plan::PlanArgs::default()
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![50_000, 6_000, 4_000, 2_000],
+            // sum(inputs) - fee
+            outputs: vec![60_720],
+            vsize_estimate: 640,
+            // vsize * fee_rate
+            fee_estimate: 1_280,
+            change: 0,
+        });
+}
+
+#[test]
+fn test_max_selector_many_utxos_900() {
+    // Less than the max transaction size 100_000 (i.e 400_000 weight).
+    const TX_VSIZE: u64 = 99_876;
+    const TX_FEE: Amount = TX_VSIZE as Amount * 2;
+
+    let inputs: Vec<_> = (0..900).into_iter().map(|i| (i + 1) * 100).collect();
+
+    // Expected result: 670 utxos, with the largest amounts.
+    // Total transaction weight does not exceed the max limit if there are 670 UTXOs.
+    let expected_selected_inputs: Vec<_> = inputs.iter().copied().rev().take(670).collect();
+    let expected_amount = expected_selected_inputs.iter().sum::<Amount>() - TX_FEE;
+
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs,
+        max: true,
+        dust_threshold: 2_000,
+        fee_per_vb: 2,
+        ..plan::PlanArgs::default()
+    });
+    plan::BitcoinPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: expected_selected_inputs,
+            // sum(inputs) - fee
+            outputs: vec![expected_amount],
+            vsize_estimate: TX_VSIZE,
+            // vsize * fee_rate
+            fee_estimate: TX_FEE,
+            change: 0,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_max_error.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_max_error.rs
new file mode 100644
index 00000000000..9cc479c4c35
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_max_error.rs
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{plan, Amount, DUST};
+use tw_any_coin::test_utils::plan_utils::AnyPlannerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_proto::BitcoinV2::Proto;
+use tw_proto::Common::Proto as CommonProto;
+
+#[test]
+fn test_max_selector_insufficient_to_cover_fee() {
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![1_000, 2_000],
+        max: true,
+        dust_threshold: DUST,
+        fee_per_vb: 10,
+        ..plan::PlanArgs::default()
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(
+        plan.error,
+        CommonProto::SigningError::Error_not_enough_utxos
+    );
+}
+
+#[test]
+fn test_max_selector_insufficient_to_cover_fee_and_dust() {
+    const TX_VSIZE: usize = 342;
+    const TX_FEE_PER_VBYTE: Amount = 10;
+    const TX_FEE: Amount = TX_VSIZE as Amount * TX_FEE_PER_VBYTE;
+
+    const UTXO1: Amount = 700;
+    const UTXO2: Amount = 3_000;
+
+    assert!(UTXO1 + UTXO2 - TX_FEE < DUST);
+
+    let input = plan::make_planning_input(plan::PlanArgs {
+        inputs: vec![UTXO1, UTXO2],
+        max: true,
+        dust_threshold: DUST,
+        fee_per_vb: TX_FEE_PER_VBYTE,
+        ..plan::PlanArgs::default()
+    });
+
+    let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+    let plan = planner.plan(CoinType::Bitcoin, input);
+    assert_eq!(
+        plan.error,
+        CommonProto::SigningError::Error_not_enough_utxos
+    );
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_psbt.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_psbt.rs
new file mode 100644
index 00000000000..28c55e13b9d
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_plan/plan_psbt.rs
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::input::out_point;
+use crate::chains::common::bitcoin::psbt_plan::BitcoinPsbtPlanHelper;
+use crate::chains::common::bitcoin::{btc_info, input, output, transaction_psbt, RecipientType};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::ecdsa;
+use tw_proto::BitcoinV2::Proto;
+
+#[test]
+fn test_bitcoin_plan_psbt_thorchain_swap_witness() {
+    let private_key = ecdsa::secp256k1::PrivateKey::try_from(
+        "f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55",
+    )
+    .unwrap();
+
+    let psbt = "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d00000000";
+    let input = Proto::SigningInput {
+        public_keys: vec![private_key.public().compressed().to_vec().into()],
+        chain_info: btc_info(),
+        transaction: transaction_psbt(psbt),
+        ..Proto::SigningInput::default()
+    };
+
+    let utxo_0 = Proto::Input {
+        out_point: out_point(
+            "c6986020440e94beeeaab40fc8fb4314135cc6fe90107c0619f6bc5fdb107014",
+            0,
+        ),
+        value: 66_406,
+        sighash_type: 1,
+        sequence: input::sequence(u32::MAX),
+        claiming_script: input::receiver_address("bc1qkyu3n8k8jmekl3pwvdl59k5w8enjp25akz2r3z"),
+    };
+
+    let out_0 = Proto::Output {
+        value: 60_000,
+        to_recipient: output::to_address("bc1q7g48qdshqd000aysws74pun2uzxrp598gcfum0"),
+    };
+    let out_1 = Proto::Output {
+        value: 0,
+        to_recipient: RecipientType::custom_script_pubkey(
+            "6a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a3530"
+                .decode_hex()
+                .unwrap()
+                .into()
+        ),
+    };
+    let out_2 = Proto::Output {
+        value: 4_670,
+        to_recipient: output::to_address("bc1qkyu3n8k8jmekl3pwvdl59k5w8enjp25akz2r3z"),
+    };
+
+    let expected = Proto::TransactionPlan {
+        inputs: vec![utxo_0],
+        outputs: vec![out_0, out_1, out_2],
+        available_amount: 66_406,
+        send_amount: 66_406,
+        vsize_estimate: 216,
+        fee_estimate: 1736,
+        change: 0,
+        ..Proto::TransactionPlan::default()
+    };
+
+    BitcoinPsbtPlanHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .plan_psbt(expected);
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/brc20.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/brc20.rs
new file mode 100644
index 00000000000..5836744205a
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/brc20.rs
@@ -0,0 +1,198 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, plan, sign, TransactionOneof, DUST, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::{ecdsa, schnorr};
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+
+const ALICE_PRIVATE_KEY: &str = "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129";
+
+#[test]
+fn test_bitcoin_sign_brc20_commit() {
+    let alice_private_key = ecdsa::secp256k1::PrivateKey::try_from(ALICE_PRIVATE_KEY).unwrap();
+    let alice_pubkey = alice_private_key.public().compressed();
+
+    let txid = "8ec895b4d30adb01e38471ca1019bfc8c3e5fbd1f28d9e7b5653260d89989008";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 1),
+        value: 26_400,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2wpkh(alice_pubkey.to_vec()),
+        ..Default::default()
+    };
+
+    let out1 = Proto::Output {
+        value: 7_000,
+        to_recipient: output::brc20_inscribe(alice_pubkey.to_vec(), "oadf", "20"),
+    };
+
+    // Change/return transaction.
+    let out2 = Proto::Output {
+        value: 16_400,
+        to_recipient: output::p2wpkh(alice_pubkey.to_vec()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1, out2],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![ALICE_PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    // https://www.blockchain.com/explorer/transactions/btc/797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1
+    let txid = "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1";
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000",
+            txid,
+            inputs: vec![26_400],
+            outputs: vec![7_000, 16_400],
+            vsize: 153,
+            weight: 610,
+            fee: 3000,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_brc20_reveal() {
+    let alice_private_key = schnorr::PrivateKey::try_from(ALICE_PRIVATE_KEY).unwrap();
+    let alice_pubkey = alice_private_key.public().compressed();
+
+    // Now spend just created `797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1` commit output.
+    let txid = "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: 7_000,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::brc20_inscribe(alice_pubkey.to_vec(), "oadf", "20"),
+        ..Default::default()
+    };
+
+    let out1 = Proto::Output {
+        value: DUST,
+        to_recipient: output::p2wpkh(alice_pubkey.to_vec()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![ALICE_PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        // We enable deterministic Schnorr signatures here
+        dangerous_use_fixed_schnorr_rng: true,
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    plan::BitcoinPlanHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![7_000],
+            outputs: vec![DUST],
+            vsize_estimate: 131,
+            fee_estimate: 7_000 - DUST,
+            change: 0,
+        });
+
+    // https://www.blockchain.com/explorer/transactions/btc/7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000000101b11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790000000000ffffffff012202000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d03406a35548b8fa4620028e021a944c1d3dc6e947243a7bfc901bf63fefae0d2460efa149a6440cab51966aa4f09faef2d1e5efcba23ab4ca6e669da598022dbcfe35b0063036f7264010118746578742f706c61696e3b636861727365743d7574662d3800377b2270223a226272632d3230222c226f70223a227472616e73666572222c227469636b223a226f616466222c22616d74223a223230227d6821c00f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000",
+            txid: "7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca",
+            inputs: vec![7_000],
+            outputs: vec![DUST],
+            // `vsize` is different from the estimated value due to the signatures der serialization.
+            vsize: 131,
+            weight: 522,
+            fee: 7_000 - DUST,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_brc20_transfer() {
+    let alice_private_key = schnorr::PrivateKey::try_from(ALICE_PRIVATE_KEY).unwrap();
+    let alice_pubkey = alice_private_key.public().compressed();
+    let bob_address = "bc1qazgc2zhu2kmy42py0vs8d7yff67l3zgpwfzlpk";
+
+    // Now spend just created `7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca` reveal output.
+    let txid1 = "7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid1, 0),
+        value: DUST,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2wpkh(alice_pubkey.to_vec()),
+        ..Default::default()
+    };
+
+    // UTXO to cover fee.
+    let txid2 = "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1";
+    let tx2 = Proto::Input {
+        out_point: input::out_point(txid2, 1),
+        value: 16_400,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2wpkh(alice_pubkey.to_vec()),
+        ..Default::default()
+    };
+
+    let out1 = Proto::Output {
+        value: DUST,
+        to_recipient: output::to_address(bob_address),
+    };
+
+    let change_output = Proto::Output {
+        value: 13_400,
+        to_recipient: output::p2wpkh(alice_pubkey.to_vec()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1, tx2],
+        outputs: vec![out1, change_output],
+        input_selector: Proto::InputSelector::UseAll,
+        // We enable deterministic Schnorr signatures here
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![ALICE_PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        // We enable deterministic Schnorr signatures here
+        dangerous_use_fixed_schnorr_rng: true,
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/3e3576eb02667fac284a5ecfcb25768969680cc4c597784602d0a33ba7c654b7
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000000102ca3edda74a46877efa5364ab85947e148508713910ada23e147ea28926dc46700000000000ffffffffb11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790100000000ffffffff022202000000000000160014e891850afc55b64aa8247b2076f8894ebdf889015834000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d024830450221008798393eb0b7390217591a8c33abe18dd2f7ea7009766e0d833edeaec63f2ec302200cf876ff52e68dbaf108a3f6da250713a9b04949a8f1dcd1fb867b24052236950121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb0248304502210096bbb9d1f0596d69875646689e46f29485e8ceccacde9d0025db87fd96d3066902206d6de2dd69d965d28df3441b94c76e812384ab9297e69afe3480ee4031e1b2060121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000",
+            txid: "3e3576eb02667fac284a5ecfcb25768969680cc4c597784602d0a33ba7c654b7",
+            inputs: vec![DUST, 16_400],
+            outputs: vec![DUST, 13_400],
+            vsize: 209,
+            weight: 834,
+            fee: 3000,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/mod.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/mod.rs
new file mode 100644
index 00000000000..2d3540532e6
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/mod.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod brc20;
+mod op_return;
+mod ordinal_nft;
+mod p2pkh;
+mod p2sh;
+mod p2tr_key_path;
+mod p2tr_script_path;
+mod p2wpkh;
+mod p2wsh;
+mod psbt;
+mod send_to_address;
+mod sighash_single;
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/op_return.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/op_return.rs
new file mode 100644
index 00000000000..10101742107
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/op_return.rs
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{
+    dust_threshold, input, output, sign, TransactionOneof, DUST, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_proto::BitcoinV2::Proto;
+
+/// Deposit 0.0001 BTC from bc1q2sphzvc2uqmxqte2w9dd4gzy4sy9vvfv0me9ke to 0xa8491D40d4F71A752cA41DA0516AEd80c33a1B56 on ZETA mainnet.
+/// https://www.zetachain.com/docs/developers/omnichain/bitcoin/#example-1-deposit-btc-into-an-account-in-zevm
+///
+/// Original test: https://github.com/trustwallet/wallet-core/blob/55ca3e561d6c0815a5601a51fd66ffc679061660/tests/chains/Bitcoin/TWBitcoinSigningTests.cpp#L888-L962
+/// *Note* that if we enable change output, current selection algorithm will calculate
+/// different change and fee amounts than in the original test.
+#[test]
+fn test_bitcoin_deposit_to_zetachain() {
+    let my_private_key = "428d66be0b5a620f126a00fa67637222ce3dc9badfe5c605189520760810cfac"
+        .decode_hex()
+        .unwrap();
+    let my_address = "bc1q2sphzvc2uqmxqte2w9dd4gzy4sy9vvfv0me9ke";
+    let my_evm_zetachain_address = "0xa8491D40d4F71A752cA41DA0516AEd80c33a1B56";
+
+    // https://www.zetachain.com/docs/reference/glossary/#tss
+    let zeta_tss_address = "bc1qm24wp577nk8aacckv8np465z3dvmu7ry45el6y";
+
+    let utxo_hash_0 = "17a6adb5db1e33c87467a58aa31cddbb3800052315015cf3cf1c2b0119310e20";
+    let utxo_0 = Proto::Input {
+        out_point: input::out_point(utxo_hash_0, 0),
+        value: 20_000,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::receiver_address(my_address),
+        ..Default::default()
+    };
+
+    let out_0 = Proto::Output {
+        value: 10_000,
+        to_recipient: output::to_address(zeta_tss_address),
+    };
+    // OP_RETURN must be the second output after the actual amount and before the change.
+    let out_1 = Proto::Output {
+        value: 0,
+        // Pass my ZetaChain EVM address bytes (20) as the OP_RETURN.
+        to_recipient: output::op_return(my_evm_zetachain_address.decode_hex().unwrap()),
+    };
+    let explicit_change_output = Proto::Output {
+        value: 7_420,
+        to_recipient: output::to_address(my_address),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        inputs: vec![utxo_0],
+        outputs: vec![out_0, out_1, explicit_change_output],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        fee_per_vb: 1,
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![my_private_key.into()],
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    // Successfully broadcasted:
+    // https://mempool.space/tx/2b871b6c1112ad0a777f6db1f7a7709154c4d9af8e771ba4eca148915f830e9d
+    // https://explorer.zetachain.com/cc/tx/0x269e319478f8849247abb28b33a7b8e0a849dab4551bab328bf58bf67b02a807
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "01000000000101200e3119012b1ccff35c011523050038bbdd1ca38aa56774c8331edbb5ada6170000000000ffffffff031027000000000000160014daaae0d3de9d8fdee31661e61aea828b59be78640000000000000000166a14a8491d40d4f71a752ca41da0516aed80c33a1b56fc1c000000000000160014540371330ae036602f2a715adaa044ac0856312c02483045022100e29731f7474f9103c6df3434c8c62a540a21ad0e10e23df343b1e81e4b26110602202d37fb4fee5341a41f9e4e65ba2d3e0d2309425ea9806d94eb268efe6f21007001210369cdaf80b4a5fdad91e9face90e848225512884ec2e3ed572ca11dc68e75054700000000",
+            txid: "2b871b6c1112ad0a777f6db1f7a7709154c4d9af8e771ba4eca148915f830e9d",
+            inputs: vec![20_000],
+            outputs: vec![10_000, 0, 7_420],
+            vsize: 172,
+            weight: 686,
+            // sum(inputs) - sum(outputs)
+            fee: 2580,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/ordinal_nft.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/ordinal_nft.rs
new file mode 100644
index 00000000000..ef200d41233
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/ordinal_nft.rs
@@ -0,0 +1,128 @@
+// use common::hex;
+// use tw_bitcoin::aliases::*;
+// use tw_bitcoin::entry::BitcoinEntry;
+// use tw_coin_entry::coin_entry::CoinEntry;
+// use tw_coin_entry::test_utils::test_context::TestCoinContext;
+// use tw_proto::BitcoinV2::Proto;
+// use tw_proto::Utxo::Proto as UtxoProto;
+//
+// #[test]
+// fn coin_entry_sign_ordinal_nft_commit_reveal_transfer() {
+//     let coin = TestCoinContext::default();
+//
+//     let alice_private_key = hex("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129");
+//     let alice_pubkey = hex("030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb");
+//
+//     let txid: Vec<u8> = hex("579590c3227253ad423b1e7e3c5b073b8a280d307c68aecd779df2600daa2f99")
+//         .into_iter()
+//         .rev()
+//         .collect();
+//
+//     let tx1 = Proto::Input {
+//         txid: txid.as_slice().into(),
+//         vout: 0,
+//         value: 32_400,
+//         sighash_type: UtxoProto::SighashType::All,
+//         to_recipient: ProtoInputRecipient::builder(Proto::mod_Input::InputBuilder {
+//             variant: ProtoInputBuilder::p2wpkh(alice_pubkey.as_slice().into()),
+//         }),
+//         ..Default::default()
+//     };
+//
+//     let out1 = Proto::Output {
+//         value: 31_100,
+//         to_recipient: ProtoOutputRecipient::builder(Proto::mod_Output::OutputBuilder {
+//             variant: ProtoOutputBuilder::ordinal_inscribe(
+//                 Proto::mod_Output::OutputOrdinalInscription {
+//                     inscribe_to: alice_pubkey.as_slice().into(),
+//                     mime_type: "image/png".into(),
+//                     payload: hex(common::data::NFT_INSCRIPTION_IMAGE_DATA).into(),
+//                 },
+//             ),
+//         }),
+//     };
+//
+//     let signing = Proto::SigningInput {
+//         private_key: alice_private_key.as_slice().into(),
+//         inputs: vec![tx1],
+//         outputs: vec![out1],
+//         input_selector: UtxoProto::InputSelector::UseAll,
+//         disable_change_output: true,
+//         ..Default::default()
+//     };
+//
+//     let signed = BitcoinEntry.sign(&coin, signing);
+//     assert_eq!(signed.error, Proto::Error::OK);
+//
+//     // https://www.blockchain.com/explorer/transactions/btc/f1e708e5c5847339e16accf8716c14b33717c14d6fe68f9db36627cecbde7117
+//     assert_eq!(
+//         signed.txid,
+//         hex("f1e708e5c5847339e16accf8716c14b33717c14d6fe68f9db36627cecbde7117")
+//     );
+//
+//     let encoded = tw_encoding::hex::encode(signed.encoded, false);
+//     let transaction = signed.transaction.unwrap();
+//
+//     assert_eq!(transaction.inputs.len(), 1);
+//     assert_eq!(transaction.outputs.len(), 1);
+//     assert_eq!(&encoded, "02000000000101992faa0d60f29d77cdae687c300d288a3b075b3c7e1e3b42ad537222c39095570000000000ffffffff017c790000000000002251202ac69a7e9dba801e9fcba826055917b84ca6fba4d51a29e47d478de603eedab602473044022054212984443ed4c66fc103d825bfd2da7baf2ab65d286e3c629b36b98cd7debd022050214cfe5d3b12a17aaaf1a196bfeb2f0ad15ffb320c4717eb7614162453e4fe0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000");
+//
+//     let txid: Vec<u8> = hex("f1e708e5c5847339e16accf8716c14b33717c14d6fe68f9db36627cecbde7117")
+//         .into_iter()
+//         .rev()
+//         .collect();
+//
+//     let tx1 = Proto::Input {
+//         txid: txid.as_slice().into(),
+//         vout: 0,
+//         value: 31_100,
+//         sighash_type: UtxoProto::SighashType::UseDefault,
+//         to_recipient: ProtoInputRecipient::builder(Proto::mod_Input::InputBuilder {
+//             variant: ProtoInputBuilder::ordinal_inscribe(
+//                 Proto::mod_Input::InputOrdinalInscription {
+//                     one_prevout: false,
+//                     inscribe_to: alice_pubkey.as_slice().into(),
+//                     mime_type: "image/png".into(),
+//                     payload: hex(common::data::NFT_INSCRIPTION_IMAGE_DATA).into(),
+//                 },
+//             ),
+//         }),
+//         ..Default::default()
+//     };
+//
+//     let out1 = Proto::Output {
+//         value: 546,
+//         to_recipient: ProtoOutputRecipient::builder(Proto::mod_Output::OutputBuilder {
+//             variant: ProtoOutputBuilder::p2wpkh(Proto::ToPublicKeyOrHash {
+//                 to_address: ProtoPubkeyOrHash::pubkey(alice_pubkey.as_slice().into()),
+//             }),
+//         }),
+//     };
+//
+//     let signing = Proto::SigningInput {
+//         private_key: alice_private_key.as_slice().into(),
+//         inputs: vec![tx1],
+//         outputs: vec![out1],
+//         input_selector: UtxoProto::InputSelector::UseAll,
+//         disable_change_output: true,
+//         // We enable deterministic Schnorr signatures here
+//         dangerous_use_fixed_schnorr_rng: true,
+//         ..Default::default()
+//     };
+//
+//     let signed = BitcoinEntry.sign(&coin, signing);
+//     assert_eq!(signed.error, Proto::Error::OK);
+//
+//     // https://www.blockchain.com/explorer/transactions/btc/173f8350b722243d44cc8db5584de76b432eb6d0888d9e66e662db51584f44ac
+//     assert_eq!(
+//         signed.txid,
+//         hex("173f8350b722243d44cc8db5584de76b432eb6d0888d9e66e662db51584f44ac")
+//     );
+//
+//     let encoded = tw_encoding::hex::encode(signed.encoded, false);
+//     let transaction = signed.transaction.unwrap();
+//
+//     assert_eq!(encoded, common::data::NFT_INSCRIPTION_RAW_HEX);
+//     assert_eq!(transaction.inputs.len(), 1);
+//     assert_eq!(transaction.outputs.len(), 1);
+// }
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2pkh.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2pkh.rs
new file mode 100644
index 00000000000..5b76d84eeb3
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2pkh.rs
@@ -0,0 +1,116 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, plan, sign, TransactionOneof, BITCOIN_P2PKH_PREFIX,
+    DUST, MINER_FEE, ONE_BTC, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_hash::hasher::sha256_ripemd;
+use tw_keypair::ecdsa;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::address::legacy::LegacyAddress;
+
+enum P2PKHClaimingScriptType {
+    PublicKey,
+    PublicKeyHash,
+    P2PKHAddress,
+}
+
+/// Note this test contains a sample transaction that has never been broadcasted.
+fn test_bitcoin_sign_input_p2pkh(utxo_owner: P2PKHClaimingScriptType) {
+    const ALICE_PRIVATE_KEY: &str =
+        "56429688a1a6b00b90ccd22a0de0a376b6569d8684022ae92229a28478bfb657";
+
+    let alice_private_key = ecdsa::secp256k1::PrivateKey::try_from(ALICE_PRIVATE_KEY).unwrap();
+    let alice_pubkey = alice_private_key.public();
+    let bob_pubkey = "037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf"
+        .decode_hex()
+        .unwrap();
+
+    let claiming_script = match utxo_owner {
+        P2PKHClaimingScriptType::PublicKey => input::p2pkh(alice_pubkey.to_vec()),
+        P2PKHClaimingScriptType::PublicKeyHash => {
+            let alice_pubkey_hash = sha256_ripemd(alice_pubkey.compressed().as_slice());
+            input::p2pkh_with_hash(alice_pubkey_hash)
+        },
+        P2PKHClaimingScriptType::P2PKHAddress => {
+            let alice_address =
+                LegacyAddress::p2pkh_with_public_key(BITCOIN_P2PKH_PREFIX, &alice_pubkey).unwrap();
+            input::receiver_address(&alice_address.to_string())
+        },
+    };
+
+    // Create transaction with P2PKH as input and output.
+    let txid = "1e1cdc48aa990d7e154a161d5b5f1cad737742e97d2712ab188027bb42e6e47b";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: ONE_BTC * 50,
+        sighash_type: SIGHASH_ALL,
+        claiming_script,
+        ..Default::default()
+    };
+
+    let out1 = Proto::Output {
+        value: ONE_BTC * 50 - MINER_FEE,
+        to_recipient: output::p2pkh(bob_pubkey.clone()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![ALICE_PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    plan::BitcoinPlanHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .plan(plan::Expected {
+            inputs: vec![ONE_BTC * 50],
+            outputs: vec![ONE_BTC * 50 - MINER_FEE],
+            vsize_estimate: 193,
+            // Fee includes potential change amount.
+            // In this test we do not want to have a change output.
+            fee_estimate: MINER_FEE,
+            change: 0,
+        });
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000017be4e642bb278018ab12277de9427773ad1c5f5b1d164a157e0d99aa48dc1c1e000000006a473044022078eda020d4b86fcb3af78ef919912e6d79b81164dbbb0b0b96da6ac58a2de4b102201a5fd8d48734d5a02371c4b5ee551a69dca3842edbf577d863cf8ae9fdbbd4590121036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536ffffffff01c0aff629010000001976a9145eaaa4f458f9158f86afcba08dd7448d27045e3d88ac00000000",
+            txid: "c19f410bf1d70864220e93bca20f836aaaf8cdde84a46692616e9f4480d54885",
+            inputs: vec![ONE_BTC * 50],
+            outputs: vec![ONE_BTC * 50 - MINER_FEE],
+            // `vsize` is different from the estimated value due to the signatures der serialization.
+            vsize: 191,
+            weight: 764,
+            fee: MINER_FEE,
+        });
+}
+
+/// Note this test contains a sample transaction that has never been broadcasted.
+#[test]
+fn test_bitcoin_sign_input_p2pkh_public_key() {
+    test_bitcoin_sign_input_p2pkh(P2PKHClaimingScriptType::PublicKey);
+}
+
+/// Note this test contains a sample transaction that has never been broadcasted.
+#[test]
+fn test_bitcoin_sign_input_p2pkh_public_key_hash() {
+    test_bitcoin_sign_input_p2pkh(P2PKHClaimingScriptType::PublicKeyHash);
+}
+
+/// Note this test contains a sample transaction that has never been broadcasted.
+#[test]
+fn test_bitcoin_sign_input_p2pkh_address() {
+    test_bitcoin_sign_input_p2pkh(P2PKHClaimingScriptType::P2PKHAddress);
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2sh.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2sh.rs
new file mode 100644
index 00000000000..3e5e5854a27
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2sh.rs
@@ -0,0 +1,191 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, TransactionOneof, BITCOIN_P2SH_PREFIX, DUST,
+    MINER_FEE, ONE_BTC, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_hash::hasher::sha256_ripemd;
+use tw_hash::H160;
+use tw_keypair::ecdsa;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::address::legacy::LegacyAddress;
+use tw_utxo::script::standard_script::conditions;
+
+enum P2SHRecipientType {
+    RedeemScript,
+    RedeemScriptHash,
+    P2SHAddress,
+}
+
+fn test_bitcoin_sign_input_p2pkh_output_p2sh(recipient_type: P2SHRecipientType) {
+    let alice_privkey_data = "56429688a1a6b00b90ccd22a0de0a376b6569d8684022ae92229a28478bfb657"
+        .decode_hex()
+        .unwrap();
+    let alice_private_key =
+        ecdsa::secp256k1::PrivateKey::try_from(alice_privkey_data.as_slice()).unwrap();
+    let alice_public_key = alice_private_key.public();
+
+    let bob_private_key = "b7da1ec42b19085fe09fec54b9d9eacd998ae4e6d2ad472be38d8393391b9ead";
+    let bob_private_key = ecdsa::secp256k1::PrivateKey::try_from(bob_private_key).unwrap();
+    let bob_public_key = bob_private_key.public();
+
+    // Create transaction with P2SH output.
+
+    let txid = "e7503721268d0547b3b009dab56e5ebd8bcadbfc7dfae3468a56b5cb0c07a2f7";
+
+    let tx0 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: 50 * ONE_BTC,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_public_key.compressed().to_vec()),
+        ..Default::default()
+    };
+
+    // We use a simple P2PKH as the redeem script (ie. P2PKH embedded inside P2SH).
+    let bob_pubkey_hash = sha256_ripemd(bob_public_key.compressed().as_slice());
+    let bob_pubkey_hash = H160::try_from(bob_pubkey_hash.as_slice()).unwrap();
+    let redeem_script = conditions::new_p2pkh(&bob_pubkey_hash);
+
+    let to_recipient = match recipient_type {
+        P2SHRecipientType::RedeemScript => output::p2sh_with_script(redeem_script.to_vec()),
+        P2SHRecipientType::RedeemScriptHash => {
+            let script_hash = sha256_ripemd(redeem_script.as_slice());
+            output::p2sh_with_hash(script_hash)
+        },
+        P2SHRecipientType::P2SHAddress => {
+            let p2sh_address =
+                LegacyAddress::p2sh_with_prefix_byte(&redeem_script, BITCOIN_P2SH_PREFIX).unwrap();
+            output::to_address(p2sh_address.to_string().as_str())
+        },
+    };
+
+    let out0 = Proto::Output {
+        value: 50 * ONE_BTC - MINER_FEE,
+        to_recipient,
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx0],
+        outputs: vec![out0],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_keys: vec![alice_privkey_data.into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "0200000001f7a2070ccbb5568a46e3fa7dfcdbca8bbd5e6eb5da09b0b347058d26213750e7000000006a473044022007c88caf624c0a130fc79d2835ed5b6db49f2dea0d5e685f06138aaa4a904d690220243fe7744c8b48759e74a87075de3f548988252a770871fc1444652bb32ec46e0121036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536ffffffff01c0aff6290100000017a914a519b524d55ae8972e8e0e6b9d645ab20eb2635e8700000000",
+            txid: "5d99b77a411a879fb6fa5b442f0d121965346d8e5ab61e0d189967fd5f49bd82",
+            inputs: vec![ONE_BTC * 50],
+            outputs: vec![ONE_BTC * 50 - MINER_FEE],
+            vsize: 189,
+            weight: 756,
+            fee: MINER_FEE,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2sh_with_redeem_script() {
+    test_bitcoin_sign_input_p2pkh_output_p2sh(P2SHRecipientType::RedeemScript);
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2sh_with_redeem_script_hash() {
+    test_bitcoin_sign_input_p2pkh_output_p2sh(P2SHRecipientType::RedeemScriptHash);
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2sh_with_address() {
+    test_bitcoin_sign_input_p2pkh_output_p2sh(P2SHRecipientType::P2SHAddress);
+}
+
+// TODO uncomment when P2SH spend is ready
+// #[test]
+// fn test_bitcoin_sign_input_p2sh_output_p2pkh() {
+//     // Create transaction with P2SH as input (claim).
+//
+//     let txid: Vec<u8> = hex("5d99b77a411a879fb6fa5b442f0d121965346d8e5ab61e0d189967fd5f49bd82")
+//         .into_iter()
+//         .rev()
+//         .collect();
+//
+//     let tx1 = Proto::Input {
+//         txid: txid.as_slice().into(),
+//         vout: 0,
+//         value: 50 * ONE_BTC - MINER_FEE,
+//         sighash_type: UtxoProto::SighashType::All,
+//         to_recipient: ProtoInputRecipient::builder(Proto::mod_Input::InputBuilder {
+//             // The way P2SH is signed in Bitcoin, we first place the redeem script directly here.
+//             variant: ProtoInputBuilder::p2sh(redeem_script.as_bytes().into()),
+//         }),
+//         ..Default::default()
+//     };
+//
+//     let out1 = Proto::Output {
+//         value: 50 * ONE_BTC - MINER_FEE - MINER_FEE,
+//         to_recipient: ProtoOutputRecipient::builder(Proto::mod_Output::OutputBuilder {
+//             variant: ProtoOutputBuilder::p2pkh(Proto::ToPublicKeyOrHash {
+//                 to_address: ProtoPubkeyOrHash::pubkey(alice_pubkey.as_slice().into()),
+//             }),
+//         }),
+//     };
+//
+//     let mut signing = Proto::SigningInput {
+//         inputs: vec![tx1],
+//         outputs: vec![out1],
+//         input_selector: UtxoProto::InputSelector::UseAll,
+//         disable_change_output: true,
+//         ..Default::default()
+//     };
+//
+//     // Generate the sighashes.
+//     let sighashes = BitcoinEntry.preimage_hashes(&coin, signing.clone());
+//     assert_eq!(sighashes.error, Proto::Error::OK);
+//
+//     // Sign the sighashes.
+//     let signatures = Signer::signatures_from_proto(
+//         &sighashes,
+//         bob_private_key.to_vec(),
+//         Default::default(),
+//         false,
+//     )
+//     .unwrap();
+//
+//     let sig = &signatures[0];
+//
+//     // Construc the final redeem scrip with the necessary stack items (signature + pubkey).
+//     let mut sig_buf = PushBytesBuf::new();
+//     sig_buf.extend_from_slice(sig).unwrap();
+//
+//     let mut redeem_buf = PushBytesBuf::new();
+//     redeem_buf
+//         .extend_from_slice(redeem_script.as_bytes())
+//         .unwrap();
+//
+//     let finalized = ScriptBuf::builder()
+//         .push_slice(sig_buf)
+//         .push_key(&bob_native_pubkey)
+//         .push_slice(redeem_buf.as_push_bytes())
+//         .into_script();
+//
+//     // Now that we've signed the input, we update the input with the complete,
+//     // finalized redeem script.
+//     signing.inputs[0].to_recipient = ProtoInputRecipient::builder(Proto::mod_Input::InputBuilder {
+//         variant: ProtoInputBuilder::p2sh(finalized.as_bytes().into()),
+//     });
+//
+//     // Compile the final transaction.
+//     let signed = BitcoinEntry.compile(&coin, signing, signatures, vec![]);
+//     let encoded = tw_encoding::hex::encode(signed.encoded, false);
+//     assert_eq!(signed.error, Proto::Error::OK);
+//     assert_eq!(&encoded, "020000000182bd495ffd6799180d1eb65a8e6d346519120d2f445bfab69f871a417ab7995d000000008447304402207aad4b72c6d78c81a1e795325bd5ddb449f0a1363205903f5e37950e6b89054102202aaf4dd919700d21fe2431352df99c434378bd0d46b778b445079579300effdf0121037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf1976a9145eaaa4f458f9158f86afcba08dd7448d27045e3d88acffffffff01806de729010000001976a914e4c1ea86373d554b8f4efff2cfb0001ea19124d288ac00000000");
+// }
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2tr_key_path.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2tr_key_path.rs
new file mode 100644
index 00000000000..2f4eadf0cec
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2tr_key_path.rs
@@ -0,0 +1,381 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, TransactionOneof, BITCOIN_HRP, DUST, MINER_FEE,
+    ONE_BTC, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::{ecdsa, schnorr};
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::address::taproot::TaprootAddress;
+use tw_utxo::script::standard_script::conditions;
+
+const ALICE_PRIVATE_KEY: &str = "12ce558df23528f1aa86f1f51ac7e13a197a06bda27610fa89e13b04c40ee999";
+const BOB_PRIVATE_KEY: &str = "26c2566adcc030a1799213bfd546e615f6ab06f72085ec6806ff1761da48d227";
+
+fn p2tr_key_path_address(internal_pubkey: &schnorr::PublicKey) -> String {
+    let pubkey = internal_pubkey.compressed();
+    let merkle_root = None;
+    TaprootAddress::p2tr_with_public_key(BITCOIN_HRP.to_string(), &pubkey, merkle_root)
+        .unwrap()
+        .to_string()
+}
+
+enum P2TRRecipientType {
+    KeyPath,
+    KeyPathAssumeTweaked,
+    P2TRAddress,
+}
+
+fn test_bitcoin_sign_input_p2pkh_output_p2tr_key_path(send_to: P2TRRecipientType) {
+    let alice_private_key = schnorr::PrivateKey::try_from(ALICE_PRIVATE_KEY).unwrap();
+    let alice_pubkey = alice_private_key.public();
+
+    let bob_private_key = schnorr::PrivateKey::try_from(BOB_PRIVATE_KEY).unwrap();
+    let bob_pubkey = bob_private_key.public();
+
+    let txid = "c50563913e5a838f937c94232f5a8fc74e58b629fae41dfdffcc9a70f833b53a";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: ONE_BTC * 50,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_pubkey.to_vec()),
+        ..Default::default()
+    };
+
+    let to_recipient = match send_to {
+        P2TRRecipientType::KeyPath => output::p2tr_key_path(bob_pubkey.to_vec()),
+        P2TRRecipientType::KeyPathAssumeTweaked => {
+            let bob_pubkey_tweaked = bob_pubkey.tweak(None).x_only();
+            output::p2tr_assume_tweaked(bob_pubkey_tweaked.bytes().to_vec())
+        },
+        P2TRRecipientType::P2TRAddress => output::to_address(&p2tr_key_path_address(&bob_pubkey)),
+    };
+
+    let out1 = Proto::Output {
+        value: ONE_BTC * 50 - MINER_FEE,
+        to_recipient,
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![ALICE_PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    let txid = "9a582032f6a50cedaff77d3d5604b33adf8bc31bdaef8de977c2187e395860ac";
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000013ab533f8709accfffd1de4fa29b6584ec78f5a2f23947c938f835a3e916305c5000000006b48304502210086ab2c2192e2738529d6cd9604d8ee75c5b09b0c2f4066a5c5fa3f87a26c0af602202afc7096aaa992235c43e712146057b5ed6a776d82b9129620bc5a21991c0a5301210351e003fdc48e7f31c9bc94996c91f6c3273b7ef4208a1686021bedf7673bb058ffffffff01c0aff62901000000225120e01cfdd05da8fa1d71f987373f3790d45dea9861acb0525c86656fe50f4397a600000000",
+            txid,
+            inputs: vec![ONE_BTC * 50],
+            outputs: vec![ONE_BTC * 50 - MINER_FEE],
+            vsize: 201,
+            weight: 804,
+            fee: MINER_FEE,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2tr_key_path() {
+    test_bitcoin_sign_input_p2pkh_output_p2tr_key_path(P2TRRecipientType::KeyPath);
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2tr_assume_tweaked() {
+    test_bitcoin_sign_input_p2pkh_output_p2tr_key_path(P2TRRecipientType::KeyPathAssumeTweaked);
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2tr_address() {
+    test_bitcoin_sign_input_p2pkh_output_p2tr_key_path(P2TRRecipientType::P2TRAddress);
+}
+
+enum P2TRClaimingScriptType {
+    KeyPath,
+    P2TRAddress,
+    // Direct scriptPubkey with the witness program.
+    P2TRCustomScript,
+}
+
+fn test_bitcoin_sign_output_p2tr(utxo_owner: P2TRClaimingScriptType) {
+    let alice_private_key = schnorr::PrivateKey::try_from(ALICE_PRIVATE_KEY).unwrap();
+    let alice_pubkey = alice_private_key.public();
+
+    let bob_private_key = schnorr::PrivateKey::try_from(BOB_PRIVATE_KEY).unwrap();
+    let bob_pubkey = bob_private_key.public();
+
+    let claiming_script = match utxo_owner {
+        P2TRClaimingScriptType::KeyPath => input::p2tr_key_path(bob_pubkey.to_vec()),
+        P2TRClaimingScriptType::P2TRAddress => {
+            input::receiver_address(&p2tr_key_path_address(&bob_pubkey))
+        },
+        P2TRClaimingScriptType::P2TRCustomScript => {
+            let custom_script = conditions::new_p2tr_key_path(&bob_pubkey.compressed());
+            input::custom_script(custom_script.to_vec())
+        },
+    };
+
+    // Now spend `9a582032f6a50cedaff77d3d5604b33adf8bc31bdaef8de977c2187e395860ac` output
+    // created at `test_bitcoin_sign_input_p2pkh_output_p2tr_key_path` test.
+    let txid = "9a582032f6a50cedaff77d3d5604b33adf8bc31bdaef8de977c2187e395860ac";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: ONE_BTC * 50 - MINER_FEE,
+        sighash_type: SIGHASH_ALL,
+        claiming_script,
+        ..Default::default()
+    };
+
+    let out1 = Proto::Output {
+        value: ONE_BTC * 50 - MINER_FEE - MINER_FEE,
+        to_recipient: output::p2tr_key_path(alice_pubkey.to_vec()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![BOB_PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        // We enable deterministic Schnorr signatures here
+        dangerous_use_fixed_schnorr_rng: true,
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000000101ac6058397e18c277e98defda1bc38bdf3ab304563d7df7afed0ca5f63220589a0000000000ffffffff01806de72901000000225120a5c027857e359d19f625e52a106b8ac6ca2d6a8728f6cf2107cd7958ee0787c20140ec2d3910d41506b60aaa20520bb72f15e2d2cbd97e3a8e26ee7bad5f4c56b0f2fb0ceaddac33cb2813a33ba017ba6b1d011bab74a0426f12a2bcf47b4ed5bc8600000000",
+            txid: "1487204b521cd24d4e30e9998d2b0584ac8efd41d42bac041dc899abcf83ecdf",
+            inputs: vec![ONE_BTC * 50 - MINER_FEE],
+            outputs: vec![ONE_BTC * 50 - MINER_FEE - MINER_FEE],
+            vsize: 111,
+            weight: 444,
+            fee: MINER_FEE,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_input_p2tr_key_path() {
+    test_bitcoin_sign_output_p2tr(P2TRClaimingScriptType::KeyPath);
+}
+
+#[test]
+fn test_bitcoin_sign_input_p2tr_address() {
+    test_bitcoin_sign_output_p2tr(P2TRClaimingScriptType::P2TRAddress);
+}
+
+#[test]
+fn test_bitcoin_sign_input_p2tr_custom_script() {
+    test_bitcoin_sign_output_p2tr(P2TRClaimingScriptType::P2TRCustomScript);
+}
+
+/// Transfer from P2TR to P2WPKH address.
+#[test]
+fn test_bitcoin_sign_input_p2tr_key_path_with_change_output_a9c63d() {
+    const PRIVATE_KEY: &str = "7fa638b0df495b2968ae6dc7011c4db08c86df16c91aa71a77ee6a222954e5bb";
+    const SEND_TO: &str = "bc1qtaquch7d90x37qre6f75z5a6l0luzh0c03epyz";
+
+    let my_private_key = schnorr::PrivateKey::try_from(PRIVATE_KEY).unwrap();
+    let my_public_key = my_private_key.public();
+
+    let txid = "75ed78f0ae2bad924065d2357ef01184ceee2181c44e03337746512be9371a82";
+    let utxo0 = Proto::Input {
+        out_point: input::out_point(txid, 1),
+        value: 8_802,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2tr_key_path(my_public_key.to_vec()),
+        ..Default::default()
+    };
+
+    let out0 = Proto::Output {
+        value: 3_000,
+        to_recipient: output::to_address(SEND_TO),
+    };
+    // Send the change amount back to the same P2TR address.
+    // The correct amount will be calculated for us.
+    let change_output = Proto::Output {
+        to_recipient: output::p2tr_key_path(my_public_key.to_vec()),
+        ..Proto::Output::default()
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![utxo0],
+        outputs: vec![out0],
+        input_selector: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 8,
+        change_output: Some(change_output),
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        dangerous_use_fixed_schnorr_rng: true,
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    // Successfully broadcasted: https://mempool.space/tx/a9c63dfe54f6ff462155d966a54226c456b3e43b52a9abe55d7fa87d6564c6e4
+    let txid = "a9c63dfe54f6ff462155d966a54226c456b3e43b52a9abe55d7fa87d6564c6e4";
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000000101821a37e92b51467733034ec48121eece8411f07e35d2654092ad2baef078ed750100000000ffffffff02b80b0000000000001600145f41cc5fcd2bcd1f0079d27d4153bafbffc15df83212000000000000225120412a773e0bba5cfb5462d024cd4bf2cce1b8688a9e7a7a3f8507ebba8f00de580140cbe4d13bc9e067b042179e2c217e4e4b1d552119d12839aa4df11c21282f9159e2c4b58a4f22b291c200c0d0c5f277902282bdd78589dff0edbea89d3f00d77400000000",
+            txid,
+            inputs: vec![8_802],
+            outputs: vec![3_000, 4_658],
+            vsize: 142,
+            weight: 568,
+            fee: 1_144,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_input_p2tr_key_path_with_max_amount_89c5d1() {
+    const PRIVATE_KEY: &str = "7fa638b0df495b2968ae6dc7011c4db08c86df16c91aa71a77ee6a222954e5bb";
+    const SEND_TO: &str = "bc1qtaquch7d90x37qre6f75z5a6l0luzh0c03epyz";
+
+    let my_private_key = schnorr::PrivateKey::try_from(PRIVATE_KEY).unwrap();
+    let my_public_key = my_private_key.public();
+
+    let txid = "a9c63dfe54f6ff462155d966a54226c456b3e43b52a9abe55d7fa87d6564c6e4";
+    let utxo0 = Proto::Input {
+        out_point: input::out_point(txid, 1),
+        value: 4_658,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2tr_key_path(my_public_key.to_vec()),
+        ..Default::default()
+    };
+
+    // Send max amount to an address.
+    let max_output = Proto::Output {
+        to_recipient: output::to_address(SEND_TO),
+        ..Proto::Output::default()
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![utxo0],
+        input_selector: Proto::InputSelector::SelectDescending,
+        fee_per_vb: 6,
+        max_amount_output: Some(max_output),
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        dangerous_use_fixed_schnorr_rng: true,
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    // Successfully broadcasted: https://mempool.space/tx/89c5d1d6242677a409c20fee95d6c7f7f397b82f707c96cca8e83308c4400f07
+    let txid = "89c5d1d6242677a409c20fee95d6c7f7f397b82f707c96cca8e83308c4400f07";
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000000101e4c664657da87f5de5aba9523be4b356c42642a566d9552146fff654fe3dc6a90100000000ffffffff01da0f0000000000001600145f41cc5fcd2bcd1f0079d27d4153bafbffc15df80140f480cb921aeae4ab03e0455da56517b6a9f2f90145e4432e0c1c39b1c06a42aa8265b30bed2d4185de2302faa89cb2a664a8a38b7fe9808a926263b7bf7cffb800000000",
+            txid,
+            inputs: vec![4_658],
+            outputs: vec![4_058],
+            vsize: 99,
+            weight: 396,
+            fee: 600,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_input_p2tr_and_p2wpkh() {
+    const P2TR_PRIVATE_KEY: &str =
+        "2481de1ce115aa2f0ae9066046baf37256db97958aa7a5ac26c6d8ed0a48e88c";
+    const P2WPKH_PRIVATE_KEY: &str =
+        "25834fabebf75c15d5852aed768894e6f49853023df586e3dd5e83b42a9e2e2b";
+    const SEND_TO: &str = "bc1q8jqgv4us4pluu8nql9ze66y6rs6kxwk5tq678a";
+
+    let p2tr_private_key = schnorr::PrivateKey::try_from(P2TR_PRIVATE_KEY).unwrap();
+    let p2wpkh_private_key = ecdsa::secp256k1::PrivateKey::try_from(P2WPKH_PRIVATE_KEY).unwrap();
+
+    let txid = "0200c9a11371465e5d02fdb86fd13f2fa76561fd9d7d14929f31b8f919217995";
+    let p2tr_utxo = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: 5_817,
+        sighash_type: SIGHASH_ALL,
+        // Spend a P2TR UTXO.
+        claiming_script: input::p2tr_key_path(p2tr_private_key.public().to_vec()),
+        ..Default::default()
+    };
+
+    let txid = "aff21919411e1988755768c2f7d2c34b7451a12f81c333d7609f6f03f408f2f0";
+    let p2wpkh_utxo = Proto::Input {
+        out_point: input::out_point(txid, 1),
+        value: 4_500,
+        sighash_type: SIGHASH_ALL,
+        // Spend a P2WPKH UTXO.
+        claiming_script: input::p2wpkh(p2wpkh_private_key.public().to_vec()),
+        ..Default::default()
+    };
+
+    // Send max amount to a P2WPKH address.
+    let max_output = Proto::Output {
+        to_recipient: output::to_address(SEND_TO),
+        ..Proto::Output::default()
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![p2tr_utxo, p2wpkh_utxo],
+        input_selector: Proto::InputSelector::UseAll,
+        fee_per_vb: 4,
+        max_amount_output: Some(max_output),
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![
+            P2TR_PRIVATE_KEY.decode_hex().unwrap().into(),
+            P2WPKH_PRIVATE_KEY.decode_hex().unwrap().into(),
+        ],
+        chain_info: btc_info(),
+        dangerous_use_fixed_schnorr_rng: true,
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    // Successfully broadcasted: https://mempool.space/tx/bfc782da443774b9cf35e6d59b08312be311d791b4e802136fff88adc2312d28
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "0200000000010295792119f9b8319f92147d9dfd6165a72f3fd16fb8fd025d5e467113a1c900020000000000fffffffff0f208f4036f9f60d733c3812fa151744bc3d2f7c268577588191e411919f2af0100000000ffffffff01ad250000000000001600143c80865790a87fce1e60f9459d689a1c35633ad40140d8cd111da08d7863366d4ff23f6b3be3ce7c7496ecabdbb6a275b1591270767e163d091b208190abae3075f24f11b1291656732369e3f9a14efdf131e481701302473044022021df9a043a886a9e7068fe06a19d8aa0a4a5a21c4b4e50abdbc6aeede32ca494022049da5e9082d83e6108027f4d63965cee50a2c9b619e603692748388150b3bf840121037ef29d31b889dfbae30cff4e996f742a49aae10a03fb6f992048c8d366b4b7c900000000",
+            txid: "bfc782da443774b9cf35e6d59b08312be311d791b4e802136fff88adc2312d28",
+            inputs: vec![5_817, 4_500],
+            outputs: vec![9_645],
+            vsize: 167,
+            weight: 667,
+            fee: 672,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2tr_script_path.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2tr_script_path.rs
new file mode 100644
index 00000000000..5b4f67bb338
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2tr_script_path.rs
@@ -0,0 +1,150 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, TransactionOneof, DUST, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::schnorr;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::transaction::asset::brc20::{BRC20TransferInscription, Brc20Ticker};
+
+const ALICE_PRIVATE_KEY: &str = "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129";
+
+/// A test for the custom P2TR script-path builders. This test essentially
+/// reconstruct the BRC20 transfer tests, but without using the convenience
+/// builders.
+#[test]
+fn test_bitcoin_sign_output_p2tr_custom_script_path() {
+    let alice_private_key = schnorr::PrivateKey::try_from(ALICE_PRIVATE_KEY).unwrap();
+    let alice_pubkey = alice_private_key.public();
+
+    let txid = "8ec895b4d30adb01e38471ca1019bfc8c3e5fbd1f28d9e7b5653260d89989008";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 1),
+        value: 26_400,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2wpkh(alice_pubkey.to_vec()),
+        ..Default::default()
+    };
+
+    // Build the BRC20 transfer outside the library, only provide essential
+    // information to the builder.
+    let ticker = Brc20Ticker::new("oadf".to_string()).unwrap();
+    let amount = "20".to_string();
+    let inscribe_to = alice_pubkey.compressed();
+    let transfer = BRC20TransferInscription::new(&inscribe_to, &ticker, &amount).unwrap();
+    let merkle_root = transfer.spend_info.merkle_root().unwrap();
+
+    // Provide the public key ("internal key") and the merkle root directly to the builder.
+    let out1 = Proto::Output {
+        value: 7_000,
+        to_recipient: output::p2tr_script_path(alice_pubkey.to_vec(), merkle_root.to_vec()),
+    };
+
+    // Change/return transaction.
+    let out2 = Proto::Output {
+        value: 16_400,
+        to_recipient: output::p2wpkh(alice_pubkey.to_vec()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1, out2],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![ALICE_PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        // We enable deterministic Schnorr signatures here
+        dangerous_use_fixed_schnorr_rng: true,
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000",
+            txid: "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1",
+            inputs: vec![26_400],
+            outputs: vec![7_000, 16_400],
+            vsize: 153,
+            weight: 610,
+            fee: 3000,
+        });
+}
+
+// TODO uncomment when input P2TR script path
+// #[test]
+// fn test_bitcoin_sign_input_p2tr_custom_script_path() {
+//     // https://www.blockchain.com/explorer/transactions/btc/797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1
+//     let txid: Vec<u8> = hex("797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1")
+//         .into_iter()
+//         .rev()
+//         .collect();
+//
+//     // Prepare the BRC20 payload and control block.
+//     let payload = &transfer.script;
+//     let control_block = transfer
+//         .spend_info
+//         .control_block(&(payload.to_owned(), LeafVersion::TapScript))
+//         .unwrap();
+//
+//     // Provide the payload and control block directly to the builder.
+//     let tx1 = Proto::Input {
+//         txid: txid.as_slice().into(),
+//         vout: 0,
+//         value: 7_000,
+//         sighash_type: UtxoProto::SighashType::UseDefault,
+//         to_recipient: ProtoInputRecipient::builder(Proto::mod_Input::InputBuilder {
+//             variant: ProtoInputBuilder::p2tr_script_path(
+//                 Proto::mod_Input::InputTaprootScriptPath {
+//                     one_prevout: false,
+//                     payload: payload.to_vec().into(),
+//                     control_block: control_block.serialize().into(),
+//                 },
+//             ),
+//         }),
+//         ..Default::default()
+//     };
+//
+//     let out1 = Proto::Output {
+//         value: 546,
+//         to_recipient: ProtoOutputRecipient::builder(Proto::mod_Output::OutputBuilder {
+//             variant: ProtoOutputBuilder::p2wpkh(Proto::ToPublicKeyOrHash {
+//                 to_address: ProtoPubkeyOrHash::pubkey(alice_pubkey.as_slice().into()),
+//             }),
+//         }),
+//     };
+//
+//     let signing = Proto::SigningInput {
+//         private_key: alice_private_key.as_slice().into(),
+//         inputs: vec![tx1],
+//         outputs: vec![out1],
+//         input_selector: UtxoProto::InputSelector::UseAll,
+//         disable_change_output: true,
+//         // We enable deterministic Schnorr signatures here
+//         dangerous_use_fixed_schnorr_rng: true,
+//         ..Default::default()
+//     };
+//
+//     let signed = BitcoinEntry.sign(&coin, signing);
+//     assert_eq!(signed.error, Proto::Error::OK);
+//
+//     // https://www.blockchain.com/explorer/transactions/btc/7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca
+//     assert_eq!(
+//         signed.txid,
+//         hex("7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca")
+//     );
+//
+//     let encoded = tw_encoding::hex::encode(signed.encoded, false);
+//     let transaction = signed.transaction.unwrap();
+//
+//     assert_eq!(encoded, "02000000000101b11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790000000000ffffffff012202000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d03406a35548b8fa4620028e021a944c1d3dc6e947243a7bfc901bf63fefae0d2460efa149a6440cab51966aa4f09faef2d1e5efcba23ab4ca6e669da598022dbcfe35b0063036f7264010118746578742f706c61696e3b636861727365743d7574662d3800377b2270223a226272632d3230222c226f70223a227472616e73666572222c227469636b223a226f616466222c22616d74223a223230227d6821c00f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000");
+//     assert_eq!(transaction.inputs.len(), 1);
+//     assert_eq!(transaction.outputs.len(), 1);
+// }
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2wpkh.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2wpkh.rs
new file mode 100644
index 00000000000..9506375debb
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2wpkh.rs
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, TransactionOneof, DUST, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::ecdsa;
+use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
+use tw_proto::BitcoinV2::Proto;
+
+#[test]
+fn test_bitcoin_sign_p2wpkh_input_different_builders() {
+    let my_private_key = "9ea2172511ed73ae0096be8e593c3b75631700edaf729f1abbae607314a20e35";
+    let my_private_key = ecdsa::secp256k1::PrivateKey::try_from(my_private_key).unwrap();
+    let my_address = "bc1qvrt7ukvhvmdny0a3j9k8l8jasx92lrqm30t2u2";
+    // A redeem script for any P2WPKH UTXO sent to my address.
+    let custom_redeem_script = "001460d7ee599766db323fb1916c7f9e5d818aaf8c1b"
+        .decode_hex()
+        .unwrap();
+
+    let utxo_hash_0 = "b33082a5fad105c1d9712e8d503971fe4d84713065bd323fd1019636ed940e8d";
+    let utxo_0 = Proto::Input {
+        out_point: input::out_point(utxo_hash_0, 1),
+        value: 30_269,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2wpkh(my_private_key.public().to_vec()),
+        ..Default::default()
+    };
+
+    let utxo_hash_1 = "1f62c18bfc5f8293a2b7b061587c427bf830fb224289f9a806e6ad48de6a4c7d";
+    let utxo_1 = Proto::Input {
+        out_point: input::out_point(utxo_hash_1, 1),
+        value: 4_863,
+        sighash_type: SIGHASH_ALL,
+        // Equivalent to `input::p2wpkh(my_private_key.public().to_vec())`.
+        claiming_script: input::receiver_address(my_address),
+        ..Default::default()
+    };
+
+    let utxo_hash_2 = "71c3343dfca5f1914e1bfc04153517d73650cb9c931e8511d24d1f5290120f6f";
+    let utxo_2 = Proto::Input {
+        out_point: input::out_point(utxo_hash_2, 0),
+        value: 300,
+        sighash_type: SIGHASH_ALL,
+        // Equivalent to `input::p2wpkh(my_private_key.public().to_vec())`.
+        claiming_script: input::custom_script(custom_redeem_script),
+        ..Default::default()
+    };
+
+    let out_0 = Proto::Output {
+        value: 28_035,
+        to_recipient: output::to_address("bc1q2dsdlq3343vk29runkgv4yc292hmq53jedfjmp"),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V1,
+        inputs: vec![utxo_0, utxo_1, utxo_2],
+        outputs: vec![out_0],
+        change_output: None,
+        // No matter which selector to use.
+        input_selector: Proto::InputSelector::SelectAscending,
+        dust_policy: dust_threshold(DUST),
+        fee_per_vb: 33,
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![my_private_key.to_zeroizing_vec().to_vec().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    // Successfully broadcasted: https://mempool.space/tx/5d6bf53576a54be4d92cd8abf58d28ecc9ea7956eaf970d24d6bfcb9fcfe9855
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "010000000001027d4c6ade48ade606a8f9894222fb30f87b427c5861b0b7a293825ffc8bc1621f0100000000ffffffff8d0e94ed369601d13f32bd653071844dfe7139508d2e71d9c105d1faa58230b30100000000ffffffff01836d0000000000001600145360df8231ac5965147c9d90ca930a2aafb0523202483045022100f95f9ac5d39f4b47dcd8c86daaaeac86374258d9960f922333ba0d5fdaa15b7e0220761794672dc9fbd71398d608f72f5d21a0f6c1306c6b700ad0d82f747c221062012103a11506993946e20ea82686b157bf08f944759f43d91af8d84650ee73a482431c02483045022100eb6ba0dcc64af61b2186b7efdab1ff03784d585ee03437f9a53875e93429db080220015a268d308436d3564b83ceaed90bc7272ca164016298ea855d1936568002a7012103a11506993946e20ea82686b157bf08f944759f43d91af8d84650ee73a482431c00000000",
+            txid: "5d6bf53576a54be4d92cd8abf58d28ecc9ea7956eaf970d24d6bfcb9fcfe9855",
+            inputs: vec![4_863, 30_269],
+            outputs: vec![28_035],
+            vsize: 178,
+            weight: 710,
+            // sum(inputs) - sum(outputs)
+            fee: 7_097,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2wsh.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2wsh.rs
new file mode 100644
index 00000000000..ffca582c171
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/p2wsh.rs
@@ -0,0 +1,182 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, TransactionOneof, BITCOIN_HRP, DUST, MINER_FEE,
+    ONE_BTC, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_hash::hasher::sha256_ripemd;
+use tw_hash::sha2::sha256;
+use tw_hash::H160;
+use tw_keypair::ecdsa;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::address::segwit::SegwitAddress;
+use tw_utxo::script::standard_script::conditions;
+use tw_utxo::script::Script;
+
+const ALICE_PRIVATE_KEY: &str = "56429688a1a6b00b90ccd22a0de0a376b6569d8684022ae92229a28478bfb657";
+const BOB_PRIVATE_KEY: &str = "b7da1ec42b19085fe09fec54b9d9eacd998ae4e6d2ad472be38d8393391b9ead";
+
+fn p2pkh_redeem_script(public_key: &ecdsa::secp256k1::PublicKey) -> Script {
+    let pubkey_hash = sha256_ripemd(public_key.compressed().as_slice());
+    let pubkey_hash = H160::try_from(pubkey_hash.as_slice()).unwrap();
+    conditions::new_p2pkh(&pubkey_hash)
+}
+
+enum P2WSHRecipientType {
+    RedeemScript,
+    RedeemScriptHash,
+    P2WSHAddress,
+}
+
+fn test_bitcoin_sign_output_p2wsh(recipient_type: P2WSHRecipientType) {
+    let alice_private_key = ecdsa::secp256k1::PrivateKey::try_from(ALICE_PRIVATE_KEY).unwrap();
+    let alice_pubkey = alice_private_key.public();
+
+    let bob_private_key = ecdsa::secp256k1::PrivateKey::try_from(BOB_PRIVATE_KEY).unwrap();
+    let bob_pubkey = bob_private_key.public();
+
+    // Create transaction with P2WSH as output (spend).
+
+    let txid = "c01007bb55bde4e70278e1154c34db72f34a833687d3f37443bd5c49137ee5fe";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: 50 * ONE_BTC - 2 * MINER_FEE,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_pubkey.compressed().to_vec()),
+        ..Default::default()
+    };
+
+    // We use a simple P2PKH as the redeem script (ie. P2PKH embedded inside P2WSH).
+    let redeem_script = p2pkh_redeem_script(&bob_pubkey);
+    let to_recipient = match recipient_type {
+        P2WSHRecipientType::RedeemScript => output::p2wsh_with_script(redeem_script.to_vec()),
+        P2WSHRecipientType::RedeemScriptHash => {
+            let script_hash = sha256(redeem_script.as_slice());
+            output::p2wsh_with_hash(script_hash)
+        },
+        P2WSHRecipientType::P2WSHAddress => {
+            let p2wsh_address =
+                SegwitAddress::p2wsh_with_hrp(&redeem_script, BITCOIN_HRP.to_string()).unwrap();
+            output::to_address(&p2wsh_address.to_string())
+        },
+    };
+
+    let out1 = Proto::Output {
+        value: 50 * ONE_BTC - 3 * MINER_FEE,
+        to_recipient,
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![ALICE_PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "0200000001fee57e13495cbd4374f3d38736834af372db344c15e17802e7e4bd55bb0710c0000000006b483045022100edd19b379131b9f7a05ff2a79313ccec181f2e3fd06901e27ffff4fa500dbf95022060ae976cd70b8af956fdf4582bb1289bdf233a5bace82e69ea9b7cfb55c583370121036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536ffffffff01402bd82901000000220020883a539555e537e0498732376a3d4d282e304bce7bfda6876a2b63b08a04f54400000000",
+            txid: "dd9d4ca23532f5c89d016e1aacef1210ab5b9d00527c633969841daca7dd17c7",
+            inputs: vec![50 * ONE_BTC - 2 * MINER_FEE],
+            outputs: vec![50 * ONE_BTC - 3 * MINER_FEE],
+            vsize: 201,
+            weight: 804,
+            fee: MINER_FEE,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2wsh_redeem_script() {
+    test_bitcoin_sign_output_p2wsh(P2WSHRecipientType::RedeemScript);
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2wsh_redeem_script_hash() {
+    test_bitcoin_sign_output_p2wsh(P2WSHRecipientType::RedeemScriptHash);
+}
+
+#[test]
+fn test_bitcoin_sign_output_p2wsh_address() {
+    test_bitcoin_sign_output_p2wsh(P2WSHRecipientType::P2WSHAddress);
+}
+
+// TODO uncomment when P2WSH is ready
+// #[test]
+// fn test_bitcoin_sign_input_p2wsh() {
+//     // Create transaction with P2WSH as input (claim).
+//     let txid: Vec<u8> = hex("dd9d4ca23532f5c89d016e1aacef1210ab5b9d00527c633969841daca7dd17c7")
+//         .into_iter()
+//         .rev()
+//         .collect();
+//
+//     let tx1 = Proto::Input {
+//         txid: txid.as_slice().into(),
+//         vout: 0,
+//         value: 50 * ONE_BTC - 3 * MINER_FEE,
+//         sighash_type: UtxoProto::SighashType::All,
+//         to_recipient: ProtoInputRecipient::builder(Proto::mod_Input::InputBuilder {
+//             // The way P2WSH is signed in Bitcoin, we first place the redeem script directly here.
+//             variant: ProtoInputBuilder::p2wsh(redeem_script.to_bytes().into()),
+//         }),
+//         ..Default::default()
+//     };
+//
+//     let out1 = Proto::Output {
+//         value: 50 * ONE_BTC - 4 * MINER_FEE,
+//         to_recipient: ProtoOutputRecipient::builder(Proto::mod_Output::OutputBuilder {
+//             variant: ProtoOutputBuilder::p2pkh(Proto::ToPublicKeyOrHash {
+//                 to_address: ProtoPubkeyOrHash::pubkey(alice_pubkey.as_slice().into()),
+//             }),
+//         }),
+//     };
+//
+//     let mut signing = Proto::SigningInput {
+//         inputs: vec![tx1],
+//         outputs: vec![out1],
+//         input_selector: UtxoProto::InputSelector::UseAll,
+//         disable_change_output: true,
+//         ..Default::default()
+//     };
+//
+//     // Generate the sighashes.
+//     let sighashes = BitcoinEntry.preimage_hashes(&coin, signing.clone());
+//     let sighash = sighashes.sighashes.iter().next().unwrap().sighash.as_ref();
+//     let sighash = H256::try_from(sighash).unwrap();
+//
+//     // Sign the sighash externally.
+//     let private_key = ecdsa::secp256k1::PrivateKey::try_from(bob_private_key.as_slice()).unwrap();
+//     let signature = private_key.sign(sighash).unwrap();
+//
+//     // Construct the final redeem witness stack with the necessary witness stack items (signature + pubkey).
+//     let mut finalized = Witness::new();
+//     finalized.push(sig);
+//     finalized.push(bob_native_pubkey.to_bytes());
+//     finalized.push(redeem_script);
+//
+//     // The witness stack must be encoded correctly.
+//     let mut encoded = vec![];
+//     let _ = finalized.consensus_encode(&mut encoded).unwrap();
+//
+//     // Now that we've signed the input, we update the input with the complete,
+//     // finalized redeem witness stack..
+//     signing.inputs[0].to_recipient = ProtoInputRecipient::builder(Proto::mod_Input::InputBuilder {
+//         variant: ProtoInputBuilder::p2wsh(encoded.into()),
+//     });
+//
+//     // Compile the final transaction.
+//     let signed = BitcoinEntry.compile(&coin, signing, signatures, vec![]);
+//     let encoded = tw_encoding::hex::encode(signed.encoded, false);
+//     assert_eq!(signed.error, Proto::Error::OK);
+//     assert_eq!(&encoded, "02000000000101c717dda7ac1d846939637c52009d5bab1012efac1a6e019dc8f53235a24c9ddd0000000000ffffffff0100e9c829010000001976a914e4c1ea86373d554b8f4efff2cfb0001ea19124d288ac0347304402201d22810b5580a49a2e73d7c4ea90754b5d70d36adb9a8f0c9cb7393da1d1d28f02207683b2e3d31a5c7e74126681f1f2a7249b7a3a918d5890ef69b94bd3bb4fb9300121037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf1976a9145eaaa4f458f9158f86afcba08dd7448d27045e3d88ac00000000");
+// }
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/psbt.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/psbt.rs
new file mode 100644
index 00000000000..fc957c289d8
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/psbt.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::psbt_sign::{BitcoinPsbtSignHelper, Expected};
+use crate::chains::common::bitcoin::transaction_psbt;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_proto::BitcoinV2::Proto;
+
+#[test]
+fn test_bitcoin_sign_psbt_thorchain_swap_witness() {
+    let private_key = "f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55"
+        .decode_hex()
+        .unwrap();
+
+    let psbt = "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d00000000";
+    let input = Proto::SigningInput {
+        private_keys: vec![private_key.into()],
+        transaction: transaction_psbt(psbt),
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted: https://mempool.space/tx/634a416e82ac710166725f6a4090ac7b5db69687e86b2d2e38dcb3d91c956c32
+    BitcoinPsbtSignHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .sign_psbt(Expected {
+            psbt: "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d01086c02483045022100b1229a008f20691639767bf925d6b8956ea957ccc633ad6b5de3618733a55e6b02205774d3320489b8a57a6f8de07f561de3e660ff8e587f6ac5422c49020cd4dc9101210306d8c664ea8fd2683eebea1d3114d90e0a5429e5783ba49b80ddabce04ff28f300000000",
+            encoded: "02000000000101147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d02483045022100b1229a008f20691639767bf925d6b8956ea957ccc633ad6b5de3618733a55e6b02205774d3320489b8a57a6f8de07f561de3e660ff8e587f6ac5422c49020cd4dc9101210306d8c664ea8fd2683eebea1d3114d90e0a5429e5783ba49b80ddabce04ff28f300000000",
+            txid: "634a416e82ac710166725f6a4090ac7b5db69687e86b2d2e38dcb3d91c956c32",
+            vsize: 216,
+            weight: 862,
+            fee: 1736,
+        });
+}
+
+#[test]
+fn test_bitcoin_sign_psbt_thorchain_swap_non_witness() {
+    // 1CKZYtNxAQnTbygz6vyhBYnwx4NvcxURMB
+    let private_key = "7a87cb2c9fa56f7a63dfc50659dca260473cb6bb0fd4d8a2beeaf5357d41de95"
+        .decode_hex()
+        .unwrap();
+
+    let psbt = "70736274ff01008202000000015c37bcf049b7e62dd5bfd707e0998ce86163b786e3cd45db2336cb794a8d8aa10000000000ffffffff03f82a000000000000160014bf5a13a26791a5db6406304a46952e264c2b28910000000000000000056a032b3a6291950000000000001976a9147c2c0ac72afbde13ecf52fca54368e7883b538b188ac000000000001007e0200000002714916920be4dbc87cbb8697ca9b1420d6b1e47e7d732e2d2e0e7a935087788d0000000000ffffffff326c951cd9b3dc382e2d6be88796b65d7bac90406a5f72660171ac826e414a630200000000ffffffff01efca0000000000001976a9147c2c0ac72afbde13ecf52fca54368e7883b538b188ac0000000000000000";
+    let input = Proto::SigningInput {
+        private_keys: vec![private_key.into()],
+        transaction: transaction_psbt(psbt),
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted: https://mempool.space/tx/710e9270b57720f567ada156c6ac72177aa00a36789e2c6526fd80040fae3ce4
+    BitcoinPsbtSignHelper::new(&input)
+        .coin(CoinType::Bitcoin)
+        .sign_psbt(Expected {
+            psbt: "70736274ff01008202000000015c37bcf049b7e62dd5bfd707e0998ce86163b786e3cd45db2336cb794a8d8aa10000000000ffffffff03f82a000000000000160014bf5a13a26791a5db6406304a46952e264c2b28910000000000000000056a032b3a6291950000000000001976a9147c2c0ac72afbde13ecf52fca54368e7883b538b188ac000000000001007e0200000002714916920be4dbc87cbb8697ca9b1420d6b1e47e7d732e2d2e0e7a935087788d0000000000ffffffff326c951cd9b3dc382e2d6be88796b65d7bac90406a5f72660171ac826e414a630200000000ffffffff01efca0000000000001976a9147c2c0ac72afbde13ecf52fca54368e7883b538b188ac0000000001076a473044022057ce7a6147fd9e139df797adcec440bad60770f40cbd609363e3075b64d3eccd02200ae7dce5f7d1fa18c5e907a16c1b078fa90f537d36101447e53fbd058d2d950a0121036c3b7dfd678da989d91593e49918a6c9d8a1d37c7e9c0abeae2118c312e69b3100000000",
+            encoded: "02000000015c37bcf049b7e62dd5bfd707e0998ce86163b786e3cd45db2336cb794a8d8aa1000000006a473044022057ce7a6147fd9e139df797adcec440bad60770f40cbd609363e3075b64d3eccd02200ae7dce5f7d1fa18c5e907a16c1b078fa90f537d36101447e53fbd058d2d950a0121036c3b7dfd678da989d91593e49918a6c9d8a1d37c7e9c0abeae2118c312e69b31ffffffff03f82a000000000000160014bf5a13a26791a5db6406304a46952e264c2b28910000000000000000056a032b3a6291950000000000001976a9147c2c0ac72afbde13ecf52fca54368e7883b538b188ac00000000",
+            txid: "710e9270b57720f567ada156c6ac72177aa00a36789e2c6526fd80040fae3ce4",
+            vsize: 236,
+            weight: 944,
+            fee: 2662,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/send_to_address.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/send_to_address.rs
new file mode 100644
index 00000000000..7cf0c9eeb90
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/send_to_address.rs
@@ -0,0 +1,297 @@
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, TransactionOneof, DUST, SIGHASH_ALL,
+};
+use std::str::FromStr;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::ecdsa;
+use tw_misc::traits::{ToBytesVec, ToBytesZeroizing};
+use tw_proto::BitcoinV2::Proto;
+use tw_utxo::address::legacy::LegacyAddress;
+use tw_utxo::address::segwit::SegwitAddress;
+use tw_utxo::script::standard_script::conditions;
+
+#[test]
+fn test_bitcoin_send_to_p2sh_address() {
+    let p2sh_prefix = btc_info().unwrap().p2sh_prefix as u8;
+
+    let alice_private_key = "57a64865bce5d4855e99b1cce13327c46171434f2d72eeaf9da53ee075e7f90a";
+    let alice_private_key = ecdsa::secp256k1::PrivateKey::try_from(alice_private_key).unwrap();
+    let alice_public_key = alice_private_key.public();
+    let bob_address = "19prEapJCTF3zAS2ofreXyQhcnDscuXxbd";
+
+    // Create the P2SH address.
+    // We use a simple P2PKH as the redeem script.
+    let bob_address = LegacyAddress::from_str(bob_address).unwrap();
+    let p2pkh_redeem_script = conditions::new_p2pkh(&bob_address.payload());
+    let p2sh_address =
+        LegacyAddress::p2sh_with_prefix_byte(&p2pkh_redeem_script, p2sh_prefix).unwrap();
+    assert_eq!(
+        p2sh_address.to_string(),
+        "3BSsey83R7AvczeRrYZihwDTkQ8Khjtewr"
+    );
+
+    let utxo_hash_0 = "181c84965c9ea86a5fac32fdbd5f73a21a7a9e749fb6ab97e273af2329f6b911";
+    let utxo_0 = Proto::Input {
+        out_point: input::out_point(utxo_hash_0, 0),
+        value: 10_000,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_public_key.to_vec().into()),
+        ..Default::default()
+    };
+
+    // The output variant is derived from the specified address.
+    let out_0 = Proto::Output {
+        value: 1_000,
+        to_recipient: output::to_address(&p2sh_address.to_string()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![utxo_0],
+        outputs: vec![out_0],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        fee_per_vb: 1,
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![alice_private_key.to_zeroizing_vec().to_vec().into()],
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "020000000111b9f62923af73e297abb69f749e7a1aa2735fbdfd32ac5f6aa89e5c96841c18000000006a4730440220079b598713c12210c13f059c477f4ab33f85e80749c0925e0ac655bc0a3b9ca802200e9b83fb57ab3f2c907daeb386f02ed1e459aa058168c9e3b4e9a074ec8db78d0121028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28fffffffff01e80300000000000017a9146b04883a86994629fcc84e558968e2d70a3472fd8700000000",
+            txid: "4a476d6bc5e6e7fe13ef4388a22ff75cf9ecebb656483c27f5d884a1f173ac66",
+            inputs: vec![10_000],
+            outputs: vec![1_000],
+            vsize: 189,
+            weight: 756,
+            // sum(inputs) - sum(outputs)
+            fee: 9000,
+        });
+}
+
+#[test]
+fn test_bitcoin_send_to_p2pkh_address() {
+    let alice_private_key = "57a64865bce5d4855e99b1cce13327c46171434f2d72eeaf9da53ee075e7f90a"
+        .decode_hex()
+        .unwrap();
+    let alice_pubkey = "028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28f"
+        .decode_hex()
+        .unwrap();
+    let bob_address = "12C2h5hXPxyrdvnYUBFaBGFnNNYjpWXhPX";
+
+    let txid = "181c84965c9ea86a5fac32fdbd5f73a21a7a9e749fb6ab97e273af2329f6b911";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: 10_000,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_pubkey.clone()),
+        ..Default::default()
+    };
+
+    // The output variant is derived from the specified address.
+    let out1 = Proto::Output {
+        value: 1_000,
+        to_recipient: output::to_address(bob_address),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![alice_private_key.into()],
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "020000000111b9f62923af73e297abb69f749e7a1aa2735fbdfd32ac5f6aa89e5c96841c18000000006b483045022100a42afe29055e70d912c7bc3b113a6a58216ad0eafc7d73ae447df9044e347d900220530c5b4721c0c832d06be4921369792da9187df6fcf17bcf6c77a27d5ed85a200121028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28fffffffff01e8030000000000001976a9140d0e1cec6c2babe8badde5e9b3dea667da90036d88ac00000000",
+            txid: "ff0901ef4796e9a0a82c4f8a6edebe9112cc54c4eefac77f6d4c4dd267b0da86",
+            inputs: vec![10_000],
+            outputs: vec![1_000],
+            vsize: 192,
+            weight: 768,
+            fee: 9_000,
+        });
+}
+
+#[test]
+fn test_bitcoin_send_to_p2wsh_address() {
+    let alice_private_key = "57a64865bce5d4855e99b1cce13327c46171434f2d72eeaf9da53ee075e7f90a";
+    let alice_private_key = ecdsa::secp256k1::PrivateKey::try_from(alice_private_key).unwrap();
+    let alice_pubkey = alice_private_key.public();
+    let bob_address = "12C2h5hXPxyrdvnYUBFaBGFnNNYjpWXhPX";
+
+    // Create the P2WSH address.
+    // We use a simple P2PKH as the redeem script.
+    let bob_address = LegacyAddress::from_str(bob_address).unwrap();
+    let p2pkh_redeem_script = conditions::new_p2pkh(&bob_address.payload());
+    let p2wsh_address =
+        SegwitAddress::p2wsh_with_hrp(&p2pkh_redeem_script, "bc".to_string()).unwrap();
+    assert_eq!(
+        p2wsh_address.to_string(),
+        "bc1qmtahx7nh2fqlcrf8fgf49mq6ywxnvjssay26aa8qfvf3xd907l6suvaz4x"
+    );
+
+    let utxo_hash_0 = "181c84965c9ea86a5fac32fdbd5f73a21a7a9e749fb6ab97e273af2329f6b911";
+    let utxo_0 = Proto::Input {
+        out_point: input::out_point(utxo_hash_0, 0),
+        value: 10_000,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_pubkey.to_vec()),
+        ..Default::default()
+    };
+
+    // The output variant is derived from the specified address.
+    let out_0 = Proto::Output {
+        value: 1_000,
+        to_recipient: output::to_address(&p2wsh_address.to_string()),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![utxo_0],
+        outputs: vec![out_0],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![alice_private_key.to_zeroizing_vec().to_vec().into()],
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "020000000111b9f62923af73e297abb69f749e7a1aa2735fbdfd32ac5f6aa89e5c96841c18000000006b483045022100b0ee8b8a5466db1fef9054e29bf2d241f1637dfafe65f87559bc55028153051802201008183146fd71a744cbe66ae01222c4372f2b6d274658d7dfa18ef33ab5ab5b0121028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28fffffffff01e803000000000000220020dafb737a775241fc0d274a1352ec1a238d364a10e915aef4e04b131334aff7f500000000",
+            txid: "a0dbacd99420b9fdd08623382efc474174e289cd84765097057a24d2cf67b108",
+            inputs: vec![10_000],
+            outputs: vec![1_000],
+            vsize: 201,
+            weight: 804,
+            fee: 9_000,
+        });
+}
+
+#[test]
+fn test_bitcoin_send_to_p2wpkh_address() {
+    let alice_private_key = "57a64865bce5d4855e99b1cce13327c46171434f2d72eeaf9da53ee075e7f90a"
+        .decode_hex()
+        .unwrap();
+    let alice_pubkey = "028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28f"
+        .decode_hex()
+        .unwrap();
+    let bob_address = "bc1qp58pemrv9w473wkauh5m8h4xvldfqqmdk7s5ju";
+
+    let txid = "181c84965c9ea86a5fac32fdbd5f73a21a7a9e749fb6ab97e273af2329f6b911";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: 10_000,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_pubkey),
+        ..Default::default()
+    };
+
+    // The output variant is derived from the specified address.
+    let out1 = Proto::Output {
+        value: 1_000,
+        to_recipient: output::to_address(bob_address),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![alice_private_key.into()],
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "020000000111b9f62923af73e297abb69f749e7a1aa2735fbdfd32ac5f6aa89e5c96841c18000000006b483045022100cdee6087a59c27f670d04d2782d139b202abdb936643bff8c0a46ec726bbc7ec022072241248659a582ef3460bdd232936fcea77b25b0e024f3841f8ba5e89efd31a0121028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28fffffffff01e8030000000000001600140d0e1cec6c2babe8badde5e9b3dea667da90036d00000000",
+            txid: "711566e32e03c01106f019bf1911958979441f5aec5f58b7a368549d4cac569c",
+            inputs: vec![10_000],
+            outputs: vec![1_000],
+            vsize: 189,
+            weight: 756,
+            fee: 9_000,
+        });
+}
+
+#[test]
+fn test_bitcoin_send_to_p2tr_key_path_address() {
+    let alice_private_key = "57a64865bce5d4855e99b1cce13327c46171434f2d72eeaf9da53ee075e7f90a"
+        .decode_hex()
+        .unwrap();
+    let alice_pubkey = "028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28f"
+        .decode_hex()
+        .unwrap();
+    let bob_address = "bc1pps3sf8cl8xuy42s9gnyacez9wlwjxpyf32lrxlac7fw4wnuf6e9s0v066l";
+
+    let txid = "181c84965c9ea86a5fac32fdbd5f73a21a7a9e749fb6ab97e273af2329f6b911";
+    let tx1 = Proto::Input {
+        out_point: input::out_point(txid, 0),
+        value: 10_000,
+        sighash_type: SIGHASH_ALL,
+        claiming_script: input::p2pkh(alice_pubkey),
+        ..Default::default()
+    };
+
+    // The output variant is derived from the specified address.
+    let out1 = Proto::Output {
+        value: 1_000,
+        to_recipient: output::to_address(bob_address),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V2,
+        inputs: vec![tx1],
+        outputs: vec![out1],
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![alice_private_key.into()],
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "020000000111b9f62923af73e297abb69f749e7a1aa2735fbdfd32ac5f6aa89e5c96841c18000000006b483045022100c85b0030e0f18fdb6bf4b6085945732ed6354aa45beb4da3cc8fb76378ab424a02204aef0ccfd9270549c302ca8fca2aed9e6d459b07e7a1af8477f2137e5ca070f30121028d7dce6d72fb8f7af9566616c6436349c67ad379f2404dd66fe7085fe0fba28fffffffff01e8030000000000002251200c23049f1f39b84aaa0544c9dc644577dd2304898abe337fb8f25d574f89d64b00000000",
+            txid: "b37fdb67c208aeb9a42b329eeafe52d9ff870341c8bdc2e09b2a8de64ea13d2a",
+            inputs: vec![10_000],
+            outputs: vec![1_000],
+            vsize: 201,
+            weight: 804,
+            fee: 9_000,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/sighash_single.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/sighash_single.rs
new file mode 100644
index 00000000000..cfde76bbda3
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_sign/sighash_single.rs
@@ -0,0 +1,90 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, TransactionOneof, DUST, SIGHASH_SINGLE,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_keypair::ecdsa;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+
+/// In this test we check not only SIGHASH_SINGLE, but also multiple private keys,
+/// also legacy and witness UTXOs at the same time.
+///
+/// Note this test contains a sample transaction that has never been broadcasted.
+/// https://github.com/trustwallet/wallet-core/blob/b92d1de562c05114e57da521da629d65f116c414/tests/chains/Bitcoin/TWBitcoinSigningTests.cpp#L1231-L1264
+#[test]
+fn test_bitcoin_sign_sighash_single() {
+    let priv_key_1 = "bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866";
+    let priv_key_2 = "619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9";
+
+    let ecdsa_priv_key_1 = ecdsa::secp256k1::PrivateKey::try_from(priv_key_1).unwrap();
+    let ecdsa_priv_key_2 = ecdsa::secp256k1::PrivateKey::try_from(priv_key_2).unwrap();
+
+    let utxo_hash_0 = "9f96ade4b41d5433f4eda31e1738ec2b36f6e7d1420d94a6af99801a88f7f7ff";
+    let utxo_0 = Proto::Input {
+        out_point: input::out_point(utxo_hash_0, 0),
+        value: 210_000_000,
+        sighash_type: SIGHASH_SINGLE,
+        claiming_script: input::p2pk(ecdsa_priv_key_1.public().compressed().to_vec()),
+        ..Default::default()
+    };
+
+    let utxo_hash_1 = "8ac60eb9575db5b2d987e29f301b5b819ea83a5c6579d282d189cc04b8e151ef";
+    let utxo_1 = Proto::Input {
+        out_point: input::out_point(utxo_hash_1, 1),
+        value: 210_000_000,
+        sighash_type: SIGHASH_SINGLE,
+        claiming_script: input::p2wpkh(ecdsa_priv_key_2.public().to_vec()),
+        ..Default::default()
+    };
+
+    let out_0 = Proto::Output {
+        value: 335_790_000,
+        to_recipient: output::to_address("1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx"),
+    };
+    let explicit_change_output = Proto::Output {
+        value: 84_209_739,
+        to_recipient: output::to_address("1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU"),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V1,
+        inputs: vec![utxo_0, utxo_1],
+        outputs: vec![out_0, explicit_change_output],
+        change_output: None,
+        // No matter which selector to use.
+        input_selector: Proto::InputSelector::UseAll,
+        dust_policy: dust_threshold(DUST),
+        // Disable transaction fee calculation.
+        // This transaction was generated via legacy Bitcoin implementation with an error in weight calculation.
+        fee_per_vb: 0,
+        ..Default::default()
+    };
+
+    let signing = Proto::SigningInput {
+        private_keys: vec![
+            priv_key_1.decode_hex().unwrap().into(),
+            priv_key_2.decode_hex().unwrap().into(),
+        ],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::Bitcoin)
+        .sign(sign::Expected {
+            encoded: "01000000000102fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f0000000049483045022100fd8591c3611a07b55f509ec850534c7a9c49713c9b8fa0e844ea06c2e65e19d702205e3806676192e790bc93dd4c28e937c4bf97b15f189158ba1a30d7ecff5ee75503ffffffffef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a0100000000ffffffff02b0bf0314000000001976a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac4bf00405000000001976a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac00024730440220096d20c7e92f991c2bf38dc28118feb34019ae74ec1c17179b28cb041de7517402204594f46a911f24bdc7109ca192e6860ebf2f3a0087579b3c128d5ce0cd5ed4680321025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee635700000000",
+            txid: "68c08a357a16b163983f7338185dc8befdf3e301e648b1cceca26a3fd33fefbd",
+            inputs: vec![210_000_000, 210_000_000],
+            outputs: vec![335_790_000, 84_209_739],
+            vsize: 261,
+            weight: 1042,
+            // sum(inputs) - sum(outputs)
+            fee: 261,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/bitcoin_transaction_util.rs b/rust/tw_tests/tests/chains/bitcoin/bitcoin_transaction_util.rs
new file mode 100644
index 00000000000..a42d55cf322
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/bitcoin_transaction_util.rs
@@ -0,0 +1,13 @@
+use tw_any_coin::test_utils::transaction_calc_tx_hash_utils::TransactionUtilHelper;
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_bitcoin_transaction_util_calc_tx_hash() {
+    let encoded_tx = "02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000";
+    let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::Bitcoin, encoded_tx);
+
+    assert_eq!(
+        tx_hash,
+        "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/bitcoin/mod.rs b/rust/tw_tests/tests/chains/bitcoin/mod.rs
new file mode 100644
index 00000000000..25954022bf4
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoin/mod.rs
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod bitcoin_address;
+mod bitcoin_compile;
+mod bitcoin_plan;
+mod bitcoin_sign;
+mod bitcoin_transaction_util;
diff --git a/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_address.rs b/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_address.rs
new file mode 100644
index 00000000000..45dfce10f59
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_address.rs
@@ -0,0 +1,153 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_base58_is_valid, test_address_create_base58_with_public_key, test_address_derive,
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+    AddressBase58IsValid, AddressCreateBase58WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_bitcoincash_address_derive() {
+    test_address_derive(
+        CoinType::BitcoinCash,
+        "28071bf4e2b0340db41b807ed8a5514139e5d6427ff9d58dbd22b7ed187103a4",
+        "bitcoincash:qruxj7zq6yzpdx8dld0e9hfvt7u47zrw9gfr5hy0vh",
+    );
+}
+
+#[test]
+fn test_bitcoincash_address_normalization() {
+    test_address_normalization(
+        CoinType::BitcoinCash,
+        "BitCoinCash:QRPLWYX7KUEQKRH6DMD3FCLTA6U32HAFP5TNPKCHX2",
+        "bitcoincash:qrplwyx7kueqkrh6dmd3fclta6u32hafp5tnpkchx2",
+    );
+    // Already normalized.
+    test_address_normalization(
+        CoinType::BitcoinCash,
+        "bitcoincash:qruxj7zq6yzpdx8dld0e9hfvt7u47zrw9gfr5hy0vh",
+        "bitcoincash:qruxj7zq6yzpdx8dld0e9hfvt7u47zrw9gfr5hy0vh",
+    );
+    test_address_normalization(
+        CoinType::BitcoinCash,
+        "qqslmu0jxk4st3ldjyuazfpf5thd6vlgfuggqd3re4",
+        "bitcoincash:qqslmu0jxk4st3ldjyuazfpf5thd6vlgfuggqd3re4",
+    );
+    // Legacy address should be normalized as Legacy.
+    test_address_normalization(
+        CoinType::BitcoinCash,
+        "1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2",
+        "1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2",
+    );
+}
+
+#[test]
+fn test_bitcoincash_address_is_valid() {
+    test_address_valid(
+        CoinType::BitcoinCash,
+        "bitcoincash:qr6m7j9njldwwzlg9v7v53unlr4jkmx6eylep8ekg2",
+    );
+    test_address_valid(
+        CoinType::BitcoinCash,
+        "bitcoincash:qqa2qx0d8tegw32xk8u75ws055en4x3h2u0e6k46y4",
+    );
+    test_address_valid(
+        CoinType::BitcoinCash,
+        "bitcoincash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc",
+    );
+    test_address_valid(
+        CoinType::BitcoinCash,
+        "pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc",
+    );
+    test_address_valid(
+        CoinType::BitcoinCash,
+        "bitcoincash:qr6m7j9njldwwzlg9v7v53unlr4jkmx6eylep8ekg2",
+    );
+    test_address_valid(
+        CoinType::BitcoinCash,
+        "qq07l6rr5lsdm3m80qxw80ku2ex0tj76vvsxpvmgme",
+    );
+    test_address_valid(
+        CoinType::BitcoinCash,
+        "qqslmu0jxk4st3ldjyuazfpf5thd6vlgfuggqd3re4",
+    );
+    test_address_valid(CoinType::BitcoinCash, "1BvBMSEYstWetqTFn5Au4m4GFg7xJaNVN2");
+}
+
+#[test]
+fn test_bitcoincash_address_is_valid_base58() {
+    // Litecoin P2PKH
+    test_address_base58_is_valid(AddressBase58IsValid {
+        coin: CoinType::BitcoinCash,
+        address: "LW6HjAU6GL9fK2LZWUA6VZCzomTdrpx3nr",
+        p2pkh: 48,
+        p2sh: 50,
+    });
+    // BitcoinCash P2SH
+    test_address_base58_is_valid(AddressBase58IsValid {
+        coin: CoinType::Bitcoin,
+        address: "35XRC5HRZjih1sML23UXv1Ry1SzTDKSmfQ",
+        p2pkh: 0,
+        p2sh: 5,
+    });
+}
+
+#[test]
+fn test_bitcoincash_address_invalid() {
+    // Wrong checksum
+    test_address_invalid(
+        CoinType::BitcoinCash,
+        "pqx578nanz2h2estzmkr53zqdg6qt8xyqvffffffff",
+    );
+    test_address_invalid(
+        CoinType::BitcoinCash,
+        "bitcoincash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvffffffff",
+    );
+
+    // Valid eCash addresses are invalid for BCH
+    test_address_invalid(
+        CoinType::BitcoinCash,
+        "pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0",
+    );
+    test_address_invalid(
+        CoinType::BitcoinCash,
+        "ecash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0",
+    );
+
+    // Wrong prefix
+    test_address_invalid(
+        CoinType::BitcoinCash,
+        "bcash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc",
+    );
+
+    // Wrong base 32 (characters o, i)
+    test_address_invalid(
+        CoinType::BitcoinCash,
+        "poi578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc",
+    );
+}
+
+#[test]
+fn test_bitcoincash_address_get_data() {
+    test_address_get_data(
+        CoinType::BitcoinCash,
+        "bitcoincash:qpk05r5kcd8uuzwqunn8rlx5xvuvzjqju5rch3tc0u",
+        "6cfa0e96c34fce09c0e4e671fcd43338c14812e5",
+    );
+}
+
+#[test]
+fn test_bitcoincash_address_create_base58_with_public_key() {
+    test_address_create_base58_with_public_key(AddressCreateBase58WithPublicKey {
+        coin: CoinType::BitcoinCash,
+        public_key: "03b49081a4d7ad24b20e209bc6fe10491aadb5607777baf0509a036cce96025db0",
+        public_key_type: PublicKeyType::Secp256k1,
+        p2pkh: 48,
+        p2sh: 50,
+        expected: "LW6HjAU6GL9fK2LZWUA6VZCzomTdrpx3nr",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_compile.rs b/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_compile.rs
new file mode 100644
index 00000000000..16a55185d3d
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_compile.rs
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::bitcoincash::test_cases::transfer_96ee20;
+use crate::chains::common::bitcoin::{btc_info, compile, preimage, TransactionOneof};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_keypair::ecdsa;
+use tw_keypair::traits::SigningKeyTrait;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::BitcoinV2::Proto;
+
+#[test]
+fn test_bitcoincash_compile() {
+    let private_key = ecdsa::secp256k1::PrivateKey::try_from(transfer_96ee20::PRIVATE_KEY).unwrap();
+    let public_key = private_key.public().compressed().to_vec();
+
+    let input = Proto::SigningInput {
+        public_keys: vec![public_key.clone().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(transfer_96ee20::transaction_builder()),
+        ..Default::default()
+    };
+
+    let sighash_1 = transfer_96ee20::SIGHASH.decode_hex().unwrap();
+    preimage::BitcoinPreImageHelper::new(&input)
+        .coin(CoinType::BitcoinCash)
+        .add_expected_legacy(public_key.clone(), sighash_1.clone())
+        .pre_image();
+
+    let signature_1 = private_key
+        .sign(sighash_1.as_slice().try_into().unwrap())
+        .unwrap();
+    assert_eq!(signature_1.to_vec().to_hex(), transfer_96ee20::SIGNATURE);
+
+    compile::BitcoinCompileHelper::new(&input)
+        .coin(CoinType::BitcoinCash)
+        .add_pubkey_sig(public_key, signature_1.to_vec())
+        .compile(compile::Expected {
+            encoded: transfer_96ee20::ENCODED_TX,
+            txid: transfer_96ee20::TX_ID,
+            inputs: vec![5151],
+            outputs: vec![600, 4325],
+            vsize: 226,
+            weight: 904,
+            fee: 226,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_sign.rs b/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_sign.rs
new file mode 100644
index 00000000000..0282966d3c6
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoincash/bitcoincash_sign.rs
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::bitcoincash::test_cases::transfer_96ee20;
+use crate::chains::common::bitcoin::{btc_info, plan, sign, TransactionOneof};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_proto::BitcoinV2::Proto;
+
+/// Original test: https://github.com/trustwallet/wallet-core/blob/cd5a27481d2181e63362cb57e2b2160506cce163/tests/chains/BitcoinCash/TWBitcoinCashTests.cpp#L122-L164
+/// *Note* that if we enable change output, current selection algorithm will calculate
+/// different change and fee amounts than in the original test.
+#[test]
+fn test_bitcoincash_sign_input_p2pkh_from_to_address() {
+    let signing = Proto::SigningInput {
+        private_keys: vec![transfer_96ee20::PRIVATE_KEY.decode_hex().unwrap().into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(transfer_96ee20::transaction_builder()),
+        ..Default::default()
+    };
+
+    plan::BitcoinPlanHelper::new(&signing)
+        .coin(CoinType::BitcoinCash)
+        .plan(plan::Expected {
+            inputs: vec![5151],
+            outputs: vec![600, 4325],
+            vsize_estimate: 227,
+            fee_estimate: 226,
+            change: 0,
+        });
+
+    // Successfully broadcasted:
+    // https://blockchair.com/bitcoin-cash/transaction/96ee20002b34e468f9d3c5ee54f6a8ddaa61c118889c4f35395c2cd93ba5bbb4
+    sign::BitcoinSignHelper::new(&signing)
+        .coin(CoinType::BitcoinCash)
+        .sign(sign::Expected {
+            encoded: transfer_96ee20::ENCODED_TX,
+            txid: transfer_96ee20::TX_ID,
+            inputs: vec![5151],
+            outputs: vec![600, 4325],
+            vsize: 226,
+            weight: 904,
+            fee: 226,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/bitcoincash/mod.rs b/rust/tw_tests/tests/chains/bitcoincash/mod.rs
new file mode 100644
index 00000000000..7e2ebc4aa6b
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoincash/mod.rs
@@ -0,0 +1,10 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod bitcoincash_address;
+mod bitcoincash_compile;
+mod bitcoincash_sign;
+mod test_cases;
+
+pub const BCH_SIGHASH_FORK: u32 = 0x40;
diff --git a/rust/tw_tests/tests/chains/bitcoincash/test_cases.rs b/rust/tw_tests/tests/chains/bitcoincash/test_cases.rs
new file mode 100644
index 00000000000..3fe081a5c60
--- /dev/null
+++ b/rust/tw_tests/tests/chains/bitcoincash/test_cases.rs
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::bitcoincash::BCH_SIGHASH_FORK;
+use crate::chains::common::bitcoin::{dust_threshold, input, output, DUST, SIGHASH_ALL};
+use tw_proto::BitcoinV2::Proto;
+
+/// Successfully broadcasted:
+/// https://blockchair.com/bitcoin-cash/transaction/96ee20002b34e468f9d3c5ee54f6a8ddaa61c118889c4f35395c2cd93ba5bbb4
+pub(super) mod transfer_96ee20 {
+    use super::*;
+
+    pub const PRIVATE_KEY: &str =
+        "7fdafb9db5bc501f2096e7d13d331dc7a75d9594af3d251313ba8b6200f4e384";
+    pub const ENCODED_TX: &str = concat!(
+        "01000000",
+        "01",
+            "e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05", "02000000", "6b483045022100b70d158b43cbcded60e6977e93f9a84966bc0cec6f2dfd1463d1223a90563f0d02207548d081069de570a494d0967ba388ff02641d91cadb060587ead95a98d4e3534121038eab72ec78e639d02758e7860cdec018b49498c307791f785aa3019622f4ea5b", "ffffffff",
+        "02",
+            "5802000000000000", "1976a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac",
+            "e510000000000000", "1976a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac",
+        "00000000"
+    );
+    pub const SIGHASH: &str = "1136d4975aee4ff6ccf0b8a9c640532f563b48d9856fdc9682c37a071702937c";
+    pub const SIGNATURE: &str = "b70d158b43cbcded60e6977e93f9a84966bc0cec6f2dfd1463d1223a90563f0d7548d081069de570a494d0967ba388ff02641d91cadb060587ead95a98d4e35301";
+    pub const TX_ID: &str = "96ee20002b34e468f9d3c5ee54f6a8ddaa61c118889c4f35395c2cd93ba5bbb4";
+
+    pub fn transaction_builder() -> Proto::TransactionBuilder<'static> {
+        // Create transaction with P2PKH as input and output.
+        let utxo_hash_1 = "050d00e2e18ef13969606f1ceee290d3f49bd940684ce39898159352952b8ce2";
+        let utxo_1 = Proto::Input {
+            out_point: input::out_point(utxo_hash_1, 2),
+            value: 5151,
+            sighash_type: SIGHASH_ALL | BCH_SIGHASH_FORK,
+            // Cash address without prefix.
+            claiming_script: input::receiver_address("qzhlrcrcne07x94h99thved2pgzdtv8ccujjy73xya"),
+            ..Default::default()
+        };
+
+        let out_1 = Proto::Output {
+            value: 600,
+            // Legacy address.
+            to_recipient: output::to_address("1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx"),
+        };
+        let explicit_change_out = Proto::Output {
+            value: 4325,
+            // Cash address with an explicit prefix.
+            to_recipient: output::to_address(
+                "bitcoincash:qz0q3xmg38sr94rw8wg45vujah7kzma3cskxymnw06",
+            ),
+        };
+
+        Proto::TransactionBuilder {
+            version: Proto::TransactionVersion::V1,
+            inputs: vec![utxo_1],
+            outputs: vec![out_1, explicit_change_out],
+            change_output: None,
+            // No matter which selector to use.
+            input_selector: Proto::InputSelector::SelectInOrder,
+            dust_policy: dust_threshold(DUST),
+            ..Default::default()
+        }
+    }
+}
diff --git a/rust/tw_tests/tests/chains/common/bitcoin/compile.rs b/rust/tw_tests/tests/chains/common/bitcoin/compile.rs
new file mode 100644
index 00000000000..853c5d60641
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/bitcoin/compile.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::common::bitcoin::sign;
+use tw_any_coin::test_utils::sign_utils::CompilerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_memory::Data;
+use tw_proto::BitcoinV2::Proto;
+
+pub use crate::chains::common::bitcoin::sign::Expected;
+
+pub struct BitcoinCompileHelper<'a> {
+    input: &'a Proto::SigningInput<'a>,
+    coin_type: Option<CoinType>,
+    public_keys: Vec<Data>,
+    signatures: Vec<Data>,
+}
+
+impl<'a> BitcoinCompileHelper<'a> {
+    pub fn new(input: &'a Proto::SigningInput<'a>) -> Self {
+        BitcoinCompileHelper {
+            input,
+            coin_type: None,
+            public_keys: Vec::default(),
+            signatures: Vec::default(),
+        }
+    }
+
+    pub fn coin(mut self, coin_type: CoinType) -> Self {
+        self.coin_type = Some(coin_type);
+        self
+    }
+
+    pub fn add_pubkey_sig(mut self, pubkey: Data, sighash: Data) -> Self {
+        self.public_keys.push(pubkey);
+        self.signatures.push(sighash);
+        self
+    }
+}
+
+impl<'a> BitcoinCompileHelper<'a> {
+    pub fn compile(self, expected: Expected) {
+        let coin_type = self
+            .coin_type
+            .expect("'BitcoinPreImageHelper::coin_type' is not set");
+        let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+        let compile_output =
+            compiler.compile(coin_type, self.input, self.signatures, self.public_keys);
+
+        sign::BitcoinSignHelper::new(self.input)
+            .coin(coin_type)
+            .verify_output(compile_output, expected);
+    }
+}
diff --git a/rust/tw_tests/tests/chains/common/bitcoin/data.rs b/rust/tw_tests/tests/chains/common/bitcoin/data.rs
new file mode 100644
index 00000000000..c17d4f0113b
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/bitcoin/data.rs
@@ -0,0 +1,517 @@
+pub const NFT_INSCRIPTION_IMAGE_DATA: &str = "\
+89504e470d0a1a0a0000000d4948445200000360000002be0803000000f3\
+0f8d7d000000d8504c54450000003070bf3070af3173bd3078b73870b730\
+70b73575ba3075ba3075b53070ba3078bb3474bb3474b73074bb3074b733\
+76b93076b93373bc3373b93073b93376bc3275ba3075ba3572ba3272ba33\
+75bc3276b83474bb3274bb3274b83276bd3276bb3474bd3474bb3276b934\
+74bb3474b93274bb3274b93476bb3276bb3375ba3275ba3373bc3273ba32\
+77bc3375bc3375ba3373bc3374ba3174b93376bb3375bc3375bb3375b933\
+75bb3374bb3376bb3475bb3375bb3375ba3374bb3276bc3276ba3375bc32\
+75bc3375bb3275bb3374bc3374bb3375bb7edf10e10000004774524e5300\
+10101f20202030303030404040404050505050505f606060606f70707070\
+7f7f7f7f80808080808f8f909090909f9f9f9fa0a0afafafb0bfbfcfcfcf\
+cfcfdfdfdfdfefefefef6a89059600001c294944415478daeddd6b7bd3d6\
+ba2ee0d8350eb00c81ec5533cbac69d6da99383334dbe510904b66129383\
+feff3fda17506888751892255b52eefb634b1259d2a3f1ead5d0f0d61600\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000084eaef3c9b4e274f87f604546e\
+27ba8abf3a19db1b50a96114dfb01031a8d0cf57f18f0e7a760a54e4b778\
+c9c2ad1854a27f1c27586cdb3350c1edd7224eb667dfc0aa9e5fc569666e\
+c460b5f2f0df71063762b08afb8b389b3211ca978771aec82006a5fcf870\
+39cd8587ce5066f8ba8ac3cc0c6250d0cec738d8c53fed2f2820bb79a89d\
+08ab185fc545a91321b03a8ce21216ea44c8372c152f2fb1400d375fb722\
+b6630f427abcf6aee2d544220675c54bc420adb5318b2be25e0c6ec72b8a\
+2bb4186bdac3dfb5e1495cb5d903fb15bed48657711d4ec67d3b973b6eb8\
+574fbafe1ac6343cb8cba5e1248a6bb69031eeead8557bba648c3b3a74ed\
+1c9cc56b74f54e5b913b13aebde82a5ebf9399af8da0ebe17a7ab09170fd\
+1db2b1ee3dddbce57a3a79b77a5978383e5fb95c8c0e9eba29a33ba3d683\
+6793d94925e3d6f9686b6bf0a69ab12c3a98ec2819696baa86c39d67cfa6\
+b377671556846fbe3e385e7d10fbdb59f4ee60fa6c6767e899340d8dd2b3\
+835974d3c9d9592db759974fbefdc98a06b1a5b09d9dfdf041a2d94429c9\
+66ed44ebea4f1cde1c63aa1cc4b29fa1ed2923d9dce8b5b6787dbefbbaa9\
+a641ccbb2f3448eec2f1955587fbcbb748bbeb1ac4e203479a8de46b5d4f\
+b4e683c4bfbf7fbda6bf3f73ac59bfe16233d5e106ea446318eb77bc9eea\
+f0d7ac6d189cac27618f1c6ed66cbca99baf5b9bb1965bb185e3cd9a9dae\
+bb35bfd18819c258af876be82d0c4207d3fa231639e2acd5a431f15a4bc4\
+2e7cdd3a6bf57ec3f75eeb8e98b75ce8cc2d58f1787d89d8bcce80fde290\
+b34ef5bdf13f2f3d37a9cee762024617027679385a65ab06b5558a0246fb\
+03369facfe5ad6e88d802160950f5e3787b1530143c07e48d7eb51955b37\
+383c1730da2caa345d35ac22bf5d6dc6048c7606ecf27054d77a18db93ea\
+6ac5270e39ed0bd87c7f54ef660ec6c7972623721703f6e970773d4b398d\
+267301e34e05ecf470cddfdd359acc2f058c3b10b04faf27a3cd2c42b8bd\
+7b583e6502c65a9598ec7b393fdc54b66ea66c7a7c2a6034dddb2283d6e9\
+ebe978bb496be76eef4e0ee7a702467b03f6e9d3fcf8f574321edd6bee87\
+e88f46e3e9e1f1fcf4536ee9e875159a12b07fddbb77af7d1fa87fefde76\
+c6f4949f1c721a12b0f64e7a1030044cc0b8038ed2cfc51702062b9aa69f\
+8bd3d67ea86b0143c0ea93d14574c411300143c0040c5609d82b01831565\
+7cf7c31f020602b66490b174b6238e80d51730df5f848009187721601f04\
+0c56f43863259bb67ea68cef3cfbd31147c07c2604cc6782554ec63f050c\
+3404040c015ba72e764611b03604ec0f479ca604ec42c060551d9c183b11\
+3004ac3e9d7cc70d011330b8ad830bc40818cdd1c125ce8e040c01ab4f27\
+175345c0040c6e3bedde57fdbc17301a23ea5ec03af891e862c09e0818a8\
+a7040c1d81353af3059708d84602e6cb5558b30e3e95f5ed45344707e715\
+59391b011330ee84eebd3cd513309aa37bafff5ad8977604ec8380c18a76\
+3bb7c65917977aa4b51edfa580591691757bd8b9824ac070c7e2ae923b1f\
+b08bce05ccaa6dac5bf79e1a4d058c06b94b01b3e60d6bd7b9a9b11695a2\
+493af77247c60b382f1c6e1a14b076be9e68cd1b9aa4732fd877709511ba\
+19b05f5c31a0be5b967606ec4cc0d013d848c0ac18c0da75aeab9df160af\
+e770b36e19cf655f752d608e366bd7b5a97b0301a325016be5e4f3875e68\
+a649baf64ab3179a69cb09b9e8d8e7f1be258dba676965c0bc6f89a6408d\
+265e07a3513af6dcc8eb60344bc75e087b2b60344ac7de57f1b60acdd2b1\
+af41f7b60aad39237f71bd80fa6e5ada389dde17c8d22c1d9b4e1f7b5b85\
+46e9d63a82be1d8c86e9d674fa879d5ba998ee06ac8593f71e9b4c8f53b2\
+3ebbe6fad22cddfafa8789b9beb4a72dd0bec988befa81a6e95463db5444\
+9aa6538f66232bd3d330a75d9a2b652a224df3be4b177debfae2b6c50d25\
+7748971a6f5645a471ba3495e3b1995234cd6e87a672ec5a1591a6e9d2fc\
+d8899952b4e9bea56d53398e4ce4a071e2ee3c697e6f22078d73d69d87b3\
+9135a568d359d9b627cdd79e33d3386fbbf31d7cb1256fd019a8cd43df1f\
+4bf38c3bf3f0c873661a68b733a7a5c7603450771e841d593080e6e975a6\
+35f0be3bed1a3ae4ac2b4f8f4ebdcf4cbbcecb76cd7f883d06a381de76a4\
+4fffd063309a68da913efd63af5bd244e38ef4e927de06a36da5559b56b2\
+38f2188c26caead3b7693e7da44b4f235d77a3bd7dad4b4f239d76a28dd8\
+d3a5a799de76a23bf0d8a28834d3a4136dc489b9f434d36e27aefdef3511\
+69a64127da88a7e6d2d350d75d6870c79a883454d4818bff634d449aeaa8\
+03fd8189053968aa7107ba1c334d449a2a6b36625bdeb93cd544a4a9b226\
+41bcf211604519ab0644edef71f87a66362c63b2d4453b3a0453af33d35c\
+93d6f7b8233d0edad9e568c7c237b11e070d76ddf29bb0c7adbf42d06951\
+cb6fc2a6e671d064472d3f4123f33868b2dd763f46ca7a0a6645299ca177\
+fbfa40f79db57a3ae2cc6366da7b13d6fcd7a916195b3f7070d9bcac09f5\
+8d6fd43f760b468b6fc21adf879bb905a3e94e5b5c232edc82d1e69bb086\
+d7888f634fc168ba517bcfd299898834df756ba7f35d5b508ae6cb78272c\
+fed8e40dcf6a807a178c569ca74d9e8f98350ff1dc71a521321bf50d6e73\
+0c634d7ada206a679b63167b558536c85a37a0b96d8ecc014c85484b6ac4\
+c6be76993980cd1c555a5223367408cb1cc0f4106992710b87b0990a91d6\
+d488d7ad1bc2b207b0b1634a931c659eaec3b60d605e05a35932e72336f1\
+59d8fdcc0df6c596b4a9cdd1c0373f162ddb5eeeb8cc4761f1a2697d8edf\
+622d0ebad3e668da63a5ec0e871607cdf332fb9cfd6793b6b59f5d206a71\
+d0c0212cfb9cbd68522731bb836816074df4266ecb6d58f60d98018c461a\
+e59cb68de9d5ff1c1bc068a1a81d27eefd2b03185d1cc2e2bd56e4cb0046\
+3befc21a91b0dc7c19c068aac175dcf4d161e72a3680d1562ff3cedef8dd\
+667b893fe76ee0b9018cc6eae50e61f16293cfc37ecbddbcf8574791e69a\
+e49fc18b8d4da4ed1fe76f9d5988345a947f0e6faad5717f11b06ddb0e21\
+edee73c4717cb28932f179c086e970d0fe3ec7e73271edd3d5872143ab0e\
+07dd2812e378b6de41ecf955d0568d1c3e3a5124c6f1628defaf840d5f71\
+fc2f478fe69b849dcd6b6bd8f7f7023748079156f83df0848e0fd611b19d\
+45e0d65cba01a3157a27a109abbfd9713f0add16eb04d0b1dbb02f11dba9\
+b53afc77f086b801a33db6c3cfeb1afb89fdbdabf0cd78e3a8d11ee378f3\
+117bb228b00dffe93b68b4c87e91842d6a983cb51315d9024f98e972c22a\
+ef760c0bc54bbee87ac22a8d5891de867c713712164715dd8a15ea6dc817\
+77266195743b0ac74bbeb833095b3d62e3452c5fdc1593c2095bada158ac\
+75f8c55c7f9ef61a5d178f58e96ec7fde2f18a0f1d23da6c705efca42fb7\
+6a47d1d6a1f951742261c725cefbe2b762c57b1b9fe7cf7bc192bbd8ea28\
+1eb1e2bd8dcfd3a3b437e8c48d588932b1d01bcf257a1b6ebfe85099f8a6\
+4c0042bb1dc35999dfae3ca44326d775d589a56ebe74e7e9da2056aa8a8b\
+f7f296b2df59941abe2c904de706b1f3eaebc461b9d8ce75377027f6edfb\
+5886155787e74f1c0b3a697c5eae4eacb23a8c0fdd7dd159a59e8925d689\
+fde372d5e17d070175626e3ff179a9eaf0d2d26ca813f307b172cd8dcb7d\
+d5212296ffc2f35ea951f058ef903b5227febe4ab363e763a99b2f333770\
+2b96ff7511a5de4a89cfc58b3b16b179a941ac546fdec40ddc8ad5466f03\
+11ab8f07cbdc5dfb7547ccb443743bea8b97de06225657bcb40ea1744351\
+eb1036d6edd03a84fa2236132ff8a14edcd7db8016743bf43620d1fdf32a\
+6ebeec47a8eb56ccbc0dc8aa137f77f3057546ecbd275fd0bc3a517508b5\
+d589aa43088fd8b9ea106a54e8eb22ac67034507b1379e2cc3e69b1d9a1b\
+50db2066f882fa0631c317d4368819bea0be41ccf005b50d62862fa844e2\
+33b163c3175434889d9bba0135dab79e28ace94eecc4175542e5111b1f9f\
+7efaf4e9f850730300000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+00000000000000000068bff16c49effbfffc9fe5ff698f41016fe3253f7d\
+ff9fd1f2ffb4c740c040c040c0046c15b3aa0ceedcae1b26ec8583b01f7d\
+b2f483e3b01f7cbef483ff2b608d1657e5d19ddb75bdebd2bb61f9bcbd08\
+fb9bcb7f7226600276778aab781a34f695dd7fbb35ec770113b0861a25ec\
+8628e407c7093ff82aa8a05ffab173f7600276a76ac49f4a55888135620d\
+15a28009585dfefbd992b5d488c3b23b30a1427cd2fa80f5968fc28e8075\
+22602b9f3d256bc471e20e0ca81167657b234d0ed860f94ffc216002965a\
+23f64a55884159a9a3421430016b6cc0126bc417e52ac4803d584b852860\
+02d6dc808dcbd488e3943d987bf7564b85286002d6dc8095aa11a3943db8\
+c8fb6b8b3a2a440113b0e6062c312c2fca5588b9bbf0f1f24f8c054cc03a\
+1db01235e23875174e8b5688010d150113b036072ca946bce895aa107393\
+b95c217ed8123001eb74c012e3f24bb90a316716484d15a2800958930356\
+b8461c67ecc3e9062a4401abd728d5ff4938030ed3ff79ff6e06ac708d78\
+9a11b0680315a2806dcaa068f17327039658233e2a5721660e4975558802\
+d6ad800dd734d2f587c3dc3f55c9d933890b9d2093cc80bd2854210e56fb\
+f8b5062cfcef0b5858c03e1fd21ffdb083fb3b93d9c9591cc7f3bf767fd6\
+3fcefdd5c3f403fbec60767276f56d83cfa2e860b2d3af3160bdb8508d78\
+9a19b0a84885384fd8530f6e7ffc77d3a70fd619b0efc7f9b3ab93e820ef\
+cf0b5860c01e67eca6fe24baba795a14dca7d3c0226c78e3cfdc9a24f16e\
+b25353c08ad588c39c5651af7c85387c363b4bfea557efc6c3b5042cf900\
+2c664f05acce80ed1c5fddbaeed611b0fe5e9473f2465f4fb383e89b8493\
+21baa5648df8aa5c85985123e654883b7b27d9bff8ddd3ba03d69fa41f80\
+abd952c2bfefe2840d5fdc3a0a0702961eb061b45cd8541fb0fede55c8b3\
+84689cf5a0372e35a2f58abc7a729ab781652ac47e5ebabe9eb5e33a0396\
+7b00a25b254491a33017b0d4803dbf8aeb0f5860bcbe9c66412763a192b1\
+408d38ccfd83bdc215e2f020f4c32f86b505ec79c036fc388a09581501eb\
+1f27eeac8a03b6b388eb52b68ff8aa5c8598ba87532bc4e1acc8c7d9ab27\
+603b1f8bff7901ab2060c38ff11a02f63c8e371ab00235e269ee1f8c8a55\
+88e143f75727c31a02167e006e8ca102b67ac0fa8b780d01fb2dde70c0c2\
+6bc4fc0a31a5c39f52210e3f16fe40cb65e2aa01eb17b9a95d6c0b587501\
+3b8ed710b0c2f95a541eb049e8b4c2e57f781db68b8f922bc4de79bc7ac2\
+560cd8b0607dfeb3805515b0ab780d012b9caf595479c0926ac4455085f8\
+e751d88e48ab10c72506e545afca800d0bdffffe2c6015052c5e43c08685\
+cfaf41f5010bad119737f6c528a8467c98da432c3184dd5e6760a5800d4b\
+f4971e09587b02b6287e76d510b0c01a719250e75d8724f328f529739921\
+ecd65254ab04ac4cbee28ba180b52560c5cfaf411d01eb85b503972bc4a4\
+ecfc115221fef9ed7f9519c27e1c245709585426dff1494fc05a12b01203\
+581d014bfc9d3fe55788e3a4c5812f422ac4ef53aa4665cef06945012bdb\
+c03d10b076042cf96f5ebe9eec6edffb6c7bb43b3d3ebdf57375042ca946\
+7c1152216e85d488e9156272043e7d9acf4f3f850e61e5039676037c7a38\
+feb2ff479337e7a9b76102d682801d25fdfed1d2839addefc779be554fc0\
+826ac4d3c4f3e6287f16484685786b08bb3c9eecdefbf67fb677d3ceef1f\
+c25f3e6089f5c3e5e1f6cd6d1f9fa73c4e17b016042c6162c4bf927fc5e8\
+cdf7dedbd1fc9b84b7fde7b784eeaca4d4f6022ac4901af1617640a2bf4f\
+eda56b4bcaf9fd43f84b072c7102c77c10b409e3adbff77142486f1d05b3\
+e9730336ff7665bd77afc28005e7ebf3dfdc3fbffd6d7515be0fff32bf46\
+7c995ce7f5726bc4495685f83da1cb23f7d7b1f5f7c4e3d15b3d60891dc4\
+5f93f6fc49e66342ef83ad1cb0cbfd7eeeaf2e13b0e54b7bf6f73dee3fa9\
+2d6083fc1a719152f8bccdab114fb32ac4bf3e464abcbe7cea9c1ab16cc0\
+923a1cff480ef971ea733c01ab2060fbfd805f5d2660cb7fb2d83a4b55ae\
+e8925b233e4c3bc7f26ac48456c28f091cc5e7a3ac4d4b1ac3fe583d608b\
+b0f1eb4bc24e32ae3e02b65ac0920e7e6d01fb636301cbad118fd2eabcbc\
+1a31a142bcb5ccc5ef39cbcb649768250336ce9d2272f380677c46015b29\
+60e783ad3506eccf8d052cb7465ca4b6c6a2ece754a7050be1840e4fe6e8\
+5a326051d8a14e8de32b01ab22609783ad7506ecfb5cedb5072ce997dd7c\
+dcf430fd2e649c35bee4578801aeb306c172011b66dd5685ec9e85805511\
+b0f1568d014bdac27f6e2a602fb377d7517a2730bb46ccaf10f31d656d5a\
+b9808d836629670d613f09d8ea017bbf5567c0121f562e0e1e6c24603935\
+e222e3e169668db87a859878bff462c580bd2f7007967c15792160ab07ec\
+51bd014b5d073075add1fa0296b4317f5fd41f668dede38c64565121263d\
+aa9eae18b045ce1cfd25efd38eb880950fd89f5bf506ec28e3d1f655c692\
+beb504ec65d605e628eb59712fe3141f075fb58a1dca57ab05ac97fdf03b\
+c124ede410b0f2017b5173c0f2a7929f640d66d5066c94f5b8699139bd2e\
+a3468c8a5588fd074f9f3d9bde7694b5bf4b052ce1684fb31da73ded13b0\
+f2017b5073c002df863a3978daaf3f60893562488598d4c888d22bc4b47b\
+9de1647612bec6d48a012bf5a267f25f11b0d201bbd8aa3b6093e0a3194d\
+8675072ca3463cca2ea87aa9cfa9422bc49d8382ebb7ad18b06905017b20\
+602b066c5e7bc00abd7b727bf1e6aa03965423be0aa91093b6e445810ab1\
+3f39297c76af18b0a30a02f648c0560cd887fa033628f4cafcadaf20a8fa\
+dbe5526bc48779cf07d36ac4a00af149998531560cd8db0a02f68b80ad18\
+b069fd01dbda2e94b08b719d014bad118ff25a6e6935624085d83f2e7576\
+0b98800505ace018f6c3f2e855072cb546ccab10536bc4fc0a7158725d7e\
+0113b0b0806d0dde944d58e55f407c9d5c23e656886935627e8558365f4d\
+08d813016b48c08e720aa571a141ec9ff505ec28b946ccad10d36ac4dc0a\
+b174be9a10304d8ea604ec7dee9d48a1883daa2d604935e234a4424cda96\
+5f022ac459bca18069d3b72d6059ef229f063c0c1abd09ce58545bc0926a\
+c445488598d42089f22bc4151ef7ae18b0490501f3a0799d01cb7a553270\
+16f1f6f8f8bcd010567dc0926ac407b390697bcbbbe4a2975b21a61488a7\
+afa7d3f14d93ca03b6bbfcdfffefb8a02d015b63c02e0afde6d409af83db\
+2b8d665dbdab0f58628d18522126d68851ce5e4a1cc0e6a37eb192bc54c0\
+06e1134f4b9c6702b662c07a71d6410d6c1d64d8de9dbe9e5fa63f0dab2d\
+604935e2554885985823e6558809ff2079f99bea0396f04123016b4cc092\
+8abef40be0a270c0be8d6687f3ccdbeb1a0216348568103af8a575b6532f\
+5329cb62d410b0f7a97b55c01a10b0b338fc02388e4b06eccb8748ec2ffe\
+525bc04262320fde27d91562caf7caae27609390495c02b6a98025dd260d\
+0b0c60455e3adc4fddb01a0296542306a6e065c05cca9c87d3e75b6b0bd8\
+60b5832260f506ec6d1c7c01fc2d5e31600927c9abfa027654b2420c1afc\
+9ee4fca90feb0b58d2ff59f4caecb15eb16736021612b0497068eec72b07\
+6c9c7676bd2fd26aa9ac469c17a89b333badef8377f86e0d017b19172e12\
+9f6f07de902f046cc580259e868b8422f1fe555ec0a271de07495d00f86d\
+75bde60235e2b8f4e0f72170640e18c3570f58efba60c2faffefaf2f8f0d\
+d8633d015b2d608947272161cf73a73b8de378b193fd4126691b7654a0d5\
+525d8d38283df88df346b03fc2db442b072cf9839ea4dd496f0d3fa65c43\
+9346eea980ad16b0b43791f77ef8473b51e07cc245e6287692364e8d736f\
+736aa811e7e507bf5ede8d6cf2d3fac419c1ab076c90b88d2987a2bf7795\
+5aa52454ea1743015b2d606973d916b3bf1681eaefec4501b39d1e7fffb9\
+d4a730bfa5fef4c3a4fb9c9bf7093b653acfd7252bc4dcc1ef43fe3f4fba\
+3cf43fc6b5046cebf7383462dfe295dc0839ca1b099f8f05ac68c07a1927\
+d2d5d9d959de0dffb780cd12b2f9e3e53be985dfcc8dd81b7e8f57a99b81\
+b7252bc4dcc16f9c5ff9250c10c38f714d01eb5da75e259fded88e0793e8\
+e68df4492fa0057323a6fdff8e2a28dcef5cc08a7d53726ac06ecf373f39\
+98ecfc7d6cfb3b9328732848de88ab683a9d1ebcbb2a7933302a5b21e60d\
+7ebd8003b494b09d455c57c09293f17d2746b3d96c169de53742522eb657\
+ef0ea6d3d9d7703e10b0a2011b5512b0e4f7a1cecea2283a39bbca1d0af2\
+9fed7e2cf15ce7ba64859853237e08cbe3cd857dfacfa29a5e57f9ea4da9\
+63372b7eb19d0a58d180ad38843d4a1cc0c29c0715aae56727bc2d320c85\
+5f7596a399727d880e9eedececec3c3b88aef2df28582960bdf35207602f\
+f0863ce85d0b01ab65087b94318015e876e7a7bcf8372d647eb20fe51b24\
+83a02314aa9280155d71282561bdeb3aae73773d60694da802011b5e97f9\
+d179a1945f146f73649d2fe3d2835fd2cddbf1a603b6b55dea10dcfe16b7\
+fc523d12b0c2012b595fdc08d86fa50ac441b142b5c4dc8eb7252bc4ccc0\
+27457370bde980954cd83f0a0f613d012b7c6bba7dbd62c0ca2ca97479bf\
+e0295ae2da392a5b21669d6983228f1397ae2ad77505ac5495f88fe29f63\
+2a60c5774ae86dd87f0e13035666c997cb27f90f9352cfb6d56bc471e9c1\
+2fa5bd1fd8c71b9fd516b0ad41d185f12fff51e273440256e2aab31b3486\
+cdfbd3c480bd2c9eaff3fb4bdbb05fc3b5f37de9426754309abda0b3fb70\
+abc68005ecc2bc6310f2391e0958895333a4be384c5a85efcbee1e15ad4e\
+e6497556dee951a2453c2e5921660c7e6913407a018d8e375bf506ac5099\
+78dc2f77a578256065aefdb9eb5e5ffeba951ab0adadf1bc4869f26bf236\
+4c2abf76a6c524604e5d547802c87e40be6a0ed8d6d6243062e74fca7695\
+2f7a0256aab8ca5e94f7eb98334d3fe907a10b8e5eeef7cb8da39725a69a\
+46a55b61e3e2d1ccd9fc2f9795ba03b635d83f5fe918e49e09ff190858c9\
+bb97f41d3bff6b11b269e6a8b21b90b193cc439b756c67fd12fb6e5cb242\
+4c1dfc06652f52b3af3f597bc002ca89f92467570ef62fd3a3a9c9b1427b\
+20f1d05cbeffbec6df34af6c1b4d3396418ce7fba3fc4d382e7ec92d1a93\
+71e9c16f9edb2e4adefcc36fc15c47c03eafe1355fe5187cfe05a7a5a2d9\
+4abd84d58e0785fef9fdf03fd6df3dbc1991cbd3c39b0bd4de0fd990edcf\
+8bfade8ad9e5e9ebc9a85f6a13e24fc79351e99db79bb45674d05dc420e9\
+27ef17dffccb1f4ee9a5edf9fb2df0ffcadad0ff4a5df13ab50f3ab97d14\
+3e1d1fee86076430fe7169e64faf3b99ae8de86f8fbe1cc2d1bd157ec7bd\
+d1d75f32de1ddd2b7e64faa36f9bd0caa3fa7df3b7fb9b3e92bb7f6d48a9\
+63f9d741dc5de54c00000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000000000000008066fbffddd184\
+8d4adc88950000000049454e44ae426082";
+
+pub const NFT_INSCRIPTION_RAW_HEX: &str = "\
+020000000001011771decbce2766b39d8fe66f4dc11737b3146c71f8cc6a\
+e1397384c5e508e7f10000000000ffffffff012202000000000000160014\
+e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d0340e9bb1aaf8cb98c60\
+f793f08fc4258a9ad5a7b430fc5906fe3b522b67431fec087cbaf54767d4\
+3061be51d8f49fa179cb9b4f0f9e00ee23101962ac64f9d71a76fdda1d00\
+63036f7264010109696d6167652f706e67004d080289504e470d0a1a0a00\
+00000d4948445200000360000002be0803000000f30f8d7d000000d8504c\
+54450000003070bf3070af3173bd3078b73870b73070b73575ba3075ba30\
+75b53070ba3078bb3474bb3474b73074bb3074b73376b93076b93373bc33\
+73b93073b93376bc3275ba3075ba3572ba3272ba3375bc3276b83474bb32\
+74bb3274b83276bd3276bb3474bd3474bb3276b93474bb3474b93274bb32\
+74b93476bb3276bb3375ba3275ba3373bc3273ba3277bc3375bc3375ba33\
+73bc3374ba3174b93376bb3375bc3375bb3375b93375bb3374bb3376bb34\
+75bb3375bb3375ba3374bb3276bc3276ba3375bc3275bc3375bb3275bb33\
+74bc3374bb3375bb7edf10e10000004774524e530010101f202020303030\
+30404040404050505050505f606060606f707070707f7f7f7f8080808080\
+8f8f909090909f9f9f9fa0a0afafafb0bfbfcfcfcfcfcfdfdfdfdfefefef\
+ef6a89059600001c294944415478daeddd6b7bd3d6ba2ee0d8350eb00c81\
+ec5533cbac69d6da99383334dbe510904b66129383feff3fda1750688875\
+1892255b52eefb634b1259d2a3f1ead5d0f0d61600000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+004d08020000000000000084eaef3c9b4e274f87f604546e27ba8abf3a19\
+db1b50a96114dfb01031a8d0cf57f18f0e7a760a54e4b778c9c2ad1854a2\
+7f1c27586cdb3350c1edd7224eb667dfc0aa9e5fc569666ec460b5f2f0df\
+71063762b08afb8b389b3211ca978771aec82006a5fcf87039cd8587ce50\
+66f8ba8ac3cc0c6250d0cec738d8c53fed2f2820bb79a89d08ab185fc545\
+a91321b03a8ce21216ea44c8372c152f2fb1400d375fb722b6630f427abc\
+f6aee2d544220675c54bc420adb5318b2be25e0c6ec72b8a2bb4186bdac3\
+dfb5e1495cb5d903fb15bed48657711d4ec67d3b973b6eb8574fbafe1ac6\
+343cb8cba5e1248a6bb69031eeead8557bba648c3b3a74ed1c9cc56b74f5\
+4e5b913b13aebde82a5ebf9399af8da0ebe17a7ab09170fd1db2b1ee3ddd\
+bce57a3a79b77a5978383e5fb95c8c0e9eba29a33ba3d6836793d94925e3\
+d6f9686b6bf0a69ab12c3a98ec2819696baa86c39d67cfa6b37767155684\
+6fbe3e385e7d10fbdb59f4ee60fa6c6767e899340d8dd2b3835974d3c9d9\
+592db759974fbefdc98a06b1a5b09d9dfdf041a2d94429c966ed44ebea4f\
+1cde1c63aa1cc4b29fa1ed2923d9dce8b5b6787dbefbbaa9a641ccbb2f34\
+48eec2f1955587fbcbb748bbeb1ac4e203479a8de46b5d4fb4e683c4bfbf\
+7fbda6bf3f73ac59bfe16233d5e106ea446318eb77bc9eeaf0d7ac6d189c\
+ac27618f1c6ed66cbca99baf5b9b4d0802b1965bb185e3cd9a9daebb35bf\
+d18819c258af876be82d0c4207d3fa231639e2acd5a431f15a4bc42e7cdd\
+3a6bf57ec3f75eeb8e98b75ce8cc2d58f1787d89d8bcce80fde290b34ef5\
+bdf13f2f3d37a9cee762024617027679385a65ab06b5558a0246fb03369f\
+acfe5ad6e88d802160950f5e3787b1530143c07e48d7eb51955b37383c17\
+30da2caa345d35ac22bf5d6dc6048c7606ecf27054d77a18db93ea6ac527\
+0e39ed0bd87c7f54ef660ec6c7972623721703f6e970773d4b398d267301\
+e34e05ecf470cddfdd359acc2f058c3b10b04faf27a3cd2c42b8bd7b583e\
+6502c65a9598ec7b393fdc54b66ea66c7a7c2a6034dddb2283d6e9ebe978\
+bb496be76eef4e0ee7a702467b03f6e9d3fcf8f574321edd6bee87e88f46\
+e3e9e1f1fcf4536ee9e875159a12b07fddbb77af7d1fa87fefde76c6f494\
+9f1c721a12b0f64e7a1030044cc0b8038ed2cfc51702062b9aa69f8bd3d6\
+7ea86b0143c0ea93d14574c411300143c0040c5609d82b018315657cf7c3\
+1f020602b66490b174b6238e80d51730df5f848009187721601f040c56f4\
+3863259bb67ea68cef3cfbd31147c07c2604cc6782554ec63f050c340404\
+0c015ba72e764611b03604ec0f479ca604ec42c060551d9c183b113004ac\
+3e9d7cc70d011330b8ad830bc40818cdd1c125ce8e040c01ab4f27175345\
+c0040c6e3bedde57fdbc17301a23ea5ec03af891e862c09e0818a84d0802\
+a7040c1d81353af3059708d84602e6cb5558b30e3e95f5ed45344707e715\
+59391b011330ee84eebd3cd513309aa37bafff5ad8977604ec8380c18a76\
+3bb7c65917977aa4b51edfa580591691757bd8b9824ac070c7e2ae923b1f\
+b08bce05ccaa6dac5bf79e1a4d058c06b94b01b3e60d6bd7b9a9b11695a2\
+493af77247c60b382f1c6e1a14b076be9e68cd1b9aa4732fd877709511ba\
+19b05f5c31a0be5b967606ec4cc0d013d848c0ac18c0da75aeab9df160af\
+e770b36e19cf655f752d608e366bd7b5a97b0301a325016be5e4f3875e68\
+a649baf64ab3179a69cb09b9e8d8e7f1be258dba676965c0bc6f89a6408d\
+265e07a3513af6dcc8eb60344bc75e087b2b60344ac7de57f1b60acdd2b1\
+af41f7b60aad39237f71bd80fa6e5ada389dde17c8d22c1d9b4e1f7b5b85\
+46e9d63a82be1d8c86e9d674fa879d5ba998ee06ac8593f71e9b4c8f53b2\
+3ebbe6fad22cddfafa8789b9beb4a72dd0bec988befa81a6e95463db5444\
+9aa6538f66232bd3d330a75d9a2b652a224df3be4b177debfae2b6c50d25\
+7748971a6f5645a471ba3495e3b1995234cd6e87a672ec5a1591a6e9d2fc\
+d8899952b4e9bea56d53398e4ce4a071e2ee3c697e6f22078d73d69d87b3\
+9135a568d359d9b627cdd79e33d3386fbbf31d7cb1256fd019a8cd43df1f\
+4bf38c3bf3f0c873661a68b733a7a5c7603450771e841d593080e6e975a6\
+35f0be3bed1a3ae4ac2b4d08024f8f4ebdcf4cbbcecb76cd7f883d06a381\
+de76a44fffd063309a68da913efd63af5bd244e38ef4e927de06a36da555\
+9b56b238f2188c26caead3b7693e7da44b4f235d77a3bd7dad4b4f239d76\
+a28dd8d3a5a799de76a23bf0d8a28834d3a4136dc489b9f434d36e27aefd\
+ef351169a64127da88a7e6d2d350d75d6870c79a883454d4818bff634d44\
+9aeaa803fd8189053968aa7107ba1c334d449a2a6b36625bdeb93cd544a4\
+a9b22641bcf211604519ab0644edef71f87a66362c63b2d4453b3a0453af\
+33d35c93d6f7b8233d0edad9e568c7c237b11e070d76ddf29bb0c7adbf42\
+d06951cb6fc2a6e671d064472d3f4123f33868b2dd763f46ca7a0a664529\
+9ca177fbfa40f79db57a3ae2cc6366da7b13d6fcd7a916195b3f7070d9bc\
+ac09f58d6fd43f760b468b6fc21adf879bb905a3e94e5b5c232edc82d1e6\
+9bb086d7888f634fc168ba517bcfd299898834df756ba7f35d5b508ae6cb\
+78272cfed8e40dcf6a807a178c569ca74d9e8f98350ff1dc71a521321bf5\
+0d6e730c634d7ada206a679b63167b558536c85a37a0b96d8ecc014c8548\
+4b6ac4c6be76993980cd1c555a5223367408cb1cc0f4106992710b87b099\
+0a91d6d488d7ad1bc2b207b0b1634a931c659eaec3b60d605e05a35932e7\
+2336f159d8fdcc0df6c596b4a9cdd1c0373f162ddb5eeeb8cc4761f1a269\
+7d8edf622d0ebad3e668da63a5ec0e871607cdf332fb9c4d0802fd6793b6\
+b59f5d206a71d0c0212cfb9cbd68522731bb836816074df4266ecb6d58f6\
+0d98018c461ae59cb68de9d5ff1c1bc068a1a81d27eefd2b03185d1cc2e2\
+bd56e4cb00463befc21a91b0dc7c19c068aac175dcf4d161e72a3680d156\
+2ff3cedef8dd667b893fe76ee0b9018cc6eae50e61f16293cfc37ecbddbc\
+f8574791e69ae49fc18b8d4da4ed1fe76f9d5988345a947f0e6faad5717f\
+11b06ddb0e21edee73c4717cb28932f179c086e970d0fe3ec7e73271edd3\
+d5872143ab0e07dd2812e378b6de41ecf955d0568d1c3e3a5124c6f1628d\
+efaf840d5f71fc2f478fe69b849dcd6b6bd8f7f7023748079156f83df084\
+8e0fd611b19d45e0d65cba01a3157a27a109abbfd9713f0add16eb04d0b1\
+dbb02f11dba9b53afc77f086b801a33db6c3cfeb1afb89fdbdabf0cd78e3\
+a8d11ee378f3117bb228b00dffe93b68b4c87e91842d6a983cb51315d902\
+4f98e972c22aef760c0bc54bbee87ac22a8d5891de867c713712164715dd\
+8a15ea6dc81777266195743b0ac74bbeb833095b3d62e3452c5fdc1593c2\
+095bada158ac75f8c55c7f9ef61a5d178f58e96ec7fde2f18a0f1d23da6c\
+705efca42fb76a47d1d6a1f951742261c725cefbe2b762c57b1b9fe7cf7b\
+c192bbd8ea281eb1e2bd8dcfd3a3b437e8c48d588932b1d01bcf257a1b6e\
+bfe85099f8a64c0042bb1dc35999dfae3ca44326d775d589a56ebe74e7e9\
+da2056aa8a8b4d0802f7f296b2df59941abe2c904de706b1f3eaebc461b9\
+d8ce75377027f6edfb5886155787e74f1c0b3a697c5eae4eacb23a8c0fdd\
+7dd159a59e8925d689fde372d5e17d070175626e3ff179a9eaf0d2d26ca8\
+13f307b172cd8dcb7dd5212296ffc2f35ea951f058ef903b5227febe4ab3\
+63e763a99b2f3337702b96ff7511a5de4a89cfc58b3b16b179a941ac546f\
+dec40ddc8ad5466f0311ab8f07cbdc5dfb7547ccb443743bea8b97de0622\
+5657bcb40ea1744351eb1036d6edd03a84fa2236132ff8a14edcd7db8016\
+743bf43620d1fdf32a6ebeec47a8eb56ccbc0dc8aa137f77f3057546ecbd\
+275fd0bc3a517508b5d589aa43088fd8b9ea106a54e8eb22ac67034507b1\
+379e2cc3e69b1d9a1b50db2066f882fa0631c317d4368819bea0be41ccf0\
+05b50d62862fa844e233b163c3175434889d9bba0135dab79e28ace94eec\
+c4175542e5111b1f9f7efaf4e9f850730300000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000068bff16c49effbfffc9fe5ff\
+698f41016fe3253f7dff9fd1f2ffb4c740c040c040c0046c15b3aa0ceedc\
+ae1b26ec8583b01f7db2f483e3b01f7cbef483ff2b608d1657e5d19ddb75\
+bdebd2bb61f9bcbd08fb9bcb7f7226600276778aab781a34f695dd7fbb35\
+ec770113b0861a25ec8628e407c7093ff82aa84d0802a05ffab173f76002\
+76a76ac49f4a55888135620d15a28009585dfefbd992b5d488c3b23b30a1\
+427cd2fa80f5968fc28e807522602b9f3d256bc471e20e0ca81167657b23\
+4d0ed860f94ffc216002965a23f64a55884159a9a3421430016b6cc0126b\
+c417e52ac4803d584b85286002d6dc808dcbd488e3943d987bf7564b8528\
+6002d6dc8095aa11a3943db8c8fb6b8b3a2a440113b0e6062c312c2fca55\
+88b9bbf0f1f24f8c054cc03a1db01235e23875174e8b5688010d150113b0\
+36072ca946bce895aa107393b95c217ed8123001eb74c012e3f24bb90a31\
+6716484d15a2800958930356b8461c67ecc3e9062a4401abd728d5ff4938\
+030ed3ff79ff6e06ac708d789a11b0680315a2806dcaa068f17327039658\
+233e2a5721660e4975558802d6ad800dd734d2f587c3dc3f55c9d933890b\
+9d2093cc80bd2854210e56fbf8b5062cfcef0b5858c03e1fd21ffdb083fb\
+3b93d9c9591cc7f3bf767fd63fcefdd5c3f403fbec60767276f56d83cfa2\
+e860b2d3af3160bdb8508d789a19b0a84885384fd8530f6e7ffc77d3a70f\
+d619b0efc7f9b3ab93e820efcf0b5860c01e67eca6fe24baba795a14dca7\
+d3c0226c78e3cfdc9a24f16eb25353c08ad588c39c5651af7c85387c363b\
+4bfea557efc6c3b5042cf9002c664f05acce80ed1c5fddbaeed611b0fe5e\
+9473f2465f4fb383e89b849321baa5648df8aa5c85985123e654883b7b27\
+d9bf4d0802f8ddd3ba03d69fa41f80abd952c2bfefe2840d5fdc3a0a0702\
+961eb061b45cd8541fb0fede55c8b384689cf5a0372e35a2f58abc7a729a\
+b781652ac47e5ebabe9eb5e33a03967b00a25b254491a33017b0d4803dbf\
+8aeb0f5860bcbe9c66412763a192b1408d38ccfd83bdc215e2f020f4c32f\
+86b505ec79c036fc388a09581501eb1f27eeac8a03b6b388eb52b68ff8aa\
+5c8598ba87532bc4e1acc8c7d9ab27603b1f8bff7901ab2060c38ff11a02\
+f63c8e371ab00235e269ee1f8c8a5588e143f75727c31a02167e006e8ca1\
+02b67ac0fa8b780d01fb2dde70c0c26bc4fc0a31a5c39f52210e3f16fe40\
+cb65e2aa01eb17b9a95d6c0b5875013b8ed710b0c2f95a541eb049e8b4c2\
+e57f781db68b8f922bc4de79bc7ac2560cd8b0607dfeb3805515b0ab780d\
+012b9caf595479c0926ac4455085f8e751d88e48ab10c72506e545afca80\
+0d0bdffffe2c6015052c5e43c08685cfaf41f5010bad119737f6c528a846\
+7c98da432c3184dd5e6760a5800d4bf4971e09587b02b6287e76d510b0c0\
+1a719250e75d8724f328f529739921ecd65254ab04ac4cbee28ba180b525\
+60c5cfaf411d01eb85b503972bc4a4ecfc115221fef9ed7f9519c27e1c24\
+5709585426dff1494fc05a12b01203581d014bfc9d3fe55788e3a4c5812f\
+422ac4ef53aa4665cef06945012bdbc03d10b076042cf96f5ebe9eec6edf\
+fb6c7bb43b3d3ebdf57375042ca9464d08027c1152216e85d488e9156272\
+043e7d9acf4f3f850e61e5039676037c7a38feb2ff479337e7a9b76102d6\
+82801d25fdfed1d2839addefc779be554fc0826ac4d3c4f3e6287f164846\
+85786b08bb3c9eecdefbf67fb677d3ceef1fc25f3e6089f5c3e5e1f6cd6d\
+1f9fa73c4e17b016042c6162c4bf927fc5e8cdf7dedbd1fc9b84b7fde7b7\
+84eeaca4d4f6022ac4901af1617640a2bf4feda56b4bcaf9fd43f84b072c\
+7102c77c10b409e3adbff77142486f1d05b3e9730336ff7665bd77afc280\
+05e7ebf3dfdc3fbffd6d7515be0fff32bf467c995ce7f5726bc4495685f8\
+3da1cb23f7d7b1f5f7c4e3d15b3d60891dc45f93f6fc49e66342ef83ad1c\
+b0cbfd7eeeaf2e13b0e54b7bf6f73dee3fa92d6083fc1a719152f8bccdab\
+114fb32ac4bf3e464abcbe7cea9c1ab16cc0923a1cff480ef971ea733c01\
+ab2060fbfd805f5d2660cb7fb2d83a4b55aee8925b233e4c3bc7f26ac484\
+56c28f091cc5e7a3ac4d4b1ac3fe583d608bb0f1eb4bc24e32ae3e02b65a\
+c0920e7e6d01fb636301cbad118fd2eabcbc1a31a142bcb5ccc5ef39cbcb\
+649768250336ce9d2272f380677c46015b2960e783ad3506eccf8d052cb7\
+465ca4b6c6a2ece754a7050be1840e4fe6e85a326051d8a14e8de32b01ab\
+22609783ad7506ecfb5cedb5072ce997dd7cdcf430fd2e649c35bee45788\
+01aeb306c172011b66dd5685ec9e85805511b0f1568d014bdac27f6e4d08\
+022a602fb377d7517a2730bb46ccaf10f31d656d5ab9808d836629670d61\
+3f09d8ea017bbf5567c0121f562e0e1e6c24603935e222e3e169668db87a\
+859878bff462c580bd2f7007967c15792160ab07ec51bd014b5d073075ad\
+d1fa0296b4317f5fd41f668dede38c64565121263daa9eae18b045ce1cfd\
+25efd38eb880950fd89f5bf506ec28e3d1f655c692beb504ec65d605e628\
+eb59712fe3141f075fb58a1dca57ab05ac97fdf03bc124ede410b0f2017b\
+5173c0f2a7929f640d66d5066c94f5b8699139bd2ea3468c8a5588fd074f\
+9f3d9bde7694b5bf4b052ce1684fb31da73ded13b0f2017b5073c002df86\
+3a3978daaf3f60893562488598d4c888d22bc4b47b9de1647612bec6d48a\
+012bf5a267f25f11b0d201bbd8aa3b6093e0a3194d8675072ca3463cca2e\
+a87aa9cfa9422bc49d8382ebb7ad18b06905017b20602b066c5e7bc00abd\
+7b727bf1e6aa03965423be0aa91093b6e445810ab13f39297c76af18b0a3\
+0a02f648c0560cd887fa033628f4cafcadaf20a8fadbe5526bc48779cf07\
+d36ac4a00af149998531560cd8db0a02f68b80ad18b069fd01dbda2e94b0\
+8b719d014bad118ff25a6e6935624085d83f2e75760b98800505ace018f6\
+c3f2e855072cb546ccab10536bc4fc0a7158725d7e0113b0b0806d0dde94\
+4d58e55f407c9d5c23e656886935627e8558365f4d08d813016b48c08e72\
+0aa571a141ec9ff505ec284d0802b946ccad10d36ac4dc0ab174be9a1030\
+4d8ea604ec7dee9d48a1883daa2d604935e234a4424cda965f022ac459bc\
+a18069d3b72d6059ef229f063c0c1abd09ce58545bc0926ac445488598d4\
+2089f22bc4151ef7ae18b0490501f3a0799d01cb7a55327016f1f6f8f8bc\
+d010567dc0926ac407b390697bcbbbe4a2975b21a61488a7afa7d3f14d93\
+ca03b6bbfcdfffefb8a02d015b63c02e0afde6d409af83db2b8d665dbdab\
+0f58628d18522126d68851ce5e4a1cc0e6a37eb192bc54c006e1134f4b9c\
+6702b662c07a71d6410d6c1d64d8de9dbe9e5fa63f0dab2d604935e25548\
+85985823e6558809ff2079f99bea0396f04123016b4cc0928abef40be0a2\
+70c0be8d6687f3ccdbeb1a0216348568103af8a575b6532f5329cb62d410\
+b0f7a97b55c01a10b0b338fc02388e4b06eccb8748ec2ffe525bc0426232\
+0fde27d91562caf7caae27609390495c02b6a98025dd260d0b0c60455e3a\
+dc4fddb01a0296542306a6e065c05cca9c87d3e75b6b0bd860b5832260f5\
+06ec6d1c7c01fc2d5e31600927c9abfa027654b2420c1afc9ee4fca90feb\
+0b58d2ff59f4caecb15eb16736021612b0497068eec72b076c9c7676bd2f\
+d26aa9ac469c17a89b333badef8377f86e0d017b19172e129f6f07de902f\
+046cc580259e868b8422f1fe555ec0a271de07495d00f86d75bde60235e2\
+b8f4e0f72170640e18c3570f58efba60c2faffefaf2f8f0d4d0802d8633d\
+015b2d608947272161cf73a73b8de378b193fd4126691b7654a0d5525d8d\
+38283df88df346b03fc2db442b072cf9839ea4dd496f0d3fa65c439346ee\
+a980ad16b0b43791f77ef8473b51e07cc245e6287692364e8d736f736aa8\
+11e7e507bf5ede8d6cf2d3fac419c1ab076c90b88d2987a2bf77955aa524\
+54ea1743015b2d606973d916b3bf1681eaefec4501b39d1e7fffb9d4a730\
+bfa5fef4c3a4fb9c9bf7093b653acfd7252bc4dcc1ef43fe3f4fba3cf43f\
+c6b5046cebf7383462dfe295dc0839ca1b099f8f05ac68c07a1927d2d5d9\
+d959de0dffb780cd12b2f9e3e53be985dfcc8dd81b7e8f57a99b81b7252b\
+c4dcc16f9c5ff9250c10c38f714d01eb5da75e259fded88e0793e8e68df4\
+492fa0057323a6fdff8e2a28dcef5cc08a7d53726ac06ecf373f3998ecfc\
+7d6cfb3b9328732848de88ab683a9d1ebcbb2a7933302a5b21e60d7ebd80\
+03b494b09d455c57c09293f17d2746b3d96c169de53742522eb657ef0ea6\
+d3d9d7703e10b0a2011b5512b0e4f7a1cecea2283a39bbca1d0af29fed7e\
+2cf15ce7ba64859853237e08cbe3cd857dfacfa29a5e57f9ea4da963372b\
+7eb19d0a58d180ad38843d4a1cc0c29c0715aae56727bc2d320c855f7596\
+a399727d880e9eedececec3c3b88aef2df28582960bdf35207602ff0863c\
+e85d0b01ab65087b94318015e876e7a7bcf8372d647eb20fe51b2483a023\
+14aa9280155d714d0802282561bdeb3aae73773d60694da802011b5e97f9\
+d179a1945f146f73649d2fe3d2835fd2cddbf1a603b6b55dea10dcfe16b7\
+fc523d12b0c2012b595fdc08d86fa50ac441b142b5c4dc8eb7252bc4ccc0\
+27457370bde980954cd83f0a0f613d012b7c6bba7dbd62c0ca2ca97479bf\
+e0295ae2da392a5b21669d6983228f1397ae2ad77505ac5495f88fe29f63\
+2a60c5774ae86dd87f0e13035666c997cb27f90f9352cfb6d56bc471e9c1\
+2fa5bd1fd8c71b9fd516b0ad41d185f12fff51e273440256e2aab31b3486\
+cdfbd3c480bd2c9eaff3fb4bdbb05fc3b5f37de9426754309abda0b3fb70\
+abc68005ecc2bc6310f2391e0958895333a4be384c5a85efcbee1e15ad4e\
+e6497556dee951a2453c2e5921660c7e6913407a018d8e375bf506ac5099\
+78dc2f77a578256065aefdb9eb5e5ffeba951ab0adadf1bc4869f26bf236\
+4c2abf76a6c524604e5d547802c87e40be6a0ed8d6d6243062e74fca7695\
+2f7a0256aab8ca5e94f7eb98334d3fe907a10b8e5eeef7cb8da39725a69a\
+46a55b61e3e2d1ccd9fc2f9795ba03b635d83f5fe918e49e09ff190858c9\
+bb97f41d3bff6b11b269e6a8b21b90b193cc439b756c67fd12fb6e5cb242\
+4c1dfc06652f52b3af3f597bc002ca89f92467570ef62fd3a3a9c9b1427b\
+20f1d05cbeffbec6df34af6c1b4d3396418ce7fba3fc4d382e7ec92d1a93\
+71e9c16f9edb2e4adefcc36fc15c47c03eafe1354d29015fe5187cfe05a7\
+a5a2d94abd84d58e0785fef9fdf03fd6df3dbc1991cbd3c39b0bd4de0fd9\
+90edcf8bfade8ad9e5e9ebc9a85f6a13e24fc79351e99db79bb45674d05d\
+c420e927ef17dffccb1f4ee9a5edf9fb2df0ffcadad0ff4a5df13ab50f3a\
+b97d143e1d1fee86076430fe7169e64faf3b99ae8de86f8fbe1cc2d1bd15\
+7ec7bdd1d75f32de1ddd2b7e64faa36f9bd0caa3fa7df3b7fb9b3e92bb7f\
+6d48a963f9d741dc5de54c00000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000000000000000000008066fbff\
+ddd1848d4adc88950000000049454e44ae4260826821c00f209b6ada5edb\
+42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000";
diff --git a/rust/tw_tests/tests/chains/common/bitcoin/mod.rs b/rust/tw_tests/tests/chains/common/bitcoin/mod.rs
new file mode 100644
index 00000000000..337c48c590e
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/bitcoin/mod.rs
@@ -0,0 +1,229 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+// This seems to be required, even if the tests in `tests/` actually use
+// functions/constants.
+#![allow(dead_code)]
+
+use tw_encoding::hex::DecodeHex;
+
+pub mod compile;
+pub mod data;
+pub mod plan;
+pub mod preimage;
+pub mod psbt_plan;
+pub mod psbt_sign;
+pub mod sign;
+
+pub const ONE_BTC: i64 = 100_000_000;
+pub const MINER_FEE: i64 = 1_000_000;
+pub const DUST: i64 = 546;
+
+pub const SIGHASH_ALL: u32 = 0x01;
+pub const SIGHASH_SINGLE: u32 = 0x03;
+pub const SIGHASH_ANYONE_CAN_PAY: u32 = 0x80;
+
+pub const BITCOIN_P2PKH_PREFIX: u8 = 0;
+pub const BITCOIN_P2SH_PREFIX: u8 = 5;
+pub const BITCOIN_HRP: &str = "bc";
+
+pub type Amount = i64;
+
+pub use tw_proto::BitcoinV2::Proto::mod_Input::mod_InputBuilder::OneOfvariant as InputBuilderType;
+pub use tw_proto::BitcoinV2::Proto::mod_Input::{
+    InputBuilder, OneOfclaiming_script as ClaimingScriptType,
+};
+pub use tw_proto::BitcoinV2::Proto::mod_Output::mod_OutputBuilder::OneOfvariant as OutputBuilderType;
+pub use tw_proto::BitcoinV2::Proto::mod_Output::{
+    OneOfto_recipient as RecipientType, OutputBuilder,
+};
+pub use tw_proto::BitcoinV2::Proto::mod_PublicKeyOrHash::OneOfvariant as PublicKeyOrHashType;
+pub use tw_proto::BitcoinV2::Proto::mod_SigningInput::OneOftransaction as TransactionOneof;
+
+use tw_proto::BitcoinV2::Proto;
+
+pub fn btc_info() -> Option<Proto::ChainInfo<'static>> {
+    Some(Proto::ChainInfo {
+        p2pkh_prefix: BITCOIN_P2PKH_PREFIX as u32,
+        p2sh_prefix: BITCOIN_P2SH_PREFIX as u32,
+        hrp: "bc".into(),
+    })
+}
+
+pub fn dust_threshold(threshold: i64) -> Proto::mod_TransactionBuilder::OneOfdust_policy {
+    Proto::mod_TransactionBuilder::OneOfdust_policy::fixed_dust_threshold(threshold)
+}
+
+pub fn transaction_psbt(hex: &str) -> TransactionOneof {
+    TransactionOneof::psbt(Proto::Psbt {
+        psbt: hex.decode_hex().unwrap().into(),
+    })
+}
+
+pub mod input {
+    use super::*;
+    use tw_encoding::hex::DecodeHex;
+    use tw_memory::Data;
+
+    pub fn reverse_txid(txid: &str) -> Data {
+        txid.decode_hex().unwrap().into_iter().rev().collect()
+    }
+
+    pub fn out_point(txid: &str, vout: u32) -> Option<Proto::OutPoint<'static>> {
+        Some(Proto::OutPoint {
+            hash: reverse_txid(txid).into(),
+            vout,
+        })
+    }
+
+    pub fn sequence(sequence: u32) -> Option<Proto::mod_Input::Sequence> {
+        Some(Proto::mod_Input::Sequence { sequence })
+    }
+
+    pub fn claiming_script_builder(ty: InputBuilderType<'static>) -> ClaimingScriptType<'static> {
+        ClaimingScriptType::script_builder(InputBuilder { variant: ty })
+    }
+
+    pub fn p2pk(pubkey: Data) -> ClaimingScriptType<'static> {
+        claiming_script_builder(InputBuilderType::p2pk(pubkey.into()))
+    }
+
+    pub fn p2pkh(pubkey: Data) -> ClaimingScriptType<'static> {
+        claiming_script_builder(InputBuilderType::p2pkh(Proto::PublicKeyOrHash {
+            variant: PublicKeyOrHashType::pubkey(pubkey.into()),
+        }))
+    }
+
+    pub fn p2pkh_with_hash(pubkey_hash: Data) -> ClaimingScriptType<'static> {
+        claiming_script_builder(InputBuilderType::p2pkh(Proto::PublicKeyOrHash {
+            variant: PublicKeyOrHashType::hash(pubkey_hash.into()),
+        }))
+    }
+
+    pub fn p2wpkh(pubkey: Data) -> ClaimingScriptType<'static> {
+        claiming_script_builder(InputBuilderType::p2wpkh(Proto::PublicKeyOrHash {
+            variant: PublicKeyOrHashType::pubkey(pubkey.into()),
+        }))
+    }
+
+    pub fn p2tr_key_path(pubkey: Data) -> ClaimingScriptType<'static> {
+        claiming_script_builder(InputBuilderType::p2tr_key_path(pubkey.into()))
+    }
+
+    pub fn brc20_inscribe(
+        inscribe_to: Data,
+        ticker: &str,
+        transfer_amount: &str,
+    ) -> ClaimingScriptType<'static> {
+        claiming_script_builder(InputBuilderType::brc20_inscribe(
+            Proto::mod_Input::InputBrc20Inscription {
+                inscribe_to: inscribe_to.into(),
+                ticker: ticker.to_string().into(),
+                transfer_amount: transfer_amount.to_string().into(),
+            },
+        ))
+    }
+
+    pub fn receiver_address(addr: &str) -> ClaimingScriptType<'static> {
+        ClaimingScriptType::receiver_address(addr.to_string().into())
+    }
+
+    pub fn custom_script(script: Data) -> ClaimingScriptType<'static> {
+        ClaimingScriptType::script_data(script.into())
+    }
+}
+
+pub mod output {
+    use super::*;
+    use tw_memory::Data;
+    use tw_proto::BitcoinV2::Proto::mod_Output::mod_RedeemScriptOrHash::OneOfvariant as RedeemScriptOrHashType;
+    use tw_proto::BitcoinV2::Proto::mod_Output::OutputTaprootScriptPath as TaprootScriptPath;
+
+    pub fn receiver_builder(ty: OutputBuilderType<'static>) -> RecipientType<'static> {
+        RecipientType::builder(OutputBuilder { variant: ty })
+    }
+
+    pub fn p2sh_with_script(redeem_script: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2sh(
+            Proto::mod_Output::RedeemScriptOrHash {
+                variant: RedeemScriptOrHashType::redeem_script(redeem_script.into()),
+            },
+        ))
+    }
+
+    pub fn p2sh_with_hash(redeem_script_hash: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2sh(
+            Proto::mod_Output::RedeemScriptOrHash {
+                variant: RedeemScriptOrHashType::hash(redeem_script_hash.into()),
+            },
+        ))
+    }
+
+    pub fn p2pkh(pubkey: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2pkh(Proto::PublicKeyOrHash {
+            variant: PublicKeyOrHashType::pubkey(pubkey.into()),
+        }))
+    }
+
+    pub fn p2wpkh(pubkey: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2wpkh(Proto::PublicKeyOrHash {
+            variant: PublicKeyOrHashType::pubkey(pubkey.into()),
+        }))
+    }
+
+    pub fn p2wsh_with_script(redeem_script: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2wsh(
+            Proto::mod_Output::RedeemScriptOrHash {
+                variant: RedeemScriptOrHashType::redeem_script(redeem_script.into()),
+            },
+        ))
+    }
+
+    pub fn p2wsh_with_hash(redeem_script_hash: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2wsh(
+            Proto::mod_Output::RedeemScriptOrHash {
+                variant: RedeemScriptOrHashType::hash(redeem_script_hash.into()),
+            },
+        ))
+    }
+
+    pub fn p2tr_key_path(pubkey: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2tr_key_path(pubkey.into()))
+    }
+
+    pub fn p2tr_assume_tweaked(tweaked_pubkey: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2tr_dangerous_assume_tweaked(
+            tweaked_pubkey.into(),
+        ))
+    }
+
+    pub fn p2tr_script_path(internal_pubkey: Data, merkle_root: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::p2tr_script_path(TaprootScriptPath {
+            internal_key: internal_pubkey.into(),
+            merkle_root: merkle_root.into(),
+        }))
+    }
+
+    pub fn brc20_inscribe(
+        inscribe_to: Data,
+        ticker: &str,
+        transfer_amount: &str,
+    ) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::brc20_inscribe(
+            Proto::mod_Output::OutputBrc20Inscription {
+                inscribe_to: inscribe_to.into(),
+                ticker: ticker.to_string().into(),
+                transfer_amount: transfer_amount.to_string().into(),
+            },
+        ))
+    }
+
+    pub fn to_address(addr: &str) -> RecipientType<'static> {
+        RecipientType::to_address(addr.to_string().into())
+    }
+
+    pub fn op_return(data: Data) -> RecipientType<'static> {
+        receiver_builder(OutputBuilderType::op_return(data.into()))
+    }
+}
diff --git a/rust/tw_tests/tests/chains/common/bitcoin/plan.rs b/rust/tw_tests/tests/chains/common/bitcoin/plan.rs
new file mode 100644
index 00000000000..eaa2cf285a5
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/bitcoin/plan.rs
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::*;
+use tw_any_coin::test_utils::plan_utils::AnyPlannerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_proto::Common::Proto::SigningError;
+
+pub struct Expected {
+    pub inputs: Vec<i64>,
+    pub outputs: Vec<i64>,
+    pub vsize_estimate: u64,
+    pub fee_estimate: i64,
+    pub change: i64,
+}
+
+pub struct BitcoinPlanHelper<'a> {
+    input: &'a Proto::SigningInput<'a>,
+    coin_type: Option<CoinType>,
+}
+
+impl<'a> BitcoinPlanHelper<'a> {
+    pub fn new(input: &'a Proto::SigningInput<'a>) -> Self {
+        BitcoinPlanHelper {
+            input,
+            coin_type: None,
+        }
+    }
+
+    pub fn coin(mut self, coin_type: CoinType) -> Self {
+        self.coin_type = Some(coin_type);
+        self
+    }
+
+    #[track_caller]
+    pub fn plan(self, expected: Expected) {
+        let coin_type = self
+            .coin_type
+            .expect("'BitcoinPlanHelper::coin_type' is not set");
+
+        let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+        let output = planner.plan(coin_type, self.input.clone());
+
+        assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+
+        let output_inputs: Vec<_> = output.inputs.iter().map(|utxo| utxo.value).collect();
+        let output_outputs: Vec<_> = output.outputs.iter().map(|output| output.value).collect();
+
+        let expected_available_amount: i64 = expected.inputs.iter().sum();
+        let expected_send_amount: i64 = expected.outputs.iter().sum();
+
+        assert_eq!(output_inputs, expected.inputs, "Wrong UTXOs");
+        assert_eq!(output_outputs, expected.outputs, "Wrong Outputs");
+        assert_eq!(
+            output.available_amount, expected_available_amount,
+            "Wrong total available amount"
+        );
+        assert_eq!(
+            output.send_amount, expected_send_amount,
+            "Wrong total send amount"
+        );
+        assert_eq!(
+            output.vsize_estimate, expected.vsize_estimate,
+            "Wrong vsize estimate"
+        );
+        assert_eq!(
+            output.fee_estimate, expected.fee_estimate,
+            "Wrong fee estimate"
+        );
+        assert_eq!(output.change, expected.change, "Wrong change");
+    }
+}
+
+#[derive(Default)]
+pub struct PlanArgs {
+    pub inputs: Vec<Amount>,
+    pub outputs: Vec<Amount>,
+    pub change: bool,
+    pub max: bool,
+    pub dust_threshold: Amount,
+    pub order: Proto::InputSelector,
+    pub fee_per_vb: Amount,
+}
+
+pub fn make_planning_input(args: PlanArgs) -> Proto::SigningInput<'static> {
+    const ALICE_PUBKEY: &str = "037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf";
+    const BOB_PUBKEY: &str = "037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf";
+    const DUMMY_TXID: &str = "06953f715201d085d0607097bc7571fcebe92bd4aa30038bd480a72357b28796";
+
+    let alice_pubkey = ALICE_PUBKEY.decode_hex().unwrap();
+    let bob_pubkey = BOB_PUBKEY.decode_hex().unwrap();
+
+    let inputs: Vec<_> = args
+        .inputs
+        .iter()
+        .enumerate()
+        .map(|(vout, utxo_amount)| Proto::Input {
+            out_point: input::out_point(DUMMY_TXID, vout as u32),
+            value: *utxo_amount,
+            sighash_type: SIGHASH_ALL,
+            claiming_script: input::p2pkh(alice_pubkey.clone()),
+            ..Proto::Input::default()
+        })
+        .collect();
+
+    let outputs: Vec<_> = args
+        .outputs
+        .iter()
+        .map(|output_amount| Proto::Output {
+            value: *output_amount,
+            to_recipient: output::p2pkh(bob_pubkey.clone()),
+        })
+        .collect();
+
+    let change_output = if args.change {
+        Some(Proto::Output {
+            // Put any value here as the change amount will be overwritten.
+            value: 1234,
+            to_recipient: output::p2pkh(alice_pubkey),
+        })
+    } else {
+        None
+    };
+
+    let max_amount_output = if args.max {
+        Some(Proto::Output {
+            // Put any value here as the max amount will be overwritten.
+            value: 4321,
+            to_recipient: output::p2pkh(bob_pubkey),
+        })
+    } else {
+        None
+    };
+
+    let builder = Proto::TransactionBuilder {
+        inputs,
+        outputs,
+        input_selector: args.order,
+        fee_per_vb: args.fee_per_vb,
+        change_output,
+        max_amount_output,
+        dust_policy: dust_threshold(args.dust_threshold),
+        ..Default::default()
+    };
+
+    Proto::SigningInput {
+        // Chain info does not matter in this case, set to the default BTC.
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Proto::SigningInput::default()
+    }
+}
diff --git a/rust/tw_tests/tests/chains/common/bitcoin/preimage.rs b/rust/tw_tests/tests/chains/common/bitcoin/preimage.rs
new file mode 100644
index 00000000000..142fceabe43
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/bitcoin/preimage.rs
@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::sign_utils::PreImageHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::ToHex;
+use tw_memory::Data;
+use tw_proto::BitcoinV2::Proto;
+use tw_proto::Common::Proto::SigningError;
+
+struct ExpectedSighash {
+    pubkey: Data,
+    sighash: Data,
+    taproot_tweak: Option<Data>,
+    signing_method: Proto::mod_PreSigningOutput::SigningMethod,
+}
+
+pub struct BitcoinPreImageHelper<'a> {
+    input: &'a Proto::SigningInput<'a>,
+    coin_type: Option<CoinType>,
+    expected_sighashes: Vec<ExpectedSighash>,
+}
+
+impl<'a> BitcoinPreImageHelper<'a> {
+    pub fn new(input: &'a Proto::SigningInput<'a>) -> Self {
+        BitcoinPreImageHelper {
+            input,
+            coin_type: None,
+            expected_sighashes: Vec::default(),
+        }
+    }
+
+    pub fn coin(mut self, coin_type: CoinType) -> Self {
+        self.coin_type = Some(coin_type);
+        self
+    }
+
+    pub fn add_expected_legacy(mut self, pubkey: Data, sighash: Data) -> Self {
+        self.expected_sighashes.push(ExpectedSighash {
+            pubkey: pubkey.to_vec(),
+            sighash: sighash.to_vec(),
+            taproot_tweak: None,
+            signing_method: Proto::mod_PreSigningOutput::SigningMethod::Legacy,
+        });
+        self
+    }
+
+    pub fn add_expected_segwit(mut self, pubkey: Data, sighash: Data) -> Self {
+        self.expected_sighashes.push(ExpectedSighash {
+            pubkey: pubkey.to_vec(),
+            sighash: sighash.to_vec(),
+            taproot_tweak: None,
+            signing_method: Proto::mod_PreSigningOutput::SigningMethod::Segwit,
+        });
+        self
+    }
+
+    pub fn add_expected_taproot(
+        mut self,
+        pubkey: Data,
+        sighash: Data,
+        taproot_tweak: Option<Data>,
+    ) -> Self {
+        self.expected_sighashes.push(ExpectedSighash {
+            pubkey: pubkey.to_vec(),
+            sighash: sighash.to_vec(),
+            taproot_tweak,
+            signing_method: Proto::mod_PreSigningOutput::SigningMethod::Taproot,
+        });
+        self
+    }
+}
+
+impl<'a> BitcoinPreImageHelper<'a> {
+    pub fn pre_image(self) {
+        let coin_type = self
+            .coin_type
+            .expect("'BitcoinPreImageHelper::coin_type' is not set");
+        let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+        let preimage_output = pre_imager.pre_image_hashes(coin_type, self.input);
+
+        assert_eq!(
+            preimage_output.error,
+            SigningError::OK,
+            "{}",
+            preimage_output.error_message
+        );
+
+        assert_eq!(
+            preimage_output.sighashes.len(),
+            self.expected_sighashes.len(),
+            "Wrong number of sighashes",
+        );
+
+        for (i, (actual_sighash, expected_sighash)) in preimage_output
+            .sighashes
+            .into_iter()
+            .zip(self.expected_sighashes)
+            .enumerate()
+        {
+            assert_eq!(
+                actual_sighash.public_key.to_hex(),
+                expected_sighash.pubkey.to_hex(),
+                "Wrong public key at {}",
+                i
+            );
+            assert_eq!(
+                actual_sighash.sighash.to_hex(),
+                expected_sighash.sighash.to_hex(),
+                "Wrong sighash at {}",
+                i
+            );
+            let actual_merkle_tree = actual_sighash.tweak.map(|tweak| tweak.merkle_root.to_hex());
+            let expected_merkle_tree = expected_sighash.taproot_tweak.map(|root| root.to_hex());
+            assert_eq!(
+                actual_merkle_tree, expected_merkle_tree,
+                "Wrong taproot merkle tree at {}",
+                i
+            );
+            assert_eq!(
+                actual_sighash.signing_method, expected_sighash.signing_method,
+                "Wrong signing method at {}",
+                i
+            );
+        }
+    }
+}
diff --git a/rust/tw_tests/tests/chains/common/bitcoin/psbt_plan.rs b/rust/tw_tests/tests/chains/common/bitcoin/psbt_plan.rs
new file mode 100644
index 00000000000..3f258771632
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/bitcoin/psbt_plan.rs
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::plan_utils::AnyPlannerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_proto::BitcoinV2::Proto;
+
+pub struct BitcoinPsbtPlanHelper<'a> {
+    input: &'a Proto::SigningInput<'a>,
+    coin_type: Option<CoinType>,
+}
+
+impl<'a> BitcoinPsbtPlanHelper<'a> {
+    pub fn new(input: &'a Proto::SigningInput<'a>) -> Self {
+        BitcoinPsbtPlanHelper {
+            input,
+            coin_type: None,
+        }
+    }
+
+    pub fn coin(mut self, coin_type: CoinType) -> Self {
+        self.coin_type = Some(coin_type);
+        self
+    }
+
+    #[track_caller]
+    pub fn plan_psbt(self, expected: Proto::TransactionPlan) {
+        let coin_type = self
+            .coin_type
+            .expect("'BitcoinPsbtPlanHelper::coin_type' is not set");
+
+        let mut planner = AnyPlannerHelper::<Proto::TransactionPlan>::default();
+        let output = planner.plan(coin_type, self.input.clone());
+
+        assert_eq!(output.error, expected.error, "{}", output.error_message);
+
+        assert_eq!(output.inputs, expected.inputs, "Wrong transaction UTXOs");
+        assert_eq!(
+            output.outputs, expected.outputs,
+            "Wrong transaction outputs"
+        );
+
+        assert_eq!(
+            output.available_amount, expected.available_amount,
+            "Wrong available amount"
+        );
+        assert_eq!(
+            output.send_amount, expected.send_amount,
+            "Wrong send amount"
+        );
+        assert_eq!(
+            output.vsize_estimate, expected.vsize_estimate,
+            "Wrong vsize"
+        );
+        assert_eq!(output.fee_estimate, expected.fee_estimate, "Wrong fee");
+        assert_eq!(output.change, expected.change, "Wrong change");
+    }
+}
diff --git a/rust/tw_tests/tests/chains/common/bitcoin/psbt_sign.rs b/rust/tw_tests/tests/chains/common/bitcoin/psbt_sign.rs
new file mode 100644
index 00000000000..dbbc0ae5c6c
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/bitcoin/psbt_sign.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::ToHex;
+use tw_proto::BitcoinV2::Proto;
+use tw_proto::Common::Proto::SigningError;
+
+pub struct Expected {
+    /// Hex encoded PSBT.
+    pub psbt: &'static str,
+    pub encoded: &'static str,
+    pub txid: &'static str,
+    pub vsize: u64,
+    pub weight: u64,
+    pub fee: i64,
+}
+
+pub struct BitcoinPsbtSignHelper<'a> {
+    input: &'a Proto::SigningInput<'a>,
+    coin_type: Option<CoinType>,
+}
+
+impl<'a> BitcoinPsbtSignHelper<'a> {
+    pub fn new(input: &'a Proto::SigningInput<'a>) -> Self {
+        BitcoinPsbtSignHelper {
+            input,
+            coin_type: None,
+        }
+    }
+
+    pub fn coin(mut self, coin_type: CoinType) -> Self {
+        self.coin_type = Some(coin_type);
+        self
+    }
+
+    #[track_caller]
+    pub fn sign_psbt(self, expected: Expected) {
+        let coin_type = self
+            .coin_type
+            .expect("'BitcoinSignHelper::coin_type' is not set");
+
+        let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+        let output = signer.sign(coin_type, self.input.clone());
+
+        assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+
+        let psbt = output.psbt.expect("No PSBT in the SigningOutput").psbt;
+        assert_eq!(psbt.to_hex(), expected.psbt, "Wrong PSBT hex");
+        assert_eq!(
+            output.encoded.to_hex(),
+            expected.encoded,
+            "Wrong encoded signed transaction"
+        );
+        assert_eq!(output.txid.to_hex(), expected.txid, "Wrong txid");
+        assert_eq!(output.vsize, expected.vsize, "Wrong vsize");
+        assert_eq!(output.weight, expected.weight, "Wrong weight");
+        assert_eq!(output.fee, expected.fee, "Wrong fee");
+    }
+}
diff --git a/rust/tw_tests/tests/chains/common/bitcoin/sign.rs b/rust/tw_tests/tests/chains/common/bitcoin/sign.rs
new file mode 100644
index 00000000000..83917d568c9
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/bitcoin/sign.rs
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use super::*;
+use std::collections::HashMap;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::ToHex;
+use tw_memory::Data;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Common::Proto::SigningError;
+
+type UtxoMap = HashMap<OutPoint, i64>;
+
+pub struct Expected {
+    pub encoded: &'static str,
+    pub txid: &'static str,
+    pub inputs: Vec<i64>,
+    pub outputs: Vec<i64>,
+    pub vsize: u64,
+    pub weight: u64,
+    pub fee: i64,
+}
+
+pub struct BitcoinSignHelper<'a> {
+    input: &'a Proto::SigningInput<'a>,
+    coin_type: Option<CoinType>,
+}
+
+impl<'a> BitcoinSignHelper<'a> {
+    pub fn new(input: &'a Proto::SigningInput<'a>) -> Self {
+        BitcoinSignHelper {
+            input,
+            coin_type: None,
+        }
+    }
+
+    pub fn coin(mut self, coin_type: CoinType) -> Self {
+        self.coin_type = Some(coin_type);
+        self
+    }
+
+    #[track_caller]
+    pub fn sign(self, expected: Expected) {
+        let coin_type = self
+            .coin_type
+            .expect("'BitcoinSignHelper::coin_type' is not set");
+        let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+        let output = signer.sign(coin_type, self.input.clone());
+
+        self.verify_output(output, expected);
+    }
+
+    pub fn verify_output(self, output: Proto::SigningOutput, expected: Expected) {
+        assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+
+        let tx = output.transaction.as_ref().unwrap();
+
+        // Collect all the UTXO amounts by using `OutPoint`.
+        let output_inputs = self.transaction_input_amounts(tx);
+        // Collect all the Output amounts.
+        let output_outputs: Vec<_> = tx.outputs.iter().map(|output| output.value).collect();
+
+        assert_eq!(
+            output.encoded.to_hex(),
+            expected.encoded,
+            "Wrong encoded signed transaction"
+        );
+        assert_eq!(output_inputs, expected.inputs, "Wrong UTXOs");
+        assert_eq!(output_outputs, expected.outputs, "Wrong Outputs");
+        assert_eq!(output.txid.to_hex(), expected.txid, "Wrong txid");
+        assert_eq!(output.vsize, expected.vsize, "Wrong vsize");
+        assert_eq!(output.weight, expected.weight, "Wrong weight");
+        assert_eq!(output.fee, expected.fee, "Wrong fee");
+    }
+
+    /// Gets the map of `{ OutPoint -> Amount }`.
+    fn utxo_map(&self) -> UtxoMap {
+        let builder_input = self.transaction_builder();
+
+        let mut utxo_map = HashMap::with_capacity(builder_input.inputs.len());
+        for utxo in builder_input.inputs.iter() {
+            utxo_map.insert(OutPoint::from_proto(&utxo.out_point), utxo.value);
+        }
+        utxo_map
+    }
+
+    /// Collect all the UTXO amounts by using `OutPoint`.
+    fn transaction_input_amounts(&self, tx: &Proto::Transaction) -> Vec<i64> {
+        let utxo_map = self.utxo_map();
+
+        let mut output_inputs = Vec::with_capacity(tx.inputs.len());
+        for utxo in tx.inputs.iter() {
+            let searching_out_point = OutPoint::from_proto(&utxo.out_point);
+            let utxo_amount = *utxo_map.get(&searching_out_point).unwrap_or_else(|| {
+                panic!("Signed transaction does not contain {searching_out_point:?} UTXO")
+            });
+            output_inputs.push(utxo_amount);
+        }
+
+        output_inputs
+    }
+
+    fn transaction_builder(&self) -> &Proto::TransactionBuilder<'_> {
+        match self.input.transaction {
+            TransactionOneof::builder(ref builder) => builder,
+            TransactionOneof::psbt(_) => panic!(
+                "`BitcoinSignHelper` doesn't support PSBT. Consider using `BitcoinPsbtSignHelper`"
+            ),
+            TransactionOneof::None => unreachable!(),
+        }
+    }
+}
+
+#[derive(Debug, Eq, Hash, PartialEq)]
+struct OutPoint {
+    hash: Data,
+    vout: u32,
+}
+
+impl OutPoint {
+    fn from_proto(proto: &Option<Proto::OutPoint>) -> OutPoint {
+        let out_point = proto.as_ref().expect("No OutPoint specified");
+        OutPoint {
+            hash: out_point.hash.to_vec(),
+            vout: out_point.vout,
+        }
+    }
+}
diff --git a/rust/tw_tests/tests/chains/common/mod.rs b/rust/tw_tests/tests/chains/common/mod.rs
new file mode 100644
index 00000000000..25f4e24a93a
--- /dev/null
+++ b/rust/tw_tests/tests/chains/common/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod bitcoin;
diff --git a/rust/tw_tests/tests/chains/cosmos/cosmos_address.rs b/rust/tw_tests/tests/chains/cosmos/cosmos_address.rs
new file mode 100644
index 00000000000..a9acab72f63
--- /dev/null
+++ b/rust/tw_tests/tests/chains/cosmos/cosmos_address.rs
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_bech32_is_valid, test_address_create_bech32_with_public_key,
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+    AddressBech32IsValid, AddressCreateBech32WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_cosmos_address_normalization() {
+    test_address_normalization(
+        CoinType::Cosmos,
+        "cosmosvaloper1sxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08",
+        "cosmosvaloper1sxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08",
+    );
+}
+
+#[test]
+fn test_cosmos_address_is_valid() {
+    test_address_valid(
+        CoinType::Cosmos,
+        "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02",
+    );
+    test_address_valid(
+        CoinType::Cosmos,
+        "cosmosvaloper1sxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08",
+    );
+    test_address_valid(
+        CoinType::Cosmos,
+        "cosmosvalconspub1zcjduepqjnnwe2jsywv0kfc97pz04zkm7tc9k2437cde2my3y5js9t7cw9mstfg3sa",
+    );
+}
+
+#[test]
+fn test_cosmos_address_invalid() {
+    test_address_invalid(
+        CoinType::Cosmos,
+        "cosmosvaloper1sxx9mszve0gaedz5ld7qdkjkfv8z992ax6",
+    );
+    test_address_invalid(
+        CoinType::Cosmos,
+        "one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe",
+    );
+    test_address_invalid(
+        CoinType::Cosmos,
+        "bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2",
+    );
+}
+
+#[test]
+fn test_cosmos_address_get_data() {
+    test_address_get_data(
+        CoinType::Cosmos,
+        "cosmosvaloper1sxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08",
+        "818c5dc04ccbd1dcb454fb7c06da564b0e22955d",
+    );
+}
+
+#[test]
+fn test_any_address_is_valid_bech32() {
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Cosmos,
+        address: "juno1mry47pkga5tdswtluy0m8teslpalkdq0gnn4mf",
+        hrp: "juno",
+    });
+}
+
+#[test]
+fn test_any_address_create_bech32_with_public_key() {
+    test_address_create_bech32_with_public_key(AddressCreateBech32WithPublicKey {
+        coin: CoinType::Cosmos,
+        private_key: "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433",
+        public_key_type: PublicKeyType::Secp256k1,
+        hrp: "dydx",
+        expected: "dydx1mry47pkga5tdswtluy0m8teslpalkdq0hc72uz",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/cosmos/cosmos_sign.rs b/rust/tw_tests/tests/chains/cosmos/cosmos_sign.rs
new file mode 100644
index 00000000000..2244b152974
--- /dev/null
+++ b/rust/tw_tests/tests/chains/cosmos/cosmos_sign.rs
@@ -0,0 +1,128 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_any_signer_sign_cosmos() {
+    use tw_proto::Cosmos::Proto;
+    use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+    let private_key = "8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af"
+        .decode_hex()
+        .unwrap();
+
+    let send_msg = Proto::mod_Message::Send {
+        from_address: "cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx".into(),
+        to_address: "cosmos18s0hdnsllgcclweu9aymw4ngktr2k0rkygdzdp".into(),
+        amounts: vec![Proto::Amount {
+            denom: "uatom".into(),
+            amount: "400000".into(),
+        }],
+        ..Proto::mod_Message::Send::default()
+    };
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Protobuf,
+        account_number: 546179,
+        chain_id: "cosmoshub-4".into(),
+        sequence: 0,
+        fee: Some(Proto::Fee {
+            gas: 200000,
+            amounts: vec![Proto::Amount {
+                denom: "uatom".into(),
+                amount: "1000".into(),
+            }],
+        }),
+        private_key: private_key.into(),
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::send_coins_message(send_msg),
+        }],
+        ..Proto::SigningInput::default()
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output = TWDataHelper::wrap(unsafe {
+        tw_any_signer_sign(input_data.ptr(), CoinType::Cosmos as u32)
+    })
+    .to_vec()
+    .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseBItY29zbW9zMThzMGhkbnNsbGdjY2x3ZXU5YXltdzRuZ2t0cjJrMHJreWdkemRwGg8KBXVhdG9tEgY0MDAwMDASZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJEgQKAggBEhMKDQoFdWF0b20SBDEwMDAQwJoMGkCvvVE6d29P30cO9/lnXyGunWMPxNY12NuqDcCnFkNM0H4CUQdl1Gc9+ogIJbro5nyzZzlv9rl2/GsZox/JXoCX"}"#;
+    assert_eq!(output.serialized, expected);
+}
+
+/// Tests if it is possible to sign a transaction for a custom chain using `CoinType::Cosmos`.
+/// Successfully broadcasted (testnet):
+/// https://explorer.zetachain.com/cosmos/tx/A2FC8816657856ED274C4418C3CAEAEE645561275F6C63AB5F8B1DCFB37341A0
+#[test]
+fn test_any_signer_sign_custom_chain() {
+    use tw_proto::Cosmos::Proto;
+    use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+    let send_msg = Proto::mod_Message::Send {
+        from_address: "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne".into(),
+        to_address: "zeta1cscf4ldnkkz7f0wpveur6dpd0d6p2zxnsuu70y".into(),
+        amounts: vec![Proto::Amount {
+            denom: "azeta".into(),
+            // 0.3 ZETA
+            amount: "300000000000000000".into(),
+        }],
+        ..Proto::mod_Message::Send::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Protobuf,
+        account_number: 2726346,
+        chain_id: "athens_7001-1".into(),
+        sequence: 2,
+        fee: Some(Proto::Fee {
+            gas: 200000,
+            amounts: vec![],
+        }),
+        private_key: "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::send_coins_message(send_msg),
+        }],
+        // Use a different Transaction hashing algorithm.
+        tx_hasher: Proto::TxHasher::Keccak256,
+        signer_info: Some(Proto::SignerInfo {
+            // Zetachain requires a compressed public key to sign a transaction,
+            // however an uncompressed public key is used to generate address.
+            public_key_type: Proto::SignerPublicKeyType::Secp256k1,
+            json_type: "ethermint/PubKeyEthSecp256k1".into(),
+            protobuf_type: "/ethermint.crypto.v1.ethsecp256k1.PubKey".into(),
+        }),
+        ..Proto::SigningInput::default()
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output = TWDataHelper::wrap(unsafe {
+        tw_any_signer_sign(input_data.ptr(), CoinType::Cosmos as u32)
+    })
+    .to_vec()
+    .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    assert_eq!(
+        output.serialized,
+        r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpoBCpcBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEncKK3pldGExNHB5MzZzeDU3dWQ4MnQ5eXJrczl6Nmhkc3JwbjV4NmtteHMwbmUSK3pldGExY3NjZjRsZG5ra3o3ZjB3cHZldXI2ZHBkMGQ2cDJ6eG5zdXU3MHkaGwoFYXpldGESEjMwMDAwMDAwMDAwMDAwMDAwMBJhClkKTwooL2V0aGVybWludC5jcnlwdG8udjEuZXRoc2VjcDI1NmsxLlB1YktleRIjCiECho5+FjRBfbKt/Z/jggW/oP6gGJin/TBWXRP3BWo3wGUSBAoCCAEYAhIEEMCaDBpAgGvqca0w2N9wnHnnxS9HiVud4aQ9lNCumzgNIW6wOR4kvPScacGS1G3kwCw7wyI2NJL8M1eVYjafFIt2FpKl3w=="}"#
+    );
+}
diff --git a/rust/tw_tests/tests/chains/cosmos/cosmos_transaction_util.rs b/rust/tw_tests/tests/chains/cosmos/cosmos_transaction_util.rs
new file mode 100644
index 00000000000..d986376243e
--- /dev/null
+++ b/rust/tw_tests/tests/chains/cosmos/cosmos_transaction_util.rs
@@ -0,0 +1,13 @@
+use tw_any_coin::test_utils::transaction_calc_tx_hash_utils::TransactionUtilHelper;
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_cosmos_transaction_util_calc_tx_hash() {
+    let encoded_tx = "CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseBItY29zbW9zMThzMGhkbnNsbGdjY2x3ZXU5YXltdzRuZ2t0cjJrMHJreWdkemRwGg8KBXVhdG9tEgY0MDAwMDASZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJEgQKAggBEhMKDQoFdWF0b20SBDEwMDAQwJoMGkCvvVE6d29P30cO9/lnXyGunWMPxNY12NuqDcCnFkNM0H4CUQdl1Gc9+ogIJbro5nyzZzlv9rl2/GsZox/JXoCX";
+    let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::Cosmos, encoded_tx);
+
+    assert_eq!(
+        tx_hash,
+        "85392373F54577562067030BF0D61596C91188AA5E6CA8FFE731BD0349296411"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/cosmos/mod.rs b/rust/tw_tests/tests/chains/cosmos/mod.rs
new file mode 100644
index 00000000000..fbf72ad83a8
--- /dev/null
+++ b/rust/tw_tests/tests/chains/cosmos/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod cosmos_address;
+mod cosmos_sign;
+mod cosmos_transaction_util;
diff --git a/rust/tw_tests/tests/chains/dydx/dydx_address.rs b/rust/tw_tests/tests/chains/dydx/dydx_address.rs
new file mode 100644
index 00000000000..8ba214f3e41
--- /dev/null
+++ b/rust/tw_tests/tests/chains/dydx/dydx_address.rs
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_bech32_is_valid, test_address_create_bech32_with_public_key,
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+    AddressBech32IsValid, AddressCreateBech32WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_dydx_address_normalization() {
+    test_address_normalization(
+        CoinType::Dydx,
+        "dydx1adl7usw7z2dnysyn7wvrghu0u0q6gr7jqs4gtt",
+        "dydx1adl7usw7z2dnysyn7wvrghu0u0q6gr7jqs4gtt",
+    );
+}
+
+#[test]
+fn test_dydx_address_is_valid() {
+    test_address_valid(
+        CoinType::Dydx,
+        "dydxvaloper1gf9yvztyvnc3aqrkjd8hfnaf8pk56sl7mzfage",
+    );
+}
+
+#[test]
+fn test_dydx_address_invalid() {
+    test_address_invalid(
+        CoinType::Dydx,
+        "dydxvaloper1gf9yvztyvnc3aqrkjd8hfnaf8pk56sl7mz",
+    );
+    // Cosmos has a different `hrp`.
+    test_address_invalid(
+        CoinType::Cosmos,
+        "dydx1adl7usw7z2dnysyn7wvrghu0u0q6gr7jqs4gtt",
+    );
+}
+
+#[test]
+fn test_dydx_address_get_data() {
+    test_address_get_data(
+        CoinType::Dydx,
+        "dydxvaloper1gf9yvztyvnc3aqrkjd8hfnaf8pk56sl7mzfage",
+        "424a46096464f11e8076934f74cfa9386d4d43fe",
+    );
+}
+
+#[test]
+fn test_dydx_is_valid_bech32() {
+    // Dydx address must be valid if its Base32 prefix passed.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Dydx,
+        address: "dydx1adl7usw7z2dnysyn7wvrghu0u0q6gr7jqs4gtt",
+        hrp: "dydx",
+    });
+    // Dydx address must be valid for the standard Cosmos hub if its Base32 prefix passed.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Cosmos,
+        address: "dydx1adl7usw7z2dnysyn7wvrghu0u0q6gr7jqs4gtt",
+        hrp: "dydx",
+    });
+    // Cosmos address must be valid with "cosmos" hrp.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Dydx,
+        address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02",
+        hrp: "cosmos",
+    });
+}
+
+#[test]
+fn test_any_address_create_bech32_with_public_key() {
+    test_address_create_bech32_with_public_key(AddressCreateBech32WithPublicKey {
+        coin: CoinType::Cosmos,
+        private_key: "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433",
+        public_key_type: PublicKeyType::Secp256k1,
+        hrp: "dydx",
+        expected: "dydx1mry47pkga5tdswtluy0m8teslpalkdq0hc72uz",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/dydx/mod.rs b/rust/tw_tests/tests/chains/dydx/mod.rs
new file mode 100644
index 00000000000..d559c269a8b
--- /dev/null
+++ b/rust/tw_tests/tests/chains/dydx/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod dydx_address;
diff --git a/rust/tw_tests/tests/chains/ecash/ecash_address.rs b/rust/tw_tests/tests/chains/ecash/ecash_address.rs
new file mode 100644
index 00000000000..f78cc75a1f5
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ecash/ecash_address.rs
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_invalid, test_address_normalization, test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_bitcoincash_address_normalization() {
+    test_address_normalization(
+        CoinType::eCash,
+        "pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0",
+        "ecash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0",
+    );
+}
+
+#[test]
+fn test_bitcoincash_address_is_valid() {
+    test_address_valid(
+        CoinType::eCash,
+        "pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0",
+    );
+    test_address_valid(
+        CoinType::eCash,
+        "ecash:qqra3amvnyyhrltyn5h97klwe68cuw3sfcgry9hl9k",
+    );
+}
+
+#[test]
+fn test_bitcoincash_address_invalid() {
+    // Wrong checksum
+    test_address_invalid(
+        CoinType::eCash,
+        "pqx578nanz2h2estzmkr53zqdg6qt8xyqvffffffff",
+    );
+    test_address_invalid(
+        CoinType::eCash,
+        "ecash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvffffffff",
+    );
+
+    // Valid BCH addresses are invalid for eCash
+    test_address_invalid(
+        CoinType::eCash,
+        "pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc",
+    );
+    test_address_invalid(
+        CoinType::eCash,
+        "bitcoincash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc",
+    );
+
+    // Wrong prefix
+    test_address_invalid(
+        CoinType::eCash,
+        "fcash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0",
+    );
+
+    // Wrong base 32 (characters o, i)
+    test_address_invalid(
+        CoinType::eCash,
+        "poi578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc",
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ecash/ecash_sign.rs b/rust/tw_tests/tests/chains/ecash/ecash_sign.rs
new file mode 100644
index 00000000000..f3607dc337b
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ecash/ecash_sign.rs
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::bitcoincash::BCH_SIGHASH_FORK;
+use crate::chains::common::bitcoin::{
+    btc_info, dust_threshold, input, output, sign, TransactionOneof, DUST, SIGHASH_ALL,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_proto::BitcoinV2::Proto;
+
+#[test]
+fn test_ecash_sign_input_p2pkh_from_to_address() {
+    let private_key = "7fdafb9db5bc501f2096e7d13d331dc7a75d9594af3d251313ba8b6200f4e384"
+        .decode_hex()
+        .unwrap();
+
+    // Create transaction with P2PKH as input and output.
+    let utxo_hash_1 = "050d00e2e18ef13969606f1ceee290d3f49bd940684ce39898159352952b8ce2";
+    let utxo_1 = Proto::Input {
+        out_point: input::out_point(utxo_hash_1, 2),
+        value: 5151,
+        sighash_type: SIGHASH_ALL | BCH_SIGHASH_FORK,
+        // Cash address without prefix.
+        claiming_script: input::receiver_address("qzhlrcrcne07x94h99thved2pgzdtv8ccujjy73xya"),
+        ..Default::default()
+    };
+
+    let out_1 = Proto::Output {
+        value: 600,
+        // Cash address with an explicit prefix.
+        to_recipient: output::to_address("ecash:qpmfhhledgp0jy66r5vmwjwmdfu0up7ujqpvm4v8rm"),
+    };
+    let explicit_change_out = Proto::Output {
+        value: 4325,
+        // Cash address without the prefix.
+        to_recipient: output::to_address("qz0q3xmg38sr94rw8wg45vujah7kzma3cs0tssg5fd"),
+    };
+
+    let builder = Proto::TransactionBuilder {
+        version: Proto::TransactionVersion::V1,
+        inputs: vec![utxo_1],
+        outputs: vec![out_1, explicit_change_out],
+        change_output: None,
+        // No matter which selector to use.
+        input_selector: Proto::InputSelector::SelectInOrder,
+        dust_policy: dust_threshold(DUST),
+        ..Default::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_keys: vec![private_key.into()],
+        chain_info: btc_info(),
+        transaction: TransactionOneof::builder(builder),
+        ..Default::default()
+    };
+
+    // Successfully broadcasted:
+    // https://blockchair.com/ecash/transaction/96ee20002b34e468f9d3c5ee54f6a8ddaa61c118889c4f35395c2cd93ba5bbb4
+    sign::BitcoinSignHelper::new(&input)
+        .coin(CoinType::BitcoinCash)
+        .sign(sign::Expected {
+            encoded: "0100000001e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05020000006b483045022100b70d158b43cbcded60e6977e93f9a84966bc0cec6f2dfd1463d1223a90563f0d02207548d081069de570a494d0967ba388ff02641d91cadb060587ead95a98d4e3534121038eab72ec78e639d02758e7860cdec018b49498c307791f785aa3019622f4ea5bffffffff0258020000000000001976a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ace5100000000000001976a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac00000000",
+            txid: "96ee20002b34e468f9d3c5ee54f6a8ddaa61c118889c4f35395c2cd93ba5bbb4",
+            inputs: vec![5151],
+            outputs: vec![600, 4325],
+            vsize: 226,
+            weight: 904,
+            fee: 226,
+        });
+}
diff --git a/rust/tw_tests/tests/chains/ecash/mod.rs b/rust/tw_tests/tests/chains/ecash/mod.rs
new file mode 100644
index 00000000000..fc959a82f8c
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ecash/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod ecash_address;
+mod ecash_sign;
diff --git a/tests/Ethereum/Data/custom.json b/rust/tw_tests/tests/chains/ethereum/data/custom.json
similarity index 100%
rename from tests/Ethereum/Data/custom.json
rename to rust/tw_tests/tests/chains/ethereum/data/custom.json
diff --git a/rust/tw_tests/tests/chains/ethereum/data/custom_decoded.json b/rust/tw_tests/tests/chains/ethereum/data/custom_decoded.json
new file mode 100644
index 00000000000..c5f0e4b4cb8
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/data/custom_decoded.json
@@ -0,0 +1,20 @@
+{
+    "function": "setName(string,uint256,int32)",
+    "inputs": [
+        {
+            "name": "name",
+            "type": "string",
+            "value": "trusty"
+        },
+        {
+            "name": "age",
+            "type": "uint256",
+            "value": "3"
+        },
+        {
+            "name": "height",
+            "type": "int32",
+            "value": "100"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/rust/tw_tests/tests/chains/ethereum/ethereum_abi.rs b/rust/tw_tests/tests/chains/ethereum/ethereum_abi.rs
new file mode 100644
index 00000000000..33802575420
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/ethereum_abi.rs
@@ -0,0 +1,193 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde_json::{json, Value as Json};
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+use tw_number::U256;
+use tw_proto::EthereumAbi::{Proto as AbiProto, Proto};
+use tw_proto::{deserialize, serialize};
+use wallet_core_rs::ffi::ethereum::abi::{
+    tw_ethereum_abi_decode_contract_call, tw_ethereum_abi_decode_params,
+    tw_ethereum_abi_decode_value, tw_ethereum_abi_encode_function,
+    tw_ethereum_abi_function_get_signature,
+};
+
+use tw_coin_registry::coin_type::CoinType;
+use Proto::mod_ParamType::OneOfparam as ParamTypeEnum;
+use Proto::mod_Token::OneOftoken as TokenEnum;
+use Proto::AbiError as AbiErrorKind;
+
+fn param(name: &str, kind: ParamTypeEnum<'static>) -> Proto::Param<'static> {
+    Proto::Param {
+        name: name.to_string().into(),
+        param: Some(Proto::ParamType { param: kind }),
+    }
+}
+
+fn named_token(name: &str, token: TokenEnum<'static>) -> Proto::Token<'static> {
+    Proto::Token {
+        name: name.to_string().into(),
+        token,
+    }
+}
+
+fn number_n<const BITS: u32>(value: u64) -> Proto::NumberNParam<'static> {
+    Proto::NumberNParam {
+        bits: BITS,
+        value: U256::encode_be_compact(value),
+    }
+}
+
+#[test]
+fn test_ethereum_abi_decode_contract_call() {
+    const CUSTOM_ABI_JSON: &str = include_str!("data/custom.json");
+    const CUSTOM_DECODED_JSON: &str = include_str!("data/custom_decoded.json");
+
+    let encoded = "ec37a4a000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000067472757374790000000000000000000000000000000000000000000000000000".decode_hex().unwrap();
+
+    let input = AbiProto::ContractCallDecodingInput {
+        encoded: encoded.into(),
+        smart_contract_abi_json: CUSTOM_ABI_JSON.into(),
+    };
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_ethereum_abi_decode_contract_call(CoinType::Ethereum as u32, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_ethereum_abi_decode_contract_call returned nullptr");
+    let output: AbiProto::ContractCallDecodingOutput = deserialize(&output_data)
+        .expect("!tw_ethereum_abi_decode_contract_call returned an invalid output");
+
+    assert_eq!(output.error, AbiErrorKind::OK);
+    assert!(output.error_message.is_empty());
+
+    let actual: Json = serde_json::from_str(&output.decoded_json).unwrap();
+    let expected: Json = serde_json::from_str(CUSTOM_DECODED_JSON).unwrap();
+    assert_eq!(actual, expected);
+}
+
+#[test]
+fn test_ethereum_abi_decode_params() {
+    let abi_json = json!([
+        {
+            "internalType": "address",
+            "name": "to",
+            "type": "address"
+        },
+        {
+            "internalType": "bool",
+            "name": "approved",
+            "type": "bool"
+        }
+    ]);
+    let abi_json = serde_json::to_string(&abi_json).unwrap();
+    // https://etherscan.io/tx/0xc2744000a107aee4761cf8a638657f91c3003a54e2f1818c37d781be7e48187a
+    let encoded = "00000000000000000000000088341d1a8f672d2780c8dc725902aae72f143b0c0000000000000000000000000000000000000000000000000000000000000001".decode_hex().unwrap();
+
+    let input = AbiProto::ParamsDecodingInput {
+        encoded: encoded.into(),
+        abi: AbiProto::mod_ParamsDecodingInput::OneOfabi::abi_json(abi_json.into()),
+    };
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_ethereum_abi_decode_params(CoinType::Ethereum as u32, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_ethereum_abi_decode_params returned nullptr");
+
+    let output: AbiProto::ParamsDecodingOutput = deserialize(&output_data)
+        .expect("!tw_ethereum_abi_decode_params returned an invalid output");
+
+    assert_eq!(output.error, AbiErrorKind::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected_tokens = vec![
+        named_token(
+            "to",
+            TokenEnum::address("0x88341d1a8F672D2780C8dC725902AAe72F143B0c".into()),
+        ),
+        named_token("approved", TokenEnum::boolean(true)),
+    ];
+    assert_eq!(output.tokens, expected_tokens);
+}
+
+#[test]
+fn test_ethereum_abi_function_get_signature() {
+    let input = AbiProto::FunctionGetTypeInput {
+        function_name: "baz".into(),
+        inputs: vec![
+            param(
+                "foo",
+                ParamTypeEnum::number_uint(Proto::NumberNType { bits: 64 }),
+            ),
+            param("bar", ParamTypeEnum::address(Proto::AddressType {})),
+        ],
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let actual = TWStringHelper::wrap(unsafe {
+        tw_ethereum_abi_function_get_signature(CoinType::Ethereum as u32, input_data.ptr())
+    })
+    .to_string()
+    .expect("!tw_ethereum_abi_function_get_signature returned nullptr");
+
+    assert_eq!(actual, "baz(uint64,address)");
+}
+
+#[test]
+fn test_ethereum_abi_encode_function() {
+    let input = AbiProto::FunctionEncodingInput {
+        function_name: "baz".into(),
+        tokens: vec![
+            named_token("", TokenEnum::number_uint(number_n::<256>(69))),
+            named_token("", TokenEnum::boolean(true)),
+        ],
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_ethereum_abi_encode_function(CoinType::Ethereum as u32, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_ethereum_abi_encode_function returned nullptr");
+
+    let output: AbiProto::FunctionEncodingOutput = deserialize(&output_data)
+        .expect("!tw_ethereum_abi_encode_function returned an invalid output");
+
+    assert_eq!(output.error, AbiErrorKind::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(output.encoded.to_hex(), "72ed38b600000000000000000000000000000000000000000000000000000000000000450000000000000000000000000000000000000000000000000000000000000001");
+}
+
+#[test]
+fn test_ethereum_abi_decode_value() {
+    let input = AbiProto::ValueDecodingInput {
+        encoded: "000000000000000000000000000000000000000000000000000000000000002a"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        param_type: "int8".into(),
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_ethereum_abi_decode_value(CoinType::Ethereum as u32, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_ethereum_abi_decode_value returned nullptr");
+
+    let output: AbiProto::ValueDecodingOutput = deserialize(&output_data)
+        .expect("!tw_ethereum_abi_decode_value returned an invalid output");
+
+    assert_eq!(output.error, AbiErrorKind::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(output.param_str, "42");
+}
diff --git a/rust/tw_tests/tests/chains/ethereum/ethereum_address.rs b/rust/tw_tests/tests/chains/ethereum/ethereum_address.rs
new file mode 100644
index 00000000000..7fb5934a6ba
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/ethereum_address.rs
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+};
+use tw_coin_registry::blockchain_type::BlockchainType;
+use tw_coin_registry::registry::coin_items_by_blockchain;
+
+#[test]
+fn test_ethereum_address_normalization() {
+    for coin in coin_items_by_blockchain(BlockchainType::Ethereum) {
+        test_address_normalization(
+            coin.coin_id,
+            "0xb16db98b365b1f89191996942612b14f1da4bd5f",
+            "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f",
+        );
+    }
+}
+
+#[test]
+fn test_ethereum_address_is_valid() {
+    for coin in coin_items_by_blockchain(BlockchainType::Ethereum) {
+        test_address_valid(coin.coin_id, "0xb16db98b365b1f89191996942612b14f1da4bd5f");
+        test_address_valid(coin.coin_id, "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f");
+    }
+}
+
+#[test]
+fn test_ethereum_address_invalid() {
+    for coin in coin_items_by_blockchain(BlockchainType::Ethereum) {
+        test_address_invalid(coin.coin_id, "b16Db98B365B1f89191996942612B14F1Da4Bd5f");
+    }
+}
+
+#[test]
+fn test_ethereum_address_get_data() {
+    for coin in coin_items_by_blockchain(BlockchainType::Ethereum) {
+        test_address_get_data(
+            coin.coin_id,
+            "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f",
+            "b16Db98B365B1f89191996942612B14F1Da4Bd5f",
+        );
+    }
+}
diff --git a/rust/tw_tests/tests/chains/ethereum/ethereum_compile.rs b/rust/tw_tests/tests/chains/ethereum/ethereum_compile.rs
new file mode 100644
index 00000000000..b83500c18e6
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/ethereum_compile.rs
@@ -0,0 +1,108 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_plan;
+use tw_any_coin::ffi::tw_transaction_compiler::{
+    tw_transaction_compiler_compile, tw_transaction_compiler_pre_image_hashes,
+};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_data_vector_helper::TWDataVectorHelper;
+use tw_number::U256;
+use tw_proto::Ethereum::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_transaction_compiler_eth() {
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(1_000_000_000_000_000_000),
+        data: Cow::default(),
+    };
+    let input = Proto::SigningInput {
+        nonce: U256::encode_be_compact(11),
+        chain_id: U256::encode_be_compact(1),
+        gas_price: U256::encode_be_compact(20_000_000_000),
+        gas_limit: U256::encode_be_compact(21_000),
+        to_address: "0x3535353535353535353535353535353535353535".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let preimage_data = TWDataHelper::wrap(unsafe {
+        tw_transaction_compiler_pre_image_hashes(CoinType::Ethereum as u32, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_transaction_compiler_pre_image_hashes returned nullptr");
+
+    let preimage: CompilerProto::PreSigningOutput =
+        deserialize(&preimage_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(preimage.error, SigningErrorType::OK);
+    assert!(preimage.error_message.is_empty());
+    assert_eq!(
+        preimage.data_hash.to_hex(),
+        "15e180a6274b2f6a572b9b51823fce25ef39576d10188ecdcd7de44526c47217"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server
+    let signature = "360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c9796677900".decode_hex().unwrap();
+    let public_key = "044bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ce28cab79ad7119ee1ad3ebcdb98a16805211530ecc6cfefa1b88e6dff99232a".decode_hex().unwrap();
+
+    let signatures = TWDataVectorHelper::create([signature]);
+    let public_keys = TWDataVectorHelper::create([public_key]);
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_transaction_compiler_compile(
+            CoinType::Ethereum as u32,
+            input_data.ptr(),
+            signatures.ptr(),
+            public_keys.ptr(),
+        )
+    })
+    .to_vec()
+    .expect("!tw_transaction_compiler_compile returned nullptr");
+
+    let output: Proto::SigningOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    let expected_encoded = "f86c0b8504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a0360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07ba053bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c97966779";
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+}
+
+#[test]
+fn test_transaction_compiler_plan_not_supported() {
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(1),
+        data: Cow::default(),
+    };
+    let input = Proto::SigningInput {
+        to_address: "0x3535353535353535353535353535353535353535".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        ..Proto::SigningInput::default()
+    };
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let plan = TWDataHelper::wrap(unsafe {
+        tw_any_signer_plan(input_data.ptr(), CoinType::Ethereum as u32)
+    });
+    assert!(
+        plan.is_null(),
+        "Transaction plan is expected to be not supported by the {:?} coin",
+        CoinType::Ethereum
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ethereum/ethereum_message_sign.rs b/rust/tw_tests/tests/chains/ethereum/ethereum_message_sign.rs
new file mode 100644
index 00000000000..8379148b394
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/ethereum_message_sign.rs
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::ffi::tw_message_signer::{
+    tw_message_signer_pre_image_hashes, tw_message_signer_sign, tw_message_signer_verify,
+};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_proto::{deserialize, serialize, Ethereum, TxCompiler};
+
+#[test]
+fn test_tw_message_signer_sign() {
+    let input = Ethereum::Proto::MessageSigningInput {
+        private_key: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        message: "Foo".into(),
+        chain_id: None,
+        message_type: Ethereum::Proto::MessageType::MessageType_legacy,
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let output = TWDataHelper::wrap(unsafe {
+        tw_message_signer_sign(input_data.ptr(), CoinType::Ethereum as u32)
+    })
+    .to_vec()
+    .expect("!tw_message_signer_sign returned nullptr");
+
+    let output: Ethereum::Proto::MessageSigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(output.signature, "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be71101b");
+}
+
+#[test]
+fn test_tw_message_signer_verify() {
+    let input = Ethereum::Proto::MessageVerifyingInput {
+        message: "Foo".into(),
+        public_key: "0349d0134ef2c798c02879379a1760baa49c4e25e2324cd128f11e559f073bcc6f".decode_hex().unwrap().into(),
+        signature: "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be71101b".into(),
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let verified = unsafe { tw_message_signer_verify(input_data.ptr(), CoinType::Ethereum as u32) };
+    assert!(verified);
+}
+
+#[test]
+fn test_tw_message_signer_verify_invalid() {
+    let input = Ethereum::Proto::MessageVerifyingInput {
+        message: "Foo".into(),
+        public_key: "0349d0134ef2c798c02879379a1760baa49c4e25e2324cd128f11e559f073bcc6f".decode_hex().unwrap().into(),
+        signature: "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be71101c".into(),
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let verified = unsafe { tw_message_signer_verify(input_data.ptr(), CoinType::Ethereum as u32) };
+    assert!(!verified);
+}
+
+#[test]
+fn test_tw_message_signer_pre_image_hashes() {
+    let input = Ethereum::Proto::MessageSigningInput {
+        private_key: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        message: "Foo".into(),
+        chain_id: None,
+        message_type: Ethereum::Proto::MessageType::MessageType_legacy,
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let output = TWDataHelper::wrap(unsafe {
+        tw_message_signer_pre_image_hashes(input_data.ptr(), CoinType::Ethereum as u32)
+    })
+    .to_vec()
+    .expect("!tw_message_signer_sign returned nullptr");
+
+    let output: TxCompiler::Proto::PreSigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    assert_eq!(
+        output.data_hash.to_hex(),
+        "0af844076e792f9685560b2e597967da7403b00a5339b5801ea251ddde375f8a"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ethereum/ethereum_rlp.rs b/rust/tw_tests/tests/chains/ethereum/ethereum_rlp.rs
new file mode 100644
index 00000000000..c5e4cf0ea63
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/ethereum_rlp.rs
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::ToHex;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_proto::EthereumRlp::Proto as RlpProto;
+use tw_proto::{deserialize, serialize};
+use wallet_core_rs::ffi::ethereum::rlp::tw_ethereum_rlp_encode;
+use RlpProto::mod_RlpItem::OneOfitem as Item;
+
+#[test]
+fn test_ethereum_rlp() {
+    let item = RlpProto::RlpItem {
+        item: Item::number_u64(128),
+    };
+    let input = RlpProto::EncodingInput { item: Some(item) };
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_ethereum_rlp_encode(CoinType::Ethereum as u32, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_ethereum_rlp_encode returned nullptr");
+    let output: RlpProto::EncodingOutput =
+        deserialize(&output_data).expect("!tw_ethereum_rlp_encode returned an invalid output");
+
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected_encoded = "8180";
+    assert_eq!(output.encoded.to_hex(), expected_encoded);
+}
diff --git a/rust/tw_tests/tests/chains/ethereum/ethereum_sign.rs b/rust/tw_tests/tests/chains/ethereum/ethereum_sign.rs
new file mode 100644
index 00000000000..31f6aab6394
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/ethereum_sign.rs
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_number::U256;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_any_signer_sign_eth() {
+    use tw_proto::Ethereum::Proto;
+
+    let private = "0x4646464646464646464646464646464646464646464646464646464646464646"
+        .decode_hex()
+        .unwrap();
+
+    let transfer = Proto::mod_Transaction::Transfer {
+        amount: U256::encode_be_compact(1_000_000_000_000_000_000),
+        data: Cow::default(),
+    };
+
+    let input = Proto::SigningInput {
+        chain_id: U256::encode_be_compact(1),
+        nonce: U256::encode_be_compact(9),
+        gas_price: U256::encode_be_compact(20_000_000_000),
+        gas_limit: U256::encode_be_compact(21_000),
+        to_address: "0x3535353535353535353535353535353535353535".into(),
+        transaction: Some(Proto::Transaction {
+            transaction_oneof: Proto::mod_Transaction::OneOftransaction_oneof::transfer(transfer),
+        }),
+        private_key: private.into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output = TWDataHelper::wrap(unsafe {
+        tw_any_signer_sign(input_data.ptr(), CoinType::Ethereum as u32)
+    })
+    .to_vec()
+    .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    let expected = "f86c098504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a028ef61340bd939bc2195fe537567866003e1a15d3c71ff63e1590620aa636276a067cbe9d8997f761aecb703304b3800ccf555c9f3dc64214b297fb1966a3b6d83";
+    assert_eq!(output.encoded.to_hex(), expected);
+}
diff --git a/rust/tw_tests/tests/chains/ethereum/ethereum_transaction_util.rs b/rust/tw_tests/tests/chains/ethereum/ethereum_transaction_util.rs
new file mode 100644
index 00000000000..4b38c8b9ff6
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/ethereum_transaction_util.rs
@@ -0,0 +1,13 @@
+use tw_any_coin::test_utils::transaction_calc_tx_hash_utils::TransactionUtilHelper;
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_ethereum_transaction_util_calc_tx_hash() {
+    let encoded_tx = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0724c62ad4fbf47346b02de06e603e013f26f26b56fdc0be7ba3d6273401d98cea0032131cae15da7ddcda66963e8bef51ca0d9962bfef0547d3f02597a4a58c931";
+    let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::Ethereum, encoded_tx);
+
+    assert_eq!(
+        tx_hash,
+        "0x199a7829fc5149e49b452c2cab76d8fa5a9682fee6e4891b8acb697ac142513e"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ethereum/mod.rs b/rust/tw_tests/tests/chains/ethereum/mod.rs
new file mode 100644
index 00000000000..b962375b4d9
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ethereum/mod.rs
@@ -0,0 +1,11 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod ethereum_abi;
+mod ethereum_address;
+mod ethereum_compile;
+mod ethereum_message_sign;
+mod ethereum_rlp;
+mod ethereum_sign;
+mod ethereum_transaction_util;
diff --git a/rust/tw_tests/tests/chains/greenfield/greenfield_address.rs b/rust/tw_tests/tests/chains/greenfield/greenfield_address.rs
new file mode 100644
index 00000000000..5f36676b06e
--- /dev/null
+++ b/rust/tw_tests/tests/chains/greenfield/greenfield_address.rs
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_greenfield_address_normalization() {
+    test_address_normalization(
+        CoinType::Greenfield,
+        "0xb16db98b365b1f89191996942612b14f1da4bd5f",
+        "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f",
+    );
+}
+
+#[test]
+fn test_greenfield_address_is_valid() {
+    test_address_valid(
+        CoinType::Greenfield,
+        "0xb16db98b365b1f89191996942612b14f1da4bd5f",
+    );
+}
+
+#[test]
+fn test_greenfield_address_invalid() {
+    test_address_invalid(
+        CoinType::Greenfield,
+        "b16Db98B365B1f89191996942612B14F1Da4Bd5f",
+    );
+    test_address_invalid(
+        CoinType::Greenfield,
+        "bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2",
+    );
+}
+
+#[test]
+fn test_greenfield_address_get_data() {
+    test_address_get_data(
+        CoinType::Greenfield,
+        "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f",
+        "b16Db98B365B1f89191996942612B14F1Da4Bd5f",
+    );
+}
diff --git a/rust/tw_tests/tests/chains/greenfield/greenfield_compile.rs b/rust/tw_tests/tests/chains/greenfield/greenfield_compile.rs
new file mode 100644
index 00000000000..cb4dbb7c4a5
--- /dev/null
+++ b/rust/tw_tests/tests/chains/greenfield/greenfield_compile.rs
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::greenfield::{make_amount, PUBLIC_KEY_15560};
+use std::borrow::Cow;
+use tw_any_coin::test_utils::sign_utils::{CompilerHelper, PreImageHelper};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Greenfield::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+#[test]
+fn test_greenfield_compile() {
+    let public_key_data = PUBLIC_KEY_15560.decode_hex().unwrap();
+
+    let send_order = Proto::mod_Message::Send {
+        from_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        to_address: "0x280b27f3676db1C4475EE10F75D510Eb527fd155".into(),
+        amounts: vec![make_amount("BNB", "1000000000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+
+    let mut input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 15560,
+        eth_chain_id: "5600".into(),
+        cosmos_chain_id: "greenfield_5600-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "2000000000000000")],
+            gas: 200000,
+        }),
+        sequence: 2,
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::send_coins_message(send_order),
+        }],
+        mode: Proto::BroadcastMode::ASYNC,
+        public_key: public_key_data.clone().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<CompilerProto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Greenfield, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data_hash.to_hex(),
+        "b8c62654582ca96b37ca94966199682bf70ed934e740d2f874ff54675a0ac344"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature = "cb3a4684a991014a387a04a85b59227ebb79567c2025addcb296b4ca856e9f810d3b526f2a0d0fad6ad1b126b3b9516f8b3be020a7cca9c03ce3cf47f4199b6d00";
+    let protected_signature = "cb3a4684a991014a387a04a85b59227ebb79567c2025addcb296b4ca856e9f810d3b526f2a0d0fad6ad1b126b3b9516f8b3be020a7cca9c03ce3cf47f4199b6d1b";
+    let signature_bytes = signature.decode_hex().unwrap();
+
+    // Reset the `SigningInput::public_key`.
+    // The public key argument of the `TWTransactionCompilerCompileWithSignatures` should be used instead.
+    input.public_key = Cow::default();
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(
+        CoinType::Greenfield,
+        &input,
+        vec![signature_bytes],
+        vec![public_key_data],
+    );
+
+    let expected = r#"{"mode":"BROADCAST_MODE_ASYNC","tx_bytes":"CpQBCpEBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnEKKjB4OWQxZDk3YURGY2QzMjRCYmQ2MDNEMzg3MkJENzhlMDQwOTg1MTBiMRIqMHgyODBiMjdmMzY3NmRiMUM0NDc1RUUxMEY3NUQ1MTBFYjUyN2ZkMTU1GhcKA0JOQhIQMTAwMDAwMDAwMDAwMDAwMBJ5ClgKTQomL2Nvc21vcy5jcnlwdG8uZXRoLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohAnnvNAZNoQ2wRjxwSAYWugIHA+w6RQJt73vr0ggvXW/IEgUKAwjIBRgCEh0KFwoDQk5CEhAyMDAwMDAwMDAwMDAwMDAwEMCaDBpByzpGhKmRAUo4egSoW1kifrt5VnwgJa3cspa0yoVun4ENO1JvKg0PrWrRsSazuVFvizvgIKfMqcA8489H9BmbbRs="}"#;
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.serialized, expected);
+    assert_eq!(output.signature.to_hex(), protected_signature);
+}
diff --git a/rust/tw_tests/tests/chains/greenfield/greenfield_sign.rs b/rust/tw_tests/tests/chains/greenfield/greenfield_sign.rs
new file mode 100644
index 00000000000..f2ec4752a46
--- /dev/null
+++ b/rust/tw_tests/tests/chains/greenfield/greenfield_sign.rs
@@ -0,0 +1,248 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::greenfield::{make_amount, PRIVATE_KEY_15560, PRIVATE_KEY_1686};
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Greenfield::Proto;
+use Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+/// **Testnet**
+/// Successfully broadcasted: https://greenfieldscan.com/tx/0x9f895cf2dd64fb1f428cefcf2a6585a813c3540fc9fe1ef42db1da2cb1df55ab
+#[test]
+fn test_greenfield_sign_send_order_9f895c() {
+    let send_order = Proto::mod_Message::Send {
+        from_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        to_address: "0x280b27f3676db1C4475EE10F75D510Eb527fd155".into(),
+        amounts: vec![make_amount("BNB", "1000000000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 15560,
+        eth_chain_id: "5600".into(),
+        cosmos_chain_id: "greenfield_5600-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "2000000000000000")],
+            gas: 200000,
+        }),
+        sequence: 2,
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::send_coins_message(send_order),
+        }],
+        private_key: PRIVATE_KEY_15560.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Greenfield, input);
+
+    let expected = r#"{"mode":"BROADCAST_MODE_SYNC","tx_bytes":"CpQBCpEBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnEKKjB4OWQxZDk3YURGY2QzMjRCYmQ2MDNEMzg3MkJENzhlMDQwOTg1MTBiMRIqMHgyODBiMjdmMzY3NmRiMUM0NDc1RUUxMEY3NUQ1MTBFYjUyN2ZkMTU1GhcKA0JOQhIQMTAwMDAwMDAwMDAwMDAwMBJ5ClgKTQomL2Nvc21vcy5jcnlwdG8uZXRoLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohAnnvNAZNoQ2wRjxwSAYWugIHA+w6RQJt73vr0ggvXW/IEgUKAwjIBRgCEh0KFwoDQk5CEhAyMDAwMDAwMDAwMDAwMDAwEMCaDBpByzpGhKmRAUo4egSoW1kifrt5VnwgJa3cspa0yoVun4ENO1JvKg0PrWrRsSazuVFvizvgIKfMqcA8489H9BmbbRs="}"#;
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.serialized, expected);
+    assert_eq!(output.signature.to_hex(), "cb3a4684a991014a387a04a85b59227ebb79567c2025addcb296b4ca856e9f810d3b526f2a0d0fad6ad1b126b3b9516f8b3be020a7cca9c03ce3cf47f4199b6d1b");
+}
+
+/// Successfully broadcasted: https://greenfieldscan.com/tx/DA50E269A13D2C42770CD6A4C35EA7EBEE46C677465ED92985215E67C340E28D
+#[test]
+fn test_greenfield_sign_send_order_b798ab() {
+    let send_order = Proto::mod_Message::Send {
+        from_address: "0xF1DB7D5256d721fE3C144F5c1ed4b3A3A94Dc444".into(),
+        to_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        amounts: vec![make_amount("BNB", "100000000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 1686,
+        eth_chain_id: "1017".into(),
+        cosmos_chain_id: "greenfield_1017-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "6000000000000")],
+            gas: 1200,
+        }),
+        sequence: 0,
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::send_coins_message(send_order),
+        }],
+        private_key: PRIVATE_KEY_1686.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Greenfield, input);
+
+    let expected = r#"{"mode":"BROADCAST_MODE_SYNC","tx_bytes":"CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKKjB4RjFEQjdENTI1NmQ3MjFmRTNDMTQ0RjVjMWVkNGIzQTNBOTREYzQ0NBIqMHg5ZDFkOTdhREZjZDMyNEJiZDYwM0QzODcyQkQ3OGUwNDA5ODUxMGIxGhYKA0JOQhIPMTAwMDAwMDAwMDAwMDAwEnMKVgpNCiYvY29zbW9zLmNyeXB0by5ldGguZXRoc2VjcDI1NmsxLlB1YktleRIjCiEDCbufQiEfB0Z6DbH3BQTjvz/DjTWbiziPi702Ws2BbJYSBQoDCMgFEhkKFAoDQk5CEg02MDAwMDAwMDAwMDAwELAJGkGvQ8FyO09ECauebgRGWal94uZtp0K1vkqnl0xHCzzEylWLS7PJcBepUCkIkG4xnswnN4n7EqHZoZ+qVTH8Ue7fGw=="}"#;
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.serialized, expected);
+    assert_eq!(output.signature.to_hex(), "af43c1723b4f4409ab9e6e044659a97de2e66da742b5be4aa7974c470b3cc4ca558b4bb3c97017a9502908906e319ecc273789fb12a1d9a19faa5531fc51eedf1b");
+
+    let expected_signature_json = r#"[{"pub_key":{"type":"/cosmos.crypto.eth.ethsecp256k1.PubKey","value":"Awm7n0IhHwdGeg2x9wUE478/w401m4s4j4u9NlrNgWyW"},"signature":"r0PBcjtPRAmrnm4ERlmpfeLmbadCtb5Kp5dMRws8xMpVi0uzyXAXqVApCJBuMZ7MJzeJ+xKh2aGfqlUx/FHu3xs="}]"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+/// **Testnet**
+/// Successfully broadcasted Greenfield: https://greenfieldscan.com/tx/38C29C530A74946CFD22EE07DA642F5EF9399BC9AEA59EC56A9B5BE16DE16CE7
+/// BSC (parent transaction): https://testnet.bscscan.com/tx/0x7f73c8a362e14e58cb5e0ec17616afc50eff7aa398db472383a6d017c8a5861a
+#[test]
+fn test_greenfield_sign_transfer_out() {
+    let transfer_out = Proto::mod_Message::BridgeTransferOut {
+        from_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        to_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        amount: Some(make_amount("BNB", "5670000000000000")),
+        ..Proto::mod_Message::BridgeTransferOut::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 15560,
+        eth_chain_id: "5600".into(),
+        cosmos_chain_id: "greenfield_5600-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "6000000000000")],
+            gas: 1200,
+        }),
+        sequence: 7,
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::bridge_transfer_out(transfer_out),
+        }],
+        private_key: PRIVATE_KEY_15560.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Greenfield, input);
+
+    let expected = r#"{"mode":"BROADCAST_MODE_SYNC","tx_bytes":"CpkBCpYBCiEvZ3JlZW5maWVsZC5icmlkZ2UuTXNnVHJhbnNmZXJPdXQScQoqMHg5ZDFkOTdhREZjZDMyNEJiZDYwM0QzODcyQkQ3OGUwNDA5ODUxMGIxEioweDlkMWQ5N2FERmNkMzI0QmJkNjAzRDM4NzJCRDc4ZTA0MDk4NTEwYjEaFwoDQk5CEhA1NjcwMDAwMDAwMDAwMDAwEnUKWApNCiYvY29zbW9zLmNyeXB0by5ldGguZXRoc2VjcDI1NmsxLlB1YktleRIjCiECee80Bk2hDbBGPHBIBha6AgcD7DpFAm3ve+vSCC9db8gSBQoDCMgFGAcSGQoUCgNCTkISDTYwMDAwMDAwMDAwMDAQsAkaQc4DDByhu80Uy/M3sQePvAmhmbFWZeGq359rugtskEiXKfCzSB86XmBi+l+Q5ETDS2folMxbufHSE8gM4WBCHzgc"}"#;
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.serialized, expected);
+    assert_eq!(output.signature.to_hex(), "ce030c1ca1bbcd14cbf337b1078fbc09a199b15665e1aadf9f6bba0b6c90489729f0b3481f3a5e6062fa5f90e444c34b67e894cc5bb9f1d213c80ce160421f381c");
+}
+
+#[test]
+fn test_greenfield_sign_no_messages() {
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 15560,
+        eth_chain_id: "5600".into(),
+        cosmos_chain_id: "greenfield_5600-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "6000000000000")],
+            gas: 1200,
+        }),
+        sequence: 3,
+        messages: Vec::default(),
+        private_key: PRIVATE_KEY_15560.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Greenfield, input);
+
+    assert_eq!(output.error, SigningError::Error_invalid_params);
+}
+
+/// Successfully broadcasted: https://greenfieldscan.com/tx/82E967B702AFFA9227C3E987CD35B85DD862AE1C49F3027A639E354480138C40
+#[test]
+fn test_greenfield_sign_multiple_messages_82e967() {
+    let send_order1 = Proto::mod_Message::Send {
+        from_address: "0xF1DB7D5256d721fE3C144F5c1ed4b3A3A94Dc444".into(),
+        to_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        amounts: vec![make_amount("BNB", "100000000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+    let send_order2 = Proto::mod_Message::Send {
+        from_address: "0xF1DB7D5256d721fE3C144F5c1ed4b3A3A94Dc444".into(),
+        to_address: "0x280b27f3676db1C4475EE10F75D510Eb527fd155".into(),
+        amounts: vec![make_amount("BNB", "90000000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 1686,
+        eth_chain_id: "1017".into(),
+        cosmos_chain_id: "greenfield_1017-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "15000000000000")],
+            gas: 3000,
+        }),
+        sequence: 1,
+        messages: vec![
+            Proto::Message {
+                message_oneof: MessageEnum::send_coins_message(send_order1),
+            },
+            Proto::Message {
+                message_oneof: MessageEnum::send_coins_message(send_order2),
+            },
+        ],
+        private_key: PRIVATE_KEY_1686.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Greenfield, input);
+
+    let expected = r#"{"mode":"BROADCAST_MODE_SYNC","tx_bytes":"CqUCCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKKjB4RjFEQjdENTI1NmQ3MjFmRTNDMTQ0RjVjMWVkNGIzQTNBOTREYzQ0NBIqMHg5ZDFkOTdhREZjZDMyNEJiZDYwM0QzODcyQkQ3OGUwNDA5ODUxMGIxGhYKA0JOQhIPMTAwMDAwMDAwMDAwMDAwCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KKjB4RjFEQjdENTI1NmQ3MjFmRTNDMTQ0RjVjMWVkNGIzQTNBOTREYzQ0NBIqMHgyODBiMjdmMzY3NmRiMUM0NDc1RUUxMEY3NUQ1MTBFYjUyN2ZkMTU1GhUKA0JOQhIOOTAwMDAwMDAwMDAwMDASdgpYCk0KJi9jb3Ntb3MuY3J5cHRvLmV0aC5ldGhzZWNwMjU2azEuUHViS2V5EiMKIQMJu59CIR8HRnoNsfcFBOO/P8ONNZuLOI+LvTZazYFslhIFCgMIyAUYARIaChUKA0JOQhIOMTUwMDAwMDAwMDAwMDAQuBcaQS23kxqz7R/QZTegc1Ic1U0g+YUm9r8Y8Zx0+sHzKREYWg04yxy/EKvVY7LIqATQ2zi4rb9TZSIyXuMcyGk2JQYb"}"#;
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.serialized, expected);
+    assert_eq!(output.signature.to_hex(), "2db7931ab3ed1fd06537a073521cd54d20f98526f6bf18f19c74fac1f32911185a0d38cb1cbf10abd563b2c8a804d0db38b8adbf536522325ee31cc8693625061b");
+
+    let expected_signature_json = r#"[{"pub_key":{"type":"/cosmos.crypto.eth.ethsecp256k1.PubKey","value":"Awm7n0IhHwdGeg2x9wUE478/w401m4s4j4u9NlrNgWyW"},"signature":"LbeTGrPtH9BlN6BzUhzVTSD5hSb2vxjxnHT6wfMpERhaDTjLHL8Qq9VjssioBNDbOLitv1NlIjJe4xzIaTYlBhs="}]"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
+
+/// Successfully broadcasted: https://greenfieldscan.com/tx/E3539ED65D195BE8CE43C1A6567384C758E40432B8FDC7C25841E21F5F53375B
+#[test]
+fn test_greenfield_sign_multiple_messages_e3539e() {
+    let send_order = Proto::mod_Message::Send {
+        from_address: "0xF1DB7D5256d721fE3C144F5c1ed4b3A3A94Dc444".into(),
+        to_address: "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1".into(),
+        amounts: vec![make_amount("BNB", "100000000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+    let transfer_out = Proto::mod_Message::BridgeTransferOut {
+        from_address: "0xF1DB7D5256d721fE3C144F5c1ed4b3A3A94Dc444".into(),
+        to_address: "0xF1DB7D5256d721fE3C144F5c1ed4b3A3A94Dc444".into(),
+        amount: Some(make_amount("BNB", "200000000000000")),
+        ..Proto::mod_Message::BridgeTransferOut::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Eip712,
+        account_number: 1686,
+        eth_chain_id: "1017".into(),
+        cosmos_chain_id: "greenfield_1017-1".into(),
+        fee: Some(Proto::Fee {
+            amounts: vec![make_amount("BNB", "15000000000000")],
+            gas: 3000,
+        }),
+        sequence: 2,
+        messages: vec![
+            Proto::Message {
+                message_oneof: MessageEnum::send_coins_message(send_order),
+            },
+            Proto::Message {
+                message_oneof: MessageEnum::bridge_transfer_out(transfer_out),
+            },
+        ],
+        private_key: PRIVATE_KEY_1686.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Greenfield, input);
+
+    let expected = r#"{"mode":"BROADCAST_MODE_SYNC","tx_bytes":"CqsCCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKKjB4RjFEQjdENTI1NmQ3MjFmRTNDMTQ0RjVjMWVkNGIzQTNBOTREYzQ0NBIqMHg5ZDFkOTdhREZjZDMyNEJiZDYwM0QzODcyQkQ3OGUwNDA5ODUxMGIxGhYKA0JOQhIPMTAwMDAwMDAwMDAwMDAwCpUBCiEvZ3JlZW5maWVsZC5icmlkZ2UuTXNnVHJhbnNmZXJPdXQScAoqMHhGMURCN0Q1MjU2ZDcyMWZFM0MxNDRGNWMxZWQ0YjNBM0E5NERjNDQ0EioweEYxREI3RDUyNTZkNzIxZkUzQzE0NEY1YzFlZDRiM0EzQTk0RGM0NDQaFgoDQk5CEg8yMDAwMDAwMDAwMDAwMDASdgpYCk0KJi9jb3Ntb3MuY3J5cHRvLmV0aC5ldGhzZWNwMjU2azEuUHViS2V5EiMKIQMJu59CIR8HRnoNsfcFBOO/P8ONNZuLOI+LvTZazYFslhIFCgMIyAUYAhIaChUKA0JOQhIOMTUwMDAwMDAwMDAwMDAQuBcaQfkHNYUs2oMR0/ZauYXv8Nd/9bbrQ4w323P4GpyEO0j8IadMVE8TkmI6lIx4H/hPSbpG9wRrqhZZfzTsqSv5rDgb"}"#;
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.serialized, expected);
+    assert_eq!(output.signature.to_hex(), "f90735852cda8311d3f65ab985eff0d77ff5b6eb438c37db73f81a9c843b48fc21a74c544f1392623a948c781ff84f49ba46f7046baa16597f34eca92bf9ac381b");
+
+    let expected_signature_json = r#"[{"pub_key":{"type":"/cosmos.crypto.eth.ethsecp256k1.PubKey","value":"Awm7n0IhHwdGeg2x9wUE478/w401m4s4j4u9NlrNgWyW"},"signature":"+Qc1hSzagxHT9lq5he/w13/1tutDjDfbc/ganIQ7SPwhp0xUTxOSYjqUjHgf+E9Jukb3BGuqFll/NOypK/msOBs="}]"#;
+    assert_eq!(output.signature_json, expected_signature_json);
+}
diff --git a/rust/tw_tests/tests/chains/greenfield/mod.rs b/rust/tw_tests/tests/chains/greenfield/mod.rs
new file mode 100644
index 00000000000..9526a2d1147
--- /dev/null
+++ b/rust/tw_tests/tests/chains/greenfield/mod.rs
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_proto::Greenfield::Proto;
+
+mod greenfield_address;
+mod greenfield_compile;
+mod greenfield_sign;
+
+const PRIVATE_KEY_15560: &str = "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0";
+const PUBLIC_KEY_15560: &str = "0279ef34064da10db0463c70480616ba020703ec3a45026def7bebd2082f5d6fc8";
+const PRIVATE_KEY_1686: &str = "6f96f3aa7e8052170f1864f72a9a53606ee9c0d185188266cab895512a4bcf84";
+
+fn make_amount<'a>(denom: &'a str, amount: &'a str) -> Proto::Amount<'a> {
+    Proto::Amount {
+        denom: denom.into(),
+        amount: amount.into(),
+    }
+}
diff --git a/rust/tw_tests/tests/chains/internet_computer/internet_computer_address.rs b/rust/tw_tests/tests/chains/internet_computer/internet_computer_address.rs
new file mode 100644
index 00000000000..789671d8efb
--- /dev/null
+++ b/rust/tw_tests/tests/chains/internet_computer/internet_computer_address.rs
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_thorchain_address_normalization() {
+    test_address_normalization(
+        CoinType::InternetComputer,
+        "290CC7C359F44C8516FC169C5ED4F0F3AE2E24BF5DE0D4C51F5E7545B5474FAA",
+        "290cc7c359f44c8516fc169c5ed4f0f3ae2e24bf5de0d4c51f5e7545b5474faa",
+    );
+}
+
+#[test]
+fn test_thorchain_address_is_valid() {
+    test_address_valid(
+        CoinType::InternetComputer,
+        "fb257577279ecac604d4780214af95aa6adc3a814f6f3d6d7ac844d1deca500a",
+    );
+    test_address_valid(
+        CoinType::InternetComputer,
+        "e90c48d54847f4758f1d6b589a1db2500757a49a6722d4f775e050107b4b752d",
+    );
+    test_address_valid(
+        CoinType::InternetComputer,
+        "a7c5baf393aed527ef6fb3869fbf84dd4e562edf9b04bd8f9bfbd6b8e6a22776",
+    );
+    test_address_valid(
+        CoinType::InternetComputer,
+        "4cb2ca5cfcfa1d952f8cd7f0ec46c96e1023ab057b83a2c7ce236b9e71ccca0b",
+    );
+}
+
+#[test]
+fn test_thorchain_address_invalid() {
+    test_address_invalid(
+        CoinType::InternetComputer,
+        "3357cba483f268d044d4bbd4639f82c16028a76eebdf62c51bc11fc918d278b",
+    );
+    test_address_invalid(
+        CoinType::InternetComputer,
+        "3357cba483f268d044d4bbd4639f82c16028a76eebdf62c51bc11fc918d278bce",
+    );
+    test_address_invalid(
+        CoinType::InternetComputer,
+        "553357cba483f268d044d4bbd4639f82c16028a76eebdf62c51bc11fc918d278",
+    );
+}
+
+#[test]
+fn test_thorchain_address_get_data() {
+    test_address_get_data(
+        CoinType::InternetComputer,
+        "4cb2ca5cfcfa1d952f8cd7f0ec46c96e1023ab057b83a2c7ce236b9e71ccca0b",
+        "4cb2ca5cfcfa1d952f8cd7f0ec46c96e1023ab057b83a2c7ce236b9e71ccca0b",
+    );
+}
diff --git a/rust/tw_tests/tests/chains/internet_computer/mod.rs b/rust/tw_tests/tests/chains/internet_computer/mod.rs
new file mode 100644
index 00000000000..d67ce69c2ee
--- /dev/null
+++ b/rust/tw_tests/tests/chains/internet_computer/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod internet_computer_address;
diff --git a/rust/tw_tests/tests/chains/mod.rs b/rust/tw_tests/tests/chains/mod.rs
new file mode 100644
index 00000000000..d048ec74a00
--- /dev/null
+++ b/rust/tw_tests/tests/chains/mod.rs
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod aptos;
+mod binance;
+mod bitcoin;
+mod bitcoincash;
+mod common;
+mod cosmos;
+mod dydx;
+mod ecash;
+mod ethereum;
+mod greenfield;
+mod internet_computer;
+mod native_evmos;
+mod native_injective;
+mod pactus;
+mod solana;
+mod sui;
+mod tbinance;
+mod thorchain;
+mod ton;
+mod zetachain;
diff --git a/rust/tw_tests/tests/chains/native_evmos/mod.rs b/rust/tw_tests/tests/chains/native_evmos/mod.rs
new file mode 100644
index 00000000000..4f7debf5205
--- /dev/null
+++ b/rust/tw_tests/tests/chains/native_evmos/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod native_evmos_address;
+mod native_evmos_sign;
diff --git a/rust/tw_tests/tests/chains/native_evmos/native_evmos_address.rs b/rust/tw_tests/tests/chains/native_evmos/native_evmos_address.rs
new file mode 100644
index 00000000000..00b620ec8a3
--- /dev/null
+++ b/rust/tw_tests/tests/chains/native_evmos/native_evmos_address.rs
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_bech32_is_valid, test_address_create_bech32_with_public_key,
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+    AddressBech32IsValid, AddressCreateBech32WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_native_evmos_address_normalization() {
+    test_address_normalization(
+        CoinType::NativeEvmos,
+        "evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34",
+        "evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34",
+    );
+}
+
+#[test]
+fn test_native_evmos_address_is_valid() {
+    test_address_valid(
+        CoinType::NativeEvmos,
+        "evmos14py36sx57ud82t9yrks9z6hdsrpn5x6k0r05np",
+    );
+    test_address_valid(
+        CoinType::NativeEvmos,
+        "evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34",
+    );
+}
+
+#[test]
+fn test_native_evmos_address_invalid() {
+    test_address_invalid(
+        CoinType::NativeEvmos,
+        "evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw",
+    );
+    // Cosmos has a different `hrp`.
+    test_address_invalid(
+        CoinType::Cosmos,
+        "evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34",
+    );
+}
+
+#[test]
+fn test_native_evmos_address_get_data() {
+    test_address_get_data(
+        CoinType::NativeEvmos,
+        "evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34",
+        "f1829676db577682e944fc3493d451b67ff3e29f",
+    );
+}
+
+#[test]
+fn test_any_address_is_valid_bech32() {
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Cosmos,
+        address: "evmos14py36sx57ud82t9yrks9z6hdsrpn5x6k0r05np",
+        hrp: "evmos",
+    });
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::NativeEvmos,
+        address: "evmos14py36sx57ud82t9yrks9z6hdsrpn5x6k0r05np",
+        hrp: "evmos",
+    });
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::NativeEvmos,
+        address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02",
+        hrp: "cosmos",
+    });
+}
+
+#[test]
+fn test_any_address_create_bech32_with_public_key() {
+    test_address_create_bech32_with_public_key(AddressCreateBech32WithPublicKey {
+        coin: CoinType::NativeEvmos,
+        private_key: "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed",
+        public_key_type: PublicKeyType::Secp256k1Extended,
+        hrp: "evmos",
+        expected: "evmos14py36sx57ud82t9yrks9z6hdsrpn5x6k0r05np",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/native_evmos/native_evmos_sign.rs b/rust/tw_tests/tests/chains/native_evmos/native_evmos_sign.rs
new file mode 100644
index 00000000000..b8264bffe65
--- /dev/null
+++ b/rust/tw_tests/tests/chains/native_evmos/native_evmos_sign.rs
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_encoding::hex::DecodeHex;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+use tw_proto::{deserialize, serialize};
+
+const NATIVE_EVMOS_COIN_TYPE: u32 = 20009001;
+
+fn account_1037_private_key() -> Cow<'static, [u8]> {
+    "80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn account_2139877_private_key() -> Cow<'static, [u8]> {
+    "79bcbded1a5678ab34e6d9db9ad78e4e480e7b22723cc5fbf59e843732e1a8e5"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+#[test]
+fn test_sign_native_evmos_tx_json() {
+    let send_msg = Proto::mod_Message::Send {
+        from_address: "evmos1hsk6jryyqjfhp5dhc55tc9jtckygx0ep4mur4z".into(),
+        to_address: "evmos1zt50azupanqlfam5afhv3hexwyutnuke45f6ye".into(),
+        amounts: vec![make_amount("muon", "1")],
+        ..Proto::mod_Message::Send::default()
+    };
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::JSON,
+        account_number: 1037,
+        chain_id: "evmos_9001-2".into(),
+        sequence: 8,
+        fee: Some(make_fee(200000, make_amount("muon", "200"))),
+        private_key: account_1037_private_key(),
+        messages: vec![make_message(MessageEnum::send_coins_message(send_msg))],
+        ..Proto::SigningInput::default()
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output =
+        TWDataHelper::wrap(unsafe { tw_any_signer_sign(input_data.ptr(), NATIVE_EVMOS_COIN_TYPE) })
+            .to_vec()
+            .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    assert_eq!(
+        output.json,
+        r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"evmos1hsk6jryyqjfhp5dhc55tc9jtckygx0ep4mur4z","to_address":"evmos1zt50azupanqlfam5afhv3hexwyutnuke45f6ye"}}],"signatures":[{"pub_key":{"type":"ethermint/PubKeyEthSecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"1hMFtRqKjB8tiuyHYVYZundPdomebIIvHLC1gj9uXtFc+iO3UAHBysBjFB4brd9AD5yriS3uUDTAqqfg6fNGNg=="}]}}"#
+    );
+    assert_eq!(
+        output.signature_json,
+        r#"[{"pub_key":{"type":"ethermint/PubKeyEthSecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"1hMFtRqKjB8tiuyHYVYZundPdomebIIvHLC1gj9uXtFc+iO3UAHBysBjFB4brd9AD5yriS3uUDTAqqfg6fNGNg=="}]"#
+    );
+}
+
+/// CompoundingAuthz
+#[test]
+fn test_sign_native_evmos_tx_protobuf() {
+    use Proto::mod_Message::mod_AuthGrant::OneOfgrant_type as ProtoGrantType;
+    use Proto::mod_Message::mod_StakeAuthorization::OneOfvalidators as ProtoValidatorsType;
+
+    let allow_list = Proto::mod_Message::mod_StakeAuthorization::Validators {
+        address: vec!["evmosvaloper1umk407eed7af6anvut6llg2zevnf0dn0feqqny".into()],
+    };
+    let stake_authorization = Proto::mod_Message::StakeAuthorization {
+        authorization_type: Proto::mod_Message::AuthorizationType::DELEGATE,
+        validators: ProtoValidatorsType::allow_list(allow_list),
+        ..Proto::mod_Message::StakeAuthorization::default()
+    };
+    let auth_grant = Proto::mod_Message::AuthGrant {
+        granter: "evmos12m9grgas60yk0kult076vxnsrqz8xpjy9rpf3e".into(),
+        grantee: "evmos18fzq4nac28gfma6gqfvkpwrgpm5ctar2z9mxf3".into(),
+        grant_type: ProtoGrantType::grant_stake(stake_authorization),
+        expiration: 1692309600,
+    };
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Protobuf,
+        account_number: 2139877,
+        chain_id: "evmos_9001-2".into(),
+        sequence: 3,
+        fee: Some(make_fee(180859, make_amount("aevmos", "4521475000000000"))),
+        private_key: account_2139877_private_key(),
+        messages: vec![make_message(MessageEnum::auth_grant(auth_grant))],
+        ..Proto::SigningInput::default()
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output =
+        TWDataHelper::wrap(unsafe { tw_any_signer_sign(input_data.ptr(), NATIVE_EVMOS_COIN_TYPE) })
+            .to_vec()
+            .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    // Original test: https://github.com/trustwallet/wallet-core/blob/a60033f797e33628e557af7c66be539c8d78bc61/tests/chains/Evmos/SignerTests.cpp#L91-L124
+    // Please note the signature has been updated according to the serialization of the `StakeAuthorization` message.
+    // Previous: CvUBCvIBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQSzwEKLGV2bW9zMTJtOWdyZ2FzNjB5azBrdWx0MDc2dnhuc3Jxejh4cGp5OXJwZjNlEixldm1vczE4ZnpxNG5hYzI4Z2ZtYTZncWZ2a3B3cmdwbTVjdGFyMno5bXhmMxpxCmcKKi9jb3Ntb3Muc3Rha2luZy52MWJldGExLlN0YWtlQXV0aG9yaXphdGlvbhI5EjUKM2V2bW9zdmFsb3BlcjF1bWs0MDdlZWQ3YWY2YW52dXQ2bGxnMnpldm5mMGRuMGZlcXFueSABEgYI4LD6pgYSfQpZCk8KKC9ldGhlcm1pbnQuY3J5cHRvLnYxLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohA4B2WHbj6sH/GWE7z/YW5PRnXYFGaGRAov7gZZI2Fv2nEgQKAggBGAMSIAoaCgZhZXZtb3MSEDQ1MjE0NzUwMDAwMDAwMDAQ+4QLGkAm17CZgB7m+CPVlITnrHosklMTL9zrUeGRs8FL8N0GcRami9zdJ+e3xuXOtJmwP7G6QNh85CRYjFj8a8lpmmJM
+    assert_eq!(
+        output.serialized,
+        r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CvUBCvIBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQSzwEKLGV2bW9zMTJtOWdyZ2FzNjB5azBrdWx0MDc2dnhuc3Jxejh4cGp5OXJwZjNlEixldm1vczE4ZnpxNG5hYzI4Z2ZtYTZncWZ2a3B3cmdwbTVjdGFyMno5bXhmMxpxCmcKKi9jb3Ntb3Muc3Rha2luZy52MWJldGExLlN0YWtlQXV0aG9yaXphdGlvbhI5IAESNQozZXZtb3N2YWxvcGVyMXVtazQwN2VlZDdhZjZhbnZ1dDZsbGcyemV2bmYwZG4wZmVxcW55EgYI4LD6pgYSfQpZCk8KKC9ldGhlcm1pbnQuY3J5cHRvLnYxLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohA4B2WHbj6sH/GWE7z/YW5PRnXYFGaGRAov7gZZI2Fv2nEgQKAggBGAMSIAoaCgZhZXZtb3MSEDQ1MjE0NzUwMDAwMDAwMDAQ+4QLGkBXaTo3nk5EMFW9Euheez5ADx2bWo7XisNJ5vuGj1fKXh6CGNJGfJj/q1XUkBzaCvPNg+EcFHgtJdVSyF4cJZTg"}"#
+    );
+}
diff --git a/rust/tw_tests/tests/chains/native_injective/mod.rs b/rust/tw_tests/tests/chains/native_injective/mod.rs
new file mode 100644
index 00000000000..54f1133ee80
--- /dev/null
+++ b/rust/tw_tests/tests/chains/native_injective/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod native_injective_address;
+mod native_injective_compile;
+mod native_injective_sign;
diff --git a/rust/tw_tests/tests/chains/native_injective/native_injective_address.rs b/rust/tw_tests/tests/chains/native_injective/native_injective_address.rs
new file mode 100644
index 00000000000..08f61e94587
--- /dev/null
+++ b/rust/tw_tests/tests/chains/native_injective/native_injective_address.rs
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_bech32_is_valid, test_address_create_bech32_with_public_key,
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+    AddressBech32IsValid, AddressCreateBech32WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_native_injective_address_normalization() {
+    test_address_normalization(
+        CoinType::NativeInjective,
+        "inj14py36sx57ud82t9yrks9z6hdsrpn5x6k8tf7m3",
+        "inj14py36sx57ud82t9yrks9z6hdsrpn5x6k8tf7m3",
+    );
+}
+
+#[test]
+fn test_native_injective_address_is_valid() {
+    test_address_valid(
+        CoinType::NativeInjective,
+        "inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a",
+    );
+    test_address_valid(
+        CoinType::NativeInjective,
+        "inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd",
+    );
+}
+
+#[test]
+fn test_native_injective_address_invalid() {
+    test_address_invalid(
+        CoinType::NativeInjective,
+        "ini13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a",
+    );
+}
+
+#[test]
+fn test_native_injective_address_get_data() {
+    test_address_get_data(
+        CoinType::NativeInjective,
+        "inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd",
+        "36c36d9875ec1efced515e14246f8422903ade2e",
+    );
+}
+
+#[test]
+fn test_any_address_is_valid_bech32() {
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Cosmos,
+        address: "evmos14py36sx57ud82t9yrks9z6hdsrpn5x6k0r05np",
+        hrp: "evmos",
+    });
+}
+
+#[test]
+fn test_any_address_create_bech32_with_public_key() {
+    test_address_create_bech32_with_public_key(AddressCreateBech32WithPublicKey {
+        coin: CoinType::NativeInjective,
+        private_key: "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed",
+        public_key_type: PublicKeyType::Secp256k1Extended,
+        hrp: "inj",
+        expected: "inj14py36sx57ud82t9yrks9z6hdsrpn5x6k8tf7m3",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/native_injective/native_injective_compile.rs b/rust/tw_tests/tests/chains/native_injective/native_injective_compile.rs
new file mode 100644
index 00000000000..5bfa7c71d51
--- /dev/null
+++ b/rust/tw_tests/tests/chains/native_injective/native_injective_compile.rs
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::ffi::tw_transaction_compiler::{
+    tw_transaction_compiler_compile, tw_transaction_compiler_pre_image_hashes,
+};
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_data_vector_helper::TWDataVectorHelper;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use tw_proto::{deserialize, serialize};
+
+const NATIVE_INJECTIVE_COIN_TYPE: u32 = 10000060;
+const ACCOUNT_88701_PUBLIC_KEY: &str = "04088ac2919987d927368cb2be2ade44cd0ed3616745a9699cae264b3fc5a7c3607d99f441b8340990ee990cb3eaf560f1f0bafe600c7e94a4be8392166984f728";
+
+fn send_tx_input() -> Proto::SigningInput<'static> {
+    let send_msg = Proto::mod_Message::Send {
+        from_address: "inj1d0jkrsd09c7pule43y3ylrul43lwwcqaky8w8c".into(),
+        to_address: "inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd".into(),
+        amounts: vec![make_amount("inj", "10000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+    Proto::SigningInput {
+        account_number: 88701,
+        chain_id: "injective-1".into(),
+        sequence: 0,
+        fee: Some(make_fee(110000, make_amount("inj", "100000000000000"))),
+        public_key: ACCOUNT_88701_PUBLIC_KEY.decode_hex().unwrap().into(),
+        messages: vec![make_message(MessageEnum::send_coins_message(send_msg))],
+        ..Proto::SigningInput::default()
+    }
+}
+
+#[test]
+fn test_compile_native_injective_tx_protobuf() {
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Protobuf,
+        ..send_tx_input()
+    };
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    // Step 1: Obtain preimage hash
+
+    let preimage_output_data = TWDataHelper::wrap(unsafe {
+        tw_transaction_compiler_pre_image_hashes(NATIVE_INJECTIVE_COIN_TYPE, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_any_signer_sign returned nullptr");
+
+    let preimage_output: CompilerProto::PreSigningOutput =
+        deserialize(&preimage_output_data).unwrap();
+    assert_eq!(preimage_output.error, SigningErrorType::OK);
+    assert!(preimage_output.error_message.is_empty());
+
+    let expected_preimage = "0a8f010a8c010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126c0a2a696e6a3164306a6b7273643039633770756c6534337933796c72756c34336c77776371616b7938773863122a696e6a31786d706b6d78723461733030656d32337463327a676d7579793267723468337767636c3676641a120a03696e6a120b3130303030303030303030129c010a7c0a740a2d2f696e6a6563746976652e63727970746f2e763162657461312e657468736563703235366b312e5075624b657912430a4104088ac2919987d927368cb2be2ade44cd0ed3616745a9699cae264b3fc5a7c3607d99f441b8340990ee990cb3eaf560f1f0bafe600c7e94a4be8392166984f72812040a020801121c0a160a03696e6a120f31303030303030303030303030303010b0db061a0b696e6a6563746976652d3120fdb405";
+    assert_eq!(preimage_output.data.to_hex(), expected_preimage);
+    let expected_prehash = "57dc10c3d1893ff16e1f5a47fa4b2e96f37b9c57d98a42d88c971debb4947ec9";
+    assert_eq!(preimage_output.data_hash.to_hex(), expected_prehash);
+
+    // Step 2: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server
+    let signature = "f7a9ec0a521170bb5566ca973d3c73a1b69b162d99ce022059189991ec440637333394ff1c9e75fad84eb114393969f20989b036f1dfed28949e906dc0077421".decode_hex().unwrap();
+    let public_key = ACCOUNT_88701_PUBLIC_KEY.decode_hex().unwrap();
+
+    let signatures = TWDataVectorHelper::create([signature.clone()]);
+    let public_keys = TWDataVectorHelper::create([public_key]);
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_transaction_compiler_compile(
+            NATIVE_INJECTIVE_COIN_TYPE,
+            input_data.ptr(),
+            signatures.ptr(),
+            public_keys.ptr(),
+        )
+    })
+    .to_vec()
+    .expect("!tw_transaction_compiler_compile returned nullptr");
+
+    let output: Proto::SigningOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+    let expected_encoded = r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"Co8BCowBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmwKKmluajFkMGprcnNkMDljN3B1bGU0M3kzeWxydWw0M2x3d2NxYWt5OHc4YxIqaW5qMXhtcGtteHI0YXMwMGVtMjN0YzJ6Z211eXkyZ3I0aDN3Z2NsNnZkGhIKA2luahILMTAwMDAwMDAwMDASnAEKfAp0Ci0vaW5qZWN0aXZlLmNyeXB0by52MWJldGExLmV0aHNlY3AyNTZrMS5QdWJLZXkSQwpBBAiKwpGZh9knNoyyvireRM0O02FnRalpnK4mSz/Fp8NgfZn0Qbg0CZDumQyz6vVg8fC6/mAMfpSkvoOSFmmE9ygSBAoCCAESHAoWCgNpbmoSDzEwMDAwMDAwMDAwMDAwMBCw2wYaQPep7ApSEXC7VWbKlz08c6G2mxYtmc4CIFkYmZHsRAY3MzOU/xyedfrYTrEUOTlp8gmJsDbx3+0olJ6QbcAHdCE="}"#;
+    assert_eq!(output.serialized, expected_encoded);
+    assert_eq!(output.signature.to_hex(), signature.to_hex());
+}
diff --git a/rust/tw_tests/tests/chains/native_injective/native_injective_sign.rs b/rust/tw_tests/tests/chains/native_injective/native_injective_sign.rs
new file mode 100644
index 00000000000..8240be5a756
--- /dev/null
+++ b/rust/tw_tests/tests/chains/native_injective/native_injective_sign.rs
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_coin_entry::error::prelude::*;
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+use tw_proto::{deserialize, serialize};
+
+const NATIVE_INJECTIVE_COIN_TYPE: u32 = 10000060;
+
+fn account_17396_private_key() -> Cow<'static, [u8]> {
+    "9ee18daf8e463877aaf497282abc216852420101430482a28e246c179e2c5ef1"
+        .decode_hex()
+        .unwrap()
+        .into()
+}
+
+fn send_tx_input() -> Proto::SigningInput<'static> {
+    let send_msg = Proto::mod_Message::Send {
+        from_address: "inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a".into(),
+        to_address: "inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd".into(),
+        amounts: vec![make_amount("inj", "10000000000")],
+        ..Proto::mod_Message::Send::default()
+    };
+    Proto::SigningInput {
+        account_number: 17396,
+        chain_id: "injective-1".into(),
+        sequence: 1,
+        fee: Some(make_fee(110000, make_amount("inj", "100000000000000"))),
+        private_key: account_17396_private_key(),
+        messages: vec![make_message(MessageEnum::send_coins_message(send_msg))],
+        ..Proto::SigningInput::default()
+    }
+}
+
+#[test]
+fn test_sign_native_injective_tx_protobuf() {
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Protobuf,
+        ..send_tx_input()
+    };
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output = TWDataHelper::wrap(unsafe {
+        tw_any_signer_sign(input_data.ptr(), NATIVE_INJECTIVE_COIN_TYPE)
+    })
+    .to_vec()
+    .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    // https://www.mintscan.io/injective/txs/135DD2C4A1910E4334A9C0F15125DA992E724EBF23FEB9638FCB71218BB064A5
+    assert_eq!(
+        output.serialized,
+        r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"Co8BCowBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmwKKmluajEzdTZnN3ZxZ3cwNzRtZ21mMnplMmNhZHp2a3o5c25sd2NydHE4YRIqaW5qMXhtcGtteHI0YXMwMGVtMjN0YzJ6Z211eXkyZ3I0aDN3Z2NsNnZkGhIKA2luahILMTAwMDAwMDAwMDASngEKfgp0Ci0vaW5qZWN0aXZlLmNyeXB0by52MWJldGExLmV0aHNlY3AyNTZrMS5QdWJLZXkSQwpBBFoMa4O4vZgn5QcnDK20mbfjqQlSRvaiITKB94PYd8mLJWdCdBsGOfMXdo/k9MJ2JmDCESKDp2hdgVUH3uMikXMSBAoCCAEYARIcChYKA2luahIPMTAwMDAwMDAwMDAwMDAwELDbBhpAx2vkplmzeK7n3puCFGPWhLd0l/ZC/CYkGl+stH+3S3hiCvIe7uwwMpUlNaSwvT8HwF1kNUp+Sx2m0Uo1x5xcFw=="}"#
+    );
+    assert_eq!(output.signature.to_hex(), "c76be4a659b378aee7de9b821463d684b77497f642fc26241a5facb47fb74b78620af21eeeec3032952535a4b0bd3f07c05d64354a7e4b1da6d14a35c79c5c17");
+}
+
+#[test]
+fn test_sign_native_injective_tx_json() {
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::JSON,
+        ..send_tx_input()
+    };
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output = TWDataHelper::wrap(unsafe {
+        tw_any_signer_sign(input_data.ptr(), NATIVE_INJECTIVE_COIN_TYPE)
+    })
+    .to_vec()
+    .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    // This transaction hasn't been broadcasted.
+    assert_eq!(
+        output.json,
+        r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"100000000000000","denom":"inj"}],"gas":"110000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"10000000000","denom":"inj"}],"from_address":"inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a","to_address":"inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd"}}],"signatures":[{"pub_key":{"type":"injective/PubKeyEthSecp256k1","value":"BFoMa4O4vZgn5QcnDK20mbfjqQlSRvaiITKB94PYd8mLJWdCdBsGOfMXdo/k9MJ2JmDCESKDp2hdgVUH3uMikXM="},"signature":"7wwedceebL95DwbClz5AzEp2Z74itHC7raiV976DcacfjrJ58oDfjbAO5UOZQAlihiYBP7PpyISFQ72FPRhdZA=="}]}}"#
+    );
+    assert_eq!(
+        output.signature_json,
+        r#"[{"pub_key":{"type":"injective/PubKeyEthSecp256k1","value":"BFoMa4O4vZgn5QcnDK20mbfjqQlSRvaiITKB94PYd8mLJWdCdBsGOfMXdo/k9MJ2JmDCESKDp2hdgVUH3uMikXM="},"signature":"7wwedceebL95DwbClz5AzEp2Z74itHC7raiV976DcacfjrJ58oDfjbAO5UOZQAlihiYBP7PpyISFQ72FPRhdZA=="}]"#
+    );
+}
diff --git a/rust/tw_tests/tests/chains/pactus/mod.rs b/rust/tw_tests/tests/chains/pactus/mod.rs
new file mode 100644
index 00000000000..88e8edb4017
--- /dev/null
+++ b/rust/tw_tests/tests/chains/pactus/mod.rs
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod pactus_address;
+mod pactus_compile;
+mod pactus_sign;
+mod pactus_transaction_util;
+mod test_cases;
diff --git a/rust/tw_tests/tests/chains/pactus/pactus_address.rs b/rust/tw_tests/tests/chains/pactus/pactus_address.rs
new file mode 100644
index 00000000000..9d64d1590a7
--- /dev/null
+++ b/rust/tw_tests/tests/chains/pactus/pactus_address.rs
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_derive, test_address_get_data, test_address_invalid, test_address_normalization,
+    test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_pactus_address_derive() {
+    test_address_derive(
+        CoinType::Pactus,
+        "2134ae97465505dfd5a1fd05a8a0f146209c601eb3f1b0363b4cfe4b47ba1ab4",
+        "pc1r7jkvfnegf0rf5ua05fzu9krjhjxcrrygl3v4nl",
+    );
+}
+
+#[test]
+fn test_pactus_address_normalization() {
+    test_address_normalization(
+        CoinType::Pactus,
+        "pc1r7jkvfnegf0rf5ua05fzu9krjhjxcrrygl3v4nl",
+        "pc1r7jkvfnegf0rf5ua05fzu9krjhjxcrrygl3v4nl",
+    );
+}
+
+#[test]
+fn test_pactus_address_is_valid() {
+    test_address_valid(
+        CoinType::Pactus,
+        "000000000000000000000000000000000000000000",
+    );
+    test_address_valid(
+        CoinType::Pactus,
+        "pc1p0hrct7eflrpw4ccrttxzs4qud2axex4dcdzdfr",
+    );
+    test_address_valid(
+        CoinType::Pactus,
+        "pc1zzqkzzu4vyddss052as6c37qrdcfptegquw826x",
+    );
+    test_address_valid(
+        CoinType::Pactus,
+        "pc1r7jkvfnegf0rf5ua05fzu9krjhjxcrrygl3v4nl",
+    );
+}
+
+#[test]
+fn test_pactus_address_invalid() {
+    test_address_invalid(CoinType::Pactus, "");
+    test_address_invalid(CoinType::Pactus, "00");
+    test_address_invalid(CoinType::Pactus, "not_proper_encoded");
+    test_address_invalid(CoinType::Pactus, "pc1ioiooi");
+    test_address_invalid(CoinType::Pactus, "pc19p72rf");
+    test_address_invalid(
+        CoinType::Pactus,
+        "qc1z0hrct7eflrpw4ccrttxzs4qud2axex4dh8zz75",
+    );
+    test_address_invalid(
+        CoinType::Pactus,
+        "pc1p0hrct7eflrpw4ccrttxzs4qud2axex4dg8xaf5",
+    ); // invalid checksum
+    test_address_invalid(
+        CoinType::Pactus,
+        "pc1p0hrct7eflrpw4ccrttxzs4qud2axexs2dhdk8",
+    ); // invalid length
+    test_address_invalid(
+        CoinType::Pactus,
+        "pc1y0hrct7eflrpw4ccrttxzs4qud2axex4dksmred",
+    ); // invalid type
+}
+
+#[test]
+fn test_pactus_address_get_data() {
+    test_address_get_data(
+        CoinType::Pactus,
+        "000000000000000000000000000000000000000000",
+        "000000000000000000000000000000000000000000",
+    );
+    test_address_get_data(
+        CoinType::Pactus,
+        "pc1p0hrct7eflrpw4ccrttxzs4qud2axex4dcdzdfr",
+        "017dc785fb29f8c2eae3035acc28541c6aba6c9aad",
+    );
+    test_address_get_data(
+        CoinType::Pactus,
+        "pc1zzqkzzu4vyddss052as6c37qrdcfptegquw826x",
+        "02102c2172ac235b083e8aec3588f8036e1215e500",
+    );
+    test_address_get_data(
+        CoinType::Pactus,
+        "pc1r7jkvfnegf0rf5ua05fzu9krjhjxcrrygl3v4nl",
+        "03f4acc4cf284bc69a73afa245c2d872bc8d818c88",
+    );
+}
diff --git a/rust/tw_tests/tests/chains/pactus/pactus_compile.rs b/rust/tw_tests/tests/chains/pactus/pactus_compile.rs
new file mode 100644
index 00000000000..27a0c274c76
--- /dev/null
+++ b/rust/tw_tests/tests/chains/pactus/pactus_compile.rs
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::pactus::test_cases::PRIVATE_KEY;
+use crate::chains::pactus::test_cases::TEST_CASES;
+use tw_any_coin::ffi::tw_transaction_compiler::{
+    tw_transaction_compiler_compile, tw_transaction_compiler_pre_image_hashes,
+};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::ToHex;
+use tw_keypair::ed25519;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_data_vector_helper::TWDataVectorHelper;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Pactus::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_pactus_transaction_compile() {
+    for case in TEST_CASES.iter() {
+        // Step 1: Create signing input.
+        let input = (case.sign_input_fn)();
+
+        // Step 2: Obtain preimage hash
+        let input_data = TWDataHelper::create(serialize(&input).unwrap());
+        let preimage_data = TWDataHelper::wrap(unsafe {
+            tw_transaction_compiler_pre_image_hashes(CoinType::Pactus as u32, input_data.ptr())
+        })
+        .to_vec()
+        .expect("!tw_transaction_compiler_pre_image_hashes returned nullptr");
+
+        let preimage: CompilerProto::PreSigningOutput =
+            deserialize(&preimage_data).expect("Coin entry returned an invalid output");
+
+        assert_eq!(preimage.error, SigningErrorType::OK);
+        assert!(preimage.error_message.is_empty());
+        assert_eq!(preimage.data.to_hex(), case.data_to_sign);
+
+        // Step 3: Sign the data "externally"
+        let private_key = ed25519::sha512::KeyPair::try_from(PRIVATE_KEY).unwrap();
+        let public_key = private_key.public().to_vec();
+
+        let signature = private_key
+            .sign(preimage.data.to_vec())
+            .expect("Error signing data")
+            .to_vec();
+        assert_eq!(signature.to_hex(), case.signature);
+
+        // Step 4: Compile transaction info
+        let signatures = TWDataVectorHelper::create([signature]);
+        let public_keys = TWDataVectorHelper::create([public_key]);
+
+        let input_data = TWDataHelper::create(serialize(&input).unwrap());
+        let output_data = TWDataHelper::wrap(unsafe {
+            tw_transaction_compiler_compile(
+                CoinType::Pactus as u32,
+                input_data.ptr(),
+                signatures.ptr(),
+                public_keys.ptr(),
+            )
+        })
+        .to_vec()
+        .expect("!tw_transaction_compiler_compile returned nullptr");
+
+        let output: Proto::SigningOutput =
+            deserialize(&output_data).expect("Coin entry returned an invalid output");
+
+        assert_eq!(output.error, SigningErrorType::OK);
+        assert!(output.error_message.is_empty());
+        assert_eq!(output.transaction_id.to_hex(), case.transaction_id);
+        assert_eq!(output.signature.to_hex(), case.signature);
+        assert_eq!(output.signed_transaction_data.to_hex(), case.signed_data);
+    }
+}
diff --git a/rust/tw_tests/tests/chains/pactus/pactus_sign.rs b/rust/tw_tests/tests/chains/pactus/pactus_sign.rs
new file mode 100644
index 00000000000..f6547b1918d
--- /dev/null
+++ b/rust/tw_tests/tests/chains/pactus/pactus_sign.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::pactus::test_cases::PRIVATE_KEY;
+use crate::chains::pactus::test_cases::TEST_CASES;
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_proto::Pactus::Proto;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_pactus_sign_transactions() {
+    for case in TEST_CASES.iter() {
+        let input = Proto::SigningInput {
+            private_key: PRIVATE_KEY.decode_hex().unwrap().into(),
+            ..(case.sign_input_fn)()
+        };
+
+        let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+        let output = TWDataHelper::wrap(unsafe {
+            tw_any_signer_sign(input_data.ptr(), CoinType::Pactus as u32)
+        })
+        .to_vec()
+        .expect("!tw_any_signer_sign returned nullptr");
+
+        let output: Proto::SigningOutput = deserialize(&output).unwrap();
+
+        assert_eq!(output.error, SigningErrorType::OK);
+        assert!(output.error_message.is_empty());
+        assert_eq!(output.transaction_id.to_hex(), case.transaction_id);
+        assert_eq!(output.signature.to_hex(), case.signature);
+        assert_eq!(output.signed_transaction_data.to_hex(), case.signed_data);
+    }
+}
diff --git a/rust/tw_tests/tests/chains/pactus/pactus_transaction_util.rs b/rust/tw_tests/tests/chains/pactus/pactus_transaction_util.rs
new file mode 100644
index 00000000000..989448e3210
--- /dev/null
+++ b/rust/tw_tests/tests/chains/pactus/pactus_transaction_util.rs
@@ -0,0 +1,14 @@
+use super::test_cases::TEST_CASES;
+use tw_any_coin::test_utils::transaction_calc_tx_hash_utils::TransactionUtilHelper;
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_pactus_transaction_util_calc_tx_hash() {
+    for case in TEST_CASES {
+        let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::Pactus, case.signed_data);
+        assert_eq!(tx_hash, case.transaction_id);
+
+        let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::Pactus, case.signed_data);
+        assert_eq!(tx_hash, case.transaction_id);
+    }
+}
diff --git a/rust/tw_tests/tests/chains/pactus/test_cases.rs b/rust/tw_tests/tests/chains/pactus/test_cases.rs
new file mode 100644
index 00000000000..0a79e33bb2f
--- /dev/null
+++ b/rust/tw_tests/tests/chains/pactus/test_cases.rs
@@ -0,0 +1,206 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_proto::Pactus::Proto;
+
+/// A macro to define test data.
+/// Transaction format explained here: https://docs.pactus.org/protocol/transaction/format/
+macro_rules! define_test_data {
+    (  $tx_id:expr,
+       $signature:expr,
+       $public_key:expr
+       $(, $param:expr)*,
+    ) => {
+        pub const DATA_TO_SIGN: &str = concat!(
+            $( $param, )*
+        );
+
+        pub const SIGNED_DATA: &str = concat!(
+            "00", // Signed Flag
+            $($param, )*
+            $signature,
+            $public_key
+        );
+
+        pub const TX_ID: &str = $tx_id;
+        pub const SIGNATURE: &str  = $signature;
+    };
+}
+
+// Private key for all the test cases
+pub const PRIVATE_KEY: &str = "4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6";
+
+// Successfully broadcasted transaction:
+// https://pacviewer.com/transaction/1b6b7226f7935a15f05371d1a1fefead585a89704ce464b7cc1d453d299d235f
+pub mod transfer_test_case {
+    use super::*;
+    use tw_encoding::hex::DecodeHex;
+
+    define_test_data!(
+        "1b6b7226f7935a15f05371d1a1fefead585a89704ce464b7cc1d453d299d235f", // transaction ID
+        "4ed8fee3d8992e82660dd05bbe8608fc56ceabffdeeee61e3213b9b49d33a0fc\
+         8dea6d79ee7ec60f66433f189ed9b3c50b2ad6fa004e26790ee736693eda8506", // Signature
+        "95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa", // PublicKey
+        "01",                                                               // Version
+        "24a32300",                                                         // LockTime
+        "80ade204",                                                         // Fee
+        "0b77616c6c65742d636f7265",                                         // Memo
+        "01",                                                               // PayloadType
+        "037098338e0b6808119dfd4457ab806b9c2059b89b",                       // Sender
+        "037a14ae24533816e7faaa6ed28fcdde8e55a7df21",                       // Receiver
+        "8084af5f",                                                         // Amount
+    );
+
+    pub fn sign_input() -> Proto::SigningInput<'static> {
+        let transfer_payload = Proto::TransferPayload {
+            sender: "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr".into(),
+            receiver: "pc1r0g22ufzn8qtw0742dmfglnw73e260hep0k3yra".into(),
+            amount: 200000000,
+        };
+
+        let transaction = Proto::TransactionMessage {
+            lock_time: 2335524,
+            fee: 10000000,
+            memo: "wallet-core".into(),
+            payload: Proto::mod_TransactionMessage::OneOfpayload::transfer(transfer_payload),
+        };
+
+        let private_key_bytes = PRIVATE_KEY.decode_hex().unwrap();
+
+        Proto::SigningInput {
+            transaction: Some(transaction),
+            private_key: private_key_bytes.into(),
+        }
+    }
+}
+
+// Successfully broadcasted transaction:
+// https://pacviewer.com/transaction/d194b445642a04ec78ced4448696e50b733f2f0b517a23871882c0eefaf1c28f
+pub mod bond_with_public_key_test_case {
+    use super::*;
+    use tw_encoding::hex::DecodeHex;
+
+    define_test_data!(
+        "d194b445642a04ec78ced4448696e50b733f2f0b517a23871882c0eefaf1c28f", // transaction ID
+        "0d7bc6d94927534b89e2f53bcfc9fc849e0e2982438955eda55b4338328adac7\
+         9d4ee3216d143f0e1629764ab650734f8ba188e716d71f9eff65e39ce7006300", // Signature
+        "95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa", // PublicKey
+        "01",                                                               // Version
+        "c1b02300",                                                         // LockTime
+        "80ade204",                                                         // Fee
+        "0b77616c6c65742d636f7265",                                         // Memo
+        "02",                                                               // PayloadType
+        "037098338e0b6808119dfd4457ab806b9c2059b89b",                       // Sender
+        "0129288df0bf7bd4b5e9eeed8b932d0c76f451823d",                       // Receiver
+        "60\
+         98bd4dc20b03460a651c661dd9f10f17797049cac62a9fef228832bbcc3a3935\
+         5cdf15b68bddf432f1ab3eab8debe1300aa43724834650866a9d552827a56bbc\
+         dde32e3c517079589b54e83d16f9435abb3b2de8c3e677067cc0644ccb13833b", // Validator Public key
+        "8094ebdc03",                                                       // Stake
+    );
+
+    pub fn sign_input() -> Proto::SigningInput<'static> {
+        let bond_payload = Proto::BondPayload {
+            sender: "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr".into(),
+            receiver: "pc1p9y5gmu9l002tt60wak9extgvwm69rq3a9ackrl".into(),
+            stake: 1000000000,
+            public_key: "public1pnz75msstqdrq5eguvcwanug0zauhqjw2cc4flmez3qethnp68y64ehc4k69amapj7x4na2uda0snqz4yxujgx3jsse4f64fgy7jkh0xauvhrc5ts09vfk48g85t0js66hvajm6xruemsvlxqv3xvkyur8v9v0mtn".into()
+        };
+
+        let transaction = Proto::TransactionMessage {
+            lock_time: 2339009,
+            fee: 10000000,
+            memo: "wallet-core".into(),
+            payload: Proto::mod_TransactionMessage::OneOfpayload::bond(bond_payload),
+        };
+
+        let private_key_bytes = PRIVATE_KEY.decode_hex().unwrap();
+
+        Proto::SigningInput {
+            transaction: Some(transaction),
+            private_key: private_key_bytes.into(),
+        }
+    }
+}
+
+// Successfully broadcasted transaction:
+// https://pacviewer.com/transaction/f83f583a5c40adf93a90ea536a7e4b467d30ca4f308d5da52624d80c42adec80
+//
+// If the validator exists and has already been staked, there’s no need to send the public key.
+// If the validator does not exist, the public key is required, as it is not indexed on the chain.
+pub mod bond_without_public_key_test_case {
+    use super::*;
+    use tw_encoding::hex::DecodeHex;
+
+    define_test_data!(
+        "f83f583a5c40adf93a90ea536a7e4b467d30ca4f308d5da52624d80c42adec80", // transaction ID
+        "9e6279fb64067c7d7316ac74630bbb8589df268aa4548f1c7d85c087a8748ff0\
+         715b9149afbd94c5d8ee6b37c787ec63e963cbb38be513ebc436aa58f9a8f00d", // Signature
+        "95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa", // PublicKey
+        "01",                                                               // Version
+        "5ca32300",                                                         // LockTime
+        "80ade204",                                                         // Fee
+        "0b77616c6c65742d636f7265",                                         // Memo
+        "02",                                                               // PayloadType
+        "037098338e0b6808119dfd4457ab806b9c2059b89b",                       // Sender
+        "01d2fa2a7d560502199995ea260954f064d90278be",                       // Receiver
+        "00",                                                               // Public key zero
+        "8094ebdc03",                                                       // Stake
+    );
+
+    pub fn sign_input() -> Proto::SigningInput<'static> {
+        let bond_payload = Proto::BondPayload {
+            sender: "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr".into(),
+            receiver: "pc1p6taz5l2kq5ppnxv4agnqj48svnvsy797xpe6wd".into(),
+            stake: 1000000000,
+            public_key: Default::default(),
+        };
+
+        let transaction = Proto::TransactionMessage {
+            lock_time: 2335580,
+            fee: 10000000,
+            memo: "wallet-core".into(),
+            payload: Proto::mod_TransactionMessage::OneOfpayload::bond(bond_payload),
+        };
+
+        let private_key_bytes = PRIVATE_KEY.decode_hex().unwrap();
+
+        Proto::SigningInput {
+            transaction: Some(transaction),
+            private_key: private_key_bytes.into(),
+        }
+    }
+}
+
+pub(crate) struct TestCase {
+    pub sign_input_fn: fn() -> Proto::SigningInput<'static>,
+    pub transaction_id: &'static str,
+    pub signature: &'static str,
+    pub data_to_sign: &'static str,
+    pub signed_data: &'static str,
+}
+
+pub(crate) const TEST_CASES: &[TestCase; 3] = &[
+    TestCase {
+        sign_input_fn: transfer_test_case::sign_input,
+        transaction_id: transfer_test_case::TX_ID,
+        signature: transfer_test_case::SIGNATURE,
+        data_to_sign: transfer_test_case::DATA_TO_SIGN,
+        signed_data: transfer_test_case::SIGNED_DATA,
+    },
+    TestCase {
+        sign_input_fn: bond_with_public_key_test_case::sign_input,
+        transaction_id: bond_with_public_key_test_case::TX_ID,
+        signature: bond_with_public_key_test_case::SIGNATURE,
+        data_to_sign: bond_with_public_key_test_case::DATA_TO_SIGN,
+        signed_data: bond_with_public_key_test_case::SIGNED_DATA,
+    },
+    TestCase {
+        sign_input_fn: bond_without_public_key_test_case::sign_input,
+        transaction_id: bond_without_public_key_test_case::TX_ID,
+        signature: bond_without_public_key_test_case::SIGNATURE,
+        data_to_sign: bond_without_public_key_test_case::DATA_TO_SIGN,
+        signed_data: bond_without_public_key_test_case::SIGNED_DATA,
+    },
+];
diff --git a/rust/tw_tests/tests/chains/solana/mod.rs b/rust/tw_tests/tests/chains/solana/mod.rs
new file mode 100644
index 00000000000..01af3fc52b9
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/mod.rs
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod solana_address;
+mod solana_address_ffi;
+mod solana_compile;
+mod solana_sign;
+mod solana_transaction;
+mod solana_transaction_ffi;
+mod solana_transaction_util;
+mod solana_wallet_connect;
diff --git a/rust/tw_tests/tests/chains/solana/solana_address.rs b/rust/tw_tests/tests/chains/solana/solana_address.rs
new file mode 100644
index 00000000000..9ba8aa31d4d
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/solana_address.rs
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_solana_address_normalization() {
+    test_address_normalization(
+        CoinType::Solana,
+        "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST",
+        "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST",
+    );
+}
+
+#[test]
+fn test_solana_address_is_valid() {
+    test_address_valid(
+        CoinType::Solana,
+        "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST",
+    );
+}
+
+#[test]
+fn test_solana_address_invalid() {
+    // Contains invalid base-58 character
+    test_address_invalid(
+        CoinType::Solana,
+        "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdSl",
+    );
+    // Is invalid length
+    test_address_invalid(
+        CoinType::Solana,
+        "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpd",
+    );
+}
+
+#[test]
+fn test_solana_address_get_data() {
+    test_address_get_data(
+        CoinType::Solana,
+        "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST",
+        "18f9d8d877393bbbe8d697a8a2e52879cc7e84f467656d1cce6bab5a8d2637ec",
+    );
+}
diff --git a/rust/tw_tests/tests/chains/solana/solana_address_ffi.rs b/rust/tw_tests/tests/chains/solana/solana_address_ffi.rs
new file mode 100644
index 00000000000..57ff4aa5e18
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/solana_address_ffi.rs
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+use wallet_core_rs::ffi::solana::address::{
+    tw_solana_address_default_token_address, tw_solana_address_token_2022_address,
+};
+
+#[test]
+fn test_solana_address_default_token_address() {
+    let main_address = "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V";
+    let main_address = TWStringHelper::create(main_address);
+
+    let token_mint_address = "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt";
+    let token_mint_address = TWStringHelper::create(token_mint_address);
+
+    let actual = unsafe {
+        TWStringHelper::wrap(tw_solana_address_default_token_address(
+            main_address.ptr(),
+            token_mint_address.ptr(),
+        ))
+    }
+    .to_string()
+    .expect("!tw_solana_address_default_token_address returned a nullptr");
+
+    assert_eq!(actual, "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
+}
+
+#[test]
+fn test_solana_address_token_2022_address() {
+    let main_address = "68dzdXkni9BrAwU1asAwurMEdQhXUJq6MNY8niDAny8t";
+    let main_address = TWStringHelper::create(main_address);
+
+    let token_mint_address = "7atgF8KQo4wJrD5ATGX7t1V2zVvykPJbFfNeVf1icFv1";
+    let token_mint_address = TWStringHelper::create(token_mint_address);
+
+    let actual = unsafe {
+        TWStringHelper::wrap(tw_solana_address_token_2022_address(
+            main_address.ptr(),
+            token_mint_address.ptr(),
+        ))
+    }
+    .to_string()
+    .expect("!tw_solana_address_associated_token_address returned a nullptr");
+
+    assert_eq!(actual, "3PaFQnebQMHBgthRScup2B932cMxA1GBP7m9roCkomHq");
+}
diff --git a/rust/tw_tests/tests/chains/solana/solana_compile.rs b/rust/tw_tests/tests/chains/solana/solana_compile.rs
new file mode 100644
index 00000000000..592d5bee322
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/solana_compile.rs
@@ -0,0 +1,423 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::sign_utils::{CompilerHelper, PreImageHelper};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::base58::{self, Alphabet};
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Solana::Proto::{self, mod_SigningInput::OneOftransaction_type as TransactionType};
+
+#[test]
+fn test_solana_compile_transfer() {
+    let transfer = Proto::Transfer {
+        recipient: "3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe".into(),
+        value: 1000,
+        ..Proto::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        sender: "sp6VUqq1nDEuU83bU2hstmEYrJNipJYpwS7gZ7Jv7ZH".into(),
+        recent_blockhash: "TPJFTN4CjBn12HiBfAbGUhpD9zGvRSm2RcheFRA4Fyv".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "010001030d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c024c255a8bc3e8496217a2cd2a1894b9b9dcace04fcd9c0d599acdaaea40a1b61000000000000000000000000000000000000000000000000000000000000000006c25012cc11a599a45b3b2f7f8a7c65b0547fa0bb67170d7a0cd1eda4e2c9e501020200010c02000000e803000000000000"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature = "a8c610697087eaf8a34b3facbe06f8e9bb9603bb03270dad021ffcd2fc37b6e9efcdcb78b227401f000eb9231c67685240890962e44a17fd27fc2ff7b971df03".decode_hex().unwrap();
+    let public_key = "0d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c0"
+        .decode_hex()
+        .unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(CoinType::Solana, &input, vec![signature], vec![public_key]);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "5bWxVCP5fuzkKSGby9hnsLranszQJR2evJGTfBrpDQ4rJceW1WxKNrWqVPBsN2QCAGmE6W7VaYkyWjv39HhGrr1Ne2QSUuHZdyyn7hK4pxzLPMgPG8fY1XvXdppWMaKMLmhriLkckzGKJMaE3pWBRFBKzigXY28714uUNndb7S9hVakxa59hrLph39CMgAkcj6b8KYvJEkb1YdYytHSZNGi4kVVTNqiicNgPdf1gmG6qz9zVtnqj9JtaD2efdS8qxsKnvNWSgb8XxbT6dwyp7msUUi7d27cYaPTpK");
+    assert_eq!(output.unsigned_tx, "87PYr2vKPjNPfwNmqTvhgkThhohTqFNKYJgCHcrUCeayX6daQs9AFvMA698MG9TknbSnUxNXaNaReatkevLDgiTG5FqcBgVHG5PLPrq3PCdKPLjAN9RMQJXM5i6KaVMDzGJGMfgSFMS4ecEjqumZX4nux9rhG4jpYaQbe5sgyYUetwMmemoNiCgW2qCFsGnTYR9rWSU7S9zF");
+}
+
+#[test]
+fn test_solana_compile_create_nonce_account() {
+    let nonce_account = "6vNrYDm6EHcvBALY7HywuDWpTSc6uGt3y2nf5MuG1TmJ";
+    let sender = "sp6VUqq1nDEuU83bU2hstmEYrJNipJYpwS7gZ7Jv7ZH";
+
+    let create_nonce_account = Proto::CreateNonceAccount {
+        nonce_account: nonce_account.into(),
+        rent: 10000000,
+        ..Proto::CreateNonceAccount::default()
+    };
+    let input = Proto::SigningInput {
+        sender: sender.into(),
+        recent_blockhash: "mFmK2xFMhzJJaUN5cctfdCizE9dtgcSASSEDh1Yzmat".into(),
+        transaction_type: TransactionType::create_nonce_account(create_nonce_account),
+        tx_encoding: Proto::Encoding::Base64,
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "020003050d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c057f6ed937bb447a6700c9684d2e182b1a6661838a86cca7d0aac18be2e098b2106a7d517192c568ee08a845f73d29788cf035c3145b21ab344d8062ea940000006a7d517192c5c51218cc94c3d4af17f58daee089ba1fd44e3dbd98a0000000000000000000000000000000000000000000000000000000000000000000000000b563fd13b46e844f12f54fa8a0e78c44d95dbae4953368b7135f1e0de111cb502040200013400000000809698000000000050000000000000000000000000000000000000000000000000000000000000000000000000000000040301020324060000000d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c0"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let sender_signature = "83985a7cb1ba60a11c361a49476f10316d70032d5e2b4d882250d4de1a841f3dbaf9e68b036b067ec4f56c04032672229777ad101e9d3d51d6d917994b767e0e".decode_hex().unwrap();
+    let nonce_signature = "24708efdba7e33259607597396b665baea3fc51d71e19a963cccad4bbdd2770e42e4831d1cc037afd02065a09e8c2b5e04f63da20f200e6aff689ad3b2bf7f0a".decode_hex().unwrap();
+    let sender_pubkey = base58::decode(sender, Alphabet::Bitcoin).unwrap();
+    let nonce_pubkey = base58::decode(nonce_account, Alphabet::Bitcoin).unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(
+        CoinType::Solana,
+        &input,
+        vec![sender_signature, nonce_signature],
+        vec![sender_pubkey, nonce_pubkey],
+    );
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "AoOYWnyxumChHDYaSUdvEDFtcAMtXitNiCJQ1N4ahB89uvnmiwNrBn7E9WwEAyZyIpd3rRAenT1R1tkXmUt2fg4kcI79un4zJZYHWXOWtmW66j/FHXHhmpY8zK1LvdJ3DkLkgx0cwDev0CBloJ6MK14E9j2iDyAOav9omtOyv38KAgADBQ0ESmLQpN/loDehW1n6TU0NOrgRA6LBCm2gik0FhhHAV/btk3u0R6ZwDJaE0uGCsaZmGDiobMp9CqwYvi4JiyEGp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAan1RcZLFxRIYzJTD1K8X9Y2u4Im6H9ROPb2YoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALVj/RO0boRPEvVPqKDnjETZXbrklTNotxNfHg3hEctQIEAgABNAAAAACAlpgAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAwECAyQGAAAADQRKYtCk3+WgN6FbWfpNTQ06uBEDosEKbaCKTQWGEcA=");
+    assert_eq!(output.unsigned_tx, "AgADBQ0ESmLQpN/loDehW1n6TU0NOrgRA6LBCm2gik0FhhHAV/btk3u0R6ZwDJaE0uGCsaZmGDiobMp9CqwYvi4JiyEGp9UXGSxWjuCKhF9z0peIzwNcMUWyGrNE2AYuqUAAAAan1RcZLFxRIYzJTD1K8X9Y2u4Im6H9ROPb2YoAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAALVj/RO0boRPEvVPqKDnjETZXbrklTNotxNfHg3hEctQIEAgABNAAAAACAlpgAAAAAAFAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAwECAyQGAAAADQRKYtCk3+WgN6FbWfpNTQ06uBEDosEKbaCKTQWGEcA=");
+}
+
+#[test]
+fn test_solana_compile_withdraw_nonce_account() {
+    let sender = "sp6VUqq1nDEuU83bU2hstmEYrJNipJYpwS7gZ7Jv7ZH";
+
+    let withdraw_nonce = Proto::WithdrawNonceAccount {
+        nonce_account: "6vNrYDm6EHcvBALY7HywuDWpTSc6uGt3y2nf5MuG1TmJ".into(),
+        recipient: "3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe".into(),
+        value: 10000000,
+    };
+    let input = Proto::SigningInput {
+        sender: sender.into(),
+        recent_blockhash: "5ccb7sRth3CP8fghmarFycr6VQX3NcfyDJsMFtmdkdU8".into(),
+        transaction_type: TransactionType::withdraw_nonce_account(withdraw_nonce),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "010003060d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c057f6ed937bb447a6700c9684d2e182b1a6661838a86cca7d0aac18be2e098b2124c255a8bc3e8496217a2cd2a1894b9b9dcace04fcd9c0d599acdaaea40a1b6106a7d517192c568ee08a845f73d29788cf035c3145b21ab344d8062ea940000006a7d517192c5c51218cc94c3d4af17f58daee089ba1fd44e3dbd98a000000000000000000000000000000000000000000000000000000000000000000000000448e50d73f42e3163f5926922aadd2bca6bdd91f97b3eb7b750e2cecfd810f6d01050501020304000c050000008096980000000000"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature = "1212e67f30fc9f17a440ef446c3e8638676b8253d3dc4517e297a777c011f820509c5d102e5648827e2a6a4b6274943c9209f44d2dee31277eaa6c54afd0410c".decode_hex().unwrap();
+    let pubkey = base58::decode(sender, Alphabet::Bitcoin).unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(CoinType::Solana, &input, vec![signature], vec![pubkey]);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "7gdEdDymvtfPfVgVvCTPzafmZc1Z8Zu4uXgJDLm8KGpLyPHysxFGjtFzimZDmGtNhQCh22Ygv3ZtPZmSbANbafikR3S1tvujatHW9gMo35jveq7TxwcGoNSqc7tnH85hkEZwnDryVaiKRvtCeH3dgFE9YqPHxiBuZT5eChHJvVNb9iTTdMsJXMusRtzeRV45CvrLKUvsAH7SSWHYW6bGow5TbEJie4buuz2rnbeVG5cxaZ6vyG2nJWHNuDPWZJTRi1MFEwHoxst3a5jQPv9UrG9rNZFCw4uZizVcG6HEqHWgQBu8gVpYpzFCX5SrhjGPZpbK3YmHhUEMEpJx3Fn7jX7Kt4t3hhhrieXppoqKNuqjeNVjfEf3Q8dJRfuVMLdXYbmitCVTPQzYKWBR6ERqWLYoAVqjoAS2pRUw1nrqi1HR");
+}
+
+#[test]
+fn test_solana_compile_create_and_transfer_token() {
+    let sender = "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V";
+
+    let create_transfer_token = Proto::CreateAndTransferToken {
+        recipient_main_address: "3WUX9wASxyScbA7brDipioKfXS1XEYkQ4vo3Kej9bKei".into(),
+        token_mint_address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU".into(),
+        recipient_token_address: "BwTAyrCEdkjNyGSGVNSSGh6phn8KQaLN638Evj7PVQfJ".into(),
+        sender_token_address: "5sS5Z8GAdVHqZKRqEvpDauHvvLgbDveiyfi81uh25mrf".into(),
+        amount: 4000,
+        decimals: 6,
+        ..Proto::CreateAndTransferToken::default()
+    };
+    let input = Proto::SigningInput {
+        sender: sender.into(),
+        recent_blockhash: "AfzzEC8NVXoxKoHdjXLDVzqwqvvZmgPuqyJqjuHiPY1D".into(),
+        transaction_type: TransactionType::create_and_transfer_token_transaction(
+            create_transfer_token,
+        ),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "0100060994c3890fa8d4bc04ab2a676d2cafea5cdc899ecd95a9cbe593e9df258759685aa287d36838b4ef65c2c460d1a52498453c259cd6a35ca91064aaead28187ca69485a24ffb4070461bb6d7f1c8b758c6b2dc90029d551b5fd4eacd82d65e302202544558bb05c2698f88852a7925c5c0ee5ea8711ddb3fe1262150283eee811633b442cb3912157f13a933d0134282d032b5ffecd01a2dbf1b7790608df002ea7000000000000000000000000000000000000000000000000000000000000000006ddf6e1d765a193d9cbe146ceeb79ac1cb485ed5f5b37913a8cf5857eff00a906a7d517192c5c51218cc94c3d4af17f58daee089ba1fd44e3dbd98a000000008c97258f4e2489f1bb3d1029148e0d830b5a1399daff1084048e7bd8dbe9f8598fb6d19edbbae20ebbc767fba1da4d4b40a4b97479fe526a82325cba7cee506802080700010304050607000604020401000a0ca00f00000000000006"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature = "28d04f30288e51c257648b8c955c661228d1e13632ee2fa366d3932e359a0d6044c66074e89d8542d2a60675679bd28a1b6eb80c273ed60a8f1cfe4fdc736b02".decode_hex().unwrap();
+    let pubkey = base58::decode(sender, Alphabet::Bitcoin).unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(CoinType::Solana, &input, vec![signature], vec![pubkey]);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "2qkvFTcMk9kPaHtd7idJ1gJc4zTkuYDUJsC67kXvHjv3zwEyUx92QyhhSeBjL6h3Zaisj2nvTWid2UD1N9hbg9Ty7vSHLc7mcFVvy3yJmN9tz99iLKsf15rEeKUk3crXWLtKZEpcXJurN7vrxKwjQJnVob2RjyxwVfho1oNZ72BHvqToRM1W2KbcYhxK4d9zB4QY5tR2dzgCHWqAjf9Yov3y9mPBYCQBtw2GewrVMDbg5TK81E9BaWer3BcEafc3NCnRfcFEp7ZUXsGAgJYx32uUoJPP8ByTqBsp2JWgHyZhoz1WUUYRqWKZthzotErVetjSik4h5GcXk9Nb6kzqEf4nKEZ22eyrP5dv3eZMuGUUpMYUT9uF16T72s4TTwqiWDPFkidD33tACx74JKGoDraHEvEeAPrv6iUmC675kMuAV4EtVspVc5SnKXgRWRxb4dcH3k7K4ckjSxYZwg8UhTXUgPxA936jBr2HeQuPLmNVn2muA1HfL2DnyrobUP9vHpbL3HHgM2fckeXy8LAcjnoE9TTaAKX32wo5xoMj9wJmmtcU6YbXN4KgZ");
+}
+
+#[test]
+fn test_solana_compile_advance_nonce_account() {
+    let sender = "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V";
+
+    let advance_nonce = Proto::AdvanceNonceAccount {
+        nonce_account: "6vNrYDm6EHcvBALY7HywuDWpTSc6uGt3y2nf5MuG1TmJ".into(),
+    };
+    let input = Proto::SigningInput {
+        sender: sender.into(),
+        recent_blockhash: "4KQLRUfd7GEVXxAeDqwtuGTdwKd9zMfPycyAG3wJsdck".into(),
+        transaction_type: TransactionType::advance_nonce_account(advance_nonce),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "0100020494c3890fa8d4bc04ab2a676d2cafea5cdc899ecd95a9cbe593e9df258759685a57f6ed937bb447a6700c9684d2e182b1a6661838a86cca7d0aac18be2e098b2106a7d517192c568ee08a845f73d29788cf035c3145b21ab344d8062ea940000000000000000000000000000000000000000000000000000000000000000000003149e670959884ea98bb33bca21c9505f1fc17b1d51ca59555a5d58c93f0f9c90103030102000404000000"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature = "54772ff2be7cce175e58dde0152437382ca71f932b62497ccac624f202bbf8fb8247a8c80ba7dd5412d8316c8ab25caf48739cc677c15b97cbbbc005b3a56006".decode_hex().unwrap();
+    let pubkey = base58::decode(sender, Alphabet::Bitcoin).unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(CoinType::Solana, &input, vec![signature], vec![pubkey]);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "7YPgNzjCnUd2zBb6ZC6bf1YaoLjhJPHixLUdTjqMjq1YdzADJCx2wsTTBFFrqDKSHXEL6ntRq8NVJTQMGzGH5AQRKwtKtutehxesmtzkZCPY9ADZ4ijFyveLmTt7kjZXX7ZWVoUmKAqiaYsPTex728uMBSRJpV4zRw2yKGdQRHTKy2QFEb9acwLjmrbEgoyzPCarxjPhw21QZnNcy8RiYJB2mzZ9nvhrD5d2jB5TtdiroQPgTSdKFzkNEd7hJUKpqUppjDFcNHGK73FE9pCP2dKxCLH8Wfaez8bLtopjmWun9cbikxo7LZsarYzMXvxwZmerRd1");
+}
+
+#[test]
+fn test_solana_compile_create_and_transfer_token_with_external_fee_payer() {
+    let sender = "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V";
+    let fee_payer = "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ";
+
+    let create_transfer_token = Proto::CreateAndTransferToken {
+        recipient_main_address: "E54BymfdhXQtzDSGtgiJayauEMdB2gJjPqoDjzfbCXwj".into(),
+        token_mint_address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU".into(),
+        recipient_token_address: "Ay7G7Yb7ZCebCQdG39FxD1nFNDtqFWJCBgfd5Ek7DDcS".into(),
+        sender_token_address: "5sS5Z8GAdVHqZKRqEvpDauHvvLgbDveiyfi81uh25mrf".into(),
+        // 0.004
+        amount: 4000,
+        decimals: 6,
+        ..Proto::CreateAndTransferToken::default()
+    };
+    let input = Proto::SigningInput {
+        sender: sender.into(),
+        recent_blockhash: "EsnN3ksLV6RLBW7qqgrvm2diwVJNTzL9QCuzm6tqWsU8".into(),
+        transaction_type: TransactionType::create_and_transfer_token_transaction(
+            create_transfer_token,
+        ),
+        fee_payer: fee_payer.into(),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "0200060acb2af089b56a557737bc1718e0cbf232cf5b02e14ee0aa7c6675233f5f6f9b5794c3890fa8d4bc04ab2a676d2cafea5cdc899ecd95a9cbe593e9df258759685a9418c9576a9c00c6bd8fc223f471573f7172488de10aa84dbf63c53a20bae717485a24ffb4070461bb6d7f1c8b758c6b2dc90029d551b5fd4eacd82d65e30220c231dc02f482980f7d9915c1ecf53374091d38c060b49487f9c5d932e077ed763b442cb3912157f13a933d0134282d032b5ffecd01a2dbf1b7790608df002ea7000000000000000000000000000000000000000000000000000000000000000006ddf6e1d765a193d9cbe146ceeb79ac1cb485ed5f5b37913a8cf5857eff00a906a7d517192c5c51218cc94c3d4af17f58daee089ba1fd44e3dbd98a000000008c97258f4e2489f1bb3d1029148e0d830b5a1399daff1084048e7bd8dbe9f859ce2a4331bce3670e6ea8bedff5908c6d91f833a31a7fdeac16978c261a1801d502090700020405060708000704030502010a0ca00f00000000000006"
+    );
+    let actual_signers: Vec<_> = preimage_output
+        .signers
+        .iter()
+        .map(|signer| String::from_utf8(signer.to_vec()).unwrap())
+        .collect();
+    assert_eq!(
+        actual_signers,
+        vec![fee_payer.to_string(), sender.to_string()]
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature1 = "0567ccb81d1c52d87e6491d26a7f9e93f346a69a6f0318ab2f1d8fba210d0b034343730c7ed5d3a96a37e2eb4e97cb813eec9b1fab82b538f9cf7dd71383cd03".decode_hex().unwrap();
+    let signature2 = "8aef8b94f8448e583e51b54c4935b1911bb98ebc3053a46859865451584b11e83fe1a50734afc933b973142b73a9b4892509798b2a3a6dcd851c0809704d4b0e".decode_hex().unwrap();
+    let fee_payer_pubkey = base58::decode(fee_payer, Alphabet::Bitcoin).unwrap();
+    let sender_pubkey = base58::decode(sender, Alphabet::Bitcoin).unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(
+        CoinType::Solana,
+        &input,
+        vec![signature1, signature2],
+        vec![fee_payer_pubkey, sender_pubkey],
+    );
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "5sxFkQYd2FvqRU64N79A6xjJKNkgUsEEg2wKgai2NiK7A7hF3q5GYEbjQsYBG9S2MejwTENbwHzvypaa3D3cEkxvVTg19aJFWdCtXQiz42QF5fN2MuAb6eJR4KHFnzCtxxnYGtN9swZ5B5cMSPCffCRZeUTe3kooRmbTYPvSaemU6reVSM7X2beoFKPd2svrLFa8XnvhBwL9EiFWQ9WhHB2cDV7KozCnJAW9kdNDR4RbfFQxboANGo3ZGE5ddcZ6YdomATKze1TtHj2qzJEJRwxsRr3iM3iNFb4Eav5Q2n71KUriRf73mo44GQUPbQ2LvpZKf4V6M2PzxJwzBo7FiFZurPmsanT3U5efEsKnnueddbiLHedc8JXc1d3Z53sFxVGJpsGA8RR6thse9wUvaEWqXVtPbNA6NMao9DFGD6Dudza9pJXSobPc7mDHZmVmookf5vi6Lb9Y1Q4EgcEPQmbaDnKGGB6uGfZe629i3iKXRzAd2dB7mKfffhDadZ8S1eYGT3dhddV3ExRxcqDP9BAGQT3rkRw1JpeSSi7ziYMQ3vn4t3okdgQSq6rrpbPDUNG8tLSHFMAq3ydnh4Cb4ECKkYoz9SFAnXACUu4mWETxijuKMK9kHrTqPGk9weHTzobzCC8q8fcPWV3TcyUyMxsbVxh5q1p5h5tWfD9td5TZJ2HEUbTop2dA53ZF");
+}
+
+#[test]
+fn test_solana_compile_token_transfer_with_external_fee_payer() {
+    let sender = "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V";
+    let fee_payer = "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ";
+
+    let token_transfer = Proto::TokenTransfer {
+        token_mint_address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU".into(),
+        sender_token_address: "5sS5Z8GAdVHqZKRqEvpDauHvvLgbDveiyfi81uh25mrf".into(),
+        recipient_token_address: "AZapcpAZtEL1gQuC87F2L1hSfAZnAvNy1hHtJ8DJzySN".into(),
+        // 0.004
+        amount: 4000,
+        decimals: 6,
+        ..Proto::TokenTransfer::default()
+    };
+    let input = Proto::SigningInput {
+        sender: sender.into(),
+        recent_blockhash: "GwB5uixiTQUG2Pvo6fWAaNQmz41Jt4WMEPD7b83wvHkX".into(),
+        transaction_type: TransactionType::token_transfer_transaction(token_transfer),
+        fee_payer: fee_payer.into(),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "02000206cb2af089b56a557737bc1718e0cbf232cf5b02e14ee0aa7c6675233f5f6f9b5794c3890fa8d4bc04ab2a676d2cafea5cdc899ecd95a9cbe593e9df258759685a485a24ffb4070461bb6d7f1c8b758c6b2dc90029d551b5fd4eacd82d65e302208e12027e9261a6a276b5ff00ddecfda567ff3ae510a5b47045086ad1d50cab573b442cb3912157f13a933d0134282d032b5ffecd01a2dbf1b7790608df002ea706ddf6e1d765a193d9cbe146ceeb79ac1cb485ed5f5b37913a8cf5857eff00a9ecc01200a43c87ad04ab8b382c0934a54e585e7dcd9cdef6d1cacd52718981c4010504020403010a0ca00f00000000000006"
+    );
+    let actual_signers: Vec<_> = preimage_output
+        .signers
+        .iter()
+        .map(|signer| String::from_utf8(signer.to_vec()).unwrap())
+        .collect();
+    assert_eq!(
+        actual_signers,
+        vec![fee_payer.to_string(), sender.to_string()]
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature1 = "42eb5f9c2203aaaa1f58c38161da982fd5a855562fe75f12808fdec3bb742f3a688cf806f55588b4c533cd7e19bacc468497a8f19ad86fe06fe4dbb67a526c08".decode_hex().unwrap();
+    let signature2 = "54eac822f984d4a23620546059890652d0540d7a73e6ca450d34ae046e7d0fd25d9bd6fa041a82f5573469196b2c46088997b6de97a8d20e28ba46b07333ec02".decode_hex().unwrap();
+    let fee_payer_pubkey = base58::decode(fee_payer, Alphabet::Bitcoin).unwrap();
+    let sender_pubkey = base58::decode(sender, Alphabet::Bitcoin).unwrap();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(
+        CoinType::Solana,
+        &input,
+        vec![signature1, signature2],
+        vec![fee_payer_pubkey, sender_pubkey],
+    );
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "qjgNVBmoPDHNTN2ENQfxNVE57jWXpqdmu5GQX4msA7iK8ZRAnKpvbusQagv8CZGyNYti23p9jBsjTSx75ZU26UW5vgC8D88pusW8W5dp1ERo5DSfurMSYJ6afgQHdcuzn7exb8znSm6uV4y1cWgBRcuAGdg3wRpVhP8HEB1EeKgzjYVWvMSy6yR7qVrSL6BxHG6eiAMyahLFbEt4qBqLEdxxY7Dt4DyydVYmG2ZVtheaMHD3ACwCjpyPLXj399wxSgGXQQFGtzEJQw9awVezmJ4wZk6W4dDpXQvdKYaqUvwTwRZsQB5o2iekPWZXR9xvHiMLjMVBPzYgcU14ZSaCbqSNVv2pAJxP1sMvxZMNMzZPttPxCsDDGq9biC7exXwzesXSnZ3rsgEYeZtkUiBHAxR4rYqBpA6VzLs1bPx8MPTvr9mhNi2ezMBbg2nEfHV6Fz7H7rEY2g3jDtRz35Vmgits8s9RKi3kb73WtGUieRiXjiqkNhpvKkST1oEYRQ9");
+}
+
+#[test]
+fn test_solana_compile_transfer_with_zero_signature() {
+    let transfer = Proto::Transfer {
+        recipient: "3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe".into(),
+        value: 1000,
+        ..Proto::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        sender: "sp6VUqq1nDEuU83bU2hstmEYrJNipJYpwS7gZ7Jv7ZH".into(),
+        recent_blockhash: "TPJFTN4CjBn12HiBfAbGUhpD9zGvRSm2RcheFRA4Fyv".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "010001030d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c024c255a8bc3e8496217a2cd2a1894b9b9dcace04fcd9c0d599acdaaea40a1b61000000000000000000000000000000000000000000000000000000000000000006c25012cc11a599a45b3b2f7f8a7c65b0547fa0bb67170d7a0cd1eda4e2c9e501020200010c02000000e803000000000000"
+    );
+
+    // Step 3: Compile transaction info
+    let public_key = "0d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c0"
+        .decode_hex()
+        .unwrap();
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+
+    // Compile with zero signature
+    let signature = "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+        .decode_hex()
+        .unwrap();
+    let output = compiler.compile(CoinType::Solana, &input, vec![signature], vec![public_key]);
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "3md7BBV9wFjYGnMWcMNyAZcjca2HGfXWZkrU8vvho66z2sJMZFcx6HZdBiAddjo2kzgBv3uZoac3domBRjJJSXkbBvokxPZ8Lfa4BipQ5HdcJ2Fij2h7NHywnKFjDrgqfZ3YfUTEFreBy3MebYxQvgCaVhxGkxDwYc3Pvsoz4yQNMXTDrmgaqbhJzhV5WUXmqJeFMTyY8NguMLS6A9uP4iWe9RnMs2X5dFnhMPQzfCzL6wjVKJ99gRaqqDundDhdoYUdvgC17jY4pB9tMhL9bNBs9VwWu66dSYzQX");
+    assert_eq!(output.unsigned_tx, "87PYr2vKPjNPfwNmqTvhgkThhohTqFNKYJgCHcrUCeayX6daQs9AFvMA698MG9TknbSnUxNXaNaReatkevLDgiTG5FqcBgVHG5PLPrq3PCdKPLjAN9RMQJXM5i6KaVMDzGJGMfgSFMS4ecEjqumZX4nux9rhG4jpYaQbe5sgyYUetwMmemoNiCgW2qCFsGnTYR9rWSU7S9zF");
+}
+
+#[test]
+fn test_solana_compile_transfer_with_fake_signature() {
+    let transfer = Proto::Transfer {
+        recipient: "3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe".into(),
+        value: 1000,
+        ..Proto::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        sender: "sp6VUqq1nDEuU83bU2hstmEYrJNipJYpwS7gZ7Jv7ZH".into(),
+        recent_blockhash: "TPJFTN4CjBn12HiBfAbGUhpD9zGvRSm2RcheFRA4Fyv".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "010001030d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c024c255a8bc3e8496217a2cd2a1894b9b9dcace04fcd9c0d599acdaaea40a1b61000000000000000000000000000000000000000000000000000000000000000006c25012cc11a599a45b3b2f7f8a7c65b0547fa0bb67170d7a0cd1eda4e2c9e501020200010c02000000e803000000000000"
+    );
+
+    // Step 3: Compile transaction info
+    let public_key = "0d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c0"
+        .decode_hex()
+        .unwrap();
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+
+    // Compile with other fake signature
+    let signature = "10000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+        .decode_hex()
+        .unwrap();
+    let output = compiler.compile(CoinType::Solana, &input, vec![signature], vec![public_key]);
+    assert_eq!(output.error, SigningError::Error_signing);
+}
diff --git a/rust/tw_tests/tests/chains/solana/solana_sign.rs b/rust/tw_tests/tests/chains/solana/solana_sign.rs
new file mode 100644
index 00000000000..27c09741d3f
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/solana_sign.rs
@@ -0,0 +1,975 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::base58::{self, Alphabet};
+use tw_encoding::hex::DecodeHex;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Solana::Proto;
+
+use tw_proto::Solana::Proto::mod_SigningInput::OneOftransaction_type as TransactionType;
+
+fn b58(s: &str) -> Cow<'static, [u8]> {
+    base58::decode(s, Alphabet::Bitcoin).unwrap().into()
+}
+
+#[test]
+fn test_solana_sign_transfer() {
+    let transfer = Proto::Transfer {
+        recipient: "EN2sCsJ1WDV8UFqsiTXHcUPUxQ4juE71eCknHYYMifkd".into(),
+        value: 42,
+        ..Proto::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "3p2kzZ1DvquqC6LApPuxpTg5CCDVPqJFokGSnGhnBHrta4uq7S2EyehV1XNUVXp51D69GxGzQZUjikfDzbWBG2aFtG3gHT1QfLzyFKHM4HQtMQMNXqay1NAeiiYZjNhx9UvMX4uAQZ4Q6rx6m2AYfQ7aoMUrejq298q1wBFdtS9XVB5QTiStnzC7zs97FUEK2T4XapjF1519EyFBViTfHpGpnf5bfizDzsW9kYUtRDW1UC2LgHr7npgq5W9TBmHf9hSmRgM9XXucjXLqubNWE7HUMhbKjuBqkirRM");
+    assert_eq!(output.unsigned_tx, "87PYsiS4MUU1UqXrsDoCBmD5FcKsXhwEBD8hc4zbq78yePu7bLENmbnmjmVbsj4VvaxnZhy4bERndPFzjSRH5WpwKwMLSCKvn9eSDmPESNcdkqne2UdMfWiFoq8ZeQBnF9h98dP8GM9kfzWPjvLmhjwuwA1E2k5WCtfii7LKQ34v6AtmFQGZqgdKiNqygP7ZKusHWGT8ZkTZ");
+}
+
+#[test]
+fn test_solana_sign_transfer_v0() {
+    let transfer = Proto::Transfer {
+        recipient: "6pEfiZjMycJY4VA2FtAbKgYvRwzXDpxY58Xp4b7FQCz9".into(),
+        value: 5000,
+        ..Proto::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: "833a053c59e78138a3ed090459bc6743cca6a9cbc2809a7bf5dbc7939b8775c8"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "HxKwWFTHixCu8aw35J1uxAX6yUhLHkFCdJJdK4y98Gyj".into(),
+        v0_msg: true,
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://explorer.solana.com/tx/4ffBzXxLPYEEdCYpQGETkCTCCsH6iTdmKzwUZXZZgFemdhRpxQwboguFFoKCeGF3SsZPzuwwE7LbRwLgJbsyRqyP?cluster=testnet
+    assert_eq!(output.encoded, "6NijVxwQoDjqt6A41HXCK9kXwNDp48uLgvRyE8uz6NY5dEzaEDLzjzuMnc5TGatHZZUXehKrzUGzbg9jPSdn6pVsMc9TXNH6JGe5RJLmHwWey3MC1p8Hs2zhjw5P439P57NToatraDX9ZwvBtK4EzZzRjWbyGdicheTPjeYKCzvPCLxDkTFtPCM9VZGGXSN2Bne92NLDvf6ntNm5pxsPkZGxPe4w9Eq26gkE83hZyrYXKaiDh8TbqbHatSkw");
+}
+
+#[test]
+fn test_solana_sign_transfer_to_self() {
+    let transfer = Proto::Transfer {
+        recipient: "zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu".into(),
+        value: 42,
+        ..Proto::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://explorer.solana.com/tx/4ffBzXxLPYEEdCYpQGETkCTCCsH6iTdmKzwUZXZZgFemdhRpxQwboguFFoKCeGF3SsZPzuwwE7LbRwLgJbsyRqyP?cluster=testnet
+    assert_eq!(output.encoded, "EKUmihvvUPKVN4GSCFwZRtz8WiyAuPvthW69Smo19SCjcPLQ6T7EVZd1HU71WAoe1bfgmPNS5JhU7ZLA9XKG3qbZqeEFJ1xmRwW9ZKw8SKMAL6VRWxp87oLu7PSmf5b8R34vCaww3XLKtZkoP49a7TUK31DqPN5xJCceMB3BZJyaojQaKU8nUkzSGf89LY6abZXp9krKAebvc6bSMzTP8SHSvbmZbf3VtejmpQeN9X6e7WVDn6oDa2bGT");
+}
+
+#[test]
+fn test_solana_sign_transfer_with_memo_and_references() {
+    let transfer = Proto::Transfer {
+        recipient: "71e8mDsh3PR6gN64zL1HjwuxyKpgRXrPDUJT7XXojsVd".into(),
+        value: 10000000,
+        memo: "HelloSolanaMemo".into(),
+        references: vec![
+            "CuieVDEDtLo7FypA9SbLM9saXFdb1dsshEkyErMqkRQq".into(),
+            "tFpP7tZUt6zb7YZPpQ11kXNmsc5YzpMXmahGMvCHhqS".into(),
+        ],
+        ..Proto::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://explorer.solana.com/tx/4ffBzXxLPYEEdCYpQGETkCTCCsH6iTdmKzwUZXZZgFemdhRpxQwboguFFoKCeGF3SsZPzuwwE7LbRwLgJbsyRqyP?cluster=testnet
+    assert_eq!(output.encoded, "NfNH76sST3nJ4FmFGTZJBUpJou7DRuHM3YNprT1HeEau699CQF65xNf21Hoi491bbtVKUXfqCJyeZhfTCEnABuXNC1JrhGBeCv2AbQdaS9gpp9j4xHHomhCYdwYaBWFMcKkdMXrx9xHqL9Vkny4HezkwQfb3wGqcaE9XVRdkkNxsoJnVKddRnrQbjhsZGTcKdfmbTghoUeRECNPTm6nZTA1owWF1Dq6mfr6M3GZRh4ucqEquxKsQC2HQwNRrGZahsfyUvwspPWwMt78q5Jpjd9kHqkFDspZL6Pepv4dAA4uHhYDCHeP2bbDiFMBYxxWCVDDtRKSh3H92xUgh1GCSgNcjGdbVfQUhSDPX3k9xuuszPTsVZ2GnsavAsRp6Vf6fFEikBX6pVV9zjW1cx94EepQ2aGEBSsVu4RzX7rJjCLCq87h8cxxf1XnF8mvYGEK7wzF");
+}
+
+#[test]
+fn test_solana_sign_transfer_with_durable_nonce() {
+    let transfer = Proto::Transfer {
+        recipient: "3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe".into(),
+        value: 1000,
+        ..Proto::Transfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: "044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "5ycoKxPRpW2GdD4byZuMptHU3VU5MgUCh6NLGQ2U8VE5".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        nonce_account: "ALAaqqt4Cc8hWH22GT2L16xKNAn6gv7XCTF7JkbfWsc".into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "6zRqmNP5waeyartbf8GuQrWxdSy4SCYBTEmGhiXfYNxQTuUrvrBjia18YoCM367AQZWZ5yTjcN6FaXuaPWju7aVZNFjyqpuMZLNEbpm8ZNmKP4Na2VzR59iAdSPEZGTPuesZEniNMAD7ZSux6fayxgwrEwMWjeiskFQEwdvFzKNHfNLbjoVpdSTxhKiqfbwxnFBpBxNE4nqMj3bUR37cYJAFoDFokxy23HGpV93V9mbGG89aLBNQnd9LKTjpYFv49VMd48mptUd7uyrRwZLMneew2Bxq3PLsj9SaJyCWbsnqYj6bBahhsErz67PJTJepx4BEhqRxHGUSbpeNiL7qyERri1GZsXhN8fgU3nPiYr7tMMxuLAoUFRMJ79HCex7vxhf7SapvcP");
+}
+
+/// Transfer SOL with `priority_fee_limit` and `priority_fee_price`.
+#[test]
+fn test_solana_sign_transfer_with_priority_fee() {
+    // Corresponding Solana address: 7HP8cENhoDxS7yT6UHyT3mVwvN5rv6gMrzwRXXWFJvDU.
+    let private_key = "1eb5264f82747294e7481ecae700bd1d21e50db620bcf0d2af7582f712c71b40"
+        .decode_hex()
+        .unwrap();
+
+    let transfer = Proto::Transfer {
+        recipient: "HwHDGHYeYfXdzwvCZu7zm21SzQ7ZLBGTLNkuscyFdpvZ".into(),
+        value: 1001,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.into(),
+        recent_blockhash: "ABdaGDKfoBe2SJAYkD31sojYVwTM8ainsdBD7ZM9dut1".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        priority_fee_limit: Some(Proto::PriorityFeeLimit { limit: 2000 }),
+        priority_fee_price: Some(Proto::PriorityFeePrice { price: 2 }),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "4WReC2rmup9nZjtFQbBbha5uADkVb54CRd6a3vbAoptbuzYvdud2Xau2tkzCejZsfsUC2ppqhMqbXXzaoiSpYH8XEDo6QtUV8EGXcE3GFxVjjtBT2U8abtC2qcBMDGAghtzpsmKWfWMxmQj8wWKjpmzamiU6PjfMbuAyAX5VPhQxZQ84Ay2HtQJBK8LA9CJ9qva9ehmu7g41wKBXLPq22NGjeSHq6ubjcNLQrFx34sKGtPJ68Z2oZgrju7XjKFhtnKzqUCWcgVUjUsyHyyBJ3awaExYHEw2uKq9NVoKmf9JDkjf2LBjNpUJ3EGzFHrfwnVEQ7B5XCX4nQRPir7eLuunLwVKhrdATKDbxin3ANe5D");
+}
+
+/// Transfer SOL with `priority_fee_limit` set only.
+#[test]
+fn test_solana_sign_transfer_with_priority_fee_limit() {
+    // Corresponding Solana address: 7HP8cENhoDxS7yT6UHyT3mVwvN5rv6gMrzwRXXWFJvDU.
+    let private_key = "1eb5264f82747294e7481ecae700bd1d21e50db620bcf0d2af7582f712c71b40"
+        .decode_hex()
+        .unwrap();
+
+    let transfer = Proto::Transfer {
+        recipient: "HwHDGHYeYfXdzwvCZu7zm21SzQ7ZLBGTLNkuscyFdpvZ".into(),
+        value: 160000,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.into(),
+        recent_blockhash: "8mhXYg8vpezXr7y7eP5q3oztzY9FRwTPSvyB3izzF88m".into(),
+        transaction_type: TransactionType::transfer_transaction(transfer),
+        priority_fee_limit: Some(Proto::PriorityFeeLimit { limit: 1000 }),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://solscan.io/tx/4ei1iejYd1Yr11hdi7ziFjc6GyUAtNnUQqURqssBXB7H6kYJ4CXxYiSks3PjoPdJfZFMXTSAYTp7wqYrjCKgKxcV
+    assert_eq!(output.encoded, "23MBXQ2GgD4CWLXG5MrhmXa6YDf4ghZdxEAzdrG9U457PMBAeg3WbSy7WA7H7a8VEFZ5eYR8TSvSAJ4ZBqhS4bLT7e8VSTszLDu159RmeKcfXtn7Ae4hQybb6uALWSkdBjSHyURYZoto6HWzS57htjUQkmAimaWFG5nwfkox9wqxAZqDNVAFYEAzM3eNWwWeN2rCnNy4vLfyKSZeNTRdvPg8PjUFyXrWcKkd3NFTqSchQmZsccaxpN32sNjg2Br2thCrcazon3rBY9T1BwuaWTtZsvm653dhhKENNajaD3TyA79K1m4rP6wYVaEs6UWr6qcwsdR6WD5TCkwmmmEjVYeQp2Py");
+}
+
+#[test]
+fn test_solana_sign_delegate_stake_no_stake_account() {
+    let delegate = Proto::DelegateStake {
+        validator_pubkey: "4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC".into(),
+        value: 42,
+        ..Proto::DelegateStake::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::delegate_stake_transaction(delegate),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "j24mVM9Zgu5vDZhPLGGuCRXQnP9djNtxdHh4txN3S7dwJsNNL5fbhzGpPgSUAcLGoMVCfF9TuqTYfpfJnb4sJFe1ahM8yPL5HwuKL6py5AZJFi8SWx9fvaVB699dCPo1GT3JoEBLPCZ9o2jQtnwzLkzTYJnKv2axqhKWFE2sz6TBA5J39eZcjMFUYgyxz6Q5S4MWqYQCb8UET2NAEZoKcfy7j8N25WXL6Gj4j3hBZjpHQQNaGaNEprEqyma3ZuVhpGiCALSsuzVLX3wZVo4icXwe952deMFA4tH3BK1jcSQCgfmcKDJ9nd7bdrnUUs4BoMdF1uDZB5LxE2UH8QiqtYvaUcorF4SJ3gPxM5ykbyPsNK1cSYZF9NMpW2GofyC17eELwnHQTQB2kqphxJZu7BahvkwiDPPeeydiXAkBspJ3nc3PCBujv6WJw22ZHw5j6zAP8ZGnCW44pqtWD5qifF9tTKhySKdANNiWifs3tSCCPQqjfJXu14drNinR6VG8rJxS1qgmRYiRQUa7m1vtoaZFRN5qKUeAfoFKkAVaNnMdwgsNqNH4dqBodTCJFs1LkYwhgRZdZGbwXTn1j7vpR3DSnv4g72i2H556srzK53jdUmdv6yfxt516XDSshqZtHnKZ1tudxKjBXwsqT3imDiZFVka9wKWUAYMCi4XZ79CY6Xpsd9c18U2e9TCngQmgkTATFgrqysfraokNffgqWxvsPMugksbvbPjJs3iCzByvphkC9p7hCf6LwbeF8XnVB91EAgRDA4VLE1f9wkcq5zjy879YWJ4r516h3PQszTz1EaJXNAXdbk5Em7eyuuabGP1Q3nijFTL2yhMDsXpgrjAuEAABNxFMd4J1JRMaic615mHrhwociksrsfQK");
+}
+
+#[test]
+fn test_solana_sign_delegate_stake_with_priority_fee() {
+    let delegate = Proto::DelegateStake {
+        validator_pubkey: "BWkvytz3MAiLkUbMuYK5yV1VYThbBYYQYG3gdef8NLw5".into(),
+        // 0.01
+        value: 10000000,
+        ..Proto::DelegateStake::default()
+    };
+
+    let input = Proto::SigningInput {
+        // Corresponding Solana address: GEjr7dsDVHZMzTvnz1AgDW76LJ2GC7DATnHHMUVoF4p6.
+        private_key: "43c0aeb43038c582b1abac52e5bdc2c20c83a1995fbfde5936ccd2e6392e9d8b"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "7uKCh5WRoLdib5LfcX4NETFcJroQPjHVsekdXniyaoFZ".into(),
+        transaction_type: TransactionType::delegate_stake_transaction(delegate),
+        priority_fee_price: Some(Proto::PriorityFeePrice { price: 1000 }),
+        priority_fee_limit: Some(Proto::PriorityFeeLimit { limit: 10_000 }),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // // https://solscan.io/tx/2DRUt4Q3BxYPB1Whd4MyekByh4pXWgrfQAybZ3obeNReR96sKYX1pZgZV12NUkLXJRb1c6ffAcEx1Eu7kYmA6zqH
+    assert_eq!(output.encoded, "XUMBKTDMfK4i8N3RBJtzzDsA3KnKZ4R4HexjXxiwsKr3j4DhENHcpUFWA41xwU94dE4av4hqP9Z5nvES9FU7GuECsDE5CuRagt5b1EEH2SPW8AjdeGbTs7JfT4nm3nd6gh2uJHXVMCjTYEhTKSKgLehgCa2JqwodiKEoPUdPwRoq7YoznzSBzvwvmSZrySC2eA8pp1PaBNDCG9rMAg1mDAzAu4VNmH7Nhh9bssGPcxgKZfoWmrhpvNcx6bDV4xBJBtvsYoGasRRSTXwF82VjA1L5aaQWJjAbBBZgsiws2Z5CqeWWdt6XF7sUHovAZihUdxXzJXPjRpEgX4HqHdriqTnPuaNwmVMEcNKzmZWJ543LTz4yUhyLRbYbN9hxWMtpiKBnjZe5KX783NPiuSHioyxAvmfkdKbDyKUf6a9G9HocHZMjKT3Yz1yeanHo69V2mAfKGZCPT7hRhRae6QoXu16QjHDHNBDLUtX8Db49vNJLdV3cYWPuyZ5eHLfDbw6r9jzCF34nmXJ4kFZHJHatp3wGKGbTtyeoxZnJVxLFmv7byoKVZ1hQdxGYg3q2jfjc2NsSj2Expmz6qLGZWMyVy6cVYjfqcQz9bwT89zC8823mAnFEPKRs8whZevCxifGiUfT6H99zZzNKfuJAhwJ14rP5VpZHCiDSuDRHzjydzwFxHDKamnAQXYuadEWJB89gJWA6wPoBQE1q4kRFTrYjU32mmnfwCs6Ji18uzNfrP2W6xPMs93vz2Pejpgzyru6anf7cYhKWVtou6bM9uNdVV5Qj5zr3eY4FqbNXXMz4WkiWmKQb5nUeyvp4e424WS1QUkwNYVW5vmehM2AuzMM9VEA5F2VMyrDihE74ZFA9yctaYZ4ovtH2TvSVgCGsS7ujqHoETVtDiyrjmgJvm68NtjcTioSKpAPgEvMciwxVwsUmYC6NGC6iCP2oVc2S6QCzixF");
+}
+
+#[test]
+fn test_solana_sign_delegate_stake_no_stake_account_5zrqgk1() {
+    // Corresponding Solana address: GcQQ1qx822KK14zyfTkMLQMLEZ4a9d88HnKepaA2XbmW.
+    let private_key = "507479b94db463a33cdc413db98437b4aa8c74b6053aea936d1830c27027b1e9"
+        .decode_hex()
+        .unwrap();
+    let delegate = Proto::DelegateStake {
+        validator_pubkey: "BWkvytz3MAiLkUbMuYK5yV1VYThbBYYQYG3gdef8NLw5".into(),
+        value: 10000000,
+        ..Proto::DelegateStake::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: private_key.into(),
+        recent_blockhash: "6ocSmEiuSHkN5yKDUaQrJHCzWCYXuFk3g3jB4rN1uDzv".into(),
+        transaction_type: TransactionType::delegate_stake_transaction(delegate),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted:
+    // https://solscan.io/tx/5zRQgK1oc1oHLhsM68AM2pSUUqif6VMMnuUKjyZgUsdySaNRufvzoEu8D8SF99GThw8iZiwRbPhnsDePpnDKKmRq
+    assert_eq!(output.encoded, "nuo7rnbTG4QLqpjYoPPPhDusRjpEVDyzos8YvdX67sDaw2XwfTJNm7eXcdxqjkgLqzFiHbD7kvm1i7f1caGjxZwTEzWqNkxK28YXJXU4S2NbQFa7HwSdamF38PLgKwNKmnUkh1quaZDFK3X5swL49QPxFhtSwFcFo9TphPsfeFjMbqqsLR8vjzLkePTrWKUSMmbwMG8U9TDEeWrsWbKaFeWsRQxzYP7ubDokPLVxGJopaEUobtUGyRA5K2A9H4dbuN7pZJSLwL926hGJQphjiXuJhD9PqY5TCRAq9PhyS6jtYP6ToQUiPfvigm5aHwb5rtEZKu5gM393G7LKfedMi263FVSnJyAb41i4xZXTMD3HdKiDBF5UomqCQEyPQhM4X8mYzPDPofRZfQjz2xS1fDesxY3BWMxwKQ6bgtazJDprBWWNJ7ULpHFEJ8wXtHAR3CfTWowQJ23zsKNUPbb6Ft4Lng3DJrRkMcTvvecLx9nnNqyuwjkqcBysWqJ4pJdvLC4QAnwoZzKAn8uzTKUSA85gSeE96RUmRVE4CgtPkZ7jYgmsSS5XgcC7g4XegHHJFQ3iMG4Uuxft635txXHAbkh6x9Ra9JnPFUq6Zdgc9UyCWrhhaKDvfmFgC2K7tykqHLXdDninmR2s7zmc1wsoGYeGvy2NbLTU3mRpyVwQPFaKPDPSisJYKYY4HnBQfG89wRLh4jkRsrH9snvxYwhgRLcsaMniwGNPpQEU4tLAkxHwco32rnxyFwycaPqEYsYpTR5vc5RUrnyy4nhEx1V79hqBb7NScxAbBsaBXvYpYitgdfX1h19uBr7A7uqZ3mqptKqA2Q3VjZthnLLGjJNVuR4BNJEa7VzPnR8SLCckjVycSHkbG26cUmB985K5");
+}
+
+#[test]
+fn test_solana_sign_delegate_stake_with_account() {
+    let delegate = Proto::DelegateStake {
+        validator_pubkey: "4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC".into(),
+        value: 42,
+        stake_account: "6u9vJH9pRj66N5oJFCBADEbpMTrLxQATcL6q5p5MXwYv".into(),
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::delegate_stake_transaction(delegate),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "TKPiN35HzeD3zdwxDFvnkgoqud7CZsda15JkBwM4nDpr623rM7MZsH6QvMMyKpiz7MeRNTrfyHkRLQSBT9Tbg2mgTdfrbhhqeF3Suu5ECphqn8DFYPoMnFzeg5u9gaqevfjhuizzeo2YDJF8aVGy1pez8gMbp5vHz1SuvQUgfcvFctggUMwNiJorSmmp3N6TzQSd38CZrA8ZLhaJjuwDwVMjmj18rGTV1gkX19L7byTFrus2vNvPeUa2AawwUnFpYMPgvCKkHTrpnjvypjoLof9yMUFQ5M1S3Ntv53KJyXwXq6ejJnBDtisnDcdMDNSZp3VeKz6XCr8XVM5xNVh3LX12V4kc3ueqkokYJLP1JmuhA3nNZA1G5KTNno93HUoBkEa1x5h3haoCSgmQC97LoJbJM6B6C2NbaDj2J6iiTaVQdin4He4Jpj575WDhNTqsLjzFUHPUHQF1CRnuss8UpVyMsa4kdVqCDQGeh5DKbkikgcB8GKPBuC91DRxGEqgoygNsu5nnQy4o3YAJnBBK6HsKxpdjbYD8wCUdLw8muhjpEqeBTPShEaogm9zfehidiCcnxbeoX3gmW8oH9gpWoX7GrkJgF6Wn7iWohmrzqzAjoBz8hpeY5nkkhHrf9iswVGMpakdLGy3YxkGJVpsW8KJACwEKXGLq8SVLtXSUHG8EP16zfYHxKjkCSs8PkdFsA5esxsxppPTVZivuEPqJ5og55aNmugdNDrAFYWdcH1Q4rm7BXN6oHECdz2yY4HFVWh9u592oqozt2gQKu3vmhcNFzzQe1xgs6zKSv38kSGTnipd7Hx2VL3qNAR6XBRiwAi226qSTzxi6R82p7cMB7TMy6fk5AZ3sXDSXFNJ9S5SSU1V63ruw75QMtVio");
+}
+
+#[test]
+fn test_solana_sign_deactivate_stake() {
+    let deactivate = Proto::DeactivateStake {
+        stake_account: "6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB".into(),
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::deactivate_stake_transaction(deactivate),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "6x3fSstNz4GpPxmT5jHXwyD62uyJMKaPWeBDNNcwXZA9NJ3E7KavCXPNUd8ZYTX5VpkfHKGszkwzM6AdAp4giLD29jvWdNYjkV1Nvb42xFwGD6ryMPZzXkJijaRTrA7SvPTDSRU2haGVmorqkywAXLQUCw47NmBUfLTb5gDcKoBeaAsahckv1eCE746thJVTg2dQNvUTULKF6xckUg7kwFkcUuRe4HCcRgrKcNAUKLR2rEM3brVQkUyAaAtMMtc3gVDXxxpbtW5Fa9wGaEnh31FdRo4z5YBzAUaz7vcrvzF2j81KCPTVnYyTmeJzCzJafzCVCtw");
+}
+
+#[test]
+fn test_solana_sign_deactivate_all_stake() {
+    let deactivate_all = Proto::DeactivateAllStake {
+        stake_accounts: vec![
+            "CJQStmfyoHbosX1GfVn64yWrNJAo214q2aqxwS6FGh4k".into(),
+            "6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB".into(),
+        ],
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::deactivate_all_stake_transaction(deactivate_all),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "U9azMJWRfDhypoDeQLYWyBYFZCwRNZy8sbrVX9awKK84zNGbSQfYTTJ3ZyzjNUVbU5npbw2MsWfmZGHZRvpfN7G7o3sVePyFRXrmLxrGZzGycFv25Zff4zPxDarbsugbCBgzVGpgwu8x7MdkwBAVHVtNsgMcHgArEAjEmk7YEGpZ15rjo39bCRvmuprWLqSv2SK1RyTZPpTPXVevAbA4i9vvcY8eUbwW29SZCoyGaagLU5EBV9vckMjzGa7gq2yMR6rbq8tDdWaXapYs8RavU49WN94yg4wdE4fzYq8DjqXHq3MuUBLxeYDKJnvj84ioeM4eR1EwjBNrGyz5GHTRuhbNg1nc57SpKsSMVSZW5Ra3tUk84YZXYFHxzeQ9Tv4o");
+}
+
+#[test]
+fn test_solana_sign_withdraw_stake() {
+    let withdraw = Proto::WithdrawStake {
+        stake_account: "6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB".into(),
+        value: 42,
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::withdraw_transaction(withdraw),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "gxr4o1trVP8DGG8UC21AA964YqAPFA3rBCF9MwmBQpn5fDtcujM9wp1gzT466MxWGR8wMciS6dSL771q29eURrEEuvhJzRaFDGPLgVB3UL4gd4T2amPQkR4Dzq5drKEtPJRBR86KVVc2kjDsbWNpdL8S7pZqW3VUijAbm9TS8ezG8NExSCkhxExKhUjXWWguEL4qXra7s2JZfhtmvuJneWnEY3isUVfC9knWtGNwpNFvRvzbH2sgHzwtSsD7mkYrBJoazLCwT8r9yypxycHL41XcGtH425MA16kVSunvvBfzG9PzBTS65YJBs64tzttasCU9uEphkwgmfrmoEC8iKt8xD47Ra79RyXd95yURsaxvpb1tVAH8kMNtj8iV1Pfm");
+}
+
+#[test]
+fn test_solana_sign_withdraw_all_stake() {
+    let withdraw_all = Proto::WithdrawAllStake {
+        stake_accounts: vec![
+            Proto::StakeAccountValue {
+                stake_account: "CJQStmfyoHbosX1GfVn64yWrNJAo214q2aqxwS6FGh4k".into(),
+                value: 42,
+            },
+            Proto::StakeAccountValue {
+                stake_account: "6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB".into(),
+                value: 67,
+            },
+        ],
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"),
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        transaction_type: TransactionType::withdraw_all_transaction(withdraw_all),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "cvBNusjtHkR74EfWsvFPEe2Mydcr7eoLeY2wJw2ZMZYViotbb63Adai7UD1PW9uLusoVHGLeJC5cPgVBC4F693P9tPAxLs9yiZj1ZJQ4DgnYbeXafqzjdWje1Ly5FgpDUJaaU2RnLCG51CcrmiTJ4KB5fwai6egZaNjbiqo1DEC1wJz4FgKug2aKQWLdeCiH9WhCuvqfhNV6mEE4qRCkU8uS2gfSqBd1AdrczvoDEbKQszosrwmawxqmvTE5EWaFzMb48x9nLqxvpQCvGQu1nX6FxZJjv2swekA7wGLEAA4uSdFLTHNrYSi8pn8hVYGwESEzth9oiPkJCvW7Y2KvGALeERUZn8knHiz2eqaaT72Ajp9UogMdZtiuFHufveLXpBLWUERchhB7eU1magYcPNHcZuEE4uQv5kZJhHAqYCGU6dyUFLVA9Edus7o6fTktYVCjoGb");
+}
+
+#[test]
+fn test_solana_sign_create_token_account() {
+    let create_token_acc = Proto::CreateTokenAccount {
+        main_address: "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V".into(),
+        token_mint_address: "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt".into(),
+        token_address: "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP".into(),
+        ..Proto::CreateTokenAccount::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"),
+        recent_blockhash: "9ipJh5xfyoyDaiq8trtrdqQeAhQbQkWy2eANizKvx75K".into(),
+        transaction_type: TransactionType::create_token_account_transaction(create_token_acc),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "CKzRLx3AQeVeLQ7T4hss2rdbUpuAHdbwXDazxtRnSKBuncCk3WnYgy7XTrEiya19MJviYHYdTxi9gmWJY8qnR2vHVnH2DbPiKA8g72rD3VvMnjosGUBBvCwbBLge6FeQdgczMyRo9n5PcHvg9yJBTJaEEvuewyBVHwCGyGQci7eYd26xtZtCjAjwcTq4gGr3NZbeRW6jZp6j6APuew7jys4MKYRV4xPodua1TZFCkyWZr1XKzmPh7KTavtN5VzPDA8rbsvoEjHnKzjB2Bszs6pDjcBFSHyQqGsHoF8XPD35BLfjDghNtBmf9cFqo5axa6oSjANAuYg6cMSP4Hy28waSj8isr6gQjE315hWi3W1swwwPcn322gYZx6aMAcmjczaxX9aktpHYgZxixF7cYWEHxJs5QUK9mJePu9Xc6yW75UB4Ynx6dUgaSTEUzoQthF2TN3xXwu1");
+}
+
+#[test]
+fn test_solana_sign_create_token_account_5ktpn1() {
+    let create_token_acc = Proto::CreateTokenAccount {
+        main_address: "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ".into(),
+        token_mint_address: "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt".into(),
+        token_address: "ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf".into(),
+        ..Proto::CreateTokenAccount::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: "4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "HxaCmxrXgzkzXYvDFTToENtf9rVKk7cbiuSUqnqNheHq".into(),
+        transaction_type: TransactionType::create_token_account_transaction(create_token_acc),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://explorer.solana.com/tx/5KtPn1LGuxhFiwjxErkxTb7XxtLVYUBe6Cn33ej7ATNVyorrkk3UAFJWDBUmzP8CZjmkocCxiMAdYnvrKoGpMsJx
+    assert_eq!(output.encoded, "EoJGDRFZdnjmx7rgwYSuDGTMTUdxCBeh8RggrQDzGht9bwzLPpCWkCrN4iQJqg3R6JxP7z2QZuf7dGCZcjMVBmmisYE8waRsohcvygRwmGr6nefbaujR5avm2x3EUvoTGyy8cMZJxX7URx45qQJyCgqFLNFCQzD1Kej3xCEPAJqCdGZgmqkryw2E2nkpGKXgRmbyEg2rFgd5kpvjG6jSLLYzGomxVnaKK2XyMQbcedkTMYJ8Ara71iWPRFUziWfgivZcA1qsQp92Fpao3FSsRprhoQz9u1VyAnh8zEM9jCKiE5s4dwCknqCJYeYsbMLn1be2vNP9bMQfu1jjGSHmbb9WR3E2vakTUEUByASXqSAJZuXYE5scopEzB28rC8nrC31ArLMZng5wWym3QbqEv2Syd6RHoEeoXR6vA5LPqvJKyvtH82p4hc4XbD18128aNrFG3GTD2P");
+}
+
+#[test]
+fn test_solana_sign_create_token_account_for_other_3e6ufv() {
+    let create_token_acc = Proto::CreateTokenAccount {
+        main_address: "3xJ3MoUVFPNFEHfWdtNFa8ajXUHsJPzXcBSWMKLd76ft".into(),
+        token_mint_address: "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt".into(),
+        token_address: "67BrwFYt7qUnbAcYBVx7sQ4jeD2KWN1ohP6bMikmmQV3".into(),
+        ..Proto::CreateTokenAccount::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: "4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "HmWyvrif3QfZJnDiRyrojmH9iLr7eMxxqiC9RJWFeunr".into(),
+        transaction_type: TransactionType::create_token_account_transaction(create_token_acc),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://explorer.solana.com/tx/3E6UFVamHCm6Bgk8gXdZex7R7tJAVxqJm6t9ephAKu1PjcfZrD7CJqMwKu6RrvWSUESbZFqzdUyLXuxAFaawPHvJ
+    assert_eq!(output.encoded, "4BsrHedHuForcKDhLdnLYDXgtQgQEj3EQVDtEhqa7o6ukFjW3shpTWv6PeKQdMp6af4ASjD4xQeZvXxLK5WUjguVMUf3xdJn7RnFeM7hdDJ56RDBM5PRJbRJVHjz6FJ7SVNTvr9y3gVYQtWx7NfKRxiyEAfq9JG7nqxSWaW6raMr9t35aVcdAVuXE9iXj3rzhVfCS69vVzy5KcFEK3mvDYG6L12V2CfviCydmeCvPw5r3zBUrZSQv7Ti4XFNBrPbk28gcqQwsBknBqasHxHqD9VUyPmBTuUyXq75QN8rhqN55NjxKBUw37tEUS1jKVpWnTeLFq1eRAMdXvjftNuQ5Bmm8Zc12PGWj9vdorBaYyvZXexJST5xNjR4SCkXvXZoRScETck95chv3VBn54jP8DpB4GGUmATFKSxpdtnNV64i1SQXW13KJwswthJvAaDiqevQLKLkvrTEAdb4BxEfPkFjDVti6P58rTZCMg5CTVLqdmWwpTSW5V");
+}
+
+#[test]
+fn test_solana_sign_create_token_account_with_priority_fee_price() {
+    // Corresponding Solana address: 7HP8cENhoDxS7yT6UHyT3mVwvN5rv6gMrzwRXXWFJvDU.
+    let private_key = "1eb5264f82747294e7481ecae700bd1d21e50db620bcf0d2af7582f712c71b40"
+        .decode_hex()
+        .unwrap();
+
+    let create_token_acc = Proto::CreateTokenAccount {
+        main_address: "7HP8cENhoDxS7yT6UHyT3mVwvN5rv6gMrzwRXXWFJvDU".into(),
+        // WBTC
+        token_mint_address: "3NZ9JMVBmGAqocybic2c7LQCJScmgsAZ6vQqTDzcqmJh".into(),
+        token_address: "94JfTH8qCeBQDBatvULREG43msjSQscT7oHnqx7jppX".into(),
+        ..Proto::CreateTokenAccount::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.into(),
+        recent_blockhash: "FgDiTexKSzxGudn6pupKZZRm6J2GFvM1vGf7hPH2WX6r".into(),
+        transaction_type: TransactionType::create_token_account_transaction(create_token_acc),
+        priority_fee_price: Some(Proto::PriorityFeePrice { price: 20 }),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://solscan.io/tx/5B2Zxu14wvr7CJJa4L3934cU9GEi82JHF1B9pDcHgtTeTPqBckyL12JSuZN224EAMCBGiCXEezT8fReQu4PVmHS
+    assert_eq!(output.encoded, "BtCPMKt9QUhF9cLrawa51GPZyY3GicQpaf1iX73sswSQ4t6gNNcoKM2kVkXne3Xcyzo3fRbuBxh6PsDEcBSi5TviDq7YZsS8usLchrGwCM41U1KqjsyABZSnwiyKNf4bUg77B3SiUqs5gWrH7s6QXJ4LDZvUMu3W9Hqo7uHbBkGGBPw4Pqjys1D963LnbBrSRHBRKuYLJauePJcQ9RoCNhWgy63RfuQMXyMLdVanUtiBCwY9BWxyFiwJTLvz2XbyY8CRruxQFvmDcyCSghMGvim8AKxah7EHgBzn9PTqfdRqYcdT3quHf6mfKCpxv13DuwbYUHAhQe4acCKQsV2ty3w6QtVaL9gND1CYp3rYpDcRXg8KyXrARcvyRmBU2oBsxyHyvwqxWarre8RZJxMKEHytYDo2Wkx36zgm8JZcruUajrZi4Z2RQNNhsKYSqU9AGzV31opPpa8YLa9hRFy3YmhrDGtBv897GqDV9eD5FiDkQsDAzH9JcSibaffPe3aK3E46fh");
+}
+
+#[test]
+fn test_solana_sign_token_transfer() {
+    let token_transfer = Proto::TokenTransfer {
+        token_mint_address: "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt".into(),
+        sender_token_address: "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP".into(),
+        recipient_token_address: "3WUX9wASxyScbA7brDipioKfXS1XEYkQ4vo3Kej9bKei".into(),
+        // 0.004
+        amount: 4000,
+        decimals: 6,
+        ..Proto::TokenTransfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"),
+        recent_blockhash: "CNaHfvqePgGYMvtYi9RuUdVxDYttr1zs4TWrTXYabxZi".into(),
+        transaction_type: TransactionType::token_transfer_transaction(token_transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://explorer.solana.com/tx/3vZ67CGoRYkuT76TtpP2VrtTPBfnvG2xj6mUTvvux46qbnpThgQDgm27nC3yQVUZrABFjT9Qo7vA74tCjtV5P9Xg
+    assert_eq!(output.encoded, "PGfKqEaH2zZXDMZLcU6LUKdBSzU1GJWJ1CJXtRYCxaCH7k8uok38WSadZfrZw3TGejiau7nSpan2GvbK26hQim24jRe2AupmcYJFrgsdaCt1Aqs5kpGjPqzgj9krgxTZwwob3xgC1NdHK5BcNwhxwRtrCphGEH7zUFpGFrFrHzgpf2KY8FvPiPELQyxzTBuyNtjLjMMreehSKShEjD9Xzp1QeC1pEF8JL6vUKzxMXuveoEYem8q8JiWszYzmTMfDk13JPgv7pXFGMqDV3yNGCLsWccBeSFKN4UKECre6x2QbUEiKGkHkMc4zQwwyD8tGmEMBAGm339qdANssEMNpDeJp2LxLDStSoWShHnotcrH7pUa94xCVvCPPaomF");
+}
+
+#[test]
+fn test_solana_sign_token_transfer_2pmvzp() {
+    let token_transfer = Proto::TokenTransfer {
+        token_mint_address: "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt".into(),
+        sender_token_address: "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP".into(),
+        recipient_token_address: "ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf".into(),
+        // 0.0061
+        amount: 6100,
+        decimals: 6,
+        ..Proto::TokenTransfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"),
+        recent_blockhash: "zMEbroNLJ4vfDTdQyA72rk35c7nPo4K38efHLujbSuz".into(),
+        transaction_type: TransactionType::token_transfer_transaction(token_transfer),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://explorer.solana.com/tx/2pMvzparE16evNgNhiexBfj15eurQgqFJXemYkuGasWV8RfT5tQseadqXA2VXbgGZPM1MpLcGwfkKKqvYvrKTmnR
+    assert_eq!(output.encoded, "LCtawaKHmvh9WEjYPFFMDQXsdKMQbVyK4Q3aRRfLCouqw6GE4p31PRPFoQqtazTziEj3ex3iLgnCspz1MN4SUE9d33g3HiiA6oCS6wGMvB2i3ojtmJzndCiLoDmuZgiuGouVSeS2MAEUoS3CRjdnbNKbRwgKn8YsDe1bZ57ueipfBLJfiE7xr8ji678uAv8FcMgo8Mq88SBGxVCUhjMS2VGQZhRUHHzDmvnzxhbbUzsLDfApzjHExkUm7ws3cQ2i1cSpQNCQWJd6rcDv1sYwDAavPS571Ny3CUq4cZxABh45Gj88LkRpzBMRdoebrh9hPy8ZRnu7PocBVjZytCgdF4CuhzdYNsmdcuU2WN5CEmv5zQ7pBrFdLZ8bBifP");
+}
+
+#[test]
+fn test_solana_sign_create_and_transfer_token() {
+    let create_transfer_token = Proto::CreateAndTransferToken {
+        recipient_main_address: "71e8mDsh3PR6gN64zL1HjwuxyKpgRXrPDUJT7XXojsVd".into(),
+        token_mint_address: "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt".into(),
+        recipient_token_address: "EF6L8yJT1SoRoDCkAZfSVmaweqMzfhxZiptKi7Tgj5XY".into(),
+        sender_token_address: "ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf".into(),
+        // 0.0029
+        amount: 2900,
+        decimals: 6,
+        ..Proto::CreateAndTransferToken::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c"),
+        recent_blockhash: "DMmDdJP41M9mw8Z4586VSvxqGCrqPy5uciF6HsKUVDja".into(),
+        transaction_type: TransactionType::create_and_transfer_token_transaction(
+            create_transfer_token,
+        ),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://explorer.solana.com/tx/449VaYo48LrkMJF6XVKt9sJwVQN6Seqrmh9erDCLtiuj6BgFG3wpF5TwjNkxgJ7qzNa6NTj3TFsU3h9hKszfkA7w
+    assert_eq!(output.encoded, "3Y2MVz2VVi7aEyC9q1awwdk1ModDBPHRSacKmTYnSgkmbbJeZ62Fub1bVPSHaTy4LUcQpzCQYhHAKtTKXUDYijEeLsMAUqPBEMAq1w8zCdqDpdXy6M4PuwNtYVV1WgqeiEsiMWpPp4BGWKfcziwFbmYueUGituacJq4wTnt92fho8mFi49XW64gEG4iNGScDtJkY7Geq8PKiLh1E9JMJoceiHxKbmxzCmmLTxEHdhySYHcDUSXnXWogZskeZNBMtR9dNjEMkCzEjrxRpBtJPtUNshciY45mDPNmw4j3xyLCBTRikyfFLc5g11r3UgyVD4YokoPRvrEXsgt6W3yjBshropBm6mY2eJYvfY2eZz4Yq8kLcUatCHVKtjcb1mP9Ww57KisJ9bRhipC8sodFaMYhZARMEa4a1u9eH4MyNUATRGNXarwQSBY46PWS3nKP6QBK7Dw7Ppp9MmYkdPcXKaLScbyLF3jKu6dHWMkHw3WdXSsM1wwXjXnWF9LxdwaEVcDmySWybj6aKD9QCWTU5kdncqJU56f7SYNRTN289WdUFGNDmSh56tj2v1");
+}
+
+#[test]
+fn test_solana_sign_create_and_transfer_token_2() {
+    let create_transfer_token = Proto::CreateAndTransferToken {
+        recipient_main_address: "3WUX9wASxyScbA7brDipioKfXS1XEYkQ4vo3Kej9bKei".into(),
+        token_mint_address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU".into(),
+        recipient_token_address: "BwTAyrCEdkjNyGSGVNSSGh6phn8KQaLN638Evj7PVQfJ".into(),
+        sender_token_address: "5sS5Z8GAdVHqZKRqEvpDauHvvLgbDveiyfi81uh25mrf".into(),
+        // 0.004
+        amount: 4000,
+        decimals: 6,
+        ..Proto::CreateAndTransferToken::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"),
+        recent_blockhash: "AfzzEC8NVXoxKoHdjXLDVzqwqvvZmgPuqyJqjuHiPY1D".into(),
+        transaction_type: TransactionType::create_and_transfer_token_transaction(
+            create_transfer_token,
+        ),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "2qkvFTcMk9kPaHtd7idJ1gJc4zTkuYDUJsC67kXvHjv3zwEyUx92QyhhSeBjL6h3Zaisj2nvTWid2UD1N9hbg9Ty7vSHLc7mcFVvy3yJmN9tz99iLKsf15rEeKUk3crXWLtKZEpcXJurN7vrxKwjQJnVob2RjyxwVfho1oNZ72BHvqToRM1W2KbcYhxK4d9zB4QY5tR2dzgCHWqAjf9Yov3y9mPBYCQBtw2GewrVMDbg5TK81E9BaWer3BcEafc3NCnRfcFEp7ZUXsGAgJYx32uUoJPP8ByTqBsp2JWgHyZhoz1WUUYRqWKZthzotErVetjSik4h5GcXk9Nb6kzqEf4nKEZ22eyrP5dv3eZMuGUUpMYUT9uF16T72s4TTwqiWDPFkidD33tACx74JKGoDraHEvEeAPrv6iUmC675kMuAV4EtVspVc5SnKXgRWRxb4dcH3k7K4ckjSxYZwg8UhTXUgPxA936jBr2HeQuPLmNVn2muA1HfL2DnyrobUP9vHpbL3HHgM2fckeXy8LAcjnoE9TTaAKX32wo5xoMj9wJmmtcU6YbXN4KgZ");
+}
+
+#[test]
+fn test_solana_sign_create_and_transfer_token_with_memo_and_references() {
+    let create_transfer_token = Proto::CreateAndTransferToken {
+        recipient_main_address: "71e8mDsh3PR6gN64zL1HjwuxyKpgRXrPDUJT7XXojsVd".into(),
+        token_mint_address: "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt".into(),
+        recipient_token_address: "EF6L8yJT1SoRoDCkAZfSVmaweqMzfhxZiptKi7Tgj5XY".into(),
+        sender_token_address: "ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf".into(),
+        // 0.0029
+        amount: 2900,
+        decimals: 6,
+        memo: "HelloSolanaMemo370".into(),
+        references: vec![
+            "CuieVDEDtLo7FypA9SbLM9saXFdb1dsshEkyErMqkRQq".into(),
+            "tFpP7tZUt6zb7YZPpQ11kXNmsc5YzpMXmahGMvCHhqS".into(),
+        ],
+        ..Proto::CreateAndTransferToken::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c"),
+        recent_blockhash: "DMmDdJP41M9mw8Z4586VSvxqGCrqPy5uciF6HsKUVDja".into(),
+        transaction_type: TransactionType::create_and_transfer_token_transaction(
+            create_transfer_token,
+        ),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "FuUw2MoEGPATE38roXAw9mGQhCfdsdpVDdhuf5h8LKc8iWj2HzNS3SteXqyUoZtQ7L1ufLvu7cTMwNzxT8snnVimcknsA52CeN7bgMz1Ad1hRTAr77zE5efzAi8B124kaQ1cBEb6nFMr5Zq4wwDRoJgBaiUaM1U9ZY6GofCKHGMQN7ZNqEFG4fFvPaMXB59dFtiqrtApBGzvDho3nGshyQWZVWfMY44hvVk45FqiGrXuqUwkiJqeRaDhooZdXiFR9ubwJLXo3Ux23ZyijWKXYNsx1Lm5zMFEgRz3kXhzxzb8uzHVSrFYNieXXCQEv1GtErMKeQWuAHcwS3zxC6avTnTWJhTz3kVSXfSTYEg4MF2MBWeGrzKZ7id88ZfbpG4ZwzsDsdUCSMV6YYRNmx9P3B6oC4DL7cbi2g8hwtBdeKojY4G6JMPeg629V9sPyg2KKeYxD3cjhMKAYtrsJEbixep4LZENtdQxmgZFouJVvGy9MVhiTzGEFVwm4G25p5FhWhiS9HxHWVRXpUFHi2K9K2ttoo4Ug39V9f8s9cG1Xb5A4bHhGSuKLeCCBcrBqPWEsuLdVhjxsKJrRBJhyrZ6mpxtDhUWivZa6skmEawTts9rN2aP3dXW3cNch3s3LTXZWXG9QPUARJJPy5QAYsBoR8GunF5FFgHVuEHVpjXAd8ku9f7aoF8RNiMnXAqQHxiM3ug6HZpLHLX8aGoUbJ7vVAnEDLH");
+}
+
+#[test]
+fn test_solana_sign_create_and_transfer_token_with_durable_nonce() {
+    let create_transfer_token = Proto::CreateAndTransferToken {
+        recipient_main_address: "3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe".into(),
+        token_mint_address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU".into(),
+        recipient_token_address: "93hbN3brRjZqRQTT9Xx6rAHVDFZFWD9ragFDXvDbTEjr".into(),
+        sender_token_address: "5sS5Z8GAdVHqZKRqEvpDauHvvLgbDveiyfi81uh25mrf".into(),
+        // 0.004
+        amount: 4000,
+        decimals: 6,
+        ..Proto::CreateAndTransferToken::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"),
+        recent_blockhash: "AaYfEmGQpfJWypZ8MNmBHTep1dwCHVYDRHuZ3gVFiJpY".into(),
+        transaction_type: TransactionType::create_and_transfer_token_transaction(
+            create_transfer_token,
+        ),
+        nonce_account: "6vNrYDm6EHcvBALY7HywuDWpTSc6uGt3y2nf5MuG1TmJ".into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "388uZws6GfA9aiH1LPsYBijGBEfLEgqe6q5NWVYhsmjXjrgZB4cScGuvja6nBL3i6qg6HA4a8ptW6aHsNKVdcBWKhjZjaTPH5heEThzwEsMDfnH2PWAUbqfiFgMZQRCkhyCj57hGUR7hBFPELfz3DBw5qMz1tnP9gU6KTqHUomu5UaadLHb2v5mbgTRcsMm3yDp2tzMwrp53VqvFNmHSau4ot4kdNL1jqEJC68Fj4ku6fMQaFSPyAeLQRF45ofYsFCa65fmtb4gBpqWUdqWLv5Dy6xQUQUDsin8qpEVds6unXw5f63UjZeD7XQdC6Vz5aq3e6P9ug8L41xc1rbuRU3Kp4arUKyqTsHMQ2dxMhPwEJLkHd4mFqqUWpYFTdfLFaNGU22hEkvP1esHUzaaGDmzAozbS96oaFw2jbHRRJtL8VjoA1aokGFFThM6M6mExuy8GhUXdGjxDFU83Dan1URmHMGBRC4J9RMZip9s1sktJw9Rj5Std9KVT8T7m4MxTVTx4QoBw6KAf6PgNHyHPtZSc7kzoCxDYNo2Myxvy8D95zk9YMp1MxeZXTDQ2aJuhWvfHhhrwgcQasAxRzbnJ9oehebVUNEcZEFsfnCgYuUmxWUemoKZnE1bNMCvERVkT5fKQ36e1rt5vTC2iES9jzr3hDC1Pk1");
+}
+
+#[test]
+fn test_solana_sign_create_nonce_account() {
+    let create_nonce_account = Proto::CreateNonceAccount {
+        nonce_account_private_key:
+            "2a9737aca3cde2dc0b4f3ae3487e3a90000490cb39fbc979da32b974ff5d7490"
+                .decode_hex()
+                .unwrap()
+                .into(),
+        rent: 10000000,
+        ..Proto::CreateNonceAccount::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: "044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "mFmK2xFMhzJJaUN5cctfdCizE9dtgcSASSEDh1Yzmat".into(),
+        transaction_type: TransactionType::create_nonce_account(create_nonce_account),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "3wu6xJSbb2NysVgi7pdfMgwVBT1knAdeCr9NR8EktJLoByzM4s9SMto2PPmrnbRqPtHwnpAKxXkC4vqyWY2dRBgdGGCC1bep6qN5nSLVzpPYAWUSq5cd4gfYMAVriFYRRNHmYUnEq8vMn4vjiECmZoHrpabBj8HpXGqYBo87sbZa8ZPCxUcB71hxXiHWZHj2rovx2kr75Uuv1buWXyW6M8uR4UNvQcPPvzVbwBG82RjDYTuancMSAxmrVNR8GLBQNhrCCYrZyte3EWgEyMQxxfW8T3xNXqnbgdfvFJ3UjRBxXj3hrmv17xEivTjfs81aG2AAi24yiYrk8ep7eQqwDHVSArsrynnwVKVNUcCQCnSy7fuiuS7FweFX8DEN1K9BrfecHyWrF15fYzhkmWSs64aH6ZTYHWPv5znhFKYmAuopGwbsBEb2j5p8NS3iJZ2skb2wi47n1rpLZfoCHWKxNiikkDUJTGQNcSDrGUMfeW5aGubJrCfecPKEo9Wo9kd36iSsxYPYSWNKrz2HTooa1rCRhqjXD8dyX3bXGV8TK6W2sEgf4JkcDnNoWQLbindcP8XR");
+}
+
+#[test]
+fn test_solana_sign_create_nonce_account_with_durable_nonce() {
+    let create_nonce_account = Proto::CreateNonceAccount {
+        nonce_account_private_key:
+            "2a9737aca3cde2dc0b4f3ae3487e3a90000490cb39fbc979da32b974ff5d7490"
+                .decode_hex()
+                .unwrap()
+                .into(),
+        rent: 10000000,
+        ..Proto::CreateNonceAccount::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: "044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "E6hvnoXU9QmfWaibMk9NuT6QRZdfzbs96WGc2hhttqXQ".into(),
+        transaction_type: TransactionType::create_nonce_account(create_nonce_account),
+        nonce_account: "ALAaqqt4Cc8hWH22GT2L16xKNAn6gv7XCTF7JkbfWsc".into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "Fr8FzXoH7h6Xo2La6SE49BEPzRX6f93Qn1cFA5E8n6z2GJtZdTU2BfyYGr1zv21Zkq7h68Z3Q96VnFyUVVd1hTWeq6tHDamF1JK5L23yEeUXpEWv1KziWvG9XbxfseHUyWETQck7SY2HbsT4KSjRX9suDaBh68Bu8c96CVN7KtgYPhUrKP62dAMHsf5qo7MESFN8wKJto94ANNCbQMzPmhig9nfiAfvfz9CqV4nbnSiqBGwo2XoyPknDK8RJ1UmA5ptfZ6w6Fy4UmJbQZWuZwpUrkEkfgLMNJ36McHkGAnjpyzq9gMtzb33xSjx1BqnbWXkKJdi8HyQAHTtvtqPz7DMsW9qx5fu3TNz6iC8YHG2HiynFCRjTtc2aH1rpJ9TLdFQEK8WrhdMFr3yW27cg6NB3JUFopUkDg2k5FwtzFyCdfifwebD7eswVNnqjoZxW59fHgY3BrBH8uNst8YAQWvRH77y5L6imVmFhezU5JUb5sF58gR1D8eAQhUcHueakZb5FkFCaMeioTpKrVGgcSNe9zkBMuquoUR3t4MVTiUSLa815qKoBCRmdexQDBt5RQbdQhYyVWn3ovjdhkwDGBU2zywRvottGCcEStQrUrSQDg1tMVKxX5G3sBtxYf");
+}
+
+#[test]
+fn test_solana_sign_withdraw_nonce_account() {
+    let withdraw_nonce = Proto::WithdrawNonceAccount {
+        nonce_account: "6vNrYDm6EHcvBALY7HywuDWpTSc6uGt3y2nf5MuG1TmJ".into(),
+        recipient: "3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe".into(),
+        value: 10000000,
+    };
+    let input = Proto::SigningInput {
+        private_key: "044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "5ccb7sRth3CP8fghmarFycr6VQX3NcfyDJsMFtmdkdU8".into(),
+        transaction_type: TransactionType::withdraw_nonce_account(withdraw_nonce),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "7gdEdDymvtfPfVgVvCTPzafmZc1Z8Zu4uXgJDLm8KGpLyPHysxFGjtFzimZDmGtNhQCh22Ygv3ZtPZmSbANbafikR3S1tvujatHW9gMo35jveq7TxwcGoNSqc7tnH85hkEZwnDryVaiKRvtCeH3dgFE9YqPHxiBuZT5eChHJvVNb9iTTdMsJXMusRtzeRV45CvrLKUvsAH7SSWHYW6bGow5TbEJie4buuz2rnbeVG5cxaZ6vyG2nJWHNuDPWZJTRi1MFEwHoxst3a5jQPv9UrG9rNZFCw4uZizVcG6HEqHWgQBu8gVpYpzFCX5SrhjGPZpbK3YmHhUEMEpJx3Fn7jX7Kt4t3hhhrieXppoqKNuqjeNVjfEf3Q8dJRfuVMLdXYbmitCVTPQzYKWBR6ERqWLYoAVqjoAS2pRUw1nrqi1HR");
+}
+
+#[test]
+fn test_solana_sign_withdraw_nonce_account_to_self_with_durable_nonce() {
+    let withdraw_nonce = Proto::WithdrawNonceAccount {
+        nonce_account: "6vNrYDm6EHcvBALY7HywuDWpTSc6uGt3y2nf5MuG1TmJ".into(),
+        recipient: "sp6VUqq1nDEuU83bU2hstmEYrJNipJYpwS7gZ7Jv7ZH".into(),
+        value: 10000000,
+    };
+    let input = Proto::SigningInput {
+        private_key: "044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        recent_blockhash: "5EtRPR4sTWRSwNUE5a5SnKB46ZqTJH8vgF1qZFTKGHvw".into(),
+        transaction_type: TransactionType::withdraw_nonce_account(withdraw_nonce),
+        nonce_account: "ALAaqqt4Cc8hWH22GT2L16xKNAn6gv7XCTF7JkbfWsc".into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "3rxbwm6dSX4SbFa7yitVQnoUGWkmRuQtg3V13a2jEAPfZZACCXZX2UFgWFpPqE7KfZSYhd5QE9TLzyikCwcmSBHhKXjMp4oktQXwRT66YaCK8rJdNzBUuS1D9tgHMkLUWKAR7ZRyWd3XvtQhe7nWD6YF6TRGoKPSuwsZAArBxogA7YddmEUKPsr2qjSKbjg7X5BbNceFwjEFAiafuizdSt7eGJHB5m9zJeYct8LCanTwJwyEVu1T9HTsgjW9hqHehqhCiHP46KGo63o7WAoappZvM4EJZemu4GfM6F6H48bPXF2z1QJz17wE6BYeMXfXuGkCRt5jYxrjdKuqvTDYV34X1HjZYUdrkW6mQotWDY3bS6zyAt784Vwzk2uiA8ytmWMbC24coUVwPSPGwZ92WJ6BpVCCtGDxLzp4CkahRu78UNWzdcEwPG6AUf");
+}
+
+#[test]
+fn test_solana_sign_advance_nonce_account() {
+    let advance_nonce = Proto::AdvanceNonceAccount {
+        nonce_account: "6vNrYDm6EHcvBALY7HywuDWpTSc6uGt3y2nf5MuG1TmJ".into(),
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"),
+        recent_blockhash: "4KQLRUfd7GEVXxAeDqwtuGTdwKd9zMfPycyAG3wJsdck".into(),
+        transaction_type: TransactionType::advance_nonce_account(advance_nonce),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "7YPgNzjCnUd2zBb6ZC6bf1YaoLjhJPHixLUdTjqMjq1YdzADJCx2wsTTBFFrqDKSHXEL6ntRq8NVJTQMGzGH5AQRKwtKtutehxesmtzkZCPY9ADZ4ijFyveLmTt7kjZXX7ZWVoUmKAqiaYsPTex728uMBSRJpV4zRw2yKGdQRHTKy2QFEb9acwLjmrbEgoyzPCarxjPhw21QZnNcy8RiYJB2mzZ9nvhrD5d2jB5TtdiroQPgTSdKFzkNEd7hJUKpqUppjDFcNHGK73FE9pCP2dKxCLH8Wfaez8bLtopjmWun9cbikxo7LZsarYzMXvxwZmerRd1");
+}
+
+#[test]
+fn test_solana_sign_token_transfer_with_external_fee_payer() {
+    let token_transfer = Proto::TokenTransfer {
+        token_mint_address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU".into(),
+        sender_token_address: "5sS5Z8GAdVHqZKRqEvpDauHvvLgbDveiyfi81uh25mrf".into(),
+        recipient_token_address: "AZapcpAZtEL1gQuC87F2L1hSfAZnAvNy1hHtJ8DJzySN".into(),
+        // 0.004
+        amount: 4000,
+        decimals: 6,
+        ..Proto::TokenTransfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"),
+        recent_blockhash: "H4gZ56AdmHfZj1F36oWrxDJMUJ8ph7XdTHtmsbtHZshG".into(),
+        transaction_type: TransactionType::token_transfer_transaction(token_transfer),
+        fee_payer_private_key: b58("66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c"),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+    assert_eq!(output.encoded, "ushDP6dNZWq32FASGqdnw7E8x14zFDAEZBViTyevUptV9yb4WSgpYzEGCxt9sXkrEtHVyww4F4GdcGZbPEaQTjAeyX5KGvHHDhWoPeFNnECzjUTuPj35dpF7zJ75Jx3ADfLQtUyzu5w7812fQvhwBwP8XDm3btqSG4VLWeQU5XuVqpg33Mq1L9zkGHQ8PZ4WkgNuSrC584EVnDcFE4rZsUtAv2jFTMjinQJB1qQEGTCHbjgdtJt8PzmXGXeczNyisPsEDrhZUw3g7RFYsgBDB1RFe1TxspzbWmxwr6CNPkGVsopmS6cbvSG9ejXY8xRYaswP7knAoPXwYk26yetoA824mzdv9vJ2RYpyK72EyCqFfFidm8MrJjFR49KwV3HRQKxZzYcvhYuJhR15GKBUWAQvYJTQQWArTi7pr7m84wNsV1mCUjrYsCVK47QtMAYvWU4toTxfgThngfF47awnpcSxfy8ggbwamq7qcaSH6cQVk1LPGo1iB5YxitSbaXP");
+}
+
+#[test]
+fn test_solana_sign_create_and_transfer_token_with_external_fee_payer() {
+    let create_transfer_token = Proto::CreateAndTransferToken {
+        recipient_main_address: "E54BymfdhXQtzDSGtgiJayauEMdB2gJjPqoDjzfbCXwj".into(),
+        token_mint_address: "4zMMC9srt5Ri5X14GAgXhaHii3GnPAEERYPJgZJDncDU".into(),
+        recipient_token_address: "Ay7G7Yb7ZCebCQdG39FxD1nFNDtqFWJCBgfd5Ek7DDcS".into(),
+        sender_token_address: "5sS5Z8GAdVHqZKRqEvpDauHvvLgbDveiyfi81uh25mrf".into(),
+        // 0.004
+        amount: 4000,
+        decimals: 6,
+        ..Proto::CreateAndTransferToken::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"),
+        recent_blockhash: "EsnN3ksLV6RLBW7qqgrvm2diwVJNTzL9QCuzm6tqWsU8".into(),
+        transaction_type: TransactionType::create_and_transfer_token_transaction(
+            create_transfer_token,
+        ),
+        fee_payer_private_key: b58("66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c"),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // https://explorer.solana.com/tx/7GZGFT2VA4dpJBBwjiMqj1o8yChDvoCsqnQ7xz4GxY513W3efxRqbB8y7g4tH2GEGQRx4vCkKipG1sMaDEen1A2?cluster=devnet
+    assert_eq!(output.encoded, "5sxFkQYd2FvqRU64N79A6xjJKNkgUsEEg2wKgai2NiK7A7hF3q5GYEbjQsYBG9S2MejwTENbwHzvypaa3D3cEkxvVTg19aJFWdCtXQiz42QF5fN2MuAb6eJR4KHFnzCtxxnYGtN9swZ5B5cMSPCffCRZeUTe3kooRmbTYPvSaemU6reVSM7X2beoFKPd2svrLFa8XnvhBwL9EiFWQ9WhHB2cDV7KozCnJAW9kdNDR4RbfFQxboANGo3ZGE5ddcZ6YdomATKze1TtHj2qzJEJRwxsRr3iM3iNFb4Eav5Q2n71KUriRf73mo44GQUPbQ2LvpZKf4V6M2PzxJwzBo7FiFZurPmsanT3U5efEsKnnueddbiLHedc8JXc1d3Z53sFxVGJpsGA8RR6thse9wUvaEWqXVtPbNA6NMao9DFGD6Dudza9pJXSobPc7mDHZmVmookf5vi6Lb9Y1Q4EgcEPQmbaDnKGGB6uGfZe629i3iKXRzAd2dB7mKfffhDadZ8S1eYGT3dhddV3ExRxcqDP9BAGQT3rkRw1JpeSSi7ziYMQ3vn4t3okdgQSq6rrpbPDUNG8tLSHFMAq3ydnh4Cb4ECKkYoz9SFAnXACUu4mWETxijuKMK9kHrTqPGk9weHTzobzCC8q8fcPWV3TcyUyMxsbVxh5q1p5h5tWfD9td5TZJ2HEUbTop2dA53ZF");
+}
+
+#[test]
+fn test_solana_sign_raw_message_legacy() {
+    let legacy = Proto::mod_RawMessage::MessageLegacy {
+        header: Some(Proto::mod_RawMessage::MessageHeader {
+            num_required_signatures: 1,
+            num_readonly_signed_accounts: 0,
+            num_readonly_unsigned_accounts: 1,
+        }),
+        account_keys: vec![
+            "7v91N7iZ9mNicL8WfG6cgSCKyRXydQjLh6UYBWwm6y1Q".into(),
+            "EN2sCsJ1WDV8UFqsiTXHcUPUxQ4juE71eCknHYYMifkd".into(),
+            "11111111111111111111111111111111".into(),
+        ],
+        recent_blockhash: "11111111111111111111111111111111".into(),
+        instructions: vec![Proto::mod_RawMessage::Instruction {
+            program_id: 2,
+            accounts: vec![0, 1],
+            program_data: "020000002a00000000000000".decode_hex().unwrap().into(),
+        }],
+    };
+
+    let raw_message = Proto::RawMessage {
+        signatures: Vec::default(),
+        message: Proto::mod_RawMessage::OneOfmessage::legacy(legacy),
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr"),
+        raw_message: Some(raw_message),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "3p2kzZ1DvquqC6LApPuxpTg5CCDVPqJFokGSnGhnBHrta4uq7S2EyehV1XNUVXp51D69GxGzQZUjikfDzbWBG2aFtG3gHT1QfLzyFKHM4HQtMQMNXqay1NAeiiYZjNhx9UvMX4uAQZ4Q6rx6m2AYfQ7aoMUrejq298q1wBFdtS9XVB5QTiStnzC7zs97FUEK2T4XapjF1519EyFBViTfHpGpnf5bfizDzsW9kYUtRDW1UC2LgHr7npgq5W9TBmHf9hSmRgM9XXucjXLqubNWE7HUMhbKjuBqkirRM");
+}
+
+#[test]
+fn test_solana_sign_raw_message_v0() {
+    let v0 = Proto::mod_RawMessage::MessageV0 {
+        header: Some(Proto::mod_RawMessage::MessageHeader {
+            num_required_signatures: 1,
+            num_readonly_signed_accounts: 0,
+            num_readonly_unsigned_accounts: 1,
+        }),
+        account_keys: vec![
+            "6pEfiZjMycJY4VA2FtAbKgYvRwzXDpxY58Xp4b7FQCz9".into(),
+            "11111111111111111111111111111111".into(),
+        ],
+        recent_blockhash: "HxKwWFTHixCu8aw35J1uxAX6yUhLHkFCdJJdK4y98Gyj".into(),
+        instructions: vec![Proto::mod_RawMessage::Instruction {
+            program_id: 1,
+            accounts: vec![0, 0],
+            program_data: "020000008813000000000000".decode_hex().unwrap().into(),
+        }],
+        address_table_lookups: Vec::default(),
+    };
+
+    let raw_message = Proto::RawMessage {
+        signatures: Vec::default(),
+        message: Proto::mod_RawMessage::OneOfmessage::v0(v0),
+    };
+    let input = Proto::SigningInput {
+        private_key: "833a053c59e78138a3ed090459bc6743cca6a9cbc2809a7bf5dbc7939b8775c8"
+            .decode_hex()
+            .unwrap()
+            .into(),
+        raw_message: Some(raw_message),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://explorer.solana.com/tx/4ffBzXxLPYEEdCYpQGETkCTCCsH6iTdmKzwUZXZZgFemdhRpxQwboguFFoKCeGF3SsZPzuwwE7LbRwLgJbsyRqyP?cluster=testnet
+    assert_eq!(output.encoded, "6NijVxwQoDjqt6A41HXCK9kXwNDp48uLgvRyE8uz6NY5dEzaEDLzjzuMnc5TGatHZZUXehKrzUGzbg9jPSdn6pVsMc9TXNH6JGe5RJLmHwWey3MC1p8Hs2zhjw5P439P57NToatraDX9ZwvBtK4EzZzRjWbyGdicheTPjeYKCzvPCLxDkTFtPCM9VZGGXSN2Bne92NLDvf6ntNm5pxsPkZGxPe4w9Eq26gkE83hZyrYXKaiDh8TbqbHatSkw");
+}
+
+#[test]
+fn test_solana_sign_create_and_transfer_token_2022() {
+    let create_transfer_token: Proto::CreateAndTransferToken = Proto::CreateAndTransferToken {
+        recipient_main_address: "EbHdsfVpWzeQV4TceYQ2xENS8meBHyztyTKVSFtgHPUw".into(),
+        token_mint_address: "BSQCmMAFB9itonyVSLsUxX92Ne1rgBZFqothBk3q91k6".into(),
+        recipient_token_address: "FzsLNpzsLMBbm1LWpM6P3W4tKrCkd8KqnMmADNvArW5d".into(),
+        sender_token_address: "EQxRyhzjyhRX4TJXt7FmQ3HfFdRcu49krjxHMszidQYS".into(),
+        amount: 1000000000,
+        decimals: 9,
+        token_program_id: Proto::TokenProgramId::Token2022Program,
+        ..Proto::CreateAndTransferToken::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("MCyXa2gTJELxTPemyVi5ydDcQ3vVgFyddQYXj6UM3tw"),
+        recent_blockhash: "5oba9g5nWnvutTTb935aBMkHBYGXoak1ot4U2p34zEiJ".into(),
+        transaction_type: TransactionType::create_and_transfer_token_transaction(
+            create_transfer_token,
+        ),
+        ..Proto::SigningInput::default()
+    };
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "2xzg9AVGv8wWEn9S4m8954WSzh2MUQPCTCyFmyrSs4DJCkSaZRMAbGL8NcyDeJFT3RwUabHsX1m5CFuqzJ5Jg9knNwG6uBjYjWjNjGLBEBURa3ARqziaMAL2mZY8uZwaZETE33WZeSxNrm7zv1jJYLfqbWxquEedGND9vB9AuEspHg7TCZxfJbzY4W8QtLqyQ598z9adxWgwNXanHzqu7B4bNsp1wfKPPyx8AGQaVSx6fepaevDEZX9h2Rg1daW9TjVpktp7EHrriYVs4m44WJ18fejWLyqituXqQPdhos5oZ3e5vNXE8KcgARKXtwsXCGwwKwc9ZEVNvUp6qyUZZV8os2FHorodrT9g3Xrso5dgdsRCb42AUrKHyDdXMpRA1PmeZX6UdzgL8knt2xfzCFxzGPuMKeTtvZKFcEPJvNg73CSMPVH1mm3jz75nATdChR7xu5R4m5Gy8vhr5ndEnb8fM5P1gv6hDbfmesAEf5wye4mKTVAC4B8Mhf8WC8YNaGUG7CcxeQZXrjEfUQenboArhqbxqHFYrURK3GJLAQojXmkwSMGwv4TYL");
+}
+
+#[test]
+fn test_solana_sign_transfer_token_2022() {
+    let transfer_token: Proto::TokenTransfer = Proto::TokenTransfer {
+        amount: 1000000000,
+        decimals: 9,
+        token_program_id: Proto::TokenProgramId::Token2022Program,
+        token_mint_address: "BSQCmMAFB9itonyVSLsUxX92Ne1rgBZFqothBk3q91k6".into(),
+        sender_token_address: "EQxRyhzjyhRX4TJXt7FmQ3HfFdRcu49krjxHMszidQYS".into(),
+        recipient_token_address: "FzsLNpzsLMBbm1LWpM6P3W4tKrCkd8KqnMmADNvArW5d".into(),
+        ..Proto::TokenTransfer::default()
+    };
+    let input = Proto::SigningInput {
+        private_key: b58("MCyXa2gTJELxTPemyVi5ydDcQ3vVgFyddQYXj6UM3tw"),
+        recent_blockhash: "9U2eTS9b2Essvo1s5hDmwgC1atkSCCUipj2FemLvdWbj".into(),
+        transaction_type: TransactionType::token_transfer_transaction(transfer_token),
+        ..Proto::SigningInput::default()
+    };
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, "SAXNFUd7dNBu956Gi4XNuvMkKKjS9vp6puz45ErYMHFpMNwC3AQxDxGbweXt4GzY2FnUZ6ubm231NrdwWa8dg9bqgRMaHPLuPiy99YwtvcQ1E6mHxHqq8nL5VaN8wiVnrMU57zCLfHsSsVCHZc5peHHAPXMDE318uMCLLBwgDWuD1FfAvUAyXRSYniXzWG3jtBdDhuDohh13E2TMrtqTcKVv3crejFqFjtsNuW7KCqrZwxCv1ASNiiL2XScQBdHwStyjH2UTqLmT6wjGLiDYy7PZ88Tbz65r8NLr4Vb1aYSTChasfVjMLdybetfNaf4nJuBE4ZuXca7W66txKbHesxQbzrjUCXX12JFbKyaA8KJKBpbgkc9jWJjQkzyn");
+    // https://explorer.solana.com/tx/Lg1xWzsC9GatQMu1ZXv23t7snC92RRvbKJe22bsS76GUb8C8a9q3HPkiUnFoK6AWKSoNSsmko1EBnvKkCnL8b7w?cluster=devnet
+}
diff --git a/rust/tw_tests/tests/chains/solana/solana_transaction.rs b/rust/tw_tests/tests/chains/solana/solana_transaction.rs
new file mode 100644
index 00000000000..27b0ab7e91e
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/solana_transaction.rs
@@ -0,0 +1,335 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::borrow::Cow;
+use tw_any_coin::test_utils::sign_utils::{AnySignerHelper, CompilerHelper, PreImageHelper};
+use tw_any_coin::test_utils::transaction_decode_utils::TransactionDecoderHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::base58::{self, Alphabet};
+use tw_encoding::base64::{self, STANDARD};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Solana::Proto;
+use tw_proto::Solana::Proto::mod_RawMessage as raw_message;
+use tw_proto::Solana::Proto::mod_RawMessage::OneOfmessage as MessageType;
+
+fn b58(s: &str) -> Cow<'static, [u8]> {
+    base58::decode(s, Alphabet::Bitcoin).unwrap().into()
+}
+
+fn check_and_update_recent_blockhash(
+    tx: &mut Proto::RawMessage,
+    expected_prev: &str,
+    updated: &str,
+) {
+    let recent_blockhash = match tx.message {
+        MessageType::legacy(ref mut legacy) => &mut legacy.recent_blockhash,
+        MessageType::v0(ref mut v0) => &mut v0.recent_blockhash,
+        MessageType::None => unreachable!(),
+    };
+    assert_eq!(recent_blockhash, expected_prev);
+    *recent_blockhash = updated.to_string().into();
+}
+
+const PREV_RECENT_BLOCKHASH: &str = "H4gZ56AdmHfZj1F36oWrxDJMUJ8ph7XdTHtmsbtHZshG";
+const NEW_RECENT_BLOCKHASH: &str = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg";
+
+const SENDER_PRIVATE_KEY: &str = "9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5";
+const SENDER_PUBLIC_KEY: &str = "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V";
+const FEE_PAYER_PRIVATE_KEY: &str = "66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c";
+const FEE_PAYER_PUBLIC_KEY: &str = "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ";
+
+const PREV_SENDER_SIGNATURE: &str =
+    "37UT8U6DdqaWqV6yQuHcRN3JpMefDgVna8LJJPmmDNKYMwmefEgvcreSg9AqSsT7cU2rMBNyDktEtDU19ZqqZvML";
+const NEW_SENDER_SIGNATURE: &str =
+    "3aqBe5B9uj9PBdhLwbdDkH5X9Wa2E49bDvjaMJyZWj68TeQvAavw9dizTuUkRLLqucgA4NP9SDtT261bPXoHAHEj";
+const PREV_FEE_PAYER_SIGNATURE: &str =
+    "3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej";
+const NEW_FEE_PAYER_SIGNATURE: &str =
+    "2DaVFTx5i3fuvBvyt3s3ti4FajmYa8DCcur5Bjf9cgoFA9CnQRM6RNLTrMQ537WmRkQw9Qw3iojfxVrzQy7jWxT7";
+
+/// https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+const PREV_ENCODED_TX: &str = "AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG";
+const NEW_ENCODED_TX: &str = "Ajzc/Tke0CG8Cew5qFa6xZI/7Ya3DN0M8Ige6tKPsGzhg8Bw9DqL18KUrEZZ1F4YqZBo4Rv+FsDT8A7Nss7p4A6BNVZzzGprCJqYQeNg0EVIbmPc6mDitNniHXGeKgPZ6QZbM4FElw9O7IOFTpOBPvQFeqy0vZf/aayncL8EK/UEAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG";
+const ENCODED_UNSIGNED_MSG: &str = "AgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG";
+
+#[test]
+fn test_solana_decode_transaction() {
+    let encoded_tx = base64::decode("AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAHEIoR5xuWyrvjIW4xU7CWlPOfyFAiy8B295hGo6tNjBmRCgUkQaFYTleMcAX2p74eBXQZd1dwDyQZAPJfSv2KGc5kcFLJj5qd2BVMaSNGVPfVBm74GbLwUq5/U1Ccdqc2gokZQxRDpMq7aeToP3nRaWIP4RXMxN+LJetccXMPq/QumgOqt7kkqk07cyPCKgYoQ4fQtOqqZn5sEqjWHYj3CDS5ha48uggePWu090s1ff4yoCjAvULeZ+cqYFn+Adk5Teyfw71W3u/F6VTnLQEPW96gJr5Kcm3bGi08n224JyF++PTko52VL0CIM2xtl0WkvNslD6Wawxr7yd9HYllN4Lz8lFwXilWGgyJdOq1qqBuZbE49glHeCO/sJHNnIHC0BgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAEedVb8jHAbu50xW7OaBUH/bGy3qP0jlECsc2iVrwTjwbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpjJclj04kifG7PRApFI4NgwtaE5na/xCEBI572Nvp+Fm0P/on9df2SnTAmx8pWHneSwmrNt/J3VFLMhqns4zl6OL4d+g9rsaIj0Orta57MRu3jDSWCJf85ae4LBbiD/GXvOojZjsHekJrpRUuPggLJr943hDVD5UareeEucjCvaoHCgAFAsBcFQAKAAkDBBcBAAAAAAANBgAGACMJDAEBCQIABgwCAAAAAMqaOwAAAAAMAQYBEQs1DA8ABgEFAiMhCwsOCx0MDxoBGQcYBAgDJBscDB4PBwUQEhEfFR8UFwcFISITHw8MDCAfFgstwSCbM0HWnIEAAwAAABEBZAABCh0BAyZHAQMAypo7AAAAAJaWFAYAAAAAMgAADAMGAAABCQPZoILFk7gfE2y5bt3AC+g/4OwNzdiHKBhIbdeYvYFEjQPKyMkExMUkx0R25UNa/g5KsG0vfUwdUJ8e8HecK/Jkd3qm9XefBOB0BaD1+J+dBJz09vfyGuRYZH09HfdE/kL8v6Ql+H03+tO+9lMmmVg8O1c6gAN6eX0Cbn4=", STANDARD).unwrap();
+
+    // Step 1: Decode the transaction.
+
+    let mut decoder = TransactionDecoderHelper::<Proto::DecodingTransactionOutput>::default();
+    let output = decoder.decode(CoinType::Solana, encoded_tx);
+
+    assert_eq!(output.error, SigningError::OK);
+
+    let expected_msg = raw_message::MessageV0 {
+        header: Some(raw_message::MessageHeader {
+            num_required_signatures: 1,
+            num_readonly_signed_accounts: 0,
+            num_readonly_unsigned_accounts: 7,
+        }),
+        account_keys: vec![
+            "AHy6YZA8BsHgQfVkk7MbwpAN94iyN7Nf1zN4nPqUN32Q".into(),
+            "g7dD1FHSemkUQrX1Eak37wzvDjscgBW2pFCENwjLdMX".into(),
+            "7m57LBTxtzhWn6WdFxKtnoJLBQXyNERLYebebXLVaKy3".into(),
+            "AEBCPtV8FFkWFAKxrz7mbYvobpkZuWaRWQCyJVRaheUD".into(),
+            "BND2ehwWVeHVA5EtMm2b7Vu51AT8f2PNWusS9KQX5moy".into(),
+            "DVCeozFGbe6ew3eWTnZByjHeYqTq1cvbrB7JJhkLxaRJ".into(),
+            "GvgWmk8iPACw1AEMt47WzkuTkKoSGbn4Xk3aLM8vdbJD".into(),
+            "HkphEpUqnFBxBuCPEq5j1HA9L8EwmsmRT6UcFKziptM1".into(),
+            "Hzxx6b5a7dmmJeDXLQzr4dTrc2HGK9ar5YRakZgr3ZZ7".into(),
+            "11111111111111111111111111111111".into(),
+            "ComputeBudget111111111111111111111111111111".into(),
+            "JUP6LkbZbjS1jKKwapdHNy74zcZ3tLUZoi5QNyVTaV4".into(),
+            "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA".into(),
+            "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL".into(),
+            "D8cy77BBepLMngZx6ZukaTff5hCt1HrWyKk3Hnd9oitf".into(),
+            "GGztQqQ6pCPaJQnNpXBgELr5cs3WwDakRbh1iEMzjgSJ".into(),
+        ],
+        recent_blockhash: "DiSimxK2z1cRa6yD4goqte3rDMmghJAD8WDUZEab2CzD".into(),
+        instructions: vec![
+            raw_message::Instruction {
+                program_id: 10,
+                accounts: vec![],
+                program_data: b58("K1FDJ7"),
+            },
+            raw_message::Instruction {
+                program_id: 10,
+                accounts: vec![],
+                program_data: b58("3E9ErJ5MrzbZ"),
+            },
+            raw_message::Instruction {
+                program_id: 13,
+                accounts: vec![0, 6, 0, 35, 9, 12],
+                program_data: b58("2"),
+            },
+            raw_message::Instruction {
+                program_id: 9,
+                accounts: vec![0, 6],
+                program_data: b58("3Bxs3zzLZLuLQEYX"),
+            },
+            raw_message::Instruction {
+                program_id: 12,
+                accounts: vec![6],
+                program_data: b58("J"),
+            },
+            raw_message::Instruction {
+                program_id: 11,
+                accounts: vec![
+                    12, 15, 0, 6, 1, 5, 2, 35, 33, 11, 11, 14, 11, 29, 12, 15, 26, 1, 25, 7, 24, 4,
+                    8, 3, 36, 27, 28, 12, 30, 15, 7, 5, 16, 18, 17, 31, 21, 31, 20, 23, 7, 5, 33,
+                    34, 19, 31, 15, 12, 12, 32, 31, 22, 11,
+                ],
+                program_data: b58("5n9zLuyvSGkuf4iDD6PfDvzvzehUkDghmApUkZSXSx57jF9RGSH5Y23tzFJDG3"),
+            },
+            raw_message::Instruction {
+                program_id: 12,
+                accounts: vec![6, 0, 0],
+                program_data: b58("A"),
+            },
+        ],
+        address_table_lookups: vec![
+            raw_message::MessageAddressTableLookup {
+                account_key: "FeXRmSWmwChZbB2EC7Qjw9XKk28yBrPj3k3nzT1DKfak".into(),
+                writable_indexes: vec![202, 200, 201],
+                readonly_indexes: vec![196, 197, 36, 199],
+            },
+            raw_message::MessageAddressTableLookup {
+                account_key: "5cFsmTCEfmvpBUBHqsWZnf9n5vTWLYH2LT8X7HdShwxP".into(),
+                writable_indexes: vec![160, 245, 248, 159, 157],
+                readonly_indexes: vec![156, 244, 246, 247],
+            },
+            raw_message::MessageAddressTableLookup {
+                account_key: "HJ5StCvsDU4JsvK39VcsHjaoTRTtQU749MQ9qUsJaG1m".into(),
+                writable_indexes: vec![122, 121, 125],
+                readonly_indexes: vec![110, 126],
+            },
+        ],
+    };
+    let expected = Proto::RawMessage {
+        signatures: vec![Proto::PubkeySignature {
+            pubkey: "AHy6YZA8BsHgQfVkk7MbwpAN94iyN7Nf1zN4nPqUN32Q".into(),
+            signature: "1111111111111111111111111111111111111111111111111111111111111111".into(),
+        }],
+        message: MessageType::v0(expected_msg),
+    };
+
+    assert_eq!(output.transaction, Some(expected));
+}
+
+#[test]
+fn test_solana_decode_transaction_update_blockhash_and_sign_with_external_fee_payer() {
+    // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+    let encoded_tx = base64::decode(PREV_ENCODED_TX, STANDARD).unwrap();
+
+    // Step 1: Decode the transaction.
+    let mut decoder = TransactionDecoderHelper::<Proto::DecodingTransactionOutput>::default();
+    let output = decoder.decode(CoinType::Solana, encoded_tx);
+
+    assert_eq!(output.error, SigningError::OK);
+    let mut decoded_tx = output.transaction.unwrap();
+
+    let expected_signatures = vec![
+        Proto::PubkeySignature {
+            pubkey: FEE_PAYER_PUBLIC_KEY.into(),
+            signature: PREV_FEE_PAYER_SIGNATURE.into(),
+        },
+        Proto::PubkeySignature {
+            pubkey: SENDER_PUBLIC_KEY.into(),
+            signature: PREV_SENDER_SIGNATURE.into(),
+        },
+    ];
+    assert_eq!(decoded_tx.signatures, expected_signatures);
+
+    // Step 2. Update the recent-blockhash.
+
+    check_and_update_recent_blockhash(&mut decoded_tx, PREV_RECENT_BLOCKHASH, NEW_RECENT_BLOCKHASH);
+
+    // Step 3. Re-sign the updated transaction.
+
+    let input = Proto::SigningInput {
+        private_key: b58(SENDER_PRIVATE_KEY),
+        fee_payer_private_key: b58(FEE_PAYER_PRIVATE_KEY),
+        raw_message: Some(decoded_tx),
+        tx_encoding: Proto::Encoding::Base64,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, NEW_ENCODED_TX);
+}
+
+/// The test is similar to `test_solana_decode_transaction_update_blockhash_and_resign_with_external_fee_payer`,
+/// but with only difference that the external fee payer private key is not specified,
+/// and the corresponding signature is set at [`RawMessage::signatures`].
+#[test]
+fn test_solana_decode_transaction_update_blockhash_and_sign_with_external_fee_payer_signature() {
+    // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+    let encoded_tx = base64::decode(PREV_ENCODED_TX, STANDARD).unwrap();
+
+    // Step 1: Decode the transaction.
+    let mut decoder = TransactionDecoderHelper::<Proto::DecodingTransactionOutput>::default();
+    let output = decoder.decode(CoinType::Solana, encoded_tx);
+
+    assert_eq!(output.error, SigningError::OK);
+    let mut decoded_tx = output.transaction.unwrap();
+
+    let expected_signatures = vec![
+        Proto::PubkeySignature {
+            pubkey: FEE_PAYER_PUBLIC_KEY.into(),
+            signature: PREV_FEE_PAYER_SIGNATURE.into(),
+        },
+        Proto::PubkeySignature {
+            pubkey: SENDER_PUBLIC_KEY.into(),
+            signature: PREV_SENDER_SIGNATURE.into(),
+        },
+    ];
+    assert_eq!(decoded_tx.signatures, expected_signatures);
+
+    // Step 2. Update the recent-blockhash and external fee payer signature.
+
+    decoded_tx.signatures[0].signature = NEW_FEE_PAYER_SIGNATURE.into();
+
+    check_and_update_recent_blockhash(&mut decoded_tx, PREV_RECENT_BLOCKHASH, NEW_RECENT_BLOCKHASH);
+
+    // Step 3. Re-sign the updated transaction.
+
+    let input = Proto::SigningInput {
+        private_key: b58(SENDER_PRIVATE_KEY),
+        // Do not set the fee payer private key to test if the [`RawMessage::signatures`] is used instead.
+        // fee_payer_private_key: b58(FEE_PAYER_PRIVATE_KEY),
+        raw_message: Some(decoded_tx),
+        tx_encoding: Proto::Encoding::Base64,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.encoded, NEW_ENCODED_TX);
+}
+
+#[test]
+fn test_solana_decode_transaction_update_blockhash_and_sign_no_matching_pubkey() {
+    let encoded_tx = base64::decode("AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAHEIoR5xuWyrvjIW4xU7CWlPOfyFAiy8B295hGo6tNjBmRCgUkQaFYTleMcAX2p74eBXQZd1dwDyQZAPJfSv2KGc5kcFLJj5qd2BVMaSNGVPfVBm74GbLwUq5/U1Ccdqc2gokZQxRDpMq7aeToP3nRaWIP4RXMxN+LJetccXMPq/QumgOqt7kkqk07cyPCKgYoQ4fQtOqqZn5sEqjWHYj3CDS5ha48uggePWu090s1ff4yoCjAvULeZ+cqYFn+Adk5Teyfw71W3u/F6VTnLQEPW96gJr5Kcm3bGi08n224JyF++PTko52VL0CIM2xtl0WkvNslD6Wawxr7yd9HYllN4Lz8lFwXilWGgyJdOq1qqBuZbE49glHeCO/sJHNnIHC0BgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAEedVb8jHAbu50xW7OaBUH/bGy3qP0jlECsc2iVrwTjwbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpjJclj04kifG7PRApFI4NgwtaE5na/xCEBI572Nvp+Fm0P/on9df2SnTAmx8pWHneSwmrNt/J3VFLMhqns4zl6OL4d+g9rsaIj0Orta57MRu3jDSWCJf85ae4LBbiD/GXvOojZjsHekJrpRUuPggLJr943hDVD5UareeEucjCvaoHCgAFAsBcFQAKAAkDBBcBAAAAAAANBgAGACMJDAEBCQIABgwCAAAAAMqaOwAAAAAMAQYBEQs1DA8ABgEFAiMhCwsOCx0MDxoBGQcYBAgDJBscDB4PBwUQEhEfFR8UFwcFISITHw8MDCAfFgstwSCbM0HWnIEAAwAAABEBZAABCh0BAyZHAQMAypo7AAAAAJaWFAYAAAAAMgAADAMGAAABCQPZoILFk7gfE2y5bt3AC+g/4OwNzdiHKBhIbdeYvYFEjQPKyMkExMUkx0R25UNa/g5KsG0vfUwdUJ8e8HecK/Jkd3qm9XefBOB0BaD1+J+dBJz09vfyGuRYZH09HfdE/kL8v6Ql+H03+tO+9lMmmVg8O1c6gAN6eX0Cbn4=", STANDARD).unwrap();
+
+    // Step 1: Decode the transaction.
+    let mut decoder = TransactionDecoderHelper::<Proto::DecodingTransactionOutput>::default();
+    let output = decoder.decode(CoinType::Solana, encoded_tx);
+
+    assert_eq!(output.error, SigningError::OK);
+    let mut decoded_tx = output.transaction.unwrap();
+
+    // Step 2. Clear previous signatures.
+    decoded_tx.signatures.clear();
+
+    // Step 3. Re-sign the updated transaction.
+
+    let input = Proto::SigningInput {
+        // There is no matching pubkey in the transaction account keys.
+        private_key: b58("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr"),
+        raw_message: Some(decoded_tx),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, input);
+
+    assert_eq!(output.error, SigningError::Error_missing_private_key);
+}
+
+#[test]
+fn test_solana_decode_transaction_update_blockhash_preimage_hash_and_compile() {
+    // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+    let encoded_tx = base64::decode(PREV_ENCODED_TX, STANDARD).unwrap();
+
+    // Step 1: Decode the transaction.
+    let mut decoder = TransactionDecoderHelper::<Proto::DecodingTransactionOutput>::default();
+    let decode_output = decoder.decode(CoinType::Solana, encoded_tx);
+
+    assert_eq!(decode_output.error, SigningError::OK);
+    let mut decoded_tx = decode_output.transaction.unwrap();
+
+    // Step 2. Update recent blockhash.
+    check_and_update_recent_blockhash(&mut decoded_tx, PREV_RECENT_BLOCKHASH, NEW_RECENT_BLOCKHASH);
+
+    // Step 3. Pre-image hash the transaction.
+
+    let input = Proto::SigningInput {
+        raw_message: Some(decoded_tx),
+        tx_encoding: Proto::Encoding::Base64,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut preimager = PreImageHelper::<Proto::PreSigningOutput>::default();
+    let preimage_output = preimager.pre_image_hashes(CoinType::Solana, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    let expected_unsigned_msg = base64::decode(ENCODED_UNSIGNED_MSG, STANDARD).unwrap();
+    assert_eq!(preimage_output.data, expected_unsigned_msg);
+
+    // Step 4. Compile the updated transaction with signatures.
+
+    let fee_payer_pubkey = b58(FEE_PAYER_PUBLIC_KEY).to_vec();
+    let sender_pubkey = b58(SENDER_PUBLIC_KEY).to_vec();
+
+    let fee_payer_signature = b58(NEW_FEE_PAYER_SIGNATURE).to_vec();
+    let sender_signature = b58(NEW_SENDER_SIGNATURE).to_vec();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let compile_output = compiler.compile(
+        CoinType::Solana,
+        &input,
+        vec![fee_payer_signature, sender_signature],
+        vec![fee_payer_pubkey, sender_pubkey],
+    );
+
+    assert_eq!(compile_output.error, SigningError::OK);
+    assert_eq!(compile_output.encoded, NEW_ENCODED_TX);
+}
diff --git a/rust/tw_tests/tests/chains/solana/solana_transaction_ffi.rs b/rust/tw_tests/tests/chains/solana/solana_transaction_ffi.rs
new file mode 100644
index 00000000000..a9a31f80da0
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/solana_transaction_ffi.rs
@@ -0,0 +1,285 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_any_coin::test_utils::transaction_decode_utils::TransactionDecoderHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::base64::STANDARD;
+use tw_encoding::hex::DecodeHex;
+use tw_encoding::{base58, base64};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_data_vector_helper::TWDataVectorHelper;
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Solana::Proto::{self};
+use tw_solana::SOLANA_ALPHABET;
+use wallet_core_rs::ffi::solana::transaction::{
+    tw_solana_transaction_get_compute_unit_limit, tw_solana_transaction_get_compute_unit_price,
+    tw_solana_transaction_set_compute_unit_limit, tw_solana_transaction_set_compute_unit_price,
+    tw_solana_transaction_update_blockhash_and_sign,
+};
+
+#[test]
+fn test_solana_transaction_update_blockhash_and_sign_token_transfer_with_external_fee_payer() {
+    // base64 encoded
+    // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+    let encoded_tx = "AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG";
+    let encoded_tx = TWStringHelper::create(encoded_tx);
+
+    // base58 encoded
+    let new_blockhash = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg";
+    let new_blockhash = TWStringHelper::create(new_blockhash);
+
+    let my_private_key = base58::decode(
+        "9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5",
+        SOLANA_ALPHABET,
+    )
+    .unwrap();
+    let fee_payer_private_key = base58::decode(
+        "66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c",
+        SOLANA_ALPHABET,
+    )
+    .unwrap();
+    let private_keys = TWDataVectorHelper::create([fee_payer_private_key, my_private_key]);
+
+    let output_data = unsafe {
+        TWDataHelper::wrap(tw_solana_transaction_update_blockhash_and_sign(
+            encoded_tx.ptr(),
+            new_blockhash.ptr(),
+            private_keys.ptr(),
+        ))
+        .to_vec()
+        .expect("Expected a non-null output data")
+    };
+    let output: Proto::SigningOutput = tw_proto::deserialize(&output_data).unwrap();
+    assert_eq!(output.error, SigningError::OK);
+
+    let expected = "Ajzc/Tke0CG8Cew5qFa6xZI/7Ya3DN0M8Ige6tKPsGzhg8Bw9DqL18KUrEZZ1F4YqZBo4Rv+FsDT8A7Nss7p4A6BNVZzzGprCJqYQeNg0EVIbmPc6mDitNniHXGeKgPZ6QZbM4FElw9O7IOFTpOBPvQFeqy0vZf/aayncL8EK/UEAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG";
+    assert_eq!(output.encoded, expected);
+}
+
+#[test]
+fn test_solana_transaction_update_blockhash_and_sign_no_matching_pubkey() {
+    // base64 encoded
+    let encoded_tx = "AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAQAHEIoR5xuWyrvjIW4xU7CWlPOfyFAiy8B295hGo6tNjBmRCgUkQaFYTleMcAX2p74eBXQZd1dwDyQZAPJfSv2KGc5kcFLJj5qd2BVMaSNGVPfVBm74GbLwUq5/U1Ccdqc2gokZQxRDpMq7aeToP3nRaWIP4RXMxN+LJetccXMPq/QumgOqt7kkqk07cyPCKgYoQ4fQtOqqZn5sEqjWHYj3CDS5ha48uggePWu090s1ff4yoCjAvULeZ+cqYFn+Adk5Teyfw71W3u/F6VTnLQEPW96gJr5Kcm3bGi08n224JyF++PTko52VL0CIM2xtl0WkvNslD6Wawxr7yd9HYllN4Lz8lFwXilWGgyJdOq1qqBuZbE49glHeCO/sJHNnIHC0BgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAEedVb8jHAbu50xW7OaBUH/bGy3qP0jlECsc2iVrwTjwbd9uHXZaGT2cvhRs7reawctIXtX1s3kTqM9YV+/wCpjJclj04kifG7PRApFI4NgwtaE5na/xCEBI572Nvp+Fm0P/on9df2SnTAmx8pWHneSwmrNt/J3VFLMhqns4zl6OL4d+g9rsaIj0Orta57MRu3jDSWCJf85ae4LBbiD/GXvOojZjsHekJrpRUuPggLJr943hDVD5UareeEucjCvaoHCgAFAsBcFQAKAAkDBBcBAAAAAAANBgAGACMJDAEBCQIABgwCAAAAAMqaOwAAAAAMAQYBEQs1DA8ABgEFAiMhCwsOCx0MDxoBGQcYBAgDJBscDB4PBwUQEhEfFR8UFwcFISITHw8MDCAfFgstwSCbM0HWnIEAAwAAABEBZAABCh0BAyZHAQMAypo7AAAAAJaWFAYAAAAAMgAADAMGAAABCQPZoILFk7gfE2y5bt3AC+g/4OwNzdiHKBhIbdeYvYFEjQPKyMkExMUkx0R25UNa/g5KsG0vfUwdUJ8e8HecK/Jkd3qm9XefBOB0BaD1+J+dBJz09vfyGuRYZH09HfdE/kL8v6Ql+H03+tO+9lMmmVg8O1c6gAN6eX0Cbn4=";
+    let encoded_tx = TWStringHelper::create(encoded_tx);
+
+    // base58 encoded
+    let new_blockhash = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg";
+    let new_blockhash = TWStringHelper::create(new_blockhash);
+
+    // there is no matching pubkey in the transaction account keys.
+    let private_key = base58::decode(
+        "A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr",
+        SOLANA_ALPHABET,
+    )
+    .unwrap();
+    let private_keys = TWDataVectorHelper::create([private_key]);
+
+    let output_data = unsafe {
+        TWDataHelper::wrap(tw_solana_transaction_update_blockhash_and_sign(
+            encoded_tx.ptr(),
+            new_blockhash.ptr(),
+            private_keys.ptr(),
+        ))
+        .to_vec()
+        .expect("Expected a non-null output data")
+    };
+    let output: Proto::SigningOutput = tw_proto::deserialize(&output_data).unwrap();
+    assert_eq!(output.error, SigningError::Error_missing_private_key);
+}
+
+#[test]
+fn test_solana_transaction_update_blockhash_and_sign_empty_private_keys() {
+    // base64 encoded
+    // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+    let encoded_tx = "AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG";
+    let encoded_tx = TWStringHelper::create(encoded_tx);
+
+    // base58 encoded
+    let new_blockhash = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg";
+    let new_blockhash = TWStringHelper::create(new_blockhash);
+
+    // empty private keys
+    let private_keys = TWDataVectorHelper::default();
+
+    let output_data = unsafe {
+        TWDataHelper::wrap(tw_solana_transaction_update_blockhash_and_sign(
+            encoded_tx.ptr(),
+            new_blockhash.ptr(),
+            private_keys.ptr(),
+        ))
+        .to_vec()
+        .expect("Expected a non-null output data")
+    };
+    let output: Proto::SigningOutput = tw_proto::deserialize(&output_data).unwrap();
+    assert_eq!(output.error, SigningError::OK);
+
+    let expected = "AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG";
+    assert_eq!(output.encoded, expected);
+
+    let expected_message = "AgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG";
+    assert_eq!(output.unsigned_tx, expected_message);
+}
+
+struct SetPriorityTestInput {
+    /// Hex-encoded private key.
+    private_key: &'static str,
+    /// Base64-encoded original transaction.
+    original_tx: &'static str,
+    /// Priority fee limit if present in the original transaction.
+    original_limit: Option<u32>,
+    /// Priority fee price if present in the original transaction.
+    original_price: Option<u64>,
+    /// Base64-encoded transaction after the priority fee and limit being changed.
+    updated_tx: &'static str,
+    /// Priority fee limit to be set to.
+    limit: u32,
+    /// Priority fee price to be set to.
+    price: u64,
+    /// Base64-encoded [`SetPriorityTestInput::updated_tx`] transaction that has been signed.
+    signed_tx: &'static str,
+    /// Hex-encoded signature of the [`SetPriorityTestInput::signed_tx`] transaction.
+    signature: &'static str,
+}
+
+fn test_solana_transaction_set_priority_fee(input: SetPriorityTestInput) {
+    let original_tx = TWStringHelper::create(input.original_tx);
+
+    // Step 1 - Check if there is are no price and limit instructions.
+
+    let original_price = TWStringHelper::wrap(unsafe {
+        tw_solana_transaction_get_compute_unit_price(original_tx.ptr())
+    });
+    let original_limit = TWStringHelper::wrap(unsafe {
+        tw_solana_transaction_get_compute_unit_limit(original_tx.ptr())
+    });
+    assert_eq!(
+        original_price.to_string(),
+        input.original_price.map(|v| v.to_string()),
+        "Invalid original price"
+    );
+    assert_eq!(
+        original_limit.to_string(),
+        input.original_limit.map(|v| v.to_string()),
+        "Invalid original limit"
+    );
+
+    // Step 2 - Set price and limit instructions.
+
+    let updated_tx = TWStringHelper::wrap(unsafe {
+        tw_solana_transaction_set_compute_unit_limit(
+            original_tx.ptr(),
+            TWStringHelper::create(&input.limit.to_string()).ptr(),
+        )
+    });
+    let updated_tx = TWStringHelper::wrap(unsafe {
+        tw_solana_transaction_set_compute_unit_price(
+            updated_tx.ptr(),
+            TWStringHelper::create(&input.price.to_string()).ptr(),
+        )
+    });
+
+    // Step 3 - Check if price and limit instructions are set successfully.
+
+    let actual_limit = TWStringHelper::wrap(unsafe {
+        tw_solana_transaction_get_compute_unit_limit(updated_tx.ptr())
+    });
+    let actual_price = TWStringHelper::wrap(unsafe {
+        tw_solana_transaction_get_compute_unit_price(updated_tx.ptr())
+    });
+    assert_eq!(
+        actual_limit.to_string(),
+        Some(input.limit.to_string()),
+        "Invalid updated limit"
+    );
+    assert_eq!(
+        actual_price.to_string(),
+        Some(input.price.to_string()),
+        "Invalid updated price"
+    );
+
+    let actual_updated_tx = updated_tx.to_string().unwrap();
+    assert_eq!(actual_updated_tx, input.updated_tx);
+
+    // Step 4 - Decode transaction into a `RawMessage` Protobuf.
+
+    let tx_data = base64::decode(&actual_updated_tx, STANDARD).unwrap();
+    let mut decoder = TransactionDecoderHelper::<Proto::DecodingTransactionOutput>::default();
+    let decode_output = decoder.decode(CoinType::Solana, tx_data);
+
+    // Step 5 - Sign the decoded `RawMessage` transaction.
+
+    let signing_input = Proto::SigningInput {
+        private_key: input.private_key.decode_hex().unwrap().into(),
+        raw_message: decode_output.transaction,
+        tx_encoding: Proto::Encoding::Base64,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Solana, signing_input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    assert_eq!(
+        output.encoded, input.signed_tx,
+        "Invalid signed transaction"
+    );
+    assert_eq!(
+        output.signatures.first().unwrap().signature,
+        input.signature,
+        "Invalid signature"
+    );
+}
+
+#[test]
+fn test_solana_transaction_set_priority_fee_transfer() {
+    // Successfully broadcasted tx:
+    // https://explorer.solana.com/tx/2ho7wZUXbDNz12xGfsXg2kcNMqkBAQjv7YNXNcVcuCmbC4p9FZe9ELeM2gMjq9MKQPpmE3nBW5pbdgwVCfNLr1h8
+    test_solana_transaction_set_priority_fee(SetPriorityTestInput {
+        private_key: "baf2b2dbbbad7ca96c1fa199c686f3d8fbd2c7b352f307e37e04f33df6741f18",
+        original_tx: "AX43+Ir2EDqf2zLEvgzFrCZKRjdr3wCdp8CnvYh6N0G/s86IueX9BbiNUl16iLRGvwREDfi2Srb0hmLNBFw1BwABAAEDODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG6GdPcA92ORzVJe2jfG8KQqqMHr9YTLu30oM4i7MFEoBAgIAAQwCAAAA6AMAAAAAAAA=",
+        original_limit: None,
+        original_price: None,
+        updated_tx: "AX43+Ir2EDqf2zLEvgzFrCZKRjdr3wCdp8CnvYh6N0G/s86IueX9BbiNUl16iLRGvwREDfi2Srb0hmLNBFw1BwABAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAboZ09wD3Y5HNUl7aN8bwpCqowev1hMu7fSgziLswUSgMDAAUCECcAAAICAAEMAgAAAOgDAAAAAAAAAwAJA+gDAAAAAAAA",
+        limit: 10_000,
+        price: 1_000,
+        signed_tx: "AVUye82Mv+/aWeU2G+B6Nes365mUU2m8iqcGZn/8kFJvw4wY6AgKGG+vJHaknHlCDwE1yi1SIMVUUtNCOm3kHg8BAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAboZ09wD3Y5HNUl7aN8bwpCqowev1hMu7fSgziLswUSgMDAAUCECcAAAICAAEMAgAAAOgDAAAAAAAAAwAJA+gDAAAAAAAA",
+        signature: "2ho7wZUXbDNz12xGfsXg2kcNMqkBAQjv7YNXNcVcuCmbC4p9FZe9ELeM2gMjq9MKQPpmE3nBW5pbdgwVCfNLr1h8",
+    });
+}
+
+#[test]
+fn test_solana_transaction_set_priority_fee_transfer_override() {
+    // Successfully broadcasted tx:
+    // https://explorer.solana.com/tx/3dxcZP8Q8WTj2JapeDLymQZvn1wGxPpism59RcaWA28igXo8Lyh1xRbAjipv7hrgo6JKyoAxbZ6ADayZLWqNJZg1
+    test_solana_transaction_set_priority_fee(SetPriorityTestInput {
+        private_key: "baf2b2dbbbad7ca96c1fa199c686f3d8fbd2c7b352f307e37e04f33df6741f18",
+        original_tx: "Ab8KqzeQeInEQVRNDD1akh2B0EEeb5XJFfyVjqDrocz49NcZ6x5cp76zC9mjZKspsVCWVYIYdvNRYJYVB2OK3g4BAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwXONiS/AgQzMMUxsafHXszeF2QJdufrIFBZHMZlu8/gMCAAkDLAEAAAAAAAACAAUCiBMAAAMCAAEMAgAAAOgDAAAAAAAA",
+        original_limit: Some(5_000),
+        original_price: Some(300),
+        updated_tx: "Ab8KqzeQeInEQVRNDD1akh2B0EEeb5XJFfyVjqDrocz49NcZ6x5cp76zC9mjZKspsVCWVYIYdvNRYJYVB2OK3g4BAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwXONiS/AgQzMMUxsafHXszeF2QJdufrIFBZHMZlu8/gMCAAkD6AMAAAAAAAACAAUCECcAAAMCAAEMAgAAAOgDAAAAAAAA",
+        limit: 10_000,
+        price: 1_000,
+        signed_tx: "AYPn6T3Qqfqg/IW+2FL1suZyUDrhFVlEiKBaCAWAtINfuLgWkDw7Q+QaDvGGRa7eMgEnj4hfCA92tssQByeCCw4BAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwMGRm/lIRcy/+ytunLDm+e8jOW7xfcSayxDmzpAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABwXONiS/AgQzMMUxsafHXszeF2QJdufrIFBZHMZlu8/gMCAAkD6AMAAAAAAAACAAUCECcAAAMCAAEMAgAAAOgDAAAAAAAA",
+        signature: "3dxcZP8Q8WTj2JapeDLymQZvn1wGxPpism59RcaWA28igXo8Lyh1xRbAjipv7hrgo6JKyoAxbZ6ADayZLWqNJZg1",
+    });
+}
+
+#[test]
+fn test_solana_transaction_set_priority_fee_transfer_with_address_lookup() {
+    // Successfully broadcasted tx:
+    // https://explorer.solana.com/tx/4vkDYvXnAyauDwgQUT9pjhvArCm1jZZFp6xFiT6SYKDHwabPNyNskzzd8YJZR4UJVXakBtRAFku3axVQoA7Apido
+    test_solana_transaction_set_priority_fee(SetPriorityTestInput {
+        private_key: "a73613f265ae572772e28bd921a7bcd0f020e188aae4d1ebd07b9b487fde3573",
+        original_tx: "Acjjw79E1WGC531Oq6lsyg3X+D65Fo37i6A4nKaqDjxWVrF/djOxbyShfg0HwMuCMp2Mj2JtsiGMkJbt/iD8rQ2AAQABAgEFuF07bbuXk4EuSECBjRkLhDeGEZ4Jm4QbrRF/TN0CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUE/bdT0AlTN8m+IZkrbzaTUxHcnoKW3WZucqu7msImQEBAgACDAIAAAD0AQAAAAAAAAGDq5uNdcMMtPgcMghpRBOza1eEzcNhvr0zid3hRZoV0wEAAA==",
+        original_limit: None,
+        original_price: None,
+        updated_tx: "Acjjw79E1WGC531Oq6lsyg3X+D65Fo37i6A4nKaqDjxWVrF/djOxbyShfg0HwMuCMp2Mj2JtsiGMkJbt/iD8rQ2AAQACAwEFuF07bbuXk4EuSECBjRkLhDeGEZ4Jm4QbrRF/TN0CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBkZv5SEXMv/srbpyw5vnvIzlu8X3EmssQ5s6QAAAABQT9t1PQCVM3yb4hmStvNpNTEdyegpbdZm5yq7uawiZAwIABQIQJwAAAQIAAwwCAAAA9AEAAAAAAAACAAkD6AMAAAAAAAABg6ubjXXDDLT4HDIIaUQTs2tXhM3DYb69M4nd4UWaFdMBAAA=",
+        limit: 10_000,
+        price: 1_000,
+        signed_tx: "AcRmE7GRYYh3XKjfYpBRvTdXjYMLtowRUxaStETGPTm0qxa7sm11yqGXKiO3SgOdsRL2Y9IQRBMfqwkBZyrK9gKAAQACAwEFuF07bbuXk4EuSECBjRkLhDeGEZ4Jm4QbrRF/TN0CAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADBkZv5SEXMv/srbpyw5vnvIzlu8X3EmssQ5s6QAAAABQT9t1PQCVM3yb4hmStvNpNTEdyegpbdZm5yq7uawiZAwIABQIQJwAAAQIAAwwCAAAA9AEAAAAAAAACAAkD6AMAAAAAAAABg6ubjXXDDLT4HDIIaUQTs2tXhM3DYb69M4nd4UWaFdMBAAA=",
+        signature: "4vkDYvXnAyauDwgQUT9pjhvArCm1jZZFp6xFiT6SYKDHwabPNyNskzzd8YJZR4UJVXakBtRAFku3axVQoA7Apido",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/solana/solana_transaction_util.rs b/rust/tw_tests/tests/chains/solana/solana_transaction_util.rs
new file mode 100644
index 00000000000..72d19c6a864
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/solana_transaction_util.rs
@@ -0,0 +1,13 @@
+use tw_any_coin::test_utils::transaction_calc_tx_hash_utils::TransactionUtilHelper;
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_solana_transaction_util_calc_tx_hash() {
+    let encoded_tx = "AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG";
+    let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::Solana, encoded_tx);
+
+    assert_eq!(
+        tx_hash,
+        "3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/solana/solana_wallet_connect.rs b/rust/tw_tests/tests/chains/solana/solana_wallet_connect.rs
new file mode 100644
index 00000000000..da6af13db42
--- /dev/null
+++ b/rust/tw_tests/tests/chains/solana/solana_wallet_connect.rs
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use serde_json::json;
+use std::borrow::Cow;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_any_coin::test_utils::wallet_connect_utils::WalletConnectRequestHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::base58;
+use tw_encoding::base58::Alphabet;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Solana::Proto;
+use tw_proto::WalletConnect::Proto as WCProto;
+
+fn b58(s: &str) -> Cow<'static, [u8]> {
+    base58::decode(s, Alphabet::Bitcoin).unwrap().into()
+}
+
+fn pubkey_signature(pubkey: &str, signature: &str) -> Proto::PubkeySignature<'static> {
+    Proto::PubkeySignature {
+        pubkey: pubkey.to_string().into(),
+        signature: signature.to_string().into(),
+    }
+}
+
+#[test]
+fn test_solana_sign_wallet_connect_case_1() {
+    let tx_encoded_to_sign = "AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA=";
+    let tx_encoded_signed = "AQPWaOi7dMdmQpXi8HyQQKwiqIftrg1igGQxGtZeT50ksn4wAnyH4DtDrkkuE0fqgx80LTp4LwNN9a440SrmoA8BAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA=";
+
+    let request_params = json!({
+        "transaction": tx_encoded_to_sign
+    });
+    let input = WCProto::ParseRequestInput {
+        protocol: WCProto::Protocol::V2,
+        method: WCProto::Method::SolanaSignTransaction,
+        payload: request_params.to_string().into(),
+    };
+
+    let mut parser = WalletConnectRequestHelper::default();
+    let parsing_output = parser.parse(CoinType::Solana, &input);
+
+    let mut signing_input = match parsing_output.signing_input_oneof {
+        WCProto::mod_ParseRequestOutput::OneOfsigning_input_oneof::solana(input) => input,
+        _ => unreachable!(),
+    };
+
+    // Set missing private key.
+    signing_input.private_key = b58("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr");
+    signing_input.tx_encoding = Proto::Encoding::Base64;
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let signing_output = signer.sign(CoinType::Solana, signing_input);
+
+    assert_eq!(signing_output.error, SigningError::OK);
+    assert_eq!(signing_output.encoded, tx_encoded_signed);
+    let expected_signatures = vec![pubkey_signature(
+        "7v91N7iZ9mNicL8WfG6cgSCKyRXydQjLh6UYBWwm6y1Q",
+        "5T6uZBHnHFd8uWErDBTFRVkbKuhbcm94K5MJ2beTYDruzqv4FjS7EMKvC94ZfxNAiWUXZ6bZxS3WXUbhJwYNPWn",
+    )];
+    assert_eq!(signing_output.signatures, expected_signatures);
+}
+
+#[test]
+fn test_solana_sign_wallet_connect_with_external_fee_payer() {
+    let tx_encoded_to_sign = "AgVnzLgdHFLYfmSR0mp/npPzRqaabwMYqy8dj7ohDQsDQ0NzDH7V06lqN+LrTpfLgT7smx+rgrU4+c991xODzQMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAGCssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFqUGMlXapwAxr2PwiP0cVc/cXJIjeEKqE2/Y8U6ILrnF0haJP+0BwRhu21/HIt1jGstyQAp1VG1/U6s2C1l4wIgwjHcAvSCmA99mRXB7PUzdAkdOMBgtJSH+cXZMuB37XY7RCyzkSFX8TqTPQE0KC0DK1/+zQGi2/G3eQYI3wAupwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKkGp9UXGSxcUSGMyUw9SvF/WNruCJuh/UTj29mKAAAAAIyXJY9OJInxuz0QKRSODYMLWhOZ2v8QhASOe9jb6fhZzipDMbzjZw5uqL7f9ZCMbZH4M6Maf96sFpeMJhoYAdUCCQcAAgQFBgcIAAcEAwUCAQoMoA8AAAAAAAAG";
+    // https://explorer.solana.com/tx/7GZGFT2VA4dpJBBwjiMqj1o8yChDvoCsqnQ7xz4GxY513W3efxRqbB8y7g4tH2GEGQRx4vCkKipG1sMaDEen1A2?cluster=devnet
+    let tx_encoded_signed = "AgVnzLgdHFLYfmSR0mp/npPzRqaabwMYqy8dj7ohDQsDQ0NzDH7V06lqN+LrTpfLgT7smx+rgrU4+c991xODzQOK74uU+ESOWD5RtUxJNbGRG7mOvDBTpGhZhlRRWEsR6D/hpQc0r8kzuXMUK3OptIklCXmLKjptzYUcCAlwTUsOAgAGCssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFqUGMlXapwAxr2PwiP0cVc/cXJIjeEKqE2/Y8U6ILrnF0haJP+0BwRhu21/HIt1jGstyQAp1VG1/U6s2C1l4wIgwjHcAvSCmA99mRXB7PUzdAkdOMBgtJSH+cXZMuB37XY7RCyzkSFX8TqTPQE0KC0DK1/+zQGi2/G3eQYI3wAupwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABt324ddloZPZy+FGzut5rBy0he1fWzeROoz1hX7/AKkGp9UXGSxcUSGMyUw9SvF/WNruCJuh/UTj29mKAAAAAIyXJY9OJInxuz0QKRSODYMLWhOZ2v8QhASOe9jb6fhZzipDMbzjZw5uqL7f9ZCMbZH4M6Maf96sFpeMJhoYAdUCCQcAAgQFBgcIAAcEAwUCAQoMoA8AAAAAAAAG";
+
+    let request_params = json!({
+        "transaction": tx_encoded_to_sign
+    });
+    let input = WCProto::ParseRequestInput {
+        protocol: WCProto::Protocol::V2,
+        method: WCProto::Method::SolanaSignTransaction,
+        payload: request_params.to_string().into(),
+    };
+
+    let mut parser = WalletConnectRequestHelper::default();
+    let parsing_output = parser.parse(CoinType::Solana, &input);
+
+    let mut signing_input = match parsing_output.signing_input_oneof {
+        WCProto::mod_ParseRequestOutput::OneOfsigning_input_oneof::solana(input) => input,
+        _ => unreachable!(),
+    };
+
+    // Set missing private key.
+    signing_input.private_key = b58("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5");
+    signing_input.tx_encoding = Proto::Encoding::Base64;
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let signing_output = signer.sign(CoinType::Solana, signing_input);
+
+    assert_eq!(signing_output.error, SigningError::OK);
+    assert_eq!(signing_output.encoded, tx_encoded_signed);
+
+    let expected_signatures = vec![
+        pubkey_signature(
+            "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ",
+            "7GZGFT2VA4dpJBBwjiMqj1o8yChDvoCsqnQ7xz4GxY513W3efxRqbB8y7g4tH2GEGQRx4vCkKipG1sMaDEen1A2",
+        ),
+        pubkey_signature(
+            "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V",
+            "3n7RHTCBAtnFVuDn5eRbyQB24h6AqajJi5nGMPrfnUVFUDh2Cb8AoaJ7mVtjnv73V4HaJCzSwCLAj3zcGEaFftWZ"
+        )
+    ];
+    assert_eq!(signing_output.signatures, expected_signatures);
+}
diff --git a/rust/tw_tests/tests/chains/sui/mod.rs b/rust/tw_tests/tests/chains/sui/mod.rs
new file mode 100644
index 00000000000..c19d11c0bc7
--- /dev/null
+++ b/rust/tw_tests/tests/chains/sui/mod.rs
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_proto::Sui::Proto;
+
+mod sui_address;
+mod sui_compile;
+mod sui_sign;
+mod sui_transaction_util;
+mod test_cases;
+
+fn object_ref(id: &'static str, version: u64, digest: &'static str) -> Proto::ObjectRef<'static> {
+    Proto::ObjectRef {
+        object_id: id.into(),
+        version,
+        object_digest: digest.into(),
+    }
+}
diff --git a/rust/tw_tests/tests/chains/sui/sui_address.rs b/rust/tw_tests/tests/chains/sui/sui_address.rs
new file mode 100644
index 00000000000..c2a484ed332
--- /dev/null
+++ b/rust/tw_tests/tests/chains/sui/sui_address.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_sui_address_normalization() {
+    test_address_normalization(
+        CoinType::Sui,
+        "259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015",
+        "0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015",
+    );
+}
+
+#[test]
+fn test_sui_address_is_valid() {
+    test_address_valid(
+        CoinType::Sui,
+        "0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015",
+    );
+}
+
+#[test]
+fn test_sui_address_invalid() {
+    // Address 20 are invalid in SUI.
+    test_address_invalid(CoinType::Sui, "0xb1dc06bd64d4e179a482b97bb68243f6c02c1b92");
+    test_address_invalid(CoinType::Sui, "b1dc06bd64d4e179a482b97bb68243f6c02c1b92");
+    // Too long.
+    test_address_invalid(
+        CoinType::Sui,
+        "d575ad7f18e948462a5cf698f564ef394a752a71fec62493af8a055c012c0d502",
+    );
+    // Too short.
+    test_address_invalid(CoinType::Sui, "b1dc06bd64d4e179a482b97bb68243f6c02c1b9");
+    // Invalid short address.
+    test_address_invalid(CoinType::Sui, "0x11");
+    // Invalid Hex
+    test_address_invalid(
+        CoinType::Sui,
+        "0xS59ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015",
+    );
+}
+
+#[test]
+fn test_sui_address_get_data() {
+    test_address_get_data(
+        CoinType::Sui,
+        "0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015",
+        "259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015",
+    );
+}
diff --git a/rust/tw_tests/tests/chains/sui/sui_compile.rs b/rust/tw_tests/tests/chains/sui/sui_compile.rs
new file mode 100644
index 00000000000..67f84472525
--- /dev/null
+++ b/rust/tw_tests/tests/chains/sui/sui_compile.rs
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::sui::test_cases::{transfer_d4ay9tdb, PRIVATE_KEY_54E80D76, SENDER_54E80D76};
+use tw_any_coin::test_utils::sign_utils::{CompilerHelper, PreImageHelper};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_keypair::ed25519;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Sui::Proto::{self, mod_SigningInput::OneOftransaction_payload as TransactionType};
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+struct SuiCompileArgs<'a> {
+    input: Proto::SigningInput<'a>,
+    private_key: &'a str,
+    tx_hash: &'a str,
+    unsigned_tx_data: &'a str,
+    signature: &'a str,
+}
+
+fn test_sui_compile_impl(args: SuiCompileArgs) {
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<CompilerProto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::Sui, &args.input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(preimage_output.data_hash.to_hex(), args.tx_hash);
+
+    // Step 3: Compile transaction info
+
+    // Simulate external signing.
+    let key_pair = ed25519::sha512::KeyPair::try_from(args.private_key).unwrap();
+    let public_key_bytes = key_pair.public().to_vec();
+    let signature_bytes = key_pair
+        .sign(preimage_output.data_hash.to_vec())
+        .unwrap()
+        .to_vec();
+
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(
+        CoinType::Sui,
+        &args.input,
+        vec![signature_bytes],
+        vec![public_key_bytes],
+    );
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.unsigned_tx, args.unsigned_tx_data);
+    assert_eq!(output.signature, args.signature);
+}
+
+#[test]
+fn test_sui_compile_transfer() {
+    let input = Proto::SigningInput {
+        signer: SENDER_54E80D76.into(),
+        ..transfer_d4ay9tdb::sui_transfer_input()
+    };
+
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/D4Ay9TdBJjXkGmrZSstZakpEWskEQHaWURP6xWPRXbAm
+    test_sui_compile_impl(SuiCompileArgs {
+        input,
+        private_key: PRIVATE_KEY_54E80D76,
+        tx_hash: transfer_d4ay9tdb::TX_HASH,
+        unsigned_tx_data: transfer_d4ay9tdb::UNSIGNED_TX,
+        signature: transfer_d4ay9tdb::SIGNATURE,
+    });
+}
+
+#[test]
+fn test_sui_compile_direct_transfer() {
+    let direct = Proto::SignDirect {
+        unsigned_tx_msg: transfer_d4ay9tdb::UNSIGNED_TX.into(),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::sign_direct_message(direct),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/D4Ay9TdBJjXkGmrZSstZakpEWskEQHaWURP6xWPRXbAm
+    test_sui_compile_impl(SuiCompileArgs {
+        input,
+        private_key: PRIVATE_KEY_54E80D76,
+        tx_hash: transfer_d4ay9tdb::TX_HASH,
+        unsigned_tx_data: transfer_d4ay9tdb::UNSIGNED_TX,
+        signature: transfer_d4ay9tdb::SIGNATURE,
+    });
+}
diff --git a/rust/tw_tests/tests/chains/sui/sui_sign.rs b/rust/tw_tests/tests/chains/sui/sui_sign.rs
new file mode 100644
index 00000000000..bbc3f297e34
--- /dev/null
+++ b/rust/tw_tests/tests/chains/sui/sui_sign.rs
@@ -0,0 +1,468 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::sui::object_ref;
+use crate::chains::sui::test_cases::{transfer_d4ay9tdb, PRIVATE_KEY_54E80D76, SENDER_54E80D76};
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::DecodeHex;
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::Sui::Proto::{self, mod_SigningInput::OneOftransaction_payload as TransactionType};
+
+fn test_sign_direct_impl(unsigned_tx: &str, private_key: &str, expected_signature: &str) {
+    let direct = Proto::SignDirect {
+        unsigned_tx_msg: unsigned_tx.into(),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::sign_direct_message(direct),
+        private_key: private_key.decode_hex().unwrap().into(),
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    assert_eq!(output.unsigned_tx, unsigned_tx);
+    assert_eq!(output.signature, expected_signature);
+}
+
+#[test]
+fn test_sui_sign_direct_transfer() {
+    let unsigned_tx = "AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA";
+    let private_key = "3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266";
+    let expected_signature = "APxPduNVvHj2CcRcHOtiP2aBR9qP3vO2Cb0g12PI64QofDB6ks33oqe/i/iCTLcop2rBrkczwrayZuJOdi7gvwNqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg==";
+
+    test_sign_direct_impl(unsigned_tx, private_key, expected_signature);
+}
+
+#[test]
+fn test_sui_sign_direct_transfer_nft() {
+    let unsigned_tx = "AAAv0f6HrJCZ/1cuDVuxh1BL12XMeHxkKeZ7Js9grhcB0u8xtTvoOepOHAAAAAAAAAAgJvcpOSvKhM+tHPgGAnp5Pmc8l3wjZhVxK4/BrLu4YAgttQCskZzd41GsNuNxHYMsbbl2aSEnoKw8oAGf/LobCM7RxGurtPZtHAAAAAAAAAAgwk74iUAH9S+cGVXQxAydItvltZ3UK2L0vg1TYgDMPfABAAAAAAAAAOgDAAAAAAAA";
+    let private_key = "3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266";
+    let expected_signature = "AI+KRy820ucibONQXbaVm53ixNWqRcqp16/aG0hvX7Mt3dOMqTDKRYoRBRvbMDsyPFmpS+n5iYvs5vuGdqjUvgBqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg==";
+
+    test_sign_direct_impl(unsigned_tx, private_key, expected_signature);
+}
+
+#[test]
+fn test_sui_sign_direct_move_call() {
+    let unsigned_tx = "AAIAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAAAAAAAAINaXMihjlCd4CQVFRPjcNb7QfYP4wGgQyl1xbplvEKUCA3N1aQh0cmFuc2ZlcgACAQCdB6Mav5rHiXD0rAWTCxS+ENwxMBsAAAAAAAAAINqDfrJUZebPjUi7xcyR3QcQSA9tOLwxThgYaZ1vMfgfABQU2gJ3ToaOYd1F/R6mXryOZdvpRi21AKyRnN3jUaw243EdgyxtuXZppM+mSjYYEQWDcV/7hFRrAE0VtRwbAAAAAAAAACC5nJxYaYJfa9rfbxSikaEFVmHGuXyCIZoZbMpxMwLebAEAAAAAAAAA0AcAAAAAAAA=";
+    let private_key = "3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266";
+    let expected_signature = "AHoX1/mzUS8WQ+tNr0gXtfI7KFXjSbDlUxbGG2gkEh6L8FngU2KrsXsR1N8MzCXyJIz7+YvTfl5+Dh6AWSZC5wVqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg==";
+
+    test_sign_direct_impl(unsigned_tx, private_key, expected_signature);
+}
+
+#[test]
+fn test_sui_sign_direct_add_delegation() {
+    let unsigned_tx = "AAIAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAAAAAAAAIEt/p6rXSTjdKP6wJOXyx0c2xsgJ4MJtfxe7qHC34u4UCnN1aV9zeXN0ZW0fcmVxdWVzdF9hZGRfZGVsZWdhdGlvbl9tdWxfY29pbgAEAQEAAAAAAAAAAAAAAAAAAAAAAAAABQEAAAAAAAAAAgIAGSkMV9AFc419O9dL1kez9tzVIOiXzAEAAAAAACAfIePlHHP/+iv++FWQW9ofkVm4S2sFwupGikSq8bNjYwAH1A26NKDn7pJfn9zWaDi1nbntMJfMAQAAAAAAIKfMZAZktdmw36jwg/jcK1TDmrHmSZ/fdkeInO3BSjfWAAkB0AcAAAAAAAAAFAej1I8mhjmcpQTQtiX2J2HZ7y2xLbUArJGc3eNRrDbjcR2DLG25dmlY2RBfTU/P+GL1qpxE8NQrwiLw/JfMAQAAAAAAICs2NJlowCmCnpJ+hja2VwZE5K6yGM/qw0MSRnn9tW2cbgAAAAAAAACghgEAAAAAAA==";
+    let private_key = "3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266";
+    let expected_signature = "AMn4XpOcE9pX/VWCcue/tMkk+TxRQprGas53TT9W4beLkj6XuQdSNLSdjp9AmbqQPHKh0yJZ9i7Q2i6aax8NdQZqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg==";
+
+    test_sign_direct_impl(unsigned_tx, private_key, expected_signature);
+}
+
+#[test]
+fn test_sui_sign_transfer_sui() {
+    let input = Proto::SigningInput {
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        ..transfer_d4ay9tdb::sui_transfer_input()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/D4Ay9TdBJjXkGmrZSstZakpEWskEQHaWURP6xWPRXbAm
+    assert_eq!(output.unsigned_tx, transfer_d4ay9tdb::UNSIGNED_TX);
+    assert_eq!(output.signature, transfer_d4ay9tdb::SIGNATURE);
+}
+
+#[test]
+fn test_sui_sign_split_sui() {
+    let pay_sui = Proto::PaySui {
+        input_coins: vec![object_ref(
+            "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005",
+            85887685,
+            "GnzkqXxoowwtz1W33JrjwaW63FpnXmVo8DoVVWUwARyx",
+        )],
+        recipients: vec![
+            SENDER_54E80D76.into(),
+            SENDER_54E80D76.into(),
+            SENDER_54E80D76.into(),
+        ],
+        amounts: vec![150_000, 200_000, 100_000],
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::pay_sui(pay_sui),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.007 SUI
+        gas_budget: 7000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/GNoQj54Ra8qGbzbvD25KXEYTsRDKTH5SSjLtHftGNwBM
+    assert_eq!(output.unsigned_tx, "AAAEAAjwSQIAAAAAAAAIQA0DAAAAAAAACKCGAQAAAAAAACBU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgICAAMBAAABAQABAgABAwMAAAAAAwAAAQADAAACAAEDAFToDXbXkMJ39aRPPOkvU9JvWJSJK/OV3uY3WYiHa+ayAWNgILOn3HsRw6pvQZsX+KnBLn95ox0b3S3mcLTt1jAFxYoeBQAAAAAg6qe+uHxDnn7q4cupb3Z1reQK3m4sh6efYtcz8fWA6C9U6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsu4CAAAAAAAAwM9qAAAAAAAA");
+    assert_eq!(output.signature, "AAN/lP/bRRsgdDS/QCSl45D5gHdKv4Aow0Hmkcot6w+84vd2X+nvOgxyYo2BMInBIbsCqlOtnn8t9zo2+dNSegGF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
+
+#[test]
+fn test_sui_sign_merge_sui() {
+    // Coin type: `0x2::sui::SUI`.
+    let primary_coin = object_ref(
+        "0x102054b7676a46b1bae724134dc962db729f3389acf79d3d6f3c27ba018a0404",
+        85887686,
+        "J3ZVMi8NUj2cbwB94dYFxTLoDJiBbLj156D7DmBUnVb2",
+    );
+    let primary_coin_balance = 150000;
+
+    // Coin type: `0x2::sui::SUI`.
+    let coin_to_merge = object_ref(
+        "0xf3b55a88fe631fdc778621c334941dd82453736fa02c7f6effd4441c38a805cc",
+        85887686,
+        "AT7MeU611cvSpM7B2cQFd53Uiw7WtVwuoQcUcZjWbxou",
+    );
+    let coin_to_merge_balance = 100000;
+
+    let pay = Proto::Pay {
+        input_coins: vec![primary_coin, coin_to_merge],
+        recipients: vec![SENDER_54E80D76.into()],
+        gas: Some(object_ref(
+            "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005",
+            85887691,
+            "JAdejLaC6f59Ko7SugLSuwVn55wVKYE2ukQae4nRJcm5",
+        )),
+        amounts: vec![primary_coin_balance + coin_to_merge_balance],
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::pay(pay),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.004 SUI
+        gas_budget: 4000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/68wBKsZyYXmCUydDmabQ71kTcFWTfDG7tFmTLk1HgNdN
+    assert_eq!(output.unsigned_tx, "AAAEAQAQIFS3Z2pGsbrnJBNNyWLbcp8ziaz3nT1vPCe6AYoEBMaKHgUAAAAAIP0+kx97Pe9YDREgUkz6oiMWshB9Lmh378kj8zPFQKydAQDztVqI/mMf3HeGIcM0lB3YJFNzb6Asf27/1EQcOKgFzMaKHgUAAAAAIIxpeFeM16YQBcGe5g1g/yPrBg49nG7O3ONFnBMQpao8AAiQ0AMAAAAAAAAgVOgNdteQwnf1pE886S9T0m9YlIkr85Xe5jdZiIdr5rIDAwEAAAEBAQACAQAAAQECAAEBAwEAAAABAwBU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgFjYCCzp9x7EcOqb0GbF/ipwS5/eaMdG90t5nC07dYwBcuKHgUAAAAAIP8OWIzz7zyhJZG6luM+fwC+wc/3IWtHtGWeD/6h5YNwVOgNdteQwnf1pE886S9T0m9YlIkr85Xe5jdZiIdr5rLuAgAAAAAAAAAJPQAAAAAAAA==");
+    assert_eq!(output.signature, "AAjKOQKQuLYdWN798F50O0dtLtRWsAa6bl/C4xJHnJaEIpRbYdhlxRXXfcSDpB6/YI14YU5P+auk6KsFGOBZmg2F69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
+
+#[test]
+fn test_sui_sign_transfer_all_sui() {
+    // Coin type: `0x2::sui::SUI`.
+    let pay_all_sui = Proto::PayAllSui {
+        input_coins: vec![
+            object_ref(
+                "0x102054b7676a46b1bae724134dc962db729f3389acf79d3d6f3c27ba018a0404",
+                85887692,
+                "AHRJoaqPDuBd9fUcJApoiGF94LAKWzXeUd4M6R3qQdCh",
+            ),
+            object_ref(
+                "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005",
+                85887692,
+                "8Q8GsKYTwhUDVMEAuv98P52Wj6HMoQdZdrZNfgsVPStU",
+            ),
+            object_ref(
+                "0xf424e836c9158c53e7361d24ed81875ef06b988465cb75561e035f8f42f00d33",
+                85887692,
+                "74iZSGGCqC61JtERAkXFbPAvWLDwT2fHSQFJbebMtcEJ",
+            ),
+        ],
+        recipient: "0xf887e7077017554511e736d43424363da946d8aa748225f6b054630a0b1c0ae5".into(),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::pay_all_sui(pay_all_sui),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.004 SUI
+        gas_budget: 5000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/3yNCCsiEFMyoNcsCniCcSQ9AFZY2WVoQWGa56fcd1nvh
+    assert_eq!(output.unsigned_tx, "AAABACD4h+cHcBdVRRHnNtQ0JDY9qUbYqnSCJfawVGMKCxwK5QEBAQABAABU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgMQIFS3Z2pGsbrnJBNNyWLbcp8ziaz3nT1vPCe6AYoEBMyKHgUAAAAAIInt9ZC5H/D+LXQVrm5FMVRbXYYja9DzMY7xtj9fmTgOY2Ags6fcexHDqm9Bmxf4qcEuf3mjHRvdLeZwtO3WMAXMih4FAAAAACBt7mQv2i7T+meqMktoDf8lCK0rhyCHnv7MB+dzIwEWXfQk6DbJFYxT5zYdJO2Bh17wa5iEZct1Vh4DX49C8A0zzIoeBQAAAAAgWhna69UsKB/zNdrxzcL1x4N3cD4QnQllvgrYmNa0dqdU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsu4CAAAAAAAAQEtMAAAAAAAA");
+    assert_eq!(output.signature, "AC+cq5DVVb97CpvtgbPer5tC1TpyItXPuvZsC7mQySyrVks/eymaovfZL62zCjtyjM2gpVGt2Hy8xDLIIb5YiAaF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
+
+#[test]
+fn test_sui_sign_transfer_token() {
+    let pay = Proto::Pay {
+        input_coins: vec![
+            // Coin type: `0x1d58e26e85fbf9ee8596872686da75544342487f95b1773be3c9a49ab1061b19::suia_token::SUIA_TOKEN`
+            object_ref(
+                "0x69e007e40d4b64528c3d9e519e3d1f3e5c9c962870748171f7b94c168c868161",
+                85619063,
+                "HwJaXWsUXZnd1G8cQVtRmWvBvPKGAZMoTryoJqazNoNK",
+            ),
+        ],
+        recipients: vec![
+            "0xa7175abdd5ed92ebe3ad390db366c6a706478cdf517cde6cf98630065cda377a".into(),
+        ],
+        amounts: vec![123000],
+        // Coin type: `0x2::sui::SUI`.
+        gas: Some(object_ref(
+            "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005",
+            85619065,
+            "9zB7kRVtKQcxCfi47z22u6vQGcUtnYFBXeiuaDfHUudr",
+        )),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::pay(pay),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.003 SUI
+        gas_budget: 4000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/DYRXibkwsy84d9qdKktePE3gj9zN4yFpVx2ehv1uYMCo
+    assert_eq!(output.unsigned_tx, "AAADAQBp4AfkDUtkUow9nlGePR8+XJyWKHB0gXH3uUwWjIaBYXdxGgUAAAAAIPukOuVHEHFrj96jMXgsE8RmAU/Es2ejPAhD41bNXslEAAh44AEAAAAAAAAgpxdavdXtkuvjrTkNs2bGpwZHjN9RfN5s+YYwBlzaN3oCAgEAAAEBAQABAQMAAAAAAQIAVOgNdteQwnf1pE886S9T0m9YlIkr85Xe5jdZiIdr5rIBY2Ags6fcexHDqm9Bmxf4qcEuf3mjHRvdLeZwtO3WMAV5cRoFAAAAACCFgwpF3YPy9Px5R/K+WLDjMSiO7AsEa/4cNWn5P/nkIVToDXbXkMJ39aRPPOkvU9JvWJSJK/OV3uY3WYiHa+ay7gIAAAAAAAAACT0AAAAAAAA=");
+    assert_eq!(output.signature, "AAXK0so7TwO285ZhWKKRYs2MyFumsFSlOe4boampQKmrqhIZKhNnJKCTFEkarJTq5lIIvyTtgIu5S93gOsxN4guF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
+
+#[test]
+fn test_sui_sign_split_tokens() {
+    let pay = Proto::Pay {
+        input_coins: vec![
+            // Coin type: `0xce7ff77a83ea0cb6fd39bd8748e2ec89a3f41e8efdc3f4eb123e0ca37b184db2::buck::BUCK`
+            object_ref(
+                "0xcc94319baba4c4a2f1988805952f1cf0edf9690a150976396491ba72f7ea06f4",
+                85887684,
+                "5ErzJWYsjecyvjBSYg2CXPB76oqqJHCRarkYxsSYEf7c",
+            ),
+        ],
+        recipients: vec![
+            SENDER_54E80D76.into(),
+            SENDER_54E80D76.into(),
+            SENDER_54E80D76.into(),
+        ],
+        amounts: vec![10000000, 7000000, 123],
+        // Coin type: `0x2::sui::SUI`.
+        gas: Some(object_ref(
+            "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005",
+            85887686,
+            "HE58PPRBBwksCbB7DMG6RRUcHkR4uJEh5yq5Eax5g546",
+        )),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::pay(pay),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.007 SUI
+        gas_budget: 7000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/6yp2AfESB3od1AMmS7Q6KDbLPJgjNrcTBYR4YSx9nYTR
+    assert_eq!(output.unsigned_tx, "AAAFAQDMlDGbq6TEovGYiAWVLxzw7flpChUJdjlkkbpy9+oG9MSKHgUAAAAAID770d4E8lYGVpgqgH7V6wveP0upByVv6GPKEis8+F1vAAiAlpgAAAAAAAAIwM9qAAAAAAAACHsAAAAAAAAAACBU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgICAQAAAwEBAAECAAEDAAEDAwAAAAADAAABAAMAAAIAAQQAVOgNdteQwnf1pE886S9T0m9YlIkr85Xe5jdZiIdr5rIBY2Ags6fcexHDqm9Bmxf4qcEuf3mjHRvdLeZwtO3WMAXGih4FAAAAACDxFDVI2G12qWGuVXlDH+ENYODgVgpT6lVcFhrw27vlu1ToDXbXkMJ39aRPPOkvU9JvWJSJK/OV3uY3WYiHa+ay7gIAAAAAAADAz2oAAAAAAAA=");
+    assert_eq!(output.signature, "AGrbddwztZ+spZCG39obT6Qp+Yv35hXfIPOExVNXzkUpdr7NDMjEMS19BLT6rc811EFiMMVi65G4RmetXGOeUgWF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
+
+/// Merge `primary_coin_id`, `coin_to_merge1` and `coin_to_merge2` coins into one coin.
+/// Read the migration guide: https://blog.sui.io/sui-payment-transaction-types/
+#[test]
+fn test_sui_sign_merge_tokens() {
+    // Coin type: `0xce7ff77a83ea0cb6fd39bd8748e2ec89a3f41e8efdc3f4eb123e0ca37b184db2::buck::BUCK`
+    let primary_coin = object_ref(
+        "0x7c91902ea14bc1e1a27358d7aa44f7ab9f10890642ae97d03b4e8a4c804662cd",
+        85887687,
+        "DWJeDBNn5Uyb69E6xxoMZL2wupH9VaGxY3Pf7asJfRCQ",
+    );
+    let primary_coin_balance = 10000000;
+
+    // Coin type: `0xce7ff77a83ea0cb6fd39bd8748e2ec89a3f41e8efdc3f4eb123e0ca37b184db2::buck::BUCK`
+    let coin_to_merge1 = object_ref(
+        "0x3a5edd52deb7535dadb6cf92b9ed5e0d0eb959a6ce19ea075a3f7e1a8fe29070",
+        85887687,
+        "79CmNvfmneL651e4ND2Kqje13ZJ2sbpGk6oXsa87TkQv",
+    );
+    let coin_to_merge_balance1 = 7000000;
+
+    // Coin type: `0xce7ff77a83ea0cb6fd39bd8748e2ec89a3f41e8efdc3f4eb123e0ca37b184db2::buck::BUCK`
+    let coin_to_merge2 = object_ref(
+        "0xcc94319baba4c4a2f1988805952f1cf0edf9690a150976396491ba72f7ea06f4",
+        85887687,
+        "CZbcgfFMyUFmTErb9jewVVcThKPeLqEHk5SvoRtnihHD",
+    );
+    let coin_to_merge_balance2 = 135116;
+
+    let pay = Proto::Pay {
+        input_coins: vec![primary_coin, coin_to_merge1, coin_to_merge2],
+        recipients: vec![SENDER_54E80D76.into()],
+        amounts: vec![primary_coin_balance + coin_to_merge_balance1 + coin_to_merge_balance2],
+        // Coin type: `0x2::sui::SUI`.
+        gas: Some(object_ref(
+            "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005",
+            85887687,
+            "GvBAtzvLkhaj2mpC4LnmTH7796zYfHLof4U5dpRStSbn",
+        )),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::pay(pay),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.007 SUI
+        gas_budget: 7000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/EadSFJmRbfcJXjWsTwDZ1jUDonN6uWfjEgs79SuG2NCj
+    assert_eq!(output.unsigned_tx, "AAAFAQB8kZAuoUvB4aJzWNeqRPernxCJBkKul9A7TopMgEZizceKHgUAAAAAILnOCLChQW+Ka6TYqDCKxTKXk7bbxxfROgRAn9cAqdZ1AQA6Xt1S3rdTXa22z5K57V4NDrlZps4Z6gdaP34aj+KQcMeKHgUAAAAAIFtAEid8uKSWbaEakB3Qld75NYy9NE0uUtVG7z2Oj+mHAQDMlDGbq6TEovGYiAWVLxzw7flpChUJdjlkkbpy9+oG9MeKHgUAAAAAIKvKSBp+aB45dA6ogOr30c+9zJ0SI3c+/OczUGBIHJxkAAgMdgUBAAAAAAAgVOgNdteQwnf1pE886S9T0m9YlIkr85Xe5jdZiIdr5rIDAwEAAAIBAQABAgACAQAAAQEDAAEBAwEAAAABBABU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgFjYCCzp9x7EcOqb0GbF/ipwS5/eaMdG90t5nC07dYwBceKHgUAAAAAIOx+ljTbUQkwMHYczKT1iN+DkOpvQYNfaLWlTcnznhGtVOgNdteQwnf1pE886S9T0m9YlIkr85Xe5jdZiIdr5rLuAgAAAAAAAMDPagAAAAAAAA==");
+    assert_eq!(output.signature, "AIPDD+jY6aYK0bc2XhtvdSyygk9HKha9WdZjTcRxasDkAi6vq1/a43s9jTV7WuZ7otAXk21eu8zevJ+HB0MABwWF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
+
+#[test]
+fn test_sui_sign_delegate_sui() {
+    let add_stake = Proto::RequestAddStake {
+        // Coin type: `0x2::sui::SUI`.
+        coins: vec![
+            object_ref(
+                "0xff1af62d35654956964437882b33d3256aad20214f18a234c62b5e258ca163ee",
+                83160977,
+                "FAugxdfWPQrMu57mMc9FmgNSjkt613pixR6V5M9nashw",
+            ),
+            object_ref(
+                "0x5ef77d20c7d6745d3d9b5f69e7825aae733fa5c8a3f82f7192749e3169791c8c",
+                85887695,
+                "F3JgSqdQJgzBsNnzJiYkr2XkjTEXmq7NEybixjEYrSf4",
+            ),
+        ],
+        // Do not specify the amount.
+        amount: Some(Proto::Amount {
+            // 1.00095
+            amount: 1_000_000_000 + 1_000_000 - 50_000,
+        }),
+        // https://suiscan.xyz/mainnet/validator/0x61953ea72709eed72f4441dd944eec49a11b4acabfc8e04015e89c63be81b6ab/delegators
+        validator: "0x61953ea72709eed72f4441dd944eec49a11b4acabfc8e04015e89c63be81b6ab".into(),
+        // Coin type: `0x2::sui::SUI`.
+        gas: Some(object_ref(
+            "0x102054b7676a46b1bae724134dc962db729f3389acf79d3d6f3c27ba018a0404",
+            85989207,
+            "GXGhEVNJGNBsvaTiLi85bGask5PbVXTZUKyN6CLR3N7D",
+        )),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::request_add_stake(add_stake),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.009 SUI
+        gas_budget: 9000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/9CHdn8h68pnC7pKxFN7ABCCiufFkYQQ6EwFEQEPiz6bp
+    assert_eq!(output.unsigned_tx, "AAAFAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQEAAAAAAAAAAQEA/xr2LTVlSVaWRDeIKzPTJWqtICFPGKI0xiteJYyhY+6R7/QEAAAAACDSjWt6fM4gT8LU9OmUKUD0oeVAN3195wXyRgLAAkj/RgEAXvd9IMfWdF09m19p54JarnM/pcij+C9xknSeMWl5HIzPih4FAAAAACDQmsUAK2qhMxauQja6zUchci2O+VpXNpKHQPa5uzG92wAJAfBIqTsAAAAAACBhlT6nJwnu1y9EQd2UTuxJoRtKyr/I4EAV6JxjvoG2qwIFAAIBAQABAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMKc3VpX3N5c3RlbRpyZXF1ZXN0X2FkZF9zdGFrZV9tdWxfY29pbgAEAQAAAgAAAQMAAQQAVOgNdteQwnf1pE886S9T0m9YlIkr85Xe5jdZiIdr5rIBECBUt2dqRrG65yQTTcli23KfM4ms9509bzwnugGKBARXFyAFAAAAACDmoHkZ4Q2u0tMpkkJOmnK9WHxAXfwVxtKnoGoU3ZecTFToDXbXkMJ39aRPPOkvU9JvWJSJK/OV3uY3WYiHa+ay7gIAAAAAAABAVIkAAAAAAAA=");
+    assert_eq!(output.signature, "AF7oDeTkRQT23xGuW1WsILvm2FQIycaP6bvbTA8oQ8QJU75VQcJDTgEscfxfg8GAN60uzSLKVAJKXKOu8O6vugmF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
+
+#[test]
+fn test_sui_sign_undelegate_sui() {
+    let add_stake = Proto::RequestWithdrawStake {
+        // Coin type: `0x2::sui::SUI`.
+        staked_sui: Some(object_ref(
+            "0x4d3211b1569a24226d672b7de4edb08fa9e19b4f02dab89c9236e4fc8c4ab12d",
+            86012336,
+            "559WJM2RXnQvPyLzRJpUj2bH9ZuZNxd48YJKwNXxtxMn",
+        )),
+        // Coin type: `0x2::sui::SUI`.
+        gas: Some(object_ref(
+            "0x102054b7676a46b1bae724134dc962db729f3389acf79d3d6f3c27ba018a0404",
+            86012337,
+            "AhhZeVzEF8uGG8rRKv4h4J2MyeUXZvvDYEb1C64pyip7",
+        )),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::request_withdraw_stake(add_stake),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.009 SUI
+        gas_budget: 9000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: AwZgU1EoWoo2Zn72U119KRvdjkvUz8QXN3fedLnGXa4n
+    assert_eq!(output.unsigned_tx, "AAACAQEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABQEAAAAAAAAAAQEATTIRsVaaJCJtZyt95O2wj6nhm08C2rickjbk/IxKsS2wcSAFAAAAACA8frAQitBlYHSw54BYKrEOpjPNXZtUQcp8CBCgeteO2QEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMKc3VpX3N5c3RlbRZyZXF1ZXN0X3dpdGhkcmF3X3N0YWtlAAIBAAABAQBU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgEQIFS3Z2pGsbrnJBNNyWLbcp8ziaz3nT1vPCe6AYoEBLFxIAUAAAAAIJAmR388UsDK20u66hpL0Yo017timzGO1w9bTx3rP9fAVOgNdteQwnf1pE886S9T0m9YlIkr85Xe5jdZiIdr5rLuAgAAAAAAAEBUiQAAAAAAAA==");
+    assert_eq!(output.signature, "ADbHKQ6TSvyrjll8YwIl+0/BnPR3YedjbLllydFcYL2gCt5AdX2wXZxbwfFgpLCMUPe2tGXzj09MkWsjxEM3XwqF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
+
+#[test]
+fn test_sui_sign_transfer_nft() {
+    let transfer_obj = Proto::TransferObject {
+        // NFT https://suiscan.xyz/mainnet/object/0x2e2355a7e5f857a67c237d27e5a2184f9c683f4275d54bf90dcc70f6117f4a03
+        object: Some(object_ref(
+            "0x2e2355a7e5f857a67c237d27e5a2184f9c683f4275d54bf90dcc70f6117f4a03",
+            86012337,
+            "2XTKVJGNZm7i6ZYGQ6ikZowFu855TpTUTip8JJ1jf1ch",
+        )),
+        recipient: "0xf887e7077017554511e736d43424363da946d8aa748225f6b054630a0b1c0ae5".into(),
+        gas: Some(object_ref(
+            "0x102054b7676a46b1bae724134dc962db729f3389acf79d3d6f3c27ba018a0404",
+            87121030,
+            "5eWAHWYnidUinZFf3CWNCLSxsUr3c56VVVVofAgaP6bu",
+        )),
+    };
+
+    let input = Proto::SigningInput {
+        transaction_payload: TransactionType::transfer_object(transfer_obj),
+        private_key: PRIVATE_KEY_54E80D76.decode_hex().unwrap().into(),
+        // 0.004 SUI
+        gas_budget: 4000000,
+        reference_gas_price: 750,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::Sui, input);
+
+    assert_eq!(output.error, SigningError::OK);
+    // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/zJdcR77RiaMTzq1rURePQdcEFLEKBMUXiiUG2PyGWzR
+    assert_eq!(output.unsigned_tx, "AAACACD4h+cHcBdVRRHnNtQ0JDY9qUbYqnSCJfawVGMKCxwK5QEALiNVp+X4V6Z8I30n5aIYT5xoP0J11Uv5Dcxw9hF/SgOxcSAFAAAAACAWqN6yiNss1A1yjjz0hYuYwWdS3Dui2QSHjdKsQz08ZgEBAQEBAAEAAFToDXbXkMJ39aRPPOkvU9JvWJSJK/OV3uY3WYiHa+ayARAgVLdnakaxuuckE03JYttynzOJrPedPW88J7oBigQEhlwxBQAAAAAgRQo1hDoAiMbl2lgicyjy67PmKIWT5wccUlQMAfu84LxU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsu4CAAAAAAAAAAk9AAAAAAAA");
+    assert_eq!(output.signature, "AIbNoo74XJ9EvfVCBVwM2YMht5qsPHSu4Cb61uzKq6g2tgh4dlhKpY9Shhw/hHjlNGcg590+PvXm4nlj/IWy6wGF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==");
+}
diff --git a/rust/tw_tests/tests/chains/sui/sui_transaction_util.rs b/rust/tw_tests/tests/chains/sui/sui_transaction_util.rs
new file mode 100644
index 00000000000..42119d0b4e6
--- /dev/null
+++ b/rust/tw_tests/tests/chains/sui/sui_transaction_util.rs
@@ -0,0 +1,10 @@
+use tw_any_coin::test_utils::transaction_calc_tx_hash_utils::TransactionUtilHelper;
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_sui_transaction_util_calc_tx_hash() {
+    let encoded_tx = "AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA";
+    let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::Sui, encoded_tx);
+
+    assert_eq!(tx_hash, "HkPo6rYPyDY53x1MBszvSZVZyixVN7CHvCJGX381czAh");
+}
diff --git a/rust/tw_tests/tests/chains/sui/test_cases.rs b/rust/tw_tests/tests/chains/sui/test_cases.rs
new file mode 100644
index 00000000000..04b824f3261
--- /dev/null
+++ b/rust/tw_tests/tests/chains/sui/test_cases.rs
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::sui::object_ref;
+use tw_proto::Sui::Proto::{self, mod_SigningInput::OneOftransaction_payload as TransactionType};
+
+pub(super) const PRIVATE_KEY_54E80D76: &str =
+    "7e6682f7bf479ef0f627823cffd4e1a940a7af33e5fb39d9e0f631d2ecc5daff";
+pub(super) const SENDER_54E80D76: &str =
+    "0x54e80d76d790c277f5a44f3ce92f53d26f5894892bf395dee6375988876be6b2";
+
+/// Successfully broadcasted: https://suiscan.xyz/mainnet/tx/D4Ay9TdBJjXkGmrZSstZakpEWskEQHaWURP6xWPRXbAm
+pub(super) mod transfer_d4ay9tdb {
+    use super::*;
+
+    pub const UNSIGNED_TX: &str = "AAAEAAjoAwAAAAAAAAAIUMMAAAAAAAAAIKcXWr3V7ZLr4605DbNmxqcGR4zfUXzebPmGMAZc2jd6ACBU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgMCAAIBAAABAQABAQMAAAAAAQIAAQEDAAABAAEDAFToDXbXkMJ39aRPPOkvU9JvWJSJK/OV3uY3WYiHa+ayAWNgILOn3HsRw6pvQZsX+KnBLn95ox0b3S3mcLTt1jAFeHEaBQAAAAAgGGuNnxrqusosgjP3gQ3jBjnhapGNBlcU0yTaupXpa0BU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsu4CAAAAAAAAwMYtAAAAAAAA";
+    pub const SIGNATURE: &str = "AEh44B7iGArEHF1wOLAQJMLNgGnaIwn3gKPC92vtDJqITDETAM5z9plaxio1xomt6/cZReQ5FZaQsMC6l7E0BwmF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g==";
+    pub const TX_HASH: &str = "4c171457873befef70077461909ae40ac67bdad476b832b9c09b589cd698578f";
+
+    pub fn sui_transfer_input() -> Proto::SigningInput<'static> {
+        let pay_sui = Proto::PaySui {
+            input_coins: vec![object_ref(
+                "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005",
+                85619064,
+                "2eKuWbZSVfpFVfg8FXY9wP6W5AFXnTchSoUdp7obyYZ5",
+            )],
+            recipients: vec![
+                "0xa7175abdd5ed92ebe3ad390db366c6a706478cdf517cde6cf98630065cda377a".into(),
+                // Send some amount to self.
+                SENDER_54E80D76.into(),
+            ],
+            amounts: vec![1000, 50_000],
+        };
+
+        Proto::SigningInput {
+            transaction_payload: TransactionType::pay_sui(pay_sui),
+            // 0.003 SUI
+            gas_budget: 3000000,
+            reference_gas_price: 750,
+            ..Proto::SigningInput::default()
+        }
+    }
+}
diff --git a/rust/tw_tests/tests/chains/tbinance/mod.rs b/rust/tw_tests/tests/chains/tbinance/mod.rs
new file mode 100644
index 00000000000..07b4922f0c3
--- /dev/null
+++ b/rust/tw_tests/tests/chains/tbinance/mod.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod tbinance_address;
diff --git a/rust/tw_tests/tests/chains/tbinance/tbinance_address.rs b/rust/tw_tests/tests/chains/tbinance/tbinance_address.rs
new file mode 100644
index 00000000000..cb561ea17e9
--- /dev/null
+++ b/rust/tw_tests/tests/chains/tbinance/tbinance_address.rs
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_tbinance_address_normalization() {
+    test_address_normalization(
+        CoinType::TBinance,
+        "tbnb18mtcq20875cr0p7l4upm0u5zx4r9jpj2kfu9f8",
+        "tbnb18mtcq20875cr0p7l4upm0u5zx4r9jpj2kfu9f8",
+    );
+}
+
+#[test]
+fn test_tbinance_address_is_valid() {
+    test_address_valid(
+        CoinType::TBinance,
+        "tbnb18mtcq20875cr0p7l4upm0u5zx4r9jpj2kfu9f8",
+    );
+}
+
+#[test]
+fn test_tbinance_address_invalid() {
+    test_address_invalid(
+        CoinType::TBinance,
+        "tbnb18mtcq20875cr0p7l4upm0u5zx4r9jpj2kfu9aa",
+    );
+    // Mainnet.
+    test_address_invalid(
+        CoinType::TBinance,
+        "bnb1h8xf9htasu9aclra954dnnve8fgcda4ae7qfa8",
+    );
+}
+
+#[test]
+fn test_tbinance_address_get_data() {
+    test_address_get_data(
+        CoinType::TBinance,
+        "tbnb18mtcq20875cr0p7l4upm0u5zx4r9jpj2kfu9f8",
+        "3ed78029e7f5303787dfaf03b7f282354659064a",
+    );
+}
diff --git a/rust/tw_tests/tests/chains/thorchain/mod.rs b/rust/tw_tests/tests/chains/thorchain/mod.rs
new file mode 100644
index 00000000000..739ea814591
--- /dev/null
+++ b/rust/tw_tests/tests/chains/thorchain/mod.rs
@@ -0,0 +1,8 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod test_cases;
+mod thorchain_address;
+mod thorchain_compile;
+mod thorchain_sign;
diff --git a/rust/tw_tests/tests/chains/thorchain/test_cases.rs b/rust/tw_tests/tests/chains/thorchain/test_cases.rs
new file mode 100644
index 00000000000..5e5c256d337
--- /dev/null
+++ b/rust/tw_tests/tests/chains/thorchain/test_cases.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_cosmos_sdk::test_utils::proto_utils::{make_amount, make_fee, make_message};
+use tw_proto::Cosmos::Proto;
+use tw_proto::Cosmos::Proto::mod_Message::OneOfmessage_oneof as MessageEnum;
+
+/// https://viewblock.io/thorchain/tx/FD0445AFFC4ED9ACCB7B5D3ADE361DAE4596EA096340F1360F1020381EA454AF
+pub(super) mod send_fd0445af {
+    use super::*;
+
+    pub const PRIVATE_KEY: &str =
+        "7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e";
+    pub const JSON_TX_PREIMAGE: &str = r#"{"account_number":"593","chain_id":"thorchain","fee":{"amount":[{"amount":"2000000","denom":"rune"}],"gas":"200000"},"memo":"","msgs":[{"type":"thorchain/MsgSend","value":{"amount":[{"amount":"10000000","denom":"rune"}],"from_address":"thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r","to_address":"thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"}}],"sequence":"3"}"#;
+    /// Expected `json` value.
+    pub const JSON_TX: &str = r#"{"mode":"block","tx":{"fee":{"amount":[{"amount":"2000000","denom":"rune"}],"gas":"200000"},"memo":"","msg":[{"type":"thorchain/MsgSend","value":{"amount":[{"amount":"10000000","denom":"rune"}],"from_address":"thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r","to_address":"thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"},"signature":"qgpMX3WNq4DsNBnYtdmBD4ejiailK4uI/m3/YVqCSNF8AtkUOTmP48ztqCbpkWTFvw1/9S8/ivsFxOcK6AI0jA=="}]}}"#;
+    /// Expected `signature` for JSON signing mode.
+    pub const JSON_SIGNING_SIGNATURE: &str = "aa0a4c5f758dab80ec3419d8b5d9810f87a389a8a52b8b88fe6dff615a8248d17c02d91439398fe3cceda826e99164c5bf0d7ff52f3f8afb05c4e70ae802348c";
+    /// Expected `signature_json` for JSON signing mode.
+    pub const JSON_SIGNING_SIGNATURE_JSON: &str = r#"[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"},"signature":"qgpMX3WNq4DsNBnYtdmBD4ejiailK4uI/m3/YVqCSNF8AtkUOTmP48ztqCbpkWTFvw1/9S8/ivsFxOcK6AI0jA=="}]"#;
+
+    pub fn signing_input() -> Proto::SigningInput<'static> {
+        let send_msg = Proto::mod_Message::Send {
+            from_address: "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r".into(),
+            to_address: "thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn".into(),
+            amounts: vec![make_amount("rune", "10000000")],
+            ..Proto::mod_Message::Send::default()
+        };
+        Proto::SigningInput {
+            account_number: 593,
+            chain_id: "thorchain".into(),
+            sequence: 3,
+            fee: Some(make_fee(200000, make_amount("rune", "2000000"))),
+            messages: vec![make_message(MessageEnum::send_coins_message(send_msg))],
+            ..Proto::SigningInput::default()
+        }
+    }
+}
diff --git a/rust/tw_tests/tests/chains/thorchain/thorchain_address.rs b/rust/tw_tests/tests/chains/thorchain/thorchain_address.rs
new file mode 100644
index 00000000000..05d344ed566
--- /dev/null
+++ b/rust/tw_tests/tests/chains/thorchain/thorchain_address.rs
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_bech32_is_valid, test_address_create_bech32_with_public_key,
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+    AddressBech32IsValid, AddressCreateBech32WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_thorchain_address_normalization() {
+    test_address_normalization(
+        CoinType::THORChain,
+        "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r",
+        "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r",
+    );
+}
+
+#[test]
+fn test_thorchain_address_is_valid() {
+    test_address_valid(
+        CoinType::THORChain,
+        "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r",
+    );
+    test_address_valid(
+        CoinType::THORChain,
+        "thor1c8jd7ad9pcw4k3wkuqlkz4auv95mldr2kyhc65",
+    );
+}
+
+#[test]
+fn test_thorchain_address_invalid() {
+    test_address_invalid(
+        CoinType::THORChain,
+        "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02",
+    );
+    test_address_invalid(
+        CoinType::THORChain,
+        "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0e",
+    );
+}
+
+#[test]
+fn test_thorchain_address_get_data() {
+    test_address_get_data(
+        CoinType::THORChain,
+        "thor1c8jd7ad9pcw4k3wkuqlkz4auv95mldr2kyhc65",
+        "c1e4df75a50e1d5b45d6e03f6157bc6169bfb46a",
+    );
+}
+
+#[test]
+fn test_any_address_is_valid_bech32() {
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Cosmos,
+        address: "thor1c8jd7ad9pcw4k3wkuqlkz4auv95mldr2kyhc65",
+        hrp: "thor",
+    });
+}
+
+#[test]
+fn test_any_address_create_bech32_with_public_key() {
+    test_address_create_bech32_with_public_key(AddressCreateBech32WithPublicKey {
+        coin: CoinType::Cosmos,
+        private_key: "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed",
+        public_key_type: PublicKeyType::Secp256k1,
+        hrp: "thor",
+        expected: "thor1p05ufmhfpkjzqmc2u8humvgcqatq0esjqzrcut",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/thorchain/thorchain_compile.rs b/rust/tw_tests/tests/chains/thorchain/thorchain_compile.rs
new file mode 100644
index 00000000000..3b4aa79f304
--- /dev/null
+++ b/rust/tw_tests/tests/chains/thorchain/thorchain_compile.rs
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::thorchain::test_cases::send_fd0445af::{
+    signing_input, JSON_SIGNING_SIGNATURE, JSON_SIGNING_SIGNATURE_JSON, JSON_TX, JSON_TX_PREIMAGE,
+    PRIVATE_KEY,
+};
+use tw_any_coin::ffi::tw_transaction_compiler::{
+    tw_transaction_compiler_compile, tw_transaction_compiler_pre_image_hashes,
+};
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::ToHex;
+use tw_hash::H256;
+use tw_keypair::ecdsa::secp256k1;
+use tw_keypair::traits::{KeyPairTrait, SigningKeyTrait};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_memory::test_utils::tw_data_vector_helper::TWDataVectorHelper;
+use tw_misc::traits::ToBytesVec;
+use tw_proto::Cosmos::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_any_signer_compile_thorchain() {
+    let private_key = secp256k1::KeyPair::try_from(PRIVATE_KEY).unwrap();
+    let public_key = private_key.public().to_vec();
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::JSON,
+        public_key: public_key.clone().into(),
+        ..signing_input()
+    };
+
+    // Step 2: Obtain preimage hash
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let preimage_data = TWDataHelper::wrap(unsafe {
+        tw_transaction_compiler_pre_image_hashes(CoinType::THORChain as u32, input_data.ptr())
+    })
+    .to_vec()
+    .expect("!tw_transaction_compiler_pre_image_hashes returned nullptr");
+
+    let preimage: CompilerProto::PreSigningOutput =
+        deserialize(&preimage_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(preimage.error, SigningErrorType::OK);
+    assert!(preimage.error_message.is_empty());
+    let tx_preimage = String::from_utf8(preimage.data.to_vec())
+        .expect("Invalid transaction preimage. Expected a JSON object");
+    assert_eq!(tx_preimage, JSON_TX_PREIMAGE);
+
+    // Step 3: Sign the data "externally"
+
+    let tx_hash = H256::try_from(preimage.data_hash.as_ref()).expect("Invalid Transaction Hash");
+
+    let signature = private_key
+        .sign(tx_hash)
+        .expect("Error signing data")
+        .to_vec();
+    assert!(
+        signature.to_hex().contains(JSON_SIGNING_SIGNATURE),
+        "{} must contain {}",
+        signature.to_hex(),
+        JSON_SIGNING_SIGNATURE
+    );
+
+    // Step 4: Compile transaction info
+
+    let signatures = TWDataVectorHelper::create([signature]);
+    let public_keys = TWDataVectorHelper::create([public_key]);
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+    let output_data = TWDataHelper::wrap(unsafe {
+        tw_transaction_compiler_compile(
+            CoinType::THORChain as u32,
+            input_data.ptr(),
+            signatures.ptr(),
+            public_keys.ptr(),
+        )
+    })
+    .to_vec()
+    .expect("!tw_transaction_compiler_compile returned nullptr");
+
+    let output: Proto::SigningOutput =
+        deserialize(&output_data).expect("Coin entry returned an invalid output");
+
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    // https://viewblock.io/thorchain/tx/FD0445AFFC4ED9ACCB7B5D3ADE361DAE4596EA096340F1360F1020381EA454AF
+    assert_eq!(output.json, JSON_TX);
+    assert_eq!(output.signature.to_hex(), JSON_SIGNING_SIGNATURE);
+    assert_eq!(output.signature_json, JSON_SIGNING_SIGNATURE_JSON);
+}
diff --git a/rust/tw_tests/tests/chains/thorchain/thorchain_sign.rs b/rust/tw_tests/tests/chains/thorchain/thorchain_sign.rs
new file mode 100644
index 00000000000..c02744e79f3
--- /dev/null
+++ b/rust/tw_tests/tests/chains/thorchain/thorchain_sign.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::thorchain::test_cases::send_fd0445af::{
+    signing_input, JSON_SIGNING_SIGNATURE, JSON_SIGNING_SIGNATURE_JSON, JSON_TX, PRIVATE_KEY,
+};
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_proto::Cosmos::Proto;
+use tw_proto::{deserialize, serialize};
+
+#[test]
+fn test_any_signer_sign_thorchain() {
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::JSON,
+        private_key: PRIVATE_KEY.decode_hex().unwrap().into(),
+        ..signing_input()
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output = TWDataHelper::wrap(unsafe {
+        tw_any_signer_sign(input_data.ptr(), CoinType::THORChain as u32)
+    })
+    .to_vec()
+    .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    // https://viewblock.io/thorchain/tx/FD0445AFFC4ED9ACCB7B5D3ADE361DAE4596EA096340F1360F1020381EA454AF
+    assert_eq!(output.json, JSON_TX);
+    assert_eq!(output.signature.to_hex(), JSON_SIGNING_SIGNATURE);
+    assert_eq!(output.signature_json, JSON_SIGNING_SIGNATURE_JSON);
+}
diff --git a/rust/tw_tests/tests/chains/ton/cell_example.rs b/rust/tw_tests/tests/chains/ton/cell_example.rs
new file mode 100644
index 00000000000..55c2248c939
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/cell_example.rs
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::sync::Arc;
+use tw_ton_sdk::address::address_data::AddressData;
+use tw_ton_sdk::address::raw_address::RawAddress;
+use tw_ton_sdk::boc::BagOfCells;
+use tw_ton_sdk::cell::cell_builder::CellBuilder;
+use tw_ton_sdk::message::state_init::StateInit;
+
+pub fn comment_cell(comment: &str) -> String {
+    let mut builder = CellBuilder::new();
+    builder
+        .store_u32(32, 0)
+        .unwrap()
+        .store_string(comment)
+        .unwrap();
+    let cell = builder.build().unwrap();
+    BagOfCells::from_root(cell).to_base64(true).unwrap()
+}
+
+/// Doge chatbot example
+/// https://docs.ton.org/develop/dapps/ton-connect/transactions#smart-contract-deployment
+pub fn doge_chatbot_state_init(current_timestamp: u32) -> String {
+    let current_timestamp_ms = current_timestamp as u64 * 1000;
+
+    let doge_chatbot_boc = BagOfCells::parse_base64("te6cckEBAgEARAABFP8A9KQT9LzyyAsBAGrTMAGCCGlJILmRMODQ0wMx+kAwi0ZG9nZYcCCAGMjLBVAEzxaARfoCE8tqEssfAc8WyXP7AN4uuM8=").unwrap();
+    let doge_chatbot_cell = doge_chatbot_boc.single_root().unwrap();
+
+    let mut data_builder = CellBuilder::new();
+    // Current timestamp makes this Doge chatbot unique across other bots with the same contract code.
+    data_builder.store_u64(64, current_timestamp_ms).unwrap();
+    let data = data_builder.build().unwrap();
+
+    let state_init_cell = StateInit::default()
+        .set_code(Arc::clone(doge_chatbot_cell))
+        .set_data(data.into_arc())
+        .to_cell()
+        .unwrap();
+
+    BagOfCells::from_root(state_init_cell)
+        .to_base64(true)
+        .unwrap()
+}
+
+pub fn contract_address_from_state_init(state_init: &str) -> String {
+    let state_init_boc = BagOfCells::parse_base64(state_init).unwrap();
+    let state_init_cell = state_init_boc.single_root().unwrap();
+    let state_init_hash = state_init_cell.cell_hash();
+    RawAddress::from(AddressData::new(0, state_init_hash)).to_string()
+}
diff --git a/rust/tw_tests/tests/chains/ton/mod.rs b/rust/tw_tests/tests/chains/ton/mod.rs
new file mode 100644
index 00000000000..14be3a93db3
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/mod.rs
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod cell_example;
+mod ton_address;
+mod ton_address_converter;
+mod ton_compile;
+mod ton_message_signer;
+mod ton_sign;
+mod ton_sign_wallet_v5r1;
+mod ton_transaction_util;
+mod ton_wallet;
diff --git a/rust/tw_tests/tests/chains/ton/ton_address.rs b/rust/tw_tests/tests/chains/ton/ton_address.rs
new file mode 100644
index 00000000000..b6a388f499f
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/ton_address.rs
@@ -0,0 +1,216 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_derive, test_address_get_data, test_address_invalid, test_address_normalization,
+    test_address_valid,
+};
+use tw_coin_registry::coin_type::CoinType;
+
+const WALLET_1_DATA: &str = "8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae";
+const WALLET_1_RAW: &str = "0:8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae";
+const WALLET_1_BOUNCEABLE: &str = "EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorkdl";
+const WALLET_1_NON_BOUNCEABLE: &str = "UQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorhqg";
+const WALLET_1_BOUNCEABLE_TESTNET: &str = "kQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorvzv";
+const WALLET_1_NON_BOUNCEABLE_TESTNET: &str = "0QCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorqEq";
+
+#[test]
+fn test_ton_address_derive() {
+    test_address_derive(
+        CoinType::TON,
+        "5849481021e305dfdf9f0eaf87e07f15efec3fde8d8ed639c9fcf0bc351d998b",
+        "UQAACKJfEIfI5vkht_w3NYk8k-OU5Xl_jq9XNmmkcPaUO-tB",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "4a22d994755145e4a4ce7263bdb3a8a70e449c1fccdd299f80df862bd4dcb930",
+        "UQA3fRa_AHKBo1Lu8QF5xm_fiCLi197NfoPbeta0VJyvKa76",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "287d4c0fcc445173fe211e4ade3518c75cff7a9dd79070f54395058cdd53e485",
+        "UQCbJ0QdlDmC0ofyCtH15PHBzrj9sMLoLjNjkgTYaxR8gn9z",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "136e464280c4222a99ac34d5077a2edf11e4468a076741e495d9f31ca7939a1f",
+        "UQAliC8yJh-Ru2uwEWgEaEV9LHEs0-c1blYr_XZe7CpEwm9D",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "f15bb09a2cf37f6e6b6515be4000cdf271338c56fb1ec81848f2f1407b3a4003",
+        "UQCeAQaIFwwjmcJkYfqGiyHo2ag7qUMMfsUi28HLWmtpA7zF",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "532005268411b3b4ac85b080c8a3bc4a52600be75f758013302745ac05ac18f0",
+        "UQDD0YS5pQSe3fgHEKd-D7qTieRxmSknlQQW6fb7IFu7ky9T",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "15e5a13ec259bb4515105ba0a84ee93eaa9f56f6fdf73bf6179d1ed80b6a399c",
+        "UQAx8JmUT4p14RUAu9gpXqmTzkQz4e3GZz8VQjqWXFDxG6-S",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "9b503ff85debe95093acf0f9b057607a0a5be91cb47e2e6ec342d7825c7fafbc",
+        "UQD91HEk-TJVublA57dgkSwgrRORj48ubEIfjEPZIjQ08oZl",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "97075969876382280ff7598738b3fd2c1748f9a549dd6f5d6aa5694c21deddce",
+        "UQBrL2lNG3ThmYbf9gaA_-tsPfdrcGy27LP0M-qg-1TpG_wR",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "57d86027989f8ec649cce3be862d68564d471395c5694918b0348e17c7ef6ffe",
+        "UQDUJLg8MYZPT2C-2n-ulyNSkBsdDaUzqEq71dBx3l6fhnuL",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "b1ad2bff14fc018493c32c37cded62892ec507471e34a25da0b5b5f05e131751",
+        "UQD079e5CETiOrR_iS0atJukl7ixS6EYbtaWRSGykFAtwRhL",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "16ad201c59ecd7ace74e1677160106923a3d2ee11c495be5c3b88ba6f7ef3d17",
+        "UQDuU7NOk_eGzP5CLs_Zeg0LBpySAGy02qqGv0cO_zX5WN1n",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "3d935b7a8c24e7dc55ef7c0c890806cee3af1174a62165d4d2fb64ccf2e2260b",
+        "UQALRogl66QrJIb3KbStOd-ZadA6Ye2g23ME6JAMU1HOXRG2",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "68f3a87d12514854774300b8a4c449616e208336f1b609c96fcd8b1a87d4e064",
+        "UQALrF1c2UeoCybOsSeAdUmip4yhcCtrUAhKZ-9bxv6_okVx",
+    );
+    test_address_derive(
+        CoinType::TON,
+        "fbfbc640c4cd4649161a935562217f1caecf6e7f3a2818921f9ee336741a48cb",
+        "UQAzCS7JoSiOi1BdH4nFkuvUwbBjxUzPx1AhQKwiwXAv27Xs",
+    );
+}
+
+#[test]
+fn test_ton_address_normalization() {
+    test_address_normalization(CoinType::TON, WALLET_1_RAW, WALLET_1_NON_BOUNCEABLE);
+    test_address_normalization(CoinType::TON, WALLET_1_BOUNCEABLE, WALLET_1_NON_BOUNCEABLE);
+    test_address_normalization(
+        CoinType::TON,
+        WALLET_1_NON_BOUNCEABLE,
+        WALLET_1_NON_BOUNCEABLE,
+    );
+    test_address_normalization(
+        CoinType::TON,
+        WALLET_1_BOUNCEABLE_TESTNET,
+        WALLET_1_NON_BOUNCEABLE,
+    );
+    test_address_normalization(
+        CoinType::TON,
+        WALLET_1_NON_BOUNCEABLE_TESTNET,
+        WALLET_1_NON_BOUNCEABLE,
+    );
+}
+
+#[test]
+fn test_ton_address_is_valid() {
+    // Raw, hex-encoded
+    // For now, we allow to specify master-chain addresses.
+    test_address_valid(
+        CoinType::TON,
+        "-1:8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae",
+    );
+
+    // User-friendly, url-safe
+    test_address_valid(
+        CoinType::TON,
+        "EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorkdl",
+    );
+    test_address_valid(
+        CoinType::TON,
+        "EQBGqFmKe3oY8PChYN9g92ZEV2ybkzVB-hCiesQRn5mFnrNv",
+    );
+    test_address_valid(
+        CoinType::TON,
+        "Ef8JfFPRpHBV_tZpCurvxMJW69nt2js3SuGEWojGnOpCVPRe",
+    );
+    test_address_valid(
+        CoinType::TON,
+        "Ef_drj6m7jcME0fWTA-OwFC-6F0Le2SuOUQ6ibRc3Vz8HL8H",
+    );
+
+    // User-friendly
+    test_address_valid(
+        CoinType::TON,
+        "EQAN6Dr3vziti1Kp9D3aEFqJX4bBVfCaV57Z+9jwKTBXICv8",
+    );
+    test_address_valid(
+        CoinType::TON,
+        "EQCmGW+z+UL00FmnhWaMvJq/i86YY5GlJP3uJW19KC5Tzq4C",
+    );
+}
+
+#[test]
+fn test_ton_address_invalid() {
+    test_address_invalid(CoinType::TON, "random string");
+
+    // Invalid size
+    test_address_invalid(
+        CoinType::TON,
+        "EQIcIZpPoMnWXd8FbC1KaLtcyIgVUlwsbFK_3P6f5uf_YyzoE",
+    );
+    test_address_invalid(
+        CoinType::TON,
+        "EQIcIZpPoMnWXd8FbC1KaLtcyIgVUlwsbFK_3P6f5uf_YyE",
+    );
+
+    // Invalid size after decode
+    test_address_invalid(
+        CoinType::TON,
+        "EQIcIZpPoMnWXd8FbC1KaLtcyIgVUlwsbFK_3P6f5uf_Yyw=",
+    );
+
+    // Invalid workchain
+    test_address_invalid(
+        CoinType::TON,
+        "1:0ccd5119f27f7fe4614476c34f7e5e93c7ae098e577cf2012f8b8043165cb809",
+    );
+    test_address_invalid(
+        CoinType::TON,
+        "EQEMzVEZ8n9_5GFEdsNPfl6Tx64Jjld88gEvi4BDFly4CSyl",
+    );
+    test_address_invalid(
+        CoinType::TON,
+        "-2:e0e98cfcf743292298ad9e379a3c2e6401797b9cbfc0fe98b4e14fd0ce07ecdf",
+    );
+    test_address_invalid(
+        CoinType::TON,
+        "Ef7g6Yz890MpIpitnjeaPC5kAXl7nL_A_pi04U_Qzgfs3-Cj",
+    );
+
+    // Invalid tag
+    test_address_invalid(
+        CoinType::TON,
+        "MwCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorsn8",
+    ); // 0x33
+    test_address_invalid(
+        CoinType::TON,
+        "swCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsornJ2",
+    ); // 0x80 + 0x33
+    test_address_invalid(
+        CoinType::TON,
+        "EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsormVH",
+    ); // crc[a, b] = crc[b, a]
+    test_address_invalid(
+        CoinType::TON,
+        "EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorpcF",
+    ); // crc=0x9705
+}
+
+#[test]
+fn test_ton_address_get_data() {
+    test_address_get_data(CoinType::TON, WALLET_1_NON_BOUNCEABLE, WALLET_1_DATA);
+}
diff --git a/rust/tw_tests/tests/chains/ton/ton_address_converter.rs b/rust/tw_tests/tests/chains/ton/ton_address_converter.rs
new file mode 100644
index 00000000000..203da896306
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/ton_address_converter.rs
@@ -0,0 +1,182 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+use wallet_core_rs::ffi::ton::address_converter::{
+    tw_ton_address_converter_from_boc, tw_ton_address_converter_to_boc,
+    tw_ton_address_converter_to_user_friendly,
+};
+
+struct GetJettonAddressInput {
+    main_address: &'static str,
+    expected_main_address_encoded: &'static str,
+    jetton_address_boc_encoded: &'static str,
+    expected_jetton_address: &'static str,
+}
+
+fn test_address_converter_get_jetton_address(input: GetJettonAddressInput) {
+    let main_address = TWStringHelper::create(input.main_address);
+
+    let main_address_boc_encoded_ptr =
+        unsafe { tw_ton_address_converter_to_boc(main_address.ptr()) };
+    let main_address_boc_encoded = TWStringHelper::wrap(main_address_boc_encoded_ptr)
+        .to_string()
+        .unwrap();
+    assert_eq!(
+        main_address_boc_encoded,
+        input.expected_main_address_encoded
+    );
+
+    // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+    // '{"address":"JETTON_CONTRACT_ADDRESS","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","YOUR_MAIN_ADDRESS"]]}'
+
+    // `get_wallet_address` response:
+    let jetton_address_boc_encoded = TWStringHelper::create(input.jetton_address_boc_encoded);
+    let jetton_address_ptr =
+        unsafe { tw_ton_address_converter_from_boc(jetton_address_boc_encoded.ptr()) };
+    let jetton_address_str = TWStringHelper::wrap(jetton_address_ptr)
+        .to_string()
+        .unwrap();
+    assert_eq!(jetton_address_str, input.expected_jetton_address);
+}
+
+#[test]
+fn test_address_converter_get_jetton_notcoin_address() {
+    test_address_converter_get_jetton_address(GetJettonAddressInput {
+        main_address: "UQBjKqthWBE6GEcqb_epTRFrQ1niS6Z1Z1MHMwR-mnAYRoYr",
+        expected_main_address_encoded:
+            "te6cckEBAQEAJAAAQ4AMZVVsKwInQwjlTf71KaItaGs8SXTOrOpg5mCP004DCNAptHQU",
+        // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+        // '{"address":"EQAvlWFDxGF2lXm67y4yzC17wYKD9A0guwPkMs1gOsM__NOT","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","te6cckEBAQEAJAAAQ4AMZVVsKwInQwjlTf71KaItaGs8SXTOrOpg5mCP004DCNAptHQU"]]}'
+        jetton_address_boc_encoded:
+            "te6cckEBAQEAJAAAQ4AFvT5rqwxcbKfITqnkwL+go4Zi9bulRHAtLt4cjjFdK7B8L+Cq",
+        expected_jetton_address: "UQAt6fNdWGLjZT5CdU8mBf0FHDMXrd0qI4FpdvDkcYrpXV5H",
+    });
+}
+
+#[test]
+fn test_address_converter_get_jetton_usdt_address() {
+    test_address_converter_get_jetton_address(GetJettonAddressInput {
+        main_address: "UQBjKqthWBE6GEcqb_epTRFrQ1niS6Z1Z1MHMwR-mnAYRoYr",
+        expected_main_address_encoded:
+            "te6cckEBAQEAJAAAQ4AMZVVsKwInQwjlTf71KaItaGs8SXTOrOpg5mCP004DCNAptHQU",
+        // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+        // '{"address":"EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","te6cckEBAQEAJAAAQ4AMZVVsKwInQwjlTf71KaItaGs8SXTOrOpg5mCP004DCNAptHQU"]]}'
+        jetton_address_boc_encoded:
+            "te6cckEBAQEAJAAAQ4Aed71FEI46jdFXghsGUIG2GIR8wpbQaLzrKNj7BtHOEHBSO5Mf",
+        expected_jetton_address: "UQDzveoohHHUboq8ENgyhA2wxCPmFLaDRedZRsfYNo5wg4TL",
+    });
+}
+
+#[test]
+fn test_address_converter_get_jetton_ston_address() {
+    test_address_converter_get_jetton_address(GetJettonAddressInput {
+        main_address: "EQATQPeCwtMzQ9u54nTjUNcK4n_0VRSxPOOROLf_IE0OU3XK",
+        expected_main_address_encoded:
+            "te6cckEBAQEAJAAAQ4ACaB7wWFpmaHt3PE6cahrhXE/+iqKWJ5xyJxb/5AmhynDu6Ygj",
+        // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+        // '{"address":"EQA2kCVNwVsil2EM2mB0SkXytxCqQjS4mttjDpnXmwG9T6bO","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","te6cckEBAQEAJAAAQ4ACaB7wWFpmaHt3PE6cahrhXE/+iqKWJ5xyJxb/5AmhynDu6Ygj"]]}'
+        jetton_address_boc_encoded:
+            "te6cckEBAQEAJAAAQ4ALPu0dyA1gHd3r7J1rxlvhXSvT5y3rokMDMiCQ86TsUJDnt69H",
+        expected_jetton_address: "UQBZ92juQGsA7u9fZOteMt8K6V6fOW9dEhgZkQSHnSdihHPH",
+    });
+}
+
+#[test]
+fn test_address_converter_from_boc_null_address() {
+    // `get_wallet_address` response:
+    let null_address_boc_encoded = TWStringHelper::create("te6cckEBAQEAAwAAASCUQYZV");
+    let jetton_address_ptr =
+        unsafe { tw_ton_address_converter_from_boc(null_address_boc_encoded.ptr()) };
+    assert_eq!(
+        TWStringHelper::wrap(jetton_address_ptr)
+            .to_string()
+            .unwrap(),
+        "UQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKZ"
+    );
+}
+
+#[test]
+fn test_address_converter_from_boc_error() {
+    #[track_caller]
+    fn test_impl(addr_boc_encoded: &str) {
+        let addr_boc_encoded_ptr = TWStringHelper::create(addr_boc_encoded);
+        let jetton_address_ptr =
+            unsafe { tw_ton_address_converter_from_boc(addr_boc_encoded_ptr.ptr()) };
+        assert!(
+            jetton_address_ptr.is_null(),
+            "'{}' BoC encoded expected to be invalid",
+            addr_boc_encoded
+        );
+    }
+
+    // No type bit.
+    test_impl("te6cckEBAQEAAwAAAcCO6ba2");
+    // No res1 and workchain bits.
+    test_impl("te6cckEBAQEAAwAAAaDsenDX");
+    // Incomplete hash (31 bytes instead of 32).
+    test_impl("te6cckEBAQEAIwAAQYAgQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAUGJnJWk=");
+    // Expected 267 bits, found 268.
+    test_impl("te6cckEBAQEAJAAAQ4AgQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEgGG0Gq");
+}
+
+#[test]
+fn test_address_converter_to_user_friendly() {
+    #[track_caller]
+    fn test_impl(addr: &str, bounceable: bool, testnet: bool, expected: &str) {
+        let addr_ptr = TWStringHelper::create(addr);
+        let actual_ptr = unsafe {
+            tw_ton_address_converter_to_user_friendly(addr_ptr.ptr(), bounceable, testnet)
+        };
+        let actual_str = TWStringHelper::wrap(actual_ptr).to_string().unwrap();
+        assert_eq!(actual_str, expected);
+    }
+
+    let raw_address = "0:8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae";
+    let bounceable = "EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorkdl";
+    let non_bounceable = "UQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorhqg";
+    let bounceable_testnet = "kQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorvzv";
+    let non_bounceable_testnet = "0QCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorqEq";
+
+    // Raw to user friendly.
+    test_impl(raw_address, true, false, bounceable);
+    test_impl(raw_address, false, false, non_bounceable);
+    test_impl(raw_address, true, true, bounceable_testnet);
+    test_impl(raw_address, false, true, non_bounceable_testnet);
+
+    // Bounceable to non-bounceable.
+    test_impl(bounceable, false, false, non_bounceable);
+
+    // Non-bounceable to bounceable.
+    test_impl(non_bounceable, true, false, bounceable);
+
+    // Non-bounceable to non-bounceable.
+    test_impl(non_bounceable, false, false, non_bounceable);
+}
+
+#[test]
+fn test_address_converter_to_user_friendly_error() {
+    #[track_caller]
+    fn test_impl(addr: &str, bounceable: bool, testnet: bool) {
+        let addr_ptr = TWStringHelper::create(addr);
+        let actual_ptr = unsafe {
+            tw_ton_address_converter_to_user_friendly(addr_ptr.ptr(), bounceable, testnet)
+        };
+        assert!(actual_ptr.is_null());
+    }
+
+    // No "0:" prefix.
+    test_impl(
+        "8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae",
+        true,
+        false,
+    );
+
+    // Too short.
+    test_impl(
+        "EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsor",
+        false,
+        false,
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ton/ton_compile.rs b/rust/tw_tests/tests/chains/ton/ton_compile.rs
new file mode 100644
index 00000000000..b13d6fc472e
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/ton_compile.rs
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::ton::ton_sign::assert_eq_boc;
+use tw_any_coin::test_utils::sign_utils::{CompilerHelper, PreImageHelper};
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::TheOpenNetwork::Proto;
+use tw_proto::TxCompiler::Proto as CompilerProto;
+
+#[test]
+fn test_ton_compile_wallet_v4r2_transfer_and_deploy() {
+    let public_key = "f42c77f931bea20ec5d0150731276bbb2e2860947661245b2319ef8133ee8d41";
+
+    let transfer = Proto::Transfer {
+        dest: "EQDYW_1eScJVxtitoBRksvoV9cCYo4uKGWLVNIHB1JqRR3n0".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        public_key: public_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        expire_at: 1671135440,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<CompilerProto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::TON, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "9da0ab29120fd96b48b2bb76843e77c0a1770b47c2f78da23299e2c32f50192e"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature_bytes = "e7c6f18186845784fa20c4d63c4261e58a1256c60e6de8aa6da9c008665564b35afe67eaf56af0963427aa78b0bfa1a895378983c7f135f99862df71b6e6b708".decode_hex().unwrap();
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(CoinType::TON, &input, vec![signature_bytes], vec![]);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/6ZzWOFKZt_m3kZjbwfbATwLaVwmUOdDp0xjhuY7PO3k=
+    assert_eq_boc(&output.encoded, "te6ccgICABoAAQAAA8sAAAJFiADN98eLgHfrkE8l8gmT8X5REpTVR6QnqDhArTbKlVvbZh4ABAABAZznxvGBhoRXhPogxNY8QmHlihJWxg5t6KptqcAIZlVks1r+Z+r1avCWNCeqeLC/oaiVN4mDx/E1+Zhi33G25rcIKamjF/////8AAAAAAAMAAgFiYgBsLf6vJOEq42xW0AoyWX0K+uBMUcXFDLFqmkDg6k1Io4hQAAAAAAAAAAAAAAAAAQADAAACATQABgAFAFEAAAAAKamjF/Qsd/kxvqIOxdAVBzEna7suKGCUdmEkWyMZ74Ez7o1BQAEU/wD0pBP0vPLICwAHAgEgAA0ACAT48oMI1xgg0x/TH9MfAvgju/Jk7UTQ0x/TH9P/9ATRUUO68qFRUbryogX5AVQQZPkQ8qP4ACSkyMsfUkDLH1Iwy/9SEPQAye1U+A8B0wchwACfbFGTINdKltMH1AL7AOgw4CHAAeMAIcAC4wABwAORMOMNA6TIyx8Syx/L/wAMAAsACgAJAAr0AMntVABsgQEI1xj6ANM/MFIkgQEI9Fnyp4IQZHN0cnB0gBjIywXLAlAFzxZQA/oCE8tqyx8Syz/Jc/sAAHCBAQjXGPoA0z/IVCBHgQEI9FHyp4IQbm90ZXB0gBjIywXLAlAGzxZQBPoCFMtqEssfyz/Jc/sAAgBu0gf6ANTUIvkABcjKBxXL/8nQd3SAGMjLBcsCIs8WUAX6AhTLaxLMzMlz+wDIQBSBAQj0UfKnAgIBSAAXAA4CASAAEAAPAFm9JCtvaiaECAoGuQ+gIYRw1AgIR6STfSmRDOaQPp/5g3gSgBt4EBSJhxWfMYQCASAAEgARABG4yX7UTQ1wsfgCAVgAFgATAgEgABUAFAAZrx32omhAEGuQ64WPwAAZrc52omhAIGuQ64X/wAA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYALm0AHQ0wMhcbCSXwTgItdJwSCSXwTgAtMfIYIQcGx1Z70ighBkc3RyvbCSXwXgA/pAMCD6RAHIygfL/8nQ7UTQgQFA1yH0BDBcgQEI9ApvoTGzkl8H4AXTP8glghBwbHVnupI4MOMNA4IQZHN0crqSXwbjDQAZABgAilAEgQEI9Fkw7UTQgQFA1yDIAc8W9ADJ7VQBcrCOI4IQZHN0coMesXCAGFAFywVQA88WI/oCE8tqyx/LP8mAQPsAkl8D4gB4AfoA9AQw+CdvIjBQCqEhvvLgUIIQcGx1Z4MesXCAGFAEywUmzxZY+gIZ9ADLaRfLH1Jgyz8gyYBA+wAG");
+    assert_eq!(
+        output.hash.to_hex(),
+        "b3d9462c13a8c67e19b62002447839c386de51415ace3ff6473b1e6294299819"
+    );
+}
+
+#[test]
+fn test_ton_compile_wallet_v5r1_transfer_and_deploy() {
+    let public_key = "55b837ceefc94d1865b763149c4751b43e297cea65dabfe20febed13d56072e4";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBe6DtCpJZe8M4t-crMXe93JlEYgSl30S5OUuMSLOfeQfBu".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        public_key: public_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        expire_at: 0xffffffff,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    // Step 2: Obtain preimage hash
+    let mut pre_imager = PreImageHelper::<CompilerProto::PreSigningOutput>::default();
+    let preimage_output = pre_imager.pre_image_hashes(CoinType::TON, &input);
+
+    assert_eq!(preimage_output.error, SigningError::OK);
+    assert_eq!(
+        preimage_output.data.to_hex(),
+        "d3b8dbedb049074d90bcae341484e0385789e19f69cd86d570939b94043739a7"
+    );
+
+    // Step 3: Compile transaction info
+
+    // Simulate signature, normally obtained from signature server.
+    let signature_bytes = "00239fa98ecbde5dda29ce7c78dc6e25369e1ff7e0070d9a1b472833e8630e98d684929b60a9ac003f2fd39e07612b8eeaf3776d09d5e54d7d061b067ded4c0e".decode_hex().unwrap();
+    let mut compiler = CompilerHelper::<Proto::SigningOutput>::default();
+    let output = compiler.compile(CoinType::TON, &input, vec![signature_bytes], vec![]);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/6ZzWOFKZt_m3kZjbwfbATwLaVwmUOdDp0xjhuY7PO3k=
+    assert_eq_boc(&output.encoded, "te6cckECGwEAA2sAAkWIACm9HPyVOpjCNOG6nbf+EwCONRHHpeMQsIlCoWNKhUaaHgECAgE0AwQBoXNpZ25///8R/////wAAAACACOfqY7L3l3aKc58eNxuJTaeH/fgBw2aG0coM+hjDpjWhJKbYKmsAD8v054HYSuO6vN3bQnV5U19BhsGfe1MDoAUBFP8A9KQT9LzyyAsGAFGAAAAAP///iKrcG+d35KaMMtuxik4jqNofFL51Mu1f8Qf19onqsDlyIAIKDsPIbQMWBwIBIAgJAWJiAC90HaFSSy94Zxb85WYu97uTKIxAlLvolycpcYkWc+8giFAAAAAAAAAAAAAAAAABFgIBSAoLAQLyDALc0CDXScEgkVuPYyDXCx8gghBleHRuvSGCEHNpbnS9sJJfA+CCEGV4dG66jrSAINchAdB01yH6QDD6RPgo+kQwWL2RW+DtRNCBAUHXIfQFgwf0Dm+hMZEw4YBA1yFwf9s84DEg10mBAoC5kTDgcOIXDQIBIA4PAR4g1wsfghBzaWduuvLgin8NAeaO8O2i7fshgwjXIgKDCNcjIIAg1yHTH9Mf0x/tRNDSANMfINMf0//XCgAK+QFAzPkQmiiUXwrbMeHywIffArNQB7Dy0IRRJbry4IVQNrry4Ib4I7vy0IgikvgA3gGkf8jKAMsfAc8Wye1UIJL4D95w2zzYFwIBIBARABm+Xw9qJoQICg65D6AsAgFuEhMCAUgUFQAZrc52omhAIOuQ64X/wAAZrx32omhAEOuQ64WPwAAXsyX7UTQcdch1wsfgABGyYvtRNDXCgCAAAAP27aLt+wL0BCFukmwhjkwCIdc5MHCUIccAs44tAdcoIHYeQ2wg10nACPLgkyDXSsAC8uCTINcdBscSwgBSMLDy0InXTNc5MAGk6GwShAe78uCT10rAAPLgk+1V4tIAAcAAkVvg69csCBQgkXCWAdcsCBwS4lIQseMPINdKGBkaAJYB+kAB+kT4KPpEMFi68uCR7UTQgQFB1xj0BQSdf8jKAEAEgwf0U/Lgi44UA4MH9Fvy4Iwi1woAIW4Bs7Dy0JDiyFADzxYS9ADJ7VQAcjDXLAgkji0h8uCS0gDtRNDSAFETuvLQj1RQMJExnAGBAUDXIdcKAPLgjuLIygBYzxbJ7VST8sCN4gAQk1vbMeHXTNB8Ui06");
+    assert_eq!(
+        output.hash.to_hex(),
+        "437dae441a95a6bccdcdcea2560c313de24f13dd85c76d5d7ecaab1e70a1e52b"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ton/ton_message_signer.rs b/rust/tw_tests/tests/chains/ton/ton_message_signer.rs
new file mode 100644
index 00000000000..523188947fa
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/ton_message_signer.rs
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_keypair::test_utils::tw_private_key_helper::TWPrivateKeyHelper;
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+use wallet_core_rs::ffi::ton::message_signer::tw_ton_message_signer_sign_message;
+
+#[test]
+fn test_ton_wallet_create_state_init() {
+    let private_key = TWPrivateKeyHelper::with_hex(
+        "112d4e2e700a468f1eae699329202f1ee671d6b665caa2d92dea038cf3868c18",
+    );
+    assert!(!private_key.is_null());
+    let message = TWStringHelper::create("Hello world");
+
+    let signature = TWStringHelper::wrap(unsafe {
+        tw_ton_message_signer_sign_message(private_key.ptr(), message.ptr())
+    });
+    assert!(!signature.ptr().is_null());
+    assert_eq!(signature.to_string().unwrap(), "2490fbaa72aec0b77b19162bbbe0b0e3f7afd42cc9ef469f0494cd4a366a4bf76643300cd5991f66bce6006336742b8d1d435d541d244dcc013d428472e89504");
+}
diff --git a/rust/tw_tests/tests/chains/ton/ton_sign.rs b/rust/tw_tests/tests/chains/ton/ton_sign.rs
new file mode 100644
index 00000000000..7b5e3024755
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/ton_sign.rs
@@ -0,0 +1,476 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::ton::cell_example::{
+    comment_cell, contract_address_from_state_init, doge_chatbot_state_init,
+};
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::TheOpenNetwork::Proto;
+use tw_proto::TheOpenNetwork::Proto::mod_Transfer::OneOfpayload as PayloadType;
+
+/// The same Cell can be BoC encoded differently.
+/// Use this function to compare inner Cells closing eyes on the encoding.
+#[track_caller]
+pub(crate) fn assert_eq_boc(left: &str, right: &str) {
+    use tw_ton_sdk::boc::BagOfCells;
+
+    let left_boc = BagOfCells::parse_base64(left).unwrap();
+    let right_boc = BagOfCells::parse_base64(right).unwrap();
+
+    assert_eq!(left_boc, right_boc);
+}
+
+#[test]
+fn test_ton_sign_transfer_and_deploy() {
+    let private_key = "63474e5fe9511f1526a50567ce142befc343e71a49b865ac3908f58667319cb8";
+
+    let transfer = Proto::Transfer {
+        dest: "EQDYW_1eScJVxtitoBRksvoV9cCYo4uKGWLVNIHB1JqRR3n0".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        expire_at: 1671135440,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/6ZzWOFKZt_m3kZjbwfbATwLaVwmUOdDp0xjhuY7PO3k=
+    assert_eq_boc(&output.encoded, "te6ccgICABoAAQAAA8sAAAJFiADN98eLgHfrkE8l8gmT8X5REpTVR6QnqDhArTbKlVvbZh4ABAABAZznxvGBhoRXhPogxNY8QmHlihJWxg5t6KptqcAIZlVks1r+Z+r1avCWNCeqeLC/oaiVN4mDx/E1+Zhi33G25rcIKamjF/////8AAAAAAAMAAgFiYgBsLf6vJOEq42xW0AoyWX0K+uBMUcXFDLFqmkDg6k1Io4hQAAAAAAAAAAAAAAAAAQADAAACATQABgAFAFEAAAAAKamjF/Qsd/kxvqIOxdAVBzEna7suKGCUdmEkWyMZ74Ez7o1BQAEU/wD0pBP0vPLICwAHAgEgAA0ACAT48oMI1xgg0x/TH9MfAvgju/Jk7UTQ0x/TH9P/9ATRUUO68qFRUbryogX5AVQQZPkQ8qP4ACSkyMsfUkDLH1Iwy/9SEPQAye1U+A8B0wchwACfbFGTINdKltMH1AL7AOgw4CHAAeMAIcAC4wABwAORMOMNA6TIyx8Syx/L/wAMAAsACgAJAAr0AMntVABsgQEI1xj6ANM/MFIkgQEI9Fnyp4IQZHN0cnB0gBjIywXLAlAFzxZQA/oCE8tqyx8Syz/Jc/sAAHCBAQjXGPoA0z/IVCBHgQEI9FHyp4IQbm90ZXB0gBjIywXLAlAGzxZQBPoCFMtqEssfyz/Jc/sAAgBu0gf6ANTUIvkABcjKBxXL/8nQd3SAGMjLBcsCIs8WUAX6AhTLaxLMzMlz+wDIQBSBAQj0UfKnAgIBSAAXAA4CASAAEAAPAFm9JCtvaiaECAoGuQ+gIYRw1AgIR6STfSmRDOaQPp/5g3gSgBt4EBSJhxWfMYQCASAAEgARABG4yX7UTQ1wsfgCAVgAFgATAgEgABUAFAAZrx32omhAEGuQ64WPwAAZrc52omhAIGuQ64X/wAA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYALm0AHQ0wMhcbCSXwTgItdJwSCSXwTgAtMfIYIQcGx1Z70ighBkc3RyvbCSXwXgA/pAMCD6RAHIygfL/8nQ7UTQgQFA1yH0BDBcgQEI9ApvoTGzkl8H4AXTP8glghBwbHVnupI4MOMNA4IQZHN0crqSXwbjDQAZABgAilAEgQEI9Fkw7UTQgQFA1yDIAc8W9ADJ7VQBcrCOI4IQZHN0coMesXCAGFAFywVQA88WI/oCE8tqyx/LP8mAQPsAkl8D4gB4AfoA9AQw+CdvIjBQCqEhvvLgUIIQcGx1Z4MesXCAGFAEywUmzxZY+gIZ9ADLaRfLH1Jgyz8gyYBA+wAG");
+    assert_eq!(
+        output.hash.to_hex(),
+        "b3d9462c13a8c67e19b62002447839c386de51415ace3ff6473b1e6294299819"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_and_deploy_4b1d9f() {
+    // UQApdOSfRTScoB9bMNGeo3bn-DGpQD8gywA27UaZVvAQsrHg
+    let private_key = "e97620499dfee0107c0cd7f0ecb2afb3323d385b3a82320a5e3fa1fbdca6e722";
+
+    let transfer = Proto::Transfer {
+        dest: "UQA6whN_oU5h9jPljnlDSWRYQNDPkLaUqqaEWULNB_Zoykuu".into(),
+        // 0.0001 TON
+        amount: 100_000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        expire_at: 1721892371,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/4b1d9f09856af70ea1058b557a87c9ba2abb0bca2029e0cbbe8c659d5dae4ce1
+    assert_eq_boc(&output.encoded, "te6cckECGgEAA7QAAkWIAFLpyT6KaTlAPrZhoz1G7c/wY1KAfkGWAG3ajTKt4CFkHgECAgE0AwQBnPhb8QZRko0VcLtSmZsGLICPVXj7+QmBkrCrCL1R1bdHYWibC86XsAcA2dgem8QSl8xxsChuCd2oVG1FoMVUUgEpqaMX/////wAAAAAAAwUBFP8A9KQT9LzyyAsGAFEAAAAAKamjFyoNBiYB1ihabNBrDwYVwXUbvpGlthGturFziw2Dl/PLQAFmYgAdYQm/0Kcw+xnyxzyhpLIsIGhnyFtKVVNCLKFmg/s0ZRgMNQAAAAAAAAAAAAAAAAABBwIBIAgJAAACAUgKCwT48oMI1xgg0x/TH9MfAvgju/Jk7UTQ0x/TH9P/9ATRUUO68qFRUbryogX5AVQQZPkQ8qP4ACSkyMsfUkDLH1Iwy/9SEPQAye1U+A8B0wchwACfbFGTINdKltMH1AL7AOgw4CHAAeMAIcAC4wABwAORMOMNA6TIyx8Syx/L/wwNDg8C5tAB0NMDIXGwkl8E4CLXScEgkl8E4ALTHyGCEHBsdWe9IoIQZHN0cr2wkl8F4AP6QDAg+kQByMoHy//J0O1E0IEBQNch9AQwXIEBCPQKb6Exs5JfB+AF0z/IJYIQcGx1Z7qSODDjDQOCEGRzdHK6kl8G4w0QEQIBIBITAG7SB/oA1NQi+QAFyMoHFcv/ydB3dIAYyMsFywIizxZQBfoCFMtrEszMyXP7AMhAFIEBCPRR8qcCAHCBAQjXGPoA0z/IVCBHgQEI9FHyp4IQbm90ZXB0gBjIywXLAlAGzxZQBPoCFMtqEssfyz/Jc/sAAgBsgQEI1xj6ANM/MFIkgQEI9Fnyp4IQZHN0cnB0gBjIywXLAlAFzxZQA/oCE8tqyx8Syz/Jc/sAAAr0AMntVAB4AfoA9AQw+CdvIjBQCqEhvvLgUIIQcGx1Z4MesXCAGFAEywUmzxZY+gIZ9ADLaRfLH1Jgyz8gyYBA+wAGAIpQBIEBCPRZMO1E0IEBQNcgyAHPFvQAye1UAXKwjiOCEGRzdHKDHrFwgBhQBcsFUAPPFiP6AhPLassfyz/JgED7AJJfA+ICASAUFQBZvSQrb2omhAgKBrkPoCGEcNQICEekk30pkQzmkD6f+YN4EoAbeBAUiYcVnzGEAgFYFhcAEbjJftRNDXCx+AA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYAIBIBgZABmtznaiaEAga5Drhf/AABmvHfaiaEAQa5DrhY/AaTiNAg==");
+    assert_eq!(
+        output.hash.to_hex(),
+        "4b1d9f09856af70ea1058b557a87c9ba2abb0bca2029e0cbbe8c659d5dae4ce1"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_ordinary() {
+    let private_key = "c38f49de2fb13223a9e7d37d5d0ffbdd89a5eb7c8b0ee4d1c299f2cefe7dc4a0";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 6,
+        expire_at: 1671132440,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/3Z4tHpXNLyprecgu5aTQHWtY7dpHXEoo11MAX61Xyg0=
+    assert_eq_boc(&output.encoded, "te6ccgICAAQAAQAAALAAAAFFiAGwt/q8k4SrjbFbQCjJZfQr64ExRxcUMsWqaQODqTUijgwAAQGcEUPkil2aZ4s8KKparSep/OKHMC8vuXafFbW2HGp/9AcTRv0J5T4dwyW1G0JpHw+g5Ov6QI3Xo0O9RFr3KidICimpoxdjm3UYAAAABgADAAIBYmIAM33x4uAd+uQTyXyCZPxflESlNVHpCeoOECtNsqVW9tmIUAAAAAAAAAAAAAAAAAEAAwAA");
+    assert_eq!(
+        output.hash.to_hex(),
+        "3908cf8b570c1d3d261c62620c9f368db11f6e821a07614cff64de2e7319f81b"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_all_balance() {
+    let private_key = "c38f49de2fb13223a9e7d37d5d0ffbdd89a5eb7c8b0ee4d1c299f2cefe7dc4a0";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q".into(),
+        amount: 0,
+        mode: Proto::SendMode::ATTACH_ALL_CONTRACT_BALANCE as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 7,
+        expire_at: 1681102222,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/cVcXgI9DWNWlN2iyTsteaWJckTswVqWZnRVvX5krXeA=
+    assert_eq_boc(&output.encoded, "te6ccgICAAQAAQAAAK8AAAFFiAGwt/q8k4SrjbFbQCjJZfQr64ExRxcUMsWqaQODqTUijgwAAQGc58rMUQc/u78bg+Wtt8ETkyM0udf7S+F7wWk7lnPib2KChnBx9dZ7a/zLzhfLq+W9LjLZZfx995J17+0sbkvGCympoxdkM5WOAAAABwCCAAIBYGIAM33x4uAd+uQTyXyCZPxflESlNVHpCeoOECtNsqVW9tmAAAAAAAAAAAAAAAAAAQADAAA=");
+    assert_eq!(
+        output.hash.to_hex(),
+        "d5c5980c9083f697a7f114426effbbafac6d5c88554297d290eb65c8def3008e"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_all_balance_non_bounceable() {
+    let private_key = "c38f49de2fb13223a9e7d37d5d0ffbdd89a5eb7c8b0ee4d1c299f2cefe7dc4a0";
+
+    let transfer = Proto::Transfer {
+        dest: "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV".into(),
+        amount: 0,
+        mode: Proto::SendMode::ATTACH_ALL_CONTRACT_BALANCE as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: false,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 8,
+        expire_at: 1681102222,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/0sJkPKu6u6uObVRuSWGd_bVGiyy5lJuzEKDqSXifQEA=
+    assert_eq_boc(&output.encoded, "te6ccgICAAQAAQAAAK8AAAFFiAGwt/q8k4SrjbFbQCjJZfQr64ExRxcUMsWqaQODqTUijgwAAQGcRQQvxdU1u4QoE2Pas0AsZQMc9lea3+wtSvaC6QfLUlyJ9oISMCFnaErpyFHelDhPu4iuZqhkoLwjkR1VYhFSCimpoxdkM5WOAAAACACCAAIBYEIAM33x4uAd+uQTyXyCZPxflESlNVHpCeoOECtNsqVW9tmAAAAAAAAAAAAAAAAAAQADAAA=");
+    assert_eq!(
+        output.hash.to_hex(),
+        "e9c816780fa8e578bae309c2e098db8eb16aa25545b3ad2b61bb711ec9562795"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_with_ascii_comment() {
+    let private_key = "c38f49de2fb13223a9e7d37d5d0ffbdd89a5eb7c8b0ee4d1c299f2cefe7dc4a0";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        comment: "test comment".into(),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 10,
+        expire_at: 1681102222,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/9wjD-VrgEDpa0D9u1g03KSD7kvTNsxRocR7LEdQtCNQ=
+    assert_eq_boc(&output.encoded, "te6ccgICAAQAAQAAAMAAAAFFiAGwt/q8k4SrjbFbQCjJZfQr64ExRxcUMsWqaQODqTUijgwAAQGcY4XlvKqu7spxyjL6vyBSKjbskDgqkHhqBsdTe900RGrzExtpvwc04j94v8HOczEWSMCXjTXk0z+CVUXSL54qCimpoxdkM5WOAAAACgADAAIBYmIAM33x4uAd+uQTyXyCZPxflESlNVHpCeoOECtNsqVW9tmIUAAAAAAAAAAAAAAAAAEAAwAgAAAAAHRlc3QgY29tbWVudA==");
+    assert_eq!(
+        output.hash.to_hex(),
+        "a8c6943d5587f590c43fcdb0e894046f1965c615e19bcaf0c8407e9ccb74518d"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_with_utf8_comment() {
+    let private_key = "c38f49de2fb13223a9e7d37d5d0ffbdd89a5eb7c8b0ee4d1c299f2cefe7dc4a0";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        comment: "тестовый комментарий".into(),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 11,
+        expire_at: 1681102222,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/9wjD-VrgEDpa0D9u1g03KSD7kvTNsxRocR7LEdQtCNQ=
+    assert_eq_boc(&output.encoded, "te6ccgICAAQAAQAAANsAAAFFiAGwt/q8k4SrjbFbQCjJZfQr64ExRxcUMsWqaQODqTUijgwAAQGchoDa7EdGQuPuehHy3+0X9WNVEvYxdBtaEWn15oYUX8PEKyzztYy94Xq0T2XdhVvj2H7PTSQ+D/Ny1IBRCxk0BimpoxdkM5WOAAAACwADAAIBYmIAM33x4uAd+uQTyXyCZPxflESlNVHpCeoOECtNsqVW9tmIUAAAAAAAAAAAAAAAAAEAAwBWAAAAANGC0LXRgdGC0L7QstGL0Lkg0LrQvtC80LzQtdC90YLQsNGA0LjQuQ==");
+    assert_eq!(
+        output.hash.to_hex(),
+        "1091dfae81583d3972825633592c24eab0d3d74c91f60fda9d4afe7535103633"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_invalid_wallet_version() {
+    let private_key = "63474e5fe9511f1526a50567ce142befc343e71a49b865ac3908f58667319cb8";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        expire_at: 1671135440,
+        wallet_version: Proto::WalletVersion::WALLET_V3_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::Error_not_supported);
+}
+
+#[test]
+fn test_ton_sign_transfer_jettons() {
+    let private_key = "c054900a527538c1b4325688a421c0469b171c29f23a62da216e90b0df2412ee";
+
+    let jetton_transfer = Proto::JettonTransfer {
+        query_id: 69,
+        // Transfer 1 testtwt (decimal precision is 9).
+        jetton_amount: 1000 * 1000 * 1000,
+        to_owner: "EQAFwMs5ha8OgZ9M4hQr80z9NkE7rGxUpE1hCFndiY6JnDx8".into(),
+        // Send unused toncoins back to sender.
+        response_address: "EQBaKIMq5Am2p_rfR1IFTwsNWHxBkOpLTmwUain5Fj4llTXk".into(),
+        forward_amount: 1,
+        ..Proto::JettonTransfer::default()
+    };
+
+    let transfer = Proto::Transfer {
+        dest: "EQBiaD8PO1NwfbxSkwbcNT9rXDjqhiIvXWymNO-edV0H5lja".into(),
+        amount: 100 * 1000 * 1000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        payload: PayloadType::jetton_transfer(jetton_transfer),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 0,
+        expire_at: 1787693046,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://testnet.tonviewer.com/transaction/2HOPGAXhez3v6sdfj-5p8mPHX4S4T0CgxVbm0E2swxE=
+    assert_eq_boc(&output.encoded, "te6ccgICABoAAQAABCMAAAJFiAC0UQZVyBNtT/W+jqQKnhYasPiDIdSWnNgo1FPyLHxLKh4ABAABAZz3iNHD1z2mxbtpFAtmbVevYMnB4yHPkF3WAsL3KHcrqCw0SWezOg4lVz1zzSReeFDx98ByAqY9+eR5VF3xyugAKamjF/////8AAAAAAAMAAgFoYgAxNB+Hnam4Pt4pSYNuGp+1rhx1QxEXrrZTGnfPOq6D8yAvrwgAAAAAAAAAAAAAAAAAAQADAKoPin6lAAAAAAAAAEVDuaygCAALgZZzC14dAz6ZxChX5pn6bIJ3WNipSJrCELO7Ex0TOQAWiiDKuQJtqf630dSBU8LDVh8QZDqS05sFGop+RY+JZUICAgE0AAYABQBRAAAAACmpoxfOamBhePRNnx/pqQViBzW0dDCy/+1WLV1VhgbVTL6i30ABFP8A9KQT9LzyyAsABwIBIAANAAgE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8ADAALAAoACQAK9ADJ7VQAbIEBCNcY+gDTPzBSJIEBCPRZ8qeCEGRzdHJwdIAYyMsFywJQBc8WUAP6AhPLassfEss/yXP7AABwgQEI1xj6ANM/yFQgR4EBCPRR8qeCEG5vdGVwdIAYyMsFywJQBs8WUAT6AhTLahLLH8s/yXP7AAIAbtIH+gDU1CL5AAXIygcVy//J0Hd0gBjIywXLAiLPFlAF+gIUy2sSzMzJc/sAyEAUgQEI9FHypwICAUgAFwAOAgEgABAADwBZvSQrb2omhAgKBrkPoCGEcNQICEekk30pkQzmkD6f+YN4EoAbeBAUiYcVnzGEAgEgABIAEQARuMl+1E0NcLH4AgFYABYAEwIBIAAVABQAGa8d9qJoQBBrkOuFj8AAGa3OdqJoQCBrkOuF/8AAPbKd+1E0IEBQNch9AQwAsjKB8v/ydABgQEI9ApvoTGAC5tAB0NMDIXGwkl8E4CLXScEgkl8E4ALTHyGCEHBsdWe9IoIQZHN0cr2wkl8F4AP6QDAg+kQByMoHy//J0O1E0IEBQNch9AQwXIEBCPQKb6Exs5JfB+AF0z/IJYIQcGx1Z7qSODDjDQOCEGRzdHK6kl8G4w0AGQAYAIpQBIEBCPRZMO1E0IEBQNcgyAHPFvQAye1UAXKwjiOCEGRzdHKDHrFwgBhQBcsFUAPPFiP6AhPLassfyz/JgED7AJJfA+IAeAH6APQEMPgnbyIwUAqhIb7y4FCCEHBsdWeDHrFwgBhQBMsFJs8WWPoCGfQAy2kXyx9SYMs/IMmAQPsABg==");
+    assert_eq!(
+        output.hash.to_hex(),
+        "3e4dac37acdc99ca670b3747ab2730e818727d9d25c80d3987abe501356d0da0"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_jettons_with_comment() {
+    let private_key = "c054900a527538c1b4325688a421c0469b171c29f23a62da216e90b0df2412ee";
+
+    let jetton_transfer = Proto::JettonTransfer {
+        query_id: 0,
+        // Transfer 0.5 testtwt (decimal precision is 9).
+        jetton_amount: 500 * 1000 * 1000,
+        to_owner: "EQAFwMs5ha8OgZ9M4hQr80z9NkE7rGxUpE1hCFndiY6JnDx8".into(),
+        // Send unused toncoins back to sender.
+        response_address: "EQBaKIMq5Am2p_rfR1IFTwsNWHxBkOpLTmwUain5Fj4llTXk".into(),
+        forward_amount: 1,
+        ..Proto::JettonTransfer::default()
+    };
+
+    let transfer = Proto::Transfer {
+        dest: "EQBiaD8PO1NwfbxSkwbcNT9rXDjqhiIvXWymNO-edV0H5lja".into(),
+        amount: 100 * 1000 * 1000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        comment: "test comment".into(),
+        payload: PayloadType::jetton_transfer(jetton_transfer),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 1,
+        expire_at: 1787693046,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://testnet.tonviewer.com/transaction/12bfe84f947740aec3faa54f04a50690900e3aae9ac9596cfa6804a61a48f429
+    assert_eq_boc(&output.encoded, "te6ccgICAAQAAQAAARgAAAFFiAC0UQZVyBNtT/W+jqQKnhYasPiDIdSWnNgo1FPyLHxLKgwAAQGcaIWVosi1XnveAmoG9y0/mPeNUqUu7GY76mdbRAaVeNeDOPDlh5M3BEb26kkc6XoYDekV60o2iOobN+TGS76jBSmpoxdqjgf2AAAAAQADAAIBaGIAMTQfh52puD7eKUmDbhqfta4cdUMRF662Uxp3zzqug/MgL68IAAAAAAAAAAAAAAAAAAEAAwDKD4p+pQAAAAAAAAAAQdzWUAgAC4GWcwteHQM+mcQoV+aZ+myCd1jYqUiawhCzuxMdEzkAFoogyrkCban+t9HUgVPCw1YfEGQ6ktObBRqKfkWPiWVCAgAAAAB0ZXN0IGNvbW1lbnQ=");
+    assert_eq!(
+        output.hash.to_hex(),
+        "c98c205c8dd37d9a6ab5db6162f5b9d37cefa067de24a765154a5eb7a359f22f"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_custom_payload() {
+    // UQApdOSfRTScoB9bMNGeo3bn-DGpQD8gywA27UaZVvAQsrHg
+    let private_key = "e97620499dfee0107c0cd7f0ecb2afb3323d385b3a82320a5e3fa1fbdca6e722";
+
+    let transfer = Proto::Transfer {
+        dest: "UQA6whN_oU5h9jPljnlDSWRYQNDPkLaUqqaEWULNB_Zoykuu".into(),
+        // 0.00025 TON
+        amount: 250_000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        payload: PayloadType::custom_payload(comment_cell("Hi there sir").into()),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        expire_at: 1721906219,
+        messages: vec![transfer],
+        sequence_number: 2,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/4ca4442921d0737d518b4863f8eafc2eb26824e9362ebaa9bc59373950b7fa86
+    assert_eq_boc(&output.encoded, "te6cckEBBAEAvwABRYgAUunJPoppOUA+tmGjPUbtz/BjUoB+QZYAbdqNMq3gIWQMAQGc981GQ9a8Yr4m2YeIeuuNIWlzdHliyW6MRq3RDs5kgvXJP+iNhdZU7o79DJnm/OKuzWI5FbiNy3SF0fGGBObDDCmpoxdmojQrAAAAAgADAgFmYgAdYQm/0Kcw+xnyxzyhpLIsIGhnyFtKVVNCLKFmg/s0ZRgehIAAAAAAAAAAAAAAAAABAwAgAAAAAEhpIHRoZXJlIHNpcoAlI8E=");
+    assert_eq!(
+        output.hash.to_hex(),
+        "4ca4442921d0737d518b4863f8eafc2eb26824e9362ebaa9bc59373950b7fa86"
+    );
+}
+
+#[test]
+fn test_ton_sign_transfer_custom_payload_with_state_init() {
+    // UQD9XBth5b0D9F35h8No4nrF2au8E5H9XUc25iJMOx9tLfy3
+    let private_key = "5525e673087587bc0efd7ab09920ef7d3c1bf6b854a661430244ca59ab19e9d1";
+
+    let current_timestamp = 1721939114;
+    let expire_at = current_timestamp + 60 * 10;
+
+    let doge_state_init = doge_chatbot_state_init(current_timestamp);
+    let doge_contract_address = contract_address_from_state_init(&doge_state_init);
+    assert_eq!(
+        doge_state_init,
+        "te6cckEBBAEAUwACATQBAgEU/wD0pBP0vPLICwMAEAAAAZDrkbgQAGrTMAGCCGlJILmRMODQ0wMx+kAwi0ZG9nZYcCCAGMjLBVAEzxaARfoCE8tqEssfAc8WyXP7AO4ioYU="
+    );
+    assert_eq!(
+        doge_contract_address,
+        "0:3042cd5480da232d5ac1d9cbe324e3c9eb58f167599f6b7c20c6e638aeed0335",
+    );
+
+    let transfer = Proto::Transfer {
+        dest: doge_contract_address.into(),
+        // 0.069 TON
+        amount: 69_000_000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: false,
+        state_init: doge_state_init.into(),
+        payload: PayloadType::custom_payload(
+            comment_cell("This transaction deploys Doge Chatbot contract").into(),
+        ),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        expire_at,
+        messages: vec![transfer],
+        sequence_number: 4,
+        wallet_version: Proto::WalletVersion::WALLET_V4_R2,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/f4b7ed2247b1adf54f33dd2fd99216fbd61beefb281542d0b330ccea9b8d0338
+    assert_eq_boc(&output.encoded, "te6cckECCAEAATcAAUWIAfq4NsPLegfou/MPhtHE9YuzV3gnI/q6jm3MRJh2PtpaDAEBnPbyCSsWrOZpEjb7ZFxz5yYi+an6M6Lnq7rI7TFWdDS76LEtGBrVVrhMGziwxuy6LCVtsMBikI7RPVQ89FCIAAYpqaMXZqK3AgAAAAQAAwICaUIAGCFmqkBtEZatYOzl8ZJx5PWseLOsz7W+EGNzHFd2gZqgIObaAAAAAAAAAAAAAAAAAAPAAwQCATQFBgBkAAAAAFRoaXMgdHJhbnNhY3Rpb24gZGVwbG95cyBEb2dlIENoYXRib3QgY29udHJhY3QBFP8A9KQT9LzyyAsHABAAAAGQ65G4EABq0zABgghpSSC5kTDg0NMDMfpAMItGRvZ2WHAggBjIywVQBM8WgEX6AhPLahLLHwHPFslz+wAa2r/S");
+    assert_eq!(
+        output.hash.to_hex(),
+        "724735eea1ab0663aff42af421fb90f7f0c0f7ca3dda424d97c1daf1a21036ad"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ton/ton_sign_wallet_v5r1.rs b/rust/tw_tests/tests/chains/ton/ton_sign_wallet_v5r1.rs
new file mode 100644
index 00000000000..62b0951a0b2
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/ton_sign_wallet_v5r1.rs
@@ -0,0 +1,480 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::chains::ton::cell_example::{
+    comment_cell, contract_address_from_state_init, doge_chatbot_state_init,
+};
+use crate::chains::ton::ton_sign::assert_eq_boc;
+use tw_any_coin::test_utils::sign_utils::AnySignerHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_proto::Common::Proto::SigningError;
+use tw_proto::TheOpenNetwork::Proto;
+use tw_proto::TheOpenNetwork::Proto::mod_Transfer::OneOfpayload as PayloadType;
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_and_deploy() {
+    let private_key = "3570e35f54cfb843f2cfaf2b8cae7ceeb7b32225d7dbbd86f611056d74d9073e";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBe6DtCpJZe8M4t-crMXe93JlEYgSl30S5OUuMSLOfeQfBu".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        expire_at: 0xffffffff,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/Q32uRBqVprzNzc6iVgwxPeJPE92Fx21dfsqrHnCh5Ss=
+    assert_eq_boc(&output.encoded, "te6cckECGwEAA2sAAkWIACm9HPyVOpjCNOG6nbf+EwCONRHHpeMQsIlCoWNKhUaaHgECAgE0AwQBoXNpZ25///8R/////wAAAACACOfqY7L3l3aKc58eNxuJTaeH/fgBw2aG0coM+hjDpjWhJKbYKmsAD8v054HYSuO6vN3bQnV5U19BhsGfe1MDoAUBFP8A9KQT9LzyyAsGAFGAAAAAP///iKrcG+d35KaMMtuxik4jqNofFL51Mu1f8Qf19onqsDlyIAIKDsPIbQMWBwIBIAgJAWJiAC90HaFSSy94Zxb85WYu97uTKIxAlLvolycpcYkWc+8giFAAAAAAAAAAAAAAAAABFgIBSAoLAQLyDALc0CDXScEgkVuPYyDXCx8gghBleHRuvSGCEHNpbnS9sJJfA+CCEGV4dG66jrSAINchAdB01yH6QDD6RPgo+kQwWL2RW+DtRNCBAUHXIfQFgwf0Dm+hMZEw4YBA1yFwf9s84DEg10mBAoC5kTDgcOIXDQIBIA4PAR4g1wsfghBzaWduuvLgin8NAeaO8O2i7fshgwjXIgKDCNcjIIAg1yHTH9Mf0x/tRNDSANMfINMf0//XCgAK+QFAzPkQmiiUXwrbMeHywIffArNQB7Dy0IRRJbry4IVQNrry4Ib4I7vy0IgikvgA3gGkf8jKAMsfAc8Wye1UIJL4D95w2zzYFwIBIBARABm+Xw9qJoQICg65D6AsAgFuEhMCAUgUFQAZrc52omhAIOuQ64X/wAAZrx32omhAEOuQ64WPwAAXsyX7UTQcdch1wsfgABGyYvtRNDXCgCAAAAP27aLt+wL0BCFukmwhjkwCIdc5MHCUIccAs44tAdcoIHYeQ2wg10nACPLgkyDXSsAC8uCTINcdBscSwgBSMLDy0InXTNc5MAGk6GwShAe78uCT10rAAPLgk+1V4tIAAcAAkVvg69csCBQgkXCWAdcsCBwS4lIQseMPINdKGBkaAJYB+kAB+kT4KPpEMFi68uCR7UTQgQFB1xj0BQSdf8jKAEAEgwf0U/Lgi44UA4MH9Fvy4Iwi1woAIW4Bs7Dy0JDiyFADzxYS9ADJ7VQAcjDXLAgkji0h8uCS0gDtRNDSAFETuvLQj1RQMJExnAGBAUDXIdcKAPLgjuLIygBYzxbJ7VST8sCN4gAQk1vbMeHXTNB8Ui06");
+    assert_eq!(
+        output.hash.to_hex(),
+        "437dae441a95a6bccdcdcea2560c313de24f13dd85c76d5d7ecaab1e70a1e52b"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_ordinary() {
+    let private_key = "3570e35f54cfb843f2cfaf2b8cae7ceeb7b32225d7dbbd86f611056d74d9073e";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBe6DtCpJZe8M4t-crMXe93JlEYgSl30S5OUuMSLOfeQfBu".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 1,
+        expire_at: 1723469663,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/UhZFShj8QG6M4nUPELVROdY_IAxSSkeZojh-t2XC2IU=
+    assert_eq_boc(&output.encoded, "te6cckEBBQEAuQABRYgAKb0c/JU6mMI04bqdt/4TAI41Ecel4xCwiUKhY0qFRpoMAQGhc2lnbn///xFmug9fAAAAAbsTmIIbTn/5n8piniYykIpNGhw0mstvB4PfGuTjdh7eIY3HAokbPMSdaAoOXq8mTWzT2p3v6XSoqTh7XKacOIDgAgIKDsPIbQMEAwFiYgAvdB2hUksveGcW/OVmLve7kyiMQJS76JcnKXGJFnPvIIhQAAAAAAAAAAAAAAAAAQQAAN6nHJg=");
+
+    assert_eq!(
+        output.hash.to_hex(),
+        "5216454a18fc406e8ce2750f10b55139d63f200c524a4799a2387eb765c2d885"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_all_balance() {
+    let private_key = "502d60b0f3327382e7d0585b789f1db9aa04907fe5cddc5c28818ec163ebf4ba";
+
+    let transfer = Proto::Transfer {
+        dest: "UQAU3o5-Sp1MYRpw3U7b_wmARxqI49LxiFhEoVCxpUKjTYXk".into(),
+        amount: 0,
+        mode: Proto::SendMode::ATTACH_ALL_CONTRACT_BALANCE as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 4,
+        expire_at: 1723482783,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/q7MJULnzKZ1DY4itqKfHg_cj48ueFRIlT6I2O8rSLt0=
+    println!("{}", output.encoded);
+    assert_eq_boc(&output.encoded, "te6cckEBBQEAuAABRYgBQ8awIH6gcEaSzgT9ZAPxWhgEMUrjdKCkL1PJZ6pq4mgMAQGhc2lnbn///xFmukKfAAAABKg9bRJRcUN/+LR7Bny8XjKzf3+GzopWEf+n7ibzPpr9ZOZs5CRon4i0XFBiFMVVwfcnDI4RVWht6Jf5eSzOjwEgAgIKDsPIbYIEAwFgYgAKb0c/JU6mMI04bqdt/4TAI41Ecel4xCwiUKhY0qFRpoAAAAAAAAAAAAAAAAABBAAANXkwpA==");
+    assert_eq!(
+        output.hash.to_hex(),
+        "abb30950b9f3299d436388ada8a7c783f723e3cb9e1512254fa2363bcad22edd"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_all_balance_non_bounceable() {
+    let private_key = "3570e35f54cfb843f2cfaf2b8cae7ceeb7b32225d7dbbd86f611056d74d9073e";
+
+    let transfer = Proto::Transfer {
+        dest: "UQBe6DtCpJZe8M4t-crMXe93JlEYgSl30S5OUuMSLOfeQa2r".into(),
+        amount: 0,
+        mode: Proto::SendMode::ATTACH_ALL_CONTRACT_BALANCE as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: false,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 2,
+        expire_at: 1723470825,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/f8meQabVMmfvUOJ0D_NTyji1qr4LJ58tTkPI6dlYSPE=
+    assert_eq_boc(&output.encoded, "te6cckEBBQEAuAABRYgAKb0c/JU6mMI04bqdt/4TAI41Ecel4xCwiUKhY0qFRpoMAQGhc2lnbn///xFmuhPpAAAAAq9jgguGOlFmpN566XBRCth1GfF8kVEc0DJkvLPKOa7MQMGzr0L1xpLt5OLovDpy4KwPqNxALo/b9NluZDLcukPgAgIKDsPIbYIEAwFgQgAvdB2hUksveGcW/OVmLve7kyiMQJS76JcnKXGJFnPvIIAAAAAAAAAAAAAAAAABBAAAI3vzjA==");
+    assert_eq!(
+        output.hash.to_hex(),
+        "7fc99e41a6d53267ef50e2740ff353ca38b5aabe0b279f2d4e43c8e9d95848f1"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_with_ascii_comment() {
+    let private_key = "3570e35f54cfb843f2cfaf2b8cae7ceeb7b32225d7dbbd86f611056d74d9073e";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBe6DtCpJZe8M4t-crMXe93JlEYgSl30S5OUuMSLOfeQfBu".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        comment: "test comment".into(),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 3,
+        expire_at: 1723472681,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/uc9sMl9Ey3yQ6sX48EKM0nFSeJoq2JcEi0xMzTLYV6M=
+    assert_eq_boc(&output.encoded, "te6cckEBBgEAywABRYgAKb0c/JU6mMI04bqdt/4TAI41Ecel4xCwiUKhY0qFRpoMAQGhc2lnbn///xFmuhspAAAAA6oLkiOh1mWEhej/y/dCZAZZT1hFo6aX9ROjIOX5HvwBz99SLLlCmTJd4QV1Vp9D9eaTXL7aT28rswEjyBSYpwPgAgIKDsPIbQMDBAAAAWJiAC90HaFSSy94Zxb85WYu97uTKIxAlLvolycpcYkWc+8giFAAAAAAAAAAAAAAAAABBQAgAAAAAHRlc3QgY29tbWVudDHkkjo=");
+    assert_eq!(
+        output.hash.to_hex(),
+        "b9cf6c325f44cb7c90eac5f8f0428cd27152789a2ad897048b4c4ccd32d857a3"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_with_utf8_comment() {
+    let private_key = "3570e35f54cfb843f2cfaf2b8cae7ceeb7b32225d7dbbd86f611056d74d9073e";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBe6DtCpJZe8M4t-crMXe93JlEYgSl30S5OUuMSLOfeQfBu".into(),
+        amount: 10,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        comment: "тестовый комментарий".into(),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 4,
+        expire_at: 1723472948,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/tijrXAMehLvfESLWWgGf1R5jhW4CMoio11ZFD_musFg=
+    assert_eq_boc(&output.encoded, "te6cckEBBgEA5gABRYgAKb0c/JU6mMI04bqdt/4TAI41Ecel4xCwiUKhY0qFRpoMAQGhc2lnbn///xFmuhw0AAAABIDSMWXCM7WX+aQyurxO4nsYaqKhHm4ndzkjAS00AhtXe5fpKHUvVAFDvyqCi5T/PI/fwyZdralzzpXTrQaRP0CgAgIKDsPIbQMDBAAAAWJiAC90HaFSSy94Zxb85WYu97uTKIxAlLvolycpcYkWc+8giFAAAAAAAAAAAAAAAAABBQBWAAAAANGC0LXRgdGC0L7QstGL0Lkg0LrQvtC80LzQtdC90YLQsNGA0LjQuV6Inwc=");
+    assert_eq!(
+        output.hash.to_hex(),
+        "b628eb5c031e84bbdf1122d65a019fd51e63856e023288a8d756450ff9aeb058"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_jettons() {
+    let private_key = "502d60b0f3327382e7d0585b789f1db9aa04907fe5cddc5c28818ec163ebf4ba";
+
+    let jetton_transfer = Proto::JettonTransfer {
+        query_id: 69,
+        // Transfer 0.12 USDT (decimal precision is 6).
+        jetton_amount: 120000,
+        to_owner: "UQAU3o5-Sp1MYRpw3U7b_wmARxqI49LxiFhEoVCxpUKjTYXk".into(),
+        // Send unused toncoins back to sender.
+        response_address: "UQCh41gQP1A4I0lnAn6yAfitDAIYpXG6UFIXqeSz1TVxNOJ_".into(),
+        forward_amount: 1,
+        ..Default::default()
+    };
+
+    let transfer = Proto::Transfer {
+        dest: "EQDg4AjfaxQBVsUFueenkKlHLhhYWrcBvCEzbEgfrT0nxuGC".into(),
+        amount: 100 * 1000 * 1000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        payload: PayloadType::jetton_transfer(jetton_transfer),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 0,
+        expire_at: 1723479990,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/CapFFJlwYNa_p8-fImgUPyKLxNuq4mR5K7U-G3zbFNg=
+    assert_eq_boc(&output.encoded, "te6cckECHAEAA8QAAkWIAUPGsCB+oHBGks4E/WQD8VoYBDFK43SgpC9TyWeqauJoHgECAgE0AwQBoXNpZ25///8R/////wAAAACK9TWZkcw/aJwl28F2cStjO8o6owv7/VKsx3RW0XtPaiwwFgi+CkmtzzJLGGp24JEwbwslQ1jNHyRqqUEM41AD4AUBFP8A9KQT9LzyyAsGAFGAAAAAP///iOEJZED3G4tDJvijkvHmVvq03ZLJ8Db8Bmagv84HH0SSIAIKDsPIbQMHCAIBIAkKAAABaGIAcHAEb7WKAKtigtzz08hUo5cMLC1bgN4QmbYkD9aek+MgL68IAAAAAAAAAAAAAAAAAAELAgFIDA0BAvIOAKgPin6lAAAAAAAAAEUwHUwIACm9HPyVOpjCNOG6nbf+EwCONRHHpeMQsIlCoWNKhUabACh41gQP1A4I0lnAn6yAfitDAIYpXG6UFIXqeSz1TVxNAgIC3NAg10nBIJFbj2Mg1wsfIIIQZXh0br0hghBzaW50vbCSXwPgghBleHRuuo60gCDXIQHQdNch+kAw+kT4KPpEMFi9kVvg7UTQgQFB1yH0BYMH9A5voTGRMOGAQNchcH/bPOAxINdJgQKAuZEw4HDiGA8CASAQEQEeINcLH4IQc2lnbrry4Ip/DwHmjvDtou37IYMI1yICgwjXIyCAINch0x/TH9Mf7UTQ0gDTHyDTH9P/1woACvkBQMz5EJoolF8K2zHh8sCH3wKzUAew8tCEUSW68uCFUDa68uCG+CO78tCIIpL4AN4BpH/IygDLHwHPFsntVCCS+A/ecNs82BgCASASEwAZvl8PaiaECAoOuQ+gLAIBbhQVAgFIFhcAGa3OdqJoQCDrkOuF/8AAGa8d9qJoQBDrkOuFj8AAF7Ml+1E0HHXIdcLH4AARsmL7UTQ1woAgA/btou37AvQEIW6SbCGOTAIh1zkwcJQhxwCzji0B1yggdh5DbCDXScAI8uCTINdKwALy4JMg1x0GxxLCAFIwsPLQiddM1zkwAaTobBKEB7vy4JPXSsAA8uCT7VXi0gABwACRW+Dr1ywIFCCRcJYB1ywIHBLiUhCx4w8g10oZGhsAlgH6QAH6RPgo+kQwWLry4JHtRNCBAUHXGPQFBJ1/yMoAQASDB/RT8uCLjhQDgwf0W/LgjCLXCgAhbgGzsPLQkOLIUAPPFhL0AMntVAByMNcsCCSOLSHy4JLSAO1E0NIAURO68tCPVFAwkTGcAYEBQNch1woA8uCO4sjKAFjPFsntVJPywI3iABCTW9sx4ddM0JlgUSM=");
+    assert_eq!(
+        output.hash.to_hex(),
+        "09aa4514997060d6bfa7cf9f2268143f228bc4dbaae264792bb53e1b7cdb14d8"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_jettons_with_comment() {
+    let private_key = "502d60b0f3327382e7d0585b789f1db9aa04907fe5cddc5c28818ec163ebf4ba";
+
+    let jetton_transfer = Proto::JettonTransfer {
+        query_id: 0,
+        // Transfer 0.11 USDT (decimal precision is 6).
+        jetton_amount: 110000,
+        to_owner: "UQAU3o5-Sp1MYRpw3U7b_wmARxqI49LxiFhEoVCxpUKjTYXk".into(),
+        // Send unused toncoins back to sender.
+        response_address: "UQCh41gQP1A4I0lnAn6yAfitDAIYpXG6UFIXqeSz1TVxNOJ_".into(),
+        forward_amount: 1,
+        ..Default::default()
+    };
+
+    let transfer = Proto::Transfer {
+        dest: "EQDg4AjfaxQBVsUFueenkKlHLhhYWrcBvCEzbEgfrT0nxuGC".into(),
+        amount: 100 * 1000 * 1000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        comment: "test comment".into(),
+        payload: PayloadType::jetton_transfer(jetton_transfer),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 1,
+        expire_at: 1723480954,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/gkyDtRqJa_5-GGut6BZcVS5JmRLbObGiKrpmaIBPoxc=
+    assert_eq_boc(&output.encoded, "te6cckECBgEAASIAAUWIAUPGsCB+oHBGks4E/WQD8VoYBDFK43SgpC9TyWeqauJoDAEBoXNpZ25///8RZro7egAAAAGYUu8+ZHZK/wWb9ojB++h5tz2ie7e4GktWZfr475zJcnpRLZADd9wbyuuV7GXr8QzKeqvQbSDVJlgv4bcdnjwDYAICCg7DyG0DAwQAAAFoYgBwcARvtYoAq2KC3PPTyFSjlwwsLVuA3hCZtiQP1p6T4yAvrwgAAAAAAAAAAAAAAAAAAQUAyA+KfqUAAAAAAAAAADAa2wgAKb0c/JU6mMI04bqdt/4TAI41Ecel4xCwiUKhY0qFRpsAKHjWBA/UDgjSWcCfrIB+K0MAhilcbpQUhep5LPVNXE0CAgAAAAB0ZXN0IGNvbW1lbnQIl4du");
+    assert_eq!(
+        output.hash.to_hex(),
+        "824c83b51a896bfe7e186bade8165c552e499912db39b1a22aba6668804fa317"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_custom_payload() {
+    // UQCh41gQP1A4I0lnAn6yAfitDAIYpXG6UFIXqeSz1TVxNOJ_
+    let private_key = "502d60b0f3327382e7d0585b789f1db9aa04907fe5cddc5c28818ec163ebf4ba";
+
+    let transfer = Proto::Transfer {
+        dest: "UQAU3o5-Sp1MYRpw3U7b_wmARxqI49LxiFhEoVCxpUKjTYXk".into(),
+        // 0.00025 TON
+        amount: 250_000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        payload: PayloadType::custom_payload(comment_cell("Hi there sir").into()),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        expire_at: 1723481664,
+        messages: vec![transfer],
+        sequence_number: 2,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/_Pr9kkthRh5qQtALT4HPpWJKRF3qK7L7DUa_hmu3VAI=
+    assert_eq_boc(&output.encoded, "te6cckEBBgEAzQABRYgBQ8awIH6gcEaSzgT9ZAPxWhgEMUrjdKCkL1PJZ6pq4mgMAQGhc2lnbn///xFmuj5AAAAAAqWnjYMI5ukKZ/38yUBJq3dj7fHGvxzmY4WgFTqo6utiQ1rAW1gZTm8tErHXXXEZykBfG9qDSKaTB/XEvbvTK4CgAgIKDsPIbQMDBAAAAWZiAApvRz8lTqYwjThup23/hMAjjURx6XjELCJQqFjSoVGmmB6EgAAAAAAAAAAAAAAAAAEFACAAAAAASGkgdGhlcmUgc2lyZT4q+g==");
+    assert_eq!(
+        output.hash.to_hex(),
+        "fcfafd924b61461e6a42d00b4f81cfa5624a445dea2bb2fb0d46bf866bb75402"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_transfer_custom_payload_with_state_init() {
+    // UQCh41gQP1A4I0lnAn6yAfitDAIYpXG6UFIXqeSz1TVxNOJ_
+    let private_key = "502d60b0f3327382e7d0585b789f1db9aa04907fe5cddc5c28818ec163ebf4ba";
+
+    let current_timestamp = 1723481400;
+    let expire_at = current_timestamp + 60 * 10;
+
+    let doge_state_init = doge_chatbot_state_init(current_timestamp);
+    let doge_contract_address = contract_address_from_state_init(&doge_state_init);
+    assert_eq!(
+        doge_state_init,
+        "te6cckEBBAEAUwACATQBAgEU/wD0pBP0vPLICwMAEAAAAZFHfyLAAGrTMAGCCGlJILmRMODQ0wMx+kAwi0ZG9nZYcCCAGMjLBVAEzxaARfoCE8tqEssfAc8WyXP7AOj1qKs="
+    );
+    assert_eq!(
+        doge_contract_address,
+        "0:6af6c37f5e1704fc46174f0cbf5b558cbbf1dbc750c59c3c851bb98c7a94a145",
+    );
+
+    let transfer = Proto::Transfer {
+        dest: doge_contract_address.into(),
+        // 0.0069 TON
+        amount: 6_900_000,
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: false,
+        state_init: doge_state_init.into(),
+        payload: PayloadType::custom_payload(
+            comment_cell("This transaction deploys Doge Chatbot contract").into(),
+        ),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        expire_at,
+        messages: vec![transfer],
+        sequence_number: 3,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/Y35nc-J86gbrMC5CljEMqzCUG5vFLilLjNdHgb193eA=
+    assert_eq_boc(&output.encoded, "te6cckECCgEAAUQAAUWIAUPGsCB+oHBGks4E/WQD8VoYBDFK43SgpC9TyWeqauJoDAEBoXNpZ25///8RZro/kAAAAAOAA5mkphyRfc8/OtuqrYWeR9u1Eib135FXAntzMzjdjj+1xH96YruRHinS9gB3bfHxtK3QUvy+zrcqKliVvbtA4AICCg7DyG0DAwQAAAJnQgA1e2G/rwuCfiMLp4ZfrarGXfjt46hizh5CjdzGPUpQoptKSQAAAAAAAAAAAAAAAAADwAUGAgE0BwgAZAAAAABUaGlzIHRyYW5zYWN0aW9uIGRlcGxveXMgRG9nZSBDaGF0Ym90IGNvbnRyYWN0ART/APSkE/S88sgLCQAQAAABkUd/IsAAatMwAYIIaUkguZEw4NDTAzH6QDCLRkb2dlhwIIAYyMsFUATPFoBF+gITy2oSyx8BzxbJc/sArbH+dw==");
+    assert_eq!(
+        output.hash.to_hex(),
+        "637e6773e27cea06eb302e4296310cab30941b9bc52e294b8cd74781bd7ddde0"
+    );
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_missing_required_send_mode() {
+    let private_key = "3570e35f54cfb843f2cfaf2b8cae7ceeb7b32225d7dbbd86f611056d74d9073e";
+
+    let transfer = Proto::Transfer {
+        dest: "EQBe6DtCpJZe8M4t-crMXe93JlEYgSl30S5OUuMSLOfeQfBu".into(),
+        amount: 10,
+        // Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS is required for wallet v5r1 external messages.
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32,
+        bounceable: true,
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 1,
+        expire_at: 1723469663,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::Error_internal);
+}
+
+#[test]
+fn test_ton_sign_wallet_v5r1_mintless_jetton() {
+    let private_key = "502d60b0f3327382e7d0585b789f1db9aa04907fe5cddc5c28818ec163ebf4ba";
+
+    let jetton_transfer = Proto::JettonTransfer {
+        query_id: 1,
+        // Transfer 0 mintless jetton to self.
+        jetton_amount: 0,
+        to_owner: "UQCh41gQP1A4I0lnAn6yAfitDAIYpXG6UFIXqeSz1TVxNOJ_".into(),
+        // Send unused toncoins back to sender.
+        response_address: "UQCh41gQP1A4I0lnAn6yAfitDAIYpXG6UFIXqeSz1TVxNOJ_".into(),
+        forward_amount: 1,
+        custom_payload: "te6ccgECNQEABJMAAQgN9gLWAQlGA6+1FWXC4ss/wvDOFwMk2bVM97AUEWqaUhh63uWfQ26nAB4CIgWBcAIDBChIAQEZG2ZqtEYGAq27TvzHdGuGrhhKoICBU+Zg9Xq/qRMHGAAdIgEgBQYiASAHCChIAQEV0tdPcZG01smq0thhsmqf9ZzE0QqpP3c+ERvuHF1JDgAbKEgBAf3dO8qdKoPys7AWvavs1wMNWCOq5XashXaRopmksx/LABsiASAJCiIBIAsMKEgBAWP0xUs9JBrfQRl1FkF2tIfIDYpwLdf3fXqMi6BqxNtmABoiASANDihIAQFOErI5E7ld/nTAgHXdGI74UH8kxIaFyAkH42P54tEC9QAYIgEgDxAoSAEBrF16Czdlg18FB467CrR6Ucwxb8H+Z1e4qDeFWbkz1WEAFyIBIBESKEgBAXeWzg9xTFO6z0FP+axi8Njuxxp0zPrAUs4vnmt/dE3xABYoSAEBEZ7KazNpaWJoInmqO4II/AfncyhMNWxh6BE2qFU7/9wAFCIBIBMUKEgBAZleZTNXbgCF+8G08kiQeDPanQtNCVakzEU3g9GKB+K2ABQiASAVFihIAQFeCM83J7sm36g24qFeEDvStahHWn6SsEk+Wii49rzBiAASIgEgFxgoSAEBfV9jrgSeiAKVqeeLliXdoLrxFWe2HK0f4SG5h4kfb8YAESIBIBkaIgEgGxwoSAEBImHhXIbOHuOnOgE5f0KLqoXDB7/ZLQQGiHysuulUq2IAECIBIB0eKEgBAXT+qb5w1+qtvbJ1Fbn8y6IhO85YfxKIgKBga6ROO/yQAA8iASAfIChIAQGoJHXWXWRQGZdP9xIUrMowhvgnf+CwKTIIOBxlDiKgcAANKEgBAZ6tCuDr89HFRz3WwwK+wW4XmkE+O7Hf+NgUDI+uqnAJAAwiASAhIihIAQHtasTLBAw7MZHpRTsKyC47E1PZ/LAtF3n2Y2b5ThX0VgALIgEgIyQiASAlJihIAQGumGRf7UXrpK12Cuvj06565IC0Kbd4i2XoG6dnqC+uQAAJKEgBAXM19HUUkz6ns7o/2x45kQ2iLj8gl3zYhrAhISEUg0O1AAgiASAnKCIBICkqKEgBAa7kNA+lev+Z5T/xqKBbO648BvnLL6/hAp1auOiZTWRhAAcoSAEBxn19AKZGAUPYWs8pTpNQrCB4Ap0KfzyjOgB1Mc9PbIUABSIBICssKEgBAWarrCPqSS6+lq6NRcrWZ2/v6bN4b6Zd3GWAtN6j8a6BAAQiASAtLiIBIC8wKEgBAXYYqhLZ1tHg+HdKd8vLmTBsojkj61ZiafXB7pOt+hEFAAMiASAxMihIAQHt8p6qBiXtz+kKcgo13Udyh7Uo8irrdKlSSY2dOdALogAAIgFIMzQoSAEByacrlqsAKiFOlv4Rp4V1gNg2i4aVPkcHJq8Vug/89k4AAABduZA/UDgjSWcCfrIB+K0MAhilcbpQUhep5LPVNXE0Q7msoAAABm4N2AAABm9VrQgoSAEByIAktH0CNxT//QZ8Vgj68CApZON9XBKDfE0D2rY8Fx4AAA==".into()
+    };
+
+    let transfer = Proto::Transfer {
+        dest: "UQCn2lssMz09Gn60mBnv544DgiqIX3mK5cqGEPEPKxCNbE0E".into(), // jetton wallet address
+        amount: 90 * 1000 * 1000,                                        // 0.09 TON as fee
+        mode: Proto::SendMode::PAY_FEES_SEPARATELY as u32
+            | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS as u32,
+        bounceable: true,
+        state_init: "te6ccgEBAwEAjwACATQBAghCAg7xnhv0Dyukkvyqw4buylm/aCejhQcI2fzZrbaDq8M2AMoAgBQ8awIH6gcEaSzgT9ZAPxWhgEMUrjdKCkL1PJZ6pq4mkAPpn0MdzkzH7w8jwjgGMZfR3Y2FqlpEArXYKCy3B42gyr7UVZcLiyz/C8M4XAyTZtUz3sBQRappSGHre5Z9DbqcAg==".into(),
+        payload: PayloadType::jetton_transfer(jetton_transfer),
+        ..Proto::Transfer::default()
+    };
+
+    let input = Proto::SigningInput {
+        private_key: private_key.decode_hex().unwrap().into(),
+        messages: vec![transfer],
+        sequence_number: 7,
+        expire_at: 1727346541,
+        wallet_version: Proto::WalletVersion::WALLET_V5_R1,
+        ..Proto::SigningInput::default()
+    };
+
+    let mut signer = AnySignerHelper::<Proto::SigningOutput>::default();
+    let output = signer.sign(CoinType::TON, input);
+
+    assert_eq!(output.error, SigningError::OK, "{}", output.error_message);
+    // Successfully broadcasted: https://tonviewer.com/transaction/70f347338b3e0d33feb285a0cc7300d216b6011462ed7e76c6395bcca7abc649
+    assert_eq_boc(&output.encoded, "te6cckECPgEABjQAAUWIAUPGsCB+oHBGks4E/WQD8VoYBDFK43SgpC9TyWeqauJoDAEBoXNpZ25///8RZvU3bQAAAAeccEgIr+n38kxTDQJzavr/iItv+JNV8KDplciLKZPrDTGSAXBXT5x8NyHZ3GHpbqSEPZq7qJbGu+knS27ZzoSA4AICCg7DyG0DAwQAAAJpYgBT7S2WGZ6ejT9aTAz388cBwRVEL7zFcuVDCHiHlYhGtiAq6lQAAAAAAAAAAAAAAAAAA8AFBgIBNAcIAaIPin6lAAAAAAAAAAEIAUPGsCB+oHBGks4E/WQD8VoYBDFK43SgpC9TyWeqauJpACh41gQP1A4I0lnAn6yAfitDAIYpXG6UFIXqeSz1TVxNIgIJCEICDvGeG/QPK6SS/KrDhu7KWb9oJ6OFBwjZ/NmttoOrwzYAygCAFDxrAgfqBwRpLOBP1kA/FaGAQxSuN0oKQvU8lnqmriaQA+mfQx3OTMfvDyPCOAYxl9HdjYWqWkQCtdgoLLcHjaDKvtRVlwuLLP8LwzhcDJNm1TPewFBFqmlIYet7ln0NupwCAQgN9gLWCglGA6+1FWXC4ss/wvDOFwMk2bVM97AUEWqaUhh63uWfQ26nAB4LIgWBcAIMDShIAQEZG2ZqtEYGAq27TvzHdGuGrhhKoICBU+Zg9Xq/qRMHGAAdIgEgDg8iASAQEShIAQEV0tdPcZG01smq0thhsmqf9ZzE0QqpP3c+ERvuHF1JDgAbKEgBAf3dO8qdKoPys7AWvavs1wMNWCOq5XashXaRopmksx/LABsiASASEyIBIBQVKEgBAWP0xUs9JBrfQRl1FkF2tIfIDYpwLdf3fXqMi6BqxNtmABoiASAWFyhIAQFOErI5E7ld/nTAgHXdGI74UH8kxIaFyAkH42P54tEC9QAYIgEgGBkoSAEBrF16Czdlg18FB467CrR6Ucwxb8H+Z1e4qDeFWbkz1WEAFyIBIBobKEgBAXeWzg9xTFO6z0FP+axi8Njuxxp0zPrAUs4vnmt/dE3xABYoSAEBEZ7KazNpaWJoInmqO4II/AfncyhMNWxh6BE2qFU7/9wAFCIBIBwdKEgBAZleZTNXbgCF+8G08kiQeDPanQtNCVakzEU3g9GKB+K2ABQiASAeHyhIAQFeCM83J7sm36g24qFeEDvStahHWn6SsEk+Wii49rzBiAASIgEgICEoSAEBfV9jrgSeiAKVqeeLliXdoLrxFWe2HK0f4SG5h4kfb8YAESIBICIjIgEgJCUoSAEBImHhXIbOHuOnOgE5f0KLqoXDB7/ZLQQGiHysuulUq2IAECIBICYnKEgBAXT+qb5w1+qtvbJ1Fbn8y6IhO85YfxKIgKBga6ROO/yQAA8iASAoKShIAQGoJHXWXWRQGZdP9xIUrMowhvgnf+CwKTIIOBxlDiKgcAANKEgBAZ6tCuDr89HFRz3WwwK+wW4XmkE+O7Hf+NgUDI+uqnAJAAwiASAqKyhIAQHtasTLBAw7MZHpRTsKyC47E1PZ/LAtF3n2Y2b5ThX0VgALIgEgLC0iASAuLyhIAQGumGRf7UXrpK12Cuvj06565IC0Kbd4i2XoG6dnqC+uQAAJKEgBAXM19HUUkz6ns7o/2x45kQ2iLj8gl3zYhrAhISEUg0O1AAgiASAwMSIBIDIzKEgBAa7kNA+lev+Z5T/xqKBbO648BvnLL6/hAp1auOiZTWRhAAcoSAEBxn19AKZGAUPYWs8pTpNQrCB4Ap0KfzyjOgB1Mc9PbIUABSIBIDQ1KEgBAWarrCPqSS6+lq6NRcrWZ2/v6bN4b6Zd3GWAtN6j8a6BAAQiASA2NyIBIDg5KEgBAXYYqhLZ1tHg+HdKd8vLmTBsojkj61ZiafXB7pOt+hEFAAMiASA6OyhIAQHt8p6qBiXtz+kKcgo13Udyh7Uo8irrdKlSSY2dOdALogAAIgFIPD0oSAEByacrlqsAKiFOlv4Rp4V1gNg2i4aVPkcHJq8Vug/89k4AAABduZA/UDgjSWcCfrIB+K0MAhilcbpQUhep5LPVNXE0Q7msoAAABm4N2AAABm9VrQgoSAEByIAktH0CNxT//QZ8Vgj68CApZON9XBKDfE0D2rY8Fx4AAJev9y4=");
+    assert_eq!(
+        output.hash.to_hex(),
+        "70f347338b3e0d33feb285a0cc7300d216b6011462ed7e76c6395bcca7abc649"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ton/ton_transaction_util.rs b/rust/tw_tests/tests/chains/ton/ton_transaction_util.rs
new file mode 100644
index 00000000000..78a6d727f60
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/ton_transaction_util.rs
@@ -0,0 +1,13 @@
+use tw_any_coin::test_utils::transaction_calc_tx_hash_utils::TransactionUtilHelper;
+use tw_coin_registry::coin_type::CoinType;
+
+#[test]
+fn test_ton_transaction_util_calc_tx_hash() {
+    let encoded_tx = "te6cckECGwEAA2sAAkWIACm9HPyVOpjCNOG6nbf+EwCONRHHpeMQsIlCoWNKhUaaHgECAgE0AwQBoXNpZ25///8R/////wAAAACACOfqY7L3l3aKc58eNxuJTaeH/fgBw2aG0coM+hjDpjWhJKbYKmsAD8v054HYSuO6vN3bQnV5U19BhsGfe1MDoAUBFP8A9KQT9LzyyAsGAFGAAAAAP///iKrcG+d35KaMMtuxik4jqNofFL51Mu1f8Qf19onqsDlyIAIKDsPIbQMWBwIBIAgJAWJiAC90HaFSSy94Zxb85WYu97uTKIxAlLvolycpcYkWc+8giFAAAAAAAAAAAAAAAAABFgIBSAoLAQLyDALc0CDXScEgkVuPYyDXCx8gghBleHRuvSGCEHNpbnS9sJJfA+CCEGV4dG66jrSAINchAdB01yH6QDD6RPgo+kQwWL2RW+DtRNCBAUHXIfQFgwf0Dm+hMZEw4YBA1yFwf9s84DEg10mBAoC5kTDgcOIXDQIBIA4PAR4g1wsfghBzaWduuvLgin8NAeaO8O2i7fshgwjXIgKDCNcjIIAg1yHTH9Mf0x/tRNDSANMfINMf0//XCgAK+QFAzPkQmiiUXwrbMeHywIffArNQB7Dy0IRRJbry4IVQNrry4Ib4I7vy0IgikvgA3gGkf8jKAMsfAc8Wye1UIJL4D95w2zzYFwIBIBARABm+Xw9qJoQICg65D6AsAgFuEhMCAUgUFQAZrc52omhAIOuQ64X/wAAZrx32omhAEOuQ64WPwAAXsyX7UTQcdch1wsfgABGyYvtRNDXCgCAAAAP27aLt+wL0BCFukmwhjkwCIdc5MHCUIccAs44tAdcoIHYeQ2wg10nACPLgkyDXSsAC8uCTINcdBscSwgBSMLDy0InXTNc5MAGk6GwShAe78uCT10rAAPLgk+1V4tIAAcAAkVvg69csCBQgkXCWAdcsCBwS4lIQseMPINdKGBkaAJYB+kAB+kT4KPpEMFi68uCR7UTQgQFB1xj0BQSdf8jKAEAEgwf0U/Lgi44UA4MH9Fvy4Iwi1woAIW4Bs7Dy0JDiyFADzxYS9ADJ7VQAcjDXLAgkji0h8uCS0gDtRNDSAFETuvLQj1RQMJExnAGBAUDXIdcKAPLgjuLIygBYzxbJ7VST8sCN4gAQk1vbMeHXTNB8Ui06";
+    let tx_hash = TransactionUtilHelper::calc_tx_hash(CoinType::TON, encoded_tx);
+
+    assert_eq!(
+        tx_hash,
+        "437dae441a95a6bccdcdcea2560c313de24f13dd85c76d5d7ecaab1e70a1e52b"
+    );
+}
diff --git a/rust/tw_tests/tests/chains/ton/ton_wallet.rs b/rust/tw_tests/tests/chains/ton/ton_wallet.rs
new file mode 100644
index 00000000000..e7cdf8f35f9
--- /dev/null
+++ b/rust/tw_tests/tests/chains/ton/ton_wallet.rs
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_keypair::test_utils::tw_public_key_helper::TWPublicKeyHelper;
+use tw_keypair::tw::PublicKeyType;
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+use tw_ton::resources::WALLET_ID_V5R1_TON_MAINNET;
+use wallet_core_rs::ffi::ton::wallet::{
+    tw_ton_wallet_build_v4_r2_state_init, tw_ton_wallet_build_v5_r1_state_init,
+};
+
+#[test]
+fn test_ton_wallet_v4_r2_create_state_init() {
+    let public_key = TWPublicKeyHelper::with_hex(
+        "f229a9371fa7c2108b3d90ea22c9be705ff5d0cfeaee9cbb9366ff0171579357",
+        PublicKeyType::Ed25519,
+    );
+    assert!(!public_key.is_null());
+    let state_init_boc = TWStringHelper::wrap(unsafe {
+        tw_ton_wallet_build_v4_r2_state_init(public_key.ptr(), 0, 0x29a9a317)
+    });
+    assert_eq!(state_init_boc.to_string().unwrap(), "te6cckECFgEAAwQAAgE0AQIBFP8A9KQT9LzyyAsDAFEAAAAAKamjF/IpqTcfp8IQiz2Q6iLJvnBf9dDP6u6cu5Nm/wFxV5NXQAIBIAQFAgFIBgcE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8ICQoLAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNDA0CASAODwBu0gf6ANTUIvkABcjKBxXL/8nQd3SAGMjLBcsCIs8WUAX6AhTLaxLMzMlz+wDIQBSBAQj0UfKnAgBwgQEI1xj6ANM/yFQgR4EBCPRR8qeCEG5vdGVwdIAYyMsFywJQBs8WUAT6AhTLahLLH8s/yXP7AAIAbIEBCNcY+gDTPzBSJIEBCPRZ8qeCEGRzdHJwdIAYyMsFywJQBc8WUAP6AhPLassfEss/yXP7AAAK9ADJ7VQAeAH6APQEMPgnbyIwUAqhIb7y4FCCEHBsdWeDHrFwgBhQBMsFJs8WWPoCGfQAy2kXyx9SYMs/IMmAQPsABgCKUASBAQj0WTDtRNCBAUDXIMgBzxb0AMntVAFysI4jghBkc3Rygx6xcIAYUAXLBVADzxYj+gITy2rLH8s/yYBA+wCSXwPiAgEgEBEAWb0kK29qJoQICga5D6AhhHDUCAhHpJN9KZEM5pA+n/mDeBKAG3gQFImHFZ8xhAIBWBITABG4yX7UTQ1wsfgAPbKd+1E0IEBQNch9AQwAsjKB8v/ydABgQEI9ApvoTGACASAUFQAZrc52omhAIGuQ64X/wAAZrx32omhAEGuQ64WPwEXtMkg=");
+}
+
+#[test]
+fn test_ton_wallet_v5_r1_create_state_init() {
+    let public_key = TWPublicKeyHelper::with_hex(
+        "f229a9371fa7c2108b3d90ea22c9be705ff5d0cfeaee9cbb9366ff0171579357",
+        PublicKeyType::Ed25519,
+    );
+    assert!(!public_key.is_null());
+    let state_init_boc = TWStringHelper::wrap(unsafe {
+        tw_ton_wallet_build_v5_r1_state_init(public_key.ptr(), 0, WALLET_ID_V5R1_TON_MAINNET)
+    });
+    assert_eq!(state_init_boc.to_string().unwrap(), "te6cckECFgEAArEAAgE0AQIBFP8A9KQT9LzyyAsDAFGAAAAAP///iPkU1JuP0+EIRZ7IdRFk3zgv+uhn9XdOXcmzf4C4q8mroAIBIAQFAgFIBgcBAvIIAtzQINdJwSCRW49jINcLHyCCEGV4dG69IYIQc2ludL2wkl8D4IIQZXh0brqOtIAg1yEB0HTXIfpAMPpE+Cj6RDBYvZFb4O1E0IEBQdch9AWDB/QOb6ExkTDhgEDXIXB/2zzgMSDXSYECgLmRMOBw4hIJAgEgCgsBHiDXCx+CEHNpZ2668uCKfwkB5o7w7aLt+yGDCNciAoMI1yMggCDXIdMf0x/TH+1E0NIA0x8g0x/T/9cKAAr5AUDM+RCaKJRfCtsx4fLAh98Cs1AHsPLQhFEluvLghVA2uvLghvgju/LQiCKS+ADeAaR/yMoAyx8BzxbJ7VQgkvgP3nDbPNgSAgEgDA0AGb5fD2omhAgKDrkPoCwCAW4ODwIBSBARABmtznaiaEAg65Drhf/AABmvHfaiaEAQ65DrhY/AABezJftRNBx1yHXCx+AAEbJi+1E0NcKAIAP27aLt+wL0BCFukmwhjkwCIdc5MHCUIccAs44tAdcoIHYeQ2wg10nACPLgkyDXSsAC8uCTINcdBscSwgBSMLDy0InXTNc5MAGk6GwShAe78uCT10rAAPLgk+1V4tIAAcAAkVvg69csCBQgkXCWAdcsCBwS4lIQseMPINdKExQVAJYB+kAB+kT4KPpEMFi68uCR7UTQgQFB1xj0BQSdf8jKAEAEgwf0U/Lgi44UA4MH9Fvy4Iwi1woAIW4Bs7Dy0JDiyFADzxYS9ADJ7VQAcjDXLAgkji0h8uCS0gDtRNDSAFETuvLQj1RQMJExnAGBAUDXIdcKAPLgjuLIygBYzxbJ7VST8sCN4gAQk1vbMeHXTNBAlw92");
+}
diff --git a/rust/tw_tests/tests/chains/zetachain/mod.rs b/rust/tw_tests/tests/chains/zetachain/mod.rs
new file mode 100644
index 00000000000..b742c655b68
--- /dev/null
+++ b/rust/tw_tests/tests/chains/zetachain/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod zetachain_address;
+mod zetachain_sign;
diff --git a/rust/tw_tests/tests/chains/zetachain/zetachain_address.rs b/rust/tw_tests/tests/chains/zetachain/zetachain_address.rs
new file mode 100644
index 00000000000..374fc39cda6
--- /dev/null
+++ b/rust/tw_tests/tests/chains/zetachain/zetachain_address.rs
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::test_utils::address_utils::{
+    test_address_bech32_is_valid, test_address_create_bech32_with_public_key,
+    test_address_get_data, test_address_invalid, test_address_normalization, test_address_valid,
+    AddressBech32IsValid, AddressCreateBech32WithPublicKey,
+};
+use tw_coin_registry::coin_type::CoinType;
+use tw_keypair::tw::PublicKeyType;
+
+#[test]
+fn test_zetachain_address_normalization() {
+    test_address_normalization(
+        CoinType::NativeZetaChain,
+        "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne",
+        "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne",
+    );
+}
+
+#[test]
+fn test_zetachain_address_is_valid() {
+    test_address_valid(
+        CoinType::NativeZetaChain,
+        "zeta1em87eul072u3yz4vpgm9mdfszhu0clxekuw08f",
+    );
+    test_address_valid(
+        CoinType::NativeZetaChain,
+        "zeta17xpfvakm2amg962yls6f84z3kell8c5lxad43d",
+    );
+}
+
+#[test]
+fn test_zetachain_address_invalid() {
+    test_address_invalid(
+        CoinType::NativeZetaChain,
+        "zeta17xpfvakm2amg962yls6f84z3kell8c5lxad4",
+    );
+    // Cosmos has a different `hrp`.
+    test_address_invalid(
+        CoinType::Cosmos,
+        "zeta17xpfvakm2amg962yls6f84z3kell8c5lxad43d",
+    );
+}
+
+#[test]
+fn test_zetachain_address_get_data() {
+    test_address_get_data(
+        CoinType::NativeZetaChain,
+        "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne",
+        "A8491D40D4F71A752CA41DA0516AED80C33A1B56",
+    );
+}
+
+#[test]
+fn test_zetachain_is_valid_bech32() {
+    // NativeZetaChain address must be valid if its Base32 prefix passed.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::NativeZetaChain,
+        address: "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne",
+        hrp: "zeta",
+    });
+    // NativeZetaChain address must be valid for the standard Cosmos hub if its Base32 prefix passed.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::Cosmos,
+        address: "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne",
+        hrp: "zeta",
+    });
+    // Cosmos address must be valid with "cosmos" hrp.
+    test_address_bech32_is_valid(AddressBech32IsValid {
+        coin: CoinType::NativeZetaChain,
+        address: "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02",
+        hrp: "cosmos",
+    });
+}
+
+#[test]
+fn test_any_address_create_bech32_with_public_key() {
+    test_address_create_bech32_with_public_key(AddressCreateBech32WithPublicKey {
+        coin: CoinType::NativeZetaChain,
+        private_key: "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed",
+        public_key_type: PublicKeyType::Secp256k1Extended,
+        hrp: "zeta",
+        expected: "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne",
+    });
+}
diff --git a/rust/tw_tests/tests/chains/zetachain/zetachain_sign.rs b/rust/tw_tests/tests/chains/zetachain/zetachain_sign.rs
new file mode 100644
index 00000000000..ba87a777572
--- /dev/null
+++ b/rust/tw_tests/tests/chains/zetachain/zetachain_sign.rs
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_coin_entry::error::prelude::*;
+use tw_coin_registry::coin_type::CoinType;
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use tw_proto::Cosmos::Proto::{self, mod_Message::OneOfmessage_oneof as MessageEnum};
+use tw_proto::{deserialize, serialize};
+
+const PRIVATE_KEY: &str = "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed";
+
+/// Successfully broadcasted (testnet):
+/// https://explorer.zetachain.com/cosmos/tx/A2FC8816657856ED274C4418C3CAEAEE645561275F6C63AB5F8B1DCFB37341A0
+#[test]
+fn test_zetachain_sign_msg_send_testnet() {
+    let send_msg = Proto::mod_Message::Send {
+        from_address: "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne".into(),
+        to_address: "zeta1cscf4ldnkkz7f0wpveur6dpd0d6p2zxnsuu70y".into(),
+        amounts: vec![Proto::Amount {
+            denom: "azeta".into(),
+            // 0.3 ZETA
+            amount: "300000000000000000".into(),
+        }],
+        ..Proto::mod_Message::Send::default()
+    };
+
+    let input = Proto::SigningInput {
+        signing_mode: Proto::SigningMode::Protobuf,
+        account_number: 2726346,
+        chain_id: "athens_7001-1".into(),
+        sequence: 2,
+        fee: Some(Proto::Fee {
+            gas: 200000,
+            amounts: vec![],
+        }),
+        private_key: PRIVATE_KEY.decode_hex().unwrap().into(),
+        messages: vec![Proto::Message {
+            message_oneof: MessageEnum::send_coins_message(send_msg),
+        }],
+        tx_hasher: Proto::TxHasher::Keccak256,
+        signer_info: Some(Proto::SignerInfo {
+            // Zetachain requires a compressed public key to sign a transaction,
+            // however an uncompressed public key is used to generate address.
+            public_key_type: Proto::SignerPublicKeyType::Secp256k1,
+            json_type: "ethermint/PubKeyEthSecp256k1".into(),
+            protobuf_type: "/ethermint.crypto.v1.ethsecp256k1.PubKey".into(),
+        }),
+        ..Proto::SigningInput::default()
+    };
+
+    let input_data = TWDataHelper::create(serialize(&input).unwrap());
+
+    let output = TWDataHelper::wrap(unsafe {
+        tw_any_signer_sign(input_data.ptr(), CoinType::NativeZetaChain as u32)
+    })
+    .to_vec()
+    .expect("!tw_any_signer_sign returned nullptr");
+
+    let output: Proto::SigningOutput = deserialize(&output).unwrap();
+    assert_eq!(output.error, SigningErrorType::OK);
+    assert!(output.error_message.is_empty());
+
+    assert_eq!(
+        output.serialized,
+        r#"{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpoBCpcBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEncKK3pldGExNHB5MzZzeDU3dWQ4MnQ5eXJrczl6Nmhkc3JwbjV4NmtteHMwbmUSK3pldGExY3NjZjRsZG5ra3o3ZjB3cHZldXI2ZHBkMGQ2cDJ6eG5zdXU3MHkaGwoFYXpldGESEjMwMDAwMDAwMDAwMDAwMDAwMBJhClkKTwooL2V0aGVybWludC5jcnlwdG8udjEuZXRoc2VjcDI1NmsxLlB1YktleRIjCiECho5+FjRBfbKt/Z/jggW/oP6gGJin/TBWXRP3BWo3wGUSBAoCCAEYAhIEEMCaDBpAgGvqca0w2N9wnHnnxS9HiVud4aQ9lNCumzgNIW6wOR4kvPScacGS1G3kwCw7wyI2NJL8M1eVYjafFIt2FpKl3w=="}"#
+    );
+    assert_eq!(output.signature.to_hex(), "806bea71ad30d8df709c79e7c52f47895b9de1a43d94d0ae9b380d216eb0391e24bcf49c69c192d46de4c02c3bc322363492fc33579562369f148b761692a5df");
+    assert_eq!(
+        output.signature_json,
+        r#"[{"pub_key":{"type":"ethermint/PubKeyEthSecp256k1","value":"AoaOfhY0QX2yrf2f44IFv6D+oBiYp/0wVl0T9wVqN8Bl"},"signature":"gGvqca0w2N9wnHnnxS9HiVud4aQ9lNCumzgNIW6wOR4kvPScacGS1G3kwCw7wyI2NJL8M1eVYjafFIt2FpKl3w=="}]"#
+    );
+}
diff --git a/rust/tw_tests/tests/coin_address_derivation_test.rs b/rust/tw_tests/tests/coin_address_derivation_test.rs
new file mode 100644
index 00000000000..4f7e27b9375
--- /dev/null
+++ b/rust/tw_tests/tests/coin_address_derivation_test.rs
@@ -0,0 +1,178 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::ffi::tw_any_address::{
+    tw_any_address_create_with_public_key_derivation, tw_any_address_description,
+};
+use tw_any_coin::test_utils::address_utils::TWAnyAddressHelper;
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::registry::get_coin_item;
+use tw_coin_registry::tw_derivation::TWDerivation;
+use tw_keypair::ffi::privkey::tw_private_key_get_public_key_by_type;
+use tw_keypair::test_utils::tw_private_key_helper::TWPrivateKeyHelper;
+use tw_keypair::test_utils::tw_public_key_helper::TWPublicKeyHelper;
+use tw_memory::test_utils::tw_string_helper::TWStringHelper;
+
+#[test]
+fn test_coin_address_derivation() {
+    let private_key = TWPrivateKeyHelper::with_hex(
+        "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5",
+    );
+
+    for coin in CoinType::iter() {
+        let coin_item = get_coin_item(coin).unwrap();
+
+        // Skip unsupported blockchains.
+        if !coin_item.blockchain.is_supported() {
+            continue;
+        }
+
+        let public_key = TWPublicKeyHelper::wrap(unsafe {
+            tw_private_key_get_public_key_by_type(
+                private_key.ptr(),
+                coin_item.public_key_type as u32,
+            )
+        });
+
+        let expected_address = match coin {
+            CoinType::Ethereum
+            | CoinType::AcalaEVM
+            | CoinType::Arbitrum
+            | CoinType::ArbitrumNova
+            | CoinType::Aurora
+            | CoinType::AvalancheCChain
+            | CoinType::Boba
+            | CoinType::Callisto
+            | CoinType::Celo
+            | CoinType::ConfluxeSpace
+            | CoinType::CronosChain
+            | CoinType::ECOChain
+            | CoinType::EthereumClassic
+            | CoinType::Evmos
+            | CoinType::Fantom
+            | CoinType::GoChain
+            | CoinType::KavaEvm
+            | CoinType::Kaia
+            | CoinType::KuCoinCommunityChain
+            | CoinType::Meter
+            | CoinType::Metis
+            | CoinType::Moonbeam
+            | CoinType::Moonriver
+            | CoinType::Optimism
+            | CoinType::Zksync
+            | CoinType::PolygonzkEVM
+            | CoinType::OKXChain
+            | CoinType::POANetwork
+            | CoinType::Polygon
+            | CoinType::SmartBitcoinCash
+            | CoinType::SmartChain
+            | CoinType::SmartChainLegacy
+            | CoinType::Theta
+            | CoinType::ThetaFuel
+            | CoinType::ThunderCore
+            | CoinType::Viction
+            | CoinType::VeChain
+            | CoinType::Wanchain
+            | CoinType::xDai
+            | CoinType::IoTeXEVM
+            | CoinType::Scroll
+            | CoinType::OpBNB
+            | CoinType::Neon
+            | CoinType::Base
+            | CoinType::Linea
+            | CoinType::Greenfield
+            | CoinType::Mantle
+            | CoinType::ZenEON
+            | CoinType::MantaPacific
+            | CoinType::ZetaEVM
+            | CoinType::Merlin
+            | CoinType::Lightlink
+            | CoinType::Blast
+            | CoinType::BounceBit
+            | CoinType::ZkLinkNova
+            // end_of_evm_address_derivation_tests_marker_do_not_modify
+                => "0xAc1ec44E4f0ca7D172B7803f6836De87Fb72b309",
+            CoinType::Bitcoin => "bc1qten42eesehw0ktddcp0fws7d3ycsqez3f7d5yt",
+            CoinType::Litecoin => "ltc1qten42eesehw0ktddcp0fws7d3ycsqez3dzhsum",
+            CoinType::Dogecoin => "DDkFr311AYe6ABMsdSnjv8yoSr1Tppokp8",
+            CoinType::Dash => "XjJ192iFpqxPn7mrkk7QDuVzQ3rrY5yXJG",
+            CoinType::Viacoin => "via1qten42eesehw0ktddcp0fws7d3ycsqez3rmf8ld",
+            CoinType::DigiByte => "dgb1qten42eesehw0ktddcp0fws7d3ycsqez379fvu9",
+            CoinType::Monacoin => "MGWKYCxmN9ucWr9c7qT7ceRY2wAKz2NnGf",
+            CoinType::Syscoin => "sys1qten42eesehw0ktddcp0fws7d3ycsqez3pwuwme",
+            CoinType::Pivx => "DDkFr311AYe6ABMsdSnjv8yoSr1Tppokp8",
+            CoinType::Firo => "a9Kd3gVz5vjegicNuG7K8f8iB5QWkUuTxW",
+            CoinType::BitcoinCash => "bitcoincash:qp0xw4t8xrxae7ed4hq9a96rekynzqry2ydzeh0jgs",
+            CoinType::BitcoinGold => "btg1qten42eesehw0ktddcp0fws7d3ycsqez3lht33r",
+            CoinType::Ravencoin => "RHtMPHweTxYNhBYUN2nJTu9QKyjm7MRKsF",
+            CoinType::eCash => "ecash:qp0xw4t8xrxae7ed4hq9a96rekynzqry2y50du5gw8",
+            CoinType::Qtum => "QVD9R5M53bcd4KGJKC7fVebq4yDsnEDwtt",
+            CoinType::Stratis => "strax1qten42eesehw0ktddcp0fws7d3ycsqez39n8kr5",
+            CoinType::Aptos => "0x9006fa46f038224e8004bdda97f2e7a60c2c3d135bce7cb15541e5c0aae907a4",
+            CoinType::Cosmos => "cosmos1ten42eesehw0ktddcp0fws7d3ycsqez3lynlqx",
+            CoinType::Stargaze => "stars1ten42eesehw0ktddcp0fws7d3ycsqez3tcyzth",
+            CoinType::Juno => "juno1ten42eesehw0ktddcp0fws7d3ycsqez3fksy86",
+            CoinType::Stride => "stride1ten42eesehw0ktddcp0fws7d3ycsqez3u0nr52",
+            CoinType::Axelar => "axelar1ten42eesehw0ktddcp0fws7d3ycsqez3m29ht8",
+            CoinType::Crescent => "cre1ten42eesehw0ktddcp0fws7d3ycsqez3mvq64t",
+            CoinType::Kujira => "kujira1ten42eesehw0ktddcp0fws7d3ycsqez3wv38dv",
+            CoinType::Comdex => "comdex1ten42eesehw0ktddcp0fws7d3ycsqez3ct3ae3",
+            CoinType::Neutron => "neutron1ten42eesehw0ktddcp0fws7d3ycsqez3mm6a6p",
+            CoinType::Sommelier => "somm1ten42eesehw0ktddcp0fws7d3ycsqez3ncun3v",
+            CoinType::FetchAI => "fetch1ten42eesehw0ktddcp0fws7d3ycsqez3ve6mz3",
+            CoinType::Mars => "mars1ten42eesehw0ktddcp0fws7d3ycsqez3ze2x4a",
+            CoinType::Umee => "umee1ten42eesehw0ktddcp0fws7d3ycsqez3djwqy5",
+            CoinType::Noble => "noble1ten42eesehw0ktddcp0fws7d3ycsqez3h8xhcg",
+            CoinType::Sei => "sei1ten42eesehw0ktddcp0fws7d3ycsqez3jgzfx8",
+            CoinType::Tia => "celestia1ten42eesehw0ktddcp0fws7d3ycsqez3wwz06t",
+            CoinType::Coreum => "core1ten42eesehw0ktddcp0fws7d3ycsqez3v2ty8a",
+            CoinType::Quasar => "quasar1ten42eesehw0ktddcp0fws7d3ycsqez338fzdr",
+            CoinType::Persistence => "persistence1ten42eesehw0ktddcp0fws7d3ycsqez33g4vwz",
+            CoinType::Akash => "akash1ten42eesehw0ktddcp0fws7d3ycsqez3jl7ceu",
+            CoinType::Terra => "terra1ten42eesehw0ktddcp0fws7d3ycsqez3eqflzx",
+            CoinType::TerraV2 => "terra1ten42eesehw0ktddcp0fws7d3ycsqez3eqflzx",
+            CoinType::Kava => "kava1ten42eesehw0ktddcp0fws7d3ycsqez3r38zkp",
+            CoinType::Bluzelle => "bluzelle1ten42eesehw0ktddcp0fws7d3ycsqez32usaxh",
+            CoinType::BandChain => "band1ten42eesehw0ktddcp0fws7d3ycsqez3xtnacw",
+            CoinType::Rootstock => "0xAc1ec44E4f0ca7D172B7803f6836De87Fb72b309",
+            CoinType::THORChain => "thor1ten42eesehw0ktddcp0fws7d3ycsqez3er2y4e",
+            CoinType::CryptoOrg => "cro1ten42eesehw0ktddcp0fws7d3ycsqez38lmxuh",
+            CoinType::Ronin => "ronin:Ac1ec44E4f0ca7D172B7803f6836De87Fb72b309",
+            CoinType::Secret => "secret1ten42eesehw0ktddcp0fws7d3ycsqez3ap8ka6",
+            CoinType::Osmosis => "osmo1ten42eesehw0ktddcp0fws7d3ycsqez3hlq0k5",
+            CoinType::NativeEvmos => "evmos14s0vgnj0pjnazu4hsqlksdk7slah9vcfvt8ssm",
+            CoinType::Agoric => "agoric1ten42eesehw0ktddcp0fws7d3ycsqez3de3qss",
+            CoinType::NativeInjective => "inj14s0vgnj0pjnazu4hsqlksdk7slah9vcfyrp6ct",
+            CoinType::NativeCanto => "canto14s0vgnj0pjnazu4hsqlksdk7slah9vcfuuhw7m",
+            CoinType::InternetComputer => "290cc7c359f44c8516fc169c5ed4f0f3ae2e24bf5de0d4c51f5e7545b5474faa",
+            CoinType::Binance => "bnb1ten42eesehw0ktddcp0fws7d3ycsqez3aqvnpg",
+            CoinType::TBinance => "tbnb1ten42eesehw0ktddcp0fws7d3ycsqez3n49hpe",
+            CoinType::NativeZetaChain => "zeta14s0vgnj0pjnazu4hsqlksdk7slah9vcfcwctsr",
+            CoinType::Dydx => "dydx1ten42eesehw0ktddcp0fws7d3ycsqez3kaamq3",
+            CoinType::Solana => "5sn9QYhDaq61jLXJ8Li5BKqGL4DDMJQvU1rdN8XgVuwC",
+            CoinType::Sui => "0x01a5c6c1b74cec4fbd12b3e17252b83448136065afcdf24954dc3a9c26df4905",
+            CoinType::TON => "UQCj3jAU_Ec2kXdAqweKt4rYjiwTNwiCfaUnIDHGh7wTwx_G",
+            CoinType::Pactus => "pc1rk2qaaeu9pj3zwtvm49d3d4yqxzpp4te87cx0am",
+            // end_of_coin_address_derivation_tests_marker_do_not_modify
+            _ => panic!("{:?} must be covered", coin),
+        };
+
+        let any_address = TWAnyAddressHelper::wrap(unsafe {
+            tw_any_address_create_with_public_key_derivation(
+                public_key.ptr(),
+                coin as u32,
+                TWDerivation::Default as u32,
+            )
+        });
+
+        let description =
+            TWStringHelper::wrap(unsafe { tw_any_address_description(any_address.ptr()) });
+        assert_eq!(
+            description.to_string(),
+            Some(expected_address.to_string()),
+            "Invalid {:?} address",
+            coin
+        );
+    }
+}
diff --git a/rust/tw_tests/tests/tw_any_signer_ffi_tests.rs b/rust/tw_tests/tests/tw_any_signer_ffi_tests.rs
new file mode 100644
index 00000000000..ac9d33676c9
--- /dev/null
+++ b/rust/tw_tests/tests/tw_any_signer_ffi_tests.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_any_coin::ffi::tw_any_signer::tw_any_signer_sign;
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+
+#[test]
+fn test_any_signer_sign_unknown_coin() {
+    let unsupported_coin = u32::MAX;
+
+    let input_data = TWDataHelper::create(vec![]);
+    let output =
+        TWDataHelper::wrap(unsafe { tw_any_signer_sign(input_data.ptr(), unsupported_coin) });
+    assert!(output.is_null());
+}
diff --git a/rust/tw_tests/tests/utils/bit_reader.rs b/rust/tw_tests/tests/utils/bit_reader.rs
new file mode 100644
index 00000000000..ceb7d5fc5ba
--- /dev/null
+++ b/rust/tw_tests/tests/utils/bit_reader.rs
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use tw_encoding::hex::{DecodeHex, ToHex};
+use tw_memory::test_utils::tw_data_helper::TWDataHelper;
+use wallet_core_rs::ffi::utils::bit_reader_ffi::{
+    tw_bit_reader_create, tw_bit_reader_finished, tw_bit_reader_read_u8,
+    tw_bit_reader_read_u8_slice, CBitReaderCode,
+};
+
+#[test]
+fn test_tw_bit_reader_success() {
+    let ton_address_cell = "8005bd3e6bab0c5c6ca7c84ea9e4c0bfa0a38662f5bba544702d2ede1c8e315d2ba0"
+        .decode_hex()
+        .unwrap();
+    let ton_address_cell = TWDataHelper::create(ton_address_cell);
+
+    let reader = unsafe { tw_bit_reader_create(ton_address_cell.ptr(), 267) };
+    assert!(!reader.is_null());
+
+    let tp = unsafe { tw_bit_reader_read_u8(reader, 2) };
+    assert_eq!(tp.into_result(), Ok(2));
+
+    let res1 = unsafe { tw_bit_reader_read_u8(reader, 1) };
+    assert_eq!(res1.into_result(), Ok(0));
+
+    let wc = unsafe { tw_bit_reader_read_u8(reader, 8) };
+    assert_eq!(wc.into_result(), Ok(0));
+
+    assert!(!unsafe { tw_bit_reader_finished(reader) });
+
+    let hash_part = unsafe { tw_bit_reader_read_u8_slice(reader, 32).unwrap().into_vec() };
+    assert_eq!(
+        hash_part.to_hex(),
+        "2de9f35d5862e3653e42754f2605fd051c3317addd2a23816976f0e4718ae95d"
+    );
+
+    assert!(unsafe { tw_bit_reader_finished(reader) });
+}
+
+#[test]
+fn test_tw_bit_reader_error() {
+    let bytes_len = 2;
+    // Less than two bytes.
+    let bits_len = 15;
+
+    let data = TWDataHelper::create(vec![1; bytes_len]);
+
+    let reader = unsafe { tw_bit_reader_create(data.ptr(), bits_len as u64) };
+    assert!(!reader.is_null());
+
+    // Cannot read u8 from 9 bits.
+    let res = unsafe { tw_bit_reader_read_u8(reader, 9) };
+    assert_eq!(
+        res.into_result().unwrap_err(),
+        CBitReaderCode::TooManyBitsForType as i32
+    );
+
+    // Read a dummy u8.
+    let _ = unsafe { tw_bit_reader_read_u8_slice(reader, 8) };
+
+    // Cannot read 8 bits as there are 7 bits left only.
+    let res = unsafe { tw_bit_reader_read_u8_slice(reader, 8) };
+    assert_eq!(
+        res.into_result().unwrap_err(),
+        CBitReaderCode::NotEnoughData as i32
+    );
+}
diff --git a/rust/tw_tests/tests/utils/mod.rs b/rust/tw_tests/tests/utils/mod.rs
new file mode 100644
index 00000000000..cf923eed5af
--- /dev/null
+++ b/rust/tw_tests/tests/utils/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod bit_reader;
+mod uuid;
diff --git a/rust/tw_tests/tests/utils/uuid.rs b/rust/tw_tests/tests/utils/uuid.rs
new file mode 100644
index 00000000000..a5c9aad34e4
--- /dev/null
+++ b/rust/tw_tests/tests/utils/uuid.rs
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::collections::HashSet;
+use std::ffi::CStr;
+use wallet_core_rs::ffi::utils::uuid_ffi::tw_uuid_random;
+
+/// Example of the valid UUID: 3cbbcce1-db89-4ea2-be24-88a686be461c
+#[test]
+fn test_tw_uuid_random_is_valid() {
+    let uuid = unsafe { CStr::from_ptr(tw_uuid_random()) }
+        .to_str()
+        .unwrap();
+
+    let tokens: Vec<_> = uuid.split("-").collect();
+    assert_eq!(tokens.len(), 5);
+    assert_eq!(tokens[0].len(), 8);
+    assert_eq!(tokens[1].len(), 4);
+    assert_eq!(tokens[2].len(), 4);
+    assert_eq!(tokens[3].len(), 4);
+    assert_eq!(tokens[4].len(), 12);
+}
+
+#[test]
+fn test_tw_uuid_random_do_not_repeat() {
+    const ITERATIONS: usize = 10000;
+
+    // Use `Vec` instead of `HashSet` here to make each iteration as fast as possible.
+    let mut uuids = Vec::with_capacity(ITERATIONS);
+    for _ in 0..ITERATIONS {
+        let uuid = unsafe { CStr::from_ptr(tw_uuid_random()) }
+            .to_str()
+            .unwrap();
+        uuids.push(uuid);
+    }
+
+    let unique_uuids: HashSet<&str> = uuids.into_iter().collect();
+    assert_eq!(unique_uuids.len(), ITERATIONS);
+}
diff --git a/rust/tw_tests/tests/utils_tests.rs b/rust/tw_tests/tests/utils_tests.rs
new file mode 100644
index 00000000000..815dd5a7c46
--- /dev/null
+++ b/rust/tw_tests/tests/utils_tests.rs
@@ -0,0 +1,5 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod utils;
diff --git a/rust/wallet_core_bin/Cargo.toml b/rust/wallet_core_bin/Cargo.toml
new file mode 100644
index 00000000000..49896eb72b8
--- /dev/null
+++ b/rust/wallet_core_bin/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "wallet_core_bin"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+serde = "1.0"
+serde_json = "1.0"
+tw_coin_registry = { path = "../tw_coin_registry" }
diff --git a/rust/wallet_core_bin/src/main.rs b/rust/wallet_core_bin/src/main.rs
new file mode 100644
index 00000000000..cf9e7c554ac
--- /dev/null
+++ b/rust/wallet_core_bin/src/main.rs
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+mod registry_stats;
+
+#[derive(Debug)]
+enum Error {
+    MissingArguments,
+    UnknownCommand,
+    InvalidRegistry,
+    InvalidRegistryParam {
+        #[allow(dead_code)]
+        param: &'static str,
+    },
+}
+
+fn help() {
+    println!("WalletCore binary tools:");
+    println!();
+    println!("\tregistry-stats  Print registry statistic (e.g Rust transition progress)");
+}
+
+fn main() -> Result<(), Error> {
+    let args: Vec<String> = std::env::args().collect();
+
+    if args.len() < 2 {
+        help();
+        return Err(Error::MissingArguments);
+    }
+
+    match args[1].as_str() {
+        "registry-stats" => registry_stats::registry_stats(),
+        _ => {
+            help();
+            Err(Error::UnknownCommand)
+        },
+    }
+}
diff --git a/rust/wallet_core_bin/src/registry_stats.rs b/rust/wallet_core_bin/src/registry_stats.rs
new file mode 100644
index 00000000000..8ebd6b6dda7
--- /dev/null
+++ b/rust/wallet_core_bin/src/registry_stats.rs
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use crate::Error;
+use serde_json::Value as Json;
+use std::collections::HashSet;
+use tw_coin_registry::blockchain_type::BlockchainType;
+use tw_coin_registry::registry;
+
+struct BlockchainStats {
+    total: usize,
+    supported: usize,
+}
+
+fn blockchain_stats() -> Result<BlockchainStats, Error> {
+    let chains: Vec<Json> =
+        serde_json::from_str(registry::REGISTRY_JSON).map_err(|_| Error::InvalidRegistry)?;
+
+    fn extract_blockchain(chain: &Json) -> Option<(&str, BlockchainType)> {
+        let blockchain_val = chain.get("blockchain")?;
+        let blockchain_str = chain["blockchain"].as_str()?;
+        let blockchain_type: BlockchainType =
+            serde_json::from_value(blockchain_val.clone()).ok()?;
+        Some((blockchain_str, blockchain_type))
+    }
+
+    let mut supported = HashSet::new();
+    let mut total = HashSet::new();
+
+    for chain in chains.iter() {
+        let (blockchain_str, blockchain_type) =
+            extract_blockchain(chain).ok_or(Error::InvalidRegistryParam {
+                param: "blockchain",
+            })?;
+
+        total.insert(blockchain_str);
+        match blockchain_type {
+            BlockchainType::Unsupported => (),
+            _ => {
+                supported.insert(blockchain_str);
+            },
+        }
+    }
+
+    Ok(BlockchainStats {
+        total: total.len(),
+        supported: supported.len(),
+    })
+}
+
+pub fn registry_stats() -> Result<(), Error> {
+    let total_chains = registry::registry_iter().count();
+    let chains_in_rust = registry::supported_coin_items().count();
+    let rust_chains_progress = (chains_in_rust * 100) as f64 / total_chains as f64;
+
+    let blockchain_stats = blockchain_stats()?;
+    let blockchain_progress =
+        (blockchain_stats.supported * 100) as f64 / blockchain_stats.total as f64;
+
+    println!();
+    println!("total chains: {total_chains}");
+    println!("supported chains: {chains_in_rust}");
+    println!("chains transition progress: {rust_chains_progress:.1}%");
+
+    println!();
+    println!("total blockchain impls: {}", blockchain_stats.total);
+    println!("supported blockchain impls: {}", blockchain_stats.supported);
+    println!("blockchains transition progress: {blockchain_progress:.1}%");
+
+    Ok(())
+}
diff --git a/rust/wallet_core_rs/Cargo.toml b/rust/wallet_core_rs/Cargo.toml
new file mode 100644
index 00000000000..1b8f34f853a
--- /dev/null
+++ b/rust/wallet_core_rs/Cargo.toml
@@ -0,0 +1,50 @@
+[package]
+name = "wallet-core-rs"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+name = "wallet_core_rs"
+crate-type = ["staticlib", "rlib"] # Creates static lib
+
+[features]
+default = [
+    "any-coin",
+    "bitcoin",
+    "ethereum",
+    "keypair",
+    "solana",
+    "ton",
+    "utils",
+]
+any-coin = ["tw_any_coin"]
+bitcoin = ["tw_bitcoin", "tw_coin_registry"]
+ethereum = ["tw_ethereum", "tw_coin_registry"]
+keypair = ["tw_keypair"]
+solana = ["tw_solana"]
+ton = ["tw_ton"]
+utils = [
+    "tw_encoding",
+    "tw_hash",
+    "tw_memory",
+    "tw_number",
+    "tw_proto",
+    "uuid"
+]
+
+[dependencies]
+bitreader = "0.3.8"
+tw_any_coin = { path = "../tw_any_coin", optional = true }
+tw_bitcoin = { path = "../chains/tw_bitcoin", optional = true }
+tw_coin_registry = { path = "../tw_coin_registry", optional = true }
+tw_encoding = { path = "../tw_encoding", optional = true }
+tw_ethereum = { path = "../chains/tw_ethereum", optional = true }
+tw_hash = { path = "../tw_hash", optional = true }
+tw_keypair = { path = "../tw_keypair", optional = true }
+tw_memory = { path = "../tw_memory", optional = true }
+tw_number = { path = "../tw_number", optional = true }
+tw_misc = { path = "../tw_misc" }
+tw_proto = { path = "../tw_proto", optional = true }
+tw_solana = { path = "../chains/tw_solana", optional = true }
+tw_ton = { path = "../chains/tw_ton", optional = true }
+uuid = { version = "1.7", features = ["v4"], optional = true }
diff --git a/rust/wallet_core_rs/cbindgen.toml b/rust/wallet_core_rs/cbindgen.toml
new file mode 100644
index 00000000000..6697f798a56
--- /dev/null
+++ b/rust/wallet_core_rs/cbindgen.toml
@@ -0,0 +1,22 @@
+# Whether to add a `#pragma once` guard
+# default: doesn't emit a `#pragma once`
+pragma_once = true
+
+namespaces = ["TW", "Rust"]
+
+[parse]
+parse_deps = true
+extra_bindings = [
+    "tw_any_coin",
+    "tw_encoding",
+    "tw_hash",
+    "tw_keypair",
+    "tw_memory",
+]
+include = [
+    "tw_any_coin",
+    "tw_encoding",
+    "tw_hash",
+    "tw_keypair",
+    "tw_memory",
+]
diff --git a/rust/wallet_core_rs/src/ffi/bitcoin/mod.rs b/rust/wallet_core_rs/src/ffi/bitcoin/mod.rs
new file mode 100644
index 00000000000..7632dd9561b
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/bitcoin/mod.rs
@@ -0,0 +1,3 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
diff --git a/rust/wallet_core_rs/src/ffi/ethereum/abi.rs b/rust/wallet_core_rs/src/ffi/ethereum/abi.rs
new file mode 100644
index 00000000000..4c21d659542
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/ethereum/abi.rs
@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::evm_dispatcher;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::tw_string::TWString;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+
+/// Decode function call data to human readable json format, according to input abi json.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.ContractCallDecodingInput`.
+/// \return serialized `EthereumAbi::Proto::ContractCallDecodingOutput`.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ethereum_abi_decode_contract_call(
+    coin: u32,
+    input: *const TWData,
+) -> *mut TWData {
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+    let input_data = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let evm_dispatcher = try_or_else!(evm_dispatcher(coin), std::ptr::null_mut);
+
+    evm_dispatcher
+        .decode_abi_contract_call(input_data.as_slice())
+        .map(|data| TWData::from(data).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Decode a function input or output data according to a given ABI.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.ParamsDecodingInput`.
+/// \return The serialized data of a `TW.EthereumAbi.Proto.ParamsDecodingOutput` proto object.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ethereum_abi_decode_params(
+    coin: u32,
+    input: *const TWData,
+) -> *mut TWData {
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+    let input_data = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let evm_dispatcher = try_or_else!(evm_dispatcher(coin), std::ptr::null_mut);
+
+    evm_dispatcher
+        .decode_abi_params(input_data.as_slice())
+        .map(|data| TWData::from(data).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// Returns the function type signature, of the form "baz(int32,uint256)".
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.FunctionGetTypeInput`.
+/// \return function type signature as a Non-null string.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ethereum_abi_function_get_signature(
+    coin: u32,
+    input: *const TWData,
+) -> *mut TWString {
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+    let input_data = try_or_else!(TWData::from_ptr_as_ref(input), || TWString::new()
+        .into_ptr());
+    let evm_dispatcher = try_or_else!(evm_dispatcher(coin), || TWString::new().into_ptr());
+
+    evm_dispatcher
+        .get_abi_function_signature(input_data.as_slice())
+        .map(|str| TWString::from(str).into_ptr())
+        .unwrap_or_else(|_| TWString::new().into_ptr())
+}
+
+/// Encode function inputs to Eth ABI binary.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.FunctionEncodingInput`.
+/// \return The serialized data of a `TW.EthereumAbi.Proto.FunctionEncodingOutput` proto object.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ethereum_abi_encode_function(
+    coin: u32,
+    input: *const TWData,
+) -> *mut TWData {
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+    let input_data = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let evm_dispatcher = try_or_else!(evm_dispatcher(coin), std::ptr::null_mut);
+
+    evm_dispatcher
+        .encode_abi_function(input_data.as_slice())
+        .map(|data| TWData::from(data).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
+
+/// /// Decodes an Eth ABI value according to a given type.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input The serialized data of `TW.EthereumAbi.Proto.ValueDecodingInput`.
+/// \return The serialized data of a `TW.EthereumAbi.Proto.ValueDecodingOutput` proto object.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ethereum_abi_decode_value(
+    coin: u32,
+    input: *const TWData,
+) -> *mut TWData {
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+    let input_data = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let evm_dispatcher = try_or_else!(evm_dispatcher(coin), std::ptr::null_mut);
+
+    evm_dispatcher
+        .decode_abi_value(input_data.as_slice())
+        .map(|data| TWData::from(data).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/wallet_core_rs/src/ffi/ethereum/mod.rs b/rust/wallet_core_rs/src/ffi/ethereum/mod.rs
new file mode 100644
index 00000000000..3817d406809
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/ethereum/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod abi;
+pub mod rlp;
diff --git a/rust/wallet_core_rs/src/ffi/ethereum/rlp.rs b/rust/wallet_core_rs/src/ffi/ethereum/rlp.rs
new file mode 100644
index 00000000000..a1274efcecd
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/ethereum/rlp.rs
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use tw_coin_registry::coin_type::CoinType;
+use tw_coin_registry::dispatcher::evm_dispatcher;
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+
+/// Encodes an item or a list of items as Eth RLP binary format.
+///
+/// \param coin EVM-compatible coin type.
+/// \param input Non-null serialized `EthereumRlp::Proto::EncodingInput`.
+/// \return serialized `EthereumRlp::Proto::EncodingOutput`.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ethereum_rlp_encode(coin: u32, input: *const TWData) -> *mut TWData {
+    let coin = try_or_else!(CoinType::try_from(coin), std::ptr::null_mut);
+    let input_data = try_or_else!(TWData::from_ptr_as_ref(input), std::ptr::null_mut);
+    let evm_dispatcher = try_or_else!(evm_dispatcher(coin), std::ptr::null_mut);
+    evm_dispatcher
+        .encode_rlp(input_data.as_slice())
+        .map(|data| TWData::from(data).into_ptr())
+        .unwrap_or_else(|_| std::ptr::null_mut())
+}
diff --git a/rust/wallet_core_rs/src/ffi/mod.rs b/rust/wallet_core_rs/src/ffi/mod.rs
new file mode 100644
index 00000000000..7b77f1ed28a
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/mod.rs
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#[cfg(feature = "bitcoin")]
+pub mod bitcoin;
+#[cfg(feature = "ethereum")]
+pub mod ethereum;
+#[cfg(feature = "solana")]
+pub mod solana;
+#[cfg(feature = "ton")]
+pub mod ton;
+#[cfg(feature = "utils")]
+pub mod utils;
diff --git a/rust/wallet_core_rs/src/ffi/solana/address.rs b/rust/wallet_core_rs/src/ffi/solana/address.rs
new file mode 100644
index 00000000000..2e745e4c272
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/solana/address.rs
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use std::str::FromStr;
+use tw_memory::ffi::tw_string::TWString;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+use tw_solana::address::SolanaAddress;
+use tw_solana::defined_addresses::{TOKEN_2022_PROGRAM_ID_ADDRESS, TOKEN_PROGRAM_ID_ADDRESS};
+use tw_solana::program::stake_program::StakeProgram;
+
+/// Derive default token address for token
+///
+/// \param address Non-null pointer to a Solana Address
+/// \param token_mint_address Non-null pointer to a token mint address as a string
+/// \return Null pointer if the Default token address for a token is not found, valid pointer otherwise
+#[no_mangle]
+pub unsafe extern "C" fn tw_solana_address_default_token_address(
+    address: *const TWString,
+    token_mint_address: *const TWString,
+) -> *mut TWString {
+    tw_solana_address_token_address_impl(address, token_mint_address, *TOKEN_PROGRAM_ID_ADDRESS)
+}
+
+/// Derive token 2022 address for token
+///
+/// \param address Non-null pointer to a Solana Address
+/// \param token_mint_address Non-null pointer to a token mint address as a string
+/// \return Null pointer if the token 2022 address for a token is not found, valid pointer otherwise
+#[no_mangle]
+pub unsafe extern "C" fn tw_solana_address_token_2022_address(
+    address: *const TWString,
+    token_mint_address: *const TWString,
+) -> *mut TWString {
+    tw_solana_address_token_address_impl(
+        address,
+        token_mint_address,
+        *TOKEN_2022_PROGRAM_ID_ADDRESS,
+    )
+}
+
+unsafe fn tw_solana_address_token_address_impl(
+    address: *const TWString,
+    token_mint_address: *const TWString,
+    token_address: SolanaAddress,
+) -> *mut TWString {
+    let main_address = try_or_else!(TWString::from_ptr_as_ref(address), std::ptr::null_mut);
+    let main_address = try_or_else!(main_address.as_str(), std::ptr::null_mut);
+    let main_address = try_or_else!(SolanaAddress::from_str(main_address), std::ptr::null_mut);
+
+    let token_mint_address = try_or_else!(
+        TWString::from_ptr_as_ref(token_mint_address),
+        std::ptr::null_mut
+    );
+    let token_mint_address = try_or_else!(token_mint_address.as_str(), std::ptr::null_mut);
+    let token_mint_address = try_or_else!(
+        SolanaAddress::from_str(token_mint_address),
+        std::ptr::null_mut
+    );
+
+    let associated_token_address = try_or_else!(
+        StakeProgram::get_associated_token_address(main_address, token_address, token_mint_address),
+        std::ptr::null_mut
+    );
+
+    TWString::from(associated_token_address.to_string()).into_ptr()
+}
diff --git a/rust/wallet_core_rs/src/ffi/solana/mod.rs b/rust/wallet_core_rs/src/ffi/solana/mod.rs
new file mode 100644
index 00000000000..19d3bb454a1
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/solana/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address;
+pub mod transaction;
diff --git a/rust/wallet_core_rs/src/ffi/solana/transaction.rs b/rust/wallet_core_rs/src/ffi/solana/transaction.rs
new file mode 100644
index 00000000000..6f97e5803e3
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/solana/transaction.rs
@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::tw_data_vector::TWDataVector;
+use tw_memory::ffi::tw_string::TWString;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+use tw_solana::modules::utils::SolanaTransaction;
+
+/// Decode Solana transaction, update the recent blockhash and re-sign the transaction.
+///
+/// # Warning
+///
+/// This is a temporary solution. It will be removed when `Solana.proto` supports
+/// direct transaction signing.
+///
+/// \param encoded_tx base64 encoded Solana transaction.
+/// \param recent_blockhash base58 encoded recent blockhash.
+/// \param private_keys list of private keys that should be used to re-sign the transaction.
+/// \return serialized `Solana::Proto::SigningOutput`.
+#[no_mangle]
+pub unsafe extern "C" fn tw_solana_transaction_update_blockhash_and_sign(
+    encoded_tx: *const TWString,
+    recent_blockhash: *const TWString,
+    private_keys: *const TWDataVector,
+) -> *mut TWData {
+    let encoded_tx = try_or_else!(TWString::from_ptr_as_ref(encoded_tx), std::ptr::null_mut);
+    let encoded_tx = try_or_else!(encoded_tx.as_str(), std::ptr::null_mut);
+
+    let recent_blockhash = try_or_else!(
+        TWString::from_ptr_as_ref(recent_blockhash),
+        std::ptr::null_mut
+    );
+    let recent_blockhash = try_or_else!(recent_blockhash.as_str(), std::ptr::null_mut);
+
+    let private_keys = try_or_else!(
+        TWDataVector::from_ptr_as_ref(private_keys),
+        std::ptr::null_mut
+    )
+    .to_data_vec();
+
+    let output =
+        SolanaTransaction::update_blockhash_and_sign(encoded_tx, recent_blockhash, &private_keys);
+    let output_proto = try_or_else!(tw_proto::serialize(&output), std::ptr::null_mut);
+
+    TWData::from(output_proto).into_ptr()
+}
+
+/// Try to find a `ComputeBudgetInstruction::SetComputeUnitPrice` instruction in the given transaction,
+/// and returns the specified Unit Price.
+///
+/// \param encoded_tx base64 encoded Solana transaction.
+/// \return nullable Unit Price as a decimal string. Null if no instruction found.
+#[no_mangle]
+pub unsafe extern "C" fn tw_solana_transaction_get_compute_unit_price(
+    encoded_tx: *const TWString,
+) -> *mut TWString {
+    let encoded_tx = try_or_else!(TWString::from_ptr_as_ref(encoded_tx), std::ptr::null_mut);
+    let encoded_tx = try_or_else!(encoded_tx.as_str(), std::ptr::null_mut);
+
+    match SolanaTransaction::get_compute_unit_price(encoded_tx) {
+        Ok(Some(price)) => TWString::from(price.to_string()).into_ptr(),
+        _ => std::ptr::null_mut(),
+    }
+}
+
+/// Try to find a `ComputeBudgetInstruction::SetComputeUnitLimit` instruction in the given transaction,
+/// and returns the specified Unit Limit.
+///
+/// \param encoded_tx base64 encoded Solana transaction.
+/// \return nullable Unit Limit as a decimal string. Null if no instruction found.
+#[no_mangle]
+pub unsafe extern "C" fn tw_solana_transaction_get_compute_unit_limit(
+    encoded_tx: *const TWString,
+) -> *mut TWString {
+    let encoded_tx = try_or_else!(TWString::from_ptr_as_ref(encoded_tx), std::ptr::null_mut);
+    let encoded_tx = try_or_else!(encoded_tx.as_str(), std::ptr::null_mut);
+
+    match SolanaTransaction::get_compute_unit_limit(encoded_tx) {
+        Ok(Some(limit)) => TWString::from(limit.to_string()).into_ptr(),
+        _ => std::ptr::null_mut(),
+    }
+}
+
+/// Adds or updates a `ComputeBudgetInstruction::SetComputeUnitPrice` instruction of the given transaction,
+/// and returns the updated transaction.
+///
+/// \param encoded_tx base64 encoded Solana transaction.
+/// \price Unit Price as a decimal string.
+/// \return base64 encoded Solana transaction. Null if an error occurred.
+#[no_mangle]
+pub unsafe extern "C" fn tw_solana_transaction_set_compute_unit_price(
+    encoded_tx: *const TWString,
+    price: *const TWString,
+) -> *mut TWString {
+    let encoded_tx = try_or_else!(TWString::from_ptr_as_ref(encoded_tx), std::ptr::null_mut);
+    let encoded_tx = try_or_else!(encoded_tx.as_str(), std::ptr::null_mut);
+
+    let price = try_or_else!(TWString::from_ptr_as_ref(price), std::ptr::null_mut);
+    let price = try_or_else!(price.as_str(), std::ptr::null_mut);
+    let price = try_or_else!(price.parse(), std::ptr::null_mut);
+
+    match SolanaTransaction::set_compute_unit_price(encoded_tx, price) {
+        Ok(updated_tx) => TWString::from(updated_tx).into_ptr(),
+        _ => std::ptr::null_mut(),
+    }
+}
+
+/// Adds or updates a `ComputeBudgetInstruction::SetComputeUnitLimit` instruction of the given transaction,
+/// and returns the updated transaction.
+///
+/// \param encoded_tx base64 encoded Solana transaction.
+/// \limit Unit Limit as a decimal string.
+/// \return base64 encoded Solana transaction. Null if an error occurred.
+#[no_mangle]
+pub unsafe extern "C" fn tw_solana_transaction_set_compute_unit_limit(
+    encoded_tx: *const TWString,
+    limit: *const TWString,
+) -> *mut TWString {
+    let encoded_tx = try_or_else!(TWString::from_ptr_as_ref(encoded_tx), std::ptr::null_mut);
+    let encoded_tx = try_or_else!(encoded_tx.as_str(), std::ptr::null_mut);
+
+    let limit = try_or_else!(TWString::from_ptr_as_ref(limit), std::ptr::null_mut);
+    let limit = try_or_else!(limit.as_str(), std::ptr::null_mut);
+    let limit = try_or_else!(limit.parse(), std::ptr::null_mut);
+
+    match SolanaTransaction::set_compute_unit_limit(encoded_tx, limit) {
+        Ok(updated_tx) => TWString::from(updated_tx).into_ptr(),
+        _ => std::ptr::null_mut(),
+    }
+}
diff --git a/rust/wallet_core_rs/src/ffi/ton/address_converter.rs b/rust/wallet_core_rs/src/ffi/ton/address_converter.rs
new file mode 100644
index 00000000000..f16ee89ac69
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/ton/address_converter.rs
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use std::str::FromStr;
+use tw_memory::ffi::tw_string::TWString;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+use tw_ton::address::TonAddress;
+use tw_ton::modules::address_converter::AddressConverter;
+
+/// Converts a TON user address into a Bag of Cells (BoC) with a single root Cell.
+/// The function is mostly used to request a Jetton user address via `get_wallet_address` RPC.
+/// https://docs.ton.org/develop/dapps/asset-processing/jettons#retrieving-jetton-wallet-addresses-for-a-given-user
+///
+/// \param address Address to be converted into a Bag Of Cells (BoC).
+/// \return Pointer to a base64 encoded Bag Of Cells (BoC). Null if invalid address provided.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ton_address_converter_to_boc(
+    address: *const TWString,
+) -> *mut TWString {
+    let address = try_or_else!(TWString::from_ptr_as_ref(address), std::ptr::null_mut);
+    let address_str = try_or_else!(address.as_str(), std::ptr::null_mut);
+    let address_ton = try_or_else!(TonAddress::from_str(address_str), std::ptr::null_mut);
+
+    let boc_encoded = try_or_else!(
+        AddressConverter::convert_to_boc_base64(&address_ton),
+        std::ptr::null_mut
+    );
+
+    TWString::from(boc_encoded).into_ptr()
+}
+
+/// Parses a TON address from a Bag of Cells (BoC) with a single root Cell.
+/// The function is mostly used to parse a Jetton user address received on `get_wallet_address` RPC.
+/// https://docs.ton.org/develop/dapps/asset-processing/jettons#retrieving-jetton-wallet-addresses-for-a-given-user
+///
+/// \param boc Base64 encoded Bag Of Cells (BoC).
+/// \return Pointer to a Jetton address.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ton_address_converter_from_boc(boc: *const TWString) -> *mut TWString {
+    let boc = try_or_else!(TWString::from_ptr_as_ref(boc), std::ptr::null_mut);
+    let boc_str = try_or_else!(boc.as_str(), std::ptr::null_mut);
+
+    let address_ton = try_or_else!(
+        AddressConverter::parse_from_boc_base64(boc_str),
+        std::ptr::null_mut
+    );
+
+    TWString::from(address_ton.to_string()).into_ptr()
+}
+
+/// Converts any TON address format to user friendly with the given parameters.
+///
+/// \param address raw or user-friendly address to be converted.
+/// \param bounceable whether the result address should be bounceable.
+/// \param testnet whether the result address should be testnet.
+/// \return user-friendly address str.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ton_address_converter_to_user_friendly(
+    address: *const TWString,
+    bounceable: bool,
+    testnet: bool,
+) -> *mut TWString {
+    let address = try_or_else!(TWString::from_ptr_as_ref(address), std::ptr::null_mut);
+    let address_str = try_or_else!(address.as_str(), std::ptr::null_mut);
+    let address_ton = try_or_else!(TonAddress::from_str(address_str), std::ptr::null_mut)
+        .set_bounceable(bounceable)
+        .set_testnet(testnet);
+
+    TWString::from(address_ton.to_string()).into_ptr()
+}
diff --git a/rust/wallet_core_rs/src/ffi/ton/message_signer.rs b/rust/wallet_core_rs/src/ffi/ton/message_signer.rs
new file mode 100644
index 00000000000..8a20d5f110e
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/ton/message_signer.rs
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use tw_encoding::hex::ToHex;
+use tw_keypair::ed25519;
+use tw_keypair::ffi::privkey::TWPrivateKey;
+use tw_memory::ffi::tw_string::TWString;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+use tw_ton::modules::personal_message_signer::PersonalMessageSigner;
+
+/// Signs an arbitrary message to prove ownership of an address for off-chain services.
+/// https://github.com/ton-foundation/specs/blob/main/specs/wtf-0002.md
+///
+/// \param private_key: the private key used for signing
+/// \param message: A custom message which is input to the signing.
+/// \returns the signature, Hex-encoded. On invalid input null is returned. Returned object needs to be deleted after use.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ton_message_signer_sign_message(
+    private_key: *const TWPrivateKey,
+    message: *const TWString,
+) -> *mut TWString {
+    let private_key = try_or_else!(
+        TWPrivateKey::from_ptr_as_ref(private_key),
+        std::ptr::null_mut
+    );
+    let private_key_bytes = private_key.as_ref().key();
+    let ed25519_private_key = try_or_else!(
+        ed25519::sha512::PrivateKey::try_from(private_key_bytes.as_slice()),
+        std::ptr::null_mut
+    );
+
+    let message = try_or_else!(TWString::from_ptr_as_ref(message), std::ptr::null_mut);
+    let message_str = try_or_else!(message.as_str(), std::ptr::null_mut);
+
+    let signature = try_or_else!(
+        PersonalMessageSigner::sign(&ed25519_private_key, message_str),
+        std::ptr::null_mut
+    );
+    TWString::from(signature.to_bytes().to_hex()).into_ptr()
+}
diff --git a/rust/wallet_core_rs/src/ffi/ton/mod.rs b/rust/wallet_core_rs/src/ffi/ton/mod.rs
new file mode 100644
index 00000000000..02721354dfc
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/ton/mod.rs
@@ -0,0 +1,7 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod address_converter;
+pub mod message_signer;
+pub mod wallet;
diff --git a/rust/wallet_core_rs/src/ffi/ton/wallet.rs b/rust/wallet_core_rs/src/ffi/ton/wallet.rs
new file mode 100644
index 00000000000..0e3c81a1971
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/ton/wallet.rs
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use tw_keypair::ffi::pubkey::TWPublicKey;
+use tw_memory::ffi::tw_string::TWString;
+use tw_memory::ffi::RawPtrTrait;
+use tw_misc::try_or_else;
+use tw_ton::modules::wallet_provider::WalletProvider;
+
+/// Constructs a TON Wallet V4R2 stateInit encoded as BoC (BagOfCells) for the given `public_key`.
+///
+/// \param public_key wallet's public key.
+/// \param workchain TON workchain to which the wallet belongs. Usually, base chain is used (0).
+/// \param wallet_id wallet's ID allows to create multiple wallets for the same private key.
+/// \return Pointer to a base64 encoded Bag Of Cells (BoC) StateInit. Null if invalid public key provided.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ton_wallet_build_v4_r2_state_init(
+    public_key: *const TWPublicKey,
+    workchain: i32,
+    wallet_id: i32,
+) -> *mut TWString {
+    let public_key = try_or_else!(TWPublicKey::from_ptr_as_ref(public_key), std::ptr::null_mut);
+    let ed_pubkey = try_or_else!(public_key.as_ref().to_ed25519(), std::ptr::null_mut).clone();
+
+    let state_init = try_or_else!(
+        WalletProvider::v4r2_state_init(ed_pubkey, workchain, wallet_id),
+        std::ptr::null_mut
+    );
+    TWString::from(state_init).into_ptr()
+}
+
+// Constructs a TON Wallet V5R1 stateInit encoded as BoC (BagOfCells) for the given `public_key`.
+///
+/// \param public_key wallet's public key.
+/// \param workchain TON workchain to which the wallet belongs. Usually, base chain is used (0).
+/// \param wallet_id wallet's ID allows to create multiple wallets for the same private key.
+/// \return Pointer to a base64 encoded Bag Of Cells (BoC) StateInit. Null if invalid public key provided.
+#[no_mangle]
+pub unsafe extern "C" fn tw_ton_wallet_build_v5_r1_state_init(
+    public_key: *const TWPublicKey,
+    workchain: i32,
+    wallet_id: i32,
+) -> *mut TWString {
+    let public_key = try_or_else!(TWPublicKey::from_ptr_as_ref(public_key), std::ptr::null_mut);
+    let ed_pubkey = try_or_else!(public_key.as_ref().to_ed25519(), std::ptr::null_mut).clone();
+
+    let state_init = try_or_else!(
+        WalletProvider::v5r1_state_init(ed_pubkey, workchain, wallet_id),
+        std::ptr::null_mut
+    );
+    TWString::from(state_init).into_ptr()
+}
diff --git a/rust/wallet_core_rs/src/ffi/utils/bit_reader_ffi.rs b/rust/wallet_core_rs/src/ffi/utils/bit_reader_ffi.rs
new file mode 100644
index 00000000000..e9fcc925635
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/utils/bit_reader_ffi.rs
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use bitreader::{BitReader, BitReaderError};
+use tw_memory::ffi::c_byte_array::{CByteArray, CByteArrayResult};
+use tw_memory::ffi::c_result::{CUInt8Result, ErrorCode};
+use tw_memory::ffi::tw_data::TWData;
+use tw_memory::ffi::RawPtrTrait;
+use tw_memory::Data;
+use tw_misc::try_or_else;
+
+#[derive(Debug, Eq, PartialEq)]
+#[repr(C)]
+pub enum CBitReaderCode {
+    Ok = 0,
+    /// Requested more bits than there are left in the byte slice at the current position.
+    NotEnoughData = 1,
+    /// Requested more bits than the returned variable can hold, for example more than 8 bits when
+    /// reading into a u8.
+    TooManyBitsForType = 2,
+    InalidInput = 3,
+}
+
+impl From<BitReaderError> for CBitReaderCode {
+    fn from(value: BitReaderError) -> Self {
+        match value {
+            BitReaderError::NotEnoughData { .. } => CBitReaderCode::NotEnoughData,
+            BitReaderError::TooManyBitsForType { .. } => CBitReaderCode::TooManyBitsForType,
+        }
+    }
+}
+
+impl From<CBitReaderCode> for ErrorCode {
+    fn from(error: CBitReaderCode) -> Self {
+        error as ErrorCode
+    }
+}
+
+/// BitReader reads data from a big-endian byte slice at the granularity of a single bit.
+#[derive(Debug)]
+pub struct TWBitReader {
+    buffer: Data,
+    bit_position: u64,
+    bit_len: u64,
+}
+
+impl TWBitReader {
+    pub fn with_relative_bit_len(buffer: Data, bit_len: u64) -> TWBitReader {
+        TWBitReader {
+            buffer,
+            bit_position: 0,
+            bit_len,
+        }
+    }
+
+    /// Read at most 8 bits into a u8.
+    pub fn read_u8(&mut self, bit_count: u8) -> Result<u8, CBitReaderCode> {
+        let mut reader = self.make_reader()?;
+        let res = reader.read_u8(bit_count)?;
+        // Update the bit position in case of success read.
+        self.bit_position += bit_count as u64;
+        Ok(res)
+    }
+
+    // Reads an entire slice of `byte_count` bytes. If there aren't enough bits remaining
+    // after the internal cursor's current position, returns none.
+    pub fn read_u8_slice(&mut self, byte_count: usize) -> Result<Data, CBitReaderCode> {
+        let mut reader = self.make_reader()?;
+
+        let mut res = vec![0_u8; byte_count];
+        reader.read_u8_slice(&mut res)?;
+
+        // Update the bit position in case of success read.
+        self.bit_position += byte_count as u64 * 8;
+        Ok(res)
+    }
+
+    pub fn is_finished(&self) -> bool {
+        self.bit_len == self.bit_position
+    }
+
+    fn make_reader(&self) -> Result<BitReader<'_>, CBitReaderCode> {
+        let mut reader = BitReader::new(&self.buffer).relative_reader_atmost(self.bit_len);
+        reader.skip(self.bit_position)?;
+        Ok(reader)
+    }
+}
+
+impl RawPtrTrait for TWBitReader {}
+
+/// Constructs a new `TWBitReader` from a big-endian byte slice
+/// that will not allow reading more than `bit_len` bits. It must be deleted at the end.
+///
+/// \param data big-endian byte slice to be read.
+/// \param bit_len length this reader is allowed to read from the slice.
+/// \return nullable pointer to a `TWBitReader` instance.
+#[no_mangle]
+pub unsafe extern "C" fn tw_bit_reader_create(
+    data: *const TWData,
+    bit_len: u64,
+) -> *mut TWBitReader {
+    let data = try_or_else!(TWData::from_ptr_as_ref(data), std::ptr::null_mut);
+    TWBitReader::with_relative_bit_len(data.to_vec(), bit_len).into_ptr()
+}
+
+/// Deletes a `TWBitReader` and frees the memory.
+/// \param reader a `TWBitReader` pointer.
+#[no_mangle]
+pub unsafe extern "C" fn tw_bit_reader_delete(reader: *mut TWBitReader) {
+    // Take the ownership back to rust and drop the owner.
+    let _ = TWBitReader::from_ptr(reader);
+}
+
+/// Read at most 8 bits into a u8.
+///
+/// \param reader a `TWBitReader` pointer.
+/// \param bit_count number of bits to read. Expected from 1 to 8.
+/// \return u8 or error.
+#[no_mangle]
+pub unsafe extern "C" fn tw_bit_reader_read_u8(
+    reader: *mut TWBitReader,
+    bit_count: u8,
+) -> CUInt8Result {
+    let tw_reader = try_or_else!(
+        TWBitReader::from_ptr_as_mut(reader),
+        || CUInt8Result::error(CBitReaderCode::InalidInput)
+    );
+    tw_reader.read_u8(bit_count).into()
+}
+
+/// Reads an entire slice of `byteCount` bytes. If there aren't enough bits remaining
+/// after the internal cursor's current position, returns null.
+///
+/// \param reader a `TWBitReader` pointer.
+/// \param byte_count number of bytes to read.
+/// \return byte array or error.
+#[no_mangle]
+pub unsafe extern "C" fn tw_bit_reader_read_u8_slice(
+    reader: *mut TWBitReader,
+    byte_count: usize,
+) -> CByteArrayResult {
+    let tw_reader = try_or_else!(TWBitReader::from_ptr_as_mut(reader), || {
+        CByteArrayResult::error(CBitReaderCode::InalidInput)
+    });
+    tw_reader
+        .read_u8_slice(byte_count)
+        .map(CByteArray::from)
+        .into()
+}
+
+/// Checks whether all bits were read.
+///
+/// \param reader a `TWBitReader` pointer.
+/// \return whether all bits were read.
+#[no_mangle]
+pub unsafe extern "C" fn tw_bit_reader_finished(reader: *const TWBitReader) -> bool {
+    try_or_else!(TWBitReader::from_ptr_as_ref(reader), || true).is_finished()
+}
diff --git a/rust/wallet_core_rs/src/ffi/utils/mod.rs b/rust/wallet_core_rs/src/ffi/utils/mod.rs
new file mode 100644
index 00000000000..a6b8ac45aec
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/utils/mod.rs
@@ -0,0 +1,6 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod bit_reader_ffi;
+pub mod uuid_ffi;
diff --git a/rust/wallet_core_rs/src/ffi/utils/uuid_ffi.rs b/rust/wallet_core_rs/src/ffi/utils/uuid_ffi.rs
new file mode 100644
index 00000000000..159a4a079de
--- /dev/null
+++ b/rust/wallet_core_rs/src/ffi/utils/uuid_ffi.rs
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#![allow(clippy::missing_safety_doc)]
+
+use std::ffi::{c_char, CString};
+
+/// Creates a random UUID.
+/// This uses the [`getrandom`] crate to utilise the operating system's RNG
+/// as the source of random numbers.
+#[no_mangle]
+pub unsafe extern "C" fn tw_uuid_random() -> *const c_char {
+    let res = uuid::Uuid::new_v4();
+    CString::new(res.to_string()).unwrap().into_raw()
+}
diff --git a/rust/wallet_core_rs/src/lib.rs b/rust/wallet_core_rs/src/lib.rs
new file mode 100644
index 00000000000..f26f8e9364e
--- /dev/null
+++ b/rust/wallet_core_rs/src/lib.rs
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#[cfg(feature = "any-coin")]
+pub extern crate tw_any_coin;
+#[cfg(feature = "bitcoin")]
+pub extern crate tw_bitcoin;
+#[cfg(feature = "utils")]
+pub extern crate tw_encoding;
+#[cfg(feature = "utils")]
+pub extern crate tw_hash;
+#[cfg(feature = "keypair")]
+pub extern crate tw_keypair;
+#[cfg(feature = "utils")]
+pub extern crate tw_memory;
+
+pub mod ffi;
diff --git a/samples/cpp/CMakeLists.txt b/samples/cpp/CMakeLists.txt
index 5ecf5e6ba0d..02bfe6e2ad5 100644
--- a/samples/cpp/CMakeLists.txt
+++ b/samples/cpp/CMakeLists.txt
@@ -1,8 +1,6 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
 # Expected input configuration: WALLET_CORE: directory for TrustWalletCore build dir
 # e.g. cmake . -DWALLET_CORE=../wallet-core
@@ -30,7 +28,7 @@ set (CMAKE_C_STANDARD_REQUIRED ON)
 # ${WALLET_CORE}/src -- internal TrustWalletCore files, for signer protobuf messages
 # ${WALLET_CORE}/build/local/include) -- for protobuf includes
 include_directories (${CMAKE_SOURCE_DIR} ${WALLET_CORE}/include ${WALLET_CORE}/src ${WALLET_CORE}/build/local/include)
-link_directories (${WALLET_CORE}/build ${WALLET_CORE}/build/trezor-crypto ${WALLET_CORE}/build/local/lib)
+link_directories (${WALLET_CORE}/build ${WALLET_CORE}/build/trezor-crypto ${WALLET_CORE}/build/local/lib ${WALLET_CORE}/rust/target/release)
 
 find_library(WALLET_CORE_LIB_FILE TrustWalletCore PATH ${WALLET_CORE}/build)
 if (NOT WALLET_CORE_LIB_FILE)
@@ -39,6 +37,13 @@ else ()
     message ("TrustWalletCore library found here: ${WALLET_CORE_LIB_FILE}")
 endif ()
 
+find_library(WALLET_CORE_RS_LIB_FILE wallet_core_rs PATH ${WALLET_CORE}/rust/target/release)
+if (NOT WALLET_CORE_RS_LIB_FILE)
+	message (FATAL_ERROR "wallet_core_rs library not found.  ${SETUP_MESSAGE}")
+else ()
+	message ("wallet_core_rs library found here: ${WALLET_CORE_RS_LIB_FILE}")
+endif ()
+
 # Create all libraries and executables in the root binary dir
 set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 
@@ -71,4 +76,4 @@ SET (CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${PLATFORM_LINK_FLAGS}")
 add_executable (sample sample.cpp)
 
 # link with our library, and default platform libraries
-target_link_libraries (sample TrustWalletCore TrezorCrypto protobuf pthread ${PLATFORM_LIBS})
+target_link_libraries (sample PUBLIC TrustWalletCore ${WALLET_CORE_RS_LIB_FILE} TrezorCrypto protobuf pthread ${PLATFORM_LIBS})
diff --git a/samples/cpp/README.md b/samples/cpp/README.md
index 353c7163b93..5998b7c59d7 100644
--- a/samples/cpp/README.md
+++ b/samples/cpp/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-This repository contains a simple but complete **C++** sample application, for demostrating usage of the
+This repository contains a simple but complete **C++** sample application, for demonstrating usage of the
 [Wallet Core](https://github.com/trustwallet/wallet-core) library (part of [Trust Wallet](https://trustwallet.com)).
 
 ## DISCLAIMER
@@ -23,7 +23,7 @@ and [Build Instructions](https://developer.trustwallet.com/wallet-core/building)
 
 You need to download and build WalletCore yourself
 (there is no official binary distribution).
-The dependencies TrezorCrypto and protobuf are also needed, these are also come with WalletCore.
+The dependencies TrezorCrypto and protobuf are also needed, these also come with WalletCore.
 You need to [build](https://developer.trustwallet.com/wallet-core/building) the library.
 
 
@@ -49,7 +49,7 @@ Run it:
 ./sample
 ```
 
-The relavant sample code is in the file `cpp/sample.cpp`.
+The relevant sample code is in the file `cpp/sample.cpp`.
 
 # What it Does
 
diff --git a/samples/cpp/sample.cpp b/samples/cpp/sample.cpp
index bb69ec05b1c..1cc19a3196f 100644
--- a/samples/cpp/sample.cpp
+++ b/samples/cpp/sample.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWAnySigner.h>
@@ -24,7 +22,7 @@ int main() {
             cout << endl;
             cout << "  *** DISCLAIMER ***" << endl;
             cout << "  THIS IS A SAMPLE APPLICATION WITH DEMONSTRATION PURPOSES ONLY." << endl;
-            cout << "  DO NOT USE WITH REAL SECRETS, REAL ADDRESSESS, OR REAL TRANSACTIONS.  USE IT AT YOUR OWN RISK." << endl;
+            cout << "  DO NOT USE WITH REAL SECRETS, REAL ADDRESSES, OR REAL TRANSACTIONS.  USE IT AT YOUR OWN RISK." << endl;
             cout << "  *** DISCLAIMER ***" << endl;
             cout << endl;
         }
diff --git a/samples/go/README.md b/samples/go/README.md
index 96716cabb90..e543e7f7c0b 100644
--- a/samples/go/README.md
+++ b/samples/go/README.md
@@ -50,7 +50,7 @@ cd wallet-core
 
 ### 🐳 Docker
 1. Run `docker run -it trustwallet/wallet-core`
-The librabry is already built in this image  (Build instructions [here](building.md))  Note: may not be the most recent version.
+The library is already built in this image  (Build instructions [here](building.md))  Note: may not be the most recent version.
 
 2. Install go: `apt-get update && apt-get install golang` 
 (or download from here [go1.16.12](https://go.dev/dl/go1.16.12.linux-amd64.tar.gz), configure `GOROOT` and append `GOROOT/bin` to `PATH`).
@@ -62,7 +62,7 @@ The librabry is already built in this image  (Build instructions [here](building
 cd wallet-core/samples/go
 ```
 
-2. Compile it by `go build -o main`.  Relavant source file is `main.go`.
+2. Compile it by `go build -o main`.  Relevant source file is `main.go`.
 
 3. Run `./main` and you will see the output below: 
 
@@ -73,4 +73,4 @@ cd wallet-core/samples/go
 ```
 4. *(optional)* You might want to copy and run `main` outside of the docker container, make sure you have `libc++1` and `libc++abi1` installed in your host Ubuntu.
 
-5. *(optional)* If you want to make transaction on other networks you need to compile `src/proto` proto files and to do that, just run the `./compile.sh` . you can also modify it based on your project.
\ No newline at end of file
+5. *(optional)* If you want to make transaction on other networks you need to compile `src/proto` proto files and to do that, just run the `./compile.sh` . you can also modify it based on your project.
diff --git a/samples/go/core/bitcoin.go b/samples/go/core/bitcoin.go
index 5613b452ffa..b9b0d218298 100644
--- a/samples/go/core/bitcoin.go
+++ b/samples/go/core/bitcoin.go
@@ -1,7 +1,7 @@
 package core
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWCoinType.h>
 // #include <TrustWalletCore/TWBitcoinScript.h>
 // #include <TrustWalletCore/TWBitcoinSigHashType.h>
diff --git a/samples/go/core/coin.go b/samples/go/core/coin.go
index 122e9a286fb..f1dd5dc94d9 100644
--- a/samples/go/core/coin.go
+++ b/samples/go/core/coin.go
@@ -1,7 +1,7 @@
 package core
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWCoinType.h>
 // #include <TrustWalletCore/TWCoinTypeConfiguration.h>
 import "C"
diff --git a/samples/go/core/datavector.go b/samples/go/core/datavector.go
index 014030e8817..04a4e4bd520 100644
--- a/samples/go/core/datavector.go
+++ b/samples/go/core/datavector.go
@@ -1,7 +1,7 @@
 package core
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWDataVector.h>
 import "C"
 import "tw/types"
diff --git a/samples/go/core/mnemonic.go b/samples/go/core/mnemonic.go
index 12394cc86b9..a1968b864b9 100644
--- a/samples/go/core/mnemonic.go
+++ b/samples/go/core/mnemonic.go
@@ -1,7 +1,7 @@
 package core
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWMnemonic.h>
 import "C"
 
diff --git a/samples/go/core/publicKey.go b/samples/go/core/publicKey.go
index d116f8e7270..bf70a64622f 100644
--- a/samples/go/core/publicKey.go
+++ b/samples/go/core/publicKey.go
@@ -1,7 +1,7 @@
 package core
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWPublicKey.h>
 import "C"
 
diff --git a/samples/go/core/transaction.go b/samples/go/core/transaction.go
index 3b3333d5a11..8aa9e1a900c 100644
--- a/samples/go/core/transaction.go
+++ b/samples/go/core/transaction.go
@@ -1,7 +1,7 @@
 package core
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWCoinType.h>
 // #include <TrustWalletCore/TWAnySigner.h>
 import "C"
diff --git a/samples/go/core/transactionHelper.go b/samples/go/core/transactionHelper.go
index c8414724a32..df2a78c64dd 100644
--- a/samples/go/core/transactionHelper.go
+++ b/samples/go/core/transactionHelper.go
@@ -1,30 +1,11 @@
 package core
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWTransactionCompiler.h>
 import "C"
 import "tw/types"
 
-func BuildInput(c CoinType, from, to string, amount string, asset string, memo string, chainId string) []byte {
-	fromStr := types.TWStringCreateWithGoString(from)
-	defer C.TWStringDelete(fromStr)
-	toStr := types.TWStringCreateWithGoString(to)
-	defer C.TWStringDelete(toStr)
-	amountStr := types.TWStringCreateWithGoString(amount)
-	defer C.TWStringDelete(amountStr)
-	assetStr := types.TWStringCreateWithGoString(asset)
-	defer C.TWStringDelete(assetStr)
-	memoStr := types.TWStringCreateWithGoString(memo)
-	defer C.TWStringDelete(memoStr)
-	chainIdStr := types.TWStringCreateWithGoString(chainId)
-	defer C.TWStringDelete(chainIdStr)
-
-	result := C.TWTransactionCompilerBuildInput(C.enum_TWCoinType(c), fromStr, toStr, amountStr, assetStr, memoStr, chainIdStr)
-	defer C.TWDataDelete(result)
-	return types.TWDataGoBytes(result)
-}
-
 func PreImageHashes(c CoinType, txInputData []byte) []byte {
 	input := types.TWDataCreateWithGoBytes(txInputData)
 	defer C.TWDataDelete(input)
diff --git a/samples/go/core/wallet.go b/samples/go/core/wallet.go
index 09af05cdd42..ee95b763631 100644
--- a/samples/go/core/wallet.go
+++ b/samples/go/core/wallet.go
@@ -1,7 +1,7 @@
 package core
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWHDWallet.h>
 // #include <TrustWalletCore/TWPrivateKey.h>
 // #include <TrustWalletCore/TWPublicKey.h>
diff --git a/samples/go/dev-console/native/cgo.go b/samples/go/dev-console/native/cgo.go
index 3e0569e9162..b393d457f7a 100644
--- a/samples/go/dev-console/native/cgo.go
+++ b/samples/go/dev-console/native/cgo.go
@@ -1,7 +1,7 @@
 package native
 
 // #cgo CFLAGS: -I packaged/include
-// #cgo LDFLAGS: -lTrustWalletCore -lstdc++ -lm -lprotobuf -lTrezorCrypto
+// #cgo LDFLAGS: -lTrustWalletCore -lstdc++ -lm -lprotobuf -lwallet_core_rs -lTrezorCrypto
 //
 //
 // #cgo LDFLAGS: -Wl,-rpath,${SRCDIR}/packaged/lib -L${SRCDIR}/packaged/lib
diff --git a/samples/go/dev-console/prepare.sh b/samples/go/dev-console/prepare.sh
index 76ec7e9bb85..ff2a4f6af3a 100755
--- a/samples/go/dev-console/prepare.sh
+++ b/samples/go/dev-console/prepare.sh
@@ -5,6 +5,7 @@ cmake -DCMAKE_BUILD_TYPE=Release -DTW_UNIT_TESTS=OFF -DTW_BUILD_EXAMPLES=OFF -DT
 ninja
 cp libTrustWalletCore.a ../native/packaged/lib/
 cp libprotobuf.a ../native/packaged/lib
+cp ../../../../build/local/lib/libwallet_core_rs.a ../native/packaged/lib
 cp trezor-crypto/libTrezorCrypto.a ../native/packaged/lib
 cd -
-cp -R ../../../include native/packaged/
\ No newline at end of file
+cp -R ../../../include native/packaged/
diff --git a/samples/go/go.mod b/samples/go/go.mod
index 2835844a409..a089a1d470f 100644
--- a/samples/go/go.mod
+++ b/samples/go/go.mod
@@ -2,4 +2,4 @@ module tw
 
 go 1.16
 
-require google.golang.org/protobuf v1.27.1
+require google.golang.org/protobuf v1.33.0
diff --git a/samples/go/go.sum b/samples/go/go.sum
index 03b1917b5a4..3575a38aca0 100644
--- a/samples/go/go.sum
+++ b/samples/go/go.sum
@@ -4,5 +4,5 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
-google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
-google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
+google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
diff --git a/samples/go/main.go b/samples/go/main.go
index 8aae9f98dac..1b36647baf4 100644
--- a/samples/go/main.go
+++ b/samples/go/main.go
@@ -45,7 +45,7 @@ func main() {
 	fmt.Println("Ethereum signed tx:")
 	fmt.Println("\t", ethTxn)
 
-	// Bitcion transaction
+	// Bitcoin transaction
 	btcTxn := createBtcTransaction(bw)
 	fmt.Println("\nBitcoin signed tx:")
 	fmt.Println("\t", btcTxn)
diff --git a/samples/go/protos/binance/Binance.pb.go b/samples/go/protos/binance/Binance.pb.go
index 9205f012247..9f8752135da 100644
--- a/samples/go/protos/binance/Binance.pb.go
+++ b/samples/go/protos/binance/Binance.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.19.2
+// 	protoc-gen-go v1.28.1
+// 	protoc        v3.21.5
 // source: Binance.proto
 
 package binance
 
 import (
-	common "tw/protos/common"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	common "tw/protos/common"
 )
 
 const (
@@ -21,18 +21,22 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// Transaction structure, used internally
 type Transaction struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// int64 SIZE-OF-ENCODED      // varint encoded length of the structure after encoding
-	// 0xF0625DEE                  // prefix
-	Msgs       [][]byte `protobuf:"bytes,1,rep,name=msgs,proto3" json:"msgs,omitempty"`             // array of size 1, containing the transaction message, which are one of the transaction type below
-	Signatures [][]byte `protobuf:"bytes,2,rep,name=signatures,proto3" json:"signatures,omitempty"` // array of size 1, containing the standard signature structure of the transaction sender
-	Memo       string   `protobuf:"bytes,3,opt,name=memo,proto3" json:"memo,omitempty"`             // a short sentence of remark for the transaction, only for `Transfer` transactions.
-	Source     int64    `protobuf:"varint,4,opt,name=source,proto3" json:"source,omitempty"`        // an identifier for tools triggerring this transaction, set to zero if unwilling to disclose.
-	Data       []byte   `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`             // reserved for future use
+	// array of size 1, containing the transaction message, which are one of the transaction type below
+	Msgs [][]byte `protobuf:"bytes,1,rep,name=msgs,proto3" json:"msgs,omitempty"`
+	// array of size 1, containing the standard signature structure of the transaction sender
+	Signatures [][]byte `protobuf:"bytes,2,rep,name=signatures,proto3" json:"signatures,omitempty"`
+	// a short sentence of remark for the transaction, only for `Transfer` transactions.
+	Memo string `protobuf:"bytes,3,opt,name=memo,proto3" json:"memo,omitempty"`
+	// an identifier for tools triggering this transaction, set to zero if unwilling to disclose.
+	Source int64 `protobuf:"varint,4,opt,name=source,proto3" json:"source,omitempty"`
+	// reserved for future use
+	Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
 }
 
 func (x *Transaction) Reset() {
@@ -102,15 +106,20 @@ func (x *Transaction) GetData() []byte {
 	return nil
 }
 
+// Signature structure, used internally
 type Signature struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	PubKey        []byte `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"`                       // public key bytes of the signer address
-	Signature     []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`                               // signature bytes, please check chain access section for signature generation
-	AccountNumber int64  `protobuf:"varint,3,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty"` // another identifier of signer, which can be read from chain by account REST API or RPC
-	Sequence      int64  `protobuf:"varint,4,opt,name=sequence,proto3" json:"sequence,omitempty"`                                // sequence number for the next transaction
+	// public key bytes of the signer address
+	PubKey []byte `protobuf:"bytes,1,opt,name=pub_key,json=pubKey,proto3" json:"pub_key,omitempty"`
+	// signature bytes, please check chain access section for signature generation
+	Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"`
+	// another identifier of signer, which can be read from chain by account REST API or RPC
+	AccountNumber int64 `protobuf:"varint,3,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty"`
+	// sequence number for the next transaction
+	Sequence int64 `protobuf:"varint,4,opt,name=sequence,proto3" json:"sequence,omitempty"`
 }
 
 func (x *Signature) Reset() {
@@ -173,20 +182,28 @@ func (x *Signature) GetSequence() int64 {
 	return 0
 }
 
+// Message for Trade order
 type TradeOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0xCE6DC043           // prefix
-	Sender      []byte `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`            // originating address
-	Id          string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`                    // order id, optional
-	Symbol      string `protobuf:"bytes,3,opt,name=symbol,proto3" json:"symbol,omitempty"`            // symbol for trading pair in full name of the tokens
-	Ordertype   int64  `protobuf:"varint,4,opt,name=ordertype,proto3" json:"ordertype,omitempty"`     // only accept 2 for now, meaning limit order
-	Side        int64  `protobuf:"varint,5,opt,name=side,proto3" json:"side,omitempty"`               // 1 for buy and 2 fory sell
-	Price       int64  `protobuf:"varint,6,opt,name=price,proto3" json:"price,omitempty"`             // price of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer
-	Quantity    int64  `protobuf:"varint,7,opt,name=quantity,proto3" json:"quantity,omitempty"`       // quantity of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer
-	Timeinforce int64  `protobuf:"varint,8,opt,name=timeinforce,proto3" json:"timeinforce,omitempty"` // 1 for Good Till Expire(GTE) order and 3 for Immediate Or Cancel (IOC)
+	// originating address
+	Sender []byte `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
+	// order id, optional
+	Id string `protobuf:"bytes,2,opt,name=id,proto3" json:"id,omitempty"`
+	// symbol for trading pair in full name of the tokens
+	Symbol string `protobuf:"bytes,3,opt,name=symbol,proto3" json:"symbol,omitempty"`
+	// only accept 2 for now, meaning limit order
+	Ordertype int64 `protobuf:"varint,4,opt,name=ordertype,proto3" json:"ordertype,omitempty"`
+	// 1 for buy and 2 for sell
+	Side int64 `protobuf:"varint,5,opt,name=side,proto3" json:"side,omitempty"`
+	// price of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer
+	Price int64 `protobuf:"varint,6,opt,name=price,proto3" json:"price,omitempty"`
+	// quantity of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer
+	Quantity int64 `protobuf:"varint,7,opt,name=quantity,proto3" json:"quantity,omitempty"`
+	// 1 for Good Till Expire(GTE) order and 3 for Immediate Or Cancel (IOC)
+	Timeinforce int64 `protobuf:"varint,8,opt,name=timeinforce,proto3" json:"timeinforce,omitempty"`
 }
 
 func (x *TradeOrder) Reset() {
@@ -277,15 +294,18 @@ func (x *TradeOrder) GetTimeinforce() int64 {
 	return 0
 }
 
+// Message for CancelTrade order
 type CancelTradeOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0x166E681B      // prefix
-	Sender []byte `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"` // originating address
-	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"` // symbol for trading pair in full name of the tokens
-	Refid  string `protobuf:"bytes,3,opt,name=refid,proto3" json:"refid,omitempty"`   // order id to cancel
+	// originating address
+	Sender []byte `protobuf:"bytes,1,opt,name=sender,proto3" json:"sender,omitempty"`
+	// symbol for trading pair in full name of the tokens
+	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`
+	// order id to cancel
+	Refid string `protobuf:"bytes,3,opt,name=refid,proto3" json:"refid,omitempty"`
 }
 
 func (x *CancelTradeOrder) Reset() {
@@ -341,12 +361,15 @@ func (x *CancelTradeOrder) GetRefid() string {
 	return ""
 }
 
+// Message for Send order
 type SendOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Inputs  []*SendOrder_Input  `protobuf:"bytes,1,rep,name=inputs,proto3" json:"inputs,omitempty"`
+	// Send inputs
+	Inputs []*SendOrder_Input `protobuf:"bytes,1,rep,name=inputs,proto3" json:"inputs,omitempty"`
+	// Send outputs
 	Outputs []*SendOrder_Output `protobuf:"bytes,2,rep,name=outputs,proto3" json:"outputs,omitempty"`
 }
 
@@ -396,17 +419,22 @@ func (x *SendOrder) GetOutputs() []*SendOrder_Output {
 	return nil
 }
 
+// Message for TokenIssue order
 type TokenIssueOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0x17EFAB80      // prefix
-	From        []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`                                   // owner address
-	Name        string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`                                   // token name
-	Symbol      string `protobuf:"bytes,3,opt,name=symbol,proto3" json:"symbol,omitempty"`                               // token symbol, in full name with "-" suffix
-	TotalSupply int64  `protobuf:"varint,4,opt,name=total_supply,json=totalSupply,proto3" json:"total_supply,omitempty"` // total supply
-	Mintable    bool   `protobuf:"varint,5,opt,name=mintable,proto3" json:"mintable,omitempty"`                          // mintable
+	// owner address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// token name
+	Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
+	// token symbol, in full name with "-" suffix
+	Symbol string `protobuf:"bytes,3,opt,name=symbol,proto3" json:"symbol,omitempty"`
+	// total supply
+	TotalSupply int64 `protobuf:"varint,4,opt,name=total_supply,json=totalSupply,proto3" json:"total_supply,omitempty"`
+	// mintable
+	Mintable bool `protobuf:"varint,5,opt,name=mintable,proto3" json:"mintable,omitempty"`
 }
 
 func (x *TokenIssueOrder) Reset() {
@@ -476,15 +504,18 @@ func (x *TokenIssueOrder) GetMintable() bool {
 	return false
 }
 
+// Message for TokenMint order
 type TokenMintOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0x467E0829      // prefix
-	From   []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`      // owner address
-	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`  // token symbol, in full name with "-" suffix
-	Amount int64  `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"` // amount to mint
+	// owner address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// token symbol, in full name with "-" suffix
+	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`
+	// amount to mint
+	Amount int64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"`
 }
 
 func (x *TokenMintOrder) Reset() {
@@ -540,15 +571,18 @@ func (x *TokenMintOrder) GetAmount() int64 {
 	return 0
 }
 
+// Message for TokenBurn order
 type TokenBurnOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0x7ED2D2A0      // prefix
-	From   []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`      // owner address
-	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`  // token symbol, in full name with "-" suffix
-	Amount int64  `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"` // amount to burn
+	// owner address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// token symbol, in full name with "-" suffix
+	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`
+	// amount to burn
+	Amount int64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"`
 }
 
 func (x *TokenBurnOrder) Reset() {
@@ -604,15 +638,18 @@ func (x *TokenBurnOrder) GetAmount() int64 {
 	return 0
 }
 
+// Message for TokenFreeze order
 type TokenFreezeOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0xE774B32D      // prefix
-	From   []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`      // owner address
-	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`  // token symbol, in full name with "-" suffix
-	Amount int64  `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"` // amount of token to freeze
+	// owner address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// token symbol, in full name with "-" suffix
+	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`
+	// amount of token to freeze
+	Amount int64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"`
 }
 
 func (x *TokenFreezeOrder) Reset() {
@@ -668,15 +705,18 @@ func (x *TokenFreezeOrder) GetAmount() int64 {
 	return 0
 }
 
+// Message for TokenUnfreeze order
 type TokenUnfreezeOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0x6515FF0D      // prefix
-	From   []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`      // owner address
-	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`  // token symbol, in full name with "-" suffix
-	Amount int64  `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"` // amount of token to unfreeze
+	// owner address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// token symbol, in full name with "-" suffix
+	Symbol string `protobuf:"bytes,2,opt,name=symbol,proto3" json:"symbol,omitempty"`
+	// amount of token to unfreeze
+	Amount int64 `protobuf:"varint,3,opt,name=amount,proto3" json:"amount,omitempty"`
 }
 
 func (x *TokenUnfreezeOrder) Reset() {
@@ -732,22 +772,32 @@ func (x *TokenUnfreezeOrder) GetAmount() int64 {
 	return 0
 }
 
+// Message for HashTimeLock order
 type HTLTOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0xB33F9A24      // prefix
-	From                []byte             `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"` // signer address
-	To                  []byte             `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`     // recipient address
-	RecipientOtherChain string             `protobuf:"bytes,3,opt,name=recipient_other_chain,json=recipientOtherChain,proto3" json:"recipient_other_chain,omitempty"`
-	SenderOtherChain    string             `protobuf:"bytes,4,opt,name=sender_other_chain,json=senderOtherChain,proto3" json:"sender_other_chain,omitempty"`
-	RandomNumberHash    []byte             `protobuf:"bytes,5,opt,name=random_number_hash,json=randomNumberHash,proto3" json:"random_number_hash,omitempty"` //hash of a random number and timestamp, based on SHA256
-	Timestamp           int64              `protobuf:"varint,6,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
-	Amount              []*SendOrder_Token `protobuf:"bytes,7,rep,name=amount,proto3" json:"amount,omitempty"`
-	ExpectedIncome      string             `protobuf:"bytes,8,opt,name=expected_income,json=expectedIncome,proto3" json:"expected_income,omitempty"` // expected gained token on the other chain
-	HeightSpan          int64              `protobuf:"varint,9,opt,name=height_span,json=heightSpan,proto3" json:"height_span,omitempty"`
-	CrossChain          bool               `protobuf:"varint,10,opt,name=cross_chain,json=crossChain,proto3" json:"cross_chain,omitempty"`
+	// signer address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// recipient address
+	To []byte `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`
+	// source on other chain, optional
+	RecipientOtherChain string `protobuf:"bytes,3,opt,name=recipient_other_chain,json=recipientOtherChain,proto3" json:"recipient_other_chain,omitempty"`
+	// recipient on other chain, optional
+	SenderOtherChain string `protobuf:"bytes,4,opt,name=sender_other_chain,json=senderOtherChain,proto3" json:"sender_other_chain,omitempty"`
+	// hash of a random number and timestamp, based on SHA256
+	RandomNumberHash []byte `protobuf:"bytes,5,opt,name=random_number_hash,json=randomNumberHash,proto3" json:"random_number_hash,omitempty"`
+	// timestamp
+	Timestamp int64 `protobuf:"varint,6,opt,name=timestamp,proto3" json:"timestamp,omitempty"`
+	// amounts
+	Amount []*SendOrder_Token `protobuf:"bytes,7,rep,name=amount,proto3" json:"amount,omitempty"`
+	// expected gained token on the other chain
+	ExpectedIncome string `protobuf:"bytes,8,opt,name=expected_income,json=expectedIncome,proto3" json:"expected_income,omitempty"`
+	// period expressed in block heights
+	HeightSpan int64 `protobuf:"varint,9,opt,name=height_span,json=heightSpan,proto3" json:"height_span,omitempty"`
+	// set for cross-chain send
+	CrossChain bool `protobuf:"varint,10,opt,name=cross_chain,json=crossChain,proto3" json:"cross_chain,omitempty"`
 }
 
 func (x *HTLTOrder) Reset() {
@@ -852,15 +902,18 @@ func (x *HTLTOrder) GetCrossChain() bool {
 	return false
 }
 
+// Message for Deposit HTLT order
 type DepositHTLTOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0xB33F9A24      // prefix
-	From   []byte             `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"` // signer address
+	// signer address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// amounts
 	Amount []*SendOrder_Token `protobuf:"bytes,2,rep,name=amount,proto3" json:"amount,omitempty"`
-	SwapId []byte             `protobuf:"bytes,3,opt,name=swap_id,json=swapId,proto3" json:"swap_id,omitempty"`
+	// swap ID
+	SwapId []byte `protobuf:"bytes,3,opt,name=swap_id,json=swapId,proto3" json:"swap_id,omitempty"`
 }
 
 func (x *DepositHTLTOrder) Reset() {
@@ -916,14 +969,17 @@ func (x *DepositHTLTOrder) GetSwapId() []byte {
 	return nil
 }
 
+// Message for Claim HTLT order
 type ClaimHTLOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0xC1665300      // prefix
-	From         []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"` // signer address
-	SwapId       []byte `protobuf:"bytes,2,opt,name=swap_id,json=swapId,proto3" json:"swap_id,omitempty"`
+	// signer address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// swap ID
+	SwapId []byte `protobuf:"bytes,2,opt,name=swap_id,json=swapId,proto3" json:"swap_id,omitempty"`
+	// random number input
 	RandomNumber []byte `protobuf:"bytes,3,opt,name=random_number,json=randomNumber,proto3" json:"random_number,omitempty"`
 }
 
@@ -980,13 +1036,15 @@ func (x *ClaimHTLOrder) GetRandomNumber() []byte {
 	return nil
 }
 
+// Message for Refund HTLT order
 type RefundHTLTOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// 0x3454A27C      // prefix
-	From   []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"` // signer address
+	// signer address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// swap ID
 	SwapId []byte `protobuf:"bytes,2,opt,name=swap_id,json=swapId,proto3" json:"swap_id,omitempty"`
 }
 
@@ -1036,15 +1094,20 @@ func (x *RefundHTLTOrder) GetSwapId() []byte {
 	return nil
 }
 
+// Transfer
 type TransferOut struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	From       []byte           `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
-	To         []byte           `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`
-	Amount     *SendOrder_Token `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount,omitempty"`
-	ExpireTime int64            `protobuf:"varint,4,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
+	// source address
+	From []byte `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
+	// recipient address
+	To []byte `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`
+	// transfer amount
+	Amount *SendOrder_Token `protobuf:"bytes,3,opt,name=amount,proto3" json:"amount,omitempty"`
+	// expiration time
+	ExpireTime int64 `protobuf:"varint,4,opt,name=expire_time,json=expireTime,proto3" json:"expire_time,omitempty"`
 }
 
 func (x *TransferOut) Reset() {
@@ -1328,16 +1391,20 @@ func (x *SideChainUndelegate) GetChainId() string {
 	return ""
 }
 
+// Message for TimeLock order
 type TimeLockOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FromAddress []byte `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` // owner address
+	// owner address
+	FromAddress []byte `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"`
+	// Description (optional)
 	Description string `protobuf:"bytes,2,opt,name=description,proto3" json:"description,omitempty"`
 	// Array of symbol/amount pairs. see SDK https://github.com/binance-chain/javascript-sdk/blob/master/docs/api-docs/classes/tokenmanagement.md#timelock
-	Amount   []*SendOrder_Token `protobuf:"bytes,3,rep,name=amount,proto3" json:"amount,omitempty"`
-	LockTime int64              `protobuf:"varint,4,opt,name=lock_time,json=lockTime,proto3" json:"lock_time,omitempty"`
+	Amount []*SendOrder_Token `protobuf:"bytes,3,rep,name=amount,proto3" json:"amount,omitempty"`
+	// lock time
+	LockTime int64 `protobuf:"varint,4,opt,name=lock_time,json=lockTime,proto3" json:"lock_time,omitempty"`
 }
 
 func (x *TimeLockOrder) Reset() {
@@ -1400,17 +1467,22 @@ func (x *TimeLockOrder) GetLockTime() int64 {
 	return 0
 }
 
+// Message for TimeRelock order
 type TimeRelockOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FromAddress []byte `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` // owner address
-	Id          int64  `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`                                     // order ID
+	// owner address
+	FromAddress []byte `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"`
+	// order ID
+	Id int64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
+	// Description (optional)
 	Description string `protobuf:"bytes,3,opt,name=description,proto3" json:"description,omitempty"`
 	// Array of symbol/amount pairs.
-	Amount   []*SendOrder_Token `protobuf:"bytes,4,rep,name=amount,proto3" json:"amount,omitempty"`
-	LockTime int64              `protobuf:"varint,5,opt,name=lock_time,json=lockTime,proto3" json:"lock_time,omitempty"`
+	Amount []*SendOrder_Token `protobuf:"bytes,4,rep,name=amount,proto3" json:"amount,omitempty"`
+	// lock time
+	LockTime int64 `protobuf:"varint,5,opt,name=lock_time,json=lockTime,proto3" json:"lock_time,omitempty"`
 }
 
 func (x *TimeRelockOrder) Reset() {
@@ -1480,13 +1552,16 @@ func (x *TimeRelockOrder) GetLockTime() int64 {
 	return 0
 }
 
+// Message for TimeUnlock order
 type TimeUnlockOrder struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	FromAddress []byte `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"` // owner address
-	Id          int64  `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`                                     // order ID
+	// owner address
+	FromAddress []byte `protobuf:"bytes,1,opt,name=from_address,json=fromAddress,proto3" json:"from_address,omitempty"`
+	// order ID
+	Id int64 `protobuf:"varint,2,opt,name=id,proto3" json:"id,omitempty"`
 }
 
 func (x *TimeUnlockOrder) Reset() {
@@ -1535,18 +1610,30 @@ func (x *TimeUnlockOrder) GetId() int64 {
 	return 0
 }
 
-// Input data necessary to create a signed order.
+// Input data necessary to create a signed transaction.
 type SigningInput struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	ChainId       string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
-	AccountNumber int64  `protobuf:"varint,2,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty"`
-	Sequence      int64  `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
-	Source        int64  `protobuf:"varint,4,opt,name=source,proto3" json:"source,omitempty"`
-	Memo          string `protobuf:"bytes,5,opt,name=memo,proto3" json:"memo,omitempty"`
-	PrivateKey    []byte `protobuf:"bytes,6,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"`
+	// Chain ID
+	ChainId string `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
+	// Source account number
+	AccountNumber int64 `protobuf:"varint,2,opt,name=account_number,json=accountNumber,proto3" json:"account_number,omitempty"`
+	// Sequence number (account specific)
+	Sequence int64 `protobuf:"varint,3,opt,name=sequence,proto3" json:"sequence,omitempty"`
+	// Transaction source, see https://github.com/bnb-chain/BEPs/blob/master/BEP10.md
+	// Some important values:
+	//  0: Default source value (e.g. for Binance Chain Command Line, or SDKs)
+	//  1: Binance DEX Web Wallet
+	//  2: Trust Wallet
+	Source int64 `protobuf:"varint,4,opt,name=source,proto3" json:"source,omitempty"`
+	// Optional memo
+	Memo string `protobuf:"bytes,5,opt,name=memo,proto3" json:"memo,omitempty"`
+	// The secret private key used for signing (32 bytes).
+	PrivateKey []byte `protobuf:"bytes,6,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"`
+	// Payload message
+	//
 	// Types that are assignable to OrderOneof:
 	//	*SigningInput_TradeOrder
 	//	*SigningInput_CancelTradeOrder
@@ -1902,7 +1989,7 @@ func (*SigningInput_TimeRelockOrder) isSigningInput_OrderOneof() {}
 
 func (*SigningInput_TimeUnlockOrder) isSigningInput_OrderOneof() {}
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 type SigningOutput struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -1910,9 +1997,9 @@ type SigningOutput struct {
 
 	// Signed and encoded transaction bytes.
 	Encoded []byte `protobuf:"bytes,1,opt,name=encoded,proto3" json:"encoded,omitempty"`
-	/// error code, 0 is ok, other codes will be treated as errors
+	// OK (=0) or other codes in case of error
 	Error common.SigningError `protobuf:"varint,2,opt,name=error,proto3,enum=TW.Common.Proto.SigningError" json:"error,omitempty"`
-	/// error description
+	// error description in case of error
 	ErrorMessage string `protobuf:"bytes,3,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
 }
 
@@ -1969,59 +2056,22 @@ func (x *SigningOutput) GetErrorMessage() string {
 	return ""
 }
 
-type Signature_PubKey struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-}
-
-func (x *Signature_PubKey) Reset() {
-	*x = Signature_PubKey{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_Binance_proto_msgTypes[23]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *Signature_PubKey) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*Signature_PubKey) ProtoMessage() {}
-
-func (x *Signature_PubKey) ProtoReflect() protoreflect.Message {
-	mi := &file_Binance_proto_msgTypes[23]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use Signature_PubKey.ProtoReflect.Descriptor instead.
-func (*Signature_PubKey) Descriptor() ([]byte, []int) {
-	return file_Binance_proto_rawDescGZIP(), []int{1, 0}
-}
-
-// 0x2A2C87FA
-// A symbol-amount pair.  Could be moved out of SendOrder; kept here for backward compatibility.
+// A token amount, symbol-amount pair.  Could be moved out of SendOrder; kept here for backward compatibility.
 type SendOrder_Token struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Denom  string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"`
-	Amount int64  `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
+	// Token ID
+	Denom string `protobuf:"bytes,1,opt,name=denom,proto3" json:"denom,omitempty"`
+	// Amount
+	Amount int64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
 }
 
 func (x *SendOrder_Token) Reset() {
 	*x = SendOrder_Token{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_Binance_proto_msgTypes[24]
+		mi := &file_Binance_proto_msgTypes[23]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2034,7 +2084,7 @@ func (x *SendOrder_Token) String() string {
 func (*SendOrder_Token) ProtoMessage() {}
 
 func (x *SendOrder_Token) ProtoReflect() protoreflect.Message {
-	mi := &file_Binance_proto_msgTypes[24]
+	mi := &file_Binance_proto_msgTypes[23]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2064,19 +2114,22 @@ func (x *SendOrder_Token) GetAmount() int64 {
 	return 0
 }
 
+// Transaction input
 type SendOrder_Input struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Address []byte             `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	Coins   []*SendOrder_Token `protobuf:"bytes,2,rep,name=coins,proto3" json:"coins,omitempty"`
+	// source address
+	Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
+	// input coin amounts
+	Coins []*SendOrder_Token `protobuf:"bytes,2,rep,name=coins,proto3" json:"coins,omitempty"`
 }
 
 func (x *SendOrder_Input) Reset() {
 	*x = SendOrder_Input{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_Binance_proto_msgTypes[25]
+		mi := &file_Binance_proto_msgTypes[24]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2089,7 +2142,7 @@ func (x *SendOrder_Input) String() string {
 func (*SendOrder_Input) ProtoMessage() {}
 
 func (x *SendOrder_Input) ProtoReflect() protoreflect.Message {
-	mi := &file_Binance_proto_msgTypes[25]
+	mi := &file_Binance_proto_msgTypes[24]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2119,19 +2172,22 @@ func (x *SendOrder_Input) GetCoins() []*SendOrder_Token {
 	return nil
 }
 
+// Transaction output
 type SendOrder_Output struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	Address []byte             `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
-	Coins   []*SendOrder_Token `protobuf:"bytes,2,rep,name=coins,proto3" json:"coins,omitempty"`
+	// destination address
+	Address []byte `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"`
+	// output coin amounts
+	Coins []*SendOrder_Token `protobuf:"bytes,2,rep,name=coins,proto3" json:"coins,omitempty"`
 }
 
 func (x *SendOrder_Output) Reset() {
 	*x = SendOrder_Output{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_Binance_proto_msgTypes[26]
+		mi := &file_Binance_proto_msgTypes[25]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -2144,7 +2200,7 @@ func (x *SendOrder_Output) String() string {
 func (*SendOrder_Output) ProtoMessage() {}
 
 func (x *SendOrder_Output) ProtoReflect() protoreflect.Message {
-	mi := &file_Binance_proto_msgTypes[26]
+	mi := &file_Binance_proto_msgTypes[25]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -2188,7 +2244,7 @@ var file_Binance_proto_rawDesc = []byte{
 	0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63,
 	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12,
 	0x12, 0x0a, 0x04, 0x64, 0x61, 0x74, 0x61, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x64,
-	0x61, 0x74, 0x61, 0x22, 0x8f, 0x01, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
+	0x61, 0x74, 0x61, 0x22, 0x85, 0x01, 0x0a, 0x09, 0x53, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72,
 	0x65, 0x12, 0x17, 0x0a, 0x07, 0x70, 0x75, 0x62, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01,
 	0x28, 0x0c, 0x52, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x12, 0x1c, 0x0a, 0x09, 0x73, 0x69,
 	0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x09, 0x73,
@@ -2196,317 +2252,312 @@ var file_Binance_proto_rawDesc = []byte{
 	0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
 	0x52, 0x0d, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12,
 	0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x1a, 0x08, 0x0a, 0x06, 0x50,
-	0x75, 0x62, 0x4b, 0x65, 0x79, 0x22, 0xd2, 0x01, 0x0a, 0x0a, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f,
+	0x03, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x22, 0xd2, 0x01, 0x0a, 0x0a,
+	0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65,
+	0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64,
+	0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
+	0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x09, 0x52, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72,
+	0x64, 0x65, 0x72, 0x74, 0x79, 0x70, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6f,
+	0x72, 0x64, 0x65, 0x72, 0x74, 0x79, 0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65,
+	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x05,
+	0x70, 0x72, 0x69, 0x63, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x70, 0x72, 0x69,
+	0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x07,
+	0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x20,
+	0x0a, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x08, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x69, 0x6d, 0x65, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65,
+	0x22, 0x58, 0x0a, 0x10, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f,
 	0x72, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x0e, 0x0a, 0x02,
-	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06,
-	0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79,
-	0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x1c, 0x0a, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x74, 0x79, 0x70,
-	0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x74, 0x79,
-	0x70, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x73, 0x69, 0x64, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03,
-	0x52, 0x04, 0x73, 0x69, 0x64, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x18,
-	0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x70, 0x72, 0x69, 0x63, 0x65, 0x12, 0x1a, 0x0a, 0x08,
-	0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08,
-	0x71, 0x75, 0x61, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x12, 0x20, 0x0a, 0x0b, 0x74, 0x69, 0x6d, 0x65,
-	0x69, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74,
-	0x69, 0x6d, 0x65, 0x69, 0x6e, 0x66, 0x6f, 0x72, 0x63, 0x65, 0x22, 0x58, 0x0a, 0x10, 0x43, 0x61,
-	0x6e, 0x63, 0x65, 0x6c, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x16,
-	0x0a, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06,
-	0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x14,
-	0x0a, 0x05, 0x72, 0x65, 0x66, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x72,
-	0x65, 0x66, 0x69, 0x64, 0x22, 0xf4, 0x02, 0x0a, 0x09, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x12, 0x39, 0x0a, 0x06, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x18, 0x01, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e,
-	0x49, 0x6e, 0x70, 0x75, 0x74, 0x52, 0x06, 0x69, 0x6e, 0x70, 0x75, 0x74, 0x73, 0x12, 0x3c, 0x0a,
-	0x07, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x22,
-	0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74,
-	0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x4f, 0x75, 0x74, 0x70,
-	0x75, 0x74, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x73, 0x1a, 0x35, 0x0a, 0x05, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x09, 0x52, 0x05, 0x64, 0x65, 0x6e, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d,
-	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x6e, 0x74, 0x1a, 0x5a, 0x0a, 0x05, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x37, 0x0a, 0x05, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x18, 0x02,
-	0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63,
+	0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x12, 0x16, 0x0a, 0x06,
+	0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79,
+	0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x14, 0x0a, 0x05, 0x72, 0x65, 0x66, 0x69, 0x64, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x05, 0x72, 0x65, 0x66, 0x69, 0x64, 0x22, 0xf4, 0x02, 0x0a, 0x09, 0x53,
+	0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x39, 0x0a, 0x06, 0x69, 0x6e, 0x70, 0x75,
+	0x74, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69,
+	0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x52, 0x06, 0x69, 0x6e, 0x70,
+	0x75, 0x74, 0x73, 0x12, 0x3c, 0x0a, 0x07, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x73, 0x18, 0x02,
+	0x20, 0x03, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63,
 	0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65,
-	0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x05, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x1a, 0x5b,
-	0x0a, 0x06, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x12, 0x37, 0x0a, 0x05, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28,
-	0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x05, 0x63, 0x6f, 0x69, 0x6e, 0x73, 0x22, 0x90, 0x01, 0x0a, 0x0f,
-	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12,
-	0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66,
-	0x72, 0x6f, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f,
-	0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x12,
-	0x21, 0x0a, 0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x73, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x53, 0x75, 0x70, 0x70,
-	0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x18, 0x05,
-	0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x74, 0x61, 0x62, 0x6c, 0x65, 0x22, 0x54,
-	0x0a, 0x0e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4d, 0x69, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72,
-	0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04,
-	0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x16, 0x0a, 0x06,
-	0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d,
-	0x6f, 0x75, 0x6e, 0x74, 0x22, 0x54, 0x0a, 0x0e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x75, 0x72,
-	0x6e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01,
+	0x72, 0x2e, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x52, 0x07, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74,
+	0x73, 0x1a, 0x35, 0x0a, 0x05, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x64, 0x65,
+	0x6e, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x64, 0x65, 0x6e, 0x6f, 0x6d,
+	0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x1a, 0x5a, 0x0a, 0x05, 0x49, 0x6e, 0x70, 0x75,
+	0x74, 0x12, 0x18, 0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x37, 0x0a, 0x05, 0x63,
+	0x6f, 0x69, 0x6e, 0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e,
+	0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65,
+	0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x05, 0x63,
+	0x6f, 0x69, 0x6e, 0x73, 0x1a, 0x5b, 0x0a, 0x06, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x18,
+	0x0a, 0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x07, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x37, 0x0a, 0x05, 0x63, 0x6f, 0x69, 0x6e,
+	0x73, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e,
+	0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f,
+	0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x05, 0x63, 0x6f, 0x69, 0x6e,
+	0x73, 0x22, 0x90, 0x01, 0x0a, 0x0f, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x49, 0x73, 0x73, 0x75, 0x65,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d,
+	0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a,
+	0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73,
+	0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x21, 0x0a, 0x0c, 0x74, 0x6f, 0x74, 0x61, 0x6c, 0x5f, 0x73,
+	0x75, 0x70, 0x70, 0x6c, 0x79, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x74, 0x6f, 0x74,
+	0x61, 0x6c, 0x53, 0x75, 0x70, 0x70, 0x6c, 0x79, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x69, 0x6e, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x08, 0x52, 0x08, 0x6d, 0x69, 0x6e, 0x74,
+	0x61, 0x62, 0x6c, 0x65, 0x22, 0x54, 0x0a, 0x0e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4d, 0x69, 0x6e,
+	0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79,
 	0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79, 0x6d, 0x62,
 	0x6f, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x56, 0x0a, 0x10, 0x54, 0x6f,
-	0x6b, 0x65, 0x6e, 0x46, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12,
+	0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x54, 0x0a, 0x0e, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x42, 0x75, 0x72, 0x6e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04,
+	0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d,
+	0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75,
+	0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
+	0x22, 0x56, 0x0a, 0x10, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x46, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f,
+	0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6d, 0x62,
+	0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c,
+	0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x58, 0x0a, 0x12, 0x54, 0x6f, 0x6b, 0x65,
+	0x6e, 0x55, 0x6e, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12,
 	0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72,
 	0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01,
 	0x28, 0x09, 0x52, 0x06, 0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d,
 	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x6e, 0x74, 0x22, 0x58, 0x0a, 0x12, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x55, 0x6e, 0x66, 0x72, 0x65,
-	0x65, 0x7a, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x16, 0x0a, 0x06,
-	0x73, 0x79, 0x6d, 0x62, 0x6f, 0x6c, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x73, 0x79,
-	0x6d, 0x62, 0x6f, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0x83, 0x03, 0x0a,
-	0x09, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72,
-	0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e,
-	0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x32,
-	0x0a, 0x15, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x5f, 0x6f, 0x74, 0x68, 0x65,
-	0x72, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x13, 0x72,
-	0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x43, 0x68, 0x61,
-	0x69, 0x6e, 0x12, 0x2c, 0x0a, 0x12, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x5f, 0x6f, 0x74, 0x68,
-	0x65, 0x72, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10,
-	0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65, 0x72, 0x43, 0x68, 0x61, 0x69, 0x6e,
-	0x12, 0x2c, 0x0a, 0x12, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, 0x72, 0x61,
-	0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x48, 0x61, 0x73, 0x68, 0x12, 0x1c,
-	0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x18, 0x06, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x39, 0x0a, 0x06,
-	0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54,
-	0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52,
-	0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x27, 0x0a, 0x0f, 0x65, 0x78, 0x70, 0x65, 0x63,
-	0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x63, 0x6f, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0e, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x65,
-	0x12, 0x1f, 0x0a, 0x0b, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x5f, 0x73, 0x70, 0x61, 0x6e, 0x18,
-	0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74, 0x53, 0x70, 0x61,
-	0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e,
-	0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x63, 0x72, 0x6f, 0x73, 0x73, 0x43, 0x68, 0x61,
-	0x69, 0x6e, 0x22, 0x7a, 0x0a, 0x10, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x48, 0x54, 0x4c,
-	0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d,
-	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e,
-	0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65,
-	0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61,
-	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x77, 0x61, 0x70, 0x5f, 0x69, 0x64,
-	0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x77, 0x61, 0x70, 0x49, 0x64, 0x22, 0x61,
-	0x0a, 0x0d, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x48, 0x54, 0x4c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12,
-	0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66,
-	0x72, 0x6f, 0x6d, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x77, 0x61, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x02,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x77, 0x61, 0x70, 0x49, 0x64, 0x12, 0x23, 0x0a, 0x0d,
-	0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x03, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x0c, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x62, 0x65,
-	0x72, 0x22, 0x3e, 0x0a, 0x0f, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x48, 0x54, 0x4c, 0x54, 0x4f,
-	0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01,
-	0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x77, 0x61, 0x70,
-	0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x77, 0x61, 0x70, 0x49,
-	0x64, 0x22, 0x8d, 0x01, 0x0a, 0x0b, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4f, 0x75,
-	0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
-	0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x0c, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18,
-	0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e,
-	0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
-	0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65, 0x54, 0x69, 0x6d,
-	0x65, 0x22, 0xbf, 0x01, 0x0a, 0x11, 0x53, 0x69, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x44,
-	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x6c, 0x65, 0x67,
-	0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
-	0x0d, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x25,
-	0x0a, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72,
-	0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f,
-	0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x41, 0x0a, 0x0a, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42,
-	0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e,
-	0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x0a, 0x64, 0x65,
-	0x6c, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x69,
-	0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x68, 0x61, 0x69,
-	0x6e, 0x49, 0x64, 0x22, 0xee, 0x01, 0x0a, 0x13, 0x53, 0x69, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69,
-	0x6e, 0x52, 0x65, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x64,
-	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x01, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64,
-	0x64, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f,
-	0x73, 0x72, 0x63, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10,
-	0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x53, 0x72, 0x63, 0x41, 0x64, 0x64, 0x72,
-	0x12, 0x2c, 0x0a, 0x12, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x64, 0x73,
-	0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, 0x76, 0x61,
-	0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x44, 0x73, 0x74, 0x41, 0x64, 0x64, 0x72, 0x12, 0x39,
-	0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21,
+	0x6e, 0x74, 0x22, 0x83, 0x03, 0x0a, 0x09, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04,
+	0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
+	0x52, 0x02, 0x74, 0x6f, 0x12, 0x32, 0x0a, 0x15, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e,
+	0x74, 0x5f, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20,
+	0x01, 0x28, 0x09, 0x52, 0x13, 0x72, 0x65, 0x63, 0x69, 0x70, 0x69, 0x65, 0x6e, 0x74, 0x4f, 0x74,
+	0x68, 0x65, 0x72, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x2c, 0x0a, 0x12, 0x73, 0x65, 0x6e, 0x64,
+	0x65, 0x72, 0x5f, 0x6f, 0x74, 0x68, 0x65, 0x72, 0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4f, 0x74, 0x68, 0x65,
+	0x72, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x12, 0x2c, 0x0a, 0x12, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d,
+	0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x5f, 0x68, 0x61, 0x73, 0x68, 0x18, 0x05, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x10, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72,
+	0x48, 0x61, 0x73, 0x68, 0x12, 0x1c, 0x0a, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61, 0x6d,
+	0x70, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x74, 0x69, 0x6d, 0x65, 0x73, 0x74, 0x61,
+	0x6d, 0x70, 0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x07, 0x20, 0x03,
+	0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x27, 0x0a,
+	0x0f, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64, 0x5f, 0x69, 0x6e, 0x63, 0x6f, 0x6d, 0x65,
+	0x18, 0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x65, 0x78, 0x70, 0x65, 0x63, 0x74, 0x65, 0x64,
+	0x49, 0x6e, 0x63, 0x6f, 0x6d, 0x65, 0x12, 0x1f, 0x0a, 0x0b, 0x68, 0x65, 0x69, 0x67, 0x68, 0x74,
+	0x5f, 0x73, 0x70, 0x61, 0x6e, 0x18, 0x09, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x68, 0x65, 0x69,
+	0x67, 0x68, 0x74, 0x53, 0x70, 0x61, 0x6e, 0x12, 0x1f, 0x0a, 0x0b, 0x63, 0x72, 0x6f, 0x73, 0x73,
+	0x5f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0a, 0x63, 0x72,
+	0x6f, 0x73, 0x73, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x22, 0x7a, 0x0a, 0x10, 0x44, 0x65, 0x70, 0x6f,
+	0x73, 0x69, 0x74, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04,
+	0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d,
+	0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
+	0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x17, 0x0a, 0x07, 0x73,
+	0x77, 0x61, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x77,
+	0x61, 0x70, 0x49, 0x64, 0x22, 0x61, 0x0a, 0x0d, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x48, 0x54, 0x4c,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18, 0x01, 0x20,
+	0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x17, 0x0a, 0x07, 0x73, 0x77, 0x61,
+	0x70, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x73, 0x77, 0x61, 0x70,
+	0x49, 0x64, 0x12, 0x23, 0x0a, 0x0d, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x5f, 0x6e, 0x75, 0x6d,
+	0x62, 0x65, 0x72, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0c, 0x72, 0x61, 0x6e, 0x64, 0x6f,
+	0x6d, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x22, 0x3e, 0x0a, 0x0f, 0x52, 0x65, 0x66, 0x75, 0x6e,
+	0x64, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72,
+	0x6f, 0x6d, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x17,
+	0x0a, 0x07, 0x73, 0x77, 0x61, 0x70, 0x5f, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x06, 0x73, 0x77, 0x61, 0x70, 0x49, 0x64, 0x22, 0x8d, 0x01, 0x0a, 0x0b, 0x54, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x65, 0x72, 0x4f, 0x75, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x66, 0x72, 0x6f, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x74,
+	0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x02, 0x74, 0x6f, 0x12, 0x39, 0x0a, 0x06, 0x61,
+	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57,
+	0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53,
+	0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x06,
+	0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x0b, 0x65, 0x78, 0x70, 0x69, 0x72, 0x65,
+	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x65, 0x78, 0x70,
+	0x69, 0x72, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xbf, 0x01, 0x0a, 0x11, 0x53, 0x69, 0x64, 0x65,
+	0x43, 0x68, 0x61, 0x69, 0x6e, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x25, 0x0a,
+	0x0e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72,
+	0x41, 0x64, 0x64, 0x72, 0x12, 0x25, 0x0a, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f,
+	0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x76, 0x61,
+	0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x41, 0x0a, 0x0a, 0x64,
+	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32,
+	0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f,
+	0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b,
+	0x65, 0x6e, 0x52, 0x0a, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x19,
+	0x0a, 0x08, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x07, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x22, 0xee, 0x01, 0x0a, 0x13, 0x53, 0x69,
+	0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74,
+	0x65, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61,
+	0x64, 0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x67,
+	0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x76, 0x61, 0x6c, 0x69,
+	0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x73, 0x72, 0x63, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02,
+	0x20, 0x01, 0x28, 0x0c, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x53,
+	0x72, 0x63, 0x41, 0x64, 0x64, 0x72, 0x12, 0x2c, 0x0a, 0x12, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61,
+	0x74, 0x6f, 0x72, 0x5f, 0x64, 0x73, 0x74, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x03, 0x20, 0x01,
+	0x28, 0x0c, 0x52, 0x10, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x44, 0x73, 0x74,
+	0x41, 0x64, 0x64, 0x72, 0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04,
+	0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63,
+	0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65,
+	0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
+	0x19, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x07, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x22, 0xb9, 0x01, 0x0a, 0x13, 0x53,
+	0x69, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x55, 0x6e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61,
+	0x74, 0x65, 0x12, 0x25, 0x0a, 0x0e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x5f,
+	0x61, 0x64, 0x64, 0x72, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x64, 0x65, 0x6c, 0x65,
+	0x67, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x25, 0x0a, 0x0e, 0x76, 0x61, 0x6c,
+	0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x0c, 0x52, 0x0d, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72,
+	0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b,
+	0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72,
+	0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x63,
+	0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63,
+	0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x22, 0xac, 0x01, 0x0a, 0x0d, 0x54, 0x69, 0x6d, 0x65, 0x4c,
+	0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x66, 0x72, 0x6f, 0x6d,
+	0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b,
+	0x66, 0x72, 0x6f, 0x6d, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64,
+	0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a,
+	0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e,
+	0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
+	0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x6b,
+	0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x6f, 0x63,
+	0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22, 0xbe, 0x01, 0x0a, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x65,
+	0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x66, 0x72, 0x6f,
+	0x6d, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b,
+	0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39,
+	0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21,
 	0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74,
 	0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65,
-	0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x68, 0x61,
-	0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x68, 0x61,
-	0x69, 0x6e, 0x49, 0x64, 0x22, 0xb9, 0x01, 0x0a, 0x13, 0x53, 0x69, 0x64, 0x65, 0x43, 0x68, 0x61,
-	0x69, 0x6e, 0x55, 0x6e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x12, 0x25, 0x0a, 0x0e,
-	0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x01,
-	0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x6f, 0x72, 0x41,
-	0x64, 0x64, 0x72, 0x12, 0x25, 0x0a, 0x0e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x61, 0x74, 0x6f, 0x72,
-	0x5f, 0x61, 0x64, 0x64, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0d, 0x76, 0x61, 0x6c,
-	0x69, 0x64, 0x61, 0x74, 0x6f, 0x72, 0x41, 0x64, 0x64, 0x72, 0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d,
-	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e,
-	0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65,
-	0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61,
-	0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69,
-	0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64,
-	0x22, 0xac, 0x01, 0x0a, 0x0d, 0x54, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x41, 0x64,
-	0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69, 0x70,
-	0x74, 0x69, 0x6f, 0x6e, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73, 0x63,
-	0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e,
-	0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f,
-	0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x6e, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22,
-	0xbe, 0x01, 0x0a, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x65, 0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72,
-	0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x61, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x64, 0x65, 0x73, 0x63, 0x72, 0x69,
-	0x70, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x65, 0x73,
-	0x63, 0x72, 0x69, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x39, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75,
-	0x6e, 0x74, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69,
-	0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64,
-	0x4f, 0x72, 0x64, 0x65, 0x72, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f,
-	0x75, 0x6e, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65,
-	0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65,
-	0x22, 0x44, 0x0a, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72,
-	0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x66, 0x72, 0x6f, 0x6d, 0x5f, 0x61, 0x64, 0x64, 0x72,
-	0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x41,
-	0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
-	0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0xf9, 0x0c, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69,
-	0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x63, 0x68, 0x61, 0x69, 0x6e,
-	0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x63, 0x68, 0x61, 0x69, 0x6e,
-	0x49, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x75,
-	0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0d, 0x61, 0x63, 0x63, 0x6f,
-	0x75, 0x6e, 0x74, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12, 0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71,
-	0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x73, 0x65, 0x71,
-	0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18,
-	0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a,
-	0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d,
-	0x6f, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79,
-	0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b,
-	0x65, 0x79, 0x12, 0x3f, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65,
-	0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e,
-	0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x72, 0x61, 0x64, 0x65,
-	0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x74, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72,
-	0x64, 0x65, 0x72, 0x12, 0x52, 0x0a, 0x12, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x5f, 0x74, 0x72,
-	0x61, 0x64, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x22, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72,
-	0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x10, 0x63, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x54, 0x72, 0x61,
-	0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x0a, 0x73, 0x65, 0x6e, 0x64, 0x5f,
-	0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x54, 0x57,
-	0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53,
-	0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09, 0x73, 0x65, 0x6e, 0x64,
-	0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x5f,
-	0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x54, 0x57,
-	0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54,
-	0x6f, 0x6b, 0x65, 0x6e, 0x46, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48,
-	0x00, 0x52, 0x0b, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x4d,
-	0x0a, 0x0e, 0x75, 0x6e, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72,
-	0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61,
-	0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x55,
-	0x6e, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0d,
-	0x75, 0x6e, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x3c, 0x0a,
-	0x0a, 0x68, 0x74, 0x6c, 0x74, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0d, 0x20, 0x01, 0x28,
+	0x6e, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x63,
+	0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6c, 0x6f,
+	0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x44, 0x0a, 0x0f, 0x54, 0x69, 0x6d, 0x65, 0x55, 0x6e,
+	0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x21, 0x0a, 0x0c, 0x66, 0x72, 0x6f,
+	0x6d, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52,
+	0x0b, 0x66, 0x72, 0x6f, 0x6d, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x0e, 0x0a, 0x02,
+	0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x02, 0x69, 0x64, 0x22, 0xf9, 0x0c, 0x0a,
+	0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x19, 0x0a,
+	0x08, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x5f, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x07, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x0e, 0x61, 0x63, 0x63, 0x6f,
+	0x75, 0x6e, 0x74, 0x5f, 0x6e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
+	0x52, 0x0d, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x4e, 0x75, 0x6d, 0x62, 0x65, 0x72, 0x12,
+	0x1a, 0x0a, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
+	0x03, 0x52, 0x08, 0x73, 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x73,
+	0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x73, 0x6f, 0x75,
+	0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x18, 0x05, 0x20, 0x01, 0x28,
+	0x09, 0x52, 0x04, 0x6d, 0x65, 0x6d, 0x6f, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x61,
+	0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x72,
+	0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x3f, 0x0a, 0x0b, 0x74, 0x72, 0x61, 0x64,
+	0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1c, 0x2e,
+	0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x74,
+	0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x52, 0x0a, 0x12, 0x63, 0x61, 0x6e,
+	0x63, 0x65, 0x6c, 0x5f, 0x74, 0x72, 0x61, 0x64, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18,
+	0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e,
+	0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x61, 0x6e, 0x63, 0x65, 0x6c, 0x54,
+	0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x10, 0x63, 0x61, 0x6e,
+	0x63, 0x65, 0x6c, 0x54, 0x72, 0x61, 0x64, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x3c, 0x0a,
+	0x0a, 0x73, 0x65, 0x6e, 0x64, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0a, 0x20, 0x01, 0x28,
 	0x0b, 0x32, 0x1b, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50,
-	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00,
-	0x52, 0x09, 0x68, 0x74, 0x6c, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x51, 0x0a, 0x11, 0x64,
-	0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x48, 0x54, 0x4c, 0x54, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72,
-	0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61,
-	0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x44, 0x65, 0x70, 0x6f, 0x73, 0x69,
-	0x74, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x10, 0x64, 0x65,
-	0x70, 0x6f, 0x73, 0x69, 0x74, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x4a,
-	0x0a, 0x0f, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x48, 0x54, 0x4c, 0x54, 0x5f, 0x6f, 0x72, 0x64, 0x65,
-	0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e,
-	0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x43, 0x6c, 0x61, 0x69, 0x6d,
-	0x48, 0x54, 0x4c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0e, 0x63, 0x6c, 0x61, 0x69,
-	0x6d, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x4e, 0x0a, 0x10, 0x72, 0x65,
-	0x66, 0x75, 0x6e, 0x64, 0x48, 0x54, 0x4c, 0x54, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x10,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63,
-	0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x48, 0x54,
-	0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0f, 0x72, 0x65, 0x66, 0x75, 0x6e,
-	0x64, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x44, 0x0a, 0x0b, 0x69, 0x73,
-	0x73, 0x75, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x11, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x49, 0x73, 0x73, 0x75, 0x65, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x73, 0x73, 0x75, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72,
-	0x12, 0x41, 0x0a, 0x0a, 0x6d, 0x69, 0x6e, 0x74, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x12,
-	0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63,
-	0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x4d, 0x69, 0x6e,
-	0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09, 0x6d, 0x69, 0x6e, 0x74, 0x4f, 0x72,
-	0x64, 0x65, 0x72, 0x12, 0x41, 0x0a, 0x0a, 0x62, 0x75, 0x72, 0x6e, 0x5f, 0x6f, 0x72, 0x64, 0x65,
-	0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e,
-	0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e,
-	0x42, 0x75, 0x72, 0x6e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09, 0x62, 0x75, 0x72,
-	0x6e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x4d, 0x0a, 0x12, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66,
-	0x65, 0x72, 0x5f, 0x6f, 0x75, 0x74, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x14, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4f, 0x75,
-	0x74, 0x48, 0x00, 0x52, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x4f, 0x75, 0x74,
-	0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x55, 0x0a, 0x13, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x64, 0x65,
-	0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x15, 0x20, 0x01,
-	0x28, 0x0b, 0x32, 0x23, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x44,
-	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x11, 0x73, 0x69, 0x64, 0x65, 0x44,
-	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x5b, 0x0a, 0x15,
-	0x73, 0x69, 0x64, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f,
-	0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x54, 0x57,
-	0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53,
-	0x69, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61,
-	0x74, 0x65, 0x48, 0x00, 0x52, 0x13, 0x73, 0x69, 0x64, 0x65, 0x52, 0x65, 0x64, 0x65, 0x6c, 0x65,
-	0x67, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x5b, 0x0a, 0x15, 0x73, 0x69, 0x64,
-	0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x6f, 0x72, 0x64,
-	0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69,
-	0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69, 0x64, 0x65,
-	0x43, 0x68, 0x61, 0x69, 0x6e, 0x55, 0x6e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x48,
-	0x00, 0x52, 0x13, 0x73, 0x69, 0x64, 0x65, 0x55, 0x6e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74,
-	0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x49, 0x0a, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6c,
-	0x6f, 0x63, 0x6b, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x18, 0x20, 0x01, 0x28, 0x0b, 0x32,
-	0x1f, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f,
-	0x74, 0x6f, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72,
-	0x48, 0x00, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65,
-	0x72, 0x12, 0x4f, 0x0a, 0x11, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x72, 0x65, 0x6c, 0x6f, 0x63, 0x6b,
-	0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x19, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00,
+	0x52, 0x09, 0x73, 0x65, 0x6e, 0x64, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x47, 0x0a, 0x0c, 0x66,
+	0x72, 0x65, 0x65, 0x7a, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0b, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x22, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x46, 0x72, 0x65, 0x65, 0x7a, 0x65,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0b, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f,
+	0x72, 0x64, 0x65, 0x72, 0x12, 0x4d, 0x0a, 0x0e, 0x75, 0x6e, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65,
+	0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x54,
+	0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
+	0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x55, 0x6e, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f, 0x72, 0x64,
+	0x65, 0x72, 0x48, 0x00, 0x52, 0x0d, 0x75, 0x6e, 0x66, 0x72, 0x65, 0x65, 0x7a, 0x65, 0x4f, 0x72,
+	0x64, 0x65, 0x72, 0x12, 0x3c, 0x0a, 0x0a, 0x68, 0x74, 0x6c, 0x74, 0x5f, 0x6f, 0x72, 0x64, 0x65,
+	0x72, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1b, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e,
+	0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x48, 0x54, 0x4c, 0x54, 0x4f,
+	0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09, 0x68, 0x74, 0x6c, 0x74, 0x4f, 0x72, 0x64, 0x65,
+	0x72, 0x12, 0x51, 0x0a, 0x11, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x48, 0x54, 0x4c, 0x54,
+	0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x54,
 	0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x54, 0x69, 0x6d, 0x65, 0x52, 0x65, 0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48,
-	0x00, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x65, 0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64,
-	0x65, 0x72, 0x12, 0x4f, 0x0a, 0x11, 0x74, 0x69, 0x6d, 0x65, 0x5f, 0x75, 0x6e, 0x6c, 0x6f, 0x63,
-	0x6b, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x1a, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e,
+	0x44, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x48, 0x00, 0x52, 0x10, 0x64, 0x65, 0x70, 0x6f, 0x73, 0x69, 0x74, 0x48, 0x54, 0x4c, 0x54, 0x4f,
+	0x72, 0x64, 0x65, 0x72, 0x12, 0x4a, 0x0a, 0x0f, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x48, 0x54, 0x4c,
+	0x54, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e,
+	0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
+	0x2e, 0x43, 0x6c, 0x61, 0x69, 0x6d, 0x48, 0x54, 0x4c, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00,
+	0x52, 0x0e, 0x63, 0x6c, 0x61, 0x69, 0x6d, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x12, 0x4e, 0x0a, 0x10, 0x72, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x48, 0x54, 0x4c, 0x54, 0x5f, 0x6f,
+	0x72, 0x64, 0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e,
+	0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x52, 0x65,
+	0x66, 0x75, 0x6e, 0x64, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52,
+	0x0f, 0x72, 0x65, 0x66, 0x75, 0x6e, 0x64, 0x48, 0x54, 0x4c, 0x54, 0x4f, 0x72, 0x64, 0x65, 0x72,
+	0x12, 0x44, 0x0a, 0x0b, 0x69, 0x73, 0x73, 0x75, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18,
+	0x11, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e,
+	0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x49, 0x73,
+	0x73, 0x75, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0a, 0x69, 0x73, 0x73, 0x75,
+	0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x41, 0x0a, 0x0a, 0x6d, 0x69, 0x6e, 0x74, 0x5f, 0x6f,
+	0x72, 0x64, 0x65, 0x72, 0x18, 0x12, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e, 0x54, 0x57, 0x2e,
+	0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x6f,
+	0x6b, 0x65, 0x6e, 0x4d, 0x69, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x09,
+	0x6d, 0x69, 0x6e, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x41, 0x0a, 0x0a, 0x62, 0x75, 0x72,
+	0x6e, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x13, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x20, 0x2e,
 	0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f,
-	0x2e, 0x54, 0x69, 0x6d, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72,
-	0x48, 0x00, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72,
-	0x64, 0x65, 0x72, 0x42, 0x0d, 0x0a, 0x0b, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x5f, 0x6f, 0x6e, 0x65,
-	0x6f, 0x66, 0x22, 0x83, 0x01, 0x0a, 0x0d, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x4f, 0x75,
-	0x74, 0x70, 0x75, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x18,
-	0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x65, 0x6e, 0x63, 0x6f, 0x64, 0x65, 0x64, 0x12, 0x33,
-	0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1d, 0x2e,
-	0x54, 0x57, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e,
-	0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x52, 0x05, 0x65, 0x72,
-	0x72, 0x6f, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73,
-	0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f,
-	0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x56, 0x0a, 0x15, 0x77, 0x61, 0x6c, 0x6c,
-	0x65, 0x74, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x6a, 0x6e, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x69,
-	0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2d, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x63, 0x68, 0x61, 0x69,
-	0x6e, 0x2d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x62, 0x6c,
-	0x6f, 0x63, 0x6b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65,
-	0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x2e, 0x54, 0x6f, 0x6b, 0x65, 0x6e, 0x42, 0x75, 0x72, 0x6e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48,
+	0x00, 0x52, 0x09, 0x62, 0x75, 0x72, 0x6e, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x4d, 0x0a, 0x12,
+	0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x5f, 0x6f, 0x75, 0x74, 0x5f, 0x6f, 0x72, 0x64,
+	0x65, 0x72, 0x18, 0x14, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69,
+	0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x72, 0x61, 0x6e,
+	0x73, 0x66, 0x65, 0x72, 0x4f, 0x75, 0x74, 0x48, 0x00, 0x52, 0x10, 0x74, 0x72, 0x61, 0x6e, 0x73,
+	0x66, 0x65, 0x72, 0x4f, 0x75, 0x74, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x55, 0x0a, 0x13, 0x73,
+	0x69, 0x64, 0x65, 0x5f, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x6f, 0x72, 0x64,
+	0x65, 0x72, 0x18, 0x15, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69,
+	0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69, 0x64, 0x65,
+	0x43, 0x68, 0x61, 0x69, 0x6e, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52,
+	0x11, 0x73, 0x69, 0x64, 0x65, 0x44, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64,
+	0x65, 0x72, 0x12, 0x5b, 0x0a, 0x15, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x72, 0x65, 0x64, 0x65, 0x6c,
+	0x65, 0x67, 0x61, 0x74, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x16, 0x20, 0x01, 0x28,
+	0x0b, 0x32, 0x25, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50,
+	0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x52, 0x65,
+	0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x13, 0x73, 0x69, 0x64, 0x65,
+	0x52, 0x65, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12,
+	0x5b, 0x0a, 0x15, 0x73, 0x69, 0x64, 0x65, 0x5f, 0x75, 0x6e, 0x64, 0x65, 0x6c, 0x65, 0x67, 0x61,
+	0x74, 0x65, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x17, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x25,
+	0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x53, 0x69, 0x64, 0x65, 0x43, 0x68, 0x61, 0x69, 0x6e, 0x55, 0x6e, 0x64, 0x65, 0x6c,
+	0x65, 0x67, 0x61, 0x74, 0x65, 0x48, 0x00, 0x52, 0x13, 0x73, 0x69, 0x64, 0x65, 0x55, 0x6e, 0x64,
+	0x65, 0x6c, 0x65, 0x67, 0x61, 0x74, 0x65, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x49, 0x0a, 0x0f,
+	0x74, 0x69, 0x6d, 0x65, 0x5f, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18,
+	0x18, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e,
+	0x63, 0x65, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x4c, 0x6f, 0x63,
+	0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0d, 0x74, 0x69, 0x6d, 0x65, 0x4c, 0x6f,
+	0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x4f, 0x0a, 0x11, 0x74, 0x69, 0x6d, 0x65, 0x5f,
+	0x72, 0x65, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x19, 0x20, 0x01,
+	0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2e,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x52, 0x65, 0x6c, 0x6f, 0x63, 0x6b,
+	0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x52, 0x65, 0x6c,
+	0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x4f, 0x0a, 0x11, 0x74, 0x69, 0x6d, 0x65,
+	0x5f, 0x75, 0x6e, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x6f, 0x72, 0x64, 0x65, 0x72, 0x18, 0x1a, 0x20,
+	0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65,
+	0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x69, 0x6d, 0x65, 0x55, 0x6e, 0x6c, 0x6f, 0x63,
+	0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x48, 0x00, 0x52, 0x0f, 0x74, 0x69, 0x6d, 0x65, 0x55, 0x6e,
+	0x6c, 0x6f, 0x63, 0x6b, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x42, 0x0d, 0x0a, 0x0b, 0x6f, 0x72, 0x64,
+	0x65, 0x72, 0x5f, 0x6f, 0x6e, 0x65, 0x6f, 0x66, 0x22, 0x83, 0x01, 0x0a, 0x0d, 0x53, 0x69, 0x67,
+	0x6e, 0x69, 0x6e, 0x67, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e,
+	0x63, 0x6f, 0x64, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x65, 0x6e, 0x63,
+	0x6f, 0x64, 0x65, 0x64, 0x12, 0x33, 0x0a, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x0e, 0x32, 0x1d, 0x2e, 0x54, 0x57, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e,
+	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x45, 0x72, 0x72,
+	0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72,
+	0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
+	0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x17,
+	0x0a, 0x15, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x6a, 0x6e,
+	0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -2521,7 +2572,7 @@ func file_Binance_proto_rawDescGZIP() []byte {
 	return file_Binance_proto_rawDescData
 }
 
-var file_Binance_proto_msgTypes = make([]protoimpl.MessageInfo, 27)
+var file_Binance_proto_msgTypes = make([]protoimpl.MessageInfo, 26)
 var file_Binance_proto_goTypes = []interface{}{
 	(*Transaction)(nil),         // 0: TW.Binance.Proto.Transaction
 	(*Signature)(nil),           // 1: TW.Binance.Proto.Signature
@@ -2546,23 +2597,22 @@ var file_Binance_proto_goTypes = []interface{}{
 	(*TimeUnlockOrder)(nil),     // 20: TW.Binance.Proto.TimeUnlockOrder
 	(*SigningInput)(nil),        // 21: TW.Binance.Proto.SigningInput
 	(*SigningOutput)(nil),       // 22: TW.Binance.Proto.SigningOutput
-	(*Signature_PubKey)(nil),    // 23: TW.Binance.Proto.Signature.PubKey
-	(*SendOrder_Token)(nil),     // 24: TW.Binance.Proto.SendOrder.Token
-	(*SendOrder_Input)(nil),     // 25: TW.Binance.Proto.SendOrder.Input
-	(*SendOrder_Output)(nil),    // 26: TW.Binance.Proto.SendOrder.Output
-	(common.SigningError)(0),    // 27: TW.Common.Proto.SigningError
+	(*SendOrder_Token)(nil),     // 23: TW.Binance.Proto.SendOrder.Token
+	(*SendOrder_Input)(nil),     // 24: TW.Binance.Proto.SendOrder.Input
+	(*SendOrder_Output)(nil),    // 25: TW.Binance.Proto.SendOrder.Output
+	(common.SigningError)(0),    // 26: TW.Common.Proto.SigningError
 }
 var file_Binance_proto_depIdxs = []int32{
-	25, // 0: TW.Binance.Proto.SendOrder.inputs:type_name -> TW.Binance.Proto.SendOrder.Input
-	26, // 1: TW.Binance.Proto.SendOrder.outputs:type_name -> TW.Binance.Proto.SendOrder.Output
-	24, // 2: TW.Binance.Proto.HTLTOrder.amount:type_name -> TW.Binance.Proto.SendOrder.Token
-	24, // 3: TW.Binance.Proto.DepositHTLTOrder.amount:type_name -> TW.Binance.Proto.SendOrder.Token
-	24, // 4: TW.Binance.Proto.TransferOut.amount:type_name -> TW.Binance.Proto.SendOrder.Token
-	24, // 5: TW.Binance.Proto.SideChainDelegate.delegation:type_name -> TW.Binance.Proto.SendOrder.Token
-	24, // 6: TW.Binance.Proto.SideChainRedelegate.amount:type_name -> TW.Binance.Proto.SendOrder.Token
-	24, // 7: TW.Binance.Proto.SideChainUndelegate.amount:type_name -> TW.Binance.Proto.SendOrder.Token
-	24, // 8: TW.Binance.Proto.TimeLockOrder.amount:type_name -> TW.Binance.Proto.SendOrder.Token
-	24, // 9: TW.Binance.Proto.TimeRelockOrder.amount:type_name -> TW.Binance.Proto.SendOrder.Token
+	24, // 0: TW.Binance.Proto.SendOrder.inputs:type_name -> TW.Binance.Proto.SendOrder.Input
+	25, // 1: TW.Binance.Proto.SendOrder.outputs:type_name -> TW.Binance.Proto.SendOrder.Output
+	23, // 2: TW.Binance.Proto.HTLTOrder.amount:type_name -> TW.Binance.Proto.SendOrder.Token
+	23, // 3: TW.Binance.Proto.DepositHTLTOrder.amount:type_name -> TW.Binance.Proto.SendOrder.Token
+	23, // 4: TW.Binance.Proto.TransferOut.amount:type_name -> TW.Binance.Proto.SendOrder.Token
+	23, // 5: TW.Binance.Proto.SideChainDelegate.delegation:type_name -> TW.Binance.Proto.SendOrder.Token
+	23, // 6: TW.Binance.Proto.SideChainRedelegate.amount:type_name -> TW.Binance.Proto.SendOrder.Token
+	23, // 7: TW.Binance.Proto.SideChainUndelegate.amount:type_name -> TW.Binance.Proto.SendOrder.Token
+	23, // 8: TW.Binance.Proto.TimeLockOrder.amount:type_name -> TW.Binance.Proto.SendOrder.Token
+	23, // 9: TW.Binance.Proto.TimeRelockOrder.amount:type_name -> TW.Binance.Proto.SendOrder.Token
 	2,  // 10: TW.Binance.Proto.SigningInput.trade_order:type_name -> TW.Binance.Proto.TradeOrder
 	3,  // 11: TW.Binance.Proto.SigningInput.cancel_trade_order:type_name -> TW.Binance.Proto.CancelTradeOrder
 	4,  // 12: TW.Binance.Proto.SigningInput.send_order:type_name -> TW.Binance.Proto.SendOrder
@@ -2582,9 +2632,9 @@ var file_Binance_proto_depIdxs = []int32{
 	18, // 26: TW.Binance.Proto.SigningInput.time_lock_order:type_name -> TW.Binance.Proto.TimeLockOrder
 	19, // 27: TW.Binance.Proto.SigningInput.time_relock_order:type_name -> TW.Binance.Proto.TimeRelockOrder
 	20, // 28: TW.Binance.Proto.SigningInput.time_unlock_order:type_name -> TW.Binance.Proto.TimeUnlockOrder
-	27, // 29: TW.Binance.Proto.SigningOutput.error:type_name -> TW.Common.Proto.SigningError
-	24, // 30: TW.Binance.Proto.SendOrder.Input.coins:type_name -> TW.Binance.Proto.SendOrder.Token
-	24, // 31: TW.Binance.Proto.SendOrder.Output.coins:type_name -> TW.Binance.Proto.SendOrder.Token
+	26, // 29: TW.Binance.Proto.SigningOutput.error:type_name -> TW.Common.Proto.SigningError
+	23, // 30: TW.Binance.Proto.SendOrder.Input.coins:type_name -> TW.Binance.Proto.SendOrder.Token
+	23, // 31: TW.Binance.Proto.SendOrder.Output.coins:type_name -> TW.Binance.Proto.SendOrder.Token
 	32, // [32:32] is the sub-list for method output_type
 	32, // [32:32] is the sub-list for method input_type
 	32, // [32:32] is the sub-list for extension type_name
@@ -2875,18 +2925,6 @@ func file_Binance_proto_init() {
 			}
 		}
 		file_Binance_proto_msgTypes[23].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*Signature_PubKey); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_Binance_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SendOrder_Token); i {
 			case 0:
 				return &v.state
@@ -2898,7 +2936,7 @@ func file_Binance_proto_init() {
 				return nil
 			}
 		}
-		file_Binance_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
+		file_Binance_proto_msgTypes[24].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SendOrder_Input); i {
 			case 0:
 				return &v.state
@@ -2910,7 +2948,7 @@ func file_Binance_proto_init() {
 				return nil
 			}
 		}
-		file_Binance_proto_msgTypes[26].Exporter = func(v interface{}, i int) interface{} {
+		file_Binance_proto_msgTypes[25].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SendOrder_Output); i {
 			case 0:
 				return &v.state
@@ -2950,7 +2988,7 @@ func file_Binance_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_Binance_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   27,
+			NumMessages:   26,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/samples/go/protos/bitcoin/Bitcoin.pb.go b/samples/go/protos/bitcoin/Bitcoin.pb.go
index 88b884e6912..1758d1bd22e 100644
--- a/samples/go/protos/bitcoin/Bitcoin.pb.go
+++ b/samples/go/protos/bitcoin/Bitcoin.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.19.2
+// 	protoc-gen-go v1.28.1
+// 	protoc        v3.21.5
 // source: Bitcoin.proto
 
 package bitcoin
 
 import (
-	common "tw/protos/common"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	common "tw/protos/common"
 )
 
 const (
@@ -21,6 +21,7 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// A transaction, with its inputs and outputs
 type Transaction struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -32,7 +33,7 @@ type Transaction struct {
 	LockTime uint32 `protobuf:"varint,2,opt,name=lockTime,proto3" json:"lockTime,omitempty"`
 	// A list of 1 or more transaction inputs or sources for coins.
 	Inputs []*TransactionInput `protobuf:"bytes,3,rep,name=inputs,proto3" json:"inputs,omitempty"`
-	// A list of 1 or more transaction outputs or destinations for coins
+	// A list of 1 or more transaction outputs or destinations for coins.
 	Outputs []*TransactionOutput `protobuf:"bytes,4,rep,name=outputs,proto3" json:"outputs,omitempty"`
 }
 
@@ -169,7 +170,7 @@ type OutPoint struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// The hash of the referenced transaction.
+	// The hash of the referenced transaction (network byte order, usually needs to be reversed).
 	Hash []byte `protobuf:"bytes,1,opt,name=hash,proto3" json:"hash,omitempty"`
 	// The index of the specific output in the transaction.
 	Index uint32 `protobuf:"varint,2,opt,name=index,proto3" json:"index,omitempty"`
@@ -355,64 +356,6 @@ func (x *UnspentTransaction) GetAmount() int64 {
 	return 0
 }
 
-// Pair of destination address and amount, used for extra outputs
-type OutputAddress struct {
-	state         protoimpl.MessageState
-	sizeCache     protoimpl.SizeCache
-	unknownFields protoimpl.UnknownFields
-
-	// Destination address
-	ToAddress string `protobuf:"bytes,1,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"`
-	// Amount to be paid to this output
-	Amount int64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
-}
-
-func (x *OutputAddress) Reset() {
-	*x = OutputAddress{}
-	if protoimpl.UnsafeEnabled {
-		mi := &file_Bitcoin_proto_msgTypes[5]
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		ms.StoreMessageInfo(mi)
-	}
-}
-
-func (x *OutputAddress) String() string {
-	return protoimpl.X.MessageStringOf(x)
-}
-
-func (*OutputAddress) ProtoMessage() {}
-
-func (x *OutputAddress) ProtoReflect() protoreflect.Message {
-	mi := &file_Bitcoin_proto_msgTypes[5]
-	if protoimpl.UnsafeEnabled && x != nil {
-		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
-		if ms.LoadMessageInfo() == nil {
-			ms.StoreMessageInfo(mi)
-		}
-		return ms
-	}
-	return mi.MessageOf(x)
-}
-
-// Deprecated: Use OutputAddress.ProtoReflect.Descriptor instead.
-func (*OutputAddress) Descriptor() ([]byte, []int) {
-	return file_Bitcoin_proto_rawDescGZIP(), []int{5}
-}
-
-func (x *OutputAddress) GetToAddress() string {
-	if x != nil {
-		return x.ToAddress
-	}
-	return ""
-}
-
-func (x *OutputAddress) GetAmount() int64 {
-	if x != nil {
-		return x.Amount
-	}
-	return 0
-}
-
 // Input data necessary to create a signed transaction.
 type SigningInput struct {
 	state         protoimpl.MessageState
@@ -425,22 +368,23 @@ type SigningInput struct {
 	// except when use_max_amount is set, in that case this amount is not relevant, maximum possible amount will be used (max avail less fee).
 	// If amount is equal or more than the available amount, also max amount will be used.
 	Amount int64 `protobuf:"varint,2,opt,name=amount,proto3" json:"amount,omitempty"`
-	// Transaction fee per byte.
+	// Transaction fee rate, satoshis per byte, used to compute required fee (when planning)
 	ByteFee int64 `protobuf:"varint,3,opt,name=byte_fee,json=byteFee,proto3" json:"byte_fee,omitempty"`
-	// Recipient's address.
+	// Recipient's address, as string.
 	ToAddress string `protobuf:"bytes,4,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"`
-	// Change address.
+	// Change address, as string.
 	ChangeAddress string `protobuf:"bytes,5,opt,name=change_address,json=changeAddress,proto3" json:"change_address,omitempty"`
-	// Available private keys.
+	// The available secret private key or keys required for signing (32 bytes each).
 	PrivateKey [][]byte `protobuf:"bytes,6,rep,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"`
 	// Available redeem scripts indexed by script hash.
 	Scripts map[string][]byte `protobuf:"bytes,7,rep,name=scripts,proto3" json:"scripts,omitempty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	// Available unspent transaction outputs.
+	// Available input unspent transaction outputs.
 	Utxo []*UnspentTransaction `protobuf:"bytes,8,rep,name=utxo,proto3" json:"utxo,omitempty"`
-	// If sending max amount.
-	UseMaxAmount bool   `protobuf:"varint,9,opt,name=use_max_amount,json=useMaxAmount,proto3" json:"use_max_amount,omitempty"`
-	CoinType     uint32 `protobuf:"varint,10,opt,name=coin_type,json=coinType,proto3" json:"coin_type,omitempty"`
-	// Optional transaction plan
+	// Set if sending max amount is requested.
+	UseMaxAmount bool `protobuf:"varint,9,opt,name=use_max_amount,json=useMaxAmount,proto3" json:"use_max_amount,omitempty"`
+	// Coin type (used by forks).
+	CoinType uint32 `protobuf:"varint,10,opt,name=coin_type,json=coinType,proto3" json:"coin_type,omitempty"`
+	// Optional transaction plan. If missing, plan will be computed.
 	Plan *TransactionPlan `protobuf:"bytes,11,opt,name=plan,proto3" json:"plan,omitempty"`
 	// Optional lockTime, default value 0 means no time locking.
 	// If all inputs have final (`0xffffffff`) sequence numbers then `lockTime` is irrelevant.
@@ -450,18 +394,12 @@ type SigningInput struct {
 	LockTime uint32 `protobuf:"varint,12,opt,name=lock_time,json=lockTime,proto3" json:"lock_time,omitempty"`
 	// Optional zero-amount, OP_RETURN output
 	OutputOpReturn []byte `protobuf:"bytes,13,opt,name=output_op_return,json=outputOpReturn,proto3" json:"output_op_return,omitempty"`
-	// Optional additional destination addresses, additional to first to_address output
-	ExtraOutputs []*OutputAddress `protobuf:"bytes,14,rep,name=extra_outputs,json=extraOutputs,proto3" json:"extra_outputs,omitempty"`
-	// If use max utxo.
-	UseMaxUtxo bool `protobuf:"varint,15,opt,name=use_max_utxo,json=useMaxUtxo,proto3" json:"use_max_utxo,omitempty"`
-	// If disable dust filter.
-	DisableDustFilter bool `protobuf:"varint,16,opt,name=disable_dust_filter,json=disableDustFilter,proto3" json:"disable_dust_filter,omitempty"`
 }
 
 func (x *SigningInput) Reset() {
 	*x = SigningInput{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_Bitcoin_proto_msgTypes[6]
+		mi := &file_Bitcoin_proto_msgTypes[5]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -474,7 +412,7 @@ func (x *SigningInput) String() string {
 func (*SigningInput) ProtoMessage() {}
 
 func (x *SigningInput) ProtoReflect() protoreflect.Message {
-	mi := &file_Bitcoin_proto_msgTypes[6]
+	mi := &file_Bitcoin_proto_msgTypes[5]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -487,7 +425,7 @@ func (x *SigningInput) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SigningInput.ProtoReflect.Descriptor instead.
 func (*SigningInput) Descriptor() ([]byte, []int) {
-	return file_Bitcoin_proto_rawDescGZIP(), []int{6}
+	return file_Bitcoin_proto_rawDescGZIP(), []int{5}
 }
 
 func (x *SigningInput) GetHashType() uint32 {
@@ -581,27 +519,6 @@ func (x *SigningInput) GetOutputOpReturn() []byte {
 	return nil
 }
 
-func (x *SigningInput) GetExtraOutputs() []*OutputAddress {
-	if x != nil {
-		return x.ExtraOutputs
-	}
-	return nil
-}
-
-func (x *SigningInput) GetUseMaxUtxo() bool {
-	if x != nil {
-		return x.UseMaxUtxo
-	}
-	return false
-}
-
-func (x *SigningInput) GetDisableDustFilter() bool {
-	if x != nil {
-		return x.DisableDustFilter
-	}
-	return false
-}
-
 // Describes a preliminary transaction plan.
 type TransactionPlan struct {
 	state         protoimpl.MessageState
@@ -610,13 +527,13 @@ type TransactionPlan struct {
 
 	// Amount to be received at the other end.
 	Amount int64 `protobuf:"varint,1,opt,name=amount,proto3" json:"amount,omitempty"`
-	// Maximum available amount.
+	// Maximum available amount in all the input UTXOs.
 	AvailableAmount int64 `protobuf:"varint,2,opt,name=available_amount,json=availableAmount,proto3" json:"available_amount,omitempty"`
 	// Estimated transaction fee.
 	Fee int64 `protobuf:"varint,3,opt,name=fee,proto3" json:"fee,omitempty"`
-	// Change.
+	// Remaining change
 	Change int64 `protobuf:"varint,4,opt,name=change,proto3" json:"change,omitempty"`
-	// Selected unspent transaction outputs.
+	// Selected unspent transaction outputs (subset of all input UTXOs)
 	Utxos []*UnspentTransaction `protobuf:"bytes,5,rep,name=utxos,proto3" json:"utxos,omitempty"`
 	// Zcash branch id
 	BranchId []byte `protobuf:"bytes,6,opt,name=branch_id,json=branchId,proto3" json:"branch_id,omitempty"`
@@ -629,7 +546,7 @@ type TransactionPlan struct {
 func (x *TransactionPlan) Reset() {
 	*x = TransactionPlan{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_Bitcoin_proto_msgTypes[7]
+		mi := &file_Bitcoin_proto_msgTypes[6]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -642,7 +559,7 @@ func (x *TransactionPlan) String() string {
 func (*TransactionPlan) ProtoMessage() {}
 
 func (x *TransactionPlan) ProtoReflect() protoreflect.Message {
-	mi := &file_Bitcoin_proto_msgTypes[7]
+	mi := &file_Bitcoin_proto_msgTypes[6]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -655,7 +572,7 @@ func (x *TransactionPlan) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use TransactionPlan.ProtoReflect.Descriptor instead.
 func (*TransactionPlan) Descriptor() ([]byte, []int) {
-	return file_Bitcoin_proto_rawDescGZIP(), []int{7}
+	return file_Bitcoin_proto_rawDescGZIP(), []int{6}
 }
 
 func (x *TransactionPlan) GetAmount() int64 {
@@ -714,17 +631,18 @@ func (x *TransactionPlan) GetOutputOpReturn() []byte {
 	return nil
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
+// Note that the amount may be different than the requested amount to account for fees and available funds.
 type SigningOutput struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Resulting transaction. Note that the amount may be different than the requested amount to account for fees and available funds.
+	// Resulting transaction.
 	Transaction *Transaction `protobuf:"bytes,1,opt,name=transaction,proto3" json:"transaction,omitempty"`
 	// Signed and encoded transaction bytes.
 	Encoded []byte `protobuf:"bytes,2,opt,name=encoded,proto3" json:"encoded,omitempty"`
-	// Transaction id
+	// Transaction ID (hash)
 	TransactionId string `protobuf:"bytes,3,opt,name=transaction_id,json=transactionId,proto3" json:"transaction_id,omitempty"`
 	// Optional error
 	Error common.SigningError `protobuf:"varint,4,opt,name=error,proto3,enum=TW.Common.Proto.SigningError" json:"error,omitempty"`
@@ -735,7 +653,7 @@ type SigningOutput struct {
 func (x *SigningOutput) Reset() {
 	*x = SigningOutput{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_Bitcoin_proto_msgTypes[8]
+		mi := &file_Bitcoin_proto_msgTypes[7]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -748,7 +666,7 @@ func (x *SigningOutput) String() string {
 func (*SigningOutput) ProtoMessage() {}
 
 func (x *SigningOutput) ProtoReflect() protoreflect.Message {
-	mi := &file_Bitcoin_proto_msgTypes[8]
+	mi := &file_Bitcoin_proto_msgTypes[7]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -761,7 +679,7 @@ func (x *SigningOutput) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use SigningOutput.ProtoReflect.Descriptor instead.
 func (*SigningOutput) Descriptor() ([]byte, []int) {
-	return file_Bitcoin_proto_rawDescGZIP(), []int{8}
+	return file_Bitcoin_proto_rawDescGZIP(), []int{7}
 }
 
 func (x *SigningOutput) GetTransaction() *Transaction {
@@ -799,6 +717,7 @@ func (x *SigningOutput) GetErrorMessage() string {
 	return ""
 }
 
+/// Pre-image hash to be used for signing
 type HashPublicKey struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -813,7 +732,7 @@ type HashPublicKey struct {
 func (x *HashPublicKey) Reset() {
 	*x = HashPublicKey{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_Bitcoin_proto_msgTypes[9]
+		mi := &file_Bitcoin_proto_msgTypes[8]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -826,7 +745,7 @@ func (x *HashPublicKey) String() string {
 func (*HashPublicKey) ProtoMessage() {}
 
 func (x *HashPublicKey) ProtoReflect() protoreflect.Message {
-	mi := &file_Bitcoin_proto_msgTypes[9]
+	mi := &file_Bitcoin_proto_msgTypes[8]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -839,7 +758,7 @@ func (x *HashPublicKey) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use HashPublicKey.ProtoReflect.Descriptor instead.
 func (*HashPublicKey) Descriptor() ([]byte, []int) {
-	return file_Bitcoin_proto_rawDescGZIP(), []int{9}
+	return file_Bitcoin_proto_rawDescGZIP(), []int{8}
 }
 
 func (x *HashPublicKey) GetDataHash() []byte {
@@ -873,7 +792,7 @@ type PreSigningOutput struct {
 func (x *PreSigningOutput) Reset() {
 	*x = PreSigningOutput{}
 	if protoimpl.UnsafeEnabled {
-		mi := &file_Bitcoin_proto_msgTypes[10]
+		mi := &file_Bitcoin_proto_msgTypes[9]
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		ms.StoreMessageInfo(mi)
 	}
@@ -886,7 +805,7 @@ func (x *PreSigningOutput) String() string {
 func (*PreSigningOutput) ProtoMessage() {}
 
 func (x *PreSigningOutput) ProtoReflect() protoreflect.Message {
-	mi := &file_Bitcoin_proto_msgTypes[10]
+	mi := &file_Bitcoin_proto_msgTypes[9]
 	if protoimpl.UnsafeEnabled && x != nil {
 		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
 		if ms.LoadMessageInfo() == nil {
@@ -899,7 +818,7 @@ func (x *PreSigningOutput) ProtoReflect() protoreflect.Message {
 
 // Deprecated: Use PreSigningOutput.ProtoReflect.Descriptor instead.
 func (*PreSigningOutput) Descriptor() ([]byte, []int) {
-	return file_Bitcoin_proto_rawDescGZIP(), []int{10}
+	return file_Bitcoin_proto_rawDescGZIP(), []int{9}
 }
 
 func (x *PreSigningOutput) GetHashPublicKeys() []*HashPublicKey {
@@ -967,53 +886,39 @@ var file_Bitcoin_proto_rawDesc = []byte{
 	0x74, 0x12, 0x16, 0x0a, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
 	0x0c, 0x52, 0x06, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f,
 	0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x22, 0x46, 0x0a, 0x0d, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65,
-	0x73, 0x73, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x6f, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
-	0x73, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x22, 0xdb, 0x05, 0x0a, 0x0c, 0x53, 0x69,
-	0x67, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x68, 0x61,
-	0x73, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x68,
-	0x61, 0x73, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e,
-	0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12,
-	0x19, 0x0a, 0x08, 0x62, 0x79, 0x74, 0x65, 0x5f, 0x66, 0x65, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28,
-	0x03, 0x52, 0x07, 0x62, 0x79, 0x74, 0x65, 0x46, 0x65, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6f,
-	0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09,
-	0x74, 0x6f, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x68, 0x61,
-	0x6e, 0x67, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28,
-	0x09, 0x52, 0x0d, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
-	0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18,
-	0x06, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65,
-	0x79, 0x12, 0x45, 0x0a, 0x07, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03,
-	0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x74, 0x63, 0x6f, 0x69, 0x6e, 0x2e,
-	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70,
-	0x75, 0x74, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
-	0x07, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x73, 0x12, 0x38, 0x0a, 0x04, 0x75, 0x74, 0x78, 0x6f,
-	0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x74, 0x63,
-	0x6f, 0x69, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x55, 0x6e, 0x73, 0x70, 0x65, 0x6e,
-	0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x75, 0x74,
-	0x78, 0x6f, 0x12, 0x24, 0x0a, 0x0e, 0x75, 0x73, 0x65, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x6d,
-	0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x75, 0x73, 0x65, 0x4d,
-	0x61, 0x78, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x63, 0x6f, 0x69, 0x6e,
-	0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6f, 0x69,
-	0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x35, 0x0a, 0x04, 0x70, 0x6c, 0x61, 0x6e, 0x18, 0x0b, 0x20,
-	0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x74, 0x63, 0x6f, 0x69, 0x6e,
-	0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69,
-	0x6f, 0x6e, 0x50, 0x6c, 0x61, 0x6e, 0x52, 0x04, 0x70, 0x6c, 0x61, 0x6e, 0x12, 0x1b, 0x0a, 0x09,
-	0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x52,
-	0x08, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x28, 0x0a, 0x10, 0x6f, 0x75, 0x74,
-	0x70, 0x75, 0x74, 0x5f, 0x6f, 0x70, 0x5f, 0x72, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x18, 0x0d, 0x20,
-	0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x4f, 0x70, 0x52, 0x65, 0x74,
-	0x75, 0x72, 0x6e, 0x12, 0x44, 0x0a, 0x0d, 0x65, 0x78, 0x74, 0x72, 0x61, 0x5f, 0x6f, 0x75, 0x74,
-	0x70, 0x75, 0x74, 0x73, 0x18, 0x0e, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1f, 0x2e, 0x54, 0x57, 0x2e,
-	0x42, 0x69, 0x74, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x4f, 0x75,
-	0x74, 0x70, 0x75, 0x74, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x52, 0x0c, 0x65, 0x78, 0x74,
-	0x72, 0x61, 0x4f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x73, 0x12, 0x20, 0x0a, 0x0c, 0x75, 0x73, 0x65,
-	0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x75, 0x74, 0x78, 0x6f, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x08, 0x52,
-	0x0a, 0x75, 0x73, 0x65, 0x4d, 0x61, 0x78, 0x55, 0x74, 0x78, 0x6f, 0x12, 0x2e, 0x0a, 0x13, 0x64,
-	0x69, 0x73, 0x61, 0x62, 0x6c, 0x65, 0x5f, 0x64, 0x75, 0x73, 0x74, 0x5f, 0x66, 0x69, 0x6c, 0x74,
-	0x65, 0x72, 0x18, 0x10, 0x20, 0x01, 0x28, 0x08, 0x52, 0x11, 0x64, 0x69, 0x73, 0x61, 0x62, 0x6c,
-	0x65, 0x44, 0x75, 0x73, 0x74, 0x46, 0x69, 0x6c, 0x74, 0x65, 0x72, 0x1a, 0x3a, 0x0a, 0x0c, 0x53,
+	0x74, 0x22, 0xc3, 0x04, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70,
+	0x75, 0x74, 0x12, 0x1b, 0x0a, 0x09, 0x68, 0x61, 0x73, 0x68, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18,
+	0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x68, 0x61, 0x73, 0x68, 0x54, 0x79, 0x70, 0x65, 0x12,
+	0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52,
+	0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x19, 0x0a, 0x08, 0x62, 0x79, 0x74, 0x65, 0x5f,
+	0x66, 0x65, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x62, 0x79, 0x74, 0x65, 0x46,
+	0x65, 0x65, 0x12, 0x1d, 0x0a, 0x0a, 0x74, 0x6f, 0x5f, 0x61, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73,
+	0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x09, 0x74, 0x6f, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73,
+	0x73, 0x12, 0x25, 0x0a, 0x0e, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x5f, 0x61, 0x64, 0x64, 0x72,
+	0x65, 0x73, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x63, 0x68, 0x61, 0x6e, 0x67,
+	0x65, 0x41, 0x64, 0x64, 0x72, 0x65, 0x73, 0x73, 0x12, 0x1f, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76,
+	0x61, 0x74, 0x65, 0x5f, 0x6b, 0x65, 0x79, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0a, 0x70,
+	0x72, 0x69, 0x76, 0x61, 0x74, 0x65, 0x4b, 0x65, 0x79, 0x12, 0x45, 0x0a, 0x07, 0x73, 0x63, 0x72,
+	0x69, 0x70, 0x74, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x2b, 0x2e, 0x54, 0x57, 0x2e,
+	0x42, 0x69, 0x74, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69,
+	0x67, 0x6e, 0x69, 0x6e, 0x67, 0x49, 0x6e, 0x70, 0x75, 0x74, 0x2e, 0x53, 0x63, 0x72, 0x69, 0x70,
+	0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x73, 0x63, 0x72, 0x69, 0x70, 0x74, 0x73,
+	0x12, 0x38, 0x0a, 0x04, 0x75, 0x74, 0x78, 0x6f, 0x18, 0x08, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x24,
+	0x2e, 0x54, 0x57, 0x2e, 0x42, 0x69, 0x74, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74,
+	0x6f, 0x2e, 0x55, 0x6e, 0x73, 0x70, 0x65, 0x6e, 0x74, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x61, 0x63,
+	0x74, 0x69, 0x6f, 0x6e, 0x52, 0x04, 0x75, 0x74, 0x78, 0x6f, 0x12, 0x24, 0x0a, 0x0e, 0x75, 0x73,
+	0x65, 0x5f, 0x6d, 0x61, 0x78, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01,
+	0x28, 0x08, 0x52, 0x0c, 0x75, 0x73, 0x65, 0x4d, 0x61, 0x78, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74,
+	0x12, 0x1b, 0x0a, 0x09, 0x63, 0x6f, 0x69, 0x6e, 0x5f, 0x74, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20,
+	0x01, 0x28, 0x0d, 0x52, 0x08, 0x63, 0x6f, 0x69, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x35, 0x0a,
+	0x04, 0x70, 0x6c, 0x61, 0x6e, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x21, 0x2e, 0x54, 0x57,
+	0x2e, 0x42, 0x69, 0x74, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x54,
+	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x50, 0x6c, 0x61, 0x6e, 0x52, 0x04,
+	0x70, 0x6c, 0x61, 0x6e, 0x12, 0x1b, 0x0a, 0x09, 0x6c, 0x6f, 0x63, 0x6b, 0x5f, 0x74, 0x69, 0x6d,
+	0x65, 0x18, 0x0c, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x6c, 0x6f, 0x63, 0x6b, 0x54, 0x69, 0x6d,
+	0x65, 0x12, 0x28, 0x0a, 0x10, 0x6f, 0x75, 0x74, 0x70, 0x75, 0x74, 0x5f, 0x6f, 0x70, 0x5f, 0x72,
+	0x65, 0x74, 0x75, 0x72, 0x6e, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0e, 0x6f, 0x75, 0x74,
+	0x70, 0x75, 0x74, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x75, 0x72, 0x6e, 0x1a, 0x3a, 0x0a, 0x0c, 0x53,
 	0x63, 0x72, 0x69, 0x70, 0x74, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
 	0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
 	0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x61,
@@ -1068,13 +973,9 @@ var file_Bitcoin_proto_rawDesc = []byte{
 	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x45, 0x72, 0x72,
 	0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72,
 	0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x58,
+	0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x17,
 	0x0a, 0x15, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x6a, 0x6e,
-	0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x3f, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2d, 0x63, 0x68, 0x61, 0x69,
-	0x6e, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x75,
-	0x74, 0x78, 0x6f, 0x5f, 0x63, 0x6f, 0x69, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -1089,42 +990,40 @@ func file_Bitcoin_proto_rawDescGZIP() []byte {
 	return file_Bitcoin_proto_rawDescData
 }
 
-var file_Bitcoin_proto_msgTypes = make([]protoimpl.MessageInfo, 12)
+var file_Bitcoin_proto_msgTypes = make([]protoimpl.MessageInfo, 11)
 var file_Bitcoin_proto_goTypes = []interface{}{
 	(*Transaction)(nil),        // 0: TW.Bitcoin.Proto.Transaction
 	(*TransactionInput)(nil),   // 1: TW.Bitcoin.Proto.TransactionInput
 	(*OutPoint)(nil),           // 2: TW.Bitcoin.Proto.OutPoint
 	(*TransactionOutput)(nil),  // 3: TW.Bitcoin.Proto.TransactionOutput
 	(*UnspentTransaction)(nil), // 4: TW.Bitcoin.Proto.UnspentTransaction
-	(*OutputAddress)(nil),      // 5: TW.Bitcoin.Proto.OutputAddress
-	(*SigningInput)(nil),       // 6: TW.Bitcoin.Proto.SigningInput
-	(*TransactionPlan)(nil),    // 7: TW.Bitcoin.Proto.TransactionPlan
-	(*SigningOutput)(nil),      // 8: TW.Bitcoin.Proto.SigningOutput
-	(*HashPublicKey)(nil),      // 9: TW.Bitcoin.Proto.HashPublicKey
-	(*PreSigningOutput)(nil),   // 10: TW.Bitcoin.Proto.PreSigningOutput
-	nil,                        // 11: TW.Bitcoin.Proto.SigningInput.ScriptsEntry
-	(common.SigningError)(0),   // 12: TW.Common.Proto.SigningError
+	(*SigningInput)(nil),       // 5: TW.Bitcoin.Proto.SigningInput
+	(*TransactionPlan)(nil),    // 6: TW.Bitcoin.Proto.TransactionPlan
+	(*SigningOutput)(nil),      // 7: TW.Bitcoin.Proto.SigningOutput
+	(*HashPublicKey)(nil),      // 8: TW.Bitcoin.Proto.HashPublicKey
+	(*PreSigningOutput)(nil),   // 9: TW.Bitcoin.Proto.PreSigningOutput
+	nil,                        // 10: TW.Bitcoin.Proto.SigningInput.ScriptsEntry
+	(common.SigningError)(0),   // 11: TW.Common.Proto.SigningError
 }
 var file_Bitcoin_proto_depIdxs = []int32{
 	1,  // 0: TW.Bitcoin.Proto.Transaction.inputs:type_name -> TW.Bitcoin.Proto.TransactionInput
 	3,  // 1: TW.Bitcoin.Proto.Transaction.outputs:type_name -> TW.Bitcoin.Proto.TransactionOutput
 	2,  // 2: TW.Bitcoin.Proto.TransactionInput.previousOutput:type_name -> TW.Bitcoin.Proto.OutPoint
 	2,  // 3: TW.Bitcoin.Proto.UnspentTransaction.out_point:type_name -> TW.Bitcoin.Proto.OutPoint
-	11, // 4: TW.Bitcoin.Proto.SigningInput.scripts:type_name -> TW.Bitcoin.Proto.SigningInput.ScriptsEntry
+	10, // 4: TW.Bitcoin.Proto.SigningInput.scripts:type_name -> TW.Bitcoin.Proto.SigningInput.ScriptsEntry
 	4,  // 5: TW.Bitcoin.Proto.SigningInput.utxo:type_name -> TW.Bitcoin.Proto.UnspentTransaction
-	7,  // 6: TW.Bitcoin.Proto.SigningInput.plan:type_name -> TW.Bitcoin.Proto.TransactionPlan
-	5,  // 7: TW.Bitcoin.Proto.SigningInput.extra_outputs:type_name -> TW.Bitcoin.Proto.OutputAddress
-	4,  // 8: TW.Bitcoin.Proto.TransactionPlan.utxos:type_name -> TW.Bitcoin.Proto.UnspentTransaction
-	12, // 9: TW.Bitcoin.Proto.TransactionPlan.error:type_name -> TW.Common.Proto.SigningError
-	0,  // 10: TW.Bitcoin.Proto.SigningOutput.transaction:type_name -> TW.Bitcoin.Proto.Transaction
-	12, // 11: TW.Bitcoin.Proto.SigningOutput.error:type_name -> TW.Common.Proto.SigningError
-	9,  // 12: TW.Bitcoin.Proto.PreSigningOutput.hash_public_keys:type_name -> TW.Bitcoin.Proto.HashPublicKey
-	12, // 13: TW.Bitcoin.Proto.PreSigningOutput.error:type_name -> TW.Common.Proto.SigningError
-	14, // [14:14] is the sub-list for method output_type
-	14, // [14:14] is the sub-list for method input_type
-	14, // [14:14] is the sub-list for extension type_name
-	14, // [14:14] is the sub-list for extension extendee
-	0,  // [0:14] is the sub-list for field type_name
+	6,  // 6: TW.Bitcoin.Proto.SigningInput.plan:type_name -> TW.Bitcoin.Proto.TransactionPlan
+	4,  // 7: TW.Bitcoin.Proto.TransactionPlan.utxos:type_name -> TW.Bitcoin.Proto.UnspentTransaction
+	11, // 8: TW.Bitcoin.Proto.TransactionPlan.error:type_name -> TW.Common.Proto.SigningError
+	0,  // 9: TW.Bitcoin.Proto.SigningOutput.transaction:type_name -> TW.Bitcoin.Proto.Transaction
+	11, // 10: TW.Bitcoin.Proto.SigningOutput.error:type_name -> TW.Common.Proto.SigningError
+	8,  // 11: TW.Bitcoin.Proto.PreSigningOutput.hash_public_keys:type_name -> TW.Bitcoin.Proto.HashPublicKey
+	11, // 12: TW.Bitcoin.Proto.PreSigningOutput.error:type_name -> TW.Common.Proto.SigningError
+	13, // [13:13] is the sub-list for method output_type
+	13, // [13:13] is the sub-list for method input_type
+	13, // [13:13] is the sub-list for extension type_name
+	13, // [13:13] is the sub-list for extension extendee
+	0,  // [0:13] is the sub-list for field type_name
 }
 
 func init() { file_Bitcoin_proto_init() }
@@ -1194,18 +1093,6 @@ func file_Bitcoin_proto_init() {
 			}
 		}
 		file_Bitcoin_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} {
-			switch v := v.(*OutputAddress); i {
-			case 0:
-				return &v.state
-			case 1:
-				return &v.sizeCache
-			case 2:
-				return &v.unknownFields
-			default:
-				return nil
-			}
-		}
-		file_Bitcoin_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SigningInput); i {
 			case 0:
 				return &v.state
@@ -1217,7 +1104,7 @@ func file_Bitcoin_proto_init() {
 				return nil
 			}
 		}
-		file_Bitcoin_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+		file_Bitcoin_proto_msgTypes[6].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*TransactionPlan); i {
 			case 0:
 				return &v.state
@@ -1229,7 +1116,7 @@ func file_Bitcoin_proto_init() {
 				return nil
 			}
 		}
-		file_Bitcoin_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
+		file_Bitcoin_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*SigningOutput); i {
 			case 0:
 				return &v.state
@@ -1241,7 +1128,7 @@ func file_Bitcoin_proto_init() {
 				return nil
 			}
 		}
-		file_Bitcoin_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
+		file_Bitcoin_proto_msgTypes[8].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*HashPublicKey); i {
 			case 0:
 				return &v.state
@@ -1253,7 +1140,7 @@ func file_Bitcoin_proto_init() {
 				return nil
 			}
 		}
-		file_Bitcoin_proto_msgTypes[10].Exporter = func(v interface{}, i int) interface{} {
+		file_Bitcoin_proto_msgTypes[9].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PreSigningOutput); i {
 			case 0:
 				return &v.state
@@ -1272,7 +1159,7 @@ func file_Bitcoin_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_Bitcoin_proto_rawDesc,
 			NumEnums:      0,
-			NumMessages:   12,
+			NumMessages:   11,
 			NumExtensions: 0,
 			NumServices:   0,
 		},
diff --git a/samples/go/protos/common/Common.pb.go b/samples/go/protos/common/Common.pb.go
index bc50f992214..ddf4fd142cc 100644
--- a/samples/go/protos/common/Common.pb.go
+++ b/samples/go/protos/common/Common.pb.go
@@ -1,7 +1,7 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.19.2
+// 	protoc-gen-go v1.28.1
+// 	protoc        v3.21.5
 // source: Common.proto
 
 package common
@@ -20,38 +20,65 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// Error codes, used in multiple blockchains.
 type SigningError int32
 
 const (
-	SigningError_OK SigningError = 0 // OK
-	// chain-generic, generic
-	SigningError_Error_general  SigningError = 1
+	// This is the OK case, with value=0
+	SigningError_OK SigningError = 0
+	// Chain-generic codes:
+	// Generic error (used if there is no suitable specific error is adequate)
+	SigningError_Error_general SigningError = 1
+	// Internal error, indicates some very unusual, unexpected case
 	SigningError_Error_internal SigningError = 2
-	// chain-generic, input
-	SigningError_Error_low_balance           SigningError = 3
-	SigningError_Error_zero_amount_requested SigningError = 4 // Requested amount is zero
-	SigningError_Error_missing_private_key   SigningError = 5
-	SigningError_Error_invalid_private_key   SigningError = 15
-	SigningError_Error_invalid_address       SigningError = 16
-	SigningError_Error_invalid_utxo          SigningError = 17
-	SigningError_Error_invalid_utxo_amount   SigningError = 18
-	// chain-generic, fee
+	// Chain-generic codes, input related:
+	// Low balance: the sender balance is not enough to cover the send and other auxiliary amount such as fee, deposit, or minimal balance.
+	SigningError_Error_low_balance SigningError = 3
+	// Requested amount is zero, send of 0 makes no sense
+	SigningError_Error_zero_amount_requested SigningError = 4
+	// One required key is missing (too few or wrong keys are provided)
+	SigningError_Error_missing_private_key SigningError = 5
+	// A private key provided is invalid (e.g. wrong size, usually should be 32 bytes)
+	SigningError_Error_invalid_private_key SigningError = 15
+	// A provided address (e.g. destination address) is invalid
+	SigningError_Error_invalid_address SigningError = 16
+	// A provided input UTXO is invalid
+	SigningError_Error_invalid_utxo SigningError = 17
+	// The amount of an input UTXO is invalid
+	SigningError_Error_invalid_utxo_amount SigningError = 18
+	// Chain-generic, fee related:
+	// Wrong fee is given, probably it is too low to cover minimal fee for the transaction
 	SigningError_Error_wrong_fee SigningError = 6
-	// chain-generic, signing
-	SigningError_Error_signing    SigningError = 7
-	SigningError_Error_tx_too_big SigningError = 8 // [NEO] Transaction too big, fee in GAS needed or try send by parts
-	// UTXO-chain specific, inputs
-	SigningError_Error_missing_input_utxos SigningError = 9  // No UTXOs provided [BTC]
-	SigningError_Error_not_enough_utxos    SigningError = 10 // Not enough non-dust input UTXOs to cover requested amount (dust UTXOs are filtered out) [BTC]
-	// UTXO-chain specific, script
-	SigningError_Error_script_redeem          SigningError = 11 // [BTC] Missing redeem script
-	SigningError_Error_script_output          SigningError = 12 // [BTC] Invalid output script
-	SigningError_Error_script_witness_program SigningError = 13 // [BTC] Unrecognized witness program
-	SigningError_Error_invalid_memo           SigningError = 14 // e.g. [XRP] Invalid tag
-	SigningError_Error_input_parse            SigningError = 19 // e.g. Invalid input data
-	SigningError_Error_no_support_n2n         SigningError = 20 // e.g. Not support n2n transaction
-	SigningError_Error_signatures_count       SigningError = 21 // Incorrect count of signatures passed to compile
-	SigningError_Error_invalid_params         SigningError = 22 // Incorrect parameters
+	// Chain-generic, signing related:
+	// General signing error
+	SigningError_Error_signing SigningError = 7
+	// Resulting transaction is too large
+	// [NEO] Transaction too big, fee in GAS needed or try send by parts
+	SigningError_Error_tx_too_big SigningError = 8
+	// UTXO-chain specific, input related:
+	// No input UTXOs provided [BTC]
+	SigningError_Error_missing_input_utxos SigningError = 9
+	// Not enough non-dust input UTXOs to cover requested amount (dust UTXOs are filtered out) [BTC]
+	SigningError_Error_not_enough_utxos SigningError = 10
+	// UTXO-chain specific, script related:
+	// [BTC] Missing required redeem script
+	SigningError_Error_script_redeem SigningError = 11
+	// [BTC] Invalid required output script
+	SigningError_Error_script_output SigningError = 12
+	// [BTC] Unrecognized witness program
+	SigningError_Error_script_witness_program SigningError = 13
+	// Invalid memo, e.g. [XRP] Invalid tag
+	SigningError_Error_invalid_memo SigningError = 14
+	// Some input field cannot be parsed
+	SigningError_Error_input_parse SigningError = 19
+	// Multi-input and multi-output transaction not supported
+	SigningError_Error_no_support_n2n SigningError = 20
+	// Incorrect count of signatures passed to compile
+	SigningError_Error_signatures_count SigningError = 21
+	// Incorrect input parameter
+	SigningError_Error_invalid_params SigningError = 22
+	// Invalid input token amount
+	SigningError_Error_invalid_requested_token_amount SigningError = 23
 )
 
 // Enum value maps for SigningError.
@@ -80,31 +107,33 @@ var (
 		20: "Error_no_support_n2n",
 		21: "Error_signatures_count",
 		22: "Error_invalid_params",
+		23: "Error_invalid_requested_token_amount",
 	}
 	SigningError_value = map[string]int32{
-		"OK":                           0,
-		"Error_general":                1,
-		"Error_internal":               2,
-		"Error_low_balance":            3,
-		"Error_zero_amount_requested":  4,
-		"Error_missing_private_key":    5,
-		"Error_invalid_private_key":    15,
-		"Error_invalid_address":        16,
-		"Error_invalid_utxo":           17,
-		"Error_invalid_utxo_amount":    18,
-		"Error_wrong_fee":              6,
-		"Error_signing":                7,
-		"Error_tx_too_big":             8,
-		"Error_missing_input_utxos":    9,
-		"Error_not_enough_utxos":       10,
-		"Error_script_redeem":          11,
-		"Error_script_output":          12,
-		"Error_script_witness_program": 13,
-		"Error_invalid_memo":           14,
-		"Error_input_parse":            19,
-		"Error_no_support_n2n":         20,
-		"Error_signatures_count":       21,
-		"Error_invalid_params":         22,
+		"OK":                                   0,
+		"Error_general":                        1,
+		"Error_internal":                       2,
+		"Error_low_balance":                    3,
+		"Error_zero_amount_requested":          4,
+		"Error_missing_private_key":            5,
+		"Error_invalid_private_key":            15,
+		"Error_invalid_address":                16,
+		"Error_invalid_utxo":                   17,
+		"Error_invalid_utxo_amount":            18,
+		"Error_wrong_fee":                      6,
+		"Error_signing":                        7,
+		"Error_tx_too_big":                     8,
+		"Error_missing_input_utxos":            9,
+		"Error_not_enough_utxos":               10,
+		"Error_script_redeem":                  11,
+		"Error_script_output":                  12,
+		"Error_script_witness_program":         13,
+		"Error_invalid_memo":                   14,
+		"Error_input_parse":                    19,
+		"Error_no_support_n2n":                 20,
+		"Error_signatures_count":               21,
+		"Error_invalid_params":                 22,
+		"Error_invalid_requested_token_amount": 23,
 	}
 )
 
@@ -140,7 +169,7 @@ var File_Common_proto protoreflect.FileDescriptor
 var file_Common_proto_rawDesc = []byte{
 	0x0a, 0x0c, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x0f,
 	0x54, 0x57, 0x2e, 0x43, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2a,
-	0xd1, 0x04, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x45, 0x72, 0x72, 0x6f, 0x72,
+	0xfb, 0x04, 0x0a, 0x0c, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x45, 0x72, 0x72, 0x6f, 0x72,
 	0x12, 0x06, 0x0a, 0x02, 0x4f, 0x4b, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x45, 0x72, 0x72, 0x6f,
 	0x72, 0x5f, 0x67, 0x65, 0x6e, 0x65, 0x72, 0x61, 0x6c, 0x10, 0x01, 0x12, 0x12, 0x0a, 0x0e, 0x45,
 	0x72, 0x72, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x74, 0x65, 0x72, 0x6e, 0x61, 0x6c, 0x10, 0x02, 0x12,
@@ -177,13 +206,11 @@ var file_Common_proto_rawDesc = []byte{
 	0x16, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x73, 0x69, 0x67, 0x6e, 0x61, 0x74, 0x75, 0x72, 0x65,
 	0x73, 0x5f, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x15, 0x12, 0x18, 0x0a, 0x14, 0x45, 0x72, 0x72,
 	0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x5f, 0x70, 0x61, 0x72, 0x61, 0x6d,
-	0x73, 0x10, 0x16, 0x42, 0x55, 0x0a, 0x15, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2e, 0x63, 0x6f,
-	0x72, 0x65, 0x2e, 0x6a, 0x6e, 0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x3c, 0x67, 0x69,
-	0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65,
-	0x2d, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2d, 0x69, 0x6e, 0x74,
-	0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x63, 0x68,
-	0x61, 0x69, 0x6e, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74,
-	0x6f, 0x33,
+	0x73, 0x10, 0x16, 0x12, 0x28, 0x0a, 0x24, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x5f, 0x69, 0x6e, 0x76,
+	0x61, 0x6c, 0x69, 0x64, 0x5f, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x65, 0x64, 0x5f, 0x74,
+	0x6f, 0x6b, 0x65, 0x6e, 0x5f, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x10, 0x17, 0x42, 0x17, 0x0a,
+	0x15, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x6a, 0x6e, 0x69,
+	0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/samples/go/protos/ethereum/Ethereum.pb.go b/samples/go/protos/ethereum/Ethereum.pb.go
index 14707736bce..ef2cad5cac3 100644
--- a/samples/go/protos/ethereum/Ethereum.pb.go
+++ b/samples/go/protos/ethereum/Ethereum.pb.go
@@ -1,17 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.19.2
+// 	protoc-gen-go v1.28.1
+// 	protoc        v3.21.5
 // source: Ethereum.proto
 
 package ethereum
 
 import (
-	common "tw/protos/common"
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	common "tw/protos/common"
 )
 
 const (
@@ -21,11 +21,14 @@ const (
 	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
 )
 
+// Transaction type
 type TransactionMode int32
 
 const (
-	TransactionMode_Legacy    TransactionMode = 0 // Legacy transaction, pre-EIP2718/EIP1559; for fee gasPrice/gasLimit is used
-	TransactionMode_Enveloped TransactionMode = 1 // Enveloped transaction EIP2718 (with type 0x2), fee is according to EIP1559 (base fee, inclusion fee, ...)
+	// Legacy transaction, pre-EIP2718/EIP1559; for fee gasPrice/gasLimit is used
+	TransactionMode_Legacy TransactionMode = 0
+	// Enveloped transaction EIP2718 (with type 0x2), fee is according to EIP1559 (base fee, inclusion fee, ...)
+	TransactionMode_Enveloped TransactionMode = 1
 )
 
 // Enum value maps for TransactionMode.
@@ -73,6 +76,8 @@ type Transaction struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
+	// Payload transfer
+	//
 	// Types that are assignable to TransactionOneof:
 	//	*Transaction_Transfer_
 	//	*Transaction_Erc20Transfer
@@ -211,28 +216,29 @@ type SigningInput struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Chain identifier (256-bit number)
+	// Chain identifier (uint256, serialized little endian)
 	ChainId []byte `protobuf:"bytes,1,opt,name=chain_id,json=chainId,proto3" json:"chain_id,omitempty"`
-	// Nonce (256-bit number)
+	// Nonce (uint256, serialized little endian)
 	Nonce []byte `protobuf:"bytes,2,opt,name=nonce,proto3" json:"nonce,omitempty"`
 	// Transaction version selector: Legacy or enveloped, has impact on fee structure.
 	// Default is Legacy (value 0)
 	TxMode TransactionMode `protobuf:"varint,3,opt,name=tx_mode,json=txMode,proto3,enum=TW.Ethereum.Proto.TransactionMode" json:"tx_mode,omitempty"`
-	// Gas price (256-bit number)
+	// Gas price (uint256, serialized little endian)
 	// Relevant for legacy transactions only (disregarded for enveloped/EIP1559)
 	GasPrice []byte `protobuf:"bytes,4,opt,name=gas_price,json=gasPrice,proto3" json:"gas_price,omitempty"`
-	// Gas limit (256-bit number)
+	// Gas limit (uint256, serialized little endian)
 	GasLimit []byte `protobuf:"bytes,5,opt,name=gas_limit,json=gasLimit,proto3" json:"gas_limit,omitempty"`
-	// Maxinmum optional inclusion fee (aka tip) (256-bit number)
+	// Maximum optional inclusion fee (aka tip) (uint256, serialized little endian)
 	// Relevant for enveloped/EIP1559 transactions only, tx_mode=Enveloped, (disregarded for legacy)
 	MaxInclusionFeePerGas []byte `protobuf:"bytes,6,opt,name=max_inclusion_fee_per_gas,json=maxInclusionFeePerGas,proto3" json:"max_inclusion_fee_per_gas,omitempty"`
-	// Maxinmum fee (256-bit number)
+	// Maximum fee (uint256, serialized little endian)
 	// Relevant for enveloped/EIP1559 transactions only, tx_mode=Enveloped, (disregarded for legacy)
 	MaxFeePerGas []byte `protobuf:"bytes,7,opt,name=max_fee_per_gas,json=maxFeePerGas,proto3" json:"max_fee_per_gas,omitempty"`
 	// Recipient's address.
 	ToAddress string `protobuf:"bytes,8,opt,name=to_address,json=toAddress,proto3" json:"to_address,omitempty"`
-	// Private key.
-	PrivateKey  []byte       `protobuf:"bytes,9,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"`
+	// The secret private key used for signing (32 bytes).
+	PrivateKey []byte `protobuf:"bytes,9,opt,name=private_key,json=privateKey,proto3" json:"private_key,omitempty"`
+	// The payload transaction
 	Transaction *Transaction `protobuf:"bytes,10,opt,name=transaction,proto3" json:"transaction,omitempty"`
 }
 
@@ -338,7 +344,7 @@ func (x *SigningInput) GetTransaction() *Transaction {
 	return nil
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 type SigningOutput struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -346,14 +352,15 @@ type SigningOutput struct {
 
 	// Signed and encoded transaction bytes.
 	Encoded []byte `protobuf:"bytes,1,opt,name=encoded,proto3" json:"encoded,omitempty"`
-	V       []byte `protobuf:"bytes,2,opt,name=v,proto3" json:"v,omitempty"`
-	R       []byte `protobuf:"bytes,3,opt,name=r,proto3" json:"r,omitempty"`
-	S       []byte `protobuf:"bytes,4,opt,name=s,proto3" json:"s,omitempty"`
+	// The V, R, S components of the resulting signature, (each uint256, serialized little endian)
+	V []byte `protobuf:"bytes,2,opt,name=v,proto3" json:"v,omitempty"`
+	R []byte `protobuf:"bytes,3,opt,name=r,proto3" json:"r,omitempty"`
+	S []byte `protobuf:"bytes,4,opt,name=s,proto3" json:"s,omitempty"`
 	// The payload part, supplied in the input or assembled from input parameters
 	Data []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
-	/// error code, 0 is ok, other codes will be treated as errors
+	// error code, 0 is ok, other codes will be treated as errors
 	Error common.SigningError `protobuf:"varint,6,opt,name=error,proto3,enum=TW.Common.Proto.SigningError" json:"error,omitempty"`
-	/// error code description
+	// error code description
 	ErrorMessage string `protobuf:"bytes,7,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
 }
 
@@ -444,7 +451,7 @@ type Transaction_Transfer struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Amount to send in wei (256-bit number)
+	// Amount to send in wei (uint256, serialized little endian)
 	Amount []byte `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"`
 	// Optional payload data
 	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
@@ -502,8 +509,9 @@ type Transaction_ERC20Transfer struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
+	// destination address (string)
 	To string `protobuf:"bytes,1,opt,name=to,proto3" json:"to,omitempty"`
-	// Amount to send (256-bit number)
+	// Amount to send (uint256, serialized little endian)
 	Amount []byte `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount,omitempty"`
 }
 
@@ -559,8 +567,9 @@ type Transaction_ERC20Approve struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
+	// Target of the approval
 	Spender string `protobuf:"bytes,1,opt,name=spender,proto3" json:"spender,omitempty"`
-	// Amount to send (256-bit number)
+	// Amount to send (uint256, serialized little endian)
 	Amount []byte `protobuf:"bytes,2,opt,name=amount,proto3" json:"amount,omitempty"`
 }
 
@@ -616,9 +625,11 @@ type Transaction_ERC721Transfer struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
+	// Source address
 	From string `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
-	To   string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`
-	// ID of the token (256-bit number)
+	// Destination address
+	To string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`
+	// ID of the token (uint256, serialized little endian)
 	TokenId []byte `protobuf:"bytes,3,opt,name=token_id,json=tokenId,proto3" json:"token_id,omitempty"`
 }
 
@@ -681,11 +692,13 @@ type Transaction_ERC1155Transfer struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
+	// Source address
 	From string `protobuf:"bytes,1,opt,name=from,proto3" json:"from,omitempty"`
-	To   string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`
-	// ID of the token (256-bit number)
+	// Destination address
+	To string `protobuf:"bytes,2,opt,name=to,proto3" json:"to,omitempty"`
+	// ID of the token (uint256, serialized little endian)
 	TokenId []byte `protobuf:"bytes,3,opt,name=token_id,json=tokenId,proto3" json:"token_id,omitempty"`
-	// The amount of tokens being transferred
+	// The amount of tokens being transferred (uint256, serialized little endian)
 	Value []byte `protobuf:"bytes,4,opt,name=value,proto3" json:"value,omitempty"`
 	Data  []byte `protobuf:"bytes,5,opt,name=data,proto3" json:"data,omitempty"`
 }
@@ -763,7 +776,7 @@ type Transaction_ContractGeneric struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	// Amount to send in wei (256-bit number)
+	// Amount to send in wei (uint256, serialized little endian)
 	Amount []byte `protobuf:"bytes,1,opt,name=amount,proto3" json:"amount,omitempty"`
 	// Contract call payload data
 	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
@@ -924,13 +937,9 @@ var file_Ethereum_proto_rawDesc = []byte{
 	0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x2a, 0x2c, 0x0a, 0x0f, 0x54,
 	0x72, 0x61, 0x6e, 0x73, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x0a,
 	0x0a, 0x06, 0x4c, 0x65, 0x67, 0x61, 0x63, 0x79, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x45, 0x6e,
-	0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x64, 0x10, 0x01, 0x42, 0x57, 0x0a, 0x15, 0x77, 0x61, 0x6c,
+	0x76, 0x65, 0x6c, 0x6f, 0x70, 0x65, 0x64, 0x10, 0x01, 0x42, 0x17, 0x0a, 0x15, 0x77, 0x61, 0x6c,
 	0x6c, 0x65, 0x74, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x6a, 0x6e, 0x69, 0x2e, 0x70, 0x72, 0x6f,
-	0x74, 0x6f, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x62,
-	0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2d, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x63, 0x68, 0x61,
-	0x69, 0x6e, 0x2d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x2f, 0x62,
-	0x6c, 0x6f, 0x63, 0x6b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x65, 0x74, 0x68, 0x65, 0x72, 0x65,
-	0x75, 0x6d, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
diff --git a/samples/go/protos/common/TransactionCompiler.pb.go b/samples/go/protos/transactioncompiler/TransactionCompiler.pb.go
similarity index 87%
rename from samples/go/protos/common/TransactionCompiler.pb.go
rename to samples/go/protos/transactioncompiler/TransactionCompiler.pb.go
index 8baf5d4f998..d71cf247ce1 100644
--- a/samples/go/protos/common/TransactionCompiler.pb.go
+++ b/samples/go/protos/transactioncompiler/TransactionCompiler.pb.go
@@ -1,16 +1,17 @@
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.28.0
-// 	protoc        v3.19.2
+// 	protoc-gen-go v1.28.1
+// 	protoc        v3.21.5
 // source: TransactionCompiler.proto
 
-package common
+package transactioncompiler
 
 import (
 	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
 	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
 	reflect "reflect"
 	sync "sync"
+	common "tw/protos/common"
 )
 
 const (
@@ -31,7 +32,7 @@ type PreSigningOutput struct {
 	/// Pre-image data
 	Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
 	/// error code, 0 is ok, other codes will be treated as errors
-	Error SigningError `protobuf:"varint,3,opt,name=error,proto3,enum=TW.Common.Proto.SigningError" json:"error,omitempty"`
+	Error common.SigningError `protobuf:"varint,3,opt,name=error,proto3,enum=TW.Common.Proto.SigningError" json:"error,omitempty"`
 	/// error code description
 	ErrorMessage string `protobuf:"bytes,4,opt,name=error_message,json=errorMessage,proto3" json:"error_message,omitempty"`
 }
@@ -82,11 +83,11 @@ func (x *PreSigningOutput) GetData() []byte {
 	return nil
 }
 
-func (x *PreSigningOutput) GetError() SigningError {
+func (x *PreSigningOutput) GetError() common.SigningError {
 	if x != nil {
 		return x.Error
 	}
-	return SigningError_OK
+	return common.SigningError(0)
 }
 
 func (x *PreSigningOutput) GetErrorMessage() string {
@@ -112,13 +113,9 @@ var file_TransactionCompiler_proto_rawDesc = []byte{
 	0x50, 0x72, 0x6f, 0x74, 0x6f, 0x2e, 0x53, 0x69, 0x67, 0x6e, 0x69, 0x6e, 0x67, 0x45, 0x72, 0x72,
 	0x6f, 0x72, 0x52, 0x05, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x12, 0x23, 0x0a, 0x0d, 0x65, 0x72, 0x72,
 	0x6f, 0x72, 0x5f, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
-	0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x55,
+	0x52, 0x0c, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x42, 0x17,
 	0x0a, 0x15, 0x77, 0x61, 0x6c, 0x6c, 0x65, 0x74, 0x2e, 0x63, 0x6f, 0x72, 0x65, 0x2e, 0x6a, 0x6e,
-	0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x5a, 0x3c, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e,
-	0x63, 0x6f, 0x6d, 0x2f, 0x62, 0x69, 0x6e, 0x61, 0x6e, 0x63, 0x65, 0x2d, 0x63, 0x68, 0x61, 0x69,
-	0x6e, 0x2f, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2d, 0x69, 0x6e, 0x74, 0x65, 0x67, 0x72, 0x61, 0x74,
-	0x69, 0x6f, 0x6e, 0x2f, 0x62, 0x6c, 0x6f, 0x63, 0x6b, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x2f, 0x63,
-	0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+	0x69, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -136,7 +133,7 @@ func file_TransactionCompiler_proto_rawDescGZIP() []byte {
 var file_TransactionCompiler_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
 var file_TransactionCompiler_proto_goTypes = []interface{}{
 	(*PreSigningOutput)(nil), // 0: TW.TxCompiler.Proto.PreSigningOutput
-	(SigningError)(0),        // 1: TW.Common.Proto.SigningError
+	(common.SigningError)(0), // 1: TW.Common.Proto.SigningError
 }
 var file_TransactionCompiler_proto_depIdxs = []int32{
 	1, // 0: TW.TxCompiler.Proto.PreSigningOutput.error:type_name -> TW.Common.Proto.SigningError
@@ -152,7 +149,6 @@ func file_TransactionCompiler_proto_init() {
 	if File_TransactionCompiler_proto != nil {
 		return
 	}
-	file_Common_proto_init()
 	if !protoimpl.UnsafeEnabled {
 		file_TransactionCompiler_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
 			switch v := v.(*PreSigningOutput); i {
diff --git a/samples/go/sample/external_signing.go b/samples/go/sample/external_signing.go
index 636f56dbc0d..0cbf729f812 100644
--- a/samples/go/sample/external_signing.go
+++ b/samples/go/sample/external_signing.go
@@ -7,8 +7,8 @@ import (
 	"tw/core"
 	"tw/protos/binance"
 	"tw/protos/bitcoin"
-	"tw/protos/common"
 	"tw/protos/ethereum"
+	"tw/protos/transactioncompiler"
 
 	"google.golang.org/protobuf/proto"
 )
@@ -25,23 +25,44 @@ func SignExternalBinanceDemo() {
 
 	coin := core.CoinTypeBinance
 
+    // bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2
+    fromAddress, _ := hex.DecodeString("40c2979694bbc961023d1d27be6fc4d21a9febe6")
+    // bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5
+    toAddress, _ := hex.DecodeString("bffe47abfaede50419c577f1074fee6dd1535cd1")
+
+    inOutToken := binance.SendOrder_Token {
+        Denom: "BNB",
+        Amount: 1,
+    }
+
+    orderInput := binance.SendOrder_Input {
+        Address: fromAddress,
+        Coins: []*binance.SendOrder_Token{&inOutToken},
+    }
+    orderOutput := binance.SendOrder_Output {
+        Address: toAddress,
+        Coins: []*binance.SendOrder_Token{&inOutToken},
+    }
+
+	input := binance.SigningInput {
+	    ChainId: "Binance-Chain-Nile",
+	    OrderOneof: &binance.SigningInput_SendOrder {
+	        SendOrder: &binance.SendOrder {
+	            Inputs: []*binance.SendOrder_Input{&orderInput},
+                Outputs: []*binance.SendOrder_Output{&orderOutput},
+            },
+	    },
+	}
+
 	fmt.Println("\n==> Step 1: Prepare transaction input (protobuf)")
-	txInputData := core.BuildInput(
-		coin,
-		"bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2", // from
-		"bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5", // to
-		"1",   // amount
-		"BNB", // asset
-		"",    // memo
-		"",    // chainId
-	)
+    txInputData, _ := proto.Marshal(&input)
 	fmt.Println("txInputData len: ", len(txInputData))
 
 	fmt.Println("\n==> Step 2: Obtain preimage hash")
 	hashes := core.PreImageHashes(coin, txInputData)
 	fmt.Println("hash(es): ", len(hashes), hex.EncodeToString(hashes))
 
-	var preSigningOutput common.PreSigningOutput
+	var preSigningOutput transactioncompiler.PreSigningOutput
 	proto.Unmarshal(hashes, &preSigningOutput)
 
 	fmt.Println("\n==> Step 3: Compile transaction info")
@@ -68,39 +89,35 @@ func SignExternalEthereumDemo() {
 	coin := core.CoinTypeEthereum
 
 	fmt.Println("\n==> Step 1: Prepare transaction input (protobuf)")
-	txInputData := core.BuildInput(
-		coin,
-		"0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F", // from
-		"0x3535353535353535353535353535353535353535", // to
-		"1000000000000000000",                        // amount
-		"ETH",                                        // asset
-		"",                                           // memo
-		"",                                           // chainId
-	)
-	fmt.Println("txInputData len: ", len(txInputData))
-
-	// Set a few other values
 	var input ethereum.SigningInput
-	proto.Unmarshal(txInputData, &input)
+	input.Transaction = &ethereum.Transaction {
+	    TransactionOneof: &ethereum.Transaction_Transfer_ {
+	        Transfer: &ethereum.Transaction_Transfer{
+	            Amount: big.NewInt(1000000000000000000).Bytes(),
+	        },
+	    },
+	}
+	input.ChainId = big.NewInt(1).Bytes()
+	input.ToAddress = "0x3535353535353535353535353535353535353535"
 	input.Nonce = big.NewInt(11).Bytes()
 	input.GasPrice = big.NewInt(20000000000).Bytes()
 	input.GasLimit = big.NewInt(21000).Bytes()
 	input.TxMode = ethereum.TransactionMode_Legacy
-	txInputData2, _ := proto.Marshal(&input)
-	fmt.Println("txInputData len: ", len(txInputData2))
+	txInputData, _ := proto.Marshal(&input)
+	fmt.Println("txInputData len: ", len(txInputData))
 
 	fmt.Println("\n==> Step 2: Obtain preimage hash")
-	hashes := core.PreImageHashes(coin, txInputData2)
+	hashes := core.PreImageHashes(coin, txInputData)
 	fmt.Println("hash(es): ", len(hashes), hex.EncodeToString(hashes))
 
-	var preSigningOutput common.PreSigningOutput
+	var preSigningOutput transactioncompiler.PreSigningOutput
 	proto.Unmarshal(hashes, &preSigningOutput)
 
 	fmt.Println("\n==> Step 3: Compile transaction info")
 	// Simulate signature, normally obtained from signature server
 	signature, _ := hex.DecodeString("360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c9796677900")
 	publicKey, _ := hex.DecodeString("044bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ce28cab79ad7119ee1ad3ebcdb98a16805211530ecc6cfefa1b88e6dff99232a")
-	txOutput := core.CompileWithSignatures(coin, txInputData2, [][]byte{signature}, [][]byte{publicKey})
+	txOutput := core.CompileWithSignatures(coin, txInputData, [][]byte{signature}, [][]byte{publicKey})
 
 	fmt.Println("final txOutput proto:  ", len(txOutput))
 	var output ethereum.SigningOutput
diff --git a/samples/go/types/twdata.go b/samples/go/types/twdata.go
index dcb7bdc95f8..5bc9fa90f77 100644
--- a/samples/go/types/twdata.go
+++ b/samples/go/types/twdata.go
@@ -1,7 +1,7 @@
 package types
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWData.h>
 import "C"
 
diff --git a/samples/go/types/twstring.go b/samples/go/types/twstring.go
index 3c5b2668c64..b61c52c565a 100644
--- a/samples/go/types/twstring.go
+++ b/samples/go/types/twstring.go
@@ -1,7 +1,7 @@
 package types
 
 // #cgo CFLAGS: -I../../../include
-// #cgo LDFLAGS: -L../../../build -L../../../build/trezor-crypto -lTrustWalletCore -lprotobuf -lTrezorCrypto -lstdc++ -lm
+// #cgo LDFLAGS: -L../../../build -L../../../build/local/lib -L../../../build/trezor-crypto -lTrustWalletCore -lwallet_core_rs -lprotobuf -lTrezorCrypto -lstdc++ -lm
 // #include <TrustWalletCore/TWString.h>
 import "C"
 
diff --git a/samples/kmp/.gitignore b/samples/kmp/.gitignore
new file mode 100644
index 00000000000..e510fa99de5
--- /dev/null
+++ b/samples/kmp/.gitignore
@@ -0,0 +1,10 @@
+*.iml
+.gradle
+.idea
+.DS_Store
+build
+captures
+.externalNativeBuild
+.cxx
+local.properties
+xcuserdata
\ No newline at end of file
diff --git a/samples/kmp/README.md b/samples/kmp/README.md
new file mode 100644
index 00000000000..131cc85aebf
--- /dev/null
+++ b/samples/kmp/README.md
@@ -0,0 +1,66 @@
+
+# Kotlin Multiplatform Mobile Sample
+
+## DISCLAIMER
+
+> This is a sample html for demonstration purpose only,
+> do not use it with real addresses, real transactions, or real funds.
+> Use it at your own risk.
+
+## Prerequisites
+
+1. Setup Kotlin Multiplatform mobile development environment, you can follow this [guide](https://kotlinlang.org/docs/multiplatform-mobile-setup.html)
+- - Android Studio and Kotlin plugins
+- - JDK
+- - Xcode
+- - CocoaPods
+1. Install `kdoctor` on macOS to verify, you should see something similar to
+
+```bash
+╰─$ kdoctor
+Environment diagnose (to see all details, use -v option):
+[✓] Operation System
+[✓] Java
+[✓] Android Studio
+[✓] Xcode
+[✓] Cocoapods
+
+Conclusion:
+  ✓ Your system is ready for Kotlin Multiplatform Mobile Development!
+```
+
+## Setup authentication token for GitHub Package Registry
+
+We recommend to create a non-expiring and readonly token for accessing GitHub packages, and add it to `local.properties` next to `settings.gradle.kts`
+
+```java
+gpr.user=<github username>
+gpr.key=<github token>
+```
+
+## Build and run
+
+### CLI
+
+run `./gradlew assemble`
+
+```bash
+Starting a Gradle Daemon (subsequent builds will be faster)
+Authenticating user: <github user>
+...
+...
+BUILD SUCCESSFUL in 1m 30s
+178 actionable tasks: 46 executed, 132 up-to-date
+```
+
+### Android
+
+Open this folder in Android Studio then run
+
+<img src=https://user-images.githubusercontent.com/360470/221500542-bf303bec-b898-40ab-b0dd-4116d2faec6a.png />
+
+### iOS
+
+Open `iosApp/iosApp.xcworkspace` in Xcode, if you don't see it, please run `pod install --repo-update` under `iosApp` folder.
+
+<img src=https://user-images.githubusercontent.com/360470/221500890-4749e74a-b021-452b-85cd-7ba20749163a.png width=55% />
diff --git a/samples/kmp/androidApp/build.gradle.kts b/samples/kmp/androidApp/build.gradle.kts
new file mode 100644
index 00000000000..44b6129bc02
--- /dev/null
+++ b/samples/kmp/androidApp/build.gradle.kts
@@ -0,0 +1,49 @@
+plugins {
+    id("com.android.application")
+    kotlin("android")
+}
+
+android {
+    namespace = "com.example.kmpsample.android"
+    compileSdk = 33
+    defaultConfig {
+        applicationId = "com.example.kmpsample.android"
+        minSdk = 24
+        targetSdk = 33
+        versionCode = 1
+        versionName = "1.0"
+    }
+    buildFeatures {
+        compose = true
+    }
+    composeOptions {
+        kotlinCompilerExtensionVersion = "1.5.12"
+    }
+    packagingOptions {
+        resources {
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
+        }
+    }
+    buildTypes {
+        getByName("release") {
+            isMinifyEnabled = false
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(project(":shared"))
+    implementation("androidx.compose.ui:ui:1.3.1")
+    implementation("androidx.compose.ui:ui-tooling:1.3.1")
+    implementation("androidx.compose.ui:ui-tooling-preview:1.3.1")
+    implementation("androidx.compose.foundation:foundation:1.3.1")
+    implementation("androidx.compose.material:material:1.3.1")
+    implementation("androidx.activity:activity-compose:1.6.1")
+}
\ No newline at end of file
diff --git a/samples/kmp/androidApp/src/main/AndroidManifest.xml b/samples/kmp/androidApp/src/main/AndroidManifest.xml
new file mode 100644
index 00000000000..22d1facc822
--- /dev/null
+++ b/samples/kmp/androidApp/src/main/AndroidManifest.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <application
+        android:allowBackup="false"
+        android:supportsRtl="true"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+</manifest> 
\ No newline at end of file
diff --git a/samples/kmp/androidApp/src/main/java/com/example/kmpsample/android/MainActivity.kt b/samples/kmp/androidApp/src/main/java/com/example/kmpsample/android/MainActivity.kt
new file mode 100644
index 00000000000..1ab49166253
--- /dev/null
+++ b/samples/kmp/androidApp/src/main/java/com/example/kmpsample/android/MainActivity.kt
@@ -0,0 +1,40 @@
+package com.example.kmpsample.android
+
+import android.os.Bundle
+import androidx.activity.ComponentActivity
+import androidx.activity.compose.setContent
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material.*
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.tooling.preview.Preview
+import com.example.kmpsample.Sample
+
+class MainActivity : ComponentActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContent {
+            MyApplicationTheme {
+                Surface(
+                    modifier = Modifier.fillMaxSize(),
+                    color = MaterialTheme.colors.background
+                ) {
+                    GreetingView(Sample().greet())
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun GreetingView(text: String) {
+    Text(text = text)
+}
+
+@Preview
+@Composable
+fun DefaultPreview() {
+    MyApplicationTheme {
+        GreetingView("Hello, Android!")
+    }
+}
diff --git a/samples/kmp/androidApp/src/main/java/com/example/kmpsample/android/MyApplicationTheme.kt b/samples/kmp/androidApp/src/main/java/com/example/kmpsample/android/MyApplicationTheme.kt
new file mode 100644
index 00000000000..a0929dcde96
--- /dev/null
+++ b/samples/kmp/androidApp/src/main/java/com/example/kmpsample/android/MyApplicationTheme.kt
@@ -0,0 +1,55 @@
+package com.example.kmpsample.android
+
+import androidx.compose.foundation.isSystemInDarkTheme
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Shapes
+import androidx.compose.material.Typography
+import androidx.compose.material.darkColors
+import androidx.compose.material.lightColors
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+
+@Composable
+fun MyApplicationTheme(
+    darkTheme: Boolean = isSystemInDarkTheme(),
+    content: @Composable () -> Unit
+) {
+    val colors = if (darkTheme) {
+        darkColors(
+            primary = Color(0xFFBB86FC),
+            primaryVariant = Color(0xFF3700B3),
+            secondary = Color(0xFF03DAC5)
+        )
+    } else {
+        lightColors(
+            primary = Color(0xFF6200EE),
+            primaryVariant = Color(0xFF3700B3),
+            secondary = Color(0xFF03DAC5)
+        )
+    }
+    val typography = Typography(
+        body1 = TextStyle(
+            fontFamily = FontFamily.Default,
+            fontWeight = FontWeight.Normal,
+            fontSize = 16.sp
+        )
+    )
+    val shapes = Shapes(
+        small = RoundedCornerShape(4.dp),
+        medium = RoundedCornerShape(4.dp),
+        large = RoundedCornerShape(0.dp)
+    )
+
+    MaterialTheme(
+        colors = colors,
+        typography = typography,
+        shapes = shapes,
+        content = content
+    )
+}
diff --git a/samples/kmp/androidApp/src/main/res/values/styles.xml b/samples/kmp/androidApp/src/main/res/values/styles.xml
new file mode 100644
index 00000000000..6b4fa3d08e0
--- /dev/null
+++ b/samples/kmp/androidApp/src/main/res/values/styles.xml
@@ -0,0 +1,3 @@
+<resources>
+    <style name="AppTheme" parent="android:Theme.Material.NoActionBar"/>
+</resources>
\ No newline at end of file
diff --git a/samples/kmp/build.gradle.kts b/samples/kmp/build.gradle.kts
new file mode 100644
index 00000000000..ded20aa5f71
--- /dev/null
+++ b/samples/kmp/build.gradle.kts
@@ -0,0 +1,11 @@
+plugins {
+    //trick: for the same plugin versions in all sub-modules
+    id("com.android.application").version("7.4.1").apply(false)
+    id("com.android.library").version("7.4.1").apply(false)
+    kotlin("android").version("1.9.23").apply(false)
+    kotlin("multiplatform").version("1.9.23").apply(false)
+}
+
+tasks.register("clean", Delete::class) {
+    delete(rootProject.buildDir)
+}
diff --git a/samples/kmp/gradle.properties b/samples/kmp/gradle.properties
new file mode 100644
index 00000000000..8f3835a8705
--- /dev/null
+++ b/samples/kmp/gradle.properties
@@ -0,0 +1,16 @@
+#Gradle
+org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
+
+#Kotlin
+kotlin.code.style=official
+
+#Android
+android.useAndroidX=true
+android.nonTransitiveRClass=true
+
+#MPP
+kotlin.mpp.enableCInteropCommonization=true
+kotlin.mpp.androidSourceSetLayoutVersion=2
+
+#Native
+kotlin.native.cacheKind.iosArm64=none
diff --git a/samples/kmp/gradle/wrapper/gradle-wrapper.jar b/samples/kmp/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 00000000000..249e5832f09
Binary files /dev/null and b/samples/kmp/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/samples/kmp/gradle/wrapper/gradle-wrapper.properties b/samples/kmp/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 00000000000..e1bef7e873c
--- /dev/null
+++ b/samples/kmp/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/samples/kmp/gradlew b/samples/kmp/gradlew
new file mode 100755
index 00000000000..a69d9cb6c20
--- /dev/null
+++ b/samples/kmp/gradlew
@@ -0,0 +1,240 @@
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+
+APP_NAME="Gradle"
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/samples/kmp/gradlew.bat b/samples/kmp/gradlew.bat
new file mode 100644
index 00000000000..53a6b238d41
--- /dev/null
+++ b/samples/kmp/gradlew.bat
@@ -0,0 +1,91 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/samples/kmp/iosApp/Podfile b/samples/kmp/iosApp/Podfile
new file mode 100644
index 00000000000..aff9c517b20
--- /dev/null
+++ b/samples/kmp/iosApp/Podfile
@@ -0,0 +1,5 @@
+target 'iosApp' do
+  use_frameworks!
+  platform :ios, '14.1'
+  pod 'shared', :path => '../shared'
+end
\ No newline at end of file
diff --git a/samples/kmp/iosApp/Podfile.lock b/samples/kmp/iosApp/Podfile.lock
new file mode 100644
index 00000000000..3c203ef8291
--- /dev/null
+++ b/samples/kmp/iosApp/Podfile.lock
@@ -0,0 +1,31 @@
+PODS:
+  - shared (1.0):
+    - TrustWalletCore
+  - SwiftProtobuf (1.19.1)
+  - TrustWalletCore (2.9.8):
+    - TrustWalletCore/Core (= 2.9.8)
+  - TrustWalletCore/Core (2.9.8):
+    - TrustWalletCore/Types
+  - TrustWalletCore/Types (2.9.8):
+    - SwiftProtobuf
+
+DEPENDENCIES:
+  - shared (from `../shared`)
+
+SPEC REPOS:
+  trunk:
+    - SwiftProtobuf
+    - TrustWalletCore
+
+EXTERNAL SOURCES:
+  shared:
+    :path: "../shared"
+
+SPEC CHECKSUMS:
+  shared: 973e5c894781ebff8382176ea25326e62f08b171
+  SwiftProtobuf: 59d9ea2eb5f84b509f32d170a65f3348ae758f1e
+  TrustWalletCore: 53f09313edb1c010de78314d023c67d2d4654864
+
+PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756
+
+COCOAPODS: 1.11.3
diff --git a/samples/kmp/iosApp/iosApp.xcodeproj/project.pbxproj b/samples/kmp/iosApp/iosApp.xcodeproj/project.pbxproj
new file mode 100644
index 00000000000..ca2b9c91a95
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -0,0 +1,399 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
+		058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
+		2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; };
+		4D68B6FB00CAE8E0C67A780F /* Pods_iosApp.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3763493A43C2B782DC6DA559 /* Pods_iosApp.framework */; };
+		7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
+		058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
+		2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = "<group>"; };
+		3763493A43C2B782DC6DA559 /* Pods_iosApp.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF7B242A565900829871 /* iosApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = iosApp.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
+		7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		8E518AA3CB4D70D3D11EBEB1 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.release.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig"; sourceTree = "<group>"; };
+		9263C586D1E9CDC10BA876EB /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-iosApp.debug.xcconfig"; path = "Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig"; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		E05CC662F744BE5F2EE31649 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4D68B6FB00CAE8E0C67A780F /* Pods_iosApp.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		058557D7273AAEEB004C7B11 /* Preview Content */ = {
+			isa = PBXGroup;
+			children = (
+				058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */,
+			);
+			path = "Preview Content";
+			sourceTree = "<group>";
+		};
+		7555FF72242A565900829871 = {
+			isa = PBXGroup;
+			children = (
+				7555FF7D242A565900829871 /* iosApp */,
+				7555FF7C242A565900829871 /* Products */,
+				CD7FB8DD91AE30434E30F38B /* Pods */,
+				8E2679D394DEF21A94D85F4A /* Frameworks */,
+			);
+			sourceTree = "<group>";
+		};
+		7555FF7C242A565900829871 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				7555FF7B242A565900829871 /* iosApp.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		7555FF7D242A565900829871 /* iosApp */ = {
+			isa = PBXGroup;
+			children = (
+				058557BA273AAA24004C7B11 /* Assets.xcassets */,
+				7555FF82242A565900829871 /* ContentView.swift */,
+				7555FF8C242A565B00829871 /* Info.plist */,
+				2152FB032600AC8F00CF470E /* iOSApp.swift */,
+				058557D7273AAEEB004C7B11 /* Preview Content */,
+			);
+			path = iosApp;
+			sourceTree = "<group>";
+		};
+		8E2679D394DEF21A94D85F4A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				3763493A43C2B782DC6DA559 /* Pods_iosApp.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		CD7FB8DD91AE30434E30F38B /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				9263C586D1E9CDC10BA876EB /* Pods-iosApp.debug.xcconfig */,
+				8E518AA3CB4D70D3D11EBEB1 /* Pods-iosApp.release.xcconfig */,
+			);
+			name = Pods;
+			path = Pods;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		7555FF7A242A565900829871 /* iosApp */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */;
+			buildPhases = (
+				38E3F17341077985AF9A7089 /* [CP] Check Pods Manifest.lock */,
+				7555FF77242A565900829871 /* Sources */,
+				7555FF79242A565900829871 /* Resources */,
+				E05CC662F744BE5F2EE31649 /* Frameworks */,
+				A72FDE4F9C0BA1A12E526BE5 /* [CP] Embed Pods Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = iosApp;
+			productName = iosApp;
+			productReference = 7555FF7B242A565900829871 /* iosApp.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		7555FF73242A565900829871 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastSwiftUpdateCheck = 1130;
+				LastUpgradeCheck = 1130;
+				ORGANIZATIONNAME = orgName;
+				TargetAttributes = {
+					7555FF7A242A565900829871 = {
+						CreatedOnToolsVersion = 11.3.1;
+					};
+				};
+			};
+			buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				Base,
+			);
+			mainGroup = 7555FF72242A565900829871;
+			productRefGroup = 7555FF7C242A565900829871 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				7555FF7A242A565900829871 /* iosApp */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		7555FF79242A565900829871 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */,
+				058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		38E3F17341077985AF9A7089 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-iosApp-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
+		A72FDE4F9C0BA1A12E526BE5 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		7555FF77242A565900829871 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */,
+				7555FF83242A565900829871 /* ContentView.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		7555FFA3242A565B00829871 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
+				MTL_FAST_MATH = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+			};
+			name = Debug;
+		};
+		7555FFA4242A565B00829871 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_ENABLE_OBJC_WEAK = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 14.1;
+				MTL_ENABLE_DEBUG_INFO = NO;
+				MTL_FAST_MATH = YES;
+				SDKROOT = iphoneos;
+				SWIFT_COMPILATION_MODE = wholemodule;
+				SWIFT_OPTIMIZATION_LEVEL = "-O";
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		7555FFA6242A565B00829871 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 9263C586D1E9CDC10BA876EB /* Pods-iosApp.debug.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				ENABLE_PREVIEWS = YES;
+				INFOPLIST_FILE = iosApp/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Debug;
+		};
+		7555FFA7242A565B00829871 /* Release */ = {
+			isa = XCBuildConfiguration;
+			baseConfigurationReference = 8E518AA3CB4D70D3D11EBEB1 /* Pods-iosApp.release.xcconfig */;
+			buildSettings = {
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
+				ENABLE_PREVIEWS = YES;
+				INFOPLIST_FILE = iosApp/Info.plist;
+				LD_RUNPATH_SEARCH_PATHS = (
+					"$(inherited)",
+					"@executable_path/Frameworks",
+				);
+				PRODUCT_BUNDLE_IDENTIFIER = orgIdentifier.iosApp;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SWIFT_VERSION = 5.0;
+				TARGETED_DEVICE_FAMILY = "1,2";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7555FFA3242A565B00829871 /* Debug */,
+				7555FFA4242A565B00829871 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				7555FFA6242A565B00829871 /* Debug */,
+				7555FFA7242A565B00829871 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 7555FF73242A565900829871 /* Project object */;
+}
diff --git a/samples/kmp/iosApp/iosApp.xcworkspace/contents.xcworkspacedata b/samples/kmp/iosApp/iosApp.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 00000000000..c009e7d7c31
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "group:iosApp.xcodeproj">
+   </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
+</Workspace>
diff --git a/samples/kmp/iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/samples/kmp/iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 00000000000..18d981003d6
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/samples/kmp/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/samples/kmp/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json
new file mode 100644
index 00000000000..ee7e3ca03f8
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,11 @@
+{
+  "colors" : [
+    {
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/samples/kmp/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/samples/kmp/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json
new file mode 100644
index 00000000000..fb88a396bf3
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -0,0 +1,98 @@
+{
+  "images" : [
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "20x20"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "29x29"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
+    },
+    {
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/samples/kmp/iosApp/iosApp/Assets.xcassets/Contents.json b/samples/kmp/iosApp/iosApp/Assets.xcassets/Contents.json
new file mode 100644
index 00000000000..4aa7c5350bf
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/samples/kmp/iosApp/iosApp/ContentView.swift b/samples/kmp/iosApp/iosApp/ContentView.swift
new file mode 100644
index 00000000000..cacd4616da2
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp/ContentView.swift
@@ -0,0 +1,16 @@
+import SwiftUI
+import shared
+
+struct ContentView: View {
+	let greet = Sample().greet()
+
+	var body: some View {
+		Text(greet)
+	}
+}
+
+struct ContentView_Previews: PreviewProvider {
+	static var previews: some View {
+		ContentView()
+	}
+}
diff --git a/samples/kmp/iosApp/iosApp/Info.plist b/samples/kmp/iosApp/iosApp/Info.plist
new file mode 100644
index 00000000000..8044709cfa7
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp/Info.plist
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UIApplicationSceneManifest</key>
+	<dict>
+		<key>UIApplicationSupportsMultipleScenes</key>
+		<false/>
+	</dict>
+	<key>UIRequiredDeviceCapabilities</key>
+	<array>
+		<string>armv7</string>
+	</array>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UILaunchScreen</key>
+	<dict/>
+</dict>
+</plist>
\ No newline at end of file
diff --git a/samples/kmp/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/samples/kmp/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json
new file mode 100644
index 00000000000..4aa7c5350bf
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json	
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
\ No newline at end of file
diff --git a/samples/kmp/iosApp/iosApp/iOSApp.swift b/samples/kmp/iosApp/iosApp/iOSApp.swift
new file mode 100644
index 00000000000..0648e8602f2
--- /dev/null
+++ b/samples/kmp/iosApp/iosApp/iOSApp.swift
@@ -0,0 +1,10 @@
+import SwiftUI
+
+@main
+struct iOSApp: App {
+	var body: some Scene {
+		WindowGroup {
+			ContentView()
+		}
+	}
+}
\ No newline at end of file
diff --git a/samples/kmp/settings.gradle.kts b/samples/kmp/settings.gradle.kts
new file mode 100644
index 00000000000..f0ef9278f37
--- /dev/null
+++ b/samples/kmp/settings.gradle.kts
@@ -0,0 +1,44 @@
+pluginManagement {
+    repositories {
+        google()
+        gradlePluginPortal()
+        mavenCentral()
+    }
+}
+
+val properties = java.util.Properties()
+val localProps = file("local.properties")
+if (localProps.exists()) {
+    properties.load(localProps.inputStream())
+    val user = properties.getProperty("gpr.user")
+    if (user != null) {
+        println("Authenticating user: $user")
+    } else {
+        println("local.properties found, but gpr.user property not set. ")
+    }
+} else {
+    val user = System.getenv("GITHUB_USER")
+    if (user != null) {
+        println("Authenticating user: $user")
+    } else {
+        println("local.properties not found, and GITHUB_USER environment variable not set. ")
+    }
+}
+
+dependencyResolutionManagement {
+    repositories {
+        google()
+        mavenCentral()
+        maven {
+            url = uri("https://maven.pkg.github.com/trustwallet/wallet-core")
+            credentials {
+                username = properties["gpr.user"] as? String ?: System.getenv("GITHUB_USER")
+                password = properties["gpr.key"] as? String ?: System.getenv("GITHUB_TOKEN")
+            }
+        }
+    }
+}
+
+rootProject.name = "kmpSample"
+include(":androidApp")
+include(":shared")
\ No newline at end of file
diff --git a/samples/kmp/shared/build.gradle.kts b/samples/kmp/shared/build.gradle.kts
new file mode 100644
index 00000000000..c27215519a7
--- /dev/null
+++ b/samples/kmp/shared/build.gradle.kts
@@ -0,0 +1,95 @@
+import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform
+
+plugins {
+    kotlin("multiplatform")
+    kotlin("native.cocoapods")
+    id("com.android.library")
+}
+
+kotlin {
+    android {
+        compilations.all {
+            kotlinOptions {
+                jvmTarget = "1.8"
+            }
+        }
+    }
+
+    iosX64()
+    iosArm64()
+
+    cocoapods {
+        summary = "Some description for the Shared Module"
+        homepage = "Link to the Shared Module homepage"
+        version = "1.0"
+        ios.deploymentTarget = "14.1"
+        dependencies {
+            pod("TrustWalletCore", moduleName = "WalletCore")
+        }
+        podfile = project.file("../iosApp/Podfile")
+        framework {
+            baseName = "shared"
+
+            listOf(
+                iosX64(),
+                iosArm64(),
+                iosSimulatorArm64()
+            ).forEach {
+                it.binaries.all {
+                    linkerOpts += "-ld64"
+                }
+            }
+        }
+    }
+
+    sourceSets {
+        val commonMain by getting {
+            dependencies {
+                implementation("com.trustwallet:wallet-core-kotlin:+")
+            }
+        }
+        val commonTest by getting {
+            dependencies {
+                implementation(kotlin("test"))
+            }
+        }
+        val androidMain by getting
+        val androidUnitTest by getting
+        val iosX64Main by getting
+        val iosArm64Main by getting
+
+        val iosMain by creating {
+            dependsOn(commonMain)
+            iosX64Main.dependsOn(this)
+            iosArm64Main.dependsOn(this)
+        }
+        val iosX64Test by getting
+        val iosArm64Test by getting
+
+        val iosTest by creating {
+            dependsOn(commonTest)
+            iosX64Test.dependsOn(this)
+            iosArm64Test.dependsOn(this)
+        }
+
+        val isArmMac = DefaultNativePlatform("test").architecture.isArm
+        if (isArmMac) {
+            iosSimulatorArm64()
+
+            val iosSimulatorArm64Main by getting
+            val iosSimulatorArm64Test by getting
+
+            iosSimulatorArm64Main.dependsOn(iosMain)
+            iosSimulatorArm64Test.dependsOn(iosTest)
+        }
+    }
+}
+
+android {
+    namespace = "com.example.kmpsample"
+    compileSdk = 33
+    defaultConfig {
+        minSdk = 24
+        targetSdk = 33
+    }
+}
diff --git a/samples/kmp/shared/shared.podspec b/samples/kmp/shared/shared.podspec
new file mode 100644
index 00000000000..9673fb1edda
--- /dev/null
+++ b/samples/kmp/shared/shared.podspec
@@ -0,0 +1,39 @@
+Pod::Spec.new do |spec|
+    spec.name                     = 'shared'
+    spec.version                  = '1.0'
+    spec.homepage                 = 'Link to the Shared Module homepage'
+    spec.source                   = { :http=> ''}
+    spec.authors                  = ''
+    spec.license                  = ''
+    spec.summary                  = 'Some description for the Shared Module'
+    spec.vendored_frameworks      = 'build/cocoapods/framework/shared.framework'
+    spec.libraries                = 'c++'
+    spec.ios.deployment_target = '14.1'
+    spec.dependency 'TrustWalletCore'
+                
+    spec.pod_target_xcconfig = {
+        'KOTLIN_PROJECT_PATH' => ':shared',
+        'PRODUCT_MODULE_NAME' => 'shared',
+    }
+                
+    spec.script_phases = [
+        {
+            :name => 'Build shared',
+            :execution_position => :before_compile,
+            :shell_path => '/bin/sh',
+            :script => <<-SCRIPT
+                if [ "YES" = "$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED" ]; then
+                  echo "Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \"YES\""
+                  exit 0
+                fi
+                set -ev
+                REPO_ROOT="$PODS_TARGET_SRCROOT"
+                "$REPO_ROOT/../gradlew" -p "$REPO_ROOT" $KOTLIN_PROJECT_PATH:syncFramework \
+                    -Pkotlin.native.cocoapods.platform=$PLATFORM_NAME \
+                    -Pkotlin.native.cocoapods.archs="$ARCHS" \
+                    -Pkotlin.native.cocoapods.configuration="$CONFIGURATION"
+            SCRIPT
+        }
+    ]
+                
+end
\ No newline at end of file
diff --git a/samples/kmp/shared/src/androidMain/kotlin/com/example/kmpsample/Platform.kt b/samples/kmp/shared/src/androidMain/kotlin/com/example/kmpsample/Platform.kt
new file mode 100644
index 00000000000..611bfc44386
--- /dev/null
+++ b/samples/kmp/shared/src/androidMain/kotlin/com/example/kmpsample/Platform.kt
@@ -0,0 +1,10 @@
+package com.example.kmpsample
+
+class AndroidPlatform : Platform {
+    init {
+        System.loadLibrary("TrustWalletCore")
+    }
+    override val name: String = "Android ${android.os.Build.VERSION.SDK_INT}"
+}
+
+actual fun getPlatform(): Platform = AndroidPlatform()
\ No newline at end of file
diff --git a/samples/kmp/shared/src/commonMain/kotlin/com/example/kmpsample/Platform.kt b/samples/kmp/shared/src/commonMain/kotlin/com/example/kmpsample/Platform.kt
new file mode 100644
index 00000000000..65e10509741
--- /dev/null
+++ b/samples/kmp/shared/src/commonMain/kotlin/com/example/kmpsample/Platform.kt
@@ -0,0 +1,7 @@
+package com.example.kmpsample
+
+interface Platform {
+    val name: String
+}
+
+expect fun getPlatform(): Platform
\ No newline at end of file
diff --git a/samples/kmp/shared/src/commonMain/kotlin/com/example/kmpsample/Sample.kt b/samples/kmp/shared/src/commonMain/kotlin/com/example/kmpsample/Sample.kt
new file mode 100644
index 00000000000..c6ebdbc99a9
--- /dev/null
+++ b/samples/kmp/shared/src/commonMain/kotlin/com/example/kmpsample/Sample.kt
@@ -0,0 +1,17 @@
+package com.example.kmpsample
+import com.trustwallet.core.*
+
+class Sample {
+    private val platform: Platform = getPlatform()
+
+    fun greet(): String {
+        var log = "Wallet Core KMP on platform: ${platform.name}!\n\n"
+        val wallet = HDWallet(256, "")
+        log += "Created mnemonic: ${wallet.mnemonic}\n"
+        val btcAddress = wallet.getAddressForCoin(CoinType.Bitcoin)
+        val ethAddress = wallet.getAddressForCoin(CoinType.Ethereum)
+        log += "Bitcoin address: ${btcAddress}\n"
+        log += "Ethereum address: ${ethAddress}\n"
+        return log
+    }
+}
\ No newline at end of file
diff --git a/samples/kmp/shared/src/iosMain/kotlin/com/example/kmpsample/Platform.kt b/samples/kmp/shared/src/iosMain/kotlin/com/example/kmpsample/Platform.kt
new file mode 100644
index 00000000000..00d98e5a0c3
--- /dev/null
+++ b/samples/kmp/shared/src/iosMain/kotlin/com/example/kmpsample/Platform.kt
@@ -0,0 +1,9 @@
+package com.example.kmpsample
+
+import platform.UIKit.UIDevice
+
+class IOSPlatform: Platform {
+    override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion
+}
+
+actual fun getPlatform(): Platform = IOSPlatform()
\ No newline at end of file
diff --git a/samples/node/package-lock.json b/samples/node/package-lock.json
index e0a6b4d8d20..2e8f7ed848c 100644
--- a/samples/node/package-lock.json
+++ b/samples/node/package-lock.json
@@ -140,11 +140,6 @@
       "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
       "dev": true
     },
-    "node_modules/@types/long": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
-      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
-    },
     "node_modules/@types/node": {
       "version": "10.17.60",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
@@ -194,9 +189,9 @@
       }
     },
     "node_modules/long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
     },
     "node_modules/make-error": {
       "version": "1.3.6",
@@ -205,9 +200,9 @@
       "dev": true
     },
     "node_modules/protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz",
+      "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==",
       "hasInstallScript": true,
       "dependencies": {
         "@protobufjs/aspromise": "^1.1.2",
@@ -220,13 +215,11 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
-        "long": "^4.0.0"
+        "long": "^5.0.0"
       },
-      "bin": {
-        "pbjs": "bin/pbjs",
-        "pbts": "bin/pbts"
+      "engines": {
+        "node": ">=12.0.0"
       }
     },
     "node_modules/protobufjs/node_modules/@types/node": {
@@ -424,11 +417,6 @@
       "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
       "dev": true
     },
-    "@types/long": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/@types/long/-/long-4.0.2.tgz",
-      "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
-    },
     "@types/node": {
       "version": "10.17.60",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-10.17.60.tgz",
@@ -466,9 +454,9 @@
       "dev": true
     },
     "long": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
-      "integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/long/-/long-5.2.3.tgz",
+      "integrity": "sha512-lcHwpNoggQTObv5apGNCTdJrO69eHOZMi4BNC+rTLER8iHAqGrUVeLh/irVIM7zTw2bOXA8T6uNPeujwOLg/2Q=="
     },
     "make-error": {
       "version": "1.3.6",
@@ -477,9 +465,9 @@
       "dev": true
     },
     "protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.2.5.tgz",
+      "integrity": "sha512-gGXRSXvxQ7UiPgfw8gevrfRWcTlSbOFg+p/N+JVJEK5VhueL2miT6qTymqAmjr1Q5WbOCyJbyrk6JfWKwlFn6A==",
       "requires": {
         "@protobufjs/aspromise": "^1.1.2",
         "@protobufjs/base64": "^1.1.2",
@@ -491,9 +479,8 @@
         "@protobufjs/path": "^1.1.2",
         "@protobufjs/pool": "^1.1.0",
         "@protobufjs/utf8": "^1.1.0",
-        "@types/long": "^4.0.1",
         "@types/node": ">=13.7.0",
-        "long": "^4.0.0"
+        "long": "^5.0.0"
       },
       "dependencies": {
         "@types/node": {
diff --git a/samples/osx/README.md b/samples/osx/README.md
index e3dd3a8f6df..a6a2323d3b2 100644
--- a/samples/osx/README.md
+++ b/samples/osx/README.md
@@ -2,7 +2,7 @@
 
 ## Overview
 
-This folder contains a simple but complete **iOS/macOS** sample application, for demostrating usage of the
+This folder contains a simple but complete **iOS/macOS** sample application, for demonstrating usage of the
 [Wallet Core](https://github.com/trustwallet/wallet-core) library (part of [Trust Wallet](https://trustwallet.com)).
 
 ## DISCLAIMER
diff --git a/samples/osx/cocoapods/WalletCoreExample/AppDelegate.swift b/samples/osx/cocoapods/WalletCoreExample/AppDelegate.swift
index 5aaa729af77..8c2812c17da 100644
--- a/samples/osx/cocoapods/WalletCoreExample/AppDelegate.swift
+++ b/samples/osx/cocoapods/WalletCoreExample/AppDelegate.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Cocoa
 
diff --git a/samples/osx/cocoapods/WalletCoreExample/ViewController.swift b/samples/osx/cocoapods/WalletCoreExample/ViewController.swift
index bb130d940b6..f758c3ed046 100644
--- a/samples/osx/cocoapods/WalletCoreExample/ViewController.swift
+++ b/samples/osx/cocoapods/WalletCoreExample/ViewController.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Cocoa
 import WalletCore
diff --git a/samples/rust/.gitignore b/samples/rust/.gitignore
new file mode 100644
index 00000000000..4ff40df7737
--- /dev/null
+++ b/samples/rust/.gitignore
@@ -0,0 +1,6 @@
+# build directory
+target
+
+# Generated proto files
+src/wc_proto/*.rs
+
diff --git a/samples/rust/Cargo.lock b/samples/rust/Cargo.lock
new file mode 100644
index 00000000000..117be2dda3c
--- /dev/null
+++ b/samples/rust/Cargo.lock
@@ -0,0 +1,394 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.80"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1"
+
+[[package]]
+name = "autocfg"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+
+[[package]]
+name = "bitflags"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf"
+
+[[package]]
+name = "cc"
+version = "1.0.90"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8cd6604a82acf3039f1144f54b8eb34e91ffba622051189e71b781822d5ee1f5"
+dependencies = [
+ "jobserver",
+ "libc",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+[[package]]
+name = "either"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+
+[[package]]
+name = "errno"
+version = "0.3.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+dependencies = [
+ "libc",
+ "windows-sys",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "home"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ab46a6e9526ddef3ae7f787c06f0f2600639ba80ea3eade3d8e670a2230f51d6"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.153"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+
+[[package]]
+name = "log"
+version = "0.4.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+
+[[package]]
+name = "memchr"
+version = "2.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
+
+[[package]]
+name = "once_cell"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.78"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "protobuf"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58678a64de2fced2bdec6bca052a6716a0efe692d6e3f53d1bda6a1def64cfc0"
+dependencies = [
+ "once_cell",
+ "protobuf-support",
+ "thiserror",
+]
+
+[[package]]
+name = "protobuf-codegen"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32777b0b3f6538d9d2e012b3fad85c7e4b9244b5958d04a6415f4333782b7a77"
+dependencies = [
+ "anyhow",
+ "once_cell",
+ "protobuf",
+ "protobuf-parse",
+ "regex",
+ "tempfile",
+ "thiserror",
+]
+
+[[package]]
+name = "protobuf-parse"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96cb37955261126624a25b5e6bda40ae34cf3989d52a783087ca6091b29b5642"
+dependencies = [
+ "anyhow",
+ "indexmap",
+ "log",
+ "protobuf",
+ "protobuf-support",
+ "tempfile",
+ "thiserror",
+ "which",
+]
+
+[[package]]
+name = "protobuf-support"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1ed294a835b0f30810e13616b1cd34943c6d1e84a8f3b0dcfe466d256c3e7e7"
+dependencies = [
+ "thiserror",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
+[[package]]
+name = "rustix"
+version = "0.38.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
+[[package]]
+name = "rustsample"
+version = "1.0.0"
+dependencies = [
+ "cc",
+ "hex",
+ "libc",
+ "pkg-config",
+ "protobuf",
+ "protobuf-codegen",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.52"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+dependencies = [
+ "cfg-if",
+ "fastrand",
+ "rustix",
+ "windows-sys",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.57"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8"
diff --git a/samples/rust/Cargo.toml b/samples/rust/Cargo.toml
new file mode 100644
index 00000000000..4f27795f435
--- /dev/null
+++ b/samples/rust/Cargo.toml
@@ -0,0 +1,16 @@
+[package]
+name = "rustsample"
+version = "1.0.0"
+edition = "2021"
+build = "src/build.rs"
+
+[dependencies]
+hex = "0.4.3"
+libc = "0.2"
+protobuf = "3.2.0"
+
+[build-dependencies]
+cc = { version = "1.0", features = ["parallel"] }
+pkg-config = "0.3"
+protobuf = "3.2.0"
+protobuf-codegen = "3.2.0"
diff --git a/samples/rust/README.md b/samples/rust/README.md
new file mode 100644
index 00000000000..237b65b34ae
--- /dev/null
+++ b/samples/rust/README.md
@@ -0,0 +1,32 @@
+# Rust Sample Application
+
+A simple Rust application to how to link and use wallet-core from Rust.
+
+## Prerequisites
+
+- Compiled `wallet-core` library
+- Rust (`rustc`, `cargo`)
+
+## Building and Running
+
+- In the `build.rs` file set the path to the wallet-core folder (by default simply `../..`).
+
+```
+cargo build
+cargo run
+```
+
+## Some Details
+
+- The app links with the wallet-core library (C/C++).
+- The `walletcore_iface.rs` file contains the interface definitions in Rust.
+- Links with `TrustWalletCore`, `TrezorCrypto`, `protobuf`, and the platform libc (`c++` or `stdc++`). Build/link parameters are in `build.rs`.
+- Rust proto files are created during the build process, from the `.proto` files in wallet-core,
+into subfolder `src/wc_proto`
+(see `build.rs`).
+- Notable dependencies:
+  -- `protobuf`
+  -- `lib` for C linking
+  -- `hex`
+  -- `protobuf-codegen` for generating protobuf source files
+
diff --git a/samples/rust/src/build.rs b/samples/rust/src/build.rs
new file mode 100644
index 00000000000..64bc84cbf36
--- /dev/null
+++ b/samples/rust/src/build.rs
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+use std::fs;
+use std::path::Path;
+
+// Wallet-core project folder, with sources (proto) and build library binaries
+static WALLET_CORE_PROJECT_DIR: &str = "../..";
+
+// libs to link with, in reverse dependency order
+static LIBS: [&str; 4] = ["TrustWalletCore", "TrezorCrypto", "protobuf", "wallet_core_rs"];
+
+fn main() {
+    // Generate protobuf interface files
+    let proto_src: String = WALLET_CORE_PROJECT_DIR.to_string() + "/src/proto";
+    let out_dir: &str = "src/wc_proto";
+
+    let _create_folder_res = fs::create_dir_all(out_dir);
+    protobuf_codegen::Codegen::new()
+        //.protoc()  // use `protoc` parser, optional.
+        .protoc_path(Path::new(&(WALLET_CORE_PROJECT_DIR.to_string() + "/build/local/bin/protoc")))
+        .out_dir(out_dir)
+        .input(proto_src.to_string() + "/Common.proto")
+        .input(proto_src.to_string() + "/Bitcoin.proto")
+        .input(proto_src.to_string() + "/BitcoinV2.proto")
+        .input(proto_src.to_string() + "/Ethereum.proto")
+        .include(proto_src)
+        .run()
+        .expect("Codegen failed.");
+    println!("Protobuf codegen to {} ready", out_dir);
+
+    println!("cargo:rustc-link-search=native={}/build", WALLET_CORE_PROJECT_DIR);
+    println!("cargo:rustc-link-search=native={}/build/trezor-crypto", WALLET_CORE_PROJECT_DIR);
+    println!("cargo:rustc-link-search=native={}/build/local/lib", WALLET_CORE_PROJECT_DIR);
+    println!("cargo:rustc-link-search=native={}/rust/target/release", WALLET_CORE_PROJECT_DIR);
+
+    // Libraries; order matters
+    for i in 0..LIBS.len() {
+        println!("cargo:rustc-link-lib={}", LIBS[i]);
+    }
+    if cfg!(target_os = "macos") {
+        println!("cargo:rustc-link-lib=c++");
+    } else { // "linux", etc
+        println!("cargo:rustc-link-lib=stdc++");
+    }
+}
diff --git a/samples/rust/src/main.rs b/samples/rust/src/main.rs
new file mode 100644
index 00000000000..06a3938ef6d
--- /dev/null
+++ b/samples/rust/src/main.rs
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+pub mod walletcore_iface;
+pub mod walletcore_extra;
+pub mod wc_proto;
+
+use crate::walletcore_iface::*;
+use crate::walletcore_extra::*;
+use crate::wc_proto::Ethereum;
+use protobuf::Message;
+use hex::ToHex;
+
+// returns private key
+fn get_wallet_info(coin: u32, coin_name: &str, wallet: &HDWallet) -> TWData {
+    println!("coin {}:", coin_name);
+    let address = hd_wallet_get_address_for_coin(wallet, coin);
+    println!("  address: {}", address.to_string());
+
+    let priv_key = hd_wallet_get_key_for_coin(wallet, coin);
+    let priv_key_data = private_key_data(&priv_key);
+    println!("  privkey: {}", priv_key_data.to_hex());
+
+    let pub_key = private_key_get_public_key_secp256k1(&priv_key, true);
+    let pub_key_data = public_key_data(&pub_key);
+    println!("  pubkey:  {}", pub_key_data.to_hex());
+
+    return priv_key_data;
+}
+
+fn main() {
+    println!("=== Calling wallet-core from Rust");
+
+    let mnemonic = "confirm bleak useless tail chalk destroy horn step bulb genuine attract split";
+    println!("mnemonic is valid: {}", mnemonic_is_valid(&TWString::from_str(mnemonic)));
+
+    let mnemonic_tw = TWString::from_str(mnemonic);
+    if !mnemonic_is_valid(&mnemonic_tw) {
+        println!("Mnemonic is invalid! {}", mnemonic);
+        return;
+    }
+    println!("wallet created, mnemonic {}", mnemonic);
+    let wallet = hd_wallet_create_with_mnemonic(&mnemonic_tw, &TWString::from_str(""));
+
+    get_wallet_info(0, "bitcoin", &wallet);
+
+    let eth_pk = get_wallet_info(60, "ethereum", &wallet);
+
+    // Ethereum transaction
+    println!("Signing Ethereum transaction");
+    let mut signing_input = Ethereum::SigningInput::new();
+    signing_input.chain_id = vec!(4);
+    signing_input.nonce = vec!(0);
+    signing_input.tx_mode = ::protobuf::EnumOrUnknown::new(Ethereum::TransactionMode::Legacy);
+    signing_input.gas_price = hex::decode("00174876E800").unwrap(); // 100000000000 100 gwei
+    signing_input.gas_limit = hex::decode("005208").unwrap(); // 21000
+    signing_input.to_address = "0xE9B511C0753649E5F3E78Ed8AdBEE92d0d2Db384".to_string();
+    signing_input.private_key = eth_pk.to_vec();
+    let mut transfer = Ethereum::transaction::Transfer::new();
+    transfer.amount = hex::decode("002386F26FC10000").unwrap(); // 10000000000000000 0.01
+    let mut transaction = Ethereum::Transaction::new();
+    transaction.transaction_oneof = Some(Ethereum::transaction::Transaction_oneof::Transfer(transfer));
+    signing_input.transaction = ::protobuf::MessageField::some(transaction);
+
+    let input_ser = signing_input.write_to_bytes().unwrap();
+    let input_ser_data = TWData::from_vec(&input_ser);
+
+    let output_ser_data = any_signer_sign(&input_ser_data, 60);
+
+    let outputp: Ethereum::SigningOutput = protobuf::Message::parse_from_bytes(&output_ser_data.to_vec()).unwrap();
+    let x: Vec<u8> = outputp.encoded;
+    println!("  signed tx: {}", x.encode_hex::<String>());
+}
diff --git a/samples/rust/src/walletcore_extra.rs b/samples/rust/src/walletcore_extra.rs
new file mode 100644
index 00000000000..d6886b92774
--- /dev/null
+++ b/samples/rust/src/walletcore_extra.rs
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+// Extra type helpers, traits for wallet-core interfaces
+
+use crate::walletcore_iface::*;
+use hex::ToHex;
+use std::ffi::CString;
+use std::ffi::CStr;
+
+
+// Some traits
+pub trait FromString {
+    fn from_str(s: &str) -> Self;
+}
+
+pub trait ToVec {
+    fn to_vec(self: &Self) -> Vec<u8>;
+}
+
+pub trait FromVec {
+    fn from_vec(vec: &Vec<u8>) -> Self;
+}
+
+pub trait ToHexString {
+    fn to_hex(self: &Self) -> String;
+}
+
+
+// TWString trait implementations
+impl FromString for TWString {
+    fn from_str(s: &str) -> Self {
+        let cstring = CString::new(s).unwrap();
+        tw_string_create_with_utf8_bytes(cstring.as_ptr())
+    }
+}
+
+impl ToString for TWString {
+    fn to_string(&self) -> String {
+        let s1 = tw_string_utf8_bytes(&self);
+        let c_str: &CStr = unsafe { CStr::from_ptr(s1) };
+        let str_slice: &str = c_str.to_str().unwrap();
+        str_slice.to_owned()
+    }
+}
+
+
+// TWData trait implementations
+impl ToVec for TWData {
+    fn to_vec(&self) -> Vec<u8> {
+        tw_data_bytes(&self)
+    }
+}
+
+impl FromVec for TWData {
+    fn from_vec(v: &Vec<u8>) -> Self {
+        tw_data_create_with_bytes(v)
+    }
+}
+
+impl ToHexString for TWData {
+    fn to_hex(&self) -> String {
+        self.to_vec().encode_hex::<String>()
+    }
+}
diff --git a/samples/rust/src/walletcore_iface.rs b/samples/rust/src/walletcore_iface.rs
new file mode 100644
index 00000000000..190e55206bd
--- /dev/null
+++ b/samples/rust/src/walletcore_iface.rs
@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+// Rust interfaces to wallet-core
+// Could be auto-generated
+
+use libc::c_char;
+
+extern "C" {
+    fn TWStringCreateWithUTF8Bytes(bytes: *const c_char) -> *const u8;
+    fn TWStringDelete(twstring: *const u8);
+    fn TWStringUTF8Bytes(twstring: *const u8) -> *const c_char;
+}
+
+pub struct TWString {
+    wrapped: *const u8
+}
+
+pub fn tw_string_create_with_utf8_bytes(bytes: *const c_char) -> TWString {
+    let ptr = unsafe { TWStringCreateWithUTF8Bytes(bytes) };
+    TWString { wrapped: ptr }
+}
+
+pub fn tw_string_utf8_bytes(twstring: &TWString) -> *const c_char {
+    unsafe { TWStringUTF8Bytes(twstring.wrapped) }
+}
+
+impl Drop for TWString {
+    fn drop(&mut self) {
+        unsafe { TWStringDelete(self.wrapped) };
+    }
+}
+
+
+extern "C" {
+    fn TWDataCreateWithBytes(bytes: *const u8, size: usize) -> *const u8;
+    fn TWDataDelete(data: *const u8);
+    fn TWDataSize(data: *const u8) -> usize;
+    fn TWDataBytes(data: *const u8) -> *const u8;
+}
+
+pub struct TWData {
+    wrapped: *const u8
+}
+
+pub fn tw_data_create_with_bytes(bytes: &Vec<u8>) -> TWData {
+    let ptr = unsafe { TWDataCreateWithBytes(bytes.as_ptr(), bytes.len()) };
+    TWData { wrapped: ptr }
+}
+
+pub fn tw_data_size(data: &TWData) -> usize {
+    unsafe { TWDataSize(data.wrapped) }
+}
+
+pub fn tw_data_bytes(data: &TWData) -> Vec<u8> {
+    let size = tw_data_size(data);
+    let ptr = unsafe { TWDataBytes(data.wrapped) };
+    let slice: &[u8] = unsafe { std::slice::from_raw_parts(ptr, size) };
+    slice.to_vec()
+}
+
+impl Drop for TWData {
+    fn drop(&mut self) {
+        unsafe { TWDataDelete(self.wrapped) };
+    }
+}
+
+
+extern "C" {
+    fn TWPrivateKeyData(private_key: *const u8) -> *const u8;
+    fn TWPrivateKeyGetPublicKeySecp256k1(private_key: *const u8, compressed: bool) -> *const u8;
+    fn TWPrivateKeyDelete(private_key: *const u8);
+}
+
+pub struct PrivateKey {
+    wrapped: *const u8
+}
+
+pub fn private_key_data(private_key: &PrivateKey) -> TWData {
+    let ptr = unsafe { TWPrivateKeyData(private_key.wrapped) };
+    TWData { wrapped: ptr }
+}
+
+pub fn private_key_get_public_key_secp256k1(private_key: &PrivateKey, compressed: bool) -> PublicKey {
+    let ptr = unsafe { TWPrivateKeyGetPublicKeySecp256k1(private_key.wrapped, compressed) };
+    PublicKey { wrapped: ptr }
+}
+
+impl Drop for PrivateKey {
+    fn drop(&mut self) {
+        unsafe { TWPrivateKeyDelete(self.wrapped) };
+    }
+}
+
+
+extern "C" {
+    fn TWPublicKeyData(public_key: *const u8) -> *const u8;
+    fn TWPublicKeyDelete(public_key: *const u8);
+}
+
+pub struct PublicKey {
+    wrapped: *const u8
+}
+
+pub fn public_key_data(public_key: &PublicKey) -> TWData {
+    let ptr = unsafe { TWPublicKeyData(public_key.wrapped) };
+    TWData { wrapped: ptr }
+}
+
+impl Drop for PublicKey {
+    fn drop(&mut self) {
+        unsafe { TWPublicKeyDelete(self.wrapped) };
+    }
+}
+
+
+extern "C" {
+    fn TWHDWalletCreateWithMnemonic(mnemonic: *const u8, passphrase: *const u8) -> *const u8;
+    fn TWHDWalletDelete(wallet: *const u8);
+    fn TWHDWalletGetAddressForCoin(wallet: *const u8, coin: u32) -> *const u8;
+    fn TWHDWalletGetKeyForCoin(wallet: *const u8, coin: u32) -> *const u8;
+}
+
+pub struct HDWallet {
+    wrapped: *const u8
+}
+
+pub fn hd_wallet_create_with_mnemonic(mnemonic: &TWString, passphrase: &TWString) -> HDWallet {
+    let ptr = unsafe { TWHDWalletCreateWithMnemonic(mnemonic.wrapped, passphrase.wrapped) };
+    HDWallet { wrapped: ptr }
+}
+
+pub fn hd_wallet_get_address_for_coin(wallet: &HDWallet, coin: u32) -> TWString {
+    let ptr = unsafe { TWHDWalletGetAddressForCoin(wallet.wrapped, coin) };
+    TWString { wrapped: ptr }
+}
+
+pub fn hd_wallet_get_key_for_coin(wallet: &HDWallet, coin: u32) -> PrivateKey {
+    let ptr = unsafe { TWHDWalletGetKeyForCoin(wallet.wrapped, coin) };
+    PrivateKey { wrapped: ptr }
+}
+
+impl Drop for HDWallet {
+    fn drop(&mut self) {
+        unsafe { TWHDWalletDelete(self.wrapped) };
+    }
+}
+
+
+extern "C" {
+    fn TWAnySignerSign(input: *const u8, coin: u32) -> *const u8;
+}
+
+pub fn any_signer_sign(input: &TWData, coin: u32) -> TWData {
+    let ptr = unsafe { TWAnySignerSign(input.wrapped, coin) };
+    TWData { wrapped: ptr }
+}
+
+
+extern "C" {
+    fn TWMnemonicIsValid(mnemonic: *const u8) -> bool;
+}
+
+pub fn mnemonic_is_valid(mnemonic: &TWString) -> bool {
+    unsafe { TWMnemonicIsValid(mnemonic.wrapped) }
+}
diff --git a/samples/typescript/devconsole.ts/.gitignore b/samples/typescript/devconsole.ts/.gitignore
deleted file mode 100644
index 83dbaee65a8..00000000000
--- a/samples/typescript/devconsole.ts/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-node_modules
-lib
-
diff --git a/samples/typescript/devconsole.ts/README.md b/samples/typescript/devconsole.ts/README.md
deleted file mode 100644
index 40ed8e5045d..00000000000
--- a/samples/typescript/devconsole.ts/README.md
+++ /dev/null
@@ -1,34 +0,0 @@
-# Devconsole.ts
-
-`Devconsole.ts` is a command-line utility to quickly work with `wallet-core` library.
-It is based on `node` `typescript` console, and uses the WASM version of `wallet-core`.
-
-Type `help()` after starting it.
-
-Some wallet-core namespaces are exposed, and methods can be called directly.
-
-Note that auto-completion works in the console.
-
-## Build:
-
-```
-cd samples/typescript/devconsole.ts
-npm install
-npm run build
-npm run start
-```
-
-## Sample usage:
-
-```
-> help()
-This is an interactive typescript shell, to work with wallet-core (wasm)
-You can use:
-...
-> w1 = HDWallet.create(256, '')
-W {}
-> w1.mnemonic()
-'round profit immense ... sniff'
-> w1.getAddressForCoin(CoinType.cosmos)
-'cosmos1kgd25tvkz3jtuee4cl796trc2s0hjsfgqmhmku'
-```
diff --git a/samples/typescript/devconsole.ts/package-lock.json b/samples/typescript/devconsole.ts/package-lock.json
deleted file mode 100644
index 50046ba9ab4..00000000000
--- a/samples/typescript/devconsole.ts/package-lock.json
+++ /dev/null
@@ -1,1491 +0,0 @@
-{
-  "name": "cli-wasm",
-  "version": "0.0.1",
-  "lockfileVersion": 2,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "cli-wasm",
-      "version": "0.0.1",
-      "license": "MIT",
-      "dependencies": {
-        "@trustwallet/wallet-core": "3.0.4",
-        "chalk": "^4.1.2",
-        "clear": "^0.1.0",
-        "figlet": "^1.5.2",
-        "inquirer": "^8.2.4"
-      },
-      "bin": {
-        "cli": "index.ts"
-      },
-      "devDependencies": {
-        "@types/node": "^18.7.15",
-        "ts-node": "^10.9.1",
-        "typescript": "^4.8.2"
-      }
-    },
-    "node_modules/@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "dev": true,
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
-    "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
-      "dependencies": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "node_modules/@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
-    },
-    "node_modules/@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
-    },
-    "node_modules/@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
-    },
-    "node_modules/@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
-    },
-    "node_modules/@protobufjs/fetch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.1",
-        "@protobufjs/inquire": "^1.1.0"
-      }
-    },
-    "node_modules/@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
-    },
-    "node_modules/@protobufjs/inquire": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
-    },
-    "node_modules/@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
-    },
-    "node_modules/@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
-    },
-    "node_modules/@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
-    },
-    "node_modules/@trustwallet/wallet-core": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@trustwallet/wallet-core/-/wallet-core-3.0.4.tgz",
-      "integrity": "sha512-FrIVEwRmUYFuwU9IoXg0J8fngeW7nlJZZAsrnOWba2g/yGWZl4FQ4z87MEQ5ROOGW9jJzsdWG4PRZffvYzhqsg==",
-      "dependencies": {
-        "protobufjs": ">=6.11.3"
-      }
-    },
-    "node_modules/@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
-    },
-    "node_modules/@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "dev": true
-    },
-    "node_modules/@types/node": {
-      "version": "18.7.15",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.15.tgz",
-      "integrity": "sha512-XnjpaI8Bgc3eBag2Aw4t2Uj/49lLBSStHWfqKvIuXD7FIrZyMLWp8KuAFHAqxMZYTF9l08N1ctUn9YNybZJVmQ=="
-    },
-    "node_modules/acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
-      "dev": true,
-      "bin": {
-        "acorn": "bin/acorn"
-      },
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "dependencies": {
-        "type-fest": "^0.21.3"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "dependencies": {
-        "color-convert": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-      }
-    },
-    "node_modules/arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
-    },
-    "node_modules/base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "dependencies": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      }
-    },
-    "node_modules/bl/node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ],
-      "dependencies": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "node_modules/chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/chalk?sponsor=1"
-      }
-    },
-    "node_modules/chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
-    "node_modules/clear": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/clear/-/clear-0.1.0.tgz",
-      "integrity": "sha512-qMjRnoL+JDPJHeLePZJuao6+8orzHMGP04A8CdwCNsKhRbOnKRjefxONR7bwILT3MHecxKBjHkKL/tkZ8r4Uzw==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "dependencies": {
-        "restore-cursor": "^3.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/cli-spinners": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
-      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw==",
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==",
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
-      "engines": {
-        "node": ">=7.0.0"
-      }
-    },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "node_modules/create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
-    },
-    "node_modules/defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==",
-      "dependencies": {
-        "clone": "^1.0.2"
-      }
-    },
-    "node_modules/diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true,
-      "engines": {
-        "node": ">=0.3.1"
-      }
-    },
-    "node_modules/emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "dependencies": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/figlet": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz",
-      "integrity": "sha512-WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ==",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
-    "node_modules/figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "dependencies": {
-        "escape-string-regexp": "^1.0.5"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-    },
-    "node_modules/inquirer": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz",
-      "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==",
-      "dependencies": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "dependencies": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/long": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-5.2.0.tgz",
-      "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
-    },
-    "node_modules/make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-    },
-    "node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "dependencies": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/protobufjs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.0.tgz",
-      "integrity": "sha512-rCuxKlh0UQKSMjrpIcTLbR5TtGQ52cgs1a5nUoPBAKOccdPblN67BJtjrbtudUJK6HmBvUdsmymyYOzO7lxZEA==",
-      "hasInstallScript": true,
-      "dependencies": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      }
-    },
-    "node_modules/readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "dependencies": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/rxjs": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
-      "dependencies": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "node_modules/safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "node_modules/string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "dependencies": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-    },
-    "node_modules/tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "dependencies": {
-        "os-tmpdir": "~1.0.2"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/ts-node": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-      "dev": true,
-      "dependencies": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      },
-      "bin": {
-        "ts-node": "dist/bin.js",
-        "ts-node-cwd": "dist/bin-cwd.js",
-        "ts-node-esm": "dist/bin-esm.js",
-        "ts-node-script": "dist/bin-script.js",
-        "ts-node-transpile-only": "dist/bin-transpile.js",
-        "ts-script": "dist/bin-script-deprecated.js"
-      },
-      "peerDependencies": {
-        "@swc/core": ">=1.2.50",
-        "@swc/wasm": ">=1.2.50",
-        "@types/node": "*",
-        "typescript": ">=2.7"
-      },
-      "peerDependenciesMeta": {
-        "@swc/core": {
-          "optional": true
-        },
-        "@swc/wasm": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "node_modules/type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/typescript": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
-      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
-      "dev": true,
-      "bin": {
-        "tsc": "bin/tsc",
-        "tsserver": "bin/tsserver"
-      },
-      "engines": {
-        "node": ">=4.2.0"
-      }
-    },
-    "node_modules/util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "node_modules/v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
-    },
-    "node_modules/wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "dependencies": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "node_modules/wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "dependencies": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
-      }
-    },
-    "node_modules/yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true,
-      "engines": {
-        "node": ">=6"
-      }
-    }
-  },
-  "dependencies": {
-    "@cspotcode/source-map-support": {
-      "version": "0.8.1",
-      "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz",
-      "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/trace-mapping": "0.3.9"
-      }
-    },
-    "@jridgewell/resolve-uri": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz",
-      "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==",
-      "dev": true
-    },
-    "@jridgewell/sourcemap-codec": {
-      "version": "1.4.14",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz",
-      "integrity": "sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==",
-      "dev": true
-    },
-    "@jridgewell/trace-mapping": {
-      "version": "0.3.9",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz",
-      "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==",
-      "dev": true,
-      "requires": {
-        "@jridgewell/resolve-uri": "^3.0.3",
-        "@jridgewell/sourcemap-codec": "^1.4.10"
-      }
-    },
-    "@protobufjs/aspromise": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/aspromise/-/aspromise-1.1.2.tgz",
-      "integrity": "sha512-j+gKExEuLmKwvz3OgROXtrJ2UG2x8Ch2YZUxahh+s1F2HZ+wAceUNLkvy6zKCPVRkU++ZWQrdxsUeQXmcg4uoQ=="
-    },
-    "@protobufjs/base64": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/base64/-/base64-1.1.2.tgz",
-      "integrity": "sha512-AZkcAA5vnN/v4PDqKyMR5lx7hZttPDgClv83E//FMNhR2TMcLUhfRUBHCmSl0oi9zMgDDqRUJkSxO3wm85+XLg=="
-    },
-    "@protobufjs/codegen": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz",
-      "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg=="
-    },
-    "@protobufjs/eventemitter": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz",
-      "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q=="
-    },
-    "@protobufjs/fetch": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz",
-      "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==",
-      "requires": {
-        "@protobufjs/aspromise": "^1.1.1",
-        "@protobufjs/inquire": "^1.1.0"
-      }
-    },
-    "@protobufjs/float": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/float/-/float-1.0.2.tgz",
-      "integrity": "sha512-Ddb+kVXlXst9d+R9PfTIxh1EdNkgoRe5tOX6t01f1lYWOvJnSPDBlG241QLzcyPdoNTsblLUdujGSE4RzrTZGQ=="
-    },
-    "@protobufjs/inquire": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz",
-      "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q=="
-    },
-    "@protobufjs/path": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz",
-      "integrity": "sha512-6JOcJ5Tm08dOHAbdR3GrvP+yUUfkjG5ePsHYczMFLq3ZmMkAD98cDgcT2iA1lJ9NVwFd4tH/iSSoe44YWkltEA=="
-    },
-    "@protobufjs/pool": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/pool/-/pool-1.1.0.tgz",
-      "integrity": "sha512-0kELaGSIDBKvcgS4zkjz1PeddatrjYcmMWOlAuAPwAeccUrPHdUqo/J6LiymHHEiJT5NrF1UVwxY14f+fy4WQw=="
-    },
-    "@protobufjs/utf8": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz",
-      "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw=="
-    },
-    "@trustwallet/wallet-core": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@trustwallet/wallet-core/-/wallet-core-3.0.4.tgz",
-      "integrity": "sha512-FrIVEwRmUYFuwU9IoXg0J8fngeW7nlJZZAsrnOWba2g/yGWZl4FQ4z87MEQ5ROOGW9jJzsdWG4PRZffvYzhqsg==",
-      "requires": {
-        "protobufjs": ">=6.11.3"
-      }
-    },
-    "@tsconfig/node10": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz",
-      "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==",
-      "dev": true
-    },
-    "@tsconfig/node12": {
-      "version": "1.0.11",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz",
-      "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==",
-      "dev": true
-    },
-    "@tsconfig/node14": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz",
-      "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==",
-      "dev": true
-    },
-    "@tsconfig/node16": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz",
-      "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==",
-      "dev": true
-    },
-    "@types/node": {
-      "version": "18.7.15",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.7.15.tgz",
-      "integrity": "sha512-XnjpaI8Bgc3eBag2Aw4t2Uj/49lLBSStHWfqKvIuXD7FIrZyMLWp8KuAFHAqxMZYTF9l08N1ctUn9YNybZJVmQ=="
-    },
-    "acorn": {
-      "version": "8.8.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.8.0.tgz",
-      "integrity": "sha512-QOxyigPVrpZ2GXT+PFyZTl6TtOFc5egxHIP9IlQ+RbupQuX4RkT/Bee4/kQuC02Xkzg84JcT7oLYtDIQxp+v7w==",
-      "dev": true
-    },
-    "acorn-walk": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz",
-      "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==",
-      "dev": true
-    },
-    "ansi-escapes": {
-      "version": "4.3.2",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
-      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
-      "requires": {
-        "type-fest": "^0.21.3"
-      }
-    },
-    "ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="
-    },
-    "ansi-styles": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
-      "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
-      "requires": {
-        "color-convert": "^2.0.1"
-      }
-    },
-    "arg": {
-      "version": "4.1.3",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz",
-      "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==",
-      "dev": true
-    },
-    "base64-js": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
-      "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="
-    },
-    "bl": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz",
-      "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==",
-      "requires": {
-        "buffer": "^5.5.0",
-        "inherits": "^2.0.4",
-        "readable-stream": "^3.4.0"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-        }
-      }
-    },
-    "buffer": {
-      "version": "5.7.1",
-      "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz",
-      "integrity": "sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==",
-      "requires": {
-        "base64-js": "^1.3.1",
-        "ieee754": "^1.1.13"
-      }
-    },
-    "chalk": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
-      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
-      "requires": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      }
-    },
-    "chardet": {
-      "version": "0.7.0",
-      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
-      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA=="
-    },
-    "clear": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/clear/-/clear-0.1.0.tgz",
-      "integrity": "sha512-qMjRnoL+JDPJHeLePZJuao6+8orzHMGP04A8CdwCNsKhRbOnKRjefxONR7bwILT3MHecxKBjHkKL/tkZ8r4Uzw=="
-    },
-    "cli-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
-      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
-      "requires": {
-        "restore-cursor": "^3.1.0"
-      }
-    },
-    "cli-spinners": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/cli-spinners/-/cli-spinners-2.7.0.tgz",
-      "integrity": "sha512-qu3pN8Y3qHNgE2AFweciB1IfMnmZ/fsNTEE+NOFjmGB2F/7rLhnhzppvpCnN4FovtP26k8lHyy9ptEbNwWFLzw=="
-    },
-    "cli-width": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
-      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw=="
-    },
-    "clone": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
-      "integrity": "sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg=="
-    },
-    "color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "requires": {
-        "color-name": "~1.1.4"
-      }
-    },
-    "color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
-    },
-    "create-require": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz",
-      "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==",
-      "dev": true
-    },
-    "defaults": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
-      "integrity": "sha512-s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA==",
-      "requires": {
-        "clone": "^1.0.2"
-      }
-    },
-    "diff": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
-      "dev": true
-    },
-    "emoji-regex": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-      "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="
-    },
-    "escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="
-    },
-    "external-editor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
-      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
-      "requires": {
-        "chardet": "^0.7.0",
-        "iconv-lite": "^0.4.24",
-        "tmp": "^0.0.33"
-      }
-    },
-    "figlet": {
-      "version": "1.5.2",
-      "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz",
-      "integrity": "sha512-WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ=="
-    },
-    "figures": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
-      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
-      "requires": {
-        "escape-string-regexp": "^1.0.5"
-      }
-    },
-    "has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="
-    },
-    "iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "requires": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      }
-    },
-    "ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="
-    },
-    "inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-    },
-    "inquirer": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-8.2.4.tgz",
-      "integrity": "sha512-nn4F01dxU8VeKfq192IjLsxu0/OmMZ4Lg3xKAns148rCaXP6ntAoEkVYZThWjwON8AlzdZZi6oqnhNbxUG9hVg==",
-      "requires": {
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.1.1",
-        "cli-cursor": "^3.1.0",
-        "cli-width": "^3.0.0",
-        "external-editor": "^3.0.3",
-        "figures": "^3.0.0",
-        "lodash": "^4.17.21",
-        "mute-stream": "0.0.8",
-        "ora": "^5.4.1",
-        "run-async": "^2.4.0",
-        "rxjs": "^7.5.5",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "through": "^2.3.6",
-        "wrap-ansi": "^7.0.0"
-      }
-    },
-    "is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="
-    },
-    "is-interactive": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
-      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w=="
-    },
-    "is-unicode-supported": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
-      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw=="
-    },
-    "lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "log-symbols": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
-      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
-      "requires": {
-        "chalk": "^4.1.0",
-        "is-unicode-supported": "^0.1.0"
-      }
-    },
-    "long": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/long/-/long-5.2.0.tgz",
-      "integrity": "sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w=="
-    },
-    "make-error": {
-      "version": "1.3.6",
-      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
-      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
-      "dev": true
-    },
-    "mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg=="
-    },
-    "mute-stream": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
-      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA=="
-    },
-    "onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "requires": {
-        "mimic-fn": "^2.1.0"
-      }
-    },
-    "ora": {
-      "version": "5.4.1",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz",
-      "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==",
-      "requires": {
-        "bl": "^4.1.0",
-        "chalk": "^4.1.0",
-        "cli-cursor": "^3.1.0",
-        "cli-spinners": "^2.5.0",
-        "is-interactive": "^1.0.0",
-        "is-unicode-supported": "^0.1.0",
-        "log-symbols": "^4.1.0",
-        "strip-ansi": "^6.0.0",
-        "wcwidth": "^1.0.1"
-      }
-    },
-    "os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="
-    },
-    "protobufjs": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.1.0.tgz",
-      "integrity": "sha512-rCuxKlh0UQKSMjrpIcTLbR5TtGQ52cgs1a5nUoPBAKOccdPblN67BJtjrbtudUJK6HmBvUdsmymyYOzO7lxZEA==",
-      "requires": {
-        "@protobufjs/aspromise": "^1.1.2",
-        "@protobufjs/base64": "^1.1.2",
-        "@protobufjs/codegen": "^2.0.4",
-        "@protobufjs/eventemitter": "^1.1.0",
-        "@protobufjs/fetch": "^1.1.0",
-        "@protobufjs/float": "^1.0.2",
-        "@protobufjs/inquire": "^1.1.0",
-        "@protobufjs/path": "^1.1.2",
-        "@protobufjs/pool": "^1.1.0",
-        "@protobufjs/utf8": "^1.1.0",
-        "@types/node": ">=13.7.0",
-        "long": "^5.0.0"
-      }
-    },
-    "readable-stream": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
-      "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
-      "requires": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      }
-    },
-    "restore-cursor": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
-      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
-      "requires": {
-        "onetime": "^5.1.0",
-        "signal-exit": "^3.0.2"
-      }
-    },
-    "run-async": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
-      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="
-    },
-    "rxjs": {
-      "version": "7.5.6",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.5.6.tgz",
-      "integrity": "sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw==",
-      "requires": {
-        "tslib": "^2.1.0"
-      }
-    },
-    "safe-buffer": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
-      "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="
-    },
-    "safer-buffer": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
-      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
-    },
-    "signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "requires": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
-    "string-width": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz",
-      "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==",
-      "requires": {
-        "emoji-regex": "^8.0.0",
-        "is-fullwidth-code-point": "^3.0.0",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "requires": {
-        "ansi-regex": "^5.0.1"
-      }
-    },
-    "supports-color": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
-      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
-      "requires": {
-        "has-flag": "^4.0.0"
-      }
-    },
-    "through": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
-      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
-    },
-    "tmp": {
-      "version": "0.0.33",
-      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
-      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
-      "requires": {
-        "os-tmpdir": "~1.0.2"
-      }
-    },
-    "ts-node": {
-      "version": "10.9.1",
-      "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz",
-      "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==",
-      "dev": true,
-      "requires": {
-        "@cspotcode/source-map-support": "^0.8.0",
-        "@tsconfig/node10": "^1.0.7",
-        "@tsconfig/node12": "^1.0.7",
-        "@tsconfig/node14": "^1.0.0",
-        "@tsconfig/node16": "^1.0.2",
-        "acorn": "^8.4.1",
-        "acorn-walk": "^8.1.1",
-        "arg": "^4.1.0",
-        "create-require": "^1.1.0",
-        "diff": "^4.0.1",
-        "make-error": "^1.1.1",
-        "v8-compile-cache-lib": "^3.0.1",
-        "yn": "3.1.1"
-      }
-    },
-    "tslib": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.4.0.tgz",
-      "integrity": "sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="
-    },
-    "type-fest": {
-      "version": "0.21.3",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
-      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w=="
-    },
-    "typescript": {
-      "version": "4.8.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.2.tgz",
-      "integrity": "sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw==",
-      "dev": true
-    },
-    "util-deprecate": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
-    },
-    "v8-compile-cache-lib": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz",
-      "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==",
-      "dev": true
-    },
-    "wcwidth": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
-      "integrity": "sha512-XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==",
-      "requires": {
-        "defaults": "^1.0.3"
-      }
-    },
-    "wrap-ansi": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz",
-      "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==",
-      "requires": {
-        "ansi-styles": "^4.0.0",
-        "string-width": "^4.1.0",
-        "strip-ansi": "^6.0.0"
-      }
-    },
-    "yn": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz",
-      "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==",
-      "dev": true
-    }
-  }
-}
diff --git a/samples/typescript/devconsole.ts/package.json b/samples/typescript/devconsole.ts/package.json
deleted file mode 100644
index 7ca581061d5..00000000000
--- a/samples/typescript/devconsole.ts/package.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "name": "cli-wasm",
-  "version": "0.0.1",
-  "description": "CLI utility for Wallet Core, through WASM",
-  "main": "index.ts",
-  "bin": {
-    "cli": "index.ts"
-  },
-  "scripts": {
-    "start": "ts-node src/index.ts",
-    "build": "tsc -p .",
-    "test": "cat test/data/privpubkey.testinput.txt | ts-node src/index.ts"
-  },
-  "author": "Trust Wallet",
-  "license": "MIT",
-  "dependencies": {
-    "@trustwallet/wallet-core": "3.0.4",
-    "chalk": "^4.1.2",
-    "clear": "^0.1.0",
-    "figlet": "^1.5.2",
-    "inquirer": "^8.2.4"
-  },
-  "devDependencies": {
-    "@types/node": "^18.7.15",
-    "ts-node": "^10.9.1",
-    "typescript": "^4.8.2"
-  }
-}
diff --git a/samples/typescript/devconsole.ts/samplescripts/privkeysign.sampleinput.txt b/samples/typescript/devconsole.ts/samplescripts/privkeysign.sampleinput.txt
deleted file mode 100644
index 05a6b7a776f..00000000000
--- a/samples/typescript/devconsole.ts/samplescripts/privkeysign.sampleinput.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-// Create a private key, sign a message, derive public key from private key, verify signature
-
-privKeyData = '0xafeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5'
-messageDigest = '0001020304050607080910111213141519171819202122232425262728293031'
-
-privkey = PrivateKey.createWithData(HexCoding.decode(privKeyData)); HexCoding.encode(privkey.data())
-
-sig1 = privkey.sign(HexCoding.decode(messageDigest), Curve.secp256k1); HexCoding.encode(sig1)
-
-pubkey = privkey.getPublicKeySecp256k1(true); HexCoding.encode(pubkey.data())
-
-verifyRes = pubkey.verify(sig1, HexCoding.decode(messageDigest))
diff --git a/samples/typescript/devconsole.ts/samplescripts/protoeth.sampleinput.txt b/samples/typescript/devconsole.ts/samplescripts/protoeth.sampleinput.txt
deleted file mode 100644
index 422d16881d4..00000000000
--- a/samples/typescript/devconsole.ts/samplescripts/protoeth.sampleinput.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// test signing eip1559 erc20 transfer tx
-
-input = TW.Ethereum.Proto.SigningInput.create({
-      toAddress: "0x6b175474e89094c44da98b954eedeac495271d0f",
-      chainId: Buffer.from("01", "hex"),
-      nonce: Buffer.from("00", "hex"),
-      txMode: TW.Ethereum.Proto.TransactionMode.Enveloped,
-      maxInclusionFeePerGas: Buffer.from("0077359400", "hex"),
-      maxFeePerGas: Buffer.from("00b2d05e00", "hex"),
-      gasLimit: Buffer.from("0130B9", "hex"),
-      transaction: TW.Ethereum.Proto.Transaction.create({
-        erc20Transfer: TW.Ethereum.Proto.Transaction.ERC20Transfer.create({
-          to: "0x5322b34c88ed0691971bf52a7047448f0f4efc84",
-          amount: Buffer.from("1bc16d674ec80000", "hex"),
-        }),
-      }),
-      privateKey: HexCoding.decode(
-        "0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151"
-      ),
-    });
-
-encoded = TW.Ethereum.Proto.SigningInput.encode(input).finish(); HexCoding.encode(encoded)
-
-outputData = AnySigner.sign(encoded, CoinType.ethereum); HexCoding.encode(outputData)
-
-output = TW.Ethereum.Proto.SigningOutput.decode(outputData); HexCoding.encode(output.encoded)
diff --git a/samples/typescript/devconsole.ts/samplescripts/solanaaddress.sampleinput.txt b/samples/typescript/devconsole.ts/samplescripts/solanaaddress.sampleinput.txt
deleted file mode 100644
index c2796a598b8..00000000000
--- a/samples/typescript/devconsole.ts/samplescripts/solanaaddress.sampleinput.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-// Derive a Solana address directly and through privKey-pubKey
-
-coin = CoinType.solana
-
-wallet = HDWallet.createWithMnemonic('ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal', '')
-
-address = wallet.getAddressForCoin(coin)
-
-pk = wallet.getKeyForCoin(coin); HexCoding.encode(pk.data())
-pubkey = pk.getPublicKeyEd25519(); HexCoding.encode(pubkey.data())
-a1 = AnyAddress.createWithPublicKey(pubkey, coin); a1.description()
-
-address === a1.description()
diff --git a/samples/typescript/devconsole.ts/samplescripts/wallets.sampleinput.txt b/samples/typescript/devconsole.ts/samplescripts/wallets.sampleinput.txt
deleted file mode 100644
index 415993f3d4e..00000000000
--- a/samples/typescript/devconsole.ts/samplescripts/wallets.sampleinput.txt
+++ /dev/null
@@ -1,51 +0,0 @@
-// Delete all wallets to start with empty state (commented out not to accidentally remove data)
-//await walletsDeleteAll('deleteall')
-
-// create a wallet
-await walletCreate(256, 'First')
-await walletsList()
-await walletDump()
-
-// add an extra coin to it
-await walletAddCoin(WC.CoinType.solana)
-await walletDump()
-
-// Create a second wallet by mnemonic import
-await walletImport('ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal', 'Imported')
-await walletsList()
-await walletDump()
-
-// Load first ...
-await walletsList()
-await walletLoad(0)
-await walletDump()
-
-// ... then second
-await walletsList()
-await walletLoad(1)
-await walletDump()
-
-// retrieve private key and verify that it derives the same address
-coin = WC.CoinType.bitcoin
-privkey = wallets.wallet.wallet.privateKey(coin, 'devconsole.ts')
-pubkey = privkey.getPublicKeySecp256k1(true); HexCoding.encode(pubkey.data())
-addrDerived = AnyAddress.createWithPublicKey(pubkey, coin).description()
-addrStored = wallets.wallet.wallet.account(0).address()
-addrDerived === addrStored
-
-// create another wallet
-await walletCreate(256, 'Another')
-await walletsList()
-await walletDump()
-
-// Delete it
-await walletDelete('delete')
-await walletsList()
-await walletDump()
-
-await walletLoad(0)
-await walletDump()
-
-// Delete all wallets (commented out not to accidentally remove data)
-//await walletDeleteAll('deleteall')
-//await walletsList()
diff --git a/samples/typescript/devconsole.ts/src/index.ts b/samples/typescript/devconsole.ts/src/index.ts
deleted file mode 100644
index fd994c1f539..00000000000
--- a/samples/typescript/devconsole.ts/src/index.ts
+++ /dev/null
@@ -1,358 +0,0 @@
-#!/usr/bin/env ts-node
-
-const chalk = require('chalk');
-const clear = require('clear');
-const figlet = require('figlet');
-const repl = require('node:repl');
-const { initWasm, TW, KeyStore } = require("@trustwallet/wallet-core");
-const fs = require("fs");
-
-function enumerateNamespaces(topLevelNamespace: any) {
-    const exceptions: string[] = ['AsciiToString', 'ExitStatus', 'ENV', 'ERRNO_CODES', 'ERRNO_MESSAGES', 'DNS', 'Protocols', 'Sockets', 'UNWIND_CACHE', 'PATH', 'PATH_FS', 'SYSCALLS', 'JSEvents', 'JSEvents_requestFullscreen', 'JSEvents_resizeCanvasForFullscreen', 'ExceptionInfo', 'Browser', 'FS', 'MEMFS', 'TTY', 'PIPEFS', 'SOCKFS', 'RegisteredClass', 'Emval'];
-    var ns : string[] = [];
-    for (var member in topLevelNamespace) {
-        if (typeof topLevelNamespace[member] == 'function' || typeof topLevelNamespace[member] == 'object') {
-            ns.push(member);
-        }
-    }
-    return ns
-        .filter(n => { var firstLetter = n[0]; return (firstLetter >= 'A' && firstLetter <= 'Z'); })
-        .filter(n => !n.includes('Error'))
-        .filter(n => !n.startsWith('HEAP'))
-        .filter(n => !n.startsWith('UTF'))
-        .filter(n => !n.startsWith('FS_'))
-        .filter(n => !n.startsWith('ClassHandle'))
-        .filter(n => !n.startsWith('RegisteredPointer'))
-        .filter(n => !exceptions.includes(n));
-}
-
-async function main() {
-    // Wrapper for a wallet stored in keystore
-    class StoredKeyWallet {
-        wallet: any; // StoredKey
-        constructor(w: any) {
-            this.wallet = w;
-        }
-        status(): string {
-            return `Wallet '${this.wallet.name()}', with ${this.wallet.accountCount()} addresses`;
-        }
-        dump(): void {
-            console.error(`Wallet '${this.wallet.name()}', ${this.wallet.isMnemonic() ? 'type mnemonic' : ''}:`);
-
-            if (this.wallet.accountCount() == 0) {
-                console.log('No addresses');
-            } else {
-                console.log('Addresses:');
-                const n = this.wallet.accountCount();
-                for (var i = 0; i < n; ++i) {
-                    const a = this.wallet.account(i);
-                    console.log(`  ${WC.CoinTypeConfiguration.getSymbol(a.coin())}:  ${a.address()}`);
-                }
-            }
-        }
-    }
-
-    // Handles several wallets, with keystore
-    class TestWalletManager {
-        // single opened StoredKeyWallet instance
-        wallet: StoredKeyWallet | null = null;
-        StoreFolderPath = "/tmp/devconsole.ts";
-        StoreFixedPassword = "devconsole.ts";
-        HDWalletPassord = '';
-        DefaultCoins: any[] = [];
-        keystore: any = null;
-        // wallets available in storage
-        storeWallets: any[] = [];
-        
-        init(): void {
-            this.DefaultCoins = [WC.CoinType.bitcoin, WC.CoinType.ethereum, WC.CoinType.binance];
-            this.keystore = null;
-            // check and try to create store folder
-            if (!fs.existsSync(this.StoreFolderPath)) {
-                // try to create, ignore error
-                fs.mkdirSync(this.StoreFolderPath);
-            }
-            // check again
-            if (!fs.existsSync(this.StoreFolderPath)) {
-                console.log(`ERROR: Could not open/create storage folder!  Wallet storage will not work.  '${this.StoreFolderPath}'`);
-                return;
-            }
-            const storage = new KeyStore.FileSystemStorage(this.StoreFolderPath);
-            this.keystore = new KeyStore.Default(WC, storage);
-        }
-        async refreshStoreWallets(): Promise<void> {
-            if (!this.keystore) { return; }
-            process.stdout.write(`Refreshing wallets list ... `);
-            try {
-                this.storeWallets = await this.keystore.loadAll();
-                console.log(`found ${this.storeWallets.length} wallets  (dir: ${this.StoreFolderPath})`);
-            } catch (err) {
-                console.log(`Exception: ${err}`);
-            }
-        }
-        async list(): Promise<void> {
-            if (!this.keystore) {
-                console.log(`Keystore not available!`);
-                return;
-            }
-            await this.refreshStoreWallets();
-            if (!this.storeWallets || this.storeWallets.length == 0) {
-                console.log("No wallets found in storage.");
-            } else {
-                let idx = 0;
-                console.log(`Found ${this.storeWallets.length} wallets in storage, use walletLoad(id) to load:`);
-                this.storeWallets.forEach(w => console.log(`${idx++}:  ${w.name} \t${w.activeAccounts.length} addrs  \t${w.id}`));
-            }
-        }
-        async load(index: number) {
-            this.wallet = null;
-            if (!this.keystore) { return; }
-            try {
-                await this.refreshStoreWallets();
-                if (index >= this.storeWallets.length) {
-                    console.log(`Index out of range, max ${this.storeWallets.length}`);
-                    await walletsList();
-                    return;
-                }
-                const id = this.storeWallets[index].id;
-                process.stdout.write(`Loading wallet ${index} ${id} ... `);
-                const wallet = await this.keystore.load(id);
-                console.log("done");
-                this.wallet = new StoredKeyWallet(this.keystore.mapStoredKey(wallet));
-                this.status();
-            } catch (err) {
-                console.log(`Exception: ${err}`);
-            }
-        }
-        async loadAWallet() {
-            if (this.storeWallets.length > 0) {
-                await this.load(0);
-            }
-        }
-        autoFillName(name: string): string {
-            return (name === '') ? `Wallet${(this.storeWallets.length + 1).toString()}` : name;
-        }
-        async create(strength: number, name: string): Promise<any> {
-            this.wallet = null;
-            if (!this.keystore) { return; }
-            try {
-                if (name === '') { name = this.autoFillName(name); }
-                const hdWallet = WC.HDWallet.create(strength, this.HDWalletPassord);
-                const storedKey = WC.StoredKey.importHDWallet(hdWallet.mnemonic(), name, Buffer.from(this.StoreFixedPassword), this.DefaultCoins[0]);
-                this.DefaultCoins.forEach((coin) => {
-                    storedKey.accountForCoin(coin, hdWallet);
-                });
-                let wallet = this.keystore.mapWallet(storedKey);
-                await this.keystore.importWallet(wallet);
-                this.wallet = new StoredKeyWallet(storedKey);
-                console.log(`Wallet ${name} created, mnemonic: ${hdWallet.mnemonic()}`);
-                this.status();
-                return this.wallet;
-            } catch (err) {
-                console.log(`Exception: ${err}`);
-            }
-        }
-        async import(mnemonic: string, name: string): Promise<any> {
-            this.wallet = null;
-            if (!this.keystore) { return; }
-            try {
-                if (!WC.Mnemonic.isValid(mnemonic)) {
-                    console.error(`Mnemonic is not valid ${mnemonic}`);
-                    return null;
-                }
-                if (name === '') { name = this.autoFillName(name); }
-                // There are two ways to do this here:
-                // 1. Create HDWallet with mnemonic, create StoroedKey with it (add coins), then map to a KeyStore wallet and import it into the storage, or
-                // 2. Import in KeyStore directly (using mnemonic), and obtain StoredKey from it
-                let wallet = await this.keystore.import(mnemonic, name, this.StoreFixedPassword, this.DefaultCoins);
-                this.wallet = new StoredKeyWallet(this.keystore.mapStoredKey(wallet));
-                console.log(`Wallet ${name} imported, mnemonic: ${mnemonic}`);
-                this.status();
-                return this.wallet;
-            } catch (err) {
-                console.log(`Exception: ${err}`);
-            }
-        }
-        async addCoin(coin: string): Promise<void> {
-            if (this.wallet == null) {
-                console.error('No wallet open, see walletCreate() / walletLoad() / walletsList()');
-                return;
-            }
-            if (!this.keystore) { return; }
-            const wallet = await this.keystore.addAccounts(this.wallet?.wallet.identifier(), this.StoreFixedPassword, [coin]);
-            this.wallet = new StoredKeyWallet(this.keystore.mapStoredKey(wallet));
-        }
-        // Delete loaded wallet
-        async delete(param: string): Promise<void> {
-            if (!this.wallet) {
-                console.log(`No wallet loaded`);
-                return;
-            }
-            if (!this.keystore) { return; }
-                try {
-                if (param !== 'delete') {
-                    console.log(`Are you sure? Invoke with 'delete' parameter!`);
-                    return;
-                }
-                const name = this.wallet.wallet.name();
-                const id = this.wallet.wallet.identifier();
-                await this.keystore.delete(id, this.StoreFixedPassword);
-                this.wallet = null;
-                console.log(`Wallet '${name}' ${id} deleted.`);
-                await this.refreshStoreWallets();
-            } catch (err) {
-                console.log(`Exception: ${err}`);
-            }
-        }
-        async deleteAll(param: string): Promise<void> {
-            await this.refreshStoreWallets();
-            if (this.storeWallets.length == 0) {
-                console.log(`No wallets found`);
-                return;
-            }
-            if (!this.keystore) { return; }
-            try {
-                if (param !== 'deleteall') {
-                    console.log(`Are you sure? Invoke with 'deleteall' parameter!`);
-                    return;
-                }
-                while (this.storeWallets.length > 0) {
-                    const id = this.storeWallets[0].id;
-                    await this.keystore.delete(id, this.StoreFixedPassword);
-                    await this.refreshStoreWallets();
-                }
-                this.wallet = null;
-                console.log(`All wallets deleted.`)
-            } catch (err) {
-                console.log(`Exception: ${err}`);
-            }
-        }
-        status(): void {
-            if (this.wallet === null) {
-                console.error(`No wallet open, ${this.storeWallets.length} available; see walletCreate() / walletLoad() / walletsList()`);
-            } else {
-                console.error(`Wallet open: ${this.wallet.status()}`);
-            }
-        }
-        dump(): void {
-            this.status();
-            if (this.wallet) {
-                this.wallet.dump();
-            }
-        }
-    };
-
-    // single global TestWalletManager instance
-    let wallets: TestWalletManager = new TestWalletManager();
-
-    async function walletsList() { await wallets.list(); }
-    async function walletLoad(index: number) { await wallets.load(index); }
-    async function walletsDeleteAll(param: string) { await wallets.deleteAll(param); }
-    async function walletCreate(strength: number = 256, name: string = ''): Promise<any> { return await wallets.create(strength, name); }
-    async function walletImport(mnemonic: string, name: string = ''): Promise<any> { return wallets.import(mnemonic, name); }
-    async function walletAddCoin(coin: string): Promise<void> { return wallets.addCoin(coin); }
-    function walletDump(): void { wallets.dump(); }
-    async function walletDelete(param: string) { await wallets.delete(param); }
-
-    function help(): void {
-        console.log('This is an interactive typescript shell, to work with wallet-core (wasm)');
-        console.log('You can use:');
-        console.log();
-        console.log("- Any typescript commands                        EXAMPLES");
-        console.log("                                                 'wallet-core'.length");
-        console.log("                                                 x = 5; ++x");
-        console.log();
-        console.log('- Any method from Wallet-Core, through various namespaces, see full list below.  Some examples:');
-        console.log("    CoinType                                     CoinType.bitcoin.value");
-        console.log("    HDWallet                                     wallet = HDWallet.create(256, ''); wallet.mnemonic()");
-        console.log("    PrivateKey                                   pk = PrivateKey.createWithData(HexCoding.decode('afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5'))");
-        console.log("    PublicKey                                    pubkey = PublicKey.createWithData(HexCoding.decode('0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1'), PublicKeyType.secp256k1)");
-        console.log("    AnyAddress                                   AnyAddress.createWithString('EQCTVra3xPXenA1wNFMba2taTsc9XMdfCWC7FJpGXjk7', CoinType.solana).description()");
-        console.log("    CoinTypeConfiguration                        CoinTypeConfiguration.getSymbol(CoinType.bitcoin)");
-        console.log("    Mnemonmic                                    Mnemonic.isValidWord('acid')");
-        console.log("    HexCoding                                    HexCoding.encode(HexCoding.decode('01ab02'))");
-        console.log();
-        console.log("- Convenience methods:");
-        console.log("    walletCreate([strength], [name])             walletCreate(128)");
-        console.log("    walletImport(mnemonic, [name])               walletImport('ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal', 'Test1')");
-        console.log("    walletDump()                                 walletDump()");
-        console.log();
-        console.log("See examples in samplescripts folder, e.g.:  cat samplescripts/protoeth.sampleinput.txt | npm run start");
-        console.log();
-        console.log("A longer example:");
-        console.log("    coin = CoinType.solana");
-        console.log("    wallet = HDWallet.createWithMnemonic('ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal', '')");
-        console.log("    wallet.getAddressForCoin(coin)");
-        console.log("    pk = wallet.getKeyForCoin(coin)");
-        console.log("    HexCoding.encode(pk.data())");
-        console.log("    pubkey = pk.getPublicKeyEd25519()");
-        console.log("    HexCoding.encode(pubkey.data())");
-        console.log("    a1 = AnyAddress.createWithPublicKey(pubkey, coin)");
-        console.log("    a1.description()");
-        console.log();
-        console.log("Full list of exposed Wallet-core namespaces:");
-        console.log(enumerateNamespaces(WC).sort().join(', '));
-        console.log(enumerateNamespaces(TW).sort().map(n => 'TW.' + n).join(', '));
-        console.log();
-    }
-
-    function exit(code: number): void {
-        process.exit(code);
-    }
-
-    clear();
-    console.log(
-        chalk.blue(
-            figlet.textSync('wallet-core', { horizontalLayout: 'full' })
-        )
-    );
-    console.log(chalk.blue('  devconsole.ts, wasm lib'));
-    console.log();
-
-    process.stdout.write("Initializing WalletCore library ...");
-    const WC = await initWasm();
-    console.log(` done.`);
-    console.log();
-    console.log(`Type 'help()' for help`);
-    console.log(`Press Ctrl-C twice to exit`);
-    console.log(chalk.red(`This is a test tool, DO NOT USE WITH REAL FUNDS!`));
-    console.log();
-
-    wallets.init();
-    await wallets.refreshStoreWallets();
-    await wallets.loadAWallet();
-
-    const local = repl.start('> ');
-
-    // Expose WC namespaces, as top-level
-    var nss = enumerateNamespaces(WC);
-    nss.forEach(ns => local.context[ns] = WC[ns]);
-    // also all under WC
-    local.context.WC = WC;
-    // Expose TW namespaces (under TW)
-    local.context.TW = TW;
-    // Expose KeyStore namespace (under KeyStore)
-    local.context.KeyStore = KeyStore;
-
-    // Expose more stuff; utilities
-    local.context.help = help;
-    local.context.exit = exit;
-    local.context.walletsList = walletsList;
-    local.context.walletLoad = walletLoad;
-    local.context.walletsDeleteAll = walletsDeleteAll;
-    local.context.walletCreate = walletCreate;
-    local.context.walletImport = walletImport;
-    local.context.walletAddCoin = walletAddCoin;
-    local.context.walletDump = walletDump;
-    local.context.walletDelete = walletDelete;
-    local.context.wallets = wallets;
-    local.context.wallet = wallets.wallet;
-    local.context.coin = WC.CoinType.bitcoin;
-
-    local.on('exit', () => {
-        console.log('Bye!');
-        process.exit();
-    });
-}
-
-main();
diff --git a/samples/typescript/devconsole.ts/test/data/privpubkey.testinput.txt b/samples/typescript/devconsole.ts/test/data/privpubkey.testinput.txt
deleted file mode 100644
index 8431062b58b..00000000000
--- a/samples/typescript/devconsole.ts/test/data/privpubkey.testinput.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-// Create a private key, sign a message, derive public key from private key, verify signature
-privKeyData = '0xafeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5'
-pubKeyData = '0x0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1'
-messageDigest = '0001020304050607080910111213141519171819202122232425262728293031'
-signature = '0x673b54a91d87cfb9389e54cc55b1a9343a6eb9f2ea1f449cb19a248a86bb904c1efb109f8cf655c4f510211053c1696e52c75843c5c803fa1b78fe0c263f468201'
-
-testAssert = function(expression, text) {
-    if (!expression) { console.log('ERROR: ', text); exit(1); }
-    return 'ok: ' + text;
-}
-
-privkey = PrivateKey.createWithData(HexCoding.decode(privKeyData))
-HexCoding.encode(privkey.data())
-testAssert(HexCoding.encode(privkey.data()) == privKeyData, 'private key match')
-
-HexCoding.encode(sig1 = privkey.sign(HexCoding.decode(messageDigest), Curve.secp256k1))
-testAssert(HexCoding.encode(sig1) == signature, 'signature match')
-
-pubkey = privkey.getPublicKeySecp256k1(true)
-HexCoding.encode(pubkey.data())
-testAssert(HexCoding.encode(pubkey.data()) == pubKeyData, 'pubkey match')
-
-verifyRes = pubkey.verify(sig1, HexCoding.decode(messageDigest))
-testAssert(verifyRes, 'signature verification')
-
-exit(0)
diff --git a/samples/typescript/devconsole.ts/tsconfig.json b/samples/typescript/devconsole.ts/tsconfig.json
deleted file mode 100644
index 70198268800..00000000000
--- a/samples/typescript/devconsole.ts/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-    "compilerOptions": {
-        "target": "es5",
-        "module": "commonjs",
-        "lib": [
-            "es6",
-            "es2015",
-            "dom"
-        ],
-        "declaration": true,
-        "outDir": "lib",
-        "rootDir": "src",
-        "strict": true,
-        "types": [
-            "node"
-        ],
-        "esModuleInterop": true,
-        "resolveJsonModule": true
-    }
-}
\ No newline at end of file
diff --git a/sonar-project.properties b/sonar-project.properties
new file mode 100644
index 00000000000..ec607dbae00
--- /dev/null
+++ b/sonar-project.properties
@@ -0,0 +1,7 @@
+sonar.organization=trustwallet
+sonar.projectKey=TrustWallet_wallet-core
+sonar.cfamily.compile-commands=build/compile_commands.json
+sonar.cfamily.reportingCppStandardOverride=c++20
+sonar.cfamily.cache.enabled=false
+sonar.lang.patterns.cpp=**/*.cc,**/*.cpp,**/*.cxx,**/*.c++,**/*.hh,**/*.hpp,**/*.hxx,**/*.h++,**/*.ipp,**/*.h
+sonar.lang.patterns.c=**/*.c
diff --git a/src/Aeternity/Address.cpp b/src/Aeternity/Address.cpp
index b3d0ecc64fb..381e4b41ba0 100644
--- a/src/Aeternity/Address.cpp
+++ b/src/Aeternity/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "Identifiers.h"
@@ -38,12 +36,12 @@ Address::Address(const std::string& string) {
     }
 
     auto payload = string.substr(Identifiers::prefixAccountPubkey.size(), string.size());
-    bytes = Base58::bitcoin.decodeCheck(payload);
+    bytes = Base58::decodeCheck(payload);
 }
 
 /// Returns a string representation of the Aeternity address.
 std::string Address::string() const {
-    return Identifiers::prefixAccountPubkey + Base58::bitcoin.encodeCheck(bytes);
+    return Identifiers::prefixAccountPubkey + Base58::encodeCheck(bytes);
 }
 
 bool Address::checkType(const std::string& type) {
@@ -51,7 +49,7 @@ bool Address::checkType(const std::string& type) {
 }
 
 bool Address::checkPayload(const std::string& payload) {
-    unsigned long base58 = Base58::bitcoin.decodeCheck(payload).size();
+    unsigned long base58 = Base58::decodeCheck(payload).size();
     return base58 == size;
 }
 
diff --git a/src/Aeternity/Address.h b/src/Aeternity/Address.h
index 3733a44e93d..3d4379a5bde 100644
--- a/src/Aeternity/Address.h
+++ b/src/Aeternity/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -34,8 +32,4 @@ class Address {
     static bool checkPayload(const std::string& payload);
 };
 
-inline bool operator==(const Address& lhs, const Address& rhs) {
-    return lhs.bytes == rhs.bytes;
-}
-
 } // namespace TW::Aeternity
diff --git a/src/Aeternity/Entry.cpp b/src/Aeternity/Entry.cpp
index cab15ca9d26..1a8c25ad659 100644
--- a/src/Aeternity/Entry.cpp
+++ b/src/Aeternity/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -14,11 +12,11 @@ using namespace std;
 namespace TW::Aeternity {
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
diff --git a/src/Aeternity/Entry.h b/src/Aeternity/Entry.h
index b344b0ebb1f..36f63bff565 100644
--- a/src/Aeternity/Entry.h
+++ b/src/Aeternity/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,8 +12,8 @@ namespace TW::Aeternity {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-    bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
 };
 
diff --git a/src/Aeternity/Identifiers.h b/src/Aeternity/Identifiers.h
index d42acac5d5c..d0d8a3e5df5 100644
--- a/src/Aeternity/Identifiers.h
+++ b/src/Aeternity/Identifiers.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Aeternity/Signer.cpp b/src/Aeternity/Signer.cpp
index ff27db8d81a..ec22012eb88 100644
--- a/src/Aeternity/Signer.cpp
+++ b/src/Aeternity/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Base58.h"
@@ -37,7 +35,7 @@ Proto::SigningOutput Signer::sign(const TW::PrivateKey& privateKey, Transaction&
 
     /// sign ed25519
     auto sigRaw = privateKey.sign(msg, TWCurveED25519);
-    auto signature = Identifiers::prefixSignature + Base58::bitcoin.encodeCheck(sigRaw);
+    auto signature = Identifiers::prefixSignature + Base58::encodeCheck(sigRaw);
 
     /// encode the message using rlp
     auto rlpTxRaw = buildRlpTxRaw(txRlp, sigRaw);
@@ -48,20 +46,23 @@ Proto::SigningOutput Signer::sign(const TW::PrivateKey& privateKey, Transaction&
     return createProtoOutput(signature, signedEncodedTx);
 }
 
-Data Signer::buildRlpTxRaw(Data& txRaw, Data& sigRaw) {
-    auto rlpTxRaw = Data();
-    auto signaturesList = Data();
-    append(signaturesList, Ethereum::RLP::encode(sigRaw));
+Data Signer::buildRlpTxRaw(const Data& txRaw, const Data& sigRaw) {
+    EthereumRlp::Proto::EncodingInput input;
+    auto* rlpList = input.mutable_item()->mutable_list();
 
-    append(rlpTxRaw, Ethereum::RLP::encode(Identifiers::objectTagSignedTransaction));
-    append(rlpTxRaw, Ethereum::RLP::encode(Identifiers::rlpMessageVersion));
-    append(rlpTxRaw, Ethereum::RLP::encodeList(signaturesList));
-    append(rlpTxRaw, Ethereum::RLP::encode(txRaw));
+    rlpList->add_items()->set_number_u64(Identifiers::objectTagSignedTransaction);
+    rlpList->add_items()->set_number_u64(Identifiers::rlpMessageVersion);
 
-    return Ethereum::RLP::encodeList(rlpTxRaw);
+    // Append a list of signatures.
+    auto* signaturesList = rlpList->add_items()->mutable_list();
+    signaturesList->add_items()->set_data(sigRaw.data(), sigRaw.size());
+
+    rlpList->add_items()->set_data(txRaw.data(), txRaw.size());
+
+    return Ethereum::RLP::encode(input);
 }
 
-Data Signer::buildMessageToSign(Data& txRaw) {
+Data Signer::buildMessageToSign(const Data& txRaw) {
     auto data = Data();
     Data bytes(Identifiers::networkId.begin(), Identifiers::networkId.end());
     append(data, bytes);
diff --git a/src/Aeternity/Signer.h b/src/Aeternity/Signer.h
index d356375055a..41aacb86b19 100644
--- a/src/Aeternity/Signer.h
+++ b/src/Aeternity/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -23,9 +21,9 @@ class Signer {
 private:
     static const uint8_t checkSumSize = 4;
 
-    static Data buildRlpTxRaw(Data& txRaw, Data& sigRaw);
+    static Data buildRlpTxRaw(const Data& txRaw, const Data& sigRaw);
 
-    static Data buildMessageToSign(Data& txRaw);
+    static Data buildMessageToSign(const Data& txRaw);
 
     static Proto::SigningOutput createProtoOutput(std::string& signature, const std::string& signedTx);
 
diff --git a/src/Aeternity/Transaction.cpp b/src/Aeternity/Transaction.cpp
index 7ed0515b97b..af3f8002928 100644
--- a/src/Aeternity/Transaction.cpp
+++ b/src/Aeternity/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 #include "Identifiers.h"
@@ -12,21 +10,44 @@
 
 namespace TW::Aeternity {
 
+/// Aeternity network does not accept zero int values as rlp param,
+/// instead empty byte array should be encoded
+/// see https://forum.aeternity.com/t/invalid-tx-error-on-mainnet-goggle-says-it-looks-good/4118/5?u=defuera
+EthereumRlp::Proto::RlpItem prepareSafeZero(const uint256_t& value) {
+    EthereumRlp::Proto::RlpItem item;
+
+    if (value == 0) {
+        Data zeroValue{0};
+        item.set_data(zeroValue.data(), zeroValue.size());
+    } else {
+        auto valueData = store(value);
+        item.set_number_u256(valueData.data(), valueData.size());
+    }
+
+    return item;
+}
+
 /// RLP returns a byte serialized representation
 Data Transaction::encode() {
-    auto encoded = Data();
-    append(encoded, Ethereum::RLP::encode(Identifiers::objectTagSpendTransaction));
-    append(encoded, Ethereum::RLP::encode(Identifiers::rlpMessageVersion));
-    append(encoded, Ethereum::RLP::encode(buildTag(sender_id)));
-    append(encoded, Ethereum::RLP::encode(buildTag(recipient_id)));
-    append(encoded, encodeSafeZero(amount));
-    append(encoded, encodeSafeZero(fee));
-    append(encoded, encodeSafeZero(ttl));
-    append(encoded, encodeSafeZero(nonce));
-    append(encoded, Ethereum::RLP::encode(payload));
-
-    const Data& raw = Ethereum::RLP::encodeList(encoded);
-    return raw;
+    EthereumRlp::Proto::EncodingInput input;
+    auto* rlpList = input.mutable_item()->mutable_list();
+
+    auto senderIdTag = buildTag(sender_id);
+    auto recipientIdTag = buildTag(recipient_id);
+
+    rlpList->add_items()->set_number_u64(Identifiers::objectTagSpendTransaction);
+    rlpList->add_items()->set_number_u64(Identifiers::rlpMessageVersion);
+    rlpList->add_items()->set_data(senderIdTag.data(), senderIdTag.size());
+    rlpList->add_items()->set_data(recipientIdTag.data(), recipientIdTag.size());
+
+    *rlpList->add_items() = prepareSafeZero(amount);
+    *rlpList->add_items() = prepareSafeZero(fee);
+    *rlpList->add_items() = prepareSafeZero(ttl);
+    *rlpList->add_items() = prepareSafeZero(nonce);
+
+    rlpList->add_items()->set_data(payload.data(), payload.size());
+
+    return Ethereum::RLP::encode(input);
 }
 
 TW::Data Transaction::buildTag(const std::string& address) {
@@ -34,16 +55,9 @@ TW::Data Transaction::buildTag(const std::string& address) {
 
     auto data = Data();
     append(data, Identifiers::iDTagAccount);
-    append(data, Base58::bitcoin.decodeCheck(payload));
+    append(data, Base58::decodeCheck(payload));
 
     return data;
 }
 
-TW::Data Transaction::encodeSafeZero(uint256_t value) {
-    if (value == 0) {
-        return Ethereum::RLP::encode(Data{0});
-    }
-    return Ethereum::RLP::encode(value);
-}
-
 } // namespace TW::Aeternity
diff --git a/src/Aeternity/Transaction.h b/src/Aeternity/Transaction.h
index a58db36f651..4d938f45503 100644
--- a/src/Aeternity/Transaction.h
+++ b/src/Aeternity/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -52,13 +50,6 @@ class Transaction {
     //// buildIDTag assemble an id() object
     //// see https://github.com/aeternity/protocol/blob/epoch-v0.22.0/serializations.md#the-id-type
     static Data buildTag(const std::string& address);
-
-    /// Aeternity network does not accept zero int values as rlp param,
-    /// instead empty byte array should be encoded
-    /// see https://forum.aeternity.com/t/invalid-tx-error-on-mainnet-goggle-says-it-looks-good/4118/5?u=defuera
-    static Data encodeSafeZero(uint256_t value);
-
-
 };
 
 } // namespace TW::Aeternity
diff --git a/src/Aion/Address.cpp b/src/Aion/Address.cpp
index 411a1b97d9e..4a357ef8a2e 100644
--- a/src/Aion/Address.cpp
+++ b/src/Aion/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "../HexCoding.h"
diff --git a/src/Aion/Address.h b/src/Aion/Address.h
index 0a1bc7f4d13..459de4faffb 100644
--- a/src/Aion/Address.h
+++ b/src/Aion/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -43,8 +41,4 @@ class Address {
     std::string string() const;
 };
 
-inline bool operator==(const Address& lhs, const Address& rhs) {
-    return lhs.bytes == rhs.bytes;
-}
-
 } // namespace TW::Aion
diff --git a/src/Aion/Entry.cpp b/src/Aion/Entry.cpp
index f32ef1e3491..9c979ddc9e0 100644
--- a/src/Aion/Entry.cpp
+++ b/src/Aion/Entry.cpp
@@ -1,13 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "Signer.h"
+#include "proto/TransactionCompiler.pb.h"
 
 using namespace TW;
 using namespace std;
@@ -16,21 +15,43 @@ namespace TW::Aion {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
-    const auto addr = Address(address);
-    return {addr.bytes.begin(), addr.bytes.end()};
-}
-
 void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto preImage = Signer::signaturePreimage(input);
+            auto preImageHash = Hash::blake2b(preImage, 32);
+            output.set_data(preImage.data(), preImage.size());
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+            if (signatures.size() > 1 || publicKeys.size() > 1) {
+                output.set_error(Common::Proto::Error_no_support_n2n);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_no_support_n2n));
+                return;
+            }
+            output = Signer::compile(signatures[0], publicKeys[0], input);
+        });
+}
+
 } // namespace TW::Aion
diff --git a/src/Aion/Entry.h b/src/Aion/Entry.h
index 1ff2ed22dc1..981042894ed 100644
--- a/src/Aion/Entry.h
+++ b/src/Aion/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,10 +12,12 @@ namespace TW::Aion {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
      void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+     Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+     void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Aion
diff --git a/src/Aion/RLP.h b/src/Aion/RLP.h
index 55330d37a5a..643c7289d16 100644
--- a/src/Aion/RLP.h
+++ b/src/Aion/RLP.h
@@ -1,16 +1,14 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Transaction.h"
 
 #include "Ethereum/RLP.h"
+#include "uint256.h"
 
-#include <boost/multiprecision/cpp_int.hpp>
 #include <cstdint>
 #include <string>
 #include <vector>
@@ -20,17 +18,23 @@ namespace TW::Aion {
 /// Aion's RLP encoding for long numbers
 /// https://github.com/aionnetwork/aion/issues/680
 struct RLP {
-    static Data encodeLong(boost::multiprecision::uint128_t l) noexcept {
+    static EthereumRlp::Proto::RlpItem prepareLong(uint128_t l) {
+        EthereumRlp::Proto::RlpItem item;
+
         if ((l & 0x00000000FFFFFFFFL) == l) {
-            return Ethereum::RLP::encode(static_cast<uint256_t>(l));
-        }
-        Data result(9);
-        result[0] = 0x80 + 8;
-        for (int i = 8; i > 0; i--) {
-            result[i] = (byte)(l & 0xFF);
-            l >>= 8;
+            auto u256 = store(l);
+            item.set_number_u256(u256.data(), u256.size());
+        } else {
+            Data result(9);
+            result[0] = 0x80 + 8;
+            for (int i = 8; i > 0; i--) {
+                result[i] = (byte)(l & 0xFF);
+                l >>= 8;
+            }
+            item.set_raw_encoded(result.data(), result.size());
         }
-        return result;
+
+        return item;
     }
 };
 
diff --git a/src/Aion/Signer.cpp b/src/Aion/Signer.cpp
index 01c90385d91..8fe86f3904f 100644
--- a/src/Aion/Signer.cpp
+++ b/src/Aion/Signer.cpp
@@ -1,29 +1,16 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
-#include "../uint256.h"
-#include <boost/multiprecision/cpp_int.hpp>
 
 using namespace TW;
 
 namespace TW::Aion {
 
 Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    using boost::multiprecision::uint128_t;
-
     auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-    auto transaction = Transaction(
-        /* nonce: */ static_cast<uint128_t>(load(input.nonce())),
-        /* gasPrice: */ static_cast<uint128_t>(load(input.gas_price())),
-        /* gasLimit: */ static_cast<uint128_t>(load(input.gas_limit())),
-        /* to: */ Address(input.to_address()),
-        /* amount: */ static_cast<uint128_t>(load(input.amount())),
-        /* timestamp */ static_cast<uint128_t>(input.timestamp()),
-        /* payload: */ Data(input.payload().begin(), input.payload().end()));
+    auto transaction = Signer::buildTransaction(input);
     Signer::sign(key, transaction);
 
     auto output = Proto::SigningOutput();
@@ -46,4 +33,40 @@ void Signer::sign(const PrivateKey& privateKey, Transaction& transaction) noexce
     transaction.signature = result;
 }
 
+TW::Data Signer::signaturePreimage(const Proto::SigningInput& input) noexcept {
+    auto transaction = Signer::buildTransaction(input);
+    auto encoded = transaction.encode();
+    return transaction.encode();
+}
+
+Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey, const Proto::SigningInput& input) noexcept {
+    auto transaction = Signer::buildTransaction(input);
+
+    // Aion signature = pubKeyBytes + signatureBytes
+    Data result(publicKey.bytes.begin(), publicKey.bytes.end());
+    result.insert(result.end(), signature.begin(), signature.end());
+
+    transaction.signature = result;
+
+    auto output = Proto::SigningOutput();
+    auto encoded = transaction.encode();
+    output.set_encoded(encoded.data(), encoded.size());
+    output.set_signature(transaction.signature.data(), transaction.signature.size());
+
+    return output;
+}
+
+Transaction Signer::buildTransaction(const Proto::SigningInput& input) noexcept {
+    auto transaction = Transaction(
+        /* nonce: */ static_cast<uint128_t>(load(input.nonce())),
+        /* gasPrice: */ static_cast<uint128_t>(load(input.gas_price())),
+        /* gasLimit: */ static_cast<uint128_t>(load(input.gas_limit())),
+        /* to: */ Address(input.to_address()),
+        /* amount: */ static_cast<uint128_t>(load(input.amount())),
+        /* timestamp */ static_cast<uint128_t>(input.timestamp()),
+        /* payload: */ Data(input.payload().begin(), input.payload().end()));
+
+    return transaction;
+}
+
 } // namespace TW::Aion
diff --git a/src/Aion/Signer.h b/src/Aion/Signer.h
index 76d5e97d36b..3bf90e3c4a3 100644
--- a/src/Aion/Signer.h
+++ b/src/Aion/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -28,6 +26,14 @@ class Signer {
 
     /// Signs the given transaction.
     static void sign(const PrivateKey& privateKey, Transaction& transaction) noexcept;
+
+    /// Get transaction data to be signed
+    static TW::Data signaturePreimage(const Proto::SigningInput& input) noexcept;
+    static Proto::SigningOutput compile(const Data& signature, const PublicKey& publicKey, const Proto::SigningInput& input) noexcept;
+
+  private:
+    /// Builds an Aion transaction from the given `Proto::SigningInput`.
+    static Transaction buildTransaction(const Proto::SigningInput& input) noexcept;
 };
 
 } // namespace TW::Aion
diff --git a/src/Aion/Transaction.cpp b/src/Aion/Transaction.cpp
index c108f0d4b37..c2c6eee46aa 100644
--- a/src/Aion/Transaction.cpp
+++ b/src/Aion/Transaction.cpp
@@ -1,31 +1,43 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
+
+#include "Ethereum/RLP.h"
 #include "RLP.h"
+#include "proto/EthereumRlp.pb.h"
+#include "uint256.h"
 
 using namespace TW;
-using boost::multiprecision::uint128_t;
 
 namespace TW::Aion {
 
+static const uint128_t gTransactionType = 1;
+
 Data Transaction::encode() const noexcept {
-    auto encoded = Data();
-    append(encoded, Ethereum::RLP::encode(nonce));
-    append(encoded, Ethereum::RLP::encode(to.bytes));
-    append(encoded, Ethereum::RLP::encode(amount));
-    append(encoded, Ethereum::RLP::encode(payload));
-    append(encoded, Ethereum::RLP::encode(timestamp));
-    append(encoded, RLP::encodeLong(gasLimit));
-    append(encoded, RLP::encodeLong(gasPrice));
-    append(encoded, RLP::encodeLong(uint128_t(1))); // Aion transaction type
+    auto nonceData = store(nonce);
+    auto amountData = store(amount);
+    auto timestampData = store(timestamp);
+
+    EthereumRlp::Proto::EncodingInput input;
+    auto* rlpList = input.mutable_item()->mutable_list();
+
+    rlpList->add_items()->set_number_u256(nonceData.data(), nonceData.size());
+    rlpList->add_items()->set_data(to.bytes.data(), to.bytes.size());
+    rlpList->add_items()->set_number_u256(amountData.data(), amountData.size());
+    rlpList->add_items()->set_data(payload.data(), payload.size());
+    rlpList->add_items()->set_number_u256(timestampData.data(), timestampData.size());
+
+    *rlpList->add_items() = RLP::prepareLong(gasLimit);
+    *rlpList->add_items() = RLP::prepareLong(gasPrice);
+    *rlpList->add_items() = RLP::prepareLong(gTransactionType);
+
     if (!signature.empty()) {
-        append(encoded, Ethereum::RLP::encode(signature));
+        rlpList->add_items()->set_data(signature.data(), signature.size());
     }
-    return Ethereum::RLP::encodeList(encoded);
+
+    return Ethereum::RLP::encode(input);
 }
 
 } // namespace TW::Aion
diff --git a/src/Aion/Transaction.h b/src/Aion/Transaction.h
index b5e54bc4d85..257ddb68736 100644
--- a/src/Aion/Transaction.h
+++ b/src/Aion/Transaction.h
@@ -1,21 +1,17 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Address.h"
 #include "Data.h"
-
-#include <boost/multiprecision/cpp_int.hpp>
+#include "uint256.h"
 
 namespace TW::Aion {
 
 class Transaction {
   public:
-    using uint128_t = boost::multiprecision::uint128_t;
 
     uint128_t nonce;
     uint128_t gasPrice;
diff --git a/src/Algorand/Address.cpp b/src/Algorand/Address.cpp
index b0e4ede7229..ba6b6528639 100644
--- a/src/Algorand/Address.cpp
+++ b/src/Algorand/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "../Base32.h"
diff --git a/src/Algorand/Address.h b/src/Algorand/Address.h
index dc4af6666fe..5215b7bb6b7 100644
--- a/src/Algorand/Address.h
+++ b/src/Algorand/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -37,8 +35,4 @@ class Address {
     std::string string() const;
 };
 
-inline bool operator==(const Address& lhs, const Address& rhs) {
-    return lhs.bytes == rhs.bytes;
-}
-
 } // namespace TW::Algorand
diff --git a/src/Algorand/AssetTransfer.cpp b/src/Algorand/AssetTransfer.cpp
index 3f4c1a4eccd..f8644988cbc 100644
--- a/src/Algorand/AssetTransfer.cpp
+++ b/src/Algorand/AssetTransfer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "AssetTransfer.h"
 #include "BinaryCoding.h"
diff --git a/src/Algorand/AssetTransfer.h b/src/Algorand/AssetTransfer.h
index 63b4b51fc86..3de0f22bb82 100644
--- a/src/Algorand/AssetTransfer.h
+++ b/src/Algorand/AssetTransfer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Algorand/BaseTransaction.h b/src/Algorand/BaseTransaction.h
index 232c5ed2b00..4938e43bb2a 100644
--- a/src/Algorand/BaseTransaction.h
+++ b/src/Algorand/BaseTransaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Algorand/BinaryCoding.h b/src/Algorand/BinaryCoding.h
index ee4220d46b3..2b7ca30fd22 100644
--- a/src/Algorand/BinaryCoding.h
+++ b/src/Algorand/BinaryCoding.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Algorand/Entry.cpp b/src/Algorand/Entry.cpp
index 2f090b1ca5b..14a1320fede 100644
--- a/src/Algorand/Entry.cpp
+++ b/src/Algorand/Entry.cpp
@@ -1,23 +1,22 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "Signer.h"
+#include "proto/TransactionCompiler.pb.h"
 
 namespace TW::Algorand {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -29,4 +28,30 @@ std::string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string&
     return Signer::signJSON(json, key);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            // Algo has no preImageHash
+            auto preImage = Signer::signaturePreimage(input);
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+            if (signatures.size() > 1 || publicKeys.size() > 1) {
+                output.set_error(Common::Proto::Error_no_support_n2n);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_no_support_n2n));
+                return;
+            }
+            output = Signer::compile(signatures[0], publicKeys[0], input);
+        });
+}
+
 } // namespace TW::Algorand
diff --git a/src/Algorand/Entry.h b/src/Algorand/Entry.h
index a2e2548839b..cc47a32118e 100644
--- a/src/Algorand/Entry.h
+++ b/src/Algorand/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,11 +12,14 @@ namespace TW::Algorand {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-    bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
     bool supportsJSONSigning() const { return true; }
     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Algorand
diff --git a/src/Algorand/OptInAssetTransaction.cpp b/src/Algorand/OptInAssetTransaction.cpp
index e62488d48e1..7246c4e8c54 100644
--- a/src/Algorand/OptInAssetTransaction.cpp
+++ b/src/Algorand/OptInAssetTransaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "OptInAssetTransaction.h"
 #include "BinaryCoding.h"
diff --git a/src/Algorand/OptInAssetTransaction.h b/src/Algorand/OptInAssetTransaction.h
index 49d2a219213..ca98873fa71 100644
--- a/src/Algorand/OptInAssetTransaction.h
+++ b/src/Algorand/OptInAssetTransaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Algorand/Signer.cpp b/src/Algorand/Signer.cpp
index cfb615def50..71f44b6fcce 100644
--- a/src/Algorand/Signer.cpp
+++ b/src/Algorand/Signer.cpp
@@ -1,12 +1,11 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Address.h"
 #include "BaseTransaction.h"
+#include "Base64.h"
 #include "../HexCoding.h"
 
 #include <google/protobuf/util/json_util.h>
@@ -21,7 +20,83 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     auto protoOutput = Proto::SigningOutput();
     auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
     auto pubkey = key.getPublicKey(TWPublicKeyTypeED25519);
-    auto from = Address(pubkey);
+
+    auto preImageData = Signer::preImage(pubkey, input);
+    auto signature = key.sign(preImageData, TWCurveED25519);
+    return Signer::encodeTransaction(signature, pubkey, input);
+}
+
+std::string Signer::signJSON(const std::string& json, const Data& key) {
+    auto input = Proto::SigningInput();
+    google::protobuf::util::JsonStringToMessage(json, &input);
+    input.set_private_key(key.data(), key.size());
+    return hex(Signer::sign(input).encoded());
+}
+
+Data Signer::sign(const PrivateKey& privateKey, const BaseTransaction& transaction) noexcept {
+    Data data;
+    append(data, TRANSACTION_TAG);
+    append(data, transaction.serialize());
+    auto signature = privateKey.sign(data, TWCurveED25519);
+    return {signature.begin(), signature.end()};
+}
+
+TW::Data Signer::signaturePreimage(const Proto::SigningInput& input) noexcept {
+    auto pubKey = input.public_key();
+    return Signer::preImage(PublicKey(Data(pubKey.begin(), pubKey.end()), TWPublicKeyTypeED25519), input);
+}
+
+Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey, const Proto::SigningInput& input) noexcept {
+    return Signer::encodeTransaction(signature, publicKey, input);
+}
+
+TW::Data Signer::preImage(const TW::PublicKey& pubKey, const Proto::SigningInput& input) noexcept {
+    auto from = Address(pubKey);
+    auto firstRound = input.first_round();
+    auto lastRound = input.last_round();
+    auto fee = input.fee();
+
+    auto note = Data(input.note().begin(), input.note().end());
+    auto genesisId = input.genesis_id();
+    auto genesisHash = Data(input.genesis_hash().begin(), input.genesis_hash().end());
+
+    TW::Data transactionData;
+    if (input.has_transfer()) {
+        auto message = input.transfer();
+        auto to = Address(message.to_address());
+
+        auto transaction = Transfer(from, to, fee, message.amount(), firstRound,
+                                    lastRound, note, TRANSACTION_PAY, genesisId, genesisHash);
+        transactionData = transaction.serialize();
+    } else if (input.has_asset_transfer()) {
+        auto message = input.asset_transfer();
+        auto to = Address(message.to_address());
+
+        auto transaction =
+            AssetTransfer(from, to, fee, message.amount(),
+                          message.asset_id(), firstRound, lastRound, note,
+                          ASSET_TRANSACTION, genesisId, genesisHash);
+        transactionData = transaction.serialize();
+    } else if (input.has_asset_opt_in()) {
+        auto message = input.asset_opt_in();
+        auto transaction = OptInAssetTransaction(from, fee, message.asset_id(),
+                                                 firstRound, lastRound, note,
+                                                 ASSET_TRANSACTION, genesisId, genesisHash);
+        transactionData = transaction.serialize();
+    } else {
+        return {Data{}};
+    }
+
+    Data data;
+    append(data, TRANSACTION_TAG);
+    append(data, transactionData);
+    return data;
+}
+
+Proto::SigningOutput Signer::encodeTransaction(const Data& signature, const TW::PublicKey& pubKey, const Proto::SigningInput& input) noexcept {
+    auto protoOutput = Proto::SigningOutput();
+
+    auto from = Address(pubKey);
     auto firstRound = input.first_round();
     auto lastRound = input.last_round();
     auto fee = input.fee();
@@ -35,9 +110,10 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
 
         auto transaction = Transfer(from, to, fee, message.amount(), firstRound,
                                     lastRound, note, TRANSACTION_PAY, genesisId, genesisHash);
-        auto signature = sign(key, transaction);
+
         auto serialized = transaction.BaseTransaction::serialize(signature);
         protoOutput.set_encoded(serialized.data(), serialized.size());
+        protoOutput.set_signature(Base64::encode(signature));
     } else if (input.has_asset_transfer()) {
         auto message = input.asset_transfer();
         auto to = Address(message.to_address());
@@ -46,36 +122,22 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
             AssetTransfer(from, to, fee, message.amount(),
                           message.asset_id(), firstRound, lastRound, note,
                           ASSET_TRANSACTION, genesisId, genesisHash);
-        auto signature = sign(key, transaction);
+
         auto serialized = transaction.BaseTransaction::serialize(signature);
         protoOutput.set_encoded(serialized.data(), serialized.size());
+        protoOutput.set_signature(Base64::encode(signature));
     } else if (input.has_asset_opt_in()) {
         auto message = input.asset_opt_in();
 
         auto transaction = OptInAssetTransaction(from, fee, message.asset_id(),
                                                  firstRound, lastRound, note,
                                                  ASSET_TRANSACTION, genesisId, genesisHash);
-        auto signature = sign(key, transaction);
+
         auto serialized = transaction.BaseTransaction::serialize(signature);
         protoOutput.set_encoded(serialized.data(), serialized.size());
+        protoOutput.set_signature(Base64::encode(signature));
     }
-
     return protoOutput;
 }
 
-std::string Signer::signJSON(const std::string& json, const Data& key) {
-    auto input = Proto::SigningInput();
-    google::protobuf::util::JsonStringToMessage(json, &input);
-    input.set_private_key(key.data(), key.size());
-    return hex(Signer::sign(input).encoded());
-}
-
-Data Signer::sign(const PrivateKey& privateKey, const BaseTransaction& transaction) noexcept {
-    Data data;
-    append(data, TRANSACTION_TAG);
-    append(data, transaction.serialize());
-    auto signature = privateKey.sign(data, TWCurveED25519);
-    return {signature.begin(), signature.end()};
-}
-
 } // namespace TW::Algorand
diff --git a/src/Algorand/Signer.h b/src/Algorand/Signer.h
index 4f8ef6a2730..2c0514328c7 100644
--- a/src/Algorand/Signer.h
+++ b/src/Algorand/Signer.h
@@ -1,12 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "AssetTransfer.h"
+#include "proto/Common.pb.h"
 #include "OptInAssetTransaction.h"
 #include "Transfer.h"
 
@@ -28,6 +27,14 @@ class Signer {
 
     /// Signs the given transaction.
     static Data sign(const PrivateKey& privateKey, const BaseTransaction& transaction) noexcept;
+
+    /// Get transaction data to be signed
+    static TW::Data signaturePreimage(const Proto::SigningInput& input) noexcept;
+    static Proto::SigningOutput compile(const Data& signature, const PublicKey& publicKey, const Proto::SigningInput& input) noexcept;
+
+  private:
+    static TW::Data preImage(const TW::PublicKey& pubKey, const Proto::SigningInput& input) noexcept;
+    static Proto::SigningOutput encodeTransaction(const Data& signature, const TW::PublicKey& pubKey, const Proto::SigningInput& input) noexcept;
 };
 
 } // namespace TW::Algorand
diff --git a/src/Algorand/Transfer.cpp b/src/Algorand/Transfer.cpp
index dd470ddae22..645463679c0 100644
--- a/src/Algorand/Transfer.cpp
+++ b/src/Algorand/Transfer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transfer.h"
 #include "BinaryCoding.h"
diff --git a/src/Algorand/Transfer.h b/src/Algorand/Transfer.h
index 422ae4d2e4d..8ca7bbcad59 100644
--- a/src/Algorand/Transfer.h
+++ b/src/Algorand/Transfer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/AnyAddress.cpp b/src/AnyAddress.cpp
index 504e309da1c..ab4267ac388 100644
--- a/src/AnyAddress.cpp
+++ b/src/AnyAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "AnyAddress.h"
 
@@ -15,8 +13,9 @@ Data AnyAddress::getData() const {
     return TW::addressToData(coin, address);
 }
 
-AnyAddress* AnyAddress::createAddress(const std::string& address, enum TWCoinType coin) {
-    auto normalized = TW::normalizeAddress(coin, address);
+AnyAddress* AnyAddress::createAddress(const std::string& address, enum TWCoinType coin, const PrefixVariant& prefix) {
+    const bool hasPrefix = !std::holds_alternative<std::monostate>(prefix);
+    auto normalized = hasPrefix ? TW::normalizeAddress(coin, address, prefix) : TW::normalizeAddress(coin, address);
     if (normalized.empty()) {
         return nullptr;
     }
@@ -24,8 +23,8 @@ AnyAddress* AnyAddress::createAddress(const std::string& address, enum TWCoinTyp
     return new AnyAddress{.address = std::move(normalized), .coin = coin};
 }
 
-AnyAddress* AnyAddress::createAddress(const PublicKey& publicKey, enum TWCoinType coin) {
-    auto derivedAddress = TW::deriveAddress(coin, publicKey);
+AnyAddress* AnyAddress::createAddress(const PublicKey& publicKey, enum TWCoinType coin, TWDerivation derivation, const PrefixVariant& prefix) {
+    const auto derivedAddress = TW::deriveAddress(coin, publicKey, derivation, prefix);
     return new AnyAddress{.address = std::move(derivedAddress), .coin = coin};
 }
 
diff --git a/src/AnyAddress.h b/src/AnyAddress.h
index 78e8878a2fd..f3e7434272a 100644
--- a/src/AnyAddress.h
+++ b/src/AnyAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,6 +10,7 @@
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWPublicKey.h>
 #include <TrustWalletCore/TWData.h>
+#include <CoinEntry.h>
 #include <string>
 
 namespace TW {
@@ -22,8 +21,10 @@ class AnyAddress {
 
     enum TWCoinType coin;
 
-    static AnyAddress* createAddress(const std::string& address, enum TWCoinType coin);
-    static AnyAddress* createAddress(const PublicKey& publicKey, enum TWCoinType coin);
+    // Create address from string address and optional prefix; also normalizes the address.
+    static AnyAddress* createAddress(const std::string& address, enum TWCoinType coin, const PrefixVariant& prefix = std::monostate());
+    // Create address from private key, with optional non-standard derivation and prefix
+    static AnyAddress* createAddress(const PublicKey& publicKey, enum TWCoinType coin, TWDerivation derivation = TWDerivationDefault, const PrefixVariant& prefix = std::monostate());
 
     Data getData() const;
 };
diff --git a/src/Aptos/Entry.h b/src/Aptos/Entry.h
new file mode 100644
index 00000000000..24ab3d38afe
--- /dev/null
+++ b/src/Aptos/Entry.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/RustCoinEntry.h"
+
+namespace TW::Aptos {
+
+/// Entry point for implementation of Aptos coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final : public Rust::RustCoinEntry {
+};
+
+} // namespace TW::Aptos
diff --git a/src/AsnParser.h b/src/AsnParser.h
new file mode 100644
index 00000000000..a6d7d7e8443
--- /dev/null
+++ b/src/AsnParser.h
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "rust/bindgen/WalletCoreRSBindgen.h"
+#include "rust/Wrapper.h"
+
+namespace TW::ASN {
+
+struct AsnParser {
+    static std::optional<Data> ecdsa_signature_from_der(const Data& derEncoded) {
+        Rust::CByteArrayResultWrapper res = Rust::ecdsa_signature_from_asn_der(derEncoded.data(), derEncoded.size());
+        if (!res.isOk()) {
+            return std::nullopt;
+        }
+        return res.unwrap().data;
+    }
+};
+
+} // namespace TW::ASN
diff --git a/src/Base32.h b/src/Base32.h
index 7119a9944be..595b36591a8 100644
--- a/src/Base32.h
+++ b/src/Base32.h
@@ -1,14 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Data.h"
-
-#include <TrezorCrypto/base32.h>
+#include "rust/bindgen/WalletCoreRSBindgen.h"
+#include "rust/Wrapper.h"
 
 #include <cassert>
 
@@ -17,41 +15,28 @@ namespace TW::Base32 {
 /// Decode Base32 string, return bytes as Data
 /// alphabet: Optional alphabet, if missing, default ALPHABET_RFC4648
 inline bool decode(const std::string& encoded_in, Data& decoded_out, const char* alphabet_in = nullptr) {
-    size_t inLen = encoded_in.size();
-    // obtain output length first
-    size_t outLen = base32_decoded_length(inLen);
-    uint8_t buf[outLen];
-    if (alphabet_in == nullptr) {
-        alphabet_in = BASE32_ALPHABET_RFC4648;
+    if (encoded_in.empty()) {
+        return true;
     }
-    // perform the base32 decode
-    uint8_t* retval = base32_decode(encoded_in.data(), inLen, buf, outLen, alphabet_in);
-    if (retval == nullptr) {
-        return false;
+    Rust::CByteArrayResultWrapper res = Rust::decode_base32(encoded_in.c_str(), alphabet_in, false);
+    if (res.isOk()) {
+        decoded_out = res.unwrap().data;
+        return true;
     }
-    decoded_out.assign(buf, buf + outLen);
-    return true;
+    return false;
 }
 
+
 /// Encode bytes in Data to Base32 string
 /// alphabet: Optional alphabet, if missing, default ALPHABET_RFC4648
-inline std::string encode(const Data& val, const char* alphabet = nullptr) {
-    size_t inLen = val.size();
-    // obtain output length first, reserve for terminator
-    size_t outLen = base32_encoded_length(inLen) + 1;
-    char buf[outLen];
-    if (alphabet == nullptr) {
-        alphabet = BASE32_ALPHABET_RFC4648;
-    }
-    // perform the base32 encode
-    char* retval = base32_encode(val.data(), inLen, buf, outLen, alphabet);
-    if (retval == nullptr) {
-        // return empty string if failed
-        return std::string();
+inline std::string encode(const Data &val, const char *alphabet = nullptr, bool padding = false) {
+    auto res = Rust::encode_base32(val.data(), val.size(), alphabet, padding);
+    if (res.code != Rust::OK_CODE) {
+        return {};
     }
-    // make sure there is a terminator ath the end
-    buf[outLen - 1] = '\0';
-    return std::string(buf);
+    std::string encoded_str(res.result);
+    Rust::free_string(res.result);
+    return encoded_str;
 }
 
 } // namespace TW::Base32
diff --git a/src/Base58.cpp b/src/Base58.cpp
deleted file mode 100644
index 61ed8d4600b..00000000000
--- a/src/Base58.cpp
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright © 2014-2018 The Bitcoin Core developers
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base58.h"
-
-#include "Hash.h"
-
-#include <algorithm>
-#include <iterator>
-#include <cctype>
-#include <cassert>
-
-using namespace TW;
-
-// clang-format off
-
-static const std::array<char, 58> bitcoinDigits = {
-    '1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'J', 'K', 'L', 'M', 'N', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-    'X', 'Y', 'Z', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'm',
-    'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z'
-};
-
-static const std::array<signed char, 128> bitcoinCharacterMap = {
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-	-1, 0, 1, 2, 3, 4, 5, 6, 7, 8,-1,-1,-1,-1,-1,-1,
-	-1, 9,10,11,12,13,14,15,16,-1,17,18,19,20,21,-1,
-	22,23,24,25,26,27,28,29,30,31,32,-1,-1,-1,-1,-1,
-	-1,33,34,35,36,37,38,39,40,41,42,43,-1,44,45,46,
-	47,48,49,50,51,52,53,54,55,56,57,-1,-1,-1,-1,-1,
-};
-
-static const std::array<char, 58> rippleDigits = {
-    'r', 'p', 's', 'h', 'n', 'a', 'f', '3', '9', 'w', 'B', 'U', 'D', 'N', 'E',
-    'G', 'H', 'J', 'K', 'L', 'M', '4', 'P', 'Q', 'R', 'S', 'T', '7', 'V', 'W',
-    'X', 'Y', 'Z', '2', 'b', 'c', 'd', 'e', 'C', 'g', '6', '5', 'j', 'k', 'm',
-    '8', 'o', 'F', 'q', 'i', '1', 't', 'u', 'v', 'A', 'x', 'y', 'z'
-};
-
-static const std::array<signed char, 128> rippleCharacterMap = {
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-    -1,50,33,7,21,41,40,27,45,8,-1,-1,-1,-1,-1,-1,
-    -1,54,10,38,12,14,47,15,16,-1,17,18,19,20,13,-1,
-    22,23,24,25,26,11,28,29,30,31,32,-1,-1,-1,-1,-1,
-    -1,5,34,35,36,37,6,39,3,49,42,43,-1,44,4,46,
-    1,48,0,2,51,52,53,9,55,56,57,-1,-1,-1,-1,-1,
-};
-
-// clang-format on
-
-Base58 Base58::bitcoin = Base58(bitcoinDigits, bitcoinCharacterMap);
-
-Base58 Base58::ripple = Base58(rippleDigits, rippleCharacterMap);
-
-Data Base58::decodeCheck(const char* begin, const char* end, Hash::Hasher hasher) const {
-    auto result = decode(begin, end);
-    if (result.size() < 4) {
-        return {};
-    }
-
-    // re-calculate the checksum, ensure it matches the included 4-byte checksum
-    auto hash = Hash::hash(hasher, result.data(), result.size() - 4);
-    if (!std::equal(hash.begin(), hash.begin() + 4, result.end() - 4)) {
-        return {};
-    }
-
-    return Data(result.begin(), result.end() - 4);
-}
-
-Data Base58::decode(const char* begin, const char* end) const {
-    const auto* it = begin;
-
-    // Skip leading spaces.
-    it = std::find_if_not(it, end, [](char c) { return std::isspace(c);});
-
-    // Skip and count leading zeros.
-    std::size_t zeroes = 0;
-    std::size_t length = 0;
-    while (it != end && *it == digits[0]) {
-        zeroes += 1;
-        it += 1;
-    }
-
-    // Allocate enough space in big-endian base256 representation.
-    std::size_t base258Size = (end - it) * 733 / 1000 + 1; // log(58) / log(256), rounded up.
-    Data b256(base258Size);
-
-    // Process the characters.
-    while (it != end && !std::isspace(*it)) {
-        if (static_cast<unsigned char>(*it) >= 128) {
-            // Invalid b58 character
-            return {};
-        }
-
-        // Decode base58 character
-        int carry = characterMap[static_cast<unsigned char>(*it)];
-        if (carry == -1) {
-            // Invalid b58 character
-            return {};
-        }
-
-        std::size_t i = 0;
-        for (auto b256it = b256.rbegin(); (carry != 0 || i < length) && (b256it != b256.rend());
-             ++b256it, ++i) {
-            carry += 58 * (*b256it);
-            *b256it = static_cast<uint8_t>(carry % 256);
-            carry /= 256;
-        }
-        assert(carry == 0);
-        length = i;
-        it += 1;
-    }
-
-    // Skip trailing spaces.
-    it = std::find_if_not(it, end, [](char c) { return std::isspace(c);});
-    if (it != end) {
-        // Extra charaters at the end
-        return {};
-    }
-
-    // Skip leading zeroes in b256.
-    auto b256it = b256.begin() + (base258Size - length);
-    while (b256it != b256.end() && *b256it == 0) {
-        b256it++;
-    }
-
-    // Copy result into output vector.
-    Data result;
-    result.reserve(zeroes + (b256.end() - b256it));
-    result.assign(zeroes, 0x00);
-    std::copy(b256it, b256.end(), std::back_inserter(result));
-
-    return result;
-}
-
-std::string Base58::encodeCheck(const byte* begin, const byte* end, Hash::Hasher hasher) const {
-    // add 4-byte hash check to the end
-    Data dataWithCheck(begin, end);
-    auto hash = Hash::hash(hasher, begin, end - begin);
-    dataWithCheck.insert(dataWithCheck.end(), hash.begin(), hash.begin() + 4);
-    return encode(dataWithCheck);
-}
-
-std::string Base58::encode(const byte* begin, const byte* end) const {
-    // Skip & count leading zeroes.
-    int zeroes = 0;
-    int length = 0;
-    while (begin != end && *begin == 0) {
-        begin += 1;
-        zeroes += 1;
-    }
-
-    // Allocate enough space in big-endian base58 representation.
-    auto base58Size = (end - begin) * 138 / 100 + 1; // log(256) / log(58), rounded up.
-    Data b58(base58Size);
-
-    while (begin != end) {
-        int carry = *begin;
-        int i = 0;
-        // Apply "b58 = b58 * 256 + ch".
-        for (auto b58it = b58.rbegin(); (carry != 0 || i < length) && (b58it != b58.rend());
-             b58it++, i++) {
-            carry += 256 * (*b58it);
-            *b58it = carry % 58;
-            carry /= 58;
-        }
-
-        assert(carry == 0);
-        length = i;
-        begin += 1;
-    }
-
-    // Skip leading zeroes in base58 result.
-    auto it = b58.begin() + (base58Size - length);
-    while (it != b58.end() && *it == 0) {
-        it++;
-    }
-
-    // Translate the result into a string.
-    std::string str;
-    str.reserve(zeroes + (b58.end() - it));
-    str.assign(zeroes, digits[0]);
-    while (it != b58.end()) {
-        str += digits[*it];
-        it += 1;
-    }
-    return str;
-}
diff --git a/src/Base58.h b/src/Base58.h
index d5e231d307d..5b36feba2e9 100644
--- a/src/Base58.h
+++ b/src/Base58.h
@@ -1,71 +1,54 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Data.h"
 #include "Hash.h"
+#include "rust/bindgen/WalletCoreRSBindgen.h"
+#include "rust/Wrapper.h"
 
-#include <array>
 #include <string>
 
-namespace TW {
-
-class Base58 {
-  public:
-    /// Base58 coder with Bitcoin character map.
-    static Base58 bitcoin;
-
-    /// Base58 coder with Ripple character map.
-    static Base58 ripple;
-
-  public:
-    /// Ordered list of valid characters.
-    const std::array<char, 58> digits;
-
-    /// Maps characters to base58 values.
-    const std::array<signed char, 128> characterMap;
-
-    /// Initializes a Base58 class with custom digit mapping.
-    Base58(const std::array<char, 58>& digits, const std::array<signed char, 128>& characterMap)
-        : digits(digits), characterMap(characterMap) {}
-
-    /// Decodes a base 58 string verifying the checksum, returns empty on failure.
-    Data decodeCheck(const std::string& string, Hash::Hasher hasher = Hash::HasherSha256d) const {
-        return decodeCheck(string.data(), string.data() + string.size(), hasher);
+namespace TW::Base58 {
+    /// Decodes a base 58 string into `result`, returns `false` on failure.
+    static inline Data decode(const std::string& string, Rust::Base58Alphabet alphabet = Rust::Base58Alphabet::Bitcoin)  {
+        if (string.empty()) {
+            return {};
+        }
+        Rust::CByteArrayResultWrapper res = Rust::decode_base58(string.c_str(), alphabet);
+        return res.unwrap_or_default().data;
     }
 
-    /// Decodes a base 58 string verifying the checksum, returns empty on failure.
-    Data decodeCheck(const char* begin, const char* end, Hash::Hasher hasher = Hash::HasherSha256d) const;
+    static inline Data decodeCheck(const std::string& string, Rust::Base58Alphabet alphabet = Rust::Base58Alphabet::Bitcoin, Hash::Hasher hasher = Hash::HasherSha256d) {
+        auto result = decode(string, alphabet);
+        if (result.size() < 4) {
+            return {};
+        }
 
-    /// Decodes a base 58 string into `result`, returns `false` on failure.
-    Data decode(const std::string& string) const {
-        return decode(string.data(), string.data() + string.size());
-    }
+        // re-calculate the checksum, ensure it matches the included 4-byte checksum
+        auto hash = Hash::hash(hasher, result.data(), result.size() - 4);
+        if (!std::equal(hash.begin(), hash.begin() + 4, result.end() - 4)) {
+            return {};
+        }
 
-    /// Decodes a base 58 string into `result`, returns `false` on failure.
-    Data decode(const char* begin, const char* end) const;
+        return Data(result.begin(), result.end() - 4);
+    }
 
-    /// Encodes data as a base 58 string with a checksum.
     template <typename T>
-    std::string encodeCheck(const T& data, Hash::Hasher hasher = Hash::HasherSha256d) const {
-        return encodeCheck(data.data(), data.data() + data.size(), hasher);
+    static inline std::string encode(const T& data, Rust::Base58Alphabet alphabet = Rust::Base58Alphabet::Bitcoin) {
+        auto encoded = encode_base58(data.data(), data.size(), alphabet);
+        std::string encoded_str(encoded);
+        Rust::free_string(encoded);
+        return encoded_str;
     }
 
-    /// Encodes data as a base 58 string with a checksum.
-    std::string encodeCheck(const byte* pbegin, const byte* pend, Hash::Hasher hasher = Hash::HasherSha256d) const;
-
-    /// Encodes data as a base 58 string.
     template <typename T>
-    std::string encode(const T& data) const {
-        return encode(data.data(), data.data() + data.size());
+    static inline std::string encodeCheck(const T& data, Rust::Base58Alphabet alphabet = Rust::Base58Alphabet::Bitcoin, Hash::Hasher hasher = Hash::HasherSha256d) {
+        auto hash = Hash::hash(hasher, data);
+        Data toBeEncoded(std::begin(data), std::end(data));
+        toBeEncoded.insert(toBeEncoded.end(), hash.begin(), hash.begin() + 4);
+        return encode(toBeEncoded, alphabet);
     }
-
-    /// Encodes data as a base 58 string.
-    std::string encode(const byte* pbegin, const byte* pend) const;
-};
-
-} // namespace TW
+}
diff --git a/src/Base58Address.h b/src/Base58Address.h
index ee66c495a93..1d2092c495e 100644
--- a/src/Base58Address.h
+++ b/src/Base58Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -33,7 +31,7 @@ class Base58Address {
 
     /// Determines whether a string makes a valid address.
     static bool isValid(const std::string& string) {
-        const auto decoded = Base58::bitcoin.decodeCheck(string);
+        const auto decoded = Base58::decodeCheck(string);
         if (decoded.size() != Base58Address::size) {
             return false;
         }
@@ -43,7 +41,7 @@ class Base58Address {
     /// Determines whether a string makes a valid address, and the prefix is
     /// within the valid set.
     static bool isValid(const std::string& string, const std::vector<Data>& validPrefixes) {
-        const auto decoded = Base58::bitcoin.decodeCheck(string);
+        const auto decoded = Base58::decodeCheck(string);
         if (decoded.size() != Base58Address::size) {
             return false;
         }
@@ -59,7 +57,7 @@ class Base58Address {
 
     /// Initializes an address with a string representation.
     explicit Base58Address(const std::string& string) {
-        const auto decoded = Base58::bitcoin.decodeCheck(string);
+        const auto decoded = Base58::decodeCheck(string);
         if (decoded.size() != Base58Address::size) {
             throw std::invalid_argument("Invalid address string");
         }
@@ -86,7 +84,7 @@ class Base58Address {
 
     /// Returns a string representation of the address.
     std::string string() const {
-        return Base58::bitcoin.encodeCheck(bytes);
+        return Base58::encodeCheck(bytes);
     }
 };
 
diff --git a/src/Base64.cpp b/src/Base64.cpp
index cf4605592ad..dfcfa1353aa 100644
--- a/src/Base64.cpp
+++ b/src/Base64.cpp
@@ -1,80 +1,67 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Base64.h"
+#include "rust/bindgen/WalletCoreRSBindgen.h"
+#include "rust/Wrapper.h"
 
-#include <boost/algorithm/string.hpp>
-#include <boost/archive/iterators/base64_from_binary.hpp>
-#include <boost/archive/iterators/binary_from_base64.hpp>
-#include <boost/archive/iterators/transform_width.hpp>
+namespace TW::Base64::internal {
+
+std::string encode(const Data& val, bool is_url) {
+    Rust::CStringWrapper res = Rust::encode_base64(val.data(), val.size(), is_url);
+    return res.str;
+}
+
+Data decode(const std::string& val, bool is_url) {
+    if (val.empty()) {
+        return {};
+    }
+    Rust::CByteArrayResultWrapper res = Rust::decode_base64(val.c_str(), is_url);
+    return res.unwrap_or_default().data;
+}
+
+} // namespace TW::Base64::internal
 
 namespace TW::Base64 {
 
 using namespace TW;
 using namespace std;
 
-Data decode(const string& val) {
-    using namespace boost::archive::iterators;
-    using It = transform_width<binary_from_base64<string::const_iterator>, 8, 6>;
-    return boost::algorithm::trim_right_copy_if(Data(It(begin(val)), It(end(val))),
-                                                [](char c) { return c == '\0'; });
-}
-
-string encode(const Data& val) {
-    using namespace boost::archive::iterators;
-    using It = base64_from_binary<transform_width<Data::const_iterator, 6, 8>>;
-    auto encoded = string(It(begin(val)), It(end(val)));
-    return encoded.append((3 - val.size() % 3) % 3, '=');
-}
+static bool isBase64Any(const string& val, const char* alphabet) {
+    if (val.length() % 4 != 0) {
+        return false;
+    }
+    size_t first_non_alphabet = val.find_first_not_of(alphabet);
+    size_t first_non_padding = val.find_first_not_of("=", first_non_alphabet);
 
-/// Convert from Base64Url format to regular
-void convertFromBase64Url(string& b) {
-    // '-' and '_' (Base64URL format) are changed to '+' and '/'
-    // in-place replace
-    size_t n = b.length();
-    char* start = b.data();
-    char* end = start + n;
-    for (auto* p = start; p < end; ++p) {
-        if (*p == '-') {
-            *p = '+';
-        } else if (*p == '_') {
-            *p = '/';
-        }
+    if (first_non_alphabet == std::string::npos ||
+        (first_non_padding == std::string::npos && (val.length() - first_non_alphabet < 3))) {
+        return true;
     }
+    return false;
 }
 
-/// Convert from regular format to Base64Url
-void convertToBase64Url(string& b) {
-    // '+' and '/' are changed to '-' and '_' (Base64URL format)
-    // in-place replace
-    size_t n = b.length();
-    char* start = b.data();
-    char* end = start + n;
-    for (auto* p = start; p < end; ++p) {
-        if (*p == '+') {
-            *p = '-';
-        } else if (*p == '/') {
-            *p = '_';
-        }
-    }
+bool isBase64orBase64Url(const string& val) {
+    const char* base64_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+    const char* base64_url_chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789-_";
+    return isBase64Any(val, base64_chars) || isBase64Any(val, base64_url_chars);
 }
 
 Data decodeBase64Url(const string& val) {
-    string base64Url = val;
-    convertFromBase64Url(base64Url);
-    return decode(base64Url);
+    return internal::decode(val, true);
 }
 
 string encodeBase64Url(const Data& val) {
-    using namespace boost::archive::iterators;
-    using It = base64_from_binary<transform_width<Data::const_iterator, 6, 8>>;
-    auto encoded = string(It(begin(val)), It(end(val)));
-    encoded.append((3 - val.size() % 3) % 3, '=');
-    convertToBase64Url(encoded);
-    return encoded;
+    return internal::encode(val, true);
+}
+
+std::string encode(const Data& val) {
+   return internal::encode(val, false);
+}
+
+Data decode(const string& val) {
+   return internal::decode(val, false);
 }
 
 } // namespace TW::Base64
diff --git a/src/Base64.h b/src/Base64.h
index 5bc20e6fc70..a930522886e 100644
--- a/src/Base64.h
+++ b/src/Base64.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -10,11 +8,14 @@
 
 namespace TW::Base64 {
 
+// Checks if as string is in Base64-format or Base64Url-format
+bool isBase64orBase64Url(const std::string& val);
+
 // Decode a Base64-format string
 Data decode(const std::string& val);
 
 // Encode bytes into Base64 string
-std::string encode(const Data& val);
+std::string encode(const TW::Data& val);
 
 // Decode a Base64Url-format or a regular Base64 string.
 // Base64Url format uses '-' and '_' as the two special characters, Base64 uses '+'and '/'.
diff --git a/src/Bech32.cpp b/src/Bech32.cpp
index a309f45c2a2..273c1f3f16c 100644
--- a/src/Bech32.cpp
+++ b/src/Bech32.cpp
@@ -1,9 +1,7 @@
 // Copyright © 2017 Pieter Wuille
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bech32.h"
 #include "Data.h"
@@ -105,7 +103,7 @@ Data create_checksum(const std::string& hrp, const Data& values, ChecksumVariant
 
 } // namespace
 
-/** Encode a Bech32 string. */
+/** Encode a Bech32 string. Note that the values must each encode 5 bits, normally get from convertBits<8, 5, true> */
 std::string encode(const std::string& hrp, const Data& values, ChecksumVariant variant) {
     Data checksum = create_checksum(hrp, values, variant);
     Data combined = values;
@@ -118,7 +116,7 @@ std::string encode(const std::string& hrp, const Data& values, ChecksumVariant v
     return ret;
 }
 
-/** Decode a Bech32 string. */
+/** Decode a Bech32 string. Note that the returned values are 5 bits each, you may want to use convertBits<5, 8, false> */
 std::tuple<std::string, Data, ChecksumVariant> decode(const std::string& str) {
     if (str.length() > 120 || str.length() < 2) {
         // too long or too short
diff --git a/src/Bech32.h b/src/Bech32.h
index f9f8311a786..cb0a4bc7b9d 100644
--- a/src/Bech32.h
+++ b/src/Bech32.h
@@ -1,9 +1,7 @@
 // Copyright © 2017 Pieter Wuille
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bech32Address.cpp b/src/Bech32Address.cpp
index da1c7af32a5..8394773b635 100644
--- a/src/Bech32Address.cpp
+++ b/src/Bech32Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bech32Address.h"
 #include "Bech32.h"
diff --git a/src/Bech32Address.h b/src/Bech32Address.h
index 23a88d6a23f..b7a1707b34d 100644
--- a/src/Bech32Address.h
+++ b/src/Bech32Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Binance/Address.cpp b/src/Binance/Address.cpp
index 67f5bab7559..0ab1d1a77c0 100644
--- a/src/Binance/Address.cpp
+++ b/src/Binance/Address.cpp
@@ -1,28 +1,44 @@
 // Copyright © 2017 Pieter Wuille
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
+#include "Coin.h"
 
 #include <TrustWalletCore/TWHRP.h>
 #include <vector>
 
 namespace TW::Binance {
 
-const std::string Address::_hrp = HRP_BINANCE;
 const std::string Address::hrpValidator = "bva";
-const std::vector<std::string> validHrps = {Address::_hrp, Address::hrpValidator, "bnbp", "bvap", "bca", "bcap"};
 
-bool Address::isValid(const std::string& addr) {
-    Address addrNotUsed;
+Address::Address(TWCoinType coin):
+    Bech32Address(stringForHRP(TW::hrp(coin))) {
+}
+
+Address::Address(const Data& keyHash, TWCoinType coin):
+    Bech32Address(stringForHRP(TW::hrp(coin)), keyHash) {
+}
+
+Address::Address(const PublicKey& publicKey, TWCoinType coin):
+    Bech32Address(stringForHRP(TW::hrp(coin)), Hash::HasherSha256ripemd, publicKey) {
+}
+
+bool Address::isValid(TWCoinType coin, const std::string& addr) {
+    const auto* const hrp = stringForHRP(TW::hrp(coin));
+    Address addrNotUsed(hrp);
+    return decode(addr, addrNotUsed);
+}
+
+bool Address::isValid(const std::string& addr, const std::string& hrp) {
+    Address addrNotUsed(hrp);
     return decode(addr, addrNotUsed);
 }
 
 bool Address::decode(const std::string& addr, Address& obj_out) {
-    for (const auto& hrp : validHrps) {
+    std::vector<std::string> validHrps = {obj_out.getHrp(), Address::hrpValidator, "bnbp", "bvap", "bca", "bcap"};
+    for (const auto& hrp: validHrps) {
         if (Bech32Address::decode(addr, obj_out, hrp)) {
             return true;
         }
diff --git a/src/Binance/Address.h b/src/Binance/Address.h
index 0735d5db0cf..227f3088727 100644
--- a/src/Binance/Address.h
+++ b/src/Binance/Address.h
@@ -1,13 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "../Bech32Address.h"
 
+#include <TrustWalletCore/TWCoinType.h>
 #include <string>
 
 namespace TW::Binance {
@@ -15,18 +14,28 @@ namespace TW::Binance {
 /// Binance address is a Bech32Address, with "bnb" prefix and sha256ripemd hash
 class Address: public Bech32Address {
 public:
-    static const std::string _hrp; // HRP_BINANCE
-    static const std::string hrpValidator; // HRP_BINANCE
+    static const std::string hrpValidator;
 
-    static bool isValid(const std::string& addr);
+    /// Checks if the given `addr` is a valid Binance address and has a known hrp.
+    static bool isValid(TWCoinType coin, const std::string& addr);
+    /// Checks if the given `addr` is a valid Binance address and has the given `chainHrp`.
+    static bool isValid(const std::string& addr, const std::string& chainHrp);
 
-    Address() : Bech32Address(_hrp) {}
+    explicit Address(TWCoinType coin = TWCoinTypeBinance);
 
-    /// Initializes an address with a key hash.
-    Address(const Data& keyHash) : Bech32Address(_hrp, keyHash) {}
+    explicit Address(const std::string& chainHrp) : Bech32Address(chainHrp) {}
 
-    /// Initializes an address with a public key.
-    Address(const PublicKey& publicKey) : Bech32Address(_hrp, Hash::HasherSha256ripemd, publicKey) {}
+    /// Initializes an address with a key hash and hrp.
+    explicit Address(const Data& keyHash, const std::string& chainHrp) : Bech32Address(chainHrp, keyHash) {}
+
+    /// Initializes an address with a key hash and coin type.
+    explicit Address(const Data& keyHash, TWCoinType coin = TWCoinTypeBinance);
+
+    /// Initializes an address with a public key and hrp.
+    explicit Address(const PublicKey& publicKey, const std::string& chainHrp) : Bech32Address(chainHrp, Hash::HasherSha256ripemd, publicKey) {}
+
+    /// Initializes an address with a public key and coin type.
+    explicit Address(const PublicKey& publicKey, TWCoinType coin = TWCoinTypeBinance);
 
     static bool decode(const std::string& addr, Address& obj_out);
 };
diff --git a/src/Binance/Entry.cpp b/src/Binance/Entry.cpp
index 48d39fc64c2..c1915455dec 100644
--- a/src/Binance/Entry.cpp
+++ b/src/Binance/Entry.cpp
@@ -1,110 +1,21 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
-#include "../proto/TransactionCompiler.pb.h"
-#include "Address.h"
-#include "Signer.h"
+#include "HexCoding.h"
+#include "proto/Binance.pb.h"
 
 namespace TW::Binance {
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
-    return Address::isValid(address);
-}
-
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
-    return Address(publicKey).string();
-}
-
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
-    Address addr;
-    if (!Address::decode(address, addr)) {
-        return {};
-    }
-    return addr.getKeyHash();
-}
-
-void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
-    signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
-}
-
-std::string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string& json, const Data& key) const {
-    return Signer::signJSON(json, key);
-}
-
-Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
-    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
-        txInputData, [](const auto& input, auto& output) {
-            Signer signer(input);
-
-            auto preImageHash = signer.preImageHash();
-            auto preImage = signer.signaturePreimage();
-            output.set_data_hash(preImageHash.data(), preImageHash.size());
-            output.set_data(preImage.data(), preImage.size());
-        });
-}
-
-void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
-    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
-        txInputData, [&](const auto& input, auto& output) {
-            if (signatures.size() == 0 || publicKeys.size() == 0) {
-                output.set_error(Common::Proto::Error_invalid_params);
-                output.set_error_message("empty signatures or publickeys");
-                return;
-            }
-            if (signatures.size() > 1 || publicKeys.size() > 1) {
-                output.set_error(Common::Proto::Error_no_support_n2n);
-                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_no_support_n2n));
-                return;
-            }
-            output = Signer(input).compile(signatures[0], publicKeys[0]);
-        });
-}
-
-Data Entry::buildTransactionInput([[maybe_unused]] TWCoinType coinType, const std::string& from, const std::string& to, const uint256_t& amount, const std::string& asset, const std::string& memo, const std::string& chainId) const {
-    auto input = Proto::SigningInput();
-    input.set_chain_id(chainId);
-    input.set_account_number(0);
-    input.set_sequence(0);
-    input.set_source(0);
-    input.set_memo(memo);
-    // do not set private_key!
-    input.set_private_key("");
-
-    auto& order = *input.mutable_send_order();
-
-    Address fromAddress;
-    if (!Address::decode(from, fromAddress)) {
-        throw std::invalid_argument("Invalid from address");
-    }
-    const auto fromKeyhash = fromAddress.getKeyHash();
-    Address toAddress;
-    if (!Address::decode(to, toAddress)) {
-        throw std::invalid_argument("Invalid to address");
-    }
-    const auto toKeyhash = toAddress.getKeyHash();
-
-    {
-        auto* sendOrderInputs = order.add_inputs();
-        sendOrderInputs->set_address(fromKeyhash.data(), fromKeyhash.size());
-        auto* inputCoin = sendOrderInputs->add_coins();
-        inputCoin->set_denom(asset);
-        inputCoin->set_amount(static_cast<uint64_t>(amount));
-    }
-    {
-        auto* output = order.add_outputs();
-        output->set_address(toKeyhash.data(), toKeyhash.size());
-        auto* outputCoin = output->add_coins();
-        outputCoin->set_denom(asset);
-        outputCoin->set_amount(static_cast<uint64_t>(amount));
-    }
-
-    const auto txInputData = data(input.SerializeAsString());
-    return txInputData;
+std::string Entry::signJSON(TWCoinType coin, const std::string& json, const Data& key) const {
+    return signJSONHelper<Proto::SigningInput, Proto::SigningOutput>(
+        coin,
+        json,
+        key,
+        [](const Proto::SigningOutput& output) { return hex(output.encoded()); }
+    );
 }
 
 } // namespace TW::Binance
diff --git a/src/Binance/Entry.h b/src/Binance/Entry.h
index da927b68166..dab9768dff7 100644
--- a/src/Binance/Entry.h
+++ b/src/Binance/Entry.h
@@ -1,29 +1,19 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../CoinEntry.h"
+#include "rust/RustCoinEntry.h"
 
 namespace TW::Binance {
 
 /// Binance entry dispatcher.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry final : public CoinEntry {
+class Entry final : public Rust::RustCoinEntryWithSignJSON {
 public:
-    bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-    Data addressToData(TWCoinType coin, const std::string& address) const;
-    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-    bool supportsJSONSigning() const { return true; }
-    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
-
-    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
-    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
-    Data buildTransactionInput(TWCoinType coinType, const std::string& from, const std::string& to, const uint256_t& amount, const std::string& asset, const std::string& memo, const std::string& chainId) const;
+    bool supportsJSONSigning() const override { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const override;
 };
 
 } // namespace TW::Binance
diff --git a/src/Binance/Serialization.cpp b/src/Binance/Serialization.cpp
deleted file mode 100644
index cdf0b83bb58..00000000000
--- a/src/Binance/Serialization.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Serialization.h"
-
-#include "Address.h"
-#include "Bech32Address.h"
-#include "Ethereum/Address.h"
-#include "../HexCoding.h"
-
-namespace TW::Binance {
-
-using json = nlohmann::json;
-
-static inline std::string addressString(const std::string& bytes) {
-    auto data = Data(bytes.begin(), bytes.end());
-    return Address(data).string();
-}
-
-static inline std::string validatorAddress(const std::string& bytes) {
-    auto data = Data(bytes.begin(), bytes.end());
-    return Bech32Address(Address::hrpValidator, data).string();
-}
-
-json signatureJSON(const Proto::SigningInput& input) {
-    json j;
-    j["account_number"] = std::to_string(input.account_number());
-    j["chain_id"] = input.chain_id();
-    j["data"] = nullptr;
-    j["memo"] = input.memo();
-    j["msgs"] = json::array({orderJSON(input)});
-    j["sequence"] = std::to_string(input.sequence());
-    j["source"] = std::to_string(input.source());
-    return j;
-}
-
-json orderJSON(const Proto::SigningInput& input) {
-    json j;
-    if (input.has_trade_order()) {
-        j["id"] = input.trade_order().id();
-        j["ordertype"] = 2;
-        j["price"] = input.trade_order().price();
-        j["quantity"] = input.trade_order().quantity();
-        j["sender"] = addressString(input.trade_order().sender());
-        j["side"] = input.trade_order().side();
-        j["symbol"] = input.trade_order().symbol();
-        j["timeinforce"] = input.trade_order().timeinforce();
-    } else if (input.has_cancel_trade_order()) {
-        j["refid"] = input.cancel_trade_order().refid();
-        j["sender"] = addressString(input.cancel_trade_order().sender());
-        j["symbol"] = input.cancel_trade_order().symbol();
-    } else if (input.has_send_order()) {
-        j["inputs"] = inputsJSON(input.send_order());
-        j["outputs"] = outputsJSON(input.send_order());
-    } else if (input.has_freeze_order()) {
-        j["from"] = addressString(input.freeze_order().from());
-        j["symbol"] = input.freeze_order().symbol();
-        j["amount"] = input.freeze_order().amount();
-    } else if (input.has_unfreeze_order()) {
-        j["from"] = addressString(input.unfreeze_order().from());
-        j["symbol"] = input.unfreeze_order().symbol();
-        j["amount"] = input.unfreeze_order().amount();
-    } else if (input.has_htlt_order()) {
-        j["from"] = addressString(input.htlt_order().from());
-        j["to"] = addressString(input.htlt_order().to());
-        j["recipient_other_chain"] = input.htlt_order().recipient_other_chain();
-        j["sender_other_chain"] = input.htlt_order().sender_other_chain();
-        j["random_number_hash"] = hex(input.htlt_order().random_number_hash());
-        j["timestamp"] = input.htlt_order().timestamp();
-        j["amount"] = tokensJSON(input.htlt_order().amount());
-        j["expected_income"] = input.htlt_order().expected_income();
-        j["height_span"] = input.htlt_order().height_span();
-        j["cross_chain"] = input.htlt_order().cross_chain();
-    } else if (input.has_deposithtlt_order()) {
-        j["from"] = addressString(input.deposithtlt_order().from());
-        j["swap_id"] = hex(input.deposithtlt_order().swap_id());
-        j["amount"] = tokensJSON(input.deposithtlt_order().amount());
-    } else if (input.has_claimhtlt_order()) {
-        j["from"] = addressString(input.claimhtlt_order().from());
-        j["swap_id"] = hex(input.claimhtlt_order().swap_id());
-        j["random_number"] = hex(input.claimhtlt_order().random_number());
-    } else if (input.has_refundhtlt_order()) {
-        j["from"] = addressString(input.refundhtlt_order().from());
-        j["swap_id"] = hex(input.refundhtlt_order().swap_id());
-    } else if (input.has_transfer_out_order()) {
-        auto to = input.transfer_out_order().to();
-        auto addr = Ethereum::Address(Data(to.begin(), to.end()));
-        j["from"] = addressString(input.transfer_out_order().from());
-        j["to"] = addr.string();
-        j["amount"] = tokenJSON(input.transfer_out_order().amount());
-        j["expire_time"] = input.transfer_out_order().expire_time();
-    } else if (input.has_side_delegate_order()) {
-        j["type"] = "cosmos-sdk/MsgSideChainDelegate";
-        j["value"] = {
-            {"delegator_addr", addressString(input.side_delegate_order().delegator_addr())},
-            {"validator_addr", validatorAddress(input.side_delegate_order().validator_addr())},
-            {"delegation", tokenJSON(input.side_delegate_order().delegation(), true)},
-            {"side_chain_id", input.side_delegate_order().chain_id()},
-        };
-    } else if (input.has_side_redelegate_order()) {
-        j["type"] = "cosmos-sdk/MsgSideChainRedelegate";
-        j["value"] = {
-            {"delegator_addr", addressString(input.side_redelegate_order().delegator_addr())},
-            {"validator_src_addr", validatorAddress(input.side_redelegate_order().validator_src_addr())},
-            {"validator_dst_addr", validatorAddress(input.side_redelegate_order().validator_dst_addr())},
-            {"amount", tokenJSON(input.side_redelegate_order().amount(), true)},
-            {"side_chain_id", input.side_redelegate_order().chain_id()},
-        };
-    } else if (input.has_side_undelegate_order()) {
-        j["type"] = "cosmos-sdk/MsgSideChainUndelegate";
-        j["value"] = {
-            {"delegator_addr", addressString(input.side_undelegate_order().delegator_addr())},
-            {"validator_addr", validatorAddress(input.side_undelegate_order().validator_addr())},
-            {"amount", tokenJSON(input.side_undelegate_order().amount(), true)},
-            {"side_chain_id", input.side_undelegate_order().chain_id()},
-        };
-    } else if (input.has_time_lock_order()) {
-        j["from"] = addressString(input.time_lock_order().from_address());
-        j["description"] = input.time_lock_order().description();
-        j["amount"] = tokensJSON(input.time_lock_order().amount());
-        j["lock_time"] = input.time_lock_order().lock_time();
-    } else if (input.has_time_relock_order()) {
-        const auto amount = input.time_relock_order().amount();
-        j["from"] = addressString(input.time_relock_order().from_address());
-        j["time_lock_id"] = input.time_relock_order().id();
-        j["description"] = input.time_relock_order().description();
-        // if amount is empty or omitted, set null to avoid signature verification error
-        j["amount"] = nullptr;
-        if (!amount.empty()) {
-            j["amount"] = tokensJSON(amount);
-        }
-        j["lock_time"] = input.time_relock_order().lock_time();
-    } else if (input.has_time_unlock_order()) {
-        j["from"] = addressString(input.time_unlock_order().from_address());
-        j["time_lock_id"] = input.time_unlock_order().id();
-    }
-    return j;
-}
-
-json inputsJSON(const Proto::SendOrder& order) {
-    json j = json::array();
-    for (auto& input : order.inputs()) {
-        j.push_back({{"address", addressString(input.address())},
-                     {"coins", tokensJSON(input.coins())}});
-    }
-    return j;
-}
-
-json outputsJSON(const Proto::SendOrder& order) {
-    json j = json::array();
-    for (auto& output : order.outputs()) {
-        j.push_back({{"address", addressString(output.address())},
-                     {"coins", tokensJSON(output.coins())}});
-    }
-    return j;
-}
-
-json tokenJSON(const Proto::SendOrder_Token& token, bool stringAmount) {
-    json j = {{"denom", token.denom()}};
-    if (stringAmount) {
-        j["amount"] = std::to_string(token.amount());
-    } else {
-        j["amount"] = token.amount();
-    }
-    return j;
-}
-
-json tokensJSON(const google::protobuf::RepeatedPtrField<Proto::SendOrder_Token>& tokens) {
-    json j = json::array();
-    for (auto& token : tokens) {
-        j.push_back(tokenJSON(token));
-    }
-    return j;
-}
-
-} // namespace TW::Binance
diff --git a/src/Binance/Serialization.h b/src/Binance/Serialization.h
deleted file mode 100644
index 9b06682fbec..00000000000
--- a/src/Binance/Serialization.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "../proto/Binance.pb.h"
-#include <nlohmann/json.hpp>
-
-namespace TW::Binance {
-
-nlohmann::json signatureJSON(const Proto::SigningInput& input);
-nlohmann::json orderJSON(const Proto::SigningInput& input);
-nlohmann::json inputsJSON(const Proto::SendOrder& order);
-nlohmann::json outputsJSON(const Proto::SendOrder& order);
-nlohmann::json tokenJSON(const Proto::SendOrder_Token& token, bool stringAmount = false);
-nlohmann::json tokensJSON(const ::google::protobuf::RepeatedPtrField<Proto::SendOrder_Token>& tokens);
-
-} // namespace TW::Binance
diff --git a/src/Binance/Signer.cpp b/src/Binance/Signer.cpp
deleted file mode 100644
index 5a06be40181..00000000000
--- a/src/Binance/Signer.cpp
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Signer.h"
-#include "Serialization.h"
-#include "../HexCoding.h"
-#include "../PrivateKey.h"
-
-#include <google/protobuf/io/coded_stream.h>
-#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
-#include <google/protobuf/util/json_util.h>
-
-#include <string>
-
-namespace TW::Binance {
-
-// Message prefixes
-// see https://docs.binance.org/api-reference/transactions.html#amino-types
-static const auto sendOrderPrefix = Data{0x2A, 0x2C, 0x87, 0xFA};
-static const auto tradeOrderPrefix = Data{0xCE, 0x6D, 0xC0, 0x43};
-static const auto cancelTradeOrderPrefix = Data{0x16, 0x6E, 0x68, 0x1B};
-static const auto HTLTOrderPrefix = Data{0xB3, 0x3F, 0x9A, 0x24};
-static const auto depositHTLTOrderPrefix = Data{0x63, 0x98, 0x64, 0x96};
-static const auto claimHTLTOrderPrefix = Data{0xC1, 0x66, 0x53, 0x00};
-static const auto refundHTLTOrderPrefix = Data{0x34, 0x54, 0xA2, 0x7C};
-static const auto pubKeyPrefix = Data{0xEB, 0x5A, 0xE9, 0x87};
-static const auto transactionPrefix = Data{0xF0, 0x62, 0x5D, 0xEE};
-static const auto tokenIssueOrderPrefix = Data{0x17, 0xEF, 0xAB, 0x80};
-static const auto tokenMintOrderPrefix = Data{0x46, 0x7E, 0x08, 0x29};
-static const auto tokenBurnOrderPrefix = Data{0x7E, 0xD2, 0xD2, 0xA0};
-static const auto tokenFreezeOrderPrefix = Data{0xE7, 0x74, 0xB3, 0x2D};
-static const auto tokenUnfreezeOrderPrefix = Data{0x65, 0x15, 0xFF, 0x0D};
-static const auto transferOutOrderPrefix = Data{0x80, 0x08, 0x19, 0xC0};
-static const auto sideDelegateOrderPrefix = Data{0xE3, 0xA0, 0x7F, 0xD2};
-static const auto sideRedelegateOrderPrefix = Data{0xE3, 0xCE, 0xD3, 0x64};
-static const auto sideUndelegateOrderPrefix = Data{0x51, 0x4F, 0x7E, 0x0E};
-static const auto timeLockOrderPrefix = Data{0x07, 0x92, 0x15, 0x31};
-static const auto timeRelockOrderPrefix = Data{0x50, 0x47, 0x11, 0xDA};
-static const auto timeUnlockOrderPrefix = Data{0xC4, 0x05, 0x0C, 0x6C};
-
-Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    auto signer = Signer(input);
-    auto encoded = signer.build();
-    auto output = Proto::SigningOutput();
-    output.set_encoded(encoded.data(), encoded.size());
-    return output;
-}
-
-std::string Signer::signJSON(const std::string& json, const Data& key) {
-    auto input = Proto::SigningInput();
-    google::protobuf::util::JsonStringToMessage(json, &input);
-    input.set_private_key(key.data(), key.size());
-    auto output = Signer::sign(input);
-    return hex(output.encoded());
-}
-
-Data Signer::build() const {
-    auto signature = encodeSignature(sign());
-    return encodeTransaction(signature);
-}
-
-Data Signer::sign() const {
-    auto hash = preImageHash();
-    auto key = PrivateKey(input.private_key());
-    auto signature = key.sign(hash, TWCurveSECP256k1);
-    return {signature.begin(), signature.end() - 1};
-}
-
-Data Signer::preImageHash() const {
-    return Hash::sha256(signaturePreimage());
-}
-
-Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey) const {
-    // validate public key
-    if (publicKey.type != TWPublicKeyTypeSECP256k1) {
-        throw std::invalid_argument("Invalid public key");
-    }
-    {
-        // validate correctness of signature
-        const auto hash = this->preImageHash();
-        if (!publicKey.verify(signature, hash)) {
-            throw std::invalid_argument("Invalid signature/hash/publickey combination");
-        }
-    }
-    const auto encoded = encodeTransaction(encodeSignature(signature, publicKey));
-    auto output = Proto::SigningOutput();
-    output.set_encoded(encoded.data(), encoded.size());
-    return output;
-}
-
-std::string Signer::signaturePreimage() const {
-    auto json = signatureJSON(input);
-    return json.dump();
-}
-
-Data Signer::encodeTransaction(const Data& signature) const {
-    auto msg = encodeOrder();
-    auto transaction = Binance::Proto::Transaction();
-    transaction.add_msgs(msg.data(), msg.size());
-    transaction.add_signatures(signature.data(), signature.size());
-    transaction.set_memo(input.memo());
-    transaction.set_source(input.source());
-
-    auto data = transaction.SerializeAsString();
-    return aminoWrap(data, transactionPrefix, true);
-}
-
-Data Signer::encodeOrder() const {
-    std::string data;
-    Data prefix;
-    if (input.has_trade_order()) {
-        data = input.trade_order().SerializeAsString();
-        prefix = tradeOrderPrefix;
-    } else if (input.has_cancel_trade_order()) {
-        data = input.cancel_trade_order().SerializeAsString();
-        prefix = cancelTradeOrderPrefix;
-    } else if (input.has_send_order()) {
-        data = input.send_order().SerializeAsString();
-        prefix = sendOrderPrefix;
-    } else if (input.has_issue_order()) {
-        data = input.issue_order().SerializeAsString();
-        prefix = tokenIssueOrderPrefix;
-    } else if (input.has_mint_order()) {
-        data = input.mint_order().SerializeAsString();
-        prefix = tokenMintOrderPrefix;
-    } else if (input.has_burn_order()) {
-        data = input.burn_order().SerializeAsString();
-        prefix = tokenBurnOrderPrefix;
-    } else if (input.has_freeze_order()) {
-        data = input.freeze_order().SerializeAsString();
-        prefix = tokenFreezeOrderPrefix;
-    } else if (input.has_unfreeze_order()) {
-        data = input.unfreeze_order().SerializeAsString();
-        prefix = tokenUnfreezeOrderPrefix;
-    } else if (input.has_htlt_order()) {
-        data = input.htlt_order().SerializeAsString();
-        prefix = HTLTOrderPrefix;
-    } else if (input.has_deposithtlt_order()) {
-        data = input.deposithtlt_order().SerializeAsString();
-        prefix = depositHTLTOrderPrefix;
-    } else if (input.has_claimhtlt_order()) {
-        data = input.claimhtlt_order().SerializeAsString();
-        prefix = claimHTLTOrderPrefix;
-    } else if (input.has_refundhtlt_order()) {
-        data = input.refundhtlt_order().SerializeAsString();
-        prefix = refundHTLTOrderPrefix;
-    } else if (input.has_transfer_out_order()) {
-        data = input.transfer_out_order().SerializeAsString();
-        prefix = transferOutOrderPrefix;
-    } else if (input.has_side_delegate_order()) {
-        data = input.side_delegate_order().SerializeAsString();
-        prefix = sideDelegateOrderPrefix;
-    } else if (input.has_side_redelegate_order()) {
-        data = input.side_redelegate_order().SerializeAsString();
-        prefix = sideRedelegateOrderPrefix;
-    } else if (input.has_side_undelegate_order()) {
-        data = input.side_undelegate_order().SerializeAsString();
-        prefix = sideUndelegateOrderPrefix;
-    } else if (input.has_time_lock_order()) {
-        data = input.time_lock_order().SerializeAsString();
-        prefix = timeLockOrderPrefix;
-    } else if (input.has_time_relock_order()) {
-        data = input.time_relock_order().SerializeAsString();
-        prefix = timeRelockOrderPrefix;
-    } else if (input.has_time_unlock_order()) {
-        data = input.time_unlock_order().SerializeAsString();
-        prefix = timeUnlockOrderPrefix;
-    } else {
-        return {};
-    }
-    return aminoWrap(data, prefix, false);
-}
-
-Data Signer::encodeSignature(const Data& signature) const {
-    auto key = PrivateKey(input.private_key());
-    auto publicKey = key.getPublicKey(TWPublicKeyTypeSECP256k1);
-    return encodeSignature(signature, publicKey);
-}
-
-Data Signer::encodeSignature(const Data& signature, const PublicKey& publicKey) const {
-    auto encodedPublicKey = pubKeyPrefix;
-    encodedPublicKey.insert(encodedPublicKey.end(), static_cast<uint8_t>(publicKey.bytes.size()));
-    encodedPublicKey.insert(encodedPublicKey.end(), publicKey.bytes.begin(), publicKey.bytes.end());
-
-    auto object = Binance::Proto::Signature();
-    object.set_pub_key(encodedPublicKey.data(), encodedPublicKey.size());
-    object.set_signature(signature.data(), signature.size());
-    object.set_account_number(input.account_number());
-    object.set_sequence(input.sequence());
-
-    return aminoWrap(object.SerializeAsString(), {}, false);
-}
-
-Data Signer::aminoWrap(const std::string& raw, const Data& typePrefix, bool prefixWithSize) const {
-    const auto contentsSize = raw.size() + typePrefix.size();
-    auto size = contentsSize;
-    if (prefixWithSize) {
-        size += 10;
-    }
-
-    std::string msg;
-    msg.reserve(size);
-    {
-        google::protobuf::io::StringOutputStream output(&msg);
-        google::protobuf::io::CodedOutputStream cos(&output);
-        if (prefixWithSize) {
-            cos.WriteVarint64(contentsSize);
-        }
-        cos.WriteRaw(typePrefix.data(), static_cast<int>(typePrefix.size()));
-        cos.WriteRaw(raw.data(), static_cast<int>(raw.size()));
-    }
-
-    return {msg.begin(), msg.end()};
-}
-
-} // namespace TW::Binance
diff --git a/src/Binance/Signer.h b/src/Binance/Signer.h
deleted file mode 100644
index d66b42bf774..00000000000
--- a/src/Binance/Signer.h
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-#include "PublicKey.h"
-#include "../proto/Binance.pb.h"
-
-#include <cstdint>
-#include <utility>
-
-namespace TW::Binance {
-
-/// Helper class that performs Binance transaction signing.
-class Signer {
-  public:
-    /// Signs a Proto::SigningInput transaction
-    static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
-    /// Signs a json Proto::SigningInput with private key
-    static std::string signJSON(const std::string& json, const Data& key);
-  public:
-    Proto::SigningInput input;
-
-    /// Initializes a transaction signer.
-    explicit Signer(Proto::SigningInput input) : input(std::move(input)) {}
-
-    /// Builds a signed transaction.
-    ///
-    /// \returns the signed transaction data or an empty vector if there is an
-    /// error.
-    TW::Data build() const;
-
-    /// Signs the transaction.
-    ///
-    /// \returns the transaction signature or an empty vector if there is an
-    /// error.
-    TW::Data sign() const;
-
-    TW::Data preImageHash() const;
-    Proto::SigningOutput compile(const Data& signature, const PublicKey& publicKey) const;
-    std::string signaturePreimage() const;
-
-  private:
-    TW::Data encodeTransaction(const TW::Data& signature) const;
-    TW::Data encodeOrder() const;
-    TW::Data encodeSignature(const TW::Data& signature) const;
-    TW::Data encodeSignature(const TW::Data& signature, const PublicKey& publicKey) const;
-    TW::Data aminoWrap(const std::string& raw, const TW::Data& typePrefix,
-                       bool isPrefixLength) const;
-};
-
-} // namespace TW::Binance
diff --git a/src/BinaryCoding.cpp b/src/BinaryCoding.cpp
index 51090acc5ea..210101accbe 100644
--- a/src/BinaryCoding.cpp
+++ b/src/BinaryCoding.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "BinaryCoding.h"
 
diff --git a/src/BinaryCoding.h b/src/BinaryCoding.h
index 971189f2af0..45050e315d5 100644
--- a/src/BinaryCoding.h
+++ b/src/BinaryCoding.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/Address.h b/src/Bitcoin/Address.h
index 48ae90a8760..50aab3e10af 100644
--- a/src/Bitcoin/Address.h
+++ b/src/Bitcoin/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/Amount.h b/src/Bitcoin/Amount.h
index d286003d75f..7df4f56adcd 100644
--- a/src/Bitcoin/Amount.h
+++ b/src/Bitcoin/Amount.h
@@ -1,10 +1,8 @@
 // Copyright © 2009-2010 Satoshi Nakamoto
 // Copyright © 2009-2016 The Bitcoin Core developers
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/CashAddress.cpp b/src/Bitcoin/CashAddress.cpp
index 86852f0f472..1f98d5fb48c 100644
--- a/src/Bitcoin/CashAddress.cpp
+++ b/src/Bitcoin/CashAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "CashAddress.h"
 #include "../Coin.h"
diff --git a/src/Bitcoin/CashAddress.h b/src/Bitcoin/CashAddress.h
index 1ad14b9213f..58b1a22d5b6 100644
--- a/src/Bitcoin/CashAddress.h
+++ b/src/Bitcoin/CashAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/DustCalculator.cpp b/src/Bitcoin/DustCalculator.cpp
new file mode 100644
index 00000000000..3aeea03cecb
--- /dev/null
+++ b/src/Bitcoin/DustCalculator.cpp
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "DustCalculator.h"
+
+namespace TW::Bitcoin {
+
+FixedDustCalculator::FixedDustCalculator(Amount fixed) noexcept
+    : fixedDustAmount(fixed) {
+}
+
+Amount FixedDustCalculator::dustAmount([[maybe_unused]] Amount byteFee) noexcept {
+    return fixedDustAmount;
+}
+
+LegacyDustCalculator::LegacyDustCalculator(TWCoinType coinType) noexcept
+    : feeCalculator(getFeeCalculator(coinType, false)) {
+}
+
+Amount LegacyDustCalculator::dustAmount([[maybe_unused]] Amount byteFee) noexcept {
+    return feeCalculator.calculateSingleInput(byteFee);
+}
+
+DustCalculatorShared getDustCalculator(const Proto::SigningInput& input) {
+    if (input.disable_dust_filter()) {
+        return std::make_shared<FixedDustCalculator>(0);
+    }
+
+    if (input.has_fixed_dust_threshold()) {
+        return std::make_shared<FixedDustCalculator>(input.fixed_dust_threshold());
+    }
+
+    const auto coinType = static_cast<TWCoinType>(input.coin_type());
+    return std::make_shared<LegacyDustCalculator>(coinType);
+}
+
+} // namespace TW::Bitcoin
diff --git a/src/Bitcoin/DustCalculator.h b/src/Bitcoin/DustCalculator.h
new file mode 100644
index 00000000000..825ea9b2ba6
--- /dev/null
+++ b/src/Bitcoin/DustCalculator.h
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Amount.h"
+#include "FeeCalculator.h"
+#include "proto/Bitcoin.pb.h"
+
+#include <memory>
+#include <TrustWalletCore/TWCoinType.h>
+
+namespace TW::Bitcoin {
+
+/// Interface for transaction dust amount calculator.
+struct DustCalculator {
+    virtual ~DustCalculator() noexcept = default;
+
+    /// Returns a Dust threshold of a transaction UTXO or output.
+    virtual Amount dustAmount(Amount byteFee) noexcept = 0;
+};
+
+/// Always returns a fixed Dust amount specified in the signing request.
+class FixedDustCalculator final: public DustCalculator {
+public:
+    explicit FixedDustCalculator(Amount fixed) noexcept;
+
+    Amount dustAmount([[maybe_unused]] Amount byteFee) noexcept override;
+
+private:
+    Amount fixedDustAmount {0};
+};
+
+/// Legacy Dust filter implementation using [`FeeCalculator::calculateSingleInput`].
+/// Depends on a coin type, sats/Byte fee.
+class LegacyDustCalculator final: public DustCalculator {
+public:
+    explicit LegacyDustCalculator(TWCoinType coinType) noexcept;
+
+    Amount dustAmount(Amount byteFee) noexcept override;
+
+private:
+    const FeeCalculator& feeCalculator;
+};
+
+using DustCalculatorShared = std::shared_ptr<DustCalculator>;
+
+DustCalculatorShared getDustCalculator(const Proto::SigningInput& input);
+
+} // namespace TW::Bitcoin
diff --git a/src/Bitcoin/Entry.cpp b/src/Bitcoin/Entry.cpp
index 26816b632b7..ff5b6936977 100644
--- a/src/Bitcoin/Entry.cpp
+++ b/src/Bitcoin/Entry.cpp
@@ -1,20 +1,25 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "CashAddress.h"
+#include "ExchangeAddress.h"
 #include "SegwitAddress.h"
 #include "Signer.h"
 
 namespace TW::Bitcoin {
 
-bool Entry::validateAddress(TWCoinType coin, const std::string& address, byte p2pkh, byte p2sh,
-                            const char* hrp) const {
+const EntryV2 bitcoinV2Dispatcher;
+
+bool Entry::validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const {
+    auto* base58Prefix = std::get_if<Base58Prefix>(&addressPrefix);
+    auto* hrp = std::get_if<Bech32Prefix>(&addressPrefix);
+    bool isValidBase58 = base58Prefix ? Address::isValid(address, {{base58Prefix->p2pkh}, {base58Prefix->p2sh}}) : false;
+    bool isValidHrp = hrp ? SegwitAddress::isValid(address, *hrp) : false;
+
     switch (coin) {
     case TWCoinTypeBitcoin:
     case TWCoinTypeDigiByte:
@@ -23,20 +28,21 @@ bool Entry::validateAddress(TWCoinType coin, const std::string& address, byte p2
     case TWCoinTypeQtum:
     case TWCoinTypeViacoin:
     case TWCoinTypeBitcoinGold:
-        return SegwitAddress::isValid(address, hrp) || Address::isValid(address, {{p2pkh}, {p2sh}});
-
+    case TWCoinTypeSyscoin:
+    case TWCoinTypeStratis:
+        return isValidBase58 || isValidHrp;
     case TWCoinTypeBitcoinCash:
-        return BitcoinCashAddress::isValid(address) || Address::isValid(address, {{p2pkh}, {p2sh}});
-
+        return base58Prefix ? isValidBase58 : BitcoinCashAddress::isValid(address);
     case TWCoinTypeECash:
-        return ECashAddress::isValid(address) || Address::isValid(address, {{p2pkh}, {p2sh}});
-
+        return base58Prefix ? isValidBase58 : ECashAddress::isValid(address);
+    case TWCoinTypeFiro:
+        return isValidBase58 || ExchangeAddress::isValid(address);
     case TWCoinTypeDash:
     case TWCoinTypeDogecoin:
+    case TWCoinTypePivx:
     case TWCoinTypeRavencoin:
-    case TWCoinTypeFiro:
     default:
-        return Address::isValid(address, {{p2pkh}, {p2sh}});
+        return isValidBase58;
     }
 }
 
@@ -62,39 +68,53 @@ std::string Entry::normalizeAddress(TWCoinType coin, const std::string& address)
     }
 }
 
-std::string Entry::deriveAddress(TWCoinType coin, TWDerivation derivation, const PublicKey& publicKey,
-                            byte p2pkh, const char* hrp) const {
+std::string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    byte p2pkh = getFromPrefixPkhOrDefault(addressPrefix, coin);
+    const char* hrp = getFromPrefixHrpOrDefault(addressPrefix, coin);
+
     switch (coin) {
     case TWCoinTypeBitcoin:
     case TWCoinTypeLitecoin:
+    case TWCoinTypeDigiByte:
+    case TWCoinTypeViacoin:
+    case TWCoinTypeBitcoinGold:
+    case TWCoinTypeSyscoin:
+    case TWCoinTypeStratis:
         switch (derivation) {
         case TWDerivationBitcoinLegacy:
         case TWDerivationLitecoinLegacy:
             return Address(publicKey, p2pkh).string();
 
+        case TWDerivationBitcoinTestnet:
+            return SegwitAddress::createTestnetFromPublicKey(publicKey).string();
+
+        case TWDerivationBitcoinTaproot:
+            return bitcoinV2Dispatcher.deriveAddress(coin, publicKey, derivation, addressPrefix);
+
         case TWDerivationBitcoinSegwit:
         case TWDerivationDefault:
         default:
             return SegwitAddress(publicKey, hrp).string();
         }
 
-    case TWCoinTypeDigiByte:
-    case TWCoinTypeViacoin:
-    case TWCoinTypeBitcoinGold:
-        return SegwitAddress(publicKey, hrp).string();
-
     case TWCoinTypeBitcoinCash:
         return BitcoinCashAddress(publicKey).string();
 
     case TWCoinTypeECash:
         return ECashAddress(publicKey).string();
 
+    case TWCoinTypeFiro:
+        if (std::get_if<ExchangePrefix>(&addressPrefix)) {
+            return ExchangeAddress(publicKey).string();
+        }
+        return Address(publicKey, p2pkh).string();
+
     case TWCoinTypeDash:
     case TWCoinTypeDogecoin:
     case TWCoinTypeMonacoin:
+    case TWCoinTypePivx:
     case TWCoinTypeQtum:
     case TWCoinTypeRavencoin:
-    case TWCoinTypeFiro:
     default:
         return Address(publicKey, p2pkh).string();
     }
@@ -107,37 +127,36 @@ inline Data cashAddressToData(const CashAddress&& addr) {
 
 Data Entry::addressToData(TWCoinType coin, const std::string& address) const {
     switch (coin) {
-    case TWCoinTypeBitcoin:
-    case TWCoinTypeBitcoinGold:
-    case TWCoinTypeDigiByte:
-    case TWCoinTypeGroestlcoin:
-    case TWCoinTypeLitecoin:
-    case TWCoinTypeViacoin: {
-        const auto decoded = SegwitAddress::decode(address);
-        if (!std::get<2>(decoded)) {
-            return {};
-        }
-        return std::get<0>(decoded).witnessProgram;
-    }
-
     case TWCoinTypeBitcoinCash:
         return cashAddressToData(BitcoinCashAddress(address));
 
     case TWCoinTypeECash:
         return cashAddressToData(ECashAddress(address));
 
-    case TWCoinTypeDash:
-    case TWCoinTypeDogecoin:
-    case TWCoinTypeMonacoin:
-    case TWCoinTypeQtum:
-    case TWCoinTypeRavencoin:
     case TWCoinTypeFiro: {
-        const auto addr = Address(address);
-        return {addr.bytes.begin() + 1, addr.bytes.end()};
+        // check if it is a legacy address
+        if (Address::isValid(address)) {
+            const auto addr = Address(address);
+            return {addr.bytes.begin() + 1, addr.bytes.end()};
+        } else if (ExchangeAddress::isValid(address)) {
+            const auto addr = ExchangeAddress(address);
+            return {addr.bytes.begin() + 3, addr.bytes.end()};
+        }
+        return {};
     }
 
-    default:
-        return {};
+    default: {
+        const auto decoded = SegwitAddress::decode(address);
+        if (!std::get<2>(decoded)) {
+            // check if it is a legacy address
+            if (Address::isValid(address)) {
+                const auto addr = Address(address);
+                return {addr.bytes.begin() + 1, addr.bytes.end()};
+            }
+            return {Data()};
+        }
+        return std::get<0>(decoded).witnessProgram;
+    }
     }
 }
 
@@ -157,27 +176,8 @@ Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInput
 void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
                     const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
     auto txCompilerFunctor = [&signatures, &publicKeys](auto&& input, auto&& output) noexcept {
-        if (signatures.empty() || publicKeys.empty()) {
-            output.set_error(Common::Proto::Error_invalid_params);
-            output.set_error_message("empty signatures or publickeys");
-            return;
-        }
-
-        if (signatures.size() != publicKeys.size()) {
-            output.set_error(Common::Proto::Error_invalid_params);
-            output.set_error_message("signatures size and publickeys size not equal");
-            return;
-        }
-
-        HashPubkeyList externalSignatures;
-        auto insertFunctor = [](auto&& signature, auto&& pubkey) noexcept {
-            return std::make_pair(signature, pubkey.bytes);
-        };
-        transform(begin(signatures), end(signatures), begin(publicKeys),
-                  back_inserter(externalSignatures), insertFunctor);
-        output = Signer::sign(input, externalSignatures);
+        output = Signer::compile(input, signatures, publicKeys);
     };
-
     dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(txInputData,
                                                                             txCompilerFunctor);
 }
diff --git a/src/Bitcoin/Entry.h b/src/Bitcoin/Entry.h
index 713f97685d2..3e793f8715c 100644
--- a/src/Bitcoin/Entry.h
+++ b/src/Bitcoin/Entry.h
@@ -1,36 +1,34 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../CoinEntry.h"
+#include "rust/RustCoinEntry.h"
 
 namespace TW::Bitcoin {
 
+/// A helper Bitcoin Entry migrated to Rust partly used in some cases,
+/// for example, in Taproot address generation.
+/// TODO remove when `Bitcoin` is migrated to Rust completely.
+class EntryV2: public Rust::RustCoinEntry {
+};
+
 /// Bitcoin entry dispatcher.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific
 /// includes in this file
-class Entry final : public CoinEntry {
+class Entry : public CoinEntry {
 public:
-    bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh,
-                         const char* hrp) const;
-    std::string normalizeAddress(TWCoinType coin, const std::string& address) const;
-    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh,
-                              const char* hrp) const {
-        return deriveAddress(coin, TWDerivationDefault, publicKey, p2pkh, hrp);
-    }
-    std::string deriveAddress(TWCoinType coin, TWDerivation derivation, const PublicKey& publicKey,
-                              TW::byte p2pkh, const char* hrp) const;
-    Data addressToData(TWCoinType coin, const std::string& address) const;
-    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const final;
+    std::string normalizeAddress(TWCoinType coin, const std::string& address) const final;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const final;
+    Data addressToData(TWCoinType coin, const std::string& address) const final;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const final;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const final;
 
-    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const final;
     void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
-                 const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
+                 const std::vector<PublicKey>& publicKeys, Data& dataOut) const final;
     // Note: buildTransactionInput is not implemented for Binance chain with UTXOs
 };
 
diff --git a/src/Bitcoin/ExchangeAddress.h b/src/Bitcoin/ExchangeAddress.h
new file mode 100644
index 00000000000..dbdaa0bd765
--- /dev/null
+++ b/src/Bitcoin/ExchangeAddress.h
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../Base58Address.h"
+#include "Data.h"
+#include "../PublicKey.h"
+
+#include <string>
+
+namespace TW::Bitcoin {
+
+// see: https://github.com/firoorg/firo/blob/8bd4abdea223e22f15c36e7d2d42618dc843e2ef/src/chainparams.cpp#L357
+static const size_t kExchangeAddressSize = 23;
+static const Data kPrefix = {0x01, 0xb9, 0xbb};
+
+/// Class for firo exchange addresses
+class ExchangeAddress : public TW::Base58Address<kExchangeAddressSize> {
+  public:
+    /// Initializes an address with a string representation.
+    explicit ExchangeAddress(const std::string& string) : TW::Base58Address<kExchangeAddressSize>(string) {}
+
+    /// Initializes an address with a collection of bytes.
+    explicit ExchangeAddress(const Data& data) : TW::Base58Address<kExchangeAddressSize>(data) {}
+
+    /// Initializes an address with a public key and prefix.
+    ExchangeAddress(const PublicKey& publicKey) : TW::Base58Address<kExchangeAddressSize>(publicKey, kPrefix) {}
+
+    /// Determines whether a string makes a valid Firo exchange address.
+    static bool isValid(const std::string& string) {
+        return TW::Base58Address<size>::isValid(string, {kPrefix});
+    }
+};
+
+} // namespace TW::Bitcoin
diff --git a/src/Bitcoin/FeeCalculator.cpp b/src/Bitcoin/FeeCalculator.cpp
index ffae2669621..3294bfb64d5 100644
--- a/src/Bitcoin/FeeCalculator.cpp
+++ b/src/Bitcoin/FeeCalculator.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "FeeCalculator.h"
 
@@ -29,18 +27,35 @@ int64_t LinearFeeCalculator::calculateSingleInput(int64_t byteFee) const noexcep
 }
 
 class DecredFeeCalculator : public LinearFeeCalculator {
+private:
+    bool disableDustFilter = false;
+
 public:
-    constexpr DecredFeeCalculator() noexcept
-        : LinearFeeCalculator(gDecredBytesPerInput, gDecredBytesPerOutput, gDecredBytesBase) {}
+    constexpr DecredFeeCalculator(bool disableFilter = false) noexcept
+        : LinearFeeCalculator(gDecredBytesPerInput, gDecredBytesPerOutput, gDecredBytesBase)
+        , disableDustFilter(disableFilter) {}
+
+    int64_t calculateSingleInput(int64_t byteFee) const noexcept override {
+        if (disableDustFilter) { 
+            return 0; 
+        }
+        return LinearFeeCalculator::calculateSingleInput(byteFee);
+    }
 };
 
 static constexpr DefaultFeeCalculator defaultFeeCalculator{};
+static constexpr DefaultFeeCalculator defaultFeeCalculatorNoDustFilter(true);
 static constexpr DecredFeeCalculator decredFeeCalculator{};
+static constexpr DecredFeeCalculator decredFeeCalculatorNoDustFilter(true);
 static constexpr SegwitFeeCalculator segwitFeeCalculator{};
+static constexpr SegwitFeeCalculator segwitFeeCalculatorNoDustFilter(true);
 
-const FeeCalculator& getFeeCalculator(TWCoinType coinType) noexcept {
+const FeeCalculator& getFeeCalculator(TWCoinType coinType, bool disableFilter) noexcept {
     switch (coinType) {
     case TWCoinTypeDecred:
+        if (disableFilter) {
+            return decredFeeCalculatorNoDustFilter;
+        }
         return decredFeeCalculator;
 
     case TWCoinTypeBitcoin:
@@ -49,9 +64,17 @@ const FeeCalculator& getFeeCalculator(TWCoinType coinType) noexcept {
     case TWCoinTypeLitecoin:
     case TWCoinTypeViacoin:
     case TWCoinTypeGroestlcoin:
+    case TWCoinTypeSyscoin:
+    case TWCoinTypeStratis:
+        if (disableFilter) {
+            return segwitFeeCalculatorNoDustFilter;
+        }
         return segwitFeeCalculator;
 
     default:
+        if (disableFilter) {
+            return defaultFeeCalculatorNoDustFilter;
+        }
         return defaultFeeCalculator;
     }
 }
diff --git a/src/Bitcoin/FeeCalculator.h b/src/Bitcoin/FeeCalculator.h
index 49b76b28a75..32d0f083959 100644
--- a/src/Bitcoin/FeeCalculator.h
+++ b/src/Bitcoin/FeeCalculator.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -56,19 +54,41 @@ class ConstantFeeCalculator : public FeeCalculator {
 
 /// Default Bitcoin transaction fee calculator, non-segwit.
 class DefaultFeeCalculator : public LinearFeeCalculator {
+private:
+    bool disableDustFilter = false;
+
 public:
-    constexpr DefaultFeeCalculator() noexcept
-        : LinearFeeCalculator(gDefaultBytesPerInput, gDefaultBytesPerOutput, gDefaultBytesBase) {}
+    constexpr DefaultFeeCalculator(bool disableFilter = false) noexcept
+        : LinearFeeCalculator(gDefaultBytesPerInput, gDefaultBytesPerOutput, gDefaultBytesBase)
+        , disableDustFilter(disableFilter) {}
+    
+    [[nodiscard]] int64_t calculateSingleInput(int64_t byteFee) const noexcept override {
+        if (disableDustFilter) { 
+            return 0; 
+        }
+        return LinearFeeCalculator::calculateSingleInput(byteFee);
+    }
 };
 
 /// Bitcoin Segwit transaction fee calculator
 class SegwitFeeCalculator : public LinearFeeCalculator {
+private:
+    bool disableDustFilter = false;
+
 public:
-    constexpr SegwitFeeCalculator() noexcept
-        : LinearFeeCalculator(gSegwitBytesPerInput, gSegwitBytesPerOutput, gSegwitBytesBase) {}
+    constexpr SegwitFeeCalculator(bool disableFilter = false) noexcept
+        : LinearFeeCalculator(gSegwitBytesPerInput, gSegwitBytesPerOutput, gSegwitBytesBase)
+        , disableDustFilter(disableFilter) {}
+
+    [[nodiscard]] int64_t calculateSingleInput(int64_t byteFee) const noexcept override {
+        if (disableDustFilter) {
+            return 0;
+        }
+        return LinearFeeCalculator::calculateSingleInput(byteFee);
+    }
 };
 
 /// Return the fee calculator for the given coin.
-const FeeCalculator& getFeeCalculator(TWCoinType coinType) noexcept;
+const FeeCalculator& getFeeCalculator(TWCoinType coinType, bool disableFilter = false) noexcept;
 
 } // namespace TW::Bitcoin
diff --git a/src/Bitcoin/InputSelector.cpp b/src/Bitcoin/InputSelector.cpp
index 9564e67fa20..98a5f4e3358 100644
--- a/src/Bitcoin/InputSelector.cpp
+++ b/src/Bitcoin/InputSelector.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "InputSelector.h"
 
@@ -27,8 +25,8 @@ template <typename TypeWithAmount>
 std::vector<TypeWithAmount>
 InputSelector<TypeWithAmount>::filterOutDust(const std::vector<TypeWithAmount>& inputs,
                                              int64_t byteFee) noexcept {
-    auto inputFeeLimit = static_cast<uint64_t>(feeCalculator.calculateSingleInput(byteFee));
-    return filterThreshold(inputs, inputFeeLimit);
+    auto dustThreshold = static_cast<uint64_t>(dustCalculator->dustAmount(byteFee));
+    return filterThreshold(inputs, dustThreshold);
 }
 
 // Filters utxos that are dust
@@ -38,7 +36,7 @@ InputSelector<TypeWithAmount>::filterThreshold(const std::vector<TypeWithAmount>
                                                uint64_t minimumAmount) noexcept {
     std::vector<TypeWithAmount> filtered;
     for (auto& i : inputs) {
-        if (static_cast<uint64_t>(i.amount) > minimumAmount) {
+        if (static_cast<uint64_t>(i.amount) >= minimumAmount) {
             filtered.push_back(i);
         }
     }
@@ -72,22 +70,24 @@ InputSelector<TypeWithAmount>::select(uint64_t targetValue, uint64_t byteFee, ui
         return {};
     }
 
+    // Get all possible utxo selections up to a maximum size, sort by total amount, increasing
+    std::vector<TypeWithAmount> sorted = filterOutDust(_inputs, byteFee);
+    std::sort(
+        sorted.begin(),
+        sorted.end(),
+        [](const TypeWithAmount& lhs, const TypeWithAmount& rhs) {
+            return lhs.amount < rhs.amount;
+        });
+
     // total values of utxos should be greater than targetValue
-    if (_inputs.empty() || sum(_inputs) < targetValue) {
+    if (sorted.empty() || sum(sorted) < targetValue) {
         return {};
     }
-    assert(_inputs.size() >= 1);
+    assert(sorted.size() >= 1);
 
     // definitions for the following calculation
     const auto doubleTargetValue = targetValue * 2;
 
-    // Get all possible utxo selections up to a maximum size, sort by total amount, increasing
-    std::vector<TypeWithAmount> sorted = _inputs;
-    std::sort(sorted.begin(), sorted.end(),
-              [](const TypeWithAmount& lhs, const TypeWithAmount& rhs) {
-                  return lhs.amount < rhs.amount;
-              });
-
     // Precompute maximum amount possible to obtain with given number of inputs
     const auto n = sorted.size();
     std::vector<uint64_t> maxWithXInputs = std::vector<uint64_t>();
@@ -106,7 +106,7 @@ InputSelector<TypeWithAmount>::select(uint64_t targetValue, uint64_t byteFee, ui
         return doubleTargetValue - val;
     };
 
-    const int64_t dustThreshold = feeCalculator.calculateSingleInput(byteFee);
+    const int64_t dustThreshold = dustCalculator->dustAmount(byteFee);
 
     // 1. Find a combination of the fewest inputs that is
     //    (1) bigger than what we need
@@ -133,7 +133,7 @@ InputSelector<TypeWithAmount>::select(uint64_t targetValue, uint64_t byteFee, ui
                                    const std::vector<TypeWithAmount>& rhs) {
                           return distFrom2x(sum(lhs)) < distFrom2x(sum(rhs));
                       });
-            return filterOutDust(slices.front(), byteFee);
+            return slices.front();
         }
     }
 
@@ -152,11 +152,14 @@ InputSelector<TypeWithAmount>::select(uint64_t targetValue, uint64_t byteFee, ui
                                     }),
                      slices.end());
         if (!slices.empty()) {
-            return filterOutDust(slices.front(), byteFee);
+            return slices.front();
         }
     }
 
-    return {};
+    // If we couldn't find a combination of inputs to cover estimated transaction fee and the target amount,
+    // return the whole set of UTXOs. Later, the transaction fee will be calculated more accurately,
+    // and these UTXOs can be enough.
+    return sorted;
 }
 
 template <typename TypeWithAmount>
@@ -172,13 +175,13 @@ std::vector<TypeWithAmount> InputSelector<TypeWithAmount>::selectSimple(int64_t
     }
     assert(_inputs.size() >= 1);
 
-    // target value is larger that original, but not by a factor of 2 (optimized for large UTXO
+    // target value is larger than original, but not by a factor of 2 (optimized for large UTXO
     // cases)
     const auto increasedTargetValue =
         (uint64_t)((double)targetValue * 1.1 +
                    feeCalculator.calculate(_inputs.size(), numOutputs, byteFee) + 1000);
 
-    const int64_t dustThreshold = feeCalculator.calculateSingleInput(byteFee);
+    const int64_t dustThreshold = dustCalculator->dustAmount(byteFee);
 
     // Go through inputs in a single pass, in the order they appear, no optimization
     uint64_t sum = 0;
@@ -195,8 +198,10 @@ std::vector<TypeWithAmount> InputSelector<TypeWithAmount>::selectSimple(int64_t
         }
     }
 
-    // not enough
-    return {};
+    // If we couldn't find a combination of inputs to cover estimated transaction fee and the target amount,
+    // return the whole set of UTXOs. Later, the transaction fee will be calculated more accurately,
+    // and these UTXOs can be enough.
+    return selected;
 }
 
 template <typename TypeWithAmount>
diff --git a/src/Bitcoin/InputSelector.h b/src/Bitcoin/InputSelector.h
index 73298a69729..848dae390d4 100644
--- a/src/Bitcoin/InputSelector.h
+++ b/src/Bitcoin/InputSelector.h
@@ -1,12 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "FeeCalculator.h"
+#include "DustCalculator.h"
 #include <TrustWalletCore/TWCoinType.h>
 
 #include <numeric>
@@ -19,16 +18,18 @@ class InputSelector {
 public:
     /// Selects unspent transactions to use given a target transaction value, using complete logic.
     ///
-    /// \returns the list of indices of selected inputs, or an empty list if there are insufficient
-    /// funds.
+    /// \returns the list of indices of selected inputs. May return the entire list of UTXOs
+    ///          even if they aren't enough to cover `targetValue + fee`.
+    ///          That's because `InputSelector` has a rough segwit fee estimation algorithm, and the UTXOs can actually be enough.
     std::vector<TypeWithAmount> select(uint64_t targetValue, uint64_t byteFee,
                                        uint64_t numOutputs = 2);
 
     /// Selects unspent transactions to use given a target transaction value;
     /// Simplified version suitable for large number of inputs
     ///
-    /// \returns the list of indices of selected inputs, or an empty list if there are insufficient
-    /// funds.
+    /// \returns the list of indices of selected inputs. May return the entire list of UTXOs
+    ///          even if they aren't enough to cover `targetValue + fee`.
+    ///          That's because `InputSelector` has a rough segwit fee estimation algorithm, and the UTXOs can actually be enough.
     std::vector<TypeWithAmount> selectSimple(int64_t targetValue, int64_t byteFee,
                                              int64_t numOutputs = 2);
 
@@ -36,12 +37,20 @@ class InputSelector {
     /// Return indices. One output and no change is assumed.
     std::vector<TypeWithAmount> selectMaxAmount(int64_t byteFee) noexcept;
 
-    /// Construct, using provided feeCalculator (see getFeeCalculator()).
+    /// Construct, using provided feeCalculator (see getFeeCalculator()) and dustCalculator (see getDustCalculator()).
     explicit InputSelector(const std::vector<TypeWithAmount>& inputs,
-                           const FeeCalculator& feeCalculator) noexcept
-        : _inputs(inputs), feeCalculator(feeCalculator) {}
+                           const FeeCalculator& feeCalculator,
+                           DustCalculatorShared dustCalculator) noexcept
+        : _inputs(inputs),
+          feeCalculator(feeCalculator),
+          dustCalculator(std::move(dustCalculator)) {
+    }
+
     explicit InputSelector(const std::vector<TypeWithAmount>& inputs) noexcept
-        : InputSelector(inputs, getFeeCalculator(TWCoinTypeBitcoin)) {}
+        : _inputs(inputs),
+          feeCalculator(getFeeCalculator(TWCoinTypeBitcoin)),
+          dustCalculator(std::make_shared<LegacyDustCalculator>(TWCoinTypeBitcoin)) {
+    }
 
     /// Sum of input amounts
     static uint64_t sum(const std::vector<TypeWithAmount>& amounts) noexcept;
@@ -55,6 +64,7 @@ class InputSelector {
 private:
     const std::vector<TypeWithAmount> _inputs;
     const FeeCalculator& feeCalculator;
+    const DustCalculatorShared dustCalculator;
 };
 
 } // namespace TW::Bitcoin
diff --git a/src/Bitcoin/MessageSigner.cpp b/src/Bitcoin/MessageSigner.cpp
new file mode 100644
index 00000000000..af8a6565322
--- /dev/null
+++ b/src/Bitcoin/MessageSigner.cpp
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "MessageSigner.h"
+#include "Address.h"
+
+#include "Base64.h"
+#include "BinaryCoding.h"
+#include "Coin.h"
+#include "Data.h"
+#include "HexCoding.h"
+
+using namespace TW;
+
+namespace TW::Bitcoin {
+
+// length-encode a message string
+Data messageToData(const std::string& message) {
+    Data d;
+    TW::encodeVarInt(message.size(), d);
+    TW::append(d, TW::data(message));
+    return d;
+}
+
+// append prefix and length-encode message string
+Data messageToFullData(const std::string& message) {
+    Data d = messageToData(MessageSigner::MessagePrefix);
+    TW::append(d, messageToData(message));
+    return d;
+}
+
+Data MessageSigner::messageToHash(const std::string& message) {
+    Data d = messageToFullData(message);
+    return Hash::sha256d(d.data(), d.size());
+}
+
+std::string MessageSigner::signMessage(const PrivateKey& privateKey, const std::string& address, const std::string& message, bool compressed) {
+    if (!Address::isValid(address)) {
+        throw std::invalid_argument("Address is not valid (legacy) address");
+    }
+    std::string addrFromKey;
+    if (compressed) {
+        const auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+        addrFromKey = Address(pubKey, TW::p2pkhPrefix(TWCoinTypeBitcoin)).string();
+    } else {
+        const auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        const auto keyHash = pubKey.hash(Data{TW::p2pkhPrefix(TWCoinTypeBitcoin)}, Hash::HasherSha256ripemd);
+        addrFromKey = Address(keyHash).string();
+    }
+    if (addrFromKey != address) {
+        throw std::invalid_argument("Address does not match key");
+    }
+    const auto messageHash = messageToHash(message);
+    const auto signature = privateKey.sign(messageHash, TWCurveSECP256k1);
+
+    // The V value: add 31 (or 27 for compressed), and move to the first byte
+    const byte v = signature[SignatureRSLength] + PublicKey::SignatureVOffset + (compressed ? 4ul : 0ul);
+    auto sigAdjusted = Data{v};
+    TW::append(sigAdjusted, TW::subData(signature, 0, SignatureRSLength));
+    return Base64::encode(sigAdjusted);
+}
+
+std::string MessageSigner::recoverAddressFromMessage(const std::string& message, const Data& signature) {
+    if (signature.size() < SignatureRSVLength) {
+        throw std::invalid_argument("signature too short");
+    }
+    const auto messageHash = MessageSigner::messageToHash(message);
+    auto recId = signature[0];
+    auto compressed = false;
+    if (recId >= PublicKey::SignatureVOffset + 4) {
+        recId -= 4;
+        compressed = true;
+    }
+    if (recId >= PublicKey::SignatureVOffset) {
+        recId -= PublicKey::SignatureVOffset;
+    }
+
+    const auto publicKeyRecovered = PublicKey::recoverRaw(TW::subData(signature, 1), recId, messageHash);
+
+    if (!compressed) {
+        // uncompressed public key
+        const auto keyHash = publicKeyRecovered.hash(Data{TW::p2pkhPrefix(TWCoinTypeBitcoin)}, Hash::HasherSha256ripemd);
+        return Bitcoin::Address(keyHash).string();
+    }
+    // compressed
+    const auto publicKeyRecoveredCompressed = publicKeyRecovered.compressed();
+    return Bitcoin::Address(publicKeyRecoveredCompressed, TW::p2pkhPrefix(TWCoinTypeBitcoin)).string();
+}
+
+bool MessageSigner::verifyMessage(const std::string& address, const std::string& message, const std::string& signature) noexcept {
+    try {
+        const auto signatureData = Base64::decode(signature);
+        return verifyMessage(address, message, signatureData);
+    } catch (...) {
+        return false;
+    }
+}
+
+/// May throw
+bool MessageSigner::verifyMessage(const std::string& address, const std::string& message, const Data& signature) {
+    if (!Bitcoin::Address::isValid(address)) {
+        throw std::invalid_argument("Input address invalid, must be valid legacy");
+    }
+    const auto addressRecovered = recoverAddressFromMessage(message, signature);
+    return (addressRecovered == address);
+}
+
+} // namespace TW::Bitcoin
diff --git a/src/Bitcoin/MessageSigner.h b/src/Bitcoin/MessageSigner.h
new file mode 100644
index 00000000000..f81f7f9bdb9
--- /dev/null
+++ b/src/Bitcoin/MessageSigner.h
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "PrivateKey.h"
+
+#include <string>
+
+namespace TW::Bitcoin {
+
+/// Class for message signing and verification.
+///
+/// Bitcoin Core and some other wallets support a message signing & verification format, to create a proof (a signature)
+/// that someone has access to the private keys of a specific address.
+/// This feature currently works on old legacy addresses only.
+class MessageSigner {
+  public:
+    /// Sign a message.
+    /// privateKey: the private key used for signing
+    /// address: the address that matches the privateKey, must be a legacy address (P2PKH)
+    /// message: A custom message which is input to the signing.
+    /// compressed: True by default, as addresses are generated from the hash of the compressed public key.
+    ///    However, in some instances key hash is generated from the hash of the extended public key,
+    ///    that's also supported here as well for compatibility.
+    /// Returns the signature, Base64-encoded.
+    /// Throws on invalid input.
+    static std::string signMessage(const PrivateKey& privateKey, const std::string& address, const std::string& message, bool compressed = true);
+  
+    /// Verify signature for a message.
+    /// address: address to use, only legacy is supported
+    /// message: the message signed (without prefix)
+    /// signature: in Base64-encoded form.
+    /// Returns false on any invalid input (does not throw).
+    static bool verifyMessage(const std::string& address, const std::string& message, const std::string& signature) noexcept;
+
+    /// Verify signature for a message.
+    /// Address: address to use, only legacy is supported
+    /// message: the message signed (without prefix)
+    /// signature: in binary form.
+    /// May throw
+    static bool verifyMessage(const std::string& address, const std::string& message, const Data& signature);
+
+    /// Recover address from signature and message. May throw.
+    static std::string recoverAddressFromMessage(const std::string& message, const Data& signature);
+
+    /// Append prefix and compute hash for a message
+    static Data messageToHash(const std::string& message);
+
+    static constexpr auto MessagePrefix = "Bitcoin Signed Message:\n";
+    static const byte DigestLength = 32;
+    static const byte SignatureRSLength = 64;
+    static constexpr byte SignatureRSVLength = SignatureRSLength + 1;
+    static const byte VOffset = 27;
+};
+
+} // namespace TW::Bitcoin
diff --git a/src/Bitcoin/OpCodes.h b/src/Bitcoin/OpCodes.h
index fa797be4b19..c76b653949f 100644
--- a/src/Bitcoin/OpCodes.h
+++ b/src/Bitcoin/OpCodes.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -10,6 +8,7 @@ enum OpCode {
     // push value
    OP_0 = 0x00,
    OP_FALSE [[maybe_unused]] = OP_0,
+   // Note: values 0x01 -- 0x4b (1--75) mean that the next N bytes are interpreted as data pushed into the stack
    OP_PUSHDATA1 = 0x4c,
    OP_PUSHDATA2 = 0x4d,
    OP_PUSHDATA4 = 0x4e,
@@ -135,12 +134,16 @@ enum OpCode {
    OP_NOP3 [[maybe_unused]] = OP_CHECKSEQUENCEVERIFY,
    OP_NOP4 [[maybe_unused]] = 0xb3,
    OP_NOP5 [[maybe_unused]] = 0xb4,
+   OP_CHECKBLOCKATHEIGHT = OP_NOP5,
    OP_NOP6 [[maybe_unused]] = 0xb5,
    OP_NOP7 [[maybe_unused]] = 0xb6,
    OP_NOP8 [[maybe_unused]] = 0xb7,
    OP_NOP9 [[maybe_unused]] = 0xb8,
    OP_NOP10 [[maybe_unused]] = 0xb9,
 
+    // firo, see: https://github.com/firoorg/firo/blob/8bd4abdea223e22f15c36e7d2d42618dc843e2ef/src/script/script.h#L212
+   OP_EXCHANGEADDR = 0xe0,
+
    OP_INVALIDOPCODE [[maybe_unused]] = 0xff,
 };
 
diff --git a/src/Bitcoin/OutPoint.cpp b/src/Bitcoin/OutPoint.cpp
index 922f23d35de..fd65e3a6a51 100644
--- a/src/Bitcoin/OutPoint.cpp
+++ b/src/Bitcoin/OutPoint.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "OutPoint.h"
 
@@ -14,6 +12,7 @@ void OutPoint::encode(Data& data) const noexcept {
     std::copy(std::begin(hash), std::end(hash), std::back_inserter(data));
     encode32LE(index, data);
     // sequence is encoded in TransactionInputs
+    // tree is only for DCR
 }
 
 } // namespace TW::Bitcoin
diff --git a/src/Bitcoin/OutPoint.h b/src/Bitcoin/OutPoint.h
index 0abed5a31a1..bb7f9a951c1 100644
--- a/src/Bitcoin/OutPoint.h
+++ b/src/Bitcoin/OutPoint.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -28,16 +26,19 @@ struct OutPoint {
     /// TransactionInput.sequence)
     uint32_t sequence;
 
+    /// The tree in utxo, only works for DCR
+    int8_t tree;
+
     OutPoint() noexcept = default;
 
     /// Initializes an out-point reference with hash, index.
     template <typename T>
-    OutPoint(const T& h, uint32_t index, uint32_t sequence = 0) noexcept
-        : hash(to_array<byte, 32>(h)), index(index), sequence(sequence) {}
+    OutPoint(const T& h, uint32_t index, uint32_t sequence = 0, int8_t tree = 0) noexcept
+        : hash(to_array<byte, 32>(h)), index(index), sequence(sequence), tree(tree) {}
 
     /// Initializes an out-point from a Protobuf out-point.
     OutPoint(const Proto::OutPoint& other) noexcept
-        : OutPoint(other.hash(), other.index(), other.sequence()) {
+        : OutPoint(other.hash(), other.index(), other.sequence(), int8_t(other.tree())) {
         assert(other.hash().size() == 32);
     }
 
@@ -49,6 +50,7 @@ struct OutPoint {
         op.set_hash(std::string(hash.begin(), hash.end()));
         op.set_index(index);
         op.set_sequence(sequence);
+        op.set_tree(int32_t(tree));
         return op;
     }
 };
diff --git a/src/Bitcoin/Script.cpp b/src/Bitcoin/Script.cpp
index 7000814c396..1d2112769d4 100644
--- a/src/Bitcoin/Script.cpp
+++ b/src/Bitcoin/Script.cpp
@@ -1,20 +1,22 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "CashAddress.h"
+#include "ExchangeAddress.h"
 #include "OpCodes.h"
 #include "Script.h"
 #include "SegwitAddress.h"
+#include "proto/Bitcoin.pb.h"
+#include <TrustWalletCore/TWHRP.h>
 
 #include "../BinaryCoding.h"
 #include "../Coin.h"
 #include "../Decred/Address.h"
 #include "../Groestlcoin/Address.h"
 #include "../Zcash/TAddress.h"
+#include "../Zen/Address.h"
 
 #include <algorithm>
 #include <iterator>
@@ -32,6 +34,12 @@ bool Script::isPayToScriptHash() const {
            bytes[22] == OP_EQUAL;
 }
 
+bool Script::isPayToScriptHashReplay() const {
+    // Extra-fast test for pay-to-script-hash-replay
+    return bytes.size() == 61 && bytes[0] == OP_HASH160 && bytes[1] == 0x14 &&
+           bytes[22] == OP_EQUAL && bytes.back() == OP_CHECKBLOCKATHEIGHT;
+}
+
 bool Script::isPayToWitnessScriptHash() const {
     // Extra-fast test for pay-to-witness-script-hash
     return bytes.size() == 34 && bytes[0] == OP_0 && bytes[1] == 0x20;
@@ -80,6 +88,28 @@ bool Script::matchPayToPublicKeyHash(Data& result) const {
     return false;
 }
 
+// see: https://github.com/firoorg/firo/blob/8bd4abdea223e22f15c36e7d2d42618dc843e2ef/src/script/standard.cpp#L355
+bool Script::matchPayToExchangePublicKeyHash(Data& result) const {
+    if (bytes.size() == 26 && bytes[0] == OP_EXCHANGEADDR && bytes[1] == OP_DUP && bytes[2] == OP_HASH160 && bytes[3] == 20 &&
+        bytes[24] == OP_EQUALVERIFY && bytes[25] == OP_CHECKSIG) {
+        result.clear();
+        std::copy(std::begin(bytes) + 4, std::begin(bytes) + 4 + 20, std::back_inserter(result));
+        return true;
+    }
+    return false;
+}
+
+bool Script::matchPayToPublicKeyHashReplay(Data& result) const {
+    if (bytes.size() == 63 && bytes[0] == OP_DUP && bytes[1] == OP_HASH160 && bytes[2] == 20 &&
+        bytes[23] == OP_EQUALVERIFY && bytes[24] == OP_CHECKSIG && bytes[25] == 32 &&
+        bytes.back() == OP_CHECKBLOCKATHEIGHT) {
+        result.clear();
+        std::copy(std::begin(bytes) + 3, std::begin(bytes) + 3 + 20, std::back_inserter(result));
+        return true;
+    }
+    return false;
+}
+
 bool Script::matchPayToScriptHash(Data& result) const {
     if (!isPayToScriptHash()) {
         return false;
@@ -89,6 +119,16 @@ bool Script::matchPayToScriptHash(Data& result) const {
     return true;
 }
 
+bool Script::matchPayToScriptHashReplay(Data& result) const {
+    if (!isPayToScriptHashReplay()) {
+        return false;
+    }
+    result.clear();
+    std::copy(std::begin(bytes) + 2, std::begin(bytes) + 22, std::back_inserter(result));
+    return true;
+}
+
+
 bool Script::matchPayToWitnessPublicKeyHash(Data& result) const {
     if (!isPayToWitnessPublicKeyHash()) {
         return false;
@@ -218,6 +258,46 @@ Script Script::buildPayToPublicKeyHash(const Data& hash) {
     return script;
 }
 
+// see: https://github.com/firoorg/firo/blob/8bd4abdea223e22f15c36e7d2d42618dc843e2ef/src/script/standard.cpp#L355
+Script Script::buildPayToExchangePublicKeyHash(const Data& hash) {
+    assert(hash.size() == 20);
+    Script script;
+    script.bytes.push_back(OP_EXCHANGEADDR);
+    script.bytes.push_back(OP_DUP);
+    script.bytes.push_back(OP_HASH160);
+    script.bytes.push_back(20);
+    append(script.bytes, hash);
+    script.bytes.push_back(OP_EQUALVERIFY);
+    script.bytes.push_back(OP_CHECKSIG);
+    return script;
+}
+
+Script Script::buildPayToPublicKeyHashReplay(const Data& hash, const Data& blockHash, int64_t blockHeight) {
+    assert(hash.size() == 20);
+    assert(blockHash.size() == 32);
+    Script script;
+    script.bytes.push_back(OP_DUP);
+    script.bytes.push_back(OP_HASH160);
+    script.bytes.push_back(20);
+    append(script.bytes, hash);
+    script.bytes.push_back(OP_EQUALVERIFY);
+    script.bytes.push_back(OP_CHECKSIG);
+
+    // blockhash
+    script.bytes.push_back(32);
+    append(script.bytes, blockHash);
+
+    // blockheight
+    auto blockHeightData = encodeNumber(blockHeight);
+    // blockHeight size will never beyond 1 byte size
+    script.bytes.push_back(static_cast<byte>(blockHeightData.size()));
+    append(script.bytes, blockHeightData);
+    script.bytes.push_back(OP_CHECKBLOCKATHEIGHT);
+
+    return script;
+}
+
+
 Script Script::buildPayToScriptHash(const Data& scriptHash) {
     assert(scriptHash.size() == 20);
     Script script;
@@ -228,11 +308,48 @@ Script Script::buildPayToScriptHash(const Data& scriptHash) {
     return script;
 }
 
+Script Script::buildPayToScriptHashReplay(const Data& scriptHash, const Data& blockHash, int64_t blockHeight) {
+    assert(scriptHash.size() == 20);
+    assert(blockHash.size() == 32);
+    Script script;
+    script.bytes.push_back(OP_HASH160);
+    script.bytes.push_back(20);
+    append(script.bytes, scriptHash);
+    script.bytes.push_back(OP_EQUAL);
+
+    // blockhash
+    script.bytes.push_back(32);
+    append(script.bytes, blockHash);
+
+    // blockheight
+    auto blockHeightData = encodeNumber(blockHeight);
+    // blockHeight size will never beyond 1 byte size
+    script.bytes.push_back(static_cast<byte>(blockHeightData.size()));
+    append(script.bytes, blockHeightData);
+    script.bytes.push_back(OP_CHECKBLOCKATHEIGHT);
+
+    return script;
+}
+
+
+// Append to the buffer the length for the upcoming data (push). Supported length range: 0-75 bytes
+void pushDataLength(Data& buffer, size_t len) {
+    assert(len <= 255);
+    if (len < static_cast<byte>(OP_PUSHDATA1)) {
+        // up to 75 bytes, simple OP_PUSHBYTES with len
+        buffer.push_back(static_cast<byte>(len));
+        return;
+    }
+    // 75 < len < 256, OP_PUSHDATA with 1-byte len
+    buffer.push_back(OP_PUSHDATA1);
+    buffer.push_back(static_cast<byte>(len));
+}
+
 Script Script::buildPayToV0WitnessProgram(const Data& program) {
     assert(program.size() == 20 || program.size() == 32);
     Script script;
     script.bytes.push_back(OP_0);
-    script.bytes.push_back(static_cast<byte>(program.size()));
+    pushDataLength(script.bytes, static_cast<byte>(program.size()));
     append(script.bytes, program);
     assert(script.bytes.size() == 22 || script.bytes.size() == 34);
     return script;
@@ -252,19 +369,23 @@ Script Script::buildPayToV1WitnessProgram(const Data& publicKey) {
     assert(publicKey.size() == 32);
     Script script;
     script.bytes.push_back(OP_1);
-    script.bytes.push_back(static_cast<byte>(publicKey.size()));
+    pushDataLength(script.bytes, static_cast<byte>(publicKey.size()));
     append(script.bytes, publicKey);
     assert(script.bytes.size() == 34);
     return script;
 }
 
 Script Script::buildOpReturnScript(const Data& data) {
-    static const size_t MaxOpReturnLength = 64;
+    if (data.size() > MaxOpReturnLength) {
+        // data too long, cannot fit, fail (do not truncate)
+        return {};
+    }
+    assert(data.size() <= MaxOpReturnLength);
     Script script;
     script.bytes.push_back(OP_RETURN);
-    size_t size = std::min(data.size(), MaxOpReturnLength);
-    script.bytes.push_back(static_cast<byte>(size));
-    script.bytes.insert(script.bytes.end(), data.begin(), data.begin() + size);
+    pushDataLength(script.bytes, data.size());
+    script.bytes.insert(script.bytes.end(), data.begin(), data.begin() + data.size());
+    assert(script.bytes.size() <= 83); // max script length, must always hold
     return script;
 }
 
@@ -273,7 +394,46 @@ void Script::encode(Data& data) const {
     std::copy(std::begin(bytes), std::end(bytes), std::back_inserter(data));
 }
 
+Data Script::encodeNumber(int64_t n) {
+    Data result;
+    // check bitcoin Script::push_int64
+    if (n == -1 || (n >= 1 && n <= 16)) {
+        result.push_back(OP_1 + uint8_t(n - 1));
+        return result;
+    }
+    if (n == 0) {
+        result.push_back(OP_0);
+        return result;
+    }
+
+    const bool neg = n < 0;
+    uint64_t absvalue = neg ? -n : n;
+
+    while (absvalue) {
+        result.push_back(absvalue & 0xff);
+        absvalue >>= 8;
+    }
+
+    if (result.back() & 0x80) {
+        result.push_back(neg ? 0x80 : 0);
+    } else if (neg) {
+        result.back() |= 0x80;
+    }
+    return result;
+}
+
+bool isLtcP2sh(enum TWCoinType coin, byte start) {
+    // For ltc, we need to support legacy p2sh which starts with 5.
+    // Here we check prefix 5 and 50 in case of wallet-core changing its config value.
+    // Ref: https://github.com/litecoin-project/litecoin/blob/0.21/src/chainparams.cpp#L128
+    if (TWCoinTypeLitecoin == coin && (5 == start || 50 == start)) {
+        return true;
+    }
+    return false;
+}
+
 Script Script::lockScriptForAddress(const std::string& string, enum TWCoinType coin) {
+    // First try legacy address, for all coins
     if (Address::isValid(string)) {
         auto address = Address(string);
         auto p2pkh = TW::p2pkhPrefix(coin);
@@ -284,16 +444,23 @@ Script Script::lockScriptForAddress(const std::string& string, enum TWCoinType c
             data.reserve(Address::size - 1);
             std::copy(address.bytes.begin() + 1, address.bytes.end(), std::back_inserter(data));
             return buildPayToPublicKeyHash(data);
-        } else if (p2sh == address.bytes[0]) {
+        } else if (p2sh == address.bytes[0]
+            || isLtcP2sh(coin, address.bytes[0])) {
             // address starts with 3/M
             auto data = Data();
             data.reserve(Address::size - 1);
             std::copy(address.bytes.begin() + 1, address.bytes.end(), std::back_inserter(data));
             return buildPayToScriptHash(data);
         }
-    } else if (SegwitAddress::isValid(string)) {
-        const auto result = SegwitAddress::decode(string);
-        // address starts with bc/ltc
+        return {};
+    }
+
+    // Second, try Segwit address, for all coins; also check HRP
+    if (const auto result = SegwitAddress::decode(string);
+        std::get<2>(result) &&
+        (std::get<1>(result) == stringForHRP(TW::hrp(coin)) || (coin == TWCoinTypeBitcoin && std::get<1>(result) == SegwitAddress::TestnetPrefix))
+    ) {
+        // address starts with bc/ltc/...
         const auto address = std::get<0>(result);
         if (address.witnessVersion == 0) {
             return buildPayToV0WitnessProgram(address.witnessProgram);
@@ -301,45 +468,98 @@ Script Script::lockScriptForAddress(const std::string& string, enum TWCoinType c
         if (address.witnessVersion == 1 && address.witnessProgram.size() == 32) {
             return buildPayToV1WitnessProgram(address.witnessProgram);
         }
-    } else if (BitcoinCashAddress::isValid(string)) {
-        auto address = BitcoinCashAddress(string);
-        auto bitcoinAddress = address.legacyAddress();
-        return lockScriptForAddress(bitcoinAddress.string(), TWCoinTypeBitcoinCash);
-    } else if (Decred::Address::isValid(string)) {
-        auto bytes = Base58::bitcoin.decodeCheck(string, Hash::HasherBlake256d);
-        if (bytes[1] == TW::p2pkhPrefix(TWCoinTypeDecred)) {
-            return buildPayToPublicKeyHash(Data(bytes.begin() + 2, bytes.end()));
-        }
-        if (bytes[1] == TW::p2shPrefix(TWCoinTypeDecred)) {
-            return buildPayToScriptHash(Data(bytes.begin() + 2, bytes.end()));
-        }
-    } else if (ECashAddress::isValid(string)) {
-        auto address = ECashAddress(string);
-        auto bitcoinAddress = address.legacyAddress();
-        return lockScriptForAddress(bitcoinAddress.string(), TWCoinTypeECash);
-    } else if (Groestlcoin::Address::isValid(string)) {
-        auto address = Groestlcoin::Address(string);
-        auto data = Data();
-        data.reserve(Address::size - 1);
-        std::copy(address.bytes.begin() + 1, address.bytes.end(), std::back_inserter(data));
-        if (address.bytes[0] == TW::p2pkhPrefix(TWCoinTypeGroestlcoin)) {
-            return buildPayToPublicKeyHash(data);
-        }
-        if (address.bytes[0] == TW::p2shPrefix(TWCoinTypeGroestlcoin)) {
-            return buildPayToScriptHash(data);
-        }
-    } else if (Zcash::TAddress::isValid(string)) {
-        auto address = Zcash::TAddress(string);
+        return {};
+    }
+
+    // Thirdly, coin-specific address formats
+    switch (coin) {
+        case TWCoinTypeBitcoinCash:
+            if (BitcoinCashAddress::isValid(string)) {
+                auto address = BitcoinCashAddress(string);
+                auto bitcoinAddress = address.legacyAddress();
+                return lockScriptForAddress(bitcoinAddress.string(), TWCoinTypeBitcoinCash);
+            }
+            return {};
+
+        case TWCoinTypeDecred:
+            if (Decred::Address::isValid(string)) {
+                auto bytes = Base58::decodeCheck(string, Rust::Base58Alphabet::Bitcoin, Hash::HasherBlake256d);
+                if (bytes[1] == TW::p2pkhPrefix(TWCoinTypeDecred)) {
+                    return buildPayToPublicKeyHash(Data(bytes.begin() + 2, bytes.end()));
+                }
+                if (bytes[1] == TW::p2shPrefix(TWCoinTypeDecred)) {
+                    return buildPayToScriptHash(Data(bytes.begin() + 2, bytes.end()));
+                }
+            }
+            return {};
+
+        case TWCoinTypeECash:
+            if (ECashAddress::isValid(string)) {
+                auto address = ECashAddress(string);
+                auto bitcoinAddress = address.legacyAddress();
+                return lockScriptForAddress(bitcoinAddress.string(), TWCoinTypeECash);
+            }
+            return {};
+
+        case TWCoinTypeFiro:
+            if (ExchangeAddress::isValid(string)) {
+                auto address = ExchangeAddress(string);
+                auto data = Data();
+                data.reserve(ExchangeAddress::size - 3);
+                std::copy(address.bytes.begin() + 3, address.bytes.end(), std::back_inserter(data));
+                return buildPayToExchangePublicKeyHash(data);
+            }
+            return {};
+
+        case TWCoinTypeGroestlcoin:
+            if (Groestlcoin::Address::isValid(string)) {
+                auto address = Groestlcoin::Address(string);
+                auto data = Data();
+                data.reserve(Groestlcoin::Address::size - 1);
+                std::copy(address.bytes.begin() + 1, address.bytes.end(), std::back_inserter(data));
+                if (address.bytes[0] == TW::p2pkhPrefix(TWCoinTypeGroestlcoin)) {
+                    return buildPayToPublicKeyHash(data);
+                }
+                if (address.bytes[0] == TW::p2shPrefix(TWCoinTypeGroestlcoin)) {
+                    return buildPayToScriptHash(data);
+                }
+            }
+            return {};
+
+        case TWCoinTypeZcash:
+        case TWCoinTypeZelcash:
+            if (Zcash::TAddress::isValid(string)) {
+                auto address = Zcash::TAddress(string);
+                auto data = Data();
+                data.reserve(Zcash::TAddress::size - 2);
+                std::copy(address.bytes.begin() + 2, address.bytes.end(), std::back_inserter(data));
+                if (address.bytes[1] == TW::p2pkhPrefix(TWCoinTypeZcash)) {
+                    return buildPayToPublicKeyHash(data);
+                } else if (address.bytes[1] == TW::p2shPrefix(TWCoinTypeZcash)) {
+                    return buildPayToScriptHash(data);
+                }
+            }
+            return {};
+
+        default:
+            return {};
+    }
+}
+
+Script Script::lockScriptForAddress(const std::string& string, enum TWCoinType coin, const Data& blockHash, int64_t blockHeight) {
+    if (Zen::Address::isValid(string)) {
+        auto address = Zen::Address(string);
         auto data = Data();
-        data.reserve(Address::size - 2);
+        data.reserve(Zen::Address::size - 2);
         std::copy(address.bytes.begin() + 2, address.bytes.end(), std::back_inserter(data));
-        if (address.bytes[1] == TW::p2pkhPrefix(TWCoinTypeZcash)) {
-            return buildPayToPublicKeyHash(data);
-        } else if (address.bytes[1] == TW::p2shPrefix(TWCoinTypeZcash)) {
-            return buildPayToScriptHash(data);
+        if (address.bytes[1] == TW::p2pkhPrefix(TWCoinTypeZen)) {
+            return buildPayToPublicKeyHashReplay(data, blockHash, blockHeight);
+        } else if (address.bytes[1] == TW::p2shPrefix(TWCoinTypeZen)) {
+            return buildPayToScriptHashReplay(data, blockHash, blockHeight);
         }
     }
-    return {};
+
+    return lockScriptForAddress(string, coin);
 }
 
 } // namespace TW::Bitcoin
diff --git a/src/Bitcoin/Script.h b/src/Bitcoin/Script.h
index 39cc5c874fc..dc48452604f 100644
--- a/src/Bitcoin/Script.h
+++ b/src/Bitcoin/Script.h
@@ -1,15 +1,15 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Data.h"
+#include "rust/bindgen/WalletCoreRSBindgen.h"
 
 #include "OpCodes.h"
 #include <TrustWalletCore/TWCoinType.h>
+#include "proto/Bitcoin.pb.h"
 
 #include <string>
 #include <utility>
@@ -20,6 +20,9 @@ namespace TW::Bitcoin {
 
 class Script {
   public:
+    // Maximum length for OP_RETURN data
+    static const size_t MaxOpReturnLength = 80;
+
     /// Script raw bytes.
     Data bytes;
 
@@ -42,6 +45,10 @@ class Script {
     /// Determines whether this is a pay-to-script-hash (P2SH) script.
     bool isPayToScriptHash() const;
 
+    /// Determines whether this is a pay-to-script-hash-replay (P2SH) script.
+    /// Only apply for zen
+    bool isPayToScriptHashReplay() const;
+
     /// Determines whether this is a pay-to-witness-script-hash (P2WSH) script.
     bool isPayToWitnessScriptHash() const;
 
@@ -57,9 +64,21 @@ class Script {
     /// Matches the script to a pay-to-public-key-hash (P2PKH).
     bool matchPayToPublicKeyHash(Data& keyHash) const;
 
+    /// Matches the script to a pay-to-exchange-public-key-hash (P2PKH).
+    /// Only apply for firo
+    bool matchPayToExchangePublicKeyHash(Data& keyHash) const;
+
+    /// Matches the script to a pay-to-public-key-hash-replay (P2PKH).
+    /// Only apply for zen
+    bool matchPayToPublicKeyHashReplay(Data& keyHash) const;
+
     /// Matches the script to a pay-to-script-hash (P2SH).
     bool matchPayToScriptHash(Data& scriptHash) const;
 
+    /// Matches the script to a pay-to-script-hash-replay (P2SH).
+    /// Only apply for zen
+    bool matchPayToScriptHashReplay(Data& scriptHash) const;
+
     /// Matches the script to a pay-to-witness-public-key-hash (P2WPKH).
     bool matchPayToWitnessPublicKeyHash(Data& keyHash) const;
 
@@ -75,9 +94,21 @@ class Script {
     /// Builds a pay-to-public-key-hash (P2PKH) script from a public key hash.
     static Script buildPayToPublicKeyHash(const Data& hash);
 
+    /// Builds a pay-to-exchange-public-key-hash script from a public key hash.
+    /// This will apply for firo.
+    static Script buildPayToExchangePublicKeyHash(const Data& hash);
+
+    /// Builds a pay-to-public-key-hash-replay (P2PKH) script from a public key hash.
+    /// This will apply for zen
+    static Script buildPayToPublicKeyHashReplay(const Data& hash, const Data& blockHash, int64_t blockHeight);
+
     /// Builds a pay-to-script-hash (P2SH) script from a script hash.
     static Script buildPayToScriptHash(const Data& scriptHash);
 
+    /// Builds a pay-to-script-hash-replay (P2SH) script from a script hash.
+    /// This will apply for zen
+    static Script buildPayToScriptHashReplay(const Data& scriptHash, const Data& blockHash, int64_t blockHeight);
+
     /// Builds a pay-to-witness-public-key-hash (P2WPKH) script from a public
     /// key hash.
     static Script buildPayToWitnessPublicKeyHash(const Data& hash);
@@ -91,13 +122,17 @@ class Script {
     /// Builds a V1 pay-to-witness-program script, P2TR (from a 32-byte Schnorr public key).
     static Script buildPayToV1WitnessProgram(const Data& publicKey);
 
-    /// Builds an OP_RETURN script with given data
+    /// Builds an OP_RETURN script with given data. Returns empty script on error, if data is too long (>80).
     static Script buildOpReturnScript(const Data& data);
 
     /// Builds a appropriate lock script for the given
     /// address.
     static Script lockScriptForAddress(const std::string& address, enum TWCoinType coin);
 
+    /// Builds a appropriate lock script for the given
+    /// address with blockhash and blockheight.
+    static Script lockScriptForAddress(const std::string& address, enum TWCoinType coin, const Data& blockHash, int64_t blockHeight);
+
     /// Encodes the script.
     void encode(Data& data) const;
 
@@ -110,6 +145,9 @@ class Script {
         return OP_1 + uint8_t(n - 1);
     }
 
+    /// Encodes an integer
+    static Data encodeNumber(int64_t n);
+
     /// Decodes a small integer
     static inline int decodeNumber(uint8_t opcode) {
         if (opcode == OP_0) {
diff --git a/src/Bitcoin/SegwitAddress.cpp b/src/Bitcoin/SegwitAddress.cpp
index 4e40ce06ab7..70ec462d391 100644
--- a/src/Bitcoin/SegwitAddress.cpp
+++ b/src/Bitcoin/SegwitAddress.cpp
@@ -1,9 +1,7 @@
 // Copyright © 2017 Pieter Wuille
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "SegwitAddress.h"
 #include "../Bech32.h"
diff --git a/src/Bitcoin/SegwitAddress.h b/src/Bitcoin/SegwitAddress.h
index 8a073b6f1fa..8d65f7d83fc 100644
--- a/src/Bitcoin/SegwitAddress.h
+++ b/src/Bitcoin/SegwitAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -31,6 +29,9 @@ class SegwitAddress {
     /// Witness program.
     Data witnessProgram;
 
+    // Prefix for Bitcoin Testnet Segwit addresses
+    static constexpr auto TestnetPrefix = "tb";
+
     /// Determines whether a string makes a valid Bech32 address.
     static bool isValid(const std::string& string);
 
@@ -47,6 +48,9 @@ class SegwitAddress {
     /// Taproot (v>=1) is not supported by this method.
     SegwitAddress(const PublicKey& publicKey, std::string hrp);
 
+    /// Create a testnet address
+    static SegwitAddress createTestnetFromPublicKey(const PublicKey& publicKey) { return SegwitAddress(publicKey, TestnetPrefix); }
+
     /// Decodes a SegWit address.
     ///
     /// \returns a tuple with the address, hrp, and a success flag.
diff --git a/src/Bitcoin/SigHashType.h b/src/Bitcoin/SigHashType.h
index 72329e6a477..34d4ccc4a94 100644
--- a/src/Bitcoin/SigHashType.h
+++ b/src/Bitcoin/SigHashType.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/SignatureBuilder.cpp b/src/Bitcoin/SignatureBuilder.cpp
index fe2bb1f6ac3..0e1f621a8d0 100644
--- a/src/Bitcoin/SignatureBuilder.cpp
+++ b/src/Bitcoin/SignatureBuilder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "SignatureBuilder.h"
 #include "SigHashType.h"
@@ -11,7 +9,10 @@
 
 #include "../BinaryCoding.h"
 #include "../HexCoding.h"
+
+#include "../BitcoinDiamond/Transaction.h"
 #include "../Groestlcoin/Transaction.h"
+#include "../Verge/Transaction.h"
 #include "../Zcash/Transaction.h"
 #include "../Zcash/TransactionBuilder.h"
 
@@ -130,7 +131,7 @@ Result<std::vector<Data>, Common::Proto::SigningError> SignatureBuilder<Transact
     std::vector<Data> keys;
     int required;
 
-    if (script.matchPayToScriptHash(data)) {
+    if (script.matchPayToScriptHash(data) || script.matchPayToScriptHashReplay(data)) {
         auto redeemScript = scriptForScriptHash(data);
         if (redeemScript.empty()) {
             // Error: Missing redeem script
@@ -190,7 +191,9 @@ Result<std::vector<Data>, Common::Proto::SigningError> SignatureBuilder<Transact
         }
         return Result<std::vector<Data>, Common::Proto::SigningError>::success({signature});
     }
-    if (script.matchPayToPublicKeyHash(data)) {
+    if (script.matchPayToPublicKeyHash(data)
+        || script.matchPayToPublicKeyHashReplay(data)
+        || script.matchPayToExchangePublicKeyHash(data)) {
         // obtain public key
         auto pair = keyPairForPubKeyHash(data);
         Data pubkey;
@@ -340,6 +343,8 @@ Data SignatureBuilder<Transaction>::scriptForScriptHash(const Data& hash) const
 
 // Explicitly instantiate a Signers for compatible transactions.
 template class SignatureBuilder<Bitcoin::Transaction>;
+template class SignatureBuilder<BitcoinDiamond::Transaction>;
+template class SignatureBuilder<Verge::Transaction>;
 template class SignatureBuilder<Zcash::Transaction>;
 template class SignatureBuilder<Groestlcoin::Transaction>;
 
diff --git a/src/Bitcoin/SignatureBuilder.h b/src/Bitcoin/SignatureBuilder.h
index 07ad17f6f4c..4f6af0b2124 100644
--- a/src/Bitcoin/SignatureBuilder.h
+++ b/src/Bitcoin/SignatureBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/SignatureVersion.h b/src/Bitcoin/SignatureVersion.h
index 73659efb711..fc6fe2817cf 100644
--- a/src/Bitcoin/SignatureVersion.h
+++ b/src/Bitcoin/SignatureVersion.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/Signer.cpp b/src/Bitcoin/Signer.cpp
index ac00533c2a5..7e90a1fc2a9 100644
--- a/src/Bitcoin/Signer.cpp
+++ b/src/Bitcoin/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Hash.h"
@@ -10,24 +8,56 @@
 #include "Transaction.h"
 #include "TransactionBuilder.h"
 #include "TransactionSigner.h"
+#include "rust/bindgen/WalletCoreRSBindgen.h"
 
 #include "proto/Common.pb.h"
 
 namespace TW::Bitcoin {
 
 Proto::TransactionPlan Signer::plan(const Proto::SigningInput& input) noexcept {
+    if (input.has_signing_v2()) {
+        Proto::TransactionPlan plan;
+
+        // Forward the `Bitcoin.Proto.SigningInput.signing_v2` request to Rust.
+        auto signingV2Data = data(input.signing_v2().SerializeAsString());
+        Rust::TWDataWrapper signingV2DataPtr(signingV2Data);
+        Rust::TWDataWrapper transactionPlanV2DataPtr = Rust::tw_any_signer_plan(signingV2DataPtr.get(), input.coin_type());
+
+        auto transactionPlanV2Data = transactionPlanV2DataPtr.toDataOrDefault();
+        BitcoinV2::Proto::TransactionPlan transactionPlanV2;
+        transactionPlanV2.ParseFromArray(transactionPlanV2Data.data(), static_cast<int>(transactionPlanV2Data.size()));
+
+        // Set `Bitcoin.Proto.TransactionPlan.planning_result_v2`. Remain other fields default.
+        *plan.mutable_planning_result_v2() = transactionPlanV2;
+        return plan;
+    }
+
     auto plan = TransactionSigner<Transaction, TransactionBuilder>::plan(input);
     return plan.proto();
 }
 
 Proto::SigningOutput Signer::sign(const Proto::SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs) noexcept {
     Proto::SigningOutput output;
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input, false, optionalExternalSigs);
+    if (input.has_signing_v2()) {
+        // Forward the `Bitcoin.Proto.SigningInput.signing_v2` request to Rust.
+        auto signingV2Data = data(input.signing_v2().SerializeAsString());
+        Rust::TWDataWrapper signingV2DataPtr(signingV2Data);
+        Rust::TWDataWrapper signingOutputV2DataPtr = Rust::tw_any_signer_sign(signingV2DataPtr.get(), input.coin_type());
+
+        auto signingOutputV2Data = signingOutputV2DataPtr.toDataOrDefault();
+        BitcoinV2::Proto::SigningOutput signingOutputV2;
+        signingOutputV2.ParseFromArray(signingOutputV2Data.data(), static_cast<int>(signingOutputV2Data.size()));
+
+        // Set `Bitcoin.Proto.SigningOutput.signing_result_v2`. Remain other fields default.
+        *output.mutable_signing_result_v2() = signingOutputV2;
+        return output;
+    }
+
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input, false, std::move(optionalExternalSigs));
     if (!result) {
         output.set_error(result.error());
         return output;
     }
-
     const auto& tx = result.payload();
     *output.mutable_transaction() = tx.proto();
 
@@ -48,6 +78,21 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input, std::optiona
 
 Proto::PreSigningOutput Signer::preImageHashes(const Proto::SigningInput& input) noexcept {
     Proto::PreSigningOutput output;
+    if (input.has_signing_v2()) {
+        // Forward the `Bitcoin.Proto.SigningInput.signing_v2` request to Rust.
+        auto signingV2Data = data(input.signing_v2().SerializeAsString());
+        Rust::TWDataWrapper signingV2DataPtr(signingV2Data);
+        Rust::TWDataWrapper preOutputV2DataPtr = Rust::tw_transaction_compiler_pre_image_hashes(input.coin_type(), signingV2DataPtr.get());
+
+        auto preOutputV2Data = preOutputV2DataPtr.toDataOrDefault();
+        BitcoinV2::Proto::PreSigningOutput preSigningOutputV2;
+        preSigningOutputV2.ParseFromArray(preOutputV2Data.data(), static_cast<int>(preOutputV2Data.size()));
+
+        // Set `Bitcoin.Proto.PreSigningOutput.pre_signing_result_v2`. Remain other fields default.
+        *output.mutable_pre_signing_result_v2() = preSigningOutputV2;
+        return output;
+    }
+
     auto result = TransactionSigner<Transaction, TransactionBuilder>::preImageHashes(input);
     if (!result) {
         output.set_error(result.error());
@@ -65,4 +110,52 @@ Proto::PreSigningOutput Signer::preImageHashes(const Proto::SigningInput& input)
     return output;
 }
 
+Proto::SigningOutput Signer::compile(const Proto::SigningInput& input,
+                                     const std::vector<Data>& signatures,
+                                     const std::vector<PublicKey>& publicKeys) noexcept {
+    Proto::SigningOutput output;
+    if (input.has_signing_v2()) {
+        Rust::TWDataVectorWrapper signaturesVec = signatures;
+        Rust::TWDataVectorWrapper publicKeysVec;
+        for (const auto& pubkey : publicKeys) {
+            publicKeysVec.push(pubkey.bytes);
+        }
+
+        // Forward the `Bitcoin.Proto.SigningInput.signing_v2` request to Rust.
+        auto signingV2Data = data(input.signing_v2().SerializeAsString());
+        Rust::TWDataWrapper signingV2DataPtr(signingV2Data);
+        Rust::TWDataWrapper outputV2DataPtr = Rust::tw_transaction_compiler_compile(
+            input.coin_type(), signingV2DataPtr.get(), signaturesVec.get(), publicKeysVec.get());
+
+        auto outputV2Data = outputV2DataPtr.toDataOrDefault();
+        BitcoinV2::Proto::SigningOutput outputV2;
+        outputV2.ParseFromArray(outputV2Data.data(), static_cast<int>(outputV2Data.size()));
+
+        // Set `Bitcoin.Proto.SigningOutput.signing_result_v2`. Remain other fields default.
+        *output.mutable_signing_result_v2() = outputV2;
+        return output;
+    }
+
+    if (signatures.empty() || publicKeys.empty()) {
+        output.set_error(Common::Proto::Error_invalid_params);
+        output.set_error_message("empty signatures or publickeys");
+        return output;
+    }
+
+    if (signatures.size() != publicKeys.size()) {
+        output.set_error(Common::Proto::Error_invalid_params);
+        output.set_error_message("signatures size and publickeys size not equal");
+        return output;
+    }
+
+    HashPubkeyList externalSignatures;
+    auto insertFunctor = [](auto&& signature, auto&& pubkey) noexcept {
+        return std::make_pair(signature, pubkey.bytes);
+    };
+    transform(begin(signatures), end(signatures), begin(publicKeys),
+              back_inserter(externalSignatures), insertFunctor);
+    output = Signer::sign(input, externalSignatures);
+    return output;
+}
+
 } // namespace TW::Bitcoin
diff --git a/src/Bitcoin/Signer.h b/src/Bitcoin/Signer.h
index b990d5b7dd2..4fb9401c1d2 100644
--- a/src/Bitcoin/Signer.h
+++ b/src/Bitcoin/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 #include "../proto/Bitcoin.pb.h"
@@ -15,8 +13,6 @@
 
 namespace TW::Bitcoin {
 
-typedef std::vector<std::pair<Data, Data>> SignaturePubkeyList;
-
 class Signer {
   public:
     Signer() = delete;
@@ -29,6 +25,11 @@ class Signer {
 
     /// Collect pre-image hashes to be signed
     static Proto::PreSigningOutput preImageHashes(const Proto::SigningInput& input) noexcept;
+
+    /// Compile a transaction with the given signatures and public keys.
+    static Proto::SigningOutput compile(const Proto::SigningInput& input,
+                                        const std::vector<Data>& signatures,
+                                        const std::vector<PublicKey>& publicKeys) noexcept;
 };
 
 } // namespace TW::Bitcoin
diff --git a/src/Bitcoin/SigningInput.cpp b/src/Bitcoin/SigningInput.cpp
index a244e62952b..bd7c86f7378 100644
--- a/src/Bitcoin/SigningInput.cpp
+++ b/src/Bitcoin/SigningInput.cpp
@@ -1,13 +1,15 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "SigningInput.h"
 
 namespace TW::Bitcoin {
 
+SigningInput::SigningInput()
+    : dustCalculator(std::make_shared<LegacyDustCalculator>(TWCoinTypeBitcoin)) {
+}
+
 SigningInput::SigningInput(const Proto::SigningInput& input) {
     hashType = static_cast<TWBitcoinSigHashType>(input.hash_type());
     amount = input.amount();
@@ -24,12 +26,26 @@ SigningInput::SigningInput(const Proto::SigningInput& input) {
         utxos.emplace_back(u);
     }
     useMaxAmount = input.use_max_amount();
+    useMaxUtxo = input.use_max_utxo();
+    disableDustFilter = input.disable_dust_filter();
     coinType = static_cast<TWCoinType>(input.coin_type());
     if (input.has_plan()) {
         plan = TransactionPlan(input.plan());
     }
     outputOpReturn = data(input.output_op_return());
+    if (input.has_output_op_return_index()) {
+        outputOpReturnIndex = input.output_op_return_index().index();
+    }
     lockTime = input.lock_time();
+    time = input.time();
+
+    extraOutputsAmount = 0;
+    for (auto& output: input.extra_outputs()) {
+        extraOutputsAmount += output.amount();
+        extraOutputs.push_back(std::make_pair(output.to_address(), output.amount()));
+    }
+
+    dustCalculator = getDustCalculator(input);
 }
 
 } // namespace TW::Bitcoin
diff --git a/src/Bitcoin/SigningInput.h b/src/Bitcoin/SigningInput.h
index cc365fd5b49..86ced0f1122 100644
--- a/src/Bitcoin/SigningInput.h
+++ b/src/Bitcoin/SigningInput.h
@@ -1,12 +1,11 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Amount.h"
+#include "DustCalculator.h"
 #include "Transaction.h"
 #include "UTXO.h"
 #include <TrustWalletCore/TWBitcoinSigHashType.h>
@@ -51,6 +50,12 @@ class SigningInput {
     // If sending max amount
     bool useMaxAmount = false;
 
+    // If all input utxos
+    bool useMaxUtxo = false;
+
+    // If disable dust filter
+    bool disableDustFilter = false;
+
     // Coin type (forks)
     TWCoinType coinType = TWCoinTypeBitcoin;
 
@@ -59,10 +64,24 @@ class SigningInput {
 
     Data outputOpReturn;
 
+    // Optional index of the OP_RETURN output in the transaction.
+    // If not set, OP_RETURN output will be pushed as the latest output.
+    MaybeIndex outputOpReturnIndex;
+
     uint32_t lockTime = 0;
+    uint32_t time = 0;
+
+    // Besides to_address and change_address,
+    // we have other outputs that include address and value
+    std::vector<std::pair<std::string, int64_t>> extraOutputs;
+
+    // Total amount of the `extraOutputs`.
+    Amount extraOutputsAmount = 0;
+
+    DustCalculatorShared dustCalculator;
 
 public:
-    SigningInput() = default;
+    SigningInput();
 
     SigningInput(const Proto::SigningInput& input);
 };
diff --git a/src/Bitcoin/Transaction.cpp b/src/Bitcoin/Transaction.cpp
index 152c693d736..06d6467cafe 100644
--- a/src/Bitcoin/Transaction.cpp
+++ b/src/Bitcoin/Transaction.cpp
@@ -1,13 +1,13 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 #include "SegwitAddress.h"
 #include "SignatureVersion.h"
 #include "SigHashType.h"
+#include "rust/bindgen/WalletCoreRSBindgen.h"
+#include "rust/Wrapper.h"
 
 #include "../BinaryCoding.h"
 
diff --git a/src/Bitcoin/Transaction.h b/src/Bitcoin/Transaction.h
index b45fa14c6ab..3f276c9ad58 100644
--- a/src/Bitcoin/Transaction.h
+++ b/src/Bitcoin/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -19,6 +17,7 @@
 #include "../proto/Bitcoin.pb.h"
 
 #include <vector>
+#include <optional>
 
 namespace TW::Bitcoin {
 
diff --git a/src/Bitcoin/TransactionBuilder.cpp b/src/Bitcoin/TransactionBuilder.cpp
index 9e72dee4f5f..beb0a7d682f 100644
--- a/src/Bitcoin/TransactionBuilder.cpp
+++ b/src/Bitcoin/TransactionBuilder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionBuilder.h"
 #include "Script.h"
@@ -79,7 +77,7 @@ int64_t estimateSegwitFee(const FeeCalculator& feeCalculator, const TransactionP
 
 int extraOutputCount(const SigningInput& input) {
     int count = int(input.outputOpReturn.size() > 0);
-    return count;
+    return count + int(input.extraOutputs.size());
 }
 
 TransactionPlan TransactionBuilder::plan(const SigningInput& input) {
@@ -87,15 +85,19 @@ TransactionPlan TransactionBuilder::plan(const SigningInput& input) {
     if (input.outputOpReturn.size() > 0) {
         plan.outputOpReturn = input.outputOpReturn;
     }
+    plan.outputOpReturnIndex = input.outputOpReturnIndex;
 
     bool maxAmount = input.useMaxAmount;
-    if (input.amount == 0 && !maxAmount) {
+    Amount totalAmount = input.amount + input.extraOutputsAmount;
+    Amount dustThreshold = input.dustCalculator->dustAmount(input.byteFee);
+
+    if (totalAmount == 0 && !maxAmount) {
         plan.error = Common::Proto::Error_zero_amount_requested;
     } else if (input.utxos.empty()) {
         plan.error = Common::Proto::Error_missing_input_utxos;
     } else {
-        const auto& feeCalculator = getFeeCalculator(static_cast<TWCoinType>(input.coinType));
-        auto inputSelector = InputSelector<UTXO>(input.utxos, feeCalculator);
+        const auto& feeCalculator = getFeeCalculator(static_cast<TWCoinType>(input.coinType), input.disableDustFilter);
+        auto inputSelector = InputSelector<UTXO>(input.utxos, feeCalculator, input.dustCalculator);
         auto inputSum = InputSelector<UTXO>::sum(input.utxos);
 
         // select UTXOs
@@ -103,7 +105,7 @@ TransactionPlan TransactionBuilder::plan(const SigningInput& input) {
 
         // if amount requested is the same or more than available amount, it cannot be satisfied, but
         // treat this case as MaxAmount, and send maximum available (which will be less)
-        if (!maxAmount && static_cast<uint64_t>(input.amount) >= inputSum) {
+        if (!maxAmount && static_cast<uint64_t>(totalAmount) >= inputSum) {
             maxAmount = true;
         }
 
@@ -111,11 +113,17 @@ TransactionPlan TransactionBuilder::plan(const SigningInput& input) {
         auto output_size = 2;
         UTXOs selectedInputs;
         if (!maxAmount) {
+            // Please note that there may not be a "change" output if the "change.amount" is less than "dust",
+            // but we use a max amount of transaction outputs to simplify the algorithm, so the fee can be slightly bigger in rare cases.
             output_size = 2 + extraOutputs; // output + change
-            if (input.utxos.size() <= SimpleModeLimit && input.utxos.size() <= MaxUtxosHardLimit) {
-                selectedInputs = inputSelector.select(plan.amount, input.byteFee, output_size);
+            if (input.useMaxUtxo) {
+                selectedInputs = inputSelector.selectMaxAmount(input.byteFee);
+            } else if (input.utxos.size() <= SimpleModeLimit &&
+                input.utxos.size() <= MaxUtxosHardLimit) {
+                selectedInputs = inputSelector.select(totalAmount, input.byteFee, output_size);
             } else {
-                selectedInputs = inputSelector.selectSimple(plan.amount, input.byteFee, output_size);
+                selectedInputs =
+                    inputSelector.selectSimple(totalAmount, input.byteFee, output_size);
             }
         } else {
             output_size = 1 + extraOutputs; // output, no change
@@ -131,25 +139,45 @@ TransactionPlan TransactionBuilder::plan(const SigningInput& input) {
             }
         }
 
-        if (plan.utxos.size() == 0) {
+        if (plan.utxos.empty()) {
             plan.amount = 0;
             plan.error = Common::Proto::Error_not_enough_utxos;
+        } else if (maxAmount && !input.extraOutputs.empty()) {
+            // As of now, we don't support `max` amount **and** extra outputs.
+            plan.amount = 0;
+            plan.error = Common::Proto::Error_invalid_params;
         } else {
             plan.availableAmount = InputSelector<UTXO>::sum(plan.utxos);
 
+            // There can be less UTXOs after Dust filtering.
+            if (!maxAmount && totalAmount > plan.availableAmount) {
+                TransactionPlan errorPlan;
+                errorPlan.error = Common::Proto::Error_not_enough_utxos;
+                return errorPlan;
+            }
+
             // Compute fee.
             // must preliminary set change so that there is a second output
             if (!maxAmount) {
-                assert(input.amount <= plan.availableAmount);
                 plan.amount = input.amount;
                 plan.fee = 0;
-                plan.change = plan.availableAmount - plan.amount;
+                plan.change = plan.availableAmount - totalAmount;
             } else {
                 plan.amount = plan.availableAmount;
                 plan.fee = 0;
                 plan.change = 0;
             }
             plan.fee = estimateSegwitFee(feeCalculator, plan, output_size, input);
+
+            // `InputSelector` has a rough segwit fee estimation algorithm,
+            // so the fee could be increased or decreased (see `InputSelector::select`).
+            // We need to make sure if we have enough UTXOs to cover "requested amount + final fee".
+            if (!maxAmount && plan.availableAmount < plan.fee + plan.amount) {
+                TransactionPlan errorPlan;
+                errorPlan.error = Common::Proto::Error_not_enough_utxos;
+                return errorPlan;
+            }
+
             // If fee is larger than availableAmount (can happen in special maxAmount case), we reduce it (and hope it will go through)
             plan.fee = std::min(plan.availableAmount, plan.fee);
             assert(plan.fee >= 0 && plan.fee <= plan.availableAmount);
@@ -164,14 +192,40 @@ TransactionPlan TransactionBuilder::plan(const SigningInput& input) {
             }
             assert(plan.amount >= 0 && plan.amount <= plan.availableAmount);
 
-            // compute change
-            plan.change = plan.availableAmount - plan.amount - plan.fee;
+            // The total amount that will be spent.
+            Amount totalSpendAmount = plan.amount + input.extraOutputsAmount + plan.fee;
+
+            // Make sure that the output amount is greater or at least equal to the dust threshold.
+            if (plan.amount < dustThreshold) {
+                TransactionPlan errorPlan;
+                errorPlan.error = maxAmount ? Common::Proto::Error_not_enough_utxos : Common::Proto::Error_dust_amount_requested;
+                return errorPlan;
+            }
+
+            // Make sure that we have enough available UTXOs to spend `fee`, `amount` and `extraOutputsAmount`.
+            if (plan.availableAmount < totalSpendAmount) {
+                TransactionPlan errorPlan;
+                errorPlan.error = Common::Proto::Error_not_enough_utxos;
+                return errorPlan;
+            }
+
+            auto changeAmount = plan.availableAmount - totalSpendAmount;
+            // Compute change if it's not dust.
+            if (changeAmount >= dustThreshold) {
+                plan.change = changeAmount;
+            } else {
+                // Spend the change as tx fee if it's dust, otherwise the transaction won't be mined.
+                plan.change = 0;
+                plan.fee += changeAmount;
+            }
         }
     }
     assert(plan.change >= 0 && plan.change <= plan.availableAmount);
     assert(!maxAmount || plan.change == 0); // change is 0 in max amount case
 
-    assert(plan.amount + plan.change + plan.fee == plan.availableAmount);
+    assert(plan.error != Common::Proto::OK
+           // `plan.error` is OK, check if the values are expected.
+           || plan.amount + input.extraOutputsAmount + plan.change + plan.fee == plan.availableAmount);
 
     return plan;
 }
diff --git a/src/Bitcoin/TransactionBuilder.h b/src/Bitcoin/TransactionBuilder.h
index b2c9feeb8c0..667fbe190c7 100644
--- a/src/Bitcoin/TransactionBuilder.h
+++ b/src/Bitcoin/TransactionBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -10,6 +8,7 @@
 #include "Transaction.h"
 #include "TransactionPlan.h"
 #include "InputSelector.h"
+#include "../Result.h"
 #include "../proto/Bitcoin.pb.h"
 #include <TrustWalletCore/TWCoinType.h>
 
@@ -25,18 +24,21 @@ class TransactionBuilder {
 
     /// Builds a transaction with the selected input UTXOs, and one main output and an optional change output.
     template <typename Transaction>
-    static Transaction build(const TransactionPlan& plan, const std::string& toAddress,
-                             const std::string& changeAddress, enum TWCoinType coin, uint32_t lockTime) {
+    static Result<Transaction, Common::Proto::SigningError> build(const TransactionPlan& plan, const SigningInput& input) {
         Transaction tx;
-        tx.lockTime = lockTime;
+        tx.lockTime = input.lockTime;
 
-        auto outputTo = prepareOutputWithScript(toAddress, plan.amount, coin);
-        if (!outputTo.has_value()) { return {}; }
+        auto outputTo = prepareOutputWithScript(input.toAddress, plan.amount, input.coinType);
+        if (!outputTo.has_value()) { 
+            return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_invalid_address);
+        }
         tx.outputs.push_back(outputTo.value());
 
         if (plan.change > 0) {
-            auto outputChange = prepareOutputWithScript(changeAddress, plan.change, coin);
-            if (!outputChange.has_value()) { return {}; }
+            auto outputChange = prepareOutputWithScript(input.changeAddress, plan.change, input.coinType);
+            if (!outputChange.has_value()) { 
+                return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_invalid_address);
+            }
             tx.outputs.push_back(outputChange.value());
         }
 
@@ -46,12 +48,31 @@ class TransactionBuilder {
         }
 
         // Optional OP_RETURN output
-        if (plan.outputOpReturn.size() > 0) {
+        if (!plan.outputOpReturn.empty()) {
             auto lockingScriptOpReturn = Script::buildOpReturnScript(plan.outputOpReturn);
-            tx.outputs.emplace_back(0, lockingScriptOpReturn);
+            if (lockingScriptOpReturn.bytes.empty()) {
+                return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_invalid_memo);
+            }
+
+            auto emplace_at = tx.outputs.end();
+            if (plan.outputOpReturnIndex.has_value()) {
+                emplace_at = tx.outputs.begin();
+                std::advance(emplace_at, plan.outputOpReturnIndex.value());
+            }
+            int64_t amount = 0;
+            tx.outputs.emplace(emplace_at, amount, lockingScriptOpReturn);
+        }
+
+        // extra outputs (always in the end of the outputs list)
+        for (auto& o : input.extraOutputs) {
+            auto output = prepareOutputWithScript(o.first, o.second, input.coinType);
+            if (!output.has_value()) { 
+                return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_invalid_address);
+            }
+            tx.outputs.push_back(output.value());
         }
 
-        return tx;
+        return Result<Transaction, Common::Proto::SigningError>(tx);
     }
 
     /// Prepares a TransactionOutput with given address and amount, prepares script for it
diff --git a/src/Bitcoin/TransactionInput.cpp b/src/Bitcoin/TransactionInput.cpp
index 7c43f07e0aa..ee2db04a78d 100644
--- a/src/Bitcoin/TransactionInput.cpp
+++ b/src/Bitcoin/TransactionInput.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionInput.h"
 
diff --git a/src/Bitcoin/TransactionInput.h b/src/Bitcoin/TransactionInput.h
index 8a9b28399ae..c95c89ab07c 100644
--- a/src/Bitcoin/TransactionInput.h
+++ b/src/Bitcoin/TransactionInput.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/TransactionOutput.cpp b/src/Bitcoin/TransactionOutput.cpp
index 7f36e02fce7..008cdb3ff26 100644
--- a/src/Bitcoin/TransactionOutput.cpp
+++ b/src/Bitcoin/TransactionOutput.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionOutput.h"
 
diff --git a/src/Bitcoin/TransactionOutput.h b/src/Bitcoin/TransactionOutput.h
index 0a4ac788218..4627f5dc899 100644
--- a/src/Bitcoin/TransactionOutput.h
+++ b/src/Bitcoin/TransactionOutput.h
@@ -1,14 +1,13 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Amount.h"
 #include "Script.h"
 #include "Data.h"
+#include "PublicKey.h"
 
 #include <memory>
 
diff --git a/src/Bitcoin/TransactionPlan.h b/src/Bitcoin/TransactionPlan.h
index 1225082d307..5124a301ab1 100644
--- a/src/Bitcoin/TransactionPlan.h
+++ b/src/Bitcoin/TransactionPlan.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -11,8 +9,12 @@
 #include "Data.h"
 #include "../proto/Bitcoin.pb.h"
 
+#include <optional>
+
 namespace TW::Bitcoin {
 
+using MaybeIndex =  std::optional<std::size_t>;
+
 /// Describes a preliminary transaction plan.
 struct TransactionPlan {
     /// Amount to be received at the other end.
@@ -33,8 +35,18 @@ struct TransactionPlan {
     /// Zcash branch id
     Data branchId;
 
+    /// zen & bitcoin diamond preblockhash
+    Data preBlockHash;
+
+    /// zen preblockheight
+    int64_t preBlockHeight = 0;
+
     Data outputOpReturn;
 
+    // Optional index of the OP_RETURN output in the transaction.
+    // If not set, OP_RETURN output will be pushed as the latest output.
+    MaybeIndex outputOpReturnIndex;
+
     Common::Proto::SigningError error = Common::Proto::SigningError::OK;
 
     TransactionPlan() = default;
@@ -46,9 +58,15 @@ struct TransactionPlan {
         , change(plan.change())
         , utxos(std::vector<UTXO>(plan.utxos().begin(), plan.utxos().end()))
         , branchId(plan.branch_id().begin(), plan.branch_id().end())
+        , preBlockHash(plan.preblockhash().begin(), plan.preblockhash().end())
+        , preBlockHeight(plan.preblockheight())
         , outputOpReturn(plan.output_op_return().begin(), plan.output_op_return().end())
         , error(plan.error())
-    {}
+    {
+        if (plan.has_output_op_return_index()) {
+            outputOpReturnIndex = plan.output_op_return_index().index();
+        }
+    }
 
     Proto::TransactionPlan proto() const {
         auto plan = Proto::TransactionPlan();
@@ -60,7 +78,12 @@ struct TransactionPlan {
             *plan.add_utxos() = utxo.proto();
         }
         plan.set_branch_id(branchId.data(), branchId.size());
+        plan.set_preblockhash(preBlockHash.data(), preBlockHash.size());
+        plan.set_preblockheight(preBlockHeight);
         plan.set_output_op_return(outputOpReturn.data(), outputOpReturn.size());
+        if (outputOpReturnIndex.has_value()) {
+            plan.mutable_output_op_return_index()->set_index(static_cast<uint32_t>(outputOpReturnIndex.value()));
+        }
         plan.set_error(error);
         return plan;
     }
diff --git a/src/Bitcoin/TransactionSigner.cpp b/src/Bitcoin/TransactionSigner.cpp
index 0e87be108e8..282117df361 100644
--- a/src/Bitcoin/TransactionSigner.cpp
+++ b/src/Bitcoin/TransactionSigner.cpp
@@ -1,16 +1,19 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionSigner.h"
 
 #include "SignatureBuilder.h"
 
+#include "../BitcoinDiamond/Transaction.h"
+#include "../BitcoinDiamond/TransactionBuilder.h"
 #include "../Groestlcoin/Transaction.h"
+#include "../Verge/Transaction.h"
+#include "../Verge/TransactionBuilder.h"
 #include "../Zcash/Transaction.h"
 #include "../Zcash/TransactionBuilder.h"
+#include "../Zen/TransactionBuilder.h"
 
 namespace TW::Bitcoin {
 
@@ -27,7 +30,11 @@ Result<Transaction, Common::Proto::SigningError> TransactionSigner<Transaction,
     } else {
         plan = TransactionBuilder::plan(input);
     }
-    auto transaction = TransactionBuilder::template build<Transaction>(plan, input.toAddress, input.changeAddress, input.coinType, input.lockTime);
+    auto tx_result = TransactionBuilder::template build<Transaction>(plan, input);
+    if (!tx_result) {
+        return Result<Transaction, Common::Proto::SigningError>::failure(tx_result.error());
+    }
+    Transaction transaction = tx_result.payload();
     SigningMode signingMode =
         estimationMode ? SigningMode_SizeEstimationOnly : optionalExternalSigs.has_value() ? SigningMode_External
                                                                                            : SigningMode_Normal;
@@ -43,7 +50,11 @@ Result<HashPubkeyList, Common::Proto::SigningError> TransactionSigner<Transactio
     } else {
         plan = TransactionBuilder::plan(input);
     }
-    auto transaction = TransactionBuilder::template build<Transaction>(plan, input.toAddress, input.changeAddress, input.coinType, input.lockTime);
+    auto tx_result = TransactionBuilder::template build<Transaction>(plan, input);
+    if (!tx_result) {
+        return Result<HashPubkeyList, Common::Proto::SigningError>::failure(tx_result.error());
+    }
+    Transaction transaction = tx_result.payload();
     SignatureBuilder<Transaction> signer(std::move(input), plan, transaction, SigningMode_HashOnly);
     auto signResult = signer.sign();
     if (!signResult) {
@@ -55,6 +66,9 @@ Result<HashPubkeyList, Common::Proto::SigningError> TransactionSigner<Transactio
 // Explicitly instantiate a Signers for compatible transactions.
 template class Bitcoin::TransactionSigner<Bitcoin::Transaction, TransactionBuilder>;
 template class Bitcoin::TransactionSigner<Zcash::Transaction, Zcash::TransactionBuilder>;
+template class Bitcoin::TransactionSigner<Bitcoin::Transaction, Zen::TransactionBuilder>;
 template class Bitcoin::TransactionSigner<Groestlcoin::Transaction, TransactionBuilder>;
+template class Bitcoin::TransactionSigner<Verge::Transaction, Verge::TransactionBuilder>;
+template class Bitcoin::TransactionSigner<BitcoinDiamond::Transaction, BitcoinDiamond::TransactionBuilder>;
 
 } // namespace TW::Bitcoin
diff --git a/src/Bitcoin/TransactionSigner.h b/src/Bitcoin/TransactionSigner.h
index f75c88851cb..8f67a93cc5c 100644
--- a/src/Bitcoin/TransactionSigner.h
+++ b/src/Bitcoin/TransactionSigner.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Bitcoin/UTXO.h b/src/Bitcoin/UTXO.h
index 55f534d86b7..02fdf2dffee 100644
--- a/src/Bitcoin/UTXO.h
+++ b/src/Bitcoin/UTXO.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/BitcoinCash/Entry.h b/src/BitcoinCash/Entry.h
new file mode 100644
index 00000000000..cc5e78fe61b
--- /dev/null
+++ b/src/BitcoinCash/Entry.h
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Bitcoin/Entry.h"
+
+namespace TW::BitcoinCash {
+
+/// Entry point for BitcoinCash coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+///
+/// Currently, we must support the legacy `Bitcoin.proto` API,
+/// but `BitcoinV2.proto` still can be used through `Bitcoin.SigningInput.signing_v2`.
+/// TODO inherit Rust::RustCoinEntry directly when `Bitcoin.proto` is deprecated.
+class Entry : public Bitcoin::Entry {
+};
+
+} // namespace TW::BitcoinCash
+
diff --git a/src/BitcoinDiamond/Entry.cpp b/src/BitcoinDiamond/Entry.cpp
new file mode 100644
index 00000000000..b75a9ea6d1b
--- /dev/null
+++ b/src/BitcoinDiamond/Entry.cpp
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Entry.h"
+
+#include "Signer.h"
+#include "proto/Bitcoin.pb.h"
+#include "../Bitcoin/Address.h"
+#include "../Bitcoin/SegwitAddress.h"
+
+using namespace TW;
+using namespace std;
+
+namespace TW::BitcoinDiamond {
+
+// Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
+
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, const PrefixVariant& addressPrefix) const {
+    auto* base58Prefix = std::get_if<Base58Prefix>(&addressPrefix);
+    auto* hrp = std::get_if<Bech32Prefix>(&addressPrefix);
+    bool isValidBase58 = base58Prefix ? Bitcoin::Address::isValid(address) : false;
+    bool isValidHrp = hrp ? Bitcoin::SegwitAddress::isValid(address, *hrp) : false;
+    return isValidBase58 || isValidHrp;
+}
+
+string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    byte p2pkh = getFromPrefixPkhOrDefault(addressPrefix, coin);
+    const char* hrp = getFromPrefixHrpOrDefault(addressPrefix, coin);
+    
+    switch (derivation) {
+    case TWDerivationBitcoinLegacy:
+    case TWDerivationDefault:
+        return Bitcoin::Address(publicKey, p2pkh).string();
+    default:
+        return TW::Bitcoin::SegwitAddress(publicKey, hrp).string();
+    }
+}
+
+TW::Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    const auto decoded = Bitcoin::SegwitAddress::decode(address);
+    if (!std::get<2>(decoded)) {
+        // check if it is a legacy address
+        if (Bitcoin::Address::isValid(address)) {
+            const auto addr = Bitcoin::Address(address);
+            return {addr.bytes.begin() + 1, addr.bytes.end()};
+        }
+        return {Data()};
+    }
+    return std::get<0>(decoded).witnessProgram;
+}
+
+void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
+    signTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
+}
+
+void Entry::plan([[maybe_unused]] TWCoinType coin, const Data& dataIn, Data& dataOut) const {
+    planTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
+}
+
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<SigningInput, PreSigningOutput>(
+        txInputData,
+        [](const auto& input, auto& output) { output = Signer::preImageHashes(input); });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<SigningInput, SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+
+            if (signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("signatures size and publickeys size not equal");
+                return;
+            }
+
+            HashPubkeyList externalSignatures;
+            auto n = signatures.size();
+            for (auto i = 0ul; i < n; ++i) {
+                externalSignatures.push_back(std::make_pair(signatures[i], publicKeys[i].bytes));
+            }
+
+            output = Signer::sign(input, externalSignatures);
+        });
+}
+
+} // namespace TW::BitcoinDiamond
diff --git a/src/BitcoinDiamond/Entry.h b/src/BitcoinDiamond/Entry.h
new file mode 100644
index 00000000000..ef8002905e5
--- /dev/null
+++ b/src/BitcoinDiamond/Entry.h
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../CoinEntry.h"
+
+namespace TW::BitcoinDiamond {
+
+/// Entry point for implementation of BitcoinDiamond coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final: public CoinEntry {
+public:
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    Data addressToData(TWCoinType coin, const std::string& address) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
+};
+
+} // namespace TW::BitcoinDiamond
diff --git a/src/BitcoinDiamond/Signer.cpp b/src/BitcoinDiamond/Signer.cpp
new file mode 100644
index 00000000000..cb7c964e562
--- /dev/null
+++ b/src/BitcoinDiamond/Signer.cpp
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Signer.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "Hash.h"
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include "Transaction.h"
+#include "TransactionBuilder.h"
+
+using namespace TW;
+namespace TW::BitcoinDiamond {
+
+TransactionPlan Signer::plan(const SigningInput& input) noexcept {
+    auto plan = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::plan(input);
+    return plan.proto();
+}
+
+SigningOutput Signer::sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs) noexcept {
+    SigningOutput output;
+    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::sign(input, false, optionalExternalSigs);
+    if (!result) {
+        output.set_error(result.error());
+        return output;
+    }
+    const auto& tx = result.payload();
+    *output.mutable_transaction() = tx.proto();
+
+    Data encoded;
+    tx.encode(encoded);
+    output.set_encoded(encoded.data(), encoded.size());
+
+    Data txHashData = encoded;
+    if (tx.hasWitness()) {
+        txHashData.clear();
+        tx.encode(txHashData, Transaction::SegwitFormatMode::NonSegwit);
+    }
+    auto txHash = Hash::sha256(txHashData.data(), txHashData.size());
+    std::reverse(txHash.begin(), txHash.end());
+    output.set_transaction_id(hex(txHash));
+    return output;
+}
+
+PreSigningOutput Signer::preImageHashes(const SigningInput& input) noexcept {
+    PreSigningOutput output;
+    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::preImageHashes(input);
+    if (!result) {
+        output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
+        return output;
+    }
+
+    auto hashList = result.payload();
+    auto* hashPubKeys = output.mutable_hash_public_keys();
+    for (auto& h : hashList) {
+        auto* hpk = hashPubKeys->Add();
+        hpk->set_data_hash(h.first.data(), h.first.size());
+        hpk->set_public_key_hash(h.second.data(), h.second.size());
+    }
+    return output;
+}
+
+} // namespace TW::BitcoinDiamond
diff --git a/src/BitcoinDiamond/Signer.h b/src/BitcoinDiamond/Signer.h
new file mode 100644
index 00000000000..b5639a1d30d
--- /dev/null
+++ b/src/BitcoinDiamond/Signer.h
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../Data.h"
+#include "../PrivateKey.h"
+#include "../proto/Bitcoin.pb.h"
+
+#include <optional>
+
+namespace TW::BitcoinDiamond {
+
+using SigningInput = Bitcoin::Proto::SigningInput;
+using SigningOutput = Bitcoin::Proto::SigningOutput;
+using TransactionPlan = Bitcoin::Proto::TransactionPlan;
+using PreSigningOutput = Bitcoin::Proto::PreSigningOutput;
+
+/// Helper class that performs BitcoinDiamond transaction signing.
+class Signer {
+public:
+    /// Hide default constructor
+    Signer() = delete;
+
+    /// Returns a transaction plan (utxo selection, fee estimation)
+    static TransactionPlan plan(const SigningInput& input) noexcept;
+
+    /// Signs a Proto::SigningInput transaction
+    static SigningOutput sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs = {}) noexcept;
+
+    /// Collect pre-image hashes to be signed
+    static PreSigningOutput preImageHashes(const SigningInput& input) noexcept;
+};
+
+} // namespace TW::BitcoinDiamond
diff --git a/src/BitcoinDiamond/Transaction.cpp b/src/BitcoinDiamond/Transaction.cpp
new file mode 100644
index 00000000000..6d2135b6d27
--- /dev/null
+++ b/src/BitcoinDiamond/Transaction.cpp
@@ -0,0 +1,207 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Transaction.h"
+#include "../Bitcoin/SigHashType.h"
+#include "../BinaryCoding.h"
+#include "../Hash.h"
+#include "../Data.h"
+
+#include <cassert>
+
+using namespace TW;
+namespace TW::BitcoinDiamond {
+
+Data Transaction::getPreImage(const Bitcoin::Script& scriptCode, size_t index,
+                              enum TWBitcoinSigHashType hashType, uint64_t amount) const {
+    assert(index < inputs.size());
+
+    Data data;
+
+    // Version
+    encode32LE(_version, data);
+
+    // see: https://github.com/eveybcd/BitcoinDiamond/blob/master/src/script/interpreter.cpp#L1267
+    if (_version == CURRENT_VERSION_FORK) {
+        std::copy(std::begin(preBlockHash), std::end(preBlockHash), std::back_inserter(data));
+    }
+
+    // Input prevouts (none/all, depending on flags)
+    if ((hashType & TWBitcoinSigHashTypeAnyoneCanPay) == 0) {
+        auto hashPrevouts = getPrevoutHash();
+        std::copy(std::begin(hashPrevouts), std::end(hashPrevouts), std::back_inserter(data));
+    } else {
+        std::fill_n(back_inserter(data), 32, 0);
+    }
+
+    // Input nSequence (none/all, depending on flags)
+    if ((hashType & TWBitcoinSigHashTypeAnyoneCanPay) == 0 &&
+        !Bitcoin::hashTypeIsSingle(hashType) && !Bitcoin::hashTypeIsNone(hashType)) {
+        auto hashSequence = getSequenceHash();
+        std::copy(std::begin(hashSequence), std::end(hashSequence), std::back_inserter(data));
+    } else {
+        std::fill_n(back_inserter(data), 32, 0);
+    }
+
+    // The input being signed (replacing the scriptSig with scriptCode + amount)
+    // The prevout may already be contained in hashPrevout, and the nSequence
+    // may already be contain in hashSequence.
+    inputs[index].previousOutput.encode(data);
+    scriptCode.encode(data);
+
+    encode64LE(amount, data);
+    encode32LE(inputs[index].sequence, data);
+
+    // Outputs (none/one/all, depending on flags)
+    if (!Bitcoin::hashTypeIsSingle(hashType) && !Bitcoin::hashTypeIsNone(hashType)) {
+        auto hashOutputs = getOutputsHash();
+        copy(begin(hashOutputs), end(hashOutputs), back_inserter(data));
+    } else if (Bitcoin::hashTypeIsSingle(hashType) && index < outputs.size()) {
+        Data outputData;
+        outputs[index].encode(outputData);
+        auto hashOutputs = Hash::hash(hasher, outputData);
+        copy(begin(hashOutputs), end(hashOutputs), back_inserter(data));
+    } else {
+        fill_n(back_inserter(data), 32, 0);
+    }
+
+    // Locktime
+    encode32LE(lockTime, data);
+
+    // Sighash type
+    encode32LE(hashType, data);
+
+    return data;
+}
+
+
+void Transaction::encode(Data& data, enum SegwitFormatMode segwitFormat) const {
+    bool useWitnessFormat = true;
+    switch (segwitFormat) {
+        case NonSegwit: useWitnessFormat = false; break;
+        case IfHasWitness: useWitnessFormat = hasWitness(); break;
+        case Segwit: useWitnessFormat = true; break;
+    }
+
+    encode32LE(_version, data);
+
+    // see: https://github.com/eveybcd/BitcoinDiamond/blob/master/src/primitives/transaction.h#L344
+    if (_version == CURRENT_VERSION_FORK) {
+        std::copy(std::begin(preBlockHash), std::end(preBlockHash), std::back_inserter(data));
+    }
+
+    if (useWitnessFormat) {
+        // Use extended format in case witnesses are to be serialized.
+        data.push_back(0); // marker
+        data.push_back(1); // flag
+    }
+
+    // txins
+    encodeVarInt(inputs.size(), data);
+    for (auto& input : inputs) {
+        input.encode(data);
+    }
+
+    // txouts
+    encodeVarInt(outputs.size(), data);
+    for (auto& output : outputs) {
+        output.encode(data);
+    }
+
+    if (useWitnessFormat) {
+        encodeWitness(data);
+    }
+
+    encode32LE(lockTime, data); // nLockTime
+}
+
+
+Data Transaction::getSignatureHash(const Bitcoin::Script& scriptCode, size_t index,
+                                   enum TWBitcoinSigHashType hashType, uint64_t amount,
+                                   enum Bitcoin::SignatureVersion version) const {
+    switch (version) {
+    case Bitcoin::BASE:
+        return getSignatureHashBase(scriptCode, index, hashType);
+    case Bitcoin::WITNESS_V0:
+        return getSignatureHashWitnessV0(scriptCode, index, hashType, amount);
+    }
+}
+
+/// Generates the signature hash for Witness version 0 scripts.
+Data Transaction::getSignatureHashWitnessV0(const Bitcoin::Script& scriptCode, size_t index,
+                                            enum TWBitcoinSigHashType hashType,
+                                            uint64_t amount) const {
+    auto preimage = getPreImage(scriptCode, index, hashType, amount);
+    auto hash = Hash::hash(hasher, preimage);
+    return hash;
+}
+
+/// Generates the signature hash for for scripts other than witness scripts.
+Data Transaction::getSignatureHashBase(const Bitcoin::Script& scriptCode, size_t index,
+                                       enum TWBitcoinSigHashType hashType) const {
+    assert(index < inputs.size());
+
+    Data data;
+
+    encode32LE(_version, data);
+
+    // see: https://github.com/eveybcd/BitcoinDiamond/blob/master/src/script/interpreter.cpp#L1170
+    if (_version == CURRENT_VERSION_FORK) {
+        std::copy(std::begin(preBlockHash), std::end(preBlockHash), std::back_inserter(data));
+    }
+
+    auto serializedInputCount =
+        (hashType & TWBitcoinSigHashTypeAnyoneCanPay) != 0 ? 1 : inputs.size();
+    encodeVarInt(serializedInputCount, data);
+    for (auto subindex = 0ul; subindex < serializedInputCount; subindex += 1) {
+        serializeInput(subindex, scriptCode, index, hashType, data);
+    }
+
+    auto hashNone = Bitcoin::hashTypeIsNone(hashType);
+    auto hashSingle = Bitcoin::hashTypeIsSingle(hashType);
+    auto serializedOutputCount = hashNone ? 0 : (hashSingle ? index + 1 : outputs.size());
+    encodeVarInt(serializedOutputCount, data);
+    for (auto subindex = 0ul; subindex < serializedOutputCount; subindex += 1) {
+        if (hashSingle && subindex != index) {
+            auto output = Bitcoin::TransactionOutput(-1, {});
+            output.encode(data);
+        } else {
+            outputs[subindex].encode(data);
+        }
+    }
+
+    // Locktime
+    encode32LE(lockTime, data);
+
+    // Sighash type
+    encode32LE(hashType, data);
+
+    auto hash = Hash::hash(hasher, data);
+    return hash;
+}
+
+Bitcoin::Proto::Transaction Transaction::proto() const {
+    auto protoTx = Bitcoin::Proto::Transaction();
+    protoTx.set_version(_version);
+    protoTx.set_locktime(lockTime);
+
+    for (const auto& input : inputs) {
+        auto* protoInput = protoTx.add_inputs();
+        protoInput->mutable_previousoutput()->set_hash(input.previousOutput.hash.data(),
+                                                       input.previousOutput.hash.size());
+        protoInput->mutable_previousoutput()->set_index(input.previousOutput.index);
+        protoInput->set_sequence(input.sequence);
+        protoInput->set_script(input.script.bytes.data(), input.script.bytes.size());
+    }
+
+    for (const auto& output : outputs) {
+        auto* protoOutput = protoTx.add_outputs();
+        protoOutput->set_value(output.value);
+        protoOutput->set_script(output.script.bytes.data(), output.script.bytes.size());
+    }
+
+    return protoTx;
+}
+
+} // namespace TW::BitcoinDiamond
diff --git a/src/BitcoinDiamond/Transaction.h b/src/BitcoinDiamond/Transaction.h
new file mode 100644
index 00000000000..55f68ca1333
--- /dev/null
+++ b/src/BitcoinDiamond/Transaction.h
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+
+#include "../Bitcoin/Script.h"
+#include "../Bitcoin/Transaction.h"
+#include "../Bitcoin/TransactionInput.h"
+#include "../Bitcoin/TransactionOutput.h"
+#include "../proto/Bitcoin.pb.h"
+#include "Data.h"
+
+namespace TW::BitcoinDiamond {
+
+struct Transaction : public Bitcoin::Transaction {
+public:
+    // see: https://github.com/eveybcd/BitcoinDiamond/blob/master/src/primitives/transaction.h#L209
+    static const int32_t CURRENT_VERSION_FORK = 12;
+    static const int32_t CURRENT_VERSION = CURRENT_VERSION_FORK;
+
+    Data preBlockHash;
+
+public:
+    Transaction() : Bitcoin::Transaction(CURRENT_VERSION, 0, TW::Hash::HasherSha256d) {}
+    Transaction(const Data& blockHash, int32_t version = CURRENT_VERSION, uint32_t lockTime = 0)
+        : Bitcoin::Transaction(version, lockTime, TW::Hash::HasherSha256d)
+        , preBlockHash(blockHash) {}
+
+    Data getPreImage(const Bitcoin::Script& scriptCode, size_t index, enum TWBitcoinSigHashType hashType, uint64_t amount) const;
+    
+    /// Encodes the transaction into the provided buffer.
+    void encode(Data& data, enum SegwitFormatMode segwitFormat) const;
+    void encode(Data& data) const { encode(data, SegwitFormatMode::IfHasWitness); }
+
+    Data getSignatureHash(const Bitcoin::Script& scriptCode, size_t index, enum TWBitcoinSigHashType hashType,
+                          uint64_t amount, enum Bitcoin::SignatureVersion version) const;
+    /// Converts to Protobuf model
+    Bitcoin::Proto::Transaction proto() const;
+
+private:
+    /// Generates the signature hash for Witness version 0 scripts.
+    Data getSignatureHashWitnessV0(const Bitcoin::Script& scriptCode, size_t index,
+                                   enum TWBitcoinSigHashType hashType, uint64_t amount) const;
+
+    /// Generates the signature hash for for scripts other than witness scripts.
+    Data getSignatureHashBase(const Bitcoin::Script& scriptCode, size_t index,
+                              enum TWBitcoinSigHashType hashType) const;
+};
+
+} // namespace TW::BitcoinDiamond
diff --git a/src/BitcoinDiamond/TransactionBuilder.h b/src/BitcoinDiamond/TransactionBuilder.h
new file mode 100644
index 00000000000..7134ae515fd
--- /dev/null
+++ b/src/BitcoinDiamond/TransactionBuilder.h
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Transaction.h"
+#include "../Bitcoin/TransactionBuilder.h"
+#include "../Bitcoin/TransactionPlan.h"
+#include "../proto/Bitcoin.pb.h"
+#include  "../HexCoding.h"
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <algorithm>
+
+namespace TW::BitcoinDiamond {
+
+struct TransactionBuilder {
+    /// Plans a transaction by selecting UTXOs and calculating fees.
+    static Bitcoin::TransactionPlan plan(const Bitcoin::SigningInput& input) {
+        return Bitcoin::TransactionBuilder::plan(input);
+    }
+
+    /// Builds a transaction by selecting UTXOs and calculating fees.
+    template <typename Transaction>
+    static Result<Transaction, Common::Proto::SigningError> build(const Bitcoin::TransactionPlan& plan,
+                             const Bitcoin::SigningInput& input) {
+        auto tx_result = Bitcoin::TransactionBuilder::build<Transaction>(plan, input);
+        if (!tx_result) { return Result<Transaction, Common::Proto::SigningError>::failure(tx_result.error()); }
+        Transaction tx = tx_result.payload();
+        std::copy(plan.preBlockHash.begin(), plan.preBlockHash.end(),
+                  std::back_inserter(tx.preBlockHash));
+        return Result<Transaction, Common::Proto::SigningError>(tx);
+    }
+};
+
+} // namespace TW::BitcoinDiamond
diff --git a/src/Cardano/AddressV2.cpp b/src/Cardano/AddressV2.cpp
index 6d2140ab82f..695f9451788 100644
--- a/src/Cardano/AddressV2.cpp
+++ b/src/Cardano/AddressV2.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "AddressV2.h"
 #include "../Base58.h"
@@ -15,32 +13,32 @@ namespace TW::Cardano {
 
 bool AddressV2::parseAndCheck(const std::string& addr, Data& root_out, Data& attrs_out, byte& type_out) {
     // Decode Bas58, decode payload + crc, decode root, attr
-    Data base58decoded = Base58::bitcoin.decode(addr);
+    Data base58decoded = Base58::decode(addr);
     if (base58decoded.empty()) {
-        throw std::invalid_argument("Invalid address: could not Base58 decode");
+        return false;
     }
     auto elems = Cbor::Decode(base58decoded).getArrayElements();
     if (elems.size() < 2) {
-        throw std::invalid_argument("Could not parse address payload from CBOR data");
+        return false;
     }
     auto tag = elems[0].getTagValue();
     if (tag != PayloadTag) {
-        throw std::invalid_argument("wrong tag value");
+        return false;
     }
     Data payload = elems[0].getTagElement().getBytes();
     uint64_t crcPresent = (uint32_t)elems[1].getValue();
     uint32_t crcComputed = TW::Crc::crc32(payload);
     if (crcPresent != crcComputed) {
-        throw std::invalid_argument("CRC mismatch");
+        return false;
     }
     // parse payload, 3 elements
     auto payloadElems = Cbor::Decode(payload).getArrayElements();
     if (payloadElems.size() < 3) {
-        throw std::invalid_argument("Could not parse address root and attrs from CBOR data");
+        return false;
     }
     root_out = payloadElems[0].getBytes();
     attrs_out = payloadElems[1].encoded(); // map, but encoded as bytes
-    type_out = (TW::byte)payloadElems[2].getValue();
+    type_out = (byte)payloadElems[2].getValue();
     return true;
 }
 
@@ -100,12 +98,12 @@ Data AddressV2::getCborData() const {
 
 std::string AddressV2::string() const {
     // Base58 encode the CBOR data
-    return Base58::bitcoin.encode(getCborData());
+    return Base58::encode(getCborData());
 }
 
 Data AddressV2::keyHash(const TW::Data& xpub) {
     if (xpub.size() != 64) {
-        throw std::invalid_argument("invalid xpub length");
+        return {};
     }
     // hash of following Cbor-array: [0, [0, xpub], {} ]
     // 3rd entry map is empty map for V2, contains derivation path for V1
diff --git a/src/Cardano/AddressV2.h b/src/Cardano/AddressV2.h
index 929a52356f9..742c3eeaba6 100644
--- a/src/Cardano/AddressV2.h
+++ b/src/Cardano/AddressV2.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Cardano/AddressV3.cpp b/src/Cardano/AddressV3.cpp
index 44c34ab0352..84e264256a6 100644
--- a/src/Cardano/AddressV3.cpp
+++ b/src/Cardano/AddressV3.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "AddressV3.h"
 #include "AddressV2.h"
@@ -163,7 +161,7 @@ AddressV3::AddressV3(const Data& data) {
 AddressV3::AddressV3(const AddressV3& other) = default;
 
 uint8_t AddressV3::firstByte(NetworkId networkId, Kind kind) {
-    byte first = (byte)(((byte)kind << 4) + networkId);
+    auto first = (byte)(((byte)kind << 4) + networkId);
     return first;
 }
 
diff --git a/src/Cardano/AddressV3.h b/src/Cardano/AddressV3.h
index f9580812afe..199d9e03c9f 100644
--- a/src/Cardano/AddressV3.h
+++ b/src/Cardano/AddressV3.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Cardano/Entry.cpp b/src/Cardano/Entry.cpp
index 154b44ac407..688ac1ed355 100644
--- a/src/Cardano/Entry.cpp
+++ b/src/Cardano/Entry.cpp
@@ -1,23 +1,23 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "AddressV3.h"
 #include "Signer.h"
+#include "../proto/Cardano.pb.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 namespace TW::Cardano {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return AddressV3::isValidLegacy(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return AddressV3(publicKey).string();
 }
 
@@ -33,4 +33,31 @@ void Entry::plan([[maybe_unused]] TWCoinType coin, const Data& dataIn, Data& dat
     planTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            Transaction tx;
+            const auto buildRet = Signer::buildTx(tx, input);
+            if (buildRet != Common::Proto::OK) {
+                output.set_error(buildRet);
+                output.set_error_message(Common::Proto::SigningError_Name(buildRet));
+                return;
+            }
+            auto hash = tx.getId();
+            auto encoded = tx.encode();
+            output.set_data_hash(hash.data(), hash.size());
+            output.set_data(encoded.data(), encoded.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, const auto& publicKey) {
+            auto encoded = Signer::encodeTransactionWithSig(input, publicKey, signature);
+            output.set_encoded(encoded.data(), encoded.size());
+            return;
+        });
+}
+
 } // namespace TW::Cardano
diff --git a/src/Cardano/Entry.h b/src/Cardano/Entry.h
index 94766b32303..ed73e24e5c7 100644
--- a/src/Cardano/Entry.h
+++ b/src/Cardano/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,11 +12,14 @@ namespace TW::Cardano {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Cardano
diff --git a/src/Cardano/Signer.cpp b/src/Cardano/Signer.cpp
index 103f57f5e92..80336de5e94 100644
--- a/src/Cardano/Signer.cpp
+++ b/src/Cardano/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "AddressV3.h"
@@ -47,6 +45,12 @@ Common::Proto::SigningError Signer::buildTransactionAux(Transaction& tx, const P
     }
     const auto toAddress = AddressV3(input.transfer_message().to_address());
     tx.outputs.emplace_back(toAddress.data(), plan.amount, plan.outputTokens);
+
+    for (auto& output: plan.extraOutputs) {
+        const auto extraToAddress = AddressV3(output.address);
+        tx.outputs.emplace_back(extraToAddress.data(), output.amount, output.tokenBundle);
+    }
+
     // Change
     bool hasChangeToken = any_of(plan.changeTokens.bundle.begin(), plan.changeTokens.bundle.end(), [](auto&& t) { return t.second.amount > 0; });
     if (plan.change > 0 || hasChangeToken) {
@@ -115,6 +119,9 @@ Common::Proto::SigningError Signer::assembleSignatures(std::vector<std::pair<Dat
         const auto address = AddressV3(publicKey);
         privateKeys[address.string()] = privateKeyData;
 
+        const auto legacyAddress = AddressV2(publicKey);
+        privateKeys[legacyAddress.string()] = privateKeyData;
+
         // Also add the derived staking private key (the 2nd half) and associated address; because staking keys also need signature
         const auto stakingPrivKeyData = deriveStakingPrivateKey(privateKeyData);
         if (!stakingPrivKeyData.empty()) {
@@ -125,7 +132,7 @@ Common::Proto::SigningError Signer::assembleSignatures(std::vector<std::pair<Dat
     // collect every unique input UTXO address, preserving order
     std::vector<std::string> addresses;
     for (auto& u : plan.utxos) {
-        if (!AddressV3::isValid(u.address)) {
+        if (!AddressV3::isValidLegacy(u.address)) {
             return Common::Proto::Error_invalid_address;
         }
         addresses.emplace_back(u.address);
@@ -168,31 +175,53 @@ Common::Proto::SigningError Signer::assembleSignatures(std::vector<std::pair<Dat
         const auto privateKey = PrivateKey(privateKeyData);
         const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
         const auto signature = privateKey.sign(txId, TWCurveED25519ExtendedCardano);
-        // public key (first 32 bytes) and signature (64 bytes)
-        signatures.emplace_back(subData(publicKey.bytes, 0, 32), signature);
+        signatures.emplace_back(publicKey.bytes, signature);
     }
 
     return Common::Proto::OK;
 }
 
-Cbor::Encode cborizeSignatures(const std::vector<std::pair<Data, Data>>& signatures) {
+Cbor::Encode cborizeSignatures(const std::vector<std::pair<Data, Data>>& signatures, const bool addByronSignatures) {
+    std::map<Cbor::Encode, Cbor::Encode> cborizeSigs;
     // signatures as Cbor
     // clang-format off
-    std::vector<Cbor::Encode> sigsCbor;
+    std::vector<Cbor::Encode> sigsShelly;
+    std::vector<Cbor::Encode> sigsByron;
+
     for (auto& s : signatures) {
-        sigsCbor.emplace_back(Cbor::Encode::array({
-            Cbor::Encode::bytes(s.first),
+        sigsShelly.emplace_back(Cbor::Encode::array({
+            // public key (first 32 bytes)
+            Cbor::Encode::bytes(subData(s.first, 0, 32)),
             Cbor::Encode::bytes(s.second)
         }));
+
+        if (addByronSignatures) {
+            sigsByron.emplace_back(Cbor::Encode::array({
+                // skey - public key (first 32 bytes)  
+                Cbor::Encode::bytes(subData(s.first, 0, 32)),
+                Cbor::Encode::bytes(s.second),
+                // vkey - public key (second 32 bytes started from 32)
+                Cbor::Encode::bytes(subData(s.first, 32, 32)),
+                // payload
+                Cbor::Encode::bytes(parse_hex("A0"))
+            }));
+        }
+    }
+
+    cborizeSigs.emplace(
+        Cbor::Encode::uint(0),
+        Cbor::Encode::array(sigsShelly)
+    );
+
+    if (!sigsByron.empty()) {
+        cborizeSigs.emplace(
+            Cbor::Encode::uint(2),
+            Cbor::Encode::array(sigsByron)
+        );
     }
 
     // Cbor-encode txAux & signatures
-    return Cbor::Encode::map({
-        std::make_pair(
-            Cbor::Encode::uint(0),
-            Cbor::Encode::array(sigsCbor)
-        )
-    });
+    return Cbor::Encode::map(cborizeSigs);
     // clang-format on
 }
 
@@ -236,7 +265,16 @@ Common::Proto::SigningError Signer::encodeTransaction(Data& encoded, Data& txId,
     if (sigError != Common::Proto::OK) {
         return sigError;
     }
-    const auto sigsCbor = cborizeSignatures(signatures);
+
+    bool hasLegacyUtxos = false;
+    for (const auto& utxo : input.utxos()) {
+        if (AddressV2::isValid(utxo.address())) {
+            hasLegacyUtxos = true;
+            break;
+        }
+    }
+
+    const auto sigsCbor = cborizeSignatures(signatures, hasLegacyUtxos);
 
     // Cbor-encode txAux & signatures
     const auto cbor = Cbor::Encode::array({
@@ -304,8 +342,8 @@ std::vector<TxInput> Signer::selectInputsWithTokens(const std::vector<TxInput>&
 }
 
 // Create a simple plan, used for estimation
-TransactionPlan simplePlan(Amount amount, const TokenBundle& requestedTokens, const std::vector<TxInput>& selectedInputs, bool maxAmount, uint64_t deposit, uint64_t undeposit) {
-    TransactionPlan plan{.utxos = selectedInputs, .amount = amount, .deposit = deposit, .undeposit = undeposit};
+TransactionPlan simplePlan(Amount amount, const TokenBundle& requestedTokens, const std::vector<TxInput>& selectedInputs, bool maxAmount, uint64_t deposit, uint64_t undeposit, const std::vector<TxOutput>& extraOutputs) {
+    TransactionPlan plan{.utxos = selectedInputs, .extraOutputs = extraOutputs, .amount = amount, .deposit = deposit, .undeposit = undeposit};
     // Sum availableAmount
     plan.availableAmount = 0;
     for (auto& u : plan.utxos) {
@@ -362,14 +400,14 @@ uint64_t sumUndeposits(const Proto::SigningInput& input) {
 }
 
 // Estimates size of transaction in bytes.
-uint64_t estimateTxSize(const Proto::SigningInput& input, Amount amount, const TokenBundle& requestedTokens, const std::vector<TxInput>& selectedInputs) {
+uint64_t estimateTxSize(const Proto::SigningInput& input, Amount amount, const TokenBundle& requestedTokens, const std::vector<TxInput>& selectedInputs, const std::vector<TxOutput>& extraOutputs) {
     auto inputs = std::vector<TxInput>();
     for (auto i = 0; i < input.utxos_size(); ++i) {
         inputs.emplace_back(TxInput::fromProto(input.utxos(i)));
     }
     const auto deposits = sumDeposits(input);
     const uint64_t undeposits = sumUndeposits(input);
-    const auto _simplePlan = simplePlan(amount, requestedTokens, selectedInputs, input.transfer_message().use_max_amount(), deposits, undeposits);
+    const auto _simplePlan = simplePlan(amount, requestedTokens, selectedInputs, input.transfer_message().use_max_amount(), deposits, undeposits, extraOutputs);
 
     Data encoded;
     Data txId;
@@ -390,8 +428,8 @@ Amount txFeeFunction(uint64_t txSizeInBytes) {
     return fee;
 }
 
-Amount Signer::estimateFee(const Proto::SigningInput& input, Amount amount, const TokenBundle& requestedTokens, const std::vector<TxInput>& selectedInputs) {
-    return txFeeFunction(estimateTxSize(input, amount, requestedTokens, selectedInputs));
+Amount Signer::estimateFee(const Proto::SigningInput& input, Amount amount, const TokenBundle& requestedTokens, const std::vector<TxInput>& selectedInputs, const std::vector<TxOutput>& extraOutputs) {
+    return txFeeFunction(estimateTxSize(input, amount, requestedTokens, selectedInputs, extraOutputs));
 }
 
 TransactionPlan Signer::doPlan() const {
@@ -422,12 +460,22 @@ TransactionPlan Signer::doPlan() const {
 
     // Amounts requested
     plan.amount = input.transfer_message().amount();
+
+    uint64_t extraAmountSum = 0;
+    auto extraOutputs = std::vector<TxOutput>();
+    for (auto& output: input.extra_outputs()) {
+        const auto extraToAddress = AddressV3(output.address());
+        extraOutputs.emplace_back(extraToAddress.data(), output.amount());
+        extraAmountSum = extraAmountSum + output.amount();
+    }
+    plan.extraOutputs = extraOutputs;
+
     TokenBundle requestedTokens;
     for (auto i = 0; i < input.transfer_message().token_amount().token_size(); ++i) {
         const auto token = TokenAmount::fromProto(input.transfer_message().token_amount().token(i));
         requestedTokens.add(token);
     }
-    assert(plan.amount > 0 || maxAmount);
+    assert(plan.amount > 0 || maxAmount || input.transfer_message().token_amount().token_size() > 0);
     if (requestedTokens.size() > 1) {
         // We support transfer of only one coin (for simplicity; inputs may contain more coins which are preserved)
         plan.error = Common::Proto::Error_invalid_requested_token_amount;
@@ -483,28 +531,28 @@ TransactionPlan Signer::doPlan() const {
 
     // compute fee
     if (input.transfer_message().force_fee() == 0) {
-        plan.fee = estimateFee(input, plan.amount, requestedTokens, plan.utxos);
+        plan.fee = estimateFee(input, plan.amount, requestedTokens, plan.utxos, plan.extraOutputs);
     } else {
         // fee provided, use it (capped)
-        plan.fee = std::max(Amount(0), std::min(availableAmountAfterDeposit - plan.amount, input.transfer_message().force_fee()));
+        plan.fee = std::max(Amount(0), std::min(availableAmountAfterDeposit - plan.amount - extraAmountSum, input.transfer_message().force_fee()));
     }
     assert(plan.fee >= 0 && plan.fee < availableAmountAfterDeposit);
 
     // adjust/compute output amount
     if (!maxAmount) {
         // reduce amount if needed
-        plan.amount = std::max(Amount(0), std::min(plan.amount, availableAmountAfterDeposit - plan.fee));
+        plan.amount = std::max(Amount(0), std::min(plan.amount, availableAmountAfterDeposit - plan.fee - extraAmountSum));
     } else {
         // max available amount
-        plan.amount = std::max(Amount(0), availableAmountAfterDeposit - plan.fee);
+        plan.amount = std::max(Amount(0), availableAmountAfterDeposit - plan.fee - extraAmountSum);
     }
     assert(plan.amount >= 0 && plan.amount <= availableAmountAfterDeposit);
 
-    if (plan.amount + plan.fee > availableAmountAfterDeposit) {
+    if (plan.amount + extraAmountSum + plan.fee > availableAmountAfterDeposit) {
         plan.error = Common::Proto::Error_low_balance;
         return plan;
     }
-    assert(plan.amount + plan.fee <= availableAmountAfterDeposit);
+    assert(plan.amount + extraAmountSum + plan.fee <= availableAmountAfterDeposit);
 
     // compute output token amounts
     if (!maxAmount) {
@@ -514,7 +562,7 @@ TransactionPlan Signer::doPlan() const {
     }
 
     // compute change
-    plan.change = availableAmountAfterDeposit - (plan.amount + plan.fee);
+    plan.change = availableAmountAfterDeposit - (plan.amount + extraAmountSum + plan.fee);
     for (auto iter = plan.availableTokens.bundle.begin(); iter != plan.availableTokens.bundle.end(); ++iter) {
         const auto key = iter->second.key();
         const auto changeAmount = iter->second.amount - plan.outputTokens.getAmount(key);
@@ -526,10 +574,49 @@ TransactionPlan Signer::doPlan() const {
 
     assert(plan.change >= 0 && plan.change <= availableAmountAfterDeposit);
     assert(!maxAmount || plan.change == 0); // change is 0 in max amount case
-    assert(plan.amount + plan.change + plan.fee == availableAmountAfterDeposit);
-    assert(plan.amount + plan.change + plan.fee + plan.deposit == plan.availableAmount + plan.undeposit);
+    assert(plan.amount + extraAmountSum+ plan.change + plan.fee == availableAmountAfterDeposit);
+    assert(plan.amount + extraAmountSum+ plan.change + plan.fee + plan.deposit == plan.availableAmount + plan.undeposit);
 
     return plan;
 }
 
+
+Data Signer::encodeTransactionWithSig(const Proto::SigningInput &input, const PublicKey &publicKey, const Data &signature) {
+    Transaction txAux;
+    auto buildRet = buildTx(txAux, input);
+    if (buildRet != Common::Proto::OK) {
+        throw Common::Proto::SigningError(buildRet);
+    }
+
+    std::vector<std::pair<Data, Data>> signatures;
+    signatures.emplace_back(publicKey.bytes, signature);
+
+    bool hasLegacyUtxos = false;
+    for (const auto& utxo : input.utxos()) {
+        if (AddressV2::isValid(utxo.address())) {
+            hasLegacyUtxos = true;
+            break;
+        }
+    }
+
+    const auto sigsCbor = cborizeSignatures(signatures, hasLegacyUtxos);
+
+    // Cbor-encode txAux & signatures
+    const auto cbor = Cbor::Encode::array({
+        // txaux
+        Cbor::Encode::fromRaw(txAux.encode()),
+        // signatures
+        sigsCbor,
+        // aux data
+        Cbor::Encode::null(),
+    });
+
+    return cbor.encoded();
+}
+
+Common::Proto::SigningError Signer::buildTx(Transaction& tx, const Proto::SigningInput& input) {
+    auto plan = Signer(input).doPlan();
+    return buildTransactionAux(tx, input, plan);
+}
+
 } // namespace TW::Cardano
diff --git a/src/Cardano/Signer.h b/src/Cardano/Signer.h
index 01d538a617f..d6036e8d2d8 100644
--- a/src/Cardano/Signer.h
+++ b/src/Cardano/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -43,9 +41,11 @@ class Signer {
     }
     // Build encoded transaction
     static Common::Proto::SigningError encodeTransaction(Data& encoded, Data& txId, const Proto::SigningInput& input, const TransactionPlan& plan, bool sizeEstimationOnly = false);
+    static Data encodeTransactionWithSig(const Proto::SigningInput &input, const PublicKey &publicKey, const Data &signature);
     // Build aux transaction object, using input and plan
     static Common::Proto::SigningError buildTransactionAux(Transaction& tx, const Proto::SigningInput& input, const TransactionPlan& plan);
-    static Amount estimateFee(const Proto::SigningInput& input, Amount amount, const TokenBundle& requestedTokens, const std::vector<TxInput>& selectedInputs);
+    static Common::Proto::SigningError buildTx(Transaction& tx, const Proto::SigningInput& input);
+    static Amount estimateFee(const Proto::SigningInput& input, Amount amount, const TokenBundle& requestedTokens, const std::vector<TxInput>& selectedInputs, const std::vector<TxOutput>& extraOutputs);
     static std::vector<TxInput> selectInputsWithTokens(const std::vector<TxInput>& inputs, Amount amount, const TokenBundle& requestedTokens);
     // Build list of public keys + signature
     static Common::Proto::SigningError assembleSignatures(std::vector<std::pair<Data, Data>>& signatures, const Proto::SigningInput& input, const TransactionPlan& plan, const Data& txId, bool sizeEstimationOnly = false);
diff --git a/src/Cardano/Transaction.cpp b/src/Cardano/Transaction.cpp
index da6a4924572..eb6c41aa48d 100644
--- a/src/Cardano/Transaction.cpp
+++ b/src/Cardano/Transaction.cpp
@@ -1,30 +1,63 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
+
+#include <google/protobuf/stubs/strutil.h>
 
 #include "Transaction.h"
+#include "AddressV3.h"
 
 #include "Cbor.h"
 #include "Hash.h"
 #include "HexCoding.h"
+#include "Numeric.h"
+#include "rust/Wrapper.h"
 
 namespace TW::Cardano {
 
 TokenAmount TokenAmount::fromProto(const Proto::TokenAmount& proto) {
-    return {proto.policy_id(), proto.asset_name(), load(proto.amount())};
+    Data assetName;
+    if (!proto.asset_name().empty()) {
+        assetName = data(proto.asset_name());
+    } else if (!proto.asset_name_hex().empty()) {
+        auto assetNameData = parse_hex(proto.asset_name_hex());
+        assetName.assign(assetNameData.data(), assetNameData.data() + assetNameData.size());
+    }
+
+    return {proto.policy_id(), std::move(assetName), load(proto.amount())};
 }
 
 Proto::TokenAmount TokenAmount::toProto() const {
+    auto assetNameHex = hex(assetName);
+
     Proto::TokenAmount tokenAmount;
     tokenAmount.set_policy_id(policyId.data(), policyId.size());
-    tokenAmount.set_asset_name(assetName.data(), assetName.size());
+    tokenAmount.set_asset_name_hex(assetNameHex.data(), assetNameHex.size());
     const auto amountData = store(amount);
     tokenAmount.set_amount(amountData.data(), amountData.size());
+
+    if (const auto assetNameStr = assetNameToString(); assetNameStr.has_value()) {
+        tokenAmount.set_asset_name(assetNameStr.value().data(), assetNameStr.value().size());
+    }
     return tokenAmount;
 }
 
+std::string TokenAmount::displayAssetName() const {
+    if (const auto assetNameStr = assetNameToString(); assetNameStr.has_value()) {
+        return std::move(assetNameStr.value());
+    }
+    return hex(assetName);
+}
+
+std::optional<std::string> TokenAmount::assetNameToString() const {
+    if (!Rust::tw_string_is_utf8_bytes(assetName.data(), assetName.size())) {
+        return std::nullopt;
+    }
+    std::string assetNameStr;
+    assetNameStr.assign(assetName.data(), assetName.data() + assetName.size());
+    return assetNameStr;
+}
+
 TokenBundle TokenBundle::fromProto(const Proto::TokenBundle& proto) {
     TokenBundle ret;
     const auto addFunctor =  [&ret](auto&& cur) { ret.add(TokenAmount::fromProto(cur)); };
@@ -97,17 +130,19 @@ uint64_t TokenBundle::minAdaAmount() const {
     }
 
     std::unordered_set<std::string> policyIdRegistry;
-    std::unordered_set<std::string> assetNameRegistry;
+    std::unordered_set<Data, DataHash> assetNameRegistry;
     uint64_t sumAssetNameLengths = 0;
     for (const auto& t : bundle) {
         policyIdRegistry.emplace(t.second.policyId);
-        if (t.second.assetName.length() > 0) {
+        if (!t.second.assetName.empty()) {
             assetNameRegistry.emplace(t.second.assetName);
         }
     }
+
     auto numPids = uint64_t(policyIdRegistry.size());
     auto numAssets = uint64_t(assetNameRegistry.size());
-    for_each(assetNameRegistry.begin(), assetNameRegistry.end(), [&sumAssetNameLengths](auto&& a) { sumAssetNameLengths += a.length(); });
+    for_each(assetNameRegistry.begin(), assetNameRegistry.end(), [&sumAssetNameLengths](auto&& a){ sumAssetNameLengths += a.size(); });
+    
     return minAdaAmountHelper(numPids, numAssets, sumAssetNameLengths);
 }
 
@@ -136,6 +171,28 @@ Proto::TxInput TxInput::toProto() const {
     return txInput;
 }
 
+TxOutput TxOutput::fromProto(const Cardano::Proto::TxOutput& proto) {
+    auto ret = TxOutput();
+    ret.address = data(proto.address());
+    ret.amount = proto.amount();
+    for (auto i = 0; i < proto.token_amount_size(); ++i) {
+        auto ta = TokenAmount::fromProto(proto.token_amount(i));
+        ret.tokenBundle.add(ta);
+    }
+    return ret;
+}
+
+Proto::TxOutput TxOutput::toProto() const {
+    Proto::TxOutput txOutput;
+    const auto toAddress = AddressV3(address);
+    txOutput.set_address(toAddress.string());
+    txOutput.set_amount(amount);
+    for (const auto& token : tokenBundle.bundle) {
+        *txOutput.add_token_amount() = token.second.toProto();
+    }
+    return txOutput;
+}
+
 bool operator==(const TxInput& i1, const TxInput& i2) {
     return i1.outputIndex == i2.outputIndex && i1.txHash == i2.txHash;
 }
@@ -160,6 +217,9 @@ TransactionPlan TransactionPlan::fromProto(const Proto::TransactionPlan& proto)
     for (auto i = 0; i < proto.utxos_size(); ++i) {
         ret.utxos.emplace_back(TxInput::fromProto(proto.utxos(i)));
     }
+    for (auto i = 0; i < proto.extra_outputs_size(); ++i) {
+        ret.extraOutputs.emplace_back(TxOutput::fromProto(proto.extra_outputs(i)));
+    }
     ret.error = proto.error();
     return ret;
 }
@@ -184,6 +244,9 @@ Proto::TransactionPlan TransactionPlan::toProto() const {
     for (const auto& u : utxos) {
         *plan.add_utxos() = u.toProto();
     }
+    for (const auto& u : extraOutputs) {
+        *plan.add_extra_outputs() = u.toProto();
+    }
     plan.set_error(error);
     return plan;
 }
@@ -215,7 +278,7 @@ Cbor::Encode cborizeOutputAmounts(const Amount& amount, const TokenBundle& token
         std::map<Cbor::Encode, Cbor::Encode> subTokensMap;
         for (const auto& token : subTokens) {
             subTokensMap.emplace(
-                Cbor::Encode::bytes(data(token.assetName)),
+                Cbor::Encode::bytes(token.assetName),
                 Cbor::Encode::uint(uint64_t(token.amount)) // 64 bits
             );
         }
@@ -313,4 +376,32 @@ Data Transaction::getId() const {
     return hash;
 }
 
+/// https://github.com/Emurgo/cardano-serialization-lib/blob/78184e0a2c207c2f8bba57b0d3c437f4c808c125/rust/src/utils.rs#L1415
+std::optional<uint64_t> minAdaAmountHelper(const TxOutput& output, uint64_t coinsPerUtxoByte) noexcept {
+    const size_t outputSize = cborizeOutput(output).encoded().size();
+    const auto outputSizeExtended = static_cast<uint64_t>(outputSize + 160);
+    if (checkMulUnsignedOverflow(outputSizeExtended, coinsPerUtxoByte)) {
+        return std::nullopt;
+    }
+    return outputSizeExtended * coinsPerUtxoByte;
+}
+
+/// https://github.com/Emurgo/cardano-serialization-lib/blob/78184e0a2c207c2f8bba57b0d3c437f4c808c125/rust/src/utils.rs#L1388
+std::optional<uint64_t> TxOutput::minAdaAmount(uint64_t coinsPerUtxoByte) const noexcept {
+    // A copy of `this`.
+    TxOutput output(address, amount, tokenBundle);
+
+    while (true) {
+        const auto minAmount = minAdaAmountHelper(output, coinsPerUtxoByte);
+        if (!minAmount) {
+            return std::nullopt;
+        }
+        if (output.amount >= *minAmount) {
+            return minAmount;
+        }
+        // Set the amount to `minAmount` and re-try again.
+        output.amount = *minAmount;
+    }
+}
+
 } // namespace TW::Cardano
diff --git a/src/Cardano/Transaction.h b/src/Cardano/Transaction.h
index a8e7e758000..c0bb4dfe559 100644
--- a/src/Cardano/Transaction.h
+++ b/src/Cardano/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -17,6 +15,8 @@
 #include <string>
 #include <utility>
 #include <vector>
+#include <string>
+#include <set>
 
 namespace TW::Cardano {
 
@@ -25,17 +25,20 @@ typedef uint64_t Amount;
 class TokenAmount {
 public:
     std::string policyId;
-    std::string assetName;
+    Data assetName;
     uint256_t amount;
 
     TokenAmount() = default;
-    TokenAmount(std::string policyId, std::string assetName, uint256_t amount)
+    TokenAmount(std::string policyId, Data assetName, uint256_t amount)
         : policyId(std::move(policyId)), assetName(std::move(assetName)), amount(std::move(amount)) {}
 
     static TokenAmount fromProto(const Proto::TokenAmount& proto);
     Proto::TokenAmount toProto() const;
     /// Key used in TokenBundle
-    std::string key() const { return policyId + "_" + assetName; }
+    std::string key() const { return policyId + "_" + displayAssetName(); }
+    std::string displayAssetName() const;
+    /// Tries to convert the `assetName` to a UTF-8 string. Returns `std::nullopt` otherwise.
+    std::optional<std::string> assetNameToString() const;
 };
 
 class TokenBundle {
@@ -103,16 +106,23 @@ class TxOutput {
     /// Token amounts (optional)
     TokenBundle tokenBundle;
 
+    /// Returns minimal amount of ADA for the output or `std::nullopt` if there a problem happened.
+    std::optional<uint64_t> minAdaAmount(uint64_t coinsPerUtxoByte) const noexcept;
+
     TxOutput() = default;
     TxOutput(Data address, Amount amount)
         : address(std::move(address)), amount(amount) {}
     TxOutput(Data address, Amount amount, TokenBundle tokenBundle)
         : address(std::move(address)), amount(amount), tokenBundle(std::move(tokenBundle)) {}
+
+    static TxOutput fromProto(const Proto::TxOutput& proto);
+    Proto::TxOutput toProto() const;
 };
 
 class TransactionPlan {
 public:
     std::vector<TxInput> utxos;
+    std::vector<TxOutput> extraOutputs;
     Amount availableAmount = 0;  // total coins in the input utxos
     Amount amount = 0;           // coins in the output UTXO
     Amount fee = 0;              // coin amount deducted as fee
diff --git a/src/Cbor.cpp b/src/Cbor.cpp
index 719c173ec83..dd5f3ed06c2 100644
--- a/src/Cbor.cpp
+++ b/src/Cbor.cpp
@@ -1,11 +1,10 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Cbor.h"
 #include "HexCoding.h"
+#include "Numeric.h"
 
 #include <sstream>
 #include <cassert>
@@ -311,8 +310,11 @@ vector<Decode> Decode::getCompoundElements(uint32_t countMultiplier, TW::byte ex
             break;
         }
         uint32_t elemLen = nextElem.getTotalLen();
+        if (elemLen == 0 || checkAddUnsignedOverflow(idx, elemLen)) {
+            throw std::invalid_argument("CBOR invalid element length");
+        }
         if (idx + elemLen > length()) {
-            throw std::invalid_argument("CBOR array data too short");
+            throw std::invalid_argument("CBOR invalid array data");
         }
         elems.emplace_back(Decode(data, subStart + idx, elemLen));
         idx += elemLen;
diff --git a/src/Cbor.h b/src/Cbor.h
index 06ab9f3feca..43f245611bb 100644
--- a/src/Cbor.h
+++ b/src/Cbor.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Coin.cpp b/src/Coin.cpp
index f22a8713fc1..447c5c2f5a0 100644
--- a/src/Coin.cpp
+++ b/src/Coin.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Coin.h"
 
@@ -16,19 +14,23 @@
 #include "Aeternity/Entry.h"
 #include "Aion/Entry.h"
 #include "Algorand/Entry.h"
+#include "Aptos/Entry.h"
 #include "Binance/Entry.h"
 #include "Bitcoin/Entry.h"
+#include "BitcoinDiamond/Entry.h"
 #include "Cardano/Entry.h"
 #include "Cosmos/Entry.h"
 #include "Decred/Entry.h"
 #include "EOS/Entry.h"
-#include "Elrond/Entry.h"
+#include "MultiversX/Entry.h"
 #include "Ethereum/Entry.h"
+#include "Everscale/Entry.h"
 #include "FIO/Entry.h"
 #include "Filecoin/Entry.h"
 #include "Groestlcoin/Entry.h"
 #include "Harmony/Entry.h"
 #include "Icon/Entry.h"
+#include "IOST/Entry.h"
 #include "IoTeX/Entry.h"
 #include "Kusama/Entry.h"
 #include "NEAR/Entry.h"
@@ -50,10 +52,22 @@
 #include "Theta/Entry.h"
 #include "Tron/Entry.h"
 #include "VeChain/Entry.h"
+#include "Verge/Entry.h"
 #include "Waves/Entry.h"
+#include "XRP/Entry.h"
 #include "Zcash/Entry.h"
 #include "Zilliqa/Entry.h"
+#include "Zen/Entry.h"
 #include "Everscale/Entry.h"
+#include "Hedera/Entry.h"
+#include "TheOpenNetwork/Entry.h"
+#include "Sui/Entry.h"
+#include "Greenfield/Entry.h"
+#include "InternetComputer/Entry.h"
+#include "NativeEvmos/Entry.h"
+#include "NativeInjective/Entry.h"
+#include "BitcoinCash/Entry.h"
+#include "Pactus/Entry.h"
 // end_of_coin_includes_marker_do_not_modify
 
 using namespace TW;
@@ -63,11 +77,12 @@ using namespace std;
 Aeternity::Entry aeternityDP;
 Aion::Entry aionDP;
 Algorand::Entry algorandDP;
+Aptos::Entry AptosDP;
 Binance::Entry binanceDP;
 Bitcoin::Entry bitcoinDP;
 Cardano::Entry cardanoDP;
 Cosmos::Entry cosmosDP;
-Elrond::Entry elrondDP;
+MultiversX::Entry multiversxDP;
 EOS::Entry eosDP;
 Ethereum::Entry ethereumDP;
 Decred::Entry decredDP;
@@ -76,6 +91,7 @@ FIO::Entry fioDP;
 Groestlcoin::Entry groestlcoinDP;
 Harmony::Entry harmonyDP;
 Icon::Entry iconDP;
+IOST::Entry iostDP;
 IoTeX::Entry iotexDP;
 Kusama::Entry kusamaDP;
 Nano::Entry nanoDP;
@@ -96,11 +112,23 @@ Theta::Entry thetaDP;
 THORChain::Entry thorchainDP;
 Tron::Entry tronDP;
 VeChain::Entry vechainDP;
+Verge::Entry vergeDP;
 Waves::Entry wavesDP;
 Zcash::Entry zcashDP;
 Zilliqa::Entry zilliqaDP;
+BitcoinDiamond::Entry bcdDP;
+Zen::Entry zenDP;
 Nervos::Entry NervosDP;
 Everscale::Entry EverscaleDP;
+Hedera::Entry HederaDP;
+TheOpenNetwork::Entry tonDP;
+Sui::Entry SuiDP;
+Greenfield::Entry GreenfieldDP;
+InternetComputer::Entry InternetComputerDP;
+NativeEvmos::Entry NativeEvmosDP;
+NativeInjective::Entry NativeInjectiveDP;
+BitcoinCash::Entry BitcoinCashDP;
+Pactus::Entry PactusDP;
 // end_of_coin_dipatcher_declarations_marker_do_not_modify
 
 CoinEntry* coinDispatcher(TWCoinType coinType) {
@@ -110,6 +138,7 @@ CoinEntry* coinDispatcher(TWCoinType coinType) {
     switch (blockchain) {
         // #coin-list#
         case TWBlockchainBitcoin: entry = &bitcoinDP; break;
+        case TWBlockchainBitcoinDiamond: entry = &bcdDP; break;
         case TWBlockchainEthereum: entry = &ethereumDP; break;
         case TWBlockchainVechain: entry = &vechainDP; break;
         case TWBlockchainTron: entry = &tronDP; break;
@@ -140,16 +169,29 @@ CoinEntry* coinDispatcher(TWCoinType coinType) {
         case TWBlockchainCardano: entry = &cardanoDP; break;
         case TWBlockchainNEO: entry = &neoDP; break;
         case TWBlockchainFilecoin: entry = &filecoinDP; break;
-        case TWBlockchainElrondNetwork: entry = &elrondDP; break;
+        case TWBlockchainMultiversX: entry = &multiversxDP; break;
         case TWBlockchainOasisNetwork: entry = &oasisDP; break;
         case TWBlockchainDecred: entry = &decredDP; break;
         case TWBlockchainGroestlcoin: entry = &groestlcoinDP; break;
         case TWBlockchainZcash: entry = &zcashDP; break;
+        case TWBlockchainZen: entry = &zenDP; break;
+        case TWBlockchainVerge: entry = &vergeDP; break;
+        case TWBlockchainIOST: entry = &iostDP; break;
         case TWBlockchainThorchain: entry = &thorchainDP; break;
         case TWBlockchainRonin: entry = &roninDP; break;
         case TWBlockchainKusama: entry = &kusamaDP; break;
         case TWBlockchainNervos: entry = &NervosDP; break;
         case TWBlockchainEverscale: entry = &EverscaleDP; break;
+        case TWBlockchainAptos: entry = &AptosDP; break;
+        case TWBlockchainHedera: entry = &HederaDP; break;
+        case TWBlockchainTheOpenNetwork: entry = &tonDP; break;
+        case TWBlockchainSui: entry = &SuiDP; break;
+        case TWBlockchainGreenfield: entry = &GreenfieldDP; break;
+        case TWBlockchainInternetComputer: entry = &InternetComputerDP; break;
+        case TWBlockchainNativeEvmos: entry = &NativeEvmosDP; break;
+        case TWBlockchainNativeInjective: entry = &NativeInjectiveDP; break;
+        case TWBlockchainBitcoinCash: entry = &BitcoinCashDP; break;
+        case TWBlockchainPactus: entry = &PactusDP; break;
         // end_of_coin_dipatcher_switch_marker_do_not_modify
 
         default: entry = nullptr; break;
@@ -162,7 +204,7 @@ const Derivation CoinInfo::derivationByName(TWDerivation nameIn) const {
     if (nameIn == TWDerivationDefault && derivation.size() > 0) {
         return derivation[0];
     }
-    for (auto deriv: derivation) {
+    for (auto deriv : derivation) {
         if (deriv.name == nameIn) {
             return deriv;
         }
@@ -170,27 +212,71 @@ const Derivation CoinInfo::derivationByName(TWDerivation nameIn) const {
     return Derivation();
 }
 
+bool TW::validateAddress(TWCoinType coin, const string& address, const PrefixVariant& prefix) {
+    // dispatch
+    auto* dispatcher = coinDispatcher(coin);
+    assert(dispatcher != nullptr);
+    try {
+        return dispatcher->validateAddress(coin, address, prefix);
+    } catch (...) {
+        return false;
+    }
+}
+
 bool TW::validateAddress(TWCoinType coin, const std::string& string) {
+    const auto* hrp = stringForHRP(TW::hrp(coin));
     auto p2pkh = TW::p2pkhPrefix(coin);
     auto p2sh = TW::p2shPrefix(coin);
-    const auto* hrp = stringForHRP(TW::hrp(coin));
 
     // dispatch
     auto* dispatcher = coinDispatcher(coin);
     assert(dispatcher != nullptr);
-    return dispatcher->validateAddress(coin, string, p2pkh, p2sh, hrp);
+
+    try {
+        bool isValid = false;
+        // First check HRP.
+        if (hrp != nullptr && !std::string(hrp).empty()) {
+            isValid = dispatcher->validateAddress(coin, string, Bech32Prefix(hrp));
+        }
+        // Then check UTXO
+        if ((p2pkh != 0 || p2sh != 0) && !isValid) {
+            return isValid || dispatcher->validateAddress(coin, string, Base58Prefix{.p2pkh = p2pkh, .p2sh = p2sh});
+        }
+        // Then check normal
+        if (!isValid) {
+            isValid = dispatcher->validateAddress(coin, string, std::monostate());
+        }
+        return isValid;
+    } catch (...) {
+        return false;
+    }
 }
 
-std::string TW::normalizeAddress(TWCoinType coin, const std::string& address) {
+namespace TW::internal {
+    inline std::string normalizeAddress(TWCoinType coin, const string& address) {
+        // dispatch
+        auto* dispatcher = coinDispatcher(coin);
+        assert(dispatcher != nullptr);
+        return dispatcher->normalizeAddress(coin, address);
+    }
+} // namespace TW::internal
+
+std::string TW::normalizeAddress(TWCoinType coin, const string& address) {;
     if (!TW::validateAddress(coin, address)) {
         // invalid address, not normalizing
         return "";
     }
 
-    // dispatch
-    auto* dispatcher = coinDispatcher(coin);
-    assert(dispatcher != nullptr);
-    return dispatcher->normalizeAddress(coin, address);
+    return internal::normalizeAddress(coin, address);
+}
+
+std::string TW::normalizeAddress(TWCoinType coin, const std::string& address, const PrefixVariant& prefix) {
+    if (!TW::validateAddress(coin, address, prefix)) {
+        // invalid address, not normalizing
+        return "";
+    }
+
+    return internal::normalizeAddress(coin, address);
 }
 
 std::string TW::deriveAddress(TWCoinType coin, const PrivateKey& privateKey) {
@@ -202,18 +288,10 @@ std::string TW::deriveAddress(TWCoinType coin, const PrivateKey& privateKey, TWD
     return TW::deriveAddress(coin, privateKey.getPublicKey(keyType), derivation);
 }
 
-std::string TW::deriveAddress(TWCoinType coin, const PublicKey& publicKey) {
-    return deriveAddress(coin, publicKey, TWDerivationDefault);
-}
-
-std::string TW::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation) {
-    auto p2pkh = TW::p2pkhPrefix(coin);
-    const auto* hrp = stringForHRP(TW::hrp(coin));
-
-    // dispatch
-    auto* dispatcher = coinDispatcher(coin);
+std::string TW::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) {
+    auto const* dispatcher = coinDispatcher(coin);
     assert(dispatcher != nullptr);
-    return dispatcher->deriveAddress(coin, derivation, publicKey, p2pkh, hrp);
+    return dispatcher->deriveAddress(coin, publicKey, derivation, addressPrefix);
 }
 
 Data TW::addressToData(TWCoinType coin, const std::string& address) {
@@ -258,12 +336,6 @@ void TW::anyCoinCompileWithSignatures(TWCoinType coinType, const Data& txInputDa
     dispatcher->compile(coinType, txInputData, signatures, publicKeys, txOutputOut);
 }
 
-Data TW::anyCoinBuildTransactionInput(TWCoinType coinType, const std::string& from, const std::string& to, const uint256_t& amount, const std::string& asset, const std::string& memo, const std::string& chainId) {
-    auto* dispatcher = coinDispatcher(coinType);
-    assert(dispatcher != nullptr);
-    return dispatcher->buildTransactionInput(coinType, from, to, amount, asset, memo, chainId);
-}
-
 // Coin info accessors
 
 extern const CoinInfo getCoinInfo(TWCoinType coin); // in generated CoinInfoData.cpp file
@@ -348,6 +420,10 @@ uint32_t TW::slip44Id(TWCoinType coin) {
     return getCoinInfo(coin).slip44;
 }
 
+std::uint32_t TW::ss58Prefix(TWCoinType coin) {
+    return getCoinInfo(coin).ss58Prefix;
+}
+
 TWString* _Nullable TWCoinTypeConfigurationGetSymbol(enum TWCoinType coin) {
     return TWStringCreateWithUTF8Bytes(getCoinInfo(coin).symbol);
 }
diff --git a/src/Coin.h b/src/Coin.h
index e18cc7b88ea..35ad5bc1d59 100644
--- a/src/Coin.h
+++ b/src/Coin.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -32,8 +30,12 @@ std::vector<TWCoinType> getCoinTypes();
 /// Validates an address for a particular coin.
 bool validateAddress(TWCoinType coin, const std::string& address);
 
+/// Validates an address for a particular coin.
+bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& prefix);
+
 /// Validates and normalizes an address for a particular coin.
 std::string normalizeAddress(TWCoinType coin, const std::string& address);
+std::string normalizeAddress(TWCoinType coin, const std::string& address, const PrefixVariant& prefix);
 
 /// Returns the blockchain for a coin type.
 TWBlockchain blockchain(TWCoinType coin);
@@ -74,11 +76,8 @@ std::string deriveAddress(TWCoinType coin, const PrivateKey& privateKey);
 /// Derives the address for a particular coin from the private key, with given derivation.
 std::string deriveAddress(TWCoinType coin, const PrivateKey& privateKey, TWDerivation derivation);
 
-/// Derives the address for a particular coin from the public key.
-std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey);
-
-/// Derives the address for a particular coin from the public key, with given derivation.
-std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation);
+/// Derives the address for a particular coin from the public key, with given derivation and addressPrefix.
+std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation = TWDerivationDefault, const PrefixVariant& addressPrefix = std::monostate());
 
 /// Returns the binary representation of a string address
 Data addressToData(TWCoinType coin, const std::string& address);
@@ -104,6 +103,9 @@ byte p2shPrefix(TWCoinType coin);
 /// Returns human readable part for a coin type.
 enum TWHRP hrp(TWCoinType coin);
 
+/// Returns the ss58 prefix of a coin type.
+std::uint32_t ss58Prefix(TWCoinType coin);
+
 /// Returns chain ID.
 const char* chainId(TWCoinType coin);
 
@@ -122,8 +124,6 @@ Data anyCoinPreImageHashes(TWCoinType coinType, const Data& txInputData);
 
 void anyCoinCompileWithSignatures(TWCoinType coinType, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& txOutputOut);
 
-Data anyCoinBuildTransactionInput(TWCoinType coinType, const std::string& from, const std::string& to, const uint256_t& amount, const std::string& asset, const std::string& memo, const std::string& chainId);
-
 // Describes a derivation: path + optional format + optional name
 struct Derivation {
     TWDerivation name = TWDerivationDefault;
@@ -155,6 +155,7 @@ struct CoinInfo {
     const char* explorerTransactionUrl;
     const char* explorerAccountUrl;
     uint32_t slip44;
+    std::uint32_t ss58Prefix;
 
     // returns default derivation
     const Derivation defaultDerivation() const {
diff --git a/src/CoinEntry.cpp b/src/CoinEntry.cpp
new file mode 100644
index 00000000000..c1748f7ab8d
--- /dev/null
+++ b/src/CoinEntry.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "CoinEntry.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "rust/Wrapper.h"
+#include <variant>
+#include <google/protobuf/util/json_util.h>
+
+namespace TW {
+
+const char* getFromPrefixHrpOrDefault(const PrefixVariant &prefix, TWCoinType coin) {
+    if (std::holds_alternative<Bech32Prefix>(prefix)) {
+        const char* fromPrefix = std::get<Bech32Prefix>(prefix);
+        if (fromPrefix != nullptr && *fromPrefix != 0) {
+            return fromPrefix;
+        }
+    }
+    // Prefix contains no hrp or empty, return coin-default
+    return stringForHRP(TW::hrp(coin));
+}
+
+byte getFromPrefixPkhOrDefault(const PrefixVariant &prefix, TWCoinType coin) {
+    if (std::holds_alternative<Base58Prefix>(prefix)) {
+        return std::get<Base58Prefix>(prefix).p2pkh;
+    }
+    // Prefix contains no base58 prefixes, return coin-default
+    return TW::p2pkhPrefix(coin);
+}
+
+} // namespace TW
diff --git a/src/CoinEntry.h b/src/CoinEntry.h
index b0ab4bd72d3..569593dac84 100644
--- a/src/CoinEntry.h
+++ b/src/CoinEntry.h
@@ -1,13 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWDerivation.h>
+#include <TrustWalletCore/TWFilecoinAddressType.h>
 
 #include "Data.h"
 #include "PublicKey.h"
@@ -17,26 +16,39 @@
 
 #include <string>
 #include <vector>
+#include <variant>
 #include <utility>
 
 namespace TW {
 
 typedef std::vector<std::pair<Data, Data>> HashPubkeyList;
 
+struct Base58Prefix {
+    TW::byte p2pkh;
+    TW::byte p2sh;
+};
+
+using Bech32Prefix = const char *;
+using SS58Prefix = uint32_t;
+
+/// Declare a dummy prefix to notify the entry to derive a delegated address.
+struct DelegatedPrefix {};
+
+/// Declare a dummy prefix to notify the entry to derive a firo exchange address.
+struct ExchangePrefix {};
+
+using PrefixVariant = std::variant<Base58Prefix, Bech32Prefix, SS58Prefix, DelegatedPrefix, ExchangePrefix, std::monostate>;
+
 /// Interface for coin-specific entry, used to dispatch calls to coins
 /// Implement this for all coins.
 class CoinEntry {
 public:
     virtual ~CoinEntry() noexcept = default;
-    virtual bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const = 0;
+    virtual bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const = 0;
     // normalizeAddress is optional, it may leave this default, no-change implementation
     virtual std::string normalizeAddress([[maybe_unused]] TWCoinType coin, const std::string& address) const { return address; }
-    // Address derivation, default derivation
-    virtual std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const = 0;
-    // Address derivation, by default invoking default
-    virtual std::string deriveAddress(TWCoinType coin, [[maybe_unused]] TWDerivation derivation, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const {
-        return deriveAddress(coin, publicKey, p2pkh, hrp);
-    }
+    // Address derivation
+    virtual std::string deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const = 0;
     // Return the binary representation of a string address, used by AnyAddress
     // It is optional, if not defined, 'AnyAddress' interface will not support this coin.
     virtual Data addressToData([[maybe_unused]] TWCoinType coin, [[maybe_unused]] const std::string& address) const { return {}; }
@@ -56,9 +68,6 @@ class CoinEntry {
     virtual Data preImageHashes([[maybe_unused]] TWCoinType coin, [[maybe_unused]] const Data& txInputData) const { return {}; }
     // Optional method for compiling a transaction with externally-supplied signatures & pubkeys.
     virtual void compile([[maybe_unused]] TWCoinType coin, [[maybe_unused]] const Data& txInputData, [[maybe_unused]] const std::vector<Data>& signatures, [[maybe_unused]] const std::vector<PublicKey>& publicKeys, [[maybe_unused]] Data& dataOut) const {}
-    // Optional helper to prepare a SigningInput from simple parameters.
-    // Not suitable for UTXO chains. Some parameters, like chain-specific fee/gas paraemters, may need to be set in the SigningInput.
-    virtual Data buildTransactionInput([[maybe_unused]] TWCoinType coinType, [[maybe_unused]] const std::string& from, [[maybe_unused]] const std::string& to, [[maybe_unused]] const uint256_t& amount, [[maybe_unused]] const std::string& asset, [[maybe_unused]] const std::string& memo, [[maybe_unused]] const std::string& chainId) const { return Data(); }
 };
 
 // In each coin's Entry.cpp the specific types of the coin are used, this template enforces the Signer implement:
@@ -90,7 +99,7 @@ Data txCompilerTemplate(const Data& dataIn, Func&& fnHandler) {
     if (!input.ParseFromArray(dataIn.data(), (int)dataIn.size())) {
         output.set_error(Common::Proto::Error_input_parse);
         output.set_error_message("failed to parse input data");
-        return TW::data(output.SerializeAsString());;
+        return TW::data(output.SerializeAsString());
     }
 
     try {
@@ -103,4 +112,43 @@ Data txCompilerTemplate(const Data& dataIn, Func&& fnHandler) {
     return TW::data(output.SerializeAsString());
 }
 
+// This template will be used for compile in each coin's Entry.cpp.
+// It is a helper function to simplify exception handle that validates if there is only one `signatures` and one `publicKeys`.
+template <typename Input, typename Output, typename Func>
+Data txCompilerSingleTemplate(const Data& dataIn, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Func&& fnHandler) {
+    auto input = Input();
+    auto output = Output();
+    if (!input.ParseFromArray(dataIn.data(), (int)dataIn.size())) {
+        output.set_error(Common::Proto::Error_input_parse);
+        output.set_error_message("failed to parse input data");
+        return TW::data(output.SerializeAsString());
+    }
+
+    if (signatures.empty() || publicKeys.empty()) {
+        output.set_error(Common::Proto::Error_invalid_params);
+        output.set_error_message("empty signatures or publickeys");
+        return TW::data(output.SerializeAsString());
+    }
+    if (signatures.size() != 1 || publicKeys.size() != 1) {
+        output.set_error(Common::Proto::Error_no_support_n2n);
+        output.set_error_message("signatures and publickeys size can only be one");
+        return TW::data(output.SerializeAsString());
+    }
+
+    try {
+        // each coin function handler
+        fnHandler(input, output, signatures[0], publicKeys[0]);
+    } catch (const std::exception& e) {
+        output.set_error(Common::Proto::Error_internal);
+        output.set_error_message(e.what());
+    }
+    return TW::data(output.SerializeAsString());
+}
+
+// Get the hrp from the prefix variant, or the coin-default if it is empty or it is not an hrp
+const char* getFromPrefixHrpOrDefault(const PrefixVariant &prefix, TWCoinType coin);
+
+// Get the p2pkh prefix from the prefix variant, or the coin-default if it does not contain base58 prefixes
+byte getFromPrefixPkhOrDefault(const PrefixVariant &prefix, TWCoinType coin);
+
 } // namespace TW
diff --git a/src/Cosmos/Address.cpp b/src/Cosmos/Address.cpp
deleted file mode 100644
index 5cfabf5e553..00000000000
--- a/src/Cosmos/Address.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright © 2017 Pieter Wuille
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Address.h"
diff --git a/src/Cosmos/Address.h b/src/Cosmos/Address.h
index f13753db89a..ed4c7bf61eb 100644
--- a/src/Cosmos/Address.h
+++ b/src/Cosmos/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -22,9 +20,6 @@ class Address: public Bech32Address {
 public:
     Address() : Bech32Address("") {}
 
-    /// Initializes an address with a key hash, with prefix of the given coin.
-    Address(TWCoinType coin, const Data& keyHash) : Bech32Address(stringForHRP(TW::hrp(coin)), keyHash) {}
-
     /// Initializes an address with a key hash, with given prefix.
     Address(const std::string& hrp, const Data& keyHash) : Bech32Address(hrp, keyHash) {}
 
@@ -40,6 +35,11 @@ class Address: public Bech32Address {
         return Bech32Address::isValid(addr, hrp);
     }
 
+    /// Determines whether a string makes a valid Bech32 address with the given hrp.
+    static bool isValid(const std::string& addr, const std::string& hrp) {
+        return Bech32Address::isValid(addr, hrp);
+    }
+
     /// Creates an address object from the given string, if valid.  Returns success.
     static bool decode(const std::string& addr, Address& obj_out) {
         return Bech32Address::decode(addr, obj_out, "");
diff --git a/src/Cosmos/Entry.cpp b/src/Cosmos/Entry.cpp
index bb8ee4698d1..69a4b4c2707 100644
--- a/src/Cosmos/Entry.cpp
+++ b/src/Cosmos/Entry.cpp
@@ -1,46 +1,26 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
-
 #include "Address.h"
-#include "Signer.h"
+
+#include <proto/Cosmos.pb.h>
+#include <proto/TransactionCompiler.pb.h>
+#include <google/protobuf/util/json_util.h>
 
 using namespace TW;
 using namespace std;
 
 namespace TW::Cosmos {
 
-// Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
-
-bool Entry::validateAddress(TWCoinType coin, const string& address, TW::byte, TW::byte, [[maybe_unused]] const char* hrp) const {
-    return Address::isValid(coin, address);
-}
-
-string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte, [[maybe_unused]] const char* hrp) const {
-    return Address(coin, publicKey).string();
-}
-
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
-    Address addr;
-    if (!Address::decode(address, addr)) {
-        return Data();
-    }
-    return addr.getKeyHash();
-}
-
-void Entry::sign(TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
-    auto input = Proto::SigningInput();
-    input.ParseFromArray(dataIn.data(), (int)dataIn.size());
-    auto serializedOut = Signer::sign(input, coin).SerializeAsString();
-    dataOut.insert(dataOut.end(), serializedOut.begin(), serializedOut.end());
-}
-
 string Entry::signJSON(TWCoinType coin, const std::string& json, const Data& key) const {
-    return Signer::signJSON(json, key, coin);
+    return signJSONHelper<Proto::SigningInput, Proto::SigningOutput>(
+        coin,
+        json,
+        key,
+        [](const Proto::SigningOutput& output) { return output.json(); }
+    );
 }
 
 } // namespace TW::Cosmos
diff --git a/src/Cosmos/Entry.h b/src/Cosmos/Entry.h
index e5be0796622..77d8efec01e 100644
--- a/src/Cosmos/Entry.h
+++ b/src/Cosmos/Entry.h
@@ -1,25 +1,20 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../CoinEntry.h"
+#include "rust/RustCoinEntry.h"
 
 namespace TW::Cosmos {
 
 /// Entry point for implementation of Cosmos coin.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry : public CoinEntry {
+class Entry : public Rust::RustCoinEntryWithSignJSON {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const final;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const final;
-     Data addressToData(TWCoinType coin, const std::string& address) const final;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
-     bool supportsJSONSigning() const final { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const override;
+    ~Entry() override = default;
+    bool supportsJSONSigning() const final { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const final;
 };
 
 } // namespace TW::Cosmos
diff --git a/src/Cosmos/JsonSerialization.cpp b/src/Cosmos/JsonSerialization.cpp
deleted file mode 100644
index bb7e28c98b8..00000000000
--- a/src/Cosmos/JsonSerialization.cpp
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "JsonSerialization.h"
-#include "ProtobufSerialization.h"
-
-#include "../Cosmos/Address.h"
-#include "../proto/Cosmos.pb.h"
-#include "Base64.h"
-#include "PrivateKey.h"
-
-using namespace TW;
-
-namespace TW::Cosmos::Json {
-
-using json = nlohmann::json;
-using string = std::string;
-
-const string TYPE_PREFIX_MSG_SEND = "cosmos-sdk/MsgSend";
-const string TYPE_PREFIX_MSG_DELEGATE = "cosmos-sdk/MsgDelegate";
-const string TYPE_PREFIX_MSG_UNDELEGATE = "cosmos-sdk/MsgUndelegate";
-const string TYPE_PREFIX_MSG_REDELEGATE = "cosmos-sdk/MsgBeginRedelegate";
-const string TYPE_PREFIX_MSG_WITHDRAW_REWARD = "cosmos-sdk/MsgWithdrawDelegationReward";
-const string TYPE_PREFIX_PUBLIC_KEY = "tendermint/PubKeySecp256k1";
-const string TYPE_EVMOS_PREFIX_PUBLIC_KEY = "ethermint/PubKeyEthSecp256k1";
-const string TYPE_PREFIX_WASM_MSG_EXECUTE = "wasm/MsgExecuteContract";
-
-static inline std::string coinTypeToPrefixPublicKey(TWCoinType coin) noexcept {
-    if (coin == TWCoinTypeNativeEvmos) {
-        return TYPE_EVMOS_PREFIX_PUBLIC_KEY;
-    }
-    return TYPE_PREFIX_PUBLIC_KEY;
-}
-
-static string broadcastMode(Proto::BroadcastMode mode) {
-    switch (mode) {
-    case Proto::BroadcastMode::BLOCK:
-        return "block";
-    case Proto::BroadcastMode::ASYNC:
-        return "async";
-    default: return "sync";
-    }
-}
-
-static json broadcastJSON(json& j, Proto::BroadcastMode mode) {
-    return {
-        {"tx", j},
-        {"mode", broadcastMode(mode)}
-    };
-}
-
-static json amountJSON(const Proto::Amount& amount) {
-    return {
-        {"amount", amount.amount()},
-        {"denom", amount.denom()}
-    };
-}
-
-static json amountsJSON(const ::google::protobuf::RepeatedPtrField<Proto::Amount>& amounts) {
-    json j = json::array();
-    for (auto& amount : amounts) {
-        j.push_back(amountJSON(amount));
-    }
-    return j;
-}
-
-static json feeJSON(const Proto::Fee& fee) {
-    json js = json::array();
-
-    for (auto& amount : fee.amounts()) {
-        js.push_back(amountJSON(amount));
-    }
-
-    return {
-        {"amount", js},
-        {"gas", std::to_string(fee.gas())}
-    };
-}
-
-static json messageSend(const Proto::Message_Send& message) {
-    auto typePrefix = message.type_prefix().empty() ? TYPE_PREFIX_MSG_SEND : message.type_prefix();
-
-    return {
-        {"type", typePrefix},
-        {"value", {
-            {"amount", amountsJSON(message.amounts())},
-            {"from_address", message.from_address()},
-            {"to_address", message.to_address()}
-        }}
-    };
-}
-
-static json messageDelegate(const Proto::Message_Delegate& message) {
-    auto typePrefix = message.type_prefix().empty() ? TYPE_PREFIX_MSG_DELEGATE : message.type_prefix();
-
-    return {
-        {"type", typePrefix},
-        {"value", {
-            {"amount", amountJSON(message.amount())},
-            {"delegator_address", message.delegator_address()},
-            {"validator_address", message.validator_address()}
-        }}
-    };
-}
-
-static json messageUndelegate(const Proto::Message_Undelegate& message) {
-    auto typePrefix = message.type_prefix().empty() ? TYPE_PREFIX_MSG_UNDELEGATE : message.type_prefix();
-
-    return {
-        {"type", typePrefix},
-        {"value", {
-            {"amount", amountJSON(message.amount())},
-            {"delegator_address", message.delegator_address()},
-            {"validator_address", message.validator_address()}
-        }}
-    };
-}
-
-static json messageRedelegate(const Proto::Message_BeginRedelegate& message) {
-    auto typePrefix = message.type_prefix().empty() ? TYPE_PREFIX_MSG_REDELEGATE : message.type_prefix();
-
-    return {
-        {"type", typePrefix},
-        {"value", {
-            {"amount", amountJSON(message.amount())},
-            {"delegator_address", message.delegator_address()},
-            {"validator_src_address", message.validator_src_address()},
-            {"validator_dst_address", message.validator_dst_address()},
-        }}
-    };
-}
-
-static json messageWithdrawReward(const Proto::Message_WithdrawDelegationReward& message) {
-    auto typePrefix = message.type_prefix().empty() ? TYPE_PREFIX_MSG_WITHDRAW_REWARD : message.type_prefix();
-
-    return {
-        {"type", typePrefix},
-        {"value", {
-            {"delegator_address", message.delegator_address()},
-            {"validator_address", message.validator_address()}
-        }}
-    };
-}
-
-json messageWasmTerraTransfer(const Proto::Message_WasmTerraExecuteContractTransfer& msg) {
-    return {
-        {"type", TYPE_PREFIX_WASM_MSG_EXECUTE},
-        {"value",
-            {
-                {"sender", msg.sender_address()},
-                {"contract", msg.contract_address()},
-                {"execute_msg", Protobuf::wasmTerraExecuteTransferPayload(msg)},
-                {"coins", json::array()}  // used in case you are sending native tokens along with this message
-            }
-        }
-    };
-}
-
-static json messageRawJSON(const Proto::Message_RawJSON& message) {
-    return {
-        {"type", message.type()},
-        {"value", json::parse(message.value())},
-    };
-}
-
-static json messagesJSON(const Proto::SigningInput& input) {
-    json j = json::array();
-    for (auto& msg : input.messages()) {
-        if (msg.has_send_coins_message()) {
-            j.push_back(messageSend(msg.send_coins_message()));
-        } else if (msg.has_stake_message()) {
-            j.push_back(messageDelegate(msg.stake_message()));
-        } else if (msg.has_unstake_message()) {
-            j.push_back(messageUndelegate(msg.unstake_message()));
-        } else if (msg.has_withdraw_stake_reward_message()) {
-            j.push_back(messageWithdrawReward(msg.withdraw_stake_reward_message()));
-        } else if (msg.has_restake_message()) {
-            j.push_back(messageRedelegate(msg.restake_message()));
-        } else if (msg.has_raw_json_message()) {
-            j.push_back(messageRawJSON(msg.raw_json_message()));
-        } else if ((msg.has_wasm_terra_execute_contract_transfer_message())) {
-            j.push_back(messageWasmTerraTransfer(msg.wasm_terra_execute_contract_transfer_message()));
-        } else if (msg.has_transfer_tokens_message() || msg.has_wasm_terra_execute_contract_generic()) {
-            assert(false); // not supported, use protobuf serialization
-            return json::array();
-        }
-    }
-    return j;
-}
-
-json signatureJSON(const Data& signature, const Data& pubkey, TWCoinType coin) {
-    return {
-        {"pub_key", {
-            {"type", coinTypeToPrefixPublicKey(coin)},
-            {"value", Base64::encode(pubkey)}
-        }},
-        {"signature", Base64::encode(signature)}
-    };
-}
-
-json signaturePreimageJSON(const Proto::SigningInput& input) {
-    return {
-        {"account_number", std::to_string(input.account_number())},
-        {"chain_id", input.chain_id()},
-        {"fee", feeJSON(input.fee())},
-        {"memo", input.memo()},
-        {"msgs", messagesJSON(input)},
-        {"sequence", std::to_string(input.sequence())}
-    };
-}
-
-json transactionJSON(const Proto::SigningInput& input, const Data& signature, TWCoinType coin) {
-    auto privateKey = PrivateKey(input.private_key());
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    json tx = {
-        {"fee", feeJSON(input.fee())},
-        {"memo", input.memo()},
-        {"msg", messagesJSON(input)},
-        {"signatures", json::array({
-            signatureJSON(signature, Data(publicKey.bytes), coin)
-        })}
-    };
-    return broadcastJSON(tx, input.mode());
-}
-
-} // namespace TW::Cosmos
diff --git a/src/Cosmos/JsonSerialization.h b/src/Cosmos/JsonSerialization.h
deleted file mode 100644
index 72212d972f9..00000000000
--- a/src/Cosmos/JsonSerialization.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-#include "../proto/Cosmos.pb.h"
-#include <TrustWalletCore/TWCoinType.h>
-#include <nlohmann/json.hpp>
-
-extern const std::string TYPE_PREFIX_MSG_SEND;
-extern const std::string TYPE_PREFIX_MSG_TRANSFER;
-extern const std::string TYPE_PREFIX_MSG_DELEGATE;
-extern const std::string TYPE_PREFIX_MSG_UNDELEGATE;
-extern const std::string TYPE_PREFIX_MSG_REDELEGATE;
-extern const std::string TYPE_PREFIX_MSG_WITHDRAW_REWARD;
-extern const std::string TYPE_PREFIX_PUBLIC_KEY;
-
-namespace TW::Cosmos::Json {
-
-using string = std::string;
-using json = nlohmann::json;
-
-json signaturePreimageJSON(const Proto::SigningInput& input);
-json transactionJSON(const Proto::SigningInput& input, const Data& signature, TWCoinType coin);
-json signatureJSON(const Data& signature, const Data& pubkey, TWCoinType coin);
-
-} // namespace TW::Cosmos::json
diff --git a/src/Cosmos/Protobuf/.clang-tidy b/src/Cosmos/Protobuf/.clang-tidy
deleted file mode 100644
index 2c22f7387dd..00000000000
--- a/src/Cosmos/Protobuf/.clang-tidy
+++ /dev/null
@@ -1,6 +0,0 @@
----
-InheritParentConfig: false
-Checks: '-*,misc-definitions-in-headers'
-CheckOptions:
-  - { key: HeaderFileExtensions,          value: "x" }
-...
diff --git a/src/Cosmos/Protobuf/distribution_tx.proto b/src/Cosmos/Protobuf/distribution_tx.proto
deleted file mode 100644
index 1182c562140..00000000000
--- a/src/Cosmos/Protobuf/distribution_tx.proto
+++ /dev/null
@@ -1,11 +0,0 @@
-syntax = "proto3";
-package cosmos.distribution.v1beta1;
-
-// Src: https://github.com/cosmos/cosmos-sdk/blob/master/proto/cosmos/distribution/v1beta1/tx.proto
-
-// MsgWithdrawDelegatorReward represents delegation withdrawal to a delegator
-// from a single validator.
-message MsgWithdrawDelegatorReward {
-  string delegator_address = 1;
-  string validator_address = 2;
-}
diff --git a/src/Cosmos/Protobuf/thorchain_bank_tx.proto b/src/Cosmos/Protobuf/thorchain_bank_tx.proto
deleted file mode 100644
index 0e5870ab162..00000000000
--- a/src/Cosmos/Protobuf/thorchain_bank_tx.proto
+++ /dev/null
@@ -1,14 +0,0 @@
-syntax = "proto3";
-package types;
-
-// Src: https://gitlab.com/thorchain/thornode/-/blob/develop/proto/thorchain/v1/x/thorchain/types/msg_send.proto
-// Cosmos original: https://github.com/cosmos/cosmos-sdk/blob/master/proto/cosmos/bank/v1beta1/tx.proto
-
-import "coin.proto";
-
-// MsgSend represents a message to send coins from one account to another.
-message MsgSend {
-    bytes    from_address             = 1;
-    bytes    to_address               = 2;
-    repeated cosmos.base.v1beta1.Coin amount = 3;
-}
diff --git a/src/Cosmos/ProtobufSerialization.cpp b/src/Cosmos/ProtobufSerialization.cpp
deleted file mode 100644
index a59f64463c0..00000000000
--- a/src/Cosmos/ProtobufSerialization.cpp
+++ /dev/null
@@ -1,422 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "ProtobufSerialization.h"
-#include "JsonSerialization.h"
-#include "../proto/Cosmos.pb.h"
-#include "Protobuf/coin.pb.h"
-#include "Protobuf/bank_tx.pb.h"
-#include "Protobuf/cosmwasm_wasm_v1_tx.pb.h"
-#include "Protobuf/distribution_tx.pb.h"
-#include "Protobuf/staking_tx.pb.h"
-#include "Protobuf/authz_tx.pb.h"
-#include "Protobuf/tx.pb.h"
-#include "Protobuf/crypto_secp256k1_keys.pb.h"
-#include "Protobuf/ibc_applications_transfer_tx.pb.h"
-#include "Protobuf/terra_wasm_v1beta1_tx.pb.h"
-#include "Protobuf/thorchain_bank_tx.pb.h"
-#include "Protobuf/ethermint_keys.pb.h"
-
-#include "PrivateKey.h"
-#include "Data.h"
-#include "Hash.h"
-#include "Base64.h"
-#include "uint256.h"
-
-#include <google/protobuf/util/json_util.h>
-
-using namespace TW;
-
-namespace TW::Cosmos::Protobuf {
-
-using json = nlohmann::json;
-using string = std::string;
-const auto ProtobufAnyNamespacePrefix = "";  // to override default 'type.googleapis.com'
-
-cosmos::base::v1beta1::Coin convertCoin(const Proto::Amount& amount) {
-    cosmos::base::v1beta1::Coin coin;
-    coin.set_denom(amount.denom());
-    coin.set_amount(amount.amount());
-    return coin;
-}
-
-// Convert messages from external protobuf to internal protobuf
-google::protobuf::Any convertMessage(const Proto::Message& msg) {
-    google::protobuf::Any any;
-    switch (msg.message_oneof_case()) {
-        case Proto::Message::kSendCoinsMessage:
-            {
-                assert(msg.has_send_coins_message());
-                const auto& send = msg.send_coins_message();
-                auto msgSend = cosmos::bank::v1beta1::MsgSend();
-                msgSend.set_from_address(send.from_address());
-                msgSend.set_to_address(send.to_address());
-                for (auto i = 0; i < send.amounts_size(); ++i) {
-                    *msgSend.add_amount() = convertCoin(send.amounts(i));
-                }
-                any.PackFrom(msgSend, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kTransferTokensMessage:
-            {
-                assert(msg.has_transfer_tokens_message());
-                const auto& transfer = msg.transfer_tokens_message();
-                auto msgTransfer = ibc::applications::transfer::v1::MsgTransfer();
-                msgTransfer.set_source_port(transfer.source_port());
-                msgTransfer.set_source_channel(transfer.source_channel());
-                *msgTransfer.mutable_token() = convertCoin(transfer.token());
-                msgTransfer.set_sender(transfer.sender());
-                msgTransfer.set_receiver(transfer.receiver());
-                msgTransfer.mutable_timeout_height()->set_revision_number(transfer.timeout_height().revision_number());
-                msgTransfer.mutable_timeout_height()->set_revision_height(transfer.timeout_height().revision_height());
-                msgTransfer.set_timeout_timestamp(transfer.timeout_timestamp());
-                any.PackFrom(msgTransfer, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kStakeMessage:
-            {
-                assert(msg.has_stake_message());
-                const auto& stake = msg.stake_message();
-                auto msgDelegate = cosmos::staking::v1beta1::MsgDelegate();
-                msgDelegate.set_delegator_address(stake.delegator_address());
-                msgDelegate.set_validator_address(stake.validator_address());
-                *msgDelegate.mutable_amount() = convertCoin(stake.amount());
-                any.PackFrom(msgDelegate, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kUnstakeMessage:
-            {
-                assert(msg.has_unstake_message());
-                const auto& unstake = msg.unstake_message();
-                auto msgUndelegate = cosmos::staking::v1beta1::MsgUndelegate();
-                msgUndelegate.set_delegator_address(unstake.delegator_address());
-                msgUndelegate.set_validator_address(unstake.validator_address());
-                *msgUndelegate.mutable_amount() = convertCoin(unstake.amount());
-                any.PackFrom(msgUndelegate, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kRestakeMessage:
-            {
-                assert(msg.has_restake_message());
-                const auto& restake = msg.restake_message();
-                auto msgRedelegate = cosmos::staking::v1beta1::MsgBeginRedelegate();
-                msgRedelegate.set_delegator_address(restake.delegator_address());
-                msgRedelegate.set_validator_src_address(restake.validator_src_address());
-                msgRedelegate.set_validator_dst_address(restake.validator_dst_address());
-                *msgRedelegate.mutable_amount() = convertCoin(restake.amount());
-                any.PackFrom(msgRedelegate, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kWithdrawStakeRewardMessage:
-            {
-                assert(msg.has_withdraw_stake_reward_message());
-                const auto& withdraw = msg.withdraw_stake_reward_message();
-                auto msgWithdraw = cosmos::distribution::v1beta1::MsgWithdrawDelegatorReward();
-                msgWithdraw.set_delegator_address(withdraw.delegator_address());
-                msgWithdraw.set_validator_address(withdraw.validator_address());
-                any.PackFrom(msgWithdraw, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kWasmTerraExecuteContractTransferMessage:
-            {
-                assert(msg.has_wasm_terra_execute_contract_transfer_message());
-                const auto& wasmExecute = msg.wasm_terra_execute_contract_transfer_message();
-                auto msgExecute = terra::wasm::v1beta1::MsgExecuteContract();
-                msgExecute.set_sender(wasmExecute.sender_address());
-                msgExecute.set_contract(wasmExecute.contract_address());
-                const std::string payload = wasmTerraExecuteTransferPayload(wasmExecute).dump();
-                msgExecute.set_execute_msg(payload);
-                any.PackFrom(msgExecute, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kWasmTerraExecuteContractSendMessage:
-            {
-                assert(msg.has_wasm_terra_execute_contract_send_message());
-                const auto& wasmExecute = msg.wasm_terra_execute_contract_send_message();
-                auto msgExecute = terra::wasm::v1beta1::MsgExecuteContract();
-                msgExecute.set_sender(wasmExecute.sender_address());
-                msgExecute.set_contract(wasmExecute.contract_address());
-                const std::string payload = wasmTerraExecuteSendPayload(wasmExecute).dump();
-                msgExecute.set_execute_msg(payload);
-                any.PackFrom(msgExecute, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kThorchainSendMessage:
-            {
-                assert(msg.has_thorchain_send_message());
-                const auto& send = msg.thorchain_send_message();
-                auto msgSend =types::MsgSend();
-                msgSend.set_from_address(send.from_address());
-                msgSend.set_to_address(send.to_address());
-                for (auto i = 0; i < send.amounts_size(); ++i) {
-                    *msgSend.add_amount() = convertCoin(send.amounts(i));
-                }
-                any.PackFrom(msgSend, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kWasmTerraExecuteContractGeneric: {
-            assert(msg.has_wasm_terra_execute_contract_generic());
-                const auto& wasmExecute = msg.wasm_terra_execute_contract_generic();
-                auto msgExecute = terra::wasm::v1beta1::MsgExecuteContract();
-                msgExecute.set_sender(wasmExecute.sender_address());
-                msgExecute.set_contract(wasmExecute.contract_address());
-                msgExecute.set_execute_msg(wasmExecute.execute_msg());
-
-                for (auto i = 0; i < wasmExecute.coins_size(); ++i) {
-                    *msgExecute.add_coins() = convertCoin(wasmExecute.coins(i));
-                }
-                any.PackFrom(msgExecute, ProtobufAnyNamespacePrefix);
-                return any;
-        }
-
-        case Proto::Message::kWasmExecuteContractTransferMessage:
-            {
-                assert(msg.has_wasm_execute_contract_transfer_message());
-                const auto& wasmExecute = msg.wasm_execute_contract_transfer_message();
-                auto msgExecute = cosmwasm::wasm::v1::MsgExecuteContract();
-                msgExecute.set_sender(wasmExecute.sender_address());
-                msgExecute.set_contract(wasmExecute.contract_address());
-                const std::string payload = wasmExecuteTransferPayload(wasmExecute).dump();
-                msgExecute.set_msg(payload);
-                any.PackFrom(msgExecute, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kWasmExecuteContractSendMessage:
-            {
-                assert(msg.has_wasm_execute_contract_send_message());
-                const auto& wasmExecute = msg.wasm_execute_contract_send_message();
-                auto msgExecute = cosmwasm::wasm::v1::MsgExecuteContract();
-                msgExecute.set_sender(wasmExecute.sender_address());
-                msgExecute.set_contract(wasmExecute.contract_address());
-                const std::string payload = wasmExecuteSendPayload(wasmExecute).dump();
-                msgExecute.set_msg(payload);
-                any.PackFrom(msgExecute, ProtobufAnyNamespacePrefix);
-                return any;
-            }
-
-        case Proto::Message::kWasmExecuteContractGeneric: {
-                assert(msg.has_wasm_execute_contract_generic());
-                const auto& wasmExecute = msg.wasm_execute_contract_generic();
-                auto msgExecute = cosmwasm::wasm::v1::MsgExecuteContract();
-                msgExecute.set_sender(wasmExecute.sender_address());
-                msgExecute.set_contract(wasmExecute.contract_address());
-                msgExecute.set_msg(wasmExecute.execute_msg());
-
-                for (auto i = 0; i < wasmExecute.coins_size(); ++i) {
-                    *msgExecute.add_funds() = convertCoin(wasmExecute.coins(i));
-                }
-                any.PackFrom(msgExecute, ProtobufAnyNamespacePrefix);
-                return any;
-        }
-
-        case Proto::Message::kAuthGrant: {
-                assert(msg.has_auth_grant());
-                const auto& authGrant = msg.auth_grant();
-                auto msgAuthGrant = cosmos::authz::v1beta1::MsgGrant();
-                msgAuthGrant.set_grantee(authGrant.grantee());
-                msgAuthGrant.set_granter(authGrant.granter());
-                auto* mtAuth = msgAuthGrant.mutable_grant()->mutable_authorization();
-                // There is multiple grant possibilities, but we add support staking/compounding only for now.
-                switch (authGrant.grant_type_case()) {
-                case Proto::Message_AuthGrant::kGrantStake:
-                    mtAuth->PackFrom(authGrant.grant_stake(), ProtobufAnyNamespacePrefix);
-                    mtAuth->set_type_url("/cosmos.staking.v1beta1.StakeAuthorization");
-                    break;
-                case Proto::Message_AuthGrant::GRANT_TYPE_NOT_SET:
-                    break;
-                }
-                auto* mtExp = msgAuthGrant.mutable_grant()->mutable_expiration();
-                mtExp->set_seconds(authGrant.expiration());
-                any.PackFrom(msgAuthGrant, ProtobufAnyNamespacePrefix);
-                return any;
-        }
-
-        case Proto::Message::kAuthRevoke: {
-            assert(msg.has_auth_revoke());
-            const auto& authRevoke = msg.auth_revoke();
-            auto msgAuthRevoke = cosmos::authz::v1beta1::MsgRevoke();
-            msgAuthRevoke.set_granter(authRevoke.granter());
-            msgAuthRevoke.set_grantee(authRevoke.grantee());
-            msgAuthRevoke.set_msg_type_url(authRevoke.msg_type_url());
-            any.PackFrom(msgAuthRevoke, ProtobufAnyNamespacePrefix);
-            return any;
-        }
-
-        default:
-            throw std::invalid_argument(std::string("Message not supported ") + std::to_string(msg.message_oneof_case()));
-    }
-}
-
-std::string buildProtoTxBody(const Proto::SigningInput& input) {
-    if (input.messages_size() >= 1 && input.messages(0).has_sign_direct_message()) {
-        return input.messages(0).sign_direct_message().body_bytes();
-    }
-
-    if (input.messages_size() < 1) {
-        throw std::invalid_argument("No message found");
-    }
-    assert(input.messages_size() >= 1);
-    auto txBody = cosmos::TxBody();
-    for (auto i = 0; i < input.messages_size(); ++i) {
-        const auto msgAny = convertMessage(input.messages(i));
-        *txBody.add_messages() = msgAny;
-    }
-    txBody.set_memo(input.memo());
-    txBody.set_timeout_height(0);
-
-    return txBody.SerializeAsString();
-}
-
-std::string buildAuthInfo(const Proto::SigningInput& input, TWCoinType coin) {
-    if (input.messages_size() >= 1 && input.messages(0).has_sign_direct_message()) {
-        return input.messages(0).sign_direct_message().auth_info_bytes();
-    }
-
-    // AuthInfo
-    const auto privateKey = PrivateKey(input.private_key());
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto authInfo = cosmos::AuthInfo();
-    auto* signerInfo = authInfo.add_signer_infos();
-
-    signerInfo->mutable_mode_info()->mutable_single()->set_mode(cosmos::signing::v1beta1::SIGN_MODE_DIRECT);
-    signerInfo->set_sequence(input.sequence());
-    switch(coin) {
-        case TWCoinTypeNativeEvmos: {
-            auto pubKey = ethermint::crypto::v1::ethsecp256k1::PubKey();
-            pubKey.set_key(publicKey.bytes.data(), publicKey.bytes.size());
-            signerInfo->mutable_public_key()->PackFrom(pubKey, ProtobufAnyNamespacePrefix);
-            break;
-        }
-        default: {
-            auto pubKey = cosmos::crypto::secp256k1::PubKey();
-            pubKey.set_key(publicKey.bytes.data(), publicKey.bytes.size());
-            signerInfo->mutable_public_key()->PackFrom(pubKey, ProtobufAnyNamespacePrefix);
-        }
-    }
-
-    auto* fee = authInfo.mutable_fee();
-    for (auto i = 0; i < input.fee().amounts_size(); ++i) {
-        *fee->add_amount() = convertCoin(input.fee().amounts(i));
-    }
-
-    fee->set_gas_limit(input.fee().gas());
-    fee->set_payer("");
-    fee->set_granter("");
-    // tip is omitted
-    return authInfo.SerializeAsString();
-}
-
-Data buildSignature(const Proto::SigningInput& input, const std::string& serializedTxBody, const std::string& serializedAuthInfo, TWCoinType coin) {
-    // SignDoc Preimage
-    auto signDoc = cosmos::SignDoc();
-    signDoc.set_body_bytes(serializedTxBody);
-    signDoc.set_auth_info_bytes(serializedAuthInfo);
-    signDoc.set_chain_id(input.chain_id());
-    signDoc.set_account_number(input.account_number());
-    const auto serializedSignDoc = signDoc.SerializeAsString();
-
-    Data hashToSign;
-    switch(coin) {
-        case TWCoinTypeNativeEvmos: {
-            hashToSign = Hash::keccak256(serializedSignDoc);
-            break;
-        }
-        default: {
-            hashToSign = Hash::sha256(serializedSignDoc);
-        }
-    }
-
-    const auto privateKey = PrivateKey(input.private_key());
-    auto signedHash = privateKey.sign(hashToSign, TWCurveSECP256k1);
-    auto signature = Data(signedHash.begin(), signedHash.end() - 1);
-    return signature;
-}
-
-std::string buildProtoTxRaw(const std::string& serializedTxBody, const std::string& serializedAuthInfo, const Data& signature) {
-    auto txRaw = cosmos::TxRaw();
-    txRaw.set_body_bytes(serializedTxBody);
-    txRaw.set_auth_info_bytes(serializedAuthInfo);
-    *txRaw.add_signatures() = std::string(signature.begin(), signature.end());
-    return txRaw.SerializeAsString();
-}
-
-static string broadcastMode(Proto::BroadcastMode mode) {
-    switch (mode) {
-    case Proto::BroadcastMode::BLOCK:
-        return "BROADCAST_MODE_BLOCK";
-    case Proto::BroadcastMode::ASYNC:
-        return "BROADCAST_MODE_ASYNC";
-    case Proto::BroadcastMode::SYNC:
-    default: return "BROADCAST_MODE_SYNC";
-    }
-}
-
-std::string buildProtoTxJson(const Proto::SigningInput& input, const std::string& serializedTx) {
-    const string serializedBase64 = Base64::encode(TW::data(serializedTx));
-    const json jsonSerialized = {
-        {"tx_bytes", serializedBase64},
-        {"mode", broadcastMode(input.mode())}
-    };
-    return jsonSerialized.dump();
-}
-
-json wasmExecuteTransferPayload(const Proto::Message_WasmExecuteContractTransfer& msg) {
-    return {
-        {"transfer",
-            {
-                {"amount", toString(load(data(msg.amount())))},
-                {"recipient", msg.recipient_address()}
-            }
-        }
-    };
-}
-
-json wasmExecuteSendPayload(const Proto::Message_WasmExecuteContractSend& msg) {
-    return {
-        {"send",
-            {
-                {"amount", toString(load(data(msg.amount())))},
-                {"contract", msg.recipient_contract_address()},
-                {"msg", msg.msg()}
-            }
-        }
-    };
-}
-
-json wasmTerraExecuteTransferPayload(const Proto::Message_WasmTerraExecuteContractTransfer& msg) {
-    return {
-        {"transfer",
-            {
-                {"amount", toString(load(data(msg.amount())))},
-                {"recipient", msg.recipient_address()}
-            }
-        }
-    };
-}
-
-json wasmTerraExecuteSendPayload(const Proto::Message_WasmTerraExecuteContractSend& msg) {
-    return {
-        {"send",
-            {
-                {"amount", toString(load(data(msg.amount())))},
-                {"contract", msg.recipient_contract_address()},
-                {"msg", msg.msg()}
-            }
-        }
-    };
-}
-
-} // namespace
diff --git a/src/Cosmos/ProtobufSerialization.h b/src/Cosmos/ProtobufSerialization.h
deleted file mode 100644
index 035bb7f2c7e..00000000000
--- a/src/Cosmos/ProtobufSerialization.h
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-#include "../proto/Cosmos.pb.h"
-
-#include <nlohmann/json.hpp>
-#include <string>
-
-#include <TrustWalletCore/TWCoinType.h>
-
-namespace TW::Cosmos::Protobuf {
-
-std::string buildProtoTxBody(const Proto::SigningInput& input);
-
-std::string buildAuthInfo(const Proto::SigningInput& input, TWCoinType coin);
-
-Data buildSignature(const Proto::SigningInput& input, const std::string& serializedTxBody, const std::string& serializedAuthInfo, TWCoinType coin);
-
-std::string buildProtoTxRaw(const std::string& serializedTxBody, const std::string& serializedAuthInfo, const Data& signature);
-
-std::string buildProtoTxJson(const Proto::SigningInput& input, const std::string& serializedTx);
-
-nlohmann::json wasmExecuteTransferPayload(const Proto::Message_WasmExecuteContractTransfer& msg);
-
-nlohmann::json wasmExecuteSendPayload(const Proto::Message_WasmExecuteContractSend& msg);
-
-nlohmann::json wasmTerraExecuteTransferPayload(const Proto::Message_WasmTerraExecuteContractTransfer& msg);
-
-nlohmann::json wasmTerraExecuteSendPayload(const Proto::Message_WasmTerraExecuteContractSend& msg);
-
-} // namespace TW::Cosmos::protobuf
diff --git a/src/Cosmos/Signer.cpp b/src/Cosmos/Signer.cpp
deleted file mode 100644
index b8b538ad8f5..00000000000
--- a/src/Cosmos/Signer.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Signer.h"
-#include "JsonSerialization.h"
-#include "ProtobufSerialization.h"
-
-#include "PrivateKey.h"
-#include "Data.h"
-#include <google/protobuf/util/json_util.h>
-
-namespace TW::Cosmos {
-
-Proto::SigningOutput Signer::sign(const Proto::SigningInput& input, TWCoinType coin) noexcept {
-    switch (input.signing_mode()) {
-    case Proto::JSON:
-        return signJsonSerialized(input, coin);
-
-    case Proto::Protobuf:
-    default:
-        return signProtobuf(input, coin);
-    }
-}
-
-Proto::SigningOutput Signer::signJsonSerialized(const Proto::SigningInput& input, TWCoinType coin) noexcept {
-    auto key = PrivateKey(input.private_key());
-    auto preimage = Json::signaturePreimageJSON(input).dump();
-    auto hash = Hash::sha256(preimage);
-    auto signedHash = key.sign(hash, TWCurveSECP256k1);
-
-    auto output = Proto::SigningOutput();
-    auto signature = Data(signedHash.begin(), signedHash.end() - 1);
-    auto txJson = Json::transactionJSON(input, signature, coin);
-    output.set_json(txJson.dump());
-    output.set_signature(signature.data(), signature.size());
-    output.set_serialized("");
-    output.set_error("");
-    output.set_signature_json(txJson["tx"]["signatures"].dump());
-    return output;
-}
-
-Proto::SigningOutput Signer::signProtobuf(const Proto::SigningInput& input, TWCoinType coin) noexcept {
-    using namespace Protobuf;
-    using namespace Json;
-    try {
-        const auto serializedTxBody = buildProtoTxBody(input);
-        const auto serializedAuthInfo = buildAuthInfo(input, coin);
-        const auto signature = buildSignature(input, serializedTxBody, serializedAuthInfo, coin);
-        auto serializedTxRaw = buildProtoTxRaw(serializedTxBody, serializedAuthInfo, signature);
-
-        auto output = Proto::SigningOutput();
-        const std::string jsonSerialized = buildProtoTxJson(input, serializedTxRaw);
-        auto publicKey = PrivateKey(input.private_key()).getPublicKey(TWPublicKeyTypeSECP256k1);
-        auto signatures = nlohmann::json::array({signatureJSON(signature, publicKey.bytes, coin)});
-        output.set_serialized(jsonSerialized);
-        output.set_signature(signature.data(), signature.size());
-        output.set_json("");
-        output.set_error("");
-        output.set_signature_json(signatures.dump());
-        return output;
-    } catch (const std::exception& ex) {
-        auto output = Proto::SigningOutput();
-        output.set_error(std::string("Error: ") + ex.what());
-        return output;
-    }
-}
-
-std::string Signer::signJSON(const std::string& json, const Data& key, TWCoinType coin) {
-    auto input = Proto::SigningInput();
-    google::protobuf::util::JsonStringToMessage(json, &input);
-    input.set_private_key(key.data(), key.size());
-    auto output = Signer::sign(input, coin);
-    return output.json();
-}
-
-} // namespace TW::Cosmos
diff --git a/src/Cosmos/Signer.h b/src/Cosmos/Signer.h
deleted file mode 100644
index 4a3407021e7..00000000000
--- a/src/Cosmos/Signer.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-#include "../proto/Cosmos.pb.h"
-
-#include <TrustWalletCore/TWCoinType.h>
-
-namespace TW::Cosmos {
-
-/// Helper class that performs Cosmos transaction signing.
-class Signer {
-  public:
-    /// Signs a Proto::SigningInput transaction
-    static Proto::SigningOutput sign(const Proto::SigningInput& input, TWCoinType coin) noexcept;
-
-    /// Signs a Proto::SigningInput transaction, using Json serialization
-    static Proto::SigningOutput signJsonSerialized(const Proto::SigningInput& input, TWCoinType coin) noexcept;
-
-    /// Signs a Proto::SigningInput transaction, using binary Protobuf serialization
-    static Proto::SigningOutput signProtobuf(const Proto::SigningInput& input, TWCoinType coin) noexcept;
-
-    /// Signs a json Proto::SigningInput with private key
-    static std::string signJSON(const std::string& json, const Data& key, TWCoinType coin);
-};
-
-} // namespace TW::Cosmos
diff --git a/src/Crc.cpp b/src/Crc.cpp
index 37f4ea8ad6c..38fc2c84d9c 100644
--- a/src/Crc.cpp
+++ b/src/Crc.cpp
@@ -1,13 +1,10 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Crc.h"
 
-#include <boost/crc.hpp>  // for boost::crc_32_type
-
+#include <limits>
 #include <string>
 
 using namespace TW;
@@ -32,17 +29,12 @@ uint16_t Crc::crc16(uint8_t* bytes, uint32_t length) {
     return crc & 0xffff;
 }
 
-uint32_t Crc::crc32(const Data& data)
-{
-    boost::crc_32_type result;
-    result.process_bytes((const void*)data.data(), data.size());
-    return (uint32_t)result.checksum();
-}
-
-uint32_t Crc::crc32C(const Data& data)
-{
-    using crc_32c_type = boost::crc_optimal<32, 0x1EDC6F41, 0xFFFFFFFF, 0xFFFFFFFF, true, true>;
-    crc_32c_type result;
-    result.process_bytes((const void*)data.data(), data.size());
-    return (uint32_t)result.checksum();
+// Algorithm inspired by this old-style C implementation:
+// https://web.mit.edu/freebsd/head/sys/libkern/crc32.c (Public Domain code)
+uint32_t Crc::crc32(const Data& data) {
+    uint32_t c = std::numeric_limits<uint32_t>::max();
+    for (const auto byte : data) {
+        c = crc32_table[(c ^ byte) & 0xFF] ^ (c >> 8);
+    }
+    return ~c;
 }
diff --git a/src/Crc.h b/src/Crc.h
index 88bb3b28854..5268f186d13 100644
--- a/src/Crc.h
+++ b/src/Crc.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -17,6 +15,50 @@ uint16_t crc16(uint8_t* bytes, uint32_t length);
 
 uint32_t crc32(const TW::Data& data);
 
-uint32_t crc32C(const TW::Data& data);
-
+// Table taken from https://web.mit.edu/freebsd/head/sys/libkern/crc32.c (Public Domain code)
+// This table is used to speed up the crc calculation.
+static constexpr uint32_t crc32_table[] = {
+    0x00000000, 0x77073096, 0xee0e612c, 0x990951ba, 0x076dc419, 0x706af48f,
+    0xe963a535, 0x9e6495a3, 0x0edb8832, 0x79dcb8a4, 0xe0d5e91e, 0x97d2d988,
+    0x09b64c2b, 0x7eb17cbd, 0xe7b82d07, 0x90bf1d91, 0x1db71064, 0x6ab020f2,
+    0xf3b97148, 0x84be41de, 0x1adad47d, 0x6ddde4eb, 0xf4d4b551, 0x83d385c7,
+    0x136c9856, 0x646ba8c0, 0xfd62f97a, 0x8a65c9ec, 0x14015c4f, 0x63066cd9,
+    0xfa0f3d63, 0x8d080df5, 0x3b6e20c8, 0x4c69105e, 0xd56041e4, 0xa2677172,
+    0x3c03e4d1, 0x4b04d447, 0xd20d85fd, 0xa50ab56b, 0x35b5a8fa, 0x42b2986c,
+    0xdbbbc9d6, 0xacbcf940, 0x32d86ce3, 0x45df5c75, 0xdcd60dcf, 0xabd13d59,
+    0x26d930ac, 0x51de003a, 0xc8d75180, 0xbfd06116, 0x21b4f4b5, 0x56b3c423,
+    0xcfba9599, 0xb8bda50f, 0x2802b89e, 0x5f058808, 0xc60cd9b2, 0xb10be924,
+    0x2f6f7c87, 0x58684c11, 0xc1611dab, 0xb6662d3d, 0x76dc4190, 0x01db7106,
+    0x98d220bc, 0xefd5102a, 0x71b18589, 0x06b6b51f, 0x9fbfe4a5, 0xe8b8d433,
+    0x7807c9a2, 0x0f00f934, 0x9609a88e, 0xe10e9818, 0x7f6a0dbb, 0x086d3d2d,
+    0x91646c97, 0xe6635c01, 0x6b6b51f4, 0x1c6c6162, 0x856530d8, 0xf262004e,
+    0x6c0695ed, 0x1b01a57b, 0x8208f4c1, 0xf50fc457, 0x65b0d9c6, 0x12b7e950,
+    0x8bbeb8ea, 0xfcb9887c, 0x62dd1ddf, 0x15da2d49, 0x8cd37cf3, 0xfbd44c65,
+    0x4db26158, 0x3ab551ce, 0xa3bc0074, 0xd4bb30e2, 0x4adfa541, 0x3dd895d7,
+    0xa4d1c46d, 0xd3d6f4fb, 0x4369e96a, 0x346ed9fc, 0xad678846, 0xda60b8d0,
+    0x44042d73, 0x33031de5, 0xaa0a4c5f, 0xdd0d7cc9, 0x5005713c, 0x270241aa,
+    0xbe0b1010, 0xc90c2086, 0x5768b525, 0x206f85b3, 0xb966d409, 0xce61e49f,
+    0x5edef90e, 0x29d9c998, 0xb0d09822, 0xc7d7a8b4, 0x59b33d17, 0x2eb40d81,
+    0xb7bd5c3b, 0xc0ba6cad, 0xedb88320, 0x9abfb3b6, 0x03b6e20c, 0x74b1d29a,
+    0xead54739, 0x9dd277af, 0x04db2615, 0x73dc1683, 0xe3630b12, 0x94643b84,
+    0x0d6d6a3e, 0x7a6a5aa8, 0xe40ecf0b, 0x9309ff9d, 0x0a00ae27, 0x7d079eb1,
+    0xf00f9344, 0x8708a3d2, 0x1e01f268, 0x6906c2fe, 0xf762575d, 0x806567cb,
+    0x196c3671, 0x6e6b06e7, 0xfed41b76, 0x89d32be0, 0x10da7a5a, 0x67dd4acc,
+    0xf9b9df6f, 0x8ebeeff9, 0x17b7be43, 0x60b08ed5, 0xd6d6a3e8, 0xa1d1937e,
+    0x38d8c2c4, 0x4fdff252, 0xd1bb67f1, 0xa6bc5767, 0x3fb506dd, 0x48b2364b,
+    0xd80d2bda, 0xaf0a1b4c, 0x36034af6, 0x41047a60, 0xdf60efc3, 0xa867df55,
+    0x316e8eef, 0x4669be79, 0xcb61b38c, 0xbc66831a, 0x256fd2a0, 0x5268e236,
+    0xcc0c7795, 0xbb0b4703, 0x220216b9, 0x5505262f, 0xc5ba3bbe, 0xb2bd0b28,
+    0x2bb45a92, 0x5cb36a04, 0xc2d7ffa7, 0xb5d0cf31, 0x2cd99e8b, 0x5bdeae1d,
+    0x9b64c2b0, 0xec63f226, 0x756aa39c, 0x026d930a, 0x9c0906a9, 0xeb0e363f,
+    0x72076785, 0x05005713, 0x95bf4a82, 0xe2b87a14, 0x7bb12bae, 0x0cb61b38,
+    0x92d28e9b, 0xe5d5be0d, 0x7cdcefb7, 0x0bdbdf21, 0x86d3d2d4, 0xf1d4e242,
+    0x68ddb3f8, 0x1fda836e, 0x81be16cd, 0xf6b9265b, 0x6fb077e1, 0x18b74777,
+    0x88085ae6, 0xff0f6a70, 0x66063bca, 0x11010b5c, 0x8f659eff, 0xf862ae69,
+    0x616bffd3, 0x166ccf45, 0xa00ae278, 0xd70dd2ee, 0x4e048354, 0x3903b3c2,
+    0xa7672661, 0xd06016f7, 0x4969474d, 0x3e6e77db, 0xaed16a4a, 0xd9d65adc,
+    0x40df0b66, 0x37d83bf0, 0xa9bcae53, 0xdebb9ec5, 0x47b2cf7f, 0x30b5ffe9,
+    0xbdbdf21c, 0xcabac28a, 0x53b39330, 0x24b4a3a6, 0xbad03605, 0xcdd70693,
+    0x54de5729, 0x23d967bf, 0xb3667a2e, 0xc4614ab8, 0x5d681b02, 0x2a6f2b94,
+    0xb40bbe37, 0xc30c8ea1, 0x5a05df1b, 0x2d02ef8d};
 } // namespace TW::Crc
diff --git a/src/CryptoBox.cpp b/src/CryptoBox.cpp
new file mode 100644
index 00000000000..f0d5218559f
--- /dev/null
+++ b/src/CryptoBox.cpp
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "CryptoBox.h"
+
+namespace TW::CryptoBox {
+
+bool PublicKey::isValid(const Data& bytes) {
+    Rust::TWDataWrapper data = bytes;
+    return Rust::tw_crypto_box_public_key_is_valid(data.get());
+}
+
+std::optional<PublicKey> PublicKey::fromBytes(const Data& bytes) {
+    Rust::TWDataWrapper data = bytes;
+    if (!Rust::tw_crypto_box_public_key_is_valid(data.get())) {
+        return std::nullopt;
+    }
+    auto* publicKey = Rust::tw_crypto_box_public_key_create_with_data(data.get());
+    return PublicKey(PublicKeyPtr(publicKey, Rust::tw_crypto_box_public_key_delete));
+}
+
+Data PublicKey::getData() const {
+    Rust::TWDataWrapper data = Rust::tw_crypto_box_public_key_data(impl.get());
+    return data.toDataOrDefault();
+}
+
+SecretKey::SecretKey() {
+    auto* secretKey = Rust::tw_crypto_box_secret_key_create();
+    impl = SecretKeyPtr(secretKey, Rust::tw_crypto_box_secret_key_delete);
+}
+
+bool SecretKey::isValid(const Data& bytes) {
+    Rust::TWDataWrapper data = bytes;
+    return Rust::tw_crypto_box_secret_key_is_valid(data.get());
+}
+
+std::optional<SecretKey> SecretKey::fromBytes(const Data& bytes) {
+    Rust::TWDataWrapper data = bytes;
+    if (!Rust::tw_crypto_box_secret_key_is_valid(data.get())) {
+        return std::nullopt;
+    }
+    auto* secretKey = Rust::tw_crypto_box_secret_key_create_with_data(data.get());
+    return SecretKey(SecretKeyPtr(secretKey, Rust::tw_crypto_box_secret_key_delete));
+}
+
+PublicKey SecretKey::getPublicKey() const noexcept {
+    auto* publicKey = Rust::tw_crypto_box_secret_key_get_public_key(impl.get());
+    return PublicKey(PublicKeyPtr(publicKey, Rust::tw_crypto_box_public_key_delete));
+}
+
+Data SecretKey::getData() const {
+    Rust::TWDataWrapper data = Rust::tw_crypto_box_secret_key_data(impl.get());
+    return data.toDataOrDefault();
+}
+
+Data encryptEasy(const SecretKey& mySecret, const PublicKey& otherPubkey, const Data& message) {
+    Rust::TWDataWrapper messageData = message;
+    Rust::TWDataWrapper encrypted = Rust::tw_crypto_box_encrypt_easy(mySecret.impl.get(), otherPubkey.impl.get(), messageData.get());
+    return encrypted.toDataOrDefault();
+}
+
+std::optional<Data> decryptEasy(const SecretKey& mySecret, const PublicKey& otherPubkey, const Data& encrypted) {
+    Rust::TWDataWrapper encryptedData = encrypted;
+    Rust::TWDataWrapper decryptedData = Rust::tw_crypto_box_decrypt_easy(mySecret.impl.get(), otherPubkey.impl.get(), encryptedData.get());
+    if (!decryptedData.ptr) {
+        return std::nullopt;
+    }
+    return decryptedData.toDataOrDefault();
+}
+
+} // namespace TW::CryptoBox
\ No newline at end of file
diff --git a/src/CryptoBox.h b/src/CryptoBox.h
new file mode 100644
index 00000000000..ce00f9c2404
--- /dev/null
+++ b/src/CryptoBox.h
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/Wrapper.h"
+
+namespace TW::CryptoBox {
+
+using PublicKeyPtr = std::shared_ptr<Rust::TWCryptoBoxPublicKey>;
+using SecretKeyPtr = std::shared_ptr<Rust::TWCryptoBoxSecretKey>;
+
+/// Public key used in `crypto_box` cryptography.
+struct PublicKey {
+    explicit PublicKey(PublicKeyPtr ptr): impl(std::move(ptr)) {
+    }
+
+    /// Determines if the given public key is valid or not.
+    static bool isValid(const Data& bytes);
+
+    /// Create a `crypto_box` public key with the given block of data.
+    static std::optional<PublicKey> fromBytes(const Data& bytes);
+
+    /// Returns the raw data of the given public-key.
+    Data getData() const;
+
+    PublicKeyPtr impl;
+};
+
+/// Secret key used in `crypto_box` cryptography.
+class SecretKey {
+public:
+    /// Create a random secret key.
+    SecretKey();
+
+    explicit SecretKey(SecretKeyPtr ptr): impl(std::move(ptr)) {
+    }
+
+    /// Determines if the given secret key is valid or not.
+    static bool isValid(const Data& bytes);
+
+    /// Create a `crypto_box` secret key with the given block of data.
+    static std::optional<SecretKey> fromBytes(const Data& bytes);
+
+    /// Returns the public key associated with the given `key`.
+    PublicKey getPublicKey() const noexcept;
+
+    /// Returns the raw data of the given secret-key.
+    Data getData() const;
+
+    SecretKeyPtr impl;
+};
+
+/// Encrypts message using `my_secret` and `other_pubkey`.
+/// The output will have a randomly generated nonce prepended to it.
+/// The output will be Overhead + 24 bytes longer than the original.
+Data encryptEasy(const SecretKey& mySecret, const PublicKey& otherPubkey, const Data& message);
+
+/// Decrypts box produced by `TWCryptoBoxEncryptEasy`.
+/// We assume a 24-byte nonce is prepended to the encrypted text in box.
+std::optional<Data> decryptEasy(const SecretKey& mySecret, const PublicKey& otherPubkey, const Data& encrypted);
+
+} // namespace TW::CryptoBox
+
+/// Wrapper for C interface.
+struct TWCryptoBoxSecretKey {
+    TW::CryptoBox::SecretKey impl;
+};
+
+/// Wrapper for C interface.
+struct TWCryptoBoxPublicKey {
+    TW::CryptoBox::PublicKey impl;
+};
diff --git a/src/Data.cpp b/src/Data.cpp
index 8eea5816ce5..67b2427b6b8 100644
--- a/src/Data.cpp
+++ b/src/Data.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Data.h"
 
diff --git a/src/Data.h b/src/Data.h
index 1c43fdc68b0..7fe4a5112db 100644
--- a/src/Data.h
+++ b/src/Data.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -16,10 +14,28 @@ namespace TW {
 using byte = std::uint8_t;
 using Data = std::vector<byte>;
 
+typedef std::vector<std::pair<Data, Data>> HashPubkeyList;
+typedef std::vector<std::pair<Data, Data>> SignaturePubkeyList;
+
 inline void pad_left(Data& data, const uint32_t size) {
     data.insert(data.begin(), size - data.size(), 0);
 }
 
+template<typename It>
+inline Data data(It&& begin, It&& end) {
+    return Data(begin, end);
+}
+
+template<typename Collection>
+inline Data data_from(const Collection& collection) {
+    Data out;
+    out.reserve(collection.size());
+    for (auto&& cur : collection) {
+        out.emplace_back(uint8_t(cur));
+    }
+    return out;
+}
+
 inline Data data(const std::string& data) {
     return Data(data.begin(), data.end());
 }
@@ -32,6 +48,12 @@ inline void append(Data& data, const Data& suffix) {
     data.insert(data.end(), suffix.begin(), suffix.end());
 }
 
+inline Data concat(const Data& data, const Data& suffix) {
+    Data out = data;
+    append(out, suffix);
+    return out;
+}
+
 inline void append(Data& data, const byte suffix) {
     data.push_back(suffix);
 }
@@ -48,4 +70,14 @@ inline bool has_prefix(const Data& data, T& prefix) {
     return std::equal(prefix.begin(), prefix.end(), data.begin(), data.begin() + std::min(data.size(), prefix.size()));
 }
 
+// Custom hash function for `Data` type.
+struct DataHash {
+    std::size_t operator()(const Data& data) const {
+        // Create a string_view from the vector's data.
+        std::string_view ss(reinterpret_cast<const char*>(data.data()), data.size());
+        // Use the hash function for std::string_view
+        return std::hash<std::string_view>{}(ss);
+    }
+};
+
 } // namespace TW
diff --git a/src/DataVector.h b/src/DataVector.h
new file mode 100644
index 00000000000..3e3a071807a
--- /dev/null
+++ b/src/DataVector.h
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "TrustWalletCore/TWDataVector.h"
+#include "Data.h"
+
+namespace TW {
+
+static std::vector<Data> createFromTWDataVector(const struct TWDataVector* _Nonnull dataVector) {
+    std::vector<Data> ret;
+    const auto n = TWDataVectorSize(dataVector);
+    for (auto i = 0uL; i < n; ++i) {
+        const auto* const elem = TWDataVectorGet(dataVector, i);
+        if (const auto* const data = reinterpret_cast<const Data *>(elem); data) {
+            ret.emplace_back(*data);
+            TWDataDelete(elem);
+        }
+    }
+    return ret;
+}
+
+} // namespace TW
diff --git a/src/Decred/Address.cpp b/src/Decred/Address.cpp
index cd3685f9463..b330145ca69 100644
--- a/src/Decred/Address.cpp
+++ b/src/Decred/Address.cpp
@@ -1,13 +1,12 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
 #include "../Base58.h"
 #include "../Coin.h"
+#include "../Hash.h"
 
 #include <stdexcept>
 
@@ -17,7 +16,7 @@ static const auto keyhashSize = Hash::ripemdSize;
 static const auto addressDataSize = keyhashSize + 2;
 
 bool Address::isValid(const std::string& string) noexcept {
-    const auto data = Base58::bitcoin.decodeCheck(string, Hash::HasherBlake256d);
+    const auto data = Base58::decodeCheck(string, Rust::Base58Alphabet::Bitcoin, Hash::HasherBlake256d);
     if (data.size() != addressDataSize) {
         return false;
     }
@@ -30,7 +29,7 @@ bool Address::isValid(const std::string& string) noexcept {
 }
 
 Address::Address(const std::string& string) {
-    const auto data = Base58::bitcoin.decodeCheck(string, Hash::HasherBlake256d);
+    const auto data = Base58::decodeCheck(string, Rust::Base58Alphabet::Bitcoin, Hash::HasherBlake256d);
     if (data.size() != addressDataSize) {
         throw std::invalid_argument("Invalid address string");
     }
@@ -40,7 +39,7 @@ Address::Address(const std::string& string) {
 
 Address::Address(const PublicKey& publicKey) {
     if (publicKey.type != TWPublicKeyTypeSECP256k1) {
-        throw std::invalid_argument("Invalid publid key type");
+        throw std::invalid_argument("Invalid public key type");
     }
     const auto hash = Hash::ripemd(Hash::blake256(publicKey.bytes));
     std::copy(hash.begin(), hash.end(), bytes.begin() + 2);
@@ -49,7 +48,7 @@ Address::Address(const PublicKey& publicKey) {
 }
 
 std::string Address::string() const {
-    return Base58::bitcoin.encodeCheck(bytes, Hash::HasherBlake256d);
+    return Base58::encodeCheck(bytes, Rust::Base58Alphabet::Bitcoin, Hash::HasherBlake256d);
 }
 
 } // namespace TW::Decred
diff --git a/src/Decred/Address.h b/src/Decred/Address.h
index fb534ccffc0..4403d7da12a 100644
--- a/src/Decred/Address.h
+++ b/src/Decred/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Decred/Entry.cpp b/src/Decred/Entry.cpp
index 2bfc7149e39..4e6c17f60a6 100644
--- a/src/Decred/Entry.cpp
+++ b/src/Decred/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -11,11 +9,11 @@
 
 namespace TW::Decred {
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] TW::byte p2pkh, [[maybe_unused]] TW::byte p2sh, [[maybe_unused]] const char* hrp) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TW::byte p2pkh, [[maybe_unused]] const char* hrp) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -32,4 +30,36 @@ void Entry::plan([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     planTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            output = Signer::preImageHashes(input);
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Bitcoin::Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+
+            if (signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("signatures size and publickeys size not equal");
+                return;
+            }
+
+            HashPubkeyList externalSignatures;
+            auto n = signatures.size();
+            for (auto i = 0ul; i < n; ++i) {
+                externalSignatures.push_back(std::make_pair(signatures[i], publicKeys[i].bytes));
+            }
+
+            output = Signer::sign(input, externalSignatures);
+        });
+}
+
 } // namespace TW::Decred
diff --git a/src/Decred/Entry.h b/src/Decred/Entry.h
index 0d21789afa8..9f207c67c63 100644
--- a/src/Decred/Entry.h
+++ b/src/Decred/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,11 +12,14 @@ namespace TW::Decred {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Decred
diff --git a/src/Decred/OutPoint.cpp b/src/Decred/OutPoint.cpp
index e33f39badd4..88a74321101 100644
--- a/src/Decred/OutPoint.cpp
+++ b/src/Decred/OutPoint.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "OutPoint.h"
 
diff --git a/src/Decred/OutPoint.h b/src/Decred/OutPoint.h
index 315d78e693d..8ebd58a643b 100644
--- a/src/Decred/OutPoint.h
+++ b/src/Decred/OutPoint.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -44,14 +42,14 @@ class OutPoint {
     OutPoint(const Bitcoin::Proto::OutPoint& other) {
         std::copy(other.hash().begin(), other.hash().begin() + hash.size(), hash.begin());
         index = other.index();
-        tree = 0;
+        tree = int8_t(other.tree());
     }
 
     /// Initializes an out-point from a Protobuf out-point.
     OutPoint(const Bitcoin::OutPoint& other) {
         hash = other.hash;
         index = other.index;
-        tree = 0;
+        tree = other.tree;
     }
 
     /// Encodes the out-point into the provided buffer.
diff --git a/src/Decred/Signer.cpp b/src/Decred/Signer.cpp
index 5cb610c137e..f968cfe0239 100644
--- a/src/Decred/Signer.cpp
+++ b/src/Decred/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 
@@ -20,12 +18,14 @@ Bitcoin::Proto::TransactionPlan Signer::plan(const Bitcoin::Proto::SigningInput&
     return signer.txPlan.proto();
 }
 
-Proto::SigningOutput Signer::sign(const Bitcoin::Proto::SigningInput& input) noexcept {
-    auto signer = Signer(input);
+Proto::SigningOutput Signer::sign(const Bitcoin::Proto::SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs) noexcept {
+    SigningMode signingMode = optionalExternalSigs.has_value() ? SigningMode_External : SigningMode_Normal;
+    auto signer = Signer(std::move(input), signingMode, optionalExternalSigs);
     auto result = signer.sign();
     auto output = Proto::SigningOutput();
     if (!result) {
         output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
         return output;
     }
 
@@ -41,6 +41,33 @@ Proto::SigningOutput Signer::sign(const Bitcoin::Proto::SigningInput& input) noe
     return output;
 }
 
+Bitcoin::Proto::PreSigningOutput Signer::preImageHashes(const Bitcoin::Proto::SigningInput& input) noexcept {
+    Bitcoin::Proto::PreSigningOutput output;
+
+    auto signer = Signer(std::move(input), SigningMode_HashOnly);
+    auto result = signer.sign();
+    if (!result) {
+        output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
+        return output;
+    }
+
+    auto hashes = signer.getHashesForSigning();
+    if (hashes.size() == 0) {
+        output.set_error(Common::Proto::Error_signing);
+        output.set_error_message("got empty preImage hashes");
+        return output;
+    }
+
+    auto* hashPubKeys = output.mutable_hash_public_keys();
+    for (auto& h : hashes) {
+        auto* hpk = hashPubKeys->Add();
+        hpk->set_data_hash(h.first.data(), h.first.size());
+        hpk->set_public_key_hash(h.second.data(), h.second.size());
+    }
+    return output;
+}
+
 Result<Transaction, Common::Proto::SigningError> Signer::sign() {
     if (txPlan.utxos.empty() || _transaction.inputs.empty()) {
         return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_missing_input_utxos);
@@ -110,11 +137,11 @@ Result<std::vector<Data>, Common::Proto::SigningError> Signer::signStep(Bitcoin:
     if (script.matchPayToPublicKey(data)) {
         auto keyHash = TW::Hash::ripemd(TW::Hash::blake256(data));
         auto key = keyForPublicKeyHash(keyHash);
-        if (key.empty()) {
+        if (key.empty() && signingMode == SigningMode_Normal) {
             // Error: Missing key
             return Result<std::vector<Data>, Common::Proto::SigningError>::failure(Common::Proto::Error_missing_private_key);
         }
-        auto signature = createSignature(transactionToSign, script, key, index);
+        auto signature = createSignature(transactionToSign, script, key, keyHash, index);
         if (signature.empty()) {
             // Error: Failed to sign
             return Result<std::vector<Data>, Common::Proto::SigningError>::failure(Common::Proto::Error_signing);
@@ -122,18 +149,32 @@ Result<std::vector<Data>, Common::Proto::SigningError> Signer::signStep(Bitcoin:
         return Result<std::vector<Data>, Common::Proto::SigningError>::success({signature});
     } else if (script.matchPayToPublicKeyHash(data)) {
         auto key = keyForPublicKeyHash(data);
+        Data pubkey;
         if (key.empty()) {
-            // Error: Missing keyxs
-            return Result<std::vector<Data>, Common::Proto::SigningError>::failure(Common::Proto::Error_missing_private_key);
+            if (signingMode == SigningMode_HashOnly) {
+                // estimation mode, key is missing: use placeholder for public key
+                pubkey = Data(PublicKey::secp256k1Size);
+            } else if (signingMode == SigningMode_External) {
+                size_t hashSize = hashesForSigning.size();
+                if (!externalSignatures.has_value() || externalSignatures.value().size() <= hashSize) {
+                    // Error: no or not enough signatures provided
+                    return Result<std::vector<Data>, Common::Proto::SigningError>::failure(Common::Proto::Error_signing);
+                }
+                pubkey = std::get<1>(externalSignatures.value()[hashSize]);
+            } else {
+                // Error: Missing keyxs
+                return Result<std::vector<Data>, Common::Proto::SigningError>::failure(Common::Proto::Error_missing_private_key);
+            }
+        } else {
+            pubkey = PrivateKey(key).getPublicKey(TWPublicKeyTypeSECP256k1).bytes;
         }
 
-        auto pubkey = PrivateKey(key).getPublicKey(TWPublicKeyTypeSECP256k1);
-        auto signature = createSignature(transactionToSign, script, key, index);
+        auto signature = createSignature(transactionToSign, script, key, data, index);
         if (signature.empty()) {
             // Error: Failed to sign
             return Result<std::vector<Data>, Common::Proto::SigningError>::failure(Common::Proto::Error_signing);
         }
-        return Result<std::vector<Data>, Common::Proto::SigningError>::success({signature, pubkey.bytes});
+        return Result<std::vector<Data>, Common::Proto::SigningError>::success({signature, pubkey});
     } else if (script.matchPayToScriptHash(data)) {
         auto redeemScript = scriptForScriptHash(data);
         if (redeemScript.empty()) {
@@ -149,11 +190,11 @@ Result<std::vector<Data>, Common::Proto::SigningError> Signer::signStep(Bitcoin:
             }
             auto keyHash = TW::Hash::ripemd(TW::Hash::blake256(pubKey));
             auto key = keyForPublicKeyHash(keyHash);
-            if (key.empty()) {
+            if (key.empty() && signingMode == SigningMode_Normal) {
                 // Error: missing key
                 return Result<std::vector<Data>, Common::Proto::SigningError>::failure(Common::Proto::Error_missing_private_key);
             }
-            auto signature = createSignature(transactionToSign, script, key, index);
+            auto signature = createSignature(transactionToSign, script, key, keyHash, index);
             if (signature.empty()) {
                 // Error: Failed to sign
                 return Result<std::vector<Data>, Common::Proto::SigningError>::failure(Common::Proto::Error_signing);
@@ -169,8 +210,44 @@ Result<std::vector<Data>, Common::Proto::SigningError> Signer::signStep(Bitcoin:
 }
 
 Data Signer::createSignature(const Transaction& transaction, const Bitcoin::Script& script,
-                             const Data& key, size_t index) {
+                             const Data& key, const Data& publicKeyHash, size_t index) {
     auto sighash = transaction.computeSignatureHash(script, index, static_cast<TWBitcoinSigHashType>(input.hash_type()));
+    
+    if (signingMode == SigningMode_HashOnly) {
+        // Don't sign, only store hash-to-be-signed + pubkeyhash.  Return placeholder.
+        hashesForSigning.push_back(std::make_pair(sighash, publicKeyHash));
+        return Data(72);
+    }
+
+    if (signingMode == SigningMode_External) {
+        // Use externally-provided signature
+        // Store hash, only for counting
+        size_t hashSize = hashesForSigning.size();
+        hashesForSigning.push_back(std::make_pair(sighash, publicKeyHash));
+
+        if (!externalSignatures.has_value() || externalSignatures.value().size() <= hashSize) {
+            // Error: no or not enough signatures provided
+            return Data();
+        }
+
+        Data externalSignature = std::get<0>(externalSignatures.value()[hashSize]);
+        const Data publicKey = std::get<1>(externalSignatures.value()[hashSize]);
+
+        // Verify provided signature
+        if (!PublicKey::isValid(publicKey, TWPublicKeyTypeSECP256k1)) {
+            // Error: invalid public key
+            return Data();
+        }
+        const auto publicKeyObj = PublicKey(publicKey, TWPublicKeyTypeSECP256k1);
+        if (!publicKeyObj.verifyAsDER(externalSignature, sighash)) {
+            // Error: Signature does not match publickey+hash
+            return Data();
+        }
+        externalSignature.push_back(static_cast<byte>(input.hash_type()));
+
+        return externalSignature;
+    }
+
     auto pk = PrivateKey(key);
     auto signature = pk.signAsDER(Data(begin(sighash), end(sighash)));
     if (script.empty()) {
@@ -193,7 +270,7 @@ Data Signer::keyForPublicKeyHash(const Data& hash) const {
 }
 
 Data Signer::scriptForScriptHash(const Data& hash) const {
-    auto hashString = hex(hash.begin(), hash.end());
+    auto hashString = hex(hash);
     auto it = input.scripts().find(hashString);
     if (it == input.scripts().end()) {
         // Error: Missing redeem script
diff --git a/src/Decred/Signer.h b/src/Decred/Signer.h
index 170c5e8b818..9208c744ee3 100644
--- a/src/Decred/Signer.h
+++ b/src/Decred/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -24,6 +22,13 @@
 
 namespace TW::Decred {
 
+/// Normal and special signature modes
+enum SigningMode {
+    SigningMode_Normal = 0, // normal signing
+    SigningMode_HashOnly, // no signing, only collect hash to be signed
+    SigningMode_External, // no signing, signatures are provided
+};
+
 /// Helper class that performs Decred transaction signing.
 class Signer {
   public:
@@ -31,11 +36,24 @@ class Signer {
     static Bitcoin::Proto::TransactionPlan plan(const Bitcoin::Proto::SigningInput& input) noexcept;
 
     /// Signs a Proto::SigningInput transaction
-    static Proto::SigningOutput sign(const Bitcoin::Proto::SigningInput& input) noexcept;
+    static Proto::SigningOutput sign(const Bitcoin::Proto::SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs = {}) noexcept;
+  
+    /// Collect pre-image hashes to be signed
+    static Bitcoin::Proto::PreSigningOutput preImageHashes(const Bitcoin::Proto::SigningInput& input) noexcept;
+
   private:
     /// Private key and redeem script provider for signing.
     Bitcoin::Proto::SigningInput input;
 
+    /// Determine sign strategy
+    SigningMode signingMode = SigningMode_Normal;
+
+    /// For SigningMode_HashOnly, collect hashes (plus corresponding publickey hashes) here
+    HashPubkeyList hashesForSigning;
+
+    /// For SigningMode_External, signatures are provided here
+    std::optional<SignaturePubkeyList> externalSignatures;
+
   public:
     /// Transaction plan.
     Bitcoin::TransactionPlan txPlan;
@@ -52,14 +70,16 @@ class Signer {
     Signer() = default;
 
     /// Initializes a transaction signer with signing input.
-    explicit Signer(const Bitcoin::Proto::SigningInput& input) 
-      : input(input) {
+    explicit Signer(const Bitcoin::Proto::SigningInput& input,
+                    SigningMode mode = SigningMode_Normal,
+                    std::optional<SignaturePubkeyList> externalSignatures = {})
+        : input(input), signingMode(mode), externalSignatures(externalSignatures) {
         if (input.has_plan()) {
-          txPlan = Bitcoin::TransactionPlan(input.plan());
+            txPlan = Bitcoin::TransactionPlan(input.plan());
         } else {
-          txPlan = TransactionBuilder::plan(input);
+            txPlan = TransactionBuilder::plan(input);
         }
-        _transaction = TransactionBuilder::build(txPlan, input.to_address(), input.change_address());
+        _transaction = TransactionBuilder::build(txPlan, input);
     }
 
     /// Signs the transaction.
@@ -72,10 +92,12 @@ class Signer {
     /// \returns the signed transaction script.
     Result<Bitcoin::Script, Common::Proto::SigningError> sign(Bitcoin::Script script, size_t index);
 
+    HashPubkeyList getHashesForSigning() const { return hashesForSigning; }
+
   private:
     Result<std::vector<Data>, Common::Proto::SigningError> signStep(Bitcoin::Script script, size_t index);
     Data createSignature(const Transaction& transaction, const Bitcoin::Script& script,
-                         const Data& key, size_t index);
+                         const Data& key, const Data& publicKeyHash, size_t index);
 
     /// Returns the private key for the given public key hash.
     Data keyForPublicKeyHash(const Data& hash) const;
diff --git a/src/Decred/Transaction.cpp b/src/Decred/Transaction.cpp
index 958a843cd49..d04950afbcd 100644
--- a/src/Decred/Transaction.cpp
+++ b/src/Decred/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 
diff --git a/src/Decred/Transaction.h b/src/Decred/Transaction.h
index ee2a36fc7d2..eb2cb9983e2 100644
--- a/src/Decred/Transaction.h
+++ b/src/Decred/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Decred/TransactionBuilder.h b/src/Decred/TransactionBuilder.h
index ac81a3e9480..35dd958dc5b 100644
--- a/src/Decred/TransactionBuilder.h
+++ b/src/Decred/TransactionBuilder.h
@@ -1,12 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Transaction.h"
+#include "../Bitcoin/SigningInput.h"
 #include "../Bitcoin/TransactionPlan.h"
 #include "../Bitcoin/TransactionBuilder.h"
 #include "../proto/Bitcoin.pb.h"
@@ -25,10 +24,10 @@ struct TransactionBuilder {
     }
 
     /// Builds a transaction by selecting UTXOs and calculating fees.
-    static Transaction build(const Bitcoin::TransactionPlan& plan, const std::string& toAddress,
-                             const std::string& changeAddress) {
-        auto coin = TWCoinTypeDecred;                                 
-        auto lockingScriptTo = Bitcoin::Script::lockScriptForAddress(toAddress, coin);
+    static Transaction build(const Bitcoin::TransactionPlan& plan, const Bitcoin::SigningInput& input) {
+        auto coin = TWCoinTypeDecred;
+
+        auto lockingScriptTo = Bitcoin::Script::lockScriptForAddress(input.toAddress, coin);
         if (lockingScriptTo.empty()) {
             return {};
         }
@@ -37,17 +36,24 @@ struct TransactionBuilder {
         tx.outputs.emplace_back(TransactionOutput(plan.amount, /* version: */ 0, lockingScriptTo));
 
         if (plan.change > 0) {
-            auto lockingScriptChange = Bitcoin::Script::lockScriptForAddress(changeAddress, coin);
+            auto lockingScriptChange = Bitcoin::Script::lockScriptForAddress(input.changeAddress, coin);
             tx.outputs.emplace_back(
                 TransactionOutput(plan.change, /* version: */ 0, lockingScriptChange));
         }
 
         const auto emptyScript = Bitcoin::Script();
         for (auto& utxo : plan.utxos) {
-            auto input = TransactionInput();
-            input.previousOutput = utxo.outPoint;
-            input.sequence = utxo.outPoint.sequence;
-            tx.inputs.push_back(std::move(input));
+            auto txInput = TransactionInput();
+            txInput.previousOutput = utxo.outPoint;
+            txInput.sequence = utxo.outPoint.sequence;
+            tx.inputs.push_back(std::move(txInput));
+        }
+
+        // extra outputs
+        for (auto& o : input.extraOutputs) {
+            auto lockingScriptOther = Bitcoin::Script::lockScriptForAddress(o.first, coin);
+            tx.outputs.emplace_back(
+                TransactionOutput(o.second, /* version: */ 0, lockingScriptOther));
         }
 
         return tx;
diff --git a/src/Decred/TransactionInput.cpp b/src/Decred/TransactionInput.cpp
index 47308501e2e..8a9c0bca09e 100644
--- a/src/Decred/TransactionInput.cpp
+++ b/src/Decred/TransactionInput.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionInput.h"
 
diff --git a/src/Decred/TransactionInput.h b/src/Decred/TransactionInput.h
index dde3c075055..0b916106367 100644
--- a/src/Decred/TransactionInput.h
+++ b/src/Decred/TransactionInput.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -27,13 +25,19 @@ class TransactionInput {
     /// before inclusion into a block.
     uint32_t sequence = std::numeric_limits<uint32_t>::max();
 
-    int64_t valueIn;
-    uint32_t blockHeight;
+    int64_t valueIn = 0;
+    uint32_t blockHeight = 0;
     uint32_t blockIndex = std::numeric_limits<uint32_t>::max();
 
     /// Computational Script for confirming transaction authorization.
     Bitcoin::Script script;
 
+    TransactionInput() = default;
+    /// Initializes a transaction input with a previous output, a script and a
+    /// sequence number.
+    TransactionInput(OutPoint previousOutput, Bitcoin::Script script, uint32_t sequence)
+        : previousOutput(std::move(previousOutput)), sequence(sequence), script(std::move(script)) {}
+
     /// Encodes the transaction into the provided buffer.
     void encode(Data& data) const;
 
diff --git a/src/Decred/TransactionOutput.cpp b/src/Decred/TransactionOutput.cpp
index 1aadfd41d37..33aced75827 100644
--- a/src/Decred/TransactionOutput.cpp
+++ b/src/Decred/TransactionOutput.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionOutput.h"
 
diff --git a/src/Decred/TransactionOutput.h b/src/Decred/TransactionOutput.h
index 2d9575d4a08..4a2978e8c64 100644
--- a/src/Decred/TransactionOutput.h
+++ b/src/Decred/TransactionOutput.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Defer.h b/src/Defer.h
index 744eba85655..d3d3665f636 100644
--- a/src/Defer.h
+++ b/src/Defer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/DerivationPath.cpp b/src/DerivationPath.cpp
index aa7ac40c82d..dd54e28efbc 100644
--- a/src/DerivationPath.cpp
+++ b/src/DerivationPath.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "DerivationPath.h"
 
diff --git a/src/DerivationPath.h b/src/DerivationPath.h
index 6ab0bca83ef..cf3f1f7ba7b 100644
--- a/src/DerivationPath.h
+++ b/src/DerivationPath.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/EOS/Action.cpp b/src/EOS/Action.cpp
index e47c40f2fa2..40fa3c7798c 100644
--- a/src/EOS/Action.cpp
+++ b/src/EOS/Action.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Action.h"
 #include "../HexCoding.h"
diff --git a/src/EOS/Action.h b/src/EOS/Action.h
index c2ebcb6fa8f..26006cc3efa 100644
--- a/src/EOS/Action.h
+++ b/src/EOS/Action.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/EOS/Address.cpp b/src/EOS/Address.cpp
index db97a6d7853..72e6d52d2ed 100644
--- a/src/EOS/Address.cpp
+++ b/src/EOS/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "../Base58.h"
@@ -89,7 +87,7 @@ bool Address::extractKeyData(const std::string& string, Address* address) {
         return false;
     }
 
-    const Data& decodedBytes = Base58::bitcoin.decode(string.substr(prefixSize));
+    const Data& decodedBytes = Base58::decode(string.substr(prefixSize));
     if (decodedBytes.size() != KeyDataSize) {
         return false;
     }
@@ -139,7 +137,7 @@ Address::Address(const PublicKey& publicKey, Type type)
 
 /// Returns a string representation of the EOS address.
 std::string Address::string() const {
-    return prefix() + Base58::bitcoin.encode(keyData);
+    return prefix() + Base58::encode(keyData);
 }
 
 } // namespace TW::EOS
diff --git a/src/EOS/Address.h b/src/EOS/Address.h
index 0749b8244b7..9edbc41c816 100644
--- a/src/EOS/Address.h
+++ b/src/EOS/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/EOS/Asset.cpp b/src/EOS/Asset.cpp
index e2f246315e1..7dbb5a87d11 100644
--- a/src/EOS/Asset.cpp
+++ b/src/EOS/Asset.cpp
@@ -1,13 +1,10 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Asset.h"
+#include "algorithm/string.hpp"
 
-#include <boost/algorithm/string/trim.hpp>
-#include <boost/lexical_cast.hpp>
 #include <stdexcept>
 
 namespace TW::EOS {
@@ -40,7 +37,7 @@ Asset::Asset(int64_t amount, uint8_t decimals, const std::string& symbol) {
 Asset Asset::fromString(std::string assetString) {
     using namespace std;
 
-    boost::algorithm::trim(assetString);
+    trim(assetString);
 
     // Find space in order to split amount and symbol
     auto spacePosition = assetString.find(' ');
@@ -48,7 +45,7 @@ Asset Asset::fromString(std::string assetString) {
         throw std::invalid_argument("Asset's amount and symbol should be separated with space");
     }
 
-    auto symbolString = boost::algorithm::trim_copy(assetString.substr(spacePosition + 1));
+    auto symbolString = trim_copy(assetString.substr(spacePosition + 1));
     auto amountString = assetString.substr(0, spacePosition);
 
     // Ensure that if decimal point is used (.), decimal fraction is specified
@@ -67,13 +64,13 @@ Asset Asset::fromString(std::string assetString) {
     // Parse amount
     int64_t intPart, fractPart = 0;
     if (dotPosition != string::npos) {
-        intPart = boost::lexical_cast<int64_t>(amountString.data(), dotPosition);
-        fractPart = boost::lexical_cast<int64_t>(amountString.data() + dotPosition + 1, decimals);
+        intPart = std::stoll(amountString.substr(0, dotPosition));
+        fractPart = std::stoll(amountString.substr(dotPosition + 1, decimals));
         if (amountString[0] == '-') {
             fractPart *= -1;
         }
     } else {
-        intPart = boost::lexical_cast<int64_t>(amountString);
+        intPart = std::stoll(amountString);
     }
 
     int64_t amount = intPart;
diff --git a/src/EOS/Asset.h b/src/EOS/Asset.h
index 58e611a1469..5f91f3e6e23 100644
--- a/src/EOS/Asset.h
+++ b/src/EOS/Asset.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/EOS/Entry.cpp b/src/EOS/Entry.cpp
index fa3af508bb4..23611107634 100644
--- a/src/EOS/Entry.cpp
+++ b/src/EOS/Entry.cpp
@@ -1,10 +1,10 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
+#include "../proto/EOS.pb.h"
+#include <proto/TransactionCompiler.pb.h>
 
 #include "Address.h"
 #include "Signer.h"
@@ -13,11 +13,11 @@ namespace TW::EOS {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -25,4 +25,30 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const TW::Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto chainId = Data(input.chain_id().begin(), input.chain_id().end());
+            auto unsignedTxBytes = Signer(chainId).buildUnsignedTx(input);
+            auto imageHash = Hash::sha256(unsignedTxBytes);
+            output.set_data(unsignedTxBytes.data(), unsignedTxBytes.size());
+            output.set_data_hash(imageHash.data(), imageHash.size());
+        });
 }
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, [[maybe_unused]] const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() != 1) {
+                output.set_error(Common::Proto::Error_signatures_count);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_signatures_count));
+                return;
+            }
+
+            auto chainId = Data(input.chain_id().begin(), input.chain_id().end());
+            auto signedTx = Signer(chainId).buildSignedTx(input, signatures[0]);
+            output.set_json_encoded(signedTx.data(), signedTx.size());
+        });
+}
+
+} // namespace TW::EOS
diff --git a/src/EOS/Entry.h b/src/EOS/Entry.h
index 63823c8c020..dedf0d4c76d 100644
--- a/src/EOS/Entry.h
+++ b/src/EOS/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,12 @@ namespace TW::EOS {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::EOS
diff --git a/src/EOS/KeyType.h b/src/EOS/KeyType.h
index 9b7c259e545..c21d82eb00b 100644
--- a/src/EOS/KeyType.h
+++ b/src/EOS/KeyType.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/EOS/Name.cpp b/src/EOS/Name.cpp
index 9cb6805bf87..6ce388d800f 100644
--- a/src/EOS/Name.cpp
+++ b/src/EOS/Name.cpp
@@ -1,13 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "../BinaryCoding.h"
 #include "Name.h"
+#include "algorithm/string.hpp"
 
-#include <boost/algorithm/string/trim.hpp>
 #include <stdexcept>
 
 namespace TW::EOS {
@@ -52,7 +50,7 @@ std::string Name::string() const noexcept {
         tmp >>= 5;
     }
 
-    boost::algorithm::trim_right_if(str, [](char c) { return c == '.'; });
+    trim_right(str, ".");
     return str;
 }
 
diff --git a/src/EOS/Name.h b/src/EOS/Name.h
index 6fb75b9e7e4..5280975535f 100644
--- a/src/EOS/Name.h
+++ b/src/EOS/Name.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/EOS/PackedTransaction.cpp b/src/EOS/PackedTransaction.cpp
index a1d3e74ea3d..4c884f8c815 100644
--- a/src/EOS/PackedTransaction.cpp
+++ b/src/EOS/PackedTransaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "PackedTransaction.h"
 
diff --git a/src/EOS/PackedTransaction.h b/src/EOS/PackedTransaction.h
index f9d6ca337b7..e88a5a97703 100644
--- a/src/EOS/PackedTransaction.h
+++ b/src/EOS/PackedTransaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/EOS/Prefixes.h b/src/EOS/Prefixes.h
index b6594c8a147..d3e2335d7f5 100644
--- a/src/EOS/Prefixes.h
+++ b/src/EOS/Prefixes.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/EOS/Signer.cpp b/src/EOS/Signer.cpp
index b01ba0051e9..dc8019fbeed 100644
--- a/src/EOS/Signer.cpp
+++ b/src/EOS/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Asset.h"
@@ -15,19 +13,9 @@ namespace TW::EOS {
 Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     Proto::SigningOutput output;
     try {
-        // create an asset object
-        const auto& assetData = input.asset();
-        auto asset = Asset(assetData.amount(), static_cast<uint8_t>(assetData.decimals()),
-                           assetData.symbol());
-
-        // create a transfer action
-        auto action = TransferAction(input.currency(), input.sender(), input.recipient(), asset,
-                                     input.memo());
-
-        // create a Transaction and add the transfer action
-        auto tx = Transaction(Data(input.reference_block_id().begin(), input.reference_block_id().end()),
-                              input.reference_block_time());
-        tx.actions.push_back(action);
+        auto chainId = Data(input.chain_id().begin(), input.chain_id().end());
+        auto signer = Signer(chainId);
+        auto tx = signer.buildTx(input);
 
         // get key type
         EOS::Type type = Type::Legacy;
@@ -49,8 +37,7 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
 
         // sign the transaction with a Signer
         auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-        auto chainId = Data(input.chain_id().begin(), input.chain_id().end());
-        Signer(chainId).sign(key, type, tx);
+        signer.sign(key, type, tx);
 
         // Pack the transaction and add the json encoding to Signing outputput
         PackedTransaction ptx{tx, CompressionType::None};
@@ -84,6 +71,10 @@ void Signer::sign(const PrivateKey& privateKey, Type type, Transaction& transact
 }
 
 TW::Data Signer::hash(const Transaction& transaction) const noexcept {
+    return Hash::sha256(serializeTx(transaction));
+}
+
+TW::Data Signer::serializeTx(const Transaction& transaction) const noexcept {
     Data hashInput(chainID);
     transaction.serialize(hashInput);
 
@@ -93,7 +84,7 @@ TW::Data Signer::hash(const Transaction& transaction) const noexcept {
     }
 
     append(hashInput, cfdHash);
-    return Hash::sha256(hashInput);
+    return hashInput;
 }
 
 // canonical check for EOS
@@ -106,4 +97,57 @@ int Signer::isCanonical([[maybe_unused]] uint8_t by, uint8_t sig[64]) {
     // clang-format on
 }
 
+Transaction Signer::buildTx(const Proto::SigningInput& input) const {
+    // create an asset object
+    auto assetData = input.asset();
+    auto asset =
+        Asset(assetData.amount(), static_cast<uint8_t>(assetData.decimals()), assetData.symbol());
+
+    // create a transfer action
+    auto action =
+        TransferAction(input.currency(), input.sender(), input.recipient(), asset, input.memo());
+
+    // create a Transaction and add the transfer action
+    auto tx =
+        Transaction(Data(input.reference_block_id().begin(), input.reference_block_id().end()),
+                    input.reference_block_time());
+    if (input.expiration() > 0) {
+        tx.expiration = input.expiration();
+    }
+    tx.actions.push_back(action);
+    return tx;
+}
+
+Data Signer::buildUnsignedTx(const Proto::SigningInput& input) noexcept {
+    auto tx = buildTx(input);
+    return serializeTx(tx);
+}
+
+std::string Signer::buildSignedTx(const Proto::SigningInput& input, const Data& signature) noexcept {
+    auto tx = buildTx(input);
+
+    // get key type
+    EOS::Type type = Type::Legacy;
+    switch (input.private_key_type()) {
+    case Proto::KeyType::LEGACY:
+        type = Type::Legacy;
+        break;
+
+    case Proto::KeyType::MODERNK1:
+        type = Type::ModernK1;
+        break;
+
+    case Proto::KeyType::MODERNR1:
+        type = Type::ModernR1;
+        break;
+    default:
+        break;
+    }
+
+    tx.signatures.emplace_back(Signature(signature, type));
+    PackedTransaction ptx{tx, CompressionType::None};
+    auto stx = ptx.serialize().dump();
+    return stx;
+}
+
 } // namespace TW::EOS
diff --git a/src/EOS/Signer.h b/src/EOS/Signer.h
index 95832639489..0eef641f9a2 100644
--- a/src/EOS/Signer.h
+++ b/src/EOS/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -35,7 +33,14 @@ class Signer {
     /// Computes the transaction hash.
     Data hash(const Transaction& transaction) const noexcept;
 
+    /// Serialize the transaction.
+    Data serializeTx(const Transaction& transaction) const noexcept;
+    
     static int isCanonical(uint8_t by, uint8_t sig[64]);
+    
+    Transaction buildTx(const Proto::SigningInput& input) const;
+    Data buildUnsignedTx(const Proto::SigningInput& input) noexcept;
+    std::string buildSignedTx(const Proto::SigningInput& input, const Data& signature) noexcept;
 };
 
 } // namespace TW::EOS
diff --git a/src/EOS/Transaction.cpp b/src/EOS/Transaction.cpp
index 72c2791b460..f5ae6608f46 100644
--- a/src/EOS/Transaction.cpp
+++ b/src/EOS/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "../Base58.h"
 #include "../HexCoding.h"
@@ -57,7 +55,7 @@ std::string Signature::string() const noexcept {
         buffer.push_back(hash[i]);
     }
 
-    return prefix + TW::Base58::bitcoin.encode(buffer);
+    return prefix + TW::Base58::encode(buffer);
 }
 
 void Extension::serialize(Data& os) const noexcept {
diff --git a/src/EOS/Transaction.h b/src/EOS/Transaction.h
index 63a93edad09..420f6e7bf73 100644
--- a/src/EOS/Transaction.h
+++ b/src/EOS/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -67,7 +65,7 @@ class Transaction {
 
     void setReferenceBlock(const Data& referenceBlockId);
 
-    static const int32_t ExpirySeconds = 30;
+    static const int32_t ExpirySeconds = 3600;
     /// Get formatted date
     static std::string formatDate(int32_t date);
 };
diff --git a/src/Elrond/Address.cpp b/src/Elrond/Address.cpp
deleted file mode 100644
index 581f95b1e9e..00000000000
--- a/src/Elrond/Address.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWHRP.h>
-
-#include "Address.h"
-
-namespace TW::Elrond {
-
-const std::string Address::hrp = HRP_ELROND;
-
-bool Address::isValid(const std::string& string) {
-    return Bech32Address::isValid(string, hrp);
-}
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/Address.h b/src/Elrond/Address.h
deleted file mode 100644
index a638b4af8bd..00000000000
--- a/src/Elrond/Address.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-#include "../PublicKey.h"
-#include "../Bech32Address.h"
-
-#include <string>
-
-namespace TW::Elrond {
-
-class Address : public Bech32Address {
-  public:
-    /// The human-readable part of the address, as defined in "registry.json"
-    static const std::string hrp; // HRP_ELROND
-
-    /// Determines whether a string makes a valid address.
-    static bool isValid(const std::string& string);
-
-    Address() : Bech32Address(hrp) {}
-
-    /// Initializes an address with a key hash.
-    Address(Data keyHash) : Bech32Address(hrp, keyHash) {}
-
-    /// Initializes an address with a public key.
-    Address(const PublicKey& publicKey) : Bech32Address(hrp, publicKey.bytes) {}
-
-    static bool decode(const std::string& addr, Address& obj_out) {
-        return Bech32Address::decode(addr, obj_out, hrp);
-    }
-};
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/Codec.cpp b/src/Elrond/Codec.cpp
deleted file mode 100644
index dbdf0859291..00000000000
--- a/src/Elrond/Codec.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Codec.h"
-
-#include "HexCoding.h"
-#include "uint256.h"
-
-namespace TW::Elrond {
-
-std::string Codec::encodeString(const std::string& value) {
-    std::string encoded = hex(TW::data(value));
-    return encoded;
-}
-
-std::string Codec::encodeUint64(uint64_t value) {
-    std::string encoded = hex(store(uint256_t(value)));
-    return encoded;
-}
-
-std::string Codec::encodeBigInt(const std::string& value) {
-    return encodeBigInt(uint256_t(value));
-}
-
-// For reference, see https://docs.elrond.com/developers/developer-reference/elrond-serialization-format/#arbitrary-width-big-numbers.
-std::string Codec::encodeBigInt(uint256_t value) {
-    std::string encoded = hex(store(value));
-    return encoded;
-}
-
-std::string Codec::encodeAddress(const std::string& bech32Address) {
-    Address address;
-    Address::decode(bech32Address, address);
-    return encodeAddress(address);
-}
-
-std::string Codec::encodeAddress(const Address& address) {
-    std::string encoded = hex(address.getKeyHash());
-    return encoded;
-}
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/Codec.h b/src/Elrond/Codec.h
deleted file mode 100644
index b2ffd73405b..00000000000
--- a/src/Elrond/Codec.h
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Address.h"
-#include "uint256.h"
-
-namespace TW::Elrond {
-
-/// A stripped-down variant of the Elrond codec.
-/// For reference, see:
-/// - https://docs.elrond.com/developers/developer-reference/elrond-serialization-format
-/// - https://github.com/ElrondNetwork/elrond-sdk-erdjs/tree/main/src/smartcontracts/codec
-/// - https://github.com/ElrondNetwork/elrond-wasm-rs/tree/master/elrond-codec
-class Codec {
-public:
-    static std::string encodeString(const std::string& value);
-    static std::string encodeUint64(uint64_t value);
-    static std::string encodeBigInt(const std::string& value);
-    static std::string encodeBigInt(TW::uint256_t value);
-    static std::string encodeAddress(const std::string& bech32Address);
-    static std::string encodeAddress(const Address& address);
-};
-
-} // namespace
diff --git a/src/Elrond/Entry.cpp b/src/Elrond/Entry.cpp
deleted file mode 100644
index 2535f0bec96..00000000000
--- a/src/Elrond/Entry.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Entry.h"
-
-#include "Address.h"
-#include "Signer.h"
-
-using namespace TW;
-using namespace std;
-
-namespace TW::Elrond {
-// Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
-
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
-    return Address::isValid(address);
-}
-
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
-    return Address(publicKey).string();
-}
-
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
-    Address addr;
-    if (!Elrond::Address::decode(address, addr)) {
-        return Data();
-    }
-    return addr.getKeyHash();
-}
-
-void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
-    signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
-}
-
-string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string& json, const Data& key) const {
-    return Signer::signJSON(json, key);
-}
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/Entry.h b/src/Elrond/Entry.h
deleted file mode 100644
index e0c4ed7b0a1..00000000000
--- a/src/Elrond/Entry.h
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "../CoinEntry.h"
-
-namespace TW::Elrond {
-
-/// Entry point for implementation of Elrond coin.
-/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry final: public CoinEntry {
-public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     bool supportsJSONSigning() const { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
-};
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/GasEstimator.cpp b/src/Elrond/GasEstimator.cpp
deleted file mode 100644
index 6db7cbc9580..00000000000
--- a/src/Elrond/GasEstimator.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "GasEstimator.h"
-
-namespace TW::Elrond {
-
-// Additional gas to account for eventual increases in gas requirements (thus avoid breaking changes in clients of TW-core).
-const uint64_t ADDITIONAL_GAS_FOR_ESDT_TRANSFER = 100000;
-
-// Additional gas to account for extra blockchain operations (e.g. data movement (between accounts) for NFTs),
-// and for eventual increases in gas requirements (thus avoid breaking changes in clients of TW-core).
-const uint64_t ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER = 500000;
-
-GasEstimator::GasEstimator(const NetworkConfig& networkConfig) {
-    this->networkConfig = networkConfig;
-}
-
-uint64_t GasEstimator::forEGLDTransfer(size_t dataLength) const {
-    uint64_t gasLimit =
-        this->networkConfig.getMinGasLimit() +
-        this->networkConfig.getGasPerDataByte() * dataLength;
-
-    return gasLimit;
-}
-
-uint64_t GasEstimator::forESDTTransfer(size_t dataLength) const {
-    uint64_t gasLimit =
-        this->networkConfig.getMinGasLimit() +
-        this->networkConfig.getGasCostESDTTransfer() +
-        this->networkConfig.getGasPerDataByte() * dataLength +
-        ADDITIONAL_GAS_FOR_ESDT_TRANSFER;
-
-    return gasLimit;
-}
-
-uint64_t GasEstimator::forESDTNFTTransfer(size_t dataLength) const {
-    uint64_t gasLimit =
-        this->networkConfig.getMinGasLimit() +
-        this->networkConfig.getGasCostESDTNFTTransfer() +
-        this->networkConfig.getGasPerDataByte() * dataLength +
-        ADDITIONAL_GAS_FOR_ESDT_NFT_TRANSFER;
-
-    return gasLimit;
-}
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/GasEstimator.h b/src/Elrond/GasEstimator.h
deleted file mode 100644
index 4c14ed434d6..00000000000
--- a/src/Elrond/GasEstimator.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include <string>
-#include "NetworkConfig.h"
-
-namespace TW::Elrond {
-
-class GasEstimator {
-    NetworkConfig networkConfig;
-public:
-    GasEstimator(const NetworkConfig& networkConfig);
-
-    uint64_t forEGLDTransfer(size_t dataLength) const;
-    uint64_t forESDTTransfer(size_t dataLength) const;
-    uint64_t forESDTNFTTransfer(size_t dataLength) const;
-};
-
-} // namespace
diff --git a/src/Elrond/NetworkConfig.cpp b/src/Elrond/NetworkConfig.cpp
deleted file mode 100644
index ba514e9183f..00000000000
--- a/src/Elrond/NetworkConfig.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "NetworkConfig.h"
-
-#include <chrono>
-
-namespace TW::Elrond {
-
-NetworkConfig::NetworkConfig()
-    : chainId("1") /* Mainnet */ {
-}
-
-const std::string& NetworkConfig::getChainId() const {
-    return this->chainId;
-}
-
-void NetworkConfig::setChainId(const std::string& value) {
-    this->chainId = value;
-}
-
-uint32_t NetworkConfig::getGasPerDataByte() const {
-    return this->gasPerDataByte;
-}
-
-void NetworkConfig::setGasPerDataByte(uint32_t value) {
-    this->gasPerDataByte = value;
-}
-
-uint32_t NetworkConfig::getMinGasLimit() const {
-    return this->minGasLimit;
-}
-
-void NetworkConfig::setMinGasLimit(uint32_t value) {
-    this->minGasLimit = value;
-}
-
-uint64_t NetworkConfig::getMinGasPrice() const {
-    return this->minGasPrice;
-}
-
-void NetworkConfig::setMinGasPrice(uint64_t value) {
-    this->minGasPrice = value;
-}
-
-uint32_t NetworkConfig::getGasCostESDTTransfer() const {
-    return this->gasCostESDTTransfer;
-}
-
-void NetworkConfig::setGasCostESDTTransfer(uint32_t value) {
-    this->gasCostESDTTransfer = value;
-}
-
-uint32_t NetworkConfig::getGasCostESDTNFTTransfer() const {
-    return this->gasCostESDTNFTTransfer;
-}
-
-void NetworkConfig::setGasCostESDTNFTTransfer(uint32_t value) {
-    this->gasCostESDTNFTTransfer = value;
-}
-
-NetworkConfig NetworkConfig::GetDefault() {
-    const uint64_t timestamp = duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
-    return GetByTimestamp(timestamp);
-}
-
-NetworkConfig NetworkConfig::GetByTimestamp(uint64_t timestamp) {
-    NetworkConfig networkConfig;
-
-    // Mainnet values at the time of defining the "NetworkConfig" component (December 2021).
-    if (timestamp > 0) {
-        networkConfig.setGasPerDataByte(1500);
-        networkConfig.setMinGasLimit(50000);
-        networkConfig.setMinGasPrice(1000000000);
-        networkConfig.setGasCostESDTTransfer(200000);
-        networkConfig.setGasCostESDTNFTTransfer(200000);
-    }
-
-    return networkConfig;
-}
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/NetworkConfig.h b/src/Elrond/NetworkConfig.h
deleted file mode 100644
index 79b5ebf61d0..00000000000
--- a/src/Elrond/NetworkConfig.h
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include <string>
-
-namespace TW::Elrond {
-
-/// A "NetworkConfig" object holds the network parameters relevant to creating transactions (e.g. minimum gas limit, minimum gas price).
-class NetworkConfig {
-    /// The following fields can (should) be fetched from https://api.elrond.com/network/config.
-    /// However, a "NetworkConfig" object is initialized with proper default values for Elrond Mainnet (as of December 2021).
-    std::string chainId;
-    uint32_t gasPerDataByte;
-    uint32_t minGasLimit;
-    uint64_t minGasPrice;
-
-    /// GasSchedule entries of interest (only one at this moment), according to: https://github.com/ElrondNetwork/elrond-config-mainnet/blob/master/gasSchedules.
-    /// Here, for the sake of simplicity, we define the gas costs of interest directly in the class "NetworkConfig" 
-    /// (that is, without defining extra nested structures such as "GasSchedule" and "BuiltInCosts").
-    uint32_t gasCostESDTTransfer;
-    uint32_t gasCostESDTNFTTransfer;
-public:
-    NetworkConfig();
-
-    const std::string& getChainId() const;
-    void setChainId(const std::string& value);
-    
-    uint32_t getGasPerDataByte() const;
-    void setGasPerDataByte(uint32_t value);
-    
-    uint32_t getMinGasLimit() const;
-    void setMinGasLimit(uint32_t value);
-    
-    uint64_t getMinGasPrice() const;
-    void setMinGasPrice(uint64_t value);
-    
-    uint32_t getGasCostESDTTransfer() const;
-    void setGasCostESDTTransfer(uint32_t value);
-
-    uint32_t getGasCostESDTNFTTransfer() const;
-    void setGasCostESDTNFTTransfer(uint32_t value);
-
-    static NetworkConfig GetDefault();
-
-    /// Useful to implement upwards-compatible changes of the network configuration (a TWCore client can receive planned configuration updates, in advance).
-    static NetworkConfig GetByTimestamp(uint64_t timestamp);
-};
-
-} // namespace
diff --git a/src/Elrond/Serialization.cpp b/src/Elrond/Serialization.cpp
deleted file mode 100644
index ffe2241bd08..00000000000
--- a/src/Elrond/Serialization.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Serialization.h"
-
-#include "Address.h"
-#include "Base64.h"
-
-using namespace TW;
-
-std::map<std::string, int> fields_order{
-    {"nonce", 1},
-    {"value", 2},
-    {"receiver", 3},
-    {"sender", 4},
-    {"senderUsername", 5},
-    {"receiverUsername", 6},
-    {"gasPrice", 7},
-    {"gasLimit", 8},
-    {"data", 9},
-    {"chainID", 10},
-    {"version", 11},
-    {"options", 12},
-    {"signature", 13}};
-
-struct FieldsSorter {
-    bool operator()(const std::string& lhs, const std::string& rhs) const {
-        return fields_order[lhs] < fields_order[rhs];
-    }
-};
-
-template <class Key, class T, class Compare, class Allocator>
-using sorted_map = std::map<Key, T, FieldsSorter, Allocator>;
-using sorted_json = nlohmann::basic_json<sorted_map>;
-
-sorted_json preparePayload(const Elrond::Transaction& transaction) {
-    using namespace nlohmann;
-    sorted_json payload{
-        {"nonce", json(transaction.nonce)},
-        {"value", json(transaction.value)},
-        {"receiver", json(transaction.receiver)},
-        {"sender", json(transaction.sender)},
-        {"gasPrice", json(transaction.gasPrice)},
-        {"gasLimit", json(transaction.gasLimit)},
-    };
-
-    if (!transaction.senderUsername.empty()) {
-        payload["senderUsername"] = json(Base64::encode(data(transaction.senderUsername)));
-    }
-
-    if (!transaction.receiverUsername.empty()) {
-        payload["receiverUsername"] = json(Base64::encode(data(transaction.receiverUsername)));
-    }
-
-    if (!transaction.data.empty()) {
-        payload["data"] = json(Base64::encode(data(transaction.data)));
-    }
-
-    payload["chainID"] = json(transaction.chainID);
-    payload["version"] = json(transaction.version);
-
-    if (transaction.options != 0) {
-        payload["options"] = json(transaction.options);
-    }
-
-    return payload;
-}
-
-std::string Elrond::serializeTransaction(const Elrond::Transaction& transaction) {
-    sorted_json payload = preparePayload(transaction);
-    return payload.dump();
-}
-
-std::string Elrond::serializeSignedTransaction(const Elrond::Transaction& transaction, std::string signature) {
-    sorted_json payload = preparePayload(transaction);
-    payload["signature"] = nlohmann::json(signature);
-    return payload.dump();
-}
diff --git a/src/Elrond/Serialization.h b/src/Elrond/Serialization.h
deleted file mode 100644
index 64023d47213..00000000000
--- a/src/Elrond/Serialization.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-#include "Transaction.h"
-#include <nlohmann/json.hpp>
-
-namespace TW::Elrond {
-
-using string = std::string;
-using json = nlohmann::json;
-
-string serializeTransaction(const Transaction& transaction);
-string serializeSignedTransaction(const Transaction& transaction, string encodedSignature);
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/Signer.cpp b/src/Elrond/Signer.cpp
deleted file mode 100644
index f26e6c0460c..00000000000
--- a/src/Elrond/Signer.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Signer.h"
-#include "Address.h"
-#include "Serialization.h"
-#include "TransactionFactory.h"
-#include "HexCoding.h"
-
-#include <google/protobuf/util/json_util.h>
-
-namespace TW::Elrond {
-
-Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    TransactionFactory factory;
-
-    auto transaction = factory.create(input);
-    auto privateKey = PrivateKey(input.private_key());
-    auto signableAsString = serializeTransaction(transaction);
-    auto signableAsData = TW::data(signableAsString);
-    auto signature = privateKey.sign(signableAsData, TWCurveED25519);
-    auto encodedSignature = hex(signature);
-    auto encoded = serializeSignedTransaction(transaction, encodedSignature);
-
-    auto protoOutput = Proto::SigningOutput();
-    protoOutput.set_signature(encodedSignature);
-    protoOutput.set_encoded(encoded);
-    return protoOutput;
-}
-
-std::string Signer::signJSON(const std::string& json, const Data& key) {
-    auto input = Proto::SigningInput();
-    google::protobuf::util::JsonStringToMessage(json, &input);
-    input.set_private_key(key.data(), key.size());
-    auto output = sign(input);
-    return output.encoded();
-}
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/Signer.h b/src/Elrond/Signer.h
deleted file mode 100644
index df43bf1295d..00000000000
--- a/src/Elrond/Signer.h
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-#include "../PrivateKey.h"
-#include "../proto/Elrond.pb.h"
-
-namespace TW::Elrond {
-
-/// Helper class that performs Elrond transaction signing.
-class Signer {
-public:
-    /// Hide default constructor
-    Signer() = delete;
-
-    /// Signs a Proto::SigningInput transaction
-    static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
-    
-    /// Signs a json Proto::SigningInput with private key
-    static std::string signJSON(const std::string& json, const Data& key);
-};
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/Transaction.cpp b/src/Elrond/Transaction.cpp
deleted file mode 100644
index 24c8373e9c5..00000000000
--- a/src/Elrond/Transaction.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Transaction.h"
-
-namespace TW::Elrond {
-
-Transaction::Transaction()
-    : nonce(0), sender(""), senderUsername(""), receiver(""), receiverUsername(""), value("0"), data(""), gasPrice(0), gasLimit(0), chainID(""), version(0), options(0) {
-}
-
-} // namespace TW::Elrond
-
diff --git a/src/Elrond/Transaction.h b/src/Elrond/Transaction.h
deleted file mode 100644
index a98e7435360..00000000000
--- a/src/Elrond/Transaction.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include <string>
-
-namespace TW::Elrond {
-
-class Transaction {
-public:
-    uint64_t nonce;
-    std::string sender;
-    std::string senderUsername;
-    std::string receiver;
-    std::string receiverUsername;
-    std::string value;
-    std::string data;
-    uint64_t gasPrice;
-    uint64_t gasLimit;
-    std::string chainID;
-    uint32_t version;
-    uint32_t options;
-
-    Transaction();
-};
-
-} // namespace
diff --git a/src/Elrond/TransactionFactory.cpp b/src/Elrond/TransactionFactory.cpp
deleted file mode 100644
index 4e3a271165e..00000000000
--- a/src/Elrond/TransactionFactory.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "TransactionFactory.h"
-
-#include "Codec.h"
-
-namespace TW::Elrond {
-
-const int TX_VERSION = 1;
-
-TransactionFactory::TransactionFactory()
-    : TransactionFactory(NetworkConfig::GetDefault()) {
-}
-
-TransactionFactory::TransactionFactory(const NetworkConfig& networkConfig)
-    : networkConfig(networkConfig), gasEstimator(networkConfig) {
-}
-
-Transaction TransactionFactory::create(const Proto::SigningInput& input) {
-    if (input.has_egld_transfer()) {
-        return fromEGLDTransfer(input);
-    } else if (input.has_esdt_transfer()) {
-        return fromESDTTransfer(input);
-    } else if (input.has_esdtnft_transfer()) {
-        return fromESDTNFTTransfer(input);
-    } else {
-        return fromGenericAction(input);
-    }
-}
-
-/// Copies the input fields into a transaction object, without any other logic.
-Transaction TransactionFactory::fromGenericAction(const Proto::SigningInput& input) {
-    auto action = input.generic_action();
-
-    Transaction transaction;
-    transaction.nonce = action.accounts().sender_nonce();
-    transaction.sender = action.accounts().sender();
-    transaction.senderUsername = action.accounts().sender_username();
-    transaction.receiver = action.accounts().receiver();
-    transaction.receiverUsername = action.accounts().receiver_username();
-    transaction.value = action.value();
-    transaction.data = action.data();
-    transaction.gasLimit = input.gas_limit();
-    transaction.gasPrice = input.gas_price();
-    transaction.chainID = input.chain_id();
-    transaction.version = action.version();
-    transaction.options = action.options();
-
-    return transaction;
-}
-
-Transaction TransactionFactory::fromEGLDTransfer(const Proto::SigningInput& input) {
-    auto transfer = input.egld_transfer();
-
-    uint64_t estimatedGasLimit = this->gasEstimator.forEGLDTransfer(0);
-
-    Transaction transaction;
-    transaction.nonce = transfer.accounts().sender_nonce();
-    transaction.sender = transfer.accounts().sender();
-    transaction.senderUsername = transfer.accounts().sender_username();
-    transaction.receiver = transfer.accounts().receiver();
-    transaction.receiverUsername = transfer.accounts().receiver_username();
-    transaction.value = transfer.amount();
-    transaction.gasLimit = coalesceGasLimit(input.gas_limit(), estimatedGasLimit);
-    transaction.gasPrice = coalesceGasPrice(input.gas_price());
-    transaction.chainID = coalesceChainId(input.chain_id());
-    transaction.version = TX_VERSION;
-
-    return transaction;
-}
-
-Transaction TransactionFactory::fromESDTTransfer(const Proto::SigningInput& input) {
-    auto transfer = input.esdt_transfer();
-
-    std::string encodedTokenIdentifier = Codec::encodeString(transfer.token_identifier());
-    std::string encodedAmount = Codec::encodeBigInt(transfer.amount());
-    std::string data = prepareFunctionCall("ESDTTransfer", {encodedTokenIdentifier, encodedAmount});
-    uint64_t estimatedGasLimit = this->gasEstimator.forESDTTransfer(data.size());
-
-    Transaction transaction;
-    transaction.nonce = transfer.accounts().sender_nonce();
-    transaction.sender = transfer.accounts().sender();
-    transaction.senderUsername = transfer.accounts().sender_username();
-    transaction.receiver = transfer.accounts().receiver();
-    transaction.receiverUsername = transfer.accounts().receiver_username();
-    transaction.value = "0";
-    transaction.data = data;
-    transaction.gasLimit = coalesceGasLimit(input.gas_limit(), estimatedGasLimit);
-    transaction.gasPrice = coalesceGasPrice(input.gas_price());
-    transaction.chainID = coalesceChainId(input.chain_id());
-    transaction.version = TX_VERSION;
-
-    return transaction;
-}
-
-Transaction TransactionFactory::fromESDTNFTTransfer(const Proto::SigningInput& input) {
-    auto transfer = input.esdtnft_transfer();
-
-    std::string encodedCollection = Codec::encodeString(transfer.token_collection());
-    std::string encodedNonce = Codec::encodeUint64(transfer.token_nonce());
-    std::string encodedQuantity = Codec::encodeBigInt(transfer.amount());
-    std::string encodedReceiver = Codec::encodeAddress(transfer.accounts().receiver());
-    std::string data = prepareFunctionCall("ESDTNFTTransfer", {encodedCollection, encodedNonce, encodedQuantity, encodedReceiver});
-    uint64_t estimatedGasLimit = this->gasEstimator.forESDTNFTTransfer(data.size());
-
-    Transaction transaction;
-    transaction.nonce = transfer.accounts().sender_nonce();
-    // For NFT, SFT and MetaESDT, transaction.sender == transaction.receiver.
-    transaction.sender = transfer.accounts().sender();
-    transaction.receiver = transfer.accounts().sender();
-    transaction.value = "0";
-    transaction.data = data;
-    transaction.gasLimit = coalesceGasLimit(input.gas_limit(), estimatedGasLimit);
-    transaction.gasPrice = coalesceGasPrice(input.gas_price());
-    transaction.chainID = coalesceChainId(input.chain_id());
-    transaction.version = TX_VERSION;
-
-    return transaction;
-}
-
-uint64_t TransactionFactory::coalesceGasLimit(uint64_t providedGasLimit, uint64_t estimatedGasLimit) {
-    return providedGasLimit > 0 ? providedGasLimit : estimatedGasLimit;
-}
-
-uint64_t TransactionFactory::coalesceGasPrice(uint64_t gasPrice) {
-    return gasPrice > 0 ? gasPrice : this->networkConfig.getMinGasPrice();
-}
-
-std::string TransactionFactory::coalesceChainId(std::string chainID) {
-    return chainID.empty() ? this->networkConfig.getChainId() : chainID;
-}
-
-std::string TransactionFactory::prepareFunctionCall(const std::string& function, std::initializer_list<const std::string> arguments) {
-    const auto ARGUMENTS_SEPARATOR = "@";
-    std::string result;
-
-    result.append(function);
-
-    for (auto argument : arguments) {
-        result.append(ARGUMENTS_SEPARATOR);
-        result.append(argument);
-    }
-
-    return result;
-}
-
-} // namespace TW::Elrond
diff --git a/src/Elrond/TransactionFactory.h b/src/Elrond/TransactionFactory.h
deleted file mode 100644
index db3b3058b9d..00000000000
--- a/src/Elrond/TransactionFactory.h
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "../proto/Elrond.pb.h"
-#include "Address.h"
-#include "NetworkConfig.h"
-#include "GasEstimator.h"
-#include "Transaction.h"
-#include "uint256.h"
-
-namespace TW::Elrond {
-
-/// Creates specific transaction objects, wrt. the provided "NetworkConfig".
-class TransactionFactory {
-private:
-    NetworkConfig networkConfig;
-    GasEstimator gasEstimator;
-public:
-    TransactionFactory();
-    TransactionFactory(const NetworkConfig& networkConfig);
-
-    /// Creates the appropriate transaction object, with respect to the "oneof" field (substructure) of Proto::SigningInput.
-    Transaction create(const Proto::SigningInput &input);
-
-    Transaction fromGenericAction(const Proto::SigningInput& input);
-
-    /// This should be used to transfer EGLD.
-    /// For reference, see: https://docs.elrond.com/developers/signing-transactions/signing-transactions/#general-structure.
-    Transaction fromEGLDTransfer(const Proto::SigningInput& input);
-
-    /// This should be used to transfer regular ESDTs (fungible tokens).
-    /// For reference, see: https://docs.elrond.com/developers/esdt-tokens/#transfers
-    ///
-    /// The "regular" ESDT tokens held by an account can be fetched from https://api.elrond.com/accounts/{address}/tokens.
-    Transaction fromESDTTransfer(const Proto::SigningInput& input);
-
-    /// This should be used to transfer NFTs, SFTs and Meta ESDTs.
-    /// For reference, see: https://docs.elrond.com/developers/nft-tokens/#transfers
-    ///
-    /// The semi-fungible and non-fungible tokens held by an account can be fetched from https://api.elrond.com/accounts/{address}/nfts?type=SemiFungibleESDT,NonFungibleESDT.
-    /// The Meta ESDTs (a special kind of SFTs) held by an account can be fetched from https://api.elrond.com/accounts/{address}/nfts?type=MetaESDT.
-    ///
-    /// The fields "token_collection" and "token_nonce" are found as well in the HTTP response of the API call (as "collection" and "nonce", respectively).
-    Transaction fromESDTNFTTransfer(const Proto::SigningInput& input);
-private:
-    uint64_t coalesceGasLimit(uint64_t providedGasLimit, uint64_t estimatedGasLimit);
-    uint64_t coalesceGasPrice(uint64_t gasPrice);
-    std::string coalesceChainId(std::string chainID);
-    std::string prepareFunctionCall(const std::string& function, std::initializer_list<const std::string> arguments);
-};
-
-} // namespace
diff --git a/src/Encrypt.cpp b/src/Encrypt.cpp
index 9ed2a643eea..a3a3c8a78a0 100644
--- a/src/Encrypt.cpp
+++ b/src/Encrypt.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Encrypt.h"
 #include "Data.h"
diff --git a/src/Encrypt.h b/src/Encrypt.h
index e024186f653..2cada9f9cc3 100644
--- a/src/Encrypt.h
+++ b/src/Encrypt.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Ethereum/ABI.h b/src/Ethereum/ABI.h
deleted file mode 100644
index e0c3a9f1b90..00000000000
--- a/src/Ethereum/ABI.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "ABI/Array.h"
-#include "ABI/Bytes.h"
-#include "ABI/Function.h"
-#include "ABI/ParamAddress.h"
-#include "ABI/ParamBase.h"
-#include "ABI/Parameters.h"
-#include "ABI/ParamFactory.h"
-#include "ABI/ParamNumber.h"
-#include "ABI/ParamStruct.h"
-#include "ABI/Tuple.h"
diff --git a/src/Ethereum/ABI/Array.cpp b/src/Ethereum/ABI/Array.cpp
deleted file mode 100644
index 90071786336..00000000000
--- a/src/Ethereum/ABI/Array.cpp
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Array.h"
-#include "ParamFactory.h"
-#include "ValueEncoder.h"
-#include <Hash.h>
-
-#include <nlohmann/json.hpp>
-
-#include <cassert>
-
-namespace TW::Ethereum::ABI {
-
-using namespace TW;
-using json = nlohmann::json;
-
-int ParamArray::addParam(const std::shared_ptr<ParamBase>& param) {
-    assert(param != nullptr);
-    if (param == nullptr) {
-        return -1;
-    }
-    if (_params.getCount() >= 1 && param->getType() != getProtoType()) {
-        return -2;
-    } // do not add different types
-    return _params.addParam(param);
-}
-
-void ParamArray::addParams(const std::vector<std::shared_ptr<ParamBase>>& params) {
-    for (auto p : params) {
-        addParam(p);
-    }
-}
-
-std::shared_ptr<ParamBase> ParamArray::getProtoElem() const {
-    if (_params.getCount() >= 1) {
-        return _params.getParamUnsafe(0);
-    }
-    return _proto;
-}
-
-std::string ParamArray::getProtoType() const {
-    const auto proto = getProtoElem();
-    return (proto != nullptr) ? proto->getType() : "__empty__";
-}
-
-size_t ParamArray::getSize() const {
-    return 32 + _params.getSize();
-}
-
-void ParamArray::encode(Data& data) const {
-    size_t n = _params.getCount();
-    ValueEncoder::encodeUInt256(uint256_t(n), data);
-    _params.encode(data);
-}
-
-bool ParamArray::decode(const Data& encoded, size_t& offset_inout) {
-    size_t origOffset = offset_inout;
-    // read length
-    uint256_t len256;
-    if (!ABI::decode(encoded, len256, offset_inout)) {
-        return false;
-    }
-    // check if length is in the size_t range
-    auto len = static_cast<size_t>(len256);
-    if (len256 != uint256_t(len)) {
-        return false;
-    }
-    // check number of values
-    auto n = _params.getCount();
-    if (n == 0 || n > len) {
-        // Encoded length is less than params count, unsafe to continue decoding
-        return false;
-    }
-    if (n < len) {
-        // pad with first type
-        auto first = _params.getParamUnsafe(0);
-        for (size_t i = 0; i < len - n; i++) {
-            _params.addParam(ParamFactory::make(first->getType()));
-        }
-    }
-
-    // read values
-    auto res = _params.decode(encoded, offset_inout);
-
-    // padding
-    offset_inout = origOffset + ValueEncoder::paddedTo32(offset_inout - origOffset);
-    return res;
-}
-
-bool ParamArray::setValueJson(const std::string& value) {
-    if (_params.getCount() < 1) {
-        // no single element
-        return false;
-    }
-    auto valuesJson = json::parse(value, nullptr, false);
-    if (valuesJson.is_discarded()) {
-        return false;
-    }
-    if (!valuesJson.is_array()) {
-        return false;
-    }
-    // make sure enough elements are in the array
-    while (_params.getCount() < valuesJson.size()) {
-        addParam(ParamFactory::make(getProtoType()));
-    }
-    int cnt = 0;
-    for (const auto& e : valuesJson) {
-        std::string eString = e.is_string() ? e.get<std::string>() : e.dump();
-        _params.getParamUnsafe(cnt)->setValueJson(eString);
-        ++cnt;
-    }
-    return true;
-}
-
-Data ParamArray::hashStruct() const {
-    if (_params.getCount() == 0) {
-        return Hash::keccak256(Data());
-    }
-    Data hash(32);
-    Data hashes = _params.encodeHashes();
-    if (hashes.size() > 0) {
-        hash = Hash::keccak256(hashes);
-    }
-    return hash;
-}
-
-std::string ParamArray::getExtraTypes(std::vector<std::string>& ignoreList) const {
-    const auto& proto = getProtoElem();
-    return (proto != nullptr) ? proto->getExtraTypes(ignoreList) : "";
-}
-
-void ParamArrayFix::encode(Data& data) const {
-    this->_params.encode(data);
-}
-
-bool ParamArrayFix::decode(const Data& encoded, size_t& offset_inout) {
-    return this->_params.decode(encoded, offset_inout);
-}
-
-bool ParamArrayFix::setValueJson(const std::string& value) {
-    auto valuesJson = json::parse(value, nullptr, false);
-    if (valuesJson.is_discarded() || !valuesJson.is_array() || _params.getCount() != valuesJson.size()) {
-        return false;
-    }
-
-    std::size_t idx{0};
-    for (auto&& e : valuesJson) {
-        std::string eString = e.is_string() ? e.get<std::string>() : e.dump();
-        _params.getParamUnsafe(idx)->setValueJson(eString);
-        ++idx;
-    }
-    return true;
-}
-
-void ParamArrayFix::addParams(const Params& params) {
-    auto addParamFunctor = [this](auto&& param) {
-        if (param == nullptr) {
-            throw std::runtime_error("param can't be nullptr");
-        }
-        if (_params.getCount() >= 1 && param->getType() != _params.getParamUnsafe(0)->getType()) {
-            throw std::runtime_error("params need to be the same type");
-        } // do not add different types
-        _params.addParam(param);
-    };
-    std::for_each(begin(params), end(params), addParamFunctor);
-}
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/Array.h b/src/Ethereum/ABI/Array.h
deleted file mode 100644
index 08138aad6a2..00000000000
--- a/src/Ethereum/ABI/Array.h
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "ParamBase.h"
-#include "ParamNumber.h"
-#include "Parameters.h"
-
-namespace TW::Ethereum::ABI {
-
-/// Dynamic array of the same types, "<type>[]"
-/// Normally has at least one element.  Empty array can have prototype set so its type is known.
-/// Empty with no prototype is possible, but should be avoided.
-class ParamArray : public ParamCollection {
-private:
-    ParamSet _params;
-    std::shared_ptr<ParamBase> _proto; // an optional prototype element, determines the array type, useful in empty array case
-
-private:
-    std::shared_ptr<ParamBase> getProtoElem() const; // the first element if exists, otherwise the proto element
-    std::string getProtoType() const;
-
-public:
-    ParamArray() = default;
-    ParamArray(const std::shared_ptr<ParamBase>& param1)
-        : ParamCollection() { addParam(param1); }
-    ParamArray(const std::vector<std::shared_ptr<ParamBase>>& params)
-        : ParamCollection() { setVal(params); }
-    void setVal(const std::vector<std::shared_ptr<ParamBase>>& params) { addParams(params); }
-    std::vector<std::shared_ptr<ParamBase>> const& getVal() const { return _params.getParams(); }
-    int addParam(const std::shared_ptr<ParamBase>& param);
-    void addParams(const std::vector<std::shared_ptr<ParamBase>>& params);
-    void setProto(const std::shared_ptr<ParamBase>& proto) { _proto = proto; }
-    std::shared_ptr<ParamBase> getParam(int paramIndex) { return _params.getParamUnsafe(paramIndex); }
-    virtual std::string getType() const { return getProtoType() + "[]"; }
-    virtual size_t getSize() const;
-    virtual bool isDynamic() const { return true; }
-    virtual size_t getCount() const { return _params.getCount(); }
-    virtual void encode(Data& data) const;
-    virtual bool decode(const Data& encoded, size_t& offset_inout);
-    virtual bool setValueJson(const std::string& value);
-    virtual Data hashStruct() const;
-    virtual std::string getExtraTypes(std::vector<std::string>& ignoreList) const;
-};
-
-/// Fixed-size array of the same type e.g, "type[4]"
-class ParamArrayFix final : public ParamCollection {
-public:
-    //! Public Definitions
-    using Params = std::vector<std::shared_ptr<ParamBase>>;
-
-    //! Public constructor
-    explicit ParamArrayFix(const Params& params) noexcept(false)
-        : ParamCollection() {
-        this->addParams(params);
-    }
-
-    //! Public member methods
-    [[nodiscard]] std::size_t getCount() const final { return _params.getCount(); }
-    [[nodiscard]] size_t getSize() const final { return _params.getSize(); }
-    [[nodiscard]] bool isDynamic() const final { return false; }
-    [[nodiscard]] std::string getType() const final { return _params.getParamUnsafe(0)->getType() + "[" + std::to_string(_params.getCount()) + "]"; }
-    void encode(Data& data) const final;
-    bool decode(const Data& encoded, size_t& offset_inout) final;
-    bool setValueJson(const std::string& value) final;
-
-private:
-    //! Private member functions
-    void addParams(const Params& params) noexcept(false);
-
-    //! Private member fields
-    ParamSet _params;
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/Bytes.cpp b/src/Ethereum/ABI/Bytes.cpp
deleted file mode 100644
index 0b40d521bb1..00000000000
--- a/src/Ethereum/ABI/Bytes.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Bytes.h"
-#include "ParamNumber.h"
-#include "ValueEncoder.h"
-#include <Hash.h>
-#include <HexCoding.h>
-
-#include <cassert>
-
-namespace TW::Ethereum::ABI {
-
-void ParamByteArray::encodeBytes(const Data& bytes, Data& data) {
-    ValueEncoder::encodeUInt256(uint256_t(bytes.size()), data);
-
-    const auto count = bytes.size();
-    const auto padding = ValueEncoder::padNeeded32(count);
-    data.insert(data.end(), bytes.begin(), bytes.begin() + count);
-    append(data, Data(padding));
-}
-
-bool ParamByteArray::decodeBytes(const Data& encoded, Data& decoded, size_t& offset_inout) {
-    size_t origOffset = offset_inout;
-    // read len
-    uint256_t len256;
-    if (!ABI::decode(encoded, len256, offset_inout)) {
-        return false;
-    }
-    // check if length is in the size_t range
-    auto len = static_cast<size_t>(len256);
-    if (len256 != uint256_t(len)) {
-        return false;
-    }
-    // check if there is enough data
-    if (encoded.size() < offset_inout + len) {
-        return false;
-    }
-    // read data
-    decoded = Data(encoded.begin() + offset_inout, encoded.begin() + offset_inout + len);
-    offset_inout += len;
-    // padding
-    offset_inout = origOffset + ValueEncoder::paddedTo32(offset_inout - origOffset);
-    return true;
-}
-
-bool ParamByteArray::setValueJson(const std::string& value) {
-    setVal(parse_hex(value));
-    return true;
-}
-
-Data ParamByteArray::hashStruct() const {
-    return Hash::keccak256(_bytes);
-}
-
-void ParamByteArrayFix::setVal(const Data& val) {
-    if (val.size() > _n) { // crop right
-        _bytes = subData(val, 0, _n);
-    } else {
-        _bytes = val;
-        if (_bytes.size() < _n) { // pad on right
-            append(_bytes, Data(_n - _bytes.size()));
-        }
-    }
-    assert(_bytes.size() == _n);
-}
-
-void ParamByteArrayFix::encode(Data& data) const {
-    const auto count = _bytes.size();
-    const auto padding = ValueEncoder::padNeeded32(count);
-    data.insert(data.end(), _bytes.begin(), _bytes.begin() + count);
-    append(data, Data(padding));
-}
-
-bool ParamByteArrayFix::decodeBytesFix(const Data& encoded, size_t n, Data& decoded,
-                                       size_t& offset_inout) {
-    size_t origOffset = offset_inout;
-    if (encoded.size() < offset_inout + n) {
-        // not enough data
-        return false;
-    }
-    if (decoded.size() < n) {
-        append(decoded, Data(n - decoded.size()));
-    }
-    std::copy(encoded.begin() + offset_inout, encoded.begin() + (offset_inout + n),
-              decoded.begin());
-    offset_inout += n;
-    // padding
-    offset_inout = origOffset + ValueEncoder::paddedTo32(offset_inout - origOffset);
-    return true;
-}
-
-bool ParamByteArrayFix::setValueJson(const std::string& value) {
-    setVal(parse_hex(value));
-    return true;
-}
-
-Data ParamByteArrayFix::hashStruct() const {
-    if (_bytes.size() > 32) {
-        return Hash::keccak256(_bytes);
-    }
-    return ParamBase::hashStruct();
-}
-
-void ParamString::encodeString(const std::string& decoded, Data& data) {
-    auto bytes = Data(decoded.begin(), decoded.end());
-    ParamByteArray::encodeBytes(bytes, data);
-}
-
-bool ParamString::decodeString(const Data& encoded, std::string& decoded, size_t& offset_inout) {
-    Data decodedData;
-    if (!ParamByteArray::decodeBytes(encoded, decodedData, offset_inout)) {
-        return false;
-    }
-    decoded = std::string(decodedData.begin(), decodedData.end());
-    return true;
-}
-
-Data ParamString::hashStruct() const {
-    Data hash(32);
-    Data encoded = data(_str);
-    hash = Hash::keccak256(encoded);
-    return hash;
-}
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/Bytes.h b/src/Ethereum/ABI/Bytes.h
deleted file mode 100644
index b823ec2752b..00000000000
--- a/src/Ethereum/ABI/Bytes.h
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "ParamBase.h"
-#include "ValueEncoder.h"
-#include <Data.h>
-
-namespace TW::Ethereum::ABI {
-
-/// Dynamic array of bytes "bytes"
-class ParamByteArray: public ParamCollection
-{
-private:
-    Data _bytes;
-public:
-    ParamByteArray() = default;
-    ParamByteArray(const Data& val) : ParamCollection() { setVal(val); }
-    void setVal(const Data& val) { _bytes = val; }
-    const Data& getVal() const { return _bytes; }
-    virtual std::string getType() const { return "bytes"; };
-    virtual size_t getSize() const { return 32 + ValueEncoder::paddedTo32(_bytes.size()); }
-    virtual bool isDynamic() const { return true; }
-    virtual size_t getCount() const { return _bytes.size(); }
-    static void encodeBytes(const Data& bytes, Data& data);
-    virtual void encode(Data& data) const { encodeBytes(_bytes, data); }
-    static bool decodeBytes(const Data& encoded, Data& decoded, size_t& offset_inout);
-    virtual bool decode(const Data& encoded, size_t& offset_inout) {
-        return decodeBytes(encoded, _bytes, offset_inout);
-    }
-    virtual bool setValueJson(const std::string& value);
-    virtual Data hashStruct() const;
-};
-
-/// Fixed-size array of bytes, "bytes<N>"
-class ParamByteArrayFix: public ParamCollection
-{
-private:
-    size_t _n;
-    Data _bytes;
-public:
-    ParamByteArrayFix(size_t n): ParamCollection(), _n(n), _bytes(Data(_n)) {}
-    ParamByteArrayFix(size_t n, const Data& val): ParamCollection(), _n(n), _bytes(Data(_n)) { setVal(val); }
-    void setVal(const Data& val);
-    const std::vector<uint8_t>& getVal() const { return _bytes; }
-    virtual std::string getType() const { return "bytes" + std::to_string(_n); };
-    virtual size_t getSize() const { return ValueEncoder::paddedTo32(_bytes.size()); }
-    virtual bool isDynamic() const { return false; }
-    virtual size_t getCount() const { return _bytes.size(); }
-    virtual void encode(Data& data) const;
-    static bool decodeBytesFix(const Data& encoded, size_t n, Data& decoded, size_t& offset_inout);
-    virtual bool decode(const Data& encoded, size_t& offset_inout) {
-        return decodeBytesFix(encoded, _n, _bytes, offset_inout);
-    }
-    virtual bool setValueJson(const std::string& value);
-    virtual Data hashStruct() const;
-};
-
-/// Var-length string parameter
-class ParamString: public ParamCollection
-{
-private:
-    std::string _str;
-public:
-    ParamString() = default;
-    ParamString(std::string val): ParamCollection() { setVal(val); }
-    void setVal(const std::string& val) { _str = val; }
-    const std::string& getVal() const { return _str; }
-    virtual std::string getType() const { return "string"; };
-    virtual size_t getSize() const { return 32 + ValueEncoder::paddedTo32(_str.size()); }
-    virtual bool isDynamic() const { return true; }
-    virtual size_t getCount() const { return _str.size(); }
-    static void encodeString(const std::string& decoded, Data& data);
-    virtual void encode(Data& data) const { ParamString::encodeString(_str, data); }
-    static bool decodeString(const Data& encoded, std::string& decoded, size_t& offset_inout);
-    virtual bool decode(const Data& encoded, size_t& offset_inout) {
-        return decodeString(encoded, _str, offset_inout);
-    }
-    virtual bool setValueJson(const std::string& value) { _str = value; return true; }
-    virtual Data hashStruct() const;
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/Function.cpp b/src/Ethereum/ABI/Function.cpp
index 9057d539d74..be1007516fe 100644
--- a/src/Ethereum/ABI/Function.cpp
+++ b/src/Ethereum/ABI/Function.cpp
@@ -1,56 +1,210 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Function.h"
 
-#include <string>
+#include "rust/Wrapper.h"
+#include "TrustWalletCore/TWCoinType.h"
 
 namespace TW::Ethereum::ABI {
 
-Data Function::getSignature() const {
-    auto typ = getType();
-    auto hash = Hash::keccak256(Data(typ.begin(), typ.end()));
-    auto signature = Data(hash.begin(), hash.begin() + 4);
-    return signature;
+static constexpr std::size_t FUNCTION_SIGNATURE_LEN = 4;
+
+int Function::addParam(AbiProto::Param paramType, AbiProto::Token paramValue, bool isOutput) {
+    if (isOutput) {
+        auto idx = outputValues.size();
+        *outputs.add_params() = std::move(paramType);
+        outputValues.emplace_back(std::move(paramValue));
+        return static_cast<int>(idx);
+    }
+
+    auto idx = inputValues.size();
+    *inputs.add_params() = std::move(paramType);
+    inputValues.emplace_back(std::move(paramValue));
+    return static_cast<int>(idx);
 }
 
-void Function::encode(Data& data) const {
-    Data signature = getSignature();
-    append(data, signature);
-    _inParams.encode(data);
+int Function::addUintParam(uint32_t bits, const Data& encodedValue, bool isOutput) {
+    AbiProto::Param paramType;
+    paramType.mutable_param()->mutable_number_uint()->set_bits(bits);
+
+    AbiProto::Token paramValue;
+    auto* numValue = paramValue.mutable_number_uint();
+    numValue->set_bits(bits);
+    numValue->set_value(encodedValue.data(), encodedValue.size());
+
+    return addParam(std::move(paramType), std::move(paramValue), isOutput);
 }
 
-bool Function::decodeOutput(const Data& encoded, size_t& offset_inout) {
-    // read parameter values
-    if (!_outParams.decode(encoded, offset_inout)) {
-        return false;
+int Function::addIntParam(uint32_t bits, const Data& encodedValue, bool isOutput) {
+    AbiProto::Param paramType;
+    paramType.mutable_param()->mutable_number_int()->set_bits(bits);
+
+    AbiProto::Token paramValue;
+    auto* numValue = paramValue.mutable_number_int();
+    numValue->set_bits(bits);
+    numValue->set_value(encodedValue.data(), encodedValue.size());
+
+    return addParam(std::move(paramType), std::move(paramValue), isOutput);
+}
+
+int Function::addInArrayParam(int idx, AbiProto::ParamType paramType, AbiProto::Token paramValue) {
+    if (idx < 0) {
+        return -1;
     }
-    return true;
+
+    auto idxSize = static_cast<std::size_t>(idx);
+    if (idxSize >= inputValues.size()) {
+        return -1;
+    }
+
+    auto& arrayToken = inputValues[idxSize];
+    auto& arrayType = *inputs.mutable_params(idx)->mutable_param();
+
+    if (!arrayToken.has_array() || !arrayType.has_array()) {
+        return -1;
+    }
+
+    auto arrayInElementIdx = arrayToken.array().elements_size();
+
+    *arrayToken.mutable_array()->add_elements() = std::move(paramValue);
+    *arrayToken.mutable_array()->mutable_element_type() = paramType;
+    // Override the element type.
+    *arrayType.mutable_array()->mutable_element_type() = std::move(paramType);
+
+    return arrayInElementIdx;
 }
 
-bool Function::decodeInput(const Data& encoded, size_t& offset_inout) {
-    // read 4-byte hash
-    auto p = ParamByteArrayFix(4);
-    if (!p.decode(encoded, offset_inout)) {
-        return false;
+int Function::addInArrayUintParam(int idx, uint32_t bits, const Data& encodedValue) {
+    AbiProto::ParamType paramType;
+    paramType.mutable_number_uint()->set_bits(bits);
+
+    AbiProto::Token paramValue;
+    auto* numValue = paramValue.mutable_number_uint();
+    numValue->set_bits(bits);
+    numValue->set_value(encodedValue.data(), encodedValue.size());
+
+    return addInArrayParam(idx, std::move(paramType), std::move(paramValue));
+}
+
+int Function::addInArrayIntParam(int idx, uint32_t bits, const Data& encodedValue) {
+    AbiProto::ParamType paramType;
+    paramType.mutable_number_int()->set_bits(bits);
+
+    AbiProto::Token paramValue;
+    auto* numValue = paramValue.mutable_number_int();
+    numValue->set_bits(bits);
+    numValue->set_value(encodedValue.data(), encodedValue.size());
+
+    return addInArrayParam(idx, std::move(paramType), std::move(paramValue));
+}
+
+MaybeToken Function::getParam(int idx, bool isOutput) const {
+    const auto& values = isOutput ? outputValues : inputValues;
+
+    if (idx < 0) {
+        return {};
     }
-    std::vector<byte> hash = p.getVal();
-    // adjust offset; hash is NOT padded to 32 bytes
-    offset_inout = offset_inout - 32 + 4;
-    // verify hash
-    Data hashExpect = getSignature();
-    if (hash != hashExpect) {
-        // invalid hash
+
+    auto idxSize = static_cast<std::size_t>(idx);
+    if (idxSize >= values.size()) {
+        return {};
+    }
+
+    return values[idxSize];
+}
+
+bool Function::decode(const Data& encoded, bool isOutput) {
+    AbiProto::ParamsDecodingInput input;
+
+    input.set_encoded(encoded.data(), encoded.size());
+    if (isOutput) {
+        *input.mutable_abi_params() = outputs;
+    } else {
+        *input.mutable_abi_params() = inputs;
+    }
+
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    Rust::TWDataWrapper outputPtr = Rust::tw_ethereum_abi_decode_params(TWCoinTypeEthereum, inputData.get());
+
+    auto outputData = outputPtr.toDataOrDefault();
+    if (outputData.empty()) {
         return false;
     }
-    // read parameters
-    if (!_inParams.decode(encoded, offset_inout)) {
+
+    AbiProto::ParamsDecodingOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    if (output.error() != AbiProto::AbiError::OK) {
         return false;
     }
+
+    std::vector<AbiProto::Token> decoded;
+    for (const auto &param : output.tokens()) {
+        decoded.emplace_back(param);
+    }
+
+    if (isOutput) {
+        outputValues = decoded;
+    } else {
+        inputValues = decoded;
+    }
     return true;
 }
 
+std::string Function::getType() const {
+    AbiProto::FunctionGetTypeInput input;
+    input.set_function_name(name);
+    *input.mutable_inputs() = inputs.params();
+
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    Rust::TWStringWrapper outputPtr = Rust::tw_ethereum_abi_function_get_signature(TWCoinTypeEthereum, inputData.get());
+
+    return outputPtr.toStringOrDefault();
+}
+
+MaybeData Function::encodeFunctionCall(const std::string& functionName, const Tokens& tokens) {
+    AbiProto::FunctionEncodingInput input;
+    input.set_function_name(functionName);
+    for (const auto& token : tokens) {
+        *input.add_tokens() = token;
+    }
+
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    Rust::TWDataWrapper outputPtr = Rust::tw_ethereum_abi_encode_function(TWCoinTypeEthereum, inputData.get());
+
+    auto outputData = outputPtr.toDataOrDefault();
+    if (outputData.empty()) {
+        return {};
+    }
+
+    AbiProto::FunctionEncodingOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    if (output.error() != AbiProto::AbiError::OK) {
+        return {};
+    }
+
+    return data(output.encoded());
+}
+
+MaybeData Function::encodeFunctionCall(const std::string& functionName, const BaseParams& params) {
+    Tokens namedParams;
+    for (const auto& param : params) {
+        namedParams.push_back(param->toToken());
+    }
+    return encodeFunctionCall(functionName, namedParams);
+}
+
+MaybeData Function::encodeParams(const BaseParams& params) {
+    auto encoded = encodeFunctionCall("", params);
+    if (!encoded.has_value() || encoded.value().size() < FUNCTION_SIGNATURE_LEN) {
+        return {};
+    }
+
+    // The encoded data includes the function call signature (4 bytes). Erase it.
+    return subData(encoded.value(), FUNCTION_SIGNATURE_LEN);
+}
+
 } // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/Function.h b/src/Ethereum/ABI/Function.h
index f85af88bdcf..2bd474fadc0 100644
--- a/src/Ethereum/ABI/Function.h
+++ b/src/Ethereum/ABI/Function.h
@@ -1,77 +1,100 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "ParamBase.h"
-#include "Parameters.h"
-#include "Bytes.h"
+#include "ProtoParam.h"
+#include "proto/EthereumAbi.pb.h"
 
+#include "../../HexCoding.h"
 #include "../../uint256.h"
-#include "../../Hash.h"
 
+#include <memory>
+#include <optional>
 #include <string>
 
 namespace TW::Ethereum::ABI {
 
-/// Non-generic version of Function, templated version is impossible to pass around to and back over C interface
-/// (void* looses the template parameters).
+namespace AbiProto = EthereumAbi::Proto;
+
+using MaybeToken = std::optional<AbiProto::Token>;
+using MaybeData = std::optional<Data>;
+using Tokens = std::vector<AbiProto::Token>;
+
 class Function {
 public:
-    std::string name;
-    ParamSet _inParams;
-    ParamSet _outParams;
-
-    Function(std::string name) : name(std::move(name)) {}
-    Function(std::string name, const std::vector<std::shared_ptr<ParamBase>>& inParams)
-        : name(std::move(name)), _inParams(ParamSet(inParams)) {}
-    virtual ~Function() {}
-    /// Add an input parameter. Returns the index of the parameter.
-    int addInParam(std::shared_ptr<ParamBase> param) {
-        return _inParams.addParam(param);
-    }
-    /// Add an output parameter. Returns the index of the parameter.
-    int addOutParam(std::shared_ptr<ParamBase> param) {
-        return _outParams.addParam(param);
-    }
-    /// Add an input or output parameter. Returns the index of the parameter.
-    int addParam(std::shared_ptr<ParamBase> param, bool isOutput = false) {
-        return isOutput ? _outParams.addParam(param) : _inParams.addParam(param);
-    }
-    /// Get an input parameter.
-    bool getInParam(int paramIndex, std::shared_ptr<ParamBase>& param_out) {
-        return _inParams.getParam(paramIndex, param_out);
-    }
-    /// Get an output parameter.
-    bool getOutParam(int paramIndex, std::shared_ptr<ParamBase>& param_out) {
-        return _outParams.getParam(paramIndex, param_out);
+    explicit Function(std::string name): name(std::move(name)) {}
+
+    /// Adds an input or output parameter. Returns the index of the parameter.
+    int addParam(AbiProto::Param paramType, AbiProto::Token paramValue, bool isOutput = false);
+
+    /// Adds an input or output uint parameter. Returns the index of the parameter.
+    int addUintParam(uint32_t bits, const Data& encodedValue, bool isOutput = false);
+
+    /// Adds an input or output int parameter. Returns the index of the parameter.
+    int addIntParam(uint32_t bits, const Data& encodedValue, bool isOutput = false);
+
+    /// Adds a parameter to the input array.
+    /// Please note the array should be present at `inputValues[idx]`.
+    int addInArrayParam(int idx, AbiProto::ParamType paramType, AbiProto::Token paramValue);
+
+    /// Adds a uint parameter to the input array.
+    /// Please note the array should be present at `inputValues[idx]`.
+    int addInArrayUintParam(int idx, uint32_t bits, const Data& encodedValue);
+
+    /// Adds an int parameter to the input array.
+    /// Please note the array should be present at `inputValues[idx]`.
+    int addInArrayIntParam(int idx, uint32_t bits, const Data& encodedValue);
+
+    /// Returns an input or output parameter.
+    MaybeToken getParam(int idx, bool isOutput = false) const;
+
+    /// Returns the data of an input or output uint parameter.
+    Data getUintParamData(int idx, uint32_t bits, bool isOutput = false) const {
+        auto param = getParam(idx, isOutput);
+        if (!param.has_value() || !param->has_number_uint() || param->number_uint().bits() != bits) {
+            return store(0);
+        }
+        return data(param->number_uint().value());
     }
-    /// Get an input or output parameter.
-    bool getParam(int paramIndex, std::shared_ptr<ParamBase>& param_out, bool isOutput = false) {
-        return isOutput ? _outParams.getParam(paramIndex, param_out) : _inParams.getParam(paramIndex, param_out);
+
+    /// Returns an input or output uint parameter.
+    template <typename T>
+    T getUintParam(int idx, uint32_t bits, bool isOutput = false) const  {
+        auto valueData = getUintParamData(idx, bits, isOutput);
+        auto val256 = load(valueData);
+        return static_cast<T>(val256);
     }
-    /// Return the function type signature, of the form "baz(int32,uint256)"
-    std::string getType() const {
-        return name + _inParams.getType();
+
+    /// Encodes a function call to Eth ABI binary.
+    MaybeData encodeInput() const {
+        return encodeFunctionCall(name, inputValues);
     }
 
-    /// Return the 4-byte function signature
-    Data getSignature() const;
+    /// Decode binary, fill input or output parameters.
+    bool decode(const Data& encoded, bool isOutput = false);
 
-    virtual void encode(Data& data) const;
+    /// Returns the function type signature, of the form "baz(int32,uint256)".
+    std::string getType() const;
 
-    /// Decode binary, fill output parameters
-    bool decodeOutput(const Data& encoded, size_t& offset_inout);
-    /// Decode binary, fill input parameters
-    bool decodeInput(const Data& encoded, size_t& offset_inout);
-};
+    /// Encodes a function call to Eth ABI binary.
+    static MaybeData encodeFunctionCall(const std::string& functionName, const Tokens& params);
 
-inline void encode(const Function& func, Data& data) {
-    func.encode(data);
-}
+    /// Encodes a function call to Eth ABI binary.
+    static MaybeData encodeFunctionCall(const std::string& functionName, const BaseParams& params);
+
+    /// Encodes params to Eth ABI binary.
+    static MaybeData encodeParams(const BaseParams& params);
+
+private:
+    std::string name;
+    AbiProto::AbiParams inputs;
+    AbiProto::AbiParams outputs;
+
+    Tokens inputValues;
+    Tokens outputValues;
+};
 
 } // namespace TW::Ethereum::ABI
 
diff --git a/src/Ethereum/ABI/ParamAddress.cpp b/src/Ethereum/ABI/ParamAddress.cpp
deleted file mode 100644
index 2d06aca161e..00000000000
--- a/src/Ethereum/ABI/ParamAddress.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "ParamAddress.h"
-#include <HexCoding.h>
-#include <uint256.h>
-
-namespace TW::Ethereum::ABI {
-
-Data ParamAddress::getData() const {
-    Data data = store(getVal(), bytes);
-    return data;
-}
-
-bool ParamAddress::setValueJson(const std::string& value) {
-    setVal(load(parse_hex(value)));
-    return true;
-}
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamAddress.h b/src/Ethereum/ABI/ParamAddress.h
deleted file mode 100644
index ea9faef9ed9..00000000000
--- a/src/Ethereum/ABI/ParamAddress.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "ParamNumber.h"
-#include <Data.h>
-
-namespace TW::Ethereum::ABI {
-
-/// 160-bit Address parameter, "address".  Padded to the right, treated like ParamUInt160
-class ParamAddress: public ParamUIntN
-{
-public:
-    static const size_t bytes = 20;
-    ParamAddress(): ParamUIntN(bytes * 8) {}
-    ParamAddress(const Data& val): ParamUIntN(bytes * 8, load(val)) {}
-    virtual std::string getType() const { return "address"; };
-    // get the value as (20-byte) byte array (as opposed to uint256_t)
-    Data getData() const;
-    virtual bool setValueJson(const std::string& value);
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamBase.cpp b/src/Ethereum/ABI/ParamBase.cpp
deleted file mode 100644
index 4fde27f0410..00000000000
--- a/src/Ethereum/ABI/ParamBase.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "ParamBase.h"
-
-namespace TW::Ethereum::ABI {
-
-// Default implementation for simple types: return encoded value (32 bytes)
-Data ParamBase::hashStruct() const {
-    Data encoded;
-    encode(encoded);
-    return encoded;
-}
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamBase.h b/src/Ethereum/ABI/ParamBase.h
deleted file mode 100644
index 161abdc7c0c..00000000000
--- a/src/Ethereum/ABI/ParamBase.h
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-
-#include <string>
-
-namespace TW::Ethereum::ABI {
-
-/// Abstract base class for parameters.
-class ParamBase
-{
-public:
-    virtual ~ParamBase() = default;
-    virtual std::string getType() const = 0;
-    virtual size_t getSize() const = 0;
-    virtual bool isDynamic() const = 0;
-    virtual void encode(Data& data) const = 0;
-    virtual bool decode(const Data& encoded, size_t& offset_inout) = 0;
-    virtual bool setValueJson(const std::string& value) = 0;
-    // EIP712-style hash of the value (used for signing); default implementation
-    virtual Data hashStruct() const;
-    // Helper for EIP712 encoding; provide full type of all used types (recursively).  Default is empty implementation.
-    virtual std::string getExtraTypes([[maybe_unused]] std::vector<std::string>& ignoreList) const { return ""; }
-};
-
-/// Collection of parameters base class
-class ParamCollection: public ParamBase
-{
-public:
-    virtual size_t getCount() const = 0;
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamFactory.cpp b/src/Ethereum/ABI/ParamFactory.cpp
deleted file mode 100644
index 9a61eb71c1d..00000000000
--- a/src/Ethereum/ABI/ParamFactory.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "ParamFactory.h"
-#include "ParamAddress.h"
-#include "HexCoding.h"
-
-#include <nlohmann/json.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-
-using namespace std;
-using namespace boost::algorithm;
-using json = nlohmann::json;
-
-namespace TW::Ethereum::ABI {
-
-static int parseBitSize(const std::string& type) {
-    int size = stoi(type);
-    if (size < 8 || size > 256 || size % 8 != 0 ||
-        size == 8 || size == 16 || size == 32 || size == 64 || size == 256) {
-        throw invalid_argument("invalid bit size");
-    }
-    return size;
-}
-
-static std::shared_ptr<ParamBase> makeUInt(const std::string& type) {
-    auto bits = parseBitSize(type);
-    return make_shared<ParamUIntN>(bits);
-}
-
-static std::shared_ptr<ParamBase> makeInt(const std::string& type) {
-    auto bits = parseBitSize(type);
-    return make_shared<ParamIntN>(bits);
-}
-
-static bool isArrayType(const std::string& type) {
-    return ends_with(type, "[]") && type.length() >= 3;
-}
-
-static std::string getArrayElemType(const std::string& arrayType) {
-    if (isArrayType(arrayType)) {
-        return arrayType.substr(0, arrayType.length() - 2);
-    }
-    return "";
-}
-
-std::shared_ptr<ParamBase> ParamFactory::make(const std::string& type) {
-    shared_ptr<ParamBase> param;
-    if (isArrayType(type)) {
-        auto elemType = getArrayElemType(type);
-        auto elemParam = make(elemType);
-        if (!elemParam) {
-            return param;
-        }
-        param = make_shared<ParamArray>(elemParam);
-    } else if (type == "address") {
-        param = make_shared<ParamAddress>();
-    } else if (type == "uint8") {
-        param = make_shared<ParamUInt8>();
-    } else if (type == "uint16") {
-        param = make_shared<ParamUInt16>();
-    } else if (type == "uint32") {
-        param = make_shared<ParamUInt32>();
-    } else if (type == "uint64") {
-        param = make_shared<ParamUInt64>();
-    } else if (type == "uint256" || type == "uint") {
-        param = make_shared<ParamUInt256>();
-    } else if (type == "int8") {
-        param = make_shared<ParamInt8>();
-    } else if (type == "int16") {
-        param = make_shared<ParamInt16>();
-    } else if (type == "int32") {
-        param = make_shared<ParamInt32>();
-    } else if (type == "int64") {
-        param = make_shared<ParamInt64>();
-    } else if (type == "int256" || type == "int") {
-        param = make_shared<ParamInt256>();
-    } else if (starts_with(type, "uint")) {
-        param = makeUInt(type.substr(4, type.size() - 1));
-    } else if (starts_with(type, "int")) {
-        param = makeInt(type.substr(3, type.size() - 1));
-    } else if (type == "bool") {
-        param = make_shared<ParamBool>();
-    } else if (type == "bytes") {
-        param = make_shared<ParamByteArray>();
-    } else if (starts_with(type, "bytes")) {
-        auto bits = stoi(type.substr(5, type.size() - 1));
-        param = make_shared<ParamByteArrayFix>(bits);
-    } else if (type == "string") {
-        param = make_shared<ParamString>();
-    }
-    return param;
-}
-
-std::string joinArrayElems(const std::vector<std::string>& strings) {
-    auto array = json::array();
-    for (const auto& string : strings) {
-        // parse to prevent quotes on simple values
-        auto value = json::parse(string, nullptr, false);
-        if (value.is_discarded()) {
-            // fallback
-            value = json(string);
-        }
-        array.push_back(value);
-    }
-    return array.dump();
-}
-
-std::shared_ptr<ParamNamed> ParamFactory::makeNamed(const std::string& name, const std::string& type) {
-    auto param = make(type);
-    if (!param) {
-        return nullptr;
-    }
-    return std::make_shared<ParamNamed>(name, param);
-}
-
-bool ParamFactory::isPrimitive(const std::string& type) {
-    if (starts_with(type, "address")) {
-        return true;
-    } else if (starts_with(type, "uint")) {
-        return true;
-    } else if (starts_with(type, "int")) {
-        return true;
-    } else if (starts_with(type, "bool")) {
-        return true;
-    } else if (starts_with(type, "bytes")) {
-        return true;
-    } else if (starts_with(type, "string")) {
-        return true;
-    }
-    return false;
-}
-
-std::string ParamFactory::getValue(const std::shared_ptr<ParamBase>& param, const std::string& type) {
-    std::string result = "";
-    if (isArrayType(type)) {
-        auto values = getArrayValue(param, type);
-        result = joinArrayElems(values);
-    } else if (type == "address") {
-        auto value = dynamic_pointer_cast<ParamAddress>(param);
-        result = hexEncoded(value->getData());
-    } else if (type == "uint8") {
-        result = boost::lexical_cast<std::string>((uint)dynamic_pointer_cast<ParamUInt8>(param)->getVal());
-    } else if (type == "uint16") {
-        result = boost::lexical_cast<std::string>(dynamic_pointer_cast<ParamUInt16>(param)->getVal());
-    } else if (type == "uint32") {
-        result = boost::lexical_cast<std::string>(dynamic_pointer_cast<ParamUInt32>(param)->getVal());
-    } else if (type == "uint64") {
-        result = boost::lexical_cast<std::string>(dynamic_pointer_cast<ParamUInt64>(param)->getVal());
-    } else if (type == "uint256" || type == "uint") {
-        result = boost::lexical_cast<std::string>(dynamic_pointer_cast<ParamUInt256>(param)->getVal());
-    } else if (type == "int8") {
-        result = boost::lexical_cast<std::string>((int)dynamic_pointer_cast<ParamInt8>(param)->getVal());
-    } else if (type == "int16") {
-        result = boost::lexical_cast<std::string>(dynamic_pointer_cast<ParamInt16>(param)->getVal());
-    } else if (type == "int32") {
-        result = boost::lexical_cast<std::string>(dynamic_pointer_cast<ParamInt32>(param)->getVal());
-    } else if (type == "int64") {
-        result = boost::lexical_cast<std::string>(dynamic_pointer_cast<ParamInt64>(param)->getVal());
-    } else if (type == "int256" || type == "int") {
-        result = boost::lexical_cast<std::string>(dynamic_pointer_cast<ParamInt256>(param)->getVal());
-    } else if (starts_with(type, "uint")) {
-        auto value = dynamic_pointer_cast<ParamUIntN>(param);
-        result = boost::lexical_cast<std::string>(value->getVal());
-    } else if (starts_with(type, "int")) {
-        auto value = dynamic_pointer_cast<ParamIntN>(param);
-        result = boost::lexical_cast<std::string>(value->getVal());
-    } else if (type == "bool") {
-        auto value = dynamic_pointer_cast<ParamBool>(param);
-        result = value->getVal() ? "true" : "false";
-    } else if (type == "bytes") {
-        auto value = dynamic_pointer_cast<ParamByteArray>(param);
-        result = hexEncoded(value->getVal());
-    } else if (starts_with(type, "bytes")) {
-        auto value = dynamic_pointer_cast<ParamByteArrayFix>(param);
-        result = hexEncoded(value->getVal());
-    } else if (type == "string") {
-        auto value = dynamic_pointer_cast<ParamString>(param);
-        result = value->getVal();
-    }
-    return result;
-}
-
-std::vector<std::string> ParamFactory::getArrayValue(const std::shared_ptr<ParamBase>& param, const std::string& type) {
-    if (!isArrayType(type)) {
-        return std::vector<std::string>();
-    }
-    auto array = dynamic_pointer_cast<ParamArray>(param);
-    if (!array) {
-        return std::vector<std::string>();
-    }
-    auto elemType = getArrayElemType(type);
-    auto elems = array->getVal();
-    std::vector<std::string> values(elems.size());
-    for (auto i = 0ul; i < elems.size(); ++i) {
-        values[i] = getValue(elems[i], elemType);
-    }
-    return values;
-}
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamFactory.h b/src/Ethereum/ABI/ParamFactory.h
deleted file mode 100644
index 7ccdb948684..00000000000
--- a/src/Ethereum/ABI/ParamFactory.h
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Array.h"
-#include "Bytes.h"
-#include "ParamBase.h"
-#include "ParamStruct.h"
-
-#include <string>
-#include <vector>
-
-#include "Wasm.h"
-
-namespace TW::Ethereum::ABI {
-
-/// Factory creates concrete ParamBase class from string type.
-class ParamFactory {
-public:
-    /// Create a param of given type
-    static std::shared_ptr<ParamBase> make(const std::string& type);
-    /// Create a named param, with given name and type
-    static std::shared_ptr<ParamNamed> makeNamed(const std::string& name, const std::string& type);
-    /// Check if given type is a primitive type
-    static bool isPrimitive(const std::string& type);
-
-    static std::string getValue(const std::shared_ptr<ParamBase>& param, const std::string& type);
-    static std::vector<std::string> getArrayValue(const std::shared_ptr<ParamBase>& param,
-                                                  const std::string& type);
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamNumber.cpp b/src/Ethereum/ABI/ParamNumber.cpp
deleted file mode 100644
index 07c05516883..00000000000
--- a/src/Ethereum/ABI/ParamNumber.cpp
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "ParamNumber.h"
-
-#include <Data.h>
-#include <uint256.h>
-#include <HexCoding.h>
-
-#include <boost/lexical_cast.hpp>
-
-#include <string>
-#include <cassert>
-
-namespace TW::Ethereum::ABI {
-
-bool ParamUInt256::setUInt256FromValueJson(uint256_t& dest, const std::string& value) {
-    // try hex string or number
-    if (value.length() >= 3 && value.substr(0, 2) == "0x") {
-        dest = load(parse_hex(value));
-        return true;
-    }
-    return boost::conversion::detail::try_lexical_convert(value, dest);
-}
-
-bool ParamInt256::setInt256FromValueJson(int256_t& dest, const std::string& value) {
-    // try hex string or number
-    if (value.length() >= 3 && value.substr(0, 2) == "0x") {
-        dest = ValueEncoder::int256FromUint256(load(parse_hex(value)));
-        return true;
-    }
-    return boost::conversion::detail::try_lexical_convert(value, dest);
-}
-
-bool ParamBool::setValueJson(const std::string& value) {
-    if (value == "true" || value == "1") {
-        setVal(true);
-        return true;
-    }
-    if (value == "false" || value == "0") {
-        setVal(false);
-        return true;
-    }
-    return false;
-}
-
-bool ParamUInt8::setValueJson(const std::string& value) {
-    uint16_t val;
-    if (!boost::conversion::detail::try_lexical_convert(value, val)) {
-        return false;
-    }
-    setVal(static_cast<uint8_t>(val));
-    return true;
-}
-
-bool ParamInt8::setValueJson(const std::string& value) {
-    int16_t val;
-    if (!boost::conversion::detail::try_lexical_convert(value, val)) {
-        return false;
-    }
-    setVal(static_cast<int8_t>(val));
-    return true;
-}
-
-void ParamUIntN::setVal(uint256_t val) {
-    // mask it to the given bits
-    _val = val & _mask;
-}
-
-bool ParamUIntN::decode(const Data& encoded, size_t& offset_inout) {
-    uint256_t temp;
-    auto res = decodeNumber(encoded, temp, offset_inout);
-    setVal(temp);
-    return res;
-}
-
-void ParamUIntN::init() {
-    _mask = maskForBits(bits);
-}
-
-uint256_t ParamUIntN::maskForBits(size_t bits) {
-    assert(bits >= 8 && bits <= 256 && (bits % 8) == 0);
-    // exclude predefined sizes
-    assert(bits != 8 && bits != 16 && bits != 32 && bits != 64 && bits != 256);
-    return (uint256_t(1) << bits) - 1;
-}
-
-void ParamIntN::setVal(int256_t val) {
-    // mask it to the given bits
-    if (val < 0) {
-        _val = ValueEncoder::int256FromUint256(~((~((uint256_t)val)) & _mask));
-    } else {
-        _val = ValueEncoder::int256FromUint256(((uint256_t)val) & _mask);
-    }
-}
-
-bool ParamIntN::decodeNumber(const Data& encoded, int256_t& decoded, size_t& offset_inout) {
-    uint256_t valU;
-    auto res = ABI::decode(encoded, valU, offset_inout);
-    decoded = ValueEncoder::int256FromUint256(valU);
-    return res;
-}
-
-bool ParamIntN::decode(const Data& encoded, size_t& offset_inout) {
-    int256_t temp;
-    auto res = decodeNumber(encoded, temp, offset_inout);
-    setVal(temp);
-    return res;
-}
-
-void ParamIntN::init() {
-    _mask = ParamUIntN::maskForBits(bits);
-}
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamNumber.h b/src/Ethereum/ABI/ParamNumber.h
deleted file mode 100644
index 7b9beb3c80c..00000000000
--- a/src/Ethereum/ABI/ParamNumber.h
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "ParamBase.h"
-#include "ValueEncoder.h"
-
-#include <Data.h>
-#include <uint256.h>
-
-#include <boost/lexical_cast.hpp>
-
-#include <string>
-
-namespace TW::Ethereum::ABI {
-
-
-inline bool decode(const Data& encoded, uint256_t& decoded, size_t& offset_inout)
-{
-    decoded = 0u;
-    if (encoded.empty() || (encoded.size() < (ValueEncoder::encodedIntSize + offset_inout))) {
-        return false;
-    }
-    decoded = loadWithOffset(encoded, offset_inout);
-    offset_inout += ValueEncoder::encodedIntSize;
-    return true;
-}
-
-/// Generic parameter class for numeric types, like bool, uint32, int64, etc.  All are stored on 256 bits.
-template<typename T> 
-class ParamNumberType : public ParamBase
-{
-public:
-    ParamNumberType() = default;
-    ParamNumberType(T val) { _val = val; }
-    void setVal(T val) { _val = val; }
-    T getVal() const { return _val; }
-    virtual std::string getType() const = 0;
-    virtual size_t getSize() const { return ValueEncoder::encodedIntSize; }
-    virtual bool isDynamic() const { return false; }
-    virtual void encode(Data& data) const {
-        // cast up
-        ValueEncoder::encodeUInt256(static_cast<uint256_t>(_val), data);
-    }
-    static bool decodeNumber(const Data& encoded, T& decoded, size_t& offset_inout) {
-        uint256_t val256;
-        if (!ABI::decode(encoded, val256, offset_inout)) { return false; }
-        // cast down
-        decoded = static_cast<T>(val256);
-        return true;
-    }
-    virtual bool decode(const Data& encoded, size_t& offset_inout) {
-        return decodeNumber(encoded, _val, offset_inout);
-    }
-    virtual bool setValueJson(const std::string& value) {
-        return boost::conversion::detail::try_lexical_convert(value, _val);
-    }
-protected:
-    T _val;
-};
-
-class ParamUInt256 : public ParamNumberType<uint256_t>
-{
-public:
-    ParamUInt256() : ParamNumberType<uint256_t>(uint256_t(0)) {}
-    ParamUInt256(uint256_t val) : ParamNumberType<uint256_t>(val) {}
-    virtual std::string getType() const { return "uint256"; }
-    uint256_t getVal() const { return ParamNumberType<uint256_t>::getVal(); }
-    virtual bool setValueJson(const std::string& value) { return setUInt256FromValueJson(_val, value); }
-    static bool setUInt256FromValueJson(uint256_t& dest, const std::string& value);
-};
-
-class ParamInt256 : public ParamNumberType<int256_t>
-{
-public:
-    ParamInt256() : ParamNumberType<int256_t>(int256_t(0)) {}
-    ParamInt256(int256_t val) : ParamNumberType<int256_t>(val) {}
-    virtual std::string getType() const { return "int256"; }
-    int256_t getVal() const { return ParamNumberType<int256_t>::getVal(); }
-    virtual bool setValueJson(const std::string& value) { return setInt256FromValueJson(_val, value); }
-    static bool setInt256FromValueJson(int256_t& dest, const std::string& value);
-};
-
-class ParamBool : public ParamNumberType<bool>
-{
-public:
-    ParamBool() : ParamNumberType<bool>(false) {}
-    ParamBool(bool val) : ParamNumberType<bool>(val) {}
-    virtual std::string getType() const { return "bool"; }
-    bool getVal() const { return ParamNumberType<bool>::getVal(); }
-    virtual bool setValueJson(const std::string& value);
-};
-
-class ParamUInt8 : public ParamNumberType<uint8_t>
-{
-public:
-    ParamUInt8() : ParamNumberType<uint8_t>(0) {}
-    ParamUInt8(uint8_t val) : ParamNumberType<uint8_t>(val) {}
-    virtual std::string getType() const { return "uint8"; }
-    virtual bool setValueJson(const std::string& value);
-};
-
-class ParamInt8 : public ParamNumberType<int8_t>
-{
-public:
-    ParamInt8() : ParamNumberType<int8_t>(0) {}
-    ParamInt8(int8_t val) : ParamNumberType<int8_t>(val) {}
-    virtual std::string getType() const { return "int8"; }
-    virtual bool setValueJson(const std::string& value);
-};
-
-class ParamUInt16 : public ParamNumberType<uint16_t>
-{
-public:
-    ParamUInt16() : ParamNumberType<uint16_t>(0) {}
-    ParamUInt16(uint16_t val) : ParamNumberType<uint16_t>(val) {}
-    virtual std::string getType() const { return "uint16"; }
-};
-
-class ParamInt16 : public ParamNumberType<int16_t>
-{
-public:
-    ParamInt16() : ParamNumberType<int16_t>(0) {}
-    ParamInt16(int16_t val) : ParamNumberType<int16_t>(val) {}
-    virtual std::string getType() const { return "int16"; }
-};
-
-class ParamUInt32 : public ParamNumberType<uint32_t>
-{
-public:
-    ParamUInt32() : ParamNumberType<uint32_t>(0) {}
-    ParamUInt32(uint32_t val) : ParamNumberType<uint32_t>(val) {}
-    virtual std::string getType() const { return "uint32"; }
-};
-
-class ParamInt32 : public ParamNumberType<int32_t>
-{
-public:
-    ParamInt32() : ParamNumberType<int32_t>(0) {}
-    ParamInt32(int32_t val) : ParamNumberType<int32_t>(val) {}
-    virtual std::string getType() const { return "int32"; }
-};
-
-class ParamUInt64 : public ParamNumberType<uint64_t>
-{
-public:
-    ParamUInt64() : ParamNumberType<uint64_t>(0) {}
-    ParamUInt64(uint64_t val) : ParamNumberType<uint64_t>(val) {}
-    virtual std::string getType() const { return "uint64"; }
-};
-
-class ParamInt64 : public ParamNumberType<int64_t>
-{
-public:
-    ParamInt64() : ParamNumberType<int64_t>(0) {}
-    ParamInt64(int64_t val) : ParamNumberType<int64_t>(val) {}
-    virtual std::string getType() const { return "int64"; }
-};
-
-/// Generic parameter class for all other bit sizes, like UInt24, 40, 48, ... 248.
-/// For predefined sizes (8, 16, 32, 64, 256) use the sepcial types like UInt32.
-/// Stored on 256 bits.
-class ParamUIntN : public ParamBase
-{
-public:
-    const size_t bits;
-    ParamUIntN(size_t bits_in) : bits(bits_in) { init(); }
-    ParamUIntN(size_t bits_in, uint256_t val) : bits(bits_in) { init(); setVal(val); }
-    void setVal(uint256_t val);
-    uint256_t getVal() const { return _val; }
-    virtual std::string getType() const { return "uint" + std::to_string(bits); }
-    virtual size_t getSize() const { return ValueEncoder::encodedIntSize; }
-    virtual bool isDynamic() const { return false; }
-    virtual void encode(Data& data) const { ValueEncoder::encodeUInt256(_val, data); }
-    static bool decodeNumber(const Data& encoded, uint256_t& decoded, size_t& offset_inout) {
-        return ABI::decode(encoded, decoded, offset_inout);
-    }
-    virtual bool decode(const Data& encoded, size_t& offset_inout);
-    static uint256_t maskForBits(size_t bits);
-    virtual bool setValueJson(const std::string& value) { return ParamUInt256::setUInt256FromValueJson(_val, value); }
-
-private:
-    void init();
-    uint256_t _val;
-    uint256_t _mask;
-};
-
-/// Generic parameter class for all other bit sizes, like Int24, 40, 48, ... 248.
-/// For predefined sizes (8, 16, 32, 64, 256) use the sepcial types like Int32.
-/// Stored on 256 bits.
-class ParamIntN : public ParamBase
-{
-public:
-    const size_t bits;
-    ParamIntN(size_t bits_in) : bits(bits_in) { init(); }
-    ParamIntN(size_t bits_in, int256_t val) : bits(bits_in) { init(); setVal(val); }
-    void setVal(int256_t val);
-    int256_t getVal() const { return _val; }
-    virtual std::string getType() const { return "int" + std::to_string(bits); }
-    virtual size_t getSize() const { return ValueEncoder::encodedIntSize; }
-    virtual bool isDynamic() const { return false; }
-    virtual void encode(Data& data) const { ValueEncoder::encodeUInt256((uint256_t)_val, data); }
-    static bool decodeNumber(const Data& encoded, int256_t& decoded, size_t& offset_inout);
-    virtual bool decode(const Data& encoded, size_t& offset_inout);
-    virtual bool setValueJson(const std::string& value) { return ParamInt256::setInt256FromValueJson(_val, value); }
-
-private:
-    void init();
-    int256_t _val;
-    uint256_t _mask;
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamStruct.cpp b/src/Ethereum/ABI/ParamStruct.cpp
deleted file mode 100644
index 7910c0db7f5..00000000000
--- a/src/Ethereum/ABI/ParamStruct.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "ParamStruct.h"
-#include "ValueEncoder.h"
-#include "ParamFactory.h"
-#include <Hash.h>
-#include <HexCoding.h>
-
-#include <algorithm>
-#include <nlohmann/json.hpp>
-
-#include <cassert>
-#include <string>
-
-namespace TW::Ethereum::ABI {
-
-using json = nlohmann::json;
-
-static const Data EipStructPrefix = parse_hex("1901");
-static const auto Eip712Domain = "EIP712Domain";
-
-std::string ParamNamed::getType() const {
-    return _param->getType() + " " + _name;
-}
-
-ParamSetNamed::~ParamSetNamed() {
-    _params.clear();
-}
-
-/// Returns the index of the parameter
-int ParamSetNamed::addParam(const std::shared_ptr<ParamNamed>& param) {
-    if (param.get() == nullptr) {
-        return -1;
-    }
-    assert(param.get() != nullptr);
-    _params.push_back(param);
-    return static_cast<int>(_params.size() - 1);
-}
-
-void ParamSetNamed::addParams(const std::vector<std::shared_ptr<ParamNamed>>& params) {
-    for (auto p : params) {
-        addParam(p);
-    }
-}
-
-std::string ParamSetNamed::getType() const {
-    std::string t = "(";
-    int cnt = 0;
-    for (auto p : _params) {
-        if (cnt++ > 0) {
-            t += ",";
-        }
-        t += p->getType();
-    }
-    t += ")";
-    return t;
-}
-
-Data ParamSetNamed::encodeHashes() const {
-    Data hashes;
-    for (auto p : _params) {
-        append(hashes, p->hashStruct());
-    }
-    return hashes;
-}
-
-std::string ParamSetNamed::getExtraTypes(std::vector<std::string>& ignoreList) const {
-    std::string types;
-
-    auto params = _params;
-    /// referenced struct type should be sorted by name see: https://eips.ethereum.org/EIPS/eip-712#definition-of-encodetype
-    std::stable_sort(params.begin(), params.end(), [](auto& a, auto& b) {
-        auto lhs = a->getType();
-        auto rhs = b->getType();
-        if (ParamFactory::isPrimitive(lhs)) {
-            return true;
-        }
-        if (ParamFactory::isPrimitive(rhs)) {
-            return true;
-        }
-        return lhs.compare(rhs) < 0;
-    });
-
-    for (auto& p : params) {
-        auto pType = p->_param->getType();
-        if (std::find(ignoreList.begin(), ignoreList.end(), pType) == ignoreList.end()) {
-            types += p->getExtraTypes(ignoreList);
-            ignoreList.push_back(pType);
-        }
-    }
-    return types;
-}
-
-std::shared_ptr<ParamNamed> ParamSetNamed::findParamByName(const std::string& name) const {
-    for (auto& p : _params) {
-        if (p->_name == name) {
-            return p;
-        }
-    }
-    return nullptr;
-}
-
-Data ParamStruct::hashType() const {
-    return Hash::keccak256(TW::data(encodeType()));
-}
-
-Data ParamStruct::encodeHashes() const {
-    Data hashes;
-    Data paramsHashes = _params.encodeHashes();
-    if (paramsHashes.size() > 0) {
-        auto fullType = encodeType();
-        hashes = Hash::keccak256(TW::data(fullType));
-        append(hashes, paramsHashes);
-    }
-    return hashes;
-}
-
-Data ParamStruct::hashStruct() const {
-    Data hash(32);
-    Data hashes = encodeHashes();
-    if (hashes.size() > 0) {
-        hash = Hash::keccak256(hashes);
-    }
-    return hash;
-}
-
-std::string ParamStruct::getExtraTypes(std::vector<std::string>& ignoreList) const {
-    std::string types;
-    if (std::find(ignoreList.begin(), ignoreList.end(), _name) == ignoreList.end()) {
-        types += _name + _params.getType();
-        ignoreList.push_back(_name);
-    }
-    types += _params.getExtraTypes(ignoreList);
-    return types;
-}
-
-Data ParamStruct::hashStructJson(const std::string& messageJson) {
-    auto message = json::parse(messageJson, nullptr, false);
-    if (message.is_discarded()) {
-        throw std::invalid_argument("Could not parse Json");
-    }
-    if (!message.is_object()) {
-        throw std::invalid_argument("Expecting Json object");
-    }
-    if (!message.contains("primaryType") || !message["primaryType"].is_string()) {
-        throw std::invalid_argument("Top-level string field 'primaryType' missing");
-    }
-    if (!message.contains("domain") || !message["domain"].is_object()) {
-        throw std::invalid_argument("Top-level object field 'domain' missing");
-    }
-    if (!message.contains("message") || !message["message"].is_object()) {
-        throw std::invalid_argument("Top-level object field 'message' missing");
-    }
-    if (!message.contains("types") || !message["types"].is_object()) {
-        throw std::invalid_argument("Top-level object field 'types' missing");
-    }
-
-    // concatenate hashes
-    Data hashes = EipStructPrefix;
-
-    auto domainStruct = makeStruct(
-        Eip712Domain,
-        message["domain"].dump(),
-        message["types"].dump());
-    if (domainStruct) {
-        TW::append(hashes, domainStruct->hashStruct());
-
-        auto messageStruct = makeStruct(
-            message["primaryType"].get<std::string>(),
-            message["message"].dump(),
-            message["types"].dump());
-        if (messageStruct) {
-            const auto messageHash = messageStruct->hashStruct();
-            TW::append(hashes, messageHash);
-            return Hash::keccak256(hashes);
-        }
-    }
-    return {}; // fallback
-}
-
-std::shared_ptr<ParamStruct> findType(const std::string& typeName, const std::vector<std::shared_ptr<ParamStruct>>& types) {
-    for (auto& t : types) {
-        if (t->getType() == typeName) {
-            return t;
-        }
-    }
-    return nullptr;
-}
-
-std::shared_ptr<ParamStruct> ParamStruct::makeStruct(const std::string& structType, const std::string& valueJson, const std::string& typesJson) {
-    try {
-        // parse types
-        auto types = makeTypes(typesJson);
-        // find type info
-        auto typeInfo = findType(structType, types);
-        if (!typeInfo) {
-            throw std::invalid_argument("Type not found, " + structType);
-        }
-        auto values = json::parse(valueJson, nullptr, false);
-        if (values.is_discarded()) {
-            throw std::invalid_argument("Could not parse value Json");
-        }
-        if (!values.is_object()) {
-            throw std::invalid_argument("Expecting object");
-        }
-        std::vector<std::shared_ptr<ParamNamed>> params;
-        const auto& typeParams = typeInfo->getParams();
-        // iterate through the type; order is important and field order in the value json is not defined
-        for (auto i = 0ul; i < typeParams.getCount(); ++i) {
-            auto name = typeParams.getParam(static_cast<int>(i))->getName();
-            auto type = typeParams.getParam(static_cast<int>(i))->getParam()->getType();
-            // look for it in value (may throw)
-            auto value = values[name];
-            // first try simple params
-            auto paramVal = ParamFactory::make(type);
-            if (paramVal) {
-                if (!values.is_null()) {
-                    std::string valueString = value.is_string() ? value.get<std::string>() : value.dump();
-                    if (!paramVal->setValueJson(valueString)) {
-                        throw std::invalid_argument("Could not set type for param " + name);
-                    }
-                }
-                params.push_back(std::make_shared<ParamNamed>(name, paramVal));
-            } else if (type.length() >= 2 && type.substr(type.length() - 2, 2) == "[]") {
-                // array of struct
-                auto arrayType = type.substr(0, type.length() - 2);
-                auto subTypeInfo = findType(arrayType, types);
-                if (!subTypeInfo) {
-                    throw std::invalid_argument("Could not find type for array sub-struct " + arrayType);
-                }
-                if (!value.is_array()) {
-                    throw std::invalid_argument("Value must be array for type " + type);
-                }
-                std::vector<std::shared_ptr<ParamBase>> paramsArray;
-                if (value.size() == 0) {
-                    // empty array
-                    auto subStruct = makeStruct(arrayType, "{}", typesJson);
-                    if (!subStruct) {
-                        throw std::invalid_argument("Could not process array sub-struct " + arrayType + " " + "{}");
-                    }
-                    assert(subStruct);
-                    auto tmp = std::make_shared<ParamArray>(paramsArray);
-                    tmp->setProto(subStruct);
-                    params.push_back(std::make_shared<ParamNamed>(name, tmp));
-                } else {
-                    for (const auto& e : value) {
-                        auto subStruct = makeStruct(arrayType, e.dump(), typesJson);
-                        if (!subStruct) {
-                            throw std::invalid_argument("Could not process array sub-struct " + arrayType + " " + e.dump());
-                        }
-                        assert(subStruct);
-                        paramsArray.push_back(subStruct);
-                    }
-                    params.push_back(std::make_shared<ParamNamed>(name, std::make_shared<ParamArray>(paramsArray)));
-                }
-            } else {
-                // try if sub struct
-                auto subTypeInfo = findType(type, types);
-                if (!subTypeInfo) {
-                    throw std::invalid_argument("Could not find type for sub-struct " + type);
-                }
-                if (value.is_null()) {
-                    params.push_back(std::make_shared<ParamNamed>(name, std::make_shared<ParamStruct>(type, std::vector<std::shared_ptr<ParamNamed>>{})));
-                } else {
-                    auto subStruct = makeStruct(type, value.dump(), typesJson);
-                    if (!subStruct) {
-                        throw std::invalid_argument("Could not process sub-struct " + type);
-                    }
-                    assert(subStruct);
-                    params.push_back(std::make_shared<ParamNamed>(name, subStruct));
-                }
-            }
-        }
-        return std::make_shared<ParamStruct>(structType, params);
-    } catch (const std::invalid_argument& ex) {
-        throw;
-    } catch (const std::exception& ex) {
-        throw std::invalid_argument(std::string("Could not process Json: ") + ex.what());
-    } catch (...) {
-        throw std::invalid_argument("Could not process Json");
-    }
-}
-
-std::shared_ptr<ParamStruct> ParamStruct::makeType(const std::string& structName, const std::string& structJson, const std::vector<std::shared_ptr<ParamStruct>>& extraTypes, bool ignoreMissingType) {
-    try {
-        if (structName.empty()) {
-            throw std::invalid_argument("Missing type name");
-        }
-        auto jsonValue = json::parse(structJson, nullptr, false);
-        if (jsonValue.is_discarded()) {
-            throw std::invalid_argument("Could not parse type Json");
-        }
-        if (!jsonValue.is_array()) {
-            throw std::invalid_argument("Expecting array");
-        }
-        std::vector<std::shared_ptr<ParamNamed>> params;
-        for (auto& p2 : jsonValue) {
-            auto name = p2["name"].get<std::string>();
-            auto type = p2["type"].get<std::string>();
-            if (name.empty() || type.empty()) {
-                throw std::invalid_argument("Expecting 'name' and 'type', in " + structName);
-            }
-            auto named = ParamFactory::makeNamed(name, type);
-            if (named) {
-                // simple type (incl. array of simple type)
-                params.push_back(named);
-            } else if (type == structName) {
-                // recursive to self
-                params.push_back(std::make_shared<ParamNamed>(name, std::make_shared<ParamStruct>(type, std::vector<std::shared_ptr<ParamNamed>>{})));
-            } else if (type.length() >= 2 && type.substr(type.length() - 2, 2) == "[]") {
-                // array of struct
-                auto arrayType = type.substr(0, type.length() - 2);
-                if (ignoreMissingType) {
-                    params.push_back(std::make_shared<ParamNamed>(name, std::make_shared<ParamArray>(std::make_shared<ParamStruct>(arrayType, std::vector<std::shared_ptr<ParamNamed>>{}))));
-                } else {
-                    // try array struct from extra types
-                    auto p2struct = findType(arrayType, extraTypes);
-                    if (!p2struct) {
-                        throw std::invalid_argument("Unknown struct array type " + arrayType);
-                    }
-                    params.push_back(std::make_shared<ParamNamed>(name, std::make_shared<ParamArray>(p2struct)));
-                }
-            } else {
-                if (ignoreMissingType) {
-                    params.push_back(std::make_shared<ParamNamed>(name, std::make_shared<ParamStruct>(type, std::vector<std::shared_ptr<ParamNamed>>{})));
-                } else {
-                    // try struct from extra types
-                    auto p2struct = findType(type, extraTypes);
-                    if (!p2struct) {
-                        throw std::invalid_argument("Unknown type " + type);
-                    }
-                    params.push_back(std::make_shared<ParamNamed>(name, p2struct));
-                }
-            }
-        }
-        if (params.size() == 0) {
-            throw std::invalid_argument("No valid params found");
-        }
-        return std::make_shared<ParamStruct>(structName, params);
-    } catch (const std::invalid_argument& ex) {
-        throw;
-    } catch (const std::exception& ex) {
-        throw std::invalid_argument(std::string("Could not process Json: ") + ex.what());
-    } catch (...) {
-        throw std::invalid_argument("Could not process Json");
-    }
-}
-
-std::vector<std::shared_ptr<ParamStruct>> ParamStruct::makeTypes(const std::string& structTypes) {
-    try {
-        auto jsonValue = json::parse(structTypes, nullptr, false);
-        if (jsonValue.is_discarded()) {
-            throw std::invalid_argument("Could not parse types Json");
-        }
-        if (!jsonValue.is_object()) {
-            throw std::invalid_argument("Expecting object");
-        }
-        // do it in 2 passes, as type order may be undefined
-        std::vector<std::shared_ptr<ParamStruct>> types1;
-        for (json::iterator it = jsonValue.begin(); it != jsonValue.end(); it++) {
-            // may throw
-            auto struct1 = makeType(it.key(), it.value().dump(), {}, true);
-            types1.push_back(struct1);
-        }
-        std::vector<std::shared_ptr<ParamStruct>> types2;
-        for (json::iterator it = jsonValue.begin(); it != jsonValue.end(); it++) {
-            // may throw
-            auto struct1 = makeType(it.key(), it.value().dump(), types1, false);
-            types2.push_back(struct1);
-        }
-        return types2;
-    } catch (const std::invalid_argument& ex) {
-        throw;
-    } catch (const std::exception& ex) {
-        throw std::invalid_argument(std::string("Could not process Json: ") + ex.what());
-    } catch (...) {
-        throw std::invalid_argument("Could not process Json");
-    }
-}
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ParamStruct.h b/src/Ethereum/ABI/ParamStruct.h
deleted file mode 100644
index 816720905dd..00000000000
--- a/src/Ethereum/ABI/ParamStruct.h
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "ParamBase.h"
-
-#include <vector>
-#include <string>
-#include <memory>
-
-namespace TW::Ethereum::ABI {
-
-/// A named parameter.
-class ParamNamed: public ParamBase
-{
-public:
-    std::string _name;
-    std::shared_ptr<ParamBase> _param;
-
-public:
-    ParamNamed(const std::string& name, std::shared_ptr<ParamBase> param): _name(name), _param(param) {}
-
-    virtual std::string getName() const { return _name; }
-    virtual std::shared_ptr<ParamBase> getParam() const { return _param; }
-    virtual std::string getType() const;
-    virtual size_t getSize() const { return _param->getSize(); }
-    virtual bool isDynamic() const { return _param->isDynamic(); }
-    virtual void encode(Data& data) const { return _param->encode(data); }
-    virtual bool decode(const Data& encoded, size_t& offset_inout) { return _param->decode(encoded, offset_inout); }
-    virtual bool setValueJson(const std::string& value) { return _param->setValueJson(value); }
-    virtual Data hashStruct() const { return _param->hashStruct(); }
-    virtual std::string getExtraTypes(std::vector<std::string>& ignoreList) const { return _param->getExtraTypes(ignoreList); }
-};
-
-/// A collection of named parameters.  See also: ParamStruct
-class ParamSetNamed {
-private:
-    std::vector<std::shared_ptr<ParamNamed>> _params;
-
-public:
-    ParamSetNamed() = default;
-    ParamSetNamed(const std::shared_ptr<ParamNamed>& param1) { addParam(param1); }
-    ParamSetNamed(const std::vector<std::shared_ptr<ParamNamed>>& params) { addParams(params); }
-    virtual ~ParamSetNamed();
-
-    /// Returns the index of the parameter
-    int addParam(const std::shared_ptr<ParamNamed>& param);
-    void addParams(const std::vector<std::shared_ptr<ParamNamed>>& params);
-    size_t getCount() const { return _params.size(); }
-    std::shared_ptr<ParamNamed> getParam(int idx) const { return _params[idx]; }
-    std::string getType() const;
-    Data encodeHashes() const;
-    std::string getExtraTypes(std::vector<std::string>& ignoreList) const;
-    std::shared_ptr<ParamNamed> findParamByName(const std::string& name) const;
-};
-
-/// A named structure (set of parameters plus a type name).
-class ParamStruct: public ParamCollection
-{
-private:
-    std::string _name;
-    ParamSetNamed _params;
-
-public:
-    ParamStruct() = default;
-    ParamStruct(const std::string& name, const std::vector<std::shared_ptr<ParamNamed>>& params) : ParamCollection(), _name(name), _params(ParamSetNamed(params)) {}
-
-    std::string getType() const { return _name; }
-    const ParamSetNamed& getParams() const { return _params; }
-
-    /// Compute the hash of a struct, used for signing, according to EIP712
-    virtual Data hashStruct() const;
-    /// Get full type, extended by used sub-types, of the form 'Mail(Person from,Person to,string contents)Person(string name,address wallet)'
-    std::string encodeType() const {
-        std::vector<std::string> ignoreList;
-        return getExtraTypes(ignoreList);
-    }
-    /// Get the hash of the full type.
-    Data hashType() const;
-
-    virtual size_t getSize() const { return _params.getCount(); }
-    virtual bool isDynamic() const { return true; }
-    virtual size_t getCount() const { return _params.getCount(); }
-    virtual void encode([[maybe_unused]] Data& data) const {}
-    virtual bool decode([[maybe_unused]] const Data& encoded, [[maybe_unused]] size_t& offset_inout) { return true; }
-    virtual bool setValueJson([[maybe_unused]] const std::string& value) { return false; } // see makeStruct
-    Data encodeHashes() const;
-    virtual std::string getExtraTypes(std::vector<std::string>& ignoreList) const;
-    std::shared_ptr<ParamNamed> findParamByName(const std::string& name) const { return _params.findParamByName(name); }
-
-    /// Compute the hash of a struct, used for signing, according to EIP712 ("v4").
-    /// Input is a Json object (as string), with following fields:
-    /// - types: map of used struct types (see makeTypes())
-    /// - primaryType: the type of the message (string)
-    /// - domain: EIP712 domain specifier values
-    /// - message: the message (object).
-    /// Throws on error.
-    /// Example input:
-    ///  R"({
-    ///     "types": {
-    ///         "EIP712Domain": [
-    ///             {"name": "name", "type": "string"},
-    ///             {"name": "version", "type": "string"},
-    ///             {"name": "chainId", "type": "uint256"},
-    ///             {"name": "verifyingContract", "type": "address"}
-    ///         ],
-    ///         "Person": [
-    ///             {"name": "name", "type": "string"},
-    ///             {"name": "wallet", "type": "address"}
-    ///         ]
-    ///     },
-    ///     "primaryType": "Person",
-    ///     "domain": {
-    ///         "name": "Ether Person",
-    ///         "version": "1",
-    ///         "chainId": 1,
-    ///         "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
-    ///     },
-    ///     "message": {
-    ///         "name": "Cow",
-    ///         "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
-    ///     }
-    ///  })");
-    static Data hashStructJson(const std::string& messageJson);
-
-    /// Make a named struct, described by a json string (with values), and its type info (may contain type info of sub-types also).
-    /// Throws on error.
-    static std::shared_ptr<ParamStruct> makeStruct(const std::string& structType, const std::string& valueJson, const std::string& typesJson);
-
-    /// Parse a json with a list of types, and build a vector of named structs.  Structs params have the given name and type, and empty value.
-    /// Ex. input: R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}], "Mail": [{"name": "from", "type": "Person"}, {"name": "to", "type": "Person"}, {"name": "contents", "type": "string"}]})"
-    /// Order does not matter.  Note the quote delimiters.
-    /// Throws on error.
-    static std::vector<std::shared_ptr<ParamStruct>> makeTypes(const std::string& structTypes);
-
-    /// Make a named struct, with the given types, with empty values.
-    /// Similar to makeTypes, but works with only one type.
-    /// Ex. input: "Person", R"([{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}])"
-    /// Throws on error.
-    static std::shared_ptr<ParamStruct> makeType(const std::string& structName, const std::string& structJson, const std::vector<std::shared_ptr<ParamStruct>>& extraTypes = {}, bool ignoreMissingType = false);
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/Parameters.cpp b/src/Ethereum/ABI/Parameters.cpp
deleted file mode 100644
index 3cc66daefd9..00000000000
--- a/src/Ethereum/ABI/Parameters.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Parameters.h"
-#include "ValueEncoder.h"
-#include <Hash.h>
-
-#include <cassert>
-#include <string>
-
-namespace TW::Ethereum::ABI {
-
-ParamSet::~ParamSet() {
-    _params.clear();
-}
-
-/// Returns the index of the parameter
-int ParamSet::addParam(const std::shared_ptr<ParamBase>& param) {
-    if (param.get() == nullptr) {
-        return -1;
-    }
-    assert(param.get() != nullptr);
-    _params.push_back(param);
-    return static_cast<int>(_params.size() - 1);
-}
-
-void ParamSet::addParams(const std::vector<std::shared_ptr<ParamBase>>& params) {
-    for (auto p : params) {
-        addParam(p);
-    }
-}
-
-bool ParamSet::getParam(size_t paramIndex, std::shared_ptr<ParamBase>& param_out) const {
-    if (paramIndex >= _params.size() || paramIndex < 0) {
-        return false;
-    }
-    param_out = _params[paramIndex];
-    return true;
-}
-
-std::shared_ptr<ParamBase> ParamSet::getParamUnsafe(size_t paramIndex) const {
-    if (_params.size() == 0) {
-        // zero parameter, nothing to return.  This may cause trouble (segfault)
-        return nullptr;
-    }
-    if (paramIndex >= _params.size() || paramIndex < 0) {
-        // invalid index, return the first instead of nullptr
-        return _params[0];
-    }
-    return _params[paramIndex];
-}
-
-/// Return the function type signature, of the form "baz(int32,uint256)"
-std::string ParamSet::getType() const {
-    std::string t = "(";
-    int cnt = 0;
-    for (auto p : _params) {
-        if (cnt++ > 0) {
-            t += ",";
-        }
-        t += p->getType();
-    }
-    t += ")";
-    return t;
-}
-
-bool ParamSet::isDynamic() const {
-    for (const auto& p : _params) {
-        if (p->isDynamic()) {
-            return true;
-        }
-    }
-    return false;
-}
-
-size_t ParamSet::getSize() const {
-    // 2-pass encoding
-    size_t s = 0;
-    for (auto p : _params) {
-        if (p->isDynamic() || p->getSize() > ValueEncoder::encodedIntSize) {
-            // offset used
-            s += 32;
-        }
-        s += p->getSize();
-    }
-    return ValueEncoder::paddedTo32(s);
-}
-
-size_t ParamSet::getHeadSize() const {
-    size_t s = 0;
-    for (auto p : _params) {
-        if (p->isDynamic()) {
-            s += 32;
-        } else {
-            s += p->getSize();
-        }
-    }
-    return s;
-}
-
-void ParamSet::encode(Data& data) const {
-    // 2-pass encoding
-    size_t headSize = getHeadSize();
-    size_t dynamicOffset = 0;
-
-    // pass 1: small values or indices
-    for (auto p : _params) {
-        if (p->isDynamic() || p->getSize() > ValueEncoder::encodedIntSize) {
-            // include only offset
-            ValueEncoder::encodeUInt256(uint256_t(headSize + dynamicOffset), data);
-            dynamicOffset += p->getSize();
-        } else {
-            // encode small data
-            p->encode(data);
-        }
-    }
-
-    // pass 2: dynamic values
-    for (auto p : _params) {
-        if (p->isDynamic() || p->getSize() > ValueEncoder::encodedIntSize) {
-            // encode large data
-            p->encode(data);
-        }
-    }
-}
-
-bool ParamSet::decode(const Data& encoded, size_t& offset_inout) {
-    // pass 1: small values
-    for (auto p : _params) {
-        if (p->isDynamic()) {
-            uint256_t index;
-            if (!ABI::decode(encoded, index, offset_inout)) {
-                return false;
-            }
-            // index is read but not used
-        } else {
-            if (!p->decode(encoded, offset_inout)) {
-                return false;
-            }
-        }
-    }
-    // pass2: large values
-    for (auto p : _params) {
-        if (p->isDynamic()) {
-            if (!p->decode(encoded, offset_inout)) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-Data ParamSet::encodeHashes() const {
-    Data hashes;
-    for (auto p : _params) {
-        append(hashes, p->hashStruct());
-    }
-    return hashes;
-}
-
-Data Parameters::hashStruct() const {
-    Data hash(32);
-    Data hashes = _params.encodeHashes();
-    if (hashes.size() > 0) {
-        hash = Hash::keccak256(hashes);
-    }
-    return hash;
-}
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/Parameters.h b/src/Ethereum/ABI/Parameters.h
deleted file mode 100644
index ac315235fbe..00000000000
--- a/src/Ethereum/ABI/Parameters.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "ParamBase.h"
-#include "ParamNumber.h"
-
-#include <vector>
-#include <string>
-#include <memory>
-
-namespace TW::Ethereum::ABI {
-
-/// A set of parameters
-class ParamSet {
-private:
-    std::vector<std::shared_ptr<ParamBase>> _params;
-
-public:
-    ParamSet() = default;
-    ParamSet(const std::shared_ptr<ParamBase>& param1) { addParam(param1); }
-    ParamSet(const std::vector<std::shared_ptr<ParamBase>>& params) { addParams(params); }
-    virtual ~ParamSet();
-
-    /// Returns the index of the parameter
-    int addParam(const std::shared_ptr<ParamBase>& param);
-    void addParams(const std::vector<std::shared_ptr<ParamBase>>& params);
-    bool getParam(size_t paramIndex, std::shared_ptr<ParamBase>& param_out) const;
-    std::shared_ptr<ParamBase> getParamUnsafe(size_t paramIndex) const;
-    size_t getCount() const { return _params.size(); }
-    std::vector<std::shared_ptr<ParamBase>> const& getParams() const { return _params; }
-    /// Return the function type signature, of the form "baz(int32,uint256)"
-    std::string getType() const;
-    bool isDynamic() const;
-    size_t getSize() const;
-    virtual void encode(Data& data) const;
-    virtual bool decode(const Data& encoded, size_t& offset_inout);
-    Data encodeHashes() const;
-
-private:
-    size_t getHeadSize() const;
-};
-
-/// Collection of different parameters, dynamic length, "(<par1>,<par2>,...)".
-class Parameters: public ParamCollection
-{
-private:
-    ParamSet _params;
-
-public:
-    Parameters() = default;
-    Parameters(const std::vector<std::shared_ptr<ParamBase>>& params) : ParamCollection(), _params(ParamSet(params)) {}
-    void addParam(const std::shared_ptr<ParamBase>& param) { _params.addParam(param); }
-    void addParams(const std::vector<std::shared_ptr<ParamBase>>& params) { _params.addParams(params); }
-    std::shared_ptr<ParamBase> getParam(size_t paramIndex) const { return _params.getParamUnsafe(paramIndex); }
-    virtual std::string getType() const { return _params.getType(); }
-    virtual size_t getSize() const { return _params.getSize(); }
-    virtual bool isDynamic() const { return true; }
-    virtual size_t getCount() const { return _params.getCount(); }
-    virtual void encode(Data& data) const { _params.encode(data); }
-    virtual bool decode(const Data& encoded, size_t& offset_inout) { return _params.decode(encoded, offset_inout); }
-    virtual bool setValueJson([[maybe_unused]] const std::string& value) { return false; }
-    virtual Data hashStruct() const;
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ProtoParam.h b/src/Ethereum/ABI/ProtoParam.h
new file mode 100644
index 00000000000..8391ee94a26
--- /dev/null
+++ b/src/Ethereum/ABI/ProtoParam.h
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "proto/EthereumAbi.pb.h"
+#include "uint256.h"
+
+namespace TW::Ethereum::ABI {
+
+namespace AbiProto = EthereumAbi::Proto;
+
+struct BaseProtoParam {
+    virtual ~BaseProtoParam() noexcept = default;
+
+    virtual AbiProto::Token toToken() const = 0;
+};
+
+using BaseParams = std::vector<std::shared_ptr<BaseProtoParam>>;
+
+class ProtoBool final: public BaseProtoParam {
+public:
+    explicit ProtoBool(bool val): m_value(val) {
+    }
+
+    ~ProtoBool() override = default;
+
+    AbiProto::Token toToken() const override {
+        AbiProto::Token proto;
+        proto.set_boolean(m_value);
+        return proto;
+    }
+
+private:
+    bool m_value = false;
+};
+
+class ProtoUInt256 final: public BaseProtoParam {
+public:
+    explicit ProtoUInt256(const uint256_t &num): m_number(store(num)) {
+    }
+
+    explicit ProtoUInt256(Data numData): m_number(std::move(numData)) {
+    }
+
+    ~ProtoUInt256() override = default;
+
+    AbiProto::Token toToken() const override {
+        AbiProto::Token proto;
+        proto.mutable_number_uint()->set_bits(256);
+        proto.mutable_number_uint()->set_value(m_number.data(), m_number.size());
+        return proto;
+    }
+
+private:
+    Data m_number;
+};
+
+class ProtoByteArray final: public BaseProtoParam {
+public:
+    explicit ProtoByteArray(Data data): m_data(std::move(data)) {
+    }
+
+    ~ProtoByteArray() override = default;
+
+    AbiProto::Token toToken() const override {
+        AbiProto::Token proto;
+        proto.set_byte_array(m_data.data(), m_data.size());
+        return proto;
+    }
+
+private:
+    Data m_data;
+};
+
+class ProtoBytes32 final: public BaseProtoParam {
+public:
+    explicit ProtoBytes32(const Data& data): m_data(data) {
+        if (data.size() != 32) {
+            throw std::invalid_argument("Data must be exactly 32 bytes long");
+        }
+    }
+
+    ~ProtoBytes32() override = default;
+
+    AbiProto::Token toToken() const override {
+        AbiProto::Token proto;
+        proto.set_byte_array_fix(m_data.data(), m_data.size());
+        return proto;
+    }
+
+private:
+    Data m_data;
+};
+
+class ProtoString final: public BaseProtoParam {
+public:
+    explicit ProtoString(std::string str): m_string(std::move(str)) {
+    }
+
+    ~ProtoString() override = default;
+
+    AbiProto::Token toToken() const override {
+        AbiProto::Token proto;
+        proto.set_string_value(m_string.data(), m_string.size());
+        return proto;
+    }
+
+private:
+    std::string m_string;
+};
+
+class ProtoAddress final: public BaseProtoParam {
+public:
+    ProtoAddress() = default;
+
+    explicit ProtoAddress(std::string addr): m_address(std::move(addr)) {
+    }
+
+    ~ProtoAddress() override = default;
+
+    AbiProto::Token toToken() const override {
+        AbiProto::Token proto;
+        proto.set_address(m_address);
+        return proto;
+    }
+
+private:
+    std::string m_address {"0x0000000000000000000000000000000000000000"};
+};
+
+} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/Tuple.cpp b/src/Ethereum/ABI/Tuple.cpp
deleted file mode 100644
index c674592ff2b..00000000000
--- a/src/Ethereum/ABI/Tuple.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Tuple.h"
-
-#include <string>
-
-namespace TW::Ethereum::ABI {
-
-int ParamTuple::addParam(std::shared_ptr<ParamBase> param) {
-    return _params.addParam(param);
-}
-
-} // namespace TW::Ethereum::ABI
\ No newline at end of file
diff --git a/src/Ethereum/ABI/Tuple.h b/src/Ethereum/ABI/Tuple.h
deleted file mode 100644
index 6579f9784f6..00000000000
--- a/src/Ethereum/ABI/Tuple.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "ParamBase.h"
-#include "Parameters.h"
-#include "Data.h"
-
-namespace TW::Ethereum::ABI {
-
-/// A Tuple is a collection of parameters
-class ParamTuple: public ParamCollection
-{
-public:
-    ParamSet _params;
-
-    ParamTuple() {}
-    ParamTuple(const std::vector<std::shared_ptr<ParamBase>>& params) : _params(ParamSet(params)) {}
-
-    /// Add a parameter. Returns the index of the parameter.
-    int addParam(std::shared_ptr<ParamBase> param);
-    /// Get a parameter.
-    bool getParam(int paramIndex, std::shared_ptr<ParamBase>& param_out) {
-        return _params.getParam(paramIndex, param_out);
-    }
-    /// Return the type signature, of the form "(int32,uint256)"
-    std::string getType() const { return _params.getType(); }
-
-    virtual size_t getSize() const { return _params.getSize(); }
-    virtual bool isDynamic() const { return _params.isDynamic(); }
-    virtual void encode(Data& data) const { return _params.encode(data); }
-    virtual bool decode(const Data& encoded, size_t& offset_inout) { return _params.decode(encoded, offset_inout); }
-    virtual bool setValueJson([[maybe_unused]] const std::string& value) { return false; }
-    virtual size_t getCount() const { return _params.getCount(); }
-};
-
-} // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ValueDecoder.cpp b/src/Ethereum/ABI/ValueDecoder.cpp
index 0bf29705d3f..425f2ce7918 100644
--- a/src/Ethereum/ABI/ValueDecoder.cpp
+++ b/src/Ethereum/ABI/ValueDecoder.cpp
@@ -1,12 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "ValueDecoder.h"
-#include "Array.h"
-#include "ParamFactory.h"
+#include "proto/EthereumAbi.pb.h"
+#include "rust/Wrapper.h"
+#include "TrustWalletCore/TWCoinType.h"
 
 namespace TW::Ethereum::ABI {
 
@@ -17,29 +16,27 @@ uint256_t ValueDecoder::decodeUInt256(const Data& data) {
     return load(data);
 }
 
-std::string ValueDecoder::decodeValue(const Data& data, const std::string& type) {
-    auto param = ParamFactory::make(type);
-    if (!param) {
+std::string ValueDecoder::decodeValue(const Data& encoded, const std::string& type) {
+    EthereumAbi::Proto::ValueDecodingInput input;
+    input.set_encoded(encoded.data(), encoded.size());
+    input.set_param_type(type);
+
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    Rust::TWDataWrapper outputPtr = Rust::tw_ethereum_abi_decode_value(TWCoinTypeEthereum, inputData.get());
+
+    auto outputData = outputPtr.toDataOrDefault();
+    if (outputData.empty()) {
         return "";
     }
-    size_t offset = 0;
-    if (!param->decode(data, offset)) {
+
+    EthereumAbi::Proto::ValueDecodingOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    if (output.error() != EthereumAbi::Proto::AbiError::OK) {
         return "";
     }
-    return ParamFactory::getValue(param, param->getType());
-}
 
-std::vector<std::string> ValueDecoder::decodeArray(const Data& data, const std::string& type) {
-    auto param = ParamFactory::make(type);
-    if (!param) {
-        return std::vector<std::string>{};
-    }
-    size_t offset = 0;
-    if (!param->decode(data, offset)) {
-        return std::vector<std::string>{};
-    }
-    auto values = ParamFactory::getArrayValue(param, type);
-    return values;
+    return output.param_str();
 }
 
 } // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ValueDecoder.h b/src/Ethereum/ABI/ValueDecoder.h
index b27a9ecd935..02edf2a254c 100644
--- a/src/Ethereum/ABI/ValueDecoder.h
+++ b/src/Ethereum/ABI/ValueDecoder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -19,7 +17,5 @@ class ValueDecoder {
     static uint256_t decodeUInt256(const Data& data);
     // Decode an arbitrary type, return value as string
     static std::string decodeValue(const Data& data, const std::string& type);
-    // Decode an array of given simple types; return each element as a string in a vector
-    static std::vector<std::string> decodeArray(const Data& data, const std::string& elementType);
 };
 } // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ABI/ValueEncoder.cpp b/src/Ethereum/ABI/ValueEncoder.cpp
index d244a5acbf0..c4db5470c49 100644
--- a/src/Ethereum/ABI/ValueEncoder.cpp
+++ b/src/Ethereum/ABI/ValueEncoder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "ValueEncoder.h"
 
diff --git a/src/Ethereum/ABI/ValueEncoder.h b/src/Ethereum/ABI/ValueEncoder.h
index 8463c7bdbbb..178ae693f43 100644
--- a/src/Ethereum/ABI/ValueEncoder.h
+++ b/src/Ethereum/ABI/ValueEncoder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Ethereum/Address.cpp b/src/Ethereum/Address.cpp
index 48d013bde0c..47a804ea0b5 100644
--- a/src/Ethereum/Address.cpp
+++ b/src/Ethereum/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "AddressChecksum.h"
diff --git a/src/Ethereum/Address.h b/src/Ethereum/Address.h
index c14a56146f1..afac9e1a4de 100644
--- a/src/Ethereum/Address.h
+++ b/src/Ethereum/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Ethereum/AddressChecksum.cpp b/src/Ethereum/AddressChecksum.cpp
index da69f905a7e..e927c272633 100644
--- a/src/Ethereum/AddressChecksum.cpp
+++ b/src/Ethereum/AddressChecksum.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "AddressChecksum.h"
 
diff --git a/src/Ethereum/AddressChecksum.h b/src/Ethereum/AddressChecksum.h
index 922110c6869..4d2b78c96c1 100644
--- a/src/Ethereum/AddressChecksum.h
+++ b/src/Ethereum/AddressChecksum.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Ethereum/Barz.cpp b/src/Ethereum/Barz.cpp
new file mode 100644
index 00000000000..6002af3692b
--- /dev/null
+++ b/src/Ethereum/Barz.cpp
@@ -0,0 +1,221 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <string>
+#include "ABI/ValueEncoder.h"
+#include "ABI/Function.h"
+#include "AddressChecksum.h"
+#include "EIP1014.h"
+#include "Hash.h"
+#include "HexCoding.h"
+#include "../proto/Barz.pb.h"
+#include "AsnParser.h"
+#include "Base64.h"
+
+namespace TW::Barz {
+
+std::string getCounterfactualAddress(const Proto::ContractAddressInput input) {
+    auto encodedData = Ethereum::ABI::Function::encodeParams(Ethereum::ABI::BaseParams {
+        std::make_shared<Ethereum::ABI::ProtoAddress>(input.account_facet()),
+        std::make_shared<Ethereum::ABI::ProtoAddress>(input.verification_facet()),
+        std::make_shared<Ethereum::ABI::ProtoAddress>(input.entry_point()),
+        std::make_shared<Ethereum::ABI::ProtoAddress>(input.facet_registry()),
+        std::make_shared<Ethereum::ABI::ProtoAddress>(input.default_fallback()),
+        std::make_shared<Ethereum::ABI::ProtoByteArray>(parse_hex(input.public_key())),
+    });
+    if (!encodedData.has_value()) {
+        return {};
+    }
+
+    Data initCode = parse_hex(input.bytecode());
+    append(initCode, encodedData.value());
+
+    const Data initCodeHash = Hash::keccak256(initCode);
+    Data salt = store(input.salt(), 32);
+    return Ethereum::checksumed(Ethereum::Address(hexEncoded(Ethereum::create2Address(input.factory(), salt, initCodeHash))));
+}
+
+Data getInitCode(const std::string& factoryAddress, const PublicKey& publicKey, const std::string& verificationFacet, const uint32_t salt) {
+    auto createAccountFuncEncoded = Ethereum::ABI::Function::encodeFunctionCall("createAccount", Ethereum::ABI::BaseParams {
+        std::make_shared<Ethereum::ABI::ProtoAddress>(verificationFacet),
+        std::make_shared<Ethereum::ABI::ProtoByteArray>(publicKey.bytes),
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(salt),
+    });
+    if (!createAccountFuncEncoded.has_value()) {
+        return {};
+    }
+
+    Data envelope;
+    append(envelope, parse_hex(factoryAddress));
+    append(envelope, createAccountFuncEncoded.value());
+    return envelope;
+}
+
+Data getFormattedSignature(const Data& signature, const Data challenge, const Data& authenticatorData, const std::string& clientDataJSON) {
+    std::string challengeBase64 = TW::Base64::encodeBase64Url(challenge);
+    while (challengeBase64.back() == '=') {
+        challengeBase64.pop_back();
+    }
+    size_t challengePos = clientDataJSON.find(challengeBase64);
+    if (challengePos == std::string::npos) {
+        return Data();
+    }
+
+    const std::string clientDataJSONPre = clientDataJSON.substr(0, challengePos);
+    const std::string clientDataJSONPost = clientDataJSON.substr(challengePos + challengeBase64.size());
+
+    const auto parsedSignatureOptional = ASN::AsnParser::ecdsa_signature_from_der(signature);
+    if (!parsedSignatureOptional.has_value()) {
+        return {};
+    }
+    const Data parsedSignature = parsedSignatureOptional.value();
+    const Data rValue = subData(parsedSignature, 0, 32);
+    const Data sValue = subData(parsedSignature, 32, 64);
+
+    auto encoded = Ethereum::ABI::Function::encodeParams(Ethereum::ABI::BaseParams {
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(rValue),
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(sValue),
+        std::make_shared<Ethereum::ABI::ProtoByteArray>(authenticatorData),
+        std::make_shared<Ethereum::ABI::ProtoString>(clientDataJSONPre),
+        std::make_shared<Ethereum::ABI::ProtoString>(clientDataJSONPost),
+    });
+
+    if (encoded.has_value()) {
+        return encoded.value();
+    }
+    return {};
+}
+
+Data getPrefixedMsgHash(const Data msgHash, const std::string& barzAddress, const uint32_t chainId) {
+    // keccak256("EIP712Domain(uint256 chainId,address verifyingContract)");
+    const Data& domainSeparatorTypeHashData = parse_hex("0x47e79534a245952e8b16893a336b85a3d9ea9fa8c573f3d803afb92a79469218");
+    // keccak256("BarzMessage(bytes message)")
+    const Data& barzMsgHashData = parse_hex("0xb1bcb804a4a3a1af3ee7920d949bdfd417ea1b736c3552c8d6563a229a619100");
+    const auto signedDataPrefix = "0x1901";
+
+    auto encodedDomainSeparatorData = Ethereum::ABI::Function::encodeParams(Ethereum::ABI::BaseParams {
+        std::make_shared<Ethereum::ABI::ProtoBytes32>(domainSeparatorTypeHashData),
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(chainId),
+        std::make_shared<Ethereum::ABI::ProtoAddress>(barzAddress)
+    });
+    if (!encodedDomainSeparatorData.has_value()) {
+        return {};
+    }
+
+    Data domainSeparator = encodedDomainSeparatorData.value();
+    const Data domainSeparatorHash = Hash::keccak256(domainSeparator);
+
+    auto encodedRawMessageData = Ethereum::ABI::Function::encodeParams(Ethereum::ABI::BaseParams {
+        std::make_shared<Ethereum::ABI::ProtoBytes32>(barzMsgHashData),
+        std::make_shared<Ethereum::ABI::ProtoBytes32>(Hash::keccak256(msgHash)),
+    });
+
+    Data rawMessageData = encodedRawMessageData.value();
+
+    auto encodedMsg = Ethereum::ABI::Function::encodeParams(Ethereum::ABI::BaseParams {
+        std::make_shared<Ethereum::ABI::ProtoBytes32>(domainSeparatorHash),
+        std::make_shared<Ethereum::ABI::ProtoBytes32>(Hash::keccak256(rawMessageData))
+    });
+    auto encodedMsgData = signedDataPrefix + hex(encodedMsg.value());
+
+    Data finalEncodedMsgData = parse_hex(encodedMsgData);
+
+    const Data encodedMsgHash = Hash::keccak256(finalEncodedMsgData);
+
+    Data envelope;
+    append(envelope, encodedMsgHash);
+
+    return envelope;
+}
+
+// Function to encode the diamondCut function call using protobuf message as input
+Data getDiamondCutCode(const Proto::DiamondCutInput& input) {
+    const auto diamondCutSelector = "1f931c1c";
+    const auto dataLocationChunk = "60";
+    const char defaultPadding = '0';
+    Data encoded;
+
+    //    function diamondCut(
+    //        FacetCut[] calldata diamondCut,
+    //        address init,
+    //        bytes calldata _calldata // Note that Barz does not use the _calldata for initialization.
+    //    )
+    Data encodedSignature = parse_hex(diamondCutSelector); // diamondCut() function selector
+    encoded.insert(encoded.end(), encodedSignature.begin(), encodedSignature.end());
+
+    // First argument Data Location `diamondCut`
+    Data dataLocation = parse_hex(dataLocationChunk);
+    pad_left(dataLocation, 32);
+    append(encoded, dataLocation);
+
+    // Encode second Parameter `init`
+    Data initAddress = parse_hex(input.init_address());
+    pad_left(initAddress, 32);
+    append(encoded, initAddress);
+
+    // Third Argument Data location `_calldata`
+    auto callDataDataLocation = int(hex(encoded).size()) / 2;
+
+    Ethereum::ABI::ValueEncoder::encodeUInt256(input.facet_cuts_size(), encoded);
+
+    // Prepend the function selector for the diamondCut function
+    int instructChunk = 0;
+    int totalInstructChunk = 0;
+    int prevDataPosition = 0;
+    const auto encodingChunk = 32;
+    const auto bytesChunkLine = 5;
+    int chunkLocation;
+    Data dataPosition;
+    // Encode each FacetCut from the input
+    for (const auto& facetCut : input.facet_cuts()) {
+        if (instructChunk == 0) {
+            prevDataPosition = input.facet_cuts_size() * encodingChunk;
+            Ethereum::ABI::ValueEncoder::encodeUInt256(prevDataPosition, encoded);
+            chunkLocation = int(hex(encoded).size()) / 2;
+        } else {
+            prevDataPosition = prevDataPosition + (instructChunk * encodingChunk);
+            Ethereum::ABI::ValueEncoder::encodeUInt256(prevDataPosition, dataPosition);
+            instructChunk = 0;
+
+            encoded.insert(encoded.begin() + chunkLocation, dataPosition.begin(), dataPosition.end());
+            ++instructChunk;
+        }
+        Ethereum::ABI::ValueEncoder::encodeAddress(parse_hex(facetCut.facet_address()), encoded); // facet address
+        ++instructChunk;
+        Ethereum::ABI::ValueEncoder::encodeUInt256(facetCut.action(), encoded); // FacetAction enum
+        ++instructChunk;
+        append(encoded, dataLocation); // adding 0x60 DataStorage position
+        ++instructChunk;
+        Ethereum::ABI::ValueEncoder::encodeUInt256(facetCut.function_selectors_size(), encoded); // Number of FacetSelector
+        ++instructChunk;
+        // Encode and append function selectors
+        for (const auto& selector : facetCut.function_selectors()) {
+            Ethereum::ABI::ValueEncoder::encodeBytes(parse_hex(hex(selector)), encoded);
+            ++instructChunk;
+        }
+        totalInstructChunk += instructChunk;
+    }
+
+    Data calldataLength;
+    Ethereum::ABI::ValueEncoder::encodeUInt256((totalInstructChunk * encodingChunk) + (bytesChunkLine * encodingChunk), calldataLength);
+
+    encoded.insert(encoded.begin() + callDataDataLocation, calldataLength.begin(), calldataLength.end());
+
+    auto initDataSize = int(hex(parse_hex(input.init_data())).size());
+    if (initDataSize == 0 || initDataSize % 2 != 0)
+        return {};
+
+    auto initDataLength = initDataSize / 2; // 1 byte is encoded into 2 char
+    Ethereum::ABI::ValueEncoder::encodeUInt256(initDataLength, encoded);
+
+    append(encoded, parse_hex(input.init_data()));
+
+    const int paddingLength = (encodingChunk * 2) - (initDataSize % (encodingChunk * 2));
+    const std::string padding(paddingLength, defaultPadding);
+    append(encoded, parse_hex(padding));
+
+    return encoded;
+}
+
+} // namespace TW::Barz
diff --git a/src/Ethereum/Barz.h b/src/Ethereum/Barz.h
new file mode 100644
index 00000000000..f29afc4eeed
--- /dev/null
+++ b/src/Ethereum/Barz.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "uint256.h"
+#include "PublicKey.h"
+#include "../proto/Barz.pb.h"
+
+namespace TW::Barz {
+
+std::string getCounterfactualAddress(const Proto::ContractAddressInput input);
+Data getInitCode(const std::string& factoryAddress, const PublicKey& publicKey, const std::string& verificationFacet, const uint32_t salt);
+Data getFormattedSignature(const Data& signature, const Data challenge, const Data& authenticatorData, const std::string& clientDataJSON);
+Data getPrefixedMsgHash(const Data msgHash, const std::string& barzAddress, const uint32_t chainId);
+Data getDiamondCutCode(const Proto::DiamondCutInput& input); // action should be one of 0, 1, 2. 0 = Add, 1 = Remove, 2 = Replace
+
+}
diff --git a/src/Ethereum/ContractCall.cpp b/src/Ethereum/ContractCall.cpp
index 0ae3a65db23..727a21d192b 100644
--- a/src/Ethereum/ContractCall.cpp
+++ b/src/Ethereum/ContractCall.cpp
@@ -1,131 +1,38 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "ContractCall.h"
-#include "ABI.h"
 #include "HexCoding.h"
-#include "uint256.h"
-#include <boost/algorithm/string/predicate.hpp>
+#include "proto/EthereumAbi.pb.h"
+#include "TrustWalletCore/TWCoinType.h"
 
 using namespace std;
 using json = nlohmann::json;
 
 namespace TW::Ethereum::ABI {
 
-static void fillArray(ParamSet& paramSet, const string& type) {
-    auto baseType = string(type.begin(), type.end() - 2);
-    auto value = ParamFactory::make(baseType);
-    auto param = make_shared<ParamArray>(value);
-    paramSet.addParam(param);
-}
-
-static void fill(ParamSet& paramSet, const string& type) {
-    if (boost::algorithm::ends_with(type, "[]")) {
-        fillArray(paramSet, type);
-    } else {
-        auto param = ParamFactory::make(type);
-        paramSet.addParam(param);
-    }
-}
-
-static vector<string> getArrayValue(ParamSet& paramSet, const string& type, int idx) {
-    shared_ptr<ParamBase> param;
-    paramSet.getParam(idx, param);
-    return ParamFactory::getArrayValue(param, type);
-}
-
-static json buildInputs(ParamSet& paramSet, const json& registry); // forward
-
-static json getTupleValue(ParamSet& paramSet, [[maybe_unused]] const string& type, int idx, const json& typeInfo) {
-    shared_ptr<ParamBase> param;
-    paramSet.getParam(idx, param);
-    auto paramTuple = dynamic_pointer_cast<ParamTuple>(param);
-    if (!paramTuple.get()) {
-        return {};
-    }
-    return buildInputs(paramTuple->_params, typeInfo["components"]);
-}
-
-static string getValue(ParamSet& paramSet, const string& type, int idx) {
-    shared_ptr<ParamBase> param;
-    paramSet.getParam(idx, param);
-    return ParamFactory::getValue(param, type);
-}
-
-static json buildInputs(ParamSet& paramSet, const json& registry) {
-    auto inputs = json::array();
-    for (auto i = 0ul; i < registry.size(); i++) {
-        auto info = registry[i];
-        auto type = info["type"];
-        auto input = json{
-            {"name", info["name"]},
-            {"type", type}
-        };
-        if (boost::algorithm::ends_with(type.get<string>(), "[]")) {
-            input["value"] = json(getArrayValue(paramSet, type, static_cast<int>(i)));
-        } else if (type == "tuple") {
-            input["components"] = getTupleValue(paramSet, type, static_cast<int>(i), info);
-        } else if (type == "bool") {
-            input["value"] = getValue(paramSet, type, static_cast<int>(i)) == "true" ? json(true) : json(false);
-        } else {
-            input["value"] = getValue(paramSet, type, static_cast<int>(i));
-        }
-        inputs.push_back(input);
-    }
-    return inputs;
-}
-
-void fillTuple(ParamSet& paramSet, const json& jsonSet); // forward
-
-void decodeParamSet(ParamSet& paramSet, const json& jsonSet) {
-    for (auto& comp : jsonSet) {
-        if (comp["type"] == "tuple") {
-            fillTuple(paramSet, comp["components"]);
-        } else {        
-            fill(paramSet, comp["type"]);
-        }
-    }    
-}
-
-void fillTuple(ParamSet& paramSet, const json& jsonSet) {
-    std::shared_ptr<ParamTuple> param = make_shared<ParamTuple>();
-    decodeParamSet(param->_params, jsonSet);
-    paramSet.addParam(param);
-}
-
-optional<string> decodeCall(const Data& call, const json& abi) {
-    // check bytes length
-    if (call.size() <= 4) {
-        return {};
-    }
+optional<string> decodeCall(const Data& call, const std::string& abi) {
+    EthereumAbi::Proto::ContractCallDecodingInput input;
+    input.set_encoded(call.data(), call.size());
+    input.set_smart_contract_abi_json(abi);
 
-    auto methodId = hex(Data(call.begin(), call.begin() + 4));
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    Rust::TWDataWrapper outputPtr = Rust::tw_ethereum_abi_decode_contract_call(TWCoinTypeEthereum, inputData.get());
 
-    if (abi.find(methodId) == abi.end()) {
+    auto outputData = outputPtr.toDataOrDefault();
+    if (outputData.empty()) {
         return {};
     }
 
-    // build Function with types
-    const auto registry = abi[methodId];
-    auto func = Function(registry["name"]);
-    decodeParamSet(func._inParams, registry["inputs"]);
+    EthereumAbi::Proto::ContractCallDecodingOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
 
-    // decode inputs
-    size_t offset = 0;
-    auto success = func.decodeInput(call, offset);
-    if (!success) {
+    if (output.error() != EthereumAbi::Proto::AbiError::OK) {
         return {};
     }
 
-    // build output json
-    auto decoded = json{
-        {"function", func.getType()},
-        {"inputs", buildInputs(func._inParams, registry["inputs"])},
-    };
-    return decoded.dump();
+    return output.decoded_json();
 }
 
 } // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/ContractCall.h b/src/Ethereum/ContractCall.h
index ca7b5c44718..abbb0a0fce5 100644
--- a/src/Ethereum/ContractCall.h
+++ b/src/Ethereum/ContractCall.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,5 +10,5 @@
 #include <string>
 
 namespace TW::Ethereum::ABI {
-    std::optional<std::string> decodeCall(const Data& call, const nlohmann::json& abi);
+    std::optional<std::string> decodeCall(const Data& call, const std::string& abi);
 } // namespace TW::Ethereum::ABI
diff --git a/src/Ethereum/EIP1014.cpp b/src/Ethereum/EIP1014.cpp
new file mode 100644
index 00000000000..7a72b3e0e51
--- /dev/null
+++ b/src/Ethereum/EIP1014.cpp
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "EIP1014.h"
+#include "AddressChecksum.h"
+#include "Hash.h"
+#include "HexCoding.h"
+
+namespace TW::Ethereum {
+
+Data create2Address(const std::string& from, const Data& salt, const Data& initCodeHash) {
+    if (salt.size() != 32) {
+        throw std::runtime_error("Error: salt must be 32 bytes.");
+    }
+    if (initCodeHash.size() != 32) {
+        throw std::runtime_error("Error: initCodeHash must be 32 bytes.");
+    }
+    Data input = {0xff};
+    append(input, parse_hex(from));
+    append(input, salt);
+    append(input, initCodeHash);
+    auto hash = Hash::keccak256(input);
+    return Data(hash.end() - 20, hash.end());
+}
+
+} // namespace TW::Ethereum
diff --git a/src/Ethereum/EIP1014.h b/src/Ethereum/EIP1014.h
new file mode 100644
index 00000000000..7471a9052e8
--- /dev/null
+++ b/src/Ethereum/EIP1014.h
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+
+namespace TW::Ethereum {
+
+Data create2Address(const std::string& from, const Data& salt, const Data& initCodeHash);
+
+}
diff --git a/src/Ethereum/EIP1967.cpp b/src/Ethereum/EIP1967.cpp
new file mode 100644
index 00000000000..4fe8d527b08
--- /dev/null
+++ b/src/Ethereum/EIP1967.cpp
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "EIP1014.h"
+#include "ABI/Function.h"
+#include "Hash.h"
+#include "HexCoding.h"
+
+namespace TW::Ethereum {
+
+static const std::string eip1967ProxyBytecodeHex = R"(0x608060405260405162000c5138038062000c51833981810160405281019062000029919062000580565b6200003d828260006200004560201b60201c565b5050620007d7565b62000056836200008860201b60201c565b600082511180620000645750805b156200008357620000818383620000df60201b620000371760201c565b505b505050565b62000099816200011560201b60201c565b8073ffffffffffffffffffffffffffffffffffffffff167fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b60405160405180910390a250565b60606200010d838360405180606001604052806027815260200162000c2a60279139620001eb60201b60201c565b905092915050565b6200012b816200027d60201b620000641760201c565b6200016d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000164906200066d565b60405180910390fd5b80620001a77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b620002a060201b620000871760201c565b60000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60606000808573ffffffffffffffffffffffffffffffffffffffff1685604051620002179190620006dc565b600060405180830381855af49150503d806000811462000254576040519150601f19603f3d011682016040523d82523d6000602084013e62000259565b606091505b50915091506200027286838387620002aa60201b60201c565b925050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b606083156200031a5760008351036200031157620002ce856200027d60201b60201c565b62000310576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620003079062000745565b60405180910390fd5b5b8290506200032d565b6200032c83836200033560201b60201c565b5b949350505050565b600082511115620003495781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200037f9190620007b3565b60405180910390fd5b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003c9826200039c565b9050919050565b620003db81620003bc565b8114620003e757600080fd5b50565b600081519050620003fb81620003d0565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b62000456826200040b565b810181811067ffffffffffffffff821117156200047857620004776200041c565b5b80604052505050565b60006200048d62000388565b90506200049b82826200044b565b919050565b600067ffffffffffffffff821115620004be57620004bd6200041c565b5b620004c9826200040b565b9050602081019050919050565b60005b83811015620004f6578082015181840152602081019050620004d9565b60008484015250505050565b6000620005196200051384620004a0565b62000481565b90508281526020810184848401111562000538576200053762000406565b5b62000545848285620004d6565b509392505050565b600082601f83011262000565576200056462000401565b5b81516200057784826020860162000502565b91505092915050565b600080604083850312156200059a576200059962000392565b5b6000620005aa85828601620003ea565b925050602083015167ffffffffffffffff811115620005ce57620005cd62000397565b5b620005dc858286016200054d565b9150509250929050565b600082825260208201905092915050565b7f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60008201527f6f74206120636f6e747261637400000000000000000000000000000000000000602082015250565b600062000655602d83620005e6565b91506200066282620005f7565b604082019050919050565b60006020820190508181036000830152620006888162000646565b9050919050565b600081519050919050565b600081905092915050565b6000620006b2826200068f565b620006be81856200069a565b9350620006d0818560208601620004d6565b80840191505092915050565b6000620006ea8284620006a5565b915081905092915050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b60006200072d601d83620005e6565b91506200073a82620006f5565b602082019050919050565b6000602082019050818103600083015262000760816200071e565b9050919050565b600081519050919050565b60006200077f8262000767565b6200078b8185620005e6565b93506200079d818560208601620004d6565b620007a8816200040b565b840191505092915050565b60006020820190508181036000830152620007cf818462000772565b905092915050565b61044380620007e76000396000f3fe6080604052366100135761001161001d565b005b61001b61001d565b005b610025610091565b610035610030610093565b6100a2565b565b606061005c83836040518060600160405280602781526020016103e7602791396100c8565b905092915050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b565b600061009d61014e565b905090565b3660008037600080366000845af43d6000803e80600081146100c3573d6000f35b3d6000fd5b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516100f291906102db565b600060405180830381855af49150503d806000811461012d576040519150601f19603f3d011682016040523d82523d6000602084013e610132565b606091505b5091509150610143868383876101a5565b925050509392505050565b600061017c7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b610087565b60000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b606083156102075760008351036101ff576101bf85610064565b6101fe576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f59061034f565b60405180910390fd5b5b829050610212565b610211838361021a565b5b949350505050565b60008251111561022d5781518083602001fd5b806040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161026191906103c4565b60405180910390fd5b600081519050919050565b600081905092915050565b60005b8381101561029e578082015181840152602081019050610283565b60008484015250505050565b60006102b58261026a565b6102bf8185610275565b93506102cf818560208601610280565b80840191505092915050565b60006102e782846102aa565b915081905092915050565b600082825260208201905092915050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b6000610339601d836102f2565b915061034482610303565b602082019050919050565b600060208201905081810360008301526103688161032c565b9050919050565b600081519050919050565b6000601f19601f8301169050919050565b60006103968261036f565b6103a081856102f2565b93506103b0818560208601610280565b6103b98161037a565b840191505092915050565b600060208201905081810360008301526103de818461038b565b90509291505056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e57dd3eafc9985be746025b6d82d4f011b9a7bb3db56f9a1eb7eadfddd376b6064736f6c63430008110033416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564)";
+
+Data getEIP1967ProxyInitCode(const std::string& logicAddress, const Data& data) {
+    Data initCode = parse_hex(eip1967ProxyBytecodeHex);
+
+    auto proxyConstructorParamsEncoded = Ethereum::ABI::Function::encodeParams(Ethereum::ABI::BaseParams {
+        std::make_shared<Ethereum::ABI::ProtoAddress>(logicAddress),
+        std::make_shared<Ethereum::ABI::ProtoByteArray>(data),
+    });
+
+    if (!proxyConstructorParamsEncoded.has_value()) {
+        return {};
+    }
+
+    append(initCode, proxyConstructorParamsEncoded.value());
+    return initCode;
+}
+
+} // namespace TW::Ethereum
diff --git a/src/Ethereum/EIP1967.h b/src/Ethereum/EIP1967.h
new file mode 100644
index 00000000000..04e37fffdf8
--- /dev/null
+++ b/src/Ethereum/EIP1967.h
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+
+namespace TW::Ethereum {
+
+Data getEIP1967ProxyInitCode(const std::string& logicAddress, const Data& data);
+
+}
diff --git a/src/Ethereum/EIP2645.cpp b/src/Ethereum/EIP2645.cpp
new file mode 100644
index 00000000000..c9ae7aa9bde
--- /dev/null
+++ b/src/Ethereum/EIP2645.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <Ethereum/EIP2645.h>
+#include <Hash.h>
+#include <HexCoding.h>
+
+#include <optional>
+#include <sstream>
+
+namespace TW::Ethereum::internal {
+
+static std::string getIntFromBits(const std::string& hexString, std::size_t from, std::optional<std::size_t> length = std::nullopt) {
+    const auto data = hex_str_to_bin_str(hexString);
+    const auto sub = data.substr(data.size() - from, length.value_or(std::string::npos));
+    return std::to_string(std::stoll(sub, nullptr, 2));
+}
+
+} // namespace TW::Ethereum::internal
+
+namespace TW::Ethereum {
+
+// https://docs.starkware.co/starkex/key-derivation.html
+std::string accountPathFromAddress(const std::string& ethAddress, const std::string& layer, const std::string& application, const std::string& index) noexcept {
+    using namespace internal;
+    std::stringstream out;
+    const auto layerHash = getIntFromBits(hex(Hash::sha256(data(layer))), 31);
+    const auto applicationHash = getIntFromBits(hex(Hash::sha256(data(application))), 31);
+    const auto ethAddress1 = getIntFromBits(ethAddress.substr(2), 31);
+    const auto ethAddress2 = getIntFromBits(ethAddress.substr(2), 62, 31);
+    out << "m/2645'/" << layerHash << "'/" << applicationHash << "'/" << ethAddress1 << "'/" << ethAddress2 << "'/" << index;
+    return out.str();
+}
+
+} // namespace TW::Ethereum
diff --git a/src/Ethereum/EIP2645.h b/src/Ethereum/EIP2645.h
new file mode 100644
index 00000000000..e5d51a85f24
--- /dev/null
+++ b/src/Ethereum/EIP2645.h
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <string>
+
+namespace TW::Ethereum {
+
+std::string accountPathFromAddress(const std::string& ethAddress, const std::string& layer, const std::string& application, const std::string& index) noexcept;;
+
+} // namespace TW::Ethereum
diff --git a/src/Ethereum/Entry.cpp b/src/Ethereum/Entry.cpp
index f5a7c7ab87e..6560b3969f7 100644
--- a/src/Ethereum/Entry.cpp
+++ b/src/Ethereum/Entry.cpp
@@ -1,94 +1,22 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
-#include "Signer.h"
-
-#include "proto/TransactionCompiler.pb.h"
+#include "HexCoding.h"
+#include "proto/Ethereum.pb.h"
 
 namespace TW::Ethereum {
 
-using namespace std;
-
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
-    return Address::isValid(address);
-}
-
-string Entry::normalizeAddress([[maybe_unused]] TWCoinType coin, const string& address) const {
-    // normalized with EIP55 checksum
-    return Address(address).string();
-}
-
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
-    return Address(publicKey).string();
-}
-
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
-    const auto addr = Address(address);
-    return {addr.bytes.begin(), addr.bytes.end()};
-}
-
-void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
-    signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
-}
-
-string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string& json, const Data& key) const {
-    return Signer::signJSON(json, key);
-}
-
-Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
-    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
-        txInputData, [](const auto& input, auto& output) {
-            const auto transaction = Signer::build(input);
-            const auto chainId = load(data(input.chain_id())); // retrieve chainId from input
-            auto preHash = transaction->preHash(chainId);
-            auto preImage = transaction->serialize(chainId);
-            output.set_data_hash(preHash.data(), preHash.size());
-            output.set_data(preImage.data(), preImage.size());
-        });
-}
-
-void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, [[maybe_unused]] const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
-    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
-        txInputData, [&](const auto& input, auto& output) {
-            if (signatures.size() != 1) {
-                output.set_error(Common::Proto::Error_signatures_count);
-                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_signatures_count));
-                return;
-            }
-            output = Signer::compile(input, signatures[0]);
-        });
-}
-
-Data Entry::buildTransactionInput([[maybe_unused]] TWCoinType coinType, [[maybe_unused]] const std::string& from, const std::string& to, const uint256_t& amount, [[maybe_unused]] const std::string& asset, [[maybe_unused]] const std::string& memo, const std::string& chainId) const {
-    Proto::SigningInput input;
-
-    auto chainIdData = store(uint256_t(1));
-    if (chainId.length() > 0) {
-        // parse amount
-        uint256_t chainIdUint256{chainId};
-        chainIdData = store(chainIdUint256);
-    }
-    input.set_chain_id(chainIdData.data(), chainIdData.size());
-
-    if (!Address::isValid(to)) {
-        throw std::invalid_argument("Invalid to address");
-    }
-    input.set_to_address(to);
-
-    auto& transfer = *input.mutable_transaction()->mutable_transfer();
-    const auto amountData = store(amount);
-    transfer.set_amount(amountData.data(), amountData.size());
-
-    // not set: nonce, gasPrice, gasLimit, tx_mode (need to be set afterwards)
-
-    const auto txInputData = data(input.SerializeAsString());
-    return txInputData;
+std::string Entry::signJSON(TWCoinType coin, const std::string& json, const Data& key) const {
+    return signJSONHelper<Proto::SigningInput, Proto::SigningOutput>(
+        coin,
+        json,
+        key,
+        [](const Proto::SigningOutput& output) { return hex(output.encoded()); }
+    );
 }
 
 } // namespace TW::Ethereum
diff --git a/src/Ethereum/Entry.h b/src/Ethereum/Entry.h
index 23a31b2c8d1..69d67808596 100644
--- a/src/Ethereum/Entry.h
+++ b/src/Ethereum/Entry.h
@@ -1,30 +1,19 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../CoinEntry.h"
+#include "rust/RustCoinEntry.h"
 
 namespace TW::Ethereum {
 
 /// Entry point for Ethereum and Ethereum-fork coins.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry : public CoinEntry {
+class Entry : public Rust::RustCoinEntryWithSignJSON {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const final;
-     std::string normalizeAddress(TWCoinType coin, const std::string& address) const final;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const final;
-     Data addressToData(TWCoinType coin, const std::string& address) const final;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
-     bool supportsJSONSigning() const final { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const final;
-
-     Data preImageHashes(TWCoinType coin, const Data& txInputData) const final;
-     void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const final;
-     Data buildTransactionInput(TWCoinType coinType, const std::string& from, const std::string& to, const uint256_t& amount, const std::string& asset, const std::string& memo, const std::string& chainId) const final;
+    bool supportsJSONSigning() const final { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const final;
 };
 
 } // namespace TW::Ethereum
diff --git a/src/Ethereum/MessageSigner.cpp b/src/Ethereum/MessageSigner.cpp
new file mode 100644
index 00000000000..a50863c9d15
--- /dev/null
+++ b/src/Ethereum/MessageSigner.cpp
@@ -0,0 +1,137 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "MessageSigner.h"
+#include <proto/Ethereum.pb.h>
+#include <proto/TransactionCompiler.pb.h>
+#include "rust/Wrapper.h"
+#include "TrustWalletCore/TWCoinType.h"
+
+namespace TW::Ethereum {
+
+std::string signMessageRust(const PrivateKey& privateKey, const std::string& message, Proto::MessageType msgType, MessageSigner::MaybeChainId chainId) {
+    Proto::MessageSigningInput input;
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_message(message);
+    input.set_message_type(msgType);
+
+    if (chainId.has_value()) {
+        input.mutable_chain_id()->set_chain_id(static_cast<uint64_t>(chainId.value()));
+    }
+
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    Rust::TWDataWrapper outputPtr = Rust::tw_message_signer_sign(inputData.get(), TWCoinTypeEthereum);
+
+    auto outputData = outputPtr.toDataOrDefault();
+    if (outputData.empty()) {
+        return {};
+    }
+
+    Proto::MessageSigningOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    if (output.error() != Common::Proto::SigningError::OK) {
+        return {};
+    }
+    return output.signature();
+}
+
+Data messagePreImageHashRust(const std::string& message, Proto::MessageType msgType) {
+    Proto::MessageSigningInput input;
+    input.set_message(message);
+    input.set_message_type(msgType);
+
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    Rust::TWDataWrapper outputPtr = Rust::tw_message_signer_pre_image_hashes(inputData.get(), TWCoinTypeEthereum);
+
+    auto outputData = outputPtr.toDataOrDefault();
+    if (outputData.empty()) {
+        return {};
+    }
+
+    TxCompiler::Proto::PreSigningOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    if (output.error() != Common::Proto::SigningError::OK) {
+        return {};
+    }
+    return data(output.data_hash());
+}
+
+bool verifyMessageRust(const PublicKey& publicKey, const std::string& message, const std::string& signature) {
+    Proto::MessageVerifyingInput input;
+    input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+    input.set_message(message);
+    input.set_signature(signature);
+
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    return Rust::tw_message_signer_verify(inputData.get(), TWCoinTypeEthereum);
+}
+
+std::string MessageSigner::signMessage(const PrivateKey& privateKey, const std::string& message, MessageType msgType, MaybeChainId chainId) {
+    auto protoMsgType = Proto::MessageType::MessageType_legacy;
+    switch (msgType) {
+        case MessageType::Eip155: {
+            protoMsgType = Proto::MessageType::MessageType_eip155;
+            break;
+        }
+        case MessageType::ImmutableX: {
+            protoMsgType = Proto::MessageType::MessageType_immutable_x;
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+
+    return signMessageRust(privateKey, message, protoMsgType, chainId);
+}
+
+std::string MessageSigner::signTypedData(const PrivateKey& privateKey, const std::string& data, MessageType msgType, MessageSigner::MaybeChainId chainId) {
+    auto protoMsgType = Proto::MessageType::MessageType_typed;
+    switch (msgType) {
+        case MessageType::Eip155: {
+            protoMsgType = Proto::MessageType::MessageType_typed_eip155;
+            break;
+        }
+        default: {
+            break;
+        }
+    }
+
+    return signMessageRust(privateKey, data, protoMsgType, chainId);
+}
+
+bool MessageSigner::verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept {
+    return verifyMessageRust(publicKey, message, signature);
+}
+
+Data MessageSigner::messagePreImageHash(const std::string& message) noexcept {
+    return messagePreImageHashRust(message, Proto::MessageType::MessageType_legacy);
+}
+
+Data MessageSigner::typedDataPreImageHash(const std::string& data) noexcept {
+    return messagePreImageHashRust(data, Proto::MessageType::MessageType_typed);
+}
+
+void MessageSigner::prepareSignature(Data& signature, MessageType msgType, TW::Ethereum::MessageSigner::MaybeChainId chainId) noexcept {
+    switch (msgType) {
+        case MessageType::ImmutableX: {
+            break;
+        }
+        case MessageType::Legacy: {
+            signature[64] += 27;
+            break;
+        }
+        case MessageType::Eip155: {
+            auto id = chainId.value_or(0);
+            signature[64] += 35 + id * 2;
+            break;
+        }
+        default:
+            break;
+    }
+}
+
+} // namespace TW::Ethereum
diff --git a/src/Ethereum/MessageSigner.h b/src/Ethereum/MessageSigner.h
new file mode 100644
index 00000000000..fc45e49c152
--- /dev/null
+++ b/src/Ethereum/MessageSigner.h
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <PrivateKey.h>
+#include <string>
+#include <optional>
+
+namespace TW::Ethereum {
+
+enum class MessageType {
+    Legacy = 1,
+    Eip155 = 2,
+    ImmutableX = 3
+};
+
+class MessageSigner {
+public:
+    using MaybeChainId = std::optional<std::size_t>;
+    /// Sign a message following EIP-191
+    /// \param privateKey the private key to sign with
+    /// \param message message to sign
+    /// \param msgType message type to sign
+    /// \param chainId optional chainId if msgType is eip155
+    /// \return hex signed message
+    static std::string signMessage(const PrivateKey& privateKey, const std::string& message, MessageType msgType, MaybeChainId chainId = std::nullopt);
+
+    /// Sign typed data according to EIP-712 V4
+    /// \param privateKey the private key to sign with
+    /// \param data json data
+    /// \param msgType message type to sign
+    /// \param chainId optional chainId if msgType is eip155
+    /// \return hex signed message
+    static std::string signTypedData(const PrivateKey& privateKey, const std::string& data, MessageType msgType, MaybeChainId chainId = std::nullopt);
+
+    /// Verify a message following EIP-191
+    /// \param publicKey publickey to verify the signed message
+    /// \param message message to be verified as a string
+    /// \param signature signature to verify the message against
+    /// \return true if the message match the signature, false otherwise
+    static bool verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept;
+
+    /// Computes a hash of the message following EIP-191.
+    /// \param message message to hash
+    /// \return hash of the tuped data.
+    static Data messagePreImageHash(const std::string& message) noexcept;
+
+    /// Computes a hash of the typed data according to EIP-712 V4.
+    /// \param data json data
+    /// \return hash of the tuped data.
+    static Data typedDataPreImageHash(const std::string& data) noexcept;
+
+    static void prepareSignature(Data& signature, MessageType msgType, MaybeChainId chainId = std::nullopt) noexcept;
+};
+
+} // namespace TW::Ethereum
diff --git a/src/Ethereum/RLP.cpp b/src/Ethereum/RLP.cpp
index 50817bbd467..8a543c1e8de 100644
--- a/src/Ethereum/RLP.cpp
+++ b/src/Ethereum/RLP.cpp
@@ -1,194 +1,44 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "RLP.h"
 
-#include "../BinaryCoding.h"
+#include "BinaryCoding.h"
+#include "TrustWalletCore/TWCoinType.h"
+#include "rust/Wrapper.h"
 
 #include <tuple>
 
 namespace TW::Ethereum {
 
-Data RLP::encode(const uint256_t& value) noexcept {
-    using boost::multiprecision::cpp_int;
+Data RLP::encode(const EthereumRlp::Proto::EncodingInput& input) {
+    Rust::TWDataWrapper inputData(data(input.SerializeAsString()));
+    Rust::TWDataWrapper outputPtr = Rust::tw_ethereum_rlp_encode(TWCoinTypeEthereum, inputData.get());
 
-    Data bytes;
-    export_bits(value, std::back_inserter(bytes), 8);
-
-    if (bytes.empty() || (bytes.size() == 1 && bytes[0] == 0)) {
-        return {0x80};
+    auto outputData = outputPtr.toDataOrDefault();
+    if (outputData.empty()) {
+        return {};
     }
 
-    return encode(bytes);
-}
+    EthereumRlp::Proto::EncodingOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
 
-Data RLP::encodeList(const Data& encoded) noexcept {
-    auto result = encodeHeader(encoded.size(), 0xc0, 0xf7);
-    result.reserve(result.size() + encoded.size());
-    result.insert(result.end(), encoded.begin(), encoded.end());
-    return result;
+    return data(output.encoded());
 }
 
-Data RLP::encode(const Data& data) noexcept {
-    if (data.size() == 1 && data[0] <= 0x7f) {
-        // Fits in single byte, no header
-        return data;
-    }
-
-    auto encoded = encodeHeader(data.size(), 0x80, 0xb7);
-    encoded.insert(encoded.end(), data.begin(), data.end());
-    return encoded;
+Data RLP::encodeString(const std::string& s) {
+    EthereumRlp::Proto::EncodingInput input;
+    input.mutable_item()->set_string_item(s);
+    return encode(input);
 }
 
-Data RLP::encodeHeader(uint64_t size, uint8_t smallTag, uint8_t largeTag) noexcept {
-    if (size < 56) {
-        return {static_cast<uint8_t>(smallTag + size)};
-    }
+Data RLP::encodeU256(const uint256_t & num) {
+    auto numData = store(num);
 
-    const auto sizeData = putVarInt(size);
-
-    auto header = Data();
-    header.reserve(1 + sizeData.size());
-    header.push_back(largeTag + static_cast<uint8_t>(sizeData.size()));
-    header.insert(header.end(), sizeData.begin(), sizeData.end());
-    return header;
-}
-
-Data RLP::putVarInt(uint64_t i) noexcept {
-    Data bytes; // accumulate bytes here, in reverse order
-    do {
-        // take LSB byte, append
-        bytes.push_back(i & 0xff);
-        i = i >> 8;
-    } while (i);
-    assert(bytes.size() >= 1 && bytes.size() <= 8);
-    std::reverse(bytes.begin(), bytes.end());
-    return bytes;
-}
-
-uint64_t RLP::parseVarInt(size_t size, const Data& data, size_t index) {
-    if (size < 1 || size > 8) {
-        throw std::invalid_argument("invalid length length");
-    }
-    if (data.size() - index < size) {
-        throw std::invalid_argument("Not enough data for varInt");
-    }
-    if (size >= 2 && data[index] == 0) {
-        throw std::invalid_argument("multi-byte length must have no leading zero");
-    }
-    uint64_t val = 0;
-    for (auto i = 0ul; i < size; ++i) {
-        val = val << 8;
-        val += data[index + i];
-    }
-    return static_cast<size_t>(val);
-}
-
-RLP::DecodedItem RLP::decodeList(const Data& input) {
-    RLP::DecodedItem item;
-    auto remainder = input;
-    while (true) {
-        auto listItem = RLP::decode(remainder);
-        item.decoded.push_back(listItem.decoded[0]);
-        if (listItem.remainder.size() == 0) {
-            break;
-        } else {
-            remainder = listItem.remainder;
-        }
-    }
-    return item;
-}
-
-RLP::DecodedItem RLP::decode(const Data& input) {
-    if (input.size() == 0) {
-        throw std::invalid_argument("can't decode empty rlp data");
-    }
-    RLP::DecodedItem item;
-    auto inputLen = input.size();
-    auto prefix = input[0];
-    if (prefix <= 0x7f) {
-        // 00--7f: a single byte whose value is in the [0x00, 0x7f] range, that byte is its own RLP encoding.
-        item.decoded.emplace_back(Data{input[0]});
-        item.remainder = subData(input, 1);
-        return item;
-    }
-    if (prefix <= 0xb7) {
-        // 80--b7: short string
-        // string is 0-55 bytes long. A single byte with value 0x80 plus the length of the string followed by the string
-        // The range of the first byte is [0x80, 0xb7]
-
-        // empty string
-        if (prefix == 0x80) {
-            item.decoded.emplace_back(Data());
-            item.remainder = subData(input, 1);
-            return item;
-        }
-
-        auto strLen = prefix - 0x80;
-        if (strLen == 1 && input[1] <= 0x7f) {
-            throw std::invalid_argument("single byte below 128 must be encoded as itself");
-        }
-
-        if (inputLen < (1ul + strLen)) {
-            throw std::invalid_argument(std::string("invalid short string, length ") + std::to_string(strLen));
-        }
-        item.decoded.push_back(subData(input, 1, strLen));
-        item.remainder = subData(input, 1 + strLen);
-
-        return item;
-    }
-    if (prefix <= 0xbf) {
-        // b8--bf: long string
-        auto lenOfStrLen = size_t(prefix - 0xb7);
-        auto strLen = static_cast<size_t>(parseVarInt(lenOfStrLen, input, 1));
-        if (inputLen < lenOfStrLen || inputLen < (1 + lenOfStrLen + strLen)) {
-            throw std::invalid_argument(std::string("Invalid rlp encoding length, length ") + std::to_string(strLen));
-        }
-        auto data = subData(input, 1 + lenOfStrLen, strLen);
-        item.decoded.push_back(data);
-        item.remainder = subData(input, 1 + lenOfStrLen + strLen);
-        return item;
-    }
-    if (prefix <= 0xf7) {
-        // c0--f7: a list between  0-55 bytes long
-        auto listLen = size_t(prefix - 0xc0);
-        if (inputLen < (1 + listLen)) {
-            throw std::invalid_argument(std::string("Invalid rlp string length, length ") + std::to_string(listLen));
-        }
-        // empty list
-        if (listLen == 0) {
-            item.remainder = subData(input, 1);
-            return item;
-        }
-
-        // decode list
-        auto listItem = decodeList(subData(input, 1, listLen));
-        for (auto& data : listItem.decoded) {
-            item.decoded.push_back(data);
-        }
-        item.remainder = subData(input, 1 + listLen);
-        return item;
-    }
-    // f8--ff
-    auto lenOfListLen = size_t(prefix - 0xf7);
-    auto listLen = static_cast<size_t>(parseVarInt(lenOfListLen, input, 1));
-    if (listLen < 56) {
-        throw std::invalid_argument("length below 56 must be encoded in one byte");
-    }
-    if (inputLen < lenOfListLen || inputLen < (1 + lenOfListLen + listLen)) {
-        throw std::invalid_argument(std::string("Invalid rlp list length, length ") + std::to_string(listLen));
-    }
-
-    // decode list
-    auto listItem = decodeList(subData(input, 1 + lenOfListLen, listLen));
-    for (auto& data : listItem.decoded) {
-        item.decoded.push_back(data);
-    }
-    item.remainder = subData(input, 1 + lenOfListLen + listLen);
-    return item;
+    EthereumRlp::Proto::EncodingInput input;
+    input.mutable_item()->set_number_u256(numData.data(), numData.size());
+    return encode(input);
 }
 
 } // namespace TW::Ethereum
diff --git a/src/Ethereum/RLP.h b/src/Ethereum/RLP.h
index c65ecbbc6cb..5163d339514 100644
--- a/src/Ethereum/RLP.h
+++ b/src/Ethereum/RLP.h
@@ -1,14 +1,12 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "Transaction.h"
 #include "Data.h"
-#include "../uint256.h"
+#include "proto/EthereumRlp.pb.h"
+#include "uint256.h"
 
 #include <cstdint>
 #include <string>
@@ -20,87 +18,11 @@ namespace TW::Ethereum {
 ///
 /// - SeeAlso: https://github.com/ethereum/wiki/wiki/RLP
 struct RLP {
-    /// Encodes a string;
-    static Data encode(const std::string& string) noexcept {
-        return encode(Data(string.begin(), string.end()));
-    }
+    static Data encode(const EthereumRlp::Proto::EncodingInput& input);
 
-    static Data encode(uint8_t number) noexcept { return encode(uint256_t(number)); }
+    static Data encodeString(const std::string& s);
 
-    static Data encode(uint16_t number) noexcept { return encode(uint256_t(number)); }
-
-    static Data encode(int32_t number) noexcept {
-        if (number < 0) {
-            return {}; // RLP cannot encode negative numbers
-        }
-        return encode(static_cast<uint32_t>(number));
-    }
-
-    static Data encode(uint32_t number) noexcept { return encode(uint256_t(number)); }
-
-    static Data encode(int64_t number) noexcept {
-        if (number < 0) {
-            return {}; // RLP cannot encode negative numbers
-        }
-        return encode(static_cast<uint64_t>(number));
-    }
-
-    static Data encode(uint64_t number) noexcept { return encode(uint256_t(number)); }
-
-    static Data encode(const uint256_t& number) noexcept;
-
-    /// Wraps encoded data as a list.
-    static Data encodeList(const Data& encoded) noexcept;
-
-    /// Encodes a block of data.
-    static Data encode(const Data& data) noexcept;
-
-    /// Encodes a static array.
-    template <std::size_t N>
-    static Data encode(const std::array<uint8_t, N>& data) noexcept {
-        if (N == 1 && data[0] <= 0x7f) {
-            // Fits in single byte, no header
-            return Data(data.begin(), data.end());
-        }
-
-        auto encoded = encodeHeader(data.size(), 0x80, 0xb7);
-        encoded.insert(encoded.end(), data.begin(), data.end());
-        return encoded;
-    }
-
-    /// Encodes a list of elements.
-    template <typename T>
-    static Data encodeList(T elements) noexcept {
-        auto encodedData = Data();
-        for (const auto& el : elements) {
-            auto encoded = encode(el);
-            if (encoded.empty()) {
-                return {};
-            }
-            encodedData.insert(encodedData.end(), encoded.begin(), encoded.end());
-        }
-
-        auto encoded = encodeHeader(encodedData.size(), 0xc0, 0xf7);
-        encoded.insert(encoded.end(), encodedData.begin(), encodedData.end());
-        return encoded;
-    }
-
-    /// Encodes a list header.
-    static Data encodeHeader(uint64_t size, uint8_t smallTag, uint8_t largeTag) noexcept;
-
-    struct DecodedItem {
-        std::vector<Data> decoded;
-        Data remainder;
-    };
-
-    static DecodedItem decodeList(const Data& input);
-    /// Decodes data, remainder from RLP encoded data
-    static DecodedItem decode(const Data& data);
-
-    /// Returns the representation of an integer using the least number of bytes needed, between 1 and 8 bytes, big endian
-    static Data putVarInt(uint64_t i) noexcept;
-    /// Parses an integer of given size, between 1 and 8 bytes, big endian
-    static uint64_t parseVarInt(size_t size, const Data& data, size_t index);
+    static Data encodeU256(const uint256_t& num);
 };
 
 } // namespace TW::Ethereum
diff --git a/src/Ethereum/Signer.cpp b/src/Ethereum/Signer.cpp
deleted file mode 100644
index edfca7a0620..00000000000
--- a/src/Ethereum/Signer.cpp
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Signer.h"
-#include "HexCoding.h"
-#include "Coin.h"
-#include <TrustWalletCore/TWCoinType.h>
-#include <google/protobuf/util/json_util.h>
-
-namespace TW::Ethereum {
-
-Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    try {
-        uint256_t chainID = load(input.chain_id());
-        auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-        auto transaction = Signer::build(input);
-
-        auto signature = sign(key, chainID, transaction);
-
-        auto output = Proto::SigningOutput();
-
-        auto encoded = transaction->encoded(signature, chainID);
-        output.set_encoded(encoded.data(), encoded.size());
-
-        auto v = store(signature.v, 1);
-        output.set_v(v.data(), v.size());
-        auto r = store(signature.r, 32);
-        output.set_r(r.data(), r.size());
-        auto s = store(signature.s, 32);
-        output.set_s(s.data(), s.size());
-
-        output.set_data(transaction->payload.data(), transaction->payload.size());
-
-        return output;
-    } catch (std::exception&) {
-        return Proto::SigningOutput();
-    }
-}
-
-std::string Signer::signJSON(const std::string& json, const Data& key) {
-    auto input = Proto::SigningInput();
-    google::protobuf::util::JsonStringToMessage(json, &input);
-    input.set_private_key(key.data(), key.size());
-    auto output = Signer::sign(input);
-    return hex(output.encoded());
-}
-
-Proto::SigningOutput Signer::compile(const Proto::SigningInput& input, const Data& signature) noexcept {
-    try {
-        uint256_t chainID = load(input.chain_id());
-        auto transaction = Signer::build(input);
-
-        // prepare Signature
-        const Signature sigStruct = signatureDataToStruct(signature, transaction->usesReplayProtection(), chainID);
-
-        auto output = Proto::SigningOutput();
-
-        auto encoded = transaction->encoded(sigStruct, chainID);
-        output.set_encoded(encoded.data(), encoded.size());
-
-        auto v = store(sigStruct.v, 1);
-        output.set_v(v.data(), v.size());
-        auto r = store(sigStruct.r, 32);
-        output.set_r(r.data(), r.size());
-        auto s = store(sigStruct.s, 32);
-        output.set_s(s.data(), s.size());
-
-        output.set_data(transaction->payload.data(), transaction->payload.size());
-        return output;
-    } catch (std::exception&) {
-        return Proto::SigningOutput();
-    }
-}
-
-Signature Signer::signatureDataToStruct(const Data& signature, bool includeEip155, const uint256_t& chainID) noexcept {
-    if (!includeEip155) {
-        return signatureDataToStructSimple(signature);
-    }
-    return signatureDataToStructWithEip155(chainID, signature);
-}
-
-Signature Signer::signatureDataToStructSimple(const Data& signature) noexcept {
-    boost::multiprecision::uint256_t r, s, v;
-    import_bits(r, signature.begin(), signature.begin() + 32);
-    import_bits(s, signature.begin() + 32, signature.begin() + 64);
-    import_bits(v, signature.begin() + 64, signature.begin() + 65);
-    return Signature{r, s, v};
-}
-
-Signature Signer::signatureDataToStructWithEip155(const uint256_t& chainID, const Data& signature) noexcept {
-    Signature rsv = signatureDataToStructSimple(signature);
-    // Embed chainID in V param, for replay protection, legacy (EIP155)
-    if (chainID != 0) {
-        rsv.v += 35 + chainID + chainID;
-    } else {
-        rsv.v += 27;
-    }
-    return rsv;
-}
-
-Signature Signer::sign(const PrivateKey& privateKey, const Data& hash, bool includeEip155, const uint256_t& chainID) noexcept {
-    auto signature = privateKey.sign(hash, TWCurveSECP256k1);
-    return signatureDataToStruct(signature, includeEip155, chainID);
-}
-
-// May throw
-Data addressStringToData(const std::string& asString) {
-    if (asString.empty()) {
-        return {};
-    }
-    // only ronin address prefix is not 0x
-    if (asString.compare(0, 2, "0x") != 0) {
-        return TW::addressToData(TWCoinTypeRonin, asString);
-    }
-    return TW::addressToData(TWCoinTypeEthereum, asString);
-}
-
-std::shared_ptr<TransactionBase> Signer::build(const Proto::SigningInput& input) {
-    Data toAddress = addressStringToData(input.to_address());
-    uint256_t nonce = load(input.nonce());
-    uint256_t gasPrice = load(input.gas_price());
-    uint256_t gasLimit = load(input.gas_limit());
-    uint256_t maxInclusionFeePerGas = load(input.max_inclusion_fee_per_gas());
-    uint256_t maxFeePerGas = load(input.max_fee_per_gas());
-    switch (input.transaction().transaction_oneof_case()) {
-    case Proto::Transaction::kTransfer: {
-        switch (input.tx_mode()) {
-        case Proto::TransactionMode::Legacy:
-        default:
-            return TransactionNonTyped::buildNativeTransfer(
-                nonce, gasPrice, gasLimit,
-                /* to: */ toAddress,
-                /* amount: */ load(input.transaction().transfer().amount()),
-                /* optional data: */ Data(input.transaction().transfer().data().begin(), input.transaction().transfer().data().end()));
-
-        case Proto::TransactionMode::Enveloped: // Eip1559
-            return TransactionEip1559::buildNativeTransfer(
-                nonce, maxInclusionFeePerGas, maxFeePerGas, gasLimit,
-                /* to: */ toAddress,
-                /* amount: */ load(input.transaction().transfer().amount()),
-                /* optional data: */ Data(input.transaction().transfer().data().begin(), input.transaction().transfer().data().end()));
-        }
-    }
-
-    case Proto::Transaction::kErc20Transfer: {
-        Data tokenToAddress = addressStringToData(input.transaction().erc20_transfer().to());
-        switch (input.tx_mode()) {
-        case Proto::TransactionMode::Legacy:
-        default:
-            return TransactionNonTyped::buildERC20Transfer(
-                nonce, gasPrice, gasLimit,
-                /* tokenContract: */ toAddress,
-                /* toAddress */ tokenToAddress,
-                /* amount: */ load(input.transaction().erc20_transfer().amount()));
-
-        case Proto::TransactionMode::Enveloped: // Eip1559
-            return TransactionEip1559::buildERC20Transfer(
-                nonce, maxInclusionFeePerGas, maxFeePerGas, gasLimit,
-                /* tokenContract: */ toAddress,
-                /* toAddress */ tokenToAddress,
-                /* amount: */ load(input.transaction().erc20_transfer().amount()));
-        }
-    }
-
-    case Proto::Transaction::kErc20Approve: {
-        Data spenderAddress = addressStringToData(input.transaction().erc20_approve().spender());
-        switch (input.tx_mode()) {
-        case Proto::TransactionMode::Legacy:
-        default:
-            return TransactionNonTyped::buildERC20Approve(
-                nonce, gasPrice, gasLimit,
-                /* tokenContract: */ toAddress,
-                /* toAddress */ spenderAddress,
-                /* amount: */ load(input.transaction().erc20_approve().amount()));
-
-        case Proto::TransactionMode::Enveloped: // Eip1559
-            return TransactionEip1559::buildERC20Approve(
-                nonce, maxInclusionFeePerGas, maxFeePerGas, gasLimit,
-                /* tokenContract: */ toAddress,
-                /* toAddress */ spenderAddress,
-                /* amount: */ load(input.transaction().erc20_approve().amount()));
-        }
-    }
-
-    case Proto::Transaction::kErc721Transfer: {
-        Data tokenToAddress = addressStringToData(input.transaction().erc721_transfer().to());
-        Data tokenFromAddress = addressStringToData(input.transaction().erc721_transfer().from());
-        switch (input.tx_mode()) {
-        case Proto::TransactionMode::Legacy:
-        default:
-            return TransactionNonTyped::buildERC721Transfer(
-                nonce, gasPrice, gasLimit,
-                /* tokenContract: */ toAddress,
-                /* fromAddress: */ tokenFromAddress,
-                /* toAddress */ tokenToAddress,
-                /* tokenId: */ load(input.transaction().erc721_transfer().token_id()));
-
-        case Proto::TransactionMode::Enveloped: // Eip1559
-            return TransactionEip1559::buildERC721Transfer(
-                nonce, maxInclusionFeePerGas, maxFeePerGas, gasLimit,
-                /* tokenContract: */ toAddress,
-                /* fromAddress: */ tokenFromAddress,
-                /* toAddress */ tokenToAddress,
-                /* tokenId: */ load(input.transaction().erc721_transfer().token_id()));
-        }
-    }
-
-    case Proto::Transaction::kErc1155Transfer: {
-        Data tokenToAddress = addressStringToData(input.transaction().erc1155_transfer().to());
-        Data tokenFromAddress = addressStringToData(input.transaction().erc1155_transfer().from());
-        switch (input.tx_mode()) {
-        case Proto::TransactionMode::Legacy:
-        default:
-            return TransactionNonTyped::buildERC1155Transfer(
-                nonce, gasPrice, gasLimit,
-                /* tokenContract: */ toAddress,
-                /* fromAddress: */ tokenFromAddress,
-                /* toAddress */ tokenToAddress,
-                /* tokenId: */ load(input.transaction().erc1155_transfer().token_id()),
-                /* value */ load(input.transaction().erc1155_transfer().value()),
-                /* data */ Data(input.transaction().erc1155_transfer().data().begin(), input.transaction().erc1155_transfer().data().end()));
-
-        case Proto::TransactionMode::Enveloped: // Eip1559
-            return TransactionEip1559::buildERC1155Transfer(
-                nonce, maxInclusionFeePerGas, maxFeePerGas, gasLimit,
-                /* tokenContract: */ toAddress,
-                /* fromAddress: */ tokenFromAddress,
-                /* toAddress */ tokenToAddress,
-                /* tokenId: */ load(input.transaction().erc1155_transfer().token_id()),
-                /* value */ load(input.transaction().erc1155_transfer().value()),
-                /* data */ Data(input.transaction().erc1155_transfer().data().begin(), input.transaction().erc1155_transfer().data().end()));
-        }
-    }
-
-    case Proto::Transaction::kContractGeneric:
-    default: {
-        switch (input.tx_mode()) {
-        case Proto::TransactionMode::Legacy:
-        default:
-            return TransactionNonTyped::buildNativeTransfer(
-                nonce, gasPrice, gasLimit,
-                /* to: */ toAddress,
-                /* amount: */ load(input.transaction().contract_generic().amount()),
-                /* transaction: */ Data(input.transaction().contract_generic().data().begin(), input.transaction().contract_generic().data().end()));
-
-        case Proto::TransactionMode::Enveloped: // Eip1559
-            return TransactionEip1559::buildNativeTransfer(
-                nonce, maxInclusionFeePerGas, maxFeePerGas, gasLimit,
-                /* to: */ toAddress,
-                /* amount: */ load(input.transaction().contract_generic().amount()),
-                /* transaction: */ Data(input.transaction().contract_generic().data().begin(), input.transaction().contract_generic().data().end()));
-        }
-    }
-    }
-}
-
-Signature Signer::sign(const PrivateKey& privateKey, const uint256_t& chainID, std::shared_ptr<TransactionBase> transaction) noexcept {
-    auto preHash = transaction->preHash(chainID);
-    return Signer::sign(privateKey, preHash, transaction->usesReplayProtection(), chainID);
-}
-
-} // namespace TW::Ethereum
diff --git a/src/Ethereum/Signer.h b/src/Ethereum/Signer.h
deleted file mode 100644
index 3fb42172c1d..00000000000
--- a/src/Ethereum/Signer.h
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "RLP.h"
-#include "Transaction.h"
-#include "Data.h"
-#include "../Hash.h"
-#include "../PrivateKey.h"
-#include "../proto/Ethereum.pb.h"
-#include "../uint256.h"
-
-#include <boost/multiprecision/cpp_int.hpp>
-#include <cstdint>
-#include <vector>
-#include <memory>
-
-namespace TW::Ethereum {
-
-/// Helper class that performs Ethereum transaction signing.
-class Signer {
-  public:
-    /// Signs a Proto::SigningInput transaction
-    static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
-    /// Signs a json Proto::SigningInput with private key
-    static std::string signJSON(const std::string& json, const Data& key);
-
-  public:
-    Signer() = delete;
-
-    /// Signs the given transaction.
-    static Signature sign(const PrivateKey& privateKey, const uint256_t& chainID, std::shared_ptr<TransactionBase> transaction) noexcept;
-    /// Compiles a Proto::SigningInput transaction, with external signature
-    static Proto::SigningOutput compile(const Proto::SigningInput& input, const Data& signature) noexcept;
-
-  public:
-    /// build Transaction from signing input
-    static std::shared_ptr<TransactionBase> build(const Proto::SigningInput& input);
-
-    /// Signs a hash with the given private key for the given chain identifier.
-    ///
-    /// \returns the r, s, and v values of the transaction signature
-    static Signature sign(const PrivateKey& privateKey, const Data& hash, bool includeEip155, const uint256_t& chainID) noexcept;
-
-    /// Break up the signature into the R, S, and V values.
-    /// \returns the r, s, and v values of the transaction signature
-    static Signature signatureDataToStruct(const Data& signature, bool includeEip155, const uint256_t& chainID) noexcept;
-
-    /// Break up the signature into the R, S, and V values, with no replay protection.
-    /// \returns the r, s, and v values of the transaction signature
-    static Signature signatureDataToStructSimple(const Data& signature) noexcept;
-
-    /// Break up the signature into the R, S, and V values, and include chainID in V for replay protection (Eip155)
-    /// \returns the r, s, and v values of the transaction signature
-    static Signature signatureDataToStructWithEip155(const uint256_t& chainID, const Data& signature) noexcept;
-};
-
-} // namespace TW::Ethereum
diff --git a/src/Ethereum/Transaction.cpp b/src/Ethereum/Transaction.cpp
deleted file mode 100644
index d033dbb6f80..00000000000
--- a/src/Ethereum/Transaction.cpp
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Transaction.h"
-#include "ABI/Function.h"
-#include "ABI/ParamAddress.h"
-#include "ABI/ParamBase.h"
-#include "HexCoding.h"
-#include "RLP.h"
-
-namespace TW::Ethereum {
-
-static const Data EmptyListEncoded = parse_hex("c0");
-
-std::shared_ptr<TransactionNonTyped>
-TransactionNonTyped::buildNativeTransfer(const uint256_t& nonce,
-                                         const uint256_t& gasPrice, const uint256_t& gasLimit,
-                                         const Data& toAddress, const uint256_t& amount, const Data& data) {
-    return std::make_shared<TransactionNonTyped>(nonce, gasPrice, gasLimit, toAddress, amount, data);
-}
-
-std::shared_ptr<TransactionNonTyped>
-TransactionNonTyped::buildERC20Transfer(const uint256_t& nonce,
-                                        const uint256_t& gasPrice, const uint256_t& gasLimit,
-                                        const Data& tokenContract, const Data& toAddress, const uint256_t& amount) {
-    return std::make_shared<TransactionNonTyped>(nonce, gasPrice, gasLimit, tokenContract, 0, buildERC20TransferCall(toAddress, amount));
-}
-
-std::shared_ptr<TransactionNonTyped>
-TransactionNonTyped::buildERC20Approve(const uint256_t& nonce,
-                                       const uint256_t& gasPrice, const uint256_t& gasLimit,
-                                       const Data& tokenContract, const Data& spenderAddress, const uint256_t& amount) {
-    return std::make_shared<TransactionNonTyped>(nonce, gasPrice, gasLimit, tokenContract, 0, buildERC20ApproveCall(spenderAddress, amount));
-}
-
-std::shared_ptr<TransactionNonTyped>
-TransactionNonTyped::buildERC721Transfer(const uint256_t& nonce,
-                                         const uint256_t& gasPrice, const uint256_t& gasLimit,
-                                         const Data& tokenContract, const Data& from, const Data& to, const uint256_t& tokenId) {
-    return std::make_shared<TransactionNonTyped>(nonce, gasPrice, gasLimit, tokenContract, 0, buildERC721TransferFromCall(from, to, tokenId));
-}
-
-std::shared_ptr<TransactionNonTyped>
-TransactionNonTyped::buildERC1155Transfer(const uint256_t& nonce,
-                                          const uint256_t& gasPrice, const uint256_t& gasLimit,
-                                          const Data& tokenContract, const Data& from, const Data& to, const uint256_t& tokenId, const uint256_t& value, const Data& data) {
-    return std::make_shared<TransactionNonTyped>(nonce, gasPrice, gasLimit, tokenContract, 0, buildERC1155TransferFromCall(from, to, tokenId, value, data));
-}
-
-Data TransactionNonTyped::preHash(const uint256_t chainID) const {
-    return Hash::keccak256(serialize(chainID));
-}
-
-Data TransactionNonTyped::serialize(const uint256_t chainID) const {
-    Data encoded;
-    append(encoded, RLP::encode(nonce));
-    append(encoded, RLP::encode(gasPrice));
-    append(encoded, RLP::encode(gasLimit));
-    append(encoded, RLP::encode(to));
-    append(encoded, RLP::encode(amount));
-    append(encoded, RLP::encode(payload));
-    append(encoded, RLP::encode(chainID));
-    append(encoded, RLP::encode(0));
-    append(encoded, RLP::encode(0));
-    return RLP::encodeList(encoded);
-}
-
-Data TransactionNonTyped::encoded(const Signature& signature, [[maybe_unused]] const uint256_t chainID) const {
-    Data encoded;
-    append(encoded, RLP::encode(nonce));
-    append(encoded, RLP::encode(gasPrice));
-    append(encoded, RLP::encode(gasLimit));
-    append(encoded, RLP::encode(to));
-    append(encoded, RLP::encode(amount));
-    append(encoded, RLP::encode(payload));
-    append(encoded, RLP::encode(signature.v));
-    append(encoded, RLP::encode(signature.r));
-    append(encoded, RLP::encode(signature.s));
-    return RLP::encodeList(encoded);
-}
-
-Data TransactionNonTyped::buildERC20TransferCall(const Data& to, const uint256_t& amount) {
-    // clang-format off
-    auto func = ABI::Function("transfer", std::vector<std::shared_ptr<ABI::ParamBase>>{
-        std::make_shared<ABI::ParamAddress>(to),
-        std::make_shared<ABI::ParamUInt256>(amount)
-    });
-    // clang-format on
-    Data payload;
-    func.encode(payload);
-    return payload;
-}
-
-Data TransactionNonTyped::buildERC20ApproveCall(const Data& spender, const uint256_t& amount) {
-    // clang-format off
-    auto func = ABI::Function("approve", std::vector<std::shared_ptr<ABI::ParamBase>>{
-        std::make_shared<ABI::ParamAddress>(spender),
-        std::make_shared<ABI::ParamUInt256>(amount)
-    });
-    // clang-format on
-    Data payload;
-    func.encode(payload);
-    return payload;
-}
-
-Data TransactionNonTyped::buildERC721TransferFromCall(const Data& from, const Data& to, const uint256_t& tokenId) {
-    // clang-format off
-    auto func = ABI::Function("transferFrom", std::vector<std::shared_ptr<ABI::ParamBase>>{
-        std::make_shared<ABI::ParamAddress>(from),
-        std::make_shared<ABI::ParamAddress>(to),
-        std::make_shared<ABI::ParamUInt256>(tokenId)
-    });
-    // clang-format on
-    Data payload;
-    func.encode(payload);
-    return payload;
-}
-
-Data TransactionNonTyped::buildERC1155TransferFromCall(const Data& from, const Data& to, const uint256_t& tokenId, const uint256_t& value, const Data& data) {
-    // clang-format off
-    auto func = ABI::Function("safeTransferFrom", std::vector<std::shared_ptr<ABI::ParamBase>>{
-        std::make_shared<ABI::ParamAddress>(from),
-        std::make_shared<ABI::ParamAddress>(to),
-        std::make_shared<ABI::ParamUInt256>(tokenId),
-        std::make_shared<ABI::ParamUInt256>(value),
-        std::make_shared<ABI::ParamByteArray>(data)
-    });
-    // clang-format on
-    Data payload;
-    func.encode(payload);
-    return payload;
-}
-
-Data TransactionEip1559::preHash(const uint256_t chainID) const {
-    return Hash::keccak256(serialize(chainID));
-}
-
-Data TransactionEip1559::serialize(const uint256_t chainID) const {
-    Data encoded;
-    append(encoded, RLP::encode(chainID));
-    append(encoded, RLP::encode(nonce));
-    append(encoded, RLP::encode(maxInclusionFeePerGas));
-    append(encoded, RLP::encode(maxFeePerGas));
-    append(encoded, RLP::encode(gasLimit));
-    append(encoded, RLP::encode(to));
-    append(encoded, RLP::encode(amount));
-    append(encoded, RLP::encode(payload));
-    append(encoded, EmptyListEncoded); // empty accessList
-
-    Data envelope;
-    append(envelope, static_cast<uint8_t>(type));
-    append(envelope, RLP::encodeList(encoded));
-    return envelope;
-}
-
-Data TransactionEip1559::encoded(const Signature& signature, const uint256_t chainID) const {
-    Data encoded;
-    append(encoded, RLP::encode(chainID));
-    append(encoded, RLP::encode(nonce));
-    append(encoded, RLP::encode(maxInclusionFeePerGas));
-    append(encoded, RLP::encode(maxFeePerGas));
-    append(encoded, RLP::encode(gasLimit));
-    append(encoded, RLP::encode(to));
-    append(encoded, RLP::encode(amount));
-    append(encoded, RLP::encode(payload));
-    append(encoded, EmptyListEncoded); // empty accessList
-    append(encoded, RLP::encode(signature.v));
-    append(encoded, RLP::encode(signature.r));
-    append(encoded, RLP::encode(signature.s));
-
-    Data envelope;
-    append(envelope, static_cast<uint8_t>(type));
-    append(envelope, RLP::encodeList(encoded));
-    return envelope;
-}
-
-std::shared_ptr<TransactionEip1559>
-TransactionEip1559::buildNativeTransfer(const uint256_t& nonce,
-                                        const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-                                        const Data& toAddress, const uint256_t& amount, const Data& data) {
-    return std::make_shared<TransactionEip1559>(nonce, maxInclusionFeePerGas, maxFeePerGas, gasPrice, toAddress, amount, data);
-}
-
-std::shared_ptr<TransactionEip1559>
-TransactionEip1559::buildERC20Transfer(const uint256_t& nonce,
-                                       const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-                                       const Data& tokenContract, const Data& toAddress, const uint256_t& amount) {
-    return std::make_shared<TransactionEip1559>(nonce, maxInclusionFeePerGas, maxFeePerGas, gasPrice, tokenContract, 0, TransactionNonTyped::buildERC20TransferCall(toAddress, amount));
-}
-
-std::shared_ptr<TransactionEip1559>
-TransactionEip1559::buildERC20Approve(const uint256_t& nonce,
-                                      const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-                                      const Data& tokenContract, const Data& spenderAddress, const uint256_t& amount) {
-    return std::make_shared<TransactionEip1559>(nonce, maxInclusionFeePerGas, maxFeePerGas, gasPrice, tokenContract, 0, TransactionNonTyped::buildERC20ApproveCall(spenderAddress, amount));
-}
-
-std::shared_ptr<TransactionEip1559>
-TransactionEip1559::buildERC721Transfer(const uint256_t& nonce,
-                                        const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-                                        const Data& tokenContract, const Data& from, const Data& to, const uint256_t& tokenId) {
-    return std::make_shared<TransactionEip1559>(nonce, maxInclusionFeePerGas, maxFeePerGas, gasPrice, tokenContract, 0, TransactionNonTyped::buildERC721TransferFromCall(from, to, tokenId));
-}
-
-std::shared_ptr<TransactionEip1559>
-TransactionEip1559::buildERC1155Transfer(const uint256_t& nonce,
-                                         const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-                                         const Data& tokenContract, const Data& from, const Data& to, const uint256_t& tokenId, const uint256_t& value, const Data& data) {
-    return std::make_shared<TransactionEip1559>(nonce, maxInclusionFeePerGas, maxFeePerGas, gasPrice, tokenContract, 0, TransactionNonTyped::buildERC1155TransferFromCall(from, to, tokenId, value, data));
-}
-
-} // namespace TW::Ethereum
diff --git a/src/Ethereum/Transaction.h b/src/Ethereum/Transaction.h
deleted file mode 100644
index d43fd77aa10..00000000000
--- a/src/Ethereum/Transaction.h
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Address.h"
-#include "../uint256.h"
-
-#include <memory>
-
-namespace TW::Ethereum {
-
-// Transactions can be:
-// - Non-typed (legacy, pre-EIP2718) transactions:
-//  -- simple ETH transfer
-//  -- others with payload, function call, e.g. ERC20 transfer
-// - Typed transactions (enveloped, EIP2718), with specific type and transaction payload
-
-/// R-S-V Signature values
-struct Signature {
-public:
-    uint256_t r, s, v;
-};
-
-/// Base class for all transactions.
-/// Non-typed and various typed transactions derive from this.
-class TransactionBase {
-public:
-    uint256_t nonce;
-    Data payload;
-
-public:
-    TransactionBase(const uint256_t& nonce, const Data& payload): nonce(nonce), payload(payload) {}
-    virtual ~TransactionBase() {}
-    // pre-sign hash of the tx, for signing
-    virtual Data preHash(const uint256_t chainID) const = 0;
-    // pre-sign image of tx
-    virtual Data serialize(const uint256_t chainID) const = 0;
-    // encoded tx (signed)
-    virtual Data encoded(const Signature& signature, const uint256_t chainID) const = 0;
-    // Signals wether this tx type uses Eip155-style replay protection in the signature
-    virtual bool usesReplayProtection() const = 0;
-
-protected:
-    TransactionBase() {}
-};
-
-/// Original transaction format, with no explicit type, legacy as pre-EIP2718
-class TransactionNonTyped: public TransactionBase {
-public:
-    uint256_t gasPrice;
-    uint256_t gasLimit;
-    // Public key hash (Address.bytes)
-    Data to;
-    uint256_t amount;
-
-    // Factory methods
-    // Create a native transfer transaction
-    static std::shared_ptr<TransactionNonTyped> buildNativeTransfer(const uint256_t& nonce,
-        const uint256_t& gasPrice, const uint256_t& gasLimit,
-        const Data& toAddress, const uint256_t& amount, const Data& data = {});
-
-    // Create an ERC20 token transfer transaction
-    static std::shared_ptr<TransactionNonTyped> buildERC20Transfer(const uint256_t& nonce,
-        const uint256_t& gasPrice, const uint256_t& gasLimit,
-        const Data& tokenContract, const Data& toAddress, const uint256_t& amount);
-
-    // Create an ERC20 approve transaction
-    static std::shared_ptr<TransactionNonTyped> buildERC20Approve(const uint256_t& nonce,
-        const uint256_t& gasPrice, const uint256_t& gasLimit,
-        const Data& tokenContract, const Data& spenderAddress, const uint256_t& amount);
-
-    // Create an ERC721 NFT transfer transaction
-    static std::shared_ptr<TransactionNonTyped> buildERC721Transfer(const uint256_t& nonce,
-        const uint256_t& gasPrice, const uint256_t& gasLimit,
-        const Data& tokenContract, const Data& from, const Data& to, const uint256_t& tokenId);
-
-    // Create an ERC1155 NFT transfer transaction
-    static std::shared_ptr<TransactionNonTyped> buildERC1155Transfer(const uint256_t& nonce,
-        const uint256_t& gasPrice, const uint256_t& gasLimit,
-        const Data& tokenContract, const Data& from, const Data& to, const uint256_t& tokenId, const uint256_t& value, const Data& data);
-
-    // Helpers for building contract calls
-    static Data buildERC20TransferCall(const Data& to, const uint256_t& amount);
-    static Data buildERC20ApproveCall(const Data& spender, const uint256_t& amount);
-    static Data buildERC721TransferFromCall(const Data& from, const Data& to, const uint256_t& tokenId);
-    static Data buildERC1155TransferFromCall(const Data& from, const Data& to, const uint256_t& tokenId, const uint256_t& value, const Data& data);
-
-    virtual Data preHash(const uint256_t chainID) const;
-    virtual Data serialize(const uint256_t chainID) const;
-    virtual Data encoded(const Signature& signature, const uint256_t chainID) const;
-    virtual bool usesReplayProtection() const { return true; }
-
-public:
-    TransactionNonTyped(const uint256_t& nonce,
-        const uint256_t& gasPrice, const uint256_t& gasLimit,
-        const Data& to, const uint256_t& amount, const Data& payload = {})
-        : TransactionBase(nonce, payload)
-        , gasPrice(std::move(gasPrice))
-        , gasLimit(std::move(gasLimit))
-        , to(std::move(to))
-        , amount(std::move(amount)) {}
-};
-
-enum TransactionType: uint8_t {
-    TxType_OptionalAccessList = 0x01,
-    TxType_Eip1559 = 0x02,
-};
-
-/// Base class for various typed transactions.
-class TransactionTyped: public TransactionBase {
-public:
-    // transaction type
-    TransactionType type;
-
-    TransactionTyped(TransactionType type, const uint256_t& nonce, const Data& payload)
-    : TransactionBase(nonce, payload), type(type) {}
-    virtual bool usesReplayProtection() const { return false; }
-};
-
-/// EIP1559 transaction
-class TransactionEip1559: public TransactionTyped {
-public:
-    uint256_t maxInclusionFeePerGas;
-    uint256_t maxFeePerGas;
-    uint256_t gasLimit;
-    // Public key hash (Address.bytes)
-    Data to;
-    uint256_t amount;
-
-    // Factory methods
-    // Create a native transfer transaction
-    static std::shared_ptr<TransactionEip1559> buildNativeTransfer(const uint256_t& nonce,
-        const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-        const Data& toAddress, const uint256_t& amount, const Data& data = {});
-    // Create an ERC20 token transfer transaction
-    static std::shared_ptr<TransactionEip1559> buildERC20Transfer(const uint256_t& nonce,
-        const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-        const Data& tokenContract, const Data& toAddress, const uint256_t& amount);
-    // Create an ERC20 approve transaction
-    static std::shared_ptr<TransactionEip1559> buildERC20Approve(const uint256_t& nonce,
-        const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-        const Data& tokenContract, const Data& spenderAddress, const uint256_t& amount);
-    // Create an ERC721 NFT transfer transaction
-    static std::shared_ptr<TransactionEip1559> buildERC721Transfer(const uint256_t& nonce,
-        const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-        const Data& tokenContract, const Data& from, const Data& to, const uint256_t& tokenId);
-    // Create an ERC1155 NFT transfer transaction
-    static std::shared_ptr<TransactionEip1559> buildERC1155Transfer(const uint256_t& nonce,
-        const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasPrice,
-        const Data& tokenContract, const Data& from, const Data& to, const uint256_t& tokenId, const uint256_t& value, const Data& data);
-
-    virtual Data preHash(const uint256_t chainID) const;
-    virtual Data serialize(const uint256_t chainID) const;
-    virtual Data encoded(const Signature& signature, const uint256_t chainID) const;
-
-public:
-    TransactionEip1559(const uint256_t& nonce,
-        const uint256_t& maxInclusionFeePerGas, const uint256_t& maxFeePerGas, const uint256_t& gasLimit,
-        const Data& to, const uint256_t& amount, const Data& payload = {})
-        : TransactionTyped(TxType_Eip1559, nonce, payload)
-        , maxInclusionFeePerGas(std::move(maxInclusionFeePerGas))
-        , maxFeePerGas(std::move(maxFeePerGas))
-        , gasLimit(std::move(gasLimit))
-        , to(std::move(to))
-        , amount(std::move(amount)) {}
-};
-
-} // namespace TW::Ethereum
diff --git a/src/Everscale/Address.cpp b/src/Everscale/Address.cpp
index 177313473cd..dee503e837c 100644
--- a/src/Everscale/Address.cpp
+++ b/src/Everscale/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <charconv>
 #include <system_error>
@@ -10,45 +8,15 @@
 #include "Address.h"
 #include "HexCoding.h"
 #include "Wallet.h"
-#include "WorkchainType.h"
 
 using namespace TW;
 
 namespace TW::Everscale {
 
-using MaybeWorkchain = std::optional<std::pair<int8_t, std::string::size_type>>;
-
-MaybeWorkchain parseWorkchainId(const std::string& string) {
-    if (auto pos = string.find(':'); pos != std::string::npos) {
-        try {
-            auto workchainId = static_cast<int8_t>(std::stoi(string.substr(0, pos)));
-            return std::make_pair(workchainId, pos + 1);
-        } catch (...) {
-            // Do nothing and return empty value later
-        }
-    }
-
-    return {};
-}
+using AddressImpl = TW::CommonTON::RawAddress;
 
 bool Address::isValid(const std::string& string) noexcept {
-    auto parsed = parseWorkchainId(string);
-    if (!parsed.has_value()) {
-        return false;
-    }
-
-    auto [workchainId, pos] = *parsed;
-
-    if (workchainId != WorkchainType::Basechain && workchainId != WorkchainType::Masterchain) {
-        return false;
-    }
-
-    if (string.size() != pos + hexAddrLen) {
-        return false;
-    }
-
-    std::string addr = string.substr(pos);
-    return parse_hex(addr).size() == size;
+    return AddressImpl::isValid(string);
 }
 
 Address::Address(const std::string& string) {
@@ -56,13 +24,7 @@ Address::Address(const std::string& string) {
         throw std::invalid_argument("Invalid address string!");
     }
 
-    auto parsed = parseWorkchainId(string);
-    auto [parsedWorkchainId, pos] = *parsed;
-
-    workchainId = parsedWorkchainId;
-
-    const auto parsedHash = parse_hex(string.substr(pos));
-    std::copy(begin(parsedHash), end(parsedHash), begin(hash));
+    addressData = AddressImpl::splitAddress(string);
 }
 
 Address::Address(const PublicKey& publicKey, int8_t workchainId)
@@ -70,8 +32,7 @@ Address::Address(const PublicKey& publicKey, int8_t workchainId)
 }
 
 std::string Address::string() const {
-    std::string address = std::to_string(workchainId) + ":" + hex(hash);
-    return address;
+    return AddressImpl::to_string(addressData);
 }
 
 } // namespace TW::Everscale
diff --git a/src/Everscale/Address.h b/src/Everscale/Address.h
index d97ec61f44c..ff114a8ce78 100644
--- a/src/Everscale/Address.h
+++ b/src/Everscale/Address.h
@@ -1,31 +1,24 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Data.h"
-#include "../PublicKey.h"
+#include "PublicKey.h"
+
+#include "CommonTON/RawAddress.h"
 
 #include <optional>
 #include <string>
 
 namespace TW::Everscale {
 
+using AddressData = CommonTON::AddressData;
+
 class Address {
 public:
-    /// Number of bytes in an address
-    static const size_t size = Hash::sha256Size;
-
-    /// Hex address length
-    static const size_t hexAddrLen = size * 2;
-
-    /// Workchain ID (-1 for masterchain, 0 for base workchain)
-    std::int8_t workchainId;
-    /// StateInit hash
-    std::array<byte, size> hash{};
+    AddressData addressData;
 
     /// Determines whether a string makes a valid address.
     [[nodiscard]] static bool isValid(const std::string& string) noexcept;
@@ -37,15 +30,19 @@ class Address {
     explicit Address(const PublicKey& publicKey, int8_t workchainId);
 
     /// Initializes an Everscale address with its parts
-    explicit Address(int8_t workchainId, std::array<byte, size> hash)
-        : workchainId(workchainId), hash(hash) {}
+    explicit Address(int8_t workchainId, std::array<byte, AddressData::size> hash)
+        : addressData(workchainId, hash) {}
+
+    /// Initializes an Everscale address with AddressData
+    explicit Address(AddressData addressData)
+        : addressData(addressData) {}
 
     /// Returns a string representation of the address.
     [[nodiscard]] std::string string() const;
 };
 
 inline bool operator==(const Address& lhs, const Address& rhs) {
-    return lhs.workchainId == rhs.workchainId && lhs.hash == rhs.hash;
+    return lhs.addressData.workchainId == rhs.addressData.workchainId && lhs.addressData.hash == rhs.addressData.hash;
 }
 
 } // namespace TW::Everscale
diff --git a/src/Everscale/CellSlice.h b/src/Everscale/CellSlice.h
deleted file mode 100644
index 38c4598b9a5..00000000000
--- a/src/Everscale/CellSlice.h
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include <array>
-#include <memory>
-#include <vector>
-
-#include "Cell.h"
-
-namespace TW::Everscale {
-
-class CellSlice {
-public:
-    const Cell* _Nonnull cell;
-    uint16_t dataOffset = 0;
-
-    explicit CellSlice(const Cell* _Nonnull cell) noexcept
-        : cell(cell) {}
-
-    uint32_t getNextU32();
-    Data getNextBytes(uint8_t bytes);
-
-private:
-    void require(uint16_t bits) const;
-};
-
-} // namespace TW::Everscale
diff --git a/src/Everscale/CommonTON/BitReader.cpp b/src/Everscale/CommonTON/BitReader.cpp
new file mode 100644
index 00000000000..44220144801
--- /dev/null
+++ b/src/Everscale/CommonTON/BitReader.cpp
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "BitReader.h"
+
+namespace TW::CommonTON {
+
+std::optional<BitReader> BitReader::createExact(const TW::Data &buffer, uint64_t bitLen) {
+    Rust::TWDataWrapper twData(buffer);
+    auto *readerPtr = Rust::tw_bit_reader_create(twData.get(), bitLen);
+    if (!readerPtr) {
+        return std::nullopt;
+    }
+
+    return BitReader(std::shared_ptr<Rust::TWBitReader>(readerPtr, Rust::tw_bit_reader_delete));
+}
+
+std::optional<uint8_t> BitReader::readU8(uint8_t bitCount) {
+    Rust::CUInt8ResultWrapper res = Rust::tw_bit_reader_read_u8(reader.get(), bitCount);
+    if (res.isErr()) {
+        return std::nullopt;
+    }
+    return res.unwrap().value;
+}
+
+std::optional<Data> BitReader::readU8Slice(uint64_t byteCount) {
+    Rust::CByteArrayResultWrapper res = Rust::tw_bit_reader_read_u8_slice(reader.get(), byteCount);
+    if (res.isErr()) {
+        return std::nullopt;
+    }
+    return res.unwrap().data;
+}
+
+bool BitReader::finished() const {
+    return Rust::tw_bit_reader_finished(reader.get());
+}
+
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CommonTON/BitReader.h b/src/Everscale/CommonTON/BitReader.h
new file mode 100644
index 00000000000..51177f25b09
--- /dev/null
+++ b/src/Everscale/CommonTON/BitReader.h
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/Wrapper.h"
+
+namespace TW::CommonTON {
+
+class BitReader {
+public:
+    // Tries to create a bit reader with exact `bitLen` number of bits.
+    static std::optional<BitReader> createExact(const Data& buffer, uint64_t bitLen);
+
+    // Read at most 8 bits into a u8.
+    std::optional<uint8_t> readU8(uint8_t bitCount);
+
+    // Reads an entire slice of `byteCount` bytes. If there aren't enough bits remaining
+    // after the internal cursor's current position, returns none.
+    std::optional<Data> readU8Slice(uint64_t byteCount);
+
+    bool finished() const;
+
+private:
+    explicit BitReader(std::shared_ptr<Rust::TWBitReader> reader): reader(std::move(reader)) {}
+
+    std::shared_ptr<Rust::TWBitReader> reader;
+};
+
+} // namespace TW::CommonTON
diff --git a/src/Everscale/Cell.cpp b/src/Everscale/CommonTON/Cell.cpp
similarity index 88%
rename from src/Everscale/Cell.cpp
rename to src/Everscale/CommonTON/Cell.cpp
index 41d9ec32a81..b3be8774405 100644
--- a/src/Everscale/Cell.cpp
+++ b/src/Everscale/CommonTON/Cell.cpp
@@ -1,24 +1,22 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Cell.h"
 
 #include <cassert>
+#include <cstring>
 #include <map>
 #include <optional>
 #include <unordered_map>
 
-#include "../BinaryCoding.h"
-
-#include <boost/archive/iterators/binary_from_base64.hpp>
-#include <boost/archive/iterators/transform_width.hpp>
+#include "Base64.h"
+#include "BinaryCoding.h"
+#include "BitReader.h"
 
 using namespace TW;
 
-namespace TW::Everscale {
+namespace TW::CommonTON {
 
 constexpr static uint32_t BOC_MAGIC = 0xb5ee9c72;
 
@@ -89,11 +87,7 @@ struct Reader {
 };
 
 std::shared_ptr<Cell> Cell::fromBase64(const std::string& encoded) {
-    // `Hash::base64` trims \0 bytes from the end of the _decoded_ data, so
-    // raw transform is used here
-    using namespace boost::archive::iterators;
-    using It = transform_width<binary_from_base64<std::string::const_iterator>, 8, 6>;
-    Data boc(It(begin(encoded)), It(end(encoded)));
+    auto boc = Base64::decode(encoded);
     return Cell::deserialize(boc.data(), boc.size());
 }
 
@@ -397,4 +391,51 @@ void Cell::finalize() {
     finalized = true;
 }
 
-} // namespace TW::Everscale
+std::optional<AddressData> Cell::parseAddress() const {
+    auto reader = BitReader::createExact(data, static_cast<uint64_t>(bitLen));
+    if (!reader) {
+        return std::nullopt;
+    }
+
+    auto tp = reader->readU8(2);
+    if (!tp) {
+        return std::nullopt;
+    }
+
+    if (tp.value() == 0) {
+        // Hole address (default). Check if the Cell does not contain more bits.
+        if (!reader->finished()) {
+            return std::nullopt;
+        }
+        return AddressData();
+    }
+
+    // We expect type=0 or type=2 addresses only.
+    if (tp.value() != 2) {
+        return std::nullopt;
+    }
+
+    // Ignore res1 value.
+    reader->readU8(1);
+
+    auto workchain = reader->readU8(8);
+    if (!workchain) {
+        return std::nullopt;
+    }
+
+    auto hashPart = reader->readU8Slice(AddressData::size);
+    if (!hashPart) {
+        return std::nullopt;
+    }
+
+    if (!reader->finished()) {
+        return std::nullopt;
+    }
+
+    std::array<byte, AddressData::size> parsedHash {};
+    std::copy(begin(hashPart.value()), end(hashPart.value()), begin(parsedHash));
+
+    return AddressData(static_cast<int8_t>(workchain.value()), parsedHash);
+}
+
+} // namespace TW::CommonTON
diff --git a/src/Everscale/Cell.h b/src/Everscale/CommonTON/Cell.h
similarity index 80%
rename from src/Everscale/Cell.h
rename to src/Everscale/CommonTON/Cell.h
index 0a621ffcf19..2341fd778db 100644
--- a/src/Everscale/Cell.h
+++ b/src/Everscale/CommonTON/Cell.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -10,12 +8,11 @@
 #include <memory>
 #include <vector>
 
-#include <boost/multiprecision/cpp_int.hpp>
-
 #include "Data.h"
-#include "../Hash.h"
+#include "Hash.h"
+#include "RawAddress.h"
 
-namespace TW::Everscale {
+namespace TW::CommonTON {
 
 class Cell {
 public:
@@ -61,6 +58,9 @@ class Cell {
     [[nodiscard]] inline size_t serializedSize(uint8_t refSize) const noexcept {
         return 2 + (bitLen + 7) / 8 + refCount * refSize;
     }
+
+    // Tries to parse an address from the Cell.
+    std::optional<AddressData> parseAddress() const;
 };
 
-} // namespace TW::Everscale
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CellBuilder.cpp b/src/Everscale/CommonTON/CellBuilder.cpp
similarity index 94%
rename from src/Everscale/CellBuilder.cpp
rename to src/Everscale/CommonTON/CellBuilder.cpp
index 8ddc3ccbc94..b03a7891067 100644
--- a/src/Everscale/CellBuilder.cpp
+++ b/src/Everscale/CommonTON/CellBuilder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "CellBuilder.h"
 #include "Cell.h"
@@ -11,11 +9,11 @@
 #include <cassert>
 #include <vector>
 
-#include "../BinaryCoding.h"
+#include "BinaryCoding.h"
 
 using namespace TW;
 
-namespace TW::Everscale {
+namespace TW::CommonTON {
 
 CellBuilder::CellBuilder(Data& appendedData, uint16_t bits) {
     assert(bits <= appendedData.size() * 8);
@@ -225,6 +223,15 @@ void CellBuilder::appendWithDoubleShifting(const Data& appendedData, uint16_t bi
     }
 }
 
+void CellBuilder::appendAddress(const AddressData& addressData) {
+    Data rawData(addressData.hash.begin(), addressData.hash.end());
+    Data prefix{0x80};
+    appendRaw(prefix, 2);
+    appendBitZero();
+    appendI8(addressData.workchainId);
+    appendRaw(rawData, 256);
+}
+
 uint8_t CellBuilder::clzU128(const uint128_t& u) {
     auto hi = static_cast<uint64_t>(u >> 64);
     auto lo = static_cast<uint64_t>(u);
@@ -257,4 +264,4 @@ void CellBuilder::encode128BE(const uint128_t& val, Data& data) {
     data.emplace_back(static_cast<uint8_t>(val));
 }
 
-} // namespace TW::Everscale
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CellBuilder.h b/src/Everscale/CommonTON/CellBuilder.h
similarity index 77%
rename from src/Everscale/CellBuilder.h
rename to src/Everscale/CommonTON/CellBuilder.h
index 8b192ec42b3..6054e8d23be 100644
--- a/src/Everscale/CellBuilder.h
+++ b/src/Everscale/CommonTON/CellBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,8 +10,10 @@
 
 #include "Cell.h"
 #include "CellSlice.h"
+#include "RawAddress.h"
+#include "uint256.h"
 
-namespace TW::Everscale {
+namespace TW::CommonTON {
 
 class CellBuilder {
     uint16_t bitLen = 0;
@@ -21,8 +21,6 @@ class CellBuilder {
     std::vector<Cell::Ref> references{};
 
 public:
-    using uint128_t = boost::multiprecision::uint128_t;
-
     CellBuilder() = default;
     CellBuilder(Data& appendedData, uint16_t bits);
 
@@ -40,6 +38,7 @@ class CellBuilder {
     void appendReferenceCell(Cell::Ref child);
     void appendBuilder(const CellBuilder& builder);
     void appendCellSlice(const CellSlice& other);
+    void appendAddress(const AddressData& addressData);
 
     Cell::Ref intoCell();
 
@@ -52,4 +51,4 @@ class CellBuilder {
     static void encode128BE(const uint128_t& value, Data& data);
 };
 
-} // namespace TW::Everscale
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CellSlice.cpp b/src/Everscale/CommonTON/CellSlice.cpp
similarity index 77%
rename from src/Everscale/CellSlice.cpp
rename to src/Everscale/CommonTON/CellSlice.cpp
index 346f4a65365..08089d155d4 100644
--- a/src/Everscale/CellSlice.cpp
+++ b/src/Everscale/CommonTON/CellSlice.cpp
@@ -1,18 +1,16 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "CellSlice.h"
 
 #include <cassert>
 
-#include "../BinaryCoding.h"
+#include "BinaryCoding.h"
 
 using namespace TW;
 
-namespace TW::Everscale {
+namespace TW::CommonTON {
 
 uint32_t CellSlice::getNextU32() {
     const auto bytes = getNextBytes(sizeof(uint32_t));
@@ -56,4 +54,4 @@ void CellSlice::require(uint16_t bits) const {
     }
 }
 
-} // namespace TW::Everscale
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CommonTON/CellSlice.h b/src/Everscale/CommonTON/CellSlice.h
new file mode 100644
index 00000000000..be98c2f185a
--- /dev/null
+++ b/src/Everscale/CommonTON/CellSlice.h
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <array>
+#include <memory>
+#include <vector>
+
+#include "Cell.h"
+
+namespace TW::CommonTON {
+
+class CellSlice {
+public:
+    const Cell* _Nonnull cell;
+    uint16_t dataOffset = 0;
+
+    explicit CellSlice(const Cell* _Nonnull cell) noexcept
+        : cell(cell) {}
+
+    uint32_t getNextU32();
+    Data getNextBytes(uint8_t bytes);
+
+private:
+    void require(uint16_t bits) const;
+};
+
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CommonTON/Messages.cpp b/src/Everscale/CommonTON/Messages.cpp
new file mode 100644
index 00000000000..ae79a75111f
--- /dev/null
+++ b/src/Everscale/CommonTON/Messages.cpp
@@ -0,0 +1,76 @@
+#include "Messages.h"
+
+namespace TW::CommonTON {
+
+void ExternalInboundMessageHeader::writeTo(CellBuilder& builder) const {
+    builder.appendBitOne();
+    builder.appendBitZero();
+
+    // addr src (none)
+    builder.appendRaw(Data{0x00}, 2);
+
+    // addr dst
+    Data dstAddr(_dst.hash.begin(), _dst.hash.end());
+
+    Data prefix{0x80};
+    builder.appendRaw(prefix, 2);
+
+    builder.appendBitZero();
+    builder.appendI8(_dst.workchainId);
+    builder.appendRaw(dstAddr, 256);
+
+    // fee
+    builder.appendU128(_importFee);
+}
+
+void InternalMessageHeader::writeTo(CellBuilder& builder) const {
+    // tag
+    builder.appendBitZero();
+
+    builder.appendBitBool(_ihrDisabled);
+    builder.appendBitBool(_bounce);
+    builder.appendBitBool(_bounced);
+
+    // addr src (none)
+    builder.appendRaw(Data{0x00}, 2);
+
+    // addr dst
+    Data dstAddr(_dst.hash.begin(), _dst.hash.end());
+
+    Data prefix{0x80};
+    builder.appendRaw(prefix, 2);
+
+    builder.appendBitZero();
+    builder.appendI8(_dst.workchainId);
+    builder.appendRaw(dstAddr, 256);
+
+    // value
+    builder.appendU128(_value);
+
+    // currency collections
+    builder.appendBitZero();
+
+    // fee
+    builder.appendU128(_ihrFee);
+    builder.appendU128(_fwdFee);
+
+    // created
+    builder.appendU64(_createdLt);
+    builder.appendU32(_createdAt);
+}
+
+CellBuilder StateInit::writeTo() const {
+    CellBuilder builder;
+
+    builder.appendBitZero(); // split_depth
+    builder.appendBitZero(); // special
+    builder.appendBitOne();  // code
+    builder.appendReferenceCell(code);
+    builder.appendBitOne(); // data
+    builder.appendReferenceCell(data);
+    builder.appendBitZero(); // library
+
+    return builder;
+}
+
+} // namespace TW::CommonTON
\ No newline at end of file
diff --git a/src/Everscale/CommonTON/Messages.h b/src/Everscale/CommonTON/Messages.h
new file mode 100644
index 00000000000..232f92664d0
--- /dev/null
+++ b/src/Everscale/CommonTON/Messages.h
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <optional>
+#include <utility>
+
+#include "Cell.h"
+#include "CellBuilder.h"
+#include "CellSlice.h"
+#include "RawAddress.h"
+
+#include "PrivateKey.h"
+
+namespace TW::CommonTON {
+
+class CommonMsgInfo {
+public:
+    virtual void writeTo(CellBuilder& builder) const = 0;
+
+    virtual ~CommonMsgInfo() = default;
+};
+
+class ExternalInboundMessageHeader : public CommonMsgInfo {
+    AddressData _dst;
+    uint128_t _importFee{};
+
+public:
+    explicit ExternalInboundMessageHeader(AddressData dst)
+        : _dst(dst) {}
+
+    void writeTo(CellBuilder& builder) const override;
+};
+
+class InternalMessageHeader : public CommonMsgInfo {
+    bool _ihrDisabled;
+    bool _bounce;
+    AddressData _dst;
+    uint128_t _value;
+
+    bool _bounced{};
+    uint128_t _ihrFee{};
+    uint128_t _fwdFee{};
+    uint64_t _createdLt{};
+    uint32_t _createdAt{};
+
+public:
+    InternalMessageHeader(bool ihrDisabled, bool bounce, AddressData dst, uint64_t value)
+        : _ihrDisabled(ihrDisabled), _bounce(bounce), _dst(dst), _value(static_cast<uint128_t>(value)) {}
+
+    void writeTo(CellBuilder& builder) const override;
+};
+
+class StateInit {
+public:
+    Cell::Ref code;
+    Cell::Ref data;
+
+    [[nodiscard]] CellBuilder writeTo() const;
+};
+
+struct MessageData {
+    std::shared_ptr<CommonMsgInfo> header;
+    std::optional<StateInit> init{};
+    std::optional<Cell::Ref> body{};
+
+    using HeaderRef = std::shared_ptr<CommonMsgInfo>;
+
+    explicit MessageData(HeaderRef header) : header(std::move(header)) { }
+};
+
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CommonTON/RawAddress.cpp b/src/Everscale/CommonTON/RawAddress.cpp
new file mode 100644
index 00000000000..5f01bf7906c
--- /dev/null
+++ b/src/Everscale/CommonTON/RawAddress.cpp
@@ -0,0 +1,104 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <limits>
+#include <climits>
+
+#include "RawAddress.h"
+
+#include "HexCoding.h"
+#include "WorkchainType.h"
+
+using MaybeWorkchain = std::optional<std::pair<int8_t, std::string::size_type>>;
+
+namespace TW::CommonTON {
+
+static std::optional<long> parse_long(char const *s)
+{
+    char *end;
+    auto previous_errno = errno;
+    errno = 0;
+    long l = strtol(s, &end, 10);
+    if (errno == ERANGE && l == LONG_MAX) {
+        errno = previous_errno;
+        return {}; // Overflow
+    }
+    if (errno == ERANGE && l == LONG_MIN) {
+        errno = previous_errno;
+        return {}; // Underflow
+    }
+    if (*s == '\0' || *end != '\0') {
+        errno = previous_errno;
+        return {}; // Inconvertible
+    }
+    errno = previous_errno;
+    return l;
+}
+
+static std::optional<int8_t> parse_int8(char const *s) {
+    auto value = parse_long(s);
+    if (!value.has_value()) {
+        return std::nullopt;
+    }
+    if (value.value() <= static_cast<long>(std::numeric_limits<int8_t>::max()) && value.value() >= static_cast<long>(std::numeric_limits<int8_t>::min())) {
+        return value;
+    } else {
+        return std::nullopt;
+    }
+}
+
+static MaybeWorkchain parseWorkchainId(const std::string& string) {
+    if (auto pos = string.find(':'); pos != std::string::npos) {
+        std::string workchain_string = string.substr(0, pos);
+        auto workchain_id = parse_int8(workchain_string.c_str());
+        if (workchain_id.has_value()) {
+            return std::make_pair(workchain_id.value(), pos + 1);
+        }
+    }
+    return {};
+}
+
+bool RawAddress::isValid(const std::string& string) {
+    auto parsed = parseWorkchainId(string);
+    if (!parsed.has_value()) {
+        return false;
+    }
+
+    auto [workchainId, pos] = *parsed;
+
+    if (workchainId != WorkchainType::Basechain && workchainId != WorkchainType::Masterchain) {
+        return false;
+    }
+
+    if (string.size() != pos + AddressData::hexAddrLen) {
+        return false;
+    }
+
+    std::string addr = string.substr(pos);
+    if (!is_hex_encoded(addr)) {
+        return false;
+    }
+    return parse_hex(addr).size() == AddressData::size;
+}
+
+AddressData RawAddress::splitAddress(const std::string& address) {
+    auto parsed = parseWorkchainId(address);
+    auto [parsedWorkchainId, pos] = *parsed;
+
+    auto workchainId = parsedWorkchainId;
+
+    const auto parsedHash = parse_hex(address.substr(pos));
+
+    std::array<byte, AddressData::size> hash{};
+    std::copy(begin(parsedHash), end(parsedHash), begin(hash));
+
+    return AddressData(workchainId, hash);
+}
+
+std::string RawAddress::to_string(const AddressData& addressData) {
+    std::string address = std::to_string(addressData.workchainId) + ":" + hex(addressData.hash);
+    return address;
+}
+
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CommonTON/RawAddress.h b/src/Everscale/CommonTON/RawAddress.h
new file mode 100644
index 00000000000..f628aefb018
--- /dev/null
+++ b/src/Everscale/CommonTON/RawAddress.h
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <string>
+#include <optional>
+#include <array>
+
+#include "Hash.h"
+
+namespace TW::CommonTON {
+
+struct AddressData {
+    /// Number of bytes in an address
+    static const size_t size = Hash::sha256Size;
+
+    /// Hex address length
+    static const size_t hexAddrLen = size * 2;
+
+    /// Workchain ID (-1 for masterchain, 0 for base workchain)
+    std::int8_t workchainId{};
+
+    /// StateInit hash
+    std::array<byte, AddressData::size> hash{};
+
+    explicit AddressData(int8_t workchainId, std::array<byte, size> hash)
+        : workchainId(workchainId), hash(hash) {}
+
+    explicit AddressData() = default;
+};
+
+struct RawAddress {
+    static bool isValid(const std::string& string);
+    static AddressData splitAddress(const std::string& address);
+    static std::string to_string(const AddressData& addressData);
+};
+
+} // namespace TW::CommonTON
diff --git a/src/Everscale/CommonTON/WorkchainType.h b/src/Everscale/CommonTON/WorkchainType.h
new file mode 100644
index 00000000000..2a50e086ede
--- /dev/null
+++ b/src/Everscale/CommonTON/WorkchainType.h
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+namespace TW::CommonTON {
+
+enum WorkchainType {
+    Masterchain = -1,
+    Basechain = 0,
+};
+
+} // namespace TW::CommonTON
diff --git a/src/Everscale/Entry.cpp b/src/Everscale/Entry.cpp
index e17aa9d5997..d0291c7826d 100644
--- a/src/Everscale/Entry.cpp
+++ b/src/Everscale/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -17,7 +15,7 @@ namespace TW::Everscale {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
@@ -25,7 +23,7 @@ string Entry::normalizeAddress([[maybe_unused]] TWCoinType coin, const string& a
     return Address(address).string();
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey, WorkchainType::Basechain).string();
 }
 
diff --git a/src/Everscale/Entry.h b/src/Everscale/Entry.h
index c83a0d133ad..00bbd1f1b23 100644
--- a/src/Everscale/Entry.h
+++ b/src/Everscale/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,9 @@ namespace TW::Everscale {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
      std::string normalizeAddress(TWCoinType coin, const std::string& address) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* d) const;
+     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
      void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
 };
 
diff --git a/src/Everscale/Messages.cpp b/src/Everscale/Messages.cpp
index a20ee263f08..47d2b4d72a2 100644
--- a/src/Everscale/Messages.cpp
+++ b/src/Everscale/Messages.cpp
@@ -1,80 +1,25 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Messages.h"
+
+#include "Wallet.h"
 #include "WorkchainType.h"
 
 using namespace TW;
 
 namespace TW::Everscale {
 
-void ExternalInboundMessageHeader::writeTo(CellBuilder& builder) const {
-    builder.appendBitOne();
-    builder.appendBitZero();
-
-    // addr src (none)
-    builder.appendRaw(Data{0x00}, 2);
-
-    // addr dst
-    Data dstAddr(_dst.hash.begin(), _dst.hash.end());
-
-    Data prefix{0x80};
-    builder.appendRaw(prefix, 2);
-
-    builder.appendBitZero();
-    builder.appendI8(_dst.workchainId);
-    builder.appendRaw(dstAddr, 256);
-
-    // fee
-    builder.appendU128(_importFee);
-}
-
-void InternalMessageHeader::writeTo(CellBuilder& builder) const {
-    // tag
-    builder.appendBitZero();
-
-    builder.appendBitBool(_ihrDisabled);
-    builder.appendBitBool(_bounce);
-    builder.appendBitBool(_bounced);
-
-    // addr src (none)
-    builder.appendRaw(Data{0x00}, 2);
-
-    // addr dst
-    Data dstAddr(_dst.hash.begin(), _dst.hash.end());
-
-    Data prefix{0x80};
-    builder.appendRaw(prefix, 2);
-
-    builder.appendBitZero();
-    builder.appendI8(_dst.workchainId);
-    builder.appendRaw(dstAddr, 256);
-
-    // value
-    builder.appendU128(_value);
-    builder.appendBitZero();
-
-    // fee
-    builder.appendU128(_ihrFee);
-    builder.appendU128(_fwdFee);
-
-    // created
-    builder.appendU64(_createdLt);
-    builder.appendU32(_createdAt);
-}
-
 Cell::Ref Message::intoCell() const {
     CellBuilder builder;
 
     // write Header
-    _header->writeTo(builder);
+    _messageData.header->writeTo(builder);
 
     // write StateInit
-    if (_init.has_value()) {
-        auto initBuilder = _init.value().writeTo();
+    if (_messageData.init.has_value()) {
+        auto initBuilder = _messageData.init.value().writeTo();
 
         builder.appendBitOne();
         builder.appendBitZero();
@@ -84,9 +29,9 @@ Cell::Ref Message::intoCell() const {
     }
 
     // write Body
-    if (_body.has_value()) {
+    if (_messageData.body.has_value()) {
         builder.appendBitZero();
-        builder.appendCellSlice(_body.value());
+        builder.appendCellSlice(CellSlice(_messageData.body.value().get()));
     } else {
         builder.appendBitZero();
     }
@@ -94,8 +39,8 @@ Cell::Ref Message::intoCell() const {
     return builder.intoCell();
 }
 
-Data createSignedMessage(PublicKey& publicKey, PrivateKey& key, bool bounce, uint32_t flags, uint64_t amount, uint32_t expiredAt,
-                         Address to, const Cell::Ref& contractData) {
+MessageData createSignedMessage(PublicKey& publicKey, PrivateKey& key, bool bounce, uint32_t flags, uint64_t amount, uint32_t expiredAt,
+                                Address to, const Cell::Ref& contractData) {
     auto getInitData = [](const PublicKey& publicKey, const Cell::Ref& contractData) {
         if (contractData != nullptr) {
             auto cellSlice = CellSlice(contractData.get());
@@ -124,23 +69,15 @@ Data createSignedMessage(PublicKey& publicKey, PrivateKey& key, bool bounce, uin
     payload.prependRaw(signature, static_cast<uint16_t>(signature.size()) * 8);
 
     auto header = std::make_shared<ExternalInboundMessageHeader>(InitData(publicKey).computeAddr(WorkchainType::Basechain));
-    auto message = Message(header);
+    auto message = MessageData(header);
 
     if (withInitState) {
-        message.setStateInit(initData.makeStateInit());
+        message.init = initData.makeStateInit();
     }
 
-    auto cell = payload.intoCell();
-    auto body = CellSlice(cell.get());
-
-    message.setBody(body);
-
-    const auto messageCell = message.intoCell();
-
-    Data result{};
-    messageCell->serialize(result);
+    message.body = payload.intoCell();
 
-    return result;
+    return message;
 }
 
 } // namespace TW::Everscale
diff --git a/src/Everscale/Messages.h b/src/Everscale/Messages.h
index 345f75667ec..bd32b7f1286 100644
--- a/src/Everscale/Messages.h
+++ b/src/Everscale/Messages.h
@@ -1,81 +1,26 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include <optional>
-#include <utility>
-
 #include "Address.h"
-#include "CellBuilder.h"
-#include "CellSlice.h"
-#include "Wallet.h"
+#include "CommonTON/Messages.h"
 
-#include "../PrivateKey.h"
+using namespace TW::CommonTON;
 
 namespace TW::Everscale {
 
-using uint128_t = CellBuilder::uint128_t;
-
-class CommonMsgInfo {
-public:
-    virtual void writeTo(CellBuilder& builder) const = 0;
-
-    virtual ~CommonMsgInfo() = default;
-};
-
-class ExternalInboundMessageHeader : public CommonMsgInfo {
-    Address _dst;
-    uint128_t _importFee{};
-
-public:
-    explicit ExternalInboundMessageHeader(Address dst)
-        : _dst(dst) {}
-
-    void writeTo(CellBuilder& builder) const override;
-};
-
-class InternalMessageHeader : public CommonMsgInfo {
-    bool _ihrDisabled;
-    bool _bounce;
-    Address _dst;
-    uint128_t _value;
-
-    bool _bounced{};
-    uint128_t _ihrFee{};
-    uint128_t _fwdFee{};
-    uint64_t _createdLt{};
-    uint32_t _createdAt{};
-
-public:
-    InternalMessageHeader(bool ihrDisabled, bool bounce, Address dst, uint64_t value)
-        : _ihrDisabled(ihrDisabled), _bounce(bounce), _dst(dst), _value(static_cast<uint128_t>(value)) {}
-
-    void writeTo(CellBuilder& builder) const override;
-};
-
 class Message {
 private:
-    std::shared_ptr<CommonMsgInfo> _header;
-
-    std::optional<StateInit> _init{};
-    std::optional<CellSlice> _body{};
+    MessageData _messageData;
 
 public:
-    using HeaderRef = std::shared_ptr<CommonMsgInfo>;
-
-    explicit Message(HeaderRef header)
-        : _header(std::move(header)) {}
-
+    explicit Message(MessageData messageData) : _messageData(std::move(messageData)) {}
     [[nodiscard]] Cell::Ref intoCell() const;
-    inline void setBody(CellSlice body) { _body = body; }
-    inline void setStateInit(const StateInit& stateInit) { _init = stateInit; }
 };
 
-Data createSignedMessage(PublicKey& publicKey, PrivateKey& key, bool bounce, uint32_t flags, uint64_t amount,
-                         uint32_t expiredAt, Address destination, const Cell::Ref& contractData);
+MessageData createSignedMessage(PublicKey& publicKey, PrivateKey& key, bool bounce, uint32_t flags, uint64_t amount,
+                                uint32_t expiredAt, Address destination, const Cell::Ref& contractData);
 
 } // namespace TW::Everscale
diff --git a/src/Everscale/Signer.cpp b/src/Everscale/Signer.cpp
index 1f2a0fb9d10..33e5ee368b0 100644
--- a/src/Everscale/Signer.cpp
+++ b/src/Everscale/Signer.cpp
@@ -1,17 +1,13 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Address.h"
 #include "Messages.h"
+#include "Wallet.h"
 
-#include "../Base64.h"
-
-using namespace TW;
-using namespace std::chrono;
+#include "Base64.h"
 
 namespace TW::Everscale {
 
@@ -56,7 +52,10 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
             transfer.expired_at(),
             Address(transfer.to()),
             contractData);
-        protoOutput.set_encoded(TW::Base64::encode(signedMessage));
+        Data result{};
+        Message(signedMessage).intoCell()->serialize(result);
+
+        protoOutput.set_encoded(TW::Base64::encode(result));
         break;
     }
     default:
diff --git a/src/Everscale/Signer.h b/src/Everscale/Signer.h
index 35cfcd953a0..4e14e19e8e0 100644
--- a/src/Everscale/Signer.h
+++ b/src/Everscale/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Everscale/Wallet.cpp b/src/Everscale/Wallet.cpp
index 09bf1e442e5..73fa3c39885 100644
--- a/src/Everscale/Wallet.cpp
+++ b/src/Everscale/Wallet.cpp
@@ -1,17 +1,12 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Wallet.h"
-#include "CellBuilder.h"
 #include "Messages.h"
 
 #include "HexCoding.h"
 
-using namespace TW;
-
 namespace TW::Everscale {
 
 // WalletV3 contract https://github.com/tonlabs/ton-1/blob/master/crypto/smartcont/wallet3-code.fc
@@ -27,14 +22,14 @@ CellBuilder InitData::writeTo() const {
     return builder;
 }
 
-Address InitData::computeAddr(int8_t workchainId) const {
+AddressData InitData::computeAddr(int8_t workchainId) const {
     auto builder = this->writeTo();
 
     StateInit stateInit{
         .code = Cell::deserialize(Wallet::code.data(), Wallet::code.size()),
         .data = builder.intoCell(),
     };
-    return Address(workchainId, stateInit.writeTo().intoCell()->hash);
+    return AddressData(workchainId, stateInit.writeTo().intoCell()->hash);
 }
 
 StateInit InitData::makeStateInit() const {
@@ -55,8 +50,8 @@ CellBuilder InitData::makeTransferPayload(uint32_t expireAt, const Wallet::Gift&
     payload.appendU32(_seqno);
 
     // create internal message
-    Message::HeaderRef header = std::make_shared<InternalMessageHeader>(true, gift.bounce, gift.to, gift.amount);
-    auto message = Message(header);
+    MessageData::HeaderRef header = std::make_shared<InternalMessageHeader>(true, gift.bounce, gift.to.addressData, gift.amount);
+    auto message = Message(MessageData(header));
 
     // append it to the body
     payload.appendU8(gift.flags);
@@ -65,18 +60,4 @@ CellBuilder InitData::makeTransferPayload(uint32_t expireAt, const Wallet::Gift&
     return payload;
 }
 
-CellBuilder StateInit::writeTo() const {
-    CellBuilder builder;
-
-    builder.appendBitZero(); // split_depth
-    builder.appendBitZero(); // special
-    builder.appendBitOne();  // code
-    builder.appendReferenceCell(code);
-    builder.appendBitOne(); // data
-    builder.appendReferenceCell(data);
-    builder.appendBitZero(); // library
-
-    return builder;
-}
-
 } // namespace TW::Everscale
diff --git a/src/Everscale/Wallet.h b/src/Everscale/Wallet.h
index a0216c465db..7efd68b7778 100644
--- a/src/Everscale/Wallet.h
+++ b/src/Everscale/Wallet.h
@@ -1,23 +1,23 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include <boost/integer.hpp>
 #include <utility>
 
-#include "../PublicKey.h"
+#include "PublicKey.h"
 
 #include "Address.h"
-#include "Cell.h"
-#include "CellBuilder.h"
-#include "CellSlice.h"
+#include "CommonTON/Cell.h"
+#include "CommonTON/CellBuilder.h"
+#include "CommonTON/CellSlice.h"
+#include "CommonTON/Messages.h"
 
 const uint32_t WALLET_ID = 0x4BA92D8A;
 
+using namespace TW::CommonTON;
+
 namespace TW::Everscale {
 
 class Wallet {
@@ -49,14 +49,6 @@ class Wallet {
     static const Data code;
 };
 
-class StateInit {
-public:
-    Cell::Ref code;
-    Cell::Ref data;
-
-    [[nodiscard]] CellBuilder writeTo() const;
-};
-
 class InitData {
     uint32_t _seqno;
     uint32_t _walletId;
@@ -70,7 +62,7 @@ class InitData {
 
     [[nodiscard]] CellBuilder writeTo() const;
     [[nodiscard]] StateInit makeStateInit() const;
-    [[nodiscard]] Address computeAddr(int8_t workchainId) const;
+    [[nodiscard]] AddressData computeAddr(int8_t workchainId) const;
     [[nodiscard]] CellBuilder makeTransferPayload(uint32_t expireAt, const Wallet::Gift& gift) const;
 };
 
diff --git a/src/Everscale/WorkchainType.h b/src/Everscale/WorkchainType.h
index 786343e1065..10a6cab39a3 100644
--- a/src/Everscale/WorkchainType.h
+++ b/src/Everscale/WorkchainType.h
@@ -1,16 +1,11 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-namespace TW::Everscale {
-
-enum WorkchainType {
-    Masterchain = -1,
-    Basechain = 0,
-};
+#include "CommonTON/WorkchainType.h"
 
+namespace TW::Everscale {
+    using WorkchainType = CommonTON::WorkchainType;
 } // namespace TW::Everscale
diff --git a/src/FIO/Action.cpp b/src/FIO/Action.cpp
index db6a0c9d536..34e1a8455cd 100644
--- a/src/FIO/Action.cpp
+++ b/src/FIO/Action.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Action.h"
 #include "Data.h"
@@ -43,7 +41,7 @@ void Action::serialize(Data& out) const {
     append(out, 0); // 00
 }
 
-void AddPubAddressData::serialize(Data& out) const {
+void PubAddressActionData::serialize(Data& out) const {
     encodeString(fioAddress, out);
     addresses.serialize(out);
     encode64LE(fee, out);
@@ -51,6 +49,13 @@ void AddPubAddressData::serialize(Data& out) const {
     encodeString(tpid, out);
 }
 
+void RemoveAllPubAddressActionData::serialize(Data& out) const {
+    encodeString(fioAddress, out);
+    encode64LE(fee, out);
+    EOS::Name(actor).serialize(out);
+    encodeString(tpid, out);
+}
+
 void RegisterFioAddressData::serialize(Data& out) const {
     encodeString(fioAddress, out);
     encodeString(ownerPublicKey, out);
@@ -83,4 +88,12 @@ void NewFundsRequestData::serialize(Data& out) const {
     encodeString(tpid, out);
 }
 
+void AddBundledTransactionsActionData::serialize(Data& out) const {
+    encodeString(fioAddress, out);
+    encode64LE(bundledSets, out);
+    encode64LE(fee, out);
+    encodeString(tpid, out);
+    EOS::Name(actor).serialize(out);
+}
+
 } // namespace TW::FIO
diff --git a/src/FIO/Action.h b/src/FIO/Action.h
index 70566cfd7ba..a5c325d3341 100644
--- a/src/FIO/Action.h
+++ b/src/FIO/Action.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -83,8 +81,11 @@ class Action {
     void serialize(Data& out) const;
 };
 
-/// AddPubAddress action data part.
-class AddPubAddressData {
+/// A public address action data part.
+/// Can be used for `addaddress`, `remaddress`, `remalladdr` (addresses must be empty) actions.
+/// https://dev.fio.net/reference/add_pub_address
+/// https://dev.fio.net/reference/remove_pub_address
+class PubAddressActionData {
 public:
     std::string fioAddress;
     PublicAddresses addresses;
@@ -92,13 +93,27 @@ class AddPubAddressData {
     std::string tpid;
     std::string actor;
 
-    AddPubAddressData(const std::string& fioAddress, const std::vector<PublicAddress>& addresses,
+    PubAddressActionData(const std::string& fioAddress, const std::vector<PublicAddress>& addresses,
         uint64_t fee, const std::string& tpid, const std::string& actor) :
         fioAddress(fioAddress), addresses(addresses),
         fee(fee), tpid(tpid), actor(actor) {}
     void serialize(Data& out) const;
 };
 
+/// RemoveAllPubAddress action data part.
+/// https://dev.fio.net/reference/remove_all_pub_address
+class RemoveAllPubAddressActionData {
+public:
+    std::string fioAddress;
+    uint64_t fee;
+    std::string tpid;
+    std::string actor;
+
+    RemoveAllPubAddressActionData(const std::string& fioAddress, uint64_t fee, const std::string& tpid, const std::string& actor) :
+        fioAddress(fioAddress), fee(fee), tpid(tpid), actor(actor) {}
+    void serialize(Data& out) const;
+};
+
 /// RegisterFioAddress action data part.
 class RegisterFioAddressData {
 public:
@@ -157,4 +172,19 @@ class NewFundsRequestData {
     void serialize(Data& out) const;
 };
 
+/// AddBundledTransactions action data part.
+/// https://dev.fio.net/reference/add_bundled_transactions
+class AddBundledTransactionsActionData {
+public:
+    std::string fioAddress;
+    uint64_t bundledSets;
+    uint64_t fee;
+    std::string tpid;
+    std::string actor;
+
+    AddBundledTransactionsActionData(const std::string& fioAddress, uint64_t bundledSets, uint64_t fee, const std::string& tpid, const std::string& actor) :
+        fioAddress(fioAddress), bundledSets(bundledSets), fee(fee), tpid(tpid), actor(actor) {}
+    void serialize(Data& out) const;
+};
+
 } // namespace TW::FIO
diff --git a/src/FIO/Actor.cpp b/src/FIO/Actor.cpp
index f30c351e34f..5463da1cda1 100644
--- a/src/FIO/Actor.cpp
+++ b/src/FIO/Actor.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Actor.h"
 
diff --git a/src/FIO/Actor.h b/src/FIO/Actor.h
index 2024d756c05..dd5157890c0 100644
--- a/src/FIO/Actor.h
+++ b/src/FIO/Actor.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/FIO/Address.cpp b/src/FIO/Address.cpp
index 52d1086e48f..abfc1046846 100644
--- a/src/FIO/Address.cpp
+++ b/src/FIO/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "../Base58.h"
@@ -57,7 +55,7 @@ std::optional<Data> Address::decodeKeyData(const std::string& string) {
         return {};
     }
 
-    const Data& decodedBytes = Base58::bitcoin.decode(string.substr(prefixSize));
+    const Data& decodedBytes = Base58::decode(string.substr(prefixSize));
     if (decodedBytes.size() != size) {
         return {};
     }
@@ -94,7 +92,7 @@ Address::Address(const PublicKey& publicKey) {
 
 /// Returns a string representation of the FIO address.
 std::string Address::string() const {
-    return prefix() + Base58::bitcoin.encode(bytes);
+    return prefix() + Base58::encode(bytes);
 }
 
 PublicKey Address::publicKey() const {
diff --git a/src/FIO/Address.h b/src/FIO/Address.h
index 2d00fa70dfa..049a72d2b9e 100644
--- a/src/FIO/Address.h
+++ b/src/FIO/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/FIO/Encryption.cpp b/src/FIO/Encryption.cpp
index 0a73a45a022..ee2c2b54c6c 100644
--- a/src/FIO/Encryption.cpp
+++ b/src/FIO/Encryption.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Encryption.h"
 
diff --git a/src/FIO/Encryption.h b/src/FIO/Encryption.h
index e293f3358fd..431a685fdd3 100644
--- a/src/FIO/Encryption.h
+++ b/src/FIO/Encryption.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/FIO/Entry.cpp b/src/FIO/Entry.cpp
index a9194cb53ae..5cc91faefba 100644
--- a/src/FIO/Entry.cpp
+++ b/src/FIO/Entry.cpp
@@ -1,23 +1,23 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "Signer.h"
+#include "../proto/TransactionCompiler.pb.h"
+#include "TransactionBuilder.h"
 
 namespace TW::FIO {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -25,4 +25,27 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data &txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto &input, auto &output) {
+            
+            Proto::SigningInput in = input;
+            auto unsignedTxSerialize = TransactionBuilder::buildUnsignedTxBytes(input); 
+            auto preSignData = TransactionBuilder::buildPreSignTxData(TW::data(in.chain_params().chain_id()), unsignedTxSerialize);   
+            auto imageHash = Hash::sha256(preSignData);
+            output.set_data(preSignData.data(), preSignData.size());
+            output.set_data_hash(imageHash.data(), imageHash.size());
+       });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, [[maybe_unused]] const auto& publicKey) {
+            output = Signer::compile(input, signature);
+        });
+}
+
+
 } // namespace TW::FIO
diff --git a/src/FIO/Entry.h b/src/FIO/Entry.h
index cb9ab8c38a2..ccfbd5b4c91 100644
--- a/src/FIO/Entry.h
+++ b/src/FIO/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,12 @@ namespace TW::FIO {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::FIO
diff --git a/src/FIO/NewFundsRequest.cpp b/src/FIO/NewFundsRequest.cpp
index 257003f15f6..3c71dc3d5a8 100644
--- a/src/FIO/NewFundsRequest.cpp
+++ b/src/FIO/NewFundsRequest.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "NewFundsRequest.h"
 #include "../BinaryCoding.h"
diff --git a/src/FIO/NewFundsRequest.h b/src/FIO/NewFundsRequest.h
index 3b58d2c3a40..822f38a0656 100644
--- a/src/FIO/NewFundsRequest.h
+++ b/src/FIO/NewFundsRequest.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/FIO/Signer.cpp b/src/FIO/Signer.cpp
index 19b1803f624..0e90e84df30 100644
--- a/src/FIO/Signer.cpp
+++ b/src/FIO/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Address.h"
@@ -25,29 +23,37 @@ using namespace std;
 
 Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     FIO::Proto::SigningOutput output;
-    try {    
+    try {
+        const string actionName = TransactionBuilder::actionName(input);
         const string json = TransactionBuilder::sign(input);
         output.set_json(json);
+        output.set_action_name(actionName);
     } catch(const std::exception& e) {
         output.set_error(Common::Proto::Error_internal);
     }
     return output;
 }
 
+Proto::SigningOutput Signer::compile(const Proto::SigningInput& input, const Data& signature) noexcept {
+    FIO::Proto::SigningOutput output;
+    output = TransactionBuilder::buildSigningOutput(input, signature);
+    return output;
+}
+
 Data Signer::signData(const PrivateKey& privKey, const Data& data) {
     Data hash = Hash::sha256(data);
     Data signature = privKey.sign(hash, TWCurveSECP256k1, isCanonical);
     return signature;
 }
 
-std::string Signer::signatureToBsase58(const Data& sig) {
+std::string Signer::signatureToBase58(const Data& sig) {
     Data sigWithSuffix(sig);
     append(sigWithSuffix, TW::data(SignatureSuffix));
     // take hash, ripemd, first 4 bytes 
     Data hash = Hash::ripemd(sigWithSuffix);
     Data sigWithChecksum(sig);
     append(sigWithChecksum, TW::data(hash.data(), 4));
-    string s = SignaturePrefix + Base58::bitcoin.encode(sigWithChecksum);
+    string s = SignaturePrefix + Base58::encode(sigWithChecksum);
     return s;
 }
 
@@ -55,7 +61,7 @@ bool Signer::verify(const PublicKey& pubKey, const Data& data, const Data& signa
     return pubKey.verify(TW::data(signature.data() + 1, signature.size() - 1), data);
 }
 
-// canonical check for FIO, both R and S lenght is 32
+// canonical check for FIO, both R and S length is 32
 int Signer::isCanonical([[maybe_unused]] uint8_t by, uint8_t sig[64]) {
     return !(sig[0] & 0x80)
         && !(sig[0] == 0 && !(sig[1] & 0x80))
diff --git a/src/FIO/Signer.h b/src/FIO/Signer.h
index c41b072ed72..72b3d7b7098 100644
--- a/src/FIO/Signer.h
+++ b/src/FIO/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -21,7 +19,8 @@ class Signer {
   public:
     /// Signs a Proto::SigningInput transaction
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
-
+    /// Build the compile output
+    static Proto::SigningOutput compile(const Proto::SigningInput& input, const Data& signature) noexcept;
   public:
     static constexpr auto SignatureSuffix = "K1";
     static constexpr auto SignaturePrefix = "SIG_K1_";
@@ -30,7 +29,7 @@ class Signer {
     static Data signData(const PrivateKey& privKey, const Data& data);
 
     /// Used internally, encode signature to base58 with prefix. Ex.: "SIG_K1_K54CA1jmhgWrSdvrNrkokPyvqh7dwsSoQHNU9xgD3Ezf6cJySzhKeUubVRqmpYdnjoP1DM6SorroVAgrCu3qqvJ9coAQ6u"
-    static std::string signatureToBsase58(const Data& sig);
+    static std::string signatureToBase58(const Data& sig);
 
     /// Verify a signature, used in testing
     static bool verify(const PublicKey& pubKey, const Data& data, const Data& signature);
diff --git a/src/FIO/Transaction.cpp b/src/FIO/Transaction.cpp
index c05e210066d..d0d7bb31340 100644
--- a/src/FIO/Transaction.cpp
+++ b/src/FIO/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 #include "TransactionBuilder.h"
diff --git a/src/FIO/Transaction.h b/src/FIO/Transaction.h
index 1bfa26369b2..0204b2d0acf 100644
--- a/src/FIO/Transaction.h
+++ b/src/FIO/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/FIO/TransactionBuilder.cpp b/src/FIO/TransactionBuilder.cpp
index c0203ec9911..4a890d81705 100644
--- a/src/FIO/TransactionBuilder.cpp
+++ b/src/FIO/TransactionBuilder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionBuilder.h"
 
@@ -23,6 +21,14 @@ using namespace TW;
 using namespace std;
 using json = nlohmann::json;
 
+static constexpr auto gRegisterFioAddress = "regaddress";
+static constexpr auto gAddPubAddress = "addaddress";
+static constexpr auto gRemoveAddress = "remaddress";
+static constexpr auto gRemoveAllPubAddresses = "remalladdr";
+static constexpr auto gTransferFIOPubkey = "trnsfiopubky";
+static constexpr auto gRenewFIOAddress = "renewaddress";
+static constexpr auto gNewFundsRequest = "newfundsreq";
+static constexpr auto gAddBundledTransactions = "addbundles";
 
 /// Internal helper
 ChainParams getChainParams(const Proto::SigningInput& input) {
@@ -40,6 +46,29 @@ bool TransactionBuilder::expirySetDefaultIfNeeded(uint32_t& expiryTime) {
     return true;
 }
 
+string TransactionBuilder::actionName(const Proto::SigningInput& input) {
+    switch (input.action().message_oneof_case()) {
+        case Proto::Action::MessageOneofCase::kRegisterFioAddressMessage:
+            return gRegisterFioAddress;
+        case Proto::Action::MessageOneofCase::kAddPubAddressMessage:
+            return gAddPubAddress;
+        case Proto::Action::MessageOneofCase::kTransferMessage:
+            return gTransferFIOPubkey;
+        case Proto::Action::MessageOneofCase::kRenewFioAddressMessage:
+            return gRenewFIOAddress;
+        case Proto::Action::MessageOneofCase::kNewFundsRequestMessage:
+            return gNewFundsRequest;
+        case Proto::Action::MessageOneofCase::kRemovePubAddressMessage:
+            return gRemoveAddress;
+        case Proto::Action::MessageOneofCase::kRemoveAllPubAddressesMessage:
+            return gRemoveAllPubAddresses;
+        case Proto::Action::MessageOneofCase::kAddBundledTransactionsMessage:
+            return gAddBundledTransactions;
+        default:
+            return {};
+    }
+}
+
 string TransactionBuilder::sign(Proto::SigningInput in) {
     PrivateKey privateKey(in.private_key());
     PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
@@ -78,6 +107,24 @@ string TransactionBuilder::sign(Proto::SigningInput in) {
             action.payer_fio_name(), action.payer_fio_address(), action.payee_fio_name(), content.payee_public_address(),
             content.amount(), content.coin_symbol(), content.memo(), content.hash(), content.offline_url(),
             getChainParams(in), action.fee(), in.tpid(), in.expiry(), Data());
+    } else if (in.action().has_remove_pub_address_message()) {
+        const auto action = in.action().remove_pub_address_message();
+        // process addresses
+        std::vector<std::pair<std::string, std::string>> addresses;
+        for (int i = 0; i < action.public_addresses_size(); ++i) {
+            addresses.emplace_back(std::make_pair(action.public_addresses(i).coin_symbol(), action.public_addresses(i).address()));
+        }
+        json = TransactionBuilder::createRemovePubAddress(owner, privateKey,
+            action.fio_address(), addresses,
+            getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    } else if (in.action().has_remove_all_pub_addresses_message()) {
+        const auto action = in.action().remove_all_pub_addresses_message();
+        json = TransactionBuilder::createRemoveAllPubAddresses(owner, privateKey,
+            action.fio_address(), getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    } else if (in.action().has_add_bundled_transactions_message()) {
+        const auto action = in.action().add_bundled_transactions_message();
+        json = TransactionBuilder::createAddBundledTransactions(owner, privateKey, action.fio_address(),
+            action.bundle_sets(), getChainParams(in), action.fee(), in.tpid(), in.expiry());
     }
     return json;
 }
@@ -86,16 +133,109 @@ string TransactionBuilder::createRegisterFioAddress(const Address& address, cons
     const string& fioName,
     const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime) {
 
-    const auto* const apiName = "regaddress";
+    Transaction transaction = TransactionBuilder::buildUnsignedRegisterFioAddress(address, fioName, chainParams, fee, walletTpId, expiryTime);
+
+    Data serTx;
+    transaction.serialize(serTx);
+
+    return signAndBuildTx(chainParams.chainId, serTx, privateKey);
+}
+
+string TransactionBuilder::createAddPubAddress(const Address& address, const PrivateKey& privateKey, const string& fioName,
+    const vector<pair<string, string>>& pubAddresses,
+    const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime) {
+
+    Transaction transaction = TransactionBuilder::buildUnsignedPubAddressAction(gAddPubAddress, address, fioName, pubAddresses, chainParams, fee, walletTpId, expiryTime);
+
+    Data serTx;
+    transaction.serialize(serTx);
+
+    return signAndBuildTx(chainParams.chainId, serTx, privateKey);
+}
+
+string TransactionBuilder::createRemovePubAddress(const Address& address, const PrivateKey& privateKey, const string& fioName,
+    const vector<pair<string, string>>& pubAddresses,
+    const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime) {
+
+    Transaction transaction = TransactionBuilder::buildUnsignedPubAddressAction(gRemoveAddress, address, fioName, pubAddresses, chainParams, fee, walletTpId, expiryTime);
+
+    Data serTx;
+    transaction.serialize(serTx);
+
+    return signAndBuildTx(chainParams.chainId, serTx, privateKey);
+}
+
+std::string TransactionBuilder::createRemoveAllPubAddresses(const Address& address, const PrivateKey& privateKey, const std::string& fioName,
+    const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime) {
+
+    Transaction transaction = TransactionBuilder::buildUnsignedRemoveAllAddressesAction(address, fioName, chainParams, fee, walletTpId, expiryTime);
+
+    Data serTx;
+    transaction.serialize(serTx);
+
+    return signAndBuildTx(chainParams.chainId, serTx, privateKey);
+}
+
+std::string TransactionBuilder::createAddBundledTransactions(const Address& address, const PrivateKey& privateKey, const std::string& fioName,
+    uint64_t bundleSets, const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime) {
+
+    Transaction transaction = TransactionBuilder::buildUnsignedAddBundledTransactions(address, fioName, bundleSets, chainParams, fee, walletTpId, expiryTime);
+
+    Data serTx;
+    transaction.serialize(serTx);
+
+    return signAndBuildTx(chainParams.chainId, serTx, privateKey);
+}
+
+string TransactionBuilder::createTransfer(const Address& address, const PrivateKey& privateKey, 
+        const string& payeePublicKey, uint64_t amount,
+        const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime) {
+
+    Transaction transaction = TransactionBuilder::buildUnsignedTransfer(address, payeePublicKey, amount, chainParams, fee, walletTpId, expiryTime);
+
+    Data serTx;
+    transaction.serialize(serTx);
+
+    return signAndBuildTx(chainParams.chainId, serTx, privateKey);
+}
+
+string TransactionBuilder::createRenewFioAddress(const Address& address, const PrivateKey& privateKey, 
+    const string& fioName,
+    const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime) {
+
+    Transaction transaction = TransactionBuilder::buildUnsignedRenewFioAddress(address, fioName, chainParams, fee, walletTpId, expiryTime);
+
+    Data serTx;
+    transaction.serialize(serTx);
+
+    return signAndBuildTx(chainParams.chainId, serTx, privateKey);
+}
+
+string TransactionBuilder::createNewFundsRequest(const Address& address, const PrivateKey& privateKey,
+        const string& payerFioName, const string& payerFioAddress, const string& payeeFioName, const string& payeePublicAddress, 
+        const string& amount, const string& coinSymbol, const string& memo, const string& hash, const string& offlineUrl,
+        const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime,
+        const Data& iv) {
+
+    // use coinSymbol for chainCode as well
+    NewFundsContent newFundsContent { payeePublicAddress, amount, coinSymbol, coinSymbol, memo, hash, offlineUrl };
+    // serialize and encrypt
+    Data serContent;
+    newFundsContent.serialize(serContent);
+
+    Address payerAddress(payerFioAddress);
+    PublicKey payerPublicKey = payerAddress.publicKey();
+    // encrypt and encode
+    const string encodedEncryptedContent = Encryption::encode(Encryption::encrypt(privateKey, payerPublicKey, serContent, iv));
 
     string actor = Actor::actor(address);
-    RegisterFioAddressData raData(fioName, address.string(), fee, walletTpId, actor);
+    NewFundsRequestData nfData(payerFioName, payeeFioName, encodedEncryptedContent, fee, walletTpId, actor);
     Data serData;
-    raData.serialize(serData);
+    nfData.serialize(serData);
     
     Action action;
-    action.account = ContractAddress;
-    action.name = apiName;
+    action.account = ContractPayRequest;
+    action.name = gNewFundsRequest;
     action.actionDataSer = serData;
     action.auth.authArray.push_back(Authorization{actor, AuthrizationActive});
 
@@ -106,14 +246,123 @@ string TransactionBuilder::createRegisterFioAddress(const Address& address, cons
     Data serTx;
     tx.serialize(serTx);
 
-    return signAdnBuildTx(chainParams.chainId, serTx, privateKey);
+    return signAndBuildTx(chainParams.chainId, serTx, privateKey);
 }
 
-string TransactionBuilder::createAddPubAddress(const Address& address, const PrivateKey& privateKey, const string& fioName,
-    const vector<pair<string, string>>& pubAddresses,
-    const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime) {
+string TransactionBuilder::signAndBuildTx(const Data& chainId, const Data& packedTx, const PrivateKey& privateKey) {
+    // create signature
+    Data sigBuf = buildPreSignTxData(chainId, packedTx);
+    string signature = Signer::signatureToBase58(Signer::signData(privateKey, sigBuf));
+
+    // Build json
+    json tx = {
+        {"signatures", json::array({signature})},
+        {"compression", "none"},
+        {"packed_context_free_data", ""},
+        {"packed_trx", hex(packedTx)}
+    };
+    return tx.dump();
+}
+
+Data TransactionBuilder::buildPreSignTxData(const Data& chainId, const Data& packedTx) {
+    // create signature
+    Data sigBuf(chainId);
+    append(sigBuf, packedTx);
+    append(sigBuf, TW::Data(32)); // context_free
+    return sigBuf;
+}
+
+Data TransactionBuilder::buildUnsignedTxBytes(const Proto::SigningInput& in) {
+    Address owner(in.owner_public_key());
+
+    Transaction transaction;
+    if (in.action().has_register_fio_address_message()) {
+        const auto action = in.action().register_fio_address_message();
+        transaction = TransactionBuilder::buildUnsignedRegisterFioAddress(owner, 
+            in.action().register_fio_address_message().fio_address(),
+            getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    } else if (in.action().has_add_pub_address_message()) {
+        const auto action = in.action().add_pub_address_message();
+        // process addresses
+        std::vector<std::pair<std::string, std::string>> addresses;
+        for (int i = 0; i < action.public_addresses_size(); ++i) {
+            addresses.emplace_back(std::make_pair(action.public_addresses(i).coin_symbol(), action.public_addresses(i).address()));
+        }
+        transaction = TransactionBuilder::buildUnsignedPubAddressAction(gAddPubAddress, owner, action.fio_address(), addresses,
+            getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    } else if (in.action().has_transfer_message()) {
+        const auto action = in.action().transfer_message();
+        transaction = TransactionBuilder::buildUnsignedTransfer(owner, action.payee_public_key(), action.amount(),
+            getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    } else if (in.action().has_renew_fio_address_message()) {
+        const auto action = in.action().renew_fio_address_message();
+        transaction = TransactionBuilder::buildUnsignedRenewFioAddress(owner, action.fio_address(),
+            getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    } else if (in.action().has_remove_pub_address_message()) {
+        const auto action = in.action().remove_pub_address_message();
+        // process addresses
+        std::vector<std::pair<std::string, std::string>> addresses;
+        for (int i = 0; i < action.public_addresses_size(); ++i) {
+            addresses.emplace_back(std::make_pair(action.public_addresses(i).coin_symbol(), action.public_addresses(i).address()));
+        }
+        transaction = TransactionBuilder::buildUnsignedPubAddressAction(gRemoveAddress, owner, action.fio_address(), addresses,
+            getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    } else if (in.action().has_remove_all_pub_addresses_message()) {
+        const auto action = in.action().remove_all_pub_addresses_message();
+        transaction = TransactionBuilder::buildUnsignedRemoveAllAddressesAction(owner, action.fio_address(),
+            getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    } else if (in.action().has_add_bundled_transactions_message()) {
+        const auto action = in.action().add_bundled_transactions_message();
+        transaction = TransactionBuilder::buildUnsignedAddBundledTransactions(owner, action.fio_address(), action.bundle_sets(),
+            getChainParams(in), action.fee(), in.tpid(), in.expiry());
+    }
 
-    const auto* const apiName = "addaddress";
+    Data serTx;
+    transaction.serialize(serTx);
+
+    return serTx;
+}
+
+Proto::SigningOutput TransactionBuilder::buildSigningOutput(const Proto::SigningInput &input, const Data &signature) {
+    FIO::Proto::SigningOutput output;
+    Data serTx = buildUnsignedTxBytes(input);
+    
+    string signatureString = Signer::signatureToBase58(signature);
+    // Build json
+    json tx = {
+        {"signatures", json::array({signatureString})},
+        {"compression", "none"},
+        {"packed_context_free_data", ""},
+        {"packed_trx", hex(serTx)}
+    };
+
+    output.set_json(tx.dump());
+    output.set_action_name(actionName(input));
+    return output;
+}
+
+Transaction TransactionBuilder::buildUnsignedRegisterFioAddress(const Address& address, const std::string& fioName, const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime){
+    string actor = Actor::actor(address);
+    RegisterFioAddressData raData(fioName, address.string(), fee, walletTpId, actor);
+    Data serData;
+    raData.serialize(serData);
+    
+    Action action;
+    action.account = ContractAddress;
+    action.name = gRegisterFioAddress;
+    action.actionDataSer = serData;
+    action.auth.authArray.push_back(Authorization{actor, AuthrizationActive});
+
+    Transaction tx;
+    expirySetDefaultIfNeeded(expiryTime);
+    tx.set(expiryTime, chainParams);
+    tx.actions.push_back(action);
+    return tx;
+}
+
+Transaction TransactionBuilder::buildUnsignedPubAddressAction(const std::string& apiName, const Address& address,
+    const std::string& fioName, const std::vector<std::pair<std::string, std::string>>& pubAddresses,
+    const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime) {
 
     string actor = Actor::actor(address);
     // convert addresses to add chainCode -- set it equal to coinSymbol
@@ -121,10 +370,10 @@ string TransactionBuilder::createAddPubAddress(const Address& address, const Pri
     for (const auto& a: pubAddresses) {
         pubAddresses2.push_back(PublicAddress{a.first, a.first, a.second});
     }
-    AddPubAddressData aaData(fioName, pubAddresses2, fee, walletTpId, actor);
+    PubAddressActionData actionData(fioName, pubAddresses2, fee, walletTpId, actor);
     Data serData;
-    aaData.serialize(serData);
-    
+    actionData.serialize(serData);
+
     Action action;
     action.account = ContractAddress;
     action.name = apiName;
@@ -135,18 +384,10 @@ string TransactionBuilder::createAddPubAddress(const Address& address, const Pri
     expirySetDefaultIfNeeded(expiryTime);
     tx.set(expiryTime, chainParams);
     tx.actions.push_back(action);
-    Data serTx;
-    tx.serialize(serTx);
-
-    return signAdnBuildTx(chainParams.chainId, serTx, privateKey);
+    return tx;
 }
 
-string TransactionBuilder::createTransfer(const Address& address, const PrivateKey& privateKey, 
-        const string& payeePublicKey, uint64_t amount,
-        const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime) {
-
-    const auto* const apiName = "trnsfiopubky";
-
+Transaction TransactionBuilder::buildUnsignedTransfer(const Address& address, const std::string& payeePublicKey, uint64_t amount, const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime) {
     string actor = Actor::actor(address);
     TransferData ttData(payeePublicKey, amount, fee, walletTpId, actor);
     Data serData;
@@ -154,7 +395,7 @@ string TransactionBuilder::createTransfer(const Address& address, const PrivateK
     
     Action action;
     action.account = ContractToken;
-    action.name = apiName;
+    action.name = gTransferFIOPubkey;
     action.actionDataSer = serData;
     action.auth.authArray.push_back(Authorization{actor, AuthrizationActive});
 
@@ -162,18 +403,10 @@ string TransactionBuilder::createTransfer(const Address& address, const PrivateK
     expirySetDefaultIfNeeded(expiryTime);
     tx.set(expiryTime, chainParams);
     tx.actions.push_back(action);
-    Data serTx;
-    tx.serialize(serTx);
-
-    return signAdnBuildTx(chainParams.chainId, serTx, privateKey);
+    return tx;
 }
 
-string TransactionBuilder::createRenewFioAddress(const Address& address, const PrivateKey& privateKey, 
-    const string& fioName,
-    const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime) {
-
-    const auto* const apiName = "renewaddress";
-
+Transaction TransactionBuilder::buildUnsignedRenewFioAddress(const Address& address, const std::string& fioName, const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime) {
     string actor = Actor::actor(address);
     RenewFioAddressData raData(fioName, fee, walletTpId, actor);
     Data serData;
@@ -181,7 +414,7 @@ string TransactionBuilder::createRenewFioAddress(const Address& address, const P
     
     Action action;
     action.account = ContractAddress;
-    action.name = apiName;
+    action.name = gRenewFIOAddress;
     action.actionDataSer = serData;
     action.auth.authArray.push_back(Authorization{actor, AuthrizationActive});
 
@@ -189,39 +422,20 @@ string TransactionBuilder::createRenewFioAddress(const Address& address, const P
     expirySetDefaultIfNeeded(expiryTime);
     tx.set(expiryTime, chainParams);
     tx.actions.push_back(action);
-    Data serTx;
-    tx.serialize(serTx);
-
-    return signAdnBuildTx(chainParams.chainId, serTx, privateKey);
+    return tx;
 }
 
-string TransactionBuilder::createNewFundsRequest(const Address& address, const PrivateKey& privateKey,
-        const string& payerFioName, const string& payerFioAddress, const string& payeeFioName, const string& payeePublicAddress, 
-        const string& amount, const string& coinSymbol, const string& memo, const string& hash, const string& offlineUrl,
-        const ChainParams& chainParams, uint64_t fee, const string& walletTpId, uint32_t expiryTime,
-        const Data& iv) {
-
-    const auto* const apiName = "newfundsreq";
-
-    // use coinSymbol for chainCode as well
-    NewFundsContent newFundsContent { payeePublicAddress, amount, coinSymbol, coinSymbol, memo, hash, offlineUrl };
-    // serialize and encrypt
-    Data serContent;
-    newFundsContent.serialize(serContent);
-
-    Address payerAddress(payerFioAddress);
-    PublicKey payerPublicKey = payerAddress.publicKey();
-    // encrypt and encode
-    const string encodedEncryptedContent = Encryption::encode(Encryption::encrypt(privateKey, payerPublicKey, serContent, iv));
+Transaction TransactionBuilder::buildUnsignedRemoveAllAddressesAction(const Address& address, const std::string& fioName,
+    const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime) {
 
     string actor = Actor::actor(address);
-    NewFundsRequestData nfData(payerFioName, payeeFioName, encodedEncryptedContent, fee, walletTpId, actor);
+    RemoveAllPubAddressActionData actionData(fioName, fee, walletTpId, actor);
     Data serData;
-    nfData.serialize(serData);
-    
+    actionData.serialize(serData);
+
     Action action;
-    action.account = ContractPayRequest;
-    action.name = apiName;
+    action.account = ContractAddress;
+    action.name = gRemoveAllPubAddresses;
     action.actionDataSer = serData;
     action.auth.authArray.push_back(Authorization{actor, AuthrizationActive});
 
@@ -229,27 +443,28 @@ string TransactionBuilder::createNewFundsRequest(const Address& address, const P
     expirySetDefaultIfNeeded(expiryTime);
     tx.set(expiryTime, chainParams);
     tx.actions.push_back(action);
-    Data serTx;
-    tx.serialize(serTx);
-
-    return signAdnBuildTx(chainParams.chainId, serTx, privateKey);
+    return tx;
 }
 
-string TransactionBuilder::signAdnBuildTx(const Data& chainId, const Data& packedTx, const PrivateKey& privateKey) {
-    // create signature
-    Data sigBuf(chainId);
-    append(sigBuf, packedTx);
-    append(sigBuf, TW::Data(32)); // context_free
-    string signature = Signer::signatureToBsase58(Signer::signData(privateKey, sigBuf));
+Transaction TransactionBuilder::buildUnsignedAddBundledTransactions(const Address& address, const std::string& fioName,
+    uint64_t bundleSets, const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime) {
 
-    // Build json
-    json tx = {
-        {"signatures", json::array({signature})},
-        {"compression", "none"},
-        {"packed_context_free_data", ""},
-        {"packed_trx", hex(packedTx)}
-    };
-    return tx.dump();
+    string actor = Actor::actor(address);
+    AddBundledTransactionsActionData actionData(fioName, bundleSets, fee, walletTpId, actor);
+    Data serData;
+    actionData.serialize(serData);
+
+    Action action;
+    action.account = ContractAddress;
+    action.name = gAddBundledTransactions;
+    action.actionDataSer = serData;
+    action.auth.authArray.push_back(Authorization{actor, AuthrizationActive});
+
+    Transaction tx;
+    expirySetDefaultIfNeeded(expiryTime);
+    tx.set(expiryTime, chainParams);
+    tx.actions.push_back(action);
+    return tx;
 }
 
 } // namespace TW::FIO
diff --git a/src/FIO/TransactionBuilder.h b/src/FIO/TransactionBuilder.h
index 607e0d48963..844a58850b1 100644
--- a/src/FIO/TransactionBuilder.h
+++ b/src/FIO/TransactionBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -40,6 +38,9 @@ class TransactionBuilder {
     /// Generic transaction signer: Build a signed transaction, in Json, from the specific SigningInput messages.
     static std::string sign(Proto::SigningInput in);
 
+    /// Returns an action name according to the given signing input.
+    static std::string actionName(const Proto::SigningInput& input);
+
     /// Create a signed RegisterFioAddress transaction, returned as json string (double quote delimited), suitable for register_fio_address RPC call
     /// @address The owners' FIO address. Ex.: "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf"
     /// @privateKey The private key matching the address, needed for signing.
@@ -66,6 +67,32 @@ class TransactionBuilder {
         const std::vector<std::pair<std::string, std::string>>& pubAddresses,
         const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
 
+    /// Create a signed `remaddress` transaction, returned as json string (double quote delimited), suitable for remove_pub_address RPC call
+    /// @address The owners' FIO address
+    /// @privateKey The private key matching the address, needed for signing.
+    /// @fioName The FIO name already registered to the owner. Ex.: "dmitry@trust"
+    /// @addressess List of public addresses to be registered, ex. {{"BTC", "bc1qv...7v"},{"BNB", "bnb1ts3...9s"}}
+    /// @chainParams Current parameters from the FIO chain, must be obtained recently using get_info and get_block calls.
+    /// @fee Max fee to spend, can be obtained using get_fee API.
+    /// @walletTpId The FIO name of the originating wallet (project-wide constant)
+    /// @expiryTime Expiry for this message, can be 0, then it is taken from current time with default expiry
+    /// Note: fee is usually 0 for remove_pub_address.
+    static std::string createRemovePubAddress(const Address& address, const PrivateKey& privateKey, const std::string& fioName,
+        const std::vector<std::pair<std::string, std::string>>& pubAddresses,
+        const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
+
+    /// Create a signed `remalladdr` transaction, returned as json string (double quote delimited), suitable for remove_all_pub_address RPC call
+    /// @address The owners' FIO address
+    /// @privateKey The private key matching the address, needed for signing.
+    /// @fioName The FIO name already registered to the owner. Ex.: "dmitry@trust"
+    /// @chainParams Current parameters from the FIO chain, must be obtained recently using get_info and get_block calls.
+    /// @fee Max fee to spend, can be obtained using get_fee API.
+    /// @walletTpId The FIO name of the originating wallet (project-wide constant)
+    /// @expiryTime Expiry for this message, can be 0, then it is taken from current time with default expiry
+    /// Note: fee is usually 0 for remove_all_pub_address.
+    static std::string createRemoveAllPubAddresses(const Address& address, const PrivateKey& privateKey, const std::string& fioName,
+        const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
+
     /// Create a signed TransferTokens transaction, returned as json string (double quote delimited), suitable for transfer_tokens_pub_key RPC call
     /// @address The owners' FIO address
     /// @privateKey The private key matching the address, needed for signing.
@@ -115,11 +142,60 @@ class TransactionBuilder {
         const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime,
         const Data& iv);
 
+    /// Create a signed `addbundles` transaction, returned as json string (double quote delimited), suitable for add_bundled_transactions RPC call
+    /// @address The owners' FIO address
+    /// @privateKey The private key matching the address, needed for signing.
+    /// @fioName The FIO name already registered to the owner. Ex.: "dmitry@trust"
+    /// @bundleSets Number of bundled sets. One set is 100 bundled transactions.
+    /// @chainParams Current parameters from the FIO chain, must be obtained recently using get_info and get_block calls.
+    /// @fee Max fee to spend, can be obtained using get_fee API.
+    /// @walletTpId The FIO name of the originating wallet (project-wide constant)
+    /// @expiryTime Expiry for this message, can be 0, then it is taken from current time with default expiry
+    static std::string createAddBundledTransactions(const Address& address, const PrivateKey& privateKey, const std::string& fioName,
+        uint64_t bundleSets, const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
+
     /// Used internally.  Creates signatures and json with transaction.
-    static std::string signAdnBuildTx(const Data& chainId, const Data& packedTx, const PrivateKey& privateKey);
+    static std::string signAndBuildTx(const Data& chainId, const Data& packedTx, const PrivateKey& privateKey);
 
     /// Used internally.  If expiry is 0, fill it based on current time.  Return true if value has been changed.
     static bool expirySetDefaultIfNeeded(uint32_t& expiryTime);
+
+    /// Build an unsigned transaction, from the specific SigningInput messages.
+    static Data buildUnsignedTxBytes(const Proto::SigningInput &in);
+
+    /// Build signing output
+    static Proto::SigningOutput buildSigningOutput(const Proto::SigningInput &input, const Data &signature);
+
+    /// Build presign TxData
+    static Data buildPreSignTxData(const Data& chainId, const Data& packedTx);
+private:
+    static Transaction buildUnsignedRegisterFioAddress(const Address& address, const std::string& fioName,
+        const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
+
+    /// Builds an unsigned transaction to perform an action over public addresses, e.g. adding or removing public addresses.
+    /// @apiName The action API name, ex. "addaddress", "remaddress".
+    /// @address The owners' FIO address.
+    /// @fioName The FIO name already registered to the owner. Ex.: "dmitry@trust"
+    /// @pubAddresses List of public addresses to be registered, ex. {{"BTC", "bc1qv...7v"},{"BNB", "bnb1ts3...9s"}}
+    /// @chainParams Current parameters from the FIO chain, must be obtained recently using get_info and get_block calls.
+    /// @fee Max fee to spend, can be obtained using get_fee API.
+    /// @walletTpId The FIO name of the originating wallet (project-wide constant)
+    /// @expiryTime Expiry for this message, can be 0, then it is taken from current time with default expiry
+    static Transaction buildUnsignedPubAddressAction(const std::string& apiName, const Address& address,
+        const std::string& fioName, const std::vector<std::pair<std::string, std::string>>& pubAddresses,
+        const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
+
+    static Transaction buildUnsignedTransfer(const Address& address, const std::string& payeePublicKey, uint64_t amount,
+        const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
+
+    static Transaction buildUnsignedRenewFioAddress(const Address& address, const std::string& fioName,
+        const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
+
+    static Transaction buildUnsignedRemoveAllAddressesAction(const Address& address, const std::string& fioName,
+        const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
+
+    static Transaction buildUnsignedAddBundledTransactions(const Address& address, const std::string& fioName,
+        uint64_t bundleSets, const ChainParams& chainParams, uint64_t fee, const std::string& walletTpId, uint32_t expiryTime);
 };
 
 } // namespace TW::FIO
diff --git a/src/Filecoin/Address.cpp b/src/Filecoin/Address.cpp
index 56fc2b9963b..cae8b677bdb 100644
--- a/src/Filecoin/Address.cpp
+++ b/src/Filecoin/Address.cpp
@@ -1,12 +1,10 @@
-// Copyright © 2017-2022 Trust.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
-#include <cstring>
+#include <algorithm>
 #include <climits>
 
 #include "../Base32.h"
@@ -14,129 +12,272 @@
 namespace TW::Filecoin {
 
 static const char BASE32_ALPHABET_FILECOIN[] = "abcdefghijklmnopqrstuvwxyz234567";
-static constexpr size_t checksumSize = 4;
+static constexpr std::size_t checksumSize = 4;
 
-bool Address::isValid(const Data& data) {
-    if (data.size() < 2) {
+static constexpr uint64_t charMask = 0x80;
+
+/// Parses the given `string` as an ActorID.
+/// Please note `string` must not contain any prefixes.
+static bool parseActorID(const std::string& string, uint64_t& actorID) {
+    // `uint64_t` may contain up to 20 decimal digits.
+    static constexpr std::size_t maxDigits = 20;
+
+    if (string.length() > maxDigits) {
         return false;
     }
-    Type type = getType(data[0]);
-    if (type == Type::Invalid) {
+    const bool onlyDigits = std::all_of(
+        string.begin(),
+        string.end(),
+        [](unsigned char c)->bool { return std::isdigit(c); }
+    );
+    if (!onlyDigits) {
         return false;
-    } else if (type == Type::ID) {
-        // Verify varuint encoding
-        if (data.size() > 11) {
-            return false;
-        }
-        if (data.size() == 11 && data[10] > 0x01) {
-            return false;
-        }
-        std::size_t i;
-        for (i = 1; i < data.size(); i++) {
-            if ((data[i] & 0x80) == 0) {
-                break;
-            }
-        }
-        return i == data.size() - 1;
-    } else {
-        return data.size() == (1 + Address::payloadSize(type));
     }
-}
 
-static bool isValidID(const std::string& string) {
-    if (string.length() > 22)
-        return false;
-    for (auto i = 2ul; i < string.length(); i++) {
-        if (string[i] < '0' || string[i] > '9') {
-            return false;
-        }
-    }
     try {
-        size_t chars;
-        [[maybe_unused]] uint64_t id = std::stoull(string.substr(2), &chars);
+        std::size_t chars;
+        actorID = std::stoull(string, &chars);
         return chars > 0;
     } catch (...) {
         return false;
     }
 }
 
-static bool isValidBase32(const std::string& string, Address::Type type) {
-    // Check if valid Base32.
-    uint8_t size = Address::payloadSize(type);
-    Data decoded;
-    if (!Base32::decode(string.substr(2), decoded, BASE32_ALPHABET_FILECOIN)) {
-        return false;
+/// Decodes the given `string` as an ActorID.
+/// Please note `bytes` must not contain any prefixes.
+/// https://github.com/paritytech/unsigned-varint/blob/a3a5b8f2bee1f44270629e96541adf805a53d32c/src/decode.rs#L66-L86
+static bool decodeActorID(const Data& bytes, uint64_t& actorID, std::size_t& remainingPos) {
+    static constexpr std::size_t maxBytes = 9;
+
+    actorID = 0;
+    remainingPos = 0;
+    for (remainingPos = 0; remainingPos < bytes.size() && remainingPos <= maxBytes; ++remainingPos) {
+        auto byte = bytes[remainingPos];
+        auto k = byte & SCHAR_MAX;
+        actorID |= k << (remainingPos * 7);
+
+        // Check if last.
+        if ((byte & charMask) == 0) {
+            if (byte == 0 && remainingPos > 0) {
+                // If last byte is zero, it could have been "more minimally" encoded by dropping that trailing zero.
+                return false;
+            }
+            ++remainingPos;
+            return true;
+        }
     }
 
-    // Check size
-    if (decoded.size() != size + checksumSize) {
-        return false;
+    // Couldn't find the last byte so `(byte & 0x80) == 0`.
+    return false;
+}
+
+static void writeActorID(uint64_t actorID, Data& dest) {
+    static constexpr uint64_t shift = 7;
+
+    while (actorID >= charMask) {
+        dest.emplace_back(actorID | charMask);
+        actorID >>= shift;
+    }
+    dest.emplace_back(actorID);
+}
+
+/// Returns encoded bytes of Address including the protocol byte and actorID (if required)
+/// without the checksum.
+static Data addressToBytes(Address::Type type, uint64_t actorID, const Data& payload) {
+    Data encoded;
+    encoded.push_back(static_cast<uint8_t>(type));
+    if (type == Address::Type::ID || type == Address::Type::DELEGATED) {
+        writeActorID(actorID, encoded);
+    }
+    append(encoded, payload);
+    return encoded;
+}
+
+static Data calculateChecksum(Address::Type type, uint64_t actorID, const Data& payload) {
+    Data bytesVec(addressToBytes(type, actorID, payload));
+    Data sum = Hash::blake2b(bytesVec, checksumSize);
+    assert(sum.size() == checksumSize);
+    return sum;
+}
+
+MaybeAddress Address::fromBytes(const Data& encoded) {
+    // Should contain at least one byte (address type).
+    if (encoded.empty()) {
+        return std::nullopt;
     }
 
-    // Extract raw address.
-    Data address;
-    address.push_back(static_cast<uint8_t>(type));
-    address.insert(address.end(), decoded.data(), decoded.data() + size);
+    // Get address type.
+    Type type = Address::getType(encoded[0]);
+    Data withoutPrefix(encoded.begin() + 1, encoded.end());
+
+    switch (type) {
+        case Address::Type::ID: {
+            std::size_t remainingPos = 0;
+            uint64_t actorID = 0;
 
-    // Verify checksum.
-    Data should_sum = Hash::blake2b(address, checksumSize);
-    return std::memcmp(should_sum.data(), decoded.data() + size, checksumSize) == 0;
+            if (!decodeActorID(withoutPrefix, actorID, remainingPos)) {
+                return std::nullopt;
+            }
+            // Check if there are no remaining bytes.
+            if (remainingPos != withoutPrefix.size()) {
+                return std::nullopt;
+            }
+
+            return Address(type, actorID, Data());
+        }
+        case Address::Type::SECP256K1:
+        case Address::Type::ACTOR:
+        case Address::Type::BLS: {
+            if (!Address::isValidPayloadSize(type, withoutPrefix.size())) {
+                return std::nullopt;
+            }
+            return Address(type, 0, std::move(withoutPrefix));
+        }
+        case Address::Type::DELEGATED: {
+            std::size_t remainingPos = 0;
+            uint64_t actorID = 0;
+
+            if (!decodeActorID(withoutPrefix, actorID, remainingPos)) {
+                return std::nullopt;
+            }
+            if (!Address::isValidPayloadSize(type, withoutPrefix.size() - remainingPos)) {
+                return std::nullopt;
+            }
+
+            return Address(type, actorID, subData(withoutPrefix, remainingPos));
+        }
+        default:
+            return std::nullopt;
+    }
 }
 
-bool Address::isValid(const std::string& string) {
-    if (string.length() < 3) {
-        return false;
+MaybeAddress Address::fromString(const std::string& string) {
+    // An address must contain at least 'f' prefix and the address type.
+    static constexpr std::size_t minLength = 2;
+
+    if (string.length() < minLength) {
+        return std::nullopt;
     }
     // Only main net addresses supported.
-    if (string[0] != PREFIX) {
-        return false;
+    if (string[0] != Address::PREFIX) {
+        return std::nullopt;
     }
+
     // Get address type.
-    auto type = parseType(string[1]);
-    if (type == Type::Invalid) {
-        return false;
+    Type type = Address::parseType(string[1]);
+    if (type == Address::Type::Invalid) {
+        return std::nullopt;
     }
 
-    // ID addresses are special, they are just numbers.
-    return type == Type::ID ? isValidID(string) : isValidBase32(string, type);
+    uint64_t actorID = 0;
+    if (type == Address::Type::ID) {
+        if (!parseActorID(string.substr(2), actorID)) {
+            return std::nullopt;
+        }
+        return Address(type, actorID, Data());
+    }
+
+    // For `SECP256K1`, `ACTOR`, `BLS`, the payload starts after the Protocol Type.
+    // For `DELEGATED`, the payload starts after an ActorID and the 'f' separator.
+    std::size_t payloadPos = 2;
+    if (type == Address::Type::DELEGATED) {
+        std::size_t actorIDEnd = string.find('f', 2);
+        // Delegated address must contain the 'f' separator.
+        if (actorIDEnd == std::string::npos || actorIDEnd <= 2) {
+            return std::nullopt;
+        }
+        if (!parseActorID(string.substr(2, actorIDEnd - 2), actorID)) {
+            return std::nullopt;
+        }
+        // Address payload starts after 'f'.
+        payloadPos = actorIDEnd + 1;
+    }
+
+    Data decoded;
+    if (!Base32::decode(string.substr(payloadPos), decoded, BASE32_ALPHABET_FILECOIN)) {
+        return std::nullopt;
+    }
+    if (decoded.size() < checksumSize) {
+        return std::nullopt;
+    }
+
+    Data payload(decoded.begin(), decoded.end() - checksumSize);
+    if (!Address::isValidPayloadSize(type, payload.size())) {
+        return std::nullopt;
+    }
+
+    Data actualChecksum(decoded.end() - checksumSize, decoded.end());
+    Data expectedChecksum = calculateChecksum(type, actorID, payload);
+    if (actualChecksum != expectedChecksum) {
+       return std::nullopt;
+    }
+
+    return Address(type, actorID, std::move(payload));
+}
+
+bool Address::isValid(const std::string& string) {
+    return Address::fromString(string).has_value();
+}
+
+bool Address::isValid(const Data& encoded) {
+    return Address::fromBytes(encoded).has_value();
+}
+
+Address Address::secp256k1Address(const PublicKey& publicKey) {
+    Data payload = Hash::blake2b(publicKey.bytes, 20);
+    return Address(Type::SECP256K1, 0, std::move(payload));
+}
+
+Address Address::delegatedAddress(const PublicKey& publicKey) {
+    if (publicKey.type != TWPublicKeyTypeSECP256k1Extended) {
+        throw std::invalid_argument("Ethereum::Address needs an extended SECP256k1 public key.");
+    }
+
+    const auto data = publicKey.hash({}, Hash::HasherKeccak256, true);
+    Data payload(data.end() - 20, data.end());
+
+    return Address(Type::DELEGATED, ETHEREUM_ADDRESS_MANAGER_ACTOR_ID, std::move(payload));
+}
+
+Address Address::delegatedAddress(uint64_t actorID, Data&& payload) {
+    return Address(Type::DELEGATED, actorID, std::move(payload));
 }
 
 Address::Address(const std::string& string) {
-    if (!isValid(string))
+    auto addr = Address::fromString(string);
+    if (!addr) {
         throw std::invalid_argument("Invalid address data");
-
-    Type type = parseType(string[1]);
-    // First byte is type
-    bytes.push_back(static_cast<uint8_t>(type));
-    if (type == Type::ID) {
-        uint64_t id = std::stoull(string.substr(2));
-        while (id >= 0x80) {
-            bytes.push_back(((uint8_t)id) | 0x80);
-            id >>= 7;
-        }
-        bytes.push_back((uint8_t)id);
-        return;
     }
 
-    Data decoded;
-    if (!Base32::decode(string.substr(2), decoded, BASE32_ALPHABET_FILECOIN))
+    assign(std::move(*addr));
+}
+
+Address::Address(const Data& encoded) {
+    auto addr = Address::fromBytes(encoded);
+    if (!addr) {
         throw std::invalid_argument("Invalid address data");
-    uint8_t payloadSize = Address::payloadSize(type);
+    }
 
-    bytes.insert(bytes.end(), decoded.data(), decoded.data() + payloadSize);
+    assign(std::move(*addr));
 }
 
-Address::Address(const Data& data) {
-    if (!isValid(data)) {
+Address::Address(Type type, uint64_t actorID, Data&& payload):
+    type(type),
+    actorID(actorID),
+    payload(std::move(payload)) {
+    if (!isValidPayloadSize(this->type, this->payload.size())) {
         throw std::invalid_argument("Invalid address data");
     }
-    bytes = data;
 }
 
-Address::Address(const PublicKey& publicKey) {
-    bytes.push_back(static_cast<uint8_t>(Type::SECP256K1));
-    Data hash = Hash::blake2b(publicKey.bytes, payloadSize(Type::SECP256K1));
-    bytes.insert(bytes.end(), hash.begin(), hash.end());
+void Address::assign(Address&& other) {
+    type = other.type;
+    actorID = other.actorID;
+    payload = std::move(other.payload);
+}
+
+Data Address::toBytes() const {
+    return addressToBytes(type, actorID, payload);
 }
 
 std::string Address::string() const {
@@ -144,37 +285,25 @@ std::string Address::string() const {
     // Main net address prefix
     s.push_back(PREFIX);
     // Address type prefix
-    s.push_back(typeAscii(type()));
-
-    if (type() == Type::ID) {
-        uint64_t id = 0;
-        unsigned shift = 0;
-        for (auto i = 1ul; i < bytes.size(); i++) {
-            if (bytes[i] <= SCHAR_MAX) {
-                id |= static_cast<uint64_t>(bytes[i]) << shift;
-                break;
-            } else {
-                id |= static_cast<uint64_t>(bytes[i] & SCHAR_MAX) << shift;
-                shift += 7;
-            }
-        }
-        s.append(std::to_string(id));
+    s.push_back(typeAscii(type));
+
+    if (type == Type::ID) {
+        s.append(std::to_string(actorID));
         return s;
     }
 
-    uint8_t payloadSize = Address::payloadSize(type());
-    // Base32 encoded body
-    Data toEncode(payloadSize + checksumSize);
-    // Copy address payload without prefix
-    std::copy(bytes.data() + 1, bytes.data() + payloadSize + 1, toEncode.data());
+    if (type == Type::DELEGATED) {
+        s.append(std::to_string(actorID));
+        s.push_back('f');
+    }
+
     // Append Blake2b checksum
-    Data bytesVec;
-    bytesVec.assign(std::begin(bytes), std::end(bytes));
-    Data sum = Hash::blake2b(bytesVec, checksumSize);
-    assert(sum.size() == checksumSize);
-    std::copy(sum.begin(), sum.end(), toEncode.data() + payloadSize);
-    s.append(Base32::encode(toEncode, BASE32_ALPHABET_FILECOIN));
+    Data checksum = calculateChecksum(type, actorID, payload);
+
+    Data toEncode = payload;
+    append(toEncode, checksum);
 
+    s.append(Base32::encode(toEncode, BASE32_ALPHABET_FILECOIN));
     return s;
 }
 
diff --git a/src/Filecoin/Address.h b/src/Filecoin/Address.h
index cb8909000e3..ea5cc9cf190 100644
--- a/src/Filecoin/Address.h
+++ b/src/Filecoin/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -10,49 +8,89 @@
 
 #include <array>
 #include <cstdint>
-#include <string>
+#include <optional>
 #include <vector>
+#include <string>
 
 namespace TW::Filecoin {
 
+class Address;
+
+using MaybeAddress = std::optional<Address>;
+
 class Address {
   public:
+    /// The actor ID of the Ethereum Address Manager singleton.
+    static constexpr uint64_t ETHEREUM_ADDRESS_MANAGER_ACTOR_ID = 10;
+
     enum class Type : uint8_t {
         ID = 0,
         SECP256K1 = 1,
         ACTOR = 2,
         BLS = 3,
+        DELEGATED = 4,
         Invalid,
     };
 
-    /// Address data with address type prefix.
-    Data bytes;
+    /// Type of the Address.
+    Type type{Type::Invalid};
 
-    /// Determines whether a collection of bytes makes a valid address.
-    static bool isValid(const Data& data);
+    /// Actor ID.
+    /// This is used if `type` is either `ID` or `DELEGATED`.
+    uint64_t actorID{0};
+
+    /// Address data payload (without prefixes and checksum).
+    Data payload;
+
+    /// Decodes `encoded` as a Filecoin address.
+    /// Returns `std::nullopt` on fail.
+    static MaybeAddress fromBytes(const Data& encoded);
+
+    /// Parses `string` as a Filecoin address and validates the checksum.
+    /// Returns `std::nullopt` if `string` is not a valid address.
+    static MaybeAddress fromString(const std::string& string);
 
     /// Determines whether a string makes a valid encoded address.
     static bool isValid(const std::string& string);
 
+    /// Determines whether a collection of bytes makes a valid address.
+    static bool isValid(const Data& encoded);
+
+    /// Initializes a Secp256k1 address with a secp256k1 public key.
+    static Address secp256k1Address(const PublicKey& publicKey);
+
+    /// Initializes a Delegated address with a secp256k1 public key.
+    static Address delegatedAddress(const PublicKey& publicKey);
+
+    /// Initializes a Delegated address with a secp256k1 public key.
+    static Address delegatedAddress(uint64_t actorID, Data&& payload);
+
     /// Initializes an address with a string representation.
     explicit Address(const std::string& string);
 
     /// Initializes an address with a collection of bytes.
-    explicit Address(const Data& data);
-
-    /// Initializes an address with a secp256k1 public key.
-    explicit Address(const PublicKey& publicKey);
+    explicit Address(const Data& encoded);
 
     /// Returns a string representation of the address.
     [[nodiscard]] std::string string() const;
 
-    /// Returns the type of an address.
-    Type type() const { return getType(bytes[0]); }
+    /// Returns encoded bytes of Address including the protocol byte and actorID (if required)
+    /// without the checksum.
+    Data toBytes() const;
 
     /// Address prefix
     static constexpr char PREFIX = 'f';
 
-  public:
+private:
+    static constexpr char F0_TYPE_CHAR = '0';
+    static constexpr char F4_TYPE_CHAR = '4';
+
+    /// Initializes an address with a type, actorID and payload.
+    explicit Address(Type type, uint64_t actorID, Data&& payload);
+
+    /// Assigns the address to the `other` value.
+    void assign(Address&& other);
+
     /// Attempts to get the type by number.
     static Type getType(uint8_t raw) {
         switch (raw) {
@@ -64,6 +102,8 @@ class Address {
             return Type::ACTOR;
         case 3:
             return Type::BLS;
+        case 4:
+            return Type::DELEGATED;
         default:
             return Type::Invalid;
         }
@@ -71,34 +111,38 @@ class Address {
 
     /// Attempts to get the type by ASCII.
     static Type parseType(char c) {
-        if (c >= '0' && c <= '3') {
-            return static_cast<Type>(c - '0');
+        if (c >= F0_TYPE_CHAR && c <= F4_TYPE_CHAR) {
+            return static_cast<Type>(c - F0_TYPE_CHAR);
         } else {
             return Type::Invalid;
         }
     }
 
     /// Returns ASCII character of type
-    static char typeAscii(Type t) { return '0' + static_cast<char>(t); }
+    static char typeAscii(Type t) { return F0_TYPE_CHAR + static_cast<char>(t); }
 
-    // Returns the payload size (excluding any prefixes) of an address type.
-    // If the payload size is undefined/variable (e.g. ID)
-    // or the type is unknown, it returns zero.
-    static uint8_t payloadSize(Type t) {
+    /// Validates if the payload size (excluding any prefixes and checksum) of an address type has an expected value.
+    static bool isValidPayloadSize(Type t, std::size_t payloadSize) {
         switch (t) {
-        case Type::SECP256K1:
-        case Type::ACTOR:
-            return 20;
-        case Type::BLS:
-            return 48;
-        default:
-            return 0;
+            case Type::ID:
+                return payloadSize == 0;
+            case Type::SECP256K1:
+            case Type::ACTOR:
+                return payloadSize == 20;
+            case Type::BLS:
+                return payloadSize == 48;
+            case Type::DELEGATED:
+                return payloadSize <= 54;
+            default:
+                return false;
         }
     }
 };
 
 inline bool operator==(const Address& lhs, const Address& rhs) {
-    return lhs.bytes == rhs.bytes;
+    return lhs.type == rhs.type
+           && lhs.actorID == rhs.actorID
+           && lhs.payload == rhs.payload;
 }
 
 } // namespace TW::Filecoin
diff --git a/src/Filecoin/AddressConverter.cpp b/src/Filecoin/AddressConverter.cpp
new file mode 100644
index 00000000000..b805bb6d3f0
--- /dev/null
+++ b/src/Filecoin/AddressConverter.cpp
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "AddressConverter.h"
+
+#include "BinaryCoding.h"
+#include "Ethereum/Address.h"
+
+namespace TW::Filecoin {
+
+static constexpr std::size_t ACTOR_ID_ENCODED_LEN = sizeof(uint64_t);
+
+/// https://github.com/filecoin-project/lotus/blob/61f29a84b5a61060c4ac8aabe9b9360a2cdf5e7e/chain/types/ethtypes/eth_types.go#L279
+MaybeAddressString AddressConverter::convertToEthereumString(const std::string& filecoinAddress) {
+    // This may throw an exception if the given address is invalid.
+    Address addr(filecoinAddress);
+    if (auto &&eth_opt = convertToEthereum(addr); eth_opt) {
+        return eth_opt->string();
+    }
+    return std::nullopt;
+}
+
+MaybeEthAddress AddressConverter::convertToEthereum(const Address& filecoinAddress) {
+    switch (filecoinAddress.type) {
+        case Address::Type::ID: {
+            Data payload(Ethereum::Address::size - ACTOR_ID_ENCODED_LEN, 0);
+            payload[0] = 0xFF;
+
+            Data encodedActorID;
+            encodedActorID.reserve(ACTOR_ID_ENCODED_LEN);
+            encode64BE(filecoinAddress.actorID, encodedActorID);
+
+            append(payload, encodedActorID);
+
+            Ethereum::Address ethAddr(payload);
+            return ethAddr;
+        }
+        case Address::Type::DELEGATED: {
+            if (filecoinAddress.actorID != Address::ETHEREUM_ADDRESS_MANAGER_ACTOR_ID) {
+                return std::nullopt;
+            }
+
+            if (filecoinAddress.payload.size() != Ethereum::Address::size) {
+                return std::nullopt;
+            }
+
+            Ethereum::Address ethAddr(filecoinAddress.payload);
+            return ethAddr;
+        }
+        default:
+            return std::nullopt;
+    }
+}
+
+std::string AddressConverter::convertFromEthereumString(const std::string& ethereumAddress) {
+    // This may throw an exception if the given address is invalid.
+    Ethereum::Address addr(ethereumAddress);
+
+    return convertFromEthereum(addr).string();
+}
+
+Address AddressConverter::convertFromEthereum(const Ethereum::Address& ethereumAddress) noexcept {
+    Data addrPayload(ethereumAddress.bytes.begin(), ethereumAddress.bytes.end());
+    return Address::delegatedAddress(Address::ETHEREUM_ADDRESS_MANAGER_ACTOR_ID, std::move(addrPayload));
+}
+
+}
diff --git a/src/Filecoin/AddressConverter.h b/src/Filecoin/AddressConverter.h
new file mode 100644
index 00000000000..2d64406baa4
--- /dev/null
+++ b/src/Filecoin/AddressConverter.h
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <optional>
+
+#include "Address.h"
+#include "Ethereum/Address.h"
+
+namespace TW::Filecoin {
+
+using MaybeAddressString = std::optional<std::string>;
+using MaybeEthAddress = std::optional<Ethereum::Address>;
+
+class AddressConverter {
+public:
+    /// Converts a Filecoin address to Ethereum.
+    static MaybeAddressString convertToEthereumString(const std::string& filecoinAddress);
+
+    /// Converts a Filecoin address to Ethereum.
+    static MaybeEthAddress convertToEthereum(const Address& filecoinAddress);
+
+    /// Converts an Ethereum address to Filecoin.
+    static std::string convertFromEthereumString(const std::string& ethereumAddress);
+
+    /// Converts an Ethereum address to Filecoin.
+    static Address convertFromEthereum(const Ethereum::Address& ethereumAddress) noexcept;
+};
+
+}
diff --git a/src/Filecoin/Entry.cpp b/src/Filecoin/Entry.cpp
index 5ab6065a3ca..7e28c1fb901 100644
--- a/src/Filecoin/Entry.cpp
+++ b/src/Filecoin/Entry.cpp
@@ -1,26 +1,26 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
+#include "proto/TransactionCompiler.pb.h"
 #include "Signer.h"
 
 namespace TW::Filecoin {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte,
-                            const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte,
-                            const char*) const {
-    return Address(publicKey).string();
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    if (std::get_if<DelegatedPrefix>(&addressPrefix)) {
+        return Address::delegatedAddress(publicKey).string();
+    }
+    return Address::secp256k1Address(publicKey).string();
 }
 
 void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
@@ -31,4 +31,31 @@ std::string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string&
     return Signer::signJSON(json, key);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto preImage = Signer::signaturePreimage(input);
+            auto preImageHash = Hash::blake2b(preImage, 32);
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+            if (signatures.size() > 1 || publicKeys.size() > 1) {
+                output.set_error(Common::Proto::Error_no_support_n2n);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_no_support_n2n));
+                return;
+            }
+            output = Signer::compile(signatures[0], publicKeys[0], input);
+        });
+}
+
 } // namespace TW::Filecoin
diff --git a/src/Filecoin/Entry.h b/src/Filecoin/Entry.h
index a989db0676e..cfd0977881b 100644
--- a/src/Filecoin/Entry.h
+++ b/src/Filecoin/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,14 +12,15 @@ namespace TW::Filecoin {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific
 /// includes in this file
 class Entry final : public CoinEntry {
-  public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh,
-                                 TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh,
-                                      const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     bool supportsJSONSigning() const { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+public:
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool supportsJSONSigning() const { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Filecoin
diff --git a/src/Filecoin/Signer.cpp b/src/Filecoin/Signer.cpp
index 67676a9eeb7..d0d72f4dd2c 100644
--- a/src/Filecoin/Signer.cpp
+++ b/src/Filecoin/Signer.cpp
@@ -1,40 +1,50 @@
-// Copyright © 2017-2022 Trust.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "Signer.h"
-#include "HexCoding.h"
 #include <google/protobuf/util/json_util.h>
 
+#include "AddressConverter.h"
+#include "Ethereum/Entry.h"
+#include "Result.h"
+#include "Signer.h"
+#include "proto/Ethereum.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
 namespace TW::Filecoin {
 
-Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    // Load private key and transaction from Protobuf input.
-    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-    auto pubkey = key.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
-    Address from_address(pubkey);
-    Address to_address(input.to());
-    Transaction transaction(
-        /* to */ to_address,
-        /* from */ from_address,
-        /* nonce */ input.nonce(),
-        /* value */ load(input.value()),
-        /* gasLimit */ input.gas_limit(),
-        /* gasFeeCap */ load(input.gas_fee_cap()),
-        /* gasPremium */ load(input.gas_premium()));
+Proto::SigningOutput signingOutputError(Common::Proto::SigningError error) {
+    Proto::SigningOutput outputErr;
+    outputErr.set_error(error);
+    outputErr.set_error_message(Common::Proto::SigningError_Name(error));
+    return outputErr;
+}
 
-    // Sign transaction.
-    auto signature = sign(key, transaction);
-    const auto json = transaction.serialize(signature);
+// ChainId defines the chain ID used in the Ethereum JSON-RPC endpoint.
+// As per https://github.com/ethereum-lists/chains
+static constexpr uint256_t FILECOIN_EIP155_CHAIN_ID = 314;
 
-    // Return Protobuf output.
+static Proto::SigningOutput errorOutput(const char* error) {
     Proto::SigningOutput output;
-    output.set_json(json.data(), json.size());
+    output.set_error_message(error);
     return output;
 }
 
+Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
+    try {
+        switch (input.derivation()) {
+            case Proto::DerivationType::SECP256K1:
+                return signSecp256k1(input);
+            case Proto::DerivationType::DELEGATED:
+                return signDelegated(input);
+            default:
+                return errorOutput("Unknown derivation type");
+        }
+    } catch (const std::exception& exp) {
+        return errorOutput(exp.what());
+    }
+}
+
 Data Signer::sign(const PrivateKey& privateKey, Transaction& transaction) noexcept {
     Data toSign = Hash::blake2b(transaction.cid(), 32);
     auto signature = privateKey.sign(toSign, TWCurveSECP256k1);
@@ -49,4 +59,139 @@ std::string Signer::signJSON(const std::string& json, const Data& key) {
     return output.json();
 }
 
+TW::Data Signer::signaturePreimage(const Proto::SigningInput& input) noexcept {
+    auto pubkey = PublicKey(Data(input.public_key().begin(), input.public_key().end()), TWPublicKeyTypeSECP256k1Extended);
+    auto tx = Signer::buildTx(pubkey, input);
+    return tx.cid();
+}
+
+Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey, const Proto::SigningInput& input) noexcept {
+    auto tx = Signer::buildTx(publicKey, input);
+    const auto json = tx.serialize(Transaction::SignatureType::SECP256K1, signature);
+    
+    // Return Protobuf output.
+    Proto::SigningOutput output;
+    output.set_json(json.data(), json.size());
+    return output;
+}
+
+Proto::SigningOutput Signer::signSecp256k1(const Proto::SigningInput& input) {
+    // Load private key and transaction from Protobuf input.
+    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
+    auto pubkey = key.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+
+    auto transaction = Signer::buildTx(pubkey, input);
+
+    // Sign transaction.
+    auto signature = sign(key, transaction);
+    const auto json = transaction.serialize(Transaction::SignatureType::SECP256K1, signature);
+
+    // Return Protobuf output.
+    Proto::SigningOutput output;
+    output.set_json(json.data(), json.size());
+    return output;
+}
+
+Transaction Signer::buildTx(const PublicKey& publicKey, const Proto::SigningInput& input) noexcept {
+    Address from_address = Address::secp256k1Address(publicKey);
+    Address to_address(input.to());
+
+    // Load the transaction params.
+    Data params(input.params().begin(), input.params().end());
+
+    // Simple transfer by default.
+    Transaction::MethodType method = Transaction::MethodType::SEND;
+    if (to_address.type == Address::Type::DELEGATED) {
+        method = Transaction::MethodType::INVOKE_EVM;
+    }
+
+    return {
+        Transaction(
+            /* to */         to_address,
+            /* from */       from_address,
+            /* nonce */      input.nonce(),
+            /* value */      load(input.value()),
+            /* gasLimit */   input.gas_limit(),
+            /* gasFeeCap */  load(input.gas_fee_cap()),
+            /* gasPremium */ load(input.gas_premium()),
+            /* method */     method,
+            /* params */     params
+        )
+    };
+}
+
+/// https://github.com/filecoin-project/lotus/blob/ce17546a762eef311069e13410d15465d832a45e/chain/messagesigner/messagesigner.go#L197-L211
+Proto::SigningOutput Signer::signDelegated(const Proto::SigningInput& input) {
+    // Load private key from Protobuf input.
+    auto privateKey = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
+    auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+
+    // Load the transaction params.
+    Data params(input.params().begin(), input.params().end());
+
+    // Generate a Delegated `f4` address.
+    Address fromAddress = Address::delegatedAddress(pubkey);
+
+    // Parse `to` address. Expects either ID `f1` or Delegated `f4` address.
+    Address toAddress(input.to());
+    auto toEth = AddressConverter::convertToEthereum(toAddress);
+    if (!toEth) {
+        throw std::invalid_argument("Expected a Delegated recipient");
+    }
+    Data toBytes(toEth->bytes.begin(), toEth->bytes.end());
+
+    Ethereum::Proto::SigningInput ethInput;
+
+    auto chainId = store(FILECOIN_EIP155_CHAIN_ID);
+    auto nonce = store(uint256_t(input.nonce()));
+    auto gasLimit = store(uint256_t(input.gas_limit()));
+
+    ethInput.set_chain_id(chainId.data(), chainId.size());
+    ethInput.set_nonce(nonce.data(), nonce.size());
+    ethInput.set_tx_mode(Ethereum::Proto::Enveloped);
+    ethInput.set_gas_limit(gasLimit.data(), gasLimit.size());
+    ethInput.set_max_inclusion_fee_per_gas(input.gas_premium());
+    ethInput.set_max_fee_per_gas(input.gas_fee_cap());
+    ethInput.set_to_address(toEth->string());
+
+    auto* transfer = ethInput.mutable_transaction()->mutable_transfer();
+    transfer->set_amount(input.value());
+    transfer->set_data(params.data(), params.size());
+
+    // Get an Ethereum EIP1559 native transfer preHash to sign.
+    auto ethOutputData = Ethereum::Entry().preImageHashes(TWCoinTypeEthereum, data(ethInput.SerializeAsString()));
+    if (ethOutputData.empty()) {
+        return signingOutputError(Common::Proto::SigningError::Error_internal);
+    }
+
+    TxCompiler::Proto::PreSigningOutput ethOutput;
+    ethOutput.ParseFromArray(ethOutputData.data(), static_cast<int>(ethOutputData.size()));
+    if (ethOutput.error() != Common::Proto::SigningError::OK) {
+        return signingOutputError(ethOutput.error());
+    }
+
+    auto preHash = data(ethOutput.data_hash());
+    // Sign transaction as an Ethereum EIP1559 native transfer.
+    Data signature = privateKey.sign(preHash, TWCurveSECP256k1);
+
+    // Generate a Filecoin signed message.
+    Transaction filecoinTransaction(
+        /* to */         toAddress,
+        /* from */       fromAddress,
+        /* nonce */      input.nonce(),
+        /* value */      load(input.value()),
+        /* gasLimit */   input.gas_limit(),
+        /* gasFeeCap */  load(input.gas_fee_cap()),
+        /* gasPremium */ load(input.gas_premium()),
+        /* method */     Transaction::MethodType::INVOKE_EVM,
+        /* params */     params
+    );
+    const auto json = filecoinTransaction.serialize(Transaction::SignatureType::DELEGATED, signature);
+
+    // Return Protobuf output.
+    Proto::SigningOutput output;
+    output.set_json(json.data(), json.size());
+    return output;
+}
+
 } // namespace TW::Filecoin
diff --git a/src/Filecoin/Signer.h b/src/Filecoin/Signer.h
index b266e95e120..db3c68ed0a1 100644
--- a/src/Filecoin/Signer.h
+++ b/src/Filecoin/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -28,6 +26,22 @@ class Signer {
 
     /// Signs the given transaction.
     static Data sign(const PrivateKey& privateKey, Transaction& transaction) noexcept;
+
+    /// Get transaction data to be signed
+    static TW::Data signaturePreimage(const Proto::SigningInput& input) noexcept;
+
+    /// build transaction with signature
+    static Proto::SigningOutput compile(const Data& signature, const PublicKey& publicKey, const Proto::SigningInput& input) noexcept;
+  
+  private:
+    /// Get transaction data for secp256k1 to be signed
+    static Transaction buildTx(const PublicKey& publicKey, const Proto::SigningInput& input) noexcept;
+
+    /// Signs a Proto::SigningInput transaction.
+    static Proto::SigningOutput signSecp256k1(const Proto::SigningInput& input);
+
+    /// Signs a Proto::SigningInput transaction.
+    static Proto::SigningOutput signDelegated(const Proto::SigningInput& input);
 };
 
 } // namespace TW::Filecoin
diff --git a/src/Filecoin/Transaction.cpp b/src/Filecoin/Transaction.cpp
index 311f71ecf97..3ac1db7f6f1 100644
--- a/src/Filecoin/Transaction.cpp
+++ b/src/Filecoin/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 #include <nlohmann/json.hpp>
@@ -39,16 +37,16 @@ Cbor::Encode Transaction::message() const {
     Cbor::Encode cborGasLimit = gasLimit >= 0 ? Cbor::Encode::uint((uint64_t)gasLimit)
                                               : Cbor::Encode::negInt((uint64_t)(-gasLimit - 1));
     return Cbor::Encode::array({
-        Cbor::Encode::uint(0),                         // version
-        Cbor::Encode::bytes(to.bytes),                 // to address
-        Cbor::Encode::bytes(from.bytes),               // from address
-        Cbor::Encode::uint(nonce),                     // nonce
-        Cbor::Encode::bytes(encodeBigInt(value)),      // value
-        cborGasLimit,                                  // gas limit
+        Cbor::Encode::uint(0),                             // version
+        Cbor::Encode::bytes(to.toBytes()),                   // to address
+        Cbor::Encode::bytes(from.toBytes()),                 // from address
+        Cbor::Encode::uint(nonce),                         // nonce
+        Cbor::Encode::bytes(encodeBigInt(value)),            // value
+        cborGasLimit,                                            // gas limit
         Cbor::Encode::bytes(encodeBigInt(gasFeeCap)),  // gas fee cap
         Cbor::Encode::bytes(encodeBigInt(gasPremium)), // gas premium
-        Cbor::Encode::uint(0),                         // abi.MethodNum (0 => send)
-        Cbor::Encode::bytes(Data())                    // data (empty)
+        Cbor::Encode::uint(method),                        // abi.MethodNum
+        Cbor::Encode::bytes(params)                          // params
     });
 }
 
@@ -60,21 +58,27 @@ Data Transaction::cid() const {
     cid.insert(cid.end(), hash.begin(), hash.end());
     return cid;
 }
-std::string Transaction::serialize(Data& signature) const {
+
+std::string Transaction::serialize(SignatureType signatureType, const Data& signature) const {
     // clang-format off
+    json message = {
+        {"To", to.string()},
+        {"From", from.string()},
+        {"Nonce", nonce},
+        {"Value", toString(value)},
+        {"GasPremium", toString(gasPremium)},
+        {"GasFeeCap", toString(gasFeeCap)},
+        {"GasLimit", gasLimit},
+        {"Method", method},
+    };
+    if (!params.empty()) {
+        message["Params"] = Base64::encode(params);
+    }
+
     json tx = {
-        {"Message", json{
-                {"To", to.string()},
-                {"From", from.string()},
-                {"Nonce", nonce},
-                {"Value", toString(value)},
-                {"GasPremium", toString(gasPremium)},
-                {"GasFeeCap", toString(gasFeeCap)},
-                {"GasLimit", gasLimit},
-            }
-        },
+        {"Message", message},
         {"Signature", json{
-                {"Type", 1},
+                {"Type", static_cast<uint8_t>(signatureType)},
                 {"Data", Base64::encode(signature)},
             }
         },
diff --git a/src/Filecoin/Transaction.h b/src/Filecoin/Transaction.h
index 6ae7dfa1e99..54615507a4c 100644
--- a/src/Filecoin/Transaction.h
+++ b/src/Filecoin/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -18,6 +16,18 @@ Data encodeBigInt(const uint256_t& value);
 
 class Transaction {
   public:
+    enum class MethodType: uint64_t {
+        /// Simple transfers.
+        SEND = 0,
+        /// InvokeEVM method.
+        INVOKE_EVM = 3844450837,
+    };
+
+    enum class SignatureType: uint8_t {
+        SECP256K1 = 1,
+        DELEGATED = 3,
+    };
+
     // Transaction version
     uint64_t version;
     // Recipient address
@@ -32,13 +42,13 @@ class Transaction {
     int64_t gasLimit;
     uint256_t gasFeeCap;
     uint256_t gasPremium;
-    // Transaction type; 0 for simple transfers
+    // Transaction type
     uint64_t method;
-    // Transaction data; empty for simple transfers
+    // Transaction data
     Data params;
 
     Transaction(Address to, Address from, uint64_t nonce, uint256_t value, int64_t gasLimit,
-                uint256_t gasFeeCap, uint256_t gasPremium)
+                uint256_t gasFeeCap, uint256_t gasPremium, MethodType method, Data params)
         : version(0)
         , to(std::move(to))
         , from(std::move(from))
@@ -47,7 +57,8 @@ class Transaction {
         , gasLimit(gasLimit)
         , gasFeeCap(std::move(gasFeeCap))
         , gasPremium(std::move(gasPremium))
-        , method(0) {}
+        , method(static_cast<uint64_t>(method))
+        , params(std::move(params)) {}
 
   public:
     // message returns the CBOR encoding of the Filecoin Message to be signed.
@@ -57,7 +68,7 @@ class Transaction {
     Data cid() const;
 
     // serialize returns json ready for MpoolPush rpc
-    std::string serialize(Data& signature) const;
+    std::string serialize(SignatureType signatureType, const Data& signature) const;
 };
 
 } // namespace TW::Filecoin
diff --git a/src/FullSS58Address.h b/src/FullSS58Address.h
new file mode 100644
index 00000000000..04644660204
--- /dev/null
+++ b/src/FullSS58Address.h
@@ -0,0 +1,139 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Base58.h"
+#include "Data.h"
+#include "PublicKey.h"
+
+#include <array>
+#include <string>
+
+const std::string FullSS58Prefix = "SS58PRE";
+
+namespace TW {
+
+class FullSS58Address {
+  public:
+    static const size_t expectPublicKeySize = 32;
+
+    /// Number of bytes in an address.
+    static const size_t simpleFormatSize = 33;
+    static const size_t fullFormatSize = 34;
+
+    /// see https://docs.substrate.io/v3/advanced/ss58/#checksum-types
+    static const size_t checksumSize = 2;
+
+    /// Address data consisting of a network byte followed by the public key.
+    std::vector<byte> bytes;
+
+
+    /// Determines whether a string makes a valid address
+    static bool isValid(const std::string& string, int32_t network) {
+        const auto decoded = Base58::decode(string);
+        if (decoded.size() != (simpleFormatSize + checksumSize) && decoded.size() != (fullFormatSize + checksumSize)) {
+            return false;
+        }
+
+        if (decoded.size() == (simpleFormatSize + checksumSize)) {
+            // check network
+            if (decoded[0] != network) {
+                return false;
+            }
+        } else {
+            int32_t ss58Decoded = ((decoded[0] & 0b00111111) << 2) | (decoded[1] >> 6) | ((decoded[1] & 0b00111111) << 8);
+            if (ss58Decoded != network) {
+                return false;
+            }
+        }
+
+        auto checksum = computeChecksum(Data(decoded.begin(), decoded.end() - checksumSize));
+        // compare checksum
+        if (!std::equal(decoded.end() - checksumSize, decoded.end(), checksum.begin())) {
+            return false;
+        }
+        return true;
+    }
+
+    template <typename T>
+    static Data computeChecksum(const T& data) {
+        auto prefix = Data(FullSS58Prefix.begin(), FullSS58Prefix.end());
+        append(prefix, Data(data.begin(), data.end()));
+        auto hash = Hash::blake2b(prefix, 64);
+        auto checksum = Data(checksumSize);
+        std::copy(hash.begin(), hash.begin() + checksumSize, checksum.data());
+        return checksum;
+    }
+
+    FullSS58Address() = default;
+
+    /// Initializes an address with a string representation.
+    FullSS58Address(const std::string& string, int32_t network) {
+        if (!isValid(string, network)) {
+            throw std::invalid_argument("Invalid address string");
+        }
+        const auto decoded = Base58::decode(string);
+        bytes.resize(decoded.size() - checksumSize);
+        std::copy(decoded.begin(), decoded.end() - checksumSize, bytes.begin());
+    }
+
+    /// Initializes an address with a public key and network.
+    /// see https://docs.substrate.io/v3/advanced/ss58/#format-in-detail
+    FullSS58Address(const PublicKey& publicKey, int32_t network) {
+        if (publicKey.type != TWPublicKeyTypeED25519) {
+            throw std::invalid_argument("SS58Address expects an ed25519 public key.");
+        }
+        if (network < 0 || network > 16383) {
+            throw std::invalid_argument("network out of range");
+        }
+        if (network < 64) {
+            // Simple account/address/network
+            bytes.resize(simpleFormatSize);
+            bytes[0] = byte(network);
+            std::copy(publicKey.bytes.begin(), publicKey.bytes.end(), bytes.begin() + 1);
+        } else {
+            // Full address/address/network identifier.
+            byte byte0 = (network & 0b0000000011111100) >> 2 | 0b01000000;
+            byte byte1 = byte(network >> 8 | (network & 0b0000000000000011) << 6);
+
+            bytes.resize(fullFormatSize);
+            bytes[0] = byte0;
+            bytes[1] = byte1;
+            std::copy(publicKey.bytes.begin(), publicKey.bytes.end(), bytes.begin() + 2);
+        }
+    }
+
+    /// Returns a string representation of the address.
+    std::string string() const {
+        auto result = Data(bytes.begin(), bytes.end());
+        auto checksum = computeChecksum(bytes);
+        append(result, checksum);
+        return Base58::encode(result);
+    }
+
+    /// Returns public key bytes
+    Data keyBytes() const {
+        Data bz;
+        if (bytes.size() == simpleFormatSize) {
+            bz = Data(bytes.begin() + 1, bytes.end());
+        } else if (bytes.size() == fullFormatSize) {
+            bz =  Data(bytes.begin() + 2, bytes.end());
+        } else {
+            throw std::length_error("invalid address bytes length");
+        }
+
+        if (bz.size() != expectPublicKeySize) {
+            throw std::length_error("invalid public key bytes length");
+        }
+
+        return bz;
+    }
+};
+
+inline bool operator==(const FullSS58Address& lhs, const FullSS58Address& rhs) {
+    return lhs.bytes == rhs.bytes;
+}
+
+} // namespace TW
diff --git a/src/Greenfield/Entry.h b/src/Greenfield/Entry.h
new file mode 100644
index 00000000000..9ab2416863d
--- /dev/null
+++ b/src/Greenfield/Entry.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/RustCoinEntry.h"
+
+namespace TW::Greenfield {
+
+/// Entry point for implementation of Greenfield coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+struct Entry final : public Rust::RustCoinEntry {
+};
+
+} // namespace TW::Greenfield
diff --git a/src/Groestlcoin/Address.cpp b/src/Groestlcoin/Address.cpp
index 290b097ad69..74253e2799b 100644
--- a/src/Groestlcoin/Address.cpp
+++ b/src/Groestlcoin/Address.cpp
@@ -1,27 +1,25 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
+#include "Base58.h"
 
-#include "../Base58.h"
+#include <algorithm>
 #include <TrezorCrypto/ecdsa.h>
 
 namespace TW::Groestlcoin {
 
 bool Address::isValid(const std::string& string) {
-    const auto decoded = Base58::bitcoin.decodeCheck(string, Hash::HasherGroestl512d);
+    const auto decoded = Base58::decodeCheck(string, Rust::Base58Alphabet::Bitcoin, Hash::HasherGroestl512d);
     if (decoded.size() != Address::size) {
         return false;
     }
     return true;
-    // return isValid(string, std::vector<byte>{36, 5});
 }
 
 bool Address::isValid(const std::string& string, const std::vector<byte>& validPrefixes) {
-    const auto decoded = Base58::bitcoin.decodeCheck(string, Hash::HasherGroestl512d);
+    const auto decoded = Base58::decodeCheck(string, Rust::Base58Alphabet::Bitcoin, Hash::HasherGroestl512d);
     if (decoded.size() != Address::size) {
         return false;
     }
@@ -32,7 +30,7 @@ bool Address::isValid(const std::string& string, const std::vector<byte>& validP
 }
 
 Address::Address(const std::string& string) {
-    const auto decoded = Base58::bitcoin.decodeCheck(string, Hash::HasherGroestl512d);
+    const auto decoded = Base58::decodeCheck(string, Rust::Base58Alphabet::Bitcoin, Hash::HasherGroestl512d);
     if (decoded.size() != Address::size) {
         throw std::invalid_argument("Invalid address string");
     }
@@ -56,7 +54,7 @@ Address::Address(const PublicKey& publicKey, uint8_t prefix) {
 }
 
 std::string Address::string() const {
-    return Base58::bitcoin.encodeCheck(bytes, Hash::HasherGroestl512d);
+    return Base58::encodeCheck(bytes, Rust::Base58Alphabet::Bitcoin, Hash::HasherGroestl512d);
 }
 
 } // namespace TW::Groestlcoin
diff --git a/src/Groestlcoin/Address.h b/src/Groestlcoin/Address.h
index d29c37d4e68..2aad25dfe14 100644
--- a/src/Groestlcoin/Address.h
+++ b/src/Groestlcoin/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Groestlcoin/Entry.cpp b/src/Groestlcoin/Entry.cpp
index ae12284620a..89254b29e9a 100644
--- a/src/Groestlcoin/Entry.cpp
+++ b/src/Groestlcoin/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -12,12 +10,36 @@
 
 namespace TW::Groestlcoin {
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const {
-    return TW::Bitcoin::SegwitAddress::isValid(address, hrp) || Address::isValid(address, {p2pkh, p2sh});
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const {
+    if (auto* prefix = std::get_if<Base58Prefix>(&addressPrefix); prefix) {
+        return Address::isValid(address, {prefix->p2pkh, prefix->p2sh});
+    }
+    return TW::Bitcoin::SegwitAddress::isValid(address, std::get<Bech32Prefix>(addressPrefix));
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TW::byte p2pkh, const char* hrp) const {
-    return TW::Bitcoin::SegwitAddress(publicKey, hrp).string();
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    auto hrp = getFromPrefixHrpOrDefault(addressPrefix, coin);
+    auto p2pkh =  getFromPrefixPkhOrDefault(addressPrefix, coin);
+    
+    switch (derivation) {
+    case TWDerivationBitcoinLegacy:
+        return Address(publicKey, p2pkh).string();
+    default:
+        return TW::Bitcoin::SegwitAddress(publicKey, hrp).string();
+    }
+}
+
+TW::Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    const auto decoded = Bitcoin::SegwitAddress::decode(address);
+    if (!std::get<2>(decoded)) {
+        // check if it is a legacy address
+        if (Address::isValid(address)) {
+            const auto addr = Address(address);
+            return {addr.bytes.begin() + 1, addr.bytes.end()};
+        }
+        return {Data()};
+    }
+    return std::get<0>(decoded).witnessProgram;
 }
 
 void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
@@ -28,4 +50,36 @@ void Entry::plan([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     planTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) { 
+            output = Signer::preImageHashes(input); 
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+
+            if (signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("signatures size and publickeys size not equal");
+                return;
+            }
+
+            HashPubkeyList externalSignatures;
+            auto n = signatures.size();
+            for (auto i = 0ul; i < n; ++i) {
+                externalSignatures.push_back(std::make_pair(signatures[i], publicKeys[i].bytes));
+            }
+
+            output = Signer::sign(input, externalSignatures);
+        });
+}
+
 } // namespace TW::Groestlcoin
diff --git a/src/Groestlcoin/Entry.h b/src/Groestlcoin/Entry.h
index 069cc75074e..b9d0ca454e3 100644
--- a/src/Groestlcoin/Entry.h
+++ b/src/Groestlcoin/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,10 +12,14 @@ namespace TW::Groestlcoin {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Groestlcoin
diff --git a/src/Groestlcoin/Signer.cpp b/src/Groestlcoin/Signer.cpp
index 7b87e290ff6..772e816d8bd 100644
--- a/src/Groestlcoin/Signer.cpp
+++ b/src/Groestlcoin/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Bitcoin/TransactionBuilder.h"
@@ -21,9 +19,9 @@ TransactionPlan Signer::plan(const SigningInput& input) noexcept {
     return plan.proto();
 }
 
-SigningOutput Signer::sign(const SigningInput& input) noexcept {
+SigningOutput Signer::sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs) noexcept {
     SigningOutput output;
-    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::sign(input, false, optionalExternalSigs);
     if (!result) {
         output.set_error(result.error());
         return output;
@@ -46,4 +44,23 @@ SigningOutput Signer::sign(const SigningInput& input) noexcept {
     return output;
 }
 
+PreSigningOutput Signer::preImageHashes(const SigningInput& input) noexcept {
+    PreSigningOutput output;
+    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::preImageHashes(input);
+    if (!result) {
+        output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
+        return output;
+    }
+
+    auto hashList = result.payload();
+    auto* hashPubKeys = output.mutable_hash_public_keys();
+    for (auto& h : hashList) {
+        auto* hpk = hashPubKeys->Add();
+        hpk->set_data_hash(h.first.data(), h.first.size());
+        hpk->set_public_key_hash(h.second.data(), h.second.size());
+    }
+    return output;
+}
+
 } // namespace TW::Groestlcoin
diff --git a/src/Groestlcoin/Signer.h b/src/Groestlcoin/Signer.h
index 6b6979105d4..1a90b0c7ce3 100644
--- a/src/Groestlcoin/Signer.h
+++ b/src/Groestlcoin/Signer.h
@@ -1,17 +1,21 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 #include "../proto/Bitcoin.pb.h"
+#include "Data.h"
+
+#include <vector>
+#include <optional>
+#include <utility>
 
 namespace TW::Groestlcoin {
 
 using SigningInput = Bitcoin::Proto::SigningInput;
 using SigningOutput = Bitcoin::Proto::SigningOutput;
 using TransactionPlan = Bitcoin::Proto::TransactionPlan;
+using PreSigningOutput = Bitcoin::Proto::PreSigningOutput;
 
 class Signer {
   public:
@@ -20,8 +24,11 @@ class Signer {
     /// Returns a transaction plan (utxo selection, fee estimation)
     static TransactionPlan plan(const SigningInput& input) noexcept;
 
-    /// Signs a Proto::SigningInput transaction
-    static SigningOutput sign(const SigningInput& input) noexcept;
+    /// Signs a SigningInput transaction
+    static SigningOutput sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs = {}) noexcept;
+
+    /// Collect pre-image hashes to be signed
+    static PreSigningOutput preImageHashes(const SigningInput& input) noexcept;
 };
 
 } // namespace TW::Groestlcoin
diff --git a/src/Groestlcoin/Transaction.h b/src/Groestlcoin/Transaction.h
index 10e678c7de3..e9d34458a5e 100644
--- a/src/Groestlcoin/Transaction.h
+++ b/src/Groestlcoin/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/HDWallet.cpp b/src/HDWallet.cpp
index 47e84bdec75..23f01790c7f 100644
--- a/src/HDWallet.cpp
+++ b/src/HDWallet.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "HDWallet.h"
 
@@ -11,6 +9,7 @@
 #include "Bitcoin/CashAddress.h"
 #include "Bitcoin/SegwitAddress.h"
 #include "Coin.h"
+#include "ImmutableX/StarkKey.h"
 #include "Mnemonic.h"
 #include "memory/memzero_wrapper.h"
 
@@ -34,15 +33,34 @@ namespace {
 uint32_t fingerprint(HDNode* node, Hash::Hasher hasher);
 std::string serialize(const HDNode* node, uint32_t fingerprint, uint32_t version, bool use_public, Hash::Hasher hasher);
 bool deserialize(const std::string& extended, TWCurve curve, Hash::Hasher hasher, HDNode* node);
-HDNode getNode(const HDWallet& wallet, TWCurve curve, const DerivationPath& derivationPath);
-HDNode getMasterNode(const HDWallet& wallet, TWCurve curve);
-
 const char* curveName(TWCurve curve);
 } // namespace
 
 const int MnemonicBufLength = Mnemonic::MaxWords * (BIP39_MAX_WORD_LENGTH + 3) + 20; // some extra slack
 
-HDWallet::HDWallet(int strength, const std::string& passphrase)
+template <std::size_t seedSize>
+HDWallet<seedSize>::HDWallet(const Data& seed) {
+    std::copy_n(seed.begin(), seedSize, this->seed.begin());
+}
+
+template <std::size_t seedSize>
+void HDWallet<seedSize>::updateSeedAndEntropy(bool check) {
+    assert(!check || Mnemonic::isValid(mnemonic)); // precondition
+
+    // generate seed from mnemonic
+    mnemonic_to_seed(mnemonic.c_str(), passphrase.c_str(), seed.data(), nullptr);
+
+    // generate entropy bits from mnemonic
+    Data entropyRaw((Mnemonic::MaxWords * Mnemonic::BitsPerWord) / 8);
+    // entropy is truncated to fully bytes, 4 bytes for each 3 words (=33 bits)
+    auto entropyBytes = mnemonic_to_bits(mnemonic.c_str(), entropyRaw.data()) / 33 * 4;
+    // copy to truncate
+    entropy = data(entropyRaw.data(), entropyBytes);
+    assert(!check || entropy.size() > 10);
+}
+
+template <std::size_t seedSize>
+HDWallet<seedSize>::HDWallet(int strength, const std::string& passphrase)
     : passphrase(passphrase) {
     char buf[MnemonicBufLength];
     const char* mnemonic_chars = mnemonic_generate(strength, buf, MnemonicBufLength);
@@ -54,7 +72,8 @@ HDWallet::HDWallet(int strength, const std::string& passphrase)
     updateSeedAndEntropy();
 }
 
-HDWallet::HDWallet(const std::string& mnemonic, const std::string& passphrase, const bool check)
+template <std::size_t seedSize>
+HDWallet<seedSize>::HDWallet(const std::string& mnemonic, const std::string& passphrase, const bool check)
     : mnemonic(mnemonic), passphrase(passphrase) {
     if (mnemonic.length() == 0 ||
         (check && !Mnemonic::isValid(mnemonic))) {
@@ -63,7 +82,8 @@ HDWallet::HDWallet(const std::string& mnemonic, const std::string& passphrase, c
     updateSeedAndEntropy(check);
 }
 
-HDWallet::HDWallet(const Data& entropy, const std::string& passphrase)
+template <std::size_t seedSize>
+HDWallet<seedSize>::HDWallet(const Data& entropy, const std::string& passphrase)
     : passphrase(passphrase) {
     char buf[MnemonicBufLength];
     const char* mnemonic_chars = mnemonic_from_data(entropy.data(), static_cast<int>(entropy.size()), buf, MnemonicBufLength);
@@ -75,59 +95,80 @@ HDWallet::HDWallet(const Data& entropy, const std::string& passphrase)
     updateSeedAndEntropy();
 }
 
-HDWallet::~HDWallet() {
-    std::fill(seed.begin(), seed.end(), 0);
-    std::fill(mnemonic.begin(), mnemonic.end(), 0);
-    std::fill(passphrase.begin(), passphrase.end(), 0);
+template <std::size_t seedSize>
+HDWallet<seedSize>::~HDWallet() {
+    memzero(seed.data(), seed.size());
+    memzero(mnemonic.data(), mnemonic.size());
+    memzero(passphrase.data(), passphrase.size());
 }
 
-void HDWallet::updateSeedAndEntropy(bool check) {
-    assert(!check || Mnemonic::isValid(mnemonic)); // precondition
-
-    // generate seed from mnemonic
-    mnemonic_to_seed(mnemonic.c_str(), passphrase.c_str(), seed.data(), nullptr);
+template <size_t seedSize>
+static HDNode getMasterNode(const HDWallet<seedSize>& wallet, TWCurve curve) {
+    const auto privateKeyType = PrivateKey::getType(curve);
+    HDNode node;
+    switch (privateKeyType) {
+    case TWPrivateKeyTypeCardano: {
+        // Derives the root Cardano HDNode from a passphrase and the entropy encoded in
+        // a BIP-0039 mnemonic using the Icarus derivation (V2) scheme
+        const auto entropy = wallet.getEntropy();
+        uint8_t secret[CARDANO_SECRET_LENGTH];
+        secret_from_entropy_cardano_icarus((const uint8_t*)"", 0, entropy.data(), int(entropy.size()), secret, nullptr);
+        hdnode_from_secret_cardano(secret, &node);
+        TW::memzero(secret, CARDANO_SECRET_LENGTH);
+        break;
+    }
+    case TWPrivateKeyTypeDefault:
+    default:
+        hdnode_from_seed(wallet.getSeed().data(), HDWallet<seedSize>::mSeedSize, curveName(curve), &node);
+        break;
+    }
+    return node;
+}
 
-    // generate entropy bits from mnemonic
-    Data entropyRaw((Mnemonic::MaxWords * Mnemonic::BitsPerWord) / 8);
-    // entropy is truncated to fully bytes, 4 bytes for each 3 words (=33 bits)
-    auto entropyBytes = mnemonic_to_bits(mnemonic.c_str(), entropyRaw.data()) / 33 * 4;
-    // copy to truncate
-    entropy = data(entropyRaw.data(), entropyBytes);
-    assert(!check || entropy.size() > 10);
+template <size_t seedSize>
+static HDNode getNode(const HDWallet<seedSize>& wallet, TWCurve curve, const DerivationPath& derivationPath) {
+    const auto privateKeyType = PrivateKey::getType(curve);
+    auto node = getMasterNode<seedSize>(wallet, curve);
+    for (auto& index : derivationPath.indices) {
+        switch (privateKeyType) {
+        case TWPrivateKeyTypeCardano:
+            hdnode_private_ckd_cardano(&node, index.derivationIndex());
+            break;
+        case TWPrivateKeyTypeDefault:
+        default:
+            hdnode_private_ckd(&node, index.derivationIndex());
+            break;
+        }
+    }
+    return node;
 }
 
-PrivateKey HDWallet::getMasterKey(TWCurve curve) const {
+template <std::size_t seedSize>
+PrivateKey HDWallet<seedSize>::getMasterKey(TWCurve curve) const {
     auto node = getMasterNode(*this, curve);
     auto data = Data(node.private_key, node.private_key + PrivateKey::_size);
     return PrivateKey(data);
 }
 
-PrivateKey HDWallet::getMasterKeyExtension(TWCurve curve) const {
+template <std::size_t seedSize>
+PrivateKey HDWallet<seedSize>::getMasterKeyExtension(TWCurve curve) const {
     auto node = getMasterNode(*this, curve);
     auto data = Data(node.private_key_extension, node.private_key_extension + PrivateKey::_size);
     return PrivateKey(data);
 }
 
-PrivateKey HDWallet::getKey(TWCoinType coin, TWDerivation derivation) const {
-    const auto path = TW::derivationPath(coin, derivation);
-    return getKey(coin, path);
-}
-
-DerivationPath HDWallet::cardanoStakingDerivationPath(const DerivationPath& path) {
+template <std::size_t seedSize>
+DerivationPath HDWallet<seedSize>::cardanoStakingDerivationPath(const DerivationPath& path) {
     DerivationPath stakingPath = path;
     stakingPath.indices[3].value = 2;
     stakingPath.indices[4].value = 0;
     return stakingPath;
 }
 
-PrivateKey HDWallet::getKey(TWCoinType coin, const DerivationPath& derivationPath) const {
-    const auto curve = TWCoinTypeCurve(coin);
-    return getKeyByCurve(curve, derivationPath);
-}
-
-PrivateKey HDWallet::getKeyByCurve(TWCurve curve, const DerivationPath& derivationPath) const {
+template <std::size_t seedSize>
+PrivateKey HDWallet<seedSize>::getKeyByCurve(TWCurve curve, const DerivationPath& derivationPath) const {
     const auto privateKeyType = PrivateKey::getType(curve);
-    auto node = getNode(*this, curve, derivationPath);
+    auto node = getNode<seedSize>(*this, curve, derivationPath);
     switch (privateKeyType) {
     case TWPrivateKeyTypeCardano: {
         if (derivationPath.indices.size() < 4 || derivationPath.indices[3].value > 1) {
@@ -149,32 +190,50 @@ PrivateKey HDWallet::getKeyByCurve(TWCurve curve, const DerivationPath& derivati
         TW::memzero(&node);
         return PrivateKey(pkData, extData, chainCode, pkData2, extData2, chainCode2);
     }
-
     case TWPrivateKeyTypeDefault:
     default:
         // default path
         auto data = Data(node.private_key, node.private_key + PrivateKey::_size);
         TW::memzero(&node);
+        if (curve == TWCurveStarkex) {
+            return ImmutableX::getPrivateKeyFromEthPrivKey(PrivateKey(data));
+        }
         return PrivateKey(data);
     }
 }
 
-std::string HDWallet::getRootKey(TWCoinType coin, TWHDVersion version) const {
+template <std::size_t seedSize>
+PrivateKey HDWallet<seedSize>::getKey(TWCoinType coin, const DerivationPath& derivationPath) const {
     const auto curve = TWCoinTypeCurve(coin);
-    auto node = getMasterNode(*this, curve);
-    return serialize(&node, 0, version, false, base58Hasher(coin));
+    return getKeyByCurve(curve, derivationPath);
 }
 
-std::string HDWallet::deriveAddress(TWCoinType coin) const {
-    return deriveAddress(coin, TWDerivationDefault);
+template <std::size_t seedSize>
+PrivateKey HDWallet<seedSize>::getKey(TWCoinType coin, TWDerivation derivation) const {
+    const auto path = TW::derivationPath(coin, derivation);
+    return getKey(coin, path);
 }
 
-std::string HDWallet::deriveAddress(TWCoinType coin, TWDerivation derivation) const {
+template <std::size_t seedSize>
+std::string HDWallet<seedSize>::getRootKey(TWCoinType coin, TWHDVersion version) const {
+    const auto curve = TWCoinTypeCurve(coin);
+    auto node = getMasterNode(*this, curve);
+    return serialize(&node, 0, version, false, base58Hasher(coin));
+}
+
+template <std::size_t seedSize>
+std::string HDWallet<seedSize>::deriveAddress(TWCoinType coin, TWDerivation derivation) const {
     const auto derivationPath = TW::derivationPath(coin, derivation);
     return TW::deriveAddress(coin, getKey(coin, derivationPath), derivation);
 }
 
-std::string HDWallet::getExtendedPrivateKeyAccount(TWPurpose purpose, TWCoinType coin, TWDerivation derivation, TWHDVersion version, uint32_t account) const {
+template <std::size_t seedSize>
+std::string HDWallet<seedSize>::deriveAddress(TWCoinType coin) const {
+    return deriveAddress(coin, TWDerivationDefault);
+}
+
+template <std::size_t seedSize>
+std::string HDWallet<seedSize>::getExtendedPrivateKeyAccount(TWPurpose purpose, TWCoinType coin, TWDerivation derivation, TWHDVersion version, uint32_t account) const {
     if (version == TWHDVersionNone) {
         return "";
     }
@@ -188,7 +247,8 @@ std::string HDWallet::getExtendedPrivateKeyAccount(TWPurpose purpose, TWCoinType
     return serialize(&node, fingerprintValue, version, false, base58Hasher(coin));
 }
 
-std::string HDWallet::getExtendedPublicKeyAccount(TWPurpose purpose, TWCoinType coin, TWDerivation derivation, TWHDVersion version, uint32_t account) const {
+template <std::size_t seedSize>
+std::string HDWallet<seedSize>::getExtendedPublicKeyAccount(TWPurpose purpose, TWCoinType coin, TWDerivation derivation, TWHDVersion version, uint32_t account) const {
     if (version == TWHDVersionNone) {
         return "";
     }
@@ -203,7 +263,8 @@ std::string HDWallet::getExtendedPublicKeyAccount(TWPurpose purpose, TWCoinType
     return serialize(&node, fingerprintValue, version, true, base58Hasher(coin));
 }
 
-std::optional<PublicKey> HDWallet::getPublicKeyFromExtended(const std::string& extended, TWCoinType coin, const DerivationPath& path) {
+template <std::size_t seedSize>
+std::optional<PublicKey> HDWallet<seedSize>::getPublicKeyFromExtended(const std::string& extended, TWCoinType coin, const DerivationPath& path) {
     const auto curve = TW::curve(coin);
     const auto hasher = TW::base58Hasher(coin);
 
@@ -239,7 +300,8 @@ std::optional<PublicKey> HDWallet::getPublicKeyFromExtended(const std::string& e
     return {};
 }
 
-std::optional<PrivateKey> HDWallet::getPrivateKeyFromExtended(const std::string& extended, TWCoinType coin, const DerivationPath& path) {
+template <std::size_t seedSize>
+std::optional<PrivateKey> HDWallet<seedSize>::getPrivateKeyFromExtended(const std::string& extended, TWCoinType coin, const DerivationPath& path) {
     const auto curve = TW::curve(coin);
     const auto hasher = TW::base58Hasher(coin);
 
@@ -253,6 +315,13 @@ std::optional<PrivateKey> HDWallet::getPrivateKeyFromExtended(const std::string&
     return PrivateKey(Data(node.private_key, node.private_key + 32));
 }
 
+template <std::size_t seedSize>
+PrivateKey HDWallet<seedSize>::bip32DeriveRawSeed(TWCoinType coin, const Data& seed, const DerivationPath& path) {
+    const auto curve = TWCoinTypeCurve(coin);
+    auto wallet = HDWallet<seedSize>(seed);
+    return wallet.getKeyByCurve(curve, path);
+}
+
 namespace {
 
 uint32_t fingerprint(HDNode* node, Hash::Hasher hasher) {
@@ -277,19 +346,19 @@ std::string serialize(const HDNode* node, uint32_t fingerprint, uint32_t version
         node_data.insert(node_data.end(), node->private_key, node->private_key + 32);
     }
 
-    return Base58::bitcoin.encodeCheck(node_data, hasher);
+    return Base58::encodeCheck(node_data, Rust::Base58Alphabet::Bitcoin, hasher);
 }
 
 bool deserialize(const std::string& extended, TWCurve curve, Hash::Hasher hasher, HDNode* node) {
     TW::memzero(node);
     const char* curveNameStr = curveName(curve);
-    if (curveNameStr == nullptr || ::strlen(curveNameStr) == 0) {
+    if (curveNameStr == nullptr || std::string(curveNameStr).empty()) {
         return false;
     }
     node->curve = get_curve_by_name(curveNameStr);
     assert(node->curve != nullptr);
 
-    const auto node_data = Base58::bitcoin.decodeCheck(extended, hasher);
+    const auto node_data = Base58::decodeCheck(extended, Rust::Base58Alphabet::Bitcoin, hasher);
     if (node_data.size() != 78) {
         return false;
     }
@@ -311,47 +380,9 @@ bool deserialize(const std::string& extended, TWCurve curve, Hash::Hasher hasher
     return true;
 }
 
-HDNode getNode(const HDWallet& wallet, TWCurve curve, const DerivationPath& derivationPath) {
-    const auto privateKeyType = PrivateKey::getType(curve);
-    auto node = getMasterNode(wallet, curve);
-    for (auto& index : derivationPath.indices) {
-        switch (privateKeyType) {
-        case TWPrivateKeyTypeCardano:
-            hdnode_private_ckd_cardano(&node, index.derivationIndex());
-            break;
-        case TWPrivateKeyTypeDefault:
-        default:
-            hdnode_private_ckd(&node, index.derivationIndex());
-            break;
-        }
-    }
-    return node;
-}
-
-HDNode getMasterNode(const HDWallet& wallet, TWCurve curve) {
-    const auto privateKeyType = PrivateKey::getType(curve);
-    HDNode node;
-    switch (privateKeyType) {
-    case TWPrivateKeyTypeCardano: {
-        // Derives the root Cardano HDNode from a passphrase and the entropy encoded in
-        // a BIP-0039 mnemonic using the Icarus derivation (V2) scheme
-        const auto entropy = wallet.getEntropy();
-        uint8_t secret[CARDANO_SECRET_LENGTH];
-        secret_from_entropy_cardano_icarus((const uint8_t*)"", 0, entropy.data(), int(entropy.size()), secret, nullptr);
-        hdnode_from_secret_cardano(secret, &node);
-        TW::memzero(secret, CARDANO_SECRET_LENGTH);
-        break;
-    }
-    case TWPrivateKeyTypeDefault:
-    default:
-        hdnode_from_seed(wallet.getSeed().data(), HDWallet::seedSize, curveName(curve), &node);
-        break;
-    }
-    return node;
-}
-
 const char* curveName(TWCurve curve) {
     switch (curve) {
+    case TWCurveStarkex:
     case TWCurveSECP256k1:
         return SECP256K1_NAME;
     case TWCurveED25519:
@@ -371,3 +402,8 @@ const char* curveName(TWCurve curve) {
 }
 
 } // namespace
+
+namespace TW {
+template class HDWallet<32>;
+template class HDWallet<64>;
+} // namespace TW
diff --git a/src/HDWallet.h b/src/HDWallet.h
index 0579591c82e..7cff0fbcb2e 100644
--- a/src/HDWallet.h
+++ b/src/HDWallet.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -24,9 +22,10 @@
 
 namespace TW {
 
+template<size_t seedSize = 64>
 class HDWallet {
   public:
-    static constexpr size_t seedSize = 64;
+    static constexpr size_t mSeedSize = seedSize;
     static constexpr size_t maxMnemomincSize = 240;
     static constexpr size_t maxExtendedKeySize = 128;
 
@@ -43,13 +42,16 @@ class HDWallet {
     /// Entropy is the binary 1-to-1 representation of the mnemonic (11 bits from each word)
     TW::Data entropy;
 
-  public:
+public:
     const std::array<byte, seedSize>& getSeed() const { return seed; }
     const std::string& getMnemonic() const { return mnemonic; }
     const std::string& getPassphrase() const { return passphrase; }
     const TW::Data& getEntropy() const { return entropy; }
 
   public:
+    /// Initializes an HDWallet from given seed.
+    HDWallet(const Data& seed);
+
     /// Initializes a new random HDWallet with the provided strength in bits.  
     /// Throws on invalid strength.
     HDWallet(int strength, const std::string& passphrase);
@@ -125,6 +127,13 @@ class HDWallet {
     /// Computes the private key from an extended private key representation.
     static std::optional<PrivateKey> getPrivateKeyFromExtended(const std::string& extended, TWCoinType coin, const DerivationPath& path);
 
+    /// Derive the given seed for the given coin, with the given Derivation path
+    /// \param coin Coin to be used in order to retrieve the curve type
+    /// \param seed Custom seed to be used for the derivation, can be a mnemonic seed as well as an ethereum signature seed
+    /// \param path The derivation path to use
+    /// \return The computed private key
+    static PrivateKey bip32DeriveRawSeed(TWCoinType coin, const Data& seed, const DerivationPath& path);
+
   private:
     void updateSeedAndEntropy(bool check = true);
 
@@ -136,5 +145,5 @@ class HDWallet {
 
 /// Wrapper for C interface.
 struct TWHDWallet {
-    TW::HDWallet impl;
+    TW::HDWallet<> impl;
 };
diff --git a/src/Harmony/Address.cpp b/src/Harmony/Address.cpp
index e4be72aa81f..9da95d15d66 100644
--- a/src/Harmony/Address.cpp
+++ b/src/Harmony/Address.cpp
@@ -1,10 +1,8 @@
 
 // Copyright © 2017 Pieter Wuille
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
diff --git a/src/Harmony/Address.h b/src/Harmony/Address.h
index da4748f7a15..2fda40b406d 100644
--- a/src/Harmony/Address.h
+++ b/src/Harmony/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Harmony/Entry.cpp b/src/Harmony/Entry.cpp
index ad652105739..e9ad9fdd624 100644
--- a/src/Harmony/Entry.cpp
+++ b/src/Harmony/Entry.cpp
@@ -1,13 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
-
 #include "Address.h"
 #include "Signer.h"
+#include <proto/TransactionCompiler.pb.h>
 
 using namespace TW;
 using namespace std;
@@ -16,11 +14,11 @@ namespace TW::Harmony {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -40,4 +38,23 @@ string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string& json
     return Signer::signJSON(json, key);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data &txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [=](const auto &input, auto &output) {
+            Signer signer(uint256_t(load(input.chain_id())));
+            auto unsignedTxBytes = signer.buildUnsignedTxBytes(input);
+            auto imageHash = Hash::keccak256(unsignedTxBytes);
+            output.set_data(unsignedTxBytes.data(), unsignedTxBytes.size());
+            output.set_data_hash(imageHash.data(), imageHash.size()); });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data &txInputData, const std::vector<Data> &signatures,
+                    const std::vector<PublicKey> &publicKeys, Data &dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto &input, auto &output, const auto& signature, [[maybe_unused]] const auto& publicKey) {
+            Signer signer(uint256_t(load(input.chain_id())));
+            output = signer.buildSigningOutput(input, signature); });
+}
+
 } // namespace TW::Harmony
diff --git a/src/Harmony/Entry.h b/src/Harmony/Entry.h
index 1feefb3ca70..bc1c3ee7062 100644
--- a/src/Harmony/Entry.h
+++ b/src/Harmony/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,12 +12,15 @@ namespace TW::Harmony {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     bool supportsJSONSigning() const { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool supportsJSONSigning() const { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Harmony
diff --git a/src/Harmony/Signer.cpp b/src/Harmony/Signer.cpp
index 1c7d2c4a803..79f59e80f08 100644
--- a/src/Harmony/Signer.cpp
+++ b/src/Harmony/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "../Ethereum/RLP.h"
@@ -11,6 +9,9 @@
 
 namespace TW::Harmony {
 
+using INVALID_ENUM = std::integral_constant<uint8_t, 99>;
+using RLP = TW::Ethereum::RLP;
+
 std::tuple<uint256_t, uint256_t, uint256_t> Signer::values(const uint256_t& chainID,
                                                            const Data& signature) noexcept {
     auto r = load(Data(signature.begin(), signature.begin() + 32));
@@ -42,29 +43,39 @@ Proto::SigningOutput Signer::prepareOutput(const Data& encoded, const T& transac
     return protoOutput;
 }
 
-Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    if (input.has_transaction_message()) {
-        return signTransaction(input);
-    }
-    if (input.has_staking_message()) {
-        Harmony::Proto::StakingMessage stakingMessage = input.staking_message();
-        if (stakingMessage.has_create_validator_message()) {
-            return signCreateValidator(input);
-        }
-        if (stakingMessage.has_edit_validator_message()) {
-            return signEditValidator(input);
-        }
-        if (stakingMessage.has_delegate_message()) {
-            return signDelegate(input);
-        }
-        if (stakingMessage.has_undelegate_message()) {
-            return signUndelegate(input);
+Proto::SigningOutput Signer::sign(const Proto::SigningInput &input) noexcept {
+    auto output = Proto::SigningOutput();
+    try {
+
+        if (input.has_transaction_message()) {
+            return signTransaction(input);
         }
-        if (stakingMessage.has_collect_rewards()) {
-            return signCollectRewards(input);
+
+        if (input.has_staking_message()) {
+            Harmony::Proto::StakingMessage stakingMessage = input.staking_message();
+            if (stakingMessage.has_create_validator_message()) {
+                return Signer::signStaking<CreateValidator>(input, &Signer::buildUnsignedCreateValidator);
+            }
+            if (stakingMessage.has_edit_validator_message()) {
+                return Signer::signStaking<EditValidator>(input, &Signer::buildUnsignedEditValidator);
+            }
+            if (stakingMessage.has_delegate_message()) {
+                return Signer::signStaking<Delegate>(input, &Signer::buildUnsignedDelegate);
+            }
+            if (stakingMessage.has_undelegate_message()) {
+                return Signer::signStaking<Undelegate>(input, &Signer::buildUnsignedUndelegate);
+            }
+            if (stakingMessage.has_collect_rewards()) {
+                return Signer::signStaking<CollectRewards>(input, &Signer::buildUnsignedCollectRewards);
+            }
         }
+        output.set_error(Common::Proto::Error_invalid_params);
+        output.set_error_message("Invalid message");
+    } catch (const std::exception &e) {
+        output.set_error(Common::Proto::Error_invalid_params);
+        output.set_error_message(e.what());
     }
-    return Proto::SigningOutput();
+    return output;
 }
 
 std::string Signer::signJSON(const std::string& json, const Data& key) {
@@ -74,24 +85,10 @@ std::string Signer::signJSON(const std::string& json, const Data& key) {
     return hex(Signer::sign(input).encoded());
 }
 
-Proto::SigningOutput Signer::signTransaction(const Proto::SigningInput& input) noexcept {
+Proto::SigningOutput Signer::signTransaction(const Proto::SigningInput& input) {
     auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-    Address toAddr;
-    if (!Address::decode(input.transaction_message().to_address(), toAddr)) {
-        // invalid to address
-        return Proto::SigningOutput();
-    }
-    auto transaction = Transaction(
-        /* nonce: */ load(input.transaction_message().nonce()),
-        /* gasPrice: */ load(input.transaction_message().gas_price()),
-        /* gasLimit: */ load(input.transaction_message().gas_limit()),
-        /* fromShardID */ load(input.transaction_message().from_shard_id()),
-        /* toShardID */ load(input.transaction_message().to_shard_id()),
-        /* to: */ toAddr,
-        /* amount: */ load(input.transaction_message().amount()),
-        /* payload: */
-        Data(input.transaction_message().payload().begin(),
-             input.transaction_message().payload().end()));
+
+    auto transaction = Signer::buildUnsignedTransaction(input);
 
     auto signer = Signer(uint256_t(load(input.chain_id())));
     auto hash = signer.hash(transaction);
@@ -102,8 +99,56 @@ Proto::SigningOutput Signer::signTransaction(const Proto::SigningInput& input) n
     return prepareOutput<Transaction>(encoded, transaction);
 }
 
-Proto::SigningOutput Signer::signCreateValidator(const Proto::SigningInput& input) noexcept {
+template <typename T>
+uint8_t Signer::getEnum() noexcept {
+    return INVALID_ENUM::value;
+}
+
+template <>
+uint8_t Signer::getEnum<CreateValidator>() noexcept {
+    return DirectiveCreateValidator;
+}
+
+template <>
+uint8_t Signer::getEnum<EditValidator>() noexcept {
+    return DirectiveEditValidator;
+}
+
+template <>
+uint8_t Signer::getEnum<Delegate>() noexcept {
+    return DirectiveDelegate;
+}
+
+template <>
+uint8_t Signer::getEnum<Undelegate>() noexcept {
+    return DirectiveUndelegate;
+}
+
+template <>
+uint8_t Signer::getEnum<CollectRewards>() noexcept {
+    return DirectiveCollectRewards;
+}
+
+template <typename T>
+Proto::SigningOutput Signer::signStaking(const Proto::SigningInput &input, function<T(const Proto::SigningInput &input)> func) {
     auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
+    auto stakingTx = buildUnsignedStakingTransaction(input, func);
+
+    auto signer = Signer(uint256_t(load(input.chain_id())));
+    auto hash = signer.hash<T>(stakingTx);
+    signer.sign(key, hash, stakingTx);
+    auto encoded = signer.rlpNoHash<T>(stakingTx, true);
+
+    return prepareOutput<Staking<T>>(encoded, stakingTx);
+}
+
+CreateValidator Signer::buildUnsignedCreateValidator(const Proto::SigningInput &input) {
+    Address validatorAddr;
+    if (!Address::decode(input.staking_message().create_validator_message().validator_address(),
+                         validatorAddr)) {
+        throw std::invalid_argument("Invalid address");
+    }
+
     auto description = Description(
         /* name */ input.staking_message().create_validator_message().description().name(),
         /* identity */ input.staking_message().create_validator_message().description().identity(),
@@ -153,13 +198,8 @@ Proto::SigningOutput Signer::signCreateValidator(const Proto::SigningInput& inpu
     for (auto sig : input.staking_message().create_validator_message().slot_key_sigs()) {
         slotKeySigs.emplace_back(Data(sig.begin(), sig.end()));
     }
-    Address validatorAddr;
-    if (!Address::decode(input.staking_message().create_validator_message().validator_address(),
-                         validatorAddr)) {
-        // invalid to address
-        return Proto::SigningOutput();
-    }
-    auto createValidator = CreateValidator(
+
+    return CreateValidator(
         /* ValidatorAddress */ validatorAddr,
         /* Description */ description,
         /* Commission */ commissionRates,
@@ -170,22 +210,15 @@ Proto::SigningOutput Signer::signCreateValidator(const Proto::SigningInput& inpu
         /* PubKey */ slotPubKeys,
         /* BlsSig */ slotKeySigs,
         /* Amount */ load(input.staking_message().create_validator_message().amount()));
-
-    auto stakingTx = Staking<CreateValidator>(
-        DirectiveCreateValidator, createValidator, load(input.staking_message().nonce()),
-        load(input.staking_message().gas_price()), load(input.staking_message().gas_limit()),
-        load(input.chain_id()), 0, 0);
-
-    auto signer = Signer(uint256_t(load(input.chain_id())));
-    auto hash = signer.hash<CreateValidator>(stakingTx);
-    signer.sign(key, hash, stakingTx);
-    auto encoded = signer.rlpNoHash<CreateValidator>(stakingTx, true);
-
-    return prepareOutput<Staking<CreateValidator>>(encoded, stakingTx);
 }
 
-Proto::SigningOutput Signer::signEditValidator(const Proto::SigningInput& input) noexcept {
-    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
+EditValidator Signer::buildUnsignedEditValidator(const Proto::SigningInput &input) {
+
+    Address validatorAddr;
+    if (!Address::decode(input.staking_message().edit_validator_message().validator_address(),
+                         validatorAddr)) {
+        throw std::invalid_argument("Invalid address");
+    }
 
     auto description = Description(
         /* name */ input.staking_message().edit_validator_message().description().name(),
@@ -204,13 +237,7 @@ Proto::SigningOutput Signer::signEditValidator(const Proto::SigningInput& input)
             load(input.staking_message().edit_validator_message().commission_rate().precision()));
     }
 
-    Address validatorAddr;
-    if (!Address::decode(input.staking_message().edit_validator_message().validator_address(),
-                         validatorAddr)) {
-        // invalid to address
-        return Proto::SigningOutput();
-    }
-    auto editValidator = EditValidator(
+    return EditValidator(
         /* ValidatorAddress */ validatorAddr,
         /* Description */ description,
         /* CommissionRate */ commissionRate,
@@ -229,265 +256,266 @@ Proto::SigningOutput Signer::signEditValidator(const Proto::SigningInput& input)
              input.staking_message().edit_validator_message().slot_key_to_add_sig().end()),
         /* Active */
         load(input.staking_message().edit_validator_message().active()));
-
-    auto stakingTx = Staking<EditValidator>(
-        DirectiveEditValidator, editValidator, load(input.staking_message().nonce()),
-        load(input.staking_message().gas_price()), load(input.staking_message().gas_limit()),
-        load(input.chain_id()), 0, 0);
-
-    auto signer = Signer(uint256_t(load(input.chain_id())));
-    auto hash = signer.hash<EditValidator>(stakingTx);
-    signer.sign(key, hash, stakingTx);
-    auto encoded = signer.rlpNoHash<EditValidator>(stakingTx, true);
-
-    return prepareOutput<Staking<EditValidator>>(encoded, stakingTx);
 }
 
-Proto::SigningOutput Signer::signDelegate(const Proto::SigningInput& input) noexcept {
-    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-
+Delegate Signer::buildUnsignedDelegate(const Proto::SigningInput &input) {
     Address delegatorAddr;
     if (!Address::decode(input.staking_message().delegate_message().delegator_address(),
                          delegatorAddr)) {
-        // invalid to address
-        return Proto::SigningOutput();
+        throw std::invalid_argument("Invalid address");
     }
     Address validatorAddr;
     if (!Address::decode(input.staking_message().delegate_message().validator_address(),
                          validatorAddr)) {
-        // invalid to address
-        return Proto::SigningOutput();
+        throw std::invalid_argument("Invalid address");
     }
-    auto delegate = Delegate(delegatorAddr, validatorAddr,
-                             load(input.staking_message().delegate_message().amount()));
-    auto stakingTx =
-        Staking<Delegate>(DirectiveDelegate, delegate, load(input.staking_message().nonce()),
-                          load(input.staking_message().gas_price()),
-                          load(input.staking_message().gas_limit()), load(input.chain_id()), 0, 0);
-
-    auto signer = Signer(uint256_t(load(input.chain_id())));
-    auto hash = signer.hash<Delegate>(stakingTx);
-    signer.sign(key, hash, stakingTx);
-    auto encoded = signer.rlpNoHash<Delegate>(stakingTx, true);
-
-    return prepareOutput<Staking<Delegate>>(encoded, stakingTx);
+    return Delegate(delegatorAddr, validatorAddr,
+                    load(input.staking_message().delegate_message().amount()));
 }
 
-Proto::SigningOutput Signer::signUndelegate(const Proto::SigningInput& input) noexcept {
-    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-
+Undelegate Signer::buildUnsignedUndelegate(const Proto::SigningInput &input) {
     Address delegatorAddr;
     if (!Address::decode(input.staking_message().undelegate_message().delegator_address(),
                          delegatorAddr)) {
-        // invalid to address
-        return Proto::SigningOutput();
+        throw std::invalid_argument("Invalid address");
     }
     Address validatorAddr;
     if (!Address::decode(input.staking_message().undelegate_message().validator_address(),
                          validatorAddr)) {
-        // invalid to address
-        return Proto::SigningOutput();
+        throw std::invalid_argument("Invalid address");
     }
-    auto undelegate = Undelegate(delegatorAddr, validatorAddr,
-                                 load(input.staking_message().undelegate_message().amount()));
-    auto stakingTx = Staking<Undelegate>(
-        DirectiveUndelegate, undelegate, load(input.staking_message().nonce()),
-        load(input.staking_message().gas_price()), load(input.staking_message().gas_limit()),
-        load(input.chain_id()), 0, 0);
-
-    auto signer = Signer(uint256_t(load(input.chain_id())));
-    auto hash = signer.hash<Undelegate>(stakingTx);
-    signer.sign(key, hash, stakingTx);
-    auto encoded = signer.rlpNoHash<Undelegate>(stakingTx, true);
-
-    return prepareOutput<Staking<Undelegate>>(encoded, stakingTx);
+    return Undelegate(delegatorAddr, validatorAddr,
+                      load(input.staking_message().undelegate_message().amount()));
 }
 
-Proto::SigningOutput Signer::signCollectRewards(const Proto::SigningInput& input) noexcept {
-    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-
+CollectRewards Signer::buildUnsignedCollectRewards(const Proto::SigningInput &input) {
     Address delegatorAddr;
     if (!Address::decode(input.staking_message().collect_rewards().delegator_address(),
                          delegatorAddr)) {
-        // invalid to address
-        return Proto::SigningOutput();
+        throw std::invalid_argument("Invalid address");
     }
-    auto collectRewards = CollectRewards(delegatorAddr);
-    auto stakingTx = Staking<CollectRewards>(
-        DirectiveCollectRewards, collectRewards, load(input.staking_message().nonce()),
-        load(input.staking_message().gas_price()), load(input.staking_message().gas_limit()),
-        load(input.chain_id()), 0, 0);
+    return CollectRewards(delegatorAddr);
+}
 
-    auto signer = Signer(uint256_t(load(input.chain_id())));
-    auto hash = signer.hash<CollectRewards>(stakingTx);
-    signer.sign(key, hash, stakingTx);
-    auto encoded = signer.rlpNoHash<CollectRewards>(stakingTx, true);
+Data Signer::rlpNoHash(const Transaction& transaction, const bool include_vrs) const noexcept {
+    auto nonce = store(transaction.nonce);
+    auto gasPrice = store(transaction.gasPrice);
+    auto gasLimit = store(transaction.gasLimit);
+    auto fromShardID = store(transaction.fromShardID);
+    auto toShardID = store(transaction.toShardID);
+    auto toKeyHash = transaction.to.getKeyHash();
+    auto amount = store(transaction.amount);
+
+    Data v;
+    Data r;
+    Data s;
+    if (include_vrs) {
+        v = store(transaction.v);
+        r = store(transaction.r);
+        s = store(transaction.s);
+    } else {
+        v = store(chainID);
+        r = store(0);
+        s = store(0);
+    }
 
-    return prepareOutput<Staking<CollectRewards>>(encoded, stakingTx);
-}
+    EthereumRlp::Proto::EncodingInput input;
+    auto* rlpList = input.mutable_item()->mutable_list();
 
-template <typename T>
-void Signer::sign(const PrivateKey& privateKey, const Data& hash, T& transaction) const noexcept {
-    auto tuple = sign(chainID, privateKey, hash);
-    transaction.r = std::get<0>(tuple);
-    transaction.s = std::get<1>(tuple);
-    transaction.v = std::get<2>(tuple);
+    rlpList->add_items()->set_number_u256(nonce.data(), nonce.size());
+    rlpList->add_items()->set_number_u256(gasPrice.data(), gasPrice.size());
+    rlpList->add_items()->set_number_u256(gasLimit.data(), gasLimit.size());
+    rlpList->add_items()->set_number_u256(fromShardID.data(), fromShardID.size());
+    rlpList->add_items()->set_number_u256(toShardID.data(), toShardID.size());
+    rlpList->add_items()->set_data(toKeyHash.data(), toKeyHash.size());
+    rlpList->add_items()->set_number_u256(amount.data(), amount.size());
+    rlpList->add_items()->set_data(transaction.payload.data(), transaction.payload.size());
+
+    rlpList->add_items()->set_number_u256(v.data(), v.size());
+    rlpList->add_items()->set_number_u256(r.data(), r.size());
+    rlpList->add_items()->set_number_u256(s.data(), s.size());
+
+    return RLP::encode(input);
 }
 
-Data Signer::rlpNoHash(const Transaction& transaction, const bool include_vrs) const noexcept {
-    auto encoded = Data();
-    using RLP = TW::Ethereum::RLP;
-    append(encoded, RLP::encode(transaction.nonce));
-    append(encoded, RLP::encode(transaction.gasPrice));
-    append(encoded, RLP::encode(transaction.gasLimit));
-    append(encoded, RLP::encode(transaction.fromShardID));
-    append(encoded, RLP::encode(transaction.toShardID));
-    append(encoded, RLP::encode(transaction.to.getKeyHash()));
-    append(encoded, RLP::encode(transaction.amount));
-    append(encoded, RLP::encode(transaction.payload));
+template <typename Directive>
+Data Signer::rlpNoHash(const Staking<Directive>& transaction, const bool include_vrs) const noexcept {
+    Data v;
+    Data r;
+    Data s;
     if (include_vrs) {
-        append(encoded, RLP::encode(transaction.v));
-        append(encoded, RLP::encode(transaction.r));
-        append(encoded, RLP::encode(transaction.s));
+        v = store(transaction.v);
+        r = store(transaction.r);
+        s = store(transaction.s);
     } else {
-        append(encoded, RLP::encode(chainID));
-        append(encoded, RLP::encode(0));
-        append(encoded, RLP::encode(0));
+        v = store(chainID);
+        r = store(0);
+        s = store(0);
     }
-    return RLP::encodeList(encoded);
+
+    auto nonce = store(transaction.nonce);
+    auto gasPrice = store(transaction.gasPrice);
+    auto gasLimit = store(transaction.gasLimit);
+
+    EthereumRlp::Proto::EncodingInput input;
+    auto* rlpList = input.mutable_item()->mutable_list();
+
+    rlpList->add_items()->set_number_u64(transaction.directive);
+    *rlpList->add_items() = rlpNoHashDirective(transaction);
+
+    rlpList->add_items()->set_number_u256(nonce.data(), nonce.size());
+    rlpList->add_items()->set_number_u256(gasPrice.data(), gasPrice.size());
+    rlpList->add_items()->set_number_u256(gasLimit.data(), gasLimit.size());
+
+    rlpList->add_items()->set_number_u256(v.data(), v.size());
+    rlpList->add_items()->set_number_u256(r.data(), r.size());
+    rlpList->add_items()->set_number_u256(s.data(), s.size());
+
+    return RLP::encode(input);
 }
 
 template <typename Directive>
-Data Signer::rlpNoHash(const Staking<Directive>& transaction, const bool include_vrs) const
-    noexcept {
-    auto encoded = Data();
-    using RLP = TW::Ethereum::RLP;
+EthereumRlp::Proto::RlpItem Signer::rlpPrepareDescription(const Staking<Directive>& transaction) const noexcept {
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
 
-    append(encoded, RLP::encode(transaction.directive));
-    append(encoded, rlpNoHashDirective(transaction));
+    rlpList->add_items()->set_string_item(transaction.stakeMsg.description.name);
+    rlpList->add_items()->set_string_item(transaction.stakeMsg.description.identity);
+    rlpList->add_items()->set_string_item(transaction.stakeMsg.description.website);
+    rlpList->add_items()->set_string_item(transaction.stakeMsg.description.securityContact);
+    rlpList->add_items()->set_string_item(transaction.stakeMsg.description.details);
 
-    append(encoded, RLP::encode(transaction.nonce));
-    append(encoded, RLP::encode(transaction.gasPrice));
-    append(encoded, RLP::encode(transaction.gasLimit));
-    if (include_vrs) {
-        append(encoded, RLP::encode(transaction.v));
-        append(encoded, RLP::encode(transaction.r));
-        append(encoded, RLP::encode(transaction.s));
-    } else {
-        append(encoded, RLP::encode(chainID));
-        append(encoded, RLP::encode(0));
-        append(encoded, RLP::encode(0));
-    }
-    return RLP::encodeList(encoded);
+    return item;
 }
 
-Data Signer::rlpNoHashDirective(const Staking<CreateValidator>& transaction) const noexcept {
-    auto encoded = Data();
-    using RLP = TW::Ethereum::RLP;
+EthereumRlp::Proto::RlpItem Signer::rlpPrepareCommissionRates(const Staking<CreateValidator> &transaction) noexcept {
+    auto rateValue = store(transaction.stakeMsg.commissionRates.rate.value);
+    auto maxRateValue = store(transaction.stakeMsg.commissionRates.maxRate.value);
+    auto maxChangeRateValue = store(transaction.stakeMsg.commissionRates.maxChangeRate.value);
+
+    EthereumRlp::Proto::RlpItem item;
+    auto* commissionList = item.mutable_list();
 
-    append(encoded, RLP::encode(transaction.stakeMsg.validatorAddress.getKeyHash()));
+    // Append `commission::rate` properties list with a single item.
+    auto* rateList = commissionList->add_items()->mutable_list();
+    rateList->add_items()->set_number_u256(rateValue.data(), rateValue.size());
 
-    auto descriptionEncoded = Data();
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.name));
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.identity));
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.website));
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.securityContact));
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.details));
-    append(encoded, RLP::encodeList(descriptionEncoded));
+    // Append `commission::maxRate` properties list.
+    auto* maxRateList = commissionList->add_items()->mutable_list();
+    maxRateList->add_items()->set_number_u256(maxRateValue.data(), maxRateValue.size());
 
-    auto commissionEncoded = Data();
+    // Append `commission::maxChangeRate` properties list.
+    auto* maxChangeRateList = commissionList->add_items()->mutable_list();
+    maxChangeRateList->add_items()->set_number_u256(maxChangeRateValue.data(), maxChangeRateValue.size());
+
+    return item;
+}
 
-    auto rateEncoded = Data();
-    append(rateEncoded, RLP::encode(transaction.stakeMsg.commissionRates.rate.value));
-    append(commissionEncoded, RLP::encodeList(rateEncoded));
+EthereumRlp::Proto::RlpItem Signer::rlpNoHashDirective(const Staking<CreateValidator>& transaction) const noexcept {
+    auto validatorKeyHash = transaction.stakeMsg.validatorAddress.getKeyHash();
+    auto minSelfDelegation = store(transaction.stakeMsg.minSelfDelegation);
+    auto maxTotalDelegation = store(transaction.stakeMsg.maxTotalDelegation);
+    auto amount = store(transaction.stakeMsg.amount);
 
-    auto maxRateEncoded = Data();
-    append(maxRateEncoded, RLP::encode(transaction.stakeMsg.commissionRates.maxRate.value));
-    append(commissionEncoded, RLP::encodeList(maxRateEncoded));
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
 
-    auto maxChangeRateEncoded = Data();
-    append(maxChangeRateEncoded,
-           RLP::encode(transaction.stakeMsg.commissionRates.maxChangeRate.value));
-    append(commissionEncoded, RLP::encodeList(maxChangeRateEncoded));
+    rlpList->add_items()->set_data(validatorKeyHash.data(), validatorKeyHash.size());
+    *rlpList->add_items() = rlpPrepareDescription(transaction);
 
-    append(encoded, RLP::encodeList(commissionEncoded));
+    // Append `commission` properties list of `rate`, `maxRate`, `maxChangeRate` sublists.
+    *rlpList->add_items() = rlpPrepareCommissionRates(transaction);
 
-    append(encoded, RLP::encode(transaction.stakeMsg.minSelfDelegation));
-    append(encoded, RLP::encode(transaction.stakeMsg.maxTotalDelegation));
+    rlpList->add_items()->set_number_u256(minSelfDelegation.data(), minSelfDelegation.size());
+    rlpList->add_items()->set_number_u256(maxTotalDelegation.data(), maxTotalDelegation.size());
 
-    auto slotPubKeysEncoded = Data();
-    for (auto pk : transaction.stakeMsg.slotPubKeys) {
-        append(slotPubKeysEncoded, RLP::encode(pk));
+    // Append a list of slot public keys.
+    auto* slotPubkeysList = rlpList->add_items()->mutable_list();
+    for (const auto& pk : transaction.stakeMsg.slotPubKeys) {
+        slotPubkeysList->add_items()->set_data(pk.data(), pk.size());
     }
-    append(encoded, RLP::encodeList(slotPubKeysEncoded));
 
-    auto slotBlsSigsEncoded = Data();
-    for (auto sig : transaction.stakeMsg.slotKeySigs) {
-        append(slotBlsSigsEncoded, RLP::encode(sig));
+    // Append a list of slot key signatures.
+    auto* slotKeySigsList = rlpList->add_items()->mutable_list();
+    for (const auto& sign : transaction.stakeMsg.slotKeySigs) {
+        slotKeySigsList->add_items()->set_data(sign.data(), sign.size());
     }
-    append(encoded, RLP::encodeList(slotBlsSigsEncoded));
 
-    append(encoded, RLP::encode(transaction.stakeMsg.amount));
+    rlpList->add_items()->set_number_u256(amount.data(), amount.size());
 
-    return RLP::encodeList(encoded);
+    return item;
 }
 
-Data Signer::rlpNoHashDirective(const Staking<EditValidator>& transaction) const noexcept {
-    auto encoded = Data();
-    using RLP = TW::Ethereum::RLP;
+EthereumRlp::Proto::RlpItem Signer::rlpNoHashDirective(const Staking<EditValidator>& transaction) const noexcept {
+    auto validatorKeyHash = transaction.stakeMsg.validatorAddress.getKeyHash();
+    auto minSelfDelegation = store(transaction.stakeMsg.minSelfDelegation);
+    auto maxTotalDelegation = store(transaction.stakeMsg.maxTotalDelegation);
+    auto active = store(transaction.stakeMsg.active);
 
-    append(encoded, RLP::encode(transaction.stakeMsg.validatorAddress.getKeyHash()));
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
 
-    auto descriptionEncoded = Data();
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.name));
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.identity));
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.website));
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.securityContact));
-    append(descriptionEncoded, RLP::encode(transaction.stakeMsg.description.details));
-    append(encoded, RLP::encodeList(descriptionEncoded));
+    rlpList->add_items()->set_data(validatorKeyHash.data(), validatorKeyHash.size());
+    *rlpList->add_items() = rlpPrepareDescription(transaction);
 
-    auto decEncoded = Data();
+    auto* commissionRateList = rlpList->add_items()->mutable_list();
     if (transaction.stakeMsg.commissionRate.has_value()) {
         // Note: std::optional.value() is not available in XCode with target < iOS 12; using '*'
-        append(decEncoded, RLP::encode((*transaction.stakeMsg.commissionRate).value));
+        auto commissionRateValue = store((*transaction.stakeMsg.commissionRate).value);
+        commissionRateList->add_items()->set_number_u256(commissionRateValue.data(), commissionRateValue.size());
     }
-    append(encoded, RLP::encodeList(decEncoded));
 
-    append(encoded, RLP::encode(transaction.stakeMsg.minSelfDelegation));
-    append(encoded, RLP::encode(transaction.stakeMsg.maxTotalDelegation));
+    rlpList->add_items()->set_number_u256(minSelfDelegation.data(), minSelfDelegation.size());
+    rlpList->add_items()->set_number_u256(maxTotalDelegation.data(), maxTotalDelegation.size());
 
-    append(encoded, RLP::encode(transaction.stakeMsg.slotKeyToRemove));
-    append(encoded, RLP::encode(transaction.stakeMsg.slotKeyToAdd));
-    append(encoded, RLP::encode(transaction.stakeMsg.slotKeyToAddSig));
+    rlpList->add_items()->set_data(transaction.stakeMsg.slotKeyToRemove.data(), transaction.stakeMsg.slotKeyToRemove.size());
+    rlpList->add_items()->set_data(transaction.stakeMsg.slotKeyToAdd.data(), transaction.stakeMsg.slotKeyToAdd.size());
+    rlpList->add_items()->set_data(transaction.stakeMsg.slotKeyToAddSig.data(), transaction.stakeMsg.slotKeyToAddSig.size());
 
-    append(encoded, RLP::encode(transaction.stakeMsg.active));
+    rlpList->add_items()->set_number_u256(active.data(), active.size());
 
-    return RLP::encodeList(encoded);
+    return item;
 }
 
-Data Signer::rlpNoHashDirective(const Staking<Delegate>& transaction) const noexcept {
-    auto encoded = Data();
-    using RLP = TW::Ethereum::RLP;
-    append(encoded, RLP::encode(transaction.stakeMsg.delegatorAddress.getKeyHash()));
-    append(encoded, RLP::encode(transaction.stakeMsg.validatorAddress.getKeyHash()));
-    append(encoded, RLP::encode(transaction.stakeMsg.amount));
-    return RLP::encodeList(encoded);
+EthereumRlp::Proto::RlpItem Signer::rlpNoHashDirective(const Staking<Delegate>& transaction) const noexcept {
+    auto delegatorKeyHash = transaction.stakeMsg.delegatorAddress.getKeyHash();
+    auto validatorKeyHash = transaction.stakeMsg.validatorAddress.getKeyHash();
+    auto amount = store(transaction.stakeMsg.amount);
+
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
+    rlpList->add_items()->set_data(delegatorKeyHash.data(), delegatorKeyHash.size());
+    rlpList->add_items()->set_data(validatorKeyHash.data(), validatorKeyHash.size());
+    rlpList->add_items()->set_number_u256(amount.data(), amount.size());
+
+    return item;
 }
 
-Data Signer::rlpNoHashDirective(const Staking<Undelegate>& transaction) const noexcept {
-    auto encoded = Data();
-    using RLP = TW::Ethereum::RLP;
-    append(encoded, RLP::encode(transaction.stakeMsg.delegatorAddress.getKeyHash()));
-    append(encoded, RLP::encode(transaction.stakeMsg.validatorAddress.getKeyHash()));
-    append(encoded, RLP::encode(transaction.stakeMsg.amount));
-    return RLP::encodeList(encoded);
+EthereumRlp::Proto::RlpItem Signer::rlpNoHashDirective(const Staking<Undelegate>& transaction) const noexcept {
+    auto delegatorKeyHash = transaction.stakeMsg.delegatorAddress.getKeyHash();
+    auto validatorKeyHash = transaction.stakeMsg.validatorAddress.getKeyHash();
+    auto amount = store(transaction.stakeMsg.amount);
+
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
+    rlpList->add_items()->set_data(delegatorKeyHash.data(), delegatorKeyHash.size());
+    rlpList->add_items()->set_data(validatorKeyHash.data(), validatorKeyHash.size());
+    rlpList->add_items()->set_number_u256(amount.data(), amount.size());
+
+    return item;
 }
 
-Data Signer::rlpNoHashDirective(const Staking<CollectRewards>& transaction) const noexcept {
-    auto encoded = Data();
-    using RLP = TW::Ethereum::RLP;
-    append(encoded, RLP::encode(transaction.stakeMsg.delegatorAddress.getKeyHash()));
-    return RLP::encodeList(encoded);
+EthereumRlp::Proto::RlpItem Signer::rlpNoHashDirective(const Staking<CollectRewards>& transaction) const noexcept {
+    auto delegatorKeyHash = transaction.stakeMsg.delegatorAddress.getKeyHash();
+
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
+    rlpList->add_items()->set_data(delegatorKeyHash.data(), delegatorKeyHash.size());
+
+    return item;
 }
 
 std::string Signer::txnAsRLPHex(Transaction& transaction) const noexcept {
@@ -508,4 +536,121 @@ Data Signer::hash(const Staking<Directive>& transaction) const noexcept {
     return Hash::keccak256(rlpNoHash<Directive>(transaction, false));
 }
 
+Data Signer::buildUnsignedTxBytes(const Proto::SigningInput &input) {
+    if (input.has_transaction_message()) {
+        Transaction transaction = Signer::buildUnsignedTransaction(input);
+        return rlpNoHash(transaction, false);
+    }
+
+    if (input.has_staking_message()) {
+        auto stakingMessage = input.staking_message();
+
+        if (stakingMessage.has_create_validator_message()) {
+            auto tx = Signer::buildUnsignedStakingTransaction<CreateValidator>(input, &Signer::buildUnsignedCreateValidator);
+            return rlpNoHash<CreateValidator>(tx, false);
+        }
+        if (stakingMessage.has_edit_validator_message()) {
+            auto tx = Signer::buildUnsignedStakingTransaction<EditValidator>(input, &Signer::buildUnsignedEditValidator);
+            return rlpNoHash<EditValidator>(tx, false);
+        }
+        if (stakingMessage.has_delegate_message()) {
+            auto tx = Signer::buildUnsignedStakingTransaction<Delegate>(input, &Signer::buildUnsignedDelegate);
+            return rlpNoHash<Delegate>(tx, false);
+        }
+        if (stakingMessage.has_undelegate_message()) {
+            auto tx = Signer::buildUnsignedStakingTransaction<Undelegate>(input, &Signer::buildUnsignedUndelegate);
+            return rlpNoHash<Undelegate>(tx, false);
+        }
+        if (stakingMessage.has_collect_rewards()) {
+            auto tx = Signer::buildUnsignedStakingTransaction<CollectRewards>(input, &Signer::buildUnsignedCollectRewards);
+            return rlpNoHash<CollectRewards>(tx, false);
+        }
+    }
+
+    throw std::invalid_argument("Invalid message");
+}
+
+Proto::SigningOutput Signer::buildSigningOutput(const Proto::SigningInput &input, const Data &signature) {
+    if (input.has_transaction_message()) {
+        Transaction transaction = Signer::buildUnsignedTransaction(input);
+
+        auto tuple = values(chainID, signature);
+        transaction.r = std::get<0>(tuple);
+        transaction.s = std::get<1>(tuple);
+        transaction.v = std::get<2>(tuple);
+
+        auto encoded = rlpNoHash(transaction, true);
+        return prepareOutput<Transaction>(encoded, transaction);
+    }
+
+    if (input.has_staking_message()) {
+        auto stakingMessage = input.staking_message();
+
+        if (stakingMessage.has_create_validator_message()) {
+            return buildStakingSigningOutput<CreateValidator>(input, signature, &Signer::buildUnsignedCreateValidator);
+        }
+        if (stakingMessage.has_edit_validator_message()) {
+            return buildStakingSigningOutput<EditValidator>(input, signature, &Signer::buildUnsignedEditValidator);
+
+        }
+        if (stakingMessage.has_delegate_message()) {
+            return buildStakingSigningOutput<Delegate>(input, signature, &Signer::buildUnsignedDelegate);
+
+        }
+        if (stakingMessage.has_undelegate_message()) {
+            return buildStakingSigningOutput<Undelegate>(input, signature, &Signer::buildUnsignedUndelegate);
+        }
+        if (stakingMessage.has_collect_rewards()) {
+            return buildStakingSigningOutput<CollectRewards>(input, signature, &Signer::buildUnsignedCollectRewards);
+        }
+    }
+
+    throw std::invalid_argument("Invalid message");
+}
+
+Transaction Signer::buildUnsignedTransaction(const Proto::SigningInput &input) {
+    if (input.message_oneof_case() != Proto::SigningInput::kTransactionMessage) {
+        throw std::invalid_argument("Invalid message");
+    }
+
+    auto transactionMessage = input.transaction_message();
+
+    Transaction transaction;
+
+    Address toAddr;
+    if (!Address::decode(transactionMessage.to_address(), transaction.to)) {
+        throw std::invalid_argument("Invalid address");
+    }
+
+    transaction.nonce = load(transactionMessage.nonce());
+    transaction.gasPrice = load(transactionMessage.gas_price());
+    transaction.gasLimit = load(transactionMessage.gas_limit());
+    transaction.amount = load(transactionMessage.amount());
+    transaction.fromShardID = load(transactionMessage.from_shard_id());
+    transaction.toShardID = load(transactionMessage.to_shard_id());
+    transaction.payload = Data(transactionMessage.payload().begin(), transactionMessage.payload().end());
+    return transaction;
+}
+
+template <typename T>
+Staking<T> Signer::buildUnsignedStakingTransaction(const Proto::SigningInput &input, function<T(const Proto::SigningInput &input)> func) {
+    auto tx = func(input);
+    return Staking<T>(
+        getEnum<T>(), tx, load(input.staking_message().nonce()),
+        load(input.staking_message().gas_price()), load(input.staking_message().gas_limit()),
+        load(input.chain_id()), 0, 0);
+}
+
+template <typename T>
+Proto::SigningOutput Signer::buildStakingSigningOutput(const Proto::SigningInput &input, const Data &signature, function<T(const Proto::SigningInput &input)> func) {
+    auto tx = Signer::buildUnsignedStakingTransaction<T>(input, func);
+    auto tuple = values(chainID, signature);
+
+    tx.r = std::get<0>(tuple);
+    tx.s = std::get<1>(tuple);
+    tx.v = std::get<2>(tuple);
+    auto encoded =  rlpNoHash<T>(tx, true);
+    return prepareOutput<Staking<T>>(encoded, tx);
+}
+
 } // namespace TW::Harmony
diff --git a/src/Harmony/Signer.h b/src/Harmony/Signer.h
index dc0cac9ada9..5eea695bea4 100644
--- a/src/Harmony/Signer.h
+++ b/src/Harmony/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,8 +10,8 @@
 #include "../Hash.h"
 #include "../PrivateKey.h"
 #include "../proto/Harmony.pb.h"
+#include "../proto/EthereumRlp.pb.h"
 
-#include <boost/multiprecision/cpp_int.hpp>
 #include <cstdint>
 #include <tuple>
 #include <vector>
@@ -30,22 +28,26 @@ class Signer {
 
   private:
     static Proto::SigningOutput
-    signTransaction(const Proto::SigningInput &input) noexcept;
+    signTransaction(const Proto::SigningInput &input);
 
-    static Proto::SigningOutput
-    signCreateValidator(const Proto::SigningInput &input) noexcept;
-
-    static Proto::SigningOutput
-    signEditValidator(const Proto::SigningInput &input) noexcept;
+    template <typename T>
+    static Proto::SigningOutput signStaking(const Proto::SigningInput &input, function<T(const Proto::SigningInput &input)> func);
 
-    static Proto::SigningOutput
-    signDelegate(const Proto::SigningInput &input) noexcept;
+    template <typename T>
+    static uint8_t getEnum() noexcept;
 
-    static Proto::SigningOutput
-    signUndelegate(const Proto::SigningInput &input) noexcept;
+    template <typename T>
+    static Staking<T> buildUnsignedStakingTransaction(const Proto::SigningInput &input, function<T(const Proto::SigningInput &input)> func);
+    
+    template <typename T>
+    Proto::SigningOutput buildStakingSigningOutput(const Proto::SigningInput &input, const Data &signature, function<T(const Proto::SigningInput &input)> func);
 
-    static Proto::SigningOutput
-    signCollectRewards(const Proto::SigningInput &input) noexcept;
+    static Transaction buildUnsignedTransaction(const Proto::SigningInput &input);
+    static CreateValidator buildUnsignedCreateValidator(const Proto::SigningInput &input);
+    static EditValidator buildUnsignedEditValidator(const Proto::SigningInput &input);
+    static Delegate buildUnsignedDelegate(const Proto::SigningInput &input);
+    static Undelegate buildUnsignedUndelegate(const Proto::SigningInput &input);
+    static CollectRewards buildUnsignedCollectRewards(const Proto::SigningInput &input);
 
   public:
     uint256_t chainID;
@@ -54,29 +56,37 @@ class Signer {
     explicit Signer(uint256_t chainID) : chainID(std::move(chainID)) {}
 
     template <typename T>
-    static Proto::SigningOutput prepareOutput(const Data& encoded, const T &transaction) noexcept;
+    static Proto::SigningOutput prepareOutput(const Data &encoded, const T &transaction) noexcept;
 
     /// Signs the given transaction.
     template <typename T>
-    void sign(const PrivateKey &privateKey, const Data& hash, T &transaction) const noexcept;
+    void sign(const PrivateKey &privateKey, const Data &hash, T &transaction) noexcept {
+        auto tuple = sign(chainID, privateKey, hash);
+        transaction.r = std::get<0>(tuple);
+        transaction.s = std::get<1>(tuple);
+        transaction.v = std::get<2>(tuple);
+    }
 
     /// Signs a hash with the given private key for the given chain identifier.
     ///
     /// \returns the r, s, and v values of the transaction signature
     static std::tuple<uint256_t, uint256_t, uint256_t>
-    sign(const uint256_t &chainID, const PrivateKey &privateKey, const Data& hash) noexcept;
+    sign(const uint256_t &chainID, const PrivateKey &privateKey, const Data &hash) noexcept;
 
     /// R, S, and V values for the given chain identifier and signature.
     ///
     /// \returns the r, s, and v values of the transaction signature
     static std::tuple<uint256_t, uint256_t, uint256_t> values(const uint256_t &chainID,
-                                                              const Data& signature) noexcept;
+                                                              const Data &signature) noexcept;
 
     std::string txnAsRLPHex(Transaction &transaction) const noexcept;
 
     template <typename Directive>
     std::string txnAsRLPHex(Staking<Directive> &transaction) const noexcept;
 
+    Data buildUnsignedTxBytes(const Proto::SigningInput &input);
+    Proto::SigningOutput buildSigningOutput(const Proto::SigningInput &input, const Data &signature);
+
   protected:
     /// Computes the transaction hash.
     Data hash(const Transaction &transaction) const noexcept;
@@ -89,11 +99,16 @@ class Signer {
     template <typename Directive>
     Data rlpNoHash(const Staking<Directive> &transaction, const bool) const noexcept;
 
-    Data rlpNoHashDirective(const Staking<CreateValidator> &transaction) const noexcept;
-    Data rlpNoHashDirective(const Staking<EditValidator> &transaction) const noexcept;
-    Data rlpNoHashDirective(const Staking<Delegate> &transaction) const noexcept;
-    Data rlpNoHashDirective(const Staking<Undelegate> &transaction) const noexcept;
-    Data rlpNoHashDirective(const Staking<CollectRewards> &transaction) const noexcept;
+    EthereumRlp::Proto::RlpItem rlpNoHashDirective(const Staking<CreateValidator> &transaction) const noexcept;
+    EthereumRlp::Proto::RlpItem rlpNoHashDirective(const Staking<EditValidator> &transaction) const noexcept;
+    EthereumRlp::Proto::RlpItem rlpNoHashDirective(const Staking<Delegate> &transaction) const noexcept;
+    EthereumRlp::Proto::RlpItem rlpNoHashDirective(const Staking<Undelegate> &transaction) const noexcept;
+    EthereumRlp::Proto::RlpItem rlpNoHashDirective(const Staking<CollectRewards> &transaction) const noexcept;
+
+    template <typename Directive>
+    EthereumRlp::Proto::RlpItem rlpPrepareDescription(const Staking<Directive>& transaction) const noexcept;
+
+    static EthereumRlp::Proto::RlpItem rlpPrepareCommissionRates(const Staking<CreateValidator> &transaction) noexcept;
 };
 
 } // namespace TW::Harmony
diff --git a/src/Harmony/Staking.cpp b/src/Harmony/Staking.cpp
index 7e99697541b..7632dd9561b 100644
--- a/src/Harmony/Staking.cpp
+++ b/src/Harmony/Staking.cpp
@@ -1,5 +1,3 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
diff --git a/src/Harmony/Staking.h b/src/Harmony/Staking.h
index bf08cb0d199..eff3ba8b37f 100644
--- a/src/Harmony/Staking.h
+++ b/src/Harmony/Staking.h
@@ -1,12 +1,9 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include <boost/algorithm/string.hpp>
 #include <cstdint>
 #include <math.h>
 #include <stdint.h>
diff --git a/src/Harmony/Transaction.h b/src/Harmony/Transaction.h
index ac43aa253f0..fc4a33e5158 100644
--- a/src/Harmony/Transaction.h
+++ b/src/Harmony/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -31,6 +29,8 @@ class Transaction {
     uint256_t r = uint256_t();
     uint256_t s = uint256_t();
 
+    Transaction() = default;
+
     Transaction(uint256_t nonce, uint256_t gasPrice, uint256_t gasLimit, uint256_t fromShardID,
                 uint256_t toShardID, Address to, uint256_t amount, const Data& payload)
         : nonce(std::move(nonce))
diff --git a/src/Hash.cpp b/src/Hash.cpp
index aaf4c5c1339..80a2a7d2b6a 100644
--- a/src/Hash.cpp
+++ b/src/Hash.cpp
@@ -1,129 +1,125 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Hash.h"
-#include "BinaryCoding.h"
-
-#include <TrezorCrypto/blake256.h>
-#include <TrezorCrypto/blake2b.h>
-#include <TrezorCrypto/groestl.h>
-#include <TrezorCrypto/ripemd160.h>
-#include <TrezorCrypto/sha2.h>
-#include <TrezorCrypto/sha3.h>
-#include <TrezorCrypto/hmac.h>
 
+#include "rust/bindgen/WalletCoreRSBindgen.h"
+#include "rust/Wrapper.h"
 #include <string>
 
 using namespace TW;
 
 TW::Hash::HasherSimpleType Hash::functionPointerFromEnum(TW::Hash::Hasher hasher) {
     switch (hasher) {
-        case Hash::HasherSha1: return Hash::sha1;
-        default: case Hash::HasherSha256: return Hash::sha256;
-        case Hash::HasherSha512: return Hash::sha512;
-        case Hash::HasherSha512_256: return Hash::sha512_256;
-        case Hash::HasherKeccak256: return Hash::keccak256;
-        case Hash::HasherKeccak512: return Hash::keccak512;
-        case Hash::HasherSha3_256: return Hash::sha3_256;
-        case Hash::HasherSha3_512: return Hash::sha3_512;
-        case Hash::HasherRipemd: return Hash::ripemd;
-        case Hash::HasherBlake256: return Hash::blake256;
-        case Hash::HasherGroestl512: return Hash::groestl512;
-        case Hash::HasherSha256d: return Hash::sha256d;
-        case Hash::HasherSha256ripemd: return Hash::sha256ripemd;
-        case Hash::HasherSha3_256ripemd: return Hash::sha3_256ripemd;
-        case Hash::HasherBlake256d: return Hash::blake256d;
-        case Hash::HasherBlake256ripemd: return Hash::blake256ripemd;
-        case Hash::HasherGroestl512d: return Hash::groestl512d;
+    case Hash::HasherSha1:
+        return Hash::sha1;
+    case Hash::HasherSha256:
+        return Hash::sha256;
+    case Hash::HasherSha512:
+        return Hash::sha512;
+    case Hash::HasherSha512_256:
+        return Hash::sha512_256;
+    case Hash::HasherKeccak256:
+        return Hash::keccak256;
+    case Hash::HasherKeccak512:
+        return Hash::keccak512;
+    case Hash::HasherSha3_256:
+        return Hash::sha3_256;
+    case Hash::HasherSha3_512:
+        return Hash::sha3_512;
+    case Hash::HasherRipemd:
+        return Hash::ripemd;
+    case Hash::HasherBlake256:
+        return Hash::blake256;
+    case Hash::HasherGroestl512:
+        return Hash::groestl512;
+    case Hash::HasherSha256d:
+        return Hash::sha256d;
+    case Hash::HasherSha256ripemd:
+        return Hash::sha256ripemd;
+    case Hash::HasherSha3_256ripemd:
+        return Hash::sha3_256ripemd;
+    case Hash::HasherBlake2b:
+        return Hash::blake2b;
+    case Hash::HasherBlake256d:
+        return Hash::blake256d;
+    case Hash::HasherBlake256ripemd:
+        return Hash::blake256ripemd;
+    case Hash::HasherGroestl512d:
+        return Hash::groestl512d;
     }
 }
 
 Data Hash::sha1(const byte* data, size_t size) {
-    Data result(sha1Size);
-    sha1_Raw(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::sha1(data, size)).data;
 }
 
 Data Hash::sha256(const byte* data, size_t size) {
-    Data result(sha256Size);
-    sha256_Raw(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::sha256(data, size)).data;
 }
 
 Data Hash::sha512(const byte* data, size_t size) {
-    Data result(sha512Size);
-    sha512_Raw(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::sha512(data, size)).data;
 }
 
 Data Hash::sha512_256(const byte* data, size_t size) {
-    Data result(sha256Size);
-    sha512_256_Raw(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::sha512_256(data, size)).data;
 }
 
 Data Hash::keccak256(const byte* data, size_t size) {
-    Data result(sha256Size);
-    keccak_256(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::keccak256(data, size)).data;
 }
 
 Data Hash::keccak512(const byte* data, size_t size) {
-    Data result(sha512Size);
-    keccak_512(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::keccak512(data, size)).data;
 }
 
 Data Hash::sha3_256(const byte* data, size_t size) {
-    Data result(sha256Size);
-    ::sha3_256(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::sha3__256(data, size)).data;
 }
 
 Data Hash::sha3_512(const byte* data, size_t size) {
-    Data result(sha512Size);
-    ::sha3_512(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::sha3__512(data, size)).data;
 }
 
 Data Hash::ripemd(const byte* data, size_t size) {
-    Data result(ripemdSize);
-    ::ripemd160(data, static_cast<uint32_t>(size), result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::ripemd_160(data, size)).data;
 }
 
 Data Hash::blake256(const byte* data, size_t size) {
-    Data result(sha256Size);
-    ::blake256(data, size, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::blake_256(data, size)).data;
+}
+
+Data Hash::blake2b(const byte* data, size_t dataSize) {
+    Rust::CByteArrayResultWrapper res = Rust::blake2_b(data, dataSize, 32);
+    if (res.isErr()) {
+        throw std::runtime_error("Error 'blake2_b' hashing");
+    }
+    return res.unwrap().data;
 }
 
 Data Hash::blake2b(const byte* data, size_t dataSize, size_t hashSize) {
-    Data result(hashSize);
-    ::blake2b(data, static_cast<uint32_t>(dataSize), result.data(), hashSize);
-    return result;
+    Rust::CByteArrayResultWrapper res = Rust::blake2_b(data, dataSize, hashSize);
+    if (res.isErr()) {
+        throw std::runtime_error("Error 'blake2_b' hashing");
+    }
+    return res.unwrap().data;
 }
 
 Data Hash::blake2b(const byte* data, size_t dataSize, size_t hashSize, const Data& personal) {
-    Data result(hashSize);
-    ::blake2b_Personal(data, static_cast<uint32_t>(dataSize), personal.data(), personal.size(), result.data(), hashSize);
-    return result;
+    Rust::CByteArrayResultWrapper res = Rust::blake2_b_personal(data, dataSize, hashSize, personal.data(), personal.size());
+    if (res.isErr()) {
+        throw std::runtime_error("Error 'blake2_b_personal' hashing");
+    }
+    return res.unwrap().data;
 }
 
 Data Hash::groestl512(const byte* data, size_t size) {
-    GROESTL512_CTX ctx;
-    Data result(sha512Size);
-    groestl512_Init(&ctx);
-    groestl512_Update(&ctx, data, size);
-    groestl512_Final(&ctx, result.data());
-    return result;
+    return Rust::CByteArrayWrapper(Rust::groestl_512(data, size)).data;
 }
 
 Data Hash::hmac256(const Data& key, const Data& message) {
-    Data hmac(SHA256_DIGEST_LENGTH);
-    hmac_sha256(key.data(), static_cast<uint32_t>(key.size()), message.data(), static_cast<uint32_t>(message.size()), hmac.data());
-    return hmac;
+    Rust::CByteArrayWrapper res = Rust::hmac__sha256(key.data(), key.size(), message.data(), message.size());
+    return res.data;
 }
diff --git a/src/Hash.h b/src/Hash.h
index 7d16544976e..bcc46a756bf 100644
--- a/src/Hash.h
+++ b/src/Hash.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -23,6 +21,7 @@ enum Hasher {
     HasherSha3_256, // version 3 SHA256
     HasherSha3_512, // version 3 SHA512
     HasherRipemd, // RIPEMD160
+    HasherBlake2b, // Blake2b
     HasherBlake256, // Blake256
     HasherGroestl512, // Groestl 512
     HasherSha256d, // SHA256 hash of the SHA256 hash
@@ -82,6 +81,9 @@ Data ripemd(const byte* data, size_t size);
 /// Computes the Blake256 hash.
 Data blake256(const byte* data, size_t size);
 
+/// Computes the Blake2b hash with default size (32).
+Data blake2b(const byte* data, size_t dataSize);
+
 /// Computes the Blake2b hash.
 Data blake2b(const byte* data, size_t dataSize, size_t hashSize);
 
diff --git a/src/Hedera/Address.cpp b/src/Hedera/Address.cpp
new file mode 100644
index 00000000000..cb05e2d212f
--- /dev/null
+++ b/src/Hedera/Address.cpp
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Address.h"
+#include "HexCoding.h"
+#include "DER.h"
+#include "algorithm/string.hpp"
+
+#include <charconv>
+#include <regex>
+
+namespace TW::Hedera::internal {
+    static const std::regex gEntityIDRegex{"(0|[1-9]\\d*)\\.(0|[1-9]\\d*)\\.(0|[1-9]\\d*)(?:-([a-z]{5}))?$"};
+}
+
+namespace TW::Hedera {
+
+
+Alias::Alias(std::optional<PublicKey> alias) noexcept : mPubKey(std::move(alias)) {
+
+}
+
+std::string Alias::string() const noexcept {
+    std::string pubkeyBytes = "";
+    if (mPubKey.has_value()) {
+        pubkeyBytes = hex(mPubKey.value().bytes);
+    }
+    return gHederaDerPrefixPublic + pubkeyBytes;
+}
+
+bool Address::isValid(const std::string& string) {
+    using namespace internal;
+    std::smatch match;
+    auto isValid = std::regex_match(string, match, gEntityIDRegex);
+    if (!isValid) {
+        auto parts = TW::ssplit(string, '.');
+        if (parts.size() != 3) {
+            return false;
+        }
+        auto isNumberFunctor = [](std::string_view input) {
+            return input.find_first_not_of("0123456789") == std::string::npos;
+        };
+        if (!isNumberFunctor(parts[0]) || !isNumberFunctor(parts[1])) {
+            return false;
+        }
+        isValid = hasDerPrefix(parts[2]);
+    }
+    return isValid;
+}
+
+Address::Address(const std::string& string) {
+    if (!isValid(string)) {
+        throw std::invalid_argument("Invalid address string");
+    }
+
+    auto toInt = [](std::string_view s) -> std::optional<std::size_t> {
+        if (std::size_t value = 0; std::from_chars(s.begin(), s.end(), value).ec == std::errc{}) {
+            return value;
+        } else {
+            return std::nullopt;
+        }
+    };
+
+    // When creating an Address by string - we assume to only sent to 0.0.1 format, alias is internal.
+    auto parts = TW::ssplit(string, '.');
+    mShard = *toInt(parts[0]);
+    mRealm = *toInt(parts[1]);
+    mNum = *toInt(parts[2]);
+}
+
+Address::Address(const PublicKey& publicKey)
+    : Address(0, 0, 0, publicKey) {
+}
+
+std::string Address::string() const {
+    std::string out = std::to_string(mShard) + "." + std::to_string(mRealm) + ".";
+    if (mAlias.mPubKey.has_value()) {
+        return out + mAlias.string();
+    }
+    return out + std::to_string(mNum);
+}
+
+Address::Address(std::size_t shard, std::size_t realm, std::size_t num, std::optional<PublicKey> alias)
+    : mShard(shard), mRealm(realm), mNum(num), mAlias(std::move(alias)) {
+}
+
+} // namespace TW::Hedera
diff --git a/src/Hedera/Address.h b/src/Hedera/Address.h
new file mode 100644
index 00000000000..076cbeb47f3
--- /dev/null
+++ b/src/Hedera/Address.h
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "PublicKey.h"
+
+#include <optional>
+#include <string>
+
+namespace TW::Hedera {
+
+struct Alias {
+    explicit Alias(std::optional<PublicKey> alias = std::nullopt) noexcept;
+    std::string string() const noexcept;
+    std::optional<PublicKey> mPubKey{std::nullopt};
+};
+
+class Address {
+public:
+    /// Determines whether a string makes a valid address.
+    static bool isValid(const std::string& string);
+
+    /// Initializes a Hedera address with a string representation.
+    explicit Address(const std::string& string);
+
+    /// Initializes a Hedera address with a public key.
+    explicit Address(const PublicKey& publicKey);
+
+    /// Initializes a Hedera address with a shard, realm, num and optional alias
+    explicit Address(std::size_t shard, std::size_t realm, std::size_t num, std::optional<PublicKey> alias = std::nullopt);
+
+    /// Returns a string representation of the address.
+    std::string string() const;
+
+    std::size_t shard() const { return mShard; }
+    std::size_t realm() const { return mRealm; }
+    std::size_t num() const { return mNum; }
+    const Alias& alias() const {return mAlias;}
+
+private:
+    std::size_t mShard{0};
+    std::size_t mRealm{0};
+    std::size_t mNum;
+    Alias mAlias;
+};
+
+} // namespace TW::Hedera
diff --git a/src/Hedera/DER.cpp b/src/Hedera/DER.cpp
new file mode 100644
index 00000000000..6f72051fd01
--- /dev/null
+++ b/src/Hedera/DER.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "DER.h"
+#include "PublicKey.h"
+#include "HexCoding.h"
+
+namespace TW::Hedera {
+
+bool hasDerPrefix(const std::string& input) noexcept {
+    if (std::size_t pos = input.find(gHederaDerPrefixPublic); pos != std::string::npos) {
+        return PublicKey::isValid(parse_hex(input.substr(pos + std::string(gHederaDerPrefixPublic).size())), TWPublicKeyTypeED25519);
+    }
+    return false;
+}
+
+} // namespace TW::Hedera
diff --git a/src/Hedera/DER.h b/src/Hedera/DER.h
new file mode 100644
index 00000000000..8918fceae4a
--- /dev/null
+++ b/src/Hedera/DER.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <string>
+
+namespace TW::Hedera {
+    // Hedera DER prefix: https://github.com/hashgraph/hedera-sdk-js/blob/e0cd39c84ab189d59a6bcedcf16e4102d7bb8beb/packages/cryptography/src/Ed25519PrivateKey.js#L8
+    inline constexpr const char* const gHederaDerPrefixPrivate = "302e020100300506032b657004220420";
+    // Hedera DER prefix: https://github.com/hashgraph/hedera-sdk-js/blob/e0cd39c84ab189d59a6bcedcf16e4102d7bb8beb/packages/cryptography/src/Ed25519PublicKey.js#L7
+    inline constexpr const char* const gHederaDerPrefixPublic = "302a300506032b6570032100";
+
+    bool hasDerPrefix(const std::string& input) noexcept;
+}
diff --git a/src/Hedera/Entry.cpp b/src/Hedera/Entry.cpp
new file mode 100644
index 00000000000..b939e0d170d
--- /dev/null
+++ b/src/Hedera/Entry.cpp
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Entry.h"
+
+#include "Address.h"
+#include "Signer.h"
+
+namespace TW::Hedera {
+
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Address::isValid(address);
+}
+
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Address(publicKey).string();
+}
+
+void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
+    signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
+}
+
+} // namespace TW::Hedera
diff --git a/src/Hedera/Entry.h b/src/Hedera/Entry.h
new file mode 100644
index 00000000000..e9632c3a308
--- /dev/null
+++ b/src/Hedera/Entry.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../CoinEntry.h"
+
+namespace TW::Hedera {
+
+/// Entry point for implementation of Hedera coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final : public CoinEntry {
+public:
+    virtual bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    virtual std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    virtual void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+};
+
+} // namespace TW::Hedera
diff --git a/src/Cosmos/Protobuf/.gitignore b/src/Hedera/Protobuf/.gitignore
similarity index 100%
rename from src/Cosmos/Protobuf/.gitignore
rename to src/Hedera/Protobuf/.gitignore
diff --git a/src/Hedera/Protobuf/basic_types.proto b/src/Hedera/Protobuf/basic_types.proto
new file mode 100644
index 00000000000..40bb309ce34
--- /dev/null
+++ b/src/Hedera/Protobuf/basic_types.proto
@@ -0,0 +1,1596 @@
+// Taken from https://github.com/hashgraph/hedera-protobufs/tree/main/services
+
+syntax = "proto3";
+
+package proto;
+
+/*-
+ * ‌
+ * Hedera Network Services Protobuf
+ * ​
+ * Copyright (C) 2018 - 2022 Hedera Hashgraph, LLC
+ * ​
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ‍
+ */
+
+import "timestamp.proto";
+import "google/protobuf/wrappers.proto";
+
+option java_package = "com.hederahashgraph.api.proto.java";
+option java_multiple_files = true;
+
+/**
+ * Each shard has a nonnegative shard number. Each realm within a given shard has a nonnegative
+ * realm number (that number might be reused in other shards). And each account, file, and smart
+ * contract instance within a given realm has a nonnegative number (which might be reused in other
+ * realms).  Every account, file, and smart contract instance is within exactly one realm. So a
+ * FileID is a triplet of numbers, like 0.1.2 for entity number 2 within realm 1  within shard 0.
+ * Each realm maintains a single counter for assigning numbers,  so if there is a file with ID
+ * 0.1.2, then there won't be an account or smart  contract instance with ID 0.1.2.
+ *
+ * Everything is partitioned into realms so that each Solidity smart contract can  access everything
+ * in just a single realm, locking all those entities while it's  running, but other smart contracts
+ * could potentially run in other realms in  parallel. So realms allow Solidity to be parallelized
+ * somewhat, even though the  language itself assumes everything is serial.
+ */
+message ShardID {
+  /**
+   * the shard number (nonnegative)
+   */
+  int64 shardNum = 1;
+}
+
+/**
+ * The ID for a realm. Within a given shard, every realm has a unique ID. Each account, file, and
+ * contract instance belongs to exactly one realm.
+ */
+message RealmID {
+  /**
+   * The shard number (nonnegative)
+   */
+  int64 shardNum = 1;
+
+  /**
+   * The realm number (nonnegative)
+   */
+  int64 realmNum = 2;
+}
+
+/**
+ * The ID for an a cryptocurrency account
+ */
+message AccountID {
+  /**
+   * The shard number (nonnegative)
+   */
+  int64 shardNum = 1;
+
+  /**
+   * The realm number (nonnegative)
+   */
+  int64 realmNum = 2;
+
+  /**
+   * The account number unique within its realm which can be either a non-negative integer or an alias public key.
+   * For any AccountID fields in the query response, transaction record or transaction receipt only accountNum will
+   * be populated.
+   */
+  oneof account {
+    /**
+     * A non-negative account number unique within its realm
+     */
+    int64 accountNum = 3;
+
+    /**
+     * The public key bytes to be used as the account's alias. The public key bytes are the result of serializing
+     * a protobuf Key message for any primitive key type. Currently only primitive key bytes are supported as an alias
+     * (ThresholdKey, KeyList, ContractID, and delegatable_contract_id are not supported)
+     *
+     * May also be the ethereum account 20-byte EVM address to be used initially in place of the public key bytes. This EVM
+     * address may be either the encoded form of the shard.realm.num or the keccak-256 hash of a ECDSA_SECP256K1 primitive key.
+     *
+     * At most one account can ever have a given alias and it is used for account creation if it
+     * was automatically created using a crypto transfer. It will be null if an account is created normally.
+     * It is immutable once it is set for an account.
+     *
+     * If a transaction auto-creates the account, any further transfers to that alias will simply be deposited
+     * in that account, without creating anything, and with no creation fee being charged.
+     *
+     * If a transaction lazily-creates this account, a subsequent transaction will be required containing the public key bytes
+     * that map to the EVM address bytes. The provided public key bytes will then serve as the final alias bytes.
+     */
+    bytes alias = 4;
+
+  }
+}
+
+/**
+ * The ID for a file
+ */
+message FileID {
+  /**
+   * The shard number (nonnegative)
+   */
+  int64 shardNum = 1;
+
+  /**
+   * The realm number (nonnegative)
+   */
+  int64 realmNum = 2;
+
+  /**
+   * A nonnegative File number unique within its realm
+   */
+  int64 fileNum = 3;
+}
+
+/**
+ * The ID for a smart contract instance
+ */
+message ContractID {
+  /**
+   * The shard number (nonnegative)
+   */
+  int64 shardNum = 1;
+
+  /**
+   * The realm number (nonnegative)
+   */
+  int64 realmNum = 2;
+
+  oneof contract {
+    /**
+    * A nonnegative number unique within a given shard and realm
+    */
+    int64 contractNum = 3;
+
+    /**
+    * The 20-byte EVM address of the contract to call.
+    *
+    * Every contract has an EVM address determined by its <tt>shard.realm.num</tt> id.
+    * This address is as follows:
+    *   <ol>
+    *     <li>The first 4 bytes are the big-endian representation of the shard.</li>
+    *     <li>The next 8 bytes are the big-endian representation of the realm.</li>
+    *     <li>The final 8 bytes are the big-endian representation of the number.</li>
+    *   </ol>
+    *
+    * Contracts created via CREATE2 have an <b>additional, primary address</b> that is
+    * derived from the <a href="https://eips.ethereum.org/EIPS/eip-1014">EIP-1014</a>
+    * specification, and does not have a simple relation to a <tt>shard.realm.num</tt> id.
+    *
+    * (Please do note that CREATE2 contracts can also be referenced by the three-part
+    * EVM address described above.)
+    */
+    bytes evm_address = 4;
+  }
+}
+
+/**
+ * The ID for a transaction. This is used for retrieving receipts and records for a transaction, for
+ * appending to a file right after creating it, for instantiating a smart contract with bytecode in
+ * a file just created, and internally by the network for detecting when duplicate transactions are
+ * submitted. A user might get a transaction processed faster by submitting it to N nodes, each with
+ * a different node account, but all with the same TransactionID. Then, the transaction will take
+ * effect when the first of all those nodes submits the transaction and it reaches consensus. The
+ * other transactions will not take effect. So this could make the transaction take effect faster,
+ * if any given node might be slow. However, the full transaction fee is charged for each
+ * transaction, so the total fee is N times as much if the transaction is sent to N nodes.
+ *
+ * Applicable to Scheduled Transactions:
+ *  - The ID of a Scheduled Transaction has transactionValidStart and accountIDs inherited from the
+ *    ScheduleCreate transaction that created it. That is to say that they are equal
+ *  - The scheduled property is true for Scheduled Transactions
+ *  - transactionValidStart, accountID and scheduled properties should be omitted
+ */
+message TransactionID {
+  /**
+   * The transaction is invalid if consensusTimestamp < transactionID.transactionStartValid
+   */
+  Timestamp transactionValidStart = 1;
+
+  /**
+   * The Account ID that paid for this transaction
+   */
+  AccountID accountID = 2;
+
+  /**
+   * Whether the Transaction is of type Scheduled or no
+   */
+  bool scheduled = 3;
+
+  /**
+   * The identifier for an internal transaction that was spawned as part
+   * of handling a user transaction. (These internal transactions share the
+   * transactionValidStart and accountID of the user transaction, so a
+   * nonce is necessary to give them a unique TransactionID.)
+   *
+   * An example is when a "parent" ContractCreate or ContractCall transaction
+   * calls one or more HTS precompiled contracts; each of the "child"
+   * transactions spawned for a precompile has a id with a different nonce.
+   */
+  int32 nonce = 4;
+}
+
+/**
+ * An account, and the amount that it sends or receives during a cryptocurrency or token transfer.
+ */
+message AccountAmount {
+  /**
+   * The Account ID that sends/receives cryptocurrency or tokens
+   */
+  AccountID accountID = 1;
+
+  /**
+   * The amount of tinybars (for Crypto transfers) or in the lowest
+   * denomination (for Token transfers) that the account sends(negative) or
+   * receives(positive)
+   */
+  sint64 amount = 2;
+
+  /**
+   * If true then the transfer is expected to be an approved allowance and the
+   * accountID is expected to be the owner. The default is false (omitted).
+   */
+  bool is_approval = 3;
+}
+
+/**
+ * A list of accounts and amounts to transfer out of each account (negative) or into it (positive).
+ */
+message TransferList {
+  /**
+   * Multiple list of AccountAmount pairs, each of which has an account and
+   * an amount to transfer into it (positive) or out of it (negative)
+   */
+  repeated AccountAmount accountAmounts = 1;
+}
+
+/**
+ * A sender account, a receiver account, and the serial number of an NFT of a Token with
+ * NON_FUNGIBLE_UNIQUE type. When minting NFTs the sender will be the default AccountID instance
+ * (0.0.0) and when burning NFTs, the receiver will be the default AccountID instance.
+ */
+message NftTransfer {
+  /**
+   * The accountID of the sender
+   */
+  AccountID senderAccountID = 1;
+
+  /**
+   * The accountID of the receiver
+   */
+  AccountID receiverAccountID = 2;
+
+  /**
+   * The serial number of the NFT
+   */
+  int64 serialNumber = 3;
+
+  /**
+   * If true then the transfer is expected to be an approved allowance and the
+   * senderAccountID is expected to be the owner. The default is false (omitted).
+   */
+  bool is_approval = 4;
+}
+
+/**
+ * A list of token IDs and amounts representing the transferred out (negative) or into (positive)
+ * amounts, represented in the lowest denomination of the token
+ */
+message TokenTransferList {
+  /**
+   * The ID of the token
+   */
+  TokenID token = 1;
+
+  /**
+   * Applicable to tokens of type FUNGIBLE_COMMON. Multiple list of AccountAmounts, each of which
+   * has an account and amount
+   */
+  repeated AccountAmount transfers = 2;
+
+  /**
+   * Applicable to tokens of type NON_FUNGIBLE_UNIQUE. Multiple list of NftTransfers, each of
+   * which has a sender and receiver account, including the serial number of the NFT
+   */
+  repeated NftTransfer nftTransfers = 3;
+
+  /**
+   * If present, the number of decimals this fungible token type is expected to have. The transfer
+   * will fail with UNEXPECTED_TOKEN_DECIMALS if the actual decimals differ.
+   */
+  google.protobuf.UInt32Value expected_decimals = 4;
+}
+
+/**
+ * A rational number, used to set the amount of a value transfer to collect as a custom fee
+ */
+message Fraction {
+  /**
+   * The rational's numerator
+   */
+  int64 numerator = 1;
+
+  /**
+   * The rational's denominator; a zero value will result in FRACTION_DIVIDES_BY_ZERO
+   */
+  int64 denominator = 2;
+}
+
+/**
+ * Unique identifier for a topic (used by the consensus service)
+ */
+message TopicID {
+  /**
+   * The shard number (nonnegative)
+   */
+  int64 shardNum = 1;
+
+  /**
+   * The realm number (nonnegative)
+   */
+  int64 realmNum = 2;
+
+  /**
+   * Unique topic identifier within a realm (nonnegative).
+   */
+  int64 topicNum = 3;
+}
+
+/**
+ * Unique identifier for a token
+ */
+message TokenID {
+  /**
+   * A nonnegative shard number
+   */
+  int64 shardNum = 1;
+
+  /**
+   * A nonnegative realm number
+   */
+  int64 realmNum = 2;
+
+  /**
+   * A nonnegative token number
+   */
+  int64 tokenNum = 3;
+}
+
+/**
+ * Unique identifier for a Schedule
+ */
+message ScheduleID {
+  /**
+   * A nonnegative shard number
+   */
+  int64 shardNum = 1;
+
+  /**
+   * A nonnegative realm number
+   */
+  int64 realmNum = 2;
+
+  /**
+   * A nonnegative schedule number
+   */
+  int64 scheduleNum = 3;
+}
+
+/**
+ * Possible Token Types (IWA Compatibility).
+ * Apart from fungible and non-fungible, Tokens can have either a common or unique representation.
+ * This distinction might seem subtle, but it is important when considering how tokens can be traced
+ * and if they can have isolated and unique properties.
+ */
+enum TokenType {
+  /**
+   * Interchangeable value with one another, where any quantity of them has the same value as
+   * another equal quantity if they are in the same class.  Share a single set of properties, not
+   * distinct from one another. Simply represented as a balance or quantity to a given Hedera
+   * account.
+   */
+  FUNGIBLE_COMMON = 0;
+
+  /**
+   * Unique, not interchangeable with other tokens of the same type as they typically have
+   * different values.  Individually traced and can carry unique properties (e.g. serial number).
+   */
+  NON_FUNGIBLE_UNIQUE = 1;
+}
+
+/**
+ * Allows a set of resource prices to be scoped to a certain type of a HAPI operation.
+ *
+ * For example, the resource prices for a TokenMint operation are different between minting fungible
+ * and non-fungible tokens. This enum allows us to "mark" a set of prices as applying to one or the
+ * other.
+ *
+ * Similarly, the resource prices for a basic TokenCreate without a custom fee schedule yield a
+ * total price of $1. The resource prices for a TokenCreate with a custom fee schedule are different
+ * and yield a total base price of $2.
+ */
+enum SubType {
+  /**
+   * The resource prices have no special scope
+   */
+  DEFAULT = 0;
+
+  /**
+   * The resource prices are scoped to an operation on a fungible common token
+   */
+  TOKEN_FUNGIBLE_COMMON = 1;
+
+  /**
+   * The resource prices are scoped to an operation on a non-fungible unique token
+   */
+  TOKEN_NON_FUNGIBLE_UNIQUE = 2;
+
+  /**
+   * The resource prices are scoped to an operation on a fungible common
+   * token with a custom fee schedule
+   */
+  TOKEN_FUNGIBLE_COMMON_WITH_CUSTOM_FEES = 3;
+
+  /**
+   * The resource prices are scoped to an operation on a non-fungible unique
+   * token with a custom fee schedule
+   */
+  TOKEN_NON_FUNGIBLE_UNIQUE_WITH_CUSTOM_FEES = 4;
+
+  /**
+   * The resource prices are scoped to a ScheduleCreate containing a ContractCall.
+   */
+  SCHEDULE_CREATE_CONTRACT_CALL = 5;
+}
+
+/**
+ * Possible Token Supply Types (IWA Compatibility).
+ * Indicates how many tokens can have during its lifetime.
+ */
+enum TokenSupplyType {
+  /**
+   * Indicates that tokens of that type have an upper bound of Long.MAX_VALUE.
+   */
+  INFINITE = 0;
+
+  /**
+   * Indicates that tokens of that type have an upper bound of maxSupply,
+   * provided on token creation.
+   */
+  FINITE = 1;
+}
+
+/**
+ * Possible Freeze statuses returned on TokenGetInfoQuery or CryptoGetInfoResponse in
+ * TokenRelationship
+ */
+enum TokenFreezeStatus {
+  /**
+   * UNDOCUMENTED
+   */
+  FreezeNotApplicable = 0;
+
+  /**
+   * UNDOCUMENTED
+   */
+  Frozen = 1;
+
+  /**
+   * UNDOCUMENTED
+   */
+  Unfrozen = 2;
+}
+
+/**
+ * Possible KYC statuses returned on TokenGetInfoQuery or CryptoGetInfoResponse in TokenRelationship
+ */
+enum TokenKycStatus {
+  /**
+   * UNDOCUMENTED
+   */
+  KycNotApplicable = 0;
+
+  /**
+   * UNDOCUMENTED
+   */
+  Granted = 1;
+
+  /**
+   * UNDOCUMENTED
+   */
+  Revoked = 2;
+}
+
+/**
+ * Possible Pause statuses returned on TokenGetInfoQuery
+ */
+enum TokenPauseStatus {
+  /**
+   * Indicates that a Token has no pauseKey
+   */
+  PauseNotApplicable = 0;
+
+  /**
+   * Indicates that a Token is Paused
+   */
+  Paused = 1;
+
+  /**
+   * Indicates that a Token is Unpaused.
+   */
+  Unpaused = 2;
+}
+
+/**
+ * A Key can be a public key from either the Ed25519 or ECDSA(secp256k1) signature schemes, where
+ * in the ECDSA(secp256k1) case we require the 33-byte compressed form of the public key. We call
+ * these public keys <b>primitive keys</b>.
+ *
+ * If an account has primitive key associated to it, then the corresponding private key must sign
+ * any transaction to transfer cryptocurrency out of it.
+ *
+ * A Key can also be the ID of a smart contract instance, which is then authorized to perform any
+ * precompiled contract action that requires this key to sign.
+ *
+ * Note that when a Key is a smart contract ID, it <i>doesn't</i> mean the contract with that ID
+ * will actually create a cryptographic signature. It only means that when the contract calls a
+ * precompiled contract, the resulting "child transaction" will be authorized to perform any action
+ * controlled by the Key.
+ *
+ * A Key can be a "threshold key", which means a list of M keys, any N of which must sign in order
+ * for the threshold signature to be considered valid. The keys within a threshold signature may
+ * themselves be threshold signatures, to allow complex signature requirements.
+ *
+ * A Key can be a "key list" where all keys in the list must sign unless specified otherwise in the
+ * documentation for a specific transaction type (e.g.  FileDeleteTransactionBody).  Their use is
+ * dependent on context. For example, a Hedera file is created with a list of keys, where all of
+ * them must sign a transaction to create or modify the file, but only one of them is needed to sign
+ * a transaction to delete the file. So it's a single list that sometimes acts as a 1-of-M threshold
+ * key, and sometimes acts as an M-of-M threshold key.  A key list is always an M-of-M, unless
+ * specified otherwise in documentation. A key list can have nested key lists or threshold keys.
+ * Nested key lists are always M-of-M. A key list can have repeated primitive public keys, but all
+ * repeated keys are only required to sign once.
+ *
+ * A Key can contain a ThresholdKey or KeyList, which in turn contain a Key, so this mutual
+ * recursion would allow nesting arbitrarily deep. A ThresholdKey which contains a list of primitive
+ * keys has 3 levels: ThresholdKey -> KeyList -> Key. A KeyList which contains several primitive
+ * keys has 2 levels: KeyList -> Key. A Key with 2 levels of nested ThresholdKeys has 7 levels:
+ * Key -> ThresholdKey -> KeyList -> Key -> ThresholdKey -> KeyList -> Key.
+ *
+ * Each Key should not have more than 46 levels, which implies 15 levels of nested ThresholdKeys.
+ */
+message Key {
+  oneof key {
+    /**
+     * smart contract instance that is authorized as if it had signed with a key
+     */
+    ContractID contractID = 1;
+
+    /**
+     * Ed25519 public key bytes
+     */
+    bytes ed25519 = 2;
+
+    /**
+     * (NOT SUPPORTED) RSA-3072 public key bytes
+     */
+    bytes RSA_3072 = 3;
+
+    /**
+     * (NOT SUPPORTED) ECDSA with the p-384 curve public key bytes
+     */
+    bytes ECDSA_384 = 4;
+
+    /**
+     * a threshold N followed by a list of M keys, any N of which are required to form a valid
+     * signature
+     */
+    ThresholdKey thresholdKey = 5;
+
+    /**
+     * A list of Keys of the Key type.
+     */
+    KeyList keyList = 6;
+
+    /**
+     * Compressed ECDSA(secp256k1) public key bytes
+     */
+    bytes ECDSA_secp256k1 = 7;
+
+    /**
+     * A smart contract that, if the recipient of the active message frame, should be treated
+     * as having signed. (Note this does not mean the <i>code being executed in the frame</i>
+     * will belong to the given contract, since it could be running another contract's code via
+     * <tt>delegatecall</tt>. So setting this key is a more permissive version of setting the
+     * contractID key, which also requires the code in the active message frame belong to the
+     * the contract with the given id.)
+     */
+    ContractID delegatable_contract_id = 8;
+  }
+}
+
+/**
+ * A set of public keys that are used together to form a threshold signature.  If the threshold is N
+ * and there are M keys, then this is an N of M threshold signature. If an account is associated
+ * with ThresholdKeys, then a transaction to move cryptocurrency out of it must be signed by a list
+ * of M signatures, where at most M-N of them are blank, and the other at least N of them are valid
+ * signatures corresponding to at least N of the public keys listed here.
+ */
+message ThresholdKey {
+  /**
+   * A valid signature set must have at least this many signatures
+   */
+  uint32 threshold = 1;
+
+  /**
+   * List of all the keys that can sign
+   */
+  KeyList keys = 2;
+}
+
+/**
+ * A list of keys that requires all keys (M-of-M) to sign unless otherwise specified in
+ * documentation. A KeyList may contain repeated keys, but all repeated keys are only required to
+ * sign once.
+ */
+message KeyList {
+  /**
+   * list of keys
+   */
+  repeated Key keys = 1;
+}
+
+/**
+ * This message is <b>DEPRECATED</b> and <b>UNUSABLE</b> with network nodes. It is retained
+ * here only for historical reasons.
+ *
+ * Please use the SignaturePair and SignatureMap messages.
+ */
+message Signature {
+  option deprecated = true;
+
+  oneof signature {
+    /**
+     * smart contract virtual signature (always length zero)
+     */
+    bytes contract = 1;
+
+    /**
+     * ed25519 signature bytes
+     */
+    bytes ed25519 = 2;
+
+    /**
+     * RSA-3072 signature bytes
+     */
+    bytes RSA_3072 = 3;
+
+    /**
+     * ECDSA p-384 signature bytes
+     */
+    bytes ECDSA_384 = 4;
+
+    /**
+     * A list of signatures for a single N-of-M threshold Key. This must be a list of exactly M
+     * signatures, at least N of which are non-null.
+     */
+    ThresholdSignature thresholdSignature = 5;
+
+    /**
+     * A list of M signatures, each corresponding to a Key in a KeyList of the same length.
+     */
+    SignatureList signatureList = 6;
+  }
+}
+
+/**
+ * This message is <b>DEPRECATED</b> and <b>UNUSABLE</b> with network nodes. It is retained
+ * here only for historical reasons.
+ *
+ * Please use the SignaturePair and SignatureMap messages.
+ */
+message ThresholdSignature {
+  option deprecated = true;
+
+  /**
+   * for an N-of-M threshold key, this is a list of M signatures, at least N of which must be
+   * non-null
+   */
+  SignatureList sigs = 2;
+}
+
+/**
+ * This message is <b>DEPRECATED</b> and <b>UNUSABLE</b> with network nodes. It is retained
+ * here only for historical reasons.
+ *
+ * Please use the SignaturePair and SignatureMap messages.
+ */
+message SignatureList {
+  option deprecated = true;
+
+  /**
+   * each signature corresponds to a Key in the KeyList
+   */
+  repeated Signature sigs = 2;
+}
+
+/**
+ * The client may use any number of bytes from zero to the whole length of the public key for
+ * pubKeyPrefix. If zero bytes are used, then it must be that only one primitive key is required
+ * to sign the linked transaction; it will surely resolve to <tt>INVALID_SIGNATURE</tt> otherwise.
+ *
+ * <b>IMPORTANT:</b> In the special case that a signature is being provided for a key used to
+ * authorize a precompiled contract, the <tt>pubKeyPrefix</tt> must contain the <b>entire public
+ * key</b>! That is, if the key is a Ed25519 key, the <tt>pubKeyPrefix</tt> should be 32 bytes
+ * long. If the key is a ECDSA(secp256k1) key, the <tt>pubKeyPrefix</tt> should be 33 bytes long,
+ * since we require the compressed form of the public key.
+ *
+ * Only Ed25519 and ECDSA(secp256k1) keys and hence signatures are currently supported.
+ */
+message SignaturePair {
+  /**
+   * First few bytes of the public key
+   */
+  bytes pubKeyPrefix = 1;
+
+  oneof signature {
+    /**
+     * smart contract virtual signature (always length zero)
+     */
+    bytes contract = 2;
+
+    /**
+     * ed25519 signature
+     */
+    bytes ed25519 = 3;
+
+    /**
+     * RSA-3072 signature
+     */
+    bytes RSA_3072 = 4;
+
+    /**
+     * ECDSA p-384 signature
+     */
+    bytes ECDSA_384 = 5;
+
+    /**
+     * ECDSA(secp256k1) signature
+     */
+    bytes ECDSA_secp256k1 = 6;
+  }
+}
+
+/**
+ * A set of signatures corresponding to every unique public key used to sign a given transaction. If
+ * one public key matches more than one prefixes on the signature map, the transaction containing
+ * the map will fail immediately with the response code KEY_PREFIX_MISMATCH.
+ */
+message SignatureMap {
+  /**
+   * Each signature pair corresponds to a unique Key required to sign the transaction.
+   */
+  repeated SignaturePair sigPair = 1;
+}
+
+/**
+ * The transactions and queries supported by Hedera Hashgraph.
+ */
+enum HederaFunctionality {
+  /**
+   * UNSPECIFIED - Need to keep first value as unspecified because first element is ignored and
+   * not parsed (0 is ignored by parser)
+   */
+  NONE = 0;
+
+  /**
+   * crypto transfer
+   */
+  CryptoTransfer = 1;
+
+  /**
+   * crypto update account
+   */
+  CryptoUpdate = 2;
+
+  /**
+   * crypto delete account
+   */
+  CryptoDelete = 3;
+
+  /**
+   * Add a livehash to a crypto account
+   */
+  CryptoAddLiveHash = 4;
+
+  /**
+   * Delete a livehash from a crypto account
+   */
+  CryptoDeleteLiveHash = 5;
+
+  /**
+   * Smart Contract Call
+   */
+  ContractCall = 6;
+
+  /**
+   * Smart Contract Create Contract
+   */
+  ContractCreate = 7;
+
+  /**
+   * Smart Contract update contract
+   */
+  ContractUpdate = 8;
+
+  /**
+   * File Operation create file
+   */
+  FileCreate = 9;
+
+  /**
+   * File Operation append file
+   */
+  FileAppend = 10;
+
+  /**
+   * File Operation update file
+   */
+  FileUpdate = 11;
+
+  /**
+   * File Operation delete file
+   */
+  FileDelete = 12;
+
+  /**
+   * crypto get account balance
+   */
+  CryptoGetAccountBalance = 13;
+
+  /**
+   * crypto get account record
+   */
+  CryptoGetAccountRecords = 14;
+
+  /**
+   * Crypto get info
+   */
+  CryptoGetInfo = 15;
+
+  /**
+   * Smart Contract Call
+   */
+  ContractCallLocal = 16;
+
+  /**
+   * Smart Contract get info
+   */
+  ContractGetInfo = 17;
+
+  /**
+   * Smart Contract, get the runtime code
+   */
+  ContractGetBytecode = 18;
+
+  /**
+   * Smart Contract, get by solidity ID
+   */
+  GetBySolidityID = 19;
+
+  /**
+   * Smart Contract, get by key
+   */
+  GetByKey = 20;
+
+  /**
+   * Get a live hash from a crypto account
+   */
+  CryptoGetLiveHash = 21;
+
+  /**
+   * Crypto, get the stakers for the node
+   */
+  CryptoGetStakers = 22;
+
+  /**
+   * File Operations get file contents
+   */
+  FileGetContents = 23;
+
+  /**
+   * File Operations get the info of the file
+   */
+  FileGetInfo = 24;
+
+  /**
+   * Crypto get the transaction records
+   */
+  TransactionGetRecord = 25;
+
+  /**
+   * Contract get the transaction records
+   */
+  ContractGetRecords = 26;
+
+  /**
+   * crypto create account
+   */
+  CryptoCreate = 27;
+
+  /**
+   * system delete file
+   */
+  SystemDelete = 28;
+
+  /**
+   * system undelete file
+   */
+  SystemUndelete = 29;
+
+  /**
+   * delete contract
+   */
+  ContractDelete = 30;
+
+  /**
+   * freeze
+   */
+  Freeze = 31;
+
+  /**
+   * Create Tx Record
+   */
+  CreateTransactionRecord = 32;
+
+  /**
+   * Crypto Auto Renew
+   */
+  CryptoAccountAutoRenew = 33;
+
+  /**
+   * Contract Auto Renew
+   */
+  ContractAutoRenew = 34;
+
+  /**
+   * Get Version
+   */
+  GetVersionInfo = 35;
+
+  /**
+   * Transaction Get Receipt
+   */
+  TransactionGetReceipt = 36;
+
+  /**
+   * Create Topic
+   */
+  ConsensusCreateTopic = 50;
+
+  /**
+   * Update Topic
+   */
+  ConsensusUpdateTopic = 51;
+
+  /**
+   * Delete Topic
+   */
+  ConsensusDeleteTopic = 52;
+
+  /**
+   * Get Topic information
+   */
+  ConsensusGetTopicInfo = 53;
+
+  /**
+   * Submit message to topic
+   */
+  ConsensusSubmitMessage = 54;
+
+  UncheckedSubmit = 55;
+  /**
+   * Create Token
+   */
+  TokenCreate = 56;
+
+  /**
+   * Get Token information
+   */
+  TokenGetInfo = 58;
+
+  /**
+   * Freeze Account
+   */
+  TokenFreezeAccount = 59;
+
+  /**
+   * Unfreeze Account
+   */
+  TokenUnfreezeAccount = 60;
+
+  /**
+   * Grant KYC to Account
+   */
+  TokenGrantKycToAccount = 61;
+
+  /**
+   * Revoke KYC from Account
+   */
+  TokenRevokeKycFromAccount = 62;
+
+  /**
+   * Delete Token
+   */
+  TokenDelete = 63;
+
+  /**
+   * Update Token
+   */
+  TokenUpdate = 64;
+
+  /**
+   * Mint tokens to treasury
+   */
+  TokenMint = 65;
+
+  /**
+   * Burn tokens from treasury
+   */
+  TokenBurn = 66;
+
+  /**
+   * Wipe token amount from Account holder
+   */
+  TokenAccountWipe = 67;
+
+  /**
+   * Associate tokens to an account
+   */
+  TokenAssociateToAccount = 68;
+
+  /**
+   * Dissociate tokens from an account
+   */
+  TokenDissociateFromAccount = 69;
+
+  /**
+   * Create Scheduled Transaction
+   */
+  ScheduleCreate = 70;
+
+  /**
+   * Delete Scheduled Transaction
+   */
+  ScheduleDelete = 71;
+
+  /**
+   * Sign Scheduled Transaction
+   */
+  ScheduleSign = 72;
+
+  /**
+   * Get Scheduled Transaction Information
+   */
+  ScheduleGetInfo = 73;
+
+  /**
+   * Get Token Account Nft Information
+   */
+  TokenGetAccountNftInfos = 74;
+
+  /**
+   * Get Token Nft Information
+   */
+  TokenGetNftInfo = 75;
+
+  /**
+   * Get Token Nft List Information
+   */
+  TokenGetNftInfos = 76;
+
+  /**
+   * Update a token's custom fee schedule, if permissible
+   */
+  TokenFeeScheduleUpdate = 77;
+
+  /**
+   * Get execution time(s) by TransactionID, if available
+   */
+  NetworkGetExecutionTime = 78;
+
+  /**
+   * Pause the Token
+   */
+  TokenPause = 79;
+
+  /**
+   * Unpause the Token
+   */
+  TokenUnpause = 80;
+
+  /**
+   * Approve allowance for a spender relative to the owner account
+   */
+  CryptoApproveAllowance = 81;
+
+  /**
+   * Deletes granted allowances on owner account
+   */
+  CryptoDeleteAllowance = 82;
+
+  /**
+   * Gets all the information about an account, including balance and allowances. This does not get the list of
+   * account records.
+   */
+  GetAccountDetails = 83;
+
+  /**
+   * Ethereum Transaction
+   */
+  EthereumTransaction = 84;
+
+  /**
+   * Updates the staking info at the end of staking period to indicate new staking period has started.
+   */
+  NodeStakeUpdate = 85;
+
+  /**
+   * Generates a pseudorandom number.
+   */
+  UtilPrng = 86;
+}
+
+/**
+ * A set of prices the nodes use in determining transaction and query fees, and constants involved
+ * in fee calculations.  Nodes multiply the amount of resources consumed by a transaction or query
+ * by the corresponding price to calculate the appropriate fee. Units are one-thousandth of a
+ * tinyCent.
+ */
+message FeeComponents {
+  /**
+   * A minimum, the calculated fee must be greater than this value
+   */
+  int64 min = 1;
+
+  /**
+   * A maximum, the calculated fee must be less than this value
+   */
+  int64 max = 2;
+
+  /**
+   * A constant contribution to the fee
+   */
+  int64 constant = 3;
+
+  /**
+   * The price of bandwidth consumed by a transaction, measured in bytes
+   */
+  int64 bpt = 4;
+
+  /**
+   * The price per signature verification for a transaction
+   */
+  int64 vpt = 5;
+
+  /**
+   * The price of RAM consumed by a transaction, measured in byte-hours
+   */
+  int64 rbh = 6;
+
+  /**
+   * The price of storage consumed by a transaction, measured in byte-hours
+   */
+  int64 sbh = 7;
+
+  /**
+   * The price of computation for a smart contract transaction, measured in gas
+   */
+  int64 gas = 8;
+
+  /**
+   * The price per hbar transferred for a transfer
+   */
+  int64 tv = 9;
+
+  /**
+   * The price of bandwidth for data retrieved from memory for a response, measured in bytes
+   */
+  int64 bpr = 10;
+
+  /**
+   * The price of bandwidth for data retrieved from disk for a response, measured in bytes
+   */
+  int64 sbpr = 11;
+}
+
+/**
+ * The fees for a specific transaction or query based on the fee data.
+ */
+message TransactionFeeSchedule {
+  /**
+   * A particular transaction or query
+   */
+  HederaFunctionality hederaFunctionality = 1;
+
+  /**
+   * Resource price coefficients
+   */
+  FeeData feeData = 2 [deprecated=true];
+
+  /**
+   * Resource price coefficients. Supports subtype price definition.
+   */
+  repeated FeeData fees = 3;
+}
+
+/**
+ * The total fee charged for a transaction. It is composed of three components – a node fee that
+ * compensates the specific node that submitted the transaction, a network fee that compensates the
+ * network for assigning the transaction a consensus timestamp, and a service fee that compensates
+ * the network for the ongoing maintenance of the consequences of the transaction.
+ */
+message FeeData {
+  /**
+   * Fee paid to the submitting node
+   */
+  FeeComponents nodedata = 1;
+
+  /**
+   * Fee paid to the network for processing a transaction into consensus
+   */
+  FeeComponents networkdata = 2;
+
+  /**
+   * Fee paid to the network for providing the service associated with the
+   * transaction; for instance, storing a file
+   */
+  FeeComponents servicedata = 3;
+
+  /**
+   * SubType distinguishing between different types of FeeData, correlating
+   * to the same HederaFunctionality
+   */
+  SubType subType = 4;
+}
+
+/**
+ * A list of resource prices fee for different transactions and queries and the time period at which
+ * this fee schedule will expire. Nodes use the prices to determine the fees for all transactions
+ * based on how much of those resources each transaction uses.
+ */
+message FeeSchedule {
+  /**
+   * List of price coefficients for network resources
+   */
+  repeated TransactionFeeSchedule transactionFeeSchedule = 1;
+
+  /**
+   * FeeSchedule expiry time
+   */
+  TimestampSeconds expiryTime = 2;
+}
+
+/**
+ * This contains two Fee Schedules with expiry timestamp.
+ */
+message CurrentAndNextFeeSchedule {
+  /**
+   * Contains current Fee Schedule
+   */
+  FeeSchedule currentFeeSchedule = 1;
+
+  /**
+   * Contains next Fee Schedule
+   */
+  FeeSchedule nextFeeSchedule = 2;
+}
+
+/**
+ * Contains the IP address and the port representing a service endpoint of a Node in a network. Used
+ * to reach the Hedera API and submit transactions to the network.
+ */
+message ServiceEndpoint {
+  /**
+   * The 32-bit IPv4 address of the node encoded in left to right order (e.g.  127.0.0.1 has 127
+   * as its first byte)
+   */
+  bytes ipAddressV4 = 1;
+
+  /**
+   * The port of the node
+   */
+  int32 port = 2;
+}
+
+/**
+ * The data about a node, including its service endpoints and the Hedera account to be paid for
+ * services provided by the node (that is, queries answered and transactions submitted.)
+ *
+ * If the <tt>serviceEndpoint</tt> list is not set, or empty, then the endpoint given by the
+ * (deprecated) <tt>ipAddress</tt> and <tt>portno</tt> fields should be used.
+ *
+ * All fields are populated in the 0.0.102 address book file while only fields that start with # are
+ * populated in the 0.0.101 address book file.
+ */
+message NodeAddress {
+  /**
+   * The IP address of the Node with separator & octets encoded in UTF-8.  Usage is deprecated,
+   * ServiceEndpoint is preferred to retrieve a node's list of IP addresses and ports
+   */
+  bytes ipAddress = 1 [deprecated=true];
+
+  /**
+   * The port number of the grpc server for the node.  Usage is deprecated, ServiceEndpoint is
+   * preferred to retrieve a node's list of IP addresses and ports
+   */
+  int32 portno = 2 [deprecated=true];
+
+  /**
+   * Usage is deprecated, nodeAccountId is preferred to retrieve a node's account ID
+   */
+  bytes memo = 3 [deprecated=true];
+
+  /**
+   * The node's X509 RSA public key used to sign stream files (e.g., record stream
+   * files). Precisely, this field is a string of hexadecimal characters which,
+   * translated to binary, are the public key's DER encoding.
+   */
+  string RSA_PubKey = 4;
+
+  /**
+   * # A non-sequential identifier for the node
+   */
+  int64 nodeId = 5;
+
+  /**
+   * # The account to be paid for queries and transactions sent to this node
+   */
+  AccountID nodeAccountId = 6;
+
+  /**
+   * # Hash of the node's TLS certificate. Precisely, this field is a string of
+   * hexadecimal characters which, translated to binary, are the SHA-384 hash of
+   * the UTF-8 NFKD encoding of the node's TLS cert in PEM format. Its value can be
+   * used to verify the node's certificate it presents during TLS negotiations.
+   */
+  bytes nodeCertHash = 7;
+
+  /**
+   * # A node's service IP addresses and ports
+   */
+  repeated ServiceEndpoint serviceEndpoint = 8;
+
+  /**
+   * A description of the node, with UTF-8 encoding up to 100 bytes
+   */
+  string description = 9;
+
+  /**
+   * [Deprecated] The amount of tinybars staked to the node
+   */
+  int64 stake = 10 [deprecated = true];
+}
+
+/**
+ * A list of nodes and their metadata that contains all details of the nodes for the network.  Used
+ * to parse the contents of system files <tt>0.0.101</tt> and <tt>0.0.102</tt>.
+ */
+message NodeAddressBook {
+  /**
+   * Metadata of all nodes in the network
+   */
+  repeated NodeAddress nodeAddress = 1;
+}
+
+/**
+ * Hedera follows semantic versioning (https://semver.org/) for both the HAPI protobufs and the
+ * Services software.  This type allows the <tt>getVersionInfo</tt> query in the
+ * <tt>NetworkService</tt> to return the deployed versions of both protobufs and software on the
+ * node answering the query.
+ */
+message SemanticVersion {
+  /**
+   * Increases with incompatible API changes
+   */
+  int32 major = 1;
+
+  /**
+   * Increases with backwards-compatible new functionality
+   */
+  int32 minor = 2;
+
+  /**
+   * Increases with backwards-compatible bug fixes
+   */
+  int32 patch = 3;
+
+  /**
+   * A pre-release version MAY be denoted by appending a hyphen and a series of dot separated
+   * identifiers (https://semver.org/#spec-item-9); so given a semver 0.14.0-alpha.1+21AF26D3,
+   * this field would contain 'alpha.1'
+   */
+  string pre = 4;
+
+  /**
+   * Build metadata MAY be denoted by appending a plus sign and a series of dot separated
+   * identifiers immediately following the patch or pre-release version
+   * (https://semver.org/#spec-item-10); so given a semver 0.14.0-alpha.1+21AF26D3, this field
+   * would contain '21AF26D3'
+   */
+  string build = 5;
+}
+
+/**
+ * UNDOCUMENTED
+ */
+message Setting {
+  /**
+   * name of the property
+   */
+  string name = 1;
+
+  /**
+   * value of the property
+   */
+  string value = 2;
+
+  /**
+   * any data associated with property
+   */
+  bytes data = 3;
+}
+
+/**
+ * UNDOCUMENTED
+ */
+message ServicesConfigurationList {
+  /**
+   * list of name value pairs of the application properties
+   */
+  repeated Setting nameValue = 1;
+}
+
+/**
+ * Token's information related to the given Account
+ */
+message TokenRelationship {
+  /**
+   * The ID of the token
+   */
+  TokenID tokenId = 1;
+
+  /**
+   * The Symbol of the token
+   */
+  string symbol = 2;
+
+  /**
+   * For token of type FUNGIBLE_COMMON - the balance that the Account holds in the smallest
+   * denomination. For token of type NON_FUNGIBLE_UNIQUE - the number of NFTs held by the account
+   */
+  uint64 balance = 3;
+
+  /**
+   * The KYC status of the account (KycNotApplicable, Granted or Revoked). If the token does not
+   * have KYC key, KycNotApplicable is returned
+   */
+  TokenKycStatus kycStatus = 4;
+
+  /**
+   * The Freeze status of the account (FreezeNotApplicable, Frozen or Unfrozen). If the token does
+   * not have Freeze key, FreezeNotApplicable is returned
+   */
+  TokenFreezeStatus freezeStatus = 5;
+
+  /**
+   * Tokens divide into <tt>10<sup>decimals</sup></tt> pieces
+   */
+  uint32 decimals = 6;
+
+  /**
+   * Specifies if the relationship is created implicitly. False : explicitly associated, True :
+   * implicitly associated.
+   */
+  bool automatic_association = 7;
+}
+
+/**
+ * A number of <i>transferable units</i> of a certain token.
+ *
+ * The transferable unit of a token is its smallest denomination, as given by the token's
+ * <tt>decimals</tt> property---each minted token contains <tt>10<sup>decimals</sup></tt>
+ * transferable units. For example, we could think of the cent as the transferable unit of the US
+ * dollar (<tt>decimals=2</tt>); and the tinybar as the transferable unit of hbar
+ * (<tt>decimals=8</tt>).
+ *
+ * Transferable units are not directly comparable across different tokens.
+ */
+message TokenBalance {
+  /**
+   * A unique token id
+   */
+  TokenID tokenId = 1;
+
+  /**
+   * Number of transferable units of the identified token. For token of type FUNGIBLE_COMMON -
+   * balance in the smallest denomination. For token of type NON_FUNGIBLE_UNIQUE - the number of
+   * NFTs held by the account
+   */
+  uint64 balance = 2;
+
+  /**
+   * Tokens divide into <tt>10<sup>decimals</sup></tt> pieces
+   */
+  uint32 decimals = 3;
+}
+
+/**
+ * A sequence of token balances
+ */
+message TokenBalances {
+  repeated TokenBalance tokenBalances = 1;
+}
+
+/* A token - account association */
+message TokenAssociation {
+  TokenID token_id = 1;  // The token involved in the association
+  AccountID account_id = 2; // The account involved in the association
+}
+
+/**
+ * Staking metadata for an account or a contract returned in CryptoGetInfo or ContractGetInfo queries
+ */
+message StakingInfo {
+
+  /**
+   * If true, this account or contract declined to receive a staking reward.
+   */
+  bool decline_reward = 1;
+
+  /**
+   * The staking period during which either the staking settings for this account or contract changed (such as starting
+   * staking or changing staked_node_id) or the most recent reward was earned, whichever is later. If this account or contract
+   * is not currently staked to a node, then this field is not set.
+   */
+  Timestamp stake_period_start = 2;
+
+  /**
+   * The amount in tinybars that will be received in the next reward situation.
+   */
+  int64 pending_reward = 3;
+
+  /**
+   * The total of balance of all accounts staked to this account or contract.
+   */
+  int64 staked_to_me = 4;
+
+  /**
+   * ID of the account or node to which this account or contract is staking.
+   */
+  oneof staked_id {
+
+    /**
+     * The account to which this account or contract is staking.
+     */
+    AccountID staked_account_id = 5;
+
+    /**
+     * The ID of the node this account or contract is staked to.
+     */
+    int64 staked_node_id = 6;
+  }
+}
diff --git a/src/Hedera/Protobuf/crypto_transfer.proto b/src/Hedera/Protobuf/crypto_transfer.proto
new file mode 100644
index 00000000000..0c6c0b1b23e
--- /dev/null
+++ b/src/Hedera/Protobuf/crypto_transfer.proto
@@ -0,0 +1,55 @@
+// Taken from https://github.com/hashgraph/hedera-protobufs/tree/main/services
+
+syntax = "proto3";
+
+package proto;
+
+/*-
+ * ‌
+ * Hedera Network Services Protobuf
+ * ​
+ * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC
+ * ​
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ‍
+ */
+
+option java_package = "com.hederahashgraph.api.proto.java";
+option java_multiple_files = true;
+
+import "basic_types.proto";
+
+/**
+ * Transfers cryptocurrency among two or more accounts by making the desired adjustments to their
+ * balances. Each transfer list can specify up to 10 adjustments. Each negative amount is withdrawn
+ * from the corresponding account (a sender), and each positive one is added to the corresponding
+ * account (a receiver). The amounts list must sum to zero. Each amount is a number of tinybars
+ * (there are 100,000,000 tinybars in one hbar).  If any sender account fails to have sufficient
+ * hbars, then the entire transaction fails, and none of those transfers occur, though the
+ * transaction fee is still charged. This transaction must be signed by the keys for all the sending
+ * accounts, and for any receiving accounts that have receiverSigRequired == true. The signatures
+ * are in the same order as the accounts, skipping those accounts that don't need a signature.
+ */
+message CryptoTransferTransactionBody {
+  /**
+   * The desired hbar balance adjustments
+   */
+  TransferList transfers = 1;
+
+  /**
+   * The desired token unit balance adjustments; if any custom fees are assessed, the ledger will
+   * try to deduct them from the payer of this CryptoTransfer, resolving the transaction to
+   * INSUFFICIENT_PAYER_BALANCE_FOR_CUSTOM_FEE if this is not possible
+   */
+  repeated TokenTransferList tokenTransfers = 2;
+}
diff --git a/src/Hedera/Protobuf/duration.proto b/src/Hedera/Protobuf/duration.proto
new file mode 100644
index 00000000000..2b096068c8c
--- /dev/null
+++ b/src/Hedera/Protobuf/duration.proto
@@ -0,0 +1,38 @@
+// Taken from https://github.com/hashgraph/hedera-protobufs/tree/main/services
+
+syntax = "proto3";
+
+package proto;
+
+/*-
+ * ‌
+ * Hedera Network Services Protobuf
+ * ​
+ * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC
+ * ​
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ‍
+ */
+
+option java_package = "com.hederahashgraph.api.proto.java";
+option java_multiple_files = true;
+
+/**
+ * A length of time in seconds.
+ */
+message Duration {
+  /**
+   * The number of seconds
+   */
+  int64 seconds = 1;
+}
diff --git a/src/Hedera/Protobuf/timestamp.proto b/src/Hedera/Protobuf/timestamp.proto
new file mode 100644
index 00000000000..b7e8e9a8831
--- /dev/null
+++ b/src/Hedera/Protobuf/timestamp.proto
@@ -0,0 +1,54 @@
+// Taken from https://github.com/hashgraph/hedera-protobufs/tree/main/services
+
+syntax = "proto3";
+
+package proto;
+
+/*-
+ * ‌
+ * Hedera Network Services Protobuf
+ * ​
+ * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC
+ * ​
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ‍
+ */
+
+option java_package = "com.hederahashgraph.api.proto.java";
+option java_multiple_files = true;
+
+/**
+ * An exact date and time. This is the same data structure as the protobuf Timestamp.proto (see the
+ * comments in https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto)
+ */
+message Timestamp {
+  /**
+   * Number of complete seconds since the start of the epoch
+   */
+  int64 seconds = 1;
+
+  /**
+   * Number of nanoseconds since the start of the last second
+   */
+  int32 nanos = 2;
+}
+
+/**
+ * An exact date and time,  with a resolution of one second (no nanoseconds).
+ */
+message TimestampSeconds {
+  /**
+   * Number of complete seconds since the start of the epoch
+   */
+  int64 seconds = 1;
+}
diff --git a/src/Hedera/Protobuf/transaction_body.proto b/src/Hedera/Protobuf/transaction_body.proto
new file mode 100644
index 00000000000..0687b6f851d
--- /dev/null
+++ b/src/Hedera/Protobuf/transaction_body.proto
@@ -0,0 +1,76 @@
+// Taken from https://github.com/hashgraph/hedera-protobufs/tree/main/services
+
+syntax = "proto3";
+
+package proto;
+
+/*-
+ * ‌
+ * Hedera Network Services Protobuf
+ * ​
+ * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC
+ * ​
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ‍
+ */
+
+option java_package = "com.hederahashgraph.api.proto.java";
+option java_multiple_files = true;
+
+import "crypto_transfer.proto";
+import "duration.proto";
+import "basic_types.proto";
+
+/**
+ * A single transaction. All transaction types are possible here.
+ */
+message TransactionBody {
+  /**
+   * The ID for this transaction, which includes the payer's account (the account paying the
+   * transaction fee). If two transactions have the same transactionID, they won't both have an
+   * effect
+   */
+  TransactionID transactionID = 1;
+
+  /**
+   * The account of the node that submits the client's transaction to the network
+   */
+  AccountID nodeAccountID = 2;
+
+  /**
+   * The maximum transaction fee the client is willing to pay
+   */
+  uint64 transactionFee = 3;
+
+  /**
+   * The transaction is invalid if consensusTimestamp > transactionID.transactionValidStart +
+   * transactionValidDuration
+   */
+  Duration transactionValidDuration = 4;
+
+  /**
+   * Any notes or descriptions that should be put into the record (max length 100)
+   */
+  string memo = 6;
+
+  /**
+   * The choices here are arranged by service in roughly lexicographical order. The field ordinals are non-sequential, and a result of the historical order of implementation.
+   */
+  oneof data {
+
+    /**
+     * Transfer amount between accounts
+     */
+    CryptoTransferTransactionBody cryptoTransfer = 14;
+  }
+}
diff --git a/src/Hedera/Protobuf/transaction_contents.proto b/src/Hedera/Protobuf/transaction_contents.proto
new file mode 100644
index 00000000000..2af320a2220
--- /dev/null
+++ b/src/Hedera/Protobuf/transaction_contents.proto
@@ -0,0 +1,42 @@
+// Taken from https://github.com/hashgraph/hedera-protobufs/tree/main/services
+
+syntax = "proto3";
+
+package proto;
+
+/*-
+ * ‌
+ * Hedera Network Services Protobuf
+ * ​
+ * Copyright (C) 2018 - 2021 Hedera Hashgraph, LLC
+ * ​
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ‍
+ */
+
+option java_package = "com.hederahashgraph.api.proto.java";
+option java_multiple_files = true;
+
+import "basic_types.proto";
+
+message SignedTransaction {
+  /**
+   * TransactionBody serialized into bytes, which needs to be signed
+   */
+  bytes bodyBytes = 1;
+
+  /**
+   * The signatures on the body with the new format, to authorize the transaction
+   */
+  SignatureMap sigMap = 2;
+}
diff --git a/src/Hedera/Signer.cpp b/src/Hedera/Signer.cpp
new file mode 100644
index 00000000000..47628377551
--- /dev/null
+++ b/src/Hedera/Signer.cpp
@@ -0,0 +1,105 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Signer.h"
+#include "Address.h"
+#include "HexCoding.h"
+#include "Protobuf/transaction_body.pb.h"
+#include "Protobuf/transaction_contents.pb.h"
+#include "../PublicKey.h"
+
+namespace TW::Hedera::internals {
+static inline proto::AccountID accountIDfromStr(const std::string& input) {
+    const auto hederaAccount = Address(input);
+    auto accountID = proto::AccountID();
+    accountID.set_accountnum(static_cast<std::int64_t>(hederaAccount.num()));
+    accountID.set_realmnum(static_cast<std::int64_t>(hederaAccount.realm()));
+    accountID.set_shardnum(static_cast<std::int64_t>(hederaAccount.shard()));
+    return accountID;
+}
+
+static inline proto::Timestamp timestampFromTWProto(const Proto::Timestamp& input) {
+    auto timestamp = proto::Timestamp();
+    timestamp.set_seconds(input.seconds());
+    timestamp.set_nanos(input.nanos());
+    return timestamp;
+}
+
+static inline proto::TransactionID transactionIDFromSigningInput(const Proto::SigningInput& input) {
+    auto transactionID = proto::TransactionID();
+    *transactionID.mutable_transactionvalidstart() = timestampFromTWProto(input.body().transactionid().transactionvalidstart());
+    *transactionID.mutable_accountid() = accountIDfromStr(input.body().transactionid().accountid());
+    return transactionID;
+}
+
+static inline proto::TransactionBody transactionBodyPrerequisites(const Proto::SigningInput& input) {
+    auto body = proto::TransactionBody();
+    body.set_memo(input.body().memo());
+    body.set_transactionfee(input.body().transactionfee());
+    *body.mutable_nodeaccountid() = accountIDfromStr(input.body().nodeaccountid());
+    body.mutable_transactionvalidduration()->set_seconds(input.body().transactionvalidduration());
+    *body.mutable_transactionid() = transactionIDFromSigningInput(input);
+    return body;
+}
+
+static inline proto::TransferList transferListFromInput(const Proto::SigningInput& input) {
+    auto transferList = proto::TransferList();
+    auto fromAccountID = accountIDfromStr(input.body().transfer().from());
+    auto amount = input.body().transfer().amount();
+    auto* to = transferList.add_accountamounts();
+    to->set_amount(amount);
+    *to->mutable_accountid() = accountIDfromStr(input.body().transfer().to());
+    auto* from = transferList.add_accountamounts();
+    from->set_amount(-amount);
+    *from->mutable_accountid() = fromAccountID;
+    return transferList;
+}
+
+static inline proto::CryptoTransferTransactionBody cryptoTransferFromInput(const Proto::SigningInput& input) {
+    auto transferList = transferListFromInput(input);
+    auto cryptoTransfer = proto::CryptoTransferTransactionBody();
+    *cryptoTransfer.mutable_transfers() = transferList;
+    return cryptoTransfer;
+}
+
+static inline Proto::SigningOutput sign(const proto::TransactionBody& body, const PrivateKey& privateKey) {
+    auto protoOutput = Proto::SigningOutput();
+    Data encoded;
+    auto encodedBody = data(body.SerializeAsString());
+    auto signedBody = privateKey.sign(encodedBody, TWCurveED25519);
+    auto sigMap = proto::SignatureMap();
+    auto* sigPair = sigMap.add_sigpair();
+    sigPair->set_ed25519(signedBody.data(), signedBody.size());
+    auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeED25519).bytes;
+    sigPair->set_pubkeyprefix(pubKey.data(), pubKey.size());
+    auto signedTx = proto::SignedTransaction();
+    signedTx.set_bodybytes(encodedBody.data(), encodedBody.size());
+    *signedTx.mutable_sigmap() = sigMap;
+    encoded = data(signedTx.SerializeAsString());
+    protoOutput.set_encoded(encoded.data(), encoded.size());
+    return protoOutput;
+}
+
+} // namespace TW::Hedera::internals
+
+namespace TW::Hedera {
+
+Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
+    auto privateKey = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
+    auto body = internals::transactionBodyPrerequisites(input);
+
+    switch (input.body().data_case()) {
+    case Proto::TransactionBody::kTransfer: {
+        *body.mutable_cryptotransfer() = internals::cryptoTransferFromInput(input);
+        break;
+    }
+    case Proto::TransactionBody::DATA_NOT_SET:
+        break;
+    default:
+        break;
+    }
+    return internals::sign(body, privateKey);
+}
+
+} // namespace TW::Hedera
diff --git a/src/Hedera/Signer.h b/src/Hedera/Signer.h
new file mode 100644
index 00000000000..c76eaad764e
--- /dev/null
+++ b/src/Hedera/Signer.h
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "../PrivateKey.h"
+#include "../proto/Hedera.pb.h"
+
+namespace TW::Hedera {
+
+/// Helper class that performs Hedera transaction signing.
+class Signer {
+public:
+    /// Hide default constructor
+    Signer() = delete;
+
+    /// Signs a Proto::SigningInput transaction
+    static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+};
+
+} // namespace TW::Hedera
diff --git a/src/HexCoding.h b/src/HexCoding.h
index 6a12f0e2456..581da5e08cb 100644
--- a/src/HexCoding.h
+++ b/src/HexCoding.h
@@ -1,81 +1,79 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Data.h"
+#include "rust/bindgen/WalletCoreRSBindgen.h"
+#include "rust/Wrapper.h"
 
-#include <boost/algorithm/hex.hpp>
-
+#include <algorithm>
 #include <array>
+#include <sstream>
 #include <string>
 #include <tuple>
 
-namespace TW {
-
-std::tuple<uint8_t, bool> value(uint8_t c);
 
-/// Converts a range of bytes to a hexadecimal string representation.
-template <typename Iter>
-inline std::string hex(const Iter begin, const Iter end) {
-    static constexpr std::array<char, 16> hexmap = {
-        '0', '1', '2', '3', '4', '5', '6', '7',
-        '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'
-    };
+namespace TW::internal {
+/// Parses a string of hexadecimal values.
+///
+/// \returns the array or parsed bytes or an empty array if the string is not
+/// valid hexadecimal.
+inline Data parse_hex(const std::string& input) {
+    if (input.empty()) {
+        return {};
+    }
 
-    std::string result;
-    result.reserve((end - begin) * 2);
+    Rust::CByteArrayResultWrapper res = Rust::decode_hex(input.c_str());
+    return res.unwrap_or_default().data;
+}
+}
 
-    for (auto it = begin; it < end; ++it) {
-        auto val = static_cast<uint8_t>(*it);
-        result.push_back(hexmap[val >> 4]);
-        result.push_back(hexmap[val & 0x0f]);
-    }
+namespace TW {
 
-    return result;
+inline bool is_hex_encoded(const std::string& s)
+{
+    bool with_0x = s.compare(0, 2, "0x") == 0
+           && s.size() > 2
+           && s.find_first_not_of("0123456789abcdefABCDEF", 2) == std::string::npos;
+    bool without_0x = s.find_first_not_of("0123456789abcdefABCDEF") == std::string::npos;
+    return with_0x || without_0x;
 }
 
 /// Converts a collection of bytes to a hexadecimal string representation.
 template <typename T>
-inline std::string hex(const T& collection) {
-    return hex(std::begin(collection), std::end(collection));
+inline std::string hex(const T& collection, bool prefixed = false) {
+    auto rust_functor = [prefixed](auto&& collection){
+        auto res = Rust::encode_hex(collection.data(), collection.size(), prefixed);
+        std::string encoded_str(res);
+        Rust::free_string(res);
+        return encoded_str;
+    };
+    if constexpr (std::is_same_v<T, Data>) {
+        return rust_functor(collection);
+    }
+    else if constexpr (std::is_same_v<T, std::string>) {
+        return rust_functor(data(collection));
+    }
+    else {
+        return rust_functor(data_from(collection));
+    }
 }
 
 /// same as hex, with 0x prefix
 template <typename T>
-inline std::string hexEncoded(const T& collection) {
-    return hex(std::begin(collection), std::end(collection)).insert(0, "0x");
+inline std::string hexEncoded(T&& collection) {
+    return hex(std::forward<T>(collection), true);
 }
 
 /// Converts a `uint64_t` value to a hexadecimal string.
 inline std::string hex(uint64_t value) {
-    auto bytes = reinterpret_cast<const uint8_t*>(&value);
-    return hex(std::reverse_iterator<const uint8_t*>(bytes + sizeof(value)),
-               std::reverse_iterator<const uint8_t*>(bytes));
-}
-
-/// Parses a string of hexadecimal values.
-///
-/// \returns the array or parsed bytes or an empty array if the string is not
-/// valid hexadecimal.
-template <typename Iter>
-inline Data parse_hex(const Iter begin, const Iter end) {
-    auto it = begin;
-
-    // Skip `0x`
-    if (end - begin >= 2 && *begin == '0' && *(begin + 1) == 'x') {
-        it += 2;
-    }
-    try {
-        std::string temp;
-        boost::algorithm::unhex(it, end, std::back_inserter(temp));
-        return Data(temp.begin(), temp.end());
-    } catch (...) {
-        return {};
-    }
+    const uint8_t* begin = reinterpret_cast<const uint8_t*>(&value);
+    const uint8_t* end = begin + sizeof(value);
+    Data v(begin, end);
+    std::reverse(v.begin(), v.end());
+    return hex(v);
 }
 
 /// Parses a string of hexadecimal values.
@@ -89,9 +87,56 @@ inline Data parse_hex(const std::string& string, bool padLeft = false) {
             temp.erase(0, 2);
         }
         temp.insert(0, 1, '0');
-        return parse_hex(temp.begin(), temp.end());
+        return internal::parse_hex(temp);
+    }
+    return internal::parse_hex(string);
+}
+
+inline const char* hex_char_to_bin(char c) {
+    switch (toupper(c)) {
+    case '0':
+        return "0000";
+    case '1':
+        return "0001";
+    case '2':
+        return "0010";
+    case '3':
+        return "0011";
+    case '4':
+        return "0100";
+    case '5':
+        return "0101";
+    case '6':
+        return "0110";
+    case '7':
+        return "0111";
+    case '8':
+        return "1000";
+    case '9':
+        return "1001";
+    case 'A':
+        return "1010";
+    case 'B':
+        return "1011";
+    case 'C':
+        return "1100";
+    case 'D':
+        return "1101";
+    case 'E':
+        return "1110";
+    case 'F':
+        return "1111";
+    default:
+        return "";
+    }
+}
+
+inline std::string hex_str_to_bin_str(const std::string& hex) {
+    std::stringstream ss;
+    for (auto&& c: hex) {
+        ss << hex_char_to_bin(c);
     }
-    return parse_hex(string.begin(), string.end());
+    return ss.str();
 }
 
 } // namespace TW
diff --git a/src/IOST/Account.cpp b/src/IOST/Account.cpp
new file mode 100644
index 00000000000..1aa3c91f5b7
--- /dev/null
+++ b/src/IOST/Account.cpp
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Account.h"
+#include "../Base58.h"
+#include "../Base58Address.h"
+
+using namespace TW;
+using namespace TW::IOST;
+
+bool isAccountValid(const std::string& account) {
+    if (account.size() < 5 || account.size() > 11) {
+        return false;
+    }
+    for (char ch : account) {
+        if ((ch < 'a' || ch > 'z') && (ch < '0' || ch > '9') && ch != '_') {
+            return false;
+        }
+    }
+    return true;
+}
+
+bool isBase58AddressValid(const std::string& address) {
+    auto decoded = Base58::decode(address);
+    return decoded.size() == Base58Address<32>::size;
+}
+
+bool Account::isValid(const std::string& s) {
+    return isAccountValid(s) ? true : isBase58AddressValid(s);
+}
+
+std::string Account::encodePubKey(const PublicKey& publicKey) {
+    return Base58::encode(publicKey.bytes);
+}
+
+Account::Account(const Proto::AccountInfo& account) {
+    name = account.name();
+    if (account.active_key() != "") {
+        auto activeKeyBytesPtr = account.active_key().begin();
+        activeKey = Data(activeKeyBytesPtr, activeKeyBytesPtr + PrivateKey::_size);
+    }
+    if (account.owner_key() != "") {
+        auto ownerKeyBytesPtr = account.owner_key().begin();
+        ownerKey = Data(ownerKeyBytesPtr, ownerKeyBytesPtr + PrivateKey::_size);
+    }
+}
+
+Data Account::sign(const Data& digest, TWCurve curve) const {
+    return PrivateKey(activeKey).sign(digest, curve);
+}
+
+Data Account::publicActiveKey() const {
+    return PrivateKey(activeKey).getPublicKey(TWPublicKeyTypeED25519).bytes;
+}
+
+Data Account::publicOwnerKey() const {
+    return PrivateKey(ownerKey).getPublicKey(TWPublicKeyTypeED25519).bytes;
+}
+
+std::string Account::address(const std::string& publickey) {
+    auto publicKeyData = TW::data(publickey);
+    return Base58::encode(publicKeyData);
+}
diff --git a/src/IOST/Account.h b/src/IOST/Account.h
new file mode 100644
index 00000000000..bc93493d2bb
--- /dev/null
+++ b/src/IOST/Account.h
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../PublicKey.h"
+#include "../PrivateKey.h"
+#include "../proto/IOST.pb.h"
+
+#include <string>
+
+namespace TW::IOST {
+
+class Account {
+public:
+    static bool isValid(const std::string& name);
+    static std::string encodePubKey(const PublicKey& publicKey);
+    static std::string address(const std::string& string);
+    Account(std::string name): name(std::move(name)) {}
+    Account([[maybe_unused]] const PublicKey& publicKey) {}
+    Account(const Proto::AccountInfo& account);
+    std::string string() const { return name; }
+    Data sign(const Data& digest, TWCurve curve) const;
+    Data publicActiveKey() const;
+    Data publicOwnerKey() const;
+    std::string name;
+    Data activeKey;
+    Data ownerKey;
+};
+
+inline bool operator==(const Account& lhs, const Account& rhs) {
+    return lhs.name == rhs.name;
+}
+
+} // namespace TW::IOST
+
+/// Wrapper for C interface.
+struct TWIOSTAccount {
+    TW::IOST::Account impl;
+};
diff --git a/src/IOST/Entry.cpp b/src/IOST/Entry.cpp
new file mode 100644
index 00000000000..c5f8d59dff6
--- /dev/null
+++ b/src/IOST/Entry.cpp
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Entry.h"
+#include "Account.h"
+#include "Signer.h"
+#include "../Base58.h"
+#include "../proto/Common.pb.h"
+#include "../proto/TransactionCompiler.pb.h"
+
+using namespace TW;
+using namespace std;
+
+namespace TW::IOST {
+
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, [[maybe_unused]] const PrefixVariant& addressPrefixp) const {
+    return Account::isValid(address);
+}
+
+string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Account::encodePubKey(publicKey);
+}
+
+TW::Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& str) const {
+    return {Base58::decode(str)};
+}
+
+void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
+    signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
+}
+
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            const auto signer = Signer(input);
+            auto preImage = signer.signaturePreimage();
+            auto preImageHash = Hash::sha3_256(preImage);
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, const auto& publicKey) {
+            const auto signer = Signer(input);
+            output = signer.compile(signature, publicKey);
+        });
+}
+
+} // namespace TW::IOST
diff --git a/src/IOST/Entry.h b/src/IOST/Entry.h
new file mode 100644
index 00000000000..3b187c6ed68
--- /dev/null
+++ b/src/IOST/Entry.h
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../CoinEntry.h"
+
+namespace TW::IOST {
+
+/// Entry point for implementation of IOST coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific
+/// includes in this file.
+class Entry final : public CoinEntry {
+  public:
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefixp) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    Data addressToData(TWCoinType coin, const std::string& address) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData,
+                         const std::vector<Data>& signatures,
+                         const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
+};
+
+} // namespace TW::IOST
diff --git a/src/IOST/Signer.cpp b/src/IOST/Signer.cpp
new file mode 100644
index 00000000000..645be9f610f
--- /dev/null
+++ b/src/IOST/Signer.cpp
@@ -0,0 +1,183 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Signer.h"
+#include "Account.h"
+#include "../BinaryCoding.h"
+#include <google/protobuf/util/json_util.h>
+#include <nlohmann/json.hpp>
+#include <sstream>
+
+using namespace TW;
+using namespace TW::IOST;
+
+class IOSTEncoder {
+  public:
+    IOSTEncoder() = default;
+    void WriteByte(uint8_t b) { buffer << b; }
+    void WriteInt32(uint32_t i) {
+        std::vector<uint8_t> data;
+        encode32BE(i, data);
+        for (auto b : data) {
+            buffer << b;
+        }
+    }
+
+    void WriteInt64(uint64_t i) {
+        std::vector<uint8_t> data;
+        encode64BE(i, data);
+        for (auto b : data) {
+            buffer << b;
+        }
+    }
+
+    void WriteString(const std::string& s) {
+        WriteInt32(static_cast<uint32_t>(s.size()));
+        buffer << s;
+    }
+
+    void WriteStringSlice(const std::vector<std::string> v) {
+        WriteInt32(static_cast<uint32_t>(v.size()));
+        for (auto& s : v) {
+            WriteString(s);
+        }
+    }
+
+    std::string AsString() { return buffer.str(); }
+
+  private:
+    std::stringstream buffer;
+};
+
+std::string Signer::encodeTransaction(const Proto::Transaction& t) noexcept {
+    IOSTEncoder se;
+    se.WriteInt64(t.time());
+    se.WriteInt64(t.expiration());
+    se.WriteInt64(int64_t(t.gas_ratio() * 100));
+    se.WriteInt64(int64_t(t.gas_limit() * 100));
+    se.WriteInt64(t.delay());
+    se.WriteInt32(int32_t(t.chain_id()));
+    se.WriteString("");
+
+    std::vector<std::string> svec;
+    for (auto& item : t.signers()) {
+        svec.push_back(item);
+    }
+    se.WriteStringSlice(svec);
+
+    se.WriteInt32(t.actions_size());
+    for (auto& a : t.actions()) {
+        IOSTEncoder s;
+        s.WriteString(a.contract());
+        s.WriteString(a.action_name());
+        s.WriteString(a.data());
+        se.WriteString(s.AsString());
+    }
+
+    se.WriteInt32(t.amount_limit_size());
+    for (auto& a : t.amount_limit()) {
+        IOSTEncoder s;
+        s.WriteString(a.token());
+        s.WriteString(a.value());
+        se.WriteString(s.AsString());
+    }
+
+    se.WriteInt32(t.signatures_size());
+    for (auto& sig : t.signatures()) {
+        IOSTEncoder s;
+        s.WriteByte(static_cast<uint8_t>(sig.algorithm()));
+        s.WriteString(sig.signature());
+        s.WriteString(sig.public_key());
+        se.WriteString(s.AsString());
+    }
+
+    return se.AsString();
+}
+
+Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
+    auto t = input.transaction_template();
+
+    if (t.actions_size() == 0) {
+        t.add_actions();
+        auto* action = t.mutable_actions(0);
+        action->set_contract("token.iost");
+        action->set_action_name("transfer");
+
+        std::string token = "iost";
+        std::string src = input.account().name();
+        std::string dst = input.transfer_destination();
+        std::string amount = input.transfer_amount();
+        std::string memo = input.transfer_memo();
+
+        nlohmann::json j;
+        j.push_back(token);
+        j.push_back(src);
+        j.push_back(dst);
+        j.push_back(amount);
+        j.push_back(memo);
+        std::string data = j.dump();
+        action->set_data(data);
+    }
+
+    Account acc(input.account());
+    auto pubkey = acc.publicActiveKey();
+    std::string pubkeyStr(pubkey.begin(), pubkey.end());
+
+    t.add_publisher_sigs();
+    auto* sig = t.mutable_publisher_sigs(0);
+    sig->set_algorithm(Proto::Algorithm::ED25519);
+    sig->set_public_key(pubkeyStr);
+    auto signature = acc.sign(Hash::sha3_256(encodeTransaction(t)), TWCurveED25519);
+    std::string signatureStr(signature.begin(), signature.end());
+    sig->set_signature(signatureStr);
+
+    Proto::SigningOutput protoOutput;
+    protoOutput.mutable_transaction()->CopyFrom(t);
+    std::string transactionJson;
+    google::protobuf::util::JsonOptions jsonOptions;
+    jsonOptions.always_print_enums_as_ints = true;
+    jsonOptions.preserve_proto_field_names = true;
+    google::protobuf::util::MessageToJsonString(t, &transactionJson, jsonOptions);
+    protoOutput.set_encoded(transactionJson);
+    return protoOutput;
+}
+
+Data Signer::signaturePreimage() const {
+    return data(encodeTransaction(input.transaction_template()));
+}
+
+Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey) const {
+    Proto::SigningOutput output;
+    // validate public key
+    if (publicKey.type != TWPublicKeyTypeED25519) {
+        throw std::invalid_argument("Invalid public key");
+    }
+    {
+        // validate correctness of signature
+        const auto hash = Hash::sha3_256(this->signaturePreimage());
+        if (!publicKey.verify(signature, hash)) {
+            throw std::invalid_argument("Invalid signature/hash/publickey combination");
+        }
+    }
+    auto t = input.transaction_template();
+
+    std::string pubkeyStr(publicKey.bytes.begin(), publicKey.bytes.end());
+
+    t.add_publisher_sigs();
+    auto* sig = t.mutable_publisher_sigs(0);
+    sig->set_algorithm(Proto::Algorithm(Proto::ED25519));
+    sig->set_public_key(pubkeyStr);
+    std::string signatureStr(signature.begin(), signature.end());
+    sig->set_signature(signatureStr);
+
+    std::string transactionJson;
+    google::protobuf::util::JsonOptions jsonOptions;
+    jsonOptions.always_print_enums_as_ints = true;
+    jsonOptions.preserve_proto_field_names = true;
+    google::protobuf::util::MessageToJsonString(t, &transactionJson, jsonOptions);
+
+    output.mutable_transaction()->CopyFrom(t);
+    output.set_encoded(transactionJson);
+    return output;
+}
diff --git a/src/IOST/Signer.h b/src/IOST/Signer.h
new file mode 100644
index 00000000000..229a9227160
--- /dev/null
+++ b/src/IOST/Signer.h
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../PrivateKey.h"
+#include "../proto/IOST.pb.h"
+
+namespace TW::IOST {
+class Signer {
+  public:
+    Proto::SigningInput input;
+
+    /// Initializes a transaction signer.
+    explicit Signer(const Proto::SigningInput& input) : input(input) {}
+
+    static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+    static std::string encodeTransaction(const Proto::Transaction& t) noexcept;
+
+    Proto::SigningOutput compile(const Data& signature, const PublicKey& publicKey) const;
+    Data signaturePreimage() const;
+};
+} // namespace TW::IOST
diff --git a/src/Icon/Address.cpp b/src/Icon/Address.cpp
index 6f219a3b537..15eaf1d7a02 100644
--- a/src/Icon/Address.cpp
+++ b/src/Icon/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
@@ -12,14 +10,14 @@
 
 namespace TW::Icon {
 
-static const std::string addressPrefix = "hx";
+static const std::string gAddressPrefix = "hx";
 static const std::string contractPrefix = "cx";
 
 bool Address::isValid(const std::string& string) {
     if (string.size() != Address::size * 2 + 2) {
         return false;
     }
-    if (!std::equal(addressPrefix.begin(), addressPrefix.end(), string.begin()) &&
+    if (!std::equal(gAddressPrefix.begin(), gAddressPrefix.end(), string.begin()) &&
         !std::equal(contractPrefix.begin(), contractPrefix.end(), string.begin())) {
         return false;
     }
@@ -31,7 +29,7 @@ Address::Address(const std::string& string) {
         throw std::invalid_argument("Invalid address data");
     }
 
-    if (std::equal(addressPrefix.begin(), addressPrefix.end(), string.begin())) {
+    if (std::equal(gAddressPrefix.begin(), gAddressPrefix.end(), string.begin())) {
         type = TypeAddress;
     } else if (std::equal(contractPrefix.begin(), contractPrefix.end(), string.begin())) {
         type = TypeContract;
@@ -39,7 +37,7 @@ Address::Address(const std::string& string) {
         throw std::invalid_argument("Invalid address prefix");
     }
 
-    const auto data = parse_hex(string.begin() + 2, string.end());
+    const auto data = parse_hex(string.substr(2));
     std::copy(data.begin(), data.end(), bytes.begin());
 }
 
@@ -53,7 +51,7 @@ Address::Address(const PublicKey& publicKey, enum AddressType type)
 std::string Address::string() const {
     switch (type) {
     case TypeAddress:
-        return addressPrefix + hex(bytes);
+        return gAddressPrefix + hex(bytes);
     case TypeContract:
         return contractPrefix + hex(bytes);
     default:
diff --git a/src/Icon/Address.h b/src/Icon/Address.h
index 8c699e91f71..19da238ac78 100644
--- a/src/Icon/Address.h
+++ b/src/Icon/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Icon/AddressType.h b/src/Icon/AddressType.h
index aea709cbabf..9823182cde5 100644
--- a/src/Icon/AddressType.h
+++ b/src/Icon/AddressType.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Icon/Entry.cpp b/src/Icon/Entry.cpp
index 66c6ff5d2ad..d9e415dbd5b 100644
--- a/src/Icon/Entry.cpp
+++ b/src/Icon/Entry.cpp
@@ -1,11 +1,10 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
+#include "../proto/TransactionCompiler.pb.h"
 #include "Address.h"
 #include "Signer.h"
 
@@ -13,11 +12,11 @@ namespace TW::Icon {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey, Icon::TypeAddress).string();
 }
 
@@ -25,4 +24,33 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            Signer signer(input);
+            auto preImage = signer.preImage();
+            auto preImageHash = signer.hashImage(Data(preImage.begin(), preImage.end()));
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, [[maybe_unused]] const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+            if (signatures.size() > 1) {
+                output.set_error(Common::Proto::Error_no_support_n2n);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_no_support_n2n));
+                return;
+            }
+            auto signedTx = Signer(input).encode(signatures[0]);
+            output.set_encoded(signedTx.data(), signedTx.size());
+        });
+}
+
 } // namespace TW::Icon
diff --git a/src/Icon/Entry.h b/src/Icon/Entry.h
index 9547997f419..3983aea1b5f 100644
--- a/src/Icon/Entry.h
+++ b/src/Icon/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,12 @@ namespace TW::Icon {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
      void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+     Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+     void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Icon
diff --git a/src/Icon/Signer.cpp b/src/Icon/Signer.cpp
index b9c290c867e..e537a72740d 100644
--- a/src/Icon/Signer.cpp
+++ b/src/Icon/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 
@@ -11,7 +9,6 @@
 #include "../HexCoding.h"
 #include "../PrivateKey.h"
 
-#include <boost/multiprecision/cpp_int.hpp>
 #include <nlohmann/json.hpp>
 
 #include <algorithm>
@@ -56,6 +53,10 @@ std::string Signer::preImage() const noexcept {
     return txHash;
 }
 
+TW::Data Signer::hashImage(const Data& image) const {
+    return Hash::sha3_256(image);
+}
+
 std::string Signer::encode(const Data& signature) const noexcept {
     auto json = nlohmann::json();
     json["from"] = input.from_address();
diff --git a/src/Icon/Signer.h b/src/Icon/Signer.h
index 209757dc00f..73c6d518d88 100644
--- a/src/Icon/Signer.h
+++ b/src/Icon/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -32,6 +30,8 @@ class Signer {
     /// Encodes a signed transaction as JSON.
     std::string encode(const Data& signature) const noexcept;
 
+    TW::Data hashImage(const Data& image) const;
+
   private:
     std::map<std::string, std::string> parameters() const noexcept;
 };
diff --git a/src/ImmutableX/Constants.h b/src/ImmutableX/Constants.h
new file mode 100644
index 00000000000..f1b1e485643
--- /dev/null
+++ b/src/ImmutableX/Constants.h
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "uint256.h"
+
+namespace TW::ImmutableX {
+
+namespace internal {
+inline constexpr const char* gLayer = "starkex";
+inline constexpr const char* gApplication = "immutablex";
+inline constexpr const char* gIndex = "1";
+inline const int256_t gStarkCurveA(1);
+inline const int256_t gStarkCurveB("3141592653589793238462643383279502884197169399375105820974944592307816406665");
+inline const int256_t gStarkCurveN("3618502788666131213697322783095070105526743751716087489154079457884512865583");
+inline const int256_t gStarkCurveP("3618502788666131213697322783095070105623107215331596699973092056135872020481");
+inline const int256_t gStarkDeriveBias("112173586448650067624617006275947173271329056303198712163776463194419898833073");
+} // namespace internal
+
+} // namespace TW::ImmutableX
diff --git a/src/ImmutableX/StarkKey.cpp b/src/ImmutableX/StarkKey.cpp
new file mode 100644
index 00000000000..51dec1d669f
--- /dev/null
+++ b/src/ImmutableX/StarkKey.cpp
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <HDWallet.h>
+#include <Hash.h>
+#include <HexCoding.h>
+#include <ImmutableX/Constants.h>
+#include <ImmutableX/StarkKey.h>
+#include <rust/bindgen/WalletCoreRSBindgen.h>
+
+namespace TW::ImmutableX {
+
+uint256_t hashKeyWithIndex(const Data& seed, std::size_t index) {
+    auto data = seed;
+    data.push_back(static_cast<uint8_t>(index));
+    auto out = Hash::sha256(data);
+    return load(out);
+}
+
+std::string grindKey(const Data& seed) {
+    std::size_t index{0};
+    int256_t key = hashKeyWithIndex(seed, index);
+    while (key >= internal::gStarkDeriveBias) {
+        key = hashKeyWithIndex(store(uint256_t(key)), index);
+        index += 1;
+    }
+    auto finalKey = key % internal::gStarkCurveN;
+    std::stringstream ss;
+    ss << std::hex << finalKey;
+    return ss.str();
+}
+
+PrivateKey getPrivateKeyFromSeed(const Data& seed, const DerivationPath& path) {
+    auto key = HDWallet<32>::bip32DeriveRawSeed(TWCoinTypeEthereum, seed, path);
+    auto data = parse_hex(grindKey(key.bytes), true);
+    return PrivateKey(data);
+}
+
+PrivateKey getPrivateKeyFromEthPrivKey(const PrivateKey& ethPrivKey) {
+    return PrivateKey(parse_hex(ImmutableX::grindKey(ethPrivKey.bytes), true));
+}
+
+PrivateKey getPrivateKeyFromRawSignature(const Data& signature, const DerivationPath& derivationPath) {
+    using namespace internal;
+    // The signature is `rsv`, where `s` starts at 32 and is 32 long.
+    auto seed = subData(signature, 32, 32);
+    return getPrivateKeyFromSeed(seed, derivationPath);
+}
+
+} // namespace TW::ImmutableX
diff --git a/src/ImmutableX/StarkKey.h b/src/ImmutableX/StarkKey.h
new file mode 100644
index 00000000000..d5702ede3a1
--- /dev/null
+++ b/src/ImmutableX/StarkKey.h
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "uint256.h"
+#include <PrivateKey.h>
+#include <DerivationPath.h>
+#include <string>
+
+namespace TW::ImmutableX {
+
+uint256_t hashKeyWithIndex(const Data& seed, std::size_t index);
+
+std::string grindKey(const Data& seed);
+
+PrivateKey getPrivateKeyFromSeed(const std::string& seed, const DerivationPath& path);
+
+PrivateKey getPrivateKeyFromEthPrivKey(const PrivateKey& ethPrivKey);
+
+PrivateKey getPrivateKeyFromRawSignature(const Data& signature, const DerivationPath& derivationPath);
+
+} // namespace TW::ImmutableX
diff --git a/src/InternetComputer/Entry.h b/src/InternetComputer/Entry.h
new file mode 100644
index 00000000000..bf879432460
--- /dev/null
+++ b/src/InternetComputer/Entry.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/RustCoinEntry.h"
+
+namespace TW::InternetComputer {
+
+/// Entry point for implementation of InternetComputer coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final : public Rust::RustCoinEntry {
+};
+
+} // namespace TW::InternetComputer
diff --git a/src/IoTeX/Address.cpp b/src/IoTeX/Address.cpp
index 7aca2f45b63..8e387be97c8 100644
--- a/src/IoTeX/Address.cpp
+++ b/src/IoTeX/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
diff --git a/src/IoTeX/Address.h b/src/IoTeX/Address.h
index 5dbf03b4a39..355c63e917c 100644
--- a/src/IoTeX/Address.h
+++ b/src/IoTeX/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/IoTeX/Entry.cpp b/src/IoTeX/Entry.cpp
index 5e427d85a67..2f25cebbd00 100644
--- a/src/IoTeX/Entry.cpp
+++ b/src/IoTeX/Entry.cpp
@@ -1,13 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "Signer.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 using namespace std;
 
@@ -15,11 +14,11 @@ namespace TW::IoTeX {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -27,4 +26,23 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            Signer signer(input);
+            auto signHash = signer.hash();
+            auto preImage = signer.signaturePreimage();
+            output.set_data(preImage.data(), preImage.size());
+            output.set_data_hash(signHash.data(), signHash.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, const auto& publicKey) {
+            output = Signer::compile(input, signature, publicKey);
+        });
+}
 } // namespace TW::IoTeX
diff --git a/src/IoTeX/Entry.h b/src/IoTeX/Entry.h
index ecf04236fc7..3b56c8da833 100644
--- a/src/IoTeX/Entry.h
+++ b/src/IoTeX/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,12 @@ namespace TW::IoTeX {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::IoTeX
diff --git a/src/IoTeX/Signer.cpp b/src/IoTeX/Signer.cpp
index 11f4f9d9067..75c0d2cf7a6 100644
--- a/src/IoTeX/Signer.cpp
+++ b/src/IoTeX/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Hash.h"
@@ -39,10 +37,31 @@ Proto::SigningOutput Signer::build() const {
     return output;
 }
 
+Proto::SigningOutput Signer::compile(const Proto::SigningInput& input, const Data& signature,
+                                     const TW::PublicKey& pubKey) noexcept {
+    auto signer = Signer(input);
+    auto signedAction = Proto::Action();
+    signedAction.mutable_core()->MergeFrom(signer.action);
+
+    signedAction.set_senderpubkey(pubKey.bytes.data(), pubKey.bytes.size());
+    signedAction.set_signature(signature.data(), signature.size());
+    // build output
+    auto output = Proto::SigningOutput();
+    auto serialized = signedAction.SerializeAsString();
+    output.set_encoded(serialized);
+    auto h = Hash::keccak256(serialized);
+    output.set_hash(h.data(), h.size());
+    return output;
+}
+
 Data Signer::hash() const {
     return Hash::keccak256(action.SerializeAsString());
 }
 
+std::string Signer::signaturePreimage() const {
+    return action.SerializeAsString();
+}
+
 void Signer::toActionCore() {
     action.ParseFromString(input.SerializeAsString());
     action.DiscardUnknownFields();
diff --git a/src/IoTeX/Signer.h b/src/IoTeX/Signer.h
index 31fc2c8a15f..217c676a1c5 100644
--- a/src/IoTeX/Signer.h
+++ b/src/IoTeX/Signer.h
@@ -1,14 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Data.h"
-
 #include "proto/IoTeX.pb.h"
+#include "../PrivateKey.h"
 
 namespace TW::IoTeX {
 
@@ -17,6 +15,8 @@ class Signer {
   public:
     /// Signs a Proto::SigningInput transaction
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+    /// Build the compile output
+    static Proto::SigningOutput compile(const Proto::SigningInput& input, const Data& signature, const TW::PublicKey& pubKey) noexcept;
   public:
     Proto::SigningInput input;
     Proto::ActionCore action;
@@ -36,7 +36,8 @@ class Signer {
 
     /// Computes the transaction hash
     Data hash() const;
-
+    /// Get PreImage transaction data
+    std::string signaturePreimage() const;
   protected:
     /// Converts to proto ActionCore from transaction input
     void toActionCore();
diff --git a/src/IoTeX/Staking.cpp b/src/IoTeX/Staking.cpp
index a508c859c1e..4675d899e44 100644
--- a/src/IoTeX/Staking.cpp
+++ b/src/IoTeX/Staking.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Staking.h"
 #include "Data.h"
diff --git a/src/IoTeX/Staking.h b/src/IoTeX/Staking.h
index 73a5e737473..0e716648925 100644
--- a/src/IoTeX/Staking.h
+++ b/src/IoTeX/Staking.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/KeyPair.h b/src/KeyPair.h
index db5627b88b6..d7387c3db2d 100644
--- a/src/KeyPair.h
+++ b/src/KeyPair.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Keystore/AESParameters.cpp b/src/Keystore/AESParameters.cpp
index 6aa7bfdc5b0..4d8a47eef09 100644
--- a/src/Keystore/AESParameters.cpp
+++ b/src/Keystore/AESParameters.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "AESParameters.h"
 
@@ -12,20 +10,44 @@
 
 using namespace TW;
 
-namespace TW::Keystore {
+namespace {
 
-AESParameters::AESParameters() {
-    iv = Data(blockSize, 0);
+Data generateIv(std::size_t blockSize = TW::Keystore::gBlockSize) {
+    auto iv = Data(blockSize, 0);
     random_buffer(iv.data(), blockSize);
+    return iv;
+}
+
+static TWStoredKeyEncryption getCipher(const std::string& cipher) {
+    if (cipher == Keystore::gAes128Ctr) {
+        return TWStoredKeyEncryption::TWStoredKeyEncryptionAes128Ctr;
+    } else if (cipher == Keystore::gAes192Ctr) {
+        return TWStoredKeyEncryption::TWStoredKeyEncryptionAes192Ctr;
+    } else if (cipher == Keystore::gAes256Ctr) {
+        return TWStoredKeyEncryption::TWStoredKeyEncryptionAes256Ctr;
+    }
+    return TWStoredKeyEncryptionAes128Ctr;
 }
 
+const std::unordered_map<TWStoredKeyEncryption, Keystore::AESParameters> gEncryptionRegistry{
+    {TWStoredKeyEncryptionAes128Ctr, Keystore::AESParameters{.mKeyLength = Keystore::A128, .mCipher = Keystore::gAes128Ctr, .mCipherEncryption = TWStoredKeyEncryptionAes128Ctr}},
+    {TWStoredKeyEncryptionAes128Cbc, Keystore::AESParameters{.mKeyLength = Keystore::A128, .mCipher = Keystore::gAes128Cbc, .mCipherEncryption = TWStoredKeyEncryptionAes128Cbc}},
+    {TWStoredKeyEncryptionAes192Ctr, Keystore::AESParameters{.mKeyLength = Keystore::A192, .mCipher = Keystore::gAes192Ctr, .mCipherEncryption = TWStoredKeyEncryptionAes192Ctr}},
+    {TWStoredKeyEncryptionAes256Ctr, Keystore::AESParameters{.mKeyLength = Keystore::A256, .mCipher = Keystore::gAes256Ctr, .mCipherEncryption = TWStoredKeyEncryptionAes256Ctr}}
+};
+} // namespace
+
+namespace TW::Keystore {
+
 namespace CodingKeys {
 static const auto iv = "iv";
 } // namespace CodingKeys
 
 /// Initializes `AESParameters` with a JSON object.
-AESParameters::AESParameters(const nlohmann::json& json) {
-    iv = parse_hex(json[CodingKeys::iv].get<std::string>());
+AESParameters AESParameters::AESParametersFromJson(const nlohmann::json& json, const std::string& cipher) {
+    auto parameters = AESParameters::AESParametersFromEncryption(getCipher(cipher));
+    parameters.iv = parse_hex(json[CodingKeys::iv].get<std::string>());
+    return parameters;
 }
 
 /// Saves `this` as a JSON object.
@@ -35,4 +57,11 @@ nlohmann::json AESParameters::json() const {
     return j;
 }
 
+AESParameters AESParameters::AESParametersFromEncryption(TWStoredKeyEncryption encryption) {
+    auto parameters = gEncryptionRegistry.at(encryption);
+    // be sure to regenerate an iv.
+    parameters.iv = generateIv();
+    return parameters;
+}
+
 } // namespace TW::Keystore
diff --git a/src/Keystore/AESParameters.h b/src/Keystore/AESParameters.h
index edae9ab9b4f..46b49f9ee6c 100644
--- a/src/Keystore/AESParameters.h
+++ b/src/Keystore/AESParameters.h
@@ -1,28 +1,43 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Data.h"
 
 #include <nlohmann/json.hpp>
+#include <TrustWalletCore/TWStoredKeyEncryption.h>
 
 namespace TW::Keystore {
 
-// AES128 parameters.
-struct AESParameters {
-    static const std::size_t blockSize = 128 / 8;
+enum AESKeySize : std::int32_t {
+    Uninitialized = 0,
+    A128 = 16,
+    A192 = 24,
+    A256 = 32,
+};
 
+inline constexpr std::size_t gBlockSize{16};
+inline constexpr const char* gAes128Ctr{"aes-128-ctr"};
+inline constexpr const char* gAes128Cbc{"aes-128-cbc"};
+inline constexpr const char* gAes192Ctr{"aes-192-ctr"};
+inline constexpr const char* gAes256Ctr{"aes-256-ctr"};
+
+// AES128/192/256 parameters.
+struct AESParameters {
+    // For AES, your block length is always going to be 128 bits/16 bytes
+    std::int32_t mBlockSize{gBlockSize};
+    std::int32_t mKeyLength{A128};
+    std::string  mCipher{gAes128Ctr};
+    TWStoredKeyEncryption mCipherEncryption{TWStoredKeyEncryptionAes128Ctr};
     Data iv;
 
-    /// Initializes `AESParameters` with a random `iv` for AES 128.
-    AESParameters();
+    /// Initializes `AESParameters` with a encryption cipher.
+    static AESParameters AESParametersFromEncryption(TWStoredKeyEncryption encryption);;
 
     /// Initializes `AESParameters` with a JSON object.
-    AESParameters(const nlohmann::json& json);
+    static AESParameters AESParametersFromJson(const nlohmann::json& json, const std::string& cipher);
 
     /// Saves `this` as a JSON object.
     nlohmann::json json() const;
diff --git a/src/Keystore/Account.cpp b/src/Keystore/Account.cpp
index 6c061ce30e7..c97b8eb66d1 100644
--- a/src/Keystore/Account.cpp
+++ b/src/Keystore/Account.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Account.h"
 
diff --git a/src/Keystore/Account.h b/src/Keystore/Account.h
index 6c48ec8723f..22a55c5d48d 100644
--- a/src/Keystore/Account.h
+++ b/src/Keystore/Account.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Keystore/EncryptionParameters.cpp b/src/Keystore/EncryptionParameters.cpp
index ad7e6ecf348..db34105c024 100644
--- a/src/Keystore/EncryptionParameters.cpp
+++ b/src/Keystore/EncryptionParameters.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "EncryptionParameters.h"
 
@@ -40,8 +38,8 @@ static const auto mac = "mac";
 } // namespace CodingKeys
 
 EncryptionParameters::EncryptionParameters(const nlohmann::json& json) {
-    cipher = json[CodingKeys::cipher].get<std::string>();
-    cipherParams = AESParameters(json[CodingKeys::cipherParams]);
+    auto cipher = json[CodingKeys::cipher].get<std::string>();
+    cipherParams = AESParameters::AESParametersFromJson(json[CodingKeys::cipherParams], cipher);
 
     auto kdf = json[CodingKeys::kdf].get<std::string>();
     if (kdf == "scrypt") {
@@ -53,7 +51,7 @@ EncryptionParameters::EncryptionParameters(const nlohmann::json& json) {
 
 nlohmann::json EncryptionParameters::json() const {
     nlohmann::json j;
-    j[CodingKeys::cipher] = cipher;
+    j[CodingKeys::cipher] = cipher();
     j[CodingKeys::cipherParams] = cipherParams.json();
 
     if (auto* scryptParams = std::get_if<ScryptParameters>(&kdfParams); scryptParams) {
@@ -76,14 +74,25 @@ EncryptedPayload::EncryptedPayload(const Data& password, const Data& data, const
            scryptParams.desiredKeyLength);
 
     aes_encrypt_ctx ctx;
-    auto result = aes_encrypt_key128(derivedKey.data(), &ctx);
+    auto result = 0;
+    switch(this->params.cipherParams.mCipherEncryption) {
+    case TWStoredKeyEncryptionAes128Ctr:
+    case TWStoredKeyEncryptionAes128Cbc:
+        result = aes_encrypt_key128(derivedKey.data(), &ctx);
+        break;
+    case TWStoredKeyEncryptionAes192Ctr:
+        result = aes_encrypt_key192(derivedKey.data(), &ctx);
+        break;
+    case TWStoredKeyEncryptionAes256Ctr:
+        result = aes_encrypt_key256(derivedKey.data(), &ctx);
+        break;
+    }
     assert(result == EXIT_SUCCESS);
     if (result == EXIT_SUCCESS) {
         Data iv = this->params.cipherParams.iv;
         encrypted = Data(data.size());
         aes_ctr_encrypt(data.data(), encrypted.data(), static_cast<int>(data.size()), iv.data(), aes_ctr_cbuf_inc, &ctx);
-
-        _mac = computeMAC(derivedKey.end() - 16, derivedKey.end(), encrypted);
+        _mac = computeMAC(derivedKey.end() - params.getKeyBytesSize(), derivedKey.end(), encrypted);
     }
 }
 
@@ -101,13 +110,13 @@ Data EncryptedPayload::decrypt(const Data& password) const {
         scrypt(password.data(), password.size(), scryptParams->salt.data(),
                scryptParams->salt.size(), scryptParams->n, scryptParams->r, scryptParams->p, derivedKey.data(),
                scryptParams->defaultDesiredKeyLength);
-        mac = computeMAC(derivedKey.end() - 16, derivedKey.end(), encrypted);
+        mac = computeMAC(derivedKey.end() - params.getKeyBytesSize(), derivedKey.end(), encrypted);
     } else if (auto* pbkdf2Params = std::get_if<PBKDF2Parameters>(&params.kdfParams); pbkdf2Params) {
         derivedKey.resize(pbkdf2Params->defaultDesiredKeyLength);
         pbkdf2_hmac_sha256(password.data(), static_cast<int>(password.size()), pbkdf2Params->salt.data(),
                            static_cast<int>(pbkdf2Params->salt.size()), pbkdf2Params->iterations, derivedKey.data(),
                            pbkdf2Params->defaultDesiredKeyLength);
-        mac = computeMAC(derivedKey.end() - 16, derivedKey.end(), encrypted);
+        mac = computeMAC(derivedKey.end() - params.getKeyBytesSize(), derivedKey.end(), encrypted);
     } else {
         throw DecryptionError::unsupportedKDF;
     }
@@ -118,20 +127,21 @@ Data EncryptedPayload::decrypt(const Data& password) const {
 
     Data decrypted(encrypted.size());
     Data iv = params.cipherParams.iv;
-    if (params.cipher == "aes-128-ctr") {
+    const auto encryption = params.cipherParams.mCipherEncryption;
+    if (encryption == TWStoredKeyEncryptionAes128Ctr || encryption == TWStoredKeyEncryptionAes256Ctr) {
         aes_encrypt_ctx ctx;
-        auto __attribute__((unused)) result = aes_encrypt_key(derivedKey.data(), 16, &ctx);
+        [[maybe_unused]] auto result = aes_encrypt_key(derivedKey.data(), params.getKeyBytesSize(), &ctx);
         assert(result != EXIT_FAILURE);
 
         aes_ctr_decrypt(encrypted.data(), decrypted.data(), static_cast<int>(encrypted.size()), iv.data(),
                         aes_ctr_cbuf_inc, &ctx);
-    } else if (params.cipher == "aes-128-cbc") {
+    } else if (encryption == TWStoredKeyEncryptionAes128Cbc) {
         aes_decrypt_ctx ctx;
-        auto __attribute__((unused)) result = aes_decrypt_key(derivedKey.data(), 16, &ctx);
+        [[maybe_unused]] auto result = aes_decrypt_key(derivedKey.data(), params.getKeyBytesSize(), &ctx);
         assert(result != EXIT_FAILURE);
 
-        for (auto i = 0ul; i < encrypted.size(); i += 16) {
-            aes_cbc_decrypt(encrypted.data() + i, decrypted.data() + i, 16, iv.data(), &ctx);
+        for (auto i = 0ul; i < encrypted.size(); i += params.getKeyBytesSize()) {
+            aes_cbc_decrypt(encrypted.data() + i, decrypted.data() + i, params.getKeyBytesSize(), iv.data(), &ctx);
         }
     } else {
         throw DecryptionError::unsupportedCipher;
diff --git a/src/Keystore/EncryptionParameters.h b/src/Keystore/EncryptionParameters.h
index 6592b9756cd..d12de1b90a2 100644
--- a/src/Keystore/EncryptionParameters.h
+++ b/src/Keystore/EncryptionParameters.h
@@ -1,40 +1,44 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "AESParameters.h"
+#include "Data.h"
 #include "PBKDF2Parameters.h"
 #include "ScryptParameters.h"
-#include "Data.h"
+#include <TrustWalletCore/TWStoredKeyEncryption.h>
 #include <TrustWalletCore/TWStoredKeyEncryptionLevel.h>
 
-#include <variant>
 #include <nlohmann/json.hpp>
 #include <string>
+#include <variant>
 
 namespace TW::Keystore {
 
 /// Set of parameters used when encoding
 struct EncryptionParameters {
-    static EncryptionParameters getPreset(enum TWStoredKeyEncryptionLevel preset) {
+    static EncryptionParameters getPreset(enum TWStoredKeyEncryptionLevel preset, enum TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr) {
         switch (preset) {
-            case TWStoredKeyEncryptionLevelMinimal:
-                return EncryptionParameters(AESParameters(), ScryptParameters::Minimal);
-            case TWStoredKeyEncryptionLevelWeak:
-            case TWStoredKeyEncryptionLevelDefault:
-            default:
-                return EncryptionParameters(AESParameters(), ScryptParameters::Weak);
-            case TWStoredKeyEncryptionLevelStandard:
-                return EncryptionParameters(AESParameters(), ScryptParameters::Standard);
+        case TWStoredKeyEncryptionLevelMinimal:
+            return { AESParameters::AESParametersFromEncryption(encryption), ScryptParameters::minimal() };
+        case TWStoredKeyEncryptionLevelWeak:
+        case TWStoredKeyEncryptionLevelDefault:
+        default:
+            return { AESParameters::AESParametersFromEncryption(encryption), ScryptParameters::weak() };
+        case TWStoredKeyEncryptionLevelStandard:
+            return { AESParameters::AESParametersFromEncryption(encryption), ScryptParameters::standard() };
         }
     }
 
-    /// Cipher algorithm.
-    std::string cipher = "aes-128-ctr";
+    std::int32_t getKeyBytesSize() const noexcept {
+        return cipherParams.mKeyLength;
+    }
+
+    std::string cipher() const noexcept {
+        return cipherParams.mCipher;
+    }
 
     /// Cipher parameters.
     AESParameters cipherParams = AESParameters();
@@ -46,11 +50,11 @@ struct EncryptionParameters {
 
     /// Initializes with standard values.
     EncryptionParameters(AESParameters cipherParams, std::variant<ScryptParameters, PBKDF2Parameters> kdfParams)
-        : cipherParams(std::move(cipherParams))
-        , kdfParams(std::move(kdfParams)) {}
+        : cipherParams(std::move(cipherParams)), kdfParams(std::move(kdfParams)) {
+    }
 
     /// Initializes with a JSON object.
-    EncryptionParameters(const nlohmann::json& json);
+    explicit EncryptionParameters(const nlohmann::json& json);
 
     /// Saves `this` as a JSON object.
     nlohmann::json json() const;
@@ -87,7 +91,7 @@ struct EncryptedPayload {
     EncryptedPayload() = default;
 
     /// Initializes with standard values.
-    EncryptedPayload(const EncryptionParameters& params, const Data& encrypted, const Data& mac)
+    EncryptedPayload(EncryptionParameters  params, Data encrypted, Data mac)
         : params(std::move(params))
         , encrypted(std::move(encrypted))
         , _mac(std::move(mac)) {}
@@ -97,7 +101,7 @@ struct EncryptedPayload {
     EncryptedPayload(const Data& password, const Data& data, const EncryptionParameters& params);
 
     /// Initializes with a JSON object.
-    EncryptedPayload(const nlohmann::json& json);
+    explicit EncryptedPayload(const nlohmann::json& json);
 
     /// Decrypts the payload with the given password.
     Data decrypt(const Data& password) const;
diff --git a/src/Keystore/PBKDF2Parameters.cpp b/src/Keystore/PBKDF2Parameters.cpp
index d364184db07..e965e7bba16 100644
--- a/src/Keystore/PBKDF2Parameters.cpp
+++ b/src/Keystore/PBKDF2Parameters.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "PBKDF2Parameters.h"
 
diff --git a/src/Keystore/PBKDF2Parameters.h b/src/Keystore/PBKDF2Parameters.h
index 175a5106157..1af9ade0ca9 100644
--- a/src/Keystore/PBKDF2Parameters.h
+++ b/src/Keystore/PBKDF2Parameters.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Keystore/ScryptParameters.cpp b/src/Keystore/ScryptParameters.cpp
index cc32e0357a0..4ec194dd5e8 100644
--- a/src/Keystore/ScryptParameters.cpp
+++ b/src/Keystore/ScryptParameters.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "ScryptParameters.h"
 
@@ -13,13 +11,30 @@ using namespace TW;
 
 namespace TW::Keystore {
 
-ScryptParameters ScryptParameters::Minimal = ScryptParameters(Data(), minimalN, defaultR, minimalP, defaultDesiredKeyLength);
-ScryptParameters ScryptParameters::Weak = ScryptParameters(Data(), weakN, defaultR, weakP, defaultDesiredKeyLength);
-ScryptParameters ScryptParameters::Standard = ScryptParameters(Data(), standardN, defaultR, standardP, defaultDesiredKeyLength);
+namespace internal {
 
-ScryptParameters::ScryptParameters()
-    : salt(32) {
+Data randomSalt() {
+    Data salt(32);
     random_buffer(salt.data(), salt.size());
+    return salt;
+}
+
+} // namespace internal
+
+ScryptParameters ScryptParameters::minimal() {
+    return { internal::randomSalt(), minimalN, defaultR, minimalP, defaultDesiredKeyLength };
+}
+
+ScryptParameters ScryptParameters::weak() {
+    return { internal::randomSalt(), weakN, defaultR, weakP, defaultDesiredKeyLength };
+}
+
+ScryptParameters ScryptParameters::standard() {
+    return { internal::randomSalt(), standardN, defaultR, standardP, defaultDesiredKeyLength };
+}
+
+ScryptParameters::ScryptParameters()
+    : salt(internal::randomSalt()) {
 }
 
 #pragma GCC diagnostic ignored "-Wtautological-constant-out-of-range-compare"
diff --git a/src/Keystore/ScryptParameters.h b/src/Keystore/ScryptParameters.h
index b29faa0e344..8c8a3b3de99 100644
--- a/src/Keystore/ScryptParameters.h
+++ b/src/Keystore/ScryptParameters.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -23,10 +21,6 @@ enum class ScryptValidationError {
 
 /// Scrypt function parameters.
 struct ScryptParameters {
-    static ScryptParameters Minimal;
-    static ScryptParameters Weak;
-    static ScryptParameters Standard;
-
     /// The N and P parameters of Scrypt encryption algorithm, using 256MB memory and
     /// taking approximately 1s CPU time on a modern processor.
     static const uint32_t standardN = 1 << 18;
@@ -61,13 +55,20 @@ struct ScryptParameters {
     /// Block size factor.
     uint32_t r = defaultR;
 
+    /// Generates Scrypt encryption parameters with the minimal sufficient level (4096), and with a random salt.
+    static ScryptParameters minimal();
+    /// Generates Scrypt encryption parameters with the weak sufficient level (16k), and with a random salt.
+    static ScryptParameters weak();
+    /// Generates Scrypt encryption parameters with the standard sufficient level (262k), and with a random salt.
+    static ScryptParameters standard();
+
     /// Initializes with default scrypt parameters and a random salt.
     ScryptParameters();
 
     /// Initializes `ScryptParameters` with all values.
     ///
     /// @throws ScryptValidationError if the parameters are invalid.
-    ScryptParameters(const Data& salt, uint32_t n, uint32_t r, uint32_t p, std::size_t desiredKeyLength)
+    ScryptParameters(Data salt, uint32_t n, uint32_t r, uint32_t p, std::size_t desiredKeyLength)
         : salt(std::move(salt)), desiredKeyLength(desiredKeyLength), n(n), p(p), r(r) {
         auto error = validate();
         if (error) {
@@ -81,7 +82,7 @@ struct ScryptParameters {
     std::optional<ScryptValidationError> validate() const;
 
     /// Initializes `ScryptParameters` with a JSON object.
-    ScryptParameters(const nlohmann::json& json);
+    explicit ScryptParameters(const nlohmann::json& json);
 
     /// Saves `this` as a JSON object.
     nlohmann::json json() const;
diff --git a/src/Keystore/StoredKey.cpp b/src/Keystore/StoredKey.cpp
index add26c2ca26..b216461fe31 100644
--- a/src/Keystore/StoredKey.cpp
+++ b/src/Keystore/StoredKey.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "StoredKey.h"
 
@@ -11,12 +9,8 @@
 #include "Mnemonic.h"
 #include "PrivateKey.h"
 
-#define BOOST_UUID_RANDOM_PROVIDER_FORCE_POSIX 1
-
-#include <boost/lexical_cast.hpp>
-#include <boost/uuid/uuid_generators.hpp>
-#include <boost/uuid/uuid_io.hpp>
 #include <nlohmann/json.hpp>
+#include <TrezorCrypto/memzero.h>
 
 #include <cassert>
 #include <fstream>
@@ -26,41 +20,45 @@ using namespace TW;
 
 namespace TW::Keystore {
 
-StoredKey StoredKey::createWithMnemonic(const std::string& name, const Data& password, const std::string& mnemonic, TWStoredKeyEncryptionLevel encryptionLevel) {
+StoredKey StoredKey::createWithMnemonic(const std::string& name, const Data& password, const std::string& mnemonic, TWStoredKeyEncryptionLevel encryptionLevel, TWStoredKeyEncryption encryption) {
     if (!Mnemonic::isValid(mnemonic)) {
         throw std::invalid_argument("Invalid mnemonic");
     }
 
     Data mnemonicData = TW::Data(mnemonic.begin(), mnemonic.end());
-    return StoredKey(StoredKeyType::mnemonicPhrase, name, password, mnemonicData, encryptionLevel);
+    StoredKey key(StoredKeyType::mnemonicPhrase, name, password, mnemonicData, encryptionLevel, encryption);
+    memzero(mnemonicData.data(), mnemonic.size());
+    return key;
 }
 
-StoredKey StoredKey::createWithMnemonicRandom(const std::string& name, const Data& password, TWStoredKeyEncryptionLevel encryptionLevel) {
-    const auto wallet = TW::HDWallet(128, "");
+StoredKey StoredKey::createWithMnemonicRandom(const std::string& name, const Data& password, TWStoredKeyEncryptionLevel encryptionLevel, TWStoredKeyEncryption encryption) {
+    const auto wallet = TW::HDWallet<>(128, "");
     const auto& mnemonic = wallet.getMnemonic();
     assert(Mnemonic::isValid(mnemonic));
     Data mnemonicData = TW::Data(mnemonic.begin(), mnemonic.end());
-    return StoredKey(StoredKeyType::mnemonicPhrase, name, password, mnemonicData, encryptionLevel);
+    StoredKey key(StoredKeyType::mnemonicPhrase, name, password, mnemonicData, encryptionLevel, encryption);
+    memzero(mnemonicData.data(), mnemonic.size());
+    return key;
 }
 
-StoredKey StoredKey::createWithMnemonicAddDefaultAddress(const std::string& name, const Data& password, const std::string& mnemonic, TWCoinType coin) {
-    StoredKey key = createWithMnemonic(name, password, mnemonic, TWStoredKeyEncryptionLevelDefault);
+StoredKey StoredKey::createWithMnemonicAddDefaultAddress(const std::string& name, const Data& password, const std::string& mnemonic, TWCoinType coin, TWStoredKeyEncryption encryption) {
+    StoredKey key = createWithMnemonic(name, password, mnemonic, TWStoredKeyEncryptionLevelDefault, encryption);
     const auto wallet = key.wallet(password);
     key.account(coin, &wallet);
     return key;
 }
 
-StoredKey StoredKey::createWithPrivateKey(const std::string& name, const Data& password, const Data& privateKeyData) {
-    return StoredKey(StoredKeyType::privateKey, name, password, privateKeyData, TWStoredKeyEncryptionLevelDefault);
+StoredKey StoredKey::createWithPrivateKey(const std::string& name, const Data& password, const Data& privateKeyData, TWStoredKeyEncryption encryption) {
+    return StoredKey(StoredKeyType::privateKey, name, password, privateKeyData, TWStoredKeyEncryptionLevelDefault, encryption);
 }
 
-StoredKey StoredKey::createWithPrivateKeyAddDefaultAddress(const std::string& name, const Data& password, TWCoinType coin, const Data& privateKeyData) {
+StoredKey StoredKey::createWithPrivateKeyAddDefaultAddress(const std::string& name, const Data& password, TWCoinType coin, const Data& privateKeyData, TWStoredKeyEncryption encryption) {
     const auto curve = TW::curve(coin);
     if (!PrivateKey::isValid(privateKeyData, curve)) {
         throw std::invalid_argument("Invalid private key data");
     }
 
-    StoredKey key = createWithPrivateKey(name, password, privateKeyData);
+    StoredKey key = createWithPrivateKey(name, password, privateKeyData, encryption);
     const auto derivationPath = TW::derivationPath(coin);
     const auto pubKeyType = TW::publicKeyType(coin);
     const auto pubKey = PrivateKey(privateKeyData).getPublicKey(pubKeyType);
@@ -69,21 +67,23 @@ StoredKey StoredKey::createWithPrivateKeyAddDefaultAddress(const std::string& na
     return key;
 }
 
-StoredKey::StoredKey(StoredKeyType type, std::string name, const Data& password, const Data& data, TWStoredKeyEncryptionLevel encryptionLevel)
+StoredKey::StoredKey(StoredKeyType type, std::string name, const Data& password, const Data& data, TWStoredKeyEncryptionLevel encryptionLevel, TWStoredKeyEncryption encryption)
     : type(type), id(), name(std::move(name)), accounts() {
-    const auto encryptionParams = EncryptionParameters::getPreset(encryptionLevel);
+    const auto encryptionParams = EncryptionParameters::getPreset(encryptionLevel, encryption);
     payload = EncryptedPayload(password, data, encryptionParams);
-    boost::uuids::random_generator gen;
-    id = boost::lexical_cast<std::string>(gen());
+
+    const char* uuid_ptr = Rust::tw_uuid_random();
+    id = std::make_optional<std::string>(uuid_ptr);
+    Rust::free_string(uuid_ptr);
 }
 
-const HDWallet StoredKey::wallet(const Data& password) const {
+const HDWallet<> StoredKey::wallet(const Data& password) const {
     if (type != StoredKeyType::mnemonicPhrase) {
         throw std::invalid_argument("Invalid account requested.");
     }
     const auto data = payload.decrypt(password);
     const auto mnemonic = std::string(reinterpret_cast<const char*>(data.data()), data.size());
-    return HDWallet(mnemonic, "");
+    return HDWallet<>(mnemonic, "");
 }
 
 std::vector<Account> StoredKey::getAccounts(TWCoinType coin) const {
@@ -96,7 +96,7 @@ std::vector<Account> StoredKey::getAccounts(TWCoinType coin) const {
     return result;
 }
 
-std::optional<Account> StoredKey::getDefaultAccount(TWCoinType coin, const HDWallet* wallet) const {
+std::optional<Account> StoredKey::getDefaultAccount(TWCoinType coin, const HDWallet<>* wallet) const {
     // there are multiple, try to look for default
     if (wallet != nullptr) {
         const auto address = wallet->deriveAddress(coin);
@@ -115,7 +115,7 @@ std::optional<Account> StoredKey::getDefaultAccount(TWCoinType coin, const HDWal
     return std::nullopt;
 }
 
-std::optional<Account> StoredKey::getDefaultAccountOrAny(TWCoinType coin, const HDWallet* wallet) const {
+std::optional<Account> StoredKey::getDefaultAccountOrAny(TWCoinType coin, const HDWallet<>* wallet) const {
     const auto defaultAccount = getDefaultAccount(coin, wallet);
     if (defaultAccount.has_value()) {
         return defaultAccount;
@@ -137,13 +137,13 @@ std::optional<Account> StoredKey::getAccount(TWCoinType coin, const std::string&
     return std::nullopt;
 }
 
-std::optional<Account> StoredKey::getAccount(TWCoinType coin, TWDerivation derivation, const HDWallet& wallet) const {
+std::optional<Account> StoredKey::getAccount(TWCoinType coin, TWDerivation derivation, const HDWallet<>& wallet) const {
     // obtain address
     const auto address = wallet.deriveAddress(coin, derivation);
     return getAccount(coin, address);
 }
 
-Account StoredKey::fillAddressIfMissing(Account& account, const HDWallet* wallet) const {
+Account StoredKey::fillAddressIfMissing(Account& account, const HDWallet<>* wallet) const {
     if (account.address.empty() && wallet != nullptr) {
         account.address = wallet->deriveAddress(account.coin, account.derivation);
     }
@@ -155,7 +155,13 @@ Account StoredKey::fillAddressIfMissing(Account& account, const HDWallet* wallet
     return account;
 }
 
-std::optional<const Account> StoredKey::account(TWCoinType coin, const HDWallet* wallet) {
+void StoredKey::updateAddressForAccount(const PrivateKey& privKey, Account& account) {
+    const auto pubKey = privKey.getPublicKey(TW::publicKeyType(account.coin));
+    account.address = TW::deriveAddress(account.coin, pubKey, account.derivation);
+    account.publicKey = hex(pubKey.bytes);
+}
+
+std::optional<const Account> StoredKey::account(TWCoinType coin, const HDWallet<>* wallet) {
     const auto account = getDefaultAccountOrAny(coin, wallet);
     if (account.has_value()) {
         Account accountLval = account.value();
@@ -177,7 +183,7 @@ std::optional<const Account> StoredKey::account(TWCoinType coin, const HDWallet*
     return accounts.back();
 }
 
-Account StoredKey::account(TWCoinType coin, TWDerivation derivation, const HDWallet& wallet) {
+Account StoredKey::account(TWCoinType coin, TWDerivation derivation, const HDWallet<>& wallet) {
     const auto coinAccount = getAccount(coin, derivation, wallet);
     if (coinAccount.has_value()) {
         Account accountLval = coinAccount.value();
@@ -199,7 +205,7 @@ std::optional<const Account> StoredKey::account(TWCoinType coin) const {
     return getDefaultAccountOrAny(coin, nullptr);
 }
 
-std::optional<const Account> StoredKey::account(TWCoinType coin, TWDerivation derivation, const HDWallet& wallet) const {
+std::optional<const Account> StoredKey::account(TWCoinType coin, TWDerivation derivation, const HDWallet<>& wallet) const {
     const auto account = getAccount(coin, derivation, wallet);
     if (account.has_value()) {
         Account accountLval = account.value();
@@ -269,9 +275,7 @@ void StoredKey::fixAddresses(const Data& password) {
             }
             const auto& derivationPath = account.derivationPath;
             const auto key = wallet.getKey(account.coin, derivationPath);
-            const auto pubKey = key.getPublicKey(TW::publicKeyType(account.coin));
-            account.address = TW::deriveAddress(account.coin, pubKey, account.derivation);
-            account.publicKey = hex(pubKey.bytes);
+            updateAddressForAccount(key, account);
         }
     } break;
 
@@ -282,14 +286,30 @@ void StoredKey::fixAddresses(const Data& password) {
                 TW::validateAddress(account.coin, account.address)) {
                 continue;
             }
-            const auto pubKey = key.getPublicKey(TW::publicKeyType(account.coin));
-            account.address = TW::deriveAddress(account.coin, pubKey, account.derivation);
-            account.publicKey = hex(pubKey.bytes);
+            updateAddressForAccount(key, account);
         }
     } break;
     }
 }
 
+bool StoredKey::updateAddress(TWCoinType coin) {
+    bool addressUpdated = false;
+    const auto publicKeyType = TW::publicKeyType(coin);
+
+    for (auto& account : accounts) {
+        // Update the address for the given chain if only `publicKey` is set.
+        if (account.coin == coin && !account.publicKey.empty()) {
+            const auto publicKeyBytes = parse_hex(account.publicKey);
+            const PublicKey publicKey(publicKeyBytes, publicKeyType);
+            account.address = TW::deriveAddress(account.coin, publicKey, account.derivation);
+
+            addressUpdated = true;
+        }
+    }
+
+    return addressUpdated;
+}
+
 // -----------------
 // Encoding/Decoding
 // -----------------
diff --git a/src/Keystore/StoredKey.h b/src/Keystore/StoredKey.h
index 96d3010064b..12eaf5038f4 100644
--- a/src/Keystore/StoredKey.h
+++ b/src/Keystore/StoredKey.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -13,6 +11,7 @@
 
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWDerivation.h>
+#include <TrustWalletCore/TWStoredKeyEncryption.h>
 #include <nlohmann/json.hpp>
 
 #include <optional>
@@ -45,23 +44,23 @@ class StoredKey {
 
     /// Create a new StoredKey, with the given name, mnemonic and password.
     /// @throws std::invalid_argument if mnemonic is invalid
-    static StoredKey createWithMnemonic(const std::string& name, const Data& password, const std::string& mnemonic, TWStoredKeyEncryptionLevel encryptionLevel);
+    static StoredKey createWithMnemonic(const std::string& name, const Data& password, const std::string& mnemonic, TWStoredKeyEncryptionLevel encryptionLevel, TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr);
 
     /// Create a new StoredKey, with the given name, mnemonic and password.
     /// @throws std::invalid_argument if mnemonic is invalid
-    static StoredKey createWithMnemonicRandom(const std::string& name, const Data& password, TWStoredKeyEncryptionLevel encryptionLevel);
+    static StoredKey createWithMnemonicRandom(const std::string& name, const Data& password, TWStoredKeyEncryptionLevel encryptionLevel, TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr);
 
     /// Create a new StoredKey, with the given name, mnemonic and password, and also add the default address for the given coin..
     /// @throws std::invalid_argument if mnemonic is invalid
-    static StoredKey createWithMnemonicAddDefaultAddress(const std::string& name, const Data& password, const std::string& mnemonic, TWCoinType coin);
+    static StoredKey createWithMnemonicAddDefaultAddress(const std::string& name, const Data& password, const std::string& mnemonic, TWCoinType coin, TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr);
 
     /// Create a new StoredKey, with the given name and private key.
     /// @throws std::invalid_argument if privateKeyData is not a valid private key
-    static StoredKey createWithPrivateKey(const std::string& name, const Data& password, const Data& privateKeyData);
+    static StoredKey createWithPrivateKey(const std::string& name, const Data& password, const Data& privateKeyData, TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr);
 
     /// Create a new StoredKey, with the given name and private key, and also add the default address for the given coin..
     /// @throws std::invalid_argument if privateKeyData is not a valid private key
-    static StoredKey createWithPrivateKeyAddDefaultAddress(const std::string& name, const Data& password, TWCoinType coin, const Data& privateKeyData);
+    static StoredKey createWithPrivateKeyAddDefaultAddress(const std::string& name, const Data& password, TWCoinType coin, const Data& privateKeyData, TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr);
 
     /// Create a StoredKey from a JSON object.
     static StoredKey createWithJson(const nlohmann::json& json);
@@ -69,25 +68,25 @@ class StoredKey {
     /// Returns the HDWallet for this key.
     ///
     /// @throws std::invalid_argument if this key is of a type other than `mnemonicPhrase`.
-    const HDWallet wallet(const Data& password) const;
+    const HDWallet<> wallet(const Data& password) const;
 
     /// Returns all the accounts for a specific coin: 0, 1, or more.
     std::vector<Account> getAccounts(TWCoinType coin) const;
 
     /// If found, returns the account for a specific coin. In case of muliple accounts, the default derivation is returned, or the first one is returned.
     /// If none exists, and wallet is not null, an account is created (with default derivation).
-    std::optional<const Account> account(TWCoinType coin, const HDWallet* wallet);
+    std::optional<const Account> account(TWCoinType coin, const HDWallet<>* wallet);
 
     /// If found, returns the account for a specific coin and derivation.  In case of muliple accounts, the first one is returned.
     /// If none exists, an account is created.
-    Account account(TWCoinType coin, TWDerivation derivation, const HDWallet& wallet);
+    Account account(TWCoinType coin, TWDerivation derivation, const HDWallet<>& wallet);
 
     /// Returns the account for a specific coin if it exists.
     /// In case of muliple accounts, the default derivation is returned, or the first one is returned.
     std::optional<const Account> account(TWCoinType coin) const;
     
     /// Returns the account for a specific coin and derivation, if it exists.
-    std::optional<const Account> account(TWCoinType coin, TWDerivation derivation, const HDWallet& wallet) const;
+    std::optional<const Account> account(TWCoinType coin, TWDerivation derivation, const HDWallet<>& wallet) const;
 
     /// Add an account with aribitrary address/derivation path.  Discouraged, use account() versions.
     /// Address must be unique (for a coin).
@@ -145,6 +144,12 @@ class StoredKey {
     /// the encryption password to re-derive addresses from private keys.
     void fixAddresses(const Data& password);
 
+    /// Re-derives address for the account(s) associated with the given coin.
+    ///
+    /// This method can be used if address format has been changed.
+    /// In case of multiple accounts, all of them will be updated.
+    bool updateAddress(TWCoinType coin);
+
 private:
     /// Default constructor, private
     StoredKey() : type(StoredKeyType::mnemonicPhrase) {}
@@ -152,24 +157,27 @@ class StoredKey {
     /// Initializes a `StoredKey` with a type, an encryption password, and unencrypted data.
     /// This constructor will encrypt the provided data with default encryption
     /// parameters.
-    StoredKey(StoredKeyType type, std::string name, const Data& password, const Data& data, TWStoredKeyEncryptionLevel encryptionLevel);
+    StoredKey(StoredKeyType type, std::string name, const Data& password, const Data& data, TWStoredKeyEncryptionLevel encryptionLevel, TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr);
 
     /// Find default account for coin, if exists.  If multiple exist, default is returned.
     /// Optional wallet is needed to derive default address
-    std::optional<Account> getDefaultAccount(TWCoinType coin, const HDWallet* wallet) const;
+    std::optional<Account> getDefaultAccount(TWCoinType coin, const HDWallet<>* wallet) const;
 
     /// Find account for coin, if exists.  If multiple exist, default is returned, or any.
     /// Optional wallet is needed to derive default address
-    std::optional<Account> getDefaultAccountOrAny(TWCoinType coin, const HDWallet* wallet) const;
+    std::optional<Account> getDefaultAccountOrAny(TWCoinType coin, const HDWallet<>* wallet) const;
 
     /// Find account by coin+address (should be one, if multiple, first is returned)
     std::optional<Account> getAccount(TWCoinType coin, const std::string& address) const;
 
     /// Find account by coin+derivation (should be one, if multiple, first is returned)
-    std::optional<Account> getAccount(TWCoinType coin, TWDerivation derivation, const HDWallet& wallet) const;
+    std::optional<Account> getAccount(TWCoinType coin, TWDerivation derivation, const HDWallet<>& wallet) const;
 
     /// Re-derive account address if missing
-    Account fillAddressIfMissing(Account& account, const HDWallet* wallet) const;
+    Account fillAddressIfMissing(Account& account, const HDWallet<>* wallet) const;
+
+    /// Re-derives public key and address for the specified account.
+    static void updateAddressForAccount(const PrivateKey& privKey, Account& account);
 };
 
 } // namespace TW::Keystore
diff --git a/src/Kusama/Address.h b/src/Kusama/Address.h
index 9635b6972ca..6d4758002c2 100644
--- a/src/Kusama/Address.h
+++ b/src/Kusama/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -27,4 +25,3 @@ class Address: public SS58Address {
     Address(const PublicKey& publicKey): SS58Address(publicKey, TWSS58AddressTypeKusama) {}
 };
 } // namespace TW::Kusama
-
diff --git a/src/Kusama/Entry.cpp b/src/Kusama/Entry.cpp
index 28e56d9bfb0..46df5c4bfff 100644
--- a/src/Kusama/Entry.cpp
+++ b/src/Kusama/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -13,11 +11,11 @@ namespace TW::Kusama {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
diff --git a/src/Kusama/Entry.h b/src/Kusama/Entry.h
index f9d566239a1..d127bd39a4d 100644
--- a/src/Kusama/Entry.h
+++ b/src/Kusama/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,8 +12,8 @@ namespace TW::Kusama {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
      Data addressToData(TWCoinType coin, const std::string& address) const;
      void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
 };
diff --git a/src/LiquidStaking/LiquidStaking.cpp b/src/LiquidStaking/LiquidStaking.cpp
new file mode 100644
index 00000000000..fbb83adc742
--- /dev/null
+++ b/src/LiquidStaking/LiquidStaking.cpp
@@ -0,0 +1,271 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "LiquidStaking/LiquidStaking.h"
+#include "Data.h"
+
+// Stride
+#include "proto/Cosmos.pb.h"
+
+// Aptos
+#include "proto/Aptos.pb.h"
+
+// ETH
+#include "Ethereum/ABI/Function.h"
+#include "Ethereum/Address.h"
+#include "proto/Ethereum.pb.h"
+#include "uint256.h"
+
+namespace TW::LiquidStaking {
+
+using BlockchainActionEnumPair = std::pair<Proto::Blockchain, Action>;
+
+struct PairHash {
+    template <class T1, class T2>
+    std::size_t operator()(const std::pair<T1, T2>& pair) const {
+        return std::hash<T1>()(pair.first) ^ std::hash<T2>()(pair.second);
+    }
+};
+
+using EVMLiquidStakingFunctionRegistry = std::unordered_map<BlockchainActionEnumPair, std::string, PairHash>;
+using EVMLiquidStakingParamsRegistry = std::unordered_map<BlockchainActionEnumPair, std::string, PairHash>;
+using EVMLiquidStakingRegistry = std::unordered_map<Proto::Protocol, EVMLiquidStakingFunctionRegistry>;
+
+static const EVMLiquidStakingFunctionRegistry gStraderFunctionRegistry =
+    {{std::make_pair(Proto::POLYGON, Action::Stake), "swapMaticForMaticXViaInstantPool"},
+     {std::make_pair(Proto::POLYGON, Action::Unstake), "requestMaticXSwap"},
+     {std::make_pair(Proto::POLYGON, Action::Withdraw), "claimMaticXSwap"},
+     {std::make_pair(Proto::BNB_BSC, Action::Stake), "deposit"},
+     {std::make_pair(Proto::BNB_BSC, Action::Unstake), "requestWithdraw"}
+};
+
+static const EVMLiquidStakingFunctionRegistry gLidoFunctionRegistry =
+    {{std::make_pair(Proto::ETHEREUM, Action::Stake), "submit"},
+};
+
+static const EVMLiquidStakingRegistry gEVMLiquidStakingRegistry = {
+    {Proto::Protocol::Strader, gStraderFunctionRegistry},
+    {Proto::Protocol::Lido, gLidoFunctionRegistry},
+};
+
+namespace internal {
+    void setTransferDataAndAmount(Ethereum::Proto::Transaction::ContractGeneric& transfer, const Data& payload, const uint256_t& amount) {
+        transfer.set_data(payload.data(), payload.size());
+        Data amountData = store(amount);
+        transfer.set_amount(amountData.data(), amountData.size());
+    }
+
+    void handleStake(const Proto::Stake& stake, const Proto::Blockchain& blockchain, Data& payload, uint256_t& amount, const Proto::Protocol protocol) {
+        Ethereum::ABI::BaseParams params;
+        if (protocol == Proto::Lido) {
+            params.emplace_back(std::make_shared<Ethereum::ABI::ProtoAddress>());
+        }
+        auto funcData = Ethereum::ABI::Function::encodeFunctionCall(gEVMLiquidStakingRegistry.at(protocol).at({blockchain, Action::Stake}), params);
+        if (funcData.has_value()) {
+            payload = funcData.value();
+        }
+        amount = uint256_t(stake.amount());
+    }
+
+    void handleUnstake(const Proto::Unstake& unstake, const Proto::Blockchain& blockchain, Data& payload) {
+        Ethereum::ABI::BaseParams params;
+        params.emplace_back(std::make_shared<Ethereum::ABI::ProtoUInt256>(uint256_t(unstake.amount())));
+        auto functionName = gStraderFunctionRegistry.at({blockchain, Action::Unstake});
+        auto funcData = Ethereum::ABI::Function::encodeFunctionCall(functionName, params);
+        if (funcData.has_value()) {
+            payload = funcData.value();
+        }
+    }
+
+    void handleWithdraw(const Proto::Withdraw& withdraw, const Proto::Blockchain& blockchain, Data& payload) {
+        Ethereum::ABI::BaseParams params;
+        params.emplace_back(std::make_shared<Ethereum::ABI::ProtoUInt256>(uint256_t(withdraw.idx())));
+        auto functionName = gStraderFunctionRegistry.at({blockchain, Action::Withdraw});
+        auto funcData = Ethereum::ABI::Function::encodeFunctionCall(functionName, params);
+        if (funcData.has_value()) {
+            payload = funcData.value();
+        }
+    }
+}
+
+Proto::Output Builder::buildStraderEVM() const {
+    Proto::Output output;
+    if (!mSmartContractAddress) {
+        *output.mutable_status() = generateError(Proto::ERROR_SMART_CONTRACT_ADDRESS_NOT_SET, "Strader protocol require the smart contract address to be set");
+        return output;
+    }
+    auto input = Ethereum::Proto::SigningInput();
+
+    if (this->mBlockchain == Proto::POLYGON || this->mBlockchain == Proto::ETHEREUM) {
+        input.set_tx_mode(Ethereum::Proto::Enveloped);
+    }
+    input.set_to_address(*mSmartContractAddress);
+
+    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
+
+    auto visitFunctor = [&transfer, this](const TAction& value) {
+        Data payload;
+        uint256_t amount;
+
+        if (auto* stake = std::get_if<Proto::Stake>(&value); stake) {
+            internal::handleStake(*stake, mBlockchain, payload, amount, Proto::Protocol::Strader);
+        } else if (auto* unstake = std::get_if<Proto::Unstake>(&value); unstake) {
+            internal::handleUnstake(*unstake, mBlockchain, payload);
+            amount = uint256_t(0);
+        } else if (auto* withdraw = std::get_if<Proto::Withdraw>(&value); withdraw) {
+            internal::handleWithdraw(*withdraw, mBlockchain, payload);
+            amount = uint256_t(0);
+        }
+
+        internal::setTransferDataAndAmount(transfer, payload, amount);
+    };
+
+    std::visit(visitFunctor, this->mAction);
+
+    *output.mutable_ethereum() = input;
+    return output;
+}
+
+Proto::Output Builder::buildTortugaAptos() const {
+    Proto::Output output;
+    if (!mSmartContractAddress) {
+        *output.mutable_status() = generateError(Proto::ERROR_SMART_CONTRACT_ADDRESS_NOT_SET, "Tortuga protocol require the smart contract address to be set");
+        return output;
+    }
+    auto input = Aptos::Proto::SigningInput();
+    auto &liquid_staking_message = *input.mutable_liquid_staking_message();
+    liquid_staking_message.set_smart_contract_address(*mSmartContractAddress);
+
+    auto visitFunctor = [&liquid_staking_message](const TAction& value) {
+        if (auto* stake = std::get_if<Proto::Stake>(&value); stake) {
+            auto& tortuga_stake = *liquid_staking_message.mutable_stake();
+            tortuga_stake.set_amount(std::strtoull(stake->amount().c_str(), nullptr, 0));
+        } else if (auto* unstake = std::get_if<Proto::Unstake>(&value); unstake) {
+            auto& tortuga_unstake = *liquid_staking_message.mutable_unstake();
+            tortuga_unstake.set_amount(std::strtoull(unstake->amount().c_str(), nullptr, 0));
+        } else if (auto* withdraw = std::get_if<Proto::Withdraw>(&value); withdraw) {
+            auto& tortuga_claim = *liquid_staking_message.mutable_claim();
+            tortuga_claim.set_idx(std::strtoull(withdraw->idx().c_str(), nullptr, 0));
+        }
+    };
+
+    std::visit(visitFunctor, this->mAction);
+    *output.mutable_aptos() = input;
+    return output;
+}
+
+Proto::Output Builder::buildStride() const {
+    if (this->mBlockchain != Proto::STRIDE) {
+        auto output = Proto::Output();
+        *output.mutable_status() = generateError(Proto::ERROR_TARGETED_BLOCKCHAIN_NOT_SUPPORTED_BY_PROTOCOL, "Only Stride blockchain is supported on stride for now");
+        return output;
+    }
+
+    Proto::Output output;
+    auto input = Cosmos::Proto::SigningInput();
+    auto visitFunctor = [&input, &output](const TAction& value) {
+        if (auto* stake = std::get_if<Proto::Stake>(&value); stake) {
+            auto& stride_stake = *input.add_messages()->mutable_msg_stride_liquid_staking_stake();
+            stride_stake.set_creator(stake->asset().from_address());
+            stride_stake.set_amount(stake->amount());
+            stride_stake.set_host_denom(stake->asset().denom());
+        } else if (auto* unstake = std::get_if<Proto::Unstake>(&value); unstake) {
+            auto& stride_redeem = *input.add_messages()->mutable_msg_stride_liquid_staking_redeem();
+            stride_redeem.set_creator(unstake->asset().from_address());
+            stride_redeem.set_amount(unstake->amount());
+            stride_redeem.set_host_zone(unstake->receiver_chain_id());
+            stride_redeem.set_receiver(unstake->receiver_address());
+        } else {
+            *output.mutable_status() = generateError(Proto::ERROR_OPERATION_NOT_SUPPORTED_BY_PROTOCOL, "Stride protocol unstake include withdraw operation");
+        }
+    };
+
+    std::visit(visitFunctor, this->mAction);
+    *output.mutable_cosmos() = input;
+    return output;
+}
+
+Proto::Output Builder::buildTortuga() const {
+    if (this->mBlockchain == Proto::APTOS) {
+        return buildTortugaAptos();
+    }
+    auto output = Proto::Output();
+    *output.mutable_status() = generateError(Proto::ERROR_TARGETED_BLOCKCHAIN_NOT_SUPPORTED_BY_PROTOCOL, "Only Aptos blockchain is supported on tortuga for now");
+    return output;
+}
+
+Proto::Output Builder::buildLidoEVM() const {
+    Proto::Output output;
+    if (!mSmartContractAddress) {
+        *output.mutable_status() = generateError(Proto::ERROR_SMART_CONTRACT_ADDRESS_NOT_SET, "Lido protocol require the smart contract address to be set");
+        return output;
+    }
+    auto input = Ethereum::Proto::SigningInput();
+
+    if (this->mBlockchain == Proto::ETHEREUM) {
+        input.set_tx_mode(Ethereum::Proto::Enveloped);
+    }
+    input.set_to_address(*mSmartContractAddress);
+
+    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
+
+
+    auto visitFunctor = [&transfer, this, &output](const TAction& value) {
+        Data payload;
+        uint256_t amount;
+
+        if (auto* stake = std::get_if<Proto::Stake>(&value); stake) {
+            internal::handleStake(*stake, mBlockchain, payload, amount, Proto::Lido);
+        } else {
+            *output.mutable_status() = generateError(Proto::ERROR_OPERATION_NOT_SUPPORTED_BY_PROTOCOL, "Lido protocol only support stake action for now");
+        }
+
+        internal::setTransferDataAndAmount(transfer, payload, amount);
+    };
+
+    std::visit(visitFunctor, this->mAction);
+    *output.mutable_ethereum() = input;
+    return output;
+}
+
+Proto::Output Builder::buildLido() const {
+    switch (this->mBlockchain) {
+    case Proto::ETHEREUM:
+        return buildLidoEVM();
+    default:
+        auto output = Proto::Output();
+        *output.mutable_status() = generateError(Proto::ERROR_TARGETED_BLOCKCHAIN_NOT_SUPPORTED_BY_PROTOCOL, "Only Lido EVM chains is supported for now");
+        return output;
+    }
+}
+
+
+Proto::Output Builder::buildStrader() const {
+    switch (this->mBlockchain) {
+    case Proto::POLYGON:
+    case Proto::BNB_BSC:
+        return buildStraderEVM();
+    default:
+        auto output = Proto::Output();
+        *output.mutable_status() = generateError(Proto::ERROR_TARGETED_BLOCKCHAIN_NOT_SUPPORTED_BY_PROTOCOL, "Only Strader EVM chains is supported for now");
+        return output;
+    }
+}
+
+Proto::Output Builder::build() const {
+    switch (this->mProtocol) {
+    case Proto::Strader:
+        return this->buildStrader();
+    case Proto::Tortuga:
+        return this->buildTortuga();
+    case Proto::Stride:
+        return this->buildStride();
+    case Proto::Lido:
+        return this->buildLido();
+    default:
+        return Proto::Output();
+    }
+}
+
+} // namespace TW::LiquidStaking
diff --git a/src/LiquidStaking/LiquidStaking.h b/src/LiquidStaking/LiquidStaking.h
new file mode 100644
index 00000000000..b4f974b7701
--- /dev/null
+++ b/src/LiquidStaking/LiquidStaking.h
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "proto/LiquidStaking.pb.h"
+#include "TrustWalletCore/TWBlockchain.h"
+#include <variant>
+#include <optional>
+
+namespace TW::LiquidStaking {
+using TAction = std::variant<Proto::Stake, Proto::Unstake, Proto::Withdraw>;
+
+enum class Action {
+    Stake = 0,
+    Unstake = 1,
+    Withdraw = 2
+};
+
+class Builder {
+    TAction mAction;
+    std::string mFromAddress;
+    std::optional<std::string> mSmartContractAddress{std::nullopt};
+    Proto::Protocol mProtocol;
+    Proto::Blockchain mBlockchain;
+
+    Proto::Output buildStraderEVM() const;
+    Proto::Output buildStrader() const;
+    Proto::Output buildTortugaAptos() const;
+    Proto::Output buildTortuga() const;
+    Proto::Output buildStride() const;
+    Proto::Output buildLidoEVM() const;
+    Proto::Output buildLido() const;
+public:
+    Builder() noexcept = default;
+
+    static Builder builder() noexcept { return {}; }
+
+    Builder& protocol(Proto::Protocol protocol) noexcept {
+        mProtocol = protocol;
+        return *this;
+    }
+
+    Builder& blockchain(Proto::Blockchain blockchain) noexcept {
+        mBlockchain = blockchain;
+        return *this;
+    }
+
+    Builder& action(TAction action) noexcept {
+        mAction = std::move(action);
+        return *this;
+    }
+
+    Builder& smartContractAddress(std::string smartContractAddress) noexcept {
+        if (!smartContractAddress.empty()) {
+            mSmartContractAddress = std::move(smartContractAddress);
+        }
+        return *this;
+    }
+
+    Proto::Output build() const;
+};
+
+static inline Proto::Status generateError(Proto::StatusCode code, const std::optional<std::string>& message = std::nullopt) {
+    Proto::Status status;
+    status.set_code(code);
+    switch (code) {
+    case Proto::ERROR_ACTION_NOT_SET:
+        status.set_message(message.value_or("Liquid staking action not set"));
+        break;
+    case Proto::ERROR_TARGETED_BLOCKCHAIN_NOT_SUPPORTED_BY_PROTOCOL:
+        status.set_message(message.value_or("The selected protocol doesn't support the targeted blockchain"));
+        break;
+    case Proto::ERROR_SMART_CONTRACT_ADDRESS_NOT_SET:
+        status.set_message(message.value_or("The selected protocol require a smart contract address to be set"));
+        break;
+    case Proto::ERROR_INPUT_PROTO_DESERIALIZATION:
+        status.set_message(message.value_or("Could not deserialize input proto"));
+        break;
+    case Proto::ERROR_OPERATION_NOT_SUPPORTED_BY_PROTOCOL:
+        status.set_message(message.value_or("The selected protocol doesn't support this liquid staking operation"));
+        break;
+    default:
+        return status;
+    }
+    return status;
+}
+
+static inline Proto::Output build(const Proto::Input& input) {
+    TAction action;
+    switch (input.action_case()) {
+    case Proto::Input::kStake:
+        action = input.stake();
+        break;
+    case Proto::Input::kUnstake:
+        action = input.unstake();
+        break;
+    case Proto::Input::kWithdraw:
+        action = input.withdraw();
+        break;
+    default:
+        auto output = Proto::Output();
+        *output.mutable_status() = generateError(Proto::ERROR_ACTION_NOT_SET);
+        return output;
+    }
+
+    return Builder::builder().action(action).protocol(input.protocol()).smartContractAddress(input.smart_contract_address()).blockchain(input.blockchain()).build();
+}
+} // namespace TW::LiquidStaking
diff --git a/src/LiquidStaking/TWLiquidStaking.cpp b/src/LiquidStaking/TWLiquidStaking.cpp
new file mode 100644
index 00000000000..2b6dceb3451
--- /dev/null
+++ b/src/LiquidStaking/TWLiquidStaking.cpp
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Data.h"
+#include "proto/LiquidStaking.pb.h"
+#include "LiquidStaking/LiquidStaking.h"
+#include "TrustWalletCore/TWLiquidStaking.h"
+
+using namespace TW;
+
+TWData *_Nonnull TWLiquidStakingBuildRequest(TWData *_Nonnull input) {
+    LiquidStaking::Proto::Input inputProto;
+    LiquidStaking::Proto::Output outputProto;
+
+    if (!inputProto.ParseFromArray(TWDataBytes(input), static_cast<int>(TWDataSize(input)))) {
+        *outputProto.mutable_status() = LiquidStaking::generateError(LiquidStaking::Proto::ERROR_INPUT_PROTO_DESERIALIZATION);
+        auto outputData = TW::data(outputProto.SerializeAsString());
+        return TWDataCreateWithBytes(outputData.data(), outputData.size());
+    }
+
+    outputProto = LiquidStaking::build(inputProto);
+    auto outputData = TW::data(outputProto.SerializeAsString());
+    return TWDataCreateWithBytes(outputData.data(), outputData.size());
+}
diff --git a/src/Mnemonic.cpp b/src/Mnemonic.cpp
index 08a3112ec2a..a6e9a2227cd 100644
--- a/src/Mnemonic.cpp
+++ b/src/Mnemonic.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Mnemonic.h"
 
@@ -28,16 +26,15 @@ inline const char* const* mnemonicWordlist() { return wordlist; }
 bool Mnemonic::isValidWord(const std::string& word) {
     const char* wordC = word.c_str();
     const auto len = word.length();
+    // Although this operation is not security-critical, we aim for constant-time operation here as well
+    // (i.e., no early exit on match)
+    auto found = false;
     for (const char* const* w = mnemonicWordlist(); *w != nullptr; ++w) {
-        if (strlen(*w) != len) {
-            continue;
-        }
-        if (strncmp(*w, wordC, len) == 0) {
-            return true;
+        if (std::string(*w).size() == len && strncmp(*w, wordC, len) == 0) {
+            found = true;
         }
     }
-    // not found
-    return false;
+    return found;
 }
 
 std::string Mnemonic::suggest(const std::string& prefix) {
diff --git a/src/Mnemonic.h b/src/Mnemonic.h
index 9071a4d697a..dc6fc4ff2d6 100644
--- a/src/Mnemonic.h
+++ b/src/Mnemonic.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Move/Address.h b/src/Move/Address.h
new file mode 100644
index 00000000000..a734df9cd9e
--- /dev/null
+++ b/src/Move/Address.h
@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include <array>
+
+namespace TW::Move {
+template <typename Derived, std::size_t N = 32, bool StrictPadding = false>
+class Address {
+private:
+    static constexpr std::size_t shortSizeAddress = 3;
+    static constexpr std::size_t hexShortSizeAddress = shortSizeAddress - 2;
+    static constexpr std::size_t hexSizeAddress = N*2;
+
+    static std::string normalize(const std::string& string, std::size_t hexLen) {
+        std::string hexStr((size * 2) - hexLen, '0');
+        hexStr.append(string);
+        return hexStr;
+    }
+
+    /// Determines whether a collection of bytes makes a valid address.
+    static bool isValid(const Data& data) { return data.size() == size; }
+public:
+    static constexpr int size = N;
+    std::array<int, N> bytes;
+
+    /// Determines whether a string makes a valid address.
+    static bool isValid(const std::string& string) {
+        if (!is_hex_encoded(string)) {
+            return false;
+        }
+        auto address = string;
+        if (address.starts_with("0x")) {
+            address = address.substr(2);
+        }
+        if (address.size() == hexShortSizeAddress || (StrictPadding && (address.size() < hexSizeAddress))) {
+            address = normalize(address, address.size());
+        }
+        if (address.size() != 2 * Address::size) {
+            return false;
+        }
+        const auto data = parse_hex(address);
+        return isValid(data);
+    };
+
+    Address() noexcept = default;
+
+    Address(const std::string& string) {
+        if (!isValid(string)) {
+            throw std::invalid_argument("Invalid address string");
+        }
+        auto hexFunctor = [&string]() {
+            std::size_t hexLen = string.size() - 2;
+            bool isExpectedLen = hexLen == hexShortSizeAddress;
+            if (string.starts_with("0x") && (isExpectedLen || (StrictPadding && (hexLen < hexSizeAddress)))) {
+                //! We have specific address like 0x1, padding it.
+                return parse_hex(normalize(string.substr(2), hexLen));
+            } else {
+                auto address = string;
+                if (StrictPadding && (address.size() < hexSizeAddress)) {
+                    address = normalize(address, address.size());
+                }
+                return parse_hex(address);
+            }
+        };
+
+        const auto data = hexFunctor();
+        std::copy(data.begin(), data.end(), bytes.begin());
+    }
+
+    Address(const Data& data) {
+        if (!isValid(data)) {
+            throw std::invalid_argument("Invalid address data");
+        }
+        std::copy_n(data.begin(), size, bytes.begin());
+    }
+
+    Address(const PublicKey& publicKey, TW::Hash::Hasher hasher = Hash::Hasher::HasherSha3_256) {
+        if (publicKey.type != TWPublicKeyTypeED25519) {
+            throw std::invalid_argument("Invalid public key type");
+        }
+        auto digest = static_cast<Derived*>(this)->getDigest(publicKey);
+        const auto data = functionPointerFromEnum(hasher)(digest.data(), digest.size());
+        std::copy_n(data.begin(), Address::size, bytes.begin());
+    }
+
+    static Derived zero() {
+        return Derived("0x0");
+    }
+
+    static Derived one() {
+        return Derived("0x1");
+    }
+
+    static Derived three() {
+        return Derived("0x3");
+    }
+
+    /// Returns a string representation of the address.
+    [[nodiscard]] std::string string(bool withPrefix = true) const {
+        std::string output = withPrefix ? "0x" : "";
+        return output + hex(bytes);
+    };
+
+    /// Returns a short string representation of the address. E.G 0x1;
+    [[nodiscard]] std::string shortString() const {
+        std::string s = hex(bytes);
+        s.erase(0, s.find_first_not_of('0'));
+        return s;
+    };
+};
+} // namespace TW::Move
diff --git a/src/MultiversX/Address.cpp b/src/MultiversX/Address.cpp
new file mode 100644
index 00000000000..2b3c3a89cec
--- /dev/null
+++ b/src/MultiversX/Address.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWHRP.h>
+
+#include "Address.h"
+
+namespace TW::MultiversX {
+
+const std::string Address::hrp = HRP_ELROND;
+
+bool Address::isValid(const std::string& string) {
+    return Bech32Address::isValid(string, hrp);
+}
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Address.h b/src/MultiversX/Address.h
new file mode 100644
index 00000000000..2047e9b1df2
--- /dev/null
+++ b/src/MultiversX/Address.h
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "../Bech32Address.h"
+#include "../PublicKey.h"
+
+#include <string>
+
+namespace TW::MultiversX {
+
+class Address : public Bech32Address {
+public:
+    /// The human-readable part of the address, as defined in "registry.json"
+    static const std::string hrp; // HRP_ELROND
+
+    /// Determines whether a string makes a valid address.
+    static bool isValid(const std::string& string);
+
+    Address()
+        : Bech32Address(hrp) {}
+
+    /// Initializes an address with a key hash.
+    Address(Data keyHash)
+        : Bech32Address(hrp, keyHash) {}
+
+    /// Initializes an address with a public key.
+    Address(const PublicKey& publicKey)
+        : Bech32Address(hrp, publicKey.bytes) {}
+
+    static bool decode(const std::string& addr, Address& obj_out) {
+        return Bech32Address::decode(addr, obj_out, hrp);
+    }
+};
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Codec.cpp b/src/MultiversX/Codec.cpp
new file mode 100644
index 00000000000..95e19883315
--- /dev/null
+++ b/src/MultiversX/Codec.cpp
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Codec.h"
+
+#include "HexCoding.h"
+#include "uint256.h"
+
+namespace TW::MultiversX {
+
+std::string Codec::encodeString(const std::string& value) {
+    std::string encoded = hex(TW::data(value));
+    return encoded;
+}
+
+std::string Codec::encodeUint64(uint64_t value) {
+    std::string encoded = hex(store(uint256_t(value)));
+    return encoded;
+}
+
+std::string Codec::encodeBigInt(const std::string& value) {
+    return encodeBigInt(uint256_t(value));
+}
+
+// For reference, see https://docs.multiversx.com/developers/developer-reference/serialization-format#arbitrary-width-big-numbers.
+std::string Codec::encodeBigInt(uint256_t value) {
+    std::string encoded = hex(store(value));
+    return encoded;
+}
+
+std::string Codec::encodeAddress(const std::string& bech32Address) {
+    Address address;
+    Address::decode(bech32Address, address);
+    return encodeAddress(address);
+}
+
+std::string Codec::encodeAddress(const Address& address) {
+    std::string encoded = hex(address.getKeyHash());
+    return encoded;
+}
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Codec.h b/src/MultiversX/Codec.h
new file mode 100644
index 00000000000..88d30aa7db3
--- /dev/null
+++ b/src/MultiversX/Codec.h
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Address.h"
+#include "uint256.h"
+
+namespace TW::MultiversX {
+
+/// A stripped-down variant of the MultiversX codec.
+/// For reference, see:
+/// - https://docs.multiversx.com/developers/developer-reference/overview
+/// - https://github.com/multiversx/mx-sdk-erdjs/tree/main/src/smartcontracts/codec
+/// - https://github.com/multiversx/mx-sdk-rs/tree/master/framework/codec
+class Codec {
+public:
+    static std::string encodeString(const std::string& value);
+    static std::string encodeUint64(uint64_t value);
+    static std::string encodeBigInt(const std::string& value);
+    static std::string encodeBigInt(TW::uint256_t value);
+    static std::string encodeAddress(const std::string& bech32Address);
+    static std::string encodeAddress(const Address& address);
+};
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Entry.cpp b/src/MultiversX/Entry.cpp
new file mode 100644
index 00000000000..7aec5758beb
--- /dev/null
+++ b/src/MultiversX/Entry.cpp
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Entry.h"
+#include "Address.h"
+#include "Signer.h"
+#include <proto/TransactionCompiler.pb.h>
+
+using namespace TW;
+using namespace std;
+
+namespace TW::MultiversX {
+// Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
+
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Address::isValid(address);
+}
+
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Address(publicKey).string();
+}
+
+Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    Address addr;
+    if (!MultiversX::Address::decode(address, addr)) {
+        return Data();
+    }
+    return addr.getKeyHash();
+}
+
+void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
+    signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
+}
+
+string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string& json, const Data& key) const {
+    return Signer::signJSON(json, key);
+}
+
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto unsignedTxBytes = Signer::buildUnsignedTxBytes(input);
+            output.set_data(unsignedTxBytes.data(), unsignedTxBytes.size());
+            output.set_data_hash(unsignedTxBytes.data(), unsignedTxBytes.size()); });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, [[maybe_unused]] const auto& publicKey) {
+            output = Signer::buildSigningOutput(input, signature);
+        });
+}
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Entry.h b/src/MultiversX/Entry.h
new file mode 100644
index 00000000000..a51b55efac2
--- /dev/null
+++ b/src/MultiversX/Entry.h
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../CoinEntry.h"
+
+namespace TW::MultiversX {
+
+/// Entry point for implementation of MultiversX coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final : public CoinEntry {
+public:
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool supportsJSONSigning() const { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
+};
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Serialization.cpp b/src/MultiversX/Serialization.cpp
new file mode 100644
index 00000000000..dbd7dc25a21
--- /dev/null
+++ b/src/MultiversX/Serialization.cpp
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Serialization.h"
+
+#include "Address.h"
+#include "Base64.h"
+
+using namespace TW;
+
+std::map<std::string, int> fields_order{
+    {"nonce", 1},
+    {"value", 2},
+    {"receiver", 3},
+    {"sender", 4},
+    {"senderUsername", 5},
+    {"receiverUsername", 6},
+    {"gasPrice", 7},
+    {"gasLimit", 8},
+    {"data", 9},
+    {"chainID", 10},
+    {"version", 11},
+    {"signature", 12},
+    {"options", 13},
+    {"guardian", 14}};
+
+struct FieldsSorter {
+    bool operator()(const std::string& lhs, const std::string& rhs) const {
+        return fields_order[lhs] < fields_order[rhs];
+    }
+};
+
+template <class Key, class T, class Compare, class Allocator>
+using sorted_map = std::map<Key, T, FieldsSorter, Allocator>;
+using sorted_json = nlohmann::basic_json<sorted_map>;
+
+sorted_json preparePayload(const MultiversX::Transaction& transaction) {
+    using namespace nlohmann;
+    sorted_json payload{
+        {"nonce", json(transaction.nonce)},
+        {"value", json(transaction.value)},
+        {"receiver", json(transaction.receiver)},
+        {"sender", json(transaction.sender)},
+        {"gasPrice", json(transaction.gasPrice)},
+        {"gasLimit", json(transaction.gasLimit)},
+    };
+
+    if (!transaction.senderUsername.empty()) {
+        payload["senderUsername"] = json(Base64::encode(data(transaction.senderUsername)));
+    }
+
+    if (!transaction.receiverUsername.empty()) {
+        payload["receiverUsername"] = json(Base64::encode(data(transaction.receiverUsername)));
+    }
+
+    if (!transaction.data.empty()) {
+        payload["data"] = json(Base64::encode(data(transaction.data)));
+    }
+
+    payload["chainID"] = json(transaction.chainID);
+    payload["version"] = json(transaction.version);
+
+    if (transaction.options != 0) {
+        payload["options"] = json(transaction.options);
+    }
+
+    if (!transaction.guardian.empty()) {
+        payload["guardian"] = json(transaction.guardian);
+    }
+
+    return payload;
+}
+
+std::string MultiversX::serializeTransaction(const MultiversX::Transaction& transaction) {
+    sorted_json payload = preparePayload(transaction);
+    return payload.dump();
+}
+
+std::string MultiversX::serializeSignedTransaction(const MultiversX::Transaction& transaction, std::string signature) {
+    sorted_json payload = preparePayload(transaction);
+    payload["signature"] = nlohmann::json(signature);
+    return payload.dump();
+}
diff --git a/src/MultiversX/Serialization.h b/src/MultiversX/Serialization.h
new file mode 100644
index 00000000000..c344bf0593e
--- /dev/null
+++ b/src/MultiversX/Serialization.h
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "Transaction.h"
+#include <nlohmann/json.hpp>
+
+namespace TW::MultiversX {
+
+using string = std::string;
+using json = nlohmann::json;
+
+string serializeTransaction(const Transaction& transaction);
+string serializeSignedTransaction(const Transaction& transaction, string encodedSignature);
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Signer.cpp b/src/MultiversX/Signer.cpp
new file mode 100644
index 00000000000..a2a80fdedd3
--- /dev/null
+++ b/src/MultiversX/Signer.cpp
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Signer.h"
+#include "Address.h"
+#include "HexCoding.h"
+#include "Serialization.h"
+#include "TransactionFactory.h"
+
+#include <google/protobuf/util/json_util.h>
+
+namespace TW::MultiversX {
+
+Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
+    TransactionFactory factory;
+
+    auto privateKey = PrivateKey(input.private_key());
+    auto signableAsData = buildUnsignedTxBytes(input);
+    auto signature = privateKey.sign(signableAsData, TWCurveED25519);
+
+    return buildSigningOutput(input, signature);
+}
+
+std::string Signer::signJSON(const std::string& json, const Data& key) {
+    auto input = Proto::SigningInput();
+    google::protobuf::util::JsonStringToMessage(json, &input);
+    input.set_private_key(key.data(), key.size());
+    auto output = sign(input);
+    return output.encoded();
+}
+
+Data Signer::buildUnsignedTxBytes(const Proto::SigningInput &input) {
+    TransactionFactory factory;
+    auto transaction = factory.create(input);
+    auto signableAsString = serializeTransaction(transaction);
+
+    auto signableAsData = TW::data(signableAsString);
+    return signableAsData;
+}
+
+Proto::SigningOutput Signer::buildSigningOutput(const Proto::SigningInput &input, const Data &signature) {
+    TransactionFactory factory;
+
+    auto transaction = factory.create(input);
+    auto encodedSignature = hex(signature);
+    auto encoded = serializeSignedTransaction(transaction, encodedSignature);
+
+    auto protoOutput = Proto::SigningOutput();
+    protoOutput.set_signature(encodedSignature);
+    protoOutput.set_encoded(encoded);
+    return protoOutput;
+}
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Signer.h b/src/MultiversX/Signer.h
new file mode 100644
index 00000000000..7ccc88de919
--- /dev/null
+++ b/src/MultiversX/Signer.h
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "../PrivateKey.h"
+#include "../proto/MultiversX.pb.h"
+
+namespace TW::MultiversX {
+
+/// Helper class that performs MultiversX transaction signing.
+class Signer {
+public:
+    /// Hide default constructor
+    Signer() = delete;
+
+    /// Signs a Proto::SigningInput transaction
+    static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+    
+    /// Signs a json Proto::SigningInput with private key
+    static std::string signJSON(const std::string& json, const Data& key);
+
+    static Data buildUnsignedTxBytes(const Proto::SigningInput &input);
+    static Proto::SigningOutput buildSigningOutput(const Proto::SigningInput &input, const Data &signature);
+};
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Transaction.cpp b/src/MultiversX/Transaction.cpp
new file mode 100644
index 00000000000..54f38c135cb
--- /dev/null
+++ b/src/MultiversX/Transaction.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Transaction.h"
+
+namespace TW::MultiversX {
+
+Transaction::Transaction()
+    : nonce(0), sender(""), senderUsername(""), receiver(""), receiverUsername(""), guardian(""), value("0"), data(""), gasPrice(0), gasLimit(0), chainID(""), version(0), options(TransactionOptions::Default) {
+}
+
+bool Transaction::hasGuardian() const {
+    return !guardian.empty();
+}
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/Transaction.h b/src/MultiversX/Transaction.h
new file mode 100644
index 00000000000..518c39b201a
--- /dev/null
+++ b/src/MultiversX/Transaction.h
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace TW::MultiversX {
+
+enum TransactionOptions : uint32_t {
+    Default = 0,
+    // Not applicable for applications based on TW Core (as of April 2023).
+    HashSign = 1,
+    // Whether the transaction is guarded (using a guardian account).
+    // Generally speaking, applications can ignore this option (though some can choose to implement guarded transactions).
+    Guarded = 2
+};
+
+class Transaction {
+public:
+    uint64_t nonce;
+    std::string sender;
+    std::string senderUsername;
+    std::string receiver;
+    std::string receiverUsername;
+    std::string guardian;
+    std::string value;
+    std::string data;
+    uint64_t gasPrice;
+    uint64_t gasLimit;
+    std::string chainID;
+    uint32_t version;
+    TransactionOptions options;
+
+    Transaction();
+
+    bool hasGuardian() const;
+};
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/TransactionFactory.cpp b/src/MultiversX/TransactionFactory.cpp
new file mode 100644
index 00000000000..6894ce17f03
--- /dev/null
+++ b/src/MultiversX/TransactionFactory.cpp
@@ -0,0 +1,185 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TransactionFactory.h"
+
+#include "Codec.h"
+
+namespace TW::MultiversX {
+
+const int TX_VERSION = 2;
+
+TransactionFactory::TransactionFactory()
+    : TransactionFactory(TransactionFactoryConfig::GetDefault()) {
+}
+
+TransactionFactory::TransactionFactory(const TransactionFactoryConfig& config)
+    : config(config) {
+}
+
+Transaction TransactionFactory::create(const Proto::SigningInput& input) {
+    if (input.has_egld_transfer()) {
+        return fromEGLDTransfer(input);
+    } else if (input.has_esdt_transfer()) {
+        return fromESDTTransfer(input);
+    } else if (input.has_esdtnft_transfer()) {
+        return fromESDTNFTTransfer(input);
+    } else {
+        return fromGenericAction(input);
+    }
+}
+
+/// Copies the input fields into a transaction object, without any other logic.
+Transaction TransactionFactory::fromGenericAction(const Proto::SigningInput& input) {
+    auto action = input.generic_action();
+
+    Transaction transaction;
+    transaction.nonce = action.accounts().sender_nonce();
+    transaction.sender = action.accounts().sender();
+    transaction.senderUsername = action.accounts().sender_username();
+    transaction.receiver = action.accounts().receiver();
+    transaction.receiverUsername = action.accounts().receiver_username();
+    transaction.guardian = action.accounts().guardian();
+    transaction.value = action.value();
+    transaction.data = action.data();
+    transaction.gasLimit = input.gas_limit();
+    transaction.gasPrice = input.gas_price();
+    transaction.chainID = input.chain_id();
+    transaction.version = action.version();
+    transaction.options = static_cast<TransactionOptions>(action.options());
+
+    return transaction;
+}
+
+Transaction TransactionFactory::fromEGLDTransfer(const Proto::SigningInput& input) {
+    auto transfer = input.egld_transfer();
+
+    Transaction transaction;
+    transaction.nonce = transfer.accounts().sender_nonce();
+    transaction.sender = transfer.accounts().sender();
+    transaction.senderUsername = transfer.accounts().sender_username();
+    transaction.receiver = transfer.accounts().receiver();
+    transaction.receiverUsername = transfer.accounts().receiver_username();
+    transaction.guardian = transfer.accounts().guardian();
+    transaction.value = transfer.amount();
+    transaction.data = transfer.data();
+    transaction.gasPrice = coalesceGasPrice(input.gas_price());
+    transaction.chainID = coalesceChainId(input.chain_id());
+    transaction.version = transfer.version() ? transfer.version() : TX_VERSION;
+    transaction.options = decideOptions(transaction);
+
+    // Estimate & set gasLimit:
+    uint64_t estimatedGasLimit = computeGasLimit(0, 0, transaction.hasGuardian());
+    transaction.gasLimit = coalesceGasLimit(input.gas_limit(), estimatedGasLimit);
+
+    return transaction;
+}
+
+Transaction TransactionFactory::fromESDTTransfer(const Proto::SigningInput& input) {
+    auto transfer = input.esdt_transfer();
+
+    std::string encodedTokenIdentifier = Codec::encodeString(transfer.token_identifier());
+    std::string encodedAmount = Codec::encodeBigInt(transfer.amount());
+    std::string data = prepareFunctionCall("ESDTTransfer", {encodedTokenIdentifier, encodedAmount});
+
+    Transaction transaction;
+    transaction.nonce = transfer.accounts().sender_nonce();
+    transaction.sender = transfer.accounts().sender();
+    transaction.senderUsername = transfer.accounts().sender_username();
+    transaction.receiver = transfer.accounts().receiver();
+    transaction.receiverUsername = transfer.accounts().receiver_username();
+    transaction.guardian = transfer.accounts().guardian();
+    transaction.value = "0";
+    transaction.data = data;
+    transaction.gasPrice = coalesceGasPrice(input.gas_price());
+    transaction.chainID = coalesceChainId(input.chain_id());
+    transaction.version = transfer.version() ? transfer.version() : TX_VERSION;
+    transaction.options = decideOptions(transaction);
+
+    // Estimate & set gasLimit:
+    uint64_t executionGasLimit = this->config.getGasCostESDTTransfer() + this->config.getAdditionalGasForESDTTransfer();
+    uint64_t estimatedGasLimit = computeGasLimit(data.size(), executionGasLimit, transaction.hasGuardian());
+    transaction.gasLimit = coalesceGasLimit(input.gas_limit(), estimatedGasLimit);
+
+    return transaction;
+}
+
+Transaction TransactionFactory::fromESDTNFTTransfer(const Proto::SigningInput& input) {
+    auto transfer = input.esdtnft_transfer();
+
+    std::string encodedCollection = Codec::encodeString(transfer.token_collection());
+    std::string encodedNonce = Codec::encodeUint64(transfer.token_nonce());
+    std::string encodedQuantity = Codec::encodeBigInt(transfer.amount());
+    std::string encodedReceiver = Codec::encodeAddress(transfer.accounts().receiver());
+    std::string data = prepareFunctionCall("ESDTNFTTransfer", {encodedCollection, encodedNonce, encodedQuantity, encodedReceiver});
+
+    Transaction transaction;
+    transaction.nonce = transfer.accounts().sender_nonce();
+    // For NFT, SFT and MetaESDT, transaction.sender == transaction.receiver.
+    transaction.sender = transfer.accounts().sender();
+    transaction.receiver = transfer.accounts().sender();
+    transaction.guardian = transfer.accounts().guardian();
+    transaction.value = "0";
+    transaction.data = data;
+    transaction.gasPrice = coalesceGasPrice(input.gas_price());
+    transaction.chainID = coalesceChainId(input.chain_id());
+    transaction.version = transfer.version() ? transfer.version() : TX_VERSION;
+    transaction.options = decideOptions(transaction);
+
+    // Estimate & set gasLimit:
+    uint64_t executionGasLimit = this->config.getGasCostESDTNFTTransfer() + this->config.getAdditionalGasForESDTNFTTransfer();
+    uint64_t estimatedGasLimit = computeGasLimit(data.size(), executionGasLimit, transaction.hasGuardian());
+    transaction.gasLimit = coalesceGasLimit(input.gas_limit(), estimatedGasLimit);
+
+    return transaction;
+}
+
+uint64_t TransactionFactory::computeGasLimit(size_t dataLength, uint64_t executionGasLimit, bool hasGuardian) {
+    uint64_t dataMovementGasLimit = this->config.getMinGasLimit() + this->config.getGasPerDataByte() * dataLength;
+    uint64_t gasLimit = dataMovementGasLimit + executionGasLimit;
+
+    if (hasGuardian) {
+        gasLimit += this->config.getExtraGasLimitForGuardedTransaction();
+    }
+
+    return gasLimit;
+}
+
+uint64_t TransactionFactory::coalesceGasLimit(uint64_t providedGasLimit, uint64_t estimatedGasLimit) {
+    return providedGasLimit > 0 ? providedGasLimit : estimatedGasLimit;
+}
+
+uint64_t TransactionFactory::coalesceGasPrice(uint64_t gasPrice) {
+    return gasPrice > 0 ? gasPrice : this->config.getMinGasPrice();
+}
+
+std::string TransactionFactory::coalesceChainId(std::string chainID) {
+    return chainID.empty() ? this->config.getChainId() : chainID;
+}
+
+TransactionOptions TransactionFactory::decideOptions(const Transaction& transaction) {
+    TransactionOptions options = TransactionOptions::Default;
+
+    if (transaction.hasGuardian()) {
+        options = static_cast<TransactionOptions>(options | TransactionOptions::Guarded);
+    }
+
+    return options;
+}
+
+std::string TransactionFactory::prepareFunctionCall(const std::string& function, std::initializer_list<const std::string> arguments) {
+    const auto ARGUMENTS_SEPARATOR = "@";
+    std::string result;
+
+    result.append(function);
+
+    for (auto argument : arguments) {
+        result.append(ARGUMENTS_SEPARATOR);
+        result.append(argument);
+    }
+
+    return result;
+}
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/TransactionFactory.h b/src/MultiversX/TransactionFactory.h
new file mode 100644
index 00000000000..f3a62e019e6
--- /dev/null
+++ b/src/MultiversX/TransactionFactory.h
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Address.h"
+#include "Transaction.h"
+#include "TransactionFactoryConfig.h"
+#include "uint256.h"
+#include "../proto/MultiversX.pb.h"
+
+namespace TW::MultiversX {
+
+/// Creates specific transaction objects, wrt. the provided "TransactionFactoryConfig".
+class TransactionFactory {
+private:
+    TransactionFactoryConfig config;
+
+public:
+    TransactionFactory();
+    TransactionFactory(const TransactionFactoryConfig& config);
+
+    /// Creates the appropriate transaction object, with respect to the "oneof" field (substructure) of Proto::SigningInput.
+    Transaction create(const Proto::SigningInput& input);
+
+    Transaction fromGenericAction(const Proto::SigningInput& input);
+
+    /// This should be used to transfer EGLD.
+    /// For reference, see: https://docs.multiversx.com/developers/signing-transactions/signing-transactions.
+    Transaction fromEGLDTransfer(const Proto::SigningInput& input);
+
+    /// This should be used to transfer regular ESDTs (fungible tokens).
+    /// For reference, see: https://docs.multiversx.com/developers/esdt-tokens
+    ///
+    /// The "regular" ESDT tokens held by an account can be fetched from https://api.multiversx.com/accounts/{address}/tokens.
+    Transaction fromESDTTransfer(const Proto::SigningInput& input);
+
+    /// This should be used to transfer NFTs, SFTs and Meta ESDTs.
+    /// For reference, see: https://docs.multiversx.com/developers/nft-tokens
+    ///
+    /// The semi-fungible and non-fungible tokens held by an account can be fetched from https://api.multiversx.com/accounts/{address}/nfts?type=SemiFungibleESDT,NonFungibleESDT.
+    /// The Meta ESDTs (a special kind of SFTs) held by an account can be fetched from https://api.multiversx.com/accounts/{address}/nfts?type=MetaESDT.
+    ///
+    /// The fields "token_collection" and "token_nonce" are found as well in the HTTP response of the API call (as "collection" and "nonce", respectively).
+    Transaction fromESDTNFTTransfer(const Proto::SigningInput& input);
+
+private:
+    uint64_t computeGasLimit(size_t dataLength, uint64_t executionGasLimit, bool hasGuardian);
+    uint64_t coalesceGasLimit(uint64_t providedGasLimit, uint64_t estimatedGasLimit);
+    uint64_t coalesceGasPrice(uint64_t gasPrice);
+    std::string coalesceChainId(std::string chainID);
+    TransactionOptions decideOptions(const Transaction& transaction);
+    std::string prepareFunctionCall(const std::string& function, std::initializer_list<const std::string> arguments);
+};
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/TransactionFactoryConfig.cpp b/src/MultiversX/TransactionFactoryConfig.cpp
new file mode 100644
index 00000000000..1c8ff82f9bb
--- /dev/null
+++ b/src/MultiversX/TransactionFactoryConfig.cpp
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TransactionFactoryConfig.h"
+
+#include <chrono>
+
+namespace TW::MultiversX {
+
+TransactionFactoryConfig::TransactionFactoryConfig()
+    : chainId("1") /* Mainnet */ {
+}
+
+const std::string& TransactionFactoryConfig::getChainId() const {
+    return this->chainId;
+}
+
+void TransactionFactoryConfig::setChainId(const std::string& value) {
+    this->chainId = value;
+}
+
+uint32_t TransactionFactoryConfig::getGasPerDataByte() const {
+    return this->gasPerDataByte;
+}
+
+void TransactionFactoryConfig::setGasPerDataByte(uint32_t value) {
+    this->gasPerDataByte = value;
+}
+
+uint32_t TransactionFactoryConfig::getMinGasLimit() const {
+    return this->minGasLimit;
+}
+
+void TransactionFactoryConfig::setMinGasLimit(uint32_t value) {
+    this->minGasLimit = value;
+}
+
+uint32_t TransactionFactoryConfig::getExtraGasLimitForGuardedTransaction() const {
+    return this->minGasLimit;
+}
+
+void TransactionFactoryConfig::setExtraGasLimitForGuardedTransaction(uint32_t value) {
+    this->extraGasLimitForGuardedTransaction = value;
+}
+
+uint64_t TransactionFactoryConfig::getMinGasPrice() const {
+    return this->minGasPrice;
+}
+
+void TransactionFactoryConfig::setMinGasPrice(uint64_t value) {
+    this->minGasPrice = value;
+}
+
+uint32_t TransactionFactoryConfig::getGasCostESDTTransfer() const {
+    return this->gasCostESDTTransfer;
+}
+
+void TransactionFactoryConfig::setGasCostESDTTransfer(uint32_t value) {
+    this->gasCostESDTTransfer = value;
+}
+
+uint32_t TransactionFactoryConfig::getGasCostESDTNFTTransfer() const {
+    return this->gasCostESDTNFTTransfer;
+}
+
+void TransactionFactoryConfig::setGasCostESDTNFTTransfer(uint32_t value) {
+    this->gasCostESDTNFTTransfer = value;
+}
+
+uint64_t TransactionFactoryConfig::getAdditionalGasForESDTTransfer() const {
+    return this->additionalGasForESDTTransfer;
+}
+
+void TransactionFactoryConfig::setAdditionalGasForESDTTransfer(uint64_t value) {
+    this->additionalGasForESDTTransfer = value;
+}
+
+uint64_t TransactionFactoryConfig::getAdditionalGasForESDTNFTTransfer() const {
+    return this->additionalGasForESDTNFTTransfer;
+}
+
+void TransactionFactoryConfig::setAdditionalGasForESDTNFTTransfer(uint64_t value) {
+    this->additionalGasForESDTNFTTransfer = value;
+}
+
+TransactionFactoryConfig TransactionFactoryConfig::GetDefault() {
+    const uint64_t timestamp = duration_cast<std::chrono::seconds>(std::chrono::system_clock::now().time_since_epoch()).count();
+    return GetByTimestamp(timestamp);
+}
+
+TransactionFactoryConfig TransactionFactoryConfig::GetByTimestamp(uint64_t timestamp) {
+    TransactionFactoryConfig config;
+
+    // Mainnet values at the time of defining the "TransactionFactoryConfig" component (April / May 2023).
+    if (timestamp > 0) {
+        config.setGasPerDataByte(1500);
+        config.setMinGasLimit(50000);
+        config.setExtraGasLimitForGuardedTransaction(50000);
+        config.setMinGasPrice(1000000000);
+        config.setGasCostESDTTransfer(200000);
+        config.setGasCostESDTNFTTransfer(200000);
+        config.setAdditionalGasForESDTTransfer(100000);
+        config.setAdditionalGasForESDTNFTTransfer(500000);
+    }
+
+    return config;
+}
+
+} // namespace TW::MultiversX
diff --git a/src/MultiversX/TransactionFactoryConfig.h b/src/MultiversX/TransactionFactoryConfig.h
new file mode 100644
index 00000000000..2cf157edd73
--- /dev/null
+++ b/src/MultiversX/TransactionFactoryConfig.h
@@ -0,0 +1,71 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace TW::MultiversX {
+
+/// A "TransactionFactoryConfig" object holds the network parameters relevant to creating transactions (e.g. minimum gas limit, minimum gas price).
+class TransactionFactoryConfig {
+    /// The following fields can (should) be fetched from https://api.multiversx.com/network/config.
+    /// However, a "TransactionFactoryConfig" object is initialized with proper default values for Mainnet (as of 2023).
+    std::string chainId;
+    uint32_t gasPerDataByte;
+    uint32_t minGasLimit;
+    uint32_t extraGasLimitForGuardedTransaction;
+    uint64_t minGasPrice;
+
+    /// GasSchedule entries of interest (only one at this moment), according to: https://github.com/multiversx/mx-chain-mainnet-config/blob/master/gasSchedules.
+    /// Here, for the sake of simplicity, we define the gas costs of interest directly in the class "TransactionFactoryConfig"
+    /// (that is, without defining extra nested structures such as "GasSchedule" and "BuiltInCosts").
+    uint32_t gasCostESDTTransfer;
+    uint32_t gasCostESDTNFTTransfer;
+
+    // Additional gas to account for eventual increases in gas requirements (thus avoid breaking changes in clients of TW-core).
+    uint64_t additionalGasForESDTTransfer;
+
+    // Additional gas to account for extra blockchain operations (e.g. data movement (between accounts) for NFTs),
+    // and for eventual increases in gas requirements (thus avoid breaking changes in clients of TW-core).
+    uint64_t additionalGasForESDTNFTTransfer;
+
+public:
+    TransactionFactoryConfig();
+
+    const std::string& getChainId() const;
+    void setChainId(const std::string& value);
+
+    uint32_t getGasPerDataByte() const;
+    void setGasPerDataByte(uint32_t value);
+
+    uint32_t getMinGasLimit() const;
+    void setMinGasLimit(uint32_t value);
+
+    uint32_t getExtraGasLimitForGuardedTransaction() const;
+    void setExtraGasLimitForGuardedTransaction(uint32_t value);
+
+    uint64_t getMinGasPrice() const;
+    void setMinGasPrice(uint64_t value);
+
+    uint32_t getGasCostESDTTransfer() const;
+    void setGasCostESDTTransfer(uint32_t value);
+
+    uint64_t getAdditionalGasForESDTTransfer() const;
+    void setAdditionalGasForESDTTransfer(uint64_t value);
+
+    uint64_t getAdditionalGasForESDTNFTTransfer() const;
+    void setAdditionalGasForESDTNFTTransfer(uint64_t value);
+
+    uint32_t getGasCostESDTNFTTransfer() const;
+    void setGasCostESDTNFTTransfer(uint32_t value);
+
+    static TransactionFactoryConfig GetDefault();
+
+    /// Useful to implement upwards-compatible changes of the network configuration (a TWCore client can receive planned configuration updates, in advance).
+    static TransactionFactoryConfig GetByTimestamp(uint64_t timestamp);
+};
+
+} // namespace TW::MultiversX
diff --git a/src/NEAR/Account.cpp b/src/NEAR/Account.cpp
index 0bb0bbf42fd..08c0ea8adb5 100644
--- a/src/NEAR/Account.cpp
+++ b/src/NEAR/Account.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Account.h"
 
diff --git a/src/NEAR/Account.h b/src/NEAR/Account.h
index 1b2c090e8e9..6ae30ebcd5a 100644
--- a/src/NEAR/Account.h
+++ b/src/NEAR/Account.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/NEAR/Address.cpp b/src/NEAR/Address.cpp
index 1d669e3d449..4ba2f6aca7a 100644
--- a/src/NEAR/Address.cpp
+++ b/src/NEAR/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "Base58.h"
@@ -27,11 +25,14 @@ bool Address::isValid(const std::string& string) {
 std::optional<Data> Address::decodeLegacyAddress(const std::string& string) {
     const auto prefix = std::string("NEAR");
     if (string.substr(0, prefix.size()) != prefix) {
-        return {};
+        return std::nullopt;
     }
 
-    const Data& decoded = Base58::bitcoin.decode(string.substr(prefix.size()));
-    return Data(decoded.begin(), decoded.end() - 4);
+    const Data& decoded = Base58::decode(string.substr(prefix.size()));
+    if (decoded.size() != size + legacyChecksumSize) {
+        return std::nullopt;
+    }
+    return Data(decoded.begin(), decoded.end() - legacyChecksumSize);
 }
 
 /// Initializes a NEAR address from a string representation.
@@ -40,10 +41,10 @@ Address::Address(const std::string& string) {
     if (data.has_value()) {
         std::copy(std::begin(*data), std::end(*data), std::begin(bytes));
     } else {
-        if (!Address::isValid(string)) {
+        const auto parsed = parse_hex(string);
+        if (parsed.size() != PublicKey::ed25519Size) {
             throw std::invalid_argument("Invalid address string!");
         }
-        const auto parsed = parse_hex(string);
         std::copy(std::begin(parsed), std::end(parsed), std::begin(bytes));
     }
 }
diff --git a/src/NEAR/Address.h b/src/NEAR/Address.h
index 791aa107b9f..4ee35512d36 100644
--- a/src/NEAR/Address.h
+++ b/src/NEAR/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -16,8 +14,10 @@ namespace TW::NEAR {
 
 class Address {
 public:
-    /// Number of bytes in an address, public key size
+    /// Number of bytes in an address, public key size.
     static const size_t size = PublicKey::ed25519Size;
+    /// Number of bytes of a checksum in a legacy address.
+    static const size_t legacyChecksumSize = 4;
 
     /// Address data consisting of a prefix byte followed by the public key
     /// hash.
diff --git a/src/NEAR/Entry.cpp b/src/NEAR/Entry.cpp
index c33987cc422..9be0149177b 100644
--- a/src/NEAR/Entry.cpp
+++ b/src/NEAR/Entry.cpp
@@ -1,13 +1,13 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
-
 #include "Address.h"
+#include "Serialization.h"
 #include "Signer.h"
+#include "../proto/Common.pb.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 using namespace TW;
 using namespace std;
@@ -16,7 +16,7 @@ namespace TW::NEAR {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
@@ -24,7 +24,7 @@ string Entry::normalizeAddress([[maybe_unused]] TWCoinType coin, const string& a
     return Address(address).string();
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -37,4 +37,24 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            const auto signer = Signer(input);
+            auto preImage = signer.signaturePreimage();
+            auto preImageHash = Hash::sha256(preImage);
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, const auto& publicKey) {
+            const auto signer = Signer(input);
+            output = signer.compile(signature, publicKey);
+        });
+}
 } // namespace TW::NEAR
diff --git a/src/NEAR/Entry.h b/src/NEAR/Entry.h
index 20a0870762c..f18a67be084 100644
--- a/src/NEAR/Entry.h
+++ b/src/NEAR/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,11 +12,16 @@ namespace TW::NEAR {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string normalizeAddress(TWCoinType coin, const std::string& address) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string normalizeAddress(TWCoinType coin, const std::string& address) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData,
+                 const std::vector<Data>& signatures,
+                 const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::NEAR
diff --git a/src/NEAR/Serialization.cpp b/src/NEAR/Serialization.cpp
index 9997fc84128..f2272383ede 100644
--- a/src/NEAR/Serialization.cpp
+++ b/src/NEAR/Serialization.cpp
@@ -1,16 +1,20 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Serialization.h"
 
 #include "../BinaryCoding.h"
 #include "../PrivateKey.h"
 
+#include <nlohmann/json.hpp>
+
 namespace TW::NEAR {
 
+using json = nlohmann::json;
+
+static constexpr auto tokenTransferMethodName = "ft_transfer";
+
 static void writeU8(Data& data, uint8_t number) {
     data.push_back(number);
 }
@@ -24,6 +28,7 @@ static void writeU64(Data& data, uint64_t number) {
 }
 
 static void writeU128(Data& data, const std::string& numberData) {
+    assert(numberData.size() == 16 && "U128 number should be 16 bytes long");
     data.insert(std::end(data), std::begin(numberData), std::end(numberData));
 }
 
@@ -104,15 +109,38 @@ static void writeDeleteAccount(Data& data, const Proto::DeleteAccount& deleteAcc
     writeString(data, deleteAccount.beneficiary_id());
 }
 
+static void writeTokenTransfer(Data& data, const Proto::TokenTransfer& tokenTransfer) {
+    writeString(data, tokenTransferMethodName);
+
+    json functionCallArgs = {
+        {"amount", tokenTransfer.token_amount()},
+        {"receiver_id", tokenTransfer.receiver_id()},
+    };
+    auto functionCallArgsStr = functionCallArgs.dump();
+
+    writeU32(data, static_cast<uint32_t>(functionCallArgsStr.size()));
+    writeRawBuffer(data, functionCallArgsStr);
+
+    writeU64(data, tokenTransfer.gas());
+    writeU128(data, tokenTransfer.deposit());
+}
+
 static void writeAction(Data& data, const Proto::Action& action) {
-    writeU8(data, action.payload_case() - Proto::Action::kCreateAccount);
+    uint8_t actionByte = action.payload_case() - Proto::Action::kCreateAccount;
+    // `TokenTransfer` action is actually a `FunctionCall`,
+    // so we need to set the actionByte to the proper value.
+    if (action.payload_case() == Proto::Action::kTokenTransfer) {
+        actionByte = Proto::Action::kFunctionCall - Proto::Action::kCreateAccount;
+    }
+
+    writeU8(data, actionByte);
     switch (action.payload_case()) {
-    case Proto::Action::kTransfer:
-        writeTransfer(data, action.transfer());
-        return;
     case Proto::Action::kFunctionCall:
         writeFunctionCall(data, action.function_call());
         return;
+    case Proto::Action::kTransfer:
+        writeTransfer(data, action.transfer());
+        return;
     case Proto::Action::kStake:
         writeStake(data, action.stake());
         return;
@@ -125,6 +153,9 @@ static void writeAction(Data& data, const Proto::Action& action) {
     case Proto::Action::kDeleteAccount:
         writeDeleteAccount(data, action.delete_account());
         return;
+    case Proto::Action::kTokenTransfer:
+        writeTokenTransfer(data, action.token_transfer());
+        return;
     default:
         return;
     }
@@ -149,6 +180,23 @@ Data transactionData(const Proto::SigningInput& input) {
     return data;
 }
 
+Data transactionDataWithPublicKey(const Proto::SigningInput& input) {
+    Data data;
+    writeString(data, input.signer_id());
+    auto public_key_proto = Proto::PublicKey();
+    public_key_proto.set_data(input.public_key().data(), input.public_key().size());
+    writePublicKey(data, public_key_proto);
+    writeU64(data, input.nonce());
+    writeString(data, input.receiver_id());
+    const auto& block_hash = input.block_hash();
+    writeRawBuffer(data, block_hash);
+    writeU32(data, input.actions_size());
+    for (const auto& action : input.actions()) {
+        writeAction(data, action);
+    }
+    return data;
+}
+
 Data signedTransactionData(const Data& transactionData, const Data& signatureData) {
     Data data;
     writeRawBuffer(data, transactionData);
diff --git a/src/NEAR/Serialization.h b/src/NEAR/Serialization.h
index 54a9d7041d9..e1025553cc3 100644
--- a/src/NEAR/Serialization.h
+++ b/src/NEAR/Serialization.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -13,5 +11,5 @@ namespace TW::NEAR {
 
 Data transactionData(const Proto::SigningInput& input);
 Data signedTransactionData(const Data& transactionData, const Data& signatureData);
-
+Data transactionDataWithPublicKey(const Proto::SigningInput& input);
 } // namespace TW::NEAR
diff --git a/src/NEAR/Signer.cpp b/src/NEAR/Signer.cpp
index 65031bce7a2..9e2589ed09e 100644
--- a/src/NEAR/Signer.cpp
+++ b/src/NEAR/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Serialization.h"
@@ -24,4 +22,26 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     return output;
 }
 
+Data Signer::signaturePreimage() const {
+    return TW::NEAR::transactionDataWithPublicKey(input);
+};
+
+Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey) const {
+    // validate public key
+    if (publicKey.type != TWPublicKeyTypeED25519) {
+        throw std::invalid_argument("Invalid public key");
+    }
+    auto preImage = signaturePreimage();
+    auto hash = Hash::sha256(preImage);
+    {
+        // validate correctness of signature
+        if (!publicKey.verify(signature, hash)) {
+            throw std::invalid_argument("Invalid signature/hash/publickey combination");
+        }
+    }
+    auto signedPreImage = TW::NEAR::signedTransactionData(preImage, signature);
+    auto output = Proto::SigningOutput();
+    output.set_signed_transaction(signedPreImage.data(), signedPreImage.size());
+    return output;
+}
 } // namespace TW::NEAR
diff --git a/src/NEAR/Signer.h b/src/NEAR/Signer.h
index 5f7fd3a2752..1343851b9ab 100644
--- a/src/NEAR/Signer.h
+++ b/src/NEAR/Signer.h
@@ -1,22 +1,26 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "../proto/NEAR.pb.h"
+#include "../Data.h"
+#include "../PublicKey.h"
 
 namespace TW::NEAR {
 
 /// Helper class that performs NEAR transaction signing.
 class Signer {
   public:
+    Proto::SigningInput input;
     Signer() = delete;
-
+    /// Initializes a transaction signer.
+    explicit Signer(const Proto::SigningInput& input) : input(input) {}
     /// Signs the given transaction.
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+    Proto::SigningOutput compile(const Data& signature, const PublicKey& publicKey) const;
+    Data signaturePreimage() const;
 };
 
 } // namespace TW::NEAR
diff --git a/src/NEO/Address.cpp b/src/NEO/Address.cpp
index 64c4c28a808..3c4ee0ebd0c 100644
--- a/src/NEO/Address.cpp
+++ b/src/NEO/Address.cpp
@@ -1,14 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "OpCode.h"
 #include "../Base58.h"
 #include "Data.h"
 #include "../Hash.h"
-#include "../Ontology/ParamsBuilder.h"
 
 #include "Address.h"
 
@@ -17,7 +14,7 @@ using namespace TW;
 namespace TW::NEO {
 
 bool Address::isValid(const std::string& string) {
-    const auto decoded = Base58::bitcoin.decodeCheck(string);
+    const auto decoded = Base58::decodeCheck(string);
     return !(decoded.size() != Address::size || decoded[0] != version);
 }
 
@@ -46,11 +43,6 @@ Address::Address(const PublicKey& publicKey) {
     std::copy(keyHash.data(), keyHash.data() + Address::size, bytes.begin());
 }
 
-Address::Address(uint8_t m, const std::vector<Data>& publicKeys) {
-    auto builderData = toScriptHash(Ontology::ParamsBuilder::fromMultiPubkey(m, publicKeys));
-    std::copy(builderData.begin(), builderData.end(), bytes.begin());
-}
-
 Data Address::toScriptHash(const Data& data) const {
     return Hash::ripemd(Hash::sha256(data));
 }
diff --git a/src/NEO/Address.h b/src/NEO/Address.h
index 993cba859c3..4ab69e36cc1 100644
--- a/src/NEO/Address.h
+++ b/src/NEO/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -31,9 +29,6 @@ class Address : public TW::Base58Address<AddressSize> {
     /// Initializes a NEO address with a collection of bytes.
     explicit Address(const Data& data) : TW::Base58Address<AddressSize>(data) {}
 
-    /// Initializes an address with a collection of public key.
-    explicit Address(uint8_t m, const std::vector<Data>& publicKeys);
-
     /// Initializes a NEO address with a public key.
     explicit Address(const PublicKey &publicKey);
 
@@ -49,4 +44,4 @@ inline bool operator==(const Address& lhs, const Address& rhs) {
     return lhs.string() == rhs.string();
 }
 
-} // namespace TW::NEO
\ No newline at end of file
+} // namespace TW::NEO
diff --git a/src/NEO/BinaryCoding.h b/src/NEO/BinaryCoding.h
new file mode 100644
index 00000000000..03aaa8843b0
--- /dev/null
+++ b/src/NEO/BinaryCoding.h
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "OpCode.h"
+#include "uint256.h"
+#include "../BinaryCoding.h"
+
+namespace TW::NEO {
+
+// Append a uint256_t value as a little-endian byte array into the provided buffer, and limit
+// the array size by digit/8.
+// Noted: No padding with it.
+inline void encode256LE(Data& data, const uint256_t& value) {
+    Data bytes = store(value);
+    data.insert(data.end(), bytes.rbegin(), bytes.rend());
+    if (data.back() >= 128) {
+        data.push_back(0x00);
+    }
+}
+
+inline void encodeBytes(Data& data, const Data& value) {
+    if (value.size() <= (size_t)PUSHBYTES75) {
+        data.push_back((byte)value.size());
+        data.insert(data.end(), value.begin(), value.end());
+    } else if (value.size() < 0x100) {
+        data.push_back(PUSHDATA1);
+        data.push_back((byte)value.size());
+        data.insert(data.end(), value.begin(), value.end());
+    } else if (value.size() < 0x10000) {
+        data.push_back(PUSHDATA2);
+        encode16LE((uint16_t)value.size(), data);
+        data.insert(data.end(), value.begin(), value.end());
+    } else {
+        data.push_back(PUSHDATA4);
+        encode32LE((uint32_t)value.size(), data);
+        data.insert(data.end(), value.begin(), value.end());
+    }
+}
+
+} // namespace TW::NEO
diff --git a/src/NEO/CoinReference.h b/src/NEO/CoinReference.h
index 1a7dd9fd120..6d08a78b257 100644
--- a/src/NEO/CoinReference.h
+++ b/src/NEO/CoinReference.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -15,27 +13,31 @@
 
 namespace TW::NEO {
 
-class CoinReference : public Serializable {
+class CoinReference final: public Serializable {
   public:
     /// Number of bytes for prevIndex.
     static const size_t prevIndexSize = 2;
+    static const size_t prevHashSize = 32;
 
     uint256_t prevHash;
     uint16_t prevIndex = 0;
 
-    virtual ~CoinReference() {}
+    ~CoinReference() override = default;
 
-    int64_t size() const override {
+    size_t size() const override {
         return Hash::sha256Size + prevIndexSize;
     }
 
-    void deserialize(const Data& data, int initial_pos = 0) override {
+    void deserialize(const Data& data, size_t initial_pos = 0) override {
+        if (data.size() < initial_pos + size()) {
+            throw std::invalid_argument("Data::Cannot read enough bytes!");
+        }
         prevHash = load(readBytes(data, Hash::sha256Size, initial_pos));
         prevIndex = decode16LE(data.data() + initial_pos + Hash::sha256Size);
     }
 
     Data serialize() const override {
-        auto resp = store(prevHash);
+        auto resp = store(prevHash, prevHashSize);
         encode16LE(prevIndex, resp);
         return resp;
     }
@@ -46,4 +48,4 @@ class CoinReference : public Serializable {
     }
 };
 
-}
\ No newline at end of file
+} // namespace TW::NEO
diff --git a/src/NEO/Constants.h b/src/NEO/Constants.h
new file mode 100644
index 00000000000..73866c3ed4f
--- /dev/null
+++ b/src/NEO/Constants.h
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+namespace TW::NEO {
+
+static const size_t assetIdSize = 32;
+static const size_t contractHashSize = 32;
+static const size_t valueSize = 8;
+static const size_t scriptHashSize = 20;
+
+} // namespace TW::NEO
diff --git a/src/NEO/Entry.cpp b/src/NEO/Entry.cpp
index f9e55d72637..4fc03845630 100644
--- a/src/NEO/Entry.cpp
+++ b/src/NEO/Entry.cpp
@@ -1,24 +1,23 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "Signer.h"
+#include "proto/TransactionCompiler.pb.h"
 
 using namespace TW;
 using namespace std;
 
 namespace TW::NEO {
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, [[maybe_unused]] const string& address, [[maybe_unused]] TW::byte p2pkh, [[maybe_unused]] TW::byte p2sh, [[maybe_unused]] const char* hrp) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TW::byte p2pkh, [[maybe_unused]] const char* hrp) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -35,4 +34,28 @@ void Entry::plan([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     planTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto encoded = Signer::signaturePreimage(input);
+            auto hash = TW::Hash::sha256(encoded);
+            output.set_data_hash(hash.data(), hash.size());
+            output.set_data(encoded.data(), encoded.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.empty() || publicKeys.empty() || signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+
+            auto encoded = Signer::encodeTransaction(input, publicKeys, signatures);
+            output.set_encoded(encoded.data(), encoded.size());
+        });
+}
+
 } // namespace TW::NEO
diff --git a/src/NEO/Entry.h b/src/NEO/Entry.h
index 6a396f753c2..c38662a8d74 100644
--- a/src/NEO/Entry.h
+++ b/src/NEO/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,13 +10,16 @@ namespace TW::NEO {
 
 /// NEO entry dispatcher.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry final : public CoinEntry {
+class Entry final: public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    Data addressToData(TWCoinType coin, const std::string& address) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+    
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
 };
 
 } // namespace TW::NEO
diff --git a/src/NEO/ISerializable.h b/src/NEO/ISerializable.h
index ce2245a643d..79461bd5c92 100644
--- a/src/NEO/ISerializable.h
+++ b/src/NEO/ISerializable.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -13,11 +11,11 @@
 namespace TW::NEO {
 
 class ISerializable {
-  public:
-    virtual ~ISerializable() {}
-    virtual int64_t size() const = 0;
+public:
+    virtual ~ISerializable() = default;
+    virtual size_t size() const = 0;
     virtual Data serialize() const = 0;
-    virtual void deserialize(const Data& data, int initial_pos = 0) = 0;
+    virtual void deserialize(const Data& data, size_t initial_pos) = 0;
 };
 
 } // namespace TW::NEO
diff --git a/src/NEO/InvocationTransaction.h b/src/NEO/InvocationTransaction.h
new file mode 100644
index 00000000000..bc88148f195
--- /dev/null
+++ b/src/NEO/InvocationTransaction.h
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Transaction.h"
+#include "../Data.h"
+
+namespace TW::NEO {
+
+class InvocationTransaction final: public Transaction {
+public:
+    Data script;
+    uint64_t gas = 0;
+
+    explicit InvocationTransaction(TransactionType t = TransactionType::TT_InvocationTransaction, byte ver = 1)
+        : Transaction(t, ver) {}
+
+    size_t deserializeExclusiveData(const Data& data, size_t initial_pos) override {
+        uint32_t readBytes = 0;
+        script = readVarBytes(data, initial_pos, &readBytes);
+        if (version >= 1) {
+            gas = decode64LE(data.data() + initial_pos + readBytes);
+            readBytes += sizeof(gas);
+        }
+        return initial_pos + static_cast<size_t>(readBytes);
+    }
+
+    Data serializeExclusiveData() const override {
+        auto resp = writeVarBytes(script);
+        if (version >= 1) {
+            encode64LE(gas, resp);
+        }
+        return resp;
+    }
+
+    bool operator==(const InvocationTransaction& other) const {
+        return this->script == other.script && this->gas == other.gas &&
+               Transaction::operator==(other);
+    }
+};
+
+} // namespace TW::NEO
diff --git a/src/NEO/MinerTransaction.h b/src/NEO/MinerTransaction.h
index 73ff8daf129..ce2c9c2778e 100644
--- a/src/NEO/MinerTransaction.h
+++ b/src/NEO/MinerTransaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -11,16 +9,16 @@
 
 namespace TW::NEO {
 
-class MinerTransaction : public Transaction {
+class MinerTransaction final: public Transaction {
   public:
     uint32_t nonce;
 
-     virtual int deserializeExclusiveData(const Data& data, int initial_pos = 0) {
+     size_t deserializeExclusiveData(const Data& data, size_t initial_pos) override {
         nonce = decode32LE(data.data() + initial_pos);
         return initial_pos + 4;
     }
 
-    virtual Data serializeExclusiveData() const {
+    Data serializeExclusiveData() const override {
         auto resp = Data();
         encode32LE(nonce, resp);
         return resp;
diff --git a/src/NEO/OpCode.h b/src/NEO/OpCode.h
index 847c5b74fa6..db1dc7eddb6 100644
--- a/src/NEO/OpCode.h
+++ b/src/NEO/OpCode.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -10,8 +8,22 @@
 
 namespace TW::NEO {
 
+static const uint8_t PUSHBYTES1{0x01};
 static const uint8_t PUSHBYTES21{0x21};
 static const uint8_t PUSHBYTES40{0x40};
+static const uint8_t PUSHBYTES75{0x4B};
+static const uint8_t PUSHDATA1{0x4C};
+static const uint8_t PUSHDATA2{0x4D};
+static const uint8_t PUSHDATA4{0x4E};
+static const uint8_t PUSH0{0x00};
+static const uint8_t PUSH1{0x51};
+static const uint8_t PUSH2{0x52};
+static const uint8_t PUSH3{0x53};
+static const uint8_t PUSH5{0x55};
+static const uint8_t RET{0x66};
+static const uint8_t APPCALL{0x67};
 static const uint8_t CHECKSIG{0xAC};
+static const uint8_t PACK{0xC1};
+static const uint8_t THROWIFNOT{0xF1};
 
-} // namespace TW::NEO
\ No newline at end of file
+} // namespace TW::NEO
diff --git a/src/NEO/ReadData.cpp b/src/NEO/ReadData.cpp
index f0889883487..97580a6c1c4 100644
--- a/src/NEO/ReadData.cpp
+++ b/src/NEO/ReadData.cpp
@@ -1,31 +1,29 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Data.h"
 #include "ReadData.h"
 #include <stdexcept>
 
 
-TW::Data TW::readBytes(const TW::Data& from, int max, int initial_pos) {
-    if (from.size() - static_cast<std::size_t>(initial_pos) < static_cast<std::size_t>(max)) {
+TW::Data TW::readBytes(const TW::Data& from, size_t max, size_t initial_pos) {
+    if (from.size() < initial_pos + max) {
         throw std::invalid_argument("Data::Cannot read enough bytes!");
     }
-    return TW::Data(from.begin() + initial_pos, from.begin() + initial_pos + max);
+    return TW::subData(from, initial_pos, max);
 }
 
-TW::Data TW::readVarBytes(const Data& from, int initial_pos, uint32_t* dataRead) {
+TW::Data TW::readVarBytes(const Data& from, size_t initial_pos, uint32_t* dataRead) {
     uint64_t size = readVar<uint64_t>(from, initial_pos);
     auto shift = varIntSize(size);
     if (dataRead) {
         *dataRead = uint32_t(shift + size);
     }
-    return readBytes(from, int(size), initial_pos + int(shift));
+    return readBytes(from, int(size), initial_pos + static_cast<size_t>(shift));
 }
 
-template<> uint64_t TW::readVar(const TW::Data& from, int initial_pos, const uint64_t &max) {
+template<> uint64_t TW::readVar(const TW::Data& from, size_t initial_pos, const uint64_t &max) {
     byte fb = from[initial_pos];
     uint64_t value;
     if (fb == 0xFD) {
@@ -44,11 +42,11 @@ template<> uint64_t TW::readVar(const TW::Data& from, int initial_pos, const uin
     return value;
 }
 
-template<> int64_t TW::readVar(const TW::Data& from, int initial_pos, const int64_t &max) {
+template<> int64_t TW::readVar(const TW::Data& from, size_t initial_pos, const int64_t &max) {
     return (int64_t) readVar<uint64_t>(from, initial_pos, uint64_t(max));
 }
 
-TW::Data TW::writeVarBytes(const Data& from, int initial_pos) {
+TW::Data TW::writeVarBytes(const Data& from, size_t initial_pos) {
     Data resp;
     encodeVarInt(uint64_t(from.size() - initial_pos), resp);
     resp.insert(resp.end(), from.begin() + initial_pos, from.end());
diff --git a/src/NEO/ReadData.h b/src/NEO/ReadData.h
index fbe297c9ba3..8c661c29e90 100644
--- a/src/NEO/ReadData.h
+++ b/src/NEO/ReadData.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,14 +12,14 @@
 
 namespace TW {
 
-Data readBytes(const Data& from, int max, int initial_pos = 0);
-Data readVarBytes(const Data& from, int initial_pos = 0, uint32_t* dataRead = nullptr);
+Data readBytes(const Data& from, size_t max, size_t initial_pos = 0);
+Data readVarBytes(const Data& from, size_t initial_pos = 0, uint32_t* dataRead = nullptr);
 
-template<class T> T readVar(const TW::Data& from, int initial_pos = 0, const T& max = std::numeric_limits<int>::max());
-template<> int64_t readVar(const TW::Data& from, int initial_pos, const int64_t& max);
-template<> uint64_t readVar(const TW::Data& from, int initial_pos, const uint64_t& max);
+template<class T> T readVar(const TW::Data& from, size_t initial_pos = 0, const T& max = std::numeric_limits<int>::max());
+template<> int64_t readVar(const TW::Data& from, size_t initial_pos, const int64_t& max);
+template<> uint64_t readVar(const TW::Data& from, size_t initial_pos, const uint64_t& max);
 
-Data writeVarBytes(const Data& from, int initial_pos = 0);
+Data writeVarBytes(const Data& from, size_t initial_pos = 0);
 
 template<class T>
 static std::vector<T> concat(const std::vector<T>& v1, const std::vector<T>& v2) {
diff --git a/src/NEO/Script.cpp b/src/NEO/Script.cpp
index a168dfe74bb..0fc1f31c7e1 100644
--- a/src/NEO/Script.cpp
+++ b/src/NEO/Script.cpp
@@ -1,9 +1,9 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #include "Script.h"
+
+#include "BinaryCoding.h"
 #include "OpCode.h"
 
 namespace TW::NEO {
@@ -23,4 +23,41 @@ Data Script::CreateInvocationScript(const Data& signature) {
     return result;
 }
 
+Data Script::CreateNep5TransferScript(const Data& assetId, const Data& from, const Data& to,
+                                      uint256_t value, bool withRet /*= false*/) {
+    Data result;
+
+    // handle value
+    if (value == uint256_t(0)) {
+        result.push_back(PUSH0);
+    } else if (value >= uint256_t(1) && value <= uint256_t(16)) {
+        result.push_back(PUSH1 - 1 + (byte)value);
+    } else {
+        Data v;
+        encode256LE(v, value);
+        result.push_back((byte)v.size());
+        result.insert(result.end(), v.begin(), v.end());
+    }
+
+    encodeBytes(result, to);
+    encodeBytes(result, from);
+
+    // args length
+    result.push_back(PUSH3);
+
+    result.push_back(PACK);
+
+    std::string operation = "transfer";
+    encodeBytes(result, {operation.begin(), operation.end()});
+
+    result.push_back(APPCALL);
+    result.insert(result.end(), assetId.begin(), assetId.end());
+
+    if (withRet) {
+        result.push_back(THROWIFNOT);
+        result.push_back(RET);
+    }
+    return result;
+}
+
 } // namespace TW::NEO
diff --git a/src/NEO/Script.h b/src/NEO/Script.h
index 80090432607..35984613c14 100644
--- a/src/NEO/Script.h
+++ b/src/NEO/Script.h
@@ -1,18 +1,18 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #pragma once
 
 #include "Data.h"
+#include "uint256.h"
 
 namespace TW::NEO {
 
 class Script {
-  public:
+public:
     static Data CreateSignatureRedeemScript(const Data& publicKey);
     static Data CreateInvocationScript(const Data& signature);
+    // nep5 assetId has only 20 bytes, different with gas & neo that are 32 bytes.
+    static Data CreateNep5TransferScript(const Data& assetId, const Data& from, const Data& to, uint256_t value, bool withRet = false);
 };
-
 } // namespace TW::NEO
diff --git a/src/NEO/Serializable.h b/src/NEO/Serializable.h
index 51ec20edf73..e67bda608ca 100644
--- a/src/NEO/Serializable.h
+++ b/src/NEO/Serializable.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -23,10 +21,10 @@ class Serializable : public ISerializable {
     }
 
     template<class T>
-    static inline Data serialize(const T *data, int size) {
+    static inline Data serialize(const T *data, size_t size) {
         Data resp;
         encodeVarInt(uint64_t(size), resp);
-        for (int i = 0; i < size; ++i) {
+        for (size_t i = 0; i < size; ++i) {
             append(resp, data[i].serialize());
         }
         return resp;
@@ -44,10 +42,10 @@ class Serializable : public ISerializable {
     }
 
     template<class T>
-    static inline int deserialize(std::vector <T> &resp, const Data& data, int initial_pos = 0) {
+    static inline size_t deserialize(std::vector <T> &resp, const Data& data, size_t initial_pos = 0) {
         uint64_t size = readVar<uint64_t>(data, initial_pos, INT_MAX);
         // assert(size >= 0);
-        initial_pos += varIntSize(size);
+        initial_pos += static_cast<size_t>(varIntSize(size));
         for (uint64_t i = 0; i < size; ++i) {
             T value;
             value.deserialize(data, initial_pos);
diff --git a/src/NEO/Signer.cpp b/src/NEO/Signer.cpp
index 3329497f39f..df3187c9447 100644
--- a/src/NEO/Signer.cpp
+++ b/src/NEO/Signer.cpp
@@ -1,12 +1,15 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
+#include "InvocationTransaction.h"
 #include "Script.h"
 #include "../HexCoding.h"
+#include "../PrivateKey.h"
+#include "../PublicKey.h"
+#include "../proto/Common.pb.h"
+#include "../proto/NEO.pb.h"
 
 using namespace std;
 using namespace TW;
@@ -56,6 +59,9 @@ Proto::TransactionPlan Signer::plan(const Proto::SigningInput& input) {
 
         for (int i = 0; i < input.outputs_size(); i++) {
             required[input.outputs(i).asset_id()] = input.outputs(i).amount();
+            for (int j = 0; j < input.outputs(i).extra_outputs_size(); j++) {
+                required[input.outputs(i).asset_id()] += input.outputs(i).extra_outputs(j).amount();
+            }
         }
 
         for (int i = 0; i < input.inputs_size(); i++) {
@@ -65,6 +71,7 @@ Proto::TransactionPlan Signer::plan(const Proto::SigningInput& input) {
                 continue;
             }
 
+            // if the required has been enough, not need to add input
             if (input.inputs(i).asset_id() != input.gas_asset_id() &&
                 required[input.inputs(i).asset_id()] < available[input.inputs(i).asset_id()]) {
                 continue;
@@ -78,8 +85,8 @@ Proto::TransactionPlan Signer::plan(const Proto::SigningInput& input) {
         for (int i = 0; i < input.outputs_size(); i++) {
             auto* outputPlan = plan.add_outputs();
 
-            if (available.find(input.inputs(i).asset_id()) == available.end() ||
-                available[input.outputs(i).asset_id()] < input.outputs(i).amount()) {
+            if (available.find(input.outputs(i).asset_id()) == available.end() ||
+                available[input.outputs(i).asset_id()] < required[input.outputs(i).asset_id()]) {
                 throw Common::Proto::SigningError(Common::Proto::Error_low_balance);
             }
 
@@ -90,16 +97,25 @@ Proto::TransactionPlan Signer::plan(const Proto::SigningInput& input) {
             int64_t availableAmount = available[input.outputs(i).asset_id()];
             outputPlan->set_available_amount(availableAmount);
             outputPlan->set_amount(input.outputs(i).amount());
-            outputPlan->set_change(availableAmount - input.outputs(i).amount());
 
             outputPlan->set_to_address(input.outputs(i).to_address());
             outputPlan->set_asset_id(input.outputs(i).asset_id());
             outputPlan->set_change_address(input.outputs(i).change_address());
+
+            auto changeAmount = availableAmount - input.outputs(i).amount();
+            for (int j = 0; j < input.outputs(i).extra_outputs_size(); j++) {
+                auto* extra_plan = outputPlan->add_extra_outputs();
+
+                extra_plan->set_to_address(input.outputs(i).extra_outputs(j).to_address());
+                extra_plan->set_amount(input.outputs(i).extra_outputs(j).amount());
+                changeAmount -= input.outputs(i).extra_outputs(j).amount();
+            }
+            outputPlan->set_change(changeAmount);
         }
 
         const int64_t SIGNATURE_SIZE = 103;
         int64_t transactionSize =
-            prepareUnsignedTransaction(input, plan, false).serialize().size() + SIGNATURE_SIZE;
+            prepareUnsignedTransaction(input, plan, false)->serialize().size() + SIGNATURE_SIZE;
 
         const int64_t LARGE_TX_SIZE = 1024;
         const int64_t MIN_FEE_FOR_LARGE_TX = 100000;
@@ -130,7 +146,7 @@ Proto::TransactionPlan Signer::plan(const Proto::SigningInput& input) {
 
         if (feeNeed) {
             transactionSize =
-                prepareUnsignedTransaction(input, plan, false).serialize().size() + SIGNATURE_SIZE;
+                prepareUnsignedTransaction(input, plan, false)->serialize().size() + SIGNATURE_SIZE;
             int64_t fee = 0;
             if (transactionSize >= LARGE_TX_SIZE) {
                 fee = MIN_FEE_FOR_LARGE_TX;
@@ -148,12 +164,35 @@ Proto::TransactionPlan Signer::plan(const Proto::SigningInput& input) {
     return plan;
 }
 
-Transaction Signer::prepareUnsignedTransaction(const Proto::SigningInput& input,
-                                               const Proto::TransactionPlan& plan, bool validate) {
+std::shared_ptr<Transaction> Signer::prepareUnsignedTransaction(const Proto::SigningInput& input,
+                                                                const Proto::TransactionPlan& plan,
+                                                                bool validate) {
+    std::shared_ptr<Transaction> transaction;
     try {
-        auto transaction = Transaction();
-        transaction.type = TransactionType::TT_ContractTransaction;
-        transaction.version = 0;
+        switch (input.transaction().transaction_oneof_case()) {
+        case Proto::Transaction::kNep5Transfer: {
+            auto t = std::make_shared<InvocationTransaction>();
+            auto nep5Tx = input.transaction().nep5_transfer();
+            t->script = Script::CreateNep5TransferScript(
+                parse_hex(nep5Tx.asset_id()), Address(nep5Tx.from()).toScriptHash(),
+                Address(nep5Tx.to()).toScriptHash(), load(nep5Tx.amount()), nep5Tx.script_with_ret());
+
+            transaction = t;
+            break;
+        }
+        case Proto::Transaction::kInvocationGeneric: {
+            auto t = std::make_shared<InvocationTransaction>();
+            auto script = input.transaction().invocation_generic().script();
+            t->script = Data(script.begin(), script.end());
+            t->gas = input.transaction().invocation_generic().gas();
+
+            transaction = t;
+            break;
+        }
+        default:
+            transaction = std::make_shared<Transaction>();
+            break;
+        }
 
         for (int i = 0; i < plan.inputs_size(); i++) {
             CoinReference coin;
@@ -162,14 +201,19 @@ Transaction Signer::prepareUnsignedTransaction(const Proto::SigningInput& input,
             std::reverse(prevHashReverse.begin(), prevHashReverse.end());
             coin.prevHash = load(prevHashReverse);
             coin.prevIndex = (uint16_t)plan.inputs(i).prev_index();
-            transaction.inInputs.push_back(coin);
+            transaction->inInputs.push_back(coin);
         }
 
         for (int i = 0; i < plan.outputs_size(); i++) {
             if (plan.outputs(i).asset_id() == input.gas_asset_id()) {
-                if (validate && plan.outputs(i).amount() + plan.outputs(i).change() + plan.fee() !=
-                                    plan.outputs(i).available_amount()) {
-                    throw Common::Proto::SigningError(Common::Proto::Error_wrong_fee);
+                if (validate) {
+                    auto sumAmount = plan.outputs(i).amount() + plan.outputs(i).change() + plan.fee();
+                    for (int j = 0; j < plan.outputs(i).extra_outputs_size(); j++) {
+                        sumAmount += plan.outputs(i).extra_outputs(j).amount();
+                    }
+                    if (sumAmount != plan.outputs(i).available_amount()) {
+                        throw Common::Proto::SigningError(Common::Proto::Error_wrong_fee);
+                    }
                 }
             }
 
@@ -179,7 +223,16 @@ Transaction Signer::prepareUnsignedTransaction(const Proto::SigningInput& input,
                 out.value = (int64_t)plan.outputs(i).amount();
                 auto scriptHash = TW::NEO::Address(plan.outputs(i).to_address()).toScriptHash();
                 out.scriptHash = load(scriptHash);
-                transaction.outputs.push_back(out);
+                transaction->outputs.push_back(out);
+
+                for (int j = 0; j < plan.outputs(i).extra_outputs_size(); j++) {
+                    TransactionOutput extraOut;
+                    extraOut.assetId = load(parse_hex(plan.outputs(i).asset_id()));
+                    extraOut.value = (int64_t)plan.outputs(i).extra_outputs(j).amount();
+                    auto extraScriptHash = TW::NEO::Address(plan.outputs(i).extra_outputs(j).to_address()).toScriptHash();
+                    extraOut.scriptHash = load(extraScriptHash);
+                    transaction->outputs.push_back(extraOut);
+                }
             }
 
             // change
@@ -189,20 +242,29 @@ Transaction Signer::prepareUnsignedTransaction(const Proto::SigningInput& input,
                 out.value = plan.outputs(i).change();
                 auto scriptHash = TW::NEO::Address(plan.outputs(i).change_address()).toScriptHash();
                 out.scriptHash = load(scriptHash);
-                transaction.outputs.push_back(out);
+                transaction->outputs.push_back(out);
             }
         }
+
+        for (int i = 0; i < plan.attributes_size(); i++) {
+            TransactionAttribute attr;
+            attr.usage = (TransactionAttributeUsage)plan.attributes(i).usage();
+            attr._data.assign(plan.attributes(i).data().begin(), plan.attributes(i).data().end());
+
+            transaction->attributes.push_back(attr);
+        }
         return transaction;
     } catch (...) {
     }
 
-    return Transaction();
+    return transaction;
 }
 
 Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     auto output = Proto::SigningOutput();
     try {
-        auto signer = Signer(PrivateKey(Data(input.private_key().begin(), input.private_key().end())));
+        auto signer =
+            Signer(PrivateKey(Data(input.private_key().begin(), input.private_key().end())));
         Proto::TransactionPlan plan;
         if (input.has_plan()) {
             plan = input.plan();
@@ -210,8 +272,8 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
             plan = signer.plan(input);
         }
         auto transaction = prepareUnsignedTransaction(input, plan);
-        signer.sign(transaction);
-        auto signedTx = transaction.serialize();
+        signer.sign(*transaction);
+        auto signedTx = transaction->serialize();
 
         output.set_encoded(signedTx.data(), signedTx.size());
     } catch (const Common::Proto::SigningError& error) {
@@ -221,4 +283,41 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     return output;
 }
 
+Data Signer::signaturePreimage(const Proto::SigningInput& input) {
+    Proto::TransactionPlan p;
+    if (input.has_plan()) {
+        p = input.plan();
+    } else {
+        p = plan(input);
+    }
+    auto transaction = prepareUnsignedTransaction(input, p);
+    return transaction->serialize();
+}
+
+Data Signer::encodeTransaction(const Proto::SigningInput& input,
+                               const std::vector<PublicKey>& publicKeys,
+                               const std::vector<Data>& signatures) {
+    Proto::TransactionPlan p;
+    if (input.has_plan()) {
+        p = input.plan();
+    } else {
+        p = plan(input);
+    }
+    auto transaction = prepareUnsignedTransaction(input, p);
+    transaction->witnesses.clear();
+
+    if (publicKeys.size() != signatures.size()) {
+        return {Data()};
+    }
+
+    for (size_t i = 0; i < publicKeys.size(); i++) {
+        Witness witness;
+        witness.invocationScript = Script::CreateInvocationScript(signatures[i]);
+        witness.verificationScript = Script::CreateSignatureRedeemScript(publicKeys[i].bytes);
+        transaction->witnesses.push_back(witness);
+    }
+
+    return transaction->serialize();
+}
+
 } // namespace TW::NEO
diff --git a/src/NEO/Signer.h b/src/NEO/Signer.h
index 55c68339ce2..d26fb9addb3 100644
--- a/src/NEO/Signer.h
+++ b/src/NEO/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -15,12 +13,12 @@
 namespace TW::NEO {
 
 class Signer {
-  private:
+private:
     Data publicKey;
     TW::PrivateKey privateKey;
     Address address;
 
-  public:
+public:
     explicit Signer(const TW::PrivateKey& priKey);
     PrivateKey getPrivateKey() const;
     PublicKey getPublicKey() const;
@@ -31,10 +29,15 @@ class Signer {
     void sign(Transaction& tx) const;
     Data sign(const Data& data) const;
 
-  private:
-    static Transaction prepareUnsignedTransaction(const Proto::SigningInput& input,
-                                                  const Proto::TransactionPlan& plan,
-                                                  bool validate = true);
+    static Data signaturePreimage(const Proto::SigningInput& input);
+    static Data encodeTransaction(const Proto::SigningInput& input,
+                                  const std::vector<PublicKey>& publicKeys,
+                                  const std::vector<Data>& signatures);
+
+private:
+    static std::shared_ptr<Transaction>
+    prepareUnsignedTransaction(const Proto::SigningInput& input, const Proto::TransactionPlan& plan,
+                               bool validate = true);
 };
 
 } // namespace TW::NEO
diff --git a/src/NEO/Transaction.cpp b/src/NEO/Transaction.cpp
index 5108a85e581..0c8d7431da8 100644
--- a/src/NEO/Transaction.cpp
+++ b/src/NEO/Transaction.cpp
@@ -1,24 +1,26 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../uint256.h"
-#include "../Hash.h"
-#include "Transaction.h"
+#include <ctype.h>
+
+#include "InvocationTransaction.h"
 #include "MinerTransaction.h"
+#include "Transaction.h"
+#include "Data.h"
+#include "../Hash.h"
+#include "../uint256.h"
 
 using namespace std;
 using namespace TW;
 
 namespace TW::NEO {
 
-int64_t Transaction::size() const {
+size_t Transaction::size() const {
     return serialize().size();
 }
 
-void Transaction::deserialize(const Data& data, int initial_pos) {
+void Transaction::deserialize(const Data& data, size_t initial_pos) {
     type = (TransactionType)data[initial_pos++];
     version = data[initial_pos++];
     initial_pos = deserializeExclusiveData(data, initial_pos);
@@ -30,15 +32,20 @@ void Transaction::deserialize(const Data& data, int initial_pos) {
     Serializable::deserialize<TransactionOutput>(outputs, data, initial_pos);
 }
 
-Transaction* Transaction::deserializeFrom(const Data& data, int initial_pos) {
+Transaction* Transaction::deserializeFrom(const Data& data, size_t initial_pos) {
     Transaction* resp = nullptr;
     switch ((TransactionType)data[initial_pos]) {
     case TransactionType::TT_MinerTransaction:
         resp = new MinerTransaction();
         break;
+    case TransactionType::TT_ContractTransaction:
+        resp = new Transaction();
+        break;
+    case TransactionType::TT_InvocationTransaction:
+        resp = new InvocationTransaction();
+        break;
     default:
         throw std::invalid_argument("Transaction::deserializeFrom Invalid transaction type");
-        break;
     }
     resp->deserialize(data, initial_pos);
     return resp;
diff --git a/src/NEO/Transaction.h b/src/NEO/Transaction.h
index 7523995398c..3df16aa3d51 100644
--- a/src/NEO/Transaction.h
+++ b/src/NEO/Transaction.h
@@ -1,19 +1,17 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../uint256.h"
+#include "CoinReference.h"
 #include "ISerializable.h"
 #include "Serializable.h"
-#include "TransactionType.h"
 #include "TransactionAttribute.h"
 #include "TransactionOutput.h"
-#include "CoinReference.h"
+#include "TransactionType.h"
 #include "Witness.h"
+#include "../uint256.h"
 
 namespace TW::NEO {
 
@@ -26,20 +24,22 @@ class Transaction : public Serializable {
     std::vector<TransactionOutput> outputs;
     std::vector<Witness> witnesses;
 
-    virtual ~Transaction() {}
-    int64_t size() const override;
-    void deserialize(const Data& data, int initial_pos = 0) override;
+    Transaction(TransactionType t = TransactionType::TT_ContractTransaction, byte ver = 0) : type(t), version(ver) {}
+    ~Transaction() override = default;
+
+    size_t size() const override;
+    void deserialize(const Data& data, size_t initial_pos = 0) override;
     Data serialize() const override;
 
-    bool operator==(const Transaction &other) const;
+    bool operator==(const Transaction& other) const;
 
-    virtual int deserializeExclusiveData([[maybe_unused]] const Data& data, int initial_pos = 0) { return initial_pos; }
-    virtual Data serializeExclusiveData() const { return Data(); }
+    virtual size_t deserializeExclusiveData([[maybe_unused]] const Data& data, size_t initial_pos) { return initial_pos; }
+    virtual Data serializeExclusiveData() const { return {}; }
 
     Data getHash() const;
     uint256_t getHashUInt256() const;
 
-    static Transaction * deserializeFrom(const Data& data, int initial_pos = 0);
+    static Transaction* deserializeFrom(const Data& data, size_t initial_pos = 0);
 };
 
 } // namespace TW::NEO
diff --git a/src/NEO/TransactionAttribute.h b/src/NEO/TransactionAttribute.h
index be027e9bfd0..5c237a1201c 100644
--- a/src/NEO/TransactionAttribute.h
+++ b/src/NEO/TransactionAttribute.h
@@ -1,54 +1,99 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "TransactionAttributeUsage.h"
+#include "Constants.h"
 #include "ISerializable.h"
 #include "Serializable.h"
+#include "TransactionAttributeUsage.h"
 #include "Data.h"
 
 namespace TW::NEO {
 
-class TransactionAttribute : public Serializable {
-  public:
+class TransactionAttribute final: public Serializable {
+public:
     TransactionAttributeUsage usage = TAU_ContractHash;
     Data _data;
 
-    virtual ~TransactionAttribute() {}
+    ~TransactionAttribute() override = default;
 
-    int64_t size() const override {
-        return 1 + _data.size();
+    size_t size() const override {
+        switch (usage) {
+        case TransactionAttributeUsage::TAU_ContractHash:
+        case TransactionAttributeUsage::TAU_ECDH02:
+        case TransactionAttributeUsage::TAU_ECDH03:
+        case TransactionAttributeUsage::TAU_Vote:
+            return 1UL + contractHashSize;
+        case TransactionAttributeUsage::TAU_Script:
+            return 1UL + scriptHashSize;
+        default:
+            if (usage >= TransactionAttributeUsage::TAU_Hash1 &&
+                usage <= TransactionAttributeUsage::TAU_Hash15) {
+                return 1 + contractHashSize;
+            }
+            return 1UL + static_cast<size_t>(varIntSize(_data.size())) + _data.size();
+        }
     }
 
-    void deserialize(const Data& data, int initial_pos = 0) override {
-        if (static_cast<int>(data.size()) < initial_pos + 1) {
+    void deserialize(const Data& data, size_t initial_pos = 0) override {
+        if (data.size() < initial_pos + 1) {
             throw std::invalid_argument("Invalid data for deserialization");
         }
-        usage = (TransactionAttributeUsage) data[initial_pos];
-        if (usage == TransactionAttributeUsage::TAU_ContractHash || usage == TransactionAttributeUsage::TAU_Vote ||
-            (usage >= TransactionAttributeUsage::TAU_Hash1 && usage <= TransactionAttributeUsage::TAU_Hash15)) {
-            _data = readBytes(data, 32, initial_pos + 1);
-        } else if (usage == TransactionAttributeUsage::TAU_ECDH02 ||
-                    usage == TransactionAttributeUsage::TAU_ECDH03) {
-            _data = readBytes(data, 32, initial_pos + 1);
-        } else if (usage == TransactionAttributeUsage::TAU_Script) {
-            _data = readBytes(data, 20, initial_pos + 1);
-        } else if (usage == TransactionAttributeUsage::TAU_DescriptionUrl) {
-            _data = readBytes(data, 1, initial_pos + 1);
-        } else if (usage == TransactionAttributeUsage::TAU_Description ||
-                    usage >= TransactionAttributeUsage::TAU_Remark) {
-            _data = readBytes(data, int(data.size()) - 1 - initial_pos, initial_pos + 1);
-        } else {
+
+        // see: https://github.com/neo-project/neo/blob/v2.12.0/neo/Network/P2P/Payloads/TransactionAttribute.cs#L32
+        usage = (TransactionAttributeUsage)data[initial_pos];
+        switch (usage) {
+        case TransactionAttributeUsage::TAU_ECDH02:
+        case TransactionAttributeUsage::TAU_ECDH03: {
+            this->_data = concat({(TW::byte)usage}, readBytes(data, contractHashSize, initial_pos + 1));
+            break;
+        }
+
+        case TransactionAttributeUsage::TAU_Script: {
+            this->_data = readBytes(data, scriptHashSize, initial_pos + 1);
+            break;
+        }
+
+        case TransactionAttributeUsage::TAU_DescriptionUrl:
+        case TransactionAttributeUsage::TAU_Description:
+        case TransactionAttributeUsage::TAU_Remark: {
+            this->_data = readVarBytes(data, initial_pos + 1);
+            break;
+        }
+
+        default:
+            if (usage == TransactionAttributeUsage::TAU_ContractHash ||
+                usage == TransactionAttributeUsage::TAU_Vote ||
+                (usage >= TransactionAttributeUsage::TAU_Hash1 && usage <= TransactionAttributeUsage::TAU_Hash15)) {
+                this->_data = readBytes(data, contractHashSize, initial_pos + 1);
+                break;
+            }
             throw std::invalid_argument("TransactionAttribute Deserialize FormatException");
         }
     }
 
     Data serialize() const override {
-        return concat(Data({static_cast<byte>(usage)}), _data);
+        Data result;
+        result.push_back((TW::byte)usage);
+
+        // see: https://github.com/neo-project/neo/blob/v2.12.0/neo/Network/P2P/Payloads/TransactionAttribute.cs#L49
+        if (usage == TransactionAttributeUsage::TAU_DescriptionUrl ||
+            usage == TransactionAttributeUsage::TAU_Description ||
+            usage >= TransactionAttributeUsage::TAU_Remark) {
+            Data resp;
+            encodeVarInt((uint64_t)_data.size(), resp);
+            result.insert(result.end(), resp.begin(), resp.end());
+        }
+        if (usage == TransactionAttributeUsage::TAU_ECDH02 ||
+            usage == TransactionAttributeUsage::TAU_ECDH03) {
+            result.insert(result.end(), _data.begin() + 1, _data.begin() + 1 + contractHashSize);
+        } else {
+            result.insert(result.end(), _data.begin(), _data.end());
+        }
+
+        return result;
     }
 
     bool operator==(const TransactionAttribute &other) const {
@@ -58,4 +103,4 @@ class TransactionAttribute : public Serializable {
     }
 };
 
-}
+} // namespace TW::NEO
diff --git a/src/NEO/TransactionAttributeUsage.h b/src/NEO/TransactionAttributeUsage.h
index 3cc20ecc4ab..7c061df70df 100644
--- a/src/NEO/TransactionAttributeUsage.h
+++ b/src/NEO/TransactionAttributeUsage.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/NEO/TransactionOutput.h b/src/NEO/TransactionOutput.h
index dd99028a687..df473006a19 100644
--- a/src/NEO/TransactionOutput.h
+++ b/src/NEO/TransactionOutput.h
@@ -1,12 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "../uint256.h"
+#include "Constants.h"
 #include "Data.h"
 #include "../BinaryCoding.h"
 #include "ReadData.h"
@@ -15,32 +14,32 @@
 
 namespace TW::NEO {
 
-class TransactionOutput : public Serializable {
+class TransactionOutput final: public Serializable {
   public:
-    static const size_t assetIdSize = 32;
-    static const size_t valueSize = 8;
-    static const size_t scriptHashSize = 20;
-
     uint256_t assetId;
-    int64_t value = 0;
+    uint64_t value = 0;
     uint256_t scriptHash;
 
-    virtual ~TransactionOutput() {}
+    ~TransactionOutput() override = default;
 
-    int64_t size() const override {
-        return store(assetId).size() + valueSize + store(scriptHash).size();
+    size_t size() const override {
+        return assetIdSize + valueSize + scriptHashSize;
     }
 
-    void deserialize(const Data& data, int initial_pos = 0) override {
+    void deserialize(const Data& data, size_t initial_pos = 0) override {
+        if (data.size() < initial_pos + size()) {
+            throw std::invalid_argument("Data::Cannot read enough bytes!");
+        }
+
         assetId = load(readBytes(data, assetIdSize, initial_pos));
         value = decode64LE(data.data() + initial_pos + assetIdSize);
         scriptHash = load(readBytes(data, scriptHashSize, initial_pos + assetIdSize + valueSize));
     }
 
     Data serialize() const override {
-        auto resp = store(assetId);
+        auto resp = store(assetId, assetIdSize);
         encode64LE(value, resp);
-        return concat(resp, store(scriptHash));
+        return concat(resp, store(scriptHash, scriptHashSize));
     }
 
     bool operator==(const TransactionOutput &other) const {
@@ -50,4 +49,4 @@ class TransactionOutput : public Serializable {
     }
 };
 
-}
\ No newline at end of file
+} // namespace TW::NEO
diff --git a/src/NEO/TransactionType.h b/src/NEO/TransactionType.h
index a70400a8c26..4b3840fab2a 100644
--- a/src/NEO/TransactionType.h
+++ b/src/NEO/TransactionType.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/NEO/Witness.h b/src/NEO/Witness.h
index 2562bbb7f4e..fe67e5e260e 100644
--- a/src/NEO/Witness.h
+++ b/src/NEO/Witness.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,21 +10,21 @@
 
 namespace TW::NEO {
 
-class Witness : public Serializable {
+class Witness final: public Serializable {
   public:
     Data invocationScript;
     Data verificationScript;
 
-    virtual ~Witness() {}
+    ~Witness() override = default;
 
-    int64_t size() const override {
+    size_t size() const override {
         return invocationScript.size() + verificationScript.size();
     }
 
-    void deserialize(const Data& data, int initial_pos = 0) override {
+    void deserialize(const Data& data, size_t initial_pos = 0) override {
         uint32_t size;
         invocationScript = readVarBytes(data, initial_pos, &size);
-        verificationScript = readVarBytes(data, initial_pos + size);
+        verificationScript = readVarBytes(data, initial_pos + static_cast<size_t>(size));
     }
 
     Data serialize() const override {
diff --git a/src/NULS/Address.cpp b/src/NULS/Address.cpp
index be8a488e320..d71d4279341 100644
--- a/src/NULS/Address.cpp
+++ b/src/NULS/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #include "Address.h"
 
 #include <TrezorCrypto/ecdsa.h>
@@ -15,19 +13,27 @@ using namespace TW;
 
 namespace TW::NULS {
 
-const std::string Address::prefix("NULSd");
-const std::array<byte, 2> Address::mainnetId = {0x01, 0x00};
+std::string mainnetPrefix = std::string("NULSd");
+std::string testnetPrefix = std::string("tNULSe");
 
-bool Address::isValid(const std::string& string) {
-    if (string.empty()) {
+bool Address::isValid(const std::string& addrStr) {
+    if (addrStr.empty()) {
         return false;
     }
-    if (string.length() <= prefix.length()) {
+    std::string addrPrefix;
+    if(addrStr.find(mainnetPrefix) == 0) {
+        addrPrefix = mainnetPrefix;
+    } else if (addrStr.find(testnetPrefix) == 0) {
+        addrPrefix = testnetPrefix;
+    } else {
+        return false;
+    }
+    if (addrStr.length() <= addrPrefix.length()) {
         return false;
     }
 
-    std::string address = string.substr(prefix.length(), string.length() - prefix.length());
-    Data decoded = Base58::bitcoin.decode(address);
+    std::string address = addrStr.substr(addrPrefix.length(), addrStr.length() - addrPrefix.length());
+    Data decoded = Base58::decode(address);
     if (decoded.size() != size) {
         return false;
     }
@@ -41,22 +47,35 @@ bool Address::isValid(const std::string& string) {
     return decoded[23] == checkSum;
 }
 
-Address::Address(const TW::PublicKey& publicKey) {
-    // Main-Net chainID
-    bytes[0] = mainnetId[0];
-    bytes[1] = mainnetId[1];
+Address::Address(const TW::PublicKey& publicKey, bool isMainnet) {
+    if (isMainnet) {
+        prefix = mainnetPrefix;
+        bytes[0] = 0x01;
+        bytes[1] = 0x00;
+    } else {
+        prefix = testnetPrefix;
+        bytes[0] = 0x02;
+        bytes[1] = 0x00;
+    }
     // Address Type
     bytes[2] = addressType;
     ecdsa_get_pubkeyhash(publicKey.bytes.data(), HASHER_SHA2_RIPEMD, bytes.begin() + 3);
     bytes[23] = checksum(bytes);
 }
 
-Address::Address(const std::string& string) {
-    if (false == isValid(string)) {
+Address::Address(const std::string& addrStr) {
+    if(addrStr.find(mainnetPrefix) == 0) {
+        prefix = mainnetPrefix;
+    } else if (addrStr.find(testnetPrefix) == 0) {
+        prefix = testnetPrefix;
+    } else {
+        throw std::invalid_argument("wrong address prefix");
+    }
+    if (!isValid(addrStr)) {
         throw std::invalid_argument("Invalid address string");
     }
-    std::string address = string.substr(prefix.length(), string.length() - prefix.length());
-    const auto decoded = Base58::bitcoin.decode(address);
+    std::string address = addrStr.substr(prefix.length(), addrStr.length() - prefix.length());
+    const auto decoded = Base58::decode(address);
     std::copy(decoded.begin(), decoded.end(), bytes.begin());
 }
 
@@ -69,7 +88,7 @@ uint8_t Address::type() const {
 }
 
 std::string Address::string() const {
-    return prefix + Base58::bitcoin.encode(bytes.begin(), bytes.end());
+    return prefix + Base58::encode(bytes);
 }
 
 uint8_t Address::checksum(std::array<byte, size>& byteArray) const {
diff --git a/src/NULS/Address.h b/src/NULS/Address.h
index 7134f814be7..73425100bf0 100644
--- a/src/NULS/Address.h
+++ b/src/NULS/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #pragma once
 #include "../Base58Address.h"
 #include "../PrivateKey.h"
@@ -14,23 +12,19 @@ namespace TW::NULS {
 
 class Address : public Base58Address<24> {
   public:
-    /// NULS Main Net Chain ID = 1
-    static const std::array<byte, 2> mainnetId;
-
     /// NULS address prefix
-    static const std::string prefix;
+    std::string prefix;
 
     /// NULS address type
     static const byte addressType = 0x01;
 
     /// Determines whether a string makes a valid address.
-    static bool isValid(const std::string& string);
+    static bool isValid(const std::string& addrStr);
 
     /// Initializes an address from a string representation.
     explicit Address(const std::string& string);
 
-    /// Initializes an address from a public key.
-    explicit Address(const PublicKey& publicKey);
+    explicit Address(const TW::PublicKey& publicKey, bool isMainnet = true);
 
     /// Initializes an address with a collection of bytes.
     explicit Address(const Data& data) : TW::Base58Address<24>(data) {}
diff --git a/src/NULS/BinaryCoding.h b/src/NULS/BinaryCoding.h
index 51de36f5ec9..f9c59e4f8db 100644
--- a/src/NULS/BinaryCoding.h
+++ b/src/NULS/BinaryCoding.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -21,38 +19,69 @@ static inline void serializerRemark(std::string& remark, Data& data) {
     std::copy(remark.begin(), remark.end(), std::back_inserter(data));
 }
 
-static inline void serializerInput(const Proto::TransactionCoinFrom& input, Data& data) {
-    encodeVarInt(1, data); // there is one coinFrom
-    const auto& fromAddress = input.from_address();
-    if (!NULS::Address::isValid(fromAddress)) {
-        throw std::invalid_argument("Invalid address");
+static inline void serializerCoinData(const TW::NULS::Proto::Transaction& tx, Data& data) {
+    auto coinData = Data();
+    // CoinFrom
+    encodeVarInt(tx.input_size(), coinData);
+    for (int i = 0; i < tx.input_size(); i++) {
+        // address
+        const auto& fromAddress = tx.input(i).from_address();
+        if (!NULS::Address::isValid(fromAddress)) {
+            throw std::invalid_argument("Invalid address");
+        }
+        const auto& addr = NULS::Address(fromAddress);
+        encodeVarInt(addr.bytes.size() - 1, coinData);
+        std::copy(addr.bytes.begin(), addr.bytes.end() - 1, std::back_inserter(coinData));
+        // chain id of asset
+        encode16LE(static_cast<uint16_t>(tx.input(i).assets_chainid()), coinData);
+        // asset id
+        encode16LE(static_cast<uint16_t>(tx.input(i).assets_id()), coinData);
+        // amount
+        uint256_t numeric = load(tx.input(i).id_amount());
+        Data numericData = store(numeric);
+        std::reverse(numericData.begin(), numericData.end());
+        std::string numericStr;
+        numericStr.insert(numericStr.begin(), numericData.begin(), numericData.end());
+        numericStr.append(static_cast<unsigned long>(numericData.capacity() - numericData.size()),
+                          '\0');
+        std::copy(numericStr.begin(), numericStr.end(), std::back_inserter(coinData));
+        // nonce
+        Data nonce = parse_hex(tx.input(i).nonce());
+        encodeVarInt(nonce.size(), coinData);
+        append(coinData, nonce);
+        // locked
+        coinData.push_back(static_cast<uint8_t>(tx.input(i).locked()));
     }
-    const auto& addr = NULS::Address(fromAddress);
-    encodeVarInt(addr.bytes.size() - 1, data);
-    std::copy(addr.bytes.begin(), addr.bytes.end() - 1, std::back_inserter(data));
-    encode16LE(static_cast<uint16_t>(input.assets_chainid()), data);
-    encode16LE(static_cast<uint16_t>(input.assets_id()), data);
-    std::copy(input.id_amount().begin(), input.id_amount().end(), std::back_inserter(data));
-    Data nonce = parse_hex(input.nonce());
-    encodeVarInt(nonce.size(), data);
-    append(data, nonce);
-    data.push_back(static_cast<uint8_t>(input.locked()));
-}
-
-static inline void serializerOutput(const Proto::TransactionCoinTo& output, Data& data) {
-    encodeVarInt(1, data); // there is one coinTo
-
-    const auto& toAddress = output.to_address();
-    if (!NULS::Address::isValid(toAddress)) {
-        throw std::invalid_argument("Invalid address");
+    encodeVarInt(tx.output_size(), coinData);
+    for (int i = 0; i < tx.output_size(); i++) {
+        // address
+        const auto& toAddress = tx.output(i).to_address();
+        if (!NULS::Address::isValid(toAddress)) {
+            throw std::invalid_argument("Invalid address");
+        }
+        const auto& addr = NULS::Address(toAddress);
+        encodeVarInt(addr.bytes.size() - 1, coinData);
+        std::copy(addr.bytes.begin(), addr.bytes.end() - 1, std::back_inserter(coinData));
+        // chain id of asset
+        encode16LE(static_cast<uint16_t>(tx.output(i).assets_chainid()), coinData);
+        // asset id
+        encode16LE(static_cast<uint16_t>(tx.output(i).assets_id()), coinData);
+        // amount
+        uint256_t numeric = load(tx.output(i).id_amount());
+        Data numericData = store(numeric);
+        std::reverse(numericData.begin(), numericData.end());
+        std::string numericStr;
+        numericStr.insert(numericStr.begin(), numericData.begin(), numericData.end());
+        numericStr.append(static_cast<unsigned long>(numericData.capacity() - numericData.size()),
+                          '\0');
+        std::copy(numericStr.begin(), numericStr.end(), std::back_inserter(coinData));
+        // lock time
+        encode64LE(tx.output(i).lock_time(), coinData);
     }
-    const auto& addr = NULS::Address(toAddress);
-    encodeVarInt(addr.bytes.size() - 1, data);
-    std::copy(addr.bytes.begin(), addr.bytes.end() - 1, std::back_inserter(data));
-    encode16LE(static_cast<uint16_t>(output.assets_chainid()), data);
-    encode16LE(static_cast<uint16_t>(output.assets_id()), data);
-    std::copy(output.id_amount().begin(), output.id_amount().end(), std::back_inserter(data));
-    encode64LE(output.lock_time(), data);
+    encodeVarInt(tx.input_size() * Signer::TRANSACTION_INPUT_SIZE +
+                     tx.output_size() * Signer::TRANSACTION_OUTPUT_SIZE,
+                 data);
+    append(data, coinData);
 }
 
 static inline Data calcTransactionDigest(Data& data) {
diff --git a/src/NULS/Entry.cpp b/src/NULS/Entry.cpp
index db59dba1bb1..12560ffd6be 100644
--- a/src/NULS/Entry.cpp
+++ b/src/NULS/Entry.cpp
@@ -1,11 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
-
 #include "Address.h"
 #include "Signer.h"
 
@@ -15,16 +12,61 @@ namespace TW::NULS {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
+TW::Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    const auto addr = Address(address);
+    return {addr.bytes.begin(), addr.bytes.end()};
+}
+
 void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const TW::Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            const auto signer = Signer(input);
+            auto unsignedTxBytes = signer.buildUnsignedTx();
+            output.set_data(unsignedTxBytes.data(), unsignedTxBytes.size());
+            Data unsignedTxBytesHash = Hash::sha256(Hash::sha256((unsignedTxBytes)));
+            output.set_data_hash(unsignedTxBytesHash.data(), unsignedTxBytesHash.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_signatures_count);
+                output.set_error_message(
+                    Common::Proto::SigningError_Name(Common::Proto::Error_signatures_count));
+                return;
+            }
+            const auto signer = Signer(input);
+            // verify signatures
+            auto unsignedTxBytes = signer.buildUnsignedTx();
+            Data unsignedTxBytesHash = Hash::sha256(Hash::sha256((unsignedTxBytes)));
+            for (std::vector<Data>::size_type i = 0; i < signatures.size(); i++) {
+                if (!publicKeys[i].verify(signatures[i], unsignedTxBytesHash)) {
+                    throw std::invalid_argument("invalid signature at " + std::to_string(i));
+                }
+            }
+            std::vector<Data> publicKeysData;
+            for (std::vector<PublicKey>::size_type i = 0; i < publicKeys.size(); i++) {
+                publicKeysData.push_back(publicKeys[i].bytes);
+            }
+
+            auto signedData = signer.buildSignedTx(publicKeysData, signatures, unsignedTxBytes);
+            output.set_encoded(signedData.data(), signedData.size());
+        });
+}
+
 } // namespace TW::NULS
diff --git a/src/NULS/Entry.h b/src/NULS/Entry.h
index b11bcc629bb..fe29d702463 100644
--- a/src/NULS/Entry.h
+++ b/src/NULS/Entry.h
@@ -1,12 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "../CoinEntry.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 namespace TW::NULS {
 
@@ -14,9 +13,13 @@ namespace TW::NULS {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::NULS
diff --git a/src/NULS/Signer.cpp b/src/NULS/Signer.cpp
index 77b83e6ebae..2e1ffca2784 100644
--- a/src/NULS/Signer.cpp
+++ b/src/NULS/Signer.cpp
@@ -1,10 +1,9 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
+#include <TrezorCrypto/ecdsa.h>
 
 #include "Address.h"
 #include "BinaryCoding.h"
@@ -21,23 +20,15 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         auto signer = Signer(input);
         auto data = signer.sign();
         output.set_encoded(data.data(), data.size());
-    } catch (...) {
+    } catch (const std::exception& e) {
+        output.set_error(Common::Proto::Error_general);
+        output.set_error_message(e.what());
     }
     return output;
 }
 
-Signer::Signer(const Proto::SigningInput& input)
-    : input(input) {
-    Proto::TransactionCoinFrom coinFrom;
-    coinFrom.set_from_address(input.from());
-    coinFrom.set_assets_chainid(input.chain_id());
-    coinFrom.set_assets_id(input.idassets_id());
-    // need to update with amount + fee
-    coinFrom.set_id_amount(input.amount());
-    coinFrom.set_nonce(input.nonce());
-    // default unlocked
-    coinFrom.set_locked(0);
-    *tx.mutable_input() = coinFrom;
+Signer::Signer(const Proto::SigningInput& input) : input(input) {
+    uint256_t balance = load(input.balance());
 
     Proto::TransactionCoinTo coinTo;
     coinTo.set_to_address(input.to());
@@ -45,10 +36,97 @@ Signer::Signer(const Proto::SigningInput& input)
     coinTo.set_assets_chainid(input.chain_id());
     coinTo.set_assets_id(input.idassets_id());
     coinTo.set_lock_time(0);
-    *tx.mutable_output() = coinTo;
+    *tx.add_output() = coinTo;
 
-    tx.set_remark(input.remark());
     tx.set_type(TX_TYPE);
+
+    TW::uint256_t fromAmount;
+    // get mainnet chain id from address
+    auto from = Address(input.from());
+    if (input.chain_id() == from.chainID() && input.idassets_id() == 1) {
+        // asset is NULS
+        uint256_t txAmount = load(input.amount());
+        uint32_t txSize =
+            CalculatorTransactionSize(1, 1, static_cast<uint32_t>(tx.remark().size()));
+        uint256_t fee = (uint256_t)CalculatorTransactionFee(txSize);
+        fromAmount = txAmount;
+        if (Address::isValid(input.fee_payer()) && input.fee_payer() != input.from()) {
+            uint256_t feePayerBalance = load(input.fee_payer_balance());
+            if (fee > feePayerBalance) {
+                throw std::invalid_argument("fee payer balance not sufficient");
+            }
+            Data feeData = store(fee);
+            std::string feeStr(feeData.begin(), feeData.end());
+            Proto::TransactionCoinFrom feeCoinFrom;
+            feeCoinFrom.set_from_address(input.fee_payer());
+            feeCoinFrom.set_assets_chainid(input.chain_id());
+            feeCoinFrom.set_assets_id(input.idassets_id());
+            feeCoinFrom.set_id_amount(feeStr);
+            feeCoinFrom.set_nonce(input.fee_payer_nonce());
+            // default unlocked
+            feeCoinFrom.set_locked(0);
+            *tx.add_input() = feeCoinFrom;
+        } else {
+            fromAmount += fee;
+        }
+        // update the amount
+        Data amount = store(fromAmount);
+        std::string amountStr(amount.begin(), amount.end());
+        Proto::TransactionCoinFrom coinFrom;
+        coinFrom.set_from_address(input.from());
+        coinFrom.set_assets_chainid(input.chain_id());
+        coinFrom.set_assets_id(input.idassets_id());
+        coinFrom.set_id_amount(amountStr);
+        coinFrom.set_nonce(input.nonce());
+        // default unlocked
+        coinFrom.set_locked(0);
+        *tx.add_input() = coinFrom;
+    } else {
+        // asset is not NULS
+        uint256_t txAmount = load(input.amount());
+        fromAmount = txAmount;
+        // coinFrom
+        // asset
+        Proto::TransactionCoinFrom asset;
+        asset.set_from_address(input.from());
+        asset.set_assets_chainid(input.chain_id());
+        asset.set_assets_id(input.idassets_id());
+        asset.set_id_amount(input.amount());
+        asset.set_nonce(input.nonce());
+        // default unlocked
+        asset.set_locked(0);
+        *tx.add_input() = asset;
+
+        // fee
+        uint32_t txSize = CalculatorTransactionSize(
+            2, 1,
+            static_cast<uint32_t>(
+                tx.remark().size())); // 2 inputs, one for the asset, another for NULS fee
+        uint256_t fee = (uint256_t)CalculatorTransactionFee(txSize);
+        uint256_t feePayerBalance = load(input.fee_payer_balance());
+        if (fee > feePayerBalance) {
+            throw std::invalid_argument("fee payer balance not sufficient");
+        }
+        Data feeData = store(fee);
+        std::string feeStr(feeData.begin(), feeData.end());
+        // add new input for fee
+        Proto::TransactionCoinFrom txFee;
+        txFee.set_from_address(input.fee_payer());
+        txFee.set_nonce(input.fee_payer_nonce());
+
+        txFee.set_assets_chainid(from.chainID());
+        // network asset id 1 is NULS
+        txFee.set_assets_id(1);
+        txFee.set_id_amount(feeStr);
+        // default unlocked
+        txFee.set_locked(0);
+        *tx.add_input() = txFee;
+    }
+    if (fromAmount > balance) {
+        throw std::invalid_argument("User account balance not sufficient");
+    }
+
+    tx.set_remark(input.remark());
     tx.set_timestamp(input.timestamp());
     tx.set_tx_data("");
 }
@@ -57,34 +135,6 @@ Data Signer::sign() const {
     if (input.private_key().empty()) {
         throw std::invalid_argument("Must have private key string");
     }
-
-    uint32_t txSize = CalculatorTransactionSize(1, 1, static_cast<uint32_t>(tx.remark().size()));
-    uint256_t fee = (uint256_t)CalculatorTransactionFee(txSize);
-    uint256_t txAmount = load(input.amount());
-    uint256_t balance = load(input.balance());
-    uint256_t fromAmount = txAmount + fee;
-    if (fromAmount > balance) {
-        throw std::invalid_argument("User account balance not sufficient");
-    }
-
-    auto& coinFrom = (Proto::TransactionCoinFrom&)tx.input();
-    Data amount;
-    amount = store(fromAmount);
-    std::reverse(amount.begin(), amount.end());
-    std::string amountStr;
-    amountStr.insert(amountStr.begin(), amount.begin(), amount.end());
-    amountStr.append(static_cast<unsigned long>(amount.capacity() - amount.size()), '\0');
-    coinFrom.set_id_amount(amountStr);
-
-    auto& coinTo = (Proto::TransactionCoinTo&)tx.output();
-    Data amountTo;
-    amountTo = store(txAmount);
-    std::reverse(amountTo.begin(), amountTo.end());
-    std::string amountToStr;
-    amountToStr.insert(amountToStr.begin(), amountTo.begin(), amountTo.end());
-    amountToStr.append(static_cast<unsigned long>(amountTo.capacity() - amountTo.size()), '\0');
-    coinTo.set_id_amount(amountToStr);
-
     auto dataRet = Data();
     // Transaction Type
     encode16LE(static_cast<uint16_t>(tx.type()), dataRet);
@@ -95,31 +145,78 @@ Data Signer::sign() const {
     serializerRemark(remark, dataRet);
     // txData
     encodeVarInt(0, dataRet);
-
-    // coinFrom and coinTo size
-    encodeVarInt(TRANSACTION_INPUT_SIZE + TRANSACTION_OUTPUT_SIZE, dataRet);
-
-    // CoinData Input
-    serializerInput(tx.input(), dataRet);
-
-    // CoinData Output
-    serializerOutput(tx.output(), dataRet);
-
+    // coinData
+    serializerCoinData(tx, dataRet);
     // Calc transaction hash
     Data txHash = calcTransactionDigest(dataRet);
 
     Data privKey = data(input.private_key());
     auto priv = PrivateKey(privKey);
     auto transactionSignature = makeTransactionSignature(priv, txHash);
+    if (Address::isValid(input.fee_payer()) && input.from() != input.fee_payer()) {
+        Data feePayerPrivKey = data(input.fee_payer_private_key());
+        auto feePayerPriv = PrivateKey(feePayerPrivKey);
+        auto feePayerTransactionSignature = makeTransactionSignature(feePayerPriv, txHash);
+        transactionSignature.insert(transactionSignature.end(),
+                                    feePayerTransactionSignature.begin(),
+                                    feePayerTransactionSignature.end());
+    }
+
     encodeVarInt(transactionSignature.size(), dataRet);
-    std::copy(transactionSignature.begin(), transactionSignature.end(), std::back_inserter(dataRet));
+    std::copy(transactionSignature.begin(), transactionSignature.end(),
+              std::back_inserter(dataRet));
+
+    return dataRet;
+}
+
+Data Signer::buildUnsignedTx() const {
+    auto dataRet = Data();
+    // Transaction Type
+    encode16LE(static_cast<uint16_t>(tx.type()), dataRet);
+    // Timestamp
+    encode32LE(tx.timestamp(), dataRet);
+    // Remark
+    std::string remark = tx.remark();
+    serializerRemark(remark, dataRet);
+    // txData
+    encodeVarInt(0, dataRet);
+    // coinData
+    serializerCoinData(tx, dataRet);
 
     return dataRet;
 }
 
-uint32_t Signer::CalculatorTransactionSize(uint32_t inputCount, uint32_t outputCount, uint32_t remarkSize) const {
-    uint32_t size = TRANSACTION_FIX_SIZE + TRANSACTION_SIG_MAX_SIZE + TRANSACTION_INPUT_SIZE * inputCount +
-                    TRANSACTION_OUTPUT_SIZE * outputCount + remarkSize;
+Data Signer::buildSignedTx(const std::vector<Data> publicKeys,
+                           const std::vector<Data> signatures,
+                           const Data unsignedTxBytes) const {
+    Data transactionSignature = Data();
+    // the size of publicKeys must be the same as the size of the signatures.
+    for (std::vector<Data>::size_type i = 0; i < publicKeys.size(); i++) {
+        encodeVarInt(publicKeys[i].size(), transactionSignature);
+        std::copy(publicKeys[i].begin(), publicKeys[i].end(),
+                  std::back_inserter(transactionSignature));
+
+        std::array<uint8_t, 72> tempSigBytes;
+        size_t size = ecdsa_sig_to_der(signatures[i].data(), tempSigBytes.data());
+        auto signature = Data{};
+        std::copy(tempSigBytes.begin(), tempSigBytes.begin() + size, std::back_inserter(signature));
+
+        encodeVarInt(signature.size(), transactionSignature);
+        std::copy(signature.begin(), signature.end(), std::back_inserter(transactionSignature));
+    }
+
+    Data signedTxBytes = unsignedTxBytes;
+    encodeVarInt(transactionSignature.size(), signedTxBytes);
+    std::copy(transactionSignature.begin(), transactionSignature.end(),
+              std::back_inserter(signedTxBytes));
+    return signedTxBytes;
+}
+
+uint32_t Signer::CalculatorTransactionSize(uint32_t inputCount, uint32_t outputCount,
+                                           uint32_t remarkSize) const {
+    uint32_t size = TRANSACTION_FIX_SIZE + TRANSACTION_SIG_MAX_SIZE +
+                    TRANSACTION_INPUT_SIZE * inputCount + TRANSACTION_OUTPUT_SIZE * outputCount +
+                    remarkSize;
     return size;
 }
 
diff --git a/src/NULS/Signer.h b/src/NULS/Signer.h
index ccbd77bc023..748502aba6e 100644
--- a/src/NULS/Signer.h
+++ b/src/NULS/Signer.h
@@ -1,15 +1,13 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #pragma once
 #include "../proto/NULS.pb.h"
 
-#include <stdint.h>
-#include <algorithm>
 #include "Data.h"
 #include "../uint256.h"
+#include <algorithm>
+#include <stdint.h>
 
 namespace TW::NULS {
 
@@ -18,6 +16,7 @@ class Signer {
   public:
     /// Signs a Proto::SigningInput transaction
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+
   public:
     static const uint16_t TRANSACTION_FIX_SIZE = 11; //type size 2, time size 4, txData size 1, hash size 4
     static const uint16_t TRANSACTION_SIG_MAX_SIZE = 110;
@@ -41,7 +40,14 @@ class Signer {
     ///
     /// \returns the transaction signature or an empty vector if there is an error.
     Data sign() const;
-  private:
+
+    Data buildUnsignedTx() const;
+
+    Data buildSignedTx(const std::vector<Data> publicKeys,
+                       const std::vector<Data> signatures,
+                       const Data unsignedTxBytes) const;
+
+private:
     uint64_t CalculatorTransactionFee(uint64_t size) const;
     int32_t CalculatorMaxInput(uint32_t remarkSize) const;
     uint32_t CalculatorTransactionSize(uint32_t inputCount, uint32_t outputCount, uint32_t remarkSize) const;
diff --git a/src/Nano/Address.cpp b/src/Nano/Address.cpp
index 9788472b089..beb05b919be 100644
--- a/src/Nano/Address.cpp
+++ b/src/Nano/Address.cpp
@@ -1,9 +1,7 @@
 // Copyright © 2019 Mart Roosmaa.
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include <TrezorCrypto/nano.h>
diff --git a/src/Nano/Address.h b/src/Nano/Address.h
index a2c686ac98e..9901577d11d 100644
--- a/src/Nano/Address.h
+++ b/src/Nano/Address.h
@@ -1,9 +1,7 @@
 // Copyright © 2019 Mart Roosmaa.
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nano/Entry.cpp b/src/Nano/Entry.cpp
index 6cfdb73e52b..5fae524f9a3 100644
--- a/src/Nano/Entry.cpp
+++ b/src/Nano/Entry.cpp
@@ -1,23 +1,21 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
-
 #include "Address.h"
 #include "Signer.h"
+#include <proto/TransactionCompiler.pb.h>
 
 namespace TW::Nano {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -34,4 +32,21 @@ std::string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string&
     return Signer::signJSON(json, key);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+
+            auto unsignedTxBytes = Signer::buildUnsignedTxBytes(input);
+            output.set_data(unsignedTxBytes.data(), unsignedTxBytes.size());
+            output.set_data_hash(unsignedTxBytes.data(), unsignedTxBytes.size()); });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, [[maybe_unused]] const auto& publicKey) {
+            output = Signer::buildSigningOutput(input, signature); });
+}
+
 } // namespace TW::Nano
diff --git a/src/Nano/Entry.h b/src/Nano/Entry.h
index 1a27f029e23..441028831f7 100644
--- a/src/Nano/Entry.h
+++ b/src/Nano/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,12 +12,15 @@ namespace TW::Nano {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     bool supportsJSONSigning() const { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool supportsJSONSigning() const { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Nano
diff --git a/src/Nano/Signer.cpp b/src/Nano/Signer.cpp
index a177a84e729..1dc1deeb228 100644
--- a/src/Nano/Signer.cpp
+++ b/src/Nano/Signer.cpp
@@ -1,22 +1,19 @@
 // Copyright © 2019 Mart Roosmaa.
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "../BinaryCoding.h"
-#include "../Hash.h"
 #include "../HexCoding.h"
-#include <nlohmann/json.hpp>
+#include "../uint256.h"
 
-#include <boost/multiprecision/cpp_int.hpp>
+#include <algorithm>
+#include <nlohmann/json.hpp>
 #include <google/protobuf/util/json_util.h>
 
 using namespace TW;
 
-using uint128_t = boost::multiprecision::uint128_t;
 using json = nlohmann::json;
 
 namespace TW::Nano {
@@ -29,8 +26,6 @@ const std::array<byte, 32> kBlockHashPreamble{
 };
 
 std::array<byte, 16> store(const uint128_t& value) {
-    using boost::multiprecision::cpp_int;
-
     Data buf;
     buf.reserve(16);
     export_bits(value, std::back_inserter(buf), 8);
@@ -181,4 +176,40 @@ Proto::SigningOutput Signer::build() const {
     return output;
 }
 
+Data Signer::buildUnsignedTxBytes(const Proto::SigningInput& input) {
+    const auto pubKey = PublicKey(Data(input.public_key().begin(), input.public_key().end()), TWPublicKeyTypeED25519Blake2b);
+    auto block = hashBlockData(pubKey, input);
+    return Data(block.begin(), block.end());
+}
+
+Proto::SigningOutput Signer::buildSigningOutput(const Proto::SigningInput& input, const Data& signature) {
+    auto output = Proto::SigningOutput();
+    const auto pubKey = PublicKey(Data(input.public_key().begin(), input.public_key().end()), TWPublicKeyTypeED25519Blake2b);
+    auto block = hashBlockData(pubKey, input);
+    output.set_signature(signature.data(), signature.size());
+    output.set_block_hash(block.data(), block.size());
+
+    auto prev = previousFromInput(input);
+    auto li = linkFromInput(input);
+
+    // build json
+    json json = {
+        {"type", "state"},
+        {"account", Address(pubKey).string()},
+        {"previous", hex(prev)},
+        {"representative", Address(input.representative()).string()},
+        {"balance", input.balance()},
+        {"link", hex(li)},
+        {"link_as_account", Address(PublicKey(Data(li.begin(), li.end()), TWPublicKeyTypeED25519Blake2b)).string()},
+        {"signature", hex(signature)},
+    };
+
+    if (input.work().size() > 0) {
+        json["work"] = input.work();
+    }
+
+    output.set_json(json.dump());
+    return output;
+}
+
 } // namespace TW::Nano
diff --git a/src/Nano/Signer.h b/src/Nano/Signer.h
index 8ca6fe318d5..fb71e452dfa 100644
--- a/src/Nano/Signer.h
+++ b/src/Nano/Signer.h
@@ -1,9 +1,7 @@
 // Copyright © 2019 Mart Roosmaa.
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #pragma once
 
 #include "Address.h"
@@ -14,12 +12,13 @@
 namespace TW::Nano {
 /// Helper class that performs Ripple transaction signing.
 class Signer {
-  public:
+public:
     /// Signs a Proto::SigningInput transaction
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
     /// Signs a json Proto::SigningInput with private key
     static std::string signJSON(const std::string& json, const Data& key);
-  public:
+
+public:
     const PrivateKey privateKey;
     const PublicKey publicKey;
     const Proto::SigningInput& input;
@@ -34,6 +33,9 @@ class Signer {
 
     /// Builds signed transaction, incl. signature, and json format
     Proto::SigningOutput build() const;
+
+    static Data buildUnsignedTxBytes(const Proto::SigningInput& input);
+    static Proto::SigningOutput buildSigningOutput(const Proto::SigningInput& input, const Data& signature);
 };
 
 } // namespace TW::Nano
diff --git a/src/NativeEvmos/Entry.h b/src/NativeEvmos/Entry.h
new file mode 100644
index 00000000000..17fccc33834
--- /dev/null
+++ b/src/NativeEvmos/Entry.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Cosmos/Entry.h"
+
+namespace TW::NativeEvmos {
+
+/// Entry point for implementation of NativeEvmos coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final : public Cosmos::Entry {
+};
+
+} // namespace TW::NativeEvmos
diff --git a/src/NativeInjective/Entry.h b/src/NativeInjective/Entry.h
new file mode 100644
index 00000000000..9061e28c3cd
--- /dev/null
+++ b/src/NativeInjective/Entry.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Cosmos/Entry.h"
+
+namespace TW::NativeInjective {
+
+/// Entry point for implementation of NativeEvmos coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final : public Cosmos::Entry {
+};
+
+} // namespace TW::NativeInjective
diff --git a/src/Nebulas/Address.cpp b/src/Nebulas/Address.cpp
index 4b113b6cd8c..760dbe0084c 100644
--- a/src/Nebulas/Address.cpp
+++ b/src/Nebulas/Address.cpp
@@ -1,18 +1,17 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "../Base58.h"
 #include "../Hash.h"
 #include "../HexCoding.h"
+#include <cstring>
 
 namespace TW::Nebulas {
 
 bool Address::isValid(const std::string& string) {
-    auto data = Base58::bitcoin.decode(string);
+    auto data = Base58::decode(string);
     if (data.size() != (size_t)Address::size) {
         return false;
     }
@@ -27,7 +26,7 @@ bool Address::isValid(const std::string& string) {
     Data content(data.begin(), data.begin() + 22);
     Data checksum(data.begin() + 22, data.end());
     auto dataSha3 = Hash::sha3_256(content);
-    return ::memcmp(dataSha3.data(), checksum.data(), 4) == 0;
+    return std::memcmp(dataSha3.data(), checksum.data(), 4) == 0;
 }
 
 Address::Address(const std::string& string) {
@@ -35,7 +34,7 @@ Address::Address(const std::string& string) {
         throw std::invalid_argument("Invalid address string");
     }
 
-    auto data = Base58::bitcoin.decode(string);
+    auto data = Base58::decode(string);
     std::copy(data.begin(), data.end(), bytes.begin());
 }
 
@@ -60,7 +59,7 @@ Address::Address(const PublicKey& publicKey) {
 }
 
 std::string Address::string() const {
-    return Base58::bitcoin.encode(bytes);
+    return Base58::encode(bytes);
 }
 
 } // namespace TW::Nebulas
diff --git a/src/Nebulas/Address.h b/src/Nebulas/Address.h
index d0bcaa5c327..469a30876ad 100644
--- a/src/Nebulas/Address.h
+++ b/src/Nebulas/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nebulas/Entry.cpp b/src/Nebulas/Entry.cpp
index a8b4571e527..cf953f588c5 100644
--- a/src/Nebulas/Entry.cpp
+++ b/src/Nebulas/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -14,11 +12,11 @@ using namespace std;
 namespace TW::Nebulas {
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
diff --git a/src/Nebulas/Entry.h b/src/Nebulas/Entry.h
index 0bdcaded71c..4792552c1f4 100644
--- a/src/Nebulas/Entry.h
+++ b/src/Nebulas/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,8 +12,8 @@ namespace TW::Nebulas {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
      void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
 };
 
diff --git a/src/Nebulas/Signer.cpp b/src/Nebulas/Signer.cpp
index 1d0159eeed4..ada56c94f8b 100644
--- a/src/Nebulas/Signer.cpp
+++ b/src/Nebulas/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Base64.h"
@@ -15,14 +13,7 @@ namespace TW::Nebulas {
 Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     auto signer = Signer(load(input.chain_id()));
 
-    auto tx = Transaction(Address(input.from_address()),
-                          load(input.nonce()),
-                          load(input.gas_price()),
-                          load(input.gas_limit()),
-                          Address(input.to_address()),
-                          load(input.amount()),
-                          load(input.timestamp()),
-                          input.payload());
+    auto tx = signer.buildTransaction(input);
 
     auto privateKey = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
     signer.sign(privateKey, tx);
@@ -43,6 +34,20 @@ void Signer::sign(const PrivateKey& privateKey, Transaction& transaction) const
 }
 
 Data Signer::hash(const Transaction& transaction) const noexcept {
+    return Hash::sha3_256(getPreImage(transaction));
+}
+
+Data Signer::hash(const Data& data) const noexcept {
+    return Hash::sha3_256(data);
+}
+
+Transaction Signer::buildTransaction(const Proto::SigningInput& input) const noexcept {
+    return {Transaction(Address(input.from_address()), load(input.nonce()), load(input.gas_price()),
+                        load(input.gas_limit()), Address(input.to_address()), load(input.amount()),
+                        load(input.timestamp()), input.payload())};
+}
+
+Data Signer::getPreImage(const Transaction& transaction) const noexcept {
     auto encoded = Data();
     auto payload = Data();
     auto* data = Transaction::newPayloadData(transaction.payload);
@@ -59,7 +64,7 @@ Data Signer::hash(const Transaction& transaction) const noexcept {
     encode256BE(encoded, chainID, 32);
     encode256BE(encoded, transaction.gasPrice, 128);
     encode256BE(encoded, transaction.gasLimit, 128);
-    return Hash::sha3_256(encoded);
+    return encoded;
 }
 
 } // namespace TW::Nebulas
diff --git a/src/Nebulas/Signer.h b/src/Nebulas/Signer.h
index 2beed1448ce..51238e21f3d 100644
--- a/src/Nebulas/Signer.h
+++ b/src/Nebulas/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -32,6 +30,14 @@ class Signer {
   protected:
     /// Computes the transaction hash.
     Data hash(const Transaction& transaction) const noexcept;
+
+    /// Computes hash.
+    Data hash(const Data& preImage) const noexcept;
+
+    Transaction buildTransaction(const Proto::SigningInput& input) const noexcept;
+
+    /// Get transaction data.
+    Data getPreImage(const Transaction& transaction) const noexcept;
 };
 
 } // namespace TW::Nebulas
diff --git a/src/Nebulas/Transaction.cpp b/src/Nebulas/Transaction.cpp
index ce70cb617da..915c57f60a2 100644
--- a/src/Nebulas/Transaction.cpp
+++ b/src/Nebulas/Transaction.cpp
@@ -1,11 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 #include "../HexCoding.h"
diff --git a/src/Nebulas/Transaction.h b/src/Nebulas/Transaction.h
index dfeb5585f04..3edc9e231a6 100644
--- a/src/Nebulas/Transaction.h
+++ b/src/Nebulas/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Address.cpp b/src/Nervos/Address.cpp
index 7740a96657e..5f27a73f94d 100644
--- a/src/Nervos/Address.cpp
+++ b/src/Nervos/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "Constants.h"
diff --git a/src/Nervos/Address.h b/src/Nervos/Address.h
index 3b8c28fab7c..6e6568d4bf4 100644
--- a/src/Nervos/Address.h
+++ b/src/Nervos/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Cell.h b/src/Nervos/Cell.h
index 750f1b0fc58..8f7c0c7f79e 100644
--- a/src/Nervos/Cell.h
+++ b/src/Nervos/Cell.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/CellDep.cpp b/src/Nervos/CellDep.cpp
index a9acf139ae3..1dabbebfa66 100644
--- a/src/Nervos/CellDep.cpp
+++ b/src/Nervos/CellDep.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "CellDep.h"
 
diff --git a/src/Nervos/CellDep.h b/src/Nervos/CellDep.h
index 9318017803e..d28543052e0 100644
--- a/src/Nervos/CellDep.h
+++ b/src/Nervos/CellDep.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/CellInput.cpp b/src/Nervos/CellInput.cpp
index 61810b9686b..66e248f2f29 100644
--- a/src/Nervos/CellInput.cpp
+++ b/src/Nervos/CellInput.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "CellInput.h"
 #include "Serialization.h"
diff --git a/src/Nervos/CellInput.h b/src/Nervos/CellInput.h
index afb8488cf05..09f5b4da00c 100644
--- a/src/Nervos/CellInput.h
+++ b/src/Nervos/CellInput.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/CellOutput.cpp b/src/Nervos/CellOutput.cpp
index ed1d98b86b8..ea938845446 100644
--- a/src/Nervos/CellOutput.cpp
+++ b/src/Nervos/CellOutput.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "CellOutput.h"
 #include "Serialization.h"
diff --git a/src/Nervos/CellOutput.h b/src/Nervos/CellOutput.h
index ca2b267d0cf..d3e5ac57fd6 100644
--- a/src/Nervos/CellOutput.h
+++ b/src/Nervos/CellOutput.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Constants.h b/src/Nervos/Constants.h
index 97678b77bd7..d492dcc76c4 100644
--- a/src/Nervos/Constants.h
+++ b/src/Nervos/Constants.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Entry.cpp b/src/Nervos/Entry.cpp
index 44e725ae6a3..e8a2b4056c4 100644
--- a/src/Nervos/Entry.cpp
+++ b/src/Nervos/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -12,13 +10,13 @@
 namespace TW::Nervos {
 using namespace std;
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, byte, byte,
-                            const char* hrp) const {
-    return Address::isValid(address, hrp);
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const {
+    auto* hrpPrefix = std::get_if<Bech32Prefix>(&addressPrefix);
+    return Address::isValid(address, hrpPrefix ? *hrpPrefix : HRP_NERVOS);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, byte,
-                            const char* hrp) const {
+std::string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    const char* hrp = getFromPrefixHrpOrDefault(addressPrefix, coin);
     return Address(publicKey, hrp).string();
 }
 
diff --git a/src/Nervos/Entry.h b/src/Nervos/Entry.h
index 0d3919dcefb..a0876175889 100644
--- a/src/Nervos/Entry.h
+++ b/src/Nervos/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -17,10 +15,8 @@ namespace TW::Nervos {
 /// includes in this file
 class Entry final : public CoinEntry {
 public:
-    bool validateAddress(TWCoinType coin, const std::string& address, byte p2pkh, byte p2sh,
-                         const char* hrp) const;
-    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, byte p2pkh,
-                              const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
     void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
 };
diff --git a/src/Nervos/HeaderDep.h b/src/Nervos/HeaderDep.h
index af94b115db8..63e440f9d93 100644
--- a/src/Nervos/HeaderDep.h
+++ b/src/Nervos/HeaderDep.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/OutPoint.cpp b/src/Nervos/OutPoint.cpp
index a9cfbb1599d..b6c2992e09d 100644
--- a/src/Nervos/OutPoint.cpp
+++ b/src/Nervos/OutPoint.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "OutPoint.h"
 #include "Serialization.h"
diff --git a/src/Nervos/OutPoint.h b/src/Nervos/OutPoint.h
index f6fc82e90f0..5c7b9e6a241 100644
--- a/src/Nervos/OutPoint.h
+++ b/src/Nervos/OutPoint.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Script.cpp b/src/Nervos/Script.cpp
index b0f688f5797..abcf703259c 100644
--- a/src/Nervos/Script.cpp
+++ b/src/Nervos/Script.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Script.h"
 #include "Constants.h"
diff --git a/src/Nervos/Script.h b/src/Nervos/Script.h
index 7c0abffec5c..2c738a5c3af 100644
--- a/src/Nervos/Script.h
+++ b/src/Nervos/Script.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Serialization.h b/src/Nervos/Serialization.h
index 9a2c66dee71..96760e14321 100644
--- a/src/Nervos/Serialization.h
+++ b/src/Nervos/Serialization.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Signer.cpp b/src/Nervos/Signer.cpp
index 3a39ed1eb45..d5cb006ad30 100644
--- a/src/Nervos/Signer.cpp
+++ b/src/Nervos/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Transaction.h"
diff --git a/src/Nervos/Signer.h b/src/Nervos/Signer.h
index 7c7c0c1d279..bbbc70d3677 100644
--- a/src/Nervos/Signer.h
+++ b/src/Nervos/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Transaction.cpp b/src/Nervos/Transaction.cpp
index bf61915e2f8..ca65efa723e 100644
--- a/src/Nervos/Transaction.cpp
+++ b/src/Nervos/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 #include "Constants.h"
diff --git a/src/Nervos/Transaction.h b/src/Nervos/Transaction.h
index 6121b0a6866..9f6f6115fb9 100644
--- a/src/Nervos/Transaction.h
+++ b/src/Nervos/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/TransactionPlan.cpp b/src/Nervos/TransactionPlan.cpp
index c4135505af8..0feb4663a32 100644
--- a/src/Nervos/TransactionPlan.cpp
+++ b/src/Nervos/TransactionPlan.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionPlan.h"
 #include "Constants.h"
diff --git a/src/Nervos/TransactionPlan.h b/src/Nervos/TransactionPlan.h
index 7fc800e44a3..7812f2ee124 100644
--- a/src/Nervos/TransactionPlan.h
+++ b/src/Nervos/TransactionPlan.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nervos/Witness.cpp b/src/Nervos/Witness.cpp
index 73a7e37fed8..aa66b4aeed1 100644
--- a/src/Nervos/Witness.cpp
+++ b/src/Nervos/Witness.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Witness.h"
 #include "Serialization.h"
diff --git a/src/Nervos/Witness.h b/src/Nervos/Witness.h
index f53aa398f7a..0e67da4a72a 100644
--- a/src/Nervos/Witness.h
+++ b/src/Nervos/Witness.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nimiq/Address.cpp b/src/Nimiq/Address.cpp
index 46b6cb3ace7..46ab1bb1f5e 100644
--- a/src/Nimiq/Address.cpp
+++ b/src/Nimiq/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
@@ -90,7 +88,7 @@ Address::Address(const std::vector<uint8_t>& data) {
 
 Address::Address(const PublicKey& publicKey) {
     auto hash = std::array<uint8_t, 32>();
-    blake2b(publicKey.bytes.data(), 32, hash.data(), hash.size());
+    tc_blake2b(publicKey.bytes.data(), 32, hash.data(), hash.size());
     std::copy(hash.begin(), hash.begin() + Address::size, bytes.begin());
 }
 
diff --git a/src/Nimiq/Address.h b/src/Nimiq/Address.h
index ff60c756f9e..6b94b61c548 100644
--- a/src/Nimiq/Address.h
+++ b/src/Nimiq/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nimiq/Entry.cpp b/src/Nimiq/Entry.cpp
index 92279053f4f..413d8ba854c 100644
--- a/src/Nimiq/Entry.cpp
+++ b/src/Nimiq/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -13,11 +11,11 @@ namespace TW::Nimiq {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
diff --git a/src/Nimiq/Entry.h b/src/Nimiq/Entry.h
index cad09e0fc65..50256cd871d 100644
--- a/src/Nimiq/Entry.h
+++ b/src/Nimiq/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,8 +12,8 @@ namespace TW::Nimiq {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
      void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
 };
 
diff --git a/src/Nimiq/Signer.cpp b/src/Nimiq/Signer.cpp
index 5433b88aa86..e8de7375c62 100644
--- a/src/Nimiq/Signer.cpp
+++ b/src/Nimiq/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include <TrezorCrypto/ed25519.h>
@@ -21,7 +19,8 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         /* destination */Address(input.destination()),
         /* amount */input.value(),
         /* fee */input.fee(),
-        /* vsh */input.validity_start_height()
+        /* vsh */input.validity_start_height(),
+        /* networkId */input.network_id()
     );
 
     auto signer = Signer();
diff --git a/src/Nimiq/Signer.h b/src/Nimiq/Signer.h
index 022f98ba424..1e485e45773 100644
--- a/src/Nimiq/Signer.h
+++ b/src/Nimiq/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Nimiq/Transaction.cpp b/src/Nimiq/Transaction.cpp
index c7828ed73a8..9617cd2fcbb 100644
--- a/src/Nimiq/Transaction.cpp
+++ b/src/Nimiq/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 
@@ -11,25 +9,33 @@
 
 namespace TW::Nimiq {
 
-const uint8_t NETWORK_ID = 42;
 const uint8_t EMPTY_FLAGS = 0;
 
 std::vector<uint8_t> Transaction::serialize() const {
+    // Source code:
+    // https://github.com/nimiq/core-rs-albatross/blame/b8ed402c9096ffb54afea52347b91ab7831e75de/primitives/transaction/src/lib.rs#L699
+
     std::vector<uint8_t> data;
 
     data.push_back(0x00); // Basic TX type
+    if (isAlbatross()) {
+        data.push_back(0x00); // Signature Proof type and flags (Ed25519 type and no flags)
+    }
     data.insert(data.end(), sender_pub_key.begin(), sender_pub_key.end());
     data.insert(data.end(), destination.bytes.begin(), destination.bytes.end());
     encode64BE(amount, data);
     encode64BE(fee, data);
     encode32BE(vsh, data);
-    data.push_back(NETWORK_ID);
+    data.push_back(consensusNetworkId());
     data.insert(data.end(), signature.begin(), signature.end());
 
     return data;
 }
 
 std::vector<uint8_t> Transaction::getPreImage() const {
+    // Source code:
+    // https://github.com/nimiq/core-rs-albatross/blame/b8ed402c9096ffb54afea52347b91ab7831e75de/primitives/transaction/src/lib.rs#L582
+
     std::vector<uint8_t> data;
 
     // Build pre-image
@@ -42,10 +48,32 @@ std::vector<uint8_t> Transaction::getPreImage() const {
     encode64BE(amount, data);
     encode64BE(fee, data);
     encode32BE(vsh, data);
-    data.push_back(NETWORK_ID);
+    data.push_back(consensusNetworkId());
     data.push_back(EMPTY_FLAGS);
+    if (isAlbatross()) {
+        data.push_back(0x00); // Sender Data size (+ 0 bytes of data)
+    }
 
     return data;
 }
 
+bool Transaction::isAlbatross() const {
+    if (networkId == Proto::NetworkId::MainnetAlbatross) {
+        return true;
+    }
+    return false;
+}
+
+uint8_t Transaction::consensusNetworkId() const {
+    switch (networkId) {
+        case Proto::NetworkId::UseDefault:
+        case Proto::NetworkId::Mainnet:
+            return static_cast<uint8_t>(Proto::NetworkId::Mainnet);
+        case Proto::NetworkId::MainnetAlbatross:
+            return static_cast<uint8_t>(Proto::NetworkId::MainnetAlbatross);
+        default:
+            throw std::invalid_argument("Invalid network ID");
+    }
+}
+
 } // namespace TW::Nimiq
diff --git a/src/Nimiq/Transaction.h b/src/Nimiq/Transaction.h
index ad8c192756d..98ea799387d 100644
--- a/src/Nimiq/Transaction.h
+++ b/src/Nimiq/Transaction.h
@@ -1,12 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Address.h"
+#include "proto/Nimiq.pb.h"
 
 namespace TW::Nimiq {
 
@@ -22,16 +21,22 @@ class Transaction {
     uint64_t fee;
     // Validity start (block) height
     uint32_t vsh;
+    // Network ID
+    Proto::NetworkId networkId;
     // Sender signature
     std::array<uint8_t, 64> signature;
 
     Transaction(const std::array<uint8_t, 32>& sender, const Address& dest, uint64_t amount,
-                uint64_t fee, uint32_t vsh)
-        : sender_pub_key(sender), destination(dest), amount(amount), fee(fee), vsh(vsh) {}
+                uint64_t fee, uint32_t vsh, Proto::NetworkId networkId)
+        : sender_pub_key(sender), destination(dest), amount(amount), fee(fee), vsh(vsh), networkId(networkId) {}
 
   public:
     std::vector<uint8_t> serialize() const;
     std::vector<uint8_t> getPreImage() const;
+
+  private:
+    bool isAlbatross() const;
+    uint8_t consensusNetworkId() const;
 };
 
 } // namespace TW::Nimiq
diff --git a/src/Numeric.h b/src/Numeric.h
new file mode 100644
index 00000000000..d7db412fda7
--- /dev/null
+++ b/src/Numeric.h
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <numeric>
+
+namespace TW {
+
+template <
+    typename T,
+    typename = std::enable_if_t<std::is_unsigned_v<T>>
+>
+bool checkAddUnsignedOverflow(T x, T y) {
+    return x > std::numeric_limits<T>::max() - y;
+}
+
+template <
+    typename T,
+    typename = std::enable_if_t<std::is_unsigned_v<T>>
+>
+bool checkMulUnsignedOverflow(T x, T y) {
+    if (x == 0 || y == 0) {
+        return false;
+    }
+    return x > std::numeric_limits<T>::max() / y;
+}
+
+} // namespace TW
diff --git a/src/NumericLiteral.h b/src/NumericLiteral.h
index 4674dda8d88..0daa1f13242 100644
--- a/src/NumericLiteral.h
+++ b/src/NumericLiteral.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Oasis/Address.cpp b/src/Oasis/Address.cpp
index ee4102f4d8f..0b394ddf2c1 100644
--- a/src/Oasis/Address.cpp
+++ b/src/Oasis/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
diff --git a/src/Oasis/Address.h b/src/Oasis/Address.h
index c4eb73f3ef0..1e500aaffda 100644
--- a/src/Oasis/Address.h
+++ b/src/Oasis/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Oasis/Entry.cpp b/src/Oasis/Entry.cpp
index 3dbaeeb4d24..48efdde0ae4 100644
--- a/src/Oasis/Entry.cpp
+++ b/src/Oasis/Entry.cpp
@@ -1,25 +1,25 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "Signer.h"
 
+#include "../proto/TransactionCompiler.pb.h"
+
 using namespace std;
 
 namespace TW::Oasis {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -27,4 +27,24 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            const auto signer = Signer(input);
+            auto preImage = signer.signaturePreimage();
+            auto preImageHash = Hash::sha512_256(preImage);
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, const auto& publicKey) {
+            const auto signer = Signer(input);
+            output = signer.compile(signature, publicKey);
+        });
+}
 } // namespace TW::Oasis
diff --git a/src/Oasis/Entry.h b/src/Oasis/Entry.h
index c4b3fb6240f..497f4df9593 100644
--- a/src/Oasis/Entry.h
+++ b/src/Oasis/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,14 @@ namespace TW::Oasis {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+
+    void compile(TWCoinType coin, const Data& txInputData,
+                 const std::vector<Data>& signatures,
+                 const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Oasis
diff --git a/src/Oasis/Signer.cpp b/src/Oasis/Signer.cpp
index b9263a7d8d9..ea3405382a8 100644
--- a/src/Oasis/Signer.cpp
+++ b/src/Oasis/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <Oasis/Signer.h>
 
@@ -10,6 +8,8 @@
 #include "Signer.h"
 
 #define TRANSFER_METHOD "staking.Transfer"
+#define ESCROW_METHOD "staking.AddEscrow"
+#define RECLAIM_ESCROW_METHOD "staking.ReclaimEscrow"
 
 using namespace TW;
 
@@ -24,6 +24,96 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
 }
 
 Data Signer::build() const {
+    auto privateKey = PrivateKey(input.private_key());
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+
+    if(input.has_transfer()) {
+        auto tx = buildTransfer();
+        auto signature = signTransaction<Transaction>(tx);
+        auto encoded = tx.serialize(signature, publicKey);
+        return encoded;
+    }
+
+    if(input.has_escrow()) {
+        auto tx = buildEscrow();
+        auto signature = signTransaction<Escrow>(tx);
+        auto encoded = tx.serialize(signature, publicKey);
+        return encoded;
+    }
+
+    if(input.has_reclaimescrow()) {
+        auto tx = buildReclaimEscrow();
+        auto signature = signTransaction<ReclaimEscrow>(tx);
+        auto encoded = tx.serialize(signature, publicKey);
+        return encoded;
+    }
+
+    throw std::invalid_argument("Invalid message");
+}
+
+template <typename T>
+Data Signer::signTransaction(T& tx) const {
+    auto privateKey = PrivateKey(input.private_key());
+
+    // The use of this context thing is explained here -->
+    // https://docs.oasis.dev/oasis-core/common-functionality/crypto#domain-separation
+    auto encodedMessage = tx.encodeMessage().encoded();
+    Data dataToHash(tx.context.begin(), tx.context.end());
+    dataToHash.insert(dataToHash.end(), encodedMessage.begin(), encodedMessage.end());
+    auto hash = Hash::sha512_256(dataToHash);
+
+    auto signature = privateKey.sign(hash, TWCurveED25519);
+    return Data(signature.begin(), signature.end());
+}
+
+Data Signer::signaturePreimage() const {
+    if(input.has_transfer()) {
+        auto tx = buildTransfer();
+        return tx.signaturePreimage();
+    }
+
+    if(input.has_escrow()) {
+        auto tx = buildEscrow();
+        return tx.signaturePreimage();
+    }
+
+    if(input.has_reclaimescrow()) {
+        auto tx = buildReclaimEscrow();
+        return tx.signaturePreimage();
+    }
+
+    throw std::invalid_argument("Invalid message");
+}
+
+Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey) const {
+    Proto::SigningOutput output;
+
+    if(input.has_transfer()) {
+        auto tx = buildTransfer();
+        auto encoded = tx.serialize(signature, publicKey);
+        output.set_encoded(encoded.data(), encoded.size());
+        return output;
+    }
+
+    if(input.has_escrow()) {
+        auto tx = buildEscrow();
+        auto encoded = tx.serialize(signature, publicKey);
+        output.set_encoded(encoded.data(), encoded.size());
+        return output;
+    }
+
+    if(input.has_reclaimescrow()) {
+        auto tx = buildReclaimEscrow();
+        auto encoded = tx.serialize(signature, publicKey);
+        output.set_encoded(encoded.data(), encoded.size());
+        return output;
+    }
+
+    throw std::invalid_argument("Invalid message");
+}
+
+
+Transaction Signer::buildTransfer() const {
     // Create empty address var and check if value we want to load is valid
     Address address(input.transfer().to());
 
@@ -47,27 +137,61 @@ Data Signer::build() const {
         /* amount */ amount,
         /* nonce */ input.transfer().nonce(),
         /* context */ input.transfer().context());
+    return transaction;
+}
 
-    auto privateKey = PrivateKey(input.private_key());
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+Escrow Signer::buildEscrow() const {
+    // Create empty address var and check if value we want to load is valid
+    Address address(input.escrow().account());
+
+    // Load value on that address var we create before
+    Address::decode(input.escrow().account(), address);
 
-    auto signature = sign(transaction);
-    auto encoded = transaction.serialize(signature, publicKey);
+    // Convert values from string to uint256
+    std::istringstream amountStream(input.escrow().amount());
+    uint256_t amount;
+    amountStream >> amount;
 
-    return encoded;
+    std::istringstream gasAmountStream(input.escrow().gas_amount());
+    uint256_t gasAmount;
+    gasAmountStream >> gasAmount;
+
+    Escrow escrow(
+        /* method */ ESCROW_METHOD,
+        /* gasPrice */ input.escrow().gas_price(),
+        /* gasAmount */ gasAmount,
+        /* nonce */ input.escrow().nonce(),
+        /* account */ address,
+        /* amount */ amount,
+        /* context */ input.escrow().context());
+    return escrow;
 }
 
-Data Signer::sign(Transaction& tx) const {
-    auto privateKey = PrivateKey(input.private_key());
+ReclaimEscrow Signer::buildReclaimEscrow() const {
+     // Create empty address var and check if value we want to load is valid
+    Address address(input.reclaimescrow().account());
 
-    // The use of this context thing is explained here --> https://docs.oasis.dev/oasis-core/common-functionality/crypto#domain-separation
-    auto encodedMessage = tx.encodeMessage().encoded();
-    Data dataToHash(tx.context.begin(), tx.context.end());
-    dataToHash.insert(dataToHash.end(), encodedMessage.begin(), encodedMessage.end());
-    auto hash = Hash::sha512_256(dataToHash);
+    // Load value on that address var we create before
+    Address::decode(input.reclaimescrow().account(), address);
 
-    auto signature = privateKey.sign(hash, TWCurveED25519);
-    return Data(signature.begin(), signature.end());
+    // Convert values from string to uint256
+    std::istringstream sharesStream(input.reclaimescrow().shares());
+    uint256_t shares;
+    sharesStream >> shares;
+
+    std::istringstream gasAmountStream(input.reclaimescrow().gas_amount());
+    uint256_t gasAmount;
+    gasAmountStream >> gasAmount;
+
+    ReclaimEscrow reclaimEscrow(
+        /* method */ RECLAIM_ESCROW_METHOD,
+        /* gasPrice */ input.reclaimescrow().gas_price(),
+        /* gasAmount */ gasAmount,
+        /* nonce */ input.reclaimescrow().nonce(),
+        /* account */ address,
+        /* shares */ shares,
+        /* context */ input.reclaimescrow().context());
+    return reclaimEscrow;
 }
 
 } // namespace TW::Oasis
diff --git a/src/Oasis/Signer.h b/src/Oasis/Signer.h
index 90e92d0e5b9..eae5d2b772d 100644
--- a/src/Oasis/Signer.h
+++ b/src/Oasis/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -18,6 +16,11 @@ namespace TW::Oasis {
 
 /// Helper class that performs Oasis transaction signing.
 class Signer {
+private:
+    Transaction buildTransfer() const;
+    Escrow buildEscrow() const;
+    ReclaimEscrow buildReclaimEscrow() const;
+
 public:
     Proto::SigningInput input;
 
@@ -34,13 +37,16 @@ class Signer {
     ///
     /// \returns the transaction signature or an empty vector if there is an
     /// error.
-    Data sign(Transaction& tx) const;
+    template <typename T>
+    Data signTransaction(T& tx) const;
 
     /// Builds a signed transaction.
     ///
     /// \returns the signed transaction data or an empty vector if there is an
     /// error.
     Data build() const;
+    Data signaturePreimage() const;
+    Proto::SigningOutput compile(const Data& signature, const PublicKey& publicKey) const;
 };
 
 } // namespace TW::Oasis
diff --git a/src/Oasis/Transaction.cpp b/src/Oasis/Transaction.cpp
index dece41bfb53..262ec08ee82 100644
--- a/src/Oasis/Transaction.cpp
+++ b/src/Oasis/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 
@@ -30,6 +28,24 @@ static Data encodeVaruint(const uint256_t& value) {
     return small;
 }
 
+static Data serializeTransaction(const Data& signature, const PublicKey& publicKey, const Data& body) {
+    auto signedMessage = Cbor::Encode::map({
+            { Cbor::Encode::string("untrusted_raw_value"), Cbor::Encode::bytes(body) },
+            { Cbor::Encode::string("signature"), Cbor::Encode::map({
+                   { Cbor::Encode::string("public_key"), Cbor::Encode::bytes(publicKey.bytes) },
+                   { Cbor::Encode::string("signature"), Cbor::Encode::bytes(signature) }
+                })
+            }
+        });
+    return signedMessage.encoded();
+}
+
+static Data buildSignaturePreimage(std::string context, const Data& encodedMessage) {
+    Data dataToHash(context.begin(), context.end());
+    dataToHash.insert(dataToHash.end(), encodedMessage.begin(), encodedMessage.end());
+    return dataToHash;
+}
+
 Cbor::Encode Transaction::encodeMessage() const {
 
     return Cbor::Encode::map({
@@ -48,18 +64,65 @@ Cbor::Encode Transaction::encodeMessage() const {
     });
 }
 
-Data Transaction::serialize(Data& signature, PublicKey& publicKey) const {
-    auto signedMessage = Cbor::Encode::map({
-            { Cbor::Encode::string("untrusted_raw_value"), Cbor::Encode::bytes(encodeMessage().encoded()) },
-            { Cbor::Encode::string("signature"), Cbor::Encode::map({
-                   { Cbor::Encode::string("public_key"), Cbor::Encode::bytes(publicKey.bytes) },
-                   { Cbor::Encode::string("signature"), Cbor::Encode::bytes(signature) }
-                })
-            }
-        });
-    return signedMessage.encoded();
+Data Transaction::serialize(const Data& signature, const PublicKey& publicKey) const {
+    return serializeTransaction(signature, publicKey, encodeMessage().encoded());
+}           
+            
+Data Transaction::signaturePreimage() const {
+    return buildSignaturePreimage(context, encodeMessage().encoded());
+}           
+            
+Cbor::Encode Escrow::encodeMessage() const {
+
+    return Cbor::Encode::map({
+        { Cbor::Encode::string("nonce"), Cbor::Encode::uint(nonce) },
+        { Cbor::Encode::string("method"), Cbor::Encode::string(method) },
+        { Cbor::Encode::string("fee"), Cbor::Encode::map({
+                 { Cbor::Encode::string("gas"), Cbor::Encode::uint(gasPrice) },
+                 { Cbor::Encode::string("amount"), Cbor::Encode::bytes(encodeVaruint(gasAmount)) }
+             })
+        },
+        { Cbor::Encode::string("body"), Cbor::Encode::map({
+                  { Cbor::Encode::string("account"), Cbor::Encode::bytes(account.getKeyHash()) },
+                  { Cbor::Encode::string("amount"), Cbor::Encode::bytes(encodeVaruint(amount)) }
+              })
+        }
+    });
+}
+
+Data Escrow::serialize(const Data& signature, const PublicKey& publicKey) const {
+    return serializeTransaction(signature, publicKey, encodeMessage().encoded());
+}
+
+Data Escrow::signaturePreimage() const {
+    return buildSignaturePreimage(context, encodeMessage().encoded());
+}
+
+Cbor::Encode ReclaimEscrow::encodeMessage() const {
+
+    return Cbor::Encode::map({
+        { Cbor::Encode::string("nonce"), Cbor::Encode::uint(nonce) },
+        { Cbor::Encode::string("method"), Cbor::Encode::string(method) },
+        { Cbor::Encode::string("fee"), Cbor::Encode::map({
+                 { Cbor::Encode::string("gas"), Cbor::Encode::uint(gasPrice) },
+                 { Cbor::Encode::string("amount"), Cbor::Encode::bytes(encodeVaruint(gasAmount)) }
+             })
+        },
+        { Cbor::Encode::string("body"), Cbor::Encode::map({
+                  { Cbor::Encode::string("account"), Cbor::Encode::bytes(account.getKeyHash()) },
+                  { Cbor::Encode::string("shares"), Cbor::Encode::bytes(encodeVaruint(shares)) }
+              })
+        }
+    });
 }
 
+Data ReclaimEscrow::serialize(const Data& signature, const PublicKey& publicKey) const {
+    return serializeTransaction(signature, publicKey, encodeMessage().encoded());
+}
+
+Data ReclaimEscrow::signaturePreimage() const {
+    return buildSignaturePreimage(context, encodeMessage().encoded());
+}
 // clang-format on
 
 } // namespace TW::Oasis
diff --git a/src/Oasis/Transaction.h b/src/Oasis/Transaction.h
index 2c72e7762c4..0a423b2c7cd 100644
--- a/src/Oasis/Transaction.h
+++ b/src/Oasis/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,6 +12,7 @@
 
 namespace TW::Oasis {
 
+// Transfer transaction
 class Transaction {
   public:
     // Recipient address
@@ -46,7 +45,86 @@ class Transaction {
     Cbor::Encode encodeMessage() const;
 
     // serialize returns the CBOR encoding of the SignedMessage.
-    Data serialize(Data& signature, PublicKey& publicKey) const;
+    Data serialize(const Data& signature, const PublicKey& publicKey) const;
+
+    // serialize transaction that can be signed
+    Data signaturePreimage() const;
+};
+
+// Escrow transaction
+class Escrow {
+  public:
+    // Method name
+    std::string method;
+    // Gas price
+    uint64_t gasPrice;
+    // Gas amount
+    uint256_t gasAmount;
+    // Transaction nonce
+    uint64_t nonce;
+    Address account;
+    // Transaction amount
+    uint256_t amount;
+    // Transaction context
+    std::string context;
+
+    Escrow(std::string method, uint64_t gasPrice, uint256_t gasAmount, uint64_t nonce,
+            Address account, uint256_t amount, std::string context)
+        : method(std::move(method))
+        , gasPrice(gasPrice)
+        , gasAmount(std::move(gasAmount))
+        , nonce(nonce)
+        , account(std::move(account))
+        , amount(std::move(amount))
+        , context(std::move(context)){}
+
+  public:
+    // message returns the CBOR encoding of the Message to be signed.
+    Cbor::Encode encodeMessage() const;
+
+    // serialize returns the CBOR encoding of the SignedMessage.
+    Data serialize(const Data& signature, const PublicKey& publicKey) const;
+
+    // serialize transaction that can be signed
+    Data signaturePreimage() const;
+};
+
+// ReclaimEscrow transaction
+class ReclaimEscrow {
+  public:
+    // Method name
+    std::string method;
+    // Gas price
+    uint64_t gasPrice;
+    // Gas amount
+    uint256_t gasAmount;
+    // Transaction nonce
+    uint64_t nonce;
+    Address account;
+    // Transaction amount
+    uint256_t shares;
+    // Transaction context
+    std::string context;
+
+    ReclaimEscrow(std::string method, uint64_t gasPrice, uint256_t gasAmount, uint64_t nonce,
+            Address account, uint256_t shares, std::string context)
+        : method(std::move(method))
+        , gasPrice(gasPrice)
+        , gasAmount(std::move(gasAmount))
+        , nonce(nonce)
+        , account(std::move(account))
+        , shares(std::move(shares))
+        , context(std::move(context)){}
+
+  public:
+    // message returns the CBOR encoding of the Message to be signed.
+    Cbor::Encode encodeMessage() const;
+
+    // serialize returns the CBOR encoding of the SignedMessage.
+    Data serialize(const Data& signature, const PublicKey& publicKey) const;
+
+    // serialize transaction that can be signed
+    Data signaturePreimage() const;
 };
 
 } // namespace TW::Oasis
diff --git a/src/Ontology/Address.cpp b/src/Ontology/Address.cpp
index 40333d62217..6cf098eb111 100644
--- a/src/Ontology/Address.cpp
+++ b/src/Ontology/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "OpCode.h"
diff --git a/src/Ontology/Address.h b/src/Ontology/Address.h
index b55ebf1f3dc..463ebb73c91 100644
--- a/src/Ontology/Address.h
+++ b/src/Ontology/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Ontology/Asset.h b/src/Ontology/Asset.h
index a393db0f18e..69c060e128c 100644
--- a/src/Ontology/Asset.h
+++ b/src/Ontology/Asset.h
@@ -1,16 +1,14 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Address.h"
+#include "Data.h"
 #include "Signer.h"
 #include "Transaction.h"
 #include "../BinaryCoding.h"
-#include "Data.h"
 
 #include <array>
 #include <string>
@@ -33,5 +31,9 @@ class Asset {
     virtual Transaction transfer(const Signer& from, const Address& to, uint64_t amount,
                                  const Signer& payer, uint64_t gasPrice, uint64_t gasLimit,
                                  uint32_t nonce) = 0;
+
+    virtual Transaction unsignedTransfer(const Address& from, const Address& to, uint64_t amount,
+                                         const Address& payer, uint64_t gasPrice, uint64_t gasLimit, 
+                                         uint32_t nonce) = 0;
 };
 } // namespace TW::Ontology
diff --git a/src/Ontology/Entry.cpp b/src/Ontology/Entry.cpp
index 9f4de742362..6dace88d25a 100644
--- a/src/Ontology/Entry.cpp
+++ b/src/Ontology/Entry.cpp
@@ -1,23 +1,25 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "Signer.h"
+#include "OntTxBuilder.h"
+#include "OngTxBuilder.h"
+#include "Oep4TxBuilder.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 namespace TW::Ontology {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -25,4 +27,47 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto contract = std::string(input.contract().begin(), input.contract().end());
+            Data preImage, preImageHash; 
+
+            if (contract == "ONT") {
+                auto tx = OntTxBuilder::buildTransferTx(input);
+                preImage = tx.serializeUnsigned();
+                preImageHash = tx.txHash();
+            } else if (contract == "ONG") {
+                auto tx = OngTxBuilder::buildTransferTx(input);
+                preImage = tx.serializeUnsigned();
+                preImageHash = tx.txHash();
+            } else {
+                auto tx = Oep4TxBuilder::buildTx(input);
+                preImage = tx.serializeUnsigned();
+                preImageHash = tx.txHash();
+            }
+
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+            if (signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_signatures_count);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_signatures_count));
+                return;
+            }
+
+            auto signedTx = Signer::encodeTransaction(input, signatures, publicKeys);
+            output.set_encoded(signedTx.data(), signedTx.size());
+    });
+}
 } // namespace TW::Ontology
diff --git a/src/Ontology/Entry.h b/src/Ontology/Entry.h
index 68df17b8baf..9e43327ab02 100644
--- a/src/Ontology/Entry.h
+++ b/src/Ontology/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,12 @@ namespace TW::Ontology {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Ontology
diff --git a/src/Ontology/Oep4.cpp b/src/Ontology/Oep4.cpp
index 3c08c8af512..d6388793810 100644
--- a/src/Ontology/Oep4.cpp
+++ b/src/Ontology/Oep4.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Oep4.h"
 #include <HexCoding.h>
@@ -66,4 +64,18 @@ Transaction Oep4::transfer(const Signer& from, const Address& to, uint64_t amoun
     return tx;
 }
 
+Transaction Oep4::unsignedTransfer(const Address& from, const Address& to, uint64_t amount,
+                                   const Address& payer, uint64_t gasPrice, uint64_t gasLimit, 
+                                   uint32_t nonce) {
+    Address contract(oep4Contract);
+
+    NeoVmParamValue::ParamArray args{from._data, to._data, amount};
+    // yes, invoke neovm is not like ont transfer
+    std::reverse(args.begin(), args.end());
+    auto invokeCode = ParamsBuilder::buildOep4InvokeCode(contract, "transfer", {args});
+
+    auto tx = Transaction(0, 0xD1, nonce, gasPrice, gasLimit, payer.string(), invokeCode);
+    return tx;
+}
+
 } // namespace TW::Ontology
diff --git a/src/Ontology/Oep4.h b/src/Ontology/Oep4.h
index d121d8a1ceb..31f4a99f283 100644
--- a/src/Ontology/Oep4.h
+++ b/src/Ontology/Oep4.h
@@ -1,16 +1,14 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Address.h"
 #include "Asset.h"
+#include "Data.h"
 #include "ParamsBuilder.h"
 #include "Transaction.h"
-#include "Data.h"
 
 namespace TW::Ontology {
 
@@ -36,6 +34,7 @@ class Oep4 {
     Transaction transfer(const Signer& from, const Address& to, uint64_t amount,
                          const Signer& payer, uint64_t gasPrice, uint64_t gasLimit,
                          uint32_t nonce);
+    Transaction unsignedTransfer(const Address& from, const Address& to, uint64_t amount,
+                                 const Address& payer, uint64_t gasPrice, uint64_t gasLimit, uint32_t nonce);
 };
-
 } // namespace TW::Ontology
diff --git a/src/Ontology/Oep4TxBuilder.cpp b/src/Ontology/Oep4TxBuilder.cpp
index 04e5f2c108c..9041adc3b78 100644
--- a/src/Ontology/Oep4TxBuilder.cpp
+++ b/src/Ontology/Oep4TxBuilder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Oep4TxBuilder.h"
 #include "../HexCoding.h"
@@ -48,4 +46,24 @@ Data Oep4TxBuilder::build(const Ontology::Proto::SigningInput& input) {
     return Data();
 }
 
+Transaction Oep4TxBuilder::buildTx(const Ontology::Proto::SigningInput &input) {
+    Transaction tx;
+    auto method = std::string(input.method().begin(), input.method().end());
+    auto oep4 = Oep4(parse_hex(input.contract()));
+
+    if (method == "transfer") {
+        auto fromAddress = Address(input.owner_address());
+        auto toAddress = Address(input.to_address());
+        auto payerAddress = Address(input.payer_address());
+        tx = oep4.unsignedTransfer(fromAddress, toAddress, input.amount(), payerAddress, input.gas_price(), input.gas_limit(), input.nonce());
+    } else if (method == "balanceOf") {
+        auto queryAddress = Address(input.query_address());
+        tx = oep4.balanceOf(queryAddress, input.nonce());
+    } else if (method == "decimals") {
+        tx = oep4.decimals(input.nonce());
+    }
+
+    return tx;
+}
+
 } // namespace TW::Ontology
diff --git a/src/Ontology/Oep4TxBuilder.h b/src/Ontology/Oep4TxBuilder.h
index 138f955aa82..ea09784bc6a 100644
--- a/src/Ontology/Oep4TxBuilder.h
+++ b/src/Ontology/Oep4TxBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -24,6 +22,8 @@ class Oep4TxBuilder {
     static Data transfer(const Ontology::Proto::SigningInput& input);
 
     static Data build(const Ontology::Proto::SigningInput& input);
+
+    static Transaction buildTx(const Ontology::Proto::SigningInput& input);
 };
 
 } // namespace TW::Ontology
diff --git a/src/Ontology/Ong.cpp b/src/Ontology/Ong.cpp
index e37ff4ae6a7..2ba3f5ca170 100644
--- a/src/Ontology/Ong.cpp
+++ b/src/Ontology/Ong.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Ong.h"
 #include "Data.h"
@@ -58,4 +56,15 @@ Transaction Ong::withdraw(const Signer& claimer, const Address& receiver, uint64
     return tx;
 }
 
+Transaction Ong::unsignedTransfer(const Address &from, const Address &to, uint64_t amount, const Address &payer,
+                                  uint64_t gasPrice, uint64_t gasLimit,uint32_t nonce) {
+    NeoVmParamValue::ParamList transferParam{from._data, to._data, amount};
+    NeoVmParamValue::ParamArray args{transferParam};
+    auto invokeCode =
+            ParamsBuilder::buildNativeInvokeCode(contractAddress(), 0x00, "transfer", {args});
+    auto tx = Transaction(version, txType, nonce, gasPrice, gasLimit,
+                          payer.string(), invokeCode);
+    return tx;
+}
+
 } // namespace TW::Ontology
diff --git a/src/Ontology/Ong.h b/src/Ontology/Ong.h
index 8537f605967..0d69f9cf090 100644
--- a/src/Ontology/Ong.h
+++ b/src/Ontology/Ong.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -31,6 +29,9 @@ class Ong : public Asset {
 
     Transaction withdraw(const Signer &claimer, const Address &receiver, uint64_t amount,
                          const Signer &payer, uint64_t gasPrice, uint64_t gasLimit, uint32_t nonce);
+
+    Transaction unsignedTransfer(const Address &from, const Address &to, uint64_t amount, const Address &payer,
+                                 uint64_t gasPrice, uint64_t gasLimit, uint32_t nonce) override;
 };
 
 } // namespace TW::Ontology
diff --git a/src/Ontology/OngTxBuilder.cpp b/src/Ontology/OngTxBuilder.cpp
index f44d46a14b9..2cae37b9cb1 100644
--- a/src/Ontology/OngTxBuilder.cpp
+++ b/src/Ontology/OngTxBuilder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "OngTxBuilder.h"
 
@@ -55,4 +53,13 @@ Data OngTxBuilder::build(const Ontology::Proto::SigningInput& input) {
     return Data();
 }
 
+Transaction OngTxBuilder::buildTransferTx(const Ontology::Proto::SigningInput &input) {
+    auto fromSigner = Address(input.owner_address());
+    auto toAddress = Address(input.to_address());
+    auto payerAddress = Address(input.payer_address());
+    auto transferTx = Ong().unsignedTransfer(fromSigner, toAddress, input.amount(), payerAddress,
+                                             input.gas_price(), input.gas_limit(), input.nonce());
+    return transferTx;
+}
+
 } // namespace TW::Ontology
diff --git a/src/Ontology/OngTxBuilder.h b/src/Ontology/OngTxBuilder.h
index a97c169c5fd..8a3365017f9 100644
--- a/src/Ontology/OngTxBuilder.h
+++ b/src/Ontology/OngTxBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -26,6 +24,8 @@ class OngTxBuilder {
     static Data withdraw(const Ontology::Proto::SigningInput& input);
 
     static Data build(const Ontology::Proto::SigningInput& input);
+
+    static Transaction buildTransferTx(const Ontology::Proto::SigningInput &input);
 };
 
 } // namespace TW::Ontology
diff --git a/src/Ontology/Ont.cpp b/src/Ontology/Ont.cpp
index 55a9bf5f2a8..9efd9812d06 100644
--- a/src/Ontology/Ont.cpp
+++ b/src/Ontology/Ont.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Ont.h"
 #include "Data.h"
@@ -44,4 +42,16 @@ Transaction Ont::transfer(const Signer& from, const Address& to, uint64_t amount
     return tx;
 }
 
+Transaction Ont::unsignedTransfer(const Address& from, const Address& to, uint64_t amount,
+                                  const Address& payer, uint64_t gasPrice, uint64_t gasLimit, 
+                                  uint32_t nonce) {
+    NeoVmParamValue::ParamList transferParam{from._data, to._data, amount};
+    NeoVmParamValue::ParamArray args{transferParam};
+    auto invokeCode =
+        ParamsBuilder::buildNativeInvokeCode(contractAddress(), 0x00, "transfer", {args});
+    auto tx = Transaction(version, txType, nonce, gasPrice, gasLimit,
+                          payer.string(), invokeCode);
+    return tx;
+}
+
 } // namespace TW::Ontology
diff --git a/src/Ontology/Ont.h b/src/Ontology/Ont.h
index 88806c2a197..4ceca2a9aeb 100644
--- a/src/Ontology/Ont.h
+++ b/src/Ontology/Ont.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -23,11 +21,15 @@ class Ont : public Asset {
 
     Transaction decimals(uint32_t nonce) override;
 
-    Transaction balanceOf(const Address &address, uint32_t nonce) override;
+    Transaction balanceOf(const Address& address, uint32_t nonce) override;
 
-    Transaction transfer(const Signer &from, const Address &to, uint64_t amount,
-                         const Signer &payer, uint64_t gasPrice, uint64_t gasLimit,
+    Transaction transfer(const Signer& from, const Address& to, uint64_t amount,
+                         const Signer& payer, uint64_t gasPrice, uint64_t gasLimit,
                          uint32_t nonce) override;
+
+    Transaction unsignedTransfer(const Address& from, const Address& to, uint64_t amount,
+                                 const Address& payer, uint64_t gasPrice, uint64_t gasLimit,
+                                 uint32_t nonce) override;
 };
 
 } // namespace TW::Ontology
diff --git a/src/Ontology/OntTxBuilder.cpp b/src/Ontology/OntTxBuilder.cpp
index 735681c14fc..dc26b38e192 100644
--- a/src/Ontology/OntTxBuilder.cpp
+++ b/src/Ontology/OntTxBuilder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "OntTxBuilder.h"
 
@@ -43,4 +41,13 @@ Data OntTxBuilder::build(const Ontology::Proto::SigningInput& input) {
     return Data();
 }
 
+Transaction OntTxBuilder::buildTransferTx(const Ontology::Proto::SigningInput &input) {
+    auto fromSigner = Address(input.owner_address());
+    auto toAddress = Address(input.to_address());
+    auto payerAddress = Address(input.payer_address());
+    auto transferTx = Ont().unsignedTransfer(fromSigner, toAddress, input.amount(), payerAddress,
+                                    input.gas_price(), input.gas_limit(), input.nonce());
+    return transferTx;
+}
+
 } // namespace TW::Ontology
diff --git a/src/Ontology/OntTxBuilder.h b/src/Ontology/OntTxBuilder.h
index 5cf64cbe16c..dfeaee07fb7 100644
--- a/src/Ontology/OntTxBuilder.h
+++ b/src/Ontology/OntTxBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -24,6 +22,8 @@ class OntTxBuilder {
     static Data transfer(const Ontology::Proto::SigningInput& input);
 
     static Data build(const Ontology::Proto::SigningInput& input);
+
+    static Transaction buildTransferTx(const Ontology::Proto::SigningInput &input);
 };
 
 } // namespace TW::Ontology
diff --git a/src/Ontology/OpCode.h b/src/Ontology/OpCode.h
index 3f7904242fd..b4d86aa9303 100644
--- a/src/Ontology/OpCode.h
+++ b/src/Ontology/OpCode.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Ontology/ParamsBuilder.cpp b/src/Ontology/ParamsBuilder.cpp
index c4db460cfb7..7c529aa0080 100644
--- a/src/Ontology/ParamsBuilder.cpp
+++ b/src/Ontology/ParamsBuilder.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "ParamsBuilder.h"
 #include "Data.h"
diff --git a/src/Ontology/ParamsBuilder.h b/src/Ontology/ParamsBuilder.h
index 0a4acfd55c5..a2d8e0d8818 100644
--- a/src/Ontology/ParamsBuilder.h
+++ b/src/Ontology/ParamsBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Ontology/SigData.cpp b/src/Ontology/SigData.cpp
index 857504de0e2..e4901bc910f 100644
--- a/src/Ontology/SigData.cpp
+++ b/src/Ontology/SigData.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <stdexcept>
 
diff --git a/src/Ontology/SigData.h b/src/Ontology/SigData.h
index 0ee703922c1..67b1290b992 100644
--- a/src/Ontology/SigData.h
+++ b/src/Ontology/SigData.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Ontology/Signer.cpp b/src/Ontology/Signer.cpp
index 876b97bf9c7..48cf1bab857 100644
--- a/src/Ontology/Signer.cpp
+++ b/src/Ontology/Signer.cpp
@@ -1,15 +1,12 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 
 #include "HexCoding.h"
 #include "SigData.h"
 #include "../Ontology/Oep4TxBuilder.h"
-
 #include "../Ontology/OngTxBuilder.h"
 #include "../Ontology/OntTxBuilder.h"
 
@@ -37,8 +34,7 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     return output;
 }
 
-Signer::Signer(TW::PrivateKey priKey)
-    : privKey(std::move(priKey)) {
+Signer::Signer(TW::PrivateKey priKey) : privKey(std::move(priKey)) {
     auto pubKey = privKey.getPublicKey(TWPublicKeyTypeNIST256p1);
     publicKey = pubKey.bytes;
     address = Address(pubKey).string();
@@ -60,7 +56,7 @@ void Signer::sign(Transaction& tx) const {
     if (tx.sigVec.size() >= Transaction::sigVecLimit) {
         throw std::runtime_error("the number of transaction signatures should not be over 16.");
     }
-    auto signature = getPrivateKey().sign(Hash::sha256(tx.txHash()), TWCurveNIST256p1);
+    auto signature = getPrivateKey().sign(tx.txHash(), TWCurveNIST256p1);
     signature.pop_back();
     tx.sigVec.emplace_back(publicKey, signature, 1);
 }
@@ -69,9 +65,30 @@ void Signer::addSign(Transaction& tx) const {
     if (tx.sigVec.size() >= Transaction::sigVecLimit) {
         throw std::runtime_error("the number of transaction signatures should not be over 16.");
     }
-    auto signature = getPrivateKey().sign(Hash::sha256(tx.txHash()), TWCurveNIST256p1);
+    auto signature = getPrivateKey().sign(tx.txHash(), TWCurveNIST256p1);
     signature.pop_back();
     tx.sigVec.emplace_back(publicKey, signature, 1);
 }
 
+Data Signer::encodeTransaction(const Proto::SigningInput& input, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys) {
+    assert(signatures.size() > 0 && signatures.size() == publicKeys.size());
+
+    auto contract = std::string(input.contract().begin(), input.contract().end());
+    auto tx = Transaction();
+
+    if (contract == "ONT") {
+            tx = OntTxBuilder::buildTransferTx(input);
+    } else if (contract == "ONG") {
+            tx = OngTxBuilder::buildTransferTx(input);
+    } else {
+            tx = Oep4TxBuilder::buildTx(input);
+    }
+
+    for (auto i = 0u; i < signatures.size(); ++i) {
+        tx.sigVec.emplace_back(publicKeys[i].bytes, signatures[i], 1);
+    }
+
+    return tx.serialize();
+}
+
 } // namespace TW::Ontology
diff --git a/src/Ontology/Signer.h b/src/Ontology/Signer.h
index 4f2dc8459ca..cc6745d0ea2 100644
--- a/src/Ontology/Signer.h
+++ b/src/Ontology/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -21,9 +19,9 @@ class Signer {
 public:
     /// Signs a Proto::SigningInput transaction
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
-
+    static Data encodeTransaction(const Proto::SigningInput& input, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeyss);
 private:
-    Data publicKey;
+    Data publicKey; 
     TW::PrivateKey privKey;
     std::string address;
 
diff --git a/src/Ontology/Transaction.cpp b/src/Ontology/Transaction.cpp
index 7bf47d716f4..694c8110ec6 100644
--- a/src/Ontology/Transaction.cpp
+++ b/src/Ontology/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 #include "Address.h"
@@ -45,7 +43,7 @@ std::vector<uint8_t> Transaction::serialize() {
 
 std::vector<uint8_t> Transaction::txHash() {
     auto txSerialized = Transaction::serializeUnsigned();
-    return Hash::sha256(Hash::sha256(txSerialized));
+    return Hash::sha256(Hash::sha256(Hash::sha256(txSerialized)));
 }
 
 std::vector<uint8_t> Transaction::serialize(const PublicKey& pk) {
diff --git a/src/Ontology/Transaction.h b/src/Ontology/Transaction.h
index 0f1388b3eb7..39baf92e75e 100644
--- a/src/Ontology/Transaction.h
+++ b/src/Ontology/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -40,6 +38,8 @@ class Transaction {
 
     std::vector<SigData> sigVec;
 
+    Transaction() = default;
+    
     Transaction(uint8_t ver, uint8_t type, uint32_t nonce, uint64_t gasPrice, uint64_t gasLimit,
                 std::string payer, std::vector<uint8_t> payload)
         : version(ver)
diff --git a/src/Pactus/Entry.h b/src/Pactus/Entry.h
new file mode 100644
index 00000000000..2f41bcde419
--- /dev/null
+++ b/src/Pactus/Entry.h
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/RustCoinEntry.h"
+
+namespace TW::Pactus {
+
+/// Entry point for Pactus coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry : public Rust::RustCoinEntry {
+};
+
+} // namespace TW::Pactus
+
diff --git a/src/Polkadot/Address.h b/src/Polkadot/Address.h
index 10f3828c2a0..c717bebe016 100644
--- a/src/Polkadot/Address.h
+++ b/src/Polkadot/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -19,12 +17,17 @@ class Address: public SS58Address {
   public:
     /// Determines whether a string makes a valid address.
     static bool isValid(const std::string& string) { return SS58Address::isValid(string, TWSS58AddressTypePolkadot); }
+    static bool isValid(const std::string& string, uint32_t ss58Prefix) { return SS58Address::isValid(string, ss58Prefix); }
 
     /// Initializes a Polkadot address with a string representation.
-    Address(const std::string& string): SS58Address(string, TWSS58AddressTypePolkadot) {}
+    explicit Address(const std::string& string): SS58Address(string, TWSS58AddressTypePolkadot) {}
+
+    /// Initializes a Polkadot address with a string representation.
+    explicit Address(const std::string& string, uint32_t ss58Prefix): SS58Address(string, ss58Prefix) {}
 
     /// Initializes a Polkadot address with a public key.
-    Address(const PublicKey& publicKey): SS58Address(publicKey, TWSS58AddressTypePolkadot) {}
+    explicit Address(const PublicKey& publicKey): SS58Address(publicKey, TWSS58AddressTypePolkadot) {}
+    /// Initializes a Polkadot address with a public key and a given ss58Prefix.
+    explicit Address(const PublicKey& publicKey, std::uint32_t ss58Prefix): SS58Address(publicKey, ss58Prefix) {}
 };
 } // namespace TW::Polkadot
-
diff --git a/src/Polkadot/Entry.cpp b/src/Polkadot/Entry.cpp
index f97ae843ca9..705acc11d9d 100644
--- a/src/Polkadot/Entry.cpp
+++ b/src/Polkadot/Entry.cpp
@@ -1,28 +1,37 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
+#include "Coin.h"
 #include "Signer.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 namespace TW::Polkadot {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
-    return Address::isValid(address);
+bool Entry::validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const {
+    if (auto* prefix = std::get_if<SS58Prefix>(&addressPrefix); prefix) {
+        return Address::isValid(address, *prefix);
+    }
+    const auto ss58Prefix = TW::ss58Prefix(coin);
+    return Address::isValid(address, ss58Prefix);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
-    return Address(publicKey).string();
+std::string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    if (auto* ss58Prefix = std::get_if<SS58Prefix>(&addressPrefix); ss58Prefix) {
+        return Address(publicKey, *ss58Prefix).string();
+    }
+    const auto ss58Prefix = TW::ss58Prefix(coin);
+    return Address(publicKey, ss58Prefix).string();
 }
 
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
-    const auto addr = Address(address);
+Data Entry::addressToData(TWCoinType coin, const std::string& address) const {
+    const auto ss58Prefix = TW::ss58Prefix(coin);
+    const auto addr = Address(address, ss58Prefix);
     return {addr.bytes.begin() + 1, addr.bytes.end()};
 }
 
@@ -30,4 +39,23 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+
+            auto preImage = Signer::signaturePreImage(input);
+            auto preImageHash = Signer::hash(preImage);
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, const auto& publicKey) {
+            auto signedTx = Signer::encodeTransaction(input,  publicKey.bytes, signature);
+            output.set_encoded(signedTx.data(), signedTx.size());
+    });
+}
 } // namespace TW::Polkadot
diff --git a/src/Polkadot/Entry.h b/src/Polkadot/Entry.h
index d36ac8845af..de481bca381 100644
--- a/src/Polkadot/Entry.h
+++ b/src/Polkadot/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,10 +12,12 @@ namespace TW::Polkadot {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Polkadot
diff --git a/src/Polkadot/Extrinsic.cpp b/src/Polkadot/Extrinsic.cpp
index 6ce75c13c8d..dcd0b31a308 100644
--- a/src/Polkadot/Extrinsic.cpp
+++ b/src/Polkadot/Extrinsic.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Extrinsic.h"
 #include <TrustWalletCore/TWSS58AddressType.h>
@@ -17,16 +15,22 @@ static constexpr uint32_t multiAddrSpecVersion = 28;
 static constexpr uint32_t multiAddrSpecVersionKsm = 2028;
 
 static const std::string balanceTransfer = "Balances.transfer";
-static const std::string utilityBatch = "Utility.batch";
+static const std::string utilityBatch = "Utility.batch_all";
 static const std::string stakingBond = "Staking.bond";
 static const std::string stakingBondExtra = "Staking.bond_extra";
 static const std::string stakingUnbond = "Staking.unbond";
 static const std::string stakingWithdrawUnbond = "Staking.withdraw_unbonded";
 static const std::string stakingNominate = "Staking.nominate";
 static const std::string stakingChill = "Staking.chill";
+static const std::string stakingReBond = "Staking.rebond";
+
+// Non-existent modules and methods on Polkadot and Kusama chains:
+static const std::string assetsTransfer = "Assets.transfer";
+static const std::string joinIdentityAsKey = "Identity.join_identity_as_key";
+static const std::string identityAddAuthorization = "Identity.add_authorization";
 
 // Readable decoded call index can be found from https://polkascan.io
-static std::map<const std::string, Data> polkadotCallIndices = {
+const static std::map<const std::string, Data> polkadotCallIndices = {
     {balanceTransfer, Data{0x05, 0x00}},
     {stakingBond, Data{0x07, 0x00}},
     {stakingBondExtra, Data{0x07, 0x01}},
@@ -35,9 +39,11 @@ static std::map<const std::string, Data> polkadotCallIndices = {
     {stakingNominate, Data{0x07, 0x05}},
     {stakingChill, Data{0x07, 0x06}},
     {utilityBatch, Data{0x1a, 0x02}},
+    {stakingReBond, Data{0x07, 0x13}},
 };
 
-static std::map<const std::string, Data> kusamaCallIndices = {
+// Default Kusama call indices.
+const static std::map<const std::string, Data> kusamaCallIndices = {
     {balanceTransfer, Data{0x04, 0x00}},
     {stakingBond, Data{0x06, 0x00}},
     {stakingBondExtra, Data{0x06, 0x01}},
@@ -46,19 +52,26 @@ static std::map<const std::string, Data> kusamaCallIndices = {
     {stakingNominate, Data{0x06, 0x05}},
     {stakingChill, Data{0x06, 0x06}},
     {utilityBatch, Data{0x18, 0x02}},
+    {stakingReBond, Data{0x06, 0x13}},
 };
 
-static Data getCallIndex(TWSS58AddressType network, const std::string& key) {
-    if (network == TWSS58AddressTypePolkadot) {
-        return polkadotCallIndices[key];
+static Data getCallIndex(const Proto::CallIndices& callIndices, uint32_t network, const std::string& key) {
+    if (callIndices.has_custom()) {
+        return encodeCallIndex(callIndices.custom().module_index(), callIndices.custom().method_index());
+    }
+    if (network == static_cast<uint32_t>(TWSS58AddressTypePolkadot) && polkadotCallIndices.contains(key)) {
+        return polkadotCallIndices.at(key);
+    }
+    if (network == static_cast<uint32_t>(TWSS58AddressTypeKusama) && kusamaCallIndices.contains(key)) {
+        return kusamaCallIndices.at(key);
     }
-    // network == TWSS58AddressTypeKusama
-    return kusamaCallIndices[key];
+    throw std::invalid_argument("'call_indices' is not set");
 }
 
-bool Extrinsic::encodeRawAccount(TWSS58AddressType network, uint32_t specVersion) {
-    if ((network == TWSS58AddressTypePolkadot && specVersion >= multiAddrSpecVersion) ||
-        (network == TWSS58AddressTypeKusama && specVersion >= multiAddrSpecVersionKsm)) {
+bool Extrinsic::encodeRawAccount() const {
+    if (multiAddress ||
+        (network == static_cast<uint32_t>(TWSS58AddressTypePolkadot) && specVersion >= multiAddrSpecVersion) ||
+        (network == static_cast<uint32_t>(TWSS58AddressTypeKusama) && specVersion >= multiAddrSpecVersionKsm)) {
         return false;
     }
     return true;
@@ -75,50 +88,113 @@ Data Extrinsic::encodeEraNonceTip() const {
     return data;
 }
 
-Data Extrinsic::encodeCall(const Proto::SigningInput& input) {
+Data Extrinsic::encodeCall(const Proto::SigningInput& input) const {
     // call index from MetadataV11
     Data data;
-    auto network = TWSS58AddressType(input.network());
     if (input.has_balance_call()) {
-        data = encodeBalanceCall(input.balance_call(), network, input.spec_version());
+        data = encodeBalanceCall(input.balance_call());
     } else if (input.has_staking_call()) {
-        data = encodeStakingCall(input.staking_call(), network, input.spec_version());
+        data = encodeStakingCall(input.staking_call());
+    } else if (input.has_polymesh_call()) {
+        data = encodePolymeshCall(input.polymesh_call());
+    }
+    return data;
+}
+
+Data Extrinsic::encodeBalanceCall(const Proto::Balance& balance) const {
+    Data data;
+    if (balance.has_transfer()) {
+        data = encodeTransfer(balance.transfer());
+    } else if (balance.has_batchtransfer()) {
+        //init call array
+        auto calls = std::vector<Data>();
+        for (const auto& transfer : balance.batchtransfer().transfers()) {
+            Data itemData = encodeTransfer(transfer);
+            // put into calls array
+            calls.push_back(itemData);
+        }
+        data = encodeBatchCall(balance.batchtransfer().call_indices(), calls);
+    } else if (balance.has_asset_transfer()) {
+        data = encodeAssetTransfer(balance.asset_transfer());
+    } else if (balance.has_batch_asset_transfer()) {
+        // init call array
+        auto calls = std::vector<Data>();
+        for (const auto& transfer : balance.batch_asset_transfer().transfers()) {
+            // put into calls array
+            calls.push_back(encodeAssetTransfer(transfer));
+        }
+        data = encodeBatchCall(balance.batch_asset_transfer().call_indices(), calls);
     }
+
     return data;
 }
 
-Data Extrinsic::encodeBalanceCall(const Proto::Balance& balance, TWSS58AddressType network, uint32_t specVersion) {
+Data Extrinsic::encodeTransfer(const Proto::Balance::Transfer& transfer) const {
     Data data;
-    auto transfer = balance.transfer();
+
     auto address = SS58Address(transfer.to_address(), network);
     auto value = load(transfer.value());
     // call index
-    append(data, getCallIndex(network, balanceTransfer));
+    append(data, getCallIndex(transfer.call_indices(), network, balanceTransfer));
     // destination
-    append(data, encodeAccountId(address.keyBytes(), encodeRawAccount(network, specVersion)));
+    append(data, encodeAccountId(address.keyBytes(), encodeRawAccount()));
     // value
     append(data, encodeCompact(value));
+    // memo
+    if (transfer.memo().length() > 0) {
+        append(data, 0x01);
+        auto memo = transfer.memo();
+        if (memo.length() < 32) {
+            // padding memo with null
+            memo.append(32 - memo.length(), '\0');
+        }
+        append(data, TW::data(memo));
+    }
+
+    return data;
+}
+
+Data Extrinsic::encodeAssetTransfer(const Proto::Balance::AssetTransfer& transfer) const {
+    Data data;
+
+    auto address = SS58Address(transfer.to_address(), network);
+    auto value = load(transfer.value());
+
+    // call index
+    append(data, getCallIndex(transfer.call_indices(), network, assetsTransfer));
+    // asset id
+    if (transfer.asset_id() > 0) {
+        // For native token transfer, should ignore asset id
+        append(data, Polkadot::encodeCompact(transfer.asset_id()));
+    }
+    // destination
+    append(data, Polkadot::encodeAccountId(address.keyBytes(), encodeRawAccount()));
+    // value
+    append(data, Polkadot::encodeCompact(value));
+
     return data;
 }
 
-Data Extrinsic::encodeBatchCall(const std::vector<Data>& calls, TWSS58AddressType network) {
+Data Extrinsic::encodeBatchCall(const Proto::CallIndices& batchCallIndices, const std::vector<Data>& calls) const {
     Data data;
-    append(data, getCallIndex(network, utilityBatch));
+    append(data, getCallIndex(batchCallIndices, network, utilityBatch));
     append(data, encodeVector(calls));
     return data;
 }
 
-Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressType network, uint32_t specVersion) {
+Data Extrinsic::encodeStakingCall(const Proto::Staking& staking) const {
     Data data;
     switch (staking.message_oneof_case()) {
     case Proto::Staking::kBond: {
-        auto address = SS58Address(staking.bond().controller(), byte(network));
         auto value = load(staking.bond().value());
         auto reward = byte(staking.bond().reward_destination());
         // call index
-        append(data, getCallIndex(network, stakingBond));
+        append(data, getCallIndex(staking.bond().call_indices(), network, stakingBond));
         // controller
-        append(data, encodeAccountId(address.keyBytes(), encodeRawAccount(network, specVersion)));
+        if (!staking.bond().controller().empty()) {
+            auto controller = SS58Address(staking.bond().controller(), network);
+            append(data, encodeAccountId(controller.keyBytes(), encodeRawAccount()));
+        }
         // value
         append(data, encodeCompact(value));
         // reward destination
@@ -135,7 +211,7 @@ Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressTy
             bond->set_value(staking.bond_and_nominate().value());
             bond->set_reward_destination(staking.bond_and_nominate().reward_destination());
             // recursive call
-            call1 = encodeStakingCall(staking1, network, specVersion);
+            call1 = encodeStakingCall(staking1);
         }
 
         // encode call2
@@ -147,17 +223,17 @@ Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressTy
                 nominate->add_nominators(staking.bond_and_nominate().nominators(i));
             }
             // recursive call
-            call2 = encodeStakingCall(staking2, network, specVersion);
+            call2 = encodeStakingCall(staking2);
         }
 
         auto calls = std::vector<Data>{call1, call2};
-        data = encodeBatchCall(calls, network);
+        data = encodeBatchCall(staking.bond_and_nominate().call_indices(), calls);
     } break;
 
     case Proto::Staking::kBondExtra: {
         auto value = load(staking.bond_extra().value());
         // call index
-        append(data, getCallIndex(network, stakingBondExtra));
+        append(data, getCallIndex(staking.bond_extra().call_indices(), network, stakingBondExtra));
         // value
         append(data, encodeCompact(value));
     } break;
@@ -165,7 +241,15 @@ Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressTy
     case Proto::Staking::kUnbond: {
         auto value = load(staking.unbond().value());
         // call index
-        append(data, getCallIndex(network, stakingUnbond));
+        append(data, getCallIndex(staking.unbond().call_indices(), network, stakingUnbond));
+        // value
+        append(data, encodeCompact(value));
+    } break;
+
+    case Proto::Staking::kRebond: {
+        auto value = load(staking.rebond().value());
+        // call index
+        append(data, getCallIndex(staking.rebond().call_indices(), network, stakingReBond));
         // value
         append(data, encodeCompact(value));
     } break;
@@ -173,7 +257,7 @@ Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressTy
     case Proto::Staking::kWithdrawUnbonded: {
         auto spans = staking.withdraw_unbonded().slashing_spans();
         // call index
-        append(data, getCallIndex(network, stakingWithdrawUnbond));
+        append(data, getCallIndex(staking.withdraw_unbonded().call_indices(), network, stakingWithdrawUnbond));
         // num_slashing_spans
         encode32LE(spans, data);
     } break;
@@ -184,14 +268,14 @@ Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressTy
             accountIds.emplace_back(SS58Address(n, network));
         }
         // call index
-        append(data, getCallIndex(network, stakingNominate));
+        append(data, getCallIndex(staking.nominate().call_indices(), network, stakingNominate));
         // nominators
-        append(data, encodeAccountIds(accountIds, encodeRawAccount(network, specVersion)));
+        append(data, encodeAccountIds(accountIds, encodeRawAccount()));
     } break;
 
     case Proto::Staking::kChill:
         // call index
-        append(data, getCallIndex(network, stakingChill));
+        append(data, getCallIndex(staking.chill().call_indices(), network, stakingChill));
         break;
 
     case Proto::Staking::kChillAndUnbond: {
@@ -201,7 +285,7 @@ Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressTy
             auto staking1 = Proto::Staking();
             staking1.mutable_chill();
             // recursive call
-            call1 = encodeStakingCall(staking1, network, specVersion);
+            call1 = encodeStakingCall(staking1);
         }
 
         // encode call2
@@ -211,11 +295,11 @@ Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressTy
             auto* unbond = staking2.mutable_unbond();
             unbond->set_value(staking.chill_and_unbond().value());
             // recursive call
-            call2 = encodeStakingCall(staking2, network, specVersion);
+            call2 = encodeStakingCall(staking2);
         }
 
         auto calls = std::vector<Data>{call1, call2};
-        data = encodeBatchCall(calls, network);
+        data = encodeBatchCall(staking.chill_and_unbond().call_indices(), calls);
     } break;
 
     default:
@@ -224,12 +308,109 @@ Data Extrinsic::encodeStakingCall(const Proto::Staking& staking, TWSS58AddressTy
     return data;
 }
 
+Data Extrinsic::encodePolymeshCall(const Proto::PolymeshCall& polymesh) const {
+    Data data;
+
+    if (polymesh.has_identity_call()) {
+        const auto& identity = polymesh.identity_call();
+        if (identity.has_join_identity_as_key()) {
+            data = encodeIdentityJoinIdentityAsKey(identity.join_identity_as_key());
+        } else if (identity.has_add_authorization()) {
+            data = encodeIdentityAddAuthorization(identity.add_authorization());
+        }
+    }
+
+    return data;
+}
+
+Data Extrinsic::encodeIdentityJoinIdentityAsKey(const Proto::Identity::JoinIdentityAsKey& joinIdentity) const {
+    Data data;
+
+    // call index
+    append(data, getCallIndex(joinIdentity.call_indices(), network, joinIdentityAsKey));
+
+    // data
+    encode64LE(joinIdentity.auth_id(), data);
+
+    return data;
+}
+
+Data Extrinsic::encodeIdentityAddAuthorization(const Proto::Identity::AddAuthorization & addAuthorization) const {
+    Data data;
+
+    // call index
+    append(data, getCallIndex(addAuthorization.call_indices(), network, identityAddAuthorization));
+
+    // target
+    append(data, 0x01);
+    SS58Address address(addAuthorization.target(), network);
+    append(data, Polkadot::encodeAccountId(address.keyBytes(), true));
+
+    // join identity
+    append(data, 0x05);
+
+    if (addAuthorization.has_data()) {
+        const auto& authData = addAuthorization.data();
+
+        // asset
+        if (authData.has_asset()) {
+            append(data, 0x01);
+            append(data, TW::data(authData.asset().data()));
+        } else {
+            append(data, 0x00);
+        }
+
+        // extrinsic
+        if (authData.has_extrinsic()) {
+            append(data, 0x01);
+            append(data, TW::data(authData.extrinsic().data()));
+        } else {
+            append(data, 0x00);
+        }
+
+        // portfolio
+        if (authData.has_portfolio()) {
+            append(data, 0x01);
+            append(data, TW::data(authData.portfolio().data()));
+        } else {
+            append(data, 0x00);
+        }
+    } else {
+        // authorize all permissions
+        append(data, {0x01, 0x00}); // asset
+        append(data, {0x01, 0x00}); // extrinsic
+        append(data, {0x01, 0x00}); // portfolio
+    }
+
+    // expiry
+    append(data, encodeCompact(addAuthorization.expiry()));
+
+    return data;
+}
+
+static bool requires_new_spec_compatbility(uint32_t network, uint32_t specVersion) noexcept {
+    // version 1002005 introduces a breaking change for Polkadot and Kusama
+    return ((network == 0 || network == 2) && specVersion >= 1002005) || (network == 10 && specVersion >= 2270);
+}
+
 Data Extrinsic::encodePayload() const {
     Data data;
+    auto use_new_spec = requires_new_spec_compatbility(network, specVersion);
+
     // call
     append(data, call);
     // era / nonce / tip
     append(data, encodeEraNonceTip());
+    // fee asset id
+    if (!feeAssetId.empty()) {
+        append(data, feeAssetId);
+    }
+
+    if (use_new_spec) {
+        // mode (currently always 0)
+        data.push_back(0x00);
+    }
+
     // specVersion
     encode32LE(specVersion, data);
     // transactionVersion
@@ -238,21 +419,39 @@ Data Extrinsic::encodePayload() const {
     append(data, genesisHash);
     // block hash
     append(data, blockHash);
+
+    if (use_new_spec) {
+        // empty metadata hash
+        data.push_back(0x00);
+    }
     return data;
 }
 
 Data Extrinsic::encodeSignature(const PublicKey& signer, const Data& signature) const {
     Data data;
+    auto use_new_spec = requires_new_spec_compatbility(network, specVersion);
+
     // version header
     append(data, Data{extrinsicFormat | signedBit});
     // signer public key
-    append(data, encodeAccountId(signer.bytes, encodeRawAccount(network, specVersion)));
+    append(data, encodeAccountId(signer.bytes, encodeRawAccount()));
     // signature type
     append(data, sigTypeEd25519);
     // signature
     append(data, signature);
     // era / nonce / tip
     append(data, encodeEraNonceTip());
+
+    // fee asset id
+    if (!feeAssetId.empty()) {
+        append(data, feeAssetId);
+    }
+
+    if (use_new_spec) {
+        // mode (currently always 0)
+        data.push_back(0x00);
+    }
+
     // call
     append(data, call);
     // append length
@@ -260,4 +459,32 @@ Data Extrinsic::encodeSignature(const PublicKey& signer, const Data& signature)
     return data;
 }
 
+Data Extrinsic::encodeFeeAssetId(const Proto::SigningInput& input) {
+    if (!input.has_balance_call()) {
+        return {};
+    }
+
+    uint32_t rawFeeAssetId {0};
+    if (input.balance_call().has_asset_transfer()) {
+        rawFeeAssetId = input.balance_call().asset_transfer().fee_asset_id();
+    } else if (input.balance_call().has_batch_asset_transfer()) {
+        rawFeeAssetId = input.balance_call().batch_asset_transfer().fee_asset_id();
+    } else {
+        return {};
+    }
+
+    Data feeAssetId;
+    if (rawFeeAssetId > 0) {
+        feeAssetId.push_back(0x01);
+        Data feeEncoding;
+        encode32LE(rawFeeAssetId, feeEncoding);
+        append(feeAssetId, feeEncoding);
+    } else {
+        // use native token
+        feeAssetId.push_back(0x00);
+    }
+
+    return feeAssetId;
+}
+
 } // namespace TW::Polkadot
diff --git a/src/Polkadot/Extrinsic.h b/src/Polkadot/Extrinsic.h
index ccac8260998..885040a3bc1 100644
--- a/src/Polkadot/Extrinsic.h
+++ b/src/Polkadot/Extrinsic.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -31,37 +29,52 @@ class Extrinsic {
     // encoded Call data
     Data call;
     // network
-    TWSS58AddressType network;
+    uint32_t network;
+    // enable multi-address
+    bool multiAddress;
+    // fee asset id
+    Data feeAssetId;
 
-    Extrinsic(const Proto::SigningInput& input)
+    explicit Extrinsic(const Proto::SigningInput& input)
         : blockHash(input.block_hash().begin(), input.block_hash().end())
         , genesisHash(input.genesis_hash().begin(), input.genesis_hash().end())
         , nonce(input.nonce())
         , specVersion(input.spec_version())
         , version(input.transaction_version())
-        , tip(load(input.tip())) {
+        , tip(load(input.tip()))
+        , network(input.network())
+        , multiAddress(input.multi_address()) {
         if (input.has_era()) {
             era = encodeEra(input.era().block_number(), input.era().period());
         } else {
           // immortal era
           era = encodeCompact(0);
         }
-        network = TWSS58AddressType(input.network());
+        // keep fee asset id encoding which will be used in encodePayload & encodeSignature.
+        // see: https://github.com/paritytech/substrate/blob/d1221692968b8bc62d6eab9d10cb6b5bf38c5dc2/frame/transaction-payment/asset-tx-payment/src/lib.rs#L152
+        feeAssetId = encodeFeeAssetId(input);
         call = encodeCall(input);
     }
 
-    static Data encodeCall(const Proto::SigningInput& input);
+    Data encodeCall(const Proto::SigningInput& input) const;
     // Payload to sign.
     Data encodePayload() const;
     // Encode final data with signer public key and signature.
     Data encodeSignature(const PublicKey& signer, const Data& signature) const;
 
   protected:
-    static bool encodeRawAccount(TWSS58AddressType network, uint32_t specVersion);
-    static Data encodeBalanceCall(const Proto::Balance& balance, TWSS58AddressType network, uint32_t specVersion);
-    static Data encodeStakingCall(const Proto::Staking& staking, TWSS58AddressType network, uint32_t specVersion);
-    static Data encodeBatchCall(const std::vector<Data>& calls, TWSS58AddressType network);
+    bool encodeRawAccount() const;
+    Data encodeBalanceCall(const Proto::Balance& balance) const;
+    Data encodeTransfer(const Proto::Balance::Transfer& transfer) const;
+    Data encodeAssetTransfer(const Proto::Balance::AssetTransfer& transfer) const;
+    Data encodeStakingCall(const Proto::Staking& staking) const;
+    Data encodePolymeshCall(const Proto::PolymeshCall& polymesh) const;
+    Data encodeIdentityJoinIdentityAsKey(const Proto::Identity::JoinIdentityAsKey& joinIdentityAsKey) const;
+    Data encodeIdentityAddAuthorization(const Proto::Identity::AddAuthorization& addAuthorization) const;
+    Data encodeBatchCall(const Proto::CallIndices& batchCallIndices, const std::vector<Data>& calls) const;
     Data encodeEraNonceTip() const;
+
+    static Data encodeFeeAssetId(const Proto::SigningInput& input);
 };
 
 } // namespace TW::Polkadot
diff --git a/src/Polkadot/SS58Address.cpp b/src/Polkadot/SS58Address.cpp
index 34a25f7c263..d73535352da 100644
--- a/src/Polkadot/SS58Address.cpp
+++ b/src/Polkadot/SS58Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "SS58Address.h"
 
@@ -10,7 +8,7 @@ using namespace TW;
 using namespace std;
 
 bool SS58Address::isValid(const std::string& string, uint32_t network) {
-    const auto decoded = Base58::bitcoin.decode(string);
+    const auto decoded = Base58::decode(string);
     byte decodedNetworkSize = 0;
     uint32_t decodedNetwork = 0;
     if (!decodeNetwork(decoded, decodedNetworkSize, decodedNetwork)) {
@@ -34,7 +32,7 @@ bool SS58Address::isValid(const std::string& string, uint32_t network) {
 
 template <typename T>
 Data SS58Address::computeChecksum(const T& data) {
-    auto prefix = Data(SS58Prefix.begin(), SS58Prefix.end());
+    auto prefix = Data(gSS58Prefix.begin(), gSS58Prefix.end());
     append(prefix, Data(data.begin(), data.end()));
     auto hash = Hash::blake2b(prefix, 64);
     auto checksum = Data(checksumSize);
@@ -47,7 +45,7 @@ SS58Address::SS58Address(const std::string& string, uint32_t network) {
     if (!isValid(string, network)) {
         throw std::invalid_argument("Invalid address string");
     }
-    const auto decoded = Base58::bitcoin.decode(string);
+    const auto decoded = Base58::decode(string);
     bytes.resize(decoded.size() - checksumSize);
     std::copy(decoded.begin(), decoded.end() - checksumSize, bytes.begin());
 }
@@ -68,7 +66,7 @@ std::string SS58Address::string() const {
     auto result = Data(bytes.begin(), bytes.end());
     auto checksum = computeChecksum(bytes);
     append(result, checksum);
-    return Base58::bitcoin.encode(result);
+    return Base58::encode(result);
 }
 
 /// Returns public key bytes
diff --git a/src/Polkadot/SS58Address.h b/src/Polkadot/SS58Address.h
index 20d4e292f70..44ad512874b 100644
--- a/src/Polkadot/SS58Address.h
+++ b/src/Polkadot/SS58Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,7 +10,7 @@
 
 #include <string>
 
-inline const std::string SS58Prefix{"SS58PRE"};
+inline const std::string gSS58Prefix{"SS58PRE"};
 
 namespace TW {
 
diff --git a/src/Polkadot/ScaleCodec.h b/src/Polkadot/ScaleCodec.h
index e0d1c3ca20d..eb7dbadab12 100644
--- a/src/Polkadot/ScaleCodec.h
+++ b/src/Polkadot/ScaleCodec.h
@@ -1,29 +1,28 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../BinaryCoding.h"
+#include "BinaryCoding.h"
 #include "Data.h"
-#include "../PublicKey.h"
+#include "PublicKey.h"
 #include "SS58Address.h"
-#include <boost/multiprecision/cpp_int.hpp>
+#include "uint256.h"
+
 #include <cmath>
 #include <algorithm>
 #include <bitset>
 
-
-/// Reference https://github.com/soramitsu/kagome/blob/master/core/scale/scale_encoder_stream.cpp
-using CompactInteger = boost::multiprecision::cpp_int;
+using CompactInteger = TW::uint256_t;
 
 namespace TW::Polkadot {
 
 static constexpr size_t kMinUint16 = (1ul << 6u);
 static constexpr size_t kMinUint32 = (1ul << 14u);
 static constexpr size_t kMinBigInteger = (1ul << 30u);
+// max uint8
+static constexpr byte kMaxByte = 255;
 
 inline size_t countBytes(CompactInteger value) {
     if (0 == value) {
@@ -39,6 +38,17 @@ inline size_t countBytes(CompactInteger value) {
     return size;
 }
 
+inline Data encodeCallIndex(int32_t moduleIndex, int32_t methodIndex) {
+    if (moduleIndex > kMaxByte) {
+        throw std::invalid_argument("module index too large");
+    }
+    if (methodIndex > kMaxByte) {
+        throw std::invalid_argument("method index too large");
+    }
+
+    return Data{static_cast<byte>(moduleIndex), static_cast<byte>(methodIndex)};
+}
+
 inline Data encodeCompact(CompactInteger value) {
     auto data = Data{};
 
diff --git a/src/Polkadot/Signer.cpp b/src/Polkadot/Signer.cpp
index b5f083a522b..8107a1bf196 100644
--- a/src/Polkadot/Signer.cpp
+++ b/src/Polkadot/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Extrinsic.h"
@@ -30,4 +28,30 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput &input) noexcept {
     return protoOutput;
 }
 
+Data Signer::signaturePreImage(const Proto::SigningInput &input) {
+    auto extrinsic = Extrinsic(input);
+    auto payload = extrinsic.encodePayload();
+    // check if need to hash
+    if (payload.size() > hashTreshold) {
+        payload = Hash::blake2b(payload, 32);
+    }
+    return payload;
+}
+
+Data Signer::encodeTransaction(const Proto::SigningInput &input, const Data &publicKey, const Data &signature) {
+    auto pbk = PublicKey(publicKey, TWPublicKeyTypeED25519);
+    auto extrinsic = Extrinsic(input);
+    auto encoded = extrinsic.encodeSignature(pbk, signature);
+    return encoded;
+}
+
+Data Signer::hash(const Data &payload) {
+    // check if need to hash
+    if (payload.size() > hashTreshold) {
+        return Hash::blake2b(payload, 32);
+    }
+
+    return payload;
+}
+
 } // namespace TW::Polkadot
diff --git a/src/Polkadot/Signer.h b/src/Polkadot/Signer.h
index d893d64a010..fa0204b2b01 100644
--- a/src/Polkadot/Signer.h
+++ b/src/Polkadot/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -16,10 +14,14 @@ namespace TW::Polkadot {
 class Signer {
 public:
     /// Hide default constructor
-    Signer() = delete;
+    explicit Signer();
 
     /// Signs a Proto::SigningInput transaction
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+
+    static Data signaturePreImage(const Proto::SigningInput &input);
+    static Data encodeTransaction(const Proto::SigningInput &input, const Data &publicKey, const Data &signature);
+    static Data hash(const Data &payload);
 };
 
 } // namespace TW::Polkadot
diff --git a/src/PrivateKey.cpp b/src/PrivateKey.cpp
index 898953100ed..501dfc4124c 100644
--- a/src/PrivateKey.cpp
+++ b/src/PrivateKey.cpp
@@ -1,11 +1,10 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "PrivateKey.h"
 
+#include "HexCoding.h"
 #include "PublicKey.h"
 
 #include <TrezorCrypto/bignum.h>
@@ -18,11 +17,42 @@
 #include <TrezorCrypto/secp256k1.h>
 #include <TrezorCrypto/sodium/keypair.h>
 #include <TrezorCrypto/zilliqa.h>
+#include <ImmutableX/StarkKey.h>
 
 #include <iterator>
 
 using namespace TW;
 
+Data rust_get_public_from_private(const Data& key, TWPublicKeyType public_type) {
+    auto* privkey = Rust::tw_private_key_create_with_data(key.data(), key.size());
+    if (privkey == nullptr) {
+        return {};
+    }
+    Data toReturn;
+
+    auto* pubkey = Rust::tw_private_key_get_public_key_by_type(privkey, static_cast<uint32_t>(public_type));
+    if (pubkey == nullptr) {
+        Rust::tw_private_key_delete(privkey);
+        return {};
+    }
+
+    Rust::CByteArrayWrapper res = Rust::tw_public_key_data(pubkey);
+
+    Rust::tw_public_key_delete(pubkey);
+    Rust::tw_private_key_delete(privkey);
+    return res.data;
+}
+
+Data rust_private_key_sign(const Data& key, const Data& hash, TWCurve curve) {
+    auto* priv = Rust::tw_private_key_create_with_data(key.data(), key.size());
+    if (priv == nullptr) {
+        return {};
+    }
+    Rust::CByteArrayWrapper res = Rust::tw_private_key_sign(priv, hash.data(), hash.size(), static_cast<uint32_t>(curve));
+    Rust::tw_private_key_delete(priv);
+    return res.data;
+}
+
 bool PrivateKey::isValid(const Data& data) {
     // Check length
     if (data.size() != _size && data.size() != cardanoKeySize) {
@@ -152,31 +182,19 @@ PublicKey PrivateKey::getPublicKey(TWPublicKeyType type) const {
         append(result, secondChainCode());
     } break;
 
-    case TWPublicKeyTypeCURVE25519:
+    case TWPublicKeyTypeCURVE25519: {
         result.resize(PublicKey::ed25519Size);
         PublicKey ed25519PublicKey = getPublicKey(TWPublicKeyTypeED25519);
         ed25519_pk_to_curve25519(result.data(), ed25519PublicKey.bytes.data());
         break;
     }
-    return PublicKey(result, type);
-}
 
-Data PrivateKey::getSharedKey(const PublicKey& pubKey, TWCurve curve) const {
-    if (curve != TWCurveSECP256k1) {
-        return {};
+    case TWPublicKeyTypeStarkex: {
+        result = rust_get_public_from_private(this->bytes, type);
+        break;
     }
-
-    Data result(PublicKey::secp256k1ExtendedSize);
-    bool success = ecdh_multiply(&secp256k1, key().data(),
-                                 pubKey.bytes.data(), result.data()) == 0;
-
-    if (success) {
-        PublicKey sharedKey(result, TWPublicKeyTypeSECP256k1Extended);
-        auto hash = Hash::sha256(sharedKey.compressed().bytes);
-        return hash;
     }
-
-    return {};
+    return PublicKey(result, type);
 }
 
 int ecdsa_sign_digest_checked(const ecdsa_curve* curve, const uint8_t* priv_key, const uint8_t* digest, size_t digest_size, uint8_t* sig, uint8_t* pby, int (*is_canonical)(uint8_t by, uint8_t sig[64])) {
@@ -191,37 +209,41 @@ Data PrivateKey::sign(const Data& digest, TWCurve curve) const {
     Data result;
     bool success = false;
     switch (curve) {
-    case TWCurveSECP256k1: {
-        result.resize(65);
-        success = ecdsa_sign_digest_checked(&secp256k1, key().data(), digest.data(), digest.size(), result.data(), result.data() + 64, nullptr) == 0;
-    } break;
-    case TWCurveED25519: {
-        result.resize(64);
-        ed25519_sign(digest.data(), digest.size(), key().data(), result.data());
-        success = true;
-    } break;
-    case TWCurveED25519Blake2bNano: {
-        result.resize(64);
-        ed25519_sign_blake2b(digest.data(), digest.size(), key().data(), result.data());
-        success = true;
-    } break;
-    case TWCurveED25519ExtendedCardano: {
-        result.resize(64);
-        ed25519_sign_ext(digest.data(), digest.size(), key().data(), extension().data(), result.data());
-        success = true;
-    } break;
-    case TWCurveCurve25519: {
-        result.resize(64);
-        const auto publicKey = getPublicKey(TWPublicKeyTypeED25519);
-        ed25519_sign(digest.data(), digest.size(), key().data(), result.data());
-        const auto sign_bit = publicKey.bytes[31] & 0x80;
-        result[63] = result[63] & 127;
-        result[63] |= sign_bit;
-        success = true;
-    } break;
-    case TWCurveNIST256p1: {
-        result.resize(65);
-        success = ecdsa_sign_digest_checked(&nist256p1, key().data(), digest.data(), digest.size(), result.data(), result.data() + 64, nullptr) == 0;
+        case TWCurveSECP256k1: {
+            result.resize(65);
+            success = ecdsa_sign_digest_checked(&secp256k1, key().data(), digest.data(), digest.size(), result.data(), result.data() + 64, nullptr) == 0;
+        } break;
+        case TWCurveED25519: {
+            result.resize(64);
+            ed25519_sign(digest.data(), digest.size(), key().data(), result.data());
+            success = true;
+        } break;
+        case TWCurveED25519Blake2bNano: {
+            result.resize(64);
+            ed25519_sign_blake2b(digest.data(), digest.size(), key().data(), result.data());
+            success = true;
+        } break;
+        case TWCurveED25519ExtendedCardano: {
+            result.resize(64);
+            ed25519_sign_ext(digest.data(), digest.size(), key().data(), extension().data(), result.data());
+            success = true;
+        } break;
+        case TWCurveCurve25519: {
+            result.resize(64);
+            const auto publicKey = getPublicKey(TWPublicKeyTypeED25519);
+            ed25519_sign(digest.data(), digest.size(), key().data(), result.data());
+            const auto sign_bit = publicKey.bytes[31] & 0x80;
+            result[63] = result[63] & 127;
+            result[63] |= sign_bit;
+            success = true;
+        } break;
+        case TWCurveNIST256p1: {
+            result.resize(65);
+            success = ecdsa_sign_digest_checked(&nist256p1, key().data(), digest.data(), digest.size(), result.data(), result.data() + 64, nullptr) == 0;
+        } break;
+    case TWCurveStarkex: {
+        result = rust_private_key_sign(key(), digest, curve);
+        success = result.size() == 64;
     } break;
     case TWCurveNone:
     default:
@@ -292,5 +314,5 @@ Data PrivateKey::signZilliqa(const Data& message) const {
 }
 
 void PrivateKey::cleanup() {
-    std::fill(bytes.begin(), bytes.end(), 0);
+    memzero(bytes.data(), bytes.size());
 }
diff --git a/src/PrivateKey.h b/src/PrivateKey.h
index 32b2877a0ff..c6ab3ddd8dc 100644
--- a/src/PrivateKey.h
+++ b/src/PrivateKey.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -65,10 +63,6 @@ class PrivateKey {
     /// Returns the public key for this private key.
     PublicKey getPublicKey(enum TWPublicKeyType type) const;
 
-    /// Computes an EC Diffie-Hellman secret in constant time
-    /// Supported curves: secp256k1
-    Data getSharedKey(const PublicKey& publicKey, TWCurve curve) const;
-
     /// Signs a digest using the given ECDSA curve.
     Data sign(const Data& digest, TWCurve curve) const;
 
@@ -87,13 +81,6 @@ class PrivateKey {
     void cleanup();
 };
 
-inline bool operator==(const PrivateKey& lhs, const PrivateKey& rhs) {
-    return lhs.bytes == rhs.bytes;
-}
-inline bool operator!=(const PrivateKey& lhs, const PrivateKey& rhs) {
-    return lhs.bytes != rhs.bytes;
-}
-
 } // namespace TW
 
 /// Wrapper for C interface.
diff --git a/src/PublicKey.cpp b/src/PublicKey.cpp
index 10c2e59d88a..d9789e6bc06 100644
--- a/src/PublicKey.cpp
+++ b/src/PublicKey.cpp
@@ -1,11 +1,11 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "PublicKey.h"
+#include "PrivateKey.h"
 #include "Data.h"
+#include "rust/bindgen/WalletCoreRSBindgen.h"
 
 #include <TrezorCrypto/ecdsa.h>
 #include <TrezorCrypto/ed25519-donna/ed25519-blake2b.h>
@@ -14,6 +14,7 @@
 #include <TrezorCrypto/secp256k1.h>
 #include <TrezorCrypto/sodium/keypair.h>
 #include <TrezorCrypto/zilliqa.h>
+#include <ImmutableX/StarkKey.h>
 
 #include <iterator>
 
@@ -40,6 +41,8 @@ bool PublicKey::isValid(const Data& data, enum TWPublicKeyType type) {
     case TWPublicKeyTypeSECP256k1Extended:
     case TWPublicKeyTypeNIST256p1Extended:
         return size == secp256k1ExtendedSize && data[0] == 0x04;
+    case TWPublicKeyTypeStarkex:
+        return size == starkexSize;
     default:
         return false;
     }
@@ -54,6 +57,7 @@ PublicKey::PublicKey(const Data& data, enum TWPublicKeyType type)
         throw std::invalid_argument("Invalid public key data");
     }
     switch (type) {
+    case TWPublicKeyTypeStarkex:
     case TWPublicKeyTypeSECP256k1:
     case TWPublicKeyTypeNIST256p1:
     case TWPublicKeyTypeSECP256k1Extended:
@@ -127,6 +131,16 @@ PublicKey PublicKey::extended() const {
     }
 }
 
+bool rust_public_key_verify(const Data& key, TWPublicKeyType type, const Data& sig, const Data& msgHash) {
+    auto* pubkey = Rust::tw_public_key_create_with_data(key.data(), key.size(), static_cast<uint32_t>(type));
+    if (pubkey == nullptr) {
+        return {};
+    }
+    bool verified = Rust::tw_public_key_verify(pubkey, sig.data(), sig.size(), msgHash.data(), msgHash.size());
+    Rust::tw_public_key_delete(pubkey);
+    return verified;
+}
+
 bool PublicKey::verify(const Data& signature, const Data& message) const {
     switch (type) {
     case TWPublicKeyTypeSECP256k1:
@@ -157,6 +171,8 @@ bool PublicKey::verify(const Data& signature, const Data& message) const {
         verifyBuffer[63] &= 127;
         return ed25519_sign_open(message.data(), message.size(), ed25519PublicKey.data(), verifyBuffer.data()) == 0;
     }
+    case TWPublicKeyTypeStarkex:
+        return rust_public_key_verify(bytes, type, signature, message);
     default:
         throw std::logic_error("Not yet implemented");
     }
@@ -206,22 +222,35 @@ Data PublicKey::hash(const Data& prefix, Hash::Hasher hasher, bool skipTypeByte)
     return result;
 }
 
-PublicKey PublicKey::recover(const Data& signature, const Data& message) {
-    if (signature.size() < 65) {
+PublicKey PublicKey::recoverRaw(const Data& signatureRS, byte recId, const Data& messageDigest) {
+    if (signatureRS.size() < 2 * PrivateKey::_size) {
         throw std::invalid_argument("signature too short");
     }
-    auto v = signature[64];
-    // handle EIP155 Eth encoding of V, of the form 27+v, or 35+chainID*2+v
-    if (v >= 27) {
-        v = !(v & 0x01);
+    if (recId >= 4) {
+        throw std::invalid_argument("Invalid recId (>=4)");
+    }
+    if (messageDigest.size() < PrivateKey::_size) {
+        throw std::invalid_argument("digest too short");
     }
-    TW::Data result(65);
-    if (ecdsa_recover_pub_from_sig(&secp256k1, result.data(), signature.data(), message.data(), v) != 0) {
-        throw std::invalid_argument("recover failed");
+    TW::Data result(secp256k1SignatureSize);
+    if (auto ret = ecdsa_recover_pub_from_sig(&secp256k1, result.data(), signatureRS.data(), messageDigest.data(), recId); ret != 0) {
+        throw std::invalid_argument("recover failed " + std::to_string(ret));
     }
     return PublicKey(result, TWPublicKeyTypeSECP256k1Extended);
 }
 
+PublicKey PublicKey::recover(const Data& signature, const Data& messageDigest) {
+    if (signature.size() < secp256k1SignatureSize) {
+        throw std::invalid_argument("signature too short");
+    }
+    auto v = signature[secp256k1SignatureSize - 1];
+    // handle EIP155 Eth encoding of V, of the form 27+v, or 35+chainID*2+v
+    if (v >= PublicKey::SignatureVOffset) {
+        v = !(v & 0x01);
+    }
+    return recoverRaw(signature, v, messageDigest);
+}
+
 bool PublicKey::isValidED25519() const {
     if (type != TWPublicKeyTypeED25519) {
         return false;
diff --git a/src/PublicKey.h b/src/PublicKey.h
index 3b4691cac35..6a1e3d17855 100644
--- a/src/PublicKey.h
+++ b/src/PublicKey.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -24,12 +22,21 @@ class PublicKey {
     /// The number of bytes in an ed25519 public key.
     static const size_t ed25519Size = 32;
 
+    /// The number of bytes in an starkex public key.
+    static const size_t starkexSize = 32;
+
     /// The number of bytes in a Cardano public key (two ed25519 public key + chain code).
     static const size_t cardanoKeySize = 2 * 2 * 32;
 
     /// The number of bytes in a secp256k1 and nist256p1 extended public key.
     static const size_t secp256k1ExtendedSize = 65;
 
+    /// The number of bytes in a secp256k1 signature.
+    static const size_t secp256k1SignatureSize = 65;
+
+    /// Magic number used in V compnent encoding
+    static const byte SignatureVOffset = 27;
+
     /// The public key bytes.
     Data bytes;
 
@@ -74,8 +81,19 @@ class PublicKey {
     /// bytes and then prepending the prefix.
     Data hash(const Data& prefix, Hash::Hasher hasher = Hash::HasherSha256ripemd, bool skipTypeByte = false) const;
 
+    /// Recover public key (SECP256k1Extended) from signature R, S, V values
+    /// signatureRS: 2x32 bytes with the R and S values
+    /// recId: the recovery ID, a.k.a. V value, 0 <= v < 4
+    /// messageDigest: message digest (hash) to be signed
+    /// Throws on invalid data.
+    static PublicKey recoverRaw(const Data& signatureRS, byte recId, const Data& messageDigest);
+
     /// Recover public key from signature (SECP256k1Extended)
-    static PublicKey recover(const Data& signature, const Data& message);
+    /// signature: 65-byte signature (R, S, and V). V can have higher value bits, as used by Ethereum (for values over 27 the negated last bit is taken).
+    /// messageDigest: message digest (hash) to be signed
+    /// Throws on invalid data.
+    /// Naming is kept for backwards compatibility.
+    static PublicKey recover(const Data& signature, const Data& messageDigest);
 
     /// Check if this key makes a valid ED25519 key (it is on the curve)
     bool isValidED25519() const;
diff --git a/src/Result.h b/src/Result.h
index 1ce611525a1..456e1b2feac 100644
--- a/src/Result.h
+++ b/src/Result.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -122,10 +120,10 @@ struct Result {
     E error() const { return get<E>(); }
 
     /// Returns a new success result with the given payloadd.
-    static Result<T, E> success(T&& val) { return Result(Types::Success<T>(std::forward<T>(val))); }
+    static Result<T, E> success(T&& val) { return Result(Types::Success<T>(std::move(val))); }
 
     /// Returns a new failure result with the given error.
-    static Result<T, E> failure(E&& val) { return Result(Types::Failure<E>(std::forward<E>(val))); }
+    static Result<T, E> failure(E&& val) { return Result(Types::Failure<E>(std::move(val))); }
 
     static Result<T, E> failure(E& val) { return Result(Types::Failure<E>(val)); }
 
@@ -171,7 +169,7 @@ struct Result<void, E> {
 
     /// Returns a new failure result with the given error.
     static Result<void, E> failure(E&& val) {
-        return Result(Types::Failure<E>(std::forward<E>(val)));
+        return Result(Types::Failure<E>(std::move(val)));
     }
 
     operator bool() const { return success_; }
diff --git a/src/Ronin/Address.cpp b/src/Ronin/Address.cpp
deleted file mode 100644
index 74555fb553a..00000000000
--- a/src/Ronin/Address.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Address.h"
-#include "Ethereum/Address.h"
-#include "Ethereum/AddressChecksum.h"
-#include "../Hash.h"
-#include "../HexCoding.h"
-
-const std::string prefix = "ronin:";
-
-namespace TW::Ronin {
-
-bool Address::isValid(const std::string& string) {
-    // check prefix
-    if (string.compare(0, prefix.length(), prefix) == 0) {
-        const auto suffix = string.substr(prefix.length());
-        const auto data = parse_hex(suffix);
-        return Ethereum::Address::isValid(data);
-    }
-    // accept Ethereum format as well
-    if (Ethereum::Address::isValid(string)) {
-        return true;
-    }
-    return false;
-}
-
-Address::Address(const std::string& string) {
-    // check prefix
-    if (string.compare(0, prefix.length(), prefix) == 0) {
-        const auto suffix = string.substr(prefix.length());
-        const auto data = parse_hex(suffix);
-        std::copy(data.begin(), data.end(), bytes.begin());
-    } else if (Ethereum::Address::isValid(string)) {
-        // accept Ethereum format as well
-        Ethereum::Address ethereumAddress(string);
-        bytes = ethereumAddress.bytes;
-    } else {
-        throw std::invalid_argument("Invalid address data");
-    }
-}
-
-// Normalized: with ronin prefix, checksummed hex address, no 0x prefix
-std::string Address::string() const {
-    std::string address = Ethereum::checksumed(*this);
-    if (address.size() >= 2 && address.substr(0, 2) == "0x") {
-        address = address.substr(2);
-    } // skip 0x
-    return prefix + address;
-}
-
-} // namespace TW::Ronin
diff --git a/src/Ronin/Address.h b/src/Ronin/Address.h
deleted file mode 100644
index ac28eb1372f..00000000000
--- a/src/Ronin/Address.h
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "../PublicKey.h"
-#include "../Ethereum/Address.h"
-#include <cstdint>
-#include <vector>
-
-namespace TW::Ronin {
-
-class Address: public Ethereum::Address {
-  public:
-    /// Determines whether a string makes a valid  address.
-    static bool isValid(const std::string& string);
-
-    /// Initializes an address with a string representation.
-    explicit Address(const std::string& string);
-
-    /// Initializes an address with a public key.
-    explicit Address(const PublicKey& publicKey): Ethereum::Address(publicKey) {}
-
-    /// Returns a string representation of the address.
-    std::string string() const;
-};
-
-} // namespace TW::Ronin
diff --git a/src/Ronin/Entry.cpp b/src/Ronin/Entry.cpp
deleted file mode 100644
index d69ac356390..00000000000
--- a/src/Ronin/Entry.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Entry.h"
-
-#include "Address.h"
-#include "../Ethereum/Signer.h"
-
-using namespace TW;
-using namespace std;
-
-namespace TW::Ronin {
-
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
-    return Address::isValid(address);
-}
-
-string Entry::normalizeAddress([[maybe_unused]] TWCoinType coin, const string& address) const {
-    return Address(address).string();
-}
-
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
-    return Address(publicKey).string();
-}
-
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
-    const auto addr = Address(address);
-    return {addr.bytes.begin(), addr.bytes.end()};
-}
-
-void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
-    signTemplate<Ethereum::Signer, Ethereum::Proto::SigningInput>(dataIn, dataOut);
-}
-
-string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string& json, const Data& key) const {
-    return Ethereum::Signer::signJSON(json, key);
-}
-
-} // namespace TW::Ronin
diff --git a/src/Ronin/Entry.h b/src/Ronin/Entry.h
index 9bb7f96aa40..eeffca63f40 100644
--- a/src/Ronin/Entry.h
+++ b/src/Ronin/Entry.h
@@ -1,25 +1,15 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../CoinEntry.h"
+#include "Ethereum/Entry.h"
 
 namespace TW::Ronin {
 
 /// Entry point for Ronin (EVM side chain)
-class Entry final : public CoinEntry {
-public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string normalizeAddress(TWCoinType coin, const std::string& address) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     bool supportsJSONSigning() const { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+class Entry final : public Ethereum::Entry {
 };
 
 } // namespace TW::Ronin
diff --git a/src/Solana/Address.cpp b/src/Solana/Address.cpp
index 3e4f77cface..e642a59f94a 100644
--- a/src/Solana/Address.cpp
+++ b/src/Solana/Address.cpp
@@ -1,31 +1,20 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
-#include "Program.h"
-#include "Transaction.h"
-#include "../Base58.h"
-#include "../Base58Address.h"
-#include "../Hash.h"
-
-#include <TrezorCrypto/ed25519-donna/ed25519-donna.h>
-
-#include <cassert>
 
 using namespace TW;
 
 namespace TW::Solana {
 
 bool Address::isValid(const std::string& string) {
-    const auto data = Base58::bitcoin.decode(string);
+    const auto data = Base58::decode(string);
     return Address::isValid(data);
 }
 
 Address::Address(const std::string& string) {
-    const auto data = Base58::bitcoin.decode(string);
+    const auto data = Base58::decode(string);
     if (!isValid(data)) {
         throw std::invalid_argument("Invalid address string");
     }
@@ -48,16 +37,11 @@ Address::Address(const Data& publicKeyData) {
 }
 
 std::string Address::string() const {
-    return Base58::bitcoin.encode(bytes);
+    return Base58::encode(bytes);
 }
 
 Data Address::vector() const {
-    Data vec(std::begin(bytes), std::end(bytes));
-    return vec;
-}
-
-Address Address::defaultTokenAddress(const Address& tokenMintAddress) {
-    return TokenProgram::defaultTokenAddress(*this, tokenMintAddress);
+    return Data(begin(bytes), end(bytes));
 }
 
 } // namespace TW::Solana
diff --git a/src/Solana/Address.h b/src/Solana/Address.h
index eef248645d8..d86bd6afd4f 100644
--- a/src/Solana/Address.h
+++ b/src/Solana/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Solana/Entry.cpp b/src/Solana/Entry.cpp
index 765c9c1927f..1fc18b03274 100644
--- a/src/Solana/Entry.cpp
+++ b/src/Solana/Entry.cpp
@@ -1,39 +1,23 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
-#include "Address.h"
-#include "Signer.h"
+#include "proto/Solana.pb.h"
 
 using namespace TW;
 using namespace std;
 
 namespace TW::Solana {
 
-// Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
-
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
-    return Address::isValid(address);
-}
-
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
-    return Address(publicKey).string();
-}
-
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
-    return Address(address).vector();
-}
-
-void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
-    signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
-}
-
-string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string& json, const Data& key) const {
-    return Signer::signJSON(json, key);
+string Entry::signJSON(TWCoinType coin, const std::string& json, const Data& key) const {
+    return signJSONHelper<Proto::SigningInput, Proto::SigningOutput>(
+        coin,
+        json,
+        key,
+        [](const Proto::SigningOutput& output) { return output.encoded(); }
+    );
 }
 
 } // namespace TW::Solana
diff --git a/src/Solana/Entry.h b/src/Solana/Entry.h
index b6bc8b4f1d4..90d02756e5f 100644
--- a/src/Solana/Entry.h
+++ b/src/Solana/Entry.h
@@ -1,25 +1,20 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../CoinEntry.h"
+#include "PublicKey.h"
+#include "rust/RustCoinEntry.h"
 
 namespace TW::Solana {
 
 /// Entry point for implementation of Solana coin.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry final : public CoinEntry {
+class Entry final : public Rust::RustCoinEntryWithSignJSON {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     bool supportsJSONSigning() const { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+    bool supportsJSONSigning() const override { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const override;
 };
 
 } // namespace TW::Solana
diff --git a/src/Solana/Program.cpp b/src/Solana/Program.cpp
deleted file mode 100644
index bac0340caa8..00000000000
--- a/src/Solana/Program.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Program.h"
-#include "Address.h"
-#include "Transaction.h"
-
-#include <limits>
-
-namespace TW::Solana {
-
-Address StakeProgram::addressFromValidatorSeed(const Address& fromAddress, const Address& validatorAddress,
-                                               const Address& programId) {
-    Data extended = fromAddress.vector();
-    std::string seed = validatorAddress.string();
-    Data vecSeed(seed.begin(), seed.end());
-    vecSeed.resize(32);
-    Data additional = programId.vector();
-    extended.insert(extended.end(), vecSeed.begin(), vecSeed.end());
-    extended.insert(extended.end(), additional.begin(), additional.end());
-    Data hash = TW::Hash::sha256(extended);
-    return Address(hash);
-}
-
-Address StakeProgram::addressFromRecentBlockhash(const Address& fromAddress, const Hash& recentBlockhash, const Address& programId) {
-    Data extended = fromAddress.vector();
-    std::string seed = recentBlockhash.encoded();
-    Data vecSeed(seed.begin(), seed.end());
-    vecSeed.resize(32);
-    Data additional = programId.vector();
-    extended.insert(extended.end(), vecSeed.begin(), vecSeed.end());
-    extended.insert(extended.end(), additional.begin(), additional.end());
-    Data hash = TW::Hash::sha256(extended);
-    return Address(hash);
-}
-
-/*
- * Based on solana-program-library code, get_associated_token_address()
- * https://github.com/solana-labs/solana-program-library/blob/master/associated-token-account/program/src/lib.rs#L35
- * https://github.com/solana-labs/solana-program-library/blob/master/associated-token-account/program/src/lib.rs#L19
- */
-Address TokenProgram::defaultTokenAddress(const Address& mainAddress, const Address& tokenMintAddress) {
-    auto programId = Address(TOKEN_PROGRAM_ID_ADDRESS);
-    std::vector<Data> seeds = {
-        TW::data(mainAddress.bytes.data(), mainAddress.bytes.size()),
-        TW::data(programId.bytes.data(), programId.bytes.size()),
-        TW::data(tokenMintAddress.bytes.data(), tokenMintAddress.bytes.size())};
-    return findProgramAddress(seeds, Address(ASSOCIATED_TOKEN_PROGRAM_ID_ADDRESS));
-}
-
-/*
- * Based on solana code, find_program_address()
- * https://github.com/solana-labs/solana/blob/master/sdk/program/src/pubkey.rs#L193
- */
-Address TokenProgram::findProgramAddress(const std::vector<TW::Data>& seeds, [[maybe_unused]] const Address& programId) {
-    Address result(Data(32));
-    // cycle through seeds for the rare case when result is not valid
-    auto bumpSeed = Data{std::numeric_limits<std::uint8_t>::max()};
-    for (std::uint8_t seed = 0; seed <= std::numeric_limits<std::uint8_t>::max(); ++seed) {
-        std::vector<Data> seedsCopy = seeds;
-        seedsCopy.emplace_back(bumpSeed);
-        Address address = createProgramAddress(seedsCopy, programId);
-        PublicKey publicKey = PublicKey(TW::data(address.bytes.data(), address.bytes.size()), TWPublicKeyTypeED25519);
-        if (!publicKey.isValidED25519()) {
-            result = address;
-            break;
-        }
-        bumpSeed[0] -= 1;
-    }
-    return result;
-}
-
-/*
- * Based on solana code, create_program_address()
- * https://github.com/solana-labs/solana/blob/master/sdk/program/src/pubkey.rs#L135
- */
-Address TokenProgram::createProgramAddress(const std::vector<TW::Data>& seeds, const Address& programId) {
-    // concatenate seeds
-    Data hashInput;
-    for (auto& seed : seeds) {
-        append(hashInput, seed);
-    }
-    // append programId
-    append(hashInput, TW::data(programId.bytes.data(), programId.bytes.size()));
-    append(hashInput, TW::data("ProgramDerivedAddress"));
-    // compute hash
-    Data hash = TW::Hash::sha256(hashInput.data(), hashInput.size());
-    return Address(hash);
-}
-
-} // namespace TW::Solana
-
diff --git a/src/Solana/Program.h b/src/Solana/Program.h
deleted file mode 100644
index 4214bb98355..00000000000
--- a/src/Solana/Program.h
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Address.h"
-#include "Transaction.h"
-
-#include <vector>
-
-namespace TW::Solana {
-
-class StakeProgram {
-public:
-    static Address addressFromValidatorSeed(const Address& fromAddress,
-                                            const Address& validatorAddress,
-                                            const Address& programId);
-
-    static Address addressFromRecentBlockhash(const Address& fromAddress, const Hash& recentBlockhash, const Address& programId);
-};
-
-
-class TokenProgram {
-public:
-    /// Derive default token address for main address and token
-    static Address defaultTokenAddress(const Address& mainAddress, const Address& tokenMintAddress);
-
-    /// Create a new valid address, if neeed, trying several
-    static Address findProgramAddress(const std::vector<TW::Data>& seeds, const Address& programId);
-
-    /// Create a new address for program, with given seeds
-    static Address createProgramAddress(const std::vector<TW::Data>& seeds, const Address& programId);
-};
-
-} // namespace TW::Solana
diff --git a/src/Solana/Signer.cpp b/src/Solana/Signer.cpp
deleted file mode 100644
index f5839bc0e8f..00000000000
--- a/src/Solana/Signer.cpp
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Signer.h"
-#include "Address.h"
-#include "Program.h"
-
-#include <google/protobuf/util/json_util.h>
-
-#include <optional>
-
-namespace TW::Solana {
-
-void Signer::sign(const std::vector<PrivateKey>& privateKeys, Transaction& transaction) {
-    for (auto privateKey : privateKeys) {
-        auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
-        auto index = transaction.getAccountIndex(address);
-        auto message = transaction.messageData();
-        auto signature = Signature(privateKey.sign(message, TWCurveED25519));
-        transaction.signatures[index] = signature;
-    }
-}
-
-// Helper to convert protobuf-string-collection references to Address vector
-std::vector<Address> convertReferences(const google::protobuf::RepeatedPtrField<std::string>& references) {
-    std::vector<Address> ret;
-    for (auto i = 0; i < references.size(); ++i) {
-        if (Address::isValid(references[i])) {
-            ret.emplace_back(references[i]);
-        }
-    }
-    return ret;
-}
-
-Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    auto blockhash = Solana::Hash(input.recent_blockhash());
-    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-    Message message;
-    std::vector<PrivateKey> signerKeys;
-
-    switch (input.transaction_type_case()) {
-    case Proto::SigningInput::TransactionTypeCase::kTransferTransaction: {
-        auto protoMessage = input.transfer_transaction();
-        message = Message::createTransfer(
-            /* from */ Address(key.getPublicKey(TWPublicKeyTypeED25519)),
-            /* to */ Address(protoMessage.recipient()),
-            /* value */ protoMessage.value(),
-            /* recent_blockhash */ blockhash,
-            /* memo */ protoMessage.memo(),
-            convertReferences(protoMessage.references()));
-        signerKeys.push_back(key);
-    } break;
-
-    case Proto::SigningInput::TransactionTypeCase::kDelegateStakeTransaction: {
-        auto protoMessage = input.delegate_stake_transaction();
-        auto userAddress = Address(key.getPublicKey(TWPublicKeyTypeED25519));
-        auto validatorAddress = Address(protoMessage.validator_pubkey());
-        auto stakeProgramId = Address(STAKE_PROGRAM_ID_ADDRESS);
-        std::optional<Address> stakeAddress;
-        if (protoMessage.stake_account().size() == 0) {
-            // no stake address specified, generate a new unique
-            stakeAddress = StakeProgram::addressFromRecentBlockhash(userAddress, blockhash, stakeProgramId);
-        } else {
-            // stake address specified, use it
-            stakeAddress = Address(protoMessage.stake_account());
-        }
-        message = Message::createStake(
-            /* signer */ userAddress,
-            /* stakeAddress */ stakeAddress.value(),
-            /* voteAddress */ validatorAddress,
-            /* value */ protoMessage.value(),
-            /* recent_blockhash */ blockhash);
-        signerKeys.push_back(key);
-    } break;
-
-    case Proto::SigningInput::TransactionTypeCase::kDeactivateStakeTransaction: {
-        auto protoMessage = input.deactivate_stake_transaction();
-        auto userAddress = Address(key.getPublicKey(TWPublicKeyTypeED25519));
-        auto stakeAddress = Address(protoMessage.stake_account());
-        message = Message::createStakeDeactivate(
-            /* signer */ userAddress,
-            /* stakeAddress */ stakeAddress,
-            /* recent_blockhash */ blockhash);
-        signerKeys.push_back(key);
-    } break;
-
-    case Proto::SigningInput::TransactionTypeCase::kDeactivateAllStakeTransaction: {
-        auto protoMessage = input.deactivate_all_stake_transaction();
-        auto userAddress = Address(key.getPublicKey(TWPublicKeyTypeED25519));
-        std::vector<Address> addresses;
-        for (auto i = 0; i < protoMessage.stake_accounts_size(); ++i) {
-            addresses.emplace_back(Address(protoMessage.stake_accounts(i)));
-        }
-        message = Message::createStakeDeactivateAll(userAddress, addresses, blockhash);
-        signerKeys.push_back(key);
-    } break;
-
-    case Proto::SigningInput::TransactionTypeCase::kWithdrawTransaction: {
-        auto protoMessage = input.withdraw_transaction();
-        auto userAddress = Address(key.getPublicKey(TWPublicKeyTypeED25519));
-        auto stakeAddress = Address(protoMessage.stake_account());
-        message = Message::createStakeWithdraw(
-            /* signer */ userAddress,
-            /* stakeAddress */ stakeAddress,
-            /* value */ protoMessage.value(),
-            /* recent_blockhash */ blockhash);
-        signerKeys.push_back(key);
-    } break;
-
-    case Proto::SigningInput::TransactionTypeCase::kWithdrawAllTransaction: {
-        auto protoMessage = input.withdraw_all_transaction();
-        auto userAddress = Address(key.getPublicKey(TWPublicKeyTypeED25519));
-        std::vector<std::pair<Address, uint64_t>> stakes;
-        for (auto i = 0; i < protoMessage.stake_accounts_size(); ++i) {
-            stakes.push_back(std::make_pair<Address, uint64_t>(
-                Address(protoMessage.stake_accounts(i).stake_account()),
-                protoMessage.stake_accounts(i).value()));
-        }
-        message = Message::createStakeWithdrawAll(userAddress, stakes, blockhash);
-        signerKeys.push_back(key);
-    } break;
-
-    case Proto::SigningInput::TransactionTypeCase::kCreateTokenAccountTransaction: {
-        auto protoMessage = input.create_token_account_transaction();
-        auto userAddress = Address(key.getPublicKey(TWPublicKeyTypeED25519));
-        auto mainAddress = Address(protoMessage.main_address());
-        auto tokenMintAddress = Address(protoMessage.token_mint_address());
-        auto tokenAddress = Address(protoMessage.token_address());
-        message = Message::createTokenCreateAccount(userAddress, mainAddress, tokenMintAddress, tokenAddress, blockhash);
-        signerKeys.push_back(key);
-    } break;
-
-    case Proto::SigningInput::TransactionTypeCase::kTokenTransferTransaction: {
-        auto protoMessage = input.token_transfer_transaction();
-        auto userAddress = Address(key.getPublicKey(TWPublicKeyTypeED25519));
-        auto tokenMintAddress = Address(protoMessage.token_mint_address());
-        auto senderTokenAddress = Address(protoMessage.sender_token_address());
-        auto recipientTokenAddress = Address(protoMessage.recipient_token_address());
-        auto amount = protoMessage.amount();
-        auto decimals = static_cast<uint8_t>(protoMessage.decimals());
-        const auto memo = protoMessage.memo();
-        message = Message::createTokenTransfer(userAddress, tokenMintAddress, senderTokenAddress, recipientTokenAddress, amount, decimals, blockhash,
-                                               memo, convertReferences(protoMessage.references()));
-        signerKeys.push_back(key);
-    } break;
-
-    case Proto::SigningInput::TransactionTypeCase::kCreateAndTransferTokenTransaction: {
-        auto protoMessage = input.create_and_transfer_token_transaction();
-        auto userAddress = Address(key.getPublicKey(TWPublicKeyTypeED25519));
-        auto recipientMainAddress = Address(protoMessage.recipient_main_address());
-        auto tokenMintAddress = Address(protoMessage.token_mint_address());
-        auto recipientTokenAddress = Address(protoMessage.recipient_token_address());
-        auto senderTokenAddress = Address(protoMessage.sender_token_address());
-        auto amount = protoMessage.amount();
-        auto decimals = static_cast<uint8_t>(protoMessage.decimals());
-        const auto memo = protoMessage.memo();
-        message = Message::createTokenCreateAndTransfer(userAddress, recipientMainAddress, tokenMintAddress, recipientTokenAddress, senderTokenAddress, amount, decimals, blockhash,
-                                                        memo, convertReferences(protoMessage.references()));
-        signerKeys.push_back(key);
-    } break;
-
-    default:
-        assert(input.transaction_type_case() != Proto::SigningInput::TransactionTypeCase::TRANSACTION_TYPE_NOT_SET);
-    }
-    auto transaction = Transaction(message);
-
-    sign(signerKeys, transaction);
-
-    auto protoOutput = Proto::SigningOutput();
-    auto encoded = transaction.serialize();
-    protoOutput.set_encoded(encoded);
-
-    return protoOutput;
-}
-
-void Signer::signUpdateBlockhash(const std::vector<PrivateKey>& privateKeys,
-                                 Transaction& transaction, Solana::Hash& recentBlockhash) {
-    transaction.message.recentBlockhash = recentBlockhash;
-    Signer::sign(privateKeys, transaction);
-}
-
-// This method does not confirm that PrivateKey order matches that encoded in the messageData
-// That order must be correct for the Transaction to succeed on Solana
-Data Signer::signRawMessage(const std::vector<PrivateKey>& privateKeys, const Data messageData) {
-    std::vector<Signature> signatures;
-    for (auto privateKey : privateKeys) {
-        auto signature = Signature(privateKey.sign(messageData, TWCurveED25519));
-        signatures.push_back(signature);
-    }
-    Data buffer;
-    append(buffer, shortVecLength<Signature>(signatures));
-    for (auto signature : signatures) {
-        Data signature_vec(signature.bytes.begin(), signature.bytes.end());
-        append(buffer, signature_vec);
-    }
-    append(buffer, messageData);
-
-    return buffer;
-}
-
-std::string Signer::signJSON(const std::string& json, const Data& key) {
-    auto input = Proto::SigningInput();
-    google::protobuf::util::JsonStringToMessage(json, &input);
-    input.set_private_key(key.data(), key.size());
-    return Signer::sign(input).encoded();
-}
-
-} // namespace TW::Solana
diff --git a/src/Solana/Signer.h b/src/Solana/Signer.h
deleted file mode 100644
index 46bed571ffb..00000000000
--- a/src/Solana/Signer.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Transaction.h"
-#include "Data.h"
-#include "../Hash.h"
-#include "../PrivateKey.h"
-#include "../proto/Solana.pb.h"
-
-namespace TW::Solana {
-
-/// Helper class that performs Solana transaction signing.
-class Signer {
-  public:
-    /// Signs the given transaction.
-    static void sign(const std::vector<PrivateKey>& privateKeys, Transaction& transaction);
-
-    /// Signs a json Proto::SigningInput with private key
-    static std::string signJSON(const std::string& json, const Data& key);
-
-    static void signUpdateBlockhash(const std::vector<PrivateKey>& privateKeys,
-                                    Transaction& transaction, Solana::Hash& recentBlockhash);
-    static Data signRawMessage(const std::vector<PrivateKey>& privateKeys, const Data messageData);
-
-    static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
-};
-
-} // namespace TW::Solana
diff --git a/src/Solana/Transaction.cpp b/src/Solana/Transaction.cpp
deleted file mode 100644
index ac345134dc6..00000000000
--- a/src/Solana/Transaction.cpp
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Transaction.h"
-
-#include "Hash.h"
-#include "Signer.h"
-
-#include <vector>
-
-namespace TW::Solana {
-
-uint8_t CompiledInstruction::findAccount(const Address& address) {
-    auto it = std::find(addresses.begin(), addresses.end(), address);
-    if (it == addresses.end()) {
-        throw std::invalid_argument("address not found");
-    }
-    assert(it != addresses.end());
-    auto dist = std::distance(addresses.begin(), it);
-    assert(dist < 256);
-    return (uint8_t)dist;
-}
-
-void Message::addAccount(const AccountMeta& account) {
-    bool inSigned = (std::find(signedAccounts.begin(), signedAccounts.end(), account.account) != signedAccounts.end());
-    bool inUnsigned = (std::find(unsignedAccounts.begin(), unsignedAccounts.end(), account.account) != unsignedAccounts.end());
-    bool inReadOnly = (std::find(readOnlyAccounts.begin(), readOnlyAccounts.end(), account.account) != readOnlyAccounts.end());
-    if (account.isSigner) {
-        if (!inSigned) {
-            signedAccounts.push_back(account.account);
-        }
-    } else if (!account.isReadOnly) {
-        if (!inSigned && !inUnsigned) {
-            unsignedAccounts.push_back(account.account);
-        }
-    } else {
-        if (!inSigned && !inUnsigned && !inReadOnly) {
-            readOnlyAccounts.push_back(account.account);
-        }
-    }
-}
-
-void Message::addAccountKeys(const Address& account) {
-    if (std::find(accountKeys.begin(), accountKeys.end(), account) == accountKeys.end()) {
-        accountKeys.push_back(account);
-    }
-}
-
-void Message::compileAccounts() {
-    for (auto& instr : instructions) {
-        for (auto& address : instr.accounts) {
-            addAccount(address);
-        }
-    }
-    // add programIds (read-only, at end)
-    for (auto& instr : instructions) {
-        addAccount(AccountMeta{instr.programId, false, true});
-    }
-
-    header = MessageHeader{
-        (uint8_t)signedAccounts.size(),
-        0,
-        (uint8_t)readOnlyAccounts.size()};
-
-    // merge the three buckets
-    accountKeys.clear();
-    for (auto& a : signedAccounts) {
-        addAccountKeys(a);
-    }
-    for (auto& a : unsignedAccounts) {
-        addAccountKeys(a);
-    }
-    for (auto& a : readOnlyAccounts) {
-        addAccountKeys(a);
-    }
-
-    compileInstructions();
-}
-
-void Message::compileInstructions() {
-    compiledInstructions.clear();
-    for (auto instruction : instructions) {
-        compiledInstructions.emplace_back(CompiledInstruction(instruction, accountKeys));
-    }
-}
-
-std::string Transaction::serialize() const {
-    Data buffer;
-
-    append(buffer, shortVecLength<Signature>(this->signatures));
-    for (auto signature : this->signatures) {
-        Data signature_vec(signature.bytes.begin(), signature.bytes.end());
-        append(buffer, signature_vec);
-    }
-    append(buffer, this->messageData());
-
-    return Base58::bitcoin.encode(buffer);
-}
-
-Data Transaction::messageData() const {
-    Data buffer;
-
-    buffer.push_back(this->message.header.numRequiredSignatures);
-    buffer.push_back(this->message.header.numCreditOnlySignedAccounts);
-    buffer.push_back(this->message.header.numCreditOnlyUnsignedAccounts);
-    append(buffer, shortVecLength<Address>(this->message.accountKeys));
-    for (auto account_key : this->message.accountKeys) {
-        Data account_key_vec(account_key.bytes.begin(), account_key.bytes.end());
-        append(buffer, account_key_vec);
-    }
-    Data recentBlockhash(this->message.recentBlockhash.bytes.begin(),
-                         this->message.recentBlockhash.bytes.end());
-    append(buffer, recentBlockhash);
-
-    // apppend compiled instructions
-    append(buffer, shortVecLength<CompiledInstruction>(message.compiledInstructions));
-    for (auto instruction : message.compiledInstructions) {
-        buffer.push_back(instruction.programIdIndex);
-        append(buffer, shortVecLength<uint8_t>(instruction.accounts));
-        append(buffer, instruction.accounts);
-        append(buffer, shortVecLength<uint8_t>(instruction.data));
-        append(buffer, instruction.data);
-    }
-
-    return buffer;
-}
-
-uint8_t Transaction::getAccountIndex(Address publicKey) {
-    auto item =
-        std::find(this->message.accountKeys.begin(), this->message.accountKeys.end(), publicKey);
-    if (item == this->message.accountKeys.end()) {
-        throw std::invalid_argument("publicKey not found in message.accountKeys");
-    }
-    return (uint8_t)std::distance(this->message.accountKeys.begin(), item);
-}
-
-bool Signature::operator==(const Signature& v) const {
-    return bytes == v.bytes;
-}
-
-} // namespace TW::Solana
diff --git a/src/Solana/Transaction.h b/src/Solana/Transaction.h
deleted file mode 100644
index 8ea3e6c5fca..00000000000
--- a/src/Solana/Transaction.h
+++ /dev/null
@@ -1,508 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Address.h"
-#include "../Base58.h"
-#include "../BinaryCoding.h"
-#include "Data.h"
-
-#include <vector>
-#include <string>
-
-namespace TW::Solana {
-
-// https://docs.solana.com/developing/programming-model/transactions
-
-const std::string SYSTEM_PROGRAM_ID_ADDRESS = "11111111111111111111111111111111";
-const std::string STAKE_PROGRAM_ID_ADDRESS = "Stake11111111111111111111111111111111111111";
-const std::string TOKEN_PROGRAM_ID_ADDRESS = "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA";
-const std::string ASSOCIATED_TOKEN_PROGRAM_ID_ADDRESS = "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL";
-const std::string SYSVAR_RENT_ID_ADDRESS = "SysvarRent111111111111111111111111111111111";
-const std::string SYSVAR_CLOCK_ID_ADDRESS = "SysvarC1ock11111111111111111111111111111111";
-const std::string STAKE_CONFIG_ID_ADDRESS = "StakeConfig11111111111111111111111111111111";
-const std::string NULL_ID_ADDRESS = "11111111111111111111111111111111";
-const std::string SYSVAR_STAKE_HISTORY_ID_ADDRESS = "SysvarStakeHistory1111111111111111111111111";
-const std::string MEMO_PROGRAM_ID_ADDRESS = "MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr";
-
-template <typename T>
-Data shortVecLength(std::vector<T> vec) {
-    auto bytes = Data();
-    auto remLen = vec.size();
-    while (true) {
-        uint8_t elem = remLen & 0x7f;
-        remLen >>= 7;
-        if (remLen == 0) {
-            bytes.push_back(elem);
-            break;
-        } else {
-            elem |= 0x80;
-            bytes.push_back(elem);
-        }
-    }
-    return bytes;
-}
-
-// System instruction types
-enum SystemInstruction {
-    CreateAccount,
-    Assign,
-    Transfer,
-    CreateAccountWithSeed
-};
-
-// Stake instruction types
-enum StakeInstruction {
-    Initialize = 0,
-    DelegateStake = 2,
-    Withdraw = 4,
-    Deactivate = 5,
-};
-
-// Token instruction types
-enum TokenInstruction {
-    CreateTokenAccount = 1,
-    //SetAuthority = 6,
-    TokenTransfer = 12,
-};
-
-enum TokenAuthorityType {
-    MintTokens = 0,
-    FreezeAccount = 1,
-    AccountOwner = 2,
-    CloseAccount = 3,
-};
-
-struct AccountMeta {
-    Address account;
-    bool isSigner;
-    bool isReadOnly;
-    AccountMeta(const Address& address, bool isSigner, bool isReadOnly): account(address), isSigner(isSigner), isReadOnly(isReadOnly) {}
-};
-
-// An instruction to execute a program
-struct Instruction {
-    // Index into the transaction keys array indicating the program account that
-    // executes this instruction
-    Address programId;
-    // Ordered indices into the transaction keys array indicating which accounts
-    // to pass to the program
-    std::vector<AccountMeta> accounts;
-    // The program input data
-    Data data;
-
-    Instruction(const Address& programId, const std::vector<AccountMeta>& accounts, const Data& data)
-        : programId(programId), accounts(accounts), data(data) {}
-
-    // This creator creates a default System Transfer instruction
-    static Instruction createTransfer(const std::vector<AccountMeta>& accounts, uint64_t value) {
-        const SystemInstruction type = Transfer;
-        auto data = Data();
-        encode32LE(static_cast<uint32_t>(type), data);
-        encode64LE(static_cast<uint64_t>(value), data);
-
-        return Instruction(Address(SYSTEM_PROGRAM_ID_ADDRESS), accounts, data);
-    }
-
-    static Instruction createAccountWithSeed(const std::vector<AccountMeta>& accounts, uint64_t value, uint64_t space, const Address& programId,
-        const Address& voteAddress, uint64_t seedLength, const Address& signer) {
-        const SystemInstruction type = CreateAccountWithSeed;
-        auto data = Data();
-        std::string seed = voteAddress.string();
-        Data vecSeed(seed.begin(), seed.end());
-        vecSeed.resize(static_cast<size_t>(seedLength));
-        encode32LE(static_cast<uint32_t>(type), data);
-        append(data, signer.vector());
-        encode64LE(static_cast<uint64_t>(seedLength), data);
-        append(data, vecSeed);
-        encode64LE(static_cast<uint64_t>(value), data);
-        encode64LE(static_cast<uint64_t>(space), data);
-        append(data, programId.vector());
-
-        return Instruction(Address(SYSTEM_PROGRAM_ID_ADDRESS), accounts, data);
-    }
-
-    // creates an Initialize Stake instruction
-    static Instruction createStakeInitialize(const std::vector<AccountMeta>& accounts, const Address& signer) {
-        const StakeInstruction type = Initialize;
-        auto data = Data();
-        encode32LE(static_cast<uint32_t>(type), data);
-        append(data, signer.vector());
-        append(data, signer.vector());
-        auto lockup = Data(48);
-        append(data, lockup);
-
-        return Instruction(Address(STAKE_PROGRAM_ID_ADDRESS), accounts, data);
-    }
-
-    // creates a Withdraw Stake instruction
-    static Instruction createStakeWithdraw(const std::vector<AccountMeta>& accounts, uint64_t value) {
-        const StakeInstruction type = Withdraw;
-        auto data = Data();
-        encode32LE(static_cast<uint32_t>(type), data);
-        encode64LE(static_cast<uint64_t>(value), data);
-
-        return Instruction(Address(STAKE_PROGRAM_ID_ADDRESS), accounts, data);
-    }
-
-    // creates a Stake instruction
-    static Instruction createStake(StakeInstruction type, const std::vector<AccountMeta>& accounts) {
-        auto data = Data();
-        encode32LE(static_cast<uint32_t>(type), data);
-
-        return Instruction(Address(STAKE_PROGRAM_ID_ADDRESS), accounts, data);
-    }
-
-    // creates a createAccount token instruction.
-    static Instruction createTokenCreateAccount(const std::vector<AccountMeta>& accounts) {
-        auto data = Data();
-        return Instruction(Address(ASSOCIATED_TOKEN_PROGRAM_ID_ADDRESS), accounts, data);
-    }
-
-    // creates a transfer token instruction.
-    static Instruction createTokenTransfer(const std::vector<AccountMeta>& accounts, uint64_t value, uint8_t decimals) {
-        const TokenInstruction type = TokenTransfer;
-        auto data = Data();
-        data.push_back(static_cast<uint8_t>(type));
-        encode64LE(value, data);
-        data.push_back(static_cast<uint8_t>(decimals));
-
-        return Instruction(Address(TOKEN_PROGRAM_ID_ADDRESS), accounts, data);
-    }
-
-    static Instruction createMemo(std::string memo) {
-        auto data = TW::data(memo);
-        std::vector<AccountMeta> accounts; // empty
-        return Instruction(Address(MEMO_PROGRAM_ID_ADDRESS), accounts, data);
-    }
-};
-
-// A compiled instruction
-struct CompiledInstruction {
-    // Index into the transaction keys array indicating the program account that executes this instruction
-    uint8_t programIdIndex;
-    // Ordered indices into the transaction keys array indicating which accounts
-    // to pass to the program
-    std::vector<uint8_t> accounts;
-    // The program input data
-    Data data;
-
-    // Reference to the address vector
-    const std::vector<Address>& addresses;
-
-    /// Supplied address vector is expected to contain all addresses and programId from the instruction; they are replaced by index into the address vector.
-    CompiledInstruction(const Instruction& instruction, const std::vector<Address>& addresses): addresses(addresses) {
-        programIdIndex = findAccount(instruction.programId);
-        for (auto& account: instruction.accounts) {
-            accounts.push_back(findAccount(account.account));
-        }
-        data = instruction.data;
-    }
-
-    uint8_t findAccount(const Address& address);
-};
-
-class Hash {
-  public:
-    static const size_t size = 32;
-    /// Hash data
-    std::array<uint8_t, size> bytes;
-
-    Hash(const std::string& string) {
-        const auto data = Base58::bitcoin.decode(string);
-        std::copy(data.begin(), data.end(), this->bytes.begin());
-    }
-
-    std::string encoded() const { return Base58::bitcoin.encode(bytes); }
-};
-
-class Signature {
-  public:
-    static const size_t size = 64;
-    /// Signature data
-    std::array<uint8_t, size> bytes;
-
-    Signature(const std::string& string) {
-        const auto data = Base58::bitcoin.decode(string);
-        std::copy(data.begin(), data.end(), this->bytes.begin());
-    }
-    Signature(const std::array<uint8_t, 64>& bytes) { this->bytes = bytes; }
-    Signature(const Data& bytes) { std::copy(bytes.begin(), bytes.end(), this->bytes.begin()); }
-
-    bool operator==(const Signature& v) const;
-};
-
-struct MessageHeader {
-    // The number of signatures required for this message to be considered
-    // valid. The signatures must match the first `numRequiredSignatures` of
-    // `accountKeys`.
-    uint8_t numRequiredSignatures = 0;
-    // The last numCreditOnlySignedAccounts of the signed keys are
-    // credit-only accounts.
-    uint8_t numCreditOnlySignedAccounts = 0;
-    // The last numCreditOnlyUnsignedAccounts of the unsigned keys are
-    // credit-only accounts.
-    uint8_t numCreditOnlyUnsignedAccounts = 0;
-};
-
-class Message {
-  public:
-    // The message header, identifying signed and credit-only `accountKeys`
-    MessageHeader header;
-    // All the account keys used by this transaction
-    std::vector<Address> accountKeys;
-    // The id of a recent ledger entry.
-    Hash recentBlockhash;
-    // Programs that will be executed in sequence and committed in one atomic
-    // transaction if all succeed.
-    std::vector<Instruction> instructions;
-
-    // three buckets of different account types
-    std::vector<Address> signedAccounts;
-    std::vector<Address> unsignedAccounts;
-    std::vector<Address> readOnlyAccounts;
-    std::vector<CompiledInstruction> compiledInstructions;
-
-    Message() : recentBlockhash(NULL_ID_ADDRESS) {};
-
-    Message(Hash recentBlockhash, const std::vector<Instruction>& instructions)
-        : recentBlockhash(recentBlockhash)
-        , instructions(instructions) {
-            compileAccounts();
-    }
-
-    // add an acount, to the corresponding bucket
-    void addAccount(const AccountMeta& account);
-    // add an account to accountKeys if not yet present
-    void addAccountKeys(const Address& account);
-    // compile the single accounts lists from the buckets
-    void compileAccounts();
-    // compile the instructions; replace instruction accounts with indices
-    void compileInstructions();
-
-    static void appendReferences(std::vector<AccountMeta>& accountMetas, const std::vector<Address>& references) {
-        for (auto &&reference: references) {
-            accountMetas.emplace_back(reference, false, true);
-        }
-    }
-
-    // This constructor creates a default single-signer Transfer message
-    static Message createTransfer(const Address& from, const Address& to, uint64_t value, Hash recentBlockhash,
-        std::string memo = "", std::vector<Address> references = {}
-    ) {
-        std::vector<Instruction> instructions;
-        if (memo.length() > 0) {
-            // Optional memo. Order: before transfer, as per documentation.
-            instructions.push_back(Instruction::createMemo(memo));
-        }
-        std::vector<AccountMeta> accountMetas = {
-            AccountMeta(from, true, false),
-            AccountMeta(to, false, false),
-        };
-        appendReferences(accountMetas, references);
-        instructions.push_back(Instruction::createTransfer(accountMetas, value));
-        return Message(recentBlockhash, instructions);
-    }
-
-    // This constructor creates a create_account_with_seed_and_delegate_stake message
-    // see delegate_stake() solana/programs/stake/src/stake_instruction.rs
-    static Message createStake(const Address& signer, const Address& stakeAddress, const Address& voteAddress, uint64_t value, Hash recentBlockhash) {
-        auto sysvarRentId = Address(SYSVAR_RENT_ID_ADDRESS);
-        auto sysvarClockId = Address(SYSVAR_CLOCK_ID_ADDRESS);
-        auto stakeConfigId = Address(STAKE_CONFIG_ID_ADDRESS);
-        auto sysvarStakeHistoryId = Address(SYSVAR_STAKE_HISTORY_ID_ADDRESS);
-        auto stakeProgramId = Address(STAKE_PROGRAM_ID_ADDRESS);
-        std::vector<Instruction> instructions;
-        instructions.reserve(3);
-        // create_account_with_seed instruction
-        Address seed = Address(data(recentBlockhash.bytes.data(), recentBlockhash.bytes.size()));
-        auto createAccountInstruction = Instruction::createAccountWithSeed(std::vector<AccountMeta>{
-                AccountMeta(signer, true, true),
-                AccountMeta(stakeAddress, false, false),
-                AccountMeta(signer, true, true),
-            }, value, 200, stakeProgramId, seed, 32, signer);
-        instructions.push_back(createAccountInstruction);
-        // initialize instruction
-        auto initializeInstruction = Instruction::createStakeInitialize(std::vector<AccountMeta>{
-            AccountMeta(stakeAddress, false, false),
-            AccountMeta(sysvarRentId, false, true)
-        }, signer);
-        instructions.push_back(initializeInstruction);
-        // delegate_stake instruction
-        auto delegateInstruction = Instruction::createStake(DelegateStake,
-            std::vector<AccountMeta>{
-                AccountMeta(stakeAddress, false, false),        // 0. `[WRITE]` Initialized stake account to be delegated
-                AccountMeta(voteAddress, false, true),          // 1. `[]` Vote account to which this stake will be delegated
-                AccountMeta(sysvarClockId, false, true),        // 2. `[]` Clock sysvar
-                AccountMeta(sysvarStakeHistoryId, false, true), // 3. `[]` Stake history sysvar that carries stake warmup/cooldown history
-                AccountMeta(stakeConfigId, false, true),        // 4. `[]` Address of config account that carries stake config
-                AccountMeta(signer, true, true),                // 5. `[SIGNER]` Stake authority
-            });
-        instructions.push_back(delegateInstruction);
-        return Message(recentBlockhash, instructions);
-    }
-
-    // This constructor creates a deactivate_stake message
-    static Message createStakeDeactivate(const Address& signer, const Address& stakeAddress, Hash recentBlockhash) {
-        auto sysvarClockId = Address(SYSVAR_CLOCK_ID_ADDRESS);
-        auto instruction = Instruction::createStake(Deactivate, std::vector<AccountMeta>{
-            AccountMeta(stakeAddress, false, false),    // 0. `[WRITE]` Delegated stake account
-            AccountMeta(sysvarClockId, false, true),    // 1. `[]` Clock sysvar
-            AccountMeta(signer, true, false),           // 2. `[SIGNER]` Stake authority
-        });
-        return Message(recentBlockhash, {instruction});
-    }
-
-    // This constructor creates a deactivate_stake message with multiple stake accounts
-    static Message createStakeDeactivateAll(const Address& signer, const std::vector<Address>& stakeAddresses, Hash recentBlockhash) {
-        auto sysvarClockId = Address(SYSVAR_CLOCK_ID_ADDRESS);
-        std::vector<Instruction> instructions;
-        for(auto& address: stakeAddresses) {
-            auto instruction = Instruction::createStake(Deactivate, std::vector<AccountMeta>{
-                AccountMeta(address, false, false),         // 0. `[WRITE]` Delegated stake account
-                AccountMeta(sysvarClockId, false, true),    // 1. `[]` Clock sysvar
-                AccountMeta(signer, true, false),           // 2. `[SIGNER]` Stake authority
-            });
-            instructions.push_back(instruction);
-        }
-        return Message(recentBlockhash, instructions);
-    }
-
-    // This constructor creates a withdraw message, with the signer as the default recipient
-    static Message createStakeWithdraw(const Address& signer, const Address& stakeAddress, uint64_t value, Hash recentBlockhash) {
-        auto sysvarClockId = Address(SYSVAR_CLOCK_ID_ADDRESS);
-        auto sysvarStakeHistoryId = Address(SYSVAR_STAKE_HISTORY_ID_ADDRESS);
-        auto instruction = Instruction::createStakeWithdraw(std::vector<AccountMeta>{
-            AccountMeta(stakeAddress, false, false),            // 0. `[WRITE]` Stake account from which to withdraw
-            AccountMeta(signer, false, false),                  // 1. `[WRITE]` Recipient account
-            AccountMeta(sysvarClockId, false, true),            // 2. `[]` Clock sysvar
-            AccountMeta(sysvarStakeHistoryId, false, true),     // 3. `[]` Stake history sysvar that carries stake warmup/cooldown history
-            AccountMeta(signer, true, false),                   // 4. `[SIGNER]` Withdraw authority
-        }, value);
-        return Message(recentBlockhash, {instruction});
-    }
-
-    // This constructor creates a withdraw message, with multiple stake accounts
-    static Message createStakeWithdrawAll(const Address& signer, const std::vector<std::pair<Address, uint64_t>>& stakes, Hash recentBlockhash) {
-        auto sysvarClockId = Address(SYSVAR_CLOCK_ID_ADDRESS);
-        auto sysvarStakeHistoryId = Address(SYSVAR_STAKE_HISTORY_ID_ADDRESS);
-        std::vector<Instruction> instructions;
-        for(auto& stake: stakes) {
-            auto instruction = Instruction::createStakeWithdraw(std::vector<AccountMeta>{
-                AccountMeta(stake.first, false, false),         // 0. `[WRITE]` Stake account from which to withdraw
-                AccountMeta(signer, false, false),              // 1. `[WRITE]` Recipient account
-                AccountMeta(sysvarClockId, false, true),        // 2. `[]` Clock sysvar
-                AccountMeta(sysvarStakeHistoryId, false, true), // 3. `[]` Stake history sysvar that carries stake warmup/cooldown history
-                AccountMeta(signer, true, false),               // 4. `[SIGNER]` Withdraw authority
-            }, stake.second);
-            instructions.push_back(instruction);
-        }
-        return Message(recentBlockhash, instructions);
-    }
-
-    // This constructor creates a createAccount token message
-    // see create_associated_token_account() solana-program-library/associated-token-account/program/src/lib.rs
-    static Message createTokenCreateAccount(const Address& signer, const Address& otherMainAccount, const Address& tokenMintAddress, const Address& tokenAddress, Hash recentBlockhash) {
-        auto sysvarRentId = Address(SYSVAR_RENT_ID_ADDRESS);
-        auto systemProgramId = Address(SYSTEM_PROGRAM_ID_ADDRESS);
-        auto tokenProgramId = Address(TOKEN_PROGRAM_ID_ADDRESS);
-        auto instruction = Instruction::createTokenCreateAccount(std::vector<AccountMeta>{
-            AccountMeta(signer, true, false), // fundingAddress,
-            AccountMeta(tokenAddress, false, false),
-            AccountMeta(otherMainAccount, false, true),
-            AccountMeta(tokenMintAddress, false, true),
-            AccountMeta(systemProgramId, false, true),
-            AccountMeta(tokenProgramId, false, true),
-            AccountMeta(sysvarRentId, false, true),
-        });
-        return Message(recentBlockhash, {instruction});
-    }
-
-    // This constructor creates a transfer token message.
-    // see transfer_checked() solana-program-library/token/program/src/instruction.rs
-    static Message createTokenTransfer(const Address& signer, const Address& tokenMintAddress,
-        const Address& senderTokenAddress, const Address& recipientTokenAddress, uint64_t amount, uint8_t decimals, Hash recentBlockhash,
-        std::string memo = "", std::vector<Address> references = {}
-    ) {
-        std::vector<Instruction> instructions;
-        if (memo.length() > 0) {
-            // Optional memo. Order: before transfer, as per documentation.
-            instructions.push_back(Instruction::createMemo(memo));
-        }
-        std::vector<AccountMeta> accountMetas = {
-            AccountMeta(senderTokenAddress, false, false),
-            AccountMeta(tokenMintAddress, false, true),
-            AccountMeta(recipientTokenAddress, false, false),
-            AccountMeta(signer, true, false),
-        };
-        appendReferences(accountMetas, references);
-        instructions.push_back(Instruction::createTokenTransfer(accountMetas, amount, decimals));
-        return Message(recentBlockhash, instructions);
-    }
-
-    // This constructor creates a createAndTransferToken message, combining createAccount and transfer.
-    static Message createTokenCreateAndTransfer(const Address& signer, const Address& recipientMainAddress, const Address& tokenMintAddress,
-        const Address& recipientTokenAddress, const Address& senderTokenAddress, uint64_t amount, uint8_t decimals, Hash recentBlockhash,
-        std::string memo = "", std::vector<Address> references = {}
-    ) {
-        const auto sysvarRentId = Address(SYSVAR_RENT_ID_ADDRESS);
-        const auto systemProgramId = Address(SYSTEM_PROGRAM_ID_ADDRESS);
-        const auto tokenProgramId = Address(TOKEN_PROGRAM_ID_ADDRESS);
-        std::vector<Instruction> instructions;
-        instructions.reserve(3);
-        instructions.emplace_back(Instruction::createTokenCreateAccount(std::vector<AccountMeta>{
-            AccountMeta(signer, true, false), // fundingAddress,
-            AccountMeta(recipientTokenAddress, false, false),
-            AccountMeta(recipientMainAddress, false, true),
-            AccountMeta(tokenMintAddress, false, true),
-            AccountMeta(systemProgramId, false, true),
-            AccountMeta(tokenProgramId, false, true),
-            AccountMeta(sysvarRentId, false, true),
-        }));
-        if (memo.length() > 0) {
-            // Optional memo. Order: before transfer, as per documentation.
-            instructions.emplace_back(Instruction::createMemo(memo));
-        }
-        std::vector<AccountMeta> accountMetas = {
-            AccountMeta(senderTokenAddress, false, false),
-            AccountMeta(tokenMintAddress, false, true),
-            AccountMeta(recipientTokenAddress, false, false),
-            AccountMeta(signer, true, false),
-        };
-        appendReferences(accountMetas, references);
-        instructions.push_back(Instruction::createTokenTransfer(accountMetas, amount, decimals));
-        return Message(recentBlockhash, instructions);
-    }
-};
-
-class Transaction {
-  public:
-    // Signatures
-    std::vector<Signature> signatures;
-    // The message to sign
-    Message message;
-
-    Transaction(const Message& message) : message(message) {
-        this->signatures.resize(message.header.numRequiredSignatures, Signature(defaultSignature));
-    }
-
-    // Default basic transfer transaction
-    Transaction(const Address& from, const Address& to, uint64_t value, Hash recentBlockhash, std::string memo = "", std::vector<Address> references = {})
-        : message(Message::createTransfer(from, to, value, recentBlockhash, memo, references)) {
-        this->signatures.resize(1, Signature(defaultSignature));
-    }
-
-  public:
-    std::string serialize() const;
-    std::vector<uint8_t> messageData() const;
-    uint8_t getAccountIndex(Address publicKey);
-
-  private:
-    TW::Data defaultSignature = TW::Data(64);
-};
-
-} // namespace TW::Solana
diff --git a/src/StarkEx/MessageSigner.cpp b/src/StarkEx/MessageSigner.cpp
new file mode 100644
index 00000000000..967bc0bf7e0
--- /dev/null
+++ b/src/StarkEx/MessageSigner.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <StarkEx/MessageSigner.h>
+#include <HexCoding.h>
+
+namespace TW::StarkEx {
+
+std::string MessageSigner::signMessage(const TW::PrivateKey& privateKey, const std::string& message) {
+    auto digest = parse_hex(message, true);
+    return hex(privateKey.sign(digest, TWCurveStarkex));
+}
+
+bool MessageSigner::verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept {
+    auto starkSignature = parse_hex(signature, true);
+    auto digest = parse_hex(message, true);
+    return publicKey.verify(starkSignature, digest);
+}
+
+} // namespace TW::StarkEx
diff --git a/src/StarkEx/MessageSigner.h b/src/StarkEx/MessageSigner.h
new file mode 100644
index 00000000000..1f1eeffe52e
--- /dev/null
+++ b/src/StarkEx/MessageSigner.h
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <PrivateKey.h>
+#include <string>
+
+namespace TW::StarkEx {
+class MessageSigner {
+public:
+    /// Sign a message following StarkEx Curve
+    /// \param privateKey the private key to sign with
+    /// \param message hex message to sign
+    /// \return hex signed message
+    static std::string signMessage(const PrivateKey& privateKey, const std::string& message);;
+
+    /// Verify a message following EIP-191
+    /// \param publicKey publickey to verify the signed message
+    /// \param message message to be verified as a string
+    /// \param signature signature to verify the message against
+    /// \return true if the message match the signature, false otherwise
+    static bool verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept;;
+};
+}
diff --git a/src/Stellar/Address.cpp b/src/Stellar/Address.cpp
index 84b99a62bae..dbf2261388e 100644
--- a/src/Stellar/Address.cpp
+++ b/src/Stellar/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "Crc.h"
@@ -18,30 +16,25 @@
 namespace TW::Stellar {
 
 bool Address::isValid(const std::string& string) {
-    bool valid = false;
-
     if (string.length() != size) {
         return false;
     }
 
     // Check that it decodes correctly
     Data decoded;
-    valid = Base32::decode(string, decoded);
+    if (!Base32::decode(string, decoded) || decoded.size() != rawSize) {
+        return false;
+    }
 
     // ... and that version byte is 0x30
-    if (valid && TWStellarVersionByte(decoded[0]) != TWStellarVersionByte::TWStellarVersionByteAccountID) {
-        valid = false;
+    if (TWStellarVersionByte(decoded[0]) != TWStellarVersionByte::TWStellarVersionByteAccountID) {
+        return false;
     }
 
     // ... and that checksums match
     auto checksum_expected = Crc::crc16(decoded.data(), 33);
     auto checksum_actual = static_cast<uint16_t>((decoded[34] << 8) | decoded[33]); // unsigned short (little endian)
-    if (valid && checksum_expected != checksum_actual) {
-        valid = false;
-    }
-
-    memzero(decoded.data(), decoded.size());
-    return valid;
+    return checksum_expected == checksum_actual;
 }
 
 Address::Address(const std::string& string) {
diff --git a/src/Stellar/Address.h b/src/Stellar/Address.h
index 6f42dd14926..fab7bda7408 100644
--- a/src/Stellar/Address.h
+++ b/src/Stellar/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Stellar/Entry.cpp b/src/Stellar/Entry.cpp
index a2412dcb5dd..56c20599a79 100644
--- a/src/Stellar/Entry.cpp
+++ b/src/Stellar/Entry.cpp
@@ -1,23 +1,22 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
+#include "proto/TransactionCompiler.pb.h"
 #include "Signer.h"
 
 namespace TW::Stellar {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -25,4 +24,29 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            Signer signer(input);
+
+            auto preImage = signer.signaturePreimage();
+            auto preImageHash = Hash::sha256(preImage);
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, [[maybe_unused]] const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() != 1) {
+                output.set_error(Common::Proto::Error_signatures_count);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_signatures_count));
+                return;
+            }
+
+            output = Signer(input).compile(signatures[0]);
+        });
+}
+
 } // namespace TW::Stellar
diff --git a/src/Stellar/Entry.h b/src/Stellar/Entry.h
index f4236c325df..aef0e1b8221 100644
--- a/src/Stellar/Entry.h
+++ b/src/Stellar/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,12 @@ namespace TW::Stellar {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
 };
 
 } // namespace TW::Stellar
diff --git a/src/Stellar/Signer.cpp b/src/Stellar/Signer.cpp
index 5d48a71551b..01ac21aa776 100644
--- a/src/Stellar/Signer.cpp
+++ b/src/Stellar/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Base64.h"
@@ -33,7 +31,7 @@ std::string Signer::sign() const noexcept {
     auto publicNetwork = _input.passphrase(); // Header
     auto passphrase = Hash::sha256(publicNetwork);
     encodedWithHeaders.insert(encodedWithHeaders.end(), passphrase.begin(), passphrase.end());
-    auto transactionType = Data{0, 0, 0, 2}; // Header
+    auto transactionType = Data{0, 0, 0, 2};
     encodedWithHeaders.insert(encodedWithHeaders.end(), transactionType.begin(),
                               transactionType.end());
     encodedWithHeaders.insert(encodedWithHeaders.end(), encoded.begin(), encoded.end());
@@ -67,7 +65,13 @@ Data Signer::encode(const Proto::SigningInput& input) const {
         encode64BE(0, data);                                      // from
         encode64BE(input.op_change_trust().valid_before(), data); // to
     } else {
-        encode32BE(0, data); // missing
+        if (input.time_bounds() > 0) {
+            encode32BE(1, data);
+            encode64BE(0, data); //from
+            encode64BE(input.time_bounds(), data); //to
+        } else {
+            encode32BE(0, data); // missing
+        }
     }
 
     // Memo
@@ -142,6 +146,36 @@ Data Signer::encode(const Proto::SigningInput& input) const {
     return data;
 }
 
+Data Signer::signaturePreimage() const {
+    auto encoded = encode(_input);
+
+    auto encodedWithHeaders = Data();
+    auto publicNetwork = _input.passphrase(); // Header
+    auto passphrase = Hash::sha256(publicNetwork);
+    encodedWithHeaders.insert(encodedWithHeaders.end(), passphrase.begin(), passphrase.end());
+    auto transactionType = Data{0, 0, 0, 2}; // Header
+    encodedWithHeaders.insert(encodedWithHeaders.end(), transactionType.begin(),
+                              transactionType.end());
+    encodedWithHeaders.insert(encodedWithHeaders.end(), encoded.begin(), encoded.end());
+    return encodedWithHeaders;
+}
+
+Proto::SigningOutput Signer::compile(const Data& sig) const {
+    auto account = Address(_input.account());
+    auto encoded = encode(_input);
+
+    auto signature = Data();
+    signature.insert(signature.end(), encoded.begin(), encoded.end());
+    encode32BE(1, signature);
+    signature.insert(signature.end(), account.bytes.end() - 4, account.bytes.end());
+    encode32BE(static_cast<uint32_t>(sig.size()), signature);
+    signature.insert(signature.end(), sig.begin(), sig.end());
+
+    Proto::SigningOutput output;
+    output.set_signature(Base64::encode(signature));
+    return output;
+}
+
 uint32_t Signer::operationType(const Proto::SigningInput& input) {
     switch (input.operation_oneof_case()) {
     case Proto::SigningInput::kOpCreateAccount:
diff --git a/src/Stellar/Signer.h b/src/Stellar/Signer.h
index 7cf60a41094..3968e354f42 100644
--- a/src/Stellar/Signer.h
+++ b/src/Stellar/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 #pragma once
 
 #include "Address.h"
@@ -28,6 +26,8 @@ class Signer {
     std::string sign() const noexcept;
 
     Data encode(const Proto::SigningInput& input) const;
+    Data signaturePreimage() const;
+    Proto::SigningOutput compile(const Data& sig) const;
 
   private:
     static uint32_t operationType(const Proto::SigningInput& input);
diff --git a/src/Sui/Entry.h b/src/Sui/Entry.h
new file mode 100644
index 00000000000..86106198b80
--- /dev/null
+++ b/src/Sui/Entry.h
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/RustCoinEntry.h"
+
+namespace TW::Sui {
+
+class Entry final : public Rust::RustCoinEntry {
+};
+
+} // namespace TW::Sui
diff --git a/src/THORChain/Entry.cpp b/src/THORChain/Entry.cpp
deleted file mode 100644
index 02c1d4f97c0..00000000000
--- a/src/THORChain/Entry.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Entry.h"
-
-#include "Signer.h"
-#include "../proto/Cosmos.pb.h"
-
-using namespace std;
-
-namespace TW::THORChain {
-
-// Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
-
-void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
-    auto input = Cosmos::Proto::SigningInput();
-    input.ParseFromArray(dataIn.data(), (int)dataIn.size());
-    auto serializedOut = Signer::sign(input).SerializeAsString();
-    dataOut.insert(dataOut.end(), serializedOut.begin(), serializedOut.end());
-}
-
-string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string& json, const Data& key) const {
-    return Signer::signJSON(json, key);
-}
-
-} // namespace TW::THORChain
diff --git a/src/THORChain/Entry.h b/src/THORChain/Entry.h
index a5650e5b94a..863117825d0 100644
--- a/src/THORChain/Entry.h
+++ b/src/THORChain/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,6 @@ namespace TW::THORChain {
 /// Entry point for implementation of THORChain coin.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public Cosmos::Entry {
-public:
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
 };
 
 } // namespace TW::THORChain
diff --git a/src/THORChain/Signer.cpp b/src/THORChain/Signer.cpp
deleted file mode 100644
index 30ebb84217b..00000000000
--- a/src/THORChain/Signer.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Signer.h"
-#include "../Cosmos/Signer.h"
-#include "../proto/Cosmos.pb.h"
-
-#include <TrustWalletCore/TWCoinType.h>
-#include <google/protobuf/util/json_util.h>
-
-using namespace TW;
-
-namespace TW::THORChain {
-const std::string TYPE_PREFIX_MSG_SEND = "thorchain/MsgSend";
-
-Cosmos::Proto::SigningOutput Signer::sign(Cosmos::Proto::SigningInput& input) noexcept {
-    for (auto i = 0; i < input.messages_size(); ++i) {
-        if (input.messages(i).has_send_coins_message()) {
-            input.mutable_messages(i)->mutable_send_coins_message()->set_type_prefix(TYPE_PREFIX_MSG_SEND);
-        }
-    }
-    return Cosmos::Signer::sign(input, TWCoinTypeTHORChain);
-}
-
-std::string Signer::signJSON(const std::string& json, const Data& key) {
-    auto input = Cosmos::Proto::SigningInput();
-    google::protobuf::util::JsonStringToMessage(json, &input);
-    input.set_private_key(key.data(), key.size());
-    auto output = Signer::sign(input);
-    return output.json();
-}
-
-} // namespace TW::THORChain
diff --git a/src/THORChain/Signer.h b/src/THORChain/Signer.h
deleted file mode 100644
index e524abfb5ee..00000000000
--- a/src/THORChain/Signer.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include "Data.h"
-#include "../proto/Cosmos.pb.h"
-#include <TrustWalletCore/TWCoinType.h>
-
-namespace TW::THORChain {
-
-/// Helper class that performs THORChain transaction signing.
-class Signer {
-  public:
-    /// Signs a Proto::SigningInput transaction
-    static Cosmos::Proto::SigningOutput sign(Cosmos::Proto::SigningInput& input) noexcept;
-    /// Signs a json Proto::SigningInput with private key
-    static std::string signJSON(const std::string& json, const Data& key);
-};
-
-} // namespace TW::THORChain
diff --git a/src/THORChain/Swap.cpp b/src/THORChain/Swap.cpp
index 17d47ebf51e..260337675e3 100644
--- a/src/THORChain/Swap.cpp
+++ b/src/THORChain/Swap.cpp
@@ -1,22 +1,23 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Swap.h"
 
-#include <TrustWalletCore/TWCoinType.h>
 #include "Coin.h"
-#include "proto/THORChainSwap.pb.h"
+#include "HexCoding.h"
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWHRP.h>
+
+// ATOM
+#include "Cosmos/Address.h"
+#include "../proto/Cosmos.pb.h"
 // BTC
 #include "Bitcoin/SigHashType.h"
 #include "../proto/Bitcoin.pb.h"
 // ETH
-#include "Ethereum/Address.h"
 #include "Ethereum/ABI/Function.h"
-#include "Ethereum/ABI/ParamBase.h"
-#include "Ethereum/ABI/ParamAddress.h"
+#include "Ethereum/Address.h"
 #include "uint256.h"
 #include "../proto/Ethereum.pb.h"
 // BNB
@@ -32,94 +33,151 @@
 
 namespace TW::THORChainSwap {
 
-TWCoinType chainCoinType(Chain chain) {
-    switch (chain) {
-        case Chain::ETH: return TWCoinTypeEthereum;
-        case Chain::BNB: return TWCoinTypeBinance;
-        case Chain::BTC: return TWCoinTypeBitcoin;
-        case Chain::THOR:
-        default:
-            return TWCoinTypeTHORChain;
+static Data ethAddressStringToData(const std::string& asString) {
+    Data asData(20);
+    if (asString.empty() || !Ethereum::Address::isValid(asString)) {
+        return asData;
     }
+    auto address = Ethereum::Address(asString);
+    std::copy(address.bytes.begin(), address.bytes.end(), asData.data());
+    return asData;
 }
 
-std::string chainName(Chain chain) {
+TWCoinType chainCoinType(Chain chain) {
     switch (chain) {
-        case Chain::ETH: return "ETH";
-        case Chain::BNB: return "BNB";
-        case Chain::BTC: return "BTC";
-        case Chain::THOR:
-        default:
-            return "THOR";
+    case Chain::ETH:
+        return TWCoinTypeEthereum;
+    case Chain::AVAX:
+        return TWCoinTypeAvalancheCChain;
+    case Chain::BNB:
+        return TWCoinTypeBinance;
+    case Chain::BTC:
+        return TWCoinTypeBitcoin;
+    case Chain::DOGE:
+        return TWCoinTypeDogecoin;
+    case Chain::BCH:
+        return TWCoinTypeBitcoinCash;
+    case Chain::LTC:
+        return TWCoinTypeLitecoin;
+    case Chain::ATOM:
+        return TWCoinTypeCosmos;
+    case Chain::BSC:
+        return TWCoinTypeSmartChain;
+    case Chain::THOR:
+    default:
+        return TWCoinTypeTHORChain;
     }
 }
 
-std::string Swap::buildMemo(Chain toChain, const std::string& toSymbol, const std::string& toTokenId, const std::string& toAddress, uint64_t limit) {
-    std::string prefix = "SWAP";
-    if (toChain == Chain::ETH) {
-        prefix = "=";
+std::string chainName(Chain chain) {
+    switch (chain) {
+    case Chain::AVAX:
+        return "AVAX";
+    case Chain::ETH:
+        return "ETH";
+    case Chain::BNB:
+        return "BNB";
+    case Chain::BSC:
+        return "BSC";
+    case Chain::BTC:
+        return "BTC";
+    case Chain::DOGE:
+        return "DOGE";
+    case Chain::BCH:
+        return "BCH";
+    case Chain::LTC:
+        return "LTC";
+    case Chain::ATOM:
+        return "GAIA";
+    case Chain::THOR:
+    default:
+        return "THOR";
     }
-    const auto toCoinToken = (!toTokenId.empty() && toTokenId != "0x0000000000000000000000000000000000000000") ? toTokenId : toSymbol;
-    return prefix + ":" + chainName(toChain) + "." + toCoinToken + ":" + toAddress + ":" + std::to_string(limit);
 }
 
 bool validateAddress(Chain chain, const std::string& address) {
     return TW::validateAddress(chainCoinType(chain), address);
 }
 
-std::tuple<Data, int, std::string> Swap::build(
-    Chain fromChain,
-    Chain toChain,
-    const std::string& fromAddress,
-    const std::string& toSymbol,
-    const std::string& toTokenId,
-    const std::string& toAddress,
-    const std::string& vaultAddress,
-    const std::string& routerAddress,
-    const std::string& fromAmount,
-    const std::string& toAmountLimit
-)  {
-    if (!validateAddress(fromChain, fromAddress)) {
-        return std::make_tuple<Data, int, std::string>({}, static_cast<int>(Proto::ErrorCode::Error_Invalid_from_address), "Invalid from address");
+SwapBundled SwapBuilder::build(bool shortened) {
+    auto fromChain = static_cast<Chain>(mFromAsset.chain());
+    auto toChain = static_cast<Chain>(mToAsset.chain());
+
+    if (!validateAddress(fromChain, mFromAddress)) {
+        return {.status_code = static_cast<SwapErrorCode>(Proto::ErrorCode::Error_Invalid_from_address), .error = "Invalid from address"};
     }
-    if (!validateAddress(toChain, toAddress)) {
-        return std::make_tuple<Data, int, std::string>({}, static_cast<int>(Proto::ErrorCode::Error_Invalid_to_address), "Invalid to address");
+    if (!validateAddress(toChain, mToAddress)) {
+        return {.status_code = static_cast<SwapErrorCode>(Proto::ErrorCode::Error_Invalid_to_address), .error = "Invalid to address"};
     }
 
-    uint64_t fromAmountNum = std::atoll(fromAmount.c_str());
-    uint64_t toAmountLimitNum = std::atoll(toAmountLimit.c_str());
-    const auto memo = buildMemo(toChain, toSymbol, toTokenId, toAddress, toAmountLimitNum);
+    uint256_t fromAmountNum = uint256_t(mFromAmount);
+    const auto memo = this->buildMemo(shortened);
 
     switch (fromChain) {
-        case Chain::BTC: {
-            Data out;
-            auto res = buildBitcoin(toChain, toSymbol, toTokenId, fromAddress, toAddress, vaultAddress, fromAmountNum, memo, out);
-            return std::make_tuple<Data, int, std::string>(std::move(out), std::move(std::get<0>(res)), std::move(std::get<1>(res)));
-        }
+    case Chain::THOR:
+        return buildRune(fromAmountNum, memo);
+    case Chain::BTC:
+    case Chain::DOGE:
+    case Chain::BCH:
+    case Chain::LTC: {
+        return buildBitcoin(fromAmountNum, memo, fromChain);
+    case Chain::BNB:
+        return buildBinance(mFromAsset, fromAmountNum, memo);
+    case Chain::ATOM:
+        return buildAtom(fromAmountNum, memo);
+    case Chain::ETH:
+    case Chain::AVAX:
+    case Chain::BSC:
+        return buildEth(fromAmountNum, memo);
+    }
+    default:
+        return {.status_code = static_cast<SwapErrorCode>(Proto::ErrorCode::Error_Unsupported_from_chain), .error = "Unsupported from chain: " + std::to_string(fromChain)};
+    }
+}
+std::string SwapBuilder::buildMemo(bool shortened) noexcept {
+    uint64_t toAmountLimitNum = std::stoull(mToAmountLimit);
+
+    // Memo: 'SWAP', or shortened '='; see https://dev.thorchain.org/thorchain-dev/concepts/memos
+    std::string prefix = shortened ? "=" : "SWAP";
+    const auto& toChain = static_cast<Chain>(mToAsset.chain());
+    const auto& toTokenId = mToAsset.token_id();
+    const auto& toSymbol = mToAsset.symbol();
+    const auto toCoinToken = (!toTokenId.empty() && toTokenId != "0x0000000000000000000000000000000000000000") ? toTokenId : toSymbol;
+    std::stringstream memo;
+    memo << prefix + ":" + chainName(toChain) + "." + toCoinToken + ":" + mToAddress;
+
+    memo << ":" << std::to_string(toAmountLimitNum);
+    if (mStreamParams.has_value()) {
+        uint64_t intervalNum = std::stoull(mStreamParams->mInterval);
+        uint64_t quantityNum = std::stoull(mStreamParams->mQuantity);
+        memo << "/" << std::to_string(intervalNum) << "/" << std::to_string(quantityNum);
+    }
 
-        case Chain::ETH: {
-            Data out;
-            auto res = buildEthereum(toChain, toSymbol, toTokenId, fromAddress, toAddress, vaultAddress, routerAddress, fromAmountNum, memo, out);
-            return std::make_tuple<Data, int, std::string>(std::move(out), std::move(std::get<0>(res)), std::move(std::get<1>(res)));
+    if (mAffFeeAddress.has_value() || mAffFeeRate.has_value() || mExtraMemo.has_value()) {
+        memo << ":";
+        if (mAffFeeAddress.has_value()) {
+            memo << mAffFeeAddress.value();
         }
-
-        case Chain::BNB: {
-            Data out;
-            auto res = buildBinance(toChain, toSymbol, toTokenId, fromAddress, toAddress, vaultAddress, fromAmountNum, memo, out);
-            return std::make_tuple<Data, int, std::string>(std::move(out), std::move(std::get<0>(res)), std::move(std::get<1>(res)));
+        if (mAffFeeRate.has_value() || mExtraMemo.has_value()) {
+            memo << ":";
+            if (mAffFeeRate.has_value()) {
+                memo << mAffFeeRate.value();
+            }
+            if (mExtraMemo.has_value()) {
+                memo << ":" << mExtraMemo.value();
+            }
         }
-
-        case Chain::THOR:
-        default:
-            return std::make_tuple<Data, int, std::string>({}, static_cast<int>(Proto::ErrorCode::Error_Unsupported_from_chain), "Unsupported from chain: " + std::to_string(toChain));
     }
+
+    return memo.str();
 }
 
-std::pair<int, std::string> Swap::buildBitcoin([[maybe_unused]] Chain toChain, [[maybe_unused]] const std::string& toSymbol, [[maybe_unused]] const std::string& toTokenId, const std::string& fromAddress, [[maybe_unused]] const std::string& toAddress, const std::string& vaultAddress, uint64_t amount, const std::string& memo, Data& out) {
+SwapBundled SwapBuilder::buildBitcoin(const uint256_t& amount, const std::string& memo, Chain fromChain) {
     auto input = Bitcoin::Proto::SigningInput();
-
+    Data out;
     // Following fields must be set afterwards, before signing ...
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    auto coinType = chainCoinType(fromChain);
+    input.set_hash_type(Bitcoin::hashTypeForCoin(coinType));
     input.set_byte_fee(1);
     input.set_use_max_amount(false);
     // private_key[]
@@ -127,37 +185,68 @@ std::pair<int, std::string> Swap::buildBitcoin([[maybe_unused]] Chain toChain, [
     // scripts[]
     // ... end
 
-    input.set_amount(amount);
-    input.set_to_address(vaultAddress);
-    input.set_change_address(fromAddress);
-    input.set_coin_type(TWCoinTypeBitcoin);
+    input.set_amount(static_cast<int64_t>(amount));
+    input.set_to_address(mVaultAddress);
+    input.set_change_address(mFromAddress);
+    input.set_coin_type(coinType);
     input.set_output_op_return(memo);
 
     auto serialized = input.SerializeAsString();
     out.insert(out.end(), serialized.begin(), serialized.end());
-    return std::make_pair<int, std::string>(0, "");
+    return {.out = std::move(out)};
 }
+SwapBundled SwapBuilder::buildBinance(Proto::Asset fromAsset, const uint256_t& amount, const std::string& memo) {
+    auto input = Binance::Proto::SigningInput();
+    Data out;
 
-Data ethAddressStringToData(const std::string& asString) {
-    Data asData(20);
-    if (asString.empty() || !Ethereum::Address::isValid(asString)) {
-        return asData;
+    // Following fields must be set afterwards, before signing ...
+    input.set_chain_id("");
+    input.set_account_number(0);
+    input.set_sequence(0);
+    input.set_source(0);
+    input.set_private_key("");
+    // ... end
+
+    input.set_memo(memo);
+
+    auto& order = *input.mutable_send_order();
+
+    auto token = Binance::Proto::SendOrder::Token();
+    token.set_denom(fromAsset.token_id().empty() ? "BNB" : fromAsset.token_id());
+    token.set_amount(static_cast<uint64_t>(amount));
+    {
+        Binance::Address fromAddressBin;
+        Binance::Address::decode(mFromAddress, fromAddressBin);
+        auto input_ = order.add_inputs();
+        input_->set_address(fromAddressBin.getKeyHash().data(), fromAddressBin.getKeyHash().size());
+        *input_->add_coins() = token;
     }
-    auto address = Ethereum::Address(asString);
-    std::copy(address.bytes.begin(), address.bytes.end(), asData.data());
-    return asData;
+    {
+        Binance::Address vaultAddressBin;
+        Binance::Address::decode(mVaultAddress, vaultAddressBin);
+        auto output = order.add_outputs();
+        output->set_address(vaultAddressBin.getKeyHash().data(), vaultAddressBin.getKeyHash().size());
+        *output->add_coins() = token;
+    }
+
+    auto serialized = input.SerializeAsString();
+    out.insert(out.end(), serialized.begin(), serialized.end());
+    return {.out = std::move(out)};
 }
 
-std::pair<int, std::string> Swap::buildEthereum([[maybe_unused]] Chain toChain, [[maybe_unused]] const std::string& toSymbol, const std::string& toTokenId, [[maybe_unused]] const std::string& fromAddress, [[maybe_unused]] const std::string& toAddress, const std::string& vaultAddress, const std::string& routerAddress, uint64_t amount, const std::string& memo, Data& out) {
+SwapBundled SwapBuilder::buildEth(const uint256_t& amount, const std::string& memo) {
+    Data out;
     auto input = Ethereum::Proto::SigningInput();
-
+    // EIP-1559
+    input.set_tx_mode(this->mFromAsset.chain() == Proto::Chain::BSC ? Ethereum::Proto::Legacy : Ethereum::Proto::Enveloped);
+    const auto& toTokenId = mFromAsset.token_id();
     // some sanity check / address conversion
-    Data vaultAddressBin = ethAddressStringToData(vaultAddress);
-    if (!Ethereum::Address::isValid(vaultAddress) || vaultAddressBin.size() != Ethereum::Address::size) {
-        return std::make_pair<int, std::string>(static_cast<int>(Proto::ErrorCode::Error_Invalid_vault_address), "Invalid vault address: " + vaultAddress);
+    Data vaultAddressBin = ethAddressStringToData(mVaultAddress);
+    if (!Ethereum::Address::isValid(mVaultAddress) || vaultAddressBin.size() != Ethereum::Address::size) {
+        return {.status_code = static_cast<int>(Proto::ErrorCode::Error_Invalid_vault_address), .error = "Invalid vault address: " + mVaultAddress};
     }
-    if (!Ethereum::Address::isValid(routerAddress)) {
-        return std::make_pair<int, std::string>(static_cast<int>(Proto::ErrorCode::Error_Invalid_router_address), "Invalid router address: " + routerAddress);
+    if (!toTokenId.empty() && !Ethereum::Address::isValid(*mRouterAddress)) {
+        return {.status_code = static_cast<int>(Proto::ErrorCode::Error_Invalid_router_address), .error = "Invalid router address: " + *mRouterAddress};
     }
     Data toAssetAddressBin = ethAddressStringToData(toTokenId);
 
@@ -173,61 +262,103 @@ std::pair<int, std::string> Swap::buildEthereum([[maybe_unused]] Chain toChain,
     input.set_private_key("");
     // ... end
 
-    input.set_to_address(routerAddress);
-    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
-    auto func = Ethereum::ABI::Function("deposit", std::vector<std::shared_ptr<Ethereum::ABI::ParamBase>>{
-        std::make_shared<Ethereum::ABI::ParamAddress>(vaultAddressBin),
-        std::make_shared<Ethereum::ABI::ParamAddress>(toAssetAddressBin),
-        std::make_shared<Ethereum::ABI::ParamUInt256>(uint256_t(amount)),
-        std::make_shared<Ethereum::ABI::ParamString>(memo)
-    });
-    Data payload;
-    func.encode(payload);
-    transfer.set_data(payload.data(), payload.size());
-    Data amountData = store(uint256_t(amount));
-    transfer.set_amount(amountData.data(), amountData.size());
+    input.set_to_address(*mRouterAddress);
+    if (!toTokenId.empty()) {
+        if (!mExpirationPolicy) {
+            auto now = std::chrono::system_clock::now();
+            auto in_15_minutes = now + std::chrono::minutes(15);
+            mExpirationPolicy = std::chrono::duration_cast<std::chrono::seconds>(in_15_minutes.time_since_epoch()).count();
+        }
+        auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
+
+        // Ethereum::ABI::AbiProto::NamedParam
+        auto payload = Ethereum::ABI::Function::encodeFunctionCall("depositWithExpiry", {
+            std::make_shared<Ethereum::ABI::ProtoAddress>(mVaultAddress),
+            std::make_shared<Ethereum::ABI::ProtoAddress>(toTokenId),
+            std::make_shared<Ethereum::ABI::ProtoUInt256>(amount),
+            std::make_shared<Ethereum::ABI::ProtoString>(memo),
+            std::make_shared<Ethereum::ABI::ProtoUInt256>(uint256_t(*mExpirationPolicy)),
+        });
+        if (payload.has_value()) {
+            transfer.set_data(payload.value().data(), payload.value().size());
+        }
+
+        Data amountData = store(uint256_t(0));
+        // if tokenId is set to 0x0000000000000000000000000000000000000000 this means we are sending ethereum and transfer amount also need to be set
+        if (toTokenId == "0x0000000000000000000000000000000000000000") {
+            amountData = store(uint256_t(amount));
+        }
+        transfer.set_amount(amountData.data(), amountData.size());
+    } else {
+        input.set_to_address(mVaultAddress);
+        auto& transfer = *input.mutable_transaction()->mutable_transfer();
+        Data amountData = store(uint256_t(amount));
+        transfer.set_amount(amountData.data(), amountData.size());
+        transfer.set_data(memo.data(), memo.size());
+    }
 
     auto serialized = input.SerializeAsString();
     out.insert(out.end(), serialized.begin(), serialized.end());
-    return std::make_pair<int, std::string>(0, "");
+    return {.out = std::move(out)};
 }
 
-std::pair<int, std::string> Swap::buildBinance([[maybe_unused]] Chain toChain, [[maybe_unused]] const std::string& toSymbol, [[maybe_unused]] const std::string& toTokenId, const std::string& fromAddress, [[maybe_unused]] const std::string& toAddress, const std::string& vaultAddress, uint64_t amount, const std::string& memo, Data& out) {
-    auto input = Binance::Proto::SigningInput();
-
-    // Following fields must be set afterwards, before signing ...
-    input.set_chain_id("");
-    input.set_account_number(0);
-    input.set_sequence(0);
-    input.set_source(0);
-    input.set_private_key("");
-    // ... end
+SwapBundled SwapBuilder::buildAtom(const uint256_t& amount, const std::string& memo) {
+    if (!Cosmos::Address::isValid(mVaultAddress, "cosmos")) {
+        return {.status_code = static_cast<int>(Proto::ErrorCode::Error_Invalid_vault_address), .error = "Invalid vault address: " + mVaultAddress};
+    }
+    Data out;
 
+    auto input = Cosmos::Proto::SigningInput();
+    input.set_signing_mode(Cosmos::Proto::Protobuf);
+    input.set_chain_id("cosmoshub-4");
     input.set_memo(memo);
 
-    auto& order = *input.mutable_send_order();
+    auto* msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
 
-    auto token = Binance::Proto::SendOrder::Token();
-    token.set_denom("BNB");
-    token.set_amount(amount);
-    {
-        Binance::Address fromAddressBin;
-        Binance::Address::decode(fromAddress, fromAddressBin);
-        auto input_ = order.add_inputs();
-        input_->set_address(fromAddressBin.getKeyHash().data(), fromAddressBin.getKeyHash().size());
-        *input_->add_coins() = token;
-    }
-    {
-        Binance::Address vaultAddressBin;
-        Binance::Address::decode(vaultAddress, vaultAddressBin);
-        auto output = order.add_outputs();
-        output->set_address(vaultAddressBin.getKeyHash().data(), vaultAddressBin.getKeyHash().size());
-        *output->add_coins() = token;
-    }
+    message.set_from_address(mFromAddress);
+    message.set_to_address(mVaultAddress);
+
+    auto* amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("uatom");
+    amountOfTx->set_amount(amount.str());
 
     auto serialized = input.SerializeAsString();
     out.insert(out.end(), serialized.begin(), serialized.end());
-    return std::make_pair<int, std::string>(0, "");
+
+    return {.out = std::move(out)};
+}
+
+SwapBundled SwapBuilder::buildRune(const uint256_t& amount, const std::string& memo) {
+    auto* hrp = stringForHRP(TW::hrp(TWCoinTypeTHORChain));
+    auto* chainId = TW::chainId(TWCoinTypeTHORChain);
+
+    Bech32Address fromAddress(hrp);
+    Bech32Address::decode(mFromAddress, fromAddress, hrp);
+
+    Data out;
+
+    Cosmos::Proto::SigningInput input;
+    input.set_signing_mode(Cosmos::Proto::Protobuf);
+    input.set_chain_id(chainId);
+
+    auto* msg = input.add_messages()->mutable_thorchain_deposit_message();
+    msg->set_signer(fromAddress.getKeyHash().data(), fromAddress.getKeyHash().size());
+    msg->set_memo(memo);
+
+    auto* coin = msg->add_coins();
+    coin->set_amount(toString(amount));
+    coin->set_decimals(0);
+
+    auto* asset = coin->mutable_asset();
+    asset->set_chain(chainName(static_cast<Chain>(mFromAsset.chain())));
+    asset->set_symbol(mFromAsset.symbol());
+    asset->set_ticker(mFromAsset.symbol());
+
+    auto serialized = input.SerializeAsString();
+    out.insert(out.end(), serialized.begin(), serialized.end());
+
+    return {.out = std::move(out)};
 }
 
-} // namespace TW
+} // namespace TW::THORChainSwap
diff --git a/src/THORChain/Swap.h b/src/THORChain/Swap.h
index 723b4ee83f2..94f35c5b8a3 100644
--- a/src/THORChain/Swap.h
+++ b/src/THORChain/Swap.h
@@ -1,15 +1,17 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include "Data.h"
+#include "proto/THORChainSwap.pb.h"
+#include "uint256.h"
 
+#include <optional>
 #include <string>
 #include <utility>
+#include <optional>
 
 namespace TW::THORChainSwap {
 
@@ -19,34 +21,156 @@ enum Chain {
     BTC = 1,
     ETH = 2,
     BNB = 3,
+    DOGE = 4,
+    BCH = 5,
+    LTC = 6,
+    ATOM = 7,
+    AVAX = 8,
+    BSC = 9,
 };
 
-/// Building THORChain cross-chain transactions
-class Swap {
-public:
-    /// Logic to build a native transaction on the source chain for a swap
-    /// Returns serialized SigningInput proto message, on the source chain,
-    /// and an optional error code + message
-    static std::tuple<Data, int, std::string> build(
-        Chain fromChain,
-        Chain toChain,
-        const std::string& fromAddress,     // source address, on source chain, string format
-        const std::string& toSymbol,        // destination coin symbol
-        const std::string& toTokenId,       // destination token ID, on the destination chain, in case destination is a token, empty otherwise
-        const std::string& toAddress,       // destination address, on destination chain, string format
-        const std::string& vaultAddress,    // ThorChainSwap vault, on the source chain. Should be queried afresh, as it may change
-        const std::string& routerAddress,   // ThorChain router, only in case of Ethereum source network
-        const std::string& fromAmount,      // The source amount, as integer in the smallest native unit of the chain
-        const std::string& toAmountLimit    // The minimum accepted destination amount.  Actual destination amount will depend on current rates, limit amount can be used to prevent using very unfavorable rates.
-    );
-
-protected:
-    static std::pair<int, std::string> buildBitcoin(Chain toChain, const std::string& toSymbol, const std::string& toTokenId, const std::string& fromAddress, const std::string& toAddress, const std::string& vaultAddress, uint64_t amount, const std::string& memo, Data& out);
-    static std::pair<int, std::string> buildEthereum(Chain toChain, const std::string& toSymbol, const std::string& toTokenId, const std::string& fromAddress, const std::string& toAddress, const std::string& vaultAddress, const std::string& routerAddress, uint64_t amount, const std::string& memo, Data& out);
-    static std::pair<int, std::string> buildBinance(Chain toChain, const std::string& toSymbol, const std::string& toTokenId, const std::string& fromAddress, const std::string& toAddress, const std::string& vaultAddress, uint64_t amount, const std::string& memo, Data& out);
+using SwapErrorCode = int;
+
+struct SwapBundled {
+    Data out{};
+    SwapErrorCode status_code{0};
+    std::string error{""};
+};
+
+struct StreamParams {
+    std::string mInterval{"1"};
+    std::string mQuantity{"0"};
+};
+
+class SwapBuilder {
+    Proto::Asset mFromAsset;
+    Proto::Asset mToAsset;
+    std::string mFromAddress;
+    std::string mToAddress;
+    std::string mVaultAddress;
+    std::optional<std::string> mRouterAddress{std::nullopt};
+    std::string mFromAmount;
+    std::string mToAmountLimit{"0"};
+    std::optional<StreamParams> mStreamParams;
+    std::optional<std::string> mAffFeeAddress{std::nullopt};
+    std::optional<std::string> mAffFeeRate{std::nullopt};
+    std::optional<std::string> mExtraMemo{std::nullopt};
+    std::optional<std::size_t> mExpirationPolicy{std::nullopt};
+
+    SwapBundled buildBitcoin(const uint256_t& amount, const std::string& memo, Chain fromChain);
+    SwapBundled buildBinance(Proto::Asset fromAsset, const uint256_t& amount, const std::string& memo);
+    SwapBundled buildEth(const uint256_t& amount, const std::string& memo);
+    SwapBundled buildAtom(const uint256_t& amount, const std::string& memo);
+    SwapBundled buildRune(const uint256_t& amount, const std::string& memo);
 
 public:
-    static std::string buildMemo(Chain toChain, const std::string& toSymbol, const std::string& toTokenId, const std::string& toAddress, uint64_t limit);
+    SwapBuilder() noexcept = default;
+
+    static SwapBuilder builder() noexcept { return {}; }
+
+    SwapBuilder& from(Proto::Asset fromAsset) noexcept {
+        mFromAsset = std::move(fromAsset);
+        return *this;
+    }
+
+    SwapBuilder& fromAddress(std::string fromAddress) noexcept {
+        mFromAddress = std::move(fromAddress);
+        return *this;
+    }
+
+    SwapBuilder& to(Proto::Asset toAsset) noexcept {
+        mToAsset = std::move(toAsset);
+        return *this;
+    }
+
+    SwapBuilder& toAddress(std::string toAddress) noexcept {
+        mToAddress = std::move(toAddress);
+        return *this;
+    }
+
+    SwapBuilder& vault(std::string vaultAddress) noexcept {
+        mVaultAddress = std::move(vaultAddress);
+        return *this;
+    }
+
+    SwapBuilder& router(std::string router) noexcept {
+        if (!router.empty()) {
+            mRouterAddress = std::move(router);
+        }
+        return *this;
+    }
+
+    SwapBuilder& affFeeAddress(std::string affFeeAddress) noexcept {
+        if (!affFeeAddress.empty()) {
+            mAffFeeAddress = std::move(affFeeAddress);
+        } else {
+            mAffFeeAddress = std::nullopt;
+        }
+        return *this;
+    }
+
+    SwapBuilder& affFeeRate(std::string affFeeRate) noexcept {
+        if (!affFeeRate.empty()) {
+            mAffFeeRate = std::move(affFeeRate);
+        } else {
+            mAffFeeRate = std::nullopt;
+        }
+        return *this;
+    }
+
+    SwapBuilder& extraMemo(std::string extraMemo) noexcept {
+        if (!extraMemo.empty()) {
+            mExtraMemo = std::move(extraMemo);
+        } else {
+            mExtraMemo = std::nullopt;
+        }
+        return *this;
+    }
+
+    SwapBuilder& fromAmount(std::string fromAmount) noexcept {
+        mFromAmount = std::move(fromAmount);
+        return *this;
+    }
+
+    SwapBuilder& toAmountLimit(std::string toAmountLimit) noexcept {
+        if (!toAmountLimit.empty()) {
+            mToAmountLimit = std::move(toAmountLimit);
+        }
+        return *this;
+    }
+
+    SwapBuilder& streamInterval(const std::string& interval) noexcept {
+        if (!mStreamParams.has_value()) {
+            mStreamParams = StreamParams();
+        }
+        if (!interval.empty()) {
+            mStreamParams->mInterval = interval;
+        }
+        return *this;
+    }
+
+    SwapBuilder& streamQuantity(const std::string& quantity) noexcept {
+        if (!mStreamParams.has_value()) {
+            mStreamParams = StreamParams();
+        }
+        if (!quantity.empty()) {
+            mStreamParams->mQuantity = quantity;
+        }
+        return *this;
+    }
+
+    SwapBuilder& expirationPolicy(std::size_t expirationTime)  noexcept {
+        if (expirationTime > 0) {
+            mExpirationPolicy = expirationTime;
+        } else {
+            mExpirationPolicy = std::nullopt;
+        }
+        return *this;
+    }
+
+    std::string buildMemo(bool shortened = true) noexcept;
+
+    SwapBundled build(bool shortened = true);
 };
 
-} // namespace TW
+} // namespace TW::THORChainSwap
diff --git a/src/THORChain/TWSwap.cpp b/src/THORChain/TWSwap.cpp
index 9f1341c50fe..0cdab651fd3 100644
--- a/src/THORChain/TWSwap.cpp
+++ b/src/THORChain/TWSwap.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Data.h"
 #include "Swap.h"
@@ -22,34 +20,46 @@ TWData* _Nonnull TWTHORChainSwapBuildSwap(TWData* _Nonnull input) {
         return TWDataCreateWithBytes(outputData.data(), outputData.size());
     }
 
-    const auto fromChain = inputProto.from_chain();
+    const auto fromChain = inputProto.from_asset().chain();
     const auto toChain = inputProto.to_asset().chain();
-    auto res = THORChainSwap::Swap::build(
-        static_cast<THORChainSwap::Chain>(static_cast<int>(fromChain)),
-        static_cast<THORChainSwap::Chain>(static_cast<int>(toChain)),
-        inputProto.from_address(),
-        inputProto.to_asset().symbol(),
-        inputProto.to_asset().token_id(),
-        inputProto.to_address(),
-        inputProto.vault_address(),
-        inputProto.router_address(),
-        inputProto.from_amount(),
-        inputProto.to_amount_limit());
+    auto builder = THORChainSwap::SwapBuilder::builder();
+    builder
+        .from(inputProto.from_asset())
+        .to(inputProto.to_asset())
+        .fromAddress(inputProto.from_address())
+        .toAddress(inputProto.to_address())
+        .vault(inputProto.vault_address())
+        .router(inputProto.router_address())
+        .fromAmount(inputProto.from_amount())
+        .toAmountLimit(inputProto.to_amount_limit())
+        .affFeeAddress(inputProto.affiliate_fee_address())
+        .affFeeRate(inputProto.affiliate_fee_rate_bp())
+        .extraMemo(inputProto.extra_memo())
+        .expirationPolicy(inputProto.expiration_time());
+    if (inputProto.has_stream_params()) {
+        const auto& streamParams = inputProto.stream_params();
+        builder
+            .streamInterval(streamParams.interval())
+            .streamQuantity(streamParams.quantity());
+    }
 
+    auto&& [txInput, errorCode, error] = builder.build();
     outputProto.set_from_chain(fromChain);
     outputProto.set_to_chain(toChain);
-    if (std::get<1>(res) != 0) {
+    if (errorCode != 0) {
         // error
-        outputProto.mutable_error()->set_code(static_cast<THORChainSwap::Proto::ErrorCode>(std::get<1>(res)));
-        outputProto.mutable_error()->set_message(std::get<2>(res));
+        outputProto.mutable_error()->set_code(static_cast<THORChainSwap::Proto::ErrorCode>(errorCode));
+        outputProto.mutable_error()->set_message(error);
     } else {
         // no error
         outputProto.mutable_error()->set_code(THORChainSwap::Proto::ErrorCode::OK);
         outputProto.mutable_error()->set_message("");
 
-        const Data& txInput = std::get<0>(res);
         switch (fromChain) {
-        case THORChainSwap::Proto::BTC: {
+        case THORChainSwap::Proto::BTC:
+        case THORChainSwap::Proto::DOGE:
+        case THORChainSwap::Proto::BCH:
+        case THORChainSwap::Proto::LTC: {
             Bitcoin::Proto::SigningInput btcInput;
             if (!btcInput.ParseFromArray(txInput.data(), static_cast<int>(txInput.size()))) {
                 outputProto.mutable_error()->set_code(THORChainSwap::Proto::ErrorCode::Error_Input_proto_deserialization);
@@ -59,7 +69,9 @@ TWData* _Nonnull TWTHORChainSwapBuildSwap(TWData* _Nonnull input) {
             }
         } break;
 
-        case THORChainSwap::Proto::ETH: {
+        case THORChainSwap::Proto::ETH:
+        case THORChainSwap::Proto::BSC:
+        case THORChainSwap::Proto::AVAX: {
             Ethereum::Proto::SigningInput ethInput;
             if (!ethInput.ParseFromArray(txInput.data(), static_cast<int>(txInput.size()))) {
                 outputProto.mutable_error()->set_code(THORChainSwap::Proto::ErrorCode::Error_Input_proto_deserialization);
@@ -79,6 +91,17 @@ TWData* _Nonnull TWTHORChainSwapBuildSwap(TWData* _Nonnull input) {
             }
         } break;
 
+        case THORChainSwap::Proto::THOR:
+        case THORChainSwap::Proto::ATOM: {
+            Cosmos::Proto::SigningInput cosmosInput;
+            if (!cosmosInput.ParseFromArray(txInput.data(), static_cast<int>(txInput.size()))) {
+                outputProto.mutable_error()->set_code(THORChainSwap::Proto::ErrorCode::Error_Input_proto_deserialization);
+                outputProto.mutable_error()->set_message("Could not deserialize ATOM input");
+            } else {
+                *outputProto.mutable_cosmos() = cosmosInput;
+            }
+        } break;
+
         default:
             outputProto.mutable_error()->set_code(THORChainSwap::Proto::ErrorCode::Error_Unsupported_from_chain);
             outputProto.mutable_error()->set_message(std::string("Unsupported from chain ") + std::to_string(fromChain));
diff --git a/src/Tezos/Address.cpp b/src/Tezos/Address.cpp
index e351ce4d776..f079b45ce96 100644
--- a/src/Tezos/Address.cpp
+++ b/src/Tezos/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "BinaryCoding.h"
@@ -21,9 +19,10 @@ namespace TW::Tezos {
 const std::array<TW::byte, 3> tz1Prefix{6, 161, 159};
 const std::array<TW::byte, 3> tz2Prefix{6, 161, 161};
 const std::array<TW::byte, 3> tz3Prefix{6, 161, 164};
+const std::array<TW::byte, 3> kt1Prefix{2, 90, 121};
 
 bool Address::isValid(const std::string& string) {
-    const auto decoded = Base58::bitcoin.decodeCheck(string);
+    const auto decoded = Base58::decodeCheck(string);
     if (decoded.size() != Address::size) {
         return false;
     }
@@ -35,13 +34,25 @@ bool Address::isValid(const std::string& string) {
         return true;
     }
 
+    // contract prefix
+    if (std::equal(kt1Prefix.begin(), kt1Prefix.end(), decoded.begin())) {
+        return true;
+    }
+
     return false;
 }
 
 Address::Address(const PublicKey& publicKey) {
     auto encoded = Data(publicKey.bytes.begin(), publicKey.bytes.end());
     auto hash = Hash::blake2b(encoded, 20);
-    auto addressData = Data({6, 161, 159});
+    Data addressData;
+    if (publicKey.type == TWPublicKeyTypeSECP256k1) {
+        addressData = Data({6, 161, 161});
+    } else if (publicKey.type == TWPublicKeyTypeED25519){
+        addressData = Data({6, 161, 159});
+    } else {
+        throw std::invalid_argument("unsupported public key type");
+    }
     append(addressData, hash);
     if (addressData.size() != Address::size)
         throw std::invalid_argument("Invalid address key data");
@@ -50,7 +61,7 @@ Address::Address(const PublicKey& publicKey) {
 
 std::string Address::deriveOriginatedAddress(const std::string& operationHash, int operationIndex) {
     // Decode and remove 2 byte prefix.
-    auto decoded = Base58::bitcoin.decodeCheck(operationHash);
+    auto decoded = Base58::decodeCheck(operationHash);
     decoded.erase(decoded.begin(), decoded.begin() + 2);
     TW::encode32BE(operationIndex, decoded);
 
@@ -59,12 +70,41 @@ std::string Address::deriveOriginatedAddress(const std::string& operationHash, i
     auto prefix = Data({2, 90, 121});
     prefix.insert(prefix.end(), hash.begin(), hash.end());
 
-    return Base58::bitcoin.encodeCheck(prefix);
+    return Base58::encodeCheck(prefix);
 }
 
-Data Address::forge() const {
+Data Address::forgePKH() const {
     std::string s = string();
     return forgePublicKeyHash(s);
 }
 
+Data Address::forge() const {
+    // normal address
+    // https://github.com/ecadlabs/taquito/blob/master/packages/taquito-local-forging/src/codec.ts#L183
+    if (std::equal(tz1Prefix.begin(), tz1Prefix.end(), bytes.begin()) ||
+        std::equal(tz2Prefix.begin(), tz2Prefix.end(), bytes.begin()) ||
+        std::equal(tz3Prefix.begin(), tz3Prefix.end(), bytes.begin())) {
+        std::string s = string();
+        Data forgedPKH = forgePublicKeyHash(s);
+        Data forged = Data();
+        forged.insert(forged.end(), 0x00);
+        forged.insert(forged.end(), forgedPKH.begin(), forgedPKH.end());
+        return forged;
+    }
+
+    // contract address
+    // https://github.com/ecadlabs/taquito/blob/master/packages/taquito-local-forging/src/codec.ts#L183
+    if (std::equal(kt1Prefix.begin(), kt1Prefix.end(), bytes.begin())) {
+        std::string s = string();
+        Data forgedPrefix = forgePrefix(kt1Prefix, s);
+        Data forged = Data();
+        forged.insert(forged.end(), 0x01);
+        forged.insert(forged.end(), forgedPrefix.begin(), forgedPrefix.end());
+        forged.insert(forged.end(), 0x00);
+        return forged;
+    }
+
+    throw std::invalid_argument("invalid address");
+}
+
 } // namespace TW::Tezos
diff --git a/src/Tezos/Address.h b/src/Tezos/Address.h
index eb360abc6bd..b2f83cffcbd 100644
--- a/src/Tezos/Address.h
+++ b/src/Tezos/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -33,6 +31,9 @@ class Address : public TW::Base58Address<23> {
 
     /// Forge an address to hex bytes.
     Data forge() const;
+
+    // without type prefix
+    Data forgePKH() const;
 };
 
 } // namespace TW::Tezos
diff --git a/src/Tezos/BinaryCoding.cpp b/src/Tezos/BinaryCoding.cpp
index 1f030be4cfd..7300157f5ca 100644
--- a/src/Tezos/BinaryCoding.cpp
+++ b/src/Tezos/BinaryCoding.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "../Base58.h"
 #include "Data.h"
@@ -16,29 +14,45 @@
 namespace TW::Tezos {
 
 std::string base58ToHex(const std::string& string, size_t prefixLength) {
-    const auto decoded = Base58::bitcoin.decodeCheck(string);
+    const auto decoded = Base58::decodeCheck(string);
     if (decoded.size() < prefixLength) {
         return "";
     }
-    return TW::hex(decoded.data() + prefixLength, decoded.data() + decoded.size());
+    Data v(decoded.data() + prefixLength, decoded.data() + decoded.size());
+    return TW::hex(v);
 }
 
 PublicKey parsePublicKey(const std::string& publicKey) {
-    const auto decoded = Base58::bitcoin.decodeCheck(publicKey);
+    const auto decoded = Base58::decodeCheck(publicKey);
 
-    std::array<byte, 4> prefix = {13, 15, 37, 217};
-    auto pk = Data();
+    std::array<byte, 4> prefix;
+    enum TWPublicKeyType type;
+    std::array<byte, 4> ed25519Prefix = {13, 15, 37, 217};
+    std::array<byte, 4> secp256k1Prefix = {3, 254, 226, 86};
 
-    if (decoded.size() != 32 + prefix.size()) {
+    if (std::equal(std::begin(ed25519Prefix), std::end(ed25519Prefix), std::begin(decoded))) {
+        prefix = ed25519Prefix;
+        type = TWPublicKeyTypeED25519;
+    } else if (std::equal(std::begin(secp256k1Prefix), std::end(secp256k1Prefix), std::begin(decoded))) {
+        prefix = secp256k1Prefix;
+        type = TWPublicKeyTypeSECP256k1;
+    } else {
+        throw std::invalid_argument("Unsupported Public Key Type");
+    }
+    auto pk = Data();
+    if (type == TWPublicKeyTypeED25519 && decoded.size() != 32 + prefix.size()) {
+        throw std::invalid_argument("Invalid Public Key");
+    }
+    if (type == TWPublicKeyTypeSECP256k1 && decoded.size() != 33 + prefix.size()) {
         throw std::invalid_argument("Invalid Public Key");
     }
     append(pk, Data(decoded.begin() + prefix.size(), decoded.end()));
 
-    return PublicKey(pk, TWPublicKeyTypeED25519);
+    return PublicKey(pk, type);
 }
 
 PrivateKey parsePrivateKey(const std::string& privateKey) {
-    const auto decoded = Base58::bitcoin.decodeCheck(privateKey);
+    const auto decoded = Base58::decodeCheck(privateKey);
     auto pk = Data();
     auto prefix_size = 4ul;
 
diff --git a/src/Tezos/BinaryCoding.h b/src/Tezos/BinaryCoding.h
index 9bee6a3bd46..24849592375 100644
--- a/src/Tezos/BinaryCoding.h
+++ b/src/Tezos/BinaryCoding.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Tezos/Entry.cpp b/src/Tezos/Entry.cpp
index 71aa8246a81..0b197d93e5a 100644
--- a/src/Tezos/Entry.cpp
+++ b/src/Tezos/Entry.cpp
@@ -1,23 +1,22 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
+#include "proto/TransactionCompiler.pb.h"
 #include "Signer.h"
 
 namespace TW::Tezos {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -29,4 +28,44 @@ std::string Entry::signJSON([[maybe_unused]] TWCoinType coin, const std::string&
     return Signer::signJSON(json, key);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto operationList = TW::Tezos::OperationList(input.operation_list().branch());
+            for (TW::Tezos::Proto::Operation operation : input.operation_list().operations()) {
+                operationList.addOperation(operation);
+            }
+
+            auto preImage = Signer().buildUnsignedTx(operationList);
+
+            // get preImage hash
+            Data watermarkedData = Data();
+            watermarkedData.push_back(0x03);
+            append(watermarkedData, preImage);
+            auto preImageHash = Hash::blake2b(watermarkedData, 32);
+
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, [[maybe_unused]] const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() != 1) {
+                output.set_error(Common::Proto::Error_signatures_count);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_signatures_count));
+                return;
+            }
+
+            auto operationList = TW::Tezos::OperationList(input.operation_list().branch());
+            for (TW::Tezos::Proto::Operation operation : input.operation_list().operations()) {
+                operationList.addOperation(operation);
+            }
+            auto tx = Signer().buildSignedTx(operationList, signatures[0]);
+            
+            output.set_encoded(tx.data(), tx.size());
+        });
+}
+
 } // namespace TW::Tezos
diff --git a/src/Tezos/Entry.h b/src/Tezos/Entry.h
index bea87ca0aa3..3354a2ee744 100644
--- a/src/Tezos/Entry.h
+++ b/src/Tezos/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,11 +12,14 @@ namespace TW::Tezos {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     bool supportsJSONSigning() const { return true; }
-     std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+    bool supportsJSONSigning() const override { return true; }
+    std::string signJSON(TWCoinType coin, const std::string& json, const Data& key) const override;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
 };
 
 } // namespace TW::Tezos
diff --git a/src/Tezos/Forging.cpp b/src/Tezos/Forging.cpp
index 83088b3f3c0..9c7b22b41ec 100644
--- a/src/Tezos/Forging.cpp
+++ b/src/Tezos/Forging.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Forging.h"
 #include "Address.h"
@@ -18,7 +16,7 @@ namespace {
 constexpr const char* gTezosContractAddressPrefix{"KT1"};
 
 void encodePrefix(const std::string& address, Data& forged) {
-    const auto decoded = Base58::bitcoin.decodeCheck(address);
+    const auto decoded = Base58::decodeCheck(address);
     constexpr auto prefixSize{3};
     forged.insert(forged.end(), decoded.begin() + prefixSize, decoded.end());
 }
@@ -107,15 +105,36 @@ Data forgeAddress(const std::string& address) {
     throw std::invalid_argument("Invalid Prefix");
 }
 
+// https://github.com/ecadlabs/taquito/blob/master/packages/taquito-local-forging/src/codec.ts#L19
+Data forgePrefix(std::array<TW::byte, 3> prefix, const std::string& val) {
+    const auto decoded = Base58::decodeCheck(val);
+    if (!std::equal(prefix.begin(), prefix.end(), decoded.begin())) {
+        throw std::invalid_argument("prefix not match");
+    }
+
+    const auto prefixSize = 3;
+    Data forged = Data();
+    forged.insert(forged.end(), decoded.begin() + prefixSize, decoded.end());
+    return forged;
+}
+
 // Forge the given public key into a hex encoded string.
 Data forgePublicKey(PublicKey publicKey) {
-    std::array<uint8_t, 4> prefix = {13, 15, 37, 217};
+    std::string tag;
+    std::array<uint8_t, 4> prefix;
+    if (publicKey.type == TWPublicKeyTypeED25519) {
+        prefix = {13, 15, 37, 217};
+        tag = "00";
+    } else if (publicKey.type == TWPublicKeyTypeSECP256k1) {
+        prefix = {3, 254, 226, 86};
+        tag = "01";
+    }
     auto data = Data(prefix.begin(), prefix.end());
     auto bytes = Data(publicKey.bytes.begin(), publicKey.bytes.end());
     append(data, bytes);
 
-    auto pk = Base58::bitcoin.encodeCheck(data);
-    auto decoded = "00" + base58ToHex(pk, 4);
+    auto pk = Base58::encodeCheck(data);
+    auto decoded = tag + base58ToHex(pk, 4);
     return parse_hex(decoded);
 }
 
@@ -135,14 +154,22 @@ Data forgeOperation(const Proto::Operation& operation) {
     using namespace Proto;
     auto forged = Data();
     auto source = Address(operation.source());
-    auto forgedSource = source.forge();
+    auto forgedSource = source.forgePKH(); //https://github.com/ecadlabs/taquito/blob/master/packages/taquito-local-forging/src/schema/operation.ts#L40
     auto forgedFee = forgeZarith(operation.fee());
     auto forgedCounter = forgeZarith(operation.counter());
     auto forgedGasLimit = forgeZarith(operation.gas_limit());
     auto forgedStorageLimit = forgeZarith(operation.storage_limit());
 
     if (operation.kind() == Operation_OperationKind_REVEAL) {
-        auto publicKey = PublicKey(data(operation.reveal_operation_data().public_key()), TWPublicKeyTypeED25519);
+        enum TWPublicKeyType type;
+        if (operation.reveal_operation_data().public_key().size() == 32) {
+            type = TWPublicKeyTypeED25519;
+        } else if (operation.reveal_operation_data().public_key().size() == 33) {
+            type = TWPublicKeyTypeSECP256k1;
+        } else {
+            throw std::invalid_argument("unsupported public key type");
+        }
+        auto publicKey = PublicKey(data(operation.reveal_operation_data().public_key()), type);
         auto forgedPublicKey = forgePublicKey(publicKey);
 
         forged.push_back(Operation_OperationKind_REVEAL);
@@ -177,7 +204,7 @@ Data forgeOperation(const Proto::Operation& operation) {
 
     if (operation.kind() == Operation_OperationKind_TRANSACTION) {
         auto forgedAmount = forgeZarith(operation.transaction_operation_data().amount());
-        auto forgedDestination = Address(operation.transaction_operation_data().destination()).forge();
+        auto forgedDestination = forgeAddress(operation.transaction_operation_data().destination());
 
         forged.emplace_back(Operation_OperationKind_TRANSACTION);
         append(forged, forgedSource);
@@ -186,12 +213,10 @@ Data forgeOperation(const Proto::Operation& operation) {
         append(forged, forgedGasLimit);
         append(forged, forgedStorageLimit);
         append(forged, forgedAmount);
-        if (!operation.transaction_operation_data().has_parameters()) {
-            append(forged, forgeBool(false));
-            append(forged, forgedDestination);
+        append(forged, forgedDestination);
+        if (!operation.transaction_operation_data().has_parameters() && operation.transaction_operation_data().encoded_parameter().empty()) {
             append(forged, forgeBool(false));
         } else if (operation.transaction_operation_data().has_parameters()) {
-            append(forged, forgeAddress(operation.transaction_operation_data().destination()));
             append(forged, forgeBool(true));
             auto& parameters = operation.transaction_operation_data().parameters();
             switch (parameters.parameters_case()) {
@@ -206,6 +231,8 @@ Data forgeOperation(const Proto::Operation& operation) {
             case OperationParameters::PARAMETERS_NOT_SET:
                 break;
             }
+        } else {
+            append(forged, TW::data(operation.transaction_operation_data().encoded_parameter()));
         }
         return forged;
     }
diff --git a/src/Tezos/Forging.h b/src/Tezos/Forging.h
index 721546db1e9..878c9e35880 100644
--- a/src/Tezos/Forging.h
+++ b/src/Tezos/Forging.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -24,6 +22,7 @@ Data forgeOperation(const Proto::Operation& operation);
 Data forgeAddress(const std::string& address);
 Data forgeArray(const Data& data);
 Data forgePublicKeyHash(const std::string& publicKeyHash);
+Data forgePrefix(std::array<TW::byte, 3> prefix, const std::string& val);
 Data forgePublicKey(PublicKey publicKey);
 Data forgeZarith(uint64_t input);
 Data forgeInt32(int value, int len = 4);
diff --git a/src/Tezos/MessageSigner.cpp b/src/Tezos/MessageSigner.cpp
new file mode 100644
index 00000000000..25234f170ed
--- /dev/null
+++ b/src/Tezos/MessageSigner.cpp
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <chrono>
+#include <ctime>
+#include <iomanip>
+#include <sstream>
+
+#include "Base58.h"
+#include "HexCoding.h"
+#include "Tezos/MessageSigner.h"
+
+namespace TW::Tezos {
+
+static const Data gEdSigPrefix{9, 245, 205, 134, 18};
+static const std::string gMsgPrefix{"Tezos Signed Message:"};
+
+std::string MessageSigner::inputToPayload(const std::string& input) {
+    using namespace std::string_literals;
+    auto bytes = data(input);
+    size_t bytesLength = bytes.size();
+    std::string addPadding = std::string(8 - std::to_string(bytesLength).size(), '0') + hex(uint64_t(bytesLength));
+    std::string paddedBytesLength = addPadding.substr(addPadding.size() - 8);
+    std::string payloadBytes = "05"s + "01"s + paddedBytesLength + hex(bytes);
+    return payloadBytes;
+}
+
+std::string MessageSigner::formatMessage(const std::string& message, const std::string& dAppUrl) {
+    auto now = std::chrono::system_clock::now();
+    auto now_time = std::chrono::system_clock::to_time_t(now);
+    auto now_ms = std::chrono::duration_cast<std::chrono::milliseconds>(now.time_since_epoch()) % 1000;
+    std::ostringstream oss;
+    oss << gMsgPrefix << " " << dAppUrl << " ";
+    oss << std::put_time(std::gmtime(&now_time), "%FT%T.") << std::setw(3) << std::setfill('0') << now_ms.count() << "Z";
+    oss << " " << message;
+    return oss.str();
+}
+
+std::string MessageSigner::signMessage(const PrivateKey& privateKey, const std::string& message) {
+    auto signature = privateKey.sign(Hash::blake2b(parse_hex(message), 32), TWCurveED25519);
+    return Base58::encodeCheck(concat(gEdSigPrefix, signature));
+}
+
+bool MessageSigner::verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept {
+    auto decoded = Base58::decodeCheck(signature);
+    auto rawSignature = subData(decoded, gEdSigPrefix.size());
+    auto msg = Hash::blake2b(parse_hex(message), 32);
+    return publicKey.verify(rawSignature, msg);
+}
+
+} // namespace TW::Tezos
diff --git a/src/Tezos/MessageSigner.h b/src/Tezos/MessageSigner.h
new file mode 100644
index 00000000000..98773099c99
--- /dev/null
+++ b/src/Tezos/MessageSigner.h
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "PrivateKey.h"
+#include "Data.h"
+
+namespace TW::Tezos {
+    class MessageSigner {
+    public:
+        /// implement format input as described in https://tezostaquito.io/docs/signing/
+        /// \param message message to format e.g: Hello, World
+        /// \param dAppUrl the app url, e.g: testUrl
+        /// \return the formatted message as a string
+        static std::string formatMessage(const std::string& message, const std::string& dAppUrl);
+
+        /// implement input to payload as described in: https://tezostaquito.io/docs/signing/
+        ///
+        /// \param input formatted input to be turned into an hex payload
+        /// \return the hexpayload of the formated input as a hex string
+        static std::string inputToPayload(const std::string& input);
+
+        /// implement signing as described in https://tezostaquito.io/docs/signing/
+        /// \param privateKey the private key to sign with
+        /// \param message message to sign
+        /// \return base58 signed message
+        static std::string signMessage(const PrivateKey& privateKey, const std::string& message);
+
+        /// implement verification as described in https://tezostaquito.io/docs/signing/
+        /// \param publicKey publickey to verify the signed message
+        /// \param message message to be verified as a string
+        /// \param signature signature to verify the message against
+        /// \return true if the message match the signature, false otherwise
+        static bool verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept;;
+    };
+}
diff --git a/src/Tezos/Michelson.cpp b/src/Tezos/Michelson.cpp
index 0b573885ebd..97fcafcd750 100644
--- a/src/Tezos/Michelson.cpp
+++ b/src/Tezos/Michelson.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Michelson.h"
 
diff --git a/src/Tezos/Michelson.h b/src/Tezos/Michelson.h
index 1e6d944c59d..556383f2e12 100644
--- a/src/Tezos/Michelson.h
+++ b/src/Tezos/Michelson.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <cstdint>
 #include <string>
diff --git a/src/Tezos/OperationList.cpp b/src/Tezos/OperationList.cpp
index fc2e7ed3897..d293999080a 100644
--- a/src/Tezos/OperationList.cpp
+++ b/src/Tezos/OperationList.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "OperationList.h"
 #include "Forging.h"
@@ -21,7 +19,7 @@ void Tezos::OperationList::addOperation(const Operation& operation) {
 // Forge the given branch to a hex encoded string.
 Data Tezos::OperationList::forgeBranch() const {
     std::array<byte, 2> prefix = {1, 52};
-    const auto decoded = Base58::bitcoin.decodeCheck(branch);
+    const auto decoded = Base58::decodeCheck(branch);
     if (decoded.size() != 34 || !std::equal(prefix.begin(), prefix.end(), decoded.begin())) {
         throw std::invalid_argument("Invalid branch for forge");
     }
@@ -49,4 +47,14 @@ Data Tezos::OperationList::forge(const PrivateKey& privateKey) const {
     return forged;
 }
 
-} // namespace TW::Tezos
\ No newline at end of file
+Data TW::Tezos::OperationList::forge() const {
+    auto forged = forgeBranch();
+
+    for (auto operation : operation_list) {
+        append(forged, forgeOperation(operation));
+    }
+
+    return forged;
+}
+
+} // namespace TW::Tezos
diff --git a/src/Tezos/OperationList.h b/src/Tezos/OperationList.h
index a6f3a4a9f70..3c673f50d79 100644
--- a/src/Tezos/OperationList.h
+++ b/src/Tezos/OperationList.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -23,6 +21,7 @@ class OperationList {
     void addOperation(const Operation& transaction);
     /// Returns a data representation of the operations.
     Data forge(const PrivateKey& privateKey) const;
+    Data forge() const;
     Data forgeBranch() const;
 };
 
diff --git a/src/Tezos/Signer.cpp b/src/Tezos/Signer.cpp
index 248df7fd115..bd61436b4d7 100644
--- a/src/Tezos/Signer.cpp
+++ b/src/Tezos/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "OperationList.h"
@@ -18,14 +16,18 @@ using namespace TW;
 namespace TW::Tezos {
 
 Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    auto operationList = Tezos::OperationList(input.operation_list().branch());
-    for (Proto::Operation operation : input.operation_list().operations()) {
-        operationList.addOperation(operation);
-    }
-
     auto signer = Signer();
     PrivateKey key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-    Data encoded = signer.signOperationList(key, operationList);
+    Data encoded;
+    if (input.encoded_operations().empty()) {
+        auto operationList = Tezos::OperationList(input.operation_list().branch());
+        for (Proto::Operation operation : input.operation_list().operations()) {
+            operationList.addOperation(operation);
+        }
+        encoded = signer.signOperationList(key, operationList);
+    } else {
+        encoded = signer.signData(key, TW::data(input.encoded_operations()));
+    }
 
     auto output = Proto::SigningOutput();
     output.set_encoded(encoded.data(), encoded.size());
@@ -59,4 +61,20 @@ Data Signer::signData(const PrivateKey& privateKey, const Data& data) {
     return signedData;
 }
 
+Data Signer::buildUnsignedTx(const OperationList& operationList) {
+    Data txData = operationList.forge();
+    return txData;
+}
+
+Data Signer::buildSignedTx(const OperationList& operationList, Data signature) {
+    Data signedData = Data();
+
+    Data txData = operationList.forge();
+
+    append(signedData, txData);
+    append(signedData, signature);
+
+    return signedData;
+}
+
 } // namespace TW::Tezos
diff --git a/src/Tezos/Signer.h b/src/Tezos/Signer.h
index a6e16cf4733..1ec492b7625 100644
--- a/src/Tezos/Signer.h
+++ b/src/Tezos/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -22,9 +20,12 @@ class Signer {
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
     /// Signs a json Proto::SigningInput with private key
     static std::string signJSON(const std::string& json, const Data& key);
+
   public:
     /// Signs the given transaction.
     Data signOperationList(const PrivateKey& privateKey, const OperationList& operationList);
+    Data buildUnsignedTx(const OperationList& operationList);
+    Data buildSignedTx(const OperationList& operationList, Data signature);
     Data signData(const PrivateKey& privateKey, const Data& data);
 };
 
diff --git a/src/TheOpenNetwork/Entry.h b/src/TheOpenNetwork/Entry.h
new file mode 100644
index 00000000000..ad187a83b6a
--- /dev/null
+++ b/src/TheOpenNetwork/Entry.h
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "rust/RustCoinEntry.h"
+
+namespace TW::TheOpenNetwork {
+
+class Entry final : public Rust::RustCoinEntry {
+};
+
+} // namespace TW::TheOpenNetwork
diff --git a/src/Theta/Coins.h b/src/Theta/Coins.h
index 6f8ab47659a..33fdd8b4b48 100644
--- a/src/Theta/Coins.h
+++ b/src/Theta/Coins.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Theta/Entry.cpp b/src/Theta/Entry.cpp
index 634a661a059..f8cff52113e 100644
--- a/src/Theta/Entry.cpp
+++ b/src/Theta/Entry.cpp
@@ -1,18 +1,55 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
-
 #include "Ethereum/Address.h"
 #include "Signer.h"
+#include "../proto/Theta.pb.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 namespace TW::Theta {
 
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Ethereum::Address::isValid(address);
+}
+
+std::string Entry::normalizeAddress([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    // normalized with EIP55 checksum
+    return Ethereum::Address(address).string();
+}
+
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Ethereum::Address(publicKey).string();
+}
+
+Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    const auto addr = Ethereum::Address(address);
+    return {addr.bytes.begin(), addr.bytes.end()};
+}
+
 void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            const auto signer = Signer(input);
+            auto preImage = signer.signaturePreimage();
+            auto preImageHash = Hash::keccak256(preImage);
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, const auto& publicKey) {
+            const auto signer = Signer(input);
+            output = signer.compile(signature, publicKey);
+        });
+}
+
 } // namespace TW::Theta
diff --git a/src/Theta/Entry.h b/src/Theta/Entry.h
index 429190dee81..1d6beb82a5b 100644
--- a/src/Theta/Entry.h
+++ b/src/Theta/Entry.h
@@ -1,21 +1,24 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../CoinEntry.h"
-#include "Ethereum/Entry.h"
+#include "CoinEntry.h"
 
 namespace TW::Theta {
 
 /// Entry point for Theta.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry final : public Ethereum::Entry {
+class Entry final : public CoinEntry {
 public:
-    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const override;
+    std::string normalizeAddress(TWCoinType coin, const std::string& address) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    Data addressToData(TWCoinType coin, const std::string& address) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
 };
 
 } // namespace TW::Theta
diff --git a/src/Theta/Signer.cpp b/src/Theta/Signer.cpp
index c50c74f264e..020965d374a 100755
--- a/src/Theta/Signer.cpp
+++ b/src/Theta/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 
@@ -31,33 +29,33 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     auto output = Proto::SigningOutput();
 
     transaction.setSignature(from, signature);
-    auto encoded = transaction.encode();
+    auto encoded = transaction.encodePayload();
     output.set_encoded(encoded.data(), encoded.size());
     output.set_signature(signature.data(), signature.size());
     return output;
 }
 
-Data Signer::encode(const Transaction& transaction) noexcept {
+Data Signer::encode(const Transaction& transaction) const {
     const uint64_t nonce = 0;
-    const uint256_t gasPrice = 0;
+    const uint64_t gasPrice = 0;
     const uint64_t gasLimit = 0;
-    const Ethereum::Address to = Ethereum::Address("0x0000000000000000000000000000000000000000");
-    const uint256_t amount = 0;
+    const auto* to = "0x0000000000000000000000000000000000000000";
+    const uint64_t amount = 0;
+    auto txData = transaction.encode(chainID);
+
+    EthereumRlp::Proto::EncodingInput encodingInput;
+    auto* rlpList = encodingInput.mutable_item()->mutable_list();
 
-    auto encoded = Data();
     /// Need to add the following prefix to the tx signbytes to be compatible with
     /// the Ethereum tx format
-    append(encoded, RLP::encode(nonce));
-    append(encoded, RLP::encode(gasPrice));
-    append(encoded, RLP::encode(gasLimit));
-    append(encoded, RLP::encode(to.bytes));
-    append(encoded, RLP::encode(amount));
-    /// Chain ID
-    auto payload = Data();
-    append(payload, RLP::encode(chainID));
-    append(payload, transaction.encode());
-    append(encoded, RLP::encode(payload));
-    return RLP::encodeList(encoded);
+    rlpList->add_items()->set_number_u64(nonce);
+    rlpList->add_items()->set_number_u64(gasPrice);
+    rlpList->add_items()->set_number_u64(gasLimit);
+    rlpList->add_items()->set_address(to);
+    rlpList->add_items()->set_number_u64(amount);
+    rlpList->add_items()->set_data(txData.data(), txData.size());
+
+    return RLP::encode(encodingInput);
 }
 
 Data Signer::sign(const PrivateKey& privateKey, const Transaction& transaction) noexcept {
@@ -67,4 +65,45 @@ Data Signer::sign(const PrivateKey& privateKey, const Transaction& transaction)
     return signature;
 }
 
+Transaction Signer::buildTransaction() const{
+    auto publicKey = PublicKey(Data(input.public_key().begin(), input.public_key().end()), TWPublicKeyTypeSECP256k1Extended);
+    auto from = Ethereum::Address(publicKey);
+
+    auto transaction = Transaction(
+        /* from: */ from,
+        /* to: */ Ethereum::Address(input.to_address()),
+        /* thetaAmount: */ load(input.theta_amount()),
+        /* tfuelAmount: */ load(input.tfuel_amount()),
+        /* sequence: */ input.sequence(),
+        /* feeAmount: */ load(input.fee()));
+    return transaction;
+}
+
+Data Signer::signaturePreimage() const {
+    return encode(this->buildTransaction());
+}
+
+Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey) const{
+    // validate public key
+    if (publicKey.type != TWPublicKeyTypeSECP256k1Extended) {
+        throw std::invalid_argument("Invalid public key");
+    }
+    {
+        // validate correctness of signature
+        auto preImage = signaturePreimage();
+        auto preImageHash = Hash::keccak256(preImage);
+        if (!publicKey.verify(signature, preImageHash)) {
+            throw std::invalid_argument("Invalid signature/hash/publickey combination");
+        }
+    }
+    auto from = Ethereum::Address(publicKey);
+    auto protoOutput = Proto::SigningOutput();
+    auto transaction = buildTransaction();
+    transaction.setSignature(from, signature);
+    auto encoded = transaction.encodePayload();
+
+    protoOutput.set_encoded(encoded.data(), encoded.size());
+    protoOutput.set_signature(signature.data(), signature.size());
+    return protoOutput;
+}
 } // namespace TW::Theta
diff --git a/src/Theta/Signer.h b/src/Theta/Signer.h
index e4dbe975fd4..d4608c6e3df 100644
--- a/src/Theta/Signer.h
+++ b/src/Theta/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -23,17 +21,19 @@ class Signer {
 
   public:
     std::string chainID;
-
-    Signer() = default;
+    Proto::SigningInput input;
+    /// Initializes a transaction signer.
+    explicit Signer(const Proto::SigningInput& input) : chainID(input.chain_id()), input(input) {}
     /// Initializes a signer with a chain identifier which could be `mainnet`, `testnet` or
     /// `privatenet`
     explicit Signer(std::string chainID) : chainID(std::move(chainID)) {}
 
     /// Signs the given transaction
     Data sign(const PrivateKey& privateKey, const Transaction& transaction) noexcept;
-
-  private:
-    Data encode(const Transaction& transaction) noexcept;
+    Data encode(const Transaction& transaction) const;
+    Proto::SigningOutput compile(const Data& signature, const PublicKey& publicKey) const;
+    Data signaturePreimage() const;
+    Transaction buildTransaction() const;
 };
 
 } // namespace TW::Theta
diff --git a/src/Theta/Transaction.cpp b/src/Theta/Transaction.cpp
index 380f30084ea..c1cb17c11b8 100644
--- a/src/Theta/Transaction.cpp
+++ b/src/Theta/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 
@@ -12,43 +10,61 @@ namespace TW::Theta {
 
 using RLP = Ethereum::RLP;
 
-Data encode(const Coins& coins) noexcept {
-    auto encoded = Data();
-    append(encoded, RLP::encode(coins.thetaWei));
-    append(encoded, RLP::encode(coins.tfuelWei));
-    return RLP::encodeList(encoded);
+EthereumRlp::Proto::RlpItem prepare(const Coins& coins) noexcept {
+    auto thetaWei = store(coins.thetaWei);
+    auto tfuelWei = store(coins.tfuelWei);
+
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
+    rlpList->add_items()->set_number_u256(thetaWei.data(), thetaWei.size());
+    rlpList->add_items()->set_number_u256(tfuelWei.data(), tfuelWei.size());
+
+    return item;
 }
 
-Data encode(const TxInput& input) noexcept {
-    auto encoded = Data();
-    append(encoded, RLP::encode(input.address.bytes));
-    append(encoded, encode(input.coins));
-    append(encoded, RLP::encode(input.sequence));
-    append(encoded, RLP::encode(input.signature));
-    return RLP::encodeList(encoded);
+EthereumRlp::Proto::RlpItem prepare(const TxInput& input) noexcept {
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
+    rlpList->add_items()->set_data(input.address.bytes.data(), input.address.bytes.size());
+    *rlpList->add_items() = prepare(input.coins);
+    rlpList->add_items()->set_number_u64(input.sequence);
+    rlpList->add_items()->set_data(input.signature.data(), input.signature.size());
+
+    return item;
 }
 
-Data encode(const std::vector<TxInput>& inputs) noexcept {
-    auto encoded = Data();
+EthereumRlp::Proto::RlpItem prepare(const std::vector<TxInput>& inputs) noexcept {
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
     for (const auto& input : inputs) {
-        append(encoded, encode(input));
+        *rlpList->add_items() = prepare(input);
     }
-    return RLP::encodeList(encoded);
+
+    return item;
 }
 
-Data encode(const TxOutput& output) noexcept {
-    auto encoded = Data();
-    append(encoded, RLP::encode(output.address.bytes));
-    append(encoded, encode(output.coins));
-    return RLP::encodeList(encoded);
+EthereumRlp::Proto::RlpItem prepare(const TxOutput& output) noexcept {
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
+    rlpList->add_items()->set_data(output.address.bytes.data(), output.address.bytes.size());
+    *rlpList->add_items() = prepare(output.coins);
+
+    return item;
 }
 
-Data encode(const std::vector<TxOutput>& outputs) noexcept {
-    auto encoded = Data();
+EthereumRlp::Proto::RlpItem prepare(const std::vector<TxOutput>& outputs) noexcept {
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
     for (const auto& output : outputs) {
-        append(encoded, encode(output));
+        *rlpList->add_items() = prepare(output);
     }
-    return RLP::encodeList(encoded);
+
+    return item;
 }
 
 Transaction::Transaction(Ethereum::Address from, Ethereum::Address to,
@@ -65,15 +81,29 @@ Transaction::Transaction(Ethereum::Address from, Ethereum::Address to,
     this->outputs.push_back(output);
 }
 
-Data Transaction::encode() const noexcept {
-    auto encoded = Data();
-    uint16_t txType = 2; // TxSend
-    append(encoded, RLP::encode(txType));
-    auto encodedData = Data();
-    append(encodedData, Theta::encode(_fee));
-    append(encodedData, Theta::encode(inputs));
-    append(encodedData, Theta::encode(outputs));
-    append(encoded, RLP::encodeList(encodedData));
+Data Transaction::encodePayload() const noexcept {
+    const uint64_t txType = 2; // TxSend
+
+    EthereumRlp::Proto::EncodingInput txInput;
+    auto* txPropertiesList = txInput.mutable_item()->mutable_list();
+
+    *txPropertiesList->add_items() = prepare(_fee);
+    *txPropertiesList->add_items() = prepare(inputs);
+    *txPropertiesList->add_items() = prepare(outputs);
+
+    auto txPropertiesEncoded = RLP::encode(txInput);
+
+    Data payload;
+    append(payload, RLP::encodeU256(static_cast<uint256_t>(txType)));
+    append(payload, txPropertiesEncoded);
+
+    return payload;
+}
+
+Data Transaction::encode(const std::string& chainId) const noexcept {
+    Data encoded;
+    append(encoded, RLP::encodeString(chainId));
+    append(encoded, encodePayload());
     return encoded;
 }
 
diff --git a/src/Theta/Transaction.h b/src/Theta/Transaction.h
index 20edd2d0de6..7068cc5fa6e 100644
--- a/src/Theta/Transaction.h
+++ b/src/Theta/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -11,7 +9,7 @@
 
 #include "Coins.h"
 #include "Data.h"
-#include "../Ethereum/Address.h"
+#include "Ethereum/Address.h"
 
 namespace TW::Theta {
 
@@ -51,8 +49,11 @@ class Transaction {
                 const uint256_t& thetaAmount, const uint256_t& tfuelAmount, uint64_t sequence,
                 const uint256_t& feeAmount = 1000000000000);
 
-    /// Encodes the transaction
-    Data encode() const noexcept;
+    /// Encodes the essential part of the transaction without a Chain ID.
+    Data encodePayload() const noexcept;
+
+    /// Encodes the transaction with the given `chainId`.
+    Data encode(const std::string& chainId) const noexcept;
 
     /// Sets signature
     bool setSignature(const Ethereum::Address& address, const Data& signature) noexcept;
diff --git a/src/TransactionCompiler.cpp b/src/TransactionCompiler.cpp
index 2f725ab6780..b9ee21bb760 100644
--- a/src/TransactionCompiler.cpp
+++ b/src/TransactionCompiler.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TransactionCompiler.h"
 
@@ -10,13 +8,6 @@
 
 using namespace TW;
 
-
-Data TransactionCompiler::buildInput(TWCoinType coinType, const std::string& from, const std::string& to, const std::string& amount, const std::string& asset, const std::string& memo, const std::string& chainId) {
-    // parse amount
-    uint256_t amount256 { amount };
-    return anyCoinBuildTransactionInput(coinType, from, to, amount256, asset, memo, chainId);
-}
-
 Data TransactionCompiler::preImageHashes(TWCoinType coinType, const Data& txInputData) {
     return anyCoinPreImageHashes(coinType, txInputData);
 }
@@ -36,3 +27,17 @@ Data TransactionCompiler::compileWithSignatures(TWCoinType coinType, const Data&
     anyCoinCompileWithSignatures(coinType, txInputData, signatures, pubs, txOutput);
     return txOutput;
 }
+
+Data TransactionCompiler::compileWithSignaturesAndPubKeyType(TWCoinType coinType, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<Data>& publicKeys, enum TWPublicKeyType pubKeyType) {
+    std::vector<PublicKey> pubs;
+    for (auto& p: publicKeys) {
+        if (!PublicKey::isValid(p, pubKeyType)) {
+            throw std::invalid_argument("Invalid public key");
+        }
+        pubs.push_back(PublicKey(p, pubKeyType));
+    }
+
+    Data txOutput;
+    anyCoinCompileWithSignatures(coinType, txInputData, signatures, pubs, txOutput);
+    return txOutput;
+}
diff --git a/src/TransactionCompiler.h b/src/TransactionCompiler.h
index 21b968717b6..0c12b4dd23c 100644
--- a/src/TransactionCompiler.h
+++ b/src/TransactionCompiler.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -18,9 +16,6 @@ namespace TW {
 /// Non-core transaction utility methods, like building a transaction using an external signature
 class TransactionCompiler {
 public:
-    /// Build a coin-specific SigningInput protobuf transaction input, from simple transaction parameters
-    static Data buildInput(TWCoinType coinType, const std::string& from, const std::string& to, const std::string& amount, const std::string& asset, const std::string& memo, const std::string& chainId);
-
     /// Obtain pre-signing hash of a transaction. 
     /// It will return a proto object named `PreSigningOutput` which will include hash.
     /// We provide a default `PreSigningOutput` in TransactionCompiler.proto.
@@ -29,6 +24,9 @@ class TransactionCompiler {
 
     /// Compile a complete transation with an external signature, put together from transaction input and provided public key and signature
     static Data compileWithSignatures(TWCoinType coinType, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<Data>& publicKeys);
+    
+    static Data compileWithSignaturesAndPubKeyType(TWCoinType coinType, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<Data>& publicKeys, TWPublicKeyType pubKeyType);
+
 };
 
 } // namespace TW
diff --git a/src/Tron/Address.cpp b/src/Tron/Address.cpp
index a67ea8fd1c2..1a66a7f9ccd 100644
--- a/src/Tron/Address.cpp
+++ b/src/Tron/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
@@ -15,7 +13,7 @@
 namespace TW::Tron {
 
 bool Address::isValid(const std::string& string) {
-    const auto decoded = Base58::bitcoin.decodeCheck(string);
+    const auto decoded = Base58::decodeCheck(string);
     if (decoded.size() != Address::size) {
         return false;
     }
diff --git a/src/Tron/Address.h b/src/Tron/Address.h
index 2c7a37128ee..f19a4a3c164 100644
--- a/src/Tron/Address.h
+++ b/src/Tron/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Tron/Entry.cpp b/src/Tron/Entry.cpp
index 056728c4bc6..7cf7f756ca5 100644
--- a/src/Tron/Entry.cpp
+++ b/src/Tron/Entry.cpp
@@ -1,24 +1,23 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
-
 #include "Address.h"
+#include "Serialization.h"
 #include "Signer.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 using namespace std;
 
 namespace TW::Tron {
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -26,4 +25,30 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            const auto signer = Signer(input);
+            auto preImage = signer.signaturePreimage();
+            auto preImageHash = Hash::sha256(preImage);
+            output.set_data_hash(preImageHash.data(), preImageHash.size());
+            output.set_data(preImage.data(), preImage.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    [[maybe_unused]] const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            const auto signer = Signer(input);
+            if (signatures.size() != 1) {
+                output.set_error(Common::Proto::Error_no_support_n2n);
+                output.set_error_message(
+                    Common::Proto::SigningError_Name(Common::Proto::Error_no_support_n2n));
+                return;
+            }
+            output = signer.compile(signatures[0]);
+        });
+}
 } // namespace TW::Tron
diff --git a/src/Tron/Entry.h b/src/Tron/Entry.h
index 0d25c65da8b..e023427340c 100644
--- a/src/Tron/Entry.h
+++ b/src/Tron/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,15 @@ namespace TW::Tron {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+
+    void compile(TWCoinType coin, const Data& txInputData,
+                 const std::vector<Data>& signatures,
+                 const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Tron
diff --git a/src/Tron/MessageSigner.cpp b/src/Tron/MessageSigner.cpp
new file mode 100644
index 00000000000..8fe0d8619a6
--- /dev/null
+++ b/src/Tron/MessageSigner.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <nlohmann/json.hpp>
+#include <sstream>
+
+#include <Tron/MessageSigner.h>
+#include "HexCoding.h"
+
+
+namespace TW::Tron {
+
+Data generateMessage(const std::string& message) {
+    std::string prefix(1, MessageSigner::TronPrefix);
+    std::stringstream ss;
+    ss << prefix << MessageSigner::MessagePrefix << message;
+    Data signableMessage = Hash::keccak256(data(ss.str()));
+    return signableMessage;
+}
+
+std::string MessageSigner::signMessage(const PrivateKey& privateKey, const std::string& message) {
+    auto signableMessage = generateMessage(message);
+    auto data = privateKey.sign(signableMessage, TWCurveSECP256k1);
+    data[64] += 27;
+    return hex(data);
+}
+
+bool MessageSigner::verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept {
+    Data msg = generateMessage(message);
+    auto rawSignature = parse_hex(signature);
+    auto recovered = publicKey.recover(rawSignature, msg);
+    return recovered == publicKey && publicKey.verify(rawSignature, msg);
+}
+
+} // namespace TW::Ethereum
diff --git a/src/Tron/MessageSigner.h b/src/Tron/MessageSigner.h
new file mode 100644
index 00000000000..e6e7bf2a9a9
--- /dev/null
+++ b/src/Tron/MessageSigner.h
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <PrivateKey.h>
+#include <string>
+#include <optional>
+
+namespace TW::Tron {
+
+class MessageSigner {
+public:
+    /// Sign a message following https://github.com/tronprotocol/tronweb/blob/859253856c79d3aff26ec6c89afefc73840d648d/src/lib/trx.js#L768
+    /// \param privateKey the private key to sign with
+    /// \param message message to sign
+    /// \return hex signed message
+    static std::string signMessage(const PrivateKey& privateKey, const std::string& message);
+
+    /// Verify a TRON message
+    /// \param publicKey publickey to verify the signed message
+    /// \param message message to be verified as a string
+    /// \param signature signature to verify the message against
+    /// \return true if the message match the signature, false otherwise
+    static bool verifyMessage(const PublicKey& publicKey, const std::string& message, const std::string& signature) noexcept;
+    static constexpr auto MessagePrefix = "TRON Signed Message:\n32";
+    static constexpr std::uint8_t TronPrefix{0x19};
+};
+
+} // namespace TW::Ethereum
diff --git a/src/Tron/Protobuf/TronInternal.proto b/src/Tron/Protobuf/TronInternal.proto
index 88bc5675912..17e30c3a689 100644
--- a/src/Tron/Protobuf/TronInternal.proto
+++ b/src/Tron/Protobuf/TronInternal.proto
@@ -4,6 +4,7 @@ import "google/protobuf/any.proto";
 
 package protocol;
 
+// https://github.com/tronprotocol/protocol/blob/2a678934da3992b1a67f975769bbb2d31989451f/core/Tron.proto#L336
 message Transaction {
     message Contract {
         enum ContractType {
@@ -17,6 +18,11 @@ message Transaction {
             WithdrawBalanceContract = 13;
             UnfreezeAssetContract = 14;
             TriggerSmartContract = 31;
+            FreezeBalanceV2Contract = 54;
+            UnfreezeBalanceV2Contract = 55;
+            WithdrawExpireUnfreezeContract = 56;
+            DelegateResourceContract = 57;
+            UnDelegateResourceContract = 58;
         }
         ContractType type = 1;
         google.protobuf.Any parameter = 2;
@@ -28,6 +34,8 @@ message Transaction {
         int64 ref_block_num = 3;
         bytes ref_block_hash = 4;
         int64 expiration = 8;
+        // transaction memo
+        bytes data = 10;
         //only support size = 1,  repeated list here for extension
         repeated Contract contract = 11;
         int64 timestamp = 14;
@@ -78,6 +86,12 @@ message FreezeBalanceContract {
     bytes receiver_address = 15;
 }
 
+message FreezeBalanceV2Contract {
+    bytes owner_address = 1;
+    int64 frozen_balance = 2;
+    ResourceCode resource = 3;
+}
+
 message UnfreezeBalanceContract {
     bytes owner_address = 1;
 
@@ -85,6 +99,31 @@ message UnfreezeBalanceContract {
     bytes receiver_address = 15;
 }
 
+message UnfreezeBalanceV2Contract {
+    bytes owner_address = 1;
+    int64 unfreeze_balance = 2;
+    ResourceCode resource = 3;
+}
+
+message WithdrawExpireUnfreezeContract {
+    bytes owner_address = 1;
+}
+
+message DelegateResourceContract {
+    bytes owner_address = 1;
+    ResourceCode resource = 2;
+    int64 balance = 3;
+    bytes receiver_address = 4;
+    bool  lock = 5;
+}
+
+message UnDelegateResourceContract {
+    bytes owner_address = 1;
+    ResourceCode resource = 2;
+    int64 balance = 3;
+    bytes receiver_address = 4;
+}
+
 message UnfreezeAssetContract {
     bytes owner_address = 1;
 }
@@ -117,4 +156,4 @@ message TriggerSmartContract {
     bytes data = 4;
     int64 call_token_value = 5;
     int64 token_id = 6;
-}
\ No newline at end of file
+}
diff --git a/src/Tron/Serialization.cpp b/src/Tron/Serialization.cpp
index 36bfe251f69..989cac01ca2 100644
--- a/src/Tron/Serialization.cpp
+++ b/src/Tron/Serialization.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Serialization.h"
 #include "../HexCoding.h"
@@ -93,6 +91,14 @@ json valueJSON(const protocol::FreezeBalanceContract& contract) {
     return valueJSON;
 }
 
+json valueJSON(const protocol::FreezeBalanceV2Contract& contract) {
+    json valueJSON;
+    valueJSON["owner_address"] = hex(contract.owner_address());
+    valueJSON["frozen_balance"] = contract.frozen_balance();
+    valueJSON["resource"] = protocol::ResourceCode_Name(contract.resource());
+    return valueJSON;
+}
+
 json valueJSON(const protocol::UnfreezeBalanceContract& contract) {
     json valueJSON;
     valueJSON["owner_address"] = hex(contract.owner_address());
@@ -102,6 +108,40 @@ json valueJSON(const protocol::UnfreezeBalanceContract& contract) {
     return valueJSON;
 }
 
+json valueJSON(const protocol::UnfreezeBalanceV2Contract& contract) {
+    json valueJSON;
+    valueJSON["owner_address"] = hex(contract.owner_address());
+    valueJSON["resource"] = protocol::ResourceCode_Name(contract.resource());
+    valueJSON["unfreeze_balance"] = contract.unfreeze_balance();
+
+    return valueJSON;
+}
+
+json valueJSON(const protocol::DelegateResourceContract& contract) {
+    json valueJSON;
+    valueJSON["owner_address"] = hex(contract.owner_address());
+    valueJSON["receiver_address"] = hex(contract.receiver_address());
+    valueJSON["resource"] = protocol::ResourceCode_Name(contract.resource());
+    valueJSON["balance"] = contract.balance();
+    valueJSON["lock"] = contract.lock();
+    return valueJSON;
+}
+
+json valueJSON(const protocol::UnDelegateResourceContract& contract) {
+    json valueJSON;
+    valueJSON["owner_address"] = hex(contract.owner_address());
+    valueJSON["receiver_address"] = hex(contract.receiver_address());
+    valueJSON["resource"] = protocol::ResourceCode_Name(contract.resource());
+    valueJSON["balance"] = contract.balance();
+    return valueJSON;
+}
+
+json valueJSON(const protocol::WithdrawExpireUnfreezeContract& contract) {
+    json valueJSON;
+    valueJSON["owner_address"] = hex(contract.owner_address());
+    return valueJSON;
+}
+
 json valueJSON(const protocol::WithdrawBalanceContract& contract) {
     json valueJSON;
     valueJSON["owner_address"] = hex(contract.owner_address());
@@ -169,12 +209,42 @@ json parameterJSON(const google::protobuf::Any& parameter, const protocol::Trans
         paramJSON["value"] = valueJSON(contract);
         break;
     }
+    case protocol::Transaction::Contract::FreezeBalanceV2Contract: {
+        protocol::FreezeBalanceV2Contract contract;
+        parameter.UnpackTo(&contract);
+        paramJSON["value"] = valueJSON(contract);
+        break;
+    }
     case protocol::Transaction::Contract::UnfreezeBalanceContract: {
         protocol::UnfreezeBalanceContract contract;
         parameter.UnpackTo(&contract);
         paramJSON["value"] = valueJSON(contract);
         break;
     }
+    case protocol::Transaction::Contract::UnfreezeBalanceV2Contract: {
+        protocol::UnfreezeBalanceV2Contract contract;
+        parameter.UnpackTo(&contract);
+        paramJSON["value"] = valueJSON(contract);
+        break;
+    }
+    case protocol::Transaction::Contract::WithdrawExpireUnfreezeContract: {
+        protocol::WithdrawExpireUnfreezeContract contract;
+        parameter.UnpackTo(&contract);
+        paramJSON["value"] = valueJSON(contract);
+        break;
+    }
+    case protocol::Transaction::Contract::DelegateResourceContract: {
+        protocol::DelegateResourceContract contract;
+        parameter.UnpackTo(&contract);
+        paramJSON["value"] = valueJSON(contract);
+        break;
+    }
+    case protocol::Transaction::Contract::UnDelegateResourceContract: {
+        protocol::UnDelegateResourceContract contract;
+        parameter.UnpackTo(&contract);
+        paramJSON["value"] = valueJSON(contract);
+        break;
+    }
     case protocol::Transaction::Contract::WithdrawBalanceContract: {
         protocol::WithdrawBalanceContract contract;
         parameter.UnpackTo(&contract);
@@ -221,6 +291,9 @@ json raw_dataJSON(const protocol::Transaction::raw& raw) {
     }
     raw_dataJSON["timestamp"] = raw.timestamp();
     raw_dataJSON["expiration"] = raw.expiration();
+    if (!raw.data().empty()) {
+        raw_dataJSON["data"] = hex(raw.data());
+    }
     raw_dataJSON["contract"] = json::array({contractJSON(raw.contract(0))});
 
     return raw_dataJSON;
diff --git a/src/Tron/Serialization.h b/src/Tron/Serialization.h
index 7f3c074cfd5..cb807524fcd 100644
--- a/src/Tron/Serialization.h
+++ b/src/Tron/Serialization.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Tron/Signer.cpp b/src/Tron/Signer.cpp
index 87ed70b30f5..72e3783d079 100644
--- a/src/Tron/Signer.cpp
+++ b/src/Tron/Signer.cpp
@@ -1,20 +1,18 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 
 #include "Protobuf/TronInternal.pb.h"
 
+#include "Serialization.h"
 #include "../Base58.h"
 #include "../BinaryCoding.h"
 #include "../HexCoding.h"
-#include "Serialization.h"
 
-#include <chrono>
 #include <cassert>
+#include <chrono>
 
 namespace TW::Tron {
 
@@ -24,10 +22,10 @@ const std::string TRANSFER_TOKEN_FUNCTION = "0xa9059cbb";
 protocol::TransferContract to_internal(const Proto::TransferContract& transfer) {
     auto internal = protocol::TransferContract();
 
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(transfer.owner_address());
+    const auto ownerAddress = Base58::decodeCheck(transfer.owner_address());
     internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
 
-    const auto toAddress = Base58::bitcoin.decodeCheck(transfer.to_address());
+    const auto toAddress = Base58::decodeCheck(transfer.to_address());
     internal.set_to_address(toAddress.data(), toAddress.size());
 
     internal.set_amount(transfer.amount());
@@ -42,10 +40,10 @@ protocol::TransferAssetContract to_internal(const Proto::TransferAssetContract&
 
     internal.set_asset_name(transfer.asset_name());
 
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(transfer.owner_address());
+    const auto ownerAddress = Base58::decodeCheck(transfer.owner_address());
     internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
 
-    const auto toAddress = Base58::bitcoin.decodeCheck(transfer.to_address());
+    const auto toAddress = Base58::decodeCheck(transfer.to_address());
     internal.set_to_address(toAddress.data(), toAddress.size());
 
     internal.set_amount(transfer.amount());
@@ -56,8 +54,8 @@ protocol::TransferAssetContract to_internal(const Proto::TransferAssetContract&
 protocol::FreezeBalanceContract to_internal(const Proto::FreezeBalanceContract& freezeContract) {
     auto internal = protocol::FreezeBalanceContract();
     auto resource = protocol::ResourceCode();
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(freezeContract.owner_address());
-    const auto receiverAddress = Base58::bitcoin.decodeCheck(freezeContract.receiver_address());
+    const auto ownerAddress = Base58::decodeCheck(freezeContract.owner_address());
+    const auto receiverAddress = Base58::decodeCheck(freezeContract.receiver_address());
 
     protocol::ResourceCode_Parse(freezeContract.resource(), &resource);
 
@@ -70,24 +68,92 @@ protocol::FreezeBalanceContract to_internal(const Proto::FreezeBalanceContract&
     return internal;
 }
 
+protocol::FreezeBalanceV2Contract to_internal(const Proto::FreezeBalanceV2Contract& freezeContract) {
+    auto internal = protocol::FreezeBalanceV2Contract();
+    auto resource = protocol::ResourceCode();
+    const auto ownerAddress = Base58::decodeCheck(freezeContract.owner_address());
+
+    protocol::ResourceCode_Parse(freezeContract.resource(), &resource);
+
+    internal.set_resource(resource);
+    internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
+    internal.set_frozen_balance(freezeContract.frozen_balance());
+
+    return internal;
+}
+
 protocol::UnfreezeBalanceContract to_internal(const Proto::UnfreezeBalanceContract& unfreezeContract) {
     auto internal = protocol::UnfreezeBalanceContract();
     auto resource = protocol::ResourceCode();
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(unfreezeContract.owner_address());
-    const auto receiverAddress = Base58::bitcoin.decodeCheck(unfreezeContract.receiver_address());
+    const auto ownerAddress = Base58::decodeCheck(unfreezeContract.owner_address());
+    const auto receiverAddress = Base58::decodeCheck(unfreezeContract.receiver_address());
+
+    protocol::ResourceCode_Parse(unfreezeContract.resource(), &resource);
+
+    internal.set_resource(resource);
+    internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
+    internal.set_receiver_address(receiverAddress.data(), receiverAddress.size());
+
+    return internal;
+}
+
+protocol::UnfreezeBalanceV2Contract to_internal(const Proto::UnfreezeBalanceV2Contract& unfreezeContract) {
+    auto internal = protocol::UnfreezeBalanceV2Contract();
+    auto resource = protocol::ResourceCode();
+    const auto ownerAddress = Base58::decodeCheck(unfreezeContract.owner_address());
 
     protocol::ResourceCode_Parse(unfreezeContract.resource(), &resource);
 
+    internal.set_resource(resource);
+    internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
+    internal.set_unfreeze_balance(unfreezeContract.unfreeze_balance());
+
+    return internal;
+}
+
+protocol::DelegateResourceContract to_internal(const Proto::DelegateResourceContract& delegateContract) {
+    auto internal = protocol::DelegateResourceContract();
+    auto resource = protocol::ResourceCode();
+    const auto ownerAddress = Base58::decodeCheck(delegateContract.owner_address());
+    const auto receiverAddress = Base58::decodeCheck(delegateContract.receiver_address());
+
+    protocol::ResourceCode_Parse(delegateContract.resource(), &resource);
+
     internal.set_resource(resource);
     internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
     internal.set_receiver_address(receiverAddress.data(), receiverAddress.size());
+    internal.set_balance(delegateContract.balance());
+    internal.set_lock(delegateContract.lock());
+
+    return internal;
+}
+
+protocol::UnDelegateResourceContract to_internal(const Proto::UnDelegateResourceContract& undelegateContract) {
+    auto internal = protocol::UnDelegateResourceContract();
+    auto resource = protocol::ResourceCode();
+    const auto ownerAddress = Base58::decodeCheck(undelegateContract.owner_address());
+    const auto receiverAddress = Base58::decodeCheck(undelegateContract.receiver_address());
+
+    protocol::ResourceCode_Parse(undelegateContract.resource(), &resource);
+
+    internal.set_resource(resource);
+    internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
+    internal.set_receiver_address(receiverAddress.data(), receiverAddress.size());
+    internal.set_balance(undelegateContract.balance());
+
+    return internal;
+}
 
+protocol::WithdrawExpireUnfreezeContract to_internal(const Proto::WithdrawExpireUnfreezeContract& withdrawExpireUnfreezeContract) {
+    auto internal = protocol::WithdrawExpireUnfreezeContract();
+    const auto ownerAddress = Base58::decodeCheck(withdrawExpireUnfreezeContract.owner_address());
+    internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
     return internal;
 }
 
 protocol::UnfreezeAssetContract to_internal(const Proto::UnfreezeAssetContract& unfreezeContract) {
     auto internal = protocol::UnfreezeAssetContract();
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(unfreezeContract.owner_address());
+    const auto ownerAddress = Base58::decodeCheck(unfreezeContract.owner_address());
 
     internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
 
@@ -96,13 +162,13 @@ protocol::UnfreezeAssetContract to_internal(const Proto::UnfreezeAssetContract&
 
 protocol::VoteAssetContract to_internal(const Proto::VoteAssetContract& voteContract) {
     auto internal = protocol::VoteAssetContract();
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(voteContract.owner_address());
+    const auto ownerAddress = Base58::decodeCheck(voteContract.owner_address());
 
     internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
     internal.set_support(voteContract.support());
     internal.set_count(voteContract.count());
     for (int i = 0; i < voteContract.vote_address_size(); i++) {
-        auto voteAddress = Base58::bitcoin.decodeCheck(voteContract.vote_address(i));
+        auto voteAddress = Base58::decodeCheck(voteContract.vote_address(i));
         internal.add_vote_address(voteAddress.data(), voteAddress.size());
     }
 
@@ -111,12 +177,12 @@ protocol::VoteAssetContract to_internal(const Proto::VoteAssetContract& voteCont
 
 protocol::VoteWitnessContract to_internal(const Proto::VoteWitnessContract& voteContract) {
     auto internal = protocol::VoteWitnessContract();
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(voteContract.owner_address());
+    const auto ownerAddress = Base58::decodeCheck(voteContract.owner_address());
 
     internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
     internal.set_support(voteContract.support());
     for (int i = 0; i < voteContract.votes_size(); i++) {
-        auto voteAddress = Base58::bitcoin.decodeCheck(voteContract.votes(i).vote_address());
+        auto voteAddress = Base58::decodeCheck(voteContract.votes(i).vote_address());
         auto* vote = internal.add_votes();
 
         vote->set_vote_address(voteAddress.data(), voteAddress.size());
@@ -128,7 +194,7 @@ protocol::VoteWitnessContract to_internal(const Proto::VoteWitnessContract& vote
 
 protocol::WithdrawBalanceContract to_internal(const Proto::WithdrawBalanceContract& withdrawContract) {
     auto internal = protocol::WithdrawBalanceContract();
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(withdrawContract.owner_address());
+    const auto ownerAddress = Base58::decodeCheck(withdrawContract.owner_address());
 
     internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
 
@@ -137,8 +203,8 @@ protocol::WithdrawBalanceContract to_internal(const Proto::WithdrawBalanceContra
 
 protocol::TriggerSmartContract to_internal(const Proto::TriggerSmartContract& triggerSmartContract) {
     auto internal = protocol::TriggerSmartContract();
-    const auto ownerAddress = Base58::bitcoin.decodeCheck(triggerSmartContract.owner_address());
-    const auto contractAddress = Base58::bitcoin.decodeCheck(triggerSmartContract.contract_address());
+    const auto ownerAddress = Base58::decodeCheck(triggerSmartContract.owner_address());
+    const auto contractAddress = Base58::decodeCheck(triggerSmartContract.contract_address());
 
     internal.set_owner_address(ownerAddress.data(), ownerAddress.size());
     internal.set_contract_address(contractAddress.data(), contractAddress.size());
@@ -151,7 +217,7 @@ protocol::TriggerSmartContract to_internal(const Proto::TriggerSmartContract& tr
 }
 
 protocol::TriggerSmartContract to_internal(const Proto::TransferTRC20Contract& transferTrc20Contract) {
-    auto toAddress = Base58::bitcoin.decodeCheck(transferTrc20Contract.to_address());
+    auto toAddress = Base58::decodeCheck(transferTrc20Contract.to_address());
     // amount is 256 bits, big endian
     Data amount = data(transferTrc20Contract.amount());
 
@@ -201,12 +267,11 @@ void setBlockReference(const Proto::Transaction& transaction, protocol::Transact
     internal.mutable_raw_data()->set_ref_block_bytes(heightData.data() + heightData.size() - 2, 2);
 }
 
-Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
-    auto internal = protocol::Transaction();
-    auto output = Proto::SigningOutput();
+protocol::Transaction buildTransaction(const Proto::SigningInput& input) noexcept {
+    auto tx = protocol::Transaction();
 
     if (input.transaction().has_transfer()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_TransferContract);
 
         auto transfer = to_internal(input.transaction().transfer());
@@ -214,7 +279,7 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         any.PackFrom(transfer);
         *contract->mutable_parameter() = any;
     } else if (input.transaction().has_transfer_asset()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_TransferAssetContract);
 
         auto transfer = to_internal(input.transaction().transfer_asset());
@@ -222,23 +287,57 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         any.PackFrom(transfer);
         *contract->mutable_parameter() = any;
     } else if (input.transaction().has_freeze_balance()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_FreezeBalanceContract);
 
         auto freeze_balance = to_internal(input.transaction().freeze_balance());
         google::protobuf::Any any;
         any.PackFrom(freeze_balance);
         *contract->mutable_parameter() = any;
+    } else if (input.transaction().has_freeze_balance_v2()) {
+        auto* contract = tx.mutable_raw_data()->add_contract();
+        contract->set_type(protocol::Transaction_Contract_ContractType_FreezeBalanceV2Contract);
+        auto freeze_balance = to_internal(input.transaction().freeze_balance_v2());
+        google::protobuf::Any any;
+        any.PackFrom(freeze_balance);
+        *contract->mutable_parameter() = any;
     } else if (input.transaction().has_unfreeze_balance()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_UnfreezeBalanceContract);
-
         auto unfreeze_balance = to_internal(input.transaction().unfreeze_balance());
         google::protobuf::Any any;
         any.PackFrom(unfreeze_balance);
         *contract->mutable_parameter() = any;
+    } else if (input.transaction().has_unfreeze_balance_v2()) {
+        auto* contract = tx.mutable_raw_data()->add_contract();
+        contract->set_type(protocol::Transaction_Contract_ContractType_UnfreezeBalanceV2Contract);
+        auto unfreeze_balance = to_internal(input.transaction().unfreeze_balance_v2());
+        google::protobuf::Any any;
+        any.PackFrom(unfreeze_balance);
+        *contract->mutable_parameter() = any;
+    } else if (input.transaction().has_withdraw_expire_unfreeze()) {
+        auto* contract = tx.mutable_raw_data()->add_contract();
+        contract->set_type(protocol::Transaction_Contract_ContractType_WithdrawExpireUnfreezeContract);
+        auto withdraw_expire_unfreeze = to_internal(input.transaction().withdraw_expire_unfreeze());
+        google::protobuf::Any any;
+        any.PackFrom(withdraw_expire_unfreeze);
+        *contract->mutable_parameter() = any;
+    } else if (input.transaction().has_delegate_resource()) {
+        auto* contract = tx.mutable_raw_data()->add_contract();
+        contract->set_type(protocol::Transaction_Contract_ContractType_DelegateResourceContract);
+        auto delegate_resource = to_internal(input.transaction().delegate_resource());
+        google::protobuf::Any any;
+        any.PackFrom(delegate_resource);
+        *contract->mutable_parameter() = any;
+    } else if (input.transaction().has_undelegate_resource()) {
+        auto* contract = tx.mutable_raw_data()->add_contract();
+        contract->set_type(protocol::Transaction_Contract_ContractType_UnDelegateResourceContract);
+        auto undelegate_resource = to_internal(input.transaction().undelegate_resource());
+        google::protobuf::Any any;
+        any.PackFrom(undelegate_resource);
+        *contract->mutable_parameter() = any;
     } else if (input.transaction().has_unfreeze_asset()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_UnfreezeAssetContract);
 
         auto unfreeze_asset = to_internal(input.transaction().unfreeze_asset());
@@ -246,7 +345,7 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         any.PackFrom(unfreeze_asset);
         *contract->mutable_parameter() = any;
     } else if (input.transaction().has_vote_asset()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_VoteAssetContract);
 
         auto vote_asset = to_internal(input.transaction().vote_asset());
@@ -254,7 +353,7 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         any.PackFrom(vote_asset);
         *contract->mutable_parameter() = any;
     } else if (input.transaction().has_vote_witness()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_VoteWitnessContract);
 
         auto vote_witness = to_internal(input.transaction().vote_witness());
@@ -262,7 +361,7 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         any.PackFrom(vote_witness);
         *contract->mutable_parameter() = any;
     } else if (input.transaction().has_withdraw_balance()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_WithdrawBalanceContract);
 
         auto withdraw = to_internal(input.transaction().withdraw_balance());
@@ -270,7 +369,7 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         any.PackFrom(withdraw);
         *contract->mutable_parameter() = any;
     } else if (input.transaction().has_trigger_smart_contract()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_TriggerSmartContract);
 
         auto trigger_smart_contract = to_internal(input.transaction().trigger_smart_contract());
@@ -278,7 +377,7 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         any.PackFrom(trigger_smart_contract);
         *contract->mutable_parameter() = any;
     } else if (input.transaction().has_transfer_trc20_contract()) {
-        auto* contract = internal.mutable_raw_data()->add_contract();
+        auto contract = tx.mutable_raw_data()->add_contract();
         contract->set_type(protocol::Transaction_Contract_ContractType_TriggerSmartContract);
 
         auto trigger_smart_contract = to_internal(input.transaction().transfer_trc20_contract());
@@ -287,6 +386,42 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
         *contract->mutable_parameter() = any;
     }
 
+    if (!input.transaction().memo().empty()) {
+        tx.mutable_raw_data()->set_data(input.transaction().memo());
+    }
+
+    tx.mutable_raw_data()->set_timestamp(input.transaction().timestamp());
+    tx.mutable_raw_data()->set_expiration(input.transaction().expiration());
+    tx.mutable_raw_data()->set_fee_limit(input.transaction().fee_limit());
+    setBlockReference(input.transaction(), tx);
+
+    return tx;
+}
+
+Data serialize(const protocol::Transaction& tx) noexcept {
+    const auto serialized = tx.raw_data().SerializeAsString();
+    return Data(serialized.begin(), serialized.end());
+}
+
+Proto::SigningOutput signDirect(const Proto::SigningInput& input) {
+    const auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
+    auto hash = parse_hex(input.txid());
+    const auto signature = key.sign(hash, TWCurveSECP256k1);
+    auto output = Proto::SigningOutput();
+    output.set_signature(signature.data(), signature.size());
+    output.set_id(input.txid());
+    output.set_id(hash.data(), hash.size());
+    return output;
+}
+
+Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
+    if (!input.txid().empty()) {
+        return signDirect(input);
+    }
+
+    auto output = Proto::SigningOutput();
+    auto tx = buildTransaction(input);
+
     // Get default timestamp and expiration
     const uint64_t now = duration_cast<std::chrono::milliseconds>(
                              std::chrono::system_clock::now().time_since_epoch())
@@ -298,21 +433,18 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
                                     ? timestamp + 10 * 60 * 60 * 1000 // 10 hours
                                     : input.transaction().expiration();
 
-    internal.mutable_raw_data()->set_timestamp(timestamp);
-    internal.mutable_raw_data()->set_expiration(expiration);
-    internal.mutable_raw_data()->set_fee_limit(input.transaction().fee_limit());
-    setBlockReference(input.transaction(), internal);
+    tx.mutable_raw_data()->set_timestamp(timestamp);
+    tx.mutable_raw_data()->set_expiration(expiration);
 
-    output.set_ref_block_bytes(internal.raw_data().ref_block_bytes());
-    output.set_ref_block_hash(internal.raw_data().ref_block_hash());
+    output.set_ref_block_bytes(tx.raw_data().ref_block_bytes());
+    output.set_ref_block_hash(tx.raw_data().ref_block_hash());
 
-    const auto serialized = internal.raw_data().SerializeAsString();
-    const auto hash = Hash::sha256(Data(serialized.begin(), serialized.end()));
+    const auto hash = Hash::sha256(serialize(tx));
 
     const auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
     const auto signature = key.sign(hash, TWCurveSECP256k1);
 
-    const auto json = transactionJSON(internal, hash, signature).dump();
+    const auto json = transactionJSON(tx, hash, signature).dump();
 
     output.set_id(hash.data(), hash.size());
     output.set_signature(signature.data(), signature.size());
@@ -321,4 +453,22 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     return output;
 }
 
+Proto::SigningOutput Signer::compile(const Data& signature) const {
+    Proto::SigningOutput output;
+    auto preImage = signaturePreimage();
+    auto hash = Hash::sha256(preImage);
+    auto transaction = buildTransaction(input);
+    const auto json = transactionJSON(transaction, hash, signature).dump();
+    output.set_json(json.data(), json.size());
+    output.set_ref_block_bytes(transaction.raw_data().ref_block_bytes());
+    output.set_ref_block_hash(transaction.raw_data().ref_block_hash());
+    output.set_id(hash.data(), hash.size());
+    output.set_signature(signature.data(), signature.size());
+    return output;
+}
+
+Data Signer::signaturePreimage() const {
+    return serialize(buildTransaction(input));
+}
+
 } // namespace TW::Tron
diff --git a/src/Tron/Signer.h b/src/Tron/Signer.h
index 33a06fff775..1d3063378af 100644
--- a/src/Tron/Signer.h
+++ b/src/Tron/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -15,10 +13,14 @@ namespace TW::Tron {
 /// Helper class that performs Tron transaction signing.
 class Signer {
   public:
+    Proto::SigningInput input;
     Signer() = delete;
-
+    /// Initializes a transaction signer.
+    explicit Signer(const Proto::SigningInput& input) : input(input) {}
     /// Signs the given transaction.
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
+    Proto::SigningOutput compile(const Data& signature) const;
+    Data signaturePreimage() const;
 };
 
 } // namespace TW::Tron
diff --git a/src/VeChain/Clause.h b/src/VeChain/Clause.h
index 71d56d7d785..816647d49d5 100644
--- a/src/VeChain/Clause.h
+++ b/src/VeChain/Clause.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/VeChain/Entry.cpp b/src/VeChain/Entry.cpp
index 0a01f790321..312007e942a 100644
--- a/src/VeChain/Entry.cpp
+++ b/src/VeChain/Entry.cpp
@@ -1,18 +1,60 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
+#include <proto/TransactionCompiler.pb.h>
 
 #include "Ethereum/Address.h"
 #include "Signer.h"
 
 namespace TW::VeChain {
+
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Ethereum::Address::isValid(address);
+}
+
+std::string Entry::normalizeAddress([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    // normalized with EIP55 checksum
+    return Ethereum::Address(address).string();
+}
+
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Ethereum::Address(publicKey).string();
+}
+
+Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    const auto addr = Ethereum::Address(address);
+    return {addr.bytes.begin(), addr.bytes.end()};
+}
     
 void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto unsignedTxBytes = Signer::buildUnsignedTx(input);
+            auto imageHash = Hash::blake2b(unsignedTxBytes, 32);
+            output.set_data(unsignedTxBytes.data(), unsignedTxBytes.size());
+            output.set_data_hash(imageHash.data(), imageHash.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, [[maybe_unused]] const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() != 1) {
+                output.set_error(Common::Proto::Error_no_support_n2n);
+                output.set_error_message(Common::Proto::SigningError_Name(Common::Proto::Error_no_support_n2n));
+                return;
+            }
+
+            Data signedTx = Signer::buildSignedTx(input, signatures[0]);
+            output.set_encoded(signedTx.data(), signedTx.size());
+            output.set_signature(signatures[0].data(), signatures[0].size());
+        });
+}
+
 } // namespace TW::VeChain
diff --git a/src/VeChain/Entry.h b/src/VeChain/Entry.h
index 48ec8b5db78..c15d4896b03 100644
--- a/src/VeChain/Entry.h
+++ b/src/VeChain/Entry.h
@@ -1,21 +1,24 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
-#include "../CoinEntry.h"
-#include "Ethereum/Entry.h"
+#include "CoinEntry.h"
 
 namespace TW::VeChain {
 
 /// Entry point for VeChain.
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
-class Entry final : public Ethereum::Entry {
+class Entry final : public CoinEntry {
 public:
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const override;
+    std::string normalizeAddress(TWCoinType coin, const std::string& address) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    Data addressToData(TWCoinType coin, const std::string& address) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
 };
 
 } // namespace TW::VeChain
diff --git a/src/VeChain/Signer.cpp b/src/VeChain/Signer.cpp
index 7cbfd00d333..78ddc8a81e6 100644
--- a/src/VeChain/Signer.cpp
+++ b/src/VeChain/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 
@@ -43,4 +41,37 @@ Data Signer::sign(const PrivateKey& privateKey, Transaction& transaction) noexce
     return Data(signature.begin(), signature.end());
 }
 
+Data Signer::buildUnsignedTx(const Proto::SigningInput& input) noexcept {
+    auto transaction = Transaction();
+    transaction.chainTag = static_cast<uint8_t>(input.chain_tag());
+    transaction.blockRef = input.block_ref();
+    transaction.expiration = input.expiration();
+    for (auto& clause : input.clauses()) {
+        transaction.clauses.emplace_back(clause);
+    }
+    transaction.gasPriceCoef = static_cast<uint8_t>(input.gas_price_coef());
+    transaction.gas = input.gas();
+    transaction.dependsOn = Data(input.depends_on().begin(), input.depends_on().end());
+    transaction.nonce = input.nonce();
+
+    return transaction.encode();
+}
+
+Data Signer::buildSignedTx(const Proto::SigningInput& input, const Data& signature) noexcept {
+    auto transaction = Transaction();
+    transaction.chainTag = static_cast<uint8_t>(input.chain_tag());
+    transaction.blockRef = input.block_ref();
+    transaction.expiration = input.expiration();
+    for (auto& clause : input.clauses()) {
+        transaction.clauses.emplace_back(clause);
+    }
+    transaction.gasPriceCoef = static_cast<uint8_t>(input.gas_price_coef());
+    transaction.gas = input.gas();
+    transaction.dependsOn = Data(input.depends_on().begin(), input.depends_on().end());
+    transaction.nonce = input.nonce();
+    transaction.signature = signature;
+
+    return transaction.encode();
+}
+
 } // namespace TW::VeChain
diff --git a/src/VeChain/Signer.h b/src/VeChain/Signer.h
index f0a2a92d22b..aec2d1746b9 100644
--- a/src/VeChain/Signer.h
+++ b/src/VeChain/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -12,7 +10,6 @@
 #include "../Hash.h"
 #include "../PrivateKey.h"
 
-#include <boost/multiprecision/cpp_int.hpp>
 #include <cstdint>
 #include <tuple>
 #include <vector>
@@ -27,6 +24,10 @@ class Signer {
     /// Signs a Proto::SigningInput transaction
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
 
+    static Data buildUnsignedTx(const Proto::SigningInput& input) noexcept;
+
+    static Data buildSignedTx(const Proto::SigningInput& input, const Data& signature) noexcept;
+
     /// Signs the given transaction.
     static Data sign(const PrivateKey& privateKey, Transaction& transaction) noexcept;
 };
diff --git a/src/VeChain/Transaction.cpp b/src/VeChain/Transaction.cpp
index aeca93d352f..828d662f79e 100644
--- a/src/VeChain/Transaction.cpp
+++ b/src/VeChain/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 
@@ -12,38 +10,50 @@ namespace TW::VeChain {
 
 using RLP = Ethereum::RLP;
 
-Data encode(const Clause& clause) noexcept {
-    auto encoded = Data();
-    append(encoded, RLP::encode(clause.to.bytes));
-    append(encoded, RLP::encode(clause.value));
-    append(encoded, RLP::encode(clause.data));
-    return RLP::encodeList(encoded);
+EthereumRlp::Proto::RlpItem prepareClause(const Clause& clause) noexcept {
+    auto value = store(clause.value);
+
+    EthereumRlp::Proto::RlpItem item;
+    auto* rlpList = item.mutable_list();
+
+    rlpList->add_items()->set_data(clause.to.bytes.data(), clause.to.bytes.size());
+    rlpList->add_items()->set_number_u256(value.data(), value.size());
+    rlpList->add_items()->set_data(clause.data.data(), clause.data.size());
+
+    return item;
 }
 
-Data encodeClauses(std::vector<Clause> clauses) noexcept {
-    auto encoded = Data();
+EthereumRlp::Proto::RlpItem prepareClauses(const std::vector<Clause>& clauses) noexcept {
+    EthereumRlp::Proto::RlpItem item;
+
+    auto* rlpList = item.mutable_list();
     for (const auto& clause : clauses) {
-        auto encodedClause = encode(clause);
-        append(encoded, encodedClause);
+        *rlpList->add_items() = prepareClause(clause);
     }
-    return RLP::encodeList(encoded);
+
+    return item;
 }
 
 Data Transaction::encode() const noexcept {
-    auto encoded = Data();
-    append(encoded, RLP::encode(chainTag));
-    append(encoded, RLP::encode(blockRef));
-    append(encoded, RLP::encode(expiration));
-    append(encoded, encodeClauses(clauses));
-    append(encoded, RLP::encode(gasPriceCoef));
-    append(encoded, RLP::encode(gas));
-    append(encoded, RLP::encode(dependsOn));
-    append(encoded, RLP::encode(nonce));
-    append(encoded, RLP::encodeList(reserved));
+    EthereumRlp::Proto::EncodingInput input;
+    auto* rlpList = input.mutable_item()->mutable_list();
+
+    rlpList->add_items()->set_number_u64(chainTag);
+    rlpList->add_items()->set_number_u64(blockRef);
+    rlpList->add_items()->set_number_u64(expiration);
+    *rlpList->add_items() = prepareClauses(clauses);
+    rlpList->add_items()->set_number_u64(gasPriceCoef);
+    rlpList->add_items()->set_number_u64(gas);
+    rlpList->add_items()->set_data(dependsOn.data(), dependsOn.size());
+    rlpList->add_items()->set_number_u64(nonce);
+    // Put an empty list - reserved field for backward compatibility.
+    rlpList->add_items()->mutable_list();
+
     if (!signature.empty()) {
-        append(encoded, RLP::encode(signature));
+        rlpList->add_items()->set_data(signature.data(), signature.size());
     }
-    return RLP::encodeList(encoded);
+
+    return RLP::encode(input);
 }
 
 } // namespace TW::VeChain
diff --git a/src/VeChain/Transaction.h b/src/VeChain/Transaction.h
index c4229b795d3..3851ac2f7dc 100644
--- a/src/VeChain/Transaction.h
+++ b/src/VeChain/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Verge/Entry.cpp b/src/Verge/Entry.cpp
new file mode 100644
index 00000000000..fea63ca93f8
--- /dev/null
+++ b/src/Verge/Entry.cpp
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Entry.h"
+
+#include "Bitcoin/Address.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "Signer.h"
+
+using namespace std;
+
+namespace TW::Verge {
+
+// Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
+
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, const PrefixVariant& addressPrefix) const {
+    auto* base58Prefix = std::get_if<Base58Prefix>(&addressPrefix);
+    auto* hrp = std::get_if<Bech32Prefix>(&addressPrefix);
+    bool isValidBase58 = base58Prefix ? Bitcoin::Address::isValid(address) : false;
+    bool isValidHrp = hrp ? Bitcoin::SegwitAddress::isValid(address, *hrp) : false;
+    return isValidBase58 || isValidHrp;
+}
+
+string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    byte p2pkh = getFromPrefixPkhOrDefault(addressPrefix, coin);
+    const char* hrp = getFromPrefixHrpOrDefault(addressPrefix, coin);
+
+    switch (derivation) {
+    case TWDerivationBitcoinLegacy:
+    case TWDerivationDefault:
+        return Bitcoin::Address(publicKey, p2pkh).string();
+    default:
+        return TW::Bitcoin::SegwitAddress(publicKey, hrp).string();
+    }
+}
+
+TW::Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    const auto decoded = Bitcoin::SegwitAddress::decode(address);
+    if (!std::get<2>(decoded)) {
+        // check if it is a legacy address
+        if (Bitcoin::Address::isValid(address)) {
+            const auto addr = Bitcoin::Address(address);
+            return {addr.bytes.begin() + 1, addr.bytes.end()};
+        }
+        return {Data()};
+    }
+    return std::get<0>(decoded).witnessProgram;
+}
+
+void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
+    signTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
+}
+
+void Entry::plan([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
+    planTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
+}
+
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) { 
+            output = Signer::preImageHashes(input); 
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+
+            if (signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("signatures size and publickeys size not equal");
+                return;
+            }
+
+            HashPubkeyList externalSignatures;
+            auto n = signatures.size();
+            for (auto i = 0ul; i < n; ++i) {
+                externalSignatures.push_back(std::make_pair(signatures[i], publicKeys[i].bytes));
+            }
+
+            output = Signer::sign(input, externalSignatures);
+        });
+}
+
+} // namespace TW::Verge
diff --git a/src/Verge/Entry.h b/src/Verge/Entry.h
new file mode 100644
index 00000000000..f3bb033d560
--- /dev/null
+++ b/src/Verge/Entry.h
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../CoinEntry.h"
+
+namespace TW::Verge {
+
+/// Entry point for implementation of Verge coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final: public CoinEntry {
+public:
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    Data addressToData(TWCoinType coin, const std::string& address) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
+};
+
+} // namespace TW::Verge
diff --git a/src/Verge/Signer.cpp b/src/Verge/Signer.cpp
new file mode 100644
index 00000000000..72ce2ad9c43
--- /dev/null
+++ b/src/Verge/Signer.cpp
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Signer.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "Hash.h"
+#include "HexCoding.h"
+#include "Transaction.h"
+#include "TransactionBuilder.h"
+
+using namespace TW;
+namespace TW::Verge {
+
+TransactionPlan Signer::plan(const SigningInput& input) noexcept {
+    auto plan = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::plan(input);
+    return plan.proto();
+}
+
+SigningOutput Signer::sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs) noexcept {
+    SigningOutput output;
+    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::sign(input, false, optionalExternalSigs);
+    if (!result) {
+        output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
+    } else {
+        const auto& tx = result.payload();
+        *output.mutable_transaction() = tx.proto();
+
+        Data encoded;
+        tx.encode(encoded);
+        output.set_encoded(encoded.data(), encoded.size());
+
+        auto txHash = Hash::sha256d(encoded.data(), encoded.size());
+        std::reverse(txHash.begin(), txHash.end());
+        output.set_transaction_id(hex(txHash));
+    }
+    return output;
+}
+
+PreSigningOutput Signer::preImageHashes(const SigningInput& input) noexcept {
+    PreSigningOutput output;
+    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::preImageHashes(input);
+    if (!result) {
+        output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
+        return output;
+    }
+
+    auto hashList = result.payload();
+    auto* hashPubKeys = output.mutable_hash_public_keys();
+    for (auto& h : hashList) {
+        auto* hpk = hashPubKeys->Add();
+        hpk->set_data_hash(h.first.data(), h.first.size());
+        hpk->set_public_key_hash(h.second.data(), h.second.size());
+    }
+    return output;
+}
+
+} // namespace TW::Verge
diff --git a/src/Verge/Signer.h b/src/Verge/Signer.h
new file mode 100644
index 00000000000..659ab1a894b
--- /dev/null
+++ b/src/Verge/Signer.h
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../Data.h"
+#include "../proto/Bitcoin.pb.h"
+
+#include <vector>
+#include <optional>
+#include <utility>
+
+namespace TW::Verge {
+
+using SigningInput = Bitcoin::Proto::SigningInput;
+using SigningOutput = Bitcoin::Proto::SigningOutput;
+using TransactionPlan = Bitcoin::Proto::TransactionPlan;
+using PreSigningOutput = Bitcoin::Proto::PreSigningOutput;
+
+/// Helper class that performs Verge transaction signing.
+class Signer {
+public:
+    /// Hide default constructor
+    Signer() = delete;
+
+    /// Returns a transaction plan (utxo selection, fee estimation)
+    static TransactionPlan plan(const SigningInput& input) noexcept;
+
+    /// Signs a SigningInput transaction
+    static SigningOutput sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs = {}) noexcept;
+
+    /// Collect pre-image hashes to be signed
+    static PreSigningOutput preImageHashes(const SigningInput& input) noexcept;
+};
+
+} // namespace TW::Verge
diff --git a/src/Verge/Transaction.cpp b/src/Verge/Transaction.cpp
new file mode 100644
index 00000000000..e8469f7ba61
--- /dev/null
+++ b/src/Verge/Transaction.cpp
@@ -0,0 +1,178 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Transaction.h"
+#include "../BinaryCoding.h"
+#include "../Hash.h"
+#include "../Data.h"
+#include "../HexCoding.h"
+
+#include "../Bitcoin/SegwitAddress.h"
+#include "../Bitcoin/SigHashType.h"
+#include "../Bitcoin/SignatureVersion.h"
+
+#include <cassert>
+
+using namespace TW;
+namespace TW::Verge {
+
+Data Transaction::getPreImage(const Bitcoin::Script& scriptCode, size_t index,
+                              enum TWBitcoinSigHashType hashType, uint64_t amount) const {
+    assert(index < inputs.size());
+
+    Data data;
+
+    // Version
+    encode32LE(_version, data);
+
+    // Time
+    encode32LE(time, data);
+
+    // Input prevouts (none/all, depending on flags)
+    if ((hashType & TWBitcoinSigHashTypeAnyoneCanPay) == 0) {
+        auto hashPrevouts = getPrevoutHash();
+        std::copy(std::begin(hashPrevouts), std::end(hashPrevouts), std::back_inserter(data));
+    } else {
+        std::fill_n(back_inserter(data), 32, 0);
+    }
+
+    // Input nSequence (none/all, depending on flags)
+    if ((hashType & TWBitcoinSigHashTypeAnyoneCanPay) == 0 &&
+        !Bitcoin::hashTypeIsSingle(hashType) && !Bitcoin::hashTypeIsNone(hashType)) {
+        auto hashSequence = getSequenceHash();
+        std::copy(std::begin(hashSequence), std::end(hashSequence), std::back_inserter(data));
+    } else {
+        std::fill_n(back_inserter(data), 32, 0);
+    }
+
+    // The input being signed (replacing the scriptSig with scriptCode + amount)
+    // The prevout may already be contained in hashPrevout, and the nSequence
+    // may already be contain in hashSequence.
+    inputs[index].previousOutput.encode(data);
+    scriptCode.encode(data);
+
+    encode64LE(amount, data);
+    encode32LE(inputs[index].sequence, data);
+
+    // Outputs (none/one/all, depending on flags)
+    if (!Bitcoin::hashTypeIsSingle(hashType) && !Bitcoin::hashTypeIsNone(hashType)) {
+        auto hashOutputs = getOutputsHash();
+        copy(begin(hashOutputs), end(hashOutputs), back_inserter(data));
+    } else if (Bitcoin::hashTypeIsSingle(hashType) && index < outputs.size()) {
+        Data outputData;
+        outputs[index].encode(outputData);
+        auto hashOutputs = Hash::hash(hasher, outputData);
+        copy(begin(hashOutputs), end(hashOutputs), back_inserter(data));
+    } else {
+        fill_n(back_inserter(data), 32, 0);
+    }
+
+    // Locktime
+    encode32LE(lockTime, data);
+
+    // Sighash type
+    encode32LE(hashType, data);
+
+    return data;
+}
+
+void Transaction::encode(Data& data, enum SegwitFormatMode segwitFormat) const {
+    bool useWitnessFormat = true;
+    switch (segwitFormat) {
+        case NonSegwit: useWitnessFormat = false; break;
+        case IfHasWitness: useWitnessFormat = hasWitness(); break;
+        case Segwit: useWitnessFormat = true; break;
+    }
+
+    encode32LE(_version, data);
+
+    encode32LE(time, data);
+
+    if (useWitnessFormat) {
+        // Use extended format in case witnesses are to be serialized.
+        data.push_back(0); // marker
+        data.push_back(1); // flag
+    }
+
+    // txins
+    encodeVarInt(inputs.size(), data);
+    for (auto& input : inputs) {
+        input.encode(data);
+    }
+
+    // txouts
+    encodeVarInt(outputs.size(), data);
+    for (auto& output : outputs) {
+        output.encode(data);
+    }
+
+    if (useWitnessFormat) {
+        encodeWitness(data);
+    }
+
+    encode32LE(lockTime, data); // nLockTime
+}
+
+Data Transaction::getSignatureHash(const Bitcoin::Script& scriptCode, size_t index,
+                                   enum TWBitcoinSigHashType hashType, uint64_t amount,
+                                   enum Bitcoin::SignatureVersion version) const {
+    switch (version) {
+    case Bitcoin::BASE:
+        return getSignatureHashBase(scriptCode, index, hashType);
+    case Bitcoin::WITNESS_V0:
+        return getSignatureHashWitnessV0(scriptCode, index, hashType, amount);
+    }
+}
+
+/// Generates the signature hash for Witness version 0 scripts.
+Data Transaction::getSignatureHashWitnessV0(const Bitcoin::Script& scriptCode, size_t index,
+                                            enum TWBitcoinSigHashType hashType,
+                                            uint64_t amount) const {
+    auto preimage = getPreImage(scriptCode, index, hashType, amount);
+    auto hash = Hash::hash(hasher, preimage);
+    return hash;
+}
+
+/// Generates the signature hash for for scripts other than witness scripts.
+Data Transaction::getSignatureHashBase(const Bitcoin::Script& scriptCode, size_t index,
+                                       enum TWBitcoinSigHashType hashType) const {
+    assert(index < inputs.size());
+
+    Data data;
+
+    encode32LE(_version, data);
+
+    encode32LE(time, data);
+
+    auto serializedInputCount =
+        (hashType & TWBitcoinSigHashTypeAnyoneCanPay) != 0 ? 1 : inputs.size();
+    encodeVarInt(serializedInputCount, data);
+    for (auto subindex = 0ul; subindex < serializedInputCount; subindex += 1) {
+        serializeInput(subindex, scriptCode, index, hashType, data);
+    }
+
+    auto hashNone = Bitcoin::hashTypeIsNone(hashType);
+    auto hashSingle = Bitcoin::hashTypeIsSingle(hashType);
+    auto serializedOutputCount = hashNone ? 0 : (hashSingle ? index + 1 : outputs.size());
+    encodeVarInt(serializedOutputCount, data);
+    for (auto subindex = 0ul; subindex < serializedOutputCount; subindex += 1) {
+        if (hashSingle && subindex != index) {
+            auto output = Bitcoin::TransactionOutput(-1, {});
+            output.encode(data);
+        } else {
+            outputs[subindex].encode(data);
+        }
+    }
+
+    // Locktime
+    encode32LE(lockTime, data);
+
+    // Sighash type
+    encode32LE(hashType, data);
+
+    auto hash = Hash::hash(hasher, data);
+    return hash;
+}
+
+} // namespace TW::Verge
\ No newline at end of file
diff --git a/src/Verge/Transaction.h b/src/Verge/Transaction.h
new file mode 100644
index 00000000000..06097df9695
--- /dev/null
+++ b/src/Verge/Transaction.h
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include "../Bitcoin/Transaction.h"
+#include "../PrivateKey.h"
+#include "../Hash.h"
+#include "../Data.h"
+#include "../proto/Bitcoin.pb.h"
+
+#include "../Bitcoin/Script.h"
+#include "../Bitcoin/SignatureVersion.h"
+
+#include <vector>
+
+namespace TW::Verge {
+
+struct Transaction : public Bitcoin::Transaction {
+public:
+    /// Transaction time
+    uint32_t time = 0;
+
+public:
+    Transaction() = default;
+
+    Transaction(int32_t version, uint32_t time = 0, uint32_t lockTime = 0, TW::Hash::Hasher hasher = TW::Hash::HasherSha256d)
+        : Bitcoin::Transaction(version, lockTime, hasher)
+        , time(time) {}
+
+    /// Generates the signature pre-image.
+    Data getPreImage(const Bitcoin::Script& scriptCode, size_t index, enum TWBitcoinSigHashType hashType, uint64_t amount) const;
+
+    /// Encodes the transaction into the provided buffer.
+    void encode(Data& data, enum SegwitFormatMode segwitFormat) const;
+
+    /// Default one-parameter version, needed for templated usage.
+    void encode(Data& data) const { encode(data, SegwitFormatMode::IfHasWitness); }
+
+    /// Generates the signature hash for this transaction.
+    Data getSignatureHash(const Bitcoin::Script& scriptCode, size_t index, enum TWBitcoinSigHashType hashType,
+                          uint64_t amount, enum Bitcoin::SignatureVersion version) const;
+
+private:
+    /// Generates the signature hash for Witness version 0 scripts.
+    Data getSignatureHashWitnessV0(const Bitcoin::Script& scriptCode, size_t index,
+                                   enum TWBitcoinSigHashType hashType, uint64_t amount) const;
+
+    /// Generates the signature hash for for scripts other than witness scripts.
+    Data getSignatureHashBase(const Bitcoin::Script& scriptCode, size_t index,
+                              enum TWBitcoinSigHashType hashType) const;
+};
+
+} // namespace TW::Verge
diff --git a/src/Verge/TransactionBuilder.h b/src/Verge/TransactionBuilder.h
new file mode 100644
index 00000000000..a1532dea9ed
--- /dev/null
+++ b/src/Verge/TransactionBuilder.h
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Transaction.h"
+#include "../Bitcoin/TransactionBuilder.h"
+#include "../Bitcoin/TransactionPlan.h"
+#include "../proto/Bitcoin.pb.h"
+#include  "../HexCoding.h"
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <algorithm>
+
+namespace TW::Verge {
+
+struct TransactionBuilder {
+    /// Plans a transaction by selecting UTXOs and calculating fees.
+    static Bitcoin::TransactionPlan plan(const Bitcoin::SigningInput& input) {
+        return Bitcoin::TransactionBuilder::plan(input);
+    }
+
+    /// Builds a transaction by selecting UTXOs and calculating fees.
+    template <typename Transaction>
+    static Result<Transaction, Common::Proto::SigningError> build(const Bitcoin::TransactionPlan& plan,
+                             const Bitcoin::SigningInput& input) {
+        auto tx_result = Bitcoin::TransactionBuilder::build<Transaction>(plan, input);
+        if (!tx_result) { return Result<Transaction, Common::Proto::SigningError>::failure(tx_result.error()); }
+        Transaction tx = tx_result.payload();
+        
+        tx.time = input.time;
+        // if not set, always use latest time
+        if (tx.time == 0) {
+            tx.time = (uint32_t)std::time(nullptr);
+        }
+        return Result<Transaction, Common::Proto::SigningError>(tx);
+    }
+};
+
+} // namespace TW::Verge
diff --git a/src/Wasm.h b/src/Wasm.h
index afb9c67aa88..666c911d1e0 100644
--- a/src/Wasm.h
+++ b/src/Wasm.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #ifndef __USE_WASM
 #define __USE_WASM
diff --git a/src/Waves/Address.cpp b/src/Waves/Address.cpp
index 2f5ad758be7..39eeb09a8c6 100644
--- a/src/Waves/Address.cpp
+++ b/src/Waves/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
@@ -17,11 +15,6 @@
 
 namespace TW::Waves {
 
-template <typename T>
-Data Address::secureHash(const T &data) {
-    return Hash::keccak256(Hash::blake2b(data, 32));
-}
-
 bool Address::isValid(const Data& decoded) {
     if (decoded.size() != Address::size) {
         return false;
@@ -43,12 +36,12 @@ bool Address::isValid(const Data& decoded) {
 }
 
 bool Address::isValid(const std::string& string) {
-    const auto decoded = Base58::bitcoin.decode(string);
+    const auto decoded = Base58::decode(string);
     return isValid(decoded);
 }
 
 Address::Address(const std::string& string) {
-    const auto decoded = Base58::bitcoin.decode(string);
+    const auto decoded = Base58::decode(string);
     if (!isValid(string)) {
         throw std::invalid_argument("Invalid address key data");
     }
@@ -79,7 +72,7 @@ Address::Address(const PublicKey &publicKey) {
 }
 
 std::string Address::string() const {
-    return Base58::bitcoin.encode(bytes);
+    return Base58::encode(bytes);
 }
 
 } // namespace TW::Waves
diff --git a/src/Waves/Address.h b/src/Waves/Address.h
index fed1743c9de..bba6347681e 100644
--- a/src/Waves/Address.h
+++ b/src/Waves/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -24,7 +22,9 @@ class Address : public Base58Address<26> {
     static const signed char testnet = 'T';
 
     template <typename T>
-    static Data secureHash(const T &data);
+    static Data secureHash(const T &data) {
+        return Hash::keccak256(Hash::blake2b(data, 32));
+    }
 
     /// Determines whether a string makes a valid address.
     static bool isValid(const std::string& string);
diff --git a/src/Waves/BinaryCoding.h b/src/Waves/BinaryCoding.h
index 73e10278ab9..51e6b126c7d 100644
--- a/src/Waves/BinaryCoding.h
+++ b/src/Waves/BinaryCoding.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Waves/Entry.cpp b/src/Waves/Entry.cpp
index 9635e2d30cd..1b166e3fb41 100644
--- a/src/Waves/Entry.cpp
+++ b/src/Waves/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -15,11 +13,11 @@ namespace TW::Waves {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
diff --git a/src/Waves/Entry.h b/src/Waves/Entry.h
index ea114e04c45..ac78c44e3fa 100644
--- a/src/Waves/Entry.h
+++ b/src/Waves/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,8 +12,8 @@ namespace TW::Waves {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
      void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
 };
 
diff --git a/src/Waves/Signer.cpp b/src/Waves/Signer.cpp
index 93716de50d4..2d4d6955236 100644
--- a/src/Waves/Signer.cpp
+++ b/src/Waves/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 
diff --git a/src/Waves/Signer.h b/src/Waves/Signer.h
index f7504d61132..00cd23b0726 100644
--- a/src/Waves/Signer.h
+++ b/src/Waves/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Waves/Transaction.cpp b/src/Waves/Transaction.cpp
index 36ac5cb3447..6e676538fd4 100644
--- a/src/Waves/Transaction.cpp
+++ b/src/Waves/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 #include "BinaryCoding.h"
@@ -34,13 +32,13 @@ Data serializeTransfer(int64_t amount, std::string asset, int64_t fee, std::stri
         data.push_back(static_cast<uint8_t>(0));
     } else {
         data.push_back(static_cast<uint8_t>(1));
-        append(data, Base58::bitcoin.decode(asset));
+        append(data, Base58::decode(asset));
     }
     if (fee_asset == Transaction::WAVES) {
         data.push_back(static_cast<uint8_t>(0));
     } else {
         data.push_back(static_cast<uint8_t>(1));
-        append(data, Base58::bitcoin.decode(fee_asset));
+        append(data, Base58::decode(fee_asset));
     }
     encode64BE(timestamp, data);
     encode64BE(amount, data);
@@ -86,9 +84,9 @@ json jsonTransfer(const Data& signature, int64_t amount, const std::string& asse
     jsonTx["type"] = TransactionType::transfer;
     jsonTx["version"] = TransactionVersion::V2;
     jsonTx["fee"] = fee;
-    jsonTx["senderPublicKey"] = Base58::bitcoin.encode(pub_key);
+    jsonTx["senderPublicKey"] = Base58::encode(pub_key);
     jsonTx["timestamp"] = timestamp;
-    jsonTx["proofs"] = json::array({Base58::bitcoin.encode(signature)});
+    jsonTx["proofs"] = json::array({Base58::encode(signature)});
     jsonTx["recipient"] = Address(to).string();
     if (asset != Transaction::WAVES) {
         jsonTx["assetId"] = asset;
@@ -97,7 +95,7 @@ json jsonTransfer(const Data& signature, int64_t amount, const std::string& asse
         jsonTx["feeAssetId"] = fee_asset;
     }
     jsonTx["amount"] = amount;
-    jsonTx["attachment"] = Base58::bitcoin.encode(attachment);
+    jsonTx["attachment"] = Base58::encode(attachment);
 
     return jsonTx;
 }
@@ -108,9 +106,9 @@ json jsonLease(const Data& signature, int64_t amount, int64_t fee, Address to, i
     jsonTx["type"] = TransactionType::lease;
     jsonTx["version"] = TransactionVersion::V2;
     jsonTx["fee"] = fee;
-    jsonTx["senderPublicKey"] = Base58::bitcoin.encode(pub_key);
+    jsonTx["senderPublicKey"] = Base58::encode(pub_key);
     jsonTx["timestamp"] = timestamp;
-    jsonTx["proofs"] = json::array({Base58::bitcoin.encode(signature)});
+    jsonTx["proofs"] = json::array({Base58::encode(signature)});
     jsonTx["recipient"] = Address(to).string();
     jsonTx["amount"] = amount;
 
@@ -123,11 +121,11 @@ json jsonCancelLease(const Data& signature, const Data& leaseId, int64_t fee, in
     jsonTx["type"] = TransactionType::cancelLease;
     jsonTx["version"] = TransactionVersion::V2;
     jsonTx["fee"] = fee;
-    jsonTx["senderPublicKey"] = Base58::bitcoin.encode(pub_key);
-    jsonTx["leaseId"] = Base58::bitcoin.encode(leaseId);
+    jsonTx["senderPublicKey"] = Base58::encode(pub_key);
+    jsonTx["leaseId"] = Base58::encode(leaseId);
     jsonTx["chainId"] = 87; // mainnet
     jsonTx["timestamp"] = timestamp;
-    jsonTx["proofs"] = json::array({Base58::bitcoin.encode(signature)});
+    jsonTx["proofs"] = json::array({Base58::encode(signature)});
 
     return jsonTx;
 }
@@ -152,7 +150,7 @@ Data Transaction::serializeToSign() const {
         return serializeLease(message.amount(), message.fee(), Address(message.to()), input.timestamp(), pub_key);
     } else if (input.has_cancel_lease_message()) {
         auto message = input.cancel_lease_message();
-        auto leaseId = Base58::bitcoin.decode(message.lease_id());
+        auto leaseId = Base58::decode(message.lease_id());
         return serializeCancelLease(leaseId, message.fee(), input.timestamp(), pub_key);
     }
 
@@ -184,7 +182,7 @@ json Transaction::buildJson(const Data& signature) const {
             pub_key);
     } else if (input.has_cancel_lease_message()) {
         auto message = input.cancel_lease_message();
-        auto leaseId = Base58::bitcoin.decode(message.lease_id());
+        auto leaseId = Base58::decode(message.lease_id());
         return jsonCancelLease(
             signature,
             leaseId,
diff --git a/src/Waves/Transaction.h b/src/Waves/Transaction.h
index 539af362566..5f775df7faa 100644
--- a/src/Waves/Transaction.h
+++ b/src/Waves/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/WebAuthn.cpp b/src/WebAuthn.cpp
new file mode 100644
index 00000000000..780b0c0b4f8
--- /dev/null
+++ b/src/WebAuthn.cpp
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+
+#include "Cbor.h"
+#include "PublicKey.h"
+
+#include <utility>
+#include <algorithm>
+#include <optional>
+
+namespace TW::WebAuthn {
+
+// https://www.w3.org/TR/webauthn-2/#authenticator-data
+struct AuthData {
+    Data rpIdHash;
+    std::array<std::uint8_t, 1> flagsBuf;
+    struct {
+        bool up;
+        bool uv;
+        bool at;
+        bool ed;
+        std::uint8_t flagsInt;
+    } flags;
+    std::uint32_t counter;
+    Data counterBuf;
+    Data aaguid;
+    Data credID;
+    Data COSEPublicKey;
+};
+
+AuthData parseAuthData(const Data& buffer) {
+    AuthData authData;
+
+    authData.rpIdHash = subData(buffer, 0, 32);
+
+    auto it = buffer.begin() + 32;
+    authData.flagsBuf = { *it };
+    ++it;
+    std::uint8_t flagsInt = authData.flagsBuf[0];
+    authData.flags.up = !!(flagsInt & 0x01);
+    authData.flags.uv = !!(flagsInt & 0x04);
+    authData.flags.at = !!(flagsInt & 0x40);
+    authData.flags.ed = !!(flagsInt & 0x80);
+    authData.flags.flagsInt = flagsInt;
+
+    authData.counterBuf = Data(it, it + 4);
+    authData.counter = static_cast<std::uint32_t>((authData.counterBuf[0] << 24) |
+                                                  (authData.counterBuf[1] << 16) |
+                                                  (authData.counterBuf[2] << 8) |
+                                                  authData.counterBuf[3]);
+    it += 4;
+
+    if (authData.flags.at) {
+        authData.aaguid = Data(it, it + 16);
+        it += 16;
+
+        std::array<std::uint8_t, 2> credIDLenBuf = { *(it), *(it + 1) };
+        std::uint16_t credIDLen = static_cast<std::uint16_t>((credIDLenBuf[0] << 8) |
+                                                             credIDLenBuf[1]);
+        it += 2;
+
+        authData.credID = Data(it, it + credIDLen);
+        it += credIDLen;
+
+        authData.COSEPublicKey = Data(it, buffer.end());
+    }
+
+    return authData;
+}
+
+auto findIntKey = [](const auto& map, const auto& key) {
+    return std::find_if(map.begin(), map.end(), [&](const auto& p) {
+        return p.first.dumpToString() == key;
+    });
+};
+
+auto findStringKey = [](const auto& map, const auto& key) {
+    return std::find_if(map.begin(), map.end(), [&](const auto& p) {
+        return p.first.getString() == key;
+    });
+};
+
+std::optional<PublicKey> getPublicKey(const Data& attestationObject) {
+    const Data authData = findStringKey(TW::Cbor::Decode(attestationObject).getMapElements(), "authData")->second.getBytes();
+    if (authData.empty()) {
+        return std::nullopt;
+    }
+
+    const AuthData authDataParsed = parseAuthData(authData);
+    const auto COSEPublicKey = TW::Cbor::Decode(authDataParsed.COSEPublicKey).getMapElements();
+
+    if (COSEPublicKey.empty()) {
+        return std::nullopt;
+    }
+
+    // https://www.w3.org/TR/webauthn-2/#sctn-encoded-credPubKey-examples
+    const std::string xKey = "-2";
+    const std::string yKey = "-3";
+
+    const auto x = findIntKey(COSEPublicKey, xKey);
+    const auto y = findIntKey(COSEPublicKey, yKey);
+
+    Data publicKey;
+    append(publicKey, 0x04);
+    append(publicKey, x->second.getBytes());
+    append(publicKey, y->second.getBytes());
+
+    return PublicKey(publicKey, TWPublicKeyTypeNIST256p1Extended);
+}
+
+Data reconstructSignedMessage(const Data& authenticatorData, const Data& clientDataJSON) {
+    const auto& clientHash = Hash::sha256(clientDataJSON);
+
+    Data message;
+    append(message, authenticatorData);
+    append(message, clientHash);
+
+    return Hash::sha256(message);
+}
+
+} // namespace TW::Webauthn
diff --git a/src/WebAuthn.h b/src/WebAuthn.h
new file mode 100644
index 00000000000..67291d97f91
--- /dev/null
+++ b/src/WebAuthn.h
@@ -0,0 +1,16 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Data.h"
+#include "PublicKey.h"
+#include <optional>
+
+namespace TW::WebAuthn {
+
+std::optional<PublicKey> getPublicKey(const Data& attestationObject);
+Data reconstructSignedMessage(const Data& authenticatorData, const Data& clientDataJSON);
+
+}
diff --git a/src/XRP/Address.cpp b/src/XRP/Address.cpp
index 2ff0026deba..6a24147050b 100644
--- a/src/XRP/Address.cpp
+++ b/src/XRP/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 #include "../Base58.h"
@@ -11,7 +9,7 @@
 namespace TW::Ripple {
 
 bool Address::isValid(const std::string& string) {
-    const auto decoded = Base58::ripple.decodeCheck(string);
+    const auto decoded = Base58::decodeCheck(string, Rust::Base58Alphabet::Ripple);
     if (decoded.size() != Address::size) {
         return false;
     }
@@ -19,7 +17,7 @@ bool Address::isValid(const std::string& string) {
 }
 
 Address::Address(const std::string& string) {
-    const auto decoded = Base58::ripple.decodeCheck(string);
+    const auto decoded = Base58::decodeCheck(string, Rust::Base58Alphabet::Ripple);
     if (decoded.size() != Address::size) {
         throw std::invalid_argument("Invalid address string");
     }
@@ -33,7 +31,7 @@ Address::Address(const PublicKey& publicKey) {
 }
 
 std::string Address::string() const {
-    return Base58::ripple.encodeCheck(bytes);
+    return Base58::encodeCheck(bytes, Rust::Base58Alphabet::Ripple);
 }
 
 } // namespace TW::Ripple
diff --git a/src/XRP/Address.h b/src/XRP/Address.h
index ffa8acbec2d..c03f3a0a746 100644
--- a/src/XRP/Address.h
+++ b/src/XRP/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/XRP/BinaryCoding.h b/src/XRP/BinaryCoding.h
index d606116d6c2..ef1cb8d1cce 100644
--- a/src/XRP/BinaryCoding.h
+++ b/src/XRP/BinaryCoding.h
@@ -1,14 +1,13 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
 #include <cstddef>
 #include <cstdint>
 #include <vector>
+#include "Data.h"
 
 namespace TW::Ripple {
 
@@ -17,11 +16,20 @@ enum class FieldType;
 /// Encodes a field type.
 inline void encodeType(FieldType type, int key, std::vector<uint8_t>& data) {
     const auto typeValue = static_cast<int>(type);
-    if (key <= 0xf) {
-        data.push_back(static_cast<uint8_t>((typeValue << 4) | key));
+    if (typeValue <= 0xf) {
+        if (key <= 0xf) {
+            data.emplace_back(static_cast<uint8_t>((typeValue << 4) | key));
+        } else {
+            data.emplace_back(static_cast<uint8_t>(typeValue << 4));
+            data.emplace_back(static_cast<uint8_t>(key));
+        }
+    } else if (key <= 0xf) {
+        data.emplace_back(static_cast<uint8_t>(key));
+        data.emplace_back(static_cast<uint8_t>(typeValue));
     } else {
-        data.push_back(static_cast<uint8_t>(typeValue << 4));
-        data.push_back(static_cast<uint8_t>(key));
+        data.emplace_back(0);
+        data.emplace_back(static_cast<uint8_t>(typeValue));
+        data.emplace_back(static_cast<uint8_t>(key));
     }
 }
 
@@ -47,4 +55,8 @@ inline void encodeBytes(std::vector<uint8_t> bytes, std::vector<uint8_t>& data)
     data.insert(data.end(), bytes.begin(), bytes.end());
 }
 
+inline void encodeZeros(std::size_t len, std::vector<uint8_t>& data) {
+    append(data, Data(len));
+}
+
 } // namespace TW::Ripple
diff --git a/src/XRP/Entry.cpp b/src/XRP/Entry.cpp
index b28a843c670..ea7274ef24d 100644
--- a/src/XRP/Entry.cpp
+++ b/src/XRP/Entry.cpp
@@ -1,24 +1,23 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
 #include "Address.h"
 #include "XAddress.h"
 #include "Signer.h"
+#include "../proto/TransactionCompiler.pb.h"
 
 namespace TW::Ripple {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, TW::byte, TW::byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address) || XAddress::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
@@ -26,4 +25,25 @@ void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     signTemplate<Signer, Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Proto::SigningInput, TW::TxCompiler::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) {
+            auto signer = Signer(input);
+            auto preimage = signer.preImage();
+            output.set_data(preimage.data(), preimage.size());
+            auto hash = Hash::sha512(preimage);
+            auto preimageHash = Data(hash.begin(), hash.begin() + 32);
+            output.set_data_hash(preimageHash.data(), preimageHash.size());
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures,
+                    const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerSingleTemplate<Proto::SigningInput, Proto::SigningOutput>(
+        txInputData, signatures, publicKeys,
+        [](const auto& input, auto& output, const auto& signature, const auto& publicKey) {
+            auto signer = Signer(input);
+            output = signer.compile(signature, publicKey);
+        });
+}
 } // namespace TW::Ripple
diff --git a/src/XRP/Entry.h b/src/XRP/Entry.h
index 6736133286e..394550cdafe 100644
--- a/src/XRP/Entry.h
+++ b/src/XRP/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,9 +12,11 @@ namespace TW::Ripple {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;    
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Ripple
diff --git a/src/XRP/Signer.cpp b/src/XRP/Signer.cpp
index 52237c2fdba..0a8ff4ff0f2 100644
--- a/src/XRP/Signer.cpp
+++ b/src/XRP/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "../BinaryCoding.h"
@@ -10,29 +8,81 @@
 
 namespace TW::Ripple {
 
-static const int64_t fullyCanonical = 0x80000000;
 
 Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
     auto output = Proto::SigningOutput();
 
-    const int64_t tag = input.destination_tag();
-    if (tag > std::numeric_limits<uint32_t>::max() || tag < 0) {
-        output.set_error(Common::Proto::SigningError::Error_invalid_memo);
-        return output;
+    auto transaction =
+        Transaction(
+            input.fee(),
+            input.flags(),
+            input.sequence(),
+            input.last_ledger_sequence(),
+            Address(input.account()));
+    switch (input.operation_oneof_case()) {
+        case Proto::SigningInput::kOpPayment:
+            signPayment(input, output, transaction);
+            break;
+
+        case Proto::SigningInput::kOpEscrowCreate:
+            transaction.createEscrowCreate(
+                input.op_escrow_create().amount(),
+                input.op_escrow_create().destination(),
+                input.op_escrow_create().destination_tag(),
+                input.op_escrow_create().cancel_after(),
+                input.op_escrow_create().finish_after(),
+                input.op_escrow_create().condition());
+            break;
+
+        case Proto::SigningInput::kOpEscrowCancel:
+            transaction.createEscrowCancel(
+                input.op_escrow_cancel().owner(),
+                input.op_escrow_cancel().offer_sequence());
+            break;
+
+        case Proto::SigningInput::kOpEscrowFinish:
+            transaction.createEscrowFinish(
+                input.op_escrow_finish().owner(),
+                input.op_escrow_finish().offer_sequence(),
+                input.op_escrow_finish().condition(),
+                input.op_escrow_finish().fulfillment());
+            break;
+
+        case Proto::SigningInput::kOpNftokenBurn:
+            transaction.createNFTokenBurn(input.op_nftoken_burn().nftoken_id());
+            break;
+
+        case Proto::SigningInput::kOpNftokenCreateOffer:
+            transaction.createNFTokenCreateOffer(
+                input.op_nftoken_create_offer().nftoken_id(),
+                input.op_nftoken_create_offer().destination());
+            break;
+
+        case Proto::SigningInput::kOpNftokenAcceptOffer:
+            transaction.createNFTokenAcceptOffer(input.op_nftoken_accept_offer().sell_offer());
+            break;
+
+        case Proto::SigningInput::kOpNftokenCancelOffer:
+            signNfTokenCancelOffer(input, transaction);
+            break;
+
+        case Proto::SigningInput::kOpTrustSet:
+            transaction.createTrustSet(
+                input.op_trust_set().limit_amount().currency(),
+                input.op_trust_set().limit_amount().value(),
+                input.op_trust_set().limit_amount().issuer());
+            break;
+
+        default:
+            break;
     }
 
-    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
-    auto transaction = Transaction(
-        /* amount */ input.amount(),
-        /* fee */ input.fee(),
-        /* flags */ input.flags(),
-        /* sequence */ input.sequence(),
-        /* last_ledger_sequence */ input.last_ledger_sequence(),
-        /* account */ Address(input.account()),
-        /* destination */ input.destination(),
-        /* destination_tag*/ tag);
+    if (output.error()) {
+        return output;
+    }
 
     auto signer = Signer();
+    auto key = PrivateKey(Data(input.private_key().begin(), input.private_key().end()));
     signer.sign(key, transaction);
 
     auto encoded = transaction.serialize();
@@ -42,7 +92,6 @@ Proto::SigningOutput Signer::sign(const Proto::SigningInput& input) noexcept {
 
 void Signer::sign(const PrivateKey& privateKey, Transaction& transaction) const noexcept {
     /// See https://github.com/trezor/trezor-core/blob/master/src/apps/ripple/sign_tx.py#L59
-    transaction.flags |= fullyCanonical;
     transaction.pub_key = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1).bytes;
 
     auto unsignedTx = transaction.getPreImage();
@@ -52,4 +101,214 @@ void Signer::sign(const PrivateKey& privateKey, Transaction& transaction) const
     transaction.signature = privateKey.signAsDER(half);
 }
 
+TW::Data Signer::preImage() const {
+    auto output = Proto::SigningOutput();
+
+    auto transaction =
+        Transaction(
+            input.fee(),
+            input.flags(),
+            input.sequence(),
+            input.last_ledger_sequence(),
+            Address(input.account()));
+    switch (input.operation_oneof_case()) {
+        case Proto::SigningInput::kOpPayment:
+            signPayment(input, output, transaction);
+            break;
+
+        case Proto::SigningInput::kOpEscrowCreate:
+            transaction.createEscrowCreate(
+                input.op_escrow_create().amount(),
+                input.op_escrow_create().destination(),
+                input.op_escrow_create().destination_tag(),
+                input.op_escrow_create().cancel_after(),
+                input.op_escrow_create().finish_after(),
+                input.op_escrow_create().condition());
+            break;
+
+        case Proto::SigningInput::kOpEscrowCancel:
+            transaction.createEscrowCancel(
+                input.op_escrow_cancel().owner(),
+                input.op_escrow_cancel().offer_sequence());
+            break;
+
+        case Proto::SigningInput::kOpEscrowFinish:
+            transaction.createEscrowFinish(
+                input.op_escrow_finish().owner(),
+                input.op_escrow_finish().offer_sequence(),
+                input.op_escrow_finish().condition(),
+                input.op_escrow_finish().fulfillment());
+            break;
+
+        case Proto::SigningInput::kOpNftokenBurn:
+            transaction.createNFTokenBurn(input.op_nftoken_burn().nftoken_id());
+            break;
+
+        case Proto::SigningInput::kOpNftokenCreateOffer:
+            transaction.createNFTokenCreateOffer(
+                input.op_nftoken_create_offer().nftoken_id(),
+                input.op_nftoken_create_offer().destination());
+            break;
+
+        case Proto::SigningInput::kOpNftokenAcceptOffer:
+            transaction.createNFTokenAcceptOffer(input.op_nftoken_accept_offer().sell_offer());
+            break;
+
+        case Proto::SigningInput::kOpNftokenCancelOffer:
+            signNfTokenCancelOffer(input, transaction);
+            break;
+
+        case Proto::SigningInput::kOpTrustSet:
+            transaction.createTrustSet(
+                input.op_trust_set().limit_amount().currency(),
+                input.op_trust_set().limit_amount().value(),
+                input.op_trust_set().limit_amount().issuer());
+            break;
+
+        default:
+            break;
+    }
+
+    if (output.error()) {
+        return {};
+    }
+
+    auto publicKey = Data(input.public_key().begin(), input.public_key().end());
+    transaction.pub_key = publicKey;
+
+    auto unsignedTx = transaction.getPreImage();
+    return unsignedTx;
+}
+
+Proto::SigningOutput Signer::compile(const Data& signature, const PublicKey& publicKey) const {
+    auto output = Proto::SigningOutput();
+
+    auto transaction =
+        Transaction(
+            input.fee(),
+            input.flags(),
+            input.sequence(),
+            input.last_ledger_sequence(),
+            Address(input.account()));
+    switch (input.operation_oneof_case()) {
+        case Proto::SigningInput::kOpPayment:
+            signPayment(input, output, transaction);
+            break;
+
+        case Proto::SigningInput::kOpEscrowCreate:
+            transaction.createEscrowCreate(
+                input.op_escrow_create().amount(),
+                input.op_escrow_create().destination(),
+                input.op_escrow_create().destination_tag(),
+                input.op_escrow_create().cancel_after(),
+                input.op_escrow_create().finish_after(),
+                input.op_escrow_create().condition());
+            break;
+
+        case Proto::SigningInput::kOpEscrowCancel:
+            transaction.createEscrowCancel(
+                input.op_escrow_cancel().owner(),
+                input.op_escrow_cancel().offer_sequence());
+            break;
+
+        case Proto::SigningInput::kOpEscrowFinish:
+            transaction.createEscrowFinish(
+                input.op_escrow_finish().owner(),
+                input.op_escrow_finish().offer_sequence(),
+                input.op_escrow_finish().condition(),
+                input.op_escrow_finish().fulfillment());
+            break;
+
+        case Proto::SigningInput::kOpNftokenBurn:
+            transaction.createNFTokenBurn(input.op_nftoken_burn().nftoken_id());
+            break;
+
+        case Proto::SigningInput::kOpNftokenCreateOffer:
+            transaction.createNFTokenCreateOffer(
+                input.op_nftoken_create_offer().nftoken_id(),
+                input.op_nftoken_create_offer().destination());
+            break;
+
+        case Proto::SigningInput::kOpNftokenAcceptOffer:
+            transaction.createNFTokenAcceptOffer(input.op_nftoken_accept_offer().sell_offer());
+            break;
+
+        case Proto::SigningInput::kOpNftokenCancelOffer:
+            signNfTokenCancelOffer(input, transaction);
+            break;
+
+        case Proto::SigningInput::kOpTrustSet:
+            transaction.createTrustSet(
+                input.op_trust_set().limit_amount().currency(),
+                input.op_trust_set().limit_amount().value(),
+                input.op_trust_set().limit_amount().issuer());
+            break;
+
+        default:
+            break;
+    }
+
+    if (output.error()) {
+        return output;
+    }
+
+    auto pubKey = Data(input.public_key().begin(), input.public_key().end());
+    transaction.pub_key = pubKey;
+
+    auto unsignedTx = transaction.getPreImage();
+    auto hash = Hash::sha512(unsignedTx);
+    auto half = Data(hash.begin(), hash.begin() + 32);
+    if (!publicKey.verifyAsDER(signature, half)) {
+        output.set_error(Common::Proto::SigningError::Error_signing);
+        output.set_error_message("Signature verification failed");
+        return output;
+    }
+
+    transaction.signature = signature;
+
+    auto encoded = transaction.serialize();
+    output.set_encoded(encoded.data(), encoded.size());
+    return output;
+}
+
+void Signer::signPayment(const Proto::SigningInput& input,
+                         Proto::SigningOutput& output,
+                         Transaction& transaction) {
+    const int64_t tag = input.op_payment().destination_tag();
+    if (tag > std::numeric_limits<uint32_t>::max() || tag < 0) {
+        output.set_error(Common::Proto::SigningError::Error_invalid_memo);
+        return;
+    }
+
+    switch (input.op_payment().amount_oneof_case()) {
+        case Proto::OperationPayment::kAmount:
+            transaction.createXrpPayment(
+                input.op_payment().amount(),
+                input.op_payment().destination(),
+                tag);
+            break;
+
+        case Proto::OperationPayment::kCurrencyAmount:
+            transaction.createTokenPayment(
+                input.op_payment().currency_amount().currency(),
+                input.op_payment().currency_amount().value(),
+                input.op_payment().currency_amount().issuer(),
+                input.op_payment().destination(),
+                tag);
+            break;
+
+        default:
+            break;
+    }
+}
+
+void Signer::signNfTokenCancelOffer(const Proto::SigningInput& input, Transaction& transaction) noexcept {
+    std::vector<std::string> token_offers;
+    for (int i = 0; i < input.op_nftoken_cancel_offer().token_offers_size(); i++) {
+        token_offers.emplace_back(input.op_nftoken_cancel_offer().token_offers(i));
+    }
+
+    transaction.createNFTokenCancelOffer(token_offers);
+}
+
 } // namespace TW::Ripple
diff --git a/src/XRP/Signer.h b/src/XRP/Signer.h
index ab49851839b..4721280bf0e 100644
--- a/src/XRP/Signer.h
+++ b/src/XRP/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -16,11 +14,31 @@ namespace TW::Ripple {
 /// Helper class that performs Ripple transaction signing.
 class Signer {
   public:
+    Proto::SigningInput input;
+
+    Signer() = default;
+
+    /// Initializes a transaction signer.
+    explicit Signer(const Proto::SigningInput& input) : input(input) {}
+
     /// Signs a Proto::SigningInput transaction
     static Proto::SigningOutput sign(const Proto::SigningInput& input) noexcept;
 
     /// Signs the given transaction.
     void sign(const PrivateKey& privateKey, Transaction& transaction) const noexcept;
+
+    /// preImage returns the transaction pre-image without hashing.
+    TW::Data preImage() const;
+
+    /// compile returns the final serialized signed transaction.
+    Proto::SigningOutput compile(const Data& signatures, const PublicKey& publicKeys) const;
+
+  private:
+    static void signPayment(const Proto::SigningInput& input,
+                     Proto::SigningOutput& output,
+                     Transaction& transaction);
+
+    static void signNfTokenCancelOffer(const Proto::SigningInput& input, Transaction& transaction) noexcept;
 };
 
 } // namespace TW::Ripple
diff --git a/src/XRP/Transaction.cpp b/src/XRP/Transaction.cpp
index 00846a905c7..1ebf5d02732 100644
--- a/src/XRP/Transaction.cpp
+++ b/src/XRP/Transaction.cpp
@@ -1,63 +1,156 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "BinaryCoding.h"
 #include "Transaction.h"
 #include "../BinaryCoding.h"
 
 #include <algorithm>
+#include <cmath>
+#include <sstream>
+#include <string>
 
 namespace TW::Ripple {
 
 const int NETWORK_PREFIX = 0x53545800;
 
 Data Transaction::serialize() const {
+	// See https://xrpl.org/serialization.html
+
     auto data = Data();
-    /// field must be sorted by field type then by field name
+
+    /// fields must be sorted by field type code then by field code (key)
+    // https://xrpl.org/serialization.html#canonical-field-order
+
     /// "type"
     encodeType(FieldType::int16, 2, data);
-    encode16BE(uint16_t(TransactionType::payment), data);
+    encode16BE(uint16_t(transaction_type), data);
+
     /// "flags"
     encodeType(FieldType::int32, 2, data);
     encode32BE(static_cast<uint32_t>(flags), data);
+
     /// "sequence"
     encodeType(FieldType::int32, 4, data);
     encode32BE(sequence, data);
+
     /// "destinationTag"
-    if (encode_tag) {
+    if (((transaction_type == TransactionType::payment) || 
+         (transaction_type == TransactionType::EscrowCreate)) && encode_tag) {
         encodeType(FieldType::int32, 14, data);
         encode32BE(static_cast<uint32_t>(destination_tag), data);
     }
+
+    /// "OfferSequence"
+    if ((transaction_type == TransactionType::EscrowCancel) || 
+        (transaction_type == TransactionType::EscrowFinish)) {
+        encodeType(FieldType::int32, 25, data);
+        encode32BE(offer_sequence, data);
+    }
+
     /// "lastLedgerSequence"
     if (last_ledger_sequence > 0) {
         encodeType(FieldType::int32, 27, data);
         encode32BE(last_ledger_sequence, data);
     }
+
+    /// "CancelAfter"
+    if ((transaction_type == TransactionType::EscrowCreate) && cancel_after > 0) {
+        encodeType(FieldType::int32, 36, data);
+        encode32BE(static_cast<uint32_t>(cancel_after), data);
+    }
+
+    /// "FinishAfter"
+    if ((transaction_type == TransactionType::EscrowCreate) && finish_after > 0) {
+        encodeType(FieldType::int32, 37, data);
+        encode32BE(static_cast<uint32_t>(finish_after), data);
+    }
+
+    /// "NFTokenId"
+    if ((transaction_type == TransactionType::NFTokenCreateOffer) ||
+        (transaction_type == TransactionType::NFTokenBurn)) {
+        encodeType(FieldType::hash256, 10, data);
+        data.insert(data.end(), nftoken_id.begin(), nftoken_id.end());
+    }
+
+    /// "NFTokenAcceptOffer"
+    if (transaction_type == TransactionType::NFTokenAcceptOffer) {
+        encodeType(FieldType::hash256, 29, data);
+        data.insert(data.end(), sell_offer.begin(), sell_offer.end());
+    }
+
     /// "amount"
-    encodeType(FieldType::amount, 1, data);
-    append(data, serializeAmount(amount));
+    if ((transaction_type == TransactionType::payment) ||
+        (transaction_type == TransactionType::NFTokenCreateOffer)) {
+        encodeType(FieldType::amount, 1, data);
+        append(data,
+               (currency_amount.currency.size() > 0) ?
+                 serializeCurrencyAmount(currency_amount) :
+                 serializeAmount(amount));
+    } else if (transaction_type == TransactionType::TrustSet) {
+        encodeType(FieldType::amount, 3, data);
+        append(data, serializeCurrencyAmount(limit_amount));
+    } else if (transaction_type == TransactionType::EscrowCreate) {
+        encodeType(FieldType::amount, 1, data);
+        append(data, serializeAmount(amount));
+    }
+
     /// "fee"
     encodeType(FieldType::amount, 8, data);
     append(data, serializeAmount(fee));
+
     /// "signingPubKey"
     if (!pub_key.empty()) {
         encodeType(FieldType::vl, 3, data);
         encodeBytes(pub_key, data);
     }
+
     /// "txnSignature"
     if (!signature.empty()) {
         encodeType(FieldType::vl, 4, data);
         encodeBytes(signature, data);
     }
+
+    /// "Fulfillment"
+    if ((transaction_type == TransactionType::EscrowFinish) && !fulfillment.empty()) {
+        encodeType(FieldType::vl, 16, data);
+        encodeBytes(fulfillment, data);
+    }
+
+    /// "Condition"
+    if (((transaction_type == TransactionType::EscrowCreate) ||
+         (transaction_type == TransactionType::EscrowFinish)) && !condition.empty()) {
+        encodeType(FieldType::vl, 17, data);
+        encodeBytes(condition, data);
+    }
+
     /// "account"
     encodeType(FieldType::account, 1, data);
     encodeBytes(serializeAddress(account), data);
+
     /// "destination"
-    encodeType(FieldType::account, 3, data);
-    encodeBytes(destination, data);
+    if ((transaction_type == TransactionType::payment) ||
+        (transaction_type == TransactionType::NFTokenCreateOffer) ||
+        (transaction_type == TransactionType::EscrowCreate)) {
+        encodeType(FieldType::account, 3, data);
+        encodeBytes(destination, data);
+    }
+
+    /// "Owner"
+    if ((transaction_type == TransactionType::EscrowCancel) ||
+        (transaction_type == TransactionType::EscrowFinish)) {
+        encodeType(FieldType::account, 2, data);
+        encodeBytes(owner, data);
+    }
+
+    /// "NFTokenOffers"
+    if (transaction_type == TransactionType::NFTokenCancelOffer) {
+        // only support one offer
+        encodeType(FieldType::vector256, 4, data);
+        encodeBytes(token_offers, data);
+    }
+
     return data;
 }
 
@@ -81,6 +174,104 @@ Data Transaction::serializeAmount(int64_t amount) {
     return data;
 }
 
+Data Transaction::serializeCurrencyAmount(const CurrencyAmount& currency_amount) {
+    // Calculate value
+    // https://xrpl.org/serialization.html#token-amount-format
+    int64_t sign = 0;
+    int64_t mantissa = 0;
+    int32_t exp = 0;
+    try {
+        int32_t num_after_dot = 0;
+        bool after_dot = false;
+        bool after_e = false;
+        bool has_exp = false;
+        std::ostringstream mantissa_oss, exp_oss;
+        for (auto i : currency_amount.value) {
+            if (i == '.') {
+                after_dot = true;
+            } else if (i == 'e') {
+                after_dot = false;
+                after_e = true;
+            } else if (after_e) {
+                has_exp = true;
+                exp_oss << i;
+            } else {
+                mantissa_oss << i;
+                if (after_dot) {
+                    num_after_dot++;
+                }
+            }
+        }
+
+        mantissa = std::stoll(mantissa_oss.str());
+        sign = (mantissa >= 0) ? 1 : 0;
+        mantissa = (mantissa < 0) ? (mantissa * -1) : mantissa;
+
+        exp = has_exp ? std::stoi(exp_oss.str()) : 0;
+        exp -= num_after_dot;
+    } catch (const std::exception& e) {
+        return Data();
+    }
+
+    int64_t min_mantissa = (uint64_t)std::pow(10, 15);
+    int64_t max_mantissa = (uint64_t)std::pow(10, 16) - 1;
+    int32_t min_exp = -96;
+    int32_t max_exp = 80;
+
+    while ((mantissa < min_mantissa) && (exp > min_exp)) {
+        mantissa *= 10;
+        exp--;
+    }
+
+    while (mantissa > max_mantissa) {
+        if (exp >= max_exp) {
+            return Data();
+        }
+
+        mantissa /= 10;
+        exp++;
+    }
+
+    if (((exp < min_exp) || (mantissa < min_mantissa)) ||
+        ((exp > max_exp) || (mantissa > max_mantissa))) {
+        return Data();
+    }
+
+    typedef union {
+        uint64_t value;
+        struct {
+            uint64_t mantissa : 54;
+            uint64_t exp : 8;
+            uint64_t sign : 1;
+            uint64_t not_xrp : 1;
+        } parts;
+    } AmountCast;
+
+    AmountCast amount_cast;
+    amount_cast.parts.mantissa = mantissa;
+    amount_cast.parts.exp = exp + 97;
+    amount_cast.parts.sign = sign;
+    amount_cast.parts.not_xrp = 1;
+
+    // Serialize fields
+	// https://xrpl.org/serialization.html#amount-fields
+    auto data = Data();
+    encode64BE(amount_cast.value, data);
+
+    // ISO-4217 currency code
+    encodeZeros(1, data); // type code (0x00)
+    encodeZeros(11, data); // reserved
+    if (currency_amount.currency.size() == 3) {
+        data.insert(data.end(), currency_amount.currency.begin(), currency_amount.currency.end());
+    } else {
+        encodeZeros(3, data); // none
+    }
+
+    encodeZeros(5, data); // reserved
+    data.insert(data.end(), currency_amount.issuer.begin(), currency_amount.issuer.end());
+    return data;
+}
+
 Data Transaction::serializeAddress(Address address) {
     auto data = Data(20);
     std::copy(&address.bytes[0] + 1, &address.bytes[0] + std::min(address.bytes.size(), size_t(21)), &data[0]);
diff --git a/src/XRP/Transaction.h b/src/XRP/Transaction.h
index a51f82eefab..ca453c47919 100644
--- a/src/XRP/Transaction.h
+++ b/src/XRP/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -10,25 +8,53 @@
 #include "XAddress.h"
 #include "Data.h"
 #include "../proto/Ripple.pb.h"
+#include "../HexCoding.h"
 
 namespace TW::Ripple {
 
+// See https://github.com/XRPLF/rippled/blob/master/src/ripple/protocol/SField.h#L57-L74
 enum class FieldType: int {
-    int16   = 1,
-    int32   = 2,
-    amount  = 6,
-    vl      = 7,
-    account = 8
+    int16     = 1,
+    int32     = 2,
+    hash256   = 5,
+    amount    = 6,
+    vl        = 7,
+    account   = 8,
+    vector256 = 19
 };
 
-enum class TransactionType { payment = 0 };
+// See https://github.com/XRPLF/xrpl.js/blob/main/packages/ripple-binary-codec/src/enums/definitions.json
+enum class TransactionType {
+    no_type = -1,
+    payment = 0,
+    EscrowCreate = 1,
+    EscrowFinish = 2,
+    EscrowCancel = 4,
+    TrustSet = 20,
+    NFTokenBurn = 26,
+    NFTokenCreateOffer = 27,
+    NFTokenCancelOffer = 28,
+    NFTokenAcceptOffer = 29
+};
+
+// See https://xrpl.org/nftokencreateoffer.html
+enum class NFTokenCreateOfferFlags: int64_t {
+    tfSellNFToken = 0x00000001
+};
 
 class Transaction {
-    /// We only support transaction types other than the Payment transaction.
-    /// Non-XRP currencies are not supported. Float and negative amounts are not supported.
+    /// Float and negative amounts are not supported.
     /// See https://github.com/trezor/trezor-core/tree/master/src/apps/ripple#transactions
   public:
+      struct CurrencyAmount {
+        Data currency;
+        Data value;
+        Data issuer;
+    };
+
     int64_t amount;
+    CurrencyAmount currency_amount;
+    CurrencyAmount limit_amount;
     int64_t fee;
     int64_t flags;
     int32_t sequence;
@@ -39,28 +65,113 @@ class Transaction {
     int64_t destination_tag;
     Data pub_key;
     Data signature;
+    int64_t cancel_after;
+    int64_t finish_after;
+    Data owner;
+    int32_t offer_sequence;
+    Data condition;
+    Data fulfillment;
+    Data nftoken_id;
+    Data sell_offer;
+    Data token_offers;
+    TransactionType transaction_type;
 
-    Transaction(int64_t amount, int64_t fee, int64_t flags, int32_t sequence,
-                int32_t last_ledger_sequence, Address account, const std::string& destination,
-                int64_t destination_tag)
-        : amount(amount)
+    Transaction(int64_t fee, int64_t flags, int32_t sequence, int32_t last_ledger_sequence, Address p_account)
+        : amount(0)
         , fee(fee)
         , flags(flags)
         , sequence(sequence)
         , last_ledger_sequence(last_ledger_sequence)
-        , account(account) {
-          try {
-            auto address = Address(destination);
-            encode_tag = destination_tag > 0;
-            this->destination_tag = destination_tag;
-            this->destination = Data(address.bytes.begin() + 1, address.bytes.end());
-          } catch(const std::exception& e) {
-            auto xAddress = XAddress(destination);
-            encode_tag = xAddress.flag != TagFlag::none;
-            this->destination_tag = xAddress.tag;
-            this->destination = Data(xAddress.bytes.begin(), xAddress.bytes.end());
-          }
+        , account(p_account)
+        , encode_tag(false)
+        , destination_tag(0)
+        , cancel_after(0)
+        , finish_after(0)
+        , offer_sequence(0)
+        , nftoken_id(0)
+        , sell_offer(0)
+        , token_offers(0)
+        , transaction_type(TransactionType::no_type) {}
+
+    void createXrpPayment(int64_t p_amount, const std::string& p_destination, int64_t p_destination_tag) {
+        transaction_type = TransactionType::payment;
+        amount = p_amount;
+        setDestination(p_destination, p_destination_tag);
+    }
+
+    void createTrustSet(const std::string& currency, const std::string& issuer) { 
+        // Use maximum amount
+        // https://xrpl.org/currency-formats.html
+        std::string value("9999999999999999e80");
+        createTrustSet(currency, value, issuer);
+    }
+
+    void createTrustSet(const std::string& currency, const std::string& value, const std::string& issuer) {
+        transaction_type = TransactionType::TrustSet;
+        setCurrencyAmount(limit_amount, currency, value, issuer);
+    }
+
+    void createTokenPayment(const std::string& currency, const std::string& value, const std::string& issuer,
+                            const std::string& p_destination, int64_t p_destination_tag) {
+        transaction_type = TransactionType::payment;
+        setDestination(p_destination, p_destination_tag);
+        setCurrencyAmount(currency_amount, currency, value, issuer);
+    }
+
+    void createEscrowCreate(int64_t amount, const std::string& destination, int64_t destination_tag,
+                            int64_t cancel_after, int64_t finish_after, const std::string& condition) {
+        transaction_type = TransactionType::EscrowCreate;
+        if (cancel_after == 0 && finish_after == 0) {
+            throw std::invalid_argument("Either CancelAfter or FinishAfter must be specified");
+        } else if (finish_after == 0 && condition.length() == 0) {
+            throw std::invalid_argument("Either Condition or FinishAfter must be specified");
         }
+        this->amount = amount;
+        setDestination(destination, destination_tag);
+        this->cancel_after = cancel_after;
+        this->finish_after = finish_after;
+        this->condition = parse_hex(condition);
+    }
+
+    void createEscrowCancel(const std::string& owner, int32_t offer_sequence) {
+        transaction_type = TransactionType::EscrowCancel;
+        setAccount(owner, this->owner);
+         this->offer_sequence = offer_sequence;
+    }
+
+    void createEscrowFinish(const std::string& owner, int32_t offer_sequence, 
+                            const std::string& condition, const std::string& fulfillment) {
+        transaction_type = TransactionType::EscrowFinish;
+        setAccount(owner, this->owner);
+        this->offer_sequence = offer_sequence;
+        this->condition = parse_hex(condition);
+        this->fulfillment = parse_hex(fulfillment);
+    }
+
+    void createNFTokenBurn(const std::string& p_nftoken_id) {
+        transaction_type = TransactionType::NFTokenBurn;
+        nftoken_id = parse_hex(p_nftoken_id);
+    }
+
+    void createNFTokenCreateOffer(const std::string& p_nftoken_id, const std::string& p_destination) {
+        transaction_type = TransactionType::NFTokenCreateOffer;
+        flags = int64_t(NFTokenCreateOfferFlags::tfSellNFToken);
+        nftoken_id = parse_hex(p_nftoken_id);
+        setAccount(p_destination, destination);
+    }
+
+    void createNFTokenAcceptOffer(const std::string& p_sell_offer) {
+        transaction_type = TransactionType::NFTokenAcceptOffer;
+        sell_offer = parse_hex(p_sell_offer);
+    }
+
+    void createNFTokenCancelOffer(const std::vector<std::string> p_token_offers) {
+        transaction_type = TransactionType::NFTokenCancelOffer;
+        for (auto i : p_token_offers) {
+            Data token_offer = parse_hex(i);
+            token_offers.insert(token_offers.end(), token_offer.begin(), token_offer.end());
+        }
+    }
 
   public:
     /// simplified serialization format tailored for Payment transaction type
@@ -69,7 +180,39 @@ class Transaction {
     Data getPreImage() const;
 
     static Data serializeAmount(int64_t amount);
+    static Data serializeCurrencyAmount(const CurrencyAmount& currency_amount);
     static Data serializeAddress(Address address);
+
+  private:
+    void setCurrencyAmount(CurrencyAmount& p_currency_amount, const std::string& currency, const std::string& value, const std::string& issuer) {
+        p_currency_amount.currency = Data(currency.begin(), currency.end());
+        p_currency_amount.value = Data(value.begin(), value.end());
+        setAccount(issuer, p_currency_amount.issuer);
+    }
+
+    void setDestination(const std::string& p_destination, int64_t p_destination_tag) {
+        try {
+            auto address = Address(p_destination);
+            encode_tag = p_destination_tag > 0;
+            destination_tag = p_destination_tag;
+            destination = Data(address.bytes.begin() + 1, address.bytes.end());
+        } catch(const std::exception& e) {
+            auto xAddress = XAddress(p_destination);
+            encode_tag = xAddress.flag != TagFlag::none;
+            destination_tag = xAddress.tag;
+            destination = Data(xAddress.bytes.begin(), xAddress.bytes.end());
+        }
+    }
+
+    void setAccount(const std::string& p_account, Data& data) {
+        try {
+            auto address = Address(p_account);
+            data = Data(address.bytes.begin() + 1, address.bytes.end());
+        } catch(const std::exception& e) {
+            auto xAddress = XAddress(p_account);
+            data = Data(xAddress.bytes.begin(), xAddress.bytes.end());
+        }
+    }
 };
 
 } // namespace TW::Ripple
diff --git a/src/XRP/XAddress.cpp b/src/XRP/XAddress.cpp
index 0eb5e6978f8..95bc26507b3 100644
--- a/src/XRP/XAddress.cpp
+++ b/src/XRP/XAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "XAddress.h"
 
@@ -15,7 +13,7 @@ namespace TW::Ripple {
 const Data prefixMainnet = {0x05, 0x44};
 
 bool XAddress::isValid(const std::string& string) {
-    const auto decoded = Base58::ripple.decodeCheck(string);
+    const auto decoded = Base58::decodeCheck(string, Rust::Base58Alphabet::Ripple);
     if (decoded.size() != XAddress::size) {
         return false;
     }
@@ -32,7 +30,7 @@ XAddress::XAddress(const std::string& string) {
     if (!XAddress::isValid(string)) {
         throw std::invalid_argument("Invalid address string");
     }
-    const auto decoded = Base58::ripple.decodeCheck(string);
+    const auto decoded = Base58::decodeCheck(string, Rust::Base58Alphabet::Ripple);
     std::copy(decoded.begin() + prefixMainnet.size(), decoded.begin() + prefixMainnet.size() + XAddress::keyHashSize, bytes.begin());
     if (decoded[22] == byte(TagFlag::classic)) {
         tag = decode32LE(Data(decoded.end() - 8, decoded.end() - 4).data());
@@ -57,7 +55,7 @@ std::string XAddress::string() const {
     append(result, byte(flag));
     encode32LE(tag, result);
     append(result, Data{0x00, 0x00, 0x00, 0x00});
-    return Base58::ripple.encodeCheck(result);
+    return Base58::encodeCheck(result, Rust::Base58Alphabet::Ripple);
 }
 
 } // namespace TW::Ripple
diff --git a/src/XRP/XAddress.h b/src/XRP/XAddress.h
index 75454734821..424baed0333 100644
--- a/src/XRP/XAddress.h
+++ b/src/XRP/XAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -20,7 +18,7 @@ class XAddress {
     /// Number of bytes in a X-address.
     static const size_t size = 31;
 
-    /// Publick key hash length.
+    /// Public key hash length.
     static const size_t keyHashSize = 20;
 
     /// Address data consisting of public key hash
diff --git a/src/Zcash/Entry.cpp b/src/Zcash/Entry.cpp
index ff5f1ac21ce..50a45f9f10d 100644
--- a/src/Zcash/Entry.cpp
+++ b/src/Zcash/Entry.cpp
@@ -1,25 +1,37 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
+#include "Bitcoin/Address.h"
 #include "Signer.h"
 #include "TAddress.h"
 
 namespace TW::Zcash {
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, [[maybe_unused]] const std::string& address, [[maybe_unused]] TW::byte p2pkh, [[maybe_unused]] TW::byte p2sh, [[maybe_unused]] const char* hrp) const {
+bool Entry::validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const {
+    if (coin == TWCoinTypeKomodo) {
+        auto* base58Prefix = std::get_if<Base58Prefix>(&addressPrefix);
+        return base58Prefix ? Bitcoin::Address::isValid(address, {{base58Prefix->p2pkh}, {base58Prefix->p2sh}}) : false;
+    }
     return TAddress::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, [[maybe_unused]] const char* hrp) const {
+std::string Entry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    byte p2pkh = getFromPrefixPkhOrDefault(addressPrefix, coin);
+    if (coin == TWCoinTypeKomodo) {
+        return Bitcoin::Address(publicKey, p2pkh).string();
+    }
     return TAddress(publicKey, p2pkh).string();
 }
 
-Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+Data Entry::addressToData(TWCoinType coin, const std::string& address) const {
+    if (coin == TWCoinTypeKomodo) {
+        const auto addr = Bitcoin::Address(address);
+        return {addr.bytes.begin() + 1, addr.bytes.end()};
+    }
+
     const auto addr = TAddress(address);
     return {addr.bytes.begin() + 2, addr.bytes.end()};
 }
@@ -32,4 +44,36 @@ void Entry::plan([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::D
     planTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
 }
 
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) { 
+            output = Signer::preImageHashes(input); 
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+
+            if (signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("signatures size and publickeys size not equal");
+                return;
+            }
+
+            HashPubkeyList externalSignatures;
+            auto n = signatures.size();
+            for (auto i = 0ul; i < n; ++i) {
+                externalSignatures.push_back(std::make_pair(signatures[i], publicKeys[i].bytes));
+            }
+
+            output = Signer::sign(input, externalSignatures);
+        });
+}
+
 } // namespace TW::Zcash
diff --git a/src/Zcash/Entry.h b/src/Zcash/Entry.h
index 626f8105131..2b43578fbaf 100644
--- a/src/Zcash/Entry.h
+++ b/src/Zcash/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,11 +12,14 @@ namespace TW::Zcash {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
-     Data addressToData(TWCoinType coin, const std::string& address) const;
-     void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
-     void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
+    Data addressToData(TWCoinType coin, const std::string& address) const;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const;
 };
 
 } // namespace TW::Zcash
diff --git a/src/Zcash/Signer.cpp b/src/Zcash/Signer.cpp
index 37db9183ee8..19099969c65 100644
--- a/src/Zcash/Signer.cpp
+++ b/src/Zcash/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Bitcoin/TransactionSigner.h"
@@ -18,11 +16,12 @@ TransactionPlan Signer::plan(const SigningInput& input) noexcept {
     return plan.proto();
 }
 
-SigningOutput Signer::sign(const SigningInput& input) noexcept {
+SigningOutput Signer::sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs) noexcept {
     SigningOutput output;
-    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::sign(input, false, optionalExternalSigs);
     if (!result) {
         output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
     } else {
         const auto& tx = result.payload();
         *output.mutable_transaction() = tx.proto();
@@ -38,4 +37,23 @@ SigningOutput Signer::sign(const SigningInput& input) noexcept {
     return output;
 }
 
+PreSigningOutput Signer::preImageHashes(const SigningInput& input) noexcept {
+    PreSigningOutput output;
+    auto result = Bitcoin::TransactionSigner<Transaction, TransactionBuilder>::preImageHashes(input);
+    if (!result) {
+        output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
+        return output;
+    }
+
+    auto hashList = result.payload();
+    auto* hashPubKeys = output.mutable_hash_public_keys();
+    for (auto& h : hashList) {
+        auto* hpk = hashPubKeys->Add();
+        hpk->set_data_hash(h.first.data(), h.first.size());
+        hpk->set_public_key_hash(h.second.data(), h.second.size());
+    }
+    return output;
+}
+
 } // namespace TW::Zcash
diff --git a/src/Zcash/Signer.h b/src/Zcash/Signer.h
index f331652764a..cc83b5dd897 100644
--- a/src/Zcash/Signer.h
+++ b/src/Zcash/Signer.h
@@ -1,17 +1,20 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
+
 #include "../proto/Bitcoin.pb.h"
+#include "Data.h"
+
+#include <optional>
 
 namespace TW::Zcash {
 
 using SigningInput = Bitcoin::Proto::SigningInput;
 using SigningOutput = Bitcoin::Proto::SigningOutput;
 using TransactionPlan = Bitcoin::Proto::TransactionPlan;
+using PreSigningOutput = Bitcoin::Proto::PreSigningOutput;
 
 class Signer {
   public:
@@ -20,8 +23,11 @@ class Signer {
     /// Returns a transaction plan (utxo selection, fee estimation)
     static TransactionPlan plan(const SigningInput& input) noexcept;
 
-    /// Signs a Proto::SigningInput transaction
-    static SigningOutput sign(const SigningInput& input) noexcept;
+    /// Signs a SigningInput transaction
+    static SigningOutput sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs = {}) noexcept;
+
+    /// Collect pre-image hashes to be signed
+    static PreSigningOutput preImageHashes(const SigningInput& input) noexcept;
 };
 
 } // namespace TW::Zcash
diff --git a/src/Zcash/TAddress.h b/src/Zcash/TAddress.h
index 3452746b13f..0cef48d16d7 100644
--- a/src/Zcash/TAddress.h
+++ b/src/Zcash/TAddress.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Zcash/Transaction.cpp b/src/Zcash/Transaction.cpp
index 291c3384370..a5432ac2a16 100644
--- a/src/Zcash/Transaction.cpp
+++ b/src/Zcash/Transaction.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Transaction.h"
 
@@ -96,7 +94,7 @@ Data Transaction::getPreImage(const Bitcoin::Script& scriptCode, size_t index, e
     // The input being signed (replacing the scriptSig with scriptCode + amount)
     // The prevout may already be contained in hashPrevout, and the nSequence
     // may already be contain in hashSequence.
-    reinterpret_cast<const Bitcoin::OutPoint&>(inputs[index].previousOutput).encode(data);
+    inputs[index].previousOutput.encode(data);
     scriptCode.encode(data);
 
     encode64LE(amount, data);
diff --git a/src/Zcash/Transaction.h b/src/Zcash/Transaction.h
index 4086f3ddbea..5c0dd6bd154 100644
--- a/src/Zcash/Transaction.h
+++ b/src/Zcash/Transaction.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Zcash/TransactionBuilder.h b/src/Zcash/TransactionBuilder.h
index 1c5cd9fde1e..d3940801658 100644
--- a/src/Zcash/TransactionBuilder.h
+++ b/src/Zcash/TransactionBuilder.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -11,6 +9,7 @@
 #include "../Bitcoin/TransactionPlan.h"
 #include "../proto/Bitcoin.pb.h"
 #include  "../HexCoding.h"
+#include "../Result.h"
 #include <TrustWalletCore/TWCoinType.h>
 
 #include <algorithm>
@@ -25,18 +24,18 @@ struct TransactionBuilder {
 
     /// Builds a transaction by selecting UTXOs and calculating fees.
     template <typename Transaction>
-    static Transaction build(const Bitcoin::TransactionPlan& plan, const std::string& toAddress,
-                             const std::string& changeAddress, enum TWCoinType coin, uint32_t lockTime) {
-        coin = TWCoinTypeZcash;
-        Transaction tx =
-            Bitcoin::TransactionBuilder::build<Transaction>(plan, toAddress, changeAddress, coin, lockTime);
+    static Result<Transaction, Common::Proto::SigningError> build(const Bitcoin::TransactionPlan& plan, const Bitcoin::SigningInput& input) {
+        auto tx_result =
+            Bitcoin::TransactionBuilder::build<Transaction>(plan, input);
+        if (!tx_result) { return Result<Transaction, Common::Proto::SigningError>::failure(tx_result.error()); }
+        Transaction tx = tx_result.payload();
         // if not set, always use latest consensus branch id
         if (plan.branchId.empty()) {
             std::copy(BlossomBranchID.begin(), BlossomBranchID.end(), tx.branchId.begin());
         } else {
             std::copy(plan.branchId.begin(), plan.branchId.end(), tx.branchId.begin());
         }
-        return tx;
+        return Result<Transaction, Common::Proto::SigningError>(tx);
     }
 };
 
diff --git a/src/Zen/Address.h b/src/Zen/Address.h
new file mode 100644
index 00000000000..b387c8c5c15
--- /dev/null
+++ b/src/Zen/Address.h
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../Base58Address.h"
+#include "../PublicKey.h"
+
+#include <array>
+#include <cstdint>
+#include <string>
+
+namespace TW::Zen {
+
+class Address : public TW::Base58Address<22> {
+public:
+    static const TW::byte staticPrefix = 0x20;
+    static const TW::byte p2pkh = 0x89; // p2pkhPrefix(TWCoinType::TWCoinTypeZcash);
+    static const TW::byte p2sh = 0x96;  // p2shPrefix(TWCoinType::TWCoinTypeZcash);
+
+    /// Determines whether a string makes a valid ZCash address.
+    static bool isValid(const std::string& string) {
+        return TW::Base58Address<size>::isValid(string,
+                                                {{staticPrefix, p2pkh}, {staticPrefix, p2sh}});
+    }
+
+    /// Determines whether a string makes a valid ZCash address, with possible prefixes.
+    static bool isValid(const std::string& string, const std::vector<Data>& validPrefixes) {
+        return TW::Base58Address<size>::isValid(string, validPrefixes);
+    }
+
+    /// Initializes an address with a string representation.
+    explicit Address(const std::string& string) : TW::Base58Address<size>(string) {}
+
+    /// Initializes an address with a collection of bytes.
+    explicit Address(const Data& data) : TW::Base58Address<size>(data) {}
+
+    /// Initializes a  address with a public key and a prefix (2nd byte).
+    Address(const PublicKey& publicKey, uint8_t prefix = p2pkh)
+        : TW::Base58Address<size>(publicKey, {staticPrefix, prefix}) {}
+
+private:
+    Address() = default;
+};
+
+} // namespace TW::Zen
diff --git a/src/Zen/Entry.cpp b/src/Zen/Entry.cpp
new file mode 100644
index 00000000000..09087ca4b20
--- /dev/null
+++ b/src/Zen/Entry.cpp
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Entry.h"
+
+#include "Address.h"
+#include "Signer.h"
+
+using namespace std;
+
+namespace TW::Zen {
+
+// Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const string& address, [[maybe_unused]] const PrefixVariant& addressPrefixp) const {
+    return Address::isValid(address);
+}
+
+string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
+    return Address(publicKey).string();
+}
+
+TW::Data Entry::addressToData([[maybe_unused]] TWCoinType coin, const std::string& address) const {
+    const auto addr = Address(address);
+    return {addr.bytes.begin() + 2, addr.bytes.end()};
+}
+
+void Entry::sign([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
+    signTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
+}
+
+void Entry::plan([[maybe_unused]] TWCoinType coin, const TW::Data& dataIn, TW::Data& dataOut) const {
+    planTemplate<Signer, Bitcoin::Proto::SigningInput>(dataIn, dataOut);
+}
+
+TW::Data Entry::preImageHashes([[maybe_unused]] TWCoinType coin, const Data& txInputData) const {
+    return txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::PreSigningOutput>(
+        txInputData, [](const auto& input, auto& output) { 
+            output = Signer::preImageHashes(input); 
+        });
+}
+
+void Entry::compile([[maybe_unused]] TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    dataOut = txCompilerTemplate<Bitcoin::Proto::SigningInput, Bitcoin::Proto::SigningOutput>(
+        txInputData, [&](const auto& input, auto& output) {
+            if (signatures.size() == 0 || publicKeys.size() == 0) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("empty signatures or publickeys");
+                return;
+            }
+
+            if (signatures.size() != publicKeys.size()) {
+                output.set_error(Common::Proto::Error_invalid_params);
+                output.set_error_message("signatures size and publickeys size not equal");
+                return;
+            }
+
+            HashPubkeyList externalSignatures;
+            auto n = signatures.size();
+            for (auto i = 0ul; i < n; ++i) {
+                externalSignatures.push_back(std::make_pair(signatures[i], publicKeys[i].bytes));
+            }
+
+            output = Signer::sign(input, externalSignatures);
+        });
+}
+
+} // namespace TW::Zen
diff --git a/src/Zen/Entry.h b/src/Zen/Entry.h
new file mode 100644
index 00000000000..5e89746c89d
--- /dev/null
+++ b/src/Zen/Entry.h
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../CoinEntry.h"
+
+namespace TW::Zen {
+
+/// Entry point for implementation of Zen coin.
+/// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
+class Entry final : public CoinEntry {
+public:
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefixp) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    Data addressToData(TWCoinType coin, const std::string& address) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+    void plan(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
+};
+
+} // namespace TW::Zen
diff --git a/src/Zen/Signer.cpp b/src/Zen/Signer.cpp
new file mode 100644
index 00000000000..405ec592248
--- /dev/null
+++ b/src/Zen/Signer.cpp
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Signer.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "Hash.h"
+#include "Bitcoin/Transaction.h"
+#include "TransactionBuilder.h"
+
+namespace TW::Zen {
+
+TransactionPlan Signer::plan(const SigningInput& input) noexcept {
+    auto plan = Bitcoin::TransactionSigner<Bitcoin::Transaction, TransactionBuilder>::plan(input);
+    return plan.proto();
+}
+
+SigningOutput Signer::sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs) noexcept {
+    SigningOutput output;
+    auto result = Bitcoin::TransactionSigner<Bitcoin::Transaction, TransactionBuilder>::sign(input, false, optionalExternalSigs);
+    if (!result) {
+        output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
+    } else {
+        const auto& tx = result.payload();
+        *output.mutable_transaction() = tx.proto();
+
+        Data encoded;
+        tx.encode(encoded);
+        output.set_encoded(encoded.data(), encoded.size());
+
+        auto txHash = Hash::sha256d(encoded.data(), encoded.size());
+        std::reverse(txHash.begin(), txHash.end());
+        output.set_transaction_id(hex(txHash));
+    }
+    return output;
+}
+
+PreSigningOutput Signer::preImageHashes(const SigningInput& input) noexcept {
+    PreSigningOutput output;
+    auto result = Bitcoin::TransactionSigner<Bitcoin::Transaction, TransactionBuilder>::preImageHashes(input);
+    if (!result) {
+        output.set_error(result.error());
+        output.set_error_message(Common::Proto::SigningError_Name(result.error()));
+        return output;
+    }
+
+    auto hashList = result.payload();
+    auto* hashPubKeys = output.mutable_hash_public_keys();
+    for (const auto& h : hashList) {
+        auto* hpk = hashPubKeys->Add();
+        hpk->set_data_hash(h.first.data(), h.first.size());
+        hpk->set_public_key_hash(h.second.data(), h.second.size());
+    }
+    return output;
+}
+
+} // namespace TW::Zen
diff --git a/src/Zen/Signer.h b/src/Zen/Signer.h
new file mode 100644
index 00000000000..2e4476e4e8e
--- /dev/null
+++ b/src/Zen/Signer.h
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "../Data.h"
+#include "../proto/Bitcoin.pb.h"
+
+#include <optional>
+
+namespace TW::Zen {
+
+using SigningInput = Bitcoin::Proto::SigningInput;
+using SigningOutput = Bitcoin::Proto::SigningOutput;
+using TransactionPlan = Bitcoin::Proto::TransactionPlan;
+using PreSigningOutput = Bitcoin::Proto::PreSigningOutput;
+
+/// Helper class that performs Zen transaction signing.
+class Signer {
+public:
+    /// Hide default constructor
+    Signer() = delete;
+
+    /// Returns a transaction plan (utxo selection, fee estimation)
+    static TransactionPlan plan(const SigningInput& input) noexcept;
+
+    /// Signs a SigningInput transaction
+    static SigningOutput sign(const SigningInput& input, std::optional<SignaturePubkeyList> optionalExternalSigs = {}) noexcept;
+
+    /// Collect pre-image hashes to be signed
+    static PreSigningOutput preImageHashes(const SigningInput& input) noexcept;
+};
+
+} // namespace TW::Zen
diff --git a/src/Zen/TransactionBuilder.h b/src/Zen/TransactionBuilder.h
new file mode 100644
index 00000000000..7abd9d51cec
--- /dev/null
+++ b/src/Zen/TransactionBuilder.h
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "Address.h"
+#include "../Bitcoin/Transaction.h"
+#include "../Bitcoin/TransactionBuilder.h"
+#include "../Bitcoin/TransactionPlan.h"
+#include "../Bitcoin/TransactionOutput.h"
+#include "../Coin.h"
+#include "../proto/Bitcoin.pb.h"
+#include  "../HexCoding.h"
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <algorithm>
+
+using namespace TW;
+
+namespace TW::Zen {
+
+struct TransactionBuilder {
+    /// Plans a transaction by selecting UTXOs and calculating fees.
+    static Bitcoin::TransactionPlan plan(const Bitcoin::SigningInput& input) {
+        return Bitcoin::TransactionBuilder::plan(input);
+    }
+
+    /// Builds a transaction with the selected input UTXOs, and one main output and an optional change output.
+    template <typename Transaction>
+    static Result<Transaction, Common::Proto::SigningError> build(const Bitcoin::TransactionPlan& plan, const Bitcoin::SigningInput& input) {
+        Transaction tx;
+        tx.lockTime = input.lockTime;
+
+        auto blockHash = plan.preBlockHash;
+        auto blockHeight = plan.preBlockHeight;
+
+        auto outputTo = prepareOutputWithScript(input.toAddress, plan.amount, input.coinType, blockHash, blockHeight);
+        if (!outputTo.has_value()) { 
+            return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_invalid_address);
+        }
+        tx.outputs.push_back(outputTo.value());
+
+        if (plan.change > 0) {
+            auto outputChange = prepareOutputWithScript(input.changeAddress, plan.change, input.coinType, blockHash, blockHeight);
+            if (!outputChange.has_value()) { 
+                return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_invalid_address);
+            }
+            tx.outputs.push_back(outputChange.value());
+        }
+
+        const auto emptyScript = Bitcoin::Script();
+        for (auto& utxo : plan.utxos) {
+            tx.inputs.emplace_back(utxo.outPoint, emptyScript, utxo.outPoint.sequence);
+        }
+
+        // Optional OP_RETURN output
+        if (!plan.outputOpReturn.empty()) {
+            auto lockingScriptOpReturn = Bitcoin::Script::buildOpReturnScript(plan.outputOpReturn);
+            if (lockingScriptOpReturn.bytes.empty()) {
+                return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_invalid_memo);
+            }
+
+            auto emplace_at = tx.outputs.end();
+            if (plan.outputOpReturnIndex.has_value()) {
+                emplace_at = tx.outputs.begin();
+                std::advance(emplace_at, plan.outputOpReturnIndex.value());
+            }
+            const int64_t amount = 0;
+            tx.outputs.emplace(emplace_at, amount, lockingScriptOpReturn);
+        }
+
+        // extra outputs (always in the end of the outputs list)
+        for (auto& o : input.extraOutputs) {
+            auto output = prepareOutputWithScript(o.first, o.second, input.coinType, blockHash, blockHeight);
+            if (!output.has_value()) { 
+                return Result<Transaction, Common::Proto::SigningError>::failure(Common::Proto::Error_invalid_address);
+            }
+            tx.outputs.push_back(output.value());
+        }
+
+        return Result<Transaction, Common::Proto::SigningError>(tx);
+    }
+
+    /// Prepares a TransactionOutput with given address and amount, prepares script for it
+    static std::optional<Bitcoin::TransactionOutput> prepareOutputWithScript(const std::string& addr, Bitcoin::Amount amount, enum TWCoinType coin, const Data& blockHash, int64_t blockHeight) {
+        auto lockingScript = Bitcoin::Script::lockScriptForAddress(addr, coin, blockHash, blockHeight);
+        if (lockingScript.empty()) {
+            return {};
+        }
+        return Bitcoin::TransactionOutput(amount, lockingScript);
+    }
+
+};
+
+} // namespace TW::Zen
diff --git a/src/Zilliqa/Address.cpp b/src/Zilliqa/Address.cpp
index af0d14ac1bd..8c0c2ab6d0d 100644
--- a/src/Zilliqa/Address.cpp
+++ b/src/Zilliqa/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
diff --git a/src/Zilliqa/Address.h b/src/Zilliqa/Address.h
index 8214e6aaebb..a46d6a934f3 100644
--- a/src/Zilliqa/Address.h
+++ b/src/Zilliqa/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Zilliqa/AddressChecksum.cpp b/src/Zilliqa/AddressChecksum.cpp
index bbd072f6268..60f65f8c61f 100644
--- a/src/Zilliqa/AddressChecksum.cpp
+++ b/src/Zilliqa/AddressChecksum.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "AddressChecksum.h"
 
diff --git a/src/Zilliqa/AddressChecksum.h b/src/Zilliqa/AddressChecksum.h
index a91665deda1..511ab562e16 100644
--- a/src/Zilliqa/AddressChecksum.h
+++ b/src/Zilliqa/AddressChecksum.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/Zilliqa/Entry.cpp b/src/Zilliqa/Entry.cpp
index 9ab22662f0d..246456d6bb5 100644
--- a/src/Zilliqa/Entry.cpp
+++ b/src/Zilliqa/Entry.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Entry.h"
 
@@ -13,11 +11,11 @@ namespace TW::Zilliqa {
 
 // Note: avoid business logic from here, rather just call into classes like Address, Signer, etc.
 
-bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, byte, byte, const char*) const {
+bool Entry::validateAddress([[maybe_unused]] TWCoinType coin, const std::string& address, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address::isValid(address);
 }
 
-std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, byte, const char*) const {
+std::string Entry::deriveAddress([[maybe_unused]] TWCoinType coin, const PublicKey& publicKey, [[maybe_unused]] TWDerivation derivation, [[maybe_unused]] const PrefixVariant& addressPrefix) const {
     return Address(publicKey).string();
 }
 
diff --git a/src/Zilliqa/Entry.h b/src/Zilliqa/Entry.h
index fa1335f5838..fed967de694 100644
--- a/src/Zilliqa/Entry.h
+++ b/src/Zilliqa/Entry.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -14,8 +12,8 @@ namespace TW::Zilliqa {
 /// Note: do not put the implementation here (no matter how simple), to avoid having coin-specific includes in this file
 class Entry final : public CoinEntry {
 public:
-     bool validateAddress(TWCoinType coin, const std::string& address, TW::byte p2pkh, TW::byte p2sh, const char* hrp) const;
-     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TW::byte p2pkh, const char* hrp) const;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const;
+     std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const;
      Data addressToData(TWCoinType coin, const std::string& address) const;
      void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const;
      bool supportsJSONSigning() const { return true; }
diff --git a/src/Zilliqa/Signer.cpp b/src/Zilliqa/Signer.cpp
index 521ffd5c556..cf2003ec4f7 100644
--- a/src/Zilliqa/Signer.cpp
+++ b/src/Zilliqa/Signer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Signer.h"
 #include "Address.h"
diff --git a/src/Zilliqa/Signer.h b/src/Zilliqa/Signer.h
index c1ce6f9cfe6..46eb12168f9 100644
--- a/src/Zilliqa/Signer.h
+++ b/src/Zilliqa/Signer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/algorithm/erase.h b/src/algorithm/erase.h
index a01fe425ce2..ed3a0bf9fd4 100644
--- a/src/algorithm/erase.h
+++ b/src/algorithm/erase.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/algorithm/sort_copy.h b/src/algorithm/sort_copy.h
index 0b4dfeefe05..eb1e7b3bf31 100644
--- a/src/algorithm/sort_copy.h
+++ b/src/algorithm/sort_copy.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/algorithm/string.hpp b/src/algorithm/string.hpp
new file mode 100644
index 00000000000..806b14b9899
--- /dev/null
+++ b/src/algorithm/string.hpp
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <sstream>
+#include <string>
+#include <vector>
+
+namespace TW {
+
+constexpr std::string_view kWitespaces = " \t\n\r\f\v";
+
+// trim from end of string (right)
+inline void trim_right(std::string& s, std::string_view t = kWitespaces)
+{
+    s.erase(s.find_last_not_of(t) + 1);
+}
+
+// trim from beginning of string (left)
+inline void trim_left(std::string& s, std::string_view t = kWitespaces)
+{
+    s.erase(0, s.find_first_not_of(t));
+}
+
+// trim from both ends of string (right then left)
+inline void trim(std::string& s, std::string_view t = kWitespaces)
+{
+    trim_left(s, t);
+    trim_right(s, t);
+}
+
+// trim from both ends of string (right then left)
+inline std::string trim_copy(std::string s, std::string_view t = kWitespaces) {
+    trim(s, t);
+    return s;
+}
+
+inline std::vector<std::string> ssplit(const std::string& input, char delimiter) {
+    std::istringstream iss(input);
+    std::vector<std::string> tokens;
+    std::string token;
+    while (std::getline(iss, token, delimiter)) {
+        if (!token.empty()) {
+            tokens.emplace_back(token);
+        }
+    }
+    return tokens;
+}
+
+} // namespace TW
diff --git a/src/algorithm/to_array.h b/src/algorithm/to_array.h
index 06f302cd7e1..b6588da79af 100644
--- a/src/algorithm/to_array.h
+++ b/src/algorithm/to_array.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/concepts/tw_concepts.h b/src/concepts/tw_concepts.h
new file mode 100644
index 00000000000..fd31b0e31da
--- /dev/null
+++ b/src/concepts/tw_concepts.h
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <type_traits>
+
+namespace TW {
+
+template <typename T>
+concept integral = std::is_integral_v<T>;
+
+template <typename T>
+concept floating_point = std::is_floating_point_v<T>;
+
+} // namespace TW
diff --git a/src/interface/TWAES.cpp b/src/interface/TWAES.cpp
index 04f86c8faed..7b63e735015 100644
--- a/src/interface/TWAES.cpp
+++ b/src/interface/TWAES.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWAES.h>
 
diff --git a/src/interface/TWAccount.cpp b/src/interface/TWAccount.cpp
index 73a624738c7..b29be55591d 100644
--- a/src/interface/TWAccount.cpp
+++ b/src/interface/TWAccount.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWAccount.h>
 
@@ -10,7 +8,8 @@
 
 using namespace TW;
 
-struct TWAccount* _Nonnull TWAccountCreate(TWString* _Nonnull address, enum TWCoinType coin,
+struct TWAccount* _Nonnull TWAccountCreate(TWString* _Nonnull address,
+                                           enum TWCoinType coin,
                                            enum TWDerivation derivation, 
                                            TWString* _Nonnull derivationPath,
                                            TWString* _Nonnull publicKey,
@@ -33,6 +32,10 @@ TWString* _Nonnull TWAccountAddress(struct TWAccount* _Nonnull account) {
     return TWStringCreateWithUTF8Bytes(account->impl.address.c_str());
 }
 
+enum TWCoinType TWAccountCoin(struct TWAccount* _Nonnull account) {
+    return account->impl.coin;
+}
+
 enum TWDerivation TWAccountDerivation(struct TWAccount* _Nonnull account) {
     return account->impl.derivation;
 }
@@ -48,7 +51,3 @@ TWString* _Nonnull TWAccountPublicKey(struct TWAccount* _Nonnull account) {
 TWString* _Nonnull TWAccountExtendedPublicKey(struct TWAccount* _Nonnull account) {
     return TWStringCreateWithUTF8Bytes(account->impl.extendedPublicKey.c_str());
 }
-
-enum TWCoinType TWAccountCoin(struct TWAccount* _Nonnull account) {
-    return account->impl.coin;
-}
diff --git a/src/interface/TWAnyAddress.cpp b/src/interface/TWAnyAddress.cpp
index 57594be3847..b91bb724f1d 100644
--- a/src/interface/TWAnyAddress.cpp
+++ b/src/interface/TWAnyAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWAnyAddress.h>
@@ -10,6 +8,7 @@
 
 #include "Data.h"
 #include "Coin.h"
+#include "CoinEntry.h"
 #include "AnyAddress.h"
 
 bool TWAnyAddressEqual(struct TWAnyAddress* _Nonnull lhs, struct TWAnyAddress* _Nonnull rhs) {
@@ -21,6 +20,17 @@ bool TWAnyAddressIsValid(TWString* _Nonnull string, enum TWCoinType coin) {
     return TW::validateAddress(coin, address);
 }
 
+bool TWAnyAddressIsValidSS58([[maybe_unused]] TWString* string, [[maybe_unused]] enum TWCoinType coin, [[maybe_unused]] uint32_t ss58Prefix) {
+    const auto& address = *reinterpret_cast<const std::string*>(string);
+    return TW::validateAddress(coin, address, ss58Prefix);
+}
+
+bool TWAnyAddressIsValidBech32(TWString* _Nonnull string, enum TWCoinType coin, TWString* _Nonnull hrp) {
+    const auto& address = *reinterpret_cast<const std::string*>(string);
+    const auto& hrpStr = *reinterpret_cast<const std::string*>(hrp);
+    return TW::validateAddress(coin, address, hrpStr.c_str());
+}
+
 struct TWAnyAddress* _Nullable TWAnyAddressCreateWithString(TWString* _Nonnull string,
                                                             enum TWCoinType coin) {
     const auto& address = *reinterpret_cast<const std::string*>(string);
@@ -31,11 +41,63 @@ struct TWAnyAddress* _Nullable TWAnyAddressCreateWithString(TWString* _Nonnull s
     return new TWAnyAddress{impl};
 }
 
+struct TWAnyAddress* _Nullable TWAnyAddressCreateBech32(TWString* _Nonnull string,
+                                                            enum TWCoinType coin, TWString* _Nonnull hrp) {
+    const auto& address = *reinterpret_cast<const std::string*>(string);
+    const auto& hrpStr = *reinterpret_cast<const std::string*>(hrp);
+    auto *impl = TW::AnyAddress::createAddress(address, coin, hrpStr.c_str());
+    if (impl == nullptr) {
+        return nullptr;
+    }
+    return new TWAnyAddress{impl};
+}
+
+
+struct TWAnyAddress* TWAnyAddressCreateSS58(TWString* _Nonnull string, enum TWCoinType coin, uint32_t ss58Prefix) {
+    const auto& address = *reinterpret_cast<const std::string*>(string);
+    auto *impl = TW::AnyAddress::createAddress(address, coin, ss58Prefix);
+    if (impl == nullptr) {
+        return nullptr;
+    }
+    return new TWAnyAddress{impl};
+}
+
 struct TWAnyAddress* _Nonnull TWAnyAddressCreateWithPublicKey(
     struct TWPublicKey* _Nonnull publicKey, enum TWCoinType coin) {
     return new TWAnyAddress{TW::AnyAddress::createAddress(publicKey->impl, coin)};
 }
 
+struct TWAnyAddress* _Nonnull TWAnyAddressCreateWithPublicKeyDerivation(
+    struct TWPublicKey* _Nonnull publicKey, enum TWCoinType coin, enum TWDerivation derivation) {
+    return new TWAnyAddress{TW::AnyAddress::createAddress(publicKey->impl, coin, derivation)};
+}
+
+struct TWAnyAddress* _Nonnull TWAnyAddressCreateBech32WithPublicKey(
+    struct TWPublicKey* _Nonnull publicKey, enum TWCoinType coin, TWString* _Nonnull hrp) {
+    const auto& hrpStr = *reinterpret_cast<const std::string*>(hrp);
+    return new TWAnyAddress{TW::AnyAddress::createAddress(publicKey->impl, coin, TWDerivationDefault, TW::Bech32Prefix(hrpStr.c_str()))};
+}
+
+struct TWAnyAddress* TWAnyAddressCreateSS58WithPublicKey(struct TWPublicKey* publicKey, enum TWCoinType coin, uint32_t ss58Prefix) {
+    return new TWAnyAddress{TW::AnyAddress::createAddress(publicKey->impl, coin, TWDerivationDefault, TW::SS58Prefix(ss58Prefix))};
+}
+
+struct TWAnyAddress* TWAnyAddressCreateWithPublicKeyFilecoinAddressType(struct TWPublicKey* _Nonnull publicKey, enum TWFilecoinAddressType filecoinAddressType) {
+    TW::PrefixVariant prefix = std::monostate();
+    if (filecoinAddressType == TWFilecoinAddressTypeDelegated) {
+        prefix = TW::DelegatedPrefix();
+    }
+    return new TWAnyAddress{TW::AnyAddress::createAddress(publicKey->impl, TWCoinTypeFilecoin, TWDerivationDefault, prefix)};
+}
+
+struct TWAnyAddress* TWAnyAddressCreateWithPublicKeyFiroAddressType(struct TWPublicKey* _Nonnull publicKey, enum TWFiroAddressType firoAddressType) {
+    TW::PrefixVariant prefix = std::monostate();
+    if (firoAddressType == TWFiroAddressTypeExchange) {
+        prefix = TW::ExchangePrefix();
+    }
+    return new TWAnyAddress{TW::AnyAddress::createAddress(publicKey->impl, TWCoinTypeFiro, TWDerivationDefault, prefix)};
+}
+
 void TWAnyAddressDelete(struct TWAnyAddress* _Nonnull address) {
     delete address->impl;
     delete address;
diff --git a/src/interface/TWAnySigner.cpp b/src/interface/TWAnySigner.cpp
index 64f3dbcc382..97cbfc631e3 100644
--- a/src/interface/TWAnySigner.cpp
+++ b/src/interface/TWAnySigner.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWAnySigner.h>
 
diff --git a/src/interface/TWAsnParser.cpp b/src/interface/TWAsnParser.cpp
new file mode 100644
index 00000000000..1dbd9b5a3ad
--- /dev/null
+++ b/src/interface/TWAsnParser.cpp
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAsnParser.h>
+
+#include "AsnParser.h"
+
+using namespace TW;
+
+TWData *_Nullable TWAsnParserEcdsaSignatureFromDer(TWData *_Nonnull encoded) {
+    const Data& encodedData = *reinterpret_cast<const Data*>(encoded);
+    try {
+        auto decoded = ASN::AsnParser::ecdsa_signature_from_der(encodedData);
+        if (!decoded) {
+            return nullptr;
+        }
+        return TWDataCreateWithBytes(decoded.value().data(), decoded.value().size());
+    } catch (...) {
+        return nullptr;
+    }
+}
diff --git a/src/interface/TWBarz.cpp b/src/interface/TWBarz.cpp
new file mode 100644
index 00000000000..60da9690279
--- /dev/null
+++ b/src/interface/TWBarz.cpp
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWBarz.h>
+#include <TrustWalletCore/TWData.h>
+#include <string>
+#include "Ethereum/Barz.h"
+
+TWString *_Nonnull TWBarzGetCounterfactualAddress(TWData *_Nonnull input) {
+    TW::Barz::Proto::ContractAddressInput inputProto;
+
+    const auto bytes = TWDataBytes(input);
+    const auto size = static_cast<int>(TWDataSize(input));
+    if (!inputProto.ParseFromArray(bytes, size)) {
+        return "";
+    }
+
+    return TWStringCreateWithUTF8Bytes(TW::Barz::getCounterfactualAddress(inputProto).c_str());
+}
+
+TWData *_Nonnull TWBarzGetInitCode(TWString* _Nonnull factory, struct TWPublicKey* _Nonnull publicKey, TWString* _Nonnull verificationFacet, uint32_t salt) {
+    const auto& factoryStr = *reinterpret_cast<const std::string*>(factory);
+    const auto& publicKeyConverted = *reinterpret_cast<const TW::PublicKey*>(publicKey);
+    const auto& verificationFacetStr = *reinterpret_cast<const std::string*>(verificationFacet);
+
+    const auto initCode = TW::Barz::getInitCode(factoryStr, publicKeyConverted, verificationFacetStr, salt);
+    return TWDataCreateWithData(&initCode);
+}
+
+TWData *_Nonnull TWBarzGetFormattedSignature(TWData* _Nonnull signature, TWData* _Nonnull challenge, TWData* _Nonnull authenticatorData, TWString* _Nonnull clientDataJSON) {
+    const auto& signatureData = *reinterpret_cast<const TW::Data*>(signature);
+    const auto& challengeData = *reinterpret_cast<const TW::Data*>(challenge);
+    const auto& authenticatorDataConverted = *reinterpret_cast<const TW::Data*>(authenticatorData);
+    const auto& clientDataJSONStr = *reinterpret_cast<const std::string*>(clientDataJSON);
+
+    const auto initCode = TW::Barz::getFormattedSignature(signatureData, challengeData, authenticatorDataConverted, clientDataJSONStr);
+    return TWDataCreateWithData(&initCode);
+}
+
+TWData *_Nonnull TWBarzGetPrefixedMsgHash(TWData* _Nonnull msgHash, TWString* _Nonnull barzAddress, uint32_t chainId) {
+    const auto& msgHashData = *reinterpret_cast<const TW::Data*>(msgHash);
+    const auto& barzAddressData = *reinterpret_cast<const std::string*>(barzAddress);
+
+    const auto prefixedMsgHash = TW::Barz::getPrefixedMsgHash(msgHashData, barzAddressData, chainId);
+    return TWDataCreateWithData(&prefixedMsgHash);
+}
+
+TWData *_Nonnull TWBarzGetDiamondCutCode(TWData *_Nonnull input) {
+    TW::Barz::Proto::DiamondCutInput inputProto;
+
+    const auto bytes = TWDataBytes(input);
+    const auto size = static_cast<int>(TWDataSize(input));
+    if (!inputProto.ParseFromArray(bytes, size)) {
+        return "";
+    }
+
+    const auto diamondCutCode = TW::Barz::getDiamondCutCode(inputProto);
+    return TWDataCreateWithData(&diamondCutCode);
+}
\ No newline at end of file
diff --git a/src/interface/TWBase32.cpp b/src/interface/TWBase32.cpp
index 11fd93093c8..1e71325af10 100644
--- a/src/interface/TWBase32.cpp
+++ b/src/interface/TWBase32.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWBase32.h>
 
@@ -12,11 +10,11 @@
 
 using namespace TW;
 
-TWData* TWBase32DecodeWithAlphabet(TWString* _Nonnull string, TWString* _Nonnull alphabet) {
+TWData* TWBase32DecodeWithAlphabet(TWString* _Nonnull string, TWString* _Nullable alphabet) {
     Data decodedOut;
     auto cppString = *reinterpret_cast<const std::string*>(string);
     const char* alphabetRaw = nullptr;
-    if (TWStringSize(alphabet) > 0) {
+    if (alphabet != nullptr) {
         alphabetRaw = TWStringUTF8Bytes(alphabet);
     }
     auto result = Base32::decode(cppString, decodedOut, alphabetRaw);
@@ -24,14 +22,13 @@ TWData* TWBase32DecodeWithAlphabet(TWString* _Nonnull string, TWString* _Nonnull
 }
 
 TWData* _Nullable TWBase32Decode(TWString* _Nonnull string) {
-    std::string empty;
-    return TWBase32DecodeWithAlphabet(string, &empty);
+    return TWBase32DecodeWithAlphabet(string, nullptr);
 }
 
-TWString* _Nonnull TWBase32EncodeWithAlphabet(TWData* _Nonnull data, TWString* _Nonnull alphabet) {
+TWString* _Nonnull TWBase32EncodeWithAlphabet(TWData* _Nonnull data, TWString* _Nullable alphabet) {
     auto cppData = *reinterpret_cast<const Data*>(data);
     const char* alphabetRaw = nullptr;
-    if (TWStringSize(alphabet) > 0) {
+    if (alphabet != nullptr) {
         alphabetRaw = TWStringUTF8Bytes(alphabet);
     }
     auto result = Base32::encode(cppData, alphabetRaw);
@@ -39,6 +36,5 @@ TWString* _Nonnull TWBase32EncodeWithAlphabet(TWData* _Nonnull data, TWString* _
 }
 
 TWString* _Nonnull TWBase32Encode(TWData* _Nonnull data) {
-    std::string empty;
-    return TWBase32EncodeWithAlphabet(data, &empty);
+    return TWBase32EncodeWithAlphabet(data, nullptr);
 }
diff --git a/src/interface/TWBase58.cpp b/src/interface/TWBase58.cpp
index 923b8a33bf0..b8a05c34f1c 100644
--- a/src/interface/TWBase58.cpp
+++ b/src/interface/TWBase58.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWBase58.h>
 
@@ -14,19 +12,19 @@ using namespace TW;
 
 TWString *_Nonnull TWBase58Encode(TWData *_Nonnull data) {
     const auto& d = *reinterpret_cast<const Data*>(data);
-    const auto str = Base58::bitcoin.encodeCheck(d);
+    const auto str = Base58::encodeCheck(d);
     return TWStringCreateWithUTF8Bytes(str.c_str());
 }
 
 TWString *_Nonnull TWBase58EncodeNoCheck(TWData *_Nonnull data) {
     auto& d = *reinterpret_cast<const Data*>(data);
-    const auto encoded = Base58::bitcoin.encode(d);
+    const auto encoded = Base58::encode(d);
     return TWStringCreateWithUTF8Bytes(encoded.c_str());
 }
 
 TWData *_Nullable TWBase58Decode(TWString *_Nonnull string) {
     auto& s = *reinterpret_cast<const std::string*>(string);
-    const auto decoded = Base58::bitcoin.decodeCheck(s);
+    const auto decoded = Base58::decodeCheck(s);
     if (decoded.empty()) {
         return nullptr;
     }
@@ -36,7 +34,7 @@ TWData *_Nullable TWBase58Decode(TWString *_Nonnull string) {
 
 TWData *_Nullable TWBase58DecodeNoCheck(TWString *_Nonnull string) {
     auto& s = *reinterpret_cast<const std::string*>(string);
-    const auto decoded = Base58::bitcoin.decode(s);
+    const auto decoded = Base58::decode(s);
     if (decoded.empty()) {
         return nullptr;
     }
diff --git a/src/interface/TWBase64.cpp b/src/interface/TWBase64.cpp
index c57a713e6e2..0009dab4b06 100644
--- a/src/interface/TWBase64.cpp
+++ b/src/interface/TWBase64.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWBase64.h>
 
diff --git a/src/interface/TWBech32.cpp b/src/interface/TWBech32.cpp
new file mode 100644
index 00000000000..fe184ead846
--- /dev/null
+++ b/src/interface/TWBech32.cpp
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWBech32.h>
+
+#include "../Bech32.h"
+
+#include <string>
+
+using namespace TW;
+
+static TWString *_Nonnull encodeGeneric(TWString* _Nonnull hrp, TWData *_Nonnull data, const Bech32::ChecksumVariant variant) {
+    const auto cppHrp = *static_cast<const std::string*>(hrp);
+    const auto cppData = *static_cast<const Data*>(data);
+    Data enc;
+    if (!Bech32::convertBits<8, 5, true>(enc, cppData)) {
+        return TWStringCreateWithUTF8Bytes("");
+    }
+    const auto result = Bech32::encode(cppHrp, enc, variant);
+    return TWStringCreateWithUTF8Bytes(result.c_str());
+}
+
+static TWData *_Nullable decodeGeneric(TWString *_Nonnull string, const Bech32::ChecksumVariant variant) {
+    const auto cppString = *static_cast<const std::string*>(string);
+    const auto decoded = Bech32::decode(cppString);
+
+    const auto data = std::get<1>(decoded);
+    if (data.empty()) { // Failed to decode
+        return nullptr;
+    }
+
+    if (std::get<2>(decoded) != variant) { // Wrong ChecksumVariant
+        return nullptr;
+    }
+
+    // Bech bits conversion
+    Data conv;
+    if (!Bech32::convertBits<5, 8, false>(conv, data)) {
+        return nullptr;
+    }
+
+    return TWDataCreateWithBytes(conv.data(), conv.size());
+}
+
+TWString *_Nonnull TWBech32Encode(TWString* _Nonnull hrp, TWData *_Nonnull data) {
+    return encodeGeneric(hrp, data, Bech32::ChecksumVariant::Bech32);
+}
+
+TWString *_Nonnull TWBech32EncodeM(TWString* _Nonnull hrp, TWData *_Nonnull data) {
+    return encodeGeneric(hrp, data, Bech32::ChecksumVariant::Bech32M);
+}
+
+TWData *_Nullable TWBech32Decode(TWString *_Nonnull string) {
+    return decodeGeneric(string, Bech32::ChecksumVariant::Bech32);
+}
+
+TWData *_Nullable TWBech32DecodeM(TWString *_Nonnull string) {
+        return decodeGeneric(string, Bech32::ChecksumVariant::Bech32M);
+}
diff --git a/src/interface/TWBitcoin.cpp b/src/interface/TWBitcoin.cpp
deleted file mode 100644
index d6cf837ce7e..00000000000
--- a/src/interface/TWBitcoin.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWBitcoinSigHashType.h>
-#include "../Bitcoin/SigHashType.h"
-
-bool TWBitcoinSigHashTypeIsSingle(enum TWBitcoinSigHashType type) {
-    return TW::Bitcoin::hashTypeIsSingle(type);
-}
-
-bool TWBitcoinSigHashTypeIsNone(enum TWBitcoinSigHashType type) {
-    return TW::Bitcoin::hashTypeIsNone(type);
-}
diff --git a/src/interface/TWBitcoinAddress.cpp b/src/interface/TWBitcoinAddress.cpp
index cefd940e992..e81dd75a32d 100644
--- a/src/interface/TWBitcoinAddress.cpp
+++ b/src/interface/TWBitcoinAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "../Base58.h"
 #include "../Bitcoin/Address.h"
diff --git a/src/interface/TWBitcoinMessageSigner.cpp b/src/interface/TWBitcoinMessageSigner.cpp
new file mode 100644
index 00000000000..03b1bc5f93c
--- /dev/null
+++ b/src/interface/TWBitcoinMessageSigner.cpp
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWBitcoinMessageSigner.h>
+
+#include "Bitcoin/MessageSigner.h"
+
+TWString* _Nonnull TWBitcoinMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull address, TWString* _Nonnull message) {
+    try {
+        const auto signature = TW::Bitcoin::MessageSigner::signMessage(privateKey->impl, TWStringUTF8Bytes(address), TWStringUTF8Bytes(message), true);
+        return TWStringCreateWithUTF8Bytes(signature.c_str());
+    } catch (...) {
+        return TWStringCreateWithUTF8Bytes("");
+    }
+}
+
+bool TWBitcoinMessageSignerVerifyMessage(TWString* _Nonnull address, TWString* _Nonnull message, TWString* _Nonnull signature) {
+    return TW::Bitcoin::MessageSigner::verifyMessage(TWStringUTF8Bytes(address), TWStringUTF8Bytes(message), TWStringUTF8Bytes(signature));
+}
diff --git a/src/interface/TWBitcoinScript.cpp b/src/interface/TWBitcoinScript.cpp
index fb0fb321147..3093e132896 100644
--- a/src/interface/TWBitcoinScript.cpp
+++ b/src/interface/TWBitcoinScript.cpp
@@ -1,13 +1,11 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWBitcoinScript.h>
-
 #include "../Bitcoin/Script.h"
 #include "../Bitcoin/SigHashType.h"
+#include "Data.h"
 
 #include <iterator>
 
@@ -154,6 +152,13 @@ struct TWBitcoinScript *_Nonnull TWBitcoinScriptLockScriptForAddress(TWString *_
     return new TWBitcoinScript{ .impl = script };
 }
 
+struct TWBitcoinScript *_Nonnull TWBitcoinScriptLockScriptForAddressReplay(TWString *_Nonnull address, enum TWCoinType coin, TWData *blockHash, int64_t blockHeight) {
+    auto* s = reinterpret_cast<const std::string*>(address);
+    auto* v = reinterpret_cast<const std::vector<uint8_t>*>(blockHash);
+    auto script = TW::Bitcoin::Script::lockScriptForAddress(*s, coin, *v, blockHeight);
+    return new TWBitcoinScript{ .impl = script };
+}
+
 uint32_t TWBitcoinScriptHashTypeForCoin(enum TWCoinType coinType) {
     return TW::Bitcoin::hashTypeForCoin(coinType);
 }
diff --git a/src/interface/TWBitcoinSigHashType.cpp b/src/interface/TWBitcoinSigHashType.cpp
new file mode 100644
index 00000000000..131b40c050b
--- /dev/null
+++ b/src/interface/TWBitcoinSigHashType.cpp
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include "../Bitcoin/SigHashType.h"
+
+bool TWBitcoinSigHashTypeIsSingle(enum TWBitcoinSigHashType type) {
+    return TW::Bitcoin::hashTypeIsSingle(type);
+}
+
+bool TWBitcoinSigHashTypeIsNone(enum TWBitcoinSigHashType type) {
+    return TW::Bitcoin::hashTypeIsNone(type);
+}
diff --git a/src/interface/TWCardano.cpp b/src/interface/TWCardano.cpp
index 9c1c43ed16d..d4278c593c9 100644
--- a/src/interface/TWCardano.cpp
+++ b/src/interface/TWCardano.cpp
@@ -1,9 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
+#include <algorithm>
 #include <TrustWalletCore/TWCardano.h>
 
 #include "Cardano/Transaction.h"
@@ -12,6 +11,46 @@
 
 using namespace TW;
 
+namespace internal {
+
+/// May throw an exception if `tokenBundle` can't be deserialzied as `TW::Cardano::Proto::TokenBundle`.
+std::optional<uint64_t> cardanoMinAdaAmount(const std::string& toAddress, const Data *tokenBundle, uint64_t coinsPerUtxoByte) {
+    // Set the initial amount to 0.
+    const uint64_t amount = 0;
+    const TW::Cardano::AddressV3 cardanoAddress(toAddress);
+
+    TW::Cardano::Proto::TokenBundle bundleProto;
+    if (!tokenBundle || !bundleProto.ParseFromArray(tokenBundle->data(), (int)tokenBundle->size())) {
+        // Expect at least an empty `TokenBundle`.
+        return std::nullopt;
+    }
+    const auto tokens = TW::Cardano::TokenBundle::fromProto(bundleProto);
+
+    const TW::Cardano::TxOutput output(cardanoAddress.data(), amount, tokens);
+    return output.minAdaAmount(coinsPerUtxoByte);
+}
+
+}
+
+std::optional<uint64_t> parseAdaAmount(const std::string &amount) {
+    const bool onlyDigits = std::all_of(
+        amount.begin(),
+        amount.end(),
+        [](unsigned char c)->bool { return std::isdigit(c); }
+    );
+    if (!onlyDigits) {
+        return std::nullopt;
+    }
+
+    std::size_t chars;
+    uint64_t amountInt = std::stoull(amount, &chars);
+    if (chars != amount.size()) {
+        return std::nullopt;
+    }
+
+    return amountInt;
+}
+
 uint64_t TWCardanoMinAdaAmount(TWData *_Nonnull tokenBundle) {
     const Data* bundleData = static_cast<const Data*>(tokenBundle);
     TW::Cardano::Proto::TokenBundle bundleProto;
@@ -21,6 +60,28 @@ uint64_t TWCardanoMinAdaAmount(TWData *_Nonnull tokenBundle) {
     return 0;
 }
 
+TWString *_Nullable TWCardanoOutputMinAdaAmount(TWString *_Nonnull toAddress, TWData *_Nonnull tokenBundle, TWString *_Nonnull coinsPerUtxoByte) {
+    const std::string& address = *reinterpret_cast<const std::string*>(toAddress);
+    const std::string& coinsPerUtxoByteStr = *reinterpret_cast<const std::string*>(coinsPerUtxoByte);
+    const auto* bundleData = static_cast<const Data*>(tokenBundle);
+
+    try {
+        const auto coinsPerUtxoByteInt = parseAdaAmount(coinsPerUtxoByteStr);
+        if (!coinsPerUtxoByteInt) {
+            // Couldn't parse the `coinsPerUtxoByte` string.
+            return nullptr;
+        }
+
+        const auto minAdaAmount = internal::cardanoMinAdaAmount(address, bundleData, *coinsPerUtxoByteInt);
+        if (!minAdaAmount) {
+            return nullptr;
+        }
+        return TWStringCreateWithUTF8Bytes(std::to_string(*minAdaAmount).c_str());
+    } catch (...) {
+        return nullptr;
+    }
+}
+
 TWString *_Nonnull TWCardanoGetStakingAddress(TWString *_Nonnull baseAddress) {
     const auto& address = *reinterpret_cast<const std::string*>(baseAddress);
     try {
@@ -29,3 +90,11 @@ TWString *_Nonnull TWCardanoGetStakingAddress(TWString *_Nonnull baseAddress) {
         return TWStringCreateWithUTF8Bytes("");
     }
 }
+
+TWString *_Nonnull TWCardanoGetByronAddress(struct TWPublicKey *_Nonnull publicKey) {
+    try {
+        return TWStringCreateWithUTF8Bytes(TW::Cardano::AddressV2({ publicKey->impl }).string().c_str());
+    } catch (...) {
+        return TWStringCreateWithUTF8Bytes("");
+    }
+}
diff --git a/src/interface/TWCoinType.cpp b/src/interface/TWCoinType.cpp
index 2d58d5a7be5..908edfc73b9 100644
--- a/src/interface/TWCoinType.cpp
+++ b/src/interface/TWCoinType.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWHRP.h>
@@ -55,6 +53,11 @@ TWString *_Nonnull TWCoinTypeDeriveAddressFromPublicKey(enum TWCoinType coin, st
     return TWStringCreateWithUTF8Bytes(string.c_str());
 }
 
+TWString *_Nonnull TWCoinTypeDeriveAddressFromPublicKeyAndDerivation(enum TWCoinType coin, struct TWPublicKey *_Nonnull publicKey, enum TWDerivation derivation) {
+    const auto string = TW::deriveAddress(coin, publicKey->impl, derivation);
+    return TWStringCreateWithUTF8Bytes(string.c_str());
+}
+
 enum TWHRP TWCoinTypeHRP(enum TWCoinType coin) {
     return TW::hrp(coin);
 }
@@ -82,3 +85,7 @@ uint32_t TWCoinTypeSlip44Id(enum TWCoinType coin) {
 enum TWPublicKeyType TWCoinTypePublicKeyType(enum TWCoinType coin) {
     return TW::publicKeyType(coin);
 }
+
+uint32_t TWCoinTypeSS58Prefix(enum TWCoinType coin) {
+    return TW::ss58Prefix(coin);
+}
diff --git a/src/interface/TWCryptoBox.cpp b/src/interface/TWCryptoBox.cpp
new file mode 100644
index 00000000000..35f83bceb8b
--- /dev/null
+++ b/src/interface/TWCryptoBox.cpp
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWCryptoBox.h"
+#include "CryptoBox.h"
+
+using namespace TW;
+
+TWData* _Nonnull TWCryptoBoxEncryptEasy(struct TWCryptoBoxSecretKey* _Nonnull mySecret, struct TWCryptoBoxPublicKey* _Nonnull otherPubkey, TWData* _Nonnull message) {
+    auto& messageBytes = *reinterpret_cast<const Data*>(message);
+    auto encrypted = CryptoBox::encryptEasy(mySecret->impl, otherPubkey->impl, messageBytes);
+    return TWDataCreateWithBytes(encrypted.data(), encrypted.size());
+}
+
+TWData* _Nullable TWCryptoBoxDecryptEasy(struct TWCryptoBoxSecretKey* _Nonnull mySecret, struct TWCryptoBoxPublicKey* _Nonnull otherPubkey, TWData* _Nonnull encrypted) {
+    auto& encryptedBytes = *reinterpret_cast<const Data*>(encrypted);
+    auto decrypted = CryptoBox::decryptEasy(mySecret->impl, otherPubkey->impl, encryptedBytes);
+    if (!decrypted) {
+        return nullptr;
+    }
+    return TWDataCreateWithBytes(decrypted->data(), decrypted->size());
+}
diff --git a/src/interface/TWCryptoBoxPublicKey.cpp b/src/interface/TWCryptoBoxPublicKey.cpp
new file mode 100644
index 00000000000..3dc0e10ec08
--- /dev/null
+++ b/src/interface/TWCryptoBoxPublicKey.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWCryptoBoxPublicKey.h"
+#include "CryptoBox.h"
+
+using namespace TW;
+
+bool TWCryptoBoxPublicKeyIsValid(TWData* _Nonnull data) {
+    auto& bytes = *reinterpret_cast<const Data*>(data);
+    return CryptoBox::PublicKey::isValid(bytes);
+}
+
+struct TWCryptoBoxPublicKey* _Nullable TWCryptoBoxPublicKeyCreateWithData(TWData* _Nonnull data) {
+    auto& bytes = *reinterpret_cast<const Data*>(data);
+    auto publicKey = CryptoBox::PublicKey::fromBytes(bytes);
+    if (!publicKey) {
+        return nullptr;
+    }
+    return new TWCryptoBoxPublicKey { publicKey.value() };
+}
+
+void TWCryptoBoxPublicKeyDelete(struct TWCryptoBoxPublicKey* _Nonnull publicKey) {
+    delete publicKey;
+}
+
+TWData* _Nonnull TWCryptoBoxPublicKeyData(struct TWCryptoBoxPublicKey* _Nonnull publicKey) {
+    auto bytes = publicKey->impl.getData();
+    return TWDataCreateWithBytes(bytes.data(), bytes.size());
+}
diff --git a/src/interface/TWCryptoBoxSecretKey.cpp b/src/interface/TWCryptoBoxSecretKey.cpp
new file mode 100644
index 00000000000..0a16fa6a06f
--- /dev/null
+++ b/src/interface/TWCryptoBoxSecretKey.cpp
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWCryptoBoxSecretKey.h"
+#include "CryptoBox.h"
+
+using namespace TW;
+
+bool TWCryptoBoxSecretKeyIsValid(TWData* _Nonnull data) {
+    auto& bytes = *reinterpret_cast<const Data*>(data);
+    return CryptoBox::SecretKey::isValid(bytes);
+}
+
+struct TWCryptoBoxSecretKey* _Nullable TWCryptoBoxSecretKeyCreateWithData(TWData* _Nonnull data) {
+    auto& bytes = *reinterpret_cast<const Data*>(data);
+    auto secretKey = CryptoBox::SecretKey::fromBytes(bytes);
+    if (!secretKey) {
+        return nullptr;
+    }
+    return new TWCryptoBoxSecretKey { secretKey.value() };
+}
+
+struct TWCryptoBoxSecretKey* _Nonnull TWCryptoBoxSecretKeyCreate() {
+    CryptoBox::SecretKey secretKey;
+    return new TWCryptoBoxSecretKey { secretKey };
+}
+
+void TWCryptoBoxSecretKeyDelete(struct TWCryptoBoxSecretKey* _Nonnull key) {
+    delete key;
+}
+
+struct TWCryptoBoxPublicKey* TWCryptoBoxSecretKeyGetPublicKey(struct TWCryptoBoxSecretKey* _Nonnull key) {
+    auto publicKey = key->impl.getPublicKey();
+    return new TWCryptoBoxPublicKey { publicKey };
+}
+
+TWData* _Nonnull TWCryptoBoxSecretKeyData(struct TWCryptoBoxSecretKey* _Nonnull secretKey) {
+    auto bytes = secretKey->impl.getData();
+    return TWDataCreateWithBytes(bytes.data(), bytes.size());
+}
diff --git a/src/interface/TWData.cpp b/src/interface/TWData.cpp
index b08b5e7cb94..3cb2d364b88 100644
--- a/src/interface/TWData.cpp
+++ b/src/interface/TWData.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWData.h>
 #include <TrustWalletCore/TWString.h>
diff --git a/src/interface/TWDataVector.cpp b/src/interface/TWDataVector.cpp
index bea89cc1dac..73985924849 100644
--- a/src/interface/TWDataVector.cpp
+++ b/src/interface/TWDataVector.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWDataVector.h>
 
diff --git a/src/interface/TWDerivationPath.cpp b/src/interface/TWDerivationPath.cpp
index f48bc051d77..0b1c853abdd 100644
--- a/src/interface/TWDerivationPath.cpp
+++ b/src/interface/TWDerivationPath.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWDerivationPath.h>
 #include <TrustWalletCore/TWPurpose.h>
diff --git a/src/interface/TWDerivationPathIndex.cpp b/src/interface/TWDerivationPathIndex.cpp
index f443955191e..6f0a14ea9b2 100644
--- a/src/interface/TWDerivationPathIndex.cpp
+++ b/src/interface/TWDerivationPathIndex.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWDerivationPathIndex.h>
 #include <TrustWalletCore/TWString.h>
diff --git a/src/interface/TWEthereum.cpp b/src/interface/TWEthereum.cpp
new file mode 100644
index 00000000000..2c492c48e3f
--- /dev/null
+++ b/src/interface/TWEthereum.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Data.h"
+#include "Ethereum/EIP1014.h"
+#include "Ethereum/EIP2645.h"
+#include <TrustWalletCore/TWEthereum.h>
+
+#include <string>
+
+TWString* TWEthereumEip2645GetPath(TWString* ethAddress, TWString* layer, TWString* application, TWString* index) {
+    const auto& ethAddressStr = *reinterpret_cast<const std::string*>(ethAddress);
+    const auto& layerStr = *reinterpret_cast<const std::string*>(layer);
+    const auto& applicationStr = *reinterpret_cast<const std::string*>(application);
+    const auto& indexStr = *reinterpret_cast<const std::string*>(index);
+    return new std::string(TW::Ethereum::accountPathFromAddress(ethAddressStr, layerStr, applicationStr, indexStr));
+}
\ No newline at end of file
diff --git a/src/interface/TWEthereumAbi.cpp b/src/interface/TWEthereumAbi.cpp
index 2ea781199eb..829eb594a33 100644
--- a/src/interface/TWEthereumAbi.cpp
+++ b/src/interface/TWEthereumAbi.cpp
@@ -1,51 +1,74 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWEthereumAbi.h>
 #include <TrustWalletCore/TWEthereumAbiFunction.h>
 
 #include "Data.h"
-#include "Ethereum/ABI.h"
+#include "Ethereum/ABI/Function.h"
 #include "Ethereum/ContractCall.h"
+#include "Ethereum/MessageSigner.h"
 #include "HexCoding.h"
-#include "uint256.h"
 
 #include <cassert>
-#include <string>
 #include <vector>
 
 using namespace TW;
 namespace EthAbi = TW::Ethereum::ABI;
 
+template <typename F>
+static TWData* _Nonnull ethereumAbiForwardToRust(F rustFunction, enum TWCoinType coin, TWData* _Nonnull input) {
+    const Data& inputData = *(reinterpret_cast<const Data*>(input));
+
+    const Rust::TWDataWrapper dataInPtr(inputData);
+    Rust::TWDataWrapper dataOutPtr = rustFunction(static_cast<uint32_t>(coin), dataInPtr.get());
+
+    auto dataOut = dataOutPtr.toDataOrDefault();
+    return TWDataCreateWithBytes(dataOut.data(), dataOut.size());
+}
+
+TWData* _Nonnull TWEthereumAbiDecodeContractCall(enum TWCoinType coin, TWData* _Nonnull input) {
+    return ethereumAbiForwardToRust(Rust::tw_ethereum_abi_decode_contract_call, coin, input);
+}
+
+TWData* _Nonnull TWEthereumAbiDecodeParams(enum TWCoinType coin, TWData* _Nonnull input) {
+    return ethereumAbiForwardToRust(Rust::tw_ethereum_abi_decode_params, coin, input);
+}
+
+TWData* _Nonnull TWEthereumAbiDecodeValue(enum TWCoinType coin, TWData* _Nonnull input) {
+    return ethereumAbiForwardToRust(Rust::tw_ethereum_abi_decode_value, coin, input);
+}
+
+TWData* _Nonnull TWEthereumAbiEncodeFunction(enum TWCoinType coin, TWData* _Nonnull input) {
+    return ethereumAbiForwardToRust(Rust::tw_ethereum_abi_encode_function, coin, input);
+}
+
 TWData* _Nonnull TWEthereumAbiEncode(struct TWEthereumAbiFunction* _Nonnull func_in) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    Data encoded;
-    function.encode(encoded);
-    return TWDataCreateWithData(&encoded);
+    Data encodedData;
+    auto encoded = func_in->impl.encodeInput();
+    if (encoded.has_value()) {
+        encodedData = encoded.value();
+    }
+    return TWDataCreateWithData(&encodedData);
 }
 
 bool TWEthereumAbiDecodeOutput(struct TWEthereumAbiFunction* _Nonnull func_in,
                                TWData* _Nonnull encoded) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
     assert(encoded != nullptr);
-    Data encData = data(TWDataBytes(encoded), TWDataSize(encoded));
+    const Data& encData = *(reinterpret_cast<const Data*>(encoded));
 
-    size_t offset = 0;
-    return function.decodeOutput(encData, offset);
+    bool isOutput = true;
+    return func_in->impl.decode(encData, isOutput);
 }
 
 TWString* _Nullable TWEthereumAbiDecodeCall(TWData* _Nonnull callData, TWString* _Nonnull abiString) {
     const Data& call = *(reinterpret_cast<const Data*>(callData));
     const auto& jsonString = *reinterpret_cast<const std::string*>(abiString);
     try {
-        auto abi = nlohmann::json::parse(jsonString);
-        auto string = EthAbi::decodeCall(call, abi);
+        auto string = EthAbi::decodeCall(call, jsonString);
         if (!string.has_value()) {
             return nullptr;
         }
@@ -59,7 +82,7 @@ TWString* _Nullable TWEthereumAbiDecodeCall(TWData* _Nonnull callData, TWString*
 TWData* _Nonnull TWEthereumAbiEncodeTyped(TWString* _Nonnull messageJson) {
     Data data;
     try {
-        data = EthAbi::ParamStruct::hashStructJson(TWStringUTF8Bytes(messageJson));
+        data = Ethereum::MessageSigner::typedDataPreImageHash(TWStringUTF8Bytes(messageJson));
     } catch (...) {} // return empty
     return TWDataCreateWithBytes(data.data(), data.size());
 }
diff --git a/src/interface/TWEthereumAbiFunction.cpp b/src/interface/TWEthereumAbiFunction.cpp
index 3951b949f5b..db792629ee0 100644
--- a/src/interface/TWEthereumAbiFunction.cpp
+++ b/src/interface/TWEthereumAbiFunction.cpp
@@ -1,17 +1,13 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWEthereumAbiFunction.h>
 
-#include "Ethereum/ABI.h"
+#include "Ethereum/ABI/Function.h"
 #include "Data.h"
 #include "HexCoding.h"
-#include "../uint256.h"
 
-#include <string>
 #include <vector>
 #include <cassert>
 
@@ -30,8 +26,7 @@ void TWEthereumAbiFunctionDelete(struct TWEthereumAbiFunction *_Nonnull func_in)
 
 TWString *_Nonnull TWEthereumAbiFunctionGetType(struct TWEthereumAbiFunction *_Nonnull func_in) {
     assert(func_in != nullptr);
-    auto function = func_in->impl;
-    std::string sign = function.getType();
+    std::string sign = func_in->impl.getType();
     return TWStringCreateWithUTF8Bytes(sign.c_str());
 }
 
@@ -39,418 +34,369 @@ TWString *_Nonnull TWEthereumAbiFunctionGetType(struct TWEthereumAbiFunction *_N
 
 int TWEthereumAbiFunctionAddParamUInt8(struct TWEthereumAbiFunction *_Nonnull func_in, uint8_t val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    auto param = std::make_shared<EthAbi::ParamUInt8>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 8;
+    auto encodedValue = store(val);
+    return func_in->impl.addUintParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamUInt16(struct TWEthereumAbiFunction *_Nonnull func_in, uint16_t val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    auto param = std::make_shared<EthAbi::ParamUInt16>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 16;
+    auto encodedValue = store(val);
+    return func_in->impl.addUintParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamUInt32(struct TWEthereumAbiFunction *_Nonnull func_in, uint32_t val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    auto param = std::make_shared<EthAbi::ParamUInt32>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 32;
+    auto encodedValue = store(val);
+    return func_in->impl.addUintParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamUInt64(struct TWEthereumAbiFunction *_Nonnull func_in, uint64_t val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    auto param = std::make_shared<EthAbi::ParamUInt64>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 64;
+    auto encodedValue = store(val);
+    return func_in->impl.addUintParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamUInt256(struct TWEthereumAbiFunction *_Nonnull func_in, TWData *_Nonnull val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    uint256_t val2 = load(*static_cast<const Data*>(val));
-    auto param = std::make_shared<EthAbi::ParamUInt256>(val2);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 256;
+    const Data& encodedValue = *(reinterpret_cast<const Data*>(val));
+    return func_in->impl.addUintParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamUIntN(struct TWEthereumAbiFunction *_Nonnull func_in, int bits, TWData *_Nonnull val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    uint256_t val2 = load(*static_cast<const Data*>(val));
-    auto param = std::make_shared<EthAbi::ParamUIntN>(bits, val2);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    const Data& encodedValue = *(reinterpret_cast<const Data*>(val));
+    return func_in->impl.addUintParam(static_cast<uint32_t>(bits), encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamInt8(struct TWEthereumAbiFunction *_Nonnull func_in, int8_t val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    auto param = std::make_shared<EthAbi::ParamInt8>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 8;
+    auto encodedValue = store(val);
+    return func_in->impl.addIntParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamInt16(struct TWEthereumAbiFunction *_Nonnull func_in, int16_t val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    auto param = std::make_shared<EthAbi::ParamInt16>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 16;
+    auto encodedValue = store(val);
+    return func_in->impl.addIntParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamInt32(struct TWEthereumAbiFunction *_Nonnull func_in, int32_t val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    auto param = std::make_shared<EthAbi::ParamInt32>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 32;
+    auto encodedValue = store(val);
+    return func_in->impl.addIntParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamInt64(struct TWEthereumAbiFunction *_Nonnull func_in, int64_t val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    auto param = std::make_shared<EthAbi::ParamInt64>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 64;
+    auto encodedValue = store(val);
+    return func_in->impl.addIntParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamInt256(struct TWEthereumAbiFunction *_Nonnull func_in, TWData *_Nonnull val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    assert(val != nullptr);
-    int256_t val2 = EthAbi::ValueEncoder::int256FromUint256(load(*static_cast<const Data*>(val)));
-    auto param = std::make_shared<EthAbi::ParamInt256>(val2);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    uint32_t bits = 256;
+    const Data& encodedValue = *(reinterpret_cast<const Data*>(val));
+    return func_in->impl.addIntParam(bits, encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamIntN(struct TWEthereumAbiFunction *_Nonnull func_in, int bits, TWData *_Nonnull val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    assert(val != nullptr);
-    int256_t val2 = EthAbi::ValueEncoder::int256FromUint256(load(*static_cast<const Data*>(val)));
-    auto param = std::make_shared<EthAbi::ParamIntN>(bits, val2);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    const Data& encodedValue = *(reinterpret_cast<const Data*>(val));
+    return func_in->impl.addIntParam(static_cast<uint32_t>(bits), encodedValue, isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamBool(struct TWEthereumAbiFunction *_Nonnull func_in, bool val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    auto param = std::make_shared<EthAbi::ParamBool>(val);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    EthereumAbi::Proto::Param paramType;
+    // Declare the `boolean` type.
+    paramType.mutable_param()->mutable_boolean();
+
+    EthereumAbi::Proto::Token token;
+    token.set_boolean(val);
+
+    return func_in->impl.addParam(std::move(paramType), std::move(token), isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamString(struct TWEthereumAbiFunction *_Nonnull func_in, TWString *_Nonnull val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    assert(val != nullptr);
-    auto param = std::make_shared<EthAbi::ParamString>(TWStringUTF8Bytes(val));
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    EthereumAbi::Proto::Param paramType;
+    // Declare the `string` type.
+    paramType.mutable_param()->mutable_string_param();
+
+    EthereumAbi::Proto::Token token;
+    auto* s = reinterpret_cast<const std::string*>(val);
+    token.set_string_value(*s);
+
+    return func_in->impl.addParam(std::move(paramType), std::move(token), isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamAddress(struct TWEthereumAbiFunction *_Nonnull func_in, TWData *_Nonnull val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    assert(val != nullptr);
-    Data data = TW::data(TWDataBytes(val), TWDataSize(val));
-    auto param = std::make_shared<EthAbi::ParamAddress>(data);
-    auto idx = function.addParam(param, isOutput);
-    return idx;
+    EthereumAbi::Proto::Param paramType;
+    // Declare the `address` type.
+    paramType.mutable_param()->mutable_address();
+
+    EthereumAbi::Proto::Token token;
+    const Data& addressData = *(reinterpret_cast<const Data*>(val));
+    bool prefixed = true;
+    auto addressStr = hex(addressData, prefixed);
+    token.set_address(addressStr);
+
+    return func_in->impl.addParam(std::move(paramType), std::move(token), isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamBytes(struct TWEthereumAbiFunction *_Nonnull func_in, TWData *_Nonnull val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    Data data = TW::data(TWDataBytes(val), TWDataSize(val));
-    auto param = std::make_shared<EthAbi::ParamByteArray>(data);
-    auto idx = function.addParam(param, isOutput);
-    return idx;    
+    EthereumAbi::Proto::Param paramType;
+    // Declare the `byte_array` type.
+    paramType.mutable_param()->mutable_byte_array();
+
+    EthereumAbi::Proto::Token token;
+    const Data& bytesData = *(reinterpret_cast<const Data*>(val));
+    token.set_byte_array(bytesData.data(), bytesData.size());
+
+    return func_in->impl.addParam(std::move(paramType), std::move(token), isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamBytesFix(struct TWEthereumAbiFunction *_Nonnull func_in, size_t count, TWData *_Nonnull val, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    Data data = TW::data(TWDataBytes(val), TWDataSize(val));
-    auto param = std::make_shared<EthAbi::ParamByteArrayFix>(count, data);
-    auto idx = function.addParam(param, isOutput);
-    return idx;    
+    EthereumAbi::Proto::Param paramType;
+    // Declare the `byte_array_fix` type.
+    paramType.mutable_param()->mutable_byte_array_fix()->set_size(static_cast<uint64_t>(count));
+
+    EthereumAbi::Proto::Token token;
+    Data bytesData = *(reinterpret_cast<const Data*>(val));
+    bytesData.resize(count);
+    token.set_byte_array_fix(bytesData.data(), bytesData.size());
+
+    return func_in->impl.addParam(std::move(paramType), std::move(token), isOutput);
 }
 
 int TWEthereumAbiFunctionAddParamArray(struct TWEthereumAbiFunction *_Nonnull func_in, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    auto param = std::make_shared<EthAbi::ParamArray>();
-    auto idx = function.addParam(param, isOutput);
-    return idx;    
+    EthereumAbi::Proto::Param paramType;
+    // Declare the `array` type.
+    paramType.mutable_param()->mutable_array();
+
+    EthereumAbi::Proto::Token token;
+    // Declare the `array` empty value.
+    token.mutable_array();
+
+    return func_in->impl.addParam(std::move(paramType), std::move(token), isOutput);
 }
 
 ///// GetParam
 
 uint8_t TWEthereumAbiFunctionGetParamUInt8(struct TWEthereumAbiFunction *_Nonnull func_in, int idx, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    std::shared_ptr<EthAbi::ParamBase> param;
-    if (!function.getParam(idx, param, isOutput)) {
-        return 0;
-    }
-    auto param2 = std::dynamic_pointer_cast<EthAbi::ParamUInt8>(param);
-    if (param2 == nullptr) {
-        return 0;
-    }
-    return param2->getVal();
+    return func_in->impl.getUintParam<uint8_t>(idx, 8, isOutput);
 }
 
 uint64_t TWEthereumAbiFunctionGetParamUInt64(struct TWEthereumAbiFunction *_Nonnull func_in, int idx, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    std::shared_ptr<EthAbi::ParamBase> param;
-    if (!function.getParam(idx, param, isOutput)) {
-        return 0;
-    }
-    auto param2 = std::dynamic_pointer_cast<EthAbi::ParamUInt64>(param);
-    if (param2 == nullptr) {
-        return 0;
-    }
-    return param2->getVal();
+    return func_in->impl.getUintParam<uint64_t>(idx, 64, isOutput);
 }
 
 TWData *_Nonnull TWEthereumAbiFunctionGetParamUInt256(struct TWEthereumAbiFunction *_Nonnull func_in, int idx, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    uint256_t val256 = 0;
-    std::shared_ptr<EthAbi::ParamBase> param;
-    if (!function.getParam(idx, param, isOutput)) {
-        TW::Data valData = TW::store(val256);
-        return TWDataCreateWithData(&valData);
-    }
-    auto param2 = std::dynamic_pointer_cast<EthAbi::ParamUInt256>(param);
-    if (param2 == nullptr) {
-        TW::Data valData = TW::store(val256);
-        return TWDataCreateWithData(&valData);
-    }
-    val256 = param2->getVal();
-    TW::Data valData = TW::store(val256);
+    auto valData = func_in->impl.getUintParamData(idx, 256, isOutput);
     return TWDataCreateWithData(&valData);
 }
 
 bool TWEthereumAbiFunctionGetParamBool(struct TWEthereumAbiFunction *_Nonnull func_in, int idx, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    std::shared_ptr<EthAbi::ParamBase> param;
-    if (!function.getParam(idx, param, isOutput)) {
+    auto param = func_in->impl.getParam(idx, isOutput);
+    if (!param.has_value() || !param->has_boolean()) {
         return false;
     }
-    auto param2 = std::dynamic_pointer_cast<EthAbi::ParamBool>(param);
-    if (param2 == nullptr) {
-        return false;
-    }
-    return param2->getVal();
+    return param->boolean();
 }
 
 TWString *_Nonnull TWEthereumAbiFunctionGetParamString(struct TWEthereumAbiFunction *_Nonnull func_in, int idx, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
     std::string valStr;
-    std::shared_ptr<EthAbi::ParamBase> param;
-    if (!function.getParam(idx, param, isOutput)) {
-        return TWStringCreateWithUTF8Bytes(valStr.c_str());
-    }
-    auto param2 = std::dynamic_pointer_cast<EthAbi::ParamString>(param);
-    if (param2 == nullptr) {
+
+    auto param = func_in->impl.getParam(idx, isOutput);
+    if (!param.has_value() || !param->has_string_value()) {
         return TWStringCreateWithUTF8Bytes(valStr.c_str());
     }
-    valStr = param2->getVal();
+    valStr = param->string_value();
     return TWStringCreateWithUTF8Bytes(valStr.c_str());
 }
 
 TWData *_Nonnull TWEthereumAbiFunctionGetParamAddress(struct TWEthereumAbiFunction *_Nonnull func_in, int idx, bool isOutput) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
+    Data addressData;
 
-    Data valData;
-    std::shared_ptr<EthAbi::ParamBase> param;
-    if (!function.getParam(idx, param, isOutput)) {
-        return TWDataCreateWithData(&valData);
+    auto param = func_in->impl.getParam(idx, isOutput);
+    if (!param.has_value() || !param->has_address()) {
+        return TWDataCreateWithData(&addressData);
     }
-    auto param2 = std::dynamic_pointer_cast<EthAbi::ParamAddress>(param);
-    if (param2 == nullptr) {
-        return TWDataCreateWithData(&valData);
+    auto addressStr = param->address();
+    try {
+        addressData = parse_hex(addressStr);
+        return TWDataCreateWithData(&addressData);
+    } catch (...) {
+        return TWDataCreateWithData(&addressData);
     }
-    valData = param2->getData();
-    return TWDataCreateWithData(&valData);
 }
 
 ///// AddInArrayParam
 
-int addInArrayParam(EthAbi::Function& function, int arrayIdx, const std::shared_ptr<EthAbi::ParamBase>& childParam) {
-    std::shared_ptr<EthAbi::ParamBase> param;
-    if (!function.getInParam(arrayIdx, param)) {
-        return -1;
-    }
-    std::shared_ptr<EthAbi::ParamArray> paramArr = std::dynamic_pointer_cast<EthAbi::ParamArray>(param);
-    if (paramArr == nullptr) {
-        return -1; // not an array
-    }
-    return paramArr->addParam(childParam);
-}
-
 int TWEthereumAbiFunctionAddInArrayParamUInt8(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, uint8_t val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamUInt8>(val));
+    auto encodedVal = store(val);
+    return func_in->impl.addInArrayUintParam(arrayIdx, 8, encodedVal);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamUInt16(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, uint16_t val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamUInt16>(val));
+    auto encodedVal = store(val);
+    return func_in->impl.addInArrayUintParam(arrayIdx, 16, encodedVal);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamUInt32(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, uint32_t val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamUInt32>(val));
+    auto encodedVal = store(val);
+    return func_in->impl.addInArrayUintParam(arrayIdx, 32, encodedVal);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamUInt64(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, uint64_t val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamUInt64>(val));
+    auto encodedVal = store(val);
+    return func_in->impl.addInArrayUintParam(arrayIdx, 64, encodedVal);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamUInt256(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, TWData *_Nonnull val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    uint256_t val2 = load(*static_cast<const Data*>(val));
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamUInt256>(val2));
+    const Data& bytesData = *(reinterpret_cast<const Data*>(val));
+    return func_in->impl.addInArrayUintParam(arrayIdx, 256, bytesData);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamUIntN(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, int bits, TWData *_Nonnull val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    uint256_t val2 = load(*static_cast<const Data*>(val));
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamUIntN>(bits, val2));
+    const Data& bytesData = *(reinterpret_cast<const Data*>(val));
+    return func_in->impl.addInArrayUintParam(arrayIdx, bits, bytesData);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamInt8(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, int8_t val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamInt8>(val));
+    auto encodedVal = store(val);
+    return func_in->impl.addInArrayIntParam(arrayIdx, 8, encodedVal);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamInt16(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, int16_t val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamInt16>(val));
+    auto encodedVal = store(val);
+    return func_in->impl.addInArrayIntParam(arrayIdx, 16, encodedVal);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamInt32(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, int32_t val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamInt32>(val));
+    auto encodedVal = store(val);
+    return func_in->impl.addInArrayIntParam(arrayIdx, 32, encodedVal);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamInt64(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, int64_t val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamInt64>(val));
+    auto encodedVal = store(val);
+    return func_in->impl.addInArrayIntParam(arrayIdx, 64, encodedVal);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamInt256(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, TWData *_Nonnull val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    assert(val != nullptr);
-    int256_t val2 = EthAbi::ValueEncoder::int256FromUint256(load(*static_cast<const Data*>(val)));
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamInt256>(val2));
+    const Data& bytesData = *(reinterpret_cast<const Data*>(val));
+    return func_in->impl.addInArrayIntParam(arrayIdx, 256, bytesData);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamIntN(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, int bits, TWData *_Nonnull val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
-
-    assert(val != nullptr);
-    int256_t val2 = EthAbi::ValueEncoder::int256FromUint256(load(*static_cast<const Data*>(val)));
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamIntN>(bits, val2));
+    const Data& bytesData = *(reinterpret_cast<const Data*>(val));
+    return func_in->impl.addInArrayIntParam(arrayIdx, bits, bytesData);
 }
 
 int TWEthereumAbiFunctionAddInArrayParamBool(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, bool val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamBool>(val));
+    EthereumAbi::Proto::ParamType paramType;
+    // Declare the boolean type.
+    paramType.mutable_boolean();
+
+    EthereumAbi::Proto::Token token;
+    token.set_boolean(val);
+
+    return func_in->impl.addInArrayParam(arrayIdx, std::move(paramType), std::move(token));
 }
 
 int TWEthereumAbiFunctionAddInArrayParamString(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, TWString *_Nonnull val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    assert(val != nullptr);
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamString>(TWStringUTF8Bytes(val)));
+    EthereumAbi::Proto::ParamType paramType;
+    // Declare the boolean type.
+    paramType.mutable_string_param();
+
+    EthereumAbi::Proto::Token token;
+    token.set_string_value(TWStringUTF8Bytes(val));
+
+    return func_in->impl.addInArrayParam(arrayIdx, std::move(paramType), std::move(token));
 }
 
 int TWEthereumAbiFunctionAddInArrayParamAddress(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, TWData *_Nonnull val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    assert(val != nullptr);
-    Data data = TW::data(TWDataBytes(val), TWDataSize(val));
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamAddress>(data));
+    EthereumAbi::Proto::ParamType paramType;
+    // Declare the boolean type.
+    paramType.mutable_address();
+
+    EthereumAbi::Proto::Token token;
+    const Data& addressData = *(reinterpret_cast<const Data*>(val));
+    bool prefixed = true;
+    auto addressStr = hex(addressData, prefixed);
+    token.set_address(addressStr);
+
+    return func_in->impl.addInArrayParam(arrayIdx, std::move(paramType), std::move(token));
 }
 
 int TWEthereumAbiFunctionAddInArrayParamBytes(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, TWData *_Nonnull val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    Data data = TW::data(TWDataBytes(val), TWDataSize(val));
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamByteArray>(data));
+    EthereumAbi::Proto::ParamType paramType;
+    // Declare the boolean type.
+    paramType.mutable_byte_array();
+
+    EthereumAbi::Proto::Token token;
+    const Data& bytesData = *(reinterpret_cast<const Data*>(val));
+    token.set_byte_array(bytesData.data(), bytesData.size());
+
+    return func_in->impl.addInArrayParam(arrayIdx, std::move(paramType), std::move(token));
 }
 
 int TWEthereumAbiFunctionAddInArrayParamBytesFix(struct TWEthereumAbiFunction *_Nonnull func_in, int arrayIdx, size_t count, TWData *_Nonnull val) {
     assert(func_in != nullptr);
-    EthAbi::Function& function = func_in->impl;
 
-    Data data = TW::data(TWDataBytes(val), TWDataSize(val));
-    return addInArrayParam(function, arrayIdx, std::make_shared<EthAbi::ParamByteArrayFix>(count, data));
+    EthereumAbi::Proto::ParamType paramType;
+    // Declare the boolean type.
+    paramType.mutable_byte_array_fix()->set_size(static_cast<uint64_t>(count));
+
+    EthereumAbi::Proto::Token token;
+    Data bytesData = *(reinterpret_cast<const Data*>(val));
+    bytesData.resize(count);
+    token.set_byte_array_fix(bytesData.data(), bytesData.size());
+
+    return func_in->impl.addInArrayParam(arrayIdx, std::move(paramType), std::move(token));
 }
diff --git a/src/interface/TWEthereumAbiValue.cpp b/src/interface/TWEthereumAbiValue.cpp
index a3dc02612af..828521133d4 100644
--- a/src/interface/TWEthereumAbiValue.cpp
+++ b/src/interface/TWEthereumAbiValue.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWEthereumAbiValue.h>
 
diff --git a/src/interface/TWEthereumMessageSigner.cpp b/src/interface/TWEthereumMessageSigner.cpp
new file mode 100644
index 00000000000..9d40be9e34c
--- /dev/null
+++ b/src/interface/TWEthereumMessageSigner.cpp
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWEthereumMessageSigner.h>
+
+#include "Ethereum/MessageSigner.h"
+
+namespace TW::internal {
+
+TWString* _Nonnull TWEthereumMessageSignerSignCommon(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message, Ethereum::MessageType msgType, Ethereum::MessageSigner::MaybeChainId chainId = std::nullopt) {
+    try {
+        const auto signature = TW::Ethereum::MessageSigner::signMessage(privateKey->impl, TWStringUTF8Bytes(message), msgType, chainId);
+        return TWStringCreateWithUTF8Bytes(signature.c_str());
+    } catch (...) {
+        return TWStringCreateWithUTF8Bytes("");
+    }
+}
+
+TWString* _Nonnull TWEthereumMessageSignerSignTypedCommon(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message, Ethereum::MessageType msgType, Ethereum::MessageSigner::MaybeChainId chainId = std::nullopt) {
+    try {
+        const auto signature = TW::Ethereum::MessageSigner::signTypedData(privateKey->impl, TWStringUTF8Bytes(message), msgType, chainId);
+        return TWStringCreateWithUTF8Bytes(signature.c_str());
+    } catch (...) {
+        return TWStringCreateWithUTF8Bytes("");
+    }
+}
+
+} // namespace TW::internal
+
+TWString* _Nonnull TWEthereumMessageSignerSignTypedMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull messageJson) {
+    return TW::internal::TWEthereumMessageSignerSignTypedCommon(privateKey, messageJson, TW::Ethereum::MessageType::Legacy);
+}
+
+TWString* _Nonnull TWEthereumMessageSignerSignTypedMessageEip155(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull messageJson, int chainId) {
+    return TW::internal::TWEthereumMessageSignerSignTypedCommon(privateKey, messageJson, TW::Ethereum::MessageType::Eip155, static_cast<std::size_t>(chainId));
+}
+
+TWString* _Nonnull TWEthereumMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message) {
+    return TW::internal::TWEthereumMessageSignerSignCommon(privateKey, message, TW::Ethereum::MessageType::Legacy);
+}
+
+TWString* _Nonnull TWEthereumMessageSignerSignMessageImmutableX(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message) {
+    return TW::internal::TWEthereumMessageSignerSignCommon(privateKey, message, TW::Ethereum::MessageType::ImmutableX);
+}
+
+TWString* _Nonnull TWEthereumMessageSignerSignMessageEip155(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message, int chainId) {
+    return TW::internal::TWEthereumMessageSignerSignCommon(privateKey, message, TW::Ethereum::MessageType::Eip155, static_cast<std::size_t>(chainId));
+}
+
+bool TWEthereumMessageSignerVerifyMessage(const struct TWPublicKey* _Nonnull publicKey, TWString* _Nonnull message, TWString* _Nonnull signature) {
+    return TW::Ethereum::MessageSigner::verifyMessage(publicKey->impl, TWStringUTF8Bytes(message), TWStringUTF8Bytes(signature));
+}
diff --git a/src/interface/TWEthereumRlp.cpp b/src/interface/TWEthereumRlp.cpp
new file mode 100644
index 00000000000..16bb66dae32
--- /dev/null
+++ b/src/interface/TWEthereumRlp.cpp
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWEthereumRlp.h>
+
+#include "rust/Wrapper.h"
+#include "Data.h"
+
+using namespace TW;
+
+TWData* _Nonnull TWEthereumRlpEncode(enum TWCoinType coin, TWData* _Nonnull input) {
+    const Data& dataIn = *(reinterpret_cast<const Data*>(input));
+
+    const Rust::TWDataWrapper dataInPtr(dataIn);
+    Rust::TWDataWrapper dataOutPtr = Rust::tw_ethereum_rlp_encode(static_cast<uint32_t>(coin), dataInPtr.get());
+
+    auto dataOut = dataOutPtr.toDataOrDefault();
+    return TWDataCreateWithBytes(dataOut.data(), dataOut.size());
+}
diff --git a/src/interface/TWFIOAccount.cpp b/src/interface/TWFIOAccount.cpp
index 4cdd419aa71..378113fb24c 100644
--- a/src/interface/TWFIOAccount.cpp
+++ b/src/interface/TWFIOAccount.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWFIOAccount.h>
 
diff --git a/src/interface/TWFilecoinAddressConverter.cpp b/src/interface/TWFilecoinAddressConverter.cpp
new file mode 100644
index 00000000000..10d6722b27a
--- /dev/null
+++ b/src/interface/TWFilecoinAddressConverter.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWFilecoinAddressConverter.h>
+#include <Filecoin/AddressConverter.h>
+
+TWString* _Nonnull TWFilecoinAddressConverterConvertToEthereum(TWString* _Nonnull filecoinAddress) {
+    const auto& address = *reinterpret_cast<const std::string*>(filecoinAddress);
+    try {
+        if (auto eth_opt = TW::Filecoin::AddressConverter::convertToEthereumString(address); eth_opt) {
+            return TWStringCreateWithUTF8Bytes(eth_opt->c_str());
+        }
+    } catch (...) {
+    }
+
+    // Return an empty string if an error occurs.
+    return TWStringCreateWithUTF8Bytes("");
+}
+
+TWString* _Nonnull TWFilecoinAddressConverterConvertFromEthereum(TWString* _Nonnull ethAddress) {
+    const auto& address = *reinterpret_cast<const std::string*>(ethAddress);
+    try {
+        std::string filecoinAddress = TW::Filecoin::AddressConverter::convertFromEthereumString(address);
+        return TWStringCreateWithUTF8Bytes(filecoinAddress.c_str());
+    } catch (...) {
+    }
+
+    // Return an empty string if an error occurs.
+    return TWStringCreateWithUTF8Bytes("");
+}
diff --git a/src/interface/TWGroestlcoinAddress.cpp b/src/interface/TWGroestlcoinAddress.cpp
index e825cc591f1..164592aba55 100644
--- a/src/interface/TWGroestlcoinAddress.cpp
+++ b/src/interface/TWGroestlcoinAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWGroestlcoinAddress.h>
 #include <TrustWalletCore/TWPublicKey.h>
diff --git a/src/interface/TWHDVersion.cpp b/src/interface/TWHDVersion.cpp
index e093336537a..5bfeb6d4ccb 100644
--- a/src/interface/TWHDVersion.cpp
+++ b/src/interface/TWHDVersion.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWHDVersion.h>
 
diff --git a/src/interface/TWHDWallet.cpp b/src/interface/TWHDWallet.cpp
index 18447aa54bd..bce0e819a6b 100644
--- a/src/interface/TWHDWallet.cpp
+++ b/src/interface/TWHDWallet.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWHDWallet.h>
 
@@ -51,7 +49,7 @@ void TWHDWalletDelete(struct TWHDWallet *wallet) {
 }
 
 TWData *_Nonnull TWHDWalletSeed(struct TWHDWallet *_Nonnull wallet) {
-    return TWDataCreateWithBytes(wallet->impl.getSeed().data(), HDWallet::seedSize);
+    return TWDataCreateWithBytes(wallet->impl.getSeed().data(), HDWallet<>::mSeedSize);
 }
 
 TWString *_Nonnull TWHDWalletMnemonic(struct TWHDWallet *_Nonnull wallet){
@@ -67,14 +65,17 @@ struct TWPrivateKey *_Nonnull TWHDWalletGetMasterKey(struct TWHDWallet *_Nonnull
 }
 
 struct TWPrivateKey *_Nonnull TWHDWalletGetKeyForCoin(struct TWHDWallet *wallet, TWCoinType coin) {
-    auto derivationPath = TW::derivationPath(coin);
-    return new TWPrivateKey{ wallet->impl.getKey(coin, derivationPath) };
+    return TWHDWalletGetKeyDerivation(wallet, coin, TWDerivationDefault);
 }
 
 TWString *_Nonnull TWHDWalletGetAddressForCoin(struct TWHDWallet *wallet, TWCoinType coin) {
-    auto derivationPath = TW::derivationPath(coin);
+    return TWHDWalletGetAddressDerivation(wallet, coin, TWDerivationDefault);
+}
+
+TWString *_Nonnull TWHDWalletGetAddressDerivation(struct TWHDWallet *wallet, TWCoinType coin, enum TWDerivation derivation) {
+    auto derivationPath = TW::derivationPath(coin, derivation);
     PrivateKey privateKey = wallet->impl.getKey(coin, derivationPath);
-    std::string address = deriveAddress(coin, privateKey);
+    std::string address = deriveAddress(coin, privateKey, derivation);
     return TWStringCreateWithUTF8Bytes(address.c_str());
 }
 
@@ -84,6 +85,11 @@ struct TWPrivateKey *_Nonnull TWHDWalletGetKey(struct TWHDWallet *_Nonnull walle
     return new TWPrivateKey{ wallet->impl.getKey(coin, path) };
 }
 
+struct TWPrivateKey *_Nonnull TWHDWalletGetKeyDerivation(struct TWHDWallet *_Nonnull wallet, enum TWCoinType coin, enum TWDerivation derivation) {
+    auto derivationPath = TW::derivationPath(coin, derivation);
+    return new TWPrivateKey{ wallet->impl.getKey(coin, derivationPath) };
+}
+
 struct TWPrivateKey *_Nonnull TWHDWalletGetDerivedKey(struct TWHDWallet *_Nonnull wallet, enum TWCoinType coin, uint32_t account, uint32_t change, uint32_t address) {
     const auto derivationPath = DerivationPath(TW::purpose(coin), TW::slip44Id(coin), account, change, address);
     return new TWPrivateKey{ wallet->impl.getKey(coin, derivationPath) };
@@ -121,7 +127,7 @@ TWString *_Nonnull TWHDWalletGetExtendedPublicKeyDerivation(struct TWHDWallet *w
 
 TWPublicKey *TWHDWalletGetPublicKeyFromExtended(TWString *_Nonnull extended, enum TWCoinType coin, TWString *_Nonnull derivationPath) {
     const auto derivationPathObject = DerivationPath(*reinterpret_cast<const std::string*>(derivationPath));
-    auto publicKey = HDWallet::getPublicKeyFromExtended(*reinterpret_cast<const std::string*>(extended), coin, derivationPathObject);
+    auto publicKey = HDWallet<>::getPublicKeyFromExtended(*reinterpret_cast<const std::string*>(extended), coin, derivationPathObject);
     if (!publicKey) {
         return nullptr;
     }
diff --git a/src/interface/TWHash.cpp b/src/interface/TWHash.cpp
index fc442c13fcd..a6a5528627d 100644
--- a/src/interface/TWHash.cpp
+++ b/src/interface/TWHash.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWHash.h>
 #include "../Hash.h"
@@ -83,6 +81,16 @@ TWData* _Nonnull TWHashSHA256SHA256(TWData* _Nonnull data) {
     return TWDataCreateWithBytes(result.data(), result.size());
 }
 
+TWData *_Nonnull TWHashBlake2bPersonal(TWData *_Nonnull data, TWData * _Nonnull personal, size_t outlen) {
+    auto resultBytes = TW::Data(outlen);
+    auto dataBytes = TWDataBytes(data);
+    auto personalBytes = TWDataBytes(personal);
+    auto personalSize = TWDataSize(personal);
+    tc_blake2b_Personal(dataBytes, static_cast<uint32_t>(TWDataSize(data)), personalBytes, personalSize, resultBytes.data(), outlen);
+    auto result = TWDataCreateWithBytes(resultBytes.data(), outlen);
+    return result;
+}
+
 TWData* _Nonnull TWHashSHA256RIPEMD(TWData* _Nonnull data) {
     const auto result = Hash::sha256ripemd(reinterpret_cast<const byte*>(TWDataBytes(data)), TWDataSize(data));
     return TWDataCreateWithBytes(result.data(), result.size());
diff --git a/src/interface/TWMnemonic.cpp b/src/interface/TWMnemonic.cpp
index f966a26ad4e..e5694b3c9a4 100644
--- a/src/interface/TWMnemonic.cpp
+++ b/src/interface/TWMnemonic.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWMnemonic.h>
 
diff --git a/src/interface/TWNEARAccount.cpp b/src/interface/TWNEARAccount.cpp
index 84dca468ef0..2c0f55ec0f9 100644
--- a/src/interface/TWNEARAccount.cpp
+++ b/src/interface/TWNEARAccount.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWNEARAccount.h>
 
diff --git a/src/interface/TWNervosAddress.cpp b/src/interface/TWNervosAddress.cpp
index 963ddf763ff..925be23fdac 100644
--- a/src/interface/TWNervosAddress.cpp
+++ b/src/interface/TWNervosAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TrustWalletCore/TWData.h"
 #include "../Base58.h"
diff --git a/src/interface/TWPBKDF2.cpp b/src/interface/TWPBKDF2.cpp
index 2ea0e4be9ec..3fae3225482 100644
--- a/src/interface/TWPBKDF2.cpp
+++ b/src/interface/TWPBKDF2.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrezorCrypto/memzero.h>
 #include <TrezorCrypto/pbkdf2.h>
diff --git a/src/interface/TWPrivateKey.cpp b/src/interface/TWPrivateKey.cpp
index ab91378d9ca..37483dca65d 100644
--- a/src/interface/TWPrivateKey.cpp
+++ b/src/interface/TWPrivateKey.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "../PrivateKey.h"
 #include "../PublicKey.h"
@@ -11,6 +9,7 @@
 #include <TrezorCrypto/rand.h>
 #include <TrezorCrypto/secp256k1.h>
 #include <TrustWalletCore/TWPrivateKey.h>
+#include <TrustWalletCore/TWCoinType.h>
 
 #include <exception>
 
@@ -62,40 +61,31 @@ TWData *TWPrivateKeyData(struct TWPrivateKey *_Nonnull pk) {
 }
 
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyNist256p1(struct TWPrivateKey *_Nonnull pk) {
-    return new TWPublicKey{ pk->impl.getPublicKey(TWPublicKeyTypeNIST256p1) };
+    return TWPrivateKeyGetPublicKeyByType(pk, TWPublicKeyTypeNIST256p1);
 }
 
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeySecp256k1(struct TWPrivateKey *_Nonnull pk, bool compressed) {
     if (compressed)  {
-        return new TWPublicKey{ pk->impl.getPublicKey(TWPublicKeyTypeSECP256k1) };
+        return TWPrivateKeyGetPublicKeyByType(pk, TWPublicKeyTypeSECP256k1);
      } else {
-        return new TWPublicKey{ pk->impl.getPublicKey(TWPublicKeyTypeSECP256k1Extended) };
+         return TWPrivateKeyGetPublicKeyByType(pk, TWPublicKeyTypeSECP256k1Extended);
      }
 }
 
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyEd25519(struct TWPrivateKey *_Nonnull pk) {
-    return new TWPublicKey{ pk->impl.getPublicKey(TWPublicKeyTypeED25519) };
+    return TWPrivateKeyGetPublicKeyByType(pk, TWPublicKeyTypeED25519);
 }
 
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyEd25519Blake2b(struct TWPrivateKey *_Nonnull pk) {
-    return new TWPublicKey{ pk->impl.getPublicKey(TWPublicKeyTypeED25519Blake2b) };
+    return TWPrivateKeyGetPublicKeyByType(pk, TWPublicKeyTypeED25519Blake2b);
 }
 
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyEd25519Cardano(struct TWPrivateKey *_Nonnull pk) {
-    return new TWPublicKey{ pk->impl.getPublicKey(TWPublicKeyTypeED25519Cardano) };
+    return TWPrivateKeyGetPublicKeyByType(pk, TWPublicKeyTypeED25519Cardano);
 }
 
 struct TWPublicKey *_Nonnull TWPrivateKeyGetPublicKeyCurve25519(struct TWPrivateKey *_Nonnull pk) {
-    return new TWPublicKey{pk->impl.getPublicKey(TWPublicKeyTypeCURVE25519)};
-}
-
-TWData *_Nullable TWPrivateKeyGetSharedKey(const struct TWPrivateKey *_Nonnull pk, const struct TWPublicKey *_Nonnull publicKey, enum TWCurve curve) {
-    auto result = pk->impl.getSharedKey(publicKey->impl, curve);
-    if (result.empty()) {
-        return nullptr;
-    } else {
-        return TWDataCreateWithBytes(result.data(), result.size());
-    }
+    return TWPrivateKeyGetPublicKeyByType(pk, TWPublicKeyTypeCURVE25519);
 }
 
 TWData *TWPrivateKeySign(struct TWPrivateKey *_Nonnull pk, TWData *_Nonnull digest, enum TWCurve curve) {
@@ -128,3 +118,11 @@ TWData *TWPrivateKeySignZilliqaSchnorr(struct TWPrivateKey *_Nonnull pk, TWData
         return TWDataCreateWithBytes(result.data(), result.size());
     }
 }
+
+struct TWPublicKey* TWPrivateKeyGetPublicKey(struct TWPrivateKey* pk, enum TWCoinType coinType) {
+    return TWPrivateKeyGetPublicKeyByType(pk, TWCoinTypePublicKeyType(coinType));
+}
+
+struct TWPublicKey* TWPrivateKeyGetPublicKeyByType(struct TWPrivateKey* pk, enum TWPublicKeyType pubkeyType) {
+    return new TWPublicKey{ pk->impl.getPublicKey(pubkeyType) };
+}
diff --git a/src/interface/TWPublicKey.cpp b/src/interface/TWPublicKey.cpp
index 61ada495ab1..6459b947a05 100644
--- a/src/interface/TWPublicKey.cpp
+++ b/src/interface/TWPublicKey.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWPublicKey.h>
 
diff --git a/src/interface/TWRippleXAddress.cpp b/src/interface/TWRippleXAddress.cpp
index f003e5614a0..4c74dae0fb6 100644
--- a/src/interface/TWRippleXAddress.cpp
+++ b/src/interface/TWRippleXAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "../XRP/XAddress.h"
 
diff --git a/src/interface/TWSegwitAddress.cpp b/src/interface/TWSegwitAddress.cpp
index 59a41db467e..5d74bdb3716 100644
--- a/src/interface/TWSegwitAddress.cpp
+++ b/src/interface/TWSegwitAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "../Bitcoin/SegwitAddress.h"
 
diff --git a/src/interface/TWSolanaAddress.cpp b/src/interface/TWSolanaAddress.cpp
index df311698057..41a03176174 100644
--- a/src/interface/TWSolanaAddress.cpp
+++ b/src/interface/TWSolanaAddress.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Solana/Address.h"
 #include <TrustWalletCore/TWSolanaAddress.h>
@@ -23,9 +21,34 @@ TWString* _Nullable TWSolanaAddressDefaultTokenAddress(struct TWSolanaAddress* _
         if (address == nullptr || tokenMintAddress == nullptr) {
             return nullptr;
         }
-        Solana::Address tokenMint = Solana::Address(TWStringUTF8Bytes(tokenMintAddress));
-        std::string defaultAddress = address->impl.defaultTokenAddress(tokenMint).string();
-        return TWStringCreateWithUTF8Bytes(defaultAddress.c_str());
+        Rust::TWStringWrapper tokenMint = TWStringUTF8Bytes(tokenMintAddress);
+        Rust::TWStringWrapper mainAddress = address->impl.string();
+
+        Rust::TWStringWrapper newTokenAddress = Rust::tw_solana_address_default_token_address(mainAddress.get(), tokenMint.get());
+
+        if (!newTokenAddress) {
+            return nullptr;
+        }
+        return TWStringCreateWithUTF8Bytes(newTokenAddress.c_str());
+    } catch (...) {
+        return nullptr;
+    }
+}
+
+TWString* _Nullable TWSolanaAddressToken2022Address(struct TWSolanaAddress* _Nonnull address, TWString* _Nonnull tokenMintAddress) {
+    try {
+        if (address == nullptr || tokenMintAddress == nullptr) {
+            return nullptr;
+        }
+        Rust::TWStringWrapper tokenMintAddressWrapper = TWStringUTF8Bytes(tokenMintAddress);
+        Rust::TWStringWrapper mainAddress = address->impl.string();
+
+        Rust::TWStringWrapper newTokenAddress = Rust::tw_solana_address_token_2022_address(mainAddress.get(), tokenMintAddressWrapper.get());
+
+        if (!newTokenAddress) {
+            return nullptr;
+        }
+        return TWStringCreateWithUTF8Bytes(newTokenAddress.c_str());
     } catch (...) {
         return nullptr;
     }
diff --git a/src/interface/TWSolanaTransaction.cpp b/src/interface/TWSolanaTransaction.cpp
new file mode 100644
index 00000000000..f555f6eb5d7
--- /dev/null
+++ b/src/interface/TWSolanaTransaction.cpp
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWSolanaTransaction.h"
+#include "DataVector.h"
+#include "rust/Wrapper.h"
+
+using namespace TW;
+
+TWData *_Nonnull TWSolanaTransactionUpdateBlockhashAndSign(TWString *_Nonnull encodedTx,
+                                                           TWString *_Nonnull recentBlockhash,
+                                                           const struct TWDataVector *_Nonnull privateKeys) {
+    auto& encodedTxRef = *reinterpret_cast<const std::string*>(encodedTx);
+    auto& recentBlockhashRef = *reinterpret_cast<const std::string*>(recentBlockhash);
+
+    Rust::TWStringWrapper encodedTxStr = encodedTxRef;
+    Rust::TWStringWrapper recentBlockhashStr = recentBlockhashRef;
+    Rust::TWDataVectorWrapper privateKeysVec = createFromTWDataVector(privateKeys);
+
+    Rust::TWDataWrapper output = Rust::tw_solana_transaction_update_blockhash_and_sign(encodedTxStr.get(),
+                                                                                       recentBlockhashStr.get(),
+                                                                                       privateKeysVec.get());
+
+    auto outputData = output.toDataOrDefault();
+    return TWDataCreateWithBytes(outputData.data(), outputData.size());
+}
+
+TWString *_Nullable TWSolanaTransactionGetComputeUnitPrice(TWString *_Nonnull encodedTx) {
+    auto& encodedTxRef = *reinterpret_cast<const std::string*>(encodedTx);
+
+    Rust::TWStringWrapper encodedTxStr = encodedTxRef;
+    Rust::TWStringWrapper maybePrice = Rust::tw_solana_transaction_get_compute_unit_price(encodedTxStr.get());
+
+    if (!maybePrice) {
+        return nullptr;
+    }
+
+    auto priceStr = maybePrice.toStringOrDefault();
+    return TWStringCreateWithUTF8Bytes(priceStr.c_str());
+}
+
+TWString *_Nullable TWSolanaTransactionGetComputeUnitLimit(TWString *_Nonnull encodedTx) {
+    auto& encodedTxRef = *reinterpret_cast<const std::string*>(encodedTx);
+
+    Rust::TWStringWrapper encodedTxStr = encodedTxRef;
+    Rust::TWStringWrapper maybeLimit = Rust::tw_solana_transaction_get_compute_unit_limit(encodedTxStr.get());
+
+    if (!maybeLimit) {
+        return nullptr;
+    }
+
+    auto limitStr = maybeLimit.toStringOrDefault();
+    return TWStringCreateWithUTF8Bytes(limitStr.c_str());
+}
+
+TWString *_Nullable TWSolanaTransactionSetComputeUnitPrice(TWString *_Nonnull encodedTx, TWString *_Nonnull price) {
+    auto& encodedTxRef = *reinterpret_cast<const std::string*>(encodedTx);
+    auto& priceRef = *reinterpret_cast<const std::string*>(price);
+
+    Rust::TWStringWrapper encodedTxStr = encodedTxRef;
+    Rust::TWStringWrapper priceStr = priceRef;
+
+    Rust::TWStringWrapper updatedTxStr = Rust::tw_solana_transaction_set_compute_unit_price(encodedTxStr.get(), priceStr.get());
+
+    if (!updatedTxStr) {
+        return nullptr;
+    }
+
+    auto updatedTx = updatedTxStr.toStringOrDefault();
+    return TWStringCreateWithUTF8Bytes(updatedTx.c_str());
+}
+
+TWString *_Nullable TWSolanaTransactionSetComputeUnitLimit(TWString *_Nonnull encodedTx, TWString *_Nonnull limit) {
+    auto& encodedTxRef = *reinterpret_cast<const std::string*>(encodedTx);
+    auto& limitRef = *reinterpret_cast<const std::string*>(limit);
+
+    Rust::TWStringWrapper encodedTxStr = encodedTxRef;
+    Rust::TWStringWrapper limitStr = limitRef;
+
+    Rust::TWStringWrapper updatedTxStr = Rust::tw_solana_transaction_set_compute_unit_limit(encodedTxStr.get(), limitStr.get());
+
+    if (!updatedTxStr) {
+        return nullptr;
+    }
+
+    auto updatedTx = updatedTxStr.toStringOrDefault();
+    return TWStringCreateWithUTF8Bytes(updatedTx.c_str());
+}
diff --git a/src/interface/TWStarkExMessageSigner.cpp b/src/interface/TWStarkExMessageSigner.cpp
new file mode 100644
index 00000000000..a17df64afc6
--- /dev/null
+++ b/src/interface/TWStarkExMessageSigner.cpp
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWStarkExMessageSigner.h>
+
+#include "StarkEx/MessageSigner.h"
+
+TWString* _Nonnull TWStarkExMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message) {
+    try {
+        const auto signature = TW::StarkEx::MessageSigner::signMessage(privateKey->impl, TWStringUTF8Bytes(message));
+        return TWStringCreateWithUTF8Bytes(signature.c_str());
+    } catch (...) {
+        return TWStringCreateWithUTF8Bytes("");
+    }
+}
+
+bool TWStarkExMessageSignerVerifyMessage(const struct TWPublicKey* _Nonnull publicKey, TWString* _Nonnull message, TWString* _Nonnull signature) {
+    return TW::StarkEx::MessageSigner::verifyMessage(publicKey->impl, TWStringUTF8Bytes(message), TWStringUTF8Bytes(signature));
+}
diff --git a/src/interface/TWStarkWare.cpp b/src/interface/TWStarkWare.cpp
new file mode 100644
index 00000000000..a8f36656b12
--- /dev/null
+++ b/src/interface/TWStarkWare.cpp
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWStarkWare.h>
+#include <ImmutableX/StarkKey.h>
+#include <HexCoding.h>
+#include <DerivationPath.h>
+#include <string>
+
+struct TWPrivateKey* TWStarkWareGetStarkKeyFromSignature(const struct TWDerivationPath* derivationPath, TWString* signature) {
+    using namespace TW;
+    const auto& ethSignatureStr = *reinterpret_cast<const std::string*>(signature);
+    return new TWPrivateKey{ ImmutableX::getPrivateKeyFromRawSignature(parse_hex(ethSignatureStr), derivationPath->impl)};
+}
diff --git a/src/interface/TWStoredKey.cpp b/src/interface/TWStoredKey.cpp
index bccd49a9a03..f756ce5e6b3 100644
--- a/src/interface/TWStoredKey.cpp
+++ b/src/interface/TWStoredKey.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWStoredKey.h>
 
@@ -25,33 +23,50 @@ struct TWStoredKey* _Nullable TWStoredKeyLoad(TWString* _Nonnull path) {
     }
 }
 
-struct TWStoredKey* _Nonnull TWStoredKeyCreateLevel(TWString* _Nonnull name, TWData* _Nonnull password, enum TWStoredKeyEncryptionLevel encryptionLevel) {
+struct TWStoredKey* _Nonnull TWStoredKeyCreateLevelAndEncryption(TWString* _Nonnull name, TWData* _Nonnull password, enum TWStoredKeyEncryptionLevel encryptionLevel, enum TWStoredKeyEncryption encryption) {
     const auto& nameString = *reinterpret_cast<const std::string*>(name);
     const auto passwordData = TW::data(TWDataBytes(password), TWDataSize(password));
-    return new TWStoredKey{ KeyStore::StoredKey::createWithMnemonicRandom(nameString, passwordData, encryptionLevel) };
+    return new TWStoredKey{ KeyStore::StoredKey::createWithMnemonicRandom(nameString, passwordData, encryptionLevel, encryption) };
+}
+
+struct TWStoredKey* _Nonnull TWStoredKeyCreateLevel(TWString* _Nonnull name, TWData* _Nonnull password, enum TWStoredKeyEncryptionLevel encryptionLevel) {
+   return TWStoredKeyCreateLevelAndEncryption(name, password, encryptionLevel, TWStoredKeyEncryptionAes128Ctr);
+}
+
+struct TWStoredKey* _Nonnull TWStoredKeyCreateEncryption(TWString* _Nonnull name, TWData* _Nonnull password, enum TWStoredKeyEncryption encryption) {
+    return TWStoredKeyCreateLevelAndEncryption(name, password, TWStoredKeyEncryptionLevelDefault, encryption);
 }
 
 struct TWStoredKey* _Nonnull TWStoredKeyCreate(TWString* _Nonnull name, TWData* _Nonnull password) {
-    return TWStoredKeyCreateLevel(name, password, TWStoredKeyEncryptionLevelDefault);
+    return TWStoredKeyCreateLevelAndEncryption(name, password, TWStoredKeyEncryptionLevelDefault, TWStoredKeyEncryptionAes128Ctr);
 }
 
 struct TWStoredKey* _Nullable TWStoredKeyImportPrivateKey(TWData* _Nonnull privateKey, TWString* _Nonnull name, TWData* _Nonnull password, enum TWCoinType coin) {
+    return TWStoredKeyImportPrivateKeyWithEncryption(privateKey, name, password, coin, TWStoredKeyEncryptionAes128Ctr);
+}
+
+struct TWStoredKey* _Nullable TWStoredKeyImportPrivateKeyWithEncryption(TWData* _Nonnull privateKey, TWString* _Nonnull name, TWData* _Nonnull password, enum TWCoinType coin, enum TWStoredKeyEncryption encryption) {
     try {
         const auto& privateKeyData = *reinterpret_cast<const TW::Data*>(privateKey);
         const auto& nameString = *reinterpret_cast<const std::string*>(name);
         const auto passwordData = TW::data(TWDataBytes(password), TWDataSize(password));
-        return new TWStoredKey{ KeyStore::StoredKey::createWithPrivateKeyAddDefaultAddress(nameString, passwordData, coin, privateKeyData) };
+        return new TWStoredKey{ KeyStore::StoredKey::createWithPrivateKeyAddDefaultAddress(nameString, passwordData, coin, privateKeyData, encryption) };
     } catch (...) {
         return nullptr;
     }
 }
 
 struct TWStoredKey* _Nullable TWStoredKeyImportHDWallet(TWString* _Nonnull mnemonic, TWString* _Nonnull name, TWData* _Nonnull password, enum TWCoinType coin) {
+    return TWStoredKeyImportHDWalletWithEncryption(mnemonic, name, password, coin, TWStoredKeyEncryptionAes128Ctr);
+}
+
+
+struct TWStoredKey* _Nullable TWStoredKeyImportHDWalletWithEncryption(TWString* _Nonnull mnemonic, TWString* _Nonnull name, TWData* _Nonnull password, enum TWCoinType coin, enum TWStoredKeyEncryption encryption) {
     try {
         const auto& mnemonicString = *reinterpret_cast<const std::string*>(mnemonic);
         const auto& nameString = *reinterpret_cast<const std::string*>(name);
         const auto passwordData = TW::data(TWDataBytes(password), TWDataSize(password));
-        return new TWStoredKey{ KeyStore::StoredKey::createWithMnemonicAddDefaultAddress(nameString, passwordData, mnemonicString, coin) };
+        return new TWStoredKey{ KeyStore::StoredKey::createWithMnemonicAddDefaultAddress(nameString, passwordData, mnemonicString, coin, encryption) };
     } catch (...) {
         return nullptr;
     }
@@ -209,6 +224,14 @@ bool TWStoredKeyFixAddresses(struct TWStoredKey* _Nonnull key, TWData* _Nonnull
     }
 }
 
+bool TWStoredKeyUpdateAddress(struct TWStoredKey* _Nonnull key, enum TWCoinType coin) {
+    try {
+        return key->impl.updateAddress(coin);
+    } catch (...) {
+        return false;
+    }
+}
+
 TWString* _Nullable TWStoredKeyEncryptionParameters(struct TWStoredKey* _Nonnull key) {
     if (!key->impl.id) {
         return nullptr;
diff --git a/src/interface/TWString+Hex.cpp b/src/interface/TWString+Hex.cpp
index 65021dcaeb9..f2802f8c6a8 100644
--- a/src/interface/TWString+Hex.cpp
+++ b/src/interface/TWString+Hex.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWData.h>
 #include <TrustWalletCore/TWString.h>
diff --git a/src/interface/TWString.cpp b/src/interface/TWString.cpp
index 2812a1c94d1..3641660b8d8 100644
--- a/src/interface/TWString.cpp
+++ b/src/interface/TWString.cpp
@@ -1,11 +1,10 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 
 #include <TrustWalletCore/TWString.h>
+#include <TrezorCrypto/memzero.h>
 #include <string>
 
 TWString *_Nonnull TWStringCreateWithUTF8Bytes(const char *_Nonnull bytes) {
@@ -34,8 +33,12 @@ const char *_Nonnull TWStringUTF8Bytes(TWString *_Nonnull string) {
 }
 
 void TWStringDelete(TWString *_Nonnull string) {
-    auto* s = reinterpret_cast<const std::string*>(string);
-    delete s;
+    auto *sConst = reinterpret_cast<const std::string*>(string);
+    // `const_cast` is safe here despite that the pointer to the string is const
+    // but `std::string` is not a constant value.
+    auto *s = const_cast<std::string*>(sConst);
+    memzero(s->data(), s->size());
+    delete sConst;
 }
 
 bool TWStringEqual(TWString *_Nonnull lhs, TWString *_Nonnull rhs) {
diff --git a/src/interface/TWTONAddressConverter.cpp b/src/interface/TWTONAddressConverter.cpp
new file mode 100644
index 00000000000..4113448ad24
--- /dev/null
+++ b/src/interface/TWTONAddressConverter.cpp
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWTONAddressConverter.h>
+
+#include "Base64.h"
+#include "rust/Wrapper.h"
+
+using namespace TW;
+
+TWString *_Nullable TWTONAddressConverterToBoc(TWString *_Nonnull address) {
+    auto& addressString = *reinterpret_cast<const std::string*>(address);
+
+    const Rust::TWStringWrapper addressRustStr = addressString;
+    const Rust::TWStringWrapper bocRustStr = Rust::tw_ton_address_converter_to_boc(addressRustStr.get());
+    if (!bocRustStr) {
+        return nullptr;
+    }
+
+    return TWStringCreateWithUTF8Bytes(bocRustStr.c_str());
+}
+
+TWString *_Nullable TWTONAddressConverterFromBoc(TWString *_Nonnull boc) {
+    auto& bocEncoded = *reinterpret_cast<const std::string*>(boc);
+
+    const Rust::TWStringWrapper bocRustStr = bocEncoded;
+    const Rust::TWStringWrapper addressRustStr = Rust::tw_ton_address_converter_from_boc(bocRustStr.get());
+    if (!addressRustStr) {
+        return nullptr;
+    }
+
+    return TWStringCreateWithUTF8Bytes(addressRustStr.c_str());
+}
+
+TWString *_Nullable TWTONAddressConverterToUserFriendly(TWString *_Nonnull address, bool bounceable, bool testnet) {
+    auto& addressString = *reinterpret_cast<const std::string*>(address);
+
+    const Rust::TWStringWrapper addressRustStr = addressString;
+    const Rust::TWStringWrapper userFriendlyRustStr = Rust::tw_ton_address_converter_to_user_friendly(addressRustStr.get(), bounceable, testnet);
+    if (!userFriendlyRustStr) {
+        return nullptr;
+    }
+
+    return TWStringCreateWithUTF8Bytes(userFriendlyRustStr.c_str());
+}
diff --git a/src/interface/TWTONMessageSigner.cpp b/src/interface/TWTONMessageSigner.cpp
new file mode 100644
index 00000000000..3795470fbbe
--- /dev/null
+++ b/src/interface/TWTONMessageSigner.cpp
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWTONMessageSigner.h"
+#include "rust/Wrapper.h"
+#include "PrivateKey.h"
+
+using namespace TW;
+
+TWString *_Nullable TWTONMessageSignerSignMessage(struct TWPrivateKey *_Nonnull privateKey, TWString* _Nonnull message) {
+    auto* privateKeyRustRaw = Rust::tw_private_key_create_with_data(privateKey->impl.bytes.data(), privateKey->impl.bytes.size());
+    const auto privateKeyRust = std::shared_ptr<Rust::TWPrivateKey>(privateKeyRustRaw, Rust::tw_private_key_delete);
+
+    Rust::TWStringWrapper messageRust = TWStringUTF8Bytes(message);
+    Rust::TWStringWrapper signature = Rust::tw_ton_message_signer_sign_message(privateKeyRust.get(), messageRust.get());
+
+    if (!signature) {
+        return nullptr;
+    }
+    return TWStringCreateWithUTF8Bytes(signature.c_str());
+}
diff --git a/src/interface/TWTONWallet.cpp b/src/interface/TWTONWallet.cpp
new file mode 100644
index 00000000000..7e6495491ab
--- /dev/null
+++ b/src/interface/TWTONWallet.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWTONWallet.h"
+#include "rust/Wrapper.h"
+#include "PublicKey.h"
+
+using namespace TW;
+
+TWString *_Nullable TWTONWalletBuildV4R2StateInit(struct TWPublicKey *_Nonnull publicKey, int32_t workchain, int32_t walletId) {
+    auto keyType = static_cast<uint32_t>(TWPublicKeyKeyType(publicKey));
+    auto* publicKeyRustRaw = Rust::tw_public_key_create_with_data(publicKey->impl.bytes.data(), publicKey->impl.bytes.size(), keyType);
+    const auto publicKeyRust = Rust::wrapTWPublicKey(publicKeyRustRaw);
+
+    Rust::TWStringWrapper stateInit = Rust::tw_ton_wallet_build_v4_r2_state_init(publicKeyRust.get(), workchain, walletId);
+    if (!stateInit) {
+        return nullptr;
+    }
+    return TWStringCreateWithUTF8Bytes(stateInit.c_str());
+}
diff --git a/src/interface/TWTezosMessageSigner.cpp b/src/interface/TWTezosMessageSigner.cpp
new file mode 100644
index 00000000000..af09a2a2e77
--- /dev/null
+++ b/src/interface/TWTezosMessageSigner.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWTezosMessageSigner.h>
+#include "Tezos/MessageSigner.h"
+
+bool TWTezosMessageSignerVerifyMessage(const struct TWPublicKey* _Nonnull publicKey, TWString* _Nonnull message, TWString* _Nonnull signature) {
+    return TW::Tezos::MessageSigner::verifyMessage(publicKey->impl, TWStringUTF8Bytes(message), TWStringUTF8Bytes(signature));
+}
+
+TWString* _Nonnull TWTezosMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message) {
+    try {
+        const auto signature = TW::Tezos::MessageSigner::signMessage(privateKey->impl, TWStringUTF8Bytes(message));
+        return TWStringCreateWithUTF8Bytes(signature.c_str());
+    } catch (...) {
+        return TWStringCreateWithUTF8Bytes("");
+    }
+}
+
+TWString* TWTezosMessageSignerFormatMessage(TWString* _Nonnull message, TWString* _Nonnull url) {
+    const auto formatedMessage = TW::Tezos::MessageSigner::formatMessage(TWStringUTF8Bytes(message), TWStringUTF8Bytes(url));
+    return TWStringCreateWithUTF8Bytes(formatedMessage.c_str());
+}
+
+TWString* TWTezosMessageSignerInputToPayload(TWString* message) {
+    const auto payload = TW::Tezos::MessageSigner::inputToPayload(TWStringUTF8Bytes(message));
+    return TWStringCreateWithUTF8Bytes(payload.c_str());
+}
diff --git a/src/interface/TWTransactionCompiler.cpp b/src/interface/TWTransactionCompiler.cpp
index bd8b6bcf051..5db643063ee 100644
--- a/src/interface/TWTransactionCompiler.cpp
+++ b/src/interface/TWTransactionCompiler.cpp
@@ -1,59 +1,43 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWTransactionCompiler.h>
 
 #include "TransactionCompiler.h"
-#include "Data.h"
-#include "uint256.h"
+#include "DataVector.h"
 
 #include <cassert>
 
 using namespace TW;
 
-
-TWData *_Nonnull TWTransactionCompilerBuildInput(enum TWCoinType coinType, TWString *_Nonnull from, TWString *_Nonnull to, TWString *_Nonnull amount, TWString *_Nonnull asset, TWString *_Nonnull memo, TWString *_Nonnull chainId) {
+TWData *_Nonnull TWTransactionCompilerPreImageHashes(enum TWCoinType coinType, TWData *_Nonnull txInputData) {
     Data result;
     try {
-        result = TransactionCompiler::buildInput(
-            coinType,
-            std::string(TWStringUTF8Bytes(from)),
-            std::string(TWStringUTF8Bytes(to)),
-            std::string(TWStringUTF8Bytes(amount)),
-            std::string(TWStringUTF8Bytes(asset)),
-            std::string(TWStringUTF8Bytes(memo)),
-            std::string(TWStringUTF8Bytes(chainId))
-        );
+        assert(txInputData != nullptr);
+        const Data inputData = data(TWDataBytes(txInputData), TWDataSize(txInputData));
+
+        result = TransactionCompiler::preImageHashes(coinType, inputData);
     } catch (...) {} // return empty
     return TWDataCreateWithBytes(result.data(), result.size());
 }
 
-std::vector<Data> createFromTWDataVector(const struct TWDataVector* _Nonnull dataVector) {
-    std::vector<Data> ret;
-    const auto n = TWDataVectorSize(dataVector);
-    for (auto i = 0ul; i < n; ++i) {
-        auto elem = TWDataVectorGet(dataVector, i);
-        ret.push_back(*(static_cast<const Data*>(elem)));
-        TWDataDelete(elem);
-    }
-    return ret;
-}
-
-TWData *_Nonnull TWTransactionCompilerPreImageHashes(enum TWCoinType coinType, TWData *_Nonnull txInputData) {
+TWData *_Nonnull TWTransactionCompilerCompileWithSignatures(enum TWCoinType coinType, TWData *_Nonnull txInputData, const struct TWDataVector *_Nonnull signatures, const struct TWDataVector *_Nonnull publicKeys) {
     Data result;
     try {
         assert(txInputData != nullptr);
         const Data inputData = data(TWDataBytes(txInputData), TWDataSize(txInputData));
+        assert(signatures != nullptr);
+        const auto signaturesVec = createFromTWDataVector(signatures);
+        assert(publicKeys != nullptr);
+        const auto publicKeysVec = createFromTWDataVector(publicKeys);
 
-        result = TransactionCompiler::preImageHashes(coinType, inputData);
+        result  = TransactionCompiler::compileWithSignatures(coinType, inputData, signaturesVec, publicKeysVec);
     } catch (...) {} // return empty
     return TWDataCreateWithBytes(result.data(), result.size());
 }
 
-TWData *_Nonnull TWTransactionCompilerCompileWithSignatures(enum TWCoinType coinType, TWData *_Nonnull txInputData, const struct TWDataVector *_Nonnull signatures, const struct TWDataVector *_Nonnull publicKeys) {
+TWData *_Nonnull TWTransactionCompilerCompileWithSignaturesAndPubKeyType(enum TWCoinType coinType, TWData *_Nonnull txInputData, const struct TWDataVector *_Nonnull signatures, const struct TWDataVector *_Nonnull publicKeys, enum TWPublicKeyType pubKeyType) {
     Data result;
     try {
         assert(txInputData != nullptr);
@@ -63,7 +47,7 @@ TWData *_Nonnull TWTransactionCompilerCompileWithSignatures(enum TWCoinType coin
         assert(publicKeys != nullptr);
         const auto publicKeysVec = createFromTWDataVector(publicKeys);
 
-        result  = TransactionCompiler::compileWithSignatures(coinType, inputData, signaturesVec, publicKeysVec);
+        result  = TransactionCompiler::compileWithSignaturesAndPubKeyType(coinType, inputData, signaturesVec, publicKeysVec, pubKeyType);
     } catch (...) {} // return empty
     return TWDataCreateWithBytes(result.data(), result.size());
 }
diff --git a/src/interface/TWTransactionDecoder.cpp b/src/interface/TWTransactionDecoder.cpp
new file mode 100644
index 00000000000..b8083494e42
--- /dev/null
+++ b/src/interface/TWTransactionDecoder.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWTransactionDecoder.h"
+#include "rust/Wrapper.h"
+
+using namespace TW;
+
+TWData *_Nonnull TWTransactionDecoderDecode(enum TWCoinType coinType, TWData *_Nonnull encodedTx) {
+    const Data& txData = *(reinterpret_cast<const Data*>(encodedTx));
+
+    const Rust::TWDataWrapper txDataPtr(txData);
+    const Rust::TWDataWrapper outputDataPtr = Rust::tw_transaction_decoder_decode(static_cast<uint32_t>(coinType), txDataPtr.get());
+
+    const auto outputData = outputDataPtr.toDataOrDefault();
+    return TWDataCreateWithBytes(outputData.data(), outputData.size());
+}
diff --git a/src/interface/TWTranscationUtil.cpp b/src/interface/TWTranscationUtil.cpp
new file mode 100644
index 00000000000..3f99dd81a83
--- /dev/null
+++ b/src/interface/TWTranscationUtil.cpp
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWTransactionUtil.h"
+#include "rust/Wrapper.h"
+
+using namespace TW;
+
+TWString* _Nullable TWTransactionUtilCalcTxHash(enum TWCoinType coinType, TWString* _Nonnull encodedTx) {
+    try {
+        if (encodedTx == nullptr) {
+            return nullptr;
+        }
+        const Rust::TWStringWrapper encodedTxWrapper = TWStringUTF8Bytes(encodedTx);
+
+        const Rust::TWStringWrapper outputDataPtr = Rust::tw_transaction_util_calc_tx_hash(static_cast<uint32_t>(coinType), encodedTxWrapper.get());
+        if (!outputDataPtr) {
+            return nullptr;
+        }
+
+        return TWStringCreateWithUTF8Bytes(outputDataPtr.c_str());
+    } catch (...) {
+        return nullptr;
+    }
+}
diff --git a/src/interface/TWTronMessageSigner.cpp b/src/interface/TWTronMessageSigner.cpp
new file mode 100644
index 00000000000..5fe47eba53b
--- /dev/null
+++ b/src/interface/TWTronMessageSigner.cpp
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWTronMessageSigner.h>
+#include "Tron/MessageSigner.h"
+
+TWString* _Nonnull TWTronMessageSignerSignMessage(const struct TWPrivateKey* _Nonnull privateKey, TWString* _Nonnull message) {
+    try {
+        const auto signature = TW::Tron::MessageSigner::signMessage(privateKey->impl, TWStringUTF8Bytes(message));
+        return TWStringCreateWithUTF8Bytes(signature.c_str());
+    } catch (...) {
+        return TWStringCreateWithUTF8Bytes("");
+    }
+}
+
+bool TWTronMessageSignerVerifyMessage(const struct TWPublicKey* _Nonnull publicKey, TWString* _Nonnull message, TWString* _Nonnull signature) {
+    return TW::Tron::MessageSigner::verifyMessage(publicKey->impl, TWStringUTF8Bytes(message), TWStringUTF8Bytes(signature));
+}
diff --git a/src/interface/TWWalletConnectRequest.cpp b/src/interface/TWWalletConnectRequest.cpp
new file mode 100644
index 00000000000..37fc49cbc87
--- /dev/null
+++ b/src/interface/TWWalletConnectRequest.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWWalletConnectRequest.h>
+
+#include "rust/Wrapper.h"
+
+using namespace TW;
+
+TWData* _Nonnull TWWalletConnectRequestParse(enum TWCoinType coin, TWData* _Nonnull input) {
+    const Data& inputData = *reinterpret_cast<const Data*>(input);
+    Rust::TWDataWrapper twInputData = inputData;
+
+    Rust::TWDataWrapper twOutputData = Rust::tw_wallet_connect_request_parse(static_cast<uint32_t>(coin), twInputData.get());
+    auto outputData = twOutputData.toDataOrDefault();
+    return TWDataCreateWithBytes(outputData.data(), outputData.size());
+}
diff --git a/src/interface/TWWebAuthn.cpp b/src/interface/TWWebAuthn.cpp
new file mode 100644
index 00000000000..7291ec0c7b8
--- /dev/null
+++ b/src/interface/TWWebAuthn.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWWebAuthn.h>
+#include <string>
+#include "WebAuthn.h"
+#include "AsnParser.h"
+
+struct TWPublicKey *_Nullable TWWebAuthnGetPublicKey(TWData *_Nonnull attestationObject) {
+    const auto& attestationObjectData = *reinterpret_cast<const TW::Data*>(attestationObject);
+    const auto publicKey = TW::WebAuthn::getPublicKey(attestationObjectData);
+    if (publicKey.has_value()) {
+        return new TWPublicKey{ TW::PublicKey(publicKey.value()) };
+    } else {
+        return nullptr;
+    }
+}
+
+TWData *_Nonnull TWWebAuthnGetRSValues(TWData *_Nonnull signature) {
+    const auto& signatureData = *reinterpret_cast<const TW::Data*>(signature);
+    const auto& rsValues = TW::ASN::AsnParser::ecdsa_signature_from_der(signatureData);
+    return TWDataCreateWithData(&rsValues);
+}
+
+TWData *_Nonnull TWWebAuthnReconstructOriginalMessage(TWData* _Nonnull authenticatorData, TWData* _Nonnull clientDataJSON) {
+    const auto& authenticatorDataConverted = *reinterpret_cast<const TW::Data*>(authenticatorData);
+    const auto& clientDataJSONConverted = *reinterpret_cast<const TW::Data*>(clientDataJSON);
+    const auto& message = TW::WebAuthn::reconstructSignedMessage(authenticatorDataConverted, clientDataJSONConverted);
+    return TWDataCreateWithData(&message);
+}
diff --git a/src/memory/memzero_wrapper.h b/src/memory/memzero_wrapper.h
index be8c7859e4d..71af4291e78 100644
--- a/src/memory/memzero_wrapper.h
+++ b/src/memory/memzero_wrapper.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/operators/equality_comparable.h b/src/operators/equality_comparable.h
index aa2fd02f34b..4309afbc1ff 100644
--- a/src/operators/equality_comparable.h
+++ b/src/operators/equality_comparable.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/src/proto/Aeternity.proto b/src/proto/Aeternity.proto
index 8a20764369a..98c5fe5b28d 100644
--- a/src/proto/Aeternity.proto
+++ b/src/proto/Aeternity.proto
@@ -11,8 +11,10 @@ message SigningInput {
     // Address of the recipient with "ak_" prefix
     string to_address = 2;
 
+    // Amount (uint256, serialized big endian)
     bytes amount = 3;
 
+    // Fee amount (uint256, serialized big endian)
     bytes fee = 4;
 
     // Message, optional
@@ -21,15 +23,18 @@ message SigningInput {
     // Time to live until block height
     uint64 ttl = 6;
 
+    // Nonce (should be larger than in the last transaction of the account)
     uint64 nonce = 7;
 
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 8;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes, Base64 with checksum
     string encoded = 1;
+
     // Signature, Base58 with checksum
     string signature = 2;
 }
diff --git a/src/proto/Aion.proto b/src/proto/Aion.proto
index 771e6774171..f4ac15ce4e8 100644
--- a/src/proto/Aion.proto
+++ b/src/proto/Aion.proto
@@ -3,38 +3,46 @@ syntax = "proto3";
 package TW.Aion.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
 // Input data necessary to create a signed transaction.
 message SigningInput {
-    // Nonce (256-bit number)
+    // Nonce (uint256, serialized big endian)
     bytes nonce = 1;
 
-    // Gas price (256-bit number)
+    // Gas price (uint256, serialized big endian)
     bytes gas_price = 2;
 
-    // Gas limit (256-bit number)
+    // Gas limit (uint256, serialized big endian)
     bytes gas_limit = 3;
 
     // Recipient's address.
     string to_address = 4;
 
-    // Amount to send in wei (256-bit number)
+    // Amount to send in wei (uint256, serialized big endian)
     bytes amount = 5;
 
     // Optional payload
     bytes payload = 6;
 
-    // Private key.
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 7;
 
     // Timestamp
     uint64 timestamp = 8;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
 
     // Signature.
     bytes signature = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 3;
+
+    // error description
+    string error_message = 4;
 }
diff --git a/src/proto/Algorand.proto b/src/proto/Algorand.proto
index 937493e51a9..744a2562070 100644
--- a/src/proto/Algorand.proto
+++ b/src/proto/Algorand.proto
@@ -3,18 +3,32 @@ syntax = "proto3";
 package TW.Algorand.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// Simple transfer message, transfer an amount to an address
 message Transfer {
+    // Destination address (string)
     string to_address = 1;
+
+    // Amount
     uint64 amount = 2;
 }
 
+// Asset Transfer message, with assetID
 message AssetTransfer {
+    // Destination address (string)
     string to_address = 1;
+
+    // Amount
     uint64 amount = 2;
+
+    // ID of the asset being transferred
     uint64 asset_id = 3;
 }
 
+// Opt-in message for an asset
 message AssetOptIn {
+    // ID of the asset
     uint64 asset_id = 1;
 }
 
@@ -22,19 +36,28 @@ message AssetOptIn {
 message SigningInput {
     // network / chain id
     string genesis_id = 1;
+
     // network / chain hash
     bytes genesis_hash = 2;
+
     // binary note data
     bytes note = 3;
-    // private key
+
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 4;
+
     // network / first round
     uint64 first_round = 5;
+
     // network / last round
     uint64 last_round = 6;
-    // fee
+
+    // fee amount
     uint64 fee = 7;
+    // public key
+    bytes public_key = 8;
 
+    // message payload
     oneof message_oneof {
         Transfer transfer = 10;
         AssetTransfer asset_transfer = 11;
@@ -42,8 +65,17 @@ message SigningInput {
     }
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
+
+    // Signature in base64.
+    string signature = 2;
+
+    // Error code, 0 is ok, other codes will be treated as errors.
+    Common.Proto.SigningError error = 3;
+
+    // Error description.
+    string error_message = 4;
 }
diff --git a/src/proto/Aptos.proto b/src/proto/Aptos.proto
new file mode 100644
index 00000000000..6323e2e16d1
--- /dev/null
+++ b/src/proto/Aptos.proto
@@ -0,0 +1,198 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.Aptos.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+// Necessary fields to process a TransferMessage
+message TransferMessage {
+  // Destination Account address (string)
+  string to = 1;
+  // Amount to be transferred (uint64)
+  uint64 amount = 2;
+}
+
+// Necessary tag for type function argument
+message StructTag {
+  // Address of the account
+  string account_address = 1;
+  // Module name
+  string module = 2;
+  // Identifier
+  string name = 3;
+}
+
+// Necessary fields to process a `0x1::coin::transfer` function.
+message TokenTransferMessage {
+  // Destination Account address (string)
+  string to = 1;
+  // Amount to be transferred (uint64)
+  uint64 amount = 2;
+  // token function to call, e.g BTC: 0x43417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b9::coins::BTC
+  StructTag function = 3;
+}
+
+// Necessary fields to process a `0x1::aptos_account::transfer_coins` function.
+// Can be used to transfer tokens with registering the recipient account if needed.
+message TokenTransferCoinsMessage {
+  // Destination Account address (string)
+  string to = 1;
+  // Amount to be transferred (uint64)
+  uint64 amount = 2;
+  // token function to call, e.g BTC: 0x43417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b9::coins::BTC
+  StructTag function = 3;
+}
+
+// Necessary fields to process a ManagedTokensRegisterMessage
+message ManagedTokensRegisterMessage {
+  // token function to register, e.g BTC: 0x43417434fd869edee76cca2a4d2301e528a1551b1d719b75c350c3c97d15b8b9::coins::BTC
+  StructTag function = 1;
+}
+
+// Necessary fields to process a CreateAccountMessage
+message CreateAccountMessage {
+  // auth account address to create
+  string auth_key = 1;
+}
+
+// Necessary fields to process an OfferNftMessage
+message OfferNftMessage {
+  // Receiver address
+  string receiver = 1;
+  // Creator address
+  string creator = 2;
+  // Name of the collection
+  string collectionName = 3;
+  // Name of the NFT
+  string name = 4;
+  // Property version (should be often 0)
+  uint64 property_version = 5;
+  // Amount of NFT's to transfer (should be often 1)
+  uint64 amount = 6;
+}
+
+// Necessary fields to process an CancelOfferNftMessage
+message CancelOfferNftMessage {
+  // Receiver address
+  string receiver = 1;
+  // Creator address
+  string creator = 2;
+  // Name of the collection
+  string collectionName = 3;
+  // Name of the NFT
+  string name = 4;
+  // Property version (should be often 0)
+  uint64 property_version = 5;
+}
+
+// Necessary fields to process an ClaimNftMessage
+message ClaimNftMessage {
+  // Sender address
+  string sender = 1;
+  // Creator address
+  string creator = 2;
+  // Name of the collection
+  string collectionName = 3;
+  // Name of the NFT
+  string name = 4;
+  // Property version (should be often 0)
+  uint64 property_version = 5;
+}
+
+message TortugaClaim {
+  // idx of ticket to claim
+  uint64 idx = 1;
+}
+
+message TortugaStake {
+  // Amount to be stake
+  uint64 amount = 1;
+}
+
+message TortugaUnstake {
+  // Amount to be stake
+  uint64 amount = 1;
+}
+
+message LiquidStaking {
+  // Smart contract address of liquid staking module
+  string smart_contract_address = 1;
+
+  oneof liquid_stake_transaction_payload {
+    TortugaStake stake = 2;
+    TortugaUnstake unstake = 3;
+    TortugaClaim claim = 4;
+  }
+}
+
+message NftMessage {
+  oneof nft_transaction_payload {
+    OfferNftMessage offer_nft = 1;
+    CancelOfferNftMessage cancel_offer_nft = 2;
+    ClaimNftMessage claim_nft = 3;
+  }
+}
+
+// Input data necessary to create a signed transaction.
+message SigningInput {
+  // Sender Account address (string)
+  string sender = 1;
+  // Sequence number, incremented atomically for each tx present on the account, start at 0 (int64)
+  int64 sequence_number = 2;
+  // Max gas amount that the user is willing to pay (uint64)
+  uint64 max_gas_amount = 3;
+  // Gas unit price - queried through API (uint64)
+  uint64 gas_unit_price = 4;
+  // Expiration timestamp for the transaction, can't be in the past (uint64)
+  uint64 expiration_timestamp_secs = 5;
+  //  Chain id 1 (mainnet) 32(devnet) (uint32 - casted in uint8_t later)
+  uint32 chain_id = 6;
+  //  Private key to sign the transaction (bytes)
+  bytes private_key = 7;
+  // hex encoded function to sign, use it for smart contract approval (string)
+  string any_encoded = 8;
+
+  oneof transaction_payload {
+    TransferMessage transfer = 9;
+    TokenTransferMessage token_transfer = 10;
+    CreateAccountMessage create_account = 11;
+    NftMessage nft_message = 12;
+    ManagedTokensRegisterMessage register_token = 13;
+    LiquidStaking liquid_staking_message = 14;
+    TokenTransferCoinsMessage token_transfer_coins = 15;
+  }
+}
+
+// Information related to the signed transaction
+message TransactionAuthenticator {
+  // Signature part of the signed transaction (bytes)
+  bytes signature = 1;
+  // Public key of the signer (bytes)
+  bytes public_key = 2;
+}
+
+// Transaction signing output.
+message SigningOutput {
+  /// The raw transaction (bytes)
+  bytes raw_txn = 1;
+
+  /// Public key and signature to authenticate
+  TransactionAuthenticator authenticator = 2;
+
+  /// Signed and encoded transaction bytes.
+  bytes encoded = 3;
+
+  // Transaction json format for api broadcasting (string)
+  string json = 4;
+
+  // Error code, 0 is ok, other codes will be treated as errors.
+  Common.Proto.SigningError error = 5;
+
+  // Error description.
+  string error_message = 6;
+}
diff --git a/src/proto/Barz.proto b/src/proto/Barz.proto
new file mode 100644
index 00000000000..6c8342054e7
--- /dev/null
+++ b/src/proto/Barz.proto
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.Barz.Proto;
+option java_package = "wallet.core.jni.proto";
+
+// Input parameters for calculating a counterfactual address for ERC-4337 based smart contract wallet
+message ContractAddressInput {
+  // ERC-4337 entry point
+  string entry_point = 1;
+  // Address of the contract factory
+  string factory = 2;
+
+  // Diamond proxy facets required for the contract setup
+  string account_facet = 3;
+  string verification_facet = 4;
+  string facet_registry = 5;
+  string default_fallback = 6;
+
+  // Bytecode of the smart contract to deploy
+  string bytecode = 7;
+  // PublicKey of the wallet
+  string public_key = 8;
+
+  // Salt is used to derive multiple account from the same public key
+  uint32 salt = 9;
+}
+
+// FacetCutAction represents the action to be performed for a FacetCut
+enum FacetCutAction {
+  ADD = 0;
+  REPLACE = 1;
+  REMOVE = 2;
+}
+
+// FacetCut represents a single operation to be performed on a facet
+message FacetCut {
+  string facet_address = 1; // The address of the facet
+  FacetCutAction action = 2; // The action to perform
+  repeated bytes function_selectors = 3; // List of function selectors, each is bytes4
+}
+
+// DiamondCutInput represents the input parameters for a diamondCut operation
+message DiamondCutInput {
+  repeated FacetCut facet_cuts = 1; // List of facet cuts to apply
+  string init_address = 2; // Address to call with `init` data after applying cuts
+  bytes init_data = 3; // Data to pass to `init` function call
+}
+
diff --git a/src/proto/Binance.proto b/src/proto/Binance.proto
index 375c1ec7586..7fe597ee92e 100644
--- a/src/proto/Binance.proto
+++ b/src/proto/Binance.proto
@@ -5,140 +5,258 @@ option java_package = "wallet.core.jni.proto";
 
 import "Common.proto";
 
+// Transaction structure, used internally
 message Transaction {
-    // int64 SIZE-OF-ENCODED      // varint encoded length of the structure after encoding
-    // 0xF0625DEE                  // prefix
-    repeated bytes msgs = 1;       // array of size 1, containing the transaction message, which are one of the transaction type below
-    repeated bytes signatures = 2; // array of size 1, containing the standard signature structure of the transaction sender
-    string memo = 3;               // a short sentence of remark for the transaction, only for `Transfer` transactions.
-    int64 source = 4;              // an identifier for tools triggerring this transaction, set to zero if unwilling to disclose.
-    bytes data = 5;                // reserved for future use
+    // array of size 1, containing the transaction message, which are one of the transaction type below
+    repeated bytes msgs = 1;
+
+    // array of size 1, containing the standard signature structure of the transaction sender
+    repeated bytes signatures = 2;
+
+    // a short sentence of remark for the transaction, only for `Transfer` transactions.
+    string memo = 3;
+
+    // an identifier for tools triggering this transaction, set to zero if unwilling to disclose.
+    int64 source = 4;
+
+    // reserved for future use
+    bytes data = 5;
 }
 
+// Signature structure, used internally
 message Signature {
-    message PubKey {
-        // 0xEB5AE987          // prefix
-        // bytes               // public key bytes
-    }
-    bytes pub_key = 1;         // public key bytes of the signer address
-    bytes signature = 2;       // signature bytes, please check chain access section for signature generation
-    int64 account_number = 3;  // another identifier of signer, which can be read from chain by account REST API or RPC
-    int64 sequence = 4;        // sequence number for the next transaction
+    // public key bytes of the signer address
+    bytes pub_key = 1;
+
+    // signature bytes, please check chain access section for signature generation
+    bytes signature = 2;
+
+    // another identifier of signer, which can be read from chain by account REST API or RPC
+    int64 account_number = 3;
+
+    // sequence number for the next transaction
+    int64 sequence = 4;
 }
 
+// Message for Trade order
 message TradeOrder {
-    // 0xCE6DC043           // prefix
-    bytes sender = 1;       // originating address
-    string id = 2;          // order id, optional
-    string symbol = 3;      // symbol for trading pair in full name of the tokens
-    int64 ordertype = 4;    // only accept 2 for now, meaning limit order
-    int64 side = 5;         // 1 for buy and 2 fory sell
-    int64 price = 6;        // price of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer
-    int64 quantity = 7;     // quantity of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer
-    int64 timeinforce = 8;  // 1 for Good Till Expire(GTE) order and 3 for Immediate Or Cancel (IOC)
+    // originating address
+    bytes sender = 1;
+
+    // order id, optional
+    string id = 2;
+
+    // symbol for trading pair in full name of the tokens
+    string symbol = 3;
+
+    // only accept 2 for now, meaning limit order
+    int64 ordertype = 4;
+
+    // 1 for buy and 2 for sell
+    int64 side = 5;
+
+    // price of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer
+    int64 price = 6;
+
+    // quantity of the order, which is the real price multiplied by 1e8 (10^8) and rounded to integer
+    int64 quantity = 7;
+
+    // 1 for Good Till Expire(GTE) order and 3 for Immediate Or Cancel (IOC)
+    int64 timeinforce = 8;
 }
 
+// Message for CancelTrade order
 message CancelTradeOrder {
-    // 0x166E681B      // prefix
-    bytes sender = 1;  // originating address
-    string symbol = 2; // symbol for trading pair in full name of the tokens
-    string refid = 3;  // order id to cancel
+    // originating address
+    bytes sender = 1;
+
+    // symbol for trading pair in full name of the tokens
+    string symbol = 2;
+
+    // order id to cancel
+    string refid = 3;
 }
 
+// Message for Send order
 message SendOrder {
-    // 0x2A2C87FA
-    // A symbol-amount pair.  Could be moved out of SendOrder; kept here for backward compatibility.
+    // A token amount, symbol-amount pair.  Could be moved out of SendOrder; kept here for backward compatibility.
     message Token {
+        // Token ID
         string denom = 1;
+
+        // Amount
         int64 amount = 2;
     }
+
+    // Transaction input
     message Input {
+        // source address
         bytes address = 1;
+
+        // input coin amounts
         repeated Token coins = 2;
     }
+
+    // Transaction output
     message Output {
+        // destination address
         bytes address = 1;
+
+        // output coin amounts
         repeated Token coins = 2;
     }
+
+    // Send inputs
     repeated Input inputs = 1;
+
+    // Send outputs
     repeated Output outputs = 2;
 }
 
+// Message for TokenIssue order
 message TokenIssueOrder {
-    // 0x17EFAB80      // prefix
-    bytes from = 1;    // owner address
-    string name = 2;   // token name
-    string symbol = 3; // token symbol, in full name with "-" suffix
-    int64 total_supply = 4; // total supply
-    bool mintable = 5; // mintable
+    // owner address
+    bytes from = 1;
+
+    // token name
+    string name = 2;
+
+    // token symbol, in full name with "-" suffix
+    string symbol = 3;
+
+    // total supply
+    int64 total_supply = 4;
+
+    // mintable
+    bool mintable = 5;
 }
 
+// Message for TokenMint order
 message TokenMintOrder {
-    // 0x467E0829      // prefix
-    bytes from = 1;    // owner address
-    string symbol = 2; // token symbol, in full name with "-" suffix
-    int64 amount = 3;  // amount to mint
+    // owner address
+    bytes from = 1;
+
+    // token symbol, in full name with "-" suffix
+    string symbol = 2;
+
+    // amount to mint
+    int64 amount = 3;
 }
 
+// Message for TokenBurn order
 message TokenBurnOrder {
-    // 0x7ED2D2A0      // prefix
-    bytes from = 1;    // owner address
-    string symbol = 2; // token symbol, in full name with "-" suffix
-    int64 amount = 3;  // amount to burn
+    // owner address
+    bytes from = 1;
+
+    // token symbol, in full name with "-" suffix
+    string symbol = 2;
+
+    // amount to burn
+    int64 amount = 3;
 }
 
+// Message for TokenFreeze order
 message TokenFreezeOrder {
-    // 0xE774B32D      // prefix
-    bytes from = 1;    // owner address
-    string symbol = 2; // token symbol, in full name with "-" suffix
-    int64 amount = 3;  // amount of token to freeze
+    // owner address
+    bytes from = 1;
+
+    // token symbol, in full name with "-" suffix
+    string symbol = 2;
+
+    // amount of token to freeze
+    int64 amount = 3;
 }
 
+// Message for TokenUnfreeze order
 message TokenUnfreezeOrder {
-    // 0x6515FF0D      // prefix
-    bytes from = 1;    // owner address
-    string symbol = 2; // token symbol, in full name with "-" suffix
-    int64 amount = 3;  // amount of token to unfreeze
+    // owner address
+    bytes from = 1;
+
+    // token symbol, in full name with "-" suffix
+    string symbol = 2;
+
+    // amount of token to unfreeze
+    int64 amount = 3;
 }
 
+// Message for HashTimeLock order
 message HTLTOrder {
-    // 0xB33F9A24      // prefix
-    bytes from = 1;    // signer address
-    bytes to = 2;    // recipient address
+    // signer address
+    bytes from = 1;
+
+    // recipient address
+    bytes to = 2;
+
+    // source on other chain, optional
     string recipient_other_chain = 3;
+
+    // recipient on other chain, optional
     string sender_other_chain = 4;
-    bytes random_number_hash = 5; //hash of a random number and timestamp, based on SHA256
+
+    // hash of a random number and timestamp, based on SHA256
+    bytes random_number_hash = 5;
+
+    // timestamp
     int64 timestamp = 6;
+
+    // amounts
     repeated SendOrder.Token amount = 7;
-    string expected_income = 8; // expected gained token on the other chain
+
+    // expected gained token on the other chain
+    string expected_income = 8;
+
+    // period expressed in block heights
     int64 height_span = 9;
+
+    // set for cross-chain send
     bool cross_chain = 10;
 }
 
+// Message for Deposit HTLT order
 message DepositHTLTOrder {
-    // 0xB33F9A24      // prefix
-    bytes from = 1;    // signer address
+    // signer address
+    bytes from = 1;
+
+    // amounts
     repeated SendOrder.Token amount = 2;
+
+    // swap ID
     bytes swap_id = 3;
 }
 
+// Message for Claim HTLT order
 message ClaimHTLOrder {
-    // 0xC1665300      // prefix
-    bytes from = 1;    // signer address
+    // signer address
+    bytes from = 1;
+
+    // swap ID
     bytes swap_id = 2;
+
+    // random number input
     bytes random_number = 3;
 }
 
+// Message for Refund HTLT order
 message RefundHTLTOrder {
-    // 0x3454A27C      // prefix
-    bytes from = 1;    // signer address
+    // signer address
+    bytes from = 1;
+
+    // swap ID
     bytes swap_id = 2;
 }
 
+// Transfer
 message TransferOut {
+    // source address
     bytes from = 1;
+
+    // recipient address
     bytes to = 2;
+
+    // transfer amount
 	SendOrder.Token amount = 3;
+
+    // expiration time
 	int64 expire_time = 4;
 }
 
@@ -164,37 +282,83 @@ message SideChainUndelegate {
 	string chain_id = 4;
 }
 
+// Message for BNB Beacon Chain -> BSC Stake Migration.
+// https://github.com/bnb-chain/javascript-sdk/blob/26f6db8b67326e6214e74203ff90c89777b592a1/src/types/msg/stake/stakeMigrationMsg.ts#L13-L18
+message SideChainStakeMigration {
+    bytes validator_src_addr = 1;
+    bytes validator_dst_addr = 2;
+    bytes delegator_addr = 3;
+    bytes refund_addr = 4;
+    SendOrder.Token amount = 5;
+}
+
+// Message for TimeLock order
 message TimeLockOrder {
-    bytes from_address = 1; // owner address
+    // owner address
+    bytes from_address = 1;
+
+    // Description (optional)
     string description = 2;
+
     // Array of symbol/amount pairs. see SDK https://github.com/binance-chain/javascript-sdk/blob/master/docs/api-docs/classes/tokenmanagement.md#timelock
     repeated SendOrder.Token amount = 3;
+
+    // lock time
     int64 lock_time = 4;
 }
 
+// Message for TimeRelock order
 message TimeRelockOrder {
-    bytes from_address = 1; // owner address
-    int64 id = 2; // order ID
+    // owner address
+    bytes from_address = 1;
+
+    // order ID
+    int64 id = 2;
+
+    // Description (optional)
     string description = 3;
+
     // Array of symbol/amount pairs.
     repeated SendOrder.Token amount = 4;
+
+    // lock time
     int64 lock_time = 5;
 }
 
+// Message for TimeUnlock order
 message TimeUnlockOrder {
-    bytes from_address = 1; // owner address
-    int64 id = 2; // order ID
+    // owner address
+    bytes from_address = 1;
+
+    // order ID
+    int64 id = 2;
 }
 
-// Input data necessary to create a signed order.
+// Input data necessary to create a signed transaction.
 message SigningInput {
+    // Chain ID
     string chain_id = 1;
+
+    // Source account number
     int64 account_number = 2;
+
+    // Sequence number (account specific)
     int64 sequence = 3;
+
+    // Transaction source, see https://github.com/bnb-chain/BEPs/blob/master/BEP10.md
+    // Some important values:
+    //  0: Default source value (e.g. for Binance Chain Command Line, or SDKs)
+    //  1: Binance DEX Web Wallet
+    //  2: Trust Wallet
     int64 source = 4;
+
+    // Optional memo
     string memo = 5;
+
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 6;
 
+    // Payload message
     oneof order_oneof {
         TradeOrder trade_order = 8;
         CancelTradeOrder cancel_trade_order = 9;
@@ -215,17 +379,24 @@ message SigningInput {
         TimeLockOrder time_lock_order = 24;
         TimeRelockOrder time_relock_order = 25;
         TimeUnlockOrder time_unlock_order = 26;
+        SideChainStakeMigration side_stake_migration_order = 27;
     }
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
 
-    /// error code, 0 is ok, other codes will be treated as errors
+    // OK (=0) or other codes in case of error
     Common.Proto.SigningError error = 2;
 
-    /// error description
+    // error description in case of error
     string error_message = 3;
+
+    // Signature bytes.
+    bytes signature = 4;
+
+    // Signature JSON string.
+    string signature_json = 5;
 }
diff --git a/src/proto/Bitcoin.proto b/src/proto/Bitcoin.proto
index 1e9e631284a..26fdba4c113 100644
--- a/src/proto/Bitcoin.proto
+++ b/src/proto/Bitcoin.proto
@@ -3,8 +3,10 @@ syntax = "proto3";
 package TW.Bitcoin.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "BitcoinV2.proto";
 import "Common.proto";
 
+// A transaction, with its inputs and outputs
 message Transaction {
     // Transaction data format version.
     sint32 version = 1;
@@ -15,7 +17,7 @@ message Transaction {
     // A list of 1 or more transaction inputs or sources for coins.
     repeated TransactionInput inputs = 3;
 
-    // A list of 1 or more transaction outputs or destinations for coins
+    // A list of 1 or more transaction outputs or destinations for coins.
     repeated TransactionOutput outputs = 4;
 }
 
@@ -33,7 +35,7 @@ message TransactionInput {
 
 // Bitcoin transaction out-point reference.
 message OutPoint {
-    // The hash of the referenced transaction.
+    // The hash of the referenced transaction (network byte order, usually needs to be reversed).
     bytes hash = 1;
 
     // The index of the specific output in the transaction.
@@ -41,6 +43,9 @@ message OutPoint {
 
     // Transaction version as defined by the sender.
     uint32 sequence = 3;
+
+    // The tree in utxo, only works for DCR
+    int32 tree = 4;
 }
 
 // Bitcoin transaction output.
@@ -50,6 +55,9 @@ message TransactionOutput {
 
     // Usually contains the public key as a Bitcoin script setting up conditions to claim this output.
     bytes script = 2;
+
+    // Optional spending script for P2TR script-path transactions.
+    bytes spendingScript = 5;
 }
 
 // An unspent transaction output, that can serve as input to a transaction
@@ -62,6 +70,34 @@ message UnspentTransaction {
 
     // Amount of the UTXO
     int64 amount = 3;
+
+    // The transaction variant
+    TransactionVariant variant = 4;
+
+    // Optional spending script for P2TR script-path transactions.
+    bytes spendingScript = 5;
+}
+
+enum TransactionVariant {
+    P2PKH = 0;
+    P2WPKH = 1;
+    P2TRKEYPATH = 2;
+    BRC20TRANSFER = 3;
+    NFTINSCRIPTION = 4;
+}
+
+// Pair of destination address and amount, used for extra outputs
+message OutputAddress {
+    // Destination address
+    string to_address = 1;
+
+    // Amount to be paid to this output
+    int64 amount = 2;
+}
+
+// Optional index of a corresponding output in the transaction.
+message OutputIndex {
+    uint32 index = 1;
 }
 
 // Input data necessary to create a signed transaction.
@@ -74,31 +110,31 @@ message SigningInput {
     // If amount is equal or more than the available amount, also max amount will be used.
     int64 amount = 2;
 
-    // Transaction fee per byte.
+    // Transaction fee rate, satoshis per byte, used to compute required fee (when planning)
     int64 byte_fee = 3;
 
-    // Recipient's address.
+    // Recipient's address, as string.
     string to_address = 4;
 
-    // Change address.
+    // Change address, as string.
     string change_address = 5;
 
-    // Available private keys.
+    // The available secret private key or keys required for signing (32 bytes each).
     repeated bytes private_key = 6;
 
     // Available redeem scripts indexed by script hash.
     map<string, bytes> scripts = 7;
 
-    // Available unspent transaction outputs.
+    // Available input unspent transaction outputs.
     repeated UnspentTransaction utxo = 8;
 
-    // If sending max amount.
+    // Set if sending max amount is requested.
     bool use_max_amount = 9;
 
-    // Coin type (forks).
+    // Coin type (used by forks).
     uint32 coin_type = 10;
 
-    // Optional transaction plan
+    // Optional transaction plan. If missing, plan will be computed.
     TransactionPlan plan = 11;
 
     // Optional lockTime, default value 0 means no time locking.
@@ -110,6 +146,33 @@ message SigningInput {
 
     // Optional zero-amount, OP_RETURN output
     bytes output_op_return = 13;
+
+    // Optional index of the OP_RETURN output in the transaction.
+    // If not set, OP_RETURN output will be pushed as the latest output.
+    OutputIndex output_op_return_index = 26;
+
+    // Optional additional destination addresses, additional to first to_address output
+    repeated OutputAddress extra_outputs = 14;
+
+    // If use max utxo.
+    bool use_max_utxo = 15;
+
+    // If disable dust filter.
+    bool disable_dust_filter = 16;
+
+    // transaction creation time that will be used for verge(xvg)
+    uint32 time = 17;
+
+    // If set, uses Bitcoin 2.0 Signing protocol.
+    // As a result, `Bitcoin.Proto.SigningOutput.signing_result_v2` is set.
+    BitcoinV2.Proto.SigningInput signing_v2 = 21;
+
+    // One of the "Dust" amount policies.
+    // Later, we plan to add support for `DynamicDust` policy with a `min_relay_fee` amount.
+    oneof dust_policy {
+        // Use a constant "Dust" threshold.
+        int64 fixed_dust_threshold = 24;
+    }
 }
 
 // Describes a preliminary transaction plan.
@@ -117,16 +180,16 @@ message TransactionPlan {
     // Amount to be received at the other end.
     int64 amount = 1;
 
-    // Maximum available amount.
+    // Maximum available amount in all the input UTXOs.
     int64 available_amount = 2;
 
     // Estimated transaction fee.
     int64 fee = 3;
 
-    // Change.
+    // Remaining change
     int64 change = 4;
 
-    // Selected unspent transaction outputs.
+    // Selected unspent transaction outputs (subset of all input UTXOs)
     repeated UnspentTransaction utxos = 5;
 
     // Zcash branch id
@@ -137,25 +200,46 @@ message TransactionPlan {
 
     // Optional zero-amount, OP_RETURN output
     bytes output_op_return = 8;
+
+    // Optional index of the OP_RETURN output in the transaction.
+    // If not set, OP_RETURN output will be pushed as the latest output.
+    OutputIndex output_op_return_index = 14;
+
+    // zen & bitcoin diamond preblockhash
+    bytes preblockhash = 9;
+
+    // zen preblockheight
+    int64 preblockheight = 10;
+
+    // Result of a transaction planning using the Bitcoin 2.0 protocol.
+    // Set if `Bitcoin.Proto.SigningInput.planning_v2` used.
+    BitcoinV2.Proto.TransactionPlan planning_result_v2 = 12;
 };
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
+// Note that the amount may be different than the requested amount to account for fees and available funds.
 message SigningOutput {
-    // Resulting transaction. Note that the amount may be different than the requested amount to account for fees and available funds.
+    // Resulting transaction.
     Transaction transaction = 1;
 
     // Signed and encoded transaction bytes.
     bytes encoded = 2;
 
-    // Transaction id
+    // Transaction ID (hash)
     string transaction_id = 3;
 
     // Optional error
     Common.Proto.SigningError error = 4;
+
     // error description
     string error_message = 5;
+
+    // Result of a transaction signing using the Bitcoin 2.0 protocol.
+    // Set if `Bitcoin.Proto.SigningInput.signing_v2` used.
+    BitcoinV2.Proto.SigningOutput signing_result_v2 = 7;
 }
 
+/// Pre-image hash to be used for signing
 message HashPublicKey {
     /// Pre-image data hash that will be used for signing
     bytes data_hash = 1;
@@ -174,4 +258,8 @@ message PreSigningOutput {
 
     /// error description
     string error_message = 3;
-}
\ No newline at end of file
+
+    // Result of a transaction pre-signing using the Bitcoin 2.0 protocol.
+    // Set if `Bitcoin.Proto.SigningInput.signing_v2` used.
+    BitcoinV2.Proto.PreSigningOutput pre_signing_result_v2 = 7;
+}
diff --git a/src/proto/BitcoinV2.proto b/src/proto/BitcoinV2.proto
new file mode 100644
index 00000000000..6129b39b40c
--- /dev/null
+++ b/src/proto/BitcoinV2.proto
@@ -0,0 +1,379 @@
+syntax = "proto3";
+
+package TW.BitcoinV2.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+enum InputSelector {
+    // Automatically select enough inputs in an ascending order to cover the outputs of the transaction.
+    SelectAscending = 0;
+    // Automatically select enough inputs in the given order to cover the outputs of the transaction.
+    SelectInOrder = 1;
+    // Automatically select enough inputs in an descending order to cover the outputs of the transaction.
+    SelectDescending = 2;
+    // Use all the inputs provided in the given order.
+    UseAll = 10;
+}
+
+// Either a public key or public key hash.
+message PublicKeyOrHash {
+    oneof variant {
+        // Public key bytes.
+        bytes pubkey = 1;
+        // Public key hash.
+        bytes hash = 2;
+    }
+}
+
+// Bitcoin transaction out-point reference.
+message OutPoint {
+    // The hash of the referenced transaction (network byte order, usually needs to be reversed).
+    // The referenced transaction ID in REVERSED order.
+    bytes hash = 1;
+
+    // The position in the previous transactions output that this input references.
+    uint32 vout = 2;
+}
+
+message Input {
+    // Reference to the previous transaction's output.
+    OutPoint out_point = 1;
+    // The amount of satoshis of this input.
+    int64 value = 2;
+    // The sighash type, normally `All`.
+    // See `TWBitcoinSigHashType` enum.
+    uint32 sighash_type = 3;
+    // Optional sequence number, used for timelocks, replace-by-fee, etc.
+    // Leave empty to use a default 4294967295 (0xFFFFFFFF) value.
+    Sequence sequence = 4;
+
+    // Script for claiming this UTXO.
+    oneof claiming_script {
+        // Construct claiming script with a builder pattern.
+        InputBuilder script_builder = 5;
+        // Spending script pubkey data.
+        // Use this variant if the UTXO claiming script is known already, otherwise use `InputBuilder`.
+        // Please note that the signing method (eg "legacy" or "segwit") will be determined by parsing the script data as:
+        // - P2PK, P2PKH - legacy signing method;
+        // - P2WPKH - segwit signing method.
+        bytes script_data = 6;
+        // Derive a spending script pubkey from a receiver address.
+        // E.g "bc1" segwit address will be P2WPKH claiming script.
+        // TODO consider deprecating this because we can't determine if the script pubkey is P2PK or P2PKH actually.
+        string receiver_address = 7;
+    }
+
+    // Optional sequence number, used for timelocks, replace-by-fee, etc.
+    message Sequence {
+        uint32 sequence = 1;
+    }
+
+    message InputBuilder {
+        oneof variant {
+            // Pay-to-Script-Hash, specify the redeem script.
+            // Please note that we support standard redeem scripts only, such as P2PKH, P2WPKH, P2TR.
+            // TODO next iteration.
+            // bytes p2sh = 1;
+
+            // Pay-to-Public-Key, specify the public key.
+            bytes p2pk = 2;
+            // Pay-to-Public-Key-Hash, specify the public key.
+            PublicKeyOrHash p2pkh = 3;
+
+            // Pay-to-Witness-Script-Hash, specify the redeem script.
+            // TODO next iteration.
+            // bytes p2wsh = 4;
+
+            // Pay-to-Public-Key-Hash, specify the public key.
+            PublicKeyOrHash p2wpkh = 5;
+            // Pay-to-Taproot-key-path (balance transfers), specify the public key.
+            bytes p2tr_key_path = 7;
+
+            // Pay-to-Taproot-script-path (complex transfers).
+            // TODO next iteration.
+            // InputTaprootScriptPath p2tr_script_path = 8;
+
+            // Create a BRC20 inscription.
+            InputBrc20Inscription brc20_inscribe = 9;
+        }
+    }
+
+    message InputTaprootScriptPath {
+        // The payload of the Taproot transaction.
+        bytes payload = 2;
+        // The control block of the Taproot transaction required for claiming.
+        bytes control_block = 3;
+    }
+
+    message InputBrc20Inscription {
+        // The recipient of the inscription, usually the sender.
+        bytes inscribe_to = 2;
+        // The ticker of the BRC20 inscription.
+        string ticker = 3;
+        // The BRC20 token transfer amount.
+        string transfer_amount = 4;
+    }
+}
+
+message Output {
+    // The amount of satoshis to send.
+    int64 value = 1;
+
+    oneof to_recipient {
+        // Construct output with builder pattern.
+        OutputBuilder builder = 2;
+        // Construct output by providing the scriptPubkey directly.
+        bytes custom_script_pubkey = 3;
+        // Derive the expected output from the provided address.
+        string to_address = 4;
+    }
+
+    message OutputBuilder {
+        oneof variant {
+            // Pay-to-Script-Hash, specify the redeem script or its hash.
+            RedeemScriptOrHash p2sh = 1;
+            // Pay-to-Public-Key, specify the public key.
+            bytes p2pk = 2;
+            // Pay-to-Public-Key-Hash, specify the public key or its hash.
+            PublicKeyOrHash p2pkh = 3;
+            // Pay-to-Witness-Script-Hash, specify the redeem script or its hash.
+            RedeemScriptOrHash p2wsh = 4;
+            // Pay-to-Public-Key-Hash, specify the public key or its hash.
+            PublicKeyOrHash p2wpkh = 5;
+            // Pay-to-Taproot-key-path (balance transfers), specify the public key.
+            bytes p2tr_key_path = 6;
+            // Pay-to-Taproot-script-path (complex transfers)
+            OutputTaprootScriptPath p2tr_script_path = 7;
+            bytes p2tr_dangerous_assume_tweaked = 8;
+            OutputBrc20Inscription brc20_inscribe = 9;
+            // OP_RETURN output. In most cases, with a zero-amount.
+            bytes op_return = 12;
+        }
+    }
+
+    // Either a redeem script or its hash.
+    message RedeemScriptOrHash {
+        oneof variant {
+            // Redeem script bytes.
+            bytes redeem_script = 1;
+            // Public key hash.
+            bytes hash = 2;
+        }
+    }
+
+    message OutputTaprootScriptPath {
+        // The internal key, usually the public key of the recipient.
+        bytes internal_key = 1;
+        // The merkle root of the Taproot script(s), required to compute the sighash.
+        bytes merkle_root = 2;
+    }
+
+    message OutputBrc20Inscription {
+        // The recipient of the inscription, usually the sender.
+        bytes inscribe_to = 1;
+        // The ticker of the BRC20 inscription.
+        string ticker = 2;
+        // The BRC20 token transfer amount.
+        string transfer_amount = 3;
+    }
+}
+
+message ChainInfo {
+    // P2PKH prefix for this chain.
+    uint32 p2pkh_prefix = 1;
+    // P2SH prefix for this coin type.
+    uint32 p2sh_prefix = 2;
+    // HRP for this coin type if applicable.
+    string hrp = 3;
+}
+
+enum TransactionVersion {
+    // V1 is used by default.
+    UseDefault = 0;
+    // Original transaction version.
+    V1 = 1;
+    // https://github.com/bitcoin/bips/blob/master/bip-0068.mediawiki#specification
+    V2 = 2;
+}
+
+// Transaction builder used in `SigningInput`.
+message TransactionBuilder {
+    // Transaction version.
+    TransactionVersion version = 1;
+    // (optional) Block height or timestamp indicating at what point transactions can be included in a block.
+    // Zero by default.
+    uint32 lock_time = 2;
+    // The inputs to spend.
+    repeated Input inputs = 3;
+    // The output of the transaction. Note that the change output is specified
+    // in the `change_output` field.
+    repeated Output outputs = 4;
+    // How the inputs should be selected.
+    InputSelector input_selector = 5;
+    // The amount of satoshis per vbyte ("satVb"), used for fee calculation.
+    // Can be satoshis per byte ("satB") **ONLY** when transaction does not contain segwit UTXOs.
+    int64 fee_per_vb = 6;
+    // (optional) The change output to be added (return to sender) at the end of the outputs list.
+    // The `Output.value` will be overwritten, leave default.
+    // Note there can be no change output if the change amount is less than dust threshold.
+    // Leave empty to explicitly disable change output creation.
+    Output change_output = 7;
+    // The only output with a max available amount to be send.
+    // If set, `SigningInput.outputs` and `SigningInput.change` will be ignored.
+    // The `Output.value` will be overwritten, leave default.
+    Output max_amount_output = 8;
+    // One of the "Dust" amount policies.
+    // Later, we plan to add support for `DynamicDust` policy with a `min_relay_fee` amount.
+    oneof dust_policy {
+        // Use a constant "Dust" threshold.
+        int64 fixed_dust_threshold = 14;
+    }
+}
+
+// Partially Signed Bitcoin Transaction.
+message Psbt {
+    // Partially Signed Bitcoin Transaction binary encoded.
+    bytes psbt = 1;
+}
+
+message SigningInput {
+    // User private keys.
+    // Only required if the `sign` method is called.
+    repeated bytes private_keys = 1;
+    // User public keys.
+    // Only required if the `plan`, `preImageHash` methods are called.
+    repeated bytes public_keys = 2;
+    // Chain info includes p2pkh, p2sh address prefixes.
+    // The parameter needs to be set if an input/output has a receiver address pattern.
+    ChainInfo chain_info = 3;
+    // Whether disable auxiliary random data when signing.
+    // Use for testing **ONLY**.
+    bool dangerous_use_fixed_schnorr_rng = 4;
+
+    // The transaction signing type.
+    oneof transaction {
+        // Build a transaction to be signed.
+        TransactionBuilder builder = 10;
+        // Finalize a Partially Signed Bitcoin Transaction by signing the rest of UTXOs.
+        Psbt psbt = 11;
+    }
+}
+
+message Transaction {
+    // The protocol version, is currently expected to be 1 or 2 (BIP68).
+    int32 version = 1;
+    // Block height or timestamp indicating at what point transactions can be included in a block.
+    // Zero by default.
+    uint32 lock_time = 2;
+    // The transaction inputs.
+    repeated TransactionInput inputs = 3;
+    // The transaction outputs.
+    repeated TransactionOutput outputs = 4;
+
+    message TransactionInput {
+        // Reference to the previous transaction's output.
+        OutPoint out_point = 1;
+        // The sequence number, used for timelocks, replace-by-fee, etc.
+        uint32 sequence = 2;
+        // The script for claiming the input (non-Segwit/non-Taproot).
+        bytes script_sig = 3;
+        // The script for claiming the input (Segit/Taproot).
+        repeated bytes witness_items = 4;
+    }
+
+    message TransactionOutput {
+        // The condition for claiming the output.
+        bytes script_pubkey = 1;
+        // The amount of satoshis to spend.
+        int64 value = 2;
+    }
+}
+
+message TransactionPlan {
+    // A possible error, `OK` if none.
+    Common.Proto.SigningError error = 1;
+    // Error description.
+    string error_message = 2;
+    // Selected unspent transaction outputs (subset of all input UTXOs).
+    repeated Input inputs = 3;
+    // Transaction outputs including a change output if applied.
+    repeated Output outputs = 4;
+    // Maximum available amount in all the transaction input UTXOs.
+    // That is an amount that will be spent by this transaction.
+    int64 available_amount = 5;
+    // Total sending amount in all the transaction outputs.
+    // That is an amount that will be sent (including change output if applied).
+    int64 send_amount = 6;
+    // The estimated `vsize` in `vbytes`.
+    // It is used to compare how much blockweight needs to be allocated to confirm a transaction.
+    // For non-segwit transactions, `vsize` = `size`.
+    uint64 vsize_estimate = 7;
+    // The estimated fees of the transaction in satoshis.
+    int64 fee_estimate = 8;
+    // Remaining change.
+    // Zero if not applied.
+    int64 change = 9;
+}
+
+message PreSigningOutput {
+    // A possible error, `OK` if none.
+    Common.Proto.SigningError error = 1;
+    // Error description.
+    string error_message = 2;
+    // The sighashes to be signed; ECDSA for legacy and Segwit, Schnorr for Taproot.
+    repeated Sighash sighashes = 4;
+
+    enum SigningMethod {
+        // Used for P2SH and P2PKH - standard ecdsa secp256k1 signing
+        Legacy = 0;
+        // Used for P2WSH and P2WPKH - standard ecdsa secp256k1 signing
+        Segwit = 1;
+        // Used for P2TR key-path and P2TR script-pay - schnorr signing
+        Taproot = 2;
+    }
+
+    message Sighash {
+        // Public key used for signing.
+        // Please note it can be tweaked in case of P2TR scriptPubkey.
+        bytes public_key = 1;
+        // The sighash to be signed.
+        bytes sighash = 2;
+        // Signing method to be used to sign the sighash.
+        SigningMethod signing_method = 3;
+        // Taproot tweak if `Taproot` signing method is used.
+        // Empty if there is no need to tweak the private to sign the sighash.
+        TaprootTweak tweak = 4;
+    }
+
+    message TaprootTweak {
+        // 32 bytes merkle root of the script tree.
+        // Empty if there are no scripts, and the private key should be tweaked without a merkle root.
+        bytes merkle_root = 1;
+    }
+}
+
+message SigningOutput {
+    // A possible error, `OK` if none.
+    Common.Proto.SigningError error = 1;
+    // Error description.
+    string error_message = 2;
+    // Resulting transaction.
+    Transaction transaction = 3;
+    // The encoded transaction that can be submitted to the network.
+    bytes encoded = 4;
+    // The transaction ID (hash).
+    bytes txid = 5;
+    // The total `vsize` in `vbytes`.
+    // It is used to compare how much blockweight needs to be allocated to confirm a transaction.
+    // For non-segwit transactions, `vsize` = `size`.
+    uint64 vsize = 6;
+    // Transaction weight is defined as Base transaction size * 3 + Total transaction size
+    // (ie. the same method as calculating Block weight from Base size and Total size).
+    uint64 weight = 7;
+    // The total and final fee of the transaction in satoshis.
+    int64 fee = 8;
+    // Optional. Signed transaction serialized as PSBT.
+    // Set if `SigningInput.psbt` is used.
+    Psbt psbt = 9;
+}
diff --git a/src/proto/Cardano.proto b/src/proto/Cardano.proto
index c3ceaa27df9..e4581e9ab75 100644
--- a/src/proto/Cardano.proto
+++ b/src/proto/Cardano.proto
@@ -5,30 +5,48 @@ option java_package = "wallet.core.jni.proto";
 
 import "Common.proto";
 
+// A transaction output that can be used as input
 message OutPoint {
+    // The transaction ID
     bytes tx_hash = 1;
+
+    // The index of this output within the transaction
     uint64 output_index = 2;
 }
 
+// Represents a token and an amount. Token is identified by PolicyID and name.
 message TokenAmount {
-    string policy_id = 1; // as hex string (28x2 digits)
+    // Policy ID of the token, as hex string (28x2 digits)
+    string policy_id = 1;
+
+    // The name of the asset (within the policy)
     string asset_name = 2;
-    bytes amount = 3; // 256-bit number
+
+    // The amount (uint256, serialized big endian)
+    bytes amount = 3;
+
+    // The name of the asset (hex encoded). Ignored if `asset_name` is set
+    string asset_name_hex = 4;
 }
 
+// One input for a transaction
 message TxInput {
+    // The UTXO
     OutPoint out_point = 1;
 
+    // The owner address (string)
     string address = 2;
 
-    // ADA amount
+    // ADA amount in the UTXO
     uint64 amount = 3;
 
-    // optional token amounts
+    // optional token amounts in the UTXO
     repeated TokenAmount token_amount = 4;
 }
 
+// One output for a transaction
 message TxOutput {
+    // Destination address (string)
     string address = 1;
     
     // ADA amount
@@ -43,6 +61,7 @@ message TokenBundle {
     repeated TokenAmount token = 1;
 }
 
+// Message for simple Transfer tx
 message Transfer {
     // Destination address as string
     string to_address = 1;
@@ -66,7 +85,7 @@ message Transfer {
     uint64 force_fee = 6;
 }
 
-// Register a staking key for the account, preprequisite for Staking.
+// Register a staking key for the account, prerequisite for Staking.
 // Note: staking messages are typically used with a 1-output-to-self transaction.
 message RegisterStakingKey {
     // Staking address (as string)
@@ -106,6 +125,7 @@ message Withdraw {
     uint64 withdraw_amount = 2;
 }
 
+// Describes a preliminary transaction plan.
 message TransactionPlan {
     // total coins in the utxos
     uint64 available_amount = 1;
@@ -123,7 +143,7 @@ message TransactionPlan {
     uint64 deposit = 10;
 
     // coins undeposited (coming from deposit) in this TX
-    uint64 undeposit = 11;  
+    uint64 undeposit = 11;
 
     // total tokens in the utxos (optional)
     repeated TokenAmount available_tokens = 5;
@@ -134,16 +154,22 @@ message TransactionPlan {
     // tokens in the change (optional)
     repeated TokenAmount change_tokens = 7;
 
+    // The selected UTXOs, subset ot the input UTXOs
     repeated TxInput utxos = 8;
     
+    // Optional error
     Common.Proto.SigningError error = 9;
+
+    // Optional additional destination addresses, additional to first to_address output
+    repeated TxOutput extra_outputs = 12;
 }
 
-// Input data necessary to create a signed transaction
+// Input data necessary to create a signed transaction.
 message SigningInput {
+    // Available input UTXOs
     repeated TxInput utxos = 1;
 
-    // Available private keys (double extended keys); every input UTXO adress should be covered
+    // Available private keys (double extended keys); every input UTXO address should be covered
     // In case of Plan only, keys should be present, in correct number
     repeated bytes private_key = 2;
 
@@ -157,19 +183,24 @@ message SigningInput {
     Delegate delegate = 7;
 
     // Optional, used in case of withdraw
-    Withdraw withdraw = 8;    
+    Withdraw withdraw = 8;
 
     // Optional
     DeregisterStakingKey deregister_staking_key = 9;
 
+    // Time-to-live time of the TX
     uint64 ttl = 4;
 
-    // Optional plan
+    // Optional plan, if missing it will be computed
     TransactionPlan plan = 5;
+
+    // extra output UTXOs
+    repeated TxOutput extra_outputs = 10;
 }
 
-// Transaction signing output
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+    // Encoded transaction bytes
     bytes encoded = 1;
 
     // TxID, derived from transaction data, also needed for submission
@@ -177,4 +208,7 @@ message SigningOutput {
 
     // Optional error
     Common.Proto.SigningError error = 3;
+
+    // error code description
+    string error_message = 4;
 }
diff --git a/src/proto/Common.proto b/src/proto/Common.proto
index 7b24800829d..af13469d47f 100644
--- a/src/proto/Common.proto
+++ b/src/proto/Common.proto
@@ -3,36 +3,72 @@ syntax = "proto3";
 package TW.Common.Proto;
 option java_package = "wallet.core.jni.proto";
 
+// Error codes, used in multiple blockchains.
 enum SigningError {
-    OK = 0; // OK
-    // chain-generic, generic
+    // This is the OK case, with value=0
+    OK = 0;
+    
+    // Chain-generic codes:
+    // Generic error (used if there is no suitable specific error is adequate)
     Error_general = 1;
+    // Internal error, indicates some very unusual, unexpected case
     Error_internal = 2;
-    // chain-generic, input
+
+    // Chain-generic codes, input related:
+    // Low balance: the sender balance is not enough to cover the send and other auxiliary amount such as fee, deposit, or minimal balance.
     Error_low_balance = 3;
-    Error_zero_amount_requested = 4; // Requested amount is zero
+    // Requested amount is zero, send of 0 makes no sense
+    Error_zero_amount_requested = 4;
+    // One required key is missing (too few or wrong keys are provided)
     Error_missing_private_key = 5;
+    // A private key provided is invalid (e.g. wrong size, usually should be 32 bytes)
     Error_invalid_private_key = 15;
+    // A provided address (e.g. destination address) is invalid
     Error_invalid_address = 16;
+    // A provided input UTXO is invalid
     Error_invalid_utxo = 17;
+    // The amount of an input UTXO is invalid
     Error_invalid_utxo_amount = 18;
-    // chain-generic, fee
+
+    // Chain-generic, fee related:
+    // Wrong fee is given, probably it is too low to cover minimal fee for the transaction
     Error_wrong_fee = 6;
-    // chain-generic, signing
+
+    // Chain-generic, signing related:
+    // General signing error
     Error_signing = 7;
-    Error_tx_too_big = 8; // [NEO] Transaction too big, fee in GAS needed or try send by parts
-    // UTXO-chain specific, inputs
-    Error_missing_input_utxos = 9; // No UTXOs provided [BTC]
-    Error_not_enough_utxos = 10; // Not enough non-dust input UTXOs to cover requested amount (dust UTXOs are filtered out) [BTC]
-    // UTXO-chain specific, script
-    Error_script_redeem = 11; // [BTC] Missing redeem script
-    Error_script_output = 12; // [BTC] Invalid output script
-    Error_script_witness_program = 13; // [BTC] Unrecognized witness program
-
-    Error_invalid_memo = 14; // e.g. [XRP] Invalid tag
-    Error_input_parse = 19; // e.g. Invalid input data
-    Error_no_support_n2n = 20; // e.g. Not support multi-input and multi-output transaction
-    Error_signatures_count = 21; // Incorrect count of signatures passed to compile
-    Error_invalid_params = 22; // Incorrect parameters
+    // Resulting transaction is too large
+    // [NEO] Transaction too big, fee in GAS needed or try send by parts
+    Error_tx_too_big = 8;
+
+    // UTXO-chain specific, input related:
+    // No input UTXOs provided [BTC]
+    Error_missing_input_utxos = 9;
+    // Not enough non-dust input UTXOs to cover requested amount (dust UTXOs are filtered out) [BTC]
+    Error_not_enough_utxos = 10;
+
+    // UTXO-chain specific, script related:
+    // [BTC] Missing required redeem script
+    Error_script_redeem = 11;
+    // [BTC] Invalid required output script 
+    Error_script_output = 12;
+    // [BTC] Unrecognized witness program
+    Error_script_witness_program = 13;
+
+    // Invalid memo, e.g. [XRP] Invalid tag
+    Error_invalid_memo = 14;
+    // Some input field cannot be parsed
+    Error_input_parse = 19;
+    // Multi-input and multi-output transaction not supported
+    Error_no_support_n2n = 20;
+    // Incorrect count of signatures passed to compile
+    Error_signatures_count = 21;
+    // Incorrect input parameter
+    Error_invalid_params = 22;
+    // Invalid input token amount
     Error_invalid_requested_token_amount = 23;
+    // Operation not supported for the chain.
+    Error_not_supported = 24;
+    // Requested amount is too low (less dust).
+    Error_dust_amount_requested = 25;
 }
diff --git a/src/proto/Cosmos.proto b/src/proto/Cosmos.proto
index ddeacaa1f5a..04384442e93 100644
--- a/src/proto/Cosmos.proto
+++ b/src/proto/Cosmos.proto
@@ -3,13 +3,23 @@ syntax = "proto3";
 package TW.Cosmos.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// A denomination and an amount
 message Amount {
+    // name of the denomination
     string denom = 1;
+
+    // amount, number as string
     string amount = 2;
 }
 
+// Fee incl. gas
 message Fee {
+    // Fee amount(s)
     repeated Amount amounts = 1;
+
+    // Gas price
     uint64 gas = 2;
 }
 
@@ -22,12 +32,27 @@ message Height {
     uint64 revision_height = 2;
 }
 
+// Transaction broadcast mode
 enum BroadcastMode {
     BLOCK = 0; // Wait for the tx to pass/fail CheckTx, DeliverTx, and be committed in a block
     SYNC = 1;  // Wait for the tx to pass/fail CheckTx
     ASYNC = 2; // Don't wait for pass/fail CheckTx; send and return tx immediately
 }
 
+message THORChainAsset {
+    string chain = 1;
+    string symbol = 2;
+    string ticker = 3;
+    bool synth = 4;
+}
+
+message THORChainCoin {
+    THORChainAsset asset = 1;
+    string amount = 2;
+    int64 decimals = 3;
+}
+
+// A transaction payload message
 message Message {
     // cosmos-sdk/MsgSend
     message Send {
@@ -78,6 +103,13 @@ message Message {
         string type_prefix = 5;
     }
 
+    // cosmos-sdk/MsgSetWithdrawAddress
+    message SetWithdrawAddress {
+        string delegator_address = 1;
+        string withdraw_address = 2;
+        string type_prefix = 3;
+    }
+
     // cosmos-sdk/MsgWithdrawDelegationReward
     message WithdrawDelegationReward {
         string delegator_address = 1;
@@ -126,6 +158,13 @@ message Message {
         repeated Amount amounts = 3;
     }
 
+    // thorchain/MsgDeposit
+    message THORChainDeposit {
+        repeated THORChainCoin coins = 1;
+        string memo = 2;
+        bytes signer = 3;
+    }
+
     // execute within wasm/MsgExecuteContract, used by Terra Classic
     message WasmTerraExecuteContractGeneric {
         // sender address
@@ -177,6 +216,7 @@ message Message {
     }
 
     // execute within wasm/MsgExecuteContract
+    // TODO replaces `ExecuteContract`.
     message WasmExecuteContractGeneric {
         // sender address
         string sender_address = 1;
@@ -255,11 +295,46 @@ message Message {
 
     // cosmos-sdk/MsgRevoke
     message AuthRevoke {
-        string granter      = 1;
-        string grantee      = 2;
+        string granter = 1;
+        string grantee = 2;
         string msg_type_url = 3;
     }
 
+    // VoteOption enumerates the valid vote options for a given governance proposal.
+    enum VoteOption {
+        //_UNSPECIFIED defines a no-op vote option.
+        _UNSPECIFIED = 0;
+        // YES defines a yes vote option.
+        YES = 1;
+        // ABSTAIN defines an abstain vote option.
+        ABSTAIN = 2;
+        // NO defines a no vote option.
+        NO = 3;
+        // NO_WITH_VETO defines a no with veto vote option.
+        NO_WITH_VETO = 4;
+    }
+
+    // cosmos-sdk/MsgVote defines a message to cast a vote.
+    message MsgVote {
+        uint64     proposal_id = 1;
+        string     voter = 2;
+        VoteOption option = 3;
+    }
+
+    message MsgStrideLiquidStakingStake {
+        string creator = 1;
+        string amount = 2;
+        string host_denom = 3;
+    }
+
+    message MsgStrideLiquidStakingRedeem {
+        string creator = 1;
+        string amount = 2;
+        string host_zone = 3;
+        string receiver = 4;
+    }
+
+    // The payload message
     oneof message_oneof {
         Send send_coins_message = 1;
         Transfer transfer_tokens_message = 2;
@@ -271,40 +346,91 @@ message Message {
         WasmTerraExecuteContractTransfer wasm_terra_execute_contract_transfer_message = 8;
         WasmTerraExecuteContractSend wasm_terra_execute_contract_send_message = 9;
         THORChainSend thorchain_send_message = 10;
-        WasmTerraExecuteContractGeneric wasm_terra_execute_contract_generic = 11;
-        WasmExecuteContractTransfer wasm_execute_contract_transfer_message = 12;
-        WasmExecuteContractSend wasm_execute_contract_send_message = 13;
-        WasmExecuteContractGeneric wasm_execute_contract_generic = 14;
-        SignDirect sign_direct_message = 15;
-        AuthGrant  auth_grant = 16;
-        AuthRevoke auth_revoke = 17;
+        WasmTerraExecuteContractGeneric wasm_terra_execute_contract_generic = 12;
+        WasmExecuteContractTransfer wasm_execute_contract_transfer_message = 13;
+        WasmExecuteContractSend wasm_execute_contract_send_message = 14;
+        WasmExecuteContractGeneric wasm_execute_contract_generic = 15;
+        SignDirect sign_direct_message = 16;
+        AuthGrant  auth_grant = 17;
+        AuthRevoke auth_revoke = 18;
+        SetWithdrawAddress set_withdraw_address_message = 19;
+        MsgVote msg_vote = 20;
+        MsgStrideLiquidStakingStake msg_stride_liquid_staking_stake = 21;
+        MsgStrideLiquidStakingRedeem msg_stride_liquid_staking_redeem = 22;
+        THORChainDeposit thorchain_deposit_message = 23;
     }
 }
 
+// Options for transaction encoding: JSON (Amino, older) or Protobuf.
 enum SigningMode {
     JSON = 0;        // JSON format, Pre-Stargate
     Protobuf = 1;    // Protobuf-serialized (binary), Stargate
 }
 
-// Input data necessary to create a signed order.
+enum TxHasher {
+    // For Cosmos chain, `Sha256` is used by default.
+    UseDefault = 0;
+    Sha256 = 1;
+    Keccak256 = 2;
+}
+
+enum SignerPublicKeyType {
+    // Default public key type.
+    Secp256k1 = 0;
+    // Mostly used in Cosmos chains with EVM support.
+    Secp256k1Extended = 1;
+}
+
+// Custom Signer info required to sign a transaction and generate a broadcast JSON message.
+message SignerInfo {
+    // Public key type used to sign a transaction.
+    // It can be different from the value from `registry.json`.
+    SignerPublicKeyType public_key_type = 1;
+    string json_type = 2;
+    string protobuf_type = 3;
+}
+
+// Input data necessary to create a signed transaction.
 message SigningInput {
-    // Specify if Stargate or earlier serialization is used
+    // Specify if protobuf (a.k.a. Stargate) or earlier JSON serialization is used
     SigningMode signing_mode = 1;
 
+    // Source account number
     uint64 account_number = 2;
+
+    // Chain ID (string)
     string chain_id = 3;
+
+    // Transaction fee
     Fee fee = 4;
+
+    // Optional memo
     string memo = 5;
+
+    // Sequence number (account specific)
     uint64 sequence = 6;
 
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 7;
 
+    // Payload message(s)
     repeated Message messages = 8;
 
+    // Broadcast mode (included in output, relevant when broadcasting)
     BroadcastMode mode = 9;
+
+    bytes public_key = 10;
+
+    TxHasher tx_hasher = 11;
+
+    // Optional. If set, use a different Signer info when signing the transaction.
+    SignerInfo signer_info = 12;
+
+    // Optional timeout_height
+    uint64 timeout_height = 13;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signature
     bytes signature = 1;
@@ -316,9 +442,11 @@ message SigningOutput {
     // wrapped in a ready-to-broadcast json.
     string serialized = 3;
 
-    // Set in case of error
-    string error = 4;
-
     // signatures array json string
-    string signature_json = 5;
+    string signature_json = 4;
+
+    // error description
+    string error_message = 5;
+
+    Common.Proto.SigningError error = 6;
 }
diff --git a/src/proto/Decred.proto b/src/proto/Decred.proto
index d8355f5e6b5..82ff3dd429a 100644
--- a/src/proto/Decred.proto
+++ b/src/proto/Decred.proto
@@ -6,11 +6,12 @@ option java_package = "wallet.core.jni.proto";
 import "Bitcoin.proto";
 import "Common.proto";
 
+// A transfer transaction
 message Transaction {
-    /// Serialization format
+    // Serialization format
     uint32 serializeType = 1;
 
-    /// Transaction data format version
+    // Transaction data format version
     uint32 version = 2;
 
     // A list of 1 or more transaction inputs or sources for coins.
@@ -19,10 +20,10 @@ message Transaction {
     // A list of 1 or more transaction outputs or destinations for coins
     repeated TransactionOutput outputs = 4;
 
-    /// The time when a transaction can be spent (usually zero, in which case it has no effect).
+    // The time when a transaction can be spent (usually zero, in which case it has no effect).
     uint32 lockTime = 5;
 
-    /// The block height at which the transaction expires and is no longer valid.
+    // The block height at which the transaction expires and is no longer valid.
     uint32 expiry = 6;
 }
 
@@ -34,8 +35,13 @@ message TransactionInput {
     // Transaction version as defined by the sender.
     uint32 sequence = 2;
 
+    // The amount of the input
 	int64 valueIn = 3;
+
+    // Creation block height
 	uint32 blockHeight = 4;
+
+    // Index within the block
 	uint32 blockIndex = 5;
 
     // Computational script for confirming transaction authorization.
@@ -47,14 +53,14 @@ message TransactionOutput {
     // Transaction amount.
     int64 value = 1;
 
-    /// Transaction output version.
+    // Transaction output version.
     uint32 version = 2;
 
     // Usually contains the public key as a Decred script setting up conditions to claim this output.
     bytes script = 3;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Resulting transaction. Note that the amount may be different than the requested amount to account for fees and available funds.
     Transaction transaction = 1;
@@ -67,4 +73,6 @@ message SigningOutput {
 
     // Optional error
     Common.Proto.SigningError error = 4;
+
+    string error_message = 5;
 }
diff --git a/src/proto/EOS.proto b/src/proto/EOS.proto
index d6a09f94f41..04bec8f5906 100644
--- a/src/proto/EOS.proto
+++ b/src/proto/EOS.proto
@@ -13,17 +13,22 @@ enum KeyType {
 
 // Values for an Asset object.
 message Asset {
+    // Total amount
     int64 amount = 1;
+
+    // Number of decimals defined
     uint32 decimals = 2;
+
+    // Asset symbol
     string symbol = 3;
 }
 
 // Input data necessary to create a signed transaction.
 message SigningInput {
-    // Chain id (256-bit number)
+    // Chain id (uint256, serialized big endian)
     bytes chain_id = 1;
 
-    // Reference Block Id (256-bits)
+    // Reference Block Id (uint256, serialized big endian)
     bytes reference_block_id = 2;
 
     // Timestamp on the reference block
@@ -44,18 +49,24 @@ message SigningInput {
     // Asset details and amount
     Asset asset = 8;
 
-    // Sender's private key's raw bytes
+    // Sender's secret private key used for signing (32 bytes).
     bytes private_key = 9;
 
     // Type of the private key
     KeyType private_key_type = 10;
+
+    // Expiration of the transaction, if not set, default is reference_block_time + 3600 seconds
+    sfixed32 expiration = 11;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // JSON of the packed transaction.
     string json_encoded = 1;
 
     // Optional error
     Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
 }
diff --git a/src/proto/Elrond.proto b/src/proto/Elrond.proto
deleted file mode 100644
index a2f4c59728a..00000000000
--- a/src/proto/Elrond.proto
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-syntax = "proto3";
-
-package TW.Elrond.Proto;
-option java_package = "wallet.core.jni.proto";
-
-// Generic action. Using one of the more specific actions (e.g. transfers, see below) is recommended.
-message GenericAction {
-    Accounts    accounts = 1;
-    string      value = 2;
-    string      data = 3;
-    uint32      version = 4;
-    // Currently, the "options" field should be ignored (not set) by applications using TW Core.
-    // In the future, TW Core will handle specific transaction options 
-    // (such as the "SignedWithHash" flag, as seen in https://github.com/ElrondNetwork/elrond-go-core/blob/main/core/versioning/txVersionChecker.go)
-    // when building and signing transactions.
-    uint32      options = 5;
-}
-
-// EGLD transfer (move balance).
-message EGLDTransfer {
-    Accounts    accounts = 1;
-    string      amount = 2;
-}
-
-// ESDT transfer (transfer regular ESDTs - fungible tokens).
-message ESDTTransfer {
-    Accounts    accounts = 1;
-    string      token_identifier = 2;
-    string      amount = 3;
-}
-
-// ESDTNFT transfer (transfer NFTs, SFTs and Meta ESDTs).
-message ESDTNFTTransfer {
-    Accounts    accounts = 1;
-    string      token_collection = 2;
-    uint64      token_nonce = 3;
-    string      amount = 4;
-}
-
-// Transaction sender & receiver etc.
-message Accounts {
-    uint64      sender_nonce = 1;
-    string      sender = 2;
-    string      sender_username = 3;
-    string      receiver = 4;
-    string      receiver_username = 5;
-}
-
-// Input data necessary to create a signed transaction.
-message SigningInput {
-    bytes       private_key = 1;
-    string      chain_id = 2;
-    uint64      gas_price = 3;
-    uint64      gas_limit = 4;
-
-    oneof message_oneof {
-        GenericAction generic_action = 5;
-        EGLDTransfer egld_transfer = 6;
-        ESDTTransfer esdt_transfer = 7;
-        ESDTNFTTransfer esdtnft_transfer = 8;
-    }
-}
-
-// Transaction signing output.
-message SigningOutput {
-    string encoded = 1;
-    string signature = 2;
-}
diff --git a/src/proto/Ethereum.proto b/src/proto/Ethereum.proto
index f67ea7b4100..cfe413cb54b 100644
--- a/src/proto/Ethereum.proto
+++ b/src/proto/Ethereum.proto
@@ -9,7 +9,7 @@ import "Common.proto";
 message Transaction {
     // Native coin transfer transaction
     message Transfer {
-        // Amount to send in wei (256-bit number)
+        // Amount to send in wei (uint256, serialized big endian)
         bytes amount = 1;
 
         // Optional payload data
@@ -18,40 +18,46 @@ message Transaction {
 
     // ERC20 token transfer transaction
     message ERC20Transfer {
+        // destination address (string)
         string to = 1;
 
-        // Amount to send (256-bit number)
+        // Amount to send (uint256, serialized big endian)
         bytes amount = 2;
     }
 
     // ERC20 approve transaction
     message ERC20Approve {
+        // Target of the approval
         string spender = 1;
 
-        // Amount to send (256-bit number)
+        // Amount to send (uint256, serialized big endian)
         bytes amount = 2;
     }
 
     // ERC721 NFT transfer transaction
     message ERC721Transfer {
+        // Source address
         string from = 1;
 
+        // Destination address
         string to = 2;
 
-        // ID of the token (256-bit number)
+        // ID of the token (uint256, serialized big endian)
         bytes token_id = 3;
     }
 
     // ERC1155 NFT transfer transaction
     message ERC1155Transfer {
+        // Source address
         string from = 1;
 
+        // Destination address
         string to = 2;
 
-        // ID of the token (256-bit number)
+        // ID of the token (uint256, serialized big endian)
         bytes token_id = 3;
 
-        // The amount of tokens being transferred
+        // The amount of tokens being transferred (uint256, serialized big endian)
         bytes value = 4;
 
         bytes data = 5;
@@ -59,13 +65,30 @@ message Transaction {
 
     // Generic smart contract transaction
     message ContractGeneric {
-        // Amount to send in wei (256-bit number)
+        // Amount to send in wei (uint256, serialized big endian)
         bytes amount = 1;
 
         // Contract call payload data
         bytes data = 2;
     }
 
+    // Batched transaction for ERC-4337 wallets
+    message Batch {
+        message BatchedCall {
+            // Recipient addresses.
+            string address = 1;
+
+            // Amounts to send in wei (uint256, serialized big endian)
+            bytes amount = 2;
+
+            // Contract call payloads data
+            bytes payload = 3;
+        }
+
+        repeated BatchedCall calls = 1;
+    }
+
+    // Payload transfer
     oneof transaction_oneof {
         Transfer transfer = 1;
         ERC20Transfer erc20_transfer = 2;
@@ -73,56 +96,103 @@ message Transaction {
         ERC721Transfer erc721_transfer = 4;
         ERC1155Transfer erc1155_transfer = 5;
         ContractGeneric contract_generic = 6;
+        Batch batch = 7;
     }
 }
 
+// Transaction type
 enum TransactionMode {
-    Legacy = 0; // Legacy transaction, pre-EIP2718/EIP1559; for fee gasPrice/gasLimit is used
-    Enveloped = 1; // Enveloped transaction EIP2718 (with type 0x2), fee is according to EIP1559 (base fee, inclusion fee, ...) 
+    // Legacy transaction, pre-EIP2718/EIP1559; for fee gasPrice/gasLimit is used
+    Legacy = 0;
+
+    // Enveloped transaction EIP2718 (with type 0x2), fee is according to EIP1559 (base fee, inclusion fee, ...) 
+    Enveloped = 1;
+
+    // EIP4337-compatible UserOperation
+    UserOp = 2;
+}
+
+// ERC-4337 structure that describes a transaction to be sent on behalf of a user
+message UserOperation {
+    // Entry point contract address
+    string entry_point = 1;
+
+    // Account factory contract address
+    bytes init_code = 2;
+
+    // Account logic contract address
+    string sender = 3;
+
+    // The amount of gas to pay for to compensate the bundler for pre-verification execution and calldata
+    bytes pre_verification_gas = 4;
+
+    // The amount of gas to allocate for the verification step
+    bytes verification_gas_limit = 5;
+
+    // Address of paymaster sponsoring the transaction, followed by extra data to send to the paymaster (empty for self-sponsored transaction)
+    bytes paymaster_and_data = 6;
+}
+
+// An item of the [EIP-2930](https://eips.ethereum.org/EIPS/eip-2930) access list.
+message Access {
+    // Address to be accessed by the transaction.
+    string address = 1;
+    // Storage keys to be accessed by the transaction.
+    repeated bytes stored_keys = 2;
 }
 
 // Input data necessary to create a signed transaction.
 // Legacy and EIP2718/EIP1559 transactions supported, see TransactionMode.
 message SigningInput {
-    // Chain identifier (256-bit number)
+    // Chain identifier (uint256, serialized big endian)
     bytes chain_id = 1;
 
-    // Nonce (256-bit number)
+    // Nonce (uint256, serialized big endian)
     bytes nonce = 2;
 
     // Transaction version selector: Legacy or enveloped, has impact on fee structure.
     // Default is Legacy (value 0)
     TransactionMode tx_mode = 3;
 
-    // Gas price (256-bit number)
+    // Gas price (uint256, serialized big endian)
     // Relevant for legacy transactions only (disregarded for enveloped/EIP1559)
     bytes gas_price = 4;
 
-    // Gas limit (256-bit number)
+    // Gas limit (uint256, serialized big endian)
     bytes gas_limit = 5;
 
-    // Maxinmum optional inclusion fee (aka tip) (256-bit number)
+    // Maximum optional inclusion fee (aka tip) (uint256, serialized big endian)
     // Relevant for enveloped/EIP1559 transactions only, tx_mode=Enveloped, (disregarded for legacy)
     bytes max_inclusion_fee_per_gas = 6;
 
-    // Maxinmum fee (256-bit number)
+    // Maximum fee (uint256, serialized big endian)
     // Relevant for enveloped/EIP1559 transactions only, tx_mode=Enveloped, (disregarded for legacy)
     bytes max_fee_per_gas = 7;
 
     // Recipient's address.
     string to_address = 8;
 
-    // Private key.
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 9;
 
+    // The payload transaction
     Transaction transaction = 10;
+
+    // UserOperation for ERC-4337 wallets
+    UserOperation user_operation = 11;
+
+    // Optional list of addresses and storage keys that the transaction plans to access.
+    // Used in `TransactionMode::Enveloped` only.
+    repeated Access access_list = 12;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
 
+    // The V, R, S components of the resulting signature, (each uint256, serialized big endian)
     bytes v = 2;
     bytes r = 3;
     bytes s = 4;
@@ -130,9 +200,68 @@ message SigningOutput {
     // The payload part, supplied in the input or assembled from input parameters
     bytes data = 5;
 
-    /// error code, 0 is ok, other codes will be treated as errors
+    // error code, 0 is ok, other codes will be treated as errors
     Common.Proto.SigningError error = 6;
 
-    /// error code description
+    // error code description
     string error_message = 7;
+
+    // Encoded transaction bytes.
+    bytes pre_hash = 8;
+}
+
+enum MessageType {
+    // Sign a message following EIP-191.
+    MessageType_legacy = 0;
+    // Sign a message following EIP-191 with EIP-155 replay attack protection.
+    MessageType_eip155 = 1;
+    // Sign a typed message EIP-712 V4.
+    MessageType_typed = 2;
+    // Sign a typed message EIP-712 V4 with EIP-155 replay attack protection.
+    MessageType_typed_eip155 = 3;
+    // Sign a message with Immutable X msg type.
+    MessageType_immutable_x = 4;
+}
+
+message MaybeChainId {
+    // Chain ID.
+    uint64 chain_id = 3;
+}
+
+message MessageSigningInput {
+    // The secret private key used for signing (32 bytes).
+    bytes private_key = 1;
+
+    // Message to sign. Either a regular message or a typed data structured message in JSON format.
+    // Message type should be declared at `message_type`.
+    string message = 2;
+
+    // Optional. Used in replay protection and to check Typed Structured Data input.
+    // Eg. should be set if `message_type` is `MessageType_eip155`, or MessageType_typed, or `MessageType_typed_eip155`.
+    MaybeChainId chain_id = 3;
+
+    // Message type.
+    MessageType message_type = 4;
+}
+
+message MessageSigningOutput {
+    // The signature, Hex-encoded.
+    string signature = 1;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
+}
+
+message MessageVerifyingInput {
+    // The message signed.
+    string message = 1;
+
+    // Public key that will verify and recover the message from the signature.
+    bytes public_key = 2;
+
+    // The signature, Hex-encoded.
+    string signature = 3;
 }
diff --git a/src/proto/EthereumAbi.proto b/src/proto/EthereumAbi.proto
new file mode 100644
index 00000000000..8ee2c0692a1
--- /dev/null
+++ b/src/proto/EthereumAbi.proto
@@ -0,0 +1,318 @@
+syntax = "proto3";
+
+package TW.EthereumAbi.Proto;
+option java_package = "wallet.core.jni.proto";
+
+enum AbiError {
+    // This is the OK case, with value=0
+    OK = 0;
+
+    // Internal error.
+    Error_internal = 1;
+
+    // Unexpected function signature or ABI mismatch.
+    Error_abi_mismatch = 2;
+    // Invalid ABI.
+    Error_invalid_abi = 3;
+    // Invalid parameter type.
+    Error_invalid_param_type = 4;
+    // Invalid address value.
+    Error_invalid_address_value = 5;
+    // Invalid UInt value.
+    Error_invalid_uint_value = 6;
+    // Missing parameter type.
+    Error_missing_param_type = 7;
+    // Missing parameter value.
+    Error_missing_param_value = 8;
+    // Invalid encoded data.
+    Error_decoding_data = 9;
+    // Invalid empty type.
+    // For example, bytes0, address[0].
+    Error_empty_type = 10;
+}
+
+// ABI type parameters excluding values.
+
+// Indicates a boolean type.
+message BoolType {}
+
+// Generic number type for all bit sizes, like UInt24, 40, 48, ... 248.
+message NumberNType {
+    // The number of bits of an integer.
+    uint32 bits = 1;
+}
+
+// Indicates a string type.
+message StringType {}
+
+// Indicates an address type.
+message AddressType {}
+
+// Indicates an array type with an inner `element_type`.
+message ArrayType {
+    // The type of array elements.
+    ParamType element_type = 1;
+}
+
+// Indicates a fixed-size array type with an inner `element_type`.
+message FixedArrayType {
+    // The fixed-size of the array.
+    uint64 size = 1;
+    // The type of array elements.
+    ParamType element_type = 2;
+}
+
+// Indicates a byte array type.
+message ByteArrayType {}
+
+// Indicates a fixed-size byte array type.
+message ByteArrayFixType {
+    // The fixed-size of the array.
+    uint64 size = 1;
+}
+
+// Indicates a tuple with inner type parameters.
+message TupleType {
+    // Tuple named parameters.
+    repeated Param params = 1;
+}
+
+// Named parameter with type.
+message Param {
+    // Name of the parameter.
+    string name = 1;
+
+    // Type of the parameter.
+    ParamType param = 2;
+}
+
+message ParamType {
+    oneof param {
+        BoolType boolean = 1;
+        NumberNType number_int = 2;
+        NumberNType number_uint = 3;
+        // Nested values. Gap in field numbering is intentional.
+        StringType string_param = 7;
+        AddressType address = 8;
+        ByteArrayType byte_array = 9;
+        ByteArrayFixType byte_array_fix = 10;
+
+        // Nested values. Gap in field numbering is intentional.
+        ArrayType array = 14;
+        FixedArrayType fixed_array = 15;
+
+        // Nested values. Gap in field numbering is intentional.
+        TupleType tuple = 19;
+    }
+}
+
+// ABI parameters including values.
+
+// Generic number parameter for all other bit sizes, like UInt24, 40, 48, ... 248.
+message NumberNParam {
+    // Count of bits of the number.
+    // 0 < bits <= 256, bits % 8 == 0
+    uint32 bits = 1;
+
+    // Serialized big endian.
+    bytes value = 2;
+}
+
+// A byte array of arbitrary size.
+message ArrayParam {
+    // The type of array elements.
+    ParamType element_type = 1;
+
+    // Array elements.
+    repeated Token elements = 2;
+}
+
+// A tuple with various parameters similar to a structure.
+message TupleParam {
+    // Tokens (values) of the tuple parameters.
+    repeated Token params = 1;
+}
+
+// A value of an ABI parameter.
+message Token {
+    // Optional. Name of a corresponding parameter.
+    string name = 1;
+
+    oneof token {
+        // Integer values.
+        bool boolean = 2;
+        NumberNParam number_int = 3;
+        NumberNParam number_uint = 4;
+
+        // Simple values. Gap in field numbering is intentional.
+        string string_value = 7;
+        string address = 8;
+        bytes byte_array = 9;
+        bytes byte_array_fix = 10;
+
+        // Nested values. Gap in field numbering is intentional.
+        ArrayParam array = 14;
+        ArrayParam fixed_array = 15;
+
+        // Nested values. Gap in field numbering is intentional.
+        TupleParam tuple = 19;
+    }
+}
+
+//// TWEthereumAbiDecodeContractCall
+
+// Decode a contract call (function input) according to the given ABI json.
+message ContractCallDecodingInput {
+    // An encoded smart contract call with a prefixed function signature (4 bytes).
+    bytes encoded = 1;
+
+    // A smart contract ABI in JSON.
+    // Each ABI function must be mapped to a short signature.
+    // Expected to be a set of functions mapped to corresponding short signatures.
+    // Example:
+    // ```
+    // {
+    //     "1896f70a": {
+    //         "name": "setResolver",
+    //         "inputs": [...],
+    //         ...
+    //     },
+    //     "ac9650d8": {
+    //         "name": "multicall",
+    //         "inputs": [...],
+    //         ...
+    //     }
+    // }
+    // ```
+    string smart_contract_abi_json = 2;
+}
+
+message ContractCallDecodingOutput {
+    // Human readable json format, according to the input `ContractCallDecodingInput::smart_contract_abi_json`.
+    string decoded_json = 1;
+
+    // Decoded parameters.
+    repeated Token tokens = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    AbiError error = 3;
+
+    // error code description
+    string error_message = 4;
+}
+
+//// TWEthereumAbiDecodeParams
+
+// A set of ABI type parameters.
+message AbiParams {
+    // ABI type parameters.
+    repeated Param params = 1;
+}
+
+// Decode a function input or output data according to the given ABI json.
+message ParamsDecodingInput {
+    // An encoded ABI.
+    bytes encoded = 1;
+
+    oneof abi {
+        // A set of ABI parameters in JSON.
+        // Expected to be a JSON array at the entry level.
+        // Example:
+        // ```
+        // [
+        //     {
+        //         "name": "_to',
+        //         "type": "address"
+        //     },
+        //     {
+        //         "name": "_value",
+        //         "type": "uint256"
+        //     }
+        // ]
+        // ```
+        string abi_json = 2;
+
+        // A set of ABI type parameters.
+        AbiParams abi_params = 3;
+    }
+}
+
+message ParamsDecodingOutput {
+    // Decoded parameters.
+    repeated Token tokens = 1;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    AbiError error = 2;
+
+    // error code description
+    string error_message = 3;
+}
+
+//// TWEthereumAbiDecodeValue
+
+// Decode an Eth ABI value.
+message ValueDecodingInput {
+    // An encoded value to be decoded.
+    bytes encoded = 1;
+
+    // A type of the parameter.
+    // Example: "bytes[32]".
+    // Please note `tuple` is not supported.
+    string param_type = 2;
+}
+
+message ValueDecodingOutput {
+    // Decoded parameter.
+    Token token = 1;
+
+    // Decoded parameter as a string.
+    string param_str = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    AbiError error = 3;
+
+    // error code description
+    string error_message = 4;
+}
+
+//// TWEthereumAbiEncodeFunction
+
+// Encode a function call to Eth ABI binary.
+message FunctionEncodingInput {
+    // Function name.
+    string function_name = 1;
+
+    // Parameters to be encoded.
+    repeated Token tokens = 2;
+}
+
+message FunctionEncodingOutput {
+    // The function type signature.
+    // Example: "baz(int32,uint256)"
+    string function_type = 1;
+
+    // An encoded smart contract call with a prefixed function signature (4 bytes).
+    bytes encoded = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    AbiError error = 3;
+
+    // error code description
+    string error_message = 4;
+}
+
+//// TWEthereumAbiFunctionGetType
+
+// Return the function type signature, of the form "baz(int32,uint256)".
+message FunctionGetTypeInput {
+    // Function signature. Includes function inputs if they are.
+    // Examples:
+    // - `functionName()`
+    // - `functionName()`
+    // - `functionName(bool)`
+    // - `functionName(uint256,bytes32)`
+    string function_name = 1;
+
+    // A set of ABI type parameters.
+    repeated Param inputs = 2;
+}
diff --git a/src/proto/EthereumRlp.proto b/src/proto/EthereumRlp.proto
new file mode 100644
index 00000000000..0655ff37064
--- /dev/null
+++ b/src/proto/EthereumRlp.proto
@@ -0,0 +1,49 @@
+syntax = "proto3";
+
+package TW.EthereumRlp.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+// List of elements.
+message RlpList {
+    repeated RlpItem items = 1;
+}
+
+// RLP item.
+message RlpItem {
+    oneof item {
+        // A string to be encoded.
+        string string_item = 1;
+        // A U64 number to be encoded.
+        uint64 number_u64 = 2;
+        // A U256 number to be encoded.
+        bytes number_u256 = 3;
+        // An address to be encoded.
+        string address = 4;
+        // A data to be encoded.
+        bytes data = 5;
+        // A list of items to be encoded.
+        RlpList list = 6;
+        // An RLP encoded item to be appended as it is.
+        bytes raw_encoded = 7;
+    }
+}
+
+// RLP encoding input.
+message EncodingInput {
+    // An item or a list to encode.
+    RlpItem item = 1;
+}
+
+/// RLP encoding output.
+message EncodingOutput {
+    // An item RLP encoded.
+    bytes encoded = 1;
+
+    // Error code, 0 is ok, other codes will be treated as errors.
+    Common.Proto.SigningError error = 2;
+
+    // Error code description.
+    string error_message = 3;
+}
diff --git a/src/proto/Everscale.proto b/src/proto/Everscale.proto
index c98841981c4..20ef2644ba8 100644
--- a/src/proto/Everscale.proto
+++ b/src/proto/Everscale.proto
@@ -1,19 +1,23 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 syntax = "proto3";
 
 package TW.Everscale.Proto;
 option java_package = "wallet.core.jni.proto";
 
+
+// Message option
 enum MessageBehavior {
-    SimpleTransfer = 0; // Sends a message with the specified amount. The sender pays a fee from the account balance
-    SendAllBalance = 1; // Sends the entire account balance along with the message
+    // Sends a message with the specified amount. The sender pays a fee from the account balance
+    SimpleTransfer = 0;
+
+    // Sends the entire account balance along with the message
+    SendAllBalance = 1;
 }
 
+// Transfer message
 message Transfer {
     // If set to true, then the message will be returned if there is an error on the recipient's side.
     bool bounce = 1;
@@ -37,14 +41,18 @@ message Transfer {
     }
 }
 
+// Input data necessary to create a signed transaction.
 message SigningInput {
+    // The payload transfer
     oneof action_oneof {
         Transfer transfer = 1;
     }
 
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 2;
 }
 
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     string encoded = 1;
 }
diff --git a/src/proto/FIO.proto b/src/proto/FIO.proto
index 5579cde39dd..664c041e5f0 100644
--- a/src/proto/FIO.proto
+++ b/src/proto/FIO.proto
@@ -52,6 +52,7 @@ message Action {
     }
 
     // Acion for adding public chain addresses to a FIO name; add_pub_address
+    // Note: actor is not needed, computed from private key
     message AddPubAddress {
         // The FIO name already registered to the owner. Ex.: "alice@trust"
         string fio_address = 1;
@@ -59,13 +60,35 @@ message Action {
         // List of public addresses to be registered, ex. {{"BTC", "bc1qv...7v"},{"BNB", "bnb1ts3...9s"}}
         repeated PublicAddress public_addresses = 2;
         
+        // Max fee to spend, can be obtained using get_fee API.
+        uint64 fee = 3;        
+    }
+
+    // Action for removing public chain addresses from a FIO name; remove_pub_address
+    // Note: actor is not needed, computed from private key
+    message RemovePubAddress {
+        // The FIO name already registered to the owner. Ex.: "alice@trust"
+        string fio_address = 1;
+
+        // List of public addresses to be unregistered, ex. {{"BTC", "bc1qv...7v"},{"BNB", "bnb1ts3...9s"}}
+        repeated PublicAddress public_addresses = 2;
+
         // Max fee to spend, can be obtained using get_fee API.
         uint64 fee = 3;
-        
-        // Note: actor is not needed, computed from private key
     }
 
-    // Action for transfering FIO coins; transfer_tokens_pub_key
+    // Action for removing public chain addresses from a FIO name; remove_pub_address
+    // Note: actor is not needed, computed from private key
+    message RemoveAllPubAddress {
+        // The FIO name already registered to the owner. Ex.: "alice@trust"
+        string fio_address = 1;
+
+        // Max fee to spend, can be obtained using get_fee API.
+        uint64 fee = 3;
+    }
+
+    // Action for transferring FIO coins; transfer_tokens_pub_key
+    // Note: actor is not needed, computed from private key
     message Transfer {
         // FIO address of the payee. Ex.: "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf"
         string payee_public_key = 1;
@@ -75,11 +98,10 @@ message Action {
 
         // Max fee to spend, can be obtained using get_fee API.
         uint64 fee = 3;
-        
-        // Note: actor is not needed, computed from private key
     }
 
     // Action for renewing a FIO name; renew_fio_address
+    // Note: actor is not needed, computed from private key
     message RenewFioAddress {
         // The FIO name to be renewed. Ex.: "alice@trust"
         string fio_address = 1;
@@ -89,11 +111,10 @@ message Action {
         
         // Max fee to spend, can be obtained using get_fee API.
         uint64 fee = 3;
-
-        // Note: actor is not needed, computed from owner_fio_public_key
     }
 
     // Action for creating a new payment request; new_funds_request
+    // Note: actor is not needed, computed from private key
     message NewFundsRequest {
         // The FIO name of the requested payer. Ex.: "alice@trust"
         string payer_fio_name = 1;
@@ -109,16 +130,30 @@ message Action {
 
         // Max fee to spend, can be obtained using get_fee API.
         uint64 fee = 5;
+    }
+
+    // Action for adding `100 * bundle_sets` bundled transactions to the supplied FIO Handle. When bundles are purchased one or more sets of bundled transactions are added to the existing count.
+    message AddBundledTransactions {
+        // The FIO name already registered to the owner. Ex.: "alice@trust"
+        string fio_address = 1;
+
+        // Number of bundled sets. One set is 100 bundled transactions.
+        uint64 bundle_sets = 2;
 
-        // Note: actor is not needed, computed from private key
+        // Max fee to spend, can be obtained using get_fee API.
+        uint64 fee = 3;
     }
 
+    // Payload message
     oneof message_oneof {
         RegisterFioAddress register_fio_address_message = 1;
         AddPubAddress add_pub_address_message = 2;
         Transfer transfer_message = 3;
         RenewFioAddress renew_fio_address_message = 4;
         NewFundsRequest new_funds_request_message = 5;
+        RemovePubAddress remove_pub_address_message = 6;
+        RemoveAllPubAddress remove_all_pub_addresses_message = 7;
+        AddBundledTransactions add_bundled_transactions_message = 8;
     }
 }
 
@@ -134,7 +169,7 @@ message ChainParams {
     uint64 ref_block_prefix = 3;
 }
 
-// Transaction signing input
+// Input data necessary to create a signed transaction.
 message SigningInput {
     // Expiry for this message, in unix time. Can be 0, then it is taken from current time with default expiry
     uint32 expiry = 1;
@@ -142,7 +177,7 @@ message SigningInput {
     // Current parameters of the FIO blockchain
     ChainParams chain_params = 2;
     
-    // The private key matching the address, needed for signing
+    // The secret private key matching the address, used for signing (32 bytes).
     bytes private_key = 3;
 
     // The FIO name of the originating wallet (project-wide constant)
@@ -150,13 +185,22 @@ message SigningInput {
 
     // Context-specific action data
     Action action = 5;
+
+    // FIO address of the owner. Ex.: "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf"
+    string owner_public_key = 6;
 }
 
-// Transaction signing output
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed transaction in JSON
     string json = 1;
 
     // Optional error
     Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
+
+    // Performed action name, ex. "addaddress", "remaddress", "trnsfiopubky" etc.
+    string action_name = 4;
 }
diff --git a/src/proto/Filecoin.proto b/src/proto/Filecoin.proto
index 0c39da82c72..09a26ce03a4 100644
--- a/src/proto/Filecoin.proto
+++ b/src/proto/Filecoin.proto
@@ -3,9 +3,20 @@ syntax = "proto3";
 package TW.Filecoin.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// Defines the type of `from` address derivation.
+enum DerivationType {
+    // Defines a Secp256k1 (`f1`) derivation for the sender address.
+    // Default derivation type.
+    SECP256K1 = 0;
+    // Defines a Delegated (`f4`) derivation for the sender address.
+    DELEGATED = 1;
+}
+
 // Input data necessary to create a signed transaction.
 message SigningInput {
-    // Private key of sender account.
+    // The secret private key of the sender account, used for signing (32 bytes).
     bytes private_key = 1;
 
     // Recipient's address.
@@ -14,20 +25,36 @@ message SigningInput {
     // Transaction nonce.
     uint64 nonce = 3;
 
-    // Transfer value.
+    // Transfer value (uint256, serialized big endian)
     bytes value = 4;
 
     // Gas limit.
     int64 gas_limit = 5;
 
-    // Gas fee cap.
+    // Gas fee cap (uint256, serialized big endian)
     bytes gas_fee_cap = 6;
 
-    // Gas premium.
+    // Gas premium (uint256, serialized big endian)
     bytes gas_premium = 7;
+
+    // Message params.
+    bytes params = 8;
+
+    // Sender address derivation type.
+    DerivationType derivation = 9;
+
+    // Public key secp256k1 extended
+    bytes public_key = 10;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+    // Resulting transaction, in JSON.
     string json = 1;
+
+    // Error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // Error description
+    string error_message = 3;
 }
diff --git a/src/proto/Greenfield.proto b/src/proto/Greenfield.proto
new file mode 100644
index 00000000000..20e87548615
--- /dev/null
+++ b/src/proto/Greenfield.proto
@@ -0,0 +1,128 @@
+syntax = "proto3";
+
+package TW.Greenfield.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+// A denomination and an amount
+message Amount {
+    // name of the denomination
+    string denom = 1;
+
+    // amount, number as string
+    string amount = 2;
+}
+
+// Fee incl. gas
+message Fee {
+    // Fee amount(s)
+    repeated Amount amounts = 1;
+
+    // Gas price
+    uint64 gas = 2;
+}
+
+// Transaction broadcast mode
+enum BroadcastMode {
+    SYNC = 0;  // Wait for the tx to pass/fail CheckTx
+    ASYNC = 1; // Don't wait for pass/fail CheckTx; send and return tx immediately
+}
+
+// A transaction payload message
+message Message {
+    // cosmos-sdk/MsgSend
+    message Send {
+        string from_address = 1;
+        string to_address = 2;
+        repeated Amount amounts = 3;
+        // Optional. Default `cosmos.bank.v1beta1.MsgSend`.
+        string type_prefix = 4;
+    }
+
+    // greenfield/MsgTransferOut
+    // Used to transfer BNB Greenfield to BSC blockchain.
+    message BridgeTransferOut {
+        // In most cases, `from_address` and `to_address` are equal.
+        string from_address = 1;
+        string to_address = 2;
+        Amount amount = 3;
+        // Optional. Default `greenfield.bridge.MsgTransferOut`.
+        string type_prefix = 4;
+    }
+
+    // The payload message
+    oneof message_oneof {
+        Send send_coins_message = 1;
+        BridgeTransferOut bridge_transfer_out = 2;
+    }
+}
+
+// Options for transaction encoding.
+// Consider adding Json mode.
+enum EncodingMode {
+    Protobuf = 0;    // Protobuf-serialized (binary)
+}
+
+// Options for transaction signing.
+// Consider adding Direct mode when it is supported.
+enum SigningMode {
+    Eip712 = 0;
+}
+
+// Input data necessary to create a signed transaction.
+message SigningInput {
+    // An encoding mode.
+    EncodingMode encoding_mode = 1;
+
+    // A signing mode.
+    SigningMode signing_mode = 2;
+
+    // Source account number
+    uint64 account_number = 3;
+
+    // ETH Chain ID (string).
+    // Must be set if `signing_mode` is Eip712.
+    string eth_chain_id = 4;
+
+    // Cosmos Chain ID (string)
+    string cosmos_chain_id = 5;
+
+    // Transaction fee
+    Fee fee = 6;
+
+    // Optional memo
+    string memo = 7;
+
+    // Sequence number (account specific)
+    uint64 sequence = 8;
+
+    // The secret private key used for signing (32 bytes).
+    bytes private_key = 9;
+
+    // Message payloads.
+    repeated Message messages = 10;
+
+    // Broadcast mode (included in output, relevant when broadcasting)
+    BroadcastMode mode = 11;
+
+    bytes public_key = 12;
+}
+
+// Result containing the signed and encoded transaction.
+message SigningOutput {
+    // Signature
+    bytes signature = 1;
+
+    // Signed transaction containing protobuf encoded, Base64-encoded form (Stargate case),
+    // wrapped in a ready-to-broadcast json.
+    string serialized = 2;
+
+    // signatures array json string
+    string signature_json = 3;
+
+    // error description
+    string error_message = 4;
+
+    Common.Proto.SigningError error = 5;
+}
diff --git a/src/proto/Harmony.proto b/src/proto/Harmony.proto
index 72762c24acd..85852dbc348 100644
--- a/src/proto/Harmony.proto
+++ b/src/proto/Harmony.proto
@@ -3,56 +3,68 @@ syntax = "proto3";
 package TW.Harmony.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
 // Input data necessary to create a signed transaction.
 message SigningInput {
-    // Chain identifier (256-bit number)
+    // Chain identifier (uint256, serialized big endian)
     bytes chain_id = 1;
 
-    // Private key.
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 2;
 
+    // The payload message
     oneof message_oneof {
         TransactionMessage transaction_message = 3;
         StakingMessage staking_message = 4;
     }
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
 
+    // THE V,R,S components of the signature
     bytes v = 2;
     bytes r = 3;
     bytes s = 4;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 5;
+
+    // error code description
+    string error_message = 6;
 }
 
+// A Transfer message
 message TransactionMessage {
-    // Nonce (256-bit number)
+    // Nonce (uint256, serialized big endian)
     bytes nonce = 1;
 
-    // Gas price (256-bit number)
+    // Gas price (uint256, serialized big endian)
     bytes gas_price = 2;
 
-    // Gas limit (256-bit number)
+    // Gas limit (uint256, serialized big endian)
     bytes gas_limit = 3;
 
     // Recipient's address.
     string to_address = 4;
 
-    // Amount to send in wei (256-bit number)
+    // Amount to send in wei (uint256, serialized big endian)
     bytes amount = 5;
 
     // Optional payload
     bytes payload = 6;
 
-    // From shard ID (256-bit number)
+    // From shard ID (uint256, serialized big endian)
     bytes from_shard_id = 7;
 
-    // To Shard ID (256-bit number)
+    // To Shard ID (uint256, serialized big endian)
     bytes to_shard_id = 8;
 }
 
+// A Staking message.
 message StakingMessage {
     // StakeMsg 
     oneof stake_msg {
@@ -63,16 +75,17 @@ message StakingMessage {
         DirectiveCollectRewards collect_rewards = 5;
     }
 
-    // Nonce (256-bit number)
+    // Nonce (uint256, serialized big endian)
     bytes nonce = 6;
 
-    // Gas price (256-bit number)
+    // Gas price (uint256, serialized big endian)
     bytes gas_price = 7;
 
-    // Gas limit (256-bit number)
+    // Gas limit (uint256, serialized big endian)
     bytes gas_limit = 8;   
 }
 
+// Description for a validator
 message Description {
     string name = 1;
     string identity = 2;
@@ -81,21 +94,38 @@ message Description {
     string details = 5;
 }
 
+// A variable precision number
 message Decimal {
+    // The 'raw' value
     bytes value = 1;
+
+    // The precision (number of decimals)
     bytes precision = 2;
 }
 
+// Represents validator commission rule
 message CommissionRate {
+    // The rate
     Decimal rate = 1;
+
+    // Maximum rate
     Decimal max_rate = 2;
+
+    // Maximum of rate change
     Decimal max_change_rate = 3;
 }
 
+// Create Validator directive
 message DirectiveCreateValidator {
+    // Address of validator
     string validator_address = 1;
+
+    // Description, name etc.
     Description description = 2;
+
+    // Rates
     CommissionRate commission_rates = 3;
+
     bytes min_self_delegation = 4;
     bytes max_total_delegation = 5;
     repeated bytes slot_pub_keys = 6;
@@ -103,7 +133,10 @@ message DirectiveCreateValidator {
     bytes amount = 8;
 }
 
+
+// Edit Validator directive
 message DirectiveEditValidator {
+    // Validator address
     string validator_address = 1;
     Description description = 2;
     Decimal commission_rate = 3;
@@ -115,18 +148,33 @@ message DirectiveEditValidator {
     bytes active = 9;
 }
 
+// Delegate directive
 message DirectiveDelegate {
+    // Delegator address
     string delegator_address = 1;
+    
+    // Validator address
     string validator_address = 2;
+    
+    // Delegate amount (uint256, serialized big endian)
     bytes amount = 3;
 }
 
+// Undelegate directive
 message DirectiveUndelegate {
+    // Delegator address
     string delegator_address = 1;
+    
+    // Validator address
     string validator_address = 2;
+
+    // Undelegate amount (uint256, serialized big endian)
     bytes amount = 3;
 }
 
+
+// Collect reward
 message DirectiveCollectRewards {
+    // Delegator address
     string delegator_address = 1;
-}
\ No newline at end of file
+}
diff --git a/src/proto/Hedera.proto b/src/proto/Hedera.proto
new file mode 100644
index 00000000000..4f331c77d3e
--- /dev/null
+++ b/src/proto/Hedera.proto
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.Hedera.Proto;
+option java_package = "wallet.core.jni.proto";
+
+// An exact date and time. This is the same data structure as the protobuf Timestamp.proto
+// (see the comments in https://github.com/google/protobuf/blob/master/src/google/protobuf/timestamp.proto)
+message Timestamp {
+  // Number of complete seconds since the start of the epoch
+  int64 seconds = 1;
+  // Number of nanoseconds since the start of the last second
+  int32 nanos = 2;
+}
+
+// The ID for a transaction. This is used for retrieving receipts and records for a transaction, for
+// appending to a file right after creating it, for instantiating a smart contract with bytecode in
+// a file just created, and internally by the network for detecting when duplicate transactions are
+// submitted. A user might get a transaction processed faster by submitting it to N nodes, each with
+// a different node account, but all with the same TransactionID. Then, the transaction will take
+// effect when the first of all those nodes submits the transaction and it reaches consensus. The
+// other transactions will not take effect. So this could make the transaction take effect faster,
+// if any given node might be slow. However, the full transaction fee is charged for each
+// transaction, so the total fee is N times as much if the transaction is sent to N nodes.
+//
+// Applicable to Scheduled Transactions:
+//  - The ID of a Scheduled Transaction has transactionValidStart and accountIDs inherited from the
+//    ScheduleCreate transaction that created it. That is to say that they are equal
+//  - The scheduled property is true for Scheduled Transactions
+//  - transactionValidStart, accountID and scheduled properties should be omitted
+message TransactionID {
+  // The transaction is invalid if consensusTimestamp < transactionID.transactionStartValid
+  Timestamp transactionValidStart = 1;
+  // The Account ID that paid for this transaction
+  string accountID = 2;
+  // Whether the Transaction is of type Scheduled or no
+  bool scheduled = 3;
+  // The identifier for an internal transaction that was spawned as part
+  // of handling a user transaction. (These internal transactions share the
+  // transactionValidStart and accountID of the user transaction, so a
+  // nonce is necessary to give them a unique TransactionID.)
+  //
+  // An example is when a "parent" ContractCreate or ContractCall transaction
+  // calls one or more HTS precompiled contracts; each of the "child" transactions spawned for a precompile has a id
+  // with a different nonce.
+  int32 nonce = 4;
+}
+
+// Necessary fields to process a TransferMessage
+message TransferMessage {
+  // Source Account address (string)
+  string from = 1;
+  // Destination Account address (string)
+  string to = 2;
+  // Amount to be transferred (sint64)
+  sint64 amount = 3;
+}
+
+// A single transaction. All transaction types are possible here.
+message TransactionBody {
+  // The ID for this transaction, which includes the payer's account (the account paying the transaction fee).
+  // If two transactions have the same transactionID, they won't both have an effect
+  TransactionID transactionID = 1;
+  // The account of the node that submits the client's transaction to the network
+  string nodeAccountID = 2;
+  // The maximum transaction fee the client is willing to pay
+  uint64 transactionFee = 3;
+  // The transaction is invalid if consensusTimestamp > transactionID.transactionValidStart + transactionValidDuration
+  int64 transactionValidDuration = 4;
+  // Any notes or descriptions that should be put into the record (max length 100)
+  string memo = 5;
+  // The choices here are arranged by service in roughly lexicographical order. The field ordinals are non-sequential,
+  // and a result of the historical order of implementation.
+  oneof data {
+    // Transfer amount between accounts
+    TransferMessage transfer = 6;
+  }
+}
+
+// Input data necessary to create a signed transaction.
+message SigningInput {
+  // Private key to sign the transaction (bytes)
+  bytes private_key = 1;
+
+  // The transaction body
+  TransactionBody body = 2;
+}
+
+// Transaction signing output.
+message SigningOutput {
+  // Signed and encoded transaction bytes.
+  bytes encoded = 1;
+}
diff --git a/src/proto/IOST.proto b/src/proto/IOST.proto
new file mode 100644
index 00000000000..0566e0fde68
--- /dev/null
+++ b/src/proto/IOST.proto
@@ -0,0 +1,101 @@
+syntax = "proto3";
+
+package TW.IOST.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+// The message defines transaction action struct.
+message Action {
+    // contract name
+    string contract = 1;
+    // action name
+    string action_name = 2;
+    // data
+    string data = 3;
+}
+
+// The message defines transaction amount limit struct.
+message AmountLimit {
+    // token name
+    string token = 1;
+    // limit value
+    string value = 2;
+}
+
+// The enumeration defines the signature algorithm.
+enum Algorithm {
+    // unknown
+    UNKNOWN = 0;
+    // secp256k1
+    SECP256K1 = 1;
+    // ed25519
+    ED25519 = 2;
+}
+
+// The message defines signature struct.
+message Signature {
+    // signature algorithm
+    Algorithm algorithm = 1;
+    // signature bytes
+    bytes signature = 2;
+    // public key
+    bytes public_key = 3;
+}
+
+// The message defines the transaction request.
+message Transaction {
+    // transaction timestamp
+    int64 time = 1;
+    // expiration timestamp
+    int64 expiration = 2;
+    // gas price
+    double gas_ratio = 3;
+    // gas limit
+    double gas_limit = 4;
+    // delay nanoseconds
+    int64 delay = 5;
+    // chain id
+    uint32 chain_id = 6;
+    // action list
+    repeated Action actions = 7;
+    // amount limit
+    repeated AmountLimit amount_limit = 8;
+    // signer list
+    repeated string signers = 9;
+    // signatures of signers
+    repeated Signature signatures = 10;
+    // publisher
+    string publisher = 11;
+    // signatures of publisher
+    repeated Signature publisher_sigs = 12;
+}
+
+message AccountInfo {
+    string name = 1;
+    bytes active_key = 2;
+    bytes owner_key = 3;
+}
+
+// Input data necessary to create a signed transaction.
+message SigningInput {
+    AccountInfo account = 1;
+    Transaction transaction_template = 2;
+    string transfer_destination = 3;
+    string transfer_amount = 4;
+    string transfer_memo = 5;
+}
+
+// Transaction signing output.
+message SigningOutput {
+    // Signed transaction
+    Transaction transaction = 1;
+    // Signed and encoded transaction bytes.
+    bytes encoded = 2;
+    
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 3;
+
+    // error code description
+    string error_message = 4;
+}
diff --git a/src/proto/Icon.proto b/src/proto/Icon.proto
index 8319b026d7c..9b378f4dc82 100644
--- a/src/proto/Icon.proto
+++ b/src/proto/Icon.proto
@@ -3,6 +3,8 @@ syntax = "proto3";
 package TW.Icon.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
 // Input data necessary to create a signed transaction.
 message SigningInput {
     // Sender address.
@@ -11,7 +13,7 @@ message SigningInput {
     // Recipient address.
     string to_address = 2;
 
-    // Transfer amount.
+    // Transfer amount (uint256, serialized big endian)
     bytes value = 3;
 
     // The amount of step to send with the transaction.
@@ -26,15 +28,20 @@ message SigningInput {
     // Network identifier
     bytes network_id = 7;
 
-    // Private key.
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 8;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // JSON-encoded transaction parameters.
     string encoded = 1;
 
     // Signature.
     bytes signature = 2;
+
+    // error description
+    string error_message = 3;
+
+    Common.Proto.SigningError error = 4;
 }
diff --git a/src/proto/InternetComputer.proto b/src/proto/InternetComputer.proto
new file mode 100644
index 00000000000..a74c86107d3
--- /dev/null
+++ b/src/proto/InternetComputer.proto
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.InternetComputer.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+// Internet Computer Transactions
+message Transaction {
+
+    // ICP ledger transfer arguments
+    message Transfer {
+        string to_account_identifier = 1;
+        uint64 amount = 2;
+        uint64 memo = 3;
+        uint64 current_timestamp_nanos = 4;
+        uint64 permitted_drift = 5;
+    }
+
+    // Payload transfer
+    oneof transaction_oneof {
+        Transfer transfer = 1;
+    }
+}
+
+// Input data necessary to create a signed transaction.
+message SigningInput {
+    bytes private_key = 1;
+    Transaction transaction = 2;
+}
+
+// Transaction signing output.
+message SigningOutput {
+    // Signed and encoded transaction bytes.
+    // NOTE: Before sending to the Rosetta node, this value should be hex-encoded before using with the JSON structure.
+    bytes signed_transaction = 1;
+
+    Common.Proto.SigningError error = 2;
+
+    string error_message = 3;
+}
\ No newline at end of file
diff --git a/src/proto/IoTeX.proto b/src/proto/IoTeX.proto
index 1df337cf627..47a7238de0d 100644
--- a/src/proto/IoTeX.proto
+++ b/src/proto/IoTeX.proto
@@ -3,96 +3,164 @@ syntax = "proto3";
 package TW.IoTeX.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// A transfer
 message Transfer {
+    // Amount (as string)
     string amount  = 1;
+
+    // Destination address
     string recipient = 2;
+
+    // Payload data
     bytes payload  = 3;
 }
 
+// A Staking message
 message Staking {
-  // create stake
-  message Create {
-    string candidateName = 1;
-    string stakedAmount = 2;
-    uint32 stakedDuration = 3;
-    bool autoStake = 4;
-    bytes payload = 5;
-  }
-
-  // unstake or withdraw
-  message Reclaim {
-    uint64 bucketIndex = 1;
-    bytes payload = 2;
-  }
-
-  // add the amount of bucket
-  message AddDeposit {
-    uint64 bucketIndex = 1;
-    string amount = 2;
-    bytes payload = 3;
-  }
-
-  // restake the duration and autoStake flag of bucket
-  message Restake {
-    uint64 bucketIndex = 1;
-    uint32 stakedDuration = 2;
-    bool autoStake = 3;
-    bytes payload = 4;
-  }
-
-  // move the bucket to vote for another candidate or transfer the ownership of bucket to another voters
-  message ChangeCandidate {
-    uint64 bucketIndex = 1;
-    string candidateName = 2;
-    bytes payload = 3;
-  }
-
-  message TransferOwnership {
-    uint64 bucketIndex = 1;
-    string voterAddress = 2;
-    bytes payload = 3;
-  }
-
-  message CandidateBasicInfo {
-    string name = 1;
-    string operatorAddress = 2;
-    string rewardAddress = 3;
-  }
-
-  message CandidateRegister {
-    CandidateBasicInfo candidate = 1;
-    string stakedAmount = 2;
-    uint32 stakedDuration = 3;
-    bool autoStake = 4;
-    string ownerAddress = 5; // if ownerAddress is absent, owner of candidate is the sender
-    bytes payload = 6;
-  }
-  oneof message {
-    Create stakeCreate = 1;
-    Reclaim stakeUnstake = 2;
-    Reclaim stakeWithdraw = 3;
-    AddDeposit stakeAddDeposit = 4;
-    Restake stakeRestake = 5;
-    ChangeCandidate stakeChangeCandidate = 6;
-    TransferOwnership stakeTransferOwnership = 7;
-    CandidateRegister candidateRegister = 8;
-    CandidateBasicInfo candidateUpdate = 9;
-  }
+    // create stake
+    message Create {
+        // validator name
+        string candidateName = 1;
+
+        // amount to be staked
+        string stakedAmount = 2;
+
+        // duration
+        uint32 stakedDuration = 3;
+
+        // auto-restake
+        bool autoStake = 4;
+
+        // payload data
+        bytes payload = 5;
+    }
+
+    // unstake or withdraw
+    message Reclaim {
+        // index to claim
+        uint64 bucketIndex = 1;
+
+        // payload data
+        bytes payload = 2;
+    }
+
+    // add the amount of bucket
+    message AddDeposit {
+        // index
+        uint64 bucketIndex = 1;
+
+        // amount to add
+        string amount = 2;
+
+        // payload data
+        bytes payload = 3;
+    }
+
+    // restake the duration and autoStake flag of bucket
+    message Restake {
+        // index
+        uint64 bucketIndex = 1;
+
+        // stake duration
+        uint32 stakedDuration = 2;
+
+        // auto re-stake
+        bool autoStake = 3;
+
+        // payload data
+        bytes payload = 4;
+    }
+
+    // move the bucket to vote for another candidate or transfer the ownership of bucket to another voters
+    message ChangeCandidate {
+        // index
+        uint64 bucketIndex = 1;
+
+        // validator name
+        string candidateName = 2;
+
+        // payload data
+        bytes payload = 3;
+    }
+
+    // transfer ownserhip of stake
+    message TransferOwnership {
+        // index
+        uint64 bucketIndex = 1;
+
+        // address of voter
+        string voterAddress = 2;
+
+        // payload data
+        bytes payload = 3;
+    }
+
+    // Candidate (validator) info
+    message CandidateBasicInfo {
+        string name = 1;
+        string operatorAddress = 2;
+        string rewardAddress = 3;
+    }
+
+    // Register a Candidate
+    message CandidateRegister {
+        CandidateBasicInfo candidate = 1;
+        string stakedAmount = 2;
+        uint32 stakedDuration = 3;
+        bool autoStake = 4;
+        string ownerAddress = 5; // if ownerAddress is absent, owner of candidate is the sender
+        bytes payload = 6;
+    }
+
+    // the payload message
+    oneof message {
+        Create stakeCreate = 1;
+        Reclaim stakeUnstake = 2;
+        Reclaim stakeWithdraw = 3;
+        AddDeposit stakeAddDeposit = 4;
+        Restake stakeRestake = 5;
+        ChangeCandidate stakeChangeCandidate = 6;
+        TransferOwnership stakeTransferOwnership = 7;
+        CandidateRegister candidateRegister = 8;
+        CandidateBasicInfo candidateUpdate = 9;
+    }
 }
 
+// Arbitrary contract call
 message ContractCall {
+    // amount
     string amount  = 1;
+
+    // contract address
     string contract = 2;
+
+    // payload data
     bytes data = 3;
 }
 
-// transaction signing input
+// Input data necessary to create a signed transaction.
 message SigningInput {
+    // Transaction version
     uint32 version = 1;
+
+    // Nonce (should be larger than in the last transaction of the account)
     uint64 nonce = 2;
+
+    // Limit for the gas used
     uint64 gasLimit = 3;
+
+    // Gas price
     string gasPrice = 4;
-    bytes privateKey = 5;
+
+    // The chain id of blockchain
+    uint32 chainID = 5;
+
+    // The secret private key used for signing (32 bytes).
+    bytes privateKey = 6;
+
+    // Payload transfer
     oneof action {
         Transfer transfer = 10;
         ContractCall call = 12;
@@ -106,41 +174,68 @@ message SigningInput {
         Staking.TransferOwnership stakeTransferOwnership = 46;
         Staking.CandidateRegister candidateRegister = 47;
         Staking.CandidateBasicInfo candidateUpdate = 48;
-  }
+    }
 }
 
-// transaction signing output
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded Action bytes
     bytes encoded = 1;
 
     // Signed Action hash
     bytes hash = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 3;
+
+    // error code description
+    string error_message = 4;
 }
 
+// An Action structure
+// Used internally
 message ActionCore {
-  uint32 version = 1;
-  uint64 nonce = 2;
-  uint64 gasLimit = 3;
-  string gasPrice = 4;
-  oneof action {
-    Transfer transfer = 10;
-    ContractCall execution = 12;
-    // Native staking
-    Staking.Create stakeCreate = 40;
-    Staking.Reclaim stakeUnstake = 41;
-    Staking.Reclaim stakeWithdraw = 42;
-    Staking.AddDeposit stakeAddDeposit = 43;
-    Staking.Restake stakeRestake = 44;
-    Staking.ChangeCandidate stakeChangeCandidate = 45;
-    Staking.TransferOwnership stakeTransferOwnership = 46;
-    Staking.CandidateRegister candidateRegister = 47;
-    Staking.CandidateBasicInfo candidateUpdate = 48;
-  }
+    // version number
+    uint32 version = 1;
+
+    // Nonce (should be larger than in the last transaction of the account)
+    uint64 nonce = 2;
+
+    // Gas limit
+    uint64 gasLimit = 3;
+
+    // Gas price
+    string gasPrice = 4;
+
+    // Chain ID
+    uint32 chainID = 5;
+
+    // action payload
+    oneof action {
+        Transfer transfer = 10;
+        ContractCall execution = 12;
+        // Native staking
+        Staking.Create stakeCreate = 40;
+        Staking.Reclaim stakeUnstake = 41;
+        Staking.Reclaim stakeWithdraw = 42;
+        Staking.AddDeposit stakeAddDeposit = 43;
+        Staking.Restake stakeRestake = 44;
+        Staking.ChangeCandidate stakeChangeCandidate = 45;
+        Staking.TransferOwnership stakeTransferOwnership = 46;
+        Staking.CandidateRegister candidateRegister = 47;
+        Staking.CandidateBasicInfo candidateUpdate = 48;
+    }
 }
 
+// Signed Action
+// Used internally
 message Action {
-  ActionCore core = 1;
-  bytes senderPubKey = 2;
-  bytes signature = 3;
-}
\ No newline at end of file
+    // Action details
+    ActionCore core = 1;
+
+    // public key
+    bytes senderPubKey = 2;
+
+    // the signature
+    bytes signature = 3;
+}
diff --git a/src/proto/LiquidStaking.proto b/src/proto/LiquidStaking.proto
new file mode 100644
index 00000000000..b91c1bdf3b4
--- /dev/null
+++ b/src/proto/LiquidStaking.proto
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.LiquidStaking.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Ethereum.proto";
+import "Cosmos.proto";
+import "Aptos.proto";
+
+// Enum for supported coins for liquid staking
+enum Coin {
+  // Previously, MATIC.
+  POL = 0;
+  ATOM = 1;
+  BNB = 2;
+  APT = 3;
+  ETH = 4;
+}
+
+// Enum for supported target blockchains for liquid staking
+enum Blockchain {
+  ETHEREUM = 0;
+  POLYGON = 1;
+  STRIDE = 2;
+  BNB_BSC = 3;
+  APTOS = 4;
+}
+
+// Enum for supported liquid staking protocols
+enum Protocol {
+  Strader = 0;
+  Stride = 1;
+  Tortuga = 2;
+  Lido = 3;
+}
+
+// Enum for status codes to indicate the result of an operation
+enum StatusCode {
+  OK = 0;
+  ERROR_ACTION_NOT_SET = 1;
+  ERROR_TARGETED_BLOCKCHAIN_NOT_SUPPORTED_BY_PROTOCOL = 2;
+  ERROR_SMART_CONTRACT_ADDRESS_NOT_SET = 3;
+  ERROR_INPUT_PROTO_DESERIALIZATION = 4;
+  ERROR_OPERATION_NOT_SUPPORTED_BY_PROTOCOL = 5;
+}
+
+// Message to represent the status of an operation
+message Status {
+  // Status code of the operation
+  StatusCode code = 1;
+
+  // Optional error message, populated in case of error
+  string message = 2;
+}
+
+// Message to represent the asset for staking operations
+message Asset {
+  // Coin to be staked
+  Coin   staking_token = 1;
+  // Optional, liquid_token to be manipulated: unstake, claim rewards
+  string liquid_token = 2;
+  // Denom of the asset to be manipulated, required by some liquid staking protocols
+  string denom = 3;
+
+  // Address for building the appropriate input
+  string from_address = 4;
+}
+
+// Message to represent a stake operation
+message Stake {
+  Asset  asset = 1;
+  string amount = 2;
+}
+
+// Message to represent an unstake operation
+message Unstake {
+  Asset asset = 1;
+  string amount = 2;
+  // Some cross-chain protocols propose u to setup a receiver_address
+  string receiver_address = 3;
+  // Some cross-chain protocols propose u to set the receiver chain_id, it allows auto-claim after probation period
+  string receiver_chain_id = 4;
+}
+
+// Message to represent a withdraw operation
+message Withdraw {
+  Asset asset = 1;
+  string amount = 2;
+  // Sometimes withdraw is just the index of a request, amount is already known by the SC
+  string idx = 3;
+}
+
+// Message to represent the input for a liquid staking operation
+message Input {
+  // Oneof field to specify the action: stake, unstake or withdraw
+  oneof action {
+    Stake stake = 1;
+    Unstake unstake = 2;
+    Withdraw withdraw = 3;
+  }
+
+  // Optional smart contract address for EVM-based chains
+  string smart_contract_address = 4;
+
+  // Protocol to be used for liquid staking
+  Protocol protocol = 5;
+
+  // Target blockchain for the liquid staking operation
+  Blockchain blockchain = 6;
+}
+
+// Message to represent the output of a liquid staking operation
+message Output {
+  // Status of the liquid staking operation
+  Status status = 1;
+
+  // Unsigned transaction input - needs to be completed and signed
+  oneof signing_input_oneof {
+    Ethereum.Proto.SigningInput ethereum = 2;
+    Cosmos.Proto.SigningInput cosmos = 3;
+    Aptos.Proto.SigningInput aptos = 4;
+  }
+}
diff --git a/src/proto/MultiversX.proto b/src/proto/MultiversX.proto
new file mode 100644
index 00000000000..02162ef5796
--- /dev/null
+++ b/src/proto/MultiversX.proto
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.MultiversX.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+// Generic action. Using one of the more specific actions (e.g. transfers, see below) is recommended.
+message GenericAction {
+    // Accounts involved
+    Accounts    accounts = 1;
+
+    // amount
+    string      value = 2;
+
+    // additional data
+    string      data = 3;
+
+    // transaction version
+    uint32      version = 4;
+
+    // Generally speaking, the "options" field can be ignored (not set) by applications using TW Core.
+    uint32      options = 5;
+}
+
+// EGLD transfer (move balance).
+message EGLDTransfer {
+    // Accounts involved
+    Accounts    accounts = 1;
+
+    // Transfer amount (string)
+    string      amount = 2;
+    string      data = 3;
+
+    // transaction version, if empty, the default value will be used
+    uint32      version = 4;
+}
+
+// ESDT transfer (transfer regular ESDTs - fungible tokens).
+message ESDTTransfer {
+    // Accounts involved
+    Accounts    accounts = 1;
+
+    // Token ID
+    string      token_identifier = 2;
+
+    // Transfer token amount (string)
+    string      amount = 3;
+
+    // transaction version, if empty, the default value will be used
+    uint32      version = 4;
+}
+
+// ESDTNFT transfer (transfer NFTs, SFTs and Meta ESDTs).
+message ESDTNFTTransfer {
+    // Accounts involved
+    Accounts    accounts = 1;
+
+    // tokens
+    string      token_collection = 2;
+
+    // nonce of the token
+    uint64      token_nonce = 3;
+
+    // transfer amount
+    string      amount = 4;
+
+    // transaction version, if empty, the default value will be used
+    uint32      version = 5;
+}
+
+// Transaction sender & receiver etc.
+message Accounts {
+    // Nonce of the sender
+    uint64      sender_nonce = 1;
+
+    // Sender address
+    string      sender = 2;
+
+    // Sender username
+    string      sender_username = 3;
+
+    // Receiver address
+    string      receiver = 4;
+
+    // Receiver username
+    string      receiver_username = 5;
+
+    // Guardian address
+    string      guardian = 6;
+}
+
+// Input data necessary to create a signed transaction.
+message SigningInput {
+    // The secret private key used for signing (32 bytes).
+    bytes       private_key = 1;
+
+    // Chain identifier, string
+    string      chain_id = 2;
+
+    // Gas price
+    uint64      gas_price = 3;
+
+    // Limit for the gas used
+    uint64      gas_limit = 4;
+
+    // transfer payload
+    oneof message_oneof {
+        GenericAction generic_action = 5;
+        EGLDTransfer egld_transfer = 6;
+        ESDTTransfer esdt_transfer = 7;
+        ESDTNFTTransfer esdtnft_transfer = 8;
+    }
+}
+
+// Result containing the signed and encoded transaction.
+message SigningOutput {
+    string encoded = 1;
+    string signature = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 3;
+
+    // error code description
+    string error_message = 4;
+}
diff --git a/src/proto/NEAR.proto b/src/proto/NEAR.proto
index 6a2641a2a45..920fa57d587 100644
--- a/src/proto/NEAR.proto
+++ b/src/proto/NEAR.proto
@@ -3,64 +3,114 @@ syntax = "proto3";
 package TW.NEAR.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// Public key with type
 message PublicKey {
+    // Key type
     uint32 key_type = 1;
+
+    // The public key data
     bytes data = 2;
 }
 
+// Permissions for a function call
 message FunctionCallPermission {
-    bytes allowance = 1; // uint128 / little endian byte order
+    // uint128 / big endian byte order
+    bytes allowance = 1;
+
     string receiver_id = 2;
+
     repeated string method_names = 3;
 }
 
+// Full access
 message FullAccessPermission {
 }
 
+// Access key: nonce + permission
 message AccessKey {
+    // Nonce
     uint64 nonce = 1;
+
+    // Permission
     oneof permission {
         FunctionCallPermission function_call = 2;
         FullAccessPermission full_access = 3;
     }
 }
 
+// Create Account
 message CreateAccount {
 }
 
+// Deploying a contract
 message DeployContract {
     bytes code = 1;
 }
 
+// A method/function call
 message FunctionCall {
+    // Method/function name
     string method_name = 1;
+
+    // input arguments
     bytes args = 2;
+
+    // gas
     uint64 gas = 3;
-    bytes deposit = 4; // uint128 / little endian byte order
+
+    // uint128 / big endian byte order
+    bytes deposit = 4;
 }
 
+// Transfer
 message Transfer {
-    bytes deposit = 1; // uint128 / little endian byte order
+    // amount; uint128 / big endian byte order
+    bytes deposit = 1; 
 }
 
+// Stake
 message Stake {
-    bytes stake = 1; // uint128 / little endian byte order
+    // amount; uint128 / big endian byte order
+    bytes stake = 1;
+
+    // owner public key
     PublicKey public_key = 2;
 }
 
+// Add a key
 message AddKey {
     PublicKey public_key = 1;
     AccessKey access_key = 2;
 }
 
+// Delete a key
 message DeleteKey {
     PublicKey public_key = 1;
 }
 
+// Delete account
 message DeleteAccount {
     string beneficiary_id = 1;
 }
 
+// Fungible token transfer
+message TokenTransfer {
+    // Token amount. Base-10 decimal string.
+    string token_amount = 1;
+
+    // ID of the receiver.
+    string receiver_id = 2;
+
+    // Gas.
+    uint64 gas = 3;
+
+    // NEAR deposit amount; uint128 / big endian byte order.
+    bytes deposit = 4;
+}
+
+// Represents an action
 message Action {
     oneof payload {
         CreateAccount create_account = 1;
@@ -71,23 +121,46 @@ message Action {
         AddKey add_key = 6;
         DeleteKey delete_key = 7;
         DeleteAccount delete_account = 8;
+        // Gap in field numbering is intentional as it's not a standard NEAR action.
+        TokenTransfer token_transfer = 13;
     }
 }
 
 // Input data necessary to create a signed order.
 message SigningInput {
+    // ID of the sender
     string signer_id = 1;
+
+    // Nonce (should be larger than in the last transaction of the account)
     uint64 nonce = 2;
+
+    // ID of the receiver
     string receiver_id = 3;
+
+    // Recent block hash
     bytes block_hash = 4;
+
+    // Payload action(s)
     repeated Action actions = 5;
 
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 6;
+
+    // The public key used for compiling a transaction with a signature.
+    bytes public_key = 7;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed transaction blob
     bytes signed_transaction = 1;
-    bytes hash = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
+    
+    // Hash of the transaction
+    bytes hash = 4;
 }
diff --git a/src/proto/NEO.proto b/src/proto/NEO.proto
index 0093145f29f..acb0984d947 100644
--- a/src/proto/NEO.proto
+++ b/src/proto/NEO.proto
@@ -5,41 +5,113 @@ option java_package = "wallet.core.jni.proto";
 
 import "Common.proto";
 
+// Input for a transaction (output of a prev tx)
 message TransactionInput {
+    // Previous tx hash
     bytes prev_hash = 1;
+
+    // Output index
     fixed32 prev_index = 2;
 
     // unspent value of UTXO
     int64 value = 3;
 
+    // Asset
     string asset_id = 4;
 }
 
+// extra address of Output
+message OutputAddress {
+    // Amount (as string)
+    sint64 amount = 1;
+
+    // destination address
+    string to_address = 2;
+}
+
+// Output of a transaction
 message TransactionOutput {
+    // Asset
     string asset_id = 1;
+
+    // Amount (as string)
     sint64 amount = 2;
+
+    // destination address
     string to_address = 3;
+
+    // change address
     string change_address = 4;
+
+    // extra output
+    repeated OutputAddress extra_outputs = 5;
+}
+
+// Transaction
+message Transaction {
+    // nep5 token transfer transaction
+    message Nep5Transfer {
+        string asset_id = 1;
+        string from = 2;
+        string to = 3;
+
+        // Amount to send (256-bit number)
+        bytes amount = 4;
+
+        // determine if putting THROWIFNOT & RET instructions
+        bool script_with_ret = 5;
+    }
+
+    // Generic invocation transaction
+    message InvocationGeneric {
+        // gas to use
+        uint64 gas = 1;
+
+        // Contract call payload data
+        bytes script = 2;
+    }
+
+    oneof transaction_oneof {
+        Nep5Transfer nep5_transfer = 1;
+        InvocationGeneric invocation_generic = 2;
+    }
 }
 
 // Input data necessary to create a signed transaction.
 message SigningInput {
+    // Available transaction inputs
     repeated TransactionInput inputs = 1;
+
+    // Transaction outputs
     repeated TransactionOutput outputs = 2;
+
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 3;
+
+    // Fee
     int64 fee = 4;
+
+    // Asset ID for gas
     string gas_asset_id = 5;
+
+    // Address for the change
     string gas_change_address = 6;
+
+    // Optional transaction plan (if missing it will be computed)
     TransactionPlan plan = 7;
+    Transaction transaction = 8;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
 
     // Optional error
     Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
 }
 
 // Describes a preliminary transaction output plan.
@@ -50,12 +122,27 @@ message TransactionOutputPlan {
     // Maximum available amount.
     int64 available_amount = 2;
 
+    // Amount that is left as change
     int64 change = 3;
+
+    // Asset
     string asset_id = 4;
+
+    // Destination address
     string to_address = 5;
+
+    // Address for the change
     string change_address = 6;
+
+    // extra output
+    repeated OutputAddress extra_outputs = 7;
 };
 
+message TransactionAttributePlan {
+    int32 usage = 1;
+    bytes data = 2;
+}
+
 // Describes a preliminary transaction plan.
 message TransactionPlan {
     // Used assets
@@ -69,4 +156,7 @@ message TransactionPlan {
 
     // Optional error
     Common.Proto.SigningError error = 4;
-};
\ No newline at end of file
+
+    // Attribute
+    repeated TransactionAttributePlan attributes = 5;
+};
diff --git a/src/proto/NULS.proto b/src/proto/NULS.proto
index 2bcfd9d7a2e..7bfe9d62238 100644
--- a/src/proto/NULS.proto
+++ b/src/proto/NULS.proto
@@ -3,65 +3,138 @@ syntax = "proto3";
 package TW.NULS.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// Transaction from address
 message TransactionCoinFrom {
+    // Source address
     string from_address = 1;
+
+    // Chain ID
     uint32 assets_chainid = 2;
+
+    // ID of the asset
     uint32 assets_id = 3;
-    //tranaction out amount (256-bit number)
+
+    // transaction out amount (256-bit number)
     bytes id_amount = 4;
-    //8 bytes
+
+    // Nonce, 8 bytes
     bytes nonce = 5;
-    //lock status: 1 locked; 0 unlocked
+
+    // lock status: 1 locked; 0 unlocked
     uint32 locked = 6;
 }
 
+// Transaction to a destination
 message TransactionCoinTo {
+    // destination address
     string to_address = 1;
+
+    // Chain ID
     uint32 assets_chainid = 2;
+
+    // ID of the asset
     uint32 assets_id = 3;
-    // tranaction amount (256-bit number)
+
+    // transaction amount (uint256, serialized big endian)
     bytes id_amount = 4;
+
+    // lock time
     uint32 lock_time = 5;
 }
 
+// A signature
 message Signature {
+    // Length of public key data
     uint32 pkey_len = 1;
+
+    // The public key
     bytes public_key = 2;
+
+    // The length of the signature
     uint32 sig_len = 3;
+
+    // The signature data
     bytes signature = 4;
 }
 
+// A transaction
 message Transaction {
+    // transaction type
     uint32  type = 1;
+
+    // Timestamp of the transaction
     uint32  timestamp = 2;
+
+    // Optional string remark
     string  remark = 3;
+
+    // The raw data
     bytes   tx_data = 4;
-    //CoinFrom
-    TransactionCoinFrom input = 5;
-    //CoinTo
-    TransactionCoinTo output = 6;
 
+    // CoinFrom
+    repeated TransactionCoinFrom input = 5;
+
+    // CoinTo
+    repeated TransactionCoinTo output = 6;
+
+    // Signature
     Signature tx_sigs = 7;
+
+    // Tx hash
     uint32 hash = 8;
 }
 
 // Input data necessary to create a signed order.
 message SigningInput {
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 1;
+
+    // Source address
     string from = 2;
+
+    // Destination address
     string to = 3;
+
+    // Transfer amount (uint256, serialized big endian)
     bytes  amount = 4;
+
+    // Chain ID
     uint32 chain_id = 5;
+
+    // Asset ID
     uint32 idassets_id = 6;
-    //The last 8 bytes of latest transaction hash 
+
+    // The last 8 bytes of latest transaction hash 
     bytes nonce = 7;
+
+    // Optional memo remark
     string remark = 8;
+
     // Account balance 
     bytes  balance = 9;
+
     // time, accurate to the second
     uint32 timestamp = 10;
+    // external address paying fee, required for token transfer, optional for NULS transfer, depending on if an external fee payer is provided. If provided, it will be the fee paying address.
+    string fee_payer = 11;
+    // fee payer address nonce, required for token transfer, optional for NULS transfer, depending on if fee_payer is provided.
+    bytes fee_payer_nonce = 12;
+    // fee payer address private key, required for token transfer, optional for NULS transfer, depending on if fee_payer is provided.
+    bytes fee_payer_private_key = 13;
+    // fee payer NULS balance, it is required for token transfer. optional for NULS transfer, depending on if fee_payer is provided.
+    bytes fee_payer_balance = 14;
 }
 
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+    // Encoded transaction
     bytes encoded = 1;
-}
\ No newline at end of file
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
+}
diff --git a/src/proto/Nano.proto b/src/proto/Nano.proto
index 954c7930e28..f9bc057cb13 100644
--- a/src/proto/Nano.proto
+++ b/src/proto/Nano.proto
@@ -3,14 +3,17 @@ syntax = "proto3";
 package TW.Nano.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
 // Input data necessary to create a signed transaction.
 message SigningInput {
-    // Private key
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 1;
 
     // Optional parent block hash
     bytes parent_block = 2;
 
+    // Receive/Send reference
     oneof link_oneof {
         // Hash of a block to receive from
         bytes link_block = 3;
@@ -26,14 +29,25 @@ message SigningInput {
 
     // Work
     string work = 7;
+
+    // Pulic key used for building preImage (32 bytes).
+    bytes public_key = 8;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signature
     bytes signature = 1;
+
     // Block hash
     bytes block_hash = 2;
-    // Json representation of the block
+
+    // JSON representation of the block
     string json = 3;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 4;
+
+    // error code description
+    string error_message = 5;
 }
diff --git a/src/proto/Nebulas.proto b/src/proto/Nebulas.proto
index fc8e7e9acf9..215bd503495 100644
--- a/src/proto/Nebulas.proto
+++ b/src/proto/Nebulas.proto
@@ -8,42 +8,47 @@ message SigningInput {
     // sender's address.
     string from_address = 1;
 
-    // Chain identifier (256-bit number)
+    // Chain identifier (uint256, serialized big endian)
     bytes chain_id = 2;
 
-    // Nonce (256-bit number)
+    // Nonce (uint256, serialized big endian)
     bytes nonce = 3;
 
-    // Gas price (256-bit number)
+    // Gas price (uint256, serialized big endian)
     bytes gas_price = 4;
 
-    // Gas limit (256-bit number)
+    // Gas limit (uint256, serialized big endian)
     bytes gas_limit = 5;
 
     // Recipient's address.
     string to_address = 6;
 
-    // Amount to send in wei, 1 NAS = 10^18 Wei (256-bit number)
+    // Amount to send in wei, 1 NAS = 10^18 Wei (uint256, serialized big endian)
     bytes amount = 7;
 
-    // Timestamp to create transaction (256-bit number)
+    // Timestamp to create transaction (uint256, serialized big endian)
     bytes timestamp = 8;
 
     // Optional payload
     string payload = 9;
 
-    // Private key.
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 10;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+    // Algorithm code
     uint32 algorithm = 1;
+
+    // The signature
     bytes signature = 2;
+
+    // Encoded transaction
     string raw = 3;
 }
 
-//
+// Generic data
 message Data {
     string type = 1;
     bytes payload = 2;
@@ -51,17 +56,39 @@ message Data {
 
 // Raw transaction data
 message RawTransaction {
+    // tx hash
     bytes hash  = 1;
+
+    // source address
     bytes from = 2;
+
+    // destination address
     bytes to = 3;
+
+    // amount (uint256, serialized big endian)
     bytes value = 4;
+
+    // Nonce (should be larger than in the last transaction of the account)
     uint64 nonce = 5;
+
+    // transaction timestamp
     int64 timestamp = 6;
+
+    // generic data
     Data data = 7;
+
+    // chain ID (4 bytes)
     uint32 chain_id = 8;
+
+    // gas price (uint256, serialized big endian)
     bytes gas_price = 9;
+
+    // gas limit (uint256, serialized big endian)
     bytes gas_limit = 10;
 
+    // algorithm
     uint32 alg = 11;
+
+    // signature
     bytes sign = 12;
-}
\ No newline at end of file
+}
diff --git a/src/proto/Nervos.proto b/src/proto/Nervos.proto
index fd7c92afc6f..f662d81b1ce 100644
--- a/src/proto/Nervos.proto
+++ b/src/proto/Nervos.proto
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 syntax = "proto3";
 
@@ -22,7 +20,7 @@ message TransactionPlan {
     // A list of 1 or more selected cells for this transaction
     repeated Cell selected_cells = 3;
 
-    // A list of 1 or more outputs by this transaciton
+    // A list of 1 or more outputs by this transaction
     repeated CellOutput outputs = 4;
 
     // A list of outputs data.
@@ -74,6 +72,7 @@ message Script {
     bytes args = 3;
 }
 
+// Transfer of native asset
 message NativeTransfer {
     // Recipient's address.
     string to_address = 1;
@@ -88,6 +87,7 @@ message NativeTransfer {
     bool use_max_amount = 4;
 }
 
+// Token transfer (SUDT)
 message SudtTransfer {
     // Recipient's address.
     string to_address = 1;
@@ -105,6 +105,7 @@ message SudtTransfer {
     bool use_max_amount = 5;
 }
 
+// Deposit
 message DaoDeposit {
     // Recipient's address.
     string to_address = 1;
@@ -140,7 +141,7 @@ message SigningInput {
     // Transaction fee per byte.
     uint64 byte_fee = 1;
 
-    // Available private keys.
+    // The available secret private keys used for signing (32 bytes each).
     repeated bytes private_key = 2;
 
     // Available unspent cell outputs.
@@ -149,6 +150,7 @@ message SigningInput {
     // Optional transaction plan
     TransactionPlan plan = 4;
 
+    // The payload transfer
     oneof operation_oneof {
         NativeTransfer native_transfer = 5;
         SudtTransfer sudt_transfer = 6;
@@ -191,7 +193,7 @@ message Cell {
     bytes output_type = 10;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Resulting transaction. Note that the amount may be different than the requested amount to account for fees and available funds.
     string transaction_json = 1;
diff --git a/src/proto/Nimiq.proto b/src/proto/Nimiq.proto
index 6c96981278d..13abbd9c734 100644
--- a/src/proto/Nimiq.proto
+++ b/src/proto/Nimiq.proto
@@ -3,20 +3,37 @@ syntax = "proto3";
 package TW.Nimiq.Proto;
 option java_package = "wallet.core.jni.proto";
 
+enum NetworkId {
+    UseDefault = 0;
+    // Default PoW Mainnet.
+    Mainnet = 42;
+    // PoS Mainnet starting at the PoW block height 3’456’000.
+    MainnetAlbatross = 24;
+}
+
 // Input data necessary to create a signed transaction.
 message SigningInput {
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 1;
 
+    // Destination address
     string destination = 2;
 
+    // Amount of the transfer
     uint64 value = 3;
 
+    // Fee amount
     uint64 fee = 4;
 
+    // Validity start, in block height
     uint32 validity_start_height = 5;
+
+    // Network ID.
+    NetworkId network_id = 6;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+    // The encoded transaction
     bytes encoded = 1;
 }
diff --git a/src/proto/Oasis.proto b/src/proto/Oasis.proto
index 6b327044b58..cbf406bfe2d 100644
--- a/src/proto/Oasis.proto
+++ b/src/proto/Oasis.proto
@@ -1,37 +1,78 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 syntax = "proto3";
 
 package TW.Oasis.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// Transfer
 message TransferMessage {
+    // destination address
     string to = 1;
+
+    // Gas price
     uint64 gas_price = 2;
 
     // Amount values strings prefixed by zero. e.g. "\u000010000000"
     string gas_amount = 3;
+
     // Amount values strings prefixed by zero
     string amount = 4;
 
+    // Nonce (should be larger than in the last transaction of the account)
     uint64 nonce = 5;
+
+    // Context, see https://docs.oasis.dev/oasis-core/common-functionality/crypto#domain-separation
     string context = 6;
 }
 
+message EscrowMessage {
+    uint64 gas_price = 1;
+    string gas_amount = 2;
+    uint64 nonce = 3;
+
+    string account = 4;
+    string amount = 5;
+
+    string context = 6;
+}
+
+message ReclaimEscrowMessage {
+    uint64 gas_price = 1;
+    string gas_amount = 2;
+    uint64 nonce = 3;
+
+    string account = 4;
+    string shares = 5;
+
+    string context = 6;
+}
+
+// Input data necessary to create a signed transaction.
 message SigningInput {
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 1;
 
+    // Transfer payload
     oneof message {
         TransferMessage transfer = 2;
+        EscrowMessage escrow = 3;
+        ReclaimEscrowMessage reclaimEscrow = 4;
     }
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
+    
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
 }
diff --git a/src/proto/Ontology.proto b/src/proto/Ontology.proto
index 28992aacfcf..6b837d53212 100644
--- a/src/proto/Ontology.proto
+++ b/src/proto/Ontology.proto
@@ -3,35 +3,55 @@ syntax = "proto3";
 package TW.Ontology.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
 // Input data necessary to create a signed transaction.
 message SigningInput {
-
+    // Contract ID, e.g. "ONT"
     string contract = 1;
 
+    // Method, e.g. "transfer"
     string method = 2;
 
+    // The secret private key used for signing (32 bytes).
     bytes owner_private_key = 3;
 
     // base58 encode address string (160-bit number)
     string to_address = 4;
 
+    // Transfer amount
     uint64 amount = 5;
 
+    // Private key of the payer
     bytes payer_private_key = 6;
 
+    // Gas price
     uint64 gas_price = 7;
 
+    // Limit for gas used
     uint64 gas_limit = 8;
 
     // base58 encode address string (160-bit number)
     string query_address = 9;
 
+    // Nonce (should be larger than in the last transaction of the account)
     uint32 nonce = 10;
 
+    // base58 encode address string (160-bit number)
+    string owner_address = 11;
+
+    // base58 encode address string (160-bit number)
+    string payer_address = 12;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
 }
diff --git a/src/proto/Pactus.proto b/src/proto/Pactus.proto
new file mode 100644
index 00000000000..ce3f9d3a02e
--- /dev/null
+++ b/src/proto/Pactus.proto
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.Pactus.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+message TransactionMessage {
+  // The lock time for the transaction.
+  uint32 lock_time = 1;
+  // The transaction fee in NanoPAC.
+  int64 fee = 2;
+  // A memo string for the transaction (optional).
+  string memo = 3;
+
+  oneof payload {
+    TransferPayload transfer = 10;
+    BondPayload bond = 11;
+  }
+}
+
+// Transfer payload for creating a Transfer transaction between two accounts.
+message TransferPayload {
+  // The sender's account address.
+  string sender = 1;
+  // The receiver's account address.
+  string receiver = 2;
+  // The amount to be transferred, specified in NanoPAC.
+  int64 amount = 3;
+}
+
+// Bond payload for creating a Bond transaction from an account to a validator.
+message BondPayload {
+  // The sender's account address.
+  string sender = 1;
+  // The receiver's validator address.
+  string receiver = 2;
+  // The stake amount in NanoPAC.
+  int64 stake = 3;
+  // The public key of the validator (only set when creating a new validator).
+  string public_key = 4;
+}
+
+// Input data necessary to create a signed transaction.
+message SigningInput {
+  bytes private_key = 1;
+  TransactionMessage transaction = 2;
+}
+
+// Transaction signing output.
+message SigningOutput {
+  // Transaction ID (Hash).
+  bytes transaction_id = 1;
+  // Signed and encoded transaction bytes.
+  bytes signed_transaction_data = 2;
+  // Signature the signed transaction.
+  bytes signature = 3;
+  // A possible error, `OK` if none.
+  Common.Proto.SigningError error = 4;
+  // Detailed error message, if any.
+  string error_message = 5;
+}
diff --git a/src/proto/Polkadot.proto b/src/proto/Polkadot.proto
index d46afa39725..c25ddbd019e 100644
--- a/src/proto/Polkadot.proto
+++ b/src/proto/Polkadot.proto
@@ -3,17 +3,16 @@ syntax = "proto3";
 package TW.Polkadot.Proto;
 option java_package = "wallet.core.jni.proto";
 
-enum Network {
-    POLKADOT = 0;
-    KUSAMA = 2;
-}
+import "Common.proto";
 
+// Destination options for reward
 enum RewardDestination {
     STAKED = 0;
     STASH = 1;
     CONTROLLER = 2;
 }
 
+// An era, a period defined by a starting block and length
 message Era {
     // recent block number (called phase in polkadot code), should match block hash
     uint64 block_number = 1;
@@ -22,52 +21,178 @@ message Era {
     uint64 period = 2;
 }
 
+// Readable decoded call indices can be found at https://www.subscan.io/
+message CustomCallIndices {
+    // Module index.
+    int32 module_index = 4;
+
+    // Method index.
+    int32 method_index = 5;
+}
+
+// Optional call indices.
+// Must be set if `SigningInput::network` is different from `Polkadot` and `Kusama`.
+message CallIndices {
+    oneof variant {
+        CustomCallIndices custom = 1;
+    }
+}
+
+// Balance transfer transaction
 message Balance {
+    // transfer
     message Transfer {
+        // destination address
         string to_address = 1;
-        bytes value = 2; // big integer
+
+        // amount (uint256, serialized big endian)
+        bytes value = 2;
+
+        // max 32 chars
+        string memo = 3;
+
+        // call indices
+        CallIndices call_indices = 4;
+    }
+    // batch tranfer
+    message BatchTransfer {
+        // call indices
+        CallIndices call_indices = 1;
+
+        repeated Transfer transfers = 2;
     }
+    // asset transfer
+    message AssetTransfer {
+        // call indices
+        CallIndices call_indices = 1;
+
+        // destination
+        string to_address = 2;
+
+        // value - BigInteger
+        bytes value = 3;
+
+        // asset identifier
+        uint32 asset_id = 4;
+
+        // fee asset identifier
+        uint32 fee_asset_id = 5;
+    }
+
+    // batch asset transfer
+    message BatchAssetTransfer {
+        // call indices
+        CallIndices call_indices = 1;
+
+        // fee asset identifier
+        uint32 fee_asset_id = 2;
+
+        repeated AssetTransfer transfers = 3;
+    }
+
     oneof message_oneof {
         Transfer transfer = 1;
+        BatchTransfer batchTransfer = 2;
+        AssetTransfer asset_transfer = 3;
+        BatchAssetTransfer batch_asset_transfer = 4;
     }
 }
 
+// Staking transaction
 message Staking {
+    // Bond to a controller
     message Bond {
+        // controller ID (optional)
         string controller = 1;
+
+        // amount (uint256, serialized big endian)
         bytes value = 2;
+
+        // destination for rewards
         RewardDestination reward_destination = 3;
+
+        // call indices
+        CallIndices call_indices = 4;
     }
 
+    // Bond to a controller, with nominators
     message BondAndNominate {
+        // controller ID (optional)
         string controller = 1;
+
+        // amount (uint256, serialized big endian)
         bytes value = 2;
+
+        // destination for rewards
         RewardDestination reward_destination = 3;
+
+        // list of nominators
         repeated string nominators = 4;
+
+        // call indices
+        CallIndices call_indices = 5;
     }
 
+    // Bond extra amount
     message BondExtra {
+        // amount (uint256, serialized big endian)
         bytes value = 1;
+
+        // call indices
+        CallIndices call_indices = 2;
     }
 
+    // Unbond
     message Unbond {
+        // amount (uint256, serialized big endian)
+        bytes value = 1;
+
+        // call indices
+        CallIndices call_indices = 2;
+    }
+
+    // Rebond
+    message Rebond {
+        // amount (uint256, serialized big endian)
         bytes value = 1;
+
+        // call indices
+        CallIndices call_indices = 2;
     }
 
+    // Withdraw unbonded amounts
     message WithdrawUnbonded {
         int32 slashing_spans = 1;
+
+        // call indices
+        CallIndices call_indices = 2;
     }
 
+    // Nominate
     message Nominate {
+        // list of nominators
         repeated string nominators = 1;
+
+        // call indices
+        CallIndices call_indices = 2;
     }
 
+    // Chill and unbound
     message ChillAndUnbond {
+        // amount (uint256, serialized big endian)
         bytes value = 1;
+
+        // call indices
+        CallIndices call_indices = 2;
     }
 
-    message Chill {}
+    // Chill
+    message Chill {
+        // call indices
+        CallIndices call_indices = 1;
+    }
 
+    // Payload messsage
     oneof message_oneof {
         Bond bond = 1;
         BondAndNominate bond_and_nominate = 2;
@@ -77,6 +202,61 @@ message Staking {
         Nominate nominate = 6;
         Chill chill = 7;
         ChillAndUnbond chill_and_unbond = 8;
+        Rebond rebond = 9;
+    }
+}
+
+// Identity module
+message Identity {
+    // Identity::join_identity_as_key call
+    message JoinIdentityAsKey {
+        // call indices
+        CallIndices call_indices = 1;
+
+        // auth id
+        uint64 auth_id = 2;
+    }
+
+    // Identity::add_authorization call
+    message AddAuthorization {
+        message Data {
+            bytes data = 1;
+        }
+
+        message AuthData {
+            // authorization data, empty means all permissions, null means no permissions
+            Data asset = 1;
+
+            // authorization data, empty means all permissions, null means no permissions
+            Data extrinsic = 2;
+
+            // authorization data, empty means all permissions, null means no permissions
+            Data portfolio = 3;
+        }
+
+        // call indices
+        CallIndices call_indices = 1;
+
+        // address that will be added to the Identity
+        string target = 2;
+
+        // authorization data, null means all permissions
+        AuthData data = 3;
+
+        // expire time, unix seconds
+        uint64 expiry = 4;
+    }
+
+    oneof message_oneof {
+        JoinIdentityAsKey join_identity_as_key = 1;
+        AddAuthorization add_authorization = 2;
+    }
+}
+
+// Polymesh call
+message PolymeshCall {
+    oneof message_oneof {
+        Identity identity_call = 2;
     }
 }
 
@@ -85,29 +265,49 @@ message SigningInput {
     // Recent block hash, or genesis hash if era is not set
     bytes block_hash = 1;
 
+    // Genesis block hash (identifies the chain)
     bytes genesis_hash = 2;
 
     // Current account nonce
     uint64 nonce = 3;
 
+    // Specification version, e.g. 26.
     uint32 spec_version = 4;
+
+    // Transaction version, e.g. 5.
     uint32 transaction_version = 5;
-    bytes tip = 6;  // big integer
+
+    // Optional tip to pay, big integer
+    bytes tip = 6;
 
     // Optional time validity limit, recommended, for replay-protection.  Empty means Immortal.
     Era era = 7;
 
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 8;
-    Network network = 9;
 
+    // Network type
+    uint32 network = 9;
+
+    // Whether enable MultiAddress
+    bool multi_address = 10;
+
+    // Payload message
     oneof message_oneof {
-        Balance balance_call = 10;
-        Staking staking_call = 11;
+        Balance balance_call = 11;
+        Staking staking_call = 12;
+        PolymeshCall polymesh_call = 13;
     }
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
 }
diff --git a/src/proto/Ripple.proto b/src/proto/Ripple.proto
index 82f7ebd39a4..d32b58e25c9 100644
--- a/src/proto/Ripple.proto
+++ b/src/proto/Ripple.proto
@@ -5,31 +5,166 @@ option java_package = "wallet.core.jni.proto";
 
 import "Common.proto";
 
+// https://xrpl.org/currency-formats.html#token-amounts
+message CurrencyAmount {
+	// Currency code
+	// https://xrpl.org/currency-formats.html#currency-codes
+	string currency = 1;
+
+	// String number
+	// https://xrpl.org/currency-formats.html#string-numbers
+	string value = 2;
+
+	// Account
+	// https://xrpl.org/accounts.html
+	string issuer = 3;
+}
+
+// https://xrpl.org/trustset.html
+message OperationTrustSet {
+    CurrencyAmount limit_amount = 1;
+}
+
+// https://xrpl.org/payment.html
+message OperationPayment {
+    // Transfer amount
+	oneof amount_oneof {
+		int64 amount = 1;
+		CurrencyAmount currency_amount = 2;
+	}
+
+    // Target account
+	string destination = 3;
+
+    // A Destination Tag
+	int64 destination_tag = 4;
+}
+
+// https://xrpl.org/escrowcreate.html
+message OperationEscrowCreate {
+    // Escrow amount
+    int64 amount = 1;
+
+    // Beneficiary account
+    string destination = 2;
+
+    // Destination Tag
+    int64 destination_tag = 3;
+
+    // Escrow expire time
+    int64 cancel_after = 4;
+
+    // Escrow release time
+    int64 finish_after = 5;
+
+    // Crypto condition
+    // https://datatracker.ietf.org/doc/html/draft-thomas-crypto-conditions-02#section-8.1
+    string condition = 6;
+}
+
+// https://xrpl.org/escrowcancel.html
+message OperationEscrowCancel {
+    // Funding account
+    string owner = 1;
+
+    // Escrow transaction sequence
+    int32 offer_sequence = 2;
+}
+
+// https://xrpl.org/escrowfinish.html
+message OperationEscrowFinish {
+    // Funding account
+    string owner = 1;
+
+    // Escrow transaction sequence
+    int32 offer_sequence = 2;
+
+    // Crypto condition
+    string condition = 3;
+
+    // Fulfillment matching condition
+    string fulfillment = 4;
+}
+
+// https://xrpl.org/nftokenburn.html 
+message OperationNFTokenBurn {
+    // Hash256 NFTokenId
+    bytes nftoken_id = 1;
+}
+
+// https://xrpl.org/nftokencreateoffer.html 
+message OperationNFTokenCreateOffer {
+    // Hash256 NFTokenId
+    bytes nftoken_id = 1;
+
+    // Destination account
+    string destination = 2;
+}
+
+// https://xrpl.org/nftokenacceptoffer.html 
+message OperationNFTokenAcceptOffer {
+    // Hash256 NFTokenOffer
+    bytes sell_offer = 1;
+}
+
+// https://xrpl.org/nftokencanceloffer.html 
+message OperationNFTokenCancelOffer {
+    // Vector256 NFTokenOffers
+    repeated bytes token_offers = 1;
+}
+
 // Input data necessary to create a signed transaction.
 message SigningInput {
-    int64 amount = 1;
+    // Transfer fee
+    int64 fee = 1;
+
+    // Account sequence number
+    int32 sequence = 2;
+
+    // Ledger sequence number
+    int32 last_ledger_sequence = 3;
+
+    // Source account
+    string account = 4;
 
-    int64 fee = 2;
+    // Transaction flags, optional
+    int64 flags = 5;
 
-    int32 sequence = 3;
+    // The secret private key used for signing (32 bytes).
+    bytes private_key = 6;
 
-    int32 last_ledger_sequence = 4;
+    oneof operation_oneof {
+        OperationTrustSet op_trust_set = 7;
 
-    string account = 5;
+        OperationPayment op_payment = 8;
 
-    string destination = 6;
+        OperationNFTokenBurn op_nftoken_burn = 9;
 
-    int64 destination_tag = 7;
+        OperationNFTokenCreateOffer op_nftoken_create_offer = 10;
 
-    int64 flags = 8;
+        OperationNFTokenAcceptOffer op_nftoken_accept_offer = 11;
 
-    bytes private_key = 9;
+        OperationNFTokenCancelOffer op_nftoken_cancel_offer = 12;
+
+        OperationEscrowCreate op_escrow_create = 16;
+
+        OperationEscrowCancel op_escrow_cancel = 17;
+
+        OperationEscrowFinish op_escrow_finish = 18;
+    }
+
+    // Only used by tss chain-integration.
+    bytes public_key = 15;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+    // Encoded transaction
     bytes encoded = 1;
 
     // Optional error
     Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
 }
diff --git a/src/proto/Solana.proto b/src/proto/Solana.proto
index 45ac259f631..0649cf72671 100644
--- a/src/proto/Solana.proto
+++ b/src/proto/Solana.proto
@@ -3,41 +3,64 @@ syntax = "proto3";
 package TW.Solana.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// Transfer transaction
 message Transfer {
+    // destination address
     string recipient = 1;
+
+    // amount
     uint64 value = 2;
-    string memo = 3;  // optional
-    repeated string references = 4; // optional referenced public keys
+
+    // optional memo
+    string memo = 3;
+
+    // optional referenced public keys
+    repeated string references = 4;
 }
 
 // Create and initialize a stake account, and delegate amount to it.
 // Recommendation behavior is to not specify a stake account, and a new unique account will be created each time.
 // Optionally a stake account pubkey can be specified, but it should not exist on chain.
 message DelegateStake {
+    // Validator's public key
     string validator_pubkey = 1;
+
+    // delegation amount
     uint64 value = 2;
+
+    // staking account
     string stake_account = 3;
 }
 
 // Deactivate staking on stake account
 message DeactivateStake {
+    // staking account
     string stake_account = 1;
 }
 
 // Deactivate staking on multiple stake account
 message DeactivateAllStake {
+    // staking accounts
     repeated string stake_accounts = 1;
 }
 
 // Withdraw amount from stake account
 message WithdrawStake {
+    // staking account
     string stake_account = 1;
+
+    // withdrawal amount
     uint64 value = 2;
 }
 
-// Techinical structure to group a staking account and an amount
+// Technical structure to group a staking account and an amount
 message StakeAccountValue {
+    // staking account
     string stake_account = 1;
+
+    // amount
     uint64 value = 2;
 }
 
@@ -46,57 +69,254 @@ message WithdrawAllStake {
     repeated StakeAccountValue stake_accounts = 1;
 }
 
+enum TokenProgramId {
+    TokenProgram = 0;
+    Token2022Program = 1;
+}
+
 // Create a token account under a main account for a token type
 message CreateTokenAccount {
     // main account -- can be same as signer, or other main account (if done on some other account's behalf)
     string main_address = 1;
+
+    // Token minting address
     string token_mint_address = 2;
+
+    // Token address
     string token_address = 3;
+
+    // optional token program id
+    TokenProgramId token_program_id = 4;
 }
 
 // Transfer tokens
 message TokenTransfer {
+    // Mint address of the token
     string token_mint_address = 1;
+
+    // Source address
     string sender_token_address = 2;
+
+    // Destination address
     string recipient_token_address = 3;
+
+    // Amount
     uint64 amount = 4;
-    uint32 decimals = 5; // Note: 8-bit value
-    string memo = 6;  // optional
-    repeated string references = 7; // optional referenced public keys
+
+    // Note: 8-bit value
+    uint32 decimals = 5;
+
+    // optional memo§
+    string memo = 6;
+
+    // optional referenced public keys
+    repeated string references = 7;
+
+    // optional token program id
+    TokenProgramId token_program_id = 8;
 }
 
 // CreateTokenAccount and TokenTransfer combined
 message CreateAndTransferToken {
     // main account -- can be same as signer, or other main account (if done on some other account's behalf)
     string recipient_main_address = 1;
+
+    // Mint address of the token
     string token_mint_address = 2;
+
     // Token address for the recipient, will be created first
     string recipient_token_address = 3;
+
+    // Sender's token address
     string sender_token_address = 4;
+
+    // amount
     uint64 amount = 5;
-    uint32 decimals = 6; // Note: 8-bit value
-    string memo = 7;  // optional
-    repeated string references = 8; // optional referenced public keys
+
+    // Note: 8-bit value
+    uint32 decimals = 6;
+
+    // optional
+    string memo = 7;
+
+    // optional referenced public keys
+    repeated string references = 8;
+
+    // optional token program id
+    TokenProgramId token_program_id = 9;
+}
+
+message CreateNonceAccount {
+    // Required for building pre-signing hash of a transaction
+    string nonce_account = 1;
+    uint64 rent = 2;
+    // Optional for building pre-signing hash of a transaction
+    bytes nonce_account_private_key = 3;
+}
+
+message WithdrawNonceAccount {
+    string nonce_account = 1;
+    string recipient = 2;
+    uint64 value = 3;
+}
+
+message AdvanceNonceAccount {
+    string nonce_account = 1;
+}
+
+message PubkeySignature {
+    string pubkey = 1;
+    // base58 encoded signature.
+    string signature = 2;
+}
+
+message RawMessage {
+    message MessageHeader {
+        uint32 num_required_signatures = 1;
+        uint32 num_readonly_signed_accounts = 2;
+        uint32 num_readonly_unsigned_accounts = 3;
+    }
+
+    message Instruction {
+        uint32 program_id = 1;
+        repeated uint32 accounts = 2 [packed = true];
+        bytes program_data = 3;
+    }
+
+    message MessageAddressTableLookup {
+        string account_key = 1;
+        repeated uint32 writable_indexes = 2 [packed = true];
+        repeated uint32 readonly_indexes = 3 [packed = true];
+    }
+
+    message MessageLegacy {
+        MessageHeader header = 1;
+        repeated string account_keys = 2;
+        // Relatively recent block hash (base58 encoded).
+        string recent_blockhash = 3;
+        repeated Instruction instructions = 4;
+    }
+
+    message MessageV0 {
+        MessageHeader header = 1;
+        repeated string account_keys = 2;
+        // Relatively recent block hash (base58 encoded).
+        string recent_blockhash = 3;
+        repeated Instruction instructions = 4;
+        repeated MessageAddressTableLookup address_table_lookups = 5;
+    }
+
+    // Transaction signatures.
+    // If private keys are set in `SigningInput`, corresponding signatures will be overriden.
+    // It's also possible some or all the signatures are be used to compile a transaction if corresponding private keys are not set.
+    repeated PubkeySignature signatures = 1;
+    oneof message {
+        MessageLegacy legacy = 2;
+        MessageV0 v0 = 3;
+    }
+}
+
+message DecodingTransactionOutput {
+    // Decoded transaction info.
+    RawMessage transaction = 1;
+
+    // Error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // Error code description
+    string error_message = 3;
+}
+
+enum Encoding {
+    Base58 = 0;
+    Base64 = 1;
+}
+
+// Specific compute unit limit that the transaction is allowed to consume.
+message PriorityFeePrice {
+    uint64 price = 1;
+}
+
+// Compute unit price in "micro-lamports" to pay a higher transaction fee for higher transaction prioritization.
+message PriorityFeeLimit {
+    uint32 limit = 2;
 }
 
 // Input data necessary to create a signed transaction.
 message SigningInput {
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 1;
+
+    // Relatively recent block hash
     string recent_blockhash = 2;
+
+    bool v0_msg = 3;
+
+    // Payload message
     oneof transaction_type {
-        Transfer transfer_transaction = 3;
-        DelegateStake delegate_stake_transaction = 4;
-        DeactivateStake deactivate_stake_transaction = 5;
-        DeactivateAllStake deactivate_all_stake_transaction = 6;
-        WithdrawStake withdraw_transaction = 7;
-        WithdrawAllStake withdraw_all_transaction = 8;
-        CreateTokenAccount create_token_account_transaction = 9;
-        TokenTransfer token_transfer_transaction = 10;
-        CreateAndTransferToken create_and_transfer_token_transaction = 11;
+        Transfer transfer_transaction = 4;
+        DelegateStake delegate_stake_transaction = 5;
+        DeactivateStake deactivate_stake_transaction = 6;
+        DeactivateAllStake deactivate_all_stake_transaction = 7;
+        WithdrawStake withdraw_transaction = 8;
+        WithdrawAllStake withdraw_all_transaction = 9;
+        CreateTokenAccount create_token_account_transaction = 10;
+        TokenTransfer token_transfer_transaction = 11;
+        CreateAndTransferToken create_and_transfer_token_transaction = 12;
+        CreateNonceAccount create_nonce_account = 13;
+        WithdrawNonceAccount withdraw_nonce_account = 16;
+        AdvanceNonceAccount advance_nonce_account = 19;
     }
+    // Required for building pre-signing hash of a transaction
+    string sender = 14;
+    // Required for using durable transaction nonce
+    string nonce_account = 15;
+    // Optional external fee payer private key. support: TokenTransfer, CreateAndTransferToken
+    bytes fee_payer_private_key = 17;
+    // Optional external fee payer. support: TokenTransfer, CreateAndTransferToken
+    string fee_payer = 18;
+    // Optional message plan. For signing an already prepared message.
+    RawMessage raw_message = 20;
+    // Output transaction encoding.
+    Encoding tx_encoding = 21;
+    // Optional. Set a specific compute unit limit that the transaction is allowed to consume.
+    // https://solana.com/docs/intro/transaction_fees#prioritization-fee
+    PriorityFeePrice priority_fee_price = 22;
+    // Optional. Set a compute unit price in "micro-lamports" to pay a higher transaction
+    // fee for higher transaction prioritization.
+    // https://solana.com/docs/intro/transaction_fees#prioritization-fee
+    PriorityFeeLimit priority_fee_limit = 23;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+    // The encoded transaction
     string encoded = 1;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
+
+    // The encoded message. Can be used to estimate a transaction fee required to execute the message.
+    string unsigned_tx = 4;
+
+    // Transaction signatures (may include external signatures).
+    repeated PubkeySignature signatures = 5;
+}
+
+/// Transaction pre-signing output
+message PreSigningOutput {
+    // Signer list
+    repeated bytes signers = 1;
+
+    // Pre-image data. There is no hashing for Solana presign image
+    bytes data = 2;
+
+    // Error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 3;
+
+    // Error code description
+    string error_message = 4;
 }
diff --git a/src/proto/Stellar.proto b/src/proto/Stellar.proto
index 0849f07097f..ab890559337 100644
--- a/src/proto/Stellar.proto
+++ b/src/proto/Stellar.proto
@@ -3,24 +3,30 @@ syntax = "proto3";
 package TW.Stellar.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// Represents an asset
+// Note: alphanum12 currently not supported
 message Asset {
     // Optional in case of non-native asset; the asset issuer address
     string issuer = 1;
 
     // Optional in case of non-native asset; the asset alphanum4 code.
     string alphanum4 = 2;
-
-    // Note: alphanum12 currently not supported
 }
 
+// Create a new account
 message OperationCreateAccount {
+    // address
     string destination = 1;
 
     // Amount (*10^7)
     int64 amount = 2;
 }
 
+// Perform payment
 message OperationPayment {
+    // Destination address
     string destination = 1;
 
     // Optional, can be left empty for native asset
@@ -30,24 +36,32 @@ message OperationPayment {
     int64 amount = 3;
 }
 
+// Change trust
 message OperationChangeTrust {
+    // The asset
     Asset asset = 1;
 
     // Validity (time bound to), unix time.  Set to (now() + 2 * 365 * 86400) for 2 years; set to 0 for missing.
     int64 valid_before = 2;
 }
 
+// A predicate (used in claim)
+// Rest of predicates not currently supported
+// See https://github.com/stellar/stellar-protocol/blob/master/core/cap-0023.md
 enum ClaimPredicate {
     Predicate_unconditional = 0;
-    // Rest of predicates not currently supported
-    // See https://github.com/stellar/stellar-protocol/blob/master/core/cap-0023.md
 }
 
+// Claimant: account & predicate
 message Claimant {
+    // Claimant account
     string account = 1;
+
+    // predicate
     ClaimPredicate predicate = 2;
 }
 
+// Create a claimable balance (2-phase transfer)
 message OperationCreateClaimableBalance {
     // Optional, can be left empty for native asset
     Asset asset = 1;
@@ -55,42 +69,53 @@ message OperationCreateClaimableBalance {
     // Amount (*10^7)
     int64 amount = 2;
 
+    // One or more claimants
     repeated Claimant claimants = 3;
 }
 
+// Claim a claimable balance
 message OperationClaimClaimableBalance {
     // 32-byte balance ID hash
     bytes balance_id = 1;
 }
 
+// Empty memo (placeholder)
 message MemoVoid {
 }
 
+// Memo with text
 message MemoText {
     string text = 1;
 }
 
+// Memo with an ID
 message MemoId {
     int64 id = 1;
 }
 
+// Memo with a hash
 message MemoHash {
     bytes hash = 1;
 }
 
 // Input data necessary to create a signed transaction.
 message SigningInput {
+    // Transaction fee
     int32 fee = 1;
 
+    // Account sequence
     int64 sequence = 2;
 
+    // Source account
     string account = 3;
 
-    // Private key.
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 4;
 
+    // Wellknown passphrase, specific to the chain
     string passphrase = 5;
 
+    // Payload message
     oneof operation_oneof {
         OperationCreateAccount op_create_account = 6;
         OperationPayment op_payment = 7;
@@ -99,6 +124,7 @@ message SigningInput {
         OperationClaimClaimableBalance op_claim_claimable_balance = 15;
     }
 
+    // Memo
     oneof memo_type_oneof {
         MemoVoid memo_void = 9;
         MemoText memo_text = 10;
@@ -106,10 +132,18 @@ message SigningInput {
         MemoHash memo_hash = 12;
         MemoHash memo_return_hash = 13;
     }
+
+    int64 time_bounds = 16;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signature.
     string signature = 1;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 2;
+
+    // error code description
+    string error_message = 3;
 }
diff --git a/src/proto/Sui.proto b/src/proto/Sui.proto
new file mode 100644
index 00000000000..1efb8798b8c
--- /dev/null
+++ b/src/proto/Sui.proto
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.Sui.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+// Object info (including Coins).
+message ObjectRef {
+    // Hex string representing the object ID.
+    string object_id = 1;
+    // Object version.
+    uint64 version = 2;
+    // Base58 string representing the object digest.
+    string object_digest = 3;
+}
+
+// Optional amount.
+message Amount {
+    uint64 amount = 1;
+}
+
+// Base64 encoded msg to sign (string)
+message SignDirect {
+    // Obtain by calling any write RpcJson on SUI
+    string unsigned_tx_msg = 1;
+}
+
+// Send `Coin<T>` to a list of addresses, where T can be any coin type, following a list of amounts.
+// The object specified in the gas field will be used to pay the gas fee for the transaction.
+// The gas object can not appear in input_coins.
+// https://docs.sui.io/sui-api-ref#unsafe_pay
+message Pay {
+    // The Sui coins to be used in this transaction, including the coin for gas payment.
+    repeated ObjectRef input_coins = 1;
+
+    // The recipients' addresses, the length of this vector must be the same as amounts.
+    repeated string recipients = 2;
+
+    // The amounts to be transferred to recipients, following the same order.
+    repeated uint64 amounts = 3;
+
+    // Gas object to be used in this transaction.
+    ObjectRef gas = 4;
+}
+
+// Send SUI coins to a list of addresses, following a list of amounts.
+// This is for SUI coin only and does not require a separate gas coin object.
+// https://docs.sui.io/sui-api-ref#unsafe_paysui
+message PaySui {
+    // The Sui coins to be used in this transaction, including the coin for gas payment.
+    repeated ObjectRef input_coins = 1;
+
+    // The recipients' addresses, the length of this vector must be the same as amounts.
+    repeated string recipients = 2;
+
+    // The amounts to be transferred to recipients, following the same order.
+    repeated uint64 amounts = 3;
+}
+
+// Send all SUI coins to one recipient.
+// This is for SUI coin only and does not require a separate gas coin object.
+// https://docs.sui.io/sui-api-ref#unsafe_payallsui
+message PayAllSui {
+    // The Sui coins to be used in this transaction, including the coin for gas payment.
+    repeated ObjectRef input_coins = 1;
+
+    // The recipient address.
+    string recipient = 2;
+}
+
+// Add stake to a validator's staking pool using multiple coins and amount.
+// https://docs.sui.io/sui-api-ref#unsafe_requestaddstake
+message RequestAddStake {
+    // Coin<SUI> objects to stake.
+    repeated ObjectRef coins = 1;
+
+    // Optional stake amount.
+    Amount amount = 2;
+
+    // The validator's Sui address.
+    string validator = 3;
+
+    // Gas object to be used in this transaction.
+    ObjectRef gas = 4;
+}
+
+// Withdraw stake from a validator's staking pool.
+// https://docs.sui.io/sui-api-ref#unsafe_requestwithdrawstake
+message RequestWithdrawStake {
+    // StakedSui object ID.
+    ObjectRef staked_sui = 1;
+
+    // Gas object to be used in this transaction.
+    ObjectRef gas = 2;
+}
+
+/// Transfer an object from one address to another. The object's type must allow public transfers.
+/// https://docs.sui.io/sui-api-ref#unsafe_transferobject
+message TransferObject {
+    // Object ID to be transferred.
+    ObjectRef object = 1;
+
+    // The recipient address.
+    string recipient = 2;
+
+    // Gas object to be used in this transaction.
+    ObjectRef gas = 3;
+}
+
+// Input data necessary to create a signed transaction.
+message SigningInput {
+    //  Private key to sign the transaction (bytes).
+    bytes private_key = 1;
+
+    // Optional transaction signer.
+    // Needs to be set if no private key provided at `TransactionCompiler` module.
+    string signer = 2;
+
+    oneof transaction_payload {
+        SignDirect sign_direct_message = 3;
+        Pay pay = 4;
+        PaySui pay_sui = 5;
+        PayAllSui pay_all_sui = 6;
+        RequestAddStake request_add_stake = 7;
+        RequestWithdrawStake request_withdraw_stake = 8;
+        TransferObject transfer_object = 9;
+    }
+
+    // The gas budget, the transaction will fail if the gas cost exceed the budget.
+    uint64 gas_budget = 12;
+
+    // Reference gas price.
+    uint64 reference_gas_price = 13;
+}
+
+// Transaction signing output.
+message SigningOutput {
+    /// The raw transaction without indent in base64
+    string unsigned_tx = 1;
+
+    /// The signature encoded in base64
+    string signature = 2;
+
+    // Error code, 0 is ok, other codes will be treated as errors.
+    Common.Proto.SigningError error = 3;
+
+    // Error description.
+    string error_message = 4;
+}
diff --git a/src/proto/THORChainSwap.proto b/src/proto/THORChainSwap.proto
index a5c943b4a65..69b6d257e16 100644
--- a/src/proto/THORChainSwap.proto
+++ b/src/proto/THORChainSwap.proto
@@ -6,6 +6,7 @@ option java_package = "wallet.core.jni.proto";
 import "Bitcoin.proto";
 import "Ethereum.proto";
 import "Binance.proto";
+import "Cosmos.proto";
 
 // Supported blockchains
 enum Chain {
@@ -13,11 +14,18 @@ enum Chain {
     BTC = 1;
     ETH = 2;
     BNB = 3;
+    DOGE = 4;
+    BCH = 5;
+    LTC = 6;
+    ATOM = 7;
+    AVAX = 8;
+    BSC = 9;
 }
 
 // Predefined error codes
 enum ErrorCode {
-    OK = 0; // OK
+    // OK
+    OK = 0;
     Error_general = 1;
     Error_Input_proto_deserialization = 2;
     Error_Unsupported_from_chain = 13;
@@ -30,21 +38,39 @@ enum ErrorCode {
 
 // An error code + a free text
 message Error {
+    // code of the error
     ErrorCode code = 1;
+
+    // optional error message
     string message = 2;
 }
 
 // Represents an asset.  Examples: BNB.BNB, RUNE.RUNE, BNB.RUNE-67C
 message Asset {
+    // Chain ID
     Chain chain = 1;
+
+    // Symbol
     string symbol = 2;
+
+    // The ID of the token (blockchain-specific format)
     string token_id = 3;
 }
 
+message StreamParams {
+    // Optional Swap Interval ncy in blocks.
+    // The default is 1 - time-optimised means getting the trade done quickly, regardless of the cost.
+    string interval = 1;
+
+    // Optional Swap Quantity. Swap interval times every Interval blocks.
+    // The default is 0 - network will determine the number of swaps.
+    string quantity = 2;
+}
+
 // Input for a swap between source and destination chains; for creating a TX on the source chain.
 message SwapInput {
     // Source chain
-    Chain from_chain = 1;
+    Asset from_asset = 1;
 
     // Source address, on source chain
     string from_address = 2;
@@ -64,15 +90,36 @@ message SwapInput {
     // The source amount, integer as string, in the smallest native unit of the chain
     string from_amount = 7;
 
-    // The minimum accepted destination amount.  Actual destination amount will depend on current rates, limit amount can be used to prevent using very unfavorable rates.
+    // Optional minimum accepted destination amount.  Actual destination amount will depend on current rates, limit amount can be used to prevent using very unfavorable rates.
+    // The default is 0 - no price limit.
     string to_amount_limit = 8;
+
+    // Optional affiliate fee destination address.  A Rune address.
+    string affiliate_fee_address = 9;
+
+    // Optional affiliate fee, percentage base points, e.g. 100 means 1%, 0 - 1000, as string. Empty means to ignore it.
+    string affiliate_fee_rate_bp = 10;
+
+    // Optional extra custom memo, reserved for later use.
+    string extra_memo = 11;
+
+    // Optional expirationTime, will be now() + 15 min if not set
+    uint64 expiration_time = 12;
+
+    // Optional streaming parameters. Use Streaming Swaps and Swap Optimisation strategy if set.
+    // https://docs.thorchain.org/thorchain-finance/continuous-liquidity-pools#streaming-swaps-and-swap-optimisation
+    StreamParams stream_params = 13;
 }
 
+// Result of the swap, a SigningInput struct for the specific chain
 message SwapOutput {
+    // Source chain
     Chain from_chain = 1;
+
+    // Destination chain
     Chain to_chain = 2;
 
-    // Error code, filled in case of error, OK&"" on success
+    // Error code, filled in case of error, OK/empty on success
     Error error = 3;
 
     // Prepared unsigned transaction input, on the source chain, to THOR.  Some fields must be completed, and it has to be signed.
@@ -80,5 +127,6 @@ message SwapOutput {
         Bitcoin.Proto.SigningInput bitcoin = 4;
         Ethereum.Proto.SigningInput ethereum = 5;
         Binance.Proto.SigningInput binance = 6;
+        Cosmos.Proto.SigningInput cosmos = 7;
     }
 }
diff --git a/src/proto/Tezos.proto b/src/proto/Tezos.proto
index f5d9240e1e7..7d632d2e90a 100644
--- a/src/proto/Tezos.proto
+++ b/src/proto/Tezos.proto
@@ -3,35 +3,63 @@ syntax = "proto3";
 package TW.Tezos.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
 // Input data necessary to create a signed Tezos transaction.
 // Next field: 3
 message SigningInput {
+  // One or more operations
   OperationList operation_list = 1;
-  bytes private_key = 2;
+
+  // Encoded operation bytes obtained with $RPC_URL/chains/main/blocks/head/helpers/forge/operations, operation_list will be ignored.
+  bytes encoded_operations = 2;
+
+  // The secret private key used for signing (32 bytes).
+  bytes private_key = 3;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 // Next field: 2
 message SigningOutput {
+  // The encoded transaction
   bytes encoded = 1;
+
+  // error code, 0 is ok, other codes will be treated as errors
+  Common.Proto.SigningError error = 2;
+
+  // error code description
+  string error_message = 3;
 }
 
 // A list of operations and a branch.
 // Next field: 3
 message OperationList {
+  // branch
   string branch = 1;
+
+  // list of operations
   repeated Operation operations = 2;
 }
 
 // An operation that can be applied to the Tezos blockchain.
 // Next field: 12
 message Operation {
+  // counter
   int64 counter = 1;
+
+  // source account
   string source = 2;
+
+  // fee
   int64 fee = 3;
+
+  // gas limit
   int64 gas_limit = 4;
+
+  // storage limit
   int64 storage_limit = 5;
 
+  // Operation types
   enum OperationKind {
     // Note: Proto3 semantics require a zero value.
     ENDORSEMENT = 0;
@@ -40,6 +68,7 @@ message Operation {
     TRANSACTION = 108;
     DELEGATION = 110;
   }
+  // Operation type
   OperationKind kind = 7;
 
   // Operation specific data depending on the type of the operation.
@@ -73,6 +102,7 @@ message FA2Parameters {
   repeated TxObject txs_object = 2;
 }
 
+// Generic operation parameters
 message OperationParameters {
   oneof parameters {
     FA12Parameters fa12_parameters = 1;
@@ -85,7 +115,8 @@ message OperationParameters {
 message TransactionOperationData {
   string destination = 1;
   int64 amount = 2;
-  OperationParameters parameters = 3;
+  bytes encoded_parameter = 3;
+  OperationParameters parameters = 4;
 }
 
 // Reveal operation specific data.
diff --git a/src/proto/TheOpenNetwork.proto b/src/proto/TheOpenNetwork.proto
new file mode 100644
index 00000000000..4ef1ca11ac4
--- /dev/null
+++ b/src/proto/TheOpenNetwork.proto
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+syntax = "proto3";
+
+package TW.TheOpenNetwork.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Common.proto";
+
+enum WalletVersion {
+    WALLET_V3_R1 = 0;
+    WALLET_V3_R2 = 1;
+    WALLET_V4_R2 = 2;
+    WALLET_V5_R1 = 3;
+};
+
+enum SendMode {
+    DEFAULT = 0;
+    PAY_FEES_SEPARATELY = 1;
+    IGNORE_ACTION_PHASE_ERRORS = 2;
+    DESTROY_ON_ZERO_BALANCE = 32;
+    ATTACH_ALL_INBOUND_MESSAGE_VALUE = 64;
+    ATTACH_ALL_CONTRACT_BALANCE = 128;
+};
+
+message Transfer {
+    // Recipient address
+    string dest = 1;
+
+    // Amount to send in nanotons
+    uint64 amount = 2;
+
+    // Send mode (optional, 0 by default)
+    // Learn more: https://ton.org/docs/develop/func/stdlib#send_raw_message
+    uint32 mode = 3;
+
+    // Transfer comment message (optional, empty by default)
+    // Ignored if `custom_payload` is specified
+    string comment = 4;
+
+    // If the address is bounceable
+    bool bounceable = 5;
+
+    // Optional raw one-cell BoC encoded in Base64.
+    // Can be used to deploy a smart contract.
+    string state_init = 6;
+
+    // One of the Transfer message payloads (optional).
+    oneof payload {
+        // Jetton transfer payload.
+        JettonTransfer jetton_transfer = 7;
+        // TON transfer with custom payload (contract call). Raw one-cell BoC encoded in Base64.
+        string custom_payload = 8;
+    }
+}
+
+message JettonTransfer {
+    // Arbitrary request number. Default is 0. Optional field.
+    uint64 query_id = 1;
+
+    // Amount of transferred jettons in elementary integer units. The real value transferred is jetton_amount multiplied by ten to the power of token decimal precision
+    uint64 jetton_amount = 2;
+
+    // Address of the new owner of the jettons.
+    string to_owner = 3;
+
+    // Address where to send a response with confirmation of a successful transfer and the rest of the incoming message Toncoins. Usually the sender should get back their toncoins.
+    string response_address = 4;
+
+    // Amount in nanotons to forward to recipient. Basically minimum amount - 1 nanoton should be used
+    uint64 forward_amount = 5;
+
+    // Optional raw one-cell BoC encoded in Base64.
+    // Can be used in the case of mintless jetton transfers.
+    string custom_payload = 6;
+}
+
+message SigningInput {
+    // The secret private key used for signing (32 bytes).
+    bytes private_key = 1;
+
+    // Public key of the signer (32 bytes). Used when transaction is going to be signed externally.
+    bytes public_key = 2;
+
+    // Up to 4 internal messages.
+    repeated Transfer messages = 3;
+
+    // Message counter (optional, 0 by default used for the first deploy)
+    // This field is required, because we need to protect the smart contract against "replay attacks"
+    // Learn more: https://ton.org/docs/develop/smart-contracts/guidelines/external-messages
+    uint32 sequence_number = 4;
+
+    // Expiration UNIX timestamp (optional, now() + 60 by default)
+    uint32 expire_at = 5;
+
+    // Wallet version
+    WalletVersion wallet_version = 6;
+}
+
+// Transaction signing output.
+message SigningOutput {
+    // Signed and base64 encoded BOC message
+    string encoded = 1;
+
+    // Transaction Cell hash
+    bytes hash = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 3;
+
+    // error code description
+    string error_message = 4;
+}
diff --git a/src/proto/Theta.proto b/src/proto/Theta.proto
index f779c0b5b0d..7191c6cc5ae 100644
--- a/src/proto/Theta.proto
+++ b/src/proto/Theta.proto
@@ -3,6 +3,8 @@ syntax = "proto3";
 package TW.Theta.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
 /// Input data necessary to create a signed transaction
 message SigningInput {
     /// Chain ID string, mainnet, testnet and privatenet
@@ -11,27 +13,36 @@ message SigningInput {
     /// Recipient address
     string to_address = 2;
 
-    /// Theta token amount to send in wei (256-bit number)
+    /// Theta token amount to send in wei (uint256, serialized big endian)
     bytes theta_amount = 3;
 
-    /// TFuel token amount to send in wei (256-bit number)
+    /// TFuel token amount to send in wei (uint256, serialized big endian)
     bytes tfuel_amount = 4;
 
     /// Sequence number of the transaction for the sender address
     uint64 sequence = 5;
 
-    /// Fee amount in TFuel wei for the transaction (256-bit number)
+    /// Fee amount in TFuel wei for the transaction (uint256, serialized big endian)
     bytes fee = 6;
 
-    /// Private key
+    /// The secret private key used for signing (32 bytes).
     bytes private_key = 7;
+
+    /// Public key
+    bytes public_key = 8;
 }
 
-/// Transaction signing output
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     /// Signed and encoded transaction bytes
     bytes encoded = 1;
 
     /// Signature
     bytes signature = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 3;
+
+    // error code description
+    string error_message = 4;
 }
diff --git a/src/proto/Tron.proto b/src/proto/Tron.proto
index 3a6b635b169..89e6fd6529d 100644
--- a/src/proto/Tron.proto
+++ b/src/proto/Tron.proto
@@ -3,6 +3,9 @@ syntax = "proto3";
 package TW.Tron.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// A transfer transaction
 message TransferContract {
     // Sender address.
     string owner_address = 1;
@@ -14,6 +17,7 @@ message TransferContract {
     int64 amount = 3;
 }
 
+// Asset transfer
 message TransferAssetContract {
     // Asset name.
     string asset_name = 1;
@@ -28,6 +32,7 @@ message TransferAssetContract {
     int64 amount = 4;
 }
 
+// TRC20 token transfer
 message TransferTRC20Contract {
     // Contract name.
     string contract_address = 1;
@@ -38,79 +43,181 @@ message TransferTRC20Contract {
     // Recipient address.
     string to_address = 3;
 
-    // Amount to send, uint256, big-endian.
+    // Amount to send, (uint256, serialized big endian)
     bytes amount = 4;
 }
 
+// Freeze balance
 message FreezeBalanceContract {
     // Sender address.
     string owner_address = 1;
+
     // Frozen balance. Minimum 1
     int64 frozen_balance = 2;
+
     // Frozen duration
     int64 frozen_duration = 3;
+
     // Resource type: BANDWIDTH | ENERGY
     string resource = 10;
+
     // Receiver address
     string receiver_address = 15;
 }
 
+// stake TRX to obtain TRON Power (voting rights) and bandwidth or energy.
+message FreezeBalanceV2Contract {
+    // Address of transaction initiator, data type is string
+    string owner_address = 1;
+
+    // Amount of TRX to be staked, unit is sun, data type is uint256
+    int64 frozen_balance = 2;
+
+    // Resource type, "BANDWIDTH" or "ENERGY", data type is string
+    string resource = 3;
+}
+
+// Unstake TRX to release bandwidth and energy and at the same time TRON Power will be reduced and all corresponding votes will be canceled.
+message UnfreezeBalanceV2Contract {
+    // Address of transaction initiator, data type is string
+    string owner_address = 1;
+    // Amount of TRX to be unstaked, unit is sun, data type is uint256
+    int64 unfreeze_balance = 2;
+    // Resource type, "BANDWIDTH" or "ENERGY", data type is string
+    string resource = 3;
+}
+
+// withdraw unfrozen balance
+message WithdrawExpireUnfreezeContract {
+    // Address of transaction initiator, data type is string
+    string owner_address = 1;
+}
+
+// delegate resource
+message DelegateResourceContract {
+    // Address of transaction initiator, data type is string
+    string owner_address = 1;
+    // Resource type, "BANDWIDTH" or "ENERGY", data type is string
+    string resource = 2;
+    // Amount of TRX staked for resource to be delegated, unit is sun, data type is uint256
+    int64 balance = 3;
+    // Receiver address of resource to be delegated to
+    string receiver_address = 4;
+    // Whether it is locked, if it is set to true, the delegated resources cannot be undelegated within 3 days.
+    // When the lock time is not over, if the owner delegates the same resources using the lock to the same address,
+    // the lock time will be reset to 3 days
+    bool  lock = 5;
+}
+
+// undelegate resource
+message UnDelegateResourceContract {
+    // Address of transaction initiator, data type is string
+    string owner_address = 1;
+    // Resource type, "BANDWIDTH" or "ENERGY", data type is string
+    string resource = 2;
+    // Amount of TRX staked for resource to be undelegated, unit is sun, data type is uint256
+    int64 balance = 3;
+    // Receiver address of resource to be delegated to, data type is string
+    string receiver_address = 4;
+}
+
+// Unfreeze balance
 message UnfreezeBalanceContract {
     // Sender address
     string owner_address = 1;
+
     // Resource type: BANDWIDTH | ENERGY
     string resource = 10;
+
     // Receiver address
     string receiver_address = 15;
 }
 
+// Unfreeze asset
 message UnfreezeAssetContract {
     // Sender address
     string owner_address = 1;
 }
 
+// Vote asset
 message VoteAssetContract {
     // Sender address
     string owner_address = 1;
+
     // Vote addresses
     repeated string vote_address = 2;
+
     bool support = 3;
+
     int32 count = 5;
 }
 
+// Vote witness
 message VoteWitnessContract {
+    // A vote
     message Vote {
+        // address
         string vote_address = 1;
+
+        // vote count
         int64 vote_count = 2;
     }
+
+    // Owner
     string owner_address = 1;
+
+    // The votes
     repeated Vote votes = 2;
+
     bool support = 3;
 }
 
+// Withdraw balance
 message WithdrawBalanceContract {
     // Sender address
     string owner_address = 1;
 }
 
+// Smart contract call
 message TriggerSmartContract {
+    // Owner
     string owner_address = 1;
+
+    // Contract address
     string contract_address = 2;
+
+    // amount
     int64 call_value = 3;
+
+    // call data
     bytes data = 4;
+
+    // token value
     int64 call_token_value = 5;
+
+    // ID of the token
     int64 token_id = 6;
 }
 
+// Info from block header
 message BlockHeader {
+    // creation timestamp
     int64 timestamp = 1;
+
+    // root
     bytes tx_trie_root = 2;
+
+    // hash of the parent
     bytes parent_hash = 3;
+
     int64 number = 7;
+
     bytes witness_address = 9;
+
     int32 version = 10;
 }
 
+// Transaction
 message Transaction {
     // Transaction timestamp in milliseconds.
     int64 timestamp = 1;
@@ -121,9 +228,12 @@ message Transaction {
     // Transaction block header.
     BlockHeader block_header = 3;
 
-    // Transaction fee limit
+    // Transaction fee limit.
     int64 fee_limit = 4;
 
+    // Transaction memo.
+    string memo = 5;
+
     // Contract.
     oneof contract_oneof {
         TransferContract transfer = 10;
@@ -136,18 +246,27 @@ message Transaction {
         VoteWitnessContract vote_witness = 17;
         TriggerSmartContract trigger_smart_contract = 18;
         TransferTRC20Contract transfer_trc20_contract = 19;
+        FreezeBalanceV2Contract freeze_balance_v2 = 20;
+        UnfreezeBalanceV2Contract unfreeze_balance_v2 = 21;
+        WithdrawExpireUnfreezeContract withdraw_expire_unfreeze = 23;
+        DelegateResourceContract delegate_resource = 24;
+        UnDelegateResourceContract undelegate_resource = 25;
     }
 }
 
+// Input data necessary to create a signed transaction.
 message SigningInput {
     // Transaction.
     Transaction transaction = 1;
 
-    // Private key.
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 2;
+
+    // For direct sign in Tron, we just have to sign the txId returned by the DApp json payload.
+    string txId = 3;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Transaction identifier.
     bytes id = 1;
@@ -158,5 +277,12 @@ message SigningOutput {
     bytes ref_block_bytes = 3;
     bytes ref_block_hash = 4;
 
+    // Result in JSON
     string json = 5;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 6;
+
+    // error code description
+    string error_message = 7;
 }
diff --git a/src/proto/VeChain.proto b/src/proto/VeChain.proto
index c89d9f0bfc5..26d4086c1db 100644
--- a/src/proto/VeChain.proto
+++ b/src/proto/VeChain.proto
@@ -3,11 +3,14 @@ syntax = "proto3";
 package TW.VeChain.Proto;
 option java_package = "wallet.core.jni.proto";
 
+import "Common.proto";
+
+// A clause, between a sender and destination
 message Clause {
     /// Recipient address.
     string to = 1;
 
-    /// Transaction amount.
+    /// Transaction amount (uint256, serialized big endian)
     bytes value = 2;
 
     /// Payload data.
@@ -43,15 +46,21 @@ message SigningInput {
     /// Number set by user.
     uint64 nonce = 8;
 
-    // Private key.
+    /// The secret private key used for signing (32 bytes).
     bytes private_key = 9;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed and encoded transaction bytes.
     bytes encoded = 1;
 
     // Signature.
     bytes signature = 2;
+
+    // error code, 0 is ok, other codes will be treated as errors
+    Common.Proto.SigningError error = 3;
+
+    // error code description
+    string error_message = 4;
 }
diff --git a/src/proto/WalletConnect.proto b/src/proto/WalletConnect.proto
new file mode 100644
index 00000000000..7d9139b70d5
--- /dev/null
+++ b/src/proto/WalletConnect.proto
@@ -0,0 +1,48 @@
+syntax = "proto3";
+
+package TW.WalletConnect.Proto;
+option java_package = "wallet.core.jni.proto";
+
+import "Binance.proto";
+import "Common.proto";
+import "Solana.proto";
+
+// The transaction protocol may differ from version to version.
+enum Protocol {
+    V2 = 0;
+}
+
+// WalletConnect request method.
+enum Method {
+    Unknown = 0;
+    // cosmos_signAmino
+    CosmosSignAmino = 1;
+    // solana_signTransaction
+    SolanaSignTransaction = 2;
+}
+
+message ParseRequestInput {
+    // A protocol version.
+    Protocol protocol = 1;
+
+    // A signing method like "cosmos_signAmino" or "eth_signTransaction".
+    Method method = 2;
+
+    // Transaction payload to sign.
+    // Basically, a JSON object.
+    string payload = 3;
+}
+
+message ParseRequestOutput {
+    // OK (=0) or other codes in case of error
+    Common.Proto.SigningError error = 1;
+
+    // error description in case of error
+    string error_message = 2;
+
+    // Prepared unsigned transaction input, on the source chain. Some fields must be completed, and it has to be signed.
+    oneof signing_input_oneof {
+        Binance.Proto.SigningInput binance = 3;
+        Solana.Proto.SigningInput solana = 4;
+    }
+}
diff --git a/src/proto/Waves.proto b/src/proto/Waves.proto
index 011fcf1138b..a2acc2ef599 100644
--- a/src/proto/Waves.proto
+++ b/src/proto/Waves.proto
@@ -3,29 +3,45 @@ syntax = "proto3";
 package TW.Waves.Proto;
 option java_package = "wallet.core.jni.proto";
 
-//Transfer transaction
+// Transfer transaction
 message TransferMessage {
+    // amount
     int64 amount = 1;
+
+    // asset ID
     string asset = 2;
+
     // minimum 0.001 Waves (100000 Wavelets) for now
     int64 fee = 3;
+
+    // asset of the fee
     string fee_asset = 4;
+
+    // destination address
     string to = 5;
+
     // any 140 bytes payload, will be displayed to the client as utf-8 string
     bytes attachment = 6;
 }
 
-//Lease transaction
+// Lease transaction
 message LeaseMessage {
+    // amount
     int64 amount = 1;
+
+    // destination
     string to = 2;
+
     // minimum 0.001 Waves (100000 Wavelets) for now
     int64 fee = 3;
 }
 
-//Lease transaction
+// Cancel Lease transaction
 message CancelLeaseMessage {
+    // Lease ID to cancel
     string lease_id = 1;
+
+    // Fee used
     int64 fee = 2;
 }
 
@@ -34,7 +50,11 @@ message CancelLeaseMessage {
 message SigningInput {
     // in millis
     int64 timestamp = 1;
+
+    // The secret private key used for signing (32 bytes).
     bytes private_key = 2;
+
+    // Payload message
     oneof message_oneof {
         TransferMessage transfer_message = 3;
         LeaseMessage lease_message = 4;
@@ -42,9 +62,12 @@ message SigningInput {
     }
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
+    // signature data
     bytes signature = 1;
+
+    // transaction in JSON format
     string json = 2;
 }
 
diff --git a/src/proto/Zilliqa.proto b/src/proto/Zilliqa.proto
index ea5d3eff4c9..4e4e661fc98 100644
--- a/src/proto/Zilliqa.proto
+++ b/src/proto/Zilliqa.proto
@@ -3,14 +3,17 @@ syntax = "proto3";
 package TW.Zilliqa.Proto;
 option java_package = "wallet.core.jni.proto";
 
+// Generic transaction
 message Transaction {
+    // Transfer transaction
     message Transfer {
-        // Amount to send (256-bit number)
+        // Amount to send (uint256, serialized big endian)
         bytes amount           = 1;
     }
 
+    // Generic contract call
     message Raw {
-        // Amount to send (256-bit number)
+        // Amount to send (uint256, serialized big endian)
         bytes amount           = 1;
 
         // Smart contract code
@@ -43,13 +46,14 @@ message SigningInput {
     // GasLimit
     uint64 gas_limit       = 5;
 
-    // Private Key
+    // The secret private key used for signing (32 bytes).
     bytes private_key      = 6;
 
+    // The payload transaction
     Transaction transaction = 7;
 }
 
-// Transaction signing output.
+// Result containing the signed and encoded transaction.
 message SigningOutput {
     // Signed signature bytes.
     bytes signature = 1;
diff --git a/src/rust/RustCoinEntry.cpp b/src/rust/RustCoinEntry.cpp
new file mode 100644
index 00000000000..870bbe2c076
--- /dev/null
+++ b/src/rust/RustCoinEntry.cpp
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "RustCoinEntry.h"
+#include "Wrapper.h"
+
+namespace TW::Rust {
+
+bool RustCoinEntry::validateAddress(TWCoinType coin, const std::string &address, const PrefixVariant &addressPrefix) const {
+    Rust::TWStringWrapper addressStr = address;
+
+    if (std::holds_alternative<std::monostate>(addressPrefix)) {
+        return Rust::tw_any_address_is_valid(addressStr.get(), static_cast<uint32_t>(coin));
+    } else if (const auto* hrpPrefix = std::get_if<Bech32Prefix>(&addressPrefix); hrpPrefix) {
+        Rust::TWStringWrapper hrpStr = std::string(*hrpPrefix);
+        return Rust::tw_any_address_is_valid_bech32(addressStr.get(), static_cast<uint32_t>(coin), hrpStr.get());
+    } else {
+        throw std::invalid_argument("`Rust::tw_any_address_is_valid_ss58`, `Rust::tw_any_address_create_with_public_key_filecoin_address_type` are not supported yet");
+    }
+}
+
+std::string RustCoinEntry::normalizeAddress(TWCoinType coin, const std::string& address) const {
+    Rust::TWStringWrapper addressStr = address;
+
+    // `CoinEntry::normalizeAddress` is used when a `TWAnyAddress` has been created already, therefore validated.
+    auto anyAddress = Rust::wrapTWAnyAddress(
+        Rust::tw_any_address_create_with_string_unchecked(addressStr.get(), static_cast<uint32_t>(coin)));
+    if (!anyAddress) {
+        return {};
+    }
+
+    Rust::TWStringWrapper normalized = Rust::tw_any_address_description(anyAddress.get());
+    return normalized.toStringOrDefault();
+}
+
+std::string RustCoinEntry::deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const {
+    auto *twPublicKeyRaw = Rust::tw_public_key_create_with_data(publicKey.bytes.data(),
+                                                                publicKey.bytes.size(),
+                                                                static_cast<uint32_t>(publicKey.type));
+    auto twPublicKey = Rust::wrapTWPublicKey(twPublicKeyRaw);
+    if (!twPublicKey) {
+        return {};
+    }
+
+    Rust::TWAnyAddress* anyAddressRaw = nullptr;
+    if (std::holds_alternative<std::monostate>(addressPrefix)) {
+        anyAddressRaw = Rust::tw_any_address_create_with_public_key_derivation(twPublicKey.get(),
+                                                                               static_cast<uint32_t>(coin),
+                                                                               static_cast<uint32_t>(derivation));
+    } else if (const auto* hrpPrefix = std::get_if<Bech32Prefix>(&addressPrefix); hrpPrefix) {
+        Rust::TWStringWrapper hrpStr = std::string(*hrpPrefix);
+        anyAddressRaw = Rust::tw_any_address_create_bech32_with_public_key(twPublicKey.get(),
+                                                                           static_cast<uint32_t>(coin),
+                                                                           hrpStr.get());
+    } else {
+        throw std::invalid_argument("`Rust::tw_any_address_is_valid_ss58`, `Rust::tw_any_address_create_with_public_key_filecoin_address_type` are not supported yet");
+    }
+
+    auto anyAddress = Rust::wrapTWAnyAddress(anyAddressRaw);
+    if (!anyAddress) {
+        return {};
+    }
+
+    Rust::TWStringWrapper derivedAddress = Rust::tw_any_address_description(anyAddress.get());
+    return derivedAddress.toStringOrDefault();
+}
+
+Data RustCoinEntry::addressToData(TWCoinType coin, const std::string& address) const {
+    Rust::TWStringWrapper addressStr = address;
+
+    // `CoinEntry::normalizeAddress` is used when a `TWAnyAddress` has been created already, therefore validated.
+    auto anyAddress = Rust::wrapTWAnyAddress(
+        Rust::tw_any_address_create_with_string_unchecked(addressStr.get(), static_cast<uint32_t>(coin)));
+    if (!anyAddress) {
+        return {};
+    }
+
+    Rust::TWDataWrapper data = Rust::tw_any_address_data(anyAddress.get());
+    return data.toDataOrDefault();
+}
+
+void RustCoinEntry::sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const {
+    Rust::TWDataWrapper input = Rust::tw_data_create_with_bytes(dataIn.data(), dataIn.size());
+    Rust::TWDataWrapper output = Rust::tw_any_signer_sign(input.get(), static_cast<uint32_t>(coin));
+
+    dataOut = output.toDataOrDefault();
+}
+
+Data RustCoinEntry::preImageHashes(TWCoinType coin, const Data& txInputData) const {
+    Rust::TWDataWrapper input = txInputData;
+    Rust::TWDataWrapper output = Rust::tw_transaction_compiler_pre_image_hashes(static_cast<uint32_t>(coin), input.get());
+
+    return output.toDataOrDefault();
+}
+
+void RustCoinEntry::compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const {
+    Rust::TWDataWrapper input = txInputData;
+
+    std::vector<Data> publicKeysData;
+    for (const auto& publicKey : publicKeys) {
+        publicKeysData.push_back(publicKey.bytes);
+    }
+
+    Rust::TWDataVectorWrapper signaturesVec = signatures;
+    Rust::TWDataVectorWrapper publicKeysVec = publicKeysData;
+
+    Rust::TWDataWrapper output = Rust::tw_transaction_compiler_compile(static_cast<uint32_t>(coin), input.get(), signaturesVec.get(), publicKeysVec.get());
+    dataOut = output.toDataOrDefault();
+}
+
+} // namespace TW::Rust
diff --git a/src/rust/RustCoinEntry.h b/src/rust/RustCoinEntry.h
new file mode 100644
index 00000000000..371c483883a
--- /dev/null
+++ b/src/rust/RustCoinEntry.h
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "CoinEntry.h"
+
+#include <google/protobuf/util/json_util.h>
+
+namespace TW::Rust {
+
+/// The function takes a Protobuf output message `const Output&` and returns `std::string`.
+template<typename Output>
+using SignJSONOutputHandler = std::function<std::string(const Output&)>;
+
+class RustCoinEntry : public CoinEntry {
+public:
+    ~RustCoinEntry() noexcept override = default;
+    bool validateAddress(TWCoinType coin, const std::string& address, const PrefixVariant& addressPrefix) const override;
+    std::string normalizeAddress(TWCoinType coin, const std::string& address) const override;
+    std::string deriveAddress(TWCoinType coin, const PublicKey& publicKey, TWDerivation derivation, const PrefixVariant& addressPrefix) const override;
+    Data addressToData(TWCoinType coin, const std::string& address) const override;
+    void sign(TWCoinType coin, const Data& dataIn, Data& dataOut) const override;
+
+    Data preImageHashes(TWCoinType coin, const Data& txInputData) const override;
+    void compile(TWCoinType coin, const Data& txInputData, const std::vector<Data>& signatures, const std::vector<PublicKey>& publicKeys, Data& dataOut) const override;
+};
+
+class RustCoinEntryWithSignJSON: public RustCoinEntry {
+public:
+    ~RustCoinEntryWithSignJSON() noexcept override = default;
+
+protected:
+    /// Helper function that can be used by [`Entry::signJSON`] to:
+    /// 1. Deserialize the given `json` as an `Input` object.
+    /// 2. Put the given `key` as `Input::private_key`.
+    /// 3. Serialize the input as bytes and call `Entry::sign`.
+    /// 4. Deserialize the output bytes as an `Output` object.
+    /// 5. Map the output object to a string.
+    template <typename Input, typename Output>
+    std::string signJSONHelper(TWCoinType coin, const std::string &json, const Data &key,
+                               SignJSONOutputHandler<Output> mapOutput) const {
+        Input input;
+        google::protobuf::util::JsonStringToMessage(json, &input);
+        input.set_private_key(key.data(), key.size());
+
+        auto inputData = data(input.SerializeAsString());
+        Data dataOut;
+        sign(coin, inputData, dataOut);
+
+        if (dataOut.empty()) {
+            return {};
+        }
+
+        Output output;
+        output.ParseFromArray(dataOut.data(), static_cast<int>(dataOut.size()));
+
+        return mapOutput(output);
+    }
+};
+
+} // namespace TW::Rust
diff --git a/src/rust/Wrapper.h b/src/rust/Wrapper.h
new file mode 100644
index 00000000000..04d97a9104c
--- /dev/null
+++ b/src/rust/Wrapper.h
@@ -0,0 +1,244 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <memory>
+#include <optional>
+
+#include "../Data.h"
+#include "bindgen/WalletCoreRSBindgen.h"
+
+namespace TW::Rust {
+
+inline std::shared_ptr<TWAnyAddress> wrapTWAnyAddress(TWAnyAddress* anyAddress) {
+    return std::shared_ptr<TWAnyAddress>(anyAddress, tw_any_address_delete);
+}
+
+inline std::shared_ptr<TWPublicKey> wrapTWPublicKey(TWPublicKey* publicKey) {
+    return std::shared_ptr<TWPublicKey>(publicKey, tw_public_key_delete);
+}
+
+struct TWDataVectorWrapper {
+    TWDataVectorWrapper():
+        ptr(std::shared_ptr<TWDataVector>(tw_data_vector_create(), Rust::tw_data_vector_delete)) {
+    }
+
+    /// Implicit constructor.
+    TWDataVectorWrapper(const std::vector<Data>& vec) {
+        ptr = std::shared_ptr<TWDataVector>(tw_data_vector_create(), Rust::tw_data_vector_delete);
+
+        for (const auto& item : vec) {
+            auto* itemData = tw_data_create_with_bytes(item.data(), item.size());
+            Rust::tw_data_vector_add(ptr.get(), itemData);
+            Rust::tw_data_delete(itemData);
+        }
+    }
+
+    ~TWDataVectorWrapper() = default;
+
+    void push(const Data& item) {
+        auto* itemData = tw_data_create_with_bytes(item.data(), item.size());
+        Rust::tw_data_vector_add(ptr.get(), itemData);
+        Rust::tw_data_delete(itemData);
+    }
+
+    TWDataVector* get() const {
+        return ptr.get();
+    }
+
+    std::shared_ptr<TWDataVector> ptr;
+};
+
+struct TWDataWrapper {
+    /// Implicit constructor.
+    TWDataWrapper(const Data& bytes) {
+        auto* dataRaw = tw_data_create_with_bytes(bytes.data(), bytes.size());
+        ptr = std::shared_ptr<TWData>(dataRaw, tw_data_delete);
+    }
+
+    /// Implicit constructor.
+    TWDataWrapper(TWData *ptr): ptr(std::shared_ptr<TWData>(ptr, tw_data_delete)) {
+    }
+
+    ~TWDataWrapper() = default;
+
+    TWData* get() const {
+        return ptr.get();
+    }
+
+    Data toDataOrDefault() const {
+        if (!ptr) {
+            return {};
+        }
+
+        auto* bytes = tw_data_bytes(ptr.get());
+        Data out(bytes, bytes + tw_data_size(ptr.get()));
+        return out;
+    }
+
+    std::shared_ptr<TWData> ptr;
+};
+
+struct TWStringWrapper {
+    /// Implicit constructor.
+    TWStringWrapper(const std::string& string) {
+        auto* stringRaw = tw_string_create_with_utf8_bytes(string.c_str());
+        ptr = std::shared_ptr<TWString>(stringRaw, tw_string_delete);
+    }
+
+    /// Implicit constructor.
+    TWStringWrapper(TWString *ptr): ptr(std::shared_ptr<TWString>(ptr, tw_string_delete)) {
+    }
+
+    /// Implicit constructor.
+    TWStringWrapper(const char* string) {
+        auto* stringRaw = tw_string_create_with_utf8_bytes(string);
+        ptr = std::shared_ptr<TWString>(stringRaw, tw_string_delete);
+    }
+
+    ~TWStringWrapper() = default;
+
+    TWString* get() const {
+        return ptr.get();
+    }
+
+    std::string toStringOrDefault() const {
+        if (!ptr) {
+            return {};
+        }
+
+        auto* bytes = tw_string_utf8_bytes(ptr.get());
+        return {bytes};
+    }
+
+    const char* c_str() const {
+        return ptr ? tw_string_utf8_bytes(ptr.get()) : nullptr;
+    }
+
+    explicit operator bool() const {
+        return static_cast<bool>(ptr);
+    }
+
+    std::shared_ptr<TWString> ptr;
+};
+
+struct CByteArrayWrapper {
+    CByteArrayWrapper() = default;
+
+    /// Implicit constructor.
+    CByteArrayWrapper(const CByteArray &rawArray) {
+        *this = rawArray;
+    }
+
+    CByteArrayWrapper& operator=(CByteArray rawArray) {
+        if (rawArray.data == nullptr || rawArray.size == 0) {
+            return *this;
+        }
+        Data result(&rawArray.data[0], &rawArray.data[rawArray.size]);
+        free_c_byte_array(&rawArray);
+        data = std::move(result);
+        return *this;
+    }
+
+    Data data;
+};
+
+struct CStringWrapper {
+    /// Implicit move constructor.
+    CStringWrapper(const char* c_str) {
+        *this = c_str;
+    }
+
+    CStringWrapper& operator=(const char* c_str) {
+        if (c_str == nullptr) {
+            return *this;
+        }
+        str = c_str;
+        Rust::free_string(c_str);
+        return *this;
+    }
+
+    std::string str;
+};
+
+struct CUInt8Wrapper {
+    /// Implicit move constructor.
+    CUInt8Wrapper(uint8_t c_u8) {
+        *this = c_u8;
+    }
+
+    CUInt8Wrapper& operator=(uint8_t c_u8) {
+        value = c_u8;
+        return *this;
+    }
+
+    uint8_t value;
+};
+
+struct CUInt64Wrapper {
+    /// Implicit move constructor.
+    CUInt64Wrapper(uint64_t c_u64) {
+        *this = c_u64;
+    }
+
+    CUInt64Wrapper& operator=(uint64_t c_u64) {
+        value = c_u64;
+        return *this;
+    }
+
+    uint64_t value;
+};
+
+template<typename T>
+class CResult {
+public:
+    /// Implicit move constructor.
+    /// This constructor is not fired if `R` type is `CResult`, i.e not a move constructor.
+    template<typename R>
+    CResult(const R& result) {
+        *this = result;
+    }
+
+    template <typename R>
+    CResult& operator=(const R& result) {
+        code = result.code;
+        if (code == OK_CODE) {
+            inner = result.result;
+        }
+        return *this;
+    }
+
+    /// Returns an inner value.
+    /// This method must be used if only `CResult::isOk` returns true,
+    /// otherwise it throws an exception.
+    T unwrap() {
+        return *inner;
+    }
+
+    /// Returns the result value if `CResult::isOk` return true, otherwise returns a default value.
+    T unwrap_or_default() {
+        return inner ? *inner : T {};
+    }
+
+    /// Whether the result contains a value.
+    bool isOk() const {
+        return code == OK_CODE;
+    }
+
+    /// Whether the result contains an error.
+    bool isErr() const {
+        return !isOk();
+    }
+
+private:
+    ErrorCode code;
+    std::optional<T> inner;
+};
+
+using CByteArrayResultWrapper = CResult<CByteArrayWrapper>;
+using CUInt8ResultWrapper = CResult<CUInt8Wrapper>;
+using CUInt64ResultWrapper = CResult<CUInt64Wrapper>;
+
+} // namespace TW::Rust
diff --git a/src/rust/bindgen/.gitignore b/src/rust/bindgen/.gitignore
new file mode 100644
index 00000000000..3e5286443dc
--- /dev/null
+++ b/src/rust/bindgen/.gitignore
@@ -0,0 +1 @@
+WalletCoreRSBindgen.h
diff --git a/src/uint256.h b/src/uint256.h
index 46159abb2cd..43c6999a21a 100644
--- a/src/uint256.h
+++ b/src/uint256.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -13,6 +11,7 @@
 
 namespace TW {
 
+using uint128_t = boost::multiprecision::uint128_t;
 using int256_t = boost::multiprecision::int256_t;
 using uint256_t = boost::multiprecision::uint256_t;
 
@@ -28,20 +27,6 @@ inline uint256_t load(const Data& data) {
     return result;
 }
 
-/// Loads a `uint256_t` from a collection of bytes.
-/// The leftmost offset bytes are skipped, and the next 32 bytes are taken.  At least 32 (+offset)
-/// bytes are needed.
-inline uint256_t loadWithOffset(const Data& data, size_t offset) {
-    using boost::multiprecision::cpp_int;
-    if (data.empty() || (data.size() < (256 / 8 + offset))) {
-        // not enough bytes in data
-        return uint256_t(0);
-    }
-    uint256_t result;
-    import_bits(result, data.begin() + offset, data.begin() + offset + 256 / 8);
-    return result;
-}
-
 /// Loads a `uint256_t` from Protobuf bytes (which are wrongly represented as
 /// std::string).
 inline uint256_t load(const std::string& data) {
diff --git a/swift/.gitignore b/swift/.gitignore
index 7166ea4da50..f392a48ec06 100644
--- a/swift/.gitignore
+++ b/swift/.gitignore
@@ -14,3 +14,4 @@ cpp.xcconfig
 # fastlane
 fastlane/README.md
 fastlane/report.xml
+WalletCoreRs.xcframework
diff --git a/swift/Example/Example/ContentView.swift b/swift/Example/Example/ContentView.swift
index 6918ce3fb59..b5da0ca723d 100644
--- a/swift/Example/Example/ContentView.swift
+++ b/swift/Example/Example/ContentView.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import SwiftUI
 import WalletCore
diff --git a/swift/Example/Example/ExampleApp.swift b/swift/Example/Example/ExampleApp.swift
index 938063a069d..f3f442eefcd 100644
--- a/swift/Example/Example/ExampleApp.swift
+++ b/swift/Example/Example/ExampleApp.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import SwiftUI
 
diff --git a/swift/Example/ExampleMac/ContentView.swift b/swift/Example/ExampleMac/ContentView.swift
index 41e49a49f7a..80981c59ac9 100644
--- a/swift/Example/ExampleMac/ContentView.swift
+++ b/swift/Example/ExampleMac/ContentView.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import SwiftUI
 import WalletCore
diff --git a/swift/Example/ExampleMac/ExampleMacApp.swift b/swift/Example/ExampleMac/ExampleMacApp.swift
index 911a53f8948..040a390bd88 100644
--- a/swift/Example/ExampleMac/ExampleMacApp.swift
+++ b/swift/Example/ExampleMac/ExampleMacApp.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import SwiftUI
 
diff --git a/swift/Example/ExampleTests/ExampleTests.swift b/swift/Example/ExampleTests/ExampleTests.swift
index c719046e6d8..427609b0096 100644
--- a/swift/Example/ExampleTests/ExampleTests.swift
+++ b/swift/Example/ExampleTests/ExampleTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Playground.playground/Contents.swift b/swift/Playground.playground/Contents.swift
index 832b3e213a6..4c886c35bc6 100644
--- a/swift/Playground.playground/Contents.swift
+++ b/swift/Playground.playground/Contents.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import UIKit
 import TrustWalletCore
diff --git a/swift/PrivacyInfo.xcprivacy b/swift/PrivacyInfo.xcprivacy
new file mode 100644
index 00000000000..19df86cbf91
--- /dev/null
+++ b/swift/PrivacyInfo.xcprivacy
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>NSPrivacyAccessedAPITypes</key>
+	<array>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategorySystemBootTime</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>35F9.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>85F4.1</string>
+			</array>
+		</dict>
+		<dict>
+			<key>NSPrivacyAccessedAPIType</key>
+			<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
+			<key>NSPrivacyAccessedAPITypeReasons</key>
+			<array>
+				<string>C617.1</string>
+			</array>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/swift/Sources/Dummy.cpp b/swift/Sources/Dummy.cpp
index e433c2b6009..d495a10a6b7 100644
--- a/swift/Sources/Dummy.cpp
+++ b/swift/Sources/Dummy.cpp
@@ -1,7 +1,5 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 // Dummy C++ file to force inclusion of the C++ STL when compiling.
diff --git a/swift/Sources/Extensions/Account+Codable.swift b/swift/Sources/Extensions/Account+Codable.swift
index 39b48c3d0c5..75449402873 100644
--- a/swift/Sources/Extensions/Account+Codable.swift
+++ b/swift/Sources/Extensions/Account+Codable.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/Extensions/AddressProtocol.swift b/swift/Sources/Extensions/AddressProtocol.swift
index 1660d724252..5a522687283 100644
--- a/swift/Sources/Extensions/AddressProtocol.swift
+++ b/swift/Sources/Extensions/AddressProtocol.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/Extensions/BitcoinAddress+Extension.swift b/swift/Sources/Extensions/BitcoinAddress+Extension.swift
index 48b799a6064..eb11bd99cdd 100644
--- a/swift/Sources/Extensions/BitcoinAddress+Extension.swift
+++ b/swift/Sources/Extensions/BitcoinAddress+Extension.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/Extensions/CoinType+Address.swift b/swift/Sources/Extensions/CoinType+Address.swift
index f0dbc2ea6ae..0cb5e2e0fff 100644
--- a/swift/Sources/Extensions/CoinType+Address.swift
+++ b/swift/Sources/Extensions/CoinType+Address.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/Extensions/Data+Hex.swift b/swift/Sources/Extensions/Data+Hex.swift
index 3888716e089..f57ac017624 100644
--- a/swift/Sources/Extensions/Data+Hex.swift
+++ b/swift/Sources/Extensions/Data+Hex.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/Extensions/DerivationPath+Extension.swift b/swift/Sources/Extensions/DerivationPath+Extension.swift
index 09678360e85..a97d0fb0687 100644
--- a/swift/Sources/Extensions/DerivationPath+Extension.swift
+++ b/swift/Sources/Extensions/DerivationPath+Extension.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/Extensions/Mnemonic+Extension.swift b/swift/Sources/Extensions/Mnemonic+Extension.swift
index 8eecce8b1ad..e9d0ebd825d 100644
--- a/swift/Sources/Extensions/Mnemonic+Extension.swift
+++ b/swift/Sources/Extensions/Mnemonic+Extension.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/Extensions/PublicKey+Bitcoin.swift b/swift/Sources/Extensions/PublicKey+Bitcoin.swift
index 8694b7dbba0..421097f1c75 100644
--- a/swift/Sources/Extensions/PublicKey+Bitcoin.swift
+++ b/swift/Sources/Extensions/PublicKey+Bitcoin.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 public extension PublicKey {
     /// Returns the ripemd160 hash of the sha2 hash of the compressed public key data.
diff --git a/swift/Sources/KeyStore.swift b/swift/Sources/KeyStore.swift
index 815843c87de..0b6c3368d77 100644
--- a/swift/Sources/KeyStore.swift
+++ b/swift/Sources/KeyStore.swift
@@ -74,8 +74,8 @@ public final class KeyStore {
     }
 
     /// Creates a new wallet. HD default by default
-    public func createWallet(name: String, password: String, coins: [CoinType]) throws -> Wallet {
-        let key = StoredKey(name: name, password: Data(password.utf8))
+    public func createWallet(name: String, password: String, coins: [CoinType], encryption: StoredKeyEncryption = .aes128Ctr) throws -> Wallet {
+        let key = StoredKey(name: name, password: Data(password.utf8), encryption: encryption)
         return try saveCreatedWallet(for: key, password: password, coins: coins)
     }
 
@@ -158,8 +158,8 @@ public final class KeyStore {
     ///   - password: password to use for the imported private key
     ///   - coin: coin to use for this wallet
     /// - Returns: new wallet
-    public func `import`(privateKey: PrivateKey, name: String, password: String, coin: CoinType) throws -> Wallet {
-        guard let newKey = StoredKey.importPrivateKey(privateKey: privateKey.data, name: name, password: Data(password.utf8), coin: coin) else {
+    public func `import`(privateKey: PrivateKey, name: String, password: String, coin: CoinType, encryption: StoredKeyEncryption = .aes128Ctr) throws -> Wallet {
+        guard let newKey = StoredKey.importPrivateKeyWithEncryption(privateKey: privateKey.data, name: name, password: Data(password.utf8), coin: coin, encryption: encryption) else {
             throw Error.invalidKey
         }
         let url = makeAccountURL()
@@ -179,8 +179,8 @@ public final class KeyStore {
     ///   - encryptPassword: password to use for encrypting
     ///   - coins: coins to add
     /// - Returns: new account
-    public func `import`(mnemonic: String, name: String, encryptPassword: String, coins: [CoinType]) throws -> Wallet {
-        guard let key = StoredKey.importHDWallet(mnemonic: mnemonic, name: name, password: Data(encryptPassword.utf8), coin: coins.first ?? .ethereum) else {
+    public func `import`(mnemonic: String, name: String, encryptPassword: String, coins: [CoinType], encryption: StoredKeyEncryption = .aes128Ctr) throws -> Wallet {
+        guard let key = StoredKey.importHDWalletWithEncryption(mnemonic: mnemonic, name: name, password: Data(encryptPassword.utf8), coin: coins.first ?? .ethereum, encryption: encryption) else {
             throw Error.invalidMnemonic
         }
         let url = makeAccountURL()
@@ -201,7 +201,7 @@ public final class KeyStore {
     ///   - password: account password
     ///   - newPassword: password to use for exported key
     /// - Returns: encrypted JSON key
-    public func export(wallet: Wallet, password: String, newPassword: String) throws -> Data {
+    public func export(wallet: Wallet, password: String, newPassword: String, encryption: StoredKeyEncryption = .aes128Ctr) throws -> Data {
         var privateKeyData = try exportPrivateKey(wallet: wallet, password: password)
         defer {
             privateKeyData.resetBytes(in: 0 ..< privateKeyData.count)
@@ -211,12 +211,12 @@ public final class KeyStore {
             throw Error.accountNotFound
         }
 
-        if let mnemonic = checkMnemonic(privateKeyData), let newKey = StoredKey.importHDWallet(mnemonic: mnemonic, name: "", password: Data(newPassword.utf8), coin: coin) {
+        if let mnemonic = checkMnemonic(privateKeyData), let newKey = StoredKey.importHDWalletWithEncryption(mnemonic: mnemonic, name: "", password: Data(newPassword.utf8), coin: coin, encryption: encryption) {
             guard let json = newKey.exportJSON() else {
                 throw Error.invalidKey
             }
             return json
-        } else if let newKey = StoredKey.importPrivateKey(privateKey: privateKeyData, name: "", password: Data(newPassword.utf8), coin: coin) {
+        } else if let newKey = StoredKey.importPrivateKeyWithEncryption(privateKey: privateKeyData, name: "", password: Data(newPassword.utf8), coin: coin, encryption: encryption) {
             guard let json = newKey.exportJSON() else {
                 throw Error.invalidKey
             }
@@ -269,11 +269,11 @@ public final class KeyStore {
     ///   - wallet: wallet to update
     ///   - password: current password
     ///   - newName: new name
-    public func update(wallet: Wallet, password: String, newName: String) throws {
-        try update(wallet: wallet, password: password, newPassword: password, newName: newName)
+    public func update(wallet: Wallet, password: String, newName: String, encryption: StoredKeyEncryption = .aes128Ctr) throws {
+        try update(wallet: wallet, password: password, newPassword: password, newName: newName, encryption: encryption)
     }
 
-    private func update(wallet: Wallet, password: String, newPassword: String, newName: String) throws {
+    private func update(wallet: Wallet, password: String, newPassword: String, newName: String, encryption: StoredKeyEncryption = .aes128Ctr) throws {
         guard let index = wallets.firstIndex(of: wallet) else {
             fatalError("Missing wallet")
         }
@@ -291,10 +291,10 @@ public final class KeyStore {
         }
 
         if let mnemonic = checkMnemonic(privateKeyData),
-            let key = StoredKey.importHDWallet(mnemonic: mnemonic, name: newName, password: Data(newPassword.utf8), coin: coins[0]) {
+            let key = StoredKey.importHDWalletWithEncryption(mnemonic: mnemonic, name: newName, password: Data(newPassword.utf8), coin: coins[0], encryption: encryption) {
             wallets[index].key = key
-        } else if let key = StoredKey.importPrivateKey(
-                privateKey: privateKeyData, name: newName, password: Data(newPassword.utf8), coin: coins[0]) {
+        } else if let key = StoredKey.importPrivateKeyWithEncryption(
+                privateKey: privateKeyData, name: newName, password: Data(newPassword.utf8), coin: coins[0], encryption: encryption) {
             wallets[index].key = key
         } else {
             throw Error.invalidKey
diff --git a/swift/Sources/TWCardano.swift b/swift/Sources/TWCardano.swift
index 1eb456be7ce..88670f92ab4 100644
--- a/swift/Sources/TWCardano.swift
+++ b/swift/Sources/TWCardano.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/TWData.swift b/swift/Sources/TWData.swift
index f5cef1d23a2..01116fc0460 100644
--- a/swift/Sources/TWData.swift
+++ b/swift/Sources/TWData.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Sources/TWString.swift b/swift/Sources/TWString.swift
index a9225577c9a..30fb0b7ae3c 100644
--- a/swift/Sources/TWString.swift
+++ b/swift/Sources/TWString.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import Foundation
 
diff --git a/swift/Tests/AESTests.swift b/swift/Tests/AESTests.swift
index 868300617de..2326b2bf3cf 100644
--- a/swift/Tests/AESTests.swift
+++ b/swift/Tests/AESTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Addresses/BinanceAddressTests.swift b/swift/Tests/Addresses/BinanceAddressTests.swift
new file mode 100644
index 00000000000..a950cf3c30e
--- /dev/null
+++ b/swift/Tests/Addresses/BinanceAddressTests.swift
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class BinanceAddressTests: XCTestCase {
+    func testIsValid() {
+        XCTAssertTrue(AnyAddress.isValid(string: "bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw", coin: .binance))
+
+        XCTAssertFalse(AnyAddress.isValid(string: "bad1devga6q804tx9fqrnx0vtu5r36kxgp9tqx8h9k", coin: .binance))
+        XCTAssertFalse(AnyAddress.isValid(string: "tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", coin: .binance))
+    }
+
+    func testIsValidBech32() {
+        XCTAssertTrue(AnyAddress.isValidBech32(string: "bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw", coin: .binance, hrp: "bnb"));
+        XCTAssertTrue(AnyAddress.isValidBech32(string: "tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", coin: .binance, hrp: "tbnb"));
+        
+        XCTAssertFalse(AnyAddress.isValidBech32(string: "bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw", coin: .binance, hrp: "tbnb"));
+        XCTAssertFalse(AnyAddress.isValidBech32(string: "tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", coin: .binance, hrp: "bnb"));
+    }
+}
diff --git a/swift/Tests/Addresses/BitcoinAddressTests.swift b/swift/Tests/Addresses/BitcoinAddressTests.swift
index 14341165f07..da079e80027 100644
--- a/swift/Tests/Addresses/BitcoinAddressTests.swift
+++ b/swift/Tests/Addresses/BitcoinAddressTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Addresses/JunoAddressTests.swift b/swift/Tests/Addresses/JunoAddressTests.swift
new file mode 100644
index 00000000000..eb6e0739ba7
--- /dev/null
+++ b/swift/Tests/Addresses/JunoAddressTests.swift
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class JunoAddressTests: XCTestCase {
+    func testAnyAddressValidation() {
+        let addr = AnyAddress(string: "juno1gckvjxau7k56f8wg8c8xj80khyp83y8x8eqc94", coin: .cosmos, hrp: "juno")!;
+        XCTAssertTrue(AnyAddress.isValidBech32(string: addr.description, coin: .cosmos, hrp: "juno"));
+        XCTAssertFalse(AnyAddress.isValidBech32(string: addr.description, coin: .bitcoin, hrp: "juno"));
+        XCTAssertFalse(AnyAddress.isValid(string: addr.description, coin: .bitcoin));
+        XCTAssertFalse(AnyAddress.isValid(string: addr.description, coin: .cosmos));
+    }
+    
+    func testAnyAddressFromPubkey() {
+        let data = Data(hexString: "02753f5c275e1847ba4d2fd3df36ad00af2e165650b35fe3991e9c9c46f68b12bc")!;
+        let pubkey = PublicKey(data: data, type: .secp256k1)!;
+        let anyAddr = AnyAddress(publicKey: pubkey, coin: .cosmos, hrp: "juno");
+        XCTAssertEqual(anyAddr.description, "juno1cj2vfjec3c3luf9fx9vddnglhh9gawmncn4k5n");
+    }
+}
diff --git a/swift/Tests/Addresses/NEOAddressTests.swift b/swift/Tests/Addresses/NEOAddressTests.swift
index 35c4b2ea57b..fffdc401277 100644
--- a/swift/Tests/Addresses/NEOAddressTests.swift
+++ b/swift/Tests/Addresses/NEOAddressTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Addresses/OntologyAddressTests.swift b/swift/Tests/Addresses/OntologyAddressTests.swift
index 616aa19e309..760465b3ecd 100644
--- a/swift/Tests/Addresses/OntologyAddressTests.swift
+++ b/swift/Tests/Addresses/OntologyAddressTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Addresses/TronAddressTests.swift b/swift/Tests/Addresses/TronAddressTests.swift
index c8d875a38d0..cc2b3a6773f 100644
--- a/swift/Tests/Addresses/TronAddressTests.swift
+++ b/swift/Tests/Addresses/TronAddressTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/AnyAddressTests.swift b/swift/Tests/AnyAddressTests.swift
new file mode 100644
index 00000000000..cc155d2c458
--- /dev/null
+++ b/swift/Tests/AnyAddressTests.swift
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class AnyAddressTests: XCTestCase {
+    let any_address_test_address = "bc1qcj2vfjec3c3luf9fx9vddnglhh9gawmncmgxhz"
+    let any_address_test_pubkey = "02753f5c275e1847ba4d2fd3df36ad00af2e165650b35fe3991e9c9c46f68b12bc"
+
+    func testCreateWithString() {
+        let coin = CoinType.bitcoin
+        let address = AnyAddress(string: any_address_test_address, coin: coin)!
+        XCTAssertEqual(address.coin, coin)
+        XCTAssertEqual(address.description, any_address_test_address)
+    }
+
+    func testCreateWithStringBech32() {
+        let coin = CoinType.bitcoin
+        let address1 = AnyAddress(string: any_address_test_address, coin: coin, hrp: "bc")!
+        XCTAssertEqual(address1.description, any_address_test_address)
+
+        let address2 = AnyAddress(string: "tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3", coin: coin, hrp: "tb")!
+        XCTAssertEqual(address2.description, "tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3")
+    }
+
+    func testCreateWithPublicKey() {
+        let coin = CoinType.bitcoin
+        let pubkey = PublicKey(data: Data(hexString: any_address_test_pubkey)!, type: .secp256k1)!
+        let address = AnyAddress(publicKey: pubkey, coin: coin)
+        XCTAssertEqual(address.description, any_address_test_address)
+    }
+
+    func testCreateWithPublicKeyDerivation() {
+        let coin = CoinType.bitcoin
+        let pubkey = PublicKey(data: Data(hexString: any_address_test_pubkey)!, type: .secp256k1)!
+        let address1 = AnyAddress(publicKey: pubkey, coin: coin, derivation: .bitcoinSegwit)
+        XCTAssertEqual(address1.description, any_address_test_address)
+
+        let address2 = AnyAddress(publicKey: pubkey, coin: coin, derivation: .bitcoinLegacy)
+        XCTAssertEqual(address2.description, "1JvRfEQFv5q5qy9uTSAezH7kVQf4hqnHXx")
+        
+        let address3 = AnyAddress(publicKey: pubkey, coin: coin, derivation: .bitcoinTaproot)
+        XCTAssertEqual(address3.description, "bc1pnncpg8s7gu7t6xmmzxqarcj8ydthmaz8gr4m76eephjfprs53maswgel0w")
+    }
+
+    func testCreateBech32WithPublicKey() {
+        let coin = CoinType.bitcoin
+        let pubkey = PublicKey(data: Data(hexString: any_address_test_pubkey)!, type: .secp256k1)!
+        let address1 = AnyAddress(publicKey: pubkey, coin: coin, hrp: "bc")
+        XCTAssertEqual(address1.description, any_address_test_address)
+
+        let address2 = AnyAddress(publicKey: pubkey, coin: coin, hrp: "tb")
+        XCTAssertEqual(address2.description, "tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3")
+    }
+
+    func testIsValid() {
+        let coin = CoinType.bitcoin
+        XCTAssertTrue(AnyAddress.isValid(string: any_address_test_address, coin: coin));
+        XCTAssertFalse(AnyAddress.isValid(string: any_address_test_address, coin: .ethereum));
+        XCTAssertFalse(AnyAddress.isValid(string: "__INVALID_ADDRESS__", coin: .ethereum));
+    }
+
+    func testIsValidBech32() {
+        let coin = CoinType.bitcoin
+        XCTAssertTrue(AnyAddress.isValidBech32(string: any_address_test_address, coin: coin, hrp: "bc"));
+        XCTAssertFalse(AnyAddress.isValidBech32(string: any_address_test_address, coin: coin, hrp: "tb"));
+    }
+}
diff --git a/swift/Tests/AsnParserTests.swift b/swift/Tests/AsnParserTests.swift
new file mode 100644
index 00000000000..38965bb8b5f
--- /dev/null
+++ b/swift/Tests/AsnParserTests.swift
@@ -0,0 +1,15 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class AsnParserTests: XCTestCase {
+    func testEcdsaSignatureFromDer()  {
+        let encoded = Data(hexString: "3046022100db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495da022100ff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1")!
+        let expected = Data(hexString: "db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495daff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1")!
+        let actual = AsnParser.ecdsaSignatureFromDer(encoded: encoded)
+        XCTAssertEqual(actual, expected);
+    }
+}
diff --git a/swift/Tests/BarzTests.swift b/swift/Tests/BarzTests.swift
new file mode 100644
index 00000000000..c5a40f64363
--- /dev/null
+++ b/swift/Tests/BarzTests.swift
@@ -0,0 +1,198 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class BarzTests: XCTestCase {
+
+    // https://testnet.bscscan.com/tx/0x6c6e1fe81c722c0abce1856b9b4e078ab2cad06d51f2d1b04945e5ba2286d1b4
+    func testInitCode() {
+        let factoryAddress = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800"
+        let publicKeyData = Data(hexString: "0x04e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b02")!
+        let publicKey = PublicKey(data: publicKeyData, type: .nist256p1Extended)!
+        let verificationFacet = "0x6BF22ff186CC97D88ECfbA47d1473a234CEBEFDf"
+        let result = Barz.getInitCode(factory: factoryAddress, publicKey: publicKey, verificationFacet: verificationFacet, salt: 0)
+        XCTAssertEqual(result.hexString, "3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000006bf22ff186cc97d88ecfba47d1473a234cebefdf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b0200000000000000000000000000000000000000000000000000000000000000")
+    }
+
+    func testInitCodeNoneZeroSalt() {
+        let factoryAddress = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800"
+        let publicKeyData = Data(hexString: "0x04e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b02")!
+        let publicKey = PublicKey(data: publicKeyData, type: .nist256p1Extended)!
+        let verificationFacet = "0x6BF22ff186CC97D88ECfbA47d1473a234CEBEFDf"
+        let result = Barz.getInitCode(factory: factoryAddress, publicKey: publicKey, verificationFacet: verificationFacet, salt: 1)
+        XCTAssertEqual(result.hexString, "3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000006bf22ff186cc97d88ecfba47d1473a234cebefdf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004104e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b0200000000000000000000000000000000000000000000000000000000000000")
+    }
+
+    func testCounterfactualAddress() {
+        let input = BarzContractAddressInput.with {
+            $0.factory = "0x2c97f4a366Dd5D91178ec9E36c5C1fcA393A538C"
+            $0.accountFacet = "0x3322C04EAe11B9b14c6c289f2668b6f07071b591"
+            $0.verificationFacet = "0x90A6fE0A938B0d4188e9013C99A0d7D9ca6bFB63"
+            $0.entryPoint = entryPoint
+            $0.facetRegistry = "0xFd1A8170c12747060324D9079a386BD4290e6f93"
+            $0.defaultFallback = "0x22eB0720d9Fc4bC90BB812B309e939880B71c20d"
+            $0.bytecode = bytecode
+            $0.publicKey = "0xB5547FBdC56DCE45e1B8ef75569916D438e09c46"
+            $0.salt = 0
+        }
+
+        XCTAssertEqual(Barz.getCounterfactualAddress(input: try! input.serializedData()), "0x77F62bb3E43190253D4E198199356CD2b25063cA");
+    }
+
+    func testCounterfactualAddressNonZeroSalt() {
+        let input = BarzContractAddressInput.with {
+            $0.factory = "0x96C489979E39F877BDb8637b75A25C1a5B2DE14C"
+            $0.accountFacet = "0xF6F5e5fC74905e65e3FF53c6BacEba8535dd14d1"
+            $0.verificationFacet = "0xaB84813cbf26Fd951CB3d7E33Dccb8995027e490"
+            $0.entryPoint = entryPoint
+            $0.facetRegistry = "0x9a95d201BB8F559771784D12c01F8084278c65E5"
+            $0.defaultFallback = "0x522cDc7558b5f798dF5D61AB09B6D95Ebd342EF9"
+            $0.bytecode = "0x60806040526040516104c83803806104c883398101604081905261002291610163565b6000858585858560405160240161003d959493929190610264565b60408051601f198184030181529181526020820180516001600160e01b0316634a93641760e01b1790525190915060009081906001600160a01b038a16906100869085906102c3565b600060405180830381855af49150503d80600081146100c1576040519150601f19603f3d011682016040523d82523d6000602084013e6100c6565b606091505b50915091508115806100e157506100dc816102df565b600114155b156100ff57604051636ff35f8960e01b815260040160405180910390fd5b505050505050505050610306565b80516001600160a01b038116811461012457600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b8381101561015a578181015183820152602001610142565b50506000910152565b60008060008060008060c0878903121561017c57600080fd5b6101858761010d565b95506101936020880161010d565b94506101a16040880161010d565b93506101af6060880161010d565b92506101bd6080880161010d565b60a08801519092506001600160401b03808211156101da57600080fd5b818901915089601f8301126101ee57600080fd5b81518181111561020057610200610129565b604051601f8201601f19908116603f0116810190838211818310171561022857610228610129565b816040528281528c602084870101111561024157600080fd5b61025283602083016020880161013f565b80955050505050509295509295509295565b600060018060a01b0380881683528087166020840152808616604084015280851660608401525060a0608083015282518060a08401526102ab8160c085016020870161013f565b601f01601f19169190910160c0019695505050505050565b600082516102d581846020870161013f565b9190910192915050565b80516020808301519190811015610300576000198160200360031b1b821691505b50919050565b6101b3806103156000396000f3fe60806040523661000b57005b600080356001600160e01b03191681527f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f6020819052604090912054819060601c806100cf576004838101546040516366ffd66360e11b81526000356001600160e01b031916928101929092526001600160a01b03169063cdffacc690602401602060405180830381865afa1580156100a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100cc919061014d565b90505b6001600160a01b0381166101295760405162461bcd60e51b815260206004820152601d60248201527f4261727a3a2046756e6374696f6e20646f6573206e6f74206578697374000000604482015260640160405180910390fd5b3660008037600080366000845af43d6000803e808015610148573d6000f35b3d6000fd5b60006020828403121561015f57600080fd5b81516001600160a01b038116811461017657600080fd5b939250505056fea2646970667358221220d35db061bb6ecdb7688c3674af669ce44d527cae4ded59214d06722d73da62be64736f6c63430008120033"
+            $0.publicKey = "0xB5547FBdC56DCE45e1B8ef75569916D438e09c46"
+            $0.salt = 123456
+        }
+
+        XCTAssertEqual(Barz.getCounterfactualAddress(input: try! input.serializedData()), "0xB91aaa96B138A1B1D94c9df4628187132c5F2bf1");
+    }
+
+    func testFormatSignature() {
+        let signature = Data(hexString: "0x3044022012d89e3b41e253dc9e90bd34dc1750d059b76d0b1d16af2059aa26e90b8960bf0220256d8a05572c654906ce422464693e280e243e6d9dbc5f96a681dba846bca276")!
+        let challenge = Data(hexString: "0xcf267a78c5adaf96f341a696eb576824284c572f3e61be619694d539db1925f9")!
+        let authenticatorData = Data(hexString: "0x1a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d00000000")!
+        let clientDataJSON = "{\"type\":\"webauthn.get\",\"challenge\":\"zyZ6eMWtr5bzQaaW61doJChMVy8-Yb5hlpTVOdsZJfk\",\"origin\":\"https://trustwallet.com\"}";
+        let result = Barz.getFormattedSignature(signature: signature, challenge: challenge, authenticatorData: authenticatorData, clientDataJSON: clientDataJSON);
+        XCTAssertEqual(result.hexString, "12d89e3b41e253dc9e90bd34dc1750d059b76d0b1d16af2059aa26e90b8960bf256d8a05572c654906ce422464693e280e243e6d9dbc5f96a681dba846bca27600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000251a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000247b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a22000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025222c226f726967696e223a2268747470733a2f2f747275737477616c6c65742e636f6d227d000000000000000000000000000000000000000000000000000000")
+    }
+
+    // https://testnet.bscscan.com/tx/0x43fc13dfdf06bbb09da8ce070953753764f1e43782d0c8b621946d8b45749419
+    func testSignK1TransferAccountDeployed() {
+        let input = EthereumSigningInput.with {
+            $0.chainID = Data(hexString: "61")!
+            $0.nonce = Data(hexString: "02")!
+            $0.txMode = .userOp
+            $0.gasLimit = Data(hexString: "0186A0")!
+            $0.maxFeePerGas = Data(hexString: "01a339c9e9")!
+            $0.maxInclusionFeePerGas = Data(hexString: "01a339c9e9")!
+            $0.toAddress = "0x61061fCAE11fD5461535e134EfF67A98CFFF44E9"
+            $0.privateKey = Data(hexString: "3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483")!
+
+            $0.userOperation = EthereumUserOperation.with {
+                $0.verificationGasLimit = Data(hexString: "0186a0")!
+                $0.preVerificationGas = Data(hexString: "b708")!
+                $0.entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+                $0.sender = "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f"
+            }
+
+            $0.transaction = EthereumTransaction.with {
+                $0.transfer = EthereumTransaction.Transfer.with {
+                    $0.amount = Data(hexString: "2386f26fc10000")!
+                }
+            }
+        }
+        let output: EthereumSigningOutput = AnySigner.sign(input: input, coin: .ethereum)
+        XCTAssertEqual(output.preHash.hexString, "2d37191a8688f69090451ed90a0a9ba69d652c2062ee9d023b3ebe964a3ed2ae")
+        XCTAssertEqual(String(data: output.encoded, encoding: .utf8), "{\"callData\":\"0xb61d27f600000000000000000000000061061fcae11fd5461535e134eff67a98cfff44e9000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"100000\",\"initCode\":\"0x\",\"maxFeePerGas\":\"7033440745\",\"maxPriorityFeePerGas\":\"7033440745\",\"nonce\":\"2\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"46856\",\"sender\":\"0xb16Db98B365B1f89191996942612B14F1Da4Bd5f\",\"signature\":\"0x80e84992ebf8d5f71180231163ed150a7557ed0aa4b4bcee23d463a09847e4642d0fbf112df2e5fa067adf4b2fa17fc4a8ac172134ba5b78e3ec9c044e7f28d71c\",\"verificationGasLimit\":\"100000\"}")
+    }
+
+    // https://testnet.bscscan.com/tx/0xea1f5cddc0653e116327cbcb3bc770360a642891176eff2ec69c227e46791c31
+    func testSignR1TransferAccountNotDeployed() {
+        let attestationObject = Data(hexString: "0xa363666d74646e6f6e656761747453746d74a068617574684461746158981a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e075d00000000000000000000000000000000000000000014c14f8a2dfd8f451581fad6e4e1c11821abcaacd6a5010203262001215820b173a6a812025c40c38bac46343646bd0a8137c807aae6e04aac238cc24d2ad2225820116ca14d23d357588ff2aabd7db29d5976f4ecc8037775db86f67e873a306b1f")!
+        let publicKey = WebAuthn.getPublicKey(attestationObject: attestationObject)!
+
+        let input = EthereumSigningInput.with {
+            $0.chainID = Data(hexString: "61")!
+            $0.nonce = Data(hexString: "00")!
+            $0.txMode = .userOp
+            $0.gasLimit = Data(hexString: "2625A0")!
+            $0.maxFeePerGas = Data(hexString: "01a339c9e9")!
+            $0.maxInclusionFeePerGas = Data(hexString: "01a339c9e9")!
+            $0.toAddress = "0x61061fCAE11fD5461535e134EfF67A98CFFF44E9"
+            $0.privateKey = Data(hexString: "3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483")!
+
+            $0.userOperation = EthereumUserOperation.with {
+                $0.verificationGasLimit = Data(hexString: "2DC6C0")!
+                $0.preVerificationGas = Data(hexString: "b708")!
+                $0.entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+                $0.sender = "0x1392Ae041BfBdBAA0cFF9234a0C8F64df97B7218"
+                $0.initCode = Barz.getInitCode(
+                    factory: factory,
+                    publicKey: publicKey,
+                    verificationFacet: "0x5034534Efe9902779eD6eA6983F435c00f3bc510",
+                    salt: 0
+                )
+            }
+
+            $0.transaction = EthereumTransaction.with {
+                $0.transfer = EthereumTransaction.Transfer.with {
+                    $0.amount = Data(hexString: "2386f26fc10000")!
+                }
+            }
+        }
+        let output: EthereumSigningOutput = AnySigner.sign(input: input, coin: .ethereum)
+        XCTAssertEqual(output.preHash.hexString, "548c13a0bb87981d04a3a24a78ad5e4ba8d0afbf3cfe9311250e07b54cd38937")
+        XCTAssertEqual(String(data: output.encoded, encoding: .utf8), "{\"callData\":\"0xb61d27f600000000000000000000000061061fcae11fd5461535e134eff67a98cfff44e9000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"2500000\",\"initCode\":\"0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000005034534efe9902779ed6ea6983f435c00f3bc51000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104b173a6a812025c40c38bac46343646bd0a8137c807aae6e04aac238cc24d2ad2116ca14d23d357588ff2aabd7db29d5976f4ecc8037775db86f67e873a306b1f00000000000000000000000000000000000000000000000000000000000000\",\"maxFeePerGas\":\"7033440745\",\"maxPriorityFeePerGas\":\"7033440745\",\"nonce\":\"0\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"46856\",\"sender\":\"0x1392Ae041BfBdBAA0cFF9234a0C8F64df97B7218\",\"signature\":\"0xbf1b68323974e71ad9bd6dfdac07dc062599d150615419bb7876740d2bcf3c8909aa7e627bb0e08a2eab930e2e7313247c9b683c884236dd6ea0b6834fb2cb0a1b\",\"verificationGasLimit\":\"3000000\"}");
+    }
+
+    // https://testnet.bscscan.com/tx/0x872f709815a9f79623a349f2f16d93b52c4d5136967bab53a586f045edbe9203
+    func testSignR1BatchedTransferAccountDeployed() {
+        let approveFunc = EthereumAbiFunction(name: "approve")
+        approveFunc.addParamAddress(val: Data(hexString: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789")!, isOutput: false)
+        approveFunc.addParamUInt256(val: Data(hexString: "8AC7230489E80000")!, isOutput: false)
+        let approveCall = EthereumAbi.encode(fn: approveFunc)
+
+        let transferFunc = EthereumAbiFunction(name: "transfer")
+        transferFunc.addParamAddress(val: Data(hexString: "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789")!, isOutput: false)
+        transferFunc.addParamUInt256(val: Data(hexString: "8AC7230489E80000")!, isOutput: false)
+        let transferCall = EthereumAbi.encode(fn: transferFunc)
+
+        let input = EthereumSigningInput.with {
+            $0.chainID = Data(hexString: "61")!
+            $0.nonce = Data(hexString: "03")!
+            $0.txMode = .userOp
+            $0.gasLimit = Data(hexString: "015A61")!
+            $0.maxFeePerGas = Data(hexString: "02540BE400")!
+            $0.maxInclusionFeePerGas = Data(hexString: "02540BE400")!
+            $0.privateKey = Data(hexString: "3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483")!
+
+            $0.userOperation = EthereumUserOperation.with {
+                $0.verificationGasLimit = Data(hexString: "07F7C4")!
+                $0.preVerificationGas = Data(hexString: "DAFC")!
+                $0.entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+                $0.sender = "0x1e6c542ebc7c960c6a155a9094db838cef842cf5"
+            }
+
+            $0.transaction = EthereumTransaction.with {
+                $0.batch = EthereumTransaction.Batch.with {
+                    $0.calls = [
+                        EthereumTransaction.Batch.BatchedCall.with {
+                            $0.address = "0x03bBb5660B8687C2aa453A0e42dCb6e0732b1266"
+                            $0.amount = Data(hexString: "00")!
+                            $0.payload = approveCall
+                        },
+                        EthereumTransaction.Batch.BatchedCall.with {
+                            $0.address = "0x03bBb5660B8687C2aa453A0e42dCb6e0732b1266"
+                            $0.amount = Data(hexString: "00")!
+                            $0.payload = transferCall
+                        }
+                    ]
+                }
+            }
+        }
+        let output: EthereumSigningOutput = AnySigner.sign(input: input, coin: .ethereum)
+        XCTAssertEqual(output.preHash.hexString, "84d0464f5a2b191e06295443970ecdcd2d18f565d0d52b5a79443192153770ab")
+        XCTAssertEqual(String(data: output.encoded, encoding: .utf8), "{\"callData\":\"0x47e1da2a000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000000200000000000000000000000003bbb5660b8687c2aa453a0e42dcb6e0732b126600000000000000000000000003bbb5660b8687c2aa453a0e42dcb6e0732b12660000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044a9059cbb0000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e8000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"88673\",\"initCode\":\"0x\",\"maxFeePerGas\":\"10000000000\",\"maxPriorityFeePerGas\":\"10000000000\",\"nonce\":\"3\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"56060\",\"sender\":\"0x1E6c542ebC7c960c6A155A9094DB838cEf842cf5\",\"signature\":\"0x0747b665fe9f3a52407f95a35ac3e76de37c9b89483ae440431244e89a77985f47df712c7364c1a299a5ef62d0b79a2cf4ed63d01772275dd61f72bd1ad5afce1c\",\"verificationGasLimit\":\"522180\"}")
+    }
+
+    let factory = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800"
+    let diamondCutFacet = "0x312382b3B302bDcC0711fe710314BE298426296f"
+    let accountFacet = "0x84E684272903737d807375197f9a581FEa094Bc3"
+    let tokenReceiverFacet = "0x77E64E56966430a5B7A4F4A20C9fe039afb6ec21"
+    let diamondLoupeFacet = "0x518834B7EE4461d703ED2de8bCdfC5eCf761bBCA"
+    let entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789"
+    let diamondInit = "0x02a3C76D089c50615139B904c4dbD62F20e74a1b"
+    let facetRegistry = "0x77A4259d76897bA1eC8D6c3EFc5c35e0D7572A8f"
+    let bytecode = "0x608060405260405162003cc638038062003cc68339818101604052810190620000299190620019ad565b60008673ffffffffffffffffffffffffffffffffffffffff16633253960f6040518163ffffffff1660e01b81526004016020604051808303816000875af115801562000079573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200009f919062001aec565b9050600060e01b817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603620000fe576040517f5a5b4d3900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000600267ffffffffffffffff8111156200011e576200011d6200196b565b5b6040519080825280602002602001820160405280156200015b57816020015b62000147620018ff565b8152602001906001900390816200013d5790505b5090506000600167ffffffffffffffff8111156200017e576200017d6200196b565b5b604051908082528060200260200182016040528015620001ad5781602001602082028036833780820191505090505b5090506000600167ffffffffffffffff811115620001d057620001cf6200196b565b5b604051908082528060200260200182016040528015620001ff5781602001602082028036833780820191505090505b509050631f931c1c60e01b8260008151811062000221576200022062001b21565b5b60200260200101907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152505060405180606001604052808d73ffffffffffffffffffffffffffffffffffffffff16815260200160006002811115620002ab57620002aa62001b37565b5b81526020018381525083600081518110620002cb57620002ca62001b21565b5b60200260200101819052508381600081518110620002ee57620002ed62001b21565b5b60200260200101907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152505060405180606001604052808b73ffffffffffffffffffffffffffffffffffffffff1681526020016000600281111562000378576200037762001b37565b5b8152602001828152508360018151811062000398576200039762001b21565b5b6020026020010181905250620003b9846200047e60201b620001671760201c565b6200046c838c8b8e8e8d8d8d8d604051602401620003de979695949392919062001b8c565b6040516020818303038152906040527f95a21aec000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050620004b060201b620001911760201c565b5050505050505050505050506200211f565b806200048f6200073460201b60201c565b60010160016101000a81548163ffffffff021916908360e01c021790555050565b60005b8351811015620006df576000848281518110620004d557620004d462001b21565b5b602002602001015160200151905060006002811115620004fa57620004f962001b37565b5b81600281111562000510576200050f62001b37565b5b0362000570576200056a85838151811062000530576200052f62001b21565b5b60200260200101516000015186848151811062000552576200055162001b21565b5b6020026020010151604001516200073960201b60201c565b620006c8565b6001600281111562000587576200058662001b37565b5b8160028111156200059d576200059c62001b37565b5b03620005fd57620005f7858381518110620005bd57620005bc62001b21565b5b602002602001015160000151868481518110620005df57620005de62001b21565b5b602002602001015160400151620009db60201b60201c565b620006c7565b60028081111562000613576200061262001b37565b5b81600281111562000629576200062862001b37565b5b0362000689576200068385838151811062000649576200064862001b21565b5b6020026020010151600001518684815181106200066b576200066a62001b21565b5b60200260200101516040015162000c8f60201b60201c565b620006c6565b6040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620006bd9062001be7565b60405180910390fd5b5b5b508080620006d69062001c61565b915050620004b3565b507f8faa70878671ccd212d20771b795c50af8fd3ff6cf27f4bde57e5d4de0aeb673838383604051620007159392919062001c82565b60405180910390a16200072f828262000e3760201b60201c565b505050565b600090565b600081511162000780576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007779062001d97565b60405180910390fd5b60006200079262000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160362000806576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007fd9062001dfb565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff16036200087c576200087b828562000f9860201b60201c565b5b60005b8351811015620009d4576000848281518110620008a157620008a062001b21565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161462000998576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200098f9062001e5f565b60405180910390fd5b620009ac8583868a6200107c60201b60201c565b8380620009b99062001ec3565b94505050508080620009cb9062001c61565b9150506200087f565b5050505050565b600081511162000a22576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000a199062001d97565b60405180910390fd5b600062000a3462000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160362000aa8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000a9f9062001dfb565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff160362000b1e5762000b1d828562000f9860201b60201c565b5b60005b835181101562000c8857600084828151811062000b435762000b4262001b21565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff160362000c39576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000c309062001eef565b60405180910390fd5b62000c4c8582846200122960201b60201c565b62000c608583868a6200107c60201b60201c565b838062000c6d9062001ec3565b9450505050808062000c7f9062001c61565b91505062000b21565b5050505050565b600081511162000cd6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000ccd9062001d97565b60405180910390fd5b600062000ce862000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161462000d5c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000d539062001f53565b60405180910390fd5b60005b825181101562000e3157600083828151811062000d815762000d8062001b21565b5b602002602001015190506000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905062000e198482846200122960201b60201c565b5050808062000e289062001c61565b91505062000d5f565b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16031562000f675762000e988260405180606001604052806028815260200162003c7a60289139620018aa60201b60201c565b6000808373ffffffffffffffffffffffffffffffffffffffff168360405162000ec2919062001fb7565b600060405180830381855af49150503d806000811462000eff576040519150601f19603f3d011682016040523d82523d6000602084013e62000f04565b606091505b50915091508162000f645760008151111562000f235780518082602001fd5b83836040517f192105d700000000000000000000000000000000000000000000000000000000815260040162000f5b92919062001fd7565b60405180910390fd5b50505b5050565b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f90508091505090565b62000fc38160405180606001604052806024815260200162003ca260249139620018aa60201b60201c565b81600201805490508260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018190555081600201819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b81846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508360010160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018390806001815401808255809150506001900390600052602060002090600891828204019190066004029091909190916101000a81548163ffffffff021916908360e01c021790555080846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036200129b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620012929062002003565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036200130c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620013039062002067565b60405180910390fd5b6000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160149054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff169050600060018560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000180549050620013e59190620020cb565b9050808214620015805760008560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000182815481106200144a576200144962001b21565b5b90600052602060002090600891828204019190066004029054906101000a900460e01b9050808660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018481548110620014c957620014c862001b21565b5b90600052602060002090600891828204019190066004026101000a81548163ffffffff021916908360e01c021790555082866000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550505b8460010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001805480620015d757620015d6620020ec565b5b60019003818190600052602060002090600891828204019190066004026101000a81549063ffffffff02191690559055846000016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000820160146101000a8154906bffffffffffffffffffffffff0219169055505060008103620018a357600060018660020180549050620016c49190620020cb565b905060008660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015490508181146200180c57600087600201838154811062001732576200173162001b21565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508088600201838154811062001779576200177862001b21565b5b9060005260206000200160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550818860010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060010181905550505b86600201805480620018235762001822620020ec565b5b6001900381819060005260206000200160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905590558660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001016000905550505b5050505050565b6000823b9050600081118290620018f9576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620018f0919062002102565b60405180910390fd5b50505050565b6040518060600160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600060028111156200193e576200193d62001b37565b5b8152602001606081525090565b60008151905060018060a01b03811681146200196657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620019a157808201518184015260208101905062001984565b50600083830152505050565b600080600080600080600080610100898b031215620019cb57600080fd5b620019d6896200194b565b9750620019e660208a016200194b565b9650620019f660408a016200194b565b955062001a0660608a016200194b565b945062001a1660808a016200194b565b935062001a2660a08a016200194b565b925062001a3660c08a016200194b565b915060e089015160018060401b038082111562001a5257600080fd5b818b0191508b601f83011262001a6757600080fd5b81518181111562001a7d5762001a7c6200196b565b5b601f1960405181603f83601f860116011681019150808210848311171562001aaa5762001aa96200196b565b5b816040528281528e602084870101111562001ac457600080fd5b62001ad783602083016020880162001981565b80955050505050509295985092959890939650565b60006020828403121562001aff57600080fd5b815163ffffffff60e01b8116811462001b1757600080fd5b8091505092915050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052602160045260246000fd5b60018060a01b03811682525050565b6000815180845262001b7681602086016020860162001981565b6020601f19601f83011685010191505092915050565b600060018060a01b03808a168352808916602084015280881660408401528087166060840152808616608084015280851660a08401525060e060c083015262001bd960e083018462001b5c565b905098975050505050505050565b60208152602760208201527f4c69624469616d6f6e644375743a20496e636f7272656374204661636574437560408201527f74416374696f6e0000000000000000000000000000000000000000000000000060608201526000608082019050919050565b634e487b7160e01b600052601160045260246000fd5b60008019820362001c775762001c7662001c4b565b5b600182019050919050565b60006060808301818452808751808352608092508286019150828160051b8701016020808b0160005b8481101562001d6357607f198a8503018652815188850160018060a01b038251168652848201516003811062001cf157634e487b7160e01b600052602160045260246000fd5b80868801525060408083015192508a81880152508082518083528a880191508684019350600092505b8083101562001d465763ffffffff60e01b84511682528682019150868401935060018301925062001d1a565b508096505050508282019150828601955060018101905062001cab565b505062001d738189018b62001b4d565b50868103604088015262001d88818962001b5c565b95505050505050949350505050565b60208152602b60208201527f4c69624469616d6f6e644375743a204e6f2073656c6563746f727320696e206660408201527f6163657420746f2063757400000000000000000000000000000000000000000060608201526000608082019050919050565b60208152602c60208201527f4c69624469616d6f6e644375743a204164642066616365742063616e2774206260408201527f652061646472657373283029000000000000000000000000000000000000000060608201526000608082019050919050565b60208152603560208201527f4c69624469616d6f6e644375743a2043616e2774206164642066756e6374696f60408201527f6e207468617420616c726561647920657869737473000000000000000000000060608201526000608082019050919050565b600060018060601b0380831681810362001ee25762001ee162001c4b565b5b6001810192505050919050565b60208152603860208201527f4c69624469616d6f6e644375743a2043616e2774207265706c6163652066756e60408201527f6374696f6e20776974682073616d652066756e6374696f6e000000000000000060608201526000608082019050919050565b60208152603660208201527f4c69624469616d6f6e644375743a2052656d6f7665206661636574206164647260408201527f657373206d75737420626520616464726573732830290000000000000000000060608201526000608082019050919050565b6000825162001fcb81846020870162001981565b80830191505092915050565b60018060a01b038316815260406020820152600062001ffa604083018462001b5c565b90509392505050565b60208152603760208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f76652066756e6360408201527f74696f6e207468617420646f65736e277420657869737400000000000000000060608201526000608082019050919050565b60208152602e60208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f766520696d6d7560408201527f7461626c652066756e6374696f6e00000000000000000000000000000000000060608201526000608082019050919050565b6000828203905081811115620020e657620020e562001c4b565b5b92915050565b634e487b7160e01b600052603160045260246000fd5b60208152600062002117602083018462001b5c565b905092915050565b611b4b806200212f6000396000f3fe60806040523661000b57005b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f9050809150600082600001600080357fffffffff00000000000000000000000000000000000000000000000000000000167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610141576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610138906114d3565b60405180910390fd5b3660008037600080366000845af43d6000803e8060008114610162573d6000f35b3d6000fd5b806101706103c0565b60010160016101000a81548163ffffffff021916908360e01c021790555050565b60005b83518110156103755760008482815181106101b2576101b1611510565b5b6020026020010151602001519050600060028111156101d4576101d3611526565b5b8160028111156101e7576101e6611526565b5b036102375761023285838151811061020257610201611510565b5b60200260200101516000015186848151811061022157610220611510565b5b6020026020010151604001516103c5565b610361565b6001600281111561024b5761024a611526565b5b81600281111561025e5761025d611526565b5b036102ae576102a985838151811061027957610278611510565b5b60200260200101516000015186848151811061029857610297611510565b5b60200260200101516040015161063c565b610360565b6002808111156102c1576102c0611526565b5b8160028111156102d4576102d3611526565b5b036103245761031f8583815181106102ef576102ee611510565b5b60200260200101516000015186848151811061030e5761030d611510565b5b6020026020010151604001516108bd565b61035f565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103569061153c565b60405180910390fd5b5b5b50808061036d906115b6565b915050610194565b507f8faa70878671ccd212d20771b795c50af8fd3ff6cf27f4bde57e5d4de0aeb6738383836040516103a99392919061163b565b60405180910390a16103bb8282610a48565b505050565b600090565b6000815111610409576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161040090611747565b60405180910390fd5b6000610413610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610484576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161047b906117ab565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff16036104f1576104f08285610b97565b5b60005b835181101561063557600084828151811061051257610511611510565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614610606576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105fd9061180f565b60405180910390fd5b6106128583868a610c72565b838061061d90611873565b9450505050808061062d906115b6565b9150506104f4565b5050505050565b6000815111610680576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161067790611747565b60405180910390fd5b600061068a610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036106fb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106f2906117ab565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff1603610768576107678285610b97565b5b60005b83518110156108b657600084828151811061078957610788611510565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff160361087c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610873906118a2565b60405180910390fd5b610887858284610e1f565b6108938583868a610c72565b838061089e90611873565b945050505080806108ae906115b6565b91505061076b565b5050505050565b6000815111610901576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108f890611747565b60405180910390fd5b600061090b610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161461097c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161097390611906565b60405180910390fd5b60005b8251811015610a4257600083828151811061099d5761099c611510565b5b602002602001015190506000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050610a2d848284610e1f565b50508080610a3a906115b6565b91505061097f565b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160315610b6657610a9f82604051806060016040528060288152602001611aca60289139611481565b6000808373ffffffffffffffffffffffffffffffffffffffff1683604051610ac7919061196a565b600060405180830381855af49150503d8060008114610b02576040519150601f19603f3d011682016040523d82523d6000602084013e610b07565b606091505b509150915081610b6357600081511115610b245780518082602001fd5b83836040517f192105d7000000000000000000000000000000000000000000000000000000008152600401610b5a929190611988565b60405180910390fd5b50505b5050565b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f90508091505090565b610bb981604051806060016040528060248152602001611af260249139611481565b81600201805490508260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018190555081600201819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b81846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508360010160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018390806001815401808255809150506001900390600052602060002090600891828204019190066004029091909190916101000a81548163ffffffff021916908360e01c021790555080846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610e8e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e85906119b2565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610efc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610ef390611a16565b60405180910390fd5b6000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160149054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff169050600060018560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000180549050610fd39190611a7a565b90508082146111675760008560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001828154811061103457611033611510565b5b90600052602060002090600891828204019190066004029054906101000a900460e01b9050808660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000184815481106110b0576110af611510565b5b90600052602060002090600891828204019190066004026101000a81548163ffffffff021916908360e01c021790555082866000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550505b8460010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054806111bb576111ba611a98565b5b60019003818190600052602060002090600891828204019190066004026101000a81549063ffffffff02191690559055846000016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000820160146101000a8154906bffffffffffffffffffffffff021916905550506000810361147a576000600186600201805490506112a59190611a7a565b905060008660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015490508181146113e657600087600201838154811061130f5761130e611510565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508088600201838154811061135357611352611510565b5b9060005260206000200160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550818860010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060010181905550505b866002018054806113fa576113f9611a98565b5b6001900381819060005260206000200160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905590558660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001016000905550505b5050505050565b6000823b90506000811182906114cd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114c49190611aae565b60405180910390fd5b50505050565b602081526020808201527f4469616d6f6e643a2046756e6374696f6e20646f6573206e6f7420657869737460408201526000606082019050919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052602160045260246000fd5b60208152602760208201527f4c69624469616d6f6e644375743a20496e636f7272656374204661636574437560408201527f74416374696f6e0000000000000000000000000000000000000000000000000060608201526000608082019050919050565b634e487b7160e01b600052601160045260246000fd5b6000801982036115c9576115c86115a0565b5b600182019050919050565b60018060a01b03811682525050565b60005b838110156116015780820151818401526020810190506115e6565b50600083830152505050565b600081518084526116258160208601602086016115e3565b6020601f19601f83011685010191505092915050565b60006060808301818452808751808352608092508286019150828160051b8701016020808b0160005b8481101561171757607f198a8503018652815188850160018060a01b03825116865284820151600381106116a857634e487b7160e01b600052602160045260246000fd5b80868801525060408083015192508a81880152508082518083528a880191508684019350600092505b808310156116fb5763ffffffff60e01b8451168252868201915086840193506001830192506116d1565b5080965050505082820191508286019550600181019050611664565b50506117258189018b6115d4565b508681036040880152611738818961160d565b95505050505050949350505050565b60208152602b60208201527f4c69624469616d6f6e644375743a204e6f2073656c6563746f727320696e206660408201527f6163657420746f2063757400000000000000000000000000000000000000000060608201526000608082019050919050565b60208152602c60208201527f4c69624469616d6f6e644375743a204164642066616365742063616e2774206260408201527f652061646472657373283029000000000000000000000000000000000000000060608201526000608082019050919050565b60208152603560208201527f4c69624469616d6f6e644375743a2043616e2774206164642066756e6374696f60408201527f6e207468617420616c726561647920657869737473000000000000000000000060608201526000608082019050919050565b60006bffffffffffffffffffffffff808316818103611895576118946115a0565b5b6001810192505050919050565b60208152603860208201527f4c69624469616d6f6e644375743a2043616e2774207265706c6163652066756e60408201527f6374696f6e20776974682073616d652066756e6374696f6e000000000000000060608201526000608082019050919050565b60208152603660208201527f4c69624469616d6f6e644375743a2052656d6f7665206661636574206164647260408201527f657373206d75737420626520616464726573732830290000000000000000000060608201526000608082019050919050565b6000825161197c8184602087016115e3565b80830191505092915050565b60018060a01b03831681526040602082015260006119a9604083018461160d565b90509392505050565b60208152603760208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f76652066756e6360408201527f74696f6e207468617420646f65736e277420657869737400000000000000000060608201526000608082019050919050565b60208152602e60208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f766520696d6d7560408201527f7461626c652066756e6374696f6e00000000000000000000000000000000000060608201526000608082019050919050565b6000828203905081811115611a9257611a916115a0565b5b92915050565b634e487b7160e01b600052603160045260246000fd5b602081526000611ac1602083018461160d565b90509291505056fe4c69624469616d6f6e644375743a205f696e6974206164647265737320686173206e6f20636f64654c69624469616d6f6e644375743a204e657720666163657420686173206e6f20636f6465a264697066735822122045b771fb2128a1a34c5b052e9a86464933844b34929cf0d65bbea6a4e76e3b2764736f6c634300081200334c69624469616d6f6e644375743a205f696e6974206164647265737320686173206e6f20636f64654c69624469616d6f6e644375743a204e657720666163657420686173206e6f20636f6465"
+}
diff --git a/swift/Tests/Base32Tests.swift b/swift/Tests/Base32Tests.swift
index 41be00de149..d02a6ebc1d9 100644
--- a/swift/Tests/Base32Tests.swift
+++ b/swift/Tests/Base32Tests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Base64Tests.swift b/swift/Tests/Base64Tests.swift
index b4fdc17c1cf..dd310795b78 100644
--- a/swift/Tests/Base64Tests.swift
+++ b/swift/Tests/Base64Tests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Bech32Tests.swift b/swift/Tests/Bech32Tests.swift
new file mode 100644
index 00000000000..f09bd9507fa
--- /dev/null
+++ b/swift/Tests/Bech32Tests.swift
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class Bech32Tests: XCTestCase {
+    func testEncode()  {
+        let data = Data(hexString: "00443214c74254b635cf84653a56d7c675be77df")!
+        let encoded = Bech32.encode(hrp: "abcdef", data: data)
+        XCTAssertEqual(encoded, "abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw")
+    }
+
+    func testDecode()  {
+        let decoded = Bech32.decode(string: "abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw")!
+        XCTAssertEqual(decoded.hexString, "00443214c74254b635cf84653a56d7c675be77df")
+    }
+
+    func testDecodeWrongChecksumVariant()  {
+        // This is a Bech32m variant, not Bech32 variant. So it should fail using Bech32 decoder.
+        let decoded = Bech32.decode(string: "abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx")
+        XCTAssertNil(decoded)
+    }
+
+    func testEncodeM()  {
+        let data = Data(hexString: "ffbbcdeb38bdab49ca307b9ac5a928398a418820")!
+        let encoded = Bech32.encodeM(hrp: "abcdef", data: data)
+        XCTAssertEqual(encoded, "abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx")
+    }
+
+    func testDecodeM()  {
+        let decoded = Bech32.decodeM(string: "abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx")!
+        XCTAssertEqual(decoded.hexString, "ffbbcdeb38bdab49ca307b9ac5a928398a418820")
+    }
+
+    func testDecodeMWrongChecksumVariant()  {
+        // This is a Bech32 variant, not Bech32m variant. So it should fail using Bech32M decoder.
+        let decoded = Bech32.decodeM(string: "abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw")
+        XCTAssertNil(decoded)
+    }
+}
diff --git a/swift/Tests/Blockchains/AcalaEVMTests.swift b/swift/Tests/Blockchains/AcalaEVMTests.swift
new file mode 100644
index 00000000000..dd4577c23a1
--- /dev/null
+++ b/swift/Tests/Blockchains/AcalaEVMTests.swift
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class AcalaEVMTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: false)
+        let address = AnyAddress(publicKey: pubkey, coin: .acalaEVM)
+        let expected = AnyAddress(string: "0xe32DC46bfBF78D1eada7b0a68C96903e01418D64", coin: .acalaEVM)!
+
+        XCTAssertEqual(address.description, expected.description)
+    }
+}
diff --git a/swift/Tests/Blockchains/AcalaTests.swift b/swift/Tests/Blockchains/AcalaTests.swift
new file mode 100644
index 00000000000..4ef108e7f2c
--- /dev/null
+++ b/swift/Tests/Blockchains/AcalaTests.swift
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class AcalaTests: XCTestCase {
+
+    let genesisHash = Data(hexString: "0xfc41b9bd8ef8fe53d58c7ea67c794c7ec9a73daf05e6d54b14ff6342c99ba64c")!
+
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "0x9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0")!)!
+        let pubkey = key.getPublicKeyEd25519()
+        let address = AnyAddress(publicKey: pubkey, coin: .acala)
+        let addressFromString = AnyAddress(string: "269ZCS3WLGydTN8ynhyhZfzJrXkePUcdhwgLQs6TWFs5wVL5", coin: .acala)!
+
+        XCTAssertEqual(address.description, addressFromString.description)
+        XCTAssertEqual(address.data, pubkey.data)
+    }
+
+    func testSigning() {
+        // real key in 1p test
+        let key = PrivateKey(data: Data(hexString: "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0")!)!
+
+        let input = PolkadotSigningInput.with {
+            $0.genesisHash = genesisHash
+            $0.blockHash = Data(hexString: "0x707ffa05b7dc6cdb6356bd8bd51ff20b2757c3214a76277516080a10f1bc7537")!
+            $0.era = PolkadotEra.with {
+                $0.blockNumber = 3893613
+                $0.period = 64
+            }
+            $0.nonce = 0
+            $0.specVersion = 2170
+            $0.network = CoinType.acala.ss58Prefix
+            $0.transactionVersion = 2
+            $0.privateKey = key.data
+            $0.balanceCall.transfer = PolkadotBalance.Transfer.with {
+                $0.value = Data(hexString: "0xe8d4a51000")! // 1 ACA
+                $0.toAddress = "25Qqz3ARAvnZbahGZUzV3xpP1bB3eRrupEprK7f2FNbHbvsz"
+                $0.callIndices = PolkadotCallIndices.with {
+                    $0.custom = PolkadotCustomCallIndices.with {
+                        $0.moduleIndex = 0x0a
+                        $0.methodIndex = 0x00
+                    }
+                }
+            }
+            $0.multiAddress = true
+        }
+        let output: PolkadotSigningOutput = AnySigner.sign(input: input, coin: .polkadot)
+
+        // https://acala.subscan.io/extrinsic/3893620-3
+        XCTAssertEqual("0x" + output.encoded.hexString, "0x41028400e9590e4d99264a14a85e21e69537e4a64f66a875d38cb8f76b305f41fabe24a900dd54466dffd1e3c80b76013e9459fbdcd17805bd5fdbca0961a643bad1cbd2b7fe005c62c51c18b67f31eb9e61b187a911952fee172ef18402d07c703eec3100d50200000a0000c8c602ded977c56076ae38d98026fa669ca10d6a2b5a0bfc4086ae7668ed1c60070010a5d4e8")
+    }
+}
diff --git a/swift/Tests/Blockchains/AeternityTests.swift b/swift/Tests/Blockchains/AeternityTests.swift
index e92183f72ce..b5a7a619f0d 100644
--- a/swift/Tests/Blockchains/AeternityTests.swift
+++ b/swift/Tests/Blockchains/AeternityTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/AgoricTests.swift b/swift/Tests/Blockchains/AgoricTests.swift
new file mode 100644
index 00000000000..a35e0ed4948
--- /dev/null
+++ b/swift/Tests/Blockchains/AgoricTests.swift
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class AgoricTests: XCTestCase {
+
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "037048190544fa57651452f477c096de4f3073e7835cf3845b04602563a73f73")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: true)
+        let address = AnyAddress(publicKey: pubkey, coin: .agoric)
+        let addressFromString = AnyAddress(string: "agoric18zvvgk6j3eq5wd7mqxccgt20gz2w94cy88aek5", coin: .agoric)!
+
+        XCTAssertEqual(pubkey.data.hexString, "03df9a5e4089f89d45913fb2b856de984c7e8bf1344cc6444cc9705899a48c939d")
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSign() {
+        let privateKey = PrivateKey(data: Data(hexString: "037048190544fa57651452f477c096de4f3073e7835cf3845b04602563a73f73")!)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
+        let fromAddress = AnyAddress(publicKey: publicKey, coin: .agoric)
+
+        let sendCoinsMessage = CosmosMessage.Send.with {
+            $0.fromAddress = fromAddress.description
+            $0.toAddress = "agoric1cqvwa8jr6pmt45jndanc8lqmdsxjkhw0yertc0"
+            $0.amounts = [CosmosAmount.with {
+                $0.amount = "1"
+                $0.denom = "ubld"
+            }]
+        }
+
+
+        let fee = CosmosFee.with {
+            $0.gas = 100000
+            $0.amounts = [CosmosAmount.with {
+                $0.amount = "2000"
+                $0.denom = "ubld"
+            }]
+        }
+
+        let input = CosmosSigningInput.with {
+            $0.signingMode = .protobuf;
+            $0.accountNumber = 62972
+            $0.chainID = "agoric-3"
+            $0.sequence = 1
+            $0.messages = [
+                CosmosMessage.with {
+                    $0.sendCoinsMessage = sendCoinsMessage
+                }
+            ]
+            $0.fee = fee
+            $0.privateKey = privateKey.data
+        }
+
+        let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .agoric)
+
+        XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWFnb3JpYzE4enZ2Z2s2ajNlcTV3ZDdtcXhjY2d0MjBnejJ3OTRjeTg4YWVrNRItYWdvcmljMWNxdndhOGpyNnBtdDQ1am5kYW5jOGxxbWRzeGpraHcweWVydGMwGgkKBHVibGQSATESZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA9+aXkCJ+J1FkT+yuFbemEx+i/E0TMZETMlwWJmkjJOdEgQKAggBGAESEgoMCgR1YmxkEgQyMDAwEKCNBhpAenbGO4UBK610dwSY6l5pl58qwHW1OujQ/9vF9unQdrA1SE0b/2mZxnevy5y3u6pJfBffWUfCx68PcVEu7D3EYQ==\"}")
+    }
+}
diff --git a/swift/Tests/Blockchains/AionTests.swift b/swift/Tests/Blockchains/AionTests.swift
index c65188e041a..89c731de13f 100644
--- a/swift/Tests/Blockchains/AionTests.swift
+++ b/swift/Tests/Blockchains/AionTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/AlgorandTests.swift b/swift/Tests/Blockchains/AlgorandTests.swift
index 0df5b148700..7c03fbb1a07 100644
--- a/swift/Tests/Blockchains/AlgorandTests.swift
+++ b/swift/Tests/Blockchains/AlgorandTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -18,6 +16,29 @@ class AlgorandTests: XCTestCase {
         XCTAssertEqual(pubkey.data.hexString, "00d1857babdde3d70dad15110a9093e77abef991524f10dfa6a727946bfdd411")
         XCTAssertEqual(address.description, addressFromString.description)
     }
+    
+    func testSignNFTTransfer() {
+        // Successfully broadcasted: https://algoexplorer.io/tx/FFLUH4QKZHG744RIQ2AZNWZUSIIH262KZ4MEWSY4RXMWN5NMOOJA
+        let round: UInt64 = 27963950
+        let transaction = AlgorandAssetTransfer.with {
+            $0.toAddress = "362T7CSXNLIOBX6J3H2SCPS4LPYFNV6DDWE6G64ZEUJ6SY5OJIR6SB5CVE"
+            $0.amount = 1
+            $0.assetID = 989643841
+        }
+        let input = AlgorandSigningInput.with {
+            $0.genesisID = "mainnet-v1.0"
+            $0.genesisHash = Data(base64Encoded: "wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=")!
+            $0.note = "TWT TO THE MOON".data(using: .utf8)!
+            $0.privateKey = Data(hexString: "dc6051ffc7b3ec601bde432f6dea34d40fe3855e4181afa0f0524c42194a6da7")!
+            $0.firstRound = round
+            $0.lastRound = round + 1000
+            $0.fee = 1000
+            $0.assetTransfer = transaction
+        }
+        let output: AlgorandSigningOutput = AnySigner.sign(input: input, coin: .algorand)
+
+        XCTAssertEqual(output.signature, "nXQsDH1ilG3DIo2VQm5tdYKXe9o599ygdqikmROpZiNXAvQeK3avJqgjM5o+iByCdq6uOxlbveDyVmL9nZxxBg==")
+    }
 
     func testSign() {
         let round: UInt64 = 1937767
diff --git a/swift/Tests/Blockchains/AptosTests.swift b/swift/Tests/Blockchains/AptosTests.swift
new file mode 100644
index 00000000000..335b02aad87
--- /dev/null
+++ b/swift/Tests/Blockchains/AptosTests.swift
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class AptosTests: XCTestCase {
+    func testAddress() {
+        let anyAddress = AnyAddress(string: "0x6af7d07b8a541913dfa87a9f99628faa255c70241ef9ebd9b82a7e715ee13108", coin: .aptos)
+
+        XCTAssertEqual(anyAddress?.description, "0x6af7d07b8a541913dfa87a9f99628faa255c70241ef9ebd9b82a7e715ee13108")
+        XCTAssertEqual(anyAddress?.coin, .aptos)
+
+        let invalid = "MQqpqMQgCBuiPkoXfgZZsJvuzCeI1zc00z6vHJj4"
+        XCTAssertNil(Data(hexString: invalid))
+        XCTAssertNil(AnyAddress(string: invalid, coin: .aptos))
+        XCTAssertFalse(AnyAddress.isValid(string: invalid, coin: .aptos))
+    }
+    
+    func testBlindSign() {
+        // Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x7efd69e7f9462774b932ce500ab51c0d0dcc004cf272e09f8ffd5804c2a84e33?network=mainnet
+        let payloadJson = """
+                             {
+                                "function": "0x16fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c::AnimeSwapPoolV1::swap_exact_coins_for_coins_3_pair_entry",
+                                "type_arguments": [
+                                             "0x1::aptos_coin::AptosCoin",
+                                             "0x881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f4::coin::MOJO",
+                                             "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDT",
+                                             "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
+                                         ],
+                                "arguments": ["1000000", "49329"],
+                                 "type": "entry_function_payload"
+                             }
+                             """
+        // Successfully broadcasted https://explorer.aptoslabs.com/txn/0xb4d62afd3862116e060dd6ad9848ccb50c2bc177799819f1d29c059ae2042467?network=devnet
+        let privateKeyData = Data(hexString: "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec")!
+        let input = AptosSigningInput.with {
+            $0.chainID = 1
+            $0.anyEncoded = payloadJson
+            $0.expirationTimestampSecs = 3664390082
+            $0.gasUnitPrice = 100
+            $0.maxGasAmount = 100011
+            $0.sequenceNumber = 42
+            $0.sender = "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30"
+            $0.privateKey = privateKeyData
+        }
+        let output: AptosSigningOutput = AnySigner.sign(input: input, coin: .aptos)
+        let expectedRawTx = "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada0000000001"
+        let expectedSignature = "42cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b"
+        let expectedSignedTx = "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada00000000010020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c4042cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b"
+        XCTAssertEqual(output.rawTxn.hexString, expectedRawTx)
+        XCTAssertEqual(output.authenticator.signature.hexString, expectedSignature)
+        XCTAssertEqual(output.encoded.hexString, expectedSignedTx)
+    }
+
+    func testSign() {
+        // Successfully broadcasted https://explorer.aptoslabs.com/txn/0xb4d62afd3862116e060dd6ad9848ccb50c2bc177799819f1d29c059ae2042467?network=devnet
+        let privateKeyData = Data(hexString: "5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec")!
+        let transferMsg = AptosTransferMessage.with {
+            $0.to = "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30"
+            $0.amount = 1000
+        }
+        let input = AptosSigningInput.with {
+            $0.chainID = 33
+            $0.sender = "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30"
+            $0.expirationTimestampSecs = 3664390082
+            $0.gasUnitPrice = 100
+            $0.maxGasAmount = 3296766
+            $0.sequenceNumber = 99
+            $0.transfer = transferMsg
+            $0.privateKey = privateKeyData
+        }
+        let output: AptosSigningOutput = AnySigner.sign(input: input, coin: .aptos)
+        let expectedRawTx = "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021"
+        let expectedSignature = "5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01"
+        let expectedSignedTx = "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01"
+        XCTAssertEqual(output.rawTxn.hexString, expectedRawTx)
+        XCTAssertEqual(output.authenticator.signature.hexString, expectedSignature)
+        XCTAssertEqual(output.encoded.hexString, expectedSignedTx)
+    }
+}
diff --git a/swift/Tests/Blockchains/AvalancheTests.swift b/swift/Tests/Blockchains/AvalancheTests.swift
index 6e7b1a81c1d..cc0da61aaae 100644
--- a/swift/Tests/Blockchains/AvalancheTests.swift
+++ b/swift/Tests/Blockchains/AvalancheTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/BandChainTests.swift b/swift/Tests/Blockchains/BandChainTests.swift
index 03200907d37..60fb141add8 100644
--- a/swift/Tests/Blockchains/BandChainTests.swift
+++ b/swift/Tests/Blockchains/BandChainTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/BinanceChainTests.swift b/swift/Tests/Blockchains/BinanceChainTests.swift
index a1e0a021715..8f16331ee46 100644
--- a/swift/Tests/Blockchains/BinanceChainTests.swift
+++ b/swift/Tests/Blockchains/BinanceChainTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -27,6 +25,16 @@ class BinanceChainTests: XCTestCase {
         XCTAssertEqual("bnb1devga6q804tx9fqrnx0vtu5r36kxgp9tmk4xkm", address.description)
     }
 
+    func testBinanceTestnet() {
+        let wallet = HDWallet(mnemonic: "rabbit tilt arm protect banner ill produce vendor april bike much identify pond upset front easily glass gallery address hair priority focus forest angle", passphrase: "")!
+        let privateKey = wallet.getKeyForCoin(coin: .binance)
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
+        let address = AnyAddress(publicKey: publicKey, coin: .binance, hrp: "tbnb")
+
+        XCTAssertEqual(privateKey.data.hexString, "727f677b390c151caf9c206fd77f77918f56904b5504243db9b21e51182c4c06")
+        XCTAssertEqual("tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", address.description)
+    }
+
     func testSignSendOrder() {
         let privateKey = PrivateKey(data: Data(hexString: "95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832")!)!
         let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
@@ -228,4 +236,35 @@ class BinanceChainTests: XCTestCase {
         }
         queue.waitUntilAllOperationsAreFinished()
     }
+    
+    func testSignFromWalletConnectRequest() throws {
+        // Step 1: Parse a signing request received through WalletConnect.
+        
+        let requestPayload = """
+        {"signerAddress":"bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2","signDoc":{"account_number":"19","chain_id":"chain-bnb","memo":"","data":null,"msgs":[{"inputs":[{"address":"bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2","coins":[{"amount":1001000000,"denom":"BNB"}]}],"outputs":[{"address":"bnb13zeh6hs97d5eu2s5qerguhv8ewwue6u4ywa6yf","coins":[{"amount":1001000000,"denom":"BNB"}]}]}],"sequence":"23","source":"1"}}
+        """
+        let parsingInput = WalletConnectParseRequestInput.with {
+            $0.method = .cosmosSignAmino
+            $0.payload = requestPayload
+        }
+        let parsingInputBytes = try parsingInput.serializedData()
+        
+        let parsingOutputBytes = WalletConnectRequest.parse(coin: .binance, input: parsingInputBytes)
+        let parsingOutput = try WalletConnectParseRequestOutput(serializedData: parsingOutputBytes)
+        
+        var signingInput = parsingOutput.binance
+        
+        // Step 2: Set missing fields.
+        
+        signingInput.privateKey = Data(hexString: "95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832")!
+        
+        // Step 3: Sign the transaction.
+        
+        let output: BinanceSigningOutput = AnySigner.sign(input: signingInput, coin: .binance)
+        
+        let expected = """
+        {"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Amo1kgCI2Yw4iMpoxT38k/RWRgJgbLuH8P5e5TPbOOUC"},"signature":"PCTHhMa7+Z1U/6uxU+3LbTxKd0k231xypdMolyVvjgYvMg+0dTMC+wqW8IxHWXTSDt/Ronu+7ac1h/WN3JWJdQ=="}
+        """
+        XCTAssertEqual(output.signatureJson, expected)
+    }
 }
diff --git a/swift/Tests/Blockchains/BinanceSmartChainTests.swift b/swift/Tests/Blockchains/BinanceSmartChainTests.swift
index 972c46c178e..a1d82e098e8 100644
--- a/swift/Tests/Blockchains/BinanceSmartChainTests.swift
+++ b/swift/Tests/Blockchains/BinanceSmartChainTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/BitcoinDiamondTests.swift b/swift/Tests/Blockchains/BitcoinDiamondTests.swift
new file mode 100644
index 00000000000..1afbbdc18f2
--- /dev/null
+++ b/swift/Tests/Blockchains/BitcoinDiamondTests.swift
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class BitcoinDiamondTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: true)
+        let address = AnyAddress(publicKey: pubkey, coin: .bitcoinDiamond)
+        let addressFromString = AnyAddress(string: "1G15VvshDxwFTnahZZECJfFwEkq9fP79o8", coin: .bitcoinDiamond)!
+
+        XCTAssertEqual(pubkey.data.hexString, "02485a209514cc896f8ed736e205bc4c35bd5299ef3f9e84054475336b964c02a3")
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSign() {
+        let key = PrivateKey(data: Data(hexString: "d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee")!)!
+
+        let script = BitcoinScript.lockScriptForAddress(address: "1G15VvshDxwFTnahZZECJfFwEkq9fP79o8", coin: .bitcoinDiamond)
+        let utxos = [
+            BitcoinUnspentTransaction.with {
+                $0.outPoint.hash = Data(hexString: "034f4667301711e8a69236a93476ed798f9c11aaae472da5b315191a0453461d")!
+                $0.outPoint.index = 0
+                $0.outPoint.sequence = UINT32_MAX
+                $0.script = script.data
+                $0.amount = 27615
+            }
+        ]
+
+        let plan = BitcoinTransactionPlan.with {
+            $0.amount = 17615
+            $0.fee = 10000
+            $0.change = 0
+            $0.utxos = utxos
+            $0.preblockhash = Data(hexString: "99668daf7c77c6462f3ba8fab61b4f62abaabd62911e7e59729ee9e1929dfa4b")!
+        }
+
+        let input = BitcoinSigningInput.with {
+            $0.amount = 17615
+            $0.toAddress = "1HevQVTSEc8cEpDm65UpfCdj5erd4xxBhx"
+            $0.hashType = BitcoinScript.hashTypeForCoin(coinType: .bitcoinDiamond)
+            $0.coinType = CoinType.bitcoinDiamond.rawValue
+            $0.privateKey = [key.data]
+            $0.plan = plan
+        }
+
+        let output: BitcoinSigningOutput = AnySigner.sign(input: input, coin: .bitcoinDiamond)
+        XCTAssertEqual(output.error, .ok)
+        XCTAssertEqual(output.encoded.hexString, "0c00000099668daf7c77c6462f3ba8fab61b4f62abaabd62911e7e59729ee9e1929dfa4b01034f4667301711e8a69236a93476ed798f9c11aaae472da5b315191a0453461d000000006a473044022078e0d3a9e1eb270ab02c15f8fcf1d3bfc95a324839690b7de4f011a4266132ff02204679e8103c4d3f0bb5192a5f53cc273732fd0e8392ab3b00dc708fd24d0160b3012102485a209514cc896f8ed736e205bc4c35bd5299ef3f9e84054475336b964c02a3ffffffff01cf440000000000001976a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac00000000")
+    }
+}
diff --git a/swift/Tests/Blockchains/BitcoinTests.swift b/swift/Tests/Blockchains/BitcoinTests.swift
index e4b7255fc76..28d0eb39094 100644
--- a/swift/Tests/Blockchains/BitcoinTests.swift
+++ b/swift/Tests/Blockchains/BitcoinTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -11,6 +9,223 @@ class BitcoinTransactionSignerTests: XCTestCase {
     override func setUp() {
         continueAfterFailure = false
     }
+    
+    func testSignBrc20Commit() throws {
+        // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1
+        let privateKeyData = Data(hexString: "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129")!
+        let dustAmount = 546 as Int64
+        let txId = Data.reverse(hexString: "8ec895b4d30adb01e38471ca1019bfc8c3e5fbd1f28d9e7b5653260d89989008")
+        
+        let privateKey = PrivateKey(data: privateKeyData)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
+        
+        let utxo0 = BitcoinV2Input.with {
+            $0.outPoint = BitcoinV2OutPoint.with {
+                $0.hash = txId
+                $0.vout = 1
+            }
+            $0.value = 26_400
+            $0.sighashType = BitcoinSigHashType.all.rawValue
+            $0.scriptBuilder = BitcoinV2Input.InputBuilder.with {
+                $0.p2Wpkh = BitcoinV2PublicKeyOrHash.with {
+                    $0.pubkey = publicKey.data
+                }
+            }
+        }
+        
+        let out0 = BitcoinV2Output.with {
+            $0.value = 7_000
+            $0.builder = BitcoinV2Output.OutputBuilder.with {
+                $0.brc20Inscribe = BitcoinV2Output.OutputBrc20Inscription.with {
+                    $0.inscribeTo = publicKey.data
+                    $0.ticker = "oadf"
+                    $0.transferAmount = "20"
+                }
+            }
+        }
+        
+        // Change/return transaction. Set it explicitly.
+        let changeOut = BitcoinV2Output.with {
+            $0.value = 16_400
+            $0.builder = BitcoinV2Output.OutputBuilder.with {
+                $0.p2Wpkh = BitcoinV2PublicKeyOrHash.with {
+                    $0.pubkey = publicKey.data
+                }
+            }
+        }
+        
+        let signingInput = BitcoinV2SigningInput.with {
+            $0.builder = BitcoinV2TransactionBuilder.with {
+                $0.version = .v2
+                $0.inputs = [utxo0]
+                $0.outputs = [out0, changeOut]
+                $0.inputSelector = .useAll
+                $0.fixedDustThreshold = dustAmount
+            }
+            $0.privateKeys = [privateKeyData]
+            $0.chainInfo = BitcoinV2ChainInfo.with {
+                $0.p2PkhPrefix = 0
+                $0.p2ShPrefix = 5
+            }
+        }
+        
+        let legacySigningInput = BitcoinSigningInput.with {
+            $0.signingV2 = signingInput
+        }
+        
+        let output: BitcoinSigningOutput = AnySigner.sign(input: legacySigningInput, coin: .bitcoin)
+        XCTAssertEqual(output.error, .ok)
+        let outputV2 = output.signingResultV2
+        XCTAssertEqual(outputV2.error, .ok)
+        XCTAssertEqual(outputV2.encoded.hexString, "02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000");
+        XCTAssertEqual(outputV2.txid.hexString, "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1")
+    }
+    
+    func testSignBrc20Reveal() throws {
+        // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca
+        let privateKeyData = Data(hexString: "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129")!
+        let dustAmount = 546 as Int64
+        // Now spend just created `797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1` commit output.
+        let txIdCommit = Data.reverse(hexString: "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1")
+        
+        let privateKey = PrivateKey(data: privateKeyData)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
+        
+        let utxo0 = BitcoinV2Input.with {
+            $0.outPoint = BitcoinV2OutPoint.with {
+                $0.hash = txIdCommit
+                $0.vout = 0
+            }
+            $0.value = 7_000
+            $0.sighashType = BitcoinSigHashType.all.rawValue
+            $0.scriptBuilder = BitcoinV2Input.InputBuilder.with {
+                $0.brc20Inscribe = BitcoinV2Input.InputBrc20Inscription.with {
+                    $0.inscribeTo = publicKey.data
+                    $0.ticker = "oadf"
+                    $0.transferAmount = "20"
+                }
+            }
+        }
+        
+        let out0 = BitcoinV2Output.with {
+            $0.value = dustAmount
+            $0.builder = BitcoinV2Output.OutputBuilder.with {
+                $0.p2Wpkh = BitcoinV2PublicKeyOrHash.with {
+                    $0.pubkey = publicKey.data
+                }
+            }
+        }
+        
+        let signingInput = BitcoinV2SigningInput.with {
+            $0.builder = BitcoinV2TransactionBuilder.with {
+                $0.version = .v2
+                $0.inputs = [utxo0]
+                $0.outputs = [out0]
+                $0.inputSelector = .useAll
+                $0.fixedDustThreshold = dustAmount
+            }
+            $0.privateKeys = [privateKeyData]
+            $0.chainInfo = BitcoinV2ChainInfo.with {
+                $0.p2PkhPrefix = 0
+                $0.p2ShPrefix = 5
+            }
+            $0.dangerousUseFixedSchnorrRng = true
+        }
+        
+        let legacySigningInput = BitcoinSigningInput.with {
+            $0.signingV2 = signingInput
+        }
+        
+        let output: BitcoinSigningOutput = AnySigner.sign(input: legacySigningInput, coin: .bitcoin)
+        XCTAssertEqual(output.error, .ok)
+        let outputV2 = output.signingResultV2
+        XCTAssertEqual(outputV2.error, .ok)
+        XCTAssertEqual(outputV2.encoded.hexString, "02000000000101b11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790000000000ffffffff012202000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d03406a35548b8fa4620028e021a944c1d3dc6e947243a7bfc901bf63fefae0d2460efa149a6440cab51966aa4f09faef2d1e5efcba23ab4ca6e669da598022dbcfe35b0063036f7264010118746578742f706c61696e3b636861727365743d7574662d3800377b2270223a226272632d3230222c226f70223a227472616e73666572222c227469636b223a226f616466222c22616d74223a223230227d6821c00f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000");
+        XCTAssertEqual(outputV2.txid.hexString, "7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca")
+    }
+    
+    func testSignBrc20Transfer() throws {
+        // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/3e3576eb02667fac284a5ecfcb25768969680cc4c597784602d0a33ba7c654b7
+        let privateKeyData = Data(hexString: "e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129")!
+        let dustAmount = 546 as Int64
+        // Now spend just created `7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca` reveal output.
+        let txIdReveal = Data.reverse(hexString: "7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca")
+        let txIdForFee = Data.reverse(hexString: "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1")
+        
+        let privateKey = PrivateKey(data: privateKeyData)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
+        
+        let bobAddress = "bc1qazgc2zhu2kmy42py0vs8d7yff67l3zgpwfzlpk"
+        
+        let utxo0 = BitcoinV2Input.with {
+            $0.outPoint = BitcoinV2OutPoint.with {
+                $0.hash = txIdReveal
+                $0.vout = 0
+            }
+            $0.value = dustAmount
+            $0.sighashType = BitcoinSigHashType.all.rawValue
+            $0.scriptBuilder = BitcoinV2Input.InputBuilder.with {
+                $0.p2Wpkh = BitcoinV2PublicKeyOrHash.with {
+                    $0.pubkey = publicKey.data
+                }
+            }
+        }
+        
+        let utxo1 = BitcoinV2Input.with {
+            $0.outPoint = BitcoinV2OutPoint.with {
+                $0.hash = txIdForFee
+                $0.vout = 1
+            }
+            $0.value = 16_400
+            $0.sighashType = BitcoinSigHashType.all.rawValue
+            $0.scriptBuilder = BitcoinV2Input.InputBuilder.with {
+                $0.p2Wpkh = BitcoinV2PublicKeyOrHash.with {
+                    $0.pubkey = publicKey.data
+                }
+            }
+        }
+        
+        let out0 = BitcoinV2Output.with {
+            $0.value = dustAmount
+            $0.toAddress = bobAddress
+        }
+        
+        // Change/return transaction. Set it explicitly.
+        let changeOut = BitcoinV2Output.with {
+            $0.value = 13_400
+            $0.builder = BitcoinV2Output.OutputBuilder.with {
+                $0.p2Wpkh = BitcoinV2PublicKeyOrHash.with {
+                    $0.pubkey = publicKey.data
+                }
+            }
+        }
+        
+        let signingInput = BitcoinV2SigningInput.with {
+            $0.builder = BitcoinV2TransactionBuilder.with {
+                $0.version = .v2
+                $0.inputs = [utxo0, utxo1]
+                $0.outputs = [out0, changeOut]
+                $0.inputSelector = .useAll
+                $0.fixedDustThreshold = dustAmount
+            }
+            $0.privateKeys = [privateKeyData]
+            $0.chainInfo = BitcoinV2ChainInfo.with {
+                $0.p2PkhPrefix = 0
+                $0.p2ShPrefix = 5
+            }
+        }
+        
+        let legacySigningInput = BitcoinSigningInput.with {
+            $0.signingV2 = signingInput
+        }
+        
+        let output: BitcoinSigningOutput = AnySigner.sign(input: legacySigningInput, coin: .bitcoin)
+        XCTAssertEqual(output.error, .ok)
+        let outputV2 = output.signingResultV2
+        XCTAssertEqual(outputV2.error, .ok)
+        XCTAssertEqual(outputV2.encoded.hexString, "02000000000102ca3edda74a46877efa5364ab85947e148508713910ada23e147ea28926dc46700000000000ffffffffb11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790100000000ffffffff022202000000000000160014e891850afc55b64aa8247b2076f8894ebdf889015834000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d024830450221008798393eb0b7390217591a8c33abe18dd2f7ea7009766e0d833edeaec63f2ec302200cf876ff52e68dbaf108a3f6da250713a9b04949a8f1dcd1fb867b24052236950121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb0248304502210096bbb9d1f0596d69875646689e46f29485e8ceccacde9d0025db87fd96d3066902206d6de2dd69d965d28df3441b94c76e812384ab9297e69afe3480ee4031e1b2060121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000");
+        XCTAssertEqual(outputV2.txid.hexString, "3e3576eb02667fac284a5ecfcb25768969680cc4c597784602d0a33ba7c654b7")
+    }
 
     func testSignP2WSH() throws {
         // set up input
@@ -20,6 +235,9 @@ class BitcoinTransactionSignerTests: XCTestCase {
             $0.byteFee = 1
             $0.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx"
             $0.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU"
+            // Set the very low fixed Dust threshold just to fix the tests.
+            // Actually, the transaction in this test has change=79 that will lead to Dust error when broadcasting it.
+            $0.fixedDustThreshold = 79;
         }
 
         input.scripts["593128f9f90e38b706c18623151e37d2da05c229"] = Data(hexString: "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac")!
@@ -106,6 +324,7 @@ class BitcoinTransactionSignerTests: XCTestCase {
         // redeem p2wpkh nested in p2sh
         let scriptHash = lockScript.matchPayToScriptHash()!
         let input = BitcoinSigningInput.with {
+            $0.amount = 43980
             $0.toAddress = "3NqULUrjZ7NL36YtBGsSVzqr5q1x9CJWwu"
             $0.hashType = BitcoinScript.hashTypeForCoin(coinType: .bitcoin)
             $0.coinType = CoinType.bitcoin.rawValue
@@ -174,4 +393,83 @@ class BitcoinTransactionSignerTests: XCTestCase {
         XCTAssertEqual(output.error, .ok)
         XCTAssertEqual(output.encoded.hexString, "01000000026c90312e53a3411347a197bfd637c2583d617dd2317262a70e1b5245d2f1e36a000000008a47304402201a631068ea5ddea19467ef7c932a0f3b04f366ca2beaf70e18958e47456124980220614816c449e39cf6acc6625e1cf3100db1db7c0b755bdbb6804d4fa3c4b735d10141041b3937fac1f14074447cde9d3a324ed292d2865ed0d7a7da26cb43558ce4db4ef33c47e820e53031ae16bb0c39205def059a5ca8e1d617650eabc72c5206a81dffffffff13bf27945c669cf3c1d70cf3048f4ab14f1ab6acf06d10d425e8288217a81efd000000008a473044022051d381d8f48a9a4866ca4109f12647922514604a4733e8da8aac046e19275f700220797c3ebf20df7d2a9fed283f9d0ad14cbd656cafb5ec70a2b1c85646ea7485190141041b3937fac1f14074447cde9d3a324ed292d2865ed0d7a7da26cb43558ce4db4ef33c47e820e53031ae16bb0c39205def059a5ca8e1d617650eabc72c5206a81dffffffff0194590000000000001976a914a0c0a50f986924e65ae9bd18eafae448f83117ed88ac00000000")
     }
+    
+    func testSignPsbtThorSwap() throws {
+        let privateKey = Data(hexString: "f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55")!
+        let psbt = Data(hexString: "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d00000000")!
+
+        let input = BitcoinV2SigningInput.with {
+            $0.psbt = BitcoinV2Psbt.with {
+                $0.psbt = psbt
+            }
+            $0.privateKeys = [privateKey]
+        }
+
+        let legacy = BitcoinSigningInput.with {
+            $0.signingV2 = input
+        }
+        let output: BitcoinSigningOutput = AnySigner.sign(input: legacy, coin: .bitcoin)
+
+        XCTAssertEqual(output.error, .ok)
+        XCTAssert(output.hasSigningResultV2)
+        let outputV2 = output.signingResultV2
+        XCTAssertEqual(outputV2.psbt.psbt.hexString, "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d01086c02483045022100b1229a008f20691639767bf925d6b8956ea957ccc633ad6b5de3618733a55e6b02205774d3320489b8a57a6f8de07f561de3e660ff8e587f6ac5422c49020cd4dc9101210306d8c664ea8fd2683eebea1d3114d90e0a5429e5783ba49b80ddabce04ff28f300000000")
+        XCTAssertEqual(outputV2.encoded.hexString, "02000000000101147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d02483045022100b1229a008f20691639767bf925d6b8956ea957ccc633ad6b5de3618733a55e6b02205774d3320489b8a57a6f8de07f561de3e660ff8e587f6ac5422c49020cd4dc9101210306d8c664ea8fd2683eebea1d3114d90e0a5429e5783ba49b80ddabce04ff28f300000000")
+        XCTAssertEqual(outputV2.txid.hexString, "634a416e82ac710166725f6a4090ac7b5db69687e86b2d2e38dcb3d91c956c32")
+    }
+    
+    func testPlanPsbtThorSwap() throws {
+        let privateKeyBytes = Data(hexString: "f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55")!
+        let privateKey = PrivateKey(data: privateKeyBytes)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
+
+        let psbt = Data(hexString: "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d00000000")!
+
+        let input = BitcoinV2SigningInput.with {
+            // TODO check if it works
+            $0.psbt.psbt = psbt
+            $0.publicKeys = [publicKey.data]
+        }
+
+        let legacy = BitcoinSigningInput.with {
+            $0.signingV2 = input
+        }
+        let legacyPlan: BitcoinTransactionPlan = AnySigner.plan(input: legacy, coin: .bitcoin)
+
+        XCTAssertEqual(legacyPlan.error, .ok)
+        XCTAssert(legacyPlan.hasPlanningResultV2)
+        let plan = legacyPlan.planningResultV2
+        
+        XCTAssertEqual(plan.inputs[0].receiverAddress, "bc1qkyu3n8k8jmekl3pwvdl59k5w8enjp25akz2r3z")
+        XCTAssertEqual(plan.inputs[0].value, 66_406)
+
+        // Vault transfer
+        XCTAssertEqual(plan.outputs[0].toAddress, "bc1q7g48qdshqd000aysws74pun2uzxrp598gcfum0")
+        XCTAssertEqual(plan.outputs[0].value, 60_000)
+
+        // OP_RETURN
+        XCTAssertEqual(
+            plan.outputs[1].customScriptPubkey.hexString,
+            "6a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a3530"
+        )
+        XCTAssertEqual(plan.outputs[1].value, 0)
+
+        // Change output
+        XCTAssertEqual(plan.outputs[2].toAddress, "bc1qkyu3n8k8jmekl3pwvdl59k5w8enjp25akz2r3z")
+        XCTAssertEqual(plan.outputs[2].value, 4_670)
+
+        XCTAssertEqual(plan.feeEstimate, 1736)
+        // Please note that `change` in PSBT planning is always 0.
+        // That's because we aren't able to determine which output is an actual change from PSBT.
+        XCTAssertEqual(plan.change, 0)
+    }
+
+    func testBitcoinMessageSigner() {
+        let verifyResult = BitcoinMessageSigner.verifyMessage(
+            address: "1B8Qea79tsxmn4dTiKKRVvsJpHwL2fMQnr",
+            message: "test signature",
+            signature: "H+3L5IbSVcejp4S2VwLXCxLEMQAWDvKbE8lQyq0ocdvyM1aoEudkzN/S/qLI3vnNOFY6V13BXWSFrPr3OjGa5Dk="
+        )
+        XCTAssertTrue(verifyResult)
+    }
 }
diff --git a/swift/Tests/Blockchains/BitconCashTests.swift b/swift/Tests/Blockchains/BitconCashTests.swift
index c5cec4484d5..406dc3026af 100644
--- a/swift/Tests/Blockchains/BitconCashTests.swift
+++ b/swift/Tests/Blockchains/BitconCashTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/BluzelleTests.swift b/swift/Tests/Blockchains/BluzelleTests.swift
index fde2d9cc4a4..78d32c8843f 100644
--- a/swift/Tests/Blockchains/BluzelleTests.swift
+++ b/swift/Tests/Blockchains/BluzelleTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 import XCTest
 import WalletCore
 
diff --git a/swift/Tests/Blockchains/CardanoTests.swift b/swift/Tests/Blockchains/CardanoTests.swift
index 32561ab157d..4acef413ba3 100644
--- a/swift/Tests/Blockchains/CardanoTests.swift
+++ b/swift/Tests/Blockchains/CardanoTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -62,6 +60,56 @@ class CardanoTests: XCTestCase {
         let txid = output.txID
         XCTAssertEqual(txid.hexString, "9b5b15e133cd73ccaa85307d2986aebc846505118a2eb4e6111e6b4b67d1f389")
     }
+    
+    /// Successfully broadcasted:
+    /// https://cardanoscan.io/transaction/0203ce2c91f59f169a26e9ef91254639d2b7911afac9c7c0ae64539f88ba46a5
+    func testSignTransferFromLegacy() throws {
+        let privateKey = PrivateKey(data: Data(hexString: "98f266d1aac660179bc2f456033941238ee6b2beb8ed0f9f34c9902816781f5a9903d1d395d6ab887b65ea5e344ef09b449507c21a75f0ce8c59d0ed1c6764eba7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f4e890ca4eb6bec44bf751b5a843174534af64d6ad1f44e0613db78a7018781f5aa151d2997f52059466b715d8eefab30a78b874ae6ef4931fa58bb21ef8ce2423d46f19d0fbf75afb0b9a24e31d533f4fd74cee3b56e162568e8defe37123afc4")!)!
+        let publicKey = privateKey.getPublicKeyEd25519Cardano()
+        let byronAddress = Cardano.getByronAddress(publicKey: publicKey)
+        
+        XCTAssertEqual(
+            publicKey.data.hexString,
+        "d163c8c4f0be7c22cd3a1152abb013c855ea614b92201497a568c5d93ceeb41ea7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f40b5aaa6103dc10842894a1eeefc5447b9bcb9bcf227d77e57be195d17bc03263d46f19d0fbf75afb0b9a24e31d533f4fd74cee3b56e162568e8defe37123afc4"
+        )
+
+        XCTAssertEqual(
+            byronAddress,
+            "Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8"
+        )
+        var input = CardanoSigningInput.with {
+            $0.transferMessage.toAddress = "addr1q90uh2eawrdc9vaemftgd50l28yrh9lqxtjjh4z6dnn0u7ggasexxdyyk9f05atygnjlccsjsggtc87hhqjna32fpv5qeq96ls"
+            $0.transferMessage.changeAddress = "addr1qx55ymlqemndq8gluv40v58pu76a2tp4mzjnyx8n6zrp2vtzrs43a0057y0edkn8lh9su8vh5lnhs4npv6l9tuvncv8swc7t08"
+            $0.transferMessage.amount = 3000000
+            $0.ttl = 190000000
+        }
+
+        input.privateKey.append(privateKey.data)
+
+        let utxo1 = CardanoTxInput.with {
+            $0.outPoint.txHash = Data(hexString: "8316e5007d61fb90652cabb41141972a38b5bc60954d602cf843476aa3f67f63")!
+            $0.outPoint.outputIndex = 0
+            $0.address = "Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8"
+            $0.amount = 2500000
+        }
+        input.utxos.append(utxo1)
+
+        let utxo2 = CardanoTxInput.with {
+            $0.outPoint.txHash = Data(hexString: "e29392c59c903fefb905730587d22cae8bda30bd8d9aeec3eca082ae77675946")!
+            $0.outPoint.outputIndex = 0
+            $0.address = "Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8"
+            $0.amount = 1700000
+        }
+        input.utxos.append(utxo2)
+
+        // Sign
+        let output: CardanoSigningOutput = AnySigner.sign(input: input, coin: .cardano)
+        XCTAssertEqual(output.error, TW_Common_Proto_SigningError.ok)
+
+        XCTAssertEqual(output.encoded.hexString, "83a400828258208316e5007d61fb90652cabb41141972a38b5bc60954d602cf843476aa3f67f6300825820e29392c59c903fefb905730587d22cae8bda30bd8d9aeec3eca082ae77675946000182825839015fcbab3d70db82b3b9da5686d1ff51c83b97e032e52bd45a6ce6fe7908ec32633484b152fa756444e5fc62128210bc1fd7b8253ec5490b281a002dc6c082583901a9426fe0cee6d01d1fe32af650e1e7b5d52c35d8a53218f3d0861531621c2b1ebdf4f11f96da67fdcb0e1d97a7e778566166be55f193c30f1a000f9ec1021a0002b0bf031a0b532b80a20081825820d163c8c4f0be7c22cd3a1152abb013c855ea614b92201497a568c5d93ceeb41e58406a23ab9267867fbf021c1cb2232bc83d2cdd663d651d22d59b6cddbca5cb106d4db99da50672f69a2309ca8a329a3f9576438afe4538b013de4591a6dfcd4d090281845820d163c8c4f0be7c22cd3a1152abb013c855ea614b92201497a568c5d93ceeb41e58406a23ab9267867fbf021c1cb2232bc83d2cdd663d651d22d59b6cddbca5cb106d4db99da50672f69a2309ca8a329a3f9576438afe4538b013de4591a6dfcd4d095820a7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f441a0f6")
+
+        XCTAssertEqual(output.txID.hexString, "0203ce2c91f59f169a26e9ef91254639d2b7911afac9c7c0ae64539f88ba46a5")
+    }
 
     func testSignTransferToken1() throws {
         let toToken = CardanoTokenAmount.with {
@@ -109,7 +157,7 @@ class CardanoTests: XCTestCase {
         }
         let token1 = CardanoTokenAmount.with {
             $0.policyID = "9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77"
-            $0.assetName = "SUNDAE"
+            $0.assetNameHex = "53554e444145"
             $0.amount = Data(hexString: "04d3e8d9")! // 80996569
         }
         utxo2.tokenAmount.append(token1)
@@ -221,4 +269,69 @@ class CardanoTests: XCTestCase {
         let txid = output.txID
         XCTAssertEqual(txid.hexString, "6dcf3956232953fc25b8355fb1ded1e912b5802090fd21434d789087d6329683")
     }
+
+    // Successfully broadcasted:
+    // https://cardanoscan.io/transaction/87ca43a36b09c0b140f0ef2b71fbdcfcf1fdc88f7aa378b861e8eed3e8974628
+    func testSignNftTransfer() throws {
+        let fromAddress = "addr1qy5eme9r6frr0m6q2qpncg282jtrhq5lg09uxy2j0545hj8rv7v2ntdxuv6p4s3eq4lqzg39lewgvt6fk5kmpa0zppesufzjud"
+        let toAddress = "addr1qy9wjfn6nd8kak6dd8z53u7t5wt9f4lx0umll40px5hnq05avwcsq5r3ytdp36wttzv4558jaq8lvhgqhe3y8nuf5xrquju7z4"
+        let coinsPerUtxoByte = "4310";
+
+        let tokenAmount = CardanoTokenAmount.with {
+            $0.policyID = "219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5e"
+            $0.assetNameHex = "636f6f6c63617473736f636965747934353637"
+            $0.amount = Data(hexString: "01")! // 1
+        };
+        var input = CardanoSigningInput.with {
+            $0.transferMessage.toAddress = toAddress
+            $0.transferMessage.changeAddress = fromAddress
+            $0.ttl = 89130965
+        }
+        input.transferMessage.tokenAmount.token.append(tokenAmount);
+        
+        // check min ADA amount, set it
+        let inputTokenAmountSerialized = try input.transferMessage.tokenAmount.serializedData()
+        let minAmount = Cardano.outputMinAdaAmount(toAddress: toAddress, tokenBundle: inputTokenAmountSerialized, coinsPerUtxoByte: coinsPerUtxoByte)!;
+        let minAmountInt = UInt64(minAmount)!
+        XCTAssertEqual(minAmountInt, 1202490)
+        input.transferMessage.amount = minAmountInt
+        
+        input.privateKey.append(Data(hexString: "d09831a668db6b36ffb747600cb1cd3e3d34f36e1e6feefc11b5f988719b7557a7029ab80d3e6fe4180ad07a59ddf742ea9730f3c4145df6365fa4ae2ee49c3392e19444caf461567727b7fefec40a3763bdb6ce5e0e8c05f5e340355a8fef4528dfe7502cfbda49e38f5a0021962d52dc3dee82834a23abb6750981799b75577d1ed9af9853707f0ef74264274e71b2f12e86e3c91314b6efa75ef750d9711b84cedd742ab873ef2f9566ad20b3fc702232c6d2f5d83ff425019234037d1e58")!)
+
+        let utxo1 = CardanoTxInput.with {
+            $0.outPoint.txHash = Data(hexString: "aba499ec2f23529e70bb256ceaffcc6274a882cf02f29e5670c75ee980d7c2b8")!
+            $0.outPoint.outputIndex = 0
+            $0.address = fromAddress
+            $0.amount = 1202490
+            $0.tokenAmount = [tokenAmount]
+        }
+        input.utxos.append(utxo1)
+        
+        let utxo2 = CardanoTxInput.with {
+            $0.outPoint.txHash = Data(hexString: "ee414d635b3bc67831907354d274a31174664777c57c21ae923b9459e5644840")!
+            $0.outPoint.outputIndex = 0
+            $0.address = fromAddress
+            $0.amount = 1000000
+        }
+        input.utxos.append(utxo2)
+        
+        let utxo3 = CardanoTxInput.with {
+            $0.outPoint.txHash = Data(hexString: "6a7221dcc28353ed69b733391ffeb984a34c1e72293af111d59f9ddfa8639167")!
+            $0.outPoint.outputIndex = 0
+            $0.address = fromAddress
+            $0.amount = 2000000
+        }
+        input.utxos.append(utxo3)
+
+        // Sign
+        let output: CardanoSigningOutput = AnySigner.sign(input: input, coin: .cardano)
+        XCTAssertEqual(output.error, TW_Common_Proto_SigningError.ok)
+
+        let encoded = output.encoded
+        XCTAssertEqual(encoded.hexString,
+            "83a400838258206a7221dcc28353ed69b733391ffeb984a34c1e72293af111d59f9ddfa863916700825820aba499ec2f23529e70bb256ceaffcc6274a882cf02f29e5670c75ee980d7c2b800825820ee414d635b3bc67831907354d274a31174664777c57c21ae923b9459e5644840000182825839010ae9267a9b4f6edb4d69c548f3cba39654d7e67f37ffd5e1352f303e9d63b100507122da18e9cb58995a50f2e80ff65d00be6243cf89a186821a0012593aa1581c219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5ea153636f6f6c63617473736f6369657479343536370182583901299de4a3d24637ef4050033c214754963b829f43cbc311527d2b4bc8e36798a9ada6e3341ac239057e012225fe5c862f49b52db0f5e208731a002b1525021a0002b19b031a055007d5a1008182582088bd26e8656fa7dead846c3373588f0192da5bfb90bf5d3fb877decfb3b3fd085840da8656aca0dacc57d4c2d957fc7dff03908f6dcf60c48f1e40b3006e2fd0cfacfa4c24fa02e35a310572526586d4ce0d30bf660ba274c8efd507848cbe177d09f6")
+
+        let txid = output.txID
+        XCTAssertEqual(txid.hexString, "87ca43a36b09c0b140f0ef2b71fbdcfcf1fdc88f7aa378b861e8eed3e8974628")
+    }
 }
diff --git a/swift/Tests/Blockchains/CeloTests.swift b/swift/Tests/Blockchains/CeloTests.swift
index 886490bba7c..367d9531e60 100644
--- a/swift/Tests/Blockchains/CeloTests.swift
+++ b/swift/Tests/Blockchains/CeloTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/ConfluxeSpaceTests.swift b/swift/Tests/Blockchains/ConfluxeSpaceTests.swift
new file mode 100644
index 00000000000..77751907f35
--- /dev/null
+++ b/swift/Tests/Blockchains/ConfluxeSpaceTests.swift
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class ConfluxeSpaceTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0")!)!
+                let pubkey = key.getPublicKeySecp256k1(compressed: false)
+                let address = AnyAddress(publicKey: pubkey, coin: .confluxeSpace)
+                let expected = AnyAddress(string: "0xe32DC46bfBF78D1eada7b0a68C96903e01418D64", coin: .confluxeSpace)!
+
+                XCTAssertEqual(address.description, expected.description)
+    }
+}
diff --git a/swift/Tests/Blockchains/CosmosTests.swift b/swift/Tests/Blockchains/CosmosTests.swift
index 3d940fe09d5..90cfd33423c 100644
--- a/swift/Tests/Blockchains/CosmosTests.swift
+++ b/swift/Tests/Blockchains/CosmosTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -65,7 +63,7 @@ class CosmosSignerTests: XCTestCase {
         let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .cosmos)
 
         XCTAssertJSONEqual(output.serialized, "{\"tx_bytes\": \"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H\", \"mode\": \"BROADCAST_MODE_BLOCK\"}")
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
     
     func testAuthCompounding() {
@@ -102,8 +100,8 @@ class CosmosSignerTests: XCTestCase {
         
         let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .cosmos)
 
-        XCTAssertJSONEqual(output.serialized, "{\"tx_bytes\": \"CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjoSNgo0Y29zbW9zdmFsb3BlcjFnanR2bHk5bGVsNnpza3Z3dHZsZzV2aHdwdTljOXdhdzdzeHp3eCABEgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQIFyfuijGKf87Hz61ZqxasfLI1PZnNge4RDq/tRyB/tZI6p80iGRqHecoV6+84EQkc9GTlNRQOSlApRCsivT9XI=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}")
-        XCTAssertEqual(output.error, "")
+        XCTAssertJSONEqual(output.serialized, "{\"tx_bytes\": \"CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjogARI2CjRjb3Ntb3N2YWxvcGVyMWdqdHZseTlsZWw2enNrdnd0dmxnNXZod3B1OWM5d2F3N3N4end4EgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQEAN1nIfDawlHnep2bNEm14w+g7tYybJJT3htcGVS6s9D7va3ed1OUEIk9LZoc3G//VenJ+KLw26SRVBaRukgVI=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}")
+        XCTAssertEqual(output.errorMessage, "")
     }
     
     func testRevokeAuthCompounding() {
@@ -137,7 +135,7 @@ class CosmosSignerTests: XCTestCase {
         let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .cosmos)
 
         XCTAssertJSONEqual(output.serialized, "{\"tx_bytes\": \"CqoBCqcBCh8vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnUmV2b2tlEoMBCi1jb3Ntb3MxM2swcTBsN2xnMmtyMzJrdnQ3bHkyMzZwcGxkeTh2OWR6d2gzZ2QSLWNvc21vczFmczdsdTI4aHg1bTlha203cnAwYzI0MjJjbjhyMmY3Z3VydWpoZhojL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuTXNnRGVsZWdhdGUSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAQSEwoNCgV1YXRvbRIEMjE5NBC3rQUaQI7K+W7MMBoD6FbFZxRBqs9VTjErztjWTy57+fvrLaTCIZ+eBs7CuaKqfUZdSN8otjubSHVTQID3k9DpPAX0yDo=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}")
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 
     func testStaking() {
@@ -176,7 +174,7 @@ class CosmosSignerTests: XCTestCase {
         let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .cosmos)
 
         XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpsBCpgBCiMvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dEZWxlZ2F0ZRJxCi1jb3Ntb3MxaHNrNmpyeXlxamZocDVkaGM1NXRjOWp0Y2t5Z3gwZXBoNmRkMDISNGNvc21vc3ZhbG9wZXIxemt1cHI4M2hyemtuM3VwNWVsa3R6Y3EzdHVmdDhueHNtd2RxZ3AaCgoEbXVvbhICMTASZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAcSEgoMCgRtdW9uEgQxMDE4ENmaBhpA8O9Jm/kL6Za2I3poDs5vpMowYJgNvYCJBRU/vxAjs0lNZYsq40qpTbwOTbORjJA5UjQ6auc40v6uCFT4q4z+uA==\"}")
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 
     func testWithdraw() {
@@ -221,7 +219,7 @@ class CosmosSignerTests: XCTestCase {
         let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .cosmos)
 
         XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CukDCqABCjcvY29zbW9zLmRpc3RyaWJ1dGlvbi52MWJldGExLk1zZ1dpdGhkcmF3RGVsZWdhdG9yUmV3YXJkEmUKLWNvc21vczEwMHJoeGNscWFzeTZ2bnJjZXJ2Z2g5OWFseDV4dzdsa2ZwNHU1NBI0Y29zbW9zdmFsb3BlcjFleTY5cjM3Z2Z4dnhnNjJzaDRyMGt0cHVjNDZwempybTg3M2FlOAqgAQo3L2Nvc21vcy5kaXN0cmlidXRpb24udjFiZXRhMS5Nc2dXaXRoZHJhd0RlbGVnYXRvclJld2FyZBJlCi1jb3Ntb3MxMDByaHhjbHFhc3k2dm5yY2VydmdoOTlhbHg1eHc3bGtmcDR1NTQSNGNvc21vc3ZhbG9wZXIxc2psbHNucmFtdGczZXd4cXd3cndqeGZnYzRuNGVmOXUybGNuajAKoAEKNy9jb3Ntb3MuZGlzdHJpYnV0aW9uLnYxYmV0YTEuTXNnV2l0aGRyYXdEZWxlZ2F0b3JSZXdhcmQSZQotY29zbW9zMTAwcmh4Y2xxYXN5NnZucmNlcnZnaDk5YWx4NXh3N2xrZnA0dTU0EjRjb3Ntb3N2YWxvcGVyMTY0OHlubHBkdzdmcWEyYXh0MHcyeXAzZms1NDJqdW5sN3JzdnE2EmUKUQpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJXKG7D830zVXu7qgALJ3RKyQI6qZZ8rnWhgdH/kfqdxRIECgIIARi+AhIQCgoKBXVhdG9tEgExEOC2DRpAXLgJ+8xEMUn7nkFj3ukg2V65Vh5ob7HKeCaNpMM6OPQrpW2r6askfssIFcOd8ThiBEz65bJz81Fmb5MtDTGv4g==\"}")
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 
     func testIbcTransfer() {
@@ -270,6 +268,6 @@ class CosmosSignerTests: XCTestCase {
 
         // https://www.mintscan.io/cosmos/txs/817101F3D96314AD028733248B28BAFAD535024D7D2C8875D3FE31DC159F096B
         XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"Cr4BCrsBCikvaWJjLmFwcGxpY2F0aW9ucy50cmFuc2Zlci52MS5Nc2dUcmFuc2ZlchKNAQoIdHJhbnNmZXISC2NoYW5uZWwtMTQxGg8KBXVhdG9tEgYxMDAwMDAiLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseCorb3NtbzE4czBoZG5zbGxnY2Nsd2V1OWF5bXc0bmdrdHIyazBya3ZuN2ptbjIHCAEQgI6ZBBJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEC7O9c5DejAsZ/lUaN5LMfNukR9GfX5qUrQcHhPh1WNkkSBAoCCAEYAhIUCg4KBXVhdG9tEgUxMjUwMBCgwh4aQK0HIWdFMk+C6Gi1KG/vELe1ffcc1aEWUIqz2t/ZhwqNNHxUUSp27wteiugHEMVTEIOBhs84t2gIcT/nD/1yKOU=\"}")
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 }
diff --git a/swift/Tests/Blockchains/CronosTests.swift b/swift/Tests/Blockchains/CronosTests.swift
index b28a89849bb..a1e917f30ce 100644
--- a/swift/Tests/Blockchains/CronosTests.swift
+++ b/swift/Tests/Blockchains/CronosTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/CryptoorgTests.swift b/swift/Tests/Blockchains/CryptoorgTests.swift
index 7926940b6b5..9f781e24982 100644
--- a/swift/Tests/Blockchains/CryptoorgTests.swift
+++ b/swift/Tests/Blockchains/CryptoorgTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -60,6 +58,6 @@ class CryptoorgTests: XCTestCase {
 
         // https://crypto.org/explorer/tx/BCB213B0A121F0CF11BECCF52475F1C8328D6070F3CFDA9E14C42E6DB30E847E
         XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpABCo0BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm0KKmNybzFjdHd0Y3dwZ2tza3k5ODhkaHRoNmpzbHh2ZXVtZ3UwZDQ1emdmMBIqY3JvMXhwYWh5NmM3d2xkeGFjdjZsZDk5aDQzNW1odmZuc3VwMjR2Y3VzGhMKB2Jhc2Vjcm8SCDUwMDAwMDAwEmkKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQOIMbBhYj5+i+WdiIxxCEpFyNCJMHy/XsVdxiwde9Vr4xIECgIIARgCEhUKDwoHYmFzZWNybxIENTAwMBDAmgwaQAcxK9xk6r69gmz+1UWaCnYxNuXPXZdp59YcqKPJE5d6fp+IICTBOwd2rs8MiApcf8kNSrbZ6oECxcGQAdxF0SI=\"}")
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 }
diff --git a/swift/Tests/Blockchains/DashTests.swift b/swift/Tests/Blockchains/DashTests.swift
index 655594b9a1c..94ebddfccc1 100644
--- a/swift/Tests/Blockchains/DashTests.swift
+++ b/swift/Tests/Blockchains/DashTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/Data b/swift/Tests/Blockchains/Data
index f50c5d874d3..154e08de1f2 120000
--- a/swift/Tests/Blockchains/Data
+++ b/swift/Tests/Blockchains/Data
@@ -1 +1 @@
-../../../tests/Ethereum/Data
\ No newline at end of file
+../../../tests/chains/Ethereum/Data
\ No newline at end of file
diff --git a/swift/Tests/Blockchains/DecredTests.swift b/swift/Tests/Blockchains/DecredTests.swift
index 2f7b3d4e54b..5dc0a9d4814 100644
--- a/swift/Tests/Blockchains/DecredTests.swift
+++ b/swift/Tests/Blockchains/DecredTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/DogeTests.swift b/swift/Tests/Blockchains/DogeTests.swift
index fd4708d10b8..991b8c570fc 100644
--- a/swift/Tests/Blockchains/DogeTests.swift
+++ b/swift/Tests/Blockchains/DogeTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/DydxTests.swift b/swift/Tests/Blockchains/DydxTests.swift
new file mode 100644
index 00000000000..a464c834c8a
--- /dev/null
+++ b/swift/Tests/Blockchains/DydxTests.swift
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class DydxTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: true)
+        let address = AnyAddress(publicKey: pubkey, coin: .dydx)
+        let addressFromString = AnyAddress(string: "dydx1mry47pkga5tdswtluy0m8teslpalkdq0hc72uz", coin: .dydx)!
+
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+}
diff --git a/swift/Tests/Blockchains/ECashTests.swift b/swift/Tests/Blockchains/ECashTests.swift
index 7826b92e44f..7f07d59b0ba 100644
--- a/swift/Tests/Blockchains/ECashTests.swift
+++ b/swift/Tests/Blockchains/ECashTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/EOSTests.swift b/swift/Tests/Blockchains/EOSTests.swift
index 30ea50eda7c..4f5373c46ad 100644
--- a/swift/Tests/Blockchains/EOSTests.swift
+++ b/swift/Tests/Blockchains/EOSTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -60,8 +58,8 @@ class EOSTests: XCTestCase {
         {
             "compression": "none",
             "packed_context_free_data": "",
-            "packed_trx": "7c59a35cd6679a1f3d4800000000010000000080a920cd000000572d3ccdcd010000000080a920cd00000000a8ed3232330000000080a920cd0000000000ea3055e09304000000000004544b4e00000000126d79207365636f6e64207472616e7366657200",
-            "signatures": ["SIG_K1_KfCdjsrTnx5cBpbA5cUdHZAsRYsnC9uKzuS1shFeqfMCfdZwX4PBm9pfHwGRT6ffz3eavhtkyNci5GoFozQAx8P8PBnDmj"]
+            "packed_trx": "6e67a35cd6679a1f3d4800000000010000000080a920cd000000572d3ccdcd010000000080a920cd00000000a8ed3232330000000080a920cd0000000000ea3055e09304000000000004544b4e00000000126d79207365636f6e64207472616e7366657200",
+            "signatures": ["SIG_K1_K9RdLC7DEDWjTfR64GU8BtDHcAjzR1ntcT651JMcfHNTpdsvDrUwfyzF1FkvL9fxEi2UCtGJZ9zYoNbJoMF1fbU64cRiJ7"]
         }
         """
         XCTAssertEqual(output.error, TW_Common_Proto_SigningError.ok)
diff --git a/swift/Tests/Blockchains/ElrondTests.swift b/swift/Tests/Blockchains/ElrondTests.swift
deleted file mode 100644
index 06718ed42a3..00000000000
--- a/swift/Tests/Blockchains/ElrondTests.swift
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-import WalletCore
-import XCTest
-
-class ElrondTests: XCTestCase {
-
-    let aliceBech32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
-    let alicePubKeyHex = "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1"
-    let aliceSeedHex = "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"
-    let bobBech32 = "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx"
-
-    func testAddress() {
-        let key = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
-        let pubkey = key.getPublicKeyEd25519()
-        let address = AnyAddress(publicKey: pubkey, coin: .elrond)
-        let addressFromString = AnyAddress(string: aliceBech32, coin: .elrond)!
-
-        XCTAssertEqual(pubkey.data.hexString, alicePubKeyHex)
-        XCTAssertEqual(address.description, addressFromString.description)
-    }
-
-    func testSignGenericAction() {
-        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
-
-        let input = ElrondSigningInput.with {
-            $0.genericAction = ElrondGenericAction.with {
-                $0.accounts = ElrondAccounts.with {
-                    $0.senderNonce = 7
-                    $0.sender = aliceBech32
-                    $0.receiver = bobBech32 
-                }
-                $0.value = "0"
-                $0.data = "foo"
-                $0.version = 1
-            }
-            $0.gasPrice = 1000000000
-            $0.gasLimit = 50000
-            $0.chainID = "1"
-            $0.privateKey = privateKey.data
-        }
-
-        let output: ElrondSigningOutput = AnySigner.sign(input: input, coin: .elrond)
-        let expectedSignature = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700"
-        let expectedEncoded = #"{"nonce":7,"value":"0","receiver":"\#(bobBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"\#(expectedSignature)"}"#
-
-        XCTAssertEqual(output.signature, expectedSignature)
-        XCTAssertEqual(output.encoded, expectedEncoded)
-    }
-
-    func testSignEGLDTransfer() {
-        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
-
-        let input = ElrondSigningInput.with {
-            $0.egldTransfer = ElrondEGLDTransfer.with {
-                $0.accounts = ElrondAccounts.with {
-                    $0.senderNonce = 7
-                    $0.sender = aliceBech32
-                    $0.receiver = bobBech32
-                }
-                $0.amount = "1000000000000000000"
-            }
-            $0.chainID = "1"
-            $0.privateKey = privateKey.data
-        }
-
-        let output: ElrondSigningOutput = AnySigner.sign(input: input, coin: .elrond)
-        let expectedSignature = "7e1c4c63b88ea72dcf7855a54463b1a424eb357ac3feb4345221e512ce07c7a50afb6d7aec6f480b554e32cf2037082f3bc17263d1394af1f3ef240be53c930b"
-        let expectedEncoded = #"{"nonce":7,"value":"1000000000000000000","receiver":"\#(bobBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1,"signature":"\#(expectedSignature)"}"#
-
-        XCTAssertEqual(output.signature, expectedSignature)
-        XCTAssertEqual(output.encoded, expectedEncoded)
-    }
-
-    func testSignESDTTransfer() {
-        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
-
-        let input = ElrondSigningInput.with {
-            $0.esdtTransfer = ElrondESDTTransfer.with {
-                $0.accounts = ElrondAccounts.with {
-                    $0.senderNonce = 7
-                    $0.sender = aliceBech32
-                    $0.receiver = bobBech32
-                }
-                $0.amount = "10000000000000"
-                $0.tokenIdentifier = "MYTOKEN-1234"
-            }
-
-            $0.privateKey = privateKey.data
-        }
-
-        let output: ElrondSigningOutput = AnySigner.sign(input: input, coin: .elrond)
-        let expectedSignature = "9add6d9ac3f1a1fddb07b934e8a73cad3b8c232bdf29d723c1b38ad619905f03e864299d06eb3fe3bbb48a9f1d9b7f14e21dc5eaffe0c87f5718ad0c4198bb0c"
-        let expectedData = "RVNEVFRyYW5zZmVyQDRkNTk1NDRmNGI0NTRlMmQzMTMyMzMzNEAwOTE4NGU3MmEwMDA="
-        let expectedEncoded = #"{"nonce":7,"value":"0","receiver":"\#(bobBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":425000,"data":"\#(expectedData)","chainID":"1","version":1,"signature":"\#(expectedSignature)"}"#
-
-        XCTAssertEqual(output.signature, expectedSignature)
-        XCTAssertEqual(output.encoded, expectedEncoded)
-    }
-
-    func testSignESDTNFTTransfer() {
-        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
-
-        let input = ElrondSigningInput.with {
-            $0.esdtnftTransfer = ElrondESDTNFTTransfer.with {
-                $0.accounts = ElrondAccounts.with {
-                    $0.senderNonce = 7
-                    $0.sender = aliceBech32
-                    $0.receiver = bobBech32
-                }
-                $0.tokenCollection = "LKMEX-aab910"
-                $0.tokenNonce = 4
-                $0.amount = "184300000000000000"
-            }
-
-            $0.privateKey = privateKey.data
-        }
-
-        let output: ElrondSigningOutput = AnySigner.sign(input: input, coin: .elrond)
-        let expectedSignature = "cc935685d5b31525e059a16a832cba98dee751983a5a93de4198f6553a2c55f5f1e0b4300fe9077376fa754546da0b0f6697e66462101a209aafd0fc775ab60a"
-        let expectedData = "RVNEVE5GVFRyYW5zZmVyQDRjNGI0ZDQ1NTgyZDYxNjE2MjM5MzEzMEAwNEAwMjhlYzNkZmEwMWFjMDAwQDgwNDlkNjM5ZTVhNjk4MGQxY2QyMzkyYWJjY2U0MTAyOWNkYTc0YTE1NjM1MjNhMjAyZjA5NjQxY2MyNjE4Zjg="
-        let expectedEncoded = #"{"nonce":7,"value":"0","receiver":"\#(aliceBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":937500,"data":"\#(expectedData)","chainID":"1","version":1,"signature":"\#(expectedSignature)"}"#
-
-        XCTAssertEqual(output.signature, expectedSignature)
-        XCTAssertEqual(output.encoded, expectedEncoded)
-    }
-}
diff --git a/swift/Tests/Blockchains/EthereumAbiTests.swift b/swift/Tests/Blockchains/EthereumAbiTests.swift
index a6a18430e5b..0fbd2e07be2 100644
--- a/swift/Tests/Blockchains/EthereumAbiTests.swift
+++ b/swift/Tests/Blockchains/EthereumAbiTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -57,7 +55,7 @@ class EthereumAbiTests: XCTestCase {
     func testValueDecoderValue() {
         XCTAssertEqual("42", EthereumAbiValue.decodeValue(input: Data(hexString: "000000000000000000000000000000000000000000000000000000000000002a")!, type: "uint"))
         XCTAssertEqual("24", EthereumAbiValue.decodeValue(input: Data(hexString: "0000000000000000000000000000000000000000000000000000000000000018")!, type: "uint8"))
-        XCTAssertEqual("0xf784682c82526e245f50975190ef0fff4e4fc077", EthereumAbiValue.decodeValue(input: Data(hexString: "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077")!, type: "address"))
+        XCTAssertEqual("0xF784682C82526e245F50975190EF0fff4E4fC077", EthereumAbiValue.decodeValue(input: Data(hexString: "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077")!, type: "address"))
         XCTAssertEqual("Hello World!    Hello World!    Hello World!", EthereumAbiValue.decodeValue(input: Data(hexString:
             "000000000000000000000000000000000000000000000000000000000000002c48656c6c6f20576f726c64212020202048656c6c6f20576f726c64212020202048656c6c6f20576f726c64210000000000000000000000000000000000000000"
             )!, type: "string"))
@@ -71,7 +69,7 @@ class EthereumAbiTests: XCTestCase {
 
     func testValueDecoderArray_address() {
         let input = Data(hexString: "0000000000000000000000000000000000000000000000000000000000000002000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc0770000000000000000000000002e00cd222cb42b616d86d037cc494e8ab7f5c9a3")
-        XCTAssertEqual("[\"0xf784682c82526e245f50975190ef0fff4e4fc077\",\"0x2e00cd222cb42b616d86d037cc494e8ab7f5c9a3\"]", EthereumAbiValue.decodeArray(input: input!, type: "address[]"))
+        XCTAssertEqual("[\"0xF784682C82526e245F50975190EF0fff4E4fC077\",\"0x2e00CD222Cb42B616D86D037Cc494e8ab7F5c9a3\"]", EthereumAbiValue.decodeArray(input: input!, type: "address[]"))
     }
 
     func testValueDecoderArray_bytes() {
@@ -90,7 +88,7 @@ class EthereumAbiTests: XCTestCase {
             "inputs": [{
                 "name": "_spender",
                 "type": "address",
-                "value": "0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed"
+                "value": "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"
             }, {
                 "name": "_value",
                 "type": "uint256",
@@ -113,24 +111,24 @@ class EthereumAbiTests: XCTestCase {
             "inputs": [{
                 "name": "caller",
                 "type": "address",
-                "value": "0x27239549dd40e1d60f5b80b0c4196923745b1fd2"
+                "value": "0x27239549DD40E1D60F5B80B0C4196923745B1FD2"
             }, {
                 "components": [{
                     "name": "srcToken",
                     "type": "address",
-                    "value": "0x2b591e99afe9f32eaa6214f7b7629768c40eeb39"
+                    "value": "0x2b591e99afE9f32eAA6214f7B7629768c40Eeb39"
                 }, {
                     "name": "dstToken",
                     "type": "address",
-                    "value": "0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"
+                    "value": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
                 }, {
                     "name": "srcReceiver",
                     "type": "address",
-                    "value": "0x27239549dd40e1d60f5b80b0c4196923745b1fd2"
+                    "value": "0x27239549DD40E1D60F5B80B0C4196923745B1FD2"
                 }, {
                     "name": "dstReceiver",
                     "type": "address",
-                    "value": "0x1611c227725c5e420ef058275ae772b41775e261"
+                    "value": "0x1611C227725c5E420Ef058275AE772b41775e261"
                 }, {
                     "name": "amount",
                     "type": "uint256",
@@ -221,4 +219,135 @@ class EthereumAbiTests: XCTestCase {
 
         XCTAssertEqual(hash.hexString, "54140d99a864932cbc40fd8a2d1d1706c3923a79c183a3b151e929ac468064db")
     }
+    
+    func testEthereumAbiEncodeFunction() throws {
+        let amountIn = EthereumAbiNumberNParam.with {
+            $0.bits = 256
+            $0.value = Data(hexString: "0x0de0b6b3a7640000")! // 1000000000000000000
+        }
+        let amountOutMin = EthereumAbiNumberNParam.with {
+            $0.bits = 256
+            $0.value = Data(hexString: "0x229f7e501ad62bdb")! // 2494851601099271131
+        }
+        let deadline = EthereumAbiNumberNParam.with {
+            $0.bits = 256
+            $0.value = Data(hexString: "0x5f0ed070")! // 1594806384
+        }
+        
+        let arr = EthereumAbiArrayParam.with {
+            $0.elementType = EthereumAbiParamType.with {
+                $0.address = EthereumAbiAddressType.init()
+            }
+            $0.elements = [
+                EthereumAbiToken.with { $0.address = "0x6B175474E89094C44Da98b954EedeAC495271d0F" },
+                EthereumAbiToken.with { $0.address = "0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2" },
+                EthereumAbiToken.with { $0.address = "0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2" },
+                EthereumAbiToken.with { $0.address = "0xE41d2489571d322189246DaFA5ebDe1F4699F498" },
+            ]
+        }
+        let encodingInput = EthereumAbiFunctionEncodingInput.with {
+            $0.functionName = "swapExactTokensForTokens"
+            $0.tokens = [
+                EthereumAbiToken.with { $0.numberUint = amountIn },
+                EthereumAbiToken.with { $0.numberUint = amountOutMin },
+                EthereumAbiToken.with { $0.array = arr },
+                EthereumAbiToken.with { $0.address = "0x7d8bf18C7cE84b3E175b339c4Ca93aEd1dD166F1" },
+                EthereumAbiToken.with { $0.numberUint = deadline },
+            ]
+        }
+        
+        let inputData = try encodingInput.serializedData()
+        let outputData = EthereumAbi.encodeFunction(coin: .ethereum, input: inputData)
+        
+        let encodingOutput = try EthereumAbiFunctionEncodingOutput(serializedData: outputData)
+        XCTAssertEqual(encodingOutput.error, EthereumAbiAbiError.ok)
+        XCTAssertEqual(encodingOutput.functionType, "swapExactTokensForTokens(uint256,uint256,address[],address,uint256)")
+        
+        let expectedEncoded = Data(hexString: "0x38ed17390000000000000000000000000000000000000000000000000de0b6b3a7640000000000000000000000000000000000000000000000000000229f7e501ad62bdb00000000000000000000000000000000000000000000000000000000000000a00000000000000000000000007d8bf18c7ce84b3e175b339c4ca93aed1dd166f1000000000000000000000000000000000000000000000000000000005f0ed07000000000000000000000000000000000000000000000000000000000000000040000000000000000000000006b175474e89094c44da98b954eedeac495271d0f0000000000000000000000009f8f72aa9304c8b593d555f12ef6589cc3a579a2000000000000000000000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000e41d2489571d322189246dafa5ebde1f4699f498")!
+        XCTAssertEqual(encodingOutput.encoded, expectedEncoded)
+    }
+    
+    func testEthereumAbiDecodeParams() throws {
+        let encoded = Data(hexString: "00000000000000000000000088341d1a8f672d2780c8dc725902aae72f143b0c0000000000000000000000000000000000000000000000000000000000000001")!
+        
+        let abiParams = [
+            EthereumAbiParam.with {
+                $0.name = "to"
+                $0.param = EthereumAbiParamType.with { $0.address = EthereumAbiAddressType.init() }
+            },
+            EthereumAbiParam.with {
+                $0.name = "approved"
+                $0.param = EthereumAbiParamType.with { $0.boolean = EthereumAbiBoolType.init() }
+            }
+        ]
+        let decodingInput = EthereumAbiParamsDecodingInput.with {
+            $0.encoded = encoded
+            $0.abiParams = EthereumAbiAbiParams.with { $0.params = abiParams }
+        }
+        
+        let inputData = try decodingInput.serializedData()
+        let outputData = EthereumAbi.decodeParams(coin: .ethereum, input: inputData)
+        
+        let decodingOutput = try EthereumAbiParamsDecodingOutput(serializedData: outputData)
+        XCTAssertEqual(decodingOutput.error, EthereumAbiAbiError.ok)
+        
+        XCTAssertEqual(decodingOutput.tokens[0].name, "to")
+        XCTAssertEqual(decodingOutput.tokens[0].address, "0x88341d1a8F672D2780C8dC725902AAe72F143B0c")
+        XCTAssertEqual(decodingOutput.tokens[1].name, "approved")
+        XCTAssertEqual(decodingOutput.tokens[1].boolean, true)
+    }
+    
+    func testEthereumAbiDecodeValue() throws {
+        let encoded = Data(hexString: "000000000000000000000000000000000000000000000000000000000000002c48656c6c6f20576f726c64212020202048656c6c6f20576f726c64212020202048656c6c6f20576f726c64210000000000000000000000000000000000000000")!
+
+        let decodingInput = EthereumAbiValueDecodingInput.with {
+            $0.encoded = encoded
+            $0.paramType = "string"
+        }
+        
+        let inputData = try decodingInput.serializedData()
+        let outputData = EthereumAbi.decodeValue(coin: .ethereum, input: inputData)
+        
+        let decodingOutput = try EthereumAbiValueDecodingOutput(serializedData: outputData)
+        XCTAssertEqual(decodingOutput.error, EthereumAbiAbiError.ok)
+        XCTAssertEqual(decodingOutput.token.stringValue, "Hello World!    Hello World!    Hello World!")
+    }
+    
+    func testEthereumAbiDecodeContractCall() throws {
+        let encoded = Data(hexString: "c47f0027000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000086465616462656566000000000000000000000000000000000000000000000000")!
+        let abiJson = """
+            {
+                "c47f0027": {
+                    "constant": false,
+                    "inputs": [
+                        {
+                            "name": "name",
+                            "type": "string"
+                        }
+                    ],
+                    "name": "setName",
+                    "outputs": [],
+                    "payable": false,
+                    "stateMutability": "nonpayable",
+                    "type": "function"
+                }
+            }
+        """
+        
+        let decodingInput = EthereumAbiContractCallDecodingInput.with {
+            $0.encoded = encoded
+            $0.smartContractAbiJson = abiJson
+        }
+        
+        let inputData = try decodingInput.serializedData()
+        let outputData = EthereumAbi.decodeContractCall(coin: .ethereum, input: inputData)
+        
+        let decodingOutput = try EthereumAbiContractCallDecodingOutput(serializedData: outputData)
+        XCTAssertEqual(decodingOutput.error, EthereumAbiAbiError.ok)
+        
+        let expectedJson = #"{"function":"setName(string)","inputs":[{"name":"name","type":"string","value":"deadbeef"}]}"#
+        XCTAssertEqual(decodingOutput.decodedJson, expectedJson)
+        XCTAssertEqual(decodingOutput.tokens[0].name, "name")
+        XCTAssertEqual(decodingOutput.tokens[0].stringValue, "deadbeef")
+    }
 }
diff --git a/swift/Tests/Blockchains/EthereumRlpTests.swift b/swift/Tests/Blockchains/EthereumRlpTests.swift
new file mode 100644
index 00000000000..b62e8d92e59
--- /dev/null
+++ b/swift/Tests/Blockchains/EthereumRlpTests.swift
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class EthereumRlpTests: XCTestCase {
+    func testRlpEncodeEip1559() throws {
+        let chainId = Data(hexString: "0x0a")!
+        let nonce = Data(hexString: "0x06")!
+        let maxInclusionFeePerGas = Data(hexString: "0x77359400")! // 2000000000
+        let maxFeePerGas = Data(hexString: "0xb2d05e00")! // 3000000000
+        let gasLimit = Data(hexString: "0x526c")! // 21100
+        let to = "0x6b175474e89094c44da98b954eedeac495271d0f"
+        let amount = Data(hexString: "0x00")!
+        let payload = Data(hexString: "a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1")!
+        // Empty `access_list`.
+        let accessList = EthereumRlpRlpList()
+        
+        let rlpList = EthereumRlpRlpList.with {
+            $0.items = [
+                EthereumRlpRlpItem.with { $0.numberU256 = chainId },
+                EthereumRlpRlpItem.with { $0.numberU256 = nonce },
+                EthereumRlpRlpItem.with { $0.numberU256 = maxInclusionFeePerGas },
+                EthereumRlpRlpItem.with { $0.numberU256 = maxFeePerGas },
+                EthereumRlpRlpItem.with { $0.numberU256 = gasLimit },
+                EthereumRlpRlpItem.with { $0.address = to },
+                EthereumRlpRlpItem.with { $0.numberU256 = amount },
+                EthereumRlpRlpItem.with { $0.data = payload },
+                EthereumRlpRlpItem.with { $0.list = accessList },
+            ]
+        }
+        
+        let encodingInput = EthereumRlpEncodingInput.with {
+            $0.item.list = rlpList
+        }
+        let inputData = try encodingInput.serializedData()
+        let outputData = EthereumRlp.encode(coin: .ethereum, input: inputData)
+        
+        let encodingOutput = try EthereumRlpEncodingOutput(serializedData: outputData)
+        XCTAssertEqual(encodingOutput.error, CommonSigningError.ok)
+        XCTAssertEqual(encodingOutput.encoded.hexString, "f86c0a06847735940084b2d05e0082526c946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1c0")
+    }
+}
diff --git a/swift/Tests/Blockchains/EthereumTests.swift b/swift/Tests/Blockchains/EthereumTests.swift
index b16ba0bf7db..9d5e73a326a 100644
--- a/swift/Tests/Blockchains/EthereumTests.swift
+++ b/swift/Tests/Blockchains/EthereumTests.swift
@@ -1,14 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
 
 class EthereumTests: XCTestCase {
-
+    
     func testAddress() {
         let anyAddress = AnyAddress(string: "0x7d8bf18c7ce84b3e175b339c4ca93aed1dd166f1", coin: .ethereum)
 
@@ -158,6 +156,67 @@ class EthereumTests: XCTestCase {
         XCTAssertEqual(output.data.hexString, "f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000")
     }
 
+    func testSignStakeRocketPool() {
+        let function = EthereumAbiFunction(name: "deposit")
+
+        let input = EthereumSigningInput.with {
+            $0.chainID = Data(hexString: "01")!
+            $0.nonce = Data(hexString: "01")!
+            $0.txMode = .enveloped
+            $0.gasPrice = Data(hexString: "77541880")! // 2002000000
+            $0.gasLimit = Data(hexString: "0320c8")! // 205000
+            $0.maxFeePerGas = Data(hexString: "067ef83700")! // 27900000000
+            $0.maxInclusionFeePerGas = Data(hexString: "3b9aca00")! // 1000000000
+            $0.toAddress = "0x2cac916b2a963bf162f076c0a8a4a8200bcfbfb4" // contract
+            $0.privateKey = Data(hexString: "9f56448d33de406db1561aae15fce64bdf0e9706ff15c45d4409e8fcbfd1a498")!
+
+            $0.transaction = EthereumTransaction.with {
+                $0.transfer = EthereumTransaction.Transfer.with {
+                    $0.amount = Data(hexString: "2386f26fc10000")! // 0.01 ETH
+                    $0.data = Data(hexString: EthereumAbi.encode(fn: function).hexString)!
+                }
+            }
+        }
+        let output: EthereumSigningOutput = AnySigner.sign(input: input, coin: .ethereum)
+
+        // https://etherscan.io/tx/0xfeba0c579f3e964fbc4eafa500e86891b9f4113735b1364edd4433d765506f1e
+        XCTAssertEqual(output.r.hexString, "fb39e5079d7a0598ec45785d73a06b91fe1db707b9c6a150c87ffce2492c66d6")
+        XCTAssertEqual(output.v.hexString, "00")
+        XCTAssertEqual(output.s.hexString, "7fbd43a6f4733b2b4f98ad1bc4678ea2615f5edf56ad91408337adec2f07c0ac")
+        XCTAssertEqual(output.encoded.hexString, "02f8770101843b9aca0085067ef83700830320c8942cac916b2a963bf162f076c0a8a4a8200bcfbfb4872386f26fc1000084d0e30db0c080a0fb39e5079d7a0598ec45785d73a06b91fe1db707b9c6a150c87ffce2492c66d6a07fbd43a6f4733b2b4f98ad1bc4678ea2615f5edf56ad91408337adec2f07c0ac")
+    }
+
+    func testSignUnstakeRocketPool() {
+        let function = EthereumAbiFunction(name: "burn")
+        function.addParamUInt256(val: Data(hexString: "0x21faa32ab2502b")!, isOutput: false)
+
+        let input = EthereumSigningInput.with {
+            $0.chainID = Data(hexString: "01")!
+            $0.nonce = Data(hexString: "03")!
+            $0.txMode = .enveloped
+            $0.gasPrice = Data(hexString: "77541880")! // 2002000000
+            $0.gasLimit = Data(hexString: "055730")! // 350000
+            $0.maxFeePerGas = Data(hexString: "067ef83700")! // 27900000000
+            $0.maxInclusionFeePerGas = Data(hexString: "3b9aca00")! // 1000000000
+            $0.toAddress = "0xae78736Cd615f374D3085123A210448E74Fc6393" // contract
+            $0.privateKey = Data(hexString: "9f56448d33de406db1561aae15fce64bdf0e9706ff15c45d4409e8fcbfd1a498")!
+
+            $0.transaction = EthereumTransaction.with {
+                $0.contractGeneric = EthereumTransaction.ContractGeneric.with {
+                    $0.amount = Data(hexString: "00")!
+                    $0.data = Data(hexString: EthereumAbi.encode(fn: function).hexString)!
+                }
+            }
+        }
+        let output: EthereumSigningOutput = AnySigner.sign(input: input, coin: .ethereum)
+
+        // https://etherscan.io/tx/0x7fd3c0e9b8b309b4258baa7677c60f5e00e8db7b647fbe3a52adda25058a4b37
+        XCTAssertEqual(output.r.hexString, "1fc6e94908107584357799e952b4e3fb87f088aeb66d7930a7015643f19c9e7f")
+        XCTAssertEqual(output.v.hexString, "00")
+        XCTAssertEqual(output.s.hexString, "2c56a0b70ff2e52bf374a3dcd404bc42317d5ca15d319f5e33665352eb48f06f")
+        XCTAssertEqual(output.encoded.hexString, "02f8900103843b9aca0085067ef837008305573094ae78736cd615f374d3085123a210448e74fc639380a442966c680000000000000000000000000000000000000000000000000021faa32ab2502bc080a01fc6e94908107584357799e952b4e3fb87f088aeb66d7930a7015643f19c9e7fa02c56a0b70ff2e52bf374a3dcd404bc42317d5ca15d319f5e33665352eb48f06f")
+    }
+
     func testSignJSON() {
         let json = """
         {
@@ -213,4 +272,101 @@ class EthereumTests: XCTestCase {
         XCTAssertEqual(ethAddress, "0xa4531dE99E22B2166d340E7221669DF565c52024")
         XCTAssertEqual(btcAddress, "bc1q97jc0jdgsyvvhxydxxd6np8sa920c39l3qpscf")
     }
+    
+    func testMessageAndVerifySignerImmutableX() {
+        let privateKey = PrivateKey(data: Data(hexString: "3b0a61f46fdae924007146eacb6db6642de7a5603ad843ec58e10331d89d4b84")!)!
+        let msg = "Only sign this request if you’ve initiated an action with Immutable X.\n\nFor internal use:\nbd717ba31dca6e0f3f136f7c4197babce5f09a9f25176044c0b3112b1b6017a3"
+        let signature = EthereumMessageSigner.signMessageImmutableX(privateKey: privateKey, message: msg)
+        XCTAssertEqual(signature, "32cd5a58f3419fc5db672e3d57f76199b853eda0856d491b38f557b629b0a0814ace689412bf354a1af81126d2749207dffae8ae8845160f33948a6b787e17ee01")
+        let pubKey = privateKey.getPublicKey(coinType: .ethereum)
+        XCTAssertTrue(EthereumMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
+    }
+    
+    func testMessageAndVerifySignerLegacy() {
+        let privateKey = PrivateKey(data: Data(hexString: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")!)!
+        let msg = "Foo"
+        let signature = EthereumMessageSigner.signMessage(privateKey: privateKey, message: msg)
+        XCTAssertEqual(signature, "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be71101b")
+        let pubKey = privateKey.getPublicKey(coinType: .ethereum)
+        XCTAssertTrue(EthereumMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
+    }
+    
+    func testMessageAndVerifySignerEip155() {
+        let privateKey = PrivateKey(data: Data(hexString: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")!)!
+        let msg = "Foo"
+        let signature = EthereumMessageSigner.signMessageEip155(privateKey: privateKey, message: msg, chainId: 0)
+        XCTAssertEqual(signature, "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be711023")
+        let pubKey = privateKey.getPublicKey(coinType: .ethereum)
+        XCTAssertTrue(EthereumMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
+    }
+    
+    func testMessageAndVerifySigner712Legacy() {
+        let privateKey = PrivateKey(data: Data(hexString: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")!)!
+        let msg = """
+         {
+                        "types": {
+                            "EIP712Domain": [
+                                {"name": "name", "type": "string"},
+                                {"name": "version", "type": "string"},
+                                {"name": "chainId", "type": "uint256"},
+                                {"name": "verifyingContract", "type": "address"}
+                            ],
+                            "Person": [
+                                {"name": "name", "type": "string"},
+                                {"name": "wallet", "type": "address"}
+                            ]
+                        },
+                        "primaryType": "Person",
+                        "domain": {
+                            "name": "Ether Person",
+                            "version": "1",
+                            "chainId": 0,
+                            "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                        },
+                        "message": {
+                            "name": "Cow",
+                            "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                        }
+                    }
+        """
+        let signature = EthereumMessageSigner.signTypedMessage(privateKey: privateKey, messageJson: msg)
+        XCTAssertEqual(signature, "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf3761c")
+        let pubKey = privateKey.getPublicKey(coinType: .ethereum)
+        XCTAssertTrue(EthereumMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
+    }
+    
+    func testMessageAndVerifySigner712Eip155() {
+        let privateKey = PrivateKey(data: Data(hexString: "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d")!)!
+        let msg = """
+         {
+                        "types": {
+                            "EIP712Domain": [
+                                {"name": "name", "type": "string"},
+                                {"name": "version", "type": "string"},
+                                {"name": "chainId", "type": "uint256"},
+                                {"name": "verifyingContract", "type": "address"}
+                            ],
+                            "Person": [
+                                {"name": "name", "type": "string"},
+                                {"name": "wallet", "type": "address"}
+                            ]
+                        },
+                        "primaryType": "Person",
+                        "domain": {
+                            "name": "Ether Person",
+                            "version": "1",
+                            "chainId": 0,
+                            "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                        },
+                        "message": {
+                            "name": "Cow",
+                            "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                        }
+                    }
+        """
+        let signature = EthereumMessageSigner.signTypedMessageEip155(privateKey: privateKey, messageJson: msg, chainId: 0)
+        XCTAssertEqual(signature, "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf37624")
+        let pubKey = privateKey.getPublicKey(coinType: .ethereum)
+        XCTAssertTrue(EthereumMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
+    }
 }
diff --git a/swift/Tests/Blockchains/EverscaleTests.swift b/swift/Tests/Blockchains/EverscaleTests.swift
index d3ce3f32293..2fc44ddf7b5 100644
--- a/swift/Tests/Blockchains/EverscaleTests.swift
+++ b/swift/Tests/Blockchains/EverscaleTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/EvmosTests.swift b/swift/Tests/Blockchains/EvmosTests.swift
index ae10bdc08aa..e1df1d44943 100644
--- a/swift/Tests/Blockchains/EvmosTests.swift
+++ b/swift/Tests/Blockchains/EvmosTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -71,6 +69,6 @@ class EvmosTests: XCTestCase {
         {"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpoBCpcBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEncKLGV2bW9zMXJrMzlkazN3ZmY1bnBzN2VtdWh2M250a24zbnN6NnoyZXJxZnIwEixldm1vczEwazlscnJydWFwOW51OTZteHd3eWUyZjZhNXdhemVoMzNrcTY3ehoZCgZhZXZtb3MSDzIwMDAwMDAwMDAwMDAwMBJ7ClcKTwooL2V0aGVybWludC5jcnlwdG8udjEuZXRoc2VjcDI1NmsxLlB1YktleRIjCiEClHXJ+iPsaTZnuqdsTaabSczP3wWMTcsnumfPvJCC2e0SBAoCCAESIAoaCgZhZXZtb3MSEDE0MDAwMDAwMDAwMDAwMDAQ4MUIGkAz9vh1EutbLrLZmRA4eK72bA6bhfMX0YnhtRl5jeaL3AYmk0qdrwG9XzzleBsZ++IokJIk47cgOOyvEjl92Jhj"}
         """
         XCTAssertJSONEqual(output.serialized, expected)
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 }
diff --git a/swift/Tests/Blockchains/FIOTests.swift b/swift/Tests/Blockchains/FIOTests.swift
index 3edbc7cd9d1..4a35e145ea8 100644
--- a/swift/Tests/Blockchains/FIOTests.swift
+++ b/swift/Tests/Blockchains/FIOTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/FilecoinTests.swift b/swift/Tests/Blockchains/FilecoinTests.swift
index ab5a83f6f53..2998bdfec56 100644
--- a/swift/Tests/Blockchains/FilecoinTests.swift
+++ b/swift/Tests/Blockchains/FilecoinTests.swift
@@ -1,21 +1,36 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
 
 class FilecoinTests: XCTestCase {
 
-    func testAddress() {
+    func testCreateAddress() {
         let privateKey = PrivateKey(data: Data(hexString: "1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe")!)!
         let publicKey = privateKey.getPublicKeySecp256k1(compressed: false)
         let address = AnyAddress(publicKey: publicKey, coin: .filecoin)
         XCTAssertEqual(address.description, "f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq")
     }
 
+    func testCreateDelegatedAddress() {
+        let privateKey = PrivateKey(data: Data(hexString: "825d2bb32965764a98338139412c7591ed54c951dd65504cd8ddaeaa0fea7b2a")!)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: false)
+        let address = AnyAddress(publicKey: publicKey, filecoinAddressType: .delegated)
+        XCTAssertEqual(address.description, "f410fvak24cyg3saddajborn6idt7rrtfj2ptauk5pbq")
+    }
+
+    func testAddressConverter() {
+        let actualEth = FilecoinAddressConverter.convertToEthereum(filecoinAddress: "f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky")
+        XCTAssertEqual(actualEth, "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0")
+        XCTAssert(AnyAddress.isValid(string: actualEth, coin: .ethereum))
+        
+        let actualFilecoin = FilecoinAddressConverter.convertFromEthereum(ethAddress:"0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0")
+        XCTAssertEqual(actualFilecoin, "f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky")
+        XCTAssert(AnyAddress.isValid(string: actualFilecoin, coin: .filecoin))
+    }
+
     func testSigner() {
         let input = FilecoinSigningInput.with {
             $0.privateKey = Data(hexString: "1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe")!
@@ -36,6 +51,7 @@ class FilecoinTests: XCTestCase {
                 "GasFeeCap": "700000000000000000000",
                 "GasLimit": 1000,
                 "GasPremium": "800000000000000000000",
+                "Method": 0,
                 "Nonce": 2,
                 "To": "f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq",
                 "Value": "600000000000000000000"
@@ -48,4 +64,39 @@ class FilecoinTests: XCTestCase {
         """
         XCTAssertJSONEqual(output.json, json)
     }
+
+    /// Successfully broadcasted:
+    /// https://filfox.info/en/message/bafy2bzaceczvto7d2af7cq3kuwlvmanlh5xica4apl3vwxu37yaeozq72mvgm
+    func testSignerToDelegated() {
+        let input = FilecoinSigningInput.with {
+            $0.privateKey = Data(hexString: "d3d6ed8b97dcd4661f62a1162bee6949401fd3935f394e6eacf15b6d5005483c")!
+            $0.to = "f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky"
+            $0.nonce = 0
+            $0.value = Data(hexString: "038d7ea4c68000")! // 0.001 FIL
+            $0.gasLimit = 6152567
+            $0.gasFeeCap = Data(hexString: "01086714e9")! // 4435940585
+            $0.gasPremium = Data(hexString: "b0f553")! // 11597139
+        }
+
+        let output: FilecoinSigningOutput = AnySigner.sign(input: input, coin: .filecoin)
+        let json = """
+        {
+            "Message": {
+                "From": "f1mzyorxlcvdoqn5cto7urefbucugrcxxghpjc5hi",
+                "GasFeeCap": "4435940585",
+                "GasLimit": 6152567,
+                "GasPremium": "11597139",
+                "Method": 3844450837,
+                "Nonce": 0,
+                "To": "f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky",
+                "Value": "1000000000000000"
+            },
+            "Signature": {
+                "Data": "bxZhnsOYjdArPa3W0SpggwqtXPgvfRSoM2dU5lXYar9lWhTGc6FvPWk2RTUGyA8UtzMIdOPSUKfzU1iA2eA3YwA=",
+                "Type": 1
+            }
+        }
+        """
+        XCTAssertJSONEqual(output.json, json)
+    }
 }
diff --git a/swift/Tests/Blockchains/GreenfieldTests.swift b/swift/Tests/Blockchains/GreenfieldTests.swift
new file mode 100644
index 00000000000..dce11dcfc84
--- /dev/null
+++ b/swift/Tests/Blockchains/GreenfieldTests.swift
@@ -0,0 +1,96 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class GreenfieldTests: XCTestCase {
+    func testSignSend() {
+        // Successfully broadcasted: https://greenfieldscan.com/tx/ED8508F3C174C4430B8EE718A6D6F0B02A8C516357BE72B1336CF74356529D19
+
+        let sendCoinsMessage = GreenfieldMessage.Send.with {
+            $0.fromAddress = "0xA815ae0b06dC80318121745BE40e7F8c6654e9f3"
+            $0.toAddress = "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0"
+            $0.amounts = [GreenfieldAmount.with {
+                $0.amount = "1234500000000000"
+                $0.denom = "BNB"
+            }]
+        }
+
+        let message = GreenfieldMessage.with {
+            $0.sendCoinsMessage = sendCoinsMessage
+        }
+
+        let fee = GreenfieldFee.with {
+            $0.gas = 1200
+            $0.amounts = [GreenfieldAmount.with {
+                $0.amount = "6000000000000"
+                $0.denom = "BNB"
+            }]
+        }
+
+        let input = GreenfieldSigningInput.with {
+            $0.signingMode = .eip712;
+            $0.encodingMode = .protobuf
+            $0.mode = .sync
+            $0.accountNumber = 15952
+            $0.ethChainID = "5600"
+            $0.cosmosChainID = "greenfield_5600-1"
+            $0.memo = "Trust Wallet test memo"
+            $0.sequence = 0
+            $0.messages = [message]
+            $0.fee = fee
+            $0.privateKey = Data(hexString: "825d2bb32965764a98338139412c7591ed54c951dd65504cd8ddaeaa0fea7b2a")!
+        }
+
+        let output: GreenfieldSigningOutput = AnySigner.sign(input: input, coin: .greenfield)
+
+        XCTAssertJSONEqual(output.serialized, "{\"tx_bytes\": \"CqwBCpEBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnEKKjB4QTgxNWFlMGIwNmRDODAzMTgxMjE3NDVCRTQwZTdGOGM2NjU0ZTlmMxIqMHg4ZGJENmM3RWRlOTA2NDZhNjFCYmM2NDk4MzFiN2MyOThCRmQzN0EwGhcKA0JOQhIQMTIzNDUwMDAwMDAwMDAwMBIWVHJ1c3QgV2FsbGV0IHRlc3QgbWVtbxJzClYKTQomL2Nvc21vcy5jcnlwdG8uZXRoLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohAhm/mQgs8vzaqBLW66HrqQNv86PYTBgXyElU1OiuKD/sEgUKAwjIBRIZChQKA0JOQhINNjAwMDAwMDAwMDAwMBCwCRpBwbRb1qEAWwaqVfmp1Mn7iMi7wwV/oPi2J2eW9NBIdNoky+ZL+uegS/kY+funCOrqVZ+Kbol9/djAV+bQaNUB0xw=\", \"mode\": \"BROADCAST_MODE_SYNC\"}")
+        XCTAssertEqual(output.errorMessage, "")
+    }
+    
+    func testSignTransferOut() {
+        // Successfully broadcasted Greenfield: https://greenfieldscan.com/tx/38C29C530A74946CFD22EE07DA642F5EF9399BC9AEA59EC56A9B5BE16DE16CE7
+        // BSC (parent transaction): https://testnet.bscscan.com/tx/0x7f73c8a362e14e58cb5e0ec17616afc50eff7aa398db472383a6d017c8a5861a
+
+        let transferOutMessage = GreenfieldMessage.BridgeTransferOut.with {
+            $0.fromAddress = "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1"
+            $0.toAddress = "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1"
+            $0.amount = GreenfieldAmount.with {
+                $0.amount = "5670000000000000"
+                $0.denom = "BNB"
+            }
+        }
+
+        let message = GreenfieldMessage.with {
+            $0.bridgeTransferOut = transferOutMessage
+        }
+
+        let fee = GreenfieldFee.with {
+            $0.gas = 1200
+            $0.amounts = [GreenfieldAmount.with {
+                $0.amount = "6000000000000"
+                $0.denom = "BNB"
+            }]
+        }
+
+        let input = GreenfieldSigningInput.with {
+            $0.signingMode = .eip712;
+            $0.encodingMode = .protobuf
+            $0.mode = .sync
+            $0.accountNumber = 15560
+            $0.ethChainID = "5600"
+            $0.cosmosChainID = "greenfield_5600-1"
+            $0.sequence = 7
+            $0.messages = [message]
+            $0.fee = fee
+            $0.privateKey = Data(hexString: "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0")!
+        }
+
+        let output: GreenfieldSigningOutput = AnySigner.sign(input: input, coin: .greenfield)
+
+        XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_SYNC\",\"tx_bytes\":\"CpkBCpYBCiEvZ3JlZW5maWVsZC5icmlkZ2UuTXNnVHJhbnNmZXJPdXQScQoqMHg5ZDFkOTdhREZjZDMyNEJiZDYwM0QzODcyQkQ3OGUwNDA5ODUxMGIxEioweDlkMWQ5N2FERmNkMzI0QmJkNjAzRDM4NzJCRDc4ZTA0MDk4NTEwYjEaFwoDQk5CEhA1NjcwMDAwMDAwMDAwMDAwEnUKWApNCiYvY29zbW9zLmNyeXB0by5ldGguZXRoc2VjcDI1NmsxLlB1YktleRIjCiECee80Bk2hDbBGPHBIBha6AgcD7DpFAm3ve+vSCC9db8gSBQoDCMgFGAcSGQoUCgNCTkISDTYwMDAwMDAwMDAwMDAQsAkaQc4DDByhu80Uy/M3sQePvAmhmbFWZeGq359rugtskEiXKfCzSB86XmBi+l+Q5ETDS2folMxbufHSE8gM4WBCHzgc\"}")
+        XCTAssertEqual(output.errorMessage, "")
+    }
+}
diff --git a/swift/Tests/Blockchains/GroestlcoinTests.swift b/swift/Tests/Blockchains/GroestlcoinTests.swift
index ed0d9b250d5..5490f79e1b3 100644
--- a/swift/Tests/Blockchains/GroestlcoinTests.swift
+++ b/swift/Tests/Blockchains/GroestlcoinTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/GroestlcoinTransactionSignerTests.swift b/swift/Tests/Blockchains/GroestlcoinTransactionSignerTests.swift
index 09bdb7119ee..b1e89358d4c 100644
--- a/swift/Tests/Blockchains/GroestlcoinTransactionSignerTests.swift
+++ b/swift/Tests/Blockchains/GroestlcoinTransactionSignerTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -14,6 +12,7 @@ class GroestlcoinTransactionSignerTests: XCTestCase {
 
     func testSignP2WPKH() throws {
         var input = BitcoinSigningInput.with {
+            $0.coinType = CoinType.groestlcoin.rawValue
             $0.hashType = BitcoinScript.hashTypeForCoin(coinType: .groestlcoin)
             $0.amount = 2500
             $0.byteFee = 1
@@ -67,6 +66,7 @@ class GroestlcoinTransactionSignerTests: XCTestCase {
 
     func testSignP2PKH() throws {
         var input = BitcoinSigningInput.with {
+            $0.coinType = CoinType.groestlcoin.rawValue
             $0.hashType = BitcoinScript.hashTypeForCoin(coinType: .groestlcoin)
             $0.amount = 2500
             $0.byteFee = 1
@@ -118,6 +118,7 @@ class GroestlcoinTransactionSignerTests: XCTestCase {
 
     func testSignP2SH_P2WPKH() throws {
         var input = BitcoinSigningInput.with {
+            $0.coinType = CoinType.groestlcoin.rawValue
             $0.hashType = BitcoinScript.hashTypeForCoin(coinType: .groestlcoin)
             $0.amount = 5000
             $0.byteFee = 1
diff --git a/swift/Tests/Blockchains/HarmonyTests.swift b/swift/Tests/Blockchains/HarmonyTests.swift
index c74eca95520..e0faa2c289d 100644
--- a/swift/Tests/Blockchains/HarmonyTests.swift
+++ b/swift/Tests/Blockchains/HarmonyTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/HederaTests.swift b/swift/Tests/Blockchains/HederaTests.swift
new file mode 100644
index 00000000000..7db774a98b9
--- /dev/null
+++ b/swift/Tests/Blockchains/HederaTests.swift
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class HederaTests: XCTestCase {
+    func testAddress() {
+        let anyAddress = AnyAddress(string: "0.0.1377988", coin: .hedera)
+
+        XCTAssertEqual(anyAddress?.description, "0.0.1377988")
+        XCTAssertEqual(anyAddress?.coin, .hedera)
+
+        let invalid = "0.0.a"
+        XCTAssertNil(Data(hexString: invalid))
+        XCTAssertNil(AnyAddress(string: invalid, coin: .hedera))
+        XCTAssertFalse(AnyAddress.isValid(string: invalid, coin: .hedera))
+    }
+
+    func testSignSimpleTransfer() {
+        // Successfully broadcasted: https://hashscan.io/testnet/transaction/0.0.48694347-1667222879-749068449?t=1667222891.440398729&p=1
+        let privateKeyData = Data(hexString: "e87a5584c0173263e138db689fdb2a7389025aaae7cb1a18a1017d76012130e8")!
+        
+        let transfer = HederaTransferMessage.with {
+            $0.amount = 100000000
+            $0.from = "0.0.48694347"
+            $0.to = "0.0.48462050"
+        }
+        
+        let transactionID = HederaTransactionID.with {
+            $0.accountID = "0.0.48694347"
+            $0.transactionValidStart = HederaTimestamp.with {
+                $0.seconds = 1667222879
+                $0.nanos = 749068449
+            }
+        }
+        
+        let body = HederaTransactionBody.with {
+            $0.memo = ""
+            $0.nodeAccountID = "0.0.9"
+            $0.transactionFee = 100000000
+            $0.transactionValidDuration = 120
+            $0.transactionID = transactionID
+            $0.transfer = transfer
+        }
+        
+        let input = HederaSigningInput.with {
+            $0.privateKey = privateKeyData
+            $0.body = body
+        }
+        
+        let output: HederaSigningOutput = AnySigner.sign(input: input, coin: .hedera)
+        let expectedEncoded = "0a440a150a0c08df9aff9a0610a1c197e502120518cb889c17120218091880c2d72f22020878721e0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f12660a640a205d3a70d08b2beafb72c7a68986b3ff819a306078b8c359d739e4966e82e6d40e1a40612589c3b15f1e3ed6084b5a3a5b1b81751578cac8d6c922f31731b3982a5bac80a22558b2197276f5bae49b62503a4d39448ceddbc5ef3ba9bee4c0f302f70c"
+        XCTAssertEqual(output.encoded.hexString, expectedEncoded)
+    }
+}
diff --git a/swift/Tests/Blockchains/IconTests.swift b/swift/Tests/Blockchains/IconTests.swift
index 4745b55be81..3e19c5d48bb 100644
--- a/swift/Tests/Blockchains/IconTests.swift
+++ b/swift/Tests/Blockchains/IconTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/InternetComputerTests.swift b/swift/Tests/Blockchains/InternetComputerTests.swift
new file mode 100644
index 00000000000..e4942450abf
--- /dev/null
+++ b/swift/Tests/Blockchains/InternetComputerTests.swift
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class InternetComputerTests: XCTestCase {
+    // TODO: Check and finalize implementation
+
+    func testAddress() {
+        // TODO: Check and finalize implementation
+
+        let key = PrivateKey(data: Data(hexString: "ee42eaada903e20ef6e5069f0428d552475c1ea7ed940842da6448f6ef9d48e7")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: false)
+        let address = AnyAddress(publicKey: pubkey, coin: .internetComputer)
+        let addressFromString = AnyAddress(string: "2f25874478d06cf68b9833524a6390d0ba69c566b02f46626979a3d6a4153211", coin: .internetComputer)!
+
+        XCTAssertEqual(pubkey.data.hexString, "048542e6fb4b17d6dfcac3948fe412c00d626728815ee7cc70509603f1bc92128a6e7548f3432d6248bc49ff44a1e50f6389238468d17f7d7024de5be9b181dbc8")
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSign() {
+        let key = PrivateKey(data: Data(hexString: "227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be")!)!
+        let input = InternetComputerSigningInput.with {
+            $0.privateKey = key.data
+            $0.transaction = InternetComputerTransaction.with {
+                $0.transfer = InternetComputerTransaction.Transfer.with {
+                    $0.toAccountIdentifier = "943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a"
+                    $0.amount = 100000000
+                    $0.memo = 0
+                    $0.currentTimestampNanos = 1691709940000000000
+                }
+            }
+                
+        }
+        let output: InternetComputerSigningOutput = AnySigner.sign(input: input, coin: .internetComputer)
+        XCTAssertEqual(output.signedTransaction.hexString, "81826b5452414e53414354494f4e81a266757064617465a367636f6e74656e74a66c726571756573745f747970656463616c6c6e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d026b63616e69737465725f69644a000000000000000201016b6d6574686f645f6e616d656773656e645f706263617267583b0a0012070a050880c2d72f2a220a20943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a3a0a088090caa5a3a78abd176d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f736967984013186f18b9181c189818b318a8186518b2186118d418971618b1187d18eb185818e01826182f1873183b185018cb185d18ef18d81839186418b3183218da1824182f184e18a01880182718c0189018c918a018fd18c418d9189e189818b318ef1874183b185118e118a51864185918e718ed18c71889186c1822182318ca6a726561645f7374617465a367636f6e74656e74a46c726571756573745f747970656a726561645f73746174656e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d0265706174687381824e726571756573745f7374617475735820e8fbc2d5b0bf837b3a369249143e50d4476faafb2dd620e4e982586a51ebcf1e6d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f7369679840182d182718201888188618ce187f0c182a187a18d718e818df18fb18d318d41118a5186a184b18341842185318d718e618e8187a1828186c186a183618461418f3183318bd18a618a718bc18d918c818b7189d186e1865188418ff18fd18e418e9187f181b18d705184818b21872187818d6181c161833184318a2")
+    }
+    
+    func testSignWithInvalidToAccountIdentifier() {
+        let key = PrivateKey(data: Data(hexString: "227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be")!)!
+        let input = InternetComputerSigningInput.with {
+            $0.privateKey = key.data
+            $0.transaction = InternetComputerTransaction.with {
+                $0.transfer = InternetComputerTransaction.Transfer.with {
+                    $0.toAccountIdentifier = "643d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826b"
+                    $0.amount = 100000000
+                    $0.memo = 0
+                    $0.currentTimestampNanos = 1691709940000000000
+                }
+            }
+                
+        }
+        let output: InternetComputerSigningOutput = AnySigner.sign(input: input, coin: .internetComputer)
+        XCTAssertEqual(output.error.rawValue, 16)
+    }
+    
+    func testSignWithInvalidAmount() {
+        let key = PrivateKey(data: Data(hexString: "227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be")!)!
+        let input = InternetComputerSigningInput.with {
+            $0.privateKey = key.data
+            $0.transaction = InternetComputerTransaction.with {
+                $0.transfer = InternetComputerTransaction.Transfer.with {
+                    $0.toAccountIdentifier = "943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a"
+                    $0.amount = 0
+                    $0.memo = 0
+                    $0.currentTimestampNanos = 1691709940000000000
+                }
+            }
+                
+        }
+        let output: InternetComputerSigningOutput = AnySigner.sign(input: input, coin: .internetComputer)
+        XCTAssertEqual(output.error.rawValue, 23)
+    }
+}
diff --git a/swift/Tests/Blockchains/IoTeXTests.swift b/swift/Tests/Blockchains/IoTeXTests.swift
index 0c91d1f18f1..017df545223 100644
--- a/swift/Tests/Blockchains/IoTeXTests.swift
+++ b/swift/Tests/Blockchains/IoTeXTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/KavaTests.swift b/swift/Tests/Blockchains/KavaTests.swift
index f9a5f8957a5..1b23b5e3632 100644
--- a/swift/Tests/Blockchains/KavaTests.swift
+++ b/swift/Tests/Blockchains/KavaTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/KinTests.swift b/swift/Tests/Blockchains/KinTests.swift
index 7dfec26b99b..2f6bf523852 100644
--- a/swift/Tests/Blockchains/KinTests.swift
+++ b/swift/Tests/Blockchains/KinTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/KuCoinCommunityChainTests.swift b/swift/Tests/Blockchains/KuCoinCommunityChainTests.swift
index df42dfc52fb..6faee34cac3 100644
--- a/swift/Tests/Blockchains/KuCoinCommunityChainTests.swift
+++ b/swift/Tests/Blockchains/KuCoinCommunityChainTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/KusamaTests.swift b/swift/Tests/Blockchains/KusamaTests.swift
index 0b93a1cd118..b881a2451fb 100644
--- a/swift/Tests/Blockchains/KusamaTests.swift
+++ b/swift/Tests/Blockchains/KusamaTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -51,7 +49,7 @@ class KusamaTests: XCTestCase {
                     $0.value = Data(hexString: "0x02540be400")!
                 }
             }
-            $0.network = .kusama
+            $0.network = CoinType.kusama.ss58Prefix
             $0.transactionVersion = 2
             $0.privateKey = key.data
         }
diff --git a/swift/Tests/Blockchains/LitecoinTests.swift b/swift/Tests/Blockchains/LitecoinTests.swift
index 01fb5b275b0..f4087fe1a04 100644
--- a/swift/Tests/Blockchains/LitecoinTests.swift
+++ b/swift/Tests/Blockchains/LitecoinTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/MonacoinTests.swift b/swift/Tests/Blockchains/MonacoinTests.swift
index e34a22a022b..b08d139ab98 100644
--- a/swift/Tests/Blockchains/MonacoinTests.swift
+++ b/swift/Tests/Blockchains/MonacoinTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/MultiversXTests.swift b/swift/Tests/Blockchains/MultiversXTests.swift
new file mode 100644
index 00000000000..7b8cbf09ffc
--- /dev/null
+++ b/swift/Tests/Blockchains/MultiversXTests.swift
@@ -0,0 +1,243 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class MultiversXTests: XCTestCase {
+
+    let aliceBech32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
+    let alicePubKeyHex = "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1"
+    let aliceSeedHex = "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9"
+    let bobBech32 = "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx"
+    let carolBech32 = "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8"
+
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+        let pubkey = key.getPublicKeyEd25519()
+        let address = AnyAddress(publicKey: pubkey, coin: .multiversX)
+        let addressFromString = AnyAddress(string: aliceBech32, coin: .multiversX)!
+
+        XCTAssertEqual(pubkey.data.hexString, alicePubKeyHex)
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSignGenericAction() {
+        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+
+        let input = MultiversXSigningInput.with {
+            $0.genericAction = MultiversXGenericAction.with {
+                $0.accounts = MultiversXAccounts.with {
+                    $0.senderNonce = 7
+                    $0.sender = aliceBech32
+                    $0.receiver = bobBech32
+                }
+                $0.value = "0"
+                $0.data = "foo"
+                $0.version = 1
+            }
+            $0.gasPrice = 1000000000
+            $0.gasLimit = 50000
+            $0.chainID = "1"
+            $0.privateKey = privateKey.data
+        }
+
+        let output: MultiversXSigningOutput = AnySigner.sign(input: input, coin: .multiversX)
+        let expectedSignature = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700"
+        let expectedEncoded = #"{"nonce":7,"value":"0","receiver":"\#(bobBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"\#(expectedSignature)"}"#
+
+        XCTAssertEqual(output.signature, expectedSignature)
+        XCTAssertEqual(output.encoded, expectedEncoded)
+    }
+
+    func testSignGenericActionWithGuardian() {
+        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+
+        let input = MultiversXSigningInput.with {
+            $0.genericAction = MultiversXGenericAction.with {
+                $0.accounts = MultiversXAccounts.with {
+                    $0.senderNonce = 42
+                    $0.sender = aliceBech32
+                    $0.receiver = bobBech32
+                    $0.guardian = carolBech32
+                }
+                $0.value = "1000000000000000000"
+                $0.data = ""
+                $0.version = 2
+                $0.options = 2
+            }
+            $0.gasPrice = 1000000000
+            $0.gasLimit = 100000
+            $0.chainID = "1"
+            $0.privateKey = privateKey.data
+        }
+
+        let output: MultiversXSigningOutput = AnySigner.sign(input: input, coin: .multiversX)
+        let expectedSignature = "dae30e5cddb4a1f050009f939ce2c90843770870f9e6c77366be07e5cd7b3ebfdda38cd45d04e9070037d57761b6a68cee697e6043057f9dc565a4d0e632480d"
+        let expectedEncoded = #"{"nonce":42,"value":"1000000000000000000","receiver":"\#(bobBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":100000,"chainID":"1","version":2,"signature":"\#(expectedSignature)","options":2,"guardian":"\#(carolBech32)"}"#
+
+        XCTAssertEqual(output.signature, expectedSignature)
+        XCTAssertEqual(output.encoded, expectedEncoded)
+    }
+    
+    func testSignGenericActionUndelegate() {
+        // Successfully broadcasted https://explorer.multiversx.com/transactions/3301ae5a6a77f0ab9ceb5125258f12539a113b0c6787de76a5c5867f2c515d65
+        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+
+        let input = MultiversXSigningInput.with {
+            $0.genericAction = MultiversXGenericAction.with {
+                $0.accounts = MultiversXAccounts.with {
+                    $0.senderNonce = 6
+                    $0.sender = "erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa"
+                    $0.receiver = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r"
+                }
+                $0.value = "0"
+                $0.data = "unDelegate@0de0b6b3a7640000"
+                $0.version = 1
+            }
+            $0.gasPrice = 1000000000
+            $0.gasLimit = 12000000
+            $0.chainID = "1"
+            $0.privateKey = privateKey.data
+        }
+
+        let output: MultiversXSigningOutput = AnySigner.sign(input: input, coin: .multiversX)
+        let expectedSignature = "89f9683af92f7b835bff4e1d0dbfcff5245b3367df4d23538eb799e0ad0a90be29ac3bd3598ce55b35b35ebef68bfa5738eed39fd01adc33476f65bd1b966e0b"
+        let expectedEncoded = #"{"nonce":6,"value":"0","receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r","sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa","gasPrice":1000000000,"gasLimit":12000000,"data":"dW5EZWxlZ2F0ZUAwZGUwYjZiM2E3NjQwMDAw","chainID":"1","version":1,"signature":"\#(expectedSignature)"}"#
+
+        XCTAssertEqual(output.signature, expectedSignature)
+        XCTAssertEqual(output.encoded, expectedEncoded)
+    }
+    
+    func testSignGenericActionDelegate() {
+        // Successfully broadcasted https://explorer.multiversx.com/transactions/e5007662780f8ed677b37b156007c24bf60b7366000f66ec3525cfa16a4564e7
+        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+
+        let input = MultiversXSigningInput.with {
+            $0.genericAction = MultiversXGenericAction.with {
+                $0.accounts = MultiversXAccounts.with {
+                    $0.senderNonce = 1
+                    $0.sender = "erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa"
+                    $0.receiver = "erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r"
+                }
+                $0.value = "1"
+                $0.data = "delegate"
+                $0.version = 1
+            }
+            $0.gasPrice = 1000000000
+            $0.gasLimit = 12000000
+            $0.chainID = "1"
+            $0.privateKey = privateKey.data
+        }
+
+        let output: MultiversXSigningOutput = AnySigner.sign(input: input, coin: .multiversX)
+        let expectedSignature = "3b9164d47a4e3c0330ae387cd29ba6391f9295acf5e43a16a4a2611645e66e5fa46bf22294ca68fe1948adf45cec8cb47b8792afcdb248bd9adec7c6e6c27108"
+        let expectedEncoded = #"{"nonce":1,"value":"1","receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r","sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa","gasPrice":1000000000,"gasLimit":12000000,"data":"ZGVsZWdhdGU=","chainID":"1","version":1,"signature":"\#(expectedSignature)"}"#
+
+        XCTAssertEqual(output.signature, expectedSignature)
+        XCTAssertEqual(output.encoded, expectedEncoded)
+    }
+
+    func testSignEGLDTransfer() {
+        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+
+        let input = MultiversXSigningInput.with {
+            $0.egldTransfer = MultiversXEGLDTransfer.with {
+                $0.accounts = MultiversXAccounts.with {
+                    $0.senderNonce = 7
+                    $0.sender = aliceBech32
+                    $0.receiver = bobBech32
+                }
+                $0.amount = "1000000000000000000"
+            }
+            $0.chainID = "1"
+            $0.privateKey = privateKey.data
+        }
+
+        let output: MultiversXSigningOutput = AnySigner.sign(input: input, coin: .multiversX)
+        let expectedSignature = "0f40dec9d37bde3c67803fc535088e536344e271807bb7c1aa24af3c69bffa9b705e149ff7bcaf21678f4900c4ee72741fa6ef08bf4c67fc6da1c6b0f337730e"
+        let expectedEncoded = #"{"nonce":7,"value":"1000000000000000000","receiver":"\#(bobBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":2,"signature":"\#(expectedSignature)"}"#
+
+        XCTAssertEqual(output.signature, expectedSignature)
+        XCTAssertEqual(output.encoded, expectedEncoded)
+    }
+
+    func testSignEGLDTransferWithGuardian() {
+        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+
+        let input = MultiversXSigningInput.with {
+            $0.egldTransfer = MultiversXEGLDTransfer.with {
+                $0.accounts = MultiversXAccounts.with {
+                    $0.senderNonce = 7
+                    $0.sender = aliceBech32
+                    $0.receiver = bobBech32
+                    $0.guardian = carolBech32
+                }
+                $0.amount = "1000000000000000000"
+            }
+            $0.chainID = "1"
+            $0.privateKey = privateKey.data
+        }
+
+        let output: MultiversXSigningOutput = AnySigner.sign(input: input, coin: .multiversX)
+        let expectedSignature = "741dd0d24db4df37a050f693f8481b6e51b8dd6dfc2f01a4f90aa1af3e59c89a8b0ef9d710af33103970e353d9f0cb9fd128a2e174731cbc88265d9737ed5604"
+        let expectedEncoded = #"{"nonce":7,"value":"1000000000000000000","receiver":"\#(bobBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":100000,"chainID":"1","version":2,"signature":"\#(expectedSignature)","options":2,"guardian":"\#(carolBech32)"}"#
+
+        XCTAssertEqual(output.signature, expectedSignature)
+        XCTAssertEqual(output.encoded, expectedEncoded)
+    }
+
+    func testSignESDTTransfer() {
+        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+
+        let input = MultiversXSigningInput.with {
+            $0.esdtTransfer = MultiversXESDTTransfer.with {
+                $0.accounts = MultiversXAccounts.with {
+                    $0.senderNonce = 7
+                    $0.sender = aliceBech32
+                    $0.receiver = bobBech32
+                }
+                $0.amount = "10000000000000"
+                $0.tokenIdentifier = "MYTOKEN-1234"
+            }
+
+            $0.privateKey = privateKey.data
+        }
+
+        let output: MultiversXSigningOutput = AnySigner.sign(input: input, coin: .multiversX)
+        let expectedSignature = "dd7cdc90aa09da6034b00a99e3ba0f1a2a38fa788fad018d53bf2e706f99e1a42c80063c28e6b48a5f2574c4054986f34c8eb36b1da63a22d19cf3ea5990b306"
+        let expectedData = "RVNEVFRyYW5zZmVyQDRkNTk1NDRmNGI0NTRlMmQzMTMyMzMzNEAwOTE4NGU3MmEwMDA="
+        let expectedEncoded = #"{"nonce":7,"value":"0","receiver":"\#(bobBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":425000,"data":"\#(expectedData)","chainID":"1","version":2,"signature":"\#(expectedSignature)"}"#
+
+        XCTAssertEqual(output.signature, expectedSignature)
+        XCTAssertEqual(output.encoded, expectedEncoded)
+    }
+
+    func testSignESDTNFTTransfer() {
+        let privateKey = PrivateKey(data: Data(hexString: aliceSeedHex)!)!
+
+        let input = MultiversXSigningInput.with {
+            $0.esdtnftTransfer = MultiversXESDTNFTTransfer.with {
+                $0.accounts = MultiversXAccounts.with {
+                    $0.senderNonce = 7
+                    $0.sender = aliceBech32
+                    $0.receiver = bobBech32
+                }
+                $0.tokenCollection = "LKMEX-aab910"
+                $0.tokenNonce = 4
+                $0.amount = "184300000000000000"
+            }
+
+            $0.privateKey = privateKey.data
+        }
+
+        let output: MultiversXSigningOutput = AnySigner.sign(input: input, coin: .multiversX)
+        let expectedSignature = "59af89d9a9ece1f35bc34323c42061cae27bb5f9830f5eb26772e680732cbd901a86caa7c3eadacd392fe1024bef4c1f08ce1dfcafec257d6f41444ccea30a0c"
+        let expectedData = "RVNEVE5GVFRyYW5zZmVyQDRjNGI0ZDQ1NTgyZDYxNjE2MjM5MzEzMEAwNEAwMjhlYzNkZmEwMWFjMDAwQDgwNDlkNjM5ZTVhNjk4MGQxY2QyMzkyYWJjY2U0MTAyOWNkYTc0YTE1NjM1MjNhMjAyZjA5NjQxY2MyNjE4Zjg="
+        let expectedEncoded = #"{"nonce":7,"value":"0","receiver":"\#(aliceBech32)","sender":"\#(aliceBech32)","gasPrice":1000000000,"gasLimit":937500,"data":"\#(expectedData)","chainID":"1","version":2,"signature":"\#(expectedSignature)"}"#
+
+        XCTAssertEqual(output.signature, expectedSignature)
+        XCTAssertEqual(output.encoded, expectedEncoded)
+    }
+}
diff --git a/swift/Tests/Blockchains/NEARTests.swift b/swift/Tests/Blockchains/NEARTests.swift
index d275f2059ec..e145db8c625 100644
--- a/swift/Tests/Blockchains/NEARTests.swift
+++ b/swift/Tests/Blockchains/NEARTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/NEOTests.swift b/swift/Tests/Blockchains/NEOTests.swift
index 89754e3e28e..21b881831ff 100644
--- a/swift/Tests/Blockchains/NEOTests.swift
+++ b/swift/Tests/Blockchains/NEOTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -95,7 +93,12 @@ class NEOTests: XCTestCase {
         let result = signedTx.encoded.hexString
 
         //  https://testnet-explorer.o3.network/transactions/0x7b138c753c24f474d0f70af30a9d79756e0ee9c1f38c12ed07fbdf6fc5132eaf
+
         XCTAssertEqual("8000001efb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00039b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc50083064905000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ace72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c605013cf0617000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac014140dc261ac093a87640441bf0c3ad4a55ec727932b9175f600618bb5275f31aacf122956bc88746dc666759a2d67f120fe3ce1659f916d22a91e0b02421d3bddbd1232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac",
                 result)
+
+        // TODO uncomment when nist256p1 Rust implementation is enabled.
+        // XCTAssertEqual("8000001efb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00039b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc50083064905000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ace72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c605013cf0617000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac014140dc261ac093a87640441bf0c3ad4a55ec727932b9175f600618bb5275f31aacf1dd6a943678b9239a98a65d2980edf01beed0a0b4904573f31309a6a128a54980232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac",
+        //         result)
     }
 }
diff --git a/swift/Tests/Blockchains/NULSTests.swift b/swift/Tests/Blockchains/NULSTests.swift
index 3bafd7b654a..458162f164b 100644
--- a/swift/Tests/Blockchains/NULSTests.swift
+++ b/swift/Tests/Blockchains/NULSTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -36,4 +34,73 @@ class NULSTests: XCTestCase {
 
         XCTAssertEqual(output.encoded.hexString, "0200f885885d00008c0117010001f7ec6473df12e751d64cf20a8baa7edd50810f8101000100201d9a0000000000000000000000000000000000000000000000000000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120100010080969800000000000000000000000000000000000000000000000000000000000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1d7e3463044022028019c0099e2233c7adb84bb03a9a5666ece4a5b65a026a090fa460f3679654702204df0fcb8762b5944b3aba033fa1a287ccb098150035dd8b66f52dc58d3d0843a")
     }
+
+    func testTokenSign() {
+        let input = NULSSigningInput.with {
+            $0.privateKey = Data(hexString: "0x9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b")!
+            $0.from = "NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H"
+            $0.to = "NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe"
+            $0.amount = Data(hexString: "0x989680")!
+            $0.chainID = 9
+            $0.idassetsID = 1
+            $0.nonce = "0000000000000000".data(using: .utf8)!
+            $0.remark = ""
+            $0.balance = Data(hexString: "0x05f5e100")!
+            $0.timestamp = 1569228280
+            $0.feePayer = "NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H"
+            $0.feePayerBalance = Data(hexString: "0x0f4240")!
+            $0.feePayerNonce = "0000000000000000".data(using: .utf8)!
+
+        }
+
+        let output: NULSSigningOutput = AnySigner.sign(input: input, coin: .nuls)
+
+        XCTAssertEqual(output.encoded.hexString, "0200f885885d0000d20217010001f7ec6473df12e751d64cf20a8baa7edd50810f810900010080969800000000000000000000000000000000000000000000000000000000000800000000000000000017010001f7ec6473df12e751d64cf20a8baa7edd50810f8101000100a086010000000000000000000000000000000000000000000000000000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120900010080969800000000000000000000000000000000000000000000000000000000000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1d7e346304402204629e7e39708468a405f8d8dd208d0133a686beb5d3ae829b7a2f5867c74480902203d0dffac8189b1caa9087e480fd57581e8c382cc4e17034b492dd2178dac851d")
+    }
+
+    func testSignWithFeePayer() {
+        let input = NULSSigningInput.with {
+            $0.privateKey = Data(hexString: "0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002")!
+            $0.from = "NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac"
+            $0.to = "NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV"
+            $0.amount = Data(hexString: "0x0186a0")!
+            $0.chainID = 1
+            $0.idassetsID = 1
+            $0.nonce = "0000000000000000".data(using: .utf8)!
+            $0.remark = ""
+            $0.balance = Data(hexString: "0x0f4240")!
+            $0.timestamp = 1660632991
+            $0.feePayer = "NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA"
+            $0.feePayerNonce = "0000000000000000".data(using: .utf8)!
+            $0.feePayerBalance = Data(hexString: "0x0f4240")!
+            $0.feePayerPrivateKey = Data(hexString: "0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6")!
+        }
+
+        let output: NULSSigningOutput = AnySigner.sign(input: input, coin: .nuls)
+
+        XCTAssertEqual(output.encoded.hexString, "02009f3ffb620000d202170100014f019a4227bff89d51590fbf53fbd98d994485f801000100a086010000000000000000000000000000000000000000000000000000000000080000000000000000001701000152a6388c8bf54e8fcd73cc824813bfef0912299b01000100a086010000000000000000000000000000000000000000000000000000000000080000000000000000000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b701000100a0860100000000000000000000000000000000000000000000000000000000000000000000000000d22102764370693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022040b5820b93fd5e272f2a00518af45a722571834934ba20d9a866de8e6d6409ab022003c610c647648444c1e2193634b2c51817a5a6ac3fe781da1a9ea773506afd8221025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff4630440220140e46b260942a8475f38df39bf54a2eea56c77199fc7ba775aa4b7f147d0d2102206c82705cba509f37ba0e35520a97bccb71a9e35cadcb8d95dd7fde5c8aa9e428")
+    }
+
+    func testTokenSignWithFeePayer() {
+        let input = NULSSigningInput.with {
+            $0.privateKey = Data(hexString: "0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002")!
+            $0.from = "NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac"
+            $0.to = "NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV"
+            $0.amount = Data(hexString: "0x0186a0")!
+            $0.chainID = 9
+            $0.idassetsID = 1
+            $0.nonce = "0000000000000000".data(using: .utf8)!
+            $0.remark = ""
+            $0.balance = Data(hexString: "0x0dbba0")!
+            $0.timestamp = 1660636748
+            $0.feePayer = "NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA"
+            $0.feePayerNonce = "e05d03df6ede0e22".data(using: .utf8)!
+            $0.feePayerBalance = Data(hexString: "0x0f4240")!
+            $0.feePayerPrivateKey = Data(hexString: "0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6")!
+        }
+
+        let output: NULSSigningOutput = AnySigner.sign(input: input, coin: .nuls)
+
+        XCTAssertEqual(output.encoded.hexString, "02004c4efb620000d2021701000152a6388c8bf54e8fcd73cc824813bfef0912299b09000100a08601000000000000000000000000000000000000000000000000000000000008000000000000000000170100014f019a4227bff89d51590fbf53fbd98d994485f801000100a08601000000000000000000000000000000000000000000000000000000000008e05d03df6ede0e22000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b709000100a0860100000000000000000000000000000000000000000000000000000000000000000000000000d32102764370693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022025cb5b40bda4e6fc0ba719bb0c1a907b2a0faa91316ef2c836310d49f906b6a802207d530a56a6c56d974036c86125da06d6e47f9d8ba1544ac3e620cebd883a707821025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff473045022100ff6f45a1c3856f9ea954baca6b2988295bbb22c958f87f0d3baf9989930549530220426ecb1520513710b99ab50e1f6c7e21b0175adef08aa05070bb9bfca8a001d8")
+    }
 }
diff --git a/swift/Tests/Blockchains/NativeInjectiveTests.swift b/swift/Tests/Blockchains/NativeInjectiveTests.swift
new file mode 100644
index 00000000000..f8686ff84bb
--- /dev/null
+++ b/swift/Tests/Blockchains/NativeInjectiveTests.swift
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class NativeInjectiveTests: XCTestCase {
+    
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "9ee18daf8e463877aaf497282abc216852420101430482a28e246c179e2c5ef1")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: false)
+        let address = AnyAddress(publicKey: pubkey, coin: .nativeInjective)
+        let addressFromString = AnyAddress(string: "inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a", coin: .nativeInjective)!
+
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSign() {
+        let privateKey = PrivateKey(data: Data(hexString: "9ee18daf8e463877aaf497282abc216852420101430482a28e246c179e2c5ef1")!)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: false)
+        let fromAddress = AnyAddress(publicKey: publicKey, coin: .nativeInjective)
+
+        let message = CosmosMessage.with {
+            $0.sendCoinsMessage = CosmosMessage.Send.with {
+                $0.fromAddress = fromAddress.description
+                $0.toAddress = "inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd"
+                $0.amounts = [CosmosAmount.with {
+                    $0.amount = "10000000000"
+                    $0.denom = "inj"
+                }]
+            }
+        }
+
+        let fee = CosmosFee.with {
+            $0.gas = 110000
+            $0.amounts = [CosmosAmount.with {
+                $0.amount = "100000000000000"
+                $0.denom = "inj"
+            }]
+        }
+
+        let input = CosmosSigningInput.with {
+            $0.signingMode = .protobuf;
+            $0.accountNumber = 17396
+            $0.chainID = "injective-1"
+            $0.sequence = 1
+            $0.messages = [message]
+            $0.fee = fee
+            $0.privateKey = privateKey.data
+        }
+
+        let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .nativeInjective)
+
+        XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"Co8BCowBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmwKKmluajEzdTZnN3ZxZ3cwNzRtZ21mMnplMmNhZHp2a3o5c25sd2NydHE4YRIqaW5qMXhtcGtteHI0YXMwMGVtMjN0YzJ6Z211eXkyZ3I0aDN3Z2NsNnZkGhIKA2luahILMTAwMDAwMDAwMDASngEKfgp0Ci0vaW5qZWN0aXZlLmNyeXB0by52MWJldGExLmV0aHNlY3AyNTZrMS5QdWJLZXkSQwpBBFoMa4O4vZgn5QcnDK20mbfjqQlSRvaiITKB94PYd8mLJWdCdBsGOfMXdo/k9MJ2JmDCESKDp2hdgVUH3uMikXMSBAoCCAEYARIcChYKA2luahIPMTAwMDAwMDAwMDAwMDAwELDbBhpAx2vkplmzeK7n3puCFGPWhLd0l/ZC/CYkGl+stH+3S3hiCvIe7uwwMpUlNaSwvT8HwF1kNUp+Sx2m0Uo1x5xcFw==\"}")
+    }
+}
diff --git a/swift/Tests/Blockchains/NativeZetaChainTests.swift b/swift/Tests/Blockchains/NativeZetaChainTests.swift
new file mode 100644
index 00000000000..5c5a8650098
--- /dev/null
+++ b/swift/Tests/Blockchains/NativeZetaChainTests.swift
@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class NativeZetaChainTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: false)
+        let address = AnyAddress(publicKey: pubkey, coin: .nativeZetaChain)
+        let addressFromString = AnyAddress(string: "zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne", coin: .nativeZetaChain)!
+
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSign() {
+        let privateKey = PrivateKey(data: Data(hexString: "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed")!)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: false)
+        let fromAddress = AnyAddress(publicKey: publicKey, coin: .nativeZetaChain)
+
+        let message = CosmosMessage.with {
+            $0.sendCoinsMessage = CosmosMessage.Send.with {
+                $0.fromAddress = fromAddress.description
+                $0.toAddress = "zeta1cscf4ldnkkz7f0wpveur6dpd0d6p2zxnsuu70y"
+                $0.amounts = [CosmosAmount.with {
+                    $0.amount = "300000000000000000"
+                    $0.denom = "azeta"
+                }]
+            }
+        }
+
+        let fee = CosmosFee.with {
+            $0.gas = 200000
+        }
+
+        let input = CosmosSigningInput.with {
+            $0.signingMode = .protobuf;
+            $0.accountNumber = 2726346
+            $0.chainID = "athens_7001-1"
+            $0.sequence = 2
+            $0.messages = [message]
+            $0.fee = fee
+            $0.privateKey = privateKey.data
+            $0.txHasher = CosmosTxHasher.keccak256
+            $0.signerInfo = CosmosSignerInfo.with {
+                $0.publicKeyType = CosmosSignerPublicKeyType.secp256K1
+                $0.jsonType = "ethermint/PubKeyEthSecp256k1"
+                $0.protobufType = "/ethermint.crypto.v1.ethsecp256k1.PubKey"
+            }
+        }
+
+        let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .nativeZetaChain)
+
+        XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpoBCpcBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEncKK3pldGExNHB5MzZzeDU3dWQ4MnQ5eXJrczl6Nmhkc3JwbjV4NmtteHMwbmUSK3pldGExY3NjZjRsZG5ra3o3ZjB3cHZldXI2ZHBkMGQ2cDJ6eG5zdXU3MHkaGwoFYXpldGESEjMwMDAwMDAwMDAwMDAwMDAwMBJhClkKTwooL2V0aGVybWludC5jcnlwdG8udjEuZXRoc2VjcDI1NmsxLlB1YktleRIjCiECho5+FjRBfbKt/Z/jggW/oP6gGJin/TBWXRP3BWo3wGUSBAoCCAEYAhIEEMCaDBpAgGvqca0w2N9wnHnnxS9HiVud4aQ9lNCumzgNIW6wOR4kvPScacGS1G3kwCw7wyI2NJL8M1eVYjafFIt2FpKl3w==\"}")
+    }
+}
diff --git a/swift/Tests/Blockchains/NervosTests.swift b/swift/Tests/Blockchains/NervosTests.swift
index e250869c9ad..c1716b0775f 100644
--- a/swift/Tests/Blockchains/NervosTests.swift
+++ b/swift/Tests/Blockchains/NervosTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/NimiqTests.swift b/swift/Tests/Blockchains/NimiqTests.swift
index d056302a5e3..d96ad33e5ce 100644
--- a/swift/Tests/Blockchains/NimiqTests.swift
+++ b/swift/Tests/Blockchains/NimiqTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -16,10 +14,11 @@ class NimiqTests: XCTestCase {
             $0.value = 42042042
             $0.fee = 1000
             $0.validityStartHeight = 314159
+            $0.networkID = .mainnetAlbatross
         }
 
         let output: NimiqSigningOutput = AnySigner.sign(input: input, coin: .nimiq)
 
-        XCTAssertEqual(output.encoded.hexString, "0070c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b7021450ffc385cd4e7c6ac9a7e91614ca67ff90568a00000000028182ba00000000000003e80004cb2f2a74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b")
+        XCTAssertEqual(output.encoded.hexString, "000070c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b7021450ffc385cd4e7c6ac9a7e91614ca67ff90568a00000000028182ba00000000000003e80004cb2f180ba678744be3bf9cd44fbcdabfb5be209f21739934836e26055610ab02720fa99489219d9f3581664473a1b40b30ad1f6e13150d59f8234a42c3f0de3d505405")
     }
 }
diff --git a/swift/Tests/Blockchains/OasisTests.swift b/swift/Tests/Blockchains/OasisTests.swift
index 03ad91930f7..994d0aff619 100644
--- a/swift/Tests/Blockchains/OasisTests.swift
+++ b/swift/Tests/Blockchains/OasisTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/OntologyTests.swift b/swift/Tests/Blockchains/OntologyTests.swift
index 3779918b0f7..a81c6744980 100644
--- a/swift/Tests/Blockchains/OntologyTests.swift
+++ b/swift/Tests/Blockchains/OntologyTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -53,7 +51,11 @@ class OntologyTests: XCTestCase {
 
         let output: OntologySigningOutput = AnySigner.sign(input: input, coin: .ontology)
         let result = output.encoded.hexString
+
         XCTAssertEqual("00d102d45c8bf401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94abac41aaf3ead76586a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140301766d925382a6ebb2ebeb18d3741954c9370dcf6d9c45b34ce7b18bc42dcdb7cff28ddaf7f1048822c0ca21a0c4926323a2497875b963f3b8cbd3717aa6e7c2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac414038466b25ac49a22ba8c301328ef049a61711b257987e85e25d63e0444a14e860305a4cd3bb6ea2fe80fd293abb3c592e679c42c546cbf3baa051a07b28b374a6232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac", result)
+
+        // TODO uncomment when nist256p1 Rust implementation is enabled.
+        // XCTAssertEqual("00d102d45c8bf401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94abac41aaf3ead76586a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140301766d925382a6ebb2ebeb18d3741954c9370dcf6d9c45b34ce7b18bc42dcdb8300d7215080efb87dd3f35de5f3b6d98aacd6161fbc0845b82d0d8be4b8b6d52321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac414038466b25ac49a22ba8c301328ef049a61711b257987e85e25d63e0444a14e860305a4cd3bb6ea2fe80fd293abb3c592e679c42c546cbf3baa051a07b28b374a6232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac", result)
     }
 
     func testSignOngTransfer() {
@@ -72,7 +74,11 @@ class OntologyTests: XCTestCase {
 
         let output: OntologySigningOutput = AnySigner.sign(input: input, coin: .ontology)
         let result = output.encoded.hexString
+
         XCTAssertEqual("00d19d3182a8f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94abac41aaf3ead76586a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140e27e935b87855efad62bb76b21c7b591f445f867eff86f888ca6ee1870ecd80f73b8ab199a4d757b4c7b9ed46c4ff8cfa8aefaa90b7fb6485e358034448cba752321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac4140450047b2efb384129a16ec4c707790e9379b978cc7085170071d8d7c5c037d743b078bd4e21bb4404c0182a32ee05260e22454dffb34dacccf458dfbee6d32db232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac", result)
+
+        // TODO uncomment when nist256p1 Rust implementation is enabled.
+        // XCTAssertEqual("00d19d3182a8f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94abac41aaf3ead76586a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140e27e935b87855efad62bb76b21c7b591f445f867eff86f888ca6ee1870ecd80f8c4754e565b28a85b384612b93b00730143800049b97e83c95844a8eb7d66adc2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac4140450047b2efb384129a16ec4c707790e9379b978cc7085170071d8d7c5c037d74c4f8742a1de44bc0b3fe7d5cd11fad9edac2a5cdabe2c3b824743cc70df5f276232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac", result)
     }
 
 }
diff --git a/swift/Tests/Blockchains/OsmosisTests.swift b/swift/Tests/Blockchains/OsmosisTests.swift
index bd7303dbe51..45fc92bc3e8 100644
--- a/swift/Tests/Blockchains/OsmosisTests.swift
+++ b/swift/Tests/Blockchains/OsmosisTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -58,6 +56,6 @@ class OsmosisTests: XCTestCase {
         let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .osmosis)
 
         XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"Co0BCooBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmoKK29zbW8xbWt5Njljbjhla3R3eTA4NDV2ZWM5dXBzZHBoa3R4dDBlbjk3ZjUSK29zbW8xOHMwaGRuc2xsZ2NjbHdldTlheW13NG5na3RyMmswcmt2bjdqbW4aDgoFdW9zbW8SBTk5ODAwEmQKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLs71zkN6MCxn+VRo3ksx826RH0Z9fmpStBweE+HVY2SRIECgIIARISCgwKBXVvc21vEgMyMDAQwJoMGkAMY//Md5GRUR4lVZhk558hFS3kii9QZYoYKfg4+ac/xgNeyoiEweVDhcmEvlH1orVwjLUOnYs4ly2a/yIurYVj\"}")
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 }
diff --git a/swift/Tests/Blockchains/PactusTests.swift b/swift/Tests/Blockchains/PactusTests.swift
new file mode 100644
index 00000000000..933bdeaebea
--- /dev/null
+++ b/swift/Tests/Blockchains/PactusTests.swift
@@ -0,0 +1,129 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class PactusTests: XCTestCase {
+    var privateKey: PrivateKey!
+
+    override func setUp() {
+        super.setUp()
+        privateKey = PrivateKey(data: Data(hexString: "4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6")!)!
+    }
+
+   func testAddress() {
+        let pubkey = privateKey.getPublicKeyEd25519()
+        let address = AnyAddress(publicKey: pubkey, coin: .pactus)
+        let addressFromString = AnyAddress(string: "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr", coin: .pactus)!
+
+        XCTAssertEqual(pubkey.data.hexString, "95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560bb72145f4fa")
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testTransferSign() {
+        // Successfully broadcasted transaction:
+        // https://pacviewer.com/transaction/1b6b7226f7935a15f05371d1a1fefead585a89704ce464b7cc1d453d299d235f
+        let input = PactusSigningInput.with {
+            $0.privateKey = privateKey.data
+            $0.transaction = PactusTransactionMessage.with {
+                $0.lockTime = 2335524
+                $0.fee = 10000000
+                $0.memo = "wallet-core"
+                $0.transfer = PactusTransferPayload.with {
+                    $0.sender = "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr"
+                    $0.receiver = "pc1r0g22ufzn8qtw0742dmfglnw73e260hep0k3yra"
+                    $0.amount = 200000000
+                }
+            }
+        }
+
+        let output: PactusSigningOutput = AnySigner.sign(input: input, coin: .pactus)
+
+        let expectedTransactionID = "1b6b7226f7935a15f05371d1a1fefead585a89704ce464b7cc1d453d299d235f"
+        let expectedSignature = "4ed8fee3d8992e82660dd05bbe8608fc56ceabffdeeee61e3213b9b49d33a0fc" +
+                                "8dea6d79ee7ec60f66433f189ed9b3c50b2ad6fa004e26790ee736693eda8506"
+        let expectedSignedData = "000124a3230080ade2040b77616c6c65742d636f726501037098338e0b680811" +
+                                 "9dfd4457ab806b9c2059b89b037a14ae24533816e7faaa6ed28fcdde8e55a7df" +
+                                 "218084af5f4ed8fee3d8992e82660dd05bbe8608fc56ceabffdeeee61e3213b9" +
+                                 "b49d33a0fc8dea6d79ee7ec60f66433f189ed9b3c50b2ad6fa004e26790ee736" +
+                                 "693eda850695794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560b" +
+                                 "b72145f4fa";
+        XCTAssertEqual(output.transactionID.hexString, expectedTransactionID)
+        XCTAssertEqual(output.signature.hexString, expectedSignature)
+        XCTAssertEqual(output.signedTransactionData.hexString, expectedSignedData)
+    }
+
+    func testBondWithPublicKeySign() {
+        // Successfully broadcasted transaction:
+        // https://pacviewer.com/transaction/d194b445642a04ec78ced4448696e50b733f2f0b517a23871882c0eefaf1c28f
+        let input = PactusSigningInput.with {
+            $0.privateKey = privateKey.data
+            $0.transaction = PactusTransactionMessage.with {
+                $0.lockTime = 2339009
+                $0.fee = 10000000
+                $0.memo = "wallet-core"
+                $0.bond = PactusBondPayload.with {
+                    $0.sender = "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr"
+                    $0.receiver = "pc1p9y5gmu9l002tt60wak9extgvwm69rq3a9ackrl"
+                    $0.stake = 1000000000
+                    $0.publicKey = "public1pnz75msstqdrq5eguvcwanug0zauhqjw2cc4flmez3qethnp68y64ehc4k69amapj7x4na2uda0snqz4yxujgx3jsse4f64fgy7jkh0xauvhrc5ts09vfk48g85t0js66hvajm6xruemsvlxqv3xvkyur8v9v0mtn"
+                }
+            }
+        }
+
+        let output: PactusSigningOutput = AnySigner.sign(input: input, coin: .pactus)
+
+        let expectedTransactionID = "d194b445642a04ec78ced4448696e50b733f2f0b517a23871882c0eefaf1c28f"
+        let expectedSignature = "0d7bc6d94927534b89e2f53bcfc9fc849e0e2982438955eda55b4338328adac7" +
+                                "9d4ee3216d143f0e1629764ab650734f8ba188e716d71f9eff65e39ce7006300"
+        let expectedSignedData = "0001c1b0230080ade2040b77616c6c65742d636f726502037098338e0b680811" +
+                                 "9dfd4457ab806b9c2059b89b0129288df0bf7bd4b5e9eeed8b932d0c76f45182" +
+                                 "3d6098bd4dc20b03460a651c661dd9f10f17797049cac62a9fef228832bbcc3a" +
+                                 "39355cdf15b68bddf432f1ab3eab8debe1300aa43724834650866a9d552827a5" +
+                                 "6bbcdde32e3c517079589b54e83d16f9435abb3b2de8c3e677067cc0644ccb13" +
+                                 "833b8094ebdc030d7bc6d94927534b89e2f53bcfc9fc849e0e2982438955eda5" +
+                                 "5b4338328adac79d4ee3216d143f0e1629764ab650734f8ba188e716d71f9eff" +
+                                 "65e39ce700630095794161374b22c696dabb98e93f6ca9300b22f3b904921fbf" +
+                                 "560bb72145f4fa"
+
+        XCTAssertEqual(output.transactionID.hexString, expectedTransactionID)
+        XCTAssertEqual(output.signature.hexString, expectedSignature)
+        XCTAssertEqual(output.signedTransactionData.hexString, expectedSignedData)
+    }
+
+    func testBondWithoutPublicKeySign() {
+        // Successfully broadcasted transaction:
+        // https://pacviewer.com/transaction/f83f583a5c40adf93a90ea536a7e4b467d30ca4f308d5da52624d80c42adec80
+        let input = PactusSigningInput.with {
+            $0.privateKey = privateKey.data
+            $0.transaction = PactusTransactionMessage.with {
+                $0.lockTime = 2335580
+                $0.fee = 10000000
+                $0.memo = "wallet-core"
+                $0.bond = PactusBondPayload.with {
+                    $0.sender = "pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr"
+                    $0.receiver = "pc1p6taz5l2kq5ppnxv4agnqj48svnvsy797xpe6wd"
+                    $0.stake = 1000000000
+                }
+            }
+        }
+
+        let output: PactusSigningOutput = AnySigner.sign(input: input, coin: .pactus)
+
+        let expectedTransactionID = "f83f583a5c40adf93a90ea536a7e4b467d30ca4f308d5da52624d80c42adec80"
+        let expectedSignature = "9e6279fb64067c7d7316ac74630bbb8589df268aa4548f1c7d85c087a8748ff0" +
+                                "715b9149afbd94c5d8ee6b37c787ec63e963cbb38be513ebc436aa58f9a8f00d"
+        let expectedSignedData = "00015ca3230080ade2040b77616c6c65742d636f726502037098338e0b680811" +
+                                 "9dfd4457ab806b9c2059b89b01d2fa2a7d560502199995ea260954f064d90278" +
+                                 "be008094ebdc039e6279fb64067c7d7316ac74630bbb8589df268aa4548f1c7d" +
+                                 "85c087a8748ff0715b9149afbd94c5d8ee6b37c787ec63e963cbb38be513ebc4" +
+                                 "36aa58f9a8f00d95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf" +
+                                 "560bb72145f4fa";
+
+        XCTAssertEqual(output.transactionID.hexString, expectedTransactionID)
+        XCTAssertEqual(output.signature.hexString, expectedSignature)
+        XCTAssertEqual(output.signedTransactionData.hexString, expectedSignedData)
+    }
+}
diff --git a/swift/Tests/Blockchains/PolkadotTests.swift b/swift/Tests/Blockchains/PolkadotTests.swift
index aae9c432a70..fe1d96c74d8 100644
--- a/swift/Tests/Blockchains/PolkadotTests.swift
+++ b/swift/Tests/Blockchains/PolkadotTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -44,7 +42,7 @@ class PolkadotTests: XCTestCase {
             $0.blockHash = Data(hexString: "0x7d5fa17b70251d0806f26156b1b698dfd09e040642fa092595ce0a78e9e84fcd")!
             $0.nonce = 1
             $0.specVersion = 28
-            $0.network = .polkadot
+            $0.network = CoinType.polkadot.ss58Prefix
             $0.transactionVersion = 6
             $0.privateKey = key.data
             $0.era = PolkadotEra.with {
@@ -73,7 +71,7 @@ class PolkadotTests: XCTestCase {
             $0.blockHash = genesisHash
             $0.nonce = 0
             $0.specVersion = 17
-            $0.network = .polkadot
+            $0.network = CoinType.polkadot.ss58Prefix
             $0.transactionVersion = 3
             $0.privateKey = key.data
             $0.stakingCall.bond = PolkadotStaking.Bond.with {
@@ -97,7 +95,7 @@ class PolkadotTests: XCTestCase {
             $0.blockHash = genesisHash
             $0.nonce = 4
             $0.specVersion = 30
-            $0.network = .polkadot
+            $0.network = CoinType.polkadot.ss58Prefix
             $0.transactionVersion = 7
             $0.privateKey = key.data
             $0.stakingCall.bondAndNominate = PolkadotStaking.BondAndNominate.with {
@@ -125,7 +123,7 @@ class PolkadotTests: XCTestCase {
             $0.blockHash = genesisHash
             $0.nonce = 5
             $0.specVersion = 30
-            $0.network = .polkadot
+            $0.network = CoinType.polkadot.ss58Prefix
             $0.transactionVersion = 7
             $0.privateKey = key.data
             $0.stakingCall.bondExtra = PolkadotStaking.BondExtra.with {
@@ -151,7 +149,7 @@ class PolkadotTests: XCTestCase {
             }
             $0.nonce = 6
             $0.specVersion = 9200
-            $0.network = .polkadot
+            $0.network = CoinType.polkadot.ss58Prefix
             $0.transactionVersion = 12
             $0.privateKey = key.data
             $0.stakingCall.chillAndUnbond = PolkadotStaking.ChillAndUnbond.with {
@@ -163,4 +161,40 @@ class PolkadotTests: XCTestCase {
         // https://polkadot.subscan.io/extrinsic/10541383-2
         XCTAssertEqual("0x" + output.encoded.hexString, "0xd10184008361bd08ddca5fda28b5e2aa84dc2621de566e23e089e555a42194c3eaf2da7900c891ba102db672e378945d74cf7f399226a76b43cab502436971599255451597fc2599902e4b62c7ce85ecc3f653c693fef3232be620984b5bb5bcecbbd7b209d50318001a02080706070207004d446617")
     }
+    
+    func testAcalaSigning() {
+        // real key in 1p test
+        let key = PrivateKey(data: Data(hexString: "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0")!)!
+        
+        let acalaGenesisHash = Data(hexString: "0xfc41b9bd8ef8fe53d58c7ea67c794c7ec9a73daf05e6d54b14ff6342c99ba64c")!
+
+        let input = PolkadotSigningInput.with {
+            $0.genesisHash = acalaGenesisHash
+            $0.blockHash = Data(hexString: "0x707ffa05b7dc6cdb6356bd8bd51ff20b2757c3214a76277516080a10f1bc7537")!
+            $0.era = PolkadotEra.with {
+                $0.blockNumber = 3893613
+                $0.period = 64
+            }
+            $0.nonce = 0
+            $0.specVersion = 2170
+            $0.network = 10 // Acala
+            $0.transactionVersion = 2
+            $0.privateKey = key.data
+            $0.balanceCall.transfer = PolkadotBalance.Transfer.with {
+                $0.value = Data(hexString: "0xe8d4a51000")! // 1 ACA
+                $0.toAddress = "25Qqz3ARAvnZbahGZUzV3xpP1bB3eRrupEprK7f2FNbHbvsz"
+                $0.callIndices = PolkadotCallIndices.with {
+                    $0.custom = PolkadotCustomCallIndices.with {
+                        $0.moduleIndex = 0x0a
+                        $0.methodIndex = 0x00
+                    }
+                }
+            }
+            $0.multiAddress = true
+        }
+        let output: PolkadotSigningOutput = AnySigner.sign(input: input, coin: .polkadot)
+
+        // https://acala.subscan.io/extrinsic/3893620-3
+        XCTAssertEqual("0x" + output.encoded.hexString, "0x41028400e9590e4d99264a14a85e21e69537e4a64f66a875d38cb8f76b305f41fabe24a900dd54466dffd1e3c80b76013e9459fbdcd17805bd5fdbca0961a643bad1cbd2b7fe005c62c51c18b67f31eb9e61b187a911952fee172ef18402d07c703eec3100d50200000a0000c8c602ded977c56076ae38d98026fa669ca10d6a2b5a0bfc4086ae7668ed1c60070010a5d4e8")
+    }
 }
diff --git a/swift/Tests/Blockchains/PolygonTests.swift b/swift/Tests/Blockchains/PolygonTests.swift
index cba7eb17b76..5c0e06fff09 100644
--- a/swift/Tests/Blockchains/PolygonTests.swift
+++ b/swift/Tests/Blockchains/PolygonTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 import WalletCore
 import XCTest
 
diff --git a/swift/Tests/Blockchains/QtumTests.swift b/swift/Tests/Blockchains/QtumTests.swift
index b6cd3394538..1c9fdaf3da1 100644
--- a/swift/Tests/Blockchains/QtumTests.swift
+++ b/swift/Tests/Blockchains/QtumTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/Blockchains/RippleTests.swift b/swift/Tests/Blockchains/RippleTests.swift
index e42151c04e3..7e5787d4f2f 100644
--- a/swift/Tests/Blockchains/RippleTests.swift
+++ b/swift/Tests/Blockchains/RippleTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -29,25 +27,33 @@ class RippleTests: XCTestCase {
     }
 
     func testSigner() {
-        let input = RippleSigningInput.with {
-            $0.amount = 29_000_000
-            $0.fee = 200_000
-            $0.sequence = 1 // from account info api
-            $0.account = "rDpysuumkweqeC7XdNgYNtzL5GxbdsmrtF"
+        let operation = RippleOperationPayment.with {
             $0.destination = "rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF"
-            $0.privateKey = Data(hexString: "ba005cd605d8a02e3d5dfd04234cef3a3ee4f76bfbad2722d1fb5af8e12e6764")!
+            $0.amount = 10
+        }
+        let input = RippleSigningInput.with {
+            $0.fee = 10
+            $0.sequence = 32268248 // from account info api
+            $0.lastLedgerSequence = 32268269
+            $0.account = "rfxdLwsZnoespnTDDb1Xhvbc8EFNdztaoq"
+            $0.privateKey = Data(hexString: "a5576c0f63da10e584568c8d134569ff44017b0a249eb70657127ae04f38cc77")!
+            $0.opPayment = operation
         }
 
         let output: RippleSigningOutput = AnySigner.sign(input: input, coin: .xrp)
-        XCTAssertEqual(output.encoded.hexString, "12000022800000002400000001614000000001ba8140684000000000030d407321026cc34b92cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b6744630440220067f20b3eebfc7107dd0bcc72337a236ac3be042c0469f2341d76694a17d4bb9022048393d7ee7dcb729783b33f5038939ddce1bb8337e66d752974626854556bbb681148400b6b6d08d5d495653d73eda6804c249a5148883148132e4e20aecf29090ac428a9c43f230a829220d")
+        XCTAssertEqual(output.encoded.hexString, "12000022000000002401ec5fd8201b01ec5fed61400000000000000a68400000000000000a732103d13e1152965a51a4a9fd9a8b4ea3dd82a4eba6b25fcad5f460a2342bb650333f74463044022037d32835c9394f39b2cfd4eaf5b0a80e0db397ace06630fa2b099ff73e425dbc02205288f780330b7a88a1980fa83c647b5908502ad7de9a44500c08f0750b0d9e8481144c55f5a78067206507580be7bb2686c8460adff983148132e4e20aecf29090ac428a9c43f230a829220d")
 
-        let input2 = RippleSigningInput.with {
-            $0.amount = 29_000_000
-            $0.fee = 200_000
-            $0.sequence = 1 // from account info api
-            $0.account = "rDpysuumkweqeC7XdNgYNtzL5GxbdsmrtF"
+        let operation2 = RippleOperationPayment.with {
             $0.destination = "XVfvixWZQKkcenFRYApCjpTUyJ4BePMjMaPqnob9QVPiVJV"
-            $0.privateKey = Data(hexString: "ba005cd605d8a02e3d5dfd04234cef3a3ee4f76bfbad2722d1fb5af8e12e6764")!
+            $0.amount = 10
+        }
+        let input2 = RippleSigningInput.with {
+            $0.fee = 10
+            $0.sequence = 32268248 // from account info api
+            $0.lastLedgerSequence = 32268269
+            $0.account = "rfxdLwsZnoespnTDDb1Xhvbc8EFNdztaoq"
+            $0.privateKey = Data(hexString: "a5576c0f63da10e584568c8d134569ff44017b0a249eb70657127ae04f38cc77")!
+            $0.opPayment = operation2
         }
         let output2: RippleSigningOutput = AnySigner.sign(input: input2, coin: .xrp)
         XCTAssertEqual(output2.encoded, output.encoded)
diff --git a/swift/Tests/Blockchains/RoninTests.swift b/swift/Tests/Blockchains/RoninTests.swift
index 2cb54acb389..fc8e102ca12 100644
--- a/swift/Tests/Blockchains/RoninTests.swift
+++ b/swift/Tests/Blockchains/RoninTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/ScrollTests.swift b/swift/Tests/Blockchains/ScrollTests.swift
new file mode 100644
index 00000000000..c890debc03e
--- /dev/null
+++ b/swift/Tests/Blockchains/ScrollTests.swift
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class ScrollTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "828c4c48c2cef521f0251920891ed79e871faa24f64f43cde83d07bc99f8dbf0")!)!
+                let pubkey = key.getPublicKeySecp256k1(compressed: false)
+                let address = AnyAddress(publicKey: pubkey, coin: .scroll)
+                let expected = AnyAddress(string: "0xe32DC46bfBF78D1eada7b0a68C96903e01418D64", coin: .scroll)!
+        
+                XCTAssertEqual(address.description, expected.description)
+    }
+}
diff --git a/swift/Tests/Blockchains/SecretTests.swift b/swift/Tests/Blockchains/SecretTests.swift
new file mode 100644
index 00000000000..2acf4b61247
--- /dev/null
+++ b/swift/Tests/Blockchains/SecretTests.swift
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class SecretTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "87201512d132ef7a1e57f9e24905fbc24300bd73f676b5716182be5f3e39dada")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: true)
+        let address = AnyAddress(publicKey: pubkey, coin: .secret)
+        let addressFromString = AnyAddress(string: "secret18mdrja40gfuftt5yx6tgj0fn5lurplezyp894y", coin: .secret)!
+
+        XCTAssertEqual(pubkey.data.hexString, "02466ac5d28cb4fab6c349060c6c1619e8d301e7741fb6b33cc1edac25f45d8646")
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSigningTransaction() {
+        let privateKey = PrivateKey(data: Data(hexString: "87201512d132ef7a1e57f9e24905fbc24300bd73f676b5716182be5f3e39dada")!)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
+        let fromAddress = AnyAddress(publicKey: publicKey, coin: .secret)
+
+        let sendCoinsMessage = CosmosMessage.Send.with {
+            $0.fromAddress = fromAddress.description
+            $0.toAddress = "secret1rnq6hjfnalxeef87rmdeya3nu9dhpc7k9pujs3"
+            $0.amounts = [CosmosAmount.with {
+                $0.amount = "100000"
+                $0.denom = "uscrt"
+            }]
+        }
+
+        let message = CosmosMessage.with {
+            $0.sendCoinsMessage = sendCoinsMessage
+        }
+
+        let fee = CosmosFee.with {
+            $0.gas = 25000
+            $0.amounts = [CosmosAmount.with {
+                $0.amount = "2500"
+                $0.denom = "uscrt"
+            }]
+        }
+
+        let input = CosmosSigningInput.with {
+            $0.signingMode = .protobuf;
+            $0.accountNumber = 265538
+            $0.chainID = "secret-4"
+            $0.memo = ""
+            $0.sequence = 1
+            $0.messages = [message]
+            $0.fee = fee
+            $0.privateKey = privateKey.data
+        }
+
+        let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .secret)
+
+        XCTAssertJSONEqual(output.serialized, "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLXNlY3JldDE4bWRyamE0MGdmdWZ0dDV5eDZ0Z2owZm41bHVycGxlenlwODk0eRItc2VjcmV0MXJucTZoamZuYWx4ZWVmODdybWRleWEzbnU5ZGhwYzdrOXB1anMzGg8KBXVzY3J0EgYxMDAwMDASZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAkZqxdKMtPq2w0kGDGwWGejTAed0H7azPMHtrCX0XYZGEgQKAggBGAESEwoNCgV1c2NydBIEMjUwMBCowwEaQOcHd2gHpa5WKZ/5RRerEtrHlyDlojIEzUGhC9xMFgs7UQMWy+kTTN+NRf7zQ8rx3cPkIKeZhv0u1KRc8uRCc4o=\"}")
+        XCTAssertEqual(output.errorMessage, "")
+    }
+}
diff --git a/swift/Tests/Blockchains/SmartBitcoinCashTests.swift b/swift/Tests/Blockchains/SmartBitcoinCashTests.swift
index 131f13d14b6..5385549a3b8 100644
--- a/swift/Tests/Blockchains/SmartBitcoinCashTests.swift
+++ b/swift/Tests/Blockchains/SmartBitcoinCashTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -10,12 +8,12 @@ import XCTest
 class SmartBitcoinCashTests: XCTestCase {
 
     func testAddress() {
-        let key = PrivateKey(data: Data(hexString: "ab4accc9310d90a61fc354d8f353bca4a2b3c0590685d3eb82d0216af3badddc")!)!
+        let key = PrivateKey(data: Data(hexString: "155cbd57319f3d938977b4c18000473eb3c432c4e31b667b63e88559c497d82d")!)!
         let pubkey = key.getPublicKeySecp256k1(compressed: false)
         let address = AnyAddress(publicKey: pubkey, coin: .smartBitcoinCash)
-        let addressFromString = AnyAddress(string: "0xA3Dcd899C0f3832DFDFed9479a9d828c6A4EB2A7", coin: .smartBitcoinCash)!
+        let addressFromString = AnyAddress(string: "0x8bFC9477684987dcAf0970b9bce5E3D9267C99C0", coin: .smartBitcoinCash)!
 
-        XCTAssertEqual(pubkey.data.hexString, "0448a9ffac8022f1c7eb5253746e24d11d9b6b2737c0aecd48335feabb95a179916b1f3a97bed6740a85a2d11c663d38566acfb08af48a47ce0c835c65c9b23d0d")
+        XCTAssertEqual(pubkey.data.hexString, "046439f94100c802691c53ef18523be2c24d301f0e2bd3b425e832378a5405eff4331d5e57303785969073321fc76a8504a3854bdb21e6ab7b268a1737882a29c0")
         XCTAssertEqual(address.description, addressFromString.description)
     }
 
diff --git a/swift/Tests/Blockchains/SolanaTests.swift b/swift/Tests/Blockchains/SolanaTests.swift
index a0632941a0c..9c6287ddef3 100644
--- a/swift/Tests/Blockchains/SolanaTests.swift
+++ b/swift/Tests/Blockchains/SolanaTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -228,4 +226,107 @@ class SolanaTests: XCTestCase {
 
         XCTAssertEqual(result, "3p2kzZ1DvquqC6LApPuxpTg5CCDVPqJFokGSnGhnBHrta4uq7S2EyehV1XNUVXp51D69GxGzQZUjikfDzbWBG2aFtG3gHT1QfLzyFKHM4HQtMQMNXqay1NAeiiYZjNhx9UvMX4uAQZ4Q6rx6m2AYfQ7aoMUrejq298q1wBFdtS9XVB5QTiStnzC7zs97FUEK2T4XapjF1519EyFBViTfHpGpnf5bfizDzsW9kYUtRDW1UC2LgHr7npgq5W9TBmHf9hSmRgM9XXucjXLqubNWE7HUMhbKjuBqkirRM")
     }
+
+    func testDecodeUpdateBlockhashAndSign() throws {
+        // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+        let encodedTx = "AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG"
+        let newBlockhash = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg"
+        let encodedTxData = Base64.decode(string: encodedTx)!
+        
+        let senderPrivateKey = Data(hexString: "7f0932159226ddec9e1a4b0b8fe7cdc135049f9e549a867d722aa720dd64f32e")!
+        let feePayerPrivateKey = Data(hexString: "4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7")!
+        
+        // Step 1: Decode the transaction.
+        
+        let decodeOutputData = TransactionDecoder.decode(coinType: .solana, encodedTx: encodedTxData)
+        var decodeOutput = try SolanaDecodingTransactionOutput(serializedData: decodeOutputData)
+        
+        XCTAssertEqual(decodeOutput.error, .ok)
+        
+        // Step 2: Update recent blockhash.
+
+        decodeOutput.transaction.legacy.recentBlockhash = newBlockhash
+        
+        // Step 3: Re-sign the updated transaction.
+        
+        let signingInput = SolanaSigningInput.with {
+            $0.privateKey = senderPrivateKey
+            $0.feePayerPrivateKey = feePayerPrivateKey
+            $0.rawMessage = decodeOutput.transaction
+            $0.txEncoding = .base64
+        }
+        
+        let output: SolanaSigningOutput = AnySigner.sign(input: signingInput, coin: .solana)
+        XCTAssertEqual(output.error, .ok)
+        XCTAssertEqual(output.encoded, "Ajzc/Tke0CG8Cew5qFa6xZI/7Ya3DN0M8Ige6tKPsGzhg8Bw9DqL18KUrEZZ1F4YqZBo4Rv+FsDT8A7Nss7p4A6BNVZzzGprCJqYQeNg0EVIbmPc6mDitNniHXGeKgPZ6QZbM4FElw9O7IOFTpOBPvQFeqy0vZf/aayncL8EK/UEAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG")
+    }
+    
+    func testSignFromWalletConnectRequest() throws {
+        // Step 1: Parse a signing request received through WalletConnect.
+        
+        let requestPayload = """
+        {"transaction":"AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA="}
+        """
+        let parsingInput = WalletConnectParseRequestInput.with {
+            $0.method = .solanaSignTransaction
+            $0.payload = requestPayload
+        }
+        let parsingInputBytes = try parsingInput.serializedData()
+        
+        let parsingOutputBytes = WalletConnectRequest.parse(coin: .solana, input: parsingInputBytes)
+        let parsingOutput = try WalletConnectParseRequestOutput(serializedData: parsingOutputBytes)
+        
+        var signingInput = parsingOutput.solana
+        
+        // Step 2: Set missing fields.
+        
+        signingInput.privateKey = Base58.decodeNoCheck(string: "A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr")!
+        signingInput.txEncoding = .base64
+        
+        // Step 3: Sign the transaction.
+        
+        let output: SolanaSigningOutput = AnySigner.sign(input: signingInput, coin: .solana)
+        
+        let expected = "AQPWaOi7dMdmQpXi8HyQQKwiqIftrg1igGQxGtZeT50ksn4wAnyH4DtDrkkuE0fqgx80LTp4LwNN9a440SrmoA8BAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA="
+        XCTAssertEqual(output.encoded, expected)
+    }
+    
+    func testSetPriorityFee() throws {
+        let privateKey = Data(hexString: "baf2b2dbbbad7ca96c1fa199c686f3d8fbd2c7b352f307e37e04f33df6741f18")!
+        let originalTx = "AX43+Ir2EDqf2zLEvgzFrCZKRjdr3wCdp8CnvYh6N0G/s86IueX9BbiNUl16iLRGvwREDfi2Srb0hmLNBFw1BwABAAEDODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG6GdPcA92ORzVJe2jfG8KQqqMHr9YTLu30oM4i7MFEoBAgIAAQwCAAAA6AMAAAAAAAA="
+
+        // Step 1 - Check if there are no price and limit instructions in the original transaction.
+        XCTAssertEqual(SolanaTransaction.getComputeUnitPrice(encodedTx: originalTx), nil)
+        XCTAssertEqual(SolanaTransaction.getComputeUnitLimit(encodedTx: originalTx), nil)
+
+        // Step 2 - Set price and limit instructions.
+        let txWithPrice = SolanaTransaction.setComputeUnitPrice(encodedTx: originalTx, price: "1000")!
+        let updatedTx = SolanaTransaction.setComputeUnitLimit(encodedTx: txWithPrice, limit: "10000")!
+
+        XCTAssertEqual(updatedTx, "AX43+Ir2EDqf2zLEvgzFrCZKRjdr3wCdp8CnvYh6N0G/s86IueX9BbiNUl16iLRGvwREDfi2Srb0hmLNBFw1BwABAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAboZ09wD3Y5HNUl7aN8bwpCqowev1hMu7fSgziLswUSgMDAAUCECcAAAICAAEMAgAAAOgDAAAAAAAAAwAJA+gDAAAAAAAA")
+
+        // Step 3 - Check if price and limit instructions are set successfully.
+        XCTAssertEqual(SolanaTransaction.getComputeUnitPrice(encodedTx: updatedTx), "1000")
+        XCTAssertEqual(SolanaTransaction.getComputeUnitLimit(encodedTx: updatedTx), "10000")
+
+        // Step 4 - Decode transaction into a `RawMessage` Protobuf.
+        let updatedTxData = Base64.decode(string: updatedTx)!
+        let decodeOutputData = TransactionDecoder.decode(coinType: .solana, encodedTx: updatedTxData)
+        var decodeOutput = try SolanaDecodingTransactionOutput(serializedData: decodeOutputData)
+
+        XCTAssertEqual(decodeOutput.error, .ok)
+
+        // Step 5 - Sign the decoded `RawMessage` transaction.
+        let signingInput = SolanaSigningInput.with {
+            $0.privateKey = privateKey
+            $0.rawMessage = decodeOutput.transaction
+            $0.txEncoding = .base64
+        }
+
+        let output: SolanaSigningOutput = AnySigner.sign(input: signingInput, coin: .solana)
+        XCTAssertEqual(output.error, .ok)
+        // Successfully broadcasted tx:
+        // https://explorer.solana.com/tx/2ho7wZUXbDNz12xGfsXg2kcNMqkBAQjv7YNXNcVcuCmbC4p9FZe9ELeM2gMjq9MKQPpmE3nBW5pbdgwVCfNLr1h8
+        XCTAssertEqual(output.encoded, "AVUye82Mv+/aWeU2G+B6Nes365mUU2m8iqcGZn/8kFJvw4wY6AgKGG+vJHaknHlCDwE1yi1SIMVUUtNCOm3kHg8BAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAboZ09wD3Y5HNUl7aN8bwpCqowev1hMu7fSgziLswUSgMDAAUCECcAAAICAAEMAgAAAOgDAAAAAAAAAwAJA+gDAAAAAAAA")
+    }
 }
diff --git a/swift/Tests/Blockchains/StargazeTests.swift b/swift/Tests/Blockchains/StargazeTests.swift
new file mode 100644
index 00000000000..16bc5f5c3c0
--- /dev/null
+++ b/swift/Tests/Blockchains/StargazeTests.swift
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class StargazeTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: true)
+        let address = AnyAddress(publicKey: pubkey, coin: .stargaze)
+        let addressFromString = AnyAddress(string: "stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy", coin: .stargaze)!
+
+        XCTAssertEqual(pubkey.data.hexString, "02cbfdb5e472893322294e60cf0883d43df431e1089d29ecb447a9e6d55045aae5")
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+    
+    func testSignCW721() {
+        let privateKey = PrivateKey(data: Data(hexString: "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433")!)!
+
+        let txMessage = "{\"transfer_nft\": {\"recipient\": \"stars1kd5q7qejlqz94kpmd9pvr4v2gzgnca3lvt6xnp\",\"token_id\": \"1209\"}}";
+        let wasmMsg = CosmosMessage.WasmExecuteContractGeneric.with {
+            $0.contractAddress = "stars14gmjlyfz5mpv5d8zrksn0tjhz2wwvdc4yk06754alfasq9qen7fsknry42"
+            $0.senderAddress = "stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy"
+            $0.executeMsg = txMessage
+        }
+
+        let message = CosmosMessage.with {
+            $0.wasmExecuteContractGeneric = wasmMsg
+        }
+
+        let fee = CosmosFee.with {
+            $0.gas = 666666
+            $0.amounts = [CosmosAmount.with {
+                $0.amount = "1000"
+                $0.denom = "ustars"
+            }]
+        }
+
+        let input = CosmosSigningInput.with {
+            $0.signingMode = .protobuf;
+            $0.accountNumber = 188393
+            $0.chainID = "stargaze-1"
+            $0.memo = ""
+            $0.sequence = 5
+            $0.messages = [message]
+            $0.fee = fee
+            $0.privateKey = privateKey.data
+        }
+
+        let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .stargaze)
+
+        // Successfully broadcasted: https://www.mintscan.io/stargaze/txs/300836A5BF9002CF38EE34A8C56E8E7E6854FA64F1DEB3AE108F381A48150F7C
+        let expected = """
+        {
+                            "mode":"BROADCAST_MODE_BLOCK",
+                            "tx_bytes":"CoACCv0BCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QS1AEKLHN0YXJzMW1yeTQ3cGtnYTV0ZHN3dGx1eTBtOHRlc2xwYWxrZHEwMmE4bmh5EkBzdGFyczE0Z21qbHlmejVtcHY1ZDh6cmtzbjB0amh6Mnd3dmRjNHlrMDY3NTRhbGZhc3E5cWVuN2Zza25yeTQyGmJ7InRyYW5zZmVyX25mdCI6IHsicmVjaXBpZW50IjogInN0YXJzMWtkNXE3cWVqbHF6OTRrcG1kOXB2cjR2Mmd6Z25jYTNsdnQ2eG5wIiwidG9rZW5faWQiOiAiMTIwOSJ9fRJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECy/215HKJMyIpTmDPCIPUPfQx4QidKey0R6nm1VBFquUSBAoCCAEYBRIUCg4KBnVzdGFycxIEMTAwMBCq2CgaQMx+l2sdM5DAPbDyY1p173MLnjGyNWIcRmaFiVNphLuTV3tjhwPbsXEA0hyRxyWS3vN0/xUF/JEsO9wRspj2aJ4="
+        }
+        """;
+        XCTAssertJSONEqual(output.serialized, expected)
+        XCTAssertEqual(output.errorMessage, "")
+    }
+
+    func testSign() {
+        let privateKey = PrivateKey(data: Data(hexString: "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433")!)!
+        let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
+        let fromAddress = AnyAddress(publicKey: publicKey, coin: .stargaze)
+
+        let sendCoinsMessage = CosmosMessage.Send.with {
+            $0.fromAddress = fromAddress.description
+            $0.toAddress = "stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy"
+            $0.amounts = [CosmosAmount.with {
+                $0.amount = "10000"
+                $0.denom = "ustars"
+            }]
+        }
+
+        let message = CosmosMessage.with {
+            $0.sendCoinsMessage = sendCoinsMessage
+        }
+
+        let fee = CosmosFee.with {
+            $0.gas = 80000
+            $0.amounts = [CosmosAmount.with {
+                $0.amount = "1000"
+                $0.denom = "ustars"
+            }]
+        }
+
+        let input = CosmosSigningInput.with {
+            $0.signingMode = .protobuf;
+            $0.accountNumber = 188393
+            $0.chainID = "stargaze-1"
+            $0.memo = ""
+            $0.sequence = 0
+            $0.messages = [message]
+            $0.fee = fee
+            $0.privateKey = privateKey.data
+        }
+
+        let output: CosmosSigningOutput = AnySigner.sign(input: input, coin: .stargaze)
+
+        // Successfully broadcasted: https://www.mintscan.io/stargaze/txs/98D5E36CA7080DDB286FE924A5A9976ABD4EBE49C92A09D322F29AD30DE4BE4D
+        let expected = """
+        {
+                            "mode":"BROADCAST_MODE_BLOCK",
+                            "tx_bytes":"CpABCo0BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm0KLHN0YXJzMW1yeTQ3cGtnYTV0ZHN3dGx1eTBtOHRlc2xwYWxrZHEwMmE4bmh5EixzdGFyczFtcnk0N3BrZ2E1dGRzd3RsdXkwbTh0ZXNscGFsa2RxMDJhOG5oeRoPCgZ1c3RhcnMSBTEwMDAwEmYKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLL/bXkcokzIilOYM8Ig9Q99DHhCJ0p7LRHqebVUEWq5RIECgIIARIUCg4KBnVzdGFycxIEMTAwMBCA8QQaQHAkntxzC1oH7Yde4+KEmnB+K3XbJIYw0q6MqMPEY65YAwBDNDOdaTu/rpehus/20MvBfbAEZiw9+whzXLpkQ5A="
+        }
+        """;
+        XCTAssertJSONEqual(output.serialized, expected)
+        XCTAssertEqual(output.errorMessage, "")
+    }
+}
diff --git a/swift/Tests/Blockchains/StarkExTests.swift b/swift/Tests/Blockchains/StarkExTests.swift
new file mode 100644
index 00000000000..56dd47f5839
--- /dev/null
+++ b/swift/Tests/Blockchains/StarkExTests.swift
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class StarkExTests: XCTestCase {
+    func testMessageAndVerifySigner() {
+        let privateKey = PrivateKey(data: Data(hexString: "04be51a04e718c202e4dca60c2b72958252024cfc1070c090dd0f170298249de")!)!
+        let msg = "463a2240432264a3aa71a5713f2a4e4c1b9e12bbb56083cd56af6d878217cf"
+        let signature = StarkExMessageSigner.signMessage(privateKey: privateKey, message: msg)
+        XCTAssertEqual(signature, "04cf5f21333dd189ada3c0f2a51430d733501a9b1d5e07905273c1938cfb261e05b6013d74adde403e8953743a338c8d414bb96bf69d2ca1a91a85ed2700a528")
+        let pubKey = privateKey.getPublicKeyByType(pubkeyType: .starkex)
+        XCTAssertTrue(StarkExMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
+    }
+}
diff --git a/swift/Tests/Blockchains/StellarTests.swift b/swift/Tests/Blockchains/StellarTests.swift
index 9ff0754b748..159d1575fdb 100644
--- a/swift/Tests/Blockchains/StellarTests.swift
+++ b/swift/Tests/Blockchains/StellarTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/SuiTests.swift b/swift/Tests/Blockchains/SuiTests.swift
new file mode 100644
index 00000000000..868cb6947ec
--- /dev/null
+++ b/swift/Tests/Blockchains/SuiTests.swift
@@ -0,0 +1,69 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class SuiTests: XCTestCase {
+    func testAddress() {
+        let anyAddress = AnyAddress(string: "0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015", coin: .sui)
+
+        XCTAssertEqual(anyAddress?.description, "0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015")
+        XCTAssertEqual(anyAddress?.coin, .sui)
+
+        let invalid = "MQqpqMQgCBuiPkoXfgZZsJvuzCeI1zc00z6vHJj4"
+        XCTAssertNil(Data(hexString: invalid))
+        XCTAssertNil(AnyAddress(string: invalid, coin: .sui))
+        XCTAssertFalse(AnyAddress.isValid(string: invalid, coin: .sui))
+    }
+
+    func testSignDirect() {
+        // Successfully broadcasted: https://suiscan.xyz/mainnet/tx/D4Ay9TdBJjXkGmrZSstZakpEWskEQHaWURP6xWPRXbAm
+        let privateKeyData = Data(hexString: "7e6682f7bf479ef0f627823cffd4e1a940a7af33e5fb39d9e0f631d2ecc5daff")!
+        let txBytes = """
+AAAEAAjoAwAAAAAAAAAIUMMAAAAAAAAAIKcXWr3V7ZLr4605DbNmxqcGR4zfUXzebPmGMAZc2jd6ACBU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsgMCAAIBAAABAQABAQMAAAAAAQIAAQEDAAABAAEDAFToDXbXkMJ39aRPPOkvU9JvWJSJK/OV3uY3WYiHa+ayAWNgILOn3HsRw6pvQZsX+KnBLn95ox0b3S3mcLTt1jAFeHEaBQAAAAAgGGuNnxrqusosgjP3gQ3jBjnhapGNBlcU0yTaupXpa0BU6A1215DCd/WkTzzpL1PSb1iUiSvzld7mN1mIh2vmsu4CAAAAAAAAwMYtAAAAAAAA
+"""
+
+        let input = SuiSigningInput.with {
+            $0.paySui = SuiPaySui.with {
+                $0.inputCoins = [SuiObjectRef.with {
+                    $0.objectID = "0x636020b3a7dc7b11c3aa6f419b17f8a9c12e7f79a31d1bdd2de670b4edd63005"
+                    $0.version = 85619064
+                    $0.objectDigest = "2eKuWbZSVfpFVfg8FXY9wP6W5AFXnTchSoUdp7obyYZ5"
+                }]
+                $0.recipients = [
+                    "0xa7175abdd5ed92ebe3ad390db366c6a706478cdf517cde6cf98630065cda377a",
+                    "0x54e80d76d790c277f5a44f3ce92f53d26f5894892bf395dee6375988876be6b2"
+                ]
+                $0.amounts = [1000, 50000]
+            }
+            $0.privateKey = privateKeyData
+            // 0.003 SUI
+            $0.gasBudget = 3000000
+            $0.referenceGasPrice = 750
+        }
+        let output: SuiSigningOutput = AnySigner.sign(input: input, coin: .sui)
+        XCTAssertEqual(output.unsignedTx, txBytes)
+        let expectedSignature = "AEh44B7iGArEHF1wOLAQJMLNgGnaIwn3gKPC92vtDJqITDETAM5z9plaxio1xomt6/cZReQ5FZaQsMC6l7E0BwmF69FEH+T5VPvl3GB3vwCOEZpeJpKXxvcIPQAdKsh2/g=="
+        XCTAssertEqual(output.signature, expectedSignature)
+    }
+    
+    func testTransferSui() {
+        // Successfully broadcasted https://explorer.sui.io/txblock/HkPo6rYPyDY53x1MBszvSZVZyixVN7CHvCJGX381czAh?network=devnet
+        let privateKeyData = Data(hexString: "3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266")!
+        let txBytes = """
+AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA
+"""
+        let input = SuiSigningInput.with {
+            $0.signDirectMessage = SuiSignDirect.with {
+                $0.unsignedTxMsg = txBytes
+            }
+            $0.privateKey = privateKeyData
+        }
+        let output: SuiSigningOutput = AnySigner.sign(input: input, coin: .sui)
+        XCTAssertEqual(output.unsignedTx, txBytes)
+        let expectedSignature = "APxPduNVvHj2CcRcHOtiP2aBR9qP3vO2Cb0g12PI64QofDB6ks33oqe/i/iCTLcop2rBrkczwrayZuJOdi7gvwNqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg=="
+        XCTAssertEqual(output.signature, expectedSignature)
+    }
+}
diff --git a/swift/Tests/Blockchains/SyscoinTests.swift b/swift/Tests/Blockchains/SyscoinTests.swift
new file mode 100644
index 00000000000..9668e7de5de
--- /dev/null
+++ b/swift/Tests/Blockchains/SyscoinTests.swift
@@ -0,0 +1,167 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class SyscoinTests: XCTestCase {
+    func testAddress() {
+        let privateKey1 = PrivateKey(data: Data(hexString: "a22ddec5c567b4488bb00f69b6146c50da2ee883e2c096db098726394d585730")!)!
+        let publicKey1 = privateKey1.getPublicKeySecp256k1(compressed: true)
+
+        let legacyAddress = BitcoinAddress(publicKey: publicKey1, prefix: CoinType.syscoin.p2pkhPrefix)!
+        XCTAssertEqual(BitcoinAddress(string: "SXBPFk2PFDAP13qyKSdC4yptsJ8kJRAT3T")!.description, legacyAddress.description)
+
+        let privateKey2 = PrivateKey(data: Data(hexString: "f6ee7e6c9bd2f4dc8f0db0dc4679de06c998afc42d825edf7966dd4488b0aa1f")!)!
+        let publicKey2 = privateKey2.getPublicKeySecp256k1(compressed: true)
+        let compatibleAddress = BitcoinAddress.compatibleAddress(publicKey: publicKey2, prefix: CoinType.syscoin.p2shPrefix)
+        XCTAssertEqual(BitcoinAddress(string: "32SKP7HqJLPRNEUNUDddNAXCxyMinjbX8g")!.description, compatibleAddress.description)
+
+        let privateKey3 = PrivateKey(data: Data(hexString: "55f9cbb0376c422946fa28397c1219933ac60b312ede41bfacaf701ecd546625")!)!
+        let publicKey3 = privateKey3.getPublicKeySecp256k1(compressed: true)
+        let bech32Address = SegwitAddress(hrp: .syscoin, publicKey: publicKey3)
+        XCTAssertEqual(SegwitAddress(string: "sys1qytnqzjknvv03jwfgrsmzt0ycmwqgl0as7lkcf7")!.description, bech32Address.description)
+    }
+
+    func testSyscoinBlockchain() {
+        let chain = CoinType.syscoin
+        XCTAssertTrue(chain.validate(address: "sys1qytnqzjknvv03jwfgrsmzt0ycmwqgl0as7lkcf7"))
+        XCTAssertTrue(chain.validate(address: "SXBPFk2PFDAP13qyKSdC4yptsJ8kJRAT3T"))
+        XCTAssertTrue(chain.validate(address: "32SKP7HqJLPRNEUNUDddNAXCxyMinjbX8g"))
+        XCTAssertFalse(chain.validate(address: "Xm1iDLBP5tdxTxc6t7uJBCVjC4L2A5vB2J"))
+        XCTAssertFalse(chain.validate(address: "bitcoincash:qq07l6rr5lsdm3m80qxw80ku2ex0tj76vvsxpvmgme"))
+        XCTAssertFalse(chain.validate(address: "bc1qvtvte5tzlqlfhcdmph94lxk8jcz54q6psyvgla"))
+    }
+
+    func testExtendedKeys() {
+        let wallet = HDWallet.test
+
+        // .bip44
+        let xprv = wallet.getExtendedPrivateKey(purpose: .bip44, coin: .syscoin, version: .xprv)
+        let xpub = wallet.getExtendedPublicKey(purpose: .bip44, coin: .syscoin, version: .xpub)
+
+        XCTAssertEqual(xprv, "xprv9yFNgN7z81uG6QtwFt7gvbmLeDGeGfS2ar3DunwEkZcC7uLBXyy4eaaV3ir769zMLe3eHuTaGUtWVXwp6dkunLsfmA7bf3XqEFpTjHxSijx")
+        XCTAssertEqual(xpub, "xpub6CEj5sesxPTZJtyQMuehHji5CF78g89sx4xpiBLrJu9AzhfL5XHKCNtxtzPzyGxqb6jMbZfmbHeSGZZArL4hLttmdC6KEMuiWy7VocTYjzR")
+
+        // .bip49
+        let yprv = wallet.getExtendedPrivateKey(purpose: .bip49, coin: .syscoin, version: .yprv)
+        let ypub = wallet.getExtendedPublicKey(purpose: .bip49, coin: .syscoin, version: .ypub)
+        XCTAssertEqual(yprv, "yprvAJAofBFEEQ1DLJJVMkPr4pufHLUKZ2VSbtHqPpphEgwgfvG8exgadM8vtW8AW52N7tqU4qM8JHk5xZkq3icnzoph5QA5kRVHBnhXuRMGw2b")
+        XCTAssertEqual(ypub, "ypub6XAA4gn84mZWYnNxTmvrRxrPqNJoxVDHy7DSCDEJo2UfYibHCVzqB9TQjmL2TKSEZVFmTNcmdJXunEu6oV2AFQNeiszjzcnX4nbG27s4SgS")
+
+        // .bip84
+        let zprv = wallet.getExtendedPrivateKey(purpose: .bip84, coin: .syscoin, version: .zprv)
+        let zpub = wallet.getExtendedPublicKey(purpose: .bip84, coin: .syscoin, version: .zpub)
+        XCTAssertEqual(zprv, "zprvAcdCiLx9ooAFnC1hXh7stnobLnnu7u25rqfLeJ9v632xdCXJrc8KvgNk2eZeQQbPQHvcUpsfJzgyDkRdfnkT6vjpYqkxFv1LsPxQ7uFwLGy")
+        XCTAssertEqual(zpub, "zpub6qcZ7rV3eAiYzg6AdietFvkKtpdPXMjwE4awSgZXeNZwVzrTQ9SaUUhDswmdA4A5riyimx322es7niQvJ1Fbi3mJNSVz3d3f9GBsYBb8Wky")
+    }
+
+    func testDeriveFromXpub() {
+        let xpub = "xpub6CEj5sesxPTZJtyQMuehHji5CF78g89sx4xpiBLrJu9AzhfL5XHKCNtxtzPzyGxqb6jMbZfmbHeSGZZArL4hLttmdC6KEMuiWy7VocTYjzR"
+        let syscoin = CoinType.syscoin
+        let xpubAddr2 = HDWallet.getPublicKeyFromExtended(
+            extended: xpub,
+            coin: syscoin,
+            derivationPath: DerivationPath(purpose: .bip44, coin: syscoin.slip44Id, account: 0, change: 0, address: 2).description
+        )!
+        let xpubAddr9 = HDWallet.getPublicKeyFromExtended(
+            extended: xpub,
+            coin: syscoin,
+            derivationPath: DerivationPath(purpose: .bip44, coin: syscoin.slip44Id, account: 0, change: 0, address: 9).description
+        )!
+
+        XCTAssertEqual(BitcoinAddress(publicKey: xpubAddr2, prefix: CoinType.syscoin.p2pkhPrefix)!.description, "SkXxaA1GQu6D49qxrjSMCgsybWVsWMZb32")
+        XCTAssertEqual(BitcoinAddress(publicKey: xpubAddr9, prefix: CoinType.syscoin.p2pkhPrefix)!.description, "ST8SwH6wp6qx6RnQcnUfTJCHznDPsdatzC")
+    }
+
+    func testDeriveFromYpub() {
+        let ypub = "ypub6XAA4gn84mZWYnNxTmvrRxrPqNJoxVDHy7DSCDEJo2UfYibHCVzqB9TQjmL2TKSEZVFmTNcmdJXunEu6oV2AFQNeiszjzcnX4nbG27s4SgS"
+
+        let syscoin = CoinType.syscoin
+        let ypubAddr3 = HDWallet.getPublicKeyFromExtended(
+            extended: ypub,
+            coin: syscoin,
+            derivationPath: DerivationPath(purpose: .bip49, coin: syscoin.slip44Id, account: 0, change: 0, address: 3).description
+        )!
+        let ypubAddr10 = HDWallet.getPublicKeyFromExtended(
+            extended: ypub,
+            coin: syscoin,
+            derivationPath: DerivationPath(purpose: .bip49, coin: syscoin.slip44Id, account: 0, change: 0, address: 10).description
+        )!
+
+        XCTAssertEqual(BitcoinAddress.compatibleAddress(publicKey: ypubAddr3, prefix: CoinType.syscoin.p2shPrefix).description, "31hP9bQFV1iX49yGaaz2ZwoxXzqpPx2vbk")
+        XCTAssertEqual(BitcoinAddress.compatibleAddress(publicKey: ypubAddr10, prefix: CoinType.syscoin.p2shPrefix).description, "3FhBf4MUNWFiMz3RTbpKb7eie4WHhErSs5")
+    }
+
+    func testDeriveFromZPub() {
+        let zpub = "zpub6qcZ7rV3eAiYzg6AdietFvkKtpdPXMjwE4awSgZXeNZwVzrTQ9SaUUhDswmdA4A5riyimx322es7niQvJ1Fbi3mJNSVz3d3f9GBsYBb8Wky"
+        let syscoin = CoinType.syscoin
+        let zpubAddr4 = HDWallet.getPublicKeyFromExtended(
+            extended: zpub,
+            coin: syscoin,
+            derivationPath: DerivationPath(purpose: .bip49, coin: syscoin.slip44Id, account: 0, change: 0, address: 4).description
+        )!
+        let zpubAddr11 = HDWallet.getPublicKeyFromExtended(
+            extended: zpub,
+            coin: syscoin,
+            derivationPath: DerivationPath(purpose: .bip49, coin: syscoin.slip44Id, account: 0, change: 0, address: 11).description
+        )!
+
+        XCTAssertEqual(SegwitAddress(hrp: .syscoin, publicKey: zpubAddr4).description, "sys1q54ylw7uztxagxq5hz93cmdrawthhrd00knkp23")
+        XCTAssertEqual(SegwitAddress(hrp: .syscoin, publicKey: zpubAddr11).description, "sys1q7yzsja5wtkswdc6rleupsvzny3gnyhye0qvdda")
+    }
+
+    func testPlanAndSign_8435() throws {
+        let address = "sys1qytnqzjknvv03jwfgrsmzt0ycmwqgl0as7lkcf7"
+        let lockScript = BitcoinScript.lockScriptForAddress(address: address, coin: .syscoin)
+        let utxos = [
+            BitcoinUnspentTransaction.with {
+                $0.outPoint.hash = Data.reverse(hexString: "a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407")
+                $0.outPoint.index = 0
+                $0.outPoint.sequence = UINT32_MAX
+                $0.script = lockScript.data
+                $0.amount = 3899774
+            }
+        ]
+
+        // redeem p2pwkh
+        let scriptHash = lockScript.matchPayToWitnessPublicKeyHash()!
+        var input = BitcoinSigningInput.with {
+            $0.toAddress = "sys1q54ylw7uztxagxq5hz93cmdrawthhrd00knkp23"
+            $0.changeAddress = address
+            $0.hashType = BitcoinScript.hashTypeForCoin(coinType: .syscoin)
+            $0.amount = 1200000
+            $0.coinType = CoinType.syscoin.rawValue
+            $0.byteFee = 1
+            $0.utxo = utxos
+            $0.useMaxAmount = false
+            $0.scripts = [
+                scriptHash.hexString: BitcoinScript.buildPayToPublicKeyHash(hash: scriptHash).data
+            ]
+        }
+
+        // Plan
+        let plan: BitcoinTransactionPlan = AnySigner.plan(input: input, coin: .syscoin)
+
+        XCTAssertEqual(plan.amount, 1200000)
+        XCTAssertEqual(plan.fee, 141)
+        XCTAssertEqual(plan.change, 2699633)
+
+        // Extend input with private key
+        input.privateKey = [Data(hexString: "55f9cbb0376c422946fa28397c1219933ac60b312ede41bfacaf701ecd546625")!]
+        input.plan = plan
+
+        // Sign
+        let output: BitcoinSigningOutput = AnySigner.sign(input: input, coin: .syscoin)
+        XCTAssertEqual(output.error, TW_Common_Proto_SigningError.ok)
+
+        let txId = output.transactionID
+        XCTAssertEqual(txId, "cb92bae012ebdd88b720198e40d470746d1af2e8b9b875bb763c831341cb2ded")
+
+        let encoded = output.encoded
+        XCTAssertEqual(encoded.hexString,
+            "0100000000010107c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa80000000000ffffffff02804f120000000000160014a549f77b8259ba83029711638db47d72ef71b5ef713129000000000016001422e6014ad3631f1939281c3625bc98db808fbfb00247304402201fff942424755a4ecc84c916c3045c73efab03f9e13e55b27a6ecf6d2027d88602205e54d2fd728e0cfedeecb987dcb346e6e14c5b24ffb26d3db543d90f6571f7080121025cf26d221b01ca4d6040893b96f1dabfd2a108d449b3fa62854421f98a42562b00000000"
+        )
+    }
+}
diff --git a/swift/Tests/Blockchains/THORChainSwapTests.swift b/swift/Tests/Blockchains/THORChainSwapTests.swift
index cb51dd73711..b13699a857b 100644
--- a/swift/Tests/Blockchains/THORChainSwapTests.swift
+++ b/swift/Tests/Blockchains/THORChainSwapTests.swift
@@ -1,18 +1,18 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
 
 class THORSwapTests: XCTestCase {
 
-    func testSignerEthBnb() throws {
+    func testSignerEthBnbWithFee() throws {
         // prepare swap input
         let input = THORChainSwapSwapInput.with {
-            $0.fromChain = .eth
+            $0.fromAsset = THORChainSwapAsset.with {
+                $0.chain = .eth
+            }
             $0.fromAddress = "0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7"
             $0.toAsset = THORChainSwapAsset.with {
                 $0.chain = .bnb
@@ -24,15 +24,17 @@ class THORSwapTests: XCTestCase {
             $0.routerAddress = "0x42A5Ed456650a09Dc10EBc6361A7480fDd61f27B"
             $0.fromAmount = "50000000000000000"
             $0.toAmountLimit = "600003"
+            $0.affiliateFeeAddress = "tthor1ql2tcqyrqsgnql2tcqyj2n8kfdmt9lh0yzql2tcqy"
+            $0.affiliateFeeRateBp = "10"
         }
 
         // serialize input
         let inputSerialized = try input.serializedData()
-        XCTAssertEqual(inputSerialized.hexString, "0802122a3078623966353737316332373636346266323238326439386530396437663530636563376362303161371a0708031203424e42222a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372782a2a307831303931633444653661336346303943644130304162444165443432633763334236394338334543322a3078343241354564343536363530613039446331304542633633363141373438306644643631663237423a1135303030303030303030303030303030304206363030303033")
+        XCTAssertEqual(inputSerialized.hexString, "0a020802122a3078623966353737316332373636346266323238326439386530396437663530636563376362303161371a0708031203424e42222a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372782a2a307831303931633444653661336346303943644130304162444165443432633763334236394338334543322a3078343241354564343536363530613039446331304542633633363141373438306644643631663237423a11353030303030303030303030303030303042063630303030334a2f7474686f7231716c3274637179727173676e716c32746371796a326e386b66646d74396c6830797a716c327463717952023130")
 
         // invoke swap
         let outputData = THORChainSwap.buildSwap(input: inputSerialized)
-        XCTAssertEqual(outputData.count, 311)
+        XCTAssertEqual(outputData.count, 192)
 
         // parse result in proto
         let outputProto = try THORChainSwapSwapOutput(serializedData: outputData)
@@ -51,13 +53,15 @@ class THORSwapTests: XCTestCase {
         // sign and encode resulting input
         let output: EthereumSigningOutput = AnySigner.sign(input: txInput, coin: .ethereum)
 
-        XCTAssertEqual(output.encoded.hexString, "f90151038506fc23ac00830138809442a5ed456650a09dc10ebc6361a7480fdd61f27b87b1a2bc2ec50000b8e41fece7b40000000000000000000000001091c4de6a3cf09cda00abdaed42c7c3b69c83ec000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec500000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000003e535741503a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a363030303033000025a06ae104be3201baca38315352f81fac70ca4dd47339981914e64e91149813e780a066a3f0b2c44ddf5a96a38481274f623f552a593d723237d6742185f4885c0064")
+        XCTAssertEqual(output.encoded.hexString, "02f8d90103808083013880941091c4de6a3cf09cda00abdaed42c7c3b69c83ec87b1a2bc2ec50000b86e3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a3630303030333a7474686f7231716c3274637179727173676e716c32746371796a326e386b66646d74396c6830797a716c32746371793a3130c001a05c16871b66fd0fa8f658d6f171310bab332d09e0533d6c97329a59ddc93a9a11a05ed2be94e6dbb640e58920c8be4fa597cd5f0a918123245acb899042dd43777f")
     }
 
     func testSignerBnbBtc() throws {
         // prepare swap input
         let input = THORChainSwapSwapInput.with {
-            $0.fromChain = .bnb
+            $0.fromAsset = THORChainSwapAsset.with {
+                $0.chain = .bnb
+            }
             $0.fromAddress = "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx"
             $0.toAsset = THORChainSwapAsset.with {
                 $0.chain = .btc
@@ -73,11 +77,11 @@ class THORSwapTests: XCTestCase {
         
         // serialize input
         let inputSerialized = try input.serializedData()
-        XCTAssertEqual(inputSerialized.hexString, "0803122a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372781a0708011203425443222a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070382a2a626e62316e396573787577386361377473386c367736366b64683830307330396d7376756c36766c73653a08313030303030303042083130303030303030")
+        XCTAssertEqual(inputSerialized.hexString, "0a020803122a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372781a0708011203425443222a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070382a2a626e62316e396573787577386361377473386c367736366b64683830307330396d7376756c36766c73653a08313030303030303042083130303030303030")
 
         // invoke swap
         let outputData = THORChainSwap.buildSwap(input: inputSerialized)
-        XCTAssertEqual(outputData.count, 149)
+        XCTAssertEqual(outputData.count, 146)
 
         // parse result in proto
         let outputProto = try THORChainSwapSwapOutput(serializedData: outputData)
@@ -94,6 +98,6 @@ class THORSwapTests: XCTestCase {
         // sign and encode resulting input
         let output: BinanceSigningOutput = AnySigner.sign(input: txInput, coin: .binance)
 
-        XCTAssertEqual(output.encoded.hexString, "8002f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e421080ade204126a0a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e1912404836ee8659caa86771281d3f104424d95977bdedf644ec8585f1674796fde525669a6d446f72da89ee90fb0e064473b0a2159a79630e081592c52948d03d67071a40535741503a4254432e4254433a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070383a3130303030303030")
+        XCTAssertEqual(output.encoded.hexString, "fd01f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e421080ade204126a0a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e19124008455a84c90e73981ae098578d2ab2b498fe17b0436723c596501b9236d96697514467ed4c22ba8f1cb7506172b368a2ca8be0eb82cb93b5320f938209041f2c1a3d3d3a4254432e4254433a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070383a3130303030303030")
     }
 }
diff --git a/swift/Tests/Blockchains/THORChainTests.swift b/swift/Tests/Blockchains/THORChainTests.swift
index 45d9cb3ac80..a0ae0db1d45 100644
--- a/swift/Tests/Blockchains/THORChainTests.swift
+++ b/swift/Tests/Blockchains/THORChainTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/TerraClassicTests.swift b/swift/Tests/Blockchains/TerraClassicTests.swift
index bb1e8c81e21..66ab6f11816 100644
--- a/swift/Tests/Blockchains/TerraClassicTests.swift
+++ b/swift/Tests/Blockchains/TerraClassicTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -498,7 +496,7 @@ class TerraClassicTests: XCTestCase {
 }
 """
         )
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 
     func testSigningWasmTerraGenericProtobuf() {
@@ -547,7 +545,7 @@ class TerraClassicTests: XCTestCase {
     }
     """
             )
-            XCTAssertEqual(output.error, "")
+            XCTAssertEqual(output.errorMessage, "")
         }
 
         func testSigningWasmTerraGenericWithCoins() {
@@ -600,6 +598,6 @@ class TerraClassicTests: XCTestCase {
     }
     """
             )
-            XCTAssertEqual(output.error, "")
+            XCTAssertEqual(output.errorMessage, "")
         }
     }
diff --git a/swift/Tests/Blockchains/TerraTests.swift b/swift/Tests/Blockchains/TerraTests.swift
index 02a264beadf..af8b1d0e593 100644
--- a/swift/Tests/Blockchains/TerraTests.swift
+++ b/swift/Tests/Blockchains/TerraTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -67,7 +65,7 @@ class TerraTests: XCTestCase {
         }
         """
         XCTAssertJSONEqual(expectedJSON, output.serialized)
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 
     func testSignWasmTransferTx() {
@@ -115,7 +113,7 @@ class TerraTests: XCTestCase {
         }
         """
         )
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 
     func testSignStakeTx() throws {
@@ -161,7 +159,7 @@ class TerraTests: XCTestCase {
 
         // https://finder.terra.money/mainnet/tx/4441c65f24783b8f59b20b1b80ee43f1f4f6ff827597d87b6bbc94982b45be0c
         XCTAssertJSONEqual(output.serialized, expected)
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 
     func testSignClaimRewards() throws {
@@ -211,7 +209,7 @@ class TerraTests: XCTestCase {
 
         // https://finder.terra.money/mainnet/tx/0e62170ed5407992251d7e161f23c3467e1bea54c7f601953953bdabc7f0c30c
         XCTAssertJSONEqual(output.serialized, expected)
-        XCTAssertEqual(output.error, "")
+        XCTAssertEqual(output.errorMessage, "")
     }
 
 }
diff --git a/swift/Tests/Blockchains/TezosTests.swift b/swift/Tests/Blockchains/TezosTests.swift
index 67a26a6c971..b7374aa2e9d 100644
--- a/swift/Tests/Blockchains/TezosTests.swift
+++ b/swift/Tests/Blockchains/TezosTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -113,6 +111,27 @@ class TezosTests: XCTestCase {
 
         XCTAssertEqual(output.encoded.hexString, expected)
     }
+    
+    public func testMessageSignerSignAndVerify() {
+        let privateKey = PrivateKey(data: Data(hexString: "91b4fb8d7348db2e7de2693f58ce1cceb966fa960739adac1d9dba2cbaa0940a")!)!
+        let msg = "05010000004254657a6f73205369676e6564204d6573736167653a207465737455726c20323032332d30322d30385431303a33363a31382e3435345a2048656c6c6f20576f726c64"
+        let signature = TezosMessageSigner.signMessage(privateKey: privateKey, message: msg)
+        XCTAssertEqual(signature, "edsigu3se2fcEJUCm1aqxjzbHdf7Wsugr4mLaA9YM2UVZ9Yy5meGv87VqHN3mmDeRwApTj1JKDaYjqmLZifSFdWCqBoghqaowwJ")
+        let pubKey = privateKey.getPublicKey(coinType: .tezos)
+        XCTAssertTrue(TezosMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
+    }
+    
+    public func testMessageSignerInputToPayload() {
+        let payload = TezosMessageSigner.inputToPayload(message: "Tezos Signed Message: testUrl 2023-02-08T10:36:18.454Z Hello World");
+        let expected = "05010000004254657a6f73205369676e6564204d6573736167653a207465737455726c20323032332d30322d30385431303a33363a31382e3435345a2048656c6c6f20576f726c64";
+        XCTAssertEqual(payload, expected);
+    }
+    
+    public func testMessageSignerFormatMessage() {
+        let formatedMsg = TezosMessageSigner.formatMessage(message: "Hello World", url: "testUrl")
+        let regex = try! NSRegularExpression(pattern: "Tezos Signed Message: \\S+ \\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z .+")
+        XCTAssertTrue(regex.firstMatch(in: formatedMsg, range: NSRange(location: 0, length: formatedMsg.utf16.count)) != nil)
+    }
 
     public func testSigning() {
         let privateKeyData = Data(hexString: "c6377a4cc490dc913fc3f0d9cf67d293a32df4547c46cb7e9e33c3b7b97c64d8")!
@@ -161,4 +180,34 @@ class TezosTests: XCTestCase {
 
         XCTAssertEqual(output.encoded.hexString, expected)
     }
+
+    public func testSignEncodedBytes() throws {
+
+        let key = Data(hexString: "3caf5afaed067890cd850efd1555df351aa482badb4a541c29261f1acf261bf5")!
+        let bytes = Data(hexString: "64aa7792af40de41371a72b3342daa7bf3d2b5a84511e9074341fdd52148dd9d6c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542850f96c3a1079d780080ade2040155959998da7e79231e2be8ed8ff373ac1b1574b000ffff04737761700000009e070703060707020000000807070508030b000007070100000018323032332d30322d32345431333a34303a32322e3332385a07070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484807070100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a4438457907070080dac409070700bdf892a1a291e196aa0503066c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd0497c3a107f10f180001543aa1803f0bbe2099809ab067dfa8a4cbc1c26a00ffff07617070726f76650000002d070701000000244b5431516f64676b5974754e79664a726a72673854515a586d64544643616d373268533900006c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd0498c3a107f70f090001543aa1803f0bbe2099809ab067dfa8a4cbc1c26a00ffff07617070726f766500000036070701000000244b5431516f64676b5974754e79664a726a72673854515a586d64544643616d373268533900bdf892a1a291e196aa056c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542e71599c3a107fabb01400001b1f0d7affc39861f7f5c75f917f683d2e9f55e3100ffff04737761700000009a070700000707000007070001070700bdf892a1a291e196aa05070700a3f683c2a6d80a07070100000018323032332d30322d32345431333a34303a32322e3332385a070705090100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484805090100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a443845796c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd049ac3a107f50f1b000193d22b59c496c94504729be1c671ec1d1d7a9cf000ffff107570646174655f6f70657261746f72730000005f020000005a050507070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a73766178684848070701000000244b543147504a44546638475a73704363616e6147324b684d764775334e4a52717572617400006c00ad756cb46ba6f59efa8bd10ff544ba9d20d0954285109bc3a107a0820100000155959998da7e79231e2be8ed8ff373ac1b1574b000ffff0473776170000000a1070703060707020000000807070508030b000807070100000018323032332d30322d32345431333a34303a32322e3332385a07070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484807070100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a44384579070700a3f683c2a6d80a070700a4f096bfbe9df6f0e00603066c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd049cc3a107ed0f00000193d22b59c496c94504729be1c671ec1d1d7a9cf000ffff107570646174655f6f70657261746f72730000005f020000005a050807070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a73766178684848070701000000244b543147504a44546638475a73704363616e6147324b684d764775334e4a5271757261740000")!
+        let input = TezosSigningInput.with {
+            $0.privateKey = key
+            $0.encodedOperations = bytes
+        }
+
+        let output: TezosSigningOutput = AnySigner.sign(input: input, coin: .tezos)
+
+        let expected = "64aa7792af40de41371a72b3342daa7bf3d2b5a84511e9074341fdd52148dd9d6c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542850f96c3a1079d780080ade2040155959998da7e79231e2be8ed8ff373ac1b1574b000ffff04737761700000009e070703060707020000000807070508030b000007070100000018323032332d30322d32345431333a34303a32322e3332385a07070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484807070100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a4438457907070080dac409070700bdf892a1a291e196aa0503066c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd0497c3a107f10f180001543aa1803f0bbe2099809ab067dfa8a4cbc1c26a00ffff07617070726f76650000002d070701000000244b5431516f64676b5974754e79664a726a72673854515a586d64544643616d373268533900006c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd0498c3a107f70f090001543aa1803f0bbe2099809ab067dfa8a4cbc1c26a00ffff07617070726f766500000036070701000000244b5431516f64676b5974754e79664a726a72673854515a586d64544643616d373268533900bdf892a1a291e196aa056c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542e71599c3a107fabb01400001b1f0d7affc39861f7f5c75f917f683d2e9f55e3100ffff04737761700000009a070700000707000007070001070700bdf892a1a291e196aa05070700a3f683c2a6d80a07070100000018323032332d30322d32345431333a34303a32322e3332385a070705090100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484805090100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a443845796c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd049ac3a107f50f1b000193d22b59c496c94504729be1c671ec1d1d7a9cf000ffff107570646174655f6f70657261746f72730000005f020000005a050507070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a73766178684848070701000000244b543147504a44546638475a73704363616e6147324b684d764775334e4a52717572617400006c00ad756cb46ba6f59efa8bd10ff544ba9d20d0954285109bc3a107a0820100000155959998da7e79231e2be8ed8ff373ac1b1574b000ffff0473776170000000a1070703060707020000000807070508030b000807070100000018323032332d30322d32345431333a34303a32322e3332385a07070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484807070100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a44384579070700a3f683c2a6d80a070700a4f096bfbe9df6f0e00603066c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd049cc3a107ed0f00000193d22b59c496c94504729be1c671ec1d1d7a9cf000ffff107570646174655f6f70657261746f72730000005f020000005a050807070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a73766178684848070701000000244b543147504a44546638475a73704363616e6147324b684d764775334e4a5271757261740000e10077fc3068aaaf1c7779e1dc2c396b3b40d73ddda04648bf4b16ac2e747c89b461771488e80da3aa30fc18c90de99fd358bfb76683f3c3ec250b1ee09b6d07"
+
+        XCTAssertEqual(output.encoded.hexString, expected)
+
+        // How to do it without AnySigner
+        var watermark = Data([0x03])
+        watermark.append(bytes)
+
+        let hash = Hash.blake2b(data: watermark, size: 32)
+        let privateKey = PrivateKey(data: key)!
+        let signature = privateKey.sign(digest: hash, curve: .ed25519)!
+
+        var signed = Data()
+        signed.append(bytes)
+        signed.append(signature)
+
+        XCTAssertEqual(signed.hexString, expected)
+    }
 }
diff --git a/swift/Tests/Blockchains/TheOpenNetworkTests.swift b/swift/Tests/Blockchains/TheOpenNetworkTests.swift
new file mode 100644
index 00000000000..797ae8334e0
--- /dev/null
+++ b/swift/Tests/Blockchains/TheOpenNetworkTests.swift
@@ -0,0 +1,181 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class TheOpenNetworkTests: XCTestCase {
+    func testAddressFromPrivateKey() {
+        let data = Data(hexString: "63474e5fe9511f1526a50567ce142befc343e71a49b865ac3908f58667319cb8")
+        let privateKey = PrivateKey(data: data!)!
+        let publicKey = privateKey.getPublicKeyEd25519()
+        let address = AnyAddress(publicKey: publicKey, coin: .ton)
+        XCTAssertEqual(address.description, "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    func testAddressFromPublicKey() {
+        let data = Data(hexString: "f42c77f931bea20ec5d0150731276bbb2e2860947661245b2319ef8133ee8d41")
+        let publicKey = PublicKey(data: data!, type: PublicKeyType.ed25519)!
+        let address = AnyAddress(publicKey: publicKey, coin: .ton)
+        XCTAssertEqual(address.description, "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    func testAddressFromRawString() {
+        let addressString = "0:66fbe3c5c03bf5c82792f904c9f8bf28894a6aa3d213d41c20569b654aadedb3"
+        let address = AnyAddress(string: addressString, coin: .ton)
+        XCTAssertEqual(address!.description, "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    func testAddressFromBounceableString() {
+        let addressString = "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q"
+        let address = AnyAddress(string: addressString, coin: .ton)
+        XCTAssertEqual(address!.description, "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    func testAddressFromUserFriendlyString() {
+        let addressString = "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV"
+        let address = AnyAddress(string: addressString, coin: .ton)
+        XCTAssertEqual(address!.description, "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV")
+    }
+
+    func testAddressToBounceable() {
+        let addressString = "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV"
+        let address = TONAddressConverter.toUserFriendly(address: addressString, bounceable: true, testnet: false)
+        XCTAssertEqual(address, "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q")
+    }
+
+    func testGenerateJettonAddress() {
+        let mainAddress = "UQBjKqthWBE6GEcqb_epTRFrQ1niS6Z1Z1MHMwR-mnAYRoYr"
+        let mainAddressBoc = TONAddressConverter.toBoc(address: mainAddress)
+        XCTAssertEqual(mainAddressBoc, "te6cckEBAQEAJAAAQ4AMZVVsKwInQwjlTf71KaItaGs8SXTOrOpg5mCP004DCNAptHQU")
+
+        // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+        // '{"address":"EQAvlWFDxGF2lXm67y4yzC17wYKD9A0guwPkMs1gOsM__NOT","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","te6ccgICAAEAAQAAACQAAABDgAxlVWwrAidDCOVN/vUpoi1oazxJdM6s6mDmYI/TTgMI0A=="]]}'
+
+        // Parse the `get_wallet_address` RPC response.
+        let jettonAddressBocEncoded = "te6cckEBAQEAJAAAQ4AFvT5rqwxcbKfITqnkwL+go4Zi9bulRHAtLt4cjjFdK7B8L+Cq"
+        let jettonAddress = TONAddressConverter.fromBoc(boc: jettonAddressBocEncoded)
+        XCTAssertEqual(jettonAddress, "UQAt6fNdWGLjZT5CdU8mBf0FHDMXrd0qI4FpdvDkcYrpXV5H")
+    }
+    
+    func testBuildV4R2StateInit() {
+        let publicKeyData = Data(hexString: "f229a9371fa7c2108b3d90ea22c9be705ff5d0cfeaee9cbb9366ff0171579357")!
+        let publicKey = PublicKey(data: publicKeyData, type: .ed25519)!
+        let stateInit = TONWallet.buildV4R2StateInit(publicKey: publicKey, workchain: 0, walletId: 0x29a9a317)!
+        XCTAssertEqual(stateInit, "te6cckECFgEAAwQAAgE0AQIBFP8A9KQT9LzyyAsDAFEAAAAAKamjF/IpqTcfp8IQiz2Q6iLJvnBf9dDP6u6cu5Nm/wFxV5NXQAIBIAQFAgFIBgcE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8ICQoLAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNDA0CASAODwBu0gf6ANTUIvkABcjKBxXL/8nQd3SAGMjLBcsCIs8WUAX6AhTLaxLMzMlz+wDIQBSBAQj0UfKnAgBwgQEI1xj6ANM/yFQgR4EBCPRR8qeCEG5vdGVwdIAYyMsFywJQBs8WUAT6AhTLahLLH8s/yXP7AAIAbIEBCNcY+gDTPzBSJIEBCPRZ8qeCEGRzdHJwdIAYyMsFywJQBc8WUAP6AhPLassfEss/yXP7AAAK9ADJ7VQAeAH6APQEMPgnbyIwUAqhIb7y4FCCEHBsdWeDHrFwgBhQBMsFJs8WWPoCGfQAy2kXyx9SYMs/IMmAQPsABgCKUASBAQj0WTDtRNCBAUDXIMgBzxb0AMntVAFysI4jghBkc3Rygx6xcIAYUAXLBVADzxYj+gITy2rLH8s/yYBA+wCSXwPiAgEgEBEAWb0kK29qJoQICga5D6AhhHDUCAhHpJN9KZEM5pA+n/mDeBKAG3gQFImHFZ8xhAIBWBITABG4yX7UTQ1wsfgAPbKd+1E0IEBQNch9AQwAsjKB8v/ydABgQEI9ApvoTGACASAUFQAZrc52omhAIGuQ64X/wAAZrx32omhAEGuQ64WPwEXtMkg=")
+    }
+    
+    func testMessageSigner() {
+        // The private key has been derived by using [ton-mnemonic](https://www.npmjs.com/package/tonweb-mnemonic/v/0.0.2)
+        // from the following mnemonic:
+        // document shield addict crime broom point story depend suit satisfy test chicken valid tail speak fortune sound drill seek cube cheap body music recipe
+        let privateKeyData = Data(hexString: "112d4e2e700a468f1eae699329202f1ee671d6b665caa2d92dea038cf3868c18")!
+        let privateKey = PrivateKey(data: privateKeyData)!
+        let message = "Hello world"
+        let signature = TONMessageSigner.signMessage(privateKey: privateKey, message: message)!
+        // The following signature has been computed by calling `window.ton.send("ton_personalSign", { data: "Hello world" });`.
+        XCTAssertEqual(signature, "2490fbaa72aec0b77b19162bbbe0b0e3f7afd42cc9ef469f0494cd4a366a4bf76643300cd5991f66bce6006336742b8d1d435d541d244dcc013d428472e89504")
+    }
+
+    func testSign() {
+        let privateKeyData = Data(hexString: "c38f49de2fb13223a9e7d37d5d0ffbdd89a5eb7c8b0ee4d1c299f2cefe7dc4a0")!
+
+        let transfer = TheOpenNetworkTransfer.with {
+            $0.dest = "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q"
+            $0.amount = 10
+            $0.mode = UInt32(TheOpenNetworkSendMode.payFeesSeparately.rawValue | TheOpenNetworkSendMode.ignoreActionPhaseErrors.rawValue)
+            $0.bounceable = true
+        }
+
+        let input = TheOpenNetworkSigningInput.with {
+            $0.messages = [transfer]
+            $0.privateKey = privateKeyData
+            $0.sequenceNumber = 6
+            $0.expireAt = 1671132440
+            $0.walletVersion = TheOpenNetworkWalletVersion.walletV4R2
+        }
+
+        let output: TheOpenNetworkSigningOutput = AnySigner.sign(input: input, coin: .ton)
+
+        // tx: https://tonscan.org/tx/3Z4tHpXNLyprecgu5aTQHWtY7dpHXEoo11MAX61Xyg0=
+        let expectedString = "te6cckEBBAEArQABRYgBsLf6vJOEq42xW0AoyWX0K+uBMUcXFDLFqmkDg6k1Io4MAQGcEUPkil2aZ4s8KKparSep/OKHMC8vuXafFbW2HGp/9AcTRv0J5T4dwyW1G0JpHw+g5Ov6QI3Xo0O9RFr3KidICimpoxdjm3UYAAAABgADAgFiYgAzffHi4B365BPJfIJk/F+URKU1UekJ6g4QK02ypVb22YhQAAAAAAAAAAAAAAAAAQMAAA08Nzs="
+
+        XCTAssertEqual(output.encoded, expectedString)
+    }
+
+    func testJettonTransferSign() {
+        let privateKeyData = Data(hexString: "c054900a527538c1b4325688a421c0469b171c29f23a62da216e90b0df2412ee")!
+        
+        let jettonTransfer = TheOpenNetworkJettonTransfer.with {
+            $0.jettonAmount = 500 * 1000 * 1000
+            $0.toOwner = "EQAFwMs5ha8OgZ9M4hQr80z9NkE7rGxUpE1hCFndiY6JnDx8"
+            $0.responseAddress = "EQBaKIMq5Am2p_rfR1IFTwsNWHxBkOpLTmwUain5Fj4llTXk"
+            $0.forwardAmount = 1
+        }
+        
+        let transfer = TheOpenNetworkTransfer.with {
+            $0.dest = "EQBiaD8PO1NwfbxSkwbcNT9rXDjqhiIvXWymNO-edV0H5lja"
+            $0.amount = 100 * 1000 * 1000
+            $0.mode = UInt32(TheOpenNetworkSendMode.payFeesSeparately.rawValue | TheOpenNetworkSendMode.ignoreActionPhaseErrors.rawValue)
+            $0.comment = "test comment"
+            $0.bounceable = true
+            $0.jettonTransfer = jettonTransfer
+        }
+
+        let input = TheOpenNetworkSigningInput.with {
+            $0.messages = [transfer]
+            $0.privateKey = privateKeyData
+            $0.sequenceNumber = 1
+            $0.expireAt = 1787693046
+            $0.walletVersion = TheOpenNetworkWalletVersion.walletV4R2
+        }
+
+        let output: TheOpenNetworkSigningOutput = AnySigner.sign(input: input, coin: .ton)
+
+        // tx: https://testnet.tonscan.org/tx/Er_oT5R3QK7D-qVPBKUGkJAOOq6ayVls-mgEphpI9Ck=
+        let expectedString = "te6cckECBAEAARUAAUWIALRRBlXIE21P9b6OpAqeFhqw+IMh1Jac2CjUU/IsfEsqDAEBnGiFlaLItV573gJqBvctP5j3jVKlLuxmO+pnW0QGlXjXgzjw5YeTNwRG9upJHOl6GA3pFetKNojqGzfkxku+owUpqaMXao4H9gAAAAEAAwIBaGIAMTQfh52puD7eKUmDbhqfta4cdUMRF662Uxp3zzqug/MgL68IAAAAAAAAAAAAAAAAAAEDAMoPin6lAAAAAAAAAABB3NZQCAALgZZzC14dAz6ZxChX5pn6bIJ3WNipSJrCELO7Ex0TOQAWiiDKuQJtqf630dSBU8LDVh8QZDqS05sFGop+RY+JZUICAAAAAHRlc3QgY29tbWVudG/bd5c="
+
+        XCTAssertEqual(output.encoded, expectedString)
+    }
+    
+    func testTransferCustomPayloadSign() {
+        let privateKeyData = Data(hexString: "5525e673087587bc0efd7ab09920ef7d3c1bf6b854a661430244ca59ab19e9d1")!
+        
+        // Doge chatbot contract payload to be deployed.
+        // Docs: https://docs.ton.org/develop/dapps/ton-connect/transactions#smart-contract-deployment
+        let dogeChatbotStateInit = "te6cckEBBAEAUwACATQBAgEU/wD0pBP0vPLICwMAEAAAAZDrkbgQAGrTMAGCCGlJILmRMODQ0wMx+kAwi0ZG9nZYcCCAGMjLBVAEzxaARfoCE8tqEssfAc8WyXP7AO4ioYU="
+        // Doge chatbot's address after the contract is deployed.
+        let dogeChatbotDeployingAddress = "0:3042cd5480da232d5ac1d9cbe324e3c9eb58f167599f6b7c20c6e638aeed0335"
+        
+        // The comment has nothing to do with Doge chatbot.
+        // It's just used to attach the following ASCII comment to the transaction:
+        // "This transaction deploys Doge Chatbot contract"
+        let commentPayload = "te6cckEBAQEANAAAZAAAAABUaGlzIHRyYW5zYWN0aW9uIGRlcGxveXMgRG9nZSBDaGF0Ym90IGNvbnRyYWN0v84vSg=="
+        
+        let transfer = TheOpenNetworkTransfer.with {
+            $0.dest = dogeChatbotDeployingAddress
+            // 0.069 TON
+            $0.amount = 69_000_000
+            $0.mode = UInt32(TheOpenNetworkSendMode.payFeesSeparately.rawValue | TheOpenNetworkSendMode.ignoreActionPhaseErrors.rawValue)
+            $0.bounceable = false
+            $0.stateInit = dogeChatbotStateInit
+            $0.customPayload = commentPayload
+        }
+
+        let input = TheOpenNetworkSigningInput.with {
+            $0.messages = [transfer]
+            $0.privateKey = privateKeyData
+            $0.sequenceNumber = 4
+            $0.expireAt = 1721939714
+            $0.walletVersion = TheOpenNetworkWalletVersion.walletV4R2
+        }
+
+        let output: TheOpenNetworkSigningOutput = AnySigner.sign(input: input, coin: .ton)
+
+        // Successfully broadcasted: https://tonviewer.com/transaction/f4b7ed2247b1adf54f33dd2fd99216fbd61beefb281542d0b330ccea9b8d0338
+        let expectedString = "te6cckECCAEAATcAAUWIAfq4NsPLegfou/MPhtHE9YuzV3gnI/q6jm3MRJh2PtpaDAEBnPbyCSsWrOZpEjb7ZFxz5yYi+an6M6Lnq7rI7TFWdDS76LEtGBrVVrhMGziwxuy6LCVtsMBikI7RPVQ89FCIAAYpqaMXZqK3AgAAAAQAAwICaUIAGCFmqkBtEZatYOzl8ZJx5PWseLOsz7W+EGNzHFd2gZqgIObaAAAAAAAAAAAAAAAAAAPAAwQCATQFBgBkAAAAAFRoaXMgdHJhbnNhY3Rpb24gZGVwbG95cyBEb2dlIENoYXRib3QgY29udHJhY3QBFP8A9KQT9LzyyAsHABAAAAGQ65G4EABq0zABgghpSSC5kTDg0NMDMfpAMItGRvZ2WHAggBjIywVQBM8WgEX6AhPLahLLHwHPFslz+wAa2r/S"
+
+        XCTAssertEqual(output.encoded, expectedString)
+    }
+}
diff --git a/swift/Tests/Blockchains/ThetaFuelTests.swift b/swift/Tests/Blockchains/ThetaFuelTests.swift
new file mode 100644
index 00000000000..e0c42392f32
--- /dev/null
+++ b/swift/Tests/Blockchains/ThetaFuelTests.swift
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class ThetaFuelTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "4646464646464646464646464646464646464646464646464646464646464646")!)!
+                let pubkey = key.getPublicKeySecp256k1(compressed: false)
+                let address = AnyAddress(publicKey: pubkey, coin: .thetaFuel)
+                let expected = AnyAddress(string: "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F", coin: .thetaFuel)!
+        
+                XCTAssertEqual(address.description, expected.description)
+    }
+}
diff --git a/swift/Tests/Blockchains/ThetaTests.swift b/swift/Tests/Blockchains/ThetaTests.swift
index 17176fdbc71..37e3508cd12 100644
--- a/swift/Tests/Blockchains/ThetaTests.swift
+++ b/swift/Tests/Blockchains/ThetaTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/TronTests.swift b/swift/Tests/Blockchains/TronTests.swift
index 897c9787973..9c5c7d6ebea 100644
--- a/swift/Tests/Blockchains/TronTests.swift
+++ b/swift/Tests/Blockchains/TronTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -13,6 +11,18 @@ class TronTests: XCTestCase {
         let address = AnyAddress(string: "TLWEciM1CjP5fJqM2r9wymAidkkYtTU5k3", coin: .tron)!
         XCTAssertEqual(address.description, "TLWEciM1CjP5fJqM2r9wymAidkkYtTU5k3")
     }
+    
+    func testSignDirect() {
+        let input = TronSigningInput.with {
+            $0.privateKey = Data(hexString: "2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54")!
+            $0.txID = "546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb"
+        }
+        
+        let output: TronSigningOutput = AnySigner.sign(input: input, coin: .tron)
+        
+        XCTAssertEqual(output.id, Data(hexString: "546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb"))
+        XCTAssertEqual(output.signature, Data(hexString: "77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00"))
+    }
 
     func testSign() {
         let contract = TronTransferContract.with {
@@ -64,4 +74,13 @@ class TronTests: XCTestCase {
         """
         XCTAssertJSONEqual(output.json, expectedJSON)
     }
+    
+    func testMessageAndVerifySigner() {
+        let privateKey = PrivateKey(data: Data(hexString: "75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a")!)!
+        let msg = "Hello World"
+        let signature = TronMessageSigner.signMessage(privateKey: privateKey, message: msg)
+        XCTAssertEqual(signature, "9bb6d11ec8a6a3fb686a8f55b123e7ec4e9746a26157f6f9e854dd72f5683b450397a7b0a9653865658de8f9243f877539882891bad30c7286c3bf5622b900471b")
+        let pubKey = privateKey.getPublicKey(coinType: .tron)
+        XCTAssertTrue(TronMessageSigner.verifyMessage(pubKey: pubKey, message: msg, signature: signature))
+    }
 }
diff --git a/swift/Tests/Blockchains/WanchainTests.swift b/swift/Tests/Blockchains/WanchainTests.swift
index 8718ce3cd9b..f4b2b1b87a0 100644
--- a/swift/Tests/Blockchains/WanchainTests.swift
+++ b/swift/Tests/Blockchains/WanchainTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/WavesTests.swift b/swift/Tests/Blockchains/WavesTests.swift
index 75c9f4b6154..3f16f7bdfd0 100644
--- a/swift/Tests/Blockchains/WavesTests.swift
+++ b/swift/Tests/Blockchains/WavesTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/ZcashTests.swift b/swift/Tests/Blockchains/ZcashTests.swift
index bd7a861a0f4..afcd0ef80d0 100644
--- a/swift/Tests/Blockchains/ZcashTests.swift
+++ b/swift/Tests/Blockchains/ZcashTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -74,4 +72,12 @@ class ZcashTests: XCTestCase {
         XCTAssertEqual(output.error, TW_Common_Proto_SigningError.ok)
         XCTAssertEqual(output.encoded.hexString, "0400008085202f890153685b8809efc50dd7d5cb0906b307a1b8aa5157baa5fc1bd6fe2d0344dd193a000000006b483045022100ca0be9f37a4975432a52bb65b25e483f6f93d577955290bb7fb0060a93bfc92002203e0627dff004d3c72a957dc9f8e4e0e696e69d125e4d8e275d119001924d3b48012103b243171fae5516d1dc15f9178cfcc5fdc67b0a883055c117b01ba8af29b953f6ffffffff0140720700000000001976a91449964a736f3713d64283fd0018626ba50091c7e988ac00000000000000000000000000000000000000")
     }
+
+    func testLockScript() {
+        let script = BitcoinScript.lockScriptForAddress(address: "t1NsqaL1G2XD6xWfVmeAi9gLUVFct59zJu4", coin: .zcash)
+        XCTAssertTrue(!script.data.isEmpty)
+
+        let script2 = BitcoinScript.lockScriptForAddress(address: "t1XeXHdaaXbdEaBCz1cMib5rvg34RjTWR6N", coin: .zelcash)
+        XCTAssertTrue(!script2.data.isEmpty)
+    }
 }
diff --git a/swift/Tests/Blockchains/ZcoinTests.swift b/swift/Tests/Blockchains/ZcoinTests.swift
index 7014d4e274d..42b20607823 100644
--- a/swift/Tests/Blockchains/ZcoinTests.swift
+++ b/swift/Tests/Blockchains/ZcoinTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Blockchains/ZenTests.swift b/swift/Tests/Blockchains/ZenTests.swift
new file mode 100644
index 00000000000..ab7adddffd9
--- /dev/null
+++ b/swift/Tests/Blockchains/ZenTests.swift
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class ZenTests: XCTestCase {
+    func testAddress() {
+        let key = PrivateKey(data: Data(hexString: "3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a")!)!
+        let pubkey = key.getPublicKeySecp256k1(compressed: true)
+        let address = AnyAddress(publicKey: pubkey, coin: .zen)
+        let addressFromString = AnyAddress(string: "znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg", coin: .zen)!
+
+        XCTAssertEqual(pubkey.data.hexString, "02b4ac9056d20c52ac11b0d7e83715dd3eac851cfc9cb64b8546d9ea0d4bb3bdfe")
+        XCTAssertEqual(address.description, addressFromString.description)
+    }
+
+    func testSign() {
+        let key = PrivateKey(data: Data(hexString: "3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a")!)!
+        let blockHash = Data(hexString: "81dc725fd33fada1062323802eefb54d3325d924d4297a692214560400000000")!
+        let blockHeight = Int64(1147624)
+        let utxos = [
+            BitcoinUnspentTransaction.with {
+                $0.outPoint.hash = Data(hexString: "a39e13b5ab406547e31284cd96fb40ed271813939c195ae7a86cd67fb8a4de62")!
+                $0.outPoint.index = 0
+                $0.outPoint.sequence = UINT32_MAX
+                $0.script = Data(hexString: "76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4")!
+                $0.amount = 17600
+            }
+        ]
+
+        // Plan
+        let plan = BitcoinTransactionPlan.with {
+            $0.amount = 10000
+            $0.fee = 226
+            $0.change = 7374
+            $0.utxos = utxos
+            $0.preblockhash = blockHash
+            $0.preblockheight = blockHeight
+        }
+
+        let input = BitcoinSigningInput.with {
+            $0.amount = 10000
+            $0.toAddress = "zngBGZGKaaBamofSuFw5WMnvU2HQAtwGeb5"
+            $0.changeAddress = "znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg"
+            $0.hashType = BitcoinScript.hashTypeForCoin(coinType: .zen)
+            $0.coinType = CoinType.zen.rawValue
+            $0.privateKey = [key.data]
+            $0.plan = plan
+        }
+
+        // Sign
+        let output: BitcoinSigningOutput = AnySigner.sign(input: input, coin: .zen)
+        XCTAssertEqual(output.error, .ok)
+        XCTAssertEqual(output.encoded.hexString, "0100000001a39e13b5ab406547e31284cd96fb40ed271813939c195ae7a86cd67fb8a4de62000000006a473044022014d687c0bee0b7b584db2eecbbf73b545ee255c42b8edf0944665df3fa882cfe02203bce2412d93c5a56cb4806ddd8297ff05f8fc121306e870bae33377a58a02f05012102b4ac9056d20c52ac11b0d7e83715dd3eac851cfc9cb64b8546d9ea0d4bb3bdfeffffffff0210270000000000003f76a914a58d22659b1082d1fa8698fc51996b43281bfce788ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4ce1c0000000000003f76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b400000000")
+
+    }
+}
diff --git a/swift/Tests/Blockchains/ZilliqaTests.swift b/swift/Tests/Blockchains/ZilliqaTests.swift
index a523cd26c97..060db939033 100644
--- a/swift/Tests/Blockchains/ZilliqaTests.swift
+++ b/swift/Tests/Blockchains/ZilliqaTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/CoinAddressDerivationTests.swift b/swift/Tests/CoinAddressDerivationTests.swift
index 8fdf3190737..72c611f4083 100644
--- a/swift/Tests/CoinAddressDerivationTests.swift
+++ b/swift/Tests/CoinAddressDerivationTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -19,6 +17,9 @@ class CoinAddressDerivationTests: XCTestCase {
                 let address = coin.address(string: derivedAddress)
 
                 switch coin {
+                case .acala:
+                    let expectedResult = "25GGezx3LWFQj6HZpYzoWoVzLsHojGtybef3vthC9nd19ms3"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .aeternity:
                     let expectedResult = "ak_QDHJSfvHG9sDHBobaWt2TAGhuhipYjEqZEH34bWugpJfJc3GN"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
@@ -34,9 +35,15 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .binance:
                     let expectedResult = "bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .tbinance:
+                    let expectedResult = "tbnb12vtaxl9952zm6rwf7v8jerq74pvaf77fkw9xhl"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .bitcoin:
                     let expectedResult = "bc1quvuarfksewfeuevuc6tn0kfyptgjvwsvrprk9d"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .bitcoinDiamond:
+                    let expectedResult = "1KaRW9xPPtCTZ9FdaTHduCPck4YvSeEWNn"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .bitcoinCash:
                     let expectedResult = "bitcoincash:qpzl3jxkzgvfd9flnd26leud5duv795fnv7vuaha70"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
@@ -64,17 +71,21 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .dogecoin:
                     let expectedResult = "DJRFZNg8jkUtjcpo2zJd92FUAzwRjitw6f"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
-                case .elrond:
+                case .multiversX:
                     let expectedResult = "erd1jfcy8aeru6vlx4fe6h3pc3vlpe2cnnur5zetxdhp879yagq7vqvs8na4f8"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
-                case .eos:
+                case .eos, .wax:
                     let expectedResult = "EOS6hs8sRvGSzuQtq223zwJipMzqTJpXUVjyvHPvPwBSZWWrJTJkg"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .ethereum,
                      .smartChain,
                      .polygon,
                      .optimism,
+                     .zksync,
+                     .polygonzkEVM,
+                     .scroll,
                      .arbitrum,
+                     .arbitrumNova,
                      .ecochain,
                      .avalancheCChain,
                      .xdai,
@@ -90,9 +101,25 @@ class CoinAddressDerivationTests: XCTestCase {
                      .moonriver,
                      .moonbeam,
                      .kavaEvm,
-                     .klaytn,
+                     .kaia,
                      .meter,
-                     .okxchain:
+                     .okxchain,
+                     .confluxeSpace,
+                     .opBNB,
+                     .acalaEVM,
+                     .neon,
+                     .base,
+                     .linea,
+                     .greenfield,
+                     .mantle,
+                     .zenEON,
+                     .mantaPacific,
+                     .zetaEVM,
+                     .merlin,
+                     .lightlink,
+                     .blast,
+                     .bounceBit,
+                     .zkLinkNova:
                     let expectedResult = "0x8f348F300873Fd5DA36950B2aC75a26584584feE"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .ronin:
@@ -101,6 +128,9 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .ethereumClassic:
                     let expectedResult = "0x078bA3228F3E6C08bEEac9A005de0b7e7089aD1c"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .rootstock:
+                    let expectedResult = "0xA2D7065F94F838a3aB9C04D67B312056846424Df"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .filecoin:
                     let expectedResult = "f1zzykebxldfcakj5wdb5n3n7priul522fnmjzori"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
@@ -122,6 +152,9 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .ioTeX:
                     let expectedResult = "io1qw9cccecw09q7p5kzyqtuhfhvah2mhfrc84jfk"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .ioTeXEVM:
+                    let expectedResult = "0x038B8C633873Ca0f06961100BE5d37676EADDD23"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .litecoin:
                     let expectedResult = "ltc1qhd8fxxp2dx3vsmpac43z6ev0kllm4n53t5sk0u"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
@@ -164,6 +197,9 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .poanetwork:
                     let expectedResult = "0xe8a3e8bE17E172B6926130eAfB521e9D2849aca9"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .pivx:
+                    let expectedResult = "D81AqC8zKma3Cht4TbVuh4jyVVyLkZULCm"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .polkadot:
                     let expectedResult = "13nN6BGAoJwd7Nw1XxeBCx5YcBXuYnL94Mh7i3xBprqVSsFk"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
@@ -186,13 +222,14 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .tezos:
                     let expectedResult = "tz1acnY9VbMagps26Kj3RfoGRWD9nYG5qaRX"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
-                case .theta:
+                case .theta,
+                     .thetaFuel:
                     let expectedResult = "0x0d1fa20c218Fec2f2C55d52aB267940485fa5DA4"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
-                case .thunderToken:
+                case .thunderCore:
                     let expectedResult = "0x4b92b3ED6d8b24575Bf5ce4C6a86ED261DA0C8d7"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
-                case .tomoChain:
+                case .viction:
                     let expectedResult = "0xC74b6D8897cBa9A4b659d43fEF73C9cA852cE424"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .tron:
@@ -204,6 +241,9 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .viacoin:
                     let expectedResult = "via1qnmsgjd6cvfprnszdgmyg9kewtjfgqflz67wwhc"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .verge:
+                    let expectedResult = "DPb3Xz4vjB6QGLKDmrbprrtv4XzNqkADc2"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .wanchain:
                     let expectedResult = "0xD5ca90b928279FE5D06144136a25DeD90127aC15"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
@@ -216,6 +256,12 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .zcash:
                     let expectedResult = "t1YYnByMzdGhQv3W3rnjHMrJs6HH4Y231gy"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .komodo:
+                    let expectedResult = "RCWJLXE5CSXydxdSnwcghzPgkFswERegyb"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .zen:
+                    let expectedResult = "znUmzvod1f4P9LYsBhNxjqCDQvNSStAmYEX"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .firo:
                     let expectedResult = "aEd5XFChyXobvEics2ppAqgK3Bgusjxtik"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
@@ -246,12 +292,117 @@ class CoinAddressDerivationTests: XCTestCase {
                 case .ecash:
                     let expectedResult = "ecash:qpelrdn7a0hcucjlf9ascz3lkxv7r3rffgzn6x5377"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .iost:
+                    let expectedResult = "4av8w81EyzUgHonsVWqfs15WM4Vrpgox4BYYQWhNQDVu"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .syscoin:
+                    let expectedResult = "sys1qkl640se3mwpt666e3lyywnwh09e9jquvx9x8qj"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .stratis:
+                    let expectedResult = "strax1q0caanaw4nkf6fzwnzq2p7yum680e57pdg05zkm"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .nativeEvmos:
                     let expectedResult = "evmos13u6g7vqgw074mgmf2ze2cadzvkz9snlwstd20d"
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 case .everscale:
                     let expectedResult = "0:0c39661089f86ec5926ea7d4ee4223d634ba4ed6dcc2e80c7b6a8e6d59f79b04";
                     assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .ton:
+                    let expectedResult = "UQDgEMqToTacHic7SnvnPFmvceG5auFkCcAw0mSCvzvKUaT4";
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .aptos:
+                    let expectedResult = "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30";
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .nebl:
+                    let expectedResult = "NgDVaXAwNgBwb88xLiFKomfBmPkEh9F2d7";
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .sui:
+                    let expectedResult = "0xada112cfb90b44ba889cc5d39ac2bf46281e4a91f7919c693bcd9b8323e81ed2";
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .hedera:
+                    let expectedResult = "0.0.302a300506032b657003210049eba62f64d0d941045595d9433e65d84ecc46bcdb1421de55e05fcf2d8357d5";
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .secret:
+                    let expectedResult = "secret1f69sk5033zcdr2p2yf3xjehn7xvgdeq09d2llh"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .nativeInjective:
+                    let expectedResult = "inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .agoric:
+                    let expectedResult = "agoric18zvvgk6j3eq5wd7mqxccgt20gz2w94cy88aek5"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .stargaze:
+                    let expectedResult = "stars142j9u5eaduzd7faumygud6ruhdwme98qycayaz"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .juno:
+                    let expectedResult = "juno142j9u5eaduzd7faumygud6ruhdwme98qxkfz30"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .stride:
+                    let expectedResult = "stride142j9u5eaduzd7faumygud6ruhdwme98qn029zl"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .axelar:
+                    let expectedResult = "axelar142j9u5eaduzd7faumygud6ruhdwme98q52u3aj"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .crescent:
+                    let expectedResult = "cre142j9u5eaduzd7faumygud6ruhdwme98q5veur7"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .kujira:
+                    let expectedResult = "kujira142j9u5eaduzd7faumygud6ruhdwme98qpvgpme"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .nativeCanto:
+                    let expectedResult = "canto13u6g7vqgw074mgmf2ze2cadzvkz9snlwqua5pd"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .comdex:
+                    let expectedResult = "comdex142j9u5eaduzd7faumygud6ruhdwme98qhtgm0y"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .neutron:
+                    let expectedResult = "neutron142j9u5eaduzd7faumygud6ruhdwme98q5mrmv5"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .sommelier:
+                    let expectedResult = "somm142j9u5eaduzd7faumygud6ruhdwme98quc948e"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .fetchAI:
+                    let expectedResult = "fetch142j9u5eaduzd7faumygud6ruhdwme98qrera5y"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .mars:
+                    let expectedResult = "mars142j9u5eaduzd7faumygud6ruhdwme98qdenqrg"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .umee:
+                    let expectedResult = "umee142j9u5eaduzd7faumygud6ruhdwme98qzjhxjp"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .coreum:
+                    let expectedResult = "core1rawf376jz2lnchgc4wzf4h9c77neg3zldc7xa8"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .quasar:
+                    let expectedResult = "quasar142j9u5eaduzd7faumygud6ruhdwme98q78symk"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .persistence:
+                    let expectedResult = "persistence142j9u5eaduzd7faumygud6ruhdwme98q7gv2ch"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .akash:
+                    let expectedResult = "akash142j9u5eaduzd7faumygud6ruhdwme98qal870f"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .noble:
+                    let expectedResult = "noble142j9u5eaduzd7faumygud6ruhdwme98qc8l3wa"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .sei:
+                    let expectedResult = "sei142j9u5eaduzd7faumygud6ruhdwme98qagm0sj"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .internetComputer:
+                    let expectedResult = "6f8e568160a3c8362789848dc0fa52891964473c045cc25208a305fb35b7c4ab"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .tia:
+                    let expectedResult = "celestia142j9u5eaduzd7faumygud6ruhdwme98qpwmfv7"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .nativeZetaChain:
+                    let expectedResult = "zeta13u6g7vqgw074mgmf2ze2cadzvkz9snlwywj304"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .dydx:
+                    let expectedResult = "dydx142j9u5eaduzd7faumygud6ruhdwme98qeayaky"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
+                case .pactus:
+                    let expectedResult = "pc1r7ys2g5a4xc2qtm0t4q987m4mvs57w5g0v4pvzg"
+                    assertCoinDerivation(coin, expectedResult, derivedAddress, address)
                 @unknown default:
                     fatalError()
                 }
diff --git a/swift/Tests/CoinTypeTests.swift b/swift/Tests/CoinTypeTests.swift
index 353b85cf729..46812077e59 100644
--- a/swift/Tests/CoinTypeTests.swift
+++ b/swift/Tests/CoinTypeTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
@@ -14,7 +12,7 @@ class CoinTypeTests: XCTestCase {
         XCTAssertEqual(CoinType.litecoin.rawValue, 2)
         XCTAssertEqual(CoinType.tron.rawValue, 195)
         XCTAssertEqual(CoinType.ethereum.rawValue, 60)
-        XCTAssertEqual(CoinType.thunderToken.rawValue, 1001)
+        XCTAssertEqual(CoinType.thunderCore.rawValue, 1001)
         XCTAssertEqual(CoinType.wanchain.rawValue, 5718350)
         XCTAssertEqual(CoinType.callisto.rawValue, 820)
         XCTAssertEqual(CoinType.ethereumClassic.rawValue, 61)
@@ -23,7 +21,7 @@ class CoinTypeTests: XCTestCase {
         XCTAssertEqual(CoinType.poanetwork.rawValue, 178)
         XCTAssertEqual(CoinType.veChain.rawValue, 818)
         XCTAssertEqual(CoinType.icon.rawValue, 74)
-        XCTAssertEqual(CoinType.tomoChain.rawValue, 889)
+        XCTAssertEqual(CoinType.viction.rawValue, 889)
         XCTAssertEqual(CoinType.tezos.rawValue, 1729)
         XCTAssertEqual(CoinType.qtum.rawValue, 2301)
         XCTAssertEqual(CoinType.nebulas.rawValue, 2718)
@@ -34,6 +32,15 @@ class CoinTypeTests: XCTestCase {
     func testCoinDerivation() {
         XCTAssertEqual(CoinType.bitcoin.derivationPath(), "m/84'/0'/0'/0/0")
         XCTAssertEqual(CoinType.bitcoin.derivationPathWithDerivation(derivation: Derivation.bitcoinLegacy), "m/44'/0'/0'/0/0")
+        XCTAssertEqual(CoinType.bitcoin.derivationPathWithDerivation(derivation: Derivation.bitcoinTaproot), "m/86'/0'/0'/0/0")
         XCTAssertEqual(CoinType.solana.derivationPathWithDerivation(derivation: Derivation.solanaSolana), "m/44'/501'/0'/0'")
     }
+
+    func testDeriveAddressFromPublicKeyAndDerivation() {
+        let pkData = Data(hexString: "0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798")!
+        let publicKey = PublicKey(data: pkData, type: .secp256k1)!
+
+        let address = CoinType.bitcoin.deriveAddressFromPublicKeyAndDerivation(publicKey: publicKey, derivation: Derivation.bitcoinSegwit)
+        XCTAssertEqual(address, "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4")
+    }
 }
diff --git a/swift/Tests/CryptoBoxTests.swift b/swift/Tests/CryptoBoxTests.swift
new file mode 100644
index 00000000000..03632513e81
--- /dev/null
+++ b/swift/Tests/CryptoBoxTests.swift
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import WalletCore
+import XCTest
+
+class CryptoBoxTests: XCTestCase {
+    func testEncryptDecryptEasy() {
+        let mySecret = CryptoBoxSecretKey()
+        let myPubkey = mySecret.getPublicKey()
+        
+        let otherSecret = CryptoBoxSecretKey()
+        let otherPubkey = otherSecret.getPublicKey()
+        
+        let message = "Well done is better than well said. -Benjamin Franklin"
+        let encrypted = CryptoBox.encryptEasy(mySecret: mySecret, otherPubkey: otherPubkey, message: Data(message.utf8))
+        
+        // Step 2. Make sure the Box can be decrypted by the other side.
+        let decrypted = CryptoBox.decryptEasy(mySecret: otherSecret, otherPubkey: myPubkey, encrypted: encrypted)!
+        let decryptedStr = String(bytes: decrypted, encoding: .utf8)
+        XCTAssertEqual(decryptedStr, message)
+    }
+    
+    func testSecretKeyFromToBytes() {
+        let secretBytes = Data(hexString: "dd87000d4805d6fbd89ae1352f5e4445648b79d5e901c92aebcb610e9be468e4")!
+        XCTAssert(CryptoBoxSecretKey.isValid(data: secretBytes))
+        let secret = CryptoBoxSecretKey(data: secretBytes)
+        XCTAssertEqual(secret?.data, secretBytes)
+    }
+    
+    func testPublicKeyFromToBytes() {
+        let publicBytes = Data(hexString: "afccabc5b28a8a1fd1cd880516f9c854ae2498d0d1b978b53a59f38e4ae55747")!
+        XCTAssert(CryptoBoxPublicKey.isValid(data: publicBytes))
+        let pubkey = CryptoBoxPublicKey(data: publicBytes)
+        XCTAssertEqual(pubkey?.data, publicBytes)
+    }
+}
diff --git a/swift/Tests/DataTests.swift b/swift/Tests/DataTests.swift
index eee71d6743a..d003c6e303d 100644
--- a/swift/Tests/DataTests.swift
+++ b/swift/Tests/DataTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/DerivationPathTests.swift b/swift/Tests/DerivationPathTests.swift
index 3867d434847..7ca9110c591 100644
--- a/swift/Tests/DerivationPathTests.swift
+++ b/swift/Tests/DerivationPathTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/HDWalletTests.swift b/swift/Tests/HDWalletTests.swift
index e6e5b8b6b46..c36a17c62e3 100644
--- a/swift/Tests/HDWalletTests.swift
+++ b/swift/Tests/HDWalletTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -12,6 +10,38 @@ extension HDWallet {
 }
 
 class HDWalletTests: XCTestCase {
+    
+    func testFromMnemonicImmutableXMainnetFromSignature() {
+        let wallet = HDWallet(mnemonic: "obscure opera favorite shuffle mail tip age debate dirt pact cement loyal", passphrase: "")!
+        let starkDerivationPath = Ethereum.eip2645GetPath(ethAddress: "0xd0972E2312518Ca15A2304D56ff9cc0b7ea0Ea37", layer: "starkex", application: "immutablex", index: "1")
+        XCTAssertEqual(starkDerivationPath, "m/2645'/579218131'/211006541'/2124474935'/1609799702'/1")
+        
+        // Retrieve eth private key
+        let ethPrivateKey = wallet.getKeyForCoin(coin: CoinType.ethereum)
+        XCTAssertEqual(ethPrivateKey.data.hexString, "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d");
+        
+        // StarkKey Derivation Path
+        let derivationPath = DerivationPath(string: starkDerivationPath)!
+        
+        // Retrieve Stark Private key part
+        let ethMsg = "Only sign this request if you’ve initiated an action with Immutable X."
+        let ethSignature = EthereumMessageSigner.signMessageImmutableX(privateKey: ethPrivateKey, message: ethMsg)
+        XCTAssertEqual(ethSignature, "18b1be8b78807d3326e28bc286d7ee3d068dcd90b1949ce1d25c1f99825f26e70992c5eb7f44f76b202aceded00d74f771ed751f2fe538eec01e338164914fe001")
+        let starkPrivateKey = StarkWare.getStarkKeyFromSignature(derivationPath: derivationPath, signature: ethSignature)
+        XCTAssertEqual(starkPrivateKey.data.hexString, "04be51a04e718c202e4dca60c2b72958252024cfc1070c090dd0f170298249de")
+        let starkPublicKey = starkPrivateKey.getPublicKeyByType(pubkeyType: .starkex)
+        XCTAssertEqual(starkPublicKey.data.hexString, "00e5b9b11f8372610ef35d647a1dcaba1a4010716588d591189b27bf3c2d5095")
+        
+        // Account Register
+        let ethMsgToRegister = "Only sign this key linking request from Immutable X"
+        let ethSignatureToRegister = EthereumMessageSigner.signMessageImmutableX(privateKey: ethPrivateKey, message: ethMsgToRegister)
+        XCTAssertEqual(ethSignatureToRegister, "646da4160f7fc9205e6f502fb7691a0bf63ecbb74bbb653465cd62388dd9f56325ab1e4a9aba99b1661e3e6251b42822855a71e60017b310b9f90e990a12e1dc01")
+        let starkMsg = "463a2240432264a3aa71a5713f2a4e4c1b9e12bbb56083cd56af6d878217cf"
+        let starkSignature = StarkExMessageSigner.signMessage(privateKey: starkPrivateKey, message: starkMsg)
+        XCTAssertEqual(starkSignature, "04cf5f21333dd189ada3c0f2a51430d733501a9b1d5e07905273c1938cfb261e05b6013d74adde403e8953743a338c8d414bb96bf69d2ca1a91a85ed2700a528")
+        XCTAssertTrue(StarkExMessageSigner.verifyMessage(pubKey: starkPublicKey, message: starkMsg, signature: starkSignature))
+    }
+    
     func testCreateFromMnemonic() {
         let wallet = HDWallet.test
 
@@ -49,6 +79,57 @@ class HDWalletTests: XCTestCase {
         XCTAssertEqual(masterKey.data.hexString, "e120fc1ef9d193a851926ebd937c3985dc2c4e642fb3d0832317884d5f18f3b3")
     }
 
+    func testGetKeyForCoin() {
+        let coin = CoinType.bitcoin
+        let wallet = HDWallet.test
+        let key = wallet.getKeyForCoin(coin: coin)
+
+        let address = coin.deriveAddress(privateKey: key)
+        XCTAssertEqual(address, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85")
+    }
+
+    func testGetKeyDerivation() {
+        let coin = CoinType.bitcoin
+        let wallet = HDWallet.test
+
+        let key1 = wallet.getKeyDerivation(coin: coin, derivation: .bitcoinSegwit)
+        XCTAssertEqual(key1.data.hexString, "1901b5994f075af71397f65bd68a9fff8d3025d65f5a2c731cf90f5e259d6aac")
+
+        let key2 = wallet.getKeyDerivation(coin: coin, derivation: .bitcoinLegacy)
+        XCTAssertEqual(key2.data.hexString, "28071bf4e2b0340db41b807ed8a5514139e5d6427ff9d58dbd22b7ed187103a4")
+
+        let key3 = wallet.getKeyDerivation(coin: coin, derivation: .bitcoinTestnet)
+        XCTAssertEqual(key3.data.hexString, "ca5845e1b43e3adf577b7f110b60596479425695005a594c88f9901c3afe864f")
+        
+        let key4 = wallet.getKeyDerivation(coin: coin, derivation: .bitcoinTaproot)
+        XCTAssertEqual(key4.data.hexString, "a2c4d6df786f118f20330affd65d248ffdc0750ae9cbc729d27c640302afd030")
+    }
+
+    func testGetAddressForCoin() {
+        let coin = CoinType.bitcoin
+        let wallet = HDWallet.test
+
+        let address = wallet.getAddressForCoin(coin: coin)
+        XCTAssertEqual(address, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85")
+    }
+
+    func testGetAddressDerivation() {
+        let coin = CoinType.bitcoin
+        let wallet = HDWallet.test
+
+        let address1 = wallet.getAddressDerivation(coin: coin, derivation: .bitcoinSegwit)
+        XCTAssertEqual(address1, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85")
+
+        let address2 = wallet.getAddressDerivation(coin: coin, derivation: .bitcoinLegacy)
+        XCTAssertEqual(address2, "1PeUvjuxyf31aJKX6kCXuaqxhmG78ZUdL1")
+
+        let address3 = wallet.getAddressDerivation(coin: coin, derivation: .bitcoinTestnet)
+        XCTAssertEqual(address3, "tb1qwgpxgwn33z3ke9s7q65l976pseh4edrzfmyvl0")
+        
+        let address4 = wallet.getAddressDerivation(coin: coin, derivation: .bitcoinTaproot)
+        XCTAssertEqual(address4, "bc1pgqks0cynn93ymve4x0jq3u7hne77908nlysp289hc44yc4cmy0hslyckrz")
+    }
+
     func testDerive() {
         let wallet = HDWallet.test
 
@@ -169,6 +250,15 @@ class HDWalletTests: XCTestCase {
         XCTAssertEqual("bnb1wk7kxw0qrvxe2pj9mk6ydjx0t4j9jla8pja0td", address.description)
     }
 
+    func testDeriveBinanceTestnet() {
+        let binance = CoinType.binance
+        let wallet = HDWallet.test
+        let key = wallet.getKeyForCoin(coin: binance)
+        let address = AnyAddress(publicKey: key.getPublicKeySecp256k1(compressed: true), coin: binance, hrp: "tbnb")
+
+        XCTAssertEqual("tbnb1wk7kxw0qrvxe2pj9mk6ydjx0t4j9jla8085ttu", address.description)
+    }
+
     func testDeriveZcash() {
         let zcash = CoinType.zcash
         let wallet = HDWallet.test
diff --git a/swift/Tests/HashTests.swift b/swift/Tests/HashTests.swift
index fc192dceebe..da1c58574d2 100644
--- a/swift/Tests/HashTests.swift
+++ b/swift/Tests/HashTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/Keystore/KeyStoreTests.swift b/swift/Tests/Keystore/KeyStoreTests.swift
index 3ae5529e79e..99b2815b825 100755
--- a/swift/Tests/Keystore/KeyStoreTests.swift
+++ b/swift/Tests/Keystore/KeyStoreTests.swift
@@ -183,6 +183,20 @@ class KeyStoreTests: XCTestCase {
         XCTAssertNotNil(storedData)
         XCTAssertNotNil(PrivateKey(data: storedData!))
     }
+    
+    func testImportPrivateKeyAES256() throws {
+        let keyStore = try KeyStore(keyDirectory: keyDirectory)
+        let privateKeyData = Data(hexString: "9cdb5cab19aec3bd0fcd614c5f185e7a1d97634d4225730eba22497dc89a716c")!
+        let key = StoredKey.importPrivateKeyWithEncryption(privateKey: privateKeyData, name: "name", password: Data("password".utf8), coin: .ethereum, encryption: StoredKeyEncryption.aes256Ctr)!
+        let json = key.exportJSON()!
+
+        let wallet = try keyStore.import(json: json, name: "name", password: "password", newPassword: "newPassword", coins: [.ethereum])
+        let storedData = wallet.key.decryptPrivateKey(password: Data("newPassword".utf8))
+
+        XCTAssertNotNil(keyStore.keyWallet)
+        XCTAssertNotNil(storedData)
+        XCTAssertNotNil(PrivateKey(data: storedData!))
+    }
 
     func testImportPrivateKey() throws {
         let keyStore = try KeyStore(keyDirectory: keyDirectory)
@@ -208,9 +222,18 @@ class KeyStoreTests: XCTestCase {
         XCTAssertEqual(wallet.accounts.count, 1)
         XCTAssertNotNil(keyStore.hdWallet)
     }
+    
+    func testImportWalletAES256() throws {
+        let keyStore = try KeyStore(keyDirectory: keyDirectory)
+        let wallet = try keyStore.import(mnemonic: mnemonic, name: "name", encryptPassword: "newPassword", coins: [.ethereum], encryption: .aes256Ctr)
+        let storedData = wallet.key.decryptMnemonic(password: Data("newPassword".utf8))
 
-    func testImportJSON() throws {
+        XCTAssertNotNil(storedData)
+        XCTAssertEqual(wallet.accounts.count, 1)
+        XCTAssertNotNil(keyStore.hdWallet)
+    }
 
+    func testImportJSON() throws {
         let expected = """
         {
             "activeAccounts": [{
@@ -414,6 +437,10 @@ class KeyStoreTests: XCTestCase {
         let btc2 = try wallet.getAccount(password: password, coin: .bitcoin, derivation: .bitcoinLegacy)
         XCTAssertEqual(btc2.address, "1NyRyFewhZcWMa9XCj3bBxSXPXyoSg8dKz")
         XCTAssertEqual(btc2.extendedPublicKey, "xpub6CR52eaUuVb4kXAVyHC2i5ZuqJ37oWNPZFtjXaazFPXZD45DwWBYEBLdrF7fmCR9pgBuCA9Q57zZfyJjDUBDNtWkhWuGHNYKLgDHpqrHsxV")
+        
+        let btc3 = try wallet.getAccount(password: password, coin: .bitcoin, derivation: .bitcoinTaproot)
+        XCTAssertEqual(btc3.address, "bc1pyqkqf20fmmwmcxf98tv6k63e2sgnjy4zne6d0r32vxwm3au0hnksq6ec57")
+        XCTAssertEqual(btc3.extendedPublicKey, "zpub6qNRYbLLXquaD1GKxHZWDs3moUFQfP4iqXiDPCd8aD3oNHZkCAusAw5raKQEWV8BkXBTXhWBkgZTxzjjnQ5cRjWa6LNcjmrVVNdUKvbKTgm")
 
         let solana1 = try wallet.getAccount(password: password, coin: .solana, derivation: .default)
         XCTAssertEqual(solana1.address, "HiipoCKL8hX2RVmJTz3vaLy34hS2zLhWWMkUWtw85TmZ")
diff --git a/swift/Tests/LiquidStakingTests.swift b/swift/Tests/LiquidStakingTests.swift
new file mode 100644
index 00000000000..009ad2759d1
--- /dev/null
+++ b/swift/Tests/LiquidStakingTests.swift
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class LiquidStakingTests: XCTestCase {
+    
+    func testStraderStakePolygon() throws {
+        let input = LiquidStakingInput.with {
+            $0.blockchain = .polygon
+            $0.protocol = .strader
+            $0.smartContractAddress = "0xfd225c9e6601c9d38d8f98d8731bf59efcf8c0e3"
+            $0.stake = LiquidStakingStake.with {
+                $0.amount = "1000000000000000000"
+                $0.asset = LiquidStakingAsset.with {
+                    $0.stakingToken = .pol
+                }
+            }
+        }
+        let inputSerialized = try input.serializedData()
+        XCTAssertEqual(inputSerialized.hexString, "0a170a00121331303030303030303030303030303030303030222a3078666432323563396536363031633964333864386639386438373331626635396566636638633065333001")
+        let outputData = LiquidStaking.buildRequest(input: inputSerialized)
+        XCTAssertEqual(outputData.count, 68)
+        let outputProto = try LiquidStakingOutput(serializedData: outputData)
+        var txInput = outputProto.ethereum
+        
+        txInput.chainID = Data(hexString: "89")!
+        txInput.nonce = Data(hexString: "01")!
+        txInput.maxFeePerGas = Data(hexString: "8fbcc8fcd8")!
+        txInput.maxInclusionFeePerGas = Data(hexString: "085e42c7c0")!
+        txInput.gasLimit = Data(hexString: "01c520")!
+        txInput.privateKey = Data(hexString: "4a160b803c4392ea54865d0c5286846e7ad5e68fbd78880547697472b22ea7ab")!
+        
+        let output: EthereumSigningOutput = AnySigner.sign(input: txInput, coin: .ethereum)
+
+        XCTAssertEqual(output.encoded.hexString, "02f87a81890185085e42c7c0858fbcc8fcd88301c52094fd225c9e6601c9d38d8f98d8731bf59efcf8c0e3880de0b6b3a764000084c78cf1a0c001a04bcf92394d53d4908130cc6d4f7b2491967f9d6c59292b84c1f56adc49f6c458a073e09f45d64078c41a7946ffdb1dee8e604eb76f318088490f8f661bb7ddfc54")
+        // Successfully broadcasted: https://polygonscan.com/tx/0x0f6c4f7a893c3f08be30d2ea24479d7ed4bdba40875d07cfd607cf97980b7cf0
+    }
+}
diff --git a/swift/Tests/MnemonicTests.swift b/swift/Tests/MnemonicTests.swift
index e76baa79185..3d2f043714d 100644
--- a/swift/Tests/MnemonicTests.swift
+++ b/swift/Tests/MnemonicTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
diff --git a/swift/Tests/PBKDF2Tests.swift b/swift/Tests/PBKDF2Tests.swift
index c5ccbadc1af..cb3645cdf95 100644
--- a/swift/Tests/PBKDF2Tests.swift
+++ b/swift/Tests/PBKDF2Tests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/PrivateKeyTests.swift b/swift/Tests/PrivateKeyTests.swift
index ae363969f17..1fd2ce348bb 100644
--- a/swift/Tests/PrivateKeyTests.swift
+++ b/swift/Tests/PrivateKeyTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -20,6 +18,22 @@ class PrivateKeyTests: XCTestCase {
         let privateKey = PrivateKey(data: Data(hexString: "0xdeadbeef")!)
         XCTAssertNil(privateKey)
     }
+    
+    func testStarkKeyCreation() {
+        let data = Data(hexString: "06cf0a8bf113352eb863157a45c5e5567abb34f8d32cddafd2c22aa803f4892c")!
+        XCTAssertTrue(PrivateKey.isValid(data: data, curve: .starkex))
+        let privateKey = PrivateKey(data: data)!
+        let pubKey = privateKey.getPublicKeyByType(pubkeyType: .starkex)
+        XCTAssertEqual(pubKey.data.hexString, "02d2bbdc1adaf887b0027cdde2113cfd81c60493aa6dc15d7887ddf1a82bc831")
+    }
+    
+    func testStarkKeySigning() {
+        let data = Data(hexString: "0139fe4d6f02e666e86a6f58e65060f115cd3c185bd9e98bd829636931458f79")!
+        let privateKey = PrivateKey(data: data)!
+        let digest = Data(hexString: "06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76")!
+        let signature = privateKey.sign(digest: digest, curve: .starkex)!
+        XCTAssertEqual(signature.hexString, "061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a")
+    }
 
     func testIsValidString() {
         let data = Data(hexString: "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5")!
@@ -35,44 +49,6 @@ class PrivateKeyTests: XCTestCase {
         XCTAssertEqual(publicKey.data.hexString, "0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91")
     }
 
-    func testGetSharedKey() {
-        let privateKey = PrivateKey(data: Data(hexString: "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0")!)!
-        let publicKey = PublicKey(data: Data(hexString: "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992")!, type: .secp256k1)!
-
-        let derivedData = privateKey.getSharedKey(publicKey: publicKey, curve: .secp256k1)!
-
-        XCTAssertEqual(derivedData.hexString, "ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a")
-    }
-
-    func testGetSharedKeyWycherproof() {
-        let privateKey = PrivateKey(data: Data(hexString: "f4b7ff7cccc98813a69fae3df222bfe3f4e28f764bf91b4a10d8096ce446b254")!)!
-        let publicKey = PublicKey(data: Data(hexString: "02d8096af8a11e0b80037e1ee68246b5dcbb0aeb1cf1244fd767db80f3fa27da2b")!, type: .secp256k1)!
-
-        let derivedData = privateKey.getSharedKey(publicKey: publicKey, curve: .secp256k1)!
-
-        XCTAssertEqual(derivedData.hexString, "81165066322732362ca5d3f0991d7f1f7d0aad7ea533276496785d369e35159a")
-    }    
-
-    func testGetSharedKeyBidirectional() {
-        let privateKey1 = PrivateKey(data: Data(hexString: "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0")!)!
-        let publicKey1 = privateKey1.getPublicKeySecp256k1(compressed: false)
-        let privateKey2 = PrivateKey(data: Data(hexString: "ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a")!)!
-        let publicKey2 = privateKey2.getPublicKeySecp256k1(compressed: false)
-
-        let derivedData1 = privateKey1.getSharedKey(publicKey: publicKey2, curve: .secp256k1)!
-        let derivedData2 = privateKey2.getSharedKey(publicKey: publicKey1, curve: .secp256k1)!
-
-        XCTAssertEqual(derivedData1.hexString, derivedData2.hexString)
-    }
-
-    func testGetSharedKeyError() {
-        let privateKey = PrivateKey(data: Data(hexString: "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0")!)!
-        let publicKey = PublicKey(data: Data(hexString: "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992")!, type: .secp256k1)!
-
-        let derivedData = privateKey.getSharedKey(publicKey: publicKey, curve: .ed25519)
-        XCTAssertNil(derivedData)
-    }
-
     func testSignSchnorr() {
         let privateKey = PrivateKey(data: Data(hexString: "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5")!)!
         let publicKey = privateKey.getPublicKeySecp256k1(compressed: true)
diff --git a/swift/Tests/PublicKeyTests.swift b/swift/Tests/PublicKeyTests.swift
index b6844ea38c8..026935dbb6d 100644
--- a/swift/Tests/PublicKeyTests.swift
+++ b/swift/Tests/PublicKeyTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import WalletCore
 import XCTest
@@ -35,4 +33,14 @@ class PublicKeyTests: XCTestCase {
         XCTAssertTrue(result2)
         XCTAssertTrue(result3)
     }
+    
+    func testVerifyStarkey() {
+        let data = Data(hexString: "02c5dbad71c92a45cc4b40573ae661f8147869a91d57b8d9b8f48c8af7f83159")!
+        let publicKey = PublicKey(data: data, type: .starkex)!
+        let signature = Data(hexString: "061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a")!
+        let hash = Data(hexString: "06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76")!
+        XCTAssertTrue(publicKey.verify(signature: signature, message: hash))
+        let invalidSignature = Data(hexString: "061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9b")!
+        XCTAssertFalse(publicKey.verify(signature: invalidSignature, message: hash))
+    }
 }
diff --git a/swift/Tests/TransactionCompilerTests.swift b/swift/Tests/TransactionCompilerTests.swift
new file mode 100644
index 00000000000..3a45d34b0b7
--- /dev/null
+++ b/swift/Tests/TransactionCompilerTests.swift
@@ -0,0 +1,183 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class TransactionCompilerTests: XCTestCase {
+    override func setUp() {
+        continueAfterFailure = false
+    }
+
+    func testBitcoinCompileWithSignatures() throws {
+        // Test external signining with a Bitcoin transaction with 3 input UTXOs, all used, but only using 2 public keys.
+        // Three signatures are neeeded.  This illustrates that order of UTXOs/hashes is not always the same.
+
+        let revUtxoHash0 = Data(hexString: "07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8")!
+        let revUtxoHash1 = Data(hexString: "d6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e")!
+        let revUtxoHash2 = Data(hexString: "6021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d")!
+        let inPubKey0 = Data(hexString: "024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382")!
+        let inPubKey1 = Data(hexString: "0217142f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc")!
+        let inPubKeyHash0 = Data(hexString: "bd92088bb7e82d611a9b94fbb74a0908152b784f")!
+        let inPubKeyHash1 = Data(hexString: "6641abedacf9483b793afe1718689cc9420bbb1c")!
+
+        // Test data: Input UTXO infos
+        struct UtxoInfo {
+            let revUtxoHash: Data
+            let publicKey: Data
+            let amount: Int64
+            let index: UInt32
+        }
+        let utxoInfos: [UtxoInfo] = [
+            // first
+            UtxoInfo(revUtxoHash: revUtxoHash0, publicKey: inPubKey0, amount: 600000, index: 0),
+            // second UTXO, with same pubkey
+            UtxoInfo(revUtxoHash: revUtxoHash1, publicKey: inPubKey0, amount: 500000, index: 1),
+            // third UTXO, with different pubkey
+            UtxoInfo(revUtxoHash: revUtxoHash2, publicKey: inPubKey1, amount: 400000, index: 0),
+        ]
+        
+        // Signature infos, indexed by pubkeyhash+hash
+        struct SignatureInfo {
+            let signature: Data
+            let publicKey: Data
+        }
+        let signatureInfos: [String: SignatureInfo] = [
+            inPubKeyHash0.hexString + "+" + "a296bead4172007be69b21971a790e076388666c162a9505698415f1b003ebd7":
+            SignatureInfo(signature: Data(hexString: "304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a40")!, publicKey: inPubKey0),
+            inPubKeyHash1.hexString + "+" + "505f527f00e15fcc5a2d2416c9970beb57dfdfaca99e572a01f143b24dd8fab6":
+            SignatureInfo(signature: Data(hexString: "3044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e37966414fe115820220646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e4")!, publicKey: inPubKey1),
+            inPubKeyHash0.hexString + "+" + "60ed6e9371e5ddc72fd88e46a12cb2f68516ebd307c0fd31b1b55cf767272101":
+            SignatureInfo(signature: Data(hexString: "30440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b102207e777f7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc")!, publicKey: inPubKey0),
+        ]
+
+        let coin = CoinType.bitcoin
+        let ownAddress = "bc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z00ppggv"
+
+        // Setup input for Plan
+        var signingInput = BitcoinSigningInput.with {
+            $0.coinType = coin.rawValue
+            $0.hashType = BitcoinSigHashType.all.rawValue
+            $0.amount = 1200000
+            $0.useMaxAmount = false
+            $0.byteFee = 1
+            $0.toAddress = "bc1q2dsdlq3343vk29runkgv4yc292hmq53jedfjmp"
+            $0.changeAddress = ownAddress
+        }
+        
+        // process UTXOs
+        var count: UInt32 = 0        
+        for u in utxoInfos {
+            let publicKey = PublicKey(data: u.publicKey, type: PublicKeyType.secp256k1)
+            let address = SegwitAddress(hrp: .bitcoin, publicKey: publicKey!)
+            if (count == 0) { XCTAssertEqual(address.description, ownAddress) }
+            if (count == 1) { XCTAssertEqual(address.description, ownAddress) }
+            if (count == 2) { XCTAssertEqual(address.description, "bc1qveq6hmdvl9yrk7f6lct3s6yue9pqhwcuxedggg") }
+
+            let utxoScript = BitcoinScript.lockScriptForAddress(address: address.description, coin: coin)
+            if (count == 0) { XCTAssertEqual(utxoScript.data.hexString, "0014bd92088bb7e82d611a9b94fbb74a0908152b784f") }
+            if (count == 1) { XCTAssertEqual(utxoScript.data.hexString, "0014bd92088bb7e82d611a9b94fbb74a0908152b784f") }
+            if (count == 2) { XCTAssertEqual(utxoScript.data.hexString, "00146641abedacf9483b793afe1718689cc9420bbb1c") }
+            
+            let keyHash: Data = utxoScript.matchPayToWitnessPublicKeyHash()!
+            if (count == 0) { XCTAssertEqual(keyHash.hexString, inPubKeyHash0.hexString) }
+            if (count == 1) { XCTAssertEqual(keyHash.hexString, inPubKeyHash0.hexString) }
+            if (count == 2) { XCTAssertEqual(keyHash.hexString, inPubKeyHash1.hexString) }
+            
+            let redeemScript = BitcoinScript.buildPayToPublicKeyHash(hash: keyHash)
+            if (count == 0) { XCTAssertEqual(redeemScript.data.hexString, "76a914bd92088bb7e82d611a9b94fbb74a0908152b784f88ac") }
+            if (count == 1) { XCTAssertEqual(redeemScript.data.hexString, "76a914bd92088bb7e82d611a9b94fbb74a0908152b784f88ac") }
+            if (count == 2) { XCTAssertEqual(redeemScript.data.hexString, "76a9146641abedacf9483b793afe1718689cc9420bbb1c88ac") }
+            signingInput.scripts[keyHash.hexString] = redeemScript.data
+            
+            let outPoint = BitcoinOutPoint.with {
+                $0.hash = u.revUtxoHash
+                $0.index = u.index
+                $0.sequence = UInt32.max
+            }
+            let utxo = BitcoinUnspentTransaction.with {
+                $0.script = utxoScript.data
+                $0.amount = u.amount
+                $0.outPoint = outPoint
+            }
+            signingInput.utxo.append(utxo)
+            
+            count += 1
+        }
+        XCTAssertEqual(count, 3)
+        XCTAssertEqual(signingInput.utxo.count, 3)
+
+        // Plan
+        let plan: BitcoinTransactionPlan = AnySigner.plan(input: signingInput, coin: coin)
+
+        // At this point plan can be checked, assume it is accepted unmodified
+        XCTAssertEqual(plan.amount, 1200000)
+        XCTAssertEqual(plan.fee, 277)
+        XCTAssertEqual(plan.change, 299723)
+        XCTAssertEqual(plan.utxos.count, 3)
+        // Note that UTXOs happen to be in reverse order compared to the input
+        XCTAssertEqual(plan.utxos[0].outPoint.hash.hexString, revUtxoHash2.hexString)
+        XCTAssertEqual(plan.utxos[1].outPoint.hash.hexString, revUtxoHash1.hexString)
+        XCTAssertEqual(plan.utxos[2].outPoint.hash.hexString, revUtxoHash0.hexString)
+
+        // Extend input with accepted plan
+        signingInput.plan = plan
+
+        // Serialize input
+        let txInputData = try signingInput.serializedData()
+        XCTAssertEqual(txInputData.count, 692)
+
+        /// Step 2: Obtain preimage hashes
+        let preImageHashes = TransactionCompiler.preImageHashes(coinType: coin, txInputData: txInputData)
+        let preSigningOutput: BitcoinPreSigningOutput = try BitcoinPreSigningOutput(serializedData: preImageHashes)
+
+        XCTAssertEqual(preSigningOutput.error, CommonSigningError.ok)
+        XCTAssertEqual(preSigningOutput.hashPublicKeys[0].dataHash.hexString, "505f527f00e15fcc5a2d2416c9970beb57dfdfaca99e572a01f143b24dd8fab6")
+        XCTAssertEqual(preSigningOutput.hashPublicKeys[1].dataHash.hexString, "a296bead4172007be69b21971a790e076388666c162a9505698415f1b003ebd7")
+        XCTAssertEqual(preSigningOutput.hashPublicKeys[2].dataHash.hexString, "60ed6e9371e5ddc72fd88e46a12cb2f68516ebd307c0fd31b1b55cf767272101")
+        XCTAssertEqual(preSigningOutput.hashPublicKeys[0].publicKeyHash.hexString, inPubKeyHash1.hexString)
+        XCTAssertEqual(preSigningOutput.hashPublicKeys[1].publicKeyHash.hexString, inPubKeyHash0.hexString)
+        XCTAssertEqual(preSigningOutput.hashPublicKeys[2].publicKeyHash.hexString, inPubKeyHash0.hexString)
+
+        // Simulate signatures, normally they are obtained from external source, e.g. a signature server.
+        let signatureVec = DataVector()
+        let pubkeyVec = DataVector()
+        for h in preSigningOutput.hashPublicKeys {
+            let preImageHash = h.dataHash
+            let pubkeyHash = h.publicKeyHash
+            
+            let key: String = pubkeyHash.hexString + "+" + preImageHash.hexString
+            XCTAssertTrue(signatureInfos.contains { $0.key == key })
+            let sigInfo: SignatureInfo = signatureInfos[key]!
+            let publicKeyData = sigInfo.publicKey
+            let publicKey = PublicKey(data: publicKeyData, type: PublicKeyType.secp256k1)!
+            let signature = sigInfo.signature
+            
+            signatureVec.add(data: signature)
+            pubkeyVec.add(data: publicKeyData)
+
+            // Verify signature (pubkey & hash & signature)
+            XCTAssertTrue(publicKey.verifyAsDER(signature: signature, message: preImageHash))
+        }
+        
+        /// Step 3: Compile transaction info
+        let compileWithSignatures = TransactionCompiler.compileWithSignatures(coinType: coin, txInputData: txInputData, signatures: signatureVec, publicKeys: pubkeyVec)
+        
+        let ExpectedTx = "010000000001036021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d0000000000ffffffffd6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e0100000000ffffffff07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa80000000000ffffffff02804f1200000000001600145360df8231ac5965147c9d90ca930a2aafb05232cb92040000000000160014bd92088bb7e82d611a9b94fbb74a0908152b784f02473044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e37966414fe115820220646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e401210217142f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc0247304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a400121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382024730440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b102207e777f7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc0121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb49338200000000"
+        
+        XCTAssertEqual(compileWithSignatures.count, 786)
+        let output: BitcoinSigningOutput = try BitcoinSigningOutput(serializedData: compileWithSignatures)
+        XCTAssertEqual(output.encoded.count, 518)
+        XCTAssertEqual(output.encoded.hexString, ExpectedTx)
+    }
+    
+    // Test if `compileWithSignaturesAndPubKeyType` binding is available in Swift.
+    func testBitcoinCompileWithSignaturesAndPubKeyType() {
+        let txInputData = Data()
+        let signatureVec = DataVector()
+        let pubkeyVec = DataVector()
+
+        let _ = TransactionCompiler.compileWithSignaturesAndPubKeyType(coinType: .bitcoin, txInputData: txInputData, signatures: signatureVec, publicKeys: pubkeyVec, pubKeyType: .secp256k1)
+    }
+}
diff --git a/swift/Tests/UniversalAssetIDTests.swift b/swift/Tests/UniversalAssetIDTests.swift
index 73ad5ac8358..e2d2c3ca6d8 100644
--- a/swift/Tests/UniversalAssetIDTests.swift
+++ b/swift/Tests/UniversalAssetIDTests.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 import WalletCore
diff --git a/swift/Tests/WebAuthnTests.swift b/swift/Tests/WebAuthnTests.swift
new file mode 100644
index 00000000000..d57140b48e2
--- /dev/null
+++ b/swift/Tests/WebAuthnTests.swift
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import XCTest
+import WalletCore
+
+class WebAuthnTests: XCTestCase {
+
+    func testGetPubicKey() {
+        let attestationObject = Data(hexString: "0xa363666d74646e6f6e656761747453746d74a068617574684461746158a4f95bc73828ee210f9fd3bbe72d97908013b0a3759e9aea3d0ae318766cd2e1ad4500000000adce000235bcc60a648b0b25f1f055030020c720eb493e167ce93183dd91f5661e1004ed8cc1be23d3340d92381da5c0c80ca5010203262001215820a620a8cfc88fd062b11eab31663e56cad95278bef612959be214d98779f645b82258204e7b905b42917570148b0432f99ba21f2e7eebe018cbf837247e38150a89f771")!
+        let result = WebAuthn.getPublicKey(attestationObject: attestationObject)!.data
+        XCTAssertEqual(result.hexString, "04a620a8cfc88fd062b11eab31663e56cad95278bef612959be214d98779f645b84e7b905b42917570148b0432f99ba21f2e7eebe018cbf837247e38150a89f771")
+    }
+
+    func testGetRSValues() {
+        let signature = Data(hexString: "0x30440220766589b461a838748708cdf88444b21b1fa52b57d70671b4f9bf60ad14b372ec022020cc439c9c20661bfa39bbea24a900ec1484b2395eb065ead8ef4e273144a57d")!
+        let result = WebAuthn.getRSValues(signature: signature)
+        XCTAssertEqual(result.hexString, "766589b461a838748708cdf88444b21b1fa52b57d70671b4f9bf60ad14b372ec20cc439c9c20661bfa39bbea24a900ec1484b2395eb065ead8ef4e273144a57d")
+    }
+
+    func testReconstructOriginalMessage() {
+        let authenticatorData = Data(hexString: "0x1a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d00000000")!
+        let clientDataJSON = Data(hexString: "0x7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a224e5549794f5545774d6b45744e554535517930304d6b5a424c546847516a4174517a52474f4441794d3045304f546b30222c226f726967696e223a2268747470733a2f2f747275737477616c6c65742e636f6d227d")!
+        let result = WebAuthn.reconstructOriginalMessage(authenticatorData: authenticatorData, clientDataJSON: clientDataJSON)
+        XCTAssertEqual(result.hexString, "3254cdbd677e6e31e75d2135bad0cf56440d7c6b108c141a3509d76ce45c6731")
+    }
+}
diff --git a/swift/Tests/XCTAssert+Extension.swift b/swift/Tests/XCTAssert+Extension.swift
index 048c712951c..15aa17f5eb9 100644
--- a/swift/Tests/XCTAssert+Extension.swift
+++ b/swift/Tests/XCTAssert+Extension.swift
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import XCTest
 
diff --git a/swift/common-xcframework.yml b/swift/common-xcframework.yml
index fead1284c2c..dae0d4b55c7 100644
--- a/swift/common-xcframework.yml
+++ b/swift/common-xcframework.yml
@@ -8,7 +8,6 @@ options:
     macOS: 10.14
 settings:
   base:
-    ENABLE_BITCODE: YES
     HEADER_SEARCH_PATHS: $(SRCROOT)/wallet-core ${SRCROOT}/trezor-crypto/crypto
     SYSTEM_HEADER_SEARCH_PATHS: ${SRCROOT}/include ${SRCROOT}/../build/local/include ${SRCROOT}/trezor-crypto/include $(SRCROOT)/protobuf /usr/local/include /opt/homebrew/include
     CLANG_CXX_LANGUAGE_STANDARD: c++20
@@ -35,12 +34,15 @@ targets:
         - "proto/*.proto"
         - "Tron/Protobuf/*.proto"
         - "Zilliqa/Protobuf/*.proto"
+        - "Cosmos/Protobuf/*.proto"
+        - "Hedera/Protobuf/*.proto"
     dependencies:
       - target: trezor-crypto_${platform}
         link: true
       - target: protobuf_${platform}
         link: true
       - sdk: libc++.tbd
+      - framework: WalletCoreRs.xcframework
     settings:
       SKIP_INSTALL: false
       SUPPORTS_MACCATALYST: true
diff --git a/swift/cpp.xcconfig.in b/swift/cpp.xcconfig.in
index 41c80610459..09e3c0f91af 100644
--- a/swift/cpp.xcconfig.in
+++ b/swift/cpp.xcconfig.in
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 HEADER_SEARCH_PATHS = $(SRCROOT)/../src @Boost_INCLUDE_DIRS@
 SYSTEM_HEADER_SEARCH_PATHS = $(SRCROOT)/../src/build/local/include $(SRCROOT)/../build/local/src/protobuf/protobuf-3.19.2/src
diff --git a/swift/fastlane/Fastfile b/swift/fastlane/Fastfile
index 54bb2511daf..5fa18ea4945 100644
--- a/swift/fastlane/Fastfile
+++ b/swift/fastlane/Fastfile
@@ -13,8 +13,9 @@ platform :ios do
     create_xcframework(
       workspace: 'TrustWalletCore.xcworkspace',
       scheme: 'WalletCore',
-      destinations: ['iOS', 'macOS'],
-      xcframework_output_directory: 'build'
+      destinations: ['iOS'],
+      xcframework_output_directory: 'build',
+      enable_bitcode: false
     )
   end
 
@@ -23,8 +24,9 @@ platform :ios do
     create_xcframework(
       workspace: 'TrustWalletCore.xcworkspace',
       scheme: 'SwiftProtobuf',
-      destinations: ['iOS', 'macOS'],
-      xcframework_output_directory: 'build'
+      destinations: ['iOS'],
+      xcframework_output_directory: 'build',
+      enable_bitcode: false
     )
   end
 end
diff --git a/swift/project.yml b/swift/project.yml
index 3d17eb60784..df46f6a29e5 100644
--- a/swift/project.yml
+++ b/swift/project.yml
@@ -27,9 +27,10 @@ targets:
         excludes:
           - ".vscode"
           - "proto/*.proto"
-          - "Cosmos/Protobuf/*.proto"
           - "Tron/Protobuf/*.proto"
           - "Zilliqa/Protobuf/*.proto"
+          - "Cosmos/Protobuf/*.proto"
+          - "Hedera/Protobuf/*.proto"
       - Sources
     dependencies:
       - target: trezor-crypto
@@ -37,6 +38,7 @@ targets:
       - target: protobuf
         link: true
       - sdk: libc++.tbd
+      - framework: WalletCoreRs.xcframework
     scheme:
       testTargets:
         - WalletCoreTests
@@ -60,6 +62,7 @@ targets:
           fi
         name: SwiftLint
         shell: /bin/bash
+        basedOnDependencyAnalysis: false
 
   WalletCoreTests:
     type: bundle.unit-test
diff --git a/tests/Aeternity/AddressTests.cpp b/tests/Aeternity/AddressTests.cpp
deleted file mode 100644
index c08866c05e7..00000000000
--- a/tests/Aeternity/AddressTests.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <Aeternity/Address.h>
-#include <HexCoding.h>
-#include <gtest/gtest.h>
-
-namespace TW::Aeternity::tests {
-
-TEST(AeternityAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("ee93a4f66f8d16b819bb9beb9ffccdfcdc1412e87fee6a324c2a99a1e0e67148"), TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
-}
-
-TEST(AeternityAddress, FromString) {
-    auto address = Address("ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
-    ASSERT_EQ(address.string(), "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
-}
-
-} // namespace TW::Aeternity::tests
diff --git a/tests/Aeternity/SignerTests.cpp b/tests/Aeternity/SignerTests.cpp
deleted file mode 100644
index 55f9246fd3b..00000000000
--- a/tests/Aeternity/SignerTests.cpp
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Aeternity/Signer.h"
-#include "Aeternity/Transaction.h"
-#include "HexCoding.h"
-
-#include "Aeternity/Address.h"
-#include <gtest/gtest.h>
-#include "uint256.h"
-
-namespace TW::Aeternity::tests {
-
-TEST(AeternitySigner, Sign) {
-    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
-    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
-    uint256_t amount = 10;
-    uint256_t fee = 20000000000000;
-    std::string payload = "Hello World";
-    uint64_t ttl = 82757;
-    uint64_t nonce = 49;
-
-    auto transaction = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
-    auto privateKey = PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
-
-    auto result = Signer::sign(privateKey, transaction);
-    EXPECT_EQ(result.signature(), "sg_VW42qDPP3MMNFAStYaumjZz7mC7BZYpbNa15E57ejqUe7JdQFWCiX65eLNUpGMpt8tSpfgCfkYzcaFppqx7W75CrcWdC8");
-    EXPECT_EQ(result.encoded(), "tx_+KkLAfhCuEDZ2XDV5OuHv1iuLn66sFLBUwnzp1K8JW1Zz+fEgmuEh6HEvNu0R112M3IYkVzvTSnT0pJ3TWhVOumgJ+IWwW8HuGH4XwwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKMKhhIwnOVAAIMBQ0Uxi0hlbGxvIFdvcmxkDZqNSg==");
-}
-
-TEST(AeternitySigner, SignTxWithZeroTtl) {
-    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
-    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
-    uint256_t amount = 10;
-    uint256_t fee = 20000000000000;
-    std::string payload = "Hello World";
-    uint64_t ttl = 0;
-    uint64_t nonce = 49;
-
-    auto transaction = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
-    auto privateKey = PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
-
-    auto result = Signer::sign(privateKey, transaction);
-    EXPECT_EQ(result.signature(), "sg_7qJK868bqEZ5ciC2P3WCKYfhayvKTHvPsz3bdPgpfF3Ky7yNg9f8k22A3gxjjSm9afa6JmP8TJpF4GJkFh2k7gGaog9KS");
-    EXPECT_EQ(result.encoded(), "tx_+KYLAfhCuEA0OgWhpq/VfS6ksMS+Df4ewZxIITEhjaaMOiyT0aRuAEe6b5+d2cQtzoyz58NNr+N4MFowctrGXrCrrkhNIywLuF74XAwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKMKhhIwnOVAAAAxi0hlbGxvIFdvcmxkjoDNvQ==");
-}
-
-TEST(AeternitySigner, SignTxWithZeroAmount) {
-    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
-    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
-    uint256_t amount = 0;
-    uint256_t fee = 20000000000000;
-    std::string payload = "Zero amount test";
-    uint64_t ttl = 113579;
-    uint64_t nonce = 7;
-
-    auto transaction = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
-    auto privateKey = PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
-
-    auto result = Signer::sign(privateKey, transaction);
-    EXPECT_EQ(result.signature(), "sg_ShWvujPnyKBT1Ng2X5k6XSchVK8Bq7LYEisPMH11DUoPkXZcooBzqw81j9j5JewoFFpT9xEhUptj1azcLA21ogURYh4Lz");
-    EXPECT_EQ(result.encoded(), "tx_+K4LAfhCuEDEbeoiVYmJCXm91KNfZXOvZMoT9x/sZja09EXZmErFBxm52b1IVoM4806Zr+TsliAYzUyKfUUFo3jGfXEPdZ8PuGb4ZAwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKMAhhIwnOVAAIMBu6sHkFplcm8gYW1vdW50IHRlc3S5L3Vn");
-}
-
-TEST(AeternitySigner, SignTxWithZeroNonce) {
-    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
-    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
-    uint256_t amount = 3369980000000000000;
-    uint256_t fee = 20000000000000;
-    std::string payload = "Zero nonce test";
-    uint64_t ttl = 113579;
-    uint64_t nonce = 0;
-
-    auto transaction = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
-    auto privateKey = PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
-
-    auto result = Signer::sign(privateKey, transaction);
-    EXPECT_EQ(result.signature(), "sg_MaJc4ptSUhq5kH6mArszDAvu4f7PejyuhmgM6U8GEr8bRUTaSFbdFPx4C6FEYA5v5Lgwu9EToaWnHgR2xkqZ9JjHnaBpA");
-    EXPECT_EQ(result.encoded(), "tx_+LULAfhCuECdQsgcE8bp+9CANdasxkt5gxfjBSI1ztyPl1aNJbm+MwUvE7Lu/qvAkHijfe+Eui2zrqhZRYc5mblRa+oLOIIEuG34awwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKOILsSS9IArwACGEjCc5UAAgwG7qwCPWmVybyBub25jZSB0ZXN0piWfFA==");
-}
-
-} // namespace TW::Aeternity::tests
diff --git a/tests/Aeternity/TWAnySignerTests.cpp b/tests/Aeternity/TWAnySignerTests.cpp
deleted file mode 100644
index f966db42fbe..00000000000
--- a/tests/Aeternity/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "uint256.h"
-#include "proto/Aeternity.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::Aeternity::tests {
-
-TEST(TWAnySignerAeternity, Sign) {
-    auto privateKey = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
-
-    Proto::SigningInput input;
-    input.set_from_address("ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
-    input.set_to_address("ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v");
-    auto amount = store(uint256_t(10));
-    input.set_amount(amount.data(), amount.size());
-    auto fee = store(uint256_t(20000000000000));
-    input.set_fee(fee.data(), fee.size());
-    input.set_payload("Hello World");
-    input.set_ttl(82757);
-    input.set_nonce(49);
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeAeternity);
-
-    ASSERT_EQ(output.encoded(), "tx_+KkLAfhCuEDZ2XDV5OuHv1iuLn66sFLBUwnzp1K8JW1Zz+fEgmuEh6HEvNu0R112M3IYkVzvTSnT0pJ3TWhVOumgJ+IWwW8HuGH4XwwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKMKhhIwnOVAAIMBQ0Uxi0hlbGxvIFdvcmxkDZqNSg==");
-}
-
-} // namespace TW::Aeternity::tests
diff --git a/tests/Aeternity/TWCoinTypeTests.cpp b/tests/Aeternity/TWCoinTypeTests.cpp
deleted file mode 100644
index 7db96db7589..00000000000
--- a/tests/Aeternity/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWAeternityCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAeternity));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAeternity, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAeternity, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAeternity));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAeternity));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAeternity), 18);
-    ASSERT_EQ(TWBlockchainAeternity, TWCoinTypeBlockchain(TWCoinTypeAeternity));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAeternity));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAeternity));
-    assertStringsEqual(symbol, "AE");
-    assertStringsEqual(txUrl, "https://explorer.aepps.com/transactions/t123");
-    assertStringsEqual(accUrl, "https://explorer.aepps.com/account/transactions/a12");
-    assertStringsEqual(id, "aeternity");
-    assertStringsEqual(name, "Aeternity");
-}
diff --git a/tests/Aeternity/TransactionTests.cpp b/tests/Aeternity/TransactionTests.cpp
deleted file mode 100644
index ea0ac8aedd3..00000000000
--- a/tests/Aeternity/TransactionTests.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "../interface/TWTestUtilities.h"
-#include <Aeternity/Signer.h>
-#include <gtest/gtest.h>
-
-namespace TW::Aeternity::tests {
-
-TEST(AeternityTransaction, EncodeRlp) {
-    std::string sender_id = "ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi";
-    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
-    uint64_t amount = 10;
-    uint64_t fee = 2e13;
-    std::string payload = "Hello World";
-    uint64_t ttl = 82757;
-    uint64_t nonce = 49;
-
-    auto tx = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
-    auto encodedTx = tx.encode();
-    auto encodedTxHex = TW::hex(encodedTx);
-
-    ASSERT_EQ(encodedTxHex, "f85f0c01a101cea7ade470c9f99d9d4e400880a86f1d49bb444b62f11a9ebb64bbcfeb73fef3a1011f13a3b08bf001400662a68b69d875f7803cec4c08647f6ed5d84c7897bd50a30a8612309ce5400083014345318b48656c6c6f20576f726c64");
-}
-
-TEST(AeternityTransaction, EncodeRlpWithZeroAmount) {
-    std::string sender_id = "ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi";
-    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
-    uint64_t amount = 0;
-    uint64_t fee = 2e13;
-    std::string payload = "Hello World";
-    uint64_t ttl = 82757;
-    uint64_t nonce = 49;
-
-    auto tx = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
-    auto encodedTx = tx.encode();
-    auto encodedTxHex = TW::hex(encodedTx);
-
-    ASSERT_EQ(encodedTxHex, "f85f0c01a101cea7ade470c9f99d9d4e400880a86f1d49bb444b62f11a9ebb64bbcfeb73fef3a1011f13a3b08bf001400662a68b69d875f7803cec4c08647f6ed5d84c7897bd50a3008612309ce5400083014345318b48656c6c6f20576f726c64");
-}
-
-TEST(AeternityTransaction, EncodeRlpWithZeroTtl) {
-    std::string sender_id = "ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi";
-    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
-    uint64_t amount = 10;
-    uint64_t fee = 2e13;
-    std::string payload = "Hello World";
-    uint64_t ttl = 0;
-    uint64_t nonce = 49;
-
-    auto tx = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
-    auto encodedTx = tx.encode();
-    auto encodedTxHex = TW::hex(encodedTx);
-
-    ASSERT_EQ(encodedTxHex, "f85c0c01a101cea7ade470c9f99d9d4e400880a86f1d49bb444b62f11a9ebb64bbcfeb73fef3a1011f13a3b08bf001400662a68b69d875f7803cec4c08647f6ed5d84c7897bd50a30a8612309ce5400000318b48656c6c6f20576f726c64");
-}
-
-} // namespace TW::Aeternity::tests
diff --git a/tests/Aion/AddressTests.cpp b/tests/Aion/AddressTests.cpp
deleted file mode 100644
index 05f37edb64e..00000000000
--- a/tests/Aion/AddressTests.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Aion/Address.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Aion::tests {
-
-TEST(AionAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("01a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7"), TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "0xa0d2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7");
-}
-
-TEST(AionAddress, FromString) {
-    std::string aionAddress = "0xa0d2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7";
-    const auto address = Address(aionAddress);
-    ASSERT_EQ(address.string(), aionAddress);
-}
-
-TEST(AionAddress, isValid) {
-    std::string validAddress = "0xa0d2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7";
-    std::string invalidAddress = "0xzzd2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7";
-
-    ASSERT_TRUE(Address::isValid(validAddress));
-    ASSERT_FALSE(Address::isValid(invalidAddress));
-}
-
-} // namespace TW::Aion::tests
diff --git a/tests/Aion/RLPTests.cpp b/tests/Aion/RLPTests.cpp
deleted file mode 100644
index 86df3146ace..00000000000
--- a/tests/Aion/RLPTests.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Aion/RLP.h"
-#include "HexCoding.h"
-#include <gtest/gtest.h>
-
-namespace TW::Aion::tests {
-
-using boost::multiprecision::uint128_t;
-
-TEST(AionRLP, EncodeLong) {
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(1))), "01");
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(21000))), "825208");
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(1000000))), "830f4240");
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(20000000000))), "8800000004a817c800");
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(9007199254740991))), "88001fffffffffffff");
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(9007199254740990))), "88001ffffffffffffe");
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(4294967296L))), "880000000100000000");
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(4295000060L))), "880000000100007ffc");
-    EXPECT_EQ(hex(RLP::encodeLong(uint128_t(72057594037927935L))), "8800ffffffffffffff");
-}
-
-} // namespace TW::Aion::tests
diff --git a/tests/Aion/SignerTests.cpp b/tests/Aion/SignerTests.cpp
deleted file mode 100644
index 34d44504db7..00000000000
--- a/tests/Aion/SignerTests.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Aion/Signer.h"
-#include "Aion/Transaction.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Aion::tests {
-
-TEST(AionSigner, Sign) {
-    auto address = Aion::Address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
-    auto transaction = Transaction(9, 20000000000, 21000, address, 10000, 155157377101, {});
-
-    auto privateKey = PrivateKey(parse_hex("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9"));
-    Signer::sign(privateKey, transaction);
-
-    EXPECT_EQ(hex(transaction.signature), "a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
-
-    // Raw transaction
-    EXPECT_EQ(hex(transaction.encode()), "f89b09a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
-}
-
-TEST(AionSigner, SignWithData) {
-    auto address = Aion::Address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
-    auto transaction = Transaction(9, 20000000000, 21000, address, 10000, 155157377101, parse_hex("41494f4e0000"));
-
-    auto privateKey = PrivateKey(parse_hex("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9"));
-    Signer::sign(privateKey, transaction);
-
-    EXPECT_EQ(hex(transaction.signature), "a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a736fc2642c2d62900204779aa274dba3b8712eff7a8464aa78ea52b09ece20679fe3f5edf94c84a7e0c5f93213be891bc279af927086f455167f5bc73d3046c0d");
-
-    // Raw transaction
-    EXPECT_EQ(hex(transaction.encode()), "f8a109a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108641494f4e000085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a736fc2642c2d62900204779aa274dba3b8712eff7a8464aa78ea52b09ece20679fe3f5edf94c84a7e0c5f93213be891bc279af927086f455167f5bc73d3046c0d");
-}
-
-} // namespace TW::Aion::tests
diff --git a/tests/Aion/TWAnySignerTests.cpp b/tests/Aion/TWAnySignerTests.cpp
deleted file mode 100644
index 2f7ab4630c0..00000000000
--- a/tests/Aion/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "uint256.h"
-#include "proto/Aion.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::Aion::tests {
-
-TEST(TWAnySignerAion, Sign) {
-    auto privateKey = parse_hex("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9");
-
-    Proto::SigningInput input;
-    input.set_to_address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
-    auto amount = store(uint256_t(10000));
-    input.set_amount(amount.data(), amount.size());
-    auto gasPrice = store(uint256_t(20000000000));
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    auto gasLimit = store(uint256_t(21000));
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    auto nonce = store(uint256_t(9));
-    input.set_nonce(nonce.data(), nonce.size());
-    input.set_timestamp(155157377101);
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeAion);
-
-    ASSERT_EQ(hex(output.encoded()), "f89b09a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
-}
-
-} // namespace TW::Aion::tests
diff --git a/tests/Aion/TWCoinTypeTests.cpp b/tests/Aion/TWCoinTypeTests.cpp
deleted file mode 100644
index e87d983d8d8..00000000000
--- a/tests/Aion/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWAionCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAion));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAion, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAion, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAion));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAion));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAion), 18);
-    ASSERT_EQ(TWBlockchainAion, TWCoinTypeBlockchain(TWCoinTypeAion));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAion));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAion));
-    assertStringsEqual(symbol, "AION");
-    assertStringsEqual(txUrl, "https://mainnet.aion.network/#/transaction/t123");
-    assertStringsEqual(accUrl, "https://mainnet.aion.network/#/account/a12");
-    assertStringsEqual(id, "aion");
-    assertStringsEqual(name, "Aion");
-}
diff --git a/tests/Aion/TransactionTests.cpp b/tests/Aion/TransactionTests.cpp
deleted file mode 100644
index 9b9ff818758..00000000000
--- a/tests/Aion/TransactionTests.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Aion/Transaction.h"
-#include "HexCoding.h"
-#include <gtest/gtest.h>
-
-namespace TW::Aion::tests {
-
-TEST(AionTransaction, Encode) {
-    auto address = Aion::Address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
-    auto transaction = Transaction(9, 20000000000, 21000, address, 10000, 155157377101, {});
-    ASSERT_EQ(hex(transaction.encode()), "f83909a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001");
-}
-
-TEST(AionTransaction, EncodeWithSignature) {
-    auto address = Aion::Address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
-    auto transaction = Transaction(9, 20000000000, 21000, address, 10000, 155157377101, {});
-    transaction.signature = parse_hex("a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
-    ASSERT_EQ(hex(transaction.encode()), "f89b09a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
-}
-
-} // namespace TW::Aion::tests
diff --git a/tests/Algorand/AddressTests.cpp b/tests/Algorand/AddressTests.cpp
deleted file mode 100644
index 6edff289604..00000000000
--- a/tests/Algorand/AddressTests.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Algorand/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include <gtest/gtest.h>
-#include <vector>
-
-using namespace TW;
-
-namespace TW::Algorand::tests {
-
-TEST(AlgorandAddress, Validation) {
-    // empty address
-    ASSERT_FALSE(Address::isValid(""));
-    // invalid checksum
-    ASSERT_FALSE(Address::isValid("JBCQYJ2FREG667NAN7BFKH4RFIKPT7CYDQJNW3SNN5Z7F7ILFLKQ346TS3"));
-    // wrong length
-    ASSERT_FALSE(Address::isValid("JBCQYJ2FREG667NAN7BFKH4RFIKPT7CYDQJNW3SNN5Z7F7ILFLKQ346TSU "));
-    // Stellar address
-    ASSERT_FALSE(Address::isValid("GABQHYQOY22KHGTCTAK24AWAUE4TXERF4O4JBSXELNM7IL5CTPUWM3SC"));
-
-    ASSERT_TRUE(Address::isValid("HXIWBVQGOO6ZWE5NYJO22XMYRUGZ6TGNX2K2EERPT3ZIWPHE5CLJGB2GEA"));
-}
-
-TEST(AlgorandAddress, FromPrivateKey) {
-    auto privateKey = PrivateKey(parse_hex("526d96fffdbfe787b2f00586298538f9a019e97f6587964dc61aae9ad1d7fa23"));
-    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
-    ASSERT_EQ(address.string(), "JBCQYJ2FREG667NAN7BFKH4RFIKPT7CYDQJNW3SNN5Z7F7ILFLKQ346TSU");
-}
-
-TEST(AlgorandAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("c2b423afa8b0095e5ae105668b91b2132db4dadbf38acfc64908d3476a00191f"), TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "YK2CHL5IWAEV4WXBAVTIXENSCMW3JWW36OFM7RSJBDJUO2QADEP5QYVO5I");
-}
-
-TEST(AlgorandAddress, FromString) {
-    auto address = Address("PITDOF57RHOVLT37KM7DCXDCETLDL3OA5CBAN7LQ44Z36LGFC27IJ2IQ64");
-    ASSERT_EQ(address.string(), "PITDOF57RHOVLT37KM7DCXDCETLDL3OA5CBAN7LQ44Z36LGFC27IJ2IQ64");
-}
-
-} // namespace TW::Algorand::tests
diff --git a/tests/Algorand/SignerTests.cpp b/tests/Algorand/SignerTests.cpp
deleted file mode 100644
index d3efef06418..00000000000
--- a/tests/Algorand/SignerTests.cpp
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Algorand/Address.h"
-#include "Algorand/BinaryCoding.h"
-#include "Algorand/Signer.h"
-#include "Base64.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include <gtest/gtest.h>
-#include <vector>
-
-using namespace TW;
-
-namespace TW::Algorand::tests {
-
-TEST(AlgorandSigner, EncodeNumbers) {
-    auto tests = {
-        std::make_tuple(100ull, "64"),
-        std::make_tuple(200ull, "ccc8"),
-        std::make_tuple(55536ull, "cdd8f0"),
-        std::make_tuple(3294967296ull, "cec4653600"),
-        std::make_tuple(14294967296ull, "cf00000003540be400"),
-    };
-
-    for (auto& test : tests) {
-        Data data;
-        encodeNumber(std::get<0>(test), data);
-        ASSERT_EQ(hex(data), std::get<1>(test));
-    }
-}
-
-TEST(AlgorandSigner, EncodeStrings) {
-    auto tests = {
-        std::make_tuple("algo", "a4616c676f"),
-        std::make_tuple("It's like JSON. but fast and small.", "d92349742773206c696b65204a534f4e2e20627574206661737420616e6420736d616c6c2e"),
-        std::make_tuple(
-            "MessagePack is an efficient binary serialization format. It lets you exchange data among multiple languages like JSON. But it's faster and smaller. Small integers are encoded into a single byte, and typical short strings require only one extra byte in addition to the strings themselves.",
-            "da011f4d6573736167655061636b20697320616e20656666696369656e742062696e6172792073657269616c697a6174696f6e20666f726d61742e204974206c65747320796f752065786368616e6765206461746120616d6f6e67206d756c7469706c65206c616e677561676573206c696b65204a534f4e2e2042757420697427732066617374657220616e6420736d616c6c65722e20536d616c6c20696e7465676572732061726520656e636f64656420696e746f20612073696e676c6520627974652c20616e64207479706963616c2073686f727420737472696e67732072657175697265206f6e6c79206f6e65206578747261206279746520696e206164646974696f6e20746f2074686520737472696e6773207468656d73656c7665732e")};
-
-    for (auto& test : tests) {
-        Data data;
-        Algorand::encodeString(std::get<0>(test), data);
-        ASSERT_EQ(hex(data), std::get<1>(test));
-    }
-}
-
-TEST(AlgorandSigner, EncodeBytes) {
-    auto rawtx = "010000000001029294c2b3bd4d25483c4c12432df01a856a38cc0cb48da1a7dd590b7d893392a90000000000ffffffffded892ea55bf1c6ccc495d3493767d7c24497f612b9edc9ab8d30eb671ea76750000000000ffffffff021027000000000000160014b96bacd6f729ef8ac1dd30d159433c0917ba8d3db00f00000000000016001476cd9d430de6db162fc3db509920255ff6d2bdb002483045022100eb8675ff6775e9c399dddba9f178002b745872e541617d690cbce7c933adb87602205de8074c173696de65d4c644a84ea1337c9e9928c7052fddcf9d99e35815e2f20121032858d3a5f9825408ea3959800c5daf22e7a91e459ef168df45071266501d28e102473044022025f1cf362a9c09bd351769f1918ab9f0a6c3f6c4682f29fdbfc08354554ea37b02203f62345b3da4d7a29f58c7c741682be4108a0fb2013980332cc3e081aad7423f01210237d83670da2d3947a58752dab95d59b592c78f2e734d1c14dbf75b29bbe4116100000000";
-    Data data;
-    encodeBytes(parse_hex(rawtx), data);
-    ASSERT_EQ(hex(data), "c50173010000000001029294c2b3bd4d25483c4c12432df01a856a38cc0cb48da1a7dd590b7d893392a90000000000ffffffffded892ea55bf1c6ccc495d3493767d7c24497f612b9edc9ab8d30eb671ea76750000000000ffffffff021027000000000000160014b96bacd6f729ef8ac1dd30d159433c0917ba8d3db00f00000000000016001476cd9d430de6db162fc3db509920255ff6d2bdb002483045022100eb8675ff6775e9c399dddba9f178002b745872e541617d690cbce7c933adb87602205de8074c173696de65d4c644a84ea1337c9e9928c7052fddcf9d99e35815e2f20121032858d3a5f9825408ea3959800c5daf22e7a91e459ef168df45071266501d28e102473044022025f1cf362a9c09bd351769f1918ab9f0a6c3f6c4682f29fdbfc08354554ea37b02203f62345b3da4d7a29f58c7c741682be4108a0fb2013980332cc3e081aad7423f01210237d83670da2d3947a58752dab95d59b592c78f2e734d1c14dbf75b29bbe4116100000000");
-}
-
-TEST(AlgorandSigner, Sign) {
-    auto key = PrivateKey(parse_hex("c9d3cc16fecabe2747eab86b81528c6ed8b65efc1d6906d86aabc27187a1fe7c"));
-    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
-    auto from = Address(publicKey);
-    auto to = Address("UCE2U2JC4O4ZR6W763GUQCG57HQCDZEUJY4J5I6VYY4HQZUJDF7AKZO5GM");
-    Data note;
-    std::string genesisId = "mainnet-v1.0";
-    auto genesisHash = Base64::decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=");
-    auto transaction = Transfer(
-        /* from */ from,
-        /* to */ to,
-        /* fee */ 488931,
-        /* amount */ 847,
-        /* first round */ 51,
-        /* last round */ 61,
-        /* note */ note,
-        /* type */ "pay",
-        /* genesis id*/ genesisId,
-        /* genesis hash*/ genesisHash);
-
-    auto serialized = transaction.serialize();
-    auto signature = Signer::sign(key, transaction);
-    auto result = transaction.BaseTransaction::serialize(signature);
-
-    ASSERT_EQ(hex(serialized), "89a3616d74cd034fa3666565ce000775e3a2667633a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c763da3726376c420a089aa6922e3b998fadff6cd4808ddf9e021e4944e389ea3d5c638786689197ea3736e64c42074b000b6368551a6066d713e2866002e8dab34b69ede09a72e85a39bbb1f7928a474797065a3706179");
-    ASSERT_EQ(hex(signature), "de73363dbdeda0682adca06f6268a16a6ec47253c94d5692dc1c49a84a05847812cf66d7c4cf07c7e2f50f143ec365d405e30b35117b264a994626054d2af604");
-    ASSERT_EQ(hex(result), "82a3736967c440de73363dbdeda0682adca06f6268a16a6ec47253c94d5692dc1c49a84a05847812cf66d7c4cf07c7e2f50f143ec365d405e30b35117b264a994626054d2af604a374786e89a3616d74cd034fa3666565ce000775e3a2667633a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c763da3726376c420a089aa6922e3b998fadff6cd4808ddf9e021e4944e389ea3d5c638786689197ea3736e64c42074b000b6368551a6066d713e2866002e8dab34b69ede09a72e85a39bbb1f7928a474797065a3706179");
-}
-
-TEST(AlgorandSigner, SignAsset) {
-    // https://testnet.algoexplorer.io/tx/NJ62HYO2LC222AVLIN2GW5LKIWKLGC7NZLIQ3DUL2RDVRYO2UW7A
-    auto key = PrivateKey(parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04"));
-    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
-    auto from = Address(publicKey);
-    auto to = Address("GJIWJSX2EU5RC32LKTDDXWLA2YICBHKE35RV2ZPASXZYKWUWXFLKNFSS4U");
-    Data note;
-    std::string genesisId = "testnet-v1.0";
-    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
-    auto transaction = AssetTransfer(
-        /* from */ from,
-        /* to */ to,
-        /* fee */ 2340,
-        /* amount */ 1000000,
-        /* asset id */ 13379146,
-        /* first round */ 15775683,
-        /* last round */ 15776683,
-        /* note */ note,
-        /* type */ "axfer",
-        /* genesis id*/ genesisId,
-        /* genesis hash*/ genesisHash);
-
-    auto serialized = transaction.serialize();
-    auto signature = Signer::sign(key, transaction);
-    auto result = transaction.BaseTransaction::serialize(signature);
-
-    ASSERT_EQ(hex(serialized), "8aa461616d74ce000f4240a461726376c420325164cafa253b116f4b54c63bd960d610209d44df635d65e095f3855a96b956a3666565cd0924a26676ce00f0b7c3a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bbaba3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
-    ASSERT_EQ(hex(signature), "412720eff99a17280a437bdb8eeba7404b855d6433fffd5dde7f7966c1f9ae531a1af39e18b8a58b4a6c6acb709cca92f8a18c36d8328be9520c915311027005");
-    ASSERT_EQ(hex(result), "82a3736967c440412720eff99a17280a437bdb8eeba7404b855d6433fffd5dde7f7966c1f9ae531a1af39e18b8a58b4a6c6acb709cca92f8a18c36d8328be9520c915311027005a374786e8aa461616d74ce000f4240a461726376c420325164cafa253b116f4b54c63bd960d610209d44df635d65e095f3855a96b956a3666565cd0924a26676ce00f0b7c3a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bbaba3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
-}
-
-TEST(AlgorandSigner, SignAssetOptIn) {
-    // https://testnet.algoexplorer.io/tx/47LE2QS4B5N6IFHXOUN2MJUTCOQCHNY6AB3AJYECK4IM2VYKJDKQ
-    auto key = PrivateKey(parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04"));
-    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-    Data note;
-    std::string genesisId = "testnet-v1.0";
-    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
-    auto transaction = OptInAssetTransaction(
-        /* from */ address,
-        /* fee */ 2340,
-        /* asset id */ 13379146,
-        /* first round */ 15775553,
-        /* last round */ 15776553,
-        /* note */ note,
-        /* type */ "axfer",
-        /* genesis id*/ genesisId,
-        /* genesis hash*/ genesisHash);
-
-    auto serialized = transaction.serialize();
-    auto signature = Signer::sign(key, transaction);
-    auto result = transaction.BaseTransaction::serialize(signature);
-
-    ASSERT_EQ(hex(serialized), "89a461726376c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a3666565cd0924a26676ce00f0b741a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bb29a3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
-    ASSERT_EQ(hex(signature), "f3a29d9a40271c00b542b38ab2ccb4967015ae6609368d4b8eb2f5e2b5348577cf9e0f62b0777ccb2d8d9b943b15c24c0cf1db312cb01a3c198d9d9c6c5bb00b");
-    ASSERT_EQ(hex(result), "82a3736967c440f3a29d9a40271c00b542b38ab2ccb4967015ae6609368d4b8eb2f5e2b5348577cf9e0f62b0777ccb2d8d9b943b15c24c0cf1db312cb01a3c198d9d9c6c5bb00ba374786e89a461726376c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a3666565cd0924a26676ce00f0b741a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bb29a3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
-}
-
-TEST(AlgorandSigner, ProtoSignerOptIn) {
-    // https://testnet.algoexplorer.io/tx/47LE2QS4B5N6IFHXOUN2MJUTCOQCHNY6AB3AJYECK4IM2VYKJDKQ
-    auto optIn = new Proto::AssetOptIn();
-    optIn->set_asset_id(13379146);
-
-    auto privateKey = parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04");
-
-    auto input = Proto::SigningInput();
-    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
-    std::string str(genesisHash.begin(), genesisHash.end());
-    input.set_allocated_asset_opt_in(optIn);
-    input.set_genesis_hash(str);
-    input.set_genesis_id("testnet-v1.0");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_first_round(15775553);
-    input.set_last_round(15776553);
-    input.set_fee(2340);
-
-    auto result = Signer::sign(input);
-    auto encoded = result.encoded();
-
-    ASSERT_EQ(hex(encoded), "82a3736967c440f3a29d9a40271c00b542b38ab2ccb4967015ae6609368d4b8eb2f5e2b5348577cf9e0f62b0777ccb2d8d9b943b15c24c0cf1db312cb01a3c198d9d9c6c5bb00ba374786e89a461726376c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a3666565cd0924a26676ce00f0b741a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bb29a3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
-}
-
-TEST(AlgorandSigner, ProtoSignerAssetTransaction) {
-    // https://testnet.algoexplorer.io/tx/NJ62HYO2LC222AVLIN2GW5LKIWKLGC7NZLIQ3DUL2RDVRYO2UW7A
-    auto transaction = new Proto::AssetTransfer();
-    transaction->set_asset_id(13379146);
-    transaction->set_amount(1000000);
-    transaction->set_to_address("GJIWJSX2EU5RC32LKTDDXWLA2YICBHKE35RV2ZPASXZYKWUWXFLKNFSS4U");
-
-    auto privateKey = parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04");
-
-    auto input = Proto::SigningInput();
-    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
-    std::string str(genesisHash.begin(), genesisHash.end());
-    input.set_allocated_asset_transfer(transaction);
-    input.set_genesis_hash(str);
-    input.set_genesis_id("testnet-v1.0");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_first_round(15775683);
-    input.set_last_round(15776683);
-    input.set_fee(2340);
-
-    auto result = Signer::sign(input);
-    auto encoded = result.encoded();
-
-    ASSERT_EQ(hex(encoded), "82a3736967c440412720eff99a17280a437bdb8eeba7404b855d6433fffd5dde7f7966c1f9ae531a1af39e18b8a58b4a6c6acb709cca92f8a18c36d8328be9520c915311027005a374786e8aa461616d74ce000f4240a461726376c420325164cafa253b116f4b54c63bd960d610209d44df635d65e095f3855a96b956a3666565cd0924a26676ce00f0b7c3a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bbaba3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
-}
-
-} // namespace TW::Algorand::tests
diff --git a/tests/Algorand/TWAnySignerTests.cpp b/tests/Algorand/TWAnySignerTests.cpp
deleted file mode 100644
index 5b3e00aa411..00000000000
--- a/tests/Algorand/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base64.h"
-#include "HexCoding.h"
-#include "proto/Algorand.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Algorand::tests {
-
-TEST(TWAnySignerAlgorand, Sign) {
-    auto privateKey = parse_hex("d5b43d706ef0cb641081d45a2ec213b5d8281f439f2425d1af54e2afdaabf55b");
-    auto note = parse_hex("68656c6c6f");
-    auto genesisHash = Base64::decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=");
-
-    Proto::SigningInput input;
-    auto& transaction = *input.mutable_transfer();
-    transaction.set_to_address("CRLADAHJZEW2GFY2UPEHENLOGCUOU74WYSTUXQLVLJUJFHEUZOHYZNWYR4");
-    transaction.set_amount(1000000000000ull);
-    input.set_first_round(1937767ull);
-    input.set_last_round(1938767ull);
-    input.set_fee(263000ull);
-    input.set_genesis_id("mainnet-v1.0");
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_note(note.data(), note.size());
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeAlgorand);
-
-    ASSERT_EQ(hex(output.encoded()), "82a3736967c440baa00062adcdcb5875e4435cdc6885d26bfe5308ab17983c0fda790b7103051fcb111554e5badfc0ac7edf7e1223a434342a9eeed5cdb047690827325051560ba374786e8aa3616d74cf000000e8d4a51000a3666565ce00040358a26676ce001d9167a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce001d954fa46e6f7465c40568656c6c6fa3726376c42014560180e9c92da3171aa3c872356e30a8ea7f96c4a74bc1755a68929c94cb8fa3736e64c42061bf060efc02e2887dfffc8ed85268c8c091c013eedf315bc50794d02a8791ada474797065a3706179");
-}
-
-TEST(TWAnySignerAlgorand, SignJSON) {
-    auto json = STRING(R"({"genesisId":"mainnet-v1.0","genesisHash":"wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=","note":"aGVsbG8=","firstRound":"1937767","lastRound":"1938767","fee":"263000","transfer":{"toAddress":"CRLADAHJZEW2GFY2UPEHENLOGCUOU74WYSTUXQLVLJUJFHEUZOHYZNWYR4","amount":"1000000000000"}})");
-    auto key = DATA("d5b43d706ef0cb641081d45a2ec213b5d8281f439f2425d1af54e2afdaabf55b");
-
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeAlgorand));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeAlgorand));
-    assertStringsEqual(result, "82a3736967c440baa00062adcdcb5875e4435cdc6885d26bfe5308ab17983c0fda790b7103051fcb111554e5badfc0ac7edf7e1223a434342a9eeed5cdb047690827325051560ba374786e8aa3616d74cf000000e8d4a51000a3666565ce00040358a26676ce001d9167a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce001d954fa46e6f7465c40568656c6c6fa3726376c42014560180e9c92da3171aa3c872356e30a8ea7f96c4a74bc1755a68929c94cb8fa3736e64c42061bf060efc02e2887dfffc8ed85268c8c091c013eedf315bc50794d02a8791ada474797065a3706179");
-}
-
-} // namespace TW::Algorand::tests
diff --git a/tests/Algorand/TWCoinTypeTests.cpp b/tests/Algorand/TWCoinTypeTests.cpp
deleted file mode 100644
index f95721fa727..00000000000
--- a/tests/Algorand/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWAlgorandCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAlgorand));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAlgorand, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAlgorand, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAlgorand));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAlgorand));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAlgorand), 6);
-    ASSERT_EQ(TWBlockchainAlgorand, TWCoinTypeBlockchain(TWCoinTypeAlgorand));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAlgorand));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAlgorand));
-    assertStringsEqual(symbol, "ALGO");
-    assertStringsEqual(txUrl, "https://algoexplorer.io/tx/CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A");
-    assertStringsEqual(accUrl, "https://algoexplorer.io/address/J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM");
-    assertStringsEqual(id, "algorand");
-    assertStringsEqual(name, "Algorand");
-}
diff --git a/tests/AnyAddressTests.cpp b/tests/AnyAddressTests.cpp
deleted file mode 100644
index bc7dc5af2b2..00000000000
--- a/tests/AnyAddressTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "AnyAddress.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::tests {
-
-constexpr auto ANY_ADDRESS_TEST_ADDRESS = "bc1qcj2vfjec3c3luf9fx9vddnglhh9gawmncmgxhz";
-constexpr auto ANY_ADDRESS_TEST_PUBKEY = "02753f5c275e1847ba4d2fd3df36ad00af2e165650b35fe3991e9c9c46f68b12bc";
-
-TEST(AnyAddress, createFromString) {
-    std::unique_ptr<AnyAddress> addr(AnyAddress::createAddress(ANY_ADDRESS_TEST_ADDRESS, TWCoinTypeBitcoin));
-    EXPECT_EQ(ANY_ADDRESS_TEST_ADDRESS, addr->address);
-}
-
-TEST(AnyAddress, createFromPubKey) {
-    const Data key = parse_hex(ANY_ADDRESS_TEST_PUBKEY);
-    PublicKey publicKey(key, TWPublicKeyTypeSECP256k1);
-    std::unique_ptr<AnyAddress> addr(AnyAddress::createAddress(publicKey, TWCoinTypeBitcoin));
-    EXPECT_EQ(ANY_ADDRESS_TEST_ADDRESS, addr->address);
-}
-
-TEST(AnyAddress, createFromWrongString) {
-    std::unique_ptr<AnyAddress> addr(AnyAddress::createAddress("1aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaax", TWCoinTypeBitcoin));
-    EXPECT_EQ(nullptr, addr);
-}
-
-} // namespace TW::tests
diff --git a/tests/Arbitrum/TWCoinTypeTests.cpp b/tests/Arbitrum/TWCoinTypeTests.cpp
deleted file mode 100644
index 35c6faa4ab6..00000000000
--- a/tests/Arbitrum/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWArbitrumCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeArbitrum));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xa1e319be22c08155e5904aa211fb87df5f4ade48de79c6578b1cf3dfda9e498c"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeArbitrum, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xecf9ffa7f51e1194f89c25ad8c484f6bfd04e1ac"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeArbitrum, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeArbitrum));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeArbitrum));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeArbitrum), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeArbitrum));
-
-    assertStringsEqual(symbol, "ETH");
-    assertStringsEqual(txUrl, "https://arbiscan.io/tx/0xa1e319be22c08155e5904aa211fb87df5f4ade48de79c6578b1cf3dfda9e498c");
-    assertStringsEqual(accUrl, "https://arbiscan.io/address/0xecf9ffa7f51e1194f89c25ad8c484f6bfd04e1ac");
-    assertStringsEqual(id, "arbitrum");
-    assertStringsEqual(name, "Arbitrum");
-}
diff --git a/tests/Aurora/TWCoinTypeTests.cpp b/tests/Aurora/TWCoinTypeTests.cpp
deleted file mode 100644
index 5dff7ccd8fb..00000000000
--- a/tests/Aurora/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWAuroraCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAurora));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x99deebdb70f8027037abb3d3d0f3c7523daee857d85e9056d2671593ff2f2f28"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAurora, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x8707cdE20dd43E3dB1F74c28fcd509ef38B0bA51"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAurora, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAurora));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAurora));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAurora), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeAurora));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAurora));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAurora));
-    assertStringsEqual(symbol, "ETH");
-    assertStringsEqual(txUrl, "https://aurorascan.dev/tx/0x99deebdb70f8027037abb3d3d0f3c7523daee857d85e9056d2671593ff2f2f28");
-    assertStringsEqual(accUrl, "https://aurorascan.dev/address/0x8707cdE20dd43E3dB1F74c28fcd509ef38B0bA51");
-    assertStringsEqual(id, "aurora");
-    assertStringsEqual(name, "Aurora");
-}
diff --git a/tests/Avalanche/TWCoinTypeTests.cpp b/tests/Avalanche/TWCoinTypeTests.cpp
deleted file mode 100644
index f9b1aa72576..00000000000
--- a/tests/Avalanche/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWAvalancheCoinType, TWCoinTypeCChain) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAvalancheCChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x9243890b844219accefd8798271052f5a056453ec18984a56e81c92921330d54"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAvalancheCChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xa664325f36Ec33E66323fe2620AF3f2294b2Ef3A"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAvalancheCChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAvalancheCChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAvalancheCChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAvalancheCChain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeAvalancheCChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAvalancheCChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAvalancheCChain));
-    assertStringsEqual(symbol, "AVAX");
-    assertStringsEqual(txUrl, "https://snowtrace.io/tx/0x9243890b844219accefd8798271052f5a056453ec18984a56e81c92921330d54");
-    assertStringsEqual(accUrl, "https://snowtrace.io/address/0xa664325f36Ec33E66323fe2620AF3f2294b2Ef3A");
-    assertStringsEqual(id, "avalanchec");
-    assertStringsEqual(name, "Avalanche C-Chain");
-}
diff --git a/tests/BandChain/TWCoinTypeTests.cpp b/tests/BandChain/TWCoinTypeTests.cpp
deleted file mode 100644
index 4fdd7e8f90b..00000000000
--- a/tests/BandChain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWBandChainCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBandChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("473264551D3063A9EC64EC251C61BE92DDDFCF6CC46D026D1E574D83D5447173"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBandChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("band12nmsm9khdsv0tywge43q3zwj8kkj3hvup9rltp"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBandChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBandChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBandChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBandChain), 6);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeBandChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBandChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBandChain));
-    assertStringsEqual(symbol, "BAND");
-    assertStringsEqual(txUrl, "https://scan-wenchang-testnet2.bandchain.org//tx/473264551D3063A9EC64EC251C61BE92DDDFCF6CC46D026D1E574D83D5447173");
-    assertStringsEqual(accUrl, "https://scan-wenchang-testnet2.bandchain.org//account/band12nmsm9khdsv0tywge43q3zwj8kkj3hvup9rltp");
-    assertStringsEqual(id, "band");
-    assertStringsEqual(name, "BandChain");
-}
diff --git a/tests/Base64Tests.cpp b/tests/Base64Tests.cpp
deleted file mode 100644
index 64787ffaaf8..00000000000
--- a/tests/Base64Tests.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base64.h"
-#include "Data.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Base64::tests {
-
-TEST(Base64, encode) {
-    auto encoded = encode(data("Hello, world!"));
-    EXPECT_EQ("SGVsbG8sIHdvcmxkIQ==", encoded);
-    encoded = encode(data("1"));
-    EXPECT_EQ("MQ==", encoded);
-    encoded = encode(data("12"));
-    EXPECT_EQ("MTI=", encoded);
-    encoded = encode(data("123"));
-    EXPECT_EQ("MTIz", encoded);
-    encoded = encode(data("1234"));
-    EXPECT_EQ("MTIzNA==", encoded);
-    encoded = encode(data(""));
-    EXPECT_EQ("", encoded);
-    encoded = encode(data("Lorem ipsum dolor sit amet, consectetur adipiscing elit"));
-    EXPECT_EQ("TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdA==", encoded);
-    encoded = encode(parse_hex("11ff8156775b79325e5d62e742d9b96c30b6515a5cd2f1f64c5da4b193c03f070e0d291b"));
-    EXPECT_EQ("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODSkb", encoded);
-}
-
-TEST(Base64, decode) {
-    auto decoded = decode("SGVsbG8sIHdvcmxkIQ==");
-    EXPECT_EQ(hex(data("Hello, world!")), hex(decoded));
-    decoded = decode("MQ==");
-    EXPECT_EQ(hex(data("1")), hex(decoded));
-    decoded = decode("MTI=");
-    EXPECT_EQ(hex(data("12")), hex(decoded));
-    decoded = decode("MTIz");
-    EXPECT_EQ(hex(data("123")), hex(decoded));
-    decoded = decode("");
-    EXPECT_EQ("", hex(decoded));
-    decoded = decode("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODSkb");
-    EXPECT_EQ("11ff8156775b79325e5d62e742d9b96c30b6515a5cd2f1f64c5da4b193c03f070e0d291b", hex(decoded));
-}
-
-TEST(Base64, UrlFormat) {
-    const std::string const1 = "11003faa8556289975ec991ac9994dfb613abec4ea000d5094e6379080f594e559b330b8";
-
-    // Encoded string has both special characters
-    auto encoded = encode(parse_hex(const1));
-    EXPECT_EQ("EQA/qoVWKJl17JkayZlN+2E6vsTqAA1QlOY3kID1lOVZszC4", encoded);
-    encoded = encodeBase64Url(parse_hex(const1));
-    EXPECT_EQ("EQA_qoVWKJl17JkayZlN-2E6vsTqAA1QlOY3kID1lOVZszC4", encoded);
-
-    auto decoded = decode("EQA/qoVWKJl17JkayZlN+2E6vsTqAA1QlOY3kID1lOVZszC4");
-    EXPECT_EQ(const1, hex(decoded));
-    decoded = decodeBase64Url("EQA_qoVWKJl17JkayZlN-2E6vsTqAA1QlOY3kID1lOVZszC4");
-    EXPECT_EQ(const1, hex(decoded));
-}
-
-} // namespace TW::Base64::tests
diff --git a/tests/Binance/SignerTests.cpp b/tests/Binance/SignerTests.cpp
deleted file mode 100644
index 66e5d88fc91..00000000000
--- a/tests/Binance/SignerTests.cpp
+++ /dev/null
@@ -1,705 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Bech32Address.h"
-#include "Binance/Address.h"
-#include "Binance/Signer.h"
-#include "Coin.h"
-#include "Ethereum/Address.h"
-#include "HDWallet.h"
-#include "HexCoding.h"
-#include "proto/Binance.pb.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Binance {
-
-TEST(BinanceSigner, Sign) {
-    auto input = Proto::SigningInput();
-    input.set_chain_id("chain-bnb");
-    input.set_account_number(12);
-    input.set_sequence(35);
-    input.set_memo("");
-    input.set_source(1);
-
-    auto key = parse_hex("90335b9d2153ad1a9799a3ccc070bd64b4164e9642ee1dd48053c33f9a3a05e9");
-    input.set_private_key(key.data(), key.size());
-
-    auto& order = *input.mutable_trade_order();
-    Binance::Address address;
-    ASSERT_TRUE(Binance::Address::decode("bnb1hgm0p7khfk85zpz5v0j8wnej3a90w709vhkdfu", address));
-    auto keyhash = address.getKeyHash();
-    order.set_sender(keyhash.data(), keyhash.size());
-    order.set_id("BA36F0FAD74D8F41045463E4774F328F4AF779E5-36");
-    order.set_symbol("NNB-338_BNB");
-    order.set_ordertype(2);
-    order.set_side(1);
-    order.set_price(136350000);
-    order.set_quantity(100000000);
-    order.set_timeinforce(1);
-
-    auto signer = Binance::Signer(std::move(input));
-    auto signature = signer.sign();
-
-    ASSERT_EQ(hex(signature.begin(), signature.end()),
-              "9123cb6906bb20aeb753f4a121d4d88ff0e9750ba75b0c4e10d76caee1e7d2481290fa3b9887a6225d69"
-              "97f5f939ef834ea61d596a314237c48e560da9e17b5a");
-}
-
-TEST(BinanceSigner, Build) {
-    auto input = Proto::SigningInput();
-    input.set_chain_id("chain-bnb");
-    input.set_account_number(1);
-    input.set_sequence(10);
-
-    auto key = parse_hex("90335b9d2153ad1a9799a3ccc070bd64b4164e9642ee1dd48053c33f9a3a05e9");
-    input.set_private_key(key.data(), key.size());
-
-    auto& order = *input.mutable_trade_order();
-    auto address = Binance::Address(parse_hex("b6561dcc104130059a7c08f48c64610c1f6f9064"));
-    auto keyhash = address.getKeyHash();
-    order.set_sender(keyhash.data(), keyhash.size());
-    order.set_id("B6561DCC104130059A7C08F48C64610C1F6F9064-11");
-    order.set_symbol("BTC-5C4_BNB");
-    order.set_ordertype(2);
-    order.set_side(1);
-    order.set_price(100000000);
-    order.set_quantity(1200000000);
-    order.set_timeinforce(1);
-
-    auto signer = Binance::Signer(std::move(input));
-    auto result = signer.build();
-
-    ASSERT_EQ(hex(result.begin(), result.end()), "db01"
-        "f0625dee"
-        "0a65"
-            "ce6dc043"
-            "0a14""b6561dcc104130059a7c08f48c64610c1f6f9064"
-            "122b""423635363144434331303431333030353941374330384634384336343631304331463646393036342d3131"
-            "1a0b""4254432d3543345f424e42"
-            "2002"
-            "2801"
-            "3080c2d72f"
-            "3880989abc04"
-            "4001"
-        "126e"
-            "0a26"
-            "eb5ae987"
-            "21029729a52e4e3c2b4a4e52aa74033eedaf8ba1df5ab6d1f518fd69e67bbd309b0e"
-            "1240""2a78b6d9a108eb9440221802b626e24d80179395ac984f016db012ef1a0c16d71b4d7053e05366ae3ea2681fc8052398fda20551c965d74c5970bbc66b94b48e"
-            "1801"
-            "200a"
-    );
-}
-
-TEST(BinanceSigner, BuildSend) {
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("chain-bnb");
-    signingInput.set_account_number(19);
-    signingInput.set_sequence(23);
-    signingInput.set_memo("test");
-    signingInput.set_source(1);
-
-    auto key = parse_hex("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832");
-    signingInput.set_private_key(key.data(), key.size());
-
-    auto& order = *signingInput.mutable_send_order();
-
-    auto fromKeyhash = parse_hex("40c2979694bbc961023d1d27be6fc4d21a9febe6");
-    auto fromAddress = Binance::Address(fromKeyhash);
-
-    auto toKeyhash = parse_hex("88b37d5e05f3699e2a1406468e5d87cb9dcceb95");
-    auto toAddress = Binance::Address(toKeyhash);
-
-    auto input = order.add_inputs();
-    input->set_address(fromKeyhash.data(), fromKeyhash.size());
-    auto inputCoin = input->add_coins();
-    inputCoin->set_denom("BNB");
-    inputCoin->set_amount(1'001'000'000);
-
-    auto output = order.add_outputs();
-    output->set_address(toKeyhash.data(), toKeyhash.size());
-    auto outputCoin = output->add_coins();
-    outputCoin->set_denom("BNB");
-    outputCoin->set_amount(1'001'000'000);
-
-    auto signer = Binance::Signer(std::move(signingInput));
-    auto signature = signer.sign();
-    ASSERT_EQ(hex(signature.begin(), signature.end()),
-              "c65a13440f18a155bd971ee40b9e0dd58586f5bf344e12ec4c76c439aebca8c7789bab7bfbfb4ce89aad"
-              "c4a02df225b6b6efc861c13bbeb5f7a3eea2d7ffc80f");
-
-    auto result = signer.build();
-
-    ASSERT_EQ(hex(result.begin(), result.end()), "cc01"
-        "f0625dee"
-        "0a4e"
-            "2a2c87fa"
-            "0a23""0a1440c2979694bbc961023d1d27be6fc4d21a9febe6120b0a03424e4210c098a8dd03"
-            "1223""0a1488b37d5e05f3699e2a1406468e5d87cb9dcceb95120b0a03424e4210c098a8dd03"
-        "126e"
-            "0a26"
-            "eb5ae987"
-            "21026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502"
-            "1240""c65a13440f18a155bd971ee40b9e0dd58586f5bf344e12ec4c76c439aebca8c7789bab7bfbfb4ce89aadc4a02df225b6b6efc861c13bbeb5f7a3eea2d7ffc80f"
-            "1813"
-            "2017"
-        "1a04""74657374"
-        "2001"
-    );
-}
-
-TEST(BinanceSigner, BuildSend2) {
-    const auto derivationPath = TW::derivationPath(TWCoinTypeBinance);
-
-    const auto fromWallet = HDWallet("swift slam quote sail high remain mandate sample now stamp title among fiscal captain joy puppy ghost arrow attract ozone situate install gain mean", "");
-    const auto fromPrivateKey = fromWallet.getKey(TWCoinTypeBinance, derivationPath);
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-
-    const auto toWallet = HDWallet( "bottom quick strong ranch section decide pepper broken oven demand coin run jacket curious business achieve mule bamboo remain vote kid rigid bench rubber", "");
-    const auto toPrivateKey = toWallet.getKey(TWCoinTypeBinance, derivationPath);
-    const auto toPublicKey = PublicKey(toPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("bnbchain-1000");
-    signingInput.set_account_number(0);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto token = Proto::SendOrder::Token();
-    token.set_denom("BNB");
-    token.set_amount(100000000000000);
-
-    auto input = Proto::SendOrder::Input();
-    auto fromKeyHash = Binance::Address(fromPublicKey).getKeyHash();
-    input.set_address(fromKeyHash.data(), fromKeyHash.size());
-    *input.add_coins() = token;
-
-    auto output = Proto::SendOrder::Output();
-    auto toKeyHash = Binance::Address(toPublicKey).getKeyHash();
-    output.set_address(toKeyHash.data(), toKeyHash.size());
-    *output.add_coins() = token;
-
-    auto sendOrder = Proto::SendOrder();
-    *sendOrder.add_inputs() = input;
-    *sendOrder.add_outputs() = output;
-
-    *signingInput.mutable_send_order() = sendOrder;
-
-    const auto data = Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-        "c601"
-        "f0625dee"
-        "0a52"
-            "2a2c87fa"
-            "0a25""0a141d0e3086e8e4e0a53c38a90d55bd58b34d57d2fa120d0a03424e42108080e983b1de16"
-            "1225""0a146b571fc0a9961a7ddf45e49a88a4d83941fcabbe120d0a03424e42108080e983b1de16"
-        "126c"
-            "0a26"
-            "eb5ae987"
-            "21027e69d96640300433654e016d218a8d7ffed751023d8efe81e55dedbd6754c971"
-            "1240""8b23eecfa8237a27676725173e58154e6c204bb291b31c3b7b507c8f04e2773909ba70e01b54f4bd0bc76669f5712a5a66b9508acdf3aa5e4fde75fbe57622a1"
-            "2001"
-    );
-}
-
-TEST(BinanceSigner, BuildHTLT) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    auto fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    const auto toPrivateKey =
-        PrivateKey(parse_hex("851fab89c14f4bbec0cc06f5e445ec065efc641068d78b308c67217d9bd5c88a"));
-    const auto toPublicKey = PublicKey(toPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    auto toAddr = Binance::Address(toPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(0);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto token = Proto::SendOrder::Token();
-    token.set_denom("BNB");
-    token.set_amount(100000000);
-
-    auto randomNumberHash =
-        parse_hex("e8eae926261ab77d018202434791a335249b470246a7b02e28c3b2fb6ffad8f3");
-
-    auto& htltOrder = *signingInput.mutable_htlt_order();
-    htltOrder.set_from(fromAddr.data(), fromAddr.size());
-    htltOrder.set_to(toAddr.data(), toAddr.size());
-    htltOrder.set_recipient_other_chain("");
-    htltOrder.set_sender_other_chain("");
-    *htltOrder.add_amount() = token;
-    htltOrder.set_height_span(400);
-    htltOrder.set_expected_income("100000000:BTC-1DC");
-    htltOrder.set_timestamp(1567746273);
-    htltOrder.set_random_number_hash(randomNumberHash.data(), randomNumberHash.size());
-    htltOrder.set_cross_chain(false);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "ee01f0625dee0a7ab33f9a240a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e112140153f11d6db7"
-              "e69c7d51e771c697378018fb6c242a20e8eae926261ab77d018202434791a335249b470246a7b02e28c3"
-              "b2fb6ffad8f330e1d1c7eb053a0a0a03424e421080c2d72f42113130303030303030303a4254432d3144"
-              "43489003126c0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f"
-              "6b6a8fc7124051439de2da19fe9fd22137c903cfc5dc87553bf05dca0bb202c0e07c47f9b51269efa272"
-              "43eb7b55888f5384a84ac1eac6d325c830d1be0ed042838e2dc0f6a9180f");
-}
-
-TEST(BinanceSigner, BuildDepositHTLT) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("851fab89c14f4bbec0cc06f5e445ec065efc641068d78b308c67217d9bd5c88a"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    auto fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(16);
-    signingInput.set_sequence(0);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto token = Proto::SendOrder::Token();
-    token.set_denom("BTC-1DC");
-    token.set_amount(100000000);
-
-    auto swapID = parse_hex("dd8fd4719741844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5");
-
-    auto& depositHTLTOrder = *signingInput.mutable_deposithtlt_order();
-    depositHTLTOrder.set_from(fromAddr.data(), fromAddr.size());
-    depositHTLTOrder.set_swap_id(swapID.data(), swapID.size());
-    *depositHTLTOrder.add_amount() = token;
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "c001f0625dee0a4c639864960a140153f11d6db7e69c7d51e771c697378018fb6c24120e0a074254432d"
-              "3144431080c2d72f1a20dd8fd4719741844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5"
-              "126c0a26eb5ae98721038df6960084e20b2d07d50e1422f94105c6241d9f1482a4eb79ce8bfd460f19e4"
-              "12400ca4144c6818e2836d09b4faf3161781d85f9adfc00badb2eaa0953174610a233b81413dafcf8471"
-              "6abad48a4ed3aeb9884d90eb8416eec5d5c0c6930ab60bd01810");
-}
-
-TEST(BinanceSigner, BuildClaimHTLT) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    auto fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto randomNumber =
-        parse_hex("bda6933c7757d0ca428aa01fb9d0935a231f87bf2deeb9b409cea3f2d580a2cc");
-    auto swapID = parse_hex("dd8fd4719741844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5");
-
-    auto& claimHTLTOrder = *signingInput.mutable_claimhtlt_order();
-    claimHTLTOrder.set_from(fromAddr.data(), fromAddr.size());
-    claimHTLTOrder.set_swap_id(swapID.data(), swapID.size());
-    claimHTLTOrder.set_random_number(randomNumber.data(), randomNumber.size());
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(
-        hex(data.begin(), data.end()),
-        "d401f0625dee0a5ec16653000a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e11220dd8fd4719741844d35"
-        "eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e51a20bda6933c7757d0ca428aa01fb9d0935a231f87bf"
-        "2deeb9b409cea3f2d580a2cc126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561a"
-        "ac993dbe0f6b6a8fc71240fa30ba50111aa31d8329dacb6d044c1c7d54f1cb782bc9aa2a50c3fabce02a4579d7"
-        "5b76ca69a9fab11b676d9da66b5af7aa4c9ad3d18e24fffeb16433be39fb180f2001");
-}
-
-TEST(BinanceSigner, BuildRefundHTLT) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    auto fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto swapID = parse_hex("dd8fd4719741844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5");
-
-    auto& refundHTLTOrder = *signingInput.mutable_refundhtlt_order();
-    refundHTLTOrder.set_from(fromAddr.data(), fromAddr.size());
-    refundHTLTOrder.set_swap_id(swapID.data(), swapID.size());
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "b201f0625dee0a3c3454a27c0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e11220dd8fd4719741"
-              "844d35eb35ddbeca9531d5493a8e4667689c55e73c77503dd9e5126e0a26eb5ae9872103a9a55c040c8e"
-              "b8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240c9f36142534d16ec8ce656f8eb73"
-              "70b32206a2d15198b7165acf1e2a18952c9e4570b0f862e1ab7bb868c30781a42c9e3ec0ae08982e8d6c"
-              "91c55b83c71b7b1e180f2001");
-}
-
-TEST(BinanceSigner, BuildIssueOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& issueOrder = *signingInput.mutable_issue_order();
-    issueOrder.set_from(fromAddr.data(), fromAddr.size());
-    issueOrder.set_name("NewBinanceToken");
-    issueOrder.set_symbol("NNB-338_BNB");
-    issueOrder.set_total_supply(1000000000);
-    issueOrder.set_mintable(true);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "b601f0625dee0a40"
-              "17efab80"
-              "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120f"
-              "4e657742696e616e6365546f6b656e"
-              "1a0b"
-              "4e4e422d3333385f424e42"
-              "208094ebdc032801126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac"
-              "993dbe0f6b6a8fc71240b2612500b80f5ee8fab1574e9b1763fd898a7048910d02e00dea6337d3c848c9"
-              "5aa2213db595179db076dfdb10f6e2d9b2aa76c9cd3ee11396ac224991e3e0cd180f2001");
-}
-
-TEST(BinanceSigner, BuildMintOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& mintOrder = *signingInput.mutable_mint_order();
-    mintOrder.set_from(fromAddr.data(), fromAddr.size());
-    mintOrder.set_symbol("NNB-338_BNB");
-    mintOrder.set_amount(1000000);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "a101f0625dee0a2b"
-              "467e0829"
-              "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120b"
-              "4e4e422d3333385f424e42"
-              "18c0843d126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f"
-              "6b6a8fc71240b2612500b80f5ee8fab1574e9b1763fd898a7048910d02e00dea6337d3c848c95aa2213d"
-              "b595179db076dfdb10f6e2d9b2aa76c9cd3ee11396ac224991e3e0cd180f2001");
-}
-
-TEST(BinanceSigner, BuildBurnOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& burnOrder = *signingInput.mutable_burn_order();
-    burnOrder.set_from(fromAddr.data(), fromAddr.size());
-    burnOrder.set_symbol("NNB-338_BNB");
-    burnOrder.set_amount(1000000);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "a101f0625dee0a2b"
-              "7ed2d2a0"
-              "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120b"
-              "4e4e422d3333385f424e42"
-              "18c0843d126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f"
-              "6b6a8fc71240b2612500b80f5ee8fab1574e9b1763fd898a7048910d02e00dea6337d3c848c95aa2213d"
-              "b595179db076dfdb10f6e2d9b2aa76c9cd3ee11396ac224991e3e0cd180f2001");
-}
-
-TEST(BinanceSigner, BuildFreezeOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& freezeOrder = *signingInput.mutable_freeze_order();
-    freezeOrder.set_from(fromAddr.data(), fromAddr.size());
-    freezeOrder.set_symbol("NNB-338_BNB");
-    freezeOrder.set_amount(1000000);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "a101f0625dee0a2b"
-              "e774b32d"
-              "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120b"
-              "4e4e422d3333385f424e42"
-              "18c0843d126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f"
-              "6b6a8fc71240e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162"
-              "722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991180f2001");
-}
-
-TEST(BinanceSigner, BuildUnfreezeOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& unfreezeOrder = *signingInput.mutable_unfreeze_order();
-    unfreezeOrder.set_from(fromAddr.data(), fromAddr.size());
-    unfreezeOrder.set_symbol("NNB-338_BNB");
-    unfreezeOrder.set_amount(1000000);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "a101f0625dee0a2b"
-              "6515ff0d"
-              "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1120b"
-              "4e4e422d3333385f424e42"
-              "18c0843d126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f"
-              "6b6a8fc71240e3022069d897bf5bf4846d354fcd2c0e85807053be643c8b8c8596306003f7340d43a162"
-              "722673eb848258b0435b1f49993d0e75d4ae43d03453a3ae57fe6991180f2001");
-}
-
-TEST(BinanceSigner, BuildTransferOutOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    const auto toAddr = Ethereum::Address("0x35552c16704d214347f29Fa77f77DA6d75d7C752");
-    const auto toBytes = Data(toAddr.bytes.begin(), toAddr.bytes.end());
-
-    auto input = Proto::SigningInput();
-    input.set_chain_id("test-chain");
-    input.set_account_number(15);
-    input.set_sequence(1);
-    input.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& order = *input.mutable_transfer_out_order();
-    order.set_from(fromAddr.data(), fromAddr.size());
-    order.set_to(toBytes.data(), toBytes.size());
-    order.set_expire_time(12345678);
-
-    auto& token = *order.mutable_amount();
-    token.set_denom("BNB");
-    token.set_amount(100000000);
-
-    const auto data = Binance::Signer(std::move(input)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "b701f0625dee0a41800819c00a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1121435552c16704d"
-              "214347f29fa77f77da6d75d7c7521a0a0a03424e421080c2d72f20cec2f105126e0a26eb5ae9872103a9"
-              "a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc712407eda148e1167b1be12"
-              "71a788ccf4e3eade1c7e1773e9d2093982d7f802f8f85f35ef550049011728206e4eda1a272f9e96fd95"
-              "ef3983cad85a29cd14262c22e0180f2001");
-}
-
-TEST(BinanceSigner, BuildSideChainDelegate) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-    auto validator = Bech32Address("");
-    Bech32Address::decode("bva10npy5809y303f227g4leqw7vs3s6ep5ul26sq2", validator, "bva");
-
-    auto input = Proto::SigningInput();
-    input.set_chain_id("test-chain");
-    input.set_account_number(15);
-    input.set_sequence(1);
-    input.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& order = *input.mutable_side_delegate_order();
-    order.set_delegator_addr(fromAddr.data(), fromAddr.size());
-    order.set_validator_addr(validator.getKeyHash().data(), validator.getKeyHash().size());
-    order.set_chain_id("chapel");
-
-    auto& token = *order.mutable_delegation();
-    token.set_denom("BNB");
-    token.set_amount(200000000);
-
-    const auto data = Binance::Signer(std::move(input)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-              "ba01f0625dee0a44e3a07fd20a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e112147cc24a1de524"
-              "5f14a95e457f903bcc8461ac869c1a0a0a03424e42108084af5f220663686170656c126e0a26eb5ae987"
-              "2103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc7124039302c9975fb"
-              "2a09ac2b6b6fb1d3b9fb5b4c03630d3d7a7da42b1c6736d6127142a3fcdca0b70a3d065da8d4f4df8b5d"
-              "9d8f46aeb3627a7d7aa901fe186af34c180f2001");
-}
-
-TEST(BinanceSigner, BuildSideChainRedelegate) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-    auto validator1 = Bech32Address("");
-    auto validator2 = Bech32Address("");
-    Bech32Address::decode("bva1echrty7p8r23cwx8g3ezwcza9azy4zq7ca0pzw", validator1, "bva");
-    Bech32Address::decode("bva1p7s26ervsmv3w83k5696glautc9sm5rchz5f5e", validator2, "bva");
-
-    auto input = Proto::SigningInput();
-    input.set_chain_id("test-chain");
-    input.set_account_number(15);
-    input.set_sequence(1);
-    input.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& order = *input.mutable_side_redelegate_order();
-    order.set_delegator_addr(fromAddr.data(), fromAddr.size());
-    order.set_validator_src_addr(validator1.getKeyHash().data(), validator1.getKeyHash().size());
-    order.set_validator_dst_addr(validator2.getKeyHash().data(), validator2.getKeyHash().size());
-    order.set_chain_id("chapel");
-
-    auto& token = *order.mutable_amount();
-    token.set_denom("BNB");
-    token.set_amount(100000000);
-
-    const auto data = Binance::Signer(std::move(input)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-        "d001f0625dee0a5ae3ced3640a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e11214ce2e3593c138"
-        "d51c38c7447227605d2f444a881e1a140fa0ad646c86d9171e36a68ba47fbc5e0b0dd078220a0a03424e"
-        "421080c2d72f2a0663686170656c126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08"
-        "af44ea561aac993dbe0f6b6a8fc71240114c6927423e95ecc831ec763b629b3a40db8feeb330528a941f"
-        "d74843c0d63b4271b23916770d4901988c1f56b20086e5768a12290ebec265e30a80f8f3d88e180f2001"
-    );
-}
-
-TEST(BinanceSigner, BuildSideChainUndelegate) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-    auto validator = Bech32Address("");
-    Bech32Address::decode("bva1echrty7p8r23cwx8g3ezwcza9azy4zq7ca0pzw", validator, "bva");
-
-    auto input = Proto::SigningInput();
-    input.set_chain_id("test-chain");
-    input.set_account_number(15);
-    input.set_sequence(1);
-    input.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& order = *input.mutable_side_undelegate_order();
-    order.set_delegator_addr(fromAddr.data(), fromAddr.size());
-    order.set_validator_addr(validator.getKeyHash().data(), validator.getKeyHash().size());
-    order.set_chain_id("chapel");
-
-    auto& token = *order.mutable_amount();
-    token.set_denom("BNB");
-    token.set_amount(100000000);
-
-    const auto data = Binance::Signer(std::move(input)).build();
-    ASSERT_EQ(hex(data.begin(), data.end()),
-        "ba01f0625dee0a44514f7e0e0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e11214ce2e3593c138"
-        "d51c38c7447227605d2f444a881e1a0a0a03424e421080c2d72f220663686170656c126e0a26eb5ae987"
-        "2103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240a622b7ca7a28"
-        "75e5eaa675a5ed976b2ec3b8ca055a2b05e7fb471d328bd04df854789437dd06407e41ebb1e5a345604c"
-        "93663dfb660e223800636c0b94c2e798180f2001"
-    );
-}
-
-TEST(BinanceSigner, BuildTimeLockOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& lockOrder = *signingInput.mutable_time_lock_order();
-    lockOrder.set_from_address(fromAddr.data(), fromAddr.size());
-    lockOrder.set_description("Description locked for offer");
-    auto amount = lockOrder.add_amount();
-    amount->set_denom("BNB");
-    amount->set_amount(1000000);
-    lockOrder.set_lock_time(1600001371);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    EXPECT_EQ(hex(data.begin(), data.end()),
-        "bf01f0625dee0a49"
-        "07921531"
-        "0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e1121c4465736372697074696f6e206c6f636b656420666f72206f666665721a090a03424e4210c0843d20dbaaf8fa05126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240c270822b9515ba486c6a6b3472d388a5aea872ed960c0b53de0fafdc8682ef473a126f01e7dd2c00f04a0138a601b9540f54b14026846de362f7ab7f9fed948b180f2001"
-    );
-}
-
-TEST(BinanceSigner, BuildTimeRelockOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& relockOrder = *signingInput.mutable_time_relock_order();
-    relockOrder.set_from_address(fromAddr.data(), fromAddr.size());
-    relockOrder.set_id(333);
-    relockOrder.set_description("Description locked for offer");
-    auto amount = relockOrder.add_amount();
-    amount->set_denom("BNB");
-    amount->set_amount(1000000);
-    relockOrder.set_lock_time(1600001371);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    EXPECT_EQ(hex(data.begin(), data.end()),
-              "c201f0625dee0a4c504711da0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e110cd021a1c446573"
-              "6372697074696f6e206c6f636b656420666f72206f6666657222090a03424e4210c0843d28dbaaf8fa05"
-              "126e0a26eb5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc7"
-              "124086ddaa077c8ae551d402fa409cf7e91663982b0542200967c03c0b5876b181353250f689d342f221"
-              "7624a077b671ce7d09649187e29879f40abbbee9de7ab27c180f2001");
-}
-
-TEST(BinanceSigner, BuildTimeUnlockOrder) {
-    const auto fromPrivateKey =
-        PrivateKey(parse_hex("eeba3f6f2db26ced519a3d4c43afff101db957a21d54d25dc7fd235c404d7a5d"));
-    const auto fromPublicKey = PublicKey(fromPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const Data fromAddr = Binance::Address(fromPublicKey).getKeyHash();
-
-    auto signingInput = Proto::SigningInput();
-    signingInput.set_chain_id("test-chain");
-    signingInput.set_account_number(15);
-    signingInput.set_sequence(1);
-    signingInput.set_private_key(fromPrivateKey.bytes.data(), fromPrivateKey.bytes.size());
-
-    auto& unlockOrder = *signingInput.mutable_time_unlock_order();
-    unlockOrder.set_from_address(fromAddr.data(), fromAddr.size());
-    unlockOrder.set_id(333);
-
-    const auto data = Binance::Signer(std::move(signingInput)).build();
-    EXPECT_EQ(hex(data.begin(), data.end()),
-              "9301f0625dee0a1dc4050c6c0a1408c7c918f6b72c3c0c21b7d08eb6fc66509998e110cd02126e0a26eb"
-              "5ae9872103a9a55c040c8eb8120f3d1b32193250841c08af44ea561aac993dbe0f6b6a8fc71240da777b"
-              "fd2032834f59ec9fe69fd6eaa4aca24242dfbc5ec4ef8c435cb9da7eb05ab78e1b8ca9f109657cb77996"
-              "898f1b59137b3d8f1e00f842e409e18033b347180f2001");
-}
-
-} // namespace TW::Binance
diff --git a/tests/Binance/TWAnySignerTests.cpp b/tests/Binance/TWAnySignerTests.cpp
deleted file mode 100644
index aa06a82e55e..00000000000
--- a/tests/Binance/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Binance/Address.h"
-#include "proto/Binance.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include "Coin.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-#include <thread>
-
-namespace TW::Binance {
-
-Proto::SigningOutput SignTest() {
-    auto input = Proto::SigningInput();
-    input.set_chain_id("Binance-Chain-Tigris");
-    input.set_account_number(0);
-    input.set_sequence(0);
-    input.set_source(0);
-
-    auto key = parse_hex("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832");
-    input.set_private_key(key.data(), key.size());
-
-    auto& order = *input.mutable_send_order();
-
-    Address fromAddress;
-    EXPECT_TRUE(Address::decode("bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2", fromAddress));
-    EXPECT_EQ(hex(fromAddress.getKeyHash()), "40c2979694bbc961023d1d27be6fc4d21a9febe6");
-    auto fromKeyhash = fromAddress.getKeyHash();
-    Address toAddress;
-    EXPECT_TRUE(Address::decode("bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5", toAddress));
-    EXPECT_EQ(hex(toAddress.getKeyHash()), "bffe47abfaede50419c577f1074fee6dd1535cd1");
-    auto toKeyhash = toAddress.getKeyHash();
-
-    {
-        auto inputOrder = order.add_inputs();
-        inputOrder->set_address(fromKeyhash.data(), fromKeyhash.size());
-        auto inputCoin = inputOrder->add_coins();
-        inputCoin->set_denom("BNB");
-        inputCoin->set_amount(1);
-    }
-
-    {
-        auto output = order.add_outputs();
-        output->set_address(toKeyhash.data(), toKeyhash.size());
-        auto outputCoin = output->add_coins();
-        outputCoin->set_denom("BNB");
-        outputCoin->set_amount(1);
-    }
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeBinance);
-    return output;
-}
-
-TEST(TWAnySignerBinance, Sign) {
-    Proto::SigningOutput output = SignTest();
-    ASSERT_EQ(hex(output.encoded()), "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212409073e581e1ea4fdf11242fe30a732f96d20799c638354bcf7a242161ac015b9321fbbed93e85b0ef9b5de58fba74dff54ecb1e379ef26e1023be8996003f4899");
-}
-
-TEST(TWAnySignerBinance, SignJSON) {
-    auto json = STRING(R"({"chainId":"Binance-Chain-Tigris","accountNumber":"13186","source":"2","memo":"Testing","sendOrder":{"inputs":[{"address":"EuZU7e+eUIuDNzaph9Bp2lqJrts=","coins":[{"denom":"BNB","amount":"1345227"}]}],"outputs":[{"address":"M7vzB7mBRvE9IGk8+UbC13pMryg=","coins":[{"denom":"BNB","amount":"1345227"}]}]}})");
-    auto key = DATA("f947b3554a1c2fa70e1caa9de53fbda353348d1e856c593848f3a29737d31f11");
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeBinance));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeBinance));
-    assertStringsEqual(result, "ca01f0625dee0a4a2a2c87fa0a210a1412e654edef9e508b833736a987d069da5a89aedb12090a03424e4210cb8d5212210a1433bbf307b98146f13d20693cf946c2d77a4caf2812090a03424e4210cb8d52126d0a26eb5ae9872102e58176f271a9796b4288908be85094a2ac978e25535fd59a37b58626e3a84d9e1240015b4beb3d6ef366a7a92fd283f66b8f0d8cdb6b152a9189146b27f84f507f047e248517cf691a36ebc2b7f3b7f64e27585ce1c40f1928d119c31af428efcf3e1882671a0754657374696e672002");
-}
-
-TEST(TWAnySignerBinance, MultithreadedSigning) {
-    auto f = [](int n) {
-        for (int i = 0; i < n; i++) {
-            Proto::SigningOutput output = SignTest();
-            ASSERT_EQ(hex(output.encoded()), "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212409073e581e1ea4fdf11242fe30a732f96d20799c638354bcf7a242161ac015b9321fbbed93e85b0ef9b5de58fba74dff54ecb1e379ef26e1023be8996003f4899");
-        }
-    };
-
-    // Ensure multiple threads cause no asserts
-    std::thread th1(f, 1000);
-    std::thread th2(f, 1000);
-    std::thread th3(f, 1000);
-
-    th1.join();
-    th2.join();
-    th3.join();
-}
-
-} // namespace TW::Binance
diff --git a/tests/Binance/TWCoinTypeTests.cpp b/tests/Binance/TWCoinTypeTests.cpp
deleted file mode 100644
index 52ce9bc3bf9..00000000000
--- a/tests/Binance/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWBinanceCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBinance));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("A93625C9F9ABEA1A8E31585B30BBB16C34FAE0D172EB5B6B2F834AF077BF06BB"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBinance, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("bnb1u7jm0cll5h3224y0tapwn6gf6pr49ytewx4gsz"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBinance, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBinance));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBinance));
-    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeBinance));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBinance), 8);
-    ASSERT_EQ(TWBlockchainBinance, TWCoinTypeBlockchain(TWCoinTypeBinance));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBinance));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBinance));
-    assertStringsEqual(symbol, "BNB");
-    assertStringsEqual(txUrl, "https://explorer.binance.org/tx/A93625C9F9ABEA1A8E31585B30BBB16C34FAE0D172EB5B6B2F834AF077BF06BB");
-    assertStringsEqual(accUrl, "https://explorer.binance.org/address/bnb1u7jm0cll5h3224y0tapwn6gf6pr49ytewx4gsz");
-    assertStringsEqual(id, "binance");
-    assertStringsEqual(name, "BNB Beacon Chain");
-    assertStringsEqual(chainId, "Binance-Chain-Tigris");
-}
diff --git a/tests/BinanceSmartChain/SignerTests.cpp b/tests/BinanceSmartChain/SignerTests.cpp
deleted file mode 100644
index 3ec01b4f1e6..00000000000
--- a/tests/BinanceSmartChain/SignerTests.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnySigner.h>
-#include "Ethereum/Signer.h"
-#include "Ethereum/Transaction.h"
-#include "Ethereum/Address.h"
-#include "Ethereum/ABI.h"
-#include "proto/Ethereum.pb.h"
-#include "HexCoding.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Binance {
-
-TEST(BinanceSmartChain, SignNativeTransfer) {
-    // https://explorer.binance.org/smart-testnet/tx/0x6da28164f7b3bc255d749c3ae562e2a742be54c12bf1858b014cc2fe5700684e
-
-    auto toAddress = parse_hex("0x31BE00EB1fc8e14A696DBC72f746ec3e95f49683");
-    auto transaction = Ethereum::TransactionNonTyped::buildNativeTransfer(
-        /* nonce: */ 0,
-        /* gasPrice: */ 20000000000,
-        /* gasLimit: */ 21000,
-        /* to: */ toAddress,
-        /* amount: */ 10000000000000000 // 0.01
-    );
-
-    // addr: 0xB9F5771C27664bF2282D98E09D7F50cEc7cB01a7  mnemonic: isolate dismiss ... cruel note
-    auto privateKey = PrivateKey(parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904"));
-    uint256_t chainID = 97;
-    auto signature = Ethereum::Signer::sign(privateKey, chainID, transaction);
-
-    auto encoded = transaction->encoded(signature, chainID);
-    ASSERT_EQ(hex(encoded), "f86c808504a817c8008252089431be00eb1fc8e14a696dbc72f746ec3e95f49683872386f26fc100008081e5a057806b486844c5d0b7b5ce34b289f4e8776aa1fe24a3311cef5053995c51050ca07697aa0695de27da817625df0e7e4c64b0ab22d9df30aec92299a7b380be8db7");
-}
-
-TEST(BinanceSmartChain, SignTokenTransfer) {
-    auto toAddress = parse_hex("0x31BE00EB1fc8e14A696DBC72f746ec3e95f49683");
-    auto func = Ethereum::ABI::Function("transfer", std::vector<std::shared_ptr<Ethereum::ABI::ParamBase>>{
-        std::make_shared<Ethereum::ABI::ParamAddress>(toAddress),
-        std::make_shared<Ethereum::ABI::ParamUInt256>(uint256_t(10000000000000000))
-    });
-    Data payloadFunction;
-    func.encode(payloadFunction);
-    EXPECT_EQ(hex(payloadFunction), "a9059cbb00000000000000000000000031be00eb1fc8e14a696dbc72f746ec3e95f49683000000000000000000000000000000000000000000000000002386f26fc10000");
-
-    auto input = Ethereum::Proto::SigningInput();
-    auto chainId = store(uint256_t(97));
-    auto nonce = store(uint256_t(30));
-    auto gasPrice = store(uint256_t(20000000000));
-    auto gasLimit = store(uint256_t(1000000));
-    auto tokenContractAddress = "0xed24fc36d5ee211ea25a80239fb8c4cfd80f12ee";
-    auto dummyAmount = store(uint256_t(0));
-    // addr: 0xB9F5771C27664bF2282D98E09D7F50cEc7cB01a7  mnemonic: isolate dismiss ... cruel note
-    auto privateKey = PrivateKey(parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904"));
-
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_to_address(tokenContractAddress);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
-    transfer.set_data(payloadFunction.data(), payloadFunction.size());
-
-    const std::string expected = "f8ab1e8504a817c800830f424094ed24fc36d5ee211ea25a80239fb8c4cfd80f12ee80b844a9059cbb00000000000000000000000031be00eb1fc8e14a696dbc72f746ec3e95f49683000000000000000000000000000000000000000000000000002386f26fc1000081e6a0aa9d5e9a947e96f728fe5d3e6467000cd31a693c00270c33ec64b4abddc29516a00bf1d5646139b2bcca1ad64e6e79f45b7d1255de603b5a3765cbd9544ae148d0";
-
-    Ethereum::Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSmartChain);
-
-    EXPECT_EQ(hex(output.encoded()), expected);
-}
-
-} // namespace TW::Binance
diff --git a/tests/BinanceSmartChain/TWAnyAddressTests.cpp b/tests/BinanceSmartChain/TWAnyAddressTests.cpp
deleted file mode 100644
index e50537d7b8c..00000000000
--- a/tests/BinanceSmartChain/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include "HexCoding.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(TWBinanceSmartChain, Address) {
-
-    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("727f677b390c151caf9c206fd77f77918f56904b5504243db9b21e51182c4c06").get()));
-    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), false));
-    auto string = "0xf3d468DBb386aaD46E92FF222adDdf872C8CC064";
-    
-    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeSmartChain));
-    auto expected = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING(string).get(), TWCoinTypeSmartChain));
-
-    auto addressString = WRAPS(TWAnyAddressDescription(address.get()));
-    auto expectedString = WRAPS(TWAnyAddressDescription(expected.get()));
-
-    assertStringsEqual(addressString, string);
-    assertStringsEqual(expectedString, string);
-}
diff --git a/tests/BinanceSmartChain/TWCoinTypeTests.cpp b/tests/BinanceSmartChain/TWCoinTypeTests.cpp
deleted file mode 100644
index 9f768216878..00000000000
--- a/tests/BinanceSmartChain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWBinanceSmartChainCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeSmartChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb9ae2e808fe8e57171f303ad8f6e3fd17d949b0bfc7b4db6e8e30a71cc517d7e"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeSmartChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x35552c16704d214347f29Fa77f77DA6d75d7C752"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeSmartChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSmartChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSmartChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeSmartChain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeSmartChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeSmartChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeSmartChain));
-    ASSERT_EQ(20000714, TWCoinTypeSmartChain);
-    assertStringsEqual(symbol, "BNB");
-    assertStringsEqual(txUrl, "https://bscscan.com/tx/0xb9ae2e808fe8e57171f303ad8f6e3fd17d949b0bfc7b4db6e8e30a71cc517d7e");
-    assertStringsEqual(accUrl, "https://bscscan.com/address/0x35552c16704d214347f29Fa77f77DA6d75d7C752");
-    assertStringsEqual(id, "smartchain");
-    assertStringsEqual(name, "BNB Smart Chain");
-}
-
-TEST(TWBinanceSmartChainLegacyCoinType, TWCoinType) {
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSmartChainLegacy));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSmartChainLegacy));
-
-    ASSERT_EQ(10000714, TWCoinTypeSmartChainLegacy);
-    assertStringsEqual(id, "bsc");
-    assertStringsEqual(name, "Smart Chain Legacy");
-}
diff --git a/tests/BinaryCodingTests.cpp b/tests/BinaryCodingTests.cpp
deleted file mode 100644
index 1627a90951c..00000000000
--- a/tests/BinaryCodingTests.cpp
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "BinaryCoding.h"
-#include "HexCoding.h"
-
-#include <vector>
-
-#include <gtest/gtest.h>
-
-using namespace std;
-using namespace TW;
-
-TEST(BinaryCodingTests, varIntSize) {
-    vector<tuple<uint64_t, uint8_t>> tests = {
-        {0, 1},
-        {1, 1},
-        {10, 1},
-        {100, 1},
-        {0xfb, 1},
-        {0xfc, 1},
-        {0xfd, 3},
-        {0xfe, 3},
-        {0xff, 3},
-        {0x100, 3},
-        {0x200, 3},
-        {0x1000, 3},
-        {0xffff, 3},
-        {0x10000, 5},
-        {0x20000, 5},
-        {0xffffffff, 5},
-        {0x100000000, 9},
-        {0x200000000, 9},
-        {0x1000000000, 9},
-        {0x10000000000, 9},
-        {0x100000000000, 9},
-        {0x1000000000000, 9},
-        {0x10000000000000, 9},
-        {0x100000000000000, 9},
-        {0xffffffffffffffff, 9},
-    };
-    for (auto& test : tests) {
-        EXPECT_EQ(varIntSize(get<0>(test)), get<1>(test));
-    }
-}
-
-TEST(BinaryCodingTests, encodeAndDecodeVarInt) {
-    vector<tuple<uint64_t, string>> tests = {
-        {0, "00"},
-        {1, "01"},
-        {10, "0a"},
-        {100, "64"},
-        {0xfb, "fb"},
-        {0xfc, "fc"},
-        {0xfd, "fdfd00"},
-        {0xfe, "fdfe00"},
-        {0xff, "fdff00"},
-        {0x100, "fd0001"},
-        {0x200, "fd0002"},
-        {0x1000, "fd0010"},
-        {0xffff, "fdffff"},
-        {0x10000, "fe00000100"},
-        {0x20000, "fe00000200"},
-        {0xffffffff, "feffffffff"},
-        {0x100000000, "ff0000000001000000"},
-        {0x200000000, "ff0000000002000000"},
-        {0x1000000000, "ff0000000010000000"},
-        {0x10000000000, "ff0000000000010000"},
-        {0x100000000000, "ff0000000000100000"},
-        {0x1000000000000, "ff0000000000000100"},
-        {0x10000000000000, "ff0000000000001000"},
-        {0x100000000000000, "ff0000000000000001"},
-        {0xffffffffffffffff, "ffffffffffffffffff"},
-    };
-    for (auto& test : tests) {
-        const auto input = get<0>(test);
-        Data encoded;
-        uint8_t resultEnc = encodeVarInt(input, encoded);
-        EXPECT_EQ(hex(encoded), get<1>(test));
-        EXPECT_EQ(resultEnc, varIntSize(input));
-        // decode back
-        size_t index = 0;
-        const auto resultDec = decodeVarInt(encoded, index);
-        EXPECT_EQ(get<0>(resultDec), true);
-        EXPECT_EQ(get<1>(resultDec), input);
-    }
-}
-
-TEST(BinaryCodingTests, decodeVarIntTooShort) {
-    {
-        Data encoded = parse_hex("fe000000"); // one byte missing
-        size_t index = 0;
-        const auto result = decodeVarInt(encoded, index);
-        EXPECT_EQ(get<0>(result), false);
-    }
-    {
-        Data encoded = parse_hex("fe00000000");
-        size_t index = 0;
-        const auto result = decodeVarInt(encoded, index);
-        EXPECT_EQ(get<0>(result), true);
-    }
-}
-
-TEST(BinaryCodingTests, encodeAndDecodeString) {
-    vector<tuple<string, string>> tests = {
-        {"", "00"},
-        {"A", "0141"},
-        {"AB", "024142"},
-        {"abcdefghij", "0a6162636465666768696a"},
-        {"abcdefghIj", "0a6162636465666768496a"},
-        {"12345678901234567890123456789012345678901234567890", "323132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"},
-        {
-            "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
-            "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
-            "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
-            , "fd2c01"
-            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
-            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
-            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
-            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
-            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
-            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
-        },
-    };
-    for (auto& test : tests) {
-        const auto input = get<0>(test);
-        Data encoded;
-        encodeString(input, encoded);
-        EXPECT_EQ(hex(encoded), get<1>(test));
-        // decode back
-        size_t index = 0;
-        const auto resultDec = decodeString(encoded, index);
-        EXPECT_EQ(get<0>(resultDec), true);
-        EXPECT_EQ(get<1>(resultDec), get<0>(test));
-    }
-}
-
-TEST(BinaryCodingTests, decodeStringTooShort) {
-    {
-        Data encoded = parse_hex("0a616263646566676849"); // one byte missing
-        size_t index = 0;
-        const auto result = decodeString(encoded, index);
-        EXPECT_EQ(get<0>(result), false);
-    }
-    {
-        Data encoded = parse_hex("0a6162636465666768496a");
-        size_t index = 0;
-        const auto result = decodeString(encoded, index);
-        EXPECT_EQ(get<0>(result), true);
-    }
-}
diff --git a/tests/Bitcoin/FeeCalculatorTests.cpp b/tests/Bitcoin/FeeCalculatorTests.cpp
deleted file mode 100644
index 93ea4013e77..00000000000
--- a/tests/Bitcoin/FeeCalculatorTests.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Bitcoin/FeeCalculator.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Bitcoin {
-
-TEST(BitcoinFeeCalculator, ConstantFeeCalculator) {
-    const auto feeCalculator = ConstantFeeCalculator(33);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 33);
-    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 33);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 33);
-    EXPECT_EQ(feeCalculator.calculateSingleInput(10), 0);
-}
-
-TEST(BitcoinFeeCalculator, LinearFeeCalculator) {
-    const auto feeCalculator = LinearFeeCalculator(10, 20, 50);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 100);
-    EXPECT_EQ(feeCalculator.calculate(1, 1, 1), 80);
-    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 90);
-    EXPECT_EQ(feeCalculator.calculate(1, 0, 1), 60);
-    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 50);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 1000);
-    EXPECT_EQ(feeCalculator.calculateSingleInput(10), 100);
-}
-
-TEST(BitcoinFeeCalculator, BitcoinCalculate) {
-    const FeeCalculator& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 174);
-    EXPECT_EQ(feeCalculator.calculate(1, 1, 1), 143);
-    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 72);
-    EXPECT_EQ(feeCalculator.calculate(1, 0, 1), 112);
-    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 10);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 1740);
-}
-
-TEST(BitcoinFeeCalculator, SegwitCalculate) {
-    const FeeCalculator& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 174);
-    EXPECT_EQ(feeCalculator.calculate(1, 1, 1), 143);
-    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 72);
-    EXPECT_EQ(feeCalculator.calculate(1, 0, 1), 112);
-    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 10);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 1740);
-}
-
-TEST(BitcoinFeeCalculator, DefaultCalculate) {
-    DefaultFeeCalculator defaultFeeCalculator;
-    EXPECT_EQ(defaultFeeCalculator.calculate(1, 2, 1), 226);
-    EXPECT_EQ(defaultFeeCalculator.calculate(1, 1, 1), 192);
-    EXPECT_EQ(defaultFeeCalculator.calculate(0, 2, 1), 78);
-    EXPECT_EQ(defaultFeeCalculator.calculate(1, 0, 1), 158);
-    EXPECT_EQ(defaultFeeCalculator.calculate(0, 0, 1), 10);
-    EXPECT_EQ(defaultFeeCalculator.calculate(1, 2, 10), 2260);
-}
-
-TEST(BitcoinFeeCalculator, DefaultCalculateSingleInput) {
-    DefaultFeeCalculator defaultFeeCalculator;
-    EXPECT_EQ(defaultFeeCalculator.calculateSingleInput(1), 148);
-    EXPECT_EQ(defaultFeeCalculator.calculateSingleInput(2), 296);
-    EXPECT_EQ(defaultFeeCalculator.calculateSingleInput(10), 1480);
-}
-
-TEST(BitcoinFeeCalculator, DecredCalculate) {
-    const FeeCalculator& feeCalculator = getFeeCalculator(TWCoinTypeDecred);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 254);
-    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 12);
-    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 2540);
-    EXPECT_EQ(feeCalculator.calculateSingleInput(1), 166);
-}
-
-} // namespace TW::Bitcoin
diff --git a/tests/Bitcoin/TWBitcoinSigningTests.cpp b/tests/Bitcoin/TWBitcoinSigningTests.cpp
deleted file mode 100644
index f2c26b2691c..00000000000
--- a/tests/Bitcoin/TWBitcoinSigningTests.cpp
+++ /dev/null
@@ -1,1760 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base58.h"
-#include "Bitcoin/Address.h"
-#include "Bitcoin/OutPoint.h"
-#include "Bitcoin/Script.h"
-#include "Bitcoin/SegwitAddress.h"
-#include "Bitcoin/SigHashType.h"
-#include "Bitcoin/Transaction.h"
-#include "Bitcoin/TransactionBuilder.h"
-#include "Bitcoin/TransactionSigner.h"
-#include "Hash.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "TxComparisonHelper.h"
-#include "proto/Bitcoin.pb.h"
-
-#include <TrustWalletCore/TWBitcoinScript.h>
-#include <TrustWalletCore/TWCoinType.h>
-#include <TrustWalletCore/TWPublicKeyType.h>
-
-#include <cassert>
-#include <gtest/gtest.h>
-
-namespace TW::Bitcoin {
-
-// clang-format off
-SigningInput buildInputP2PKH(bool omitKey = false) {
-    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
-    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
-
-    // Setup input
-    SigningInput input;
-    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
-    input.amount = 335'790'000;
-    input.byteFee = 1;
-    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
-    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
-    input.coinType = TWCoinTypeBitcoin;
-
-    auto utxoKey0 = PrivateKey(parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
-    auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto utxoPubkeyHash0 = Hash::ripemd(Hash::sha256(pubKey0.bytes));
-    assert(hex(utxoPubkeyHash0) == "b7cd046b6d522a3d61dbcb5235c0e9cc97265457");
-    if (!omitKey) {
-        input.privateKeys.push_back(utxoKey0);
-    }
-
-    auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
-    auto pubKey1 = utxoKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto utxoPubkeyHash1 = Hash::ripemd(Hash::sha256(pubKey1.bytes));
-    assert(hex(utxoPubkeyHash1) == "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
-    if (!omitKey) {
-        input.privateKeys.push_back(utxoKey1);
-    }
-
-    auto utxo0Script = Script::buildPayToPublicKeyHash(utxoPubkeyHash0);
-    Data scriptHash;
-    utxo0Script.matchPayToPublicKeyHash(scriptHash);
-    assert(hex(scriptHash) == "b7cd046b6d522a3d61dbcb5235c0e9cc97265457");
-
-    UTXO utxo0;
-    utxo0.script = utxo0Script;
-    utxo0.amount = 625'000'000;
-    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
-    input.utxos.push_back(utxo0);
-
-    UTXO utxo1;
-    utxo1.script = Script(parse_hex("0014"
-                                    "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
-    utxo1.amount = 600'000'000;
-    utxo1.outPoint = OutPoint(hash1, 1, UINT32_MAX);
-    input.utxos.push_back(utxo1);
-
-    return input;
-}
-
-TEST(BitcoinSigning, SignP2PKH) {
-    auto input = buildInputP2PKH();
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {625'000'000}, 335'790'000, 226));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{228, 225, 226}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "01" // inputs
-            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "6a"  "47304402202819d70d4bec472113a1392cadc0860a7a1b34ea0869abb4bdce3290c3aba086022023eff75f410ad19cdbe6c6a017362bd554ce5fb906c13534ddc306be117ad30a012103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432"  "ffffffff"
-        "02" // outputs
-            "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "aefd3c1100000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2PKH_NegativeMissingKey) {
-    auto input = buildInputP2PKH(true);
-
-    {
-        // test plan (but do not reuse plan result). Plan works even with missing keys.
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {625'000'000}, 335'790'000, 226));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_missing_private_key);
-}
-
-TEST(BitcoinSigning, EncodeP2WPKH) {
-    auto unsignedTx = Transaction(1, 0x11);
-
-    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
-    auto outpoint0 = TW::Bitcoin::OutPoint(hash0, 0);
-    unsignedTx.inputs.emplace_back(outpoint0, Script(), 0xffffffee);
-
-    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
-    auto outpoint1 = TW::Bitcoin::OutPoint(hash1, 1);
-    unsignedTx.inputs.emplace_back(outpoint1, Script(), UINT32_MAX);
-
-    auto outScript0 = Script(parse_hex("76a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac"));
-    unsignedTx.outputs.emplace_back(112340000, outScript0);
-
-    auto outScript1 = Script(parse_hex("76a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac"));
-    unsignedTx.outputs.emplace_back(223450000, outScript1);
-
-    Data unsignedData;
-    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
-    ASSERT_EQ(unsignedData.size(), 164ul);
-    ASSERT_EQ(hex(unsignedData),
-        "01000000" // version
-        "0001" // marker & flag
-        "02" // inputs
-            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "00"  ""  "eeffffff"
-            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "202cb20600000000"  "19"  "76a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac"
-            "9093510d00000000"  "19"  "76a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac"
-        // witness
-            "00"
-            "00"
-        "11000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2WPKH_Bip143) {
-    // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki#native-p2wpkh
-
-    SigningInput input;
-    input.hashType = TWBitcoinSigHashTypeAll;
-    const auto amount = 112340000; // 0x06B22C20
-    input.amount = amount;
-    input.byteFee = 20; // not relevant
-    input.toAddress = "1Cu32FVupVCgHkMMRJdYJugxwo2Aprgk7H";
-    input.changeAddress = "16TZ8J6Q5iZKBWizWzFAYnrsaox5Z5aBRV";
-
-    const auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
-    const auto utxoKey0 = PrivateKey(parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
-    const auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(hex(pubKey0.bytes), "03c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432");
-
-    const auto utxo0Script = Script::buildPayToPublicKey(pubKey0.bytes);
-    Data key2;
-    utxo0Script.matchPayToPublicKey(key2);
-    EXPECT_EQ(hex(key2), hex(pubKey0.bytes));
-    input.privateKeys.push_back(utxoKey0);
-
-    const auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
-    const auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
-    const auto pubKey1 = utxoKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(hex(pubKey1.bytes), "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357");
-    const auto utxoPubkeyHash1 = Hash::ripemd(Hash::sha256(pubKey1.bytes));
-    EXPECT_EQ(hex(utxoPubkeyHash1), "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
-    input.privateKeys.push_back(utxoKey1);
-    input.lockTime = 0x11;
-
-    UTXO utxo0;
-    utxo0.script = utxo0Script;
-    utxo0.amount = 1000000; // note: this amount is not specified in the test
-    utxo0.outPoint = OutPoint(hash0, 0, 0xffffffee);
-    input.utxos.push_back(utxo0);
-
-    UTXO utxo1;
-    auto utxo1Script = Script::buildPayToV0WitnessProgram(utxoPubkeyHash1);
-    utxo1.script = utxo1Script;
-    utxo1.amount = 600000000; // 0x23C34600 0046c323
-    utxo1.outPoint = OutPoint(hash1, 1, UINT32_MAX);
-    input.utxos.push_back(utxo1);
-
-    // Set plan to force both UTXOs and exact output amounts
-    TransactionPlan plan;
-    plan.amount = amount;
-    plan.availableAmount = 600000000 + 1000000;
-    plan.fee = 265210000;    // very large, the amounts specified (in1, out0, out1) are not consistent/realistic
-    plan.change = 223450000; // 0x0d519390
-    plan.branchId = {0};
-    plan.utxos.push_back(utxo0);
-    plan.utxos.push_back(utxo1);
-    input.plan = plan;
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    const auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{343, 233, 261}));
-    // expected in one string for easy comparison/copy:
-    ASSERT_EQ(hex(serialized), "01000000000102fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f00000000494830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01eeffffffef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a0100000000ffffffff02202cb206000000001976a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac9093510d000000001976a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac000247304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee0121025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee635711000000");
-    // expected in structured format:
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "02" // inputs
-            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "4830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01"  "eeffffff"
-            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "202cb20600000000"  "19"  "76a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac"
-            "9093510d00000000"  "19"  "76a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac"
-        // witness
-            "00"
-            "02"
-                "47"  "304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee01"
-                "21"  "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"
-        "11000000" // nLockTime
-    );
-}
-
-SigningInput buildInputP2WPKH(int64_t amount, TWBitcoinSigHashType hashType, int64_t utxo0Amount, int64_t utxo1Amount, bool useMaxAmount = false) {
-    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
-    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
-
-    // Setup input
-    SigningInput input;
-    input.hashType = hashType;
-    input.amount = amount;
-    input.useMaxAmount = useMaxAmount;
-    input.byteFee = 1;
-    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
-    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
-    input.coinType = TWCoinTypeBitcoin;
-
-    auto utxoKey0 = PrivateKey(parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
-    auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto utxoPubkeyHash0 = Hash::ripemd(Hash::sha256(pubKey0.bytes));
-    assert(hex(utxoPubkeyHash0) == "b7cd046b6d522a3d61dbcb5235c0e9cc97265457");
-    input.privateKeys.push_back(utxoKey0);
-
-    auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
-    auto pubKey1 = utxoKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto utxoPubkeyHash1 = Hash::ripemd(Hash::sha256(pubKey1.bytes));
-    assert(hex(utxoPubkeyHash1) == "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
-    input.privateKeys.push_back(utxoKey1);
-
-    auto scriptPub1 = Script(parse_hex("0014"
-                                       "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
-    Data scriptHash;
-    scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
-    auto scriptHashHex = hex(scriptHash);
-    assert(scriptHashHex == "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
-
-    auto redeemScript = Script::buildPayToPublicKeyHash(parse_hex("1d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
-    input.scripts[scriptHashHex] = redeemScript;
-
-    UTXO utxo0;
-    utxo0.script = Script(parse_hex("2103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432ac"));
-    utxo0.amount = utxo0Amount;
-    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
-    input.utxos.push_back(utxo0);
-
-    UTXO utxo1;
-    utxo1.script = Script(parse_hex("0014"
-                                    "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
-    utxo1.amount = utxo1Amount;
-    utxo1.outPoint = OutPoint(hash1, 1, UINT32_MAX);
-    input.utxos.push_back(utxo1);
-
-    return input;
-}
-
-TEST(BitcoinSigning, SignP2WPKH) {
-    auto input = buildInputP2WPKH(335'790'000, TWBitcoinSigHashTypeAll, 625'000'000, 600'000'000);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {625'000'000}, 335'790'000, 192));
-    }
-
-    // Signs
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{195, 192, 193}));
-    EXPECT_EQ(serialized.size(), 192ul);
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "01" // inputs
-            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100c327babdd370f0fc5b24cf920736446bf7d9c5660e4a5f7df432386fd652fe280220269c4fc3690c1c248e50c8bf2435c20b4ef00f308b403575f4437f862a91c53a01"  "ffffffff"
-        "02" // outputs
-            "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "d0fd3c1100000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        "00000000" // nLockTime
-    );
-
-    {
-        // Non-segwit encoded, for comparison
-        Data serialized_;
-        signedTx.encode(serialized_, Transaction::SegwitFormatMode::NonSegwit);
-        EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{195, 192, 193}));
-        EXPECT_EQ(serialized_.size(), 192ul);
-        ASSERT_EQ(hex(serialized_), // printed using prettyPrintTransaction
-            "01000000" // version
-            "01" // inputs
-                "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100c327babdd370f0fc5b24cf920736446bf7d9c5660e4a5f7df432386fd652fe280220269c4fc3690c1c248e50c8bf2435c20b4ef00f308b403575f4437f862a91c53a01"  "ffffffff"
-            "02" // outputs
-                "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-                "d0fd3c1100000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-            "00000000" // nLockTime
-        );
-    }
-}
-
-TEST(BitcoinSigning, SignP2WPKH_HashSingle_TwoInput) {
-    auto input = buildInputP2WPKH(335'790'000, TWBitcoinSigHashTypeSingle, 210'000'000, 210'000'000);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {210'000'000, 210'000'000}, 335'790'000, 261));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{343, 233, 261}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "02" // inputs
-            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100fd8591c3611a07b55f509ec850534c7a9c49713c9b8fa0e844ea06c2e65e19d702205e3806676192e790bc93dd4c28e937c4bf97b15f189158ba1a30d7ecff5ee75503"  "ffffffff"
-            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "4bf0040500000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        // witness
-            "00"
-            "02"  "47"  "30440220096d20c7e92f991c2bf38dc28118feb34019ae74ec1c17179b28cb041de7517402204594f46a911f24bdc7109ca192e6860ebf2f3a0087579b3c128d5ce0cd5ed46803"  "21"  "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2WPKH_HashAnyoneCanPay_TwoInput) {
-    auto input = buildInputP2WPKH(335'790'000, TWBitcoinSigHashTypeAnyoneCanPay, 210'000'000, 210'000'000);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {210'000'000, 210'000'000}, 335'790'000, 261));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{344, 233, 261}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "02" // inputs
-            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100e21fb2f1cfd59bdb3703fd45db38fd680d0c06e5d0be86fb7dc233c07ee7ab2f02207367220a73e43df4352a6831f6f31d8dc172c83c9f613a9caf679f0f15621c5e80"  "ffffffff"
-            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "4bf0040500000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        // witness
-            "00"
-            "02"  "48"  "304502210095f9cc913d2f0892b953f2380112533e8930b67c53e00a7bbd7a01d547156adc022026efe3a684aa7432a00a919dbf81b63e635fb92d3149453e95b4a7ccea59f7c480"  "21"  "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2WPKH_MaxAmount) {
-    auto input = buildInputP2WPKH(1'000, TWBitcoinSigHashTypeAll, 625'000'000, 600'000'000, true);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {625'000'000, 600'000'000}, 1224999773, 227));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{310, 199, 227}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "02" // inputs
-            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100a8b3c1619e985923994e80efdc0be0eac12f2419e11ce5e4286a0a5ac27c775d02205d6feee85ffe19ae0835cba1562beb3beb172107cd02ac4caf24a8be3749811f01"  "ffffffff"
-            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
-        "01" // outputs
-            "5d03044900000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-        // witness
-            "00"
-            "02"  "48"  "3045022100db1199de92f6fb638a0ba706d13ec686bb01138a254dec2c397616cd74bad30e02200d7286d6d2d4e00d145955bf3d3b848b03c0d1eef8899e4645687a3035d7def401"  "21"  "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, EncodeP2WSH) {
-    auto unsignedTx = Transaction(1);
-
-    auto outpoint0 = OutPoint(parse_hex("0001000000000000000000000000000000000000000000000000000000000000"), 0);
-    unsignedTx.inputs.emplace_back(outpoint0, Script(), UINT32_MAX);
-
-    auto outScript0 = Script(parse_hex("76a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac"));
-    unsignedTx.outputs.emplace_back(1000, outScript0);
-
-    Data unsignedData;
-    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::NonSegwit);
-    ASSERT_EQ(hex(unsignedData),
-        "01000000" // version
-        "01" // inputs
-            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
-        "01" // outputs
-            "e803000000000000"  "19"  "76a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac"
-        "00000000" // nLockTime
-    );
-}
-
-SigningInput buildInputP2WSH(enum TWBitcoinSigHashType hashType, bool omitScript = false, bool omitKeys = false) {
-    SigningInput input;
-    input.hashType = hashType;
-    input.amount = 1000;
-    input.byteFee = 1;
-    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
-    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
-
-    if (!omitKeys) {
-        auto utxoKey0 = PrivateKey(parse_hex("ed00a0841cd53aedf89b0c616742d1d2a930f8ae2b0fb514765a17bb62c7521a"));
-        input.privateKeys.push_back(utxoKey0);
-
-        auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
-        input.privateKeys.push_back(utxoKey1);
-    }
-
-    if (!omitScript) {
-        auto redeemScript = Script(parse_hex("2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"));
-        auto scriptHash = "593128f9f90e38b706c18623151e37d2da05c229";
-        input.scripts[scriptHash] = redeemScript;
-    }
-
-    UTXO utxo0;
-    auto p2wsh = Script::buildPayToWitnessScriptHash(parse_hex("ff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3db"));
-    utxo0.script = p2wsh;
-    utxo0.amount = 1226;
-    auto hash0 = parse_hex("0001000000000000000000000000000000000000000000000000000000000000");
-    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
-    input.utxos.push_back(utxo0);
-
-    return input;
-}
-
-TEST(BitcoinSigning, SignP2WSH) {
-    // Setup input
-    const auto input = buildInputP2WSH(hashTypeForCoin(TWCoinTypeBitcoin));
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{231, 119, 147}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "e803000000000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "4f00000000000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        // witness
-            "02"  "48"  "30450221009eefc1befe96158f82b74e6804f1f713768c6172636ca11fcc975c316ea86f75022057914c48bc24f717498b851a47a2926f96242e3943ebdf08d5a97a499efc8b9001"  "23"  "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2WSH_HashNone) {
-    // Setup input
-    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeNone);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{231, 119, 147}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "e803000000000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "4f00000000000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        // witness
-            "02"  "48"  "3045022100caa585732cfc50226a90834a306d23d5d2ab1e94af2c66136a637e3d9bad3688022069028750908e53a663bb1f434fd655bcc0cf8d394c6fa1fd5a4983790135722e02"  "23"  "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2WSH_HashSingle) {
-    // Setup input
-    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeSingle);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{230, 119, 147}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "e803000000000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "4f00000000000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        // witness
-            "02"  "47"  "304402201ba80b2c48fe82915297dc9782ae2141e40263001fafd21b02c04a092503f01e0220666d6c63475c6c52abd09371c200ac319bcf4a7c72eb3782e95790f5c847f0b903"  "23"  "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2WSH_HashAnyoneCanPay) {
-    // Setup input
-    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeAnyoneCanPay);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(serialized.size(), 231ul);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{231, 119, 147}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "e803000000000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "4f00000000000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        // witness
-            "02"  "48"  "3045022100d14699fc9b7337768bcd1430098d279cfaf05f6abfa75dd542da2dc038ae1700022063f0751c08796c086ac23b39c25f4320f432092e0c11bec46af0723cc4f55a3980"  "23"  "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2WSH_NegativeMissingScript) {
-    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll, true);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 174));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_script_redeem);
-}
-
-TEST(BitcoinSigning, SignP2WSH_NegativeMissingKeys) {
-    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll, false, true);
-
-    {
-        // test plan (but do not reuse plan result). Plan works even with missing keys.
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_missing_private_key);
-}
-
-TEST(BitcoinSigning, SignP2WSH_NegativePlanWithError) {
-    // Setup input
-    auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll);
-    input.plan = TransactionBuilder::plan(input);
-    input.plan->error = Common::Proto::Error_missing_input_utxos;
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
-}
-
-TEST(BitcoinSigning, SignP2WSH_NegativeNoUTXOs) {
-    // Setup input
-    auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll);
-    input.utxos.clear();
-    ASSERT_FALSE(input.plan.has_value());
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
-}
-
-TEST(BitcoinSigning, SignP2WSH_NegativePlanWithNoUTXOs) {
-    // Setup input
-    auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll);
-    input.plan = TransactionBuilder::plan(input);
-    input.plan->utxos.clear();
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
-}
-
-TEST(BitcoinSigning, EncodeP2SH_P2WPKH) {
-    auto unsignedTx = Transaction(1, 0x492);
-
-    auto outpoint0 = OutPoint(parse_hex("db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477"), 1);
-    unsignedTx.inputs.emplace_back(outpoint0, Script(), 0xfffffffe);
-
-    auto outScript0 = Script(parse_hex("76a914a457b684d7f0d539a46a45bbc043f35b59d0d96388ac"));
-    unsignedTx.outputs.emplace_back(199'996'600, outScript0);
-
-    auto outScript1 = Script(parse_hex("76a914fd270b1ee6abcaea97fea7ad0402e8bd8ad6d77c88ac"));
-    unsignedTx.outputs.emplace_back(800'000'000, outScript1);
-
-    Data unsignedData;
-    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::NonSegwit);
-    ASSERT_EQ(hex(unsignedData),
-        "01000000" // version
-        "01" // inputs
-            "db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477"  "01000000"  "00"  ""  "feffffff"
-        "02" // outputs
-            "b8b4eb0b00000000"  "19"  "76a914a457b684d7f0d539a46a45bbc043f35b59d0d96388ac"
-            "0008af2f00000000"  "19"  "76a914fd270b1ee6abcaea97fea7ad0402e8bd8ad6d77c88ac"
-        "92040000" // nLockTime
-    );
-}
-
-SigningInput buildInputP2SH_P2WPKH(bool omitScript = false, bool omitKeys = false, bool invalidOutputScript = false, bool invalidRedeemScript = false) {
-    // Setup input
-    SigningInput input;
-    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
-    input.amount = 200'000'000;
-    input.byteFee = 1;
-    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
-    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
-    input.coinType = TWCoinTypeBitcoin;
-
-    auto utxoKey0 = PrivateKey(parse_hex("eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf"));
-    auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(pubKey0.bytes));
-    assert(hex(utxoPubkeyHash) == "79091972186c449eb1ded22b78e40d009bdf0089");
-    if (!omitKeys) {
-        input.privateKeys.push_back(utxoKey0);
-    }
-
-    if (!omitScript && !invalidRedeemScript) {
-        auto redeemScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
-        auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
-        assert(hex(scriptHash) == "4733f37cf4db86fbc2efed2500b4f4e49f312023");
-        input.scripts[hex(scriptHash)] = redeemScript;
-    } else if (invalidRedeemScript) {
-        auto redeemScript = Script(parse_hex("FAFBFCFDFE"));
-        auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
-        input.scripts[hex(scriptHash)] = redeemScript;
-    }
-
-    UTXO utxo0;
-    auto utxo0Script = Script(parse_hex("a9144733f37cf4db86fbc2efed2500b4f4e49f31202387"));
-    if (invalidOutputScript) {
-        utxo0Script = Script(parse_hex("FFFEFDFCFB"));
-    }
-    utxo0.script = utxo0Script;
-    utxo0.amount = 1'000'000'000;
-    auto hash0 = parse_hex("db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477");
-    utxo0.outPoint = OutPoint(hash0, 1, UINT32_MAX);
-    input.utxos.push_back(utxo0);
-
-    return input;
-}
-
-TEST(BitcoinSigning, SignP2SH_P2WPKH) {
-    auto input = buildInputP2SH_P2WPKH();
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 170));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{251, 142, 170}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477"  "01000000"  "17"  "16001479091972186c449eb1ded22b78e40d009bdf0089"  "ffffffff"
-        "02" // outputs
-            "00c2eb0b00000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "5607af2f00000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        // witness
-            "02"  "47"  "3044022062b408cc7f92c8add622f3297b8992d68403849c6421ef58274ed6fc077102f30220250696eacc0aad022f55882d742dda7178bea780c03705bf9cdbee9f812f785301"  "21"  "03ad1d8e89212f0b92c74d23bb710c00662ad1470198ac48c43f7d6f93a2a26873"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2SH_P2WPKH_NegativeOmitScript) {
-    auto input = buildInputP2SH_P2WPKH(true, false);
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 174));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_script_redeem);
-}
-
-TEST(BitcoinSigning, SignP2SH_P2WPKH_NegativeInvalidOutputScript) {
-    auto input = buildInputP2SH_P2WPKH(false, false, true);
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 174));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_script_output);
-}
-
-TEST(BitcoinSigning, SignP2SH_P2WPKH_NegativeInvalidRedeemScript) {
-    auto input = buildInputP2SH_P2WPKH(false, false, false, true);
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 174));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_script_redeem);
-}
-
-TEST(BitcoinSigning, SignP2SH_P2WPKH_NegativeOmitKeys) {
-    auto input = buildInputP2SH_P2WPKH(false, true);
-    {
-        // test plan (but do not reuse plan result). Plan works even with missing keys.
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 170));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_missing_private_key);
-}
-
-TEST(BitcoinSigning, EncodeP2SH_P2WSH) {
-    auto unsignedTx = Transaction(1);
-
-    auto hash0 = parse_hex("36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e");
-    auto outpoint0 = OutPoint(hash0, 1);
-    unsignedTx.inputs.emplace_back(outpoint0, Script(), 0xffffffff);
-
-    auto outScript0 = Script(parse_hex("76a914389ffce9cd9ae88dcc0631e88a821ffdbe9bfe2688ac"));
-    unsignedTx.outputs.emplace_back(0x0000000035a4e900, outScript0);
-
-    auto outScript1 = Script(parse_hex("76a9147480a33f950689af511e6e84c138dbbd3c3ee41588ac"));
-    unsignedTx.outputs.emplace_back(0x00000000052f83c0, outScript1);
-
-    Data unsignedData;
-    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::NonSegwit);
-    ASSERT_EQ(hex(unsignedData),
-        "01000000" // version
-        "01" // inputs
-            "36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e"  "01000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "00e9a43500000000"  "19"  "76a914389ffce9cd9ae88dcc0631e88a821ffdbe9bfe2688ac"
-            "c0832f0500000000"  "19"  "76a9147480a33f950689af511e6e84c138dbbd3c3ee41588ac"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, SignP2SH_P2WSH) {
-    // Setup signing input
-    SigningInput input;
-    input.amount = 900000000;
-    input.hashType = (TWBitcoinSigHashType)0;
-    input.toAddress = "16AQVuBMt818u2HBcbxztAZTT2VTDKupPS";
-    input.changeAddress = "1Bd1VA2bnLjoBk4ook3H19tZWETk8s6Ym5";
-
-    auto key0 = parse_hex("730fff80e1413068a05b57d6a58261f07551163369787f349438ea38ca80fac6");
-    input.privateKeys.push_back(PrivateKey(key0));
-    auto key1 = parse_hex("11fa3d25a17cbc22b29c44a484ba552b5a53149d106d3d853e22fdd05a2d8bb3");
-    input.privateKeys.push_back(PrivateKey(key1));
-    auto key2 = parse_hex("77bf4141a87d55bdd7f3cd0bdccf6e9e642935fec45f2f30047be7b799120661");
-    input.privateKeys.push_back(PrivateKey(key2));
-    auto key3 = parse_hex("14af36970f5025ea3e8b5542c0f8ebe7763e674838d08808896b63c3351ffe49");
-    input.privateKeys.push_back(PrivateKey(key3));
-    auto key4 = parse_hex("fe9a95c19eef81dde2b95c1284ef39be497d128e2aa46916fb02d552485e0323");
-    input.privateKeys.push_back(PrivateKey(key4));
-    auto key5 = parse_hex("428a7aee9f0c2af0cd19af3cf1c78149951ea528726989b2e83e4778d2c3f890");
-    input.privateKeys.push_back(PrivateKey(key5));
-
-    auto redeemScript = Script::buildPayToWitnessScriptHash(parse_hex("a16b5755f7f6f96dbd65f5f0d6ab9418b89af4b1f14a1bb8a09062c35f0dcb54"));
-    auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
-    input.scripts[hex(scriptHash)] = redeemScript;
-
-    auto witnessScript = Script(parse_hex(
-        "56"
-            "210307b8ae49ac90a048e9b53357a2354b3334e9c8bee813ecb98e99a7e07e8c3ba3"
-            "2103b28f0c28bfab54554ae8c658ac5c3e0ce6e79ad336331f78c428dd43eea8449b"
-            "21034b8113d703413d57761b8b9781957b8c0ac1dfe69f492580ca4195f50376ba4a"
-            "21033400f6afecb833092a9a21cfdf1ed1376e58c5d1f47de74683123987e967a8f4"
-            "2103a6d48b1131e94ba04d9737d61acdaa1322008af9602b3b14862c07a1789aac16"
-            "2102d8b661b0b3302ee2f162b09e07a55ad5dfbe673a9f01d9f0c19617681024306b"
-        "56ae"
-    ));
-    auto witnessScriptHash = Hash::ripemd(Hash::sha256(witnessScript.bytes));
-    input.scripts[hex(witnessScriptHash)] = witnessScript;
-
-    auto utxo0Script = Script(parse_hex("a9149993a429037b5d912407a71c252019287b8d27a587"));
-    UTXO utxo;
-    utxo.outPoint = OutPoint(parse_hex("36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e"), 1, UINT32_MAX);
-    utxo.script = utxo0Script;
-    utxo.amount = 987654321;
-    input.utxos.push_back(utxo);
-
-    TransactionPlan plan;
-    plan.amount = input.amount;
-    plan.availableAmount = input.utxos[0].amount;
-    plan.change = 87000000;
-    plan.fee = plan.availableAmount - plan.amount - plan.change;
-    plan.utxos = input.utxos;
-    input.plan = plan;
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    auto expected =
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e"  "01000000"  "23"  "220020a16b5755f7f6f96dbd65f5f0d6ab9418b89af4b1f14a1bb8a09062c35f0dcb54"  "ffffffff"
-        "02" // outputs
-            "00e9a43500000000"  "19"  "76a914389ffce9cd9ae88dcc0631e88a821ffdbe9bfe2688ac"
-            "c0832f0500000000"  "19"  "76a9147480a33f950689af511e6e84c138dbbd3c3ee41588ac"
-        // witness
-            "08"
-                "00"  ""
-                "47"  "304402201992f5426ae0bab04cf206d7640b7e00410297bfe5487637f6c2427ee8496be002204ad4e64dc2d269f593cc4820db1fc1e8dc34774f602945115ce485940e05c64200"
-                "47"  "304402201e412363fa554b994528fd44149f3985b18bb901289ef6b71105b27c7d0e336c0220595e4a1e67154337757562ed5869127533e3e5084c3c2e128518f5f0b85b721800"
-                "47"  "3044022003b0a20ccf545b3f12c5ade10db8717e97b44da2e800387adfd82c95caf529d902206aee3a2395530d52f476d0ddd9d20ba062820ae6f4e1be4921c3630395743ad900"
-                "48"  "3045022100ed7a0eeaf72b84351bceac474b0c0510f67065b1b334f77e6843ed102f968afe022004d97d0cfc4bf5651e46487d6f87bd4af6aef894459f9778f2293b0b2c5b7bc700"
-                "48"  "3045022100934a0c364820588154aed2d519cbcc61969d837b91960f4abbf0e374f03aa39d022036b5c58b754bd44cb5c7d34806c89d9778ea1a1c900618a841e9fbfbe805ff9b00"
-                "47"  "3044022044e3b59b06931d46f857c82fa1d53d89b116a40a581527eac35c5eb5b7f0785302207d0f8b5d063ffc6749fb4e133db7916162b540c70dee40ec0b21e142d8843b3a00"
-                "cf"  "56210307b8ae49ac90a048e9b53357a2354b3334e9c8bee813ecb98e99a7e07e8c3ba32103b28f0c28bfab54554ae8c658ac5c3e0ce6e79ad336331f78c428dd43eea8449b21034b8113d703413d57761b8b9781957b8c0ac1dfe69f492580ca4195f50376ba4a21033400f6afecb833092a9a21cfdf1ed1376e58c5d1f47de74683123987e967a8f42103a6d48b1131e94ba04d9737d61acdaa1322008af9602b3b14862c07a1789aac162102d8b661b0b3302ee2f162b09e07a55ad5dfbe673a9f01d9f0c19617681024306b56ae"
-        "00000000" // nLockTime
-        ;
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{800, 154, 316}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), expected);
-}
-
-TEST(BitcoinSigning, Sign_NegativeNoUtxos) {
-    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
-    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
-
-    // Setup input
-    SigningInput input;
-    input.hashType = TWBitcoinSigHashTypeAll;
-    input.amount = 335'790'000;
-    input.byteFee = 1;
-    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
-    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
-
-    auto scriptPub1 = Script(parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
-    Data scriptHash;
-    scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
-    auto scriptHashHex = hex(scriptHash);
-    ASSERT_EQ(scriptHashHex, "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
-
-    auto redeemScript = Script::buildPayToPublicKeyHash(scriptHash);
-    input.scripts[scriptHashHex] = redeemScript;
-
-    {
-        // plan returns empty, as there are 0 utxos
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {}, 0, 0, Common::Proto::Error_missing_input_utxos));
-    }
-
-    // Invoke Sign nonetheless
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    // Fails as there are 0 utxos
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
-}
-
-TEST(BitcoinSigning, Sign_NegativeInvalidAddress) {
-    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
-    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
-
-    // Setup input
-    SigningInput input;
-    input.hashType = TWBitcoinSigHashTypeAll;
-    input.amount = 335'790'000;
-    input.byteFee = 1;
-    input.toAddress = "THIS-IS-NOT-A-BITCOIN-ADDRESS";
-    input.changeAddress = "THIS-IS-NOT-A-BITCOIN-ADDRESS-EITHER";
-
-    auto utxoKey0 = PrivateKey(parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
-    input.privateKeys.push_back(utxoKey0);
-
-    auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
-    input.privateKeys.push_back(utxoKey1);
-
-    auto scriptPub1 = Script(parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
-    Data scriptHash;
-    scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
-    auto scriptHashHex = hex(scriptHash);
-    ASSERT_EQ(scriptHashHex, "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
-
-    auto redeemScript = Script::buildPayToPublicKeyHash(scriptHash);
-    input.scripts[scriptHashHex] = redeemScript;
-
-    UTXO utxo0;
-    auto utxo0Script = Script(parse_hex("2103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432ac"));
-    utxo0.script = utxo0Script;
-    utxo0.amount = 625'000'000;
-    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
-    input.utxos.push_back(utxo0);
-
-    UTXO utxo1;
-    auto utxo1Script = Script(parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
-    utxo1.script = utxo1Script;
-    utxo1.amount = 600'000'000;
-    utxo1.outPoint = OutPoint(hash1, 1, UINT32_MAX);
-    input.utxos.push_back(utxo1);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(std::move(input));
-        EXPECT_TRUE(verifyPlan(plan, {625'000'000}, 335'790'000, 174));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_FALSE(result);
-    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
-}
-
-TEST(BitcoinSigning, Plan_10input_MaxAmount) {
-    auto ownAddress = "bc1q0yy3juscd3zfavw76g4h3eqdqzda7qyf58rj4m";
-    auto ownPrivateKey = "eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf";
-
-    SigningInput input;
-
-    for (int i = 0; i < 10; ++i) {
-        auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
-        Data keyHash;
-        EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
-        EXPECT_EQ(hex(keyHash), "79091972186c449eb1ded22b78e40d009bdf0089");
-
-        auto redeemScript = Script::buildPayToPublicKeyHash(keyHash);
-        input.scripts[std::string(keyHash.begin(), keyHash.end())] = redeemScript;
-
-        UTXO utxo;
-        utxo.script = utxoScript;
-        utxo.amount = 1'000'000 + i * 10'000;
-        auto hash = parse_hex("a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407");
-        std::reverse(hash.begin(), hash.end());
-        utxo.outPoint = OutPoint(hash, 0, UINT32_MAX);
-        input.utxos.push_back(utxo);
-    }
-
-    input.coinType = TWCoinTypeBitcoin;
-    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
-    input.useMaxAmount = true;
-    input.amount = 2'000'000;
-    input.byteFee = 1;
-    input.toAddress = "bc1qauwlpmzamwlf9tah6z4w0t8sunh6pnyyjgk0ne";
-    input.changeAddress = ownAddress;
-
-    // Plan.
-    // Estimated size: witness size: 10 * (1 + 1 + 72 + 1 + 33) + 2 = 1082; base 451; raw 451 + 1082 = 1533; vsize 451 + 1082/4 --> 722
-    // Actual size:    witness size:                                  1078; base 451; raw 451 + 1078 = 1529; vsize 451 + 1078/4 --> 721
-    auto plan = TransactionBuilder::plan(input);
-    EXPECT_TRUE(verifyPlan(plan, {1'000'000, 1'010'000, 1'020'000, 1'030'000, 1'040'000, 1'050'000, 1'060'000, 1'070'000, 1'080'000, 1'090'000}, 10'449'278, 722));
-
-    // Extend input with keys, reuse plan, Sign
-    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
-    input.privateKeys.push_back(privKey);
-    input.plan = plan;
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{1529, 451, 721}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-
-    ASSERT_EQ(serialized.size(), 1529ul);
-}
-
-TEST(BitcoinSigning, Sign_LitecoinReal_a85f) {
-    auto coin = TWCoinTypeLitecoin;
-    auto ownAddress = "ltc1qt36tu30tgk35tyzsve6jjq3dnhu2rm8l8v5q00";
-    auto ownPrivateKey = "b820f41f96c8b7442f3260acd23b3897e1450b8c7c6580136a3c2d3a14e34674";
-
-    // Setup input
-    SigningInput input;
-    input.coinType = coin;
-    input.hashType = hashTypeForCoin(coin);
-    input.amount = 3'899'774;
-    input.useMaxAmount = true;
-    input.byteFee = 1;
-    input.toAddress = "ltc1q0dvup9kzplv6yulzgzzxkge8d35axkq4n45hum";
-    input.changeAddress = ownAddress;
-
-    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
-    input.privateKeys.push_back(privKey);
-
-    auto utxo0Script = Script::lockScriptForAddress(ownAddress, coin);
-    Data keyHash0;
-    EXPECT_TRUE(utxo0Script.matchPayToWitnessPublicKeyHash(keyHash0));
-    EXPECT_EQ(hex(keyHash0), "5c74be45eb45a3459050667529022d9df8a1ecff");
-
-    auto redeemScript = Script::buildPayToPublicKeyHash(keyHash0);
-    input.scripts[std::string(keyHash0.begin(), keyHash0.end())] = redeemScript;
-
-    UTXO utxo0;
-    utxo0.script = utxo0Script;
-    utxo0.amount = 3'900'000;
-    auto hash0 = parse_hex("7051cd18189401a844abf0f9c67e791315c4c154393870453f8ad98a818efdb5");
-    std::reverse(hash0.begin(), hash0.end());
-    utxo0.outPoint = OutPoint(hash0, 9, UINT32_MAX - 1);
-    input.utxos.push_back(utxo0);
-
-    // set plan, to match real tx
-    TransactionPlan plan;
-    plan.availableAmount = 3'900'000;
-    plan.amount = 3'899'774;
-    plan.fee = 226;
-    plan.change = 0;
-    plan.utxos.push_back(input.utxos[0]);
-    input.plan = plan;
-    EXPECT_TRUE(verifyPlan(input.plan.value(), {3'900'000}, 3'899'774, 226));
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-
-    // https://blockchair.com/litecoin/transaction/a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "b5fd8e818ad98a3f4570383954c1c41513797ec6f9f0ab44a801941818cd5170"  "09000000"  "00"  ""  "feffffff"
-        "01" // outputs
-            "7e813b0000000000"  "16"  "00147b59c096c20fd9a273e240846b23276c69d35815"
-        // witness
-            "02"
-                "47"  "3044022029153096af176f9cca0ba9b827e947689a8bb8d11dda570c880f9108bc590b3002202410c78b666722ade1ef4547ad85a128ddcbd4695c40f942457bea3d043b9bb301"
-                "21"  "036739829f2cfec79cfe6aaf1c22ecb7d4867dfd8ab4deb7121b36a00ab646caed"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, PlanAndSign_LitecoinReal_8435) {
-    auto coin = TWCoinTypeLitecoin;
-    auto ownAddress = "ltc1q0dvup9kzplv6yulzgzzxkge8d35axkq4n45hum";
-    auto ownPrivateKey = "690b34763f34e0226ad2a4d47098269322e0402f847c97166e8f39959fcaff5a";
-
-    // Setup input for Plan
-    SigningInput input;
-    input.coinType = coin;
-    input.hashType = hashTypeForCoin(coin);
-    input.amount = 1'200'000;
-    input.useMaxAmount = false;
-    input.byteFee = 1;
-    input.toAddress = "ltc1qt36tu30tgk35tyzsve6jjq3dnhu2rm8l8v5q00";
-    input.changeAddress = ownAddress;
-
-    auto utxo0Script = Script::lockScriptForAddress(ownAddress, coin);
-    Data keyHash0;
-    EXPECT_TRUE(utxo0Script.matchPayToWitnessPublicKeyHash(keyHash0));
-    EXPECT_EQ(hex(keyHash0), "7b59c096c20fd9a273e240846b23276c69d35815");
-
-    auto redeemScript = Script::buildPayToPublicKeyHash(keyHash0);
-    input.scripts[std::string(keyHash0.begin(), keyHash0.end())] = redeemScript;
-
-    UTXO utxo0;
-    utxo0.script = utxo0Script;
-    utxo0.amount = 3'899'774;
-    auto hash0 = parse_hex("a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407");
-    std::reverse(hash0.begin(), hash0.end());
-    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
-    input.utxos.push_back(utxo0);
-
-    // Plan
-    auto plan = TransactionBuilder::plan(input);
-    EXPECT_TRUE(verifyPlan(plan, {3'899'774}, 1'200'000, 141));
-
-    // Extend input with keys and plan, for Sign
-    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
-    input.privateKeys.push_back(privKey);
-    input.plan = plan;
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{222, 113, 141}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-
-    // https://blockchair.com/litecoin/transaction/8435d205614ee70066060734adf03af4194d0c3bc66dd01bb124ab7fd25e2ef8
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8"  "00000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "804f120000000000"  "16"  "00145c74be45eb45a3459050667529022d9df8a1ecff"
-            "7131290000000000"  "16"  "00147b59c096c20fd9a273e240846b23276c69d35815"
-        // witness
-            "02"
-                "47"  "304402204139b82927dd80445f27a5d2c29fa4881dbd2911714452a4a706145bc43cc4bf022016fbdf4b09bc5a9c43e79edb1c1061759779a20c35535082bdc469a61ed0771f01"
-                "21"  "02499e327a05cc8bb4b3c34c8347ecfcb152517c9927c092fa273be5379fde3226"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, Sign_ManyUtxos_400) {
-    auto ownAddress = "bc1q0yy3juscd3zfavw76g4h3eqdqzda7qyf58rj4m";
-    auto ownPrivateKey = "eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf";
-
-    // Setup input
-    SigningInput input;
-
-    const auto n = 400;
-    uint64_t utxoSum = 0;
-    for (int i = 0; i < n; ++i) {
-        auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
-        Data keyHash;
-        EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
-        EXPECT_EQ(hex(keyHash), "79091972186c449eb1ded22b78e40d009bdf0089");
-
-        auto redeemScript = Script::buildPayToPublicKeyHash(keyHash);
-        input.scripts[std::string(keyHash.begin(), keyHash.end())] = redeemScript;
-
-        UTXO utxo;
-        utxo.script = utxoScript;
-        utxo.amount = 1000 + (i + 1) * 10;
-        auto hash = parse_hex("a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407");
-        std::reverse(hash.begin(), hash.end());
-        utxo.outPoint = OutPoint(hash, 0, UINT32_MAX);
-        input.utxos.push_back(utxo);
-        utxoSum += utxo.amount;
-    }
-    EXPECT_EQ(utxoSum, 1'202'000ul);
-
-    input.coinType = TWCoinTypeBitcoin;
-    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
-    input.useMaxAmount = false;
-    input.amount = 300'000;
-    input.byteFee = 1;
-    input.toAddress = "bc1qauwlpmzamwlf9tah6z4w0t8sunh6pnyyjgk0ne";
-    input.changeAddress = ownAddress;
-
-    // Plan
-    auto plan = TransactionBuilder::plan(input);
-
-    // expected result: 66 utxos, with the largest amounts
-    std::vector<int64_t> subset;
-    uint64_t subsetSum = 0;
-    for (int i = n - 66; i < n; ++i) {
-        const uint64_t val = 1000 + (i + 1) * 10;
-        subset.push_back(val);
-        subsetSum += val;
-    }
-    EXPECT_EQ(subset.size(), 66ul);
-    EXPECT_EQ(subsetSum, 308'550ul);
-    EXPECT_TRUE(verifyPlan(plan, subset, 300'000, 4'561));
-
-    // Extend input with keys, reuse plan, Sign
-    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
-    input.privateKeys.push_back(privKey);
-    input.plan = plan;
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-
-    EXPECT_EQ(serialized.size(), 9871ul);
-}
-
-TEST(BitcoinSigning, Sign_ManyUtxos_2000) {
-    auto ownAddress = "bc1q0yy3juscd3zfavw76g4h3eqdqzda7qyf58rj4m";
-    auto ownPrivateKey = "eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf";
-
-    // Setup input
-    SigningInput input;
-
-    const auto n = 2000;
-    uint64_t utxoSum = 0;
-    for (int i = 0; i < n; ++i) {
-        auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
-        Data keyHash;
-        EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
-        EXPECT_EQ(hex(keyHash), "79091972186c449eb1ded22b78e40d009bdf0089");
-
-        auto redeemScript = Script::buildPayToPublicKeyHash(keyHash);
-        input.scripts[std::string(keyHash.begin(), keyHash.end())] = redeemScript;
-
-        UTXO utxo;
-        utxo.script = utxoScript;
-        utxo.amount = 1000 + (i + 1) * 10;
-        auto hash = parse_hex("a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407");
-        std::reverse(hash.begin(), hash.end());
-        utxo.outPoint = OutPoint(hash, 0, UINT32_MAX);
-        input.utxos.push_back(utxo);
-        utxoSum += utxo.amount;
-    }
-    EXPECT_EQ(utxoSum, 22'010'000ul);
-
-    input.coinType = TWCoinTypeBitcoin;
-    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
-    input.useMaxAmount = false;
-    input.amount = 2'000'000;
-    input.byteFee = 1;
-    input.toAddress = "bc1qauwlpmzamwlf9tah6z4w0t8sunh6pnyyjgk0ne";
-    input.changeAddress = ownAddress;
-
-    // Plan
-    auto plan = TransactionBuilder::plan(input);
-
-    // expected result: 601 utxos (smaller ones)
-    std::vector<int64_t> subset;
-    uint64_t subsetSum = 0;
-    for (int i = 0; i < 601; ++i) {
-        const uint64_t val = 1000 + (i + 1) * 10;
-        subset.push_back(val);
-        subsetSum += val;
-    }
-    EXPECT_EQ(subset.size(), 601ul);
-    EXPECT_EQ(subsetSum, 2'410'010ul);
-    EXPECT_TRUE(verifyPlan(plan, subset, 2'000'000, 40'943));
-
-    // Extend input with keys, reuse plan, Sign
-    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
-    input.privateKeys.push_back(privKey);
-    input.plan = plan;
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-
-    EXPECT_EQ(serialized.size(), 89'339ul);
-}
-
-TEST(BitcoinSigning, EncodeThreeOutput) {
-    auto coin = TWCoinTypeLitecoin;
-    auto ownAddress = "ltc1qt36tu30tgk35tyzsve6jjq3dnhu2rm8l8v5q00";
-    auto ownPrivateKey = "b820f41f96c8b7442f3260acd23b3897e1450b8c7c6580136a3c2d3a14e34674";
-    auto toAddress0 = "ltc1qgknskahmm6svn42e33gum5wc4dz44wt9vc76q4";
-    auto toAddress1 = "ltc1qulgtqdgxyd9nxnn5yxft6jykskz0ffl30nu32z";
-    auto utxo0Amount = 3'851'829;
-    auto toAmount0 = 1'000'000;
-    auto toAmount1 = 2'000'000;
-
-    auto unsignedTx = Transaction(1);
-
-    auto hash0 = parse_hex("bbe736ada63c4678025dff0ff24d5f38970a3e4d7a2f77808689ed68004f55fe");
-    std::reverse(hash0.begin(), hash0.end());
-    auto outpoint0 = TW::Bitcoin::OutPoint(hash0, 0);
-    unsignedTx.inputs.emplace_back(outpoint0, Script(), UINT32_MAX);
-
-    auto lockingScript0 = Script::lockScriptForAddress(toAddress0, coin);
-    unsignedTx.outputs.emplace_back(toAmount0, lockingScript0);
-    auto lockingScript1 = Script::lockScriptForAddress(toAddress1, coin);
-    unsignedTx.outputs.emplace_back(toAmount1, lockingScript1);
-    // change
-    auto lockingScript2 = Script::lockScriptForAddress(ownAddress, coin);
-    unsignedTx.outputs.emplace_back(utxo0Amount - toAmount0 - toAmount1 - 172, lockingScript2);
-
-    Data unsignedData;
-    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
-    EXPECT_EQ(unsignedData.size(), 147ul);
-    EXPECT_EQ(hex(unsignedData), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "fe554f0068ed898680772f7a4d3e0a97385f4df20fff5d0278463ca6ad36e7bb"  "00000000"  "00"  ""  "ffffffff"
-        "03" // outputs
-            "40420f0000000000"  "16"  "001445a70b76fbdea0c9d5598c51cdd1d8ab455ab965"
-            "80841e0000000000"  "16"  "0014e7d0b03506234b334e742192bd48968584f4a7f1"
-            "c9fe0c0000000000"  "16"  "00145c74be45eb45a3459050667529022d9df8a1ecff"
-        // witness
-            "00"
-        "00000000" // nLockTime
-    );
-
-    // add signature
-
-    auto privkey = PrivateKey(parse_hex(ownPrivateKey));
-    auto pubkey = PrivateKey(privkey).getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(hex(pubkey.bytes), "036739829f2cfec79cfe6aaf1c22ecb7d4867dfd8ab4deb7121b36a00ab646caed");
-
-    auto utxo0Script = Script::lockScriptForAddress(ownAddress, coin); // buildPayToV0WitnessProgram()
-    Data keyHashIn0;
-    EXPECT_TRUE(utxo0Script.matchPayToWitnessPublicKeyHash(keyHashIn0));
-    EXPECT_EQ(hex(keyHashIn0), "5c74be45eb45a3459050667529022d9df8a1ecff");
-
-    auto redeemScript0 = Script::buildPayToPublicKeyHash(keyHashIn0);
-    EXPECT_EQ(hex(redeemScript0.bytes), "76a9145c74be45eb45a3459050667529022d9df8a1ecff88ac");
-
-    auto hashType = TWBitcoinSigHashType::TWBitcoinSigHashTypeAll;
-    Data sighash = unsignedTx.getSignatureHash(redeemScript0, unsignedTx.inputs[0].previousOutput.index,
-                                               hashType, utxo0Amount, static_cast<SignatureVersion>(unsignedTx._version));
-    auto sig = privkey.signAsDER(sighash);
-    ASSERT_FALSE(sig.empty());
-    sig.push_back(hashType);
-    EXPECT_EQ(hex(sig), "30450221008d88197a37ffcb51ecacc7e826aa588cb1068a107a82373c4b54ec42318a395c02204abbf5408504614d8f943d67e7873506c575e85a5e1bd92a02cd345e5192a82701");
-
-    // add witness stack
-    unsignedTx.inputs[0].scriptWitness.push_back(sig);
-    unsignedTx.inputs[0].scriptWitness.push_back(pubkey.bytes);
-
-    unsignedData.clear();
-    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
-    EXPECT_EQ(unsignedData.size(), 254ul);
-    // https://blockchair.com/litecoin/transaction/9e3fe98565a904d2da5ec1b3ba9d2b3376dfc074f43d113ce1caac01bf51b34c
-    EXPECT_EQ(hex(unsignedData), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "fe554f0068ed898680772f7a4d3e0a97385f4df20fff5d0278463ca6ad36e7bb"  "00000000"  "00"  ""  "ffffffff"
-        "03" // outputs
-            "40420f0000000000"  "16"  "001445a70b76fbdea0c9d5598c51cdd1d8ab455ab965"
-            "80841e0000000000"  "16"  "0014e7d0b03506234b334e742192bd48968584f4a7f1"
-            "c9fe0c0000000000"  "16"  "00145c74be45eb45a3459050667529022d9df8a1ecff"
-        // witness
-            "02"
-                "48"  "30450221008d88197a37ffcb51ecacc7e826aa588cb1068a107a82373c4b54ec42318a395c02204abbf5408504614d8f943d67e7873506c575e85a5e1bd92a02cd345e5192a82701"
-                "21"  "036739829f2cfec79cfe6aaf1c22ecb7d4867dfd8ab4deb7121b36a00ab646caed"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, RedeemExtendedPubkeyUTXO) {
-    auto wif = "L4BeKzm3AHDUMkxLRVKTSVxkp6Hz9FcMQPh18YCKU1uioXfovzwP";
-    auto decoded = Base58::bitcoin.decodeCheck(wif);
-    auto key = PrivateKey(Data(decoded.begin() + 1, decoded.begin() + 33));
-    auto pubkey = key.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
-    auto hash = Hash::sha256ripemd(pubkey.bytes.data(), pubkey.bytes.size());
-
-    Data data;
-    append(data, 0x00);
-    append(data, hash);
-    auto address = Bitcoin::Address(data);
-    auto addressString = address.string();
-
-    EXPECT_EQ(addressString, "1PAmpW5igXUJnuuzRa5yTcsWHwBamZG7Y2");
-
-    // Setup input for Plan
-    SigningInput input;
-    input.coinType = TWCoinTypeBitcoin;
-    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
-    input.amount = 26972;
-    input.useMaxAmount = true;
-    input.byteFee = 1;
-    input.toAddress = addressString;
-
-    auto utxo0Script = Script::lockScriptForAddress(addressString, TWCoinTypeBitcoin);
-
-    UTXO utxo0;
-    utxo0.script = utxo0Script;
-    utxo0.amount = 16874;
-    auto hash0 = parse_hex("6ae3f1d245521b0ea7627231d27d613d58c237d6bf97a1471341a3532e31906c");
-    std::reverse(hash0.begin(), hash0.end());
-    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
-    input.utxos.push_back(utxo0);
-
-    UTXO utxo1;
-    utxo1.script = utxo0Script;
-    utxo1.amount = 10098;
-    auto hash1 = parse_hex("fd1ea8178228e825d4106df0acb61a4fb14a8f04f30cd7c1f39c665c9427bf13");
-    std::reverse(hash1.begin(), hash1.end());
-    utxo1.outPoint = OutPoint(hash1, 0, UINT32_MAX);
-    input.utxos.push_back(utxo1);
-
-    input.privateKeys.push_back(key);
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data encoded;
-    signedTx.encode(encoded);
-    EXPECT_EQ(encoded.size(), 402ul);
-}
-
-TEST(BitcoinSigning, SignP2TR_5df51e) {
-    const auto privateKey = "13fcaabaf9e71ffaf915e242ec58a743d55f102cf836968e5bd4881135e0c52c";
-    const auto ownAddress = "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8";
-    const auto toAddress = "bc1ptmsk7c2yut2xah4pgflpygh2s7fh0cpfkrza9cjj29awapv53mrslgd5cf"; // Taproot
-    const auto coin = TWCoinTypeBitcoin;
-
-    // Setup input
-    SigningInput input;
-    input.hashType = hashTypeForCoin(coin);
-    input.amount = 1100;
-    input.useMaxAmount = false;
-    input.byteFee = 1;
-    input.toAddress = toAddress;
-    input.changeAddress = ownAddress;
-    input.coinType = coin;
-
-    auto utxoKey0 = PrivateKey(parse_hex(privateKey));
-    auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(hex(pubKey0.bytes), "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee");
-    EXPECT_EQ(SegwitAddress(pubKey0, "bc").string(), ownAddress);
-    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(pubKey0.bytes));
-    EXPECT_EQ(hex(utxoPubkeyHash), "0cb9f5c6b62c03249367bc20a90dd2425e6926af");
-    input.privateKeys.push_back(utxoKey0);
-
-    auto redeemScript = Script::lockScriptForAddress(input.toAddress, coin);
-    EXPECT_EQ(hex(redeemScript.bytes), "51205ee16f6144e2d46edea1427e1222ea879377e029b0c5d2e252517aee85948ec7");
-    auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
-    EXPECT_EQ(hex(scriptHash), "e0a5001e7b394a1a6b2978cdcab272241280bf46");
-    input.scripts[hex(scriptHash)] = redeemScript;
-
-    UTXO utxo0;
-    auto utxo0Script = Script::lockScriptForAddress(ownAddress, coin);
-    EXPECT_EQ(hex(utxo0Script.bytes), "00140cb9f5c6b62c03249367bc20a90dd2425e6926af");
-    utxo0.script = utxo0Script;
-    utxo0.amount = 49429;
-    auto hash0 = parse_hex("c24bd72e3eaea797bd5c879480a0db90980297bc7085efda97df2bf7d31413fb");
-    std::reverse(hash0.begin(), hash0.end());
-    utxo0.outPoint = OutPoint(hash0, 1, UINT32_MAX);
-    input.utxos.push_back(utxo0);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {49429}, 1100, 153));
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{234, 125, 153}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    // https://mempool.space/tx/5df51e13bfeb79f386e1e17237f06d1b5c87c5bfcaa907c0c1cfe51cd7ca446d
-    EXPECT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "fb1314d3f72bdf97daef8570bc97029890dba08094875cbd97a7ae3e2ed74bc2"  "01000000"  "00"  ""  "ffffffff"
-        "02" // outputs
-            "4c04000000000000"  "22"  "51205ee16f6144e2d46edea1427e1222ea879377e029b0c5d2e252517aee85948ec7"
-            "30bc000000000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
-        // witness
-            "02"
-                "47"  "3044022021cea91157fdab33226e38ee7c1a686538fc323f5e28feb35775cf82ba8c62210220723743b150cea8ead877d8b8d059499779a5df69f9bdc755c9f968c56cfb528f01"
-                "21"  "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(BitcoinSigning, Build_OpReturn_THORChainSwap_eb4c) {
-    auto coin = TWCoinTypeBitcoin;
-    auto ownAddress = "bc1q7s0a2l4aguksehx8hf93hs9yggl6njxds6m02g";
-    auto toAddress = "bc1qxu5a8gtnjxw3xwdlmr2gl9d76h9fysu3zl656e";
-    auto utxoAmount = 342101;
-    auto toAmount = 300000;
-    int fee = 36888;
-
-    auto unsignedTx = Transaction(2, 0);
-
-    auto hash0 = parse_hex("30b82960291a39de3664ec4c844a815e3e680e29b4d3a919e450f0c119cf4e35");
-    std::reverse(hash0.begin(), hash0.end());
-    auto outpoint0 = TW::Bitcoin::OutPoint(hash0, 1);
-    unsignedTx.inputs.emplace_back(outpoint0, Script(), UINT32_MAX);
-
-    auto lockingScriptTo = Script::lockScriptForAddress(toAddress, coin);
-    unsignedTx.outputs.push_back(TransactionOutput(toAmount, lockingScriptTo));
-    // change
-    auto lockingScriptChange = Script::lockScriptForAddress(ownAddress, coin);
-    unsignedTx.outputs.push_back(TransactionOutput(utxoAmount - toAmount - fee, lockingScriptChange));
-    // memo OP_RETURN
-    Data memo = data("SWAP:THOR.RUNE:thor1tpercamkkxec0q0jk6ltdnlqvsw29guap8wmcl:");
-    auto lockingScriptOpReturn = Script::buildOpReturnScript(memo);
-    EXPECT_EQ(hex(lockingScriptOpReturn.bytes), "6a3b535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a");
-    unsignedTx.outputs.push_back(TransactionOutput(0, lockingScriptOpReturn));
-
-    Data unsignedData;
-    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
-    EXPECT_EQ(unsignedData.size(), 186ul);
-    EXPECT_EQ(hex(unsignedData), // printed using prettyPrintTransaction
-        "02000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "354ecf19c1f050e419a9d3b4290e683e5e814a844cec6436de391a296029b830"  "01000000"  "00"  ""  "ffffffff"
-        "03" // outputs
-            "e093040000000000"  "16"  "00143729d3a173919d1339bfd8d48f95bed5ca924391"
-            "5d14000000000000"  "16"  "0014f41fd57ebd472d0cdcc7ba4b1bc0a4423fa9c8cd"
-            "0000000000000000"  "3d"  "6a3b535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a"
-        // witness
-            "00"
-        "00000000" // nLockTime
-    );
-
-    // add signature
-    auto pubkey = parse_hex("0206121b83ebfddbb1997b50cb87b968190857269333e21e295142c8b88af9312a");
-    auto sig = parse_hex("3045022100876eba8f9324d3fbb00b9dad9a34a8166dd75127d4facda63484c19703e9c178022052495a6229cc465d5f0fcf3cde3b22a0f861e762d0bb10acde26a57598bfe7e701");
-
-    // add witness stack
-    unsignedTx.inputs[0].scriptWitness.push_back(sig);
-    unsignedTx.inputs[0].scriptWitness.push_back(pubkey);
-
-    unsignedData.clear();
-    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
-    EXPECT_EQ(unsignedData.size(), 293ul);
-    // https://blockchair.com/bitcoin/transaction/eb4c1b064bfaf593d7cc6a5c73b75f932ffefe12a0478acf5a7e3145476683fc
-    EXPECT_EQ(hex(unsignedData),
-        "02000000000101354ecf19c1f050e419a9d3b4290e683e5e814a844cec6436de391a296029b8300100000000ffffffff03e0930400000000001600143729d3a1"
-        "73919d1339bfd8d48f95bed5ca9243915d14000000000000160014f41fd57ebd472d0cdcc7ba4b1bc0a4423fa9c8cd00000000000000003d6a3b535741503a54"
-        "484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a02483045022100876eba8f"
-        "9324d3fbb00b9dad9a34a8166dd75127d4facda63484c19703e9c178022052495a6229cc465d5f0fcf3cde3b22a0f861e762d0bb10acde26a57598bfe7e70121"
-        "0206121b83ebfddbb1997b50cb87b968190857269333e21e295142c8b88af9312a00000000"
-    );
-}
-
-TEST(BitcoinSigning, Sign_OpReturn_THORChainSwap) {
-    PrivateKey privateKey = PrivateKey(parse_hex("6bd4096fa6f08bd3af2b437244ba0ca2d35045c5233b8d6796df37e61e974de5"));
-    PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto ownAddress = SegwitAddress(publicKey, "bc");
-    auto ownAddressString = ownAddress.string();
-    EXPECT_EQ(ownAddressString, "bc1q2gzg42w98ytatvmsgxfc8vrg6l24c25pydup9u");
-    auto toAddress = "bc1qxu5a8gtnjxw3xwdlmr2gl9d76h9fysu3zl656e";
-    auto utxoAmount = 342101;
-    auto toAmount = 300000;
-    int byteFee = 126;
-    Data memo = data("SWAP:THOR.RUNE:thor1tpercamkkxec0q0jk6ltdnlqvsw29guap8wmcl:");
-
-    SigningInput input;
-    input.coinType = TWCoinTypeBitcoin;
-    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
-    input.amount = toAmount;
-    input.byteFee = byteFee;
-    input.toAddress = toAddress;
-    input.changeAddress = ownAddressString;
-
-    input.privateKeys.push_back(privateKey);
-    input.outputOpReturn = memo;
-
-    UTXO utxo;
-    auto utxoHash = parse_hex("30b82960291a39de3664ec4c844a815e3e680e29b4d3a919e450f0c119cf4e35");
-    std::reverse(utxoHash.begin(), utxoHash.end());
-    utxo.outPoint = OutPoint(utxoHash, 1, UINT32_MAX);
-    utxo.amount = utxoAmount;
-
-    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(publicKey.bytes));
-    EXPECT_EQ(hex(utxoPubkeyHash), "52048aa9c53917d5b370419383b068d7d55c2a81");
-    auto utxoScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
-    EXPECT_EQ(hex(utxoScript.bytes), "001452048aa9c53917d5b370419383b068d7d55c2a81");
-    utxo.script = utxoScript;
-    input.utxos.push_back(utxo);
-
-    {
-        // test plan (but do not reuse plan result)
-        auto plan = TransactionBuilder::plan(input);
-        EXPECT_TRUE(verifyPlan(plan, {342101}, 300000, 26586));
-        EXPECT_EQ(plan.outputOpReturn.size(), 59ul);
-    }
-
-    // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
-
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{293, 183, 211}));
-    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
-    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "354ecf19c1f050e419a9d3b4290e683e5e814a844cec6436de391a296029b830"  "01000000"  "00"  ""  "ffffffff"
-        "03" // outputs
-            "e093040000000000"  "16"  "00143729d3a173919d1339bfd8d48f95bed5ca924391"
-            "9b3c000000000000"  "16"  "001452048aa9c53917d5b370419383b068d7d55c2a81"
-            "0000000000000000"  "3d"  "6a3b535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a"
-        // witness
-            "02"
-                "48"  "3045022100ff6c0aaef512aa52f3036161bfbcef39046ac89eb9617fa461a0c9c43fe45eb3022055d208d3f81736e72e3ad8ef761dc79ac5dd3dc00721174bc69db416a74960e301"
-                "21"  "02c2e5c8b4927812fb37444a7862466ad23978a4ac626f8eaf93e1d1a60d6abb80"
-        "00000000" // nLockTime
-    );
-}
-// clang-format on
-} // namespace TW::Bitcoin
diff --git a/tests/Bitcoin/TWCoinTypeTests.cpp b/tests/Bitcoin/TWCoinTypeTests.cpp
deleted file mode 100644
index 0cba7d8cb7e..00000000000
--- a/tests/Bitcoin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWBitcoinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBitcoin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0607f62530b68cfcc91c57a1702841dd399a899d0eecda8e31ecca3f52f01df2"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBitcoin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("17A16QmavnUfCW11DAApiJxp7ARnxN5pGX"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBitcoin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBitcoin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBitcoin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBitcoin), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeBitcoin));
-    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeBitcoin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBitcoin));
-    assertStringsEqual(symbol, "BTC");
-    assertStringsEqual(txUrl, "https://blockchair.com/bitcoin/transaction/0607f62530b68cfcc91c57a1702841dd399a899d0eecda8e31ecca3f52f01df2");
-    assertStringsEqual(accUrl, "https://blockchair.com/bitcoin/address/17A16QmavnUfCW11DAApiJxp7ARnxN5pGX");
-    assertStringsEqual(id, "bitcoin");
-    assertStringsEqual(name, "Bitcoin");
-}
diff --git a/tests/Bitcoin/TWSegwitAddressTests.cpp b/tests/Bitcoin/TWSegwitAddressTests.cpp
deleted file mode 100644
index ccc41fc5737..00000000000
--- a/tests/Bitcoin/TWSegwitAddressTests.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWSegwitAddress.h>
-#include <TrustWalletCore/TWPublicKey.h>
-
-#include <gtest/gtest.h>
-
-const char* address1 = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4";
-const char* address2 = "bc1qr583w2swedy2acd7rung055k8t3n7udp7vyzyg";
-const char* address3Taproot = "bc1ptmsk7c2yut2xah4pgflpygh2s7fh0cpfkrza9cjj29awapv53mrslgd5cf";
-
-TEST(TWSegwitAddress, PublicKeyToAddress) {
-    auto pkData = DATA("0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798");
-    auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(pkData.get(), TWPublicKeyTypeSECP256k1));
-
-    auto address = WRAP(TWSegwitAddress, TWSegwitAddressCreateWithPublicKey(TWHRPBitcoin, publicKey.get()));
-    auto string = WRAPS(TWSegwitAddressDescription(address.get()));
-
-    ASSERT_STREQ(address1, TWStringUTF8Bytes(string.get()));
-}
-
-TEST(TWSegwitAddress, InitWithAddress) {
-    auto string = STRING(address1);
-    auto address = WRAP(TWSegwitAddress, TWSegwitAddressCreateWithString(string.get()));
-    auto description = WRAPS(TWSegwitAddressDescription(address.get()));
-
-    ASSERT_TRUE(address.get() != nullptr);
-    ASSERT_STREQ(address1, TWStringUTF8Bytes(description.get()));
-
-    ASSERT_EQ(0, TWSegwitAddressWitnessVersion(address.get()));
-
-    ASSERT_EQ(TWHRPBitcoin, TWSegwitAddressHRP(address.get()));
-}
-
-TEST(TWSegwitAddress, TaprootString) {
-    const auto string = STRING(address3Taproot);
-    const auto address = WRAP(TWSegwitAddress, TWSegwitAddressCreateWithString(string.get()));
-    ASSERT_TRUE(address.get() != nullptr);
-
-    const auto description = WRAPS(TWSegwitAddressDescription(address.get()));
-    ASSERT_STREQ(address3Taproot, TWStringUTF8Bytes(description.get()));
-
-    ASSERT_EQ(1, TWSegwitAddressWitnessVersion(address.get())); // taproot has segwit version 1
-
-    ASSERT_EQ(TWHRPBitcoin, TWSegwitAddressHRP(address.get()));
-}
-
-TEST(TWSegwitAddress, InvalidAddress) {
-    std::vector<std::shared_ptr<TWString>> strings = {
-        STRING("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t5"),
-        STRING("bc1rw5uspcuh"),
-        STRING("bc10w508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kw5rljs90"),
-        STRING("BC1QR508D6QEJXTDG4Y5R3ZARVARYV98GJ9P"),
-        STRING("tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sL5k7"),
-        STRING("bc1zw508d6qejxtdg4y5r3zarvaryvqyzf3du"),
-        STRING("tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3pjxtptv"),
-        STRING("bc1gmk9yu"),
-    };
-    for (auto& string : strings) {
-        ASSERT_TRUE(TWSegwitAddressCreateWithString(string.get()) == nullptr) << "Invalid address '" << TWStringUTF8Bytes(string.get()) << "' reported as valid.";
-    }
-}
diff --git a/tests/BitcoinCash/TWBitcoinCashTests.cpp b/tests/BitcoinCash/TWBitcoinCashTests.cpp
deleted file mode 100644
index e4f960149f6..00000000000
--- a/tests/BitcoinCash/TWBitcoinCashTests.cpp
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Bitcoin/Address.h"
-#include "Bitcoin/SigHashType.h"
-#include "HexCoding.h"
-#include "proto/Bitcoin.pb.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWBitcoinSigHashType.h>
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWAnySigner.h>
-#include <TrustWalletCore/TWBitcoinAddress.h>
-#include <TrustWalletCore/TWBitcoinScript.h>
-#include <TrustWalletCore/TWHDWallet.h>
-#include <TrustWalletCore/TWHash.h>
-#include <TrustWalletCore/TWPrivateKey.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Bitcoin::tests {
-
-// clang-format off
-TEST(BitcoinCash, Address) {
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc").get(), TWCoinTypeBitcoinCash));
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("bitcoincash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc").get(), TWCoinTypeBitcoinCash));
-}
-
-TEST(BitcoinCash, ValidAddress) {
-    auto string = STRING("bitcoincash:qqa2qx0d8tegw32xk8u75ws055en4x3h2u0e6k46y4");
-    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeBitcoinCash));
-    ASSERT_NE(address.get(), nullptr);
-
-    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(string.get(), TWCoinTypeBitcoinCash));
-    ASSERT_FALSE(TWBitcoinScriptSize(script.get()) == 0);
-}
-
-TEST(BitcoinCash, InvalidAddress) {
-    // Wrong checksum
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("pqx578nanz2h2estzmkr53zqdg6qt8xyqvffffffff").get(), TWCoinTypeBitcoinCash));
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("bitcoincash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvffffffff").get(), TWCoinTypeBitcoinCash));
-
-    // Valid eCash addresses are invalid for BCH
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0").get(), TWCoinTypeECash));
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0").get(), TWCoinTypeBitcoinCash));
-
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("ecash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0").get(), TWCoinTypeECash));
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("ecash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0").get(), TWCoinTypeBitcoinCash));
-
-    // Wrong prefix
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("bcash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc").get(), TWCoinTypeBitcoinCash));
-
-    // Wrong base 32 (characters o, i)
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("poi578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc").get(), TWCoinTypeBitcoinCash));
-}
-
-TEST(BitcoinCash, LegacyToCashAddr) {
-    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("28071bf4e2b0340db41b807ed8a5514139e5d6427ff9d58dbd22b7ed187103a4").get()));
-    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
-    auto address = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(publicKey.get(), 0));
-    auto addressString = WRAPS(TWBitcoinAddressDescription(address.get()));
-    assertStringsEqual(addressString, "1PeUvjuxyf31aJKX6kCXuaqxhmG78ZUdL1");
-
-    auto cashAddress = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeBitcoinCash));
-    auto cashAddressString = WRAPS(TWAnyAddressDescription(cashAddress.get()));
-    assertStringsEqual(cashAddressString, "bitcoincash:qruxj7zq6yzpdx8dld0e9hfvt7u47zrw9gfr5hy0vh");
-}
-
-TEST(BitcoinCash, LockScript) {
-    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING("bitcoincash:qpk05r5kcd8uuzwqunn8rlx5xvuvzjqju5rch3tc0u").get(), TWCoinTypeBitcoinCash));
-    auto data = WRAPD(TWAnyAddressData(address.get()));
-    auto rawData = WRAPD(TWDataCreateWithSize(0));
-    TWDataAppendByte(rawData.get(), 0x00);
-    TWDataAppendData(rawData.get(), data.get());
-
-    auto legacyAddress = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithData(rawData.get()));
-    auto legacyString = WRAPS(TWBitcoinAddressDescription(legacyAddress.get()));
-    assertStringsEqual(legacyString, "1AwDXywmyhASpCCFWkqhySgZf8KiswFoGh");
-
-    auto keyHash = WRAPD(TWDataCreateWithBytes(legacyAddress.get()->impl.bytes.data() + 1, 20));
-    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptBuildPayToPublicKeyHash(keyHash.get()));
-    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
-    assertHexEqual(scriptData, "76a9146cfa0e96c34fce09c0e4e671fcd43338c14812e588ac");
-
-    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("pzukqjmcyzrkh3gsqzdcy3e3d39cqxhl3g0f405k5l").get(), TWCoinTypeBitcoinCash));
-    auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
-    assertHexEqual(scriptData2, "a914b9604b7820876bc510009b8247316c4b801aff8a87");
-}
-
-TEST(BitcoinCash, ExtendedKeys) {
-    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
-        STRING("ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal").get(),
-        STRING("TREZOR").get()
-    ));
-
-    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeBitcoinCash, TWHDVersionXPRV));
-    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeBitcoinCash, TWHDVersionXPUB));
-
-    assertStringsEqual(xprv, "xprv9yEvwSfPanK5gLYVnYvNyF2CEWJx1RsktQtKDeT6jnCnqASBiPCvFYHFSApXv39bZbF6hRaha1kWQBVhN1xjo7NHuhAn5uUfzy79TBuGiHh");
-    assertStringsEqual(xpub, "xpub6CEHLxCHR9sNtpcxtaTPLNxvnY9SQtbcFdov22riJ7jmhxmLFvXAoLbjHSzwXwNNuxC1jUP6tsHzFV9rhW9YKELfmR9pJaKFaM8C3zMPgjw");
-}
-
-TEST(BitcoinCash, DeriveFromXPub) {
-    auto xpub = STRING("xpub6CEHLxCHR9sNtpcxtaTPLNxvnY9SQtbcFdov22riJ7jmhxmLFvXAoLbjHSzwXwNNuxC1jUP6tsHzFV9rhW9YKELfmR9pJaKFaM8C3zMPgjw");
-    auto pubKey2 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeBitcoinCash, STRING("m/44'/145'/0'/0/2").get()));
-    auto pubKey9 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeBitcoinCash, STRING("m/44'/145'/0'/0/9").get()));
-
-    auto address2 = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(pubKey2.get(), TWCoinTypeBitcoinCash));
-    auto address2String = WRAPS(TWAnyAddressDescription(address2.get()));
-
-    auto address9 = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(pubKey9.get(), TWCoinTypeBitcoinCash));
-    auto address9String = WRAPS(TWAnyAddressDescription(address9.get()));
-
-    assertStringsEqual(address2String, "bitcoincash:qq4cm0hcc4trsj98v425f4ackdq7h92rsy6zzstrgy");
-    assertStringsEqual(address9String, "bitcoincash:qqyqupaugd7mycyr87j899u02exc6t2tcg9frrqnve");
-}
-
-TEST(BitcoinCash, SignTransaction) {
-    const int64_t amount = 600;
-
-    // Transaction on Bitcoin Cash Mainnet
-    // https://blockchair.com/bitcoin-cash/transaction/96ee20002b34e468f9d3c5ee54f6a8ddaa61c118889c4f35395c2cd93ba5bbb4
-
-    auto input = Proto::SigningInput();
-    input.set_hash_type(hashTypeForCoin(TWCoinTypeBitcoinCash));
-    input.set_amount(amount);
-    input.set_byte_fee(1);
-    input.set_to_address("1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx");
-    input.set_change_address("1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU");
-
-    auto hash0 = DATA("e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05");
-    auto utxo0 = input.add_utxo();
-    utxo0->mutable_out_point()->set_hash(TWDataBytes(hash0.get()), TWDataSize(hash0.get()));
-    utxo0->mutable_out_point()->set_index(2);
-    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
-    utxo0->set_amount(5151);
-    auto script0 = parse_hex("76a914aff1e0789e5fe316b729577665aa0a04d5b0f8c788ac");
-    utxo0->set_script(script0.data(), script0.size());
-
-    auto utxoKey0 = DATA("7fdafb9db5bc501f2096e7d13d331dc7a75d9594af3d251313ba8b6200f4e384");
-    input.add_private_key(TWDataBytes(utxoKey0.get()), TWDataSize(utxoKey0.get()));
-
-    // Sign
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeBitcoinCash);
-
-    EXPECT_EQ(output.transaction().outputs_size(), 2);
-    EXPECT_EQ(output.transaction().outputs(0).value(), amount);
-    EXPECT_EQ(output.transaction().outputs(1).value(), 4325);
-    EXPECT_EQ(output.encoded().length(), 226ul);
-    ASSERT_EQ(hex(output.encoded()),
-        "01000000"
-        "01"
-            "e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05" "02000000" "6b483045022100b70d158b43cbcded60e6977e93f9a84966bc0cec6f2dfd1463d1223a90563f0d02207548d081069de570a494d0967ba388ff02641d91cadb060587ead95a98d4e3534121038eab72ec78e639d02758e7860cdec018b49498c307791f785aa3019622f4ea5b" "ffffffff"
-        "02"
-            "5802000000000000" "1976a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
-            "e510000000000000" "1976a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
-        "00000000");
-}
-// clang-format on
-
-} // namespace TW::Bitcoin::tests
diff --git a/tests/BitcoinCash/TWCoinTypeTests.cpp b/tests/BitcoinCash/TWCoinTypeTests.cpp
deleted file mode 100644
index 9b56e10a7af..00000000000
--- a/tests/BitcoinCash/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWBitcoinCashCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBitcoinCash));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBitcoinCash, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBitcoinCash, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBitcoinCash));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBitcoinCash));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBitcoinCash), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeBitcoinCash));
-    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeBitcoinCash));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBitcoinCash));
-    assertStringsEqual(symbol, "BCH");
-    assertStringsEqual(txUrl, "https://blockchair.com/bitcoin-cash/transaction/t123");
-    assertStringsEqual(accUrl, "https://blockchair.com/bitcoin-cash/address/a12");
-    assertStringsEqual(id, "bitcoincash");
-    assertStringsEqual(name, "Bitcoin Cash");
-}
diff --git a/tests/BitcoinGold/TWCoinTypeTests.cpp b/tests/BitcoinGold/TWCoinTypeTests.cpp
deleted file mode 100644
index 55b11cdfa52..00000000000
--- a/tests/BitcoinGold/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWBitcoinGoldCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBitcoinGold));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("2f807d7734de35d2236a1b3d8704eb12954f5f82ea66987949b10e94d9999b23"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBitcoinGold, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("GJjz2Du9BoJQ3CPcoyVTHUJZSj62i1693U"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBitcoinGold, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBitcoinGold));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBitcoinGold));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBitcoinGold), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeBitcoinGold));
-    ASSERT_EQ(23, TWCoinTypeP2shPrefix(TWCoinTypeBitcoinGold));
-    ASSERT_EQ(0, TWCoinTypeStaticPrefix(TWCoinTypeBitcoinGold));
-    assertStringsEqual(symbol, "BTG");
-    assertStringsEqual(txUrl, "https://explorer.bitcoingold.org/insight/tx/2f807d7734de35d2236a1b3d8704eb12954f5f82ea66987949b10e94d9999b23");
-    assertStringsEqual(accUrl, "https://explorer.bitcoingold.org/insight/address/GJjz2Du9BoJQ3CPcoyVTHUJZSj62i1693U");
-    assertStringsEqual(id, "bitcoingold");
-    assertStringsEqual(name, "Bitcoin Gold");
-}
diff --git a/tests/BitcoinGold/TWSegwitAddressTests.cpp b/tests/BitcoinGold/TWSegwitAddressTests.cpp
deleted file mode 100644
index b526c21a480..00000000000
--- a/tests/BitcoinGold/TWSegwitAddressTests.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-
-#include "../interface/TWTestUtilities.h"
-#include "Bitcoin/SegwitAddress.h"
-#include "Coin.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "HexCoding.h"
-#include <gtest/gtest.h>
-#include <TrustWalletCore/TWAnyAddress.h>
-
-using namespace TW;
-
-TEST(TWBitcoinGoldSegwitAddress, Valid) {
-    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid("btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk"));
-    ASSERT_FALSE(Bitcoin::SegwitAddress::isValid("btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sl"));
-}
-
-/// Initializes a Bech32 address with a human-readable part, a witness
-/// version, and a witness program.
-TEST(TWBitcoinGoldSegwitAddress, WitnessProgramToAddress) {
-    auto address = Bitcoin::SegwitAddress("btg", 0, parse_hex("5e6132a9ad21f7423081441ab4ae229501f6c8a8"));
-
-    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid(address.string()));
-    ASSERT_EQ(address.string(), "btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
-}
-
-/// Get address data from a Bech32 address
-TEST(TWBitcoinGoldSegwitAddress, addressToData) {
-    auto data = TW::addressToData(TWCoinTypeBitcoinGold, "btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
-    ASSERT_EQ(hex(data), "5e6132a9ad21f7423081441ab4ae229501f6c8a8");
-}
-
-/// Initializes a Bech32 address with a public key and a HRP prefix.
-TEST(TWBitcoinGoldSegwitAddress, PubkeyToAddress) {
-    const auto publicKey = PublicKey(parse_hex("02f74712b5d765a73b52a14c1e113f2ef3f9502d09d5987ee40f53828cfe68b9a6"), TWPublicKeyTypeSECP256k1);
-
-    /// construct with public key
-    auto address = Bitcoin::SegwitAddress(publicKey, "btg");
-
-    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid(address.string()));
-    ASSERT_EQ(address.string(), "btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
-}
-
-/// Decodes a SegWit address.
-TEST(TWBitcoinGoldSegwitAddress, Decode) {
-    auto result = Bitcoin::SegwitAddress::decode("btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
-
-    ASSERT_TRUE(std::get<2>(result));
-    ASSERT_EQ(std::get<0>(result).string(), "btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
-    ASSERT_EQ(std::get<1>(result), "btg");
-}
diff --git a/tests/Bluzelle/TWCoinTypeTests.cpp b/tests/Bluzelle/TWCoinTypeTests.cpp
deleted file mode 100644
index 33acfa33f7b..00000000000
--- a/tests/Bluzelle/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWCoinTypeBluzelle, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBluzelle));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("AC026E0EC6E33A77D5EA6B9CEF9810699BC2AD8C5582E007E7857457C6D3B819"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBluzelle, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("bluzelle1q9cryfal7u3jvnq6er5ufety20xtzw6ycx2te9"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBluzelle, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBluzelle));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBluzelle));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBluzelle), 6);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeBluzelle));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBluzelle));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBluzelle));
-    assertStringsEqual(symbol, "BLZ");
-    assertStringsEqual(txUrl, "https://bigdipper.net.bluzelle.com/transactions/AC026E0EC6E33A77D5EA6B9CEF9810699BC2AD8C5582E007E7857457C6D3B819");
-    assertStringsEqual(accUrl, "https://bigdipper.net.bluzelle.com/account/bluzelle1q9cryfal7u3jvnq6er5ufety20xtzw6ycx2te9");
-    assertStringsEqual(id, "bluzelle");
-    assertStringsEqual(name, "Bluzelle");
-}
diff --git a/tests/Boba/TWCoinTypeTests.cpp b/tests/Boba/TWCoinTypeTests.cpp
deleted file mode 100644
index d538cea0cf3..00000000000
--- a/tests/Boba/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWBobaCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBoba));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBoba, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x4F96F50eDB37a19216d87693E5dB241e31bD3735"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBoba, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBoba));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBoba));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBoba), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeBoba));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBoba));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBoba));
-    assertStringsEqual(symbol, "BOBAETH");
-    assertStringsEqual(txUrl, "https://blockexplorer.boba.network/tx/0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103");
-    assertStringsEqual(accUrl, "https://blockexplorer.boba.network/address/0x4F96F50eDB37a19216d87693E5dB241e31bD3735");
-    assertStringsEqual(id, "boba");
-    assertStringsEqual(name, "Boba");
-}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 746cff782a1..288f2842ba8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,8 +1,6 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
 enable_testing()
 
@@ -25,6 +23,7 @@ file(GLOB_RECURSE test_sources *.cpp **/*.cpp **/*.cc)
 add_executable(tests ${test_sources})
 target_link_libraries(tests gtest_main TrezorCrypto TrustWalletCore walletconsolelib protobuf Boost::boost)
 target_include_directories(tests PRIVATE ${CMAKE_SOURCE_DIR}/src)
+target_include_directories(tests PRIVATE ${CMAKE_SOURCE_DIR}/tests/common)
 target_compile_options(tests PRIVATE "-Wall")
 if (NOT ANDROID AND TW_UNITY_BUILD)
     set_target_properties(tests PROPERTIES UNITY_BUILD ON)
diff --git a/tests/Callisto/TWCoinTypeTests.cpp b/tests/Callisto/TWCoinTypeTests.cpp
deleted file mode 100644
index 2c83326e867..00000000000
--- a/tests/Callisto/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWCallistoCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCallisto));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCallisto, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCallisto, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCallisto));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCallisto));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCallisto), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeCallisto));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCallisto));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCallisto));
-    assertStringsEqual(symbol, "CLO");
-    assertStringsEqual(txUrl, "https://explorer.callisto.network/tx/t123");
-    assertStringsEqual(accUrl, "https://explorer.callisto.network/addr/a12");
-    assertStringsEqual(id, "callisto");
-    assertStringsEqual(name, "Callisto");
-}
diff --git a/tests/Cardano/AddressTests.cpp b/tests/Cardano/AddressTests.cpp
deleted file mode 100644
index 8a8918fe6c9..00000000000
--- a/tests/Cardano/AddressTests.cpp
+++ /dev/null
@@ -1,510 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Cardano/AddressV3.h"
-
-#include "Coin.h"
-#include "HDWallet.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-using namespace std;
-
-namespace TW::Cardano::tests {
-
-const auto dummyKey = parse_hex("1111111111111111111111111111111111111111111111111111111111111111");
-
-TEST(CardanoAddress, V3NetworkIdKind) {
-    EXPECT_EQ(AddressV3::firstByte(AddressV3::Network_Test, AddressV3::Kind_Base), 0);
-    EXPECT_EQ(AddressV3::firstByte(AddressV3::Network_Production, AddressV3::Kind_Base), 1);
-    EXPECT_EQ(AddressV3::firstByte(AddressV3::NetworkId(2), AddressV3::Kind(3)), 50);
-
-    EXPECT_EQ(AddressV3::networkIdFromFirstByte(0), AddressV3::Network_Test);
-    EXPECT_EQ(AddressV3::networkIdFromFirstByte(1), AddressV3::Network_Production);
-    EXPECT_EQ(AddressV3::networkIdFromFirstByte(50), AddressV3::NetworkId(2));
-
-    EXPECT_EQ(AddressV3::kindFromFirstByte(0), AddressV3::Kind_Base);
-    EXPECT_EQ(AddressV3::kindFromFirstByte(1), AddressV3::Kind_Base);
-    EXPECT_EQ(AddressV3::kindFromFirstByte(50), AddressV3::Kind(3));
-}
-
-TEST(CardanoAddress, Validation) {
-    // valid V3 address
-    ASSERT_TRUE(AddressV3::isValidLegacy("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23"));
-
-    ASSERT_TRUE(AddressV3::isValid("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23"));
-    ASSERT_TRUE(AddressV3::isValid("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5"));
-    ASSERT_TRUE(AddressV3::isValid("addr1vyuca7esanpgs4ke0um3ft6f4yaeuz3ftpfqx9nxpct2uyqu7dvlp")); // enterprise
-    ASSERT_TRUE(AddressV3::isValid("stake1uy9ggsc9qls4pu9qvyyacwnmr9tt0gzcdt5s0zj4au8qkqc65geks")); // reward
-    ASSERT_TRUE(AddressV3::isValid("addr1sxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qmxapsy")); // kind 8
-
-    // valid V2 address
-    ASSERT_TRUE(AddressV3::isValidLegacy("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx"));
-    ASSERT_TRUE(AddressV3::isValidLegacy("Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W"));
-
-    ASSERT_FALSE(AddressV3::isValid("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx"));
-
-    // valid V1 address
-    ASSERT_TRUE(AddressV3::isValidLegacy("DdzFFzCqrhssmYoG5Eca1bKZFdGS8d6iag1mU4wbLeYcSPVvBNF2wRG8yhjzQqErbg63N6KJA4DHqha113tjKDpGEwS5x1dT2KfLSbSJ"));
-    ASSERT_TRUE(AddressV3::isValidLegacy("DdzFFzCqrht7HGoJ87gznLktJGywK1LbAJT2sbd4txmgS7FcYLMQFhawb18ojS9Hx55mrbsHPr7PTraKh14TSQbGBPJHbDZ9QVh6Z6Di"));
-
-    // invalid V3, invalid network
-    ASSERT_FALSE(AddressV3::isValidLegacy("addr1sna05l45z33zpkm8z44q8f0h57wxvm0c86e34wlmua7gtcrdgrdrzy8ny3walyfjanhe33nsyuh088qr5gepqaen6jsa9r94xvvd7fh6jc3e6x"));
-    // invalid V3, invalid prefix
-    ASSERT_FALSE(AddressV3::isValidLegacy("prefix1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35q3hm7lv"));
-    // invalid V3, length
-    ASSERT_FALSE(AddressV3::isValidLegacy("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32xsmpqws7"));
-    // invalid checksum V3
-    ASSERT_FALSE(AddressV3::isValidLegacy("PREFIX1qvqsyqcyq5rqwzqfpg9scrgwpugpzysnzs23v9ccrydpk8qarc0jqxuzx4s"));
-    // invalid checksum V2
-    ASSERT_FALSE(AddressV3::isValidLegacy("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvm"));
-    // random
-    ASSERT_FALSE(AddressV3::isValidLegacy("hasoiusaodiuhsaijnnsajnsaiussai"));
-    // empty
-    ASSERT_FALSE(AddressV3::isValidLegacy(""));
-    ASSERT_FALSE(AddressV3::isValidLegacy("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk2"));
-}
-
-TEST(CardanoAddress, FromStringV2) {
-    {
-        auto address = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
-        EXPECT_EQ(hex(address.data()), "01" "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034e" "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-    }
-    {
-        auto address = AddressV3("addr1qxteqxsgxrs4he9d28lh70qu7qfz7saj6dmxwsqyle2yp3xvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35quehtx3");
-        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
-        EXPECT_EQ(hex(address.data()), "01" "97901a0830e15be4ad51ff7f3c1cf0122f43b2d376674004fe5440c4" "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-    }
-    {
-        auto address = AddressV3("addr1q8sfzcwce0fqll3symd7f0amayxqq68nxt2u8pgen9y00tkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35q40ytea");
-        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
-        EXPECT_EQ(hex(address.data()), "01" "e09161d8cbd20ffe3026dbe4bfbbe90c0068f332d5c385199948f7ae" "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-    }
-    {
-        auto address = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
-        ASSERT_EQ(address.string(), "Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
-    }
-    {
-        auto address = AddressV3("DdzFFzCqrhssmYoG5Eca1bKZFdGS8d6iag1mU4wbLeYcSPVvBNF2wRG8yhjzQqErbg63N6KJA4DHqha113tjKDpGEwS5x1dT2KfLSbSJ");
-        ASSERT_EQ(address.string(), "DdzFFzCqrhssmYoG5Eca1bKZFdGS8d6iag1mU4wbLeYcSPVvBNF2wRG8yhjzQqErbg63N6KJA4DHqha113tjKDpGEwS5x1dT2KfLSbSJ");
-    }
-}
-
-TEST(CardanoAddress, FromStringV3_Base) {
-    {
-        auto address = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-        EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-        EXPECT_EQ(address.string("addr"), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-        EXPECT_EQ(AddressV3::Network_Production, address.networkId);
-        EXPECT_EQ(AddressV3::Kind_Base, address.kind);
-        EXPECT_EQ("8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468", hex(address.bytes));
-    }
-}
-
-TEST(CardanoAddress, FromStringV3_Enterprise) {
-    {
-        auto address = AddressV3("addr1vyuca7esanpgs4ke0um3ft6f4yaeuz3ftpfqx9nxpct2uyqu7dvlp");
-        EXPECT_EQ(address.string(), "addr1vyuca7esanpgs4ke0um3ft6f4yaeuz3ftpfqx9nxpct2uyqu7dvlp");
-        EXPECT_EQ(AddressV3::Network_Production, address.networkId);
-        EXPECT_EQ(AddressV3::Kind_Enterprise, address.kind);
-        EXPECT_EQ("398efb30ecc28856d97f3714af49a93b9e0a2958520316660e16ae10", hex(address.bytes));
-    }
-}
-
-TEST(CardanoAddress, FromStringV3_Reward) {
-    {
-        auto address = AddressV3("stake1uy9ggsc9qls4pu9qvyyacwnmr9tt0gzcdt5s0zj4au8qkqc65geks");
-        EXPECT_EQ(address.string(), "stake1uy9ggsc9qls4pu9qvyyacwnmr9tt0gzcdt5s0zj4au8qkqc65geks");
-        EXPECT_EQ(AddressV3::Network_Production, address.networkId);
-        EXPECT_EQ(AddressV3::Kind_Reward, address.kind);
-        EXPECT_EQ("0a84430507e150f0a06109dc3a7b1956b7a0586ae9078a55ef0e0b03", hex(address.bytes));
-    }
-}
-
-TEST(CardanoAddress, MnemonicToAddressV3) {
-    {
-        // Test from cardano-crypto.js; Test wallet
-        const auto mnemonic = "cost dash dress stove morning robust group affair stomach vacant route volume yellow salute laugh";
-        const auto coin = TWCoinTypeCardano;
-        const auto derivPath = derivationPath(coin);
-
-        const auto wallet = HDWallet(mnemonic, "");
-
-        // check entropy
-        EXPECT_EQ("30a6f50aeb58ff7699b822d63e0ef27aeff17d9f", hex(wallet.getEntropy()));
-
-        {
-            PrivateKey masterPrivKey = wallet.getMasterKey(TWCurve::TWCurveED25519ExtendedCardano);
-            PrivateKey masterPrivKeyExt = wallet.getMasterKeyExtension(TWCurve::TWCurveED25519ExtendedCardano);
-            // the two together matches first half of keypair
-            ASSERT_EQ("a018cd746e128a0be0782b228c275473205445c33b9000a33dd5668b430b5744", hex(masterPrivKey.bytes));
-            ASSERT_EQ("26877cfe435fddda02409b839b7386f3738f10a30b95a225f4b720ee71d2505b", hex(masterPrivKeyExt.bytes));
-
-            PublicKey masterPublicKey = masterPrivKey.getPublicKey(TWPublicKeyTypeED25519);
-            ASSERT_EQ("3aecb95953edd0b16db20366097ddedcb3512fe36193473c5fca2af774d44739", hex(masterPublicKey.bytes));
-        }
-        {
-            string addr = wallet.deriveAddress(TWCoinType::TWCoinTypeCardano);
-            EXPECT_EQ("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq", addr);
-        }
-        {
-            const auto privateKey = wallet.getKey(coin, derivPath);
-            EXPECT_EQ(hex(privateKey.bytes), "e8c8c5b2df13f3abed4e6b1609c808e08ff959d7e6fc3d849e3f2880550b574437aa559095324d78459b9bb2da069da32337e1cc5da78f48e1bd084670107f3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fae0d152bb611cb9ff34e945e4ff627e6fba81da687a601a879759cd76530b5744424db69a75edd4780a5fbc05d1a3c84ac4166ff8e424808481dd8e77627ce5f5bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276");
-            const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-
-            const auto address = AddressV3(publicKey);
-            EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-            EXPECT_EQ(address.networkId, AddressV3::Network_Production);
-            EXPECT_EQ(address.kind, AddressV3::Kind_Base);
-            EXPECT_EQ(hex(address.bytes), "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034e" "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-        }
-        {
-            PrivateKey privateKey = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/1852'/1815'/0'/0/0"));
-            EXPECT_EQ("e8c8c5b2df13f3abed4e6b1609c808e08ff959d7e6fc3d849e3f2880550b5744", hex(privateKey.key()));
-            EXPECT_EQ("37aa559095324d78459b9bb2da069da32337e1cc5da78f48e1bd084670107f31", hex(privateKey.extension()));
-            EXPECT_EQ("10f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fa", hex(privateKey.chainCode()));
-            EXPECT_EQ("e0d152bb611cb9ff34e945e4ff627e6fba81da687a601a879759cd76530b5744", hex(privateKey.secondKey()));
-            EXPECT_EQ("424db69a75edd4780a5fbc05d1a3c84ac4166ff8e424808481dd8e77627ce5f5", hex(privateKey.secondExtension()));
-            EXPECT_EQ("bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276", hex(privateKey.secondChainCode()));
-            PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-            EXPECT_EQ("fafa7eb4146220db67156a03a5f7a79c666df83eb31abbfbe77c85e06d40da3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26faf4b8d5201961e68f2e177ba594101f513ee70fe70a41324e8ea8eb787ffda6f4bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276", hex(publicKey.bytes));
-            string addr = AddressV3(publicKey).string();
-            EXPECT_EQ("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq", addr);
-        }
-        {
-            PrivateKey privKey0 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/44'/1815'/0'/0/0"));
-            PublicKey pubKey0 = privKey0.getPublicKey(TWPublicKeyTypeED25519Cardano);
-            auto addr0 = AddressV2(pubKey0);
-            EXPECT_EQ("Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W", addr0.string());
-        }
-        {
-            PrivateKey privKey1 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/44'/1815'/0'/0/1"));
-            PublicKey pubKey1 = privKey1.getPublicKey(TWPublicKeyTypeED25519Cardano);
-            auto addr1 = AddressV2(pubKey1);
-            EXPECT_EQ("Ae2tdPwUPEZ7dnds6ZyhQdmgkrDFFPSDh8jG9RAhswcXt1bRauNw5jczjpV", addr1.string());
-        }
-        {
-            PrivateKey privKey1 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/44'/1815'/0'/0/2"));
-            PublicKey pubKey1 = privKey1.getPublicKey(TWPublicKeyTypeED25519Cardano);
-            auto addr1 = AddressV2(pubKey1);
-            EXPECT_EQ("Ae2tdPwUPEZ8LAVy21zj4BF97iWxKCmPv12W6a18zLX3V7rZDFFVgqUBkKw", addr1.string());
-        }
-        {
-            PrivateKey privKey0 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/1852'/1815'/0'/0/0"));
-            PublicKey pubKey0 = privKey0.getPublicKey(TWPublicKeyTypeED25519Cardano);
-            auto addr0 = AddressV3(pubKey0);
-            EXPECT_EQ("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq", addr0.string());
-        }
-        {
-            PrivateKey privKey1 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/1852'/1815'/0'/0/1"));
-            PublicKey pubKey1 = privKey1.getPublicKey(TWPublicKeyTypeED25519Cardano);
-            auto addr1 = AddressV3(pubKey1);
-            EXPECT_EQ("addr1q9068st87h22h3l6w6t5evnlm067rag94llqya2hkjrsd3wvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qpmxzjt", addr1.string());
-        }
-        {
-            PrivateKey privKey1 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/1852'/1815'/0'/0/2"));
-            PublicKey pubKey1 = privKey1.getPublicKey(TWPublicKeyTypeED25519Cardano);
-            auto addr1 = AddressV3(pubKey1);
-            EXPECT_EQ("addr1qxteqxsgxrs4he9d28lh70qu7qfz7saj6dmxwsqyle2yp3xvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35quehtx3", addr1.string());
-        }
-    }
-    {
-        auto mnemonicPlay1 = "youth away raise north opinion slice dash bus soldier dizzy bitter increase saddle live champion";
-        auto wallet = HDWallet(mnemonicPlay1, "");
-        string addr = wallet.deriveAddress(TWCoinType::TWCoinTypeCardano);
-        EXPECT_EQ("addr1q83nm9ntq3eaz8dya49txxtle6nn8geq4gmyylrzhzs7v0qjdwm6zuahwwds6c7mj8t6a09rup6m2cnh6zvzddnafp2slmcu95", addr);
-    }
-    {
-        auto mnemonicPlay2 = "return custom two home gain guilt kangaroo supply market current curtain tomorrow heavy blue robot";
-        auto wallet = HDWallet(mnemonicPlay2, "");
-        string addr = wallet.deriveAddress(TWCoinType::TWCoinTypeCardano);
-        EXPECT_EQ("addr1qywxuqm7dx0yvqnn2yllye9urz5f2e4fgwanluzh008r22e53hart525dxgjcl0xzm0kes4n5tan8f5pz7ej0tkzgyrqtfmlal", addr);
-    }
-    {
-        auto mnemonicALDemo = "civil void tool perfect avocado sweet immense fluid arrow aerobic boil flash";
-        auto wallet = HDWallet(mnemonicALDemo, "");
-        string addr = wallet.deriveAddress(TWCoinType::TWCoinTypeCardano);
-        EXPECT_EQ("addr1q94zzrtl32tjp8j96auatnhxd2y35fnk6wuxqvqm9364vp9spdkjdsmyfhvfagjzh4uzp9zs6p5djw89jac2g0ujs2eqsuy7pu", addr);
-    }
-    {
-        // V2 Tested against AdaLite
-        auto mnemonicPlay1 = "youth away raise north opinion slice dash bus soldier dizzy bitter increase saddle live champion";
-        auto wallet = HDWallet(mnemonicPlay1, "");
-        PrivateKey privateKey = wallet.getKey(TWCoinTypeCardano, DerivationPath(TWPurposeBIP44, TWCoinTypeCardano, DerivationPathIndex(0, true).derivationIndex(), 0, 0));
-        PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-        string addr = AddressV2(publicKey).string();
-        EXPECT_EQ("Ae2tdPwUPEZJYT9g1JgQWtLveUHavyRxQGi6hVzoQjct7yyCLGgk3pCyx7h", addr);
-    }
-    {
-        // V2 Tested against AdaLite
-        auto mnemonicPlay2 = "return custom two home gain guilt kangaroo supply market current curtain tomorrow heavy blue robot";
-        auto wallet = HDWallet(mnemonicPlay2, "");
-        PrivateKey privateKey = wallet.getKey(TWCoinTypeCardano, DerivationPath(TWPurposeBIP44, TWCoinTypeCardano, DerivationPathIndex(0, true).derivationIndex(), 0, 0));
-        PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-        string addr = AddressV2(publicKey).string();
-        EXPECT_EQ("Ae2tdPwUPEZLtJx7LA2XZ3zzwonH9x9ieX3dMzaTBD3TfXuKczjMSjTecr1", addr);
-    }
-    {
-        // V2 AdaLite Demo phrase, 12-word.  AdaLite uses V1 for it, in V2 it produces different addresses.
-        // In AdaLite V1 addr0 is DdzFFzCqrht7HGoJ87gznLktJGywK1LbAJT2sbd4txmgS7FcYLMQFhawb18ojS9Hx55mrbsHPr7PTraKh14TSQbGBPJHbDZ9QVh6Z6Di
-        auto mnemonicALDemo = "civil void tool perfect avocado sweet immense fluid arrow aerobic boil flash";
-        auto wallet = HDWallet(mnemonicALDemo, "");
-        PrivateKey privateKey = wallet.getKey(TWCoinTypeCardano, DerivationPath(TWPurposeBIP44, TWCoinTypeCardano, DerivationPathIndex(0, true).derivationIndex(), 0, 0));
-        PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-        string addr = AddressV2(publicKey).string();
-        EXPECT_EQ("Ae2tdPwUPEZJbLcD8iLgN7hVGvq66WdR4zocntRekSP97Ds3MvCfmEDjJYu", addr);
-    }
-}
-
-TEST(CardanoAddress, KeyHashV2) {
-    auto xpub = parse_hex("e6f04522f875c1563682ca876ddb04c2e2e3ae718e3ff9f11c03dd9f9dccf69869272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000");
-    auto hash = AddressV2::keyHash(xpub);
-    ASSERT_EQ("a1eda96a9952a56c983d9f49117f935af325e8a6c9d38496e945faa8", hex(hash));
-}
-
-TEST(CardanoAddress, FromDataV3_Base) {
-    auto address0 = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-    EXPECT_EQ(address0.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-    EXPECT_EQ(hex(address0.data()), "018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-    {
-        auto address = AddressV3(parse_hex("018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468"));
-        EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
-        EXPECT_EQ(address.networkId, AddressV3::Network_Production);
-        EXPECT_EQ(hex(address.bytes), "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-    }
-    {
-        auto address = AddressV3::createBase(AddressV3::Network_Production,
-            PublicKey(parse_hex("fafa7eb4146220db67156a03a5f7a79c666df83eb31abbfbe77c85e06d40da31"), TWPublicKeyTypeED25519),
-            PublicKey(parse_hex("f4b8d5201961e68f2e177ba594101f513ee70fe70a41324e8ea8eb787ffda6f4"), TWPublicKeyTypeED25519));
-        EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-    }
-}
-
-TEST(CardanoAddress, FromDataV3_Enterprise) {
-    auto address = AddressV3(parse_hex("61398efb30ecc28856d97f3714af49a93b9e0a2958520316660e16ae10"));
-    EXPECT_EQ(address.string(), "addr1vyuca7esanpgs4ke0um3ft6f4yaeuz3ftpfqx9nxpct2uyqu7dvlp");
-    EXPECT_EQ(address.kind, AddressV3::Kind_Enterprise);
-    EXPECT_EQ(address.networkId, AddressV3::Network_Production);
-    EXPECT_EQ(hex(address.bytes), "398efb30ecc28856d97f3714af49a93b9e0a2958520316660e16ae10");
-}
-
-TEST(CardanoAddress, FromDataV3_Reward) {
-    auto address = AddressV3(parse_hex("e10a84430507e150f0a06109dc3a7b1956b7a0586ae9078a55ef0e0b03"));
-    EXPECT_EQ(address.string(), "stake1uy9ggsc9qls4pu9qvyyacwnmr9tt0gzcdt5s0zj4au8qkqc65geks");
-    EXPECT_EQ(address.kind, AddressV3::Kind_Reward);
-    EXPECT_EQ(address.networkId, AddressV3::Network_Production);
-    EXPECT_EQ(hex(address.bytes), "0a84430507e150f0a06109dc3a7b1956b7a0586ae9078a55ef0e0b03");
-}
-
-TEST(CardanoAddress, FromDataV3_Invalid) {
-    {   // base, invalid length
-        auto address = AddressV3(parse_hex("018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a34"));
-        EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32xsmpqws7");
-        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
-        EXPECT_EQ(address.networkId, AddressV3::Network_Production);
-        EXPECT_EQ(hex(address.bytes), "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a34");
-    }
-    {   // kind = 8
-        auto address = AddressV3(parse_hex("818d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468"));
-        EXPECT_EQ(address.string(), "addr1sxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qmxapsy");
-        EXPECT_EQ(address.kind, static_cast<AddressV3::Kind>(8));
-        EXPECT_EQ(address.networkId, AddressV3::Network_Production);
-        EXPECT_EQ(hex(address.bytes), "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-    }
-}
-
-TEST(CardanoAddress, FromPublicKeyV2) {
-    {
-        // caradano-crypto.js test
-        auto publicKey = PublicKey(parse_hex(
-                                       "e6f04522f875c1563682ca876ddb04c2e2e3ae718e3ff9f11c03dd9f9dccf69869272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"
-                                       "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" // dummy second
-            ), TWPublicKeyTypeED25519Cardano);
-        auto address = AddressV2(publicKey);
-        ASSERT_EQ(address.string(), "Ae2tdPwUPEZCxt4UV1Uj2AMMRvg5pYPypqZowVptz3GYpK4pkcvn3EjkuNH");
-    }
-    {
-        // Adalite test account addr0
-        auto publicKey = PublicKey(parse_hex(
-                                       "57fd54be7b38bb8952782c2f59aa276928a4dcbb66c8c62ce44f9d623ecd5a03bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4"
-                                       "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" // dummy second
-            ), TWPublicKeyTypeED25519Cardano);
-        auto address = AddressV2(publicKey);
-        ASSERT_EQ(address.string(), "Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W");
-    }
-    {
-        // Adalite test account addr1
-        auto publicKey = PublicKey(parse_hex(
-                                       "25af99056d600f7956312406bdd1cd791975bb1ae91c9d034fc65f326195fcdb247ee97ec351c0820dd12de4ca500232f73a35fe6f86778745bcd57f34d1048d"
-                                       "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" // dummy second
-            ), TWPublicKeyTypeED25519Cardano);
-        auto address = AddressV2(publicKey);
-        ASSERT_EQ(address.string(), "Ae2tdPwUPEZ7dnds6ZyhQdmgkrDFFPSDh8jG9RAhswcXt1bRauNw5jczjpV");
-    }
-    {
-        // Play1 addr0
-        auto publicKey = PublicKey(parse_hex(
-                                       "7cee0f30b9d536a786547dd77b35679b6830e945ffde768eb4f2a061b9dba016e513fa1290da1d22e83a41f17eed72d4489483b561fff36b9555ffdb91c430e2"
-                                       "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" // dummy second
-            ), TWPublicKeyTypeED25519Cardano);
-        auto address = AddressV2(publicKey);
-        ASSERT_EQ(address.string(), "Ae2tdPwUPEZJYT9g1JgQWtLveUHavyRxQGi6hVzoQjct7yyCLGgk3pCyx7h");
-    }
-}
-
-TEST(CardanoAddress, FromPrivateKeyV2) {
-    {
-        // mnemonic Test, addr0
-        auto privateKey = PrivateKey(
-            parse_hex("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744"),
-            parse_hex("309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71eff"),
-            parse_hex("bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4"),
-            dummyKey, dummyKey, dummyKey
-        );
-        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-        ASSERT_EQ(hex(publicKey.bytes),
-            "57fd54be7b38bb8952782c2f59aa276928a4dcbb66c8c62ce44f9d623ecd5a03"
-            "bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4"
-            "857eed804ff087b97f87848f6493e87257a8c5203cb9f422f6e7a7d8a4d299f3"
-            "1111111111111111111111111111111111111111111111111111111111111111");
-        auto address = AddressV2(publicKey);
-        ASSERT_EQ(address.string(), "Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W");
-    }
-    {
-        // mnemonic Play1, addr0
-        auto privateKey = PrivateKey(
-            parse_hex("a089c9423100960440ccd5b7adbd202d1ab1993a7bb30fc88b287d94016df247"),
-            parse_hex("da86a87f08fb15de1431a6c0ccd5ebf51c3bee81f7eaf714801bbbe4d903154a"),
-            parse_hex("e513fa1290da1d22e83a41f17eed72d4489483b561fff36b9555ffdb91c430e2"),
-            dummyKey, dummyKey, dummyKey
-        );
-        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-        ASSERT_EQ(hex(publicKey.bytes),
-            "7cee0f30b9d536a786547dd77b35679b6830e945ffde768eb4f2a061b9dba016"
-            "e513fa1290da1d22e83a41f17eed72d4489483b561fff36b9555ffdb91c430e2"
-            "857eed804ff087b97f87848f6493e87257a8c5203cb9f422f6e7a7d8a4d299f3"
-            "1111111111111111111111111111111111111111111111111111111111111111");
-        auto address = AddressV2(publicKey);
-        ASSERT_EQ(address.string(), "Ae2tdPwUPEZJYT9g1JgQWtLveUHavyRxQGi6hVzoQjct7yyCLGgk3pCyx7h");
-    }
-    {
-        // from cardano-crypto.js test
-        auto privateKey = PrivateKey(
-            parse_hex("d809b1b4b4c74734037f76aace501730a3fe2fca30b5102df99ad3f7c0103e48"),
-            parse_hex("d54cde47e9041b31f3e6873d700d83f7a937bea746dadfa2c5b0a6a92502356c"),
-            parse_hex("69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"),
-            dummyKey, dummyKey, dummyKey
-        );
-        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-        ASSERT_EQ(hex(publicKey.bytes),
-            "e6f04522f875c1563682ca876ddb04c2e2e3ae718e3ff9f11c03dd9f9dccf698"
-            "69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"
-            "857eed804ff087b97f87848f6493e87257a8c5203cb9f422f6e7a7d8a4d299f3"
-            "1111111111111111111111111111111111111111111111111111111111111111");
-        auto address = AddressV2(publicKey);
-        ASSERT_EQ(address.string(), "Ae2tdPwUPEZCxt4UV1Uj2AMMRvg5pYPypqZowVptz3GYpK4pkcvn3EjkuNH");
-    }
-}
-
-TEST(CardanoAddress, PrivateKeyExtended) {
-    // check extended key lengths, private key 2x3x32 bytes, public key 2x64 bytes
-    auto privateKeyExt = PrivateKey(
-        parse_hex("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744"),
-        parse_hex("309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71eff"),
-        parse_hex("bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4"),
-        dummyKey, dummyKey, dummyKey
-    );
-    auto publicKeyExt = privateKeyExt.getPublicKey(TWPublicKeyTypeED25519Cardano);
-    ASSERT_EQ(128ul, publicKeyExt.bytes.size());
-
-    // Non-extended: both are 32 bytes.
-    auto privateKeyNonext = PrivateKey(
-        parse_hex("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744")
-    );
-    auto publicKeyNonext = privateKeyNonext.getPublicKey(TWPublicKeyTypeED25519);
-    ASSERT_EQ(32ul, publicKeyNonext.bytes.size());
-}
-
-TEST(CardanoAddress, FromStringNegativeInvalidString) {
-    try {
-        auto address = AddressV3("__INVALID_ADDRESS__");
-    } catch (...) {
-        return;
-    }
-    FAIL() << "Expected exception!";
-}
-
-TEST(CardanoAddress, FromStringNegativeBadChecksumV2) {
-    try {
-        auto address = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvm");
-    } catch (...) {
-        return;
-    }
-    FAIL() << "Expected exception!";
-}
-
-TEST(CardanoAddress, CopyConstructorLegacy) {
-    AddressV3 address1 = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
-    EXPECT_TRUE(address1.legacyAddressV2.has_value());
-    AddressV3 address2 = AddressV3(address1);
-    EXPECT_TRUE(address2.legacyAddressV2.has_value());
-    EXPECT_TRUE(*(address2.legacyAddressV2) == *(address1.legacyAddressV2));
-    // if it was not a deep copy, double freeing would occur
-}
-
-TEST(CardanoAddress, AssignmentOperatorLegacy) {
-    AddressV3 addr1leg = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
-    EXPECT_TRUE(addr1leg.legacyAddressV2.has_value());
-    AddressV3 addr2nonleg = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-    EXPECT_FALSE(addr2nonleg.legacyAddressV2.has_value());
-    AddressV3 addr3leg = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
-    EXPECT_TRUE(addr3leg.legacyAddressV2.has_value());
-
-    AddressV3 address = addr1leg;
-    EXPECT_TRUE(address.legacyAddressV2.has_value());
-    EXPECT_TRUE(*address.legacyAddressV2 == *addr1leg.legacyAddressV2);
-    address = addr2nonleg;
-    EXPECT_FALSE(address.legacyAddressV2.has_value());
-    address = addr3leg;
-    EXPECT_TRUE(address.legacyAddressV2.has_value());
-    EXPECT_TRUE(*address.legacyAddressV2 == *addr3leg.legacyAddressV2);
-}
-
-TEST(CardanoAddress, StakingKey) {
-    {
-        auto address = AddressV3("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23");
-        EXPECT_EQ(hex(address.data()), "01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b");
-        EXPECT_EQ(address.getStakingAddress(), "stake1u80jysjtdzqt88jt4jx93h5lumfr67d273r4vwyasfa2pxcwxllmx");
-        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).data()), "e1df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b");
-        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).bytes), "df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b");
-    }
-    {
-        auto address = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-        EXPECT_EQ(hex(address.data()), "018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-        EXPECT_EQ(address.getStakingAddress(), "stake1u8xxf0e93w8rxr8sehvlmvp7zz6wftqg7hdplhkxyg4rg6qwgxzhc");
-        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).data()), "e1cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).bytes), "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
-    }
-    {
-        auto address = AddressV3("addr1q8lcljuzfg8yvpuv94x02sytmwd8jsalzf6u0j8muhq69wng9ejcvpyczmw0zx7wguq2dml4xdl2wj3k7uexsfnxep2q9ja352");
-        EXPECT_EQ(hex(address.data()), "01ff8fcb824a0e46078c2d4cf5408bdb9a7943bf1275c7c8fbe5c1a2ba682e6586049816dcf11bce4700a6eff5337ea74a36f732682666c854");
-        EXPECT_EQ(address.getStakingAddress(), "stake1u95zuevxqjvpdh83r08ywq9xal6nxl48fgm0wvngyenvs4qh0hqf9");
-        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).data()), "e1682e6586049816dcf11bce4700a6eff5337ea74a36f732682666c854");
-        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).bytes), "682e6586049816dcf11bce4700a6eff5337ea74a36f732682666c854");
-    }
-    {   // negative case: cannot get staking address from non-base address
-        auto address = AddressV3("stake1u95zuevxqjvpdh83r08ywq9xal6nxl48fgm0wvngyenvs4qh0hqf9");
-        EXPECT_EQ(hex(address.data()), "e1682e6586049816dcf11bce4700a6eff5337ea74a36f732682666c854");
-        EXPECT_EQ(address.getStakingAddress(), "");
-    }
-}
-
-} // namespace TW::Cardano::tests
diff --git a/tests/Cardano/SigningTests.cpp b/tests/Cardano/SigningTests.cpp
deleted file mode 100644
index d0fb95a5a95..00000000000
--- a/tests/Cardano/SigningTests.cpp
+++ /dev/null
@@ -1,813 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Cardano/AddressV3.h"
-#include "Cardano/Signer.h"
-#include "proto/Cardano.pb.h"
-#include <TrustWalletCore/TWCardano.h>
-
-#include "Cbor.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-#include <vector>
-
-using namespace TW;
-using namespace std;
-
-namespace TW::Cardano::SigningTests {
-
-const auto privateKeyTest1 = "089b68e458861be0c44bf9f7967f05cc91e51ede86dc679448a3566990b7785bd48c330875b1e0d03caaed0e67cecc42075dce1c7a13b1c49240508848ac82f603391c68824881ae3fc23a56a1a75ada3b96382db502e37564e84a5413cfaf1290dbd508e5ec71afaea98da2df1533c22ef02a26bb87b31907d0b2738fb7785b38d53aa68fc01230784c9209b2b2a2faf28491b3b1f1d221e63e704bbd0403c4154425dfbb01a2c5c042da411703603f89af89e57faae2946e2a5c18b1c5ca0e";
-const auto ownAddress1 = "addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23";
-const auto sundaeTokenPolicy = "9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77";
-
-TEST(CardanoSigning, SelectInputs) {
-    const auto inputs = std::vector<TxInput>({
-        TxInput{{parse_hex("0001"), 0}, "ad01", 700, {}},
-        TxInput{{parse_hex("0002"), 1}, "ad02", 900, {}},
-        TxInput{{parse_hex("0003"), 2}, "ad03", 300, {}},
-        TxInput{{parse_hex("0004"), 3}, "ad04", 600, {}},
-    });
-
-    { // 2
-        const auto s1 = Signer::selectInputsWithTokens(inputs, 1500, {});
-        ASSERT_EQ(s1.size(), 2ul);
-        EXPECT_EQ(s1[0].amount, 900ul);
-        EXPECT_EQ(s1[1].amount, 700ul);
-    }
-    { // all
-        const auto s1 = Signer::selectInputsWithTokens(inputs, 10000, {});
-        ASSERT_EQ(s1.size(), 4ul);
-        EXPECT_EQ(s1[0].amount, 900ul);
-        EXPECT_EQ(s1[1].amount, 700ul);
-        EXPECT_EQ(s1[2].amount, 600ul);
-        EXPECT_EQ(s1[3].amount, 300ul);
-    }
-    { // 3
-        const auto s1 = Signer::selectInputsWithTokens(inputs, 2000, {});
-        ASSERT_EQ(s1.size(), 3ul);
-    }
-    { // 1
-        const auto s1 = Signer::selectInputsWithTokens(inputs, 500, {});
-        ASSERT_EQ(s1.size(), 1ul);
-    }
-    { // at least 0 is returned
-        const auto s1 = Signer::selectInputsWithTokens(inputs, 0, {});
-        ASSERT_EQ(s1.size(), 1ul);
-    }
-}
-
-Proto::SigningInput createSampleInput(uint64_t amount, int utxoCount = 10,
-                                      const std::string& alternateToAddress = "", bool omitPrivateKey = false) {
-    const std::string toAddress = (alternateToAddress.length() > 0) ? alternateToAddress : "addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5";
-
-    Proto::SigningInput input;
-    if (utxoCount >= 1) {
-        auto* utxo1 = input.add_utxos();
-        const auto txHash1 = parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767");
-        utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-        utxo1->mutable_out_point()->set_output_index(1);
-        utxo1->set_address(ownAddress1);
-        utxo1->set_amount(1500000);
-    }
-    if (utxoCount >= 2) {
-        auto* utxo2 = input.add_utxos();
-        const auto txHash2 = parse_hex("554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0");
-        utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
-        utxo2->mutable_out_point()->set_output_index(0);
-        utxo2->set_address(ownAddress1);
-        utxo2->set_amount(6500000);
-    }
-
-    if (!omitPrivateKey) {
-        const auto privateKeyData = parse_hex(privateKeyTest1);
-        input.add_private_key(privateKeyData.data(), privateKeyData.size());
-    }
-    input.mutable_transfer_message()->set_to_address(toAddress);
-    input.mutable_transfer_message()->set_change_address(ownAddress1);
-    input.mutable_transfer_message()->set_amount(amount);
-    input.mutable_transfer_message()->set_use_max_amount(false);
-    input.set_ttl(53333333);
-    return input;
-}
-
-TEST(CardanoSigning, Plan) {
-    auto input = createSampleInput(7000000);
-
-    {
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.utxos.size(), 2ul);
-        EXPECT_EQ(plan.availableAmount, 8000000ul);
-        EXPECT_EQ(plan.amount, 7000000ul);
-        EXPECT_EQ(plan.fee, 170196ul);
-        EXPECT_EQ(plan.change, 829804ul);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-        EXPECT_EQ(plan.error, Common::Proto::OK);
-    }
-    { // very small target amount
-        input.mutable_transfer_message()->set_amount(1);
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.utxos.size(), 1ul);
-        EXPECT_EQ(plan.availableAmount, 6500000ul);
-        EXPECT_EQ(plan.amount, 1ul);
-        EXPECT_EQ(plan.fee, 168435ul);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-    }
-    { // small target amount
-        input.mutable_transfer_message()->set_amount(2000000);
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.utxos.size(), 1ul);
-        EXPECT_EQ(plan.availableAmount, 6500000ul);
-        EXPECT_EQ(plan.amount, 2000000ul);
-        EXPECT_EQ(plan.fee, 168611ul);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-    }
-    { // small target amount requested, but max amount
-        input.mutable_transfer_message()->set_amount(2000000);
-        input.mutable_transfer_message()->set_use_max_amount(true);
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.utxos.size(), 2ul);
-        EXPECT_EQ(plan.availableAmount, 8000000ul);
-        EXPECT_EQ(plan.amount, 7832667ul);
-        EXPECT_EQ(plan.fee, 167333ul);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-    }
-}
-
-TEST(CardanoSigning, PlanForceFee) {
-    auto requestedAmount = 6500000ul;
-    auto availableAmount = 8000000ul;
-    auto input = createSampleInput(requestedAmount);
-
-    {
-        auto fee = 170147ul;
-        input.mutable_transfer_message()->set_force_fee(fee);
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.availableAmount, availableAmount);
-        EXPECT_EQ(plan.amount, requestedAmount);
-        EXPECT_EQ(plan.fee, fee);
-        EXPECT_EQ(plan.change, availableAmount - requestedAmount - fee);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-        EXPECT_EQ(plan.error, Common::Proto::OK);
-    }
-    { // tiny fee
-        auto fee = 100ul;
-        input.mutable_transfer_message()->set_force_fee(fee);
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.availableAmount, availableAmount);
-        EXPECT_EQ(plan.amount, requestedAmount);
-        EXPECT_EQ(plan.fee, fee);
-        EXPECT_EQ(plan.change, availableAmount - requestedAmount - fee);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-    }
-    { // large fee
-        auto fee = 1200000ul;
-        input.mutable_transfer_message()->set_force_fee(fee);
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.availableAmount, availableAmount);
-        EXPECT_EQ(plan.amount, requestedAmount);
-        EXPECT_EQ(plan.fee, fee);
-        EXPECT_EQ(plan.change, availableAmount - requestedAmount - fee);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-    }
-    { // very large fee, larger than possible, truncated
-        auto fee = 3000000ul;
-        input.mutable_transfer_message()->set_force_fee(fee);
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.availableAmount, availableAmount);
-        EXPECT_EQ(plan.amount, requestedAmount);
-        EXPECT_EQ(plan.fee, 1500000ul);
-        EXPECT_EQ(plan.change, 0ul);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-    }
-    { // force fee and max amount: fee is used, amount is max, change 0
-        auto fee = 160000ul;
-        input.mutable_transfer_message()->set_force_fee(fee);
-        input.mutable_transfer_message()->set_use_max_amount(true);
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-        EXPECT_EQ(plan.availableAmount, availableAmount);
-        EXPECT_EQ(plan.amount, 7840000ul);
-        EXPECT_EQ(plan.fee, fee);
-        EXPECT_EQ(plan.change, 0ul);
-        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-    }
-}
-
-TEST(CardanoSigning, PlanMissingPrivateKey) {
-    auto input = createSampleInput(7000000, 10, "", true);
-
-    auto signer = Signer(input);
-    const auto plan = signer.doPlan();
-
-    EXPECT_EQ(plan.utxos.size(), 2ul);
-    EXPECT_EQ(plan.availableAmount, 8000000ul);
-    EXPECT_EQ(plan.amount, 7000000ul);
-    EXPECT_EQ(plan.fee, 170196ul);
-    EXPECT_EQ(plan.change, 829804ul);
-    EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
-    EXPECT_EQ(plan.error, Common::Proto::OK);
-}
-
-TEST(CardanoSigning, SignTransfer1) {
-    const auto input = createSampleInput(7000000);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a40082825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a006acfc082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a000ca96c021a000298d4031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058407cf591599852b5f5e007fdc241062405c47e519266c0d884b0767c1d4f5eacce00db035998e53ed10ca4ba5ce4aac8693798089717ce6cf4415f345cc764200ef6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "9b5b15e133cd73ccaa85307d2986aebc846505118a2eb4e6111e6b4b67d1f389");
-
-    {
-        const auto decode = Cbor::Decode(encoded);
-        ASSERT_TRUE(decode.isValid());
-        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0\", 0], [h\"f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767\", 1]], 1: [[h\"01558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd5\", 7000000], [h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 829804]], 2: 170196, 3: 53333333}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"7cf591599852b5f5e007fdc241062405c47e519266c0d884b0767c1d4f5eacce00db035998e53ed10ca4ba5ce4aac8693798089717ce6cf4415f345cc764200e\"]]}, null]");
-        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
-    }
-}
-
-TEST(CardanoSigning, PlanAndSignTransfer1) {
-    uint amount = 6000000;
-    auto input = createSampleInput(amount);
-
-    {
-        // run plan and check result
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-
-        EXPECT_EQ(plan.availableAmount, 8000000ul);
-        EXPECT_EQ(plan.amount, amount);
-        EXPECT_EQ(plan.fee, 170196ul);
-        EXPECT_EQ(plan.change, 8000000 - amount - 170196);
-        ASSERT_EQ(plan.utxos.size(), 2ul);
-        EXPECT_EQ(plan.utxos[0].amount, 6500000ul);
-        EXPECT_EQ(plan.utxos[1].amount, 1500000ul);
-
-        // perform sign with default plan
-        const auto output = signer.sign();
-
-        EXPECT_EQ(output.error(), Common::Proto::OK);
-
-        const auto encoded = data(output.encoded());
-        EXPECT_EQ(hex(encoded), "83a40082825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a005b8d8082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a001bebac021a000298d4031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058404abc749ffaffcf2f87970e4f1983c5e44b352ee1515b60017fc65e581d42b3a6ed146d5eb35d04a770460b0541a25afd5aedfd027fdaded82686f43454196a0cf6");
-        const auto txid = data(output.tx_id());
-        EXPECT_EQ(hex(txid), "3852f809245d7000ad0c5ccb1357e5d333b0dd25158924581e4c7049ec68c564");
-    }
-
-    // set different plan, with one input only
-    input.mutable_plan()->set_amount(amount);
-    input.mutable_plan()->set_available_amount(6500000);
-    input.mutable_plan()->set_fee(165489);
-    input.mutable_plan()->set_change(17191988);
-    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
-    input.mutable_plan()->set_error(Common::Proto::OK);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a40081825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a005b8d8082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a01065434021a00028671031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058408311a058035d75545a47b844fea401aa9c23e99fe7bc8136b554396eef135d4cd93062c5df38e613185c21bb1c98b881d1e0fd1024d3539b163c8e14d1a6e40df6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "e319c0bfc99cdb79d64f00b7e8fb8bfbf29fa70554c84f101e92b7dfed172448");
-}
-
-TEST(CardanoSigning, PlanAndSignMaxAmount) {
-    auto input = createSampleInput(7000000);
-    input.mutable_transfer_message()->set_use_max_amount(true);
-
-    {
-        // run plan and check result
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-
-        EXPECT_EQ(plan.availableAmount, 8000000ul);
-        EXPECT_EQ(plan.amount, 8000000 - 167333ul);
-        EXPECT_EQ(plan.fee, 167333ul);
-        EXPECT_EQ(plan.change, 0ul);
-        ASSERT_EQ(plan.utxos.size(), 2ul);
-        EXPECT_EQ(plan.utxos[0].amount, 1500000ul);
-        EXPECT_EQ(plan.utxos[1].amount, 6500000ul);
-    }
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a40082825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000018182583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a0077845b021a00028da5031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058403e64473e08adc863953c0e9f820b658dda0b8a423d6172fdccff73fcd5559956c9df8ed93ff67405331d368a0c11fd18c69781046384946582e1555e9e8ec70bf6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "ca0f1e12f20c95011da7d686d206a1eb98df94accd74c4df4ef403c5ce836057");
-}
-
-TEST(CardanoSigning, SignNegative) {
-    { // plan with error
-        auto input = createSampleInput(7000000);
-        const auto error = Common::Proto::Error_invalid_memo;
-        input.mutable_plan()->set_error(error);
-        auto signer = Signer(input);
-        const auto output = signer.sign();
-        EXPECT_EQ(output.error(), error);
-    }
-    { // zero requested amount
-        auto input = createSampleInput(0);
-        auto signer = Signer(input);
-        const auto output = signer.sign();
-        EXPECT_EQ(output.error(), Common::Proto::Error_zero_amount_requested);
-    }
-    { // no utxo
-        auto input = createSampleInput(7000000, 0);
-        auto signer = Signer(input);
-        const auto output = signer.sign();
-        EXPECT_EQ(output.error(), Common::Proto::Error_missing_input_utxos);
-    }
-    { // low balance
-        auto input = createSampleInput(7000000000);
-        auto signer = Signer(input);
-        const auto output = signer.sign();
-        EXPECT_EQ(output.error(), Common::Proto::Error_low_balance);
-    }
-    { // missing private key
-        auto input = createSampleInput(7000000, 10, "", true);
-        auto signer = Signer(input);
-        const auto output = signer.sign();
-        EXPECT_EQ(output.error(), Common::Proto::Error_missing_private_key);
-    }
-}
-
-TEST(CardanoSigning, SignTransfer_0db1ea) {
-    const auto amount = 1100000ul;
-
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("81b935447bb994567f041d181b628a0afbcd747d0199c9ff4cd895686bbee8c6");
-    utxo1->mutable_out_point()->set_tx_hash(std::string(txHash1.begin(), txHash1.end()));
-    utxo1->mutable_out_point()->set_output_index(0);
-    utxo1->set_address(ownAddress1);
-    utxo1->set_amount(1000000);
-    auto* utxo2 = input.add_utxos();
-    const auto txHash2 = parse_hex("3a9068a273cc2af59b45593b78973841d972d01802abe992c55dbeecdffc561b");
-    utxo2->mutable_out_point()->set_tx_hash(std::string(txHash2.begin(), txHash2.end()));
-    utxo2->mutable_out_point()->set_output_index(0);
-    utxo2->set_address(ownAddress1);
-    utxo2->set_amount(1800000);
-
-    const auto privateKeyData1 = parse_hex(privateKeyTest1);
-    input.add_private_key(privateKeyData1.data(), privateKeyData1.size());
-    input.mutable_transfer_message()->set_to_address("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-    input.mutable_transfer_message()->set_change_address(ownAddress1);
-    input.mutable_transfer_message()->set_amount(amount);
-    auto fee = 170147ul;
-    input.mutable_transfer_message()->set_use_max_amount(false);
-    input.mutable_transfer_message()->set_force_fee(fee); // use force fee feature here
-    input.set_ttl(54675589);
-
-    {
-        // run plan and check result
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-
-        EXPECT_EQ(plan.availableAmount, 2800000ul);
-        EXPECT_EQ(plan.amount, amount);
-        EXPECT_EQ(plan.fee, fee);
-        EXPECT_EQ(plan.change, 2800000ul - amount - fee);
-        EXPECT_EQ(plan.utxos.size(), 2ul);
-    }
-
-    // set plan with specific fee, to match the real transaction
-    input.mutable_plan()->set_amount(amount);
-    input.mutable_plan()->set_available_amount(2800000);
-    input.mutable_plan()->set_fee(fee);
-    input.mutable_plan()->set_change(2800000 - amount - fee);
-    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
-    *(input.mutable_plan()->add_utxos()) = input.utxos(1);
-    input.mutable_plan()->set_error(Common::Proto::OK);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    // https://cardanoscan.io/transaction/0db1ea8c5c5828bbd027fcef3da02a63b86899db670ad7bb0630cefbe35944fa
-    // curl -d '{"txHash":"0db1ea..44fa","txBody":"83a400..06f6"}' -H "Content-Type: application/json" https://<cardano-node>/api/txs/submit
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a4008282582081b935447bb994567f041d181b628a0afbcd747d0199c9ff4cd895686bbee8c6008258203a9068a273cc2af59b45593b78973841d972d01802abe992c55dbeecdffc561b000182825839018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a34681a0010c8e082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a001757fd021a000298a3031a03424885a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058406300b52aaff1e26067a3e0a48ae26f4f068765f46f934fabeab872c1d25535fc94893ec72feacd787f0174fbabd8933727d9a2b319b406e7a855843b0c051806f6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "0db1ea8c5c5828bbd027fcef3da02a63b86899db670ad7bb0630cefbe35944fa");
-}
-
-TEST(CardanoSigning, SignTransferFromLegacy) {
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(1);
-    utxo1->set_address("Ae2tdPwUPEZMRgecV9jV2e9RdbrmnWu7YgRie4de16xLdkWhy6q7ypmRhgn");
-    utxo1->set_amount(1500000);
-    auto* utxo2 = input.add_utxos();
-    const auto txHash2 = parse_hex("554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0");
-    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
-    utxo2->mutable_out_point()->set_output_index(0);
-    utxo2->set_address("Ae2tdPwUPEZMRgecV9jV2e9RdbrmnWu7YgRie4de16xLdkWhy6q7ypmRhgn");
-    utxo2->set_amount(6500000);
-
-    const auto privateKeyData = parse_hex("c031e942f6bf2b2864700e7da20964ee6bb6d716345ce2e24d8c00e6500b574411111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111");
-    {
-        const auto privKey = PrivateKey(privateKeyData);
-        const auto pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-        const auto addr = AddressV2(pubKey);
-        EXPECT_EQ(addr.string(), "Ae2tdPwUPEZMRgecV9jV2e9RdbrmnWu7YgRie4de16xLdkWhy6q7ypmRhgn");
-    }
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-    input.mutable_transfer_message()->set_to_address("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
-    input.mutable_transfer_message()->set_change_address(ownAddress1);
-    input.mutable_transfer_message()->set_amount(7000000);
-    input.mutable_transfer_message()->set_use_max_amount(false);
-    input.set_ttl(53333333);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::Error_invalid_address);
-    EXPECT_EQ(hex(output.encoded()), "");
-}
-
-TEST(CardanoSigning, SignTransferToLegacy) {
-    const auto toAddressLegacy = "DdzFFzCqrhssmYoG5Eca1bKZFdGS8d6iag1mU4wbLeYcSPVvBNF2wRG8yhjzQqErbg63N6KJA4DHqha113tjKDpGEwS5x1dT2KfLSbSJ";
-    EXPECT_FALSE(AddressV3::isValid(toAddressLegacy)); // not V3
-    EXPECT_TRUE(AddressV3::isValidLegacy(toAddressLegacy));
-
-    const auto input = createSampleInput(7000000, 10, toAddressLegacy);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-    EXPECT_EQ(hex(output.encoded()), "83a40082825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282584c82d818584283581c6aebd89cf88271c3ee76339930d8956b03f018b2f4871522f88eb8f9a101581e581c692a37dae3bc63dfc3e1463f12011f26655ab1d1e0f4ed4b8fc63708001ad8a9555b1a006acfc082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a000ca627021a00029c19031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840db9becdc733f4c08c0e7abc29b5cc6469f9339d32f565df8bf77455439ae1f949facc9b831754e74d3fbb42e99647eedd6c28de1461d18c315485f5d24b5b90af6");
-    EXPECT_EQ(hex(data(output.tx_id())), "f9b713e9987ec1377ac223f50d63c7a5e155915302de43f40d7b2627accabf69");
-}
-
-TEST(CardanoSigning, SignTransferToInvalid) {
-    const auto input = createSampleInput(7000000, 10, "__INVALID_ADDRESS__");
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::Error_invalid_address);
-    EXPECT_EQ(hex(output.encoded()), "");
-}
-
-TEST(CardanoSigning, SignTransferToken) {
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(1);
-    utxo1->set_address(ownAddress1);
-    utxo1->set_amount(8051373);
-    // some token, to be preserved
-    auto* token3 = utxo1->add_token_amount();
-    token3->set_policy_id(sundaeTokenPolicy);
-    token3->set_asset_name("CUBY");
-    const auto tokenAmount3 = store(uint256_t(3000000));
-    token3->set_amount(tokenAmount3.data(), tokenAmount3.size());
-
-    auto* utxo2 = input.add_utxos();
-    const auto txHash2 = parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767");
-    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
-    utxo2->mutable_out_point()->set_output_index(2);
-    utxo2->set_address(ownAddress1);
-    utxo2->set_amount(2000000);
-    // some SUNDAE token, to be transferred
-    auto* token1 = utxo2->add_token_amount();
-    token1->set_policy_id(sundaeTokenPolicy);
-    token1->set_asset_name("SUNDAE");
-    const auto tokenAmount1 = store(uint256_t(80996569));
-    token1->set_amount(tokenAmount1.data(), tokenAmount1.size());
-    // some other token, to be preserved
-    auto* token2 = utxo2->add_token_amount();
-    token2->set_policy_id(sundaeTokenPolicy);
-    token2->set_asset_name("CUBY");
-    const auto tokenAmount2 = store(uint256_t(2000000));
-    token2->set_amount(tokenAmount2.data(), tokenAmount2.size());
-
-    const auto privateKeyData = parse_hex(privateKeyTest1);
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-    input.mutable_transfer_message()->set_to_address("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
-    input.mutable_transfer_message()->set_change_address("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
-    input.mutable_transfer_message()->set_amount(1500000);
-    auto* toToken = input.mutable_transfer_message()->mutable_token_amount()->add_token();
-    toToken->set_policy_id(sundaeTokenPolicy);
-    toToken->set_asset_name("SUNDAE");
-    const auto toTokenAmount = store(uint256_t(20000000));
-    toToken->set_amount(toTokenAmount.data(), toTokenAmount.size());
-    input.mutable_transfer_message()->set_use_max_amount(false);
-    input.set_ttl(53333333);
-
-    { // check min ADA amount, set it
-        const auto bundleProtoData = data(input.transfer_message().token_amount().SerializeAsString());
-        const auto minAdaAmount = TWCardanoMinAdaAmount(&bundleProtoData);
-        EXPECT_EQ(minAdaAmount, 1444443ul);
-        input.mutable_transfer_message()->set_amount(minAdaAmount);
-    }
-
-    {
-        // run plan and check result
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-
-        EXPECT_EQ(plan.availableAmount, 10051373ul);
-        EXPECT_EQ(plan.amount, 1444443ul);
-        EXPECT_EQ(plan.fee, 174601ul);
-        EXPECT_EQ(plan.change, 8432329ul);
-        EXPECT_EQ(plan.utxos.size(), 2ul);
-        EXPECT_EQ(plan.availableTokens.size(), 2ul);
-        EXPECT_EQ(plan.availableTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_CUBY"), 5000000);
-        EXPECT_EQ(plan.availableTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 80996569);
-        EXPECT_EQ(plan.outputTokens.size(), 1ul);
-        EXPECT_EQ(plan.outputTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_CUBY"), 0);
-        EXPECT_EQ(plan.outputTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 20000000);
-        EXPECT_EQ(plan.changeTokens.size(), 2ul);
-        EXPECT_EQ(plan.changeTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_CUBY"), 5000000);
-        EXPECT_EQ(plan.changeTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 60996569);
-    }
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a40082825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76702018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd5821a00160a5ba1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a14653554e4441451a01312d00825839018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468821a0080aac9a1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a244435542591a004c4b404653554e4441451a03a2bbd9021a0002aa09031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840d90dcfbd190cbe59c42094e59eeb49b3de9d80a85b786cc311f932c5c9302d1c8c6c577b22aa70ff7955c139c700ea918f8cb425c3ba43a27980e1d238e4e908f6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "201c537693b005b64a0f0528e366ec67a84be0119ed4363b547f141f2a7770c2");
-
-    {
-        // also test proto toProto / fromProto
-        const Proto::TransactionPlan planProto = Signer::plan(input);
-        const auto plan2 = TransactionPlan::fromProto(planProto);
-        EXPECT_EQ(plan2.amount, 1444443ul);
-        EXPECT_EQ(plan2.change, 8432329ul);
-    }
-}
-
-TEST(CardanoSigning, SignTransferToken_1dd248) {
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("f2d2b11c8c07c5c646f5b5af20fddf2f0a174743c6a1b13cca27e28a6ca34710");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(0);
-    utxo1->set_address(ownAddress1);
-    utxo1->set_amount(1500000);
-    // some token
-    auto* token3 = utxo1->add_token_amount();
-    token3->set_policy_id(sundaeTokenPolicy);
-    token3->set_asset_name("SUNDAE");
-    const auto tokenAmount3 = store(uint256_t(20000000));
-    token3->set_amount(tokenAmount3.data(), tokenAmount3.size());
-
-    auto* utxo2 = input.add_utxos();
-    const auto txHash2 = parse_hex("6975fcf7bbca745c85f50777f956219868fd9cad14ba496fed1371252e8df60f");
-    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
-    utxo2->mutable_out_point()->set_output_index(0);
-    utxo2->set_address(ownAddress1);
-    utxo2->set_amount(10258890);
-
-    const auto privateKeyData = parse_hex(privateKeyTest1);
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-    input.mutable_transfer_message()->set_to_address("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq"); // Test
-    input.mutable_transfer_message()->set_change_address(ownAddress1);
-    input.mutable_transfer_message()->set_amount(1600000);
-    auto* toToken = input.mutable_transfer_message()->mutable_token_amount()->add_token();
-    toToken->set_policy_id(sundaeTokenPolicy);
-    toToken->set_asset_name("SUNDAE");
-    const auto toTokenAmount = store(uint256_t(11000000));
-    toToken->set_amount(toTokenAmount.data(), toTokenAmount.size());
-    input.mutable_transfer_message()->set_use_max_amount(false);
-    input.set_ttl(61232158);
-
-    { // check min ADA amount
-        const auto bundleProtoData = data(input.transfer_message().token_amount().SerializeAsString());
-        EXPECT_EQ(TWCardanoMinAdaAmount(&bundleProtoData), 1444443ul);
-        EXPECT_GT(input.transfer_message().amount(), TWCardanoMinAdaAmount(&bundleProtoData));
-    }
-
-    {
-        // run plan and check result
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-
-        EXPECT_EQ(plan.availableAmount, 11758890ul);
-        EXPECT_EQ(plan.amount, 11758890 - 9984729 - 174161ul);
-        EXPECT_EQ(plan.fee, 174161ul);
-        EXPECT_EQ(plan.change, 9984729ul);
-        EXPECT_EQ(plan.utxos.size(), 2ul);
-        EXPECT_EQ(plan.availableTokens.size(), 1ul);
-        EXPECT_EQ(plan.availableTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 20000000);
-        EXPECT_EQ(plan.outputTokens.size(), 1ul);
-        EXPECT_EQ(plan.outputTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 11000000);
-        EXPECT_EQ(plan.changeTokens.size(), 1ul);
-        EXPECT_EQ(plan.changeTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 9000000);
-    }
-
-    // set plan with specific fee, to match the real transaction
-    input.mutable_plan()->set_available_amount(11758890);
-    input.mutable_plan()->set_amount(1600000);
-    input.mutable_plan()->set_fee(174102);
-    input.mutable_plan()->set_change(9984788);
-    *(input.mutable_plan()->add_available_tokens()) = input.utxos(0).token_amount(0);
-    *(input.mutable_plan()->add_output_tokens()) = input.utxos(0).token_amount(0);
-    input.mutable_plan()->mutable_output_tokens(0)->set_amount(toTokenAmount.data(), toTokenAmount.size());
-    *(input.mutable_plan()->add_change_tokens()) = input.utxos(0).token_amount(0);
-    const auto changeTokenAmount = store(uint256_t(9000000));
-    input.mutable_plan()->mutable_change_tokens(0)->set_amount(changeTokenAmount.data(), changeTokenAmount.size());
-    *(input.mutable_plan()->add_utxos()) = input.utxos(1);
-    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
-    input.mutable_plan()->set_error(Common::Proto::OK);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    // https://cardanoscan.io/transaction/1dd24872d93d3b5091b98e19b9f920cd0c4369e4c5ca178e898152c52f00c162
-    // curl -d '{"txHash":"1dd248..c162","txBody":"83a400..08f6"}' -H "Content-Type: application/json" https://<cardano-node>/api/txs/submit
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a400828258206975fcf7bbca745c85f50777f956219868fd9cad14ba496fed1371252e8df60f00825820f2d2b11c8c07c5c646f5b5af20fddf2f0a174743c6a1b13cca27e28a6ca34710000182825839018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468821a00186a00a1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a14653554e4441451a00a7d8c082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b821a00985b14a1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a14653554e4441451a00895440021a0002a816031a03a6541ea100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840c8cdee32bfd584f55cf334b4ec6f734635144736d48f882e647a7a6283f230bc5a67d4dd66a9e523e0c29c812ed1e3589febbcf96547a1fc6d061a7ccfb81308f6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "1dd24872d93d3b5091b98e19b9f920cd0c4369e4c5ca178e898152c52f00c162");
-}
-
-TEST(CardanoSigning, SignTransferTokenMaxAmount_620b71) {
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("46964521ad00d9b3f3d41f77c07e1b3093848048dbdf2d95cf900e15cdac0d7f");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(0);
-    utxo1->set_address(ownAddress1);
-    utxo1->set_amount(2170871);
-    // some token
-    auto* token1 = utxo1->add_token_amount();
-    token1->set_policy_id(sundaeTokenPolicy);
-    token1->set_asset_name("SUNDAE");
-    const auto tokenAmount1 = store(uint256_t(20000000));
-    token1->set_amount(tokenAmount1.data(), tokenAmount1.size());
-
-    const auto privateKeyData = parse_hex(privateKeyTest1);
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-    input.mutable_transfer_message()->set_to_address("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
-    input.mutable_transfer_message()->set_change_address(ownAddress1);
-    input.mutable_transfer_message()->set_amount(666); // doesn't matter, max is used
-    auto* toToken = input.mutable_transfer_message()->mutable_token_amount()->add_token();
-    toToken->set_policy_id(sundaeTokenPolicy);
-    toToken->set_asset_name("SUNDAE");
-    const auto toTokenAmount = store(uint256_t(666)); // doesn't matter, max is used
-    input.mutable_transfer_message()->set_use_max_amount(true);
-    input.set_ttl(61085916);
-
-    {
-        // run plan and check result
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-
-        EXPECT_EQ(plan.availableAmount, 2170871ul);
-        EXPECT_EQ(plan.amount, 2170871 - 167730ul);
-        EXPECT_EQ(plan.fee, 167730ul);
-        EXPECT_EQ(plan.change, 0ul);
-        EXPECT_EQ(plan.utxos.size(), 1ul);
-        EXPECT_EQ(plan.availableTokens.size(), 1ul);
-        EXPECT_EQ(plan.availableTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 20000000);
-        EXPECT_EQ(plan.outputTokens.size(), 1ul);
-        EXPECT_EQ(plan.outputTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 20000000);
-        EXPECT_EQ(plan.changeTokens.size(), 0ul);
-    }
-
-    // set plan with specific fee, to match the real transaction
-    input.mutable_plan()->set_available_amount(2170871);
-    input.mutable_plan()->set_amount(1998526);
-    input.mutable_plan()->set_fee(172345);
-    input.mutable_plan()->set_change(0);
-    *(input.mutable_plan()->add_available_tokens()) = input.utxos(0).token_amount(0);
-    *(input.mutable_plan()->add_output_tokens()) = input.utxos(0).token_amount(0);
-    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
-    input.mutable_plan()->set_error(Common::Proto::OK);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    // https://cardanoscan.io/transaction/620b719338efb419b0e1417bfbe01fc94a62d5669a4b8cbbf4e32ecc1ca3b872
-    // curl -d '{"txHash":"620b71..b872","txBody":"83a400..08f6"}' -H "Content-Type: application/json" https://<cardano-node>/api/txs/submit
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a4008182582046964521ad00d9b3f3d41f77c07e1b3093848048dbdf2d95cf900e15cdac0d7f00018182583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd5821a001e7ebea1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a14653554e4441451a01312d00021a0002a139031a03a418dca100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840e1d1565cd747b20b0f10a92f068f3d5faebdee92b4b4a4b96ce14736d975e17d1446f7f51e64997a0bb38e0151dc738468161d574d6cfcd8040e4455ff46bc08f6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "620b719338efb419b0e1417bfbe01fc94a62d5669a4b8cbbf4e32ecc1ca3b872");
-}
-
-TEST(CardanoSigning, SignTransferTwoTokens) {
-    auto input = createSampleInput(7000000);
-    input.mutable_transfer_message()->set_amount(1500000);
-    auto* token1 = input.mutable_transfer_message()->mutable_token_amount()->add_token();
-    token1->set_policy_id(sundaeTokenPolicy);
-    token1->set_asset_name("SUNDAE");
-    const auto tokenAmount1 = store(uint256_t(40000000));
-    token1->set_amount(tokenAmount1.data(), tokenAmount1.size());
-    auto* token2 = input.mutable_transfer_message()->mutable_token_amount()->add_token();
-    token2->set_policy_id(sundaeTokenPolicy);
-    token2->set_asset_name("CUBY");
-    const auto tokenAmount2 = store(uint256_t(2000000));
-    token2->set_amount(tokenAmount2.data(), tokenAmount2.size());
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::Error_invalid_requested_token_amount);
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(output.encoded()), "");
-}
-
-TEST(CardanoSigning, SignMessageWithKey) {
-    // test case from cardano-crypto.js
-
-    const auto privateKey = PrivateKey(parse_hex(
-        "d809b1b4b4c74734037f76aace501730a3fe2fca30b5102df99ad3f7c0103e48"
-        "d54cde47e9041b31f3e6873d700d83f7a937bea746dadfa2c5b0a6a92502356c"
-        "69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"
-        "1111111111111111111111111111111111111111111111111111111111111111"
-        "1111111111111111111111111111111111111111111111111111111111111111"
-        "1111111111111111111111111111111111111111111111111111111111111111"));
-
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-    EXPECT_EQ(hex(publicKey.bytes),
-              "e6f04522f875c1563682ca876ddb04c2e2e3ae718e3ff9f11c03dd9f9dccf698"
-              "69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"
-              "857eed804ff087b97f87848f6493e87257a8c5203cb9f422f6e7a7d8a4d299f3"
-              "1111111111111111111111111111111111111111111111111111111111111111");
-
-    const auto sampleMessageStr = "Hello world";
-    const auto sampleMessage = data(sampleMessageStr);
-
-    const auto signature = privateKey.sign(sampleMessage, TWCurveED25519ExtendedCardano);
-
-    const auto sampleRightSignature = "1096ddcfb2ad21a4c0d861ef3fabe18841e8de88105b0d8e36430d7992c588634ead4100c32b2800b31b65e014d54a8238bdda63118d829bf0bcf1b631e86f0e";
-    EXPECT_EQ(hex(signature), sampleRightSignature);
-}
-
-TEST(CardanoSigning, AnySignTransfer1) {
-    const auto input = createSampleInput(7000000);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeCardano);
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a40082825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a006acfc082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a000ca96c021a000298d4031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058407cf591599852b5f5e007fdc241062405c47e519266c0d884b0767c1d4f5eacce00db035998e53ed10ca4ba5ce4aac8693798089717ce6cf4415f345cc764200ef6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "9b5b15e133cd73ccaa85307d2986aebc846505118a2eb4e6111e6b4b67d1f389");
-}
-
-TEST(CardanoSigning, AnyPlan1) {
-    const auto input = createSampleInput(7000000);
-
-    Proto::TransactionPlan plan;
-    ANY_PLAN(input, plan, TWCoinTypeCardano);
-
-    EXPECT_EQ(plan.error(), Common::Proto::OK);
-    EXPECT_EQ(plan.amount(), 7000000ul);
-    EXPECT_EQ(plan.available_amount(), 8000000ul);
-    EXPECT_EQ(plan.fee(), 170196ul);
-    EXPECT_EQ(plan.change(), 829804ul);
-    ASSERT_EQ(plan.utxos_size(), 2);
-    EXPECT_EQ(plan.utxos(0).amount(), 6500000ul);
-    EXPECT_EQ(plan.utxos(1).amount(), 1500000ul);
-
-    EXPECT_EQ(hex(plan.SerializeAsString()), "0880a4e80310c09fab0318d4b10a20ecd2324292010a220a20554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af01267616464723171383034336d356865656179646e76746d6d6b7975686536717635686176766873663064323671336a7967737370786c796670796b3679716b77307968747976747230666c656b6a3834753634617a38326375666d716e36357a6473796c7a6b323318a0dd8c034293010a240a20f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76710011267616464723171383034336d356865656179646e76746d6d6b7975686536717635686176766873663064323671336a7967737370786c796670796b3679716b77307968747976747230666c656b6a3834753634617a38326375666d716e36357a6473796c7a6b323318e0c65b");
-
-    {
-        // also test fromProto
-        const auto plan2 = TransactionPlan::fromProto(plan);
-        EXPECT_EQ(plan2.amount, plan.amount());
-        EXPECT_EQ(plan2.change, plan.change());
-    }
-}
-
-} // namespace TW::Cardano::tests
diff --git a/tests/Cardano/StakingTests.cpp b/tests/Cardano/StakingTests.cpp
deleted file mode 100644
index a1cc13e71f1..00000000000
--- a/tests/Cardano/StakingTests.cpp
+++ /dev/null
@@ -1,351 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Cardano/AddressV3.h"
-#include "Cardano/Signer.h"
-#include "proto/Cardano.pb.h"
-#include <TrustWalletCore/TWCardano.h>
-
-#include "Cbor.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-#include <vector>
-
-using namespace TW;
-using namespace std;
-
-namespace TW::Cardano::StakingTests {
-
-const auto privateKeyTest1 = "089b68e458861be0c44bf9f7967f05cc91e51ede86dc679448a3566990b7785bd48c330875b1e0d03caaed0e67cecc42075dce1c7a13b1c49240508848ac82f603391c68824881ae3fc23a56a1a75ada3b96382db502e37564e84a5413cfaf1290dbd508e5ec71afaea98da2df1533c22ef02a26bb87b31907d0b2738fb7785b38d53aa68fc01230784c9209b2b2a2faf28491b3b1f1d221e63e704bbd0403c4154425dfbb01a2c5c042da411703603f89af89e57faae2946e2a5c18b1c5ca0e";
-const auto ownAddress1 = "addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23";
-const auto stakingAddress1 = "stake1u80jysjtdzqt88jt4jx93h5lumfr67d273r4vwyasfa2pxcwxllmx";
-const auto poolIdNufi = "7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6";
-
-TEST(CardanoStaking, RegisterStakingKey) {
-    const auto privateKeyData = parse_hex(privateKeyTest1);
-    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
-    const auto ownAddress = AddressV3(publicKey).string();
-    EXPECT_EQ(ownAddress, ownAddress1);
-    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
-    EXPECT_EQ(stakingAddress, stakingAddress1);
-    const auto poolId = parse_hex(poolIdNufi);
-
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(1);
-    utxo1->set_address(ownAddress);
-    utxo1->set_amount(10000000ul);
-
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-
-    input.mutable_transfer_message()->set_to_address(ownAddress);
-    input.mutable_transfer_message()->set_change_address(ownAddress);
-    input.mutable_transfer_message()->set_amount(5000000ul); // not relevant if we use MaxAmount
-    input.mutable_transfer_message()->set_use_max_amount(true);
-    input.set_ttl(69986091ul);
-
-    // Register staking key, 2 ADA deposit
-    input.mutable_register_staking_key()->set_staking_address(stakingAddress);
-    input.mutable_register_staking_key()->set_deposit_amount(2000000ul);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a50081825820cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a007772fa021a00029f06031a042be72b048182008200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09ba100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840d08ed71da87d0928090edd9e226496ab109f2eee7926ac2ce51e7abe89a4f513c4afe2b85b71595e862e7f6fc992d14d2416a6e53a1961da7d26d3cf3f823400825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932584079ed55400cebc70c56ca87ba09009dfc298c64768f90a9139bf2e7f134250927c614ee846253fac33e652f1b50373d349fdfe13c207968c2a10991824fe2a10ef6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "6a206fe4df76e12499b4fd9722f33429f4d93f8a996f9f523fa6c02a8301386b");
-
-    {
-        const auto decode = Cbor::Decode(encoded);
-        ASSERT_TRUE(decode.isValid());
-        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca\", 1]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 7828218]], 2: 171782, 3: 69986091, 4: [[0, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"]]]}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"d08ed71da87d0928090edd9e226496ab109f2eee7926ac2ce51e7abe89a4f513c4afe2b85b71595e862e7f6fc992d14d2416a6e53a1961da7d26d3cf3f823400\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"79ed55400cebc70c56ca87ba09009dfc298c64768f90a9139bf2e7f134250927c614ee846253fac33e652f1b50373d349fdfe13c207968c2a10991824fe2a10e\"]]}, null]");
-        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
-    }
-}
-
-TEST(CardanoStaking, DeregisterStakingKey) {
-    const auto privateKeyData = parse_hex(privateKeyTest1);
-    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
-    const auto ownAddress = AddressV3(publicKey).string();
-    EXPECT_EQ(ownAddress, ownAddress1);
-    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
-    EXPECT_EQ(stakingAddress, stakingAddress1);
-    const auto poolId = parse_hex(poolIdNufi);
-
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(1);
-    utxo1->set_address(ownAddress);
-    utxo1->set_amount(10000000ul);
-
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-
-    input.mutable_transfer_message()->set_to_address(ownAddress);
-    input.mutable_transfer_message()->set_change_address(ownAddress);
-    input.mutable_transfer_message()->set_amount(5000000ul); // not relevant if we use MaxAmount
-    input.mutable_transfer_message()->set_use_max_amount(true);
-    input.set_ttl(69986091ul);
-
-    // Deregister staking key, get back 2 ADA deposit
-    input.mutable_deregister_staking_key()->set_staking_address(stakingAddress);
-    input.mutable_deregister_staking_key()->set_undeposit_amount(2000000ul);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a50081825820cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a00b47bfa021a00029f06031a042be72b048182018200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09ba100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290584056619a7d6192b6f68c31a43e927c893161fd994d5c1bcc16f3710cf5e5e652e01f118d55f0110e9de34edc050d509748bea637db5c34f4fe342ae262ccb5520d825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e069325840d23680fdd8aa63e10efccc550eb726743b653008952f9d731d076d1df8106b0401823ebb195127b211389f1bc2c3f6ededbcec04bc8f0de93607a2409421e006f6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "1caae2456e5471cc77e73410da475fb0a23874c18c1ea55f9267c59767caef0a");
-
-    {
-        const auto decode = Cbor::Decode(encoded);
-        ASSERT_TRUE(decode.isValid());
-        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca\", 1]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 11828218]], 2: 171782, 3: 69986091, 4: [[1, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"]]]}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"56619a7d6192b6f68c31a43e927c893161fd994d5c1bcc16f3710cf5e5e652e01f118d55f0110e9de34edc050d509748bea637db5c34f4fe342ae262ccb5520d\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"d23680fdd8aa63e10efccc550eb726743b653008952f9d731d076d1df8106b0401823ebb195127b211389f1bc2c3f6ededbcec04bc8f0de93607a2409421e006\"]]}, null]");
-        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
-    }
-}
-
-TEST(CardanoStaking, Redelegate) {
-    const auto privateKeyData = parse_hex(privateKeyTest1);
-    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
-    const auto ownAddress = AddressV3(publicKey).string();
-    EXPECT_EQ(ownAddress, ownAddress1);
-    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
-    EXPECT_EQ(stakingAddress, stakingAddress1);
-    const auto poolId = parse_hex(poolIdNufi);
-
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(1);
-    utxo1->set_address(ownAddress);
-    utxo1->set_amount(10000000ul);
-
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-
-    input.mutable_transfer_message()->set_to_address(ownAddress);
-    input.mutable_transfer_message()->set_change_address(ownAddress);
-    input.mutable_transfer_message()->set_amount(5000000ul); // not relevant if we use MaxAmount
-    input.mutable_transfer_message()->set_use_max_amount(true);
-    input.set_ttl(69986091ul);
-
-    // Delegate, no deposit
-    input.mutable_delegate()->set_staking_address(stakingAddress);
-    input.mutable_delegate()->set_pool_id(poolId.data(), poolId.size());
-    input.mutable_delegate()->set_deposit_amount(0ul);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a50081825820cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a0095f251021a0002a42f031a042be72b048183028200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b581c7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6a100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840fb48f3ddbfc2d4ca231a0581c5b456019aa4215ed5a2447ba89a4860569f9e7296afd3a0a81506882d8bda33683e623e6d8033786275369f7e247d866e017c06825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e069325840e26f696a6cd1c34101623568c9efe3796ff5855ada0e2e0cf557c7fc2148f6b2af176aff40a1f9c13fb29d9636c49f774d4a967c71f052f865cfaf0d02d5bb05f6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "985f613fb8b86dad35f075599099776e50fc2a6aa74ee4b37c14fd9f2c0f0891");
-
-    {
-        const auto decode = Cbor::Decode(encoded);
-        ASSERT_TRUE(decode.isValid());
-        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca\", 1]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 9826897]], 2: 173103, 3: 69986091, 4: [[2, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"], h\"7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6\"]]}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"fb48f3ddbfc2d4ca231a0581c5b456019aa4215ed5a2447ba89a4860569f9e7296afd3a0a81506882d8bda33683e623e6d8033786275369f7e247d866e017c06\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"e26f696a6cd1c34101623568c9efe3796ff5855ada0e2e0cf557c7fc2148f6b2af176aff40a1f9c13fb29d9636c49f774d4a967c71f052f865cfaf0d02d5bb05\"]]}, null]");
-        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
-    }
-}
-
-TEST(CardanoStaking, RegisterAndDelegate_similar53339b) {
-    const auto privateKeyData = parse_hex(privateKeyTest1);
-    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
-    const auto ownAddress = AddressV3(publicKey).string();
-    EXPECT_EQ(ownAddress, ownAddress1);
-    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
-    EXPECT_EQ(stakingAddress, stakingAddress1);
-    const auto poolId = parse_hex(poolIdNufi);
-
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("9b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(0);
-    utxo1->set_address(ownAddress);
-    utxo1->set_amount(4000000ul);
-    auto* utxo2 = input.add_utxos();
-    const auto txHash2 = parse_hex("9b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e");
-    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
-    utxo2->mutable_out_point()->set_output_index(1);
-    utxo2->set_address(ownAddress);
-    utxo2->set_amount(26651312ul);
-
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-
-    input.mutable_transfer_message()->set_to_address(ownAddress);
-    input.mutable_transfer_message()->set_change_address(ownAddress);
-    input.mutable_transfer_message()->set_amount(4000000ul); // not relevant if we use MaxAmount
-    input.mutable_transfer_message()->set_use_max_amount(true);
-    input.set_ttl(69885081ul);
-
-    // Register staking key, 2 ADA desposit
-    input.mutable_register_staking_key()->set_staking_address(stakingAddress);
-    input.mutable_register_staking_key()->set_deposit_amount(2000000ul);
-
-    // Delegate
-    input.mutable_delegate()->set_staking_address(stakingAddress);
-    input.mutable_delegate()->set_pool_id(poolId.data(), poolId.size());
-    input.mutable_delegate()->set_deposit_amount(0ul);
-
-    {
-        // run plan and check result
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-
-        const auto amount = 28475125ul;
-        const auto availAmount = 30651312ul;
-        EXPECT_EQ(plan.availableAmount, availAmount);
-        EXPECT_EQ(plan.amount, amount);
-        const auto fee = 176187ul;
-        EXPECT_EQ(plan.fee, fee);
-        EXPECT_EQ(plan.change, availAmount - 2000000ul - amount - fee);
-        EXPECT_EQ(plan.change, 0ul);
-
-        // perform sign with default plan
-        const auto output = signer.sign();
-
-        EXPECT_EQ(output.error(), Common::Proto::OK);
-
-        const auto encoded = data(output.encoded());
-        EXPECT_EQ(hex(encoded), "83a500828258209b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e008258209b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a01b27ef5021a0002b03b031a042a5c99048282008200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b83028200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b581c7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6a100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840677c901704be027d9a1734e8aa06f0700009476fa252baaae0de280331746a320a61456d842d948ea5c0e204fc36f3bd04c88ca7ee3d657d5a38014243c37c07825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e0693258401fa21bdc62b85ca217bf08cbacdeba2fadaf33dc09ee3af9cc25b40f24822a1a42cfbc03585cc31a370ef75aaec4d25db6edcf329e40a4e725ec8718c94f220af6");
-        const auto txid = data(output.tx_id());
-        EXPECT_EQ(hex(txid), "96a781fd6481b6a7fd3926da110265e8c44b53947b81daa84da5b148825d02aa");
-    }
-
-    // set different plan, with exact fee
-    const auto amount = 28467322ul;
-    input.mutable_plan()->set_amount(amount);
-    input.mutable_plan()->set_available_amount(28651312ul);
-    input.mutable_plan()->set_fee(183990);
-    input.mutable_plan()->set_change(0);
-    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
-    *(input.mutable_plan()->add_utxos()) = input.utxos(1);
-    input.mutable_plan()->set_error(Common::Proto::OK);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    // Similar to (but with different key): https://cardanoscan.io/transaction/53339b758009a0896a87e9569cadcdb5a095ffe0c100cc7483d72e817e81b60b
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a500828258209b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e008258209b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a01b2607a021a0002ceb6031a042a5c99048282008200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b83028200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b581c7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6a100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058405d8b21c993aec7a7bdf0c832e5688920b64b665e1e36a2e6040d6dd8ad195e7774df3c1377047737d8b676fa4115e38fbf6ef854904db6d9c8ee3e26e8561408825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932584088a3f6387693f9077d11a6e245e024b791074bcaa26c034e687d67f3324b6f90a437d33d0343e11c7dee1a28270c223e02080e452fe97cdc93d26c720ab6b805f6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "23e1d1bc27f6de57e323d232d44c909fb41ee2ebfff28b82ca8cae6947866ea7");
-
-    {
-        const auto decode = Cbor::Decode(encoded);
-        ASSERT_TRUE(decode.isValid());
-        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"9b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e\", 0], [h\"9b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e\", 1]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 28467322]], 2: 183990, 3: 69885081, 4: [[0, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"]], [2, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"], h\"7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6\"]]}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"5d8b21c993aec7a7bdf0c832e5688920b64b665e1e36a2e6040d6dd8ad195e7774df3c1377047737d8b676fa4115e38fbf6ef854904db6d9c8ee3e26e8561408\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"88a3f6387693f9077d11a6e245e024b791074bcaa26c034e687d67f3324b6f90a437d33d0343e11c7dee1a28270c223e02080e452fe97cdc93d26c720ab6b805\"]]}, null]");
-        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
-    }
-}
-
-TEST(CardanoStaking, Withdraw_similarf48098) {
-    const auto privateKeyData = parse_hex(privateKeyTest1);
-    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
-    const auto ownAddress = AddressV3(publicKey).string();
-    EXPECT_EQ(ownAddress, ownAddress1);
-    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
-    EXPECT_EQ(stakingAddress, stakingAddress1);
-
-    Proto::SigningInput input;
-    auto* utxo1 = input.add_utxos();
-    const auto txHash1 = parse_hex("7dfd2c579794314b1f84efc9db932a098e440ccefb874945591f1d4e85a9152a");
-    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
-    utxo1->mutable_out_point()->set_output_index(0);
-    utxo1->set_address(ownAddress);
-    utxo1->set_amount(6305913ul);
-
-    input.add_private_key(privateKeyData.data(), privateKeyData.size());
-
-    input.mutable_transfer_message()->set_to_address(ownAddress);
-    input.mutable_transfer_message()->set_change_address(ownAddress);
-    input.mutable_transfer_message()->set_amount(6000000ul); // not relevant if we use MaxAmount
-    input.mutable_transfer_message()->set_use_max_amount(true);
-    input.set_ttl(71678326ul);
-
-    // Withdraw available amount
-    const auto withdrawAmount = 3468ul;
-    input.mutable_withdraw()->set_staking_address(stakingAddress);
-    input.mutable_withdraw()->set_withdraw_amount(withdrawAmount);
-
-    {
-        // run plan and check result
-        auto signer = Signer(input);
-        const auto plan = signer.doPlan();
-
-        const auto amount = 6137599ul;
-        const auto availAmount = 6305913ul;
-        EXPECT_EQ(plan.availableAmount, availAmount);
-        EXPECT_EQ(plan.amount, amount);
-        const auto fee = 171782ul;
-        EXPECT_EQ(plan.fee, fee);
-        EXPECT_EQ(plan.change, availAmount + withdrawAmount - amount - fee);
-        EXPECT_EQ(plan.change, 0ul);
-
-        // perform sign with default plan
-        const auto output = signer.sign();
-
-        EXPECT_EQ(output.error(), Common::Proto::OK);
-
-        const auto encoded = data(output.encoded());
-        EXPECT_EQ(hex(encoded), "83a500818258207dfd2c579794314b1f84efc9db932a098e440ccefb874945591f1d4e85a9152a00018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a005da6ff021a00029f06031a0445b97605a1581de1df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b190d8ca100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058401ebaca2876fd17122404912a2558a98109cdf0f990a938d2917fa2c3b8c4e55e18a2cbabfa82fff03fa0d7ab8b88ca01ed18e42af3bfc4cda7f423a3aa30c00b825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e069325840777f04fa8f083fe562aecf78898aaaaac36e2cc6ca962f6ffb01e84a421cae1860496db79b2c5fb2879524c3d5121060b9ea1e693336230c6e5338e14c4c3303f6");
-        const auto txid = data(output.tx_id());
-        EXPECT_EQ(hex(txid), "6dcf3956232953fc25b8355fb1ded1e912b5802090fd21434d789087d6329683");
-    }
-
-    // set different plan, with exact fee
-    const auto amount = 6137599ul;
-    input.mutable_plan()->set_amount(amount);
-    input.mutable_plan()->set_available_amount(6305913ul);
-    input.mutable_plan()->set_fee(171782ul);
-    input.mutable_plan()->set_change(0);
-    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
-    input.mutable_plan()->set_error(Common::Proto::OK);
-
-    auto signer = Signer(input);
-    const auto output = signer.sign();
-
-    EXPECT_EQ(output.error(), Common::Proto::OK);
-
-    // Similar to (but with different key): https://cardanoscan.io/transaction/f480985662886e419a22673d31944455ab8891a80940bf392a37d9288ea9cf01?tab=withdrawals
-    const auto encoded = data(output.encoded());
-    EXPECT_EQ(hex(encoded), "83a500818258207dfd2c579794314b1f84efc9db932a098e440ccefb874945591f1d4e85a9152a00018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a005da6ff021a00029f06031a0445b97605a1581de1df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b190d8ca100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058401ebaca2876fd17122404912a2558a98109cdf0f990a938d2917fa2c3b8c4e55e18a2cbabfa82fff03fa0d7ab8b88ca01ed18e42af3bfc4cda7f423a3aa30c00b825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e069325840777f04fa8f083fe562aecf78898aaaaac36e2cc6ca962f6ffb01e84a421cae1860496db79b2c5fb2879524c3d5121060b9ea1e693336230c6e5338e14c4c3303f6");
-    const auto txid = data(output.tx_id());
-    EXPECT_EQ(hex(txid), "6dcf3956232953fc25b8355fb1ded1e912b5802090fd21434d789087d6329683");
-
-    {
-        const auto decode = Cbor::Decode(encoded);
-        ASSERT_TRUE(decode.isValid());
-        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"7dfd2c579794314b1f84efc9db932a098e440ccefb874945591f1d4e85a9152a\", 0]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 6137599]], 2: 171782, 3: 71678326, 5: {h\"e1df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\": 3468}}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"1ebaca2876fd17122404912a2558a98109cdf0f990a938d2917fa2c3b8c4e55e18a2cbabfa82fff03fa0d7ab8b88ca01ed18e42af3bfc4cda7f423a3aa30c00b\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"777f04fa8f083fe562aecf78898aaaaac36e2cc6ca962f6ffb01e84a421cae1860496db79b2c5fb2879524c3d5121060b9ea1e693336230c6e5338e14c4c3303\"]]}, null]");
-                                          
-        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
-    }
-}
-
-} // namespace TW::Cardano::tests
diff --git a/tests/Cardano/TWCoinTypeTests.cpp b/tests/Cardano/TWCoinTypeTests.cpp
deleted file mode 100644
index 987f2fc7856..00000000000
--- a/tests/Cardano/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWCardanoCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCardano));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("b7a6c5cadab0f64bdc89c77ee4a351463aba5c33f2cef6bbd6542a74a90a3af3"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCardano, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("DdzFFzCqrhstpwKc8WMvPwwBb5oabcTW9zc5ykA37wJR4tYQucvsR9dXb2kEGNXkFJz2PtrpzfRiZkx8R1iNo8NYqdsukVmv7EAybFwC"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCardano, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCardano));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCardano));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCardano), 6);
-    ASSERT_EQ(TWBlockchainCardano, TWCoinTypeBlockchain(TWCoinTypeCardano));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCardano));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCardano));
-    assertStringsEqual(symbol, "ADA");
-    assertStringsEqual(txUrl, "https://cardanoscan.io/transaction/b7a6c5cadab0f64bdc89c77ee4a351463aba5c33f2cef6bbd6542a74a90a3af3");
-    assertStringsEqual(accUrl, "https://cardanoscan.io/address/DdzFFzCqrhstpwKc8WMvPwwBb5oabcTW9zc5ykA37wJR4tYQucvsR9dXb2kEGNXkFJz2PtrpzfRiZkx8R1iNo8NYqdsukVmv7EAybFwC");
-    assertStringsEqual(id, "cardano");
-    assertStringsEqual(name, "Cardano");
-}
diff --git a/tests/Cardano/TransactionTests.cpp b/tests/Cardano/TransactionTests.cpp
deleted file mode 100644
index 702a32ce77a..00000000000
--- a/tests/Cardano/TransactionTests.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Cardano/Transaction.h"
-#include "Cardano/AddressV3.h"
-#include <TrustWalletCore/TWCardano.h>
-
-#include "HexCoding.h"
-#include "Cbor.h"
-
-#include <gtest/gtest.h>
-
-
-namespace TW::Cardano {
-
-Transaction createTx() {
-    Transaction tx;
-    tx.inputs.emplace_back(parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767"), 1);
-    tx.inputs.emplace_back(parse_hex("554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0"), 0);
-    tx.outputs.emplace_back(
-        AddressV3("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23").data(),
-        2000000);
-    tx.outputs.emplace_back(
-        AddressV3("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5").data(),
-        16749189);
-    tx.fee = 165555;
-    tx.ttl = 53333345;
-    return tx;
-}
-
-TEST(CardanoTransaction, Encode) {
-    const Transaction tx = createTx();
-
-    const auto encoded = tx.encode();
-    EXPECT_EQ(hex(encoded), "a40082825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000018282583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a001e848082583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a00ff9285021a000286b3031a032dcd61");
-
-    {
-        const auto decode = Cbor::Decode(encoded);
-        ASSERT_TRUE(decode.isValid());
-        EXPECT_EQ(decode.getMapElements().size(), 4ul);
-        EXPECT_EQ(decode.dumpToString(), "{0: [[h\"f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767\", 1], [h\"554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0\", 0]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 2000000], [h\"01558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd5\", 16749189]], 2: 165555, 3: 53333345}");
-    }
-}
-
-TEST(CardanoTransaction, GetId) {
-    const Transaction tx = createTx();
-
-    const auto txid = tx.getId();
-    EXPECT_EQ(hex(txid), "cc262713a3e15a0fa245b062f33ffc6c2aa5a64c3ae7bfa793414069914e1bbf");
-}
-
-TEST(CardanoTransaction, minAdaAmount) {
-    const auto policyId = "9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77";
-
-    { // ADA only
-        const auto tb = TokenBundle();
-        EXPECT_EQ(tb.minAdaAmount(), 1000000ul);
-    }
-    { // 1 policyId, 1 6-char asset name
-        const auto tb = TokenBundle({TokenAmount(policyId, "TOKEN1", 0)});
-        EXPECT_EQ(tb.minAdaAmount(), 1444443ul);
-    }
-    { // 2 policyId, 2 4-char asset names
-        auto tb = TokenBundle();
-        tb.add(TokenAmount("012345678901234567890POLICY1", "TOK1", 20));
-        tb.add(TokenAmount("012345678901234567890POLICY2", "TOK2", 20));
-        EXPECT_EQ(tb.minAdaAmount(), 1629628ul);
-    }
-    { // 10 policyId, 10 6-char asset names
-        auto tb = TokenBundle();
-        for (auto i = 0; i < 10; ++i) {
-            std::string policyId1 = +"012345678901234567890123456" + std::to_string(i);
-            std::string name = "ASSET" + std::to_string(i);
-            tb.add(TokenAmount(policyId1, name, 0));
-        }
-        EXPECT_EQ(tb.minAdaAmount(), 3370367ul);
-    }
-
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(0, 0, 0), 1000000ul);           // ADA only
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 0, 0), 1370369ul);           // 1 policyId, no asset name
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 1, 1), 1444443ul);           // 1 policyId, 1 1-char asset name
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 1, 6), 1444443ul);           // 1 policyId, 1 6-char asset name
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 1, 32), 1555554ul);          // 1 policyId, 1 32-char asset name
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 110, 110 * 32), 23777754ul); // 1 policyId, 110 32-char asset name
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(2, 2, 8), 1629628ul);           // 2 policyId, 2 4-char asset names
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(3, 5, 20), 1999998ul);          // 3 policyId, 5 4-char asset names
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(10, 10, 10 * 6), 3370367ul);    // 10 policyId, 10 6-char asset names
-    EXPECT_EQ(TokenBundle::minAdaAmountHelper(60, 60, 60 * 32), 21222201ul);  // 60 policyId, 60 32-char asset names
-}
-
-TEST(CardanoTransaction, getPolicyIDs) {
-    const auto policyId1 = "012345678901234567890POLICY1";
-    const auto policyId2 = "012345678901234567890POLICY2";
-    const auto tb = TokenBundle({
-        TokenAmount(policyId1, "TOK1", 10),
-        TokenAmount(policyId2, "TOK2", 20),
-        TokenAmount(policyId2, "TOK3", 30), // duplicate policyId
-    });
-    ASSERT_EQ(tb.getPolicyIds().size(), 2ul);
-    EXPECT_TRUE(tb.getPolicyIds().contains(policyId1));
-    EXPECT_TRUE(tb.getPolicyIds().contains(policyId2));
-
-    EXPECT_EQ(tb.getByPolicyId(policyId1).size(), 1ul);
-    EXPECT_EQ(tb.getByPolicyId(policyId2).size(), 2ul);
-}
-
-TEST(TWCardanoTransaction, minAdaAmount) {
-    { // ADA-only
-        const auto bundleProto = TokenBundle().toProto();
-        const auto bundleProtoData = data(bundleProto.SerializeAsString());
-        EXPECT_EQ(TWCardanoMinAdaAmount(&bundleProtoData), 1000000ul);
-    }
-    { // 2 policyId, 2 4-char asset names
-        auto bundle = TokenBundle();
-        bundle.add(TokenAmount("012345678901234567890POLICY1", "TOK1", 20));
-        bundle.add(TokenAmount("012345678901234567890POLICY2", "TOK2", 20));
-        const auto bundleProto = bundle.toProto();
-        const auto bundleProtoData = data(bundleProto.SerializeAsString());
-        EXPECT_EQ(TWCardanoMinAdaAmount(&bundleProtoData), 1629628ul);
-    }
-}
-
-} // namespace TW::Cardano
diff --git a/tests/Celo/TWCoinTypeTests.cpp b/tests/Celo/TWCoinTypeTests.cpp
deleted file mode 100644
index 7a66fc66eda..00000000000
--- a/tests/Celo/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWCeloCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCelo));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xaf41ee58afe633dc7b179c15693cca40fe0372c1d7c70351620105d59d326693"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCelo, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xFBFf95e2Fa7e4Ff3aeA34eFB05fB60F9968a6aaD"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCelo, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCelo));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCelo));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCelo), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeCelo));
-
-    assertStringsEqual(symbol, "CELO");
-    assertStringsEqual(txUrl, "https://explorer.celo.org/tx/0xaf41ee58afe633dc7b179c15693cca40fe0372c1d7c70351620105d59d326693");
-    assertStringsEqual(accUrl, "https://explorer.celo.org/address/0xFBFf95e2Fa7e4Ff3aeA34eFB05fB60F9968a6aaD");
-    assertStringsEqual(id, "celo");
-    assertStringsEqual(name, "Celo");
-}
diff --git a/tests/CoinAddressDerivationTests.cpp b/tests/CoinAddressDerivationTests.cpp
deleted file mode 100644
index ed8d695148e..00000000000
--- a/tests/CoinAddressDerivationTests.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Coin.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-#include <mutex>
-#include <thread>
-
-namespace TW {
-
-TEST(Coin, DeriveAddress) {
-    auto dummyKeyData = parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
-    const auto privateKey = PrivateKey(dummyKeyData);
-    const auto privateKeyExt = PrivateKey(dummyKeyData, dummyKeyData, dummyKeyData, dummyKeyData, dummyKeyData, dummyKeyData);
-
-    const auto coins = TW::getCoinTypes();
-    for (auto& c : coins) {
-        std::string address;
-        switch (c) {
-        default:
-            address = TW::deriveAddress(c, privateKey);
-            break;
-
-        case TWCoinTypeCardano:
-        case TWCoinTypeNEO:
-            address = TW::deriveAddress(c, privateKeyExt);
-            break;
-        }
-
-        switch (c) {
-        // Ethereum and ...
-        case TWCoinTypeEthereum:
-        // ... clones:
-        case TWCoinTypeArbitrum:
-        case TWCoinTypeAurora:
-        case TWCoinTypeAvalancheCChain:
-        case TWCoinTypeBoba:
-        case TWCoinTypeCallisto:
-        case TWCoinTypeCelo:
-        case TWCoinTypeCronosChain:
-        case TWCoinTypeECOChain:
-        case TWCoinTypeEthereumClassic:
-        case TWCoinTypeEvmos:
-        case TWCoinTypeFantom:
-        case TWCoinTypeGoChain:
-        case TWCoinTypeKavaEvm:
-        case TWCoinTypeKlaytn:
-        case TWCoinTypeKuCoinCommunityChain:
-        case TWCoinTypeMeter:
-        case TWCoinTypeMetis:
-        case TWCoinTypeMoonbeam:
-        case TWCoinTypeMoonriver:
-        case TWCoinTypeOptimism:
-        case TWCoinTypeOKXChain:
-        case TWCoinTypePOANetwork:
-        case TWCoinTypePolygon:
-        case TWCoinTypeSmartBitcoinCash:
-        case TWCoinTypeSmartChain:
-        case TWCoinTypeSmartChainLegacy:
-        case TWCoinTypeTheta:
-        case TWCoinTypeThunderToken:
-        case TWCoinTypeTomoChain:
-        case TWCoinTypeVeChain:
-        case TWCoinTypeWanchain:
-        case TWCoinTypeXDai:
-            EXPECT_EQ(address, "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F");
-            break;
-
-        case TWCoinTypeKin:
-        case TWCoinTypeStellar:
-            EXPECT_EQ(address, "GDXJHJHWN6GRNOAZXON6XH74ZX6NYFAS5B7642RSJQVJTIPA4ZYUQLEB");
-            break;
-
-        case TWCoinTypeNEO:
-        case TWCoinTypeOntology:
-            EXPECT_EQ(address, "AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5");
-            break;
-
-        case TWCoinTypeTerra:
-        case TWCoinTypeTerraV2:
-            EXPECT_EQ(address, "terra1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0ll9rwp");
-            break;
-
-        case TWCoinTypeZcash:
-        case TWCoinTypeZelcash:
-            EXPECT_EQ(address, "t1b9xfAk3kZp5Qk3rinDPq7zzLkJGHTChDS");
-            break;
-
-        case TWCoinTypeAeternity:
-            EXPECT_EQ(address, "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
-            break;
-        case TWCoinTypeAion:
-            EXPECT_EQ(address, "0xa0010b0ea04ba4d76ca6e5e9900bacf19bc4402eaec7e36ea7ddd8eed48f60f3");
-            break;
-        case TWCoinTypeAlgorand:
-            EXPECT_EQ(address, "52J2J5TPRULLQGN3TPVZ77GN7TOBIEXIP7XGUMSMFKM2DYHGOFEOGBP2T4");
-            break;
-        case TWCoinTypeBandChain:
-            EXPECT_EQ(address, "band1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0q5lp5f");
-            break;
-        case TWCoinTypeBinance:
-            EXPECT_EQ(address, "bnb1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0mlq0d0");
-            break;
-        case TWCoinTypeBitcoin:
-            EXPECT_EQ(address, "bc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z00ppggv");
-            break;
-        case TWCoinTypeBitcoinCash:
-            EXPECT_EQ(address, "bitcoincash:qz7eyzytkl5z6cg6nw20hd62pyyp22mcfuardfd2vn");
-            break;
-        case TWCoinTypeBitcoinGold:
-            EXPECT_EQ(address, "btg1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0eg8day");
-            break;
-        case TWCoinTypeBluzelle:
-            EXPECT_EQ(address, "bluzelle1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0vrup2s");
-            break;
-        case TWCoinTypeCardano:
-            EXPECT_EQ(address, "addr1qxzk4wqhh5qmzas4e26aghcvkz8feju6sa43nghfj5xxsly9d2up00gpk9mptj44630sevywnn9e4pmtrx3wn9gvdp7qjhvjl4");
-            break;
-        case TWCoinTypeCosmos:
-            EXPECT_EQ(address, "cosmos1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0emlrvp");
-            break;
-        case TWCoinTypeCryptoOrg:
-            EXPECT_EQ(address, "cro1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0pqh6ss");
-            break;
-        case TWCoinTypeDash:
-            EXPECT_EQ(address, "XsyCV5yojxF4y3bYeEiVYqarvRgsWFELZL");
-            break;
-        case TWCoinTypeDecred:
-            EXPECT_EQ(address, "Dsp4u8xxTHSZU2ELWTQLQP77xJhgeWrTsGK");
-            break;
-        case TWCoinTypeDigiByte:
-            EXPECT_EQ(address, "dgb1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0c69ssz");
-            break;
-        case TWCoinTypeDogecoin:
-            EXPECT_EQ(address, "DNRTC6GZ5evmM7BZWwPqF54fyDqUqULMyu");
-            break;
-        case TWCoinTypeECash:
-            EXPECT_EQ(address, "ecash:qz7eyzytkl5z6cg6nw20hd62pyyp22mcfuywezks2y");
-            break;
-        case TWCoinTypeEOS:
-            EXPECT_EQ(address, "EOS5TrYnZP1RkDSUMzBY4GanCy6AP68kCMdkAb5EACkAwkdgRLShz");
-            break;
-        case TWCoinTypeElrond:
-            EXPECT_EQ(address, "erd1a6f6fan035ttsxdmn04ellxdlnwpgyhg0lhx5vjv92v6rc8xw9yq83344f");
-            break;
-        case TWCoinTypeEverscale:
-            EXPECT_EQ(address, "0:ef64d51f95ef17973b737277cfecbd2a8d551141be2f58f5fb362575fc3eb5b0");
-            break;
-        case TWCoinTypeFIO:
-            EXPECT_EQ(address, "FIO5TrYnZP1RkDSUMzBY4GanCy6AP68kCMdkAb5EACkAwkdgRLShz");
-            break;
-        case TWCoinTypeFilecoin:
-            EXPECT_EQ(address, "f1qsx7qwiojh5duxbxhbqgnlyx5hmpcf7mcz5oxsy");
-            break;
-        case TWCoinTypeFiro:
-            EXPECT_EQ(address, "aHzpPjmY132KseS4nkiQTbDahTEXqesY89");
-            break;
-        case TWCoinTypeGroestlcoin:
-            EXPECT_EQ(address, "grs1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0jsaf3d");
-            break;
-        case TWCoinTypeHarmony:
-            EXPECT_EQ(address, "one1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj0nmx3dt");
-            break;
-        case TWCoinTypeICON:
-            EXPECT_EQ(address, "hx4728fc65c31728f0d3538b8783b5394b31a136b9");
-            break;
-        case TWCoinTypeIoTeX:
-            EXPECT_EQ(address, "io1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj0zgdt6h");
-            break;
-        case TWCoinTypeKava:
-            EXPECT_EQ(address, "kava1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z09wt76x");
-            break;
-        case TWCoinTypeKusama:
-            EXPECT_EQ(address, "Hy8mqcexg5FMwMYnQvzrUvD723qMxDjMRU9HdNCnTsMAypY");
-            break;
-        case TWCoinTypeLitecoin:
-            EXPECT_EQ(address, "ltc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0tamvsu");
-            break;
-        case TWCoinTypeMonacoin:
-            EXPECT_EQ(address, "MRBWtGEKHGCHhmyJ1L4CwaWQZJzM5DnVcs");
-            break;
-        case TWCoinTypeNEAR:
-            EXPECT_EQ(address, "ee93a4f66f8d16b819bb9beb9ffccdfcdc1412e87fee6a324c2a99a1e0e67148");
-            break;
-        case TWCoinTypeNULS:
-            EXPECT_EQ(address, "NULSd6HgfXT3m5JBGxeCZXHRQbb82FKgZGT8o");
-            break;
-        case TWCoinTypeNano:
-            EXPECT_EQ(address, "nano_1qepdf4k95dhb5gsmhmq3iddqsxiafwkihunm7irn48jdiwdtnn6pe93k3f6");
-            break;
-        case TWCoinTypeNativeEvmos:
-            EXPECT_EQ(address, "evmos1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj07me7uu");
-            break;
-        case TWCoinTypeNebulas:
-            EXPECT_EQ(address, "n1XTciu9ZRYt3ni7SxNBmivk9Y6XpP6VrhT");
-            break;
-        case TWCoinTypeNimiq:
-            EXPECT_EQ(address, "NQ74 D40G N3M0 9EJD ET56 UPLR 02VC X6DU 8G1E");
-            break;
-        case TWCoinTypeOasis:
-            EXPECT_EQ(address, "oasis1qzw4h3wmyjtrttduqqrs8udggyy2emwdzqmuzwg4");
-            break;
-        case TWCoinTypeOsmosis:
-            EXPECT_EQ(address, "osmo1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z03qvn6n");
-            break;
-        case TWCoinTypePolkadot:
-            EXPECT_EQ(address, "16PpFrXrC6Ko3pYcyMAx6gPMp3mFFaxgyYMt4G5brkgNcSz8");
-            break;
-        case TWCoinTypeQtum:
-            EXPECT_EQ(address, "QdtLm8ccxhuJFF5zCgikpaghbM3thdaGsW");
-            break;
-        case TWCoinTypeRavencoin:
-            EXPECT_EQ(address, "RSZYjMDCP4q3t7NAFXPPnqEGrMZn971pdB");
-            break;
-        case TWCoinTypeRonin:
-            EXPECT_EQ(address, "ronin:9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F");
-            break;
-        case TWCoinTypeSolana:
-            EXPECT_EQ(address, "H4JcMPicKkHcxxDjkyyrLoQj7Kcibd9t815ak4UvTr9M");
-            break;
-        case TWCoinTypeTHORChain:
-            EXPECT_EQ(address, "thor1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0luxce7");
-            break;
-        case TWCoinTypeTezos:
-            EXPECT_EQ(address, "tz1gcEWswVU6dxfNQWbhTgaZrUrNUFwrsT4z");
-            break;
-        case TWCoinTypeTron:
-            EXPECT_EQ(address, "TQLCsShbQNXMTVCjprY64qZmEA4rBarpQp");
-            break;
-        case TWCoinTypeViacoin:
-            EXPECT_EQ(address, "via1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z09y9mn2");
-            break;
-        case TWCoinTypeWaves:
-            EXPECT_EQ(address, "3P2C786D6mBuvyf4WYr6K6Vch5uhi97nBHG");
-            break;
-        case TWCoinTypeXRP:
-            EXPECT_EQ(address, "rJHMeqKu8Ep7Fazx8MQG6JunaafBXz93YQ");
-            break;
-        case TWCoinTypeZilliqa:
-            EXPECT_EQ(address, "zil1j2cvtd7j9n7fnxfv2r3neucjw8tp4xz9sp07v4");
-            break;
-        case TWCoinTypeNervos:
-            EXPECT_EQ(address, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqtsqfsf77ae0wn5a7795hs2ydv83g6hl4qleywxw");
-            break;
-            // no default branch here, intentionally, to better notice any missing coins
-        }
-    }
-}
-
-int countThreadReady = 0;
-std::mutex countThreadReadyMutex;
-
-void useCoinFromThread() {
-    const int tryCount = 20;
-    for (int i = 0; i < tryCount; ++i) {
-        // perform some operations
-        TW::validateAddress(TWCoinTypeZilliqa, "zil1j8xae6lggm8y63m3y2r7aefu797ze7mhzulnqg");
-        TW::validateAddress(TWCoinTypeEthereum, "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F");
-        const auto coinTypes = TW::getCoinTypes();
-    }
-    countThreadReadyMutex.lock();
-    ++countThreadReady;
-    countThreadReadyMutex.unlock();
-}
-
-TEST(Coin, InitMultithread) {
-    const int numThread = 20;
-    countThreadReady = 0;
-    std::thread thread[numThread];
-    // execute in threads
-    for (int i = 0; i < numThread; ++i) {
-        thread[i] = std::thread(useCoinFromThread);
-    }
-    // wait for completion
-    for (int i = 0; i < numThread; ++i) {
-        thread[i].join();
-    }
-    // check that all completed OK
-    ASSERT_EQ(countThreadReady, numThread);
-}
-
-} // namespace TW
diff --git a/tests/Cosmos/AddressTests.cpp b/tests/Cosmos/AddressTests.cpp
deleted file mode 100644
index bcb2012b58e..00000000000
--- a/tests/Cosmos/AddressTests.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "Cosmos/Address.h"
-
-#include <gtest/gtest.h>
-#include <TrustWalletCore/TWHDWallet.h>
-
-namespace TW::Cosmos {
-
-TEST(CosmosAddress, Valid) {
-    ASSERT_TRUE(Address::isValid(TWCoinTypeBinance, "bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2"));
-}
-
-TEST(CosmosAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid(TWCoinTypeBinance, "bnb1grpf0955h0ykzq3ar6nmum7y6gdfl6lxfn46h2"));
-}
-
-TEST(CosmosAddress, Cosmos_FromPublicKey) {
-    auto privateKey = PrivateKey(parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005"));
-    auto publicKeyData = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    ASSERT_EQ(hex(publicKeyData.bytes.begin(), publicKeyData.bytes.end()), "0257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc5");
-
-    auto publicKey = PublicKey(publicKeyData);
-    auto address = Address("cosmos", publicKey);
-    ASSERT_EQ(address.string(), "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-    ASSERT_EQ(hex(address.getKeyHash()), "bc2da90c84049370d1b7c528bc164bc588833f21");
-}
-
-TEST(CosmosAddress, Cosmos_FromString) {
-    Address addr;
-    ASSERT_TRUE(Address::decode("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02", addr));
-    ASSERT_EQ(addr.string(), "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-}
-
-TEST(CosmosAddress, Cosmos_Valid) {
-    ASSERT_TRUE(Address::isValid(TWCoinTypeCosmos, "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02"));
-    ASSERT_TRUE(Address::isValid(TWCoinTypeCosmos, "cosmospub1addwnpepqftjsmkr7d7nx4tmhw4qqze8w39vjq364xt8etn45xqarlu3l2wu2n7pgrq"));
-    ASSERT_TRUE(Address::isValid(TWCoinTypeCosmos, "cosmosvaloper1sxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08"));
-    ASSERT_TRUE(Address::isValid(TWCoinTypeCosmos, "cosmosvalconspub1zcjduepqjnnwe2jsywv0kfc97pz04zkm7tc9k2437cde2my3y5js9t7cw9mstfg3sa"));
-}
-
-TEST(CosmosAddress, Cosmos_Invalid) {
-    ASSERT_FALSE(Address::isValid(TWCoinTypeCosmos, "cosmos1xsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02"));
-    ASSERT_FALSE(Address::isValid(TWCoinTypeCosmos, "cosmospub1xddwnpepqftjsmkr7d7nx4tmhw4qqze8w39vjq364xt8etn45xqarlu3l2wu2n7pgrq"));
-    ASSERT_FALSE(Address::isValid(TWCoinTypeCosmos, "cosmosvaloper1xxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08"));
-    ASSERT_FALSE(Address::isValid(TWCoinTypeCosmos, "cosmosvalconspub1xcjduepqjnnwe2jsywv0kfc97pz04zkm7tc9k2437cde2my3y5js9t7cw9mstfg3sa"));
-}
-
-TEST(CosmosAddress, ThorFromPublicKey) {
-    auto privateKey = PrivateKey(parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e"));
-    auto publicKeyData = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    ASSERT_EQ(hex(publicKeyData.bytes.begin(), publicKeyData.bytes.end()), "03ed997e396cf4292f5fce5a42bba41599ccd5d96e313154a7c9ea7049de317c77");
-
-    auto publicKey = PublicKey(publicKeyData);
-    auto address = Address("thor", publicKey);
-    ASSERT_EQ(address.string(), "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r");
-    ASSERT_EQ(hex(address.getKeyHash()), "1522e767db6eb19708b0038029bfbd607bc9bd0e");
-}
-
-TEST(CosmosAddress, ThorValid) {
-    ASSERT_TRUE(Address::isValid(TWCoinTypeTHORChain, "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r"));
-    ASSERT_FALSE(Address::isValid(TWCoinTypeTHORChain, "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2s"));
-}
-
-} // namespace TW::Cosmos
diff --git a/tests/Cosmos/ProtobufTests.cpp b/tests/Cosmos/ProtobufTests.cpp
deleted file mode 100644
index 73557fd4303..00000000000
--- a/tests/Cosmos/ProtobufTests.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base64.h"
-#include "Cosmos/Address.h"
-#include "Cosmos/Protobuf/authz_tx.pb.h"
-#include "Cosmos/Protobuf/bank_tx.pb.h"
-#include "Cosmos/Protobuf/tx.pb.h"
-#include "Data.h"
-#include "HexCoding.h"
-
-#include "Protobuf/Article.pb.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <google/protobuf/util/json_util.h>
-#include <nlohmann/json.hpp>
-
-#include <gtest/gtest.h>
-
-namespace TW::Cosmos::tests {
-
-using json = nlohmann::json;
-
-TEST(CosmosProtobuf, SendMsg) {
-    auto msgSend = cosmos::bank::v1beta1::MsgSend();
-    msgSend.set_from_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-    msgSend.set_to_address("cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573");
-    auto coin = msgSend.add_amount();
-    coin->set_denom("muon");
-    coin->set_amount("1");
-
-    auto txBody = cosmos::TxBody();
-    txBody.add_messages()->PackFrom(msgSend);
-    txBody.set_memo("");
-    txBody.set_timeout_height(0);
-
-    const auto serialized = data(txBody.SerializeAsString());
-    EXPECT_EQ(hex(serialized), "0a9c010a2f747970652e676f6f676c65617069732e636f6d2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412690a2d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b796778306570683664643032122d636f736d6f73317a743530617a7570616e716c66616d356166687633686578777975746e756b656834633537331a090a046d756f6e120131");
-    EXPECT_EQ(Base64::encode(serialized), "CpwBCi90eXBlLmdvb2dsZWFwaXMuY29tL2Nvc21vcy5iYW5rLnYxYmV0YTEuTXNnU2VuZBJpCi1jb3Ntb3MxaHNrNmpyeXlxamZocDVkaGM1NXRjOWp0Y2t5Z3gwZXBoNmRkMDISLWNvc21vczF6dDUwYXp1cGFucWxmYW01YWZodjNoZXh3eXV0bnVrZWg0YzU3MxoJCgRtdW9uEgEx");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(txBody, &json);
-    assertJSONEqual(json, R"({"messages":[{"@type":"type.googleapis.com/cosmos.bank.v1beta1.MsgSend","amount":[{"amount":"1","denom":"muon"}],"fromAddress":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","toAddress":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}]})");
-}
-
-TEST(CosmosProtobuf, DeterministicSerialization_Article) {
-    // https://github.com/cosmos/cosmos-sdk/blob/master/docs/architecture/adr-027-deterministic-protobuf-serialization.md
-    auto article = blog::Article();
-    article.set_title("The world needs change 🌳");
-    article.set_description("");
-    article.set_created(1596806111080);
-    article.set_updated(0);
-    article.set_public_(true);
-    article.set_promoted(false);
-    article.set_type(blog::NEWS);
-    article.set_review(blog::REVIEW_UNSPECIFIED);
-    *article.add_comments() = "Nice one";
-    *article.add_comments() = "Thank you";
-
-    const auto serialized = data(article.SerializeAsString());
-    EXPECT_EQ(hex(serialized), "0a1b54686520776f726c64206e65656473206368616e676520f09f8cb318e8bebec8bc2e280138024a084e696365206f6e654a095468616e6b20796f75");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/Cosmos/SignerTests.cpp b/tests/Cosmos/SignerTests.cpp
deleted file mode 100644
index 36355e3ed4f..00000000000
--- a/tests/Cosmos/SignerTests.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Coin.h"
-#include "HexCoding.h"
-#include "Base64.h"
-#include "proto/Cosmos.pb.h"
-#include "Cosmos/Address.h"
-#include "Cosmos/Signer.h"
-#include "../interface/TWTestUtilities.h"
-#include "Cosmos/Protobuf/bank_tx.pb.h"
-
-#include <gtest/gtest.h>
-#include <google/protobuf/util/json_util.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(CosmosSigner, SignTxProtobuf) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-    input.set_memo("");
-    input.set_sequence(8);
-
-    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
-    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("muon");
-    amountOfTx->set_amount("1");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("200");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-
-    EXPECT_EQ(R"({"signingMode":"Protobuf","accountNumber":"1037","chainId":"gaia-13003","fee":{"amounts":[{"denom":"muon","amount":"200"}],"gas":"200000"},"sequence":"8","messages":[{"sendCoinsMessage":{"fromAddress":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","toAddress":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573","amounts":[{"denom":"muon","amount":"1"}]}}]})", json);
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "f9e1f4001657a42009c4eb6859625d2e41e961fc72efd2842909c898e439fc1f549916e4ecac676ee353c7d54c5ae30a29b4210b8bff0ebfdcb375e105002f47");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(CosmosSigner, SignProtobuf_ErrorMissingMessage) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-    input.set_memo("");
-    input.set_sequence(8);
-
-    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
-    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("200");
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    EXPECT_EQ(output.error(), "Error: No message found");
-    EXPECT_EQ(output.serialized(), "");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(hex(output.signature()), "");
-}
-
-TEST(CosmosSigner, SignTxJson) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::JSON); // obsolete
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-    input.set_memo("");
-    input.set_sequence(8);
-
-    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
-    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("muon");
-    amountOfTx->set_amount("1");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("200");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-
-    EXPECT_EQ(R"({"accountNumber":"1037","chainId":"gaia-13003","fee":{"amounts":[{"denom":"muon","amount":"200"}],"gas":"200000"},"sequence":"8","messages":[{"sendCoinsMessage":{"fromAddress":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","toAddress":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573","amounts":[{"denom":"muon","amount":"1"}]}}]})", json);
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    // the sample tx on testnet
-    // https://hubble.figment.network/chains/gaia-13003/blocks/142933/transactions/3A9206598C3D2E75A5EC074FD33EA53EB18EC729357F0965971C1C51F812AEA3?format=json
-    EXPECT_EQ(R"({"mode":"block","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}]}})", output.json());
-
-    EXPECT_EQ(hex(output.signature()), "fc3ef899d206c88077fec42f21ba0b4df4bd3fd115fdf606ae01d9136fef363f57e9e33a7b9ec6ddab658cd07e3c0067470de94e4e75b979a1085a29f0efd926");
-    EXPECT_EQ(output.serialized(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(CosmosSigner, SignTxJson_WithMode) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::JSON); // obsolete
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-    input.set_memo("");
-    input.set_sequence(8);
-    input.set_mode(Proto::BroadcastMode::ASYNC);
-
-    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
-    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("muon");
-    amountOfTx->set_amount("1");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("200");
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    {
-        auto output = Signer::sign(input, TWCoinTypeCosmos);
-        EXPECT_EQ(R"({"mode":"async","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}]}})", output.json());
-        EXPECT_EQ(output.error(), "");
-    }
-    input.set_mode(Proto::BroadcastMode::SYNC);
-    {
-        auto output = Signer::sign(input, TWCoinTypeCosmos);
-        EXPECT_EQ(R"({"mode":"sync","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}]}})", output.json());
-        EXPECT_EQ(output.error(), "");
-    }
-}
-
-TEST(CosmosSigner, SignIbcTransferProtobuf_817101) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(546179);
-    input.set_chain_id("cosmoshub-4");
-    input.set_sequence(2);
-
-    Address fromAddress;
-    EXPECT_TRUE(Address::decode("cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx", fromAddress));
-    Address toAddress;
-    EXPECT_TRUE(Address::decode("osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn", toAddress));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_transfer_tokens_message();
-    message.set_source_port("transfer");
-    message.set_source_channel("channel-141");
-    message.set_sender(fromAddress.string());
-    message.set_receiver(toAddress.string());
-    message.mutable_token()->set_denom("uatom");
-    message.mutable_token()->set_amount("100000"); // 0.1 ATOM
-    message.mutable_timeout_height()->set_revision_number(1);
-    message.mutable_timeout_height()->set_revision_height(8800000);
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(500000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uatom");
-    amountOfFee->set_amount("12500");
-
-    auto privateKey = parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af");
-    EXPECT_EQ(Cosmos::Address(TWCoinTypeCosmos, PrivateKey(privateKey).getPublicKey(TWPublicKeyTypeSECP256k1)).string(), "cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    // real-world tx: https://www.mintscan.io/cosmos/txs/817101F3D96314AD028733248B28BAFAD535024D7D2C8875D3FE31DC159F096B
-    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "Cr4BCr...1yKOU=", "mode": "BROADCAST_MODE_BLOCK"}' https://api.cosmos.network/cosmos/tx/v1beta1/txs
-    // also similar TX: BCDAC36B605576C8182C2829C808B30A69CAD4959D5ED1E6FF9984ABF280D603
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"Cr4BCrsBCikvaWJjLmFwcGxpY2F0aW9ucy50cmFuc2Zlci52MS5Nc2dUcmFuc2ZlchKNAQoIdHJhbnNmZXISC2NoYW5uZWwtMTQxGg8KBXVhdG9tEgYxMDAwMDAiLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseCorb3NtbzE4czBoZG5zbGxnY2Nsd2V1OWF5bXc0bmdrdHIyazBya3ZuN2ptbjIHCAEQgI6ZBBJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEC7O9c5DejAsZ/lUaN5LMfNukR9GfX5qUrQcHhPh1WNkkSBAoCCAEYAhIUCg4KBXVhdG9tEgUxMjUwMBCgwh4aQK0HIWdFMk+C6Gi1KG/vELe1ffcc1aEWUIqz2t/ZhwqNNHxUUSp27wteiugHEMVTEIOBhs84t2gIcT/nD/1yKOU=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "ad07216745324f82e868b5286fef10b7b57df71cd5a116508ab3dadfd9870a8d347c54512a76ef0b5e8ae80710c55310838186cf38b76808713fe70ffd7228e5");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(CosmosSigner, SignDirect1) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_sign_direct_message();
-    const auto bodyBytes = parse_hex("0a89010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412690a2d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b796778306570683664643032122d636f736d6f73317a743530617a7570616e716c66616d356166687633686578777975746e756b656834633537331a090a046d756f6e120131");
-    message.set_body_bytes(bodyBytes.data(), bodyBytes.size());
-    const auto authInfoBytes = parse_hex("0a500a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a210257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc512040a020801180812110a0b0a046d756f6e120332303010c09a0c");
-    message.set_auth_info_bytes(authInfoBytes.data(), authInfoBytes.size());
-
-    {
-        std::string json;
-        google::protobuf::util::MessageToJsonString(input, &json);
-        EXPECT_EQ(R"({"signingMode":"Protobuf","accountNumber":"1037","chainId":"gaia-13003","messages":[{"signDirectMessage":{"bodyBytes":"CokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATE=","authInfoBytes":"ClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYCBIRCgsKBG11b24SAzIwMBDAmgw="}}]})", json);
-    }
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "f9e1f4001657a42009c4eb6859625d2e41e961fc72efd2842909c898e439fc1f549916e4ecac676ee353c7d54c5ae30a29b4210b8bff0ebfdcb375e105002f47");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(CosmosSigner, SignDirect_0a90010a) {
-    const auto bodyBytes = parse_hex("0a90010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412700a2d636f736d6f7331706b707472653766646b6c366766727a6c65736a6a766878686c63337234676d6d6b38727336122d636f736d6f7331717970717870713971637273737a673270767871367273307a716733797963356c7a763778751a100a0575636f736d120731323334353637");
-    { // verify contents of body
-        auto msgSend = cosmos::bank::v1beta1::MsgSend();
-        msgSend.set_from_address("cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6");
-        msgSend.set_to_address("cosmos1qypqxpq9qcrsszg2pvxq6rs0zqg3yyc5lzv7xu");
-        auto amount = msgSend.add_amount();
-        amount->set_denom("ucosm");
-        amount->set_amount("1234567");
-        const auto msgSendSer = msgSend.SerializeAsString();
-        const auto bodyBytes1 = data(msgSendSer);
-        ASSERT_EQ(hex(bodyBytes1), "0a2d636f736d6f7331706b707472653766646b6c366766727a6c65736a6a766878686c63337234676d6d6b38727336122d636f736d6f7331717970717870713971637273737a673270767871367273307a716733797963356c7a763778751a100a0575636f736d120731323334353637");
-        const auto prefix = "/cosmos.bank.v1beta1.MsgSend";
-        const auto bodyBytes2 = parse_hex("0a90010a1c" + hex(data(prefix)) + "1270" + hex(bodyBytes1));
-        ASSERT_EQ(hex(bodyBytes2), hex(bodyBytes));
-    }
-
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1);
-    input.set_chain_id("cosmoshub-4");
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_sign_direct_message();
-    message.set_body_bytes(bodyBytes.data(), bodyBytes.size());
-    const auto authInfoBytes = parse_hex("0a0a0a0012040a020801180112130a0d0a0575636f736d12043230303010c09a0c");
-    message.set_auth_info_bytes(authInfoBytes.data(), authInfoBytes.size());
-
-    {
-        std::string json;
-        google::protobuf::util::MessageToJsonString(input, &json);
-        EXPECT_EQ(R"({"signingMode":"Protobuf","accountNumber":"1","chainId":"cosmoshub-4","messages":[{"signDirectMessage":{"bodyBytes":"CpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLWNvc21vczFwa3B0cmU3ZmRrbDZnZnJ6bGVzamp2aHhobGMzcjRnbW1rOHJzNhItY29zbW9zMXF5cHF4cHE5cWNyc3N6ZzJwdnhxNnJzMHpxZzN5eWM1bHp2N3h1GhAKBXVjb3NtEgcxMjM0NTY3","authInfoBytes":"CgoKABIECgIIARgBEhMKDQoFdWNvc20SBDIwMDAQwJoM"}}]})", json);
-    }
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLWNvc21vczFwa3B0cmU3ZmRrbDZnZnJ6bGVzamp2aHhobGMzcjRnbW1rOHJzNhItY29zbW9zMXF5cHF4cHE5cWNyc3N6ZzJwdnhxNnJzMHpxZzN5eWM1bHp2N3h1GhAKBXVjb3NtEgcxMjM0NTY3EiEKCgoAEgQKAggBGAESEwoNCgV1Y29zbRIEMjAwMBDAmgwaQEgXmSAlm4M5bz+OX1GtvvZ3fBV2wrZrp4A/Imd55KM7ASivB/siYJegmYiOKzQ82uwoEmFalNnG2BrHHDwDR2Y=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "48179920259b83396f3f8e5f51adbef6777c1576c2b66ba7803f226779e4a33b0128af07fb226097a099888e2b343cdaec2812615a94d9c6d81ac71c3c034766");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/Cosmos/StakingTests.cpp b/tests/Cosmos/StakingTests.cpp
deleted file mode 100644
index f3fb89a34f5..00000000000
--- a/tests/Cosmos/StakingTests.cpp
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base64.h"
-#include "Coin.h"
-#include "Cosmos/Address.h"
-#include "Cosmos/Signer.h"
-#include "HexCoding.h"
-#include "proto/Cosmos.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(CosmosStaking, CompoundingAuthz) {
-    // Successfully broadcasted https://www.mintscan.io/cosmos/txs/C4629BC7C88690518D8F448E7A8D239C9D63975B11F8E1CE2F95CC2ADA3CCF67
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1290826);
-    input.set_chain_id("cosmoshub-4");
-    input.set_memo("");
-    input.set_sequence(5);
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_auth_grant();
-    message.set_granter("cosmos13k0q0l7lg2kr32kvt7ly236ppldy8v9dzwh3gd");
-    message.set_grantee("cosmos1fs7lu28hx5m9akm7rp0c2422cn8r2f7gurujhf");
-    auto& grant_stake = *message.mutable_grant_stake();
-    grant_stake.mutable_allow_list()->add_address("cosmosvaloper1gjtvly9lel6zskvwtvlg5vhwpu9c9waw7sxzwx");
-    grant_stake.set_authorization_type(TW::Cosmos::Proto::Message_AuthorizationType_DELEGATE);
-    message.set_expiration(1692309600);
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(96681);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uatom");
-    amountOfFee->set_amount("2418");
-
-    auto privateKey = parse_hex("c7764249cdf77f8f1d840fa8af431579e5e41cf1af937e1e23afa22f3f4f0ccc");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-    auto expected = R"(
-                {
-                    "mode":"BROADCAST_MODE_BLOCK",
-                    "tx_bytes":"CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjoSNgo0Y29zbW9zdmFsb3BlcjFnanR2bHk5bGVsNnpza3Z3dHZsZzV2aHdwdTljOXdhdzdzeHp3eCABEgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQIFyfuijGKf87Hz61ZqxasfLI1PZnNge4RDq/tRyB/tZI6p80iGRqHecoV6+84EQkc9GTlNRQOSlApRCsivT9XI="
-                })";
-    assertJSONEqual(output.serialized(), expected);
-}
-
-TEST(CosmosStaking, RevokeCompoundingAuthz) {
-    // Successfully broadcasted:  https://www.mintscan.io/cosmos/txs/E3218F634BB6A1BE256545EBE38275D5B02D41E88F504A43F97CD9CD2B624D44
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1290826);
-    input.set_chain_id("cosmoshub-4");
-    input.set_memo("");
-    input.set_sequence(4);
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_auth_revoke();
-    message.set_grantee("cosmos1fs7lu28hx5m9akm7rp0c2422cn8r2f7gurujhf");
-    message.set_granter("cosmos13k0q0l7lg2kr32kvt7ly236ppldy8v9dzwh3gd");
-    message.set_msg_type_url("/cosmos.staking.v1beta1.MsgDelegate");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(87735);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uatom");
-    amountOfFee->set_amount("2194");
-
-    auto privateKey = parse_hex("c7764249cdf77f8f1d840fa8af431579e5e41cf1af937e1e23afa22f3f4f0ccc");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-    auto expected = R"(
-                {
-                    "mode":"BROADCAST_MODE_BLOCK",
-                    "tx_bytes":"CqoBCqcBCh8vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnUmV2b2tlEoMBCi1jb3Ntb3MxM2swcTBsN2xnMmtyMzJrdnQ3bHkyMzZwcGxkeTh2OWR6d2gzZ2QSLWNvc21vczFmczdsdTI4aHg1bTlha203cnAwYzI0MjJjbjhyMmY3Z3VydWpoZhojL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuTXNnRGVsZWdhdGUSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAQSEwoNCgV1YXRvbRIEMjE5NBC3rQUaQI7K+W7MMBoD6FbFZxRBqs9VTjErztjWTy57+fvrLaTCIZ+eBs7CuaKqfUZdSN8otjubSHVTQID3k9DpPAX0yDo="
-                })";
-    assertJSONEqual(output.serialized(), expected);
-}
-
-TEST(CosmosStaking, Staking) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-    input.set_memo("");
-    input.set_sequence(7);
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_stake_message();
-    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-    message.set_validator_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
-    auto& amountOfTx = *message.mutable_amount();
-    amountOfTx.set_denom("muon");
-    amountOfTx.set_amount("10");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(101721);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("1018");
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"CpsBCpgBCiMvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dEZWxlZ2F0ZRJxCi1jb3Ntb3MxaHNrNmpyeXlxamZocDVkaGM1NXRjOWp0Y2t5Z3gwZXBoNmRkMDISNGNvc21vc3ZhbG9wZXIxemt1cHI4M2hyemtuM3VwNWVsa3R6Y3EzdHVmdDhueHNtd2RxZ3AaCgoEbXVvbhICMTASZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAcSEgoMCgRtdW9uEgQxMDE4ENmaBhpA8O9Jm/kL6Za2I3poDs5vpMowYJgNvYCJBRU/vxAjs0lNZYsq40qpTbwOTbORjJA5UjQ6auc40v6uCFT4q4z+uA==\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "f0ef499bf90be996b6237a680ece6fa4ca3060980dbd808905153fbf1023b3494d658b2ae34aa94dbc0e4db3918c903952343a6ae738d2feae0854f8ab8cfeb8");
-    EXPECT_EQ(output.error(), "");
-
-    { // Json-serialization, for coverage (to be removed later)
-        input.set_signing_mode(Proto::JSON);
-        auto signingOutput = Signer::sign(input, TWCoinTypeCosmos);
-        ASSERT_EQ(hex(signingOutput.signature()), "c08bdf6c2b0b4428f37975e85d329f1cb19745b000994a743b5df81d57d573aa5f755349befcc848c1d1507818723b1288594bc91df685e89aff22e0303b4861");
-        EXPECT_EQ(signingOutput.error(), "");
-        EXPECT_EQ(hex(signingOutput.serialized()), "");
-    }
-}
-
-TEST(CosmosStaking, Unstaking) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-    input.set_memo("");
-    input.set_sequence(7);
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_unstake_message();
-    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-    message.set_validator_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
-    auto& amountOfTx = *message.mutable_amount();
-    amountOfTx.set_denom("muon");
-    amountOfTx.set_amount("10");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(101721);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("1018");
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"Cp0BCpoBCiUvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dVbmRlbGVnYXRlEnEKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBoKCgRtdW9uEgIxMBJmClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYBxISCgwKBG11b24SBDEwMTgQ2ZoGGkBhlxHFnjBERxLtjLbMCKXcrDctaSZ9djtWCa3ely1bpV6m+6aAFjpr8aEZH+q2AtjJSEdgpQRJxP+9/gQsRTnZ\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "619711c59e30444712ed8cb6cc08a5dcac372d69267d763b5609adde972d5ba55ea6fba680163a6bf1a1191feab602d8c9484760a50449c4ffbdfe042c4539d9");
-    EXPECT_EQ(output.error(), "");
-
-    { // Json-serialization, for coverage (to be removed later)
-        input.set_signing_mode(Proto::JSON);
-        auto signingOutput = Signer::sign(input, TWCoinTypeCosmos);
-        ASSERT_EQ(hex(signingOutput.signature()), "8f85a9515a211881daebfb346c2beeca3ab5c2d406a9b3ad402cfddaa3d08e2b13378e13cfef8ecf1d6500fe85d0ce3e793034dd77aba90f216427807cbff79f");
-        EXPECT_EQ(signingOutput.error(), "");
-        EXPECT_EQ(hex(signingOutput.serialized()), "");
-    }
-}
-
-TEST(CosmosStaking, Restaking) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-    input.set_memo("");
-    input.set_sequence(7);
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_restake_message();
-    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-    message.set_validator_dst_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-    message.set_validator_src_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
-
-    auto& amountOfTx = *message.mutable_amount();
-    amountOfTx.set_denom("muon");
-    amountOfTx.set_amount("10");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(101721);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("1018");
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"CtIBCs8BCiovY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dCZWdpblJlZGVsZWdhdGUSoAEKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBotY29zbW9zMWhzazZqcnl5cWpmaHA1ZGhjNTV0YzlqdGNreWd4MGVwaDZkZDAyIgoKBG11b24SAjEwEmYKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJXKG7D830zVXu7qgALJ3RKyQI6qZZ8rnWhgdH/kfqdxRIECgIIARgHEhIKDAoEbXVvbhIEMTAxOBDZmgYaQJ52qO5xdtBkNUeFeWrnqUXkngyHFKCXnOPPClyVI0HrULdp5jbwGra2RujEOn4BrbFCb3JFnpc2o1iuLXbKQxg=\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "9e76a8ee7176d064354785796ae7a945e49e0c8714a0979ce3cf0a5c952341eb50b769e636f01ab6b646e8c43a7e01adb1426f72459e9736a358ae2d76ca4318");
-    EXPECT_EQ(output.error(), "");
-
-    { // Json-serialization, for coverage (to be removed later)
-        input.set_signing_mode(Proto::JSON);
-        auto signingOutput = Signer::sign(input, TWCoinTypeCosmos);
-        ASSERT_EQ(hex(signingOutput.signature()), "e64d3761bd25a28befcda80c0a0e208d024fdb0a2b89955170e65a5c5d454aba2ce81d57e01f0c126de5a59c2b58124c109560c9803d65a17a14b548dd6c50db");
-        EXPECT_EQ(signingOutput.error(), "");
-        EXPECT_EQ(hex(signingOutput.serialized()), "");
-    }
-}
-
-TEST(CosmosStaking, Withdraw) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1037);
-    input.set_chain_id("gaia-13003");
-    input.set_memo("");
-    input.set_sequence(7);
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_withdraw_stake_reward_message();
-    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-    message.set_validator_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(101721);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("1018");
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeCosmos);
-
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"CqMBCqABCjcvY29zbW9zLmRpc3RyaWJ1dGlvbi52MWJldGExLk1zZ1dpdGhkcmF3RGVsZWdhdG9yUmV3YXJkEmUKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBJmClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYBxISCgwKBG11b24SBDEwMTgQ2ZoGGkBW1Cd+0pNfMPEVXQtqG1VIijDjZP2UOiDlvUF478axnxlF8PaOAsY0S5OdUE3Wz7+nu8YVmrLZQS/8mlqLaK05\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "56d4277ed2935f30f1155d0b6a1b55488a30e364fd943a20e5bd4178efc6b19f1945f0f68e02c6344b939d504dd6cfbfa7bbc6159ab2d9412ffc9a5a8b68ad39");
-    EXPECT_EQ(output.error(), "");
-
-    { // Json-serialization, for coverage (to be removed later)
-        input.set_signing_mode(Proto::JSON);
-        auto signingOutput = Signer::sign(input, TWCoinTypeCosmos);
-        ASSERT_EQ(hex(signingOutput.signature()), "546f0d67356f6af94cfb5ab22b974e499c33123f2c2c292f4f0e64878e0e728f4643105fd771550beb3f2371f08880aaa38fa8f2334c103a779f1d82d2db98d6");
-        EXPECT_EQ(signingOutput.error(), "");
-        EXPECT_EQ(hex(signingOutput.serialized()), "");
-    }
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/Cosmos/TWAnyAddressTests.cpp b/tests/Cosmos/TWAnyAddressTests.cpp
deleted file mode 100644
index 5605e54aef0..00000000000
--- a/tests/Cosmos/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWCoinType.h>
-
-#include <gtest/gtest.h>
-
-TEST(CosmosAnyAddress, Cosmos) {
-    auto string = STRING("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeCosmos));
-    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
-    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "bc2da90c84049370d1b7c528bc164bc588833f21");
-}
diff --git a/tests/Cosmos/TWAnySignerTests.cpp b/tests/Cosmos/TWAnySignerTests.cpp
deleted file mode 100644
index ae6fd1e8bf7..00000000000
--- a/tests/Cosmos/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Cosmos/Address.h"
-#include "HexCoding.h"
-#include "proto/Cosmos.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <gtest/gtest.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(TWAnySignerCosmos, SignTx) {
-    auto privateKey = parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af");
-    Proto::SigningInput input;
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(546179);
-    input.set_chain_id("cosmoshub-4");
-    input.set_memo("");
-    input.set_sequence(0);
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Address fromAddress;
-    EXPECT_TRUE(Address::decode("cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx", fromAddress));
-    Address toAddress;
-    EXPECT_TRUE(Address::decode("cosmos18s0hdnsllgcclweu9aymw4ngktr2k0rkygdzdp", toAddress));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("uatom");
-    amountOfTx->set_amount("400000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uatom");
-    amountOfFee->set_amount("1000");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeCosmos);
-
-    // https://www.mintscan.io/cosmos/txs/85392373F54577562067030BF0D61596C91188AA5E6CA8FFE731BD0349296411
-    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "CpIBC...JXoCX", "mode": "BROADCAST_MODE_BLOCK"}' https://api.cosmos.network/cosmos/tx/v1beta1/txs
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseBItY29zbW9zMThzMGhkbnNsbGdjY2x3ZXU5YXltdzRuZ2t0cjJrMHJreWdkemRwGg8KBXVhdG9tEgY0MDAwMDASZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJEgQKAggBEhMKDQoFdWF0b20SBDEwMDAQwJoMGkCvvVE6d29P30cO9/lnXyGunWMPxNY12NuqDcCnFkNM0H4CUQdl1Gc9+ogIJbro5nyzZzlv9rl2/GsZox/JXoCX\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "afbd513a776f4fdf470ef7f9675f21ae9d630fc4d635d8dbaa0dc0a716434cd07e02510765d4673dfa880825bae8e67cb367396ff6b976fc6b19a31fc95e8097");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(TWAnySignerCosmos, SignJSON) {
-    auto json = STRING(R"({"accountNumber":"8733","chainId":"cosmoshub-2","fee":{"amounts":[{"denom":"uatom","amount":"5000"}],"gas":"200000"}, "memo":"Testing", "messages":[{"sendCoinsMessage":{"fromAddress":"cosmos1ufwv9ymhqaal6xz47n0jhzm2wf4empfqvjy575","toAddress":"cosmos135qla4294zxarqhhgxsx0sw56yssa3z0f78pm0","amounts":[{"denom":"uatom","amount":"995000"}]}}]})");
-    auto key = DATA("c9b0a273831931aa4a5f8d1a570d5021dda91d3319bd3819becdaabfb7b44e3b");
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeCosmos));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeCosmos));
-    assertStringsEqual(result, R"({"mode":"block","tx":{"fee":{"amount":[{"amount":"5000","denom":"uatom"}],"gas":"200000"},"memo":"Testing","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"995000","denom":"uatom"}],"from_address":"cosmos1ufwv9ymhqaal6xz47n0jhzm2wf4empfqvjy575","to_address":"cosmos135qla4294zxarqhhgxsx0sw56yssa3z0f78pm0"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6EsukEXB53GhohQVeDpxtkeH8KQIayd/Co/ApYRYkTm"},"signature":"ULEpUqNzoAnYEx2x22F3ANAiPXquAU9+mqLWoAA/ZOUGTMsdb6vryzsW6AKX2Kqj1pGNdrTcQ58Z09JPyjpgEA=="}]}})");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/Cosmos/TWCoinTypeTests.cpp b/tests/Cosmos/TWCoinTypeTests.cpp
deleted file mode 100644
index 10d3a2d3cc4..00000000000
--- a/tests/Cosmos/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWCosmosCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCosmos));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("541FA06FB37AC1BF61922143783DD76FECA361830F9876D0342536EE8A87A790"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCosmos, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("cosmos1gu6y2a0ffteesyeyeesk23082c6998xyzmt9mz"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCosmos, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCosmos));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCosmos));
-    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeCosmos));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCosmos), 6);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeCosmos));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCosmos));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCosmos));
-    assertStringsEqual(chainId, "cosmoshub-4");
-    assertStringsEqual(symbol, "ATOM");
-    assertStringsEqual(txUrl, "https://mintscan.io/cosmos/txs/541FA06FB37AC1BF61922143783DD76FECA361830F9876D0342536EE8A87A790");
-    assertStringsEqual(accUrl, "https://mintscan.io/cosmos/account/cosmos1gu6y2a0ffteesyeyeesk23082c6998xyzmt9mz");
-    assertStringsEqual(id, "cosmos");
-    assertStringsEqual(name, "Cosmos Hub");
-}
diff --git a/tests/Cronos/TWAnyAddressTests.cpp b/tests/Cronos/TWAnyAddressTests.cpp
deleted file mode 100644
index bee3a617641..00000000000
--- a/tests/Cronos/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWCoinType.h>
-
-#include <gtest/gtest.h>
-
-TEST(CronosAnyAddress, Validate) {
-    auto string = STRING("0xEC49280228b0D05Aa8e8b756503254e1eE7835ab");
-
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeCronosChain));
-    
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "ec49280228b0d05aa8e8b756503254e1ee7835ab");    
-}
diff --git a/tests/Cronos/TWCoinTypeTests.cpp b/tests/Cronos/TWCoinTypeTests.cpp
deleted file mode 100644
index 728c15a121d..00000000000
--- a/tests/Cronos/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-TEST(TWCronosCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCronosChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x850131282053328ad569fa91200aa970cbed7d97b52951fe8b449cca3708789e"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCronosChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x44eed2bb80b688a8778173c19fe11cd6876af15a"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCronosChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCronosChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCronosChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCronosChain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeCronosChain));
-
-    assertStringsEqual(symbol, "CRO");
-    assertStringsEqual(txUrl, "https://cronoscan.com/tx/0x850131282053328ad569fa91200aa970cbed7d97b52951fe8b449cca3708789e");
-    assertStringsEqual(accUrl, "https://cronoscan.com/address/0x44eed2bb80b688a8778173c19fe11cd6876af15a");
-    assertStringsEqual(id, "cronos");
-    assertStringsEqual(name, "Cronos Chain");
-}
diff --git a/tests/CryptoOrg/AddressTests.cpp b/tests/CryptoOrg/AddressTests.cpp
deleted file mode 100644
index 8bd3bfdd62f..00000000000
--- a/tests/CryptoOrg/AddressTests.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Cosmos/Address.h"
-#include "PublicKey.h"
-#include "PrivateKey.h"
-#include <TrustWalletCore/TWCoinType.h>
-
-#include <gtest/gtest.h>
-#include <vector>
-
-namespace TW::Cosmos::tests {
-
-TEST(CryptoorgAddress, Valid) {
-    ASSERT_TRUE(Address::isValid(TWCoinTypeCryptoOrg, "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0"));
-    ASSERT_TRUE(Address::isValid(TWCoinTypeCryptoOrg, "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus"));
-    ASSERT_TRUE(Address::isValid(TWCoinTypeCryptoOrg, "cro1z53wwe7md6cewz9sqwqzn0aavpaun0gw39h3rd"));
-    ASSERT_TRUE(Address::isValid(TWCoinTypeCryptoOrg, "cro1y8ua5laceufhqtwzyhahq0qk7rm87hhugtsfey"));
-}
-
-TEST(CryptoorgAddress, Invalid) {
-    EXPECT_FALSE(Address::isValid(TWCoinTypeCryptoOrg, "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf1"));
-    EXPECT_FALSE(Address::isValid(TWCoinTypeCryptoOrg, "cro1z53wwe7md6cewz9sqwqzn0aavpaun0gw39h3re"));
-    EXPECT_FALSE(Address::isValid(TWCoinTypeCryptoOrg, "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02")); // valid cosmos
-}
-
-TEST(CryptoorgAddress, FromPrivateKey) {
-    auto privateKey = PrivateKey(parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e"));
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto address = Address(TWCoinTypeCryptoOrg, publicKey);
-    EXPECT_EQ(address.string(), "cro1z53wwe7md6cewz9sqwqzn0aavpaun0gw39h3rd");
-    EXPECT_EQ(hex(address.getKeyHash()), "1522e767db6eb19708b0038029bfbd607bc9bd0e");
-}
-
-TEST(CryptoorgAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("03ed997e396cf4292f5fce5a42bba41599ccd5d96e313154a7c9ea7049de317c77"), TWPublicKeyTypeSECP256k1);
-    auto address = Address(TWCoinTypeCryptoOrg, publicKey);
-    EXPECT_EQ(address.string(), "cro1z53wwe7md6cewz9sqwqzn0aavpaun0gw39h3rd");
-    EXPECT_EQ(hex(address.getKeyHash()), "1522e767db6eb19708b0038029bfbd607bc9bd0e");
-}
-
-TEST(CryptoorgAddress, FromString) {
-    Address address;
-    EXPECT_TRUE(Address::decode("cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0", address));
-    EXPECT_EQ(address.string(), "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0");
-    EXPECT_EQ(hex(address.getKeyHash()), "c2dcbc3828b42c429cedbaefa943e66679b471ed");
-}
-
-} // namespace TW::Cosmos::tests
\ No newline at end of file
diff --git a/tests/CryptoOrg/SignerTests.cpp b/tests/CryptoOrg/SignerTests.cpp
deleted file mode 100644
index 9cb39723edb..00000000000
--- a/tests/CryptoOrg/SignerTests.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "proto/Cosmos.pb.h"
-#include "Cosmos/Signer.h"
-#include "Cosmos/Address.h"
-#include "HexCoding.h"
-#include "PublicKey.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-#include <google/protobuf/util/json_util.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(CryptoorgSigner, SignTx_DDCCE4) {
-    auto input = Cosmos::Proto::SigningInput();
-    input.set_account_number(125798);
-    input.set_sequence(0);
-    input.set_chain_id("crypto-org-chain-mainnet-1");
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address("cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0");
-    message.set_to_address("cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus");
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("basecro");
-    amountOfTx->set_amount("100000000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("basecro");
-    amountOfFee->set_amount("5000");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-
-    assertJSONEqual(json, R"(
-        {
-            "accountNumber": "125798",
-            "chainId": "crypto-org-chain-mainnet-1",
-            "fee": {
-                "amounts": [
-                    {
-                        "denom": "basecro",
-                        "amount": "5000"
-                    }
-                ],
-                "gas": "200000"
-            },
-            "messages": [
-                {
-                    "sendCoinsMessage": {
-                        "fromAddress": "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0",
-                        "toAddress": "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus",
-                        "amounts": [
-                            {
-                                "denom": "basecro",
-                                "amount": "100000000"
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-    )");
-
-    auto privateKey = parse_hex("200e439e39cf1aad465ee3de6166247f914cbc0f823fc2dd48bf16dcd556f39d");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Cosmos::Signer::sign(input, TWCoinTypeCryptoOrg);
-
-    assertJSONEqual(output.json(), R"(
-        {
-            "mode": "block",
-            "tx": {
-                "fee": {
-                    "amount": [
-                        {
-                            "amount": "5000",
-                            "denom": "basecro"
-                        }
-                    ],
-                    "gas": "200000"
-                },
-                "memo": "",
-                "msg": [
-                    {
-                        "type": "cosmos-sdk/MsgSend",
-                        "value": {
-                            "amount": [
-                                {
-                                    "amount": "100000000",
-                                    "denom": "basecro"
-                                }
-                            ],
-                            "from_address": "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0",
-                            "to_address": "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus"
-                        }
-                    }
-                ],
-                "signatures": [
-                    {
-                        "pub_key": {
-                            "type": "tendermint/PubKeySecp256k1",
-                            "value": "A4gxsGFiPn6L5Z2IjHEISkXI0IkwfL9exV3GLB171Wvj"
-                        },
-                        "signature": "5+5rSFFg0FE9cTklQWQHNktBDJsz7UCnMSgF0t0+gYcrIhEWUyTtibXaHZQbKAAaciJ1BkHXYREjU55VswByVg=="
-                    }
-                ]
-            }
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "e7ee6b485160d0513d713925416407364b410c9b33ed40a7312805d2dd3e81872b2211165324ed89b5da1d941b28001a7222750641d7611123539e55b3007256");
-
-    /// https://crypto.org/explorer/tx/DDCCE4052040B05914CADEFE78C0A75BE363AE39504E7EF6B2EDB8A9072AD44B
-    /// curl -H 'Content-Type: application/json' --data-binary '{"mode":"block","tx":{"fee": ... }}' https://mainnet.crypto.org:1317/txs
-}
-
-TEST(CryptoorgSigner, SignJson) {
-    auto inputJson = R"({"accountNumber":"125798","chainId":"crypto-org-chain-mainnet-1","fee":{"amounts":[{"denom":"basecro","amount":"5000"}],"gas":"200000"},"messages":[{"sendCoinsMessage":{"fromAddress":"cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0","toAddress":"cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus","amounts":[{"denom":"basecro","amount":"100000000"}]}}]})";
-    auto privateKey = parse_hex("200e439e39cf1aad465ee3de6166247f914cbc0f823fc2dd48bf16dcd556f39d");
-
-    auto outputJson = Cosmos::Signer::signJSON(inputJson, privateKey, TWCoinTypeCryptoOrg);
-
-    assertJSONEqual(outputJson, R"(
-        {
-            "mode": "block",
-            "tx": {
-                "fee": {
-                    "amount": [
-                        {
-                            "amount": "5000",
-                            "denom": "basecro"
-                        }
-                    ],
-                    "gas": "200000"
-                },
-                "memo": "",
-                "msg": [
-                    {
-                        "type": "cosmos-sdk/MsgSend",
-                        "value": {
-                            "amount": [
-                                {
-                                    "amount": "100000000",
-                                    "denom": "basecro"
-                                }
-                            ],
-                            "from_address": "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0",
-                            "to_address": "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus"
-                        }
-                    }
-                ],
-                "signatures": [
-                    {
-                        "pub_key": {
-                            "type": "tendermint/PubKeySecp256k1",
-                            "value": "A4gxsGFiPn6L5Z2IjHEISkXI0IkwfL9exV3GLB171Wvj"
-                        },
-                        "signature": "5+5rSFFg0FE9cTklQWQHNktBDJsz7UCnMSgF0t0+gYcrIhEWUyTtibXaHZQbKAAaciJ1BkHXYREjU55VswByVg=="
-                    }
-                ]
-            }
-        }
-    )");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/CryptoOrg/TWAnyAddressTests.cpp b/tests/CryptoOrg/TWAnyAddressTests.cpp
deleted file mode 100644
index e9771fed810..00000000000
--- a/tests/CryptoOrg/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include "HexCoding.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(CryptoorgAnyAddress, IsValid) {
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0").get(), TWCoinTypeCryptoOrg));
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus").get(), TWCoinTypeCryptoOrg));
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02").get(), TWCoinTypeCryptoOrg));
-}
-
-TEST(CryptoorgAnyAddress, Create) {
-    auto string = STRING("cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0");
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeCryptoOrg));
-    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
-    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "c2dcbc3828b42c429cedbaefa943e66679b471ed");
-}
diff --git a/tests/CryptoOrg/TWAnySignerTests.cpp b/tests/CryptoOrg/TWAnySignerTests.cpp
deleted file mode 100644
index 5f87a527d21..00000000000
--- a/tests/CryptoOrg/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnySigner.h>
-#include "proto/Cosmos.pb.h"
-#include "HexCoding.h"
-#include "Base64.h"
-#include "Data.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-
-const auto Address1 = "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0";
-const auto Address2 = "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus";
-const auto PrivateKey1 = "200e439e39cf1aad465ee3de6166247f914cbc0f823fc2dd48bf16dcd556f39d";
-
-TEST(TWAnySignerCryptoorg, SignTx_Proto_BCB213) {
-    auto input = Cosmos::Proto::SigningInput();
-    input.set_signing_mode(Cosmos::Proto::Protobuf);
-    input.set_account_number(125798);
-    input.set_sequence(2);
-    input.set_chain_id("crypto-org-chain-mainnet-1");
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(Address1);
-    message.set_to_address(Address2);
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("basecro");
-    amountOfTx->set_amount("50000000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("basecro");
-    amountOfFee->set_amount("5000");
-
-    auto privateKey = parse_hex(PrivateKey1);
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Cosmos::Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeCryptoOrg);
-
-    // https://crypto.org/explorer/tx/BCB213B0A121F0CF11BECCF52475F1C8328D6070F3CFDA9E14C42E6DB30E847E
-    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "CpABC...F0SI=", "mode": "BROADCAST_MODE_BLOCK"}' https://mainnet.crypto.org:1317/cosmos/tx/v1beta1/txs
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CpABCo0BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm0KKmNybzFjdHd0Y3dwZ2tza3k5ODhkaHRoNmpzbHh2ZXVtZ3UwZDQ1emdmMBIqY3JvMXhwYWh5NmM3d2xkeGFjdjZsZDk5aDQzNW1odmZuc3VwMjR2Y3VzGhMKB2Jhc2Vjcm8SCDUwMDAwMDAwEmkKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQOIMbBhYj5+i+WdiIxxCEpFyNCJMHy/XsVdxiwde9Vr4xIECgIIARgCEhUKDwoHYmFzZWNybxIENTAwMBDAmgwaQAcxK9xk6r69gmz+1UWaCnYxNuXPXZdp59YcqKPJE5d6fp+IICTBOwd2rs8MiApcf8kNSrbZ6oECxcGQAdxF0SI=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "07312bdc64eabebd826cfed5459a0a763136e5cf5d9769e7d61ca8a3c913977a7e9f882024c13b0776aecf0c880a5c7fc90d4ab6d9ea8102c5c19001dc45d122");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(TWAnySignerCryptoorg, SignTx_Json_DDCCE4) {
-    auto input = Cosmos::Proto::SigningInput();
-    input.set_signing_mode(Cosmos::Proto::JSON); // obsolete
-    input.set_account_number(125798);
-    input.set_sequence(0);
-    input.set_chain_id("crypto-org-chain-mainnet-1");
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(Address1);
-    message.set_to_address(Address2);
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("basecro");
-    amountOfTx->set_amount("100000000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("basecro");
-    amountOfFee->set_amount("5000");
-
-    auto privateKey = parse_hex(PrivateKey1);
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Cosmos::Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeCryptoOrg);
-
-    assertJSONEqual(output.json(), R"(
-        {
-            "mode": "block",
-            "tx": {
-                "fee": {
-                    "amount": [
-                        {
-                            "amount": "5000",
-                            "denom": "basecro"
-                        }
-                    ],
-                    "gas": "200000"
-                },
-                "memo": "",
-                "msg": [
-                    {
-                        "type": "cosmos-sdk/MsgSend",
-                        "value": {
-                            "amount": [
-                                {
-                                    "amount": "100000000",
-                                    "denom": "basecro"
-                                }
-                            ],
-                            "from_address": "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0",
-                            "to_address": "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus"
-                        }
-                    }
-                ],
-                "signatures": [
-                    {
-                        "pub_key": {
-                            "type": "tendermint/PubKeySecp256k1",
-                            "value": "A4gxsGFiPn6L5Z2IjHEISkXI0IkwfL9exV3GLB171Wvj"
-                        },
-                        "signature": "5+5rSFFg0FE9cTklQWQHNktBDJsz7UCnMSgF0t0+gYcrIhEWUyTtibXaHZQbKAAaciJ1BkHXYREjU55VswByVg=="
-                    }
-                ]
-            }
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "e7ee6b485160d0513d713925416407364b410c9b33ed40a7312805d2dd3e81872b2211165324ed89b5da1d941b28001a7222750641d7611123539e55b3007256");
-    EXPECT_EQ(output.serialized(), "");
-    EXPECT_EQ(output.error(), "");
-
-    /// https://crypto.org/explorer/tx/DDCCE4052040B05914CADEFE78C0A75BE363AE39504E7EF6B2EDB8A9072AD44B
-    /// curl -H 'Content-Type: application/json' --data-binary '{"mode":"block","tx":{"fee": ... }}' https://mainnet.crypto.org:1317/txs
-}
diff --git a/tests/CryptoOrg/TWCoinTypeTests.cpp b/tests/CryptoOrg/TWCoinTypeTests.cpp
deleted file mode 100644
index a6e06751ec4..00000000000
--- a/tests/CryptoOrg/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWCryptoorgCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCryptoOrg));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("D87D2EB46B21466886EE149C1DEA3AE6C2E019C7D8C24FA1533A95439DDCE1E2"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCryptoOrg, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("cro10wrflcdc4pys9vvgqm98yg7yv5ltj7d3xehent"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCryptoOrg, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCryptoOrg));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCryptoOrg));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCryptoOrg), 8);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeCryptoOrg));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCryptoOrg));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCryptoOrg));
-    assertStringsEqual(symbol, "CRO");
-    assertStringsEqual(txUrl, "https://crypto.org/explorer/tx/D87D2EB46B21466886EE149C1DEA3AE6C2E019C7D8C24FA1533A95439DDCE1E2");
-    assertStringsEqual(accUrl, "https://crypto.org/explorer/account/cro10wrflcdc4pys9vvgqm98yg7yv5ltj7d3xehent");
-    assertStringsEqual(id, "cryptoorg");
-    assertStringsEqual(name, "Crypto.org");
-}
diff --git a/tests/Dash/TWCoinTypeTests.cpp b/tests/Dash/TWCoinTypeTests.cpp
deleted file mode 100644
index 20fa3257b39..00000000000
--- a/tests/Dash/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWDashCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeDash));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeDash, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeDash, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeDash));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeDash));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeDash), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeDash));
-    ASSERT_EQ(0x10, TWCoinTypeP2shPrefix(TWCoinTypeDash));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeDash));
-    assertStringsEqual(symbol, "DASH");
-    assertStringsEqual(txUrl, "https://blockchair.com/dash/transaction/t123");
-    assertStringsEqual(accUrl, "https://blockchair.com/dash/address/a12");
-    assertStringsEqual(id, "dash");
-    assertStringsEqual(name, "Dash");
-}
diff --git a/tests/Dash/TWDashTests.cpp b/tests/Dash/TWDashTests.cpp
deleted file mode 100644
index c1ad9c58117..00000000000
--- a/tests/Dash/TWDashTests.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWBitcoinScript.h>
-
-#include <gtest/gtest.h>
-
-TEST(Dash, LockScripts) {
-    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("XgkpWEFe59pX3aMhx6PrDawjNnoZKHeZbp").get(), TWCoinTypeDash));
-    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
-    assertHexEqual(scriptData, "76a91442914f5b70c61619eca5359df57d0b9bdcf8ccff88ac");
-
-    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("7eprxeVjKfVgS8p2RNsZ89K72YV61xg4gq").get(), TWCoinTypeDash));
-    auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
-    assertHexEqual(scriptData2, "a9148835ae54f297ad069552a1401e535dfe5f396f6187");
-}
diff --git a/tests/Decred/AddressTests.cpp b/tests/Decred/AddressTests.cpp
deleted file mode 100644
index 9629a821d21..00000000000
--- a/tests/Decred/AddressTests.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Decred/Address.h"
-
-#include "Coin.h"
-#include "HDWallet.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Decred::tests {
-
-TEST(DecredAddress, FromPublicKey) {
-    const auto publicKey = PublicKey(parse_hex("0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798"), TWPublicKeyTypeSECP256k1);
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "DsmcYVbP1Nmag2H4AS17UTvmWXmGeA7nLDx");
-}
-
-TEST(DecredAddress, Valid) {
-    ASSERT_TRUE(Address::isValid("DsmcYVbP1Nmag2H4AS17UTvmWXmGeA7nLDx"));
-    ASSERT_TRUE(Address::isValid("Dcur2mcGjmENx4DhNqDctW5wJCVyT3Qeqkx"));
-}
-
-TEST(DecredAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("rnBFvgZphmN39GWzUJeUitaP22Fr9be75H"));
-    ASSERT_FALSE(Address::isValid("t3gQDEavk5VzAAHK8TrQu2BWDLxEiF1unBm"));
-}
-
-TEST(DecredAddress, FromString) {
-    const auto string = "DsmcYVbP1Nmag2H4AS17UTvmWXmGeA7nLDx";
-    const auto address = Address(string);
-
-    ASSERT_EQ(address.string(), string);
-}
-
-TEST(DecredAddress, Derive) {
-    const auto mnemonic = "ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal";
-    const auto wallet = HDWallet(mnemonic, "");
-    const auto path = TW::derivationPath(TWCoinTypeDecred);
-    const auto address = TW::deriveAddress(TWCoinTypeDecred, wallet.getKey(TWCoinTypeDecred, path));
-    ASSERT_EQ(address, "DsVMHD5D86dpRnt2GPZvv4bYUJZg6B9Pzqa");
-}
-
-} // namespace TW::Decred::tests
diff --git a/tests/Decred/SignerTests.cpp b/tests/Decred/SignerTests.cpp
deleted file mode 100644
index 85cf02ea128..00000000000
--- a/tests/Decred/SignerTests.cpp
+++ /dev/null
@@ -1,434 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Decred/Address.h"
-#include "Decred/Signer.h"
-#include "proto/Decred.pb.h"
-
-#include "Hash.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <Bitcoin/OpCodes.h>
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Decred::tests {
-
-// clang-format off
-TEST(DecredSigner, SignP2PKH) {
-    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
-
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-
-
-    // For this example, create a fake transaction that represents what would
-    // ordinarily be the real transaction that is being spent. It contains a
-    // single output that pays to address in the amount of 1 DCR.
-    auto originTx = Transaction();
-
-    auto txInOrigin = TransactionInput();
-    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
-    txInOrigin.valueIn = 100'000'000;
-    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
-    originTx.inputs.push_back(txInOrigin);
-
-    auto txOutOrigin = TransactionOutput();
-    txOutOrigin.value = 100'000'000;
-    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
-    originTx.outputs.push_back(txOutOrigin);
-
-    ASSERT_EQ(hex(originTx.hash()), "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a");
-
-
-    // Setup input
-    Bitcoin::Proto::SigningInput input;
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
-    input.set_amount(100'000'000);
-    input.set_byte_fee(1);
-    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-
-    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
-    input.add_private_key(utxoKey0.data(), utxoKey0.size());
-
-    auto utxo0 = input.add_utxo();
-    auto utxo0Script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
-    utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
-    utxo0->set_amount(100'000'000);
-    utxo0->mutable_out_point()->set_hash(originTx.hash().data(), originTx.hash().size());
-    utxo0->mutable_out_point()->set_index(0);
-
-
-	// Create the transaction to redeem the fake transaction.
-    auto redeemTx = Transaction();
-
-    auto txIn = TransactionInput();
-    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
-    txIn.valueIn = 100'000'000;
-    redeemTx.inputs.push_back(txIn);
-
-    auto txOut = TransactionOutput();
-    redeemTx.outputs.push_back(txOut);
-
-    auto plan = input.mutable_plan();
-    plan->set_amount(100'000'000);
-    plan->set_available_amount(100'000'000);
-    plan->set_fee(0);
-    plan->set_change(0);
-    auto utxop0 = plan->add_utxos();
-    *utxop0 = *utxo0;
-
-    // Sign
-    auto signer = Signer(std::move(input));
-    signer._transaction = redeemTx;
-    signer.txPlan.amount = 100'000'000;
-    const auto result = signer.sign();
-
-    ASSERT_TRUE(result);
-
-    const auto expectedSignature = "47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f0121"
-        "02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5";
-    EXPECT_EQ(hex(result.payload().inputs[0].script.bytes), expectedSignature);
-
-    const auto expectedEncoded =
-        "0100" // Serialize type
-        "0000" // Version
-        "01"   // Inputs
-            "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a" // Hash
-            "00000000" // Index
-            "00" // Tree
-            "ffffffff" // Sequence
-        "01"   // Outputs
-            "0000000000000000" // Value
-            "0000" // Version
-            "00" // Script
-        "00000000" // Lock time
-        "00000000" // Expiry
-        "01"
-            "00e1f50500000000" // Value
-            "00000000" // Block height
-            "ffffffff" // Block index
-            "6a47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f012102a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5";
-    auto encoded = Data();
-    result.payload().encode(encoded);
-    EXPECT_EQ(hex(encoded), expectedEncoded);
-}
-
-TEST(DecredSigner, SignP2SH) {
-    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
-
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-
-
-    // For this example, create a fake transaction that represents what would
-    // ordinarily be the real transaction that is being spent. It contains a
-    // single output that pays to address in the amount of 1 DCR.
-    auto originTx = Transaction();
-
-    auto txInOrigin = TransactionInput();
-    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
-    txInOrigin.valueIn = 100'000'000;
-    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
-    originTx.inputs.push_back(txInOrigin);
-
-    auto txOutOrigin = TransactionOutput();
-    txOutOrigin.value = 100'000'000;
-    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
-    originTx.outputs.push_back(txOutOrigin);
-
-    ASSERT_EQ(hex(originTx.hash()), "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a");
-
-
-    // Setup input
-    Bitcoin::Proto::SigningInput input;
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
-    input.set_amount(100'000'000);
-    input.set_byte_fee(1);
-    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-
-    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
-    input.add_private_key(utxoKey0.data(), utxoKey0.size());
-
-    auto redeemScript = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
-    auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
-    auto scriptString = std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
-    (*input.mutable_scripts())[hex(scriptHash.begin(), scriptHash.end())] = scriptString;
-
-    auto utxo0 = input.add_utxo();
-    auto utxo0Script = Bitcoin::Script::buildPayToScriptHash(scriptHash);
-    utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
-    utxo0->set_amount(100'000'000);
-    utxo0->mutable_out_point()->set_hash(originTx.hash().data(), originTx.hash().size());
-    utxo0->mutable_out_point()->set_index(0);
-
-    auto plan = input.mutable_plan();
-    plan->set_amount(100'000'000);
-    plan->set_available_amount(100'000'000);
-    plan->set_fee(0);
-    plan->set_change(0);
-    auto utxop0 = plan->add_utxos();
-    *utxop0 = *utxo0;
-
-	// Create the transaction to redeem the fake transaction.
-    auto redeemTx = Transaction();
-
-    auto txIn = TransactionInput();
-    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
-    txIn.valueIn = 100'000'000;
-    redeemTx.inputs.push_back(txIn);
-
-    auto txOut = TransactionOutput();
-    redeemTx.outputs.push_back(txOut);
-
-
-    // Sign
-    auto signer = Signer(std::move(input));
-    signer._transaction = redeemTx;
-    signer.txPlan.amount = 100'000'000;
-    const auto result = signer.sign();
-
-    ASSERT_TRUE(result);
-
-    const auto expectedSignature = "47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f012102a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf51976a914f5eba6730a4052ddeef0a93d93d24004f49db51e88ac1976a914f5eba6730a4052ddeef0a93d93d24004f49db51e88ac";
-    EXPECT_EQ(hex(result.payload().inputs[0].script.bytes), expectedSignature);
-
-    const auto expectedEncoded =
-        "0100" // Serialize type
-        "0000" // Version
-        "01"   // Inputs
-            "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a" // Hash
-            "00000000" // Index
-            "00" // Tree
-            "ffffffff" // Sequence
-        "01"   // Outputs
-            "0000000000000000" // Value
-            "0000" // Version
-            "00" // Script
-        "00000000" // Lock time
-        "00000000" // Expiry
-        "01"
-            "00e1f50500000000" // Value
-            "00000000" // Block height
-            "ffffffff" // Block index
-            "9e47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f012102a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf51976a914f5eba6730a4052ddeef0a93d93d24004f49db51e88ac1976a914f5eba6730a4052ddeef0a93d93d24004f49db51e88ac";
-    auto encoded = Data();
-    result.payload().encode(encoded);
-    EXPECT_EQ(hex(encoded), expectedEncoded);
-}
-
-TEST(DecredSigner, SignNegativeNoUtxo) {
-    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
-
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-
-    auto originTx = Transaction();
-
-    auto txInOrigin = TransactionInput();
-    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
-    txInOrigin.valueIn = 100'000'000;
-    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
-    originTx.inputs.push_back(txInOrigin);
-
-    auto txOutOrigin = TransactionOutput();
-    txOutOrigin.value = 100'000'000;
-    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
-    originTx.outputs.push_back(txOutOrigin);
-
-    ASSERT_EQ(hex(originTx.hash()), "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a");
-
-    // Setup input
-    Bitcoin::Proto::SigningInput input;
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
-    input.set_amount(100'000'000);
-    input.set_byte_fee(1);
-    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-
-    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
-    input.add_private_key(utxoKey0.data(), utxoKey0.size());
-
-	// Create the transaction to redeem the fake transaction.
-    auto redeemTx = Transaction();
-
-    auto txIn = TransactionInput();
-    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
-    txIn.valueIn = 100'000'000;
-    redeemTx.inputs.push_back(txIn);
-
-    auto txOut = TransactionOutput();
-    redeemTx.outputs.push_back(txOut);
-
-    // Sign
-    auto signer = Signer(std::move(input));
-    signer._transaction = redeemTx;
-    signer.txPlan.amount = 100'000'000;
-    const auto result = signer.sign();
-
-    // Fails as there are 0 utxos
-    ASSERT_FALSE(result);
-}
-
-TEST(DecredSigner, SignP2PKH_NoPlan) {
-    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
-
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-
-
-    // For this example, create a fake transaction that represents what would
-    // ordinarily be the real transaction that is being spent. It contains a
-    // single output that pays to address in the amount of 1 DCR.
-    auto originTx = Transaction();
-
-    auto txInOrigin = TransactionInput();
-    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
-    txInOrigin.valueIn = 150'000'000;
-    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
-    originTx.inputs.push_back(txInOrigin);
-
-    auto txOutOrigin = TransactionOutput();
-    txOutOrigin.value = 100'000'000;
-    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
-    originTx.outputs.push_back(txOutOrigin);
-
-    ASSERT_EQ(hex(originTx.hash()), "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a");
-
-
-    // Setup input
-    Bitcoin::Proto::SigningInput input;
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
-    input.set_amount(100'000'000);
-    input.set_byte_fee(1);
-    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
-
-    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
-    input.add_private_key(utxoKey0.data(), utxoKey0.size());
-
-    auto utxo0 = input.add_utxo();
-    auto utxo0Script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
-    utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
-    utxo0->set_amount(150'000'000);
-    utxo0->mutable_out_point()->set_hash(originTx.hash().data(), originTx.hash().size());
-    utxo0->mutable_out_point()->set_index(0);
-
-
-	// Create the transaction to redeem the fake transaction.
-    auto redeemTx = Transaction();
-
-    auto txIn = TransactionInput();
-    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
-    txIn.valueIn = 100'000'000;
-    redeemTx.inputs.push_back(txIn);
-
-    auto txOut = TransactionOutput();
-    redeemTx.outputs.push_back(txOut);
-
-
-    // Sign
-    auto signer = Signer(std::move(input));
-    signer._transaction = redeemTx;
-    //signer.txPlan.utxos.push_back(*utxo0);
-    //signer.txPlan.amount = 100'000'000;
-    const auto result = signer.sign();
-
-    ASSERT_TRUE(result);
-    ASSERT_TRUE(result.payload().inputs.size() >= 1);
-
-    const auto expectedSignature = "47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f0121"
-        "02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5";
-    EXPECT_EQ(hex(result.payload().inputs[0].script.bytes), expectedSignature);
-
-    const auto expectedEncoded =
-        "0100" // Serialize type
-        "0000" // Version
-        "01"   // Inputs
-            "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a" // Hash
-            "00000000" // Index
-            "00" // Tree
-            "ffffffff" // Sequence
-        "01"   // Outputs
-            "0000000000000000" // Value
-            "0000" // Version
-            "00" // Script
-        "00000000" // Lock time
-        "00000000" // Expiry
-        "01"
-            "00e1f50500000000" // Value
-            "00000000" // Block height
-            "ffffffff" // Block index
-            "6a47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f012102a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5";
-    auto encoded = Data();
-    result.payload().encode(encoded);
-    EXPECT_EQ(hex(encoded), expectedEncoded);
-}
-
-TEST(DecredSigning, SignP2WPKH_NegativeAddressWrongType) {
-    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
-    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
-
-    // Setup input
-    Bitcoin::Proto::SigningInput input;
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
-    input.set_amount(335'790'000);
-    input.set_byte_fee(1);
-    input.set_to_address("1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx");
-    input.set_change_address("1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU");
-
-    auto utxoKey0 = parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866");
-    input.add_private_key(utxoKey0.data(), utxoKey0.size());
-
-    auto utxoKey1 = parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9");
-    input.add_private_key(utxoKey1.data(), utxoKey1.size());
-
-    auto scriptPub1 = Bitcoin::Script(parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
-    auto scriptHash = std::vector<uint8_t>();
-    scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
-    auto scriptHashHex = hex(scriptHash.begin(), scriptHash.end());
-    ASSERT_EQ(scriptHashHex, "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
-
-    auto redeemScript = Bitcoin::Script::buildPayToPublicKeyHash(scriptHash);
-    auto scriptString = std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
-    (*input.mutable_scripts())[scriptHashHex] = scriptString;
-
-    auto utxo0 = input.add_utxo();
-    auto utxo0Script = parse_hex("2103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432ac");
-    utxo0->set_script(utxo0Script.data(), utxo0Script.size());
-    utxo0->set_amount(625'000'000);
-    utxo0->mutable_out_point()->set_hash(hash0.data(), hash0.size());
-    utxo0->mutable_out_point()->set_index(0);
-    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
-
-    auto utxo1 = input.add_utxo();
-    auto utxo1Script = parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
-    utxo1->set_script(utxo1Script.data(), utxo1Script.size());
-    utxo1->set_amount(600'000'000);
-    utxo1->mutable_out_point()->set_hash(hash1.data(), hash1.size());
-    utxo1->mutable_out_point()->set_index(1);
-    utxo1->mutable_out_point()->set_sequence(UINT32_MAX);
-
-    // Sign
-    auto result = Signer(std::move(input)).sign();
-
-    ASSERT_FALSE(result) << std::to_string(result.error());
-}
-// clang-format on
-
-} // namespace TW::Decred::tests
diff --git a/tests/Decred/TWAnySignerTests.cpp b/tests/Decred/TWAnySignerTests.cpp
deleted file mode 100644
index 033d87a4a2c..00000000000
--- a/tests/Decred/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,114 +0,0 @@
-
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include "HexCoding.h"
-#include "proto/Bitcoin.pb.h"
-#include "proto/Decred.pb.h"
-#include <TrustWalletCore/TWBitcoinScript.h>
-#include <TrustWalletCore/TWBitcoinSigHashType.h>
-#include <TrustWalletCore/TWAnySigner.h>
-#include <gtest/gtest.h>
-
-
-namespace TW::Decred {
-
-Bitcoin::Proto::SigningInput createInput() {
-    const int64_t utxoValue = 39900000;
-    const int64_t amount = 10000000;
-
-    auto input = Bitcoin::Proto::SigningInput();
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
-    input.set_amount(amount);
-    input.set_byte_fee(1);
-    input.set_to_address("Dsesp1V6DZDEtcq2behmBVKdYqKMdkh96hL");
-    input.set_change_address("DsUoWCAxprdGNtKQqambFbTcSBgH1SHn9Gp");
-    input.set_coin_type(TWCoinTypeDecred);
-
-    auto& utxo = *input.add_utxo();
-
-    auto hash = parse_hex("fdbfe9dd703f306794a467f175be5bd9748a7925033ea1cf9889d7cf4dd11550");
-    auto script = parse_hex("76a914b75fdec70b2e731795dd123ab40f918bf099fee088ac");
-    auto utxoKey = parse_hex("ba005cd605d8a02e3d5dfd04234cef3a3ee4f76bfbad2722d1fb5af8e12e6764");
-
-    utxo.set_amount(utxoValue);
-    utxo.set_script(script.data(), script.size());
-    
-    auto& outpoint = *utxo.mutable_out_point();
-    outpoint.set_hash(hash.data(), hash.size());
-    outpoint.set_index(0);
-
-    input.add_private_key(utxoKey.data(), utxoKey.size());
-    return input;
-}
-
-TEST(TWAnySignerDecred, Signing) {
-    auto input = createInput();
-
-    const int64_t utxoValue = 39900000;
-    const int64_t amount = 10000000;
-    const int64_t fee = 100000;
-
-    auto& plan = *input.mutable_plan();
-    plan.set_amount(amount);
-    plan.set_available_amount(utxoValue);
-    plan.set_fee(fee);
-    plan.set_change(utxoValue - amount - fee);
-    auto& planUtxo = *plan.add_utxos();
-    planUtxo = input.utxo(0);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeDecred);
-
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    ASSERT_EQ(hex(output.encoded()), "0100000001fdbfe9dd703f306794a467f175be5bd9748a7925033ea1cf9889d7cf4dd1155000000000000000000002809698000000000000001976a914989b1aecabf1c24e213cc0f2d8a22ffee25dd4e188ac40b6c6010000000000001976a9142a194fc92e27fef9cc2b057bc9060c580cbb484888ac000000000000000001000000000000000000000000ffffffff6a47304402206ee887c9239e5fff0048674bdfff2a8cfbeec6cd4a3ccebcc12fac44b24cc5ac0220718f7c760818fde18bc5ba8457d43d5a145cc4cf13d2a5557cba9107e9f4558d0121026cc34b92cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b6");
-}
-
-TEST(TWAnySignerDecred, Plan) {
-    auto input = createInput();
-
-    Bitcoin::Proto::TransactionPlan plan;
-    ANY_PLAN(input, plan, TWCoinTypeDecred);
-
-    EXPECT_EQ(plan.amount(), 10000000);
-    EXPECT_EQ(plan.available_amount(), 39900000);
-    EXPECT_EQ(plan.fee(), 254);
-    EXPECT_EQ(plan.change(), 29899746);
-    EXPECT_EQ(plan.utxos_size(), 1);
-    EXPECT_EQ(plan.branch_id(), "");
-}
-
-TEST(TWAnySignerDecred, PlanAndSign) {
-    auto input = createInput();
-
-    Bitcoin::Proto::TransactionPlan plan;
-    ANY_PLAN(input, plan, TWCoinTypeDecred);
-
-    EXPECT_EQ(plan.amount(), 10000000);
-    EXPECT_EQ(plan.available_amount(), 39900000);
-    EXPECT_EQ(plan.fee(), 254);
-    EXPECT_EQ(plan.change(), 29899746);
-    EXPECT_EQ(plan.utxos_size(), 1);
-    EXPECT_EQ(plan.branch_id(), "");
-    
-    // copy over plan fields
-    *input.mutable_plan() = plan;
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeDecred);
-
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    ASSERT_EQ(output.encoded().size(), 251ul);
-    ASSERT_EQ(hex(output.encoded()), "0100000001fdbfe9dd703f306794a467f175be5bd9748a7925033ea1cf9889d7cf4dd1155000000000000000000002809698000000000000001976a914989b1aecabf1c24e213cc0f2d8a22ffee25dd4e188ace23bc8010000000000001976a9142a194fc92e27fef9cc2b057bc9060c580cbb484888ac000000000000000001000000000000000000000000ffffffff6a47304402203e6ee9e16d6bc36bb4242f7a4cac333a1c2a150ea16143412b88b721f6ae16bf02201019affdf815a5c22e4b0fb7e4685c4707094922d6a41354f9055d3bb0f26e630121026cc34b92cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b6");
-}
-
-TEST(TWAnySignerDecred, SupportsJSON) {
-    ASSERT_FALSE(TWAnySignerSupportsJSON(TWCoinTypeDecred));
-}
-
-} // namespace
diff --git a/tests/Decred/TWCoinTypeTests.cpp b/tests/Decred/TWCoinTypeTests.cpp
deleted file mode 100644
index 8e8200bae80..00000000000
--- a/tests/Decred/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWDecredCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeDecred));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeDecred, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeDecred, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeDecred));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeDecred));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeDecred), 8);
-    ASSERT_EQ(TWBlockchainDecred, TWCoinTypeBlockchain(TWCoinTypeDecred));
-    ASSERT_EQ(0x1a, TWCoinTypeP2shPrefix(TWCoinTypeDecred));
-    ASSERT_EQ(0x7, TWCoinTypeStaticPrefix(TWCoinTypeDecred));
-    assertStringsEqual(symbol, "DCR");
-    assertStringsEqual(txUrl, "https://dcrdata.decred.org/tx/t123");
-    assertStringsEqual(accUrl, "https://dcrdata.decred.org/address/a12");
-    assertStringsEqual(id, "decred");
-    assertStringsEqual(name, "Decred");
-}
diff --git a/tests/DigiByte/TWCoinTypeTests.cpp b/tests/DigiByte/TWCoinTypeTests.cpp
deleted file mode 100644
index 0140cef4893..00000000000
--- a/tests/DigiByte/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWDigiByteCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeDigiByte));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeDigiByte, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeDigiByte, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeDigiByte));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeDigiByte));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeDigiByte), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeDigiByte));
-    ASSERT_EQ(0x3f, TWCoinTypeP2shPrefix(TWCoinTypeDigiByte));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeDigiByte));
-    assertStringsEqual(symbol, "DGB");
-    assertStringsEqual(txUrl, "https://digiexplorer.info/tx/t123");
-    assertStringsEqual(accUrl, "https://digiexplorer.info/address/a12");
-    assertStringsEqual(id, "digibyte");
-    assertStringsEqual(name, "DigiByte");
-}
diff --git a/tests/Dogecoin/TWCoinTypeTests.cpp b/tests/Dogecoin/TWCoinTypeTests.cpp
deleted file mode 100644
index decba7e836e..00000000000
--- a/tests/Dogecoin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWDogecoinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeDogecoin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeDogecoin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeDogecoin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeDogecoin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeDogecoin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeDogecoin), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeDogecoin));
-    ASSERT_EQ(0x16, TWCoinTypeP2shPrefix(TWCoinTypeDogecoin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeDogecoin));
-    assertStringsEqual(symbol, "DOGE");
-    assertStringsEqual(txUrl, "https://blockchair.com/dogecoin/transaction/t123");
-    assertStringsEqual(accUrl, "https://blockchair.com/dogecoin/address/a12");
-    assertStringsEqual(id, "doge");
-    assertStringsEqual(name, "Dogecoin");
-}
diff --git a/tests/Dogecoin/TWDogeTests.cpp b/tests/Dogecoin/TWDogeTests.cpp
deleted file mode 100644
index 76f83bdb96a..00000000000
--- a/tests/Dogecoin/TWDogeTests.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWBitcoinScript.h>
-
-#include <gtest/gtest.h>
-
-TEST(Doge, LockScripts) {
-    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("DLSSSUS3ex7YNDACJDxMER1ZMW579Vy8Zy").get(), TWCoinTypeDogecoin));
-    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
-    assertHexEqual(scriptData, "76a914a7d191ec42aa113e28cd858cceaa7c733ba2f77788ac");
-
-    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("AETZJzedcmLM2rxCM6VqCGF3YEMUjA3jMw").get(), TWCoinTypeDogecoin));
-    auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
-    assertHexEqual(scriptData2, "a914f191149f72f235548746654f5b473c58258f7fb687");
-}
diff --git a/tests/ECO/TWCoinTypeTests.cpp b/tests/ECO/TWCoinTypeTests.cpp
deleted file mode 100644
index 3f2f2ae6b96..00000000000
--- a/tests/ECO/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWHECOCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeECOChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x2e62832615f5b68b3bbcd72046a24260ce47052841c1679841b9c574d3959f13"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeECOChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xc5a5b3e49e5d06afe163553c942dc59b4e358cf1"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeECOChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeECOChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeECOChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeECOChain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeECOChain));
-
-    assertStringsEqual(symbol, "HT");
-    assertStringsEqual(txUrl, "https://hecoinfo.com/tx/0x2e62832615f5b68b3bbcd72046a24260ce47052841c1679841b9c574d3959f13");
-    assertStringsEqual(accUrl, "https://hecoinfo.com/address/0xc5a5b3e49e5d06afe163553c942dc59b4e358cf1");
-    assertStringsEqual(id, "heco");
-    assertStringsEqual(name, "Huobi ECO Chain");
-}
diff --git a/tests/ECash/TWCoinTypeTests.cpp b/tests/ECash/TWCoinTypeTests.cpp
deleted file mode 100644
index 59d2ea5954d..00000000000
--- a/tests/ECash/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWECashCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeECash));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("6bc767e69cfacffd954c9e5acd178d3140bf00d094b92c6f6052b517500c553b"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeECash, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("ecash:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdg2jj94l5j"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeECash, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeECash));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeECash));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeECash), 2);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeECash));
-    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeECash));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeECash));
-    assertStringsEqual(symbol, "XEC");
-    assertStringsEqual(txUrl, "https://explorer.bitcoinabc.org/tx/6bc767e69cfacffd954c9e5acd178d3140bf00d094b92c6f6052b517500c553b");
-    assertStringsEqual(accUrl, "https://explorer.bitcoinabc.org/address/ecash:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdg2jj94l5j");
-    assertStringsEqual(id, "ecash");
-    assertStringsEqual(name, "eCash");
-}
diff --git a/tests/EOS/AddressTests.cpp b/tests/EOS/AddressTests.cpp
deleted file mode 100644
index e11efc7feeb..00000000000
--- a/tests/EOS/AddressTests.cpp
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "EOS/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include <TrustWalletCore/TWPublicKeyType.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::EOS::tests {
-
-TEST(EOSAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_FALSE(Address::isValid("65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF"));
-    ASSERT_FALSE(Address::isValid("EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjT"));
-    ASSERT_FALSE(Address::isValid("PUB_5hieQEFWh68h6bjaYAY25Ptd2bmqLCaFsunaneh9gZsmSgUBUe"));
-    ASSERT_FALSE(Address::isValid("PUB_K1_5hieQEFWh68h6bjaYAY25Ptd2bmqLCaFsunaneh9gZsmSgUBUe"));
-
-    ASSERT_THROW(Address("PUB_K1_65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF"), std::invalid_argument);
-    ASSERT_THROW(EOS::Address(Data(0)), std::invalid_argument);
-}
-
-TEST(EOSAddress, Base58) {
-    ASSERT_EQ(
-        Address("EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF").string(),
-        "EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF");
-    ASSERT_EQ(
-        Address("EOS55hdeEZHoArE8LLTv6drj2yR1K1AH8wAPT4kjTVSnkmQc3nzwQ").string(),
-        "EOS55hdeEZHoArE8LLTv6drj2yR1K1AH8wAPT4kjTVSnkmQc3nzwQ");
-    ASSERT_EQ(
-        Address("PUB_R1_5hieQEFWh68h6bjaYAY25Ptd2bmqLCaFsunaneh9gZsmSgUBUe").string(),
-        "PUB_R1_5hieQEFWh68h6bjaYAY25Ptd2bmqLCaFsunaneh9gZsmSgUBUe");
-    ASSERT_EQ(
-        Address("PUB_R1_7M9ckjr6p5CmS3N3yLPg9vcTB5NHmLcMHwZ3iGccEVfbjJRHv3").string(),
-        "PUB_R1_7M9ckjr6p5CmS3N3yLPg9vcTB5NHmLcMHwZ3iGccEVfbjJRHv3");
-}
-
-TEST(EOSAddress, FromPrivateKey) {
-    std::string privArray[]{"8e14ef506fee5e0aaa32f03a45242d32d0eb993ffe25ce77542ef07219db667c",
-                            "e2bfd815c5923f404388a3257aa5527f0f52e92ce364e1e26a04d270c901edda",
-                            "e6b783120a21cb234d8e15077ce186c47261d1043781ab8b16b84f2acd377668",
-                            "bb96c0a4a6ec9c93ccc0b2cbad6b0e8110b9ca4731aef9c6937b99552a319b03"};
-
-    Type privTypes[]{Type::Legacy, Type::Legacy, Type::ModernR1, Type::ModernR1};
-
-    std::string pubArray[]{"EOS6TFKUKVvtvjRq9T4fV9pdxNUuJke92nyb4rzSFtZfdR5ssmVuY",
-                           "EOS5YtaCcbPJ3BknNBTDezE9eJoGNnAVuUwT8bnxhSRS5dqRvyfxr",
-                           "PUB_R1_67itCyDj42CRgtpyP4fLbAccBYnVHGeZQujQAeK3fyNbvfvZM6",
-                           "PUB_R1_5DpVkbrMBDnY4JRhiEdHLmdLDKGQLNfL7X7it2pqT7Uk83ccDL"};
-
-    for (int i = 0; i < 4; i++) {
-        const auto privateKey = PrivateKey(parse_hex(privArray[i]));
-        const auto publicKey = PublicKey(privateKey.getPublicKey(privTypes[i] == Type::Legacy ? TWPublicKeyTypeSECP256k1 : TWPublicKeyTypeNIST256p1));
-        const auto address = Address(publicKey, privTypes[i]);
-
-        ASSERT_EQ(address.string(), pubArray[i]);
-    }
-}
-
-TEST(EOSAddress, IsValid) {
-    ASSERT_TRUE(Address::isValid("EOS6Vm7RWMS1KKAM9kDXgggpu4sJkFMEpARhmsWA84tk4P22m29AV"));
-    ASSERT_TRUE(Address::isValid("PUB_R1_6pQRUVU5vdneRnmjSiZPsvu3zBqcptvg6iK2Vz4vKo4ugnzow3"));
-    ASSERT_TRUE(Address::isValid("EOS5mGcPvsqFDe8YRrA3yMMjQgjrCa6yiCho79KViDhvxh4ajQjgS"));
-    ASSERT_TRUE(Address::isValid("PUB_R1_82dMu3zSSfyHYc4cvWJ6SPsHZWB5mBNAyhL53xiM5xpqmfqetN"));
-
-    ASSERT_NO_THROW(Address(parse_hex("039d91164ea04f4e751762643ef4ae520690af361b8e677cf341fd213419956b356cb721b7"), Type::ModernR1));
-    ASSERT_NO_THROW(Address(parse_hex("02d3c8e736a9a50889766caf3c37bd16e2fecc7340b3130e25d4c01b153f996a10a78afc0e"), Type::Legacy));
-}
-
-} // namespace TW::EOS::tests
diff --git a/tests/EOS/AssetTests.cpp b/tests/EOS/AssetTests.cpp
deleted file mode 100644
index b697bea654b..00000000000
--- a/tests/EOS/AssetTests.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "EOS/Asset.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::EOS::tests {
-
-TEST(EOSAsset, Serialization) {
-    Data buf;
-    Asset(5000, 3, "BRAVO").serialize(buf);
-    ASSERT_EQ(hex(buf), "881300000000000003425241564f0000");
-
-    buf.clear();
-    Asset(90000, 3, "BRAVO").serialize(buf);
-    ASSERT_EQ(hex(buf), "905f01000000000003425241564f0000");
-
-    buf.clear();
-    Asset(1000, 3, "BRAVO").serialize(buf);
-    ASSERT_EQ(hex(buf), "e80300000000000003425241564f0000");
-
-    std::string assetStr = "3.141 PI";
-    ASSERT_EQ(Asset::fromString(assetStr).string(), assetStr);
-
-    // add tests for negative amounts, fractional amounts
-}
-
-} // namespace TW::EOS
diff --git a/tests/EOS/NameTests.cpp b/tests/EOS/NameTests.cpp
deleted file mode 100644
index e9b64201926..00000000000
--- a/tests/EOS/NameTests.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "EOS/Name.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::EOS::tests {
-
-TEST(EOSName, Invalid) {
-    ASSERT_THROW(Name(std::string(14, 'a')), std::invalid_argument);
-
-    std::string invalidNames[] = {"Alice", "alice16", "12345satoshis"};
-    for (auto name : invalidNames) {
-        ASSERT_FALSE(Name(name).string() == name);
-    }
-}
-
-TEST(EOSName, Valid) {
-    ASSERT_NO_THROW(Name(std::string(13, 'a')));
-
-    std::string validName = "satoshis12345";
-    ASSERT_EQ(Name(validName).string(), validName);
-    Data buf;
-    Name(validName).serialize(buf);
-    ASSERT_EQ(hex(buf), "458608d8354cb3c1");
-}
-
-} // namespace TW::EOS::tests
\ No newline at end of file
diff --git a/tests/EOS/SignatureTests.cpp b/tests/EOS/SignatureTests.cpp
deleted file mode 100644
index 72f3fb85a2c..00000000000
--- a/tests/EOS/SignatureTests.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "EOS/Transaction.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::EOS::tests {
-
-TEST(EOSSignature, Serialization) {
-    Data buf;
-    Signature* sig = new Signature(parse_hex("1f14262320d5b145220fb94d8fe204117edd25e52bbe9557b6e0909dd00307af266f5be1deef001446979523ac9de32c7eae5e5be4180b5a60c0e6bf14b2dd3e05"), Type::ModernK1);
-    sig->serialize(buf);
-
-    ASSERT_EQ(
-        hex(buf),
-        "001f14262320d5b145220fb94d8fe204117edd25e52bbe9557b6e0909dd00307af266f5be1deef001446979523ac9de32c7eae5e5be4180b5a60c0e6bf14b2dd3e05");
-
-    ASSERT_EQ(
-        sig->string(),
-        "SIG_K1_JwtfgsdSx5RuF5aejedQ7FJTexaKMrQyYosPUWUrU1mzdLx6JUgLTZJd7zWA8q8VdnXht3YmVt7jafmD2eEK7hTRpT9rY5");
-
-    delete sig;
-    sig = new Signature(parse_hex("1f5c419d16f573ddbf07d2eb959621f690f9cb856ea2d113e3af02b3b40005488410e82ffa37a079e119844d213f4eb066a640507db68851752bea6e61eb864d84"), Type::ModernR1);
-    buf.clear();
-    sig->serialize(buf);
-
-    ASSERT_EQ(
-        hex(buf),
-        "011f5c419d16f573ddbf07d2eb959621f690f9cb856ea2d113e3af02b3b40005488410e82ffa37a079e119844d213f4eb066a640507db68851752bea6e61eb864d84");
-
-    ASSERT_EQ(
-        sig->string(),
-        "SIG_R1_K7KpdLYqa6ebCP22TuiYAY9YoJh1dTWTZEVkdPzdoadFL6f8PkMYk5N8wtsF11cneEJ91XnEZP6wDJHhRyqr1fr68ouYcz");
-
-    delete sig;
-    ASSERT_THROW(sig = new Signature(parse_hex("1f5c419d16f573ddbf07d2eb959621f690f9cb856ea2d113e3af02b3b40005488410e82ffa37a079e119844d213f4eb066a640507db68851752bea6e61eb864d84"), Type::Legacy), std::invalid_argument);
-    ASSERT_THROW(sig = new Signature(parse_hex("011f5c419d16f573ddbf07d2eb959621f690f9cb856ea2d113e3af02b3b40005488410e82ffa37a079e119844d213f4eb066a640507db68851752bea6e61eb864d84"), Type::ModernR1), std::invalid_argument);
-}
-
-} // namespace TW::EOS::tests
\ No newline at end of file
diff --git a/tests/EOS/TWAnySignerTests.cpp b/tests/EOS/TWAnySignerTests.cpp
deleted file mode 100644
index ea9e2b2b237..00000000000
--- a/tests/EOS/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include "HexCoding.h"
-#include "proto/EOS.pb.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::EOS::tests {
-
-TEST(TWAnySignerEOS, Sign) {
-    Proto::SigningInput input;
-    auto chainId = parse_hex("cf057bbfb72640471fd910bcb67639c22df9f92470936cddc1ade0e2f2e7dc4f");
-    auto refBlock = parse_hex("000067d6f6a7e7799a1f3d487439a679f8cf95f1c986f35c0d2fa320f51a7144");
-    auto key = parse_hex("559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd");
-
-    auto& asset = *input.mutable_asset();
-    asset.set_amount(300000);
-    asset.set_decimals(4);
-    asset.set_symbol("TKN");
-
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_reference_block_id(refBlock.data(), refBlock.size());
-    input.set_reference_block_time(1554209118);
-    input.set_currency("token");
-    input.set_sender("token");
-    input.set_recipient("eosio");
-    input.set_memo("my second transfer");
-    input.set_private_key(key.data(), key.size());
-    input.set_private_key_type(Proto::KeyType::MODERNK1);
-
-    {
-        Proto::SigningOutput output;
-        ANY_SIGN(input, TWCoinTypeEOS);
-
-        EXPECT_EQ(output.error(), Common::Proto::OK);
-        EXPECT_EQ(output.json_encoded(), R"({"compression":"none","packed_context_free_data":"","packed_trx":"7c59a35cd6679a1f3d4800000000010000000080a920cd000000572d3ccdcd010000000080a920cd00000000a8ed3232330000000080a920cd0000000000ea3055e09304000000000004544b4e00000000126d79207365636f6e64207472616e7366657200","signatures":["SIG_K1_KfCdjsrTnx5cBpbA5cUdHZAsRYsnC9uKzuS1shFeqfMCfdZwX4PBm9pfHwGRT6ffz3eavhtkyNci5GoFozQAx8P8PBnDmj"]})");
-    }
-
-    input.set_private_key_type(Proto::KeyType::LEGACY);
-    {
-        Proto::SigningOutput output;
-        ANY_SIGN(input, TWCoinTypeEOS);
-        EXPECT_EQ(output.error(), Common::Proto::Error_internal);
-        EXPECT_TRUE(output.json_encoded().empty());
-    }
-}
-
-} // namespace TW::EOS::tests
diff --git a/tests/EOS/TWCoinTypeTests.cpp b/tests/EOS/TWCoinTypeTests.cpp
deleted file mode 100644
index 65412f55772..00000000000
--- a/tests/EOS/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWEOSCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeEOS));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeEOS, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeEOS, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeEOS));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeEOS));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeEOS), 4);
-    ASSERT_EQ(TWBlockchainEOS, TWCoinTypeBlockchain(TWCoinTypeEOS));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeEOS));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeEOS));
-    assertStringsEqual(symbol, "EOS");
-    assertStringsEqual(txUrl, "https://bloks.io/transaction/t123");
-    assertStringsEqual(accUrl, "https://bloks.io/account/a12");
-    assertStringsEqual(id, "eos");
-    assertStringsEqual(name, "EOS");
-}
diff --git a/tests/EOS/TransactionTests.cpp b/tests/EOS/TransactionTests.cpp
deleted file mode 100644
index 65bfa0fb392..00000000000
--- a/tests/EOS/TransactionTests.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "EOS/Transaction.h"
-#include "EOS/Signer.h"
-#include "EOS/Action.h"
-#include "EOS/Address.h"
-#include "PrivateKey.h"
-#include "HexCoding.h"
-#include "Hash.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-namespace TW::EOS::tests {
-
-static std::string k1Sigs[5] {
-    "SIG_K1_KfCdjsrTnx5cBpbA5cUdHZAsRYsnC9uKzuS1shFeqfMCfdZwX4PBm9pfHwGRT6ffz3eavhtkyNci5GoFozQAx8P8PBnDmj",
-    "SIG_K1_K6wW678ngyWT7fgR4nNqm5XoKZBp9NDN4tKsctyzzADjXn15iAH9tcnQ393t6uvsqYxHKjdnxxduT1nyKMLiZbRqL7dHYr",
-    "SIG_K1_K6cUbZX6xfWcV5iotVprnf12Lc5AmV8SKmN5hVdv39gcM8wfEcwcNScvTuGLWpWzDT463dyhNmUfMB4nqt7tJVFnzx8mSi",
-    "SIG_K1_Khj7xhMd8HxrT6dUzuwiFM1MfMHtog5jCygJj7ADvdmUGkzZkmjymZXucEAud3whJ2qsMcxHcKtLWs8Ndm6be14qjTAH2a",
-    "SIG_K1_K93MjjE39CSH7kwJBgoRsSF2VaH6a8psQKU29nSg4xxxrVhz2iQuubyyB5t2ACZFFYSkNHSdYia5efhnW6Z9SPtbQTquMY"
-};
-
-static std::string r1Sigs[5] { 
-    "SIG_R1_Kbywy4Mjun4Ymrh23Xk5yRtKJxcDWaDjQjLKERAny6Vs6oT1DYoEdoAj9AJK9iukHdEd9HBYnf3GmLtA55JFY5VaNszJMa",
-    "SIG_R1_KAhJJg4QGYBWY7hG6BKGAbW57fg6g8xTh3LG3Sss3bGv4BwiwHmRV1jsgh6hrnVRUoCaKMbJQzzWy9HXy6PnDmfJ6fbZMJ",
-    "SIG_R1_KxAwVKfpLr2MeK4aSAp5LSi2Vohsp94Uhk5UvZZDUJqd7ccBkhc2kYY1L6z5rjRNNo7BeP1Qr6H2xPFqo54YQ6DjczAqLW",
-    "SIG_R1_K1isJT8pJhkrHi3mcvrfY12nY6jirMCWaAHWuBXvu2ondcm3QHkgdaTwERskftZ9cqB5k2r8ajoYS4VWsiivjbd56D6pxX",
-    "SIG_R1_KWtgvnj2LaaYdtBTjM7bTR23LPBytDHFE7gPEfGTZ7PWc4yc6piPuPUHsVJVkvKmpW2gEUhq3toCfjkt34itSxMgekovdG"
-};
-
-TEST(EOSTransaction, Serialization) {
-    ASSERT_THROW(TransferAction("token", "eosio", "token", Asset::fromString("-20.1234 TKN"), "my first transfer"), std::invalid_argument);
-
-    Data referenceBlockId = parse_hex("000046dc08ad384ca452d92c59348aba888fcbb6ef1ebffc3181617706664d4c");
-    int32_t referenceBlockTime = 1554121728;
-    auto chainId = parse_hex("cf057bbfb72640471fd910bcb67639c22df9f92470936cddc1ade0e2f2e7dc4f");
-
-    Transaction tx {referenceBlockId, referenceBlockTime};
-    tx.actions.push_back(TransferAction("token", "eosio", "token", Asset::fromString("20.1234 TKN"), "my first transfer"));
-    ASSERT_EQ(tx.actions.back().serialize().dump(), "{\"account\":\"token\",\"authorizations\":[{\"actor\":\"eosio\",\"permission\":\"active\"}],\"data\":\"0000000000ea30550000000080a920cd121203000000000004544b4e00000000116d79206669727374207472616e73666572\",\"name\":\"transfer\"}");
-
-    Data buf;
-    tx.serialize(buf);
-
-    Signer signer {chainId};
-
-    ASSERT_EQ(
-        hex(buf),
-        "1e04a25cdc46a452d92c00000000010000000080a920cd000000572d3ccdcd010000000000ea305500000000a8ed3232320000000000ea30550000000080a920cd121203000000000004544b4e00000000116d79206669727374207472616e7366657200"
-    );
-
-    ASSERT_EQ(
-        hex(signer.hash(tx)),
-        "5de974bb90b940b462688609735a1dd522fa853aba765c30d14bedd27d719dd1"
-    );
-
-    // make transaction invalid and see if signing succeeds
-    tx.maxNetUsageWords = UINT32_MAX;
-    ASSERT_THROW(signer.sign(PrivateKey(Hash::sha256(std::string("A"))), Type::ModernK1, tx), std::invalid_argument);
-
-    referenceBlockId = parse_hex("000067d6f6a7e7799a1f3d487439a679f8cf95f1c986f35c0d2fa320f51a7144");
-    referenceBlockTime = 1554209118;
-
-    Transaction tx2 {referenceBlockId, referenceBlockTime};
-    tx2.actions.push_back(TransferAction("token", "token", "eosio", Asset::fromString("30.0000 TKN"), "my second transfer"));
-
-    buf.clear();
-    tx2.serialize(buf);
-    ASSERT_EQ(
-        hex(buf),
-        "7c59a35cd6679a1f3d4800000000010000000080a920cd000000572d3ccdcd010000000080a920cd00000000a8ed3232330000000080a920cd0000000000ea3055e09304000000000004544b4e00000000126d79207365636f6e64207472616e7366657200"
-    );
-
-    ASSERT_EQ(
-        hex(signer.hash(tx2)),
-        "4dac38a8ad7f095a09ec0eb0cbd060c9d8ea0a842535d369c9ce526cdf1b5d85"
-    );
-
-    ASSERT_NO_THROW(tx2.serialize());
-
-    // verify k1 sigs
-    for (int i = 0; i < 5; i++) {
-        PrivateKey pk(Hash::sha256(std::string(i + 1, 'A')));
-        ASSERT_NO_THROW(signer.sign(pk, Type::ModernK1, tx2));
-
-        ASSERT_EQ(
-            tx2.signatures.back().string(),
-            k1Sigs[i]
-        );
-    }
-
-    // verify r1 sigs
-    for (int i = 0; i < 5; i++) {
-        PrivateKey pk(Hash::sha256(std::string(i + 1, 'A')));
-        ASSERT_NO_THROW(signer.sign(pk, Type::ModernR1, tx2));
-
-        ASSERT_EQ(
-            tx2.signatures.back().string(),
-            r1Sigs[i]
-        );
-    }
-}
-
-TEST(EOSTransaction, formatDate) {
-    EXPECT_EQ(Transaction::formatDate(1554209148), "2019-04-02T12:45:48");
-    EXPECT_EQ(Transaction::formatDate(1654160000), "2022-06-02T08:53:20");
-    EXPECT_EQ(Transaction::formatDate(0), "1970-01-01T00:00:00");
-    EXPECT_EQ(Transaction::formatDate(std::numeric_limits<int32_t>::max()), "2038-01-19T03:14:07");
-}
-
-} // namespace TW::EOS::tests
diff --git a/tests/Elrond/AddressTests.cpp b/tests/Elrond/AddressTests.cpp
deleted file mode 100644
index a96a0f53c1a..00000000000
--- a/tests/Elrond/AddressTests.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <gtest/gtest.h>
-#include <vector>
-
-#include "Elrond/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "TestAccounts.h"
-
-using namespace TW;
-
-namespace TW::Elrond::tests {
-
-TEST(ElrondAddress, Valid) {
-    ASSERT_TRUE(Address::isValid(ALICE_BECH32));
-    ASSERT_TRUE(Address::isValid(BOB_BECH32));
-}
-
-TEST(ElrondAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid(""));
-    ASSERT_FALSE(Address::isValid("foo"));
-    ASSERT_FALSE(Address::isValid("10z9xdugayn528ksaesdwlhf006fw5sg2qmmm0h52fvxczwgesyvq5pwemr"));
-    ASSERT_FALSE(Address::isValid("xerd10z9xdugayn528ksaesdwlhf006fw5sg2qmmm0h52fvxczwgesyvq5pwemr"));
-    ASSERT_FALSE(Address::isValid("foo10z9xdugayn528ksaesdwlhf006fw5sg2qmmm0h52fvxczwgesyvq5pwemr"));
-    ASSERT_FALSE(Address::isValid(ALICE_PUBKEY_HEX));
-}
-
-TEST(ElrondAddress, FromString) {
-    Address alice, bob, carol;
-    ASSERT_TRUE(Address::decode(ALICE_BECH32, alice));
-    ASSERT_TRUE(Address::decode(BOB_BECH32, bob));
-
-    ASSERT_EQ(ALICE_PUBKEY_HEX, hex(alice.getKeyHash()));
-    ASSERT_EQ(BOB_PUBKEY_HEX, hex(bob.getKeyHash()));
-}
-
-TEST(ElrondAddress, FromData) {
-    const auto alice = Address(parse_hex(ALICE_PUBKEY_HEX));
-    const auto bob = Address(parse_hex(BOB_PUBKEY_HEX));
-
-    ASSERT_EQ(ALICE_BECH32, alice.string());
-    ASSERT_EQ(BOB_BECH32, bob.string());
-}
-
-TEST(ElrondAddress, FromPrivateKey) {
-    auto aliceKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    auto alice = Address(aliceKey.getPublicKey(TWPublicKeyTypeED25519));
-    ASSERT_EQ(ALICE_BECH32, alice.string());
-
-    auto bobKey = PrivateKey(parse_hex(BOB_SEED_HEX));
-    auto bob = Address(bobKey.getPublicKey(TWPublicKeyTypeED25519));
-    ASSERT_EQ(BOB_BECH32, bob.string());
-}
-
-TEST(ElrondAddress, FromPublicKey) {
-    auto alice = PublicKey(parse_hex(ALICE_PUBKEY_HEX), TWPublicKeyTypeED25519);
-    ASSERT_EQ(ALICE_BECH32, Address(alice).string());
-
-    auto bob = PublicKey(parse_hex(BOB_PUBKEY_HEX), TWPublicKeyTypeED25519);
-    ASSERT_EQ(BOB_BECH32, Address(bob).string());
-}
-
-} // namespace TW::Elrond::tests
diff --git a/tests/Elrond/SerializationTests.cpp b/tests/Elrond/SerializationTests.cpp
deleted file mode 100644
index c1a730de8c7..00000000000
--- a/tests/Elrond/SerializationTests.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "boost/format.hpp"
-#include <gtest/gtest.h>
-#include <vector>
-
-#include "Elrond/Serialization.h"
-#include "HexCoding.h"
-#include "TestAccounts.h"
-
-using namespace TW;
-
-namespace TW::Elrond::tests {
-
-TEST(ElrondSerialization, SignableString) {
-    Transaction transaction;
-    transaction.nonce = 42;
-    transaction.value = "43";
-    transaction.sender = "alice";
-    transaction.receiver = "bob";
-    transaction.data = "foo";
-    transaction.chainID = "1";
-    transaction.version = 1;
-
-    string jsonString = serializeTransaction(transaction);
-    ASSERT_EQ(R"({"nonce":42,"value":"43","receiver":"bob","sender":"alice","gasPrice":0,"gasLimit":0,"data":"Zm9v","chainID":"1","version":1})", jsonString);
-}
-
-TEST(ElrondSerialization, SignableStringWithRealData) {
-    Transaction transaction;
-    transaction.nonce = 15;
-    transaction.value = "100";
-    transaction.sender = ALICE_BECH32;
-    transaction.receiver = BOB_BECH32;
-    transaction.gasPrice = 1000000000;
-    transaction.gasLimit = 50000;
-    transaction.data = "foo";
-    transaction.chainID = "1";
-    transaction.version = 1;
-
-    string expected = (boost::format(R"({"nonce":15,"value":"100","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1})") % BOB_BECH32 % ALICE_BECH32).str();
-    string actual = serializeTransaction(transaction);
-    ASSERT_EQ(expected, actual);
-}
-
-TEST(ElrondSerialization, SignableStringWithoutData) {
-    Transaction transaction;
-    transaction.nonce = 42;
-    transaction.value = "43";
-    transaction.sender = "feed";
-    transaction.receiver = "abba";
-    transaction.chainID = "1";
-    transaction.version = 1;
-
-    string jsonString = serializeTransaction(transaction);
-    ASSERT_EQ(R"({"nonce":42,"value":"43","receiver":"abba","sender":"feed","gasPrice":0,"gasLimit":0,"chainID":"1","version":1})", jsonString);
-}
-
-} // namespace TW::Elrond::tests
diff --git a/tests/Elrond/SignerTests.cpp b/tests/Elrond/SignerTests.cpp
deleted file mode 100644
index aeaa8455a69..00000000000
--- a/tests/Elrond/SignerTests.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "boost/format.hpp"
-#include <gtest/gtest.h>
-
-#include "Elrond/Address.h"
-#include "Elrond/Signer.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "TestAccounts.h"
-
-using namespace TW;
-
-namespace TW::Elrond::tests {
-
-TEST(ElrondSigner, SignGenericAction) {
-    auto input = Proto::SigningInput();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
-    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_generic_action()->set_value("0");
-    input.mutable_generic_action()->set_data("foo");
-    input.mutable_generic_action()->set_version(1);
-    input.set_gas_price(1000000000);
-    input.set_gas_limit(50000);
-    input.set_chain_id("1");
-
-    auto output = Signer::sign(input);
-    auto signature = output.signature();
-    auto encoded = output.encoded();
-    auto expectedSignature = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700";
-    auto expectedEncoded = (boost::format(R"({"nonce":7,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignature).str();
-
-    ASSERT_EQ(expectedEncoded, encoded);
-    ASSERT_EQ(expectedSignature, signature);
-}
-
-TEST(ElrondSigner, SignGenericActionJSON) {
-    // Shuffle some fields, assume arbitrary order in the input
-    auto input = (boost::format(R"({"genericAction" : {"accounts": {"senderNonce": 7, "receiver": "%1%", "sender": "%2%"}, "data": "foo", "value": "0", "version": 1}, "gasPrice": 1000000000, "gasLimit": 50000, "chainId": "1"})") % BOB_BECH32 % ALICE_BECH32).str();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-
-    auto encoded = Signer::signJSON(input, privateKey.bytes);
-    auto expectedSignature = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700";
-    auto expectedEncoded = (boost::format(R"({"nonce":7,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignature).str();
-
-    ASSERT_EQ(expectedEncoded, encoded);
-}
-
-TEST(ElrondSigner, SignWithoutData) {
-    auto input = Proto::SigningInput();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(0);
-    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_generic_action()->set_value("0");
-    input.mutable_generic_action()->set_data("");
-    input.mutable_generic_action()->set_version(1);
-    input.set_gas_price(1000000000);
-    input.set_gas_limit(50000);
-    input.set_chain_id("1");
-
-    auto output = Signer::sign(input);
-    auto signature = output.signature();
-    auto encoded = output.encoded();
-    auto expectedSignature = "c7253b821c68011584ebd3a5bb050ade19235c2d10260e411e523105826c40a79849b3eeb96fcc2a7a6b1fa140b6756f50b249e005be056ce0cf53125e0b1b00";
-    auto expectedEncoded = (boost::format(R"({"nonce":0,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignature).str();
-
-    ASSERT_EQ(expectedSignature, signature);
-    ASSERT_EQ(expectedEncoded, encoded);
-}
-
-TEST(ElrondSigner, SignJSONWithoutData) {
-    // Shuffle some fields, assume arbitrary order in the input
-    auto input = (boost::format(R"({"genericAction" : {"accounts": {"senderNonce": 0, "receiver": "%1%", "sender": "%2%"}, "value": "0", "version": 1}, "gasPrice": 1000000000, "gasLimit": 50000, "chainId": "1"})") % BOB_BECH32 % ALICE_BECH32).str();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-
-    auto encoded = Signer::signJSON(input, privateKey.bytes);
-    auto expectedSignature = "c7253b821c68011584ebd3a5bb050ade19235c2d10260e411e523105826c40a79849b3eeb96fcc2a7a6b1fa140b6756f50b249e005be056ce0cf53125e0b1b00";
-    auto expectedEncoded = (boost::format(R"({"nonce":0,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignature).str();
-
-    ASSERT_EQ(expectedEncoded, encoded);
-}
-
-TEST(ElrondSigner, SignWithUsernames) {
-    // https://github.com/ElrondNetwork/elrond-go/blob/master/examples/construction_test.go, scenario "TestConstructTransaction_Usernames".
-
-    auto input = Proto::SigningInput();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(89);
-    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_generic_action()->mutable_accounts()->set_sender_username("alice");
-    input.mutable_generic_action()->mutable_accounts()->set_receiver_username("bob");
-    input.mutable_generic_action()->set_value("0");
-    input.mutable_generic_action()->set_data("");
-    input.mutable_generic_action()->set_version(1);
-    input.set_gas_price(1000000000);
-    input.set_gas_limit(50000);
-    input.set_chain_id("local-testnet");
-
-    auto output = Signer::sign(input);
-    auto signature = output.signature();
-    auto encoded = output.encoded();
-    auto expectedSignature = "1bed82c3f91c9d24f3a163e7b93a47453d70e8743201fe7d3656c0214569566a76503ef0968279ac942ca43b9c930bd26638dfb075a220ce80b058ab7bca140a";
-    auto expectedEncoded =
-        (boost::format(R"({"nonce":89,"value":"0","receiver":"%1%","sender":"%2%","senderUsername":"%3%","receiverUsername":"%4%","gasPrice":1000000000,"gasLimit":50000,"chainID":"local-testnet","version":1,"signature":"%5%"})") % BOB_BECH32 % ALICE_BECH32
-         // "alice"
-         % "YWxpY2U="
-         // "bob"
-         % "Ym9i" % expectedSignature)
-            .str();
-
-    ASSERT_EQ(expectedSignature, signature);
-    ASSERT_EQ(expectedEncoded, encoded);
-}
-
-TEST(ElrondSigner, SignWithOptions) {
-    auto input = Proto::SigningInput();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(89);
-    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_generic_action()->set_value("0");
-    input.mutable_generic_action()->set_data("");
-    input.mutable_generic_action()->set_version(1);
-    // We'll set a dummy value on the "options" field (merely an example).
-    // Currently, the "options" field should be ignored (not set) by applications using TW Core.
-    // In the future, TW Core will handle specific transaction options
-    // (such as the "SignedWithHash" flag, as seen in https://github.com/ElrondNetwork/elrond-go-core/blob/main/core/versioning/txVersionChecker.go)
-    // when building and signing transactions.
-    input.mutable_generic_action()->set_options(42);
-    input.set_gas_price(1000000000);
-    input.set_gas_limit(50000);
-    input.set_chain_id("local-testnet");
-
-    auto output = Signer::sign(input);
-    auto signature = output.signature();
-    auto encoded = output.encoded();
-    auto expectedSignature = "d9a624f13960ae1cc471de48bdb43b101b9d469bb8b159f68bb629bb32d0109e1acfebb62d6d2fc5786c0b85f9e7ce2caff74988864a8285f34797c5a5fa5801";
-    auto expectedEncoded =
-        (boost::format(R"({"nonce":89,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"chainID":"local-testnet","version":1,"options":42,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignature).str();
-
-    ASSERT_EQ(expectedEncoded, encoded);
-    ASSERT_EQ(expectedSignature, signature);
-}
-
-TEST(ElrondSigner, SignEGLDTransfer) {
-    auto input = Proto::SigningInput();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    input.mutable_egld_transfer()->mutable_accounts()->set_sender_nonce(7);
-    input.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_egld_transfer()->set_amount("1000000000000000000");
-
-    auto output = Signer::sign(input);
-    auto signature = output.signature();
-    auto encoded = output.encoded();
-    auto expectedSignature = "7e1c4c63b88ea72dcf7855a54463b1a424eb357ac3feb4345221e512ce07c7a50afb6d7aec6f480b554e32cf2037082f3bc17263d1394af1f3ef240be53c930b";
-    auto expectedEncoded =
-        (boost::format(R"({"nonce":7,"value":"1000000000000000000","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":1,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignature).str();
-
-    ASSERT_EQ(expectedSignature, signature);
-    ASSERT_EQ(expectedEncoded, encoded);
-}
-
-TEST(ElrondSigner, SignESDTTransfer) {
-    auto input = Proto::SigningInput();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    input.mutable_esdt_transfer()->mutable_accounts()->set_sender_nonce(7);
-    input.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
-    input.mutable_esdt_transfer()->set_amount("10000000000000");
-
-    auto output = Signer::sign(input);
-    auto signature = output.signature();
-    auto encoded = output.encoded();
-    auto expectedSignature = "9add6d9ac3f1a1fddb07b934e8a73cad3b8c232bdf29d723c1b38ad619905f03e864299d06eb3fe3bbb48a9f1d9b7f14e21dc5eaffe0c87f5718ad0c4198bb0c";
-    auto expectedEncoded =
-        (boost::format(R"({"nonce":7,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":425000,"data":"%3%","chainID":"1","version":1,"signature":"%4%"})") % BOB_BECH32 % ALICE_BECH32
-         // "ESDTTransfer@4d59544f4b454e2d31323334@09184e72a000"
-         % "RVNEVFRyYW5zZmVyQDRkNTk1NDRmNGI0NTRlMmQzMTMyMzMzNEAwOTE4NGU3MmEwMDA=" % expectedSignature)
-            .str();
-
-    ASSERT_EQ(expectedSignature, signature);
-    ASSERT_EQ(expectedEncoded, encoded);
-}
-
-TEST(ElrondSigner, SignESDTNFTTransfer) {
-    auto input = Proto::SigningInput();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    input.mutable_esdtnft_transfer()->mutable_accounts()->set_sender_nonce(7);
-    input.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
-    input.mutable_esdtnft_transfer()->set_token_nonce(4);
-    input.mutable_esdtnft_transfer()->set_amount("184300000000000000");
-
-    auto output = Signer::sign(input);
-    auto signature = output.signature();
-    auto encoded = output.encoded();
-    auto expectedSignature = "cc935685d5b31525e059a16a832cba98dee751983a5a93de4198f6553a2c55f5f1e0b4300fe9077376fa754546da0b0f6697e66462101a209aafd0fc775ab60a";
-    auto expectedEncoded =
-        (boost::format(R"({"nonce":7,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":937500,"data":"%3%","chainID":"1","version":1,"signature":"%4%"})") % ALICE_BECH32 % ALICE_BECH32
-         // "ESDTNFTTransfer@4c4b4d45582d616162393130@04@028ec3dfa01ac000@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8"
-         % "RVNEVE5GVFRyYW5zZmVyQDRjNGI0ZDQ1NTgyZDYxNjE2MjM5MzEzMEAwNEAwMjhlYzNkZmEwMWFjMDAwQDgwNDlkNjM5ZTVhNjk4MGQxY2QyMzkyYWJjY2U0MTAyOWNkYTc0YTE1NjM1MjNhMjAyZjA5NjQxY2MyNjE4Zjg=" % expectedSignature)
-            .str();
-
-    ASSERT_EQ(expectedSignature, signature);
-    ASSERT_EQ(expectedEncoded, encoded);
-}
-
-} // namespace TW::Elrond::tests
diff --git a/tests/Elrond/TWAnySignerTests.cpp b/tests/Elrond/TWAnySignerTests.cpp
deleted file mode 100644
index 277864dbe9e..00000000000
--- a/tests/Elrond/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "boost/format.hpp"
-#include <gtest/gtest.h>
-
-#include "Elrond/Signer.h"
-#include "HexCoding.h"
-#include "TestAccounts.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-using namespace TW;
-
-namespace TW::Elrond::tests {
-
-TEST(TWAnySignerElrond, Sign) {
-    auto input = Proto::SigningInput();
-    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
-    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_generic_action()->set_value("0");
-    input.mutable_generic_action()->set_data("foo");
-    input.mutable_generic_action()->set_version(1);
-    input.set_gas_price(1000000000);
-    input.set_gas_limit(50000);
-    input.set_chain_id("1");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeElrond);
-
-    auto signature = output.signature();
-    auto encoded = output.encoded();
-    auto expectedSignature = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700";
-    auto expectedEncoded = (boost::format(R"({"nonce":7,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignature).str();
-
-    ASSERT_EQ(expectedSignature, signature);
-    ASSERT_EQ(expectedEncoded, encoded);
-}
-
-TEST(TWAnySignerElrond, SignJSON) {
-    // Shuffle some fields, assume arbitrary order in the input
-    auto input = STRING((boost::format(R"({"genericAction" : {"accounts": {"senderNonce": 7, "receiver": "%1%", "sender": "%2%"}, "data": "foo", "value": "0", "version": 1}, "gasPrice": 1000000000, "gasLimit": 50000, "chainId": "1"})") % BOB_BECH32 % ALICE_BECH32).str().c_str());
-    auto privateKey = DATA(ALICE_SEED_HEX);
-    auto encoded = WRAPS(TWAnySignerSignJSON(input.get(), privateKey.get(), TWCoinTypeElrond));
-    auto expectedSignature = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700";
-    auto expectedEncoded = (boost::format(R"({"nonce":7,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignature).str();
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeElrond));
-    assertStringsEqual(encoded, expectedEncoded.c_str());
-}
-
-} // namespace TW::Elrond::tests
diff --git a/tests/Elrond/TWCoinTypeTests.cpp b/tests/Elrond/TWCoinTypeTests.cpp
deleted file mode 100644
index 900d36abd6d..00000000000
--- a/tests/Elrond/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWElrondCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeElrond));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("1fc9785cb8bea0129a16cf7bddc97630c176a556ea566f0e72923c882b5cb3c8"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeElrond, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("erd12yne790km8ezwetkz7m3hmqy9utdc6vdkgsunfzpwguec6v04p2qtk9uqj"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeElrond, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeElrond));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeElrond));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeElrond), 18);
-    ASSERT_EQ(TWBlockchainElrondNetwork, TWCoinTypeBlockchain(TWCoinTypeElrond));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeElrond));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeElrond));
-    assertStringsEqual(symbol, "eGLD");
-    assertStringsEqual(txUrl, "https://explorer.elrond.com/transactions/1fc9785cb8bea0129a16cf7bddc97630c176a556ea566f0e72923c882b5cb3c8");
-    assertStringsEqual(accUrl, "https://explorer.elrond.com/address/erd12yne790km8ezwetkz7m3hmqy9utdc6vdkgsunfzpwguec6v04p2qtk9uqj");
-    assertStringsEqual(id, "elrond");
-    assertStringsEqual(name, "Elrond");
-}
diff --git a/tests/Elrond/TestAccounts.h b/tests/Elrond/TestAccounts.h
deleted file mode 100644
index 80e45e638c3..00000000000
--- a/tests/Elrond/TestAccounts.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-// Well-known accounts on Testnet & Devnet,
-// https://github.com/ElrondNetwork/elrond-sdk-erdpy/tree/main/erdpy/testnet/wallets/users:
-const auto ALICE_BECH32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th";
-const auto ALICE_PUBKEY_HEX = "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1";
-const auto ALICE_SEED_HEX = "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9";
-const auto BOB_BECH32 = "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx";
-const auto BOB_PUBKEY_HEX = "8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8";
-const auto BOB_SEED_HEX = "b8ca6f8203fb4b545a8e83c5384da033c415db155b53fb5b8eba7ff5a039d639";
diff --git a/tests/Elrond/TransactionFactoryTests.cpp b/tests/Elrond/TransactionFactoryTests.cpp
deleted file mode 100644
index 8837d2cab6b..00000000000
--- a/tests/Elrond/TransactionFactoryTests.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <gtest/gtest.h>
-#include <vector>
-
-#include "Elrond/TransactionFactory.h"
-#include "TestAccounts.h"
-
-namespace TW::Elrond::tests {
-
-TEST(ElrondTransactionFactory, fromEGLDTransfer) {
-    auto input = Proto::SigningInput();
-    input.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_egld_transfer()->set_amount("1000000000000000000");
-
-    TransactionFactory factory;
-    Transaction transaction = factory.fromEGLDTransfer(input);
-
-    ASSERT_EQ(ALICE_BECH32, transaction.sender);
-    ASSERT_EQ(BOB_BECH32, transaction.receiver);
-    ASSERT_EQ("", transaction.data);
-    ASSERT_EQ("1000000000000000000", transaction.value);
-    ASSERT_EQ(50000ul, transaction.gasLimit);
-    ASSERT_EQ(1000000000ul, transaction.gasPrice);
-    ASSERT_EQ("1", transaction.chainID);
-    ASSERT_EQ(1ul, transaction.version);
-}
-
-TEST(ElrondTransactionFactory, fromESDTTransfer) {
-    auto input = Proto::SigningInput();
-    input.mutable_esdt_transfer()->mutable_accounts()->set_sender_nonce(7);
-    input.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
-    input.mutable_esdt_transfer()->set_amount("10000000000000");
-
-    TransactionFactory factory;
-    Transaction transaction = factory.fromESDTTransfer(input);
-
-    ASSERT_EQ(ALICE_BECH32, transaction.sender);
-    ASSERT_EQ(BOB_BECH32, transaction.receiver);
-    ASSERT_EQ("ESDTTransfer@4d59544f4b454e2d31323334@09184e72a000", transaction.data);
-    ASSERT_EQ("0", transaction.value);
-    ASSERT_EQ(425000ul, transaction.gasLimit);
-    ASSERT_EQ(1000000000ul, transaction.gasPrice);
-    ASSERT_EQ("1", transaction.chainID);
-    ASSERT_EQ(1ul, transaction.version);
-}
-
-TEST(ElrondTransactionFactory, fromESDTNFTTransfer) {
-    auto input = Proto::SigningInput();
-    input.mutable_esdtnft_transfer()->mutable_accounts()->set_sender_nonce(7);
-    input.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    input.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    input.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
-    input.mutable_esdtnft_transfer()->set_token_nonce(4);
-    input.mutable_esdtnft_transfer()->set_amount("184300000000000000");
-
-    TransactionFactory factory;
-    Transaction transaction = factory.fromESDTNFTTransfer(input);
-
-    ASSERT_EQ(ALICE_BECH32, transaction.sender);
-    ASSERT_EQ(ALICE_BECH32, transaction.receiver);
-    ASSERT_EQ("ESDTNFTTransfer@4c4b4d45582d616162393130@04@028ec3dfa01ac000@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8", transaction.data);
-    ASSERT_EQ("0", transaction.value);
-    ASSERT_EQ(937500ul, transaction.gasLimit);
-    ASSERT_EQ(1000000000ul, transaction.gasPrice);
-    ASSERT_EQ("1", transaction.chainID);
-    ASSERT_EQ(1ul, transaction.version);
-}
-
-TEST(ElrondTransactionFactory, createTransfersWithProvidedNetworkConfig) {
-    NetworkConfig networkConfig;
-
-    // Set dummy values:
-    networkConfig.setChainId("T");
-    networkConfig.setMinGasPrice(1500000000);
-    networkConfig.setMinGasLimit(60000);
-    networkConfig.setGasPerDataByte(2000);
-    networkConfig.setGasCostESDTTransfer(300000);
-    networkConfig.setGasCostESDTNFTTransfer(300000);
-
-    Proto::SigningInput signingInputWithEGLDTransfer;
-    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    signingInputWithEGLDTransfer.mutable_egld_transfer()->set_amount("0");
-
-    Proto::SigningInput signingInputWithESDTTransfer;
-    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
-    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_amount("10000000000000");
-
-    Proto::SigningInput signingInputWithESDTNFTTransfer;
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_nonce(4);
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_amount("184300000000000000");
-
-    TransactionFactory factory(networkConfig);
-    Transaction tx1 = factory.fromEGLDTransfer(signingInputWithEGLDTransfer);
-    Transaction tx2 = factory.fromESDTTransfer(signingInputWithESDTTransfer);
-    Transaction tx3 = factory.fromESDTNFTTransfer(signingInputWithESDTNFTTransfer);
-
-    ASSERT_EQ(60000ul, tx1.gasLimit);
-    ASSERT_EQ(1500000000ul, tx1.gasPrice);
-    ASSERT_EQ("T", tx1.chainID);
-
-    ASSERT_EQ(560000ul, tx2.gasLimit);
-    ASSERT_EQ(1500000000ul, tx2.gasPrice);
-    ASSERT_EQ("T", tx2.chainID);
-
-    ASSERT_EQ(1110000ul, tx3.gasLimit);
-    ASSERT_EQ(1500000000ul, tx3.gasPrice);
-    ASSERT_EQ("T", tx3.chainID);
-}
-
-TEST(ElrondTransactionFactory, createTransfersWithOverriddenNetworkParameters) {
-    Proto::SigningInput signingInputWithEGLDTransfer;
-    signingInputWithEGLDTransfer.set_gas_limit(50500);
-    signingInputWithEGLDTransfer.set_gas_price(1000000001);
-    signingInputWithEGLDTransfer.set_chain_id("A");
-
-    Proto::SigningInput signingInputWithESDTTransfer;
-    signingInputWithESDTTransfer.set_gas_limit(5000000);
-    signingInputWithESDTTransfer.set_gas_price(1000000002);
-    signingInputWithESDTTransfer.set_chain_id("B");
-
-    Proto::SigningInput signingInputWithESDTNFTTransfer;
-    signingInputWithESDTNFTTransfer.set_gas_limit(10000000);
-    signingInputWithESDTNFTTransfer.set_gas_price(1000000003);
-    signingInputWithESDTNFTTransfer.set_chain_id("C");
-
-    TransactionFactory factory;
-    Transaction tx1 = factory.fromEGLDTransfer(signingInputWithEGLDTransfer);
-    Transaction tx2 = factory.fromESDTTransfer(signingInputWithESDTTransfer);
-    Transaction tx3 = factory.fromESDTNFTTransfer(signingInputWithESDTNFTTransfer);
-
-    ASSERT_EQ(50500ul, tx1.gasLimit);
-    ASSERT_EQ(1000000001ul, tx1.gasPrice);
-    ASSERT_EQ("A", tx1.chainID);
-
-    ASSERT_EQ(5000000ul, tx2.gasLimit);
-    ASSERT_EQ(1000000002ul, tx2.gasPrice);
-    ASSERT_EQ("B", tx2.chainID);
-
-    ASSERT_EQ(10000000ul, tx3.gasLimit);
-    ASSERT_EQ(1000000003ul, tx3.gasPrice);
-    ASSERT_EQ("C", tx3.chainID);
-}
-
-TEST(ElrondTransactionFactory, create) {
-    Proto::SigningInput signingInputWithGenericAction;
-    signingInputWithGenericAction.mutable_generic_action()->set_data("hello");
-
-    Proto::SigningInput signingInputWithEGLDTransfer;
-    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    signingInputWithEGLDTransfer.mutable_egld_transfer()->set_amount("1");
-
-    Proto::SigningInput signingInputWithESDTTransfer;
-    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
-    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_amount("10000000000000");
-
-    Proto::SigningInput signingInputWithESDTNFTTransfer;
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_nonce(4);
-    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_amount("184300000000000000");
-
-    TransactionFactory factory;
-    Transaction tx1 = factory.create(signingInputWithGenericAction);
-    Transaction tx2 = factory.create(signingInputWithEGLDTransfer);
-    Transaction tx3 = factory.create(signingInputWithESDTTransfer);
-    Transaction tx4 = factory.create(signingInputWithESDTNFTTransfer);
-
-    ASSERT_EQ("hello", tx1.data);
-    ASSERT_EQ("1", tx2.value);
-    ASSERT_EQ("ESDTTransfer@4d59544f4b454e2d31323334@09184e72a000", tx3.data);
-    ASSERT_EQ("ESDTNFTTransfer@4c4b4d45582d616162393130@04@028ec3dfa01ac000@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8", tx4.data);
-}
-
-} // namespace TW::Elrond::tests
diff --git a/tests/Ethereum/AbiStructTests.cpp b/tests/Ethereum/AbiStructTests.cpp
deleted file mode 100644
index 7db3e83333b..00000000000
--- a/tests/Ethereum/AbiStructTests.cpp
+++ /dev/null
@@ -1,930 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Ethereum/ABI.h"
-#include "Ethereum/Address.h"
-#include "Ethereum/Signer.h"
-#include "../interface/TWTestUtilities.h"
-#include <HexCoding.h>
-#include <PrivateKey.h>
-
-#include <fstream>
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-extern std::string TESTS_ROOT;
-
-namespace TW::Ethereum::tests {
-
-using namespace ABI;
-
-std::string load_file(const std::string path) {
-    std::ifstream stream(path);
-    std::string content((std::istreambuf_iterator<char>(stream)), (std::istreambuf_iterator<char>()));
-    return content;
-}
-
-// https://github.com/MetaMask/eth-sig-util/blob/main/test/index.ts
-// clang-format off
-ParamStruct msgPersonCow2("Person", std::vector<std::shared_ptr<ParamNamed>>{
-    std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Cow")),
-    std::make_shared<ParamNamed>("wallets", std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamAddress>(parse_hex("CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826")),
-        std::make_shared<ParamAddress>(parse_hex("DeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"))
-    }))
-});
-ParamStruct msgPersonBob3("Person", std::vector<std::shared_ptr<ParamNamed>>{
-    std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Bob")),
-    std::make_shared<ParamNamed>("wallets", std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamAddress>(parse_hex("bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB")),
-        std::make_shared<ParamAddress>(parse_hex("B0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57")),
-        std::make_shared<ParamAddress>(parse_hex("B0B0b0b0b0b0B000000000000000000000000000"))
-    }))
-});
-ParamStruct msgGroup("Group", std::vector<std::shared_ptr<ParamNamed>>{
-    std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("")),
-    std::make_shared<ParamNamed>("members", std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamStruct>(msgPersonCow2)
-    }))
-});
-ParamStruct msgMailCow1Bob1("Mail", std::vector<std::shared_ptr<ParamNamed>>{
-    std::make_shared<ParamNamed>("from", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{
-        std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Cow")),
-        std::make_shared<ParamNamed>("wallet", std::make_shared<ParamAddress>(parse_hex("CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826")))
-    })),
-    std::make_shared<ParamNamed>("to", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{
-        std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Bob")),
-        std::make_shared<ParamNamed>("wallet", std::make_shared<ParamAddress>(parse_hex("bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB")))
-    })),
-    std::make_shared<ParamNamed>("contents", std::make_shared<ParamString>("Hello, Bob!"))
-});
-ParamStruct msgMailCow2Bob3("Mail", std::vector<std::shared_ptr<ParamNamed>>{
-    std::make_shared<ParamNamed>("from", std::make_shared<ParamStruct>(msgPersonCow2)),
-    std::make_shared<ParamNamed>("to", std::make_shared<ParamArray>(std::make_shared<ParamStruct>(msgPersonBob3))),
-    std::make_shared<ParamNamed>("contents", std::make_shared<ParamString>("Hello, Bob!"))
-});
-ParamStruct gMsgEIP712Domain("EIP712Domain", std::vector<std::shared_ptr<ParamNamed>>{
-    std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Ether Mail")),
-    std::make_shared<ParamNamed>("version", std::make_shared<ParamString>("1")),
-    std::make_shared<ParamNamed>("chainId", std::make_shared<ParamUInt256>(1)),
-    std::make_shared<ParamNamed>("verifyingContract", std::make_shared<ParamAddress>(parse_hex("CcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC")))
-});
-
-PrivateKey privateKeyCow = PrivateKey(Hash::keccak256(TW::data("cow")));
-PrivateKey privateKeyDragon = PrivateKey(Hash::keccak256(TW::data("dragon")));
-PrivateKey privateKeyOilTimes12 = PrivateKey(parse_hex("b0f20d59451a2fac1be6d458e036adfa5d83ebd4c21f9a76de3c4a3a65671eba")); // 0x60c2A43Cc69658eC4b02a65A07623D7192166F4e
-
-// See 'signedTypeData' in https://github.com/MetaMask/eth-sig-util/blob/main/test/index.ts
-TEST(EthereumAbiStruct, encodeTypes) {
-    EXPECT_EQ(msgMailCow1Bob1.encodeType(), "Mail(Person from,Person to,string contents)Person(string name,address wallet)");
-
-    EXPECT_EQ(hex(msgMailCow1Bob1.hashType()), "a0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2");
-
-    EXPECT_EQ(hex(msgMailCow1Bob1.encodeHashes()), "a0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2fc71e5fa27ff56c350aa531bc129ebdf613b772b6604664f5d8dbe21b85eb0c8cd54f074a4af31b4411ff6a60c9719dbd559c221c8ac3492d9d872b041d703d1b5aadf3154a261abdd9086fc627b61efca26ae5702701d05cd2305f7c52a2fc8");
-
-    EXPECT_EQ(hex(msgMailCow1Bob1.hashStruct()), "c52c0ee5d84264471806290a3f2c4cecfc5490626bf912d01f240d7a274b371e");
-
-    EXPECT_EQ(hex(gMsgEIP712Domain.hashStruct()), "f2cee375fa42b42143804025fc449deafd50cc031ca257e0b194a650a912090f");
-
-    Address address = Address(privateKeyCow.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
-    EXPECT_EQ(address.string(), "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826");
-}
-
-TEST(EthereumAbiStruct, encodeTypes_Json) {
-    auto hash = ParamStruct::hashStructJson(
-        R"({
-            "types": {
-                "EIP712Domain": [
-                    {"name": "name", "type": "string"},
-                    {"name": "version", "type": "string"},
-                    {"name": "chainId", "type": "uint256"},
-                    {"name": "verifyingContract", "type": "address"}
-                ],
-                "Person": [
-                    {"name": "name", "type": "string"},
-                    {"name": "wallet", "type": "address"}
-                ],
-                "Mail": [
-                    {"name": "from", "type": "Person"},
-                    {"name": "to", "type": "Person"},
-                    {"name": "contents", "type": "string"}
-                ]
-            },
-            "primaryType": "Mail",
-            "domain": {
-                "name": "Ether Mail",
-                "version": "1",
-                "chainId": "0x01",
-                "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
-            },
-            "message": {
-                "from": {
-                    "name": "Cow",
-                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
-                },
-                "to": {
-                    "name": "Bob",
-                    "wallet": "bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
-                },
-                "contents": "Hello, Bob!"
-            }
-        })");
-    ASSERT_EQ(hex(hash), "be609aee343fb3c4b28e1df9e632fca64fcfaede20f02e86244efddf30957bd2");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyCow, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "4355c47d63924e8a72e509b65029052eb6c299d53a04e167c5775fd466751c9d");
-    EXPECT_EQ(hex(store(rsv.s)), "07299936d304c153f6443dfa05f40ff007d72911b6f72307f996231605b91562");
-    EXPECT_EQ(hex(store(rsv.v)), "1c");
-}
-
-// See 'signedTypeData with V3 string' in https://github.com/MetaMask/eth-sig-util/blob/main/test/index.ts
-TEST(EthereumAbiStruct, encodeTypes_v3) {
-    EXPECT_EQ(msgMailCow1Bob1.encodeType(), "Mail(Person from,Person to,string contents)Person(string name,address wallet)");
-
-    EXPECT_EQ(hex(msgMailCow1Bob1.hashType()), "a0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2");
-
-    EXPECT_EQ(hex(msgMailCow1Bob1.encodeHashes()), "a0cedeb2dc280ba39b857546d74f5549c3a1d7bdc2dd96bf881f76108e23dac2fc71e5fa27ff56c350aa531bc129ebdf613b772b6604664f5d8dbe21b85eb0c8cd54f074a4af31b4411ff6a60c9719dbd559c221c8ac3492d9d872b041d703d1b5aadf3154a261abdd9086fc627b61efca26ae5702701d05cd2305f7c52a2fc8");
-
-    EXPECT_EQ(hex(msgMailCow1Bob1.hashStruct()), "c52c0ee5d84264471806290a3f2c4cecfc5490626bf912d01f240d7a274b371e");
-
-    EXPECT_EQ(hex(gMsgEIP712Domain.hashStruct()), "f2cee375fa42b42143804025fc449deafd50cc031ca257e0b194a650a912090f");
-
-    Address address = Address(privateKeyCow.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
-    EXPECT_EQ(address.string(), "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826");
-}
-
-TEST(EthereumAbiStruct, encodeTypes_v3_Json) {
-    auto hash = ParamStruct::hashStructJson(
-        R"({
-            "types": {
-                "EIP712Domain": [
-                    {"name": "name", "type": "string"},
-                    {"name": "version", "type": "string"},
-                    {"name": "chainId", "type": "uint256"},
-                    {"name": "verifyingContract", "type": "address"}
-                ],
-                "Person": [
-                    {"name": "name", "type": "string"},
-                    {"name": "wallet", "type": "address"}
-                ],
-                "Mail": [
-                    {"name": "from", "type": "Person"},
-                    {"name": "to", "type": "Person"},
-                    {"name": "contents", "type": "string"}
-                ]
-            },
-            "primaryType": "Mail",
-            "domain": {
-                "name": "Ether Mail",
-                "version": "1",
-                "chainId": 1,
-                "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
-            },
-            "message": {
-                "from": {
-                    "name": "Cow",
-                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
-                },
-                "to": {
-                    "name": "Bob",
-                    "wallet": "bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"
-                },
-                "contents": "Hello, Bob!"
-            }
-        })");
-    ASSERT_EQ(hex(hash), "be609aee343fb3c4b28e1df9e632fca64fcfaede20f02e86244efddf30957bd2");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyCow, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "4355c47d63924e8a72e509b65029052eb6c299d53a04e167c5775fd466751c9d");
-    EXPECT_EQ(hex(store(rsv.s)), "07299936d304c153f6443dfa05f40ff007d72911b6f72307f996231605b91562");
-    EXPECT_EQ(hex(store(rsv.v)), "1c");
-}
-
-// See 'signedTypeData_v4' in https://github.com/MetaMask/eth-sig-util/blob/main/test/index.ts
-TEST(EthereumAbiStruct, encodeTypes_v4) {
-    EXPECT_EQ(msgGroup.encodeType(), "Group(string name,Person[] members)Person(string name,address[] wallets)");
-
-    EXPECT_EQ(msgPersonCow2.encodeType(), "Person(string name,address[] wallets)");
-
-    EXPECT_EQ(hex(msgPersonCow2.hashType()), "fabfe1ed996349fc6027709802be19d047da1aa5d6894ff5f6486d92db2e6860");
-
-    EXPECT_EQ(hex(msgPersonCow2.encodeHashes()),
-              "fabfe1ed996349fc6027709802be19d047da1aa5d6894ff5f6486d92db2e6860"
-              "8c1d2bd5348394761719da11ec67eedae9502d137e8940fee8ecd6f641ee1648"
-              "8a8bfe642b9fc19c25ada5dadfd37487461dc81dd4b0778f262c163ed81b5e2a");
-
-    EXPECT_EQ(hex(msgPersonCow2.hashStruct()), "9b4846dd48b866f0ac54d61b9b21a9e746f921cefa4ee94c4c0a1c49c774f67f");
-
-    EXPECT_EQ(hex(msgPersonBob3.encodeHashes()),
-              "fabfe1ed996349fc6027709802be19d047da1aa5d6894ff5f6486d92db2e6860"
-              "28cac318a86c8a0a6a9156c2dba2c8c2363677ba0514ef616592d81557e679b6"
-              "d2734f4c86cc3bd9cabf04c3097589d3165d95e4648fc72d943ed161f651ec6d");
-
-    EXPECT_EQ(hex(msgPersonBob3.hashStruct()), "efa62530c7ae3a290f8a13a5fc20450bdb3a6af19d9d9d2542b5a94e631a9168");
-
-    EXPECT_EQ(msgMailCow2Bob3.encodeType(), "Mail(Person from,Person[] to,string contents)Person(string name,address[] wallets)");
-
-    EXPECT_EQ(hex(msgMailCow2Bob3.hashType()), "4bd8a9a2b93427bb184aca81e24beb30ffa3c747e2a33d4225ec08bf12e2e753");
-
-    EXPECT_EQ(hex(msgMailCow2Bob3.encodeHashes()),
-              "4bd8a9a2b93427bb184aca81e24beb30ffa3c747e2a33d4225ec08bf12e2e753"
-              "9b4846dd48b866f0ac54d61b9b21a9e746f921cefa4ee94c4c0a1c49c774f67f"
-              "ca322beec85be24e374d18d582a6f2997f75c54e7993ab5bc07404ce176ca7cd"
-              "b5aadf3154a261abdd9086fc627b61efca26ae5702701d05cd2305f7c52a2fc8");
-
-    EXPECT_EQ(hex(msgMailCow2Bob3.hashStruct()), "eb4221181ff3f1a83ea7313993ca9218496e424604ba9492bb4052c03d5c3df8");
-
-    EXPECT_EQ(hex(gMsgEIP712Domain.hashStruct()), "f2cee375fa42b42143804025fc449deafd50cc031ca257e0b194a650a912090f");
-
-    Address address = Address(privateKeyCow.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
-    EXPECT_EQ(address.string(), "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826");
-}
-
-TEST(EthereumAbiStruct, encodeTypes_v4_Json) {
-    auto hash = ParamStruct::hashStructJson(
-        R"({
-            "types": {
-                "EIP712Domain": [
-                    {"name": "name", "type": "string"},
-                    {"name": "version", "type": "string"},
-                    {"name": "chainId", "type": "uint256"},
-                    {"name": "verifyingContract", "type": "address"}
-                ],
-                "Person": [
-                    {"name": "name", "type": "string"},
-                    {"name": "wallets", "type": "address[]"}
-                ],
-                "Mail": [
-                    {"name": "from", "type": "Person"},
-                    {"name": "to", "type": "Person[]"},
-                    {"name": "contents", "type": "string"}
-                ]
-            },
-            "primaryType": "Mail",
-            "domain": {
-                "name": "Ether Mail",
-                "version": "1",
-                "chainId": 1,
-                "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
-            },
-            "message": {
-                "from": {
-                    "name": "Cow",
-                    "wallets": [
-                        "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
-                        "DeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"
-                    ]
-                },
-                "to": [
-                    {
-                        "name": "Bob",
-                        "wallets": [
-                            "bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
-                            "B0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57",
-                            "B0B0b0b0b0b0B000000000000000000000000000"
-                        ]
-                    }
-                ],
-                "contents": "Hello, Bob!"
-            }
-        })");
-    ASSERT_EQ(hex(hash), "a85c2e2b118698e88db68a8105b794a8cc7cec074e89ef991cb4f5f533819cc2");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyCow, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "65cbd956f2fae28a601bebc9b906cea0191744bd4c4247bcd27cd08f8eb6b71c");
-    EXPECT_EQ(hex(store(rsv.s)), "78efdf7a31dc9abee78f492292721f362d296cf86b4538e07b51303b67f74906");
-    EXPECT_EQ(hex(store(rsv.v)), "1b");
-}
-
-// See 'signedTypeData_v4 with recursive types' in https://github.com/MetaMask/eth-sig-util/blob/main/test/index.ts
-TEST(EthereumAbiStruct, encodeTypes_v4Rec) {
-    ParamStruct msgPersonRecursiveMother("Person", std::vector<std::shared_ptr<ParamNamed>>{
-        std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Lyanna")),
-        std::make_shared<ParamNamed>("mother", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{})),
-        std::make_shared<ParamNamed>("father", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{
-            std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Rickard")),
-            std::make_shared<ParamNamed>("mother", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{})),
-            std::make_shared<ParamNamed>("father", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{}))
-        }))
-    });
-    ParamStruct msgPersonRecursiveFather("Person", std::vector<std::shared_ptr<ParamNamed>>{
-        std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Rhaegar")),
-        std::make_shared<ParamNamed>("mother", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{})),
-        std::make_shared<ParamNamed>("father", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{
-            std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Aeris II")),
-            std::make_shared<ParamNamed>("mother", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{})),
-            std::make_shared<ParamNamed>("father", std::make_shared<ParamStruct>("Person", std::vector<std::shared_ptr<ParamNamed>>{}))
-        }))
-    });
-    ParamStruct msgPersonRecursive("Person", std::vector<std::shared_ptr<ParamNamed>>{
-        std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Jon")),
-        std::make_shared<ParamNamed>("mother", std::make_shared<ParamStruct>(msgPersonRecursiveMother)),
-        std::make_shared<ParamNamed>("father", std::make_shared<ParamStruct>(msgPersonRecursiveFather))
-    });
-
-    EXPECT_EQ(msgPersonRecursive.encodeType(), "Person(string name,Person mother,Person father)");
-
-    EXPECT_EQ(hex(msgPersonRecursive.hashType()), "7c5c8e90cb92c8da53b893b24962513be98afcf1b57b00327ae4cc14e3a64116");
-
-    EXPECT_EQ(hex(msgPersonRecursiveMother.encodeHashes()),
-              "7c5c8e90cb92c8da53b893b24962513be98afcf1b57b00327ae4cc14e3a64116"
-              "afe4142a2b3e7b0503b44951e6030e0e2c5000ef83c61857e2e6003e7aef8570"
-              "0000000000000000000000000000000000000000000000000000000000000000"
-              "88f14be0dd46a8ec608ccbff6d3923a8b4e95cdfc9648f0db6d92a99a264cb36");
-
-    EXPECT_EQ(hex(msgPersonRecursiveMother.hashStruct()), "9ebcfbf94f349de50bcb1e3aa4f1eb38824457c99914fefda27dcf9f99f6178b");
-
-    EXPECT_EQ(hex(msgPersonRecursiveFather.encodeHashes()),
-              "7c5c8e90cb92c8da53b893b24962513be98afcf1b57b00327ae4cc14e3a64116"
-              "b2a7c7faba769181e578a391a6a6811a3e84080c6a3770a0bf8a856dfa79d333"
-              "0000000000000000000000000000000000000000000000000000000000000000"
-              "02cc7460f2c9ff107904cff671ec6fee57ba3dd7decf999fe9fe056f3fd4d56e");
-
-    EXPECT_EQ(hex(msgPersonRecursiveFather.hashStruct()), "b852e5abfeff916a30cb940c4e24c43cfb5aeb0fa8318bdb10dd2ed15c8c70d8");
-
-    EXPECT_EQ(hex(msgPersonRecursive.encodeHashes()),
-              "7c5c8e90cb92c8da53b893b24962513be98afcf1b57b00327ae4cc14e3a64116"
-              "e8d55aa98b6b411f04dbcf9b23f29247bb0e335a6bc5368220032fdcb9e5927f"
-              "9ebcfbf94f349de50bcb1e3aa4f1eb38824457c99914fefda27dcf9f99f6178b"
-              "b852e5abfeff916a30cb940c4e24c43cfb5aeb0fa8318bdb10dd2ed15c8c70d8");
-
-    EXPECT_EQ(hex(msgPersonRecursive.hashStruct()), "fdc7b6d35bbd81f7fa78708604f57569a10edff2ca329c8011373f0667821a45");
-
-    ParamStruct msgEIP712Domain("EIP712Domain", std::vector<std::shared_ptr<ParamNamed>>{
-        std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Family Tree")),
-        std::make_shared<ParamNamed>("version", std::make_shared<ParamString>("1")),
-        std::make_shared<ParamNamed>("chainId", std::make_shared<ParamUInt256>(1)),
-        std::make_shared<ParamNamed>("verifyingContract", std::make_shared<ParamAddress>(parse_hex("CcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC")))
-    });
-
-    EXPECT_EQ(hex(msgEIP712Domain.hashStruct()), "facb2c1888f63a780c84c216bd9a81b516fc501a19bae1fc81d82df590bbdc60");
-
-    Address address = Address(privateKeyDragon.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
-    EXPECT_EQ(address.string(), "0x065a687103C9F6467380beE800ecD70B17f6b72F");
-}
-
-TEST(EthereumAbiStruct, encodeTypes_v4Rec_Json) {
-    auto hash = ParamStruct::hashStructJson(
-        R"({
-            "types": {
-                "EIP712Domain": [
-                    {"name": "name", "type": "string"},
-                    {"name": "version", "type": "string"},
-                    {"name": "chainId", "type": "uint256"},
-                    {"name": "verifyingContract", "type": "address"}
-                ],
-                "Person": [
-                    {"name": "name", "type": "string"},
-                    {"name": "mother", "type": "Person"},
-                    {"name": "father", "type": "Person"}
-                ]
-            },
-            "primaryType": "Person",
-            "domain": {
-                "name": "Family Tree",
-                "version": "1",
-                "chainId": 1,
-                "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
-            },
-            "message": {
-                "name": "Jon",
-                "mother": {
-                    "name": "Lyanna",
-                    "father": {
-                        "name": "Rickard"
-                    }
-                },
-                "father": {
-                    "name": "Rhaegar",
-                    "father": {
-                        "name": "Aeris II"
-                    }
-                }
-            }
-        })");
-    ASSERT_EQ(hex(hash), "807773b9faa9879d4971b43856c4d60c2da15c6f8c062bd9d33afefb756de19c");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyDragon, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "f2ec61e636ff7bb3ac8bc2a4cc2c8b8f635dd1b2ec8094c963128b358e79c85c");
-    EXPECT_EQ(hex(store(rsv.s)), "5ca6dd637ed7e80f0436fe8fce39c0e5f2082c9517fe677cc2917dcd6c84ba88");
-    EXPECT_EQ(hex(store(rsv.v)), "1c");
-}
-
-// See 'signedTypeData' in https://github.com/MetaMask/eth-sig-util/blob/main/test/index.ts
-TEST(EthereumAbiStruct, encodeTypeCow1) {
-    ParamStruct msgPersonCow1("Person", std::vector<std::shared_ptr<ParamNamed>>{
-        std::make_shared<ParamNamed>("name", std::make_shared<ParamString>("Cow")),
-        std::make_shared<ParamNamed>("wallet", std::make_shared<ParamAddress>(parse_hex("CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826")))
-    });
-
-    EXPECT_EQ(msgPersonCow1.encodeType(), "Person(string name,address wallet)");
-
-    EXPECT_EQ(hex(msgPersonCow1.hashType()), "b9d8c78acf9b987311de6c7b45bb6a9c8e1bf361fa7fd3467a2163f994c79500");
-
-    EXPECT_EQ(hex(msgPersonCow1.encodeHashes()), "b9d8c78acf9b987311de6c7b45bb6a9c8e1bf361fa7fd3467a2163f994c795008c1d2bd5348394761719da11ec67eedae9502d137e8940fee8ecd6f641ee1648000000000000000000000000cd2a3d9f938e13cd947ec05abc7fe734df8dd826");
-
-    EXPECT_EQ(hex(msgPersonCow1.hashStruct()), "fc71e5fa27ff56c350aa531bc129ebdf613b772b6604664f5d8dbe21b85eb0c8");
-}
-
-TEST(EthereumAbiStruct, hashStructJson) {
-    {
-        auto hash = ParamStruct::hashStructJson(
-            R"({
-                "types": {
-                    "EIP712Domain": [
-                        {"name": "name", "type": "string"},
-                        {"name": "version", "type": "string"},
-                        {"name": "chainId", "type": "uint256"},
-                        {"name": "verifyingContract", "type": "address"}
-                    ],
-                    "Person": [
-                        {"name": "name", "type": "string"},
-                        {"name": "wallet", "type": "address"}
-                    ]
-                },
-                "primaryType": "Person",
-                "domain": {
-                    "name": "Ether Person",
-                    "version": "1",
-                    "chainId": 1,
-                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
-                },
-                "message": {
-                    "name": "Cow",
-                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
-                }
-            })");
-        ASSERT_EQ(hex(hash), "0b4bb85394b9ebb1c2425e283c9e734a9a7a832622e97c998f77e1c7a3f01a20");
-    }
-    { // edge cases
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson("NOT_A_JSON"), "Could not parse Json");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson("+/{\\"), "Could not parse Json");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(""), "Could not parse Json");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson("0"), "Expecting Json object");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson("[]"), "Expecting Json object");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({})"), "Top-level string field 'primaryType' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"domain": {}, "message": {}, "types": {}})"), "Top-level string field 'primaryType' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": [], "domain": {}, "message": {}, "types": {}})"), "Top-level string field 'primaryType' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "message": {}, "types": {}})"), "Top-level object field 'domain' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": "vDomain", "message": {}, "types": {}})"), "Top-level object field 'domain' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": {}, "types": {}})"), "Top-level object field 'message' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": {}, "message": "v2", "types": {}})"), "Top-level object field 'message' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": {}, "message": {}})"), "Top-level object field 'types' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": {}, "message": {}, "types": "vTypes"})"), "Top-level object field 'types' missing");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": {}, "message": {}, "types": {}})"), "Type not found, EIP712Domain");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": {}, "message": {}, "types": {"EIP712Domain": []}})"), "No valid params found");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": {}, "message": {}, "types": {"EIP712Domain": [{"name": "param", "type": "type"}]}})"), "Unknown type type");
-        EXPECT_EXCEPTION(ParamStruct::hashStructJson(R"({"primaryType": "v1", "domain": {"param": "val"}, "message": {}, "types": {"EIP712Domain": [{"name": "param", "type": "string"}]}})"), "Type not found, v1");
-    }
-}
-
-TEST(EthereumAbiStruct, hashStruct_emptyString) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/eip712_emptyString.json";
-    auto typeData = load_file(path);
-    auto hash = ParamStruct::hashStructJson(typeData);
-    EXPECT_EQ(hex(hash), "bc9d33285c5e42b00571f5deaf9636d2e498a6fa50e0d1be81095bded070117a");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyOilTimes12, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "5df6cb46d874bc0acc519695f393008a837ca9d2e316836b669b8f0de7673638");
-    EXPECT_EQ(hex(store(rsv.s)), "54cc0bcc0ad657f9222f7e7be3fbe0ec4a8edb9385c39d578dfac8d38727af12");
-    EXPECT_EQ(hex(store(rsv.v)), "1c");
-}
-
-TEST(EthereumAbiStruct, hashStruct_emptyArray) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/eip712_emptyArray.json";
-    auto typeData = load_file(path);
-    auto hash = ParamStruct::hashStructJson(typeData);
-    EXPECT_EQ(hex(hash), "9f1a1bc718e966d683c544aef6fd0b73c85a1d6244af9b64bb8f4a6fa6716086");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyOilTimes12, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "de47efd592493f7189d44f071424ecb24b50d80750d3bd2bb6fc80451c13a52f");
-    EXPECT_EQ(hex(store(rsv.s)), "202b8a2be1ef3c466853e8cd5275a6af15b11e7e1cc0ae4a7e249bc9bad591eb");
-    EXPECT_EQ(hex(store(rsv.v)), "1c");
-}
-
-TEST(EthereumAbiStruct, hashStruct_walletConnect) {
-    // https://github.com/WalletConnect/walletconnect-example-dapp/blob/master/src/helpers/eip712.ts
-    auto path = TESTS_ROOT + "/Ethereum/Data/eip712_walletconnect.json";
-    auto typeData = load_file(path);
-    auto hash = ParamStruct::hashStructJson(typeData);
-    EXPECT_EQ(hex(hash), "abc79f527273b9e7bca1b3f1ac6ad1a8431fa6dc34ece900deabcd6969856b5e");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyOilTimes12, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "e9c1ce1307593c378c7e38e8aa00dfb42b5a1ce543b59a138a12f29bd7fea75c");
-    EXPECT_EQ(hex(store(rsv.s)), "3fe71ef91c37abea29fe14b5f0de805f924af19d71bcef09e74aef2f0ccdf52a");
-    EXPECT_EQ(hex(store(rsv.v)), "1c");
-}
-
-TEST(EthereumAbiStruct, hashStruct_cryptofights) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/eip712_cryptofights.json";
-    auto typeData = load_file(path);
-    auto hash = ParamStruct::hashStructJson(typeData);
-    EXPECT_EQ(hex(hash), "db12328a6d193965801548e1174936c3aa7adbe1b54b3535a3c905bd4966467c");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyOilTimes12, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "9e26bdf0d113a72805acb1c2c8b0734d264290fd1cfbdf5e6502ae65a2f2bd83");
-    EXPECT_EQ(hex(store(rsv.s)), "11512c15ad0833fd457ae5dd59c3bcb3d03f35b3d33c1c5a575852163db42369");
-    EXPECT_EQ(hex(store(rsv.v)), "1b");
-}
-
-TEST(EthereumAbiStruct, hashStruct_rarible) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/eip712_rarible.json";
-    auto typeData = load_file(path);
-    auto hash = ParamStruct::hashStructJson(typeData);
-    EXPECT_EQ(hex(hash), "df0200de55c05eb55af2597012767ea3af653d68000be49580f8e05acd91d366");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyCow, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "9e6155c62a55d3dc6034973d93821dace5a0c66bfbd8413ad29205c2fb079e84");
-    EXPECT_EQ(hex(store(rsv.s)), "3ca5906f24b82672304302a0e42e5dc090acc800060bad51fb81cc4469f69930");
-    EXPECT_EQ(hex(store(rsv.v)), "1b");
-}
-
-TEST(EthereumAbiStruct, hashStruct_snapshot) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/eip712_snapshot_v4.json";
-    auto typeData = load_file(path);
-    auto hash = ParamStruct::hashStructJson(typeData);
-    EXPECT_EQ(hex(hash), "f558d08ad4a7651dbc9ec028cfcb4a8e6878a249073ef4fa694f85ee95f61c0f");
-
-    // sign the hash
-    const auto rsv = Signer::sign(privateKeyOilTimes12, hash, true, 0);
-    EXPECT_EQ(hex(store(rsv.r)), "9da563ffcafe9fa8809540ebcc4bcf8bbc26874e192f430432e06547593e8681");
-    EXPECT_EQ(hex(store(rsv.s)), "164808603aca259775bdf511124b58651f1b3ce9ccbcd5a8d63df02e2359bb8b");
-    EXPECT_EQ(hex(store(rsv.v)), "1b");
-}
-
-TEST(EthereumAbiStruct, ParamFactoryMakeNamed) {
-    std::shared_ptr<ParamNamed> p = ParamFactory::makeNamed("firstparam", "uint256");
-    EXPECT_EQ(p->getName(), "firstparam");
-    ASSERT_NE(p->getParam().get(), nullptr);
-    EXPECT_EQ(p->getParam()->getType(), "uint256");
-}
-
-TEST(EthereumAbiStruct, ParamStructMakeStruct) {
-    {
-        std::shared_ptr<ParamStruct> s = ParamStruct::makeStruct("Person",
-            R"(
-                {"name": "Cow", "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"}
-            )",
-            R"({
-                "Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}]
-            })");
-        ASSERT_NE(s.get(), nullptr);
-        EXPECT_EQ(s->getType(), "Person");
-        ASSERT_EQ(s->getCount(), 2ul);
-        EXPECT_EQ(s->encodeType(), "Person(string name,address wallet)");
-        EXPECT_EQ(hex(s->hashStruct()), "fc71e5fa27ff56c350aa531bc129ebdf613b772b6604664f5d8dbe21b85eb0c8");
-    }
-    {
-        std::shared_ptr<ParamStruct> s = ParamStruct::makeStruct("Person",
-            R"(
-                {"name": "Cow", "wallets": ["CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826", "DeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"]}
-            )",
-            R"({
-                "Person": [{"name": "name", "type": "string"}, {"name": "wallets", "type": "address[]"}]
-            })");
-        ASSERT_NE(s.get(), nullptr);
-        EXPECT_EQ(s->getType(), "Person");
-        ASSERT_EQ(s->getCount(), 2ul);
-        EXPECT_EQ(s->encodeType(), "Person(string name,address[] wallets)");
-        EXPECT_EQ(hex(s->hashStruct()), "9b4846dd48b866f0ac54d61b9b21a9e746f921cefa4ee94c4c0a1c49c774f67f");
-    }
-    {
-        std::shared_ptr<ParamStruct> s = ParamStruct::makeStruct("Mail",
-            R"({"from": {"name": "Cow", "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"}, "to": {"name": "Bob", "wallet": "bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"}, "contents": "Hello, Bob!"})",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}],"Mail": [{"name": "from", "type": "Person"},{"name": "to", "type": "Person"},{"name": "contents", "type": "string"}]})");
-        ASSERT_NE(s.get(), nullptr);
-        EXPECT_EQ(s->getType(), "Mail");
-        ASSERT_EQ(s->getCount(), 3ul);
-        EXPECT_EQ(s->encodeType(), "Mail(Person from,Person to,string contents)Person(string name,address wallet)");
-        EXPECT_EQ(hex(s->hashStruct()), "c52c0ee5d84264471806290a3f2c4cecfc5490626bf912d01f240d7a274b371e");
-    }
-
-    { // extra param
-        std::shared_ptr<ParamStruct> s = ParamStruct::makeStruct("Person",
-            R"({"extra_param": "extra_value", "name": "Cow", "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"})",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}]})");
-        ASSERT_NE(s.get(), nullptr);
-        EXPECT_EQ(s->encodeType(), "Person(string name,address wallet)");
-        EXPECT_EQ(hex(s->hashStruct()), "fc71e5fa27ff56c350aa531bc129ebdf613b772b6604664f5d8dbe21b85eb0c8");
-    }
-    { // empty array
-        std::shared_ptr<ParamStruct> s = ParamStruct::makeStruct("Person",
-            R"({"extra_param": "extra_value", "name": "Cow", "wallets": []})",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallets", "type": "address[]"}]})");
-        ASSERT_NE(s.get(), nullptr);
-        EXPECT_EQ(s->encodeType(), "Person(string name,address[] wallets)");
-    }
-    { // missing param
-        std::shared_ptr<ParamStruct> s = ParamStruct::makeStruct("Person",
-            R"({"wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"})",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}]})");
-        ASSERT_NE(s.get(), nullptr);
-        EXPECT_EQ(s->encodeType(), "Person(string name,address wallet)");
-    }
-
-    {
-        EXPECT_EXCEPTION(ParamStruct::makeStruct("Person",
-            "NOT_A_JSON+/{\\",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}]})"),
-            "Could not parse value Json");
-    }
-    {
-        EXPECT_EXCEPTION(ParamStruct::makeStruct("Person",
-            "0",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}]})"),
-            "Expecting object");
-    }
-    {
-        EXPECT_EXCEPTION(ParamStruct::makeStruct("Person",
-            // params mixed up
-            R"({"wallets": "Cow", "name": ["CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826", "DeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"]})",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallets", "type": "address[]"}]})"),
-            "Could not set type for param wallets");
-    }
-    {
-        EXPECT_EXCEPTION(ParamStruct::makeStruct("Person",
-            R"({"name": "Cow", "wallets": ["CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826", "DeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"]})",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallets", "type": "missingtype[]"}]})"),
-            "Unknown struct array type missingtype");
-    }
-    {
-        EXPECT_EXCEPTION(ParamStruct::makeStruct("Person",
-            R"({"name": "Cow", "wallets": "NOT_AN_ARRAY"})",
-            R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallets", "type": "address[]"}]})"),
-            "Could not set type for param wallets");
-    }
-    {
-        EXPECT_EXCEPTION(ParamStruct::makeStruct("Mail",
-            R"({"from": {"name": "Cow", "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"}, "to": {"name": "Bob", "wallet": "bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB"}, "contents": "Hello, Bob!"})",
-            R"({"Mail": [{"name": "from", "type": "Person"},{"name": "to", "type": "Person"},{"name": "contents", "type": "string"}]})"),
-            "Unknown type Person");
-    }
-}
-
-TEST(EthereumAbiStruct, ParamFactoryMakeTypes) {
-    {
-        std::vector<std::shared_ptr<ParamStruct>> tt = ParamStruct::makeTypes(R"({"Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}]})");
-        ASSERT_EQ(tt.size(), 1ul);
-        EXPECT_EQ(tt[0]->encodeType(), "Person(string name,address wallet)");
-    }
-    {
-        std::vector<std::shared_ptr<ParamStruct>> tt = ParamStruct::makeTypes(
-            R"({
-                "Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}],
-                "Mail": [{"name": "from", "type": "Person"}, {"name": "to", "type": "Person"}, {"name": "contents", "type": "string"}]
-            })");
-        ASSERT_EQ(tt.size(), 2ul);
-        EXPECT_EQ(tt[0]->encodeType(), "Mail(Person from,Person to,string contents)Person(string name,address wallet)");
-        EXPECT_EQ(tt[1]->encodeType(), "Person(string name,address wallet)");
-    }
-    { // edge cases
-        EXPECT_EXCEPTION(ParamStruct::makeTypes("NOT_A_JSON"), "Could not parse types Json");
-        EXPECT_EXCEPTION(ParamStruct::makeTypes("+/{\\"), "Could not parse types Json");
-        EXPECT_EXCEPTION(ParamStruct::makeTypes(""), "Could not parse types Json");
-        EXPECT_EXCEPTION(ParamStruct::makeTypes("0"), "Expecting object");
-        EXPECT_EXCEPTION(ParamStruct::makeTypes("[]"), "Expecting object");
-        EXPECT_EXCEPTION(ParamStruct::makeTypes("[{}]"), "Expecting object");
-        EXPECT_EQ(ParamStruct::makeTypes("{}").size(), 0ul);
-        EXPECT_EXCEPTION(ParamStruct::makeTypes("{\"a\": 0}"), "Expecting array");
-        EXPECT_EXCEPTION(ParamStruct::makeTypes(R"({"name": 0})"), "Expecting array");
-        // order does not matter
-        EXPECT_EQ(ParamStruct::makeTypes(R"({"Mail": [{"name": "from", "type": "Person"}, {"name": "to", "type": "Person"}, {"name": "contents", "type": "string"}], "Person": [{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}]})").size(), 2ul);
-    }
-}
-
-TEST(EthereumAbiStruct, ParamFactoryMakeType) {
-    {
-        std::shared_ptr<ParamStruct> t = ParamStruct::makeType("Person", R"([{"name": "name", "type": "string"}, {"name": "wallet", "type": "address"}])");
-        EXPECT_NE(t.get(), nullptr);
-        EXPECT_EQ(t->getType(), "Person");
-        ASSERT_EQ(t->getCount(), 2ul);
-        ASSERT_EQ(t->encodeType(), "Person(string name,address wallet)");
-    }
-    { // edge cases
-        EXPECT_EXCEPTION(ParamStruct::makeType("", ""), "Missing type name");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", "NOT_A_JSON"), "Could not parse type Json");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", "+/{\\"), "Could not parse type Json");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", ""), "Could not parse type Json");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", "0"), "Expecting array");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", "{}"), "Expecting array");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", "[]"), "No valid params found");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", R"([{"dummy": 0}])"), "Could not process Json: ");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", R"([{"name": "val"}])"), "Could not process Json: ");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", R"([{"type": "val"}])"), "Could not process Json: ");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", R"([{"name": "", "type": "type"}])"), "Expecting 'name' and 'type', in Person");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", R"([{"name": "name", "type": ""}])"), "Expecting 'name' and 'type', in Person");
-        EXPECT_EXCEPTION(ParamStruct::makeType("Person", R"([{"name": "name", "type": "UNKNOWN_TYPE"}, {"name": "wallet", "type": "address"}])"), "Unknown type UNKNOWN_TYPE");
-        EXPECT_EQ(ParamStruct::makeType("Person", R"([{"name": "name", "type": "UNKNOWN_TYPE"}, {"name": "wallet", "type": "address"}])", {}, true)->encodeType(), "Person(UNKNOWN_TYPE name,address wallet)UNKNOWN_TYPE()");
-    }
-}
-
-TEST(EthereumAbiStruct, ParamNamedMethods) {
-    const auto ps = std::make_shared<ParamString>("Hello");
-    auto pn = std::make_shared<ParamNamed>("name", ps);
-
-    EXPECT_EQ(pn->getSize(), ps->getSize());
-    EXPECT_EQ(pn->isDynamic(), ps->isDynamic());
-    Data encoded;
-    pn->encode(encoded);
-    EXPECT_EQ(hex(encoded), "000000000000000000000000000000000000000000000000000000000000000548656c6c6f000000000000000000000000000000000000000000000000000000");
-    size_t offset = 0;
-    EXPECT_EQ(pn->decode(encoded, offset), true);
-    EXPECT_EQ(offset, 64ul);
-    pn->setValueJson("World");
-    EXPECT_EQ(ps->getVal(), "World");
-}
-
-TEST(EthereumAbiStruct, ParamSetNamed) {
-    const auto pn1 = std::make_shared<ParamNamed>("param1", std::make_shared<ParamString>("Hello"));
-    const auto pn2 = std::make_shared<ParamNamed>("param2", std::make_shared<ParamString>("World"));
-    auto ps = std::make_shared<ParamSetNamed>(std::vector<std::shared_ptr<ParamNamed>>{pn1, pn2});
-    EXPECT_EQ(ps->getCount(), 2ul);
-    EXPECT_EQ(ps->addParam(std::shared_ptr<ParamNamed>(nullptr)), -1);
-    EXPECT_EQ(ps->findParamByName("NO_SUCH_PARAM"), nullptr);
-    auto pf1 = ps->findParamByName("param2");
-    ASSERT_NE(pf1.get(), nullptr);
-    EXPECT_EQ(pf1->getName(), "param2");
-}
-
-TEST(EthereumAbiStruct, ParamStructMethods) {
-    const auto pn1 = std::make_shared<ParamNamed>("param1", std::make_shared<ParamString>("Hello"));
-    const auto pn2 = std::make_shared<ParamNamed>("param2", std::make_shared<ParamString>("World"));
-    auto ps = std::make_shared<ParamStruct>("struct", std::vector<std::shared_ptr<ParamNamed>>{pn1, pn2});
-
-    EXPECT_EQ(ps->getSize(), 2ul);
-    EXPECT_EQ(ps->isDynamic(), true);
-    Data encoded;
-    ps->encode(encoded);
-    EXPECT_EQ(hex(encoded), "");
-    size_t offset = 0;
-    EXPECT_EQ(ps->decode(encoded, offset), true);
-    EXPECT_EQ(offset, 0ul);
-    EXPECT_FALSE(ps->setValueJson("dummy"));
-    EXPECT_EQ(ps->findParamByName("param2")->getName(), "param2");
-}
-
-TEST(EthereumAbiStruct, ParamHashStruct) {
-    {
-        auto p = std::make_shared<ParamUInt8>();
-        EXPECT_TRUE(p->setValueJson("13"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000000000000000000d");
-    }
-    {
-        auto p = std::make_shared<ParamUInt16>();
-        EXPECT_TRUE(p->setValueJson("1234"));
-        EXPECT_EQ(hex(p->hashStruct()), "00000000000000000000000000000000000000000000000000000000000004d2");
-    }
-    {
-        auto p = std::make_shared<ParamUInt32>();
-        EXPECT_TRUE(p->setValueJson("1234567"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000000000000012d687");
-    }
-    {
-        auto p = std::make_shared<ParamUInt64>();
-        EXPECT_TRUE(p->setValueJson("1234567"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000000000000012d687");
-    }
-    {
-        auto p = std::make_shared<ParamUIntN>(128);
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000112210f47de98115");
-    }
-    {
-        auto p = std::make_shared<ParamUIntN>(168);
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000112210f47de98115");
-    }
-    {
-        auto p = std::make_shared<ParamUInt256>();
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000112210f47de98115");
-    }
-    {
-        auto p = std::make_shared<ParamInt8>();
-        EXPECT_TRUE(p->setValueJson("13"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000000000000000000d");
-    }
-    {
-        auto p = std::make_shared<ParamInt16>();
-        EXPECT_TRUE(p->setValueJson("1234"));
-        EXPECT_EQ(hex(p->hashStruct()), "00000000000000000000000000000000000000000000000000000000000004d2");
-    }
-    {
-        auto p = std::make_shared<ParamInt32>();
-        EXPECT_TRUE(p->setValueJson("1234567"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000000000000012d687");
-    }
-    {
-        auto p = std::make_shared<ParamInt64>();
-        EXPECT_TRUE(p->setValueJson("1234567"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000000000000012d687");
-    }
-    {
-        auto p = std::make_shared<ParamIntN>(128);
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000112210f47de98115");
-    }
-    {
-        auto p = std::make_shared<ParamIntN>(168);
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000112210f47de98115");
-    }
-    {
-        auto p = std::make_shared<ParamInt256>();
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000112210f47de98115");
-    }
-    {
-        auto p = std::make_shared<ParamBool>();
-        EXPECT_TRUE(p->setValueJson("true"));
-        EXPECT_EQ(hex(p->hashStruct()), "0000000000000000000000000000000000000000000000000000000000000001");
-    }
-    {
-        auto p = std::make_shared<ParamString>();
-        EXPECT_TRUE(p->setValueJson("ABCdefGHI"));
-        EXPECT_EQ(hex(p->hashStruct()), "3a2aa9c027187dbf5a2f0c980281da43e810ecbe4d32e0b5c22211882c691889");
-    }
-    {
-        auto p = std::make_shared<ParamByteArray>();
-        EXPECT_TRUE(p->setValueJson("0123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "79fad56e6cf52d0c8c2c033d568fc36856ba2b556774960968d79274b0e6b944");
-        EXPECT_TRUE(p->setValueJson("0xa9059cbb0000000000000000000000002e0d94754b348d208d64d52d78bcd443afa9fa520000000000000000000000000000000000000000000000000000000000000007"));
-        EXPECT_EQ(hex(p->hashStruct()), "a9485354dd9d340e02789cfc540c6c4a2ff5511beb414b64634a5e11c6a7168c");
-        EXPECT_TRUE(p->setValueJson("0x0000000000000000000000000000000000000000000000000000000123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "c8243991757dc8723e4976248127e573da4a2cbfad54b776d5a7c8d92b6e2a6b");
-        EXPECT_TRUE(p->setValueJson("0x00"));
-        EXPECT_EQ(hex(p->hashStruct()), "bc36789e7a1e281436464229828f817d6612f7b477d66591ff96a9e064bcc98a");
-        EXPECT_TRUE(p->setValueJson("0x"));
-        EXPECT_EQ(hex(p->hashStruct()), "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-        EXPECT_TRUE(p->setValueJson(""));
-        EXPECT_EQ(hex(p->hashStruct()), "c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470");
-    }
-    {
-        auto p = std::make_shared<ParamByteArrayFix>(36);
-        EXPECT_TRUE(p->setValueJson("0x000000000000000000000000000000000000000000000000000000000000000123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "3deb4663f580c622d668f2121c29c3f4dacf06e40a3a76d1dea25e90bcd63b5d");
-    }
-    {
-        auto p = std::make_shared<ParamByteArrayFix>(20);
-        EXPECT_TRUE(p->setValueJson("0x0000000000000000000000000000000123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "0000000000000000000000000000000123456789000000000000000000000000");
-    }
-    {
-        auto p = std::make_shared<ParamByteArrayFix>(32);
-        EXPECT_TRUE(p->setValueJson("0x0000000000000000000000000000000000000000000000000000000123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "0000000000000000000000000000000000000000000000000000000123456789");
-    }
-    {
-        auto p = std::make_shared<ParamAddress>();
-        EXPECT_TRUE(p->setValueJson("0x0000000000000000000000000000000123456789"));
-        EXPECT_EQ(hex(p->hashStruct()), "0000000000000000000000000000000000000000000000000000000123456789");
-    }
-    {
-        using collection = std::vector<std::shared_ptr<ParamBase>>;
-        auto p = std::make_shared<ParamArrayFix>(collection{std::make_shared<ParamBool>(), std::make_shared<ParamBool>(), std::make_shared<ParamBool>()});
-        EXPECT_TRUE(p->setValueJson("[1,0,1]"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001");
-    }
-    {
-        using collection = std::vector<std::shared_ptr<ParamBase>>;
-        auto p = std::make_shared<ParamArrayFix>(collection{std::make_shared<ParamUInt8>(), std::make_shared<ParamUInt8>(), std::make_shared<ParamUInt8>()});
-        EXPECT_TRUE(p->setValueJson("[13,14,15]"));
-        EXPECT_EQ(hex(p->hashStruct()), "000000000000000000000000000000000000000000000000000000000000000d000000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000000f");
-
-        // Coverage
-        EXPECT_FALSE(p->setValueJson("NotValidJson"));
-        EXPECT_FALSE(p->setValueJson("{}"));
-        EXPECT_FALSE(p->setValueJson("[1,2,3,4]"));
-        EXPECT_FALSE(p->setValueJson("[1,2]"));
-    }
-    {
-        auto p = std::make_shared<ParamArray>(std::make_shared<ParamUInt8>());
-        EXPECT_TRUE(p->setValueJson("[13,14,15]"));
-        EXPECT_EQ(hex(p->hashStruct()), "71494e9b6acbff3356f1292cc149101310110b6b13f835ae4665e4b00892fa83");
-    }
-    {
-        auto p = std::make_shared<ParamArray>(std::make_shared<ParamAddress>());
-        EXPECT_TRUE(p->setValueJson("[\"0x0000000000000000000000000000000123456789\"]"));
-        EXPECT_EQ(hex(p->hashStruct()), "c8243991757dc8723e4976248127e573da4a2cbfad54b776d5a7c8d92b6e2a6b");
-    }
-    {
-        auto p = std::make_shared<ParamArray>(std::make_shared<ParamBool>());
-        EXPECT_TRUE(p->setValueJson("[true,false,true]"));
-        EXPECT_EQ(hex(p->hashStruct()), "5c6090c0461491a2941743bda5c3658bf1ea53bbd3edcde54e16205e18b45792");
-    }
-}
-// clang-format on
-} // namespace TW::Ethereum::tests
diff --git a/tests/Ethereum/AbiTests.cpp b/tests/Ethereum/AbiTests.cpp
deleted file mode 100644
index 598fc454f86..00000000000
--- a/tests/Ethereum/AbiTests.cpp
+++ /dev/null
@@ -1,1646 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Ethereum/ABI.h"
-#include "HexCoding.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Ethereum::ABI::tests {
-
-///// Parameter types
-
-TEST(EthereumAbi, ParamTypeNames) {
-    EXPECT_EQ("uint8", ParamUInt8().getType());
-    EXPECT_EQ("uint16", ParamUInt16().getType());
-    EXPECT_EQ("uint32", ParamUInt32().getType());
-    EXPECT_EQ("uint64", ParamUInt64().getType());
-    EXPECT_EQ("uint256", ParamUInt256().getType());
-    EXPECT_EQ("uint168", ParamUIntN(168).getType());
-    EXPECT_EQ("int8", ParamInt8().getType());
-    EXPECT_EQ("int16", ParamInt16().getType());
-    EXPECT_EQ("int32", ParamInt32().getType());
-    EXPECT_EQ("int64", ParamInt64().getType());
-    EXPECT_EQ("int256", ParamInt256().getType());
-    EXPECT_EQ("int168", ParamIntN(168).getType());
-    EXPECT_EQ("bool", ParamBool().getType());
-    EXPECT_EQ("string", ParamString().getType());
-    EXPECT_EQ("address", ParamAddress().getType());
-    EXPECT_EQ("bytes", ParamByteArray().getType());
-    EXPECT_EQ("bytes168", ParamByteArrayFix(168).getType());
-    {
-        // ParamArray, non-empty
-        auto paramArray = ParamArray();
-        paramArray.addParam(std::make_shared<ParamBool>());
-        EXPECT_EQ("bool[]", paramArray.getType());
-    }
-    {
-        // ParamArray, empty with prototype
-        auto paramArray = ParamArray();
-        paramArray.setProto(std::make_shared<ParamBool>());
-        EXPECT_EQ("bool[]", paramArray.getType());
-    }
-    {
-        // ParamArray, empty, no prototype
-        auto paramArray = ParamArray();
-        EXPECT_EQ("__empty__[]", paramArray.getType());
-    }
-    EXPECT_EQ("()", ParamTuple().getType());
-}
-
-TEST(EthereumAbi, ParamBool) {
-    {
-        auto param = ParamBool(false);
-        EXPECT_FALSE(param.getVal());
-        param.setVal(true);
-        EXPECT_TRUE(param.getVal());
-
-        EXPECT_EQ("bool", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-    }
-    {
-        auto param = ParamBool(false);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000000", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_FALSE(param.getVal());
-    }
-    {
-        auto param = ParamBool(true);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000001", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_TRUE(param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamUInt8) {
-    {
-        auto param = ParamUInt8(101);
-        EXPECT_EQ(101, param.getVal());
-        param.setVal(1);
-        EXPECT_EQ(1, param.getVal());
-
-        EXPECT_EQ("uint8", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-    }
-    {
-        auto param = ParamUInt8(101);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000065", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(101, param.getVal());
-    }
-    {
-        auto param = ParamUInt8(1);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000001", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(1, param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamUInt16) {
-    {
-        auto param = ParamUInt16(101);
-        EXPECT_EQ(101, param.getVal());
-        param.setVal(1234);
-        EXPECT_EQ(1234, param.getVal());
-
-        EXPECT_EQ("uint16", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-    }
-    {
-        auto param = ParamUInt16(101);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000065", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(101, param.getVal());
-    }
-    {
-        auto param = ParamUInt16(1234);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("00000000000000000000000000000000000000000000000000000000000004d2", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(1234, param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamUInt32) {
-    {
-        auto param = ParamUInt32(101);
-        EXPECT_EQ(101ul, param.getVal());
-        param.setVal(1234);
-        EXPECT_EQ(1234ul, param.getVal());
-
-        EXPECT_EQ("uint32", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-    }
-    {
-        auto param = ParamUInt32(101);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000065", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(101ul, param.getVal());
-    }
-    {
-        auto param = ParamUInt32(1234);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("00000000000000000000000000000000000000000000000000000000000004d2", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(1234ul, param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamUInt64) {
-    {
-        auto param = ParamUInt64(101);
-        EXPECT_EQ(101ul, param.getVal());
-        param.setVal(1234);
-        EXPECT_EQ(1234ul, param.getVal());
-
-        EXPECT_EQ("uint64", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-    }
-    {
-        auto param = ParamUInt64(101);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000065", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(101ul, param.getVal());
-    }
-    {
-        auto param = ParamUInt64(1234);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("00000000000000000000000000000000000000000000000000000000000004d2", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(1234ul, param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamUInt256) {
-    const uint256_t bigInt = uint256_t("0x1234567890123456789012345678901234567890");
-    {
-        auto param = ParamUInt256(uint256_t(101));
-        EXPECT_EQ(uint256_t(101), param.getVal());
-        param.setVal(uint256_t(1234));
-        EXPECT_EQ(uint256_t(1234), param.getVal());
-
-        EXPECT_EQ("uint256", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-    }
-    {
-        auto param = ParamUInt256(uint256_t(101));
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000065", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(uint256_t(101), param.getVal());
-    }
-    {
-        auto param = ParamUInt256(uint256_t(1234));
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("00000000000000000000000000000000000000000000000000000000000004d2", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(uint256_t(1234), param.getVal());
-    }
-    {
-        auto param = ParamUInt256(bigInt);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000001234567890123456789012345678901234567890", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(bigInt, param.getVal());
-    }
-    {
-        auto param = ParamUInt256(uint256_t(-1));
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(uint256_t(-1), param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamUInt80) {
-    {
-        auto param = ParamUIntN(80, 0);
-        EXPECT_EQ(0, param.getVal());
-        param.setVal(100);
-        EXPECT_EQ(100, param.getVal());
-
-        EXPECT_EQ("uint80", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-
-        // above number of bits, masked
-        param.setVal(load(Data(parse_hex("1010101010101010101010101010101010101010101010101010101010101010"))));
-        EXPECT_EQ(load(Data(parse_hex("00000010101010101010101010"))), param.getVal());
-    }
-    {
-        auto param = ParamUIntN(80, 1);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000001", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(1, param.getVal());
-    }
-    {
-        auto param = ParamUIntN(80, 0x123);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000123", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(0x123, param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamInt80) {
-    // large negative, above number of bits, and its counterpart truncated to 80 bits
-    int256_t largeNeg2 = ValueEncoder::int256FromUint256(load(Data(parse_hex("ffff101010101010101010101010101010101010101010101010101010101010"))));
-    int256_t largeNeg1 = ValueEncoder::int256FromUint256(load(Data(parse_hex("ffffffffffffffffffffffffffffffffffffffffffff10101010101010101010"))));
-    {
-        auto param = ParamIntN(80, 0);
-        EXPECT_EQ(0, param.getVal());
-        param.setVal(int256_t(101));
-        EXPECT_EQ(int256_t(101), param.getVal());
-
-        EXPECT_EQ("int80", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-
-        param.setVal(int256_t(-101));
-        EXPECT_EQ(int256_t(-101), param.getVal());
-        param.setVal(largeNeg1);
-        EXPECT_EQ(largeNeg1, param.getVal());
-        // large negative, above number of bits, masked
-        param.setVal(largeNeg2);
-        EXPECT_EQ(largeNeg1, param.getVal());
-    }
-    {
-        auto param = ParamIntN(80, 1);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000001", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(1, param.getVal());
-    }
-    {
-        auto param = ParamIntN(80, int256_t(-1234));
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffb2e", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(int256_t(-1234), param.getVal());
-    }
-    {
-        auto param = ParamIntN(80, largeNeg1);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("ffffffffffffffffffffffffffffffffffffffffffff10101010101010101010", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(int256_t(largeNeg1), param.getVal());
-    }
-    {
-        auto param = ParamIntN(80, largeNeg2);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("ffffffffffffffffffffffffffffffffffffffffffff10101010101010101010", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(int256_t(largeNeg1), param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamString) {
-    const std::string helloStr = "Hello World!    Hello World!    Hello World!";
-    {
-        auto param = ParamString(helloStr);
-        EXPECT_EQ(helloStr, param.getVal());
-
-        EXPECT_EQ("string", param.getType());
-        EXPECT_TRUE(param.isDynamic());
-        EXPECT_EQ(3 * 32ul, param.getSize());
-    }
-    {
-        auto param = ParamString(helloStr);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ(
-            "000000000000000000000000000000000000000000000000000000000000002c"
-            "48656c6c6f20576f726c64212020202048656c6c6f20576f726c642120202020"
-            "48656c6c6f20576f726c64210000000000000000000000000000000000000000",
-            hex(encoded));
-        EXPECT_EQ(3 * 32ul, encoded.size());
-        EXPECT_EQ(3 * 32ul, param.getSize());
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(helloStr, param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamAddress) {
-    std::string val1Str("f784682c82526e245f50975190ef0fff4e4fc077");
-    Data val1(parse_hex(val1Str));
-    {
-        auto param = ParamAddress(val1);
-        EXPECT_EQ(val1, param.getData());
-
-        EXPECT_EQ("address", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-    }
-    {
-        auto param = ParamAddress(val1);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077", hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(val1, param.getData());
-    }
-    {
-        auto param = ParamAddress(parse_hex("0000000000000000000000000000000000000012"));
-        EXPECT_EQ("0000000000000000000000000000000000000012", hex(param.getData()));
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000012", hex(encoded));
-    }
-    {
-        auto param = ParamAddress(parse_hex("4300000000000000000000000000000000000000"));
-        EXPECT_EQ("4300000000000000000000000000000000000000", hex(param.getData()));
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000004300000000000000000000000000000000000000", hex(encoded));
-    }
-}
-
-TEST(EthereumAbi, ParamByteArray) {
-    Data data10 = parse_hex("31323334353637383930");
-    {
-        auto param = ParamByteArray(data10);
-        EXPECT_EQ(data10, param.getVal());
-
-        EXPECT_EQ("bytes", param.getType());
-        EXPECT_TRUE(param.isDynamic());
-        EXPECT_EQ(2 * 32ul, param.getSize());
-    }
-    {
-        auto param = ParamByteArray(data10);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ(2 * 32ul, encoded.size());
-        EXPECT_EQ(2 * 32ul, param.getSize());
-        EXPECT_EQ(
-            "000000000000000000000000000000000000000000000000000000000000000a"
-            "3132333435363738393000000000000000000000000000000000000000000000",
-            hex(encoded));
-        EXPECT_EQ(2 * 32ul, encoded.size());
-        EXPECT_EQ(2 * 32ul, param.getSize());
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(data10, param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamByteArrayFix) {
-    Data data10 = parse_hex("31323334353637383930");
-    {
-        auto param = ParamByteArrayFix(10, data10);
-        EXPECT_EQ(data10, param.getVal());
-
-        EXPECT_EQ("bytes10", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(32ul, param.getSize());
-    }
-    {
-        auto param = ParamByteArrayFix(10, data10);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ(32ul, encoded.size());
-        EXPECT_EQ(32ul, param.getSize());
-        EXPECT_EQ(
-            "3132333435363738393000000000000000000000000000000000000000000000",
-            hex(encoded));
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(data10, param.getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamArrayByte) {
-    {
-        auto param = ParamArray();
-        param.addParam(std::make_shared<ParamUInt8>(49));
-        param.addParam(std::make_shared<ParamUInt8>(50));
-        param.addParam(std::make_shared<ParamUInt8>(51));
-        EXPECT_EQ(3ul, param.getVal().size());
-        EXPECT_EQ(49, (std::dynamic_pointer_cast<ParamUInt8>(param.getVal()[0]))->getVal());
-        EXPECT_EQ(51, (std::dynamic_pointer_cast<ParamUInt8>(param.getVal()[2]))->getVal());
-
-        EXPECT_EQ("uint8[]", param.getType());
-        EXPECT_TRUE(param.isDynamic());
-        EXPECT_EQ((3 + 1) * 32ul, param.getSize());
-        EXPECT_EQ(3ul, param.getCount());
-    }
-    {
-        auto param = ParamArray();
-        param.addParam(std::make_shared<ParamUInt8>(49));
-        param.addParam(std::make_shared<ParamUInt8>(50));
-        param.addParam(std::make_shared<ParamUInt8>(51));
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ(4 * 32ul, encoded.size());
-        EXPECT_EQ(4 * 32ul, param.getSize());
-        EXPECT_EQ(
-            "0000000000000000000000000000000000000000000000000000000000000003"
-            "0000000000000000000000000000000000000000000000000000000000000031"
-            "0000000000000000000000000000000000000000000000000000000000000032"
-            "0000000000000000000000000000000000000000000000000000000000000033",
-            hex(encoded));
-        EXPECT_EQ(4 * 32ul, encoded.size());
-        EXPECT_EQ(4 * 32ul, param.getSize());
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(3ul, param.getVal().size());
-        EXPECT_EQ(49, (std::dynamic_pointer_cast<ParamUInt8>(param.getVal()[0]))->getVal());
-        EXPECT_EQ(51, (std::dynamic_pointer_cast<ParamUInt8>(param.getVal()[2]))->getVal());
-    }
-}
-
-TEST(EthereumAbi, ParamArrayEmpty) {
-    auto param = ParamArray();
-    param.setProto(std::make_shared<ParamUInt8>(0));
-
-    EXPECT_EQ(0ul, param.getCount());
-    Data encoded;
-    param.encode(encoded);
-    EXPECT_EQ(32ul, encoded.size());
-    EXPECT_EQ(32ul, param.getSize());
-    EXPECT_EQ(
-        "0000000000000000000000000000000000000000000000000000000000000000",
-        hex(encoded));
-    EXPECT_EQ("uint8[]", param.getType());
-    EXPECT_EQ("c5d2460186f7233c927e7db2dcc703c0e500b653ca82273b7bfad8045d85a470", hex(param.hashStruct()));
-}
-
-TEST(EthereumAbi, ParamFixedArrayAddress) {
-    {
-        auto param = ParamArrayFix({std::make_shared<ParamAddress>(Data(parse_hex("f784682c82526e245f50975190ef0fff4e4fc077")))});
-        EXPECT_EQ(param.getType(), "address[1]");
-        EXPECT_EQ(param.getCount(), 1ul);
-        EXPECT_EQ(param.getSize(), 32ul);
-        EXPECT_FALSE(param.isDynamic());
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ(hex(encoded), "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077");
-        std::size_t offset{0};
-        EXPECT_TRUE(param.decode(encoded, offset));
-    }
-    {
-        auto param = ParamArrayFix({std::make_shared<ParamAddress>(Data(parse_hex("f784682c82526e245f50975190ef0fff4e4fc077"))),
-                                    std::make_shared<ParamAddress>(Data(parse_hex("2e00cd222cb42b616d86d037cc494e8ab7f5c9a3")))});
-        EXPECT_EQ(param.getType(), "address[2]");
-        EXPECT_EQ(param.getCount(), 2ul);
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ(hex(encoded), "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc0770000000000000000000000002e00cd222cb42b616d86d037cc494e8ab7f5c9a3");
-        std::size_t offset{0};
-        EXPECT_TRUE(param.decode(encoded, offset));
-    }
-    {
-        // nullptr
-        EXPECT_THROW(ParamArrayFix({nullptr}), std::runtime_error);
-        // Should be the same type
-        EXPECT_THROW(
-            ParamArrayFix({std::make_shared<ParamAddress>(Data(parse_hex("f784682c82526e245f50975190ef0fff4e4fc077"))),
-                           std::make_shared<ParamString>("Foo")}),
-            std::runtime_error);
-    }
-}
-
-TEST(EthereumAbi, ParamArrayAddress) {
-    {
-        auto param = ParamArray();
-        param.addParam(std::make_shared<ParamAddress>(Data(parse_hex("f784682c82526e245f50975190ef0fff4e4fc077"))));
-        param.addParam(std::make_shared<ParamAddress>(Data(parse_hex("2e00cd222cb42b616d86d037cc494e8ab7f5c9a3"))));
-        EXPECT_EQ(2ul, param.getVal().size());
-
-        EXPECT_EQ("address[]", param.getType());
-        EXPECT_TRUE(param.isDynamic());
-        EXPECT_EQ((2 + 1) * 32ul, param.getSize());
-        EXPECT_EQ(2ul, param.getCount());
-    }
-    {
-        auto param = ParamArray();
-        param.addParam(std::make_shared<ParamAddress>(Data(parse_hex("f784682c82526e245f50975190ef0fff4e4fc077"))));
-        param.addParam(std::make_shared<ParamAddress>(Data(parse_hex("2e00cd222cb42b616d86d037cc494e8ab7f5c9a3"))));
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ(3 * 32ul, encoded.size());
-        EXPECT_EQ(3 * 32ul, param.getSize());
-        EXPECT_EQ(
-            "0000000000000000000000000000000000000000000000000000000000000002"
-            "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077"
-            "0000000000000000000000002e00cd222cb42b616d86d037cc494e8ab7f5c9a3",
-            hex(encoded));
-        EXPECT_EQ(3 * 32ul, encoded.size());
-        EXPECT_EQ(3 * 32ul, param.getSize());
-        size_t offset = 0;
-        EXPECT_TRUE(param.decode(encoded, offset));
-        EXPECT_EQ(2ul, param.getCount());
-        EXPECT_EQ(2ul, param.getVal().size());
-        EXPECT_EQ(
-            "2e00cd222cb42b616d86d037cc494e8ab7f5c9a3",
-            hex((std::dynamic_pointer_cast<ParamAddress>(param.getVal()[1]))->getData()));
-    }
-}
-
-TEST(EthereumAbi, ParamArrayOfByteArray) {
-    auto param = ParamArray();
-    param.addParam(std::make_shared<ParamByteArray>(parse_hex("1011")));
-    param.addParam(std::make_shared<ParamByteArray>(parse_hex("102222")));
-    param.addParam(std::make_shared<ParamByteArray>(parse_hex("10333333")));
-    EXPECT_EQ(3ul, param.getVal().size());
-
-    EXPECT_EQ("bytes[]", param.getType());
-    EXPECT_TRUE(param.isDynamic());
-    EXPECT_EQ((1 + 3 + 3 * 2) * 32ul, param.getSize());
-    EXPECT_EQ(3ul, param.getCount());
-}
-
-TEST(EthereumAbi, ParamArrayBytesContract) {
-    auto param = ParamArray();
-    param.addParam(std::make_shared<ParamByteArray>(parse_hex("0xd5fa2b00e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000047331175b23c2f067204b506ca1501c26731c990")));
-    param.addParam(std::make_shared<ParamByteArray>(parse_hex("0x304e6adee71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000")));
-    param.addParam(std::make_shared<ParamByteArray>(parse_hex("0x8b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001447331175b23c2f067204b506ca1501c26731c990000000000000000000000000")));
-    param.addParam(std::make_shared<ParamByteArray>(parse_hex("0x8b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000014d30f834b53d8f7e851e87b90ffa65757a35b8505000000000000000000000000")));
-    EXPECT_EQ(4ul, param.getCount());
-    EXPECT_EQ(4ul, param.getVal().size());
-
-    EXPECT_EQ("bytes[]", param.getType());
-    EXPECT_TRUE(param.isDynamic());
-
-    Data encoded;
-    param.encode(encoded);
-    EXPECT_EQ(896ul, encoded.size());
-
-    EXPECT_EQ(896ul, param.getSize());
-}
-
-TEST(EthereumAbi, ParamTupleStatic) {
-    {
-        auto param = ParamTuple();
-        param.addParam(std::make_shared<ParamBool>(true));
-        param.addParam(std::make_shared<ParamUInt64>(123));
-        EXPECT_EQ("(bool,uint64)", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(2ul, param.getCount());
-        EXPECT_EQ(64ul, param.getSize());
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000007b", hex(encoded));
-        { // decode
-            size_t offset = 0;
-            auto param2 = ParamTuple();
-            param2.addParam(std::make_shared<ParamBool>());
-            param2.addParam(std::make_shared<ParamUInt64>());
-            EXPECT_TRUE(param2.decode(encoded, offset));
-            EXPECT_EQ(2ul, param2.getCount());
-            Data encoded2;
-            param2.encode(encoded2);
-            EXPECT_EQ("0000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000007b", hex(encoded));
-        }
-    }
-    {
-        auto param = ParamTuple();
-        param.addParam(std::make_shared<ParamUInt64>(456));
-        param.addParam(std::make_shared<ParamAddress>(parse_hex("000102030405060708090a0b0c0d0e0f10111213")));
-        EXPECT_EQ("(uint64,address)", param.getType());
-        EXPECT_FALSE(param.isDynamic());
-        EXPECT_EQ(2ul, param.getCount());
-        EXPECT_EQ(64ul, param.getSize());
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ("00000000000000000000000000000000000000000000000000000000000001c8000000000000000000000000000102030405060708090a0b0c0d0e0f10111213", hex(encoded));
-    }
-}
-
-TEST(EthereumAbi, ParamTupleDynamic) {
-    {
-        auto param = ParamTuple();
-        param.addParam(std::make_shared<ParamString>("Don't trust, verify!"));
-        param.addParam(std::make_shared<ParamUInt64>(13));
-        param.addParam(std::make_shared<ParamByteArray>(parse_hex("00010203040506070809")));
-        EXPECT_EQ("(string,uint64,bytes)", param.getType());
-        EXPECT_TRUE(param.isDynamic());
-        EXPECT_EQ(3ul, param.getCount());
-        EXPECT_EQ(7 * 32ul, param.getSize());
-        Data encoded;
-        param.encode(encoded);
-        EXPECT_EQ(
-            "0000000000000000000000000000000000000000000000000000000000000060" // offet 3*32
-            "000000000000000000000000000000000000000000000000000000000000000d"
-            "00000000000000000000000000000000000000000000000000000000000000a0" // offet 5*32
-            "0000000000000000000000000000000000000000000000000000000000000014" // len
-            "446f6e27742074727573742c2076657269667921000000000000000000000000"
-            "000000000000000000000000000000000000000000000000000000000000000a" // len
-            "0001020304050607080900000000000000000000000000000000000000000000",
-            hex(encoded));
-    }
-}
-
-///// Direct encode & decode
-
-TEST(EthereumAbi, EncodeVectorByte10) {
-    auto p = ParamByteArrayFix(10, parse_hex("31323334353637383930"));
-    EXPECT_EQ("bytes10", p.getType());
-    Data encoded;
-    p.encode(encoded);
-    EXPECT_EQ("3132333435363738393000000000000000000000000000000000000000000000", hex(encoded));
-}
-
-TEST(EthereumAbi, EncodeVectorByte) {
-    auto p = ParamByteArray(parse_hex("31323334353637383930"));
-    EXPECT_EQ("bytes", p.getType());
-    Data encoded;
-    p.encode(encoded);
-    EXPECT_EQ(
-        "000000000000000000000000000000000000000000000000000000000000000a"
-        "3132333435363738393000000000000000000000000000000000000000000000",
-        hex(encoded));
-}
-
-TEST(EthereumAbi, EncodeArrayByte) {
-    auto p = ParamArray(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamByteArray>(parse_hex("1011")),
-        std::make_shared<ParamByteArray>(parse_hex("102222"))});
-    EXPECT_EQ("bytes[]", p.getType());
-    Data encoded;
-    p.encode(encoded);
-    EXPECT_EQ(
-        "0000000000000000000000000000000000000000000000000000000000000002"
-        "0000000000000000000000000000000000000000000000000000000000000040"
-        "0000000000000000000000000000000000000000000000000000000000000080"
-        "0000000000000000000000000000000000000000000000000000000000000002"
-        "1011000000000000000000000000000000000000000000000000000000000000"
-        "0000000000000000000000000000000000000000000000000000000000000003"
-        "1022220000000000000000000000000000000000000000000000000000000000",
-        hex(encoded));
-    EXPECT_EQ((1 + 2 + 2 * 2) * 32ul, encoded.size());
-    EXPECT_EQ((1 + 2 + 2 * 2) * 32ul, p.getSize());
-}
-
-TEST(EthereumAbi, DecodeUInt) {
-    Data encoded = parse_hex("000000000000000000000000000000000000000000000000000000000000002a");
-    size_t offset = 0;
-    uint256_t decoded;
-    bool res = ParamNumberType<uint256_t>::decodeNumber(encoded, decoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(uint256_t(42), decoded);
-    EXPECT_EQ(32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeUInt8) {
-    Data encoded = parse_hex("0000000000000000000000000000000000000000000000000000000000000018");
-    size_t offset = 0;
-    uint8_t decoded;
-    bool res = ParamNumberType<uint8_t>::decodeNumber(encoded, decoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(24, decoded);
-    EXPECT_EQ(32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeUInt8WithOffset) {
-    Data encoded = parse_hex("abcdef0000000000000000000000000000000000000000000000000000000000000018");
-    size_t offset = 3;
-    uint8_t decoded;
-    bool res = ParamNumberType<uint8_t>::decodeNumber(encoded, decoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(24, decoded);
-    EXPECT_EQ(3 + 32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeUIntWithOffset) {
-    Data encoded = parse_hex("abcdef000000000000000000000000000000000000000000000000000000000000002a");
-    size_t offset = 3;
-    uint256_t decoded;
-    bool res = decode(encoded, decoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(uint256_t(42), decoded);
-    EXPECT_EQ(3 + 32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeUIntErrorTooShort) {
-    Data encoded = parse_hex("000000000000000000000000000000000000000000000000002a");
-    size_t offset = 0;
-    uint256_t decoded;
-    bool res = decode(encoded, decoded, offset);
-    EXPECT_FALSE(res);
-    EXPECT_EQ(uint256_t(0), decoded);
-    EXPECT_EQ(0ul, offset);
-}
-
-TEST(EthereumAbi, DecodeArrayUint) {
-    Data encoded;
-    append(encoded, parse_hex("000000000000000000000000000000000000000000000000000000000000000a"));
-    append(encoded, parse_hex("3132333435363738393000000000000000000000000000000000000000000000"));
-    size_t offset = 0;
-    std::vector<byte> decoded;
-    bool res = ParamByteArray::decodeBytes(encoded, decoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(10ul, decoded.size());
-    if (decoded.size() >= 2) {
-        EXPECT_EQ(49u, decoded[0]);
-        EXPECT_EQ(50u, decoded[1]);
-    }
-    EXPECT_EQ(32 + 32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeArrayTooShort) {
-    Data encoded;
-    append(encoded, parse_hex("000000000000000000000000000000000000000000000000000000000000000a"));
-    append(encoded, parse_hex("313233343536373839"));
-    size_t offset = 0;
-    std::vector<byte> decoded;
-    bool res = ParamByteArray::decodeBytes(encoded, decoded, offset);
-    EXPECT_FALSE(res);
-}
-
-TEST(EthereumAbi, DecodeArrayInvalidLen) {
-    Data encoded = parse_hex("0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef");
-    size_t offset = 0;
-    std::vector<byte> decoded;
-    bool res = ParamByteArray::decodeBytes(encoded, decoded, offset);
-    EXPECT_FALSE(res);
-}
-
-TEST(EthereumAbi, DecodeByteArray) {
-    Data encoded;
-    append(encoded, parse_hex("000000000000000000000000000000000000000000000000000000000000000a"));
-    append(encoded, parse_hex("3132333435363738393000000000000000000000000000000000000000000000"));
-    size_t offset = 0;
-    Data decoded;
-    bool res = ParamByteArray::decodeBytes(encoded, decoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ("31323334353637383930", hex(decoded));
-    EXPECT_EQ(32 + 32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeByteArray10) {
-    Data encoded = parse_hex("3132333435363738393000000000000000000000000000000000000000000000");
-    size_t offset = 0;
-    Data decoded;
-    bool res = ParamByteArrayFix::decodeBytesFix(encoded, 10, decoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(10ul, decoded.size());
-    EXPECT_EQ(49u, decoded[0]);
-    EXPECT_EQ(50u, decoded[1]);
-    EXPECT_EQ(32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeArrayOfByteArray) {
-    Data encoded = parse_hex(
-        "0000000000000000000000000000000000000000000000000000000000000002"
-        "0000000000000000000000000000000000000000000000000000000000000040"
-        "0000000000000000000000000000000000000000000000000000000000000080"
-        "0000000000000000000000000000000000000000000000000000000000000002"
-        "1011000000000000000000000000000000000000000000000000000000000000"
-        "0000000000000000000000000000000000000000000000000000000000000003"
-        "1022200000000000000000000000000000000000000000000000000000000000");
-    size_t offset = 0;
-    Data decoded;
-    auto param = ParamArray();
-    param.addParam(std::make_shared<ParamByteArray>(Data()));
-    param.addParam(std::make_shared<ParamByteArray>(Data()));
-    bool res = param.decode(encoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(2ul, param.getCount());
-    EXPECT_EQ(7 * 32ul, offset);
-    EXPECT_EQ(2ul, param.getVal().size());
-}
-
-///// Parameters encode & decode
-
-TEST(EthereumAbi, EncodeParamsSimple) {
-    auto p = Parameters(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(16u),
-        std::make_shared<ParamUInt256>(17u),
-        std::make_shared<ParamBool>(true)});
-    EXPECT_EQ("(uint256,uint256,bool)", p.getType());
-    Data encoded;
-    p.encode(encoded);
-
-    EXPECT_EQ(3 * 32ul, encoded.size());
-    EXPECT_EQ(3 * 32ul, p.getSize());
-    EXPECT_EQ(
-        "0000000000000000000000000000000000000000000000000000000000000010"
-        "0000000000000000000000000000000000000000000000000000000000000011"
-        "0000000000000000000000000000000000000000000000000000000000000001",
-        hex(encoded));
-}
-
-TEST(EthereumAbi, EncodeParamsMixed) {
-    auto p = Parameters(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(69u),
-        std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-            std::make_shared<ParamUInt256>(1),
-            std::make_shared<ParamUInt256>(2),
-            std::make_shared<ParamUInt256>(3)}),
-        std::make_shared<ParamBool>(true),
-        std::make_shared<ParamString>("Hello"),
-        std::make_shared<ParamByteArray>(Data{0x64, 0x61, 0x76, 0x65})});
-    EXPECT_EQ("(uint256,uint256[],bool,string,bytes)", p.getType());
-    Data encoded;
-    p.encode(encoded);
-
-    EXPECT_EQ(13 * 32ul, encoded.size());
-    EXPECT_EQ(13 * 32ul, p.getSize());
-    EXPECT_EQ(
-        "0000000000000000000000000000000000000000000000000000000000000045"
-        "00000000000000000000000000000000000000000000000000000000000000a0"
-        "0000000000000000000000000000000000000000000000000000000000000001"
-        "0000000000000000000000000000000000000000000000000000000000000120"
-        "0000000000000000000000000000000000000000000000000000000000000160"
-        "0000000000000000000000000000000000000000000000000000000000000003"
-        "0000000000000000000000000000000000000000000000000000000000000001"
-        "0000000000000000000000000000000000000000000000000000000000000002"
-        "0000000000000000000000000000000000000000000000000000000000000003"
-        "0000000000000000000000000000000000000000000000000000000000000005"
-        "48656c6c6f000000000000000000000000000000000000000000000000000000"
-        "0000000000000000000000000000000000000000000000000000000000000004"
-        "6461766500000000000000000000000000000000000000000000000000000000",
-        hex(encoded));
-    /*
-     * explained:
-     * uint256 69u
-     * idx of dynamic vector, 5*32
-     * true
-     * index of dynamic string, 9*32
-     * index of dynamic data, 11*32
-     * vector size 3
-     * vector val1
-     * vector val2
-     * vector val3
-     * string size 5
-     * string
-     * data size 4
-     * data
-     */
-}
-
-TEST(EthereumAbi, DecodeParamsSimple) {
-    Data encoded;
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000010"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000011"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000001"));
-    auto p = Parameters(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(0),
-        std::make_shared<ParamUInt256>(0),
-        std::make_shared<ParamBool>(false)});
-    EXPECT_EQ("(uint256,uint256,bool)", p.getType());
-    size_t offset = 0;
-    bool res = p.decode(encoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(uint256_t(16u), (std::dynamic_pointer_cast<ParamUInt256>(p.getParam(0)))->getVal());
-    EXPECT_EQ(uint256_t(17u), (std::dynamic_pointer_cast<ParamUInt256>(p.getParam(1)))->getVal());
-    EXPECT_EQ(true, (std::dynamic_pointer_cast<ParamBool>(p.getParam(2)))->getVal());
-    EXPECT_EQ(3 * 32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeParamsMixed) {
-    Data encoded;
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000045"));
-    append(encoded, parse_hex("00000000000000000000000000000000000000000000000000000000000000a0"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000001"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000120"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000160"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000003"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000001"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000002"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000003"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000005"));
-    append(encoded, parse_hex("48656c6c6f000000000000000000000000000000000000000000000000000000"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000004"));
-    append(encoded, parse_hex("6461766500000000000000000000000000000000000000000000000000000000"));
-    // clang-format off
-    auto p = Parameters(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(),
-        std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-            std::make_shared<ParamUInt256>(),
-            std::make_shared<ParamUInt256>(),
-            std::make_shared<ParamUInt256>()
-        }),
-        std::make_shared<ParamBool>(),
-        std::make_shared<ParamString>(),
-        std::make_shared<ParamByteArray>()
-    });
-    // clang-format on
-    EXPECT_EQ("(uint256,uint256[],bool,string,bytes)", p.getType());
-    size_t offset = 0;
-    bool res = p.decode(encoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(uint256_t(69u), (std::dynamic_pointer_cast<ParamUInt256>(p.getParam(0)))->getVal());
-    EXPECT_EQ(3ul, (std::dynamic_pointer_cast<ParamArray>(p.getParam(1)))->getCount());
-    EXPECT_EQ(1, (std::dynamic_pointer_cast<ParamUInt256>((std::dynamic_pointer_cast<ParamArray>(p.getParam(1)))->getParam(0)))->getVal());
-    EXPECT_EQ(3, (std::dynamic_pointer_cast<ParamUInt256>((std::dynamic_pointer_cast<ParamArray>(p.getParam(1)))->getParam(2)))->getVal());
-    EXPECT_EQ(true, (std::dynamic_pointer_cast<ParamBool>(p.getParam(2)))->getVal());
-    EXPECT_EQ("Hello", (std::dynamic_pointer_cast<ParamString>(p.getParam(3)))->getVal());
-    EXPECT_EQ(13 * 32ul, offset);
-}
-
-///// Function encode & decode
-
-TEST(EthereumAbi, EncodeSignature) {
-    // clang-format off
-    auto func = Function("baz", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(69u),
-        std::make_shared<ParamBool>(true)
-    });
-    // clang-format on
-    EXPECT_EQ("baz(uint256,bool)", func.getType());
-    Data encoded;
-    func.encode(encoded);
-
-    EXPECT_EQ(encoded.size(), 32 * 2 + 4ul);
-    EXPECT_EQ(hex(encoded.begin(), encoded.begin() + 4), "72ed38b6");
-    EXPECT_EQ(hex(encoded.begin() + 4, encoded.begin() + 36), "0000000000000000000000000000000000000000000000000000000000000045");
-    EXPECT_EQ(hex(encoded.begin() + 36, encoded.begin() + 68), "0000000000000000000000000000000000000000000000000000000000000001");
-}
-
-TEST(EthereumAbi, EncodeFunctionWithDynamicArgumentsCase1) {
-    // clang-format off
-    auto func = Function("sam", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamByteArray>(Data{0x64, 0x61, 0x76, 0x65}),
-        std::make_shared<ParamBool>(true),
-        std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-            std::make_shared<ParamUInt256>(1),
-            std::make_shared<ParamUInt256>(2),
-            std::make_shared<ParamUInt256>(3)
-        })
-    });
-    // clang-format on
-    EXPECT_EQ("sam(bytes,bool,uint256[])", func.getType());
-    Data encoded;
-    func.encode(encoded);
-
-    EXPECT_EQ(encoded.size(), 32 * 9 + 4ul);
-    EXPECT_EQ(hex(encoded.begin() + 0, encoded.begin() + 4), "a5643bf2");
-    EXPECT_EQ(hex(encoded.begin() + 4, encoded.begin() + 36), "0000000000000000000000000000000000000000000000000000000000000060");
-    EXPECT_EQ(hex(encoded.begin() + 36, encoded.begin() + 68), "0000000000000000000000000000000000000000000000000000000000000001");
-    EXPECT_EQ(hex(encoded.begin() + 68, encoded.begin() + 100), "00000000000000000000000000000000000000000000000000000000000000a0");
-    EXPECT_EQ(hex(encoded.begin() + 100, encoded.begin() + 132), "0000000000000000000000000000000000000000000000000000000000000004");
-    EXPECT_EQ(hex(encoded.begin() + 132, encoded.begin() + 164), "6461766500000000000000000000000000000000000000000000000000000000");
-    EXPECT_EQ(hex(encoded.begin() + 164, encoded.begin() + 196), "0000000000000000000000000000000000000000000000000000000000000003");
-    EXPECT_EQ(hex(encoded.begin() + 196, encoded.begin() + 228), "0000000000000000000000000000000000000000000000000000000000000001");
-    EXPECT_EQ(hex(encoded.begin() + 228, encoded.begin() + 260), "0000000000000000000000000000000000000000000000000000000000000002");
-    EXPECT_EQ(hex(encoded.begin() + 260, encoded.begin() + 292), "0000000000000000000000000000000000000000000000000000000000000003");
-}
-
-TEST(EthereumAbi, EncodeFunctionWithDynamicArgumentsCase2) {
-    // clang-format off
-    auto func = Function("f", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(0x123),
-        std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-            std::make_shared<ParamUInt32>(0x456),
-            std::make_shared<ParamUInt32>(0x789)}),
-        std::make_shared<ParamByteArrayFix>(10, std::vector<byte>{0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30}),
-        std::make_shared<ParamString>("Hello, world!")
-    });
-    // clamp-format on
-    EXPECT_EQ("f(uint256,uint32[],bytes10,string)", func.getType());
-    Data encoded;
-    func.encode(encoded);
-
-    EXPECT_EQ(encoded.size(), 32 * 9 + 4ul);
-    EXPECT_EQ(hex(encoded.begin() + 0, encoded.begin() + 4), "47b941bf");
-    EXPECT_EQ(hex(encoded.begin() + 4, encoded.begin() + 36), "0000000000000000000000000000000000000000000000000000000000000123");
-    EXPECT_EQ(hex(encoded.begin() + 36, encoded.begin() + 68), "0000000000000000000000000000000000000000000000000000000000000080");
-    EXPECT_EQ(hex(encoded.begin() + 68, encoded.begin() + 100), "3132333435363738393000000000000000000000000000000000000000000000");
-    EXPECT_EQ(hex(encoded.begin() + 100, encoded.begin() + 132), "00000000000000000000000000000000000000000000000000000000000000e0");
-    EXPECT_EQ(hex(encoded.begin() + 132, encoded.begin() + 164), "0000000000000000000000000000000000000000000000000000000000000002");
-    EXPECT_EQ(hex(encoded.begin() + 164, encoded.begin() + 196), "0000000000000000000000000000000000000000000000000000000000000456");
-    EXPECT_EQ(hex(encoded.begin() + 196, encoded.begin() + 228), "0000000000000000000000000000000000000000000000000000000000000789");
-    EXPECT_EQ(hex(encoded.begin() + 228, encoded.begin() + 260), "000000000000000000000000000000000000000000000000000000000000000d");
-    EXPECT_EQ(hex(encoded.begin() + 260, encoded.begin() + 292), "48656c6c6f2c20776f726c642100000000000000000000000000000000000000");
-}
-
-TEST(EthereumAbi, DecodeFunctionOutputCase1) {
-    Data encoded;
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000045"));
-
-    // clang-format off
-    auto func = Function("readout", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamAddress>(parse_hex("f784682c82526e245f50975190ef0fff4e4fc077")),
-        std::make_shared<ParamUInt64>(1000)
-    });
-    // clang-format on
-    func.addOutParam(std::make_shared<ParamUInt64>());
-    EXPECT_EQ("readout(address,uint64)", func.getType());
-
-    // original output value
-    std::shared_ptr<ParamBase> param;
-    EXPECT_TRUE(func.getOutParam(0, param));
-    EXPECT_EQ(0ul, (std::dynamic_pointer_cast<ParamUInt64>(param))->getVal());
-
-    size_t offset = 0;
-    bool res = func.decodeOutput(encoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(32ul, offset);
-
-    // new output value
-    EXPECT_EQ(0x45ul, (std::dynamic_pointer_cast<ParamUInt64>(param))->getVal());
-}
-
-TEST(EthereumAbi, DecodeFunctionOutputCase2) {
-    // clang-format off
-    auto func = Function("getAmountsOut", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(100),
-        std::make_shared<ParamArray>(std::make_shared<ParamAddress>(parse_hex("000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077")))
-    });
-    // clang-format on
-    func.addOutParam(std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(66),
-        std::make_shared<ParamUInt256>(67)}));
-    EXPECT_EQ("getAmountsOut(uint256,address[])", func.getType());
-
-    Data encoded;
-    append(encoded, parse_hex(
-                        "0000000000000000000000000000000000000000000000000000000000000020"
-                        "0000000000000000000000000000000000000000000000000000000000000002"
-                        "0000000000000000000000000000000000000000000000000000000000000004"
-                        "0000000000000000000000000000000000000000000000000000000000000005"));
-    size_t offset = 0;
-    bool res = func.decodeOutput(encoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(128ul, offset);
-
-    // new output values
-    std::shared_ptr<ParamBase> param;
-    EXPECT_TRUE(func.getOutParam(0, param));
-    EXPECT_EQ(2ul, (std::dynamic_pointer_cast<ParamArray>(param))->getCount());
-    EXPECT_EQ(4, (std::dynamic_pointer_cast<ParamUInt256>((std::dynamic_pointer_cast<ParamArray>(param))->getParam(0)))->getVal());
-    EXPECT_EQ(5, (std::dynamic_pointer_cast<ParamUInt256>((std::dynamic_pointer_cast<ParamArray>(param))->getParam(1)))->getVal());
-}
-
-TEST(EthereumAbi, DecodeInputSignature) {
-    Data encoded;
-    append(encoded, parse_hex("72ed38b6"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000045"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000001"));
-    // clang-format off
-    auto func = Function("baz", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(), std::make_shared<ParamBool>()
-    });
-    // clang-format on
-    EXPECT_EQ("baz(uint256,bool)", func.getType());
-    size_t offset = 0;
-    bool res = func.decodeInput(encoded, offset);
-    EXPECT_TRUE(res);
-    std::shared_ptr<ParamBase> param;
-    EXPECT_TRUE(func.getInParam(0, param));
-    EXPECT_EQ(69u, (std::dynamic_pointer_cast<ParamUInt256>(param))->getVal());
-    EXPECT_TRUE(func.getInParam(1, param));
-    EXPECT_EQ(true, (std::dynamic_pointer_cast<ParamBool>(param))->getVal());
-    EXPECT_EQ(4 + 2 * 32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeFunctionInputWithDynamicArgumentsCase1) {
-    Data encoded;
-    append(encoded, parse_hex("a5643bf2"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000060"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000001"));
-    append(encoded, parse_hex("00000000000000000000000000000000000000000000000000000000000000a0"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000004"));
-    append(encoded, parse_hex("6461766500000000000000000000000000000000000000000000000000000000"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000003"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000001"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000002"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000003"));
-
-    // clang-format off
-    auto func = Function("sam", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamByteArray>(Data{0x64, 0x61, 0x76, 0x65}),
-        std::make_shared<ParamBool>(true),
-        std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-            std::make_shared<ParamUInt256>(1),
-            std::make_shared<ParamUInt256>(2),
-            std::make_shared<ParamUInt256>(3)
-        })
-    });
-    // clang-format on
-    EXPECT_EQ("sam(bytes,bool,uint256[])", func.getType());
-
-    size_t offset = 0;
-    bool res = func.decodeInput(encoded, offset);
-    EXPECT_TRUE(res);
-    std::shared_ptr<ParamBase> param;
-    EXPECT_TRUE(func.getInParam(0, param));
-    EXPECT_EQ(4ul, (std::dynamic_pointer_cast<ParamByteArray>(param))->getCount());
-    EXPECT_EQ(0x64, (std::dynamic_pointer_cast<ParamByteArray>(param))->getVal()[0]);
-    EXPECT_EQ(0x65, (std::dynamic_pointer_cast<ParamByteArray>(param))->getVal()[3]);
-    EXPECT_TRUE(func.getInParam(1, param));
-    EXPECT_EQ(true, (std::dynamic_pointer_cast<ParamBool>(param))->getVal());
-    EXPECT_TRUE(func.getInParam(2, param));
-    EXPECT_EQ(3ul, (std::dynamic_pointer_cast<ParamArray>(param))->getCount());
-    EXPECT_EQ(uint256_t(1), (std::dynamic_pointer_cast<ParamUInt256>((std::dynamic_pointer_cast<ParamArray>(param))->getVal()[0]))->getVal());
-    EXPECT_EQ(uint256_t(3), (std::dynamic_pointer_cast<ParamUInt256>((std::dynamic_pointer_cast<ParamArray>(param))->getVal()[2]))->getVal());
-    EXPECT_EQ(4 + 9 * 32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeFunctionInputWithDynamicArgumentsCase2) {
-    Data encoded;
-    append(encoded, parse_hex("47b941bf"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000123"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000080"));
-    append(encoded, parse_hex("3132333435363738393000000000000000000000000000000000000000000000"));
-    append(encoded, parse_hex("00000000000000000000000000000000000000000000000000000000000000e0"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000002"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000456"));
-    append(encoded, parse_hex("0000000000000000000000000000000000000000000000000000000000000789"));
-    append(encoded, parse_hex("000000000000000000000000000000000000000000000000000000000000000d"));
-    append(encoded, parse_hex("48656c6c6f2c20776f726c642100000000000000000000000000000000000000"));
-
-    // clang-format off
-    auto func = Function("f", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(0x123),
-        std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-            std::make_shared<ParamUInt32>(0x456),
-            std::make_shared<ParamUInt32>(0x789)}),
-        std::make_shared<ParamByteArrayFix>(10, std::vector<byte>{0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, 0x30}),
-        std::make_shared<ParamString>("Hello, world!")
-    });
-    // clang-format on
-    EXPECT_EQ("f(uint256,uint32[],bytes10,string)", func.getType());
-
-    size_t offset = 0;
-    bool res = func.decodeInput(encoded, offset);
-    EXPECT_TRUE(res);
-    std::shared_ptr<ParamBase> param;
-    EXPECT_TRUE(func.getInParam(0, param));
-    EXPECT_EQ(uint256_t(0x123), (std::dynamic_pointer_cast<ParamUInt256>(param))->getVal());
-    EXPECT_TRUE(func.getInParam(1, param));
-    EXPECT_EQ(2ul, (std::dynamic_pointer_cast<ParamArray>(param))->getCount());
-    EXPECT_EQ(0x456ul, (std::dynamic_pointer_cast<ParamUInt32>((std::dynamic_pointer_cast<ParamArray>(param))->getVal()[0]))->getVal());
-    EXPECT_EQ(0x789ul, (std::dynamic_pointer_cast<ParamUInt32>((std::dynamic_pointer_cast<ParamArray>(param))->getVal()[1]))->getVal());
-    EXPECT_TRUE(func.getInParam(2, param));
-    EXPECT_EQ(10ul, (std::dynamic_pointer_cast<ParamByteArrayFix>(param))->getCount());
-    EXPECT_EQ("31323334353637383930", hex((std::dynamic_pointer_cast<ParamByteArrayFix>(param))->getVal()));
-    EXPECT_TRUE(func.getInParam(3, param));
-    EXPECT_EQ(std::string("Hello, world!"), (std::dynamic_pointer_cast<ParamString>(param))->getVal());
-    EXPECT_EQ(4 + 9 * 32ul, offset);
-}
-
-TEST(EthereumAbi, DecodeFunctionContractMulticall) {
-    Data encoded = parse_hex(
-        "0xac9650d800000000000000000000000000000000000000000000000000000000000000200000000000000000"
-        "000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000"
-        "000000000000000000008000000000000000000000000000000000000000000000000000000000000001000000"
-        "0000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000"
-        "000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000"
-        "00000044d5fa2b00e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f0000000000"
-        "0000000000000047331175b23c2f067204b506ca1501c26731c990000000000000000000000000000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000000000000000000064304e6a"
-        "dee71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f000000000000000000000000"
-        "000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-        "000000000000000000000000000000000000000000a48b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e"
-        "574c32a17a67156fa9ed3c4c6f000000000000000000000000000000000000000000000000000000000000003c"
-        "000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000"
-        "0000000000000000000000000000000000001447331175b23c2f067204b506ca1501c26731c990000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-        "0000000000000000000000000000000000000000a48b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e57"
-        "4c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000002ca00"
-        "000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000"
-        "000000000000000000000000000000000014d30f834b53d8f7e851e87b90ffa65757a35b850500000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000");
-    ASSERT_EQ(4 + 928ul, encoded.size());
-
-    // clang-format off
-    auto func = Function("multicall", std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamArray>(std::vector<std::shared_ptr<ParamBase>>{
-            std::make_shared<ParamByteArray>(Data()),
-            std::make_shared<ParamByteArray>(Data()),
-            std::make_shared<ParamByteArray>(Data()),
-            std::make_shared<ParamByteArray>(Data())
-        }),
-    });
-    // clang-format on
-    EXPECT_EQ("multicall(bytes[])", func.getType());
-
-    size_t offset = 0;
-    bool res = func.decodeInput(encoded, offset);
-    EXPECT_TRUE(res);
-    EXPECT_EQ(4 + 29 * 32ul, offset);
-}
-
-TEST(EthereumAbi, ParamFactoryMake) {
-    {
-        // test for UInt256: ParamUInt256 and ParamUIntN(256), both have type "uint256", factory produces the more specific ParamUInt256
-        // there was confusion about this
-        std::shared_ptr<ParamBase> p = ParamFactory::make("uint256");
-        EXPECT_EQ("uint256", p->getType());
-        EXPECT_TRUE(nullptr != std::dynamic_pointer_cast<ParamUInt256>(p).get());
-        EXPECT_EQ(nullptr, std::dynamic_pointer_cast<ParamUIntN>(p).get());
-    }
-    {
-        // int32 is ParamInt32, not ParamIntN
-        std::shared_ptr<ParamBase> p = ParamFactory::make("int32");
-        EXPECT_EQ("int32", p->getType());
-        EXPECT_TRUE(nullptr != std::dynamic_pointer_cast<ParamInt32>(p).get());
-        EXPECT_EQ(nullptr, std::dynamic_pointer_cast<ParamIntN>(p).get());
-    }
-    {
-        // int168 is ParamIntN
-        std::shared_ptr<ParamBase> p = ParamFactory::make("int168");
-        EXPECT_EQ("int168", p->getType());
-        EXPECT_TRUE(nullptr != std::dynamic_pointer_cast<ParamIntN>(p).get());
-    }
-    {
-        // uint is uint256
-        std::shared_ptr<ParamBase> p = ParamFactory::make("uint");
-        EXPECT_EQ("uint256", p->getType());
-        EXPECT_TRUE(nullptr != std::dynamic_pointer_cast<ParamUInt256>(p).get());
-    }
-    {
-        // int is int256
-        std::shared_ptr<ParamBase> p = ParamFactory::make("int");
-        EXPECT_EQ("int256", p->getType());
-        EXPECT_TRUE(nullptr != std::dynamic_pointer_cast<ParamInt256>(p).get());
-    }
-    {
-        std::shared_ptr<ParamBase> p = ParamFactory::make("uint8[]");
-        EXPECT_EQ("uint8[]", p->getType());
-        EXPECT_TRUE(nullptr != std::dynamic_pointer_cast<ParamArray>(p).get());
-        auto elemParam = std::dynamic_pointer_cast<ParamArray>(p)->getParam(0);
-        EXPECT_TRUE(nullptr != elemParam.get());
-    }
-    {
-        std::shared_ptr<ParamBase> p = ParamFactory::make("address[]");
-        EXPECT_EQ("address[]", p->getType());
-        EXPECT_TRUE(nullptr != std::dynamic_pointer_cast<ParamArray>(p).get());
-        auto elemParam = std::dynamic_pointer_cast<ParamArray>(p)->getParam(0);
-        EXPECT_TRUE(nullptr != elemParam.get());
-    }
-    {
-        std::shared_ptr<ParamBase> p = ParamFactory::make("bytes[]");
-        EXPECT_EQ("bytes[]", p->getType());
-        EXPECT_TRUE(nullptr != std::dynamic_pointer_cast<ParamArray>(p).get());
-        auto elemParam = std::dynamic_pointer_cast<ParamArray>(p)->getParam(0);
-        EXPECT_TRUE(nullptr != elemParam.get());
-    }
-}
-
-TEST(EthereumAbi, ParamFactoryMakeException) {
-    EXPECT_EXCEPTION(ParamFactory::make("uint93"), "invalid bit size");
-}
-
-TEST(EthereumAbi, ParamFactoryGetArrayValue) {
-    {
-        auto pArray = std::make_shared<ParamArray>(std::make_shared<ParamUInt8>());
-        const auto vals = ParamFactory::getArrayValue(pArray, pArray->getType());
-        ASSERT_EQ(vals.size(), 1ul);
-        EXPECT_EQ(vals[0], "0");
-    }
-    { // wrong type, not array
-        auto pArray = std::make_shared<ParamArray>(std::make_shared<ParamUInt8>());
-        const auto vals = ParamFactory::getArrayValue(pArray, "bool");
-        EXPECT_EQ(vals.size(), 0ul);
-    }
-    { // wrong param, not array
-        auto pArray = std::make_shared<ParamUInt8>();
-        const auto vals = ParamFactory::getArrayValue(pArray, "uint8[]");
-        EXPECT_EQ(vals.size(), 0ul);
-    }
-}
-
-TEST(EthereumAbi, ParamFactorySetGetValue) {
-    {
-        auto p = std::make_shared<ParamUInt8>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("13"));
-        EXPECT_EQ("13", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamUInt16>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234"));
-        EXPECT_EQ("1234", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamUInt32>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567"));
-        EXPECT_EQ("1234567", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamUInt64>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567"));
-        EXPECT_EQ("1234567", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamUIntN>(128);
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ("1234567890123456789", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0xa5"));
-        EXPECT_EQ("165", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-    }
-    {
-        auto p = std::make_shared<ParamUIntN>(168);
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ("1234567890123456789", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0xa5"));
-        EXPECT_EQ("165", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-    }
-    {
-        auto p = std::make_shared<ParamUInt256>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ("1234567890123456789", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0xa5"));
-        EXPECT_EQ("165", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0x00"));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0x"));
-    }
-    {
-        auto p = std::make_shared<ParamInt8>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("13"));
-        EXPECT_EQ("13", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamInt16>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234"));
-        EXPECT_EQ("1234", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamInt32>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567"));
-        EXPECT_EQ("1234567", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamInt64>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567"));
-        EXPECT_EQ("1234567", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamIntN>(128);
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ("1234567890123456789", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0xa5"));
-        EXPECT_EQ("165", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-    }
-    {
-        auto p = std::make_shared<ParamIntN>(168);
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ("1234567890123456789", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0xa5"));
-        EXPECT_EQ("165", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("a5"));
-    }
-    {
-        auto p = std::make_shared<ParamInt256>();
-        EXPECT_EQ("0", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("1234567890123456789"));
-        EXPECT_EQ("1234567890123456789", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0xa5"));
-        EXPECT_EQ("165", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0x00"));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0x"));
-    }
-    {
-        auto p = std::make_shared<ParamBool>();
-        EXPECT_EQ("false", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("true"));
-        EXPECT_EQ("true", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("false"));
-        EXPECT_TRUE(p->setValueJson("1"));
-        EXPECT_TRUE(p->setValueJson("0"));
-        EXPECT_FALSE(p->setValueJson("a5"));
-        EXPECT_FALSE(p->setValueJson("0xa5"));
-        EXPECT_FALSE(p->setValueJson("0x00"));
-    }
-    {
-        auto p = std::make_shared<ParamString>();
-        EXPECT_EQ("", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("ABCdefGHI"));
-        EXPECT_EQ("ABCdefGHI", ParamFactory::getValue(p, p->getType()));
-        EXPECT_EQ(9ul, p->getCount());
-    }
-    {
-        auto p = std::make_shared<ParamByteArray>();
-        EXPECT_EQ("0x", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0123456789"));
-        EXPECT_EQ("0x0123456789", ParamFactory::getValue(p, p->getType()));
-    }
-    {
-        auto p = std::make_shared<ParamByteArrayFix>(36);
-        EXPECT_EQ("0x000000000000000000000000000000000000000000000000000000000000000000000000", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0x000000000000000000000000000000000000000000000000000000000000000123456789"));
-        EXPECT_EQ("0x000000000000000000000000000000000000000000000000000000000000000123456789", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0x0123456789")); // will be padded
-        EXPECT_EQ("0x012345678900000000000000000000000000000000000000000000000000000000000000", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0xabcdef0000000000000000000000000000000000000000000000000000000000000123456789")); // will be cropped
-        EXPECT_EQ("0xabcdef000000000000000000000000000000000000000000000000000000000000012345", ParamFactory::getValue(p, p->getType()));
-    }
-    {
-        auto p = std::make_shared<ParamAddress>();
-        EXPECT_EQ("0x0000000000000000000000000000000000000000", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("0x0000000000000000000000000000000123456789"));
-        EXPECT_EQ("0x0000000000000000000000000000000123456789", ParamFactory::getValue(p, p->getType()));
-    }
-    {
-        auto p = std::make_shared<ParamArray>(std::make_shared<ParamUInt8>());
-        EXPECT_EQ("[0]", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("[13,14,15]"));
-        EXPECT_EQ("[13,14,15]", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("13"));
-    }
-    {
-        auto p = std::make_shared<ParamArray>(std::make_shared<ParamAddress>());
-        EXPECT_EQ("[\"0x0000000000000000000000000000000000000000\"]", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("[\"0x0000000000000000000000000000000123456789\"]"));
-        EXPECT_EQ("[\"0x0000000000000000000000000000000123456789\"]", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("0x0000000000000000000000000000000123456789"));
-    }
-    {
-        auto p = std::make_shared<ParamArray>(std::make_shared<ParamBool>());
-        EXPECT_EQ("[false]", ParamFactory::getValue(p, p->getType()));
-        EXPECT_TRUE(p->setValueJson("[true,false,true]"));
-        EXPECT_EQ("[true,false,true]", ParamFactory::getValue(p, p->getType()));
-        EXPECT_FALSE(p->setValueJson("true"));
-    }
-}
-
-TEST(EthereumAbi, ParamFactoryGetValue) {
-    const std::vector<std::string> types = {
-        "uint8",
-        "uint16",
-        "uint32",
-        "uint64",
-        "uint128",
-        "uint168",
-        "uint256",
-        "int8",
-        "int16",
-        "int32",
-        "int64",
-        "int128",
-        "int168",
-        "int256",
-        "bool",
-        "string",
-        "bytes",
-        "bytes168",
-        "address",
-        "uint8[]",
-        "address[]",
-        "bool[]",
-        "bytes[]",
-    };
-    for (auto t : types) {
-        std::shared_ptr<ParamBase> p = ParamFactory::make(t);
-        EXPECT_EQ(t, p->getType());
-
-        std::string expected = "";
-        // for numerical values, value is "0"
-        if (t == "uint8[]" || t == "int8[]") {
-            expected = "[0]";
-        } else if (t == "bool") {
-            expected = "false";
-        } else if (t == "address[]") {
-            expected = "[\"0x0000000000000000000000000000000000000000\"]";
-        } else if (t == "address") {
-            expected = "0x0000000000000000000000000000000000000000";
-        } else if (t == "bool[]") {
-            expected = "[false]";
-        } else if (t == "bytes[]") {
-            expected = "[\"0x\"]";
-        } else if (t == "bytes") {
-            expected = "0x";
-        } else if (t == "bytes168") {
-            expected = "0x000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000";
-        } else if (t.substr(0, 3) == "int" || t.substr(0, 4) == "uint") {
-            expected = "0";
-        }
-        EXPECT_EQ(expected, ParamFactory::getValue(p, t));
-    }
-}
-
-TEST(EthereumAbi, MaskForBits) {
-    EXPECT_EQ(0x000000ffffff, ParamUIntN::maskForBits(24));
-    EXPECT_EQ(0x00ffffffffff, ParamUIntN::maskForBits(40));
-}
-
-TEST(EthereumAbi, ParamSetMethods) {
-    {
-        auto p = ParamSet(std::vector<std::shared_ptr<ParamBase>>{
-            std::make_shared<ParamUInt256>(16u),
-            std::make_shared<ParamBool>(true)});
-        EXPECT_EQ(p.getCount(), 2ul);
-        EXPECT_EQ(p.addParam(std::shared_ptr<ParamString>(nullptr)), -1);
-
-        std::shared_ptr<ParamBase> getparam;
-        EXPECT_TRUE(p.getParam(1, getparam));
-        EXPECT_EQ(getparam->getType(), "bool");
-        EXPECT_FALSE(p.getParam(2, getparam));
-
-        EXPECT_EQ(p.getParamUnsafe(0)->getType(), "uint256");
-        EXPECT_EQ(p.getParamUnsafe(1)->getType(), "bool");
-        EXPECT_EQ(p.getParamUnsafe(2)->getType(), "uint256");
-        EXPECT_EQ(p.getParamUnsafe(99)->getType(), "uint256");
-    }
-    {
-        auto pEmpty = ParamSet(std::vector<std::shared_ptr<ParamBase>>{});
-        EXPECT_EQ(pEmpty.getParamUnsafe(0).get(), nullptr);
-    }
-}
-
-TEST(EthereumAbi, ParametersMethods) {
-    auto p = Parameters(std::vector<std::shared_ptr<ParamBase>>{
-        std::make_shared<ParamUInt256>(16u),
-        std::make_shared<ParamBool>(true)});
-    EXPECT_TRUE(p.isDynamic());
-    EXPECT_EQ(p.getCount(), 2ul);
-    EXPECT_FALSE(p.setValueJson("value"));
-    EXPECT_EQ(hex(p.hashStruct()), "755311b9e2cee471a91b161ccc5deed933d844b5af2b885543cc3c04eb640983");
-}
-
-} // namespace TW::Ethereum::ABI::tests
diff --git a/tests/Ethereum/AddressTests.cpp b/tests/Ethereum/AddressTests.cpp
deleted file mode 100644
index 2c4ca5745e7..00000000000
--- a/tests/Ethereum/AddressTests.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Ethereum/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Ethereum::tests {
-
-TEST(EthereumAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_FALSE(Address::isValid("aaeb60f3e94c9b9a09f33669435e7ef1beaed"));
-    ASSERT_FALSE(Address::isValid("fB6916095ca1df60bB79Ce92cE3Ea74c37c5d359"));
-}
-
-TEST(EthereumAddress, EIP55) {
-    ASSERT_EQ(
-        Address(parse_hex("5aaeb6053f3e94c9b9a09f33669435e7ef1beaed")).string(),
-        "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
-    ASSERT_EQ(
-        Address(parse_hex("0x5AAEB6053F3E94C9b9A09f33669435E7Ef1BEAED")).string(),
-        "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
-    ASSERT_EQ(
-        Address(parse_hex("0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359")).string(),
-        "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359");
-    ASSERT_EQ(
-        Address(parse_hex("0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB")).string(),
-        "0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB");
-    ASSERT_EQ(
-        Address(parse_hex("0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb")).string(),
-        "0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb");
-}
-
-TEST(EthereumAddress, String) {
-    const auto address = Address("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
-    ASSERT_EQ(address.string(), "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
-}
-
-TEST(EthereumAddress, FromPrivateKey) {
-    const auto privateKey = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
-    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
-    const auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "0xAc1ec44E4f0ca7D172B7803f6836De87Fb72b309");
-}
-
-TEST(EthereumAddress, IsValid) {
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_TRUE(Address::isValid("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"));
-}
-
-} // namespace TW::Ethereum::tests
diff --git a/tests/Ethereum/ContractCallTests.cpp b/tests/Ethereum/ContractCallTests.cpp
deleted file mode 100644
index f338581c242..00000000000
--- a/tests/Ethereum/ContractCallTests.cpp
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Ethereum/ContractCall.h"
-#include "HexCoding.h"
-
-#include <fstream>
-#include <gtest/gtest.h>
-
-extern std::string TESTS_ROOT;
-
-namespace TW::Ethereum::ABI::tests {
-
-static nlohmann::json load_json(std::string path) {
-    std::ifstream stream(path);
-    nlohmann::json json;
-    stream >> json;
-    return json;
-}
-
-TEST(ContractCall, Approval) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/erc20.json";
-    auto abi = load_json(path);
-    auto call = parse_hex("095ea7b30000000000000000000000005aaeb6053f3e94c9b9a09f33669435e7ef1beaed"
-                          "0000000000000000000000000000000000000000000000000000000000000001");
-    auto decoded = decodeCall(call, abi);
-
-    auto expected =
-        R"|({"function":"approve(address,uint256)","inputs":[{"name":"_spender","type":"address","value":"0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed"},{"name":"_value","type":"uint256","value":"1"}]})|";
-
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, UniswapSwapTokens) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/uniswap_router_v2.json";
-    auto abi = load_json(path);
-    // https://etherscan.io/tx/0x57a2414f3cd9ca373b7e663ae67ecf933e40cb77a6e4ed28e4e28b5aa0d8ec63
-    auto call = parse_hex(
-        "0x38ed17390000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000"
-        "00000000000000000000000000000000229f7e501ad62bdb000000000000000000000000000000000000000000"
-        "00000000000000000000a00000000000000000000000007d8bf18c7ce84b3e175b339c4ca93aed1dd166f10000"
-        "00000000000000000000000000000000000000000000000000005f0ed070000000000000000000000000000000"
-        "00000000000000000000000000000000040000000000000000000000006b175474e89094c44da98b954eedeac4"
-        "95271d0f0000000000000000000000009f8f72aa9304c8b593d555f12ef6589cc3a579a2000000000000000000"
-        "000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000e41d2489571d32218924"
-        "6dafa5ebde1f4699f498");
-    auto decoded = decodeCall(call, abi);
-    auto expected =
-        R"|({"function":"swapExactTokensForTokens(uint256,uint256,address[],address,uint256)","inputs":[{"name":"amountIn","type":"uint256","value":"1000000000000000000"},{"name":"amountOutMin","type":"uint256","value":"2494851601099271131"},{"name":"path","type":"address[]","value":["0x6b175474e89094c44da98b954eedeac495271d0f","0x9f8f72aa9304c8b593d555f12ef6589cc3a579a2","0xc02aaa39b223fe8d0a0e5c4f27ead9083c756cc2","0xe41d2489571d322189246dafa5ebde1f4699f498"]},{"name":"to","type":"address","value":"0x7d8bf18c7ce84b3e175b339c4ca93aed1dd166f1"},{"name":"deadline","type":"uint256","value":"1594806384"}]})|";
-
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, KyberTrade) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/kyber_proxy.json";
-    auto abi = load_json(path);
-
-    // https://etherscan.io/tx/0x51ffab782b9a27d754389505d5a50db525c04c68142ce20512d579f10f9e13e4
-    auto call = parse_hex(
-        "ae591d54000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000"
-        "000000000000000000000000000004a97d605a3b980000000000000000000000000000dac17f958d2ee523a220"
-        "6206994597c13d831ec70000000000000000000000007755297c6a26d495739206181fe81646dbd0bf39ffffff"
-        "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000"
-        "000000000000000ce32ff7d63c35d189000000000000000000000000440bbd6a888a36de6e2f6a25f65bc4e168"
-        "74faa9000000000000000000000000000000000000000000000000000000000000000800000000000000000000"
-        "000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000"
-        "000000000000000000");
-    auto decoded = decodeCall(call, abi);
-
-    auto expected =
-        R"|({"function":"tradeWithHintAndFee(address,uint256,address,address,uint256,uint256,address,uint256,bytes)","inputs":[{"name":"src","type":"address","value":"0xeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee"},{"name":"srcAmount","type":"uint256","value":"86000000000000000000"},{"name":"dest","type":"address","value":"0xdac17f958d2ee523a2206206994597c13d831ec7"},{"name":"destAddress","type":"address","value":"0x7755297c6a26d495739206181fe81646dbd0bf39"},{"name":"maxDestAmount","type":"uint256","value":"115792089237316195423570985008687907853269984665640564039457584007913129639935"},{"name":"minConversionRate","type":"uint256","value":"237731504554534883721"},{"name":"platformWallet","type":"address","value":"0x440bbd6a888a36de6e2f6a25f65bc4e16874faa9"},{"name":"platformFeeBps","type":"uint256","value":"8"},{"name":"hint","type":"bytes","value":"0x"}]})|";
-
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, ApprovalForAll) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/erc721.json";
-    auto abi = load_json(path);
-
-    // https://etherscan.io/tx/0xc2744000a107aee4761cf8a638657f91c3003a54e2f1818c37d781be7e48187a
-    auto call = parse_hex("0xa22cb46500000000000000000000000088341d1a8f672d2780c8dc725902aae72f143b"
-                          "0c0000000000000000000000000000000000000000000000000000000000000001");
-    auto decoded = decodeCall(call, abi);
-
-    auto expected =
-        R"|({"function":"setApprovalForAll(address,bool)","inputs":[{"name":"to","type":"address","value":"0x88341d1a8f672d2780c8dc725902aae72f143b0c"},{"name":"approved","type":"bool","value":true}]})|";
-
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, CustomCall) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/custom.json";
-    auto abi = load_json(path);
-
-    auto call = parse_hex("ec37a4a000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000067472757374790000000000000000000000000000000000000000000000000000");
-    auto decoded = decodeCall(call, abi);
-    auto expected =
-        R"|({"function":"setName(string,uint256,int32)","inputs":[{"name":"name","type":"string","value":"trusty"},{"name":"age","type":"uint","value":"3"},{"name":"height","type":"int32","value":"100"}]})|";
-
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, SetResolver) {
-    auto call = parse_hex("0x1896f70ae71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c"
-                          "6f0000000000000000000000004976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41");
-    auto path = TESTS_ROOT + "/Ethereum/Data/ens.json";
-    auto abi = load_json(path);
-    auto decoded = decodeCall(call, abi);
-    auto expected =
-        R"|({"function":"setResolver(bytes32,address)","inputs":[{"name":"node","type":"bytes32","value":"0xe71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f"},{"name":"resolver","type":"address","value":"0x4976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41"}]})|";
-
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, RenewENS) {
-    auto call = parse_hex(
-        "0xacf1a84100000000000000000000000000000000000000000000000000000000000000400000000000000000"
-        "000000000000000000000000000000000000000001e18558000000000000000000000000000000000000000000"
-        "000000000000000000000a68657769676f76656e7300000000000000000000000000000000000000000000");
-    auto path = TESTS_ROOT + "/Ethereum/Data/ens.json";
-    auto abi = load_json(path);
-    auto decoded = decodeCall(call, abi);
-    auto expected =
-        R"|({"function":"renew(string,uint256)","inputs":[{"name":"name","type":"string","value":"hewigovens"},{"name":"duration","type":"uint256","value":"31556952"}]})|";
-
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, Multicall) {
-    auto call = parse_hex(
-        "0xac9650d800000000000000000000000000000000000000000000000000000000000000200000000000000000"
-        "000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000"
-        "000000000000000000008000000000000000000000000000000000000000000000000000000000000001000000"
-        "0000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000"
-        "000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000"
-        "00000044d5fa2b00e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f0000000000"
-        "0000000000000047331175b23c2f067204b506ca1501c26731c990000000000000000000000000000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000000000000000000064304e6a"
-        "dee71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f000000000000000000000000"
-        "000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-        "000000000000000000000000000000000000000000a48b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e"
-        "574c32a17a67156fa9ed3c4c6f000000000000000000000000000000000000000000000000000000000000003c"
-        "000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000"
-        "0000000000000000000000000000000000001447331175b23c2f067204b506ca1501c26731c990000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
-        "0000000000000000000000000000000000000000a48b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e57"
-        "4c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000002ca00"
-        "000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000"
-        "000000000000000000000000000000000014d30f834b53d8f7e851e87b90ffa65757a35b850500000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000");
-    ASSERT_EQ(4 + 928ul, call.size());
-    auto path = TESTS_ROOT + "/Ethereum/Data/ens.json";
-    auto abi = load_json(path);
-    auto decoded = decodeCall(call, abi);
-    auto expected =
-        R"|({"function":"multicall(bytes[])","inputs":[{"name":"data","type":"bytes[]","value":["0xd5fa2b00e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000047331175b23c2f067204b506ca1501c26731c990","0x304e6adee71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000","0x8b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001447331175b23c2f067204b506ca1501c26731c990000000000000000000000000","0x8b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000014d30f834b53d8f7e851e87b90ffa65757a35b8505000000000000000000000000"]}]})|";
-
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, Invalid) {
-    EXPECT_FALSE(decodeCall(Data(), "{}").has_value());
-    EXPECT_FALSE(decodeCall(parse_hex("0xa22cb46500"), "{}").has_value());
-}
-
-TEST(ContractCall, GetAmountsOut) {
-    auto call = parse_hex(
-        "d06ca61f"
-        "0000000000000000000000000000000000000000000000000000000000000064"
-        "0000000000000000000000000000000000000000000000000000000000000040"
-        "0000000000000000000000000000000000000000000000000000000000000001"
-        "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077");
-    auto path = TESTS_ROOT + "/Ethereum/Data/getAmountsOut.json";
-    auto abi = load_json(path);
-
-    auto decoded = decodeCall(call, abi);
-    ASSERT_TRUE(decoded.has_value());
-    auto expected =
-        R"|({"function":"getAmountsOut(uint256,address[])","inputs":[{"name":"amountIn","type":"uint256","value":"100"},{"name":"path","type":"address[]","value":["0xf784682c82526e245f50975190ef0fff4e4fc077"]}]})|";
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, 1inch) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/1inch.json";
-    auto abi = load_json(path);
-
-    // https://etherscan.io/tx/0xc2d113151124579c21332d4cc6ab2b7f61e81d62392ed8596174513cb47e35ba
-    auto call = parse_hex(
-        "7c02520000000000000000000000000027239549dd40e1d60f5b80b0c4196923745b1fd2000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001800000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb39000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000027239549dd40e1d60f5b80b0c4196923745b1fd20000000000000000000000001611c227725c5e420ef058275ae772b41775e261000000000000000000000000000000000000000000000000000005d0fadb1c0000000000000000000000000000000000000000000000000000000005c31df1da000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002080000000000000000000000069d91b94f0aaf8e8a2586909fa77a5c2c89818d50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000104128acb080000000000000000000000001611c227725c5e420ef058275ae772b41775e2610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000005d0fadb1c0000000000000000000000000000000000000000000000000000000001000276a400000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000400000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb39000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000");
-    auto decoded = decodeCall(call, abi);
-    ASSERT_TRUE(decoded.has_value());
-    auto expected =
-        R"|({"function":"swap(address,(address,address,address,address,uint256,uint256,uint256,bytes),bytes)","inputs":[{"name":"caller","type":"address","value":"0x27239549dd40e1d60f5b80b0c4196923745b1fd2"},{"components":[{"name":"srcToken","type":"address","value":"0x2b591e99afe9f32eaa6214f7b7629768c40eeb39"},{"name":"dstToken","type":"address","value":"0xa0b86991c6218b36c1d19d4a2e9eb0ce3606eb48"},{"name":"srcReceiver","type":"address","value":"0x27239549dd40e1d60f5b80b0c4196923745b1fd2"},{"name":"dstReceiver","type":"address","value":"0x1611c227725c5e420ef058275ae772b41775e261"},{"name":"amount","type":"uint256","value":"6395120000000"},{"name":"minReturnAmount","type":"uint256","value":"24748356058"},{"name":"flags","type":"uint256","value":"4"},{"name":"permit","type":"bytes","value":"0x"}],"name":"desc","type":"tuple"},{"name":"data","type":"bytes","value":"0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002080000000000000000000000069d91b94f0aaf8e8a2586909fa77a5c2c89818d50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000104128acb080000000000000000000000001611c227725c5e420ef058275ae772b41775e2610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000005d0fadb1c0000000000000000000000000000000000000000000000000000000001000276a400000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000400000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb39000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000"}]})|";
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-TEST(ContractCall, TupleNested) {
-    auto path = TESTS_ROOT + "/Ethereum/Data/tuple_nested.json";
-    auto abi = load_json(path);
-
-    auto call = parse_hex(
-        "74b6ef0b"
-        "0000000000000000000000000000000000000000000000000000000000000001"
-        "0000000000000000000000000000000000000000000000000000000000000002"
-        "0000000000000000000000000000000000000000000000000000000000000003"
-        "0000000000000000000000000000000000000000000000000000000000000004"
-        "0000000000000000000000000000000000000000000000000000000000000005"
-        "0000000000000000000000000000000000000000000000000000000000000001");
-    auto decoded = decodeCall(call, abi);
-    ASSERT_TRUE(decoded.has_value());
-    auto expected =
-        R"|({"function":"nested_tuple(uint16,(uint16,(uint16,uint64),uint32),bool)","inputs":[{"name":"param1","type":"uint16","value":"1"},{"components":[{"name":"param21","type":"uint16","value":"2"},{"components":[{"name":"param221","type":"uint16","value":"3"},{"name":"param222","type":"uint64","value":"4"}],"name":"param22","type":"tuple"},{"name":"param23","type":"uint32","value":"5"}],"name":"param2","type":"tuple"},{"name":"param3","type":"bool","value":true}]})|";
-    EXPECT_EQ(decoded.value(), expected);
-}
-
-} // namespace TW::Ethereum::ABI::tests
diff --git a/tests/Ethereum/RLPTests.cpp b/tests/Ethereum/RLPTests.cpp
deleted file mode 100644
index 52b01b75de4..00000000000
--- a/tests/Ethereum/RLPTests.cpp
+++ /dev/null
@@ -1,306 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Ethereum/RLP.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Ethereum::tests {
-
-using boost::multiprecision::uint256_t;
-
-std::string stringifyItems(const RLP::DecodedItem& di);
-
-std::string stringifyData(const Data& data) {
-    if (data.size() == 0)
-        return "0";
-    // try if only letters
-    bool isLettersOnly = true;
-    for (auto i : data) {
-        if (!((i >= 'A' && i <= 'Z') || (i >= 'a' && i <= 'z') || i == ' ' || i == ',')) {
-            isLettersOnly = false;
-            break;
-        }
-    }
-    if (isLettersOnly)
-        return std::string("'") + std::string(data.begin(), data.end()) + "'";
-    // try if it can be parsed (recursive)
-    if (data.size() >= 2) {
-        try {
-            const auto di = RLP::decode(data);
-            if (di.decoded.size() > 0 && di.remainder.size() == 0) {
-                return stringifyItems(di);
-            }
-        } catch (...) {
-        }
-    }
-    // any other: as hex string
-    return hex(data);
-}
-
-std::string stringifyItems(const RLP::DecodedItem& di) {
-    const auto n = di.decoded.size();
-    if (n == 0) {
-        return "-";
-    }
-    if (n == 1) {
-        return stringifyData(di.decoded[0]);
-    }
-    std::string res = "(" + std::to_string(n) + ": ";
-    int count = 0;
-    for (auto i : di.decoded) {
-        if (count++)
-            res += " ";
-        res += stringifyData(i);
-    }
-    res += ")";
-    return res;
-}
-
-std::string decodeHelper(const std::string& hexData) {
-    const auto data = parse_hex(hexData);
-    const auto di = RLP::decode(data);
-    return stringifyItems(di);
-}
-
-TEST(RLP, EncodeString) {
-    EXPECT_EQ(hex(RLP::encode("")), "80");
-    EXPECT_EQ(hex(RLP::encode("d")), "64");
-    EXPECT_EQ(hex(RLP::encode("dog")), "83646f67");
-}
-
-TEST(RLP, EncodeInteger) {
-    EXPECT_EQ(hex(RLP::encode(0)), "80");
-    EXPECT_EQ(hex(RLP::encode(127)), "7f");
-    EXPECT_EQ(hex(RLP::encode(128)), "8180");
-    EXPECT_EQ(hex(RLP::encode(255)), "81ff");
-    EXPECT_EQ(hex(RLP::encode(256)), "820100");
-    EXPECT_EQ(hex(RLP::encode(1024)), "820400");
-    EXPECT_EQ(hex(RLP::encode(0xffff)), "82ffff");
-    EXPECT_EQ(hex(RLP::encode(0x010000)), "83010000");
-    EXPECT_EQ(hex(RLP::encode(0xffffff)), "83ffffff");
-    EXPECT_EQ(hex(RLP::encode(static_cast<uint64_t>(0xffffffffULL))), "84ffffffff");
-    EXPECT_EQ(hex(RLP::encode(static_cast<uint64_t>(0xffffffffffffffULL))), "87ffffffffffffff");
-}
-
-TEST(RLP, EncodeUInt256) {
-    EXPECT_EQ(hex(RLP::encode(uint256_t(0))), "80");
-    EXPECT_EQ(hex(RLP::encode(uint256_t(1))), "01");
-    EXPECT_EQ(hex(RLP::encode(uint256_t(127))), "7f");
-    EXPECT_EQ(hex(RLP::encode(uint256_t(128))), "8180");
-    EXPECT_EQ(hex(RLP::encode(uint256_t(256))), "820100");
-    EXPECT_EQ(hex(RLP::encode(uint256_t(1024))), "820400");
-    EXPECT_EQ(hex(RLP::encode(uint256_t(0xffffff))), "83ffffff");
-    EXPECT_EQ(hex(RLP::encode(uint256_t(0xffffffffULL))), "84ffffffff");
-    EXPECT_EQ(hex(RLP::encode(uint256_t(0xffffffffffffffULL))), "87ffffffffffffff");
-    EXPECT_EQ(
-        hex(RLP::encode(uint256_t("0x102030405060708090a0b0c0d0e0f2"))),
-        "8f102030405060708090a0b0c0d0e0f2");
-    EXPECT_EQ(
-        hex(RLP::encode(uint256_t("0x0100020003000400050006000700080009000a000b000c000d000e01"))),
-        "9c0100020003000400050006000700080009000a000b000c000d000e01");
-    EXPECT_EQ(
-        hex(RLP::encode(uint256_t("0x0100000000000000000000000000000000000000000000000000000000000000"))),
-        "a00100000000000000000000000000000000000000000000000000000000000000");
-}
-
-TEST(RLP, EncodeList) {
-    EXPECT_EQ(hex(RLP::encodeList(std::vector<int>())), "c0");
-    EXPECT_EQ(hex(RLP::encodeList(std::vector<int>{1, 2, 3})), "c3010203");
-    EXPECT_EQ(hex(RLP::encodeList(std::vector<std::string>{"a", "b"})), "c26162");
-    EXPECT_EQ(hex(RLP::encodeList(std::vector<std::string>{"cat", "dog"})), "c88363617483646f67");
-    {
-        const auto encoded = RLP::encodeList(std::vector<int>(1024));
-        EXPECT_EQ(hex(subData(encoded, 0, 20)), "f904008080808080808080808080808080808080");
-    }
-}
-
-TEST(RLP, EncodeListNested) {
-    const auto l11 = RLP::encodeList(std::vector<int>{1, 2, 3});
-    const auto l12 = RLP::encodeList(std::vector<std::string>{"apple", "banana", "cherry"});
-    const auto l21 = RLP::encodeList(std::vector<Data>{parse_hex("abcdef"), parse_hex("00010203040506070809")});
-    const auto l22 = RLP::encodeList(std::vector<std::string>{"bitcoin", "beeenbee", "eth"});
-    const auto l1 = RLP::encodeList(std::vector<Data>{l11, l12});
-    const auto l2 = RLP::encodeList(std::vector<Data>{l21, l22});
-    const auto encoded = RLP::encodeList(std::vector<Data>{l1, l2});
-    EXPECT_EQ(hex(encoded), "f8479cdb84c301020395d4856170706c658662616e616e6186636865727279a9e890cf83abcdef8a0001020304050607080996d587626974636f696e88626565656e62656583657468");
-}
-
-TEST(RLP, EncodeInvalid) {
-    ASSERT_TRUE(RLP::encode(-1).empty());
-    ASSERT_TRUE(RLP::encodeList(std::vector<int>{0, -1}).empty());
-}
-
-TEST(RLP, DecodeInteger) {
-    EXPECT_EQ(decodeHelper("00"), "00"); // not the primary encoding for 0
-    EXPECT_EQ(decodeHelper("01"), "01");
-    EXPECT_EQ(decodeHelper("09"), "09");
-    EXPECT_EQ(decodeHelper("7f"), "7f");
-    EXPECT_EQ(decodeHelper("80"), "0");
-    EXPECT_EQ(decodeHelper("8180"), "80");
-    EXPECT_EQ(decodeHelper("81ff"), "ff");
-    EXPECT_EQ(decodeHelper("820100"), "0100");
-    EXPECT_EQ(decodeHelper("820400"), "0400");
-    EXPECT_EQ(decodeHelper("82ffff"), "ffff");
-    EXPECT_EQ(decodeHelper("83010000"), "010000");
-    EXPECT_EQ(decodeHelper("83ffffff"), "ffffff");
-    EXPECT_EQ(decodeHelper("84ffffffff"), "ffffffff");
-    EXPECT_EQ(decodeHelper("87ffffffffffffff"), "ffffffffffffff");
-}
-
-TEST(RLP, DecodeString) {
-    EXPECT_EQ(decodeHelper("80"), "0");
-    EXPECT_EQ(decodeHelper("64"), "'d'");
-    EXPECT_EQ(decodeHelper("83646f67"), "'dog'");
-    EXPECT_EQ(decodeHelper("83636174"), "'cat'");
-    EXPECT_EQ(decodeHelper("8f102030405060708090a0b0c0d0e0f2"), "102030405060708090a0b0c0d0e0f2");
-    EXPECT_EQ(decodeHelper("9c0100020003000400050006000700080009000a000b000c000d000e01"), "0100020003000400050006000700080009000a000b000c000d000e01");
-    EXPECT_EQ(decodeHelper("a00100000000000000000000000000000000000000000000000000000000000000"), "0100000000000000000000000000000000000000000000000000000000000000");
-    // long string
-    EXPECT_EQ(decodeHelper("b87674686973206973206120612076657279206c6f6e6720737472696e672c2074686973206973206120612076657279206c6f6e6720737472696e672c2074686973206973206120612076657279206c6f6e6720737472696e672c2074686973206973206120612076657279206c6f6e6720737472696e67"),
-              "'this is a a very long string, this is a a very long string, this is a a very long string, this is a a very long string'");
-}
-
-TEST(RLP, DecodeList) {
-    // empty list
-    EXPECT_EQ(decodeHelper("c0"), "-");
-    // short list
-    EXPECT_EQ(decodeHelper("c3010203"), "(3: 01 02 03)");
-    EXPECT_EQ(decodeHelper("c26162"), "(2: 'a' 'b')");
-    EXPECT_EQ(decodeHelper("c88363617483646f67"), "(2: 'cat' 'dog')");
-
-    // long list, raw ether transfer tx
-    EXPECT_EQ(decodeHelper("f86b81a985051f4d5ce982520894515778891c99e3d2e7ae489980cb7c77b37b5e76861b48eb57e0008025a0ad01c32a7c974df9d0bd48c8d7e0ecab62e90811917aa7dc0c966751a0c3f475a00dc77d9ec68484481bdf87faac14378f4f18d477f84c0810d29480372c1bbc65"),
-              "(9: "
-              "a9 "                                                               // nonce
-              "051f4d5ce9 "                                                       // gas price
-              "5208 "                                                             // gas limit
-              "515778891c99e3d2e7ae489980cb7c77b37b5e76 "                         // to
-              "1b48eb57e000 "                                                     // amount
-              "0 "                                                                // data
-              "25 "                                                               // v
-              "ad01c32a7c974df9d0bd48c8d7e0ecab62e90811917aa7dc0c966751a0c3f475 " // r
-              "0dc77d9ec68484481bdf87faac14378f4f18d477f84c0810d29480372c1bbc65"  // s
-              ")");
-
-    // long list, raw token transfer tx
-    EXPECT_EQ(decodeHelper("f8aa81d485077359400082db9194dac17f958d2ee523a2206206994597c13d831ec780b844a9059cbb000000000000000000000000c6b6b55c8c4971145a842cc4e5db92d879d0b3e00000000000000000000000000000000000000000000000000000000002faf0801ca02843d8ed66b9623392dc336dd36d5dd5a630b2019962869b6e50fdb4ecb5b6aca05d9ea377bc65e2921f7fc257de8135530cc74e3188b6ba57a4b9cb284393050a"),
-              "(9: "
-              "d4 "
-              "0773594000 "
-              "db91 "
-              "dac17f958d2ee523a2206206994597c13d831ec7 "
-              "0 "
-              "a9059cbb000000000000000000000000c6b6b55c8c4971145a842cc4e5db92d879d0b3e00000000000000000000000000000000000000000000000000000000002faf080 "
-              "1c "
-              "2843d8ed66b9623392dc336dd36d5dd5a630b2019962869b6e50fdb4ecb5b6ac "
-              "5d9ea377bc65e2921f7fc257de8135530cc74e3188b6ba57a4b9cb284393050a"
-              ")");
-
-    {
-        // long list, with 2-byte size
-        const std::string elem = "0123";
-        const std::size_t n = 500;
-        std::vector<std::string> longarr;
-        for (auto i = 0ul; i < n; ++i)
-            longarr.push_back(elem);
-
-        const Data encoded = RLP::encodeList(longarr);
-        ASSERT_EQ(hex(subData(encoded, 0, 20)), "f909c48430313233843031323384303132338430");
-
-        auto decoded = RLP::decode(encoded);
-        ASSERT_EQ(decoded.decoded.size(), n);
-        for (int i = 0; i < 20; i++) {
-            EXPECT_EQ(hex(decoded.decoded[i]), "30313233");
-        }
-    }
-    {
-        // long list, with 3-byte size
-        const std::string elem = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789";
-        const std::size_t n = 650;
-        std::vector<std::string> longarr;
-        for (auto i = 0ul; i < n; ++i)
-            longarr.push_back(elem);
-
-        const Data encoded = RLP::encodeList(longarr);
-        ASSERT_EQ(encoded.size(), 66304ul);
-        ASSERT_EQ(hex(subData(encoded, 0, 30)), "fa0102fcb864303132333435363738393031323334353637383930313233");
-
-        auto decoded = RLP::decode(encoded);
-        ASSERT_EQ(decoded.decoded.size(), n);
-    }
-
-    // nested list
-    EXPECT_EQ(decodeHelper("f8479cdb84c301020395d4856170706c658662616e616e6186636865727279a9e890cf83abcdef8a0001020304050607080996d587626974636f696e88626565656e62656583657468"),
-              "(2: (2: (3: 01 02 03) (3: 'apple' 'banana' 'cherry')) (2: (2: abcdef 00010203040506070809) (3: 'bitcoin' 'beeenbee' 'eth')))");
-}
-
-TEST(RLP, DecodeInvalid) {
-    // decode empty data
-    EXPECT_THROW(RLP::decode(Data()), std::invalid_argument);
-
-    // incorrect length
-    EXPECT_THROW(RLP::decode(parse_hex("0x81636174")), std::invalid_argument);
-    EXPECT_THROW(RLP::decode(parse_hex("0xb9ffff")), std::invalid_argument);
-    EXPECT_THROW(RLP::decode(parse_hex("0xc883636174")), std::invalid_argument);
-
-    // some tests are from https://github.com/ethereum/tests/blob/develop/RLPTests/invalidRLPTest.json
-    // int32 overflow
-    EXPECT_THROW(RLP::decode(parse_hex("0xbf0f000000000000021111")), std::invalid_argument);
-
-    // wrong size list
-    EXPECT_THROW(RLP::decode(parse_hex("0xf80180")), std::invalid_argument);
-
-    // bytes should be single byte
-    EXPECT_THROW(RLP::decode(parse_hex("0x8100")), std::invalid_argument);
-
-    // leading zeros in long length list
-    EXPECT_THROW(RLP::decode(parse_hex("fb00000040000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f")), std::invalid_argument);
-    EXPECT_THROW(RLP::decode(parse_hex("f800")), std::invalid_argument);
-}
-
-TEST(RLP, putVarInt) {
-    EXPECT_EQ(hex(RLP::putVarInt(0)), "00");
-    EXPECT_EQ(hex(RLP::putVarInt(1)), "01");
-    EXPECT_EQ(hex(RLP::putVarInt(0x21)), "21");
-    EXPECT_EQ(hex(RLP::putVarInt(0xff)), "ff");
-    EXPECT_EQ(hex(RLP::putVarInt(0x100)), "0100");
-    EXPECT_EQ(hex(RLP::putVarInt(0x4321)), "4321");
-    EXPECT_EQ(hex(RLP::putVarInt(0x654321)), "654321");
-    EXPECT_EQ(hex(RLP::putVarInt(0x87654321)), "87654321");
-    EXPECT_EQ(hex(RLP::putVarInt(0xa987654321)), "a987654321");
-    EXPECT_EQ(hex(RLP::putVarInt(0xcba987654321)), "cba987654321");
-    EXPECT_EQ(hex(RLP::putVarInt(0xedcba987654321)), "edcba987654321");
-    EXPECT_EQ(hex(RLP::putVarInt(0x21edcba987654321)), "21edcba987654321");
-    EXPECT_EQ(hex(RLP::putVarInt(0xffffffffffffffff)), "ffffffffffffffff");
-}
-
-TEST(RLP, parseVarInt) {
-    EXPECT_EQ(hex(store(RLP::parseVarInt(1, parse_hex("00"), 0))), "00");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(1, parse_hex("01"), 0))), "01");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(1, parse_hex("fc"), 0))), "fc");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(1, parse_hex("ff"), 0))), "ff");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(1, parse_hex("abcd"), 1))), "cd");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(2, parse_hex("0102"), 0))), "0102");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(2, parse_hex("0100"), 0))), "0100");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(2, parse_hex("fedc"), 0))), "fedc");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(2, parse_hex("ffff"), 0))), "ffff");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(3, parse_hex("010203"), 0))), "010203");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(4, parse_hex("01020304"), 0))), "01020304");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(5, parse_hex("0102030405"), 0))), "0102030405");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(6, parse_hex("010203040506"), 0))), "010203040506");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(7, parse_hex("01020304050607"), 0))), "01020304050607");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(8, parse_hex("0102030405060708"), 0))), "0102030405060708");
-    EXPECT_EQ(hex(store(RLP::parseVarInt(8, parse_hex("abcd0102030405060708"), 2))), "0102030405060708");
-    EXPECT_THROW(RLP::parseVarInt(0, parse_hex("01"), 0), std::invalid_argument);                 // wrong size
-    EXPECT_THROW(RLP::parseVarInt(9, parse_hex("010203040506070809"), 0), std::invalid_argument); // wrong size
-    EXPECT_THROW(RLP::parseVarInt(4, parse_hex("0102"), 0), std::invalid_argument);               // too short
-    EXPECT_THROW(RLP::parseVarInt(4, parse_hex("01020304"), 2), std::invalid_argument);           // too short
-    EXPECT_THROW(RLP::parseVarInt(2, parse_hex("0002"), 0), std::invalid_argument);               // starts with 0
-}
-
-} // namespace TW::Ethereum::tests
diff --git a/tests/Ethereum/SignerTests.cpp b/tests/Ethereum/SignerTests.cpp
deleted file mode 100644
index 0899ff812c0..00000000000
--- a/tests/Ethereum/SignerTests.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Ethereum/Address.h"
-#include "Ethereum/RLP.h"
-#include "Ethereum/Signer.h"
-#include "Ethereum/Transaction.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Ethereum {
-
-using boost::multiprecision::uint256_t;
-
-
-TEST(EthereumTransaction, encodeTransactionNonTyped) {
-    const auto transaction = TransactionNonTyped::buildERC20Transfer(
-        /* nonce: */ 0,
-        /* gasPrice: */ 42000000000, // 0x09c7652400
-        /* gasLimit: */ 78009, // 130B9
-        /* tokenContract: */ parse_hex("0x6b175474e89094c44da98b954eedeac495271d0f"), // DAI
-        /* toAddress: */ parse_hex("0x5322b34c88ed0691971bf52a7047448f0f4efc84"),
-        /* amount: */ 2000000000000000000
-    );
-    const uint256_t dummyChain = 0x34;
-    const auto dummySignature = Signature{0, 0, 0};
-
-    const auto preHash = transaction->preHash(dummyChain);
-    EXPECT_EQ(hex(preHash), "b3525019dc367d3ecac48905f9a95ff3550c25a24823db765f92cae2dec7ebfd");
-    
-    const auto encoded = transaction->encoded(dummySignature, dummyChain);
-    EXPECT_EQ(hex(encoded), "f86a808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000808080");
-}
-
-TEST(EthereumSigner, PreHash) {
-    const auto address = parse_hex("0x3535353535353535353535353535353535353535");
-    const auto transaction = TransactionNonTyped::buildNativeTransfer(
-        /* nonce: */ 9,
-        /* gasPrice: */ 20000000000,
-        /* gasLimit: */ 21000,
-        /* to: */ address,
-        /* amount: */ 1000000000000000000
-    );
-    const auto preHash = transaction->preHash(1);
-    
-    ASSERT_EQ(hex(preHash), "daf5a779ae972f972197303d7b574746c7ef83eadac0f2791ad23db92e4c8e53");
-}
-
-TEST(EthereumSigner, Sign) {
-    const auto address = parse_hex("0x3535353535353535353535353535353535353535");
-    const auto transaction = TransactionNonTyped::buildNativeTransfer(
-        /* nonce: */ 9,
-        /* gasPrice: */ 20000000000,
-        /* gasLimit: */ 21000,
-        /* to: */ address,
-        /* amount: */ 1000000000000000000
-    );
-
-    const auto key = PrivateKey(parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646"));
-    const auto signature = Signer::sign(key, 1, transaction);
-
-    ASSERT_EQ(signature.v, 37);
-    ASSERT_EQ(signature.r, uint256_t("18515461264373351373200002665853028612451056578545711640558177340181847433846"));
-    ASSERT_EQ(signature.s, uint256_t("46948507304638947509940763649030358759909902576025900602547168820602576006531"));
-}
-
-TEST(EthereumSigner, SignERC20Transfer) {
-    const auto transaction = TransactionNonTyped::buildERC20Transfer(
-        /* nonce: */ 0,
-        /* gasPrice: */ 42000000000, // 0x09c7652400
-        /* gasLimit: */ 78009, // 130B9
-        /* tokenContract: */ parse_hex("0x6b175474e89094c44da98b954eedeac495271d0f"), // DAI
-        /* toAddress: */ parse_hex("0x5322b34c88ed0691971bf52a7047448f0f4efc84"),
-        /* amount: */ 2000000000000000000
-    );
-
-    const auto key = PrivateKey(parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151"));
-    const auto signature = Signer::sign(key, 1, transaction);
-
-    ASSERT_EQ(signature.v, 37);
-    ASSERT_EQ(hex(store(signature.r)), "724c62ad4fbf47346b02de06e603e013f26f26b56fdc0be7ba3d6273401d98ce");
-    ASSERT_EQ(hex(store(signature.s)), "032131cae15da7ddcda66963e8bef51ca0d9962bfef0547d3f02597a4a58c931");
-}
-
-TEST(EthereumSigner, EIP1559_1442) {
-    const auto transaction = TransactionEip1559::buildNativeTransfer(
-        6, // nonce
-        2000000000, // maxInclusionFeePerGas
-        3000000000, // maxFeePerGas
-        21100, // gasLimit
-        parse_hex("B9F5771C27664bF2282D98E09D7F50cEc7cB01a7"),
-        543210987654321, // amount
-        Data() // data
-    );
-
-    const uint256_t chainID = 3;
-    const auto key = PrivateKey(parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904"));
-    const auto signature = Signer::sign(key, chainID, transaction);
-    EXPECT_EQ(signature.v, 0);
-    EXPECT_EQ(hex(store(signature.r)), "92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c64");
-    EXPECT_EQ(hex(store(signature.s)), "6487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58");
-
-    const auto encoded = transaction->encoded(signature, chainID);
-    // https://ropsten.etherscan.io/tx/0x14429509307efebfdaa05227d84c147450d168c68539351fbc01ed87c916ab2e
-    EXPECT_EQ(hex(encoded), "02f8710306847735940084b2d05e0082526c94b9f5771c27664bf2282d98e09d7f50cec7cb01a78701ee0c29f50cb180c080a092c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c64a06487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58");
-}
-
-} // namespace TW::Ethereum
diff --git a/tests/Ethereum/TWAnySignerTests.cpp b/tests/Ethereum/TWAnySignerTests.cpp
deleted file mode 100644
index 727966fa8d8..00000000000
--- a/tests/Ethereum/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,488 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include "HexCoding.h"
-#include "uint256.h"
-#include "proto/Ethereum.pb.h"
-#include "Ethereum/ABI/Function.h"
-#include "Ethereum/ABI/ParamBase.h"
-#include "Ethereum/ABI/ParamAddress.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Ethereum {
-
-TEST(TWEthereumSigner, EmptyValue) {
-    auto str = std::string("");
-    uint256_t zero = load(str);
-
-    ASSERT_EQ(zero, uint256_t(0));
-}
-
-TEST(TWEthereumSigner, BigInt) {
-    // Check uint256_t loading
-    Data expectedData = {0x52, 0x08};
-    auto value = uint256_t(21000);
-    auto loaded = load(expectedData);
-    ASSERT_EQ(loaded, value);
-
-    // Check proto storing
-    Proto::SigningInput input;
-    auto storedData = store(value);
-    input.set_gas_limit(storedData.data(), storedData.size());
-    ASSERT_EQ(hex(input.gas_limit()), hex(expectedData));
-
-    // Check proto loading
-    auto protoLoaded = load(input.gas_limit());
-    ASSERT_EQ(protoLoaded, value);
-}
-
-TEST(TWAnySignerEthereum, Sign) {
-    // from http://thetokenfactory.com/#/factory
-    // https://etherscan.io/tx/0x63879f20909a315bcffe629bc03b20e5bc65ba2a377bd7152e3b69c4bd4cd6cc
-    Proto::SigningInput input;
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(11));
-    auto gasPrice = store(uint256_t(20000000000));
-    auto gasLimit = store(uint256_t(1000000));
-    auto data = parse_hex("0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161094b38038061094b83398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b5050505050506106da806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f357806318160ddd1461016857806323b872dd14610171578063313ce5671461025c57806354fd4d501461026857806370a08231146102c657806395d89b41146102f4578063a9059cbb14610352578063cae9ca51146103f7578063dd62ed3e146105be575b6105f2610002565b6040805160038054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6102e260025481565b610662600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101c4575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101d05750600082115b156106bf57600160a060020a0383811660008181526020818152604080832080548801905588851680845281842080548990039055600183528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060016106c3565b61067660045460ff1681565b6040805160068054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b6105f46005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03166000908152602081905260408120548290108015906103845750600082115b156106ca5733600160a060020a0390811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610162565b604080516020604435600481810135601f810184900484028501840190955284845261066294813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a03908116600081815260016020908152604080832094881680845294825280832087905580518781529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a383600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105965780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f19250505015156106d257610002565b6102e2600435602435600160a060020a03828116600090815260016020908152604080832093851683529290522054610162565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b6040805160ff9092168252519081900360200190f35b820191906000526020600020905b81548152906001019060200180831161069a57829003601f168201915b505050505081565b5060005b9392505050565b506000610162565b5060016106c35600000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000754204275636b73000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003544f540000000000000000000000000000000000000000000000000000000000");
-    auto key = parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
-
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    // tx_mode not set, Legacy is the default
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_private_key(key.data(), key.size());
-    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
-    transfer.set_data(data.data(), data.size());
-
-    std::string expected = "f90a9e0b8504a817c800830f42408080b90a4b60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161094b38038061094b83398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b5050505050506106da806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f357806318160ddd1461016857806323b872dd14610171578063313ce5671461025c57806354fd4d501461026857806370a08231146102c657806395d89b41146102f4578063a9059cbb14610352578063cae9ca51146103f7578063dd62ed3e146105be575b6105f2610002565b6040805160038054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6102e260025481565b610662600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101c4575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101d05750600082115b156106bf57600160a060020a0383811660008181526020818152604080832080548801905588851680845281842080548990039055600183528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060016106c3565b61067660045460ff1681565b6040805160068054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b6105f46005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03166000908152602081905260408120548290108015906103845750600082115b156106ca5733600160a060020a0390811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610162565b604080516020604435600481810135601f810184900484028501840190955284845261066294813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a03908116600081815260016020908152604080832094881680845294825280832087905580518781529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a383600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105965780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f19250505015156106d257610002565b6102e2600435602435600160a060020a03828116600090815260016020908152604080832093851683529290522054610162565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b6040805160ff9092168252519081900360200190f35b820191906000526020600020905b81548152906001019060200180831161069a57829003601f168201915b505050505081565b5060005b9392505050565b506000610162565b5060016106c35600000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000754204275636b73000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003544f54000000000000000000000000000000000000000000000000000000000026a042556c4f2a3f4e4e639cca524d1da70e60881417d4643e5382ed110a52719eafa0172f591a2a763d0bd6b13d042d8c5eb66e87f129c9dc77ada66b6041012db2b3";
-
-    {
-        // sign test
-        Proto::SigningOutput output;
-        ANY_SIGN(input, TWCoinTypeEthereum);
-
-        ASSERT_EQ(hex(output.encoded()), expected);
-        ASSERT_EQ(hex(output.data()), hex(data));
-    }
-}
-
-TEST(TWAnySignerEthereum, SignERC20TransferAsERC20) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasPrice = store(uint256_t(42000000000)); // 0x09c7652400
-    auto gasLimit = store(uint256_t(78009));       // 130B9
-    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
-    auto token = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
-    auto amount = uint256_t(2000000000000000000);
-    auto amountData = store(amount);
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    // tx_mode not set, Legacy is the default
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_to_address(token);
-    input.set_private_key(key.data(), key.size());
-    auto& erc20 = *input.mutable_transaction()->mutable_erc20_transfer();
-    erc20.set_to(toAddress);
-    erc20.set_amount(amountData.data(), amountData.size());
-
-    // https://etherscan.io/tx/0x199a7829fc5149e49b452c2cab76d8fa5a9682fee6e4891b8acb697ac142513e
-    std::string expected = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0724c62ad4fbf47346b02de06e603e013f26f26b56fdc0be7ba3d6273401d98cea0032131cae15da7ddcda66963e8bef51ca0d9962bfef0547d3f02597a4a58c931";
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), expected);
-
-    // expected payload
-    Data payload;
-    {
-        auto func = ABI::Function("transfer", std::vector<std::shared_ptr<ABI::ParamBase>>{
-                                             std::make_shared<ABI::ParamAddress>(parse_hex(toAddress)),
-                                             std::make_shared<ABI::ParamUInt256>(amount)});
-        func.encode(payload);
-    }
-    ASSERT_EQ(hex(output.data()), hex(payload));
-    ASSERT_EQ(hex(output.data()), "a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000");
-}
-
-TEST(TWAnySignerEthereum, SignERC20TransferAsGenericContract) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasPrice = store(uint256_t(42000000000));                 // 0x09c7652400
-    auto gasLimit = store(uint256_t(78009));                       // 130B9
-    auto toAddress = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
-    // payload: transfer(0x5322b34c88ed0691971bf52a7047448f0f4efc84, 2000000000000000000)
-    auto data = parse_hex("0xa9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000");
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    // tx_mode not set, Legacy is the default
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_to_address(toAddress);
-    input.set_private_key(key.data(), key.size());
-    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
-    transfer.set_data(data.data(), data.size());
-
-    // https://etherscan.io/tx/0x199a7829fc5149e49b452c2cab76d8fa5a9682fee6e4891b8acb697ac142513e
-    std::string expected = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0724c62ad4fbf47346b02de06e603e013f26f26b56fdc0be7ba3d6273401d98cea0032131cae15da7ddcda66963e8bef51ca0d9962bfef0547d3f02597a4a58c931";
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), expected);
-    ASSERT_EQ(hex(output.data()), hex(data));
-}
-
-TEST(TWAnySignerEthereum, SignERC20TransferInvalidAddress) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasPrice = store(uint256_t(42000000000)); // 0x09c7652400
-    auto gasLimit = store(uint256_t(78009));       // 130B9
-    auto invalidAddress = "0xdeadbeef";
-    auto amount = store(uint256_t(2000000000000000000));
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    // tx_mode not set, Legacy is the default
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_to_address(invalidAddress);
-    input.set_private_key(key.data(), key.size());
-    auto& erc20 = *input.mutable_transaction()->mutable_erc20_transfer();
-    erc20.set_to(invalidAddress);
-    erc20.set_amount(amount.data(), amount.size());
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), "");
-}
-
-TEST(TWAnySignerEthereum, SignERC20Approve) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasPrice = store(uint256_t(42000000000)); // 0x09c7652400
-    auto gasLimit = store(uint256_t(78009));       // 130B9
-    auto spenderAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
-    auto token = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
-    auto amount = store(uint256_t(2000000000000000000));
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    // tx_mode not set, Legacy is the default
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_to_address(token);
-    input.set_private_key(key.data(), key.size());
-    auto& erc20 = *input.mutable_transaction()->mutable_erc20_approve();
-    erc20.set_spender(spenderAddress);
-    erc20.set_amount(amount.data(), amount.size());
-
-    std::string expected = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844095ea7b30000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0d8136d66da1e0ba8c7208d5c4f143167f54b89a0fe2e23440653bcca28b34dc1a049222a79339f1a9e4641cb4ad805c49c225ae704299ffc10627bf41c035c464a";
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), expected);
-}
-
-TEST(TWAnySignerEthereum, SignERC721Transfer) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasPrice = store(uint256_t(42000000000));
-    auto gasLimit = store(uint256_t(78009));
-    auto tokenContract = "0x4e45e92ed38f885d39a733c14f1817217a89d425";
-    auto fromAddress = "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc";
-    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
-    auto tokenId = parse_hex("23c47ee5");
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    // tx_mode not set, Legacy is the default
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_to_address(tokenContract);
-    input.set_private_key(key.data(), key.size());
-    auto& erc721 = *input.mutable_transaction()->mutable_erc721_transfer();
-    erc721.set_from(fromAddress);
-    erc721.set_to(toAddress);
-    erc721.set_token_id(tokenId.data(), tokenId.size());
-
-    std::string expected = "f8ca808509c7652400830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b86423b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee526a0d38440a4dc140a4100d301eb49fcc35b64439e27d1d8dd9b55823dca04e6e659a03b5f56a57feabc3406f123d6f8198cd7d7e2ced7e2d58d375f076952ecd9ce88";
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), expected);
-    ASSERT_EQ(hex(output.data()), "23b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee5");
-}
-
-TEST(TWAnySignerEthereum, SignERC1155Transfer) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasPrice = store(uint256_t(42000000000));
-    auto gasLimit = store(uint256_t(78009));
-    auto tokenContract = "0x4e45e92ed38f885d39a733c14f1817217a89d425";
-    auto fromAddress = "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc";
-    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
-    auto tokenId = parse_hex("23c47ee5");
-    auto value = uint256_t(2000000000000000000);
-    auto valueData = store(value);
-    auto data = parse_hex("01020304");
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    // tx_mode not set, Legacy is the default
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_to_address(tokenContract);
-    input.set_private_key(key.data(), key.size());
-    auto& erc1155 = *input.mutable_transaction()->mutable_erc1155_transfer();
-    erc1155.set_from(fromAddress);
-    erc1155.set_to(toAddress);
-    erc1155.set_token_id(tokenId.data(), tokenId.size());
-    erc1155.set_value(valueData.data(), valueData.size());
-    erc1155.set_data(data.data(), data.size());
-
-    std::string expected = "f9014a808509c7652400830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b8e4f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000004010203040000000000000000000000000000000000000000000000000000000026a010315488201ac801ce346bffd1570de147615462d7e7db3cf08cf558465c6b79a06643943b24593bc3904a9fda63bb169881730994c973ab80f07d66a698064573";
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), expected);
-
-    // expected payload
-    Data payload;
-    {
-        auto func = ABI::Function("safeTransferFrom", std::vector<std::shared_ptr<ABI::ParamBase>>{
-                                                     std::make_shared<ABI::ParamAddress>(parse_hex(fromAddress)),
-                                                     std::make_shared<ABI::ParamAddress>(parse_hex(toAddress)),
-                                                     std::make_shared<ABI::ParamUInt256>(uint256_t(0x23c47ee5)),
-                                                     std::make_shared<ABI::ParamUInt256>(value),
-                                                     std::make_shared<ABI::ParamByteArray>(data)});
-        func.encode(payload);
-    }
-    ASSERT_EQ(hex(output.data()), hex(payload));
-    ASSERT_EQ(hex(output.data()), "f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000");
-}
-
-TEST(TWAnySignerEthereum, SignJSON) {
-    auto json = STRING(R"({"chainId":"AQ==","gasPrice":"1pOkAA==","gasLimit":"Ugg=","toAddress":"0x7d8bf18C7cE84b3E175b339c4Ca93aEd1dD166F1","transaction":{"transfer":{"amount":"A0i8paFgAA=="}}})");
-    auto key = DATA("17209af590a86462395d5881e60d11c7fa7d482cfb02b5a01b93c2eeef243543");
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeEthereum));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeEthereum));
-    assertStringsEqual(result, "f86a8084d693a400825208947d8bf18c7ce84b3e175b339c4ca93aed1dd166f1870348bca5a160008025a0fe5802b49e04c6b1705088310e133605ed8b549811a18968ad409ea02ad79f21a05bf845646fb1e1b9365f63a7fd5eb5e984094e3ed35c3bed7361aebbcbf41f10");
-}
-
-TEST(TWAnySignerEthereum, PlanNotSupported) {
-    // Ethereum does not use plan(), call it nonetheless
-    Proto::SigningInput input;
-    auto inputData = input.SerializeAsString();
-    auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t*)inputData.data(), inputData.size()));
-    auto outputTWData = WRAPD(TWAnySignerPlan(inputTWData.get(), TWCoinTypeEthereum));
-    EXPECT_EQ(TWDataSize(outputTWData.get()), 0ul);
-}
-
-TEST(TWAnySignerEthereum, SignERC1559Transfer_1442) {
-    auto chainId = store(uint256_t(3));
-    auto nonce = store(uint256_t(6));
-    auto gasLimit = store(uint256_t(21100));
-    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
-    auto maxFeePerGas = store(uint256_t(3000000000));
-    auto toAddress = "0xB9F5771C27664bF2282D98E09D7F50cEc7cB01a7";
-    auto value = uint256_t(543210987654321);
-    auto valueData = store(value);
-    auto key = parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    input.set_tx_mode(Proto::TransactionMode::Enveloped); // EIP1559
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
-    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
-    input.set_to_address(toAddress);
-    input.set_private_key(key.data(), key.size());
-    auto& transfer = *input.mutable_transaction()->mutable_transfer();
-    transfer.set_amount(valueData.data(), valueData.size());
-    transfer.set_data(Data().data(), 0);
-
-    // https://ropsten.etherscan.io/tx/0x14429509307efebfdaa05227d84c147450d168c68539351fbc01ed87c916ab2e
-    std::string expected = "02f8710306847735940084b2d05e0082526c94b9f5771c27664bf2282d98e09d7f50cec7cb01a78701ee0c29f50cb180c080a092c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c64a06487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58";
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    EXPECT_EQ(hex(output.encoded()), expected);
-    EXPECT_EQ(hex(output.v()), "00");
-    EXPECT_EQ(hex(output.r()), "92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c64");
-    EXPECT_EQ(hex(output.s()), "6487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58");
-    EXPECT_EQ(hex(output.data()), "");
-}
-
-TEST(TWAnySignerEthereum, SignERC20Transfer_1559) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasLimit = store(uint256_t(78009));                   // 130B9
-    auto maxInclusionFeePerGas = store(uint256_t(2000000000)); // 77359400
-    auto maxFeePerGas = store(uint256_t(3000000000));          // B2D05E00
-    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
-    auto token = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
-    auto amount = uint256_t(2000000000000000000);
-    auto amountData = store(amount);
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    input.set_tx_mode(Proto::TransactionMode::Enveloped);
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
-    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
-    input.set_to_address(token);
-    input.set_private_key(key.data(), key.size());
-    auto& erc20 = *input.mutable_transaction()->mutable_erc20_transfer();
-    erc20.set_to(toAddress);
-    erc20.set_amount(amountData.data(), amountData.size());
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), "02f8b00180847735940084b2d05e00830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000c080a0adfcfdf98d4ed35a8967a0c1d78b42adb7c5d831cf5a3272654ec8f8bcd7be2ea011641e065684f6aa476f4fd250aa46cd0b44eccdb0a6e1650d658d1998684cdf");
-}
-
-TEST(TWAnySignerEthereum, SignERC20Approve_1559) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasLimit = store(uint256_t(78009)); // 130B9
-    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
-    auto maxFeePerGas = store(uint256_t(3000000000));
-    auto spenderAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
-    auto token = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
-    auto amount = store(uint256_t(2000000000000000000));
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    input.set_tx_mode(Proto::TransactionMode::Enveloped);
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
-    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
-    input.set_to_address(token);
-    input.set_private_key(key.data(), key.size());
-    auto& erc20 = *input.mutable_transaction()->mutable_erc20_approve();
-    erc20.set_spender(spenderAddress);
-    erc20.set_amount(amount.data(), amount.size());
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), "02f8b00180847735940084b2d05e00830130b9946b175474e89094c44da98b954eedeac495271d0f80b844095ea7b30000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000c080a05a43dda3dc193480ee532a5ed67ba8fbd2e3afb9eee218f4fb955b415d592925a01300e5b5f51c8cd5bf80f018cea3fb347fae589e65355068ac44ffc996313c60");
-}
-
-TEST(TWAnySignerEthereum, SignERC721Transfer_1559) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasLimit = store(uint256_t(78009));
-    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
-    auto maxFeePerGas = store(uint256_t(3000000000));
-    auto tokenContract = "0x4e45e92ed38f885d39a733c14f1817217a89d425";
-    auto fromAddress = "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc";
-    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
-    auto tokenId = parse_hex("23c47ee5");
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    input.set_tx_mode(Proto::TransactionMode::Enveloped);
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
-    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
-    input.set_to_address(tokenContract);
-    input.set_private_key(key.data(), key.size());
-    auto& erc721 = *input.mutable_transaction()->mutable_erc721_transfer();
-    erc721.set_from(fromAddress);
-    erc721.set_to(toAddress);
-    erc721.set_token_id(tokenId.data(), tokenId.size());
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), "02f8d00180847735940084b2d05e00830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b86423b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee5c080a0dbd591d1eac39bad62d7c158d5e1d55e7014d2218998f8980462e2f283f42d4aa05acadb904484a0fb5526a4c64b8addb8aac4f6548f90199e40eb787b79faed4a");
-}
-
-TEST(TWAnySignerEthereum, SignERC1155Transfer_1559) {
-    auto chainId = store(uint256_t(1));
-    auto nonce = store(uint256_t(0));
-    auto gasLimit = store(uint256_t(78009));
-    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
-    auto maxFeePerGas = store(uint256_t(3000000000));
-    auto tokenContract = "0x4e45e92ed38f885d39a733c14f1817217a89d425";
-    auto fromAddress = "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc";
-    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
-    auto tokenId = parse_hex("23c47ee5");
-    auto value = uint256_t(2000000000000000000);
-    auto valueData = store(value);
-    auto data = parse_hex("01020304");
-    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
-
-    Proto::SigningInput input;
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    input.set_tx_mode(Proto::TransactionMode::Enveloped);
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
-    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
-    input.set_to_address(tokenContract);
-    input.set_private_key(key.data(), key.size());
-    auto& erc1155 = *input.mutable_transaction()->mutable_erc1155_transfer();
-    erc1155.set_from(fromAddress);
-    erc1155.set_to(toAddress);
-    erc1155.set_token_id(tokenId.data(), tokenId.size());
-    erc1155.set_value(valueData.data(), valueData.size());
-    erc1155.set_data(data.data(), data.size());
-
-    // sign test
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEthereum);
-
-    ASSERT_EQ(hex(output.encoded()), "02f901500180847735940084b2d05e00830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b8e4f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000c080a0533df41dda5540c57257b7fe89c29cefff0155c333e063220df2bf9680fcc15aa036a844fd20de5a51de96ceaaf078558e87d86426a4a5d4b215ee1fd0fa397f8a");
-}
-
-} // namespace TW::Ethereum
diff --git a/tests/Ethereum/TWCoinTypeTests.cpp b/tests/Ethereum/TWCoinTypeTests.cpp
deleted file mode 100644
index 128fa78357e..00000000000
--- a/tests/Ethereum/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWEthereumCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeEthereum));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x9edaf0f7d9c6629c31bbf0471fc07d696c73b566b93783f7e25d8d5d2b62fa4f"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeEthereum, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x5bb497e8d9fe26e92dd1be01e32076c8e024d167"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeEthereum, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeEthereum));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeEthereum));
-    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeEthereum));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeEthereum), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeEthereum));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeEthereum));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeEthereum));
-    assertStringsEqual(symbol, "ETH");
-    assertStringsEqual(txUrl, "https://etherscan.io/tx/0x9edaf0f7d9c6629c31bbf0471fc07d696c73b566b93783f7e25d8d5d2b62fa4f");
-    assertStringsEqual(accUrl, "https://etherscan.io/address/0x5bb497e8d9fe26e92dd1be01e32076c8e024d167");
-    assertStringsEqual(id, "ethereum");
-    assertStringsEqual(name, "Ethereum");
-    assertStringsEqual(chainId, "1");
-}
diff --git a/tests/Ethereum/TWEthereumAbiTests.cpp b/tests/Ethereum/TWEthereumAbiTests.cpp
deleted file mode 100644
index be8a59d4731..00000000000
--- a/tests/Ethereum/TWEthereumAbiTests.cpp
+++ /dev/null
@@ -1,340 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWEthereumAbi.h>
-#include <TrustWalletCore/TWEthereumAbiFunction.h>
-#include <TrustWalletCore/TWString.h>
-
-#include "Ethereum/ABI.h"
-#include "Data.h"
-#include "HexCoding.h"
-#include "uint256.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-#include <string>
-
-namespace TW::Ethereum {
-
-TEST(TWEthereumAbi, FuncCreateEmpty) {
-    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("baz")).get());
-    EXPECT_TRUE(func != nullptr);
-
-    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
-    std::string type2 = TWStringUTF8Bytes(type.get());
-    EXPECT_EQ("baz()", type2);
-
-    // delete
-    TWEthereumAbiFunctionDelete(func);
-}
-
-TEST(TWEthereumAbi, FuncCreate1) {
-    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("baz")).get());
-    EXPECT_TRUE(func != nullptr);
-
-    auto p1index = TWEthereumAbiFunctionAddParamUInt64(func, 69, false);
-    EXPECT_EQ(0, p1index);
-    auto p2index = TWEthereumAbiFunctionAddParamUInt64(func, 9, true);
-    EXPECT_EQ(0, p2index);
-    // check back get value
-    auto p2val2 = TWEthereumAbiFunctionGetParamUInt64(func, p2index, true);
-    EXPECT_EQ(9ul, p2val2);
-
-    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
-    std::string type2 = TWStringUTF8Bytes(type.get());
-    EXPECT_EQ("baz(uint64)", type2);
-
-    // delete
-    TWEthereumAbiFunctionDelete(func);
-}
-
-TEST(TWEthereumAbi, FuncCreate2) {
-    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("baz")).get());
-    EXPECT_TRUE(func != nullptr);
-
-    auto p1valStr = WRAPS(TWStringCreateWithUTF8Bytes("0045"));
-    auto p1val = WRAPD(TWDataCreateWithHexString(p1valStr.get()));
-    auto p1index = TWEthereumAbiFunctionAddParamUInt256(func, p1val.get(), false);
-    EXPECT_EQ(0, p1index);
-
-    Data dummy(0);
-    auto p2index = TWEthereumAbiFunctionAddParamUInt256(func, &dummy, true);
-    EXPECT_EQ(0, p2index);
-
-    // check back get value
-    auto p2val2 = WRAPD(TWEthereumAbiFunctionGetParamUInt256(func, p2index, true));
-    Data p2val3 = data(TWDataBytes(p2val2.get()), TWDataSize(p2val2.get()));
-    EXPECT_EQ("00", hex(p2val3));
-
-    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
-    EXPECT_EQ("baz(uint256)", std::string(TWStringUTF8Bytes(type.get())));
-
-    // delete
-    TWEthereumAbiFunctionDelete(func);
-}
-
-TEST(TWEthereumAbi, EncodeFuncCase1) {
-    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("sam")).get());
-    EXPECT_TRUE(func != nullptr);
-    
-    EXPECT_EQ(0, TWEthereumAbiFunctionAddParamBytes(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("64617665")).get())).get(), false));
-    EXPECT_EQ(1, TWEthereumAbiFunctionAddParamBool(func, true, false));
-    auto paramArrIdx = TWEthereumAbiFunctionAddParamArray(func, false);
-    EXPECT_EQ(2, paramArrIdx);
-    EXPECT_EQ(0, TWEthereumAbiFunctionAddInArrayParamUInt256(func, paramArrIdx, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("01")).get())).get()));
-    EXPECT_EQ(1, TWEthereumAbiFunctionAddInArrayParamUInt256(func, paramArrIdx, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("02")).get())).get()));
-    EXPECT_EQ(2, TWEthereumAbiFunctionAddInArrayParamUInt256(func, paramArrIdx, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("03")).get())).get()));
-
-    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
-    EXPECT_EQ("sam(bytes,bool,uint256[])", std::string(TWStringUTF8Bytes(type.get())));
-
-    auto encoded = WRAPD(TWEthereumAbiEncode(func));
-    Data enc2 = data(TWDataBytes(encoded.get()), TWDataSize(encoded.get()));
-    EXPECT_EQ("a5643bf2"
-        "0000000000000000000000000000000000000000000000000000000000000060"
-        "0000000000000000000000000000000000000000000000000000000000000001"
-        "00000000000000000000000000000000000000000000000000000000000000a0"
-        "0000000000000000000000000000000000000000000000000000000000000004"
-        "6461766500000000000000000000000000000000000000000000000000000000"
-        "0000000000000000000000000000000000000000000000000000000000000003"
-        "0000000000000000000000000000000000000000000000000000000000000001"
-        "0000000000000000000000000000000000000000000000000000000000000002"
-        "0000000000000000000000000000000000000000000000000000000000000003",
-        hex(enc2));
-
-    // delete
-    TWEthereumAbiFunctionDelete(func);
-}
-
-TEST(TWEthereumAbi, EncodeFuncCase2) {
-    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("f")).get());
-    EXPECT_TRUE(func != nullptr);
-    
-    EXPECT_EQ(0, TWEthereumAbiFunctionAddParamUInt256(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false));
-    auto paramArrIdx = TWEthereumAbiFunctionAddParamArray(func, false);
-    EXPECT_EQ(1, paramArrIdx);
-    EXPECT_EQ(0, TWEthereumAbiFunctionAddInArrayParamUInt32(func, paramArrIdx, 0x456));
-    EXPECT_EQ(1, TWEthereumAbiFunctionAddInArrayParamUInt32(func, paramArrIdx, 0x789));
-    EXPECT_EQ(2, TWEthereumAbiFunctionAddParamBytesFix(func, 10, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("31323334353637383930")).get())).get(), false));
-    EXPECT_EQ(3, TWEthereumAbiFunctionAddParamString(func, WRAPS(TWStringCreateWithUTF8Bytes("Hello, world!")).get(), false));
-
-    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
-    EXPECT_EQ("f(uint256,uint32[],bytes10,string)", std::string(TWStringUTF8Bytes(type.get())));
-
-    auto encoded = WRAPD(TWEthereumAbiEncode(func));
-    Data enc2 = data(TWDataBytes(encoded.get()), TWDataSize(encoded.get()));
-    EXPECT_EQ("47b941bf"
-        "0000000000000000000000000000000000000000000000000000000000000123"
-        "0000000000000000000000000000000000000000000000000000000000000080"
-        "3132333435363738393000000000000000000000000000000000000000000000"
-        "00000000000000000000000000000000000000000000000000000000000000e0"
-        "0000000000000000000000000000000000000000000000000000000000000002"
-        "0000000000000000000000000000000000000000000000000000000000000456"
-        "0000000000000000000000000000000000000000000000000000000000000789"
-        "000000000000000000000000000000000000000000000000000000000000000d"
-        "48656c6c6f2c20776f726c642100000000000000000000000000000000000000",
-        hex(enc2));
-
-    // delete
-    TWEthereumAbiFunctionDelete(func);
-}
-
-TEST(TWEthereumAbi, EncodeFuncMonster) {
-    // Monster function with all parameters types
-    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("monster")).get());
-    EXPECT_TRUE(func != nullptr);
-    
-    TWEthereumAbiFunctionAddParamUInt8(func, 1, false);
-    TWEthereumAbiFunctionAddParamUInt16(func, 2, false);
-    TWEthereumAbiFunctionAddParamUInt32(func, 3, false);
-    TWEthereumAbiFunctionAddParamUInt64(func, 4, false);
-    TWEthereumAbiFunctionAddParamUIntN(func, 168, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false);
-    TWEthereumAbiFunctionAddParamUInt256(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false);
-    TWEthereumAbiFunctionAddParamInt8(func, 1, false);
-    TWEthereumAbiFunctionAddParamInt16(func, 2, false);
-    TWEthereumAbiFunctionAddParamInt32(func, 3, false);
-    TWEthereumAbiFunctionAddParamInt64(func, 4, false);
-    TWEthereumAbiFunctionAddParamIntN(func, 168, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false);
-    TWEthereumAbiFunctionAddParamInt256(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false);
-    TWEthereumAbiFunctionAddParamBool(func, true, false);
-    TWEthereumAbiFunctionAddParamString(func, WRAPS(TWStringCreateWithUTF8Bytes("Hello, world!")).get(), false);
-    TWEthereumAbiFunctionAddParamAddress(func,
-        WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("f784682c82526e245f50975190ef0fff4e4fc077")).get())).get(), false);
-    TWEthereumAbiFunctionAddParamBytes(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("3132333435")).get())).get(), false);
-    TWEthereumAbiFunctionAddParamBytesFix(func, 5, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("3132333435")).get())).get(), false);
-    
-    TWEthereumAbiFunctionAddInArrayParamUInt8(func, TWEthereumAbiFunctionAddParamArray(func, false), 1);
-    TWEthereumAbiFunctionAddInArrayParamUInt16(func, TWEthereumAbiFunctionAddParamArray(func, false), 2);
-    TWEthereumAbiFunctionAddInArrayParamUInt32(func, TWEthereumAbiFunctionAddParamArray(func, false), 3);
-    TWEthereumAbiFunctionAddInArrayParamUInt64(func, TWEthereumAbiFunctionAddParamArray(func, false), 4);
-    TWEthereumAbiFunctionAddInArrayParamUIntN(func, TWEthereumAbiFunctionAddParamArray(func, false), 168, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get());
-    TWEthereumAbiFunctionAddInArrayParamUInt256(func, TWEthereumAbiFunctionAddParamArray(func, false), WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get());
-    TWEthereumAbiFunctionAddInArrayParamInt8(func, TWEthereumAbiFunctionAddParamArray(func, false), 1);
-    TWEthereumAbiFunctionAddInArrayParamInt16(func, TWEthereumAbiFunctionAddParamArray(func, false), 2);
-    TWEthereumAbiFunctionAddInArrayParamInt32(func, TWEthereumAbiFunctionAddParamArray(func, false), 3);
-    TWEthereumAbiFunctionAddInArrayParamInt64(func, TWEthereumAbiFunctionAddParamArray(func, false), 4);
-    TWEthereumAbiFunctionAddInArrayParamIntN(func, TWEthereumAbiFunctionAddParamArray(func, false), 168, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get());
-    TWEthereumAbiFunctionAddInArrayParamInt256(func, TWEthereumAbiFunctionAddParamArray(func, false), WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get());
-    TWEthereumAbiFunctionAddInArrayParamBool(func, TWEthereumAbiFunctionAddParamArray(func, false), true);
-    TWEthereumAbiFunctionAddInArrayParamString(func, TWEthereumAbiFunctionAddParamArray(func, false), WRAPS(TWStringCreateWithUTF8Bytes("Hello, world!")).get());
-    TWEthereumAbiFunctionAddInArrayParamAddress(func, TWEthereumAbiFunctionAddParamArray(func, false), 
-        WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("f784682c82526e245f50975190ef0fff4e4fc077")).get())).get());
-    TWEthereumAbiFunctionAddInArrayParamBytes(func, TWEthereumAbiFunctionAddParamArray(func, false), WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("3132333435")).get())).get());
-    TWEthereumAbiFunctionAddInArrayParamBytesFix(func, TWEthereumAbiFunctionAddParamArray(func, false), 5, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("3132333435")).get())).get());
-
-    // check back out params
-    EXPECT_EQ(1, TWEthereumAbiFunctionGetParamUInt8(func, 0, false));
-    EXPECT_EQ(4ul, TWEthereumAbiFunctionGetParamUInt64(func, 3, false));
-    EXPECT_EQ(true, TWEthereumAbiFunctionGetParamBool(func, 12, false));
-    EXPECT_EQ(std::string("Hello, world!"), std::string(TWStringUTF8Bytes(WRAPS(TWEthereumAbiFunctionGetParamString(func, 13, false)).get())));
-    WRAPD(TWEthereumAbiFunctionGetParamAddress(func, 14, false));
-
-    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
-    EXPECT_EQ(
-        "monster(uint8,uint16,uint32,uint64,uint168,uint256,int8,int16,int32,int64,int168,int256,bool,string,address,bytes,bytes5,"
-        "uint8[],uint16[],uint32[],uint64[],uint168[],uint256[],int8[],int16[],int32[],int64[],int168[],int256[],bool[],string[],address[],bytes[],bytes5[])",
-        std::string(TWStringUTF8Bytes(type.get())));
-
-    auto encoded = WRAPD(TWEthereumAbiEncode(func));
-    Data enc2 = data(TWDataBytes(encoded.get()), TWDataSize(encoded.get()));
-    EXPECT_EQ(4ul + 76 * 32, enc2.size());
-
-    // delete
-    TWEthereumAbiFunctionDelete(func);
-}
-
-TEST(TWEthereumAbi, DecodeOutputFuncCase1) {
-    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("readout")).get());
-    EXPECT_TRUE(func != nullptr);
-
-    TWEthereumAbiFunctionAddParamAddress(func, 
-        WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("f784682c82526e245f50975190ef0fff4e4fc077")).get())).get(), false);
-    TWEthereumAbiFunctionAddParamUInt64(func, 1000, false);
-    EXPECT_EQ(0, TWEthereumAbiFunctionAddParamUInt64(func, 0, true));
-
-    // original output value
-    EXPECT_EQ(0ul, TWEthereumAbiFunctionGetParamUInt64(func, 0, true));
-
-    // decode
-    auto encoded = WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0000000000000000000000000000000000000000000000000000000000000045")).get()));
-    EXPECT_EQ(true, TWEthereumAbiDecodeOutput(func, encoded.get()));
-
-    // new output value
-    EXPECT_EQ(0x45ul, TWEthereumAbiFunctionGetParamUInt64(func, 0, true));
-
-    // delete
-    TWEthereumAbiFunctionDelete(func);
-}
-
-TEST(TWEthereumAbi, GetParamWrongType) {
-    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("func")).get());
-    ASSERT_TRUE(func != nullptr);
-    // add parameters
-    EXPECT_EQ(0, TWEthereumAbiFunctionAddParamUInt8(func, 1, true));
-    EXPECT_EQ(1, TWEthereumAbiFunctionAddParamUInt64(func, 2, true));
-
-    // GetParameter with correct types
-    EXPECT_EQ(1, TWEthereumAbiFunctionGetParamUInt8(func, 0, true));
-    EXPECT_EQ(2ul, TWEthereumAbiFunctionGetParamUInt64(func, 1, true));
-
-    // GetParameter with wrong type, default value (0) is returned
-    EXPECT_EQ(0, TWEthereumAbiFunctionGetParamUInt8(func, 1, true));
-    EXPECT_EQ(0ul, TWEthereumAbiFunctionGetParamUInt64(func, 0, true));
-    EXPECT_EQ("00", hex(*(static_cast<const Data*>(WRAPD(TWEthereumAbiFunctionGetParamUInt256(func, 0, true)).get()))));
-    EXPECT_EQ(false, TWEthereumAbiFunctionGetParamBool(func, 0, true));
-    EXPECT_EQ("", std::string(TWStringUTF8Bytes(WRAPS(TWEthereumAbiFunctionGetParamString(func, 0, true)).get())));
-    EXPECT_EQ("", hex(*(static_cast<const Data*>(WRAPD(TWEthereumAbiFunctionGetParamAddress(func, 0, true)).get()))));
-
-    // GetParameter with wrong index, default value (0) is returned
-    EXPECT_EQ(0, TWEthereumAbiFunctionGetParamUInt8(func, 99, true));
-    EXPECT_EQ(0ul, TWEthereumAbiFunctionGetParamUInt64(func, 99, true));
-    EXPECT_EQ("00", hex(*(static_cast<const Data*>(WRAPD(TWEthereumAbiFunctionGetParamUInt256(func, 99, true)).get()))));
-    EXPECT_EQ(false, TWEthereumAbiFunctionGetParamBool(func, 99, true));
-    EXPECT_EQ("", std::string(TWStringUTF8Bytes(WRAPS(TWEthereumAbiFunctionGetParamString(func, 99, true)).get())));
-    EXPECT_EQ("", hex(*(static_cast<const Data*>(WRAPD(TWEthereumAbiFunctionGetParamAddress(func, 99, true)).get()))));
-
-    // delete
-    TWEthereumAbiFunctionDelete(func);
-}
-
-TEST(TWEthereumAbi, DecodeCall) {
-    auto callHex = STRING("c47f0027000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000086465616462656566000000000000000000000000000000000000000000000000");
-    auto call = WRAPD(TWDataCreateWithHexString(callHex.get()));
-    auto abi = STRING(R"|({"c47f0027":{"constant":false,"inputs":[{"name":"name","type":"string"}],"name":"setName","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}})|");
-    auto decoded = WRAPS(TWEthereumAbiDecodeCall(call.get(), abi.get()));
-    auto expected = R"|({"function":"setName(string)","inputs":[{"name":"name","type":"string","value":"deadbeef"}]})|";
-
-    assertStringsEqual(decoded, expected);
-}
-
-TEST(TWEthereumAbi, DecodeInvalidCall) {
-    auto callHex = STRING("c47f002700");
-    auto call = WRAPD(TWDataCreateWithHexString(callHex.get()));
-
-    auto decoded1 = TWEthereumAbiDecodeCall(call.get(), STRING(",,").get());
-    auto decoded2 = TWEthereumAbiDecodeCall(call.get(), STRING("{}").get());
-
-    EXPECT_TRUE(decoded1 == nullptr);
-    EXPECT_TRUE(decoded2 == nullptr);
-}
-
-TEST(TWEthereumAbi, encodeTyped) {
-    auto message = WRAPS(TWStringCreateWithUTF8Bytes(
-        R"({
-            "types": {
-                "EIP712Domain": [
-                    {"name": "name", "type": "string"},
-                    {"name": "version", "type": "string"},
-                    {"name": "chainId", "type": "uint256"},
-                    {"name": "verifyingContract", "type": "address"}
-                ],
-                "Person": [
-                    {"name": "name", "type": "string"},
-                    {"name": "wallets", "type": "address[]"}
-                ],
-                "Mail": [
-                    {"name": "from", "type": "Person"},
-                    {"name": "to", "type": "Person[]"},
-                    {"name": "contents", "type": "string"}
-                ]
-            },
-            "primaryType": "Mail",
-            "domain": {
-                "name": "Ether Mail",
-                "version": "1",
-                "chainId": 1,
-                "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
-            },
-            "message": {
-                "from": {
-                    "name": "Cow",
-                    "wallets": [
-                        "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
-                        "DeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"
-                    ]
-                },
-                "to": [
-                    {
-                        "name": "Bob",
-                        "wallets": [
-                            "bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
-                            "B0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57",
-                            "B0B0b0b0b0b0B000000000000000000000000000"
-                        ]
-                    }
-                ],
-                "contents": "Hello, Bob!"
-            }
-        })"));
-    auto hash = WRAPD(TWEthereumAbiEncodeTyped(message.get()));
-
-    EXPECT_EQ(
-        hex(TW::data(TWDataBytes(hash.get()), TWDataSize(hash.get()))),
-        "a85c2e2b118698e88db68a8105b794a8cc7cec074e89ef991cb4f5f533819cc2"
-    );
-}
-
-} // namespace TW::Ethereum
diff --git a/tests/Ethereum/ValueDecoderTests.cpp b/tests/Ethereum/ValueDecoderTests.cpp
deleted file mode 100644
index c576971e9d4..00000000000
--- a/tests/Ethereum/ValueDecoderTests.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Ethereum/ABI/ValueDecoder.h"
-#include <HexCoding.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::Ethereum::tests {
-
-uint256_t decodeFromHex(std::string s) {
-    auto data = parse_hex(s);
-    return ABI::ValueDecoder::decodeUInt256(data);
-}
-
-TEST(EthereumAbiValueDecoder, decodeUInt256) {
-    EXPECT_EQ(uint256_t(0), decodeFromHex(""));
-    EXPECT_EQ(uint256_t(0), decodeFromHex("0000000000000000000000000000000000000000000000000000000000000000"));
-    EXPECT_EQ(uint256_t(1), decodeFromHex("0000000000000000000000000000000000000000000000000000000000000001"));
-    EXPECT_EQ(uint256_t(123456), decodeFromHex("01e240"));
-    EXPECT_EQ(uint256_t(10020405371567), decodeFromHex("0000000000000000000000000000000000000000000000000000091d0eb3e2af"));
-    EXPECT_EQ(uint256_t(10020405371567), decodeFromHex("0000000000000000000000000000000000000000000000000000091d0eb3e2af00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"));
-}
-
-TEST(EthereumAbiValueDecoder, decodeValue) {
-    EXPECT_EQ("42", ABI::ValueDecoder::decodeValue(parse_hex("000000000000000000000000000000000000000000000000000000000000002a"), "uint"));
-    EXPECT_EQ("24", ABI::ValueDecoder::decodeValue(parse_hex("0000000000000000000000000000000000000000000000000000000000000018"), "uint8"));
-    EXPECT_EQ("123456", ABI::ValueDecoder::decodeValue(parse_hex("000000000000000000000000000000000000000000000000000000000001e240"), "uint256"));
-    EXPECT_EQ("0xf784682c82526e245f50975190ef0fff4e4fc077", ABI::ValueDecoder::decodeValue(parse_hex("000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077"), "address"));
-    EXPECT_EQ("Hello World!    Hello World!    Hello World!",
-              ABI::ValueDecoder::decodeValue(parse_hex(
-                                                 "000000000000000000000000000000000000000000000000000000000000002c"
-                                                 "48656c6c6f20576f726c64212020202048656c6c6f20576f726c642120202020"
-                                                 "48656c6c6f20576f726c64210000000000000000000000000000000000000000"),
-                                             "string"));
-    EXPECT_EQ("0x31323334353637383930", ABI::ValueDecoder::decodeValue(parse_hex("3132333435363738393000000000000000000000000000000000000000000000"), "bytes10"));
-}
-
-TEST(EthereumAbiValueDecoder, decodeArray) {
-    {
-        // Array of UInt8
-        Data input = parse_hex(
-            "0000000000000000000000000000000000000000000000000000000000000003"
-            "0000000000000000000000000000000000000000000000000000000000000031"
-            "0000000000000000000000000000000000000000000000000000000000000032"
-            "0000000000000000000000000000000000000000000000000000000000000033");
-        auto res = ABI::ValueDecoder::decodeArray(input, "uint8[]");
-        EXPECT_EQ(3ul, res.size());
-        EXPECT_EQ("49", res[0]);
-        EXPECT_EQ("50", res[1]);
-        EXPECT_EQ("51", res[2]);
-    }
-    {
-        // Array of Address
-        Data input = parse_hex(
-            "0000000000000000000000000000000000000000000000000000000000000002"
-            "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077"
-            "0000000000000000000000002e00cd222cb42b616d86d037cc494e8ab7f5c9a3");
-        auto res = ABI::ValueDecoder::decodeArray(input, "address[]");
-        EXPECT_EQ(2ul, res.size());
-        EXPECT_EQ("0xf784682c82526e245f50975190ef0fff4e4fc077", res[0]);
-        EXPECT_EQ("0x2e00cd222cb42b616d86d037cc494e8ab7f5c9a3", res[1]);
-    }
-    {
-        // Array of ByteArray
-        Data input = parse_hex(
-            "0000000000000000000000000000000000000000000000000000000000000002"
-            "0000000000000000000000000000000000000000000000000000000000000040"
-            "0000000000000000000000000000000000000000000000000000000000000080"
-            "0000000000000000000000000000000000000000000000000000000000000002"
-            "1011000000000000000000000000000000000000000000000000000000000000"
-            "0000000000000000000000000000000000000000000000000000000000000003"
-            "1022220000000000000000000000000000000000000000000000000000000000");
-        auto res = ABI::ValueDecoder::decodeArray(input, "bytes[]");
-        EXPECT_EQ(2ul, res.size());
-        EXPECT_EQ("0x1011", res[0]);
-        EXPECT_EQ("0x102222", res[1]);
-    }
-}
-
-} // namespace TW::Ethereum::tests
diff --git a/tests/EthereumClassic/TWCoinTypeTests.cpp b/tests/EthereumClassic/TWCoinTypeTests.cpp
deleted file mode 100644
index 4e0183374fe..00000000000
--- a/tests/EthereumClassic/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWEthereumClassicCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeEthereumClassic));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x66004165d3901819dc22e568931591d2e4287bda54995f4ce2701a12016f5997"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeEthereumClassic, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x9eab4b0fc468a7f5d46228bf5a76cb52370d068d"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeEthereumClassic, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeEthereumClassic));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeEthereumClassic));
-    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeEthereumClassic));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeEthereumClassic), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeEthereumClassic));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeEthereumClassic));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeEthereumClassic));
-    assertStringsEqual(symbol, "ETC");
-    assertStringsEqual(txUrl, "https://blockscout.com/etc/mainnet/tx/0x66004165d3901819dc22e568931591d2e4287bda54995f4ce2701a12016f5997");
-    assertStringsEqual(accUrl, "https://blockscout.com/etc/mainnet/address/0x9eab4b0fc468a7f5d46228bf5a76cb52370d068d");
-    assertStringsEqual(id, "classic");
-    assertStringsEqual(name, "Ethereum Classic");
-    assertStringsEqual(chainId, "61");
-}
diff --git a/tests/Everscale/AddressTests.cpp b/tests/Everscale/AddressTests.cpp
deleted file mode 100644
index 5896183c21d..00000000000
--- a/tests/Everscale/AddressTests.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Everscale/Address.h"
-#include "Everscale/WorkchainType.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include <gtest/gtest.h>
-#include <vector>
-
-using namespace TW;
-
-namespace TW::Everscale {
-
-TEST(EverscaleAddress, Valid) {
-    ASSERT_TRUE(Address::isValid("0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
-}
-
-TEST(EverscaleAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("hello world"));
-    ASSERT_FALSE(Address::isValid("83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
-    ASSERT_FALSE(Address::isValid("1:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
-    ASSERT_FALSE(Address::isValid("-2:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
-    ASSERT_FALSE(Address::isValid("2147483648:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
-    ASSERT_FALSE(Address::isValid("0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469ab"));
-}
-
-TEST(EverscaleAddress, FromString) {
-    auto address = Address("0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a");
-    ASSERT_EQ(address.string(), "0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a");
-
-    auto address_uppercase = Address("0:83A0352908060FA87839195D8A763A8D9AB28F8FA41468832B398A719CC6469A");
-    ASSERT_EQ(address_uppercase.string(), "0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a");
-}
-
-TEST(EverscaleAddress, FromPrivateKey) {
-    auto privateKey = PrivateKey(parse_hex("5b59e0372d19b6355c73fa8cc708fa3301ae2ec21bb6277e8b79d386ccb7846f"));
-    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519), WorkchainType::Basechain);
-    ASSERT_EQ(address.string(), "0:269fee242eb410786abe1777a14785c8bbeb1e34100c7570e17698b36ad66fb0");
-}
-
-TEST(EverscaleAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("e4925f9932df8d7fd0042efff3e2178a972028b644ded3a3b66f6d0577f82e78"), TWPublicKeyTypeED25519);
-    auto address = Address(publicKey, WorkchainType::Basechain);
-    ASSERT_EQ(address.string(), "0:269fee242eb410786abe1777a14785c8bbeb1e34100c7570e17698b36ad66fb0");
-}
-
-} // namespace TW::Everscale
diff --git a/tests/Everscale/SignerTests.cpp b/tests/Everscale/SignerTests.cpp
deleted file mode 100644
index 80eb521a52d..00000000000
--- a/tests/Everscale/SignerTests.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Everscale/Messages.h"
-#include "Everscale/Signer.h"
-
-#include "Base64.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Everscale {
-
-TEST(EverscaleSigner, TransferWithDeploy) {
-    auto input = Proto::SigningInput();
-
-    auto& transfer = *input.mutable_transfer();
-    transfer.set_bounce(false);
-    transfer.set_behavior(Proto::MessageBehavior::SimpleTransfer);
-    transfer.set_amount(500000000);
-    transfer.set_expired_at(1680770631);
-    transfer.set_to("0:db18a67f4626f15ac0537a18445937f685f9b30184f0d7b28be4bdeb92d2fd90");
-
-    // NOTE: There is `set_encoded_contract_data` because contract was not deployed yet
-
-    auto privateKey = parse_hex("542bd4288352f1c6b270046f153d406aec054a0a06000ab9b36b5c6dd3050ad4");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(Cell::fromBase64(output.encoded())->hash), "bfb18e56e9d00d783c7eb1726f08bf613dd0f01a110a130c0f8f91bb13390a39");
-
-    // Link to the message: https://everscan.io/messages/bfb18e56e9d00d783c7eb1726f08bf613dd0f01a110a130c0f8f91bb13390a39
-    ASSERT_EQ(output.encoded(), "te6ccgICAAQAAQAAAUoAAAPhiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrBGMBTen55/RbfcIBoeCrPB1cxPMcHRx7xyBzJmdtewBPaTu/WuHgnqg09jQaxTEcii+Nuqm7p3b6iMq+/6598ggCXUlsUyF0MjgAAAAAHAAAwACAAEAaEIAbYxTP6MTeK1gKb0MIiyb+0L82YDCeGvZRfJe9clpfsgg7msoAAAAAAAAAAAAAAAAAAAAUAAAAABLqS2KOWKN+7Y5OSiKhKisiw6t/h2ovvR3WbapyAtrdctwupwA3v8AIN0gggFMl7ohggEznLqxn3Gw7UTQ0x/THzHXC//jBOCk8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA==");
-}
-
-TEST(EverscaleSigner, Transfer1) {
-    auto input = Proto::SigningInput();
-
-    auto& transfer = *input.mutable_transfer();
-    transfer.set_bounce(false);
-    transfer.set_behavior(Proto::MessageBehavior::SimpleTransfer);
-    transfer.set_amount(100000000);
-    transfer.set_expired_at(1680770631);
-    transfer.set_to("0:db18a67f4626f15ac0537a18445937f685f9b30184f0d7b28be4bdeb92d2fd90");
-
-    transfer.set_encoded_contract_data("te6ccgEBAQEAKgAAUAAAAAFLqS2KOWKN+7Y5OSiKhKisiw6t/h2ovvR3WbapyAtrdctwupw=");
-
-    auto privateKey = parse_hex("542bd4288352f1c6b270046f153d406aec054a0a06000ab9b36b5c6dd3050ad4");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(Cell::fromBase64(output.encoded())->hash), "73807b0a3ca2d8564c023dccd5b9da222a270f68338c6fc2c064dda376a2c59d");
-
-    // Link to the message: https://everscan.io/messages/73807b0a3ca2d8564c023dccd5b9da222a270f68338c6fc2c064dda376a2c59d
-    ASSERT_EQ(output.encoded(), "te6ccgICAAIAAQAAAKoAAAHfiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrAImASIQKH2jIwoA65IGC6aua4gAA4fFo/Nuxgb3sIRELhZnSXIS7IsE2E4D+8hk3EWGVZX+ICqlN/ka9DvXduhaXUlsUyF0MjgAAAAIHAABAGhCAG2MUz+jE3itYCm9DCIsm/tC/NmAwnhr2UXyXvXJaX7IIC+vCAAAAAAAAAAAAAAAAAAA");
-}
-
-TEST(EverscaleSigner, Transfer2) {
-    auto input = Proto::SigningInput();
-
-    auto& transfer = *input.mutable_transfer();
-    transfer.set_bounce(true);
-    transfer.set_behavior(Proto::MessageBehavior::SendAllBalance);
-    transfer.set_amount(200000000);
-    transfer.set_expired_at(1680770631);
-    transfer.set_to("0:df112b59eb82792623575194c60d2f547c68d54366644a3a5e02b8132f3c4c56");
-
-    transfer.set_encoded_contract_data("te6ccgEBAQEAKgAAUAAAAAJLqS2KOWKN+7Y5OSiKhKisiw6t/h2ovvR3WbapyAtrdctwupw=");
-
-    auto privateKey = parse_hex("542bd4288352f1c6b270046f153d406aec054a0a06000ab9b36b5c6dd3050ad4");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(Cell::fromBase64(output.encoded())->hash), "e35616cfa88e115580f07c6b41ae3ded1902d2bab1efefb74f677b4aececef24");
-
-    // Link to the message: https://everscan.io/messages/e35616cfa88e115580f07c6b41ae3ded1902d2bab1efefb74f677b4aececef24
-    ASSERT_EQ(output.encoded(), "te6ccgICAAIAAQAAAKoAAAHfiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrANrT0ivIEpuMGjKoyS9J03Wbl24jowXvdzQdLD6L3USLETUyRGbbmbUfBcNtF1FwKtmIQd0lNR1qIX9K/eloMgaXUlsUyF0MjgAAAAUFAABAGhiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrIF9eEAAAAAAAAAAAAAAAAAAA");
-}
-
-} // namespace TW::Everscale
diff --git a/tests/Everscale/TWAnyAddressTests.cpp b/tests/Everscale/TWAnyAddressTests.cpp
deleted file mode 100644
index 74d1212ec58..00000000000
--- a/tests/Everscale/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWHDWallet.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::Everscale {
-
-TEST(TWEverscale, HDWallet) {
-    auto mnemonic =
-        STRING("shoot island position soft burden budget tooth cruel issue economy destroy above");
-    auto passphrase = STRING("");
-
-    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(mnemonic.get(), passphrase.get()));
-
-    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypeEverscale, WRAPS(TWCoinTypeDerivationPath(TWCoinTypeEverscale)).get()));
-    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyEd25519(privateKey.get()));
-    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeEverscale));
-    auto addressStr = WRAPS(TWAnyAddressDescription(address.get()));
-
-    assertStringsEqual(addressStr, "0:0c39661089f86ec5926ea7d4ee4223d634ba4ed6dcc2e80c7b6a8e6d59f79b04");
-}
-
-} // namespace TW::Everscale
diff --git a/tests/Everscale/TWAnySignerTests.cpp b/tests/Everscale/TWAnySignerTests.cpp
deleted file mode 100644
index 0dbae0871ee..00000000000
--- a/tests/Everscale/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base64.h"
-#include "HexCoding.h"
-#include "proto/Everscale.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::Everscale {
-
-TEST(TWAnySignerEverscale, SignMessageToDeployWallet) {
-    Proto::SigningInput input;
-
-    auto& transfer = *input.mutable_transfer();
-    transfer.set_bounce(false);
-    transfer.set_behavior(Proto::MessageBehavior::SimpleTransfer);
-    transfer.set_amount(500000000);
-    transfer.set_expired_at(1680770631);
-    transfer.set_to("0:db18a67f4626f15ac0537a18445937f685f9b30184f0d7b28be4bdeb92d2fd90");
-
-    // NOTE: There is `set_encoded_contract_data` because contract was not deployed yet
-
-    auto privateKey = parse_hex("542bd4288352f1c6b270046f153d406aec054a0a06000ab9b36b5c6dd3050ad4");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeEverscale);
-
-    ASSERT_EQ(output.encoded(), "te6ccgICAAQAAQAAAUoAAAPhiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrBGMBTen55/RbfcIBoeCrPB1cxPMcHRx7xyBzJmdtewBPaTu/WuHgnqg09jQaxTEcii+Nuqm7p3b6iMq+/6598ggCXUlsUyF0MjgAAAAAHAAAwACAAEAaEIAbYxTP6MTeK1gKb0MIiyb+0L82YDCeGvZRfJe9clpfsgg7msoAAAAAAAAAAAAAAAAAAAAUAAAAABLqS2KOWKN+7Y5OSiKhKisiw6t/h2ovvR3WbapyAtrdctwupwA3v8AIN0gggFMl7ohggEznLqxn3Gw7UTQ0x/THzHXC//jBOCk8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA==");
-}
-
-} // namespace TW::Everscale
diff --git a/tests/Everscale/TWCoinTypeTests.cpp b/tests/Everscale/TWCoinTypeTests.cpp
deleted file mode 100644
index b737fe7dc63..00000000000
--- a/tests/Everscale/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-namespace TW::Everscale {
-
-TEST(TWEverscaleCoinType, TWCoinType) {
-    const auto coin = TWCoinTypeEverscale;
-    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
-    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
-    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
-    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("781238b2b0d15cd4cd2e2a0a142753750cd5e1b2c8b506fcede75a90e02f1268"));
-    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
-    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0:d2bf59964a05dee84a0dd1ddc0ad83ba44d49719cf843d689dc8b726d0fb59d8"));
-    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
-
-    assertStringsEqual(id, "everscale");
-    assertStringsEqual(name, "Everscale");
-    assertStringsEqual(symbol, "EVER");
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 9);
-    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEverscale);
-    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
-    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
-    assertStringsEqual(txUrl, "https://everscan.io/transactions/781238b2b0d15cd4cd2e2a0a142753750cd5e1b2c8b506fcede75a90e02f1268");
-    assertStringsEqual(accUrl, "https://everscan.io/accounts/0:d2bf59964a05dee84a0dd1ddc0ad83ba44d49719cf843d689dc8b726d0fb59d8");
-}
-
-} // namespace TW::Everscale
diff --git a/tests/Evmos/SignerTests.cpp b/tests/Evmos/SignerTests.cpp
deleted file mode 100644
index 53f599038eb..00000000000
--- a/tests/Evmos/SignerTests.cpp
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Base64.h"
-#include "proto/Cosmos.pb.h"
-#include "Cosmos/Address.h"
-#include "Cosmos/Signer.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <nlohmann/json.hpp>
-
-#include <gtest/gtest.h>
-#include <google/protobuf/util/json_util.h>
-
-namespace TW::Cosmos::evmos::tests {
-
-TEST(EvmosSigner, SignTxJsonEthermintKeyType) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::JSON); // obsolete
-    input.set_account_number(1037);
-    input.set_chain_id("evmos_9001-2");
-    input.set_memo("");
-    input.set_sequence(8);
-
-    auto fromAddress = Address("evmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
-    auto toAddress = Address("evmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("muon");
-    amountOfTx->set_amount("1");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("muon");
-    amountOfFee->set_amount("200");
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeNativeEvmos);
-    auto anotherExpectedJson =R"(
-                            {
-                                "mode":"block",
-                                "tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},
-                                "memo":"",
-                                "msg":[{"type":"cosmos-sdk/MsgSend",
-                                "value":{"amount":[{"amount":"1","denom":"muon"}],
-                                "from_address":"evmos1hsk6jryyqjfhp5dhc55tc9jtckygx0ep4mur4z",
-                                "to_address":"evmos1zt50azupanqlfam5afhv3hexwyutnuke45f6ye"}}],
-                                "signatures":
-                                        [
-                                            {
-                                                "pub_key":
-                                                        {
-                                                            "type":"ethermint/PubKeyEthSecp256k1",
-                                                            "value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"
-                                                        },
-                                                "signature":"RWt8aaBxdMAeEjym8toWskJ6WaJpEF9Ciucz2lAHkvNnTicGpzxwTUzJbJXRirSnGkejhISaYtDw2RBiq0vg5w=="
-                                            }
-                                        ]}
-                            })"_json;
-
-    /// This tx is not broadcasted, we just want to test the signature format (ethermint/PubKeyEthSecp256k1)
-    EXPECT_EQ(anotherExpectedJson, nlohmann::json::parse(output.json()));
-
-    auto signatures = nlohmann::json::parse(output.signature_json());
-
-    auto expectedSignatures = R"(
-        [
-            {
-                "pub_key":
-                    {
-                        "type":"ethermint/PubKeyEthSecp256k1",
-                        "value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"
-                    },
-                "signature":"RWt8aaBxdMAeEjym8toWskJ6WaJpEF9Ciucz2lAHkvNnTicGpzxwTUzJbJXRirSnGkejhISaYtDw2RBiq0vg5w=="
-            }
-        ])"_json;
-    EXPECT_EQ(signatures, expectedSignatures);
-}
-
-TEST(EvmosSigner, CompoundingAuthz) {
-    // Successfully broadcasted https://www.mintscan.io/evmos/txs/8D811CEC078420C41220F0B584EA0AC037763380FAC31E0E352E4BB4D1D18B79
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(2139877);
-    input.set_chain_id("evmos_9001-2");
-    input.set_memo("");
-    input.set_sequence(3);
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_auth_grant();
-    message.set_granter("evmos12m9grgas60yk0kult076vxnsrqz8xpjy9rpf3e");
-    message.set_grantee("evmos18fzq4nac28gfma6gqfvkpwrgpm5ctar2z9mxf3");
-    auto& grant_stake = *message.mutable_grant_stake();
-    grant_stake.mutable_allow_list()->add_address("evmosvaloper1umk407eed7af6anvut6llg2zevnf0dn0feqqny");
-    grant_stake.set_authorization_type(TW::Cosmos::Proto::Message_AuthorizationType_DELEGATE);
-    message.set_expiration(1692309600);
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(180859);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("aevmos");
-    amountOfFee->set_amount("4521475000000000");
-
-    auto privateKey = parse_hex("79bcbded1a5678ab34e6d9db9ad78e4e480e7b22723cc5fbf59e843732e1a8e5");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeNativeEvmos);
-    auto expected = R"(
-                {
-                    "mode":"BROADCAST_MODE_BLOCK",
-                    "tx_bytes":"CvUBCvIBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQSzwEKLGV2bW9zMTJtOWdyZ2FzNjB5azBrdWx0MDc2dnhuc3Jxejh4cGp5OXJwZjNlEixldm1vczE4ZnpxNG5hYzI4Z2ZtYTZncWZ2a3B3cmdwbTVjdGFyMno5bXhmMxpxCmcKKi9jb3Ntb3Muc3Rha2luZy52MWJldGExLlN0YWtlQXV0aG9yaXphdGlvbhI5EjUKM2V2bW9zdmFsb3BlcjF1bWs0MDdlZWQ3YWY2YW52dXQ2bGxnMnpldm5mMGRuMGZlcXFueSABEgYI4LD6pgYSfQpZCk8KKC9ldGhlcm1pbnQuY3J5cHRvLnYxLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohA4B2WHbj6sH/GWE7z/YW5PRnXYFGaGRAov7gZZI2Fv2nEgQKAggBGAMSIAoaCgZhZXZtb3MSEDQ1MjE0NzUwMDAwMDAwMDAQ+4QLGkAm17CZgB7m+CPVlITnrHosklMTL9zrUeGRs8FL8N0GcRami9zdJ+e3xuXOtJmwP7G6QNh85CRYjFj8a8lpmmJM"
-                })";
-    assertJSONEqual(output.serialized(), expected);
-}
-}
diff --git a/tests/Evmos/TWAnyAddressTests.cpp b/tests/Evmos/TWAnyAddressTests.cpp
deleted file mode 100644
index 5f52cdbf5c4..00000000000
--- a/tests/Evmos/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWCoinType.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::Evmos::tests {
-
-TEST(EvmosAnyAddress, EvmosValidate) {
-    auto string = STRING("0x30627903124Aa1e71384bc52e1cb96E4AB3252b6");
-
-    EXPECT_TRUE(TWAnyAddressIsValid(string.get(), TWCoinTypeEvmos));
-
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeEvmos));
-    
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "30627903124aa1e71384bc52e1cb96e4ab3252b6");    
-}
-
-TEST(EvmosAnyAddress, EvmosCreate) {
-    auto publicKeyHex = "045a0c6b83b8bd9827e507270cadb499b7e3a9095246f6a2213281f783d877c98b256742741b0639f317768fe4f4c2762660c2112283a7685d815507dee3229173"; // shoot island position ...
-    const auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA(publicKeyHex).get(), TWPublicKeyTypeSECP256k1Extended));
-
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeEvmos));
-
-    EXPECT_EQ(std::string(TWStringUTF8Bytes(WRAPS(TWAnyAddressDescription(addr.get())).get())), std::string("0x8f348F300873Fd5DA36950B2aC75a26584584feE"));
-
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "8f348f300873fd5da36950b2ac75a26584584fee");
-}
-
-} // namespace TW::Evmos::tests
diff --git a/tests/Evmos/TWCoinTypeTests.cpp b/tests/Evmos/TWCoinTypeTests.cpp
deleted file mode 100644
index 9e5fdcf643e..00000000000
--- a/tests/Evmos/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-namespace TW::Evmos::tests {
-
-TEST(TWEvmosCoinType, TWCoinTypeEvmos) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeEvmos));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x24af42cf4977a96d62e3a82c3cd9b519c3e7c53dd83398b88f0cb435d867b422"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeEvmos, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x30627903124Aa1e71384bc52e1cb96E4AB3252b6"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeEvmos, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeEvmos));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeEvmos));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeEvmos), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeEvmos));
-
-    assertStringsEqual(symbol, "EVMOS");
-    assertStringsEqual(txUrl, "https://evm.evmos.org/tx/0x24af42cf4977a96d62e3a82c3cd9b519c3e7c53dd83398b88f0cb435d867b422");
-    assertStringsEqual(accUrl, "https://evm.evmos.org/address/0x30627903124Aa1e71384bc52e1cb96E4AB3252b6");
-    assertStringsEqual(id, "evmos");
-    assertStringsEqual(name, "Evmos");
-}
-
-} // namespace TW::Evmos::tests
diff --git a/tests/FIO/AddressTests.cpp b/tests/FIO/AddressTests.cpp
deleted file mode 100644
index aea76097f2e..00000000000
--- a/tests/FIO/AddressTests.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "FIO/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include <TrustWalletCore/TWPublicKeyType.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::FIO::tests {
-
-TEST(FIOAddress, ValidateString) {
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_FALSE(Address::isValid("65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF"));
-    ASSERT_FALSE(Address::isValid("EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjT"));
-
-    ASSERT_TRUE(Address::isValid("FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o"));
-}
-
-TEST(FIOAddress, ValidateData) {
-    Address address("FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
-    EXPECT_EQ(address.bytes.size(), 37ul);
-    Data addrData = TW::data(address.bytes.data(), address.bytes.size());
-
-    EXPECT_EQ(Address::isValid(addrData), true);
-
-    // create invalid data, too short
-    Data addressDataShort = subData(addrData, 0, addrData.size() - 1);
-    EXPECT_EQ(Address::isValid(addressDataShort), false);
-}
-
-TEST(FIOAddress, FromString) {
-    Address addr("FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
-    ASSERT_EQ(addr.string(), "FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
-    ASSERT_EQ(hex(addr.bytes), "0271195c66ec2799e436757a70cd8431d4b17733a097b18a5f7f1b6b085978ff0f343fc54e");
-}
-
-TEST(FIOAddress, FromStringInvalid) {
-    try {
-        Address address("WRP5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
-    } catch (std::invalid_argument&) {
-        return; // ok
-    }
-    ADD_FAILURE() << "Missed expected exeption";
-}
-
-TEST(FIOAddress, FromPublicKey) {
-    auto key = PrivateKey(parse_hex("ea8eb60b7e5868e218f248e032769020b4fea5dcfd02f2992861eaf4fb534854"));
-    auto publicKey = key.getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(hex(publicKey.bytes), "0271195c66ec2799e436757a70cd8431d4b17733a097b18a5f7f1b6b085978ff0f");
-    auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
-}
-
-TEST(FIOAddress, GetPublicKey) {
-    const auto publicKeyHex = "0271195c66ec2799e436757a70cd8431d4b17733a097b18a5f7f1b6b085978ff0f";
-    const PublicKey publicKey(parse_hex(publicKeyHex), TWPublicKeyTypeSECP256k1);
-    auto address = Address(publicKey);
-    EXPECT_EQ(hex(address.publicKey().bytes), publicKeyHex);
-}
-
-} // namespace TW::FIO::tests
diff --git a/tests/FIO/SignerTests.cpp b/tests/FIO/SignerTests.cpp
deleted file mode 100644
index e85ab9422d5..00000000000
--- a/tests/FIO/SignerTests.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "FIO/Actor.h"
-#include "FIO/Signer.h"
-
-#include "Base58.h"
-#include "Hash.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::FIO::tests {
-
-using namespace std;
-
-TEST(FIOSigner, SignEncode) {
-    string sig1 = Signer::signatureToBsase58(parse_hex("1f4fccc30bcba876963aef6de584daf7258306c02f4528fe25b116b517de8b349968bdc080cd6bef36f5a46d31a7c01ed0806ad215bb66a94f61e27a895d610983"));
-
-    EXPECT_EQ("SIG_K1_K5hJTPeiV4bDkNR13mf66N2DY5AtVL4NU1iWE4G4dsczY2q68oCcUVxhzFdxjgV2eAeb2jNV1biqtCJ3SaNL8kkNgoZ43H", sig1);
-}
-
-TEST(FIOSigner, SignInternals) {
-    // 5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf
-    PrivateKey pk = PrivateKey(parse_hex("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035"));
-    {
-        Data pk2 = parse_hex("80");
-        append(pk2, pk.bytes);
-        EXPECT_EQ("5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri", Base58::bitcoin.encodeCheck(pk2));
-    }
-    Data rawData = parse_hex("4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd774a26285e19fac10ac5390000000001003056372503a85b0000c6eaa6645232017016f2cc12266c6b00000000a8ed3232bd010f6164616d4066696f746573746e657403034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c7877703730643776034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b397300000000000000007016f2cc12266c6b0e726577617264734077616c6c6574000000000000000000000000000000000000000000000000000000000000000000");
-    Data hash = Hash::sha256(rawData);
-    EXPECT_EQ("0f3cca0f50da4200b2858f65de1ea4530a9afd9e4bfc0b6b7196e36c25cc7a8b", hex(hash));
-    Data sign2 = Signer::signData(pk, rawData);
-    EXPECT_EQ("1f4ae8d1b993f94d0de4b249d5185481770de0711863ad640b3aac21de598fcc02761c6e5395106bafb7b09aab1c7aa5ac0573dbd821c2d255725391a5105d30d1", hex(sign2));
-
-    string sigStr = Signer::signatureToBsase58(sign2);
-    EXPECT_EQ("SIG_K1_K54CA1jmhgWrSdvrNrkokPyvqh7dwsSoQHNU9xgD3Ezf6cJySzhKeUubVRqmpYdnjoP1DM6SorroVAgrCu3qqvJ9coAQ6u", sigStr);
-    EXPECT_TRUE(Signer::verify(pk.getPublicKey(TWPublicKeyTypeSECP256k1), hash, sign2));
-}
-
-TEST(FIOSigner, Actor) {
-    {
-        const auto addr1 = "FIO6cDpi7vPnvRwMEdXtLnAmFwygaQ8CzD7vqKLBJ2GfgtHBQ4PPy";
-        Address addr = Address(addr1);
-        EXPECT_EQ(addr1, addr.string());
-
-        uint64_t shortenedKey = Actor::shortenKey(addr.bytes);
-        EXPECT_EQ(1518832697283783336U, shortenedKey);
-        string name = Actor::name(shortenedKey);
-        EXPECT_EQ("2odzomo2v4pec", name);
-    }
-    const int n = 4;
-    const string addrArr[n] = {
-        "FIO6cDpi7vPnvRwMEdXtLnAmFwygaQ8CzD7vqKLBJ2GfgtHBQ4PPy",
-        "FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE",
-        "FIO7bxrQUTbQ4mqcoefhWPz1aFieN4fA9RQAiozRz7FrUChHZ7Rb8",
-        "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf",
-    };
-    const string actorArr[n] = {
-        "2odzomo2v4pe",
-        "hhq2g4qgycfb",
-        "5kmx4qbqlpld",
-        "qdfejz2a5wpl",
-    };
-    for (int i = 0; i < n; ++i) {
-        Address addr = Address(addrArr[i]);
-        EXPECT_EQ(addrArr[i], addr.string());
-
-        string actor = Actor::actor(addr);
-        EXPECT_EQ(actorArr[i], actor);
-    }
-}
-
-} // namespace TW::FIO::tests
diff --git a/tests/FIO/TWCoinTypeTests.cpp b/tests/FIO/TWCoinTypeTests.cpp
deleted file mode 100644
index fcbb7a47bb6..00000000000
--- a/tests/FIO/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWFIOCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeFIO));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("930d1d3cf8988b39b5f64b64e9d61314a3e05a155d9e3505bdf863aab1adddf3"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeFIO, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("f5axfpgffiqz"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeFIO, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeFIO));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeFIO));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeFIO), 9);
-    ASSERT_EQ(TWBlockchainFIO, TWCoinTypeBlockchain(TWCoinTypeFIO));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeFIO));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeFIO));
-    assertStringsEqual(symbol, "FIO");
-    assertStringsEqual(txUrl, "https://explorer.fioprotocol.io/transaction/930d1d3cf8988b39b5f64b64e9d61314a3e05a155d9e3505bdf863aab1adddf3");
-    assertStringsEqual(accUrl, "https://explorer.fioprotocol.io/account/f5axfpgffiqz");
-    assertStringsEqual(id, "fio");
-    assertStringsEqual(name, "FIO");
-}
diff --git a/tests/FIO/TWFIOTests.cpp b/tests/FIO/TWFIOTests.cpp
deleted file mode 100644
index acbdf2e889a..00000000000
--- a/tests/FIO/TWFIOTests.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWAnySigner.h>
-#include <TrustWalletCore/TWPrivateKey.h>
-#include "proto/FIO.pb.h"
-#include "FIO/Address.h"
-#include "Data.h"
-#include "../interface/TWTestUtilities.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::FIO::TWFIOTests {
-
-using namespace std;
-
-TEST(TWFIO, Address) {
-    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035").get()));
-    ASSERT_NE(nullptr, privateKey.get());
-    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), false));
-    ASSERT_NE(nullptr, publicKey.get());
-    ASSERT_EQ(65ul, publicKey.get()->impl.bytes.size());
-    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeFIO));
-    auto addressString = WRAPS(TWAnyAddressDescription(address.get()));
-    assertStringsEqual(addressString, "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf");
-
-    auto address2 = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING("FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf").get(), TWCoinTypeFIO));
-    ASSERT_NE(nullptr, address2.get());
-    auto address2String = WRAPS(TWAnyAddressDescription(address2.get()));
-    assertStringsEqual(address2String, "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf");
-
-    ASSERT_TRUE(TWAnyAddressEqual(address.get(), address2.get()));
-}
-
-const Data gChainId = parse_hex("4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd77");
-// 5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf
-const PrivateKey privKeyBA = PrivateKey(parse_hex("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035"));
-const PublicKey pubKey6M = privKeyBA.getPublicKey(TWPublicKeyTypeSECP256k1);
-const Address addr6M(pubKey6M);
-
-TEST(TWFIO, RegisterFioAddress) {
-    Proto::SigningInput input;
-    input.set_expiry(1579784511);
-    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
-    input.mutable_chain_params()->set_head_block_number(39881);
-    input.mutable_chain_params()->set_ref_block_prefix(4279583376);
-    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
-    input.set_tpid("rewards@wallet");
-    input.mutable_action()->mutable_register_fio_address_message()->set_fio_address("adam@fiotestnet");
-    input.mutable_action()->mutable_register_fio_address_message()->set_owner_fio_public_key(addr6M.string());
-    input.mutable_action()->mutable_register_fio_address_message()->set_fee(5000000000);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeFIO);
-    EXPECT_EQ(Common::Proto::OK, output.error());
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K19ugLriG3ApYgjJCRDsy21p9xgsjbDtqBuZrmAEix9XYzndR1kNbJ6fXCngMJMAhxUHfwHAsPnh58otXiJZkazaM1EkS5"]})", output.json());
-}
-
-TEST(TWFIO, AddPubAddress) {
-    Proto::SigningInput input;
-    input.set_expiry(1579729429);
-    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
-    input.mutable_chain_params()->set_head_block_number(11565);
-    input.mutable_chain_params()->set_ref_block_prefix(4281229859);
-    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
-    input.set_tpid("rewards@wallet");
-    auto action = input.mutable_action()->mutable_add_pub_address_message();
-    action->set_fio_address("adam@fiotestnet");
-    action->add_public_addresses();
-    action->add_public_addresses();
-    action->add_public_addresses();
-    action->mutable_public_addresses(0)->set_coin_symbol("BTC");
-    action->mutable_public_addresses(0)->set_address("bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v");
-    action->mutable_public_addresses(1)->set_coin_symbol("ETH");
-    action->mutable_public_addresses(1)->set_address("0xce5cB6c92Da37bbBa91Bd40D4C9D4D724A3a8F51");
-    action->mutable_public_addresses(2)->set_coin_symbol("BNB");
-    action->mutable_public_addresses(2)->set_address("bnb1ts3dg54apwlvr9hupv2n0j6e46q54znnusjk9s");
-    action->set_fee(0);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeFIO);
-    EXPECT_EQ(Common::Proto::OK, output.error());
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"15c2285e2d2d23622eff0000000001003056372503a85b0000c6eaa664523201102b2f46fca756b200000000a8ed3232c9010f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K3zimaMKU8cBhVRPw46KM2u7uQWaAKXrnoeYZ7MEbp6sVJcDQmQR2RtdavpUPwkAnYUkd8NqLun8H48tcxZBcTUgkiPGVJ"]})", output.json());
-}
-
-TEST(TWFIO, Transfer) {
-    Proto::SigningInput input;
-    input.set_expiry(1579790000);
-    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
-    input.mutable_chain_params()->set_head_block_number(50000);
-    input.mutable_chain_params()->set_ref_block_prefix(4000123456);
-    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
-    input.set_tpid("rewards@wallet");
-    input.mutable_action()->mutable_transfer_message()->set_payee_public_key("FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE");
-    input.mutable_action()->mutable_transfer_message()->set_amount(1000000000);
-    input.mutable_action()->mutable_transfer_message()->set_fee(250000000);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeFIO);
-    EXPECT_EQ(Common::Proto::OK, output.error());
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9"]})", output.json());
-}
-
-TEST(TWFIO, RenewFioAddress) {
-    Proto::SigningInput input;
-    input.set_expiry(1579785000);
-    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
-    input.mutable_chain_params()->set_head_block_number(39881);
-    input.mutable_chain_params()->set_ref_block_prefix(4279583376);
-    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
-    input.set_tpid("rewards@wallet");
-    input.mutable_action()->mutable_renew_fio_address_message()->set_fio_address("nick@fiotestnet");
-    input.mutable_action()->mutable_renew_fio_address_message()->set_owner_fio_public_key(addr6M.string());
-    input.mutable_action()->mutable_renew_fio_address_message()->set_fee(3000000000);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeFIO);
-    EXPECT_EQ(Common::Proto::OK, output.error());
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff0000000001003056372503a85b80b1ba2919aea6ba01102b2f46fca756b200000000a8ed32322f0f6e69636b4066696f746573746e6574005ed0b200000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_Jxz7oCJ7Z4ECsxqb2utqBcyP3zPQCeQCBws9wWQjyptUKoWVk2AyCVEqtdMHJwqtLniio5Z7npMnaZB8E4pa2G75P9uGkb"]})", output.json());
-}
-
-TEST(TWFIO, NewFundsRequest) {
-    Proto::SigningInput input;
-    input.set_expiry(1579785000);
-    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
-    input.mutable_chain_params()->set_head_block_number(39881);
-    input.mutable_chain_params()->set_ref_block_prefix(4279583376);
-    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
-    input.set_tpid("rewards@wallet");
-    input.mutable_action()->mutable_new_funds_request_message()->set_payer_fio_name("mario@fiotestnet");
-    input.mutable_action()->mutable_new_funds_request_message()->set_payer_fio_address("FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
-    input.mutable_action()->mutable_new_funds_request_message()->set_payee_fio_name("alice@fiotestnet");
-    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_payee_public_address("bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v");
-    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_amount("5");
-    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_coin_symbol("BTC");
-    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_memo("Memo");
-    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_hash("Hash");
-    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_offline_url("https://trustwallet.com");
-    input.mutable_action()->mutable_new_funds_request_message()->set_fee(3000000000);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeFIO);
-    // Packed transacton varies, as there is no way to control encryption IV parameter from this level.
-    // Therefore full equality cannot be checked, tail is cut off.  The first N chars are checked, works in this case.
-    EXPECT_EQ(
-        R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff000000000100403ed4aa0ba85b00acba384dbdb89a01102b2f46fca756b200000000a8ed32328802106d6172696f4066696f746573746)",
-        output.json().substr(0, 195));
-}
-
-} // namespace TW::FIO::TWFIOTests
diff --git a/tests/FIO/TransactionBuilderTests.cpp b/tests/FIO/TransactionBuilderTests.cpp
deleted file mode 100644
index ff7b73d9484..00000000000
--- a/tests/FIO/TransactionBuilderTests.cpp
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "FIO/Action.h"
-#include "FIO/NewFundsRequest.h"
-#include "FIO/Transaction.h"
-#include "FIO/TransactionBuilder.h"
-
-#include "BinaryCoding.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-#include <nlohmann/json.hpp>
-
-namespace TW::FIO::TransactionBuilderTests {
-using namespace std;
-
-const Data chainId = parse_hex("4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd77");
-// 5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf
-const PrivateKey gPrivKeyBA = PrivateKey(parse_hex("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035"));
-const PublicKey gPubKey6MA = gPrivKeyBA.getPublicKey(TWPublicKeyTypeSECP256k1);
-const Address gAddr6M(gPubKey6MA);
-
-TEST(FIOTransactionBuilder, RegisterFioAddressGeneric) {
-    Proto::SigningInput input;
-    input.set_expiry(1579784511);
-    input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
-    input.mutable_chain_params()->set_head_block_number(39881);
-    input.mutable_chain_params()->set_ref_block_prefix(4279583376);
-    input.set_private_key(string(gPrivKeyBA.bytes.begin(), gPrivKeyBA.bytes.end()));
-    input.set_tpid("rewards@wallet");
-    input.mutable_action()->mutable_register_fio_address_message()->set_fio_address("adam@fiotestnet");
-    input.mutable_action()->mutable_register_fio_address_message()->set_owner_fio_public_key(gAddr6M.string());
-    input.mutable_action()->mutable_register_fio_address_message()->set_fee(5000000000);
-
-    auto json = TransactionBuilder::sign(input);
-
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K19ugLriG3ApYgjJCRDsy21p9xgsjbDtqBuZrmAEix9XYzndR1kNbJ6fXCngMJMAhxUHfwHAsPnh58otXiJZkazaM1EkS5"]})", json);
-}
-
-TEST(FIOTransactionBuilder, RegisterFioAddress) {
-    ChainParams chainParams{chainId, 39881, 4279583376};
-    uint64_t fee = 5000000000;
-
-    string t = TransactionBuilder::createRegisterFioAddress(gAddr6M, gPrivKeyBA, "adam@fiotestnet",
-                                                            chainParams, fee, "rewards@wallet", 1579784511);
-
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K19ugLriG3ApYgjJCRDsy21p9xgsjbDtqBuZrmAEix9XYzndR1kNbJ6fXCngMJMAhxUHfwHAsPnh58otXiJZkazaM1EkS5"]})", t);
-}
-
-TEST(FIOTransactionBuilder, AddPubAddress) {
-    ChainParams chainParams{chainId, 11565, 4281229859};
-
-    string t = TransactionBuilder::createAddPubAddress(gAddr6M, gPrivKeyBA, "adam@fiotestnet", {{"BTC", "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v"}, {"ETH", "0xce5cB6c92Da37bbBa91Bd40D4C9D4D724A3a8F51"}, {"BNB", "bnb1ts3dg54apwlvr9hupv2n0j6e46q54znnusjk9s"}},
-                                                       chainParams, 0, "rewards@wallet", 1579729429);
-
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"15c2285e2d2d23622eff0000000001003056372503a85b0000c6eaa664523201102b2f46fca756b200000000a8ed3232c9010f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K3zimaMKU8cBhVRPw46KM2u7uQWaAKXrnoeYZ7MEbp6sVJcDQmQR2RtdavpUPwkAnYUkd8NqLun8H48tcxZBcTUgkiPGVJ"]})", t);
-}
-
-TEST(FIOTransactionBuilder, Transfer) {
-    ChainParams chainParams{chainId, 50000, 4000123456};
-    string payee = "FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE";
-    uint64_t amount = 1000000000;
-    uint64_t fee = 250000000;
-
-    string t = TransactionBuilder::createTransfer(gAddr6M, gPrivKeyBA, payee, amount,
-                                                  chainParams, fee, "rewards@wallet", 1579790000);
-
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9"]})", t);
-}
-
-TEST(FIOTransactionBuilder, RenewFioAddress) {
-    ChainParams chainParams{chainId, 39881, 4279583376};
-    uint64_t fee = 3000000000;
-
-    string t = TransactionBuilder::createRenewFioAddress(gAddr6M, gPrivKeyBA, "nick@fiotestnet",
-                                                         chainParams, fee, "rewards@wallet", 1579785000);
-
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff0000000001003056372503a85b80b1ba2919aea6ba01102b2f46fca756b200000000a8ed32322f0f6e69636b4066696f746573746e6574005ed0b200000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_Jxz7oCJ7Z4ECsxqb2utqBcyP3zPQCeQCBws9wWQjyptUKoWVk2AyCVEqtdMHJwqtLniio5Z7npMnaZB8E4pa2G75P9uGkb"]})", t);
-}
-
-TEST(FIOTransactionBuilder, NewFundsRequest) {
-    {
-        ChainParams chainParams{chainId, 18484, 3712870657};
-        const Data iv = parse_hex("000102030405060708090a0b0c0d0e0f"); // use fixed iv for testability
-        string t = TransactionBuilder::createNewFundsRequest(
-            Address("FIO5NMm9Vf3NjYFnhoc7yxTCrLW963KPUCzeMGv3SJ6zR3GMez4ub"), gPrivKeyBA,
-            "tag@fiotestnet", "FIO7iYHtDhs45smFgSqLyJ6Zi4D3YG8K5bZGyxmshLCDXXBPbbmJN", "dapixbp@fiotestnet", "14R4wEsGT58chmqo7nB65Dy4je6TiijDWc",
-            "1", "BTC", "payment", "", "",
-            chainParams, 800000000, "", 1583528215, iv);
-        EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"17b9625e344801e94ddd000000000100403ed4aa0ba85b00acba384dbdb89a01702096fedf5bf9f900000000a8ed3232d2010e7461674066696f746573746e657412646170697862704066696f746573746e6574980141414543417751464267634943516f4c4441304f447a684533513779504a4738592f52486a69545576436163734a444a516243612f41643763354e36354f56366d3441566974596379654e7a4749306d4c366b5a71567348737837537845623471724d346435567258364939746a6842447067566b3078596575325861676759516b323168684972306c76412b7535546977545661673d3d0008af2f000000000c7a62777072727a796d736b620000","signatures":["SIG_K1_K95jnXSBCf1BnQXQPZzxKYPGxugwpbeVp2NSjN1kmYd9SQibvnSfh2ggmSVXii4Jvq3dtRHFA8s7n3kcQdLhY4KMrkgDgp"]})", t);
-    }
-
-    ChainParams chainParams{chainId, 39881, 4279583376};
-    uint64_t fee = 3000000000;
-
-    const Data iv = parse_hex("000102030405060708090a0b0c0d0e0f"); // use fixed iv for testability
-    string t = TransactionBuilder::createNewFundsRequest(gAddr6M, gPrivKeyBA,
-                                                         "mario@fiotestnet", "FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o", "alice@fiotestnet", "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v",
-                                                         "5", "BTC", "Memo", "Hash", "https://trustwallet.com",
-                                                         chainParams, fee, "rewards@wallet", 1579785000, iv);
-
-    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff000000000100403ed4aa0ba85b00acba384dbdb89a01102b2f46fca756b200000000a8ed32328802106d6172696f4066696f746573746e657410616c6963654066696f746573746e6574c00141414543417751464267634943516f4c4441304f442f3575342f6b436b7042554c4a44682f546951334d31534f4e4938426668496c4e54766d39354249586d54396f616f7a55632f6c6c3942726e57426563464e767a76766f6d3751577a517250717241645035683433305732716b52355266416555446a704f514732364c347a6936767241553052764855474e382b685779736a6971506b2b7a455a444952534678426268796c69686d59334f4752342f5a46466358484967343241327834005ed0b2000000000c716466656a7a32613577706c0e726577617264734077616c6c657400","signatures":["SIG_K1_Kk79iVcQMpqpVgZwGTmC1rxgCTLy5BDFtHd8FvjRNm2FqNHR9dpeUmPTNqBKGMNG3BsPy4c5u26TuEDpS87SnyMpF43cZk"]})", t);
-}
-
-TEST(FIOTransaction, ActionRegisterFioAddressInternal) {
-    RegisterFioAddressData radata("adam@fiotestnet", gAddr6M.string(),
-                                  5000000000, "rewards@wallet", "qdfejz2a5wpl");
-    Data ser1;
-    radata.serialize(ser1);
-    EXPECT_EQ(
-        hex(parse_hex("0F6164616D4066696F746573746E65743546494F366D31664D645470526B52426E6564765973685843784C4669433573755255384B44667838787874587032686E7478706E6600F2052A01000000102B2F46FCA756B20E726577617264734077616C6C6574")),
-        hex(ser1));
-
-    Action raAction;
-    raAction.account = "fio.address";
-    raAction.name = "regaddress";
-    raAction.actionDataSer = ser1;
-    raAction.auth.authArray.push_back(Authorization{"qdfejz2a5wpl", "active"});
-    Data ser2;
-    raAction.serialize(ser2);
-    EXPECT_EQ(
-        "003056372503a85b0000c6eaa66498ba0"
-        "1102b2f46fca756b200000000a8ed3232"
-        "65"
-        "0f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400",
-        hex(ser2));
-
-    Transaction tx;
-    tx.expiration = 1579784511;
-    tx.refBlockNumber = 39881;
-    tx.refBlockPrefix = 4279583376;
-    tx.actions.push_back(raAction);
-    Data ser3;
-    tx.serialize(ser3);
-    EXPECT_EQ(
-        "3f99295ec99b904215ff0000000001"
-        "003056372503a85b0000c6eaa66498ba0"
-        "1102b2f46fca756b200000000a8ed3232"
-        "65"
-        "0f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400",
-        hex(ser3));
-}
-
-TEST(FIOTransaction, ActionAddPubAddressInternal) {
-    AddPubAddressData aadata("adam@fiotestnet", {{"BTC", "BTC", "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v"}, {"ETH", "ETH", "0xce5cB6c92Da37bbBa91Bd40D4C9D4D724A3a8F51"}, {"BNB", "BNB", "bnb1ts3dg54apwlvr9hupv2n0j6e46q54znnusjk9s"}},
-                             0, "rewards@wallet", "qdfejz2a5wpl");
-    Data ser1;
-    aadata.serialize(ser1);
-    EXPECT_EQ(
-        "0f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c6574",
-        hex(ser1));
-
-    Action aaAction;
-    aaAction.account = "fio.address";
-    aaAction.name = "addaddress";
-    aaAction.actionDataSer = ser1;
-    aaAction.auth.authArray.push_back(Authorization{"qdfejz2a5wpl", "active"});
-    Data ser2;
-    aaAction.serialize(ser2);
-    EXPECT_EQ(
-        "003056372503a85b0000c6eaa66452320"
-        "1102b2f46fca756b200000000a8ed3232"
-        "c901"
-        "0f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400",
-        hex(ser2));
-
-    Transaction tx;
-    tx.expiration = 1579729429;
-    tx.refBlockNumber = 11565;
-    tx.refBlockPrefix = 4281229859;
-    tx.actions.push_back(aaAction);
-    Data ser3;
-    tx.serialize(ser3);
-    EXPECT_EQ(
-        "15c2285e2d2d23622eff0000000001"
-        "003056372503a85b0000c6eaa66452320"
-        "1102b2f46fca756b200000000a8ed3232"
-        "c901"
-        "0f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400",
-        hex(ser3));
-}
-
-TEST(FIONewFundsContent, serialize) {
-    {
-        NewFundsContent newFunds{"bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v", "10", "BTC", "BTC", "Memo", "Hash", "https://trustwallet.com"};
-        Data ser;
-        newFunds.serialize(ser);
-        EXPECT_EQ(hex(ser), "2a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c78777037306437760231300342544303425443044d656d6f04486173681768747470733a2f2f747275737477616c6c65742e636f6d0000000000");
-    }
-    {
-        // empty struct
-        NewFundsContent newFunds{"", "", "", "", "", "", ""};
-        Data ser;
-        newFunds.serialize(ser);
-        EXPECT_EQ(hex(ser), "000000000000000000000000");
-    }
-    {
-        // test from https://github.com/fioprotocol/fiojs/blob/master/src/tests/encryption-fio.test.ts
-        NewFundsContent newFunds{"purse.alice", "1", "", "fio.reqobt", "", "", ""};
-        Data ser;
-        newFunds.serialize(ser);
-        EXPECT_EQ(hex(ser), "0b70757273652e616c6963650131000a66696f2e7265716f62740000000000000000");
-    }
-}
-
-TEST(FIONewFundsContent, deserialize) {
-    {
-        const Data ser = parse_hex("2a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c78777037306437760231300342544303425443044d656d6f04486173681768747470733a2f2f747275737477616c6c65742e636f6d0000000000");
-        size_t index = 0;
-        const auto newFunds = NewFundsContent::deserialize(ser, index);
-        EXPECT_EQ(newFunds.payeePublicAddress, "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v");
-        EXPECT_EQ(newFunds.amount, "10");
-        EXPECT_EQ(newFunds.coinSymbol, "BTC");
-        EXPECT_EQ(newFunds.offlineUrl, "https://trustwallet.com");
-    }
-    {
-        // incomplete input
-        const Data ser = parse_hex("0b6d");
-        size_t index = 0;
-        const auto newFunds = NewFundsContent::deserialize(ser, index);
-        EXPECT_EQ(newFunds.payeePublicAddress, "");
-        EXPECT_EQ(newFunds.amount, "");
-        EXPECT_EQ(newFunds.offlineUrl, "");
-    }
-}
-
-TEST(FIOTransactionBuilder, expirySetDefault) {
-    uint32_t expiry = 1579790000;
-    EXPECT_EQ(TransactionBuilder::expirySetDefaultIfNeeded(expiry), false);
-    EXPECT_EQ(expiry, 1579790000ul);
-    expiry = 0;
-    EXPECT_EQ(expiry, 0ul);
-    EXPECT_EQ(TransactionBuilder::expirySetDefaultIfNeeded(expiry), true);
-    EXPECT_TRUE(expiry > 1579790000);
-}
-
-// May throw nlohmann::json::type_error
-void createTxWithChainParam(const ChainParams& paramIn, ChainParams& paramOut) {
-    string tx = TransactionBuilder::createAddPubAddress(gAddr6M, gPrivKeyBA, "adam@fiotestnet", {{"BTC", "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v"}},
-                                                        paramIn, 0, "rewards@wallet", 1579729429);
-    // retrieve chain params from encoded tx; parse out packed tx
-    try {
-        nlohmann::json txJson = nlohmann::json::parse(tx);
-        Data txData = parse_hex(txJson.at("packed_trx").get<std::string>());
-        // decode values
-        ASSERT_TRUE(txData.size() >= 10);
-        paramOut.headBlockNumber = decode16LE(txData.data() + 4);
-        paramOut.refBlockPrefix = decode32LE(txData.data() + 4 + 2);
-    } catch (nlohmann::json::type_error& e) {
-        FAIL() << "Json parse error " << e.what();
-    }
-}
-
-void checkBlockNum(uint64_t blockNumIn, uint64_t blockNumExpected) {
-    ChainParams paramOut;
-    createTxWithChainParam(ChainParams{chainId, blockNumIn, 4281229859}, paramOut);
-    EXPECT_EQ(paramOut.headBlockNumber, blockNumExpected);
-}
-
-void checkRefBlockPrefix(uint64_t blockPrefixIn, uint64_t blockPrefixExpected) {
-    ChainParams paramOut;
-    createTxWithChainParam(ChainParams{chainId, 11565, blockPrefixIn}, paramOut);
-    EXPECT_EQ(paramOut.refBlockPrefix, blockPrefixExpected);
-}
-
-TEST(FIOTransactionBuilder, chainParansRange) {
-    // headBlockNumber, 2 bytes
-    checkBlockNum(101, 101);
-    checkBlockNum(0xFFFF, 0xFFFF);
-    checkBlockNum(0x00011234, 0x1234);
-    // large values truncated
-    checkBlockNum(0xFFAB1234, 0x1234);
-    checkBlockNum(0x0000000112345678, 0x5678);
-    checkBlockNum(0xFFABCDEF12345678, 0x5678);
-
-    // refBlockPrefix, 4 bytes; Large refBlockPrefix values used to cause problem
-    checkRefBlockPrefix(101, 101);
-    checkRefBlockPrefix(4281229859, 4281229859);
-    checkRefBlockPrefix(0xFFFFFFFF, 0xFFFFFFFF);
-    // large values truncated
-    checkRefBlockPrefix(0x0000000112345678, 0x12345678);
-    checkRefBlockPrefix(0xFFABCDEF12345678, 0x12345678);
-}
-
-TEST(FIOTransactionBuilder, encodeVarInt) {
-    {
-        Data data;
-        EXPECT_EQ(TW::FIO::encodeVarInt(0x11, data), 1);
-        EXPECT_EQ(hex(data), "11");
-    }
-    {
-        Data data;
-        EXPECT_EQ(TW::FIO::encodeVarInt(0x7F, data), 1);
-        EXPECT_EQ(hex(data), "7f");
-    }
-    {
-        Data data;
-        EXPECT_EQ(TW::FIO::encodeVarInt(0x80, data), 2);
-        EXPECT_EQ(hex(data), "8001");
-    }
-    {
-        Data data;
-        EXPECT_EQ(TW::FIO::encodeVarInt(0xFF, data), 2);
-        EXPECT_EQ(hex(data), "ff01");
-    }
-    {
-        Data data;
-        EXPECT_EQ(TW::FIO::encodeVarInt(0x100, data), 2);
-        EXPECT_EQ(hex(data), "8002");
-    }
-    {
-        Data data;
-        EXPECT_EQ(TW::FIO::encodeVarInt(0x3FFF, data), 2);
-        EXPECT_EQ(hex(data), "ff7f");
-    }
-    {
-        Data data;
-        EXPECT_EQ(TW::FIO::encodeVarInt(0x4000, data), 3);
-        EXPECT_EQ(hex(data), "808001");
-    }
-    {
-        Data data;
-        EXPECT_EQ(TW::FIO::encodeVarInt(0xFFFFFFFF, data), 5);
-        EXPECT_EQ(hex(data), "ffffffff0f");
-    }
-}
-
-TEST(FIOTransactionBuilder, encodeString) {
-    {
-        Data data;
-        const string text = "ABC";
-        TW::FIO::encodeString(text, data);
-        EXPECT_EQ(hex(data), "03" + hex(text));
-    }
-    {
-        Data data;
-        const string text = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789";
-        EXPECT_EQ(text.length(), 130ul);
-        TW::FIO::encodeString(text, data);
-        // length on 2 bytes
-        EXPECT_EQ(hex(data), "8201" + hex(text));
-    }
-}
-
-} // namespace TW::FIO::TransactionBuilderTests
diff --git a/tests/Fantom/TWCoinTypeTests.cpp b/tests/Fantom/TWCoinTypeTests.cpp
deleted file mode 100644
index acd79755342..00000000000
--- a/tests/Fantom/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWFantomCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeFantom));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb0a741d882291951de1fac72e90b9baf886ddb0c9c87658a0c206490dfaa5202"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeFantom, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x9474feb9917b87da6f0d830ba66ee0035835c0d3"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeFantom, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeFantom));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeFantom));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeFantom), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeFantom));
-
-    assertStringsEqual(symbol, "FTM");
-    assertStringsEqual(txUrl, "https://ftmscan.com/tx/0xb0a741d882291951de1fac72e90b9baf886ddb0c9c87658a0c206490dfaa5202");
-    assertStringsEqual(accUrl, "https://ftmscan.com/address/0x9474feb9917b87da6f0d830ba66ee0035835c0d3");
-    assertStringsEqual(id, "fantom");
-    assertStringsEqual(name, "Fantom");
-}
diff --git a/tests/Filecoin/AddressTests.cpp b/tests/Filecoin/AddressTests.cpp
deleted file mode 100644
index be2bd2355b9..00000000000
--- a/tests/Filecoin/AddressTests.cpp
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright © 2017-2020 Trust.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Filecoin/Address.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-#include <vector>
-
-using namespace TW;
-
-namespace TW::Filecoin::tests {
-// clang-format off
-
-struct address_test {
-    std::string encoded;
-    const char* hex;
-};
-
-static const address_test validAddresses[] = {
-    // ID addresses
-    {"f00",                    "0000"},
-    {"f01",                    "0001"},
-    {"f010",                   "000a"},
-    {"f0150",                  "009601"},
-    {"f0499",                  "00f303"},
-    {"f01024",                 "008008"},
-    {"f01729",                 "00c10d"},
-    {"f0999999",               "00bf843d"},
-    {"f018446744073709551615", "00ffffffffffffffffff01"},
-    // secp256k1 addresses
-    {"f15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq", "01ea0f0ea039b291a0f08fd179e0556a8c3277c0d3"},
-    {"f12fiakbhe2gwd5cnmrenekasyn6v5tnaxaqizq6a", "01d1500504e4d1ac3e89ac891a4502586fabd9b417"},
-    {"f1wbxhu3ypkuo6eyp6hjx6davuelxaxrvwb2kuwva", "01b06e7a6f0f551de261fe3a6fe182b422ee0bc6b6"},
-    {"f1xtwapqc6nh4si2hcwpr3656iotzmlwumogqbuaa", "01bcec07c05e69f92468e2b3e3bf77c874f2c5da8c"},
-    {"f1xcbgdhkgkwht3hrrnui3jdopeejsoatkzmoltqy", "01b882619d46558f3d9e316d11b48dcf211327026a"},
-    {"f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy", "01fd1d0f4dfcd7e99afcb99a8326b7dc459d32c628"},
-    // Actor addresses
-    {"f24vg6ut43yw2h2jqydgbg2xq7x6f4kub3bg6as6i", "02e54dea4f9bc5b47d261819826d5e1fbf8bc5503b"},
-    {"f25nml2cfbljvn4goqtclhifepvfnicv6g7mfmmvq", "02eb58bd08a15a6ade19d0989674148fa95a8157c6"},
-    {"f2nuqrg7vuysaue2pistjjnt3fadsdzvyuatqtfei", "026d21137eb4c4814269e894d296cf6500e43cd714"},
-    {"f24dd4ox4c2vpf5vk5wkadgyyn6qtuvgcpxxon64a", "02e0c7c75f82d55e5ed55db28033630df4274a984f"},
-    {"f2gfvuyh7v2sx3patm5k23wdzmhyhtmqctasbr23y", "02316b4c1ff5d4afb7826ceab5bb0f2c3e0f364053"},
-    // BLS addresses
-    {"f3vvmn62lofvhjd2ugzca6sof2j2ubwok6cj4xxbfzz4yuxfkgobpihhd2thlanmsh3w2ptld2gqkn2jvlss4a","03ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd"},
-    {"f3wmuu6crofhqmm3v4enos73okk2l366ck6yc4owxwbdtkmpk42ohkqxfitcpa57pjdcftql4tojda2poeruwa","03b3294f0a2e29e0c66ebc235d2fedca5697bf784af605c75af608e6a63d5cd38ea85ca8989e0efde9188b382f9372460d"},
-    {"f3s2q2hzhkpiknjgmf4zq3ejab2rh62qbndueslmsdzervrhapxr7dftie4kpnpdiv2n6tvkr743ndhrsw6d3a","0396a1a3e4ea7a14d49985e661b22401d44fed402d1d0925b243c923589c0fbc7e32cd04e29ed78d15d37d3aaa3fe6da33"},
-    {"f3q22fijmmlckhl56rn5nkyamkph3mcfu5ed6dheq53c244hfmnq2i7efdma3cj5voxenwiummf2ajlsbxc65a","0386b454258c589475f7d16f5aac018a79f6c1169d20fc33921dd8b5ce1cac6c348f90a3603624f6aeb91b64518c2e8095"},
-    {"f3u5zgwa4ael3vuocgc5mfgygo4yuqocrntuuhcklf4xzg5tcaqwbyfabxetwtj4tsam3pbhnwghyhijr5mixa","03a7726b038022f75a384617585360cee629070a2d9d28712965e5f26ecc40858382803724ed34f2720336f09db631f074"},
-};
-
-static const std::string invalidAddresses[] = {
-    "",
-    "f0-1",                   // Negative :)
-    "f018446744073709551616", // Greater than max uint64_t
-    "f15ihq5ibzwki2b4ep2f46avlkr\0zhpqgtga7pdrq", // Embedded NUL
-    "t15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq",  // Test net
-    "a15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq",  // Unknown net
-    "f95ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq",  // Unknown address type
-    // Invalid checksum cases
-    "f15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7rdrr",
-    "f24vg6ut43yw2h2jqydgbg2xq7x6f4kub3bg6as66",
-    "f3vvmn62lofvhjd2ugzca6sof2j2ubwok6cj4xxbfzz4yuxfkgobpihhd2thlanmsh3w2ptld2gqkn2jvlss44",
-};
-
-TEST(FilecoinAddress, IsValid) {
-    for (const auto& test : validAddresses) {
-        ASSERT_TRUE(Address::isValid(test.encoded))
-            << "is_valid() != true: " << test.encoded << std::endl;
-        ASSERT_TRUE(Address::isValid(parse_hex(test.hex)))
-            << "is_valid() != true: " << test.hex << std::endl;
-    }
-    for (const auto& address : invalidAddresses)
-        ASSERT_FALSE(Address::isValid(address)) << "is_valid() != false: " << address << std::endl;
-
-    ASSERT_FALSE(Address::isValid(parse_hex("00"))) << "Empty varuint";
-    ASSERT_FALSE(Address::isValid(parse_hex("00ff"))) << "Short varuint";
-    ASSERT_FALSE(Address::isValid(parse_hex("00ff00ff"))) << "Varuint with hole";
-    ASSERT_FALSE(Address::isValid(parse_hex("000101"))) << "Long varuint";
-    ASSERT_FALSE(Address::isValid(parse_hex("000000"))) << "Long varuint";
-    ASSERT_FALSE(Address::isValid(parse_hex("00ffffffffffffffffff02"))) << "Overflow";
-}
-
-TEST(FilecoinAddress, String) {
-    for (const auto& test : validAddresses) {
-        Address a(parse_hex(test.hex));
-        ASSERT_EQ(a.string(), test.encoded) << "Address(" << test.hex << ")";
-    }
-}
-
-TEST(FilecoinAddress, FromString) {
-    for (const auto& test : validAddresses) {
-        Address a(test.encoded);
-        ASSERT_EQ(hex(a.bytes), test.hex) << "Address(" << test.encoded << ")";
-    }
-}
-
-}
diff --git a/tests/Filecoin/SignerTests.cpp b/tests/Filecoin/SignerTests.cpp
deleted file mode 100644
index 2e52a650ee0..00000000000
--- a/tests/Filecoin/SignerTests.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright © 2017-2019 Trust.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Filecoin/Address.h"
-#include "Filecoin/Signer.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Filecoin {
-
-TEST(FilecoinSigner, DerivePublicKey) {
-    const PrivateKey privateKey(
-        parse_hex("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe"));
-    const PublicKey publicKey((privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended)));
-    const Address address(publicKey);
-    ASSERT_EQ(address.string(), "f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq");
-}
-
-TEST(FilecoinSigner, Sign) {
-    const PrivateKey privateKey(
-        parse_hex("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe"));
-    const PublicKey publicKey((privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended)));
-    const Address fromAddress(publicKey);
-    const Address toAddress("f1rletqqhinhagw6nxjcr4kbfws25thgt7owzuruy");
-
-    Transaction tx(toAddress, fromAddress,
-                   /*nonce*/ 1,
-                   /*value*/ 6000,
-                   /*gasLimit*/ 23423423423423,
-                   /*gasFeeCap*/ 456456456456445645,
-                   /*gasPremium*/ 5675674564734345);
-
-    Data signature = Signer::sign(privateKey, tx);
-
-    ASSERT_EQ(tx.serialize(signature), R"({"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"456456456456445645","GasLimit":23423423423423,"GasPremium":"5675674564734345","Nonce":1,"To":"f1rletqqhinhagw6nxjcr4kbfws25thgt7owzuruy","Value":"6000"},"Signature":{"Data":"3GOUpn2Wiwe20QXLC8ixx23WiKDwrVkfxYi3CgzZ5jBVKZT4WUOZNuZhpUFky0PqGaM7vErEOi//yqBGSIQQUAA=","Type":1}})");
-}
-
-} // namespace TW::Filecoin
diff --git a/tests/Filecoin/TWAnySignerTests.cpp b/tests/Filecoin/TWAnySignerTests.cpp
deleted file mode 100644
index 0f7c0ae4d5c..00000000000
--- a/tests/Filecoin/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "Data.h"
-#include "HexCoding.h"
-#include "proto/Filecoin.pb.h"
-#include "uint256.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Filecoin::tests {
-
-TEST(TWAnySignerFilecoin, Sign) {
-    Proto::SigningInput input;
-    auto privateKey = parse_hex("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe");
-    auto toAddress =
-        "f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq";
-    uint64_t nonce = 2;
-    // 600 FIL
-    // auto value = parse_hex("2086ac351052600000");
-    auto value = store(uint256_t(600) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
-    uint64_t gasLimit = 1000;
-    // auto gasFeeCap = parse_hex("25f273933db5700000");
-    auto gasFeeCap = store(uint256_t(700) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
-    // auto gasPremium = parse_hex("2b5e3af16b18800000");
-    auto gasPremium = store(uint256_t(800) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
-
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_to(toAddress);
-    input.set_nonce(nonce);
-    input.set_value(value.data(), value.size());
-    input.set_gas_limit(gasLimit);
-    input.set_gas_fee_cap(gasFeeCap.data(), gasFeeCap.size());
-    input.set_gas_premium(gasPremium.data(), gasPremium.size());
-
-    auto inputString = input.SerializeAsString();
-    auto inputData = WRAPD(TWDataCreateWithBytes((const byte*)inputString.data(), inputString.size()));
-
-    auto outputData = WRAPD(TWAnySignerSign(inputData.get(), TWCoinTypeFilecoin));
-
-    Proto::SigningOutput output;
-    output.ParseFromArray(TWDataBytes(outputData.get()), static_cast<int>(TWDataSize(outputData.get())));
-
-    ASSERT_EQ(output.json(), R"({"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"700000000000000000000","GasLimit":1000,"GasPremium":"800000000000000000000","Nonce":2,"To":"f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq","Value":"600000000000000000000"},"Signature":{"Data":"jMRu+OZ/lfppgmqSfGsntFrRLWZnUg3ZYmJTTRLsVt4V1310vR3VKGJpaE6S4sNvDOE6sEgmN9YmfTkPVK2qMgE=","Type":1}})");
-}
-
-TEST(TWAnySignerFilecoin, SignJSON) {
-    auto json = STRING(
-        R"({
-            "to": "f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq",
-            "nonce": "2",
-            "value": "IIasNRBSYAAA",
-            "gasLimit": 1000,
-            "gasFeeCap": "JfJzkz21cAAA",
-            "gasPremium": "K1468WsYgAAA"
-        })");
-    auto key = DATA("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe");
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeFilecoin));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeFilecoin));
-    assertStringsEqual(result, R"({"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"700000000000000000000","GasLimit":1000,"GasPremium":"800000000000000000000","Nonce":2,"To":"f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq","Value":"600000000000000000000"},"Signature":{"Data":"jMRu+OZ/lfppgmqSfGsntFrRLWZnUg3ZYmJTTRLsVt4V1310vR3VKGJpaE6S4sNvDOE6sEgmN9YmfTkPVK2qMgE=","Type":1}})");
-}
-
-} // namespace TW::Filecoin::tests
diff --git a/tests/Filecoin/TWCoinTypeTests.cpp b/tests/Filecoin/TWCoinTypeTests.cpp
deleted file mode 100644
index 9e5ff95f72e..00000000000
--- a/tests/Filecoin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-TEST(TWFilecoinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeFilecoin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("bafy2bzacedsgjcd6xfhrrymmfrqubb44otlyhvgqkgsh533d5j5hwniiqespm"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeFilecoin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("f1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeFilecoin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeFilecoin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeFilecoin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeFilecoin), 18);
-    ASSERT_EQ(TWBlockchainFilecoin, TWCoinTypeBlockchain(TWCoinTypeFilecoin));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeFilecoin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeFilecoin));
-    assertStringsEqual(symbol, "FIL");
-    assertStringsEqual(txUrl, "https://filfox.info/en/message/bafy2bzacedsgjcd6xfhrrymmfrqubb44otlyhvgqkgsh533d5j5hwniiqespm");
-    assertStringsEqual(accUrl, "https://filfox.info/en/address/f1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za");
-    assertStringsEqual(id, "filecoin");
-    assertStringsEqual(name, "Filecoin");
-}
diff --git a/tests/Filecoin/TransactionTests.cpp b/tests/Filecoin/TransactionTests.cpp
deleted file mode 100644
index 6e35a17e0a0..00000000000
--- a/tests/Filecoin/TransactionTests.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright © 2017-2020 Trust.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Filecoin/Address.h"
-#include "Filecoin/Transaction.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Filecoin {
-
-TEST(FilecoinTransaction, EncodeBigInt) {
-    ASSERT_EQ(hex(encodeBigInt(0)), "");
-    ASSERT_EQ(hex(encodeBigInt(1)), "0001");
-    ASSERT_EQ(hex(encodeBigInt(16)), "0010");
-    ASSERT_EQ(hex(encodeBigInt(1111111111111)), "000102b36211c7");
-    uint256_t reallyBig = 1;
-    reallyBig <<= 128;
-    ASSERT_EQ(hex(encodeBigInt(reallyBig)), "000100000000000000000000000000000000");
-}
-
-TEST(FilecoinTransaction, Serialize) {
-    const PrivateKey privateKey(
-        parse_hex("2f0f1d2c8de955c7c3fb4d9cae02539fadcb13fa998ccd9a1e871bed95f1941e"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
-    const Address fromAddress(publicKey);
-    const Address toAddress("f1hvadvq4rd2pyayrigjx2nbqz2nvemqouslw4wxi");
-
-    Transaction tx(toAddress, fromAddress,
-                   /*nonce*/ 0x1234567890,
-                   /*value*/ 1000,
-                   /*gasLimit*/ 3333333333,
-                   /*gasFeeCap*/ 11111111,
-                   /*gasPremium*/ 333333);
-
-    ASSERT_EQ(hex(tx.message().encoded()),
-              "8a0055013d403ac3911e9f806228326fa68619d36a4641d455013d413d4c3fe3d89f99495a48c6046224"
-              "a71f0cd71b0000001234567890430003e81ac6aea1554400a98ac744000516150040");
-    ASSERT_EQ(hex(tx.cid()),
-              "0171a0e40220a3b06c2837a94e3a431a78b00536d0298455ceec3d304adf26a3868147c4e6e1");
-}
-
-} // namespace TW::Filecoin
diff --git a/tests/Firo/TWCoinTypeTests.cpp b/tests/Firo/TWCoinTypeTests.cpp
deleted file mode 100644
index b8e7a60f49b..00000000000
--- a/tests/Firo/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWFiroCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeFiro));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("09a60d58b3d17519a42a8eca60750c33b710ca8f3ca71994192e05c248a2a111"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeFiro, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a8ULhhDgfdSiXJhSZVdhb8EuDc6R3ogsaM"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeFiro, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeFiro));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeFiro));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeFiro), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeFiro));
-    ASSERT_EQ(0x7, TWCoinTypeP2shPrefix(TWCoinTypeFiro));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeFiro));
-    assertStringsEqual(symbol, "FIRO");
-    assertStringsEqual(txUrl, "https://explorer.firo.org/tx/09a60d58b3d17519a42a8eca60750c33b710ca8f3ca71994192e05c248a2a111");
-    assertStringsEqual(accUrl, "https://explorer.firo.org/address/a8ULhhDgfdSiXJhSZVdhb8EuDc6R3ogsaM");
-    assertStringsEqual(id, "firo");
-    assertStringsEqual(name, "Firo");
-}
diff --git a/tests/Firo/TWZCoinAddressTests.cpp b/tests/Firo/TWZCoinAddressTests.cpp
deleted file mode 100644
index 21c495364e5..00000000000
--- a/tests/Firo/TWZCoinAddressTests.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWSegwitAddress.h>
-#include <TrustWalletCore/TWBitcoinAddress.h>
-#include <TrustWalletCore/TWBitcoinScript.h>
-#include <TrustWalletCore/TWHash.h>
-#include <TrustWalletCore/TWHDWallet.h>
-#include <TrustWalletCore/TWHRP.h>
-#include <TrustWalletCore/TWPrivateKey.h>
-
-#include <gtest/gtest.h>
-
-TEST(TWZCoin, Address) {
-    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("a22ddec5c567b4488bb00f69b6146c50da2ee883e2c096db098726394d585730").get()));
-    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
-    auto address = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeFiro)));
-    auto addressString = WRAPS(TWBitcoinAddressDescription(address.get()));
-    assertStringsEqual(addressString, "aAbqxogrjdy2YHVcnQxFHMzqpt2fhjCTVT");
-}
-
-TEST(TWZCoin, ExtendedKeys) {
-    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
-        STRING("ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal").get(),
-        STRING("TREZOR").get()
-    ));
-
-    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeFiro, TWHDVersionXPUB));
-    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeFiro, TWHDVersionXPRV));
-
-    assertStringsEqual(xpub, "xpub6Cb8Q6pDeS8PdKNbDv9Hvq4WpJXL3JvKvmHHwR1wD2H543hiCUE1f1tB5AXE6yg13k7xZ6PzEXMNUFHXk6kkx4RYte8VB1i4tCX9rwQVR4a");
-    assertStringsEqual(xprv, "xprv9ybmzbHKp4a6QqJ87tcHZh7nGGgqdrCUZYMh92cKegk6BFNZevum7DZhDuVDqqMdcBT9B4wJSEmwJW9JNdkMcUUjEWKqppxNrJjKFSyKsCr");
-}
-
-TEST(TWZcoin, DeriveFromXpub) {
-    auto xpub = STRING("xpub6Cb8Q6pDeS8PdKNbDv9Hvq4WpJXL3JvKvmHHwR1wD2H543hiCUE1f1tB5AXE6yg13k7xZ6PzEXMNUFHXk6kkx4RYte8VB1i4tCX9rwQVR4a");
-    auto pubKey3 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeFiro, STRING("m/44'/136'/0'/0/3").get()));
-    auto pubKey5 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeFiro, STRING("m/44'/136'/0'/0/5").get()));
-
-    auto address3 = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(pubKey3.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeFiro)));
-    auto address3String = WRAPS(TWBitcoinAddressDescription(address3.get()));
-
-    auto address5 = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(pubKey5.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeFiro)));
-    auto address5String = WRAPS(TWBitcoinAddressDescription(address5.get()));
-
-    assertStringsEqual(address3String, "aLnztJEbyACnxF9H7SFC8YjUxedwyQsgVm");
-    assertStringsEqual(address5String, "aJj2jdMzHyKFJLEFTxhpn379avEqRKFUyw");
-}
-
-TEST(TWZcoin, LockScripts) {
-    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("a4YtT82mWWxHZhLmdx7e5aroW92dqJoRs3").get(), TWCoinTypeFiro));
-    auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
-    assertHexEqual(scriptData2, "76a9142a10f88e30768d2712665c279922b9621ce58bc788ac");
-
-    auto script3 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("4CFa4fnAQvFz4VpikGNzQ9XfCDXMmdk6sh").get(), TWCoinTypeFiro));
-    auto scriptData3 = WRAPD(TWBitcoinScriptData(script3.get()));
-    assertHexEqual(scriptData3, "a914f010b17a9189e0f2737d71ae9790359eb5bbc13787");
-}
diff --git a/tests/GoChain/TWCoinTypeTests.cpp b/tests/GoChain/TWCoinTypeTests.cpp
deleted file mode 100644
index 7e8b1b75a94..00000000000
--- a/tests/GoChain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWGoChainCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeGoChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeGoChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeGoChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeGoChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeGoChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeGoChain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeGoChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeGoChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeGoChain));
-    assertStringsEqual(symbol, "GO");
-    assertStringsEqual(txUrl, "https://explorer.gochain.io/tx/t123");
-    assertStringsEqual(accUrl, "https://explorer.gochain.io/addr/a12");
-    assertStringsEqual(id, "gochain");
-    assertStringsEqual(name, "GoChain");
-}
diff --git a/tests/Groestlcoin/AddressTests.cpp b/tests/Groestlcoin/AddressTests.cpp
deleted file mode 100644
index a07719aaa0c..00000000000
--- a/tests/Groestlcoin/AddressTests.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Groestlcoin/Address.h"
-
-#include "Coin.h"
-#include "HDWallet.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Groestlcoin::tests {
-
-TEST(GroestlcoinAddress, FromPublicKey) {
-    const auto publicKey = PublicKey(parse_hex("03b85cc59b67c35851eb5060cfc3a759a482254553c5857075c9e247d74d412c91"), TWPublicKeyTypeSECP256k1);
-    const auto address = Address(publicKey, 36);
-    ASSERT_EQ(address.string(), "Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM");
-}
-
-TEST(GroestlcoinAddress, Valid) {
-    ASSERT_TRUE(Address::isValid(std::string("Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM")));
-}
-
-TEST(GroestlcoinAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid(std::string("1JAd7XCBzGudGpJQSDSfpmJhiygtLQWaGL"))); // Valid bitcoin address
-}
-
-TEST(GroestlcoinAddress, FromString) {
-    const auto string = "Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM";
-    const auto address = Address(string);
-
-    ASSERT_EQ(address.string(), string);
-}
-
-TEST(GroestlcoinAddress, Derive) {
-    const auto mnemonic = "all all all all all all all all all all all all";
-    const auto wallet = HDWallet(mnemonic, "");
-    const auto path = TW::derivationPath(TWCoinTypeGroestlcoin);
-    const auto address = TW::deriveAddress(TWCoinTypeGroestlcoin, wallet.getKey(TWCoinTypeGroestlcoin, path));
-    ASSERT_EQ(address, "grs1qw4teyraux2s77nhjdwh9ar8rl9dt7zww8r6lne");
-}
-
-} // namespace TW::Groestlcoin::tests
diff --git a/tests/Groestlcoin/TWCoinTypeTests.cpp b/tests/Groestlcoin/TWCoinTypeTests.cpp
deleted file mode 100644
index 6187d5d4e85..00000000000
--- a/tests/Groestlcoin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWGroestlcoinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeGroestlcoin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeGroestlcoin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeGroestlcoin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeGroestlcoin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeGroestlcoin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeGroestlcoin), 8);
-    ASSERT_EQ(TWBlockchainGroestlcoin, TWCoinTypeBlockchain(TWCoinTypeGroestlcoin));
-    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeGroestlcoin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeGroestlcoin));
-    assertStringsEqual(symbol, "GRS");
-    assertStringsEqual(txUrl, "https://blockchair.com/groestlcoin/transaction/t123");
-    assertStringsEqual(accUrl, "https://blockchair.com/groestlcoin/address/a12");
-    assertStringsEqual(id, "groestlcoin");
-    assertStringsEqual(name, "Groestlcoin");
-}
diff --git a/tests/HDWallet/HDWalletTests.cpp b/tests/HDWallet/HDWalletTests.cpp
deleted file mode 100644
index fdf70a687d2..00000000000
--- a/tests/HDWallet/HDWalletTests.cpp
+++ /dev/null
@@ -1,426 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HDWallet.h"
-#include "Mnemonic.h"
-#include "Bitcoin/Address.h"
-#include "Bitcoin/CashAddress.h"
-#include "Bitcoin/SegwitAddress.h"
-#include "Ethereum/Address.h"
-#include "HexCoding.h"
-#include "PublicKey.h"
-#include "Hash.h"
-#include "Base58.h"
-#include "Coin.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-
-extern std::string TESTS_ROOT;
-
-namespace TW::HDWalletTests {
-
-const auto mnemonic1 = "ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal";
-const auto gPassphrase = "passphrase";
-
-TEST(HDWallet, generate) {
-    {
-        HDWallet wallet = HDWallet(128, gPassphrase);
-        EXPECT_TRUE(Mnemonic::isValid(wallet.getMnemonic()));
-        EXPECT_EQ(wallet.getPassphrase(), gPassphrase);
-        EXPECT_EQ(wallet.getEntropy().size(), 16ul);
-    }
-    {
-        HDWallet wallet = HDWallet(256, gPassphrase);
-        EXPECT_TRUE(Mnemonic::isValid(wallet.getMnemonic()));
-        EXPECT_EQ(wallet.getPassphrase(), gPassphrase);
-        EXPECT_EQ(wallet.getEntropy().size(), 32ul);
-    }
-}
-
-TEST(HDWallet, generateInvalid) {
-    EXPECT_EXCEPTION(HDWallet(64, gPassphrase), "Invalid strength");
-    EXPECT_EXCEPTION(HDWallet(129, gPassphrase), "Invalid strength");
-    EXPECT_EXCEPTION(HDWallet(512, gPassphrase), "Invalid strength");
-}
-
-TEST(HDWallet, createFromMnemonic) {
-    {
-        HDWallet wallet = HDWallet(mnemonic1, gPassphrase);
-        EXPECT_EQ(wallet.getMnemonic(), mnemonic1);
-        EXPECT_EQ(wallet.getPassphrase(), gPassphrase);
-        EXPECT_EQ(hex(wallet.getEntropy()), "ba5821e8c356c05ba5f025d9532fe0f21f65d594");
-        EXPECT_EQ(hex(wallet.getSeed()), "143cd5fc27ae46eb423efebc41610473f5e24a80f2ca2e2fa7bf167e537f58f4c68310ae487fce82e25bad29bab2530cf77fd724a5ebfc05a45872773d7ee2d6");
-    }
-    {   // empty passphrase
-        HDWallet wallet = HDWallet(mnemonic1, "");
-        EXPECT_EQ(wallet.getMnemonic(), mnemonic1);
-        EXPECT_EQ(wallet.getPassphrase(), "");
-        EXPECT_EQ(hex(wallet.getEntropy()), "ba5821e8c356c05ba5f025d9532fe0f21f65d594");
-        EXPECT_EQ(hex(wallet.getSeed()), "354c22aedb9a37407adc61f657a6f00d10ed125efa360215f36c6919abd94d6dbc193a5f9c495e21ee74118661e327e84a5f5f11fa373ec33b80897d4697557d");
-    }
-}
-
-TEST(HDWallet, entropyLength_createFromMnemonic) {
-    {   // 12 words
-        HDWallet wallet = HDWallet("oil oil oil oil oil oil oil oil oil oil oil oil", "");
-        EXPECT_EQ(wallet.getEntropy().size(), 16ul);
-        EXPECT_EQ(hex(wallet.getEntropy()), "99d33a674ce99d33a674ce99d33a674c");
-    }
-    {   // 12 words, from https://github.com/trezor/python-mnemonic/blob/master/vectors.json
-        HDWallet wallet = HDWallet("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", "");
-        EXPECT_EQ(wallet.getEntropy().size(), 16ul);
-        EXPECT_EQ(hex(wallet.getEntropy()), "00000000000000000000000000000000");
-    }
-    {   // 15 words
-        HDWallet wallet = HDWallet("history step cheap card humble screen raise seek robot slot coral roof spoil wreck caution", "");
-        EXPECT_EQ(wallet.getEntropy().size(), 20ul);
-        EXPECT_EQ(hex(wallet.getEntropy()), "6c3aac9b9146ef832c4e18bb3980c0dddd25fc49");
-    }
-    {   // 18 words
-        HDWallet wallet = HDWallet("caught hockey split gun symbol code payment copy broccoli silly shed secret stove tell citizen staff photo high", "");
-        EXPECT_EQ(wallet.getEntropy().size(), 24ul);
-        EXPECT_EQ(hex(wallet.getEntropy()), "246d8f48b3fdc65a2869801c791715614d6bbd8a56a0a3ad");
-    }
-    {   // 21 words
-        HDWallet wallet = HDWallet("diary shine country alpha bridge coast loan hungry hip media sell crucial swarm share gospel lake visa coin dizzy physical basket", "");
-        EXPECT_EQ(wallet.getEntropy().size(), 28ul);
-        EXPECT_EQ(hex(wallet.getEntropy()), "3d58bcc40381bc59a0c37a6bf14f0d9a3db78a5933e5f4a5ad00d1f1");
-    }
-    {   // 24 words
-        HDWallet wallet = HDWallet("poet spider smile swift roof pilot subject save hand diet ice universe over brown inspire ugly wide economy symbol shove episode patient plug swamp", "");
-        EXPECT_EQ(wallet.getEntropy().size(), 32ul);
-        EXPECT_EQ(hex(wallet.getEntropy()), "a73a3732edebbb49f5fdfe68c7b5c0f6e9de3a1d5760faa8c771e384bf4229b6");
-    }
-    {   // 24 words, from https://github.com/trezor/python-mnemonic/blob/master/vectors.json
-        HDWallet wallet = HDWallet("letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic bless", "");
-        EXPECT_EQ(wallet.getEntropy().size(), 32ul);
-        EXPECT_EQ(hex(wallet.getEntropy()), "8080808080808080808080808080808080808080808080808080808080808080");
-    }
-}
-
-TEST(HDWallet, createFromSpanishMnemonic) {
-    {
-        EXPECT_EXCEPTION(HDWallet("llanto radical atraer riesgo actuar masa fondo cielo dieta archivo sonrisa mamut", ""), "Invalid mnemonic");
-    }
-    {
-        HDWallet wallet = HDWallet("llanto radical atraer riesgo actuar masa fondo cielo dieta archivo sonrisa mamut", "", false);
-        EXPECT_EQ(wallet.getMnemonic(), "llanto radical atraer riesgo actuar masa fondo cielo dieta archivo sonrisa mamut");
-        EXPECT_EQ(wallet.getPassphrase(), "");
-        EXPECT_EQ(hex(wallet.getEntropy()), "");
-        EXPECT_EQ(hex(wallet.getSeed()), "ec8f8703432fc7d32e699ee056e9d84b1435e6a64a6a40ad63dbde11eab189a276ddcec20f3326d3c6ee39cbd018585b104fc3633b801c011063ae4c318fb9b6");
-    }
-}
-
-TEST(HDWallet, createFromMnemonicInvalid) {
-    EXPECT_EXCEPTION(HDWallet("THIS IS AN INVALID MNEMONIC", gPassphrase), "Invalid mnemonic");
-    EXPECT_EXCEPTION(HDWallet("", gPassphrase), "Invalid mnemonic");
-
-    EXPECT_EXCEPTION(HDWallet("", gPassphrase, false), "Invalid mnemonic");
-    HDWallet walletUnchecked = HDWallet("THIS IS AN INVALID MNEMONIC", gPassphrase, false);
-}
-
-TEST(HDWallet, createFromEntropy) {
-    {
-        HDWallet wallet = HDWallet(parse_hex("ba5821e8c356c05ba5f025d9532fe0f21f65d594"), gPassphrase);
-        EXPECT_EQ(wallet.getMnemonic(), mnemonic1);
-    }
-}
-
-TEST(HDWallet, createFromEntropyInvalid) {
-    EXPECT_EXCEPTION(HDWallet(parse_hex(""), gPassphrase), "Invalid mnemonic data");
-    EXPECT_EXCEPTION(HDWallet(parse_hex("123456"), gPassphrase), "Invalid mnemonic data");
-}
-
-TEST(HDWallet, recreateFromEntropy) {
-    {
-        HDWallet wallet1 = HDWallet(mnemonic1, gPassphrase);
-        EXPECT_EQ(wallet1.getMnemonic(), mnemonic1);
-        EXPECT_EQ(hex(wallet1.getEntropy()), "ba5821e8c356c05ba5f025d9532fe0f21f65d594");
-        HDWallet wallet2 = HDWallet(wallet1.getEntropy(), gPassphrase);
-        EXPECT_EQ(wallet2.getMnemonic(), wallet1.getMnemonic());
-        EXPECT_EQ(wallet2.getEntropy(), wallet1.getEntropy());
-        EXPECT_EQ(wallet2.getSeed(), wallet1.getSeed());
-    }
-}
-
-TEST(HDWallet, privateKeyFromXPRV) {
-    const std::string xprv = "xprv9yqEgpMG2KCjvotCxaiMkzmKJpDXz2xZi3yUe4XsURvo9DUbPySW1qRbdeDLiSxZt88hESHUhm2AAe2EqfWM9ucdQzH3xv1HoKoLDqHMK9n";
-    auto privateKey = HDWallet::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
-    ASSERT_TRUE(privateKey);
-    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto address = Bitcoin::BitcoinCashAddress(publicKey);
-
-    EXPECT_EQ(hex(publicKey.bytes), "025108168f7e5aad52f7381c18d8f880744dbee21dc02c15abe512da0b1cca7e2f");
-    EXPECT_EQ(address.string(), "bitcoincash:qp3y0dyg6ya8nt4n3algazn073egswkytqs00z7rz4");
-}
-
-TEST(HDWallet, privateKeyFromXPRV_Invalid) {
-    const std::string xprv = "xprv9y0000";
-    auto privateKey = HDWallet::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
-    ASSERT_FALSE(privateKey);
-}
-
-TEST(HDWallet, privateKeyFromXPRV_InvalidVersion) {
-    {
-        // Version bytes (first 4) are invalid, 0x00000000
-        const std::string xprv = "11117pE7xwz2GARukXY8Vj2ge4ozfX4HLgy5ztnJXjr5btzJE8EbtPhZwrcPWAodW2aFeYiXkXjSxJYm5QrnhSKFXDgACcFdMqGns9VLqESCq3";
-        auto privateKey = HDWallet::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
-        ASSERT_FALSE(privateKey);
-    }
-    {
-        // Version bytes (first 4) are invalid, 0xdeadbeef
-        const std::string xprv = "pGoh3VZXR4mTkT4bfqj4paog12KmHkAWkdLY8HNsZagD1ihVccygLr1ioLBhVQsny47uEh5swP3KScFc4JJrazx1Y7xvzmH2y5AseLgVMwomBTg2";
-        auto privateKey = HDWallet::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
-        ASSERT_FALSE(privateKey);
-    }
-}
-
-TEST(HDWallet, privateKeyFromExtended_InvalidCurve) {
-    // invalid coin & curve, should fail
-    const std::string xprv = "xprv9yqEgpMG2KCjvotCxaiMkzmKJpDXz2xZi3yUe4XsURvo9DUbPySW1qRbdeDLiSxZt88hESHUhm2AAe2EqfWM9ucdQzH3xv1HoKoLDqHMK9n";
-    auto privateKey = HDWallet::getPrivateKeyFromExtended(xprv, TWCoinType(123456), DerivationPath(TWPurposeBIP44, 123456, 0, 0, 0));
-    ASSERT_FALSE(privateKey);
-}
-
-TEST(HDWallet, privateKeyFromXPRV_Invalid45) {
-    // 45th byte is not 0
-    const std::string xprv = "xprv9yqEgpMG2KCjvotCxaiMkzmKJpDXz2xZi3yUe4XsURvo9DUbPySW1qRbhw2dJ8QexahgVSfkjxU4FgmN4GLGN3Ui8oLqC6433CeyPUNVHHh";
-    auto privateKey = HDWallet::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
-    ASSERT_FALSE(privateKey);
-}
-
-TEST(HDWallet, privateKeyFromMptv) {
-    const std::string mptv = "Mtpv7SkyM349Svcf1WiRtB5hC91ZZkVsGuv3kz1V7tThGxBFBzBLFnw6LpaSvwpHHuy8dAfMBqpBvaSAHzbffvhj2TwfojQxM7Ppm3CzW67AFL5";
-    auto privateKey = HDWallet::getPrivateKeyFromExtended(mptv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 4));
-    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
-
-    auto witness = Data{0x00, 0x14};
-    auto keyHash = Hash::sha256ripemd(publicKey.bytes.data(), 33);
-    witness.insert(witness.end(), keyHash.begin(), keyHash.end());
-
-    auto prefix = Data{TW::p2shPrefix(TWCoinTypeLitecoin)};
-    auto redeemScript = Hash::sha256ripemd(witness.data(), witness.size());
-    prefix.insert(prefix.end(), redeemScript.begin(), redeemScript.end());
-
-    auto address = Bitcoin::Address(prefix);
-
-    EXPECT_EQ(hex(publicKey.bytes), "02c36f9c3051e9cfbb196ecc35311f3ad705ea6798ffbe6b039e70f6bd047e6f2c");
-    EXPECT_EQ(address.string(), "MBzcCaoLk9626cLj2UVvcxs6nsVUi39zEy");
-}
-
-TEST(HDWallet, privateKeyFromZprv) {
-    const std::string zprv = "zprvAdzGEQ44z4WPLNCRpDaup2RumWxLGgR8PQ9UVsSmJigXsHVDaHK1b6qGM2u9PmxB2Gx264ctAz4yRoN3Xwf1HZmKcn6vmjqwsawF4WqQjfd";
-    auto privateKey = HDWallet::getPrivateKeyFromExtended(zprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoin), 0, 0, 5));
-    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto address = Bitcoin::SegwitAddress(publicKey, "bc");
-
-    EXPECT_EQ(hex(publicKey.bytes), "022dc3f5a3fcfd2d1cc76d0cb386eaad0e30247ba729da0d8847a2713e444fdafa");
-    EXPECT_EQ(address.string(), "bc1q5yyq60jepll68hds7exa7kpj20gsvdu0aztw5x");
-}
-
-TEST(HDWallet, privateKeyFromDGRV) {
-    const std::string dgpv = "dgpv595jAJYGBLanByCJXRzrWBZFVXdNisfuPmKRDquCQcwBbwKbeR21AtkETf4EpjBsfsK3kDZgMqhcuky1B9PrT5nxiEcjghxpUVYviHXuCmc";
-    auto privateKey = HDWallet::getPrivateKeyFromExtended(dgpv, TWCoinTypeDogecoin, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeDogecoin), 0, 0, 1));
-    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto address = Bitcoin::Address(publicKey, TW::p2pkhPrefix(TWCoinTypeDogecoin));
-
-    EXPECT_EQ(hex(publicKey.bytes), "03eb6bf281990ee074a39c71ed8ce78c486066ac433bcf066dd5eb08f87d3a6c34");
-    EXPECT_EQ(address.string(), "D5taDndQJ1fDF3AM1yWavmJY2BgSi17CUv");
-}
-
-TEST(HDWallet, privateKeyFromXPRVForDGB) {
-    const std::string xprvForDgb = "xprv9ynLofyuR3uCqCMJADwzBaPnXB53EVe5oLujvPfdvCxae3NzgEpYjZMgcUeS8EUeYfYVLG61ZgPXm9TZWiwBnLVCgd551vCwpXC19hX3mFJ";
-    auto privateKey = HDWallet::getPrivateKeyFromExtended(xprvForDgb, TWCoinTypeDigiByte, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeDigiByte), 0, 0, 1));
-    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto address = Bitcoin::Address(publicKey, TW::p2pkhPrefix(TWCoinTypeDigiByte));
-
-    EXPECT_EQ(hex(publicKey.bytes), "03238a5c541c2cbbf769dbe0fb2a373c22db4da029370767fbe746d59da4de07f1");
-    EXPECT_EQ(address.string(), "D9Gv7jWSVsS9Y5q98C79WyfEj6P2iM5Nzs");
-}
-
-TEST(HDWallet, DeriveWithLeadingZerosEth) {
-    // Derivation test case with leading zeroes, see  https://blog.polychainlabs.com/bitcoin,/bip32,/bip39,/kdf/2021/05/17/inconsistent-bip32-derivations.html
-    const auto mnemonic = "name dash bleak force moral disease shine response menu rescue more will";
-    const auto derivationPath = "m/44'/60'";
-    const auto coin = TWCoinTypeEthereum;
-    auto wallet = HDWallet(mnemonic, "");
-    const auto addr = Ethereum::Address(wallet.getKey(coin, DerivationPath(derivationPath)).getPublicKey(TW::publicKeyType(coin)));
-    EXPECT_EQ(addr.string(), "0x0ba17e928471c64AaEaf3ABfB3900EF4c27b380D");
-}
-
-static nlohmann::json getVectors() {
-    const std::string vectorsJsonPath = std::string(TESTS_ROOT) + "/HDWallet/bip39_vectors.json";
-    auto vectorsJson = loadJson(vectorsJsonPath)["english"];
-    return vectorsJson;
-}
-
-TEST(HDWallet, Bip39Vectors) {
-    // BIP39 test vectors, from https://github.com/trezor/python-mnemonic/blob/master/vectors.json
-    const auto passphrase = "TREZOR";
-    const auto vectors = getVectors();
-    for (const auto& v: vectors) {
-        const std::string entropy = v[0];
-        const std::string mnemonic = v[1];
-        const std::string seed = v[2];
-        const std::string xprv = v[3];
-        { // from mnemonic
-            HDWallet wallet = HDWallet(mnemonic, passphrase);
-            EXPECT_EQ(wallet.getMnemonic(), mnemonic);
-            EXPECT_EQ(wallet.getPassphrase(), passphrase);
-            EXPECT_EQ(hex(wallet.getEntropy()), entropy);
-            EXPECT_EQ(hex(wallet.getSeed()), seed);
-            EXPECT_EQ(wallet.getRootKey(TWCoinTypeBitcoin, TWHDVersionXPRV), xprv);
-        }
-        { // from entropy
-            HDWallet wallet = HDWallet(parse_hex(entropy), passphrase);
-            EXPECT_EQ(wallet.getMnemonic(), mnemonic);
-            EXPECT_EQ(wallet.getPassphrase(), passphrase);
-            EXPECT_EQ(hex(wallet.getEntropy()), entropy);
-            EXPECT_EQ(hex(wallet.getSeed()), seed);
-            EXPECT_EQ(wallet.getRootKey(TWCoinTypeBitcoin, TWHDVersionXPRV), xprv);
-        }
-    }
-}
-
-TEST(HDWallet, getExtendedPrivateKey) {
-    const HDWallet wallet = HDWallet(mnemonic1, "");
-    const auto purpose = TWPurposeBIP44;
-    const auto coin = TWCoinTypeBitcoin;
-    const auto hdVersion = TWHDVersionZPRV;
-    
-    // default
-    const auto extPubKey1 = wallet.getExtendedPrivateKey(purpose, coin, hdVersion);
-    EXPECT_EQ(extPubKey1, "zprvAcwsTZNaY1f7rfwsy5GseSDStYBrxwtsBZDkb3iyuQUs4NF6n58BuH7Xj54RuaSCWtU5CiQzuYQgFgqr1HokgKcVAeGeXokhJUAJeP3VmvY");
-
-    // explicitly specify default account=0
-    const auto extPubKey2 = wallet.getExtendedPrivateKeyAccount(purpose, coin, TWDerivationDefault, hdVersion, 0);
-    EXPECT_EQ(extPubKey2, "zprvAcwsTZNaY1f7rfwsy5GseSDStYBrxwtsBZDkb3iyuQUs4NF6n58BuH7Xj54RuaSCWtU5CiQzuYQgFgqr1HokgKcVAeGeXokhJUAJeP3VmvY");
-
-    // custom account=1
-    const auto extPubKey3 = wallet.getExtendedPrivateKeyAccount(purpose, coin, TWDerivationDefault, hdVersion, 1);
-    EXPECT_EQ(extPubKey3, "zprvAcwsTZNaY1f7sifgNNgdNa4P9mPtyg3zRVgwkx2qF9Sn7F255MzP6Zyumn6bgV5xuoS8ZrDvjzE7APcFSacXdzFYpGvyybb1bnAoh5nHxpn");
-}
-
-TEST(HDWallet, getExtendedPublicKey) {
-    const HDWallet wallet = HDWallet(mnemonic1, "");
-    const auto purpose = TWPurposeBIP44;
-    const auto coin = TWCoinTypeBitcoin;
-    const auto hdVersion = TWHDVersionZPUB;
-    const auto derivation = TWDerivationDefault;
-    
-    // default
-    const auto extPubKey1 = wallet.getExtendedPublicKey(purpose, coin, hdVersion);
-    EXPECT_EQ(extPubKey1, "zpub6qwDs4uUNPDR5A2M56ot1aABSa2MNQciYn9MPS8bTk1qwAaFKcSST5S1aLidvPp9twqpaumG7vikR2vHhBXjp5oGgHyMvWK3AtUkfeEgyns");
-
-    // explicitly specify default account=0
-    const auto extPubKey2 = wallet.getExtendedPublicKeyAccount(purpose, coin, derivation, hdVersion, 0);
-    EXPECT_EQ(extPubKey2, "zpub6qwDs4uUNPDR5A2M56ot1aABSa2MNQciYn9MPS8bTk1qwAaFKcSST5S1aLidvPp9twqpaumG7vikR2vHhBXjp5oGgHyMvWK3AtUkfeEgyns");
-
-    // custom account=1
-    const auto extPubKey3 = wallet.getExtendedPublicKeyAccount(purpose, coin, derivation, hdVersion, 1);
-    EXPECT_EQ(extPubKey3, "zpub6qwDs4uUNPDR6Ck9UQDdji17hoEPP8mqnicYZLSSoUykz3MDcuJdeNJPd3BozqEafeLZkegWqzAvkgA4JZZ5tTN2rDpGKfk54essyfx1eZP");
-}
-
-TEST(HDWallet, Derive_XpubPub_vs_PrivPub) {
-    // Test different routes for deriving address from mnemonic, result should be the same:
-    // - Direct: mnemonic -> seed -> privateKey -> publicKey -> address
-    // - Extended Public: mnemonic -> seed -> zpub -> publicKey -> address
-    // - Extended Private: mnemonic -> seed -> zpriv -> privateKey -> publicKey -> address
-
-    const HDWallet wallet = HDWallet(mnemonic1, "");
-    const auto coin = TWCoinTypeBitcoin;
-    const auto derivPath1 = DerivationPath("m/84'/0'/0'/0/0");
-    const auto derivPath2 = DerivationPath("m/84'/0'/0'/0/2");
-    const auto expectedPublicKey1 = "02df9ef2a7a5552765178b181e1e1afdefc7849985c7dfe9647706dd4fa40df6ac";
-    const auto expectedPublicKey2 = "031e1f64d2f6768dccb6814545b2e2d58e26ad5f91b7cbaffe881ed572c65060db";
-    const auto expectedAddress1 = "bc1qpsp72plnsqe6e2dvtsetxtww2cz36ztmfxghpd";
-    const auto expectedAddress2 = "bc1q7zddsunzaftf4zlsg9exhzlkvc5374a6v32jf6";
-
-    // -> privateKey -> publicKey
-    {
-        const auto privateKey1 = wallet.getKey(coin, derivPath1);
-        const auto publicKey1 = privateKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
-        EXPECT_EQ(hex(publicKey1.bytes), expectedPublicKey1);
-        const auto address1 = Bitcoin::SegwitAddress(publicKey1, "bc");
-        EXPECT_EQ(address1.string(), expectedAddress1);
-    }
-    {
-        const auto privateKey2 = wallet.getKey(coin, derivPath2);
-        const auto publicKey2 = privateKey2.getPublicKey(TWPublicKeyTypeSECP256k1);
-        EXPECT_EQ(hex(publicKey2.bytes), expectedPublicKey2);
-        const auto address2 = Bitcoin::SegwitAddress(publicKey2, "bc");
-        EXPECT_EQ(address2.string(), expectedAddress2);
-    }
-
-    // zpub -> publicKey
-    const auto zpub = wallet.getExtendedPublicKey(TWPurposeBIP84, coin, TWHDVersionZPUB);
-    EXPECT_EQ(zpub, "zpub6rNUNtxSa9Gxvm4Bdxf1MPMwrvkzwDx6vP96Hkzw3jiQKdg3fhXBStxjn12YixQB8h88B3RMSRscRstf9AEVaYr3MAqVBEWBDuEJU4PGaT9");
-
-    {
-        const auto publicKey1 = wallet.getPublicKeyFromExtended(zpub, coin, derivPath1);
-        EXPECT_TRUE(publicKey1.has_value());
-        EXPECT_EQ(hex(publicKey1->bytes), expectedPublicKey1);
-        const auto address1 = Bitcoin::SegwitAddress(publicKey1.value(), "bc");
-        EXPECT_EQ(address1.string(), expectedAddress1);
-    }
-    {
-        const auto publicKey2 = wallet.getPublicKeyFromExtended(zpub, coin, derivPath2);
-        EXPECT_TRUE(publicKey2.has_value());
-        EXPECT_EQ(hex(publicKey2->bytes), expectedPublicKey2);
-        const auto address2 = Bitcoin::SegwitAddress(publicKey2.value(), "bc");
-        EXPECT_EQ(address2.string(), expectedAddress2);
-    }
-
-    // zpriv -> privateKey -> publicKey
-    const auto zpriv = wallet.getExtendedPrivateKey(TWPurposeBIP84, coin, TWHDVersionZPRV);
-    EXPECT_EQ(zpriv, "zprvAdP7yPRYjmifiGyiXw7zzFRDJtvWXmEFZADVVNbKVQBRSqLu8ACvu6eFvhrnnw4QwdTD8PUVa48MguwiPTiyfn85zWx9iA5MYy4Eufu5bas");
-
-    {
-        const auto privateKey1 = wallet.getPrivateKeyFromExtended(zpriv, coin, derivPath1);
-        EXPECT_TRUE(privateKey1.has_value());
-        const auto publicKey1 = privateKey1->getPublicKey(TWPublicKeyTypeSECP256k1);
-        EXPECT_EQ(hex(publicKey1.bytes), expectedPublicKey1);
-        const auto address1 = Bitcoin::SegwitAddress(publicKey1, "bc");
-        EXPECT_EQ(address1.string(), expectedAddress1);
-    }
-    {
-        const auto privateKey2 = wallet.getPrivateKeyFromExtended(zpriv, coin, derivPath2);
-        EXPECT_TRUE(privateKey2.has_value());
-        const auto publicKey2 = privateKey2->getPublicKey(TWPublicKeyTypeSECP256k1);
-        EXPECT_EQ(hex(publicKey2.bytes), expectedPublicKey2);
-        const auto address2 = Bitcoin::SegwitAddress(publicKey2, "bc");
-        EXPECT_EQ(address2.string(), expectedAddress2);
-    }
-}
-
-TEST(HDWallet, getKeyByCurve) {
-    const auto derivPath = "m/44'/539'/0'/0/0";
-    HDWallet wallet = HDWallet(mnemonic1, "");
-    {
-        const auto privateKey = wallet.getKeyByCurve(TWCurveSECP256k1, DerivationPath(derivPath));
-        EXPECT_EQ(hex(privateKey.bytes), "4fb8657d6464adcaa086d6758d7f0b6b6fc026c98dc1671fcc6460b5a74abc62");
-    }
-    {
-        const auto privateKey = wallet.getKeyByCurve(TWCurveNIST256p1, DerivationPath(derivPath));
-        EXPECT_EQ(hex(privateKey.bytes), "a13df52d5a5b438bbf921bbf86276e4347fe8e2f2ed74feaaee12b77d6d26f86");
-    }
-}
-
-TEST(HDWallet, getKey) {
-    const auto derivPath = "m/44'/539'/0'/0/0";
-    HDWallet wallet = HDWallet(mnemonic1, "");
-    {
-        const auto privateKey = wallet.getKey(TWCoinTypeBitcoin, DerivationPath(derivPath));
-        EXPECT_EQ(hex(privateKey.bytes), "4fb8657d6464adcaa086d6758d7f0b6b6fc026c98dc1671fcc6460b5a74abc62");
-    }
-    {
-        const auto privateKey = wallet.getKey(TWCoinTypeNEO, DerivationPath(derivPath));
-        EXPECT_EQ(hex(privateKey.bytes), "a13df52d5a5b438bbf921bbf86276e4347fe8e2f2ed74feaaee12b77d6d26f86");
-    }
-}
-
-} // namespace
diff --git a/tests/Harmony/AddressTests.cpp b/tests/Harmony/AddressTests.cpp
deleted file mode 100644
index eac8744c266..00000000000
--- a/tests/Harmony/AddressTests.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Harmony/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Harmony::tests {
-
-TEST(HarmonyAddress, FromString) {
-    Address sender;
-    ASSERT_TRUE(Address::decode("one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe", sender));
-    Address receiver;
-    ASSERT_TRUE(Address::decode("one1tp7xdd9ewwnmyvws96au0e7e7mz6f8hjqr3g3p", receiver));
-
-    ASSERT_EQ("ed1ebe4fd1f73f86388f231997859ca42c07da5d", hex(sender.getKeyHash()));
-    ASSERT_EQ("587c66b4b973a7b231d02ebbc7e7d9f6c5a49ef2", hex(receiver.getKeyHash()));
-}
-
-TEST(HarmonyAddress, FromData) {
-    const auto address = Address(parse_hex("0x587c66b4b973a7b231d02ebbc7e7d9f6c5a49ef2"));
-    const auto address_2 = Address(parse_hex("0xed1ebe4fd1f73f86388f231997859ca42c07da5d"));
-    ASSERT_EQ(address.string(), "one1tp7xdd9ewwnmyvws96au0e7e7mz6f8hjqr3g3p");
-    ASSERT_EQ(address_2.string(), "one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe");
-}
-
-TEST(HarmonyAddress, InvalidHarmonyAddress) {
-    ASSERT_FALSE(Address::isValid("one1a50tun737ulcvwy0yvve0pe"));
-    ASSERT_FALSE(Address::isValid("oe1tp7xdd9ewwnmyvws96au0ee7e7mz6f8hjqr3g3p"));
-}
-
-TEST(HarmonyAddress, FromPrivateKey) {
-    const auto privateKey =
-        PrivateKey(parse_hex("e2f88b4974ae763ca1c2db49218802c2e441293a09eaa9ab681779e05d1b7b94"));
-    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe");
-}
-
-} // namespace TW::Harmony::tests
diff --git a/tests/Harmony/SignerTests.cpp b/tests/Harmony/SignerTests.cpp
deleted file mode 100644
index 9cfe4104306..00000000000
--- a/tests/Harmony/SignerTests.cpp
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <gtest/gtest.h>
-
-#include "Ethereum/RLP.h"
-#include "Harmony/Address.h"
-#include "Harmony/Signer.h"
-#include "HexCoding.h"
-#include "proto/Harmony.pb.h"
-
-namespace TW::Harmony {
-
-using namespace boost::multiprecision;
-
-class SignerExposed : public Signer {
-  public:
-    SignerExposed(uint256_t chainID) : Signer(chainID) {}
-    using Signer::hash;
-};
-
-static uint256_t MAIN_NET = 0x1;
-
-static uint256_t LOCAL_NET = 0x2;
-
-static uint256_t TEST_AMOUNT = uint256_t("0x4c53ecdc18a60000");
-
-static Address TEST_RECEIVER;
-static bool testReceiverDecodeResult =
-    Address::decode("one1d2rngmem4x2c6zxsjjz29dlah0jzkr0k2n88wc", TEST_RECEIVER);
-
-static auto TEST_TRANSACTION = Transaction(/* nonce: */ 0x9,
-                                           /* gasPrice: */ 0x0,
-                                           /* gasLimit: */ 0x5208,
-                                           /* fromShardID */ 0x1,
-                                           /* toShardID */ 0x0,
-                                           /* to: */ TEST_RECEIVER,
-                                           /* amount: */ TEST_AMOUNT,
-                                           /* payload: */ {});
-
-TEST(HarmonySigner, RLPEncodingAndHashAssumeLocalNet) {
-    auto rlpUnhashedShouldBe = "e909808252080180946a87346f3ba9958d08d09484a"
-                               "2b7fdbbe42b0df6884c53ecdc18a6000080028080";
-    auto rlpHashedShouldBe = "610238ad72e4492af494f49bf5d92"
-                             "13626a0ee5adb8256bb2558e990ee4da8f0";
-    auto signer = SignerExposed(LOCAL_NET);
-    auto rlpHex = signer.txnAsRLPHex(TEST_TRANSACTION);
-    auto hash = signer.hash(TEST_TRANSACTION);
-
-    ASSERT_EQ(rlpHex, rlpUnhashedShouldBe);
-    ASSERT_EQ(hex(hash), rlpHashedShouldBe);
-}
-
-TEST(HarmonySigner, SignAssumeLocalNet) {
-    auto key =
-        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
-    auto signer = SignerExposed(LOCAL_NET);
-
-    uint256_t v("0x28");
-    uint256_t r("0x325aed6caa01a5235b7a508c8ab67f0c43946b05a1ea6a3e0628de4033fe372d");
-    uint256_t s("0x6c19085d3376c30f6dc47cec795991cd37d6d0ebddfa633b0a8f494bc19cd01b");
-
-    auto transaction = Transaction(TEST_TRANSACTION);
-    auto hash = signer.hash(transaction);
-
-    signer.sign(key, hash, transaction);
-
-    ASSERT_EQ(transaction.v, v);
-    ASSERT_EQ(transaction.r, r);
-    ASSERT_EQ(transaction.s, s);
-}
-
-TEST(HarmonySigner, SignProtoBufAssumeLocalNet) {
-    auto input = Proto::SigningInput();
-    auto trasactionMsg = input.mutable_transaction_message();
-
-    trasactionMsg->set_to_address(TEST_RECEIVER.string());
-    const auto privateKey =
-        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
-    auto payload = parse_hex("");
-    trasactionMsg->set_payload(payload.data(), payload.size());
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    auto value = store(LOCAL_NET);
-    input.set_chain_id(value.data(), value.size());
-
-    value = store(uint256_t("0x9"));
-    trasactionMsg->set_nonce(value.data(), value.size());
-
-    value = store(uint256_t(""));
-    trasactionMsg->set_gas_price(value.data(), value.size());
-
-    value = store(uint256_t("0x5208"));
-    trasactionMsg->set_gas_limit(value.data(), value.size());
-
-    value = store(uint256_t("0x1"));
-    trasactionMsg->set_from_shard_id(value.data(), value.size());
-
-    value = store(uint256_t("0x0"));
-    trasactionMsg->set_to_shard_id(value.data(), value.size());
-
-    value = store(uint256_t("0x4c53ecdc18a60000"));
-    trasactionMsg->set_amount(value.data(), value.size());
-
-    auto proto_output = Signer::sign(input);
-
-    auto shouldBeV = "28";
-    auto shouldBeR = "325aed6caa01a5235b7a508c8ab67f0c43946b05a1ea6a3e0628de4033fe372d";
-    auto shouldBeS = "6c19085d3376c30f6dc47cec795991cd37d6d0ebddfa633b0a8f494bc19cd01b";
-
-    ASSERT_EQ(hex(proto_output.v()), shouldBeV);
-    ASSERT_EQ(hex(proto_output.r()), shouldBeR);
-    ASSERT_EQ(hex(proto_output.s()), shouldBeS);
-}
-
-TEST(HarmonySigner, SignOverProtoBufAssumeMainNet) {
-    auto input = Proto::SigningInput();
-    auto trasactionMsg = input.mutable_transaction_message();
-    trasactionMsg->set_to_address(TEST_RECEIVER.string());
-    const auto privateKey =
-        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
-    auto payload = parse_hex("");
-    trasactionMsg->set_payload(payload.data(), payload.size());
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    auto value = store(MAIN_NET);
-    input.set_chain_id(value.data(), value.size());
-    
-    value = store(uint256_t("0xa"));
-    trasactionMsg->set_nonce(value.data(), value.size());
-
-    value = store(uint256_t(""));
-    trasactionMsg->set_gas_price(value.data(), value.size());
-
-    value = store(uint256_t("0x5208"));
-    trasactionMsg->set_gas_limit(value.data(), value.size());
-
-    value = store(uint256_t("0x1"));
-    trasactionMsg->set_from_shard_id(value.data(), value.size());
-
-    value = store(uint256_t("0x0"));
-    trasactionMsg->set_to_shard_id(value.data(), value.size());
-
-    value = store(uint256_t("0x4c53ecdc18a60000"));
-    trasactionMsg->set_amount(value.data(), value.size());
-
-    auto proto_output = Signer::sign(input);
-
-    auto expectEncoded = "f8690a808252080180946a87346f3ba9958d08d09484a2b7fdbbe42b0df6884c53ecdc18a"
-                         "600008026a074acbc63a58e7861e54ca24babf1cb800c5b694da25c3ae2b1543045053667"
-                         "08a0616ab8262ee6f6fb30ffcab3e9e8261479c7469ce97010a70b3d3f962842c61a";
-
-    auto v = "26";
-    auto r = "74acbc63a58e7861e54ca24babf1cb800c5b694da25c3ae2b154304505366708";
-    auto s = "616ab8262ee6f6fb30ffcab3e9e8261479c7469ce97010a70b3d3f962842c61a";
-
-    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
-    ASSERT_EQ(hex(proto_output.v()), v);
-    ASSERT_EQ(hex(proto_output.r()), r);
-    ASSERT_EQ(hex(proto_output.s()), s);
-}
-} // namespace TW::Harmony
diff --git a/tests/Harmony/StakingTests.cpp b/tests/Harmony/StakingTests.cpp
deleted file mode 100644
index 4f96ec0fa87..00000000000
--- a/tests/Harmony/StakingTests.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base64.h"
-#include "Coin.h"
-#include "HDWallet.h"
-#include "Harmony/Address.h"
-#include "Harmony/Signer.h"
-#include "HexCoding.h"
-#include "proto/Harmony.pb.h"
-
-#include <TrustWalletCore/TWHRP.h>
-#include <gtest/gtest.h>
-
-namespace TW::Harmony {
-
-static Address TEST_ACCOUNT;
-static bool testAccountDecodeResult =
-    Address::decode("one1a0x3d6xpmr6f8wsyaxd9v36pytvp48zckswvv9", TEST_ACCOUNT);
-
-static auto PRIVATE_KEY =
-    PrivateKey(parse_hex("4edef2c24995d15b0e25cbd152fb0e2c05d3b79b9c2afd134e6f59f91bf99e48"));
-
-TEST(HarmonyStaking, SignCreateValidator) {
-    auto input = Proto::SigningInput();
-    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
-
-    auto value = store(uint256_t("0x2"));
-    input.set_chain_id(value.data(), value.size());
-
-    auto stakingMessage = input.mutable_staking_message();
-    auto createValidatorMsg = stakingMessage->mutable_create_validator_message();
-
-    createValidatorMsg->set_validator_address(TEST_ACCOUNT.string());
-
-    auto description = createValidatorMsg->mutable_description();
-    description->set_name("Alice");
-    description->set_identity("alice");
-    description->set_website("alice.harmony.one");
-    description->set_security_contact("Bob");
-    description->set_details("Don't mess with me!!!");
-    auto commission = createValidatorMsg->mutable_commission_rates();
-
-    // (value, precision): (1, 1) represents 0.1
-    value = store(uint256_t("1"));
-    commission->mutable_rate()->set_value(value.data(), value.size());
-    value = store(uint256_t("1"));
-    commission->mutable_rate()->set_precision(value.data(), value.size());
-
-    // (value, precision): (9, 1) represents 0.9
-    value = store(uint256_t("9"));
-    commission->mutable_max_rate()->set_value(value.data(), value.size());
-    value = store(uint256_t("1"));
-    commission->mutable_max_rate()->set_precision(value.data(), value.size());
-
-    // (value, precision): (5, 2) represents 0.05
-    value = store(uint256_t("5"));
-    commission->mutable_max_change_rate()->set_value(value.data(), value.size());
-    value = store(uint256_t("2"));
-    commission->mutable_max_change_rate()->set_precision(value.data(), value.size());
-
-    value = store(uint256_t("10"));
-    createValidatorMsg->set_min_self_delegation(value.data(), value.size());
-
-    value = store(uint256_t("3000"));
-    createValidatorMsg->set_max_total_delegation(value.data(), value.size());
-
-    value = parse_hex("b9486167ab9087ab818dc4ce026edb5bf216863364c32e42df"
-                      "2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611");
-    createValidatorMsg->add_slot_pub_keys(value.data(), value.size());
-
-    value = parse_hex("4252b0f1210efb0d5061e8a706a7ea9d62292a7947a975472f"
-                      "b77e1af7278a1c3c2e6eeba73c0581ece398613829940df129"
-                      "f3071c9a24b4b448bb1e880dc5872a58cb07eed94294c4e01a"
-                      "5c864771cafef7b96be541cb3c521a98f01838dd94");
-    createValidatorMsg->add_slot_key_sigs(value.data(), value.size());
-
-    value = store(uint256_t("100"));
-    createValidatorMsg->set_amount(value.data(), value.size());
-
-    value = store(uint256_t("0x02"));
-    stakingMessage->set_nonce(value.data(), value.size());
-
-    value = store(uint256_t("0x0"));
-    stakingMessage->set_gas_price(value.data(), value.size());
-
-    value = store(uint256_t("0x64"));
-    stakingMessage->set_gas_limit(value.data(), value.size());
-
-    auto proto_output = Signer::sign(input);
-
-    auto expectEncoded =
-            "f9015280f9010894ebcd16e8c1d8f493ba04e99a56474122d81a9c58f83885416c69636585616c696365916"
-            "16c6963652e6861726d6f6e792e6f6e6583426f6295446f6e2774206d6573732077697468206d65212121dd"
-            "c988016345785d8a0000c9880c7d713b49da0000c887b1a2bc2ec500000a820bb8f1b0b9486167ab9087ab8"
-            "18dc4ce026edb5bf216863364c32e42df2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611f862b860"
-            "4252b0f1210efb0d5061e8a706a7ea9d62292a7947a975472fb77e1af7278a1c3c2e6eeba73c0581ece3986"
-            "13829940df129f3071c9a24b4b448bb1e880dc5872a58cb07eed94294c4e01a5c864771cafef7b96be541cb"
-            "3c521a98f01838dd946402806428a00d8437f81be3481b01542e9baef0445f3758cf084c5e1fba93d087ccc"
-            "e084cb1a0404c1a42442c2d39f84582353a1c67012451ff83ef6d3622f684041df9bf0072";
-
-    auto v = "28";
-    auto r = "0d8437f81be3481b01542e9baef0445f3758cf084c5e1fba93d087ccce084cb1";
-    auto s = "404c1a42442c2d39f84582353a1c67012451ff83ef6d3622f684041df9bf0072";
-
-    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
-    ASSERT_EQ(hex(proto_output.v()), v);
-    ASSERT_EQ(hex(proto_output.r()), r);
-    ASSERT_EQ(hex(proto_output.s()), s);
-}
-
-TEST(HarmonyStaking, SignEditValidator) {
-    auto input = Proto::SigningInput();
-    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
-
-    auto value = store(uint256_t("0x2"));
-    input.set_chain_id(value.data(), value.size());
-
-    auto stakingMessage = input.mutable_staking_message();
-    auto editValidatorMsg = stakingMessage->mutable_edit_validator_message();
-
-    editValidatorMsg->set_validator_address(TEST_ACCOUNT.string());
-
-    auto description = editValidatorMsg->mutable_description();
-    description->set_name("Alice");
-    description->set_identity("alice");
-    description->set_website("alice.harmony.one");
-    description->set_security_contact("Bob");
-    description->set_details("Don't mess with me!!!");
-
-    auto commissionRate = editValidatorMsg->mutable_commission_rate();
-
-    // (value, precision): (1, 1) represents 0.1
-    value = store(uint256_t("1"));
-    commissionRate->set_value(value.data(), value.size());
-    value = store(uint256_t("1"));
-    commissionRate->set_precision(value.data(), value.size());
-
-    value = store(uint256_t("10"));
-    editValidatorMsg->set_min_self_delegation(value.data(), value.size());
-
-    value = store(uint256_t("3000"));
-    editValidatorMsg->set_max_total_delegation(value.data(), value.size());
-
-    value = parse_hex("b9486167ab9087ab818dc4ce026edb5bf216863364c32e42df"
-                      "2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611");
-    editValidatorMsg->set_slot_key_to_remove(value.data(), value.size());
-    editValidatorMsg->set_slot_key_to_add(value.data(), value.size());
-
-    value = parse_hex("4252b0f1210efb0d5061e8a706a7ea9d62292a7947a975472f"
-                      "b77e1af7278a1c3c2e6eeba73c0581ece398613829940df129"
-                      "f3071c9a24b4b448bb1e880dc5872a58cb07eed94294c4e01a"
-                      "5c864771cafef7b96be541cb3c521a98f01838dd94");
-    editValidatorMsg->set_slot_key_to_add_sig(value.data(), value.size());
-
-    value = store(uint256_t("1"));
-    editValidatorMsg->set_active(value.data(), value.size());
-
-    value = store(uint256_t("0x02"));
-    stakingMessage->set_nonce(value.data(), value.size());
-
-    value = store(uint256_t("0x0"));
-    stakingMessage->set_gas_price(value.data(), value.size());
-
-    value = store(uint256_t("0x64")); // 0x5208
-    stakingMessage->set_gas_limit(value.data(), value.size());
-
-    auto proto_output = Signer::sign(input);
-
-    auto expectEncoded =
-        "f9016c01f9012294ebcd16e8c1d8f493ba04e99a56474122d81a9c58f83885416c69636585616c69636591616c6963652e6861726d6f6e792e6f6e6583426f6295446f6e2774206d6573732077697468206d65212121c988016345785d8a00000a820bb8b0b9486167ab9087ab818dc4ce026edb5bf216863364c32e42df2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611b0b9486167ab9087ab818dc4ce026edb5bf216863364c32e42df2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611b8604252b0f1210efb0d5061e8a706a7ea9d62292a7947a975472fb77e1af7278a1c3c2e6eeba73c0581ece398613829940df129f3071c9a24b4b448bb1e880dc5872a58cb07eed94294c4e01a5c864771cafef7b96be541cb3c521a98f01838dd940102806427a089d6f87855619c31e933d5f00638ca58737dfffdfdf8b66a048a2e45f103e05da04aafc5c51a95412760c089371b411a5ab8f235b456291a9754d544b162df4eef";
-
-    auto v = "27";
-    auto r = "89d6f87855619c31e933d5f00638ca58737dfffdfdf8b66a048a2e45f103e05d";
-    auto s = "4aafc5c51a95412760c089371b411a5ab8f235b456291a9754d544b162df4eef";
-
-    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
-    ASSERT_EQ(hex(proto_output.v()), v);
-    ASSERT_EQ(hex(proto_output.r()), r);
-    ASSERT_EQ(hex(proto_output.s()), s);
-}
-
-TEST(HarmonyStaking, SignDelegate) {
-    auto input = Proto::SigningInput();
-    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
-
-    auto value = store(uint256_t("0x2"));
-    input.set_chain_id(value.data(), value.size());
-
-    auto stakingMessage = input.mutable_staking_message();
-    auto delegateMsg = stakingMessage->mutable_delegate_message();
-    delegateMsg->set_delegator_address(TEST_ACCOUNT.string());
-    delegateMsg->set_validator_address(TEST_ACCOUNT.string());
-
-    value = store(uint256_t("0xa"));
-    delegateMsg->set_amount(value.data(), value.size());
-
-    value = store(uint256_t("0x02"));
-    stakingMessage->set_nonce(value.data(), value.size());
-
-    value = store(uint256_t("0x0"));
-    stakingMessage->set_gas_price(value.data(), value.size());
-
-    value = store(uint256_t("0x64"));
-    stakingMessage->set_gas_limit(value.data(), value.size());
-
-    auto proto_output = Signer::sign(input);
-
-    auto expectEncoded =
-        "f87302eb94ebcd16e8c1d8f493ba04e99a56474122d81a9c5894ebcd16e8c1d8f493ba04e99a56474122d81a"
-        "9c580a02806428a0ada9a8fb49eb3cd74f0f861e16bc1f1d56a0c6e3c25b0391f9e07a7963317e80a05c28dbc4"
-        "1763dc2391263e1aae30f842f90734d7ec68cee2352af0d4b0662b54";
-
-    auto v = "28";
-    auto r = "ada9a8fb49eb3cd74f0f861e16bc1f1d56a0c6e3c25b0391f9e07a7963317e80";
-    auto s = "5c28dbc41763dc2391263e1aae30f842f90734d7ec68cee2352af0d4b0662b54";
-
-    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
-    ASSERT_EQ(hex(proto_output.v()), v);
-    ASSERT_EQ(hex(proto_output.r()), r);
-    ASSERT_EQ(hex(proto_output.s()), s);
-}
-
-TEST(HarmonyStaking, SignUndelegate) {
-    auto input = Proto::SigningInput();
-    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
-
-    auto value = store(uint256_t("0x2"));
-    input.set_chain_id(value.data(), value.size());
-
-    auto stakingMessage = input.mutable_staking_message();
-    auto undelegateMsg = stakingMessage->mutable_undelegate_message();
-    undelegateMsg->set_delegator_address(TEST_ACCOUNT.string());
-    undelegateMsg->set_validator_address(TEST_ACCOUNT.string());
-
-    value = store(uint256_t("0xa"));
-    undelegateMsg->set_amount(value.data(), value.size());
-
-    value = store(uint256_t("0x02"));
-    stakingMessage->set_nonce(value.data(), value.size());
-
-    value = store(uint256_t("0x0"));
-    stakingMessage->set_gas_price(value.data(), value.size());
-
-    value = store(uint256_t("0x64"));
-    stakingMessage->set_gas_limit(value.data(), value.size());
-
-    auto proto_output = Signer::sign(input);
-
-    auto expectEncoded =
-        "f87303eb94ebcd16e8c1d8f493ba04e99a56474122d81a9c5894ebcd16e8c1d8f493ba04e99a56474122d81a9c"
-        "580a02806428a05bf8c653567defe2c3728732bc9d67dd099a977df91c740a883fd89e03abb6e2a05202c4b516"
-        "52d5144c6a30d14d1a7a316b5a4a6b49be985b4bc6980e49f7acb7";
-
-    auto v = "28";
-    auto r = "5bf8c653567defe2c3728732bc9d67dd099a977df91c740a883fd89e03abb6e2";
-    auto s = "5202c4b51652d5144c6a30d14d1a7a316b5a4a6b49be985b4bc6980e49f7acb7";
-
-    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
-    ASSERT_EQ(hex(proto_output.v()), v);
-    ASSERT_EQ(hex(proto_output.r()), r);
-    ASSERT_EQ(hex(proto_output.s()), s);
-}
-
-TEST(HarmonyStaking, SignCollectRewards) {
-    auto input = Proto::SigningInput();
-    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
-
-    auto value = store(uint256_t("0x2"));
-    input.set_chain_id(value.data(), value.size());
-
-    auto stakingMessage = input.mutable_staking_message();
-    auto collectRewardsMsg = stakingMessage->mutable_collect_rewards();
-    collectRewardsMsg->set_delegator_address(TEST_ACCOUNT.string());
-
-    value = store(uint256_t("0x02"));
-    stakingMessage->set_nonce(value.data(), value.size());
-
-    value = store(uint256_t("0x0"));
-    stakingMessage->set_gas_price(value.data(), value.size());
-
-    value = store(uint256_t("0x64"));
-    stakingMessage->set_gas_limit(value.data(), value.size());
-
-    auto proto_output = Signer::sign(input);
-
-    auto expectEncoded = "f85d04d594ebcd16e8c1d8f493ba04e99a56474122d81a9c5802806428a04c15c72f425"
-                         "77001083a9c7ff9d9724077aec704a524e53dc7c9afe97ca4e625a055c13ea17c3efd1cd9"
-                         "1f2988c7e7673950bac5a08c174f2d0af27a82039f1e3d";
-
-    auto v = "28";
-    auto r = "4c15c72f42577001083a9c7ff9d9724077aec704a524e53dc7c9afe97ca4e625";
-    auto s = "55c13ea17c3efd1cd91f2988c7e7673950bac5a08c174f2d0af27a82039f1e3d";
-
-    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
-    ASSERT_EQ(hex(proto_output.v()), v);
-    ASSERT_EQ(hex(proto_output.r()), r);
-    ASSERT_EQ(hex(proto_output.s()), s);
-}
-
-} // namespace TW::Harmony
diff --git a/tests/Harmony/TWAnyAddressTests.cpp b/tests/Harmony/TWAnyAddressTests.cpp
deleted file mode 100644
index 759eef52c84..00000000000
--- a/tests/Harmony/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWCoinType.h>
-
-#include <gtest/gtest.h>
-
-TEST(HarmonyAnyAddress, Harmony) {
-    auto string = STRING("one1c8dpswxg2p50znzecnq0peuxlxtcm9je7q7yje");
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeHarmony));
-    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
-
-    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
-
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "c1da1838c85068f14c59c4c0f0e786f9978d9659");
-}
diff --git a/tests/Harmony/TWAnySignerTests.cpp b/tests/Harmony/TWAnySignerTests.cpp
deleted file mode 100644
index 5278c3ff18e..00000000000
--- a/tests/Harmony/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/Harmony.pb.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Harmony::tests {
-
-static auto TEST_RECEIVER = "one129r9pj3sk0re76f7zs3qz92rggmdgjhtwge62k";
-
-static uint256_t LOCAL_NET = 0x2;
-
-TEST(TWAnySignerHarmony, Sign) {
-    Proto::SigningInput input;
-
-    auto transactionMessage = input.mutable_transaction_message();
-    transactionMessage->set_to_address(TEST_RECEIVER);
-    const auto privateKey = parse_hex("4edef2c24995d15b0e25cbd152fb0e2c05d3b79b9c2afd134e6f59f91bf99e48");
-
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto value = store(LOCAL_NET);
-    input.set_chain_id(value.data(), value.size());
-
-    value = store(uint256_t("0x1"));
-    transactionMessage->set_nonce(value.data(), value.size());
-
-    value = store(uint256_t(""));
-    transactionMessage->set_gas_price(value.data(), value.size());
-
-    value = store(uint256_t("0x5208"));
-    transactionMessage->set_gas_limit(value.data(), value.size());
-
-    value = store(uint256_t("0x1"));
-    transactionMessage->set_from_shard_id(value.data(), value.size());
-
-    value = store(uint256_t("0x0"));
-    transactionMessage->set_to_shard_id(value.data(), value.size());
-
-    value = store(uint256_t("0x6bfc8da5ee8220000"));
-    transactionMessage->set_amount(value.data(), value.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeHarmony);
-
-    auto shouldBeV = "28";
-    auto shouldBeR = "84cc200aab11f5e1b2f7ece0d56ec67385ac50cefb6e3dc2a2f3e036ed575a5c";
-    auto shouldBeS = "643f18005b790cac8d8e7dc90e6147df0b83874b52db198864694ea28a79e6fc";
-
-    ASSERT_EQ(hex(output.v()), shouldBeV);
-    ASSERT_EQ(hex(output.r()), shouldBeR);
-    ASSERT_EQ(hex(output.s()), shouldBeS);
-
-    ASSERT_EQ(hex(output.encoded()), "f86a0180825208018094514650ca30b3c79f693e14220115434236d44aeb8906bfc8da5ee82200008028a084cc200aab11f5e1b2f7ece0d56ec67385ac50cefb6e3dc2a2f3e036ed575a5ca0643f18005b790cac8d8e7dc90e6147df0b83874b52db198864694ea28a79e6fc");
-}
-
-TEST(TWAnySignerHarmony, SignJSON) {
-    auto json = STRING(R"({"chainId":"Ag==","transactionMessage":{"nonce":"AQ==","gasPrice":"AA==","gasLimit":"Ugg=","toAddress":"one129r9pj3sk0re76f7zs3qz92rggmdgjhtwge62k","amount":"Br/I2l7oIgAA","fromShardId":"AQ==","toShardId":"AA=="}})");
-    auto key = DATA("4edef2c24995d15b0e25cbd152fb0e2c05d3b79b9c2afd134e6f59f91bf99e48");
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeHarmony));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeHarmony));
-    assertStringsEqual(result, "f86a0180825208018094514650ca30b3c79f693e14220115434236d44aeb8906bfc8da5ee82200008028a084cc200aab11f5e1b2f7ece0d56ec67385ac50cefb6e3dc2a2f3e036ed575a5ca0643f18005b790cac8d8e7dc90e6147df0b83874b52db198864694ea28a79e6fc");
-}
-
-} // namespace TW::Harmony::tests
diff --git a/tests/Harmony/TWCoinTypeTests.cpp b/tests/Harmony/TWCoinTypeTests.cpp
deleted file mode 100644
index 5541e8ca94f..00000000000
--- a/tests/Harmony/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWHarmonyCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeHarmony));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeHarmony, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeHarmony, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeHarmony));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeHarmony));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeHarmony), 18);
-    ASSERT_EQ(TWBlockchainHarmony, TWCoinTypeBlockchain(TWCoinTypeHarmony));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeHarmony));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeHarmony));
-    assertStringsEqual(symbol, "ONE");
-    assertStringsEqual(txUrl, "https://explorer.harmony.one/#/tx/t123");
-    assertStringsEqual(accUrl, "https://explorer.harmony.one/#/address/a12");
-    assertStringsEqual(id, "harmony");
-    assertStringsEqual(name, "Harmony");
-}
diff --git a/tests/HexCodingTests.cpp b/tests/HexCodingTests.cpp
deleted file mode 100644
index 57a40717fed..00000000000
--- a/tests/HexCodingTests.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Data.h"
-#include "uint256.h"
-#include <gtest/gtest.h>
-
-namespace TW {
-
-TEST(HexCoding, validation) {
-    const std::string valid = "0x7d8bf18c7ce84b3e175b339c4ca93aed1dd166f1";
-    const std::string invalid = "0xMQqpqMQgCBuiPkoXfgZZsJvuzCeI1zc00z6vHJj4";
-    const auto bytes = parse_hex(invalid);
-    const auto bytes2 = parse_hex(valid);
-
-    ASSERT_TRUE(bytes.empty());
-    ASSERT_EQ("0x" + hex(bytes2), valid);
-}
-
-TEST(HexCoding, OddLength) {
-    const std::string oddHex = "0x28fa6ae00";
-    const auto bytes = parse_hex(oddHex, true);
-    const auto number = load(bytes);
-    ASSERT_EQ(number, 11000000000);
-}
-
-}
diff --git a/tests/ICON/TWCoinTypeTests.cpp b/tests/ICON/TWCoinTypeTests.cpp
deleted file mode 100644
index bffbd0459f0..00000000000
--- a/tests/ICON/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWICONCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeICON));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeICON, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeICON, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeICON));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeICON));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeICON), 18);
-    ASSERT_EQ(TWBlockchainIcon, TWCoinTypeBlockchain(TWCoinTypeICON));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeICON));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeICON));
-    assertStringsEqual(symbol, "ICX");
-    assertStringsEqual(txUrl, "https://tracker.icon.foundation/transaction/t123");
-    assertStringsEqual(accUrl, "https://tracker.icon.foundation/address/a12");
-    assertStringsEqual(id, "icon");
-    assertStringsEqual(name, "ICON");
-}
diff --git a/tests/Icon/AddressTests.cpp b/tests/Icon/AddressTests.cpp
deleted file mode 100644
index a9ed8262e39..00000000000
--- a/tests/Icon/AddressTests.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Icon/Address.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Icon::tests {
-
-TEST(IconAddress, Validation) {
-    ASSERT_TRUE(Address::isValid("cx116f042497e5f34268b1b91e742680f84cf4e9f3"));
-    ASSERT_TRUE(Address::isValid("hx116f042497e5f34268b1b91e742680f84cf4e9f3"));
-
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_FALSE(Address::isValid("dshadghasdghsadadsadjsad"));
-    ASSERT_FALSE(Address::isValid("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"));
-}
-
-TEST(IconAddress, String) {
-    const auto address = Address("hx116f042497e5f34268b1b91e742680f84cf4e9f3");
-    ASSERT_EQ(address.string(), "hx116f042497e5f34268b1b91e742680f84cf4e9f3");
-
-    const auto address2 = Address("cx116f042497e5f34268b1b91e742680f84cf4e9f3");
-    ASSERT_EQ(address2.string(), "cx116f042497e5f34268b1b91e742680f84cf4e9f3");
-}
-
-TEST(IconAddress, FromPrivateKey) {
-    const auto privateKey = PrivateKey(parse_hex("94d1a980d5e528067d44bf8a60d646f556e40ca71e17cd4ead2d56f89e4bd20f"));
-    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
-    const auto address = Address(publicKey, TypeAddress);
-
-    ASSERT_EQ(address.string(), "hx98c0832ca5bd8e8bf355ca9491888aa9725c2c48");
-}
-
-} // namespace TW::Icon::tests
diff --git a/tests/Icon/TWAnySignerTests.cpp b/tests/Icon/TWAnySignerTests.cpp
deleted file mode 100644
index ca9f6b070d3..00000000000
--- a/tests/Icon/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Data.h"
-#include "HexCoding.h"
-#include "proto/Icon.pb.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Icon::tests {
-
-TEST(TWAnySignerIcon, Sign) {
-    auto key = parse_hex("2d42994b2f7735bbc93a3e64381864d06747e574aa94655c516f9ad0a74eed79");
-    auto input = Proto::SigningInput();
-
-    input.set_from_address("hxbe258ceb872e08851f1f59694dac2558708ece11");
-    input.set_to_address("hx5bfdb090f43a808005ffc27c25b213145e80b7cd");
-
-    auto value = uint256_t(1000000000000000000);
-    auto valueData = store(value);
-    input.set_value(valueData.data(), valueData.size());
-
-    auto stepLimit = uint256_t("74565");
-    auto stepLimitData = store(stepLimit);
-    input.set_step_limit(stepLimitData.data(), stepLimitData.size());
-
-    auto one = uint256_t("01");
-    auto oneData = store(one);
-    input.set_network_id(oneData.data(), oneData.size());
-    input.set_nonce(oneData.data(), oneData.size());
-
-    input.set_timestamp(1516942975500598);
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeICON);
-
-    auto expected = std::string("{\"from\":\"hxbe258ceb872e08851f1f59694dac2558708ece11\",\"nid\":\"0x1\",\"nonce\":\"0x1\",\"signature\":\"xR6wKs+IA+7E91bT8966jFKlK5mayutXCvayuSMCrx9KB7670CsWa0B7LQzgsxU0GLXaovlAT2MLs1XuDiSaZQE=\",\"stepLimit\":\"0x12345\",\"timestamp\":\"0x563a6cf330136\",\"to\":\"hx5bfdb090f43a808005ffc27c25b213145e80b7cd\",\"value\":\"0xde0b6b3a7640000\",\"version\":\"0x3\"}");
-    ASSERT_EQ(output.encoded(), expected);
-}
-
-} // namespace TW::Icon::tests
diff --git a/tests/IoTeX/AddressTests.cpp b/tests/IoTeX/AddressTests.cpp
deleted file mode 100644
index 36fd80b38d9..00000000000
--- a/tests/IoTeX/AddressTests.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <gtest/gtest.h>
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-
-#include "IoTeX/Address.h"
-
-namespace TW::IoTeX {
-
-TEST(IoTeXAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8"));
-    ASSERT_FALSE(Address::isValid("io187wzp08vnhjpkydnr97qlh8kh0dpkkytfam8j"));
-    ASSERT_FALSE(Address::isValid("it187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j"));
-    ASSERT_FALSE(Address::isValid("ko187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j"));
-    ASSERT_FALSE(Address::isValid("io187wzp18vnhjjpkydnr97qlh8kh0dpkkytfam8j"));
-    ASSERT_FALSE(Address::isValid("io187wzp08vnhjbpkydnr97qlh8kh0dpkkytfam8j"));
-    ASSERT_FALSE(Address::isValid("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8k"));
-}
-
-TEST(IoTeXAddress, Valid) {
-    ASSERT_TRUE(Address::isValid("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j"));
-}
-
-TEST(IoTeXAddress, FromString) {
-    Address address;
-    ASSERT_TRUE(Address::decode("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j", address));
-    ASSERT_EQ("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j", address.string());
-
-    ASSERT_FALSE(Address::decode("io187wzp08vnhjbpkydnr97qlh8kh0dpkkytfam8j", address));
-}
-
-TEST(IoTeXAddress, FromPrivateKey) {
-    const auto privateKey = PrivateKey(parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f"));
-    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
-
-    EXPECT_THROW({
-        try
-        {
-            const auto _publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-            const auto _address = Address(_publicKey);
-        }
-        catch( const std::invalid_argument& e )
-        {
-            EXPECT_STREQ("address may only be an extended SECP256k1 public key", e.what());
-            throw;
-        }
-    }, std::invalid_argument);
-}
-
-TEST(IoTeXAddress, FromKeyHash) {
-    const auto keyHash = parse_hex("3f9c20bcec9de520d88d98cbe07ee7b5ded0dac4");
-    const auto address = Address(keyHash);
-    ASSERT_EQ(address.string(), "io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
-
-    EXPECT_THROW({
-        try
-        {
-            const auto _keyHash = parse_hex("3f9c20bcec9de520d88d98cbe07ee7b5ded0da");
-            const auto _address = Address(_keyHash);
-        }
-        catch( const std::invalid_argument& e )
-        {
-            EXPECT_STREQ("invalid address data", e.what());
-            throw;
-        }
-    }, std::invalid_argument);
-}
-
-} // namespace TW::IoTeX
diff --git a/tests/IoTeX/SignerTests.cpp b/tests/IoTeX/SignerTests.cpp
deleted file mode 100644
index 43a5c5ee22f..00000000000
--- a/tests/IoTeX/SignerTests.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <gtest/gtest.h>
-
-#include "HexCoding.h"
-
-#include "IoTeX/Address.h"
-#include "IoTeX/Signer.h"
-#include "proto/IoTeX.pb.h"
-
-namespace TW::IoTeX {
-
-TEST(IoTeXSigner, Sign) {
-    auto input = Proto::SigningInput();
-    input.set_version(1);
-    input.set_nonce(123);
-    input.set_gaslimit(888);
-    input.set_gasprice("999");
-    auto key = parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f");
-    input.set_privatekey(key.data(), key.size());
-    auto tsf = input.mutable_transfer();
-    tsf->set_amount("456");
-    tsf->set_recipient("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
-    auto text = parse_hex("68656c6c6f20776f726c6421"); // "hello world!"
-    tsf->set_payload(text.data(), text.size());
-
-    auto signer = IoTeX::Signer(std::move(input));
-    auto h = signer.hash();
-    ASSERT_EQ(hex(h.begin(), h.end()), "0f17cd7f43bdbeff73dfe8f5cb0c0045f2990884e5050841de887cf22ca35b50");
-    auto sig = signer.sign();
-    ASSERT_EQ(hex(sig.begin(), sig.end()), "555cc8af4181bf85c044c3201462eeeb95374f78aa48c67b87510ee63d5e502372e53082f03e9a11c1e351de539cedf85d8dff87de9d003cb9f92243541541a000");
-}
-
-TEST(IoTeXSigner, Build) {
-    auto input = Proto::SigningInput();
-    input.set_version(1);
-    input.set_nonce(123);
-    input.set_gaslimit(888);
-    input.set_gasprice("999");
-    auto keyhex = parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f");
-    input.set_privatekey(keyhex.data(), keyhex.size());
-    auto tsf = input.mutable_transfer();
-    tsf->set_amount("456");
-    tsf->set_recipient("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
-    auto text = parse_hex("68656c6c6f20776f726c6421"); // "hello world!"
-    tsf->set_payload(text.data(), text.size());
-
-    auto signer = IoTeX::Signer(std::move(input));
-    auto output = signer.build();
-    auto encoded = output.encoded(); // signed action's serialized bytes
-    ASSERT_EQ(hex(encoded.begin(), encoded.end()), "0a4c0801107b18f8062203393939523e0a033435361229696f313837777a703038766e686a6a706b79646e723937716c68386b683064706b6b797466616d386a1a0c68656c6c6f20776f726c64211241044e18306ae9ef4ec9d07bf6e705442d4d1a75e6cdf750330ca2d880f2cc54607c9c33deb9eae9c06e06e04fe9ce3d43962cc67d5aa34fbeb71270d4bad3d648d91a41555cc8af4181bf85c044c3201462eeeb95374f78aa48c67b87510ee63d5e502372e53082f03e9a11c1e351de539cedf85d8dff87de9d003cb9f92243541541a000");
-    auto h = output.hash(); // signed action's hash
-    ASSERT_EQ(hex(h.begin(), h.end()), "6c84ac119058e859a015221f87a4e187c393d0c6ee283959342eac95fad08c33");
-}
-
-} // namespace TW::IoTeX
diff --git a/tests/IoTeX/StakingTests.cpp b/tests/IoTeX/StakingTests.cpp
deleted file mode 100644
index 8a2008b1908..00000000000
--- a/tests/IoTeX/StakingTests.cpp
+++ /dev/null
@@ -1,332 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Data.h"
-#include "HexCoding.h"
-#include "IoTeX/Staking.h"
-#include "proto/IoTeX.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <gtest/gtest.h>
-
-namespace TW::IoTeX::tests {
-
-TEST(TWIoTeXStaking, Create) {
-    std::string IOTEX_STAKING_CANDIDATE = "io19d0p3ah4g8ww9d7kcxfq87yxe7fnr8rpth5shj";
-    std::string IOTEX_STAKING_PAYLOAD = "payload";
-    std::string IOTEX_STAKING_AMOUNT = "100";
-    Data candidate(IOTEX_STAKING_CANDIDATE.begin(), IOTEX_STAKING_CANDIDATE.end());
-    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
-    Data amount(IOTEX_STAKING_AMOUNT.begin(), IOTEX_STAKING_AMOUNT.end());
-
-    auto stake = stakingCreate(candidate, amount, 10000, true, payload);
-    ASSERT_EQ(hex(stake), "0a29696f313964307033616834673877773964376b63786671383779786537666e723872"
-                          "7074683573686a120331303018904e20012a077061796c6f6164");
-}
-
-TEST(TWIoTeXStaking, AddDeposit) {
-    std::string IOTEX_STAKING_PAYLOAD = "payload";
-    std::string IOTEX_STAKING_AMOUNT = "10";
-    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
-    Data amount(IOTEX_STAKING_AMOUNT.begin(), IOTEX_STAKING_AMOUNT.end());
-
-    auto stake = stakingAddDeposit(10, amount, payload);
-
-    ASSERT_EQ(hex(stake), "080a120231301a077061796c6f6164");
-}
-
-TEST(TWIoTeXStaking, Unstake) {
-    std::string IOTEX_STAKING_PAYLOAD = "payload";
-    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
-
-    auto stake = stakingUnstake(10, payload);
-
-    ASSERT_EQ(hex(stake), "080a12077061796c6f6164");
-}
-
-TEST(TWIoTeXStaking, Withdraw) {
-    std::string IOTEX_STAKING_PAYLOAD = "payload";
-    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
-
-    auto stake = stakingWithdraw(10, payload);
-
-    ASSERT_EQ(hex(stake), "080a12077061796c6f6164");
-}
-
-TEST(TWIoTeXStaking, Restake) {
-    std::string IOTEX_STAKING_PAYLOAD = "payload";
-    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
-
-    auto stake = stakingRestake(10, 1000, true, payload);
-
-    ASSERT_EQ(hex(stake), "080a10e807180122077061796c6f6164");
-}
-
-TEST(TWIoTeXStaking, ChangeCandidate) {
-    std::string IOTEX_STAKING_CANDIDATE = "io1xpq62aw85uqzrccg9y5hnryv8ld2nkpycc3gza";
-    std::string IOTEX_STAKING_PAYLOAD = "payload";
-    Data candidate(IOTEX_STAKING_CANDIDATE.begin(), IOTEX_STAKING_CANDIDATE.end());
-    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
-
-    auto stake = stakingChangeCandidate(10, candidate, payload);
-
-    ASSERT_EQ(hex(stake), "080a1229696f3178707136326177383575717a72636367397935686e727976386c"
-                          "64326e6b7079636333677a611a077061796c6f6164");
-}
-
-TEST(TWIoTeXStaking, Transfer) {
-    std::string IOTEX_STAKING_CANDIDATE = "io1xpq62aw85uqzrccg9y5hnryv8ld2nkpycc3gza";
-    std::string IOTEX_STAKING_PAYLOAD = "payload";
-    Data candidate(IOTEX_STAKING_CANDIDATE.begin(), IOTEX_STAKING_CANDIDATE.end());
-    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
-
-    auto stake = stakingTransfer(10, candidate, payload);
-
-    ASSERT_EQ(hex(stake), "080a1229696f3178707136326177383575717a72636367397935686e727976386c6432"
-                          "6e6b7079636333677a611a077061796c6f6164");
-}
-
-TEST(TWIoTeXStaking, CandidateRegister) {
-    std::string IOTEX_STAKING_NAME = "test";
-    std::string IOTEX_STAKING_OPERATOR = "io10a298zmzvrt4guq79a9f4x7qedj59y7ery84he";
-    std::string IOTEX_STAKING_REWARD = "io13sj9mzpewn25ymheukte4v39hvjdtrfp00mlyv";
-    std::string IOTEX_STAKING_OWNER = "io19d0p3ah4g8ww9d7kcxfq87yxe7fnr8rpth5shj";
-    std::string IOTEX_STAKING_AMOUNT = "100";
-    std::string IOTEX_STAKING_PAYLOAD = "payload";
-    Data name(IOTEX_STAKING_NAME.begin(), IOTEX_STAKING_NAME.end());
-    Data operatorAddress(IOTEX_STAKING_OPERATOR.begin(), IOTEX_STAKING_OPERATOR.end());
-    Data reward(IOTEX_STAKING_REWARD.begin(), IOTEX_STAKING_REWARD.end());
-    Data amount(IOTEX_STAKING_AMOUNT.begin(), IOTEX_STAKING_AMOUNT.end());
-    Data owner(IOTEX_STAKING_OWNER.begin(), IOTEX_STAKING_OWNER.end());
-    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
-
-    auto stake =
-        candidateRegister(name, operatorAddress, reward, amount, 10000, false, owner, payload);
-
-    ASSERT_EQ(hex(stake),
-              "0a5c0a04746573741229696f3130613239387a6d7a7672743467757137396139663478377165646a3539"
-              "7937657279383468651a29696f3133736a396d7a7065776e3235796d6865756b74653476333968766a64"
-              "7472667030306d6c7976120331303018904e2a29696f313964307033616834673877773964376b637866"
-              "71383779786537666e7238727074683573686a32077061796c6f6164");
-}
-
-TEST(TWIoTeXStaking, CandidateUpdate) {
-    std::string IOTEX_STAKING_NAME = "test";
-    std::string IOTEX_STAKING_OPERATOR = "io1cl6rl2ev5dfa988qmgzg2x4hfazmp9vn2g66ng";
-    std::string IOTEX_STAKING_REWARD = "io1juvx5g063eu4ts832nukp4vgcwk2gnc5cu9ayd";
-    Data name(IOTEX_STAKING_NAME.begin(), IOTEX_STAKING_NAME.end());
-    Data operatorAddress(IOTEX_STAKING_OPERATOR.begin(), IOTEX_STAKING_OPERATOR.end());
-    Data reward(IOTEX_STAKING_REWARD.begin(), IOTEX_STAKING_REWARD.end());
-
-    auto stake = candidateUpdate(name, operatorAddress, reward);
-
-    ASSERT_EQ(hex(stake), "0a04746573741229696f31636c36726c32657635646661393838716d677a6732783468"
-                          "66617a6d7039766e326736366e671a29696f316a757678356730363365753474733833"
-                          "326e756b7034766763776b32676e6335637539617964");
-}
-
-Proto::SigningInput createSigningInput() {
-    auto keyhex = parse_hex("cfa6ef757dee2e50351620dca002d32b9c090cfda55fb81f37f1d26b273743f1");
-    auto input = Proto::SigningInput();
-    input.set_version(1);
-    input.set_nonce(0);
-    input.set_gaslimit(1000000);
-    input.set_gasprice("10");
-    input.set_privatekey(keyhex.data(), keyhex.size());
-    return input;
-}
-
-TEST(TWIoTeXStaking, SignAll) {
-    { // sign stakecreate
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        auto& action = *input.mutable_stakecreate();
-        action.set_candidatename("io19d0p3ah4g8ww9d7kcxfq87yxe7fnr8rpth5shj");
-        action.set_stakedamount("100");
-        action.set_stakedduration(10000);
-        action.set_autostake(true);
-        action.set_payload("payload");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(hex(output.encoded()),
-                  "0a4b080118c0843d22023130c2023e0a29696f313964307033616834673877773964376b63786671"
-                  "3837797865"
-                  "37666e7238727074683573686a120331303018904e20012a077061796c6f6164124104755ce6d890"
-                  "3f6b3793bd"
-                  "db4ea5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c"
-                  "0bc76ef30d"
-                  "d6a1038ed9da8daf331a412e8bac421bab88dcd99c26ac8ffbf27f11ee57a41e7d2537891bfed5ae"
-                  "d8e2e026d4"
-                  "6e55d1b856787bc1cd7c1216a6e2534c5b5d1097c3afe8e657aa27cbbb0801");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "f1785e47b4200c752bb6518bd18097a41e075438b8c18c9cb00e1ae2f38ce767");
-    }
-    { // sign stakeadddeposit
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        auto& action = *input.mutable_stakeadddeposit();
-        action.set_bucketindex(10);
-        action.set_amount("10");
-        action.set_payload("payload");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(
-            hex(output.encoded()),
-            "0a1c080118c0843d22023130da020f080a120231301a077061796c6f6164124104755ce6d8903f6b3793"
-            "bddb4ea5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0b"
-            "c76ef30dd6a1038ed9da8daf331a41a48ab1feba8181d760de946aefed7d815a89fd9b1ab503d2392bb5"
-            "5e1bb75eec42dddc8bd642f89accc3a37b3cf15a103a95d66695fdf0647b202869fdd66bcb01");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "ca8937d6f224a4e4bf93cb5605581de2d26fb0481e1dfc1eef384ee7ccf94b73");
-    }
-    { // sign stakeunstake
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        auto& action = *input.mutable_stakeunstake();
-        action.set_bucketindex(10);
-        action.set_payload("payload");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(
-            hex(output.encoded()),
-            "0a18080118c0843d22023130ca020b080a12077061796c6f6164124104755ce6d8903f6b3793bddb4ea5"
-            "d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef30d"
-            "d6a1038ed9da8daf331a4100adee39b48e1d3dbbd65298a57c7889709fc4df39987130da306f6997374a"
-            "184b7e7c232a42f21e89b06e6e7ceab81303c6b7483152d08d19ac829b22eb81e601");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "bed58b64a6c4e959eca60a86f0b2149ce0e1dd527ac5fd26aef725ebf7c22a7d");
-    }
-    { // sign stakewithdraw
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        auto& action = *input.mutable_stakewithdraw();
-        action.set_bucketindex(10);
-        action.set_payload("payload");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(
-            hex(output.encoded()),
-            "0a18080118c0843d22023130d2020b080a12077061796c6f6164124104755ce6d8903f6b3793bddb4ea5"
-            "d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef30d"
-            "d6a1038ed9da8daf331a4152644d102186be6640d46b517331f3402e24424b0d85129595421d28503d75"
-            "340b2922f5a0d4f667bbd6f576d9816770286b2ce032ba22eaec3952e24da4756b00");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "28049348cf34f1aa927caa250e7a1b08778c44efaf73b565b6fa9abe843871b4");
-    }
-    { // sign stakerestake
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        auto& action = *input.mutable_stakerestake();
-        action.set_bucketindex(10);
-        action.set_stakedduration(1000);
-        action.set_autostake(true);
-        action.set_payload("payload");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(
-            hex(output.encoded()),
-            "0a1d080118c0843d22023130e20210080a10e807180122077061796c6f6164124104755ce6d8903f6b37"
-            "93bddb4ea5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c"
-            "0bc76ef30dd6a1038ed9da8daf331a41e2e763aed5b1fd1a8601de0f0ae34eb05162e34b0389ae3418ee"
-            "dbf762f64959634a968313a6516dba3a97b34efba4753bbed3a33d409ecbd45ac75007cd8e9101");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "8816e8f784a1fce40b54d1cd172bb6976fd9552f1570c73d1d9fcdc5635424a9");
-    }
-    { // sign stakechangecandidate
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        auto& action = *input.mutable_stakechangecandidate();
-        action.set_bucketindex(10);
-        action.set_candidatename("io1xpq62aw85uqzrccg9y5hnryv8ld2nkpycc3gza");
-        action.set_payload("payload");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(
-            hex(output.encoded()),
-            "0a43080118c0843d22023130ea0236080a1229696f3178707136326177383575717a7263636739793568"
-            "6e727976386c64326e6b7079636333677a611a077061796c6f6164124104755ce6d8903f6b3793bddb4e"
-            "a5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef3"
-            "0dd6a1038ed9da8daf331a41d519eb3747163b945b862989b7e82a7f8468001e9683757cb88d5ddd95f8"
-            "1895047429e858bd48f7d59a88bfec92de231d216293aeba1e4fbe11461d9c9fc99801");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "186526b5b9fe74e25beb52c83c41780a69108160bef2ddaf3bffb9f1f1e5e73a");
-    }
-    { // sign staketransfer
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        auto& action = *input.mutable_staketransferownership();
-        action.set_bucketindex(10);
-        action.set_voteraddress("io1xpq62aw85uqzrccg9y5hnryv8ld2nkpycc3gza");
-        action.set_payload("payload");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(
-            hex(output.encoded()),
-            "0a43080118c0843d22023130f20236080a1229696f3178707136326177383575717a7263636739793568"
-            "6e727976386c64326e6b7079636333677a611a077061796c6f6164124104755ce6d8903f6b3793bddb4e"
-            "a5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef3"
-            "0dd6a1038ed9da8daf331a41fa26db427ab87a56a129196c1604f2e22c4dd2a1f99b2217bc916260757d"
-            "00093d9e6dccdf53e3b0b64e41a69d71c238fbf9281625164694a74dfbeba075d0ce01");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "74b2e1d6a09ba5d1298fa422d5850991ae516865077282196295a38f93c78b85");
-    }
-    { // sign candidateupdate
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        auto& action = *input.mutable_candidateupdate();
-        action.set_name("test");
-        action.set_operatoraddress("io1cl6rl2ev5dfa988qmgzg2x4hfazmp9vn2g66ng");
-        action.set_rewardaddress("io1juvx5g063eu4ts832nukp4vgcwk2gnc5cu9ayd");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(
-            hex(output.encoded()),
-            "0a69080118c0843d2202313082035c0a04746573741229696f31636c36726c3265763564666139383871"
-            "6d677a673278346866617a6d7039766e326736366e671a29696f316a7576783567303633657534747338"
-            "33326e756b7034766763776b32676e6335637539617964124104755ce6d8903f6b3793bddb4ea5d3589d"
-            "637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef30dd6a103"
-            "8ed9da8daf331a4101885c9c6684a4a8f2f5bf11f8326f27be48658f292e8f55ec8a11a604bb0c563a11"
-            "ebf12d995ca1c152e00f8e0f0edf288db711aa10dbdfd5b7d73b4a28e1f701");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "ca1a28f0e9a58ffc67037cc75066dbdd8e024aa2b2e416e4d6ce16c3d86282e5");
-    }
-    { // sign candidateregister
-        auto input = createSigningInput();
-        Proto::SigningOutput output;
-        input.set_gasprice("1000");
-        auto& cbi = *input.mutable_candidateregister()->mutable_candidate();
-        cbi.set_name("test");
-        cbi.set_operatoraddress("io10a298zmzvrt4guq79a9f4x7qedj59y7ery84he");
-        cbi.set_rewardaddress("io13sj9mzpewn25ymheukte4v39hvjdtrfp00mlyv");
-
-        auto& action = *input.mutable_candidateregister();
-        action.set_stakedamount("100");
-        action.set_stakedduration(10000);
-        action.set_autostake(false);
-        action.set_owneraddress("io19d0p3ah4g8ww9d7kcxfq87yxe7fnr8rpth5shj");
-        action.set_payload("payload");
-        ANY_SIGN(input, TWCoinTypeIoTeX);
-        ASSERT_EQ(hex(output.encoded()),
-                  "0aaa01080118c0843d220431303030fa029a010a5c0a04746573741229696f3130613239387a6d7a"
-                  "7672743467"
-                  "757137396139663478377165646a35397937657279383468651a29696f3133736a396d7a7065776e"
-                  "3235796d68"
-                  "65756b74653476333968766a647472667030306d6c7976120331303018904e2a29696f3139643070"
-                  "3361683467"
-                  "3877773964376b63786671383779786537666e7238727074683573686a32077061796c6f61641241"
-                  "04755ce6d8"
-                  "903f6b3793bddb4ea5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99"
-                  "a5c1335b58"
-                  "3c0bc76ef30dd6a1038ed9da8daf331a417819b5bcb635e3577acc8ca757f2c3d6afa451c2b6ff8a"
-                  "9179b141ac"
-                  "68e2c50305679e5d09d288da6f0fb52876a86c74deab6a5247edc6d371de5c2f121e159400");
-        // signed action's hash
-        ASSERT_EQ(hex(output.hash()),
-                  "35f53a536e014b32b85df50483ef04849b80ad60635b3b1979c5ba1096b65237");
-    }
-}
-
-} // namespace TW::IoTeX::tests
diff --git a/tests/IoTeX/TWAnySignerTests.cpp b/tests/IoTeX/TWAnySignerTests.cpp
deleted file mode 100644
index 9807a5dfb8a..00000000000
--- a/tests/IoTeX/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include "HexCoding.h"
-#include "proto/IoTeX.pb.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::IoTeX::tests {
-
-TEST(TWAnySignerIoTeX, Sign) {
-    auto key = parse_hex("68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748");
-    Proto::SigningInput input;
-    input.set_version(1);
-    input.set_nonce(1);
-    input.set_gaslimit(1);
-    input.set_gasprice("1");
-    input.set_privatekey(key.data(), key.size());
-    auto& transfer = *input.mutable_transfer();
-    transfer.set_amount("1");
-    transfer.set_recipient("io1e2nqsyt7fkpzs5x7zf2uk0jj72teu5n6aku3tr");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeIoTeX);
-
-    ASSERT_EQ(hex(output.encoded()), "0a39080110011801220131522e0a01311229696f3165326e7173797437666b707a733578377a6632756b306a6a3732746575356e36616b75337472124104fb30b196ce3e976593ecc2da220dca9cdea8c84d2373770042a930b892ac0f5cf762f20459c9100eb9d4d7597f5817bf21e10b53a0120b9ec1ba5cddfdcb669b1a41ec9757ae6c9009315830faaab250b6db0e9535b00843277f596ae0b2b9efc0bd4e14138c056fc4cdfa285d13dd618052b3d1cb7a3f554722005a2941bfede96601");
-}
-
-} // namespace TW::IoTeX::tests
diff --git a/tests/IoTeX/TWCoinTypeTests.cpp b/tests/IoTeX/TWCoinTypeTests.cpp
deleted file mode 100644
index ce42df73442..00000000000
--- a/tests/IoTeX/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWIoTeXCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeIoTeX));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeIoTeX, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeIoTeX, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeIoTeX));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeIoTeX));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeIoTeX), 18);
-    ASSERT_EQ(TWBlockchainIoTeX, TWCoinTypeBlockchain(TWCoinTypeIoTeX));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeIoTeX));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeIoTeX));
-    assertStringsEqual(symbol, "IOTX");
-    assertStringsEqual(txUrl, "https://iotexscan.io/action/t123");
-    assertStringsEqual(accUrl, "https://iotexscan.io/address/a12");
-    assertStringsEqual(id, "iotex");
-    assertStringsEqual(name, "IoTeX");
-}
diff --git a/tests/Kava/TWCoinTypeTests.cpp b/tests/Kava/TWCoinTypeTests.cpp
deleted file mode 100644
index 0852f499368..00000000000
--- a/tests/Kava/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWKavaCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeKava));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("2988DF83FCBFAA38179D583A96734CBD071541D6768221BB23111BC8136D5E6A"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeKava, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("kava1xd39avn2f008jmvua0eupg39zsp2xn3wf802vn"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeKava, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeKava));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeKava));
-    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeKava));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeKava), 6);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeKava));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeKava));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeKava));
-    assertStringsEqual(chainId, "kava_2222-10");
-    assertStringsEqual(symbol, "KAVA");
-    assertStringsEqual(txUrl, "https://mintscan.io/kava/txs/2988DF83FCBFAA38179D583A96734CBD071541D6768221BB23111BC8136D5E6A");
-    assertStringsEqual(accUrl, "https://mintscan.io/kava/account/kava1xd39avn2f008jmvua0eupg39zsp2xn3wf802vn");
-    assertStringsEqual(id, "kava");
-    assertStringsEqual(name, "Kava");
-}
diff --git a/tests/KavaEvm/TWCoinTypeTests.cpp b/tests/KavaEvm/TWCoinTypeTests.cpp
deleted file mode 100644
index 70b1d91b97c..00000000000
--- a/tests/KavaEvm/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWKavaEvmCoinType, TWCoinType) {
-    const auto coin = TWCoinTypeKavaEvm;
-    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
-    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
-    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
-    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
-    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xa999bd5183568ba178795e6a9d1561566fbf4a9ccc813cc475168832bc4909b3"));
-    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
-    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xF92d3DB0d9f912f285b1ec69578A6201A78487d7"));
-    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
-
-    assertStringsEqual(id, "kavaevm");
-    assertStringsEqual(name, "KavaEvm");
-    assertStringsEqual(symbol, "KAVA");
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
-    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
-    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
-    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
-    assertStringsEqual(chainId, "2222");
-    assertStringsEqual(txUrl, "https://explorer.kava.io/tx/0xa999bd5183568ba178795e6a9d1561566fbf4a9ccc813cc475168832bc4909b3");
-    assertStringsEqual(accUrl, "https://explorer.kava.io/address/0xF92d3DB0d9f912f285b1ec69578A6201A78487d7");
-}
diff --git a/tests/Kin/TWCoinTypeTests.cpp b/tests/Kin/TWCoinTypeTests.cpp
deleted file mode 100644
index 9120ef0e2f9..00000000000
--- a/tests/Kin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWKinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeKin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeKin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeKin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeKin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeKin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeKin), 5);
-    ASSERT_EQ(TWBlockchainStellar, TWCoinTypeBlockchain(TWCoinTypeKin));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeKin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeKin));
-    assertStringsEqual(symbol, "KIN");
-    assertStringsEqual(txUrl, "https://www.kin.org/blockchainInfoPage/?&dataType=public&header=Transaction&id=t123");
-    assertStringsEqual(accUrl, "https://www.kin.org/blockchainAccount/?&dataType=public&header=accountID&id=a12");
-    assertStringsEqual(id, "kin");
-    assertStringsEqual(name, "Kin");
-}
diff --git a/tests/Klaytn/TWCoinTypeTests.cpp b/tests/Klaytn/TWCoinTypeTests.cpp
deleted file mode 100644
index 9f293370262..00000000000
--- a/tests/Klaytn/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWKlaytnCoinType, TWCoinType) {
-    const auto coin = TWCoinTypeKlaytn;
-    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
-    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
-    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
-    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
-    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7"));
-    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
-    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x2ad9656bf5b82caf10847b431012e28e301e83ba"));
-    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
-
-    assertStringsEqual(id, "klaytn");
-    assertStringsEqual(name, "Klaytn");
-    assertStringsEqual(symbol, "KLAY");
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
-    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
-    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
-    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
-    assertStringsEqual(chainId, "8217");
-    assertStringsEqual(txUrl, "https://scope.klaytn.com/tx/0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7");
-    assertStringsEqual(accUrl, "https://scope.klaytn.com/account/0x2ad9656bf5b82caf10847b431012e28e301e83ba");
-}
diff --git a/tests/KuCoinCommunityChain/TWCoinTypeTests.cpp b/tests/KuCoinCommunityChain/TWCoinTypeTests.cpp
deleted file mode 100644
index c8069645912..00000000000
--- a/tests/KuCoinCommunityChain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWKuCoinCommunityChainCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeKuCoinCommunityChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x2f0d79cd289a02f3181b68b9583a64c3809fe7387810b274275985c29d02c80d"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeKuCoinCommunityChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x4446fc4eb47f2f6586f9faab68b3498f86c07521"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeKuCoinCommunityChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeKuCoinCommunityChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeKuCoinCommunityChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeKuCoinCommunityChain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeKuCoinCommunityChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeKuCoinCommunityChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeKuCoinCommunityChain));
-    assertStringsEqual(symbol, "KCS");
-    assertStringsEqual(txUrl, "https://explorer.kcc.io/en/tx/0x2f0d79cd289a02f3181b68b9583a64c3809fe7387810b274275985c29d02c80d");
-    assertStringsEqual(accUrl, "https://explorer.kcc.io/en/address/0x4446fc4eb47f2f6586f9faab68b3498f86c07521");
-    assertStringsEqual(id, "kcc");
-    assertStringsEqual(name, "KuCoin Community Chain");
-}
diff --git a/tests/Kusama/AddressTests.cpp b/tests/Kusama/AddressTests.cpp
deleted file mode 100644
index 10f6178d1df..00000000000
--- a/tests/Kusama/AddressTests.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Kusama/Address.h"
-#include "PublicKey.h"
-#include "PrivateKey.h"
-#include <gtest/gtest.h>
-#include <vector>
-
-namespace TW::Kusama::tests {
-
-TEST(KusamaAddress, Validation) {
-    // Substrate ed25519
-    ASSERT_FALSE(Address::isValid("5FqqU2rytGPhcwQosKRtW1E3ha6BJKAjHgtcodh71dSyXhoZ"));
-    // Polkadot ed25519
-    ASSERT_FALSE(Address::isValid("15AeCjMpcSt3Fwa47jJBd7JzQ395Kr2cuyF5Zp4UBf1g9ony"));
-    // Polkadot sr25519
-    ASSERT_FALSE(Address::isValid("15AeCjMpcSt3Fwa47jJBd7JzQ395Kr2cuyF5Zp4UBf1g9ony"));
-    // Bitcoin
-    ASSERT_FALSE(Address::isValid("1ES14c7qLb5CYhLMUekctxLgc1FV2Ti9DA"));
-
-    // Kusama ed25519
-    ASSERT_TRUE(Address::isValid("FHKAe66mnbk8ke8zVWE9hFVFrJN1mprFPVmD5rrevotkcDZ"));
-    // Kusama secp256k1
-    ASSERT_TRUE(Address::isValid("FxQFyTorsjVsjjMyjdgq8w5vGx8LiA1qhWbRYcFijxKKchx"));
-    // Kusama sr25519
-    ASSERT_TRUE(Address::isValid("EJ5UJ12GShfh7EWrcNZFLiYU79oogdtXFUuDDZzk7Wb2vCe"));
-}
-
-TEST(KusamaAddress, FromPrivateKey) {
-    // from subkey: tiny escape drive pupil flavor endless love walk gadget match filter luxury
-    auto privateKey = PrivateKey(parse_hex("0xa21981f3bb990c40837df44df639541ff57c5e600f9eb4ac00ed8d1f718364e5"));
-    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
-    ASSERT_EQ(address.string(), "CeVXtoU4py9e7F6upfM2ZarVave299TjcdaTSxhDDZrYgnM");
-}
-
-TEST(KusamaAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("0x032eb287017c5cde2940b5dd062d413f9d09f8aa44723fc80bf46b96c81ac23d"), TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "CeVXtoU4py9e7F6upfM2ZarVave299TjcdaTSxhDDZrYgnM");
-}
-
-TEST(KusamaAddress, FromString) {
-    auto address = Address("CeVXtoU4py9e7F6upfM2ZarVave299TjcdaTSxhDDZrYgnM");
-    ASSERT_EQ(address.string(), "CeVXtoU4py9e7F6upfM2ZarVave299TjcdaTSxhDDZrYgnM");
-}
-
-} // namespace TW::Kusama::tests
\ No newline at end of file
diff --git a/tests/Kusama/SignerTests.cpp b/tests/Kusama/SignerTests.cpp
deleted file mode 100644
index 3af2df1c9ec..00000000000
--- a/tests/Kusama/SignerTests.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Polkadot/Signer.h"
-#include "Polkadot/Extrinsic.h"
-#include "Polkadot/SS58Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "proto/Polkadot.pb.h"
-#include "uint256.h"
-
-#include <TrustWalletCore/TWSS58AddressType.h>
-#include <gtest/gtest.h>
-
-
-namespace TW::Polkadot::tests {
-    extern PrivateKey privateKey;
-    extern PublicKey toPublicKey;
-    auto genesisHashKSM = parse_hex("b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe");
-
-TEST(PolkadotSigner, SignTransferKSM) {
-    auto blockHash = parse_hex("4955dd4813f3e91ef3fd5a825b928af2fc50a71380085f753ccef00bb1582891");
-    auto toAddress = SS58Address(toPublicKey, TWSS58AddressTypeKusama);
-
-    auto input = Proto::SigningInput();
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_genesis_hash(genesisHashKSM.data(), genesisHashKSM.size());
-    input.set_nonce(0);
-    input.set_spec_version(2019);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_network(Proto::Network::KUSAMA);
-    input.set_transaction_version(2);
-
-    auto balanceCall = input.mutable_balance_call();
-    auto& transfer = *balanceCall->mutable_transfer();
-    auto value = store(uint256_t(12345));
-    transfer.set_to_address(toAddress.string());
-    transfer.set_value(value.data(), value.size());
-
-    auto extrinsic = Extrinsic(input);
-    auto preimage = extrinsic.encodePayload();
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(preimage), "04008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48e5c0000000e307000002000000b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe4955dd4813f3e91ef3fd5a825b928af2fc50a71380085f753ccef00bb1582891");
-    ASSERT_EQ(hex(output.encoded()), "25028488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee000765cfa76cfe19499f4f19ef7dc4527652ec5b2e6b5ecfaf68725dafd48ae2694ad52e61f44152a544784e847de10ddb2c56bee4406574dcbcfdb5e5d35b6d0300000004008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48e5c0");
-}
-
-} // namespace TW::Polkadot::tests
diff --git a/tests/Kusama/TWAnySignerTests.cpp b/tests/Kusama/TWAnySignerTests.cpp
deleted file mode 100644
index 68875989066..00000000000
--- a/tests/Kusama/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/Polkadot.pb.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::Polkadot::tests {
-
-TEST(TWAnySignerKusama, Sign) {
-    auto key = parse_hex("0x8cdc538e96f460da9d639afc5c226f477ce98684d77fb31e88db74c1f1dd86b2");
-    auto genesisHash = parse_hex("0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe");
-
-    Proto::SigningInput input;
-    input.set_block_hash(genesisHash.data(), genesisHash.size());
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_nonce(1);
-    input.set_spec_version(2019);
-    input.set_private_key(key.data(), key.size());
-    input.set_network(Proto::Network::KUSAMA);
-    input.set_transaction_version(2);
-
-    auto balanceCall = input.mutable_balance_call();
-    auto& transfer = *balanceCall->mutable_transfer();
-    auto value = store(uint256_t(10000000000));
-    transfer.set_to_address("CtwdfrhECFs3FpvCGoiE4hwRC4UsSiM8WL899HjRdQbfYZY");
-    transfer.set_value(value.data(), value.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeKusama);
-
-    ASSERT_EQ(hex(output.encoded()), "350284f41296779fd61a5bed6c2f506cc6c9ea93d6aeb357b9c69717193f434ba24ae700cd78b46eff36c433e642d7e9830805aab4f43eef70067ef32c8b2a294c510673a841c5f8a6e8900c03be40cfa475ae53e6f8aa61961563cb7cc0fa169ef9630d00040004000e33fdfb980e4499e5c3576e742a563b6a4fc0f6f598b1917fd7a6fe393ffc720700e40b5402");
-}
-
-} // namespace TW::Polkadot::tests
diff --git a/tests/Kusama/TWCoinTypeTests.cpp b/tests/Kusama/TWCoinTypeTests.cpp
deleted file mode 100644
index 3ea8f9284f5..00000000000
--- a/tests/Kusama/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWKusamaCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeKusama));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xcbe0c2e2851c1245bedaae4d52f06eaa6b4784b786bea2f0bff11af7715973dd"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeKusama, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("DbCNECPna3k6MXFWWNZa5jGsuWycqEE6zcUxZYkxhVofrFk"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeKusama, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeKusama));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeKusama));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeKusama), 12);
-    ASSERT_EQ(TWBlockchainKusama, TWCoinTypeBlockchain(TWCoinTypeKusama));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeKusama));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeKusama));
-    assertStringsEqual(symbol, "KSM");
-    assertStringsEqual(txUrl, "https://kusama.subscan.io/extrinsic/0xcbe0c2e2851c1245bedaae4d52f06eaa6b4784b786bea2f0bff11af7715973dd");
-    assertStringsEqual(accUrl, "https://kusama.subscan.io/account/DbCNECPna3k6MXFWWNZa5jGsuWycqEE6zcUxZYkxhVofrFk");
-    assertStringsEqual(id, "kusama");
-    assertStringsEqual(name, "Kusama");
-}
diff --git a/tests/Litecoin/TWCoinTypeTests.cpp b/tests/Litecoin/TWCoinTypeTests.cpp
deleted file mode 100644
index 3d96044505d..00000000000
--- a/tests/Litecoin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWLitecoinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeLitecoin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeLitecoin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeLitecoin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeLitecoin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeLitecoin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeLitecoin), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeLitecoin));
-    ASSERT_EQ(0x32, TWCoinTypeP2shPrefix(TWCoinTypeLitecoin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeLitecoin));
-    assertStringsEqual(symbol, "LTC");
-    assertStringsEqual(txUrl, "https://blockchair.com/litecoin/transaction/t123");
-    assertStringsEqual(accUrl, "https://blockchair.com/litecoin/address/a12");
-    assertStringsEqual(id, "litecoin");
-    assertStringsEqual(name, "Litecoin");
-}
diff --git a/tests/Meter/TWCoinTypeTests.cpp b/tests/Meter/TWCoinTypeTests.cpp
deleted file mode 100644
index 50902798e57..00000000000
--- a/tests/Meter/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWMeterCoinType, TWCoinType) {
-    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeMeter));
-    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x8ea268d5dbb40217c763b800a75fc063cf28b56f40f2bc69dc043f5c4bbdc144"));
-    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeMeter, txId.get()));
-    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xe5a273954d24eddf9ae9ea4cef2347d584cfa3dd"));
-    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeMeter, accId.get()));
-    const auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeMeter));
-    const auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeMeter));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeMeter), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeMeter));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeMeter));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeMeter));
-    assertStringsEqual(symbol, "MTR");
-    assertStringsEqual(txUrl, "https://scan.meter.io/tx/0x8ea268d5dbb40217c763b800a75fc063cf28b56f40f2bc69dc043f5c4bbdc144");
-    assertStringsEqual(accUrl, "https://scan.meter.io/address/0xe5a273954d24eddf9ae9ea4cef2347d584cfa3dd");
-    assertStringsEqual(id, "meter");
-    assertStringsEqual(name, "Meter");
-}
diff --git a/tests/Metis/TWCoinTypeTests.cpp b/tests/Metis/TWCoinTypeTests.cpp
deleted file mode 100644
index da3e515be54..00000000000
--- a/tests/Metis/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWMetisCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeMetis));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x422f2ebbede32d4434ad0cf0ae55d44a84e14d3d5725a760133255b42676d8ce"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeMetis, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xBe9E8Ec25866B21bA34e97b9393BCabBcB4A5C86"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeMetis, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeMetis));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeMetis));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeMetis), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeMetis));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeMetis));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeMetis));
-    assertStringsEqual(symbol, "METIS");
-    assertStringsEqual(txUrl, "https://andromeda-explorer.metis.io/tx/0x422f2ebbede32d4434ad0cf0ae55d44a84e14d3d5725a760133255b42676d8ce");
-    assertStringsEqual(accUrl, "https://andromeda-explorer.metis.io/address/0xBe9E8Ec25866B21bA34e97b9393BCabBcB4A5C86");
-    assertStringsEqual(id, "metis");
-    assertStringsEqual(name, "Metis");
-}
diff --git a/tests/Monacoin/TWCoinTypeTests.cpp b/tests/Monacoin/TWCoinTypeTests.cpp
deleted file mode 100644
index e539e3924e2..00000000000
--- a/tests/Monacoin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWMonacoinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeMonacoin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeMonacoin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeMonacoin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeMonacoin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeMonacoin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeMonacoin), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeMonacoin));
-    ASSERT_EQ(0x37, TWCoinTypeP2shPrefix(TWCoinTypeMonacoin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeMonacoin));
-    assertStringsEqual(symbol, "MONA");
-    assertStringsEqual(txUrl, "https://blockbook.electrum-mona.org/tx/t123");
-    assertStringsEqual(accUrl, "https://blockbook.electrum-mona.org/address/a12");
-    assertStringsEqual(id, "monacoin");
-    assertStringsEqual(name, "Monacoin");
-}
diff --git a/tests/Moonbeam/TWCoinTypeTests.cpp b/tests/Moonbeam/TWCoinTypeTests.cpp
deleted file mode 100644
index 76083ca05e8..00000000000
--- a/tests/Moonbeam/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWMoonbeamCoinType, TWCoinType) {
-    const auto coin = TWCoinTypeMoonbeam;
-    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
-    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
-    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
-    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
-    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb22a146c933e6e51affbfa5f712a266b5f5e92ae453cd2f252bcc3c36ff035a6"));
-    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
-    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x201bb4f276C765dF7225e5A4153E17edD23a67eC"));
-    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
-
-    assertStringsEqual(id, "moonbeam");
-    assertStringsEqual(name, "Moonbeam");
-    assertStringsEqual(symbol, "GLMR");
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
-    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
-    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
-    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
-    assertStringsEqual(chainId, "1284");
-    assertStringsEqual(txUrl, "https://moonscan.io/tx/0xb22a146c933e6e51affbfa5f712a266b5f5e92ae453cd2f252bcc3c36ff035a6");
-    assertStringsEqual(accUrl, "https://moonscan.io/address/0x201bb4f276C765dF7225e5A4153E17edD23a67eC");
-}
diff --git a/tests/Moonriver/TWCoinTypeTests.cpp b/tests/Moonriver/TWCoinTypeTests.cpp
deleted file mode 100644
index 8ef39efaf15..00000000000
--- a/tests/Moonriver/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWMoonriverCoinType, TWCoinType) {
-    const auto coin = TWCoinTypeMoonriver;
-    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
-    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
-    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
-    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
-    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x2e2daa3943ba65d9bbb910a4f6765aa6a466a0ef8935090547ca9d30e201e032"));
-    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
-    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x899831D937937d011305E73EE782cce0455DF15a"));
-    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
-
-    assertStringsEqual(id, "moonriver");
-    assertStringsEqual(name, "Moonriver");
-    assertStringsEqual(symbol, "MOVR");
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
-    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
-    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
-    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
-    assertStringsEqual(chainId, "1285");
-    assertStringsEqual(txUrl, "https://moonriver.moonscan.io/tx/0x2e2daa3943ba65d9bbb910a4f6765aa6a466a0ef8935090547ca9d30e201e032");
-    assertStringsEqual(accUrl, "https://moonriver.moonscan.io/address/0x899831D937937d011305E73EE782cce0455DF15a");
-}
diff --git a/tests/NEAR/AccountTests.cpp b/tests/NEAR/AccountTests.cpp
deleted file mode 100644
index f1294306588..00000000000
--- a/tests/NEAR/AccountTests.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "NEAR/Account.h"
-#include "HexCoding.h"
-#include <gtest/gtest.h>
-
-namespace TW::NEAR::tests {
-
-TEST(NEARAccount, Validation) {
-    ASSERT_FALSE(Account::isValid("a"));
-    ASSERT_FALSE(Account::isValid("!?:"));
-    ASSERT_FALSE(Account::isValid("11111111111111111111111111111111222222222222222222222222222222223"));
-
-    ASSERT_TRUE(Account::isValid("9902c136629fc630416e50d4f2fef6aff867ea7e.lockup.near"));
-    ASSERT_TRUE(Account::isValid("app_1.alice.near"));
-    ASSERT_TRUE(Account::isValid("test-trust.vlad.near"));
-    ASSERT_TRUE(Account::isValid("deadbeef"));
-}
-
-} // namespace TW::NEAR::tests
diff --git a/tests/NEAR/AddressTests.cpp b/tests/NEAR/AddressTests.cpp
deleted file mode 100644
index 214cd3fab2b..00000000000
--- a/tests/NEAR/AddressTests.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "NEAR/Address.h"
-#include "Base58.h"
-#include "PrivateKey.h"
-#include <TrustWalletCore/TWPublicKeyType.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::NEAR::tests {
-
-TEST(NEARAddress, Validation) {
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_FALSE(Address::isValid("65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF"));
-    ASSERT_FALSE(Address::isValid("EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjT"));
-
-    ASSERT_TRUE(Address::isValid("NEAR2758Nk7CMUcxTwXdjVdSxNEidiZQWMZN3USJzj76q5ia3v2v2v"));
-    ASSERT_TRUE(Address::isValid("917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d"));
-}
-
-TEST(NEARAddress, FromString) {
-    ASSERT_EQ(
-        Address("NEAR2758Nk7CMUcxTwXdjVdSxNEidiZQWMZN3USJzj76q5ia3v2v2v").string(),
-        "917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d");
-    ASSERT_EQ(
-        Address("9685af3fe2dc231e5069ccff8ec6950eb961d42ebb9116a8ab9c0d38f9e45249").string(),
-        "9685af3fe2dc231e5069ccff8ec6950eb961d42ebb9116a8ab9c0d38f9e45249");
-}
-
-TEST(NEARAddress, FromPrivateKey) {
-    auto fullKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    auto key = PrivateKey(Data(fullKey.begin(), fullKey.begin() + 32));
-    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d");
-}
-
-} // namespace TW::NEAR::tests
diff --git a/tests/NEAR/SerializationTests.cpp b/tests/NEAR/SerializationTests.cpp
deleted file mode 100644
index 7f6904988b6..00000000000
--- a/tests/NEAR/SerializationTests.cpp
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Base58.h"
-#include "proto/NEAR.pb.h"
-#include "NEAR/Serialization.h"
-
-#include <TrustWalletCore/TWHRP.h>
-#include <gtest/gtest.h>
-
-namespace TW::NEAR {
-
-TEST(NEARSerialization, SerializeTransferTransaction) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    auto& transfer = *input.mutable_actions(0)->mutable_transfer();
-    Data deposit(16, 0);
-    deposit[0] = 1;
-    transfer.set_deposit(deposit.data(), deposit.size());
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000301000000000000000000000000000000");
-}
-
-TEST(NEARSerialization, SerializeFunctionCallTransaction) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    auto& functionCall = *input.mutable_actions(0)->mutable_function_call();
-
-    functionCall.set_method_name("qqq");
-    functionCall.set_gas(1000);
-
-    Data deposit(16, 0);
-    deposit[0] = 1;
-    functionCall.set_deposit(deposit.data(), deposit.size());
-
-    Data args(3, 0);
-    args[0] = 1;
-    args[1] = 2;
-    args[2] = 3;
-    functionCall.set_args(args.data(), args.size());
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef601000000020300000071717103000000010203e80300000000000001000000000000000000000000000000");
-}
-
-TEST(NEARSerialization, SerializeStakeTransaction) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    auto& stake = *input.mutable_actions(0)->mutable_stake();
-    Data amount(16, 0);
-    amount[0] = 1;
-    stake.set_stake(amount.data(), amount.size());
-
-    auto& pKey = *stake.mutable_public_key();
-    pKey.set_data(publicKey.data(), publicKey.size());
-    pKey.set_key_type(0);
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef601000000040100000000000000000000000000000000917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d");
-}
-
-TEST(NEARSerialization, SerializeStakeTransaction2) {
-    auto publicKey = Base58::bitcoin.decode("C2P7YcEmBv31vtCHLBcESteN4Yi4vSCkXEXMTANyB649");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("vdx.testnet");
-    input.set_nonce(93128451000005);
-    input.set_receiver_id("vdx.testnet");
-
-    input.add_actions();
-    auto& stake = *input.mutable_actions(0)->mutable_stake();
-    // 2490000000000000000000000000
-    auto amount = parse_hex("000000fa4f3f757902ae0b0800000000"); // little endian
-    stake.set_stake(amount.data(), amount.size());
-
-    auto& pKey = *stake.mutable_public_key();
-    pKey.set_data(publicKey.data(), publicKey.size());
-    pKey.set_key_type(0);
-
-    auto blockHash = Base58::bitcoin.decode("ByDnm7c25npQXwNUX5yivbYbpjFcNuNumF6BJjaK3vhJ");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("5Cfk7QBnmDxxFxQk75FFq4ADrQS9gxHKe6vtuGH6JCCm8WV8aRPEGVqp579JHNmmHMUt49gkCVcH2t7NRnh2v7Qu");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "0b0000007664782e746573746e657400a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426dac5863d28b35400000b0000007664782e746573746e6574a2fbdae8a769c636d109952e4fe760b03688e629933cbf693aedfd97a470c7a50100000004000000fa4f3f757902ae0b080000000000a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426da");
-}
-
-TEST(NEARSerialization, SerializeAddKeyFunctionCallTransaction) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    auto& addKey = *input.mutable_actions(0)->mutable_add_key();
-
-    auto& pKey = *addKey.mutable_public_key();
-    pKey.set_data(publicKey.data(), publicKey.size());
-    pKey.set_key_type(0);
-
-    auto& accessKey = *addKey.mutable_access_key();
-    accessKey.set_nonce(0);
-    auto& functionCallPermission = *accessKey.mutable_function_call();
-    functionCallPermission.set_receiver_id("zzz");
-    functionCallPermission.add_method_names("www");
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000500917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d00000000000000000000030000007a7a7a0100000003000000777777");
-}
-
-TEST(NEARSerialization, SerializeAddKeyFullAccessTransaction) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    auto& addKey = *input.mutable_actions(0)->mutable_add_key();
-
-    auto& pKey = *addKey.mutable_public_key();
-    pKey.set_data(publicKey.data(), publicKey.size());
-    pKey.set_key_type(0);
-
-    auto& accessKey = *addKey.mutable_access_key();
-    accessKey.set_nonce(0);
-
-    accessKey.mutable_full_access();
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000500917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d000000000000000001");
-}
-
-TEST(NEARSerialization, SerializeDeleteKeyTransaction) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    auto& deleteKey = *input.mutable_actions(0)->mutable_delete_key();
-
-    auto& pKey = *deleteKey.mutable_public_key();
-    pKey.set_data(publicKey.data(), publicKey.size());
-    pKey.set_key_type(0);
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000600917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d");
-}
-
-TEST(NEARSerialization, SerializeCreateAccountTransaction) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    input.mutable_actions(0)->mutable_create_account();
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef60100000000");
-}
-
-TEST(NEARSerialization, SerializeDeleteAccountTransaction) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    auto& deleteAccount = *input.mutable_actions(0)->mutable_delete_account();
-    deleteAccount.set_beneficiary_id("123");
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto serialized = transactionData(input);
-    auto serializedHex = hex(serialized);
-
-    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000703000000313233");
-}
-
-}
diff --git a/tests/NEAR/SignerTests.cpp b/tests/NEAR/SignerTests.cpp
deleted file mode 100644
index 2a41296484c..00000000000
--- a/tests/NEAR/SignerTests.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base64.h"
-#include "Base58.h"
-#include "HexCoding.h"
-#include "proto/NEAR.pb.h"
-#include "NEAR/Signer.h"
-
-#include <TrustWalletCore/TWHRP.h>
-#include <gtest/gtest.h>
-
-namespace TW::NEAR {
-
-TEST(NEARSigner, SignTx) {
-    auto publicKey = Base58::bitcoin.decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
-
-    auto input = Proto::SigningInput();
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-
-    input.add_actions();
-    auto& transfer = *input.mutable_actions(0)->mutable_transfer();
-    Data deposit(16, 0);
-    deposit[0] = 1;
-    // uint128_t / little endian byte order
-    transfer.set_deposit(deposit.data(), deposit.size());
-
-    auto blockHash = Base58::bitcoin.decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    auto privateKey = Base58::bitcoin.decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
-    input.set_private_key(privateKey.data(), 32);
-
-    auto output = Signer::sign(std::move(input));
-
-    auto signed_transaction = output.signed_transaction();
-    auto outputInBase64 = Base64::encode(Data(signed_transaction.begin(), signed_transaction.end()));
-
-    ASSERT_EQ(outputInBase64, "CQAAAHRlc3QubmVhcgCRez0mjUtY9/7BsVC9aNab4+5dTMOYVeNBU4Rlu3eGDQEAAAAAAAAADQAAAHdoYXRldmVyLm5lYXIPpHP9JpAd8pa+atxMxN800EDvokNSJLaYaRDmMML+9gEAAAADAQAAAAAAAAAAAAAAAAAAAACWmoMzIYbul1Xkg5MlUlgG4Ymj0tK7S0dg6URD6X4cTyLe7vAFmo6XExAO2m4ZFE2n6KDvflObIHCLodjQIb0B");
-    ASSERT_EQ(hex(output.hash()), "eea6e680f3ea51a7f667e9a801d0bfadf66e03d41ed54975b3c6006351461b32");
-}
-
-}
diff --git a/tests/NEAR/TWAnySignerTests.cpp b/tests/NEAR/TWAnySignerTests.cpp
deleted file mode 100644
index 2f6204022e7..00000000000
--- a/tests/NEAR/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/NEAR.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <gtest/gtest.h>
-
-namespace TW::NEAR {
-
-TEST(TWAnySignerNEAR, SignTransfer) {
-
-    auto privateKey = parse_hex("8737b99bf16fba78e1e753e23ba00c4b5423ac9c45d9b9caae9a519434786568");
-    auto blockHash = parse_hex("0fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6");
-    // uint128_t / little endian byte order
-    auto deposit = parse_hex("01000000000000000000000000000000");
-
-    Proto::SigningInput input;
-    input.set_signer_id("test.near");
-    input.set_nonce(1);
-    input.set_receiver_id("whatever.near");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    
-    auto& action = *input.add_actions();
-    auto& transfer = *action.mutable_transfer();
-    transfer.set_deposit(deposit.data(), deposit.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNEAR);
-
-    ASSERT_EQ(hex(output.signed_transaction()), "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef601000000030100000000000000000000000000000000969a83332186ee9755e4839325525806e189a3d2d2bb4b4760e94443e97e1c4f22deeef0059a8e9713100eda6e19144da7e8a0ef7e539b20708ba1d8d021bd01");
-    ASSERT_EQ(hex(output.hash()), "eea6e680f3ea51a7f667e9a801d0bfadf66e03d41ed54975b3c6006351461b32");
-}
-
-TEST(TWAnySignerNEAR, SignStake) {
-
-    auto privateKey = parse_hex("d22149327ceb8e86f70962be0c7293f8308d85d0cbea2cc24e47c3033da7440f");
-    auto publicKey = parse_hex("a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426da");
-    auto blockHash = parse_hex("a2fbdae8a769c636d109952e4fe760b03688e629933cbf693aedfd97a470c7a5");
-
-    // 2490000000000000000000000000
-    auto amount = parse_hex("000000fa4f3f757902ae0b0800000000"); // little endian
-
-    Proto::SigningInput input;
-    input.set_signer_id("vdx.testnet");
-    input.set_nonce(93128451000005);
-    input.set_receiver_id("vdx.testnet");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    
-    auto& action = *input.add_actions();
-    auto& stake = *action.mutable_stake();
-    stake.set_stake(amount.data(), amount.size());
-
-    auto& pubkey = *stake.mutable_public_key();
-    pubkey.set_data(publicKey.data(), publicKey.size());
-    pubkey.set_key_type(0);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNEAR);
-
-    ASSERT_EQ(hex(output.signed_transaction()), "0b0000007664782e746573746e657400a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426dac5863d28b35400000b0000007664782e746573746e6574a2fbdae8a769c636d109952e4fe760b03688e629933cbf693aedfd97a470c7a50100000004000000fa4f3f757902ae0b080000000000a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426da0011fdbc234d4ce470ec7f2ac5e4d3d8f8fe1525f83e9a2425e7000aea52f7260ff4f5191beaa1a5ac29256e68c6acd368ada0d06ed033e9a204ee119f5ef1b104");
-    ASSERT_EQ(hex(output.hash()), "c8aedbf75fcaa9b663a3959d27f1deae809e1923460791471e5219eafecc4ba8");
-}
-
-} // namespace TW::NEAR
diff --git a/tests/NEAR/TWCoinTypeTests.cpp b/tests/NEAR/TWCoinTypeTests.cpp
deleted file mode 100644
index e5b5951a368..00000000000
--- a/tests/NEAR/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWNEARCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNEAR));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("FPQAMaVnvFHNwNBJWnTttXfdJhp5FvMGGDJEesB8gvbL"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNEAR, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("test-trust.vlad.near"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNEAR, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNEAR));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNEAR));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNEAR), 24);
-    ASSERT_EQ(TWBlockchainNEAR, TWCoinTypeBlockchain(TWCoinTypeNEAR));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNEAR));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNEAR));
-    assertStringsEqual(symbol, "NEAR");
-    assertStringsEqual(txUrl, "https://explorer.near.org/transactions/FPQAMaVnvFHNwNBJWnTttXfdJhp5FvMGGDJEesB8gvbL");
-    assertStringsEqual(accUrl, "https://explorer.near.org/accounts/test-trust.vlad.near");
-    assertStringsEqual(id, "near");
-    assertStringsEqual(name, "NEAR");
-}
diff --git a/tests/NEO/AddressTests.cpp b/tests/NEO/AddressTests.cpp
deleted file mode 100644
index c17f9b8a5c9..00000000000
--- a/tests/NEO/AddressTests.cpp
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "NEO/Address.h"
-#include "NEO/Signer.h"
-#include "PublicKey.h"
-
-#include <gtest/gtest.h>
-
-using namespace std;
-using namespace TW;
-
-namespace TW::NEO::tests {
-
-TEST(NEOAddress, FromPublicKey) {
-    const auto publicKey = PublicKey(parse_hex("0222b2277d039d67f4197a638dd5a1d99c290b17aa8c4a16ccee5165fe612de66a"), TWPublicKeyTypeSECP256k1);
-    const auto address = Address(publicKey);
-    EXPECT_EQ(string("AKmrAHRD9ZDUnu4m3vWWonpsojo4vgSuqp"), address.string());
-}
-
-TEST(NEOAddress, FromString) {
-    string neoAddress = "AXkgwcMJTy9wTAXHsbyhauxh7t2Tt31MmC";
-    const auto address = Address(neoAddress);
-    EXPECT_EQ(address.string(), neoAddress);
-}
-
-TEST(NEOAddress, isValid) {
-    string neoAddress = "AQAsqiyHS4SSVWZ4CmMmnCxWg7vJ84GEj4";
-    string bitcoinAddress = "1Ma2DrB78K7jmAwaomqZNRMCvgQrNjE2QC";
-
-    EXPECT_TRUE(Address::isValid(neoAddress));
-    EXPECT_FALSE(Address::isValid(bitcoinAddress));
-}
-
-TEST(NEOAddress, validation) {
-    EXPECT_FALSE(Address::isValid("abc"));
-    EXPECT_FALSE(Address::isValid("abeb60f3e94c1b9a09f33669435e7ef12eacd"));
-    EXPECT_FALSE(Address::isValid("abcb60f3e94c9b9a09f33669435e7ef1beaedads"));
-    EXPECT_TRUE(Address::isValid("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD"));
-}
-
-TEST(NEOAddress, fromPubKey) {
-    auto address = Address(PublicKey(parse_hex("031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486"), TWPublicKeyTypeNIST256p1));
-    EXPECT_EQ("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5", address.string());
-}
-
-TEST(NEOAddress, fromString) {
-    auto b58Str = "AYTxeseHT5khTWhtWX1pFFP1mbQrd4q1zz";
-    auto address = Address(b58Str);
-    EXPECT_EQ(b58Str, address.string());
-    auto errB58Str = "AATxeseHT5khTWhtWX1pFFP1mbQrd4q1zz";
-    EXPECT_THROW(new Address(errB58Str), std::invalid_argument);
-}
-
-TEST(NEOAddress, Valid) {
-    ASSERT_TRUE(Address::isValid("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD"));
-}
-
-TEST(NEOAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("ANDfjwrUr54515515155WKRMyxFwvVwnZD"));
-}
-
-TEST(NEOAddress, FromPrivateKey) {
-    auto key = PrivateKey(parse_hex("0x2A9EAB0FEC93CD94FA0A209AC5604602C1F0105FB02EAB398E17B4517C2FFBAB"));
-    auto publicKey = key.getPublicKey(TWPublicKeyTypeNIST256p1);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "AQCSMB3oSDA1dHPn6GXN6KB4NHmdo1fX41");
-}
-
-} // namespace TW::NEO::tests
diff --git a/tests/NEO/CoinReferenceTests.cpp b/tests/NEO/CoinReferenceTests.cpp
deleted file mode 100644
index 90c1f2700dc..00000000000
--- a/tests/NEO/CoinReferenceTests.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "uint256.h"
-#include "HexCoding.h"
-#include "NEO/CoinReference.h"
-#include <gtest/gtest.h>
-
-namespace TW::NEO::tests {
-
-using namespace std;
-
-TEST(NEOCoinReference, Serialize) {
-    auto coinReference = CoinReference();
-    string prevHash = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a";
-    coinReference.prevHash = load(parse_hex(prevHash));
-    coinReference.prevIndex = 1;
-    EXPECT_EQ(prevHash + "0100", hex(coinReference.serialize()));
-}
-
-TEST(NEOCoinReference, Deserialize) {
-    auto coinReference = CoinReference();
-    coinReference.deserialize(parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a0100"));
-    EXPECT_EQ("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a", hex(store(coinReference.prevHash)));
-    EXPECT_EQ(1, coinReference.prevIndex);
-}
-
-} // namespace TW::NEO::tests
diff --git a/tests/NEO/SignerTests.cpp b/tests/NEO/SignerTests.cpp
deleted file mode 100644
index fe33508c885..00000000000
--- a/tests/NEO/SignerTests.cpp
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "PublicKey.h"
-#include "HexCoding.h"
-#include "NEO/Address.h"
-#include "NEO/Signer.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::NEO::tests {
-
-using namespace std;
-
-TEST(NEOSigner, FromPublicPrivateKey) {
-    auto hexPrvKey = "4646464646464646464646464646464646464646464646464646464646464646";
-    auto hexPubKey = "031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486";
-    auto signer = Signer(PrivateKey(parse_hex(hexPrvKey)));
-    auto prvKey = signer.getPrivateKey();
-    auto pubKey = signer.getPublicKey();
-
-    EXPECT_EQ(hexPrvKey, hex(prvKey.bytes));
-    EXPECT_EQ(hexPubKey, hex(pubKey.bytes));
-
-    auto address = signer.getAddress();
-    EXPECT_TRUE(Address::isValid(address.string()));
-
-    EXPECT_EQ(Address(pubKey), address);
-}
-
-TEST(NEOSigner, SigningData) {
-    auto signer = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
-    auto verScript = "ba7908ddfe5a1177f2c9d3fa1d3dc71c9c289a3325b3bdd977e20c50136959ed02d1411efa5e8b897d970ef7e2325e6c0a3fdee4eb421223f0d86e455879a9ad";
-    auto invocationScript = string("401642b3d538e138f34b32330e381a7fe3f5151fcf958f2030991e72e2e25043143e4a1ebd239634efba279c96fa0ab04a15aa15179d73a7ef5a886ac8a06af484401642b3d538e138f34b32330e381a7fe3f5151fcf958f2030991e72e2e25043143e4a1ebd239634efba279c96fa0ab04a15aa15179d73a7ef5a886ac8a06af484401642b3d538e138f34b32330e381a7fe3f5151fcf958f2030991e72e2e25043143e4a1ebd239634efba279c96fa0ab04a15aa15179d73a7ef5a886ac8a06af484");
-    invocationScript = string(invocationScript.rbegin(), invocationScript.rend());
-
-    EXPECT_EQ(verScript, hex(signer.sign(parse_hex(invocationScript))));
-}
-
-TEST(NEOAccount, validity) {
-    auto hexPrvKey = "4646464646464646464646464646464646464646464646464646464646464646";
-    auto hexPubKey = "031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486";
-    auto signer = Signer(PrivateKey(parse_hex(hexPrvKey)));
-    auto prvKey = signer.getPrivateKey();
-    auto pubKey = signer.getPublicKey();
-    EXPECT_EQ(hexPrvKey, hex(prvKey.bytes));
-    EXPECT_EQ(hexPubKey, hex(pubKey.bytes));
-}
-
-TEST(NEOSigner, SigningTransaction) {
-    auto signer = Signer(PrivateKey(parse_hex("F18B2F726000E86B4950EBEA7BFF151F69635951BC4A31C44F28EE6AF7AEC128")));
-    auto transaction = Transaction();
-    transaction.type = TransactionType::TT_ContractTransaction;
-    transaction.version = 0x00;
-
-    CoinReference coin;
-    coin.prevHash = load(parse_hex("9c85b39cd5677e2bfd6bf8a711e8da93a2f1d172b2a52c6ca87757a4bccc24de")); // reverse hash
-    coin.prevIndex = (uint16_t)1;
-    transaction.inInputs.push_back(coin);
-
-    {
-        TransactionOutput out;
-        out.assetId = load(parse_hex("9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5"));
-        out.value = (int64_t)1 * 100000000;
-        auto scriptHash = TW::NEO::Address("Ad9A1xPbuA5YBFr1XPznDwBwQzdckAjCev").toScriptHash();
-        out.scriptHash = load(scriptHash);
-        transaction.outputs.push_back(out);
-    }
-
-    {
-        TransactionOutput out;
-        out.assetId = load(parse_hex("9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5"));
-        out.value = (int64_t)892 * 100000000;
-        auto scriptHash = TW::NEO::Address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV").toScriptHash();
-        out.scriptHash = load(scriptHash);
-        transaction.outputs.push_back(out);
-    }
-    signer.sign(transaction);
-    auto signedTx = transaction.serialize();
-    EXPECT_EQ(hex(signedTx), "800000019c85b39cd5677e2bfd6bf8a711e8da93a2f1d172b2a52c6ca87757a4bccc24de0100029b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500e1f50500000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500fcbbc414000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac0141405046619c8e20e1fdeec92ce95f3019f6e7cc057294eb16b2d5e55c105bf32eb27e1fc01c1858576228f1fef8c0945a8ad69688e52a4ed19f5b85f5eff7e961d7232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac");
-}
-
-} // namespace TW::NEO::tests
diff --git a/tests/NEO/TWAnySignerTests.cpp b/tests/NEO/TWAnySignerTests.cpp
deleted file mode 100644
index e61fec59506..00000000000
--- a/tests/NEO/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include "HexCoding.h"
-#include "proto/NEO.pb.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::NEO::tests {
-
-Proto::SigningInput createInput() {
-    const std::string NEO_ASSET_ID = "9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5";
-    const std::string GAS_ASSET_ID = "e72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c60";
-
-    Proto::SigningInput input;
-    auto privateKey = parse_hex("F18B2F726000E86B4950EBEA7BFF151F69635951BC4A31C44F28EE6AF7AEC128");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_fee(12345); // too low
-    input.set_gas_asset_id(GAS_ASSET_ID);
-    input.set_gas_change_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
-
-#define ADD_UTXO_INPUT(hash, index, value, assetId) \
-        { \
-            auto utxo = input.add_inputs(); \
-            utxo->set_prev_hash(parse_hex(hash).data(), parse_hex(hash).size()); \
-            utxo->set_prev_index(index); \
-            utxo->set_asset_id(assetId); \
-            utxo->set_value(value); \
-        }
-
-    ADD_UTXO_INPUT("c61508268c5d0343af1875c60e569493100824dbdba108b31789e0e33bcb50fb", 1, 98899890000, GAS_ASSET_ID);
-    ADD_UTXO_INPUT("4eb2f96937a0d4dc96b77ba69a29e1de9574cbd62b16d881f1ee2061a291d70b", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("3fee0109d155dcfab272176117306b45b176914c88e8c379933c246a9e29ea0b", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("6ea9ce8c578bfeeecdf281f498e2a764689df3b93d6855a3cc45bd6b5213c426", 0, 400000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("f75ad3cbd277d83ee240e08f99a97ffd7e42a82a868e0f7043414f6d6147262b", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("054734e98f442b3e73a940ca8f594859ece1c7ddac14130b0e2f5e2799b85931", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("8b0c42d448912fc28c674fdcf8e21e4667d7d2133666168eaa0570488a9c5036", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 1, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 2, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 3, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 4, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 5, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 6, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 7, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 8, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 9, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("cf83bce600626b6077e136581c1aecc78a0bbb7d7649b1f580b6be881087ec40", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("9bd7572ba8df685e262369897d24f7217b42be496b9eed16e16a889dd83b394e", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("b4ee250397dde2f1001d782d3c803c38992447d3b351cdc9bf20cfaa2cbf995b", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("e1019ca259a1615f77263324156a70007b76cb4f26b01b2956b8f85e6842ac62", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("bd379df2aca526ac600919aaba0e59d4a1ad4e2f22d18966063cf45e431d016f", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("164c3f843b9b7bfa6a7376a1548f343acb5cdfa0193b8f31e8c9a647ea63ea7d", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("4acec74a76161eafe70e0791b1f504b5ba1d175fd4f340d5bf56804e25505e92", 0, 300000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("895c6629a71c84cbdc8956abea9ca2d9d215e909e6173b1a1a96289186a67796", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("54828143c4c3a0e1b09102e4ed29220b141089c2bc4200b1042eeb12e5e49296", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("5345e4abc86f7ace47112f5a91c129175833bafcaf9f1e1bcbbaf4d019c1c69d", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("c83e19d0d4210df97b3bc7768dc7184ae3acfc1b5b3ac9b05d2be0fe5a636b9f", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("3456b03f5cb688ce26ab1d09b7a15799136c8c886ca7c3c6bcb2363e61bb1bb1", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 10, 34000000000, NEO_ASSET_ID);
-    // all inputs below must be unused in this tx
-    ADD_UTXO_INPUT("e5a7887521b8b3aaf2d5426617ddabe8ef8ea3eab31c80a977c3b8f339df5be0", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("1455e9dd3cd6a04d81cd47acc07a7335212029ebbdcd0abc3e52c33f8b77f6eb", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("da711260085211b5573801d0dfe064235c69e61a55f9c15449ac55cc02b9adee", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("04486cfed371103dd51a89205b2c8bcc45ad887c49a768a62465f35810437bef", 0, 500000000, NEO_ASSET_ID);
-    ADD_UTXO_INPUT("a5f27055a442db0e65103561900456d37af4233267960daded870c1ab2219ef4", 0, 500000000, NEO_ASSET_ID);
-
-    {
-        auto output = input.add_outputs();
-        output->set_asset_id(NEO_ASSET_ID);
-        output->set_to_address("Ad9A1xPbuA5YBFr1XPznDwBwQzdckAjCev");
-        output->set_change_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
-        output->set_amount(25000000000);
-    }
-
-    return input;
-}
-
-TEST(TWAnySignerNEO, Sign) {
-    Proto::SigningInput input = createInput();
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNEO);
-
-    //  https://testnet-explorer.o3.network/transactions/0x7b138c753c24f474d0f70af30a9d79756e0ee9c1f38c12ed07fbdf6fc5132eaf
-    ASSERT_EQ(hex(output.encoded()), "8000001efb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00039b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc50083064905000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ace72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c605013cf0617000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac014140dc261ac093a87640441bf0c3ad4a55ec727932b9175f600618bb5275f31aacf122956bc88746dc666759a2d67f120fe3ce1659f916d22a91e0b02421d3bddbd1232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac");
-}
-
-TEST(TWAnySignerNEO, Plan) {
-    Proto::SigningInput input = createInput();
-    Proto::TransactionPlan plan;
-    ANY_PLAN(input, plan, TWCoinTypeNEO);
-
-    EXPECT_EQ(plan.inputs_size(), 30);
-    EXPECT_EQ(plan.outputs_size(), 2);
-    EXPECT_EQ(plan.fee(), 1408000);
-    EXPECT_EQ(plan.error(), Common::Proto::OK);
-}
-
-} // namespace TW::NEO::tests
diff --git a/tests/NEO/TWCoinTypeTests.cpp b/tests/NEO/TWCoinTypeTests.cpp
deleted file mode 100644
index 8b986b73a4d..00000000000
--- a/tests/NEO/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWNEOCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNEO));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("e0ddf7c81c732df26180aca0c36d5868ad009fdbbe6e7a56ebafc14bba41cd53"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNEO, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("AcxuqWhTureEQGeJgbmtSWNAtssjMLU7pb"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNEO, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNEO));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNEO));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNEO), 8);
-    ASSERT_EQ(TWBlockchainNEO, TWCoinTypeBlockchain(TWCoinTypeNEO));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNEO));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNEO));
-    assertStringsEqual(symbol, "NEO");
-    assertStringsEqual(txUrl, "https://neoscan.io/transaction/e0ddf7c81c732df26180aca0c36d5868ad009fdbbe6e7a56ebafc14bba41cd53");
-    assertStringsEqual(accUrl, "https://neoscan.io/address/AcxuqWhTureEQGeJgbmtSWNAtssjMLU7pb");
-    assertStringsEqual(id, "neo");
-    assertStringsEqual(name, "NEO");
-}
\ No newline at end of file
diff --git a/tests/NEO/TWNEOAddressTests.cpp b/tests/NEO/TWNEOAddressTests.cpp
deleted file mode 100644
index 029f3bdb95b..00000000000
--- a/tests/NEO/TWNEOAddressTests.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWCoinType.h>
-#include <TrustWalletCore/TWHDWallet.h>
-#include <TrustWalletCore/TWHRP.h>
-#include "HexCoding.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-#include <iostream>
-
-
-TEST(NEO, ExtendedKeys) {
-    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
-        STRING("client recycle grass verb guitar battle abstract table they swamp accuse athlete recall ski light").get(),
-        STRING("NEO").get()
-    ));
-
-    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeNEO, TWHDVersionXPUB));
-    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeNEO, TWHDVersionXPRV));
-
-    assertStringsEqual(xpub, "xpub6CEwQUwgAnJmxNkb7CxuJGZN8FQNnqkKWeFjHqBEsD6PN267g3yNejdZyNEALzM7CxbQbtBzmndRjhvKyQDZoP8JrBLBQ8DJbhS1ge9Ln6F");
-    assertStringsEqual(xprv, "xprv9yFazyQnLQkUjtg81BRtw8cdaDZtPP2U9RL8VSmdJsZQVDky8Wf86wK687witsCZhYZCaRALSbGRVbLBuzDzbp6dpJFqnjnvNbiNV4JgrNY");
-}
\ No newline at end of file
diff --git a/tests/NEO/TransactionOutputTests.cpp b/tests/NEO/TransactionOutputTests.cpp
deleted file mode 100644
index 84753ba029a..00000000000
--- a/tests/NEO/TransactionOutputTests.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "uint256.h"
-#include "HexCoding.h"
-#include "NEO/TransactionOutput.h"
-#include <gtest/gtest.h>
-
-namespace TW::NEO::tests {
-
-using namespace std;
-
-TEST(NEOTransactionOutput, Serialize) {
-    auto transactionOutput = TransactionOutput();
-    string assetId = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a";
-    string scriptHash = "cbb23e6f9ade28d5a8ff3eac9d73af039e821b1b";
-    transactionOutput.value = 1L;
-    transactionOutput.assetId = load(parse_hex(assetId));
-    transactionOutput.scriptHash = load(parse_hex(scriptHash));
-    EXPECT_EQ(assetId + "0100000000000000" + scriptHash, hex(transactionOutput.serialize()));
-
-    transactionOutput.value = 0xff01;
-    EXPECT_EQ(assetId + "01ff000000000000" + scriptHash, hex(transactionOutput.serialize()));
-}
-
-TEST(NEOTransactionOutput, Deserialize) {
-    string assetId = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a";
-    string scriptHash = "cbb23e6f9ade28d5a8ff3eac9d73af039e821b1b";
-    auto transactionOutput = TransactionOutput();
-    transactionOutput.deserialize(parse_hex(assetId + "0100000000000000" + scriptHash));
-    EXPECT_EQ(1, transactionOutput.value);
-    EXPECT_EQ(assetId, hex(store(transactionOutput.assetId)));
-    EXPECT_EQ(scriptHash, hex(store(transactionOutput.scriptHash)));
-
-    transactionOutput.deserialize(parse_hex(assetId + "01ff000000000000" + scriptHash));
-    EXPECT_EQ(0xff01, transactionOutput.value);
-    EXPECT_EQ(assetId, hex(store(transactionOutput.assetId)));
-    EXPECT_EQ(scriptHash, hex(store(transactionOutput.scriptHash)));
-}
-
-} // namespace TW::NEO::tests
diff --git a/tests/NEO/TransactionTests.cpp b/tests/NEO/TransactionTests.cpp
deleted file mode 100644
index 08c328ea405..00000000000
--- a/tests/NEO/TransactionTests.cpp
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "uint256.h"
-#include "HexCoding.h"
-#include "NEO/Transaction.h"
-#include "NEO/TransactionType.h"
-#include "NEO/TransactionAttributeUsage.h"
-#include "NEO/TransactionAttribute.h"
-#include <gtest/gtest.h>
-
-namespace TW::NEO::tests {
-
-using namespace std;
-
-TEST(NEOTransaction, SerializeDeserializeEmpty) {
-    auto transaction = Transaction();
-    EXPECT_EQ(transaction, transaction);
-
-    EXPECT_EQ(0ul, transaction.attributes.size());
-    EXPECT_EQ(0ul, transaction.inInputs.size());
-    EXPECT_EQ(0ul, transaction.outputs.size());
-    auto serialized = transaction.serialize();
-
-    auto deserializedTransaction = Transaction();
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-}
-
-TEST(NEOTransaction, SerializeDeserializeEmptyCollections) {
-    auto transaction = Transaction();
-    transaction.type = TransactionType::TT_EnrollmentTransaction;
-    transaction.version = 0x07;
-    const string zeroVarLong = "00";
-    auto serialized = transaction.serialize();
-    EXPECT_EQ("2007" + zeroVarLong + zeroVarLong + zeroVarLong, hex(serialized));
-
-    auto deserializedTransaction = Transaction();
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-    EXPECT_EQ(transaction, transaction);
-}
-
-TEST(NEOTransaction, SerializeDeserializeAttribute) {
-    auto transaction = Transaction();
-    transaction.type = TransactionType::TT_ContractTransaction;
-    transaction.version = 0x07;
-    const string zeroVarLong = "00";
-    const string oneVarLong = "01";
-    transaction.attributes.push_back(TransactionAttribute());
-    transaction.attributes[0].usage = TransactionAttributeUsage::TAU_ContractHash;
-    transaction.attributes[0]._data = parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a");
-    auto serialized = transaction.serialize();
-    EXPECT_EQ("8007" + oneVarLong + hex(transaction.attributes[0].serialize()) + zeroVarLong + zeroVarLong, hex(serialized));
-
-    auto deserializedTransaction = Transaction();
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-
-    transaction.attributes.push_back(TransactionAttribute());
-    transaction.attributes[1].usage = TransactionAttributeUsage::TAU_ECDH02;
-    transaction.attributes[1]._data = parse_hex("b7ecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a");
-    serialized = transaction.serialize();
-    const string twoVarLong = "02";
-    string expectedSerialized = "8007" + twoVarLong;
-    expectedSerialized += hex(transaction.attributes[0].serialize());
-    expectedSerialized += hex(transaction.attributes[1].serialize());
-    expectedSerialized += zeroVarLong + zeroVarLong;
-    EXPECT_EQ(expectedSerialized, hex(serialized));
-
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-    EXPECT_EQ(transaction, transaction);
-}
-
-TEST(NEOTransaction, SerializeDeserializeInputs) {
-    auto transaction = Transaction();
-    transaction.type = TransactionType::TT_ContractTransaction;
-    transaction.version = 0x07;
-    const string zeroVarLong = "00";
-    const string oneVarLong = "01";
-    transaction.inInputs.push_back(CoinReference());
-    transaction.inInputs[0].prevHash = load(parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.inInputs[0].prevIndex = 0xa;
-    auto serialized = transaction.serialize();
-    EXPECT_EQ("8007" + zeroVarLong + oneVarLong + hex(transaction.inInputs[0].serialize()) + zeroVarLong, hex(serialized));
-
-    auto deserializedTransaction = Transaction();
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-
-    transaction.inInputs.push_back(CoinReference());
-    transaction.inInputs[1].prevHash = load(parse_hex("bdecbb623eee4f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.inInputs[1].prevIndex = 0xbc;
-    serialized = transaction.serialize();
-    const string twoVarLong = "02";
-    string expectedSerialized = "8007" + zeroVarLong + twoVarLong;
-    expectedSerialized += hex(transaction.inInputs[0].serialize());
-    expectedSerialized += hex(transaction.inInputs[1].serialize());
-    expectedSerialized += zeroVarLong;
-    EXPECT_EQ(expectedSerialized, hex(serialized));
-
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-    EXPECT_EQ(transaction, transaction);
-}
-
-TEST(NEOTransaction, SerializeDeserializeOutputs) {
-    auto transaction = Transaction();
-    transaction.type = TransactionType::TT_ContractTransaction;
-    transaction.version = 0x07;
-    const string zeroVarLong = "00";
-    const string oneVarLong = "01";
-    transaction.outputs.push_back(TransactionOutput());
-    transaction.outputs[0].assetId = load(parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.outputs[0].scriptHash = load(parse_hex("cbb23e6f9ade28d5a8ff3eac9d73af039e821b1b"));
-    transaction.outputs[0].value = 0x2;
-    auto serialized = transaction.serialize();
-    EXPECT_EQ("8007" + zeroVarLong + zeroVarLong + oneVarLong + hex(transaction.outputs[0].serialize()), hex(serialized));
-
-    auto deserializedTransaction = Transaction();
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-
-    transaction.outputs.push_back(TransactionOutput());
-    transaction.outputs[1].assetId = load(parse_hex("bdecbb623eee6a9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.outputs[1].scriptHash = load(parse_hex("cbb23e6f9a3e28d5a8ff3eac9d73af039e821b1b"));
-    transaction.outputs[1].value = 0x2;
-    serialized = transaction.serialize();
-    const string twoVarLong = "02";
-    string expectedSerialized = "8007" + zeroVarLong + zeroVarLong + twoVarLong;
-    expectedSerialized += hex(transaction.outputs[0].serialize());
-    expectedSerialized += hex(transaction.outputs[1].serialize());
-    EXPECT_EQ(expectedSerialized, hex(serialized));
-
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-}
-
-TEST(NEOTransaction, SerializeDeserialize) {
-    auto transaction = Transaction();
-    transaction.type = TransactionType::TT_ContractTransaction;
-    transaction.version = 0x07;
-    const string oneVarLong = "01";
-
-    transaction.attributes.push_back(TransactionAttribute());
-    transaction.attributes[0].usage = TransactionAttributeUsage::TAU_ContractHash;
-    transaction.attributes[0]._data = parse_hex("bdecbb623eee6f9ade28d5a8ff5fbdea9c9d73af039e0286201b3b0291fb4d4a");
-
-    transaction.inInputs.push_back(CoinReference());
-    transaction.inInputs[0].prevHash = load(parse_hex("bdecbb623eee679ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.inInputs[0].prevIndex = 0xa;
-
-    transaction.outputs.push_back(TransactionOutput());
-    transaction.outputs[0].assetId = load(parse_hex("bdecbb623eee6f9ad328d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.outputs[0].scriptHash = load(parse_hex("cbb23e6f9ade28a5a8ff3eac9d73af039e821b1b"));
-    transaction.outputs[0].value = 0x2;
-
-    auto serialized = transaction.serialize();
-    string expectedSerialized = "8007";
-    expectedSerialized += oneVarLong + hex(transaction.attributes[0].serialize());
-    expectedSerialized += oneVarLong + hex(transaction.inInputs[0].serialize());
-    expectedSerialized += oneVarLong + hex(transaction.outputs[0].serialize());
-    ASSERT_EQ(expectedSerialized, hex(serialized));
-
-    auto deserializedTransaction = Transaction();
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-
-    transaction.outputs.push_back(TransactionOutput());
-    transaction.outputs[1].assetId = load(parse_hex("bdecbb623eee6a9a3e28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.outputs[1].scriptHash = load(parse_hex("cbb23e6f9a3e28d5a8ff3eac9da3af039e821b1b"));
-    transaction.outputs[1].value = 0x2;
-    serialized = transaction.serialize();
-    const string twoVarLong = "02";
-    expectedSerialized = "8007";
-    expectedSerialized += oneVarLong + hex(transaction.attributes[0].serialize());
-    expectedSerialized += oneVarLong + hex(transaction.inInputs[0].serialize());
-    expectedSerialized += twoVarLong + hex(transaction.outputs[0].serialize());
-    expectedSerialized += hex(transaction.outputs[1].serialize());
-    EXPECT_EQ(expectedSerialized, hex(serialized));
-
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-
-    transaction.inInputs.push_back(CoinReference());
-    transaction.inInputs[1].prevHash = load(parse_hex("bdecbb623e3e6f9ade28d5a8ff4fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.inInputs[1].prevIndex = 0xbc;
-    transaction.inInputs.push_back(CoinReference());
-    transaction.inInputs[2].prevHash = load(parse_hex("bdecbb624eee6f9ade28d5a8ff3fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
-    transaction.inInputs[2].prevIndex = 0x1f;
-
-    serialized = transaction.serialize();
-    const string threeVarLong = "03";
-    expectedSerialized = "8007";
-    expectedSerialized += oneVarLong + hex(transaction.attributes[0].serialize());
-    expectedSerialized += threeVarLong + hex(transaction.inInputs[0].serialize());
-    expectedSerialized += hex(transaction.inInputs[1].serialize());
-    expectedSerialized += hex(transaction.inInputs[2].serialize());
-    expectedSerialized += twoVarLong + hex(transaction.outputs[0].serialize());
-    expectedSerialized += hex(transaction.outputs[1].serialize());
-    EXPECT_EQ(expectedSerialized, hex(serialized));
-
-    deserializedTransaction.deserialize(serialized);
-    EXPECT_EQ(transaction, deserializedTransaction);
-}
-
-TEST(NEOTransaction, SerializeDeserializeMiner) {
-    string block2tn = "0000d11f7a2800000000";
-    std::unique_ptr<Transaction> deserializedTransaction(Transaction::deserializeFrom(parse_hex(block2tn)));
-    auto serialized = deserializedTransaction->serialize();
-    std::unique_ptr<Transaction> serializedTransaction(Transaction::deserializeFrom(serialized));
-
-    EXPECT_EQ(*deserializedTransaction, *serializedTransaction);
-
-    string notMiner = "1000d11f7a2800000000";
-    EXPECT_THROW(
-        std::unique_ptr<Transaction> _deserializedTransaction(Transaction::deserializeFrom(parse_hex(notMiner))),
-        std::invalid_argument);
-}
-
-TEST(NEOTransaction, GetHash) {
-    string block2tn = "0000d11f7a2800000000";
-    std::unique_ptr<Transaction> deserializedTransaction(Transaction::deserializeFrom(parse_hex(block2tn)));
-
-    Data hash = parse_hex("8e3a32ba3a7e8bdb0ad9a2ad064713e45bd20eb0dab0d2e77df5b5ce985276d0");
-    // It is flipped on the https://github.com/NeoResearch/neopt/blob/master/tests/ledger_Tests/Transaction.Test.cpp
-    hash = Data(hash.rbegin(), hash.rend());
-
-    EXPECT_EQ(hex(hash), hex(deserializedTransaction->getHash()));
-}
-
-TEST(NEOTransaction, SerializeSize) {
-    auto transaction = Transaction();
-    transaction.type = TransactionType::TT_EnrollmentTransaction;
-    transaction.version = 0x07;
-    const string zeroVarLong = "00";
-    auto serialized = transaction.serialize();
-    auto verSerialized = parse_hex("2007" + zeroVarLong + zeroVarLong + zeroVarLong);
-    EXPECT_EQ(hex(verSerialized), hex(serialized));
-    EXPECT_EQ(verSerialized, serialized);
-
-    EXPECT_EQ(serialized.size(), static_cast<uint64_t>(transaction.size()));
-}
-
-} // namespace TW::NEO::tests
diff --git a/tests/NULS/AddressTests.cpp b/tests/NULS/AddressTests.cpp
deleted file mode 100644
index 0082fac96fc..00000000000
--- a/tests/NULS/AddressTests.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "NULS/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include <gtest/gtest.h>
-
-namespace TW::NULS::tests {
-
-TEST(NULSAddress, StaticInvalid) {
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_FALSE(Address::isValid("aaeb60f3e94c9b9a09f33669435e7ef1beaed"));
-    ASSERT_FALSE(Address::isValid("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z"));
-    ASSERT_TRUE(Address::isValid("NULSd6HgUxmcJWc88iELEJ7RH9XHsazBQqnJc"));
-    ASSERT_TRUE(Address::isValid("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2"));
-}
-
-TEST(NULSAddress, ChainID) {
-    const auto address = Address("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2");
-    ASSERT_TRUE(address.chainID() == 1);
-}
-
-TEST(NULSAddress, Type) {
-    const auto address = Address("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2");
-    ASSERT_TRUE(address.type() == 1);
-}
-
-TEST(NULSAddress, FromString) {
-    const auto address = Address("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2");
-    ASSERT_EQ(address.string(), "NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2");
-}
-
-TEST(NULSAddress, FromPrivateKey) {
-    const auto privateKey =
-        PrivateKey(parse_hex("a1269039e4ffdf43687852d7247a295f0b5bc55e6dda031cffaa3295ca0a9d7a"));
-    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "NULSd6HghWa4CN5qdxqMwYVikQxRZyj57Jn4L");
-}
-
-TEST(NULSAddress, FromCompressedPublicKey) {
-    const auto publicKey =
-        PublicKey(parse_hex("0244d50ff36c3136b4bf81f0c74b066695bc2af43e28d7f0ca1d48fcfd084bea66"), TWPublicKeyTypeSECP256k1);
-    const auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "NULSd6HgUiMKPNi221bPfqvvho8QpuYBvn1x3");
-}
-
-TEST(NULSAddress, FromPrivateKey33) {
-    const auto privateKey = PrivateKey(parse_hex("d77580833f0b3c35b7114c23d6b66790d726c308baf237ec8c369152f2c08d27"));
-    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "NULSd6HgXx8YkwEjePLWUmdRSZzPQzK6BXnsB");
-}
-
-} // namespace TW::NULS::tests
diff --git a/tests/NULS/TWAnySignerTests.cpp b/tests/NULS/TWAnySignerTests.cpp
deleted file mode 100644
index c0f5c3b0eea..00000000000
--- a/tests/NULS/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/NULS.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include "uint256.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::NULS::tests {
-
-TEST(TWAnySignerNULS, Sign) {
-    auto privateKey = parse_hex("0x9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b");
-    auto amount = store(uint256_t(10000000));
-    auto balance = store(uint256_t(100000000));
-    std::string nonce = "0000000000000000";
-    Proto::SigningInput input;
-
-    input.set_from("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
-    input.set_to("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
-    input.set_amount(amount.data(), amount.size());
-    input.set_chain_id(1);
-    input.set_idassets_id(1);
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_balance(balance.data(), balance.size());
-    input.set_timestamp(1569228280);
-    input.set_nonce(nonce.data(), nonce.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNULS);
-
-    EXPECT_EQ(hex(output.encoded()), "0200f885885d00008c0117010001f7ec6473df12e751d64cf20a8baa7edd50810f8101000100201d9a0000000000000000000000000000000000000000000000000000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120100010080969800000000000000000000000000000000000000000000000000000000000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1d7e3463044022028019c0099e2233c7adb84bb03a9a5666ece4a5b65a026a090fa460f3679654702204df0fcb8762b5944b3aba033fa1a287ccb098150035dd8b66f52dc58d3d0843a");
-}
-
-} // namespace TW::NULS::tests
diff --git a/tests/NULS/TWCoinTypeTests.cpp b/tests/NULS/TWCoinTypeTests.cpp
deleted file mode 100644
index 3d048c09faf..00000000000
--- a/tests/NULS/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWNULSCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNULS));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNULS, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNULS, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNULS));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNULS));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNULS), 8);
-    ASSERT_EQ(TWBlockchainNULS, TWCoinTypeBlockchain(TWCoinTypeNULS));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNULS));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNULS));
-    assertStringsEqual(symbol, "NULS");
-    assertStringsEqual(txUrl, "https://nulscan.io/transaction/info?hash=t123");
-    assertStringsEqual(accUrl, "https://nulscan.io/address/info?address=a12");
-    assertStringsEqual(id, "nuls");
-    assertStringsEqual(name, "NULS");
-}
diff --git a/tests/Nano/AddressTests.cpp b/tests/Nano/AddressTests.cpp
deleted file mode 100644
index 2c3435a11ee..00000000000
--- a/tests/Nano/AddressTests.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright © 2019 Mart Roosmaa.
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Nano/Address.h"
-
-#include <gtest/gtest.h>
-
-using namespace std;
-using namespace TW;
-
-namespace TW::Nano::tests {
-
-TEST(NanoAddress, FromPublicKey) {
-    {
-        const auto publicKey = PublicKey(parse_hex("5114aad86a390897d2a91b33b931b3a59a7df9e63eb3694f9430122f5622ae50"), TWPublicKeyTypeED25519Blake2b);
-        const auto address = Address(publicKey);
-        ASSERT_EQ(string("nano_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg"), address.string());
-    }
-
-    {
-        const auto publicKey = PublicKey(parse_hex("03e20ec6b4a39a629815ae02c0a1393b9225e3b890cae45b59f42fa29be9668d"), TWPublicKeyTypeED25519);
-        ASSERT_THROW(Address address(publicKey), std::invalid_argument);
-    }
-}
-
-TEST(NanoAddress, FromString) {
-    {
-        string nanoAddress = "nano_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg";
-        const auto address = Address(nanoAddress);
-        ASSERT_EQ(address.string(), nanoAddress);
-        ASSERT_EQ(hex(address.bytes), "5114aad86a390897d2a91b33b931b3a59a7df9e63eb3694f9430122f5622ae50");
-    }
-
-    {
-        string xrbAddress = "xrb_1111111111111111111111111111111111111111111111111111hifc8npp";
-        string nanoAddress = "nano_1111111111111111111111111111111111111111111111111111hifc8npp";
-        const auto address = Address(xrbAddress);
-        ASSERT_EQ(address.string(), nanoAddress);
-        ASSERT_EQ(hex(address.bytes), "0000000000000000000000000000000000000000000000000000000000000000");
-    }
-}
-
-TEST(NanoAddress, isValid) {
-    string nanodeAddress = "nano_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg";
-    string faultyChecksumAddress = "xrb_1111111111111111111111111111111111111111111111111111hi111111";
-    string bitcoinAddress = "1Ma2DrB78K7jmAwaomqZNRMCvgQrNjE2QC";
-
-    ASSERT_TRUE(Address::isValid(nanodeAddress));
-    ASSERT_FALSE(Address::isValid(faultyChecksumAddress));
-    ASSERT_FALSE(Address::isValid(bitcoinAddress));
-}
-
-} // namespace TW::Nano::tests
diff --git a/tests/Nano/SignerTests.cpp b/tests/Nano/SignerTests.cpp
deleted file mode 100644
index 966198c3bc0..00000000000
--- a/tests/Nano/SignerTests.cpp
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright © 2019 Mart Roosmaa.
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Nano/Signer.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Nano::tests {
-
-const std::string kPrivateKey{"173c40e97fe2afcd24187e74f6b603cb949a5365e72fbdd065a6b165e2189e34"};
-const std::string kRepOfficial1{"xrb_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4"};
-const std::string kRepNanode{"xrb_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg"};
-
-TEST(NanoSigner, sign1) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
-
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_link_block(linkBlock.data(), linkBlock.size());
-    input.set_representative(kRepOfficial1);
-    input.set_balance("96242336390000000000000000000");
-
-    // https://www.nanode.co/block/f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696
-    const auto signer = Signer(input);
-    ASSERT_EQ(hex(signer.blockHash), "f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
-    const auto signature = signer.sign();
-    ASSERT_EQ(hex(signature), "d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09");
-    const Proto::SigningOutput out = signer.build();
-    EXPECT_EQ(hex(out.signature()), "d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09");
-    EXPECT_EQ(hex(out.block_hash()), "f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
-    EXPECT_EQ(
-        "{\"account\":\"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c\","
-        "\"balance\":\"96242336390000000000000000000\","
-        "\"link\":\"491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507\","
-        "\"link_as_account\":\"nano_1kazsap8mc481zbqbcqjytpf9mmigj87qr5k5fhf97579t4k8fa94octjx6d\","
-        "\"previous\":\"0000000000000000000000000000000000000000000000000000000000000000\","
-        "\"representative\":\"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4\","
-        "\"signature\":\"d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09\","
-        "\"type\":\"state\"}",
-        out.json());
-}
-
-TEST(NanoSigner, sign2) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto parentBlock = parse_hex("f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
-
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_parent_block(parentBlock.data(), parentBlock.size());
-    input.set_representative(kRepNanode);
-    input.set_balance("96242336390000000000000000000");
-
-    // https://www.nanode.co/block/2568bf76336f7a415ca236dab97c1df9de951ca057a2e79df1322e647a259e7b
-    const auto signer = Signer(input);
-    ASSERT_EQ(hex(signer.blockHash), "2568bf76336f7a415ca236dab97c1df9de951ca057a2e79df1322e647a259e7b");
-    const auto signature = signer.sign();
-    ASSERT_EQ(hex(signature), "3a0687542405163d5623808052042b3482360a82cc003d178a0c0d8bfbca86450975d0faec60ae5ac37feba9a8e2205c8540317b26f2c589c2a6578b03870403");
-}
-
-TEST(NanoSigner, sign3) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto parentBlock = parse_hex("2568bf76336f7a415ca236dab97c1df9de951ca057a2e79df1322e647a259e7b");
-    const auto linkBlock = parse_hex("d7384845d2ae530b45a5dd50ee50757f988329f652781767af3f1bc2322f52b9");
-
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_parent_block(parentBlock.data(), parentBlock.size());
-    input.set_link_block(linkBlock.data(), linkBlock.size());
-    input.set_representative(kRepNanode);
-    input.set_balance("196242336390000000000000000000");
-    input.set_work("123456789");
-
-    // https://www.nanode.co/block/1ca240212838d053ecaa9dceee598c52a6080067edecaeede3319eb0b7db6525
-    const auto signer = Signer(input);
-    ASSERT_EQ(hex(signer.blockHash), "1ca240212838d053ecaa9dceee598c52a6080067edecaeede3319eb0b7db6525");
-    const auto signature = signer.sign();
-    ASSERT_EQ(hex(signature), "e980d45365ae2fb291950019f7c19a3d5fa5df2736ca7e7ca1984338b4686976cb7efdda2894ddcea480f82645b50f2340c9d0fc69a05621bdc355783a21820d");
-    const Proto::SigningOutput out = signer.build();
-    EXPECT_EQ(
-        "{\"account\":\"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c\","
-        "\"balance\":\"196242336390000000000000000000\","
-        "\"link\":\"d7384845d2ae530b45a5dd50ee50757f988329f652781767af3f1bc2322f52b9\","
-        "\"link_as_account\":\"nano_3osrb34x7dkm3f4tdqcixsa9czwrienzenmr4xmtyhruras4ynosarg1sdiq\","
-        "\"previous\":\"2568bf76336f7a415ca236dab97c1df9de951ca057a2e79df1322e647a259e7b\","
-        "\"representative\":\"nano_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg\","
-        "\"signature\":\"e980d45365ae2fb291950019f7c19a3d5fa5df2736ca7e7ca1984338b4686976cb7efdda2894ddcea480f82645b50f2340c9d0fc69a05621bdc355783a21820d\","
-        "\"type\":\"state\",\"work\":\"123456789\"}",
-        out.json());
-}
-
-TEST(NanoSigner, sign4) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto parentBlock = parse_hex("1ca240212838d053ecaa9dceee598c52a6080067edecaeede3319eb0b7db6525");
-
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_parent_block(parentBlock.data(), parentBlock.size());
-    input.set_link_recipient("xrb_3wm37qz19zhei7nzscjcopbrbnnachs4p1gnwo5oroi3qonw6inwgoeuufdp");
-    input.set_representative(kRepNanode);
-    input.set_balance("126242336390000000000000000000");
-
-    // https://www.nanode.co/block/32ac7d8f5a16a498abf203b8dfee623c9e111ff25e7339f8cd69ec7492b23edd
-    const auto signer = Signer(input);
-    ASSERT_EQ(hex(signer.blockHash), "32ac7d8f5a16a498abf203b8dfee623c9e111ff25e7339f8cd69ec7492b23edd");
-    const auto signature = signer.sign();
-    ASSERT_EQ(hex(signature), "bcb806e140c9e2bc71c51ebbd941b4d99cee3d97fd50e3006eabc5e325c712662e2dc163ee32660875d67815ce4721e122389d2e64f1c9ad4555a9d3d8c33802");
-}
-
-TEST(NanoSigner, signInvalid1) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-
-    // Missing link_block
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_representative(kRepOfficial1);
-    input.set_balance("96242336390000000000000000000");
-
-    ASSERT_THROW(Signer signer(input), std::invalid_argument);
-}
-
-TEST(NanoSigner, signInvalid2) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
-
-    // Missing representative
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_link_block(linkBlock.data(), linkBlock.size());
-    input.set_balance("96242336390000000000000000000");
-
-    ASSERT_THROW(Signer signer(input), std::invalid_argument);
-}
-
-TEST(NanoSigner, signInvalid3) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
-
-    // Missing balance
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_link_block(linkBlock.data(), linkBlock.size());
-    input.set_representative(kRepOfficial1);
-
-    ASSERT_THROW(Signer signer(input), std::invalid_argument);
-}
-
-TEST(NanoSigner, signInvalid4) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
-
-    // Account first block cannot be 0 balance
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_link_block(linkBlock.data(), linkBlock.size());
-    input.set_representative(kRepOfficial1);
-    input.set_balance("0");
-
-    ASSERT_THROW(Signer signer(input), std::invalid_argument);
-}
-
-TEST(NanoSigner, signInvalid5) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-
-    // First block must use link_block not link_recipient
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_link_recipient("xrb_3wm37qz19zhei7nzscjcopbrbnnachs4p1gnwo5oroi3qonw6inwgoeuufdp");
-    input.set_representative(kRepOfficial1);
-    input.set_balance("96242336390000000000000000000");
-
-    ASSERT_THROW(Signer signer(input), std::invalid_argument);
-}
-
-TEST(NanoSigner, signInvalid6) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
-
-    // Invalid representative value
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_link_block(linkBlock.data(), linkBlock.size());
-    input.set_representative("xrb_4wm37qz19zhei7nzscjcopbrbnnachs4p1gnwo5oroi3qonw6inwgoeuufdp");
-    input.set_balance("96242336390000000000000000000");
-
-    ASSERT_THROW(Signer signer(input), std::invalid_argument);
-}
-
-TEST(NanoSigner, signInvalid7) {
-    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
-    const auto parentBlock = parse_hex("f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
-
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_parent_block(parentBlock.data(), parentBlock.size());
-    input.set_link_recipient("xrb_4wm37qz19zhei7nzscjcopbrbnnachs4p1gnwo5oroi3qonw6inwgoeuufdp");
-    input.set_representative(kRepOfficial1);
-    input.set_balance("1.2.3");
-
-    ASSERT_THROW(Signer signer(input), std::invalid_argument);
-}
-
-} // namespace TW::Nano::tests
diff --git a/tests/Nano/TWAnySignerTests.cpp b/tests/Nano/TWAnySignerTests.cpp
deleted file mode 100644
index a348de09dae..00000000000
--- a/tests/Nano/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright © 2019 Mart Roosmaa.
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/Nano.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Nano::tests {
-
-TEST(TWAnySignerNano, sign) {
-    const auto privateKey = parse_hex("173c40e97fe2afcd24187e74f6b603cb949a5365e72fbdd065a6b165e2189e34");
-    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
-
-    auto input = Proto::SigningInput();
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_link_block(linkBlock.data(), linkBlock.size());
-    input.set_representative("xrb_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4");
-    input.set_balance("96242336390000000000000000000");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNano);
-
-    EXPECT_EQ(
-        "{\"account\":\"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c\","
-        "\"balance\":\"96242336390000000000000000000\","
-        "\"link\":\"491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507\","
-        "\"link_as_account\":\"nano_1kazsap8mc481zbqbcqjytpf9mmigj87qr5k5fhf97579t4k8fa94octjx6d\","
-        "\"previous\":\"0000000000000000000000000000000000000000000000000000000000000000\","
-        "\"representative\":\"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4\","
-        "\"signature\":"
-        "\"d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5"
-        "ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09\","
-        "\"type\":\"state\"}",
-        output.json());
-}
-
-TEST(TWAnySignerNano, SignJSON) {
-    auto json = STRING(R"({"link_block":"SR/KLGmoRgfTdKrx9qzTznB0TFvgchte05RlPoUjNQc=","representative":"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4","balance":"96242336390000000000000000000"})");
-    auto key = DATA("173c40e97fe2afcd24187e74f6b603cb949a5365e72fbdd065a6b165e2189e34");
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeNano));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeNano));
-    assertStringsEqual(result, R"({"account":"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c","balance":"96242336390000000000000000000","link":"491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507","link_as_account":"nano_1kazsap8mc481zbqbcqjytpf9mmigj87qr5k5fhf97579t4k8fa94octjx6d","previous":"0000000000000000000000000000000000000000000000000000000000000000","representative":"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4","signature":"d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09","type":"state"})");
-}
-
-} // namespace TW::Nano::tests
diff --git a/tests/Nano/TWCoinTypeTests.cpp b/tests/Nano/TWCoinTypeTests.cpp
deleted file mode 100644
index 37be0b6aa62..00000000000
--- a/tests/Nano/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWNanoCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNano));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNano, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("nano_1wpj616kwhe1y38y1mspd8aub8i334cwybqco511iyuxm55zx8d67ptf1tsf"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNano, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNano));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNano));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNano), 30);
-    ASSERT_EQ(TWBlockchainNano, TWCoinTypeBlockchain(TWCoinTypeNano));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNano));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNano));
-    assertStringsEqual(symbol, "XNO");
-    assertStringsEqual(txUrl, "https://nanocrawler.cc/explorer/block/C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F");
-    assertStringsEqual(accUrl, "https://nanocrawler.cc/explorer/account/nano_1wpj616kwhe1y38y1mspd8aub8i334cwybqco511iyuxm55zx8d67ptf1tsf");
-    assertStringsEqual(id, "nano");
-    assertStringsEqual(name, "Nano");
-}
diff --git a/tests/NativeEvmos/TWAnyAddressTests.cpp b/tests/NativeEvmos/TWAnyAddressTests.cpp
deleted file mode 100644
index 410da049ba9..00000000000
--- a/tests/NativeEvmos/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWCoinType.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::NativeEvmos::tests {
-
-TEST(EvmosAnyAddress, NativeEvmosValidate) {
-    auto string = STRING("evmos1mwspdc5y6lj0glm90j9sg7vmr5ksmqcnzhg0h9");
-
-    EXPECT_TRUE(TWAnyAddressIsValid(string.get(), TWCoinTypeNativeEvmos));
-
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeNativeEvmos));
-
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "dba016e284d7e4f47f657c8b04799b1d2d0d8313");
-}
-
-TEST(EvmosAnyAddress, NativeEvmosCreate) {
-    auto publicKeyHex = "035a0c6b83b8bd9827e507270cadb499b7e3a9095246f6a2213281f783d877c98b"; // shoot island position ...
-    const auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA(publicKeyHex).get(), TWPublicKeyTypeSECP256k1));
-
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeNativeEvmos));
-
-    EXPECT_EQ(std::string(TWStringUTF8Bytes(WRAPS(TWAnyAddressDescription(addr.get())).get())), std::string("evmos1mwspdc5y6lj0glm90j9sg7vmr5ksmqcnzhg0h9"));
-
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "dba016e284d7e4f47f657c8b04799b1d2d0d8313");
-}
-
-} // namespace TW::NativeEvmos::tests
diff --git a/tests/NativeEvmos/TWCoinTypeTests.cpp b/tests/NativeEvmos/TWCoinTypeTests.cpp
deleted file mode 100644
index fdcc17272f5..00000000000
--- a/tests/NativeEvmos/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-namespace TW::NativeEvmos::tests {
-
-TEST(TWEvmosCoinType, TWCoinTypeNativeEvmos) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNativeEvmos));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("A16C211C83AD1E684DE46F694FAAC17D8465C864BD7385A81EC062CDE0638811"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNativeEvmos, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNativeEvmos, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNativeEvmos));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNativeEvmos));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNativeEvmos), 18);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeNativeEvmos));
-
-    assertStringsEqual(symbol, "EVMOS");
-    assertStringsEqual(txUrl, "https://mintscan.io/evmos/txs/A16C211C83AD1E684DE46F694FAAC17D8465C864BD7385A81EC062CDE0638811");
-    assertStringsEqual(accUrl, "https://mintscan.io/evmos/account/evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34");
-    assertStringsEqual(id, "nativeevmos");
-    assertStringsEqual(name, "Native Evmos");
-}
-
-} // namespace TW::NativeEvmos::tests
diff --git a/tests/Nebulas/AddressTests.cpp b/tests/Nebulas/AddressTests.cpp
deleted file mode 100644
index 45a70df9a09..00000000000
--- a/tests/Nebulas/AddressTests.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Nebulas/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include <gtest/gtest.h>
-
-namespace TW::Nebulas::tests {
-
-using namespace std;
-
-TEST(NebulasAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_FALSE(Address::isValid("a1TgpFZWCMmFd2sphb6RKsCvsEyMCNa2Yyv"));
-    ASSERT_FALSE(Address::isValid("n2TgpFZWCMmFd2sphb6RKsCvsEyMCNa2Yyv"));
-    // normal address test
-    ASSERT_TRUE(Address::isValid("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY"));
-    // contract address test
-    ASSERT_TRUE(Address::isValid("n1zUNqeBPvsyrw5zxp9mKcDdLTjuaEL7s39"));
-}
-
-TEST(NebulasAddress, String) {
-    ASSERT_THROW(Address("abc"), std::invalid_argument);
-    ASSERT_EQ(Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY").string(),
-              "n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-    ASSERT_EQ(Address(Base58::bitcoin.decode("n1TgpFZWCMmFd2sphb6RKsCvsEyMCNa2Yyv")).string(),
-              "n1TgpFZWCMmFd2sphb6RKsCvsEyMCNa2Yyv");
-
-    const auto address = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-    ASSERT_EQ(address.string(), "n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-}
-
-TEST(NebulasAddress, Data) {
-    Data data;
-    EXPECT_THROW(Address(data).string(), std::invalid_argument);
-    ASSERT_EQ(Address(Base58::bitcoin.decode("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY")).string(),
-              "n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-}
-
-TEST(NebulasAddress, FromPrivateKey) {
-    const auto privateKey = PrivateKey(parse_hex("d2fd0ec9f6268fc8d1f563e3e976436936708bdf0dc60c66f35890f5967a8d2b"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-
-    EXPECT_THROW(Address(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1)), std::invalid_argument);
-}
-
-} // namespace TW::Nebulas::tests
diff --git a/tests/Nebulas/SignerTests.cpp b/tests/Nebulas/SignerTests.cpp
deleted file mode 100644
index f0f130f6860..00000000000
--- a/tests/Nebulas/SignerTests.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Nebulas/Address.h"
-#include "Nebulas/Signer.h"
-#include <time.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::Nebulas {
-
-class SignerExposed : public Signer {
-  public:
-    SignerExposed(boost::multiprecision::uint256_t chainID) : Signer(chainID) {}
-    using Signer::hash;
-};
-
-TEST(NebulasSigner, Hash) {
-    auto from = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-    auto to = Address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
-    auto transaction = Transaction(
-        /* to: */ from,
-        /* nonce: */ 7,
-        /* gasPrice: */ 1000000,
-        /* gasLimit: */ 200000,
-        /* to: */ to,
-        /* amount: */ 11000000000000000000ULL,
-        /* timestamp: */ 1560052938,
-        /* payload: */ std::string());
-    auto signer = SignerExposed(1);
-    auto hash = signer.hash(transaction);
-
-    ASSERT_EQ(hex(hash), "505dd4769de32a9c4bb6d6afd4f8e1ea6474815fd43484d8917cbd9e0993b885");
-}
-
-} // namespace TW::Nebulas
diff --git a/tests/Nebulas/TWAnySignerTests.cpp b/tests/Nebulas/TWAnySignerTests.cpp
deleted file mode 100644
index bafee5a3fcf..00000000000
--- a/tests/Nebulas/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include "HexCoding.h"
-#include "uint256.h"
-#include "proto/Nebulas.pb.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Nebulas::tests {
-
-TEST(TWAnySignerNebulas, Sign) {
-    Proto::SigningInput input;
-    input.set_from_address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-    input.set_to_address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
-    auto value = store(uint256_t(7));
-    input.set_nonce(value.data(), value.size());
-    value = store(uint256_t(1000000));
-    input.set_gas_price(value.data(), value.size());
-    value = store(uint256_t(200000));
-    input.set_gas_limit(value.data(), value.size());
-    value = store(uint256_t(11000000000000000000ULL));
-    input.set_amount(value.data(), value.size());
-    input.set_payload("");
-    value = store(uint256_t(1560052938));
-    input.set_timestamp(value.data(), value.size());
-
-    const auto privateKey = parse_hex("d2fd0ec9f6268fc8d1f563e3e976436936708bdf0dc60c66f35890f5967a8d2b");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    auto chainid = store(uint256_t(1));
-    input.set_chain_id(chainid.data(), chainid.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNebulas);
-
-    EXPECT_EQ(hex(output.signature()), "f53f4a9141ff8e462b094138eccd8c3a5d7865f9e9ab509626c78460a9e0b0fc35f7ed5ba1795ceb81a5e46b7580a6f7fb431d44fdba92515399cf6a8e47e71500");
-    EXPECT_EQ(output.raw(), "CiBQXdR2neMqnEu21q/U+OHqZHSBX9Q0hNiRfL2eCZO4hRIaGVefwtw23wEobqA40/7aIwQHghETxH4r+50aGhlXf89CeLWgHFjKu9/6tn4KNbelsMDAIIi2IhAAAAAAAAAAAJin2bgxTAAAKAcwyony5wU6CAoGYmluYXJ5QAFKEAAAAAAAAAAAAAAAAAAPQkBSEAAAAAAAAAAAAAAAAAADDUBYAWJB9T9KkUH/jkYrCUE47M2MOl14Zfnpq1CWJseEYKngsPw19+1boXlc64Gl5Gt1gKb3+0MdRP26klFTmc9qjkfnFQA=");
-}
-
-} // namespace TW::Nebulas::tests
diff --git a/tests/Nebulas/TWCoinTypeTests.cpp b/tests/Nebulas/TWCoinTypeTests.cpp
deleted file mode 100644
index c3eac69cffa..00000000000
--- a/tests/Nebulas/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWNebulasCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNebulas));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNebulas, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNebulas, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNebulas));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNebulas));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNebulas), 18);
-    ASSERT_EQ(TWBlockchainNebulas, TWCoinTypeBlockchain(TWCoinTypeNebulas));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNebulas));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNebulas));
-    assertStringsEqual(symbol, "NAS");
-    assertStringsEqual(txUrl, "https://explorer.nebulas.io/#/tx/t123");
-    assertStringsEqual(accUrl, "https://explorer.nebulas.io/#/address/a12");
-    assertStringsEqual(id, "nebulas");
-    assertStringsEqual(name, "Nebulas");
-}
diff --git a/tests/Nebulas/TransactionTests.cpp b/tests/Nebulas/TransactionTests.cpp
deleted file mode 100644
index 0651403fd2a..00000000000
--- a/tests/Nebulas/TransactionTests.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Nebulas/Signer.h"
-#include "HexCoding.h"
-#include "Base64.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-extern std::string htmlescape(const std::string& str);
-
-namespace TW::Nebulas::tests {
-
-using namespace std;
-
-TEST(NebulasTransaction, serialize) {
-    auto from = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-    auto to = Address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
-    auto transaction = Transaction(
-        /* to: */ from,
-        /* nonce: */ 7,
-        /* gasPrice: */ 1000000,
-        /* gasLimit: */ 200000,
-        /* to: */ to,
-        /* amount: */ 11000000000000000000ULL,
-        /* timestamp: */ 1560052938,
-        /* payload: */ std::string());
-
-    const auto privateKey = PrivateKey(parse_hex("d2fd0ec9f6268fc8d1f563e3e976436936708bdf0dc60c66f35890f5967a8d2b"));
-    auto signer = Signer(1);
-    signer.sign(privateKey, transaction);
-    transaction.serializeToRaw();
-
-    ASSERT_EQ(TW::Base64::encode(transaction.raw), "CiBQXdR2neMqnEu21q/U+OHqZHSBX9Q0hNiRfL2eCZO4hRIaGVefwtw23wEobqA40/7aIwQHghETxH4r+50aGhlXf89CeLWgHFjKu9/6tn4KNbelsMDAIIi2IhAAAAAAAAAAAJin2bgxTAAAKAcwyony5wU6CAoGYmluYXJ5QAFKEAAAAAAAAAAAAAAAAAAPQkBSEAAAAAAAAAAAAAAAAAADDUBYAWJB9T9KkUH/jkYrCUE47M2MOl14Zfnpq1CWJseEYKngsPw19+1boXlc64Gl5Gt1gKb3+0MdRP26klFTmc9qjkfnFQA=");
-}
-
-TEST(NebulasTransaction, binaryPayload) {
-    auto from = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-    auto to = Address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
-    auto transaction = Transaction(
-        /* to: */ from,
-        /* nonce: */ 7,
-        /* gasPrice: */ 1000000,
-        /* gasLimit: */ 200000,
-        /* to: */ to,
-        /* amount: */ 11000000000000000000ULL,
-        /* timestamp: */ 1560052938,
-        /* payload: */ std::string("{\"binary\":\"test\"}"));
-
-    const auto privateKey = PrivateKey(parse_hex("d2fd0ec9f6268fc8d1f563e3e976436936708bdf0dc60c66f35890f5967a8d2b"));
-    auto signer = Signer(1);
-    signer.sign(privateKey, transaction);
-    ASSERT_EQ(TW::Base64::encode(transaction.raw), "CiB1Oqj7bxLQMHEoNyg/vFHmsTrGdkpTf/5qFDkYPB3bkxIaGVefwtw23wEobqA40/7aIwQHghETxH4r+50aGhlXf89CeLWgHFjKu9/6tn4KNbelsMDAIIi2IhAAAAAAAAAAAJin2bgxTAAAKAcwyony5wU6PQoGYmluYXJ5EjN7IkRhdGEiOnsiZGF0YSI6WzExNiwxMDEsMTE1LDExNl0sInR5cGUiOiJCdWZmZXIifX1AAUoQAAAAAAAAAAAAAAAAAA9CQFIQAAAAAAAAAAAAAAAAAAMNQFgBYkGHXq+JWPaEyeB19bqL3QB5jyM961WLq7PMTpnGM4iLtBjCkngjS81kgPM2TE4qKDcpzqjum/NccrZtUPQLGk0MAQ==");
-}
-
-TEST(NebulasTransaction, htmlescape) {
-    // test for escaped label
-    auto test = ("test&<>\x20\x28\x20\x29");
-    auto result = htmlescape(test);
-    ASSERT_EQ(result, "test\\u0026\\u003c\\u003e\\u2028\\u2029");
-}
-
-TEST(NebulasTransaction, serializeUnsigned) {
-    auto from = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
-    auto to = Address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
-    auto transaction = Transaction(
-        /* to: */ from,
-        /* nonce: */ 7,
-        /* gasPrice: */ 1000000,
-        /* gasLimit: */ 200000,
-        /* to: */ to,
-        /* amount: */ 11000000000000000000ULL,
-        /* timestamp: */ 1560052938,
-        /* payload: */ std::string());
-
-    ASSERT_THROW(transaction.serializeToRaw(), std::logic_error);
-}
-
-} // namespace TW::Nebulas::tests
diff --git a/tests/Nervos/AddressTests.cpp b/tests/Nervos/AddressTests.cpp
deleted file mode 100644
index 15fb9cadfe0..00000000000
--- a/tests/Nervos/AddressTests.cpp
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HDWallet.h"
-#include "HexCoding.h"
-#include "Nervos/Address.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include <gtest/gtest.h>
-#include <vector>
-
-namespace TW::Nervos::tests {
-
-TEST(NervosAddress, Valid) {
-    ASSERT_TRUE(Address::isValid("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
-                                 "rg8furras980hksatlslfaktks7epf25"));
-    ASSERT_TRUE(Address::isValid("ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt6"));
-    ASSERT_TRUE(Address::isValid("ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3394p3wg6"
-                                 "p60qclvpfmaa582lu860dja5h0fk0v"));
-}
-
-TEST(NervosAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9"
-                                  "erg8furras980hksatlslfaktks7epf26"));
-    ASSERT_FALSE(Address::isValid("ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt7"));
-    ASSERT_FALSE(Address::isValid("ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3394p3wg"
-                                  "6p60qclvpfmaa582lu860dja5h0fk0w"));
-}
-
-TEST(NervosAddress, FromPrivateKey) {
-    auto privateKey =
-        PrivateKey(parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb"));
-    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    ASSERT_EQ(address.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
-                                "g8furras980hksatlslfaktks7epf25");
-}
-
-TEST(NervosAddress, FromPublicKey) {
-    auto publicKey =
-        PublicKey(parse_hex("026c9e4cbb95d4b3a123c1fc80795feacc38029683a1b3e16bccf49bba25fb2858"),
-                  TWPublicKeyTypeSECP256k1);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
-                                "g8furras980hksatlslfaktks7epf25");
-}
-
-TEST(NervosAddress, FromString) {
-    auto address1 = Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8fu"
-                            "rras980hksatlslfaktks7epf25");
-    ASSERT_EQ(address1.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
-                                 "rg8furras980hksatlslfaktks7epf25");
-    auto address2 = Address("ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt6");
-    ASSERT_EQ(address2.string(), "ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt6");
-    auto address3 = Address("ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3394p3wg6p60qc"
-                            "lvpfmaa582lu860dja5h0fk0v");
-    ASSERT_EQ(address3.string(), "ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3394p3wg6"
-                                 "p60qclvpfmaa582lu860dja5h0fk0v");
-}
-
-TEST(TWNervosAddress, AddressFromPublicKey) {
-    auto privateKey =
-        PrivateKey(parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb"));
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    ASSERT_EQ(publicKey.bytes.size(), 33ul);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
-                                "g8furras980hksatlslfaktks7epf25");
-}
-
-TEST(NervosAddress, AddressFromString) {
-    auto address = Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8fur"
-                           "ras980hksatlslfaktks7epf25");
-    ASSERT_EQ(address.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
-                                "g8furras980hksatlslfaktks7epf25");
-}
-
-TEST(NervosAddress, AddressFromWallet) {
-    auto hdWallet = HDWallet(
-        "alpha draw toss question picnic endless recycle wrong enable roast success palm", "");
-    auto addressString = hdWallet.deriveAddress(TWCoinTypeNervos);
-    ASSERT_EQ(addressString, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8f"
-                             "urras980hksatlslfaktks7epf25");
-}
-
-} // namespace TW::Nervos::tests
diff --git a/tests/Nervos/SignerTests.cpp b/tests/Nervos/SignerTests.cpp
deleted file mode 100644
index b7ea9e3645f..00000000000
--- a/tests/Nervos/SignerTests.cpp
+++ /dev/null
@@ -1,929 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Nervos/Address.h"
-#include "Nervos/Cell.h"
-#include "Nervos/Serialization.h"
-#include "Nervos/Signer.h"
-#include "Nervos/Transaction.h"
-#include "Nervos/TransactionPlan.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::Nervos::tests {
-
-std::vector<PrivateKey> getPrivateKeys(Proto::SigningInput& input) {
-    std::vector<PrivateKey> privateKeys;
-    privateKeys.reserve(input.private_key_size());
-    for (auto&& privateKey : input.private_key()) {
-        privateKeys.emplace_back(privateKey);
-    }
-    return privateKeys;
-}
-
-Proto::SigningInput getInput1() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_native_transfer();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
-                             "wectaumxn0664yw2jd53lqk4mxg3");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
-                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
-    operation.set_amount(10000000000);
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(100000000000);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"), 1)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(20000000000);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"), 0)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
-
-    return input;
-}
-
-void checkOutput1(Transaction& tx) {
-    // https://explorer.nervos.org/transaction/0xf2c32afde7e72011985583873bc16c0a3c01fc01fc161eb4b914fcf84c53cdf8
-    ASSERT_EQ(tx.hash(),
-              parse_hex("f2c32afde7e72011985583873bc16c0a3c01fc01fc161eb4b914fcf84c53cdf8"));
-
-    ASSERT_EQ(tx.cellDeps.size(), 1ul);
-
-    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
-              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
-    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
-
-    ASSERT_EQ(tx.headerDeps.size(), 0ul);
-
-    ASSERT_EQ(tx.inputs.size(), 1ul);
-
-    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
-              parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"));
-    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[0].since, 0ul);
-
-    ASSERT_EQ(tx.outputs.size(), 2ul);
-    ASSERT_EQ(tx.outputsData.size(), 2ul);
-
-    ASSERT_EQ(tx.outputs[0].capacity, 10000000000ul);
-    ASSERT_EQ(tx.outputs[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
-    ASSERT_EQ(tx.outputs[0].type.codeHash.size(), 0ul);
-    ASSERT_EQ(tx.outputs[0].type.args.size(), 0ul);
-    ASSERT_EQ(tx.outputsData[0].size(), 0ul);
-
-    ASSERT_EQ(tx.outputs[1].capacity, 9999999536ul);
-    ASSERT_EQ(tx.outputs[1].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
-    ASSERT_EQ(tx.outputs[1].type.codeHash.size(), 0ul);
-    ASSERT_EQ(tx.outputs[1].type.args.size(), 0ul);
-    ASSERT_EQ(tx.outputsData[1].size(), 0ul);
-
-    ASSERT_EQ(tx.serializedWitnesses.size(), 1ul);
-    ASSERT_EQ(
-        hex(tx.serializedWitnesses[0]),
-        "55000000100000005500000055000000410000002a9ef2ad7829e5ea0c7a32735d29a0cb2ec20434f6fd5bf6e2"
-        "9cda56b28e08140156191cbbf80313d3c9cae4b74607acce7b28eb21d52ef058ed8491cdde70b700");
-}
-
-void checkPlan1(TransactionPlan& txPlan) {
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-
-    ASSERT_EQ(txPlan.cellDeps.size(), 1ul);
-
-    ASSERT_EQ(txPlan.cellDeps[0].outPoint.txHash,
-              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
-    ASSERT_EQ(txPlan.cellDeps[0].outPoint.index, 0ul);
-    ASSERT_EQ(txPlan.cellDeps[0].depType, DepType::DepGroup);
-
-    ASSERT_EQ(txPlan.headerDeps.size(), 0ul);
-
-    ASSERT_EQ(txPlan.selectedCells.size(), 1ul);
-
-    ASSERT_EQ(txPlan.selectedCells[0].outPoint.txHash,
-              parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"));
-    ASSERT_EQ(txPlan.selectedCells[0].outPoint.index, 0ul);
-    ASSERT_EQ(txPlan.selectedCells[0].capacity, 20000000000ul);
-    ASSERT_EQ(txPlan.selectedCells[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(txPlan.selectedCells[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(txPlan.selectedCells[0].lock.args,
-              parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
-    ASSERT_EQ(txPlan.selectedCells[0].type.codeHash.size(), 0ul);
-    ASSERT_EQ(txPlan.selectedCells[0].type.args.size(), 0ul);
-    ASSERT_EQ(txPlan.selectedCells[0].data.size(), 0ul);
-
-    ASSERT_EQ(txPlan.outputs.size(), 2ul);
-    ASSERT_EQ(txPlan.outputsData.size(), 2ul);
-
-    ASSERT_EQ(txPlan.outputs[0].capacity, 10000000000ul);
-    ASSERT_EQ(txPlan.outputs[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(txPlan.outputs[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(txPlan.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
-    ASSERT_EQ(txPlan.outputs[0].type.codeHash.size(), 0ul);
-    ASSERT_EQ(txPlan.outputs[0].type.args.size(), 0ul);
-    ASSERT_EQ(txPlan.outputsData[0].size(), 0ul);
-
-    ASSERT_EQ(txPlan.outputs[1].capacity, 9999999536ul);
-    ASSERT_EQ(txPlan.outputs[1].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(txPlan.outputs[1].lock.hashType, HashType::Type1);
-    ASSERT_EQ(txPlan.outputs[1].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
-    ASSERT_EQ(txPlan.outputs[1].type.codeHash.size(), 0ul);
-    ASSERT_EQ(txPlan.outputs[1].type.args.size(), 0ul);
-    ASSERT_EQ(txPlan.outputsData[1].size(), 0ul);
-}
-
-TEST(NervosSigner, PlanAndSign_Native_Simple) {
-    auto input = getInput1();
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-    checkPlan1(txPlan);
-    Transaction tx;
-    tx.build(txPlan);
-    auto error = tx.sign(getPrivateKeys(input));
-    ASSERT_EQ(error, Common::Proto::SigningError::OK);
-    checkOutput1(tx);
-}
-
-TEST(NervosSigner, Sign_NegativeMissingKey) {
-    auto input = getInput1();
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-    Transaction tx;
-    tx.build(txPlan);
-    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61fec");
-    *input.mutable_private_key(0) = std::string(privateKey.begin(), privateKey.end());
-    auto error = tx.sign(getPrivateKeys(input));
-    ASSERT_EQ(error, Common::Proto::Error_missing_private_key);
-}
-
-TEST(NervosSigner, Sign_NegativeNotEnoughUtxos) {
-    auto input = getInput1();
-    auto& operation = *input.mutable_native_transfer();
-    operation.set_amount(1000000000000);
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::Error_not_enough_utxos);
-}
-
-Proto::SigningInput getInput2() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_native_transfer();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
-                             "wectaumxn0664yw2jd53lqk4mxg3");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
-                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
-    operation.set_use_max_amount(true);
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(11410040620);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("c75567c80dc9b97aaf4e5c23f4c7f37b077f2b33a50dd7abd952abfbd5beb247"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
-
-    return input;
-}
-
-TEST(NervosSigner, Sign_Native_SendMaximum) {
-    auto input = getInput2();
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-    Transaction tx;
-    tx.build(txPlan);
-    auto error = tx.sign(getPrivateKeys(input));
-
-    ASSERT_EQ(error, Common::Proto::SigningError::OK);
-
-    // https://explorer.nervos.org/transaction/0x298f5e04b6900796614b89062eb96cec63c3b2c460d01058736a793b567bc5c8
-    ASSERT_EQ(tx.hash(),
-              parse_hex("298f5e04b6900796614b89062eb96cec63c3b2c460d01058736a793b567bc5c8"));
-
-    ASSERT_EQ(tx.cellDeps.size(), 1ul);
-
-    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
-              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
-    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
-
-    ASSERT_EQ(tx.headerDeps.size(), 0ul);
-
-    ASSERT_EQ(tx.inputs.size(), 1ul);
-
-    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
-              parse_hex("c75567c80dc9b97aaf4e5c23f4c7f37b077f2b33a50dd7abd952abfbd5beb247"));
-    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[0].since, 0ul);
-
-    ASSERT_EQ(tx.outputs.size(), 1ul);
-    ASSERT_EQ(tx.outputsData.size(), 1ul);
-
-    ASSERT_EQ(tx.outputs[0].capacity, 11410040265ul);
-    ASSERT_EQ(tx.outputs[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
-    ASSERT_EQ(tx.outputs[0].type.codeHash.size(), 0ul);
-    ASSERT_EQ(tx.outputs[0].type.args.size(), 0ul);
-    ASSERT_EQ(tx.outputsData[0].size(), 0ul);
-
-    ASSERT_EQ(tx.serializedWitnesses.size(), 1ul);
-    ASSERT_EQ(
-        hex(tx.serializedWitnesses[0]),
-        "5500000010000000550000005500000041000000daf6e65e5a1fe447a4feb7199886b6635c44738e04ea594576"
-        "08fb1c447e068026529d57b02014ddc144622f886153df426853f22083f8891461eeb50b5ce97d01");
-}
-
-Proto::SigningInput getInput3() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_sudt_transfer();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
-                             "wectaumxn0664yw2jd53lqk4mxg3");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
-                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
-    uint256_t amount = 1000000000000000;
-    operation.set_amount(toString(amount));
-    input.set_byte_fee(1);
-    auto sudtAddress =
-        parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8");
-    *operation.mutable_sudt_address() = std::string(sudtAddress.begin(), sudtAddress.end());
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(14399998906);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("5b12911e7413e011f251c1fb5fae4e76fd5fcae4f0d4c6412dcc5b0bfcece823"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(14400000000);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("e118bd11a73d381daf288381ce182d92b6cf2f52d25886bbda9e1a61525c7c4a"), 0)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-    *cell2.mutable_type() =
-        Script(parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"),
-               HashType::Type1,
-               parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"))
-            .proto();
-    auto cell2Data = parse_hex("00e0e4c9b9f84f000000000000000000");
-    *cell2.mutable_data() = std::string(cell2Data.begin(), cell2Data.end());
-
-    auto& cell3 = *input.add_cell();
-    cell3.set_capacity(8210025567);
-    *cell3.mutable_out_point() =
-        OutPoint(parse_hex("09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a"), 1)
-            .proto();
-    *cell3.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqds6ed78yze6eyfyvd537z66ur22c9mmrgz82ama"))
-                                .proto();
-
-    auto privateKey1 =
-        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
-    auto privateKey2 =
-        parse_hex("0c8859a9d9084a8c2b55963268b352e258756f9240f2a1f4645c610ed191dae9");
-    input.add_private_key(std::string(privateKey2.begin(), privateKey2.end()));
-
-    return input;
-}
-
-TEST(NervosSigner, Sign_SUDT_Simple) {
-    auto input = getInput3();
-
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-    Transaction tx;
-    tx.build(txPlan);
-    auto error = tx.sign(getPrivateKeys(input));
-
-    ASSERT_EQ(error, Common::Proto::SigningError::OK);
-
-    // https://explorer.nervos.org/transaction/0x9b15f2bea26b98201540d8e20e8b1c21d96dd77ad246520b405c6aabb7173371
-    ASSERT_EQ(tx.hash(),
-              parse_hex("9b15f2bea26b98201540d8e20e8b1c21d96dd77ad246520b405c6aabb7173371"));
-
-    ASSERT_EQ(tx.cellDeps.size(), 2ul);
-
-    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
-              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
-    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
-
-    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
-              parse_hex("c7813f6a415144643970c2e88e0bb6ca6a8edc5dd7c1022746f628284a9936d5"));
-    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
-
-    ASSERT_EQ(tx.headerDeps.size(), 0ul);
-
-    ASSERT_EQ(tx.inputs.size(), 3ul);
-
-    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
-              parse_hex("e118bd11a73d381daf288381ce182d92b6cf2f52d25886bbda9e1a61525c7c4a"));
-    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[0].since, 0ul);
-
-    ASSERT_EQ(tx.inputs[1].previousOutput.txHash,
-              parse_hex("09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a"));
-    ASSERT_EQ(tx.inputs[1].previousOutput.index, 1ul);
-    ASSERT_EQ(tx.inputs[1].since, 0ul);
-
-    ASSERT_EQ(tx.inputs[2].previousOutput.txHash,
-              parse_hex("5b12911e7413e011f251c1fb5fae4e76fd5fcae4f0d4c6412dcc5b0bfcece823"));
-    ASSERT_EQ(tx.inputs[2].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[2].since, 0ul);
-
-    ASSERT_EQ(tx.outputs.size(), 3ul);
-    ASSERT_EQ(tx.outputsData.size(), 3ul);
-
-    ASSERT_EQ(tx.outputs[0].capacity, 14400000000ul);
-    ASSERT_EQ(tx.outputs[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
-    ASSERT_EQ(tx.outputs[0].type.codeHash,
-              parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"));
-    ASSERT_EQ(tx.outputs[0].type.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].type.args,
-              parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"));
-    ASSERT_EQ(hex(tx.outputsData[0]), "0080c6a47e8d03000000000000000000");
-
-    ASSERT_EQ(tx.outputs[1].capacity, 14400000000ul);
-    ASSERT_EQ(tx.outputs[1].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
-    ASSERT_EQ(tx.outputs[1].type.codeHash,
-              parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"));
-    ASSERT_EQ(tx.outputs[1].type.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[1].type.args,
-              parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"));
-    ASSERT_EQ(hex(tx.outputsData[1]), "00601e253b6b4c000000000000000000");
-
-    ASSERT_EQ(tx.outputs[2].capacity, 8210023387ul);
-    ASSERT_EQ(tx.outputs[2].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[2].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[2].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
-    ASSERT_EQ(tx.outputs[2].type.codeHash.size(), 0ul);
-    ASSERT_EQ(tx.outputs[2].type.args.size(), 0ul);
-    ASSERT_EQ(tx.outputsData[2].size(), 0ul);
-
-    ASSERT_EQ(tx.serializedWitnesses.size(), 3ul);
-    ASSERT_EQ(
-        hex(tx.serializedWitnesses[0]),
-        "550000001000000055000000550000004100000035d55fd46316f248552eb6af7ac9589c9ec533c4e5b71896b0"
-        "5cdf697e2d18551ceff54d7b860ebb2f4dd5f6c5bb4af1da15460a7621f5aa4bc7d5585a0504de00");
-    ASSERT_EQ(
-        hex(tx.serializedWitnesses[1]),
-        "5500000010000000550000005500000041000000eaa4bf69126d3016ab786610f2f0668b2ef353915d623d0b01"
-        "84fc25cec3dcad6dc08a1504a2d7dd9faced17b041d79d4c21f1977e57859713360f5e3609583501");
-    ASSERT_EQ(hex(tx.serializedWitnesses[2]), "");
-}
-
-Proto::SigningInput getInput4() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_sudt_transfer();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
-                             "wectaumxn0664yw2jd53lqk4mxg3");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
-                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
-    operation.set_use_max_amount(true);
-    input.set_byte_fee(1);
-    auto sudtAddress =
-        parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8");
-    *operation.mutable_sudt_address() = std::string(sudtAddress.begin(), sudtAddress.end());
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(8210026306);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("430cb60ee816e2631d6d9605659c18fec8eb3de94526f5fd4ad51feaad6f1664"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(14400000000);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("378b6bd2f7fc2b1599ee55be7e8fa17fdd6e0d25e2e146d5f46006e0292d6564"), 0)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-    *cell2.mutable_type() =
-        Script(parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"),
-               HashType::Type1,
-               parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"))
-            .proto();
-    auto cell2Data = parse_hex("00601e253b6b4c000000000000000000");
-    *cell2.mutable_data() = std::string(cell2Data.begin(), cell2Data.end());
-
-    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
-
-    return input;
-}
-
-TEST(NervosSigner, Sign_SUDT_SendMaximum) {
-    auto input = getInput4();
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-    Transaction tx;
-    tx.build(txPlan);
-    auto error = tx.sign(getPrivateKeys(input));
-
-    ASSERT_EQ(error, Common::Proto::SigningError::OK);
-
-    // https://explorer.nervos.org/transaction/0x09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a
-    ASSERT_EQ(tx.hash(),
-              parse_hex("09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a"));
-
-    ASSERT_EQ(tx.cellDeps.size(), 2ul);
-
-    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
-              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
-    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
-
-    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
-              parse_hex("c7813f6a415144643970c2e88e0bb6ca6a8edc5dd7c1022746f628284a9936d5"));
-    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
-
-    ASSERT_EQ(tx.headerDeps.size(), 0ul);
-
-    ASSERT_EQ(tx.inputs.size(), 2ul);
-
-    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
-              parse_hex("378b6bd2f7fc2b1599ee55be7e8fa17fdd6e0d25e2e146d5f46006e0292d6564"));
-    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[0].since, 0ul);
-
-    ASSERT_EQ(tx.inputs[1].previousOutput.txHash,
-              parse_hex("430cb60ee816e2631d6d9605659c18fec8eb3de94526f5fd4ad51feaad6f1664"));
-    ASSERT_EQ(tx.inputs[1].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[1].since, 0ul);
-
-    ASSERT_EQ(tx.outputs.size(), 2ul);
-    ASSERT_EQ(tx.outputsData.size(), 2ul);
-
-    ASSERT_EQ(tx.outputs[0].capacity, 14400000000ul);
-    ASSERT_EQ(tx.outputs[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
-    ASSERT_EQ(tx.outputs[0].type.codeHash,
-              parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"));
-    ASSERT_EQ(tx.outputs[0].type.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].type.args,
-              parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"));
-    ASSERT_EQ(hex(tx.outputsData[0]), "00601e253b6b4c000000000000000000");
-
-    ASSERT_EQ(tx.outputs[1].capacity, 8210025567ul);
-    ASSERT_EQ(tx.outputs[1].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
-    ASSERT_EQ(tx.outputs[1].type.codeHash.size(), 0ul);
-    ASSERT_EQ(tx.outputs[1].type.args.size(), 0ul);
-    ASSERT_EQ(tx.outputsData[1].size(), 0ul);
-
-    ASSERT_EQ(tx.serializedWitnesses.size(), 2ul);
-    ASSERT_EQ(
-        hex(tx.serializedWitnesses[0]),
-        "5500000010000000550000005500000041000000da7c908bdf2cb091b7ff9bb682b762d1323c5e1ecf9b2ce0eb"
-        "edb9d55f6625c52ab14910ae401833112f2ea516ab11bc9ef691c3dff7886e3238c9348c3d73a701");
-    ASSERT_EQ(hex(tx.serializedWitnesses[1]), "");
-}
-
-Proto::SigningInput getInput5() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_dao_deposit();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8f"
-                             "urras980hksatlslfaktks7epf25");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
-                                 "rg8furras980hksatlslfaktks7epf25");
-
-    operation.set_amount(10200000000);
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(8210021909);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("c7dacd4aab49f5f9643e87752428cebde38eeb49c7726781c4d8b526822004a1"), 1)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqds6ed78yze6eyfyvd537z66ur22c9mmrgz82ama"))
-                                .proto();
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(14399998167);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("d3c3263170815b326779e2fd8d548f846ae13eff9d9a82833c7071069a1d32bf"), 0)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto privateKey1 =
-        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
-    auto privateKey2 =
-        parse_hex("0c8859a9d9084a8c2b55963268b352e258756f9240f2a1f4645c610ed191dae9");
-    input.add_private_key(std::string(privateKey2.begin(), privateKey2.end()));
-
-    return input;
-}
-
-TEST(NervosSigner, Sign_DAO_Deposit) {
-    auto input = getInput5();
-
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-    Transaction tx;
-    tx.build(txPlan);
-    auto error = tx.sign(getPrivateKeys(input));
-
-    ASSERT_EQ(error, Common::Proto::SigningError::OK);
-
-    // https://explorer.nervos.org/transaction/0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683
-    ASSERT_EQ(tx.hash(),
-              parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"));
-
-    ASSERT_EQ(tx.cellDeps.size(), 2ul);
-
-    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
-              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
-    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
-
-    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
-              parse_hex("e2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c"));
-    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 2ul);
-    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
-
-    ASSERT_EQ(tx.headerDeps.size(), 0ul);
-
-    ASSERT_EQ(tx.inputs.size(), 2ul);
-
-    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
-              parse_hex("c7dacd4aab49f5f9643e87752428cebde38eeb49c7726781c4d8b526822004a1"));
-    ASSERT_EQ(tx.inputs[0].previousOutput.index, 1ul);
-    ASSERT_EQ(tx.inputs[0].since, 0ul);
-
-    ASSERT_EQ(tx.inputs[1].previousOutput.txHash,
-              parse_hex("d3c3263170815b326779e2fd8d548f846ae13eff9d9a82833c7071069a1d32bf"));
-    ASSERT_EQ(tx.inputs[1].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[1].since, 0ul);
-
-    ASSERT_EQ(tx.outputs.size(), 2ul);
-    ASSERT_EQ(tx.outputsData.size(), 2ul);
-
-    ASSERT_EQ(tx.outputs[0].capacity, 10200000000ul);
-    ASSERT_EQ(tx.outputs[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
-    ASSERT_EQ(tx.outputs[0].type.codeHash,
-              parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"));
-    ASSERT_EQ(tx.outputs[0].type.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].type.args, parse_hex(""));
-    ASSERT_EQ(hex(tx.outputsData[0]), "0000000000000000");
-
-    ASSERT_EQ(tx.outputs[1].capacity, 12410019377ul);
-    ASSERT_EQ(tx.outputs[1].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
-    ASSERT_EQ(tx.outputs[1].type.codeHash.size(), 0ul);
-    ASSERT_EQ(tx.outputs[1].type.args.size(), 0ul);
-    ASSERT_EQ(tx.outputsData[1].size(), 0ul);
-
-    ASSERT_EQ(tx.serializedWitnesses.size(), 2ul);
-    ASSERT_EQ(
-        hex(tx.serializedWitnesses[0]),
-        "5500000010000000550000005500000041000000305d09c7de3f34a4d53bc4e0031ee59c95b9abc4fc3ff5548e"
-        "1a17ca726c069a232012c9c4be6ec4d4ffbe88613ca5e686e3e4b7d0b9bbd7038003e23ffdcdd601");
-    ASSERT_EQ(
-        hex(tx.serializedWitnesses[1]),
-        "55000000100000005500000055000000410000007c514c77482dd1e1086f41a6d17364c9b5ed16364d61df6f7f"
-        "d8540f8bf7c131275c877943786b1b72fbf4f9d817ee5dd554a689808b7919543c691b5068e5be01");
-}
-
-Proto::SigningInput getInput6() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_dao_withdraw_phase1();
-
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
-                                 "rg8furras980hksatlslfaktks7epf25");
-    auto& depositCell = *operation.mutable_deposit_cell();
-    depositCell.set_capacity(10200000000);
-    *depositCell.mutable_out_point() =
-        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
-            .proto();
-    *depositCell.mutable_lock() =
-        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
-                       "80hksatlslfaktks7epf25"))
-            .proto();
-    *depositCell.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto depositCellData = parse_hex("0000000000000000");
-    *depositCell.mutable_data() = std::string(depositCellData.begin(), depositCellData.end());
-    depositCell.set_block_number(7575466);
-    auto blockHashData =
-        parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a");
-    *depositCell.mutable_block_hash() = std::string(blockHashData.begin(), blockHashData.end());
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(10200000000);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-    *cell1.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto cell1Data = parse_hex("0000000000000000");
-    *cell1.mutable_data() = std::string(cell1Data.begin(), cell1Data.end());
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(12410019377);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 1)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto privateKey1 =
-        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
-
-    return input;
-}
-
-TEST(NervosSigner, Sign_DAO_Withdraw_Phase1) {
-    auto input = getInput6();
-
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-    Transaction tx;
-    tx.build(txPlan);
-    auto error = tx.sign(getPrivateKeys(input));
-
-    ASSERT_EQ(error, Common::Proto::SigningError::OK);
-
-    // https://explorer.nervos.org/transaction/0xb4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca
-    ASSERT_EQ(tx.hash(),
-              parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"));
-
-    ASSERT_EQ(tx.cellDeps.size(), 2ul);
-
-    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
-              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
-    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
-
-    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
-              parse_hex("e2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c"));
-    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 2ul);
-    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
-
-    ASSERT_EQ(tx.headerDeps.size(), 1ul);
-    ASSERT_EQ(tx.headerDeps[0],
-              parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a"));
-
-    ASSERT_EQ(tx.inputs.size(), 2ul);
-
-    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
-              parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"));
-    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[0].since, 0ul);
-
-    ASSERT_EQ(tx.inputs[1].previousOutput.txHash,
-              parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"));
-    ASSERT_EQ(tx.inputs[1].previousOutput.index, 1ul);
-    ASSERT_EQ(tx.inputs[1].since, 0ul);
-
-    ASSERT_EQ(tx.outputs.size(), 2ul);
-    ASSERT_EQ(tx.outputsData.size(), 2ul);
-
-    ASSERT_EQ(tx.outputs[0].capacity, 10200000000ul);
-    ASSERT_EQ(tx.outputs[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
-    ASSERT_EQ(tx.outputs[0].type.codeHash,
-              parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"));
-    ASSERT_EQ(tx.outputs[0].type.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].type.args, parse_hex(""));
-    ASSERT_EQ(hex(tx.outputsData[0]), "aa97730000000000");
-
-    ASSERT_EQ(tx.outputs[1].capacity, 12410018646ul);
-    ASSERT_EQ(tx.outputs[1].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
-    ASSERT_EQ(tx.outputs[1].type.codeHash.size(), 0ul);
-    ASSERT_EQ(tx.outputs[1].type.args.size(), 0ul);
-    ASSERT_EQ(tx.outputsData[1].size(), 0ul);
-
-    ASSERT_EQ(tx.serializedWitnesses.size(), 2ul);
-    ASSERT_EQ(
-        hex(tx.serializedWitnesses[0]),
-        "5500000010000000550000005500000041000000d5131c1a6b8eca11e2c280b72c5db09ea00bb788fd3262eace"
-        "d861c39db2aad04a36f9d174b6f167a9c98b85d2bccf537a163c44459d23467dfa86408f48dd5f01");
-    ASSERT_EQ(tx.serializedWitnesses[1].size(), 0ul);
-}
-
-Proto::SigningInput getInput7() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_dao_withdraw_phase2();
-
-    auto& depositCell = *operation.mutable_deposit_cell();
-    depositCell.set_capacity(10200000000);
-    *depositCell.mutable_out_point() =
-        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
-            .proto();
-    *depositCell.mutable_lock() =
-        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
-                       "80hksatlslfaktks7epf25"))
-            .proto();
-    *depositCell.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto depositCellData = parse_hex("0000000000000000");
-    *depositCell.mutable_data() = std::string(depositCellData.begin(), depositCellData.end());
-    depositCell.set_block_number(7575466);
-    auto blockHashData1 =
-        parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a");
-    *depositCell.mutable_block_hash() = std::string(blockHashData1.begin(), blockHashData1.end());
-
-    auto& withdrawingCell = *operation.mutable_withdrawing_cell();
-    withdrawingCell.set_capacity(10200000000);
-    *withdrawingCell.mutable_out_point() =
-        OutPoint(parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"), 0)
-            .proto();
-    *withdrawingCell.mutable_lock() =
-        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
-                       "80hksatlslfaktks7epf25"))
-            .proto();
-    *withdrawingCell.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto withdrawingCellData = parse_hex("aa97730000000000");
-    *withdrawingCell.mutable_data() =
-        std::string(withdrawingCellData.begin(), withdrawingCellData.end());
-    withdrawingCell.set_block_number(7575534);
-    auto blockHashData2 =
-        parse_hex("b070d5364afd47c23fe267077d454009d6f665f200a915e68af1616e46f4aa52");
-    *withdrawingCell.mutable_block_hash() =
-        std::string(blockHashData2.begin(), blockHashData2.end());
-    withdrawingCell.set_since(0x20037c0000001731);
-
-    operation.set_amount(10200000000);
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(10200000000);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-    *cell1.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto cell1Data = parse_hex("aa97730000000000");
-    *cell1.mutable_data() = std::string(cell1Data.begin(), cell1Data.end());
-
-    auto privateKey1 =
-        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
-
-    return input;
-}
-
-TEST(NervosSigner, Sign_DAO_Withdraw_Phase2) {
-    auto input = getInput7();
-
-    TransactionPlan txPlan;
-    txPlan.plan(input);
-    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
-    Transaction tx;
-    tx.build(txPlan);
-    auto error = tx.sign(getPrivateKeys(input));
-
-    ASSERT_EQ(error, Common::Proto::SigningError::OK);
-
-    ASSERT_EQ(tx.hash(),
-              parse_hex("4fde13c93fc5d24ab7f660070aaa0b1725809d585f6258605e595cdbd856ea1c"));
-
-    ASSERT_EQ(tx.cellDeps.size(), 2ul);
-
-    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
-              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
-    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
-    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
-
-    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
-              parse_hex("e2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c"));
-    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 2ul);
-    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
-
-    ASSERT_EQ(tx.headerDeps.size(), 2ul);
-    ASSERT_EQ(tx.headerDeps[0],
-              parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a"));
-    ASSERT_EQ(tx.headerDeps[1],
-              parse_hex("b070d5364afd47c23fe267077d454009d6f665f200a915e68af1616e46f4aa52"));
-
-    ASSERT_EQ(tx.inputs.size(), 1ul);
-
-    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
-              parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"));
-    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
-    ASSERT_EQ(tx.inputs[0].since, 0x20037c0000001731ul);
-
-    ASSERT_EQ(tx.outputs.size(), 1ul);
-    ASSERT_EQ(tx.outputsData.size(), 1ul);
-
-    ASSERT_EQ(tx.outputs[0].capacity, 10199999532ul);
-    ASSERT_EQ(tx.outputs[0].lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
-    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
-    ASSERT_EQ(tx.outputs[0].type.codeHash.size(), 0ul);
-    ASSERT_EQ(tx.outputs[0].type.args.size(), 0ul);
-    ASSERT_EQ(tx.outputsData[0].size(), 0ul);
-
-    ASSERT_EQ(tx.serializedWitnesses.size(), 1ul);
-    ASSERT_EQ(hex(tx.serializedWitnesses[0]),
-              "6100000010000000550000006100000041000000743f86c5557f4e2d3327f4d17e7bad27209b29c1e9cd"
-              "bab42ab03f7094af917b4b203ddd7f2e87102e09ae579f2fe7f6adb7900b7386b58c1183ba0011b7c421"
-              "00080000000000000000000000");
-}
-
-} // namespace TW::Nervos::tests
diff --git a/tests/Nervos/TWAnyAddressTests.cpp b/tests/Nervos/TWAnyAddressTests.cpp
deleted file mode 100644
index c948853f3ec..00000000000
--- a/tests/Nervos/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "PrivateKey.h"
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWAnySigner.h>
-#include <TrustWalletCore/TWData.h>
-#include <TrustWalletCore/TWHDWallet.h>
-#include <TrustWalletCore/TWPrivateKey.h>
-#include <TrustWalletCore/TWPublicKey.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(TWAnyAddressNervos, AddressFromPublicKey) {
-    auto privateKey =
-        WRAP(TWPrivateKey,
-             TWPrivateKeyCreateWithData(
-                 DATA("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb").get()));
-    ASSERT_NE(nullptr, privateKey.get());
-    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
-    ASSERT_NE(nullptr, publicKey.get());
-    ASSERT_EQ(33ul, publicKey.get()->impl.bytes.size());
-    auto address =
-        WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeNervos));
-    auto addressString = WRAPS(TWAnyAddressDescription(address.get()));
-    assertStringsEqual(addressString, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwy"
-                                      "k5x9erg8furras980hksatlslfaktks7epf25");
-}
-
-TEST(TWAnyAddressNervos, AddressFromString) {
-    auto address =
-        WRAP(TWAnyAddress,
-             TWAnyAddressCreateWithString(STRING("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthy"
-                                                 "waa50xwsqwyk5x9erg8furras980hksatlslfaktks7epf25")
-                                              .get(),
-                                          TWCoinTypeNervos));
-    ASSERT_NE(nullptr, address.get());
-    auto addressString = WRAPS(TWAnyAddressDescription(address.get()));
-    assertStringsEqual(addressString, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwy"
-                                      "k5x9erg8furras980hksatlslfaktks7epf25");
-}
-
-TEST(TWAnyAddressNervos, AddressFromWallet) {
-    auto wallet = WRAP(
-        TWHDWallet,
-        TWHDWalletCreateWithMnemonic(
-            STRING(
-                "alpha draw toss question picnic endless recycle wrong enable roast success palm")
-                .get(),
-            STRING("").get()));
-    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKeyForCoin(wallet.get(), TWCoinTypeNervos));
-    auto privateKeyData = WRAPD(TWPrivateKeyData(privateKey.get()));
-    EXPECT_EQ(TWDataSize(privateKeyData.get()), 32ul);
-
-    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
-    auto publicKeyData = WRAPD(TWPublicKeyData(publicKey.get()));
-    EXPECT_EQ(TWDataSize(publicKeyData.get()), 33ul);
-    assertHexEqual(publicKeyData,
-                   "026c9e4cbb95d4b3a123c1fc80795feacc38029683a1b3e16bccf49bba25fb2858");
-
-    auto address = WRAPS(TWCoinTypeDeriveAddress(TWCoinTypeNervos, privateKey.get()));
-    assertStringsEqual(address, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
-                                "g8furras980hksatlslfaktks7epf25");
-}
diff --git a/tests/Nervos/TWAnySignerTests.cpp b/tests/Nervos/TWAnySignerTests.cpp
deleted file mode 100644
index 79a4b91079c..00000000000
--- a/tests/Nervos/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,665 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Nervos/Address.h"
-#include "Nervos/Serialization.h"
-#include "Nervos/TransactionPlan.h"
-#include "PublicKey.h"
-#include "proto/Nervos.pb.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::Nervos::tests {
-
-Proto::SigningInput getAnySignerInput1() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_native_transfer();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
-                             "wectaumxn0664yw2jd53lqk4mxg3");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
-                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
-    operation.set_amount(10000000000);
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(100000000000);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"), 1)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(20000000000);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"), 0)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
-
-    return input;
-}
-
-void checkAnySignerOutput1(Proto::SigningOutput& output) {
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    // https://explorer.nervos.org/transaction/0xf2c32afde7e72011985583873bc16c0a3c01fc01fc161eb4b914fcf84c53cdf8
-    ASSERT_EQ(output.transaction_id(),
-              "0xf2c32afde7e72011985583873bc16c0a3c01fc01fc161eb4b914fcf84c53cdf8");
-    ASSERT_EQ(
-        output.transaction_json(),
-        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}}],\"header_deps\":"
-        "[],\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0x71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3\"},\"since\":\"0x0\"}"
-        "],\"outputs\":[{\"capacity\":\"0x2540be400\",\"lock\":{\"args\":"
-        "\"0xab201f55b02f53b385f79b34dfad548e549b48fc\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":null},{\"capacity\":\"0x2540be230\",\"lock\":{\"args\":"
-        "\"0xb0d65be39059d6489231b48f85ad706a560bbd8d\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x\",\"0x\"],\"version\":\"0x0\","
-        "\"witnesses\":["
-        "\"0x55000000100000005500000055000000410000002a9ef2ad7829e5ea0c7a32735d29a0cb2ec20434f6fd5b"
-        "f6e29cda56b28e08140156191cbbf80313d3c9cae4b74607acce7b28eb21d52ef058ed8491cdde70b700\"]}");
-}
-
-void checkPlan1(Proto::TransactionPlan& txPlanProto) {
-    ASSERT_EQ(txPlanProto.error(), Common::Proto::OK);
-
-    ASSERT_EQ(txPlanProto.cell_deps_size(), 1);
-
-    const auto cellDep1 = txPlanProto.cell_deps(0);
-    const auto cellDep1TxHash =
-        parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c");
-    ASSERT_EQ(cellDep1.out_point().tx_hash(),
-              std::string(cellDep1TxHash.begin(), cellDep1TxHash.end()));
-    ASSERT_EQ(cellDep1.out_point().index(), 0ul);
-    ASSERT_EQ(cellDep1.dep_type(), "dep_group");
-
-    ASSERT_EQ(txPlanProto.header_deps_size(), 0);
-
-    ASSERT_EQ(txPlanProto.selected_cells_size(), 1);
-
-    auto cell1 = Cell(txPlanProto.selected_cells(0));
-    ASSERT_EQ(cell1.outPoint.txHash,
-              parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"));
-    ASSERT_EQ(cell1.outPoint.index, 0ul);
-    ASSERT_EQ(cell1.capacity, 20000000000ul);
-    ASSERT_EQ(cell1.lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(cell1.lock.hashType, HashType::Type1);
-    ASSERT_EQ(cell1.lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
-    ASSERT_EQ(cell1.type.codeHash.size(), 0ul);
-    ASSERT_EQ(cell1.type.args.size(), 0ul);
-    ASSERT_EQ(cell1.data.size(), 0ul);
-
-    ASSERT_EQ(txPlanProto.outputs_size(), 2);
-    ASSERT_EQ(txPlanProto.outputs_data_size(), 2);
-
-    auto cellOutput1 = CellOutput(txPlanProto.outputs(0));
-    ASSERT_EQ(cellOutput1.capacity, 10000000000ul);
-    ASSERT_EQ(cellOutput1.lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(cellOutput1.lock.hashType, HashType::Type1);
-    ASSERT_EQ(cellOutput1.lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
-    ASSERT_EQ(cellOutput1.type.codeHash.size(), 0ul);
-    ASSERT_EQ(cellOutput1.type.args.size(), 0ul);
-    ASSERT_EQ(txPlanProto.outputs_data(0).length(), 0ul);
-
-    auto cellOutput2 = CellOutput(txPlanProto.outputs(1));
-    ASSERT_EQ(cellOutput2.capacity, 9999999536ul);
-    ASSERT_EQ(cellOutput2.lock.codeHash,
-              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
-    ASSERT_EQ(cellOutput2.lock.hashType, HashType::Type1);
-    ASSERT_EQ(cellOutput2.lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
-    ASSERT_EQ(cellOutput2.type.codeHash.size(), 0ul);
-    ASSERT_EQ(cellOutput2.type.args.size(), 0ul);
-    ASSERT_EQ(txPlanProto.outputs_data(1).length(), 0ul);
-}
-
-TEST(TWAnySignerNervos, Sign_Native_Simple) {
-    auto input = getAnySignerInput1();
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNervos);
-    checkAnySignerOutput1(output);
-}
-
-TEST(TWAnySignerNervos, PlanAndSign_Native_Simple) {
-    auto input = getAnySignerInput1();
-    Proto::TransactionPlan txPlanProto;
-    ANY_PLAN(input, txPlanProto, TWCoinTypeNervos);
-    checkPlan1(txPlanProto);
-    *input.mutable_plan() = txPlanProto;
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNervos);
-    checkAnySignerOutput1(output);
-}
-
-TEST(TWAnySignerNervos, Sign_NegativeMissingKey) {
-    auto input = getAnySignerInput1();
-    input.clear_private_key();
-    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61fec");
-    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
-    Proto::SigningOutput output;
-
-    ANY_SIGN(input, TWCoinTypeNervos);
-
-    ASSERT_EQ(output.error(), Common::Proto::Error_missing_private_key);
-}
-
-TEST(TWAnySignerNervos, Sign_NegativeNotEnoughUtxos) {
-    auto input = getAnySignerInput1();
-    auto& operation = *input.mutable_native_transfer();
-    operation.set_amount(1000000000000);
-    Proto::SigningOutput output;
-
-    ANY_SIGN(input, TWCoinTypeNervos);
-
-    ASSERT_EQ(output.error(), Common::Proto::Error_not_enough_utxos);
-}
-
-Proto::SigningInput getAnySignerInput2() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_native_transfer();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
-                             "wectaumxn0664yw2jd53lqk4mxg3");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
-                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
-    operation.set_use_max_amount(true);
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(11410040620);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("c75567c80dc9b97aaf4e5c23f4c7f37b077f2b33a50dd7abd952abfbd5beb247"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
-
-    return input;
-}
-
-TEST(TWAnySignerNervos, Sign_Native_SendMaximum) {
-    auto input = getAnySignerInput2();
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNervos);
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    // https://explorer.nervos.org/transaction/0x298f5e04b6900796614b89062eb96cec63c3b2c460d01058736a793b567bc5c8
-    ASSERT_EQ(output.transaction_id(),
-              "0x298f5e04b6900796614b89062eb96cec63c3b2c460d01058736a793b567bc5c8");
-    ASSERT_EQ(
-        output.transaction_json(),
-        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}}],\"header_deps\":"
-        "[],\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0xc75567c80dc9b97aaf4e5c23f4c7f37b077f2b33a50dd7abd952abfbd5beb247\"},\"since\":\"0x0\"}"
-        "],\"outputs\":[{\"capacity\":\"0x2a81765c9\",\"lock\":{\"args\":"
-        "\"0xab201f55b02f53b385f79b34dfad548e549b48fc\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x\"],\"version\":\"0x0\",\"witnesses\":["
-        "\"0x5500000010000000550000005500000041000000daf6e65e5a1fe447a4feb7199886b6635c44738e04ea59"
-        "457608fb1c447e068026529d57b02014ddc144622f886153df426853f22083f8891461eeb50b5ce97d01\"]}");
-}
-
-Proto::SigningInput getAnySignerInput3() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_sudt_transfer();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
-                             "wectaumxn0664yw2jd53lqk4mxg3");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
-                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
-    uint256_t amount = 1000000000000000;
-    operation.set_amount(toString(amount));
-    input.set_byte_fee(1);
-    auto sudtAddress =
-        parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8");
-    *operation.mutable_sudt_address() = std::string(sudtAddress.begin(), sudtAddress.end());
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(14399998906);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("5b12911e7413e011f251c1fb5fae4e76fd5fcae4f0d4c6412dcc5b0bfcece823"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(14400000000);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("e118bd11a73d381daf288381ce182d92b6cf2f52d25886bbda9e1a61525c7c4a"), 0)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-    *cell2.mutable_type() =
-        Script(parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"),
-               HashType::Type1,
-               parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"))
-            .proto();
-    auto cell2Data = parse_hex("00e0e4c9b9f84f000000000000000000");
-    *cell2.mutable_data() = std::string(cell2Data.begin(), cell2Data.end());
-
-    auto& cell3 = *input.add_cell();
-    cell3.set_capacity(8210025567);
-    *cell3.mutable_out_point() =
-        OutPoint(parse_hex("09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a"), 1)
-            .proto();
-    *cell3.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqds6ed78yze6eyfyvd537z66ur22c9mmrgz82ama"))
-                                .proto();
-
-    auto privateKey1 =
-        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
-    auto privateKey2 =
-        parse_hex("0c8859a9d9084a8c2b55963268b352e258756f9240f2a1f4645c610ed191dae9");
-    input.add_private_key(std::string(privateKey2.begin(), privateKey2.end()));
-
-    return input;
-}
-
-TEST(TWAnySignerNervos, Sign_SUDT_Simple) {
-    auto input = getAnySignerInput3();
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNervos);
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    // https://explorer.nervos.org/transaction/0x9b15f2bea26b98201540d8e20e8b1c21d96dd77ad246520b405c6aabb7173371
-    ASSERT_EQ(output.transaction_id(),
-              "0x9b15f2bea26b98201540d8e20e8b1c21d96dd77ad246520b405c6aabb7173371");
-    ASSERT_EQ(
-        output.transaction_json(),
-        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{\"dep_type\":"
-        "\"code\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0xc7813f6a415144643970c2e88e0bb6ca6a8edc5dd7c1022746f628284a9936d5\"}}],\"header_deps\":"
-        "[],\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0xe118bd11a73d381daf288381ce182d92b6cf2f52d25886bbda9e1a61525c7c4a\"},\"since\":\"0x0\"}"
-        ",{\"previous_output\":{\"index\":\"0x1\",\"tx_hash\":"
-        "\"0x09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a\"},\"since\":\"0x0\"}"
-        ",{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0x5b12911e7413e011f251c1fb5fae4e76fd5fcae4f0d4c6412dcc5b0bfcece823\"},\"since\":\"0x0\"}"
-        "],\"outputs\":[{\"capacity\":\"0x35a4e9000\",\"lock\":{\"args\":"
-        "\"0xab201f55b02f53b385f79b34dfad548e549b48fc\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":{\"args\":"
-        "\"0x9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8\",\"code_hash\":"
-        "\"0x5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5\",\"hash_type\":"
-        "\"type\"}},{\"capacity\":\"0x35a4e9000\",\"lock\":{\"args\":"
-        "\"0xb0d65be39059d6489231b48f85ad706a560bbd8d\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":{\"args\":"
-        "\"0x9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8\",\"code_hash\":"
-        "\"0x5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5\",\"hash_type\":"
-        "\"type\"}},{\"capacity\":\"0x1e95b03db\",\"lock\":{\"args\":"
-        "\"0xb0d65be39059d6489231b48f85ad706a560bbd8d\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x0080c6a47e8d03000000000000000000\","
-        "\"0x00601e253b6b4c000000000000000000\",\"0x\"],\"version\":\"0x0\",\"witnesses\":["
-        "\"0x550000001000000055000000550000004100000035d55fd46316f248552eb6af7ac9589c9ec533c4e5b718"
-        "96b05cdf697e2d18551ceff54d7b860ebb2f4dd5f6c5bb4af1da15460a7621f5aa4bc7d5585a0504de00\","
-        "\"0x5500000010000000550000005500000041000000eaa4bf69126d3016ab786610f2f0668b2ef353915d623d"
-        "0b0184fc25cec3dcad6dc08a1504a2d7dd9faced17b041d79d4c21f1977e57859713360f5e3609583501\","
-        "\"0x\"]}");
-}
-
-Proto::SigningInput getAnySignerInput4() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_sudt_transfer();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
-                             "wectaumxn0664yw2jd53lqk4mxg3");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
-                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
-    operation.set_use_max_amount(true);
-    input.set_byte_fee(1);
-    auto sudtAddress =
-        parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8");
-    *operation.mutable_sudt_address() = std::string(sudtAddress.begin(), sudtAddress.end());
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(8210026306);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("430cb60ee816e2631d6d9605659c18fec8eb3de94526f5fd4ad51feaad6f1664"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(14400000000);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("378b6bd2f7fc2b1599ee55be7e8fa17fdd6e0d25e2e146d5f46006e0292d6564"), 0)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-    *cell2.mutable_type() =
-        Script(parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"),
-               HashType::Type1,
-               parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"))
-            .proto();
-    auto cell2Data = parse_hex("00601e253b6b4c000000000000000000");
-    *cell2.mutable_data() = std::string(cell2Data.begin(), cell2Data.end());
-
-    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
-
-    return input;
-}
-
-TEST(TWAnySignerNervos, Sign_SUDT_SendMaximum) {
-    auto input = getAnySignerInput4();
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNervos);
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    // https://explorer.nervos.org/transaction/0x09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a
-    ASSERT_EQ(output.transaction_id(),
-              "0x09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a");
-    ASSERT_EQ(output.transaction_json(),
-              "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_"
-              "hash\":\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{"
-              "\"dep_type\":\"code\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
-              "\"0xc7813f6a415144643970c2e88e0bb6ca6a8edc5dd7c1022746f628284a9936d5\"}}],\"header_"
-              "deps\":[],\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-              "\"0x378b6bd2f7fc2b1599ee55be7e8fa17fdd6e0d25e2e146d5f46006e0292d6564\"},\"since\":"
-              "\"0x0\"},{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-              "\"0x430cb60ee816e2631d6d9605659c18fec8eb3de94526f5fd4ad51feaad6f1664\"},\"since\":"
-              "\"0x0\"}],\"outputs\":[{\"capacity\":\"0x35a4e9000\",\"lock\":{\"args\":"
-              "\"0xab201f55b02f53b385f79b34dfad548e549b48fc\",\"code_hash\":"
-              "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_"
-              "type\":\"type\"},\"type\":{\"args\":"
-              "\"0x9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8\",\"code_"
-              "hash\":\"0x5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5\","
-              "\"hash_type\":\"type\"}},{\"capacity\":\"0x1e95b0c5f\",\"lock\":{\"args\":"
-              "\"0xb0d65be39059d6489231b48f85ad706a560bbd8d\",\"code_hash\":"
-              "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_"
-              "type\":\"type\"},\"type\":null}],\"outputs_data\":["
-              "\"0x00601e253b6b4c000000000000000000\",\"0x\"],\"version\":\"0x0\",\"witnesses\":["
-              "\"0x5500000010000000550000005500000041000000da7c908bdf2cb091b7ff9bb682b762d1323c5e1e"
-              "cf9b2ce0ebedb9d55f6625c52ab14910ae401833112f2ea516ab11bc9ef691c3dff7886e3238c9348c3d"
-              "73a701\",\"0x\"]}");
-}
-
-Proto::SigningInput getAnySignerInput5() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_dao_deposit();
-
-    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8f"
-                             "urras980hksatlslfaktks7epf25");
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
-                                 "rg8furras980hksatlslfaktks7epf25");
-    operation.set_amount(10200000000);
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(8210021909);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("c7dacd4aab49f5f9643e87752428cebde38eeb49c7726781c4d8b526822004a1"), 1)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqds6ed78yze6eyfyvd537z66ur22c9mmrgz82ama"))
-                                .proto();
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(14399998167);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("d3c3263170815b326779e2fd8d548f846ae13eff9d9a82833c7071069a1d32bf"), 0)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto privateKey1 =
-        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
-    auto privateKey2 =
-        parse_hex("0c8859a9d9084a8c2b55963268b352e258756f9240f2a1f4645c610ed191dae9");
-    input.add_private_key(std::string(privateKey2.begin(), privateKey2.end()));
-
-    return input;
-}
-
-TEST(TWAnySignerNervos, Sign_DAO_Deposit) {
-    auto input = getAnySignerInput5();
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNervos);
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    // https://explorer.nervos.org/transaction/0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683
-    ASSERT_EQ(output.transaction_id(),
-              "0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683");
-    ASSERT_EQ(
-        output.transaction_json(),
-        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{\"dep_type\":"
-        "\"code\",\"out_point\":{\"index\":\"0x2\",\"tx_hash\":"
-        "\"0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c\"}}],\"header_deps\":"
-        "[],\"inputs\":[{\"previous_output\":{\"index\":\"0x1\",\"tx_hash\":"
-        "\"0xc7dacd4aab49f5f9643e87752428cebde38eeb49c7726781c4d8b526822004a1\"},\"since\":\"0x0\"}"
-        ",{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0xd3c3263170815b326779e2fd8d548f846ae13eff9d9a82833c7071069a1d32bf\"},\"since\":\"0x0\"}"
-        "],\"outputs\":[{\"capacity\":\"0x25ff7a600\",\"lock\":{\"args\":"
-        "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":{\"args\":\"0x\",\"code_hash\":"
-        "\"0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e\",\"hash_type\":"
-        "\"type\"}},{\"capacity\":\"0x2e3b1de31\",\"lock\":{\"args\":"
-        "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x0000000000000000\",\"0x\"],\"version\":"
-        "\"0x0\",\"witnesses\":["
-        "\"0x5500000010000000550000005500000041000000305d09c7de3f34a4d53bc4e0031ee59c95b9abc4fc3ff5"
-        "548e1a17ca726c069a232012c9c4be6ec4d4ffbe88613ca5e686e3e4b7d0b9bbd7038003e23ffdcdd601\","
-        "\"0x55000000100000005500000055000000410000007c514c77482dd1e1086f41a6d17364c9b5ed16364d61df"
-        "6f7fd8540f8bf7c131275c877943786b1b72fbf4f9d817ee5dd554a689808b7919543c691b5068e5be01\"]}");
-}
-
-Proto::SigningInput getAnySignerInput6() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_dao_withdraw_phase1();
-
-    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
-                                 "rg8furras980hksatlslfaktks7epf25");
-    auto& depositCell = *operation.mutable_deposit_cell();
-    depositCell.set_capacity(10200000000);
-    *depositCell.mutable_out_point() =
-        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
-            .proto();
-    *depositCell.mutable_lock() =
-        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
-                       "80hksatlslfaktks7epf25"))
-            .proto();
-    *depositCell.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto depositCellData = parse_hex("0000000000000000");
-    *depositCell.mutable_data() = std::string(depositCellData.begin(), depositCellData.end());
-    depositCell.set_block_number(7575466);
-    auto blockHashData =
-        parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a");
-    *depositCell.mutable_block_hash() = std::string(blockHashData.begin(), blockHashData.end());
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(10200000000);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-    *cell1.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto cell1Data = parse_hex("0000000000000000");
-    *cell1.mutable_data() = std::string(cell1Data.begin(), cell1Data.end());
-
-    auto& cell2 = *input.add_cell();
-    cell2.set_capacity(12410019377);
-    *cell2.mutable_out_point() =
-        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 1)
-            .proto();
-    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-
-    auto privateKey1 =
-        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
-
-    return input;
-}
-
-TEST(TWAnySignerNervos, Sign_DAO_Withdraw_Phase1) {
-    auto input = getAnySignerInput6();
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNervos);
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    // https://explorer.nervos.org/transaction/0xb4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca
-    ASSERT_EQ(output.transaction_id(),
-              "0xb4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca");
-    ASSERT_EQ(output.transaction_json(),
-              "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_"
-              "hash\":\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{"
-              "\"dep_type\":\"code\",\"out_point\":{\"index\":\"0x2\",\"tx_hash\":"
-              "\"0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c\"}}],\"header_"
-              "deps\":[\"0x3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a\"],"
-              "\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-              "\"0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683\"},\"since\":"
-              "\"0x0\"},{\"previous_output\":{\"index\":\"0x1\",\"tx_hash\":"
-              "\"0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683\"},\"since\":"
-              "\"0x0\"}],\"outputs\":[{\"capacity\":\"0x25ff7a600\",\"lock\":{\"args\":"
-              "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
-              "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_"
-              "type\":\"type\"},\"type\":{\"args\":\"0x\",\"code_hash\":"
-              "\"0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e\",\"hash_"
-              "type\":\"type\"}},{\"capacity\":\"0x2e3b1db56\",\"lock\":{\"args\":"
-              "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
-              "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_"
-              "type\":\"type\"},\"type\":null}],\"outputs_data\":[\"0xaa97730000000000\",\"0x\"],"
-              "\"version\":\"0x0\",\"witnesses\":["
-              "\"0x5500000010000000550000005500000041000000d5131c1a6b8eca11e2c280b72c5db09ea00bb788"
-              "fd3262eaced861c39db2aad04a36f9d174b6f167a9c98b85d2bccf537a163c44459d23467dfa86408f48"
-              "dd5f01\",\"0x\"]}");
-}
-
-Proto::SigningInput getAnySignerInput7() {
-    auto input = Proto::SigningInput();
-    auto& operation = *input.mutable_dao_withdraw_phase2();
-
-    auto& depositCell = *operation.mutable_deposit_cell();
-    depositCell.set_capacity(10200000000);
-    *depositCell.mutable_out_point() =
-        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
-            .proto();
-    *depositCell.mutable_lock() =
-        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
-                       "80hksatlslfaktks7epf25"))
-            .proto();
-    *depositCell.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto depositCellData = parse_hex("0000000000000000");
-    *depositCell.mutable_data() = std::string(depositCellData.begin(), depositCellData.end());
-    depositCell.set_block_number(7575466);
-    auto blockHashData1 =
-        parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a");
-    *depositCell.mutable_block_hash() = std::string(blockHashData1.begin(), blockHashData1.end());
-
-    auto& withdrawingCell = *operation.mutable_withdrawing_cell();
-    withdrawingCell.set_capacity(10200000000);
-    *withdrawingCell.mutable_out_point() =
-        OutPoint(parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"), 0)
-            .proto();
-    *withdrawingCell.mutable_lock() =
-        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
-                       "80hksatlslfaktks7epf25"))
-            .proto();
-    *withdrawingCell.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto withdrawingCellData = parse_hex("aa97730000000000");
-    *withdrawingCell.mutable_data() =
-        std::string(withdrawingCellData.begin(), withdrawingCellData.end());
-    withdrawingCell.set_block_number(7575534);
-    auto blockHashData2 =
-        parse_hex("b070d5364afd47c23fe267077d454009d6f665f200a915e68af1616e46f4aa52");
-    *withdrawingCell.mutable_block_hash() =
-        std::string(blockHashData2.begin(), blockHashData2.end());
-    withdrawingCell.set_since(0x20037c0000001731);
-
-    operation.set_amount(10200000000);
-    input.set_byte_fee(1);
-
-    auto& cell1 = *input.add_cell();
-    cell1.set_capacity(10200000000);
-    *cell1.mutable_out_point() =
-        OutPoint(parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"), 0)
-            .proto();
-    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
-                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
-                                .proto();
-    *cell1.mutable_type() =
-        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
-               HashType::Type1, Data())
-            .proto();
-    auto cell1Data = parse_hex("aa97730000000000");
-    *cell1.mutable_data() = std::string(cell1Data.begin(), cell1Data.end());
-
-    auto privateKey1 =
-        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
-    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
-
-    return input;
-}
-
-TEST(TWAnySignerNervos, Sign_DAO_Withdraw_Phase2) {
-    auto input = getAnySignerInput7();
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNervos);
-    ASSERT_EQ(output.error(), Common::Proto::OK);
-    ASSERT_EQ(output.transaction_id(),
-              "0x4fde13c93fc5d24ab7f660070aaa0b1725809d585f6258605e595cdbd856ea1c");
-    ASSERT_EQ(
-        output.transaction_json(),
-        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{\"dep_type\":"
-        "\"code\",\"out_point\":{\"index\":\"0x2\",\"tx_hash\":"
-        "\"0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c\"}}],\"header_deps\":"
-        "[\"0x3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a\","
-        "\"0xb070d5364afd47c23fe267077d454009d6f665f200a915e68af1616e46f4aa52\"],\"inputs\":[{"
-        "\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
-        "\"0xb4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca\"},\"since\":"
-        "\"0x20037c0000001731\"}],\"outputs\":[{\"capacity\":\"0x25ff7a42c\",\"lock\":{\"args\":"
-        "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
-        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
-        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x\"],\"version\":\"0x0\",\"witnesses\":["
-        "\"0x6100000010000000550000006100000041000000743f86c5557f4e2d3327f4d17e7bad27209b29c1e9cdba"
-        "b42ab03f7094af917b4b203ddd7f2e87102e09ae579f2fe7f6adb7900b7386b58c1183ba0011b7c42100080000"
-        "000000000000000000\"]}");
-}
-
-} // namespace TW::Nervos::tests
\ No newline at end of file
diff --git a/tests/Nervos/TWCoinTypeTests.cpp b/tests/Nervos/TWCoinTypeTests.cpp
deleted file mode 100644
index bff876ae0c3..00000000000
--- a/tests/Nervos/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWNervosCoinType, TWCoinType) {
-    const auto coin = TWCoinTypeNervos;
-    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
-    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
-    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
-    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
-    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
-
-    assertStringsEqual(id, "nervos");
-    assertStringsEqual(name, "Nervos");
-    assertStringsEqual(symbol, "CKB");
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 8);
-    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainNervos);
-    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
-    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
-    assertStringsEqual(txUrl, "https://explorer.nervos.org/transaction/t123");
-    assertStringsEqual(accUrl, "https://explorer.nervos.org/address/a12");
-}
diff --git a/tests/Nimiq/AddressTests.cpp b/tests/Nimiq/AddressTests.cpp
deleted file mode 100644
index b25fda815cb..00000000000
--- a/tests/Nimiq/AddressTests.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Nimiq/Address.h"
-#include "Nimiq/Signer.h"
-
-#include <gtest/gtest.h>
-#include <vector>
-
-using namespace TW;
-
-namespace TW::Nimiq::tests {
-
-TEST(NimiqAddress, IsValid) {
-    // No address
-    ASSERT_FALSE(Address::isValid(""));
-    // Invalid country code
-    ASSERT_FALSE(Address::isValid("DE86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"));
-    // Invalid checksum
-    ASSERT_FALSE(Address::isValid("NQ42 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"));
-    // Too short
-    ASSERT_FALSE(Address::isValid("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0ML"));
-    // Too long
-    ASSERT_FALSE(Address::isValid("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA 0MLA"));
-    // Valid, without spaces
-    ASSERT_TRUE(Address::isValid("NQ862H8FYGU5RM77QSN9LYLHC56ACYYR0MLA"));
-    // Valid, normal format
-    ASSERT_TRUE(Address::isValid("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"));
-}
-
-TEST(NimiqAddress, String) {
-    // Address to string
-    ASSERT_EQ(
-        Address(parse_hex("5b3e9e5f32b89abafc3708765dc8f00216cefbb1")).string(),
-        "NQ61 BCY9 UPRJ P2DB MY1P 11T5 TJ7G 08BC VXVH");
-    // Without spaces
-    ASSERT_EQ(
-        Address("NQ862H8FYGU5RM77QSN9LYLHC56ACYYR0MLA").string(),
-        "NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA");
-    // With spaces
-    ASSERT_EQ(
-        Address("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA").string(),
-        "NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA");
-}
-
-TEST(NimiqAddress, FromPublicKey) {
-    const auto publicKey = Signer::publicKeyFromBytes(
-        parse_hex("70c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b702"));
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "NQ27 GBAY EVHP HK5X 6JHV JGFJ 5M3H BF4Y G7GD");
-}
-
-} // namespace TW::Nimiq::tests
diff --git a/tests/Nimiq/SignerTests.cpp b/tests/Nimiq/SignerTests.cpp
deleted file mode 100644
index 998b53c3642..00000000000
--- a/tests/Nimiq/SignerTests.cpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Nimiq/Address.h"
-#include "Nimiq/Signer.h"
-#include "Nimiq/Transaction.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Nimiq {
-
-TEST(NimiqSigner, DerivePublicKey) {
-    const PrivateKey privateKey(parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756"));
-    const PublicKey publicKey((privateKey.getPublicKey(TWPublicKeyTypeED25519)));
-    const auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "NQ27 GBAY EVHP HK5X 6JHV JGFJ 5M3H BF4Y G7GD");
-}
-
-TEST(NimiqSigner, Sign) {
-    const PrivateKey privateKey(parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756"));
-    const auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    std::array<uint8_t, 32> pubkeyBytes;
-    std::copy(pubkey.bytes.begin(), pubkey.bytes.end(), pubkeyBytes.data());
-
-    Transaction tx(
-        pubkeyBytes,
-        Address("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"),
-        42042042,
-        1000,
-        314159
-    );
-
-    Signer signer;
-    signer.sign(privateKey, tx);
-
-    ASSERT_EQ(hex(tx.signature),
-        "74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b");
-}
-
-} // namespace TW::Nimiq
diff --git a/tests/Nimiq/TWAnySignerTests.cpp b/tests/Nimiq/TWAnySignerTests.cpp
deleted file mode 100644
index bc7bcaf9fec..00000000000
--- a/tests/Nimiq/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/Nimiq.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::Nimiq::tests {
-
-TEST(TWAnySignerNimiq, Sign) {
-    auto privateKey = parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756");
-    
-    Proto::SigningInput input;
-
-    input.set_destination("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA");
-    input.set_fee(1000);
-    input.set_value(42042042);
-    input.set_validity_start_height(314159);
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeNimiq);
-
-    EXPECT_EQ(hex(output.encoded()), "0070c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b7021450ffc385cd4e7c6ac9a7e91614ca67ff90568a00000000028182ba00000000000003e80004cb2f2a74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b");
-}
-
-} // namespace TW::Nimiq::tests
diff --git a/tests/Nimiq/TWCoinTypeTests.cpp b/tests/Nimiq/TWCoinTypeTests.cpp
deleted file mode 100644
index 40f585625e3..00000000000
--- a/tests/Nimiq/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWNimiqCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNimiq));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNimiq, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNimiq, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNimiq));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNimiq));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNimiq), 5);
-    ASSERT_EQ(TWBlockchainNimiq, TWCoinTypeBlockchain(TWCoinTypeNimiq));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNimiq));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNimiq));
-    assertStringsEqual(symbol, "NIM");
-    assertStringsEqual(txUrl, "https://nimiq.watch/#t123");
-    assertStringsEqual(accUrl, "https://nimiq.watch/#a12");
-    assertStringsEqual(id, "nimiq");
-    assertStringsEqual(name, "Nimiq");
-}
diff --git a/tests/Nimiq/TransactionTests.cpp b/tests/Nimiq/TransactionTests.cpp
deleted file mode 100644
index 089198f2ec6..00000000000
--- a/tests/Nimiq/TransactionTests.cpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Nimiq/Address.h"
-#include "Nimiq/Transaction.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Nimiq {
-
-TEST(NimiqTransaction, PreImage) {
-    const PrivateKey privateKey(parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756"));
-    const auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    std::array<uint8_t, 32> pubkeyBytes;
-    std::copy(pubkey.bytes.begin(), pubkey.bytes.end(), pubkeyBytes.data());
-
-    Transaction tx(
-        pubkeyBytes,
-        Address("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"),
-        42042042,
-        1000,
-        314159
-    );
-    ASSERT_EQ(hex(tx.getPreImage()),
-        "000082d5f776378ccbe34a3d941f22d4715bc9f81e0d001450ffc385cd4e7c6ac9a7e91614ca67ff90568a0000000000028182ba00000000000003e80004cb2f2a00");
-}
-
-TEST(NimiqTransaction, Serialize) {
-    const PrivateKey privateKey(parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756"));
-    const auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    std::array<uint8_t, 32> pubkeyBytes;
-    std::copy(pubkey.bytes.begin(), pubkey.bytes.end(), pubkeyBytes.data());
-
-    Transaction tx(
-        pubkeyBytes,
-        Address("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"),
-        42042042,
-        1000,
-        314159
-    );
-
-    const auto signature = parse_hex("74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b");
-    std::copy(signature.begin(), signature.end(), tx.signature.begin());
-
-    ASSERT_EQ(hex(tx.serialize()),
-        "0070c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b7021450ffc385cd4e7c6ac9a7e91614ca67ff90568a00000000028182ba00000000000003e80004cb2f2a74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b");
-}
-
-} // namespace TW::Nimiq
diff --git a/tests/NumericLiteralTests.cpp b/tests/NumericLiteralTests.cpp
deleted file mode 100644
index 07813e2f48e..00000000000
--- a/tests/NumericLiteralTests.cpp
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "NumericLiteral.h"
-
-#include <gtest/gtest.h>
-
-TEST(UzLitteralOperator, SizetEquality) {
-    [[maybe_unused]] auto size = 42_uz;
-    static_assert(std::is_same_v<decltype(size), std::size_t>);
-}
\ No newline at end of file
diff --git a/tests/OKXChain/TWCoinTypeTests.cpp b/tests/OKXChain/TWCoinTypeTests.cpp
deleted file mode 100644
index 4e68b569a69..00000000000
--- a/tests/OKXChain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWCoinTypeOKXChain, TWCoinType) {
-    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOKXChain));
-    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x46C3A947E8248570FBD28E4FE456CC8F80DFD90716533878FB67857B95FA3D37"));
-    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOKXChain, txId.get()));
-    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x074faafd0b20fad2efa115b8ed7e75993e580b85"));
-    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOKXChain, accId.get()));
-    const auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOKXChain));
-    const auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOKXChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOKXChain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeOKXChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeOKXChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeOKXChain));
-    assertStringsEqual(symbol, "OKT");
-    assertStringsEqual(txUrl, "https://www.oklink.com/en/okc/tx/0x46C3A947E8248570FBD28E4FE456CC8F80DFD90716533878FB67857B95FA3D37");
-    assertStringsEqual(accUrl, "https://www.oklink.com/en/okc/address/0x074faafd0b20fad2efa115b8ed7e75993e580b85");
-    assertStringsEqual(id, "okc");
-    assertStringsEqual(name, "OKX Chain");
-}
diff --git a/tests/Oasis/AddressTests.cpp b/tests/Oasis/AddressTests.cpp
deleted file mode 100644
index ce1436525f5..00000000000
--- a/tests/Oasis/AddressTests.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Oasis/Address.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include <gtest/gtest.h>
-#include <vector>
-
-using namespace TW;
-
-namespace TW::Oasis::tests {
-
-TEST(OasisAddress, Valid) {
-    ASSERT_TRUE(Address::isValid("oasis1qp0cnmkjl22gky6p6qeghjytt4v7dkxsrsmueweh"));
-}
-
-TEST(OasisAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid("oasis1qp0cnmkjl22gky6p6qeghjytt4v7dkxsrsmuewehj"));
-    ASSERT_FALSE(Address::isValid("oasi1qp0cnmkjl22gky6p6qeghjytt4v7dkxsrsmueweh"));
-}
-
-TEST(OasisAddress, ForceInvalid) {
-    try {
-        auto addressString = "oasis1qp0cnmkjl22gky6p6qeghjytt4v7dkxsrsmuewehj";
-        auto address = Address(addressString);
-    } catch (std::invalid_argument& e1) {
-        return;
-    }
-    FAIL() << "This test should generate an exception as it an invalid address";
-}
-
-TEST(OasisAddress, FromWrongData) {
-    try {
-        auto dataString = "asdadfasdfsdfwrwrsadasdasdsad";
-        auto address = Address(data(dataString));
-    } catch (std::invalid_argument& e1) {
-        return;
-    }
-    FAIL() << "This test should generate an exception as it an invalid data";
-}
-
-TEST(OasisAddress, FromPrivateKey) {
-    auto privateKey = PrivateKey(parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0"));
-    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
-    ASSERT_EQ(address.string(), "oasis1qzawzy5kaa2xgphenf3r0f5enpr3mx5dps559yxm");
-}
-
-TEST(OasisAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("aba52c0dcb80c2fe96ed4c3741af40c573a0500c0d73acda22795c37cb0f1739"), TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "oasis1qphdkldpttpsj2j3l9sde9h26cwpfwqwwuhvruyu");
-}
-
-TEST(OasisAddress, WrongPublicKeyType) {
-    try {
-        auto publicKey = PublicKey(parse_hex("aba52c0dcb80c2fe96ed4c3741af40c573a0500c0d73acda22795c37cb0f1739"), TWPublicKeyTypeED25519Cardano);
-        auto address = Address(publicKey);
-    } catch (std::invalid_argument& e1) {
-        return;
-    }
-    FAIL() << "TWPublicKeyTypeED25519Cardano should generate an exception as it an invalid publicKey type";
-}
-
-TEST(OasisAddress, FromString) {
-    Address address;
-    ASSERT_TRUE(Address::decode("oasis1hts399h023jqd7v6vgm6dxvcguwe4rgvqqgvq38n", address));
-    ASSERT_EQ(address.string(), "oasis1hts399h023jqd7v6vgm6dxvcguwe4rgvqqgvq38n");
-
-    ASSERT_FALSE(Address::decode("oasis1hts399h023jqd7v6vgm6dxvcguwe4rgvqqgvq38ng", address));
-}
-
-} // namespace TW::Oasis::tests
diff --git a/tests/Oasis/SignerTests.cpp b/tests/Oasis/SignerTests.cpp
deleted file mode 100644
index b4cc6ee2a6b..00000000000
--- a/tests/Oasis/SignerTests.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Oasis/Address.h"
-#include "Oasis/Signer.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Oasis::tests {
-
-TEST(OasisSigner, Sign) {
-    auto input = Proto::SigningInput();
-    auto& transfer = *input.mutable_transfer();
-
-    transfer.set_gas_price(0);
-    transfer.set_gas_amount("0");
-    transfer.set_nonce(0);
-    transfer.set_to("oasis1qrrnesqpgc6rfy2m50eew5d7klqfqk69avhv4ak5");
-    transfer.set_amount("10000000");
-
-    // The use of this context thing is explained here --> https://docs.oasis.dev/oasis-core/common-functionality/crypto#domain-separation
-    transfer.set_context("oasis-core/consensus: tx for chain a245619497e580dd3bc1aa3256c07f68b8dcc13f92da115eadc3b231b083d3c4");
-
-    auto key = parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0");
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.encoded()), "a2697369676e6174757265a2697369676e617475726558406e51c18c9b2015c9b49414b3307336597f51ff331873d214ce2db81c9651a34d99529ccaa294a39ccd01c6b0bc2c2239d87c624e5ba4840cf99ac8f9283e240c6a7075626c69635f6b6579582093d8f8a455f50527976a8aa87ebde38d5606efa86cb985d3fb466aff37000e3b73756e747275737465645f7261775f76616c7565585ea463666565a2636761730066616d6f756e74410064626f6479a262746f5500c73cc001463434915ba3f39751beb7c0905b45eb66616d6f756e744400989680656e6f6e636500666d6574686f64707374616b696e672e5472616e73666572");
-}
-
-} // namespace TW::Oasis::tests
diff --git a/tests/Oasis/TWAnySignerTests.cpp b/tests/Oasis/TWAnySignerTests.cpp
deleted file mode 100644
index 5e1c2b504ee..00000000000
--- a/tests/Oasis/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnySigner.h>
-#include "HexCoding.h"
-#include "proto/Oasis.pb.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-namespace TW::Oasis::tests {
-
-TEST(TWAnySignerOasis, Sign) {
-    auto input = Proto::SigningInput();
-    auto output = Proto::SigningOutput();
-    auto& transfer = *input.mutable_transfer();
-
-    transfer.set_gas_price(0);
-    transfer.set_gas_amount("0");
-    transfer.set_nonce(0);
-    transfer.set_to("oasis1qrrnesqpgc6rfy2m50eew5d7klqfqk69avhv4ak5");
-    transfer.set_amount("10000000");
-    transfer.set_context("oasis-core/consensus: tx for chain a245619497e580dd3bc1aa3256c07f68b8dcc13f92da115eadc3b231b083d3c4");
-
-    auto key = parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0");
-    input.set_private_key(key.data(), key.size());
-
-    ANY_SIGN(input, TWCoinTypeOasis);
-
-    EXPECT_EQ("a2697369676e6174757265a2697369676e617475726558406e51c18c9b2015c9b49414b3307336597f51ff331873d214ce2db81c9651a34d99529ccaa294a39ccd01c6b0bc2c2239d87c624e5ba4840cf99ac8f9283e240c6a7075626c69635f6b6579582093d8f8a455f50527976a8aa87ebde38d5606efa86cb985d3fb466aff37000e3b73756e747275737465645f7261775f76616c7565585ea463666565a2636761730066616d6f756e74410064626f6479a262746f5500c73cc001463434915ba3f39751beb7c0905b45eb66616d6f756e744400989680656e6f6e636500666d6574686f64707374616b696e672e5472616e73666572",
-              hex(output.encoded()));
-}
-
-} // namespace TW::Oasis::tests
diff --git a/tests/Oasis/TWCoinTypeTests.cpp b/tests/Oasis/TWCoinTypeTests.cpp
deleted file mode 100644
index a75e79d0796..00000000000
--- a/tests/Oasis/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWOasisCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOasis));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0b9bd4983f1c88a1c71bf33562b6ba02b3064e01697d15a0de4bfe1922ec74b8"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOasis, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("oasis1qrx376dmwuckmruzn9vq64n49clw72lywctvxdf4"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOasis, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOasis));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOasis));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOasis), 9);
-    ASSERT_EQ(TWBlockchainOasisNetwork, TWCoinTypeBlockchain(TWCoinTypeOasis));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeOasis));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeOasis));
-    assertStringsEqual(symbol, "ROSE");
-    assertStringsEqual(txUrl, "https://oasisscan.com/transactions/0b9bd4983f1c88a1c71bf33562b6ba02b3064e01697d15a0de4bfe1922ec74b8");
-    assertStringsEqual(accUrl, "https://oasisscan.com/accounts/detail/oasis1qrx376dmwuckmruzn9vq64n49clw72lywctvxdf4");
-    assertStringsEqual(id, "oasis");
-    assertStringsEqual(name, "Oasis");
-}
diff --git a/tests/Ontology/AccountTests.cpp b/tests/Ontology/AccountTests.cpp
deleted file mode 100644
index 1fdf49f4806..00000000000
--- a/tests/Ontology/AccountTests.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Hash.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include "Ontology/Signer.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-namespace TW::Ontology::tests {
-
-TEST(OntologyAccount, validity) {
-    auto hexPrvKey = "4646464646464646464646464646464646464646464646464646464646464646";
-    auto hexPubKey = "031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486";
-    auto signer = Signer(PrivateKey(parse_hex(hexPrvKey)));
-    auto prvKey = signer.getPrivateKey();
-    auto pubKey = signer.getPublicKey();
-    EXPECT_EQ(hexPrvKey, hex(prvKey.bytes));
-    EXPECT_EQ(hexPubKey, hex(pubKey.bytes));
-}
-
-} // namespace TW::Ontology::tests
diff --git a/tests/Ontology/AddressTests.cpp b/tests/Ontology/AddressTests.cpp
deleted file mode 100644
index f6917282e9b..00000000000
--- a/tests/Ontology/AddressTests.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PublicKey.h"
-
-#include "Ontology/Address.h"
-#include "Ontology/Signer.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Ontology::tests {
-
-TEST(OntologyAddress, validation) {
-    ASSERT_FALSE(Address::isValid("abc"));
-    ASSERT_FALSE(Address::isValid("abeb60f3e94c1b9a09f33669435e7ef12eacd"));
-    ASSERT_FALSE(Address::isValid("abcb60f3e94c9b9a09f33669435e7ef1beaedads"));
-    ASSERT_TRUE(Address::isValid("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD"));
-}
-
-TEST(OntologyAddress, fromPubKey) {
-    auto address = Address(
-        PublicKey(parse_hex("031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486"), TWPublicKeyTypeSECP256k1));
-    EXPECT_EQ("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5", address.string());
-}
-
-TEST(OntologyAddress, fromString) {
-    auto b58Str = "AYTxeseHT5khTWhtWX1pFFP1mbQrd4q1zz";
-    auto address = Address(b58Str);
-    EXPECT_EQ(b58Str, address.string());
-    auto errB58Str = "AATxeseHT5khTWhtWX1pFFP1mbQrd4q1zz";
-    ASSERT_THROW(new Address(errB58Str), std::runtime_error);
-}
-
-TEST(OntologyAddress, fromMultiPubKeys) {
-    auto signer1 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
-    auto signer2 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464652")));
-    auto signer3 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464658")));
-    std::vector<Data> pubKeys{signer1.getPublicKey().bytes, signer2.getPublicKey().bytes, signer3.getPublicKey().bytes};
-    uint8_t m = 2;
-    auto multiAddress = Address(m, pubKeys);
-    EXPECT_EQ("AYGWgijVZnrUa2tRoCcydsHUXR1111DgdW", multiAddress.string());
-}
-
-} // namespace TW::Ontology::tests
diff --git a/tests/Ontology/OngTests.cpp b/tests/Ontology/OngTests.cpp
deleted file mode 100644
index d4b4994ca50..00000000000
--- a/tests/Ontology/OngTests.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-
-#include "Ontology/Ong.h"
-
-#include <gtest/gtest.h>
-#include <string>
-
-namespace TW::Ontology::tests {
-
-TEST(OntologyOng, decimals) {
-    uint32_t nonce = 0;
-    auto tx = Ong().decimals(nonce);
-    auto rawTx = hex(tx.serialize());
-    EXPECT_EQ("00d100000000000000000000000000000000000000000000000000000000000000000000000000000000"
-              "380008646563696d616c731400000000000000000000000000000000000000020068164f6e746f6c6f67"
-              "792e4e61746976652e496e766f6b650000",
-              rawTx);
-}
-
-TEST(OntologyOng, balanceOf) {
-    uint32_t nonce = 0;
-    auto address = Address("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD");
-    auto tx = Ong().balanceOf(address, nonce);
-    auto rawTx = hex(tx.serialize());
-    EXPECT_EQ("00d100000000000000000000000000000000000000000000000000000000000000000000000000000000"
-              "4d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f6614000000000000000000"
-              "00000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b650000",
-              rawTx);
-}
-
-TEST(OntologyOng, transfer) {
-    auto signer1 = Signer(
-        PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
-    auto signer2 = Signer(
-        PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464652")));
-    auto toAddress = Address("Af1n2cZHhMZumNqKgw9sfCNoTWu9de4NDn");
-    uint32_t nonce = 0;
-    uint64_t amount = 1, gasPrice = 500, gasLimit = 20000;
-    auto tx = Ong().transfer(signer1, toAddress, amount, signer2, gasPrice, gasLimit, nonce);
-    auto rawTx = hex(tx.serialize());
-    EXPECT_EQ("00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
-              "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
-              "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
-              "00000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140ac3edf2d00540f9c"
-              "2f3b24878936b409c995c425ab5edf247c5b0d812a50df293ff63e173bac71a6cd0772ff78415c46ac64"
-              "f625cbc06fe90ccdecf9a94319c42321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
-              "47125f927b7486ac41406fea9f12b125d7f65a94774e765a796428b3c6c4c46b0470624b9a1cef4ff420"
-              "488828f308c263b35287363e51add8cd49136eb57a397c6ade95df80d9a16282232103d9fd62df332403"
-              "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
-              rawTx);
-}
-
-TEST(OntologyOng, withdraw) {
-    auto signer1 = Signer(
-        PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
-    auto signer2 = Signer(
-        PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464652")));
-    uint32_t nonce = 0;
-    uint64_t amount = 1, gasPrice = 500, gasLimit = 20000;
-    auto tx =
-        Ong().withdraw(signer1, signer1.getAddress(), amount, signer2, gasPrice, gasLimit, nonce);
-    auto rawTx = hex(tx.serialize());
-    EXPECT_EQ(
-        "00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df68b00c6"
-        "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81400000000000000000000000000000000000000"
-        "016a7cc814fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc8516a7cc86c0c7472616e7366657246726f"
-        "6d1400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f"
-        "6b6500024140b8b859055c744a89ef4d4f6ae7a58e0a99fef2eb0f6cf09d740b56cf4c7c14ab64e00c28de9b1f"
-        "28921cbd62e6bcd6d452ab9871f8f5d2288812ff322ee2f4af2321031bec1250aa8f78275f99a6663688f31085"
-        "848d0ed92f1203e447125f927b7486ac41406413b060329e133cd13709c361ccd90b3944477cf3937f1459313f"
-        "0ea6435f6f2b1335192a5d1b346fd431e8af912bfa4e1a23ad7d0ab7fc5b808655af5c9043232103d9fd62df33"
-        "2403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
-        rawTx);
-}
-
-} // namespace TW::Ontology::tests
diff --git a/tests/Ontology/OntTests.cpp b/tests/Ontology/OntTests.cpp
deleted file mode 100644
index 20e9c3bbeb6..00000000000
--- a/tests/Ontology/OntTests.cpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-
-#include "Ontology/Ont.h"
-
-#include <string>
-
-#include <boost/any.hpp>
-#include <gtest/gtest.h>
-
-namespace TW::Ontology::tests {
-
-TEST(OntologyOnt, decimals) {
-    uint32_t nonce = 0;
-    auto tx = Ont().decimals(nonce);
-    auto rawTx = hex(tx.serialize());
-    EXPECT_EQ("00d100000000000000000000000000000000000000000000000000000000000000000000000000000000"
-              "380008646563696d616c731400000000000000000000000000000000000000010068164f6e746f6c6f67"
-              "792e4e61746976652e496e766f6b650000",
-              rawTx);
-}
-
-TEST(OntologyOnt, queryBalance) {
-    uint32_t nonce = 0;
-    auto address = Address("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD");
-    auto tx = Ont().balanceOf(address, nonce);
-    auto rawTx = hex(tx.serialize());
-    EXPECT_EQ("00d100000000000000000000000000000000000000000000000000000000000000000000000000000000"
-              "4d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f6614000000000000000000"
-              "00000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b650000",
-              rawTx);
-}
-
-TEST(OntologyOnt, transfer) {
-    auto signer1 = Signer(
-        PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
-    auto signer2 = Signer(
-        PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464652")));
-    auto toAddress = Address("Af1n2cZHhMZumNqKgw9sfCNoTWu9de4NDn");
-    uint32_t nonce = 0;
-    uint64_t amount = 1, gasPrice = 500, gasLimit = 20000;
-    auto tx = Ont().transfer(signer1, toAddress, amount, signer2, gasPrice, gasLimit, nonce);
-    auto rawTx = hex(tx.serialize());
-    EXPECT_EQ("00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
-              "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
-              "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
-              "00000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b65000241407531e7d5bb9ae138"
-              "862585a65c26d624f1a7a61011298809d9ed9cf60d10a4504067dee9d549a836b480c4e48904e28f9b42"
-              "dd5fa14376cbb1ef27d931eaea552321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
-              "47125f927b7486ac4140bcc6df81d7f2f3143f152c446643ac5bf7910ef90046be8c89818264a11d360d"
-              "0576d7b092fabafd0913a67ccf8b2f8e3d2bd708f768c2bb67e2d2f759805608232103d9fd62df332403"
-              "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
-              rawTx);
-}
-
-} // namespace TW::Ontology::tests
diff --git a/tests/Ontology/TWAnySignerTests.cpp b/tests/Ontology/TWAnySignerTests.cpp
deleted file mode 100644
index e25b1e46190..00000000000
--- a/tests/Ontology/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "../interface/TWTestUtilities.h"
-
-#include "Ontology/Oep4TxBuilder.h"
-#include "Ontology/OngTxBuilder.h"
-#include "Ontology/OntTxBuilder.h"
-
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Ontology::tests {
-
-TEST(TWAnySingerOntology, OntBalanceOf) {
-    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
-    // "Version":"1.0.0","00d1885602ec0000000000000000000000000000000000000000000000000000000000000000000000004d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f661400000000000000000000000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b650000"}'
-    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
-    //
-    // {"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"00","Notify":[]},"Version":"1.0.0"}
-    auto input = Proto::SigningInput();
-    input.set_contract("ONT");
-    input.set_method("balanceOf");
-    input.set_query_address("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD");
-    input.set_nonce(3959576200);
-    auto data = OntTxBuilder::build(input);
-    auto rawTx = hex(data);
-    EXPECT_EQ("00d1885602ec000000000000000000000000000000000000000000000000000000000000000000000000"
-              "4d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f6614000000000000000000"
-              "00000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b650000",
-              rawTx);
-}
-
-TEST(TWAnySingerOntology, OntDecimals) {
-    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
-    // "Version":"1.0.0","Data":"00d1bdc12a48000000000000000000000000000000000000000000000000000000000000000000000000380008646563696d616c731400000000000000000000000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b650000"}'
-    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
-    //
-    //{"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"","Notify":[]},"Version":"1.0.0"}
-    auto input = Proto::SigningInput();
-    input.set_contract("ONT");
-    input.set_method("decimals");
-    input.set_nonce(1210761661);
-    auto data = OntTxBuilder::build(input);
-    auto rawTx = hex(data);
-    EXPECT_EQ("00d1bdc12a48000000000000000000000000000000000000000000000000000000000000000000000000"
-              "380008646563696d616c731400000000000000000000000000000000000000010068164f6e746f6c6f67"
-              "792e4e61746976652e496e766f6b650000",
-              rawTx);
-}
-
-TEST(TWAnySingerOntology, OntTransfer) {
-    // tx on polaris test net.
-    // https://explorer.ont.io/transaction/4a672ce813d3fac9042e9472cf9b470f8a5e59a2deb41fd7b23a1f7479a155d5/testnet
-    auto ownerPrivateKey =
-        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
-    auto payerPrivateKey =
-        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
-    auto input = Proto::SigningInput();
-    input.set_contract("ONT");
-    input.set_method("transfer");
-    input.set_nonce(2338116610);
-    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
-    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
-    input.set_to_address("Af1n2cZHhMZumNqKgw9sfCNoTWu9de4NDn");
-    input.set_amount(1);
-    input.set_gas_price(500);
-    input.set_gas_limit(20000);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeOntology);
-
-    EXPECT_EQ("00d102d45c8bf401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
-              "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
-              "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
-              "00000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140301766d925382a6e"
-              "bb2ebeb18d3741954c9370dcf6d9c45b34ce7b18bc42dcdb7cff28ddaf7f1048822c0ca21a0c4926323a"
-              "2497875b963f3b8cbd3717aa6e7c2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
-              "47125f927b7486ac414038466b25ac49a22ba8c301328ef049a61711b257987e85e25d63e0444a14e860"
-              "305a4cd3bb6ea2fe80fd293abb3c592e679c42c546cbf3baa051a07b28b374a6232103d9fd62df332403"
-              "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
-              hex(output.encoded()));
-}
-
-TEST(TWAnySingerOntology, OngDecimals) {
-    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
-    // "Version":"1.0.0","Data":"00d1e3f2e679000000000000000000000000000000000000000000000000000000000000000000000000380008646563696d616c731400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b650000"}'
-    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
-    //
-    // {"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"09","Notify":[]},"Version":"1.0.0"}
-    auto input = Proto::SigningInput();
-    input.set_contract("ONG");
-    input.set_method("decimals");
-    input.set_nonce(2045178595);
-    auto data = OngTxBuilder::build(input);
-    auto rawTx = hex(data);
-    EXPECT_EQ("00d1e3f2e679000000000000000000000000000000000000000000000000000000000000000000000000"
-              "380008646563696d616c731400000000000000000000000000000000000000020068164f6e746f6c6f67"
-              "792e4e61746976652e496e766f6b650000",
-              rawTx);
-}
-
-TEST(TWAnySingerOntology, OngBalanceOf) {
-    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
-    // "Version":"1.0.0","Data":"00d1ab1ad0cf0000000000000000000000000000000000000000000000000000000000000000000000004d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f661400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b650000"}'
-    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
-    //
-    //{"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"27e74d240609","Notify":[]},"Version":"1.0.0"}
-    auto input = Proto::SigningInput();
-    input.set_contract("ONG");
-    input.set_method("balanceOf");
-    input.set_query_address("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD");
-    input.set_nonce(3486522027);
-    auto data = OngTxBuilder::build(input);
-    auto rawTx = hex(data);
-    EXPECT_EQ("00d1ab1ad0cf000000000000000000000000000000000000000000000000000000000000000000000000"
-              "4d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f6614000000000000000000"
-              "00000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b650000",
-              rawTx);
-}
-
-TEST(TWAnySingerOntology, OngTransfer) {
-    // tx on polaris test net.
-    // https://explorer.ont.io/transaction/8a1e59396dcb72d9095088f50d1023294bf9c7b79ba693bd641578f748cbd4e6/testnet
-    auto ownerPrivateKey =
-        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
-    auto payerPrivateKey =
-        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
-    auto input = Proto::SigningInput();
-    input.set_contract("ONG");
-    input.set_method("transfer");
-    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
-    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
-    input.set_to_address("Af1n2cZHhMZumNqKgw9sfCNoTWu9de4NDn");
-    input.set_amount(1);
-    input.set_gas_price(500);
-    input.set_gas_limit(20000);
-    input.set_nonce(2827104669);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeOntology);
-
-    EXPECT_EQ("00d19d3182a8f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
-              "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
-              "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
-              "00000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140e27e935b87855efa"
-              "d62bb76b21c7b591f445f867eff86f888ca6ee1870ecd80f73b8ab199a4d757b4c7b9ed46c4ff8cfa8ae"
-              "faa90b7fb6485e358034448cba752321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
-              "47125f927b7486ac4140450047b2efb384129a16ec4c707790e9379b978cc7085170071d8d7c5c037d74"
-              "3b078bd4e21bb4404c0182a32ee05260e22454dffb34dacccf458dfbee6d32db232103d9fd62df332403"
-              "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
-              hex(output.encoded()));
-}
-
-TEST(TWAnySingerOntology, OngWithdraw) {
-    // tx on polaris test net.
-    // https://explorer.ont.io/transaction/433cb7ed4dec32d55be0db104aaa7ade4c7dbe0f62ef94f7b17829f7ac7cd75b/testnet
-    auto ownerPrivateKey =
-        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
-    auto payerPrivateKey =
-        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
-    auto input = Proto::SigningInput();
-    input.set_contract("ONG");
-    input.set_method("withdraw");
-    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
-    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
-    input.set_to_address("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5");
-    input.set_amount(1);
-    input.set_gas_price(500);
-    input.set_gas_limit(20000);
-    input.set_nonce(3784713724);
-    auto data = OngTxBuilder::build(input);
-    auto rawTx = hex(data);
-    EXPECT_EQ(
-        "00d1fc2596e1f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df68b00c6"
-        "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81400000000000000000000000000000000000000"
-        "016a7cc814fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc8516a7cc86c0c7472616e7366657246726f"
-        "6d1400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f"
-        "6b65000241400ef868766eeafce71b6ff2a4332aa4363980e66c55ef70aea80e3baee1daf02b43ae6d4c7c8a17"
-        "8b92f523602426eaa4205ab0ae5944b0fdae0abcbabaefbc4c2321031bec1250aa8f78275f99a6663688f31085"
-        "848d0ed92f1203e447125f927b7486ac4140c49c23092cd9003247a55792211d816010c7d6204c6e07a6e017da"
-        "70007b25ee2ab3665103f846300cd03512040275b78ae46812d40cd611058decdff5551e1f232103d9fd62df33"
-        "2403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
-        rawTx);
-}
-
-TEST(TWAnySingerOntology, Oep4Decimal) {
-    auto input = Proto::SigningInput();
-    input.set_contract("ff31ec74d01f7b7d45ed2add930f5d2239f7de33");
-    input.set_method("decimals");
-    input.set_nonce(0x1234);
-    auto data = Oep4TxBuilder::build(input);
-    auto rawTx = hex(data);
-    EXPECT_EQ("00d1341200000000000000000000000000000000000000000000000000000000000000000000000000002000c108646563696d616c736733def739225d0f93dd2aed457d7b1fd074ec31ff0000", rawTx);
-}
-
-TEST(TWAnySingerOntology, Oep4BalanceOf) {
-    // read only method don't need signer
-    auto input = Proto::SigningInput();
-    input.set_contract("ff31ec74d01f7b7d45ed2add930f5d2239f7de33");
-    input.set_method("balanceOf");
-    input.set_query_address("AeaThtPwh5kAYnjHavzwmvxPd725nVTvbM");
-    input.set_nonce(0x1234);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeOntology);
-    EXPECT_EQ("00d1341200000000000000000000000000000000000000000000000000000000000000000000000000003614fa2254ffaee3c3e1172e8e98f800e4105c74988e51c10962616c616e63654f666733def739225d0f93dd2aed457d7b1fd074ec31ff0000", hex(output.encoded()));
-}
-
-TEST(TWAnySingerOntology, Oep4Transfer) {
-    // https://explorer.ont.io/testnet/tx/710266b8d497e794ecd47e01e269e4aeb6f4ff2b01eaeafc4cd371e062b13757
-    auto ownerPrivateKey =
-        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
-    auto payerPrivateKey =
-        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
-    auto input = Proto::SigningInput();
-    input.set_contract("ff31ec74d01f7b7d45ed2add930f5d2239f7de33");
-    input.set_method("transfer");
-    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
-    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
-    input.set_to_address("AVY6LfvxauVQAVHDV9hC3ZCv7cQqzfDotH");
-    input.set_amount(233);
-    input.set_gas_price(2500);
-    input.set_gas_limit(50000);
-    input.set_nonce(0x1234);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeOntology);
-
-    EXPECT_EQ("00d134120000c40900000000000050c3000000000000fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a4d02e9001496f688657b95be51c11a87b51adfda4ab69e9cbb1457e9d1a61f9aafa798b6c7fbeae35639681d7df653c1087472616e736665726733def739225d0f93dd2aed457d7b1fd074ec31ff00024140bd2923854d7b84b97a107bb3cddf18c8e3dddd2f36b41a1f5f5b23366484daa22871cfb819923fe01e9cb1e9ed16baa2b05c2feb76bcbe2ec125f72701c5e965232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac41406d638653597774ce45812ea2653250806b657b32b7c6ad3e027ddeba91e9a9da4bb5dacd23dafba868cb31bacb38b4a6ff2607682a426c1dc09b05a1e158d6cd2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac", hex(output.encoded()));
-}
-
-} // namespace TW::Ontology::tests
diff --git a/tests/Ontology/TWCoinTypeTests.cpp b/tests/Ontology/TWCoinTypeTests.cpp
deleted file mode 100644
index 733c1fe94cf..00000000000
--- a/tests/Ontology/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWOntologyCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOntology));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOntology, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOntology, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOntology));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOntology));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOntology), 0);
-    ASSERT_EQ(TWBlockchainOntology, TWCoinTypeBlockchain(TWCoinTypeOntology));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeOntology));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeOntology));
-    assertStringsEqual(symbol, "ONT");
-    assertStringsEqual(txUrl, "https://explorer.ont.io/transaction/t123");
-    assertStringsEqual(accUrl, "https://explorer.ont.io/address/a12");
-    assertStringsEqual(id, "ontology");
-    assertStringsEqual(name, "Ontology");
-}
diff --git a/tests/Ontology/TransactionTests.cpp b/tests/Ontology/TransactionTests.cpp
deleted file mode 100644
index ccf7fc14094..00000000000
--- a/tests/Ontology/TransactionTests.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include "Ontology/ParamsBuilder.h"
-#include "Ontology/Signer.h"
-#include "Ontology/Transaction.h"
-
-#include <list>
-
-#include <boost/any.hpp>
-#include <gtest/gtest.h>
-
-namespace TW::Ontology::tests {
-
-TEST(OntologyTransaction, validity) {
-    std::vector<uint8_t> ontContract{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
-    auto fromAddress = Address("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5");
-    auto toAddress = Address("APniYDGozkhUh8Tk7pe35aah2HGJ4fJfVd");
-    uint64_t amount = 1;
-    NeoVmParamValue::ParamList transferParam{fromAddress._data, toAddress._data, amount};
-    NeoVmParamValue::ParamArray args{transferParam};
-    auto invokeCode = ParamsBuilder::buildNativeInvokeCode(ontContract, 0x00, "transfer", {args});
-    uint8_t version = 0;
-    uint8_t txType = 0xd1;
-    uint32_t nonce = 1552759011;
-    uint64_t gasPrice = 600;
-    uint64_t gasLimit = 300000;
-    auto tx =
-        Transaction(version, txType, nonce, gasPrice, gasLimit, toAddress.string(), invokeCode);
-    std::string hexTx =
-        "00d1e3388d5c5802000000000000e09304000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c6"
-        "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81457e9d1a61f9aafa798b6c7fbeae35639681d7d"
-        "f66a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f"
-        "6e746f6c6f67792e4e61746976652e496e766f6b650000";
-    EXPECT_EQ(hexTx, hex(tx.serialize()));
-    auto signer1 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
-    signer1.sign(tx);
-    hexTx =
-        "00d1e3388d5c5802000000000000e09304000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c6"
-        "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81457e9d1a61f9aafa798b6c7fbeae35639681d7d"
-        "f66a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f"
-        "6e746f6c6f67792e4e61746976652e496e766f6b6500014140e03a09d85f56d2ceb5817a1f3a430bab9bf0f469"
-        "da38afe4a5b33de258a06236d8e0a59d25918a49825455c99f91de9caf8071e38a589a530519705af9081eca23"
-        "21031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac";
-    EXPECT_EQ(520ul, hex(tx.serialize()).length());
-    EXPECT_EQ(hexTx.substr(0, 20), hex(tx.serialize()).substr(0, 20));
-    auto signer2 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464652")));
-    signer2.addSign(tx);
-    auto result = tx.serialize();
-    auto verifyPosition1 =
-        hex(result).find("21031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac");
-    auto verifyPosition2 =
-        hex(result).find("2103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac");
-    EXPECT_EQ(450ul, verifyPosition1);
-    EXPECT_EQ(654ul, verifyPosition2);
-    EXPECT_EQ(724ul, hex(result).length());
-}
-
-} // namespace TW::Ontology::tests
diff --git a/tests/Optimism/TWCoinTypeTests.cpp b/tests/Optimism/TWCoinTypeTests.cpp
deleted file mode 100644
index 4073c8896b8..00000000000
--- a/tests/Optimism/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWOptimismCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOptimism));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x6fd99288be9bf71eb002bb31da10a4fb0fbbb3c45ae73693b212f49c9db7df8f"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOptimism, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x1f932361e31d206b4f6b2478123a9d0f8c761031"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOptimism, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOptimism));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOptimism));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOptimism), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeOptimism));
-
-    assertStringsEqual(symbol, "ETH");
-    assertStringsEqual(txUrl, "https://optimistic.etherscan.io/tx/0x6fd99288be9bf71eb002bb31da10a4fb0fbbb3c45ae73693b212f49c9db7df8f");
-    assertStringsEqual(accUrl, "https://optimistic.etherscan.io/address/0x1f932361e31d206b4f6b2478123a9d0f8c761031");
-    assertStringsEqual(id, "optimism");
-    assertStringsEqual(name, "Optimistic Ethereum");
-}
diff --git a/tests/Osmosis/AddressTests.cpp b/tests/Osmosis/AddressTests.cpp
deleted file mode 100644
index 68011e0dc75..00000000000
--- a/tests/Osmosis/AddressTests.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Cosmos/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include <gtest/gtest.h>
-#include <vector>
-
-namespace TW::Cosmos::tests {
-
-TEST(OsmosisAddress, Valid) {
-    EXPECT_TRUE(Address::isValid(TWCoinTypeOsmosis, "osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5"));
-    EXPECT_TRUE(Address::isValid(TWCoinTypeOsmosis, "osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn"));
-}
-
-TEST(OsmosisAddress, Invalid) {
-    EXPECT_FALSE(Address::isValid(TWCoinTypeOsmosis, "osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f6"));
-    EXPECT_FALSE(Address::isValid(TWCoinTypeOsmosis, "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02")); // valid cosmos
-}
-
-TEST(OsmosisAddress, FromPrivateKey) {
-    auto privateKey = PrivateKey(parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af"));
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    auto address = Address(TWCoinTypeOsmosis, publicKey);
-    ASSERT_EQ(address.string(), "osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5");
-}
-
-TEST(OsmosisAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("02ecef5ce437a302c67f95468de4b31f36e911f467d7e6a52b41c1e13e1d563649"), TWPublicKeyTypeSECP256k1);
-    auto address = Address(TWCoinTypeOsmosis, publicKey);
-    ASSERT_EQ(address.string(), "osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5");
-}
-
-TEST(OsmosisAddress, FromString) {
-    Address address;
-    EXPECT_TRUE(Address::decode("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5", address));
-    EXPECT_EQ(address.string(), "osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5");
-    EXPECT_EQ(hex(address.getKeyHash()), "dd89a2e267cd96e23cf5a33382f030686f65996f");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/Osmosis/SignerTests.cpp b/tests/Osmosis/SignerTests.cpp
deleted file mode 100644
index a418f5fc6fb..00000000000
--- a/tests/Osmosis/SignerTests.cpp
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Cosmos/Address.h"
-#include "Cosmos/Signer.h"
-#include "HexCoding.h"
-#include "PublicKey.h"
-#include "proto/Cosmos.pb.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(OsmosisSigner, SignTransfer_81B4) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(124703);
-    input.set_chain_id("osmosis-1");
-    input.set_memo("");
-    input.set_sequence(0);
-
-    Address fromAddress;
-    Address toAddress;
-    EXPECT_TRUE(Address::decode("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5", fromAddress));
-    EXPECT_TRUE(Address::decode("osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn", toAddress));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("uosmo");
-    amountOfTx->set_amount("99800");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uosmo");
-    amountOfFee->set_amount("200");
-
-    auto privateKey = parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeOsmosis);
-
-    // https://www.mintscan.io/osmosis/txs/81B4F01BDE72AF7FF4536E5D7E66EB218E9FC9ACAA7C5EB5DB237DD0595D5F5F
-    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "Co0B...rYVj", "mode": "BROADCAST_MODE_BLOCK"}' https://lcd-osmosis.keplr.app/cosmos/tx/v1beta1/txs
-
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"Co0BCooBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmoKK29zbW8xbWt5Njljbjhla3R3eTA4NDV2ZWM5dXBzZHBoa3R4dDBlbjk3ZjUSK29zbW8xOHMwaGRuc2xsZ2NjbHdldTlheW13NG5na3RyMmswcmt2bjdqbW4aDgoFdW9zbW8SBTk5ODAwEmQKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLs71zkN6MCxn+VRo3ksx826RH0Z9fmpStBweE+HVY2SRIECgIIARISCgwKBXVvc21vEgMyMDAQwJoMGkAMY//Md5GRUR4lVZhk558hFS3kii9QZYoYKfg4+ac/xgNeyoiEweVDhcmEvlH1orVwjLUOnYs4ly2a/yIurYVj\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "0c63ffcc779191511e25559864e79f21152de48a2f50658a1829f838f9a73fc6035eca8884c1e54385c984be51f5a2b5708cb50e9d8b38972d9aff222ead8563");
-    EXPECT_EQ(output.error(), "");
-    EXPECT_EQ(output.json(), "");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/Osmosis/TWAnyAddressTests.cpp b/tests/Osmosis/TWAnyAddressTests.cpp
deleted file mode 100644
index 58e8d8abb24..00000000000
--- a/tests/Osmosis/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include "HexCoding.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(TWOsmosisAnyAddress, IsValid) {
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5").get(), TWCoinTypeOsmosis));
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn").get(), TWCoinTypeOsmosis));
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02").get(), TWCoinTypeOsmosis));
-}
-
-TEST(TWOsmosisAnyAddress, Create) {
-    auto string = STRING("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5");
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeOsmosis));
-    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
-    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "dd89a2e267cd96e23cf5a33382f030686f65996f");
-}
diff --git a/tests/Osmosis/TWAnySignerTests.cpp b/tests/Osmosis/TWAnySignerTests.cpp
deleted file mode 100644
index 5985d55949c..00000000000
--- a/tests/Osmosis/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Cosmos/Address.h"
-#include "HexCoding.h"
-#include "proto/Cosmos.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(TWAnySignerOsmosis, Sign) {
-    auto privateKey = parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af");
-    Proto::SigningInput input;
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(124703);
-    input.set_chain_id("osmosis-1");
-    input.set_memo("");
-    input.set_sequence(0);
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Address fromAddress;
-    Address toAddress;
-    EXPECT_TRUE(Address::decode("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5", fromAddress));
-    EXPECT_TRUE(Address::decode("osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn", toAddress));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("uosmo");
-    amountOfTx->set_amount("99800");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uosmo");
-    amountOfFee->set_amount("200");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeOsmosis);
-
-    // https://www.mintscan.io/osmosis/txs/81B4F01BDE72AF7FF4536E5D7E66EB218E9FC9ACAA7C5EB5DB237DD0595D5F5F
-    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "Co0B...rYVj", "mode": "BROADCAST_MODE_BLOCK"}' https://lcd-osmosis.keplr.app/cosmos/tx/v1beta1/txs
-    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"Co0BCooBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmoKK29zbW8xbWt5Njljbjhla3R3eTA4NDV2ZWM5dXBzZHBoa3R4dDBlbjk3ZjUSK29zbW8xOHMwaGRuc2xsZ2NjbHdldTlheW13NG5na3RyMmswcmt2bjdqbW4aDgoFdW9zbW8SBTk5ODAwEmQKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLs71zkN6MCxn+VRo3ksx826RH0Z9fmpStBweE+HVY2SRIECgIIARISCgwKBXVvc21vEgMyMDAQwJoMGkAMY//Md5GRUR4lVZhk558hFS3kii9QZYoYKfg4+ac/xgNeyoiEweVDhcmEvlH1orVwjLUOnYs4ly2a/yIurYVj\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
-    EXPECT_EQ(hex(output.signature()), "0c63ffcc779191511e25559864e79f21152de48a2f50658a1829f838f9a73fc6035eca8884c1e54385c984be51f5a2b5708cb50e9d8b38972d9aff222ead8563");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/Osmosis/TWCoinTypeTests.cpp b/tests/Osmosis/TWCoinTypeTests.cpp
deleted file mode 100644
index dc9b81fe90e..00000000000
--- a/tests/Osmosis/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWOsmosisCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOsmosis));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("5A6E50A6F2927E4B8C87BB094D5FBF15F1287429A09111806FC44B3CD86CACA8"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOsmosis, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOsmosis, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOsmosis));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOsmosis));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOsmosis), 6);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeOsmosis));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeOsmosis));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeOsmosis));
-    assertStringsEqual(symbol, "OSMO");
-    assertStringsEqual(txUrl, "https://mintscan.io/osmosis/txs/5A6E50A6F2927E4B8C87BB094D5FBF15F1287429A09111806FC44B3CD86CACA8");
-    assertStringsEqual(accUrl, "https://mintscan.io/osmosis/account/osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5");
-    assertStringsEqual(id, "osmosis");
-    assertStringsEqual(name, "Osmosis");
-}
diff --git a/tests/POANetwork/TWCoinTypeTests.cpp b/tests/POANetwork/TWCoinTypeTests.cpp
deleted file mode 100644
index 37ca284bc69..00000000000
--- a/tests/POANetwork/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWPOANetworkCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypePOANetwork));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypePOANetwork, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypePOANetwork, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypePOANetwork));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypePOANetwork));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypePOANetwork), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypePOANetwork));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypePOANetwork));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypePOANetwork));
-    assertStringsEqual(symbol, "POA");
-    assertStringsEqual(txUrl, "https://blockscout.com/poa/core/tx/t123");
-    assertStringsEqual(accUrl, "https://blockscout.com/poa/core/address/a12");
-    assertStringsEqual(id, "poa");
-    assertStringsEqual(name, "POA Network");
-}
diff --git a/tests/Polkadot/AddressTests.cpp b/tests/Polkadot/AddressTests.cpp
deleted file mode 100644
index d2b4b74a230..00000000000
--- a/tests/Polkadot/AddressTests.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Polkadot/Address.h"
-#include "PublicKey.h"
-#include "PrivateKey.h"
-#include <gtest/gtest.h>
-#include <vector>
-
-namespace TW::Polkadot::tests {
-
-TEST(PolkadotAddress, Validation) {
-    // Substrate ed25519
-    ASSERT_FALSE(Address::isValid("5FqqU2rytGPhcwQosKRtW1E3ha6BJKAjHgtcodh71dSyXhoZ"));
-    // Bitcoin
-    ASSERT_FALSE(Address::isValid("1ES14c7qLb5CYhLMUekctxLgc1FV2Ti9DA"));
-    // Kusama ed25519
-    ASSERT_FALSE(Address::isValid("FHKAe66mnbk8ke8zVWE9hFVFrJN1mprFPVmD5rrevotkcDZ"));
-    // Kusama secp256k1
-    ASSERT_FALSE(Address::isValid("FxQFyTorsjVsjjMyjdgq8w5vGx8LiA1qhWbRYcFijxKKchx"));
-    // Kusama sr25519
-    ASSERT_FALSE(Address::isValid("EJ5UJ12GShfh7EWrcNZFLiYU79oogdtXFUuDDZzk7Wb2vCe"));
-
-    // Polkadot ed25519
-    ASSERT_TRUE(Address::isValid("15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu"));
-    // Polkadot sr25519
-    ASSERT_TRUE(Address::isValid("15AeCjMpcSt3Fwa47jJBd7JzQ395Kr2cuyF5Zp4UBf1g9ony"));
-}
-
-TEST(PolkadotAddress, FromPrivateKey) {
-    // subkey phrase `chief menu kingdom stereo hope hazard into island bag trick egg route`
-    auto privateKey = PrivateKey(parse_hex("0x612d82bc053d1b4729057688ecb1ebf62745d817ddd9b595bc822f5f2ba0e41a"));
-    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
-    ASSERT_EQ(address.string(), "15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu");
-}
-
-TEST(PolkadotAddress, FromPublicKey) {
-    auto publicKey = PublicKey(parse_hex("0xbeff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-    ASSERT_EQ(address.string(), "15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu");
-}
-
-TEST(PolkadotAddress, FromString) {
-    auto address = Address("15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu");
-    ASSERT_EQ(address.string(), "15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu");
-}
-
-} // namespace TW::Polkadot::tests
diff --git a/tests/Polkadot/SignerTests.cpp b/tests/Polkadot/SignerTests.cpp
deleted file mode 100644
index 17164a45ea4..00000000000
--- a/tests/Polkadot/SignerTests.cpp
+++ /dev/null
@@ -1,339 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Polkadot/Signer.h"
-#include "Polkadot/Extrinsic.h"
-#include "Polkadot/Address.h"
-#include "Polkadot/SS58Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "proto/Polkadot.pb.h"
-#include "uint256.h"
-
-#include <TrustWalletCore/TWSS58AddressType.h>
-#include <gtest/gtest.h>
-
-
-namespace TW::Polkadot::tests {
-    auto privateKey = PrivateKey(parse_hex("0xabf8e5bdbe30c65656c0a3cbd181ff8a56294a69dfedd27982aace4a76909115"));
-    auto privateKeyIOS = PrivateKey(parse_hex("37932b086586a6675e66e562fe68bd3eeea4177d066619c602fe3efc290ada62"));
-    auto privateKeyThrow2 = PrivateKey(parse_hex("70a794d4f1019c3ce002f33062f45029c4f930a56b3d20ec477f7668c6bbc37f"));
-    auto privateKeyPolkadot = PrivateKey(parse_hex("298fcced2b497ed48367261d8340f647b3fca2d9415d57c2e3c5ef90482a2266"));
-    auto addressThrow2 = "14Ztd3KJDaB9xyJtRkREtSZDdhLSbm7UUKt8Z7AwSv7q85G2";
-    auto toPublicKey = PublicKey(parse_hex("0x8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"), TWPublicKeyTypeED25519);
-    auto genesisHash = parse_hex("91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3");
-    auto controller1 = "14xKzzU1ZYDnzFj7FgdtDAYSMJNARjDc2gNw4XAFDgr4uXgp";
-
-TEST(PolkadotSigner, SignTransfer_9fd062) {
-    auto toAddress = Address("13ZLCqJNPsRZYEbwjtZZFpWt9GyFzg5WahXCVWKpWdUJqrQ5");
-
-    auto input = Proto::SigningInput();
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    auto blockHash = parse_hex("0x5d2143bb808626d63ad7e1cda70fa8697059d670a992e82cd440fbb95ea40351");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_nonce(3);
-    input.set_spec_version(26);
-    {
-        PublicKey publicKey = privateKeyThrow2.getPublicKey(TWPublicKeyTypeED25519);
-        Address address = Address(publicKey);
-        EXPECT_EQ(address.string(), addressThrow2);
-    }
-    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(5);
-
-    // era: for blockhash and block number, use curl -H "Content-Type: application/json" -H "Accept: text/plain" https://<polkadot-rpc-url>/transaction/material?noMeta=true
-    auto era = input.mutable_era();
-    era->set_block_number(3541050);
-    era->set_period(64);
-
-    auto balanceCall = input.mutable_balance_call();
-    auto transfer = balanceCall->mutable_transfer();
-    auto value = store(uint256_t(2000000000)); // 0.2
-    transfer->set_to_address(toAddress.string());
-    transfer->set_value(value.data(), value.size());
-
-    auto extrinsic = Extrinsic(input);
-    auto preimage = extrinsic.encodePayload();
-    EXPECT_EQ(hex(preimage), "05007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0300943577a5030c001a0000000500000091b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c35d2143bb808626d63ad7e1cda70fa8697059d670a992e82cd440fbb95ea40351");
-
-    auto output = Signer::sign(input);
-    // https://polkadot.subscan.io/extrinsic/0x9fd06208a6023e489147d8d93f0182b0cb7e45a40165247319b87278e08362d8
-    EXPECT_EQ(hex(output.encoded()), "3502849dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f7830073e59cef381aedf56d7af076bafff9857ffc1e3bd7d1d7484176ff5b58b73f1211a518e1ed1fd2ea201bd31869c0798bba4ffe753998c409d098b65d25dff801a5030c0005007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0300943577");
-}
-
-TEST(PolkadotSigner, SignTransferDOT) {
-
-    auto blockHash = parse_hex("0x343a3f4258fd92f5ca6ca5abdf473d86a78b0bcd0dc09c568ca594245cc8c642");
-    auto toAddress = SS58Address(toPublicKey, TWSS58AddressTypePolkadot);
-
-    auto input = Proto::SigningInput();
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    input.set_nonce(0);
-    input.set_spec_version(17);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(3);
-
-    auto& era = *input.mutable_era();
-    era.set_block_number(927699);
-    era.set_period(8);
-
-    auto balanceCall = input.mutable_balance_call();
-    auto& transfer = *balanceCall->mutable_transfer();
-    auto value = store(uint256_t(12345));
-    transfer.set_to_address(toAddress.string());
-    transfer.set_value(value.data(), value.size());
-
-    auto extrinsic = Extrinsic(input);
-    auto preimage = extrinsic.encodePayload();
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(preimage), "05008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48e5c032000000110000000300000091b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3343a3f4258fd92f5ca6ca5abdf473d86a78b0bcd0dc09c568ca594245cc8c642");
-    ASSERT_EQ(hex(output.encoded()), "29028488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee003d91a06263956d8ce3ce5c55455baefff299d9cb2bb3f76866b6828ee4083770b6c03b05d7b6eb510ac78d047002c1fe5c6ee4b37c9c5a8b09ea07677f12e50d3200000005008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48e5c0");
-}
-
-TEST(PolkadotSigner, SignTransfer_72dd5b) {
-
-    auto blockHash = parse_hex("7d5fa17b70251d0806f26156b1b698dfd09e040642fa092595ce0a78e9e84fcd");
-
-    auto input = Proto::SigningInput();
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_block_hash(blockHash.data(), blockHash.size());
-
-    input.set_nonce(1);
-    input.set_spec_version(28);
-    input.set_private_key(privateKeyIOS.bytes.data(), privateKeyIOS.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(6);
-
-    auto& era = *input.mutable_era();
-    era.set_block_number(3910736);
-    era.set_period(64);
-
-    auto balanceCall = input.mutable_balance_call();
-    auto& transfer = *balanceCall->mutable_transfer();
-    auto value = store(uint256_t(10000000000));
-    transfer.set_to_address("13ZLCqJNPsRZYEbwjtZZFpWt9GyFzg5WahXCVWKpWdUJqrQ5");
-    transfer.set_value(value.data(), value.size());
-
-    auto extrinsic = Extrinsic(input);
-    auto preimage = extrinsic.encodePayload();
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(preimage), "0500007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0700e40b5402050104001c0000000600000091b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c37d5fa17b70251d0806f26156b1b698dfd09e040642fa092595ce0a78e9e84fcd");
-    ASSERT_EQ(hex(output.encoded()), "410284008d96660f14babe708b5e61853c9f5929bc90dd9874485bf4d6dc32d3e6f22eaa0038ec4973ab9773dfcbf170b8d27d36d89b85c3145e038d68914de83cf1f7aca24af64c55ec51ba9f45c5a4d74a9917dee380e9171108921c3e5546e05be15206050104000500007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0700e40b5402");
-}
-
-TEST(PolkadotSigner, SignBond_8da66d) {
-    auto input = Proto::SigningInput();
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    auto blockHash = parse_hex("0xf1eee612825f29abd3299b486e401299df2faa55b7ce1e34bf2243bd591905fc");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_nonce(0);
-    input.set_spec_version(26);
-    {
-        PublicKey publicKey = privateKeyThrow2.getPublicKey(TWPublicKeyTypeED25519);
-        Address address = Address(publicKey);
-        EXPECT_EQ(address.string(), addressThrow2);
-    }
-    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(5);
-
-    // era: for blockhash and block number, use curl -H "Content-Type: application/json" -H "Accept: text/plain" https://<polkadot-rpc-url>/transaction/material?noMeta=true
-    auto era = input.mutable_era();
-    era->set_block_number(3540912);
-    era->set_period(64);
-
-    auto stakingCall = input.mutable_staking_call();
-    auto bond = stakingCall->mutable_bond();
-    auto value = store(uint256_t(11000000000)); // 1.1
-    bond->set_controller(addressThrow2); // myself
-    bond->set_value(value.data(), value.size());
-    bond->set_reward_destination(Proto::RewardDestination::STASH);
-
-    auto output = Signer::sign(input);
-    // https://polkadot.subscan.io/extrinsic/0x8da66d3fe0f592cff714ec107289370365117a1abdb72a19ac91181fdcf62bba
-    ASSERT_EQ(hex(output.encoded()), "3d02849dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f783009025843bc49c1c4fbc99dbbd290c92f9879665d55b02f110abfb4800f0e7630877d2cffd853deae7466c22fbc8616a609e1b92615bb365ea8adccba5ef7624050503000007009dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f7830700aea68f0201");
-}
-
-TEST(PolkadotSigner, SignBondAndNominate_4955314_2) {
-
-    auto key = parse_hex("7f44b19b391a8015ca4c7d94097b3695867a448d1391e7f3243f06987bdb6858");
-    auto input = Proto::SigningInput();
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_block_hash(genesisHash.data(), genesisHash.size());
-    input.set_nonce(4);
-    input.set_spec_version(30);
-    input.set_private_key(key.data(), key.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(7);
-
-    auto stakingCall = input.mutable_staking_call();
-    auto bondnom = stakingCall->mutable_bond_and_nominate();
-    auto value = store(uint256_t(10000000000)); // 1 DOT
-    bondnom->set_controller("13ZLCqJNPsRZYEbwjtZZFpWt9GyFzg5WahXCVWKpWdUJqrQ5");
-    bondnom->set_value(value.data(), value.size());
-    bondnom->set_reward_destination(Proto::RewardDestination::STASH);
-    bondnom->add_nominators("1zugcavYA9yCuYwiEYeMHNJm9gXznYjNfXQjZsZukF1Mpow");
-    bondnom->add_nominators("15oKi7HoBQbwwdQc47k71q4sJJWnu5opn1pqoGx4NAEYZSHs");
-
-    auto output = Signer::sign(input);
-    // https://polkadot.subscan.io/extrinsic/4955314-2
-    ASSERT_EQ(hex(output.encoded()), "6103840036092fac541e0e5feda19e537c679b487566d7101141c203ac8322c27e5f076a00a8b1f859d788f11a958e98b731358f89cf3fdd41a667ea992522e8d4f46915f4c03a1896f2ac54bdc5f16e2ce8a2a3bf233d02aad8192332afd2113ed6688e0d0010001a02080700007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0700e40b540201070508002c2a55b5ffdca266bd0207df97565b03255f70783ca1a349be5ed9f44589c36000d44533a4d21fd9d6f5d57c8cd05c61a6f23f9131cec8ae386b6b437db399ec3d");
-}
-
-TEST(PolkadotSigner, SignNominate_452522) {
-    auto input = Proto::SigningInput();
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    auto blockHash = parse_hex("0x211787d016e39007ac054547737a10542620013e73648b3134541d536cb44e2c");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_nonce(1);
-    input.set_spec_version(26);
-    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(5);
-
-    // era: for blockhash and block number, use curl -H "Content-Type: application/json" -H "Accept: text/plain" https://<polkadot-rpc-url>/transaction/material?noMeta=true
-    auto era = input.mutable_era();
-    era->set_block_number(3540945);
-    era->set_period(64);
-
-    auto stakingCall = input.mutable_staking_call();
-    auto nominate = stakingCall->mutable_nominate();
-
-    nominate->add_nominators(controller1);
-    nominate->add_nominators("1REAJ1k691g5Eqqg9gL7vvZCBG7FCCZ8zgQkZWd4va5ESih");
-
-    auto output = Signer::sign(input);
-    // https://polkadot.subscan.io/extrinsic/0x4525224b7d8f3e58de3a54a9fbfd071401c2b737f314c972a2bb087a0ff508a6
-    ASSERT_EQ(hex(output.encoded()), "a502849dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f78300d73ff0dc456704743f70173a56e6c13e88a6e1dddb38a23552a066e44fb64e2c9d8a5e9a76afb9489b8540365f668bddd34b7d9c8dbdc4600e6316080e55a30315010400070508aee72821ca00e62304e4f0d858122a65b87c8df4f0eae224ae064b951d39f610127a30e486492921e58f2564b36ab1ca21ff630672f0e76920edd601f8f2b89a");
-}
-
-TEST(PolkadotSigner, SignNominate2) {
-    auto blockHash = parse_hex("d22a6b2e3e61325050718bd04a14da9efca1f41c9f0a525c375d36106e25af68");
-    auto input = Proto::SigningInput();
-
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_nonce(0);
-    input.set_spec_version(17);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(3);
-
-    auto stakingCall = input.mutable_staking_call();
-    auto& nominate = *stakingCall->mutable_nominate();
-    // payload size larger than 256, will be hashed
-    nominate.add_nominators("1zugcabYjgfQdMLC3cAzQ8tJZMo45tMnGpivpAzpxB4CZyK");
-    nominate.add_nominators("1REAJ1k691g5Eqqg9gL7vvZCBG7FCCZ8zgQkZWd4va5ESih");
-    nominate.add_nominators("1WG3jyNqniQMRZGQUc7QD2kVLT8hkRPGMSqAb5XYQM1UDxN");
-    nominate.add_nominators("16QFrtU6kDdBjxY8qEKz5EEfuDkHxqG8pix3wSGKQzRcuWHo");
-    nominate.add_nominators("14ShUZUYUR35RBZW6uVVt1zXDxmSQddkeDdXf1JkMA6P721N");
-    nominate.add_nominators("15MUBwP6dyVw5CXF9PjSSv7SdXQuDSwjX86v1kBodCSWVR7c");
-
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.encoded()), "a1048488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee00135bbc68b67fffadaf7e98b6402c4fc60382765f543225083a024b0e0ff8071d4ec4ddd67a65828113cc76f3208765608be010d2fcfdcd47e8fe342872704c000000000705182c2a55b5a116a4c88aff57e8f2b70ba72dda72dda4b78630e16ad0ca69006f18127a30e486492921e58f2564b36ab1ca21ff630672f0e76920edd601f8f2b89a1650c532ed1a8641e8922aa24ade0ff411d03edd9ed1c6b7fe42f1a801cee37ceee9d5d071a418b51c02b456d5f5cefd6231041ad59b0e8379c59c11ba4a2439984e16482c99cfad1436111e321a86d87d0fac203bf64538f888e45d793b5413c08d5de7a5d97bea2c7ddf516d0635bddc43f326ae2f80e2595b49d4a08c4619");
-}
-
-TEST(PolkadotSigner, SignChill) {
-    auto blockHash = parse_hex("1d4a1ecc8b1c37bf0ba5d3e0bf14ec5402fbb035eeaf6d8042c07ca5f8c57429");
-    auto input = Proto::SigningInput();
-
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_nonce(0);
-    input.set_spec_version(17);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(3);
-
-    auto stakingCall = input.mutable_staking_call();
-    auto __attribute__((unused)) &chill = *stakingCall->mutable_chill();
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.encoded()), "9d018488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee0088b5e1cd93ba74b82e329f95e1b22660385970182172b2ae280801fdd1ee5652cf7bf319e5e176ccc299dd8eb1e7fccb0ea7717efaf4aacd7640789dd09c1e070000000706");
-}
-
-TEST(PolkadotSigner, SignWithdraw) {
-    auto blockHash = parse_hex("7b4d1d1e2573eabcc90a3e96058eb0d8d21d7a0b636e8030d152d9179a345dda");
-    auto input = Proto::SigningInput();
-
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_nonce(0);
-    input.set_spec_version(17);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(3);
-
-    auto stakingCall = input.mutable_staking_call();
-    auto& withdraw = *stakingCall->mutable_withdraw_unbonded();
-    withdraw.set_slashing_spans(10);
-
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.encoded()), "ad018488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee002e49bf0dec9bef01dd3bd25419e2147dc983613d0860108f889f9ff2d062c5e3267e309e2dbc35dd2fc2b877b57d86a5f12cbeb8217485be32be3c34d2507d0e00000007030a000000");
-}
-
-TEST(PolkadotSigner, SignUnbond_070957) {
-    auto input = Proto::SigningInput();
-
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    auto blockHash = parse_hex("0x53040c71c6061bd256346b81fcb3545c13b5c34c7cd0c2c25f00aa6e564b16d5");
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_nonce(2);
-    input.set_spec_version(26);
-    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(5);
-
-    auto era = input.mutable_era();
-    era->set_block_number(3540983);
-    era->set_period(64);
-
-    auto stakingCall = input.mutable_staking_call();
-    auto unbond = stakingCall->mutable_unbond();
-    auto value = store(uint256_t(4000000000));
-    unbond->set_value(value.data(), value.size());
-
-    auto output = Signer::sign(input);
-    // https://polkadot.subscan.io/extrinsic/0x070957ab697adbe11f7d72a1314d0a81d272a747d2e6880818073317125f980a
-    ASSERT_EQ(hex(output.encoded()), "b501849dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f783003a762d9dc3f2aba8922c4babf7e6622ca1d74da17ab3f152d8f29b0ffee53c7e5e150915912a9dfd98ef115d272e096543eef9f513207dd606eea97d023a64087503080007020300286bee");
-}
-
-TEST(PolkadotSigner, SignChillAndUnbond) {
-    auto blockHash = parse_hex("0x35ba668bb19453e8da6334cadcef2a27c8d4141bfc8b49e78e853c3d73e1ecd0");
-    auto input = Proto::SigningInput();
-
-    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
-    input.set_block_hash(blockHash.data(), blockHash.size());
-    input.set_nonce(6);
-    input.set_spec_version(9200);
-    input.set_private_key(privateKeyPolkadot.bytes.data(), privateKeyPolkadot.bytes.size());
-    input.set_network(Proto::Network::POLKADOT);
-    input.set_transaction_version(12);
-
-    auto era = input.mutable_era();
-    era->set_block_number(10541373);
-    era->set_period(64);
-
-    auto stakingCall = input.mutable_staking_call();
-    auto chillBond = stakingCall->mutable_chill_and_unbond();
-    auto value = store(uint256_t(100500000000)); // 10.05 DOT
-    chillBond->set_value(value.data(), value.size());
-
-    auto output = Signer::sign(input);
-    // https://polkadot.subscan.io/extrinsic/10541383-2
-    ASSERT_EQ(hex(output.encoded()), "d10184008361bd08ddca5fda28b5e2aa84dc2621de566e23e089e555a42194c3eaf2da7900c891ba102db672e378945d74cf7f399226a76b43cab502436971599255451597fc2599902e4b62c7ce85ecc3f653c693fef3232be620984b5bb5bcecbbd7b209d50318001a02080706070207004d446617");
-}
-
-} // namespace TW::Polkadot::tests
diff --git a/tests/Polkadot/TWCoinTypeTests.cpp b/tests/Polkadot/TWCoinTypeTests.cpp
deleted file mode 100644
index f5504a5c30f..00000000000
--- a/tests/Polkadot/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-TEST(TWPolkadotCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypePolkadot));
-
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb96f97d8ee508f420e606e1a6dcc74b88844713ddec2bd7cf4e3aa6b1d6beef4"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypePolkadot, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("13hJFqnkqQbmgnGQteGntjMjTdmTBRE8Z93JqxsrpgT7Yjd2"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypePolkadot, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypePolkadot));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypePolkadot));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypePolkadot), 10);
-    ASSERT_EQ(TWBlockchainPolkadot, TWCoinTypeBlockchain(TWCoinTypePolkadot));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypePolkadot));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypePolkadot));
-    assertStringsEqual(symbol, "DOT");
-    assertStringsEqual(txUrl, "https://polkadot.subscan.io/extrinsic/0xb96f97d8ee508f420e606e1a6dcc74b88844713ddec2bd7cf4e3aa6b1d6beef4");
-    assertStringsEqual(accUrl, "https://polkadot.subscan.io/account/13hJFqnkqQbmgnGQteGntjMjTdmTBRE8Z93JqxsrpgT7Yjd2");
-    assertStringsEqual(id, "polkadot");
-    assertStringsEqual(name, "Polkadot");
-}
diff --git a/tests/Polygon/TWCoinTypeTests.cpp b/tests/Polygon/TWCoinTypeTests.cpp
deleted file mode 100644
index a1810ade109..00000000000
--- a/tests/Polygon/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWPolygonCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypePolygon));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xe26ed1470d5bf99a53d687843e7acdf7e4ba6620af93b4d672e714de90476e8e"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypePolygon, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x720E1fa107A1Df39Db4E78A3633121ac36Bec132"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypePolygon, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypePolygon));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypePolygon));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypePolygon), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypePolygon));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypePolygon));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypePolygon));
-    assertStringsEqual(symbol, "MATIC");
-    assertStringsEqual(txUrl, "https://polygonscan.com/tx/0xe26ed1470d5bf99a53d687843e7acdf7e4ba6620af93b4d672e714de90476e8e");
-    assertStringsEqual(accUrl, "https://polygonscan.com/address/0x720E1fa107A1Df39Db4E78A3633121ac36Bec132");
-    assertStringsEqual(id, "polygon");
-    assertStringsEqual(name, "Polygon");
-}
diff --git a/tests/PublicKeyTests.cpp b/tests/PublicKeyTests.cpp
deleted file mode 100644
index 1154e3d8d6f..00000000000
--- a/tests/PublicKeyTests.cpp
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "PublicKey.h"
-
-#include "Hash.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(PublicKeyTests, CreateFromPrivateSecp256k1) {
-    const Data key = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
-    auto privateKey = PrivateKey(key);
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(publicKey.bytes.size(), 33ul);
-    EXPECT_EQ(hex(publicKey.bytes), "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1");
-    EXPECT_EQ(publicKey.isCompressed(), true);
-    EXPECT_TRUE(PublicKey::isValid(publicKey.bytes, TWPublicKeyTypeSECP256k1));
-}
-
-TEST(PublicKeyTests, CreateFromDataSecp256k1) {
-    const Data key = parse_hex("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1");
-    PublicKey publicKey(key, TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(hex(publicKey.bytes), hex(key));
-}
-
-TEST(PublicKeyTests, CreateInvalid) {
-    const Data keyInvalid = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32af"); // too short
-    try {
-        PublicKey publicKey(keyInvalid, TWPublicKeyTypeSECP256k1);
-    } catch (const std::invalid_argument&) {
-        return; // OK
-    }
-    FAIL() << "Missing expected exception";
-}
-
-TEST(PublicKeyTests, CreateBlake) {
-    const auto privateKeyHex = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
-    const auto publicKeyKeyHex = "b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9";
-    {
-        auto publicKey = PrivateKey(parse_hex(privateKeyHex)).getPublicKey(TWPublicKeyTypeED25519Blake2b);
-        EXPECT_EQ(hex(publicKey.bytes), publicKeyKeyHex);
-        EXPECT_EQ(publicKey.bytes.size(), 32ul);
-    }
-    {
-        const auto publicKey = PublicKey(parse_hex(publicKeyKeyHex), TWPublicKeyTypeED25519Blake2b);
-        EXPECT_EQ(hex(publicKey.bytes), publicKeyKeyHex);
-    }
-}
-
-TEST(PublicKeyTests, CompressedExtended) {
-    const Data key = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
-    auto privateKey = PrivateKey(key);
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(publicKey.type, TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(publicKey.bytes.size(), 33ul);
-    EXPECT_EQ(publicKey.isCompressed(), true);
-    EXPECT_TRUE(PublicKey::isValid(publicKey.bytes, TWPublicKeyTypeSECP256k1));
-    EXPECT_EQ(hex(publicKey.bytes), std::string("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1"));
-
-    auto extended = publicKey.extended();
-    EXPECT_EQ(extended.type, TWPublicKeyTypeSECP256k1Extended);
-    EXPECT_EQ(extended.bytes.size(), 65ul);
-    EXPECT_EQ(extended.isCompressed(), false);
-    EXPECT_TRUE(PublicKey::isValid(extended.bytes, TWPublicKeyTypeSECP256k1Extended));
-    EXPECT_EQ(hex(extended.bytes), std::string("0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91"));
-
-    auto compressed = extended.compressed();
-    EXPECT_EQ(compressed.type, TWPublicKeyTypeSECP256k1);
-    EXPECT_TRUE(compressed == publicKey);
-    EXPECT_EQ(compressed.bytes.size(), 33ul);
-    EXPECT_EQ(compressed.isCompressed(), true);
-    EXPECT_TRUE(PublicKey::isValid(compressed.bytes, TWPublicKeyTypeSECP256k1));
-    EXPECT_EQ(hex(compressed.bytes), std::string("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1"));
-
-    auto extended2 = extended.extended();
-    EXPECT_EQ(extended2.type, TWPublicKeyTypeSECP256k1Extended);
-    EXPECT_EQ(extended2.bytes.size(), 65ul);
-    EXPECT_EQ(extended2.isCompressed(), false);
-
-    auto compressed2 = compressed.compressed();
-    EXPECT_EQ(compressed2.type, TWPublicKeyTypeSECP256k1);
-    EXPECT_TRUE(compressed2 == publicKey);
-    EXPECT_EQ(compressed2.bytes.size(), 33ul);
-    EXPECT_EQ(compressed2.isCompressed(), true);
-}
-
-TEST(PublicKeyTests, CompressedExtendedNist) {
-    const Data key = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
-    auto privateKey = PrivateKey(key);
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1);
-    EXPECT_EQ(publicKey.type, TWPublicKeyTypeNIST256p1);
-    EXPECT_EQ(publicKey.bytes.size(), 33ul);
-    EXPECT_EQ(publicKey.isCompressed(), true);
-    EXPECT_TRUE(PublicKey::isValid(publicKey.bytes, TWPublicKeyTypeNIST256p1));
-    EXPECT_EQ(hex(publicKey.bytes), std::string("026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab"));
-
-    auto extended = publicKey.extended();
-    EXPECT_EQ(extended.type, TWPublicKeyTypeNIST256p1Extended);
-    EXPECT_EQ(extended.bytes.size(), 65ul);
-    EXPECT_EQ(extended.isCompressed(), false);
-    EXPECT_TRUE(PublicKey::isValid(extended.bytes, TWPublicKeyTypeNIST256p1Extended));
-    EXPECT_EQ(hex(extended.bytes), std::string("046d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab918b4fe46ccbf56701fb210d67d91c5779468f6b3fdc7a63692b9b62543f47ae"));
-
-    auto compressed = extended.compressed();
-    EXPECT_EQ(compressed.type, TWPublicKeyTypeNIST256p1);
-    EXPECT_TRUE(compressed == publicKey);
-    EXPECT_EQ(compressed.bytes.size(), 33ul);
-    EXPECT_EQ(compressed.isCompressed(), true);
-    EXPECT_TRUE(PublicKey::isValid(compressed.bytes, TWPublicKeyTypeNIST256p1));
-    EXPECT_EQ(hex(compressed.bytes), std::string("026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab"));
-
-    auto extended2 = extended.extended();
-    EXPECT_EQ(extended2.type, TWPublicKeyTypeNIST256p1Extended);
-    EXPECT_EQ(extended2.bytes.size(), 65ul);
-    EXPECT_EQ(extended2.isCompressed(), false);
-
-    auto compressed2 = compressed.compressed();
-    EXPECT_EQ(compressed2.type, TWPublicKeyTypeNIST256p1);
-    EXPECT_TRUE(compressed2 == publicKey);
-    EXPECT_EQ(compressed2.bytes.size(), 33ul);
-    EXPECT_EQ(compressed2.isCompressed(), true);
-}
-
-TEST(PublicKeyTests, CompressedExtendedED25519) {
-    const Data key = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
-    auto privateKey = PrivateKey(key);
-    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    EXPECT_EQ(publicKey.type, TWPublicKeyTypeED25519);
-    EXPECT_EQ(publicKey.bytes.size(), 32ul);
-    EXPECT_EQ(publicKey.isCompressed(), true);
-    EXPECT_TRUE(PublicKey::isValid(publicKey.bytes, TWPublicKeyTypeED25519));
-    EXPECT_EQ(hex(publicKey.bytes), std::string("4870d56d074c50e891506d78faa4fb69ca039cc5f131eb491e166b975880e867"));
-
-    auto extended = publicKey.extended();
-    EXPECT_EQ(extended.type, TWPublicKeyTypeED25519);
-    EXPECT_TRUE(extended == publicKey);
-    EXPECT_EQ(extended.bytes.size(), 32ul);
-    EXPECT_EQ(extended.isCompressed(), true);
-
-    auto compressed = publicKey.compressed();
-    EXPECT_EQ(compressed.type, TWPublicKeyTypeED25519);
-    EXPECT_TRUE(compressed == publicKey);
-    EXPECT_EQ(compressed.bytes.size(), 32ul);
-    EXPECT_EQ(compressed.isCompressed(), true);
-}
-
-TEST(PublicKeyTests, IsValidWrongType) {
-    EXPECT_FALSE(PublicKey::isValid(parse_hex("deadbeef"), (enum TWPublicKeyType)99));
-}
-
-TEST(PublicKeyTests, Verify) {
-    const auto privateKey = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
-
-    const char* message = "Hello";
-    const Data messageData = TW::data(message);
-    const Data digest = Hash::sha256(messageData);
-
-    {
-        const auto signature = privateKey.sign(digest, TWCurveSECP256k1);
-        const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-        EXPECT_TRUE(publicKey.verify(signature, digest));
-        EXPECT_EQ(hex(signature), "0f5d5a9e5fc4b82a625312f3be5d3e8ad017d882de86c72c92fcefa924e894c12071772a14201a3a0debf381b5e8dea39fadb9bcabdc02ee71ab018f55bf717f01");
-    }
-    {
-        const auto signature = privateKey.sign(digest, TWCurveED25519);
-        const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-        EXPECT_TRUE(publicKey.verify(signature, digest));
-        EXPECT_EQ(hex(signature), "42848abf2641a731e18b8a1fb80eff341a5acebdc56faeccdcbadb960aef775192842fccec344679446daa4d02d264259c8f9aa364164ebe0ebea218581e2e03");
-    }
-    {
-        const auto signature = privateKey.sign(digest, TWCurveED25519Blake2bNano);
-        const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Blake2b);
-        EXPECT_TRUE(publicKey.verify(signature, digest));
-        EXPECT_EQ(hex(signature), "5c1473944cd0234ebc5a91b2966b9e707a33b936dadd149417a2e53b6b3fc97bef17b767b1690708c74d7b4c8fe48703fd44a6ef59d4cc5b9f88ba992db0a003");
-    }
-    {
-        const auto signature = privateKey.sign(digest, TWCurveNIST256p1);
-        const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1Extended);
-        EXPECT_TRUE(publicKey.verify(signature, digest));
-        EXPECT_EQ(hex(signature), "2e4655831f0c60729583595c103bf0d862af6313e4326f03f512682106c792822f5a9cd21e7d4a3316c2d337e5eee649b09c34f7b4407344f0d32e8d33167d8901");
-    }
-}
-
-TEST(PublicKeyTests, VerifyAsDER) {
-    const auto privateKey = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
-
-    const char* message = "Hello";
-    const Data messageData = TW::data(message);
-    const Data digest = Hash::sha256(messageData);
-
-    const auto signature = privateKey.signAsDER(digest);
-    EXPECT_EQ(signature.size(), 70ul);
-    EXPECT_EQ(hex(signature), "304402200f5d5a9e5fc4b82a625312f3be5d3e8ad017d882de86c72c92fcefa924e894c102202071772a14201a3a0debf381b5e8dea39fadb9bcabdc02ee71ab018f55bf717f");
-
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_EQ(hex(publicKey.bytes), "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1");
-
-    EXPECT_TRUE(publicKey.verifyAsDER(signature, digest));
-
-    EXPECT_FALSE(publicKey.verify(signature, digest));
-
-    { // Negative: wrong key type
-        const auto publicKeyWrong = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1Extended);
-        EXPECT_FALSE(publicKeyWrong.verifyAsDER(signature, digest));
-    }
-}
-
-TEST(PublicKeyTests, VerifyEd25519Extended) {
-    const auto privateKey = PrivateKey(parse_hex("e8c8c5b2df13f3abed4e6b1609c808e08ff959d7e6fc3d849e3f2880550b574437aa559095324d78459b9bb2da069da32337e1cc5da78f48e1bd084670107f3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fae0d152bb611cb9ff34e945e4ff627e6fba81da687a601a879759cd76530b5744424db69a75edd4780a5fbc05d1a3c84ac4166ff8e424808481dd8e77627ce5f5bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
-
-    const auto message = TW::data("Hello");
-    const auto digest = Hash::sha256(message);
-    const auto signature = privateKey.sign(digest, TWCurveED25519ExtendedCardano);
-    const auto valid = publicKey.verify(signature, digest);
-
-    EXPECT_TRUE(valid);
-}
-
-TEST(PublicKeyTests, VerifySchnorr) {
-    const auto key = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
-    const auto privateKey = PrivateKey(key);
-
-    const Data messageData = TW::data("hello schnorr");
-    const Data digest = Hash::sha256(messageData);
-
-    const auto signature = privateKey.signZilliqa(digest);
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    EXPECT_TRUE(publicKey.verifyZilliqa(signature, digest));
-    EXPECT_EQ(hex(signature), "b8118ccb99563fe014279c957b0a9d563c1666e00367e9896fe541765246964f64a53052513da4e6dc20fdaf69ef0d95b4ca51c87ad3478986cf053c2dd0b853");
-}
-
-TEST(PublicKeyTests, VerifySchnorrWrongType) {
-    const auto key = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
-    const auto privateKey = PrivateKey(key);
-
-    const Data messageData = TW::data("hello schnorr");
-    const Data digest = Hash::sha256(messageData);
-
-    const auto signature = privateKey.signZilliqa(digest);
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1);
-    EXPECT_FALSE(publicKey.verifyZilliqa(signature, digest));
-}
-
-TEST(PublicKeyTests, Recover) {
-    {
-        const auto message = parse_hex("de4e9524586d6fce45667f9ff12f661e79870c4105fa0fb58af976619bb11432");
-        const auto signature = parse_hex("00000000000000000000000000000000000000000000000000000000000000020123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef80");
-        const auto publicKey = PublicKey::recover(signature, message);
-        EXPECT_EQ(publicKey.type, TWPublicKeyTypeSECP256k1Extended);
-        EXPECT_EQ(hex(publicKey.bytes),
-            "0456d8089137b1fd0d890f8c7d4a04d0fd4520a30b19518ee87bd168ea12ed8090329274c4c6c0d9df04515776f2741eeffc30235d596065d718c3973e19711ad0");
-    }
-
-    const auto privateKey = PrivateKey(parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
-    EXPECT_EQ(hex(publicKey.bytes), "0463ade8ebc212b85e7e4278dc3dcb4f9cc18aab912ef5d302b5d1940e772e9e1a9213522efddad487bbd5dd7907e8e776f918e9a5e4cb51893724e9fe76792a4f");
-    {
-        const auto message = parse_hex("6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155");
-        const auto signature = parse_hex("92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c646487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e5800");
-        const auto recovered = PublicKey::recover(signature, message);
-        EXPECT_EQ(hex(recovered.bytes), hex(publicKey.bytes));
-    }
-    { // same with v=27
-        const auto message = parse_hex("6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155");
-        const auto signature = parse_hex("92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c646487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e581b");
-        const auto recovered = PublicKey::recover(signature, message);
-        EXPECT_EQ(hex(recovered.bytes), hex(publicKey.bytes));
-    }
-    { // same with v=35+2
-        const auto message = parse_hex("6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155");
-        const auto signature = parse_hex("92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c646487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e5825");
-        const auto recovered = PublicKey::recover(signature, message);
-        EXPECT_EQ(hex(recovered.bytes), hex(publicKey.bytes));
-    }
-}
-
-TEST(PublicKeyTests, isValidED25519) {
-    EXPECT_TRUE(PublicKey::isValid(parse_hex("beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519));
-    EXPECT_TRUE(PublicKey(parse_hex("beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519).isValidED25519());
-    EXPECT_TRUE(PublicKey::isValid(parse_hex("fc8c425a8a94a55ce42f2c24b2fb2ef5ab4a69142d2d97f6c11e0106c84136d5"), TWPublicKeyTypeED25519));
-    EXPECT_TRUE(PublicKey(parse_hex("fc8c425a8a94a55ce42f2c24b2fb2ef5ab4a69142d2d97f6c11e0106c84136d5"), TWPublicKeyTypeED25519).isValidED25519());
-    EXPECT_TRUE(PublicKey::isValid(parse_hex("01beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519));
-    EXPECT_TRUE(PublicKey(parse_hex("01beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519).isValidED25519());
-    // Following 32 bytes are not valid public keys (not on the curve)
-    EXPECT_TRUE(PublicKey::isValid(parse_hex("8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"), TWPublicKeyTypeED25519));
-    EXPECT_FALSE(PublicKey(parse_hex("8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"), TWPublicKeyTypeED25519).isValidED25519());
-    EXPECT_TRUE(PublicKey::isValid(parse_hex("51fdd5feae59d7dcbf5ebea99c05593ebee302577a5486ceac706ed568aa1e0e"), TWPublicKeyTypeED25519));
-    EXPECT_FALSE(PublicKey(parse_hex("51fdd5feae59d7dcbf5ebea99c05593ebee302577a5486ceac706ed568aa1e0e"), TWPublicKeyTypeED25519).isValidED25519());
-    // invalid input size/format
-    EXPECT_FALSE(PublicKey::isValid(parse_hex("1234"), TWPublicKeyTypeED25519));
-    EXPECT_FALSE(PublicKey::isValid(parse_hex("beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa5279"), TWPublicKeyTypeED25519));
-    EXPECT_FALSE(PublicKey::isValid(parse_hex("02beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519));
-    EXPECT_FALSE(PublicKey::isValid(parse_hex("0101beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519));
-    EXPECT_FALSE(PublicKey(parse_hex("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1"), TWPublicKeyTypeSECP256k1).isValidED25519());
-}
diff --git a/tests/Qtum/TWCoinTypeTests.cpp b/tests/Qtum/TWCoinTypeTests.cpp
deleted file mode 100644
index bef8e814b59..00000000000
--- a/tests/Qtum/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWQtumCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeQtum));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeQtum, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeQtum, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeQtum));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeQtum));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeQtum), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeQtum));
-    ASSERT_EQ(0x32, TWCoinTypeP2shPrefix(TWCoinTypeQtum));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeQtum));
-    assertStringsEqual(symbol, "QTUM");
-    assertStringsEqual(txUrl, "https://qtum.info/tx/t123");
-    assertStringsEqual(accUrl, "https://qtum.info/address/a12");
-    assertStringsEqual(id, "qtum");
-    assertStringsEqual(name, "Qtum");
-}
diff --git a/tests/Ravencoin/TWCoinTypeTests.cpp b/tests/Ravencoin/TWCoinTypeTests.cpp
deleted file mode 100644
index f639dfe6bba..00000000000
--- a/tests/Ravencoin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWRavencoinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeRavencoin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeRavencoin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeRavencoin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeRavencoin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeRavencoin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeRavencoin), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeRavencoin));
-    ASSERT_EQ(0x7a, TWCoinTypeP2shPrefix(TWCoinTypeRavencoin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeRavencoin));
-    assertStringsEqual(symbol, "RVN");
-    assertStringsEqual(txUrl, "https://ravencoin.network/tx/t123");
-    assertStringsEqual(accUrl, "https://ravencoin.network/address/a12");
-    assertStringsEqual(id, "ravencoin");
-    assertStringsEqual(name, "Ravencoin");
-}
diff --git a/tests/Ronin/TWAnyAddressTests.cpp b/tests/Ronin/TWAnyAddressTests.cpp
deleted file mode 100644
index d2e0bde63c7..00000000000
--- a/tests/Ronin/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWCoinType.h>
-
-#include "Ronin/Address.h"
-#include "Ronin/Entry.h"
-
-#include <gtest/gtest.h>
-
-const auto roninPrefixChecksummed = "ronin:EC49280228b0D05Aa8e8b756503254e1eE7835ab";
-
-const auto gTests = {
-    roninPrefixChecksummed,
-    "ronin:ec49280228b0d05aa8e8b756503254e1ee7835ab",
-    "0xEC49280228b0D05Aa8e8b756503254e1eE7835ab",
-    "ronin:0xEC49280228b0D05Aa8e8b756503254e1eE7835ab",
-};
-
-TEST(RoninAnyAddress, Validate) {
-    for (const auto& t: gTests) {
-        EXPECT_TRUE(TWAnyAddressIsValid(STRING(t).get(), TWCoinTypeRonin));
-    }
-}
-
-TEST(RoninAnyAddress, Normalize) {
-    for (const auto& t: gTests) {
-        auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING(t).get(), TWCoinTypeRonin));
-        auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
-        EXPECT_TRUE(TWStringEqual(string2.get(), STRING(roninPrefixChecksummed).get()));
-
-        auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-        assertHexEqual(keyHash, "ec49280228b0d05aa8e8b756503254e1ee7835ab");
-    }
-}
-
-TEST(RoninAnyAddress, Invalid) {
-    const auto tests = {
-        "EC49280228b0D05Aa8e8b756503254e1eE7835ab", // no prefix
-        "ec49280228b0d05aa8e8b756503254e1ee7835ab", // no prefix
-        "roni:EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
-        "ronin=EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
-        "0xronin:EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
-        "EC49280228b0D05Aa8e8b756503254e1eE7835", // too short
-        "ronin:EC49280228b0D05Aa8e8b756503254e1eE7835", // too short
-        "ronin:ec49280228b0d05aa8e8b756503254e1ee7835", // too short
-    };
-
-    for (const auto& t: tests) {
-        EXPECT_FALSE(TWAnyAddressIsValid(STRING(t).get(), TWCoinTypeRonin));
-    }
-}
diff --git a/tests/Ronin/TWAnySignerTests.cpp b/tests/Ronin/TWAnySignerTests.cpp
deleted file mode 100644
index 3f852a1dab2..00000000000
--- a/tests/Ronin/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/Ethereum.pb.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::Ronin::tests {
-
-TEST(TWAnySignerRonin, Sign) {
-    // https://explorer.roninchain.com/tx/0xf13a2c4421700f8782ca73eaf16bb8baf82bcf093e23570a1ff062cdd8dbf6c3
-    Ethereum::Proto::SigningInput input;
-    auto chainId = store(uint256_t(2020));
-    auto nonce = store(uint256_t(0));
-    auto gasPrice = store(uint256_t(1000000000));
-    auto gasLimit = store(uint256_t(21000));
-    auto key = parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
-
-    input.set_chain_id(chainId.data(), chainId.size());
-    input.set_nonce(nonce.data(), nonce.size());
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(gasLimit.data(), gasLimit.size());
-    input.set_private_key(key.data(), key.size());
-    input.set_to_address("ronin:c36edf48e21cf395b206352a1819de658fd7f988");
-
-    auto& transfer = *input.mutable_transaction()->mutable_transfer();
-    auto amount = store(uint256_t(276447));
-    transfer.set_amount(amount.data(), amount.size());
-
-    std::string expected = "f86880843b9aca0082520894c36edf48e21cf395b206352a1819de658fd7f988830437df80820feca0442aa06b0d0465bfecf84b28e2ce614a32a1ccc12735dc03a5799517d6659d7aa004e1bf2efa30743f1b6d49dbec2671e9fb5ead1e7da15e352ca1df6fb86a8ba7";
-
-    // sign test
-    Ethereum::Proto::SigningOutput output;
-
-    ANY_SIGN(input, TWCoinTypeRonin);
-
-    ASSERT_EQ(hex(output.encoded()), expected);
-    EXPECT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeRonin));
-}
-
-} // namespace TW::Ronin::tests
diff --git a/tests/Ronin/TWCoinTypeTests.cpp b/tests/Ronin/TWCoinTypeTests.cpp
deleted file mode 100644
index 5d29a67771e..00000000000
--- a/tests/Ronin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWRoninCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeRonin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xc09835aaf9c1cacea8ce322865583c791d3a4dfbd9a3b72f79539db88d3697ab"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeRonin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xdc05ecd5fbdb64058d94f3182d66f44342b9adcb"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeRonin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeRonin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeRonin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeRonin), 18);
-    ASSERT_EQ(TWBlockchainRonin, TWCoinTypeBlockchain(TWCoinTypeRonin));
-
-    assertStringsEqual(symbol, "RON");
-    assertStringsEqual(txUrl, "https://explorer.roninchain.com/tx/0xc09835aaf9c1cacea8ce322865583c791d3a4dfbd9a3b72f79539db88d3697ab");
-    assertStringsEqual(accUrl, "https://explorer.roninchain.com/address/0xdc05ecd5fbdb64058d94f3182d66f44342b9adcb");
-    assertStringsEqual(id, "ronin");
-    assertStringsEqual(name, "Ronin");
-}
diff --git a/tests/SmartBitcoinCash/TWCoinTypeTests.cpp b/tests/SmartBitcoinCash/TWCoinTypeTests.cpp
deleted file mode 100644
index 04b97444049..00000000000
--- a/tests/SmartBitcoinCash/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWSmartBitcoinCashCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeSmartBitcoinCash));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeSmartBitcoinCash, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xFeEc227410E1DF9f3b4e6e2E284DC83051ae468F"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeSmartBitcoinCash, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSmartBitcoinCash));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSmartBitcoinCash));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeSmartBitcoinCash), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeSmartBitcoinCash));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeSmartBitcoinCash));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeSmartBitcoinCash));
-    assertStringsEqual(symbol, "BCH");
-    assertStringsEqual(txUrl, "https://www.smartscan.cash/tx/0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9");
-    assertStringsEqual(accUrl, "https://www.smartscan.cash/address/0xFeEc227410E1DF9f3b4e6e2E284DC83051ae468F");
-    assertStringsEqual(id, "smartbch");
-    assertStringsEqual(name, "Smart Bitcoin Cash");
-}
diff --git a/tests/Solana/AddressTests.cpp b/tests/Solana/AddressTests.cpp
deleted file mode 100644
index 15f011299f9..00000000000
--- a/tests/Solana/AddressTests.cpp
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base58.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Solana/Address.h"
-#include "Solana/Program.h"
-
-#include <gtest/gtest.h>
-
-using namespace std;
-using namespace TW;
-
-namespace TW::Solana::tests {
-
-TEST(SolanaAddress, FromPublicKey) {
-    const auto addressString = "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST";
-    const auto publicKey = PublicKey(Base58::bitcoin.decode(addressString), TWPublicKeyTypeED25519);
-    const auto address = Address(publicKey);
-    ASSERT_EQ(addressString, address.string());
-}
-
-TEST(SolanaAddress, FromString) {
-    string addressString = "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST";
-    const auto address = Address(addressString);
-    ASSERT_EQ(address.string(), addressString);
-}
-
-TEST(SolanaAddress, isValid) {
-    ASSERT_TRUE(Address::isValid("2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST"));
-    ASSERT_FALSE(Address::isValid(
-        "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdSl")); // Contains invalid base-58 character
-    ASSERT_FALSE(
-        Address::isValid("2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpd")); // Is invalid length
-}
-
-TEST(SolanaAddress, isValidOnCurve) {
-    EXPECT_TRUE(PublicKey(Base58::bitcoin.decode("HzqnaMjWFbK2io6WgV2Z5uBguCBU21RMUS16wsDUHkon"), TWPublicKeyTypeED25519).isValidED25519());
-    EXPECT_TRUE(PublicKey(Base58::bitcoin.decode("68io7dTfyeWua1wD1YcCMka4y5iiChceaFRCBjqCM5PK"), TWPublicKeyTypeED25519).isValidED25519());
-    EXPECT_TRUE(PublicKey(Base58::bitcoin.decode("Dra34QLFCjxnk8tUNcBwxs6pgb5spF4oseQYF2xn7ABZ"), TWPublicKeyTypeED25519).isValidED25519());
-    // negative case
-    EXPECT_FALSE(PublicKey(Base58::bitcoin.decode("6X4X1Ae24mkoWeCEpktevySVG9jzeCufut5vtUW3wFrD"), TWPublicKeyTypeED25519).isValidED25519());
-    EXPECT_FALSE(PublicKey(Base58::bitcoin.decode("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP"), TWPublicKeyTypeED25519).isValidED25519());
-    EXPECT_FALSE(PublicKey(Base58::bitcoin.decode("ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf"), TWPublicKeyTypeED25519).isValidED25519());
-    EXPECT_FALSE(PublicKey(Base58::bitcoin.decode("AbygL37RheNZv327cMvZPqKYLLkZ6wqWYexRxgNiZyeP"), TWPublicKeyTypeED25519).isValidED25519());
-}
-
-TEST(SolanaAddress, defaultTokenAddress) {
-    const Address serumToken = Address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    EXPECT_EQ(Address("HBYC51YrGFAZ8rM7Sj8e9uqKggpSrDYrinQDZzvMtqQp").defaultTokenAddress(serumToken).string(),
-              "6X4X1Ae24mkoWeCEpktevySVG9jzeCufut5vtUW3wFrD");
-    EXPECT_EQ(Address("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V").defaultTokenAddress(serumToken).string(),
-              "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    EXPECT_EQ(Address("Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ").defaultTokenAddress(serumToken).string(),
-              "ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf");
-}
-
-} // namespace TW::Solana::tests
diff --git a/tests/Solana/ProgramTests.cpp b/tests/Solana/ProgramTests.cpp
deleted file mode 100644
index f943622e28b..00000000000
--- a/tests/Solana/ProgramTests.cpp
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base58.h"
-#include "PrivateKey.h"
-#include "Solana/Address.h"
-#include "Solana/Program.h"
-
-#include <gtest/gtest.h>
-
-using namespace std;
-using namespace TW;
-
-namespace TW::Solana::tests {
-
-TEST(SolanaStakeProgram, addressFromValidatorSeed) {
-    auto user = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    auto validator = Address("4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC");
-    auto programId = Address("Stake11111111111111111111111111111111111111");
-    auto expected = Address("6u9vJH9pRj66N5oJFCBADEbpMTrLxQATcL6q5p5MXwYv");
-    EXPECT_EQ(StakeProgram::addressFromValidatorSeed(user, validator, programId), expected);
-}
-
-TEST(SolanaStakeProgram, addressFromRecentBlockhash) {
-    {
-        auto user = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-        Solana::Hash recentBlockhash("11111111111111111111111111111111");
-        auto programId = Address("Stake11111111111111111111111111111111111111");
-        auto expected = Address("GQDDc5EVGJZFC7AvpEJ8eoCQ75Yy4gr7eu17frCjvQRQ");
-        EXPECT_EQ(StakeProgram::addressFromRecentBlockhash(user, recentBlockhash, programId), expected);
-    }
-    {
-        auto user = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-        Solana::Hash recentBlockhash("9ipJh5xfyoyDaiq8trtrdqQeAhQbQkWy2eANizKvx75K");
-        auto programId = Address("Stake11111111111111111111111111111111111111");
-        auto expected = Address("2Kos1xJRBq3Ae1GnVNBx7HgJhq8KvdUe2bXE4QGdNaXb");
-        EXPECT_EQ(StakeProgram::addressFromRecentBlockhash(user, recentBlockhash, programId), expected);
-    }
-}
-
-TEST(SolanaTokenProgram, defaultTokenAddress) {
-    const Address serumToken = Address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    EXPECT_EQ(TokenProgram::defaultTokenAddress(Address("HBYC51YrGFAZ8rM7Sj8e9uqKggpSrDYrinQDZzvMtqQp"), serumToken).string(),
-              "6X4X1Ae24mkoWeCEpktevySVG9jzeCufut5vtUW3wFrD");
-}
-
-TEST(SolanaTokenProgram, findProgramAddress) {
-    std::vector<Data> seeds = {
-        Base58::bitcoin.decode("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V"),
-        Base58::bitcoin.decode("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"),
-        Base58::bitcoin.decode("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt"),
-    };
-    {
-        Address address = TokenProgram::findProgramAddress(seeds, Address("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"));
-        EXPECT_EQ(address.string(), "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    }
-    {
-        Address address = TokenProgram::findProgramAddress(seeds, Address("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr"));
-        EXPECT_EQ(address.string(), "CuS1kE1wvGTmwGk3FYNQK85g4jU7gMySWwFRQQ9LFunp");
-    }
-}
-
-TEST(SolanaTokenProgram, createProgramAddress) {
-    std::vector<Data> seeds4 = {
-        Base58::bitcoin.decode("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V"),
-        Base58::bitcoin.decode("TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA"),
-        Base58::bitcoin.decode("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt"),
-        Data{255}};
-    {
-        Address address = TokenProgram::createProgramAddress(seeds4, Address("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL"));
-        EXPECT_EQ(address.string(), "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    }
-    {
-        Address address = TokenProgram::createProgramAddress(seeds4, Address("MemoSq4gqABAXKb96qnH8TysNcWxMyWCqXgDLGmfcHr"));
-        EXPECT_EQ(address.string(), "CuS1kE1wvGTmwGk3FYNQK85g4jU7gMySWwFRQQ9LFunp");
-    }
-    // https://github.com/solana-labs/solana/blob/f25c969ad87e64e6d1fd07d2d37096ac71cf8d06/sdk/program/src/pubkey.rs#L353-L435
-    {
-        std::vector<Data> seeds = {TW::data(""), {1}};
-        Address address = TokenProgram::createProgramAddress(seeds, Address("BPFLoader1111111111111111111111111111111111"));
-        EXPECT_EQ(address.string(), "3gF2KMe9KiC6FNVBmfg9i267aMPvK37FewCip4eGBFcT");
-    }
-    {
-        std::vector<Data> seeds = {TW::data("Talking"), TW::data("Squirrels")};
-        Address address = TokenProgram::createProgramAddress(seeds, Address("BPFLoader1111111111111111111111111111111111"));
-        EXPECT_EQ(address.string(), "HwRVBufQ4haG5XSgpspwKtNd3PC9GM9m1196uJW36vds");
-    }
-    {
-        std::vector<Data> seeds = {Base58::bitcoin.decode("SeedPubey1111111111111111111111111111111111")};
-        Address address = TokenProgram::createProgramAddress(seeds, Address("BPFLoader1111111111111111111111111111111111"));
-        EXPECT_EQ(address.string(), "GUs5qLUfsEHkcMB9T38vjr18ypEhRuNWiePW2LoK4E3K");
-    }
-}
-
-} // namespace TW::Solana::tests
diff --git a/tests/Solana/SignerTests.cpp b/tests/Solana/SignerTests.cpp
deleted file mode 100644
index 875300fb5e2..00000000000
--- a/tests/Solana/SignerTests.cpp
+++ /dev/null
@@ -1,417 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Solana/Signer.h"
-#include "Solana/Transaction.h"
-#include "Solana/Program.h"
-#include "HexCoding.h"
-#include "PublicKey.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-namespace TW::Solana::tests {
-
-TEST(SolanaSigner, CompiledInstruction) {
-    const auto privateKey0 =
-        PrivateKey(Base58::bitcoin.decode("96PKHuMPtniu1T74RvUNkbDPXPPRZ8Mg1zXwciCAyaDq"));
-    const auto publicKey0 = privateKey0.getPublicKey(TWPublicKeyTypeED25519);
-    const auto address0 = Address(publicKey0);
-    ASSERT_EQ(Data(publicKey0.bytes.begin(), publicKey0.bytes.end()),
-              Base58::bitcoin.decode("GymAh18wHuFTytfSJWi8eYTA9x5S3sNb9CJSGBWoPRE3"));
-    const auto privateKey1 =
-        PrivateKey(Base58::bitcoin.decode("GvGmNPMQLZE2VNx3KG2GdiC4ndS8uCqd7PjioPgm9Qhi"));
-    const auto publicKey1 = privateKey1.getPublicKey(TWPublicKeyTypeED25519);
-    const auto address1 = Address(publicKey1);
-    ASSERT_EQ(Data(publicKey1.bytes.begin(), publicKey1.bytes.end()),
-              Base58::bitcoin.decode("2oKoYSAHgveX91917v4DUEuN8BNKXDg8KJWpaGyEay9V"));
-    Address programId("11111111111111111111111111111111");
-
-    std::vector<Address> addresses = {address0, address1, programId};
-
-    std::vector<AccountMeta> instrAddresses = {
-        AccountMeta(address1, false, false),
-        AccountMeta(address0, false, false),
-        AccountMeta(programId, false, false),
-        AccountMeta(address1, false, false),
-        AccountMeta(address0, false, false),
-    };
-    Data data = {0, 1, 2, 4};
-    Instruction instruction(programId, instrAddresses, data);
-
-    auto compiledInstruction = CompiledInstruction(instruction, addresses);
-
-    EXPECT_EQ(compiledInstruction.programIdIndex, 2);
-    ASSERT_EQ(compiledInstruction.accounts.size(), 5ul);
-    EXPECT_EQ(compiledInstruction.accounts[0], 1);
-    EXPECT_EQ(compiledInstruction.accounts[1], 0);
-    EXPECT_EQ(compiledInstruction.accounts[2], 2);
-    EXPECT_EQ(compiledInstruction.accounts[3], 1);
-    EXPECT_EQ(compiledInstruction.accounts[4], 0);
-    ASSERT_EQ(compiledInstruction.data.size(), 4ul);
-}
-
-TEST(SolanaSigner, CompiledInstructionFindAccount) {
-    Address address1 = Address(parse_hex("0102030405060708090a0102030405060708090a0102030405060708090a0101"));
-    Address address2 = Address(parse_hex("0102030405060708090a0102030405060708090a0102030405060708090a0102"));
-    Address address3 = Address(parse_hex("0102030405060708090a0102030405060708090a0102030405060708090a0103"));
-    Address programId("11111111111111111111111111111111");
-    // clang-format off
-    Instruction instruction(programId, std::vector<AccountMeta>{
-        AccountMeta(address1, true, false),
-        AccountMeta(address2, false, false),
-    }, Data{1, 2, 3, 4});
-    // clang-format on
-    std::vector<Address> addresses = {
-        address1,
-        address2,
-        programId,
-    };
-    CompiledInstruction compiledInstruction = CompiledInstruction(instruction, addresses);
-    ASSERT_EQ(compiledInstruction.findAccount(address1), 0);
-    ASSERT_EQ(compiledInstruction.findAccount(address2), 1);
-    ASSERT_EQ(compiledInstruction.findAccount(programId), 2);
-    // negative case
-    try {
-        compiledInstruction.findAccount(address3);
-        FAIL() << "Missing expected exception";
-    } catch (...) {
-        // ok
-    }
-}
-
-TEST(SolanaSigner, SingleSignTransaction) {
-    const auto privateKey =
-        PrivateKey(Base58::bitcoin.decode("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    ASSERT_EQ(Data(publicKey.bytes.begin(), publicKey.bytes.end()),
-              Base58::bitcoin.decode("7v91N7iZ9mNicL8WfG6cgSCKyRXydQjLh6UYBWwm6y1Q"));
-
-    const auto from = Address(publicKey);
-    auto to = Address("EN2sCsJ1WDV8UFqsiTXHcUPUxQ4juE71eCknHYYMifkd");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto transaction = Transaction(from, to, 42, recentBlockhash);
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKey);
-    Signer::sign(signerKeys, transaction);
-
-    std::vector<Signature> expectedSignatures;
-    Signature expectedSignature(
-        "5T6uZBHnHFd8uWErDBTFRVkbKuhbcm94K5MJ2beTYDruzqv4FjS7EMKvC94ZfxNAiWUXZ6bZxS3WXUbhJwYNPWn");
-    expectedSignatures.push_back(expectedSignature);
-    ASSERT_EQ(transaction.signatures, expectedSignatures);
-
-    auto expectedString =
-        "3p2kzZ1DvquqC6LApPuxpTg5CCDVPqJFokGSnGhnBHrta4uq7S2EyehV1XNUVXp51D69GxGzQZU"
-        "jikfDzbWBG2aFtG3gHT1QfLzyFKHM4HQtMQMNXqay1NAeiiYZjNhx9UvMX4uAQZ4Q6rx6m2AYfQ"
-        "7aoMUrejq298q1wBFdtS9XVB5QTiStnzC7zs97FUEK2T4XapjF1519EyFBViTfHpGpnf5bfizDz"
-        "sW9kYUtRDW1UC2LgHr7npgq5W9TBmHf9hSmRgM9XXucjXLqubNWE7HUMhbKjuBqkirRM";
-    ASSERT_EQ(transaction.serialize(), expectedString);
-
-    const auto additionalPrivateKey =
-        PrivateKey(Base58::bitcoin.decode("96PKHuMPtniu1T74RvUNkbDPXPPRZ8Mg1zXwciCAyaDq"));
-    signerKeys.push_back(additionalPrivateKey);
-    try {
-        Signer::sign(signerKeys, transaction);
-        FAIL() << "publicKey not found in message.accountKeys";
-    } catch (std::invalid_argument const& err) {
-        EXPECT_EQ(err.what(), std::string("publicKey not found in message.accountKeys"));
-    }
-}
-
-TEST(SolanaSigner, SignTransactionToSelf) {
-    const auto privateKey =
-        PrivateKey(Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    ASSERT_EQ(Data(publicKey.bytes.begin(), publicKey.bytes.end()),
-              Base58::bitcoin.decode("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu"));
-
-    const auto from = Address(publicKey);
-    auto to = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto transaction = Transaction(from, to, 42, recentBlockhash);
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKey);
-    Signer::sign(signerKeys, transaction);
-
-    std::vector<Signature> expectedSignatures;
-    Signature expectedSignature(
-        "3CFWDEK51noPJP4v2t8JZ3qj7kC7kLKyws9akfHMyuJnQ35EtzBptHqvaHfeswiLsvUSxzMVNoj4CuRxWtDD9zB1");
-    expectedSignatures.push_back(expectedSignature);
-    ASSERT_EQ(transaction.signatures, expectedSignatures);
-
-    auto expectedString =
-        "EKUmihvvUPKVN4GSCFwZRtz8WiyAuPvthW69Smo19SCjcPLQ6T7EVZd1HU71WAoe1bfgmPNS5JhU7ZLA9XKG3qbZqe"
-        "EFJ1xmRwW9ZKw8SKMAL6VRWxp87oLu7PSmf5b8R34vCaww3XLKtZkoP49a7TUK31DqPN5xJCceMB3BZJyaojQaKU8n"
-        "UkzSGf89LY6abZXp9krKAebvc6bSMzTP8SHSvbmZbf3VtejmpQeN9X6e7WVDn6oDa2bGT";
-    ASSERT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaSigner, MultipleSignTransaction) {
-    const auto privateKey0 =
-        PrivateKey(Base58::bitcoin.decode("96PKHuMPtniu1T74RvUNkbDPXPPRZ8Mg1zXwciCAyaDq"));
-    const auto publicKey0 = privateKey0.getPublicKey(TWPublicKeyTypeED25519);
-    const auto address0 = Address(publicKey0);
-    ASSERT_EQ(Data(publicKey0.bytes.begin(), publicKey0.bytes.end()),
-              Base58::bitcoin.decode("GymAh18wHuFTytfSJWi8eYTA9x5S3sNb9CJSGBWoPRE3"));
-    const auto privateKey1 =
-        PrivateKey(Base58::bitcoin.decode("GvGmNPMQLZE2VNx3KG2GdiC4ndS8uCqd7PjioPgm9Qhi"));
-    const auto publicKey1 = privateKey1.getPublicKey(TWPublicKeyTypeED25519);
-    const auto address1 = Address(publicKey1);
-    ASSERT_EQ(Data(publicKey1.bytes.begin(), publicKey1.bytes.end()),
-              Base58::bitcoin.decode("2oKoYSAHgveX91917v4DUEuN8BNKXDg8KJWpaGyEay9V"));
-
-    Data data = {0, 0, 0, 0};
-    Address programId("11111111111111111111111111111111");
-    std::vector<AccountMeta> instrAddresses = {
-        AccountMeta(address0, true, false),
-        AccountMeta(address1, false, false),
-    };
-    Instruction instruction(programId, instrAddresses, data);
-    std::vector<Instruction> instructions = {instruction};
-
-    MessageHeader header = {2, 0, 1};
-    std::vector<Address> accountKeys = {address0, address1, programId};
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    Message message;
-    message.header = header;
-    message.accountKeys = accountKeys;
-    message.recentBlockhash = recentBlockhash;
-    message.instructions = instructions;
-    message.compileInstructions();
-
-    auto transaction = Transaction(message);
-
-    std::vector<PrivateKey> signerKeys;
-    // Sign order should not matter
-    signerKeys.push_back(privateKey1);
-    signerKeys.push_back(privateKey0);
-    Signer::sign(signerKeys, transaction);
-
-    std::vector<Signature> expectedSignatures;
-    Signature expectedSignature0(
-        "37beWPhNMfWUz75Tb24TX3PCS89FZscbCgwwLpFnzVfZYPqDpAWruvqzc9eeQYft35H23Vm9Tv1dPwEKWT3vAVPb");
-    expectedSignatures.push_back(expectedSignature0);
-    Signature expectedSignature1(
-        "5NxQshVaAXtQ8YVdcBtCanT62KbxnRfhubjGndFvetgn9AiaoLVZvRGutR5D7FJebRxq8bd6nQXn59LFzavEUrdQ");
-    expectedSignatures.push_back(expectedSignature1);
-    ASSERT_EQ(transaction.signatures, expectedSignatures);
-
-    auto expectedString =
-        "oL2CmkcP9xf2DiU7eo6hh3JdHnX3NGjunheXYo6SjVchzc8LtFJpPs4jccWUd7oPZUPQNTcR7Ee"
-        "Hn259ror9A7aXgJdP4djhntoD8irF1kuBZCj7pubtoWfiAKzagSL4hChQsTSe7e9jaGtoXu58mP"
-        "HCMKTz55TLjhdmCj7ixoWRowWEzkrF49MxXnurb4yf6ASru1XdHPFn3DdzkRHgypYwvRM6ci8p2"
-        "7trQvXFukhWX6qG6JkxqsWYSzACcAAGGWfAxSi63Yx1RxkxGUzyxy5f2thQhWZ6Nx6pR1im65yV"
-        "YMYPXj94kgtHxXw9h5V4p7xSAwRpmhw4jewYyQVX4jmnfro3gFNdX9AqpqMs4uGHA4rZM";
-    ASSERT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaSigner, SignUpdateBlockhash) {
-    const auto privateKey =
-        PrivateKey(Base58::bitcoin.decode("G4VSzrknPBWZ1z2YwUnWTxD1td7wmqR5jMPEJRN6wm8S"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    ASSERT_EQ(Data(publicKey.bytes.begin(), publicKey.bytes.end()),
-              Base58::bitcoin.decode("41a5jYky56M6EWDsFfLaZRxoRtgAJSRWxJnxaJNJELn5"));
-
-    const auto from = Address(publicKey);
-    auto to = Address("4iSnyfDKaejniaPc2pBBckwQqV3mDS93go15NdxWJq2y");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto transaction = Transaction(from, to, 42, recentBlockhash);
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKey);
-    Signer::sign(signerKeys, transaction);
-
-    Solana::Hash newBlockhash("GgBaCs3NCBuZN12kCJgAW63ydqohFkHEdfdEXBPzLHq");
-    Signer::signUpdateBlockhash(signerKeys, transaction, newBlockhash);
-
-    std::vector<Signature> expectedSignatures;
-    Signature expectedSignature(
-        "5AFhXjvGdENXCAe9MPvUA2qjoL4XtZwZKG7kK2HmZf1ibpxjx5kzogHZjN39uYB9J33UFJN15KhSggBZhzyNQmta");
-    expectedSignatures.push_back(expectedSignature);
-    ASSERT_EQ(transaction.signatures, expectedSignatures);
-
-    auto expectedString =
-        "62ABadDCoPfGGRnhLoBhfcPekMHyN5ee8DgTY8wD4iwKDjyFAsNbsaahTcqMWxmwa61q9iAGCQB"
-        "v1bETcYzWsTwLKMVGLoEpwqA84mPjqHyr5sQD5dcghyQiQ1ckYNub9K7s8FspVwwowK8gJG69xe"
-        "DEaqi7G1zrChBVbQYTmVUwJETyDmP1Vs8QU3CaxBs8qwcxoziU52KWLBpRj9o38QVBdxJtJ7hig"
-        "hgPKJubfqUfTWdN94PzqEfyPqwoCpFD39nvBn8C5xe1caPKivicg6U7Lzm9s8RYTLCEB";
-    ASSERT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaSigner, SignRawMessage) {
-    const auto privateKey =
-        PrivateKey(Base58::bitcoin.decode("GjXseuD8JavBjKMdd6GEsPYZPV7tMMa46GS2JRS5tHRq"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    ASSERT_EQ(Data(publicKey.bytes.begin(), publicKey.bytes.end()),
-              Base58::bitcoin.decode("3BocAWPm1oNXN5qkAV4QeDUmAPpkTcN1rrmCMWAfsXJY"));
-
-    auto rawMessageData =
-        "01000203207be13c43c4528592eaf3fd34e064c641c5be3cb6691877d7ade94dff36734108eaea30723c33b525"
-        "07bc54024910612f885e4c80c10b99a047fd42c0acbace00000000000000000000000000000000000000000000"
-        "000000000000000000000404040404040404040404040404040404040404040404040404040404040404010202"
-        "00010c020000002a00000000000000";
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKey);
-    Data rawTransaction = Signer::signRawMessage(signerKeys, parse_hex(rawMessageData));
-
-    auto expectedHex =
-        "016e7f8349977b482bccf0bfc202ad917295803831e59ccb865b97d657464791ebfe3336879b84b9f165e464a3"
-        "4751fe30d54b01f3c9f33f969aafe1e85951b10901000203207be13c43c4528592eaf3fd34e064c641c5be3cb6"
-        "691877d7ade94dff36734108eaea30723c33b52507bc54024910612f885e4c80c10b99a047fd42c0acbace0000"
-        "000000000000000000000000000000000000000000000000000000000000040404040404040404040404040404"
-        "040404040404040404040404040404040401020200010c020000002a00000000000000";
-    ASSERT_EQ(hex(rawTransaction), expectedHex);
-}
-
-TEST(SolanaSigner, SignDelegateStakeV2) {
-    const auto privateKeySigner =
-        PrivateKey(Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"));
-    const auto publicKeySigner = privateKeySigner.getPublicKey(TWPublicKeyTypeED25519);
-    auto signer = Address(publicKeySigner);
-    ASSERT_EQ(signer.string(), "zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-
-    auto voteAddress = Address("4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC");
-    auto programId = Address("Stake11111111111111111111111111111111111111");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto stakeAddress = StakeProgram::addressFromRecentBlockhash(signer, recentBlockhash, programId);
-
-    auto message = Message::createStake(signer, stakeAddress, voteAddress, 42, recentBlockhash);
-    auto transaction = Transaction(message);
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKeySigner);
-    Signer::sign(signerKeys, transaction);
-
-    std::vector<Signature> expectedSignatures;
-    Signature expectedSignature("58iogHzSJZmvTxi71W8k2yZXSPVfGAgtgqrk1RaBtfVFewU9yiJCkvSF1Hhjyax5DuexzR7ryWZDAWKQ73pyqvMs");
-    expectedSignatures.push_back(expectedSignature);
-    EXPECT_EQ(transaction.signatures, expectedSignatures);
-
-    auto expectedString = "j24mVM9Zgu5vDZhPLGGuCRXQnP9djNtxdHh4txN3S7dwJsNNL5fbhzGpPgSUAcLGoMVCfF9TuqTYfpfJnb4sJFe1ahM8yPL5HwuKL6py5AZJFi8SWx9fvaVB699dCPo1GT3JoEBLPCZ9o2jQtnwzLkzTYJnKv2axqhKWFE2sz6TBA5J39eZcjMFUYgyxz6Q5S4MWqYQCb8UET2NAEZoKcfy7j8N25WXL6Gj4j3hBZjpHQQNaGaNEprEqyma3ZuVhpGiCALSsuzVLX3wZVo4icXwe952deMFA4tH3BK1jcSQCgfmcKDJ9nd7bdrnUUs4BoMdF1uDZB5LxE2UH8QiqtYvaUcorF4SJ3gPxM5ykbyPsNK1cSYZF9NMpW2GofyC17eELwnHQTQB2kqphxJZu7BahvkwiDPPeeydiXAkBspJ3nc3PCBujv6WJw22ZHw5j6zAP8ZGnCW44pqtWD5qifF9tTKhySKdANNiWifs3tSCCPQqjfJXu14drNinR6VG8rJxS1qgmRYiRQUa7m1vtoaZFRN5qKUeAfoFKkAVaNnMdwgsNqNH4dqBodTCJFs1LkYwhgRZdZGbwXTn1j7vpR3DSnv4g72i2H556srzK53jdUmdv6yfxt516XDSshqZtHnKZ1tudxKjBXwsqT3imDiZFVka9wKWUAYMCi4XZ79CY6Xpsd9c18U2e9TCngQmgkTATFgrqysfraokNffgqWxvsPMugksbvbPjJs3iCzByvphkC9p7hCf6LwbeF8XnVB91EAgRDA4VLE1f9wkcq5zjy879YWJ4r516h3PQszTz1EaJXNAXdbk5Em7eyuuabGP1Q3nijFTL2yhMDsXpgrjAuEAABNxFMd4J1JRMaic615mHrhwociksrsfQK";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaSigner, SignDelegateStakeV1) {
-    const auto privateKeySigner =
-        PrivateKey(Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746"));
-    const auto publicKeySigner = privateKeySigner.getPublicKey(TWPublicKeyTypeED25519);
-    auto signer = Address(publicKeySigner);
-    ASSERT_EQ(signer.string(), "zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-
-    auto voteAddress = Address("4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC");
-    auto programId = Address("Stake11111111111111111111111111111111111111");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto stakeAddress = StakeProgram::addressFromValidatorSeed(signer, voteAddress, programId);
-
-    auto message = Message::createStake(signer, stakeAddress, voteAddress, 42, recentBlockhash);
-    auto transaction = Transaction(message);
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKeySigner);
-    Signer::sign(signerKeys, transaction);
-
-    std::vector<Signature> expectedSignatures;
-    Signature expectedSignature("gDPbnakbktrASmnUwKGpmftvQRbcyAvxyAyVXq3oVLfAdTPDqY8hhLPHTgidEZGWcmiaXnEyKg2GQLkkAh3JYr3");
-    expectedSignatures.push_back(expectedSignature);
-    EXPECT_EQ(transaction.signatures, expectedSignatures);
-
-    auto expectedString = "TKPiN35HzeD3zdwxDFvnkgoqud7CZsda15JkBwM4nDpr623rM7MZsH6QvMMyKpiz7MeRNTrfyHkRLQSBT9Tbg2mgTdfrbhhqeF3Suu5ECphqn8DFYPoMnFzeg5u9gaqevfjhuizzeo2YDJF8aVGy1pez8gMbp5vHz1SuvQUgfcvFctggUMwNiJorSmmp3N6TzQSd38CZrA8ZLhaJjuwDwVMjmj18rGTV1gkX19L7byTFrus2vNvPeUa2AawwUnFpYMPgvCKkHTrpnjvypjoLof9yMUFQ5M1S3Ntv53KJyXwXq6ejJnBDtisnDcdMDNSZp3VeKz6XCr8XVM5xNVh3LX12V4kc3ueqkokYJLP1JmuhA3nNZA1G5KTNno93HUoBkEa1x5h3haoCSgmQC97LoJbJM6B6C2NbaDj2J6iiTaVQdin4He4Jpj575WDhNTqsLjzFUHPUHQF1CRnuss8UpVyMsa4kdVqCDQGeh5DKbkikgcB8GKPBuC91DRxGEqgoygNsu5nnQy4o3YAJnBBK6HsKxpdjbYD8wCUdLw8muhjpEqeBTPShEaogm9zfehidiCcnxbeoX3gmW8oH9gpWoX7GrkJgF6Wn7iWohmrzqzAjoBz8hpeY5nkkhHrf9iswVGMpakdLGy3YxkGJVpsW8KJACwEKXGLq8SVLtXSUHG8EP16zfYHxKjkCSs8PkdFsA5esxsxppPTVZivuEPqJ5og55aNmugdNDrAFYWdcH1Q4rm7BXN6oHECdz2yY4HFVWh9u592oqozt2gQKu3vmhcNFzzQe1xgs6zKSv38kSGTnipd7Hx2VL3qNAR6XBRiwAi226qSTzxi6R82p7cMB7TMy6fk5AZ3sXDSXFNJ9S5SSU1V63ruw75QMtVio";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaSigner, SignCreateTokenAccount) {
-    const auto privateKeySigner =
-        PrivateKey(Base58::bitcoin.decode("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"));
-    const auto publicKeySigner = privateKeySigner.getPublicKey(TWPublicKeyTypeED25519);
-    auto signer = Address(publicKeySigner);
-    EXPECT_EQ(signer.string(), "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-
-    auto token = Address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    auto tokenAddress = Address("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    Solana::Hash recentBlockhash("9ipJh5xfyoyDaiq8trtrdqQeAhQbQkWy2eANizKvx75K");
-
-    auto message = Message::createTokenCreateAccount(signer, signer, token, tokenAddress, recentBlockhash);
-    auto transaction = Transaction(message);
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKeySigner);
-    Signer::sign(signerKeys, transaction);
-
-    std::vector<Signature> expectedSignatures;
-    Signature expectedSignature("3doYbPs5rES3TeDSrntqUvMgXCDE2ViJX2SFhLtiptVNkqPuixXs1SwU5LUZ3KwHnCzDUth6BRr3vU3gqnuUgRvQ");
-    expectedSignatures.push_back(expectedSignature);
-    EXPECT_EQ(transaction.signatures, expectedSignatures);
-
-    auto expectedString =
-        // test data obtained from spl-token create-account
-        "CKzRLx3AQeVeLQ7T4hss2rdbUpuAHdbwXDazxtRnSKBuncCk3WnYgy7XTrEiya19MJviYHYdTxi9gmWJY8qnR2vHVnH2DbPiKA8g72rD3VvMnjosGUBBvCwbBLge6FeQdgczMyRo9n5PcHvg9yJBTJaEEvuewyBVHwCGyGQci7eYd26xtZtCjAjwcTq4gGr3NZbeRW6jZp6j6APuew7jys4MKYRV4xPodua1TZFCkyWZr1XKzmPh7KTavtN5VzPDA8rbsvoEjHnKzjB2Bszs6pDjcBFSHyQqGsHoF8XPD35BLfjDghNtBmf9cFqo5axa6oSjANAuYg6cMSP4Hy28waSj8isr6gQjE315hWi3W1swwwPcn322gYZx6aMAcmjczaxX9aktpHYgZxixF7cYWEHxJs5QUK9mJePu9Xc6yW75UB4Ynx6dUgaSTEUzoQthF2TN3xXwu1";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaSigner, SignCreateTokenAccountForOther_3E6UFV) {
-    const auto privateKeySigner =
-        PrivateKey(parse_hex("4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7"));
-    const auto publicKeySigner = privateKeySigner.getPublicKey(TWPublicKeyTypeED25519);
-    auto signer = Address(publicKeySigner);
-    EXPECT_EQ(signer.string(), "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ");
-
-    auto otherMainAddress = Address("3xJ3MoUVFPNFEHfWdtNFa8ajXUHsJPzXcBSWMKLd76ft");
-    auto token = Address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    auto tokenAddress = Address("67BrwFYt7qUnbAcYBVx7sQ4jeD2KWN1ohP6bMikmmQV3");
-    Solana::Hash recentBlockhash("HmWyvrif3QfZJnDiRyrojmH9iLr7eMxxqiC9RJWFeunr");
-
-    auto message = Message::createTokenCreateAccount(signer, otherMainAddress, token, tokenAddress, recentBlockhash);
-    auto transaction = Transaction(message);
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKeySigner);
-    Signer::sign(signerKeys, transaction);
-
-    auto expectedString =
-        // https://explorer.solana.com/tx/3E6UFVamHCm6Bgk8gXdZex7R7tJAVxqJm6t9ephAKu1PjcfZrD7CJqMwKu6RrvWSUESbZFqzdUyLXuxAFaawPHvJ
-        "4BsrHedHuForcKDhLdnLYDXgtQgQEj3EQVDtEhqa7o6ukFjW3shpTWv6PeKQdMp6af4ASjD4xQeZvXxLK5WUjguVMUf3xdJn7RnFeM7hdDJ56RDBM5PRJbRJVHjz6FJ7SVNTvr9y3gVYQtWx7NfKRxiyEAfq9JG7nqxSWaW6raMr9t35aVcdAVuXE9iXj3rzhVfCS69vVzy5KcFEK3mvDYG6L12V2CfviCydmeCvPw5r3zBUrZSQv7Ti4XFNBrPbk28gcqQwsBknBqasHxHqD9VUyPmBTuUyXq75QN8rhqN55NjxKBUw37tEUS1jKVpWnTeLFq1eRAMdXvjftNuQ5Bmm8Zc12PGWj9vdorBaYyvZXexJST5xNjR4SCkXvXZoRScETck95chv3VBn54jP8DpB4GGUmATFKSxpdtnNV64i1SQXW13KJwswthJvAaDiqevQLKLkvrTEAdb4BxEfPkFjDVti6P58rTZCMg5CTVLqdmWwpTSW5V";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaSigner, SignTransferToken_3vZ67C) {
-    const auto privateKeySigner =
-        PrivateKey(Base58::bitcoin.decode("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5"));
-    const auto publicKeySigner = privateKeySigner.getPublicKey(TWPublicKeyTypeED25519);
-    auto signer = Address(publicKeySigner);
-    EXPECT_EQ(signer.string(), "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-
-    auto token = Address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    auto senderTokenAddress = Address("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    auto recipientTokenAddress = Address("3WUX9wASxyScbA7brDipioKfXS1XEYkQ4vo3Kej9bKei");
-    uint64_t amount = 4000;
-    uint8_t decimals = 6;
-    Solana::Hash recentBlockhash("CNaHfvqePgGYMvtYi9RuUdVxDYttr1zs4TWrTXYabxZi");
-
-    auto message = Message::createTokenTransfer(signer, token,
-                                                senderTokenAddress, recipientTokenAddress, amount, decimals, recentBlockhash);
-    auto transaction = Transaction(message);
-
-    std::vector<PrivateKey> signerKeys;
-    signerKeys.push_back(privateKeySigner);
-    Signer::sign(signerKeys, transaction);
-
-    std::vector<Signature> expectedSignatures;
-    Signature expectedSignature("3vZ67CGoRYkuT76TtpP2VrtTPBfnvG2xj6mUTvvux46qbnpThgQDgm27nC3yQVUZrABFjT9Qo7vA74tCjtV5P9Xg");
-    expectedSignatures.push_back(expectedSignature);
-    EXPECT_EQ(transaction.signatures, expectedSignatures);
-
-    auto expectedString =
-        // https://explorer.solana.com/tx/3vZ67CGoRYkuT76TtpP2VrtTPBfnvG2xj6mUTvvux46qbnpThgQDgm27nC3yQVUZrABFjT9Qo7vA74tCjtV5P9Xg
-        // test data obtained from spl-token transfer
-        "PGfKqEaH2zZXDMZLcU6LUKdBSzU1GJWJ1CJXtRYCxaCH7k8uok38WSadZfrZw3TGejiau7nSpan2GvbK26hQim24jRe2AupmcYJFrgsdaCt1Aqs5kpGjPqzgj9krgxTZwwob3xgC1NdHK5BcNwhxwRtrCphGEH7zUFpGFrFrHzgpf2KY8FvPiPELQyxzTBuyNtjLjMMreehSKShEjD9Xzp1QeC1pEF8JL6vUKzxMXuveoEYem8q8JiWszYzmTMfDk13JPgv7pXFGMqDV3yNGCLsWccBeSFKN4UKECre6x2QbUEiKGkHkMc4zQwwyD8tGmEMBAGm339qdANssEMNpDeJp2LxLDStSoWShHnotcrH7pUa94xCVvCPPaomF";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-} // namespace TW::Solana::tests
diff --git a/tests/Solana/TWAnySignerTests.cpp b/tests/Solana/TWAnySignerTests.cpp
deleted file mode 100644
index 2a0dd1ca007..00000000000
--- a/tests/Solana/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,397 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base58.h"
-#include "HexCoding.h"
-#include "proto/Solana.pb.h"
-#include "Solana/Address.h"
-#include "Solana/Program.h"
-#include "PrivateKey.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-namespace TW::Solana::tests {
-
-const auto expectedString1 =
-    "3p2kzZ1DvquqC6LApPuxpTg5CCDVPqJFokGSnGhnBHrta4uq7S2EyehV1XNUVXp51D69GxGzQZU"
-    "jikfDzbWBG2aFtG3gHT1QfLzyFKHM4HQtMQMNXqay1NAeiiYZjNhx9UvMX4uAQZ4Q6rx6m2AYfQ"
-    "7aoMUrejq298q1wBFdtS9XVB5QTiStnzC7zs97FUEK2T4XapjF1519EyFBViTfHpGpnf5bfizDz"
-    "sW9kYUtRDW1UC2LgHr7npgq5W9TBmHf9hSmRgM9XXucjXLqubNWE7HUMhbKjuBqkirRM";
-
-TEST(TWAnySignerSolana, SignTransfer) {
-    auto privateKey = Base58::bitcoin.decode("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr");
-    auto input = Proto::SigningInput();
-
-    auto& message = *input.mutable_transfer_transaction();
-    message.set_recipient("EN2sCsJ1WDV8UFqsiTXHcUPUxQ4juE71eCknHYYMifkd");
-    message.set_value((uint64_t)42L);
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    ASSERT_EQ(output.encoded(), expectedString1);
-}
-
-TEST(TWAnySignerSolana, SignTransferToSelf) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Proto::SigningInput();
-
-    auto& message = *input.mutable_transfer_transaction();
-    message.set_recipient("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    message.set_value((uint64_t)42L);
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString =
-        "EKUmihvvUPKVN4GSCFwZRtz8WiyAuPvthW69Smo19SCjcPLQ6T7EVZd1HU71WAoe1bfgmPNS5JhU7ZLA9XKG3qbZqe"
-        "EFJ1xmRwW9ZKw8SKMAL6VRWxp87oLu7PSmf5b8R34vCaww3XLKtZkoP49a7TUK31DqPN5xJCceMB3BZJyaojQaKU8n"
-        "UkzSGf89LY6abZXp9krKAebvc6bSMzTP8SHSvbmZbf3VtejmpQeN9X6e7WVDn6oDa2bGT";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignTransferWithMemoAndReference) {
-    const auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_transfer_transaction();
-    message.set_recipient("71e8mDsh3PR6gN64zL1HjwuxyKpgRXrPDUJT7XXojsVd");
-    message.set_value((uint64_t)10000000L);
-    message.set_memo("HelloSolanaMemo");
-    message.add_references("CuieVDEDtLo7FypA9SbLM9saXFdb1dsshEkyErMqkRQq");
-    message.add_references("tFpP7tZUt6zb7YZPpQ11kXNmsc5YzpMXmahGMvCHhqS");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    const auto expectedString = "NfNH76sST3nJ4FmFGTZJBUpJou7DRuHM3YNprT1HeEau699CQF65xNf21Hoi491bbtVKUXfqCJyeZhfTCEnABuXNC1JrhGBeCv2AbQdaS9gpp9j4xHHomhCYdwYaBWFMcKkdMXrx9xHqL9Vkny4HezkwQfb3wGqcaE9XVRdkkNxsoJnVKddRnrQbjhsZGTcKdfmbTghoUeRECNPTm6nZTA1owWF1Dq6mfr6M3GZRh4ucqEquxKsQC2HQwNRrGZahsfyUvwspPWwMt78q5Jpjd9kHqkFDspZL6Pepv4dAA4uHhYDCHeP2bbDiFMBYxxWCVDDtRKSh3H92xUgh1GCSgNcjGdbVfQUhSDPX3k9xuuszPTsVZ2GnsavAsRp6Vf6fFEikBX6pVV9zjW1cx94EepQ2aGEBSsVu4RzX7rJjCLCq87h8cxxf1XnF8mvYGEK7wzF";
-    EXPECT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignDelegateStakeTransaction_noStakeAccount) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_delegate_stake_transaction();
-    message.set_validator_pubkey("4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC");
-    message.set_value((uint64_t)42L);
-    message.set_stake_account("");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString = "j24mVM9Zgu5vDZhPLGGuCRXQnP9djNtxdHh4txN3S7dwJsNNL5fbhzGpPgSUAcLGoMVCfF9TuqTYfpfJnb4sJFe1ahM8yPL5HwuKL6py5AZJFi8SWx9fvaVB699dCPo1GT3JoEBLPCZ9o2jQtnwzLkzTYJnKv2axqhKWFE2sz6TBA5J39eZcjMFUYgyxz6Q5S4MWqYQCb8UET2NAEZoKcfy7j8N25WXL6Gj4j3hBZjpHQQNaGaNEprEqyma3ZuVhpGiCALSsuzVLX3wZVo4icXwe952deMFA4tH3BK1jcSQCgfmcKDJ9nd7bdrnUUs4BoMdF1uDZB5LxE2UH8QiqtYvaUcorF4SJ3gPxM5ykbyPsNK1cSYZF9NMpW2GofyC17eELwnHQTQB2kqphxJZu7BahvkwiDPPeeydiXAkBspJ3nc3PCBujv6WJw22ZHw5j6zAP8ZGnCW44pqtWD5qifF9tTKhySKdANNiWifs3tSCCPQqjfJXu14drNinR6VG8rJxS1qgmRYiRQUa7m1vtoaZFRN5qKUeAfoFKkAVaNnMdwgsNqNH4dqBodTCJFs1LkYwhgRZdZGbwXTn1j7vpR3DSnv4g72i2H556srzK53jdUmdv6yfxt516XDSshqZtHnKZ1tudxKjBXwsqT3imDiZFVka9wKWUAYMCi4XZ79CY6Xpsd9c18U2e9TCngQmgkTATFgrqysfraokNffgqWxvsPMugksbvbPjJs3iCzByvphkC9p7hCf6LwbeF8XnVB91EAgRDA4VLE1f9wkcq5zjy879YWJ4r516h3PQszTz1EaJXNAXdbk5Em7eyuuabGP1Q3nijFTL2yhMDsXpgrjAuEAABNxFMd4J1JRMaic615mHrhwociksrsfQK";
-    EXPECT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignDelegateStakeTransaction_withAccount) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_delegate_stake_transaction();
-    message.set_validator_pubkey("4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC");
-    message.set_stake_account("6u9vJH9pRj66N5oJFCBADEbpMTrLxQATcL6q5p5MXwYv");
-    message.set_value((uint64_t)42L);
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString = "TKPiN35HzeD3zdwxDFvnkgoqud7CZsda15JkBwM4nDpr623rM7MZsH6QvMMyKpiz7MeRNTrfyHkRLQSBT9Tbg2mgTdfrbhhqeF3Suu5ECphqn8DFYPoMnFzeg5u9gaqevfjhuizzeo2YDJF8aVGy1pez8gMbp5vHz1SuvQUgfcvFctggUMwNiJorSmmp3N6TzQSd38CZrA8ZLhaJjuwDwVMjmj18rGTV1gkX19L7byTFrus2vNvPeUa2AawwUnFpYMPgvCKkHTrpnjvypjoLof9yMUFQ5M1S3Ntv53KJyXwXq6ejJnBDtisnDcdMDNSZp3VeKz6XCr8XVM5xNVh3LX12V4kc3ueqkokYJLP1JmuhA3nNZA1G5KTNno93HUoBkEa1x5h3haoCSgmQC97LoJbJM6B6C2NbaDj2J6iiTaVQdin4He4Jpj575WDhNTqsLjzFUHPUHQF1CRnuss8UpVyMsa4kdVqCDQGeh5DKbkikgcB8GKPBuC91DRxGEqgoygNsu5nnQy4o3YAJnBBK6HsKxpdjbYD8wCUdLw8muhjpEqeBTPShEaogm9zfehidiCcnxbeoX3gmW8oH9gpWoX7GrkJgF6Wn7iWohmrzqzAjoBz8hpeY5nkkhHrf9iswVGMpakdLGy3YxkGJVpsW8KJACwEKXGLq8SVLtXSUHG8EP16zfYHxKjkCSs8PkdFsA5esxsxppPTVZivuEPqJ5og55aNmugdNDrAFYWdcH1Q4rm7BXN6oHECdz2yY4HFVWh9u592oqozt2gQKu3vmhcNFzzQe1xgs6zKSv38kSGTnipd7Hx2VL3qNAR6XBRiwAi226qSTzxi6R82p7cMB7TMy6fk5AZ3sXDSXFNJ9S5SSU1V63ruw75QMtVio";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignDeactivateStakeTransaction) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_deactivate_stake_transaction();
-    message.set_stake_account("6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB");
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString = "6x3fSstNz4GpPxmT5jHXwyD62uyJMKaPWeBDNNcwXZA9NJ3E7KavCXPNUd8ZYTX5VpkfHKGszkwzM6AdAp4giLD29jvWdNYjkV1Nvb42xFwGD6ryMPZzXkJijaRTrA7SvPTDSRU2haGVmorqkywAXLQUCw47NmBUfLTb5gDcKoBeaAsahckv1eCE746thJVTg2dQNvUTULKF6xckUg7kwFkcUuRe4HCcRgrKcNAUKLR2rEM3brVQkUyAaAtMMtc3gVDXxxpbtW5Fa9wGaEnh31FdRo4z5YBzAUaz7vcrvzF2j81KCPTVnYyTmeJzCzJafzCVCtw";
-    EXPECT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignDeactivateAllStakeTransaction) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_deactivate_all_stake_transaction();
-    *message.add_stake_accounts() = "CJQStmfyoHbosX1GfVn64yWrNJAo214q2aqxwS6FGh4k";
-    *message.add_stake_accounts() = "6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB";
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString = "U9azMJWRfDhypoDeQLYWyBYFZCwRNZy8sbrVX9awKK84zNGbSQfYTTJ3ZyzjNUVbU5npbw2MsWfmZGHZRvpfN7G7o3sVePyFRXrmLxrGZzGycFv25Zff4zPxDarbsugbCBgzVGpgwu8x7MdkwBAVHVtNsgMcHgArEAjEmk7YEGpZ15rjo39bCRvmuprWLqSv2SK1RyTZPpTPXVevAbA4i9vvcY8eUbwW29SZCoyGaagLU5EBV9vckMjzGa7gq2yMR6rbq8tDdWaXapYs8RavU49WN94yg4wdE4fzYq8DjqXHq3MuUBLxeYDKJnvj84ioeM4eR1EwjBNrGyz5GHTRuhbNg1nc57SpKsSMVSZW5Ra3tUk84YZXYFHxzeQ9Tv4o";
-    EXPECT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignWithdrawStakeTransaction) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_withdraw_transaction();
-    message.set_stake_account("6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB");
-    message.set_value((uint64_t)42L);
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString = "gxr4o1trVP8DGG8UC21AA964YqAPFA3rBCF9MwmBQpn5fDtcujM9wp1gzT466MxWGR8wMciS6dSL771q29eURrEEuvhJzRaFDGPLgVB3UL4gd4T2amPQkR4Dzq5drKEtPJRBR86KVVc2kjDsbWNpdL8S7pZqW3VUijAbm9TS8ezG8NExSCkhxExKhUjXWWguEL4qXra7s2JZfhtmvuJneWnEY3isUVfC9knWtGNwpNFvRvzbH2sgHzwtSsD7mkYrBJoazLCwT8r9yypxycHL41XcGtH425MA16kVSunvvBfzG9PzBTS65YJBs64tzttasCU9uEphkwgmfrmoEC8iKt8xD47Ra79RyXd95yURsaxvpb1tVAH8kMNtj8iV1Pfm";
-    EXPECT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignWithdrawAllStakeTransaction) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_withdraw_all_transaction();
-    message.add_stake_accounts();
-    message.add_stake_accounts();
-    message.mutable_stake_accounts(0)->set_stake_account("CJQStmfyoHbosX1GfVn64yWrNJAo214q2aqxwS6FGh4k");
-    message.mutable_stake_accounts(0)->set_value((uint64_t)42L);
-    message.mutable_stake_accounts(1)->set_stake_account("6XMLCn47d5kPi3g4YcjqFvDuxWnpVADpN2tXpeRc4XUB");
-    message.mutable_stake_accounts(1)->set_value((uint64_t)67L);
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString = "cvBNusjtHkR74EfWsvFPEe2Mydcr7eoLeY2wJw2ZMZYViotbb63Adai7UD1PW9uLusoVHGLeJC5cPgVBC4F693P9tPAxLs9yiZj1ZJQ4DgnYbeXafqzjdWje1Ly5FgpDUJaaU2RnLCG51CcrmiTJ4KB5fwai6egZaNjbiqo1DEC1wJz4FgKug2aKQWLdeCiH9WhCuvqfhNV6mEE4qRCkU8uS2gfSqBd1AdrczvoDEbKQszosrwmawxqmvTE5EWaFzMb48x9nLqxvpQCvGQu1nX6FxZJjv2swekA7wGLEAA4uSdFLTHNrYSi8pn8hVYGwESEzth9oiPkJCvW7Y2KvGALeERUZn8knHiz2eqaaT72Ajp9UogMdZtiuFHufveLXpBLWUERchhB7eU1magYcPNHcZuEE4uQv5kZJhHAqYCGU6dyUFLVA9Edus7o6fTktYVCjoGb";
-    EXPECT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignDeactivateStakeTransaction_1) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_deactivate_stake_transaction();
-    message.set_stake_account("6u9vJH9pRj66N5oJFCBADEbpMTrLxQATcL6q5p5MXwYv");
-
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString =
-        "AhfB77PTGTKBfbGPGuEz2khbBy8m8Kou1zqZST9dP7PLJNSeEze5NJuCh5qecPLa3S8xAQ6mTULmnAWiW81ib87nhy"
-        "wFtx5nKiUvmhdXsvKCSX6NNtNXdRz5yZi3UEop4obco85SY2czS6n4SJwmtDedHLtg9urqdZVth7AUM8KAtrRsksyv"
-        "ZRYXh64Z8QGyNY7ekj31ae11avGiSDNWYZZHqx7VPWRsKeatGyGk5zPmnRdL8ABMQgJ1Te7wAWwVnNn5QcoAxDuPw6"
-        "uDctP8Q5S4TieRVatCnukQFj5BTJisez3E2ZJPWhVrMh4K3wEFkPHA7dR";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignWithdrawStakeTransaction_1) {
-    auto privateKey = Base58::bitcoin.decode("AevJ4EWcvQ6dptBDvF2Ri5pU6QSBjkzSGHMfbLFKa746");
-    auto input = Solana::Proto::SigningInput();
-
-    auto& message = *input.mutable_withdraw_transaction();
-    message.set_stake_account("6u9vJH9pRj66N5oJFCBADEbpMTrLxQATcL6q5p5MXwYv");
-    message.set_value((uint64_t)42L);
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_recent_blockhash("11111111111111111111111111111111");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString = "NL7WgagucfLd6AkTtcKe1dqd47xxzF356Q7tEhPrz1LRzZiAmokAaUkpwJ7X71Pmz97zZf9gZQU5BNswdcdpqUL8n1jwn4CoZMaPJhX5LF43Sj817cgreSG14TEWfKertpVpTtc5zY7vkDM7t9wjYhkaqgYz76HQtqAqRHnHF2Qr9EEfLj4zYRerWtyfS3EVyVUaasPxJ5vkcaonEfpGc6uWecaFr2A3YbzEBQpWXjMaXLqmMDtNS8rTNZmwvToa71ddFZKDgaHDcc6Lkg8qriZ3aQbUqL1TbeYp2mk9dWTKY62L1YFE2DyZV5P2qz5feywcMZ9JW6X1wBmiHFCseC42QbnbTibr1VdqLbGx7UWn5tHWk5jCN2aatEPfbFDZ";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignCreateTokenAccount1) {
-    auto privateKeyData = Base58::bitcoin.decode("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5");
-    ASSERT_EQ(Address(PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519)).string(), "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-
-    auto input = Solana::Proto::SigningInput();
-    auto& message = *input.mutable_create_token_account_transaction();
-    message.set_main_address("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-    message.set_token_mint_address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    message.set_token_address("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    input.set_private_key(privateKeyData.data(), privateKeyData.size());
-    input.set_recent_blockhash("9ipJh5xfyoyDaiq8trtrdqQeAhQbQkWy2eANizKvx75K");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString =
-        "CKzRLx3AQeVeLQ7T4hss2rdbUpuAHdbwXDazxtRnSKBuncCk3WnYgy7XTrEiya19MJviYHYdTxi9gmWJY8qnR2vHVnH2DbPiKA8g72rD3VvMnjosGUBBvCwbBLge6FeQdgczMyRo9n5PcHvg9yJBTJaEEvuewyBVHwCGyGQci7eYd26xtZtCjAjwcTq4gGr3NZbeRW6jZp6j6APuew7jys4MKYRV4xPodua1TZFCkyWZr1XKzmPh7KTavtN5VzPDA8rbsvoEjHnKzjB2Bszs6pDjcBFSHyQqGsHoF8XPD35BLfjDghNtBmf9cFqo5axa6oSjANAuYg6cMSP4Hy28waSj8isr6gQjE315hWi3W1swwwPcn322gYZx6aMAcmjczaxX9aktpHYgZxixF7cYWEHxJs5QUK9mJePu9Xc6yW75UB4Ynx6dUgaSTEUzoQthF2TN3xXwu1";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignCreateTokenAccount2_5KtPn1) {
-    auto privateKeyData = parse_hex("4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7");
-    ASSERT_EQ(Address(PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519)).string(), "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ");
-
-    auto input = Solana::Proto::SigningInput();
-    auto& message = *input.mutable_create_token_account_transaction();
-    message.set_main_address("Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ");
-    message.set_token_mint_address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    message.set_token_address("ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf");
-    input.set_private_key(privateKeyData.data(), privateKeyData.size());
-    input.set_recent_blockhash("HxaCmxrXgzkzXYvDFTToENtf9rVKk7cbiuSUqnqNheHq");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString =
-        // https://explorer.solana.com/tx/5KtPn1LGuxhFiwjxErkxTb7XxtLVYUBe6Cn33ej7ATNVyorrkk3UAFJWDBUmzP8CZjmkocCxiMAdYnvrKoGpMsJx
-        "EoJGDRFZdnjmx7rgwYSuDGTMTUdxCBeh8RggrQDzGht9bwzLPpCWkCrN4iQJqg3R6JxP7z2QZuf7dGCZcjMVBmmisYE8waRsohcvygRwmGr6nefbaujR5avm2x3EUvoTGyy8cMZJxX7URx45qQJyCgqFLNFCQzD1Kej3xCEPAJqCdGZgmqkryw2E2nkpGKXgRmbyEg2rFgd5kpvjG6jSLLYzGomxVnaKK2XyMQbcedkTMYJ8Ara71iWPRFUziWfgivZcA1qsQp92Fpao3FSsRprhoQz9u1VyAnh8zEM9jCKiE5s4dwCknqCJYeYsbMLn1be2vNP9bMQfu1jjGSHmbb9WR3E2vakTUEUByASXqSAJZuXYE5scopEzB28rC8nrC31ArLMZng5wWym3QbqEv2Syd6RHoEeoXR6vA5LPqvJKyvtH82p4hc4XbD18128aNrFG3GTD2P";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignCreateTokenAccountForOther_3E6UFV) {
-    auto privateKeyData = parse_hex("4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7");
-    ASSERT_EQ(Address(PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519)).string(), "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ");
-
-    auto input = Solana::Proto::SigningInput();
-    auto& message = *input.mutable_create_token_account_transaction();
-    message.set_main_address("3xJ3MoUVFPNFEHfWdtNFa8ajXUHsJPzXcBSWMKLd76ft");
-    message.set_token_mint_address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    message.set_token_address("67BrwFYt7qUnbAcYBVx7sQ4jeD2KWN1ohP6bMikmmQV3");
-    input.set_private_key(privateKeyData.data(), privateKeyData.size());
-    input.set_recent_blockhash("HmWyvrif3QfZJnDiRyrojmH9iLr7eMxxqiC9RJWFeunr");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString =
-        // https://explorer.solana.com/tx/3E6UFVamHCm6Bgk8gXdZex7R7tJAVxqJm6t9ephAKu1PjcfZrD7CJqMwKu6RrvWSUESbZFqzdUyLXuxAFaawPHvJ
-        "4BsrHedHuForcKDhLdnLYDXgtQgQEj3EQVDtEhqa7o6ukFjW3shpTWv6PeKQdMp6af4ASjD4xQeZvXxLK5WUjguVMUf3xdJn7RnFeM7hdDJ56RDBM5PRJbRJVHjz6FJ7SVNTvr9y3gVYQtWx7NfKRxiyEAfq9JG7nqxSWaW6raMr9t35aVcdAVuXE9iXj3rzhVfCS69vVzy5KcFEK3mvDYG6L12V2CfviCydmeCvPw5r3zBUrZSQv7Ti4XFNBrPbk28gcqQwsBknBqasHxHqD9VUyPmBTuUyXq75QN8rhqN55NjxKBUw37tEUS1jKVpWnTeLFq1eRAMdXvjftNuQ5Bmm8Zc12PGWj9vdorBaYyvZXexJST5xNjR4SCkXvXZoRScETck95chv3VBn54jP8DpB4GGUmATFKSxpdtnNV64i1SQXW13KJwswthJvAaDiqevQLKLkvrTEAdb4BxEfPkFjDVti6P58rTZCMg5CTVLqdmWwpTSW5V";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignTokenTransfer1_3vZ67C) {
-    auto privateKeyData = Base58::bitcoin.decode("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5");
-    ASSERT_EQ(Address(PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519)).string(), "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-
-    auto input = Solana::Proto::SigningInput();
-    auto& message = *input.mutable_token_transfer_transaction();
-    message.set_token_mint_address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    message.set_sender_token_address("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    message.set_recipient_token_address("3WUX9wASxyScbA7brDipioKfXS1XEYkQ4vo3Kej9bKei");
-    message.set_amount(4000); // 0.004
-    message.set_decimals(6);
-    input.set_private_key(privateKeyData.data(), privateKeyData.size());
-    input.set_recent_blockhash("CNaHfvqePgGYMvtYi9RuUdVxDYttr1zs4TWrTXYabxZi");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString =
-        // https://explorer.solana.com/tx/3vZ67CGoRYkuT76TtpP2VrtTPBfnvG2xj6mUTvvux46qbnpThgQDgm27nC3yQVUZrABFjT9Qo7vA74tCjtV5P9Xg
-        "PGfKqEaH2zZXDMZLcU6LUKdBSzU1GJWJ1CJXtRYCxaCH7k8uok38WSadZfrZw3TGejiau7nSpan2GvbK26hQim24jRe2AupmcYJFrgsdaCt1Aqs5kpGjPqzgj9krgxTZwwob3xgC1NdHK5BcNwhxwRtrCphGEH7zUFpGFrFrHzgpf2KY8FvPiPELQyxzTBuyNtjLjMMreehSKShEjD9Xzp1QeC1pEF8JL6vUKzxMXuveoEYem8q8JiWszYzmTMfDk13JPgv7pXFGMqDV3yNGCLsWccBeSFKN4UKECre6x2QbUEiKGkHkMc4zQwwyD8tGmEMBAGm339qdANssEMNpDeJp2LxLDStSoWShHnotcrH7pUa94xCVvCPPaomF";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignTokenTransfer2_2pMvzp) {
-    auto privateKeyData = Base58::bitcoin.decode("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5");
-    ASSERT_EQ(Address(PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519)).string(), "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-
-    auto input = Solana::Proto::SigningInput();
-    auto& message = *input.mutable_token_transfer_transaction();
-    message.set_token_mint_address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    message.set_sender_token_address("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    message.set_recipient_token_address("ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf");
-    message.set_amount(6100); // 0.0061
-    message.set_decimals(6);
-    input.set_private_key(privateKeyData.data(), privateKeyData.size());
-    input.set_recent_blockhash("zMEbroNLJ4vfDTdQyA72rk35c7nPo4K38efHLujbSuz");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString =
-        // https://explorer.solana.com/tx/2pMvzparE16evNgNhiexBfj15eurQgqFJXemYkuGasWV8RfT5tQseadqXA2VXbgGZPM1MpLcGwfkKKqvYvrKTmnR
-        "LCtawaKHmvh9WEjYPFFMDQXsdKMQbVyK4Q3aRRfLCouqw6GE4p31PRPFoQqtazTziEj3ex3iLgnCspz1MN4SUE9d33g3HiiA6oCS6wGMvB2i3ojtmJzndCiLoDmuZgiuGouVSeS2MAEUoS3CRjdnbNKbRwgKn8YsDe1bZ57ueipfBLJfiE7xr8ji678uAv8FcMgo8Mq88SBGxVCUhjMS2VGQZhRUHHzDmvnzxhbbUzsLDfApzjHExkUm7ws3cQ2i1cSpQNCQWJd6rcDv1sYwDAavPS571Ny3CUq4cZxABh45Gj88LkRpzBMRdoebrh9hPy8ZRnu7PocBVjZytCgdF4CuhzdYNsmdcuU2WN5CEmv5zQ7pBrFdLZ8bBifP";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignCreateAndTransferToken_449VaY) {
-    auto privateKeyData = Base58::bitcoin.decode("66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c");
-    ASSERT_EQ(Address(PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519)).string(), "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ");
-
-    auto input = Solana::Proto::SigningInput();
-    auto& message = *input.mutable_create_and_transfer_token_transaction();
-    message.set_recipient_main_address("71e8mDsh3PR6gN64zL1HjwuxyKpgRXrPDUJT7XXojsVd");
-    message.set_token_mint_address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    message.set_recipient_token_address("EF6L8yJT1SoRoDCkAZfSVmaweqMzfhxZiptKi7Tgj5XY");
-    message.set_sender_token_address("ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf");
-    message.set_amount(2900);
-    message.set_decimals(6);
-    input.set_private_key(privateKeyData.data(), privateKeyData.size());
-    input.set_recent_blockhash("DMmDdJP41M9mw8Z4586VSvxqGCrqPy5uciF6HsKUVDja");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString =
-        // https://explorer.solana.com/tx/449VaYo48LrkMJF6XVKt9sJwVQN6Seqrmh9erDCLtiuj6BgFG3wpF5TwjNkxgJ7qzNa6NTj3TFsU3h9hKszfkA7w
-        "3Y2MVz2VVi7aEyC9q1awwdk1ModDBPHRSacKmTYnSgkmbbJeZ62Fub1bVPSHaTy4LUcQpzCQYhHAKtTKXUDYijEeLsMAUqPBEMAq1w8zCdqDpdXy6M4PuwNtYVV1WgqeiEsiMWpPp4BGWKfcziwFbmYueUGituacJq4wTnt92fho8mFi49XW64gEG4iNGScDtJkY7Geq8PKiLh1E9JMJoceiHxKbmxzCmmLTxEHdhySYHcDUSXnXWogZskeZNBMtR9dNjEMkCzEjrxRpBtJPtUNshciY45mDPNmw4j3xyLCBTRikyfFLc5g11r3UgyVD4YokoPRvrEXsgt6W3yjBshropBm6mY2eJYvfY2eZz4Yq8kLcUatCHVKtjcb1mP9Ww57KisJ9bRhipC8sodFaMYhZARMEa4a1u9eH4MyNUATRGNXarwQSBY46PWS3nKP6QBK7Dw7Ppp9MmYkdPcXKaLScbyLF3jKu6dHWMkHw3WdXSsM1wwXjXnWF9LxdwaEVcDmySWybj6aKD9QCWTU5kdncqJU56f7SYNRTN289WdUFGNDmSh56tj2v1";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignCreateAndTransferTokenWithMemoReferences) {
-    const auto privateKeyData = Base58::bitcoin.decode("66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c");
-    EXPECT_EQ(Address(PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519)).string(), "Eg5jqooyG6ySaXKbQUu4Lpvu2SqUPZrNkM4zXs9iUDLJ");
-
-    auto input = Solana::Proto::SigningInput();
-    auto& message = *input.mutable_create_and_transfer_token_transaction();
-    message.set_recipient_main_address("71e8mDsh3PR6gN64zL1HjwuxyKpgRXrPDUJT7XXojsVd");
-    message.set_token_mint_address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    message.set_recipient_token_address("EF6L8yJT1SoRoDCkAZfSVmaweqMzfhxZiptKi7Tgj5XY");
-    message.set_sender_token_address("ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf");
-    message.set_amount(2900);
-    message.set_decimals(6);
-    message.set_memo("HelloSolanaMemo370");
-    message.add_references("CuieVDEDtLo7FypA9SbLM9saXFdb1dsshEkyErMqkRQq");
-    message.add_references("tFpP7tZUt6zb7YZPpQ11kXNmsc5YzpMXmahGMvCHhqS");
-    input.set_private_key(privateKeyData.data(), privateKeyData.size());
-    input.set_recent_blockhash("DMmDdJP41M9mw8Z4586VSvxqGCrqPy5uciF6HsKUVDja");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeSolana);
-
-    auto expectedString = "FuUw2MoEGPATE38roXAw9mGQhCfdsdpVDdhuf5h8LKc8iWj2HzNS3SteXqyUoZtQ7L1ufLvu7cTMwNzxT8snnVimcknsA52CeN7bgMz1Ad1hRTAr77zE5efzAi8B124kaQ1cBEb6nFMr5Zq4wwDRoJgBaiUaM1U9ZY6GofCKHGMQN7ZNqEFG4fFvPaMXB59dFtiqrtApBGzvDho3nGshyQWZVWfMY44hvVk45FqiGrXuqUwkiJqeRaDhooZdXiFR9ubwJLXo3Ux23ZyijWKXYNsx1Lm5zMFEgRz3kXhzxzb8uzHVSrFYNieXXCQEv1GtErMKeQWuAHcwS3zxC6avTnTWJhTz3kVSXfSTYEg4MF2MBWeGrzKZ7id88ZfbpG4ZwzsDsdUCSMV6YYRNmx9P3B6oC4DL7cbi2g8hwtBdeKojY4G6JMPeg629V9sPyg2KKeYxD3cjhMKAYtrsJEbixep4LZENtdQxmgZFouJVvGy9MVhiTzGEFVwm4G25p5FhWhiS9HxHWVRXpUFHi2K9K2ttoo4Ug39V9f8s9cG1Xb5A4bHhGSuKLeCCBcrBqPWEsuLdVhjxsKJrRBJhyrZ6mpxtDhUWivZa6skmEawTts9rN2aP3dXW3cNch3s3LTXZWXG9QPUARJJPy5QAYsBoR8GunF5FFgHVuEHVpjXAd8ku9f7aoF8RNiMnXAqQHxiM3ug6HZpLHLX8aGoUbJ7vVAnEDLH";
-    ASSERT_EQ(output.encoded(), expectedString);
-}
-
-TEST(TWAnySignerSolana, SignJSON) {
-    auto json = STRING(R"({"recentBlockhash":"11111111111111111111111111111111","transferTransaction":{"recipient":"EN2sCsJ1WDV8UFqsiTXHcUPUxQ4juE71eCknHYYMifkd","value":"42"}})");
-    Data keyData = Base58::bitcoin.decode("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr");
-    EXPECT_EQ(hex(keyData), "8778cc93c6596387e751d2dc693bbd93e434bd233bc5b68a826c56131821cb63");
-    auto key = WRAPD(TWDataCreateWithBytes(keyData.data(), keyData.size()));
-
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeSolana));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeSolana));
-    assertStringsEqual(result, expectedString1);
-}
-
-} // namespace TW::Solana::tests
diff --git a/tests/Solana/TWCoinTypeTests.cpp b/tests/Solana/TWCoinTypeTests.cpp
deleted file mode 100644
index 5bd9998488a..00000000000
--- a/tests/Solana/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-TEST(TWSolanaCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeSolana));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("5LmxrEKGchhMuYfw6Qut6CbsvE9pVfb8YvwZKvWssSesDVjHioBCmWKSJQh1WhvcM6CpemhpHNmEMA2a36rzwTa8"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeSolana, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("Bxp8yhH9zNwxyE4UqxP7a7hgJ5xTZfxNNft7YJJ2VRjT"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeSolana, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSolana));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSolana));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeSolana), 9);
-    ASSERT_EQ(TWBlockchainSolana, TWCoinTypeBlockchain(TWCoinTypeSolana));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeSolana));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeSolana));
-    assertStringsEqual(symbol, "SOL");
-    assertStringsEqual(txUrl, "https://solscan.io/tx/5LmxrEKGchhMuYfw6Qut6CbsvE9pVfb8YvwZKvWssSesDVjHioBCmWKSJQh1WhvcM6CpemhpHNmEMA2a36rzwTa8");
-    assertStringsEqual(accUrl, "https://solscan.io/account/Bxp8yhH9zNwxyE4UqxP7a7hgJ5xTZfxNNft7YJJ2VRjT");
-    assertStringsEqual(id, "solana");
-    assertStringsEqual(name, "Solana");
-}
diff --git a/tests/Solana/TWSolanaAddressTests.cpp b/tests/Solana/TWSolanaAddressTests.cpp
deleted file mode 100644
index 2ad4f854fcd..00000000000
--- a/tests/Solana/TWSolanaAddressTests.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include <TrustWalletCore/TWHDWallet.h>
-#include <TrustWalletCore/TWSolanaAddress.h>
-
-#include <gtest/gtest.h>
-
-TEST(TWSolanaAddress, HDWallet) {
-    auto mnemonic =
-        "shoot island position soft burden budget tooth cruel issue economy destroy above";
-    auto passphrase = "";
-
-    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(STRING(mnemonic).get(), STRING(passphrase).get()));
-
-    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypeSolana, WRAPS(TWCoinTypeDerivationPath(TWCoinTypeSolana)).get()));
-    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyEd25519(privateKey.get()));
-    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeSolana));
-    auto addressStr = WRAPS(TWAnyAddressDescription(address.get()));
-
-    assertStringsEqual(addressStr, "2bUBiBNZyD29gP1oV6de7nxowMLoDBtopMMTGgMvjG5m");
-}
-
-TEST(TWSolanaProgram, defaultTokenAddress) {
-    const auto solAddress = STRING("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-    const auto serumToken = STRING("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-
-    auto solanaAddress = WRAP(TWSolanaAddress, TWSolanaAddressCreateWithString(solAddress.get()));
-    auto description = WRAPS(TWSolanaAddressDescription(solanaAddress.get()));
-    auto tokenAddress = WRAPS(TWSolanaAddressDefaultTokenAddress(solanaAddress.get(), serumToken.get()));
-
-    assertStringsEqual(tokenAddress, "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    assertStringsEqual(description, "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-}
diff --git a/tests/Solana/TransactionTests.cpp b/tests/Solana/TransactionTests.cpp
deleted file mode 100644
index c6ff726f613..00000000000
--- a/tests/Solana/TransactionTests.cpp
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Solana/Address.h"
-#include "Solana/Transaction.h"
-#include "Solana/Program.h"
-#include "HexCoding.h"
-
-#include "BinaryCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Solana {
-
-TEST(SolanaTransaction, TransferMessageData) {
-    auto from = Address("6eoo7i1khGhVm8tLBMAdq4ax2FxkKP4G7mCcfHyr3STN");
-    auto to = Address("56B334QvCDMSirsmtEJGfanZm8GqeQarrSjdAb2MbeNM");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto transaction = Transaction(from, to, 42, recentBlockhash);
-
-    auto expectedHex =
-        "0100010353f9d600fe925083bb399907ea648d23a6a081fc7e9059202fd725f7edd281dd3cc1ff9ba3c7a876c8"
-        "082df2f8a36ea9342ce3819dd4b6fa72d4a18e04a5363a00000000000000000000000000000000000000000000"
-        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000010202"
-        "00010c020000002a00000000000000";
-    ASSERT_EQ(hex(transaction.messageData()), expectedHex);
-}
-
-TEST(SolanaTransaction, TransferSerializeTransaction) {
-    auto from = Address("41a5jYky56M6EWDsFfLaZRxoRtgAJSRWxJnxaJNJELn5");
-    auto to = Address("4iSnyfDKaejniaPc2pBBckwQqV3mDS93go15NdxWJq2y");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto transaction = Transaction(from, to, 42, recentBlockhash);
-    Signature signature(
-        "46SRiQGvtPb1iivDfnuC3dW1GzXkfQPTjdUyvFqF2sdPvFrsfx94fys2xpNKR6UiAj7RgKWdJG6mEfe85up6i1JT");
-    transaction.signatures.clear();
-    transaction.signatures.push_back(signature);
-
-    auto expectedString =
-        "5SiHeYyuDgjHxWHbYXSSPfmYc8s7EYZ8bdZ7j15z9Bj1yyZA3Bia9uWkRdXVkuqifXiiQj6fVKy"
-        "7UkCL5kvv6iKrfjWTZ3szMVssTFxgJ7p8UJ7Mgg2uhHejVJvbzbiHHLbNVuJFs6kBxddnJ2yjWU"
-        "Cp2dYJgjmphfA8hRHHdPH4Rv6znxEhD8q9XY4nByRPL7oMCo32oxeJn5rGbUZdCkapRUXG7zU9w"
-        "hv6KjBktcUQZRCahhowGJT4UM5yCNCsUcqY9yan7UxqPyJgaFPuq4duqWJtQ39bTQ36X";
-    ASSERT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaTransaction, TransferTransactionPayToSelf) {
-    auto from = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    auto to = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto transaction = Transaction(from, to, 42, recentBlockhash);
-    Signature signature(
-        "3CFWDEK51noPJP4v2t8JZ3qj7kC7kLKyws9akfHMyuJnQ35EtzBptHqvaHfeswiLsvUSxzMVNoj4CuRxWtDD9zB1");
-    transaction.signatures.clear();
-    transaction.signatures.push_back(signature);
-
-    auto expectedString =
-        "EKUmihvvUPKVN4GSCFwZRtz8WiyAuPvthW69Smo19SCjcPLQ6T7EVZd1HU71WAoe1bfgmPNS5JhU7ZLA9XKG3qbZqe"
-        "EFJ1xmRwW9ZKw8SKMAL6VRWxp87oLu7PSmf5b8R34vCaww3XLKtZkoP49a7TUK31DqPN5xJCceMB3BZJyaojQaKU8n"
-        "UkzSGf89LY6abZXp9krKAebvc6bSMzTP8SHSvbmZbf3VtejmpQeN9X6e7WVDn6oDa2bGT";
-    ASSERT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaTransaction, TransferWithMemoAndReferenceTransaction) {
-    const auto from = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    const auto to = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    const Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    const auto memo = "HelloSolana73";
-    std::vector<Address> references = {Address("GaeTAQZyhVEocTC7iY8GztSyY5cBAJTkAUUA1kLFLMV")};
-    auto transaction = Transaction(from, to, 42, recentBlockhash, memo, references);
-    const Signature signature("3CFWDEK51noPJP4v2t8JZ3qj7kC7kLKyws9akfHMyuJnQ35EtzBptHqvaHfeswiLsvUSxzMVNoj4CuRxWtDD9zB1");
-    transaction.signatures.clear();
-    transaction.signatures.push_back(signature);
-
-    auto expectedString = "3pzQEdU38uMQgegTyRsRLi23NK4YokgZeSVLXYzFB7HShqZZH8FdBLqj6CeA2d2L8oR9KF2UaJPWbE8YBFmSdaafegoSXJtyj7ciwTjk5ieSXnPXtqH1TEcnMntZATg7gKpeFg6iehqdSUtZuQD1PGmHA1TrzzqLpRSRrc1sqPz8EpSJcQr1Y41B1XCEAfSJDfcuNKrfFrnQaVtRz6tseQfd9uXNYNuR1NQSepWdav5wQiohLUMDiZtxuwb7FQkQ68WE1FDsHmd4JpbWKmDEjz7HFyQY37vf6NBJyX5qWJpFMSg5qGKWvhNCDM32yM4A7HhPeoTWEywE5CXcNmQqdbRt4BzF1A11uqv4etWj";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaTransaction, StakeSerializeTransactionV2) {
-    auto signer = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    auto voteAddress = Address("4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC");
-    auto programId = Address("Stake11111111111111111111111111111111111111");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto stakeAddress = StakeProgram::addressFromRecentBlockhash(signer, recentBlockhash, programId);
-    auto message = Message::createStake(signer, stakeAddress, voteAddress, 42, recentBlockhash);
-    auto transaction = Transaction(message);
-    Signature signature(
-        "2GXRrZMMWTaY8ycwFTLFojAVZ1EepFqnVGW7b5bBuuKPiVrpaPXMAwyYsSmYc2okCa1MuJjNguu1emSJRtZxVdwt");
-    transaction.signatures.clear();
-    transaction.signatures.push_back(signature);
-
-    auto expectedString = "W1EAswaWK7mF4r9eZ2hHBZnfPnqLuNPiYkEMzFbwQsgSQu6XbSTL9AN92iyMbAMxPoRpt9ipUyztrmszAnm688N3k7uhiKn2osm9nxi6YkGLfu31jHTSu7mn3RtmenV3qopfPDAM92cXrzUhKGWtQ6cATeQh8i8ZfHpmjyuik7Eg3SQ4sa2543CmcozzjmTTWThThuLdvFCZJzBeRBFWLujqjbs5mA66XVtiDwsEqYByznoo4BN45XUHxnZebmPfo4hi5sf27UkhzPHik371BGxbVDexQp4y5nCEHy8ybfNCvMPLr2SEBiWSifwPkmwYN3hGCkBpqLoHCCiRcyJuRHW8hSDFR4JPQ3Xe3FGfpgbayaawZigUnFuPGSpoGrURZRoLCzc6V4ApqcJbmzFhg5zJz2yTX5GvQSYWLFnTKbPYcgBNpdyMLJTivonrKtgkfdymZVKjDwnHUApC7WD4L9mqzTf1dzR61Fxhu3Rdh8ECiVEDgB1wkWZWkTKEdANmtaYLKCMUs3n4VhuZbSFLEiTg7yRWM2pjBgiBB4qywbF7SE75UtzSFCaDnn27mKkxRBqZEGEgfpEoK2AxjsiCZEZxfLeyZFbwWe7xasmNiXr6CnAQhwsmxJk79h7SYmaje76JLxHVX5gbQmLfn5bc1xthS3YhteSovQ8xYq1jiHCfsXRwbxKrNA4kVMiSa6spoU9AhFL8cDAZjAqoU4YRwBihZVhXSFCRnYAK8FabzEv1M44EeHX1sfMG8T1U7y3DEjom7jv6rqZfLumWpbXDTqanB7zTbTjGyDcBBf21edjpZzBZ7osS5fTVYJ5mZBSvjjhuGkUgZZWgYozAKvdyyrJH6UdcPvNm2XgMRYJxqyCin1zhCeQ25vK1H8Jj";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaTransaction, StakeSerializeTransactionV1) {
-    auto signer = Address("zVSpQnbBZ7dyUWzXhrUQRsTYYNzoAdJWHsHSqhPj3Xu");
-    auto voteAddress = Address("4jpwTqt1qZoR7u6u639z2AngYFGN3nakvKhowcnRZDEC");
-    auto programId = Address("Stake11111111111111111111111111111111111111");
-    Solana::Hash recentBlockhash("11111111111111111111111111111111");
-    auto stakeAddress = StakeProgram::addressFromValidatorSeed(signer, voteAddress, programId);
-    auto message = Message::createStake(signer, stakeAddress, voteAddress, 42, recentBlockhash);
-    auto transaction = Transaction(message);
-    Signature signature(
-        "2GXRrZMMWTaY8ycwFTLFojAVZ1EepFqnVGW7b5bBuuKPiVrpaPXMAwyYsSmYc2okCa1MuJjNguu1emSJRtZxVdwt");
-    transaction.signatures.clear();
-    transaction.signatures.push_back(signature);
-
-    auto expectedString = "W1EAswaWK7mF4r9eZ2hHBZnfPnqLuNPiYkEMzFbwQsgSQu6XbSTL9AN92iyMbAMxPoRpt9ipUyztrmszAnm688N3k7uhiKn2osm9nxi6YkGLfu31jHTSu7mn3RtmenV3qopfPDAM7jtGoYQFb7eFVbujUb6tbeQ9UqLJq1sJ7uMZ4wqecmQPouDmJnpmJk4CHMzLnPNTwyGmGio6sYAS3xKZ7DFXvjwGPuD8PyYHSfdPro1p3jy9igPZNAbQ6fgK7LL3sERKCUdvPy7k14xgHbtsVy2mu54LY5c8F9sFst2uzQiTsXRTdjPFAyCVwB5pccNVotCrJ6Q2aKSC2D2knVH7LgWzSBMSreJG75xyATneu922wSzz7QJDieqhDtdePtSbPtoCdtPNmDfdaeDbHxVAxMios9F7RSRmH2dq86NfWDvF8TuEbYY7gPnygz6jGvwfqSSoSnY8TnUhhceC7wJSMc8Hcf1kyfi8dqKm7rF57YjnrQoMmL5bWqJLKoJtdfFu24ceQN21k38U2tUMWJaBASWukgTJUbNSCemNPZt4P3cNbeB3L1wBj4GEYXVTbTFYKME5JscU5RsnkMJZZ1PgxSi63HT4hwQLok4c18UdJgzMFu1njpZj3Sw76mwV3ea7ruHnP4yyM3YhUGbNjpx5fAcnvdLcXChdsgeUpJhutME6V86Rk2EEskoJeD3qNWi3hvfQx172hZRHyKyr29Ts1uLQxcMJq7oeQUxvTfXxSe6cBuPJUDFkAET3qpS7rWM7rvQQ8rDLQF5QvcJnrYTq12pVgw28WXdgi45811a7DWHGuwHRj5FJdLQAHkKe4EXVeTCdbYHREVwuyTJgAvb8SXjRE5a9n3qpRDr7iEd5UDZKB5HgvMsMYWh5";
-    ASSERT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaTransaction, CreateTokenAccountTransaction) {
-    auto signer = Address("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-    auto token = Address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    auto tokenAddress = Address("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    Solana::Hash recentBlockhash("9ipJh5xfyoyDaiq8trtrdqQeAhQbQkWy2eANizKvx75K");
-    auto message = Message::createTokenCreateAccount(signer, signer, token, tokenAddress, recentBlockhash);
-    EXPECT_EQ(message.header.numRequiredSignatures, 1);
-    EXPECT_EQ(message.header.numCreditOnlySignedAccounts, 0);
-    EXPECT_EQ(message.header.numCreditOnlyUnsignedAccounts, 5);
-    ASSERT_EQ(message.accountKeys.size(), 7ul);
-    EXPECT_EQ(message.accountKeys[0].string(), "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-    EXPECT_EQ(message.accountKeys[1].string(), "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    EXPECT_EQ(message.accountKeys[2].string(), "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    EXPECT_EQ(message.accountKeys[3].string(), "11111111111111111111111111111111");
-    EXPECT_EQ(message.accountKeys[4].string(), "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
-    EXPECT_EQ(message.accountKeys[5].string(), "SysvarRent111111111111111111111111111111111");
-    EXPECT_EQ(message.accountKeys[6].string(), "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
-    EXPECT_EQ(Base58::bitcoin.encode(message.recentBlockhash.bytes), "9ipJh5xfyoyDaiq8trtrdqQeAhQbQkWy2eANizKvx75K");
-    ASSERT_EQ(message.instructions.size(), 1ul);
-    EXPECT_EQ(message.instructions[0].programId.string(), "ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
-    ASSERT_EQ(message.instructions[0].accounts.size(), 7ul);
-    EXPECT_EQ(message.instructions[0].accounts[0].account.string(), "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-    EXPECT_EQ(message.instructions[0].accounts[1].account.string(), "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    EXPECT_EQ(message.instructions[0].accounts[2].account.string(), "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-    EXPECT_EQ(message.instructions[0].accounts[3].account.string(), "SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    EXPECT_EQ(message.instructions[0].accounts[4].account.string(), "11111111111111111111111111111111");
-    EXPECT_EQ(message.instructions[0].accounts[5].account.string(), "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
-    EXPECT_EQ(message.instructions[0].accounts[6].account.string(), "SysvarRent111111111111111111111111111111111");
-    auto transaction = Transaction(message);
-    transaction.signatures.clear();
-    Signature signature("3doYbPs5rES3TeDSrntqUvMgXCDE2ViJX2SFhLtiptVNkqPuixXs1SwU5LUZ3KwHnCzDUth6BRr3vU3gqnuUgRvQ");
-    transaction.signatures.push_back(signature);
-
-    auto expectedString =
-        // test data obtained from spl-token create-account
-        "CKzRLx3AQeVeLQ7T4hss2rdbUpuAHdbwXDazxtRnSKBuncCk3WnYgy7XTrEiya19MJviYHYdTxi9gmWJY8qnR2vHVnH2DbPiKA8g72rD3VvMnjosGUBBvCwbBLge6FeQdgczMyRo9n5PcHvg9yJBTJaEEvuewyBVHwCGyGQci7eYd26xtZtCjAjwcTq4gGr3NZbeRW6jZp6j6APuew7jys4MKYRV4xPodua1TZFCkyWZr1XKzmPh7KTavtN5VzPDA8rbsvoEjHnKzjB2Bszs6pDjcBFSHyQqGsHoF8XPD35BLfjDghNtBmf9cFqo5axa6oSjANAuYg6cMSP4Hy28waSj8isr6gQjE315hWi3W1swwwPcn322gYZx6aMAcmjczaxX9aktpHYgZxixF7cYWEHxJs5QUK9mJePu9Xc6yW75UB4Ynx6dUgaSTEUzoQthF2TN3xXwu1";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-TEST(SolanaTransaction, TransferTokenTransaction_3vZ67C) {
-    auto signer = Address("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
-    auto token = Address("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
-    auto senderTokenAddress = Address("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
-    auto recipientTokenAddress = Address("3WUX9wASxyScbA7brDipioKfXS1XEYkQ4vo3Kej9bKei");
-    uint64_t amount = 4000;
-    uint8_t decimals = 6;
-    Solana::Hash recentBlockhash("CNaHfvqePgGYMvtYi9RuUdVxDYttr1zs4TWrTXYabxZi");
-    auto message = Message::createTokenTransfer(signer, token, senderTokenAddress, recipientTokenAddress, amount, decimals, recentBlockhash);
-    EXPECT_EQ(message.header.numRequiredSignatures, 1);
-    EXPECT_EQ(message.header.numCreditOnlySignedAccounts, 0);
-    EXPECT_EQ(message.header.numCreditOnlyUnsignedAccounts, 2);
-    ASSERT_EQ(message.accountKeys.size(), 5ul);
-    ASSERT_EQ(message.instructions.size(), 1ul);
-    EXPECT_EQ(message.instructions[0].programId.string(), "TokenkegQfeZyiNwAJbNbGKPFXCWuBvf9Ss623VQ5DA");
-    ASSERT_EQ(message.instructions[0].accounts.size(), 4ul);
-    auto transaction = Transaction(message);
-    transaction.signatures.clear();
-    Signature signature("3vZ67CGoRYkuT76TtpP2VrtTPBfnvG2xj6mUTvvux46qbnpThgQDgm27nC3yQVUZrABFjT9Qo7vA74tCjtV5P9Xg");
-    transaction.signatures.push_back(signature);
-
-    auto expectedString =
-        // https://explorer.solana.com/tx/3vZ67CGoRYkuT76TtpP2VrtTPBfnvG2xj6mUTvvux46qbnpThgQDgm27nC3yQVUZrABFjT9Qo7vA74tCjtV5P9Xg
-        // test data obtained from spl-token transfer
-        "PGfKqEaH2zZXDMZLcU6LUKdBSzU1GJWJ1CJXtRYCxaCH7k8uok38WSadZfrZw3TGejiau7nSpan2GvbK26hQim24jRe2AupmcYJFrgsdaCt1Aqs5kpGjPqzgj9krgxTZwwob3xgC1NdHK5BcNwhxwRtrCphGEH7zUFpGFrFrHzgpf2KY8FvPiPELQyxzTBuyNtjLjMMreehSKShEjD9Xzp1QeC1pEF8JL6vUKzxMXuveoEYem8q8JiWszYzmTMfDk13JPgv7pXFGMqDV3yNGCLsWccBeSFKN4UKECre6x2QbUEiKGkHkMc4zQwwyD8tGmEMBAGm339qdANssEMNpDeJp2LxLDStSoWShHnotcrH7pUa94xCVvCPPaomF";
-    EXPECT_EQ(transaction.serialize(), expectedString);
-}
-
-} // namespace TW::Solana
diff --git a/tests/Stellar/AddressTests.cpp b/tests/Stellar/AddressTests.cpp
deleted file mode 100644
index 9f55cc55058..00000000000
--- a/tests/Stellar/AddressTests.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Bitcoin/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Stellar/Address.h"
-
-#include <gtest/gtest.h>
-
-using namespace std;
-using namespace TW;
-
-namespace TW::Stellar::tests {
-
-TEST(StellarAddress, FromPublicKey) {
-    const auto publicKey = PublicKey(parse_hex("0103E20EC6B4A39A629815AE02C0A1393B9225E3B890CAE45B59F42FA29BE9668D"), TWPublicKeyTypeED25519);
-    const auto address = Address(publicKey);
-    auto str = hex(address.bytes);
-    ASSERT_EQ(string("GAB6EDWGWSRZUYUYCWXAFQFBHE5ZEJPDXCIMVZC3LH2C7IU35FTI2NOQ"), address.string());
-}
-
-TEST(StellarAddress, FromString) {
-    string stellarAddress = "GAB6EDWGWSRZUYUYCWXAFQFBHE5ZEJPDXCIMVZC3LH2C7IU35FTI2NOQ";
-    const auto address = Address(stellarAddress);
-    ASSERT_EQ(address.string(), stellarAddress);
-}
-
-TEST(StellarAddress, isValid) {
-    string stellarAddress = "GABQHYQOY22KHGTCTAK24AWAUE4TXERF4O4JBSXELNM7IL5CTPUWM3SC";
-    string bitcoinAddress = "1Ma2DrB78K7jmAwaomqZNRMCvgQrNjE2QC";
-
-    ASSERT_TRUE(Address::isValid(stellarAddress));
-    ASSERT_FALSE(Address::isValid(bitcoinAddress));
-}
-
-} // namespace TW::Stellar::tests
diff --git a/tests/Stellar/TWAnySignerTests.cpp b/tests/Stellar/TWAnySignerTests.cpp
deleted file mode 100644
index 739f0926bca..00000000000
--- a/tests/Stellar/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Stellar/Address.h"
-#include "proto/Stellar.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <TrustWalletCore/TWStellarPassphrase.h>
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Stellar::tests {
-
-TEST(TWAnySingerStellar, Sign_Payment) {
-    auto key = parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722");
-    Proto::SigningInput input;
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
-    input.set_fee(1000);
-    input.set_sequence(2);
-    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
-    input.mutable_op_payment()->set_amount(10000000);
-    input.set_private_key(key.data(), key.size());
-    auto& memoText = *input.mutable_memo_text();
-    memoText.set_text("Hello, world!");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeStellar);
-
-    EXPECT_EQ(output.signature(), "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAEAAAANSGVsbG8sIHdvcmxkIQAAAAAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEBQQldEkYJ6rMvOHilkwFCYyroGGUvrNeWVqr/sn3iFFqgz91XxgUT0ou7bMSPRgPROfBYDfQCFfFxbcDPrrCwB");
-}
-
-TEST(TWAnySingerStellar, Sign_Payment_66b5) {
-    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
-    PrivateKey privKey = PrivateKey(key);
-    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
-    Address addr = Address(pubKey);
-    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-
-    Proto::SigningInput input;
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-    input.set_fee(1000);
-    input.set_sequence(144098454883270657);
-    input.mutable_op_payment()->set_destination("GA3ISGYIE2ZTH3UAKEKBVHBPKUSL3LT4UQ6C5CUGP2IM5F467O267KI7");
-    input.mutable_op_payment()->set_amount(1000000);
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeStellar);
-
-    // curl "https://horizon.stellar.org/transactions/66b5bca4b4293bdd85a6a559b08918482774b76bcc170b4533411f1d6422ce24"
-    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAD6AH/8MgAAAABAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAANokbCCazM+6AURQanC9VJL2ufKQ8LoqGfpDOl577te8AAAAAAAAAAAAPQkAAAAAAAAAAAXfTkXUAAABAM9Nhzr8iWKzqnHknrxSVoa4b2qzbTzgyE2+WWxg6XHH50xiFfmvtRKVhzp0Jg8PfhatOb6KNheKRWEw4OvqEDw==");
-}
-
-TEST(TWAnySingerStellar, Sign_Payment_Asset_ea50) {
-    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
-    PrivateKey privKey = PrivateKey(key);
-    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
-    Address addr = Address(pubKey);
-    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-
-    Proto::SigningInput input;
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-    input.set_fee(1000);
-    input.set_sequence(144098454883270661);
-    input.mutable_op_payment()->set_destination("GA3ISGYIE2ZTH3UAKEKBVHBPKUSL3LT4UQ6C5CUGP2IM5F467O267KI7");
-    input.mutable_op_payment()->mutable_asset()->set_issuer("GA6HCMBLTZS5VYYBCATRBRZ3BZJMAFUDKYYF6AH6MVCMGWMRDNSWJPIH");
-    input.mutable_op_payment()->mutable_asset()->set_alphanum4("MOBI");
-    input.mutable_op_payment()->set_amount(12000000);
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeStellar);
-
-    // curl "https://horizon.stellar.org/transactions/ea50884cd1288d2d5420065995d13d750d812258e0e79280c4033a434e625c99
-    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAD6AH/8MgAAAAFAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAANokbCCazM+6AURQanC9VJL2ufKQ8LoqGfpDOl577te8AAAABTU9CSQAAAAA8cTArnmXa4wEQJxDHOw5SwBaDVjBfAP5lRMNZkRtlZAAAAAAAtxsAAAAAAAAAAAF305F1AAAAQEuWZZvKZuF6SMuSGIyfLqx5sn5O55+Kd489uP4g9jZH4UE7zZ4ME0+74I0BU8YDsYOmmxcfp/vdwTd+n3oGCQw=");
-}
-
-TEST(TWAnySingerStellar, Sign_Change_Trust_ad9c) {
-    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
-    PrivateKey privKey = PrivateKey(key);
-    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
-    Address addr = Address(pubKey);
-    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-
-    Proto::SigningInput input;
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-    input.set_fee(10000);
-    input.set_sequence(144098454883270659);
-    input.mutable_op_change_trust()->mutable_asset()->set_issuer("GA6HCMBLTZS5VYYBCATRBRZ3BZJMAFUDKYYF6AH6MVCMGWMRDNSWJPIH");
-    input.mutable_op_change_trust()->mutable_asset()->set_alphanum4("MOBI");
-    input.mutable_op_change_trust()->set_valid_before(1613336576);
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeStellar);
-
-    // curl "https://horizon.stellar.org/transactions/ad9cd0f3d636096b6502ccae07adbcf2cd3c0da5393fc2b07813dbe90ecc0d7b"
-    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAnEAH/8MgAAAADAAAAAQAAAAAAAAAAAAAAAGApkAAAAAAAAAAAAQAAAAAAAAAGAAAAAU1PQkkAAAAAPHEwK55l2uMBECcQxzsOUsAWg1YwXwD+ZUTDWZEbZWR//////////wAAAAAAAAABd9ORdQAAAEAnfyXyaNQX5Bq3AEQVBIaYd+cLib+y2sNY7DF/NYVSE51dZ6swGGElz094ObsPefmVmeRrkGsSc/fF5pmth+wJ");
-}
-
-TEST(TWAnySingerStellar, Sign_Change_Trust_2) {
-    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
-    PrivateKey privKey = PrivateKey(key);
-    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
-    Address addr = Address(pubKey);
-    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-
-    Proto::SigningInput input;
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-    input.set_fee(10000);
-    input.set_sequence(144098454883270659);
-    input.mutable_op_change_trust()->mutable_asset()->set_issuer("GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX");
-    input.mutable_op_change_trust()->mutable_asset()->set_alphanum4("USD");
-    input.mutable_op_change_trust()->set_valid_before(1613336576);
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeStellar);
-
-    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAnEAH/8MgAAAADAAAAAQAAAAAAAAAAAAAAAGApkAAAAAAAAAAAAQAAAAAAAAAGAAAAAVVTRAAAAAAA6KYahh5gr2D4B3PgY0blxyy+Wdyt2jdgjVjvQlEdn9x//////////wAAAAAAAAABd9ORdQAAAEDMZtN05ZsZB4OKOZSFkQvuRqDIvMME3PYMTAGJPQlO6Ee0nOtaRn2q0uf0IhETSSfqcsK5asAZzNj07tG0SPwM");
-}
-
-TEST(TWAnySingerStellar, Sign_Create_Claimable_Balance_1f1f84) {
-    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
-    PrivateKey privKey = PrivateKey(key);
-    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
-    Address addr = Address(pubKey);
-    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-
-    Proto::SigningInput input;
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-    input.set_fee(10000);
-    input.set_sequence(144098454883270687);
-    input.mutable_op_create_claimable_balance()->set_amount(90000000);
-    input.mutable_op_create_claimable_balance()->add_claimants();
-    input.mutable_op_create_claimable_balance()->mutable_claimants(0)->set_account("GC6CJDAY54D3O4RHEH33LUTBKDZGVOTR6NHBOTL4PIWI2CDKVRSZZJGJ");
-    input.mutable_op_create_claimable_balance()->mutable_claimants(0)->set_predicate(Proto::Predicate_unconditional);
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeStellar);
-
-    // https://stellar.expert/explorer/public/tx/1f1f849ff2560901c91226f2fc866ef4ed1c67d672262c1f5829abe2348ac638
-    // curl -X POST -F "tx=AAAAAMpF..Bg==" "https://horizon.stellar.org/transactions"
-    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAnEAH/8MgAAAAfAAAAAAAAAAAAAAABAAAAAAAAAA4AAAAAAAAAAAVdSoAAAAABAAAAAAAAAAC8JIwY7we3cich97XSYVDyarpx804XTXx6LI0IaqxlnAAAAAAAAAAAAAAAAXfTkXUAAABAgms/HPhEP/EYtVr5aWwhKJsn3pIVEZGFnTD2Xd/VPVsn8qogI7RYyjyBxSFPiLAljgGsPaUMfU3WFvyJCWNwBg==");
-}
-
-TEST(TWAnySingerStellar, Sign_Claim_Claimable_Balance_c1fb3c) {
-    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
-    PrivateKey privKey = PrivateKey(key);
-    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
-    Address addr = Address(pubKey);
-    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-
-    Proto::SigningInput input;
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
-    input.set_fee(10000);
-    input.set_sequence(144098454883270689);
-    const Data balanceIdHash = parse_hex("9c7b794b7b150f3e4c6dcfa260672bbe0c248b360129112e927e0f7ee2f9faf8");
-    input.mutable_op_claim_claimable_balance()->set_balance_id(balanceIdHash.data(), balanceIdHash.size());
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeStellar);
-
-    // https://stellar.expert/explorer/public/tx/c1fb3cf348aeb72bb2e1030c1d7f7f9c6c6d1bbab071b3e7c7c1cadafa795e8e
-    // curl -X POST -F "tx=AAAAAMpF..DQ==" "https://horizon.stellar.org/transactions"
-    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAnEAH/8MgAAAAhAAAAAAAAAAAAAAABAAAAAAAAAA8AAAAAnHt5S3sVDz5Mbc+iYGcrvgwkizYBKREukn4PfuL5+vgAAAAAAAAAAXfTkXUAAABAWL7dKkR1JuPZGFbDTRDgGBHW/vLPMWNRkAew+wPfGiCnZhpJJDcyX197EDDZMsJ7ungPUyhczRaeQOwZKx4DDQ==");
-
-    { // negative test: hash wrong size
-        const Data invalidBalanceIdHash = parse_hex("010203");
-        input.mutable_op_claim_claimable_balance()->set_balance_id(invalidBalanceIdHash.data(), invalidBalanceIdHash.size());
-        ANY_SIGN(input, TWCoinTypeStellar);
-        EXPECT_EQ(output.signature(), "AAAAAXfTkXUAAABAFCywEfLs3q5Tv9eZCIcjhkJR0s8J4Us9G5YjVKUSaMoUz/AadC8dM2oQSLhpC5wjrNBi7hevg7jlkPx5/4AJCQ==");
-    }
-}
-
-} // namespace TW::Stellar::tests
diff --git a/tests/Stellar/TWCoinTypeTests.cpp b/tests/Stellar/TWCoinTypeTests.cpp
deleted file mode 100644
index 12164f9b2d6..00000000000
--- a/tests/Stellar/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWStellarCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeStellar));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("d9aeabfa9d24df8c5755125f8af243b74cd3ff878656cfa72c566a8824bf6e84"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeStellar, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("GCILJZQ3CKBKBUJWW4TAM6Q37LJA5MQX6GMSFSQN75BPLWIZ33OPRG52"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeStellar, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeStellar));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeStellar));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeStellar), 7);
-    ASSERT_EQ(TWBlockchainStellar, TWCoinTypeBlockchain(TWCoinTypeStellar));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeStellar));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeStellar));
-    assertStringsEqual(symbol, "XLM");
-    assertStringsEqual(txUrl, "https://blockchair.com/stellar/transaction/d9aeabfa9d24df8c5755125f8af243b74cd3ff878656cfa72c566a8824bf6e84");
-    assertStringsEqual(accUrl, "https://blockchair.com/stellar/account/GCILJZQ3CKBKBUJWW4TAM6Q37LJA5MQX6GMSFSQN75BPLWIZ33OPRG52");
-    assertStringsEqual(id, "stellar");
-    assertStringsEqual(name, "Stellar");
-}
diff --git a/tests/Stellar/TransactionTests.cpp b/tests/Stellar/TransactionTests.cpp
deleted file mode 100644
index b80e60a0274..00000000000
--- a/tests/Stellar/TransactionTests.cpp
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include "Stellar/Signer.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include <TrustWalletCore/TWHDWallet.h>
-#include <TrustWalletCore/TWStellarPassphrase.h>
-#include "BinaryCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Stellar::tests {
-
-using namespace std;
-
-TEST(StellarTransaction, sign) {
-    auto words = STRING("indicate rival expand cave giant same grocery burden ugly rose tuna blood");
-    auto passphrase = STRING("");
-
-    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(words.get(), passphrase.get()));
-    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKeyForCoin(wallet.get(), TWCoinTypeStellar));
-    auto input = TW::Stellar::Proto::SigningInput();
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
-    input.set_fee(1000);
-    input.set_sequence(2);
-    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
-    input.mutable_op_payment()->set_amount(10000000);
-    input.set_private_key(privateKey.get()->impl.bytes.data(), privateKey.get()->impl.bytes.size());
-
-    const auto signer = TW::Stellar::Signer(input);
-
-    const auto signature = signer.sign();
-    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAAxYC2MXoOs5v3/NT6PBn9q0uJu6u/YQle5FBa9uzteq4AAAAAAAAAAACYloAAAAAAAAAAARnfXKIAAABAocQZwTnVvGMQlpdGacWvgenxN5ku8YB8yhEGrDfEV48yDqcj6QaePAitDj/N2gxfYD9Q2pJ+ZpkQMsZZG4ACAg==");
-}
-
-TEST(StellarTransaction, signWithMemoText) {
-    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
-    auto input = Proto::SigningInput();
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
-    input.set_fee(1000);
-    input.set_sequence(2);
-    auto memoText = Proto::MemoText();
-    memoText.set_text("Hello, world!");
-    *input.mutable_memo_text() = memoText;
-    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
-    input.mutable_op_payment()->set_amount(10000000);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto signer = Signer(input);
-
-    const auto signature = signer.sign();
-    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAEAAAANSGVsbG8sIHdvcmxkIQAAAAAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEBQQldEkYJ6rMvOHilkwFCYyroGGUvrNeWVqr/sn3iFFqgz91XxgUT0ou7bMSPRgPROfBYDfQCFfFxbcDPrrCwB");
-}
-
-TEST(StellarTransaction, signWithMemoHash) {
-    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
-    auto input = Proto::SigningInput();
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
-    input.set_fee(1000);
-    input.set_sequence(2);
-    auto memoHash = Proto::MemoHash();
-    auto fromHex = parse_hex("315f5bdb76d078c43b8ac0064e4a0164612b1fce77c869345bfc94c75894edd3");
-    memoHash.set_hash(fromHex.data(), fromHex.size());
-    *input.mutable_memo_hash() = memoHash;
-    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
-    input.mutable_op_payment()->set_amount(10000000);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto signer = Signer(input);
-
-    const auto signature = signer.sign();
-    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAMxX1vbdtB4xDuKwAZOSgFkYSsfznfIaTRb/JTHWJTt0wAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAECIyh1BG+hER5W+dgHDKe49X6VEYRWIjajM4Ufq3DUG/yw7Xv1MMF4eax3U0TRi7Qwj2fio/DRD3+/Ljtvip2MD");
-}
-
-TEST(StellarTransaction, signWithMemoReturn) {
-    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
-    auto input = Proto::SigningInput();
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
-    input.set_fee(1000);
-    input.set_sequence(2);
-    auto memoHash = Proto::MemoHash();
-    auto fromHex = parse_hex("315f5bdb76d078c43b8ac0064e4a0164612b1fce77c869345bfc94c75894edd3");
-    memoHash.set_hash(fromHex.data(), fromHex.size());
-    *input.mutable_memo_return_hash() = memoHash;
-    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
-    input.mutable_op_payment()->set_amount(10000000);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto signer = Signer(input);
-
-    const auto signature = signer.sign();
-    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAQxX1vbdtB4xDuKwAZOSgFkYSsfznfIaTRb/JTHWJTt0wAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEBd77iui04quoaoWMfeJO06nRfn3Z9bptbAj7Ol44j3ApU8c9dJwVhJbQ7La4mKgIkYviEhGx3AIulFYCkokb8M");
-}
-
-TEST(StellarTransaction, signWithMemoID) {
-    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
-    auto input = Proto::SigningInput();
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
-    input.set_fee(1000);
-    input.set_sequence(2);
-    auto memoId = Proto::MemoId();
-    memoId.set_id(1234567890);
-    *input.mutable_memo_id() = memoId;
-    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
-    input.mutable_op_payment()->set_amount(10000000);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto signer = Signer(input);
-
-    const auto signature = signer.sign();
-    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAIAAAAASZYC0gAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEAOJ8wwCizQPf6JmkCsCNZolQeqet2qN7fgLUUQlwx3TNzM0+/GJ6Qc2faTybjKy111rE60IlnfaPeMl/nyxKIB");
-}
-
-TEST(StellarTransaction, signAcreateAccount) {
-    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
-    auto input = Proto::SigningInput();
-    input.set_passphrase(TWStellarPassphrase_Stellar);
-    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
-    input.set_fee(1000);
-    input.set_sequence(2);
-    auto memoId = Proto::MemoId();
-    memoId.set_id(1234567890);
-    *input.mutable_memo_id() = memoId;
-    input.mutable_op_create_account()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
-    input.mutable_op_create_account()->set_amount(10000000);
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto signer = Signer(input);
-
-    const auto signature = signer.sign();
-    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAIAAAAASZYC0gAAAAEAAAAAAAAAAAAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAmJaAAAAAAAAAAAEZ31yiAAAAQNgqNDqbe0X60gyH+1xf2Tv2RndFiJmyfbrvVjsTfjZAVRrS2zE9hHlqPQKpZkGKEFka7+1ElOS+/m/1JDnauQg=");
-}
-
-} // namespace TW::Stellar::tests
diff --git a/tests/THORChain/SignerTests.cpp b/tests/THORChain/SignerTests.cpp
deleted file mode 100644
index c283cae8bf2..00000000000
--- a/tests/THORChain/SignerTests.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "proto/Cosmos.pb.h"
-#include "THORChain/Signer.h"
-#include "HexCoding.h"
-#include "Bech32Address.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-#include <google/protobuf/util/json_util.h>
-
-using namespace TW;
-
-
-TEST(THORChainSigner, SignTx_Protobuf_7E480F) {
-    auto input = Cosmos::Proto::SigningInput();
-    input.set_signing_mode(Cosmos::Proto::Protobuf);
-    input.set_chain_id("thorchain-mainnet-v1");
-    input.set_account_number(593);
-    input.set_sequence(21);
-    input.set_memo("");
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_thorchain_send_message();
-    Bech32Address fromAddress("thor");
-    EXPECT_TRUE(Bech32Address::decode("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r", fromAddress, "thor"));
-    Bech32Address toAddress("thor");
-    EXPECT_TRUE(Bech32Address::decode("thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn", toAddress, "thor"));
-    message.set_from_address(std::string(fromAddress.getKeyHash().begin(), fromAddress.getKeyHash().end()));
-    message.set_to_address(std::string(toAddress.getKeyHash().begin(), toAddress.getKeyHash().end()));
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("rune");
-    amountOfTx->set_amount("38000000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(2500000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("rune");
-    amountOfFee->set_amount("200");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-
-    assertJSONEqual(json, R"(
-        {
-            "accountNumber": "593",
-            "chainId": "thorchain-mainnet-v1",
-            "fee": {
-                "amounts": [
-                    {
-                        "amount": "200",
-                        "denom": "rune"
-                    }
-                ],
-                "gas": "2500000"
-            },
-            "messages": [
-                {
-                    "thorchainSendMessage": {
-                        "amounts": [
-                            {
-                                "amount": "38000000",
-                                "denom": "rune"
-                            }
-                        ],
-                        "fromAddress": "FSLnZ9tusZcIsAOAKb+9YHvJvQ4=",
-                        "toAddress": "yoZFn7AFUcffQlQMXnhpGSyDOts="
-                    }
-                }
-            ],
-            "sequence": "21",
-            "signingMode": "Protobuf"
-        }
-    )");
-
-    auto privateKey = parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = THORChain::Signer::sign(input);
-
-    // https://viewblock.io/thorchain/tx/7E480FA163F6C6AFA17593F214C7BBC218F69AE3BC72366E39042AF381BFE105
-    // curl -H 'Content-Type: application/json' --data-binary '{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"ClIKUAoO..89g="}' https://<thornode>/cosmos/tx/v1beta1/txs
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "mode": "BROADCAST_MODE_BLOCK",
-            "tx_bytes": "ClIKUAoOL3R5cGVzLk1zZ1NlbmQSPgoUFSLnZ9tusZcIsAOAKb+9YHvJvQ4SFMqGRZ+wBVHH30JUDF54aRksgzrbGhAKBHJ1bmUSCDM4MDAwMDAwEmYKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQPtmX45bPQpL1/OWkK7pBWZzNXZbjExVKfJ6nBJ3jF8dxIECgIIARgVEhIKCwoEcnVuZRIDMjAwEKDLmAEaQKZtS3ATa26OOGvqdKm14ZbHeNfkPtIajXi5MkZ5XaX2SWOeX+YnCPZ9TxF9Jj5cVIo71m55xq4hVL3yDbRe89g="
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "a66d4b70136b6e8e386bea74a9b5e196c778d7e43ed21a8d78b93246795da5f649639e5fe62708f67d4f117d263e5c548a3bd66e79c6ae2154bdf20db45ef3d8");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(THORChainSigner, SignTx_Json_Deprecated) {
-    auto input = Cosmos::Proto::SigningInput();
-    input.set_memo("memo1234");
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r");
-    message.set_to_address("thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn");
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("rune");
-    amountOfTx->set_amount("50000000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(2000000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("rune");
-    amountOfFee->set_amount("200");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-
-    assertJSONEqual(json, R"(
-        {
-            "fee": {
-                "amounts": [
-                    {
-                        "denom": "rune",
-                        "amount": "200"
-                    }
-                ],
-                "gas": "2000000"
-            },
-            "memo": "memo1234",
-            "messages": [
-                {
-                    "sendCoinsMessage": {
-                        "fromAddress": "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r",
-                        "toAddress": "thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn",
-                        "amounts": [
-                            {
-                                "denom": "rune",
-                                "amount": "50000000"
-                            }
-                        ]
-                    }
-                }
-            ]
-        }
-    )");
-
-    auto privateKey = parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = THORChain::Signer::sign(input);
-
-    assertJSONEqual(output.json(), R"(
-        {
-            "mode": "block",
-            "tx": {
-                "fee": {
-                    "amount": [
-                        {
-                            "amount": "200",
-                            "denom": "rune"
-                        }
-                    ],
-                    "gas": "2000000"
-                },
-                "memo": "memo1234",
-                "msg": [
-                    {
-                        "type": "thorchain/MsgSend",
-                        "value": {
-                            "amount": [
-                                {
-                                    "amount": "50000000",
-                                    "denom": "rune"
-                                }
-                            ],
-                            "from_address": "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r",
-                            "to_address": "thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"
-                        }
-                    }
-                ],
-                "signatures": [
-                    {
-                        "pub_key": {
-                            "type": "tendermint/PubKeySecp256k1",
-                            "value": "A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"
-                        },
-                        "signature": "12AaNC0v51Rhz8rBf7V7rpI6oksREWrjzba3RK1v1NNlqZq62sG0aXWvStp9zZXe07Pp2FviFBAx+uqWsO30NQ=="
-                    }
-                ]
-            }
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "d7601a342d2fe75461cfcac17fb57bae923aa24b11116ae3cdb6b744ad6fd4d365a99abadac1b46975af4ada7dcd95ded3b3e9d85be2141031faea96b0edf435");
-}
-
-TEST(THORChainSigner, SignJson) {
-    auto inputJson = R"({"fee":{"amounts":[{"denom":"rune","amount":"200"}],"gas":"2000000"},"memo":"memo1234","messages":[{"sendCoinsMessage":{"fromAddress":"thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r","toAddress":"thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn","amounts":[{"denom":"rune","amount":"50000000"}]}}]})";
-    auto privateKey = parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e");
-
-    auto outputJson = THORChain::Signer::signJSON(inputJson, privateKey);
-
-    EXPECT_EQ(R"({"mode":"block","tx":{"fee":{"amount":[{"amount":"200","denom":"rune"}],"gas":"2000000"},"memo":"memo1234","msg":[{"type":"thorchain/MsgSend","value":{"amount":[{"amount":"50000000","denom":"rune"}],"from_address":"thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r","to_address":"thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"},"signature":"12AaNC0v51Rhz8rBf7V7rpI6oksREWrjzba3RK1v1NNlqZq62sG0aXWvStp9zZXe07Pp2FviFBAx+uqWsO30NQ=="}]}})", outputJson);
-}
diff --git a/tests/THORChain/SwapTests.cpp b/tests/THORChain/SwapTests.cpp
deleted file mode 100644
index adb3340a417..00000000000
--- a/tests/THORChain/SwapTests.cpp
+++ /dev/null
@@ -1,423 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "THORChain/Swap.h"
-#include "Bitcoin/Script.h"
-#include "Bitcoin/SegwitAddress.h"
-#include "Ethereum/Address.h"
-#include "Ethereum/ABI/Function.h"
-#include "Ethereum/ABI/ParamBase.h"
-#include "Ethereum/ABI/ParamAddress.h"
-#include "Binance/Address.h"
-#include "proto/THORChainSwap.pb.h"
-#include "proto/Bitcoin.pb.h"
-#include "proto/Ethereum.pb.h"
-#include "proto/Binance.pb.h"
-
-#include "HexCoding.h"
-#include "Coin.h"
-#include <TrustWalletCore/TWCoinType.h>
-#include <TrustWalletCore/TWAnySigner.h>
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::THORChainSwap {
-
-// Addresses for wallet 'isolate dismiss fury ... note'
-const auto Address1Btc = "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8";
-const auto Address1Eth = "0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7";
-const auto Address1Bnb = "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx";
-const auto Address1Thor = "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r";
-const Data TestKey1Btc = parse_hex("13fcaabaf9e71ffaf915e242ec58a743d55f102cf836968e5bd4881135e0c52c");
-const Data TestKey1Eth = parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904");
-const Data TestKey1Bnb = parse_hex("bcf8b072560dda05122c99390def2c385ec400e1a93df0657a85cf6b57a715da");
-const auto VaultBtc = "bc1q6m9u2qsu8mh8y7v8rr2ywavtj8g5arzlyhcej7";
-const auto VaultEth = "0x1091c4De6a3cF09CdA00AbDAeD42c7c3B69C83EC";
-const auto VaultBnb = "bnb1n9esxuw8ca7ts8l6w66kdh800s09msvul6vlse";
-const auto RouterEth = "0x42A5Ed456650a09Dc10EBc6361A7480fDd61f27B";
-
-
-TEST(THORChainSwap, SwapBtcEth) {
-    auto res = Swap::build(Chain::BTC, Chain::ETH, Address1Btc, "ETH", "", Address1Eth, VaultBtc, "", "1000000", "140000000000000000");
-    ASSERT_EQ(std::get<1>(res), 0);
-    ASSERT_EQ(std::get<2>(res), "");
-    EXPECT_EQ(hex(std::get<0>(res)), "080110c0843d1801222a62633171366d397532717375386d68387937763872723279776176746a38673561727a6c796863656a372a2a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070386a473d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a313430303030303030303030303030303030");
-
-    auto tx = Bitcoin::Proto::SigningInput();
-    ASSERT_TRUE(tx.ParseFromArray(std::get<0>(res).data(), (int)std::get<0>(res).size()));
-
-    // check fields
-    EXPECT_EQ(tx.amount(), 1000000);
-    EXPECT_EQ(tx.to_address(), VaultBtc);
-    EXPECT_EQ(tx.change_address(), Address1Btc);
-    EXPECT_EQ(tx.output_op_return(), "=:ETH.ETH:0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7:140000000000000000");
-    EXPECT_EQ(tx.coin_type(), 0ul);
-    EXPECT_EQ(tx.private_key_size(), 0);
-    EXPECT_FALSE(tx.has_plan());
-
-    // set few fields before signing
-    tx.set_byte_fee(20);
-    EXPECT_EQ(Bitcoin::SegwitAddress(PrivateKey(TestKey1Btc).getPublicKey(TWPublicKeyTypeSECP256k1), "bc").string(), Address1Btc);
-    tx.add_private_key(TestKey1Btc.data(), TestKey1Btc.size());
-    auto& utxo = *tx.add_utxo();
-    Data utxoHash = parse_hex("1234000000000000000000000000000000000000000000000000000000005678");
-    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
-    utxo.mutable_out_point()->set_index(0);
-    utxo.mutable_out_point()->set_sequence(UINT32_MAX);
-    auto utxoScript = Bitcoin::Script::lockScriptForAddress(Address1Btc, TWCoinTypeBitcoin);
-    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
-    utxo.set_amount(50000000);
-    tx.set_use_max_amount(false);
-
-    // sign and encode resulting input
-    Bitcoin::Proto::SigningOutput output;
-    ANY_SIGN(tx, TWCoinTypeBitcoin);
-    EXPECT_EQ(output.error(), 0);
-    EXPECT_EQ(hex(output.encoded()), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "1234000000000000000000000000000000000000000000000000000000005678"  "00000000"  "00"  ""  "ffffffff"
-        "03" // outputs
-            "40420f0000000000"  "16"  "0014d6cbc5021c3eee72798718d447758b91d14e8c5f"
-            "609deb0200000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
-            "0000000000000000"  "42"  "6a403d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a3134303030303030303030"
-        // witness
-            "02"
-                "47"  "304402205de19c68b5ea683b9d701d45b09f96658088db76e59ad27bd7b8383ee5d484ec0220245459a4d6d679d8b457564fccc7ecc5831c7ebed49e0366c65ac031e8a5b49201"
-                "21"  "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
-        "00000000" // nLockTime
-    );
-}
-
-TEST(THORChainSwap, SwapBtcBnb) {
-    auto res = Swap::build(Chain::BTC, Chain::BNB, Address1Btc, "BNB", "", Address1Bnb, VaultBtc, "", "200000", "140000000");
-    ASSERT_EQ(std::get<1>(res), 0);
-    ASSERT_EQ(std::get<2>(res), "");
-    EXPECT_EQ(hex(std::get<0>(res)), "080110c09a0c1801222a62633171366d397532717375386d68387937763872723279776176746a38673561727a6c796863656a372a2a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070386a41535741503a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a313430303030303030");
-
-    auto tx = Bitcoin::Proto::SigningInput();
-    ASSERT_TRUE(tx.ParseFromArray(std::get<0>(res).data(), (int)std::get<0>(res).size()));
-
-    // check fields
-    EXPECT_EQ(tx.amount(), 200000);
-    EXPECT_EQ(tx.to_address(), VaultBtc);
-    EXPECT_EQ(tx.change_address(), Address1Btc);
-    EXPECT_EQ(tx.output_op_return(), "SWAP:BNB.BNB:bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx:140000000");
-    EXPECT_EQ(tx.coin_type(), 0ul);
-    EXPECT_EQ(tx.private_key_size(), 0);
-    EXPECT_FALSE(tx.has_plan());
-
-    // set few fields before signing
-    tx.set_byte_fee(80);
-    EXPECT_EQ(Bitcoin::SegwitAddress(PrivateKey(TestKey1Btc).getPublicKey(TWPublicKeyTypeSECP256k1), "bc").string(), Address1Btc);
-    tx.add_private_key(TestKey1Btc.data(), TestKey1Btc.size());
-    auto& utxo = *tx.add_utxo();
-    Data utxoHash = parse_hex("8eae5c3a4c75058d4e3facd5d72f18a40672bcd3d1f35ebf3094bd6c78da48eb");
-    std::reverse(utxoHash.begin(), utxoHash.end());
-    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
-    utxo.mutable_out_point()->set_index(0);
-    utxo.mutable_out_point()->set_sequence(UINT32_MAX - 3);
-    auto utxoScript = Bitcoin::Script::lockScriptForAddress(Address1Btc, TWCoinTypeBitcoin);
-    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
-    utxo.set_amount(450000);
-    tx.set_use_max_amount(false);
-
-    // sign and encode resulting input
-    Bitcoin::Proto::SigningOutput output;
-    ANY_SIGN(tx, TWCoinTypeBitcoin);
-    EXPECT_EQ(output.error(), 0);
-    EXPECT_EQ(hex(output.encoded()), // printed using prettyPrintTransaction
-        "01000000" // version
-        "0001" // marker & flag
-        "01" // inputs
-            "eb48da786cbd9430bf5ef3d1d3bc7206a4182fd7d5ac3f4e8d05754c3a5cae8e"  "00000000"  "00"  ""  "fcffffff"
-        "03" // outputs
-            "400d030000000000"  "16"  "0014d6cbc5021c3eee72798718d447758b91d14e8c5f"
-            "108d030000000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
-            "0000000000000000"  "42"  "6a40535741503a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a3134303030303030"
-        // witness
-            "02"
-                "48"  "30450221008427ac07af830abbf9f2e1b182096d9faefc9e5b4324786ec68386579b05d02102204fd062817a59255d62aba24b1b0c66bc070d0ddbb70bf130a6159cc057e7f6c801210"
-                "21"  "e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
-        "00000000" // nLockTime
-    );
-
-    // similar real transaction:
-    // https://blockchair.com/bitcoin/transaction/1cd9056b212b85d9d7d34d0795a746dd8691b8cd34ef56df0aa9622fbdec5f88
-    // https://viewblock.io/thorchain/tx/1CD9056B212B85D9D7D34D0795A746DD8691B8CD34EF56DF0AA9622FBDEC5F88
-    // https://explorer.binance.org/tx/8D78469069118E9B9546696214CCD46E63D3FA0D7E854C094D63C8F6061278B7
-}
-
-Data SwapTest_ethAddressStringToData(const std::string& asString) {
-    if (asString.empty()) {
-        return Data();
-    }
-    auto address = Ethereum::Address(asString);
-    Data asData;
-    asData.resize(20);
-    std::copy(address.bytes.begin(), address.bytes.end(), asData.data());
-    return asData;
-}
-
-TEST(THORChainSwap, SwapEthBnb) {
-    auto res = Swap::build(Chain::ETH, Chain::BNB, Address1Eth, "BNB", "", Address1Bnb, VaultEth, RouterEth, "50000000000000000", "600003");
-    ASSERT_EQ(std::get<1>(res), 0);
-    ASSERT_EQ(std::get<2>(res), "");
-    EXPECT_EQ(hex(std::get<0>(res)), "0a01001201002201002a0100422a30783432413545643435363635306130394463313045426336333631413734383066446436316632374252f30132f0010a07b1a2bc2ec5000012e4011fece7b40000000000000000000000001091c4de6a3cf09cda00abdaed42c7c3b69c83ec000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec500000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000003e535741503a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a3630303030330000");
-
-    auto tx = Ethereum::Proto::SigningInput();
-    ASSERT_TRUE(tx.ParseFromArray(std::get<0>(res).data(), (int)std::get<0>(res).size()));
-
-    // check fields
-    EXPECT_EQ(tx.to_address(), RouterEth);
-    ASSERT_TRUE(tx.transaction().has_contract_generic());
-
-    Data vaultAddressBin = SwapTest_ethAddressStringToData(VaultEth);
-    EXPECT_EQ(hex(vaultAddressBin), "1091c4de6a3cf09cda00abdaed42c7c3b69c83ec");
-    auto func = Ethereum::ABI::Function("deposit", std::vector<std::shared_ptr<Ethereum::ABI::ParamBase>>{
-        std::make_shared<Ethereum::ABI::ParamAddress>(vaultAddressBin),
-        std::make_shared<Ethereum::ABI::ParamAddress>(parse_hex("0000000000000000000000000000000000000000")),
-        std::make_shared<Ethereum::ABI::ParamUInt256>(uint256_t(50000000000000000)),
-        std::make_shared<Ethereum::ABI::ParamString>("SWAP:BNB.BNB:bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx:600003")
-    });
-    Data payload;
-    func.encode(payload);
-    EXPECT_EQ(hex(payload), "1fece7b4"
-        "0000000000000000000000001091c4de6a3cf09cda00abdaed42c7c3b69c83ec"
-        "0000000000000000000000000000000000000000000000000000000000000000"
-        "00000000000000000000000000000000000000000000000000b1a2bc2ec50000"
-        "0000000000000000000000000000000000000000000000000000000000000080"
-        "000000000000000000000000000000000000000000000000000000000000003e"
-        "535741503a424e422e424e423a626e6231757334377764686678303863683937"
-        "7a6475656833783375356d757266727833306a656372783a3630303030330000");
-    EXPECT_EQ(hex(TW::data(tx.transaction().contract_generic().amount())), "b1a2bc2ec50000");
-    EXPECT_EQ(hex(TW::data(tx.transaction().contract_generic().data())), hex(payload));
-
-    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
-
-    // set few fields before signing
-    auto chainId = store(uint256_t(1));
-    tx.set_chain_id(chainId.data(), chainId.size());
-    auto nonce = store(uint256_t(3));
-    tx.set_nonce(nonce.data(), nonce.size());
-    auto gasPrice = store(uint256_t(30000000000));
-    tx.set_gas_price(gasPrice.data(), gasPrice.size());
-    auto gasLimit = store(uint256_t(80000));
-    tx.set_gas_limit(gasLimit.data(), gasLimit.size());
-    tx.set_private_key("");
-    tx.set_private_key(TestKey1Eth.data(), TestKey1Eth.size());
-
-    // sign and encode resulting input
-    Ethereum::Proto::SigningOutput output;
-    ANY_SIGN(tx, TWCoinTypeEthereum);
-    EXPECT_EQ(hex(output.encoded()), "f90151038506fc23ac00830138809442a5ed456650a09dc10ebc6361a7480fdd61f27b87b1a2bc2ec50000b8e41fece7b40000000000000000000000001091c4de6a3cf09cda00abdaed42c7c3b69c83ec000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec500000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000003e535741503a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a363030303033000025a06ae104be3201baca38315352f81fac70ca4dd47339981914e64e91149813e780a066a3f0b2c44ddf5a96a38481274f623f552a593d723237d6742185f4885c0064");
-}
-
-TEST(THORChainSwap, SwapBnbBtc) {
-    auto res = Swap::build(Chain::BNB, Chain::BTC, Address1Bnb, "BTC", "", Address1Btc, VaultBnb, "", "10000000", "10000000");
-    ASSERT_EQ(std::get<1>(res), 0);
-    ASSERT_EQ(std::get<2>(res), "");
-    EXPECT_EQ(hex(std::get<0>(res)), "2a40535741503a4254432e4254433a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070383a313030303030303052480a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e421080ade204");
-
-    auto tx = Binance::Proto::SigningInput();
-    ASSERT_TRUE(tx.ParseFromArray(std::get<0>(res).data(), (int)std::get<0>(res).size()));
-
-    // check fields
-    EXPECT_EQ(tx.memo(), "SWAP:BTC.BTC:bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8:10000000");
-    ASSERT_TRUE(tx.has_send_order());
-    ASSERT_EQ(tx.send_order().inputs_size(), 1);
-    ASSERT_EQ(tx.send_order().outputs_size(), 1);
-    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "e42be736e933cf8b97c26f33789a3ca6f8348cd1");
-    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "99730371c7c77cb81ffa76b566dcef7c1e5dc19c");
-    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
-
-    // set few fields before signing
-    tx.set_chain_id("Binance-Chain-Tigris");
-    tx.set_private_key(TestKey1Bnb.data(), TestKey1Bnb.size());
-
-    // sign and encode resulting input
-    Binance::Proto::SigningOutput output;
-    ANY_SIGN(tx, TWCoinTypeBinance);
-    EXPECT_EQ(hex(output.encoded()), "8002f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e421080ade204126a0a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e191240af2117ebd42e31a9562738e9f8933b3b54b59e6305b5675956525e4edb6a6ac65abea614e90959ae388664e2b36bf720024879b6047e174e3cff95f8f364a4e71a40535741503a4254432e4254433a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070383a3130303030303030");
-}
-
-TEST(THORChainSwap, SwapBnbEth) {
-    auto res = Swap::build(Chain::BNB, Chain::ETH, Address1Bnb, "ETH", "", Address1Eth, VaultBnb, "", "27000000", "123456");
-    ASSERT_EQ(std::get<1>(res), 0);
-    ASSERT_EQ(std::get<2>(res), "");
-    EXPECT_EQ(hex(std::get<0>(res)), "2a3b3d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a31323334353652480a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e4210c0f9ef0c12220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e4210c0f9ef0c");
-
-    auto tx = Binance::Proto::SigningInput();
-    ASSERT_TRUE(tx.ParseFromArray(std::get<0>(res).data(), (int)std::get<0>(res).size()));
-
-    // check fields
-    EXPECT_EQ(tx.memo(), "=:ETH.ETH:0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7:123456");
-    ASSERT_TRUE(tx.has_send_order());
-    ASSERT_EQ(tx.send_order().inputs_size(), 1);
-    ASSERT_EQ(tx.send_order().outputs_size(), 1);
-    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "e42be736e933cf8b97c26f33789a3ca6f8348cd1");
-    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "99730371c7c77cb81ffa76b566dcef7c1e5dc19c");
-    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
-
-    // set private key and few other fields
-    EXPECT_EQ(TW::deriveAddress(TWCoinTypeBinance, PrivateKey(TestKey1Bnb)), Address1Bnb);
-    tx.set_private_key(TestKey1Bnb.data(), TestKey1Bnb.size());
-    tx.set_chain_id("Binance-Chain-Tigris");
-    tx.set_account_number(1902570);
-    tx.set_sequence(12);
-    // sign and encode resulting input
-    Binance::Proto::SigningOutput output;
-    ANY_SIGN(tx, TWCoinTypeBinance);
-    EXPECT_EQ(hex(output.encoded()), "8102f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e4210c0f9ef0c12220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e4210c0f9ef0c12700a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e1912409ad3d44f3cc8d5dd2701b0bf3758ef674683533fb63e3e94d39728688c0279f8410395d631075dac62dee74b972c320f5a58e88ab81be6f1bb6a9564468ae1b618ea8f74200c1a3b3d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a313233343536");
-
-    // real transaction:
-    // https://explorer.binance.org/tx/F0CFDB0D9467E83B5BBF6DF92E4E2D04FE9EFF9B0A1C71D88DCEF566233DCAA2
-    // https://viewblock.io/thorchain/tx/F0CFDB0D9467E83B5BBF6DF92E4E2D04FE9EFF9B0A1C71D88DCEF566233DCAA2
-    // https://etherscan.io/tx/0x8e5bb7d87e17af86e649e402bc5c182ea8c32ddaca153804679de1184e0d9747
-}
-
-TEST(THORChainSwap, SwapBnbRune) {
-    auto res = Swap::build(Chain::BNB, Chain::THOR, Address1Bnb, "RUNE", "", Address1Thor, VaultBnb, "", "4000000", "121065076");
-    ASSERT_EQ(std::get<1>(res), 0);
-    ASSERT_EQ(std::get<2>(res), "");
-    EXPECT_EQ(hex(std::get<0>(res)), "2a44535741503a54484f522e52554e453a74686f72317a3533777765376d64366365777a39737177717a6e306161767061756e3067773065786e32723a31323130363530373652480a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e42108092f40112220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e42108092f401");
-
-    auto tx = Binance::Proto::SigningInput();
-    ASSERT_TRUE(tx.ParseFromArray(std::get<0>(res).data(), (int)std::get<0>(res).size()));
-
-    // check fields
-    EXPECT_EQ(tx.memo(), "SWAP:THOR.RUNE:thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r:121065076");
-    ASSERT_TRUE(tx.has_send_order());
-    ASSERT_EQ(tx.send_order().inputs_size(), 1);
-    ASSERT_EQ(tx.send_order().outputs_size(), 1);
-    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "e42be736e933cf8b97c26f33789a3ca6f8348cd1");
-    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "99730371c7c77cb81ffa76b566dcef7c1e5dc19c");
-    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
-
-    // set private key and few other fields
-    EXPECT_EQ(TW::deriveAddress(TWCoinTypeBinance, PrivateKey(TestKey1Bnb)), Address1Bnb);
-    tx.set_private_key(TestKey1Bnb.data(), TestKey1Bnb.size());
-    tx.set_chain_id("Binance-Chain-Tigris");
-    tx.set_account_number(1902570);
-    tx.set_sequence(4);
-    // sign and encode resulting input
-    Binance::Proto::SigningOutput output;
-    ANY_SIGN(tx, TWCoinTypeBinance);
-    EXPECT_EQ(hex(output.encoded()), "8a02f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e42108092f40112220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e42108092f40112700a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e191240d91b6655ea4ade62a90cc9b28e43ccd2887dcf1c563e42bbd0d6ae4e825c2c6a1ba7784866810f36b6e098b0c877d1daa48016d0558f7b796b3f0b410107ba2f18ea8f7420041a44535741503a54484f522e52554e453a74686f72317a3533777765376d64366365777a39737177717a6e306161767061756e3067773065786e32723a313231303635303736");
-
-    // real transaction:
-    // https://explorer.binance.org/tx/84EE429B35945F0568097527A084532A9DE7BBAB0E6A5562E511CEEFB188DE69
-    // https://viewblock.io/thorchain/tx/D582E1473FE229F02F162055833C64F49FB4FF515989A4785ED7898560A448FC
-}
-
-TEST(THORChainSwap, SwapBnbBnbToken) {
-    auto res = Swap::build(
-        Chain::BNB,
-        Chain::BNB,
-        "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx",
-        "BNB",
-        "TWT-8C2",
-        "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx",
-        "bnb1qefsjm654cdw94ejj8g4s49w7z8te75veslusz",
-        "",
-        "10000000", // 0.1 bnb
-        "5400000000" // 54.0 twt
-    ); 
-    ASSERT_EQ(std::get<1>(res), 0);
-    ASSERT_EQ(std::get<2>(res), "");
-    EXPECT_EQ(hex(std::get<0>(res)), "2a46535741503a424e422e5457542d3843323a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a3534303030303030303052480a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a140653096f54ae1ae2d73291d15854aef08ebcfa8c120a0a03424e421080ade204");
-
-    auto tx = Binance::Proto::SigningInput();
-    ASSERT_TRUE(tx.ParseFromArray(std::get<0>(res).data(), (int)std::get<0>(res).size()));
-
-    // check fields
-    EXPECT_EQ(tx.memo(), "SWAP:BNB.TWT-8C2:bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx:5400000000");
-    ASSERT_TRUE(tx.has_send_order());
-    ASSERT_EQ(tx.send_order().inputs_size(), 1);
-    ASSERT_EQ(tx.send_order().outputs_size(), 1);
-    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "e42be736e933cf8b97c26f33789a3ca6f8348cd1");
-    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "0653096f54ae1ae2d73291d15854aef08ebcfa8c");
-    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
-
-    // set private key and few other fields
-    const Data privateKey = parse_hex("bcf8b072560dda05122c99390def2c385ec400e1a93df0657a85cf6b57a715da");
-    EXPECT_EQ(Binance::Address(PrivateKey(privateKey).getPublicKey(TWPublicKeyTypeSECP256k1)).string(), "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx");
-    tx.set_private_key(privateKey.data(), privateKey.size());
-    tx.set_chain_id("Binance-Chain-Tigris");
-    tx.set_account_number(1902570);
-    tx.set_sequence(18);
-
-    // sign and encode resulting input
-    Binance::Proto::SigningOutput output;
-    ANY_SIGN(tx, TWCoinTypeBinance);
-    EXPECT_EQ(hex(output.encoded()), "8c02f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a140653096f54ae1ae2d73291d15854aef08ebcfa8c120a0a03424e421080ade20412700a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e1912405fd64a0ed5777f5ea4556624bd096f8b20b6d2b510655e4c928db1ec967e6c7025453882ce7e10138ac92f5d6a949acc5382a5539f81347856c67c4bb678d3c418ea8f7420121a46535741503a424e422e5457542d3843323a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a35343030303030303030");
-
-    // real transaction:
-    // curl -X GET "http://dataseed1.binance.org/broadcast_tx_sync?tx=0x8c02...3030"
-    // https://viewblock.io/thorchain/tx/6D1EDC9BD9BFAFEF0F88F95A164191262EA02A0413BF3D9773110AD5676E1523
-    // https://explorer.binance.org/tx/6D1EDC9BD9BFAFEF0F88F95A164191262EA02A0413BF3D9773110AD5676E1523
-    // https://explorer.binance.org/tx/60C54C9F253B89C36A2788AB66951045E8AC5F5729597CB6C64A13013A7A54CC
-}
-
-TEST(THORChainSwap, Memo) {
-    EXPECT_EQ(Swap::buildMemo(Chain::BTC, "BTC", "", "btc123", 1234), "SWAP:BTC.BTC:btc123:1234");
-    EXPECT_EQ(Swap::buildMemo(Chain::BNB, "BNB", "", "bnb123", 1234), "SWAP:BNB.BNB:bnb123:1234");
-    EXPECT_EQ(Swap::buildMemo(Chain::ETH, "ETH", "", "0xaabbccdd", 1234), "=:ETH.ETH:0xaabbccdd:1234");
-    EXPECT_EQ(Swap::buildMemo(Chain::ETH, "ETH", "", "0xaabbccdd", 1234), "=:ETH.ETH:0xaabbccdd:1234");
-    EXPECT_EQ(Swap::buildMemo(Chain::ETH, "ETH", "0x0000000000000000000000000000000000000000", "0xaabbccdd", 1234), "=:ETH.ETH:0xaabbccdd:1234");
-    EXPECT_EQ(Swap::buildMemo(Chain::ETH, "ETH", "0x4B0F1812e5Df2A09796481Ff14017e6005508003", "0xaabbccdd", 1234), "=:ETH.0x4B0F1812e5Df2A09796481Ff14017e6005508003:0xaabbccdd:1234");
-    EXPECT_EQ(Swap::buildMemo(Chain::BNB, "BNB", "TWT-8C2", "bnb123", 1234), "SWAP:BNB.TWT-8C2:bnb123:1234");
-}
-
-TEST(THORChainSwap, WrongFromAddress) {
-    {
-        auto res = Swap::build(Chain::BNB, Chain::ETH, "DummyAddress", "ETH", "", Address1Eth, VaultEth, "", "100000", "100000");
-        EXPECT_EQ(std::get<1>(res), Proto::ErrorCode::Error_Invalid_from_address);
-        EXPECT_EQ(std::get<2>(res), "Invalid from address");
-    }
-    {
-        auto res = Swap::build(Chain::BNB, Chain::ETH, Address1Btc, "ETH", "", Address1Eth, VaultEth, "", "100000", "100000");
-        EXPECT_EQ(std::get<1>(res), Proto::ErrorCode::Error_Invalid_from_address);
-        EXPECT_EQ(std::get<2>(res), "Invalid from address");
-    }
-}
-
-TEST(THORChainSwap, WrongToAddress) {
-    {
-        auto res = Swap::build(Chain::BNB, Chain::ETH, Address1Bnb, "ETH", "", "DummyAddress", VaultEth, "", "100000", "100000");
-        EXPECT_EQ(std::get<1>(res), Proto::ErrorCode::Error_Invalid_to_address);
-        EXPECT_EQ(std::get<2>(res), "Invalid to address");
-    }
-    {
-        auto res = Swap::build(Chain::BNB, Chain::ETH, Address1Bnb, "ETH", "", Address1Btc, VaultEth, "", "100000", "100000");
-        EXPECT_EQ(std::get<1>(res), Proto::ErrorCode::Error_Invalid_to_address);
-        EXPECT_EQ(std::get<2>(res), "Invalid to address");
-    }
-}
-
-TEST(THORChainSwap, FromRuneNotSupported) {
-    auto res = Swap::build(Chain::THOR, Chain::BNB, Address1Thor, "BNB", "", Address1Bnb, "", "", "1000", "1000");
-    EXPECT_EQ(std::get<1>(res), Proto::ErrorCode::Error_Unsupported_from_chain);
-    EXPECT_EQ(std::get<2>(res), "Unsupported from chain: 3");
-}
-
-TEST(THORChainSwap, EthInvalidVault) {
-    {
-        auto res = Swap::build(Chain::ETH, Chain::BNB, Address1Eth, "BNB", "", Address1Bnb, "_INVALID_ADDRESS_", RouterEth, "50000000000000000", "600003");
-        EXPECT_EQ(std::get<1>(res), Proto::ErrorCode::Error_Invalid_vault_address);
-        EXPECT_EQ(std::get<2>(res), "Invalid vault address: _INVALID_ADDRESS_");
-    }
-    {
-        auto res = Swap::build(Chain::ETH, Chain::BNB, Address1Eth, "BNB", "", Address1Bnb, VaultEth, "_INVALID_ADDRESS_", "50000000000000000", "600003");
-        EXPECT_EQ(std::get<1>(res), Proto::ErrorCode::Error_Invalid_router_address);
-        EXPECT_EQ(std::get<2>(res), "Invalid router address: _INVALID_ADDRESS_");
-    }
-}
-
-} // namespace
diff --git a/tests/THORChain/TWAnyAddressTests.cpp b/tests/THORChain/TWAnyAddressTests.cpp
deleted file mode 100644
index 28e1618885e..00000000000
--- a/tests/THORChain/TWAnyAddressTests.cpp
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnyAddress.h>
-#include "HexCoding.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(THORChainAnyAddress, IsValid) {
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r").get(), TWCoinTypeTHORChain));
-    EXPECT_TRUE(TWAnyAddressIsValid(STRING("thor1c8jd7ad9pcw4k3wkuqlkz4auv95mldr2kyhc65").get(), TWCoinTypeTHORChain));
-    EXPECT_FALSE(TWAnyAddressIsValid(STRING("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02").get(), TWCoinTypeTHORChain));
-}
-
-TEST(THORChainAnyAddress, Create) {
-    auto string = STRING("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r");
-    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeTHORChain));
-    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
-    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
-    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
-    assertHexEqual(keyHash, "1522e767db6eb19708b0038029bfbd607bc9bd0e");
-}
diff --git a/tests/THORChain/TWAnySignerTests.cpp b/tests/THORChain/TWAnySignerTests.cpp
deleted file mode 100644
index a4fb0eebde3..00000000000
--- a/tests/THORChain/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWAnySigner.h>
-#include <TrustWalletCore/TWAnyAddress.h>
-#include "Cosmos/Address.h"
-#include "proto/Cosmos.pb.h"
-#include "HexCoding.h"
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(THORChainTWAnySigner, SignTx) {
-    auto privateKey = parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e");
-    Cosmos::Proto::SigningInput input;
-    input.set_account_number(593);
-    input.set_chain_id("thorchain");
-    input.set_sequence(3);
-    input.set_private_key(privateKey.data(), privateKey.size());
-    input.set_memo("");
-
-    auto fromAddress = "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r";
-    auto toAddress = "thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn";
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress);
-    message.set_to_address(toAddress);
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("rune");
-    amountOfTx->set_amount("10000000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("rune");
-    amountOfFee->set_amount("2000000");
-
-    Cosmos::Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeTHORChain);
-
-    // https://viewblock.io/thorchain/tx/FD0445AFFC4ED9ACCB7B5D3ADE361DAE4596EA096340F1360F1020381EA454AF
-    ASSERT_EQ(output.json(), R"({"mode":"block","tx":{"fee":{"amount":[{"amount":"2000000","denom":"rune"}],"gas":"200000"},"memo":"","msg":[{"type":"thorchain/MsgSend","value":{"amount":[{"amount":"10000000","denom":"rune"}],"from_address":"thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r","to_address":"thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"},"signature":"qgpMX3WNq4DsNBnYtdmBD4ejiailK4uI/m3/YVqCSNF8AtkUOTmP48ztqCbpkWTFvw1/9S8/ivsFxOcK6AI0jA=="}]}})");
-}
diff --git a/tests/THORChain/TWCoinTypeTests.cpp b/tests/THORChain/TWCoinTypeTests.cpp
deleted file mode 100644
index fead42b2449..00000000000
--- a/tests/THORChain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWTHORChainCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTHORChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("ADF0899E58C177E2391F22D04E9C5E1C35BB0F75B42B363A0761687907FD9476"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTHORChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("thor196yf4pq80hjrmz7nnh0ar0ypqg02r0w4dq4mzu"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTHORChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTHORChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTHORChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTHORChain), 8);
-    ASSERT_EQ(TWBlockchainThorchain, TWCoinTypeBlockchain(TWCoinTypeTHORChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTHORChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTHORChain));
-    assertStringsEqual(symbol, "RUNE");
-    assertStringsEqual(txUrl, "https://viewblock.io/thorchain/tx/ADF0899E58C177E2391F22D04E9C5E1C35BB0F75B42B363A0761687907FD9476");
-    assertStringsEqual(accUrl, "https://viewblock.io/thorchain/address/thor196yf4pq80hjrmz7nnh0ar0ypqg02r0w4dq4mzu");
-    assertStringsEqual(id, "thorchain");
-    assertStringsEqual(name, "THORChain");
-}
diff --git a/tests/THORChain/TWSwapTests.cpp b/tests/THORChain/TWSwapTests.cpp
deleted file mode 100644
index d2af7e2a18e..00000000000
--- a/tests/THORChain/TWSwapTests.cpp
+++ /dev/null
@@ -1,230 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Bitcoin/Script.h"
-#include "Bitcoin/SegwitAddress.h"
-#include "PrivateKey.h"
-#include "proto/Binance.pb.h"
-#include "proto/Ethereum.pb.h"
-#include "proto/THORChainSwap.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <TrustWalletCore/TWCoinType.h>
-#include <TrustWalletCore/TWTHORChainSwap.h>
-
-#include "HexCoding.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::THORChainSwap::tests {
-
-// clang-format off
-const auto Address1Bnb = "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx";
-const auto Address1Btc = "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8";
-const auto Address1Eth = "0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7";
-const auto VaultBnb = "bnb1n9esxuw8ca7ts8l6w66kdh800s09msvul6vlse";
-const auto VaultBtc = "bc1q6m9u2qsu8mh8y7v8rr2ywavtj8g5arzlyhcej7";
-const auto VaultEth = "0x1091c4De6a3cF09CdA00AbDAeD42c7c3B69C83EC";
-const auto RouterEth = "0x42A5Ed456650a09Dc10EBc6361A7480fDd61f27B";
-const Data TestKey1Bnb = parse_hex("bcf8b072560dda05122c99390def2c385ec400e1a93df0657a85cf6b57a715da");
-const Data TestKey1Btc = parse_hex("13fcaabaf9e71ffaf915e242ec58a743d55f102cf836968e5bd4881135e0c52c");
-const Data TestKey1Eth = parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904");
-
-TEST(TWTHORChainSwap, SwapBtcToEth) {
-    // prepare swap input
-    Proto::SwapInput input;
-    input.set_from_chain(Proto::BTC);
-    input.set_from_address(Address1Btc);
-    Proto::Asset toAsset;
-    toAsset.set_chain(Proto::ETH);
-    toAsset.set_symbol("ETH");
-    toAsset.set_token_id("");
-    *input.mutable_to_asset() = toAsset;
-    input.set_to_address(Address1Eth);
-    input.set_vault_address(VaultBtc);
-    input.set_router_address("");
-    input.set_from_amount("1000000");
-    input.set_to_amount_limit("140000000000000000");
-
-    // serialize input
-    const auto inputData_ = input.SerializeAsString();
-    EXPECT_EQ(hex(inputData_), "0801122a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070381a0708021203455448222a3078623966353737316332373636346266323238326439386530396437663530636563376362303161372a2a62633171366d397532717375386d68387937763872723279776176746a38673561727a6c796863656a373a07313030303030304212313430303030303030303030303030303030");
-    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
-
-    // invoke swap
-    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
-    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
-    EXPECT_EQ(outputData.size(), 178ul);
-    // parse result in proto
-    Proto::SwapOutput outputProto;
-    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
-    EXPECT_EQ(outputProto.from_chain(), Proto::BTC);
-    EXPECT_EQ(outputProto.to_chain(), Proto::ETH);
-    EXPECT_EQ(outputProto.error().code(), 0);
-    EXPECT_EQ(outputProto.error().message(), "");
-    EXPECT_TRUE(outputProto.has_bitcoin());
-    Bitcoin::Proto::SigningInput txInput = outputProto.bitcoin();
-
-    // tx input: check some fields
-    EXPECT_EQ(txInput.amount(), 1000000);
-    EXPECT_EQ(txInput.to_address(), "bc1q6m9u2qsu8mh8y7v8rr2ywavtj8g5arzlyhcej7");
-    EXPECT_EQ(txInput.change_address(), "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8");
-    EXPECT_EQ(txInput.output_op_return(), "=:ETH.ETH:0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7:140000000000000000");
-    EXPECT_EQ(txInput.coin_type(), 0ul);
-
-    // sign tx input for signed full tx
-    // set few fields before signing
-    txInput.set_byte_fee(20);
-    EXPECT_EQ(Bitcoin::SegwitAddress(PrivateKey(TestKey1Btc).getPublicKey(TWPublicKeyTypeSECP256k1), "bc").string(), Address1Btc);
-    txInput.add_private_key(TestKey1Btc.data(), TestKey1Btc.size());
-    auto& utxo = *txInput.add_utxo();
-    Data utxoHash = parse_hex("1234000000000000000000000000000000000000000000000000000000005678");
-    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
-    utxo.mutable_out_point()->set_index(0);
-    utxo.mutable_out_point()->set_sequence(UINT32_MAX);
-    auto utxoScript = Bitcoin::Script::lockScriptForAddress(Address1Btc, TWCoinTypeBitcoin);
-    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
-    utxo.set_amount(50000000);
-    txInput.set_use_max_amount(false);
-
-    // sign and encode resulting input
-    {
-        Bitcoin::Proto::SigningOutput output;
-        ANY_SIGN(txInput, TWCoinTypeBitcoin);
-        EXPECT_EQ(output.error(), 0);
-        EXPECT_EQ(hex(output.encoded()), // printed using prettyPrintTransaction
-            "01000000" // version
-            "0001" // marker & flag
-            "01" // inputs
-                "1234000000000000000000000000000000000000000000000000000000005678"  "00000000"  "00"  ""  "ffffffff"
-            "03" // outputs
-                "40420f0000000000"  "16"  "0014d6cbc5021c3eee72798718d447758b91d14e8c5f"
-                "609deb0200000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
-                "0000000000000000"  "42"  "6a403d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a3134303030303030303030"
-            // witness
-                "02"
-                    "47"  "304402205de19c68b5ea683b9d701d45b09f96658088db76e59ad27bd7b8383ee5d484ec0220245459a4d6d679d8b457564fccc7ecc5831c7ebed49e0366c65ac031e8a5b49201"
-                    "21"  "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
-            "00000000" // nLockTime
-        );
-    }
-}
-
-TEST(TWTHORChainSwap, SwapEthBnb) {
-    // prepare swap input
-    Proto::SwapInput input;
-    input.set_from_chain(Proto::ETH);
-    input.set_from_address(Address1Eth);
-    Proto::Asset toAsset;
-    toAsset.set_chain(Proto::BNB);
-    toAsset.set_symbol("BNB");
-    toAsset.set_token_id("");
-    *input.mutable_to_asset() = toAsset;
-    input.set_to_address(Address1Bnb);
-    input.set_vault_address(VaultEth);
-    input.set_router_address(RouterEth);
-    input.set_from_amount("50000000000000000");
-    input.set_to_amount_limit("600003");
-
-    // serialize input
-    const auto inputData_ = input.SerializeAsString();
-    EXPECT_EQ(hex(inputData_), "0802122a3078623966353737316332373636346266323238326439386530396437663530636563376362303161371a0708031203424e42222a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372782a2a307831303931633444653661336346303943644130304162444165443432633763334236394338334543322a3078343241354564343536363530613039446331304542633633363141373438306644643631663237423a1135303030303030303030303030303030304206363030303033");
-    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
-
-    // invoke swap
-    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
-    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
-    EXPECT_EQ(outputData.size(), 311ul);
-    // parse result in proto
-    Proto::SwapOutput outputProto;
-    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
-    EXPECT_EQ(outputProto.from_chain(), Proto::ETH);
-    EXPECT_EQ(outputProto.to_chain(), Proto::BNB);
-    EXPECT_EQ(outputProto.error().code(), 0);
-    EXPECT_EQ(outputProto.error().message(), "");
-    EXPECT_TRUE(outputProto.has_ethereum());
-    Ethereum::Proto::SigningInput txInput = outputProto.ethereum();
-
-    // sign tx input for signed full tx
-    // set few fields before signing
-    auto chainId = store(uint256_t(1));
-    txInput.set_chain_id(chainId.data(), chainId.size());
-    auto nonce = store(uint256_t(3));
-    txInput.set_nonce(nonce.data(), nonce.size());
-    auto gasPrice = store(uint256_t(30000000000));
-    txInput.set_gas_price(gasPrice.data(), gasPrice.size());
-    auto gasLimit = store(uint256_t(80000));
-    txInput.set_gas_limit(gasLimit.data(), gasLimit.size());
-    txInput.set_private_key("");
-    txInput.set_private_key(TestKey1Eth.data(), TestKey1Eth.size());
-
-    // sign and encode resulting input
-    Ethereum::Proto::SigningOutput output;
-    ANY_SIGN(txInput, TWCoinTypeEthereum);
-    EXPECT_EQ(hex(output.encoded()), "f90151038506fc23ac00830138809442a5ed456650a09dc10ebc6361a7480fdd61f27b87b1a2bc2ec50000b8e41fece7b40000000000000000000000001091c4de6a3cf09cda00abdaed42c7c3b69c83ec000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000b1a2bc2ec500000000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000003e535741503a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a363030303033000025a06ae104be3201baca38315352f81fac70ca4dd47339981914e64e91149813e780a066a3f0b2c44ddf5a96a38481274f623f552a593d723237d6742185f4885c0064");
-}
-
-TEST(TWTHORChainSwap, SwapBnbBtc) {
-    // prepare swap input
-    Proto::SwapInput input;
-    input.set_from_chain(Proto::BNB);
-    input.set_from_address(Address1Bnb);
-    Proto::Asset toAsset;
-    toAsset.set_chain(Proto::BTC);
-    toAsset.set_symbol("BTC");
-    toAsset.set_token_id("");
-    *input.mutable_to_asset() = toAsset;
-    input.set_to_address(Address1Btc);
-    input.set_vault_address(VaultBnb);
-    input.set_router_address("");
-    input.set_from_amount("10000000");
-    input.set_to_amount_limit("10000000");
-
-    // serialize input
-    const auto inputData_ = input.SerializeAsString();
-    EXPECT_EQ(hex(inputData_), "0803122a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372781a0708011203425443222a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070382a2a626e62316e396573787577386361377473386c367736366b64683830307330396d7376756c36766c73653a08313030303030303042083130303030303030");
-    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
-
-    // invoke swap
-    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
-    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
-    EXPECT_EQ(outputData.size(), 149ul);
-    // parse result in proto
-    Proto::SwapOutput outputProto;
-    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
-    EXPECT_EQ(outputProto.from_chain(), Proto::BNB);
-    EXPECT_EQ(outputProto.to_chain(), Proto::BTC);
-    EXPECT_EQ(outputProto.error().code(), 0);
-    EXPECT_EQ(outputProto.error().message(), "");
-    EXPECT_TRUE(outputProto.has_binance());
-    Binance::Proto::SigningInput txInput = outputProto.binance();
-
-    // set few fields before signing
-    txInput.set_chain_id("Binance-Chain-Tigris");
-    txInput.set_private_key(TestKey1Bnb.data(), TestKey1Bnb.size());
-
-    // sign and encode resulting input
-    Ethereum::Proto::SigningOutput output;
-    ANY_SIGN(txInput, TWCoinTypeBinance);
-    EXPECT_EQ(hex(output.encoded()), "8002f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e421080ade204126a0a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e191240af2117ebd42e31a9562738e9f8933b3b54b59e6305b5675956525e4edb6a6ac65abea614e90959ae388664e2b36bf720024879b6047e174e3cff95f8f364a4e71a40535741503a4254432e4254433a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070383a3130303030303030");
-}
-
-TEST(TWTHORChainSwap, NegativeInvalidInput) {
-    const auto inputData = parse_hex("00112233");
-    const auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));
-
-    const auto outputTWData = WRAPD(TWTHORChainSwapBuildSwap(inputTWData.get()));
-    const auto outputData = data(TWDataBytes(outputTWData.get()), TWDataSize(outputTWData.get()));
-    EXPECT_EQ(outputData.size(), 39ul);
-    EXPECT_EQ(hex(outputData), "1a2508021221436f756c64206e6f7420646573657269616c697a6520696e7075742070726f746f");
-    EXPECT_EQ(hex(data(std::string("Could not deserialize input proto"))), "436f756c64206e6f7420646573657269616c697a6520696e7075742070726f746f");
-}
-// clang-format on
-
-} // namespace TW::ThorChainSwap::tests
diff --git a/tests/Terra/SignerTests.cpp b/tests/Terra/SignerTests.cpp
deleted file mode 100644
index ee67a38dddc..00000000000
--- a/tests/Terra/SignerTests.cpp
+++ /dev/null
@@ -1,454 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Base64.h"
-#include "proto/Cosmos.pb.h"
-#include "Cosmos/Address.h"
-#include "Cosmos/Signer.h"
-#include "Cosmos/ProtobufSerialization.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-#include <google/protobuf/util/json_util.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(TerraClassicSigner, SignSendTx) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::JSON);
-    input.set_account_number(1037);
-    input.set_chain_id("columbus-5");
-    input.set_memo("");
-    input.set_sequence(2);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", toAddress));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("luna");
-    amountOfTx->set_amount("1000000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("luna");
-    amountOfFee->set_amount("200");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-    EXPECT_EQ(json, R"({"accountNumber":"1037","chainId":"columbus-5","fee":{"amounts":[{"denom":"luna","amount":"200"}],"gas":"200000"},"sequence":"2","messages":[{"sendCoinsMessage":{"fromAddress":"terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2","toAddress":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf","amounts":[{"denom":"luna","amount":"1000000"}]}}]})");
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerra);
-
-    assertJSONEqual(output.json(), R"(
-        {
-            "mode": "block",
-            "tx": {
-                "fee": {
-                    "amount": [
-                        {
-                            "amount": "200",
-                            "denom": "luna"
-                        }
-                    ],
-                    "gas": "200000"
-                },
-                "memo": "",
-                "msg": [
-                    {
-                        "type": "cosmos-sdk/MsgSend",
-                        "value": {
-                            "amount": [
-                                {
-                                    "amount": "1000000",
-                                    "denom": "luna"
-                                }
-                            ],
-                            "from_address": "terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2",
-                            "to_address": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"
-                        }
-                    }
-                ],
-                "signatures": [
-                    {
-                        "pub_key": {
-                            "type": "tendermint/PubKeySecp256k1",
-                            "value": "AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"
-                        },
-                        "signature": "ofdIsLJzkODcQwLG89eE2g4HOaUmfKPh/08t07ehKPUqRMl4rVonzo73mkOvqtrHWjdtB+6t6R8DGudPpb6bRg=="
-                    }
-                ]
-            }
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "a1f748b0b27390e0dc4302c6f3d784da0e0739a5267ca3e1ff4f2dd3b7a128f52a44c978ad5a27ce8ef79a43afaadac75a376d07eeade91f031ae74fa5be9b46");
-    EXPECT_EQ(output.serialized(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(TerraClassicSigner, SignWasmTransferTxProtobuf_9FF3F0) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(3407705);
-    input.set_chain_id("columbus-5");
-    input.set_memo("");
-    input.set_sequence(3);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
-    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76"; // ANC
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_terra_execute_contract_transfer_message();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    const auto amount = store(uint256_t(250000), 0);
-    message.set_amount(amount.data(), amount.size());
-    message.set_recipient_address(toAddress.string());
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("3000");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-    assertJSONEqual(json, R"(
-        {
-            "signingMode": "Protobuf",
-            "accountNumber": "3407705",
-            "chainId": "columbus-5",
-            "fee": {
-                "amounts": [
-                    {
-                        "denom": "uluna",
-                        "amount": "3000"
-                    }
-                ],
-                "gas": "200000"
-            },
-            "sequence": "3",
-            "messages": [
-                {
-                    "wasmTerraExecuteContractTransferMessage": {
-                        "senderAddress": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
-                        "contractAddress": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
-                        "amount": "A9CQ",
-                        "recipientAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp"
-                    }
-                }
-            ]
-        }
-    )");
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerra);
-
-    // https://finder.terra.money/mainnet/tx/9FF3F0A16879254C22EB90D8B4D6195467FE5014381FD36BD3C23CA6698FE94B
-    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "BROADCAST_MODE_BLOCK","tx_bytes": "CogCCo..wld8"})' https://<lcd-node-url>/cosmos/tx/v1beta1/txs
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "CucBCuQBCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBK5AQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2Glt7InRyYW5zZmVyIjp7ImFtb3VudCI6IjI1MDAwMCIsInJlY2lwaWVudCI6InRlcnJhMWpsZ2FxeTludm4yaGY1dDJzcmE5eWN6OHM3N3duZjlsMGttZ2NwIn19EmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQNwZjrHsPmJKW/rXOWfukpQ1+lOHOJW3/IlFFnKLNmsABIECgIIARgDEhMKDQoFdWx1bmESBDMwMDAQwJoMGkAaprIEMLPH2HmFdwFGoaipb2GIyhXt6ombz+WMnG2mORBI6gFt0M+IymYgzZz6w1SW52R922yafDnn7yXfutRw",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "1aa6b20430b3c7d87985770146a1a8a96f6188ca15edea899bcfe58c9c6da6391048ea016dd0cf88ca6620cd9cfac35496e7647ddb6c9a7c39e7ef25dfbad470");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(TerraClassicSigner, SignWasmTransferTxJson_078E90) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::JSON);
-    input.set_account_number(3407705);
-    input.set_chain_id("columbus-5");
-    input.set_memo("");
-    input.set_sequence(2);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
-    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76"; // ANC
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_terra_execute_contract_transfer_message();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    const auto amount = store(250000);
-    message.set_amount(amount.data(), amount.size());
-    message.set_recipient_address(toAddress.string());
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("3000");
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerra);
-
-    // https://finder.terra.money/mainnet/tx/078E90458061611F6FD8B708882B55FF5C1FFB3FCE61322107A0A0DE39FC0F3E
-    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "block","tx":{...}}' https://<lcd-node-url>/txs
-    assertJSONEqual(output.json(), R"(
-        {
-            "mode": "block",
-            "tx":
-                {
-                    "fee": {"amount":[{"amount": "3000","denom": "uluna"}],"gas": "200000"},
-                    "memo": "",
-                    "msg":
-                        [
-                            {
-                                "type": "wasm/MsgExecuteContract",
-                                "value":
-                                    {
-                                        "sender": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
-                                        "contract": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
-                                        "execute_msg":
-                                            {
-                                                "transfer":
-                                                    {
-                                                        "amount": "250000",
-                                                        "recipient": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp"
-                                                    }
-                                            },
-                                        "coins": []
-                                    }
-                            }
-                        ],
-                    "signatures":
-                        [
-                            {
-                                "pub_key":
-                                    {
-                                        "type": "tendermint/PubKeySecp256k1",
-                                        "value": "A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"
-                                    },
-                                "signature": "BjETdtbA97Wv1zvcsCV1tM+bdYKC8O3uGTk4mMRv6pBJB2y/Ds7qoS7s/zrkhYak1YChklQetHsI30XRXzGIkg=="
-                            }
-                        ]
-                }
-        })");
-    EXPECT_EQ(hex(output.signature()), "06311376d6c0f7b5afd73bdcb02575b4cf9b758282f0edee19393898c46fea9049076cbf0eceeaa12eecff3ae48586a4d580a192541eb47b08df45d15f318892");
-    EXPECT_EQ(output.serialized(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(TerraClassicSigner, SignWasmGeneric_EC4F85) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(3407705);
-    input.set_chain_id("columbus-5");
-    input.set_memo("");
-    input.set_sequence(7);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
-    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76"; // ANC
-    const auto txMessage = R"({"transfer": { "amount": "250000", "recipient": "terra1d7048csap4wzcv5zm7z6tdqem2agyp9647vdyj" } })";
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_terra_execute_contract_generic();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    message.set_execute_msg(txMessage);
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("3000");
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerra);
-
-    // https://finder.terra.money/mainnet/tx/EC4F8532847E4D6AF016E6F6D3F027AE7FB6FF0B533C5132B01382D83B214A6F
-    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "BROADCAST_MODE_BLOCK","tx_bytes": "Cu4BC...iVt"})' https://<lcd-node-url>/cosmos/tx/v1beta1/txs
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "Cu4BCusBCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBLAAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2GmJ7InRyYW5zZmVyIjogeyAiYW1vdW50IjogIjI1MDAwMCIsICJyZWNpcGllbnQiOiAidGVycmExZDcwNDhjc2FwNHd6Y3Y1em03ejZ0ZHFlbTJhZ3lwOTY0N3ZkeWoiIH0gfRJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYBxITCg0KBXVsdW5hEgQzMDAwEMCaDBpAkPsS7xlSng2LMc9KiD1soN5NLaDcUh8I9okPmsdJN3le1B7yxRGNB4aQfhaRl/8Z0r5vitRT0AWuxDasd8wcFw==",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-
-    EXPECT_EQ(hex(output.signature()), "90fb12ef19529e0d8b31cf4a883d6ca0de4d2da0dc521f08f6890f9ac74937795ed41ef2c5118d0786907e169197ff19d2be6f8ad453d005aec436ac77cc1c17");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(TerraClassicSigner, SignWasmGenericWithCoins_6651FC) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(3407705);
-    input.set_chain_id("columbus-5");
-    input.set_memo("");
-    input.set_sequence(9);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
-    const auto tokenContractAddress = "terra1sepfj7s0aeg5967uxnfk4thzlerrsktkpelm5s"; // ANC Market
-    const auto txMessage = R"({ "deposit_stable": {} })";
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_terra_execute_contract_generic();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    message.set_execute_msg(txMessage);
-
-    auto amount = message.add_coins();
-    amount->set_denom("uusd");
-    amount->set_amount("1000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(600000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("7000");
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerra);
-
-    // https://finder.terra.money/mainnet/tx/6651FCE0EE5C6D6ACB655CC49A6FD5E939FB082862854616EA0642475BCDD0C9
-    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "BROADCAST_MODE_BLOCK","tx_bytes": "CrIBCq8B.....0NWg=="})' https://<lcd-node-url>/cosmos/tx/v1beta1/txs
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "CrIBCq8BCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBKEAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMXNlcGZqN3MwYWVnNTk2N3V4bmZrNHRoemxlcnJza3RrcGVsbTVzGhh7ICJkZXBvc2l0X3N0YWJsZSI6IHt9IH0qDAoEdXVzZBIEMTAwMBJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYCRITCg0KBXVsdW5hEgQ3MDAwEMDPJBpAGyi7f1ioY8XV6pjFq1s86Om4++CIUnd3rLHif2iopCcYvX0mLkTlQ6NUERg8nWTYgXcj6fOTO/ptgPuAtv0NWg==",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-
-    EXPECT_EQ(hex(output.signature()), "1b28bb7f58a863c5d5ea98c5ab5b3ce8e9b8fbe088527777acb1e27f68a8a42718bd7d262e44e543a35411183c9d64d8817723e9f3933bfa6d80fb80b6fd0d5a");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(TerraClassicSigner, SignWasmSendTxProtobuf) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(3407705);
-    input.set_chain_id("columbus-5");
-    input.set_memo("");
-    input.set_sequence(4);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
-    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76"; // ANC
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_terra_execute_contract_send_message();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    const auto amount = store(uint256_t(250000), 0);
-    message.set_amount(amount.data(), amount.size());
-    message.set_recipient_contract_address(toAddress.string());
-    const auto msgMsg = Base64::encode(data(std::string(R"({"some_message":{}})")));
-    EXPECT_EQ(msgMsg, "eyJzb21lX21lc3NhZ2UiOnt9fQ==");
-    message.set_msg(msgMsg);
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("3000");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-    assertJSONEqual(json, R"(
-        {
-            "signingMode": "Protobuf",
-            "accountNumber": "3407705",
-            "chainId": "columbus-5",
-            "fee": {
-                "amounts": [
-                    {
-                        "denom": "uluna",
-                        "amount": "3000"
-                    }
-                ],
-                "gas": "200000"
-            },
-            "sequence": "4",
-            "messages": [
-                {
-                    "wasmTerraExecuteContractSendMessage": {
-                        "senderAddress": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
-                        "contractAddress": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
-                        "amount": "A9CQ",
-                        "recipientContractAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp",
-                        "msg": "eyJzb21lX21lc3NhZ2UiOnt9fQ=="
-                    }
-                }
-            ]
-        }
-    )");
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerra);
-
-    // https://finder.terra.money/mainnet/tx/9FF3F0A16879254C22EB90D8B4D6195467FE5014381FD36BD3C23CA6698FE94B
-    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "BROADCAST_MODE_BLOCK","tx_bytes": "CogCCo..wld8"})' https://<lcd-node-url>/cosmos/tx/v1beta1/txs
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "CocCCoQCCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBLZAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2Gnt7InNlbmQiOnsiYW1vdW50IjoiMjUwMDAwIiwiY29udHJhY3QiOiJ0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcCIsIm1zZyI6ImV5SnpiMjFsWDIxbGMzTmhaMlVpT250OWZRPT0ifX0SZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awAEgQKAggBGAQSEwoNCgV1bHVuYRIEMzAwMBDAmgwaQL6NByKeRZsyq5g6CTMdmPqiM77nOe9uLO8FjpetFgkBFiG3Le7ieZZ+4vCMhD1bcFgMwSHibFI/uPil847U/+g=",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "be8d07229e459b32ab983a09331d98faa233bee739ef6e2cef058e97ad1609011621b72deee279967ee2f08c843d5b70580cc121e26c523fb8f8a5f38ed4ffe8");
-    EXPECT_EQ(output.json(), "");
-    EXPECT_EQ(output.error(), "");
-}
-
-TEST(TerraClassicSigner, SignWasmTerraTransferPayload) {
-    auto proto = Proto::Message_WasmTerraExecuteContractTransfer();
-    proto.set_recipient_address("recipient=address");
-    const auto amount = store(uint256_t(250000), 0);
-    proto.set_amount(amount.data(), amount.size());
-
-    const auto payload = Protobuf::wasmTerraExecuteTransferPayload(proto);
-
-    assertJSONEqual(payload.dump(), R"(
-        {
-            "transfer":
-                {
-                    "amount": "250000",
-                    "recipient": "recipient=address"
-                }
-        }
-    )");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/Terra/TWCoinTypeTests.cpp b/tests/Terra/TWCoinTypeTests.cpp
deleted file mode 100644
index e46e7c58f0c..00000000000
--- a/tests/Terra/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(TWTerraCoinType, TWCoinTypeClassic) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTerra));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("D28D8AFC7CE89F2A22FA2DBF78D2C0A36E549BB830C4D9FA7459E3F723CA7182"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTerra, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("terra16t3gx5rqvz6ru37yzn3shuu20erv4ngmfr59zf"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTerra, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTerra));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTerra));
-    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeTerra));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTerra), 6);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeTerra));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTerra));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTerra));
-    assertStringsEqual(chainId, "columbus-5");
-    assertStringsEqual(symbol, "LUNC");
-    assertStringsEqual(txUrl, "https://finder.terra.money/classic/tx/D28D8AFC7CE89F2A22FA2DBF78D2C0A36E549BB830C4D9FA7459E3F723CA7182");
-    assertStringsEqual(accUrl, "https://finder.terra.money/classic/address/terra16t3gx5rqvz6ru37yzn3shuu20erv4ngmfr59zf");
-    assertStringsEqual(id, "terra");
-    assertStringsEqual(name, "Terra Classic");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/TerraV2/SignerTests.cpp b/tests/TerraV2/SignerTests.cpp
deleted file mode 100644
index 4978a5c4405..00000000000
--- a/tests/TerraV2/SignerTests.cpp
+++ /dev/null
@@ -1,362 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Base64.h"
-#include "proto/Cosmos.pb.h"
-#include "Cosmos/Address.h"
-#include "Cosmos/Signer.h"
-#include "Cosmos/ProtobufSerialization.h"
-#include "uint256.h"
-#include "../interface/TWTestUtilities.h"
-
-#include <gtest/gtest.h>
-#include <google/protobuf/util/json_util.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(TerraSigner, SignSendTx) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(1037);
-    input.set_chain_id("phoenix-1");
-    input.set_memo("");
-    input.set_sequence(1);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_send_coins_message();
-    message.set_from_address(fromAddress.string());
-    message.set_to_address(toAddress.string());
-    auto amountOfTx = message.add_amounts();
-    amountOfTx->set_denom("uluna");
-    amountOfTx->set_amount("1000000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("30000");
-
-    {
-        std::string json;
-        google::protobuf::util::MessageToJsonString(input, &json);
-        assertJSONEqual(json, R"(
-            {
-                "signingMode": "Protobuf",
-                "accountNumber": "1037",
-                "chainId": "phoenix-1",
-                "fee": {
-                    "amounts": [
-                        {
-                            "denom": "uluna",
-                            "amount": "30000"
-                        }
-                    ],
-                    "gas": "200000"
-                },
-                "sequence": "1",
-                "messages": [
-                    {
-                        "sendCoinsMessage": {
-                            "fromAddress": "terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2",
-                            "toAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp",
-                            "amounts": [
-                                {
-                                    "denom": "uluna",
-                                    "amount": "1000000"
-                                }
-                            ]
-                        }
-                    }
-                ]
-            }
-        )");
-    }
-
-    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerraV2);
-
-    // similar tx: https://finder.terra.money/mainnet/tx/fbbe73ad2f0db3a13911dc424f8a34370dc4b7e8b66687f536797e68ee200ece
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "CpEBCo4BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm4KLHRlcnJhMWhzazZqcnl5cWpmaHA1ZGhjNTV0YzlqdGNreWd4MGVwMzdoZGQyEix0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcBoQCgV1bHVuYRIHMTAwMDAwMBJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYARIUCg4KBXVsdW5hEgUzMDAwMBDAmgwaQPh0C3rjzdixIUiyPx3FlWAxzbKILNAcSRVeQnaTl1vsI5DEfYa2oYlUBLqyilcMCcU/iaJLhex30No2ak0Zn1Q=",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "f8740b7ae3cdd8b12148b23f1dc5956031cdb2882cd01c49155e427693975bec2390c47d86b6a1895404bab28a570c09c53f89a24b85ec77d0da366a4d199f54");
-    EXPECT_EQ(output.error(), "");
-    EXPECT_EQ(output.json(), "");
-}
-
-TEST(TerraSigner, SignWasmTransferTx) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(3407705);
-    input.set_chain_id("phoenix-1");
-    input.set_memo("");
-    input.set_sequence(3);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
-    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76";
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_execute_contract_transfer_message();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    const auto amount = store(uint256_t(250000), 0);
-    message.set_amount(amount.data(), amount.size());
-    message.set_recipient_address(toAddress.string());
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("3000");
-
-    {
-        std::string json;
-        google::protobuf::util::MessageToJsonString(input, &json);
-        assertJSONEqual(json, R"(
-            {
-                "signingMode": "Protobuf",
-                "accountNumber": "3407705",
-                "chainId": "phoenix-1",
-                "fee": {
-                    "amounts": [
-                        {
-                            "denom": "uluna",
-                            "amount": "3000"
-                        }
-                    ],
-                    "gas": "200000"
-                },
-                "sequence": "3",
-                "messages": [
-                    {
-                        "wasmExecuteContractTransferMessage": {
-                            "senderAddress": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
-                            "contractAddress": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
-                            "amount": "A9CQ",
-                            "recipientAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp"
-                        }
-                    }
-                ]
-            }
-        )");
-    }
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerraV2);
-
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "CuUBCuIBCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QSuQEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3NhpbeyJ0cmFuc2ZlciI6eyJhbW91bnQiOiIyNTAwMDAiLCJyZWNpcGllbnQiOiJ0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcCJ9fRJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYAxITCg0KBXVsdW5hEgQzMDAwEMCaDBpAiBGbQaj+jsXE6/FssD3fC77QOxpli9GqsPea+KoNyMIEgVj89Hii+oU1bAEQS4qV0SaE2V6RNy24uCcFTIRbcQ==",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "88119b41a8fe8ec5c4ebf16cb03ddf0bbed03b1a658bd1aab0f79af8aa0dc8c2048158fcf478a2fa85356c01104b8a95d12684d95e91372db8b827054c845b71");
-    EXPECT_EQ(output.error(), "");
-    EXPECT_EQ(output.json(), "");
-}
-
-TEST(TerraSigner, SignWasmGeneric) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(3407705);
-    input.set_chain_id("phoenix-1");
-    input.set_memo("");
-    input.set_sequence(7);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76";
-    const auto txMessage = R"({"transfer": { "amount": "250000", "recipient": "terra1d7048csap4wzcv5zm7z6tdqem2agyp9647vdyj" } })";
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_execute_contract_generic();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    message.set_execute_msg(txMessage);
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("3000");
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerraV2);
-
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "CuwBCukBCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QSwAEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3NhpieyJ0cmFuc2ZlciI6IHsgImFtb3VudCI6ICIyNTAwMDAiLCAicmVjaXBpZW50IjogInRlcnJhMWQ3MDQ4Y3NhcDR3emN2NXptN3o2dGRxZW0yYWd5cDk2NDd2ZHlqIiB9IH0SZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awAEgQKAggBGAcSEwoNCgV1bHVuYRIEMzAwMBDAmgwaQGlYzOoAu/PfyCTSTisGJVW9KWwifxMbCmzy2xwqNg+ZHQkDjVRyUBl7gmbXXLzdOMqtwF1CMauJhlGwmEdzhK4=",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-
-    EXPECT_EQ(hex(output.signature()), "6958ccea00bbf3dfc824d24e2b062555bd296c227f131b0a6cf2db1c2a360f991d09038d547250197b8266d75cbcdd38caadc05d4231ab898651b098477384ae");
-    EXPECT_EQ(output.error(), "");
-    EXPECT_EQ(output.json(), "");
-}
-
-TEST(TerraSigner, SignWasmGenericWithCoins) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(3407705);
-    input.set_chain_id("phoenix-1");
-    input.set_memo("");
-    input.set_sequence(9);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    const auto tokenContractAddress = "terra1sepfj7s0aeg5967uxnfk4thzlerrsktkpelm5s";
-    const auto txMessage = R"({ "deposit_stable": {} })";
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_execute_contract_generic();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    message.set_execute_msg(txMessage);
-
-    auto amount = message.add_coins();
-    amount->set_denom("uusd");
-    amount->set_amount("1000");
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(600000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("7000");
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerraV2);
-
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "CrABCq0BCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QShAEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTFzZXBmajdzMGFlZzU5Njd1eG5mazR0aHpsZXJyc2t0a3BlbG01cxoYeyAiZGVwb3NpdF9zdGFibGUiOiB7fSB9KgwKBHV1c2QSBDEwMDASZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awAEgQKAggBGAkSEwoNCgV1bHVuYRIENzAwMBDAzyQaQEDA2foXegF+rslj6o8bX2HPJfn+q/6Ezbq2iAd0SFOTQqS8aAyywQkdZJRToXcaby1HOYL1WvmsMPgrFzChiY4=",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-
-    EXPECT_EQ(hex(output.signature()), "40c0d9fa177a017eaec963ea8f1b5f61cf25f9feabfe84cdbab688077448539342a4bc680cb2c1091d649453a1771a6f2d473982f55af9ac30f82b1730a1898e");
-    EXPECT_EQ(output.error(), "");
-    EXPECT_EQ(output.json(), "");
-}
-
-TEST(TerraSigner, SignWasmSendTx) {
-    auto input = Proto::SigningInput();
-    input.set_signing_mode(Proto::Protobuf);
-    input.set_account_number(3407705);
-    input.set_chain_id("phoenix-1");
-    input.set_memo("");
-    input.set_sequence(4);
-
-    Address fromAddress;
-    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
-    Address toAddress;
-    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
-    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76";
-
-    auto msg = input.add_messages();
-    auto& message = *msg->mutable_wasm_execute_contract_send_message();
-    message.set_sender_address(fromAddress.string());
-    message.set_contract_address(tokenContractAddress);
-    const auto amount = store(uint256_t(250000), 0);
-    message.set_amount(amount.data(), amount.size());
-    message.set_recipient_contract_address(toAddress.string());
-    const auto msgMsg = Base64::encode(data(std::string(R"({"some_message":{}})")));
-    EXPECT_EQ(msgMsg, "eyJzb21lX21lc3NhZ2UiOnt9fQ==");
-    message.set_msg(msgMsg);
-
-    auto& fee = *input.mutable_fee();
-    fee.set_gas(200000);
-    auto amountOfFee = fee.add_amounts();
-    amountOfFee->set_denom("uluna");
-    amountOfFee->set_amount("3000");
-
-    std::string json;
-    google::protobuf::util::MessageToJsonString(input, &json);
-    assertJSONEqual(json, R"(
-        {
-            "signingMode": "Protobuf",
-            "accountNumber": "3407705",
-            "chainId": "phoenix-1",
-            "fee": {
-                "amounts": [
-                    {
-                        "denom": "uluna",
-                        "amount": "3000"
-                    }
-                ],
-                "gas": "200000"
-            },
-            "sequence": "4",
-            "messages": [
-                {
-                    "wasmExecuteContractSendMessage": {
-                        "senderAddress": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
-                        "contractAddress": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
-                        "amount": "A9CQ",
-                        "recipientContractAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp",
-                        "msg": "eyJzb21lX21lc3NhZ2UiOnt9fQ=="
-                    }
-                }
-            ]
-        }
-    )");
-
-    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    auto output = Signer::sign(input, TWCoinTypeTerraV2);
-
-    assertJSONEqual(output.serialized(), R"(
-        {
-            "tx_bytes": "CoUCCoICCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QS2QEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3Nhp7eyJzZW5kIjp7ImFtb3VudCI6IjI1MDAwMCIsImNvbnRyYWN0IjoidGVycmExamxnYXF5OW52bjJoZjV0MnNyYTl5Y3o4czc3d25mOWwwa21nY3AiLCJtc2ciOiJleUp6YjIxbFgyMWxjM05oWjJVaU9udDlmUT09In19EmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQNwZjrHsPmJKW/rXOWfukpQ1+lOHOJW3/IlFFnKLNmsABIECgIIARgEEhMKDQoFdWx1bmESBDMwMDAQwJoMGkBKJbW1GDrv9j2FIckm7MtpDZzP2RjgDjU84oYmOHNHsxEBPLjtt3YAjsKWBCAsjbnbVoJ3s2XFG08nxQXS9xBK",
-            "mode": "BROADCAST_MODE_BLOCK"
-        }
-    )");
-    EXPECT_EQ(hex(output.signature()), "4a25b5b5183aeff63d8521c926eccb690d9ccfd918e00e353ce28626387347b311013cb8edb776008ec29604202c8db9db568277b365c51b4f27c505d2f7104a");
-    EXPECT_EQ(output.error(), "");
-    EXPECT_EQ(output.json(), "");
-}
-
-TEST(TerraSigner, SignWasmTransferPayload) {
-    auto proto = Proto::Message_WasmExecuteContractTransfer();
-    proto.set_recipient_address("recipient=address");
-    const auto amount = store(uint256_t(250000), 0);
-    proto.set_amount(amount.data(), amount.size());
-
-    const auto payload = Protobuf::wasmExecuteTransferPayload(proto);
-
-    assertJSONEqual(payload.dump(), R"(
-        {
-            "transfer":
-                {
-                    "amount": "250000",
-                    "recipient": "recipient=address"
-                }
-        }
-    )");
-}
-
-} // namespace TW::Cosmos::tests
diff --git a/tests/TerraV2/TWCoinTypeTests.cpp b/tests/TerraV2/TWCoinTypeTests.cpp
deleted file mode 100644
index 96c27cff876..00000000000
--- a/tests/TerraV2/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-namespace TW::Cosmos::tests {
-
-TEST(TWTerraCoinType, TWCoinType20) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTerraV2));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("CFF732C6EBEE06FFA08ABE54EE1657FD53E90FAA81604619E2062C46572A6986"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTerraV2, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("terra16t3gx5rqvz6ru37yzn3shuu20erv4ngmfr59zf"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTerraV2, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTerraV2));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTerraV2));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTerraV2), 6);
-    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeTerraV2));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTerraV2));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTerraV2));
-    assertStringsEqual(symbol, "LUNA");
-    assertStringsEqual(txUrl, "https://finder.terra.money/mainnet/tx/CFF732C6EBEE06FFA08ABE54EE1657FD53E90FAA81604619E2062C46572A6986");
-    assertStringsEqual(accUrl, "https://finder.terra.money/mainnet/address/terra16t3gx5rqvz6ru37yzn3shuu20erv4ngmfr59zf");
-    assertStringsEqual(id, "terrav2");
-    assertStringsEqual(name, "Terra");
-}
-
-} // namespace TW::Cosmos::tests
-
diff --git a/tests/Tezos/AddressTests.cpp b/tests/Tezos/AddressTests.cpp
deleted file mode 100644
index 38e121ce7df..00000000000
--- a/tests/Tezos/AddressTests.cpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HDWallet.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Tezos/Address.h"
-#include "Tezos/Forging.h"
-
-#include <TrustWalletCore/TWCoinType.h>
-
-#include <array>
-#include <gtest/gtest.h>
-#include <string>
-
-using namespace TW;
-
-namespace TW::Tezos::tests {
-
-TEST(TezosAddress, forge_tz1) {
-    auto input = Address("tz1eZwq8b5cvE2bPKokatLkVMzkxz24z3Don");
-    auto expected = "00cfa4aae60f5d9389752d41e320da224d43287fe2";
-
-    ASSERT_EQ(input.forge(), parse_hex(expected));
-}
-
-TEST(TezosAddress, forge_tz2) {
-    auto input = Address("tz2Rh3NYeLxrqTuvaZJmaMiVMqCajeXMWtYo");
-    auto expected = "01be99dd914e38388ec80432818b517759e3524f16";
-
-    ASSERT_EQ(input.forge(), parse_hex(expected));
-}
-
-TEST(TezosAddress, forge_tz3) {
-    auto input = Address("tz3RDC3Jdn4j15J7bBHZd29EUee9gVB1CxD9");
-    auto expected = "02358cbffa97149631cfb999fa47f0035fb1ea8636";
-
-    ASSERT_EQ(input.forge(), parse_hex(expected));
-}
-
-TEST(TezosAddress, isInvalid) {
-    std::array<std::string, 3> invalidAddresses{
-        "NmH7tmeJUmHcncBDvpr7aJNEBk7rp5zYsB1qt", // Invalid prefix, valid checksum
-        "tz1eZwq8b5cvE2bPKokatLkVMzkxz24z3AAAA", // Valid prefix, invalid checksum
-        "1tzeZwq8b5cvE2bPKokatLkVMzkxz24zAAAAA"  // Invalid prefix, invalid checksum
-    };
-
-    for (auto& address : invalidAddresses) {
-        ASSERT_FALSE(Address::isValid(address));
-    }
-}
-
-TEST(TezosAddress, isValid) {
-    std::array<std::string, 3> validAddresses{
-        "tz1Yju7jmmsaUiG9qQLoYv35v5pHgnWoLWbt",
-        "tz2PdGc7U5tiyqPgTSgqCDct94qd6ovQwP6u",
-        "tz3VEZ4k6a4Wx42iyev6i2aVAptTRLEAivNN"};
-
-    for (auto& address : validAddresses) {
-        ASSERT_TRUE(Address::isValid(address));
-    }
-}
-
-TEST(TezosAddress, string) {
-    auto addressString = "tz1d1qQL3mYVuiH4JPFvuikEpFwaDm85oabM";
-    auto address = Address(addressString);
-    ASSERT_EQ(address.string(), addressString);
-}
-
-TEST(TezosAddress, deriveOriginatedAddress) {
-    auto operationHash = "oo7VeTEPjEusPKnsHtKcGYbYa7i4RWpcEhUVo3Suugbbs6K62Ro";
-    auto operationIndex = 0;
-    auto expected = "KT1WrtjtAYQSrUVvSNJPTZTebiUWoopQL5hw";
-
-    ASSERT_EQ(Address::deriveOriginatedAddress(operationHash, operationIndex), expected);
-}
-
-TEST(TezosAddress, PublicKeyInit) {
-    Data bytes = parse_hex("01fe157cc8011727936c592f856c9071d39cf4acdadfa6d76435e4619c9dc56f63");
-    const auto publicKey = PublicKey(bytes, TWPublicKeyTypeED25519);
-    auto address = Address(publicKey);
-
-    auto expected = "tz1cG2jx3W4bZFeVGBjsTxUAG8tdpTXtE8PT";
-    ASSERT_EQ(address.string(), expected);
-}
-
-} // namespace TW::Tezos::tests
diff --git a/tests/Tezos/PublicKeyTests.cpp b/tests/Tezos/PublicKeyTests.cpp
deleted file mode 100644
index 66c7087dc7e..00000000000
--- a/tests/Tezos/PublicKeyTests.cpp
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Tezos/BinaryCoding.h"
-#include "Tezos/Forging.h"
-#include "PublicKey.h"
-#include "Data.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Tezos::tests {
-
-TEST(TezosPublicKey, forge) {
-    auto input = parsePublicKey("edpkuAfEJCEatRgFpRGg3gn3FdWniLXBoubARreRwuVZPWufkgDBvR");
-    auto expected = "00451bde832454ba73e6e0de313fcf5d1565ec51080edc73bb19287b8e0ab2122b";
-    auto serialized = forgePublicKey(input);
-    ASSERT_EQ(hex(serialized.begin(), serialized.end()), expected);
-}
-
-TEST(TezosPublicKey, parse) {
-    auto input = "edpkuAfEJCEatRgFpRGg3gn3FdWniLXBoubARreRwuVZPWufkgDBvR";
-    auto bytes = Data({1, 69, 27, 222, 131, 36, 84, 186, 115, 230, 224, 222, 49, 63, 207, 93, 21, 101, 236, 81, 8, 14, 220, 115, 187, 25, 40, 123, 142, 10, 178, 18, 43});
-    auto output = parsePublicKey(input);
-    auto expected = PublicKey(bytes, TWPublicKeyTypeED25519);
-    ASSERT_EQ(output, expected);
-}
-
-} // namespace TW::Tezos::tests
diff --git a/tests/Tezos/SignerTests.cpp b/tests/Tezos/SignerTests.cpp
deleted file mode 100644
index 92681344646..00000000000
--- a/tests/Tezos/SignerTests.cpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base58.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Tezos/BinaryCoding.h"
-#include "Tezos/OperationList.h"
-#include "Tezos/Signer.h"
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Tezos::tests {
-
-TEST(TezosSigner, SignString) {
-    Data bytesToSign = parse_hex("ffaa");
-    Data expectedSignature = parse_hex("eaab7f4066217b072b79609a9f76cdfadd93f8dde41763887e131c02324f18c8e41b1009e334baf87f9d2e917bf4c0e73165622e5522409a0c5817234a48cc02");
-    Data expected = Data();
-    append(expected, bytesToSign);
-    append(expected, expectedSignature);
-
-    auto key = PrivateKey(parse_hex("0x2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f"));
-    auto signedBytes = Signer().signData(key, bytesToSign);
-
-    ASSERT_EQ(signedBytes, expected);
-}
-
-TEST(TezosSigner, SignOperationList) {
-    auto branch = "BLDnkhhVgwdBAtmDNQc5HtEMsrxq8L3t7NQbjUbbdTdw5Ug1Mpe";
-    auto op_list = Tezos::OperationList(branch);
-
-    auto transactionOperationData = new Proto::TransactionOperationData();
-    transactionOperationData->set_amount(11100000);
-    transactionOperationData->set_destination("tz1gSM6yiwr85jEASZ1q3UekgHEoxYt7wg2M");
-
-    auto transactionOperation = TW::Tezos::Proto::Operation();
-    transactionOperation.set_source("tz1RKLoYm4vtLzo7TAgGifMDAkiWhjfyXwP4");
-    transactionOperation.set_fee(1283);
-    transactionOperation.set_counter(1878);
-    transactionOperation.set_gas_limit(10307);
-    transactionOperation.set_storage_limit(0);
-    transactionOperation.set_kind(Proto::Operation::TRANSACTION);
-    transactionOperation.set_allocated_transaction_operation_data(transactionOperationData);
-
-    op_list.addOperation(transactionOperation);
-
-    PublicKey publicKey = parsePublicKey("edpkuNb9N2UHtGeSc2BZCBHN8ETx7E4DwkSfz5Hw3m3tF3dLZTU8qp");
-    auto revealOperationData = new TW::Tezos::Proto::RevealOperationData();
-    revealOperationData->set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
-
-    auto revealOperation = Proto::Operation();
-    revealOperation.set_source("tz1RKLoYm4vtLzo7TAgGifMDAkiWhjfyXwP4");
-    revealOperation.set_fee(1268);
-    revealOperation.set_counter(1876);
-    revealOperation.set_gas_limit(10100);
-    revealOperation.set_storage_limit(0);
-    revealOperation.set_kind(Proto::Operation::REVEAL);
-    revealOperation.set_allocated_reveal_operation_data(revealOperationData);
-
-    op_list.addOperation(revealOperation);
-
-    auto delegateOperationData = new Tezos::Proto::DelegationOperationData();
-    delegateOperationData->set_delegate("tz1gSM6yiwr85jEASZ1q3UekgHEoxYt7wg2M");
-
-    auto delegateOperation = Proto::Operation();
-    delegateOperation.set_source("tz1RKLoYm4vtLzo7TAgGifMDAkiWhjfyXwP4");
-    delegateOperation.set_fee(1257);
-    delegateOperation.set_counter(1879);
-    delegateOperation.set_gas_limit(10100);
-    delegateOperation.set_storage_limit(0);
-    delegateOperation.set_kind(Proto::Operation::DELEGATION);
-    delegateOperation.set_allocated_delegation_operation_data(delegateOperationData);
-
-    op_list.addOperation(delegateOperation);
-
-    auto decodedPrivateKey = Base58::bitcoin.decodeCheck("edsk4bMQMM6HYtMazF3m7mYhQ6KQ1WCEcBuRwh6DTtdnoqAvC3nPCc");
-    auto key = PrivateKey(Data(decodedPrivateKey.begin() + 4, decodedPrivateKey.end()));
-
-    std::string expectedForgedBytesToSign = hex(op_list.forge(key));
-    std::string expectedSignature = "871693145f2dc72861ff6816e7ac3ce93c57611ac09a4c657a5a35270fa57153334c14cd8cae94ee228b6ef52f0e3f10948721e666318bc54b6c455404b11e03";
-    std::string expectedSignedBytes = expectedForgedBytesToSign + expectedSignature;
-
-    auto signedBytes = Signer().signOperationList(key, op_list);
-    auto signedBytesHex = hex(signedBytes.begin(), signedBytes.end());
-
-    ASSERT_EQ(hex(signedBytes.begin(), signedBytes.end()), expectedSignedBytes);
-}
-
-} // namespace TW::Tezos::tests
diff --git a/tests/Tezos/TWAnySignerTests.cpp b/tests/Tezos/TWAnySignerTests.cpp
deleted file mode 100644
index 4cac74a7885..00000000000
--- a/tests/Tezos/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Tezos/BinaryCoding.h"
-#include "proto/Tezos.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-namespace TW::Tezos::tests {
-
-TEST(TWAnySignerTezos, SignFA12) {
-    // https://ghostnet.tzkt.io/ooTBu7DLbeC7DmVfXEsp896A6WTwimedbsM9QRqUVtqA8Vxt6D3/2993172
-    auto key = parse_hex("363265a0b3f06661001cab8b4f3ca8fd97ae70608184979cf7300836f57ec2d6");
-
-    Proto::SigningInput input;
-    input.set_private_key(key.data(), key.size());
-    auto& operations = *input.mutable_operation_list();
-    operations.set_branch("BL8euoCWqNCny9AR3AKjnpi38haYMxjei1ZqNHuXMn19JSQnoWp");
-
-    auto& transaction = *operations.add_operations();
-    auto& txData = *transaction.mutable_transaction_operation_data();
-    txData.set_amount(0);
-    txData.set_destination("KT1EwXFWoG9bYebmF4pYw72aGjwEnBWefgW5");
-    txData.mutable_parameters()->mutable_fa12_parameters()->set_entrypoint("transfer");
-    txData.mutable_parameters()->mutable_fa12_parameters()->set_from("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
-    txData.mutable_parameters()->mutable_fa12_parameters()->set_to("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
-    txData.mutable_parameters()->mutable_fa12_parameters()->set_value("123");
-    transaction.set_source("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
-    transaction.set_fee(100000);
-    transaction.set_counter(2993172);
-    transaction.set_gas_limit(100000);
-    transaction.set_storage_limit(0);
-    transaction.set_kind(Proto::Operation::TRANSACTION);
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeTezos);
-    ASSERT_EQ(hex(output.encoded()), "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016c00fe2ce0cccc0214af521ad60c140c5589b4039247a08d0694d8b601a08d0600000145bd8a65cc48159d8ea60a55df735b7c5ad45f0e00ffff087472616e736665720000005907070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b555007070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b555000bb012914d768155fba2df319a81136e8e3e573b9cadb1676834490c90212615d271da029b6b0531e290e9063bcdb40bea43627af048b18e036f02be2b6b22fc8b307");
-}
-
-TEST(TWAnySignerTezos, SignFA2) {
-    // https://ghostnet.tzkt.io/onxLBoPaf23M3A8kHTwncSFG2GVXPfnGXUhkC8BhKj8QDdCEbng
-    auto key = parse_hex("363265a0b3f06661001cab8b4f3ca8fd97ae70608184979cf7300836f57ec2d6");
-
-    Proto::SigningInput input;
-    input.set_private_key(key.data(), key.size());
-    auto& operations = *input.mutable_operation_list();
-    operations.set_branch("BKvEAX9HXfJZWYfTQbR1C7B3ADoKY6a1aKVRF7qQqvc9hS8Rr3m");
-
-    auto& transaction = *operations.add_operations();
-
-    auto* transactionOperationData = transaction.mutable_transaction_operation_data();
-    transactionOperationData->set_amount(0);
-    transactionOperationData->set_destination("KT1DYk1XDzHredJq1EyNkDindiWDqZyekXGj");
-
-    auto& fa2 = *transactionOperationData->mutable_parameters()->mutable_fa2_parameters();
-    fa2.set_entrypoint("transfer");
-    auto& txObject = *fa2.add_txs_object();
-    txObject.set_from("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
-    auto& tx = *txObject.add_txs();
-    tx.set_amount("10");
-    tx.set_token_id("0");
-    tx.set_to("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
-
-    transaction.set_source("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
-    transaction.set_fee(100000);
-    transaction.set_counter(2993173);
-    transaction.set_gas_limit(100000);
-    transaction.set_storage_limit(0);
-    transaction.set_kind(Proto::Operation::TRANSACTION);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeTezos);
-    ASSERT_EQ(hex(output.encoded()), "1b1f9345dc9f77bd24b09034d1d2f9a28f02ac837f49db54b8d68341f53dc4b76c00fe2ce0cccc0214af521ad60c140c5589b4039247a08d0695d8b601a08d0600000136767f88850bae28bfb9f46b73c5e87ede4de12700ffff087472616e7366657200000066020000006107070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b5550020000003107070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b555007070000000a552d24710d6c59383286700c6c2917b25a6c1fa8b587e593c289dd47704278796792f1e522c1623845ec991e292b0935445e6994850bd03f035a006c5ed93806");
-}
-
-TEST(TWAnySignerTezos, Sign) {
-    auto key = parse_hex("2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f");
-    auto revealKey = parse_hex("311f002e899cdd9a52d96cb8be18ea2bbab867c505da2b44ce10906f511cff95");
-
-    Proto::SigningInput input;
-    input.set_private_key(key.data(), key.size());
-    auto& operations = *input.mutable_operation_list();
-    operations.set_branch("BL8euoCWqNCny9AR3AKjnpi38haYMxjei1ZqNHuXMn19JSQnoWp");
-
-    auto& reveal = *operations.add_operations();
-    auto& revealData = *reveal.mutable_reveal_operation_data();
-    revealData.set_public_key(revealKey.data(), revealKey.size());
-    reveal.set_source("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
-    reveal.set_fee(1272);
-    reveal.set_counter(30738);
-    reveal.set_gas_limit(10100);
-    reveal.set_storage_limit(257);
-    reveal.set_kind(Proto::Operation::REVEAL);
-
-    auto& transaction = *operations.add_operations();
-    auto& txData = *transaction.mutable_transaction_operation_data();
-    txData.set_amount(1);
-    txData.set_destination("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
-    transaction.set_source("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
-    transaction.set_fee(1272);
-    transaction.set_counter(30739);
-    transaction.set_gas_limit(10100);
-    transaction.set_storage_limit(257);
-    transaction.set_kind(Proto::Operation::TRANSACTION);
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeTezos);
-
-    EXPECT_EQ(hex(output.encoded()), "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016b0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e810200311f002e899cdd9a52d96cb8be18ea2bbab867c505da2b44ce10906f511cff956c0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80993f001f44e810201000081faa75f741ef614b0e35fcc8c90dfa3b0b95721000217034271b815e5f0c0a881342838ce49d7b48cdf507c72b1568c69a10db70c98774cdad1a74df760763e25f760ff13afcbbf3a1f2c833a0beeb9576a579c05");
-}
-
-TEST(TWAnySignerTezos, SignJSON) {
-    auto json = STRING(R"({"operationList": {"branch": "BL8euoCWqNCny9AR3AKjnpi38haYMxjei1ZqNHuXMn19JSQnoWp","operations": [{"source": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW","fee": 1272,"counter": 30738,"gasLimit": 10100,"storageLimit": 257,"kind": 107,"revealOperationData": {"publicKey": "QpqYbIBypAofOj4qtaWBm7Gy+2mZPFAEg3gVudxVkj4="}},{"source": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW","fee": 1272,"counter": 30739,"gasLimit": 10100,"storageLimit": 257,"kind": 108,"transactionOperationData": {"destination": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW","amount": 1}}]}})");
-    auto key = DATA("2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f");
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeTezos));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeTezos));
-    assertStringsEqual(result, "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016b0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e810200429a986c8072a40a1f3a3e2ab5a5819bb1b2fb69993c5004837815b9dc55923e6c0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80993f001f44e810201000081faa75f741ef614b0e35fcc8c90dfa3b0b957210001b86398d5b9be737dca8e4106ea18d70e69b75e92f892fb283546a99152b8d7794b919c0fbf1c31de386069a60014491c0e7505adef5781cead1cfe6608030b");
-}
-
-} // namespace TW::Tezos::tests
diff --git a/tests/Tezos/TWCoinTypeTests.cpp b/tests/Tezos/TWCoinTypeTests.cpp
deleted file mode 100644
index a8d44065d59..00000000000
--- a/tests/Tezos/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWTezosCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTezos));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("onk3Z6V4StyfiXTPSHwZFvTKVAaws37cHmZacmULPr3VbVHpKrg"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTezos, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("tz1SiPXX4MYGNJNDsRc7n8hkvUqFzg8xqF9m"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTezos, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTezos));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTezos));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTezos), 6);
-    ASSERT_EQ(TWBlockchainTezos, TWCoinTypeBlockchain(TWCoinTypeTezos));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTezos));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTezos));
-    assertStringsEqual(symbol, "XTZ");
-    assertStringsEqual(txUrl, "https://tzstats.com/onk3Z6V4StyfiXTPSHwZFvTKVAaws37cHmZacmULPr3VbVHpKrg");
-    assertStringsEqual(accUrl, "https://tzstats.com/tz1SiPXX4MYGNJNDsRc7n8hkvUqFzg8xqF9m");
-    assertStringsEqual(id, "tezos");
-    assertStringsEqual(name, "Tezos");
-}
diff --git a/tests/Theta/SignerTests.cpp b/tests/Theta/SignerTests.cpp
deleted file mode 100644
index 3f6cb122db8..00000000000
--- a/tests/Theta/SignerTests.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "Theta/Signer.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Theta {
-
-using boost::multiprecision::uint256_t;
-
-TEST(Signer, Sign) {
-    const auto pkFrom =
-        PrivateKey(parse_hex("0x93a90ea508331dfdf27fb79757d4250b4e84954927ba0073cd67454ac432c737"));
-    const auto from = Ethereum::Address("0x2E833968E5bB786Ae419c4d13189fB081Cc43bab");
-    const auto to = Ethereum::Address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
-    auto transaction = Transaction(from, to, 10, 20, 1);
-
-    auto signer = Signer("privatenet");
-    auto signature = signer.sign(pkFrom, transaction);
-    transaction.setSignature(from, signature);
-
-    ASSERT_EQ(hex(signature), "5190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8"
-                              "fe9134ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501");
-    ASSERT_EQ(hex(transaction.encode()),
-              "02f887c78085e8d4a51000f863f861942e833968e5bb786ae419c4d13189fb081cc43babc70a85e8d4a5"
-              "101401b8415190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134"
-              "ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501d9d8949f1233798e905e17356007"
-              "1255140b4a8abd3ec6c20a14");
-}
-
-} // namespace TW::Theta
diff --git a/tests/Theta/TWAnySignerTests.cpp b/tests/Theta/TWAnySignerTests.cpp
deleted file mode 100644
index 6b9fbe87e6d..00000000000
--- a/tests/Theta/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/Theta.pb.h"
-#include "uint256.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Theta::tests {
-
-TEST(TWAnySignerTheta, Sign) {
-    auto privateKey = parse_hex("93a90ea508331dfdf27fb79757d4250b4e84954927ba0073cd67454ac432c737");
-
-    Proto::SigningInput input;
-    input.set_chain_id("privatenet");
-    input.set_to_address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
-    auto amount = store(uint256_t(10));
-    input.set_theta_amount(amount.data(), amount.size());
-    auto tfuelAmount = store(uint256_t(20));
-    input.set_tfuel_amount(tfuelAmount.data(), tfuelAmount.size());
-    auto fee = store(uint256_t(1000000000000));
-    input.set_fee(fee.data(), fee.size());
-    input.set_sequence(1);
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeTheta);
-
-    ASSERT_EQ(hex(output.encoded()), "02f887c78085e8d4a51000f863f861942e833968e5bb786ae419c4d13189fb081cc43babc70a85e8d4a5101401b8415190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501d9d8949f1233798e905e173560071255140b4a8abd3ec6c20a14");
-}
-
-} // namespace TW::Thetha::tests
diff --git a/tests/Theta/TWCoinTypeTests.cpp b/tests/Theta/TWCoinTypeTests.cpp
deleted file mode 100644
index 55ed4e35b38..00000000000
--- a/tests/Theta/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWThetaCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTheta));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTheta, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTheta, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTheta));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTheta));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTheta), 18);
-    ASSERT_EQ(TWBlockchainTheta, TWCoinTypeBlockchain(TWCoinTypeTheta));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTheta));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTheta));
-    assertStringsEqual(symbol, "THETA");
-    assertStringsEqual(txUrl, "https://explorer.thetatoken.org/txs/t123");
-    assertStringsEqual(accUrl, "https://explorer.thetatoken.org/account/a12");
-    assertStringsEqual(id, "theta");
-    assertStringsEqual(name, "Theta");
-}
diff --git a/tests/Theta/TransactionTests.cpp b/tests/Theta/TransactionTests.cpp
deleted file mode 100644
index 3ff9a4b3926..00000000000
--- a/tests/Theta/TransactionTests.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Theta/Transaction.h"
-
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Theta::tests {
-
-TEST(ThetaTransaction, Encode) {
-    const auto from = Ethereum::Address("0x2E833968E5bB786Ae419c4d13189fB081Cc43bab");
-    const auto to = Ethereum::Address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
-    auto transaction = Transaction(from, to, 10, 20, 1);
-    ASSERT_EQ(hex(transaction.encode()),
-              "02f843c78085e8d4a51000e0df942e833968e5bb786ae419c4d13189fb081cc43babc70a85e8d4a51014"
-              "0180d9d8949f1233798e905e173560071255140b4a8abd3ec6c20a14");
-}
-
-TEST(ThetaTransaction, EncodeWithSignature) {
-    const auto from = Ethereum::Address("0x2E833968E5bB786Ae419c4d13189fB081Cc43bab");
-    const auto to = Ethereum::Address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
-    auto transaction = Transaction(from, to, 10, 20, 1);
-    transaction.setSignature(
-        from, parse_hex("5190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134"
-                        "ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501"));
-    ASSERT_EQ(hex(transaction.encode()),
-              "02f887c78085e8d4a51000f863f861942e833968e5bb786ae419c4d13189fb081cc43babc70a85e8d4a5"
-              "101401b8415190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134"
-              "ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501d9d8949f1233798e905e17356007"
-              "1255140b4a8abd3ec6c20a14");
-}
-
-} // namespace TW::Theta::tests
diff --git a/tests/ThunderToken/TWCoinTypeTests.cpp b/tests/ThunderToken/TWCoinTypeTests.cpp
deleted file mode 100644
index 3b31872c8c3..00000000000
--- a/tests/ThunderToken/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWThunderTokenCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeThunderToken));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeThunderToken, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeThunderToken, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeThunderToken));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeThunderToken));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeThunderToken), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeThunderToken));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeThunderToken));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeThunderToken));
-    assertStringsEqual(symbol, "TT");
-    assertStringsEqual(txUrl, "https://scan.thundercore.com/transactions/t123");
-    assertStringsEqual(accUrl, "https://scan.thundercore.com/address/a12");
-    assertStringsEqual(id, "thundertoken");
-    assertStringsEqual(name, "Thunder Token");
-}
diff --git a/tests/TomoChain/TWCoinTypeTests.cpp b/tests/TomoChain/TWCoinTypeTests.cpp
deleted file mode 100644
index 0cb99362b04..00000000000
--- a/tests/TomoChain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWTomoChainCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTomoChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x35a8d3ab06c94d5b7d27221b7c9a24ba3f1710dd0fcfd75c5d59b3a885fd709b"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTomoChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x86cCbD9bfb371c355202086882bC644A7D0b024B"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTomoChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTomoChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTomoChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTomoChain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeTomoChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTomoChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTomoChain));
-    assertStringsEqual(symbol, "TOMO");
-    assertStringsEqual(txUrl, "https://tomoscan.io/tx/0x35a8d3ab06c94d5b7d27221b7c9a24ba3f1710dd0fcfd75c5d59b3a885fd709b");
-    assertStringsEqual(accUrl, "https://tomoscan.io/address/0x86cCbD9bfb371c355202086882bC644A7D0b024B");
-    assertStringsEqual(id, "tomochain");
-    assertStringsEqual(name, "TomoChain");
-}
diff --git a/tests/TransactionCompilerTests.cpp b/tests/TransactionCompilerTests.cpp
deleted file mode 100644
index 0d9c8e4eab8..00000000000
--- a/tests/TransactionCompilerTests.cpp
+++ /dev/null
@@ -1,437 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include <TrustWalletCore/TWCoinType.h>
-#include "TransactionCompiler.h"
-#include "Coin.h"
-#include "proto/Common.pb.h"
-#include "proto/Binance.pb.h"
-#include "proto/Bitcoin.pb.h"
-#include "proto/Ethereum.pb.h"
-#include "proto/TransactionCompiler.pb.h"
-
-#include <TrustWalletCore/TWBitcoinSigHashType.h>
-#include "Bitcoin/Script.h"
-#include "Bitcoin/SegwitAddress.h"
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "uint256.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(TransactionCompiler, BinanceCompileWithSignatures) {
-    /// Step 1: Prepare transaction input (protobuf)
-    const auto coin = TWCoinTypeBinance;
-    const auto txInputData = TransactionCompiler::buildInput(
-        coin,
-        "bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2",  // from
-        "bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5",  // to
-        "1",  // amount
-        "BNB",  // asset
-        "",  // memo
-        "Binance-Chain-Nile"  // testnet chainId
-    );
-
-    {
-        // Check, by parsing
-        EXPECT_EQ(txInputData.size(), 88ul);
-        Binance::Proto::SigningInput input;
-        ASSERT_TRUE(input.ParseFromArray(txInputData.data(), (int)txInputData.size()));
-        EXPECT_EQ(input.chain_id(), "Binance-Chain-Nile");
-        EXPECT_TRUE(input.has_send_order());
-        ASSERT_EQ(input.send_order().inputs_size(), 1);
-        EXPECT_EQ(hex(data(input.send_order().inputs(0).address())), "40c2979694bbc961023d1d27be6fc4d21a9febe6");
-    }
-
-    /// Step 2: Obtain preimage hash
-    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
-    ASSERT_GT(preImageHashes.size(), 0ul);
-
-    TxCompiler::Proto::PreSigningOutput preSigningOutput;
-    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
-    ASSERT_EQ(preSigningOutput.error(), 0);
-
-    auto preImageHash = data(preSigningOutput.data_hash());
-    EXPECT_EQ(hex(preImageHash), "3f3fece9059e714d303a9a1496ddade8f2c38fa78fc4cc2e505c5dbb0ea678d1");
-
-    // Simulate signature, normally obtained from signature server
-    const auto publicKeyData = parse_hex("026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502");
-    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
-    const auto signature = parse_hex("1b1181faec30b60a2ddaa2804c253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5366bb8b041781a6771248550d04094c3d7a504f9e8310679");
-
-    // Verify signature (pubkey & hash & signature)
-    {
-        EXPECT_TRUE(publicKey.verify(signature, preImageHash));
-    }
-
-    /// Step 3: Compile transaction info
-    const Data outputData = TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKeyData});
-
-    const auto ExpectedTx = "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212401b1181faec30b60a2ddaa2804c253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5366bb8b041781a6771248550d04094c3d7a504f9e8310679";
-    {
-        EXPECT_EQ(outputData.size(), 189ul);
-        Binance::Proto::SigningOutput output;
-        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
-
-        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
-    }
-
-    { // Double check: check if simple signature process gives the same result. Note that private keys were not used anywhere up to this point.
-        Binance::Proto::SigningInput input;
-        ASSERT_TRUE(input.ParseFromArray(txInputData.data(), (int)txInputData.size()));
-        auto key = parse_hex("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832");
-        input.set_private_key(key.data(), key.size());
-
-        Binance::Proto::SigningOutput output;
-        ANY_SIGN(input, coin);
-
-        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
-    }
-}
-
-TEST(TransactionCompiler, BitcoinCompileWithSignatures) {
-    // Test external signining with a Bircoin transaction with 3 input UTXOs, all used, but only using 2 public keys.
-    // Three signatures are neeeded.  This illustrates that order of UTXOs/hashes is not always the same.
-
-    const auto revUtxoHash0 = parse_hex("07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8");
-    const auto revUtxoHash1 = parse_hex("d6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e");
-    const auto revUtxoHash2 = parse_hex("6021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d");
-    const auto inPubKey0 = parse_hex("024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382");
-    const auto inPubKey1 = parse_hex("0217142f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc");
-    const auto inPubKeyHash0 = parse_hex("bd92088bb7e82d611a9b94fbb74a0908152b784f");
-    const auto inPubKeyHash1 = parse_hex("6641abedacf9483b793afe1718689cc9420bbb1c");
-
-    // Input UTXO infos
-    struct UtxoInfo {
-        Data revUtxoHash;
-        Data publicKey;
-        long amount;
-        int index;
-    };
-    std::vector<UtxoInfo> utxoInfos = {
-        // first
-        UtxoInfo {revUtxoHash0, inPubKey0, 600'000, 0},
-        // second UTXO, with same pubkey
-        UtxoInfo {revUtxoHash1, inPubKey0, 500'000, 1},
-        // third UTXO, with different pubkey
-        UtxoInfo {revUtxoHash2, inPubKey1, 400'000, 0},
-    };
-
-    // Signature infos, indexed by pubkeyhash+hash
-    struct SignatureInfo {
-        Data signature;
-        Data publicKey;
-    };
-    std::map<std::string, SignatureInfo> signatureInfos = {
-        {
-            hex(inPubKeyHash0) + "+" + "a296bead4172007be69b21971a790e076388666c162a9505698415f1b003ebd7",
-            {
-                parse_hex("304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a40"),
-                inPubKey0,
-            }
-        },
-        {
-            hex(inPubKeyHash1) + "+" + "505f527f00e15fcc5a2d2416c9970beb57dfdfaca99e572a01f143b24dd8fab6",
-            {
-                parse_hex("3044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e37966414fe115820220646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e4"),
-                inPubKey1,
-            }
-        },
-        {
-            hex(inPubKeyHash0) + "+" + "60ed6e9371e5ddc72fd88e46a12cb2f68516ebd307c0fd31b1b55cf767272101",
-            {
-                parse_hex("30440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b102207e777f7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc"),
-                inPubKey0,
-            }
-        },
-    };
-
-    const auto coin = TWCoinTypeBitcoin;
-    const auto ownAddress = "bc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z00ppggv";
-
-    // Setup input for Plan
-    Bitcoin::Proto::SigningInput signingInput;
-    signingInput.set_coin_type(coin);
-    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
-    signingInput.set_amount(1'200'000);
-    signingInput.set_use_max_amount(false);
-    signingInput.set_byte_fee(1);
-    signingInput.set_to_address("bc1q2dsdlq3343vk29runkgv4yc292hmq53jedfjmp");
-    signingInput.set_change_address(ownAddress);
-
-    // process UTXOs
-    int count = 0;
-    for (auto& u: utxoInfos) {
-        const auto publicKey = PublicKey(u.publicKey, TWPublicKeyTypeSECP256k1);
-        const auto address = Bitcoin::SegwitAddress(publicKey, "bc");
-        if (count == 0) EXPECT_EQ(address.string(), ownAddress);
-        if (count == 1) EXPECT_EQ(address.string(), ownAddress);
-        if (count == 2) EXPECT_EQ(address.string(), "bc1qveq6hmdvl9yrk7f6lct3s6yue9pqhwcuxedggg");
-
-        const auto utxoScript = Bitcoin::Script::lockScriptForAddress(address.string(), coin);
-        if (count == 0) EXPECT_EQ(hex(utxoScript.bytes), "0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
-        if (count == 1) EXPECT_EQ(hex(utxoScript.bytes), "0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
-        if (count == 2) EXPECT_EQ(hex(utxoScript.bytes), "00146641abedacf9483b793afe1718689cc9420bbb1c");
-
-        Data keyHash;
-        EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
-        if (count == 0) EXPECT_EQ(hex(keyHash), hex(inPubKeyHash0));
-        if (count == 1) EXPECT_EQ(hex(keyHash), hex(inPubKeyHash0));
-        if (count == 2) EXPECT_EQ(hex(keyHash), hex(inPubKeyHash1));
-
-        const auto redeemScript = Bitcoin::Script::buildPayToPublicKeyHash(keyHash);
-        if (count == 0) EXPECT_EQ(hex(redeemScript.bytes), "76a914bd92088bb7e82d611a9b94fbb74a0908152b784f88ac");
-        if (count == 1) EXPECT_EQ(hex(redeemScript.bytes), "76a914bd92088bb7e82d611a9b94fbb74a0908152b784f88ac");
-        if (count == 2) EXPECT_EQ(hex(redeemScript.bytes), "76a9146641abedacf9483b793afe1718689cc9420bbb1c88ac");
-        (*signingInput.mutable_scripts())[hex(keyHash)] = std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
-
-        auto utxo = signingInput.add_utxo();
-        utxo->set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
-        utxo->set_amount(u.amount);
-        utxo->mutable_out_point()->set_hash(std::string(u.revUtxoHash.begin(), u.revUtxoHash.end()));
-        utxo->mutable_out_point()->set_index(u.index);
-        utxo->mutable_out_point()->set_sequence(UINT32_MAX);
-
-        ++count;
-    }
-    EXPECT_EQ(count, 3);
-    EXPECT_EQ(signingInput.utxo_size(), 3);
-
-    // Plan
-    Bitcoin::Proto::TransactionPlan plan;
-    ANY_PLAN(signingInput, plan, coin);
-
-    // Plan is checked, assume it is accepted
-    EXPECT_EQ(plan.amount(), 1'200'000);
-    EXPECT_EQ(plan.fee(), 277);
-    EXPECT_EQ(plan.change(), 299'723);
-    ASSERT_EQ(plan.utxos_size(), 3);
-    // Note that UTXOs happen to be in reverse order compared to the input
-    EXPECT_EQ(hex(plan.utxos(0).out_point().hash()), hex(revUtxoHash2));
-    EXPECT_EQ(hex(plan.utxos(1).out_point().hash()), hex(revUtxoHash1));
-    EXPECT_EQ(hex(plan.utxos(2).out_point().hash()), hex(revUtxoHash0));
-
-    // Extend input with accepted plan
-    *signingInput.mutable_plan() = plan;
-
-    // Serialize input
-    const auto txInputData = data(signingInput.SerializeAsString());
-    EXPECT_EQ((int)txInputData.size(), 692);
-
-    /// Step 2: Obtain preimage hashes
-    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
-    TW::Bitcoin::Proto::PreSigningOutput preSigningOutput;
-    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), (int)preImageHashes.size()));
-
-    ASSERT_EQ(preSigningOutput.error(), 0);
-    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].data_hash()), "505f527f00e15fcc5a2d2416c9970beb57dfdfaca99e572a01f143b24dd8fab6");
-    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[1].data_hash()), "a296bead4172007be69b21971a790e076388666c162a9505698415f1b003ebd7");
-    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[2].data_hash()), "60ed6e9371e5ddc72fd88e46a12cb2f68516ebd307c0fd31b1b55cf767272101");
-    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].public_key_hash()), hex(inPubKeyHash1));
-    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[1].public_key_hash()), hex(inPubKeyHash0));
-    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[2].public_key_hash()), hex(inPubKeyHash0));
-
-    // Simulate signatures, normally obtained from signature server.
-    std::vector<Data> signatureVec;
-    std::vector<Data> pubkeyVec;
-    for (const auto& h: preSigningOutput.hash_public_keys()) {
-        const auto& preImageHash = h.data_hash();
-        const auto& pubkeyhash = h.public_key_hash();
-
-        const std::string key = hex(pubkeyhash) + "+" + hex(preImageHash);
-        const auto sigInfoFind = signatureInfos.find(key);
-        ASSERT_TRUE(sigInfoFind != signatureInfos.end());
-        const auto& sigInfo = std::get<1>(*sigInfoFind);
-        const auto& publicKeyData = sigInfo.publicKey;
-        const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
-        const auto signature = sigInfo.signature;
-
-        signatureVec.push_back(signature);
-        pubkeyVec.push_back(publicKeyData);
-
-        // Verify signature (pubkey & hash & signature)
-        EXPECT_TRUE(publicKey.verifyAsDER(signature, TW::Data(preImageHash.begin(), preImageHash.end())));
-    }
-
-    /// Step 3: Compile transaction info
-    const Data compileWithSignatures = TransactionCompiler::compileWithSignatures(coin, txInputData, signatureVec, pubkeyVec);
-
-    const auto ExpectedTx = "010000000001036021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d0000000000ffffffffd6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e0100000000ffffffff07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa80000000000ffffffff02804f1200000000001600145360df8231ac5965147c9d90ca930a2aafb05232cb92040000000000160014bd92088bb7e82d611a9b94fbb74a0908152b784f02473044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e37966414fe115820220646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e401210217142f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc0247304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a400121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382024730440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b102207e777f7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc0121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb49338200000000";
-    {
-        EXPECT_EQ(compileWithSignatures.size(), 786ul);
-        Bitcoin::Proto::SigningOutput output;
-        ASSERT_TRUE(output.ParseFromArray(compileWithSignatures.data(), (int)compileWithSignatures.size()));
-
-        EXPECT_EQ(output.encoded().size(), 518ul);
-        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
-    }
-
-    { // Double check: check if simple signature process gives the same result. Note that private keys were not used anywhere up to this point.
-        Bitcoin::Proto::SigningInput input;
-        ASSERT_TRUE(input.ParseFromArray(txInputData.data(), (int)txInputData.size()));
-
-        // 2 private keys are needed (despite >2 UTXOs)
-        auto key0 = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
-        auto key1 = parse_hex("7878787878787878787878787878787878787878787878787878787878787878");
-        EXPECT_EQ(hex(PrivateKey(key0).getPublicKey(TWPublicKeyTypeSECP256k1).bytes), hex(inPubKey0));
-        EXPECT_EQ(hex(PrivateKey(key1).getPublicKey(TWPublicKeyTypeSECP256k1).bytes), hex(inPubKey1));
-        *input.add_private_key() = std::string(key0.begin(), key0.end());
-        *input.add_private_key() = std::string(key1.begin(), key1.end());
-
-        Bitcoin::Proto::SigningOutput output;
-        ANY_SIGN(input, coin);
-
-        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
-    }
-
-    {   // Negative: not enough signatures
-        const Data outputData = TransactionCompiler::compileWithSignatures(coin, txInputData, {signatureVec[0]}, pubkeyVec);
-        EXPECT_GT(outputData.size(), 1ul);
-        Bitcoin::Proto::SigningOutput output;
-        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
-        EXPECT_EQ(output.encoded().size(), 0ul);
-        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
-    }
-    {   // Negative: invalid public key
-        const auto publicKeyBlake = parse_hex("b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9");
-        EXPECT_EXCEPTION(TransactionCompiler::compileWithSignatures(coin, txInputData, signatureVec,
-            {pubkeyVec[0], pubkeyVec[1], publicKeyBlake}), "Invalid public key");
-    }
-    {   // Negative: wrong signature (formally valid)
-        const Data outputData = TransactionCompiler::compileWithSignatures(coin, txInputData,
-            {parse_hex("415502201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f3b51"),
-            signatureVec[1], signatureVec[2]},
-            pubkeyVec);
-        EXPECT_EQ(outputData.size(), 2ul);
-        Bitcoin::Proto::SigningOutput output;
-        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
-        EXPECT_EQ(output.encoded().size(), 0ul);
-        EXPECT_EQ(output.error(), Common::Proto::Error_signing);
-    }
-}
-
-TEST(TransactionCompiler, EthereumCompileWithSignatures) {
-    /// Step 1: Prepare transaction input (protobuf)
-    const auto coin = TWCoinTypeEthereum;
-    const auto txInputData0 = TransactionCompiler::buildInput(
-        coin,
-        "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F",  // from
-        "0x3535353535353535353535353535353535353535",  // to
-        "1000000000000000000", // amount
-        "ETH",  // asset
-        "",  // memo
-        ""  // chainId
-    );
-
-    // Check, by parsing
-    EXPECT_EQ((int)txInputData0.size(), 61);
-    Ethereum::Proto::SigningInput signingInput;
-    ASSERT_TRUE(signingInput.ParseFromArray(txInputData0.data(), (int)txInputData0.size()));
-    EXPECT_EQ(hex(signingInput.chain_id()), "01");
-    EXPECT_EQ(signingInput.to_address(), "0x3535353535353535353535353535353535353535");
-    ASSERT_TRUE(signingInput.transaction().has_transfer());
-    EXPECT_EQ(hex(signingInput.transaction().transfer().amount()), "0de0b6b3a7640000");
-
-    // Set a few other values
-    const auto nonce = store(uint256_t(11));
-    const auto gasPrice = store(uint256_t(20000000000));
-    const auto gasLimit = store(uint256_t(21000));
-    signingInput.set_nonce(nonce.data(), nonce.size());
-    signingInput.set_gas_price(gasPrice.data(), gasPrice.size());
-    signingInput.set_gas_limit(gasLimit.data(), gasLimit.size());
-    signingInput.set_tx_mode(Ethereum::Proto::Legacy);
-
-    // Serialize back, this shows how to serialize input protobuf to byte array
-    const auto txInputData = data(signingInput.SerializeAsString());
-    EXPECT_EQ((int)txInputData.size(), 75);
-
-    /// Step 2: Obtain preimage hash
-    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
-    ASSERT_GT(preImageHashes.size(), 0ul);
-
-    TxCompiler::Proto::PreSigningOutput preSigningOutput;
-    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
-    ASSERT_EQ(preSigningOutput.error(), 0);
-
-    auto preImageHash = data(preSigningOutput.data_hash());
-    EXPECT_EQ(hex(preImageHash), "15e180a6274b2f6a572b9b51823fce25ef39576d10188ecdcd7de44526c47217");
-
-    // Simulate signature, normally obtained from signature server
-    const Data publicKeyData = parse_hex("044bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ce28cab79ad7119ee1ad3ebcdb98a16805211530ecc6cfefa1b88e6dff99232a");
-    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1Extended);
-    const auto signature = parse_hex("360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c9796677900");
-
-    // Verify signature (pubkey & hash & signature)
-    {
-        EXPECT_TRUE(publicKey.verify(signature, preImageHash));
-    }
-
-    /// Step 3: Compile transaction info
-    const Data outputData = TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKeyData});
-
-    const auto ExpectedTx = "f86c0b8504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a0360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07ba053bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c97966779";
-    {
-        EXPECT_EQ(outputData.size(), 183ul);
-        Ethereum::Proto::SigningOutput output;
-        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
-
-        EXPECT_EQ(output.encoded().size(), 110ul);
-        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
-    }
-
-    { // Double check: check if simple signature process gives the same result. Note that private keys were not used anywhere up to this point.
-        Ethereum::Proto::SigningInput input;
-        ASSERT_TRUE(input.ParseFromArray(txInputData.data(), (int)txInputData.size()));
-        auto key = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
-        input.set_private_key(key.data(), key.size());
-
-        Ethereum::Proto::SigningOutput output;
-        ANY_SIGN(input, coin);
-
-        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
-    }
-}
-
-TEST(TransactionCompiler, EthereumBuildTransactionInput) {
-    const auto coin = TWCoinTypeEthereum;
-    const auto txInputData0 = TransactionCompiler::buildInput(
-        coin,
-        "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F",  // from
-        "0x3535353535353535353535353535353535353535",  // to
-        "1000000000000000000", // amount
-        "ETH",  // asset
-        "Memo",  // memo
-        "05"  // chainId
-    );
-
-    // Check, by parsing
-    EXPECT_EQ((int)txInputData0.size(), 61);
-    Ethereum::Proto::SigningInput input;
-    ASSERT_TRUE(input.ParseFromArray(txInputData0.data(), (int)txInputData0.size()));
-    EXPECT_EQ(hex(input.chain_id()), "05");
-    EXPECT_EQ(input.to_address(), "0x3535353535353535353535353535353535353535");
-    ASSERT_TRUE(input.transaction().has_transfer());
-    EXPECT_EQ(hex(input.transaction().transfer().amount()), "0de0b6b3a7640000");
-}
-
-TEST(TransactionCompiler, EthereumBuildTransactionInputInvalidAddress) {
-    const auto coin = TWCoinTypeEthereum;
-    EXPECT_EXCEPTION(TransactionCompiler::buildInput(
-        coin,
-        "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F",  // from
-        "__INVALID_ADDRESS__",  // to
-        "1000000000000000000", // amount
-        "ETH",  // asset
-        "",  // memo
-        ""  // chainId
-    ), "Invalid to address");
-}
diff --git a/tests/Tron/AddressTests.cpp b/tests/Tron/AddressTests.cpp
deleted file mode 100644
index 8d160ecc856..00000000000
--- a/tests/Tron/AddressTests.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Tron/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Tron {
-
-TEST(TronAddress, FromPrivateKey) {
-    const auto privateKey =  PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
-    const auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-}
-
-TEST(TronAddress, FromPublicKey) {
-    const auto privateKey = PrivateKey(parse_hex("BE88DF1D0BF30A923CB39C3BB953178BAAF3726E8D3CE81E7C8462E046E0D835"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
-    const auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "THRF3GuPnvvPzKoaT8pJex5XHmo8NNbCb3");
-}
-
-TEST(TronAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid(std::string("abc")));
-    ASSERT_FALSE(Address::isValid(std::string("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed")));
-    ASSERT_FALSE(Address::isValid(std::string("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")));
-}
-
-TEST(TronAddress, InitWithString) {
-    const auto address = Address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-
-    ASSERT_EQ(address.string(), "TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-}
-
-} // namespace TW::Tron
diff --git a/tests/Tron/SerializationTests.cpp b/tests/Tron/SerializationTests.cpp
deleted file mode 100644
index a32b5799172..00000000000
--- a/tests/Tron/SerializationTests.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "proto/Tron.pb.h"
-#include "Tron/Signer.h"
-#include "PrivateKey.h"
-#include "HexCoding.h"
-#include "uint256.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Tron {
-    TEST(TronSerialization, TransferAsset) {
-        auto input = Proto::SigningInput();
-        auto& transaction = *input.mutable_transaction();
-
-        auto& transfer = *transaction.mutable_transfer_asset();
-        transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-        transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-        transfer.set_amount(4);
-        transfer.set_asset_name("1000959");
-
-        transaction.set_timestamp(1539295479000);
-        transaction.set_expiration(1541890116000 + 10 * 60 * 60 * 1000);
-
-        auto& blockHeader = *transaction.mutable_block_header();
-        blockHeader.set_timestamp(1541890116000);
-        const auto txTrieRoot = parse_hex("845ab51bf63c2c21ee71a4dc0ac3781619f07a7cd05e1e0bd8ba828979332ffa");
-        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-        const auto parentHash = parse_hex("00000000003cb800a7e69e9144e3d16f0cf33f33a95c7ce274097822c67243c1");
-        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-        blockHeader.set_number(3979265);
-        const auto witnessAddress = parse_hex("41b487cdc02de90f15ac89a68c82f44cbfe3d915ea");
-        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-        blockHeader.set_version(3);
-
-        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-        const auto output = Signer::sign(input);
-
-        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.TransferAssetContract","value":{"amount":4,"asset_name":"31303030393539","owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db","to_address":"41521ea197907927725ef36d70f25f850d1659c7c7"}},"type":"TransferAssetContract"}],"expiration":1541926116000,"ref_block_bytes":"b801","ref_block_hash":"0e2bc08d550f5f58","timestamp":1539295479000},"signature":["77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00"],"txID":"546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb"})");
-    }
-
-    TEST(TronSerialization, SignVoteAsset) {
-        auto input = Proto::SigningInput();
-        auto& transaction = *input.mutable_transaction();
-
-        auto& vote = *transaction.mutable_vote_asset();
-        vote.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-        vote.add_vote_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-        vote.set_support(true);
-        vote.set_count(1);
-
-        transaction.set_timestamp(1539295479000);
-        transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-        auto& blockHeader = *transaction.mutable_block_header();
-        blockHeader.set_timestamp(1539295479000);
-        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-        blockHeader.set_number(3111739);
-        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-        blockHeader.set_version(3);
-
-        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-        const auto output = Signer::sign(input);
-
-        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.VoteAssetContract","value":{"count":1,"owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db","support":true,"vote_address":["41521ea197907927725ef36d70f25f850d1659c7c7"]}},"type":"VoteAssetContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["501e04b08f359116a26d9ec784abc50830f92a9dc05d2c1aceefe0eba79466d2730b63b6739edf0f1f1972181618b201ce0b4167d14a66abf40eba4097c39ec400"],"txID":"59b5736fb9756124f9470e4fadbcdafdc8c970da7157fa0ad34a41559418bf0a"})");
-    }
-
-    TEST(TronSerialization, SignVoteWitness) {
-        auto input = Proto::SigningInput();
-        auto& transaction = *input.mutable_transaction();
-
-        auto& vote_witness = *transaction.mutable_vote_witness();
-        vote_witness.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-        vote_witness.set_support(true);
-
-        auto& vote = *vote_witness.add_votes();
-        vote.set_vote_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-        vote.set_vote_count(3);
-
-        transaction.set_timestamp(1539295479000);
-        transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-        auto& blockHeader = *transaction.mutable_block_header();
-        blockHeader.set_timestamp(1539295479000);
-        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-        blockHeader.set_number(3111739);
-        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-        blockHeader.set_version(3);
-
-        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-        const auto output = Signer::sign(input);
-
-        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.VoteWitnessContract","value":{"owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db","support":true,"votes":[{"vote_address":"41521ea197907927725ef36d70f25f850d1659c7c7","vote_count":3}]}},"type":"VoteWitnessContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["79ec1073ae1319ef9303a2f5a515876cfd67f8f0e155bdbde1115d391c05358a3c32f148bfafacf07e1619aaed728d9ffbc2c7e4a5046003c7b74feb86fc68e400"],"txID":"3f923e9dd9571a66624fafeda27baa3e00aba1709d3fdc5c97c77b81fda18c1f"})");
-    }
-
-    TEST(TronSerialization, SignTriggerSmartContract) {
-        auto input = Proto::SigningInput();
-        auto data = parse_hex("736f6d652064617461");
-        auto& transaction = *input.mutable_transaction();
-        auto& trigger_contract = *transaction.mutable_trigger_smart_contract();
-        trigger_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-        trigger_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-        trigger_contract.set_call_value(0);
-        trigger_contract.set_call_token_value(10000);
-        trigger_contract.set_token_id(1);
-        trigger_contract.set_data(data.data(), data.size());
-
-        transaction.set_timestamp(1539295479000);
-        transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-        auto& blockHeader = *transaction.mutable_block_header();
-        blockHeader.set_timestamp(1539295479000);
-        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-        blockHeader.set_number(3111739);
-        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-        blockHeader.set_version(3);
-
-        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-        const auto output = Signer::sign(input);
-
-        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.TriggerSmartContract","value":{"call_token_value":10000,"contract_address":"41521ea197907927725ef36d70f25f850d1659c7c7","data":"736f6d652064617461","owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db","token_id":1}},"type":"TriggerSmartContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["21a99aafeabdddfdfae86538df048d120a83eb36bbcf5656595919ba6afddacd0a07d0ba051ae80337613174b109f36cb583b6e46ee5aecf6ffe3392fdbb8a2a01"],"txID":"9927d3daae10ad001b25ef3c1bb03073c928cc0e0823f6f3ce404c2b03ce3570"})");
-    }
-
-    TEST(TronSerialization, SignTransferTrc20Contract) {
-        auto input = Proto::SigningInput();
-        auto& transaction = *input.mutable_transaction();
-        auto& transfer_contract = *transaction.mutable_transfer_trc20_contract();
-        transfer_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-        transfer_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-        transfer_contract.set_to_address("TW1dU4L3eNm7Lw8WvieLKEHpXWAussRG9Z");
-        Data amount = store(uint256_t(1000));
-        transfer_contract.set_amount(std::string(amount.begin(), amount.end()));
-
-        transaction.set_timestamp(1539295479000);
-
-        auto& blockHeader = *transaction.mutable_block_header();
-        blockHeader.set_timestamp(1539295479000);
-        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-        blockHeader.set_number(3111739);
-        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-        blockHeader.set_version(3);
-
-        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-        const auto output = Signer::sign(input);
-
-        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.TriggerSmartContract","value":{"contract_address":"41521ea197907927725ef36d70f25f850d1659c7c7","data":"a9059cbb000000000000000000000041dbd7c53729b3310e1843083000fa84abad99696100000000000000000000000000000000000000000000000000000000000003e8","owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db"}},"type":"TriggerSmartContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["bec790877b3a008640781e3948b070740b1f6023c29ecb3f7b5835433c13fc5835e5cad3bd44360ff2ddad5ed7dc9d7dee6878f90e86a40355b7697f5954b88c01"],"txID":"0d644290e3cf554f6219c7747f5287589b6e7e30e1b02793b48ba362da6a5058"})");
-    }
-
-    TEST(TronSerialization, SignTransferTrc20Contract_LargeAmount) {
-        auto input = Proto::SigningInput();
-        auto& transaction = *input.mutable_transaction();
-        auto& transfer_contract = *transaction.mutable_transfer_trc20_contract();
-        transfer_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-        transfer_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-        transfer_contract.set_to_address("TW1dU4L3eNm7Lw8WvieLKEHpXWAussRG9Z");
-        Data amount = store(uint256_t("10000000000000000000000")); // over 64 bits, corresponds to 10000 in case of 18 decimals
-        transfer_contract.set_amount(std::string(amount.begin(), amount.end()));
-
-        transaction.set_timestamp(1539295479000);
-
-        auto& blockHeader = *transaction.mutable_block_header();
-        blockHeader.set_timestamp(1539295479000);
-        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-        blockHeader.set_number(3111739);
-        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-        blockHeader.set_version(3);
-
-        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-        const auto output = Signer::sign(input);
-
-        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.TriggerSmartContract","value":{"contract_address":"41521ea197907927725ef36d70f25f850d1659c7c7","data":"a9059cbb000000000000000000000041dbd7c53729b3310e1843083000fa84abad99696100000000000000000000000000000000000000000000021e19e0c9bab2400000","owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db"}},"type":"TriggerSmartContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["8207cbae6aff799cfefa1ab4d8a0c52b6a59be43491bd25b4f03754f0e8115b006b5f1393a3934ec3489f5d3c272a7af42658bdc165dc632b36114bd3180da2e00"],"txID":"774422d8d205760876496f22b7d4395cfceda03f139b8362a3693f1f405f0c36"})");
-    }
-}
diff --git a/tests/Tron/SignerTests.cpp b/tests/Tron/SignerTests.cpp
deleted file mode 100644
index 69dc5c37cb5..00000000000
--- a/tests/Tron/SignerTests.cpp
+++ /dev/null
@@ -1,343 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Bitcoin/Address.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "uint256.h"
-#include "proto/Tron.pb.h"
-#include "Tron/Signer.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Tron {
-
-TEST(TronSigner, SignTransferAsset) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& transfer = *transaction.mutable_transfer_asset();
-    transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    transfer.set_amount(4);
-    transfer.set_asset_name("1000959");
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1541890116000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1541890116000);
-    const auto txTrieRoot = parse_hex("845ab51bf63c2c21ee71a4dc0ac3781619f07a7cd05e1e0bd8ba828979332ffa");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000003cb800a7e69e9144e3d16f0cf33f33a95c7ce274097822c67243c1");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3979265);
-    const auto witnessAddress = parse_hex("41b487cdc02de90f15ac89a68c82f44cbfe3d915ea");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb");
-    ASSERT_EQ(hex(output.signature()), "77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00");
-}
-
-TEST(TronSigner, SignTransfer) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& transfer = *transaction.mutable_transfer();
-    transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    transfer.set_amount(2000000);
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "dc6f6d9325ee44ab3c00528472be16e1572ab076aa161ccd12515029869d0451");
-    ASSERT_EQ(hex(output.signature()), "ede769f6df28aefe6a846be169958c155e23e7e5c9621d2e8dce1719b4d952b63e8a8bf9f00e41204ac1bf69b1a663dacdf764367e48e4a5afcd6b055a747fb200");
-}
-
-TEST(TronSigner, SignFreezeBalance) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& freeze = *transaction.mutable_freeze_balance();
-    freeze.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    freeze.set_receiver_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    freeze.set_frozen_duration(1000000);
-    freeze.set_frozen_duration(100);
-    freeze.set_resource("ENERGY");
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "d314967bc1d153d649d9f54a1cc78033f0d696a58ff6922f490ddaec82558c83");
-    ASSERT_EQ(hex(output.signature()), "aa7cf79fb1692ff432a1a3e520be3355c3e8168c5fa22f6e3b96c2a9f2e2827b49d67d5e6eea5c7e7cf872047d422ce5d4d149c4df752b176d13f8f48920271201");
-}
-
-TEST(TronSigner, SignUnFreezeBalance) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& unfreeze = *transaction.mutable_unfreeze_balance();
-    unfreeze.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    unfreeze.set_receiver_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    unfreeze.set_resource("ENERGY");
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "c5bd624bb53fed8ce4a7361475263b3a91ae71ef389630e0b3b8693c8c56d7a1");
-    ASSERT_EQ(hex(output.signature()), "4b4b12b5fd091d5343335f14ac90bf23ea9a8167d648dd9d10d00c9c9b24731c484937bf133e5010f0338fb70a679a9a2eca8b945574005bc4015b419a68897300");
-}
-
-TEST(TronSigner, SignUnFreezeAsset) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& unfreeze = *transaction.mutable_unfreeze_asset();
-    unfreeze.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "432bd5cf77ff134787712724709a672fc6e51763de00292438db02d23931e13d");
-    ASSERT_EQ(hex(output.signature()), "f493d8f275538a50bb8a832d759df9cad535bb2c5cc73296b04983f551d8398b6d7a30fc0fdfd73e8a9cac77a1a6a9435dc6309bb98fbb219035e88809a0b65901");
-}
-
-TEST(TronSigner, SignWithdrawBalance) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& unfreeze = *transaction.mutable_withdraw_balance();
-    unfreeze.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "69aaa954dcd61f28a6a73e979addece6e36541522e5b3374b18b4ef9bc3de4cb");
-    ASSERT_EQ(hex(output.signature()), "cb7d23a5eb23284a25ba6deaa231de0f18d8d103592e3312bff101a4219a3e02167eca24b3f4ce78b34f0c1842b6f7fb8d813f530c4c54342cdedef9f8e1f85100");
-}
-
-TEST(TronSigner, SignVoteAsset) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& vote = *transaction.mutable_vote_asset();
-    vote.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    vote.add_vote_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    vote.set_support(true);
-    vote.set_count(1);
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "59b5736fb9756124f9470e4fadbcdafdc8c970da7157fa0ad34a41559418bf0a");
-    ASSERT_EQ(hex(output.signature()), "501e04b08f359116a26d9ec784abc50830f92a9dc05d2c1aceefe0eba79466d2730b63b6739edf0f1f1972181618b201ce0b4167d14a66abf40eba4097c39ec400");
-}
-
-TEST(TronSigner, SignVoteWitness) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& vote_witness = *transaction.mutable_vote_witness();
-    vote_witness.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    vote_witness.set_support(true);
-
-    auto& vote = *vote_witness.add_votes();
-    vote.set_vote_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    vote.set_vote_count(3);
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "3f923e9dd9571a66624fafeda27baa3e00aba1709d3fdc5c97c77b81fda18c1f");
-    ASSERT_EQ(hex(output.signature()), "79ec1073ae1319ef9303a2f5a515876cfd67f8f0e155bdbde1115d391c05358a3c32f148bfafacf07e1619aaed728d9ffbc2c7e4a5046003c7b74feb86fc68e400");
-}
-
-TEST(TronSigner, SignTriggerSmartContract) {
-    auto input = Proto::SigningInput();
-    auto data = parse_hex("736f6d652064617461");
-    auto& transaction = *input.mutable_transaction();
-    auto& trigger_contract = *transaction.mutable_trigger_smart_contract();
-    trigger_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    trigger_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    trigger_contract.set_call_value(0);
-    trigger_contract.set_call_token_value(10000);
-    trigger_contract.set_token_id(1);
-    trigger_contract.set_data(data.data(), data.size());
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "9927d3daae10ad001b25ef3c1bb03073c928cc0e0823f6f3ce404c2b03ce3570");
-    ASSERT_EQ(hex(output.signature()), "21a99aafeabdddfdfae86538df048d120a83eb36bbcf5656595919ba6afddacd0a07d0ba051ae80337613174b109f36cb583b6e46ee5aecf6ffe3392fdbb8a2a01");
-}
-
-TEST(TronSigner, SignTransferTrc20Contract) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-    auto& transfer_contract = *transaction.mutable_transfer_trc20_contract();
-    transfer_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    transfer_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    transfer_contract.set_to_address("TW1dU4L3eNm7Lw8WvieLKEHpXWAussRG9Z");
-    Data amount = store(uint256_t(1000));
-    transfer_contract.set_amount(std::string(amount.begin(), amount.end()));
-
-    transaction.set_timestamp(1539295479000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1539295479000);
-    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3111739);
-    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    const auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.id()), "0d644290e3cf554f6219c7747f5287589b6e7e30e1b02793b48ba362da6a5058");
-    ASSERT_EQ(hex(output.signature()), "bec790877b3a008640781e3948b070740b1f6023c29ecb3f7b5835433c13fc5835e5cad3bd44360ff2ddad5ed7dc9d7dee6878f90e86a40355b7697f5954b88c01");
-}
-} // namespace TW::Tron
diff --git a/tests/Tron/TWAnySignerTests.cpp b/tests/Tron/TWAnySignerTests.cpp
deleted file mode 100644
index 0dc27c18583..00000000000
--- a/tests/Tron/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/Tron.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-namespace TW::Tron {
-
-TEST(TWAnySignerTron, SignTransferAsset) {
-    auto input = Proto::SigningInput();
-    auto& transaction = *input.mutable_transaction();
-
-    auto& transfer = *transaction.mutable_transfer_asset();
-    transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
-    transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
-    transfer.set_amount(4);
-    transfer.set_asset_name("1000959");
-
-    transaction.set_timestamp(1539295479000);
-    transaction.set_expiration(1541890116000 + 10 * 60 * 60 * 1000);
-
-    auto& blockHeader = *transaction.mutable_block_header();
-    blockHeader.set_timestamp(1541890116000);
-    const auto txTrieRoot = parse_hex("845ab51bf63c2c21ee71a4dc0ac3781619f07a7cd05e1e0bd8ba828979332ffa");
-    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
-    const auto parentHash = parse_hex("00000000003cb800a7e69e9144e3d16f0cf33f33a95c7ce274097822c67243c1");
-    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
-    blockHeader.set_number(3979265);
-    const auto witnessAddress = parse_hex("41b487cdc02de90f15ac89a68c82f44cbfe3d915ea");
-    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
-    blockHeader.set_version(3);
-
-    const auto privateKey = parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54");
-    input.set_private_key(privateKey.data(), privateKey.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeTron);
-
-    ASSERT_EQ(hex(output.signature()), "77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00");
-}
-
-}
diff --git a/tests/Tron/TWCoinTypeTests.cpp b/tests/Tron/TWCoinTypeTests.cpp
deleted file mode 100644
index e496477156e..00000000000
--- a/tests/Tron/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWTronCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTron));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTron, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTron, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTron));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTron));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTron), 6);
-    ASSERT_EQ(TWBlockchainTron, TWCoinTypeBlockchain(TWCoinTypeTron));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTron));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTron));
-    assertStringsEqual(symbol, "TRX");
-    assertStringsEqual(txUrl, "https://tronscan.org/#/transaction/t123");
-    assertStringsEqual(accUrl, "https://tronscan.org/#/address/a12");
-    assertStringsEqual(id, "tron");
-    assertStringsEqual(name, "Tron");
-}
diff --git a/tests/VeChain/SignerTests.cpp b/tests/VeChain/SignerTests.cpp
deleted file mode 100644
index 71ab6ccef4b..00000000000
--- a/tests/VeChain/SignerTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "VeChain/Signer.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::VeChain {
-
-using boost::multiprecision::uint256_t;
-
-TEST(Signer, Sign) {
-    auto transaction = Transaction();
-    transaction.chainTag = 1;
-    transaction.blockRef = 1;
-    transaction.expiration = 1;
-    transaction.clauses.push_back(
-        Clause(Ethereum::Address("0x3535353535353535353535353535353535353535"), 1000, {})
-    );
-    transaction.gasPriceCoef = 0;
-    transaction.gas = 21000;
-    transaction.nonce = 1;
-
-    auto key = PrivateKey(parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646"));
-    auto signature = Signer::sign(key, transaction);
-
-    ASSERT_EQ(hex(signature), "3181b1094150f8e4f51f370b805cc9c5b107504145b9e316e846d5e5dbeedb5c1c2b5d217f197a105983dfaad6a198414d5731c7447493cb6b5169907d73dbe101");
-}
-
-} // namespace TW::VeChain
diff --git a/tests/VeChain/TWAnySignerTests.cpp b/tests/VeChain/TWAnySignerTests.cpp
deleted file mode 100644
index 783ecf827b6..00000000000
--- a/tests/VeChain/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/VeChain.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <gtest/gtest.h>
-
-namespace TW::VeChain::tests {
-
-TEST(TWAnySignerVeChain, Sign) {
-    auto input = Proto::SigningInput();
-
-    input.set_chain_tag(1);
-    input.set_block_ref(1);
-    input.set_expiration(1);
-    input.set_gas_price_coef(0);
-    input.set_gas(21000);
-    input.set_nonce(1);
-
-    auto key = parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
-    input.set_private_key(key.data(), key.size());
-
-    auto& clause = *input.add_clauses();
-    auto amount = parse_hex("31303030"); // 1000
-    clause.set_to("0x3535353535353535353535353535353535353535");
-    clause.set_value(amount.data(), amount.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeVeChain);
-
-    ASSERT_EQ(hex(output.encoded()), "f86a010101dcdb943535353535353535353535353535353535353535843130303080808252088001c0b841bf8edf9600e645b5abd677cb52f585e7f655d1361075d511b37f707a9f31da6702d28739933b264527a1d05b046f5b74044b88c30c3f5a09d616bd7a4af4901601");
-}
-
-} // namespace TW::VeChain::tests
diff --git a/tests/VeChain/TWCoinTypeTests.cpp b/tests/VeChain/TWCoinTypeTests.cpp
deleted file mode 100644
index cf41c6cba08..00000000000
--- a/tests/VeChain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWVeChainCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeVeChain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xa424053be0063555aee73a595ca69968c2e4d90d36f280753e503b92b11a655d"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeVeChain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x8a0a035a33173601bfbec8b6ae7c4a6557a55103"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeVeChain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeVeChain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeVeChain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeVeChain), 18);
-    ASSERT_EQ(TWBlockchainVechain, TWCoinTypeBlockchain(TWCoinTypeVeChain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeVeChain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeVeChain));
-    assertStringsEqual(symbol, "VET");
-    assertStringsEqual(txUrl, "https://explore.vechain.org/transactions/0xa424053be0063555aee73a595ca69968c2e4d90d36f280753e503b92b11a655d");
-    assertStringsEqual(accUrl, "https://explore.vechain.org/accounts/0x8a0a035a33173601bfbec8b6ae7c4a6557a55103");
-    assertStringsEqual(id, "vechain");
-    assertStringsEqual(name, "VeChain");
-}
diff --git a/tests/Viacoin/TWCoinTypeTests.cpp b/tests/Viacoin/TWCoinTypeTests.cpp
deleted file mode 100644
index 15ead27fdc1..00000000000
--- a/tests/Viacoin/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWViacoinCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeViacoin));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeViacoin, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeViacoin, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeViacoin));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeViacoin));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeViacoin), 8);
-    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeViacoin));
-    ASSERT_EQ(0x21, TWCoinTypeP2shPrefix(TWCoinTypeViacoin));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeViacoin));
-    assertStringsEqual(symbol, "VIA");
-    assertStringsEqual(txUrl, "https://explorer.viacoin.org/tx/t123");
-    assertStringsEqual(accUrl, "https://explorer.viacoin.org/address/a12");
-    assertStringsEqual(id, "viacoin");
-    assertStringsEqual(name, "Viacoin");
-}
diff --git a/tests/Wanchain/TWCoinTypeTests.cpp b/tests/Wanchain/TWCoinTypeTests.cpp
deleted file mode 100644
index f3ba2ce8ee7..00000000000
--- a/tests/Wanchain/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWWanchainCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeWanchain));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x180ea96a3218b82b9b35d796823266d8a425c182507adfe5eeffc96e6a14d856"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeWanchain, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x69B492D57bb777e97aa7044D0575228434e2E8B1"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeWanchain, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeWanchain));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeWanchain));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeWanchain), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeWanchain));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeWanchain));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeWanchain));
-    assertStringsEqual(symbol, "WAN");
-    assertStringsEqual(txUrl, "https://www.wanscan.org/tx/0x180ea96a3218b82b9b35d796823266d8a425c182507adfe5eeffc96e6a14d856");
-    assertStringsEqual(accUrl, "https://www.wanscan.org/address/0x69B492D57bb777e97aa7044D0575228434e2E8B1");
-    assertStringsEqual(id, "wanchain");
-    assertStringsEqual(name, "Wanchain");
-}
diff --git a/tests/Waves/AddressTests.cpp b/tests/Waves/AddressTests.cpp
deleted file mode 100644
index 1e99f576d1e..00000000000
--- a/tests/Waves/AddressTests.cpp
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Waves/Address.h"
-
-#include <Coin.h>
-#include <HDWallet.h>
-#include <gtest/gtest.h>
-
-using namespace std;
-using namespace TW;
-
-namespace TW::Waves::tests {
-
-TEST(WavesAddress, SecureHash) {
-    const auto secureHash =
-        hex(Address::secureHash(parse_hex("0157c7fefc0c6acc54e9e4354a81ac1f038e01745731")));
-
-    ASSERT_EQ(secureHash, "a7978a753c6496866dc75ba3abcaaec796f2380037a1fa7c46cbf9762ee380df");
-}
-
-TEST(WavesAddress, FromPrivateKey) {
-    const auto privateKey =
-        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
-    const auto publicKeyEd25519 = privateKey.getPublicKey(TWPublicKeyTypeED25519);
-    ASSERT_EQ(hex(Data(publicKeyEd25519.bytes.begin(), publicKeyEd25519.bytes.end())),
-              "ff84c4bfc095df25b01e48807715856d95af93d88c5b57f30cb0ce567ca4ced6");
-    const auto publicKeyCurve25519 = privateKey.getPublicKey(TWPublicKeyTypeCURVE25519);
-    ASSERT_EQ(hex(Data(publicKeyCurve25519.bytes.begin(), publicKeyCurve25519.bytes.end())),
-              "559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
-    const auto address = Address(publicKeyCurve25519);
-
-    ASSERT_EQ(address.string(), "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds");
-}
-
-TEST(WavesAddress, FromPublicKey) {
-    const auto publicKey =
-        PublicKey(parse_hex("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d"),
-                  TWPublicKeyTypeCURVE25519);
-    const auto address = Address(publicKey);
-
-    ASSERT_EQ(address.string(), "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds");
-}
-
-TEST(WavesAddress, Invalid) {
-    ASSERT_FALSE(Address::isValid(std::string("abc")));
-    ASSERT_FALSE(Address::isValid(std::string("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed")));
-    ASSERT_FALSE(Address::isValid(std::string("3PLANf4MgtNN5v5k4NNnyx2m4zKJiw1tF9v")));
-    ASSERT_FALSE(Address::isValid(std::string("3PLANf4MgtNN5v6k4NNnyx2m4zKJiw1tF8v")));
-}
-
-TEST(WavesAddress, Valid) {
-    ASSERT_TRUE(Address::isValid(std::string("3PLANf4MgtNN5v6k4NNnyx2m4zKJiw1tF9v")));
-    ASSERT_TRUE(Address::isValid(std::string("3PDjjLFDR5aWkKgufika7KSLnGmAe8ueDpC")));
-    ASSERT_TRUE(Address::isValid(std::string("3PLjucTjqEfmgBF7fs2CER3fHQapCtknPeW")));
-    ASSERT_TRUE(Address::isValid(std::string("3PB9ffP1YKQer3e7t283gPCLyjEfK8xrGp7")));
-}
-
-TEST(WavesAddress, InitWithString) {
-    const auto address = Address("3PQupTC1yRiHneotFt79LF2pkN6GrGMwEy3");
-    ASSERT_EQ(address.string(), "3PQupTC1yRiHneotFt79LF2pkN6GrGMwEy3");
-}
-
-TEST(WavesAddress, InitWithInvalidString) {
-    EXPECT_THROW(Address("3PQupTC1yRiHneotFt79LF2pkN6GrGMwEy2"), invalid_argument);
-}
-
-TEST(WavesAddress, Derive) {
-    const auto mnemonic =
-        "water process satisfy repeat flag avoid town badge sketch surge split between cabin sugar "
-        "ill special axis adjust pull useful craft peace flee physical";
-    const auto wallet = HDWallet(mnemonic, "");
-    const auto address1 = TW::deriveAddress(
-        TWCoinTypeWaves, wallet.getKey(TWCoinTypeWaves, DerivationPath("m/44'/5741564'/0'/0'/0'")));
-    const auto address2 = TW::deriveAddress(
-        TWCoinTypeWaves, wallet.getKey(TWCoinTypeWaves, DerivationPath("m/44'/5741564'/0'/0'/1'")));
-
-    ASSERT_EQ(address1, "3PQupTC1yRiHneotFt79LF2pkN6GrGMwEy3");
-    ASSERT_EQ(address2, "3PEXw52bkS9XuLhttWoKyykZjXqEY8zeLxf");
-}
-
-} // namespace TW::Waves::tests
diff --git a/tests/Waves/SignerTests.cpp b/tests/Waves/SignerTests.cpp
deleted file mode 100644
index 95938c16d39..00000000000
--- a/tests/Waves/SignerTests.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PublicKey.h"
-#include "Waves/Signer.h"
-#include "Waves/Transaction.h"
-
-#include <TrezorCrypto/sodium/keypair.h>
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Waves::tests {
-
-TEST(WavesSigner, SignTransaction) {
-    const auto privateKey =
-        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
-    const auto publicKeyCurve25519 = privateKey.getPublicKey(TWPublicKeyTypeCURVE25519);
-    ASSERT_EQ(hex(Data(publicKeyCurve25519.bytes.begin(), publicKeyCurve25519.bytes.end())),
-              "559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
-    // 3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds
-    const auto address = Address(publicKeyCurve25519);
-    auto input = Proto::SigningInput();
-    input.set_timestamp(int64_t(1526641218066));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-    
-    auto& message = *input.mutable_transfer_message();
-    message.set_amount(int64_t(100000000));
-    message.set_asset(Transaction::WAVES);
-    message.set_fee(int64_t(100000000));
-    message.set_fee_asset(Transaction::WAVES);
-    message.set_to(address.string());
-    message.set_attachment("falafel");
-    auto tx1 = Transaction(
-                           input,
-                           /* pub_key */
-                           parse_hex("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d"));
-
-    auto signature = Signer::sign(privateKey, tx1);
-
-    EXPECT_EQ(hex(tx1.serializeToSign()),
-              "0402559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d00000000016372e8"
-              "52120000000005f5e1000000000005f5e10001570acc4110b78a6d38b34d879b5bba38806202ecf1732f"
-              "8542000766616c6166656c");
-    EXPECT_EQ(hex(signature), "af7989256f496e103ce95096b3f52196dd9132e044905fe486da3b829b5e403bcba9"
-                              "5ab7e650a4a33948c2d05cfca2dce4d4df747e26402974490fb4c49fbe8f");
-
-    ASSERT_TRUE(publicKeyCurve25519.verify(signature, tx1.serializeToSign()));
-}
-
-TEST(WavesSigner, curve25519_pk_to_ed25519) {
-    const auto publicKeyCurve25519 =
-        parse_hex("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
-    auto r = Data();
-    r.resize(32);
-    curve25519_pk_to_ed25519(r.data(), publicKeyCurve25519.data());
-    EXPECT_EQ(hex(r), "ff84c4bfc095df25b01e48807715856d95af93d88c5b57f30cb0ce567ca4ce56");
-}
-
-} // namespace TW::Waves::tests
diff --git a/tests/Waves/TWAnySignerTests.cpp b/tests/Waves/TWAnySignerTests.cpp
deleted file mode 100644
index bc57276977e..00000000000
--- a/tests/Waves/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Base58.h"
-#include "HexCoding.h"
-#include "proto/Waves.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <gtest/gtest.h>
-
-namespace TW::Waves::tests {
-
-TEST(TWAnySignerWaves, Sign) {
-    auto input = Proto::SigningInput();
-    const auto privateKey = Base58::bitcoin.decode("83mqJpmgB5Mko1567sVAdqZxVKsT6jccXt3eFSi4G1zE");
-
-    input.set_timestamp(int64_t(1559146613));
-    input.set_private_key(privateKey.data(), privateKey.size());
-    auto& message = *input.mutable_transfer_message();
-    message.set_amount(int64_t(100000000));
-    message.set_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
-    message.set_fee(int64_t(100000));
-    message.set_fee_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
-    message.set_to("3PPCZQkvdMJpmx7Zrz1cnYsPe9Bt1XT2Ckx");
-    message.set_attachment("hello");
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeWaves);
-
-    ASSERT_EQ(hex(output.signature()), "5d6a77b1fd9b53d9735cd2543ba94215664f2b07d6c7befb081221fcd49f5b6ad6b9ac108582e8d3e74943bdf35fd80d985edf4b4de1fb1c5c427e84d0879f8f");
-}
-
-} // namespace TW::Waves::tests
diff --git a/tests/Waves/TWCoinTypeTests.cpp b/tests/Waves/TWCoinTypeTests.cpp
deleted file mode 100644
index b9043540b04..00000000000
--- a/tests/Waves/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWWavesCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeWaves));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeWaves, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeWaves, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeWaves));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeWaves));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeWaves), 8);
-    ASSERT_EQ(TWBlockchainWaves, TWCoinTypeBlockchain(TWCoinTypeWaves));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeWaves));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeWaves));
-    assertStringsEqual(symbol, "WAVES");
-    assertStringsEqual(txUrl, "https://wavesexplorer.com/tx/t123");
-    assertStringsEqual(accUrl, "https://wavesexplorer.com/address/a12");
-    assertStringsEqual(id, "waves");
-    assertStringsEqual(name, "Waves");
-}
diff --git a/tests/Waves/TransactionTests.cpp b/tests/Waves/TransactionTests.cpp
deleted file mode 100644
index 1e2f1354d8b..00000000000
--- a/tests/Waves/TransactionTests.cpp
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-#include "Waves/Address.h"
-#include "proto/Waves.pb.h"
-#include "Waves/Transaction.h"
-
-#include <Waves/Signer.h>
-#include <gtest/gtest.h>
-
-namespace TW::Waves::tests {
-
-using json = nlohmann::json;
-using namespace std;
-
-TEST(WavesTransaction, serialize) {
-    const auto privateKey =
-        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
-    auto input = Proto::SigningInput();
-    input.set_timestamp(int64_t(1526641218066));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    auto& message = *input.mutable_transfer_message();
-    message.set_amount(int64_t(100000000));
-    message.set_asset("");
-    message.set_fee(int64_t(100000000));
-    message.set_fee_asset(Transaction::WAVES);
-    message.set_to("3PLgzJXQiN77G7KgnR1WVa8jBYhF2dmWndx");
-    message.set_attachment("falafel");
-    auto tx1 = Transaction(
-        input,
-        /* pub_key */
-        parse_hex("d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef22"));
-    auto serialized1 = tx1.serializeToSign();
-    ASSERT_EQ(hex(serialized1), "0402d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef"
-                                "2200000000016372e852120000000005f5e1000000000005f5e1000157cdc9381c"
-                                "071beb5abd27738d5cd36cf75f3cbfdd69e8e6bb000766616c6166656c");
-
-    auto input2 = Proto::SigningInput();
-    input2.set_timestamp(int64_t(1));
-    input2.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    auto& message2 = *input2.mutable_transfer_message();
-    message2.set_amount(int64_t(1));
-    message2.set_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
-    message2.set_fee(int64_t(1));
-    message2.set_fee_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
-    message2.set_to("3PLgzJXQiN77G7KgnR1WVa8jBYhF2dmWndx");
-    message2.set_attachment("");
-
-    auto tx2 = Transaction(
-        input2,
-        /* pub_key */
-        parse_hex("d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef22"));
-    auto serialized2 = tx2.serializeToSign();
-    ASSERT_EQ(hex(serialized2),
-              "0402d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef2201bae8ddc9955fa6"
-              "f69f8e7b155efcdb97bc3bb3a95db4c4604408cec245cd187201bae8ddc9955fa6f69f8e7b155efcdb97"
-              "bc3bb3a95db4c4604408cec245cd18720000000000000001000000000000000100000000000000010157"
-              "cdc9381c071beb5abd27738d5cd36cf75f3cbfdd69e8e6bb0000");
-}
-
-TEST(WavesTransaction, failedSerialize) {
-    // 141 bytes attachment
-    const auto privateKey =
-        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
-    auto input = Proto::SigningInput();
-    input.set_timestamp(int64_t(1526641218066));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    auto& message = *input.mutable_transfer_message();
-    message.set_amount(int64_t(100000000));
-    message.set_asset("");
-    message.set_fee(int64_t(100000000));
-    message.set_fee_asset("");
-    message.set_to("3PLgzJXQiN77G7KgnR1WVa8jBYhF2dmWndx");
-    message.set_attachment("falafelfalafelfalafelfalafelfalafelfalafelfalafel"
-                           "falafelfalafelfalafelfalafelfalafelfalafelfalafel"
-                           "falafelfalafelfalafelfalafelfalafelfalafel
");
-    auto tx1 = Transaction(
-        input,
-        /* pub_key */
-        parse_hex("d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef22"));
-    EXPECT_THROW(tx1.serializeToSign(), invalid_argument);
-}
-
-TEST(WavesTransaction, jsonSerialize) {
-
-    const auto privateKey =
-        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
-    const auto publicKeyCurve25519 = privateKey.getPublicKey(TWPublicKeyTypeCURVE25519);
-    ASSERT_EQ(hex(Data(publicKeyCurve25519.bytes.begin(), publicKeyCurve25519.bytes.end())),
-              "559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
-    const auto address = Address(publicKeyCurve25519);
-
-    auto input = Proto::SigningInput();
-    input.set_timestamp(int64_t(1526641218066));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    auto& message = *input.mutable_transfer_message();
-    message.set_amount(int64_t(10000000));
-    message.set_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
-    message.set_fee(int64_t(100000000));
-    message.set_fee_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD82zq");
-    message.set_to(address.string());
-    message.set_attachment("falafel");
-    auto tx1 = Transaction(
-        input,
-        /* pub_key */
-        parse_hex("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d"));
-
-    auto signature = Signer::sign(privateKey, tx1);
-
-    auto json = tx1.buildJson(signature);
-
-    ASSERT_EQ(json["type"], TransactionType::transfer);
-    ASSERT_EQ(json["version"], TransactionVersion::V2);
-    ASSERT_EQ(json["fee"], int64_t(100000000));
-    ASSERT_EQ(json["senderPublicKey"], "6mA8eQjie53kd4jbZrwL3ZhMBqCX6nzit1k55tR2X7zU");
-    ASSERT_EQ(json["timestamp"], int64_t(1526641218066));
-    ASSERT_EQ(json["proofs"].dump(), "[\"5ynN2NUiFHkQzw9bK8R7dZcNfTWMAtcWRJsrMvFFM6dUT3fSnPCCX7CTajNU8bJCB"
-                                     "H69vU1mnwfx4zpDtF1SkzKg\"]");
-    ASSERT_EQ(json["recipient"], "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds");
-    ASSERT_EQ(json["assetId"], "DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
-    ASSERT_EQ(json["feeAssetId"], "DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD82zq");
-    ASSERT_EQ(json["amount"], int64_t(10000000));
-    ASSERT_EQ(json["attachment"], "4t2Xazb2SX");
-    ASSERT_EQ(json.dump(), "{\"amount\":10000000,\"assetId\":\"DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq\",\"attachment\":\"4t2Xazb2SX\",\"fee\":100000000,\"feeAssetId\":\"DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD82zq\",\"proofs\":[\"5ynN2NUiFHkQzw9bK8R7dZcNfTWMAtcWRJsrMvFFM6dUT3fSnPCCX7CTajNU8bJCBH69vU1mnwfx4zpDtF1SkzKg\"],\"recipient\":\"3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds\",\"senderPublicKey\":\"6mA8eQjie53kd4jbZrwL3ZhMBqCX6nzit1k55tR2X7zU\",\"timestamp\":1526641218066,\"type\":4,\"version\":2}");
-}
-
-} // namespace TW::Waves::tests
diff --git a/tests/XRP/AddressTests.cpp b/tests/XRP/AddressTests.cpp
deleted file mode 100644
index 591b2842123..00000000000
--- a/tests/XRP/AddressTests.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "XRP/Address.h"
-#include "XRP/XAddress.h"
-#include "HexCoding.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Ripple {
-
-TEST(RippleAddress, FromPublicKey) {
-    const auto publicKey = PublicKey(parse_hex("0303E20EC6B4A39A629815AE02C0A1393B9225E3B890CAE45B59F42FA29BE9668D"), TWPublicKeyTypeSECP256k1);
-    const auto address = Address(publicKey);
-    ASSERT_EQ(std::string("rnBFvgZphmN39GWzUJeUitaP22Fr9be75H"), address.string());
-}
-
-TEST(RippleAddress, FromString) {
-    std::string classic = "rnBFvgZphmN39GWzUJeUitaP22Fr9be75H";
-    const auto address = Address(classic);
-
-    ASSERT_EQ(address.string(), classic);
-}
-
-TEST(RippleXAddress, FromPublicKey) {
-    const auto publicKey = PublicKey(parse_hex("0303E20EC6B4A39A629815AE02C0A1393B9225E3B890CAE45B59F42FA29BE9668D"), TWPublicKeyTypeSECP256k1);
-    const auto address = XAddress(publicKey, 12345);
-    ASSERT_EQ(std::string("X76UnYEMbQfEs3mUqgtjp4zFy9exgThRj7XVZ6UxsdrBptF"), address.string());
-}
-
-TEST(RippleXAddress, FromString) {
-    std::string xAddress = "X76UnYEMbQfEs3mUqgtjp4zFy9exgThRj7XVZ6UxsdrBptF";
-    std::string xAddress2 = "X76UnYEMbQfEs3mUqgtjp4zFy9exgTsM93nriVZAPufrpE3";
-    const auto address = XAddress(xAddress);
-    const auto address2 = XAddress(xAddress2);
-
-    ASSERT_EQ(address.tag, 12345ul);
-    ASSERT_EQ(address.string(), xAddress);
-
-    ASSERT_EQ(address2.tag, 0ul);
-    ASSERT_EQ(address2.string(), xAddress2);
-}
-
-TEST(RippleAddress, isValid) {
-    std::string classicAddress = "r36yxStAh7qgTQNHTzjZvXybCTzUFhrfav";
-    std::string bitcoinAddress = "1Ma2DrB78K7jmAwaomqZNRMCvgQrNjE2QC";
-    std::string xAddress = "XVfvixWZQKkcenFRYApCjpTUyJ4BePTe3jJv7beatUZvQYh";
-
-    ASSERT_TRUE(Address::isValid(classicAddress));
-    ASSERT_TRUE(XAddress::isValid(xAddress));
-    ASSERT_FALSE(Address::isValid(bitcoinAddress));
-    ASSERT_FALSE(XAddress::isValid(bitcoinAddress));
-}
-
-} // namespace TW::Ripple
diff --git a/tests/XRP/TWAnySignerTests.cpp b/tests/XRP/TWAnySignerTests.cpp
deleted file mode 100644
index 6bf8bdf5986..00000000000
--- a/tests/XRP/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "proto/Common.pb.h"
-#include "proto/Ripple.pb.h"
-#include <TrustWalletCore/TWAnySigner.h>
-
-#include "../interface/TWTestUtilities.h"
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-namespace TW::Ripple::tests {
-
-TEST(TWAnySignerRipple, Sign) {
-    auto key = parse_hex("ba005cd605d8a02e3d5dfd04234cef3a3ee4f76bfbad2722d1fb5af8e12e6764");
-    Proto::SigningInput input;
-
-    input.set_amount(29000000);
-    input.set_fee(200000);
-    input.set_sequence(1);
-    input.set_account("rDpysuumkweqeC7XdNgYNtzL5GxbdsmrtF");
-    input.set_destination("rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF");
-    input.set_private_key(key.data(), key.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeXRP);
-
-    EXPECT_EQ(hex(output.encoded()), "12000022800000002400000001614000000001ba8140684000000000030d407321026cc34b92cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b6744630440220067f20b3eebfc7107dd0bcc72337a236ac3be042c0469f2341d76694a17d4bb9022048393d7ee7dcb729783b33f5038939ddce1bb8337e66d752974626854556bbb681148400b6b6d08d5d495653d73eda6804c249a5148883148132e4e20aecf29090ac428a9c43f230a829220d");
-
-    // invalid tag
-    input.set_destination_tag(641505641505);
-
-    ANY_SIGN(input, TWCoinTypeXRP);
-
-    EXPECT_EQ(output.error(), Common::Proto::SigningError::Error_invalid_memo);
-    EXPECT_EQ(output.encoded(), "");
-}
-
-} // namespace TW::Ripple::tests
diff --git a/tests/XRP/TWCoinTypeTests.cpp b/tests/XRP/TWCoinTypeTests.cpp
deleted file mode 100644
index 5f4249ca2e1..00000000000
--- a/tests/XRP/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWXRPCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeXRP));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("E26AB8F3372D2FC02DEC1FD5674ADAB762D684BFFDBBDF5D674E9D7CF4A47054"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeXRP, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("rfkH7EuS1XcSkB9pocy1R6T8F4CsNYixYU"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeXRP, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeXRP));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeXRP));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeXRP), 6);
-    ASSERT_EQ(TWBlockchainRipple, TWCoinTypeBlockchain(TWCoinTypeXRP));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeXRP));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeXRP));
-    assertStringsEqual(symbol, "XRP");
-    assertStringsEqual(txUrl, "https://bithomp.com/explorer/E26AB8F3372D2FC02DEC1FD5674ADAB762D684BFFDBBDF5D674E9D7CF4A47054");
-    assertStringsEqual(accUrl, "https://bithomp.com/explorer/rfkH7EuS1XcSkB9pocy1R6T8F4CsNYixYU");
-    assertStringsEqual(id, "ripple");
-    assertStringsEqual(name, "XRP");
-}
diff --git a/tests/XRP/TWRippleAddressTests.cpp b/tests/XRP/TWRippleAddressTests.cpp
deleted file mode 100644
index 36e738592c1..00000000000
--- a/tests/XRP/TWRippleAddressTests.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include <TrustWalletCore/TWHDWallet.h>
-#include <TrustWalletCore/TWRippleXAddress.h>
-
-#include <gtest/gtest.h>
-
-TEST(TWRipple, ExtendedKeys) {
-    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
-                                       STRING("ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal").get(),
-                                       STRING("TREZOR").get()));
-
-    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeXRP, TWHDVersionXPUB));
-    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeXRP, TWHDVersionXPRV));
-
-    assertStringsEqual(xpub, "xpub6D9oDY4gqFBtsFEonh5GTDiUm6nmij373YWzmYdshcnM4AFzdhUf55iZD33vNU2ZqfQJU5wiCJUgisMt2RHKDzhi1PbZfh5Y2NiiYJAQqUn");
-    assertStringsEqual(xprv, "xprv9zASp2XnzsdbemALgfYG65mkD4xHKGKFgKbPyAEG9HFNBMvr6AAQXHQ5MmqM66EnbJfe9TvYMy1bucz7hSQjG43NVizRZwJJYfLmeKo4nVB");
-}
-
-TEST(TWRipple, XAddress) {
-    const auto string = STRING("XVfvixWZQKkcenFRYApCjpTUyJ4BePTe3jJv7beatUZvQYh");
-    const auto xAddress = WRAP(TWRippleXAddress, TWRippleXAddressCreateWithString(string.get()));
-
-    EXPECT_TRUE(TWRippleXAddressIsValidString(string.get()));
-    EXPECT_EQ(TWRippleXAddressTag(xAddress.get()), 12345ul);
-    assertStringsEqual(WRAPS(TWRippleXAddressDescription(xAddress.get())), "XVfvixWZQKkcenFRYApCjpTUyJ4BePTe3jJv7beatUZvQYh");
-}
diff --git a/tests/XRP/TransactionTests.cpp b/tests/XRP/TransactionTests.cpp
deleted file mode 100644
index f9015b684da..00000000000
--- a/tests/XRP/TransactionTests.cpp
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "XRP/Address.h"
-#include "XRP/Transaction.h"
-#include "XRP/BinaryCoding.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "PublicKey.h"
-
-#include <gtest/gtest.h>
-
-using namespace std;
-
-namespace TW::Ripple::tests {
-
-TEST(RippleTransaction, serializeAmount) {
-    /// From https://github.com/trezor/trezor-core/blob/master/tests/test_apps.ripple.serializer.py
-    auto data0 = Transaction::serializeAmount(0);
-    auto data1 = Transaction::serializeAmount(1);
-    auto data2 = Transaction::serializeAmount(93493429243);
-    auto data3 = Transaction::serializeAmount(25000000);
-    auto data4 = Transaction::serializeAmount(100000000000);
-    /// more than max supply
-    auto data5 = Transaction::serializeAmount(200000000000000000);
-    /// negative value
-    auto data6 = Transaction::serializeAmount(-1);
-
-    ASSERT_EQ(hex(data0), "4000000000000000");
-    ASSERT_EQ(hex(data1), "4000000000000001");
-    ASSERT_EQ(hex(data2), "40000015c4a483fb");
-    ASSERT_EQ(hex(data3), "40000000017d7840");
-    ASSERT_EQ(hex(data4), "400000174876e800");
-    ASSERT_EQ(hex(data5), "42c68af0bb140000");
-    ASSERT_EQ(hex(data6), "");
-}
-
-TEST(RippleTransaction, serialize) {
-    /// From https://github.com/trezor/trezor-core/blob/master/tests/test_apps.ripple.serializer.py
-    auto account = Address("r9TeThyi5xiuUUrFjtPKZiHcDxs7K9H6Rb");
-    auto destination = "r4BPgS7DHebQiU31xWELvZawwSG2fSPJ7C";
-    auto tx1 = Transaction(
-       /* amount */25000000,
-       /* fee */10,
-       /* flags */0,
-       /* sequence */2,
-       /* last_ledger_sequence */0,
-       /* account */account,
-       /* destination */destination,
-       /* destination_tag*/0
-    );
-    auto serialized1 = tx1.serialize();
-    ASSERT_EQ(hex(serialized1), "120000220000000024000000026140000000017d784068400000000000000a81145ccb151f6e9d603f394ae778acf10d3bece874f68314e851bbbe79e328e43d68f43445368133df5fba5a");
-
-    auto tx2 = Transaction(
-       /* amount */200000,
-       /* fee */15,
-       /* flags */0,
-       /* sequence */144,
-       /* last_ledger_sequence */0,
-       /* account */Address("rGWTUVmm1fB5QUjMYn8KfnyrFNgDiD9H9e"),
-       /* destination */"rw71Qs1UYQrSQ9hSgRohqNNQcyjCCfffkQ",
-       /* destination_tag*/0
-    );
-    auto serialized2 = tx2.serialize();
-    ASSERT_EQ(hex(serialized2), "12000022000000002400000090614000000000030d4068400000000000000f8114aa1bd19d9e87be8069fdbf6843653c43837c03c6831467fe6ec28e0464dd24fb2d62a492aac697cfad02");
-
-    auto tx3 = Transaction(
-       /* amount */25000000,
-       /* fee */12,
-       /* flags */0,
-       /* sequence */1,
-       /* last_ledger_sequence */0,
-       /* account */Address("r4BPgS7DHebQiU31xWELvZawwSG2fSPJ7C"),
-       /* destination */"rBqSFEFg2B6GBMobtxnU1eLA1zbNC9NDGM",
-       /* destination_tag*/4146942154
-    );
-    auto serialized3 = tx3.serialize();
-    ASSERT_EQ(hex(serialized3), "120000220000000024000000012ef72d50ca6140000000017d784068400000000000000c8114e851bbbe79e328e43d68f43445368133df5fba5a831476dac5e814cd4aa74142c3ab45e69a900e637aa2");
-
-    auto tx4 = Transaction(
-       /* amount */25000000,
-       /* fee */12,
-       /* flags */0,
-       /* sequence */1,
-       /* last_ledger_sequence */0,
-       /* account */Address("r4BPgS7DHebQiU31xWELvZawwSG2fSPJ7C"),
-       /* destination */"XVhidoXkozM5DTZFdDnJ5nYC8FPrTuJiyGh1VxSGS6RNJJ5",
-       /* ignore destination_tag*/12345
-    );
-    auto serialized4 = tx4.serialize();
-    ASSERT_EQ(hex(serialized4), hex(serialized3));
-}
-
-TEST(RippleTransaction, preImage) {
-    auto account = Address("r9LqNeG6qHxjeUocjvVki2XR35weJ9mZgQ");
-    auto destination = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
-    auto tx1 = Transaction(
-        /* amount */1000,
-        /* fee */10,
-        /* flags */2147483648,
-        /* sequence */1,
-        /* last_ledger_sequence */0,
-        /* account */account,
-        /* destination */destination,
-        /* destination_tag*/0
-    );
-    tx1.pub_key = parse_hex("ed5f5ac8b98974a3ca843326d9b88cebd0560177b973ee0b149f782cfaa06dc66a");
-    auto unsignedTx = tx1.getPreImage();
-
-    ASSERT_EQ(hex(unsignedTx),
-          /* prefix */      "53545800"
-          /* tx type */     "120000"
-          /* flags */       "2280000000"
-          /* sequence */    "2400000001"
-          /* amount */      "6140000000000003e8"
-          /* fee */         "68400000000000000a"
-          /* pub key */     "7321ed5f5ac8b98974a3ca843326d9b88cebd0560177b973ee0b149f782cfaa06dc66a"
-          /* account */     "81145b812c9d57731e27a2da8b1830195f88ef32a3b6"
-          /* destination */ "8314b5f762798a53d543a014caf8b297cff8f2f937e8"
-    );
-    ASSERT_EQ(unsignedTx.size(), 114ul);
-}
-
-} // namespace TW::Ripple::tests
diff --git a/tests/Zcash/AddressTests.cpp b/tests/Zcash/AddressTests.cpp
deleted file mode 100644
index d539ac10b77..00000000000
--- a/tests/Zcash/AddressTests.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "Zcash/TAddress.h"
-#include "HexCoding.h"
-#include "PrivateKey.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Zcash {
-
-TEST(ZcashAddress, FromPrivateKey) {
-    const auto privateKey =  PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    const auto address = TAddress(publicKey);
-
-    EXPECT_EQ(address.string(), "t1Wg9uPPAfwhBWeRjtDPa5ZHNzyBx9rJVKY");
-    EXPECT_EQ(address.bytes[0], 0x1c);
-    EXPECT_EQ(address.bytes[1], 0xb8);
-}
-
-TEST(ZcashAddress, FromPublicKey) {
-    const auto privateKey = PrivateKey(parse_hex("BE88DF1D0BF30A923CB39C3BB953178BAAF3726E8D3CE81E7C8462E046E0D835"));
-    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    const auto address = TAddress(publicKey);
-
-    EXPECT_EQ(address.string(), "t1gaySCXCYtXE3ygP38YuWtVZczsEbdjG49");
-    EXPECT_EQ(address.bytes[0], 0x1c);
-    EXPECT_EQ(address.bytes[1], 0xb8);
-}
-
-TEST(ZcashAddress, Valid) {
-    EXPECT_TRUE(TAddress::isValid(std::string("t1RygJmrLdNGgi98gUgEJDTVaELTAYWoMBy")));
-    EXPECT_TRUE(TAddress::isValid(std::string("t1TWk2mmvESDnE4dmCfT7MQ97ij6ZqLpNVU")));
-    EXPECT_TRUE(TAddress::isValid(std::string("t3RD6RFKhWSotNbPEY4Vw7Ku9QCfKkzrbBL")));
-}
-
-TEST(ZcashAddress, Invalid) {
-    EXPECT_FALSE(TAddress::isValid(std::string("abc")));
-    EXPECT_FALSE(TAddress::isValid(std::string("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed")));
-    EXPECT_FALSE(TAddress::isValid(std::string("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")));
-    EXPECT_FALSE(TAddress::isValid(std::string("t1RygJmrLdNGgi98+UgEJDTVaELTAYWoMBy"))); // Invalid Base58
-    EXPECT_FALSE(TAddress::isValid(std::string("t1RygJmrLdNGgi98gUgEJDTVaELTAYW"))); // too short
-    EXPECT_FALSE(TAddress::isValid(std::string("t1RygJmrLdNGgi98gUgEJDTVaELTAYWoMBz"))); // bad checksum
-    EXPECT_FALSE(TAddress::isValid(std::string("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC"))); // too short
-    EXPECT_FALSE(TAddress::isValid(std::string("2NRbuP5YfzRNEa1RibT5kXay1VgvQHnydZY1"))); // invalid prefix
-}
-
-TEST(ZcashAddress, InitWithString) {
-    {
-        const auto address = TAddress("t1Wg9uPPAfwhBWeRjtDPa5ZHNzyBx9rJVKY");
-        EXPECT_EQ(address.string(), "t1Wg9uPPAfwhBWeRjtDPa5ZHNzyBx9rJVKY");
-        EXPECT_EQ(address.bytes[0], 0x1c);
-        EXPECT_EQ(address.bytes[1], 0xb8);
-    }
-    {
-        const auto address = TAddress("t3RD6RFKhWSotNbPEY4Vw7Ku9QCfKkzrbBL");
-        EXPECT_EQ(address.string(), "t3RD6RFKhWSotNbPEY4Vw7Ku9QCfKkzrbBL");
-        EXPECT_EQ(address.bytes[0], 0x1c);
-        EXPECT_EQ(address.bytes[1], 0xbd);
-    }
-}
-
-} // namespace TW::Zcash
diff --git a/tests/Zcash/TWCoinTypeTests.cpp b/tests/Zcash/TWCoinTypeTests.cpp
deleted file mode 100644
index 475ffafd17b..00000000000
--- a/tests/Zcash/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWZcashCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeZcash));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("f2438a93039faf08d39bd3df1f7b5f19a2c29ffe8753127e2956ab4461adab35"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeZcash, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("t1Yfrf1dssDLmaMBsq2LFKWPbS5vH3nGpa2"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeZcash, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeZcash));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeZcash));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeZcash), 8);
-    ASSERT_EQ(TWBlockchainZcash, TWCoinTypeBlockchain(TWCoinTypeZcash));
-    ASSERT_EQ(0xbd, TWCoinTypeP2shPrefix(TWCoinTypeZcash));
-    ASSERT_EQ(0x1c, TWCoinTypeStaticPrefix(TWCoinTypeZcash));
-    assertStringsEqual(symbol, "ZEC");
-    assertStringsEqual(txUrl, "https://blockchair.com/zcash/transaction/f2438a93039faf08d39bd3df1f7b5f19a2c29ffe8753127e2956ab4461adab35");
-    assertStringsEqual(accUrl, "https://blockchair.com/zcash/address/t1Yfrf1dssDLmaMBsq2LFKWPbS5vH3nGpa2");
-    assertStringsEqual(id, "zcash");
-    assertStringsEqual(name, "Zcash");
-}
diff --git a/tests/Zcash/TWZcashTransactionTests.cpp b/tests/Zcash/TWZcashTransactionTests.cpp
deleted file mode 100644
index 96861a4a507..00000000000
--- a/tests/Zcash/TWZcashTransactionTests.cpp
+++ /dev/null
@@ -1,188 +0,0 @@
-
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-
-#include "Bitcoin/OutPoint.h"
-#include "Bitcoin/Script.h"
-#include "Zcash/TransactionBuilder.h"
-#include "Bitcoin/TransactionSigner.h"
-#include "HexCoding.h"
-#include "PublicKey.h"
-#include "Data.h"
-#include "Coin.h"
-#include "Zcash/Transaction.h"
-
-#include <TrustWalletCore/TWBitcoinScript.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(TWZcashTransaction, Encode) {
-    // Test vector 3 https://github.com/zcash/zips/blob/master/zip-0243.rst
-    auto transaction = Zcash::Transaction();
-    transaction.lockTime = 0x0004b029;
-    transaction.expiryHeight = 0x0004b048;
-    transaction.branchId = Zcash::SaplingBranchID;
-
-    auto outpoint0 = Bitcoin::OutPoint(parse_hex("a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9"), 1);
-    transaction.inputs.emplace_back(outpoint0, Bitcoin::Script(parse_hex("483045022100a61e5d557568c2ddc1d9b03a7173c6ce7c996c4daecab007ac8f34bee01e6b9702204d38fdc0bcf2728a69fde78462a10fb45a9baa27873e6a5fc45fb5c76764202a01210365ffea3efa3908918a8b8627724af852fc9b86d7375b103ab0543cf418bcaa7f")), 0xfffffffe);
-
-    auto script0 = Bitcoin::Script(parse_hex("76a9148132712c3ff19f3a151234616777420a6d7ef22688ac"));
-    transaction.outputs.emplace_back(0x02625a00, script0);
-
-    auto script1 = Bitcoin::Script(parse_hex("76a9145453e4698f02a38abdaa521cd1ff2dee6fac187188ac"));
-    transaction.outputs.emplace_back(0x0098958b, script1);
-
-    auto unsignedData = Data{};
-    transaction.encode(unsignedData);
-
-    ASSERT_EQ(hex(unsignedData.begin(), unsignedData.end()),
-        /* header */          "04000080"
-        /* versionGroupId */  "85202f89"
-        /* vin */             "01""a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9""01000000""6b483045022100a61e5d557568c2ddc1d9b03a7173c6ce7c996c4daecab007ac8f34bee01e6b9702204d38fdc0bcf2728a69fde78462a10fb45a9baa27873e6a5fc45fb5c76764202a01210365ffea3efa3908918a8b8627724af852fc9b86d7375b103ab0543cf418bcaa7f""feffffff"
-        /* vout */            "02""005a620200000000""1976a9148132712c3ff19f3a151234616777420a6d7ef22688ac"
-                                  "8b95980000000000""1976a9145453e4698f02a38abdaa521cd1ff2dee6fac187188ac"
-        /* lockTime */        "29b00400"
-        /* expiryHeight */    "48b00400"
-        /* valueBalance */    "0000000000000000"
-        /* vShieldedSpend */  "00"
-        /* vShieldedOutput */ "00"
-        /* vJoinSplit */      "00"
-    );
-
-    auto scriptCode = Bitcoin::Script(parse_hex("76a914507173527b4c3318a2aecd793bf1cfed705950cf88ac"));
-    auto preImage = transaction.getPreImage(scriptCode, 0, TWBitcoinSigHashTypeAll, 0x02faf080);
-    ASSERT_EQ(hex(preImage.begin(), preImage.end()),
-        /* header */              "04000080"
-        /* versionGroupId */      "85202f89"
-        /* hashPrevouts */        "fae31b8dec7b0b77e2c8d6b6eb0e7e4e55abc6574c26dd44464d9408a8e33f11"
-        /* hashSequence */        "6c80d37f12d89b6f17ff198723e7db1247c4811d1a695d74d930f99e98418790"
-        /* hashOutputs */         "d2b04118469b7810a0d1cc59568320aad25a84f407ecac40b4f605a4e6868454"
-        /* hashJoinSplits */      "0000000000000000000000000000000000000000000000000000000000000000"
-        /* hashShieldedSpends */  "0000000000000000000000000000000000000000000000000000000000000000"
-        /* hashShieldedOutputs */ "0000000000000000000000000000000000000000000000000000000000000000"
-        /* lockTime */            "29b00400"
-        /* expiryHeight */        "48b00400"
-        /* valueBalance */        "0000000000000000"
-        /* hashType */            "01000000"
-        /* prevout */             "a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9""01000000"
-        /* scriptCode */          "1976a914507173527b4c3318a2aecd793bf1cfed705950cf88ac"
-        /* amount */              "80f0fa0200000000"
-        /* sequence */            "feffffff"
-    );
-
-    auto sighash = transaction.getSignatureHash(scriptCode, 0, TWBitcoinSigHashTypeAll, 0x02faf080, Bitcoin::BASE);
-    ASSERT_EQ(hex(sighash.begin(), sighash.end()), "f3148f80dfab5e573d5edfe7a850f5fd39234f80b5429d3a57edcc11e34c585b");
-}
-
-TEST(TWZcashTransaction, SaplingSigning) {
-    // tx on mainnet
-    // https://explorer.zcha.in/transactions/ec9033381c1cc53ada837ef9981c03ead1c7c41700ff3a954389cfaddc949256
-    const int64_t amount = 488000;
-    const int64_t fee = 6000;
-
-    auto input = Bitcoin::Proto::SigningInput();
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
-    input.set_amount(amount);
-    input.set_byte_fee(1);
-    input.set_to_address("t1QahNjDdibyE4EdYkawUSKBBcVTSqv64CS");
-
-    auto hash0 = DATA("53685b8809efc50dd7d5cb0906b307a1b8aa5157baa5fc1bd6fe2d0344dd193a");
-    auto utxo0 = input.add_utxo();
-    utxo0->mutable_out_point()->set_hash(TWDataBytes(hash0.get()), TWDataSize(hash0.get()));
-    utxo0->mutable_out_point()->set_index(0);
-    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
-    utxo0->set_amount(494000);
-    auto script0 = parse_hex("76a914f84c7f4dd3c3dc311676444fdead6e6d290d50e388ac");
-    utxo0->set_script(script0.data(), script0.size());
-
-    auto utxoKey0 = DATA("a9684f5bebd0e1208aae2e02bc9e9163bd1965ad23d8538644e1df8b99b99559");
-    input.add_private_key(TWDataBytes(utxoKey0.get()), TWDataSize(utxoKey0.get()));
-
-    auto plan = Zcash::TransactionBuilder::plan(input);
-    plan.amount = amount;
-    plan.fee = fee;
-    plan.change = 0;
-    plan.branchId = Data(Zcash::SaplingBranchID.begin(), Zcash::SaplingBranchID.end());
-
-    auto& protoPlan = *input.mutable_plan();
-    protoPlan = plan.proto();
-
-    // Sign
-    auto result = Bitcoin::TransactionSigner<Zcash::Transaction, Zcash::TransactionBuilder>::sign(input);
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    // txid = "ec9033381c1cc53ada837ef9981c03ead1c7c41700ff3a954389cfaddc949256"
-
-    Data serialized;
-    signedTx.encode(serialized);
-    ASSERT_EQ(hex(serialized),
-        "04000080"
-        "85202f89"
-        "01"
-            "53685b8809efc50dd7d5cb0906b307a1b8aa5157baa5fc1bd6fe2d0344dd193a""00000000""6b483045022100ca0be9f37a4975432a52bb65b25e483f6f93d577955290bb7fb0060a93bfc92002203e0627dff004d3c72a957dc9f8e4e0e696e69d125e4d8e275d119001924d3b48012103b243171fae5516d1dc15f9178cfcc5fdc67b0a883055c117b01ba8af29b953f6""ffffffff"
-        "01"
-            "4072070000000000""1976a91449964a736f3713d64283fd0018626ba50091c7e988ac"
-        "00000000"
-        "00000000"
-        "0000000000000000"
-        "00"
-        "00"
-        "00"
-    );
-}
-
-TEST(TWZcashTransaction, BlossomSigning) {
-    // tx on mainnet
-    // https://explorer.zcha.in/transactions/387939ff8eb07dd264376eeef2e126394ab139802b1d80e92b21c1a2ae54fe92
-    const int64_t amount = 17615;
-    const int64_t fee = 10000;
-    const std::string toAddress = "t1biXYN8wJahR76SqZTe1LBzTLf3JAsmT93";
-
-    auto input = Bitcoin::Proto::SigningInput();
-    input.set_hash_type(TWBitcoinSigHashTypeAll);
-    input.set_amount(amount);
-    input.set_byte_fee(1);
-    input.set_to_address(toAddress);
-    input.set_coin_type(TWCoinTypeZcash);
-
-    auto txHash0 = parse_hex("2381825cd9069a200944996257e25b9403ba3e296bbc1dd98b01019cc7028cde");
-    std::reverse(txHash0.begin(), txHash0.end());
-
-    auto utxo0 = input.add_utxo();
-    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
-    utxo0->mutable_out_point()->set_index(0);
-    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
-    utxo0->set_amount(27615);
-
-    // real key 1p "m/44'/133'/0'/0/14"
-    auto utxoKey0 = PrivateKey(parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646"));
-    auto utxoAddr0 = TW::deriveAddress(TWCoinTypeZcash, utxoKey0);
-    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeZcash);
-    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
-    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
-
-    auto plan = Zcash::TransactionBuilder::plan(input);
-    plan.amount = amount;
-    plan.fee = fee;
-    plan.change = 0;
-
-    auto& protoPlan = *input.mutable_plan();
-    protoPlan = plan.proto();
-
-    // Sign
-    auto result = Bitcoin::TransactionSigner<Zcash::Transaction, Zcash::TransactionBuilder>::sign(input);
-    ASSERT_TRUE(result) << std::to_string(result.error());
-    auto signedTx = result.payload();
-
-    Data serialized;
-    signedTx.encode(serialized);
-    ASSERT_EQ(hex(serialized), "0400008085202f8901de8c02c79c01018bd91dbc6b293eba03945be25762994409209a06d95c828123000000006b483045022100e6e5071811c08d0c2e81cb8682ee36a8c6b645f5c08747acd3e828de2a4d8a9602200b13b36a838c7e8af81f2d6e7e694ede28833a480cfbaaa68a47187655298a7f0121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ffffffff01cf440000000000001976a914c3bacb129d85288a3deb5890ca9b711f7f71392688ac00000000000000000000000000000000000000");
-}
diff --git a/tests/Zelcash/TWCoinTypeTests.cpp b/tests/Zelcash/TWCoinTypeTests.cpp
deleted file mode 100644
index ee7bce7b346..00000000000
--- a/tests/Zelcash/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWZelcashCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeZelcash));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeZelcash, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeZelcash, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeZelcash));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeZelcash));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeZelcash), 8);
-    ASSERT_EQ(TWBlockchainZcash, TWCoinTypeBlockchain(TWCoinTypeZelcash));
-    ASSERT_EQ(0xbd, TWCoinTypeP2shPrefix(TWCoinTypeZelcash));
-    ASSERT_EQ(0x1c, TWCoinTypeStaticPrefix(TWCoinTypeZelcash));
-    assertStringsEqual(symbol, "FLUX");
-    assertStringsEqual(txUrl, "https://explorer.runonflux.io/tx/t123");
-    assertStringsEqual(accUrl, "https://explorer.runonflux.io/address/a12");
-    assertStringsEqual(id, "zelcash");
-    assertStringsEqual(name, "Flux");
-}
diff --git a/tests/Zilliqa/AddressTests.cpp b/tests/Zilliqa/AddressTests.cpp
deleted file mode 100644
index 440df29db64..00000000000
--- a/tests/Zilliqa/AddressTests.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Zilliqa/Address.h"
-#include "Zilliqa/AddressChecksum.h"
-
-#include <TrustWalletCore/TWHRP.h>
-
-#include <gtest/gtest.h>
-
-namespace TW::Zilliqa::tests {
-
-TEST(ZilliqaAddress, FromPrivateKey) {
-    const auto privateKey =
-        PrivateKey(parse_hex("3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6"));
-    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
-    const auto address = Address(publicKey);
-    auto expectedAddress = "zil1j8xae6lggm8y63m3y2r7aefu797ze7mhzulnqg";
-
-    ASSERT_EQ(address.getHrp(), stringForHRP(TWHRPZilliqa));
-    ASSERT_EQ(address.string(), expectedAddress);
-}
-
-TEST(ZilliqaAddress, Validation) {
-    ASSERT_FALSE(Zilliqa::Address::isValid("0x91cddcebe846ce4d47712287eee53cf17c2cfb7"));
-    ASSERT_FALSE(Zilliqa::Address::isValid(""));
-    ASSERT_FALSE(Zilliqa::Address::isValid("0x"));
-    ASSERT_FALSE(Zilliqa::Address::isValid("91cddcebe846ce4d47712287eee53cf17c2cfb7"));
-
-    ASSERT_TRUE(Zilliqa::Address::isValid("zil1fwh4ltdguhde9s7nysnp33d5wye6uqpugufkz7"));
-}
-
-TEST(ZilliqaAddress, Checksum) {
-    ASSERT_EQ(
-        checksum(parse_hex("4BAF5FADA8E5DB92C3D3242618C5B47133AE003C")),
-        "4BAF5faDA8e5Db92C3d3242618c5B47133AE003C");
-    ASSERT_EQ(
-        checksum(parse_hex("448261915A80CDE9BDE7C7A791685200D3A0BF4E")),
-        "448261915a80cdE9BDE7C7a791685200D3A0bf4E");
-    ASSERT_EQ(
-        checksum(parse_hex("0xDED02FD979FC2E55C0243BD2F52DF022C40ADA1E")),
-        "Ded02fD979fC2e55c0243bd2F52df022c40ADa1E");
-    ASSERT_EQ(
-        checksum(parse_hex("0x13F06E60297BEA6A3C402F6F64C416A6B31E586E")),
-        "13F06E60297bea6A3c402F6f64c416A6b31e586e");
-    ASSERT_EQ(
-        checksum(parse_hex("0x1A90C25307C3CC71958A83FA213A2362D859CF33")),
-        "1a90C25307C3Cc71958A83fa213A2362D859CF33");
-}
-
-} // namespace TW::Zilliqa::tests
diff --git a/tests/Zilliqa/SignatureTests.cpp b/tests/Zilliqa/SignatureTests.cpp
deleted file mode 100644
index cd3fe38e216..00000000000
--- a/tests/Zilliqa/SignatureTests.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "../interface/TWTestUtilities.h"
-#include "HexCoding.h"
-#include "Data.h"
-#include <TrustWalletCore/TWPrivateKey.h>
-#include <TrustWalletCore/TWCoinType.h>
-
-#include <gtest/gtest.h>
-
-using namespace TW;
-
-TEST(ZilliqaSignature, Signing) {
-    auto keyData = WRAPD(TWDataCreateWithHexString(STRING("0xafeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5").get()));
-    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(keyData.get()));
-    auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
-
-    auto message = "hello schnorr";
-    auto messageData = WRAPD(TWDataCreateWithBytes((uint8_t *)message, strnlen(message, 13)));
-    auto signatureData = WRAPD(TWPrivateKeySignZilliqaSchnorr(privateKey.get(), messageData.get()));
-    auto signature = data(TWDataBytes(signatureData.get()), TWDataSize(signatureData.get()));
-
-    ASSERT_TRUE(TWPublicKeyVerifyZilliqaSchnorr(pubKey.get(), signatureData.get(), messageData.get()));
-    EXPECT_EQ(hex(signature), "d166b1ae7892c5ef541461dc12a50214d0681b63d8037cda29a3fe6af8bb973e4ea94624d85bc0010bdc1b38d05198328fae21254adc2bf5feaf2804d54dba55");
-}
diff --git a/tests/Zilliqa/SignerTests.cpp b/tests/Zilliqa/SignerTests.cpp
deleted file mode 100644
index 5c49cf46952..00000000000
--- a/tests/Zilliqa/SignerTests.cpp
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "PrivateKey.h"
-#include "Zilliqa/Address.h"
-#include "Zilliqa/Signer.h"
-#include "proto/Zilliqa.pb.h"
-#include "uint256.h"
-
-#include <gtest/gtest.h>
-
-namespace TW::Zilliqa::tests {
-
-TEST(ZilliqaSigner, PreImage) {
-    auto privateKey = PrivateKey(parse_hex("0E891B9DFF485000C7D1DC22ECF3A583CC50328684321D61947A86E57CF6C638"));
-    auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    ASSERT_EQ(hex(pubKey.bytes), "034ae47910d58b9bde819c3cffa8de4441955508db00aa2540db8e6bf6e99abc1b");
-
-    auto amount = uint256_t(15000000000000);
-    auto gasPrice = uint256_t(1000000000);
-    auto amountData = store(amount);
-    auto gasData = store(gasPrice);
-    auto toAddress = Address(parse_hex("0x9Ca91EB535Fb92Fda5094110FDaEB752eDb9B039"));
-
-    auto input = Proto::SigningInput();
-    auto& tx = *input.mutable_transaction();
-    auto& transfer = *tx.mutable_transfer();
-    transfer.set_amount(amountData.data(), amountData.size());
-
-    input.set_version(65537);
-    input.set_nonce(4);
-    input.set_to(toAddress.string());
-    input.set_gas_price(gasData.data(), gasData.size());
-    input.set_gas_limit(uint64_t(1));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    Address address;
-    auto preImage = Signer::getPreImage(input, address);
-    auto signature = Signer::sign(input).signature();
-
-    ASSERT_EQ(hex(preImage.begin(), preImage.end()), "0881800410041a149ca91eb535fb92fda5094110fdaeb752edb9b03922230a21034ae47910d58b9bde819c3cffa8de4441955508db00aa2540db8e6bf6e99abc1b2a120a10000000000000000000000da475abf00032120a100000000000000000000000003b9aca003801");
-
-    ASSERT_TRUE(pubKey.verifyZilliqa(Data(signature.begin(), signature.end()), preImage));
-}
-
-TEST(ZilliqaSigner, Signing) {
-    auto privateKey = PrivateKey(parse_hex("0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748"));
-    auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-
-    // 1 ZIL
-    auto amount = uint256_t(1000000000000);
-    auto gasPrice = uint256_t(1000000000);
-    auto amountData = store(amount);
-    auto gasData = store(gasPrice);
-    auto toAddress = Address(parse_hex("0x7FCcaCf066a5F26Ee3AFfc2ED1FA9810Deaa632C"));
-
-    auto input = Proto::SigningInput();
-    auto& tx = *input.mutable_transaction();
-    auto& transfer = *tx.mutable_transfer();
-    transfer.set_amount(amountData.data(), amountData.size());
-
-    input.set_version(65537);
-    input.set_nonce(2);
-    input.set_to(toAddress.string());
-    input.set_gas_price(gasData.data(), gasData.size());
-    input.set_gas_limit(uint64_t(1));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    auto output = Signer::sign(input);
-
-    ASSERT_EQ(hex(output.signature().begin(), output.signature().end()), "001fa4df08c11a4a79e96e69399ee48eeecc78231a78b0355a8ca783c77c139436e37934fecc2252ed8dac00e235e22d18410461fb896685c4270642738ed268");
-    ASSERT_EQ(output.json(), R"({"amount":"1000000000000","code":"","data":"","gasLimit":"1","gasPrice":"1000000000","nonce":2,"pubKey":"03fb30b196ce3e976593ecc2da220dca9cdea8c84d2373770042a930b892ac0f5c","signature":"001fa4df08c11a4a79e96e69399ee48eeecc78231a78b0355a8ca783c77c139436e37934fecc2252ed8dac00e235e22d18410461fb896685c4270642738ed268","toAddr":"7FCcaCf066a5F26Ee3AFfc2ED1FA9810Deaa632C","version":65537})");
-}
-
-TEST(ZilliqaSigner, SigningData) {
-    // https://viewblock.io/zilliqa/tx/0x6228b3d7e69fc3481b84fd00e892cec359a41654f58948ff7b1b932396b00ad9
-    auto privateKey = PrivateKey(parse_hex("0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748"));
-    auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-
-    // 10 ZIL
-    auto amount = uint256_t(10000000000000);
-    auto gasPrice = uint256_t(2000000000);
-    auto amountData = store(amount);
-    auto gasData = store(gasPrice);
-
-    std::string json = "{\"_tag\":\"DelegateStake\",\"params\":[{\"type\":\"ByStr20\",\"value\":\"0x122219cCeAb410901e96c3A0e55E46231480341b\",\"vname\":\"ssnaddr\"}]}";
-    auto jsonData = Data(json.begin(), json.end());
-
-    auto input = Proto::SigningInput();
-    auto& tx = *input.mutable_transaction();
-    auto& raw = *tx.mutable_raw_transaction();
-    raw.set_amount(amountData.data(), amountData.size());
-    raw.set_data(jsonData.data(), jsonData.size());
-
-    input.set_version(65537);
-    input.set_nonce(56);
-    input.set_to("zil1g029nmzsf36r99vupp4s43lhs40fsscx3jjpuy");
-    input.set_gas_price(gasData.data(), gasData.size());
-    input.set_gas_limit(uint64_t(5000));
-    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
-
-    auto output = Signer::sign(input);
-    ASSERT_EQ(output.json(), R"({"amount":"10000000000000","code":"","data":"{\"_tag\":\"DelegateStake\",\"params\":[{\"type\":\"ByStr20\",\"value\":\"0x122219cCeAb410901e96c3A0e55E46231480341b\",\"vname\":\"ssnaddr\"}]}","gasLimit":"5000","gasPrice":"2000000000","nonce":56,"pubKey":"03fb30b196ce3e976593ecc2da220dca9cdea8c84d2373770042a930b892ac0f5c","signature":"437fb5c3ce2c6b01f9d490f670539fae4533c82a21fa7edfe6b23df70d732937e8c578c8d6ed24be9150f5126f7b7c977a467af8947ef92a720908a761a6eb0d","toAddr":"43D459eC504C7432959c086B0ac7F7855E984306","version":65537})");
-    ASSERT_EQ(hex(output.signature().begin(), output.signature().end()), "437fb5c3ce2c6b01f9d490f670539fae4533c82a21fa7edfe6b23df70d732937e8c578c8d6ed24be9150f5126f7b7c977a467af8947ef92a720908a761a6eb0d");
-}
-
-} // namespace TW::Zilliqa::tests
\ No newline at end of file
diff --git a/tests/Zilliqa/TWAnySignerTests.cpp b/tests/Zilliqa/TWAnySignerTests.cpp
deleted file mode 100644
index 876e6abec5b..00000000000
--- a/tests/Zilliqa/TWAnySignerTests.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "HexCoding.h"
-#include "uint256.h"
-#include "proto/Zilliqa.pb.h"
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWAnySigner.h>
-#include <gtest/gtest.h>
-
-namespace TW::Zilliqa::tests {
-
-TEST(TWAnySignerZilliqa, Sign) {
-    auto input = Proto::SigningInput();
-    auto& tx = *input.mutable_transaction();
-    auto& transfer = *tx.mutable_transfer();
-    auto key = parse_hex("0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748");
-    auto amount = store(uint256_t(1000000000000));
-    auto gasPrice = store(uint256_t(1000000000));
-
-    input.set_version(65537);
-    input.set_nonce(2);
-    input.set_to("zil10lx2eurx5hexaca0lshdr75czr025cevqu83uz");
-    input.set_gas_price(gasPrice.data(), gasPrice.size());
-    input.set_gas_limit(1);
-    input.set_private_key(key.data(), key.size());
-    transfer.set_amount(amount.data(), amount.size());
-
-    Proto::SigningOutput output;
-    ANY_SIGN(input, TWCoinTypeZilliqa);
-
-    EXPECT_EQ(hex(output.signature()), "001fa4df08c11a4a79e96e69399ee48eeecc78231a78b0355a8ca783c77c139436e37934fecc2252ed8dac00e235e22d18410461fb896685c4270642738ed268");
-    EXPECT_EQ(hex(output.json()), "7b22616d6f756e74223a2231303030303030303030303030222c22636f6465223a22222c2264617461223a22222c226761734c696d6974223a2231222c226761735072696365223a2231303030303030303030222c226e6f6e6365223a322c227075624b6579223a22303366623330623139366365336539373635393365636332646132323064636139636465613863383464323337333737303034326139333062383932616330663563222c227369676e6174757265223a223030316661346466303863313161346137396539366536393339396565343865656563633738323331613738623033353561386361373833633737633133393433366533373933346665636332323532656438646163303065323335653232643138343130343631666238393636383563343237303634323733386564323638222c22746f41646472223a2237464363614366303636613546323645653341466663324544314641393831304465616136333243222c2276657273696f6e223a36353533377d");
-}
-
-TEST(TWAnySignerZilliqa, SignJSON) {
-    auto json = STRING(R"({"version":65537,"nonce":"2","to":"zil10lx2eurx5hexaca0lshdr75czr025cevqu83uz","gasPrice":"O5rKAA==","gasLimit":"1","transaction":{"transfer":{"amount":"6NSlEAA="}}})");
-    auto key = DATA("0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748");
-    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeZilliqa));
-
-    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeZilliqa));
-    assertStringsEqual(result, "7b22616d6f756e74223a2231303030303030303030303030222c22636f6465223a22222c2264617461223a22222c226761734c696d6974223a2231222c226761735072696365223a2231303030303030303030222c226e6f6e6365223a322c227075624b6579223a22303366623330623139366365336539373635393365636332646132323064636139636465613863383464323337333737303034326139333062383932616330663563222c227369676e6174757265223a223030316661346466303863313161346137396539366536393339396565343865656563633738323331613738623033353561386361373833633737633133393433366533373933346665636332323532656438646163303065323335653232643138343130343631666238393636383563343237303634323733386564323638222c22746f41646472223a2237464363614366303636613546323645653341466663324544314641393831304465616136333243222c2276657273696f6e223a36353533377d");
-}
-
-} // namespace TW::Zilliqa::tests
\ No newline at end of file
diff --git a/tests/Zilliqa/TWCoinTypeTests.cpp b/tests/Zilliqa/TWCoinTypeTests.cpp
deleted file mode 100644
index 0b1d57ea02b..00000000000
--- a/tests/Zilliqa/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWZilliqaCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeZilliqa));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeZilliqa, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeZilliqa, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeZilliqa));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeZilliqa));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeZilliqa), 12);
-    ASSERT_EQ(TWBlockchainZilliqa, TWCoinTypeBlockchain(TWCoinTypeZilliqa));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeZilliqa));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeZilliqa));
-    assertStringsEqual(symbol, "ZIL");
-    assertStringsEqual(txUrl, "https://viewblock.io/zilliqa/tx/t123");
-    assertStringsEqual(accUrl, "https://viewblock.io/zilliqa/address/a12");
-    assertStringsEqual(id, "zilliqa");
-    assertStringsEqual(name, "Zilliqa");
-}
diff --git a/tests/algorithm/erase_tests.cpp b/tests/algorithm/erase_tests.cpp
deleted file mode 100644
index 6a0ca0c41aa..00000000000
--- a/tests/algorithm/erase_tests.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "algorithm/erase.h"
-
-#include "gtest/gtest.h"
-#include <numeric> // std::iota
-
-TEST(Algorithm, Erase) {
-    std::vector<char> cnt(10);
-    std::iota(cnt.begin(), cnt.end(), '0');
-    cnt.back() = '3';
-    std::size_t nbElementsErased = TW::erase(cnt, '3');
-    ASSERT_EQ(cnt.size(), 8ul);
-    ASSERT_EQ(nbElementsErased, 2ul);
-}
-
-TEST(Algorithm, EraseIf) {
-    std::vector<char> cnt(10);
-    std::iota(cnt.begin(), cnt.end(), '0');
-    auto erased = TW::erase_if(cnt, [](char x) { return (x - '0') % 2 == 0; });
-    ASSERT_EQ(cnt.size(), 5ul);
-    ASSERT_EQ(erased, 5ul);
-}
diff --git a/tests/algorithm/sort_copy_tests.cpp b/tests/algorithm/sort_copy_tests.cpp
deleted file mode 100644
index 2603ee27b5a..00000000000
--- a/tests/algorithm/sort_copy_tests.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "algorithm/sort_copy.h"
-
-#include "gtest/gtest.h"
-
-using namespace TW;
-
-struct Amount {
-    int value;
-};
-
-TEST(SortCopy, IsSorted) {
-    std::vector<int> data{9, 1, 2, 4, 5};
-    const auto sorted = sortCopy(data);
-    std::vector<Amount> anotherData{Amount{.value = 9}, Amount{.value = 1}, Amount{.value = 0}};
-    auto sortFunctor = [](auto&& lhs, auto&& rhs) { return lhs.value < rhs.value; };
-    const auto anotherSorted = sortCopy(anotherData, sortFunctor);
-    ASSERT_TRUE(std::is_sorted(cbegin(sorted), cend(sorted)));
-    ASSERT_TRUE(std::is_sorted(cbegin(anotherSorted), cend(anotherSorted), sortFunctor));
-}
\ No newline at end of file
diff --git a/tests/algorithm/to_array_tests.cpp b/tests/algorithm/to_array_tests.cpp
deleted file mode 100644
index 58d181ad663..00000000000
--- a/tests/algorithm/to_array_tests.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "algorithm/to_array.h"
-
-#include "gtest/gtest.h"
-
-using namespace TW;
-
-TEST(Algorithms, ToArray) {
-    std::string str{"foo"};
-    auto value = TW::to_array<std::uint8_t, 4>(str);
-    auto expected = std::array<std::uint8_t, 4>{"foo"};
-    ASSERT_EQ(value, expected);
-
-    std::vector<std::uint8_t> ints{0, 1, 2};
-    auto another_value = TW::to_array<std::uint8_t, 3>(ints);
-    auto expected_ints = std::array<std::uint8_t, 3>{0, 1, 2};
-    ASSERT_EQ(another_value, expected_ints);
-}
diff --git a/tests/chains/Acala/TWAnyAddressTests.cpp b/tests/chains/Acala/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..e62412a1736
--- /dev/null
+++ b/tests/chains/Acala/TWAnyAddressTests.cpp
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWPublicKey.h>
+#include "Hash.h"
+#include "PublicKey.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Polkadot::tests {
+
+inline constexpr uint32_t acalaPrefix{10};
+
+TEST(TWAcalaAnyAddress, IsValid) {
+    EXPECT_TRUE(TWAnyAddressIsValidSS58(STRING("212ywJGVK2Nxnt5bjKXVHi4YY7FCFd4rVvhyt95CjpeHGZee").get(), TWCoinTypePolkadot, acalaPrefix));
+    EXPECT_TRUE(TWAnyAddressIsValid(STRING("212ywJGVK2Nxnt5bjKXVHi4YY7FCFd4rVvhyt95CjpeHGZee").get(), TWCoinTypeAcala));
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("212ywJGVK2Nxnt5bjKXVHi4YY7FCFd4rVvhyt95CjpeHGZee").get(), TWCoinTypePolkadot));
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("212ywJGVK2Nxnt5bjKXVHi4YY7FCFd4rVvhyt95CjpeHGZee").get(), TWCoinTypeBitcoin));
+    EXPECT_FALSE(TWAnyAddressIsValidSS58(STRING("15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu").get(), TWCoinTypePolkadot, acalaPrefix));
+}
+
+TEST(TWAcalaAnyAddress, createFromPubKey) {
+    const auto data = DATA("e9590e4d99264a14a85e21e69537e4a64f66a875d38cb8f76b305f41fabe24a9");
+    const auto pubkey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(data.get(), TWPublicKeyTypeED25519));
+    const auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(pubkey.get(), TWCoinTypeAcala));
+    const auto addrDescription = TWAnyAddressDescription(addr.get());
+    EXPECT_EQ("269ZCS3WLGydTN8ynhyhZfzJrXkePUcdhwgLQs6TWFs5wVL5", *reinterpret_cast<const std::string*>(addrDescription));
+    TWStringDelete(addrDescription);
+}
+
+TEST(TWAcalaAnyAddress, createFromString) {
+    const auto acalaAddress = STRING("24CKv1LJ1T3U9ujCN63YzTPuQjcmURGA2xTjim98UKXxgNXT");
+    const auto anyAddr = TWAnyAddressCreateWithString(acalaAddress.get(), TWCoinTypeAcala);
+    const auto addrDescription = TWAnyAddressDescription(anyAddr);
+    ASSERT_TRUE(TWAnyAddressIsValidSS58(addrDescription, TWCoinTypePolkadot, acalaPrefix));
+    ASSERT_TRUE(TWAnyAddressIsValid(addrDescription, TWCoinTypeAcala));
+    TWStringDelete(addrDescription);
+    TWAnyAddressDelete(anyAddr);
+}
+
+TEST(TWAcalaAnyAddress, createFromPubKeyAcalaPrefix) {
+    const auto data = DATA("92fd9c237030356e26cfcc4568dc71055d5ec92dfe0ff903767e00611971bad3");
+    const auto pubkey = TWPublicKeyCreateWithData(data.get(), TWPublicKeyTypeED25519);
+    const auto twAddress = TWAnyAddressCreateSS58WithPublicKey(pubkey, TWCoinTypePolkadot, acalaPrefix);
+    auto address = TWAnyAddressDescription(twAddress);
+    EXPECT_EQ("24CKv1LJ1T3U9ujCN63YzTPuQjcmURGA2xTjim98UKXxgNXT", *reinterpret_cast<const std::string*>(address));
+    TWStringDelete(address);
+    TWAnyAddressDelete(twAddress);
+    TWPublicKeyDelete(pubkey);
+}
+
+TEST(TWAcalaAnyAddress, createFromStringAcalaPrefix) {
+    const auto acalaAddress = STRING("24CKv1LJ1T3U9ujCN63YzTPuQjcmURGA2xTjim98UKXxgNXT");
+    const auto anyAddr = TWAnyAddressCreateSS58(acalaAddress.get(), TWCoinTypePolkadot, acalaPrefix);
+    const auto addrDescription = TWAnyAddressDescription(anyAddr);
+    ASSERT_TRUE(TWAnyAddressIsValidSS58(addrDescription, TWCoinTypePolkadot, acalaPrefix));
+    TWStringDelete(addrDescription);
+    TWAnyAddressDelete(anyAddr);
+}
+
+}
diff --git a/tests/chains/Acala/TWAnySignerTests.cpp b/tests/chains/Acala/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..cf8cb5f1641
--- /dev/null
+++ b/tests/chains/Acala/TWAnySignerTests.cpp
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "uint256.h"
+#include "proto/Polkadot.pb.h"
+#include "Polkadot/Extrinsic.h"
+#include "PrivateKey.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Polkadot::tests {
+
+TEST(TWAnySignerAcala, Sign) {
+    // Successfully broadcasted: https://acala.subscan.io/extrinsic/3893620-3
+    auto secret = parse_hex("9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0");
+
+    auto genesisHash = parse_hex("fc41b9bd8ef8fe53d58c7ea67c794c7ec9a73daf05e6d54b14ff6342c99ba64c");
+    auto blockHash = parse_hex("707ffa05b7dc6cdb6356bd8bd51ff20b2757c3214a76277516080a10f1bc7537");
+
+    auto input = Proto::SigningInput();
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    input.set_nonce(0);
+    input.set_spec_version(2270);
+    input.set_private_key(secret.data(), secret.size());
+    input.set_network(10); // Acala
+    input.set_transaction_version(2);
+    input.set_multi_address(true);
+
+    auto &era = *input.mutable_era();
+    era.set_block_number(3893613);
+    era.set_period(64);
+
+    auto balanceCall = input.mutable_balance_call();
+    auto &transfer = *balanceCall->mutable_transfer();
+    auto value = store(uint256_t(1'000'000'000'000));
+    transfer.set_to_address("25Qqz3ARAvnZbahGZUzV3xpP1bB3eRrupEprK7f2FNbHbvsz");
+    transfer.set_value(value.data(), value.size());
+
+    auto* callIndices = transfer.mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x0a);
+    callIndices->set_method_index(0x00);
+
+    auto extrinsic = Extrinsic(input);
+    auto preimage = extrinsic.encodePayload();
+    EXPECT_EQ(hex(preimage), "0a0000c8c602ded977c56076ae38d98026fa669ca10d6a2b5a0bfc4086ae7668ed1c60070010a5d4e8d502000000de08000002000000fc41b9bd8ef8fe53d58c7ea67c794c7ec9a73daf05e6d54b14ff6342c99ba64c707ffa05b7dc6cdb6356bd8bd51ff20b2757c3214a76277516080a10f1bc753700");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypePolkadot);
+
+    EXPECT_EQ(hex(output.encoded()), "45028400e9590e4d99264a14a85e21e69537e4a64f66a875d38cb8f76b305f41fabe24a900a9c3111fb98507f929e4da9aea30f996c69d2790e5a1e789f91634dc5d4f6afb155e0f1ea623498c04778f06dbc698109c3490c3e6b4c33d8e58ebab82a0f40bd5020000000a0000c8c602ded977c56076ae38d98026fa669ca10d6a2b5a0bfc4086ae7668ed1c60070010a5d4e8");
+}
+
+} // namespace TW::Polkadot::tests
diff --git a/tests/chains/Acala/TWCoinTypeTests.cpp b/tests/chains/Acala/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..bf861303797
--- /dev/null
+++ b/tests/chains/Acala/TWCoinTypeTests.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAcalaCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeAcala;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xf3d58aafb1208bc09d10ba74bbf1c7811dc55a9149c1505256b6fb5603f5047f"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("26JqMKx4HJJcmb1kXo24HYYobiK2jURGCq6zuEzFBK3hQ9Ti"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "acala");
+    assertStringsEqual(name, "Acala");
+    assertStringsEqual(symbol, "ACA");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 12);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainPolkadot);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(txUrl, "https://acala.subscan.io/extrinsic/0xf3d58aafb1208bc09d10ba74bbf1c7811dc55a9149c1505256b6fb5603f5047f");
+    assertStringsEqual(accUrl, "https://acala.subscan.io/account/26JqMKx4HJJcmb1kXo24HYYobiK2jURGCq6zuEzFBK3hQ9Ti");
+}
diff --git a/tests/chains/AcalaEVM/TWCoinTypeTests.cpp b/tests/chains/AcalaEVM/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..9381d5ac91a
--- /dev/null
+++ b/tests/chains/AcalaEVM/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAcalaEVMCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeAcalaEVM;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x4b0b151dd71ed8ef3174da18565790bf14f0a903a13e4f3266c7848bc8841593"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "acalaevm");
+    assertStringsEqual(name, "Acala EVM");
+    assertStringsEqual(symbol, "ACA");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "787");
+    assertStringsEqual(txUrl, "https://blockscout.acala.network/tx/0x4b0b151dd71ed8ef3174da18565790bf14f0a903a13e4f3266c7848bc8841593");
+    assertStringsEqual(accUrl, "https://blockscout.acala.network/address/0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1");
+}
diff --git a/tests/chains/Aeternity/AddressTests.cpp b/tests/chains/Aeternity/AddressTests.cpp
new file mode 100644
index 00000000000..581a9d75b86
--- /dev/null
+++ b/tests/chains/Aeternity/AddressTests.cpp
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <Aeternity/Address.h>
+#include <HexCoding.h>
+#include <gtest/gtest.h>
+
+namespace TW::Aeternity::tests {
+
+TEST(AeternityAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("ee93a4f66f8d16b819bb9beb9ffccdfcdc1412e87fee6a324c2a99a1e0e67148"), TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
+    ASSERT_ANY_THROW(Address(PublicKey(parse_hex("03df9a5e4089f89d45913fb2b856de984c7e8bf1344cc6444cc9705899a48c939d"), TWPublicKeyTypeSECP256k1)));
+}
+
+TEST(AeternityAddress, FromString) {
+    auto address = Address("ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
+    ASSERT_EQ(address.string(), "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
+    ASSERT_ANY_THROW(Address("invalid"));
+    ASSERT_ANY_THROW(Address("behave@wallet"));
+}
+
+} // namespace TW::Aeternity::tests
diff --git a/tests/chains/Aeternity/SignerTests.cpp b/tests/chains/Aeternity/SignerTests.cpp
new file mode 100644
index 00000000000..3fe61a03851
--- /dev/null
+++ b/tests/chains/Aeternity/SignerTests.cpp
@@ -0,0 +1,83 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Aeternity/Signer.h"
+#include "Aeternity/Transaction.h"
+#include "HexCoding.h"
+
+#include "Aeternity/Address.h"
+#include <gtest/gtest.h>
+#include "uint256.h"
+
+namespace TW::Aeternity::tests {
+
+TEST(AeternitySigner, Sign) {
+    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
+    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
+    uint256_t amount = 10;
+    uint256_t fee = 20000000000000;
+    std::string payload = "Hello World";
+    uint64_t ttl = 82757;
+    uint64_t nonce = 49;
+
+    auto transaction = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
+    auto privateKey = PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
+
+    auto result = Signer::sign(privateKey, transaction);
+    EXPECT_EQ(result.signature(), "sg_VW42qDPP3MMNFAStYaumjZz7mC7BZYpbNa15E57ejqUe7JdQFWCiX65eLNUpGMpt8tSpfgCfkYzcaFppqx7W75CrcWdC8");
+    EXPECT_EQ(result.encoded(), "tx_+KkLAfhCuEDZ2XDV5OuHv1iuLn66sFLBUwnzp1K8JW1Zz+fEgmuEh6HEvNu0R112M3IYkVzvTSnT0pJ3TWhVOumgJ+IWwW8HuGH4XwwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKMKhhIwnOVAAIMBQ0Uxi0hlbGxvIFdvcmxkDZqNSg==");
+}
+
+TEST(AeternitySigner, SignTxWithZeroTtl) {
+    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
+    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
+    uint256_t amount = 10;
+    uint256_t fee = 20000000000000;
+    std::string payload = "Hello World";
+    uint64_t ttl = 0;
+    uint64_t nonce = 49;
+
+    auto transaction = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
+    auto privateKey = PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
+
+    auto result = Signer::sign(privateKey, transaction);
+    EXPECT_EQ(result.signature(), "sg_7qJK868bqEZ5ciC2P3WCKYfhayvKTHvPsz3bdPgpfF3Ky7yNg9f8k22A3gxjjSm9afa6JmP8TJpF4GJkFh2k7gGaog9KS");
+    EXPECT_EQ(result.encoded(), "tx_+KYLAfhCuEA0OgWhpq/VfS6ksMS+Df4ewZxIITEhjaaMOiyT0aRuAEe6b5+d2cQtzoyz58NNr+N4MFowctrGXrCrrkhNIywLuF74XAwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKMKhhIwnOVAAAAxi0hlbGxvIFdvcmxkjoDNvQ==");
+}
+
+TEST(AeternitySigner, SignTxWithZeroAmount) {
+    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
+    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
+    uint256_t amount = 0;
+    uint256_t fee = 20000000000000;
+    std::string payload = "Zero amount test";
+    uint64_t ttl = 113579;
+    uint64_t nonce = 7;
+
+    auto transaction = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
+    auto privateKey = PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
+
+    auto result = Signer::sign(privateKey, transaction);
+    EXPECT_EQ(result.signature(), "sg_ShWvujPnyKBT1Ng2X5k6XSchVK8Bq7LYEisPMH11DUoPkXZcooBzqw81j9j5JewoFFpT9xEhUptj1azcLA21ogURYh4Lz");
+    EXPECT_EQ(result.encoded(), "tx_+K4LAfhCuEDEbeoiVYmJCXm91KNfZXOvZMoT9x/sZja09EXZmErFBxm52b1IVoM4806Zr+TsliAYzUyKfUUFo3jGfXEPdZ8PuGb4ZAwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKMAhhIwnOVAAIMBu6sHkFplcm8gYW1vdW50IHRlc3S5L3Vn");
+}
+
+TEST(AeternitySigner, SignTxWithZeroNonce) {
+    std::string sender_id = "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw";
+    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
+    uint256_t amount = 3369980000000000000;
+    uint256_t fee = 20000000000000;
+    std::string payload = "Zero nonce test";
+    uint64_t ttl = 113579;
+    uint64_t nonce = 0;
+
+    auto transaction = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
+    auto privateKey = PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
+
+    auto result = Signer::sign(privateKey, transaction);
+    EXPECT_EQ(result.signature(), "sg_MaJc4ptSUhq5kH6mArszDAvu4f7PejyuhmgM6U8GEr8bRUTaSFbdFPx4C6FEYA5v5Lgwu9EToaWnHgR2xkqZ9JjHnaBpA");
+    EXPECT_EQ(result.encoded(), "tx_+LULAfhCuECdQsgcE8bp+9CANdasxkt5gxfjBSI1ztyPl1aNJbm+MwUvE7Lu/qvAkHijfe+Eui2zrqhZRYc5mblRa+oLOIIEuG34awwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKOILsSS9IArwACGEjCc5UAAgwG7qwCPWmVybyBub25jZSB0ZXN0piWfFA==");
+}
+
+} // namespace TW::Aeternity::tests
diff --git a/tests/Aeternity/TWAeternityAddressTests.cpp b/tests/chains/Aeternity/TWAeternityAddressTests.cpp
similarity index 75%
rename from tests/Aeternity/TWAeternityAddressTests.cpp
rename to tests/chains/Aeternity/TWAeternityAddressTests.cpp
index 51376f5cf7a..79cb259b3f6 100644
--- a/tests/Aeternity/TWAeternityAddressTests.cpp
+++ b/tests/chains/Aeternity/TWAeternityAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWAnyAddress.h>
 #include <TrustWalletCore/TWHDWallet.h>
diff --git a/tests/chains/Aeternity/TWAnyAddressTests.cpp b/tests/chains/Aeternity/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..f747af3e862
--- /dev/null
+++ b/tests/chains/Aeternity/TWAnyAddressTests.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <gtest/gtest.h>
+#include <TestUtilities.h>
+
+namespace TW::Aeternity::tests {
+
+// `TWAnyAddressIsValid` must catch exceptions and return false.
+TEST(AeternityAddress, IsValid) {
+    ASSERT_FALSE(TWAnyAddressIsValid(STRING("invalid").get(), TWCoinTypeAeternity));
+    ASSERT_FALSE(TWAnyAddressIsValid(STRING("behave@wallet").get(), TWCoinTypeAeternity));
+    ASSERT_FALSE(TWAnyAddressIsValid(STRING("a").get(), TWCoinTypeAeternity));
+}
+
+} // namespace TW::Aeternity::tests
diff --git a/tests/chains/Aeternity/TWAnySignerTests.cpp b/tests/chains/Aeternity/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..75be60551f3
--- /dev/null
+++ b/tests/chains/Aeternity/TWAnySignerTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "uint256.h"
+#include "proto/Aeternity.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Aeternity::tests {
+
+TEST(TWAnySignerAeternity, Sign) {
+    auto privateKey = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+
+    Proto::SigningInput input;
+    input.set_from_address("ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
+    input.set_to_address("ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v");
+    auto amount = store(uint256_t(10));
+    input.set_amount(amount.data(), amount.size());
+    auto fee = store(uint256_t(20000000000000));
+    input.set_fee(fee.data(), fee.size());
+    input.set_payload("Hello World");
+    input.set_ttl(82757);
+    input.set_nonce(49);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeAeternity);
+
+    ASSERT_EQ(output.encoded(), "tx_+KkLAfhCuEDZ2XDV5OuHv1iuLn66sFLBUwnzp1K8JW1Zz+fEgmuEh6HEvNu0R112M3IYkVzvTSnT0pJ3TWhVOumgJ+IWwW8HuGH4XwwBoQHuk6T2b40WuBm7m+uf/M383BQS6H/uajJMKpmh4OZxSKEBHxOjsIvwAUAGYqaLadh194A87EwIZH9u1dhMeJe9UKMKhhIwnOVAAIMBQ0Uxi0hlbGxvIFdvcmxkDZqNSg==");
+}
+
+} // namespace TW::Aeternity::tests
diff --git a/tests/chains/Aeternity/TWCoinTypeTests.cpp b/tests/chains/Aeternity/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..a5ea4fed267
--- /dev/null
+++ b/tests/chains/Aeternity/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAeternityCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAeternity));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAeternity, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAeternity, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAeternity));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAeternity));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAeternity), 18);
+    ASSERT_EQ(TWBlockchainAeternity, TWCoinTypeBlockchain(TWCoinTypeAeternity));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAeternity));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAeternity));
+    assertStringsEqual(symbol, "AE");
+    assertStringsEqual(txUrl, "https://explorer.aepps.com/transactions/t123");
+    assertStringsEqual(accUrl, "https://explorer.aepps.com/account/transactions/a12");
+    assertStringsEqual(id, "aeternity");
+    assertStringsEqual(name, "Aeternity");
+}
diff --git a/tests/chains/Aeternity/TransactionTests.cpp b/tests/chains/Aeternity/TransactionTests.cpp
new file mode 100644
index 00000000000..f09aa5a9de1
--- /dev/null
+++ b/tests/chains/Aeternity/TransactionTests.cpp
@@ -0,0 +1,61 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "TestUtilities.h"
+#include <Aeternity/Signer.h>
+#include <gtest/gtest.h>
+
+namespace TW::Aeternity::tests {
+
+TEST(AeternityTransaction, EncodeRlp) {
+    std::string sender_id = "ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi";
+    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
+    uint64_t amount = 10;
+    uint64_t fee = 2e13;
+    std::string payload = "Hello World";
+    uint64_t ttl = 82757;
+    uint64_t nonce = 49;
+
+    auto tx = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
+    auto encodedTx = tx.encode();
+    auto encodedTxHex = TW::hex(encodedTx);
+
+    ASSERT_EQ(encodedTxHex, "f85f0c01a101cea7ade470c9f99d9d4e400880a86f1d49bb444b62f11a9ebb64bbcfeb73fef3a1011f13a3b08bf001400662a68b69d875f7803cec4c08647f6ed5d84c7897bd50a30a8612309ce5400083014345318b48656c6c6f20576f726c64");
+}
+
+TEST(AeternityTransaction, EncodeRlpWithZeroAmount) {
+    std::string sender_id = "ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi";
+    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
+    uint64_t amount = 0;
+    uint64_t fee = 2e13;
+    std::string payload = "Hello World";
+    uint64_t ttl = 82757;
+    uint64_t nonce = 49;
+
+    auto tx = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
+    auto encodedTx = tx.encode();
+    auto encodedTxHex = TW::hex(encodedTx);
+
+    ASSERT_EQ(encodedTxHex, "f85f0c01a101cea7ade470c9f99d9d4e400880a86f1d49bb444b62f11a9ebb64bbcfeb73fef3a1011f13a3b08bf001400662a68b69d875f7803cec4c08647f6ed5d84c7897bd50a3008612309ce5400083014345318b48656c6c6f20576f726c64");
+}
+
+TEST(AeternityTransaction, EncodeRlpWithZeroTtl) {
+    std::string sender_id = "ak_2a1j2Mk9YSmC1gioUq4PWRm3bsv887MbuRVwyv4KaUGoR1eiKi";
+    std::string recipient_id = "ak_Egp9yVdpxmvAfQ7vsXGvpnyfNq71msbdUpkMNYGTeTe8kPL3v";
+    uint64_t amount = 10;
+    uint64_t fee = 2e13;
+    std::string payload = "Hello World";
+    uint64_t ttl = 0;
+    uint64_t nonce = 49;
+
+    auto tx = Transaction(sender_id, recipient_id, amount, fee, payload, ttl, nonce);
+    auto encodedTx = tx.encode();
+    auto encodedTxHex = TW::hex(encodedTx);
+
+    ASSERT_EQ(encodedTxHex, "f85c0c01a101cea7ade470c9f99d9d4e400880a86f1d49bb444b62f11a9ebb64bbcfeb73fef3a1011f13a3b08bf001400662a68b69d875f7803cec4c08647f6ed5d84c7897bd50a30a8612309ce5400000318b48656c6c6f20576f726c64");
+}
+
+} // namespace TW::Aeternity::tests
diff --git a/tests/chains/Aion/AddressTests.cpp b/tests/chains/Aion/AddressTests.cpp
new file mode 100644
index 00000000000..a2ad39be5ac
--- /dev/null
+++ b/tests/chains/Aion/AddressTests.cpp
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Aion/Address.h"
+#include "Coin.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+#include "TestUtilities.h"
+
+using namespace TW;
+
+namespace TW::Aion::tests {
+
+TEST(AionAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("01a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7"), TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "0xa0d2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7");
+}
+
+TEST(AionAddress, FromString) {
+    std::string aionAddress = "0xa0d2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7";
+    const auto address = Address(aionAddress);
+    ASSERT_EQ(address.string(), aionAddress);
+    ASSERT_ANY_THROW(Address("0xffff"));
+}
+
+TEST(AionAddress, InvalidFromData) {
+    ASSERT_ANY_THROW(Address(parse_hex("0xffff")));
+    auto aionAddress = parse_hex("0xa0d2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7");
+    [[maybe_unused]] auto res = Address(aionAddress);
+}
+
+TEST(AionAddress, isValid) {
+    std::string validAddress = "0xa0d2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7";
+    std::string invalidAddress = "0xzzd2312facea71b740679c926d040c9056a65a4bfa2ddd18ec160064f82909e7";
+
+    ASSERT_TRUE(Address::isValid(validAddress));
+    ASSERT_EQ(Address(parse_hex(validAddress)).string(), validAddress);
+    ASSERT_FALSE(Address::isValid(invalidAddress));
+    EXPECT_EXCEPTION(Address(parse_hex(invalidAddress)), "Invalid address data");
+}
+
+} // namespace TW::Aion::tests
diff --git a/tests/chains/Aion/RLPTests.cpp b/tests/chains/Aion/RLPTests.cpp
new file mode 100644
index 00000000000..d18b892ef3c
--- /dev/null
+++ b/tests/chains/Aion/RLPTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Aion/RLP.h"
+#include "HexCoding.h"
+#include <gtest/gtest.h>
+
+namespace TW::Aion::tests {
+
+using boost::multiprecision::uint128_t;
+
+// Function helper over `RLP::prepareLong`.
+Data encodeLong(const uint128_t& l) {
+    EthereumRlp::Proto::EncodingInput input;
+    *input.mutable_item() = RLP::prepareLong(l);
+    return Ethereum::RLP::encode(input);
+}
+
+TEST(AionRLP, EncodeLong) {
+    EXPECT_EQ(hex(encodeLong(uint128_t(1))), "01");
+    EXPECT_EQ(hex(encodeLong(uint128_t(21000))), "825208");
+    EXPECT_EQ(hex(encodeLong(uint128_t(1000000))), "830f4240");
+    EXPECT_EQ(hex(encodeLong(uint128_t(20000000000))), "8800000004a817c800");
+    EXPECT_EQ(hex(encodeLong(uint128_t(9007199254740991))), "88001fffffffffffff");
+    EXPECT_EQ(hex(encodeLong(uint128_t(9007199254740990))), "88001ffffffffffffe");
+    EXPECT_EQ(hex(encodeLong(uint128_t(4294967296L))), "880000000100000000");
+    EXPECT_EQ(hex(encodeLong(uint128_t(4295000060L))), "880000000100007ffc");
+    EXPECT_EQ(hex(encodeLong(uint128_t(72057594037927935L))), "8800ffffffffffffff");
+}
+
+} // namespace TW::Aion::tests
diff --git a/tests/chains/Aion/SignerTests.cpp b/tests/chains/Aion/SignerTests.cpp
new file mode 100644
index 00000000000..84927f7dcee
--- /dev/null
+++ b/tests/chains/Aion/SignerTests.cpp
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Aion/Signer.h"
+#include "Aion/Transaction.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Aion::tests {
+
+TEST(AionSigner, Sign) {
+    auto address = Aion::Address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
+    auto transaction = Transaction(9, 20000000000, 21000, address, 10000, 155157377101, {});
+
+    auto privateKey = PrivateKey(parse_hex("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9"));
+    Signer::sign(privateKey, transaction);
+
+    EXPECT_EQ(hex(transaction.signature), "a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
+
+    // Raw transaction
+    EXPECT_EQ(hex(transaction.encode()), "f89b09a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
+}
+
+TEST(AionSigner, SignWithData) {
+    auto address = Aion::Address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
+    auto transaction = Transaction(9, 20000000000, 21000, address, 10000, 155157377101, parse_hex("41494f4e0000"));
+
+    auto privateKey = PrivateKey(parse_hex("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9"));
+    Signer::sign(privateKey, transaction);
+
+    EXPECT_EQ(hex(transaction.signature), "a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a736fc2642c2d62900204779aa274dba3b8712eff7a8464aa78ea52b09ece20679fe3f5edf94c84a7e0c5f93213be891bc279af927086f455167f5bc73d3046c0d");
+
+    // Raw transaction
+    EXPECT_EQ(hex(transaction.encode()), "f8a109a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108641494f4e000085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a736fc2642c2d62900204779aa274dba3b8712eff7a8464aa78ea52b09ece20679fe3f5edf94c84a7e0c5f93213be891bc279af927086f455167f5bc73d3046c0d");
+}
+
+} // namespace TW::Aion::tests
diff --git a/tests/chains/Aion/TWAnySignerTests.cpp b/tests/chains/Aion/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..79a3a21d7f2
--- /dev/null
+++ b/tests/chains/Aion/TWAnySignerTests.cpp
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "uint256.h"
+#include "proto/Aion.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Aion::tests {
+
+TEST(TWAnySignerAion, Sign) {
+    auto privateKey = parse_hex("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9");
+
+    Proto::SigningInput input;
+    input.set_to_address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
+    auto amount = store(uint256_t(10000));
+    input.set_amount(amount.data(), amount.size());
+    auto gasPrice = store(uint256_t(20000000000));
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    auto gasLimit = store(uint256_t(21000));
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    auto nonce = store(uint256_t(9));
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_timestamp(155157377101);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeAion);
+
+    ASSERT_EQ(hex(output.encoded()), "f89b09a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
+}
+
+} // namespace TW::Aion::tests
diff --git a/tests/chains/Aion/TWCoinTypeTests.cpp b/tests/chains/Aion/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..39175f51569
--- /dev/null
+++ b/tests/chains/Aion/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAionCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAion));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAion, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAion, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAion));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAion));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAion), 18);
+    ASSERT_EQ(TWBlockchainAion, TWCoinTypeBlockchain(TWCoinTypeAion));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAion));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAion));
+    assertStringsEqual(symbol, "AION");
+    assertStringsEqual(txUrl, "https://mainnet.aion.network/#/transaction/t123");
+    assertStringsEqual(accUrl, "https://mainnet.aion.network/#/account/a12");
+    assertStringsEqual(id, "aion");
+    assertStringsEqual(name, "Aion");
+}
diff --git a/tests/chains/Aion/TransactionCompilerTests.cpp b/tests/chains/Aion/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..e10e739bec2
--- /dev/null
+++ b/tests/chains/Aion/TransactionCompilerTests.cpp
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Aion.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Aion::tests {
+
+TEST(AionCompiler, CompileWithSignatures) {
+    /// Step 1: Prepare transaction input (protobuf)
+    auto privateKey = parse_hex("db33ffdf82c7ba903daf68d961d3c23c20471a8ce6b408e52d579fd8add80cc9");
+    auto key = PrivateKey(privateKey);
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
+
+    Proto::SigningInput input;
+    input.set_to_address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
+    auto amount = store(uint256_t(10000));
+    input.set_amount(amount.data(), amount.size());
+    auto gasPrice = store(uint256_t(20000000000));
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    auto gasLimit = store(uint256_t(21000));
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    auto nonce = store(uint256_t(9));
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_timestamp(155157377101);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto txInputData = data(input.SerializeAsString());
+    auto preImageHashes = TransactionCompiler::preImageHashes(TWCoinTypeAion, txInputData);
+
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = data(preSigningOutput.data_hash());
+    EXPECT_EQ(hex(preImageHash), "d4423fe7d233b85c1bf5b1120ec03842e572fb25f3755f7a20bc83addc8c4d85");
+
+    // Simulate signature, normally obtained from signature server
+    const auto signature = key.sign(preImageHash, TWCurveED25519);
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(TWCoinTypeAion, txInputData, {signature}, {publicKey.bytes});
+
+    const auto ExpectedTx =
+        "f89b09a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07";
+    {
+        Aion::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    // double check
+    {
+        Aion::Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeAion);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            TWCoinTypeAion, txInputData, {signature, signature}, {publicKey.bytes});
+        Aion::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            TWCoinTypeAion, txInputData, {}, {});
+        Aion::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+} // namespace TW::Aion::tests
diff --git a/tests/chains/Aion/TransactionTests.cpp b/tests/chains/Aion/TransactionTests.cpp
new file mode 100644
index 00000000000..0e2e73e3ec1
--- /dev/null
+++ b/tests/chains/Aion/TransactionTests.cpp
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Aion/Transaction.h"
+#include "HexCoding.h"
+#include <gtest/gtest.h>
+
+namespace TW::Aion::tests {
+
+TEST(AionTransaction, Encode) {
+    auto address = Aion::Address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
+    auto transaction = Transaction(9, 20000000000, 21000, address, 10000, 155157377101, {});
+    ASSERT_EQ(hex(transaction.encode()), "f83909a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001");
+}
+
+TEST(AionTransaction, EncodeWithSignature) {
+    auto address = Aion::Address("0xa082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e");
+    auto transaction = Transaction(9, 20000000000, 21000, address, 10000, 155157377101, {});
+    transaction.signature = parse_hex("a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
+    ASSERT_EQ(hex(transaction.encode()), "f89b09a0a082c3de528b7807dc27ad66debb16d4cfe4054209398cee619dd95955063d1e8227108085242019b04d8252088800000004a817c80001b860a775daa30b33fda3091768f0561c8042ee23cb48a6a3e5d7e8248b13d04a48a7d3d3386742c2716031b79950cef5fcb49c079a5cab095c8b08915e126b9741389924ba2d5c00036a3b39c2a8562fa0800f1a13a566ce6e027274ce63a41dec07");
+}
+
+} // namespace TW::Aion::tests
diff --git a/tests/chains/Algorand/AddressTests.cpp b/tests/chains/Algorand/AddressTests.cpp
new file mode 100644
index 00000000000..993b0e3247c
--- /dev/null
+++ b/tests/chains/Algorand/AddressTests.cpp
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Algorand/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+
+namespace TW::Algorand::tests {
+
+TEST(AlgorandAddress, Validation) {
+    // empty address
+    ASSERT_FALSE(Address::isValid(""));
+    // invalid checksum
+    ASSERT_FALSE(Address::isValid("JBCQYJ2FREG667NAN7BFKH4RFIKPT7CYDQJNW3SNN5Z7F7ILFLKQ346TS3"));
+    // wrong length
+    ASSERT_FALSE(Address::isValid("JBCQYJ2FREG667NAN7BFKH4RFIKPT7CYDQJNW3SNN5Z7F7ILFLKQ346TSU "));
+    // Stellar address
+    ASSERT_FALSE(Address::isValid("GABQHYQOY22KHGTCTAK24AWAUE4TXERF4O4JBSXELNM7IL5CTPUWM3SC"));
+    // invalid base32
+    ASSERT_FALSE(Address::isValid("0000000000000000000000000000000000000000000000000000000000"));
+
+    ASSERT_TRUE(Address::isValid("HXIWBVQGOO6ZWE5NYJO22XMYRUGZ6TGNX2K2EERPT3ZIWPHE5CLJGB2GEA"));
+}
+
+TEST(AlgorandAddress, FromPrivateKey) {
+    auto privateKey = PrivateKey(parse_hex("526d96fffdbfe787b2f00586298538f9a019e97f6587964dc61aae9ad1d7fa23"));
+    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
+    ASSERT_EQ(address.string(), "JBCQYJ2FREG667NAN7BFKH4RFIKPT7CYDQJNW3SNN5Z7F7ILFLKQ346TSU");
+}
+
+TEST(AlgorandAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("c2b423afa8b0095e5ae105668b91b2132db4dadbf38acfc64908d3476a00191f"), TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "YK2CHL5IWAEV4WXBAVTIXENSCMW3JWW36OFM7RSJBDJUO2QADEP5QYVO5I");
+
+    auto privateKey2 = PrivateKey(parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f"));
+    auto publicKey2 = privateKey2.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    EXPECT_ANY_THROW(new Address(publicKey2));
+}
+
+TEST(AlgorandAddress, FromString) {
+    auto address = Address("PITDOF57RHOVLT37KM7DCXDCETLDL3OA5CBAN7LQ44Z36LGFC27IJ2IQ64");
+    ASSERT_EQ(address.string(), "PITDOF57RHOVLT37KM7DCXDCETLDL3OA5CBAN7LQ44Z36LGFC27IJ2IQ64");
+
+    EXPECT_ANY_THROW(Address(""));
+}
+
+} // namespace TW::Algorand::tests
diff --git a/tests/chains/Algorand/SignerTests.cpp b/tests/chains/Algorand/SignerTests.cpp
new file mode 100644
index 00000000000..1eef1ada080
--- /dev/null
+++ b/tests/chains/Algorand/SignerTests.cpp
@@ -0,0 +1,252 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Algorand/Address.h"
+#include "Algorand/BinaryCoding.h"
+#include "Algorand/Signer.h"
+#include "Base64.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+
+namespace TW::Algorand::tests {
+
+TEST(AlgorandSigner, EncodeNumbers) {
+    auto tests = {
+        std::make_tuple(100ull, "64"),
+        std::make_tuple(200ull, "ccc8"),
+        std::make_tuple(55536ull, "cdd8f0"),
+        std::make_tuple(3294967296ull, "cec4653600"),
+        std::make_tuple(14294967296ull, "cf00000003540be400"),
+    };
+
+    for (auto& test : tests) {
+        Data data;
+        encodeNumber(std::get<0>(test), data);
+        ASSERT_EQ(hex(data), std::get<1>(test));
+    }
+}
+
+TEST(AlgorandSigner, EncodeStrings) {
+    auto tests = {
+        std::make_tuple("algo", "a4616c676f"),
+        std::make_tuple("It's like JSON. but fast and small.", "d92349742773206c696b65204a534f4e2e20627574206661737420616e6420736d616c6c2e"),
+        std::make_tuple(
+            "MessagePack is an efficient binary serialization format. It lets you exchange data among multiple languages like JSON. But it's faster and smaller. Small integers are encoded into a single byte, and typical short strings require only one extra byte in addition to the strings themselves.",
+            "da011f4d6573736167655061636b20697320616e20656666696369656e742062696e6172792073657269616c697a6174696f6e20666f726d61742e204974206c65747320796f752065786368616e6765206461746120616d6f6e67206d756c7469706c65206c616e677561676573206c696b65204a534f4e2e2042757420697427732066617374657220616e6420736d616c6c65722e20536d616c6c20696e7465676572732061726520656e636f64656420696e746f20612073696e676c6520627974652c20616e64207479706963616c2073686f727420737472696e67732072657175697265206f6e6c79206f6e65206578747261206279746520696e206164646974696f6e20746f2074686520737472696e6773207468656d73656c7665732e")};
+
+    for (auto& test : tests) {
+        Data data;
+        Algorand::encodeString(std::get<0>(test), data);
+        ASSERT_EQ(hex(data), std::get<1>(test));
+    }
+}
+
+TEST(AlgorandSigner, EncodeBytes) {
+    auto rawtx = "010000000001029294c2b3bd4d25483c4c12432df01a856a38cc0cb48da1a7dd590b7d893392a90000000000ffffffffded892ea55bf1c6ccc495d3493767d7c24497f612b9edc9ab8d30eb671ea76750000000000ffffffff021027000000000000160014b96bacd6f729ef8ac1dd30d159433c0917ba8d3db00f00000000000016001476cd9d430de6db162fc3db509920255ff6d2bdb002483045022100eb8675ff6775e9c399dddba9f178002b745872e541617d690cbce7c933adb87602205de8074c173696de65d4c644a84ea1337c9e9928c7052fddcf9d99e35815e2f20121032858d3a5f9825408ea3959800c5daf22e7a91e459ef168df45071266501d28e102473044022025f1cf362a9c09bd351769f1918ab9f0a6c3f6c4682f29fdbfc08354554ea37b02203f62345b3da4d7a29f58c7c741682be4108a0fb2013980332cc3e081aad7423f01210237d83670da2d3947a58752dab95d59b592c78f2e734d1c14dbf75b29bbe4116100000000";
+    Data data;
+    encodeBytes(parse_hex(rawtx), data);
+    ASSERT_EQ(hex(data), "c50173010000000001029294c2b3bd4d25483c4c12432df01a856a38cc0cb48da1a7dd590b7d893392a90000000000ffffffffded892ea55bf1c6ccc495d3493767d7c24497f612b9edc9ab8d30eb671ea76750000000000ffffffff021027000000000000160014b96bacd6f729ef8ac1dd30d159433c0917ba8d3db00f00000000000016001476cd9d430de6db162fc3db509920255ff6d2bdb002483045022100eb8675ff6775e9c399dddba9f178002b745872e541617d690cbce7c933adb87602205de8074c173696de65d4c644a84ea1337c9e9928c7052fddcf9d99e35815e2f20121032858d3a5f9825408ea3959800c5daf22e7a91e459ef168df45071266501d28e102473044022025f1cf362a9c09bd351769f1918ab9f0a6c3f6c4682f29fdbfc08354554ea37b02203f62345b3da4d7a29f58c7c741682be4108a0fb2013980332cc3e081aad7423f01210237d83670da2d3947a58752dab95d59b592c78f2e734d1c14dbf75b29bbe4116100000000");
+}
+
+TEST(AlgorandSigner, Sign) {
+    auto key = PrivateKey(parse_hex("c9d3cc16fecabe2747eab86b81528c6ed8b65efc1d6906d86aabc27187a1fe7c"));
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
+    auto from = Address(publicKey);
+    auto to = Address("UCE2U2JC4O4ZR6W763GUQCG57HQCDZEUJY4J5I6VYY4HQZUJDF7AKZO5GM");
+    Data note;
+    std::string genesisId = "mainnet-v1.0";
+    auto genesisHash = Base64::decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=");
+    auto transaction = Transfer(
+        /* from */ from,
+        /* to */ to,
+        /* fee */ 488931,
+        /* amount */ 847,
+        /* first round */ 51,
+        /* last round */ 61,
+        /* note */ note,
+        /* type */ "pay",
+        /* genesis id*/ genesisId,
+        /* genesis hash*/ genesisHash);
+
+    auto serialized = transaction.serialize();
+    auto signature = Signer::sign(key, transaction);
+    auto result = transaction.BaseTransaction::serialize(signature);
+
+    ASSERT_EQ(hex(serialized), "89a3616d74cd034fa3666565ce000775e3a2667633a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c763da3726376c420a089aa6922e3b998fadff6cd4808ddf9e021e4944e389ea3d5c638786689197ea3736e64c42074b000b6368551a6066d713e2866002e8dab34b69ede09a72e85a39bbb1f7928a474797065a3706179");
+    ASSERT_EQ(hex(signature), "de73363dbdeda0682adca06f6268a16a6ec47253c94d5692dc1c49a84a05847812cf66d7c4cf07c7e2f50f143ec365d405e30b35117b264a994626054d2af604");
+    ASSERT_EQ(hex(result), "82a3736967c440de73363dbdeda0682adca06f6268a16a6ec47253c94d5692dc1c49a84a05847812cf66d7c4cf07c7e2f50f143ec365d405e30b35117b264a994626054d2af604a374786e89a3616d74cd034fa3666565ce000775e3a2667633a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c763da3726376c420a089aa6922e3b998fadff6cd4808ddf9e021e4944e389ea3d5c638786689197ea3736e64c42074b000b6368551a6066d713e2866002e8dab34b69ede09a72e85a39bbb1f7928a474797065a3706179");
+}
+
+TEST(AlgorandSigner, SignAssetNFTTransfer) {
+    // Successfully broadcasted: https://app.dappflow.org/explorer/transaction/FFLUH4QKZHG744RIQ2AZNWZUSIIH262KZ4MEWSY4RXMWN5NMOOJA
+    auto key = PrivateKey(parse_hex("dc6051ffc7b3ec601bde432f6dea34d40fe3855e4181afa0f0524c42194a6da7"));
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
+    auto from = Address(publicKey);
+    auto to = Address("362T7CSXNLIOBX6J3H2SCPS4LPYFNV6DDWE6G64ZEUJ6SY5OJIR6SB5CVE");
+    Data note = Base64::decode("VFdUIFRPIFRIRSBNT09O");
+    std::string genesisId = "mainnet-v1.0";
+    auto genesisHash = Base64::decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=");
+    auto transaction = AssetTransfer(
+        /* from */ from,
+        /* to */ to,
+        /* fee */ 1000,
+        /* amount */ 1,
+        /* asset id */ 989643841,
+        /* first round */ 27963950,
+        /* last round */ 27964950,
+        /* note */ note,
+        /* type */ "axfer",
+        /* genesis id*/ genesisId,
+        /* genesis hash*/ genesisHash);
+
+    auto serialized = transaction.serialize();
+    auto signature = Signer::sign(key, transaction);
+    auto result = transaction.BaseTransaction::serialize(signature);
+
+    EXPECT_EQ(hex(serialized), "8ba461616d7401a461726376c420dfb53f8a576ad0e0dfc9d9f5213e5c5bf056d7c31d89e37b992513e963ae4a23a3666565cd03e8a26676ce01aab22ea367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce01aab616a46e6f7465c40f54575420544f20544845204d4f4f4ea3736e64c420ca40799dacdb564d1096611d9da6ca7a6a4916f6d681383860725aedafe91617a474797065a56178666572a478616964ce3afcc441");
+    EXPECT_EQ(Base64::encode(signature), "nXQsDH1ilG3DIo2VQm5tdYKXe9o599ygdqikmROpZiNXAvQeK3avJqgjM5o+iByCdq6uOxlbveDyVmL9nZxxBg==");
+    EXPECT_EQ(hex(result), "82a3736967c4409d742c0c7d62946dc3228d95426e6d7582977bda39f7dca076a8a49913a966235702f41e2b76af26a823339a3e881c8276aeae3b195bbde0f25662fd9d9c7106a374786e8ba461616d7401a461726376c420dfb53f8a576ad0e0dfc9d9f5213e5c5bf056d7c31d89e37b992513e963ae4a23a3666565cd03e8a26676ce01aab22ea367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce01aab616a46e6f7465c40f54575420544f20544845204d4f4f4ea3736e64c420ca40799dacdb564d1096611d9da6ca7a6a4916f6d681383860725aedafe91617a474797065a56178666572a478616964ce3afcc441");
+}
+
+TEST(AlgorandSigner, SignAsset) {
+    // https://explorer.bitquery.io/algorand_testnet/tx/NJ62HYO2LC222AVLIN2GW5LKIWKLGC7NZLIQ3DUL2RDVRYO2UW7A
+    auto key = PrivateKey(parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04"));
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
+    auto from = Address(publicKey);
+    auto to = Address("GJIWJSX2EU5RC32LKTDDXWLA2YICBHKE35RV2ZPASXZYKWUWXFLKNFSS4U");
+    Data note;
+    std::string genesisId = "testnet-v1.0";
+    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
+    auto transaction = AssetTransfer(
+        /* from */ from,
+        /* to */ to,
+        /* fee */ 2340,
+        /* amount */ 1000000,
+        /* asset id */ 13379146,
+        /* first round */ 15775683,
+        /* last round */ 15776683,
+        /* note */ note,
+        /* type */ "axfer",
+        /* genesis id*/ genesisId,
+        /* genesis hash*/ genesisHash);
+
+    auto serialized = transaction.serialize();
+    auto signature = Signer::sign(key, transaction);
+    auto result = transaction.BaseTransaction::serialize(signature);
+
+    ASSERT_EQ(hex(serialized), "8aa461616d74ce000f4240a461726376c420325164cafa253b116f4b54c63bd960d610209d44df635d65e095f3855a96b956a3666565cd0924a26676ce00f0b7c3a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bbaba3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
+    ASSERT_EQ(hex(signature), "412720eff99a17280a437bdb8eeba7404b855d6433fffd5dde7f7966c1f9ae531a1af39e18b8a58b4a6c6acb709cca92f8a18c36d8328be9520c915311027005");
+    ASSERT_EQ(hex(result), "82a3736967c440412720eff99a17280a437bdb8eeba7404b855d6433fffd5dde7f7966c1f9ae531a1af39e18b8a58b4a6c6acb709cca92f8a18c36d8328be9520c915311027005a374786e8aa461616d74ce000f4240a461726376c420325164cafa253b116f4b54c63bd960d610209d44df635d65e095f3855a96b956a3666565cd0924a26676ce00f0b7c3a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bbaba3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
+}
+
+TEST(AlgorandSigner, SignAssetWithNote) {
+    auto key = PrivateKey(parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04"));
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
+    auto from = Address(publicKey);
+    auto to = Address("GJIWJSX2EU5RC32LKTDDXWLA2YICBHKE35RV2ZPASXZYKWUWXFLKNFSS4U");
+    Data note = data("note");
+    std::string genesisId = "testnet-v1.0";
+    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
+    auto transaction = AssetTransfer(
+        /* from */ from,
+        /* to */ to,
+        /* fee */ 2340,
+        /* amount */ 1000000,
+        /* asset id */ 13379146,
+        /* first round */ 15775683,
+        /* last round */ 15776683,
+        /* note */ note,
+        /* type */ "axfer",
+        /* genesis id*/ genesisId,
+        /* genesis hash*/ genesisHash);
+
+    auto serialized = transaction.serialize();
+
+    ASSERT_EQ(hex(serialized), "8ba461616d74ce000f4240a461726376c420325164cafa253b116f4b54c63bd960d610209d44df635d65e095f3855a96b956a3666565cd0924a26676ce00f0b7c3a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bbaba46e6f7465c4046e6f7465a3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
+}
+
+TEST(AlgorandSigner, SignAssetOptIn) {
+    // https://explorer.bitquery.io/algorand_testnet/tx/47LE2QS4B5N6IFHXOUN2MJUTCOQCHNY6AB3AJYECK4IM2VYKJDKQ
+    auto key = PrivateKey(parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04"));
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+    Data note;
+    std::string genesisId = "testnet-v1.0";
+    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
+    auto transaction = OptInAssetTransaction(
+        /* from */ address,
+        /* fee */ 2340,
+        /* asset id */ 13379146,
+        /* first round */ 15775553,
+        /* last round */ 15776553,
+        /* note */ note,
+        /* type */ "axfer",
+        /* genesis id*/ genesisId,
+        /* genesis hash*/ genesisHash);
+
+    auto serialized = transaction.serialize();
+    auto signature = Signer::sign(key, transaction);
+    auto result = transaction.BaseTransaction::serialize(signature);
+
+    ASSERT_EQ(hex(serialized), "89a461726376c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a3666565cd0924a26676ce00f0b741a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bb29a3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
+    ASSERT_EQ(hex(signature), "f3a29d9a40271c00b542b38ab2ccb4967015ae6609368d4b8eb2f5e2b5348577cf9e0f62b0777ccb2d8d9b943b15c24c0cf1db312cb01a3c198d9d9c6c5bb00b");
+    ASSERT_EQ(hex(result), "82a3736967c440f3a29d9a40271c00b542b38ab2ccb4967015ae6609368d4b8eb2f5e2b5348577cf9e0f62b0777ccb2d8d9b943b15c24c0cf1db312cb01a3c198d9d9c6c5bb00ba374786e89a461726376c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a3666565cd0924a26676ce00f0b741a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bb29a3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
+}
+
+TEST(AlgorandSigner, ProtoSignerOptIn) {
+    // https://explorer.bitquery.io/algorand_testnet/tx/47LE2QS4B5N6IFHXOUN2MJUTCOQCHNY6AB3AJYECK4IM2VYKJDKQ
+    auto optIn = new Proto::AssetOptIn();
+    optIn->set_asset_id(13379146);
+
+    auto privateKey = parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04");
+
+    auto input = Proto::SigningInput();
+    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
+    std::string str(genesisHash.begin(), genesisHash.end());
+    input.set_allocated_asset_opt_in(optIn);
+    input.set_genesis_hash(str);
+    input.set_genesis_id("testnet-v1.0");
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_first_round(15775553);
+    input.set_last_round(15776553);
+    input.set_fee(2340);
+
+    auto result = Signer::sign(input);
+    auto encoded = result.encoded();
+
+    ASSERT_EQ(hex(encoded), "82a3736967c440f3a29d9a40271c00b542b38ab2ccb4967015ae6609368d4b8eb2f5e2b5348577cf9e0f62b0777ccb2d8d9b943b15c24c0cf1db312cb01a3c198d9d9c6c5bb00ba374786e89a461726376c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a3666565cd0924a26676ce00f0b741a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bb29a3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
+}
+
+TEST(AlgorandSigner, ProtoSignerAssetTransaction) {
+    // https://explorer.bitquery.io/algorand_testnet/tx/NJ62HYO2LC222AVLIN2GW5LKIWKLGC7NZLIQ3DUL2RDVRYO2UW7A
+    auto transaction = new Proto::AssetTransfer();
+    transaction->set_asset_id(13379146);
+    transaction->set_amount(1000000);
+    transaction->set_to_address("GJIWJSX2EU5RC32LKTDDXWLA2YICBHKE35RV2ZPASXZYKWUWXFLKNFSS4U");
+
+    auto privateKey = parse_hex("5a6a3cfe5ff4cc44c19381d15a0d16de2a76ee5c9b9d83b232e38cb5a2c84b04");
+
+    auto input = Proto::SigningInput();
+    auto genesisHash = Base64::decode("SGO1GKSzyE7IEPItTxCByw9x8FmnrCDexi9/cOUJOiI=");
+    std::string str(genesisHash.begin(), genesisHash.end());
+    input.set_allocated_asset_transfer(transaction);
+    input.set_genesis_hash(str);
+    input.set_genesis_id("testnet-v1.0");
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_first_round(15775683);
+    input.set_last_round(15776683);
+    input.set_fee(2340);
+
+    auto result = Signer::sign(input);
+    auto encoded = result.encoded();
+
+    ASSERT_EQ(hex(encoded), "82a3736967c440412720eff99a17280a437bdb8eeba7404b855d6433fffd5dde7f7966c1f9ae531a1af39e18b8a58b4a6c6acb709cca92f8a18c36d8328be9520c915311027005a374786e8aa461616d74ce000f4240a461726376c420325164cafa253b116f4b54c63bd960d610209d44df635d65e095f3855a96b956a3666565cd0924a26676ce00f0b7c3a367656eac746573746e65742d76312e30a26768c4204863b518a4b3c84ec810f22d4f1081cb0f71f059a7ac20dec62f7f70e5093a22a26c76ce00f0bbaba3736e64c42082872d60c338cb928006070e02ec0942addcb79e7fbd01c76458aea526899bd3a474797065a56178666572a478616964ce00cc264a");
+}
+
+} // namespace TW::Algorand::tests
diff --git a/tests/chains/Algorand/TWAnySignerTests.cpp b/tests/chains/Algorand/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..7d82693add4
--- /dev/null
+++ b/tests/chains/Algorand/TWAnySignerTests.cpp
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "HexCoding.h"
+#include "proto/Algorand.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Algorand::tests {
+
+TEST(TWAnySignerAlgorand, SignAssetNFTTransfer) {
+    // Successfully broadcasted: https://app.dappflow.org/explorer/transaction/FFLUH4QKZHG744RIQ2AZNWZUSIIH262KZ4MEWSY4RXMWN5NMOOJA
+    auto privateKey = parse_hex("dc6051ffc7b3ec601bde432f6dea34d40fe3855e4181afa0f0524c42194a6da7");
+    Data note = Base64::decode("VFdUIFRPIFRIRSBNT09O");
+    auto genesisHash = Base64::decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=");
+
+    Proto::SigningInput input;
+    auto& transaction = *input.mutable_asset_transfer();
+    transaction.set_to_address("362T7CSXNLIOBX6J3H2SCPS4LPYFNV6DDWE6G64ZEUJ6SY5OJIR6SB5CVE");
+    transaction.set_amount(1ull);
+    transaction.set_asset_id(989643841ull);
+    input.set_first_round(27963950ull);
+    input.set_last_round(27964950ull);
+    input.set_fee(1000ull);
+    input.set_genesis_id("mainnet-v1.0");
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_note(note.data(), note.size());
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeAlgorand);
+
+    ASSERT_EQ(hex(output.encoded()), "82a3736967c4409d742c0c7d62946dc3228d95426e6d7582977bda39f7dca076a8a49913a966235702f41e2b76af26a823339a3e881c8276aeae3b195bbde0f25662fd9d9c7106a374786e8ba461616d7401a461726376c420dfb53f8a576ad0e0dfc9d9f5213e5c5bf056d7c31d89e37b992513e963ae4a23a3666565cd03e8a26676ce01aab22ea367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce01aab616a46e6f7465c40f54575420544f20544845204d4f4f4ea3736e64c420ca40799dacdb564d1096611d9da6ca7a6a4916f6d681383860725aedafe91617a474797065a56178666572a478616964ce3afcc441");
+    ASSERT_EQ(output.signature(), "nXQsDH1ilG3DIo2VQm5tdYKXe9o599ygdqikmROpZiNXAvQeK3avJqgjM5o+iByCdq6uOxlbveDyVmL9nZxxBg==");
+}
+
+TEST(TWAnySignerAlgorand, Sign) {
+    auto privateKey = parse_hex("d5b43d706ef0cb641081d45a2ec213b5d8281f439f2425d1af54e2afdaabf55b");
+    auto note = parse_hex("68656c6c6f");
+    auto genesisHash = Base64::decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=");
+
+    Proto::SigningInput input;
+    auto& transaction = *input.mutable_transfer();
+    transaction.set_to_address("CRLADAHJZEW2GFY2UPEHENLOGCUOU74WYSTUXQLVLJUJFHEUZOHYZNWYR4");
+    transaction.set_amount(1000000000000ull);
+    input.set_first_round(1937767ull);
+    input.set_last_round(1938767ull);
+    input.set_fee(263000ull);
+    input.set_genesis_id("mainnet-v1.0");
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_note(note.data(), note.size());
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeAlgorand);
+
+    ASSERT_EQ(hex(output.encoded()), "82a3736967c440baa00062adcdcb5875e4435cdc6885d26bfe5308ab17983c0fda790b7103051fcb111554e5badfc0ac7edf7e1223a434342a9eeed5cdb047690827325051560ba374786e8aa3616d74cf000000e8d4a51000a3666565ce00040358a26676ce001d9167a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce001d954fa46e6f7465c40568656c6c6fa3726376c42014560180e9c92da3171aa3c872356e30a8ea7f96c4a74bc1755a68929c94cb8fa3736e64c42061bf060efc02e2887dfffc8ed85268c8c091c013eedf315bc50794d02a8791ada474797065a3706179");
+}
+
+TEST(TWAnySignerAlgorand, SignJSON) {
+    auto json = STRING(R"({"genesisId":"mainnet-v1.0","genesisHash":"wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=","note":"aGVsbG8=","firstRound":"1937767","lastRound":"1938767","fee":"263000","transfer":{"toAddress":"CRLADAHJZEW2GFY2UPEHENLOGCUOU74WYSTUXQLVLJUJFHEUZOHYZNWYR4","amount":"1000000000000"}})");
+    auto key = DATA("d5b43d706ef0cb641081d45a2ec213b5d8281f439f2425d1af54e2afdaabf55b");
+
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeAlgorand));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeAlgorand));
+    assertStringsEqual(result, "82a3736967c440baa00062adcdcb5875e4435cdc6885d26bfe5308ab17983c0fda790b7103051fcb111554e5badfc0ac7edf7e1223a434342a9eeed5cdb047690827325051560ba374786e8aa3616d74cf000000e8d4a51000a3666565ce00040358a26676ce001d9167a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce001d954fa46e6f7465c40568656c6c6fa3726376c42014560180e9c92da3171aa3c872356e30a8ea7f96c4a74bc1755a68929c94cb8fa3736e64c42061bf060efc02e2887dfffc8ed85268c8c091c013eedf315bc50794d02a8791ada474797065a3706179");
+}
+
+} // namespace TW::Algorand::tests
diff --git a/tests/chains/Algorand/TWCoinTypeTests.cpp b/tests/chains/Algorand/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..0f7caba2bb3
--- /dev/null
+++ b/tests/chains/Algorand/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAlgorandCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAlgorand));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAlgorand, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAlgorand, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAlgorand));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAlgorand));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAlgorand), 6);
+    ASSERT_EQ(TWBlockchainAlgorand, TWCoinTypeBlockchain(TWCoinTypeAlgorand));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAlgorand));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAlgorand));
+    assertStringsEqual(symbol, "ALGO");
+    assertStringsEqual(txUrl, "https://app.dappflow.org/explorer/transaction/CR7POXFTYDLC7TV3IXHA7AZKWABUJC52BACLHJQNXAKZJGRPQY3A");
+    assertStringsEqual(accUrl, "https://app.dappflow.org/explorer/account/J4AEINCSSLDA7LNBNWM4ZXFCTLTOZT5LG3F5BLMFPJYGFWVCMU37EZI2AM");
+    assertStringsEqual(id, "algorand");
+    assertStringsEqual(name, "Algorand");
+}
diff --git a/tests/chains/Algorand/TransactionCompilerTests.cpp b/tests/chains/Algorand/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..e630a7205a3
--- /dev/null
+++ b/tests/chains/Algorand/TransactionCompilerTests.cpp
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Algorand.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Algorand::tests {
+
+TEST(AlgorandCompiler, CompileWithSignatures) {
+    /// Step 1: Prepare transaction input (protobuf)
+    auto privateKey = parse_hex("d5b43d706ef0cb641081d45a2ec213b5d8281f439f2425d1af54e2afdaabf55b");
+    auto key = PrivateKey(privateKey);
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
+    auto note = parse_hex("68656c6c6f");
+    auto genesisHash = Base64::decode("wGHE2Pwdvd7S12BL5FaOP20EGYesN73ktiC1qzkkit8=");
+
+    auto input = Algorand::Proto::SigningInput();
+    auto& transaction = *input.mutable_transfer();
+    transaction.set_to_address("CRLADAHJZEW2GFY2UPEHENLOGCUOU74WYSTUXQLVLJUJFHEUZOHYZNWYR4");
+    transaction.set_amount(1000000000000ull);
+    input.set_first_round(1937767ull);
+    input.set_last_round(1938767ull);
+    input.set_fee(263000ull);
+    input.set_genesis_id("mainnet-v1.0");
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_note(note.data(), note.size());
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+
+    auto txInputData = data(input.SerializeAsString());
+    auto preImageHashes = TransactionCompiler::preImageHashes(TWCoinTypeAlgorand, txInputData);
+
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = data(preSigningOutput.data());
+    EXPECT_EQ(hex(preImage), "54588aa3616d74cf000000e8d4a51000a3666565ce00040358a26676ce001d9167a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce001d954fa46e6f7465c40568656c6c6fa3726376c42014560180e9c92da3171aa3c872356e30a8ea7f96c4a74bc1755a68929c94cb8fa3736e64c42061bf060efc02e2887dfffc8ed85268c8c091c013eedf315bc50794d02a8791ada474797065a3706179");
+
+    // Simulate signature, normally obtained from signature server
+    const auto signature = key.sign(preImage, TWCurveED25519);
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(TWCoinTypeAlgorand, txInputData, {signature}, {publicKey.bytes});
+
+    const auto ExpectedTx =
+        "82a3736967c440baa00062adcdcb5875e4435cdc6885d26bfe5308ab17983c0fda790b7103051fcb111554e5badfc0ac7edf7e1223a434342a9eeed5cdb047690827325051560ba374786e8aa3616d74cf000000e8d4a51000a3666565ce00040358a26676ce001d9167a367656eac6d61696e6e65742d76312e30a26768c420c061c4d8fc1dbdded2d7604be4568e3f6d041987ac37bde4b620b5ab39248adfa26c76ce001d954fa46e6f7465c40568656c6c6fa3726376c42014560180e9c92da3171aa3c872356e30a8ea7f96c4a74bc1755a68929c94cb8fa3736e64c42061bf060efc02e2887dfffc8ed85268c8c091c013eedf315bc50794d02a8791ada474797065a3706179";
+    {
+        Algorand::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    // double check
+    {
+        Algorand::Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeAlgorand);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            TWCoinTypeAlgorand, txInputData, {signature, signature}, {publicKey.bytes});
+        Algorand::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            TWCoinTypeAlgorand, txInputData, {}, {});
+        Algorand::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+} // namespace TW::Algorand::tests
diff --git a/tests/chains/Aptos/AddressTests.cpp b/tests/chains/Aptos/AddressTests.cpp
new file mode 100644
index 00000000000..b94e4222c86
--- /dev/null
+++ b/tests/chains/Aptos/AddressTests.cpp
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// Author: Clement Doumergue
+//
+// This file is part of Trust. The full Trust copyright notice, including
+// terms governing use, modification, and redistribution, is contained in the
+// file LICENSE at the root of the source code distribution tree.
+
+#include "HexCoding.h"
+#include "Aptos/Entry.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+namespace TW::Aptos::tests {
+
+TEST(AptosAddress, Valid) {
+    Entry entry;
+    ASSERT_TRUE(entry.validateAddress(TWCoinTypeAptos, "0x1", std::monostate{}));
+    ASSERT_TRUE(entry.validateAddress(TWCoinTypeAptos, "0x0", std::monostate{}));
+    ASSERT_TRUE(entry.validateAddress(TWCoinTypeAptos, "0xeeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b", std::monostate{}));
+    ASSERT_TRUE(entry.validateAddress(TWCoinTypeAptos, "eeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b", std::monostate{}));
+    ASSERT_TRUE(entry.validateAddress(TWCoinTypeAptos, "19aadeca9388e009d136245b9a67423f3eee242b03142849eb4f81a4a409e59c", std::monostate{}));
+    ASSERT_TRUE(entry.validateAddress(TWCoinTypeAptos, "0x777821c78442e17d82c3d7a371f42de7189e4248e529fe6eee6bca40ddbb", std::monostate{}));
+    ASSERT_TRUE(entry.validateAddress(TWCoinTypeAptos, "0xeeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175", std::monostate{}));
+}
+
+TEST(AptosAddress, Invalid) {
+    Entry entry;
+    ASSERT_FALSE(entry.validateAddress(TWCoinTypeAptos, "", std::monostate{}));
+    ASSERT_FALSE(entry.validateAddress(TWCoinTypeAptos, "Seff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b", std::monostate{}));
+    ASSERT_FALSE(entry.validateAddress(TWCoinTypeAptos, "eeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175bb", std::monostate{}));
+    ASSERT_FALSE(entry.validateAddress(TWCoinTypeAptos, "0xSeff357ea5c1a4e7bc11b2b17ff2dc2dcca69750bfef1e1ebcaccf8c8018175b", std::monostate{}));
+
+}
+
+TEST(AptosAddress, FromPrivateKey) {
+    auto privateKey = PrivateKey(parse_hex("088baa019f081d6eab8dff5c447f9ce2f83c1babf3d03686299eaf6a1e89156e"));
+    auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    Entry entry;
+    auto address = entry.deriveAddress(TWCoinTypeAptos, pubkey, TWDerivationDefault, std::monostate{});
+    ASSERT_EQ(address, "0xe9c4d0b6fe32a5cc8ebd1e9ad5b54a0276a57f2d081dcb5e30342319963626c3");
+}
+
+TEST(AptosAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("ad0e293a56c9fc648d1872a00521d97e6b65724519a2676c2c47cb95d131cf5a"), TWPublicKeyTypeED25519);
+    Entry entry;
+    auto address = entry.deriveAddress(TWCoinTypeAptos, publicKey, TWDerivationDefault, std::monostate{});
+    ASSERT_EQ(address, "0xe9c4d0b6fe32a5cc8ebd1e9ad5b54a0276a57f2d081dcb5e30342319963626c3");
+}
+
+} // namespace TW::Aptos::tests
diff --git a/tests/chains/Aptos/CompilerTests.cpp b/tests/chains/Aptos/CompilerTests.cpp
new file mode 100644
index 00000000000..ebe0ccc49ae
--- /dev/null
+++ b/tests/chains/Aptos/CompilerTests.cpp
@@ -0,0 +1,175 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "proto/Aptos.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestUtilities.h"
+#include "TransactionCompiler.h"
+
+#include <nlohmann/json.hpp>
+#include <gtest/gtest.h>
+
+namespace TW::Aptos::tests {
+
+TEST(AptosCompiler, StandardTransaction) {
+    // Set up a signing input.
+
+    Proto::SigningInput input;
+    input.set_sender("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30");
+    input.set_sequence_number(99);
+    auto& tf = *input.mutable_transfer();
+    tf.set_to("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30");
+    tf.set_amount(1000);
+    input.set_max_gas_amount(3296766);
+    input.set_gas_unit_price(100);
+    input.set_expiration_timestamp_secs(3664390082);
+    input.set_chain_id(33);
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    // Pre-hash the transaction.
+
+    auto preImageHashesData = TransactionCompiler::preImageHashes(TWCoinTypeAptos, inputStrData);
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), static_cast<int>(preImageHashesData.size()));
+    auto actualDataToSign = data(preSigningOutput.data());
+
+    EXPECT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(actualDataToSign), "b5e97db07fa0bd0e5598aa3643a9bc6f6693bddc1a9fec9e674a461eaa00b19307968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021");
+
+    // Sign the pre-hash data.
+
+    auto privateKey = PrivateKey(parse_hex("5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec"));
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519).bytes;
+    auto signature = privateKey.sign(actualDataToSign, TWCurveED25519);
+    EXPECT_EQ(hex(signature), "5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01");
+
+    // Compile the transaction.
+
+    auto outputData = TransactionCompiler::compileWithSignatures(TWCoinTypeAptos, inputStrData, {signature}, {publicKey});
+    Proto::SigningOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    ASSERT_EQ(hex(output.raw_txn()), "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021");
+    ASSERT_EQ(hex(output.authenticator().signature()), "5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01");
+    ASSERT_EQ(hex(output.encoded()), "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01");
+    nlohmann::json expectedJson = R"(
+                {
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "3296766",
+                    "payload": {
+                        "arguments": ["0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30","1000"],
+                        "function": "0x1::aptos_account::transfer",
+                        "type": "entry_function_payload",
+                        "type_arguments": []
+                    },
+                    "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+                    "sequence_number": "99",
+                    "signature": {
+                        "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                        "signature": "0x5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01",
+                        "type": "ed25519_signature"
+                    }
+                }
+        )"_json;
+    nlohmann::json parsedJson = nlohmann::json::parse(output.json());
+    assertJSONEqual(expectedJson, parsedJson);
+}
+
+TEST(AptosCompiler, BlindTransactionJson) {
+    // Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x7efd69e7f9462774b932ce500ab51c0d0dcc004cf272e09f8ffd5804c2a84e33?network=mainnet
+
+    auto payloadJson = R"(
+    {
+       "function": "0x16fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c::AnimeSwapPoolV1::swap_exact_coins_for_coins_3_pair_entry",
+       "type_arguments": [
+                "0x1::aptos_coin::AptosCoin",
+                "0x881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f4::coin::MOJO",
+                "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDT",
+                "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
+            ],
+       "arguments": [
+                "1000000",
+                "49329"
+            ],
+       "type": "entry_function_payload"
+    })"_json;
+    Proto::SigningInput input;
+    input.set_sequence_number(42);
+    input.set_sender("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30");
+    input.set_gas_unit_price(100);
+    input.set_max_gas_amount(100011);
+    input.set_expiration_timestamp_secs(3664390082);
+    input.set_any_encoded(payloadJson.dump());
+    input.set_chain_id(1);
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    // Pre-hash the transaction.
+
+    auto preImageHashesData = TransactionCompiler::preImageHashes(TWCoinTypeAptos, inputStrData);
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), static_cast<int>(preImageHashesData.size()));
+    auto actualDataToSign = data(preSigningOutput.data());
+
+    EXPECT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(actualDataToSign), "b5e97db07fa0bd0e5598aa3643a9bc6f6693bddc1a9fec9e674a461eaa00b19307968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada0000000001");
+
+    // Sign the pre-hash data.
+
+    auto privateKey = PrivateKey(parse_hex("5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec"));
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519).bytes;
+    auto signature = privateKey.sign(actualDataToSign, TWCurveED25519);
+    EXPECT_EQ(hex(signature), "42cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b");
+
+    // Compile the transaction.
+
+    auto outputData = TransactionCompiler::compileWithSignatures(TWCoinTypeAptos, inputStrData, {signature}, {publicKey});
+    Proto::SigningOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    ASSERT_EQ(hex(output.raw_txn()), "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada0000000001");
+    ASSERT_EQ(hex(output.authenticator().signature()), "42cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b");
+    ASSERT_EQ(hex(output.encoded()), "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f302a000000000000000216fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c0f416e696d6553776170506f6f6c563127737761705f65786163745f636f696e735f666f725f636f696e735f335f706169725f656e747279040700000000000000000000000000000000000000000000000000000000000000010a6170746f735f636f696e094170746f73436f696e0007881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f404636f696e044d4f4a4f0007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa05617373657404555344540007f22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa056173736574045553444300020840420f000000000008b1c0000000000000ab860100000000006400000000000000c2276ada00000000010020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c4042cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b");
+    nlohmann::json expectedJson = R"(
+{
+        "expiration_timestamp_secs": "3664390082",
+        "gas_unit_price": "100",
+        "max_gas_amount": "100011",
+        "payload": {
+            "function": "0x16fe2df00ea7dde4a63409201f7f4e536bde7bb7335526a35d05111e68aa322c::AnimeSwapPoolV1::swap_exact_coins_for_coins_3_pair_entry",
+            "type_arguments": [
+                "0x1::aptos_coin::AptosCoin",
+                "0x881ac202b1f1e6ad4efcff7a1d0579411533f2502417a19211cfc49751ddb5f4::coin::MOJO",
+                "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDT",
+                "0xf22bede237a07e121b56d91a491eb7bcdfd1f5907926a9e58338f964a01b17fa::asset::USDC"
+            ],
+            "arguments": [
+                "1000000",
+                "49329"
+            ],
+            "type": "entry_function_payload"
+        },
+        "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+        "sequence_number": "42",
+        "signature": {
+            "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+            "signature": "0x42cd67406e85afd1e948e7ad7f5f484fb4c60d82b267c6b6b28a92301e228b983206d2b87cd5487cf9acfb0effbd183ab90123570eb2e047cb152d337152210b",
+            "type": "ed25519_signature"
+        }
+}
+        )"_json;
+    nlohmann::json parsedJson = nlohmann::json::parse(output.json());
+    assertJSONEqual(expectedJson, parsedJson);
+}
+
+}
diff --git a/tests/chains/Aptos/TWAnySignerTests.cpp b/tests/chains/Aptos/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..dce9c2f3d72
--- /dev/null
+++ b/tests/chains/Aptos/TWAnySignerTests.cpp
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "proto/Aptos.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <nlohmann/json.hpp>
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Aptos::tests {
+
+TEST(TWAnySignerAptos, TxSign) {
+    // Successfully broadcasted https://explorer.aptoslabs.com/txn/0xb4d62afd3862116e060dd6ad9848ccb50c2bc177799819f1d29c059ae2042467?network=devnet
+    Proto::SigningInput input;
+    input.set_sender("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30");
+    input.set_sequence_number(99);
+    auto& tf = *input.mutable_transfer();
+    tf.set_to("0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30");
+    tf.set_amount(1000);
+    input.set_max_gas_amount(3296766);
+    input.set_gas_unit_price(100);
+    input.set_expiration_timestamp_secs(3664390082);
+    input.set_chain_id(33);
+    auto privateKey = PrivateKey(parse_hex("5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeAptos);
+    ASSERT_EQ(hex(output.raw_txn()), "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021");
+    ASSERT_EQ(hex(output.authenticator().signature()), "5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01");
+    ASSERT_EQ(hex(output.encoded()), "07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01");
+    nlohmann::json expectedJson = R"(
+                {
+                    "expiration_timestamp_secs": "3664390082",
+                    "gas_unit_price": "100",
+                    "max_gas_amount": "3296766",
+                    "payload": {
+                        "arguments": ["0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30","1000"],
+                        "function": "0x1::aptos_account::transfer",
+                        "type": "entry_function_payload",
+                        "type_arguments": []
+                    },
+                    "sender": "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+                    "sequence_number": "99",
+                    "signature": {
+                        "public_key": "0xea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c",
+                        "signature": "0x5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01",
+                        "type": "ed25519_signature"
+                    }
+                }
+        )"_json;
+    nlohmann::json parsedJson = nlohmann::json::parse(output.json());
+    assertJSONEqual(expectedJson, parsedJson);
+}
+
+} // namespace TW::Aptos::tests
diff --git a/tests/chains/Aptos/TWAptosAddressTests.cpp b/tests/chains/Aptos/TWAptosAddressTests.cpp
new file mode 100644
index 00000000000..4dea755b651
--- /dev/null
+++ b/tests/chains/Aptos/TWAptosAddressTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWHDWallet.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Aptos::tests {
+
+TEST(TWAptosAddress, HDWallet) {
+    auto mnemonic =
+        "shoot island position soft burden budget tooth cruel issue economy destroy above";
+    auto passphrase = "";
+
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(STRING(mnemonic).get(), STRING(passphrase).get()));
+
+    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypeAptos, WRAPS(TWCoinTypeDerivationPath(TWCoinTypeAptos)).get()));
+
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyEd25519(privateKey.get()));
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeAptos));
+    auto addressStr = WRAPS(TWAnyAddressDescription(address.get()));
+
+    assertStringsEqual(addressStr, "0x7968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30");
+}
+
+} // namespace TW::Aptos::tests
diff --git a/tests/chains/Aptos/TWCoinTypeTests.cpp b/tests/chains/Aptos/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6d4f14ce651
--- /dev/null
+++ b/tests/chains/Aptos/TWCoinTypeTests.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAptosCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeAptos;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xedc88058e27f6c065fd6607e262cb2a83a65f74301df90c61923014c59f9d465"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x60ad80e8cdadb81399e8a738014bc9ec865cef842f7c2cf7d84fbf7e40d065"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "aptos");
+    assertStringsEqual(name, "Aptos");
+    assertStringsEqual(symbol, "APT");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 8);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainAptos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(txUrl, "https://explorer.aptoslabs.com/txn/0xedc88058e27f6c065fd6607e262cb2a83a65f74301df90c61923014c59f9d465");
+    assertStringsEqual(accUrl, "https://explorer.aptoslabs.com/account/0x60ad80e8cdadb81399e8a738014bc9ec865cef842f7c2cf7d84fbf7e40d065");
+}
diff --git a/tests/chains/Arbitrum/TWCoinTypeTests.cpp b/tests/chains/Arbitrum/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..0b8eb85a5e9
--- /dev/null
+++ b/tests/chains/Arbitrum/TWCoinTypeTests.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWArbitrumCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeArbitrum));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xa1e319be22c08155e5904aa211fb87df5f4ade48de79c6578b1cf3dfda9e498c"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeArbitrum, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xecf9ffa7f51e1194f89c25ad8c484f6bfd04e1ac"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeArbitrum, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeArbitrum));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeArbitrum));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeArbitrum), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeArbitrum));
+
+    assertStringsEqual(symbol, "ETH");
+    assertStringsEqual(txUrl, "https://arbiscan.io/tx/0xa1e319be22c08155e5904aa211fb87df5f4ade48de79c6578b1cf3dfda9e498c");
+    assertStringsEqual(accUrl, "https://arbiscan.io/address/0xecf9ffa7f51e1194f89c25ad8c484f6bfd04e1ac");
+    assertStringsEqual(id, "arbitrum");
+    assertStringsEqual(name, "Arbitrum");
+}
diff --git a/tests/chains/ArbitrumNova/TWCoinTypeTests.cpp b/tests/chains/ArbitrumNova/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..15820936837
--- /dev/null
+++ b/tests/chains/ArbitrumNova/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWArbitrumNovaCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeArbitrumNova;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xfdfee13848c2d21813c82c53afc9925f31770564c3117477960a81055702c1be"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x0d0707963952f2fba59dd06f2b425ace40b492fe"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "arbitrumnova");
+    assertStringsEqual(name, "Arbitrum Nova");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "42170");
+    assertStringsEqual(txUrl, "https://nova.arbiscan.io/tx/0xfdfee13848c2d21813c82c53afc9925f31770564c3117477960a81055702c1be");
+    assertStringsEqual(accUrl, "https://nova.arbiscan.io/address/0x0d0707963952f2fba59dd06f2b425ace40b492fe");
+}
diff --git a/tests/chains/Aurora/TWCoinTypeTests.cpp b/tests/chains/Aurora/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..42b7334b872
--- /dev/null
+++ b/tests/chains/Aurora/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAuroraCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAurora));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x99deebdb70f8027037abb3d3d0f3c7523daee857d85e9056d2671593ff2f2f28"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAurora, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x8707cdE20dd43E3dB1F74c28fcd509ef38B0bA51"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAurora, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAurora));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAurora));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAurora), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeAurora));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAurora));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAurora));
+    assertStringsEqual(symbol, "ETH");
+    assertStringsEqual(txUrl, "https://aurorascan.dev/tx/0x99deebdb70f8027037abb3d3d0f3c7523daee857d85e9056d2671593ff2f2f28");
+    assertStringsEqual(accUrl, "https://aurorascan.dev/address/0x8707cdE20dd43E3dB1F74c28fcd509ef38B0bA51");
+    assertStringsEqual(id, "aurora");
+    assertStringsEqual(name, "Aurora");
+}
diff --git a/tests/chains/Avalanche/TWCoinTypeTests.cpp b/tests/chains/Avalanche/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..84ab72079c7
--- /dev/null
+++ b/tests/chains/Avalanche/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAvalancheCoinType, TWCoinTypeCChain) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeAvalancheCChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x9243890b844219accefd8798271052f5a056453ec18984a56e81c92921330d54"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeAvalancheCChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xa664325f36Ec33E66323fe2620AF3f2294b2Ef3A"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeAvalancheCChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeAvalancheCChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeAvalancheCChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeAvalancheCChain), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeAvalancheCChain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeAvalancheCChain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeAvalancheCChain));
+    assertStringsEqual(symbol, "AVAX");
+    assertStringsEqual(txUrl, "https://snowtrace.io/tx/0x9243890b844219accefd8798271052f5a056453ec18984a56e81c92921330d54");
+    assertStringsEqual(accUrl, "https://snowtrace.io/address/0xa664325f36Ec33E66323fe2620AF3f2294b2Ef3A");
+    assertStringsEqual(id, "avalanchec");
+    assertStringsEqual(name, "Avalanche C-Chain");
+}
diff --git a/tests/chains/Base/TWCoinTypeTests.cpp b/tests/chains/Base/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..993248ee996
--- /dev/null
+++ b/tests/chains/Base/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBaseCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeBase;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x4acb15506b7696a2dfac4258f3f86392b4b2b717a3f316a8aa78509b2c3b6ab4"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xb8ff877ed78ba520ece21b1de7843a8a57ca47cb"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "base");
+    assertStringsEqual(name, "Base");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "8453");
+    assertStringsEqual(txUrl, "https://basescan.org/tx/0x4acb15506b7696a2dfac4258f3f86392b4b2b717a3f316a8aa78509b2c3b6ab4");
+    assertStringsEqual(accUrl, "https://basescan.org/address/0xb8ff877ed78ba520ece21b1de7843a8a57ca47cb");
+}
diff --git a/tests/chains/Binance/AddressTests.cpp b/tests/chains/Binance/AddressTests.cpp
new file mode 100644
index 00000000000..56f812afbd4
--- /dev/null
+++ b/tests/chains/Binance/AddressTests.cpp
@@ -0,0 +1,41 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Binance/Address.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+#include "TestUtilities.h"
+
+using namespace TW;
+using namespace TW::Binance;
+
+TEST(BinanceAddress, AddressToData) {
+    // mainnet
+    auto data = TW::addressToData(TWCoinTypeBinance, "bnb1h8xf9htasu9aclra954dnnve8fgcda4ae7qfa8");
+    EXPECT_EQ(hex(data), "b9cc92dd7d870bdc7c7d2d2ad9cd993a5186f6bd");
+
+    // testnet
+    data = TW::addressToData(TWCoinTypeTBinance, "tbnb1x4hxmtdf7pwea9dghq73dufh3qspm8gp5qht9c");
+    EXPECT_EQ(hex(data), "356e6dada9f05d9e95a8b83d16f13788201d9d01");
+
+    EXPECT_EQ(Address(data, TWCoinTypeTBinance).string(), "tbnb1x4hxmtdf7pwea9dghq73dufh3qspm8gp5qht9c");
+
+    // invalid address
+    data = TW::addressToData(TWCoinTypeTBinance, "tbnb1x4hxmtdf7pwea9dghq73dufh3qspm8gp");
+    EXPECT_EQ(hex(data), "");
+}
+
+TEST(BinanceAddress, DeriveAddress) {
+    // mainnet
+    auto pubkey = parse_hex("02bf9a5e2b514492326e7ba9a5161b6e47df7a4aa970dd2d13c398bec89608d8d0");
+    auto address = TW::deriveAddress(TWCoinTypeBinance, PublicKey(pubkey, TW::publicKeyType(TWCoinTypeBinance)));
+    EXPECT_EQ(address, "bnb1h8xf9htasu9aclra954dnnve8fgcda4ae7qfa8");
+
+    // testnet
+    address = TW::deriveAddress(TWCoinTypeTBinance, PublicKey(pubkey, TW::publicKeyType(TWCoinTypeTBinance)));
+    EXPECT_EQ(address, "tbnb1h8xf9htasu9aclra954dnnve8fgcda4ahtfdak");
+}
diff --git a/tests/chains/Binance/TWAnySignerTests.cpp b/tests/chains/Binance/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..630daa83189
--- /dev/null
+++ b/tests/chains/Binance/TWAnySignerTests.cpp
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Binance/Address.h"
+#include "proto/Binance.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "Coin.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+#include <thread>
+
+namespace TW::Binance {
+
+Proto::SigningOutput SignTest() {
+    auto input = Proto::SigningInput();
+    input.set_chain_id("Binance-Chain-Tigris");
+    input.set_account_number(0);
+    input.set_sequence(0);
+    input.set_source(0);
+
+    auto key = parse_hex("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832");
+    input.set_private_key(key.data(), key.size());
+
+    auto& order = *input.mutable_send_order();
+
+    Address fromAddress;
+    EXPECT_TRUE(Address::decode("bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2", fromAddress));
+    EXPECT_EQ(hex(fromAddress.getKeyHash()), "40c2979694bbc961023d1d27be6fc4d21a9febe6");
+    auto fromKeyhash = fromAddress.getKeyHash();
+    Address toAddress;
+    EXPECT_TRUE(Address::decode("bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5", toAddress));
+    EXPECT_EQ(hex(toAddress.getKeyHash()), "bffe47abfaede50419c577f1074fee6dd1535cd1");
+    auto toKeyhash = toAddress.getKeyHash();
+
+    {
+        auto inputOrder = order.add_inputs();
+        inputOrder->set_address(fromKeyhash.data(), fromKeyhash.size());
+        auto inputCoin = inputOrder->add_coins();
+        inputCoin->set_denom("BNB");
+        inputCoin->set_amount(1);
+    }
+
+    {
+        auto output = order.add_outputs();
+        output->set_address(toKeyhash.data(), toKeyhash.size());
+        auto outputCoin = output->add_coins();
+        outputCoin->set_denom("BNB");
+        outputCoin->set_amount(1);
+    }
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeBinance);
+    return output;
+}
+
+TEST(TWAnySignerBinance, Sign) {
+    Proto::SigningOutput output = SignTest();
+    ASSERT_EQ(hex(output.encoded()), "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212409073e581e1ea4fdf11242fe30a732f96d20799c638354bcf7a242161ac015b9321fbbed93e85b0ef9b5de58fba74dff54ecb1e379ef26e1023be8996003f4899");
+}
+
+TEST(TWAnySignerBinance, SignJSON) {
+    auto json = STRING(R"({"chainId":"Binance-Chain-Tigris","accountNumber":"13186","source":"2","memo":"Testing","sendOrder":{"inputs":[{"address":"EuZU7e+eUIuDNzaph9Bp2lqJrts=","coins":[{"denom":"BNB","amount":"1345227"}]}],"outputs":[{"address":"M7vzB7mBRvE9IGk8+UbC13pMryg=","coins":[{"denom":"BNB","amount":"1345227"}]}]}})");
+    auto key = DATA("f947b3554a1c2fa70e1caa9de53fbda353348d1e856c593848f3a29737d31f11");
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeBinance));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeBinance));
+    assertStringsEqual(result, "ca01f0625dee0a4a2a2c87fa0a210a1412e654edef9e508b833736a987d069da5a89aedb12090a03424e4210cb8d5212210a1433bbf307b98146f13d20693cf946c2d77a4caf2812090a03424e4210cb8d52126d0a26eb5ae9872102e58176f271a9796b4288908be85094a2ac978e25535fd59a37b58626e3a84d9e1240015b4beb3d6ef366a7a92fd283f66b8f0d8cdb6b152a9189146b27f84f507f047e248517cf691a36ebc2b7f3b7f64e27585ce1c40f1928d119c31af428efcf3e1882671a0754657374696e672002");
+}
+
+TEST(TWAnySignerBinance, MultithreadedSigning) {
+    auto f = [](int n) {
+        for (int i = 0; i < n; i++) {
+            Proto::SigningOutput output = SignTest();
+            ASSERT_EQ(hex(output.encoded()), "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212409073e581e1ea4fdf11242fe30a732f96d20799c638354bcf7a242161ac015b9321fbbed93e85b0ef9b5de58fba74dff54ecb1e379ef26e1023be8996003f4899");
+        }
+    };
+
+    // Ensure multiple threads cause no asserts
+    std::thread th1(f, 1000);
+    std::thread th2(f, 1000);
+    std::thread th3(f, 1000);
+
+    th1.join();
+    th2.join();
+    th3.join();
+}
+
+} // namespace TW::Binance
diff --git a/tests/chains/Binance/TWCoinTypeTests.cpp b/tests/chains/Binance/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..c7f09c9a16c
--- /dev/null
+++ b/tests/chains/Binance/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBinanceCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBinance));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("A93625C9F9ABEA1A8E31585B30BBB16C34FAE0D172EB5B6B2F834AF077BF06BB"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBinance, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("bnb1u7jm0cll5h3224y0tapwn6gf6pr49ytewx4gsz"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBinance, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBinance));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBinance));
+    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeBinance));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBinance), 8);
+    ASSERT_EQ(TWBlockchainBinance, TWCoinTypeBlockchain(TWCoinTypeBinance));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBinance));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBinance));
+    assertStringsEqual(symbol, "BNB");
+    assertStringsEqual(txUrl, "https://explorer.binance.org/tx/A93625C9F9ABEA1A8E31585B30BBB16C34FAE0D172EB5B6B2F834AF077BF06BB");
+    assertStringsEqual(accUrl, "https://explorer.binance.org/address/bnb1u7jm0cll5h3224y0tapwn6gf6pr49ytewx4gsz");
+    assertStringsEqual(id, "binance");
+    assertStringsEqual(name, "BNB Beacon Chain");
+    assertStringsEqual(chainId, "Binance-Chain-Tigris");
+}
diff --git a/tests/chains/Binance/TWWalletConnectSigning.cpp b/tests/chains/Binance/TWWalletConnectSigning.cpp
new file mode 100644
index 00000000000..7ee7e7956f4
--- /dev/null
+++ b/tests/chains/Binance/TWWalletConnectSigning.cpp
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Binance.pb.h"
+#include "proto/WalletConnect.pb.h"
+#include "Coin.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWWalletConnectRequest.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Binance {
+
+TEST(TWWalletConnectSign, SendOrder) {
+    auto private_key = parse_hex("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832");
+    const auto payload = R"({"signerAddress":"bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2","signDoc":{"account_number":"19","chain_id":"chain-bnb","memo":"","data":null,"msgs":[{"inputs":[{"address":"bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2","coins":[{"amount":1001000000,"denom":"BNB"}]}],"outputs":[{"address":"bnb13zeh6hs97d5eu2s5qerguhv8ewwue6u4ywa6yf","coins":[{"amount":1001000000,"denom":"BNB"}]}]}],"sequence":"23","source":"1"}})";
+
+    WalletConnect::Proto::ParseRequestInput parsingInput;
+    parsingInput.set_method(WalletConnect::Proto::Method::CosmosSignAmino);
+    parsingInput.set_payload(payload);
+
+    const auto parsinginputData = parsingInput.SerializeAsString();
+    const auto parsingInputDataPtr = WRAPD(TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(parsinginputData.c_str()), parsinginputData.size()));
+
+    const auto outputDataPtr = WRAPD(TWWalletConnectRequestParse(TWCoinTypeBinance, parsingInputDataPtr.get()));
+
+    WalletConnect::Proto::ParseRequestOutput parsingOutput;
+    parsingOutput.ParseFromArray(
+        TWDataBytes(outputDataPtr.get()),
+        static_cast<int>(TWDataSize(outputDataPtr.get()))
+    );
+
+    EXPECT_EQ(parsingOutput.error(), Common::Proto::SigningError::OK);
+
+    // Step 2: Set missing fields.
+    ASSERT_TRUE(parsingOutput.has_binance());
+    Proto::SigningInput signingInput = parsingOutput.binance();
+
+    signingInput.set_private_key(private_key.data(), private_key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeBinance);
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_EQ(hex(output.signature()), "3c24c784c6bbf99d54ffabb153edcb6d3c4a774936df5c72a5d32897256f8e062f320fb4753302fb0a96f08c475974d20edfd1a27bbeeda73587f58ddc958975");
+    EXPECT_EQ(output.signature_json(), R"({"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"Amo1kgCI2Yw4iMpoxT38k/RWRgJgbLuH8P5e5TPbOOUC"},"signature":"PCTHhMa7+Z1U/6uxU+3LbTxKd0k231xypdMolyVvjgYvMg+0dTMC+wqW8IxHWXTSDt/Ronu+7ac1h/WN3JWJdQ=="})");
+}
+
+} // namespace TW::Binance
diff --git a/tests/chains/Binance/TransactionCompilerTests.cpp b/tests/chains/Binance/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..3c8a1d5a171
--- /dev/null
+++ b/tests/chains/Binance/TransactionCompilerTests.cpp
@@ -0,0 +1,119 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "uint256.h"
+
+#include "proto/Binance.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(BinanceCompiler, CompileWithSignatures) {
+    /// Step 1: Prepare transaction input (protobuf)
+    const auto coin = TWCoinTypeBinance;
+    // bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2
+    const auto fromAddressData = parse_hex("40c2979694bbc961023d1d27be6fc4d21a9febe6");
+    // bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5
+    const auto toAddressData = parse_hex("bffe47abfaede50419c577f1074fee6dd1535cd1");
+
+    Binance::Proto::SigningInput txInput;
+
+    txInput.set_chain_id("Binance-Chain-Nile");
+    auto& sendOrder = *txInput.mutable_send_order();
+
+    auto& input1 = *sendOrder.add_inputs();
+    input1.set_address(fromAddressData.data(), fromAddressData.size());
+    auto& input1Coin = *input1.add_coins();
+    input1Coin.set_amount(1);
+    input1Coin.set_denom("BNB");
+
+    auto& output1 = *sendOrder.add_outputs();
+    output1.set_address(toAddressData.data(), toAddressData.size());
+    auto& output1Coin = *output1.add_coins();
+    output1Coin.set_amount(1);
+    output1Coin.set_denom("BNB");
+
+    auto txInputData = data(txInput.SerializeAsString());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = data(preSigningOutput.data_hash());
+    EXPECT_EQ(hex(preImageHash), "3f3fece9059e714d303a9a1496ddade8f2c38fa78fc4cc2e505c5dbb0ea678d1");
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData =
+        parse_hex("026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
+    const auto signature =
+        parse_hex("1b1181faec30b60a2ddaa2804c253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5"
+                  "366bb8b041781a6771248550d04094c3d7a504f9e8310679");
+
+    // Verify signature (pubkey & hash & signature)
+    { EXPECT_TRUE(publicKey.verify(signature, preImageHash)); }
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKeyData});
+
+    const auto ExpectedTx =
+        "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001"
+        "121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35"
+        "920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212401b1181faec30b60a2ddaa2804c"
+        "253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5366bb8b041781a6771248550d04094c3d7a5"
+        "04f9e8310679";
+    {
+        Binance::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        Binance::Proto::SigningInput input;
+        ASSERT_TRUE(input.ParseFromArray(txInputData.data(), (int)txInputData.size()));
+        auto key = parse_hex("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832");
+        input.set_private_key(key.data(), key.size());
+
+        Binance::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, {publicKey.bytes});
+        Binance::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Binance::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+}
diff --git a/tests/chains/BinanceSmartChain/SignerTests.cpp b/tests/chains/BinanceSmartChain/SignerTests.cpp
new file mode 100644
index 00000000000..c9196d6b53b
--- /dev/null
+++ b/tests/chains/BinanceSmartChain/SignerTests.cpp
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include "Ethereum/Address.h"
+#include "Ethereum/ABI/Function.h"
+#include "proto/Ethereum.pb.h"
+#include "HexCoding.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Binance {
+
+TEST(BinanceSmartChain, SignNativeTransfer) {
+    // https://explorer.binance.org/smart-testnet/tx/0x6da28164f7b3bc255d749c3ae562e2a742be54c12bf1858b014cc2fe5700684e
+
+    Ethereum::Proto::SigningInput input;
+
+    auto chainId = store(uint256_t(97));
+    auto nonce = store(uint256_t(0));
+    auto gasPrice = store(uint256_t(20000000000));
+    auto gasLimit = store(uint256_t(21000));
+    auto toAddress = "0x31BE00EB1fc8e14A696DBC72f746ec3e95f49683";
+    auto amount = store(uint256_t(10000000000000000)); // 0.01
+    // addr: 0xB9F5771C27664bF2282D98E09D7F50cEc7cB01a7  mnemonic: isolate dismiss ... cruel note
+    auto privateKey = parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_to_address(toAddress);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    auto& transfer = *input.mutable_transaction()->mutable_transfer();
+    transfer.set_amount(amount.data(), amount.size());
+
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeSmartChain);
+
+    ASSERT_EQ(hex(output.encoded()), "f86c808504a817c8008252089431be00eb1fc8e14a696dbc72f746ec3e95f49683872386f26fc100008081e5a057806b486844c5d0b7b5ce34b289f4e8776aa1fe24a3311cef5053995c51050ca07697aa0695de27da817625df0e7e4c64b0ab22d9df30aec92299a7b380be8db7");
+}
+
+TEST(BinanceSmartChain, SignTokenTransfer) {
+    auto toAddress = "0x31BE00EB1fc8e14A696DBC72f746ec3e95f49683";
+    auto funcData = Ethereum::ABI::Function::encodeFunctionCall("transfer", Ethereum::ABI::BaseParams{
+        std::make_shared<Ethereum::ABI::ProtoAddress>(toAddress),
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(uint256_t(10000000000000000))
+    }).value();
+    EXPECT_EQ(hex(funcData), "a9059cbb00000000000000000000000031be00eb1fc8e14a696dbc72f746ec3e95f49683000000000000000000000000000000000000000000000000002386f26fc10000");
+
+    auto input = Ethereum::Proto::SigningInput();
+    auto chainId = store(uint256_t(97));
+    auto nonce = store(uint256_t(30));
+    auto gasPrice = store(uint256_t(20000000000));
+    auto gasLimit = store(uint256_t(1000000));
+    auto tokenContractAddress = "0xed24fc36d5ee211ea25a80239fb8c4cfd80f12ee";
+    auto dummyAmount = store(uint256_t(0));
+    // addr: 0xB9F5771C27664bF2282D98E09D7F50cEc7cB01a7  mnemonic: isolate dismiss ... cruel note
+    auto privateKey = PrivateKey(parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904"));
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_to_address(tokenContractAddress);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
+    transfer.set_data(funcData.data(), funcData.size());
+
+    const std::string expected = "f8ab1e8504a817c800830f424094ed24fc36d5ee211ea25a80239fb8c4cfd80f12ee80b844a9059cbb00000000000000000000000031be00eb1fc8e14a696dbc72f746ec3e95f49683000000000000000000000000000000000000000000000000002386f26fc1000081e6a0aa9d5e9a947e96f728fe5d3e6467000cd31a693c00270c33ec64b4abddc29516a00bf1d5646139b2bcca1ad64e6e79f45b7d1255de603b5a3765cbd9544ae148d0";
+
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeSmartChain);
+
+    EXPECT_EQ(hex(output.encoded()), expected);
+}
+
+} // namespace TW::Binance
diff --git a/tests/chains/BinanceSmartChain/TWAnyAddressTests.cpp b/tests/chains/BinanceSmartChain/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..139e6a8368b
--- /dev/null
+++ b/tests/chains/BinanceSmartChain/TWAnyAddressTests.cpp
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWBinanceSmartChain, Address) {
+
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("727f677b390c151caf9c206fd77f77918f56904b5504243db9b21e51182c4c06").get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), false));
+    auto string = "0xf3d468DBb386aaD46E92FF222adDdf872C8CC064";
+    
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeSmartChain));
+    auto expected = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING(string).get(), TWCoinTypeSmartChain));
+
+    auto addressString = WRAPS(TWAnyAddressDescription(address.get()));
+    auto expectedString = WRAPS(TWAnyAddressDescription(expected.get()));
+
+    assertStringsEqual(addressString, string);
+    assertStringsEqual(expectedString, string);
+}
diff --git a/tests/chains/BinanceSmartChain/TWCoinTypeTests.cpp b/tests/chains/BinanceSmartChain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..7dc7a6cb102
--- /dev/null
+++ b/tests/chains/BinanceSmartChain/TWCoinTypeTests.cpp
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBinanceSmartChainCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeSmartChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb9ae2e808fe8e57171f303ad8f6e3fd17d949b0bfc7b4db6e8e30a71cc517d7e"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeSmartChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x35552c16704d214347f29Fa77f77DA6d75d7C752"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeSmartChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSmartChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSmartChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeSmartChain), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeSmartChain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeSmartChain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeSmartChain));
+    ASSERT_EQ(20000714, TWCoinTypeSmartChain);
+    assertStringsEqual(symbol, "BNB");
+    assertStringsEqual(txUrl, "https://bscscan.com/tx/0xb9ae2e808fe8e57171f303ad8f6e3fd17d949b0bfc7b4db6e8e30a71cc517d7e");
+    assertStringsEqual(accUrl, "https://bscscan.com/address/0x35552c16704d214347f29Fa77f77DA6d75d7C752");
+    assertStringsEqual(id, "smartchain");
+    assertStringsEqual(name, "BNB Smart Chain");
+}
+
+TEST(TWBinanceSmartChainLegacyCoinType, TWCoinType) {
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSmartChainLegacy));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSmartChainLegacy));
+
+    ASSERT_EQ(10000714, TWCoinTypeSmartChainLegacy);
+    assertStringsEqual(id, "bsc");
+    assertStringsEqual(name, "Smart Chain Legacy");
+}
diff --git a/tests/Bitcoin/BitcoinAddressTests.cpp b/tests/chains/Bitcoin/BitcoinAddressTests.cpp
similarity index 91%
rename from tests/Bitcoin/BitcoinAddressTests.cpp
rename to tests/chains/Bitcoin/BitcoinAddressTests.cpp
index dd769f6a29e..fa8507663df 100644
--- a/tests/Bitcoin/BitcoinAddressTests.cpp
+++ b/tests/chains/Bitcoin/BitcoinAddressTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bitcoin/Address.h"
 #include "Bitcoin/Script.h"
diff --git a/tests/chains/Bitcoin/BitcoinOrdinalNftData.h b/tests/chains/Bitcoin/BitcoinOrdinalNftData.h
new file mode 100644
index 00000000000..3923de9d360
--- /dev/null
+++ b/tests/chains/Bitcoin/BitcoinOrdinalNftData.h
@@ -0,0 +1,521 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+std::string nftInscriptionImageData = "\
+89504e470d0a1a0a0000000d4948445200000360000002be0803000000f3\
+0f8d7d000000d8504c54450000003070bf3070af3173bd3078b73870b730\
+70b73575ba3075ba3075b53070ba3078bb3474bb3474b73074bb3074b733\
+76b93076b93373bc3373b93073b93376bc3275ba3075ba3572ba3272ba33\
+75bc3276b83474bb3274bb3274b83276bd3276bb3474bd3474bb3276b934\
+74bb3474b93274bb3274b93476bb3276bb3375ba3275ba3373bc3273ba32\
+77bc3375bc3375ba3373bc3374ba3174b93376bb3375bc3375bb3375b933\
+75bb3374bb3376bb3475bb3375bb3375ba3374bb3276bc3276ba3375bc32\
+75bc3375bb3275bb3374bc3374bb3375bb7edf10e10000004774524e5300\
+10101f20202030303030404040404050505050505f606060606f70707070\
+7f7f7f7f80808080808f8f909090909f9f9f9fa0a0afafafb0bfbfcfcfcf\
+cfcfdfdfdfdfefefefef6a89059600001c294944415478daeddd6b7bd3d6\
+ba2ee0d8350eb00c81ec5533cbac69d6da99383334dbe510904b66129383\
+feff3fda17506888751892255b52eefb634b1259d2a3f1ead5d0f0d61600\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000084eaef3c9b4e274f87f604546e\
+27ba8abf3a19db1b50a96114dfb01031a8d0cf57f18f0e7a760a54e4b778\
+c9c2ad1854a27f1c27586cdb3350c1edd7224eb667dfc0aa9e5fc569666e\
+c460b5f2f0df71063762b08afb8b389b3211ca978771aec82006a5fcf870\
+39cd8587ce5066f8ba8ac3cc0c6250d0cec738d8c53fed2f2820bb79a89d\
+08ab185fc545a91321b03a8ce21216ea44c8372c152f2fb1400d375fb722\
+b6630f427abcf6aee2d544220675c54bc420adb5318b2be25e0c6ec72b8a\
+2bb4186bdac3dfb5e1495cb5d903fb15bed48657711d4ec67d3b973b6eb8\
+574fbafe1ac6343cb8cba5e1248a6bb69031eeead8557bba648c3b3a74ed\
+1c9cc56b74f54e5b913b13aebde82a5ebf9399af8da0ebe17a7ab09170fd\
+1db2b1ee3dddbce57a3a79b77a5978383e5fb95c8c0e9eba29a33ba3d683\
+6793d94925e3d6f9686b6bf0a69ab12c3a98ec2819696baa86c39d67cfa6\
+b377671556846fbe3e385e7d10fbdb59f4ee60fa6c6767e899340d8dd2b3\
+835974d3c9d9592db759974fbefdc98a06b1a5b09d9dfdf041a2d94429c9\
+66ed44ebea4f1cde1c63aa1cc4b29fa1ed2923d9dce8b5b6787dbefbbaa9\
+a641ccbb2f3448eec2f1955587fbcbb748bbeb1ac4e203479a8de46b5d4f\
+b4e683c4bfbf7fbda6bf3f73ac59bfe16233d5e106ea446318eb77bc9eea\
+f0d7ac6d189cac27618f1c6ed66cbca99baf5b9bb1965bb185e3cd9a9dae\
+bb35bfd18819c258af876be82d0c4207d3fa231639e2acd5a431f15a4bc4\
+2e7cdd3a6bf57ec3f75eeb8e98b75ce8cc2d58f1787d89d8bcce80fde290\
+b34ef5bdf13f2f3d37a9cee762024617027679385a65ab06b5558a0246fb\
+03369facfe5ad6e88d802160950f5e3787b1530143c07e48d7eb51955b37\
+383c1730da2caa345d35ac22bf5d6dc6048c7606ecf27054d77a18db93ea\
+6ac5270e39ed0bd87c7f54ef660ec6c7972623721703f6e970773d4b398d\
+267301e34e05ecf470cddfdd359acc2f058c3b10b04faf27a3cd2c42b8bd\
+7b583e6502c65a9598ec7b393fdc54b66ea66c7a7c2a6034dddb2283d6e9\
+ebe978bb496be76eef4e0ee7a702467b03f6e9d3fcf8f574321edd6bee87\
+e88f46e3e9e1f1fcf4536ee9e875159a12b07fddbb77af7d1fa87fefde76\
+c6f4949f1c721a12b0f64e7a1030044cc0b8038ed2cfc51702062b9aa69f\
+8bd3d67ea86b0143c0ea93d14574c411300143c0040c5609d82b01831565\
+7cf7c31f020602b66490b174b6238e80d51730df5f848009187721601f04\
+0c56f43863259bb67ea68cef3cfbd31147c07c2604cc6782554ec63f050c\
+3404040c015ba72e764611b03604ec0f479ca604ec42c060551d9c183b11\
+3004ac3e9d7cc70d011330b8ad830bc40818cdd1c125ce8e040c01ab4f27\
+175345c0040c6e3bedde57fdbc17301a23ea5ec03af891e862c09e0818a8\
+a7040c1d81353af3059708d84602e6cb5558b30e3e95f5ed45344707e715\
+59391b011330ee84eebd3cd513309aa37bafff5ad8977604ec8380c18a76\
+3bb7c65917977aa4b51edfa580591691757bd8b9824ac070c7e2ae923b1f\
+b08bce05ccaa6dac5bf79e1a4d058c06b94b01b3e60d6bd7b9a9b11695a2\
+493af77247c60b382f1c6e1a14b076be9e68cd1b9aa4732fd877709511ba\
+19b05f5c31a0be5b967606ec4cc0d013d848c0ac18c0da75aeab9df160af\
+e770b36e19cf655f752d608e366bd7b5a97b0301a325016be5e4f3875e68\
+a649baf64ab3179a69cb09b9e8d8e7f1be258dba676965c0bc6f89a6408d\
+265e07a3513af6dcc8eb60344bc75e087b2b60344ac7de57f1b60acdd2b1\
+af41f7b60aad39237f71bd80fa6e5ada389dde17c8d22c1d9b4e1f7b5b85\
+46e9d63a82be1d8c86e9d674fa879d5ba998ee06ac8593f71e9b4c8f53b2\
+3ebbe6fad22cddfafa8789b9beb4a72dd0bec988befa81a6e95463db5444\
+9aa6538f66232bd3d330a75d9a2b652a224df3be4b177debfae2b6c50d25\
+7748971a6f5645a471ba3495e3b1995234cd6e87a672ec5a1591a6e9d2fc\
+d8899952b4e9bea56d53398e4ce4a071e2ee3c697e6f22078d73d69d87b3\
+9135a568d359d9b627cdd79e33d3386fbbf31d7cb1256fd019a8cd43df1f\
+4bf38c3bf3f0c873661a68b733a7a5c7603450771e841d593080e6e975a6\
+35f0be3bed1a3ae4ac2b4f8f4ebdcf4cbbcecb76cd7f883d06a381de76a4\
+4fffd063309a68da913efd63af5bd244e38ef4e927de06a36da5559b56b2\
+38f2188c26caead3b7693e7da44b4f235d77a3bd7dad4b4f239d76a28dd8\
+d3a5a799de76a23bf0d8a28834d3a4136dc489b9f434d36e27aefdef3511\
+69a64127da88a7e6d2d350d75d6870c79a883454d4818bff634d449aeaa8\
+03fd8189053968aa7107ba1c334d449a2a6b36625bdeb93cd544a4a9b226\
+41bcf211604519ab0644edef71f87a66362c63b2d4453b3a0453af33d35c\
+93d6f7b8233d0edad9e568c7c237b11e070d76ddf29bb0c7adbf42d06951\
+cb6fc2a6e671d064472d3f4123f33868b2dd763f46ca7a0a6645299ca177\
+fbfa40f79db57a3ae2cc6366da7b13d6fcd7a916195b3f7070d9bcac09f5\
+8d6fd43f760b468b6fc21adf879bb905a3e94e5b5c232edc82d1e69bb086\
+d7888f634fc168ba517bcfd299898834df756ba7f35d5b508ae6cb78272c\
+fed8e40dcf6a807a178c569ca74d9e8f98350ff1dc71a521321bf50d6e73\
+0c634d7ada206a679b63167b558536c85a37a0b96d8ecc014c85484b6ac4\
+c6be76993980cd1c555a5223367408cb1cc0f4106992710b87b0990a91d6\
+d488d7ad1bc2b207b0b1634a931c659eaec3b60d605e05a35932e72336f1\
+59d8fdcc0df6c596b4a9cdd1c0373f162ddb5eeeb8cc4761f1a2697d8edf\
+622d0ebad3e668da63a5ec0e871607cdf332fb9cfd6793b6b59f5d206a71\
+d0c0212cfb9cbd68522731bb836816074df4266ecb6d58f60d98018c461a\
+e59cb68de9d5ff1c1bc068a1a81d27eefd2b03185d1cc2e2bd56e4cb0046\
+3befc21a91b0dc7c19c068aac175dcf4d161e72a3680d1562ff3cedef8dd\
+667b893fe76ee0b9018cc6eae50e61f16293cfc37ecbddbcf8574791e69a\
+e49fc18b8d4da4ed1fe76f9d5988345a947f0e6faad5717f11b06ddb0e21\
+edee73c4717cb28932f179c086e970d0fe3ec7e73271edd3d5872143ab0e\
+07dd2812e378b6de41ecf955d0568d1c3e3a5124c6f1628defaf840d5f71\
+fc2f478fe69b849dcd6b6bd8f7f7023748079156f83df0848e0fd611b19d\
+45e0d65cba01a3157a27a109abbfd9713f0add16eb04d0b1dbb02f11dba9\
+b53afc77f086b801a33db6c3cfeb1afb89fdbdabf0cd78e3a8d11ee378f3\
+117bb228b00dffe93b68b4c87e91842d6a983cb51315d9024f98e972c22a\
+ef760c0bc54bbee87ac22a8d5891de867c713712164715dd8a15ea6dc817\
+77266195743b0ac74bbeb833095b3d62e3452c5fdc1593c2095bada158ac\
+75f8c55c7f9ef61a5d178f58e96ec7fde2f18a0f1d23da6c705efca42fb7\
+6a47d1d6a1f951742261c725cefbe2b762c57b1b9fe7cf7bc192bbd8ea28\
+1eb1e2bd8dcfd3a3b437e8c48d588932b1d01bcf257a1b6ebfe85099f8a6\
+4c0042bb1dc35999dfae3ca44326d775d589a56ebe74e7e9da2056aa8a8b\
+f7f296b2df59941abe2c904de706b1f3eaebc461b9d8ce75377027f6edfb\
+5886155787e74f1c0b3a697c5eae4eacb23a8c0fdd7dd159a59e8925d689\
+fde372d5e17d070175626e3ff179a9eaf0d2d26ca813f307b172cd8dcb7d\
+d5212296ffc2f35ea951f058ef903b5227febe4ab363e763a99b2f333770\
+2b96ff7511a5de4a89cfc58b3b16b179a941ac546fdec40ddc8ad5466f03\
+11ab8f07cbdc5dfb7547ccb443743bea8b97de06225657bcb40ea1744351\
+eb1036d6edd03a84fa2236132ff8a14edcd7db8016743bf43620d1fdf32a\
+6ebeec47a8eb56ccbc0dc8aa137f77f3057546ecbd275fd0bc3a517508b5\
+d589aa43088fd8b9ea106a54e8eb22ac67034507b1379e2cc3e69b1d9a1b\
+50db2066f882fa0631c317d4368819bea0be41ccf005b50d62862fa844e2\
+33b163c3175434889d9bba0135dab79e28ace94eecc4175542e5111b1f9f\
+7efaf4e9f850730300000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+00000000000000000068bff16c49effbfffc9fe5ff698f41016fe3253f7d\
+ff9fd1f2ffb4c740c040c040c0046c15b3aa0ceedcae1b26ec8583b01f7d\
+b2f483e3b01f7cbef483ff2b608d1657e5d19ddb75bdebd2bb61f9bcbd08\
+fb9bcb7f7226600276778aab781a34f695dd7fbb35ec770113b0861a25ec\
+8628e407c7093ff82aa8a05ffab173f7600276a76ac49f4a55888135620d\
+15a28009585dfefbd992b5d488c3b23b30a1427cd2fa80f5968fc28e8075\
+22602b9f3d256bc471e20e0ca81167657b234d0ed860f94ffc216002965a\
+23f64a55884159a9a3421430016b6cc0126bc417e52ac4803d584b852860\
+02d6dc808dcbd488e3943d987bf7564b85286002d6dc8095aa11a3943db8\
+c8fb6b8b3a2a440113b0e6062c312c2fca5588b9bbf0f1f24f8c054cc03a\
+1db01235e23875174e8b5688010d150113b036072ca946bce895aa107393\
+b95c217ed8123001eb74c012e3f24bb90a316716484d15a2800958930356\
+b8461c67ecc3e9062a4401abd728d5ff4938030ed3ff79ff6e06ac708d78\
+9a11b0680315a2806dcaa068f17327039658233e2a5721660e4975558802\
+d6ad800dd734d2f587c3dc3f55c9d933890b9d2093cc80bd2854210e56fb\
+f8b5062cfcef0b5858c03e1fd21ffdb083fb3b93d9c9591cc7f3bf767fd6\
+3fcefdd5c3f403fbec60767276f56d83cfa2e860b2d3af3160bdb8508d78\
+9a19b0a84885384fd8530f6e7ffc77d3a70fd619b0efc7f9b3ab93e820ef\
+cf0b5860c01e67eca6fe24baba795a14dca7d3c0226c78e3cfdc9a24f16e\
+b25353c08ad588c39c5651af7c85387c363b4bfea557efc6c3b5042cf900\
+2c664f05acce80ed1c5fddbaeed611b0fe5e9473f2465f4fb383e89b8493\
+21baa5648df8aa5c85985123e654883b7b27d9bff8ddd3ba03d69fa41f80\
+abd952c2bfefe2840d5fdc3a0a0702961eb061b45cd8541fb0fede55c8b3\
+84689cf5a0372e35a2f58abc7a729ab781652ac47e5ebabe9eb5e33a0396\
+7b00a25b254491a33017b0d4803dbf8aeb0f5860bcbe9c66412763a192b1\
+408d38ccfd83bdc215e2f020f4c32f86b505ec79c036fc388a09581501eb\
+1f27eeac8a03b6b388eb52b68ff8aa5c8598ba87532bc4e1acc8c7d9ab27\
+603b1f8bff7901ab2060c38ff11a02f63c8e371ab00235e269ee1f8c8a55\
+88e143f75727c31a02167e006e8ca102b67ac0fa8b780d01fb2dde70c0c2\
+6bc4fc0a31a5c39f52210e3f16fe40cb65e2aa01eb17b9a95d6c0b587501\
+3b8ed710b0c2f95a541eb049e8b4c2e57f781db68b8f922bc4de79bc7ac2\
+560cd8b0607dfeb3805515b0ab780d012b9caf595479c0926ac4455085f8\
+e751d88e48ab10c72506e545afca800d0bdffffe2c6015052c5e43c08685\
+cfaf41f5010bad119737f6c528a8467c98da432c3184dd5e6760a5800d4b\
+f4971e09587b02b6287e76d510b0c01a719250e75d8724f328f529739921\
+ecd65254ab04ac4cbee28ba180b52560c5cfaf411d01eb85b503972bc4a4\
+ecfc115221fef9ed7f9519c27e1c245709585426dff1494fc05a12b01203\
+581d014bfc9d3fe55788e3a4c5812f422ac4ef53aa4665cef06945012bdb\
+c03d10b076042cf96f5ebe9eec6edffb6c7bb43b3d3ebdf57375042ca946\
+7c1152216e85d488e9156272043e7d9acf4f3f850e61e5039676037c7a38\
+feb2ff479337e7a9b76102d682801d25fdfed1d2839addefc779be554fc0\
+826ac4d3c4f3e6287f16484685786b08bb3c9eecdefbf67fb677d3ceef1f\
+c25f3e6089f5c3e5e1f6cd6d1f9fa73c4e17b016042c6162c4bf927fc5e8\
+cdf7dedbd1fc9b84b7fde7b784eeaca4d4f6022ac4901af1617640a2bf4f\
+eda56b4bcaf9fd43f84b072c7102c77c10b409e3adbff77142486f1d05b3\
+e9730336ff7665bd77afc28005e7ebf3dfdc3fbffd6d7515be0fff32bf46\
+7c995ce7f5726bc4495685f83da1cb23f7d7b1f5f7c4e3d15b3d60891dc4\
+5f93f6fc49e66342ef83ad1cb0cbfd7eeeaf2e13b0e54b7bf6f73dee3fa9\
+2d6083fc1a719152f8bccdab114fb32ac4bf3e464abcbe7cea9c1ab16cc0\
+923a1cff480ef971ea733c01ab2060fbfd805f5d2660cb7fb2d83a4b55ae\
+e8925b233e4c3bc7f26ac48456c28f091cc5e7a3ac4d4b1ac3fe583d608b\
+b0f1eb4bc24e32ae3e02b65ac0920e7e6d01fb636301cbad118fd2eabcbc\
+1a31a142bcb5ccc5ef39cbcb649768250336ce9d2272f380677c46015b29\
+60e783ad3506eccf8d052cb7465ca4b6c6a2ece754a7050be1840e4fe6e8\
+5a326051d8a14e8de32b01ab22609783ad7506ecfb5cedb5072ce997dd7c\
+dcf430fd2e649c35bee4578801aeb306c172011b66dd5685ec9e85805511\
+b0f1568d014bdac27f6e2a602fb377d7517a2730bb46ccaf10f31d656d5a\
+b9808d836629670d613f09d8ea017bbf5567c0121f562e0e1e6c24603935\
+e222e3e169668db87a859878bff462c580bd2f7007967c15792160ab07ec\
+51bd014b5d073075add1fa0296b4317f5fd41f668dede38c64565121263d\
+aa9eae18b045ce1cfd25efd38eb880950fd89f5bf506ec28e3d1f655c692\
+beb504ec65d605e628eb59712fe3141f075fb58a1dca57ab05ac97fdf03b\
+c124ede410b0f2017b5173c0f2a7929f640d66d5066c94f5b8699139bd2e\
+a3468c8a5588fd074f9f3d9bde7694b5bf4b052ce1684fb31da73ded13b0\
+f2017b5073c002df863a3978daaf3f60893562488598d4c888d22bc4b47b\
+9de1647612bec6d48a012bf5a267f25f11b0d201bbd8aa3b6093e0a3194d\
+8675072ca3463cca2ea87aa9cfa9422bc49d8382ebb7ad18b06905017b20\
+602b066c5e7bc00abd7b727bf1e6aa03965423be0aa91093b6e445810ab1\
+3f39297c76af18b0a30a02f648c0560cd887fa033628f4cafcadaf20a8fa\
+dbe5526bc48779cf07d36ac4a00af149998531560cd8db0a02f68b80ad18\
+b069fd01dbda2e94b08b719d014bad118ff25a6e6935624085d83f2e7576\
+0b98800505ace018f6c3f2e855072cb546ccab10536bc4fc0a7158725d7e\
+0113b0b0806d0dde944d58e55f407c9d5c23e656886935627e8558365f4d\
+08d813016b48c08e720aa571a141ec9ff505ec28b946ccad10d36ac4dc0a\
+b174be9a10304d8ea604ec7dee9d48a1883daa2d604935e234a4424cda96\
+5f022ac459bca18069d3b72d6059ef229f063c0c1abd09ce58545bc0926a\
+c445488598d42089f22bc4151ef7ae18b0490501f3a0799d01cb7a553270\
+16f1f6f8f8bcd010567dc0926ac407b390697bcbbbe4a2975b21a61488a7\
+afa7d3f14d93ca03b6bbfcdfffefb8a02d015b63c02e0afde6d409af83db\
+2b8d665dbdab0f58628d18522126d68851ce5e4a1cc0e6a37eb192bc54c0\
+06e1134f4b9c6702b662c07a71d6410d6c1d64d8de9dbe9e5fa63f0dab2d\
+604935e2554885985823e6558809ff2079f99bea0396f04123016b4cc092\
+8abef40be0a270c0be8d6687f3ccdbeb1a0216348568103af8a575b6532f\
+5329cb62d410b0f7a97b55c01a10b0b338fc02388e4b06eccb8748ec2ffe\
+525bc04262320fde27d91562caf7caae27609390495c02b6a98025dd260d\
+0b0c60455e3adc4fddb01a0296542306a6e065c05cca9c87d3e75b6b0bd8\
+60b5832260f506ec6d1c7c01fc2d5e31600927c9abfa027654b2420c1afc\
+9ee4fca90feb0b58d2ff59f4caecb15eb16736021612b0497068eec72b07\
+6c9c7676bd2fd26aa9ac469c17a89b333badef8377f86e0d017b19172e12\
+9f6f07de902f046cc580259e868b8422f1fe555ec0a271de07495d00f86d\
+75bde60235e2b8f4e0f72170640e18c3570f58efba60c2faffefaf2f8f0d\
+d8633d015b2d608947272161cf73a73b8de378b193fd4126691b7654a0d5\
+525d8d38283df88df346b03fc2db442b072cf9839ea4dd496f0d3fa65c43\
+9346eea980ad16b0b43791f77ef8473b51e07cc245e6287692364e8d736f\
+736aa811e7e507bf5ede8d6cf2d3fac419c1ab076c90b88d2987a2bf7795\
+5aa52454ea1743015b2d606973d916b3bf1681eaefec4501b39d1e7fffb9\
+d4a730bfa5fef4c3a4fb9c9bf7093b653acfd7252bc4dcc1ef43fe3f4fba\
+3cf43fc6b5046cebf7383462dfe295dc0839ca1b099f8f05ac68c07a1927\
+d2d5d9d959de0dffb780cd12b2f9e3e53be985dfcc8dd81b7e8f57a99b81\
+b7252bc4dcc16f9c5ff9250c10c38f714d01eb5da75e259fded88e0793e8\
+e68df4492fa0057323a6fdff8e2a28dcef5cc08a7d53726ac06ecf373f39\
+98ecfc7d6cfb3b9328732848de88ab683a9d1ebcbb2a7933302a5b21e60d\
+7ebd8003b494b09d455c57c09293f17d2746b3d96c169de53742522eb657\
+ef0ea6d3d9d7703e10b0a2011b5512b0e4f7a1cecea2283a39bbca1d0af2\
+9fed7e2cf15ce7ba64859853237e08cbe3cd857dfacfa29a5e57f9ea4da9\
+63372b7eb19d0a58d180ad38843d4a1cc0c29c0715aae56727bc2d320c85\
+5f7596a399727d880e9eedececec3c3b88aef2df28582960bdf35207602f\
+f0863ce85d0b01ab65087b94318015e876e7a7bcf8372d647eb20fe51b24\
+83a02314aa9280155d71282561bdeb3aae73773d60694da802011b5e97f9\
+d179a1945f146f73649d2fe3d2835fd2cddbf1a603b6b55dea10dcfe16b7\
+fc523d12b0c2012b595fdc08d86fa50ac441b142b5c4dc8eb7252bc4ccc0\
+27457370bde980954cd83f0a0f613d012b7c6bba7dbd62c0ca2ca97479bf\
+e0295ae2da392a5b21669d6983228f1397ae2ad77505ac5495f88fe29f63\
+2a60c5774ae86dd87f0e13035666c997cb27f90f9352cfb6d56bc471e9c1\
+2fa5bd1fd8c71b9fd516b0ad41d185f12fff51e273440256e2aab31b3486\
+cdfbd3c480bd2c9eaff3fb4bdbb05fc3b5f37de9426754309abda0b3fb70\
+abc68005ecc2bc6310f2391e0958895333a4be384c5a85efcbee1e15ad4e\
+e6497556dee951a2453c2e5921660c7e6913407a018d8e375bf506ac5099\
+78dc2f77a578256065aefdb9eb5e5ffeba951ab0adadf1bc4869f26bf236\
+4c2abf76a6c524604e5d547802c87e40be6a0ed8d6d6243062e74fca7695\
+2f7a0256aab8ca5e94f7eb98334d3fe907a10b8e5eeef7cb8da39725a69a\
+46a55b61e3e2d1ccd9fc2f9795ba03b635d83f5fe918e49e09ff190858c9\
+bb97f41d3bff6b11b269e6a8b21b90b193cc439b756c67fd12fb6e5cb242\
+4c1dfc06652f52b3af3f597bc002ca89f92467570ef62fd3a3a9c9b1427b\
+20f1d05cbeffbec6df34af6c1b4d3396418ce7fba3fc4d382e7ec92d1a93\
+71e9c16f9edb2e4adefcc36fc15c47c03eafe1355fe5187cfe05a7a5a2d9\
+4abd84d58e0785fef9fdf03fd6df3dbc1991cbd3c39b0bd4de0fd990edcf\
+8bfade8ad9e5e9ebc9a85f6a13e24fc79351e99db79bb45674d05dc420e9\
+27ef17dffccb1f4ee9a5edf9fb2df0ffcadad0ff4a5df13ab50f3ab97d14\
+3e1d1fee86076430fe7169e64faf3b99ae8de86f8fbe1cc2d1bd157ec7bd\
+d1d75f32de1ddd2b7e64faa36f9bd0caa3fa7df3b7fb9b3e92bb7f6d48a9\
+63f9d741dc5de54c00000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000000000000008066fbffddd184\
+8d4adc88950000000049454e44ae426082";
+
+std::string nftInscriptionRawHex = "\
+020000000001011771decbce2766b39d8fe66f4dc11737b3146c71f8cc6a\
+e1397384c5e508e7f10000000000ffffffff012202000000000000160014\
+e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d0340cc1e7b0b5fa18b28\
+dce702e4e8ed2e91069d682b8daa3a773774bfc7d0e6f737d403016a9016\
+b58a92592ad0b41682e6209167444eb56605532b28e9be922d3afdda1d00\
+63036f7264010109696d6167652f706e67004d080289504e470d0a1a0a00\
+00000d4948445200000360000002be0803000000f30f8d7d000000d8504c\
+54450000003070bf3070af3173bd3078b73870b73070b73575ba3075ba30\
+75b53070ba3078bb3474bb3474b73074bb3074b73376b93076b93373bc33\
+73b93073b93376bc3275ba3075ba3572ba3272ba3375bc3276b83474bb32\
+74bb3274b83276bd3276bb3474bd3474bb3276b93474bb3474b93274bb32\
+74b93476bb3276bb3375ba3275ba3373bc3273ba3277bc3375bc3375ba33\
+73bc3374ba3174b93376bb3375bc3375bb3375b93375bb3374bb3376bb34\
+75bb3375bb3375ba3374bb3276bc3276ba3375bc3275bc3375bb3275bb33\
+74bc3374bb3375bb7edf10e10000004774524e530010101f202020303030\
+30404040404050505050505f606060606f707070707f7f7f7f8080808080\
+8f8f909090909f9f9f9fa0a0afafafb0bfbfcfcfcfcfcfdfdfdfdfefefef\
+ef6a89059600001c294944415478daeddd6b7bd3d6ba2ee0d8350eb00c81\
+ec5533cbac69d6da99383334dbe510904b66129383feff3fda1750688875\
+1892255b52eefb634b1259d2a3f1ead5d0f0d61600000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+004d08020000000000000084eaef3c9b4e274f87f604546e27ba8abf3a19\
+db1b50a96114dfb01031a8d0cf57f18f0e7a760a54e4b778c9c2ad1854a2\
+7f1c27586cdb3350c1edd7224eb667dfc0aa9e5fc569666ec460b5f2f0df\
+71063762b08afb8b389b3211ca978771aec82006a5fcf87039cd8587ce50\
+66f8ba8ac3cc0c6250d0cec738d8c53fed2f2820bb79a89d08ab185fc545\
+a91321b03a8ce21216ea44c8372c152f2fb1400d375fb722b6630f427abc\
+f6aee2d544220675c54bc420adb5318b2be25e0c6ec72b8a2bb4186bdac3\
+dfb5e1495cb5d903fb15bed48657711d4ec67d3b973b6eb8574fbafe1ac6\
+343cb8cba5e1248a6bb69031eeead8557bba648c3b3a74ed1c9cc56b74f5\
+4e5b913b13aebde82a5ebf9399af8da0ebe17a7ab09170fd1db2b1ee3ddd\
+bce57a3a79b77a5978383e5fb95c8c0e9eba29a33ba3d6836793d94925e3\
+d6f9686b6bf0a69ab12c3a98ec2819696baa86c39d67cfa6b37767155684\
+6fbe3e385e7d10fbdb59f4ee60fa6c6767e899340d8dd2b3835974d3c9d9\
+592db759974fbefdc98a06b1a5b09d9dfdf041a2d94429c966ed44ebea4f\
+1cde1c63aa1cc4b29fa1ed2923d9dce8b5b6787dbefbbaa9a641ccbb2f34\
+48eec2f1955587fbcbb748bbeb1ac4e203479a8de46b5d4fb4e683c4bfbf\
+7fbda6bf3f73ac59bfe16233d5e106ea446318eb77bc9eeaf0d7ac6d189c\
+ac27618f1c6ed66cbca99baf5b9b4d0802b1965bb185e3cd9a9daebb35bf\
+d18819c258af876be82d0c4207d3fa231639e2acd5a431f15a4bc42e7cdd\
+3a6bf57ec3f75eeb8e98b75ce8cc2d58f1787d89d8bcce80fde290b34ef5\
+bdf13f2f3d37a9cee762024617027679385a65ab06b5558a0246fb03369f\
+acfe5ad6e88d802160950f5e3787b1530143c07e48d7eb51955b37383c17\
+30da2caa345d35ac22bf5d6dc6048c7606ecf27054d77a18db93ea6ac527\
+0e39ed0bd87c7f54ef660ec6c7972623721703f6e970773d4b398d267301\
+e34e05ecf470cddfdd359acc2f058c3b10b04faf27a3cd2c42b8bd7b583e\
+6502c65a9598ec7b393fdc54b66ea66c7a7c2a6034dddb2283d6e9ebe978\
+bb496be76eef4e0ee7a702467b03f6e9d3fcf8f574321edd6bee87e88f46\
+e3e9e1f1fcf4536ee9e875159a12b07fddbb77af7d1fa87fefde76c6f494\
+9f1c721a12b0f64e7a1030044cc0b8038ed2cfc51702062b9aa69f8bd3d6\
+7ea86b0143c0ea93d14574c411300143c0040c5609d82b018315657cf7c3\
+1f020602b66490b174b6238e80d51730df5f848009187721601f040c56f4\
+3863259bb67ea68cef3cfbd31147c07c2604cc6782554ec63f050c340404\
+0c015ba72e764611b03604ec0f479ca604ec42c060551d9c183b113004ac\
+3e9d7cc70d011330b8ad830bc40818cdd1c125ce8e040c01ab4f27175345\
+c0040c6e3bedde57fdbc17301a23ea5ec03af891e862c09e0818a84d0802\
+a7040c1d81353af3059708d84602e6cb5558b30e3e95f5ed45344707e715\
+59391b011330ee84eebd3cd513309aa37bafff5ad8977604ec8380c18a76\
+3bb7c65917977aa4b51edfa580591691757bd8b9824ac070c7e2ae923b1f\
+b08bce05ccaa6dac5bf79e1a4d058c06b94b01b3e60d6bd7b9a9b11695a2\
+493af77247c60b382f1c6e1a14b076be9e68cd1b9aa4732fd877709511ba\
+19b05f5c31a0be5b967606ec4cc0d013d848c0ac18c0da75aeab9df160af\
+e770b36e19cf655f752d608e366bd7b5a97b0301a325016be5e4f3875e68\
+a649baf64ab3179a69cb09b9e8d8e7f1be258dba676965c0bc6f89a6408d\
+265e07a3513af6dcc8eb60344bc75e087b2b60344ac7de57f1b60acdd2b1\
+af41f7b60aad39237f71bd80fa6e5ada389dde17c8d22c1d9b4e1f7b5b85\
+46e9d63a82be1d8c86e9d674fa879d5ba998ee06ac8593f71e9b4c8f53b2\
+3ebbe6fad22cddfafa8789b9beb4a72dd0bec988befa81a6e95463db5444\
+9aa6538f66232bd3d330a75d9a2b652a224df3be4b177debfae2b6c50d25\
+7748971a6f5645a471ba3495e3b1995234cd6e87a672ec5a1591a6e9d2fc\
+d8899952b4e9bea56d53398e4ce4a071e2ee3c697e6f22078d73d69d87b3\
+9135a568d359d9b627cdd79e33d3386fbbf31d7cb1256fd019a8cd43df1f\
+4bf38c3bf3f0c873661a68b733a7a5c7603450771e841d593080e6e975a6\
+35f0be3bed1a3ae4ac2b4d08024f8f4ebdcf4cbbcecb76cd7f883d06a381\
+de76a44fffd063309a68da913efd63af5bd244e38ef4e927de06a36da555\
+9b56b238f2188c26caead3b7693e7da44b4f235d77a3bd7dad4b4f239d76\
+a28dd8d3a5a799de76a23bf0d8a28834d3a4136dc489b9f434d36e27aefd\
+ef351169a64127da88a7e6d2d350d75d6870c79a883454d4818bff634d44\
+9aeaa803fd8189053968aa7107ba1c334d449a2a6b36625bdeb93cd544a4\
+a9b22641bcf211604519ab0644edef71f87a66362c63b2d4453b3a0453af\
+33d35c93d6f7b8233d0edad9e568c7c237b11e070d76ddf29bb0c7adbf42\
+d06951cb6fc2a6e671d064472d3f4123f33868b2dd763f46ca7a0a664529\
+9ca177fbfa40f79db57a3ae2cc6366da7b13d6fcd7a916195b3f7070d9bc\
+ac09f58d6fd43f760b468b6fc21adf879bb905a3e94e5b5c232edc82d1e6\
+9bb086d7888f634fc168ba517bcfd299898834df756ba7f35d5b508ae6cb\
+78272cfed8e40dcf6a807a178c569ca74d9e8f98350ff1dc71a521321bf5\
+0d6e730c634d7ada206a679b63167b558536c85a37a0b96d8ecc014c8548\
+4b6ac4c6be76993980cd1c555a5223367408cb1cc0f4106992710b87b099\
+0a91d6d488d7ad1bc2b207b0b1634a931c659eaec3b60d605e05a35932e7\
+2336f159d8fdcc0df6c596b4a9cdd1c0373f162ddb5eeeb8cc4761f1a269\
+7d8edf622d0ebad3e668da63a5ec0e871607cdf332fb9c4d0802fd6793b6\
+b59f5d206a71d0c0212cfb9cbd68522731bb836816074df4266ecb6d58f6\
+0d98018c461ae59cb68de9d5ff1c1bc068a1a81d27eefd2b03185d1cc2e2\
+bd56e4cb00463befc21a91b0dc7c19c068aac175dcf4d161e72a3680d156\
+2ff3cedef8dd667b893fe76ee0b9018cc6eae50e61f16293cfc37ecbddbc\
+f8574791e69ae49fc18b8d4da4ed1fe76f9d5988345a947f0e6faad5717f\
+11b06ddb0e21edee73c4717cb28932f179c086e970d0fe3ec7e73271edd3\
+d5872143ab0e07dd2812e378b6de41ecf955d0568d1c3e3a5124c6f1628d\
+efaf840d5f71fc2f478fe69b849dcd6b6bd8f7f7023748079156f83df084\
+8e0fd611b19d45e0d65cba01a3157a27a109abbfd9713f0add16eb04d0b1\
+dbb02f11dba9b53afc77f086b801a33db6c3cfeb1afb89fdbdabf0cd78e3\
+a8d11ee378f3117bb228b00dffe93b68b4c87e91842d6a983cb51315d902\
+4f98e972c22aef760c0bc54bbee87ac22a8d5891de867c713712164715dd\
+8a15ea6dc81777266195743b0ac74bbeb833095b3d62e3452c5fdc1593c2\
+095bada158ac75f8c55c7f9ef61a5d178f58e96ec7fde2f18a0f1d23da6c\
+705efca42fb76a47d1d6a1f951742261c725cefbe2b762c57b1b9fe7cf7b\
+c192bbd8ea281eb1e2bd8dcfd3a3b437e8c48d588932b1d01bcf257a1b6e\
+bfe85099f8a64c0042bb1dc35999dfae3ca44326d775d589a56ebe74e7e9\
+da2056aa8a8b4d0802f7f296b2df59941abe2c904de706b1f3eaebc461b9\
+d8ce75377027f6edfb5886155787e74f1c0b3a697c5eae4eacb23a8c0fdd\
+7dd159a59e8925d689fde372d5e17d070175626e3ff179a9eaf0d2d26ca8\
+13f307b172cd8dcb7dd5212296ffc2f35ea951f058ef903b5227febe4ab3\
+63e763a99b2f3337702b96ff7511a5de4a89cfc58b3b16b179a941ac546f\
+dec40ddc8ad5466f0311ab8f07cbdc5dfb7547ccb443743bea8b97de0622\
+5657bcb40ea1744351eb1036d6edd03a84fa2236132ff8a14edcd7db8016\
+743bf43620d1fdf32a6ebeec47a8eb56ccbc0dc8aa137f77f3057546ecbd\
+275fd0bc3a517508b5d589aa43088fd8b9ea106a54e8eb22ac67034507b1\
+379e2cc3e69b1d9a1b50db2066f882fa0631c317d4368819bea0be41ccf0\
+05b50d62862fa844e233b163c3175434889d9bba0135dab79e28ace94eec\
+c4175542e5111b1f9f7efaf4e9f850730300000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000068bff16c49effbfffc9fe5ff\
+698f41016fe3253f7dff9fd1f2ffb4c740c040c040c0046c15b3aa0ceedc\
+ae1b26ec8583b01f7db2f483e3b01f7cbef483ff2b608d1657e5d19ddb75\
+bdebd2bb61f9bcbd08fb9bcb7f7226600276778aab781a34f695dd7fbb35\
+ec770113b0861a25ec8628e407c7093ff82aa84d0802a05ffab173f76002\
+76a76ac49f4a55888135620d15a28009585dfefbd992b5d488c3b23b30a1\
+427cd2fa80f5968fc28e807522602b9f3d256bc471e20e0ca81167657b23\
+4d0ed860f94ffc216002965a23f64a55884159a9a3421430016b6cc0126b\
+c417e52ac4803d584b85286002d6dc808dcbd488e3943d987bf7564b8528\
+6002d6dc8095aa11a3943db8c8fb6b8b3a2a440113b0e6062c312c2fca55\
+88b9bbf0f1f24f8c054cc03a1db01235e23875174e8b5688010d150113b0\
+36072ca946bce895aa107393b95c217ed8123001eb74c012e3f24bb90a31\
+6716484d15a2800958930356b8461c67ecc3e9062a4401abd728d5ff4938\
+030ed3ff79ff6e06ac708d789a11b0680315a2806dcaa068f17327039658\
+233e2a5721660e4975558802d6ad800dd734d2f587c3dc3f55c9d933890b\
+9d2093cc80bd2854210e56fbf8b5062cfcef0b5858c03e1fd21ffdb083fb\
+3b93d9c9591cc7f3bf767fd63fcefdd5c3f403fbec60767276f56d83cfa2\
+e860b2d3af3160bdb8508d789a19b0a84885384fd8530f6e7ffc77d3a70f\
+d619b0efc7f9b3ab93e820efcf0b5860c01e67eca6fe24baba795a14dca7\
+d3c0226c78e3cfdc9a24f16eb25353c08ad588c39c5651af7c85387c363b\
+4bfea557efc6c3b5042cf9002c664f05acce80ed1c5fddbaeed611b0fe5e\
+9473f2465f4fb383e89b849321baa5648df8aa5c85985123e654883b7b27\
+d9bf4d0802f8ddd3ba03d69fa41f80abd952c2bfefe2840d5fdc3a0a0702\
+961eb061b45cd8541fb0fede55c8b384689cf5a0372e35a2f58abc7a729a\
+b781652ac47e5ebabe9eb5e33a03967b00a25b254491a33017b0d4803dbf\
+8aeb0f5860bcbe9c66412763a192b1408d38ccfd83bdc215e2f020f4c32f\
+86b505ec79c036fc388a09581501eb1f27eeac8a03b6b388eb52b68ff8aa\
+5c8598ba87532bc4e1acc8c7d9ab27603b1f8bff7901ab2060c38ff11a02\
+f63c8e371ab00235e269ee1f8c8a5588e143f75727c31a02167e006e8ca1\
+02b67ac0fa8b780d01fb2dde70c0c26bc4fc0a31a5c39f52210e3f16fe40\
+cb65e2aa01eb17b9a95d6c0b5875013b8ed710b0c2f95a541eb049e8b4c2\
+e57f781db68b8f922bc4de79bc7ac2560cd8b0607dfeb3805515b0ab780d\
+012b9caf595479c0926ac4455085f8e751d88e48ab10c72506e545afca80\
+0d0bdffffe2c6015052c5e43c08685cfaf41f5010bad119737f6c528a846\
+7c98da432c3184dd5e6760a5800d4bf4971e09587b02b6287e76d510b0c0\
+1a719250e75d8724f328f529739921ecd65254ab04ac4cbee28ba180b525\
+60c5cfaf411d01eb85b503972bc4a4ecfc115221fef9ed7f9519c27e1c24\
+5709585426dff1494fc05a12b01203581d014bfc9d3fe55788e3a4c5812f\
+422ac4ef53aa4665cef06945012bdbc03d10b076042cf96f5ebe9eec6edf\
+fb6c7bb43b3d3ebdf57375042ca9464d08027c1152216e85d488e9156272\
+043e7d9acf4f3f850e61e5039676037c7a38feb2ff479337e7a9b76102d6\
+82801d25fdfed1d2839addefc779be554fc0826ac4d3c4f3e6287f164846\
+85786b08bb3c9eecdefbf67fb677d3ceef1fc25f3e6089f5c3e5e1f6cd6d\
+1f9fa73c4e17b016042c6162c4bf927fc5e8cdf7dedbd1fc9b84b7fde7b7\
+84eeaca4d4f6022ac4901af1617640a2bf4feda56b4bcaf9fd43f84b072c\
+7102c77c10b409e3adbff77142486f1d05b3e9730336ff7665bd77afc280\
+05e7ebf3dfdc3fbffd6d7515be0fff32bf467c995ce7f5726bc4495685f8\
+3da1cb23f7d7b1f5f7c4e3d15b3d60891dc45f93f6fc49e66342ef83ad1c\
+b0cbfd7eeeaf2e13b0e54b7bf6f73dee3fa92d6083fc1a719152f8bccdab\
+114fb32ac4bf3e464abcbe7cea9c1ab16cc0923a1cff480ef971ea733c01\
+ab2060fbfd805f5d2660cb7fb2d83a4b55aee8925b233e4c3bc7f26ac484\
+56c28f091cc5e7a3ac4d4b1ac3fe583d608bb0f1eb4bc24e32ae3e02b65a\
+c0920e7e6d01fb636301cbad118fd2eabcbc1a31a142bcb5ccc5ef39cbcb\
+649768250336ce9d2272f380677c46015b2960e783ad3506eccf8d052cb7\
+465ca4b6c6a2ece754a7050be1840e4fe6e85a326051d8a14e8de32b01ab\
+22609783ad7506ecfb5cedb5072ce997dd7cdcf430fd2e649c35bee45788\
+01aeb306c172011b66dd5685ec9e85805511b0f1568d014bdac27f6e4d08\
+022a602fb377d7517a2730bb46ccaf10f31d656d5ab9808d836629670d61\
+3f09d8ea017bbf5567c0121f562e0e1e6c24603935e222e3e169668db87a\
+859878bff462c580bd2f7007967c15792160ab07ec51bd014b5d073075ad\
+d1fa0296b4317f5fd41f668dede38c64565121263daa9eae18b045ce1cfd\
+25efd38eb880950fd89f5bf506ec28e3d1f655c692beb504ec65d605e628\
+eb59712fe3141f075fb58a1dca57ab05ac97fdf03bc124ede410b0f2017b\
+5173c0f2a7929f640d66d5066c94f5b8699139bd2ea3468c8a5588fd074f\
+9f3d9bde7694b5bf4b052ce1684fb31da73ded13b0f2017b5073c002df86\
+3a3978daaf3f60893562488598d4c888d22bc4b47b9de1647612bec6d48a\
+012bf5a267f25f11b0d201bbd8aa3b6093e0a3194d8675072ca3463cca2e\
+a87aa9cfa9422bc49d8382ebb7ad18b06905017b20602b066c5e7bc00abd\
+7b727bf1e6aa03965423be0aa91093b6e445810ab13f39297c76af18b0a3\
+0a02f648c0560cd887fa033628f4cafcadaf20a8fadbe5526bc48779cf07\
+d36ac4a00af149998531560cd8db0a02f68b80ad18b069fd01dbda2e94b0\
+8b719d014bad118ff25a6e6935624085d83f2e75760b98800505ace018f6\
+c3f2e855072cb546ccab10536bc4fc0a7158725d7e0113b0b0806d0dde94\
+4d58e55f407c9d5c23e656886935627e8558365f4d08d813016b48c08e72\
+0aa571a141ec9ff505ec284d0802b946ccad10d36ac4dc0ab174be9a1030\
+4d8ea604ec7dee9d48a1883daa2d604935e234a4424cda965f022ac459bc\
+a18069d3b72d6059ef229f063c0c1abd09ce58545bc0926ac445488598d4\
+2089f22bc4151ef7ae18b0490501f3a0799d01cb7a55327016f1f6f8f8bc\
+d010567dc0926ac407b390697bcbbbe4a2975b21a61488a7afa7d3f14d93\
+ca03b6bbfcdfffefb8a02d015b63c02e0afde6d409af83db2b8d665dbdab\
+0f58628d18522126d68851ce5e4a1cc0e6a37eb192bc54c006e1134f4b9c\
+6702b662c07a71d6410d6c1d64d8de9dbe9e5fa63f0dab2d604935e25548\
+85985823e6558809ff2079f99bea0396f04123016b4cc0928abef40be0a2\
+70c0be8d6687f3ccdbeb1a0216348568103af8a575b6532f5329cb62d410\
+b0f7a97b55c01a10b0b338fc02388e4b06eccb8748ec2ffe525bc0426232\
+0fde27d91562caf7caae27609390495c02b6a98025dd260d0b0c60455e3a\
+dc4fddb01a0296542306a6e065c05cca9c87d3e75b6b0bd860b5832260f5\
+06ec6d1c7c01fc2d5e31600927c9abfa027654b2420c1afc9ee4fca90feb\
+0b58d2ff59f4caecb15eb16736021612b0497068eec72b076c9c7676bd2f\
+d26aa9ac469c17a89b333badef8377f86e0d017b19172e129f6f07de902f\
+046cc580259e868b8422f1fe555ec0a271de07495d00f86d75bde60235e2\
+b8f4e0f72170640e18c3570f58efba60c2faffefaf2f8f0d4d0802d8633d\
+015b2d608947272161cf73a73b8de378b193fd4126691b7654a0d5525d8d\
+38283df88df346b03fc2db442b072cf9839ea4dd496f0d3fa65c439346ee\
+a980ad16b0b43791f77ef8473b51e07cc245e6287692364e8d736f736aa8\
+11e7e507bf5ede8d6cf2d3fac419c1ab076c90b88d2987a2bf77955aa524\
+54ea1743015b2d606973d916b3bf1681eaefec4501b39d1e7fffb9d4a730\
+bfa5fef4c3a4fb9c9bf7093b653acfd7252bc4dcc1ef43fe3f4fba3cf43f\
+c6b5046cebf7383462dfe295dc0839ca1b099f8f05ac68c07a1927d2d5d9\
+d959de0dffb780cd12b2f9e3e53be985dfcc8dd81b7e8f57a99b81b7252b\
+c4dcc16f9c5ff9250c10c38f714d01eb5da75e259fded88e0793e8e68df4\
+492fa0057323a6fdff8e2a28dcef5cc08a7d53726ac06ecf373f3998ecfc\
+7d6cfb3b9328732848de88ab683a9d1ebcbb2a7933302a5b21e60d7ebd80\
+03b494b09d455c57c09293f17d2746b3d96c169de53742522eb657ef0ea6\
+d3d9d7703e10b0a2011b5512b0e4f7a1cecea2283a39bbca1d0af29fed7e\
+2cf15ce7ba64859853237e08cbe3cd857dfacfa29a5e57f9ea4da963372b\
+7eb19d0a58d180ad38843d4a1cc0c29c0715aae56727bc2d320c855f7596\
+a399727d880e9eedececec3c3b88aef2df28582960bdf35207602ff0863c\
+e85d0b01ab65087b94318015e876e7a7bcf8372d647eb20fe51b2483a023\
+14aa9280155d714d0802282561bdeb3aae73773d60694da802011b5e97f9\
+d179a1945f146f73649d2fe3d2835fd2cddbf1a603b6b55dea10dcfe16b7\
+fc523d12b0c2012b595fdc08d86fa50ac441b142b5c4dc8eb7252bc4ccc0\
+27457370bde980954cd83f0a0f613d012b7c6bba7dbd62c0ca2ca97479bf\
+e0295ae2da392a5b21669d6983228f1397ae2ad77505ac5495f88fe29f63\
+2a60c5774ae86dd87f0e13035666c997cb27f90f9352cfb6d56bc471e9c1\
+2fa5bd1fd8c71b9fd516b0ad41d185f12fff51e273440256e2aab31b3486\
+cdfbd3c480bd2c9eaff3fb4bdbb05fc3b5f37de9426754309abda0b3fb70\
+abc68005ecc2bc6310f2391e0958895333a4be384c5a85efcbee1e15ad4e\
+e6497556dee951a2453c2e5921660c7e6913407a018d8e375bf506ac5099\
+78dc2f77a578256065aefdb9eb5e5ffeba951ab0adadf1bc4869f26bf236\
+4c2abf76a6c524604e5d547802c87e40be6a0ed8d6d6243062e74fca7695\
+2f7a0256aab8ca5e94f7eb98334d3fe907a10b8e5eeef7cb8da39725a69a\
+46a55b61e3e2d1ccd9fc2f9795ba03b635d83f5fe918e49e09ff190858c9\
+bb97f41d3bff6b11b269e6a8b21b90b193cc439b756c67fd12fb6e5cb242\
+4c1dfc06652f52b3af3f597bc002ca89f92467570ef62fd3a3a9c9b1427b\
+20f1d05cbeffbec6df34af6c1b4d3396418ce7fba3fc4d382e7ec92d1a93\
+71e9c16f9edb2e4adefcc36fc15c47c03eafe1354d29015fe5187cfe05a7\
+a5a2d94abd84d58e0785fef9fdf03fd6df3dbc1991cbd3c39b0bd4de0fd9\
+90edcf8bfade8ad9e5e9ebc9a85f6a13e24fc79351e99db79bb45674d05d\
+c420e927ef17dffccb1f4ee9a5edf9fb2df0ffcadad0ff4a5df13ab50f3a\
+b97d143e1d1fee86076430fe7169e64faf3b99ae8de86f8fbe1cc2d1bd15\
+7ec7bdd1d75f32de1ddd2b7e64faa36f9bd0caa3fa7df3b7fb9b3e92bb7f\
+6d48a963f9d741dc5de54c00000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+000000000000000000000000000000000000000000000000000000000000\
+00000000000000000000000000000000000000000000000000008066fbff\
+ddd1848d4adc88950000000049454e44ae4260826821c00f209b6ada5edb\
+42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000";
diff --git a/tests/Bitcoin/BitcoinScriptTests.cpp b/tests/chains/Bitcoin/BitcoinScriptTests.cpp
similarity index 87%
rename from tests/Bitcoin/BitcoinScriptTests.cpp
rename to tests/chains/Bitcoin/BitcoinScriptTests.cpp
index 15d3cf7fc5e..f4a6ed9fbbe 100644
--- a/tests/Bitcoin/BitcoinScriptTests.cpp
+++ b/tests/chains/Bitcoin/BitcoinScriptTests.cpp
@@ -1,12 +1,10 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bitcoin/Script.h"
 #include "Bitcoin/SignatureBuilder.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include "HexCoding.h"
 
 #include <gtest/gtest.h>
@@ -80,6 +78,22 @@ TEST(BitcoinScript, PayToScriptHash) {
     EXPECT_EQ(PayToPublicKeyHash.matchPayToScriptHash(res), false);
 }
 
+TEST(BitcoinScript, PayToScriptHashReplay) {
+    const Script script = Script::buildPayToScriptHashReplay(
+        parse_hex("2cda89c2f217517108d55ffdf3d90e111d450be9"),
+        parse_hex("f1bf729948789aef5801fd91a3bf4e014ffcf4fcbd4f685de2b6990100000000"), 1190791);
+    EXPECT_EQ(hex(script.bytes), "a9142cda89c2f217517108d55ffdf3d90e111d450be98720f1bf729948789aef5801fd91a3bf4e014ffcf4fcbd4f685de2b699010000000003872b12b4");
+
+    const Script script2 = Script::lockScriptForAddress(
+        "zsiZvKaCW9bSVt7Fy6C79CE5rFR6SEiJxAw", TWCoinTypeZen,
+        parse_hex("f1bf729948789aef5801fd91a3bf4e014ffcf4fcbd4f685de2b6990100000000"), 1190791);
+    EXPECT_EQ(script.bytes, script2.bytes);
+
+    Data res;
+    EXPECT_EQ(script.matchPayToScriptHashReplay(res), true);
+    EXPECT_EQ(hex(res), "2cda89c2f217517108d55ffdf3d90e111d450be9");
+}
+
 TEST(BitcoinScript, PayToWitnessScriptHash) {
     const Script script = Script::buildPayToWitnessScriptHash(parse_hex("ff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3db"));
     EXPECT_EQ(hex(script.bytes), hex(PayToWitnessScriptHash.bytes));
@@ -143,6 +157,11 @@ TEST(BitcoinScript, EncodeNumber) {
     EXPECT_EQ(Script::encodeNumber(1), OP_1);
     EXPECT_EQ(Script::encodeNumber(3), OP_3);
     EXPECT_EQ(Script::encodeNumber(9), OP_9);
+
+    EXPECT_EQ(hex(Script::encodeNumber(int64_t(0))), "00");
+    EXPECT_EQ(hex(Script::encodeNumber(int64_t(1))), "51");
+    EXPECT_EQ(hex(Script::encodeNumber(int64_t(10000000))), "80969800");
+    EXPECT_EQ(hex(Script::encodeNumber(int64_t(-10000000))), "80969880");
 }
 
 TEST(BitcoinScript, DecodeNumber) {
@@ -306,19 +325,54 @@ TEST(BitcoinScript, OpReturn) {
     {
         Data data = parse_hex("00010203");
         Script script = Script::buildOpReturnScript(data);
+        EXPECT_EQ(script.bytes.size(), 2 + data.size());
         EXPECT_EQ(hex(script.bytes), "6a0400010203");
     }
     {
         Data data = parse_hex("535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a");
         Script script = Script::buildOpReturnScript(data);
+        EXPECT_EQ(script.bytes.size(), 2 + data.size());
         EXPECT_EQ(hex(script.bytes), "6a3b535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a");
     }
     {
-        // too long, truncated
-        Data data = Data(70);
+        Data data = Data(69);
+        data.push_back(0xab);
+        Script script = Script::buildOpReturnScript(data);
+        EXPECT_EQ(script.bytes.size(), 2 + data.size());
+        EXPECT_EQ(hex(script.bytes), "6a46000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab");
+    }
+    {
+        Data data = Data(74);
+        data.push_back(0xab);
+        Script script = Script::buildOpReturnScript(data);
+        EXPECT_EQ(script.bytes.size(), 2 + data.size());
+        EXPECT_EQ(hex(script.bytes), 
+            "6a4b"
+            "0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab");
+    }
+    {
+        // >75 bytes, with OP_PUSHDATA1
+        Data data = Data(79);
+        data.push_back(0xab);
         Script script = Script::buildOpReturnScript(data);
-        EXPECT_EQ(hex(script.bytes), "6a4000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+        EXPECT_EQ(script.bytes.size(), 3 + data.size());
+        EXPECT_EQ(hex(script.bytes), 
+            "6a4c50"
+            "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ab");
     }
+    {
+        // >80 bytes, fails
+        EXPECT_EQ(hex(Script::buildOpReturnScript(Data(81)).bytes), "");
+        EXPECT_EQ(hex(Script::buildOpReturnScript(Data(255)).bytes), "");
+    }
+}
+
+TEST(BitcoinScript, OpReturnTooLong) {
+    // too long, truncated
+    Data data = Data(89);
+    data.push_back(0xab);
+    Script script = Script::buildOpReturnScript(data);
+    EXPECT_EQ(hex(script.bytes), "");
 }
 
 TEST(BitcoinTransactionSigner, PushAllEmpty) {
diff --git a/tests/chains/Bitcoin/FeeCalculatorTests.cpp b/tests/chains/Bitcoin/FeeCalculatorTests.cpp
new file mode 100644
index 00000000000..aa2f973c4bd
--- /dev/null
+++ b/tests/chains/Bitcoin/FeeCalculatorTests.cpp
@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/FeeCalculator.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Bitcoin {
+
+TEST(BitcoinFeeCalculator, ConstantFeeCalculator) {
+    const auto feeCalculator = ConstantFeeCalculator(33);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 33);
+    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 33);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 33);
+    EXPECT_EQ(feeCalculator.calculateSingleInput(10), 0);
+}
+
+TEST(BitcoinFeeCalculator, LinearFeeCalculator) {
+    const auto feeCalculator = LinearFeeCalculator(10, 20, 50);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 100);
+    EXPECT_EQ(feeCalculator.calculate(1, 1, 1), 80);
+    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 90);
+    EXPECT_EQ(feeCalculator.calculate(1, 0, 1), 60);
+    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 50);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 1000);
+    EXPECT_EQ(feeCalculator.calculateSingleInput(10), 100);
+}
+
+TEST(BitcoinFeeCalculator, BitcoinCalculate) {
+    const FeeCalculator& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 174);
+    EXPECT_EQ(feeCalculator.calculate(1, 1, 1), 143);
+    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 72);
+    EXPECT_EQ(feeCalculator.calculate(1, 0, 1), 112);
+    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 10);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 1740);
+}
+
+TEST(BitcoinFeeCalculator, SegwitCalculate) {
+    const FeeCalculator& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 174);
+    EXPECT_EQ(feeCalculator.calculate(1, 1, 1), 143);
+    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 72);
+    EXPECT_EQ(feeCalculator.calculate(1, 0, 1), 112);
+    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 10);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 1740);
+}
+
+TEST(BitcoinFeeCalculator, BitcoinCalculateNoDustFilter) {
+    const FeeCalculator& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin, true);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 174);
+    EXPECT_EQ(feeCalculator.calculate(1, 1, 1), 143);
+    EXPECT_EQ(feeCalculator.calculate(0, 2, 1), 72);
+    EXPECT_EQ(feeCalculator.calculate(1, 0, 1), 112);
+    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 10);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 1740);
+    EXPECT_EQ(feeCalculator.calculateSingleInput(1), 0);
+}
+
+TEST(BitcoinFeeCalculator, DefaultCalculate) {
+    DefaultFeeCalculator defaultFeeCalculator;
+    EXPECT_EQ(defaultFeeCalculator.calculate(1, 2, 1), 226);
+    EXPECT_EQ(defaultFeeCalculator.calculate(1, 1, 1), 192);
+    EXPECT_EQ(defaultFeeCalculator.calculate(0, 2, 1), 78);
+    EXPECT_EQ(defaultFeeCalculator.calculate(1, 0, 1), 158);
+    EXPECT_EQ(defaultFeeCalculator.calculate(0, 0, 1), 10);
+    EXPECT_EQ(defaultFeeCalculator.calculate(1, 2, 10), 2260);
+    EXPECT_EQ(defaultFeeCalculator.calculateSingleInput(1), 148);
+    EXPECT_EQ(defaultFeeCalculator.calculateSingleInput(2), 296);
+    EXPECT_EQ(defaultFeeCalculator.calculateSingleInput(10), 1480);
+}
+
+TEST(BitcoinFeeCalculator, DefaultCalculateNoDustFilter) {
+    DefaultFeeCalculator defaultFeeCalculator(true);
+    EXPECT_EQ(defaultFeeCalculator.calculate(1, 2, 1), 226);
+    EXPECT_EQ(defaultFeeCalculator.calculate(1, 1, 1), 192);
+    EXPECT_EQ(defaultFeeCalculator.calculate(0, 2, 1), 78);
+    EXPECT_EQ(defaultFeeCalculator.calculate(1, 0, 1), 158);
+    EXPECT_EQ(defaultFeeCalculator.calculate(0, 0, 1), 10);
+    EXPECT_EQ(defaultFeeCalculator.calculate(1, 2, 10), 2260);
+    EXPECT_EQ(defaultFeeCalculator.calculateSingleInput(1), 0);
+}
+
+TEST(BitcoinFeeCalculator, DecredCalculate) {
+    const FeeCalculator& feeCalculator = getFeeCalculator(TWCoinTypeDecred);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 254);
+    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 12);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 2540);
+    EXPECT_EQ(feeCalculator.calculateSingleInput(1), 166);
+}
+
+TEST(BitcoinFeeCalculator, DecredCalculateNoDustFilter) {
+    const FeeCalculator& feeCalculator = getFeeCalculator(TWCoinTypeDecred, true);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 1), 254);
+    EXPECT_EQ(feeCalculator.calculate(0, 0, 1), 12);
+    EXPECT_EQ(feeCalculator.calculate(1, 2, 10), 2540);
+    EXPECT_EQ(feeCalculator.calculateSingleInput(1), 0);
+}
+
+} // namespace TW::Bitcoin
diff --git a/tests/Bitcoin/InputSelectorTests.cpp b/tests/chains/Bitcoin/InputSelectorTests.cpp
similarity index 84%
rename from tests/Bitcoin/InputSelectorTests.cpp
rename to tests/chains/Bitcoin/InputSelectorTests.cpp
index 1f66fedeec5..eef037af45a 100644
--- a/tests/Bitcoin/InputSelectorTests.cpp
+++ b/tests/chains/Bitcoin/InputSelectorTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWCoinType.h>
 
@@ -127,7 +125,9 @@ TEST(BitcoinInputSelector, SelectOneInsufficientEqual) {
     auto selector = InputSelector<UTXO>(utxos);
     auto selected = selector.select(100'000, 1);
 
-    EXPECT_TRUE(verifySelectedUTXOs(selected, {}));
+    // `InputSelector` returns the entire list of UTXOs even if they are not enough.
+    // That's because `InputSelector` has a rough segwit fee estimation algorithm, and the UTXOs can actually be enough.
+    EXPECT_TRUE(verifySelectedUTXOs(selected, {100'000}));
 }
 
 TEST(BitcoinInputSelector, SelectOneInsufficientHigher) {
@@ -136,14 +136,28 @@ TEST(BitcoinInputSelector, SelectOneInsufficientHigher) {
     auto selector = InputSelector<UTXO>(utxos);
     auto selected = selector.select(99'900, 1);
 
-    EXPECT_TRUE(verifySelectedUTXOs(selected, {}));
+    // `InputSelector` returns the entire list of UTXOs even if they are not enough.
+    // That's because `InputSelector` has a rough segwit fee estimation algorithm, and the UTXOs can actually be enough.
+    EXPECT_TRUE(verifySelectedUTXOs(selected, {100'000}));
+}
+
+TEST(BitcoinInputSelector, SelectOneInsufficientHigherFilterDust) {
+    auto utxos = buildTestUTXOs({22, 100'000, 40});
+
+    auto selector = InputSelector<UTXO>(utxos);
+    auto selected = selector.select(99'900, 1);
+
+    // `InputSelector` returns the entire list of UTXOs even if they are not enough.
+    // That's because `InputSelector` has a rough segwit fee estimation algorithm, and the UTXOs can actually be enough.
+    // However, the list of result UTXOs does not include dust inputs.
+    EXPECT_TRUE(verifySelectedUTXOs(selected, {100'000}));
 }
 
 TEST(BitcoinInputSelector, SelectOneFitsExactly) {
     auto utxos = buildTestUTXOs({100'000});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto expectedFee = 174;
     auto selected = selector.select(100'000 - expectedFee, 1);
 
@@ -152,10 +166,11 @@ TEST(BitcoinInputSelector, SelectOneFitsExactly) {
     EXPECT_EQ(feeCalculator.calculate(1, 2, 1), expectedFee);
     EXPECT_EQ(feeCalculator.calculate(1, 1, 1), 143);
 
-    // 1 sat more and does not fit any more
+    // 1 sat more and does not fit any more.
+    // However, `InputSelector` returns the entire list of UTXOs even if they are not enough.
+    // That's because `InputSelector` has a rough segwit fee estimation algorithm, and the UTXOs can actually be enough.
     selected = selector.select(100'000 - expectedFee + 1, 1);
-
-    EXPECT_TRUE(verifySelectedUTXOs(selected, {}));
+    EXPECT_TRUE(verifySelectedUTXOs(selected, {100'000}));
 }
 
 TEST(BitcoinInputSelector, SelectOneFitsExactlyHighfee) {
@@ -163,7 +178,7 @@ TEST(BitcoinInputSelector, SelectOneFitsExactlyHighfee) {
 
     const auto byteFee = 10;
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto expectedFee = 1740;
     auto selected = selector.select(100'000 - expectedFee, byteFee);
 
@@ -172,17 +187,18 @@ TEST(BitcoinInputSelector, SelectOneFitsExactlyHighfee) {
     EXPECT_EQ(feeCalculator.calculate(1, 2, byteFee), expectedFee);
     EXPECT_EQ(feeCalculator.calculate(1, 1, byteFee), 1430);
 
-    // 1 sat more and does not fit any more
+    // 1 sat more and does not fit any more.
+    // However, `InputSelector` returns the entire list of UTXOs even if they are not enough.
+    // That's because `InputSelector` has a rough segwit fee estimation algorithm, and the UTXOs can actually be enough.
     selected = selector.select(100'000 - expectedFee + 1, byteFee);
-
-    EXPECT_TRUE(verifySelectedUTXOs(selected, {}));
+    EXPECT_TRUE(verifySelectedUTXOs(selected, {100'000}));
 }
 
 TEST(BitcoinInputSelector, SelectThreeNoDust) {
     auto utxos = buildTestUTXOs({100'000, 70'000, 75'000});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto selected = selector.select(100'000 - 174 - 10, 1);
 
     // 100'000 would fit with dust; instead two UTXOs are selected not to leave dust
@@ -276,7 +292,7 @@ TEST(BitcoinInputSelector, SelectTenThreeExact) {
     auto utxos = buildTestUTXOs({1'000, 2'000, 100'000, 3'000, 4'000, 5'000, 125'000, 6'000, 150'000, 7'000});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     const auto dustLimit = 102;
     auto selected = selector.select(375'000 - 376 - dustLimit, 1);
 
@@ -294,7 +310,7 @@ TEST(BitcoinInputSelector, SelectMaxAmountOne) {
     auto utxos = buildTestUTXOs({10189534});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto selected = selector.selectMaxAmount(1);
 
     EXPECT_TRUE(verifySelectedUTXOs(selected, {10189534}));
@@ -306,7 +322,7 @@ TEST(BitcoinInputSelector, SelectAllAvail) {
     auto utxos = buildTestUTXOs({10189534});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto selected = selector.select(10189534 - 226, 1);
 
     EXPECT_TRUE(verifySelectedUTXOs(selected, {10189534}));
@@ -318,7 +334,7 @@ TEST(BitcoinInputSelector, SelectMaxAmount5of5) {
     auto utxos = buildTestUTXOs({400, 500, 600, 800, 1000});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto byteFee = 1;
     auto selected = selector.selectMaxAmount(byteFee);
 
@@ -332,7 +348,7 @@ TEST(BitcoinInputSelector, SelectMaxAmount4of5) {
     auto utxos = buildTestUTXOs({400, 500, 600, 800, 1000});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto byteFee = 4;
     auto selected = selector.selectMaxAmount(byteFee);
 
@@ -346,7 +362,7 @@ TEST(BitcoinInputSelector, SelectMaxAmount1of5) {
     auto utxos = buildTestUTXOs({400, 500, 600, 800, 1000});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto byteFee = 8;
     auto selected = selector.selectMaxAmount(byteFee);
 
@@ -360,7 +376,7 @@ TEST(BitcoinInputSelector, SelectMaxAmountNone) {
     auto utxos = buildTestUTXOs({400, 500, 600, 800, 1000});
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto byteFee = 10;
     auto selected = selector.selectMaxAmount(byteFee);
 
@@ -372,8 +388,7 @@ TEST(BitcoinInputSelector, SelectMaxAmountNone) {
 TEST(BitcoinInputSelector, SelectMaxAmountNoUTXOs) {
     auto utxos = buildTestUTXOs({});
 
-    auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
-    auto selector = InputSelector<UTXO>(utxos, feeCalculator);
+    auto selector = InputSelector<UTXO>(utxos);
     auto selected = selector.selectMaxAmount(1);
 
     EXPECT_TRUE(verifySelectedUTXOs(selected, {}));
@@ -382,7 +397,7 @@ TEST(BitcoinInputSelector, SelectMaxAmountNoUTXOs) {
 TEST(BitcoinInputSelector, SelectZcashUnspents) {
     auto utxos = buildTestUTXOs({100000, 2592, 73774});
 
-    auto selector = InputSelector<UTXO>(utxos, getFeeCalculator(TWCoinTypeZcash));
+    auto selector = InputSelector<UTXO>(utxos, getFeeCalculator(TWCoinTypeZcash), std::make_shared<LegacyDustCalculator>(TWCoinTypeZcash));
     auto selected = selector.select(10000, 1);
 
     EXPECT_TRUE(verifySelectedUTXOs(selected, {73774}));
@@ -391,7 +406,7 @@ TEST(BitcoinInputSelector, SelectZcashUnspents) {
 TEST(BitcoinInputSelector, SelectGroestlUnspents) {
     auto utxos = buildTestUTXOs({499971976});
 
-    auto selector = InputSelector<UTXO>(utxos, getFeeCalculator(TWCoinTypeZcash));
+    auto selector = InputSelector<UTXO>(utxos, getFeeCalculator(TWCoinTypeZcash), std::make_shared<LegacyDustCalculator>(TWCoinTypeZcash));
     auto selected = selector.select(499951976, 1, 1);
 
     EXPECT_TRUE(verifySelectedUTXOs(selected, {499971976}));
@@ -400,7 +415,7 @@ TEST(BitcoinInputSelector, SelectGroestlUnspents) {
 TEST(BitcoinInputSelector, SelectZcashMaxAmount) {
     auto utxos = buildTestUTXOs({100000, 2592, 73774});
 
-    auto selector = InputSelector<UTXO>(utxos, getFeeCalculator(TWCoinTypeZcash));
+    auto selector = InputSelector<UTXO>(utxos, getFeeCalculator(TWCoinTypeZcash), std::make_shared<LegacyDustCalculator>(TWCoinTypeZcash));
     auto selected = selector.selectMaxAmount(1);
 
     EXPECT_TRUE(verifySelectedUTXOs(selected, {100000, 2592, 73774}));
@@ -409,10 +424,12 @@ TEST(BitcoinInputSelector, SelectZcashMaxAmount) {
 TEST(BitcoinInputSelector, SelectZcashMaxUnspents2) {
     auto utxos = buildTestUTXOs({100000, 2592, 73774});
 
-    auto selector = InputSelector<UTXO>(utxos, getFeeCalculator(TWCoinTypeZcash));
+    auto selector = InputSelector<UTXO>(utxos, getFeeCalculator(TWCoinTypeZcash), std::make_shared<LegacyDustCalculator>(TWCoinTypeZcash));
     auto selected = selector.select(176366 - 6, 1);
 
-    EXPECT_TRUE(verifySelectedUTXOs(selected, {}));
+    // `InputSelector` returns the entire list of UTXOs even if they are not enough.
+    // That's because `InputSelector` has a rough segwit fee estimation algorithm, and the UTXOs can actually be enough.
+    EXPECT_TRUE(verifySelectedUTXOs(selected, {2592, 73774, 100000}));
 }
 
 TEST(BitcoinInputSelector, ManyUtxos_900) {
diff --git a/tests/chains/Bitcoin/MessageSignerTests.cpp b/tests/chains/Bitcoin/MessageSignerTests.cpp
new file mode 100644
index 00000000000..d55cded3107
--- /dev/null
+++ b/tests/chains/Bitcoin/MessageSignerTests.cpp
@@ -0,0 +1,165 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/MessageSigner.h"
+#include <TrustWalletCore/TWBitcoinMessageSigner.h>
+#include "Bitcoin/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "Base64.h"
+#include "Coin.h"
+#include "Data.h"
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWPublicKeyType.h>
+
+#include <cassert>
+#include <gtest/gtest.h>
+
+namespace TW::Bitcoin::MessageSignerTests {
+
+const auto gPrivateKey = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
+
+TEST(BitcoinMessageSigner, VerifyMessage) {
+    EXPECT_TRUE(MessageSigner::verifyMessage(
+        "1B8Qea79tsxmn4dTiKKRVvsJpHwL2fMQnr",
+        "test signature",
+        "H+3L5IbSVcejp4S2VwLXCxLEMQAWDvKbE8lQyq0ocdvyM1aoEudkzN/S/qLI3vnNOFY6V13BXWSFrPr3OjGa5Dk="
+    ));
+    EXPECT_TRUE(MessageSigner::verifyMessage(
+        "1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN",
+        "This is an example of a signed message.",
+        "G39Qf0XrZHICWbz3r5gOkcgTRw3vM4leGjiR3refr/K1OezcKmmXaLn4zc8ji2rjbBUIMrIhH/jc5Z2qEEz7qVk="
+    ));
+    EXPECT_TRUE(MessageSigner::verifyMessage(
+        "1H8X4u6CVZRTLLNbUQTKAnc5vCkqWMpwfF",
+        "compressed key",
+        "IKUI9v2xbHogJe8HKXI2M5KEhMKaW6fjNxtyEy27Mf+3/e1ht4jZoc85e4F8stPsxt4Xcg8Yr42S28O6L/Qx9fE="
+    ));
+    EXPECT_TRUE(MessageSigner::verifyMessage(
+        "19cAJn4Ms8jodBBGtroBNNpCZiHAWGAq7X",
+        "test signature",
+        "ILH5K7JQLaRGaKGXXH5mYM6FIIy9IWyY4JUPI+PHYY4WaupxUbg+zy0bhBCrDuehy9x4WidwjkRR1GSLnWvOXBo="
+    ));
+    EXPECT_TRUE(MessageSigner::verifyMessage(
+        "19cAJn4Ms8jodBBGtroBNNpCZiHAWGAq7X",
+        "another text",
+        "H7vrF2C+TlFiHyegAw3QLv6SK0myuEEXUOgfx0+Qio1YVDuSa6p/OHpoQVlUt3F8QJdbdZN9M1h/fYEAnEz16V0="
+    ));
+    EXPECT_TRUE(MessageSigner::verifyMessage(
+        "1E4T9JZ3mq6cdgiRJEWzHqDXb9t322fE6d",
+        "test signature",
+        "HLH5K7JQLaRGaKGXXH5mYM6FIIy9IWyY4JUPI+PHYY4WaupxUbg+zy0bhBCrDuehy9x4WidwjkRR1GSLnWvOXBo="
+    ));
+}
+
+TEST(BitcoinMessageSigner, SignAndVerify) {
+    const auto pubKey = gPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(hex(pubKey.bytes), "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1");
+    const auto address = Address(pubKey, TW::p2pkhPrefix(TWCoinTypeBitcoin)).string();
+    EXPECT_EQ(address, "19cAJn4Ms8jodBBGtroBNNpCZiHAWGAq7X");
+
+    {
+        const auto msg = "test signature";
+        const auto signature = MessageSigner::signMessage(gPrivateKey, address, msg);
+        EXPECT_EQ(signature, "ILH5K7JQLaRGaKGXXH5mYM6FIIy9IWyY4JUPI+PHYY4WaupxUbg+zy0bhBCrDuehy9x4WidwjkRR1GSLnWvOXBo=");
+
+        EXPECT_TRUE(MessageSigner::verifyMessage(address, msg, signature));
+    }
+    {
+        const auto msg = "another text";
+        const auto signature = MessageSigner::signMessage(gPrivateKey, address, msg);
+        EXPECT_EQ(signature, "H7vrF2C+TlFiHyegAw3QLv6SK0myuEEXUOgfx0+Qio1YVDuSa6p/OHpoQVlUt3F8QJdbdZN9M1h/fYEAnEz16V0=");
+
+        EXPECT_TRUE(MessageSigner::verifyMessage(address, msg, signature));
+    }
+
+    // uncompressed
+    const auto pubKeyUncomp = gPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    const auto keyHash = pubKeyUncomp.hash(Data{TW::p2pkhPrefix(TWCoinTypeBitcoin)}, Hash::HasherSha256ripemd);
+    const auto addressUncomp = Address(keyHash).string();
+    EXPECT_EQ(addressUncomp, "1E4T9JZ3mq6cdgiRJEWzHqDXb9t322fE6d");
+    {
+        const auto msg = "test signature";
+        const auto signature = MessageSigner::signMessage(gPrivateKey, addressUncomp, msg, false);
+        EXPECT_EQ(signature, "HLH5K7JQLaRGaKGXXH5mYM6FIIy9IWyY4JUPI+PHYY4WaupxUbg+zy0bhBCrDuehy9x4WidwjkRR1GSLnWvOXBo=");
+
+        EXPECT_TRUE(MessageSigner::verifyMessage(addressUncomp, msg, signature));
+    }
+}
+
+TEST(BitcoinMessageSigner, SignNegative) {
+    const auto address = Address(gPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1), TW::p2pkhPrefix(TWCoinTypeBitcoin)).string();
+    EXPECT_EQ(address, "19cAJn4Ms8jodBBGtroBNNpCZiHAWGAq7X");
+    const auto msg = "test signature";
+    // Use invalid address
+    EXPECT_EXCEPTION(MessageSigner::signMessage(gPrivateKey, "__THIS_IS_NOT_A_VALID_ADDRESS__", msg), "Address is not valid (legacy) address");
+    // Use invalid address, not legacy
+    EXPECT_EXCEPTION(MessageSigner::signMessage(gPrivateKey, "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8", msg), "Address is not valid (legacy) address");
+    // Use valid, but not matching key
+    EXPECT_EXCEPTION(MessageSigner::signMessage(gPrivateKey, "1B8Qea79tsxmn4dTiKKRVvsJpHwL2fMQnr", msg), "Address does not match key");
+}
+
+TEST(BitcoinMessageSigner, VerifyNegative) {
+    const auto sig = parse_hex("1fedcbe486d255c7a3a784b65702d70b12c43100160ef29b13c950caad2871dbf23356a812e764ccdfd2fea2c8def9cd38563a575dc15d6485acfaf73a319ae439");
+    // Baseline positive
+    EXPECT_TRUE(MessageSigner::verifyMessage(
+        "1B8Qea79tsxmn4dTiKKRVvsJpHwL2fMQnr",
+        "test signature",
+        sig
+    ));
+
+    // Provide non-matching address
+    EXPECT_FALSE(MessageSigner::verifyMessage(
+        "1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN",
+        "test signature",
+        sig
+    ));
+    // Signature too short
+    EXPECT_EXCEPTION(MessageSigner::verifyMessage(
+        "1HZwkjkeaoZfTSaJxDw6aKkxp45agDiEzN",
+        "test signature",
+        parse_hex("1fedcbe486d255c7a3a784b65702d70b12c43100160ef29b13c950caad2871dbf23356a812e764ccdfd2fea2c8def9cd38563a575dc15d6485acfaf73a319ae4")
+    ), "signature too short");
+    // Invalid address  
+    EXPECT_EXCEPTION(MessageSigner::verifyMessage(
+        "__THIS_IS_NOT_A_VALID_ADDRESS__",
+        "test signature",
+        parse_hex("1fedcbe486d255c7a3a784b65702d70b12c43100160ef29b13c950caad2871dbf23356a812e764ccdfd2fea2c8def9cd38563a575dc15d6485acfaf73a319ae4")
+    ), "Input address invalid");
+    EXPECT_EXCEPTION(MessageSigner::verifyMessage(
+        "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8",
+        "test signature",
+        parse_hex("1fedcbe486d255c7a3a784b65702d70b12c43100160ef29b13c950caad2871dbf23356a812e764ccdfd2fea2c8def9cd38563a575dc15d6485acfaf73a319ae4")
+    ), "Input address invalid");
+}
+
+TEST(BitcoinMessageSigner, MessageToHash) {
+    EXPECT_EQ(hex(MessageSigner::messageToHash("Hello, world!")), "02d6c0643e40b0db549cbbd7eb47dcab71a59d7017199ebde6b272f28fbbf95f");
+    EXPECT_EQ(hex(MessageSigner::messageToHash("test signature")), "8e81cc5bca9862d8b7f22be1f7cb762b49121cf4e1611c27906a041f9a9eb21f");
+}
+
+TEST(TWBitcoinMessageSigner, VerifyMessage) {
+    EXPECT_TRUE(TWBitcoinMessageSignerVerifyMessage(
+        STRING("1B8Qea79tsxmn4dTiKKRVvsJpHwL2fMQnr").get(),
+        STRING("test signature").get(),
+        STRING("H+3L5IbSVcejp4S2VwLXCxLEMQAWDvKbE8lQyq0ocdvyM1aoEudkzN/S/qLI3vnNOFY6V13BXWSFrPr3OjGa5Dk=").get()
+    ));
+}
+
+TEST(TWBitcoinMessageSigner, SignAndVerify) {
+    const auto privKeyData = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+    const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+    const auto address = STRING("19cAJn4Ms8jodBBGtroBNNpCZiHAWGAq7X");
+    const auto message = STRING("test signature");
+
+    const auto signature = WRAPS(TWBitcoinMessageSignerSignMessage(privateKey.get(), address.get(), message.get()));
+    EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "ILH5K7JQLaRGaKGXXH5mYM6FIIy9IWyY4JUPI+PHYY4WaupxUbg+zy0bhBCrDuehy9x4WidwjkRR1GSLnWvOXBo=");
+
+    EXPECT_TRUE(TWBitcoinMessageSignerVerifyMessage(address.get(), message.get(), signature.get()));
+}
+
+} // namespace TW::Bitcoin
diff --git a/tests/Bitcoin/SegwitAddressTests.cpp b/tests/chains/Bitcoin/SegwitAddressTests.cpp
similarity index 80%
rename from tests/Bitcoin/SegwitAddressTests.cpp
rename to tests/chains/Bitcoin/SegwitAddressTests.cpp
index 4545ff9dc86..62c7fe7fde5 100644
--- a/tests/Bitcoin/SegwitAddressTests.cpp
+++ b/tests/chains/Bitcoin/SegwitAddressTests.cpp
@@ -1,11 +1,10 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bech32.h"
 #include "Bitcoin/SegwitAddress.h"
+#include "HDWallet.h"
 #include "HexCoding.h"
 
 #include <string>
@@ -208,4 +207,45 @@ TEST(SegwitAddress, Equals) {
     ASSERT_FALSE(addr1 == addr2);
 }
 
+TEST(SegwitAddress, TestnetAddress) {
+    const auto mnemonic1 = "ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal";
+    const auto passphrase = "";
+    const auto coin = TWCoinTypeBitcoin;
+    HDWallet wallet = HDWallet(mnemonic1, passphrase);
+
+    // default
+    {
+        const auto privKey = wallet.getKey(coin, TWDerivationDefault);
+        const auto pubKey = privKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_EQ(hex(pubKey.bytes), "02df9ef2a7a5552765178b181e1e1afdefc7849985c7dfe9647706dd4fa40df6ac");
+        EXPECT_EQ(SegwitAddress(pubKey, "bc").string(), "bc1qpsp72plnsqe6e2dvtsetxtww2cz36ztmfxghpd");
+    }
+
+    // testnet: different derivation path and hrp
+    {
+        const auto privKey = wallet.getKey(coin, TW::DerivationPath("m/84'/1'/0'/0/0"));
+        const auto pubKey = privKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_EQ(hex(pubKey.bytes), "03eb1a535b59f03894b99319f850c784cf4164f4de07620695c5cf0dc5c1ab2a54");
+        EXPECT_EQ(SegwitAddress::createTestnetFromPublicKey(pubKey).string(), "tb1qq8p994ak933c39d2jaj8n4sg598tnkhnyk5sg5");
+        // alternative with custom hrp
+        EXPECT_EQ(SegwitAddress(pubKey, "tb").string(), "tb1qq8p994ak933c39d2jaj8n4sg598tnkhnyk5sg5");
+    }
+
+    EXPECT_TRUE(SegwitAddress::isValid("tb1qq8p994ak933c39d2jaj8n4sg598tnkhnyk5sg5"));
+}
+
+TEST(SegwitAddress, SegwitDerivationHDWallet) {
+    const auto mnemonic1 = "ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal";
+    const auto passphrase = "";
+    const auto coin = TWCoinTypeBitcoin;
+    HDWallet wallet = HDWallet(mnemonic1, passphrase);
+
+    // addresses with different derivations
+    EXPECT_EQ(wallet.deriveAddress(coin), "bc1qpsp72plnsqe6e2dvtsetxtww2cz36ztmfxghpd");
+    EXPECT_EQ(wallet.deriveAddress(coin, TWDerivationDefault), "bc1qpsp72plnsqe6e2dvtsetxtww2cz36ztmfxghpd");
+    EXPECT_EQ(wallet.deriveAddress(coin, TWDerivationBitcoinSegwit), "bc1qpsp72plnsqe6e2dvtsetxtww2cz36ztmfxghpd");
+    EXPECT_EQ(wallet.deriveAddress(coin, TWDerivationBitcoinLegacy), "1GVb4mfQrvymPLz7zeZ3LnQ8sFv3NedZXe");
+    EXPECT_EQ(wallet.deriveAddress(coin, TWDerivationBitcoinTestnet), "tb1qq8p994ak933c39d2jaj8n4sg598tnkhnyk5sg5");
+}
+
 } // namespace TW::Bitcoin::tests
diff --git a/tests/chains/Bitcoin/TWAnyAddressTests.cpp b/tests/chains/Bitcoin/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..f482783a01b
--- /dev/null
+++ b/tests/chains/Bitcoin/TWAnyAddressTests.cpp
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+#include <TrustWalletCore/TWPublicKey.h>
+#include "Hash.h"
+#include "PublicKey.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Bitcoin::tests {
+
+void testBitcoinAddressFromPublicKeyDerivation(const char* privateKey, TWDerivation derivation, const char* expectedAddr) {
+    const auto data = DATA(privateKey);
+    const auto privkey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(data.get()));
+    const auto pubkey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyByType(privkey.get(), TWPublicKeyTypeSECP256k1));
+    const auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKeyDerivation(pubkey.get(), TWCoinTypeBitcoin, derivation));
+    const auto addrDescription = WRAPS(TWAnyAddressDescription(addr.get()));
+    assertStringsEqual(addrDescription, expectedAddr);
+}
+
+TEST(TWBitcoinAnyAddress, CreateFromPublicKey) {
+    testBitcoinAddressFromPublicKeyDerivation(
+        "a26b7ffda8ad29cf3aba066cc43ce255cb13b3fba5fa9b638f4685333e3670fd",
+        TWDerivationDefault,
+        "bc1qj7uu67l9zkajuhx976d8fvj2ylc29gnq3kjm3r"
+    );
+}
+
+TEST(TWBitcoinAnyAddress, CreateFromPublicKeyWithDerivationLegacy) {
+    testBitcoinAddressFromPublicKeyDerivation(
+        "a8212108f1f2a42b18b642c2dbe6e388e75de89ca7be9b6f7648bab06cdedabf",
+        TWDerivationBitcoinLegacy,
+        "1JspsmYcHGLjRDavb62hodTb7BW8GGia7v"
+    );
+}
+
+TEST(TWBitcoinAnyAddress, CreateFromPublicKeyWithDerivationTaproot) {
+    testBitcoinAddressFromPublicKeyDerivation(
+        "e5bbc9cab0ff9ec86889bcd84d79ca484b017763614cd4fa3bf4aa49ad9d55a9",
+        TWDerivationBitcoinTaproot,
+        "bc1pkup60ng64cthqujp38l57y0eewkyqy35s86tmqjcc5yzgmz9l2gscz37tx"
+    );
+    testBitcoinAddressFromPublicKeyDerivation(
+        "ae39965b1e73944763eb8ddaeb126d9cbde772a5c141e3ad5791f8e7f094a089",
+        TWDerivationBitcoinTaproot,
+        "bc1plvzy756f4t2p32n29jy9vrqcrj46g5yka7u7e89tkeufx5urgyss38y98d"
+    );
+    testBitcoinAddressFromPublicKeyDerivation(
+        "e0721275d0f94bf4d0f59bf0bef42179f680e38dfb306e1d0e3c13ab1d797d20",
+        TWDerivationBitcoinTaproot,
+        "bc1puu933ez5v6w99w9dqsmwdeajpnrvknc65tlnrdx3xhxwd954mudsa39gum"
+    );
+}
+
+} // namespace TW::Bitcoin::tests
diff --git a/tests/Bitcoin/TWBitcoinAddressTests.cpp b/tests/chains/Bitcoin/TWBitcoinAddressTests.cpp
similarity index 91%
rename from tests/Bitcoin/TWBitcoinAddressTests.cpp
rename to tests/chains/Bitcoin/TWBitcoinAddressTests.cpp
index c2e81b6d33a..60c6cb7d16e 100644
--- a/tests/Bitcoin/TWBitcoinAddressTests.cpp
+++ b/tests/chains/Bitcoin/TWBitcoinAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWBitcoinAddress.h>
 #include <TrustWalletCore/TWPublicKey.h>
diff --git a/tests/chains/Bitcoin/TWBitcoinPsbtTests.cpp b/tests/chains/Bitcoin/TWBitcoinPsbtTests.cpp
new file mode 100644
index 00000000000..83ef3a6c6ba
--- /dev/null
+++ b/tests/chains/Bitcoin/TWBitcoinPsbtTests.cpp
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Bitcoin.pb.h"
+#include "proto/BitcoinV2.pb.h"
+#include "PrivateKey.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Bitcoin::PsbtTests {
+
+const auto gPrivateKey = PrivateKey(parse_hex("f00ffbe44c5c2838c13d2778854ac66b75e04eb6054f0241989e223223ad5e55"));
+const auto gPsbt = parse_hex("70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d00000000");
+
+TEST(TWBitcoinPsbt, SignThorSwap) {
+    BitcoinV2::Proto::SigningInput signing;
+    signing.mutable_psbt()->set_psbt(gPsbt.data(), gPsbt.size());
+    signing.add_private_keys(gPrivateKey.bytes.data(), gPrivateKey.bytes.size());
+
+    Proto::SigningInput legacy;
+    *legacy.mutable_signing_v2() = signing;
+
+    Bitcoin::Proto::SigningOutput output;
+    ANY_SIGN(legacy, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_TRUE(output.has_signing_result_v2());
+
+    const auto& outputV2 = output.signing_result_v2();
+    EXPECT_TRUE(outputV2.has_psbt());
+    EXPECT_EQ(hex(outputV2.psbt().psbt()), "70736274ff0100bc0200000001147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d000000000001011f6603010000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d01086c02483045022100b1229a008f20691639767bf925d6b8956ea957ccc633ad6b5de3618733a55e6b02205774d3320489b8a57a6f8de07f561de3e660ff8e587f6ac5422c49020cd4dc9101210306d8c664ea8fd2683eebea1d3114d90e0a5429e5783ba49b80ddabce04ff28f300000000");
+    EXPECT_EQ(hex(outputV2.encoded()), "02000000000101147010db5fbcf619067c1090fec65c131443fbc80fb4aaeebe940e44206098c60000000000ffffffff0360ea000000000000160014f22a703617035ef7f490743d50f26ae08c30d0a70000000000000000426a403d3a474149412e41544f4d3a636f736d6f7331737377797a666d743675396a373437773537753438746778646575393573757a666c6d7175753a303a743a35303e12000000000000160014b139199ec796f36fc42e637f42da8e3e6720aa9d02483045022100b1229a008f20691639767bf925d6b8956ea957ccc633ad6b5de3618733a55e6b02205774d3320489b8a57a6f8de07f561de3e660ff8e587f6ac5422c49020cd4dc9101210306d8c664ea8fd2683eebea1d3114d90e0a5429e5783ba49b80ddabce04ff28f300000000");
+}
+
+TEST(TWBitcoinPsbt, PlanThorSwap) {
+    const auto publicKey = gPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+
+    BitcoinV2::Proto::SigningInput inputV2;
+    inputV2.mutable_psbt()->set_psbt(gPsbt.data(), gPsbt.size());
+    inputV2.add_public_keys(publicKey.bytes.data(), publicKey.bytes.size());
+
+    Proto::SigningInput legacy;
+    *legacy.mutable_signing_v2() = inputV2;
+
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(legacy, plan, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(plan.error(), Common::Proto::SigningError::OK);
+    EXPECT_TRUE(plan.has_planning_result_v2());
+
+    const auto& planV2 = plan.planning_result_v2();
+    EXPECT_EQ(planV2.send_amount(), 66'406);
+    EXPECT_EQ(planV2.fee_estimate(), 1'736);
+}
+
+}
diff --git a/tests/Bitcoin/TWBitcoinScriptTests.cpp b/tests/chains/Bitcoin/TWBitcoinScriptTests.cpp
similarity index 97%
rename from tests/Bitcoin/TWBitcoinScriptTests.cpp
rename to tests/chains/Bitcoin/TWBitcoinScriptTests.cpp
index 064b83f50d9..1851e7ba9ba 100644
--- a/tests/Bitcoin/TWBitcoinScriptTests.cpp
+++ b/tests/chains/Bitcoin/TWBitcoinScriptTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWBitcoinAddress.h>
 #include <TrustWalletCore/TWBitcoinScript.h>
@@ -23,6 +21,10 @@ const auto PayToPublicKeyHash = WRAP(TWBitcoinScript, TWBitcoinScriptCreateWithD
 
 TEST(TWBitcoinScript, Create) {
     auto data = DATA("a9144733f37cf4db86fbc2efed2500b4f4e49f31202387");
+    {
+        auto script = WRAP(TWBitcoinScript, TWBitcoinScriptCreate());
+        ASSERT_TRUE(script.get() != nullptr);
+    }
     {
         auto script = WRAP(TWBitcoinScript, TWBitcoinScriptCreateWithData(data.get()));
         ASSERT_TRUE(script.get() != nullptr);
@@ -210,11 +212,11 @@ TEST(TWBitcoinScript, LockScriptForP2WSHAddress) {
 }
 
 TEST(TWBitcoinScript, LockScriptForCashAddress) {
-    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("bitcoincash:pzclklsyx9f068hd00a0vene45akeyrg7vv0053uqf").get(), TWCoinTypeBitcoin));
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("bitcoincash:pzclklsyx9f068hd00a0vene45akeyrg7vv0053uqf").get(), TWCoinTypeBitcoinCash));
     auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
     assertHexEqual(scriptData, "a914b1fb7e043152fd1eed7bfaf66679ad3b6c9068f387");
 
-    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("bitcoincash:qpk05r5kcd8uuzwqunn8rlx5xvuvzjqju5rch3tc0u").get(), TWCoinTypeBitcoin));
+    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("bitcoincash:qpk05r5kcd8uuzwqunn8rlx5xvuvzjqju5rch3tc0u").get(), TWCoinTypeBitcoinCash));
     auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
     assertHexEqual(scriptData2, "76a9146cfa0e96c34fce09c0e4e671fcd43338c14812e588ac");
 }
diff --git a/tests/chains/Bitcoin/TWBitcoinSigningTests.cpp b/tests/chains/Bitcoin/TWBitcoinSigningTests.cpp
new file mode 100644
index 00000000000..c54bd302026
--- /dev/null
+++ b/tests/chains/Bitcoin/TWBitcoinSigningTests.cpp
@@ -0,0 +1,2385 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "Bitcoin/Address.h"
+#include "Bitcoin/OutPoint.h"
+#include "Bitcoin/Script.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "Bitcoin/SigHashType.h"
+#include "Bitcoin/Transaction.h"
+#include "Bitcoin/TransactionBuilder.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "BitcoinOrdinalNftData.h"
+#include "Hash.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "TxComparisonHelper.h"
+#include "proto/Bitcoin.pb.h"
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinScript.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWPublicKeyType.h>
+
+#include <fstream>
+#include <vector>
+#include <iterator>
+#include <cassert>
+#include <gtest/gtest.h>
+
+namespace TW::Bitcoin {
+
+// clang-format off
+SigningInput buildInputP2PKH(bool omitKey = false) {
+    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
+    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
+
+    // Setup input
+    SigningInput input;
+    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
+    input.amount = 335'790'000;
+    input.byteFee = 1;
+    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
+    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
+    input.coinType = TWCoinTypeBitcoin;
+
+    auto utxoKey0 = PrivateKey(parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
+    auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash0 = Hash::ripemd(Hash::sha256(pubKey0.bytes));
+    assert(hex(utxoPubkeyHash0) == "b7cd046b6d522a3d61dbcb5235c0e9cc97265457");
+    if (!omitKey) {
+        input.privateKeys.push_back(utxoKey0);
+    }
+
+    auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
+    auto pubKey1 = utxoKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash1 = Hash::ripemd(Hash::sha256(pubKey1.bytes));
+    assert(hex(utxoPubkeyHash1) == "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
+    if (!omitKey) {
+        input.privateKeys.push_back(utxoKey1);
+    }
+
+    auto utxo0Script = Script::buildPayToPublicKeyHash(utxoPubkeyHash0);
+    Data scriptHash;
+    utxo0Script.matchPayToPublicKeyHash(scriptHash);
+    assert(hex(scriptHash) == "b7cd046b6d522a3d61dbcb5235c0e9cc97265457");
+
+    UTXO utxo0;
+    utxo0.script = utxo0Script;
+    utxo0.amount = 625'000'000;
+    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    UTXO utxo1;
+    utxo1.script = Script(parse_hex("0014"
+                                    "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
+    utxo1.amount = 600'000'000;
+    utxo1.outPoint = OutPoint(hash1, 1, UINT32_MAX);
+    input.utxos.push_back(utxo1);
+
+    return input;
+}
+
+TEST(BitcoinSigning, SpendMinimumAmountP2WPKH) {
+    auto myPrivateKey = PrivateKey(parse_hex("9ea2172511ed73ae0096be8e593c3b75631700edaf729f1abbae607314a20e35"));
+
+    auto myPublicKey = myPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(myPublicKey.bytes));
+    auto redeemScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
+
+    // Both two UTXOs came from the same transaction.
+    auto utxoHash = parse_hex("e8b3c2d0d5851cef139d87dfb5794db8897ce90ce1b6961526f61923baf5b5a3");
+    std::reverse(utxoHash.begin(), utxoHash.end());
+
+    auto segwitDustAmount = 294;
+
+    // Setup input
+    SigningInput input;
+    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
+    input.amount = 546;
+    input.useMaxAmount = false;
+    input.useMaxUtxo = true;
+    input.byteFee = 27;
+    input.toAddress = "bc1qvrt7ukvhvmdny0a3j9k8l8jasx92lrqm30t2u2";
+    input.changeAddress = "bc1qvrt7ukvhvmdny0a3j9k8l8jasx92lrqm30t2u2";
+    input.coinType = TWCoinTypeBitcoin;
+    input.dustCalculator = std::make_shared<FixedDustCalculator>(segwitDustAmount);
+
+    input.privateKeys.push_back(myPrivateKey);
+    input.scripts[hex(utxoPubkeyHash)] = redeemScript;
+
+    UTXO utxo0;
+    utxo0.script = redeemScript;
+    utxo0.amount = segwitDustAmount;
+    utxo0.outPoint = OutPoint(utxoHash, 0, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    UTXO utxo1;
+    utxo1.script = redeemScript;
+    utxo1.amount = 16776;
+    utxo1.outPoint = OutPoint(utxoHash, 1, UINT32_MAX);
+    input.utxos.push_back(utxo1);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {294, 16776}, 546, 5643));
+        EXPECT_EQ(plan.change, 10881);
+    }
+
+    // Signs
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    const auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+
+    EXPECT_EQ(
+        hex(serialized),
+        "01000000000102a3b5f5ba2319f6261596b6e10ce97c89b84d79b5df879d13ef1c85d5d0c2b3e80000000000ffffffffa3b5f5ba2319f6261596b6e10ce97c89b84d79b5df879d13ef1c85d5d0c2b3e80100000000ffffffff02220200000000000016001460d7ee599766db323fb1916c7f9e5d818aaf8c1b812a00000000000016001460d7ee599766db323fb1916c7f9e5d818aaf8c1b02483045022100d7e4d267e94547bd365736229219a85b21f79cf896a65baa444e339215b4b36f022078c0dee3d1d603f77855fee8f23291fe180b50afaa2c9ae9f724b7418d76da75012103a11506993946e20ea82686b157bf08f944759f43d91af8d84650ee73a482431c02483045022100c10cdbe21cedab3b4e7db9422f69c7074764711d552a63545104d71c905b138802204999f3ecb5fdadfd8669a8c14f04643c59bb3e98aaf52c52f829a0f6ef5d6abb012103a11506993946e20ea82686b157bf08f944759f43d91af8d84650ee73a482431c00000000"
+    );
+}
+
+TEST(BitcoinSigning, ExtraOutputs) {
+    auto privateKey = parse_hex("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129");
+    auto ownAddress = "1MhdctqCwYMn2DT4mshpwvYtfF98wBojXS";
+    auto toAddress = "1PRuxNSZwUXym6A31kmrArdT2BGJiTna19";
+    auto utxoAmount = 10000;
+    auto toAmount = 2000;
+    int byteFee = 6;
+
+    auto signingInput = Proto::SigningInput();
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_amount(toAmount);
+    signingInput.set_byte_fee(byteFee);
+    signingInput.set_to_address(toAddress);
+    signingInput.set_change_address(ownAddress);
+    signingInput.add_private_key(privateKey.data(), privateKey.size());
+
+    auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
+    auto& utxo = *signingInput.add_utxo();
+    // The UTXO doesn't belong to the `ownAddress`, it's used just for the test purposes.
+    auto utxoHash = parse_hex("d15d38de9a619809b575532a235d23947c4ff7d219d3feb6c5b6105d23360f4e");
+    std::reverse(utxoHash.begin(), utxoHash.end());
+    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo.mutable_out_point()->set_index(0);
+    utxo.mutable_out_point()->set_sequence(4294967290);
+    utxo.set_amount(utxoAmount);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+
+    auto& output1 = *signingInput.add_extra_outputs();
+    output1.set_to_address("bc1qkm0awulcn94gmtjwzwkvnpflc3ytt7a6cjentn");
+    output1.set_amount(2000UL);
+
+    auto& output2 = *signingInput.add_extra_outputs();
+    output2.set_to_address("bc1pqa49cxxdqyr49nwe2379tq4xsc4e8qe8mdxyjx3mprnftcde0v4s3lnhzq");
+    output2.set_amount(2000UL);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(plan.amount(), 2000L);
+    EXPECT_EQ(plan.change(), 2200L);
+    EXPECT_EQ(plan.fee(), 1800L);
+
+    *signingInput.mutable_plan() = plan;
+
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    EXPECT_EQ(output.transaction().inputs_size(), 1);
+    // Expected outputs: `amount`, `change`, `extra_output[0]`, `extra_output[1]`
+    EXPECT_EQ(output.transaction().outputs_size(), 4);
+    EXPECT_EQ(hex(output.encoded()), "01000000014e0f36235d10b6c5b6fed319d2f74f7c94235d232a5375b50998619ade385dd1000000006b483045022100e044cce5c2cf141f725bb88dafc74d7db8679826838f1dd4ba35fa57a159454202204aed2c624dc53b6f98adbc818689af4d99c6d9cdb0377979a74982b0624d6e9e0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cbfaffffff04d0070000000000001976a914f608f4635f9072c4f92715e5a6c35c058a9d6fe988ac98080000000000001976a914e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d88acd007000000000000160014b6dfd773f8996a8dae4e13acc9853fc448b5fbbad007000000000000225120076a5c18cd010752cdd9547c5582a6862b938327db4c491a3b08e695e1b97b2b00000000");
+}
+
+/// It would be enough to use the only `utxo0` to send `toAmount` and pay the fee.
+/// But since the `extraOutputs` are present, `utxo0` is not enough to generate the transaction.
+/// Here, `utxoAmount - toAmount - extraOutputsAmount - fee = -1799`
+/// Please note that the `toAmount` shouldn't be reduced if `extraOutputs` are set.
+TEST(BitcoinSigning, ExtraOutputsExceedAvailableAmount) {
+    auto privateKey = parse_hex("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129");
+    auto ownAddress = "1MhdctqCwYMn2DT4mshpwvYtfF98wBojXS";
+    auto toAddress = "1PRuxNSZwUXym6A31kmrArdT2BGJiTna19";
+    auto utxoAmount = 10000;
+    auto toAmount = 5999;
+    int byteFee = 6;
+
+    auto signingInput = Proto::SigningInput();
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_amount(toAmount);
+    signingInput.set_byte_fee(byteFee);
+    signingInput.set_to_address(toAddress);
+    signingInput.set_change_address(ownAddress);
+    signingInput.add_private_key(privateKey.data(), privateKey.size());
+
+    auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
+    auto& utxo = *signingInput.add_utxo();
+    // The UTXO doesn't belong to the `ownAddress`, it's used just for the test purposes.
+    auto utxoHash = parse_hex("d15d38de9a619809b575532a235d23947c4ff7d219d3feb6c5b6105d23360f4e");
+    std::reverse(utxoHash.begin(), utxoHash.end());
+    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo.mutable_out_point()->set_index(0);
+    utxo.mutable_out_point()->set_sequence(4294967290);
+    utxo.set_amount(utxoAmount);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+
+    auto& output1 = *signingInput.add_extra_outputs();
+    output1.set_to_address("bc1qkm0awulcn94gmtjwzwkvnpflc3ytt7a6cjentn");
+    output1.set_amount(2000UL);
+
+    auto& output2 = *signingInput.add_extra_outputs();
+    output2.set_to_address("bc1pqa49cxxdqyr49nwe2379tq4xsc4e8qe8mdxyjx3mprnftcde0v4s3lnhzq");
+    output2.set_amount(2000UL);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(plan.error(), Common::Proto::Error_not_enough_utxos);
+}
+
+/// It would be enough to use the only `utxo0` to send `toAmount` and pay the fee.
+/// But since the `extraOutputs` are present, the transaction builder needs to select one extra UTXO (e.g. `utxo1`).
+TEST(BitcoinSigning, ExtraOutputsRequireExtraInputs) {
+    auto privateKey = parse_hex("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129");
+    auto ownAddress = "1MhdctqCwYMn2DT4mshpwvYtfF98wBojXS";
+    auto toAddress = "1PRuxNSZwUXym6A31kmrArdT2BGJiTna19";
+    auto utxo0Amount = 10000;
+    auto utxo1Amount = 3000;
+    auto toAmount = 5999;
+    int byteFee = 6;
+
+    auto signingInput = Proto::SigningInput();
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_amount(toAmount);
+    signingInput.set_byte_fee(byteFee);
+    signingInput.set_to_address(toAddress);
+    signingInput.set_change_address(ownAddress);
+    signingInput.add_private_key(privateKey.data(), privateKey.size());
+    // Dust threshold will be 612 (102 * 6) if otherwise is not set.
+    // So to fix the test, we should set the 313 dust threshold for the change output to be included.
+    signingInput.set_fixed_dust_threshold(313);
+
+    auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
+    auto& utxo0 = *signingInput.add_utxo();
+    // The UTXO doesn't belong to the `ownAddress`, it's used just for the test purposes.
+    auto utxoHash = parse_hex("d15d38de9a619809b575532a235d23947c4ff7d219d3feb6c5b6105d23360f4e");
+    std::reverse(utxoHash.begin(), utxoHash.end());
+    utxo0.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo0.mutable_out_point()->set_index(0);
+    utxo0.mutable_out_point()->set_sequence(4294967290);
+    utxo0.set_amount(utxo0Amount);
+    utxo0.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+
+    auto& utxo1 = *signingInput.add_utxo();
+    std::reverse(utxoHash.begin(), utxoHash.end());
+    utxo1.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo1.mutable_out_point()->set_index(1);
+    utxo1.mutable_out_point()->set_sequence(4294967290);
+    utxo1.set_amount(utxo1Amount);
+    utxo1.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+
+    auto& output1 = *signingInput.add_extra_outputs();
+    output1.set_to_address("bc1qkm0awulcn94gmtjwzwkvnpflc3ytt7a6cjentn");
+    output1.set_amount(2000UL);
+
+    auto& output2 = *signingInput.add_extra_outputs();
+    output2.set_to_address("bc1pqa49cxxdqyr49nwe2379tq4xsc4e8qe8mdxyjx3mprnftcde0v4s3lnhzq");
+    output2.set_amount(2000UL);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(plan.error(), Common::Proto::OK);
+    EXPECT_EQ(plan.amount(), toAmount);
+    EXPECT_EQ(plan.fee(), 2688L);
+    EXPECT_EQ(plan.change(), 313L);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(output.transaction().inputs_size(), 2);
+    // Expected outputs: `amount`, `change`, `extra_output[0]`, `extra_output[1]`
+    EXPECT_EQ(output.transaction().outputs_size(), 4);
+    EXPECT_EQ(hex(output.encoded()), "0100000002d15d38de9a619809b575532a235d23947c4ff7d219d3feb6c5b6105d23360f4e010000006b483045022100d104fd6b122a22b4104ec7898e355e8fe2e5fea2c838e828f748fa1e2ac3af4f022068dd9448c55f70d19cf04c2d1e7627029270e4cfd0721d5fac817a3b0c230d900121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cbfaffffff4e0f36235d10b6c5b6fed319d2f74f7c94235d232a5375b50998619ade385dd1000000006b4830450221009faff5b9ce33df0d56f068cae5c82b589698a79b86b51a6ca2c6784f7b761157022043849144348cea8526f6e78cf235e51edf6c72bf47a08234231a9df936d0746f0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cbfaffffff046f170000000000001976a914f608f4635f9072c4f92715e5a6c35c058a9d6fe988ac39010000000000001976a914e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d88acd007000000000000160014b6dfd773f8996a8dae4e13acc9853fc448b5fbbad007000000000000225120076a5c18cd010752cdd9547c5582a6862b938327db4c491a3b08e695e1b97b2b00000000");
+}
+
+/// This test only checks if the transaction output will have an expected value.
+/// It doesn't check correctness of the encoded representation.
+/// Issue: https://github.com/trustwallet/wallet-core/issues/3273
+TEST(BitcoinSigning, SignMaxAmount) {
+    const auto privateKey = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+    const auto ownAddress = "bc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z00ppggv";
+
+    const auto revUtxoHash0 =
+        parse_hex("07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8");
+    const auto inPubKey0 =
+        parse_hex("024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382");
+    const auto inPubKeyHash0 = parse_hex("bd92088bb7e82d611a9b94fbb74a0908152b784f");
+    const auto utxoScript0 = parse_hex("0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
+
+    const auto initialAmount = 10'189'533;
+    const auto availableAmount = 10'189'534;
+    const auto fee = 110;
+    const auto amountWithoutFee = availableAmount - fee;
+    // There shouldn't be any change
+    const auto change = 0;
+
+    Proto::SigningInput signingInput;
+    signingInput.set_coin_type(TWCoinTypeBitcoin);
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_amount(initialAmount);
+    signingInput.set_byte_fee(1);
+    signingInput.set_to_address("bc1q2dsdlq3343vk29runkgv4yc292hmq53jedfjmp");
+    signingInput.set_change_address(ownAddress);
+    signingInput.set_use_max_amount(true);
+
+    *signingInput.add_private_key() = std::string(privateKey.begin(), privateKey.end());
+
+    // Add UTXO
+    auto utxo = signingInput.add_utxo();
+    utxo->set_script(utxoScript0.data(), utxoScript0.size());
+    utxo->set_amount(availableAmount);
+    utxo->mutable_out_point()->set_hash(
+        std::string(revUtxoHash0.begin(), revUtxoHash0.end()));
+    utxo->mutable_out_point()->set_index(0);
+    utxo->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    // Plan
+    Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, TWCoinTypeBitcoin);
+    // Plan is checked, assume it is accepted
+    EXPECT_EQ(plan.amount(), amountWithoutFee);
+    EXPECT_EQ(plan.available_amount(), availableAmount);
+    EXPECT_EQ(plan.fee(), fee);
+    EXPECT_EQ(plan.change(), change);
+
+    *signingInput.mutable_plan() = plan;
+
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeBitcoin);
+
+    const auto& output0 = output.transaction().outputs().at(0);
+    EXPECT_EQ(output0.value(), amountWithoutFee);
+}
+
+// Tests the BitcoinV2 API through the legacy `SigningInput`.
+TEST(BitcoinSigning, SignBRC20TransferCommitV2) {
+    auto privateKey = parse_hex("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129");
+    auto fullAmount = 26400;
+    auto minerFee = 3000;
+    auto brcInscribeAmount = 7000;
+    auto forFeeAmount = fullAmount - brcInscribeAmount - minerFee;
+    auto txId = parse_hex("089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e");
+
+    PrivateKey key(privateKey);
+    auto pubKey = key.getPublicKey(TWPublicKeyTypeSECP256k1);
+
+    TW::BitcoinV2::Proto::SigningInput signing;
+    signing.add_private_keys(key.bytes.data(), key.bytes.size());
+    signing.set_dangerous_use_fixed_schnorr_rng(true);
+
+    auto& builder = *signing.mutable_builder();
+    builder.set_version(BitcoinV2::Proto::TransactionVersion::V2);
+    builder.set_input_selector(BitcoinV2::Proto::InputSelector::UseAll);
+    builder.set_fixed_dust_threshold(546);
+
+    auto& chainInfo = *signing.mutable_chain_info();
+    chainInfo.set_p2pkh_prefix(0);
+    chainInfo.set_p2sh_prefix(5);
+
+    auto& in = *builder.add_inputs();
+    auto& inOutPoint = *in.mutable_out_point();
+    inOutPoint.set_hash(txId.data(), txId.size());
+    inOutPoint.set_vout(1);
+    in.set_value(fullAmount);
+    in.mutable_script_builder()->mutable_p2wpkh()->set_pubkey(pubKey.bytes.data(), pubKey.bytes.size());
+    in.set_sighash_type(TWBitcoinSigHashTypeAll);
+
+    auto& out = *builder.add_outputs();
+    out.set_value(brcInscribeAmount);
+    auto& brc20 = *out.mutable_builder()->mutable_brc20_inscribe();
+    brc20.set_ticker("oadf");
+    brc20.set_transfer_amount("20");
+    brc20.set_inscribe_to(pubKey.bytes.data(), pubKey.bytes.size());
+
+    auto& changeOut = *builder.add_outputs();
+    changeOut.set_value(forFeeAmount);
+    changeOut.mutable_builder()->mutable_p2wpkh()->set_pubkey(pubKey.bytes.data(), pubKey.bytes.size());
+
+    Proto::SigningInput legacy;
+    *legacy.mutable_signing_v2() = signing;
+
+    Proto::SigningOutput output;
+    ANY_SIGN(legacy, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    ASSERT_TRUE(output.has_signing_result_v2());
+    EXPECT_EQ(output.signing_result_v2().error(), Common::Proto::SigningError::OK)
+        << output.signing_result_v2().error_message();
+    EXPECT_EQ(hex(output.signing_result_v2().encoded()), "02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000");
+    EXPECT_EQ(hex(output.signing_result_v2().txid()), "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1");
+
+    // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1
+}
+
+TEST(BitcoinSigning, SignPlanTransactionWithDustAmount) {
+    const auto privateKey = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+    const auto ownAddress = "bc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z00ppggv";
+
+    const auto revUtxoHash0 =
+        parse_hex("07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8");
+    const auto utxoScript0 = parse_hex("0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
+
+    const auto dustAmount = 546;
+    // Use an amount less than dust.
+    const auto sendAmount = 545;
+    const auto availableAmount = 10'189'534;
+
+    Proto::SigningInput signingInput;
+    signingInput.set_coin_type(TWCoinTypeBitcoin);
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_amount(sendAmount);
+    signingInput.set_byte_fee(1);
+    signingInput.set_to_address("bc1q2dsdlq3343vk29runkgv4yc292hmq53jedfjmp");
+    signingInput.set_change_address(ownAddress);
+    signingInput.set_fixed_dust_threshold(dustAmount);
+
+    *signingInput.add_private_key() = std::string(privateKey.begin(), privateKey.end());
+
+    // Add UTXO
+    auto utxo = signingInput.add_utxo();
+    utxo->set_script(utxoScript0.data(), utxoScript0.size());
+    utxo->set_amount(availableAmount);
+    utxo->mutable_out_point()->set_hash(
+        std::string(revUtxoHash0.begin(), revUtxoHash0.end()));
+    utxo->mutable_out_point()->set_index(0);
+    utxo->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, TWCoinTypeBitcoin);
+    EXPECT_EQ(plan.error(), Common::Proto::Error_dust_amount_requested);
+
+    // `AnySigner.sign` should return the same error.
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeBitcoin);
+    EXPECT_EQ(output.error(), Common::Proto::Error_dust_amount_requested);
+}
+
+// If the change amount is less than "dust", there should not be a change output.
+TEST(BitcoinSigning, SignPlanTransactionNoChange) {
+    const auto myPrivateKey = PrivateKey(parse_hex("9ea2172511ed73ae0096be8e593c3b75631700edaf729f1abbae607314a20e35"));
+    auto myPublicKey = myPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(myPublicKey.bytes));
+    auto redeemScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
+
+    const auto ownAddress = "bc1qvrt7ukvhvmdny0a3j9k8l8jasx92lrqm30t2u2";
+
+    auto utxoHash0 =
+        parse_hex("b33082a5fad105c1d9712e8d503971fe4d84713065bd323fd1019636ed940e8d");
+    std::reverse(utxoHash0.begin(), utxoHash0.end());
+    auto utxoAmount0 = 30269;
+    auto utxoOutputIndex0 = 1;
+
+    auto utxoHash1 =
+        parse_hex("1f62c18bfc5f8293a2b7b061587c427bf830fb224289f9a806e6ad48de6a4c7d");
+    std::reverse(utxoHash1.begin(), utxoHash1.end());
+    auto utxoAmount1 = 4863;
+    auto utxoOutputIndex1 = 1;
+
+    auto utxoHash2 =
+        parse_hex("71c3343dfca5f1914e1bfc04153517d73650cb9c931e8511d24d1f5290120f6f");
+    std::reverse(utxoHash2.begin(), utxoHash2.end());
+    // This UTXO will be filtered out as less than dust threshold.
+    auto utxoAmount2 = 300;
+    auto utxoOutputIndex2 = 0;
+
+    const auto dustAmount = 546;
+    // Change amount is too low (less than dust), so we just waste it as the transaction fee.
+    const auto dustChange = 200;
+    const auto sendAmount = 28235 - dustChange;
+
+    Proto::SigningInput signingInput;
+    signingInput.set_coin_type(TWCoinTypeBitcoin);
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_byte_fee(33);
+    signingInput.set_amount(sendAmount);
+    signingInput.set_to_address("bc1q2dsdlq3343vk29runkgv4yc292hmq53jedfjmp");
+    signingInput.set_change_address(ownAddress);
+    signingInput.set_fixed_dust_threshold(dustAmount);
+
+    signingInput.add_private_key(myPrivateKey.bytes.data(), myPrivateKey.bytes.size());
+
+    // Add UTXO 0
+    auto utxo0 = signingInput.add_utxo();
+    utxo0->set_script(redeemScript.bytes.data(), redeemScript.bytes.size());
+    utxo0->set_amount(utxoAmount0);
+    utxo0->mutable_out_point()->set_hash(
+        std::string(utxoHash0.begin(), utxoHash0.end()));
+    utxo0->mutable_out_point()->set_index(utxoOutputIndex0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    // Add UTXO 1
+    auto utxo1 = signingInput.add_utxo();
+    utxo1->set_script(redeemScript.bytes.data(), redeemScript.bytes.size());
+    utxo1->set_amount(utxoAmount1);
+    utxo1->mutable_out_point()->set_hash(
+        std::string(utxoHash1.begin(), utxoHash1.end()));
+    utxo1->mutable_out_point()->set_index(utxoOutputIndex1);
+    utxo1->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    // Add UTXO 2
+    auto utxo2 = signingInput.add_utxo();
+    utxo2->set_script(redeemScript.bytes.data(), redeemScript.bytes.size());
+    utxo2->set_amount(utxoAmount2);
+    utxo2->mutable_out_point()->set_hash(
+        std::string(utxoHash2.begin(), utxoHash2.end()));
+    utxo2->mutable_out_point()->set_index(utxoOutputIndex2);
+    utxo2->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, TWCoinTypeBitcoin);
+    EXPECT_EQ(plan.error(), Common::Proto::OK);
+
+    auto fee = 6897 + dustChange;
+    // UTXO-2 with 300 satoshis should be filtered out as less than dust.
+    EXPECT_TRUE(verifyPlan(plan, {4863, 30269}, sendAmount, fee));
+
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeBitcoin);
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    // Successfully broadcasted: https://mempool.space/tx/5d6bf53576a54be4d92cd8abf58d28ecc9ea7956eaf970d24d6bfcb9fcfe9855
+    EXPECT_EQ(hex(output.encoded()), "010000000001027d4c6ade48ade606a8f9894222fb30f87b427c5861b0b7a293825ffc8bc1621f0100000000ffffffff8d0e94ed369601d13f32bd653071844dfe7139508d2e71d9c105d1faa58230b30100000000ffffffff01836d0000000000001600145360df8231ac5965147c9d90ca930a2aafb0523202483045022100f95f9ac5d39f4b47dcd8c86daaaeac86374258d9960f922333ba0d5fdaa15b7e0220761794672dc9fbd71398d608f72f5d21a0f6c1306c6b700ad0d82f747c221062012103a11506993946e20ea82686b157bf08f944759f43d91af8d84650ee73a482431c02483045022100eb6ba0dcc64af61b2186b7efdab1ff03784d585ee03437f9a53875e93429db080220015a268d308436d3564b83ceaed90bc7272ca164016298ea855d1936568002a7012103a11506993946e20ea82686b157bf08f944759f43d91af8d84650ee73a482431c00000000");
+}
+
+// Not enough funds to send requested amount after UTXO dust filtering.
+TEST(BitcoinSigning, SignPlanTransactionNotSufficientAfterDustFiltering) {
+    const auto myPrivateKey = PrivateKey(parse_hex("9ea2172511ed73ae0096be8e593c3b75631700edaf729f1abbae607314a20e35"));
+    auto myPublicKey = myPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(myPublicKey.bytes));
+    auto redeemScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
+
+    const auto ownAddress = "bc1qvrt7ukvhvmdny0a3j9k8l8jasx92lrqm30t2u2";
+
+    auto utxoHash0 =
+        parse_hex("b33082a5fad105c1d9712e8d503971fe4d84713065bd323fd1019636ed940e8d");
+    std::reverse(utxoHash0.begin(), utxoHash0.end());
+    auto utxoAmount0 = 30269;
+    auto utxoOutputIndex0 = 1;
+
+    auto utxoHash1 =
+        parse_hex("1f62c18bfc5f8293a2b7b061587c427bf830fb224289f9a806e6ad48de6a4c7d");
+    std::reverse(utxoHash1.begin(), utxoHash1.end());
+    auto utxoAmount1 = 545;
+    auto utxoOutputIndex1 = 1;
+
+    const auto utxoScript0 = parse_hex("0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
+
+    const auto dustAmount = 546;
+    const auto sendAmount = 25620;
+
+    Proto::SigningInput signingInput;
+    signingInput.set_coin_type(TWCoinTypeBitcoin);
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_byte_fee(33);
+    signingInput.set_amount(sendAmount);
+    signingInput.set_to_address("bc1q2dsdlq3343vk29runkgv4yc292hmq53jedfjmp");
+    signingInput.set_change_address(ownAddress);
+    signingInput.set_fixed_dust_threshold(dustAmount);
+
+    signingInput.add_private_key(myPrivateKey.bytes.data(), myPrivateKey.bytes.size());
+
+    // Add UTXO 0
+    auto utxo0 = signingInput.add_utxo();
+    utxo0->set_script(redeemScript.bytes.data(), redeemScript.bytes.size());
+    utxo0->set_amount(utxoAmount0);
+    utxo0->mutable_out_point()->set_hash(
+        std::string(utxoHash0.begin(), utxoHash0.end()));
+    utxo0->mutable_out_point()->set_index(utxoOutputIndex0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    // Add UTXO 1
+    auto utxo1 = signingInput.add_utxo();
+    utxo1->set_script(redeemScript.bytes.data(), redeemScript.bytes.size());
+    utxo1->set_amount(utxoAmount1);
+    utxo1->mutable_out_point()->set_hash(
+        std::string(utxoHash1.begin(), utxoHash1.end()));
+    utxo1->mutable_out_point()->set_index(utxoOutputIndex1);
+    utxo1->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    // sum()
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, TWCoinTypeBitcoin);
+    EXPECT_EQ(plan.error(), Common::Proto::Error_not_enough_utxos);
+
+    // `AnySigner.sign` should return the same error.
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeBitcoin);
+    EXPECT_EQ(output.error(), Common::Proto::Error_not_enough_utxos);
+}
+
+// Deposit 0.0001 BTC from bc1q2sphzvc2uqmxqte2w9dd4gzy4sy9vvfv0me9ke to 0xa8491D40d4F71A752cA41DA0516AEd80c33a1B56 on ZETA mainnet.
+// https://www.zetachain.com/docs/developers/omnichain/bitcoin/#example-1-deposit-btc-into-an-account-in-zevm
+TEST(BitcoinSigning, SignDepositBtcToZetaChain) {
+    const auto myPrivateKey = PrivateKey(parse_hex("428d66be0b5a620f126a00fa67637222ce3dc9badfe5c605189520760810cfac"));
+    auto myPublicKey = myPrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(myPublicKey.bytes));
+    auto redeemScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
+
+    const auto ownAddress = "bc1q2sphzvc2uqmxqte2w9dd4gzy4sy9vvfv0me9ke";
+    const auto ownZetaEvmAddress = parse_hex("a8491D40d4F71A752cA41DA0516AEd80c33a1B56");
+    // https://www.zetachain.com/docs/reference/glossary/#tss
+    const auto zetaTssAddress = "bc1qm24wp577nk8aacckv8np465z3dvmu7ry45el6y";
+
+    auto utxoHash0 =
+        parse_hex("17a6adb5db1e33c87467a58aa31cddbb3800052315015cf3cf1c2b0119310e20");
+    std::reverse(utxoHash0.begin(), utxoHash0.end());
+    auto utxoAmount0 = 20000;
+    auto utxoOutputIndex0 = 0;
+
+    const auto sendAmount = 10000;
+    const auto dustAmount = 546;
+
+    Proto::SigningInput signingInput;
+    signingInput.set_coin_type(TWCoinTypeBitcoin);
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_byte_fee(15);
+    signingInput.set_amount(sendAmount);
+    signingInput.set_to_address(zetaTssAddress);
+    signingInput.set_change_address(ownAddress);
+    signingInput.set_fixed_dust_threshold(dustAmount);
+    signingInput.set_output_op_return(ownZetaEvmAddress.data(), ownZetaEvmAddress.size());
+    // OP_RETURN must be the second output before the change.
+    signingInput.mutable_output_op_return_index()->set_index(1);
+
+    signingInput.add_private_key(myPrivateKey.bytes.data(), myPrivateKey.bytes.size());
+
+    // Add UTXO 0
+    auto utxo0 = signingInput.add_utxo();
+    utxo0->set_script(redeemScript.bytes.data(), redeemScript.bytes.size());
+    utxo0->set_amount(utxoAmount0);
+    utxo0->mutable_out_point()->set_hash(
+        std::string(utxoHash0.begin(), utxoHash0.end()));
+    utxo0->mutable_out_point()->set_index(utxoOutputIndex0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeBitcoin);
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+
+    EXPECT_EQ(output.transaction().outputs_size(), 3);
+    // P2WPKH to the TSS address.
+    EXPECT_EQ(output.transaction().outputs(0).value(), sendAmount);
+    // OP_RETURN
+    EXPECT_EQ(output.transaction().outputs(1).value(), 0);
+    // Transaction fee.
+    EXPECT_EQ(output.transaction().outputs(2).value(), 7420);
+
+    // Successfully broadcasted:
+    // https://mempool.space/tx/2b871b6c1112ad0a777f6db1f7a7709154c4d9af8e771ba4eca148915f830e9d
+    // https://explorer.zetachain.com/cc/tx/0x269e319478f8849247abb28b33a7b8e0a849dab4551bab328bf58bf67b02a807
+    const auto expectedTx = "01000000000101200e3119012b1ccff35c011523050038bbdd1ca38aa56774c8331edbb5ada6170000000000ffffffff031027000000000000160014daaae0d3de9d8fdee31661e61aea828b59be78640000000000000000166a14a8491d40d4f71a752ca41da0516aed80c33a1b56fc1c000000000000160014540371330ae036602f2a715adaa044ac0856312c02483045022100e29731f7474f9103c6df3434c8c62a540a21ad0e10e23df343b1e81e4b26110602202d37fb4fee5341a41f9e4e65ba2d3e0d2309425ea9806d94eb268efe6f21007001210369cdaf80b4a5fdad91e9face90e848225512884ec2e3ed572ca11dc68e75054700000000";
+
+    EXPECT_EQ(hex(output.encoded()), expectedTx);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, TWCoinTypeBitcoin);
+    EXPECT_EQ(plan.error(), Common::Proto::SigningError::OK);
+    EXPECT_TRUE(plan.has_output_op_return_index());
+    EXPECT_EQ(plan.output_op_return_index().index(), 1u);
+
+    *signingInput.mutable_plan() = plan;
+    ANY_SIGN(signingInput, TWCoinTypeBitcoin);
+    // The result has to be the same as signing without transaction planning.
+    EXPECT_EQ(hex(output.encoded()), expectedTx);
+}
+
+TEST(BitcoinSigning, SignP2PKH) {
+    auto input = buildInputP2PKH();
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {625'000'000}, 335'790'000, 226));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{228, 225, 226}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "01" // inputs
+            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "6a"  "47304402202819d70d4bec472113a1392cadc0860a7a1b34ea0869abb4bdce3290c3aba086022023eff75f410ad19cdbe6c6a017362bd554ce5fb906c13534ddc306be117ad30a012103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432"  "ffffffff"
+        "02" // outputs
+            "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "aefd3c1100000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2PKH_NegativeMissingKey) {
+    auto input = buildInputP2PKH(true);
+
+    {
+        // test plan (but do not reuse plan result). Plan works even with missing keys.
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {625'000'000}, 335'790'000, 226));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_missing_private_key);
+}
+
+TEST(BitcoinSigning, EncodeP2WPKH) {
+    auto unsignedTx = Transaction(1, 0x11);
+
+    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
+    auto outpoint0 = TW::Bitcoin::OutPoint(hash0, 0);
+    unsignedTx.inputs.emplace_back(outpoint0, Script(), 0xffffffee);
+
+    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
+    auto outpoint1 = TW::Bitcoin::OutPoint(hash1, 1);
+    unsignedTx.inputs.emplace_back(outpoint1, Script(), UINT32_MAX);
+
+    auto outScript0 = Script(parse_hex("76a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac"));
+    unsignedTx.outputs.emplace_back(112340000, outScript0);
+
+    auto outScript1 = Script(parse_hex("76a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac"));
+    unsignedTx.outputs.emplace_back(223450000, outScript1);
+
+    Data unsignedData;
+    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
+    ASSERT_EQ(unsignedData.size(), 164ul);
+    ASSERT_EQ(hex(unsignedData),
+        "01000000" // version
+        "0001" // marker & flag
+        "02" // inputs
+            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "00"  ""  "eeffffff"
+            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "202cb20600000000"  "19"  "76a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac"
+            "9093510d00000000"  "19"  "76a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac"
+        // witness
+            "00"
+            "00"
+        "11000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2WPKH_Bip143) {
+    // https://github.com/bitcoin/bips/blob/master/bip-0143.mediawiki#native-p2wpkh
+
+    SigningInput input;
+    input.hashType = TWBitcoinSigHashTypeAll;
+    const auto amount = 112340000; // 0x06B22C20
+    input.amount = amount;
+    input.byteFee = 20; // not relevant
+    input.toAddress = "1Cu32FVupVCgHkMMRJdYJugxwo2Aprgk7H";
+    input.changeAddress = "16TZ8J6Q5iZKBWizWzFAYnrsaox5Z5aBRV";
+
+    const auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
+    const auto utxoKey0 = PrivateKey(parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
+    const auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(hex(pubKey0.bytes), "03c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432");
+
+    const auto utxo0Script = Script::buildPayToPublicKey(pubKey0.bytes);
+    Data key2;
+    utxo0Script.matchPayToPublicKey(key2);
+    EXPECT_EQ(hex(key2), hex(pubKey0.bytes));
+    input.privateKeys.push_back(utxoKey0);
+
+    const auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
+    const auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
+    const auto pubKey1 = utxoKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(hex(pubKey1.bytes), "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357");
+    const auto utxoPubkeyHash1 = Hash::ripemd(Hash::sha256(pubKey1.bytes));
+    EXPECT_EQ(hex(utxoPubkeyHash1), "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
+    input.privateKeys.push_back(utxoKey1);
+    input.lockTime = 0x11;
+
+    UTXO utxo0;
+    utxo0.script = utxo0Script;
+    utxo0.amount = 1000000; // note: this amount is not specified in the test
+    utxo0.outPoint = OutPoint(hash0, 0, 0xffffffee);
+    input.utxos.push_back(utxo0);
+
+    UTXO utxo1;
+    auto utxo1Script = Script::buildPayToV0WitnessProgram(utxoPubkeyHash1);
+    utxo1.script = utxo1Script;
+    utxo1.amount = 600000000; // 0x23C34600 0046c323
+    utxo1.outPoint = OutPoint(hash1, 1, UINT32_MAX);
+    input.utxos.push_back(utxo1);
+
+    // Set plan to force both UTXOs and exact output amounts
+    TransactionPlan plan;
+    plan.amount = amount;
+    plan.availableAmount = 600000000 + 1000000;
+    plan.fee = 265210000;    // very large, the amounts specified (in1, out0, out1) are not consistent/realistic
+    plan.change = 223450000; // 0x0d519390
+    plan.branchId = {0};
+    plan.utxos.push_back(utxo0);
+    plan.utxos.push_back(utxo1);
+    input.plan = plan;
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    const auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{343, 233, 261}));
+    // expected in one string for easy comparison/copy:
+    ASSERT_EQ(hex(serialized), "01000000000102fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f00000000494830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01eeffffffef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a0100000000ffffffff02202cb206000000001976a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac9093510d000000001976a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac000247304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee0121025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee635711000000");
+    // expected in structured format:
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "02" // inputs
+            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "4830450221008b9d1dc26ba6a9cb62127b02742fa9d754cd3bebf337f7a55d114c8e5cdd30be022040529b194ba3f9281a99f2b1c0a19c0489bc22ede944ccf4ecbab4cc618ef3ed01"  "eeffffff"
+            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "202cb20600000000"  "19"  "76a9148280b37df378db99f66f85c95a783a76ac7a6d5988ac"
+            "9093510d00000000"  "19"  "76a9143bde42dbee7e4dbe6a21b2d50ce2f0167faa815988ac"
+        // witness
+            "00"
+            "02"
+                "47"  "304402203609e17b84f6a7d30c80bfa610b5b4542f32a8a0d5447a12fb1366d7f01cc44a0220573a954c4518331561406f90300e8f3358f51928d43c212a8caed02de67eebee01"
+                "21"  "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"
+        "11000000" // nLockTime
+    );
+}
+
+SigningInput buildInputP2WPKH(int64_t amount, TWBitcoinSigHashType hashType, int64_t utxo0Amount, int64_t utxo1Amount, bool useMaxAmount = false) {
+    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
+    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
+
+    // Setup input
+    SigningInput input;
+    input.hashType = hashType;
+    input.amount = amount;
+    input.useMaxAmount = useMaxAmount;
+    input.byteFee = 1;
+    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
+    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
+    input.coinType = TWCoinTypeBitcoin;
+
+    auto utxoKey0 = PrivateKey(parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
+    auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash0 = Hash::ripemd(Hash::sha256(pubKey0.bytes));
+    assert(hex(utxoPubkeyHash0) == "b7cd046b6d522a3d61dbcb5235c0e9cc97265457");
+    input.privateKeys.push_back(utxoKey0);
+
+    auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
+    auto pubKey1 = utxoKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash1 = Hash::ripemd(Hash::sha256(pubKey1.bytes));
+    assert(hex(utxoPubkeyHash1) == "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
+    input.privateKeys.push_back(utxoKey1);
+
+    auto scriptPub1 = Script(parse_hex("0014"
+                                       "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
+    Data scriptHash;
+    scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
+    auto scriptHashHex = hex(scriptHash);
+    assert(scriptHashHex == "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
+
+    auto redeemScript = Script::buildPayToPublicKeyHash(parse_hex("1d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
+    input.scripts[scriptHashHex] = redeemScript;
+
+    UTXO utxo0;
+    utxo0.script = Script(parse_hex("2103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432ac"));
+    utxo0.amount = utxo0Amount;
+    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    UTXO utxo1;
+    utxo1.script = Script(parse_hex("0014"
+                                    "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
+    utxo1.amount = utxo1Amount;
+    utxo1.outPoint = OutPoint(hash1, 1, UINT32_MAX);
+    input.utxos.push_back(utxo1);
+
+    return input;
+}
+
+TEST(BitcoinSigning, SignP2WPKH) {
+    auto input = buildInputP2WPKH(335'790'000, TWBitcoinSigHashTypeAll, 625'000'000, 600'000'000);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {625'000'000}, 335'790'000, 192));
+    }
+
+    // Signs
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{195, 192, 193}));
+    EXPECT_EQ(serialized.size(), 192ul);
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "01" // inputs
+            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100c327babdd370f0fc5b24cf920736446bf7d9c5660e4a5f7df432386fd652fe280220269c4fc3690c1c248e50c8bf2435c20b4ef00f308b403575f4437f862a91c53a01"  "ffffffff"
+        "02" // outputs
+            "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "d0fd3c1100000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        "00000000" // nLockTime
+    );
+
+    {
+        // Non-segwit encoded, for comparison
+        Data serialized_;
+        signedTx.encode(serialized_, Transaction::SegwitFormatMode::NonSegwit);
+        EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{195, 192, 193}));
+        EXPECT_EQ(serialized_.size(), 192ul);
+        ASSERT_EQ(hex(serialized_), // printed using prettyPrintTransaction
+            "01000000" // version
+            "01" // inputs
+                "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100c327babdd370f0fc5b24cf920736446bf7d9c5660e4a5f7df432386fd652fe280220269c4fc3690c1c248e50c8bf2435c20b4ef00f308b403575f4437f862a91c53a01"  "ffffffff"
+            "02" // outputs
+                "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+                "d0fd3c1100000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+            "00000000" // nLockTime
+        );
+    }
+}
+
+TEST(BitcoinSigning, SignP2WPKH_HashSingle_TwoInput) {
+    auto input = buildInputP2WPKH(335'790'000, TWBitcoinSigHashTypeSingle, 210'000'000, 210'000'000);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {210'000'000, 210'000'000}, 335'790'000, 261));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{343, 233, 261}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "02" // inputs
+            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100fd8591c3611a07b55f509ec850534c7a9c49713c9b8fa0e844ea06c2e65e19d702205e3806676192e790bc93dd4c28e937c4bf97b15f189158ba1a30d7ecff5ee75503"  "ffffffff"
+            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "4bf0040500000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        // witness
+            "00"
+            "02"  "47"  "30440220096d20c7e92f991c2bf38dc28118feb34019ae74ec1c17179b28cb041de7517402204594f46a911f24bdc7109ca192e6860ebf2f3a0087579b3c128d5ce0cd5ed46803"  "21"  "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2WPKH_HashAnyoneCanPay_TwoInput) {
+    auto input = buildInputP2WPKH(335'790'000, TWBitcoinSigHashTypeAnyoneCanPay, 210'000'000, 210'000'000);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {210'000'000, 210'000'000}, 335'790'000, 261));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{344, 233, 261}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "02" // inputs
+            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100e21fb2f1cfd59bdb3703fd45db38fd680d0c06e5d0be86fb7dc233c07ee7ab2f02207367220a73e43df4352a6831f6f31d8dc172c83c9f613a9caf679f0f15621c5e80"  "ffffffff"
+            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "b0bf031400000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "4bf0040500000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        // witness
+            "00"
+            "02"  "48"  "304502210095f9cc913d2f0892b953f2380112533e8930b67c53e00a7bbd7a01d547156adc022026efe3a684aa7432a00a919dbf81b63e635fb92d3149453e95b4a7ccea59f7c480"  "21"  "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2WPKH_MaxAmount) {
+    auto input = buildInputP2WPKH(1'000, TWBitcoinSigHashTypeAll, 625'000'000, 600'000'000, true);
+    input.amount = 1'224'999'773;
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {625'000'000, 600'000'000}, 1'224'999'773, 227));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{310, 199, 227}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "02" // inputs
+            "fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f"  "00000000"  "49"  "483045022100a8b3c1619e985923994e80efdc0be0eac12f2419e11ce5e4286a0a5ac27c775d02205d6feee85ffe19ae0835cba1562beb3beb172107cd02ac4caf24a8be3749811f01"  "ffffffff"
+            "ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a"  "01000000"  "00"  ""  "ffffffff"
+        "01" // outputs
+            "5d03044900000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+        // witness
+            "00"
+            "02"  "48"  "3045022100db1199de92f6fb638a0ba706d13ec686bb01138a254dec2c397616cd74bad30e02200d7286d6d2d4e00d145955bf3d3b848b03c0d1eef8899e4645687a3035d7def401"  "21"  "025476c2e83188368da1ff3e292e7acafcdb3566bb0ad253f62fc70f07aeee6357"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, EncodeP2WSH) {
+    auto unsignedTx = Transaction(1);
+
+    auto outpoint0 = OutPoint(parse_hex("0001000000000000000000000000000000000000000000000000000000000000"), 0);
+    unsignedTx.inputs.emplace_back(outpoint0, Script(), UINT32_MAX);
+
+    auto outScript0 = Script(parse_hex("76a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac"));
+    unsignedTx.outputs.emplace_back(1000, outScript0);
+
+    Data unsignedData;
+    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::NonSegwit);
+    ASSERT_EQ(hex(unsignedData),
+        "01000000" // version
+        "01" // inputs
+            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
+        "01" // outputs
+            "e803000000000000"  "19"  "76a9144c9c3dfac4207d5d8cb89df5722cb3d712385e3f88ac"
+        "00000000" // nLockTime
+    );
+}
+
+SigningInput buildInputP2WSH(enum TWBitcoinSigHashType hashType, bool omitScript = false, bool omitKeys = false) {
+    SigningInput input;
+    input.hashType = hashType;
+    input.amount = 1000;
+    input.byteFee = 1;
+    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
+    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
+    // Set the very low fixed Dust threshold just to fix the tests.
+    // Actually, transactions in these tests have change=79 and change=52 that will lead to Dust error when broadcasting it.
+    input.dustCalculator = std::make_shared<FixedDustCalculator>(50);
+
+    if (!omitKeys) {
+        auto utxoKey0 = PrivateKey(parse_hex("ed00a0841cd53aedf89b0c616742d1d2a930f8ae2b0fb514765a17bb62c7521a"));
+        input.privateKeys.push_back(utxoKey0);
+
+        auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
+        input.privateKeys.push_back(utxoKey1);
+    }
+
+    if (!omitScript) {
+        auto redeemScript = Script(parse_hex("2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"));
+        auto scriptHash = "593128f9f90e38b706c18623151e37d2da05c229";
+        input.scripts[scriptHash] = redeemScript;
+    }
+
+    UTXO utxo0;
+    auto p2wsh = Script::buildPayToWitnessScriptHash(parse_hex("ff25429251b5a84f452230a3c75fd886b7fc5a7865ce4a7bb7a9d7c5be6da3db"));
+    utxo0.script = p2wsh;
+    utxo0.amount = 1226;
+    auto hash0 = parse_hex("0001000000000000000000000000000000000000000000000000000000000000");
+    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    return input;
+}
+
+TEST(BitcoinSigning, SignP2WSH) {
+    // Setup input
+    const auto input = buildInputP2WSH(hashTypeForCoin(TWCoinTypeBitcoin));
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{231, 119, 147}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "e803000000000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "4f00000000000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        // witness
+            "02"  "48"  "30450221009eefc1befe96158f82b74e6804f1f713768c6172636ca11fcc975c316ea86f75022057914c48bc24f717498b851a47a2926f96242e3943ebdf08d5a97a499efc8b9001"  "23"  "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2WSH_HashNone) {
+    // Setup input
+    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeNone);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{231, 119, 147}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "e803000000000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "4f00000000000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        // witness
+            "02"  "48"  "3045022100caa585732cfc50226a90834a306d23d5d2ab1e94af2c66136a637e3d9bad3688022069028750908e53a663bb1f434fd655bcc0cf8d394c6fa1fd5a4983790135722e02"  "23"  "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2WSH_HashSingle) {
+    // Setup input
+    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeSingle);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{230, 119, 147}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "e803000000000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "4f00000000000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        // witness
+            "02"  "47"  "304402201ba80b2c48fe82915297dc9782ae2141e40263001fafd21b02c04a092503f01e0220666d6c63475c6c52abd09371c200ac319bcf4a7c72eb3782e95790f5c847f0b903"  "23"  "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2WSH_HashAnyoneCanPay) {
+    // Setup input
+    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeAnyoneCanPay);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(serialized.size(), 231ul);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{231, 119, 147}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "0001000000000000000000000000000000000000000000000000000000000000"  "00000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "e803000000000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "4f00000000000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        // witness
+            "02"  "48"  "3045022100d14699fc9b7337768bcd1430098d279cfaf05f6abfa75dd542da2dc038ae1700022063f0751c08796c086ac23b39c25f4320f432092e0c11bec46af0723cc4f55a3980"  "23"  "2103596d3451025c19dbbdeb932d6bf8bfb4ad499b95b6f88db8899efac102e5fc71ac"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2WSH_NegativeMissingScript) {
+    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll, true);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 174));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_script_redeem);
+}
+
+TEST(BitcoinSigning, SignP2WSH_NegativeMissingKeys) {
+    const auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll, false, true);
+
+    {
+        // test plan (but do not reuse plan result). Plan works even with missing keys.
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'226}, 1'000, 147));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_missing_private_key);
+}
+
+TEST(BitcoinSigning, SignP2WSH_NegativePlanWithError) {
+    // Setup input
+    auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll);
+    input.plan = TransactionBuilder::plan(input);
+    input.plan->error = Common::Proto::Error_missing_input_utxos;
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
+}
+
+TEST(BitcoinSigning, SignP2WSH_NegativeNoUTXOs) {
+    // Setup input
+    auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll);
+    input.utxos.clear();
+    ASSERT_FALSE(input.plan.has_value());
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
+}
+
+TEST(BitcoinSigning, SignP2WSH_NegativePlanWithNoUTXOs) {
+    // Setup input
+    auto input = buildInputP2WSH(TWBitcoinSigHashTypeAll);
+    input.plan = TransactionBuilder::plan(input);
+    input.plan->utxos.clear();
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
+}
+
+TEST(BitcoinSigning, EncodeP2SH_P2WPKH) {
+    auto unsignedTx = Transaction(1, 0x492);
+
+    auto outpoint0 = OutPoint(parse_hex("db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477"), 1);
+    unsignedTx.inputs.emplace_back(outpoint0, Script(), 0xfffffffe);
+
+    auto outScript0 = Script(parse_hex("76a914a457b684d7f0d539a46a45bbc043f35b59d0d96388ac"));
+    unsignedTx.outputs.emplace_back(199'996'600, outScript0);
+
+    auto outScript1 = Script(parse_hex("76a914fd270b1ee6abcaea97fea7ad0402e8bd8ad6d77c88ac"));
+    unsignedTx.outputs.emplace_back(800'000'000, outScript1);
+
+    Data unsignedData;
+    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::NonSegwit);
+    ASSERT_EQ(hex(unsignedData),
+        "01000000" // version
+        "01" // inputs
+            "db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477"  "01000000"  "00"  ""  "feffffff"
+        "02" // outputs
+            "b8b4eb0b00000000"  "19"  "76a914a457b684d7f0d539a46a45bbc043f35b59d0d96388ac"
+            "0008af2f00000000"  "19"  "76a914fd270b1ee6abcaea97fea7ad0402e8bd8ad6d77c88ac"
+        "92040000" // nLockTime
+    );
+}
+
+SigningInput buildInputP2SH_P2WPKH(bool omitScript = false, bool omitKeys = false, bool invalidOutputScript = false, bool invalidRedeemScript = false) {
+    // Setup input
+    SigningInput input;
+    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
+    input.amount = 200'000'000;
+    input.byteFee = 1;
+    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
+    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
+    input.coinType = TWCoinTypeBitcoin;
+
+    auto utxoKey0 = PrivateKey(parse_hex("eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf"));
+    auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(pubKey0.bytes));
+    assert(hex(utxoPubkeyHash) == "79091972186c449eb1ded22b78e40d009bdf0089");
+    if (!omitKeys) {
+        input.privateKeys.push_back(utxoKey0);
+    }
+
+    if (!omitScript && !invalidRedeemScript) {
+        auto redeemScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
+        auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
+        assert(hex(scriptHash) == "4733f37cf4db86fbc2efed2500b4f4e49f312023");
+        input.scripts[hex(scriptHash)] = redeemScript;
+    } else if (invalidRedeemScript) {
+        auto redeemScript = Script(parse_hex("FAFBFCFDFE"));
+        auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
+        input.scripts[hex(scriptHash)] = redeemScript;
+    }
+
+    UTXO utxo0;
+    auto utxo0Script = Script(parse_hex("a9144733f37cf4db86fbc2efed2500b4f4e49f31202387"));
+    if (invalidOutputScript) {
+        utxo0Script = Script(parse_hex("FFFEFDFCFB"));
+    }
+    utxo0.script = utxo0Script;
+    utxo0.amount = 1'000'000'000;
+    auto hash0 = parse_hex("db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477");
+    utxo0.outPoint = OutPoint(hash0, 1, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    return input;
+}
+
+TEST(BitcoinSigning, SignP2SH_P2WPKH) {
+    auto input = buildInputP2SH_P2WPKH();
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 170));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{251, 142, 170}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "db6b1b20aa0fd7b23880be2ecbd4a98130974cf4748fb66092ac4d3ceb1a5477"  "01000000"  "17"  "16001479091972186c449eb1ded22b78e40d009bdf0089"  "ffffffff"
+        "02" // outputs
+            "00c2eb0b00000000"  "19"  "76a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "5607af2f00000000"  "19"  "76a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        // witness
+            "02"  "47"  "3044022062b408cc7f92c8add622f3297b8992d68403849c6421ef58274ed6fc077102f30220250696eacc0aad022f55882d742dda7178bea780c03705bf9cdbee9f812f785301"  "21"  "03ad1d8e89212f0b92c74d23bb710c00662ad1470198ac48c43f7d6f93a2a26873"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2SH_P2WPKH_NegativeOmitScript) {
+    auto input = buildInputP2SH_P2WPKH(true, false);
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 174));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_script_redeem);
+}
+
+TEST(BitcoinSigning, SignP2SH_P2WPKH_NegativeInvalidOutputScript) {
+    auto input = buildInputP2SH_P2WPKH(false, false, true);
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 174));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_script_output);
+}
+
+TEST(BitcoinSigning, SignP2SH_P2WPKH_NegativeInvalidRedeemScript) {
+    auto input = buildInputP2SH_P2WPKH(false, false, false, true);
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 174));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_script_redeem);
+}
+
+TEST(BitcoinSigning, SignP2SH_P2WPKH_NegativeOmitKeys) {
+    auto input = buildInputP2SH_P2WPKH(false, true);
+    {
+        // test plan (but do not reuse plan result). Plan works even with missing keys.
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {1'000'000'000}, 200'000'000, 170));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_missing_private_key);
+}
+
+TEST(BitcoinSigning, EncodeP2SH_P2WSH) {
+    auto unsignedTx = Transaction(1);
+
+    auto hash0 = parse_hex("36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e");
+    auto outpoint0 = OutPoint(hash0, 1);
+    unsignedTx.inputs.emplace_back(outpoint0, Script(), 0xffffffff);
+
+    auto outScript0 = Script(parse_hex("76a914389ffce9cd9ae88dcc0631e88a821ffdbe9bfe2688ac"));
+    unsignedTx.outputs.emplace_back(0x0000000035a4e900, outScript0);
+
+    auto outScript1 = Script(parse_hex("76a9147480a33f950689af511e6e84c138dbbd3c3ee41588ac"));
+    unsignedTx.outputs.emplace_back(0x00000000052f83c0, outScript1);
+
+    Data unsignedData;
+    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::NonSegwit);
+    ASSERT_EQ(hex(unsignedData),
+        "01000000" // version
+        "01" // inputs
+            "36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e"  "01000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "00e9a43500000000"  "19"  "76a914389ffce9cd9ae88dcc0631e88a821ffdbe9bfe2688ac"
+            "c0832f0500000000"  "19"  "76a9147480a33f950689af511e6e84c138dbbd3c3ee41588ac"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, SignP2SH_P2WSH) {
+    // Setup signing input
+    SigningInput input;
+    input.amount = 900000000;
+    input.hashType = (TWBitcoinSigHashType)0;
+    input.toAddress = "16AQVuBMt818u2HBcbxztAZTT2VTDKupPS";
+    input.changeAddress = "1Bd1VA2bnLjoBk4ook3H19tZWETk8s6Ym5";
+
+    auto key0 = parse_hex("730fff80e1413068a05b57d6a58261f07551163369787f349438ea38ca80fac6");
+    input.privateKeys.push_back(PrivateKey(key0));
+    auto key1 = parse_hex("11fa3d25a17cbc22b29c44a484ba552b5a53149d106d3d853e22fdd05a2d8bb3");
+    input.privateKeys.push_back(PrivateKey(key1));
+    auto key2 = parse_hex("77bf4141a87d55bdd7f3cd0bdccf6e9e642935fec45f2f30047be7b799120661");
+    input.privateKeys.push_back(PrivateKey(key2));
+    auto key3 = parse_hex("14af36970f5025ea3e8b5542c0f8ebe7763e674838d08808896b63c3351ffe49");
+    input.privateKeys.push_back(PrivateKey(key3));
+    auto key4 = parse_hex("fe9a95c19eef81dde2b95c1284ef39be497d128e2aa46916fb02d552485e0323");
+    input.privateKeys.push_back(PrivateKey(key4));
+    auto key5 = parse_hex("428a7aee9f0c2af0cd19af3cf1c78149951ea528726989b2e83e4778d2c3f890");
+    input.privateKeys.push_back(PrivateKey(key5));
+
+    auto redeemScript = Script::buildPayToWitnessScriptHash(parse_hex("a16b5755f7f6f96dbd65f5f0d6ab9418b89af4b1f14a1bb8a09062c35f0dcb54"));
+    auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
+    input.scripts[hex(scriptHash)] = redeemScript;
+
+    auto witnessScript = Script(parse_hex(
+        "56"
+            "210307b8ae49ac90a048e9b53357a2354b3334e9c8bee813ecb98e99a7e07e8c3ba3"
+            "2103b28f0c28bfab54554ae8c658ac5c3e0ce6e79ad336331f78c428dd43eea8449b"
+            "21034b8113d703413d57761b8b9781957b8c0ac1dfe69f492580ca4195f50376ba4a"
+            "21033400f6afecb833092a9a21cfdf1ed1376e58c5d1f47de74683123987e967a8f4"
+            "2103a6d48b1131e94ba04d9737d61acdaa1322008af9602b3b14862c07a1789aac16"
+            "2102d8b661b0b3302ee2f162b09e07a55ad5dfbe673a9f01d9f0c19617681024306b"
+        "56ae"
+    ));
+    auto witnessScriptHash = Hash::ripemd(Hash::sha256(witnessScript.bytes));
+    input.scripts[hex(witnessScriptHash)] = witnessScript;
+
+    auto utxo0Script = Script(parse_hex("a9149993a429037b5d912407a71c252019287b8d27a587"));
+    UTXO utxo;
+    utxo.outPoint = OutPoint(parse_hex("36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e"), 1, UINT32_MAX);
+    utxo.script = utxo0Script;
+    utxo.amount = 987654321;
+    input.utxos.push_back(utxo);
+
+    TransactionPlan plan;
+    plan.amount = input.amount;
+    plan.availableAmount = input.utxos[0].amount;
+    plan.change = 87000000;
+    plan.fee = plan.availableAmount - plan.amount - plan.change;
+    plan.utxos = input.utxos;
+    input.plan = plan;
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    auto expected =
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "36641869ca081e70f394c6948e8af409e18b619df2ed74aa106c1ca29787b96e"  "01000000"  "23"  "220020a16b5755f7f6f96dbd65f5f0d6ab9418b89af4b1f14a1bb8a09062c35f0dcb54"  "ffffffff"
+        "02" // outputs
+            "00e9a43500000000"  "19"  "76a914389ffce9cd9ae88dcc0631e88a821ffdbe9bfe2688ac"
+            "c0832f0500000000"  "19"  "76a9147480a33f950689af511e6e84c138dbbd3c3ee41588ac"
+        // witness
+            "08"
+                "00"  ""
+                "47"  "304402201992f5426ae0bab04cf206d7640b7e00410297bfe5487637f6c2427ee8496be002204ad4e64dc2d269f593cc4820db1fc1e8dc34774f602945115ce485940e05c64200"
+                "47"  "304402201e412363fa554b994528fd44149f3985b18bb901289ef6b71105b27c7d0e336c0220595e4a1e67154337757562ed5869127533e3e5084c3c2e128518f5f0b85b721800"
+                "47"  "3044022003b0a20ccf545b3f12c5ade10db8717e97b44da2e800387adfd82c95caf529d902206aee3a2395530d52f476d0ddd9d20ba062820ae6f4e1be4921c3630395743ad900"
+                "48"  "3045022100ed7a0eeaf72b84351bceac474b0c0510f67065b1b334f77e6843ed102f968afe022004d97d0cfc4bf5651e46487d6f87bd4af6aef894459f9778f2293b0b2c5b7bc700"
+                "48"  "3045022100934a0c364820588154aed2d519cbcc61969d837b91960f4abbf0e374f03aa39d022036b5c58b754bd44cb5c7d34806c89d9778ea1a1c900618a841e9fbfbe805ff9b00"
+                "47"  "3044022044e3b59b06931d46f857c82fa1d53d89b116a40a581527eac35c5eb5b7f0785302207d0f8b5d063ffc6749fb4e133db7916162b540c70dee40ec0b21e142d8843b3a00"
+                "cf"  "56210307b8ae49ac90a048e9b53357a2354b3334e9c8bee813ecb98e99a7e07e8c3ba32103b28f0c28bfab54554ae8c658ac5c3e0ce6e79ad336331f78c428dd43eea8449b21034b8113d703413d57761b8b9781957b8c0ac1dfe69f492580ca4195f50376ba4a21033400f6afecb833092a9a21cfdf1ed1376e58c5d1f47de74683123987e967a8f42103a6d48b1131e94ba04d9737d61acdaa1322008af9602b3b14862c07a1789aac162102d8b661b0b3302ee2f162b09e07a55ad5dfbe673a9f01d9f0c19617681024306b56ae"
+        "00000000" // nLockTime
+        ;
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{800, 154, 316}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), expected);
+}
+
+TEST(BitcoinSigning, Sign_NegativeNoUtxos) {
+    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
+    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
+
+    // Setup input
+    SigningInput input;
+    input.hashType = TWBitcoinSigHashTypeAll;
+    input.amount = 335'790'000;
+    input.byteFee = 1;
+    input.toAddress = "1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx";
+    input.changeAddress = "1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU";
+
+    auto scriptPub1 = Script(parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
+    Data scriptHash;
+    scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
+    auto scriptHashHex = hex(scriptHash);
+    ASSERT_EQ(scriptHashHex, "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
+
+    auto redeemScript = Script::buildPayToPublicKeyHash(scriptHash);
+    input.scripts[scriptHashHex] = redeemScript;
+
+    {
+        // plan returns empty, as there are 0 utxos
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {}, 0, 0, Common::Proto::Error_missing_input_utxos));
+    }
+
+    // Invoke Sign nonetheless
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    // Fails as there are 0 utxos
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_missing_input_utxos);
+}
+
+TEST(BitcoinSigning, Sign_NegativeInvalidAddress) {
+    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
+    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
+
+    // Setup input
+    SigningInput input;
+    input.hashType = TWBitcoinSigHashTypeAll;
+    input.amount = 335'790'000;
+    input.byteFee = 1;
+    input.toAddress = "THIS-IS-NOT-A-BITCOIN-ADDRESS";
+    input.changeAddress = "THIS-IS-NOT-A-BITCOIN-ADDRESS-EITHER";
+
+    auto utxoKey0 = PrivateKey(parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866"));
+    input.privateKeys.push_back(utxoKey0);
+
+    auto utxoKey1 = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
+    input.privateKeys.push_back(utxoKey1);
+
+    auto scriptPub1 = Script(parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
+    Data scriptHash;
+    scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
+    auto scriptHashHex = hex(scriptHash);
+    ASSERT_EQ(scriptHashHex, "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
+
+    auto redeemScript = Script::buildPayToPublicKeyHash(scriptHash);
+    input.scripts[scriptHashHex] = redeemScript;
+
+    UTXO utxo0;
+    auto utxo0Script = Script(parse_hex("2103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432ac"));
+    utxo0.script = utxo0Script;
+    utxo0.amount = 625'000'000;
+    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    UTXO utxo1;
+    auto utxo1Script = Script(parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
+    utxo1.script = utxo1Script;
+    utxo1.amount = 600'000'000;
+    utxo1.outPoint = OutPoint(hash1, 1, UINT32_MAX);
+    input.utxos.push_back(utxo1);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(std::move(input));
+        EXPECT_TRUE(verifyPlan(plan, {625'000'000}, 335'790'000, 174));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_FALSE(result);
+    EXPECT_EQ(result.error(), Common::Proto::Error_invalid_address);
+}
+
+TEST(BitcoinSigning, Plan_10input_MaxAmount) {
+    auto ownAddress = "bc1q0yy3juscd3zfavw76g4h3eqdqzda7qyf58rj4m";
+    auto ownPrivateKey = "eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf";
+
+    SigningInput input;
+
+    for (int i = 0; i < 10; ++i) {
+        auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
+        Data keyHash;
+        EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
+        EXPECT_EQ(hex(keyHash), "79091972186c449eb1ded22b78e40d009bdf0089");
+
+        auto redeemScript = Script::buildPayToPublicKeyHash(keyHash);
+        input.scripts[std::string(keyHash.begin(), keyHash.end())] = redeemScript;
+
+        UTXO utxo;
+        utxo.script = utxoScript;
+        utxo.amount = 1'000'000 + i * 10'000;
+        auto hash = parse_hex("a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407");
+        std::reverse(hash.begin(), hash.end());
+        utxo.outPoint = OutPoint(hash, 0, UINT32_MAX);
+        input.utxos.push_back(utxo);
+    }
+
+    input.coinType = TWCoinTypeBitcoin;
+    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
+    input.useMaxAmount = true;
+    input.amount = 2'000'000;
+    input.byteFee = 1;
+    input.toAddress = "bc1qauwlpmzamwlf9tah6z4w0t8sunh6pnyyjgk0ne";
+    input.changeAddress = ownAddress;
+
+    // Plan.
+    // Estimated size: witness size: 10 * (1 + 1 + 72 + 1 + 33) + 2 = 1082; base 451; raw 451 + 1082 = 1533; vsize 451 + 1082/4 --> 722
+    // Actual size:    witness size:                                  1078; base 451; raw 451 + 1078 = 1529; vsize 451 + 1078/4 --> 721
+    auto plan = TransactionBuilder::plan(input);
+    EXPECT_TRUE(verifyPlan(plan, {1'000'000, 1'010'000, 1'020'000, 1'030'000, 1'040'000, 1'050'000, 1'060'000, 1'070'000, 1'080'000, 1'090'000}, 10'449'278, 722));
+
+    // Extend input with keys, reuse plan, Sign
+    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
+    input.privateKeys.push_back(privKey);
+    input.plan = plan;
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{1529, 451, 721}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+
+    ASSERT_EQ(serialized.size(), 1529ul);
+}
+
+TEST(BitcoinSigning, Sign_LitecoinReal_a85f) {
+    auto coin = TWCoinTypeLitecoin;
+    auto ownAddress = "ltc1qt36tu30tgk35tyzsve6jjq3dnhu2rm8l8v5q00";
+    auto ownPrivateKey = "b820f41f96c8b7442f3260acd23b3897e1450b8c7c6580136a3c2d3a14e34674";
+
+    // Setup input
+    SigningInput input;
+    input.coinType = coin;
+    input.hashType = hashTypeForCoin(coin);
+    input.amount = 3'899'774;
+    input.useMaxAmount = true;
+    input.byteFee = 1;
+    input.toAddress = "ltc1q0dvup9kzplv6yulzgzzxkge8d35axkq4n45hum";
+    input.changeAddress = ownAddress;
+
+    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
+    input.privateKeys.push_back(privKey);
+
+    auto utxo0Script = Script::lockScriptForAddress(ownAddress, coin);
+    Data keyHash0;
+    EXPECT_TRUE(utxo0Script.matchPayToWitnessPublicKeyHash(keyHash0));
+    EXPECT_EQ(hex(keyHash0), "5c74be45eb45a3459050667529022d9df8a1ecff");
+
+    auto redeemScript = Script::buildPayToPublicKeyHash(keyHash0);
+    input.scripts[std::string(keyHash0.begin(), keyHash0.end())] = redeemScript;
+
+    UTXO utxo0;
+    utxo0.script = utxo0Script;
+    utxo0.amount = 3'900'000;
+    auto hash0 = parse_hex("7051cd18189401a844abf0f9c67e791315c4c154393870453f8ad98a818efdb5");
+    std::reverse(hash0.begin(), hash0.end());
+    utxo0.outPoint = OutPoint(hash0, 9, UINT32_MAX - 1);
+    input.utxos.push_back(utxo0);
+
+    // set plan, to match real tx
+    TransactionPlan plan;
+    plan.availableAmount = 3'900'000;
+    plan.amount = 3'899'774;
+    plan.fee = 226;
+    plan.change = 0;
+    plan.utxos.push_back(input.utxos[0]);
+    input.plan = plan;
+    EXPECT_TRUE(verifyPlan(input.plan.value(), {3'900'000}, 3'899'774, 226));
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+
+    // https://blockchair.com/litecoin/transaction/a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "b5fd8e818ad98a3f4570383954c1c41513797ec6f9f0ab44a801941818cd5170"  "09000000"  "00"  ""  "feffffff"
+        "01" // outputs
+            "7e813b0000000000"  "16"  "00147b59c096c20fd9a273e240846b23276c69d35815"
+        // witness
+            "02"
+                "47"  "3044022029153096af176f9cca0ba9b827e947689a8bb8d11dda570c880f9108bc590b3002202410c78b666722ade1ef4547ad85a128ddcbd4695c40f942457bea3d043b9bb301"
+                "21"  "036739829f2cfec79cfe6aaf1c22ecb7d4867dfd8ab4deb7121b36a00ab646caed"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, PlanAndSign_LitecoinReal_8435) {
+    auto coin = TWCoinTypeLitecoin;
+    auto ownAddress = "ltc1q0dvup9kzplv6yulzgzzxkge8d35axkq4n45hum";
+    auto ownPrivateKey = "690b34763f34e0226ad2a4d47098269322e0402f847c97166e8f39959fcaff5a";
+
+    // Setup input for Plan
+    SigningInput input;
+    input.coinType = coin;
+    input.hashType = hashTypeForCoin(coin);
+    input.amount = 1'200'000;
+    input.useMaxAmount = false;
+    input.byteFee = 1;
+    input.toAddress = "ltc1qt36tu30tgk35tyzsve6jjq3dnhu2rm8l8v5q00";
+    input.changeAddress = ownAddress;
+
+    auto utxo0Script = Script::lockScriptForAddress(ownAddress, coin);
+    Data keyHash0;
+    EXPECT_TRUE(utxo0Script.matchPayToWitnessPublicKeyHash(keyHash0));
+    EXPECT_EQ(hex(keyHash0), "7b59c096c20fd9a273e240846b23276c69d35815");
+
+    auto redeemScript = Script::buildPayToPublicKeyHash(keyHash0);
+    input.scripts[std::string(keyHash0.begin(), keyHash0.end())] = redeemScript;
+
+    UTXO utxo0;
+    utxo0.script = utxo0Script;
+    utxo0.amount = 3'899'774;
+    auto hash0 = parse_hex("a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407");
+    std::reverse(hash0.begin(), hash0.end());
+    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    // Plan
+    auto plan = TransactionBuilder::plan(input);
+    EXPECT_TRUE(verifyPlan(plan, {3'899'774}, 1'200'000, 141));
+
+    // Extend input with keys and plan, for Sign
+    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
+    input.privateKeys.push_back(privKey);
+    input.plan = plan;
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{222, 113, 141}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+
+    // https://blockchair.com/litecoin/transaction/8435d205614ee70066060734adf03af4194d0c3bc66dd01bb124ab7fd25e2ef8
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8"  "00000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "804f120000000000"  "16"  "00145c74be45eb45a3459050667529022d9df8a1ecff"
+            "7131290000000000"  "16"  "00147b59c096c20fd9a273e240846b23276c69d35815"
+        // witness
+            "02"
+                "47"  "304402204139b82927dd80445f27a5d2c29fa4881dbd2911714452a4a706145bc43cc4bf022016fbdf4b09bc5a9c43e79edb1c1061759779a20c35535082bdc469a61ed0771f01"
+                "21"  "02499e327a05cc8bb4b3c34c8347ecfcb152517c9927c092fa273be5379fde3226"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, Sign_ManyUtxos_400) {
+    auto ownAddress = "bc1q0yy3juscd3zfavw76g4h3eqdqzda7qyf58rj4m";
+    auto ownPrivateKey = "eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf";
+
+    // Setup input
+    SigningInput input;
+
+    const auto n = 400;
+    uint64_t utxoSum = 0;
+    for (int i = 0; i < n; ++i) {
+        auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
+        Data keyHash;
+        EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
+        EXPECT_EQ(hex(keyHash), "79091972186c449eb1ded22b78e40d009bdf0089");
+
+        auto redeemScript = Script::buildPayToPublicKeyHash(keyHash);
+        input.scripts[std::string(keyHash.begin(), keyHash.end())] = redeemScript;
+
+        UTXO utxo;
+        utxo.script = utxoScript;
+        utxo.amount = 1000 + (i + 1) * 10;
+        auto hash = parse_hex("a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407");
+        std::reverse(hash.begin(), hash.end());
+        utxo.outPoint = OutPoint(hash, 0, UINT32_MAX);
+        input.utxos.push_back(utxo);
+        utxoSum += utxo.amount;
+    }
+    EXPECT_EQ(utxoSum, 1'202'000ul);
+
+    input.coinType = TWCoinTypeBitcoin;
+    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
+    input.useMaxAmount = false;
+    input.amount = 300'000;
+    input.byteFee = 1;
+    input.toAddress = "bc1qauwlpmzamwlf9tah6z4w0t8sunh6pnyyjgk0ne";
+    input.changeAddress = ownAddress;
+
+    // Plan
+    auto plan = TransactionBuilder::plan(input);
+
+    // expected result: 66 utxos, with the largest amounts
+    std::vector<int64_t> subset;
+    uint64_t subsetSum = 0;
+    for (int i = n - 66; i < n; ++i) {
+        const uint64_t val = 1000 + (i + 1) * 10;
+        subset.push_back(val);
+        subsetSum += val;
+    }
+    EXPECT_EQ(subset.size(), 66ul);
+    EXPECT_EQ(subsetSum, 308'550ul);
+    EXPECT_TRUE(verifyPlan(plan, subset, 300'000, 4'561));
+
+    // Extend input with keys, reuse plan, Sign
+    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
+    input.privateKeys.push_back(privKey);
+    input.plan = plan;
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+
+    EXPECT_EQ(serialized.size(), 9871ul);
+}
+
+TEST(BitcoinSigning, Sign_ManyUtxos_2000) {
+    auto ownAddress = "bc1q0yy3juscd3zfavw76g4h3eqdqzda7qyf58rj4m";
+    auto ownPrivateKey = "eb696a065ef48a2192da5b28b694f87544b30fae8327c4510137a922f32c6dcf";
+
+    // Setup input
+    SigningInput input;
+
+    const auto n = 2000;
+    uint64_t utxoSum = 0;
+    for (int i = 0; i < n; ++i) {
+        auto utxoScript = Script::lockScriptForAddress(ownAddress, TWCoinTypeBitcoin);
+        Data keyHash;
+        EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
+        EXPECT_EQ(hex(keyHash), "79091972186c449eb1ded22b78e40d009bdf0089");
+
+        auto redeemScript = Script::buildPayToPublicKeyHash(keyHash);
+        input.scripts[std::string(keyHash.begin(), keyHash.end())] = redeemScript;
+
+        UTXO utxo;
+        utxo.script = utxoScript;
+        utxo.amount = 1000 + (i + 1) * 10;
+        auto hash = parse_hex("a85fd6a9a7f2f54cacb57e83dfd408e51c0a5fc82885e3fa06be8692962bc407");
+        std::reverse(hash.begin(), hash.end());
+        utxo.outPoint = OutPoint(hash, 0, UINT32_MAX);
+        input.utxos.push_back(utxo);
+        utxoSum += utxo.amount;
+    }
+    EXPECT_EQ(utxoSum, 22'010'000ul);
+
+    input.coinType = TWCoinTypeBitcoin;
+    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
+    input.useMaxAmount = false;
+    input.amount = 2'000'000;
+    input.byteFee = 1;
+    input.toAddress = "bc1qauwlpmzamwlf9tah6z4w0t8sunh6pnyyjgk0ne";
+    input.changeAddress = ownAddress;
+
+    // Plan
+    auto plan = TransactionBuilder::plan(input);
+
+    // expected result: 601 utxos (smaller ones)
+    std::vector<int64_t> subset;
+    uint64_t subsetSum = 0;
+    for (int i = 0; i < 601; ++i) {
+        const uint64_t val = 1000 + (i + 1) * 10;
+        subset.push_back(val);
+        subsetSum += val;
+    }
+    EXPECT_EQ(subset.size(), 601ul);
+    EXPECT_EQ(subsetSum, 2'410'010ul);
+    EXPECT_TRUE(verifyPlan(plan, subset, 2'000'000, 40'943));
+
+    // Extend input with keys, reuse plan, Sign
+    auto privKey = PrivateKey(parse_hex(ownPrivateKey));
+    input.privateKeys.push_back(privKey);
+    input.plan = plan;
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+
+    EXPECT_EQ(serialized.size(), 89'339ul);
+}
+
+TEST(BitcoinSigning, EncodeThreeOutput) {
+    auto coin = TWCoinTypeLitecoin;
+    auto ownAddress = "ltc1qt36tu30tgk35tyzsve6jjq3dnhu2rm8l8v5q00";
+    auto ownPrivateKey = "b820f41f96c8b7442f3260acd23b3897e1450b8c7c6580136a3c2d3a14e34674";
+    auto toAddress0 = "ltc1qgknskahmm6svn42e33gum5wc4dz44wt9vc76q4";
+    auto toAddress1 = "ltc1qulgtqdgxyd9nxnn5yxft6jykskz0ffl30nu32z";
+    auto utxo0Amount = 3'851'829;
+    auto toAmount0 = 1'000'000;
+    auto toAmount1 = 2'000'000;
+
+    auto unsignedTx = Transaction(1);
+
+    auto hash0 = parse_hex("bbe736ada63c4678025dff0ff24d5f38970a3e4d7a2f77808689ed68004f55fe");
+    std::reverse(hash0.begin(), hash0.end());
+    auto outpoint0 = TW::Bitcoin::OutPoint(hash0, 0);
+    unsignedTx.inputs.emplace_back(outpoint0, Script(), UINT32_MAX);
+
+    auto lockingScript0 = Script::lockScriptForAddress(toAddress0, coin);
+    unsignedTx.outputs.emplace_back(toAmount0, lockingScript0);
+    auto lockingScript1 = Script::lockScriptForAddress(toAddress1, coin);
+    unsignedTx.outputs.emplace_back(toAmount1, lockingScript1);
+    // change
+    auto lockingScript2 = Script::lockScriptForAddress(ownAddress, coin);
+    unsignedTx.outputs.emplace_back(utxo0Amount - toAmount0 - toAmount1 - 172, lockingScript2);
+
+    Data unsignedData;
+    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
+    EXPECT_EQ(unsignedData.size(), 147ul);
+    EXPECT_EQ(hex(unsignedData), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "fe554f0068ed898680772f7a4d3e0a97385f4df20fff5d0278463ca6ad36e7bb"  "00000000"  "00"  ""  "ffffffff"
+        "03" // outputs
+            "40420f0000000000"  "16"  "001445a70b76fbdea0c9d5598c51cdd1d8ab455ab965"
+            "80841e0000000000"  "16"  "0014e7d0b03506234b334e742192bd48968584f4a7f1"
+            "c9fe0c0000000000"  "16"  "00145c74be45eb45a3459050667529022d9df8a1ecff"
+        // witness
+            "00"
+        "00000000" // nLockTime
+    );
+
+    // add signature
+
+    auto privkey = PrivateKey(parse_hex(ownPrivateKey));
+    auto pubkey = PrivateKey(privkey).getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(hex(pubkey.bytes), "036739829f2cfec79cfe6aaf1c22ecb7d4867dfd8ab4deb7121b36a00ab646caed");
+
+    auto utxo0Script = Script::lockScriptForAddress(ownAddress, coin); // buildPayToV0WitnessProgram()
+    Data keyHashIn0;
+    EXPECT_TRUE(utxo0Script.matchPayToWitnessPublicKeyHash(keyHashIn0));
+    EXPECT_EQ(hex(keyHashIn0), "5c74be45eb45a3459050667529022d9df8a1ecff");
+
+    auto redeemScript0 = Script::buildPayToPublicKeyHash(keyHashIn0);
+    EXPECT_EQ(hex(redeemScript0.bytes), "76a9145c74be45eb45a3459050667529022d9df8a1ecff88ac");
+
+    auto hashType = TWBitcoinSigHashType::TWBitcoinSigHashTypeAll;
+    Data sighash = unsignedTx.getSignatureHash(redeemScript0, unsignedTx.inputs[0].previousOutput.index,
+                                               hashType, utxo0Amount, static_cast<SignatureVersion>(unsignedTx._version));
+    auto sig = privkey.signAsDER(sighash);
+    ASSERT_FALSE(sig.empty());
+    sig.push_back(hashType);
+    EXPECT_EQ(hex(sig), "30450221008d88197a37ffcb51ecacc7e826aa588cb1068a107a82373c4b54ec42318a395c02204abbf5408504614d8f943d67e7873506c575e85a5e1bd92a02cd345e5192a82701");
+
+    // add witness stack
+    unsignedTx.inputs[0].scriptWitness.push_back(sig);
+    unsignedTx.inputs[0].scriptWitness.push_back(pubkey.bytes);
+
+    unsignedData.clear();
+    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
+    EXPECT_EQ(unsignedData.size(), 254ul);
+    // https://blockchair.com/litecoin/transaction/9e3fe98565a904d2da5ec1b3ba9d2b3376dfc074f43d113ce1caac01bf51b34c
+    EXPECT_EQ(hex(unsignedData), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "fe554f0068ed898680772f7a4d3e0a97385f4df20fff5d0278463ca6ad36e7bb"  "00000000"  "00"  ""  "ffffffff"
+        "03" // outputs
+            "40420f0000000000"  "16"  "001445a70b76fbdea0c9d5598c51cdd1d8ab455ab965"
+            "80841e0000000000"  "16"  "0014e7d0b03506234b334e742192bd48968584f4a7f1"
+            "c9fe0c0000000000"  "16"  "00145c74be45eb45a3459050667529022d9df8a1ecff"
+        // witness
+            "02"
+                "48"  "30450221008d88197a37ffcb51ecacc7e826aa588cb1068a107a82373c4b54ec42318a395c02204abbf5408504614d8f943d67e7873506c575e85a5e1bd92a02cd345e5192a82701"
+                "21"  "036739829f2cfec79cfe6aaf1c22ecb7d4867dfd8ab4deb7121b36a00ab646caed"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, RedeemExtendedPubkeyUTXO) {
+    auto wif = "L4BeKzm3AHDUMkxLRVKTSVxkp6Hz9FcMQPh18YCKU1uioXfovzwP";
+    auto decoded = Base58::decodeCheck(wif);
+    auto key = PrivateKey(Data(decoded.begin() + 1, decoded.begin() + 33));
+    auto pubkey = key.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    auto hash = Hash::sha256ripemd(pubkey.bytes.data(), pubkey.bytes.size());
+
+    Data data;
+    append(data, 0x00);
+    append(data, hash);
+    auto address = Bitcoin::Address(data);
+    auto addressString = address.string();
+
+    EXPECT_EQ(addressString, "1PAmpW5igXUJnuuzRa5yTcsWHwBamZG7Y2");
+
+    // Setup input for Plan
+    SigningInput input;
+    input.coinType = TWCoinTypeBitcoin;
+    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
+    input.amount = 26972;
+    input.useMaxAmount = true;
+    input.byteFee = 1;
+    input.toAddress = addressString;
+
+    auto utxo0Script = Script::lockScriptForAddress(addressString, TWCoinTypeBitcoin);
+
+    UTXO utxo0;
+    utxo0.script = utxo0Script;
+    utxo0.amount = 16874;
+    auto hash0 = parse_hex("6ae3f1d245521b0ea7627231d27d613d58c237d6bf97a1471341a3532e31906c");
+    std::reverse(hash0.begin(), hash0.end());
+    utxo0.outPoint = OutPoint(hash0, 0, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    UTXO utxo1;
+    utxo1.script = utxo0Script;
+    utxo1.amount = 10098;
+    auto hash1 = parse_hex("fd1ea8178228e825d4106df0acb61a4fb14a8f04f30cd7c1f39c665c9427bf13");
+    std::reverse(hash1.begin(), hash1.end());
+    utxo1.outPoint = OutPoint(hash1, 0, UINT32_MAX);
+    input.utxos.push_back(utxo1);
+
+    input.privateKeys.push_back(key);
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data encoded;
+    signedTx.encode(encoded);
+    EXPECT_EQ(encoded.size(), 402ul);
+}
+
+TEST(BitcoinSigning, SignP2TR_5df51e) {
+    const auto privateKey = "13fcaabaf9e71ffaf915e242ec58a743d55f102cf836968e5bd4881135e0c52c";
+    const auto ownAddress = "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8";
+    const auto toAddress = "bc1ptmsk7c2yut2xah4pgflpygh2s7fh0cpfkrza9cjj29awapv53mrslgd5cf"; // Taproot
+    const auto coin = TWCoinTypeBitcoin;
+
+    // Setup input
+    SigningInput input;
+    input.hashType = hashTypeForCoin(coin);
+    input.amount = 1100;
+    input.useMaxAmount = false;
+    input.byteFee = 1;
+    input.toAddress = toAddress;
+    input.changeAddress = ownAddress;
+    input.coinType = coin;
+
+    auto utxoKey0 = PrivateKey(parse_hex(privateKey));
+    auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(hex(pubKey0.bytes), "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee");
+    EXPECT_EQ(SegwitAddress(pubKey0, "bc").string(), ownAddress);
+    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(pubKey0.bytes));
+    EXPECT_EQ(hex(utxoPubkeyHash), "0cb9f5c6b62c03249367bc20a90dd2425e6926af");
+    input.privateKeys.push_back(utxoKey0);
+
+    auto redeemScript = Script::lockScriptForAddress(input.toAddress, coin);
+    EXPECT_EQ(hex(redeemScript.bytes), "51205ee16f6144e2d46edea1427e1222ea879377e029b0c5d2e252517aee85948ec7");
+    auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
+    EXPECT_EQ(hex(scriptHash), "e0a5001e7b394a1a6b2978cdcab272241280bf46");
+    input.scripts[hex(scriptHash)] = redeemScript;
+
+    UTXO utxo0;
+    auto utxo0Script = Script::lockScriptForAddress(ownAddress, coin);
+    EXPECT_EQ(hex(utxo0Script.bytes), "00140cb9f5c6b62c03249367bc20a90dd2425e6926af");
+    utxo0.script = utxo0Script;
+    utxo0.amount = 49429;
+    auto hash0 = parse_hex("c24bd72e3eaea797bd5c879480a0db90980297bc7085efda97df2bf7d31413fb");
+    std::reverse(hash0.begin(), hash0.end());
+    utxo0.outPoint = OutPoint(hash0, 1, UINT32_MAX);
+    input.utxos.push_back(utxo0);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {49429}, 1100, 153));
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{234, 125, 153}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    // https://mempool.space/tx/5df51e13bfeb79f386e1e17237f06d1b5c87c5bfcaa907c0c1cfe51cd7ca446d
+    EXPECT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "fb1314d3f72bdf97daef8570bc97029890dba08094875cbd97a7ae3e2ed74bc2"  "01000000"  "00"  ""  "ffffffff"
+        "02" // outputs
+            "4c04000000000000"  "22"  "51205ee16f6144e2d46edea1427e1222ea879377e029b0c5d2e252517aee85948ec7"
+            "30bc000000000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
+        // witness
+            "02"
+                "47"  "3044022021cea91157fdab33226e38ee7c1a686538fc323f5e28feb35775cf82ba8c62210220723743b150cea8ead877d8b8d059499779a5df69f9bdc755c9f968c56cfb528f01"
+                "21"  "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
+        "00000000" // nLockTime
+    );
+}
+
+TEST(BitcoinSigning, Build_OpReturn_THORChainSwap_eb4c) {
+    auto coin = TWCoinTypeBitcoin;
+    auto ownAddress = "bc1q7s0a2l4aguksehx8hf93hs9yggl6njxds6m02g";
+    auto toAddress = "bc1qxu5a8gtnjxw3xwdlmr2gl9d76h9fysu3zl656e";
+    auto utxoAmount = 342101;
+    auto toAmount = 300000;
+    int fee = 36888;
+
+    auto unsignedTx = Transaction(2, 0);
+
+    auto hash0 = parse_hex("30b82960291a39de3664ec4c844a815e3e680e29b4d3a919e450f0c119cf4e35");
+    std::reverse(hash0.begin(), hash0.end());
+    auto outpoint0 = TW::Bitcoin::OutPoint(hash0, 1);
+    unsignedTx.inputs.emplace_back(outpoint0, Script(), UINT32_MAX);
+
+    auto lockingScriptTo = Script::lockScriptForAddress(toAddress, coin);
+    unsignedTx.outputs.push_back(TransactionOutput(toAmount, lockingScriptTo));
+    // change
+    auto lockingScriptChange = Script::lockScriptForAddress(ownAddress, coin);
+    unsignedTx.outputs.push_back(TransactionOutput(utxoAmount - toAmount - fee, lockingScriptChange));
+    // memo OP_RETURN
+    Data memo = data("SWAP:THOR.RUNE:thor1tpercamkkxec0q0jk6ltdnlqvsw29guap8wmcl:");
+    auto lockingScriptOpReturn = Script::buildOpReturnScript(memo);
+    EXPECT_EQ(hex(lockingScriptOpReturn.bytes), "6a3b535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a");
+    unsignedTx.outputs.push_back(TransactionOutput(0, lockingScriptOpReturn));
+
+    Data unsignedData;
+    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
+    EXPECT_EQ(unsignedData.size(), 186ul);
+    EXPECT_EQ(hex(unsignedData), // printed using prettyPrintTransaction
+        "02000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "354ecf19c1f050e419a9d3b4290e683e5e814a844cec6436de391a296029b830"  "01000000"  "00"  ""  "ffffffff"
+        "03" // outputs
+            "e093040000000000"  "16"  "00143729d3a173919d1339bfd8d48f95bed5ca924391"
+            "5d14000000000000"  "16"  "0014f41fd57ebd472d0cdcc7ba4b1bc0a4423fa9c8cd"
+            "0000000000000000"  "3d"  "6a3b535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a"
+        // witness
+            "00"
+        "00000000" // nLockTime
+    );
+
+    // add signature
+    auto pubkey = parse_hex("0206121b83ebfddbb1997b50cb87b968190857269333e21e295142c8b88af9312a");
+    auto sig = parse_hex("3045022100876eba8f9324d3fbb00b9dad9a34a8166dd75127d4facda63484c19703e9c178022052495a6229cc465d5f0fcf3cde3b22a0f861e762d0bb10acde26a57598bfe7e701");
+
+    // add witness stack
+    unsignedTx.inputs[0].scriptWitness.push_back(sig);
+    unsignedTx.inputs[0].scriptWitness.push_back(pubkey);
+
+    unsignedData.clear();
+    unsignedTx.encode(unsignedData, Transaction::SegwitFormatMode::Segwit);
+    EXPECT_EQ(unsignedData.size(), 293ul);
+    // https://blockchair.com/bitcoin/transaction/eb4c1b064bfaf593d7cc6a5c73b75f932ffefe12a0478acf5a7e3145476683fc
+    EXPECT_EQ(hex(unsignedData),
+        "02000000000101354ecf19c1f050e419a9d3b4290e683e5e814a844cec6436de391a296029b8300100000000ffffffff03e0930400000000001600143729d3a1"
+        "73919d1339bfd8d48f95bed5ca9243915d14000000000000160014f41fd57ebd472d0cdcc7ba4b1bc0a4423fa9c8cd00000000000000003d6a3b535741503a54"
+        "484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a02483045022100876eba8f"
+        "9324d3fbb00b9dad9a34a8166dd75127d4facda63484c19703e9c178022052495a6229cc465d5f0fcf3cde3b22a0f861e762d0bb10acde26a57598bfe7e70121"
+        "0206121b83ebfddbb1997b50cb87b968190857269333e21e295142c8b88af9312a00000000"
+    );
+}
+
+TEST(BitcoinSigning, Sign_OpReturn_THORChainSwap) {
+    PrivateKey privateKey = PrivateKey(parse_hex("6bd4096fa6f08bd3af2b437244ba0ca2d35045c5233b8d6796df37e61e974de5"));
+    PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto ownAddress = SegwitAddress(publicKey, "bc");
+    auto ownAddressString = ownAddress.string();
+    EXPECT_EQ(ownAddressString, "bc1q2gzg42w98ytatvmsgxfc8vrg6l24c25pydup9u");
+    auto toAddress = "bc1qxu5a8gtnjxw3xwdlmr2gl9d76h9fysu3zl656e";
+    auto utxoAmount = 342101;
+    auto toAmount = 300000;
+    int byteFee = 126;
+    Data memo = data("SWAP:THOR.RUNE:thor1tpercamkkxec0q0jk6ltdnlqvsw29guap8wmcl:");
+
+    SigningInput input;
+    input.coinType = TWCoinTypeBitcoin;
+    input.hashType = hashTypeForCoin(TWCoinTypeBitcoin);
+    input.amount = toAmount;
+    input.byteFee = byteFee;
+    input.toAddress = toAddress;
+    input.changeAddress = ownAddressString;
+
+    input.privateKeys.push_back(privateKey);
+    input.outputOpReturn = memo;
+
+    UTXO utxo;
+    auto utxoHash = parse_hex("30b82960291a39de3664ec4c844a815e3e680e29b4d3a919e450f0c119cf4e35");
+    std::reverse(utxoHash.begin(), utxoHash.end());
+    utxo.outPoint = OutPoint(utxoHash, 1, UINT32_MAX);
+    utxo.amount = utxoAmount;
+
+    auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(publicKey.bytes));
+    EXPECT_EQ(hex(utxoPubkeyHash), "52048aa9c53917d5b370419383b068d7d55c2a81");
+    auto utxoScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
+    EXPECT_EQ(hex(utxoScript.bytes), "001452048aa9c53917d5b370419383b068d7d55c2a81");
+    utxo.script = utxoScript;
+    input.utxos.push_back(utxo);
+
+    {
+        // test plan (but do not reuse plan result)
+        auto plan = TransactionBuilder::plan(input);
+        EXPECT_TRUE(verifyPlan(plan, {342101}, 300000, 26586));
+        EXPECT_EQ(plan.outputOpReturn.size(), 59ul);
+    }
+
+    // Sign
+    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    EXPECT_EQ(getEncodedTxSize(signedTx), (EncodedTxSize{293, 183, 211}));
+    EXPECT_TRUE(validateEstimatedSize(signedTx, -1, 1));
+    ASSERT_EQ(hex(serialized), // printed using prettyPrintTransaction
+        "01000000" // version
+        "0001" // marker & flag
+        "01" // inputs
+            "354ecf19c1f050e419a9d3b4290e683e5e814a844cec6436de391a296029b830"  "01000000"  "00"  ""  "ffffffff"
+        "03" // outputs
+            "e093040000000000"  "16"  "00143729d3a173919d1339bfd8d48f95bed5ca924391"
+            "9b3c000000000000"  "16"  "001452048aa9c53917d5b370419383b068d7d55c2a81"
+            "0000000000000000"  "3d"  "6a3b535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a"
+        // witness
+            "02"
+                "48"  "3045022100ff6c0aaef512aa52f3036161bfbcef39046ac89eb9617fa461a0c9c43fe45eb3022055d208d3f81736e72e3ad8ef761dc79ac5dd3dc00721174bc69db416a74960e301"
+                "21"  "02c2e5c8b4927812fb37444a7862466ad23978a4ac626f8eaf93e1d1a60d6abb80"
+        "00000000" // nLockTime
+    );
+}
+// clang-format on
+} // namespace TW::Bitcoin
diff --git a/tests/Bitcoin/TWBitcoinTransactionTests.cpp b/tests/chains/Bitcoin/TWBitcoinTransactionTests.cpp
similarity index 86%
rename from tests/Bitcoin/TWBitcoinTransactionTests.cpp
rename to tests/chains/Bitcoin/TWBitcoinTransactionTests.cpp
index 8df4be05c54..712595ce63e 100644
--- a/tests/Bitcoin/TWBitcoinTransactionTests.cpp
+++ b/tests/chains/Bitcoin/TWBitcoinTransactionTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bitcoin/Transaction.h"
 #include "HexCoding.h"
diff --git a/tests/chains/Bitcoin/TWCoinTypeTests.cpp b/tests/chains/Bitcoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6b5d718b593
--- /dev/null
+++ b/tests/chains/Bitcoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBitcoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBitcoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0607f62530b68cfcc91c57a1702841dd399a899d0eecda8e31ecca3f52f01df2"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBitcoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("17A16QmavnUfCW11DAApiJxp7ARnxN5pGX"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBitcoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBitcoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBitcoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBitcoin), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeBitcoin));
+    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeBitcoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBitcoin));
+    assertStringsEqual(symbol, "BTC");
+    assertStringsEqual(txUrl, "https://mempool.space/tx/0607f62530b68cfcc91c57a1702841dd399a899d0eecda8e31ecca3f52f01df2");
+    assertStringsEqual(accUrl, "https://mempool.space/address/17A16QmavnUfCW11DAApiJxp7ARnxN5pGX");
+    assertStringsEqual(id, "bitcoin");
+    assertStringsEqual(name, "Bitcoin");
+}
diff --git a/tests/chains/Bitcoin/TWSegwitAddressTests.cpp b/tests/chains/Bitcoin/TWSegwitAddressTests.cpp
new file mode 100644
index 00000000000..4adf19e4250
--- /dev/null
+++ b/tests/chains/Bitcoin/TWSegwitAddressTests.cpp
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include "Data.h"
+#include "HexCoding.h"
+#include <TrustWalletCore/TWPublicKey.h>
+#include <TrustWalletCore/TWSegwitAddress.h>
+
+#include <gtest/gtest.h>
+
+const char* address1 = "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4";
+const char* address2 = "bc1qr583w2swedy2acd7rung055k8t3n7udp7vyzyg";
+const char* address3Taproot = "bc1ptmsk7c2yut2xah4pgflpygh2s7fh0cpfkrza9cjj29awapv53mrslgd5cf";
+
+TEST(TWSegwitAddress, CreateAndDelete) {
+    {
+        TWSegwitAddress* addr = TWSegwitAddressCreateWithString(STRING(address1).get());
+        EXPECT_TRUE(addr != nullptr);
+        TWSegwitAddressDelete(addr);
+    }
+    {
+        auto pkData = DATA("0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798");
+        auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(pkData.get(), TWPublicKeyTypeSECP256k1));
+        TWSegwitAddress* addr = TWSegwitAddressCreateWithPublicKey(TWHRPBitcoin, publicKey.get());
+        EXPECT_TRUE(addr != nullptr);
+        TWSegwitAddressDelete(addr);
+    }
+}
+
+TEST(TWSegwitAddress, PublicKeyToAddress) {
+    auto pkData = DATA("0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798");
+    auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(pkData.get(), TWPublicKeyTypeSECP256k1));
+
+    auto address = WRAP(TWSegwitAddress, TWSegwitAddressCreateWithPublicKey(TWHRPBitcoin, publicKey.get()));
+    auto string = WRAPS(TWSegwitAddressDescription(address.get()));
+
+    ASSERT_STREQ(address1, TWStringUTF8Bytes(string.get()));
+
+    auto str = STRING(address1);
+    auto addr = WRAP(TWSegwitAddress, TWSegwitAddressCreateWithString(string.get()));
+    ASSERT_TRUE(TWSegwitAddressEqual(address.get(), addr.get()));
+}
+
+TEST(TWSegwitAddress, InitWithAddress) {
+    auto string = STRING(address1);
+    ASSERT_TRUE(TWSegwitAddressIsValidString(string.get()));
+
+    auto address = WRAP(TWSegwitAddress, TWSegwitAddressCreateWithString(string.get()));
+    auto description = WRAPS(TWSegwitAddressDescription(address.get()));
+
+    ASSERT_TRUE(address.get() != nullptr);
+    ASSERT_STREQ(address1, TWStringUTF8Bytes(description.get()));
+
+    ASSERT_EQ(0, TWSegwitAddressWitnessVersion(address.get()));
+
+    ASSERT_EQ(TWHRPBitcoin, TWSegwitAddressHRP(address.get()));
+
+    auto witness = WRAPD(TWSegwitAddressWitnessProgram(address.get()));
+    ASSERT_EQ(TW::hex(TW::data(TWDataBytes(witness.get()), TWDataSize(witness.get()))), "751e76e8199196d454941c45d1b3a323f1433bd6");
+}
+
+TEST(TWSegwitAddress, TaprootString) {
+    const auto string = STRING(address3Taproot);
+    const auto address = WRAP(TWSegwitAddress, TWSegwitAddressCreateWithString(string.get()));
+    ASSERT_TRUE(address.get() != nullptr);
+
+    const auto description = WRAPS(TWSegwitAddressDescription(address.get()));
+    ASSERT_STREQ(address3Taproot, TWStringUTF8Bytes(description.get()));
+
+    ASSERT_EQ(1, TWSegwitAddressWitnessVersion(address.get())); // taproot has segwit version 1
+
+    ASSERT_EQ(TWHRPBitcoin, TWSegwitAddressHRP(address.get()));
+}
+
+TEST(TWSegwitAddress, InvalidAddress) {
+    std::vector<std::shared_ptr<TWString>> strings = {
+        STRING("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t5"),
+        STRING("bc1rw5uspcuh"),
+        STRING("bc10w508d6qejxtdg4y5r3zarvary0c5xw7kw508d6qejxtdg4y5r3zarvary0c5xw7kw5rljs90"),
+        STRING("BC1QR508D6QEJXTDG4Y5R3ZARVARYV98GJ9P"),
+        STRING("tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3q0sL5k7"),
+        STRING("bc1zw508d6qejxtdg4y5r3zarvaryvqyzf3du"),
+        STRING("tb1qrp33g0q5c5txsp9arysrx4k6zdkfs4nce4xj0gdcccefvpysxf3pjxtptv"),
+        STRING("bc1gmk9yu"),
+    };
+    for (auto& string : strings) {
+        ASSERT_TRUE(TWSegwitAddressCreateWithString(string.get()) == nullptr) << "Invalid address '" << TWStringUTF8Bytes(string.get()) << "' reported as valid.";
+    }
+}
diff --git a/tests/chains/Bitcoin/TransactionCompilerTests.cpp b/tests/chains/Bitcoin/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..fd1aeb639c6
--- /dev/null
+++ b/tests/chains/Bitcoin/TransactionCompilerTests.cpp
@@ -0,0 +1,374 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Bitcoin/Script.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "Bitcoin/TransactionInput.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+
+#include "TxComparisonHelper.h"
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+const static uint64_t ONE_BTC = 100'000'000ll;
+
+TEST(BitcoinCompiler, CompileWithSignatures) {
+    // Test external signining with a Bircoin transaction with 3 input UTXOs, all used, but only
+    // using 2 public keys. Three signatures are neeeded.  This illustrates that order of
+    // UTXOs/hashes is not always the same.
+
+    const auto revUtxoHash0 =
+        parse_hex("07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8");
+    const auto revUtxoHash1 =
+        parse_hex("d6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e");
+    const auto revUtxoHash2 =
+        parse_hex("6021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d");
+    const auto inPubKey0 =
+        parse_hex("024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382");
+    const auto inPubKey1 =
+        parse_hex("0217142f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc");
+    const auto inPubKeyHash0 = parse_hex("bd92088bb7e82d611a9b94fbb74a0908152b784f");
+    const auto inPubKeyHash1 = parse_hex("6641abedacf9483b793afe1718689cc9420bbb1c");
+
+    // Input UTXO infos
+    struct UtxoInfo {
+        Data revUtxoHash;
+        Data publicKey;
+        long amount;
+        int index;
+    };
+    std::vector<UtxoInfo> utxoInfos = {
+        // first
+        UtxoInfo{revUtxoHash0, inPubKey0, 600'000, 0},
+        // second UTXO, with same pubkey
+        UtxoInfo{revUtxoHash1, inPubKey0, 500'000, 1},
+        // third UTXO, with different pubkey
+        UtxoInfo{revUtxoHash2, inPubKey1, 400'000, 0},
+    };
+
+    // Signature infos, indexed by pubkeyhash+hash
+    struct SignatureInfo {
+        Data signature;
+        Data publicKey;
+    };
+    std::map<std::string, SignatureInfo> signatureInfos = {
+        {hex(inPubKeyHash0) + "+" +
+             "a296bead4172007be69b21971a790e076388666c162a9505698415f1b003ebd7",
+         {
+             parse_hex("304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b349022"
+                       "00a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a40"),
+             inPubKey0,
+         }},
+        {hex(inPubKeyHash1) + "+" +
+             "505f527f00e15fcc5a2d2416c9970beb57dfdfaca99e572a01f143b24dd8fab6",
+         {
+             parse_hex("3044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e37966414fe11582022"
+                       "0646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e4"),
+             inPubKey1,
+         }},
+        {hex(inPubKeyHash0) + "+" +
+             "60ed6e9371e5ddc72fd88e46a12cb2f68516ebd307c0fd31b1b55cf767272101",
+         {
+             parse_hex("30440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b1022"
+                       "07e777f7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc"),
+             inPubKey0,
+         }},
+    };
+
+    const auto coin = TWCoinTypeBitcoin;
+    const auto ownAddress = "bc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z00ppggv";
+
+    // Setup input for Plan
+    Bitcoin::Proto::SigningInput signingInput;
+    signingInput.set_coin_type(coin);
+    signingInput.set_hash_type(TWBitcoinSigHashTypeAll);
+    signingInput.set_amount(1'200'000);
+    signingInput.set_use_max_amount(false);
+    signingInput.set_byte_fee(1);
+    signingInput.set_to_address("bc1q2dsdlq3343vk29runkgv4yc292hmq53jedfjmp");
+    signingInput.set_change_address(ownAddress);
+
+    // process UTXOs
+    int count = 0;
+    for (auto& u : utxoInfos) {
+        const auto publicKey = PublicKey(u.publicKey, TWPublicKeyTypeSECP256k1);
+        const auto address = Bitcoin::SegwitAddress(publicKey, "bc");
+        if (count == 0)
+            EXPECT_EQ(address.string(), ownAddress);
+        if (count == 1)
+            EXPECT_EQ(address.string(), ownAddress);
+        if (count == 2)
+            EXPECT_EQ(address.string(), "bc1qveq6hmdvl9yrk7f6lct3s6yue9pqhwcuxedggg");
+
+        const auto utxoScript = Bitcoin::Script::lockScriptForAddress(address.string(), coin);
+        if (count == 0)
+            EXPECT_EQ(hex(utxoScript.bytes), "0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
+        if (count == 1)
+            EXPECT_EQ(hex(utxoScript.bytes), "0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
+        if (count == 2)
+            EXPECT_EQ(hex(utxoScript.bytes), "00146641abedacf9483b793afe1718689cc9420bbb1c");
+
+        Data keyHash;
+        EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
+        if (count == 0)
+            EXPECT_EQ(hex(keyHash), hex(inPubKeyHash0));
+        if (count == 1)
+            EXPECT_EQ(hex(keyHash), hex(inPubKeyHash0));
+        if (count == 2)
+            EXPECT_EQ(hex(keyHash), hex(inPubKeyHash1));
+
+        const auto redeemScript = Bitcoin::Script::buildPayToPublicKeyHash(keyHash);
+        if (count == 0)
+            EXPECT_EQ(hex(redeemScript.bytes),
+                      "76a914bd92088bb7e82d611a9b94fbb74a0908152b784f88ac");
+        if (count == 1)
+            EXPECT_EQ(hex(redeemScript.bytes),
+                      "76a914bd92088bb7e82d611a9b94fbb74a0908152b784f88ac");
+        if (count == 2)
+            EXPECT_EQ(hex(redeemScript.bytes),
+                      "76a9146641abedacf9483b793afe1718689cc9420bbb1c88ac");
+        (*signingInput.mutable_scripts())[hex(keyHash)] =
+            std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
+
+        auto utxo = signingInput.add_utxo();
+        utxo->set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+        utxo->set_amount(u.amount);
+        utxo->mutable_out_point()->set_hash(
+            std::string(u.revUtxoHash.begin(), u.revUtxoHash.end()));
+        utxo->mutable_out_point()->set_index(u.index);
+        utxo->mutable_out_point()->set_sequence(UINT32_MAX);
+
+        ++count;
+    }
+    EXPECT_EQ(count, 3);
+    EXPECT_EQ(signingInput.utxo_size(), 3);
+
+    // Plan
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(signingInput, plan, coin);
+
+    // Plan is checked, assume it is accepted
+    EXPECT_EQ(plan.amount(), 1'200'000);
+    EXPECT_EQ(plan.fee(), 277);
+    EXPECT_EQ(plan.change(), 299'723);
+    ASSERT_EQ(plan.utxos_size(), 3);
+    // Note that UTXOs happen to be in reverse order compared to the input
+    EXPECT_EQ(hex(plan.utxos(0).out_point().hash()), hex(revUtxoHash2));
+    EXPECT_EQ(hex(plan.utxos(1).out_point().hash()), hex(revUtxoHash1));
+    EXPECT_EQ(hex(plan.utxos(2).out_point().hash()), hex(revUtxoHash0));
+
+    // Extend input with accepted plan
+    *signingInput.mutable_plan() = plan;
+
+    // Serialize input
+    const auto txInputData = data(signingInput.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    /// Step 2: Obtain preimage hashes
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    TW::Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), (int)preImageHashes.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].data_hash()), "505f527f00e15fcc5a2d2416c9970beb57dfdfaca99e572a01f143b24dd8fab6");
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[1].data_hash()), "a296bead4172007be69b21971a790e076388666c162a9505698415f1b003ebd7");
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[2].data_hash()), "60ed6e9371e5ddc72fd88e46a12cb2f68516ebd307c0fd31b1b55cf767272101");
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].public_key_hash()), hex(inPubKeyHash1));
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[1].public_key_hash()), hex(inPubKeyHash0));
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[2].public_key_hash()), hex(inPubKeyHash0));
+
+    // Simulate signatures, normally obtained from signature server.
+    std::vector<Data> signatureVec;
+    std::vector<Data> pubkeyVec;
+    for (const auto& h : preSigningOutput.hash_public_keys()) {
+        const auto& preImageHash = h.data_hash();
+        const auto& pubkeyhash = h.public_key_hash();
+
+        const std::string key = hex(pubkeyhash) + "+" + hex(preImageHash);
+        const auto sigInfoFind = signatureInfos.find(key);
+        ASSERT_TRUE(sigInfoFind != signatureInfos.end());
+        const auto& sigInfo = std::get<1>(*sigInfoFind);
+        const auto& publicKeyData = sigInfo.publicKey;
+        const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
+        const auto signature = sigInfo.signature;
+
+        signatureVec.push_back(signature);
+        pubkeyVec.push_back(publicKeyData);
+
+        EXPECT_TRUE(publicKey.verifyAsDER(signature, TW::Data(preImageHash.begin(), preImageHash.end())));
+    }
+
+    /// Step 3: Compile transaction info
+    auto compileWithSignatures =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, signatureVec, pubkeyVec);
+
+    const auto ExpectedTx =
+        "010000000001036021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d0000000000ff"
+        "ffffffd6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e0100000000ffffffff07"
+        "c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa80000000000ffffffff02804f1200"
+        "000000001600145360df8231ac5965147c9d90ca930a2aafb05232cb92040000000000160014bd92088bb7e82d"
+        "611a9b94fbb74a0908152b784f02473044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e379"
+        "66414fe115820220646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e40121021714"
+        "2f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc0247304402201857bc6e6e48b46046"
+        "a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efd"
+        "bc9c6784aa2571ff4f6f2a400121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb49"
+        "3382024730440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b102207e777f"
+        "7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc0121024bc2a31265153f07e70e0bab08"
+        "724e6b85e217f8cd628ceb62974247bb49338200000000";
+    {
+        EXPECT_EQ(compileWithSignatures.size(), 786ul);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(compileWithSignatures.data(), (int)compileWithSignatures.size()));
+
+        EXPECT_EQ(output.encoded().size(), 518ul);
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        Bitcoin::Proto::SigningInput input;
+        ASSERT_TRUE(input.ParseFromArray(txInputData.data(), (int)txInputData.size()));
+
+        // 2 private keys are needed (despite >2 UTXOs)
+        auto key0 = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+        auto key1 = parse_hex("7878787878787878787878787878787878787878787878787878787878787878");
+        EXPECT_EQ(hex(PrivateKey(key0).getPublicKey(TWPublicKeyTypeSECP256k1).bytes),
+                  hex(inPubKey0));
+        EXPECT_EQ(hex(PrivateKey(key1).getPublicKey(TWPublicKeyTypeSECP256k1).bytes),
+                  hex(inPubKey1));
+        *input.add_private_key() = std::string(key0.begin(), key0.end());
+        *input.add_private_key() = std::string(key1.begin(), key1.end());
+
+        Bitcoin::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: not enough signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(coin, txInputData, {signatureVec[0]}, pubkeyVec);
+        EXPECT_GT(outputData.size(), 1ul);
+
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+    { // Negative: invalid public key
+        const auto publicKeyBlake =
+            parse_hex("b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9");
+        EXPECT_EXCEPTION(
+            TransactionCompiler::compileWithSignatures(
+                coin, txInputData, signatureVec, {pubkeyVec[0], pubkeyVec[1], publicKeyBlake}),
+            "Invalid public key");
+    }
+    { // Negative: wrong signature (formally valid)
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData,
+            {parse_hex("415502201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b349022"
+                       "00a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f3b51"),
+             signatureVec[1], signatureVec[2]},
+            pubkeyVec);
+        EXPECT_EQ(outputData.size(), 2ul);
+
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signing);
+    }
+}
+
+TEST(BitcoinCompiler, CompileWithSignaturesV2) {
+    Bitcoin::Proto::SigningInput inputLegacy;
+    auto& input = *inputLegacy.mutable_signing_v2();
+
+    const PrivateKey alicePrivateKey(parse_hex("56429688a1a6b00b90ccd22a0de0a376b6569d8684022ae92229a28478bfb657"));
+    const auto alicePublicKey = alicePrivateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    const auto bobPublicKey = parse_hex("037ed9a436e11ec4947ac4b7823787e24ba73180f1edd2857bff19c9f4d62b65bf");
+
+    input.mutable_chain_info()->set_p2pkh_prefix(0);
+    input.mutable_chain_info()->set_p2sh_prefix(5);
+    input.add_public_keys(alicePublicKey.bytes.data(), alicePublicKey.bytes.size());
+
+    auto txid0 = parse_hex("1e1cdc48aa990d7e154a161d5b5f1cad737742e97d2712ab188027bb42e6e47b");
+    std::reverse(txid0.begin(), txid0.end());
+
+    // Step 1: Prepare transaction input (protobuf)
+
+    auto& builder = *input.mutable_builder();
+
+    auto& utxo0 = *builder.add_inputs();
+    utxo0.mutable_out_point()->set_hash(txid0.data(), txid0.size());
+    utxo0.mutable_out_point()->set_vout(0);
+    utxo0.set_value(ONE_BTC * 50);
+    utxo0.set_sighash_type(TWBitcoinSigHashTypeAll);
+    // Set the Alice public key as the owner of the P2PKH input.
+    utxo0.mutable_script_builder()->mutable_p2pkh()->set_pubkey(alicePublicKey.bytes.data(), alicePublicKey.bytes.size());
+
+    auto& out0 = *builder.add_outputs();
+    out0.set_value(ONE_BTC * 50 - 1'000'000);
+    // Set the Bob public key as the receiver of the P2PKH output.
+    out0.mutable_builder()->mutable_p2pkh()->set_pubkey(bobPublicKey.data(), bobPublicKey.size());
+
+    builder.set_version(BitcoinV2::Proto::TransactionVersion::V2);
+    builder.set_input_selector(BitcoinV2::Proto::InputSelector::UseAll);
+    builder.set_fixed_dust_threshold(546);
+
+    const auto inputLegacyData = data(inputLegacy.SerializeAsString());
+
+    // Step 2: Obtain preimage hashes
+
+    const auto preOutputData = TransactionCompiler::preImageHashes(TWCoinTypeBitcoin, inputLegacyData);
+    Bitcoin::Proto::PreSigningOutput preOutput;
+    preOutput.ParseFromArray(preOutputData.data(), static_cast<int>(preOutputData.size()));
+
+    EXPECT_EQ(preOutput.error(), Common::Proto::SigningError::OK);
+    EXPECT_TRUE(preOutput.has_pre_signing_result_v2());
+    EXPECT_EQ(preOutput.pre_signing_result_v2().error(), Common::Proto::SigningError::OK);
+
+    const auto& sighashes = preOutput.pre_signing_result_v2().sighashes();
+    EXPECT_EQ(sighashes.size(), 1);
+    const auto& sighash0 = sighashes.Get(0);
+    EXPECT_EQ(data(sighash0.public_key()), alicePublicKey.bytes);
+    EXPECT_EQ(hex(sighash0.sighash()), "6a0e072da66b141fdb448323d54765cafcaf084a06d2fa13c8aed0c694e50d18");
+
+    // Step 3: Simulate signature, normally obtained from signature server
+
+    const auto sig0 = alicePrivateKey.sign(data(sighash0.sighash()), TWCurveSECP256k1);
+    EXPECT_EQ(hex(sig0), "78eda020d4b86fcb3af78ef919912e6d79b81164dbbb0b0b96da6ac58a2de4b11a5fd8d48734d5a02371c4b5ee551a69dca3842edbf577d863cf8ae9fdbbd45900");
+
+    // Step 4: Compile transaction info
+
+    const std::vector<Data> signatures { sig0 };
+    const std::vector<Data> publicKeys { alicePublicKey.bytes };
+    const auto outputData = TransactionCompiler::compileWithSignatures(TWCoinTypeBitcoin, inputLegacyData, signatures, publicKeys);
+    Bitcoin::Proto::SigningOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_TRUE(output.has_signing_result_v2());
+    const auto& outputV2 = output.signing_result_v2();
+    EXPECT_EQ(outputV2.error(), Common::Proto::SigningError::OK);
+    EXPECT_EQ(
+        hex(outputV2.encoded()),
+        "02000000017be4e642bb278018ab12277de9427773ad1c5f5b1d164a157e0d99aa48dc1c1e000000006a473044022078eda020d4b86fcb3af78ef919912e6d79b81164dbbb0b0b96da6ac58a2de4b102201a5fd8d48734d5a02371c4b5ee551a69dca3842edbf577d863cf8ae9fdbbd4590121036666dd712e05a487916384bfcd5973eb53e8038eccbbf97f7eed775b87389536ffffffff01c0aff629010000001976a9145eaaa4f458f9158f86afcba08dd7448d27045e3d88ac00000000"
+    );
+    EXPECT_EQ(hex(outputV2.txid()), "c19f410bf1d70864220e93bca20f836aaaf8cdde84a46692616e9f4480d54885");
+}
diff --git a/tests/Bitcoin/TransactionPlanTests.cpp b/tests/chains/Bitcoin/TransactionPlanTests.cpp
similarity index 91%
rename from tests/Bitcoin/TransactionPlanTests.cpp
rename to tests/chains/Bitcoin/TransactionPlanTests.cpp
index d906c863056..357d4784979 100644
--- a/tests/Bitcoin/TransactionPlanTests.cpp
+++ b/tests/chains/Bitcoin/TransactionPlanTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TxComparisonHelper.h"
 #include "Bitcoin/OutPoint.h"
@@ -61,17 +59,29 @@ TEST(TransactionPlan, OneInsufficientLower100) {
     EXPECT_TRUE(verifyPlan(txPlan, {}, 0, 0, Common::Proto::Error_not_enough_utxos));
 }
 
-TEST(TransactionPlan, OneInsufficientLower170) {
+TEST(TransactionPlan, OneInsufficient146) {
     // requested is only slightly lower than avail, not enough for fee, cannot be satisfied
     auto utxos = buildTestUTXOs({100'000});
-    auto sigingInput = buildSigningInput(100'000 - 170, 1, utxos);
+    auto sigingInput = buildSigningInput(100'000 - 146, 1, utxos);
 
     auto txPlan = TransactionBuilder::plan(sigingInput);
 
     EXPECT_TRUE(verifyPlan(txPlan, {}, 0, 0, Common::Proto::Error_not_enough_utxos));
 }
 
-TEST(TransactionPlan, OneInsufficientLower300) {
+TEST(TransactionPlan, OneSufficientLower170) {
+    // requested is only slightly lower than avail, not enough for fee, cannot be satisfied
+    auto utxos = buildTestUTXOs({100'000});
+    auto sigingInput = buildSigningInput(100'000 - 170, 1, utxos);
+
+    auto txPlan = TransactionBuilder::plan(sigingInput);
+
+    auto dustChange = 23;
+    auto actualFee = 147 + dustChange;
+    EXPECT_TRUE(verifyPlan(txPlan, {100'000}, 100'000 - 170, actualFee));
+}
+
+TEST(TransactionPlan, OneSufficientLower300) {
     auto utxos = buildTestUTXOs({100'000});
     auto sigingInput = buildSigningInput(100'000 - 300, 1, utxos);
 
@@ -94,7 +104,9 @@ TEST(TransactionPlan, OneMoreRequested) {
 TEST(TransactionPlan, OneFitsExactly) {
     auto utxos = buildTestUTXOs({100'000});
     auto byteFee = 1;
-    auto expectedFee = 147;
+    auto dustChange = 27;
+    // Change amount is too low (less than dust), so we just waste it as the transaction fee.
+    auto expectedFee = 147 + dustChange;
     auto sigingInput = buildSigningInput(100'000 - 174, byteFee, utxos);
 
     auto txPlan = TransactionBuilder::plan(sigingInput);
@@ -108,7 +120,9 @@ TEST(TransactionPlan, OneFitsExactly) {
 TEST(TransactionPlan, OneFitsExactlyHighFee) {
     auto utxos = buildTestUTXOs({100'000});
     auto byteFee = 10;
-    auto expectedFee = 1470;
+    auto dustChange = 270;
+    // Change amount is too low (less than dust), so we just waste it as the transaction fee.
+    auto expectedFee = 1470 + dustChange;
     auto sigingInput = buildSigningInput(100'000 - 1740, byteFee, utxos);
 
     auto txPlan = TransactionBuilder::plan(sigingInput);
@@ -241,6 +255,26 @@ TEST(TransactionPlan, SelectionSuboptimal_ExtraSmallUtxo) {
     EXPECT_EQ(firstUtxo, 500);
 }
 
+TEST(TransactionPlan, SelectionSuboptimal_ExtraSmallUtxoFixedDust) {
+    // Solution found 4-in-2-out {500, 600, 800, 1000} avail 2900 txamount 1390 fee 702 change 628
+    // Better solution: 3-in-2-out {600, 800, 1000} avail 2400 txamount 1390 fee 566 change 444
+    // Previously, with with higher fee estimation used in UTXO selection, solution found was 5-in-2-out {400, 500, 600, 800, 1000} avail 3300 txamount 1390 fee 838 change 1072
+    auto utxos = buildTestUTXOs({400, 500, 600, 800, 1'000});
+    auto byteFee = 2;
+    auto signingInput = buildSigningInput(1'390, byteFee, utxos);
+    signingInput.dustCalculator = std::make_shared<FixedDustCalculator>(450);
+
+    // UTXOs smaller than singleInputFee are not included
+    auto txPlan = TransactionBuilder::plan(signingInput);
+
+    auto expectedFee = 702;
+    EXPECT_TRUE(verifyPlan(txPlan, {500, 600, 800, 1'000}, 1'390, expectedFee));
+    auto change = 2'900 - 1'390 - expectedFee;
+    auto firstUtxo = txPlan.utxos[0].amount;
+    EXPECT_EQ(change, 808);
+    EXPECT_EQ(firstUtxo, 500);
+}
+
 TEST(TransactionPlan, Selection_Satisfied5) {
     // 5-input case, with a 5-input solution.
     // Previously, with with higher fee estimation used in UTXO selection, no solution would be found.
@@ -486,15 +520,15 @@ TEST(TransactionPlan, MaxAmountDustAllFee10) {
 }
 
 TEST(TransactionPlan, One_MaxAmount_FeeMoreThanAvailable) {
-    auto utxos = buildTestUTXOs({170});
+    auto utxos = buildTestUTXOs({340});
     auto byteFee = 1;
     auto expectedFee = 113;
-    auto sigingInput = buildSigningInput(300, byteFee, utxos, true);
+    auto sigingInput = buildSigningInput(340, byteFee, utxos, true);
 
     auto txPlan = TransactionBuilder::plan(sigingInput);
 
     // Fee is reduced to availableAmount
-    EXPECT_TRUE(verifyPlan(txPlan, {170}, 170 - expectedFee, expectedFee));
+    EXPECT_TRUE(verifyPlan(txPlan, {340}, 340 - expectedFee, expectedFee));
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
     EXPECT_EQ(feeCalculator.calculate(1, 1, byteFee), 143);
@@ -681,6 +715,7 @@ TEST(TransactionPlan, OpReturn) {
     EXPECT_TRUE(verifyPlan(txPlan, {342101}, 300000, 205 * byteFee));
     EXPECT_EQ(txPlan.outputOpReturn.size(), 59ul);
     EXPECT_EQ(hex(txPlan.outputOpReturn), "535741503a54484f522e52554e453a74686f72317470657263616d6b6b7865633071306a6b366c74646e6c7176737732396775617038776d636c3a");
+    EXPECT_FALSE(txPlan.outputOpReturnIndex.has_value());
 
     auto& feeCalculator = getFeeCalculator(TWCoinTypeBitcoin);
     EXPECT_EQ(feeCalculator.calculate(1, 2, byteFee), 174 * byteFee);
diff --git a/tests/Bitcoin/TxComparisonHelper.cpp b/tests/chains/Bitcoin/TxComparisonHelper.cpp
similarity index 97%
rename from tests/Bitcoin/TxComparisonHelper.cpp
rename to tests/chains/Bitcoin/TxComparisonHelper.cpp
index f99fae78c82..f674bcaaff7 100644
--- a/tests/Bitcoin/TxComparisonHelper.cpp
+++ b/tests/chains/Bitcoin/TxComparisonHelper.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "TxComparisonHelper.h"
 
@@ -47,6 +45,7 @@ SigningInput buildSigningInput(Amount amount, int byteFee, const UTXOs& utxos, b
     input.byteFee = byteFee;
     input.useMaxAmount = useMaxAmount;
     input.coinType = coin;
+    input.dustCalculator = std::make_shared<LegacyDustCalculator>(coin);
 
     if (!omitPrivateKey) {
         auto utxoKey = PrivateKey(parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9"));
diff --git a/tests/Bitcoin/TxComparisonHelper.h b/tests/chains/Bitcoin/TxComparisonHelper.h
similarity index 79%
rename from tests/Bitcoin/TxComparisonHelper.h
rename to tests/chains/Bitcoin/TxComparisonHelper.h
index 4cb2f92a1d2..b969b14595f 100644
--- a/tests/Bitcoin/TxComparisonHelper.h
+++ b/tests/chains/Bitcoin/TxComparisonHelper.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
@@ -45,14 +43,14 @@ struct EncodedTxSize {
 bool operator==(const EncodedTxSize& s1, const EncodedTxSize& s2);
 
 /// Return the encoded size of the transaction, virtual and non-segwit, etc.
-EncodedTxSize getEncodedTxSize(const Transaction& tx);
+EncodedTxSize getEncodedTxSize(const TW::Bitcoin::Transaction& tx);
 
 /// Validate the previously estimated transaction size (if available) with the actual transaction size.
 /// Uses segwit byte size (virtual size).  Tolerance is estiamte-smaller and estimate-larger, like -1 and 20.
 /// Returns false on mismatch, and error is printed (stderr).
-bool validateEstimatedSize(const Transaction& tx, int smallerTolerance = -1, int biggerTolerance = 20);
+bool validateEstimatedSize(const TW::Bitcoin::Transaction& tx, int smallerTolerance = -1, int biggerTolerance = 20);
 
 /// Print out a transaction in a nice format, as structured hex strings.
-void prettyPrintTransaction(const Transaction& tx, bool useWitnessFormat = true);
+void prettyPrintTransaction(const TW::Bitcoin::Transaction& tx, bool useWitnessFormat = true);
 
 } // namespace TW::Bitcoin
diff --git a/tests/chains/BitcoinCash/TWBitcoinCashTests.cpp b/tests/chains/BitcoinCash/TWBitcoinCashTests.cpp
new file mode 100644
index 00000000000..dc77f5b5642
--- /dev/null
+++ b/tests/chains/BitcoinCash/TWBitcoinCashTests.cpp
@@ -0,0 +1,237 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/Address.h"
+#include "Bitcoin/SigHashType.h"
+#include "HexCoding.h"
+#include "proto/Bitcoin.pb.h"
+#include "proto/BitcoinV2.pb.h"
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinAddress.h>
+#include <TrustWalletCore/TWBitcoinScript.h>
+#include <TrustWalletCore/TWHDWallet.h>
+#include <TrustWalletCore/TWHash.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Bitcoin::tests {
+
+// clang-format off
+TEST(BitcoinCash, Address) {
+    EXPECT_TRUE(TWAnyAddressIsValid(STRING("pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc").get(), TWCoinTypeBitcoinCash));
+    EXPECT_TRUE(TWAnyAddressIsValid(STRING("bitcoincash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc").get(), TWCoinTypeBitcoinCash));
+}
+
+TEST(BitcoinCash, ValidAddress) {
+    auto string = STRING("bitcoincash:qqa2qx0d8tegw32xk8u75ws055en4x3h2u0e6k46y4");
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeBitcoinCash));
+    ASSERT_NE(address.get(), nullptr);
+
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(string.get(), TWCoinTypeBitcoinCash));
+    ASSERT_FALSE(TWBitcoinScriptSize(script.get()) == 0);
+}
+
+TEST(BitcoinCash, InvalidAddress) {
+    // Wrong checksum
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("pqx578nanz2h2estzmkr53zqdg6qt8xyqvffffffff").get(), TWCoinTypeBitcoinCash));
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("bitcoincash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvffffffff").get(), TWCoinTypeBitcoinCash));
+
+    // Valid eCash addresses are invalid for BCH
+    EXPECT_TRUE(TWAnyAddressIsValid(STRING("pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0").get(), TWCoinTypeECash));
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0").get(), TWCoinTypeBitcoinCash));
+
+    EXPECT_TRUE(TWAnyAddressIsValid(STRING("ecash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0").get(), TWCoinTypeECash));
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("ecash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvh683mrz0").get(), TWCoinTypeBitcoinCash));
+
+    // Wrong prefix
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("bcash:pqx578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc").get(), TWCoinTypeBitcoinCash));
+
+    // Wrong base 32 (characters o, i)
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("poi578nanz2h2estzmkr53zqdg6qt8xyqvwhn6qeyc").get(), TWCoinTypeBitcoinCash));
+}
+
+TEST(BitcoinCash, LegacyToCashAddr) {
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("28071bf4e2b0340db41b807ed8a5514139e5d6427ff9d58dbd22b7ed187103a4").get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+    auto address = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(publicKey.get(), 0));
+    auto addressString = WRAPS(TWBitcoinAddressDescription(address.get()));
+    assertStringsEqual(addressString, "1PeUvjuxyf31aJKX6kCXuaqxhmG78ZUdL1");
+
+    auto cashAddress = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeBitcoinCash));
+    auto cashAddressString = WRAPS(TWAnyAddressDescription(cashAddress.get()));
+    assertStringsEqual(cashAddressString, "bitcoincash:qruxj7zq6yzpdx8dld0e9hfvt7u47zrw9gfr5hy0vh");
+}
+
+TEST(BitcoinCash, LockScript) {
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING("bitcoincash:qpk05r5kcd8uuzwqunn8rlx5xvuvzjqju5rch3tc0u").get(), TWCoinTypeBitcoinCash));
+    auto data = WRAPD(TWAnyAddressData(address.get()));
+    auto rawData = WRAPD(TWDataCreateWithSize(0));
+    TWDataAppendByte(rawData.get(), 0x00);
+    TWDataAppendData(rawData.get(), data.get());
+
+    auto legacyAddress = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithData(rawData.get()));
+    auto legacyString = WRAPS(TWBitcoinAddressDescription(legacyAddress.get()));
+    assertStringsEqual(legacyString, "1AwDXywmyhASpCCFWkqhySgZf8KiswFoGh");
+
+    auto keyHash = WRAPD(TWDataCreateWithBytes(legacyAddress.get()->impl.bytes.data() + 1, 20));
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptBuildPayToPublicKeyHash(keyHash.get()));
+    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
+    assertHexEqual(scriptData, "76a9146cfa0e96c34fce09c0e4e671fcd43338c14812e588ac");
+
+    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("pzukqjmcyzrkh3gsqzdcy3e3d39cqxhl3g0f405k5l").get(), TWCoinTypeBitcoinCash));
+    auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
+    assertHexEqual(scriptData2, "a914b9604b7820876bc510009b8247316c4b801aff8a87");
+}
+
+TEST(BitcoinCash, ExtendedKeys) {
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
+        STRING("ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal").get(),
+        STRING("TREZOR").get()
+    ));
+
+    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeBitcoinCash, TWHDVersionXPRV));
+    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeBitcoinCash, TWHDVersionXPUB));
+
+    assertStringsEqual(xprv, "xprv9yEvwSfPanK5gLYVnYvNyF2CEWJx1RsktQtKDeT6jnCnqASBiPCvFYHFSApXv39bZbF6hRaha1kWQBVhN1xjo7NHuhAn5uUfzy79TBuGiHh");
+    assertStringsEqual(xpub, "xpub6CEHLxCHR9sNtpcxtaTPLNxvnY9SQtbcFdov22riJ7jmhxmLFvXAoLbjHSzwXwNNuxC1jUP6tsHzFV9rhW9YKELfmR9pJaKFaM8C3zMPgjw");
+}
+
+TEST(BitcoinCash, DeriveFromXPub) {
+    auto xpub = STRING("xpub6CEHLxCHR9sNtpcxtaTPLNxvnY9SQtbcFdov22riJ7jmhxmLFvXAoLbjHSzwXwNNuxC1jUP6tsHzFV9rhW9YKELfmR9pJaKFaM8C3zMPgjw");
+    auto pubKey2 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeBitcoinCash, STRING("m/44'/145'/0'/0/2").get()));
+    auto pubKey9 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeBitcoinCash, STRING("m/44'/145'/0'/0/9").get()));
+
+    auto address2 = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(pubKey2.get(), TWCoinTypeBitcoinCash));
+    auto address2String = WRAPS(TWAnyAddressDescription(address2.get()));
+
+    auto address9 = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(pubKey9.get(), TWCoinTypeBitcoinCash));
+    auto address9String = WRAPS(TWAnyAddressDescription(address9.get()));
+
+    assertStringsEqual(address2String, "bitcoincash:qq4cm0hcc4trsj98v425f4ackdq7h92rsy6zzstrgy");
+    assertStringsEqual(address9String, "bitcoincash:qqyqupaugd7mycyr87j899u02exc6t2tcg9frrqnve");
+}
+
+TEST(BitcoinCash, SignTransaction) {
+    const int64_t amount = 600;
+
+    // Transaction on Bitcoin Cash Mainnet
+    // https://blockchair.com/bitcoin-cash/transaction/96ee20002b34e468f9d3c5ee54f6a8ddaa61c118889c4f35395c2cd93ba5bbb4
+
+    auto input = Proto::SigningInput();
+    input.set_hash_type(hashTypeForCoin(TWCoinTypeBitcoinCash));
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address("1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx");
+    input.set_change_address("1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU");
+
+    auto hash0 = DATA("e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05");
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(TWDataBytes(hash0.get()), TWDataSize(hash0.get()));
+    utxo0->mutable_out_point()->set_index(2);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(5151);
+    auto script0 = parse_hex("76a914aff1e0789e5fe316b729577665aa0a04d5b0f8c788ac");
+    utxo0->set_script(script0.data(), script0.size());
+
+    auto utxoKey0 = DATA("7fdafb9db5bc501f2096e7d13d331dc7a75d9594af3d251313ba8b6200f4e384");
+    input.add_private_key(TWDataBytes(utxoKey0.get()), TWDataSize(utxoKey0.get()));
+
+    // Sign
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeBitcoinCash);
+
+    EXPECT_EQ(output.transaction().outputs_size(), 2);
+    EXPECT_EQ(output.transaction().outputs(0).value(), amount);
+    EXPECT_EQ(output.transaction().outputs(1).value(), 4325);
+    EXPECT_EQ(output.encoded().length(), 226ul);
+    ASSERT_EQ(hex(output.encoded()),
+        "01000000"
+        "01"
+            "e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05" "02000000" "6b483045022100b70d158b43cbcded60e6977e93f9a84966bc0cec6f2dfd1463d1223a90563f0d02207548d081069de570a494d0967ba388ff02641d91cadb060587ead95a98d4e3534121038eab72ec78e639d02758e7860cdec018b49498c307791f785aa3019622f4ea5b" "ffffffff"
+        "02"
+            "5802000000000000" "1976a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+            "e510000000000000" "1976a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+        "00000000");
+}
+
+TEST(BitcoinCash, SignTransactionV2) {
+    auto privateKey = parse_hex("7fdafb9db5bc501f2096e7d13d331dc7a75d9594af3d251313ba8b6200f4e384");
+    auto txId = parse_hex("050d00e2e18ef13969606f1ceee290d3f49bd940684ce39898159352952b8ce2");
+    std::reverse(txId.begin(), txId.end());
+
+    BitcoinV2::Proto::SigningInput signing;
+    signing.add_private_keys(privateKey.data(), privateKey.size());
+    signing.mutable_chain_info()->set_p2pkh_prefix(0);
+    signing.mutable_chain_info()->set_p2sh_prefix(5);
+    signing.mutable_chain_info()->set_hrp("bitcoincash");
+
+    auto& builder = *signing.mutable_builder();
+    builder.set_version(BitcoinV2::Proto::TransactionVersion::V1);
+    builder.set_input_selector(BitcoinV2::Proto::InputSelector::UseAll);
+    builder.set_fixed_dust_threshold(546);
+
+    auto& in = *builder.add_inputs();
+    auto& inOutPoint = *in.mutable_out_point();
+    inOutPoint.set_hash(txId.data(), txId.size());
+    inOutPoint.set_vout(2);
+    in.set_value(5151);
+    // Cash address without prefix.
+    in.set_receiver_address("qzhlrcrcne07x94h99thved2pgzdtv8ccujjy73xya");
+    in.set_sighash_type(TWBitcoinSigHashTypeAll | TWBitcoinSigHashTypeFork);
+
+    auto& out0 = *builder.add_outputs();
+    out0.set_value(600);
+    // Legacy address.
+    out0.set_to_address("1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx");
+
+    auto& explicitChangeOutput = *builder.add_outputs();
+    explicitChangeOutput.set_value(4325);
+    // Cash address with an explicit prefix.
+    explicitChangeOutput.set_to_address("bitcoincash:qz0q3xmg38sr94rw8wg45vujah7kzma3cskxymnw06");
+
+    Proto::SigningInput legacy;
+    *legacy.mutable_signing_v2() = signing;
+    legacy.set_coin_type(TWCoinTypeBitcoinCash);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(legacy, plan, TWCoinTypeBitcoin);
+
+    ASSERT_EQ(plan.error(), Common::Proto::SigningError::OK);
+    const auto planV2 = plan.planning_result_v2();
+    EXPECT_EQ(planV2.error(), Common::Proto::SigningError::OK) << planV2.error_message();
+
+    EXPECT_EQ(planV2.inputs_size(), 1);
+    EXPECT_EQ(planV2.outputs_size(), 2);
+    EXPECT_EQ(planV2.vsize_estimate(), 227);
+    EXPECT_EQ(planV2.fee_estimate(), 226);
+    EXPECT_EQ(planV2.change(), 0);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(legacy, TWCoinTypeBitcoin);
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    ASSERT_TRUE(output.has_signing_result_v2());
+    const auto outputV2 = output.signing_result_v2();
+    EXPECT_EQ(outputV2.error(), Common::Proto::SigningError::OK) << outputV2.error_message();
+    ASSERT_EQ(hex(outputV2.encoded()),
+              "01000000"
+              "01"
+              "e28c2b955293159898e34c6840d99bf4d390e2ee1c6f606939f18ee1e2000d05" "02000000" "6b483045022100b70d158b43cbcded60e6977e93f9a84966bc0cec6f2dfd1463d1223a90563f0d02207548d081069de570a494d0967ba388ff02641d91cadb060587ead95a98d4e3534121038eab72ec78e639d02758e7860cdec018b49498c307791f785aa3019622f4ea5b" "ffffffff"
+              "02"
+              "5802000000000000" "1976a914769bdff96a02f9135a1d19b749db6a78fe07dc9088ac"
+              "e510000000000000" "1976a9149e089b6889e032d46e3b915a3392edfd616fb1c488ac"
+              "00000000");
+}
+
+// clang-format on
+
+} // namespace TW::Bitcoin::tests
diff --git a/tests/chains/BitcoinCash/TWCoinTypeTests.cpp b/tests/chains/BitcoinCash/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..20e12d01de1
--- /dev/null
+++ b/tests/chains/BitcoinCash/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBitcoinCashCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBitcoinCash));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBitcoinCash, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBitcoinCash, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBitcoinCash));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBitcoinCash));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBitcoinCash), 8);
+    ASSERT_EQ(TWBlockchainBitcoinCash, TWCoinTypeBlockchain(TWCoinTypeBitcoinCash));
+    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeBitcoinCash));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBitcoinCash));
+    assertStringsEqual(symbol, "BCH");
+    assertStringsEqual(txUrl, "https://blockchair.com/bitcoin-cash/transaction/t123");
+    assertStringsEqual(accUrl, "https://blockchair.com/bitcoin-cash/address/a12");
+    assertStringsEqual(id, "bitcoincash");
+    assertStringsEqual(name, "Bitcoin Cash");
+}
diff --git a/tests/chains/BitcoinDiamond/AddressTests.cpp b/tests/chains/BitcoinDiamond/AddressTests.cpp
new file mode 100644
index 00000000000..a99b7ce46ea
--- /dev/null
+++ b/tests/chains/BitcoinDiamond/AddressTests.cpp
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "HDWallet.h"
+#include "Bitcoin/Address.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(BitcoinDiamondAddress, Valid) {
+    ASSERT_TRUE(Address::isValid(std::string("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8")));
+    ASSERT_TRUE(Address::isValid(std::string("3PaCtJcD7sxpCf3JNPLpMNnHnwJHoBeucF")));
+    ASSERT_TRUE(Address::isValid(std::string("395mRH5aV3DLHPXC4Md9cPdpiquLtTqRSX")));
+}
+
+TEST(BitcoinDiamondAddress, FromPublicKey) {
+    const auto publicKey = PublicKey(parse_hex("02485a209514cc896f8ed736e205bc4c35bd5299ef3f9e84054475336b964c02a3"), TWPublicKeyTypeSECP256k1);
+    const auto address = Address(publicKey, TWCoinTypeP2pkhPrefix(TWCoinTypeBitcoinDiamond));
+    EXPECT_EQ(address.string(), "1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+
+    auto wallet = HDWallet("shoot island position soft burden budget tooth cruel issue economy destroy above", "");
+    auto addr = wallet.deriveAddress(TWCoinTypeBitcoinDiamond);
+    EXPECT_EQ(addr, "1KaRW9xPPtCTZ9FdaTHduCPck4YvSeEWNn");
+
+    addr = wallet.deriveAddress(TWCoinTypeBitcoinDiamond, TWDerivationBitcoinSegwit);
+    EXPECT_EQ(addr, "bcd1q7jh5qukuy9fc2pjm89xnyvx5dtfyvru9evw30x");
+}
+
+TEST(BitcoinDiamondAddress, FromString) {
+    auto address = Address("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+    ASSERT_EQ(address.string(), "1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+
+    address = Address("3PaCtJcD7sxpCf3JNPLpMNnHnwJHoBeucF");
+    ASSERT_EQ(address.string(), "3PaCtJcD7sxpCf3JNPLpMNnHnwJHoBeucF");
+}
+
+TEST(BitcoinDiamondAddress, AddressData) {
+    const auto publicKey = PublicKey(parse_hex("02485a209514cc896f8ed736e205bc4c35bd5299ef3f9e84054475336b964c02a3"), TWPublicKeyTypeSECP256k1);
+    auto address = TW::deriveAddress(TWCoinTypeBitcoinDiamond, publicKey, TWDerivationBitcoinSegwit);
+
+    auto data = TW::addressToData(TWCoinTypeBitcoinDiamond, "1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+    ASSERT_EQ(hex(data), "a48da46386ce52cccad178de900c71f06130c310");
+    ASSERT_EQ(data, TW::addressToData(TWCoinTypeBitcoinDiamond, address));
+
+    data = TW::addressToData(TWCoinTypeBitcoinDiamond, "1G15VvshDxwFTnahZZECJfFwEkq9fP79"); // invalid address
+    ASSERT_EQ(data.size(), 0ul);
+}
diff --git a/tests/chains/BitcoinDiamond/SignerTests.cpp b/tests/chains/BitcoinDiamond/SignerTests.cpp
new file mode 100644
index 00000000000..2b0a239d726
--- /dev/null
+++ b/tests/chains/BitcoinDiamond/SignerTests.cpp
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "BitcoinDiamond/Signer.h"
+#include "BitcoinDiamond/TransactionBuilder.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "proto/Bitcoin.pb.h"
+
+#include <TrustWalletCore/TWCoinType.h>
+#include <gtest/gtest.h>
+
+using namespace TW;
+namespace TW::BitcoinDiamond::tests {
+
+TEST(BitcoinDiamondSigner, Sign) {
+    const int64_t amount = 17615;
+    const int64_t fee = 10000;
+    const std::string toAddress = "1HevQVTSEc8cEpDm65UpfCdj5erd4xxBhx";
+
+    auto toScript = Bitcoin::Script::lockScriptForAddress(toAddress, TWCoinTypeBitcoinDiamond);
+    ASSERT_EQ(hex(toScript.bytes), "76a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac");
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+    input.set_coin_type(TWCoinTypeBitcoinDiamond);
+
+    auto txHash0 = parse_hex("1d4653041a1915b3a52d47aeaa119c8f79ed7634a93692a6e811173067464f03");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(27615);
+
+    auto utxoKey0 =
+        PrivateKey(parse_hex("d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee"));
+    auto utxoAddr0 = TW::deriveAddress(TWCoinTypeBitcoinDiamond, utxoKey0);
+    ASSERT_EQ(utxoAddr0, "1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeBitcoinDiamond);
+    ASSERT_EQ(hex(script0.bytes), "76a914a48da46386ce52cccad178de900c71f06130c31088ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 0;
+    plan.preBlockHash =
+        parse_hex("4bfa9d92e1e99e72597e1e9162bdaaab624f1bb6faa83b2f46c6777caf8d6699");
+    std::reverse(plan.preBlockHash.begin(), plan.preBlockHash.end());
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = BitcoinDiamond::Signer::sign(input);
+
+    ASSERT_EQ(
+        hex(result.encoded()),
+        "0c00000099668daf7c77c6462f3ba8fab61b4f62abaabd62911e7e59729ee9e1929dfa4b01034f4667301711e8"
+        "a69236a93476ed798f9c11aaae472da5b315191a0453461d000000006a473044022078e0d3a9e1eb270ab02c15"
+        "f8fcf1d3bfc95a324839690b7de4f011a4266132ff02204679e8103c4d3f0bb5192a5f53cc273732fd0e8392ab"
+        "3b00dc708fd24d0160b3012102485a209514cc896f8ed736e205bc4c35bd5299ef3f9e84054475336b964c02a3"
+        "ffffffff01cf440000000000001976a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac00000000");
+}
+
+TEST(BitcoinDiamondSigner, SignSegwit) {
+    const int64_t amount = 17615;
+    const int64_t fee = 10000;
+    const std::string toAddress = "1HevQVTSEc8cEpDm65UpfCdj5erd4xxBhx";
+
+    auto toScript = Bitcoin::Script::lockScriptForAddress(toAddress, TWCoinTypeBitcoinDiamond);
+    ASSERT_EQ(hex(toScript.bytes), "76a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac");
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+    input.set_coin_type(TWCoinTypeBitcoinDiamond);
+
+    auto txHash0 = parse_hex("1d4653041a1915b3a52d47aeaa119c8f79ed7634a93692a6e811173067464f03");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(27615);
+
+    auto utxoKey0 =
+        PrivateKey(parse_hex("d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee"));
+    auto utxoAddr0 =
+        TW::deriveAddress(TWCoinTypeBitcoinDiamond, utxoKey0, TWDerivationBitcoinSegwit);
+    ASSERT_EQ(utxoAddr0, "bcd1q5jx6gcuxeefvejk30r0fqrr37psnpscslrrd0y");
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeBitcoinDiamond);
+    ASSERT_EQ(hex(script0.bytes), "0014a48da46386ce52cccad178de900c71f06130c310");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 0;
+    plan.preBlockHash =
+        parse_hex("4bfa9d92e1e99e72597e1e9162bdaaab624f1bb6faa83b2f46c6777caf8d6699");
+    std::reverse(plan.preBlockHash.begin(), plan.preBlockHash.end());
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = BitcoinDiamond::Signer::sign(input);
+
+    ASSERT_EQ(hex(result.encoded()),
+              "0c00000099668daf7c77c6462f3ba8fab61b4f62abaabd62911e7e59729ee9e1929dfa4b000101034f46"
+              "67301711e8a69236a93476ed798f9c11aaae472da5b315191a0453461d0000000000ffffffff01cf4400"
+              "00000000001976a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac02483045022100e9cd497e"
+              "a0156dbe72bd0e052869c8feb9bea182907023bcc447b98655a5e1080220767e85892df6e4c952bd62b1"
+              "8c76317f623c5e4f1a8bf4cef6b5e1193e17cf6e012102485a209514cc896f8ed736e205bc4c35bd5299"
+              "ef3f9e84054475336b964c02a300000000");
+}
+
+TEST(BitcoinDiamondSigner, SignAnyoneCanPay) {
+    const int64_t amount = 17615;
+    const int64_t fee = 10000;
+    const std::string toAddress = "1HevQVTSEc8cEpDm65UpfCdj5erd4xxBhx";
+
+    auto toScript = Bitcoin::Script::lockScriptForAddress(toAddress, TWCoinTypeBitcoinDiamond);
+    ASSERT_EQ(hex(toScript.bytes), "76a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac");
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAnyoneCanPay | TWBitcoinSigHashTypeSingle);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+    input.set_coin_type(TWCoinTypeBitcoinDiamond);
+
+    auto txHash0 = parse_hex("1d4653041a1915b3a52d47aeaa119c8f79ed7634a93692a6e811173067464f03");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(27615);
+
+    auto utxoKey0 =
+        PrivateKey(parse_hex("d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee"));
+    auto utxoAddr0 =
+        TW::deriveAddress(TWCoinTypeBitcoinDiamond, utxoKey0, TWDerivationBitcoinSegwit);
+    ASSERT_EQ(utxoAddr0, "bcd1q5jx6gcuxeefvejk30r0fqrr37psnpscslrrd0y");
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeBitcoinDiamond);
+    ASSERT_EQ(hex(script0.bytes), "0014a48da46386ce52cccad178de900c71f06130c310");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 0;
+    plan.preBlockHash =
+        parse_hex("4bfa9d92e1e99e72597e1e9162bdaaab624f1bb6faa83b2f46c6777caf8d6699");
+    std::reverse(plan.preBlockHash.begin(), plan.preBlockHash.end());
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = BitcoinDiamond::Signer::sign(input);
+
+    ASSERT_EQ(hex(result.encoded()),
+              "0c00000099668daf7c77c6462f3ba8fab61b4f62abaabd62911e7e59729ee9e1929dfa4b000101034f46"
+              "67301711e8a69236a93476ed798f9c11aaae472da5b315191a0453461d0000000000ffffffff01cf4400"
+              "00000000001976a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac02483045022100d659b1e0"
+              "8f30e133658eca9d97158723b49658bbe28930e361fa274bd11a0b090220587436eaaf3b9397d14af18f"
+              "a8b4c77a7d7d51bc4733a2821bf03865704966d7832102485a209514cc896f8ed736e205bc4c35bd5299"
+              "ef3f9e84054475336b964c02a300000000");
+}
+
+TEST(BitcoinDiamondSigner, SignWithError) {
+    const int64_t amount = 17615;
+    const std::string toAddress = "1HevQVTSEc8cEpDm65UpfCdj5erd4xxBhx";
+
+    auto toScript = Bitcoin::Script::lockScriptForAddress(toAddress, TWCoinTypeBitcoinDiamond);
+    ASSERT_EQ(hex(toScript.bytes), "76a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac");
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+    input.set_coin_type(TWCoinTypeBitcoinDiamond);
+
+    auto inputData = data(input.SerializeAsString());
+
+    // PreImageHash
+    auto preData = TransactionCompiler::preImageHashes(TWCoinTypeBitcoinDiamond, inputData);
+
+    TW::Bitcoin::Proto::PreSigningOutput output;
+    ASSERT_TRUE(output.ParseFromArray(preData.data(), (int)preData.size()));
+
+    ASSERT_NE(output.error(), Common::Proto::OK);
+
+    // Sign
+    auto result = BitcoinDiamond::Signer::sign(input);
+    ASSERT_NE(result.error(), Common::Proto::OK);
+}
+
+} // namespace TW::BitcoinDiamond::tests
diff --git a/tests/chains/BitcoinDiamond/TWAnyAddressTests.cpp b/tests/chains/BitcoinDiamond/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..43ae566f74e
--- /dev/null
+++ b/tests/chains/BitcoinDiamond/TWAnyAddressTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWBitcoinDiamond, Address) {
+    auto string = STRING("3CDf39adX4mc1AnvDzYHjw2NhxKswAPV3y");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeBitcoinDiamond));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "737cb7c194ec6502be59ed985d66b8bfe8b2b986");
+
+    string = STRING("1DH9cvKqGgzCvwoap45Nh75qV62wqje9pJ");
+    addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeBitcoinDiamond));
+    string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "86af5c1d5e754fc8906ec3c5d26e0135e1cb7c85");
+
+    // segwit addrerss
+    string = STRING("bcd1q35t4g0ezx9cl5qzac4tl377n9492uztqjwf5wh");
+    addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeBitcoinDiamond));
+    string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "8d17543f223171fa005dc557f8fbd32d4aae0960");
+}
diff --git a/tests/chains/BitcoinDiamond/TWAnySignerTests.cpp b/tests/chains/BitcoinDiamond/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..f1ab62557f2
--- /dev/null
+++ b/tests/chains/BitcoinDiamond/TWAnySignerTests.cpp
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "proto/Bitcoin.pb.h"
+#include "proto/Common.pb.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+
+TEST(TWAnySignerBitcoinDiamond, Sign) {
+    const int64_t amount = 17615;
+    const int64_t fee = 10000;
+    const std::string toAddress = "1HevQVTSEc8cEpDm65UpfCdj5erd4xxBhx";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("1G15VvshDxwFTnahZZECJfFwEkq9fP79o8");
+    input.set_coin_type(TWCoinTypeBitcoinDiamond);
+
+    auto txHash0 = parse_hex("1d4653041a1915b3a52d47aeaa119c8f79ed7634a93692a6e811173067464f03");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(27615);
+
+    auto script0 = parse_hex("76a914a48da46386ce52cccad178de900c71f06130c31088ac");
+    utxo0->set_script(script0.data(), (int)script0.size());
+
+    auto utxoKey0 = PrivateKey(parse_hex("d2b9f2846d3adcead910ee0124a3ba7ae29e8a4729787d27f9bea1f532928eee"));
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    Bitcoin::Proto::TransactionPlan plan;
+    {
+        ANY_PLAN(input, plan, TWCoinTypeBitcoinDiamond);
+
+        plan.set_amount(amount);
+        plan.set_fee(fee);
+        plan.set_change(0);
+        auto preBlockHash = parse_hex("4bfa9d92e1e99e72597e1e9162bdaaab624f1bb6faa83b2f46c6777caf8d6699");
+        std::reverse(preBlockHash.begin(), preBlockHash.end());
+        plan.set_preblockhash(preBlockHash.data(), (int)preBlockHash.size());
+    }
+    
+    *input.mutable_plan() = plan;
+
+    Bitcoin::Proto::SigningOutput output;
+    {
+        ANY_SIGN(input, TWCoinTypeBitcoinDiamond);
+        ASSERT_EQ(output.error(), Common::Proto::OK);
+    }
+    // Sign
+    ASSERT_EQ(hex(output.encoded()), "0c00000099668daf7c77c6462f3ba8fab61b4f62abaabd62911e7e59729ee9e1929dfa4b01034f4667301711e8a69236a93476ed798f9c11aaae472da5b315191a0453461d000000006a473044022078e0d3a9e1eb270ab02c15f8fcf1d3bfc95a324839690b7de4f011a4266132ff02204679e8103c4d3f0bb5192a5f53cc273732fd0e8392ab3b00dc708fd24d0160b3012102485a209514cc896f8ed736e205bc4c35bd5299ef3f9e84054475336b964c02a3ffffffff01cf440000000000001976a914b6adfbbf15c8f6fa53f1edb37054dce5c7c145c688ac00000000");
+}
diff --git a/tests/chains/BitcoinDiamond/TWCoinTypeTests.cpp b/tests/chains/BitcoinDiamond/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..7e29ed4578e
--- /dev/null
+++ b/tests/chains/BitcoinDiamond/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBitcoinDiamondCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBitcoinDiamond));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("ec564fe8993ba77f3f5c8b7f6ebb4cbc08e564a54612d6f4584cd1017cf723d4"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBitcoinDiamond, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("1HNTyntGXNhy4WxNzWfffPqp7LHb8bGJ9R"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBitcoinDiamond, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBitcoinDiamond));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBitcoinDiamond));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBitcoinDiamond), 7);
+    ASSERT_EQ(TWBlockchainBitcoinDiamond, TWCoinTypeBlockchain(TWCoinTypeBitcoinDiamond));
+    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeBitcoinDiamond));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBitcoinDiamond));
+    assertStringsEqual(symbol, "BCD");
+    assertStringsEqual(txUrl, "http://explorer.btcd.io/#/tx?tx=ec564fe8993ba77f3f5c8b7f6ebb4cbc08e564a54612d6f4584cd1017cf723d4");
+    assertStringsEqual(accUrl, "http://explorer.btcd.io/#/address?address=1HNTyntGXNhy4WxNzWfffPqp7LHb8bGJ9R");
+    assertStringsEqual(id, "bitcoindiamond");
+    assertStringsEqual(name, "Bitcoin Diamond");
+}
diff --git a/tests/chains/BitcoinDiamond/TWSegwitAddressTests.cpp b/tests/chains/BitcoinDiamond/TWSegwitAddressTests.cpp
new file mode 100644
index 00000000000..bf09d3f8d0f
--- /dev/null
+++ b/tests/chains/BitcoinDiamond/TWSegwitAddressTests.cpp
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+
+#include "TestUtilities.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "HexCoding.h"
+#include <gtest/gtest.h>
+#include <TrustWalletCore/TWAnyAddress.h>
+
+using namespace TW;
+
+TEST(TWBitcoinDiamondSegwitAddress, Valid) {
+    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid("bcd1q35t4g0ezx9cl5qzac4tl377n9492uztqjwf5wh"));
+    ASSERT_FALSE(Bitcoin::SegwitAddress::isValid("bcd1q35t4g0ezx9cl5qzac4tl377n9492uztqjwf5ac"));
+}
+
+/// Initializes a Bech32 address with a human-readable part, a witness
+/// version, and a witness program.
+TEST(TWBitcoinDiamondSegwitAddress, WitnessProgramToAddress) {
+    auto address = Bitcoin::SegwitAddress("bcd", 0, parse_hex("8d17543f223171fa005dc557f8fbd32d4aae0960"));
+
+    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid(address.string()));
+    ASSERT_EQ(address.string(), "bcd1q35t4g0ezx9cl5qzac4tl377n9492uztqjwf5wh");
+}
+
+/// Initializes a Bech32 address with a public key and a HRP prefix.
+TEST(TWBitcoinDiamondSegwitAddress, PubkeyToAddress) {
+    const auto publicKey = PublicKey(parse_hex("032a9ccb9cc6fd461df091b0f711730daa4292f9226aec918ac19381ac2af5e9ee"), TWPublicKeyTypeSECP256k1);
+
+    /// construct with public key
+    auto address = Bitcoin::SegwitAddress(publicKey, "bcd");
+
+    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid(address.string()));
+    ASSERT_EQ(address.string(), "bcd1q35t4g0ezx9cl5qzac4tl377n9492uztqjwf5wh");
+}
+
+/// Decodes a SegWit address.
+TEST(TWBitcoinDiamondSegwitAddress, Decode) {
+    auto result = Bitcoin::SegwitAddress::decode("bcd1q35t4g0ezx9cl5qzac4tl377n9492uztqjwf5wh");
+
+    ASSERT_TRUE(std::get<2>(result));
+    ASSERT_EQ(std::get<0>(result).string(), "bcd1q35t4g0ezx9cl5qzac4tl377n9492uztqjwf5wh");
+    ASSERT_EQ(std::get<1>(result), "bcd");
+}
diff --git a/tests/chains/BitcoinDiamond/TransactionCompilerTests.cpp b/tests/chains/BitcoinDiamond/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..744c64deb7a
--- /dev/null
+++ b/tests/chains/BitcoinDiamond/TransactionCompilerTests.cpp
@@ -0,0 +1,156 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Bitcoin/Script.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "Bitcoin/TransactionInput.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(BitcoinDiamondCompiler, CompileWithSignatures) {
+    // tx on mainnet
+    // http://explorer.btcd.io/#/tx?tx=6f8db2317c0940ff97c461e5e9b89692c6c1fded15fb30ae8b9cc2429ce43f66
+
+    const auto coin = TWCoinTypeBitcoinDiamond;
+    const int64_t amount = 196007725;
+    const int64_t fee = 1014;
+    const std::string toAddress = "39mKL9gxk29f2RiofywHYRDmgXPv1ur8uC";
+
+    auto toScript = Bitcoin::Script::lockScriptForAddress(toAddress, coin);
+    ASSERT_EQ(hex(toScript.bytes), "a914589133651fd11901381ecb4d3beef58bc28ba2e787");
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("15ehpdrZqfZ5rj2e4T4hZKMi3kA8qdSyQu");
+    input.set_coin_type(coin);
+
+    auto txHash0 = parse_hex("6ce528c1192a9be648dd8c960695a15454c4c77b5a1dd5c8a5a208e6ae7e0ca8");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(501008739);
+
+    auto utxoAddr0 = "15ehpdrZqfZ5rj2e4T4hZKMi3kA8qdSyQu";
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, coin);
+    ASSERT_EQ(hex(script0.bytes), "76a9143301f83977102415e34cccd5ca15136a3dba87d588ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    EXPECT_EQ(input.utxo_size(), 1);
+
+    // Plan
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, coin);
+
+    plan.set_amount(amount);
+    plan.set_fee(fee);
+    plan.set_change(305000000);
+    auto preBlockHash = parse_hex("840980d100724999ea20e8b14ddd5ea5e37e2beacb9157a17fe87d0854bc7e6f");
+    std::reverse(preBlockHash.begin(), preBlockHash.end());
+    plan.set_preblockhash(preBlockHash.data(), (int)preBlockHash.size());
+
+    // Extend input with accepted plan
+    *input.mutable_plan() = plan;
+
+    // Serialize input
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT((int)txInputData.size(), 0);
+
+    /// Step 2: Obtain preimage hashes
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    TW::Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), (int)preImageHashes.size()));
+
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].data_hash()),
+              "13565ac8d1d5a8a721417e0391cd13ea1a212b51b9d6bba093babaa203ed9d74");
+
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].public_key_hash()), "3301f83977102415e34cccd5ca15136a3dba87d5");
+
+    auto publicKeyHex = "02f65e76c2a7c239bd6c8b18dc10b71d463b96c0b0d827c97345e6bbe8ee8f2ddc";
+    auto publicKey = PublicKey(parse_hex(publicKeyHex), TWPublicKeyTypeSECP256k1);
+    auto preImageHash = preSigningOutput.hash_public_keys()[0].data_hash();
+    auto signature = parse_hex("3045022100e2c048cdf844c77275ac92cc27cfc357155d42d9a82d5d22f62247dce7681467022052c57d744a2ea91970b14e8863efdbcb3fb91f6448c027c25a8e86b752acb5ce");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(
+        publicKey.verifyAsDER(signature, TW::Data(preImageHash.begin(), preImageHash.end())));
+
+    // Simulate signatures, normally obtained from signature server.
+    std::vector<Data> signatureVec;
+    std::vector<Data> pubkeyVec;
+    signatureVec.push_back(signature);
+    pubkeyVec.push_back(publicKey.bytes);
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, signatureVec, pubkeyVec);
+
+    const auto ExpectedTx =
+        "0c0000006f7ebc54087de87fa15791cbea2b7ee3a55edd4db1e820ea99497200d180098401a80c7eaee608a2a5c8d51d5a7bc7c45454a19506968cdd48e69b2a19c128e56c000000006b483045022100e2c048cdf844c77275ac92cc27cfc357155d42d9a82d5d22f62247dce7681467022052c57d744a2ea91970b14e8863efdbcb3fb91f6448c027c25a8e86b752acb5ce012102f65e76c2a7c239bd6c8b18dc10b71d463b96c0b0d827c97345e6bbe8ee8f2ddcffffffff022dd7ae0b0000000017a914589133651fd11901381ecb4d3beef58bc28ba2e78740ee2d12000000001976a9143301f83977102415e34cccd5ca15136a3dba87d588ac00000000";
+    {
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: not enough signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, pubkeyVec);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+    { // Negative: invalid public key
+        const auto publicKeyBlake =
+            parse_hex("b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9");
+        EXPECT_EXCEPTION(
+            TransactionCompiler::compileWithSignatures(
+                coin, txInputData, signatureVec, {publicKeyBlake}),
+            "Invalid public key");
+    }
+    { // Negative: wrong signature (formally valid)
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData,
+            {parse_hex("415502201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b349022"
+                       "00a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f3b51")},
+            pubkeyVec);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signing);
+    }
+}
diff --git a/tests/BitcoinGold/TWAddressTests.cpp b/tests/chains/BitcoinGold/TWAddressTests.cpp
similarity index 76%
rename from tests/BitcoinGold/TWAddressTests.cpp
rename to tests/chains/BitcoinGold/TWAddressTests.cpp
index 77c192461bb..ec7372aee34 100644
--- a/tests/BitcoinGold/TWAddressTests.cpp
+++ b/tests/chains/BitcoinGold/TWAddressTests.cpp
@@ -1,11 +1,9 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include "Bitcoin/Address.h"
 #include "PrivateKey.h"
 #include "PublicKey.h"
diff --git a/tests/BitcoinGold/TWBitcoinGoldTests.cpp b/tests/chains/BitcoinGold/TWBitcoinGoldTests.cpp
similarity index 94%
rename from tests/BitcoinGold/TWBitcoinGoldTests.cpp
rename to tests/chains/BitcoinGold/TWBitcoinGoldTests.cpp
index 6c4247b4f90..dddb5e8a13f 100644
--- a/tests/BitcoinGold/TWBitcoinGoldTests.cpp
+++ b/tests/chains/BitcoinGold/TWBitcoinGoldTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWAnyAddress.h>
 #include <TrustWalletCore/TWAnySigner.h>
@@ -20,7 +18,7 @@
 #include "Bitcoin/TransactionSigner.h"
 #include "HexCoding.h"
 #include "proto/Bitcoin.pb.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 using namespace TW;
 
@@ -86,7 +84,7 @@ TEST(TWBitcoinGoldTxGeneration, TxGeneration) {
     auto scriptPub1 = Script(parse_hex("0014db746a75d9aae8995d135b1e19a04d7765242a8f"));
     auto scriptHash = std::vector<uint8_t>();
     scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
-    auto scriptHashHex = hex(scriptHash.begin(), scriptHash.end());
+    auto scriptHashHex = hex(scriptHash);
 
     auto redeemScript = Script::buildPayToPublicKeyHash(scriptHash);
     auto scriptString = std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
diff --git a/tests/chains/BitcoinGold/TWCoinTypeTests.cpp b/tests/chains/BitcoinGold/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..c58fa8c23de
--- /dev/null
+++ b/tests/chains/BitcoinGold/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBitcoinGoldCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBitcoinGold));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("2f807d7734de35d2236a1b3d8704eb12954f5f82ea66987949b10e94d9999b23"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBitcoinGold, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("GJjz2Du9BoJQ3CPcoyVTHUJZSj62i1693U"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBitcoinGold, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBitcoinGold));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBitcoinGold));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBitcoinGold), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeBitcoinGold));
+    ASSERT_EQ(0x17, TWCoinTypeP2shPrefix(TWCoinTypeBitcoinGold));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBitcoinGold));
+    assertStringsEqual(symbol, "BTG");
+    assertStringsEqual(txUrl, "https://explorer.bitcoingold.org/insight/tx/2f807d7734de35d2236a1b3d8704eb12954f5f82ea66987949b10e94d9999b23");
+    assertStringsEqual(accUrl, "https://explorer.bitcoingold.org/insight/address/GJjz2Du9BoJQ3CPcoyVTHUJZSj62i1693U");
+    assertStringsEqual(id, "bitcoingold");
+    assertStringsEqual(name, "Bitcoin Gold");
+}
diff --git a/tests/chains/BitcoinGold/TWSegwitAddressTests.cpp b/tests/chains/BitcoinGold/TWSegwitAddressTests.cpp
new file mode 100644
index 00000000000..e4d6be2f679
--- /dev/null
+++ b/tests/chains/BitcoinGold/TWSegwitAddressTests.cpp
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+
+#include "TestUtilities.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "Coin.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "HexCoding.h"
+#include <gtest/gtest.h>
+#include <TrustWalletCore/TWAnyAddress.h>
+
+using namespace TW;
+
+TEST(TWBitcoinGoldSegwitAddress, Valid) {
+    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid("btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk"));
+    ASSERT_FALSE(Bitcoin::SegwitAddress::isValid("btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sl"));
+}
+
+/// Initializes a Bech32 address with a human-readable part, a witness
+/// version, and a witness program.
+TEST(TWBitcoinGoldSegwitAddress, WitnessProgramToAddress) {
+    auto address = Bitcoin::SegwitAddress("btg", 0, parse_hex("5e6132a9ad21f7423081441ab4ae229501f6c8a8"));
+
+    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid(address.string()));
+    ASSERT_EQ(address.string(), "btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
+}
+
+/// Get address data from a Bech32 address
+TEST(TWBitcoinGoldSegwitAddress, addressToData) {
+    auto data = TW::addressToData(TWCoinTypeBitcoinGold, "btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
+    ASSERT_EQ(hex(data), "5e6132a9ad21f7423081441ab4ae229501f6c8a8");
+}
+
+/// Initializes a Bech32 address with a public key and a HRP prefix.
+TEST(TWBitcoinGoldSegwitAddress, PubkeyToAddress) {
+    const auto publicKey = PublicKey(parse_hex("02f74712b5d765a73b52a14c1e113f2ef3f9502d09d5987ee40f53828cfe68b9a6"), TWPublicKeyTypeSECP256k1);
+
+    /// construct with public key
+    auto address = Bitcoin::SegwitAddress(publicKey, "btg");
+
+    ASSERT_TRUE(Bitcoin::SegwitAddress::isValid(address.string()));
+    ASSERT_EQ(address.string(), "btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
+}
+
+/// Decodes a SegWit address.
+TEST(TWBitcoinGoldSegwitAddress, Decode) {
+    auto result = Bitcoin::SegwitAddress::decode("btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
+
+    ASSERT_TRUE(std::get<2>(result));
+    ASSERT_EQ(std::get<0>(result).string(), "btg1qtesn92ddy8m5yvypgsdtft3zj5qldj9g2u52sk");
+    ASSERT_EQ(std::get<1>(result), "btg");
+}
diff --git a/tests/BitcoinGold/TWSignerTests.cpp b/tests/chains/BitcoinGold/TWSignerTests.cpp
similarity index 90%
rename from tests/BitcoinGold/TWSignerTests.cpp
rename to tests/chains/BitcoinGold/TWSignerTests.cpp
index f75bc5219a5..02d28a81c4a 100644
--- a/tests/BitcoinGold/TWSignerTests.cpp
+++ b/tests/chains/BitcoinGold/TWSignerTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWAnyAddress.h>
 #include <TrustWalletCore/TWAnySigner.h>
@@ -18,7 +16,7 @@
 #include "HexCoding.h"
 #include "proto/Bitcoin.pb.h"
 #include "../Bitcoin/TxComparisonHelper.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 namespace TW::Bitcoin {
 
@@ -40,7 +38,7 @@ TEST(TWBitcoinGoldSigner, SignTransaction) {
     auto scriptPub1 = Script(parse_hex("0014db746a75d9aae8995d135b1e19a04d7765242a8f"));
     auto scriptHash = std::vector<uint8_t>();
     scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
-    auto scriptHashHex = hex(scriptHash.begin(), scriptHash.end());
+    auto scriptHashHex = hex(scriptHash);
 
     auto redeemScript = Script::buildPayToPublicKeyHash(scriptHash);
     auto scriptString = std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
diff --git a/tests/chains/Blast/TWCoinTypeTests.cpp b/tests/chains/Blast/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6136c26626d
--- /dev/null
+++ b/tests/chains/Blast/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWBlastCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeBlast;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x511fc00e8329343b9e953bf1f75e9b0a7b3cc2eb3a8f049d5be41adf4fbd6cac"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x0d11f2f0ff55c4fcfc3ff86bdc8e78ffa7df99fd"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "blast");
+    assertStringsEqual(name, "Blast");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://blastscan.io/tx/0x511fc00e8329343b9e953bf1f75e9b0a7b3cc2eb3a8f049d5be41adf4fbd6cac");
+    assertStringsEqual(accUrl, "https://blastscan.io/address/0x0d11f2f0ff55c4fcfc3ff86bdc8e78ffa7df99fd");
+}
diff --git a/tests/chains/Boba/TWCoinTypeTests.cpp b/tests/chains/Boba/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..a5e5201bf27
--- /dev/null
+++ b/tests/chains/Boba/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBobaCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBoba));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBoba, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x4F96F50eDB37a19216d87693E5dB241e31bD3735"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBoba, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBoba));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBoba));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBoba), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeBoba));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBoba));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBoba));
+    assertStringsEqual(symbol, "BOBAETH");
+    assertStringsEqual(txUrl, "https://blockexplorer.boba.network/tx/0x31533707c3feb3b10f7deeea387ff8893f229253e65ca6b14d2400bf95b5d103");
+    assertStringsEqual(accUrl, "https://blockexplorer.boba.network/address/0x4F96F50eDB37a19216d87693E5dB241e31bD3735");
+    assertStringsEqual(id, "boba");
+    assertStringsEqual(name, "Boba");
+}
diff --git a/tests/chains/BounceBit/TWCoinTypeTests.cpp b/tests/chains/BounceBit/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..7dbc072273e
--- /dev/null
+++ b/tests/chains/BounceBit/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWBounceBitCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeBounceBit;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x52558f4143d058d942e3b73414090266ae3ffce1fe8c25fe86896e2c8e5ef932"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xf4aa7349a9ccca4609943955b5ddc7bd9278c223"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "bouncebit");
+    assertStringsEqual(name, "BounceBit");
+    assertStringsEqual(symbol, "BB");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://bbscan.io/tx/0x52558f4143d058d942e3b73414090266ae3ffce1fe8c25fe86896e2c8e5ef932");
+    assertStringsEqual(accUrl, "https://bbscan.io/address/0xf4aa7349a9ccca4609943955b5ddc7bd9278c223");
+}
diff --git a/tests/chains/Callisto/TWCoinTypeTests.cpp b/tests/chains/Callisto/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..752e2349656
--- /dev/null
+++ b/tests/chains/Callisto/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWCallistoCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCallisto));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCallisto, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCallisto, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCallisto));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCallisto));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCallisto), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeCallisto));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCallisto));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCallisto));
+    assertStringsEqual(symbol, "CLO");
+    assertStringsEqual(txUrl, "https://explorer.callisto.network/tx/t123");
+    assertStringsEqual(accUrl, "https://explorer.callisto.network/addr/a12");
+    assertStringsEqual(id, "callisto");
+    assertStringsEqual(name, "Callisto");
+}
diff --git a/tests/chains/Cardano/AddressTests.cpp b/tests/chains/Cardano/AddressTests.cpp
new file mode 100644
index 00000000000..c42ea1b5402
--- /dev/null
+++ b/tests/chains/Cardano/AddressTests.cpp
@@ -0,0 +1,561 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cardano/AddressV3.h"
+
+#include "Coin.h"
+#include "HDWallet.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+using namespace std;
+
+namespace TW::Cardano::tests {
+
+const auto dummyKey = parse_hex("1111111111111111111111111111111111111111111111111111111111111111");
+
+TEST(CardanoAddress, V3NetworkIdKind) {
+    EXPECT_EQ(AddressV3::firstByte(AddressV3::Network_Test, AddressV3::Kind_Base), 0);
+    EXPECT_EQ(AddressV3::firstByte(AddressV3::Network_Production, AddressV3::Kind_Base), 1);
+    EXPECT_EQ(AddressV3::firstByte(AddressV3::NetworkId(2), AddressV3::Kind(3)), 50);
+
+    EXPECT_EQ(AddressV3::networkIdFromFirstByte(0), AddressV3::Network_Test);
+    EXPECT_EQ(AddressV3::networkIdFromFirstByte(1), AddressV3::Network_Production);
+    EXPECT_EQ(AddressV3::networkIdFromFirstByte(50), AddressV3::NetworkId(2));
+
+    EXPECT_EQ(AddressV3::kindFromFirstByte(0), AddressV3::Kind_Base);
+    EXPECT_EQ(AddressV3::kindFromFirstByte(1), AddressV3::Kind_Base);
+    EXPECT_EQ(AddressV3::kindFromFirstByte(50), AddressV3::Kind(3));
+}
+
+TEST(CardanoAddress, Validation) {
+    // valid V3 address
+    ASSERT_TRUE(AddressV3::isValidLegacy("addr1v9wa6entm75duchtu50mu6u6hkagdgqzaevt0cwryaw3pnca870vt"));
+    ASSERT_TRUE(AddressV3::isValidLegacy("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23"));
+
+    ASSERT_TRUE(AddressV3::isValid("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23"));
+    ASSERT_TRUE(AddressV3::isValid("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5"));
+    ASSERT_TRUE(AddressV3::isValid("addr1vyuca7esanpgs4ke0um3ft6f4yaeuz3ftpfqx9nxpct2uyqu7dvlp")); // enterprise
+    ASSERT_TRUE(AddressV3::isValid("stake1uy9ggsc9qls4pu9qvyyacwnmr9tt0gzcdt5s0zj4au8qkqc65geks")); // reward
+    ASSERT_TRUE(AddressV3::isValid("addr1sxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qmxapsy")); // kind 8
+
+    // valid V2 address
+    ASSERT_TRUE(AddressV3::isValidLegacy("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx"));
+    ASSERT_TRUE(AddressV3::isValidLegacy("Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W"));
+
+    ASSERT_FALSE(AddressV3::isValid("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx"));
+
+    // valid V1 address
+    ASSERT_TRUE(AddressV3::isValidLegacy("DdzFFzCqrhssmYoG5Eca1bKZFdGS8d6iag1mU4wbLeYcSPVvBNF2wRG8yhjzQqErbg63N6KJA4DHqha113tjKDpGEwS5x1dT2KfLSbSJ"));
+    ASSERT_TRUE(AddressV3::isValidLegacy("DdzFFzCqrht7HGoJ87gznLktJGywK1LbAJT2sbd4txmgS7FcYLMQFhawb18ojS9Hx55mrbsHPr7PTraKh14TSQbGBPJHbDZ9QVh6Z6Di"));
+
+    // invalid V3, invalid network
+    ASSERT_FALSE(AddressV3::isValidLegacy("addr1sna05l45z33zpkm8z44q8f0h57wxvm0c86e34wlmua7gtcrdgrdrzy8ny3walyfjanhe33nsyuh088qr5gepqaen6jsa9r94xvvd7fh6jc3e6x"));
+    // invalid V3, invalid prefix
+    ASSERT_FALSE(AddressV3::isValidLegacy("prefix1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35q3hm7lv"));
+    // invalid V3, length
+    ASSERT_FALSE(AddressV3::isValidLegacy("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32xsmpqws7"));
+    // invalid checksum V3
+    ASSERT_FALSE(AddressV3::isValidLegacy("PREFIX1qvqsyqcyq5rqwzqfpg9scrgwpugpzysnzs23v9ccrydpk8qarc0jqxuzx4s"));
+    // invalid checksum V2
+    ASSERT_FALSE(AddressV3::isValidLegacy("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvm"));
+    // invalid V2 address
+    ASSERT_FALSE(AddressV2::isValid("73Fig6QU8N"));
+    // random
+    ASSERT_FALSE(AddressV3::isValidLegacy("hasoiusaodiuhsaijnnsajnsaiussai"));
+    // empty
+    ASSERT_FALSE(AddressV3::isValidLegacy(""));
+    ASSERT_FALSE(AddressV3::isValidLegacy("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk2"));
+}
+
+TEST(CardanoAddress, FromStringV2) {
+    {
+        auto address = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
+        EXPECT_EQ(hex(address.data()), "01" "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034e" "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+    }
+    {
+        auto address = AddressV3("addr1qxteqxsgxrs4he9d28lh70qu7qfz7saj6dmxwsqyle2yp3xvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35quehtx3");
+        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
+        EXPECT_EQ(hex(address.data()), "01" "97901a0830e15be4ad51ff7f3c1cf0122f43b2d376674004fe5440c4" "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+    }
+    {
+        auto address = AddressV3("addr1q8sfzcwce0fqll3symd7f0amayxqq68nxt2u8pgen9y00tkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35q40ytea");
+        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
+        EXPECT_EQ(hex(address.data()), "01" "e09161d8cbd20ffe3026dbe4bfbbe90c0068f332d5c385199948f7ae" "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+    }
+    {
+        auto address = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
+        ASSERT_EQ(address.string(), "Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
+    }
+    {
+        auto address = AddressV3("DdzFFzCqrhssmYoG5Eca1bKZFdGS8d6iag1mU4wbLeYcSPVvBNF2wRG8yhjzQqErbg63N6KJA4DHqha113tjKDpGEwS5x1dT2KfLSbSJ");
+        ASSERT_EQ(address.string(), "DdzFFzCqrhssmYoG5Eca1bKZFdGS8d6iag1mU4wbLeYcSPVvBNF2wRG8yhjzQqErbg63N6KJA4DHqha113tjKDpGEwS5x1dT2KfLSbSJ");
+    }
+    {
+        EXPECT_ANY_THROW(new AddressV3(""));
+    }
+}
+
+TEST(CardanoAddress, FromStringV3_Base) {
+    {
+        auto address = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+        EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+        EXPECT_EQ(address.string("addr"), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+        EXPECT_EQ(AddressV3::Network_Production, address.networkId);
+        EXPECT_EQ(AddressV3::Kind_Base, address.kind);
+        EXPECT_EQ("8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468", hex(address.bytes));
+    }
+}
+
+TEST(CardanoAddress, FromStringV3_Enterprise) {
+    {
+        auto address = AddressV3("addr1vyuca7esanpgs4ke0um3ft6f4yaeuz3ftpfqx9nxpct2uyqu7dvlp");
+        EXPECT_EQ(address.string(), "addr1vyuca7esanpgs4ke0um3ft6f4yaeuz3ftpfqx9nxpct2uyqu7dvlp");
+        EXPECT_EQ(AddressV3::Network_Production, address.networkId);
+        EXPECT_EQ(AddressV3::Kind_Enterprise, address.kind);
+        EXPECT_EQ("398efb30ecc28856d97f3714af49a93b9e0a2958520316660e16ae10", hex(address.bytes));
+    }
+}
+
+TEST(CardanoAddress, FromStringV3_Reward) {
+    {
+        auto address = AddressV3("stake1uy9ggsc9qls4pu9qvyyacwnmr9tt0gzcdt5s0zj4au8qkqc65geks");
+        EXPECT_EQ(address.string(), "stake1uy9ggsc9qls4pu9qvyyacwnmr9tt0gzcdt5s0zj4au8qkqc65geks");
+        EXPECT_EQ(AddressV3::Network_Production, address.networkId);
+        EXPECT_EQ(AddressV3::Kind_Reward, address.kind);
+        EXPECT_EQ("0a84430507e150f0a06109dc3a7b1956b7a0586ae9078a55ef0e0b03", hex(address.bytes));
+    }
+}
+
+TEST(CardanoAddress, MnemonicToAddressV3) {
+    {
+        // Test from cardano-crypto.js; Test wallet
+        const auto mnemonic = "cost dash dress stove morning robust group affair stomach vacant route volume yellow salute laugh";
+        const auto coin = TWCoinTypeCardano;
+        const auto derivPath = derivationPath(coin);
+
+        const auto wallet = HDWallet(mnemonic, "");
+
+        // check entropy
+        EXPECT_EQ("30a6f50aeb58ff7699b822d63e0ef27aeff17d9f", hex(wallet.getEntropy()));
+
+        {
+            PrivateKey masterPrivKey = wallet.getMasterKey(TWCurve::TWCurveED25519ExtendedCardano);
+            PrivateKey masterPrivKeyExt = wallet.getMasterKeyExtension(TWCurve::TWCurveED25519ExtendedCardano);
+            // the two together matches first half of keypair
+            ASSERT_EQ("a018cd746e128a0be0782b228c275473205445c33b9000a33dd5668b430b5744", hex(masterPrivKey.bytes));
+            ASSERT_EQ("26877cfe435fddda02409b839b7386f3738f10a30b95a225f4b720ee71d2505b", hex(masterPrivKeyExt.bytes));
+
+            PublicKey masterPublicKey = masterPrivKey.getPublicKey(TWPublicKeyTypeED25519);
+            ASSERT_EQ("3aecb95953edd0b16db20366097ddedcb3512fe36193473c5fca2af774d44739", hex(masterPublicKey.bytes));
+        }
+        {
+            string addr = wallet.deriveAddress(TWCoinType::TWCoinTypeCardano);
+            EXPECT_EQ("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq", addr);
+        }
+        {
+            auto addressData = addressToData(TWCoinType::TWCoinTypeCardano, "addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23");
+            EXPECT_EQ(hex(addressData), "01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b");
+        }
+        {
+            const auto privateKey = wallet.getKey(coin, derivPath);
+            EXPECT_EQ(hex(privateKey.bytes), "e8c8c5b2df13f3abed4e6b1609c808e08ff959d7e6fc3d849e3f2880550b574437aa559095324d78459b9bb2da069da32337e1cc5da78f48e1bd084670107f3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fae0d152bb611cb9ff34e945e4ff627e6fba81da687a601a879759cd76530b5744424db69a75edd4780a5fbc05d1a3c84ac4166ff8e424808481dd8e77627ce5f5bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276");
+            const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+
+            const auto address = AddressV3(publicKey);
+            EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+            EXPECT_EQ(address.networkId, AddressV3::Network_Production);
+            EXPECT_EQ(address.kind, AddressV3::Kind_Base);
+            EXPECT_EQ(hex(address.bytes), "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034e"
+                                          "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+        }
+        {
+            PrivateKey privateKey = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/1852'/1815'/0'/0/0"));
+            EXPECT_EQ("e8c8c5b2df13f3abed4e6b1609c808e08ff959d7e6fc3d849e3f2880550b5744", hex(privateKey.key()));
+            EXPECT_EQ("37aa559095324d78459b9bb2da069da32337e1cc5da78f48e1bd084670107f31", hex(privateKey.extension()));
+            EXPECT_EQ("10f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fa", hex(privateKey.chainCode()));
+            EXPECT_EQ("e0d152bb611cb9ff34e945e4ff627e6fba81da687a601a879759cd76530b5744", hex(privateKey.secondKey()));
+            EXPECT_EQ("424db69a75edd4780a5fbc05d1a3c84ac4166ff8e424808481dd8e77627ce5f5", hex(privateKey.secondExtension()));
+            EXPECT_EQ("bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276", hex(privateKey.secondChainCode()));
+            PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+            EXPECT_EQ("fafa7eb4146220db67156a03a5f7a79c666df83eb31abbfbe77c85e06d40da3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26faf4b8d5201961e68f2e177ba594101f513ee70fe70a41324e8ea8eb787ffda6f4bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276", hex(publicKey.bytes));
+            string addr = AddressV3(publicKey).string();
+            EXPECT_EQ("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq", addr);
+        }
+        {
+            PrivateKey privKey0 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/44'/1815'/0'/0/0"));
+            PublicKey pubKey0 = privKey0.getPublicKey(TWPublicKeyTypeED25519Cardano);
+            auto addr0 = AddressV2(pubKey0);
+            EXPECT_EQ("Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W", addr0.string());
+        }
+        {
+            PrivateKey privKey1 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/44'/1815'/0'/0/1"));
+            PublicKey pubKey1 = privKey1.getPublicKey(TWPublicKeyTypeED25519Cardano);
+            auto addr1 = AddressV2(pubKey1);
+            EXPECT_EQ("Ae2tdPwUPEZ7dnds6ZyhQdmgkrDFFPSDh8jG9RAhswcXt1bRauNw5jczjpV", addr1.string());
+        }
+        {
+            PrivateKey privKey1 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/44'/1815'/0'/0/2"));
+            PublicKey pubKey1 = privKey1.getPublicKey(TWPublicKeyTypeED25519Cardano);
+            auto addr1 = AddressV2(pubKey1);
+            EXPECT_EQ("Ae2tdPwUPEZ8LAVy21zj4BF97iWxKCmPv12W6a18zLX3V7rZDFFVgqUBkKw", addr1.string());
+        }
+        {
+            PrivateKey privKey0 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/1852'/1815'/0'/0/0"));
+            PublicKey pubKey0 = privKey0.getPublicKey(TWPublicKeyTypeED25519Cardano);
+            auto addr0 = AddressV3(pubKey0);
+            EXPECT_EQ("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq", addr0.string());
+        }
+        {
+            PrivateKey privKey1 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/1852'/1815'/0'/0/1"));
+            PublicKey pubKey1 = privKey1.getPublicKey(TWPublicKeyTypeED25519Cardano);
+            auto addr1 = AddressV3(pubKey1);
+            EXPECT_EQ("addr1q9068st87h22h3l6w6t5evnlm067rag94llqya2hkjrsd3wvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qpmxzjt", addr1.string());
+        }
+        {
+            PrivateKey privKey1 = wallet.getKey(TWCoinTypeCardano, DerivationPath("m/1852'/1815'/0'/0/2"));
+            PublicKey pubKey1 = privKey1.getPublicKey(TWPublicKeyTypeED25519Cardano);
+            auto addr1 = AddressV3(pubKey1);
+            EXPECT_EQ("addr1qxteqxsgxrs4he9d28lh70qu7qfz7saj6dmxwsqyle2yp3xvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35quehtx3", addr1.string());
+        }
+    }
+    {
+        auto mnemonicPlay1 = "youth away raise north opinion slice dash bus soldier dizzy bitter increase saddle live champion";
+        auto wallet = HDWallet(mnemonicPlay1, "");
+        string addr = wallet.deriveAddress(TWCoinType::TWCoinTypeCardano);
+        EXPECT_EQ("addr1q83nm9ntq3eaz8dya49txxtle6nn8geq4gmyylrzhzs7v0qjdwm6zuahwwds6c7mj8t6a09rup6m2cnh6zvzddnafp2slmcu95", addr);
+    }
+    {
+        auto mnemonicPlay2 = "return custom two home gain guilt kangaroo supply market current curtain tomorrow heavy blue robot";
+        auto wallet = HDWallet(mnemonicPlay2, "");
+        string addr = wallet.deriveAddress(TWCoinType::TWCoinTypeCardano);
+        EXPECT_EQ("addr1qywxuqm7dx0yvqnn2yllye9urz5f2e4fgwanluzh008r22e53hart525dxgjcl0xzm0kes4n5tan8f5pz7ej0tkzgyrqtfmlal", addr);
+    }
+    {
+        auto mnemonicALDemo = "civil void tool perfect avocado sweet immense fluid arrow aerobic boil flash";
+        auto wallet = HDWallet(mnemonicALDemo, "");
+        string addr = wallet.deriveAddress(TWCoinType::TWCoinTypeCardano);
+        EXPECT_EQ("addr1q94zzrtl32tjp8j96auatnhxd2y35fnk6wuxqvqm9364vp9spdkjdsmyfhvfagjzh4uzp9zs6p5djw89jac2g0ujs2eqsuy7pu", addr);
+    }
+    {
+        // V2 Tested against AdaLite
+        auto mnemonicPlay1 = "youth away raise north opinion slice dash bus soldier dizzy bitter increase saddle live champion";
+        auto wallet = HDWallet(mnemonicPlay1, "");
+        PrivateKey privateKey = wallet.getKey(TWCoinTypeCardano, DerivationPath(TWPurposeBIP44, TWCoinTypeCardano, DerivationPathIndex(0, true).derivationIndex(), 0, 0));
+        PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+        string addr = AddressV2(publicKey).string();
+        EXPECT_EQ("Ae2tdPwUPEZJYT9g1JgQWtLveUHavyRxQGi6hVzoQjct7yyCLGgk3pCyx7h", addr);
+    }
+    {
+        // V2 Tested against AdaLite
+        auto mnemonicPlay2 = "return custom two home gain guilt kangaroo supply market current curtain tomorrow heavy blue robot";
+        auto wallet = HDWallet(mnemonicPlay2, "");
+        PrivateKey privateKey = wallet.getKey(TWCoinTypeCardano, DerivationPath(TWPurposeBIP44, TWCoinTypeCardano, DerivationPathIndex(0, true).derivationIndex(), 0, 0));
+        PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+        string addr = AddressV2(publicKey).string();
+        EXPECT_EQ("Ae2tdPwUPEZLtJx7LA2XZ3zzwonH9x9ieX3dMzaTBD3TfXuKczjMSjTecr1", addr);
+    }
+    {
+        // V2 AdaLite Demo phrase, 12-word.  AdaLite uses V1 for it, in V2 it produces different addresses.
+        // In AdaLite V1 addr0 is DdzFFzCqrht7HGoJ87gznLktJGywK1LbAJT2sbd4txmgS7FcYLMQFhawb18ojS9Hx55mrbsHPr7PTraKh14TSQbGBPJHbDZ9QVh6Z6Di
+        auto mnemonicALDemo = "civil void tool perfect avocado sweet immense fluid arrow aerobic boil flash";
+        auto wallet = HDWallet(mnemonicALDemo, "");
+        PrivateKey privateKey = wallet.getKey(TWCoinTypeCardano, DerivationPath(TWPurposeBIP44, TWCoinTypeCardano, DerivationPathIndex(0, true).derivationIndex(), 0, 0));
+        PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+        string addr = AddressV2(publicKey).string();
+        EXPECT_EQ("Ae2tdPwUPEZJbLcD8iLgN7hVGvq66WdR4zocntRekSP97Ds3MvCfmEDjJYu", addr);
+    }
+}
+
+TEST(CardanoAddress, KeyHashV2) {
+    auto xpub = parse_hex("e6f04522f875c1563682ca876ddb04c2e2e3ae718e3ff9f11c03dd9f9dccf69869272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000");
+    auto hash = AddressV2::keyHash(xpub);
+    ASSERT_EQ("a1eda96a9952a56c983d9f49117f935af325e8a6c9d38496e945faa8", hex(hash));
+}
+
+TEST(CardanoAddress, FromDataV3_Base) {
+    auto address0 = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+    EXPECT_EQ(address0.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+    EXPECT_EQ(hex(address0.data()), "018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+    {
+        auto address = AddressV3(parse_hex("018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468"));
+        EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
+        EXPECT_EQ(address.networkId, AddressV3::Network_Production);
+        EXPECT_EQ(hex(address.bytes), "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+    }
+    {
+        auto address = AddressV3::createBase(AddressV3::Network_Production,
+                                             PublicKey(parse_hex("fafa7eb4146220db67156a03a5f7a79c666df83eb31abbfbe77c85e06d40da31"), TWPublicKeyTypeED25519),
+                                             PublicKey(parse_hex("f4b8d5201961e68f2e177ba594101f513ee70fe70a41324e8ea8eb787ffda6f4"), TWPublicKeyTypeED25519));
+        EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+    }
+    {
+        EXPECT_ANY_THROW(AddressV3::createBase(AddressV3::Network_Production,
+                                               PublicKey(parse_hex("039997a497d964fc1a62885b05a51166a65a90df00492c8d7cf61d6accf54803be"), TWPublicKeyTypeSECP256k1),
+                                               PublicKey(parse_hex("f4b8d5201961e68f2e177ba594101f513ee70fe70a41324e8ea8eb787ffda6f4"), TWPublicKeyTypeED25519)));
+    }
+    {
+        EXPECT_ANY_THROW(AddressV3::createBase(AddressV3::Network_Production,
+                                               PublicKey(parse_hex("fafa7eb4146220db67156a03a5f7a79c666df83eb31abbfbe77c85e06d40da31"), TWPublicKeyTypeED25519),
+                                               PublicKey(parse_hex("039997a497d964fc1a62885b05a51166a65a90df00492c8d7cf61d6accf54803be"), TWPublicKeyTypeSECP256k1)));
+    }
+    {
+        EXPECT_ANY_THROW(AddressV3::createBase(AddressV3::Network_Production,
+                                               parse_hex("039997a497d964fc1a62885b05a51166a65a90df00492c8d7cf61d6accf54803be"),
+                                               parse_hex("f4b8d5201961e68f2e177ba594101f513ee70fe70a41324e8ea8eb787ffda6f4")));
+    }
+    {
+        EXPECT_ANY_THROW(AddressV3::createBase(AddressV3::Network_Production,
+                                               parse_hex("fafa7eb4146220db67156a03a5f7a79c666df83eb31abbfbe77c85e06d40da31"),
+                                               parse_hex("039997a497d964fc1a62885b05a51166a65a90df00492c8d7cf61d6accf54803be")));
+    }
+}
+
+TEST(CardanoAddress, FromPrivateKeyV3) {
+    {
+        // from cardano-crypto.js test
+        auto privateKey = PrivateKey(
+            parse_hex("d809b1b4b4c74734037f76aace501730a3fe2fca30b5102df99ad3f7c0103e48"),
+            parse_hex("d54cde47e9041b31f3e6873d700d83f7a937bea746dadfa2c5b0a6a92502356c"),
+            parse_hex("69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"),
+            dummyKey, dummyKey, dummyKey);
+        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+        EXPECT_ANY_THROW(new AddressV3(publicKey));
+    }
+}
+
+TEST(CardanoAddress, FromDataV3_Enterprise) {
+    auto address = AddressV3(parse_hex("61398efb30ecc28856d97f3714af49a93b9e0a2958520316660e16ae10"));
+    EXPECT_EQ(address.string(), "addr1vyuca7esanpgs4ke0um3ft6f4yaeuz3ftpfqx9nxpct2uyqu7dvlp");
+    EXPECT_EQ(address.kind, AddressV3::Kind_Enterprise);
+    EXPECT_EQ(address.networkId, AddressV3::Network_Production);
+    EXPECT_EQ(hex(address.bytes), "398efb30ecc28856d97f3714af49a93b9e0a2958520316660e16ae10");
+}
+
+TEST(CardanoAddress, FromDataV3_Reward) {
+    auto address = AddressV3(parse_hex("e10a84430507e150f0a06109dc3a7b1956b7a0586ae9078a55ef0e0b03"));
+    EXPECT_EQ(address.string(), "stake1uy9ggsc9qls4pu9qvyyacwnmr9tt0gzcdt5s0zj4au8qkqc65geks");
+    EXPECT_EQ(address.kind, AddressV3::Kind_Reward);
+    EXPECT_EQ(address.networkId, AddressV3::Network_Production);
+    EXPECT_EQ(hex(address.bytes), "0a84430507e150f0a06109dc3a7b1956b7a0586ae9078a55ef0e0b03");
+}
+
+TEST(CardanoAddress, FromDataV3_Invalid) {
+    {   // base, invalid length
+        auto address = AddressV3(parse_hex("018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a34"));
+        EXPECT_EQ(address.string(), "addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32xsmpqws7");
+        EXPECT_EQ(address.kind, AddressV3::Kind_Base);
+        EXPECT_EQ(address.networkId, AddressV3::Network_Production);
+        EXPECT_EQ(hex(address.bytes), "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a34");
+    }
+    {   // kind = 8
+        auto address = AddressV3(parse_hex("818d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468"));
+        EXPECT_EQ(address.string(), "addr1sxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qmxapsy");
+        EXPECT_EQ(address.kind, static_cast<AddressV3::Kind>(8));
+        EXPECT_EQ(address.networkId, AddressV3::Network_Production);
+        EXPECT_EQ(hex(address.bytes), "8d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+    }
+}
+
+TEST(CardanoAddress, FromPublicKeyV2) {
+    {
+        // caradano-crypto.js test
+        auto publicKey = PublicKey(parse_hex(
+                                       "e6f04522f875c1563682ca876ddb04c2e2e3ae718e3ff9f11c03dd9f9dccf69869272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"
+                                       "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" // dummy second
+            ), TWPublicKeyTypeED25519Cardano);
+        auto address = AddressV2(publicKey);
+        ASSERT_EQ(address.string(), "Ae2tdPwUPEZCxt4UV1Uj2AMMRvg5pYPypqZowVptz3GYpK4pkcvn3EjkuNH");
+    }
+    {
+        // Adalite test account addr0
+        auto publicKey = PublicKey(parse_hex(
+                                       "57fd54be7b38bb8952782c2f59aa276928a4dcbb66c8c62ce44f9d623ecd5a03bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4"
+                                       "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" // dummy second
+            ), TWPublicKeyTypeED25519Cardano);
+        auto address = AddressV2(publicKey);
+        ASSERT_EQ(address.string(), "Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W");
+    }
+    {
+        // Adalite test account addr1
+        auto publicKey = PublicKey(parse_hex(
+                                       "25af99056d600f7956312406bdd1cd791975bb1ae91c9d034fc65f326195fcdb247ee97ec351c0820dd12de4ca500232f73a35fe6f86778745bcd57f34d1048d"
+                                       "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" // dummy second
+            ), TWPublicKeyTypeED25519Cardano);
+        auto address = AddressV2(publicKey);
+        ASSERT_EQ(address.string(), "Ae2tdPwUPEZ7dnds6ZyhQdmgkrDFFPSDh8jG9RAhswcXt1bRauNw5jczjpV");
+    }
+    {
+        // Play1 addr0
+        auto publicKey = PublicKey(parse_hex(
+                                       "7cee0f30b9d536a786547dd77b35679b6830e945ffde768eb4f2a061b9dba016e513fa1290da1d22e83a41f17eed72d4489483b561fff36b9555ffdb91c430e2"
+                                       "11111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111111" // dummy second
+            ), TWPublicKeyTypeED25519Cardano);
+        auto address = AddressV2(publicKey);
+        ASSERT_EQ(address.string(), "Ae2tdPwUPEZJYT9g1JgQWtLveUHavyRxQGi6hVzoQjct7yyCLGgk3pCyx7h");
+    }
+}
+
+TEST(CardanoAddress, FromPrivateKeyV2) {
+    {
+        // mnemonic Test, addr0
+        auto privateKey = PrivateKey(
+            parse_hex("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744"),
+            parse_hex("309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71eff"),
+            parse_hex("bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4"),
+            dummyKey, dummyKey, dummyKey
+        );
+        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+        ASSERT_EQ(hex(publicKey.bytes),
+                  "57fd54be7b38bb8952782c2f59aa276928a4dcbb66c8c62ce44f9d623ecd5a03"
+                  "bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4"
+                  "857eed804ff087b97f87848f6493e87257a8c5203cb9f422f6e7a7d8a4d299f3"
+                  "1111111111111111111111111111111111111111111111111111111111111111");
+        auto address = AddressV2(publicKey);
+        ASSERT_EQ(address.string(), "Ae2tdPwUPEZ6RUCnjGHFqi59k5WZLiv3HoCCNGCW8SYc5H9srdTzn1bec4W");
+    }
+    {
+        // mnemonic Play1, addr0
+        auto privateKey = PrivateKey(
+            parse_hex("a089c9423100960440ccd5b7adbd202d1ab1993a7bb30fc88b287d94016df247"),
+            parse_hex("da86a87f08fb15de1431a6c0ccd5ebf51c3bee81f7eaf714801bbbe4d903154a"),
+            parse_hex("e513fa1290da1d22e83a41f17eed72d4489483b561fff36b9555ffdb91c430e2"),
+            dummyKey, dummyKey, dummyKey
+        );
+        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+        ASSERT_EQ(hex(publicKey.bytes),
+                  "7cee0f30b9d536a786547dd77b35679b6830e945ffde768eb4f2a061b9dba016"
+                  "e513fa1290da1d22e83a41f17eed72d4489483b561fff36b9555ffdb91c430e2"
+                  "857eed804ff087b97f87848f6493e87257a8c5203cb9f422f6e7a7d8a4d299f3"
+                  "1111111111111111111111111111111111111111111111111111111111111111");
+        auto address = AddressV2(publicKey);
+        ASSERT_EQ(address.string(), "Ae2tdPwUPEZJYT9g1JgQWtLveUHavyRxQGi6hVzoQjct7yyCLGgk3pCyx7h");
+    }
+    {
+        // from cardano-crypto.js test
+        auto privateKey = PrivateKey(
+            parse_hex("d809b1b4b4c74734037f76aace501730a3fe2fca30b5102df99ad3f7c0103e48"),
+            parse_hex("d54cde47e9041b31f3e6873d700d83f7a937bea746dadfa2c5b0a6a92502356c"),
+            parse_hex("69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"),
+            dummyKey, dummyKey, dummyKey
+        );
+        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+        ASSERT_EQ(hex(publicKey.bytes),
+                  "e6f04522f875c1563682ca876ddb04c2e2e3ae718e3ff9f11c03dd9f9dccf698"
+                  "69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"
+                  "857eed804ff087b97f87848f6493e87257a8c5203cb9f422f6e7a7d8a4d299f3"
+                  "1111111111111111111111111111111111111111111111111111111111111111");
+        auto address = AddressV2(publicKey);
+        ASSERT_EQ(address.string(), "Ae2tdPwUPEZCxt4UV1Uj2AMMRvg5pYPypqZowVptz3GYpK4pkcvn3EjkuNH");
+    }
+    {
+        // from cardano-crypto.js test
+        auto privateKey = PrivateKey(
+            parse_hex("d809b1b4b4c74734037f76aace501730a3fe2fca30b5102df99ad3f7c0103e48"),
+            parse_hex("d54cde47e9041b31f3e6873d700d83f7a937bea746dadfa2c5b0a6a92502356c"),
+            parse_hex("69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"),
+            dummyKey, dummyKey, dummyKey);
+        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+        EXPECT_ANY_THROW(new AddressV2(publicKey));
+    }
+}
+
+TEST(CardanoAddress, PrivateKeyExtended) {
+    // check extended key lengths, private key 2x3x32 bytes, public key 2x64 bytes
+    auto privateKeyExt = PrivateKey(
+        parse_hex("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744"),
+        parse_hex("309941d56938e943980d11643c535e046653ca6f498c014b88f2ad9fd6e71eff"),
+        parse_hex("bf36a8fa9f5e11eb7a852c41e185e3969d518e66e6893c81d3fc7227009952d4"),
+        dummyKey, dummyKey, dummyKey
+    );
+    auto publicKeyExt = privateKeyExt.getPublicKey(TWPublicKeyTypeED25519Cardano);
+    ASSERT_EQ(128ul, publicKeyExt.bytes.size());
+
+    // Non-extended: both are 32 bytes.
+    auto privateKeyNonext = PrivateKey(
+        parse_hex("b0884d248cb301edd1b34cf626ba6d880bb3ae8fd91b4696446999dc4f0b5744"));
+    auto publicKeyNonext = privateKeyNonext.getPublicKey(TWPublicKeyTypeED25519);
+    ASSERT_EQ(32ul, publicKeyNonext.bytes.size());
+}
+
+TEST(CardanoAddress, FromStringNegativeInvalidString) {
+    try {
+        auto address = AddressV3("__INVALID_ADDRESS__");
+    } catch (...) {
+        return;
+    }
+    FAIL() << "Expected exception!";
+}
+
+TEST(CardanoAddress, FromStringNegativeBadChecksumV2) {
+    try {
+        auto address = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvm");
+    } catch (...) {
+        return;
+    }
+    FAIL() << "Expected exception!";
+}
+
+TEST(CardanoAddress, CopyConstructorLegacy) {
+    AddressV3 address1 = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
+    EXPECT_TRUE(address1.legacyAddressV2.has_value());
+    AddressV3 address2 = AddressV3(address1);
+    EXPECT_TRUE(address2.legacyAddressV2.has_value());
+    EXPECT_TRUE(*(address2.legacyAddressV2) == *(address1.legacyAddressV2));
+    // if it was not a deep copy, double freeing would occur
+}
+
+TEST(CardanoAddress, AssignmentOperatorLegacy) {
+    AddressV3 addr1leg = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
+    EXPECT_TRUE(addr1leg.legacyAddressV2.has_value());
+    AddressV3 addr2nonleg = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+    EXPECT_FALSE(addr2nonleg.legacyAddressV2.has_value());
+    AddressV3 addr3leg = AddressV3("Ae2tdPwUPEZ18ZjTLnLVr9CEvUEUX4eW1LBHbxxxJgxdAYHrDeSCSbCxrvx");
+    EXPECT_TRUE(addr3leg.legacyAddressV2.has_value());
+
+    AddressV3 address = addr1leg;
+    EXPECT_TRUE(address.legacyAddressV2.has_value());
+    EXPECT_TRUE(*address.legacyAddressV2 == *addr1leg.legacyAddressV2);
+    address = addr2nonleg;
+    EXPECT_FALSE(address.legacyAddressV2.has_value());
+    address = addr3leg;
+    EXPECT_TRUE(address.legacyAddressV2.has_value());
+    EXPECT_TRUE(*address.legacyAddressV2 == *addr3leg.legacyAddressV2);
+}
+
+TEST(CardanoAddress, StakingKey) {
+    {
+        auto address = AddressV3("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23");
+        EXPECT_EQ(hex(address.data()), "01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b");
+        EXPECT_EQ(address.getStakingAddress(), "stake1u80jysjtdzqt88jt4jx93h5lumfr67d273r4vwyasfa2pxcwxllmx");
+        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).data()), "e1df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b");
+        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).bytes), "df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b");
+    }
+    {
+        auto address = AddressV3("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+        EXPECT_EQ(hex(address.data()), "018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+        EXPECT_EQ(address.getStakingAddress(), "stake1u8xxf0e93w8rxr8sehvlmvp7zz6wftqg7hdplhkxyg4rg6qwgxzhc");
+        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).data()), "e1cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).bytes), "cc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468");
+    }
+    {
+        auto address = AddressV3("addr1q8lcljuzfg8yvpuv94x02sytmwd8jsalzf6u0j8muhq69wng9ejcvpyczmw0zx7wguq2dml4xdl2wj3k7uexsfnxep2q9ja352");
+        EXPECT_EQ(hex(address.data()), "01ff8fcb824a0e46078c2d4cf5408bdb9a7943bf1275c7c8fbe5c1a2ba682e6586049816dcf11bce4700a6eff5337ea74a36f732682666c854");
+        EXPECT_EQ(address.getStakingAddress(), "stake1u95zuevxqjvpdh83r08ywq9xal6nxl48fgm0wvngyenvs4qh0hqf9");
+        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).data()), "e1682e6586049816dcf11bce4700a6eff5337ea74a36f732682666c854");
+        EXPECT_EQ(hex(AddressV3(address.getStakingAddress()).bytes), "682e6586049816dcf11bce4700a6eff5337ea74a36f732682666c854");
+    }
+    {   // negative case: cannot get staking address from non-base address
+        auto address = AddressV3("stake1u95zuevxqjvpdh83r08ywq9xal6nxl48fgm0wvngyenvs4qh0hqf9");
+        EXPECT_EQ(hex(address.data()), "e1682e6586049816dcf11bce4700a6eff5337ea74a36f732682666c854");
+        EXPECT_EQ(address.getStakingAddress(), "");
+    }
+}
+
+} // namespace TW::Cardano::tests
diff --git a/tests/chains/Cardano/SigningTests.cpp b/tests/chains/Cardano/SigningTests.cpp
new file mode 100644
index 00000000000..83be54b7926
--- /dev/null
+++ b/tests/chains/Cardano/SigningTests.cpp
@@ -0,0 +1,1072 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cardano/AddressV3.h"
+#include "Cardano/Signer.h"
+#include "proto/Cardano.pb.h"
+#include <TrustWalletCore/TWCardano.h>
+
+#include "Cbor.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+using namespace std;
+
+namespace TW::Cardano::SigningTests {
+
+const auto privateKeyTest1 = "089b68e458861be0c44bf9f7967f05cc91e51ede86dc679448a3566990b7785bd48c330875b1e0d03caaed0e67cecc42075dce1c7a13b1c49240508848ac82f603391c68824881ae3fc23a56a1a75ada3b96382db502e37564e84a5413cfaf1290dbd508e5ec71afaea98da2df1533c22ef02a26bb87b31907d0b2738fb7785b38d53aa68fc01230784c9209b2b2a2faf28491b3b1f1d221e63e704bbd0403c4154425dfbb01a2c5c042da411703603f89af89e57faae2946e2a5c18b1c5ca0e";
+const auto ownAddress1 = "addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23";
+const auto sundaeTokenPolicy = "9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77";
+
+TEST(CardanoSigning, SelectInputs) {
+    const auto inputs = std::vector<TxInput>({
+        TxInput{{parse_hex("0001"), 0}, "ad01", 700, {}},
+        TxInput{{parse_hex("0002"), 1}, "ad02", 900, {}},
+        TxInput{{parse_hex("0003"), 2}, "ad03", 300, {}},
+        TxInput{{parse_hex("0004"), 3}, "ad04", 600, {}},
+    });
+
+    { // 2
+        const auto s1 = Signer::selectInputsWithTokens(inputs, 1500, {});
+        ASSERT_EQ(s1.size(), 2ul);
+        EXPECT_EQ(s1[0].amount, 900ul);
+        EXPECT_EQ(s1[1].amount, 700ul);
+    }
+    { // all
+        const auto s1 = Signer::selectInputsWithTokens(inputs, 10000, {});
+        ASSERT_EQ(s1.size(), 4ul);
+        EXPECT_EQ(s1[0].amount, 900ul);
+        EXPECT_EQ(s1[1].amount, 700ul);
+        EXPECT_EQ(s1[2].amount, 600ul);
+        EXPECT_EQ(s1[3].amount, 300ul);
+    }
+    { // 3
+        const auto s1 = Signer::selectInputsWithTokens(inputs, 2000, {});
+        ASSERT_EQ(s1.size(), 3ul);
+    }
+    { // 1
+        const auto s1 = Signer::selectInputsWithTokens(inputs, 500, {});
+        ASSERT_EQ(s1.size(), 1ul);
+    }
+    { // at least 0 is returned
+        const auto s1 = Signer::selectInputsWithTokens(inputs, 0, {});
+        ASSERT_EQ(s1.size(), 1ul);
+    }
+}
+
+Proto::SigningInput createSampleInput(uint64_t amount, int utxoCount = 10,
+                                      const std::string& alternateToAddress = "", bool omitPrivateKey = false) {
+    const std::string toAddress = (alternateToAddress.length() > 0) ? alternateToAddress : "addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5";
+
+    Proto::SigningInput input;
+    if (utxoCount >= 1) {
+        auto* utxo1 = input.add_utxos();
+        const auto txHash1 = parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767");
+        utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+        utxo1->mutable_out_point()->set_output_index(1);
+        utxo1->set_address(ownAddress1);
+        utxo1->set_amount(1500000);
+    }
+    if (utxoCount >= 2) {
+        auto* utxo2 = input.add_utxos();
+        const auto txHash2 = parse_hex("554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0");
+        utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
+        utxo2->mutable_out_point()->set_output_index(0);
+        utxo2->set_address(ownAddress1);
+        utxo2->set_amount(6500000);
+    }
+
+    if (!omitPrivateKey) {
+        const auto privateKeyData = parse_hex(privateKeyTest1);
+        input.add_private_key(privateKeyData.data(), privateKeyData.size());
+    }
+    input.mutable_transfer_message()->set_to_address(toAddress);
+    input.mutable_transfer_message()->set_change_address(ownAddress1);
+    input.mutable_transfer_message()->set_amount(amount);
+    input.mutable_transfer_message()->set_use_max_amount(false);
+    input.set_ttl(53333333);
+    return input;
+}
+
+/// Successfully broadcasted:
+/// https://cardanoscan.io/transaction/87ca43a36b09c0b140f0ef2b71fbdcfcf1fdc88f7aa378b861e8eed3e8974628
+TEST(CardanoSigning, SendNft) {
+    const auto fromAddressPrivKey = "d09831a668db6b36ffb747600cb1cd3e3d34f36e1e6feefc11b5f988719b7557a7029ab80d3e6fe4180ad07a59ddf742ea9730f3c4145df6365fa4ae2ee49c3392e19444caf461567727b7fefec40a3763bdb6ce5e0e8c05f5e340355a8fef4528dfe7502cfbda49e38f5a0021962d52dc3dee82834a23abb6750981799b75577d1ed9af9853707f0ef74264274e71b2f12e86e3c91314b6efa75ef750d9711b84cedd742ab873ef2f9566ad20b3fc702232c6d2f5d83ff425019234037d1e58";
+    const auto fromAddress = "addr1qy5eme9r6frr0m6q2qpncg282jtrhq5lg09uxy2j0545hj8rv7v2ntdxuv6p4s3eq4lqzg39lewgvt6fk5kmpa0zppesufzjud";
+    const auto toAddress = "addr1qy9wjfn6nd8kak6dd8z53u7t5wt9f4lx0umll40px5hnq05avwcsq5r3ytdp36wttzv4558jaq8lvhgqhe3y8nuf5xrquju7z4";
+    const auto nftPolicyId = "219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5e";
+    const auto nftAssetName = "coolcatssociety4567";
+    const auto nftTokenAmount = 1ul;
+    // 1.20249 ADA. Amount locked by the NFT.
+    const auto nftInputAmount = 1202490ul;
+    const auto ttl = 89130965ul;
+
+    Proto::SigningInput input;
+
+    // Set the first utxo (NFT token and locked ADA).
+
+    auto* utxo1 = input.add_utxos();
+    // NFT unspent output.
+    const auto txHash1 = parse_hex("aba499ec2f23529e70bb256ceaffcc6274a882cf02f29e5670c75ee980d7c2b8");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(0);
+    utxo1->set_address(fromAddress);
+    utxo1->set_amount(nftInputAmount);
+
+    auto* token1 = utxo1->add_token_amount();
+    token1->set_policy_id(nftPolicyId);
+    token1->set_asset_name(nftAssetName);
+    const auto tokenAmount1 = store(uint256_t(nftTokenAmount));
+    token1->set_amount(tokenAmount1.data(), tokenAmount1.size());
+
+    // Set additional utxos to pay fee.
+
+    auto* utxo2 = input.add_utxos();
+    const auto txHash2 = parse_hex("ee414d635b3bc67831907354d274a31174664777c57c21ae923b9459e5644840");
+    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
+    utxo2->mutable_out_point()->set_output_index(0);
+    utxo2->set_address(fromAddress);
+    utxo2->set_amount(1000000);
+
+    auto* utxo3 = input.add_utxos();
+    const auto txHash3 = parse_hex("6a7221dcc28353ed69b733391ffeb984a34c1e72293af111d59f9ddfa8639167");
+    utxo3->mutable_out_point()->set_tx_hash(txHash3.data(), txHash3.size());
+    utxo3->mutable_out_point()->set_output_index(0);
+    utxo3->set_address(fromAddress);
+    utxo3->set_amount(2000000);
+
+    PrivateKey privKey(parse_hex(fromAddressPrivKey));
+    input.add_private_key(privKey.bytes.data(), privKey.bytes.size());
+
+    // Set an output info.
+
+    input.mutable_transfer_message()->set_to_address(toAddress);
+    input.mutable_transfer_message()->set_change_address(fromAddress);
+    input.mutable_transfer_message()->set_amount(nftInputAmount);
+
+    auto* toToken = input.mutable_transfer_message()->mutable_token_amount()->add_token();
+    toToken->set_policy_id(nftPolicyId);
+    toToken->set_asset_name(nftAssetName);
+    const auto toTokenAmount = store(uint256_t(nftTokenAmount));
+    toToken->set_amount(toTokenAmount.data(), toTokenAmount.size());
+    input.set_ttl(ttl);
+
+    { // check min ADA amount
+        // The byte cost at the moment when the transaction was constructed.
+        // See `ProtocolParams::coinsPerUtxoByte`:
+        // https://input-output-hk.github.io/cardano-graphql/
+        const auto coinsPerUtxoByte = STRING("4310");
+
+        const auto bundleProtoData = data(input.transfer_message().token_amount().SerializeAsString());
+        const auto toAddressPtr = STRING(toAddress);
+
+        const auto minAdaAmount = WRAPS(TWCardanoOutputMinAdaAmount(toAddressPtr.get(), &bundleProtoData, coinsPerUtxoByte.get()));
+        assertStringsEqual(minAdaAmount, std::to_string(nftInputAmount).c_str());
+        EXPECT_EQ(input.transfer_message().amount(), nftInputAmount);
+    }
+
+    // run plan and check result
+    auto signer = Signer(input);
+    const auto plan = signer.doPlan();
+    const auto output = signer.sign();
+
+    const auto txid = hex(data(output.tx_id()));
+    EXPECT_EQ(txid, "87ca43a36b09c0b140f0ef2b71fbdcfcf1fdc88f7aa378b861e8eed3e8974628");
+
+    EXPECT_EQ(plan.availableAmount, nftInputAmount + 1000000ul + 2000000ul);
+    EXPECT_EQ(plan.amount, nftInputAmount);
+    EXPECT_EQ(plan.fee, 176539ul);
+    EXPECT_EQ(plan.change, 1000000ul + 2000000ul - 176539ul);
+    EXPECT_EQ(plan.utxos.size(), 3ul);
+    EXPECT_EQ(plan.availableTokens.size(), nftTokenAmount);
+    EXPECT_EQ(plan.availableTokens.getAmount("219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5e_coolcatssociety4567"), nftTokenAmount);
+    EXPECT_EQ(plan.outputTokens.size(), 1ul);
+    EXPECT_EQ(plan.outputTokens.getAmount("219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5e_coolcatssociety4567"), nftTokenAmount);
+    EXPECT_EQ(plan.changeTokens.size(), 0ul);
+
+    const auto txHex = hex(data(output.encoded()));
+    EXPECT_EQ(txHex, "83a400838258206a7221dcc28353ed69b733391ffeb984a34c1e72293af111d59f9ddfa863916700825820aba499ec2f23529e70bb256ceaffcc6274a882cf02f29e5670c75ee980d7c2b800825820ee414d635b3bc67831907354d274a31174664777c57c21ae923b9459e5644840000182825839010ae9267a9b4f6edb4d69c548f3cba39654d7e67f37ffd5e1352f303e9d63b100507122da18e9cb58995a50f2e80ff65d00be6243cf89a186821a0012593aa1581c219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5ea153636f6f6c63617473736f6369657479343536370182583901299de4a3d24637ef4050033c214754963b829f43cbc311527d2b4bc8e36798a9ada6e3341ac239057e012225fe5c862f49b52db0f5e208731a002b1525021a0002b19b031a055007d5a1008182582088bd26e8656fa7dead846c3373588f0192da5bfb90bf5d3fb877decfb3b3fd085840da8656aca0dacc57d4c2d957fc7dff03908f6dcf60c48f1e40b3006e2fd0cfacfa4c24fa02e35a310572526586d4ce0d30bf660ba274c8efd507848cbe177d09f6");
+}
+
+TEST(CardanoSigning, Plan) {
+    auto input = createSampleInput(7000000);
+
+    {
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.utxos.size(), 2ul);
+        EXPECT_EQ(plan.availableAmount, 8000000ul);
+        EXPECT_EQ(plan.amount, 7000000ul);
+        EXPECT_EQ(plan.fee, 170196ul);
+        EXPECT_EQ(plan.change, 829804ul);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+        EXPECT_EQ(plan.error, Common::Proto::OK);
+    }
+    { // very small target amount
+        input.mutable_transfer_message()->set_amount(1);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.utxos.size(), 1ul);
+        EXPECT_EQ(plan.availableAmount, 6500000ul);
+        EXPECT_EQ(plan.amount, 1ul);
+        EXPECT_EQ(plan.fee, 168435ul);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+    }
+    { // small target amount
+        input.mutable_transfer_message()->set_amount(2000000);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.utxos.size(), 1ul);
+        EXPECT_EQ(plan.availableAmount, 6500000ul);
+        EXPECT_EQ(plan.amount, 2000000ul);
+        EXPECT_EQ(plan.fee, 168611ul);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+    }
+    { // small target amount requested, but max amount
+        input.mutable_transfer_message()->set_amount(2000000);
+        input.mutable_transfer_message()->set_use_max_amount(true);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.utxos.size(), 2ul);
+        EXPECT_EQ(plan.availableAmount, 8000000ul);
+        EXPECT_EQ(plan.amount, 7832667ul);
+        EXPECT_EQ(plan.fee, 167333ul);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+    }
+}
+
+TEST(CardanoSigning, ExtraOutputPlan) {
+    auto input = createSampleInput(2000000, 10, "addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5", true);
+    // two output
+    Proto::TxOutput txOutput;
+    txOutput.set_address("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
+    txOutput.set_amount(2000000);
+    *input.add_extra_outputs() = txOutput;
+    auto signer = Signer(input);
+    const auto plan = signer.doPlan();
+    EXPECT_EQ(plan.utxos.size(), 1ul);
+    EXPECT_EQ(plan.availableAmount, 6500000ul);
+    EXPECT_EQ(plan.amount, 2000000ul);
+    EXPECT_EQ(plan.fee, 171474ul);
+    uint64_t extraAmountSum = 0;
+    for (auto& output: plan.extraOutputs) {
+        extraAmountSum = extraAmountSum + output.amount;
+    }
+    EXPECT_EQ(plan.amount + plan.change + plan.fee + extraAmountSum, plan.availableAmount);
+
+    {
+        // also test proto fromProto / fromProto
+        Proto::TxOutput txOutputProto;
+        txOutputProto.set_address("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
+        txOutputProto.set_amount(2000000);
+
+        auto* token = txOutputProto.add_token_amount();
+        token->set_policy_id(sundaeTokenPolicy);
+        token->set_asset_name_hex("43554259");
+        const auto tokenAmount = store(uint256_t(3000000));
+        token->set_amount(tokenAmount.data(), tokenAmount.size());
+
+        const auto txOutput1 = TxOutput::fromProto(txOutputProto);
+        EXPECT_EQ(txOutput1.amount, 2000000ul);
+        const auto toAddress = AddressV3(txOutput1.address);
+        EXPECT_EQ(toAddress.string(), "addr1v9jxgu33wyunycmdddnh5a3edq6x2dt3xakkuun6wd6hsar8v9uhvee5w9erw7fnvauhswfhw44k673nv3n8sdmj89n82denweckuv34xvmnw6m9xeerq7rt8ymh5aesxaj8zu3e0y6k67tcd3nkzervxfenqer8ddjn27jkkrj");
+        EXPECT_EQ(txOutput1.tokenBundle.getByPolicyId(sundaeTokenPolicy)[0].amount, 3000000);
+        EXPECT_EQ(txOutput1.tokenBundle.getByPolicyId(sundaeTokenPolicy)[0].assetName, data("CUBY"));
+        EXPECT_EQ(txOutput1.tokenBundle.getByPolicyId(sundaeTokenPolicy)[0].policyId, sundaeTokenPolicy);
+    }
+    {
+        // also test proto toProto / toProto
+        const auto toAddress = AddressV3("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
+        std::vector<TokenAmount> tokenAmount;
+        tokenAmount.emplace_back(sundaeTokenPolicy, data("CUBY"), 3000000);
+        const Proto::TxOutput txOutputProto = TxOutput(toAddress.data(), 2000000, TokenBundle(tokenAmount)).toProto();
+        EXPECT_EQ(txOutputProto.amount(), 2000000ul);
+        EXPECT_EQ(txOutputProto.address(), "addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
+        const auto token = txOutputProto.token_amount(0);
+        EXPECT_EQ(token.policy_id(), sundaeTokenPolicy);
+        EXPECT_EQ(token.asset_name(), "CUBY");
+        EXPECT_EQ(token.asset_name_hex(), "43554259");
+        const auto amount = store(uint256_t(3000000));
+        EXPECT_EQ(data(token.amount()), amount);
+    }
+
+    {
+        // also test proto toProto / fromProto
+        const Proto::TransactionPlan planProto = Signer::plan(input);
+        const auto plan2 = TransactionPlan::fromProto(planProto);
+        EXPECT_EQ(plan2.amount, 2000000ul);
+        EXPECT_EQ(plan2.change, 2328526ul);
+    }
+}
+
+TEST(CardanoSigning, ErrorDoPlan) {
+    {
+        // Common::Proto::Error_missing_input_utxos
+        auto input = createSampleInput(2000000, 0, "addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5", true);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.error, Common::Proto::Error_missing_input_utxos);
+    }
+    {
+        // Common::Proto::Error_low_balance
+        auto input = createSampleInput(9000000, 1, "addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5", true);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.error, Common::Proto::Error_low_balance);
+
+    }
+}
+
+TEST(CardanoSigning, PlanForceFee) {
+    auto requestedAmount = 6500000ul;
+    auto availableAmount = 8000000ul;
+    auto input = createSampleInput(requestedAmount);
+
+    {
+        auto fee = 170147ul;
+        input.mutable_transfer_message()->set_force_fee(fee);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.availableAmount, availableAmount);
+        EXPECT_EQ(plan.amount, requestedAmount);
+        EXPECT_EQ(plan.fee, fee);
+        EXPECT_EQ(plan.change, availableAmount - requestedAmount - fee);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+        EXPECT_EQ(plan.error, Common::Proto::OK);
+    }
+    { // tiny fee
+        auto fee = 100ul;
+        input.mutable_transfer_message()->set_force_fee(fee);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.availableAmount, availableAmount);
+        EXPECT_EQ(plan.amount, requestedAmount);
+        EXPECT_EQ(plan.fee, fee);
+        EXPECT_EQ(plan.change, availableAmount - requestedAmount - fee);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+    }
+    { // large fee
+        auto fee = 1200000ul;
+        input.mutable_transfer_message()->set_force_fee(fee);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.availableAmount, availableAmount);
+        EXPECT_EQ(plan.amount, requestedAmount);
+        EXPECT_EQ(plan.fee, fee);
+        EXPECT_EQ(plan.change, availableAmount - requestedAmount - fee);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+    }
+    { // very large fee, larger than possible, truncated
+        auto fee = 3000000ul;
+        input.mutable_transfer_message()->set_force_fee(fee);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.availableAmount, availableAmount);
+        EXPECT_EQ(plan.amount, requestedAmount);
+        EXPECT_EQ(plan.fee, 1500000ul);
+        EXPECT_EQ(plan.change, 0ul);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+    }
+    { // force fee and max amount: fee is used, amount is max, change 0
+        auto fee = 160000ul;
+        input.mutable_transfer_message()->set_force_fee(fee);
+        input.mutable_transfer_message()->set_use_max_amount(true);
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+        EXPECT_EQ(plan.availableAmount, availableAmount);
+        EXPECT_EQ(plan.amount, 7840000ul);
+        EXPECT_EQ(plan.fee, fee);
+        EXPECT_EQ(plan.change, 0ul);
+        EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+    }
+}
+
+TEST(CardanoSigning, PlanMissingPrivateKey) {
+    auto input = createSampleInput(7000000, 10, "", true);
+
+    auto signer = Signer(input);
+    const auto plan = signer.doPlan();
+
+    EXPECT_EQ(plan.utxos.size(), 2ul);
+    EXPECT_EQ(plan.availableAmount, 8000000ul);
+    EXPECT_EQ(plan.amount, 7000000ul);
+    EXPECT_EQ(plan.fee, 170196ul);
+    EXPECT_EQ(plan.change, 829804ul);
+    EXPECT_EQ(plan.amount + plan.change + plan.fee, plan.availableAmount);
+    EXPECT_EQ(plan.error, Common::Proto::OK);
+}
+
+TEST(CardanoSigning, SignTransfer1) {
+    const auto input = createSampleInput(7000000);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a40082825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a006acfc082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a000ca96c021a000298d4031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058407cf591599852b5f5e007fdc241062405c47e519266c0d884b0767c1d4f5eacce00db035998e53ed10ca4ba5ce4aac8693798089717ce6cf4415f345cc764200ef6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "9b5b15e133cd73ccaa85307d2986aebc846505118a2eb4e6111e6b4b67d1f389");
+
+    {
+        const auto decode = Cbor::Decode(encoded);
+        ASSERT_TRUE(decode.isValid());
+        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0\", 0], [h\"f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767\", 1]], 1: [[h\"01558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd5\", 7000000], [h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 829804]], 2: 170196, 3: 53333333}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"7cf591599852b5f5e007fdc241062405c47e519266c0d884b0767c1d4f5eacce00db035998e53ed10ca4ba5ce4aac8693798089717ce6cf4415f345cc764200e\"]]}, null]");
+        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
+    }
+}
+
+TEST(CardanoSigning, PlanAndSignTransfer1) {
+    uint amount = 6000000;
+    auto input = createSampleInput(amount);
+
+    {
+        // run plan and check result
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+
+        EXPECT_EQ(plan.availableAmount, 8000000ul);
+        EXPECT_EQ(plan.amount, amount);
+        EXPECT_EQ(plan.fee, 170196ul);
+        EXPECT_EQ(plan.change, 8000000 - amount - 170196);
+        ASSERT_EQ(plan.utxos.size(), 2ul);
+        EXPECT_EQ(plan.utxos[0].amount, 6500000ul);
+        EXPECT_EQ(plan.utxos[1].amount, 1500000ul);
+
+        // perform sign with default plan
+        const auto output = signer.sign();
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+
+        const auto encoded = data(output.encoded());
+        EXPECT_EQ(hex(encoded), "83a40082825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a005b8d8082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a001bebac021a000298d4031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058404abc749ffaffcf2f87970e4f1983c5e44b352ee1515b60017fc65e581d42b3a6ed146d5eb35d04a770460b0541a25afd5aedfd027fdaded82686f43454196a0cf6");
+        const auto txid = data(output.tx_id());
+        EXPECT_EQ(hex(txid), "3852f809245d7000ad0c5ccb1357e5d333b0dd25158924581e4c7049ec68c564");
+    }
+
+    // set different plan, with one input only
+    input.mutable_plan()->set_amount(amount);
+    input.mutable_plan()->set_available_amount(6500000);
+    input.mutable_plan()->set_fee(165489);
+    input.mutable_plan()->set_change(17191988);
+    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
+    input.mutable_plan()->set_error(Common::Proto::OK);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a40081825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a005b8d8082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a01065434021a00028671031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058408311a058035d75545a47b844fea401aa9c23e99fe7bc8136b554396eef135d4cd93062c5df38e613185c21bb1c98b881d1e0fd1024d3539b163c8e14d1a6e40df6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "e319c0bfc99cdb79d64f00b7e8fb8bfbf29fa70554c84f101e92b7dfed172448");
+}
+
+TEST(CardanoSigning, PlanAndSignMaxAmount) {
+    auto input = createSampleInput(7000000);
+    input.mutable_transfer_message()->set_use_max_amount(true);
+
+    {
+        // run plan and check result
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+
+        EXPECT_EQ(plan.availableAmount, 8000000ul);
+        EXPECT_EQ(plan.amount, 8000000 - 167333ul);
+        EXPECT_EQ(plan.fee, 167333ul);
+        EXPECT_EQ(plan.change, 0ul);
+        ASSERT_EQ(plan.utxos.size(), 2ul);
+        EXPECT_EQ(plan.utxos[0].amount, 1500000ul);
+        EXPECT_EQ(plan.utxos[1].amount, 6500000ul);
+    }
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a40082825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000018182583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a0077845b021a00028da5031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058403e64473e08adc863953c0e9f820b658dda0b8a423d6172fdccff73fcd5559956c9df8ed93ff67405331d368a0c11fd18c69781046384946582e1555e9e8ec70bf6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "ca0f1e12f20c95011da7d686d206a1eb98df94accd74c4df4ef403c5ce836057");
+}
+
+TEST(CardanoSigning, SignNegative) {
+    { // plan with error
+        auto input = createSampleInput(7000000);
+        const auto error = Common::Proto::Error_invalid_memo;
+        input.mutable_plan()->set_error(error);
+        auto signer = Signer(input);
+        const auto output = signer.sign();
+        EXPECT_EQ(output.error(), error);
+    }
+    { // zero requested amount
+        auto input = createSampleInput(0);
+        auto signer = Signer(input);
+        const auto output = signer.sign();
+        EXPECT_EQ(output.error(), Common::Proto::Error_zero_amount_requested);
+    }
+    { // no utxo
+        auto input = createSampleInput(7000000, 0);
+        auto signer = Signer(input);
+        const auto output = signer.sign();
+        EXPECT_EQ(output.error(), Common::Proto::Error_missing_input_utxos);
+    }
+    { // low balance
+        auto input = createSampleInput(7000000000);
+        auto signer = Signer(input);
+        const auto output = signer.sign();
+        EXPECT_EQ(output.error(), Common::Proto::Error_low_balance);
+    }
+    { // missing private key
+        auto input = createSampleInput(7000000, 10, "", true);
+        auto signer = Signer(input);
+        const auto output = signer.sign();
+        EXPECT_EQ(output.error(), Common::Proto::Error_missing_private_key);
+    }
+}
+
+TEST(CardanoSigning, SignTransfer_0db1ea) {
+    const auto amount = 1100000ul;
+
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("81b935447bb994567f041d181b628a0afbcd747d0199c9ff4cd895686bbee8c6");
+    utxo1->mutable_out_point()->set_tx_hash(std::string(txHash1.begin(), txHash1.end()));
+    utxo1->mutable_out_point()->set_output_index(0);
+    utxo1->set_address(ownAddress1);
+    utxo1->set_amount(1000000);
+    auto* utxo2 = input.add_utxos();
+    const auto txHash2 = parse_hex("3a9068a273cc2af59b45593b78973841d972d01802abe992c55dbeecdffc561b");
+    utxo2->mutable_out_point()->set_tx_hash(std::string(txHash2.begin(), txHash2.end()));
+    utxo2->mutable_out_point()->set_output_index(0);
+    utxo2->set_address(ownAddress1);
+    utxo2->set_amount(1800000);
+
+    const auto privateKeyData1 = parse_hex(privateKeyTest1);
+    input.add_private_key(privateKeyData1.data(), privateKeyData1.size());
+    input.mutable_transfer_message()->set_to_address("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+    input.mutable_transfer_message()->set_change_address(ownAddress1);
+    input.mutable_transfer_message()->set_amount(amount);
+    auto fee = 170147ul;
+    input.mutable_transfer_message()->set_use_max_amount(false);
+    input.mutable_transfer_message()->set_force_fee(fee); // use force fee feature here
+    input.set_ttl(54675589);
+
+    {
+        // run plan and check result
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+
+        EXPECT_EQ(plan.availableAmount, 2800000ul);
+        EXPECT_EQ(plan.amount, amount);
+        EXPECT_EQ(plan.fee, fee);
+        EXPECT_EQ(plan.change, 2800000ul - amount - fee);
+        EXPECT_EQ(plan.utxos.size(), 2ul);
+    }
+
+    // set plan with specific fee, to match the real transaction
+    input.mutable_plan()->set_amount(amount);
+    input.mutable_plan()->set_available_amount(2800000);
+    input.mutable_plan()->set_fee(fee);
+    input.mutable_plan()->set_change(2800000 - amount - fee);
+    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
+    *(input.mutable_plan()->add_utxos()) = input.utxos(1);
+    input.mutable_plan()->set_error(Common::Proto::OK);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    // https://cardanoscan.io/transaction/0db1ea8c5c5828bbd027fcef3da02a63b86899db670ad7bb0630cefbe35944fa
+    // curl -d '{"txHash":"0db1ea..44fa","txBody":"83a400..06f6"}' -H "Content-Type: application/json" https://<cardano-node>/api/txs/submit
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a4008282582081b935447bb994567f041d181b628a0afbcd747d0199c9ff4cd895686bbee8c6008258203a9068a273cc2af59b45593b78973841d972d01802abe992c55dbeecdffc561b000182825839018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a34681a0010c8e082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a001757fd021a000298a3031a03424885a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058406300b52aaff1e26067a3e0a48ae26f4f068765f46f934fabeab872c1d25535fc94893ec72feacd787f0174fbabd8933727d9a2b319b406e7a855843b0c051806f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "0db1ea8c5c5828bbd027fcef3da02a63b86899db670ad7bb0630cefbe35944fa");
+}
+
+/// Successfully broadcasted:
+/// https://cardanoscan.io/transaction/0203ce2c91f59f169a26e9ef91254639d2b7911afac9c7c0ae64539f88ba46a5
+TEST(CardanoSigning, SignTransferFromLegacy) {
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("8316e5007d61fb90652cabb41141972a38b5bc60954d602cf843476aa3f67f63");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(0);
+    utxo1->set_address("Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8");
+    utxo1->set_amount(2500000);
+    auto* utxo2 = input.add_utxos();
+    const auto txHash2 = parse_hex("e29392c59c903fefb905730587d22cae8bda30bd8d9aeec3eca082ae77675946");
+    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
+    utxo2->mutable_out_point()->set_output_index(0);
+    utxo2->set_address("Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8");
+    utxo2->set_amount(1700000);
+
+    const auto privateKeyData = parse_hex("98f266d1aac660179bc2f456033941238ee6b2beb8ed0f9f34c9902816781f5a9903d1d395d6ab887b65ea5e344ef09b449507c21a75f0ce8c59d0ed1c6764eba7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f4e890ca4eb6bec44bf751b5a843174534af64d6ad1f44e0613db78a7018781f5aa151d2997f52059466b715d8eefab30a78b874ae6ef4931fa58bb21ef8ce2423d46f19d0fbf75afb0b9a24e31d533f4fd74cee3b56e162568e8defe37123afc4");
+    {
+        const auto privKey = PrivateKey(privateKeyData);
+        const auto pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+        const auto addr = AddressV2(pubKey);
+        EXPECT_EQ(addr.string(), "Ae2tdPwUPEZ6vkqxSjJxaQYmDxHf5DTnxtZ67pFLJGTb9LTnCGkDP6ca3f8");
+    }
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+    input.mutable_transfer_message()->set_to_address("addr1q90uh2eawrdc9vaemftgd50l28yrh9lqxtjjh4z6dnn0u7ggasexxdyyk9f05atygnjlccsjsggtc87hhqjna32fpv5qeq96ls");
+    input.mutable_transfer_message()->set_change_address("addr1qx55ymlqemndq8gluv40v58pu76a2tp4mzjnyx8n6zrp2vtzrs43a0057y0edkn8lh9su8vh5lnhs4npv6l9tuvncv8swc7t08");
+    input.mutable_transfer_message()->set_amount(3000000);
+    input.mutable_transfer_message()->set_use_max_amount(false);
+    input.set_ttl(190000000);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(output.encoded()), "83a400828258208316e5007d61fb90652cabb41141972a38b5bc60954d602cf843476aa3f67f6300825820e29392c59c903fefb905730587d22cae8bda30bd8d9aeec3eca082ae77675946000182825839015fcbab3d70db82b3b9da5686d1ff51c83b97e032e52bd45a6ce6fe7908ec32633484b152fa756444e5fc62128210bc1fd7b8253ec5490b281a002dc6c082583901a9426fe0cee6d01d1fe32af650e1e7b5d52c35d8a53218f3d0861531621c2b1ebdf4f11f96da67fdcb0e1d97a7e778566166be55f193c30f1a000f9ec1021a0002b0bf031a0b532b80a20081825820d163c8c4f0be7c22cd3a1152abb013c855ea614b92201497a568c5d93ceeb41e58406a23ab9267867fbf021c1cb2232bc83d2cdd663d651d22d59b6cddbca5cb106d4db99da50672f69a2309ca8a329a3f9576438afe4538b013de4591a6dfcd4d090281845820d163c8c4f0be7c22cd3a1152abb013c855ea614b92201497a568c5d93ceeb41e58406a23ab9267867fbf021c1cb2232bc83d2cdd663d651d22d59b6cddbca5cb106d4db99da50672f69a2309ca8a329a3f9576438afe4538b013de4591a6dfcd4d095820a7f484aa383806735c46fd769c679ee41f8952952036a6e2338ada940b8a91f441a0f6");
+    EXPECT_EQ(hex(data(output.tx_id())), "0203ce2c91f59f169a26e9ef91254639d2b7911afac9c7c0ae64539f88ba46a5");
+}
+
+TEST(CardanoSigning, SignTransferToLegacy) {
+    const auto toAddressLegacy = "DdzFFzCqrhssmYoG5Eca1bKZFdGS8d6iag1mU4wbLeYcSPVvBNF2wRG8yhjzQqErbg63N6KJA4DHqha113tjKDpGEwS5x1dT2KfLSbSJ";
+    EXPECT_FALSE(AddressV3::isValid(toAddressLegacy)); // not V3
+    EXPECT_TRUE(AddressV3::isValidLegacy(toAddressLegacy));
+
+    const auto input = createSampleInput(7000000, 10, toAddressLegacy);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(output.encoded()), "83a40082825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282584c82d818584283581c6aebd89cf88271c3ee76339930d8956b03f018b2f4871522f88eb8f9a101581e581c692a37dae3bc63dfc3e1463f12011f26655ab1d1e0f4ed4b8fc63708001ad8a9555b1a006acfc082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a000ca627021a00029c19031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840db9becdc733f4c08c0e7abc29b5cc6469f9339d32f565df8bf77455439ae1f949facc9b831754e74d3fbb42e99647eedd6c28de1461d18c315485f5d24b5b90af6");
+    EXPECT_EQ(hex(data(output.tx_id())), "f9b713e9987ec1377ac223f50d63c7a5e155915302de43f40d7b2627accabf69");
+}
+
+TEST(CardanoSigning, SignTransferToInvalid) {
+    const auto input = createSampleInput(7000000, 10, "__INVALID_ADDRESS__");
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::Error_invalid_address);
+    EXPECT_EQ(hex(output.encoded()), "");
+}
+
+TEST(CardanoSigning, SignTransferToken) {
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(1);
+    utxo1->set_address(ownAddress1);
+    utxo1->set_amount(8051373);
+    // some token, to be preserved
+    auto* token3 = utxo1->add_token_amount();
+    token3->set_policy_id(sundaeTokenPolicy);
+    token3->set_asset_name("CUBY");
+    const auto tokenAmount3 = store(uint256_t(3000000));
+    token3->set_amount(tokenAmount3.data(), tokenAmount3.size());
+
+    auto* utxo2 = input.add_utxos();
+    const auto txHash2 = parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767");
+    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
+    utxo2->mutable_out_point()->set_output_index(2);
+    utxo2->set_address(ownAddress1);
+    utxo2->set_amount(2000000);
+    // some SUNDAE token, to be transferred
+    auto* token1 = utxo2->add_token_amount();
+    token1->set_policy_id(sundaeTokenPolicy);
+    token1->set_asset_name_hex("53554e444145");
+    const auto tokenAmount1 = store(uint256_t(80996569));
+    token1->set_amount(tokenAmount1.data(), tokenAmount1.size());
+    // some other token, to be preserved
+    auto* token2 = utxo2->add_token_amount();
+    token2->set_policy_id(sundaeTokenPolicy);
+    token2->set_asset_name("CUBY");
+    // This should be ignored!
+    token2->set_asset_name_hex("00");
+    const auto tokenAmount2 = store(uint256_t(2000000));
+    token2->set_amount(tokenAmount2.data(), tokenAmount2.size());
+
+    const auto privateKeyData = parse_hex(privateKeyTest1);
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+    input.mutable_transfer_message()->set_to_address("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
+    input.mutable_transfer_message()->set_change_address("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+    input.mutable_transfer_message()->set_amount(1500000);
+    auto* toToken = input.mutable_transfer_message()->mutable_token_amount()->add_token();
+    toToken->set_policy_id(sundaeTokenPolicy);
+    toToken->set_asset_name_hex("53554e444145");
+    const auto toTokenAmount = store(uint256_t(20000000));
+    toToken->set_amount(toTokenAmount.data(), toTokenAmount.size());
+    input.mutable_transfer_message()->set_use_max_amount(false);
+    input.set_ttl(53333333);
+
+    { // check min ADA amount, set it
+        const auto bundleProtoData = data(input.transfer_message().token_amount().SerializeAsString());
+        const auto minAdaAmount = TWCardanoMinAdaAmount(&bundleProtoData);
+        EXPECT_EQ(minAdaAmount, 1444443ul);
+        input.mutable_transfer_message()->set_amount(minAdaAmount);
+    }
+
+    {
+        // run plan and check result
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+
+        EXPECT_EQ(plan.availableAmount, 10051373ul);
+        EXPECT_EQ(plan.amount, 1444443ul);
+        EXPECT_EQ(plan.fee, 174601ul);
+        EXPECT_EQ(plan.change, 8432329ul);
+        EXPECT_EQ(plan.utxos.size(), 2ul);
+        EXPECT_EQ(plan.availableTokens.size(), 2ul);
+        EXPECT_EQ(plan.availableTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_CUBY"), 5000000);
+        EXPECT_EQ(plan.availableTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 80996569);
+        EXPECT_EQ(plan.outputTokens.size(), 1ul);
+        EXPECT_EQ(plan.outputTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_CUBY"), 0);
+        EXPECT_EQ(plan.outputTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 20000000);
+        EXPECT_EQ(plan.changeTokens.size(), 2ul);
+        EXPECT_EQ(plan.changeTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_CUBY"), 5000000);
+        EXPECT_EQ(plan.changeTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 60996569);
+    }
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a40082825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76702018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd5821a00160a5ba1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a14653554e4441451a01312d00825839018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468821a0080aac9a1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a244435542591a004c4b404653554e4441451a03a2bbd9021a0002aa09031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840d90dcfbd190cbe59c42094e59eeb49b3de9d80a85b786cc311f932c5c9302d1c8c6c577b22aa70ff7955c139c700ea918f8cb425c3ba43a27980e1d238e4e908f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "201c537693b005b64a0f0528e366ec67a84be0119ed4363b547f141f2a7770c2");
+
+    {
+        // also test proto toProto / fromProto
+        const Proto::TransactionPlan planProto = Signer::plan(input);
+        const auto plan2 = TransactionPlan::fromProto(planProto);
+        EXPECT_EQ(plan2.amount, 1444443ul);
+        EXPECT_EQ(plan2.change, 8432329ul);
+    }
+}
+
+TEST(CardanoSigning, SignTransferToken_1dd248) {
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("f2d2b11c8c07c5c646f5b5af20fddf2f0a174743c6a1b13cca27e28a6ca34710");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(0);
+    utxo1->set_address(ownAddress1);
+    utxo1->set_amount(1500000);
+    // some token
+    auto* token3 = utxo1->add_token_amount();
+    token3->set_policy_id(sundaeTokenPolicy);
+    token3->set_asset_name_hex("53554e444145");
+    const auto tokenAmount3 = store(uint256_t(20000000));
+    token3->set_amount(tokenAmount3.data(), tokenAmount3.size());
+
+    auto* utxo2 = input.add_utxos();
+    const auto txHash2 = parse_hex("6975fcf7bbca745c85f50777f956219868fd9cad14ba496fed1371252e8df60f");
+    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
+    utxo2->mutable_out_point()->set_output_index(0);
+    utxo2->set_address(ownAddress1);
+    utxo2->set_amount(10258890);
+
+    const auto privateKeyData = parse_hex(privateKeyTest1);
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+    input.mutable_transfer_message()->set_to_address("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq"); // Test
+    input.mutable_transfer_message()->set_change_address(ownAddress1);
+    input.mutable_transfer_message()->set_amount(1600000);
+    auto* toToken = input.mutable_transfer_message()->mutable_token_amount()->add_token();
+    toToken->set_policy_id(sundaeTokenPolicy);
+    toToken->set_asset_name_hex("53554e444145");
+    const auto toTokenAmount = store(uint256_t(11000000));
+    toToken->set_amount(toTokenAmount.data(), toTokenAmount.size());
+    input.mutable_transfer_message()->set_use_max_amount(false);
+    input.set_ttl(61232158);
+
+    { // check min ADA amount
+        const auto bundleProtoData = data(input.transfer_message().token_amount().SerializeAsString());
+        EXPECT_EQ(TWCardanoMinAdaAmount(&bundleProtoData), 1444443ul);
+        EXPECT_GT(input.transfer_message().amount(), TWCardanoMinAdaAmount(&bundleProtoData));
+    }
+
+    {
+        // run plan and check result
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+
+        EXPECT_EQ(plan.availableAmount, 11758890ul);
+        EXPECT_EQ(plan.amount, 11758890 - 9984729 - 174161ul);
+        EXPECT_EQ(plan.fee, 174161ul);
+        EXPECT_EQ(plan.change, 9984729ul);
+        EXPECT_EQ(plan.utxos.size(), 2ul);
+        EXPECT_EQ(plan.availableTokens.size(), 1ul);
+        EXPECT_EQ(plan.availableTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 20000000);
+        EXPECT_EQ(plan.outputTokens.size(), 1ul);
+        EXPECT_EQ(plan.outputTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 11000000);
+        EXPECT_EQ(plan.changeTokens.size(), 1ul);
+        EXPECT_EQ(plan.changeTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 9000000);
+    }
+
+    // set plan with specific fee, to match the real transaction
+    input.mutable_plan()->set_available_amount(11758890);
+    input.mutable_plan()->set_amount(1600000);
+    input.mutable_plan()->set_fee(174102);
+    input.mutable_plan()->set_change(9984788);
+    *(input.mutable_plan()->add_available_tokens()) = input.utxos(0).token_amount(0);
+    *(input.mutable_plan()->add_output_tokens()) = input.utxos(0).token_amount(0);
+    input.mutable_plan()->mutable_output_tokens(0)->set_amount(toTokenAmount.data(), toTokenAmount.size());
+    *(input.mutable_plan()->add_change_tokens()) = input.utxos(0).token_amount(0);
+    const auto changeTokenAmount = store(uint256_t(9000000));
+    input.mutable_plan()->mutable_change_tokens(0)->set_amount(changeTokenAmount.data(), changeTokenAmount.size());
+    *(input.mutable_plan()->add_utxos()) = input.utxos(1);
+    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
+    input.mutable_plan()->set_error(Common::Proto::OK);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    // https://cardanoscan.io/transaction/1dd24872d93d3b5091b98e19b9f920cd0c4369e4c5ca178e898152c52f00c162
+    // curl -d '{"txHash":"1dd248..c162","txBody":"83a400..08f6"}' -H "Content-Type: application/json" https://<cardano-node>/api/txs/submit
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a400828258206975fcf7bbca745c85f50777f956219868fd9cad14ba496fed1371252e8df60f00825820f2d2b11c8c07c5c646f5b5af20fddf2f0a174743c6a1b13cca27e28a6ca34710000182825839018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cdd9fdb03e10b4e4ac08f5da1fdec6222a3468821a00186a00a1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a14653554e4441451a00a7d8c082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b821a00985b14a1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a14653554e4441451a00895440021a0002a816031a03a6541ea100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840c8cdee32bfd584f55cf334b4ec6f734635144736d48f882e647a7a6283f230bc5a67d4dd66a9e523e0c29c812ed1e3589febbcf96547a1fc6d061a7ccfb81308f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "1dd24872d93d3b5091b98e19b9f920cd0c4369e4c5ca178e898152c52f00c162");
+}
+
+TEST(CardanoSigning, SignTransferTokenMaxAmount_620b71) {
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("46964521ad00d9b3f3d41f77c07e1b3093848048dbdf2d95cf900e15cdac0d7f");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(0);
+    utxo1->set_address(ownAddress1);
+    utxo1->set_amount(2170871);
+    // some token
+    auto* token1 = utxo1->add_token_amount();
+    token1->set_policy_id(sundaeTokenPolicy);
+    token1->set_asset_name_hex("53554e444145");
+    const auto tokenAmount1 = store(uint256_t(20000000));
+    token1->set_amount(tokenAmount1.data(), tokenAmount1.size());
+
+    const auto privateKeyData = parse_hex(privateKeyTest1);
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+    input.mutable_transfer_message()->set_to_address("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5");
+    input.mutable_transfer_message()->set_change_address(ownAddress1);
+    input.mutable_transfer_message()->set_amount(666); // doesn't matter, max is used
+    auto* toToken = input.mutable_transfer_message()->mutable_token_amount()->add_token();
+    toToken->set_policy_id(sundaeTokenPolicy);
+    toToken->set_asset_name_hex("53554e444145");
+    const auto toTokenAmount = store(uint256_t(666)); // doesn't matter, max is used
+    input.mutable_transfer_message()->set_use_max_amount(true);
+    input.set_ttl(61085916);
+
+    {
+        // run plan and check result
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+
+        EXPECT_EQ(plan.availableAmount, 2170871ul);
+        EXPECT_EQ(plan.amount, 2170871 - 167730ul);
+        EXPECT_EQ(plan.fee, 167730ul);
+        EXPECT_EQ(plan.change, 0ul);
+        EXPECT_EQ(plan.utxos.size(), 1ul);
+        EXPECT_EQ(plan.availableTokens.size(), 1ul);
+        EXPECT_EQ(plan.availableTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 20000000);
+        EXPECT_EQ(plan.outputTokens.size(), 1ul);
+        EXPECT_EQ(plan.outputTokens.getAmount("9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77_SUNDAE"), 20000000);
+        EXPECT_EQ(plan.changeTokens.size(), 0ul);
+    }
+
+    // set plan with specific fee, to match the real transaction
+    input.mutable_plan()->set_available_amount(2170871);
+    input.mutable_plan()->set_amount(1998526);
+    input.mutable_plan()->set_fee(172345);
+    input.mutable_plan()->set_change(0);
+    *(input.mutable_plan()->add_available_tokens()) = input.utxos(0).token_amount(0);
+    *(input.mutable_plan()->add_output_tokens()) = input.utxos(0).token_amount(0);
+    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
+    input.mutable_plan()->set_error(Common::Proto::OK);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    // https://cardanoscan.io/transaction/620b719338efb419b0e1417bfbe01fc94a62d5669a4b8cbbf4e32ecc1ca3b872
+    // curl -d '{"txHash":"620b71..b872","txBody":"83a400..08f6"}' -H "Content-Type: application/json" https://<cardano-node>/api/txs/submit
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a4008182582046964521ad00d9b3f3d41f77c07e1b3093848048dbdf2d95cf900e15cdac0d7f00018182583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd5821a001e7ebea1581c9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77a14653554e4441451a01312d00021a0002a139031a03a418dca100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840e1d1565cd747b20b0f10a92f068f3d5faebdee92b4b4a4b96ce14736d975e17d1446f7f51e64997a0bb38e0151dc738468161d574d6cfcd8040e4455ff46bc08f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "620b719338efb419b0e1417bfbe01fc94a62d5669a4b8cbbf4e32ecc1ca3b872");
+}
+
+TEST(CardanoSigning, SignTransferTokenAmountNonUtf8) {
+    const auto ownAddress = "addr1q83kuum4jhwu3gxdwftdv2vezr0etmt3tp7phw5assltzl6t4afzguegnkcrdzp79vdcqswly775f33jvtpayl280qeqts960l";
+    const auto privateKey = "009aba22621d98e008c266a8d19c493f5f80a3a4f55048a83168a9c856726852fc240e6e95d7dc4e8ea599d09d64f84fdbe951b2282f5e5ed374252d17be9507643b2d078e607b5327397f212e4f6607ff0b6dfc93bdc9ad2bd0a682887edb9f304a573e99c7c2022c925511f004c7c9b89e8569080d09e2c53dfb1d53726852d4735794e3d32eac2b17d4d7c94742a77b7400b66fa11eaeb6ae38ba2dea84612f0c38fd68b9751ed4cb4ac48fb5e19f985f809fff1cfe5303fbfd29aca43d66";
+    const auto gensTokenPolicy = "dda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fb";
+    // Non UTF-8 assetName according to https://github.com/cardano-foundation/CIPs/tree/master/CIP-0067
+    const auto gensTokenNameHex = "0014df1047454e53";
+    const auto currentSlot = 138'888'357ul;
+
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("7b377e0cf7b83d67bb6919008c38e1a63be86c4831a93ad0cb45778b9f2f7e28");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(4);
+    utxo1->set_address(ownAddress);
+    utxo1->set_amount(1'700'000ul);
+    // GENS token (asset1266q2ewhgul7jh3xqpvjzqarrepfjuler20akr).
+    auto* token1 = utxo1->add_token_amount();
+    token1->set_policy_id(gensTokenPolicy);
+    token1->set_asset_name_hex(gensTokenNameHex);
+    const auto tokenAmount1 = store(uint256_t(44'660'987ul));
+    token1->set_amount(tokenAmount1.data(), tokenAmount1.size());
+
+    const auto privateKeyData = parse_hex(privateKey);
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+    input.mutable_transfer_message()->set_to_address("addr1q875r037fjeqveg6xv5wke922ff897eyrnshlj3ryp4mypzt4afzguegnkcrdzp79vdcqswly775f33jvtpayl280qeq7zgptp");
+    input.mutable_transfer_message()->set_change_address(ownAddress);
+    input.mutable_transfer_message()->set_amount(666ul); // doesn't matter, max is used
+    auto* toToken = input.mutable_transfer_message()->mutable_token_amount()->add_token();
+    toToken->set_policy_id(gensTokenPolicy);
+    toToken->set_asset_name_hex(gensTokenNameHex);
+    const auto toTokenAmount = store(uint256_t(666ul)); // doesn't matter, max is used
+    input.mutable_transfer_message()->set_use_max_amount(true);
+    input.set_ttl(currentSlot + 7200ul);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, TWCoinTypeCardano);
+
+    EXPECT_EQ(plan.error(), Common::Proto::SigningError::OK);
+    {
+        EXPECT_EQ(plan.available_amount(), 1'700'000ul);
+        EXPECT_EQ(plan.amount(), 1'700'000ul - 167'818ul);
+        EXPECT_EQ(plan.fee(), 167'818ul);
+        EXPECT_EQ(plan.change(), 0ul);
+        EXPECT_EQ(plan.utxos_size(), 1);
+        EXPECT_EQ(plan.available_tokens_size(), 1);
+
+        EXPECT_EQ(load(plan.available_tokens(0).amount()), 44'660'987ul);
+        // `assetName` must be empty as it's not a UTF-8 string.
+        EXPECT_EQ(plan.available_tokens(0).asset_name(), "");
+        EXPECT_EQ(plan.available_tokens(0).asset_name_hex(), gensTokenNameHex);
+
+        EXPECT_EQ(plan.output_tokens_size(), 1);
+        EXPECT_EQ(load(plan.output_tokens(0).amount()), 44'660'987ul);
+        // `assetName` must be empty as it's not a UTF-8 string.
+        EXPECT_EQ(plan.output_tokens(0).asset_name(), "");
+        EXPECT_EQ(plan.output_tokens(0).asset_name_hex(), gensTokenNameHex);
+        EXPECT_EQ(plan.change_tokens_size(), 0);
+    }
+
+    // set plan with specific fee, to match the real transaction
+    *input.mutable_plan() = plan;
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeCardano);
+
+    // https://cardanoscan.io/transaction/df89e81fbaec7485ba65ac3a2ffe4121a888f4937d085f3ad4f7e8e5192dea74
+    // curl -d '{"txHash":"620b71..b872","txBody":"83a400..08f6"}' -H "Content-Type: application/json" https://<cardano-node>/api/txs/submit
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a400818258207b377e0cf7b83d67bb6919008c38e1a63be86c4831a93ad0cb45778b9f2f7e2804018182583901fd41be3e4cb206651a3328eb64aa525272fb241ce17fca23206bb2044baf522473289db036883e2b1b8041df27bd44c63262c3d27d477832821a00176116a1581cdda5fdb1002f7389b33e036b6afee82a8189becb6cba852e8b79b4fba1480014df1047454e531a02a978fb021a00028f8a031a084760c5a10081825820748022805ee71f9fa31d06e60f14f0715a37c278c0690b565f26e1e1e83f930e5840386c5d05fb5cfdb11f1296e909a80314616cdd2779e5be5ea583e1a938ee8409f58b585c90248e1c0633638cc0f4517c03fdb59f17434267c2955e0fbbb3b609f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "df89e81fbaec7485ba65ac3a2ffe4121a888f4937d085f3ad4f7e8e5192dea74");
+}
+
+TEST(CardanoSigning, SignTransferTwoTokens) {
+    auto input = createSampleInput(7000000);
+    input.mutable_transfer_message()->set_amount(1500000);
+    auto* token1 = input.mutable_transfer_message()->mutable_token_amount()->add_token();
+    token1->set_policy_id(sundaeTokenPolicy);
+    token1->set_asset_name_hex("53554e444145");
+    const auto tokenAmount1 = store(uint256_t(40000000));
+    token1->set_amount(tokenAmount1.data(), tokenAmount1.size());
+    auto* token2 = input.mutable_transfer_message()->mutable_token_amount()->add_token();
+    token2->set_policy_id(sundaeTokenPolicy);
+    token2->set_asset_name_hex("43554259");
+    const auto tokenAmount2 = store(uint256_t(2000000));
+    token2->set_amount(tokenAmount2.data(), tokenAmount2.size());
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::Error_invalid_requested_token_amount);
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(output.encoded()), "");
+}
+
+TEST(CardanoSigning, SignMessageWithKey) {
+    // test case from cardano-crypto.js
+
+    const auto privateKey = PrivateKey(parse_hex(
+        "d809b1b4b4c74734037f76aace501730a3fe2fca30b5102df99ad3f7c0103e48"
+        "d54cde47e9041b31f3e6873d700d83f7a937bea746dadfa2c5b0a6a92502356c"
+        "69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"
+        "1111111111111111111111111111111111111111111111111111111111111111"
+        "1111111111111111111111111111111111111111111111111111111111111111"
+        "1111111111111111111111111111111111111111111111111111111111111111"));
+
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+    EXPECT_EQ(hex(publicKey.bytes),
+              "e6f04522f875c1563682ca876ddb04c2e2e3ae718e3ff9f11c03dd9f9dccf698"
+              "69272d81c376382b8a87c21370a7ae9618df8da708d1a9490939ec54ebe43000"
+              "857eed804ff087b97f87848f6493e87257a8c5203cb9f422f6e7a7d8a4d299f3"
+              "1111111111111111111111111111111111111111111111111111111111111111");
+
+    const auto sampleMessageStr = "Hello world";
+    const auto sampleMessage = data(sampleMessageStr);
+
+    const auto signature = privateKey.sign(sampleMessage, TWCurveED25519ExtendedCardano);
+
+    const auto sampleRightSignature = "1096ddcfb2ad21a4c0d861ef3fabe18841e8de88105b0d8e36430d7992c588634ead4100c32b2800b31b65e014d54a8238bdda63118d829bf0bcf1b631e86f0e";
+    EXPECT_EQ(hex(signature), sampleRightSignature);
+}
+
+TEST(CardanoSigning, AnySignTransfer1) {
+    const auto input = createSampleInput(7000000);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeCardano);
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a40082825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701018282583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a006acfc082583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a000ca96c021a000298d4031a032dcd55a100818258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058407cf591599852b5f5e007fdc241062405c47e519266c0d884b0767c1d4f5eacce00db035998e53ed10ca4ba5ce4aac8693798089717ce6cf4415f345cc764200ef6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "9b5b15e133cd73ccaa85307d2986aebc846505118a2eb4e6111e6b4b67d1f389");
+}
+
+TEST(CardanoSigning, AnyPlan1) {
+    const auto input = createSampleInput(7000000);
+
+    Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, TWCoinTypeCardano);
+
+    EXPECT_EQ(plan.error(), Common::Proto::OK);
+    EXPECT_EQ(plan.amount(), 7000000ul);
+    EXPECT_EQ(plan.available_amount(), 8000000ul);
+    EXPECT_EQ(plan.fee(), 170196ul);
+    EXPECT_EQ(plan.change(), 829804ul);
+    ASSERT_EQ(plan.utxos_size(), 2);
+    EXPECT_EQ(plan.utxos(0).amount(), 6500000ul);
+    EXPECT_EQ(plan.utxos(1).amount(), 1500000ul);
+
+    EXPECT_EQ(hex(plan.SerializeAsString()), "0880a4e80310c09fab0318d4b10a20ecd2324292010a220a20554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af01267616464723171383034336d356865656179646e76746d6d6b7975686536717635686176766873663064323671336a7967737370786c796670796b3679716b77307968747976747230666c656b6a3834753634617a38326375666d716e36357a6473796c7a6b323318a0dd8c034293010a240a20f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76710011267616464723171383034336d356865656179646e76746d6d6b7975686536717635686176766873663064323671336a7967737370786c796670796b3679716b77307968747976747230666c656b6a3834753634617a38326375666d716e36357a6473796c7a6b323318e0c65b");
+
+    {
+        // also test fromProto
+        const auto plan2 = TransactionPlan::fromProto(plan);
+        EXPECT_EQ(plan2.amount, plan.amount());
+        EXPECT_EQ(plan2.change, plan.change());
+    }
+}
+
+} // namespace TW::Cardano::tests
diff --git a/tests/chains/Cardano/StakingTests.cpp b/tests/chains/Cardano/StakingTests.cpp
new file mode 100644
index 00000000000..45e9e7d13f9
--- /dev/null
+++ b/tests/chains/Cardano/StakingTests.cpp
@@ -0,0 +1,349 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cardano/AddressV3.h"
+#include "Cardano/Signer.h"
+#include "proto/Cardano.pb.h"
+#include <TrustWalletCore/TWCardano.h>
+
+#include "Cbor.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+using namespace std;
+
+namespace TW::Cardano::StakingTests {
+
+const auto privateKeyTest1 = "089b68e458861be0c44bf9f7967f05cc91e51ede86dc679448a3566990b7785bd48c330875b1e0d03caaed0e67cecc42075dce1c7a13b1c49240508848ac82f603391c68824881ae3fc23a56a1a75ada3b96382db502e37564e84a5413cfaf1290dbd508e5ec71afaea98da2df1533c22ef02a26bb87b31907d0b2738fb7785b38d53aa68fc01230784c9209b2b2a2faf28491b3b1f1d221e63e704bbd0403c4154425dfbb01a2c5c042da411703603f89af89e57faae2946e2a5c18b1c5ca0e";
+const auto ownAddress1 = "addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23";
+const auto stakingAddress1 = "stake1u80jysjtdzqt88jt4jx93h5lumfr67d273r4vwyasfa2pxcwxllmx";
+const auto poolIdNufi = "7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6";
+
+TEST(CardanoStaking, RegisterStakingKey) {
+    const auto privateKeyData = parse_hex(privateKeyTest1);
+    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
+    const auto ownAddress = AddressV3(publicKey).string();
+    EXPECT_EQ(ownAddress, ownAddress1);
+    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
+    EXPECT_EQ(stakingAddress, stakingAddress1);
+    const auto poolId = parse_hex(poolIdNufi);
+
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(1);
+    utxo1->set_address(ownAddress);
+    utxo1->set_amount(10000000ul);
+
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+
+    input.mutable_transfer_message()->set_to_address(ownAddress);
+    input.mutable_transfer_message()->set_change_address(ownAddress);
+    input.mutable_transfer_message()->set_amount(5000000ul); // not relevant if we use MaxAmount
+    input.mutable_transfer_message()->set_use_max_amount(true);
+    input.set_ttl(69986091ul);
+
+    // Register staking key, 2 ADA deposit
+    input.mutable_register_staking_key()->set_staking_address(stakingAddress);
+    input.mutable_register_staking_key()->set_deposit_amount(2000000ul);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a50081825820cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a007772fa021a00029f06031a042be72b048182008200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09ba100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840d08ed71da87d0928090edd9e226496ab109f2eee7926ac2ce51e7abe89a4f513c4afe2b85b71595e862e7f6fc992d14d2416a6e53a1961da7d26d3cf3f823400825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932584079ed55400cebc70c56ca87ba09009dfc298c64768f90a9139bf2e7f134250927c614ee846253fac33e652f1b50373d349fdfe13c207968c2a10991824fe2a10ef6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "6a206fe4df76e12499b4fd9722f33429f4d93f8a996f9f523fa6c02a8301386b");
+
+    {
+        const auto decode = Cbor::Decode(encoded);
+        ASSERT_TRUE(decode.isValid());
+        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca\", 1]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 7828218]], 2: 171782, 3: 69986091, 4: [[0, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"]]]}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"d08ed71da87d0928090edd9e226496ab109f2eee7926ac2ce51e7abe89a4f513c4afe2b85b71595e862e7f6fc992d14d2416a6e53a1961da7d26d3cf3f823400\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"79ed55400cebc70c56ca87ba09009dfc298c64768f90a9139bf2e7f134250927c614ee846253fac33e652f1b50373d349fdfe13c207968c2a10991824fe2a10e\"]]}, null]");
+        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
+    }
+}
+
+TEST(CardanoStaking, DeregisterStakingKey) {
+    const auto privateKeyData = parse_hex(privateKeyTest1);
+    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
+    const auto ownAddress = AddressV3(publicKey).string();
+    EXPECT_EQ(ownAddress, ownAddress1);
+    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
+    EXPECT_EQ(stakingAddress, stakingAddress1);
+    const auto poolId = parse_hex(poolIdNufi);
+
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(1);
+    utxo1->set_address(ownAddress);
+    utxo1->set_amount(10000000ul);
+
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+
+    input.mutable_transfer_message()->set_to_address(ownAddress);
+    input.mutable_transfer_message()->set_change_address(ownAddress);
+    input.mutable_transfer_message()->set_amount(5000000ul); // not relevant if we use MaxAmount
+    input.mutable_transfer_message()->set_use_max_amount(true);
+    input.set_ttl(69986091ul);
+
+    // Deregister staking key, get back 2 ADA deposit
+    input.mutable_deregister_staking_key()->set_staking_address(stakingAddress);
+    input.mutable_deregister_staking_key()->set_undeposit_amount(2000000ul);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a50081825820cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a00b47bfa021a00029f06031a042be72b048182018200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09ba100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290584056619a7d6192b6f68c31a43e927c893161fd994d5c1bcc16f3710cf5e5e652e01f118d55f0110e9de34edc050d509748bea637db5c34f4fe342ae262ccb5520d825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e069325840d23680fdd8aa63e10efccc550eb726743b653008952f9d731d076d1df8106b0401823ebb195127b211389f1bc2c3f6ededbcec04bc8f0de93607a2409421e006f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "1caae2456e5471cc77e73410da475fb0a23874c18c1ea55f9267c59767caef0a");
+
+    {
+        const auto decode = Cbor::Decode(encoded);
+        ASSERT_TRUE(decode.isValid());
+        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca\", 1]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 11828218]], 2: 171782, 3: 69986091, 4: [[1, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"]]]}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"56619a7d6192b6f68c31a43e927c893161fd994d5c1bcc16f3710cf5e5e652e01f118d55f0110e9de34edc050d509748bea637db5c34f4fe342ae262ccb5520d\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"d23680fdd8aa63e10efccc550eb726743b653008952f9d731d076d1df8106b0401823ebb195127b211389f1bc2c3f6ededbcec04bc8f0de93607a2409421e006\"]]}, null]");
+        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
+    }
+}
+
+TEST(CardanoStaking, Redelegate) {
+    const auto privateKeyData = parse_hex(privateKeyTest1);
+    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
+    const auto ownAddress = AddressV3(publicKey).string();
+    EXPECT_EQ(ownAddress, ownAddress1);
+    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
+    EXPECT_EQ(stakingAddress, stakingAddress1);
+    const auto poolId = parse_hex(poolIdNufi);
+
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(1);
+    utxo1->set_address(ownAddress);
+    utxo1->set_amount(10000000ul);
+
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+
+    input.mutable_transfer_message()->set_to_address(ownAddress);
+    input.mutable_transfer_message()->set_change_address(ownAddress);
+    input.mutable_transfer_message()->set_amount(5000000ul); // not relevant if we use MaxAmount
+    input.mutable_transfer_message()->set_use_max_amount(true);
+    input.set_ttl(69986091ul);
+
+    // Delegate, no deposit
+    input.mutable_delegate()->set_staking_address(stakingAddress);
+    input.mutable_delegate()->set_pool_id(poolId.data(), poolId.size());
+    input.mutable_delegate()->set_deposit_amount(0ul);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a50081825820cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a0095f251021a0002a42f031a042be72b048183028200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b581c7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6a100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840fb48f3ddbfc2d4ca231a0581c5b456019aa4215ed5a2447ba89a4860569f9e7296afd3a0a81506882d8bda33683e623e6d8033786275369f7e247d866e017c06825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e069325840e26f696a6cd1c34101623568c9efe3796ff5855ada0e2e0cf557c7fc2148f6b2af176aff40a1f9c13fb29d9636c49f774d4a967c71f052f865cfaf0d02d5bb05f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "985f613fb8b86dad35f075599099776e50fc2a6aa74ee4b37c14fd9f2c0f0891");
+
+    {
+        const auto decode = Cbor::Decode(encoded);
+        ASSERT_TRUE(decode.isValid());
+        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"cba84549f07f2128410c0a22731f2c57f2a617746e8edc61b295cd8792638dca\", 1]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 9826897]], 2: 173103, 3: 69986091, 4: [[2, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"], h\"7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6\"]]}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"fb48f3ddbfc2d4ca231a0581c5b456019aa4215ed5a2447ba89a4860569f9e7296afd3a0a81506882d8bda33683e623e6d8033786275369f7e247d866e017c06\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"e26f696a6cd1c34101623568c9efe3796ff5855ada0e2e0cf557c7fc2148f6b2af176aff40a1f9c13fb29d9636c49f774d4a967c71f052f865cfaf0d02d5bb05\"]]}, null]");
+        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
+    }
+}
+
+TEST(CardanoStaking, RegisterAndDelegate_similar53339b) {
+    const auto privateKeyData = parse_hex(privateKeyTest1);
+    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
+    const auto ownAddress = AddressV3(publicKey).string();
+    EXPECT_EQ(ownAddress, ownAddress1);
+    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
+    EXPECT_EQ(stakingAddress, stakingAddress1);
+    const auto poolId = parse_hex(poolIdNufi);
+
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("9b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(0);
+    utxo1->set_address(ownAddress);
+    utxo1->set_amount(4000000ul);
+    auto* utxo2 = input.add_utxos();
+    const auto txHash2 = parse_hex("9b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e");
+    utxo2->mutable_out_point()->set_tx_hash(txHash2.data(), txHash2.size());
+    utxo2->mutable_out_point()->set_output_index(1);
+    utxo2->set_address(ownAddress);
+    utxo2->set_amount(26651312ul);
+
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+
+    input.mutable_transfer_message()->set_to_address(ownAddress);
+    input.mutable_transfer_message()->set_change_address(ownAddress);
+    input.mutable_transfer_message()->set_amount(4000000ul); // not relevant if we use MaxAmount
+    input.mutable_transfer_message()->set_use_max_amount(true);
+    input.set_ttl(69885081ul);
+
+    // Register staking key, 2 ADA desposit
+    input.mutable_register_staking_key()->set_staking_address(stakingAddress);
+    input.mutable_register_staking_key()->set_deposit_amount(2000000ul);
+
+    // Delegate
+    input.mutable_delegate()->set_staking_address(stakingAddress);
+    input.mutable_delegate()->set_pool_id(poolId.data(), poolId.size());
+    input.mutable_delegate()->set_deposit_amount(0ul);
+
+    {
+        // run plan and check result
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+
+        const auto amount = 28475125ul;
+        const auto availAmount = 30651312ul;
+        EXPECT_EQ(plan.availableAmount, availAmount);
+        EXPECT_EQ(plan.amount, amount);
+        const auto fee = 176187ul;
+        EXPECT_EQ(plan.fee, fee);
+        EXPECT_EQ(plan.change, availAmount - 2000000ul - amount - fee);
+        EXPECT_EQ(plan.change, 0ul);
+
+        // perform sign with default plan
+        const auto output = signer.sign();
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+
+        const auto encoded = data(output.encoded());
+        EXPECT_EQ(hex(encoded), "83a500828258209b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e008258209b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a01b27ef5021a0002b03b031a042a5c99048282008200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b83028200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b581c7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6a100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df2905840677c901704be027d9a1734e8aa06f0700009476fa252baaae0de280331746a320a61456d842d948ea5c0e204fc36f3bd04c88ca7ee3d657d5a38014243c37c07825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e0693258401fa21bdc62b85ca217bf08cbacdeba2fadaf33dc09ee3af9cc25b40f24822a1a42cfbc03585cc31a370ef75aaec4d25db6edcf329e40a4e725ec8718c94f220af6");
+        const auto txid = data(output.tx_id());
+        EXPECT_EQ(hex(txid), "96a781fd6481b6a7fd3926da110265e8c44b53947b81daa84da5b148825d02aa");
+    }
+
+    // set different plan, with exact fee
+    const auto amount = 28467322ul;
+    input.mutable_plan()->set_amount(amount);
+    input.mutable_plan()->set_available_amount(28651312ul);
+    input.mutable_plan()->set_fee(183990);
+    input.mutable_plan()->set_change(0);
+    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
+    *(input.mutable_plan()->add_utxos()) = input.utxos(1);
+    input.mutable_plan()->set_error(Common::Proto::OK);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    // Similar to (but with different key): https://cardanoscan.io/transaction/53339b758009a0896a87e9569cadcdb5a095ffe0c100cc7483d72e817e81b60b
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a500828258209b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e008258209b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e01018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a01b2607a021a0002ceb6031a042a5c99048282008200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b83028200581cdf22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b581c7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6a100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058405d8b21c993aec7a7bdf0c832e5688920b64b665e1e36a2e6040d6dd8ad195e7774df3c1377047737d8b676fa4115e38fbf6ef854904db6d9c8ee3e26e8561408825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932584088a3f6387693f9077d11a6e245e024b791074bcaa26c034e687d67f3324b6f90a437d33d0343e11c7dee1a28270c223e02080e452fe97cdc93d26c720ab6b805f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "23e1d1bc27f6de57e323d232d44c909fb41ee2ebfff28b82ca8cae6947866ea7");
+
+    {
+        const auto decode = Cbor::Decode(encoded);
+        ASSERT_TRUE(decode.isValid());
+        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"9b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e\", 0], [h\"9b06de86b253549b99f6a050b61217d8824085ca5ed4eb107a5e7cce4f93802e\", 1]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 28467322]], 2: 183990, 3: 69885081, 4: [[0, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"]], [2, [0, h\"df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\"], h\"7d7ac07a2f2a25b7a4db868a40720621c4939cf6aefbb9a11464f1a6\"]]}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"5d8b21c993aec7a7bdf0c832e5688920b64b665e1e36a2e6040d6dd8ad195e7774df3c1377047737d8b676fa4115e38fbf6ef854904db6d9c8ee3e26e8561408\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"88a3f6387693f9077d11a6e245e024b791074bcaa26c034e687d67f3324b6f90a437d33d0343e11c7dee1a28270c223e02080e452fe97cdc93d26c720ab6b805\"]]}, null]");
+        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
+    }
+}
+
+TEST(CardanoStaking, Withdraw_similarf48098) {
+    const auto privateKeyData = parse_hex(privateKeyTest1);
+    const auto publicKey = PrivateKey(privateKeyData).getPublicKey(TWPublicKeyTypeED25519Cardano);
+    const auto ownAddress = AddressV3(publicKey).string();
+    EXPECT_EQ(ownAddress, ownAddress1);
+    const auto stakingAddress = AddressV3(publicKey).getStakingAddress();
+    EXPECT_EQ(stakingAddress, stakingAddress1);
+
+    Proto::SigningInput input;
+    auto* utxo1 = input.add_utxos();
+    const auto txHash1 = parse_hex("7dfd2c579794314b1f84efc9db932a098e440ccefb874945591f1d4e85a9152a");
+    utxo1->mutable_out_point()->set_tx_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_output_index(0);
+    utxo1->set_address(ownAddress);
+    utxo1->set_amount(6305913ul);
+
+    input.add_private_key(privateKeyData.data(), privateKeyData.size());
+
+    input.mutable_transfer_message()->set_to_address(ownAddress);
+    input.mutable_transfer_message()->set_change_address(ownAddress);
+    input.mutable_transfer_message()->set_amount(6000000ul); // not relevant if we use MaxAmount
+    input.mutable_transfer_message()->set_use_max_amount(true);
+    input.set_ttl(71678326ul);
+
+    // Withdraw available amount
+    const auto withdrawAmount = 3468ul;
+    input.mutable_withdraw()->set_staking_address(stakingAddress);
+    input.mutable_withdraw()->set_withdraw_amount(withdrawAmount);
+
+    {
+        // run plan and check result
+        auto signer = Signer(input);
+        const auto plan = signer.doPlan();
+
+        const auto amount = 6137599ul;
+        const auto availAmount = 6305913ul;
+        EXPECT_EQ(plan.availableAmount, availAmount);
+        EXPECT_EQ(plan.amount, amount);
+        const auto fee = 171782ul;
+        EXPECT_EQ(plan.fee, fee);
+        EXPECT_EQ(plan.change, availAmount + withdrawAmount - amount - fee);
+        EXPECT_EQ(plan.change, 0ul);
+
+        // perform sign with default plan
+        const auto output = signer.sign();
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+
+        const auto encoded = data(output.encoded());
+        EXPECT_EQ(hex(encoded), "83a500818258207dfd2c579794314b1f84efc9db932a098e440ccefb874945591f1d4e85a9152a00018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a005da6ff021a00029f06031a0445b97605a1581de1df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b190d8ca100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058401ebaca2876fd17122404912a2558a98109cdf0f990a938d2917fa2c3b8c4e55e18a2cbabfa82fff03fa0d7ab8b88ca01ed18e42af3bfc4cda7f423a3aa30c00b825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e069325840777f04fa8f083fe562aecf78898aaaaac36e2cc6ca962f6ffb01e84a421cae1860496db79b2c5fb2879524c3d5121060b9ea1e693336230c6e5338e14c4c3303f6");
+        const auto txid = data(output.tx_id());
+        EXPECT_EQ(hex(txid), "6dcf3956232953fc25b8355fb1ded1e912b5802090fd21434d789087d6329683");
+    }
+
+    // set different plan, with exact fee
+    const auto amount = 6137599ul;
+    input.mutable_plan()->set_amount(amount);
+    input.mutable_plan()->set_available_amount(6305913ul);
+    input.mutable_plan()->set_fee(171782ul);
+    input.mutable_plan()->set_change(0);
+    *(input.mutable_plan()->add_utxos()) = input.utxos(0);
+    input.mutable_plan()->set_error(Common::Proto::OK);
+
+    auto signer = Signer(input);
+    const auto output = signer.sign();
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    // Similar to (but with different key): https://cardanoscan.io/transaction/f480985662886e419a22673d31944455ab8891a80940bf392a37d9288ea9cf01?tab=withdrawals
+    const auto encoded = data(output.encoded());
+    EXPECT_EQ(hex(encoded), "83a500818258207dfd2c579794314b1f84efc9db932a098e440ccefb874945591f1d4e85a9152a00018182583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a005da6ff021a00029f06031a0445b97605a1581de1df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b190d8ca100828258206d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df29058401ebaca2876fd17122404912a2558a98109cdf0f990a938d2917fa2c3b8c4e55e18a2cbabfa82fff03fa0d7ab8b88ca01ed18e42af3bfc4cda7f423a3aa30c00b825820e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e069325840777f04fa8f083fe562aecf78898aaaaac36e2cc6ca962f6ffb01e84a421cae1860496db79b2c5fb2879524c3d5121060b9ea1e693336230c6e5338e14c4c3303f6");
+    const auto txid = data(output.tx_id());
+    EXPECT_EQ(hex(txid), "6dcf3956232953fc25b8355fb1ded1e912b5802090fd21434d789087d6329683");
+
+    {
+        const auto decode = Cbor::Decode(encoded);
+        ASSERT_TRUE(decode.isValid());
+        EXPECT_EQ(decode.dumpToString(), "[{0: [[h\"7dfd2c579794314b1f84efc9db932a098e440ccefb874945591f1d4e85a9152a\", 0]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 6137599]], 2: 171782, 3: 71678326, 5: {h\"e1df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\": 3468}}, {0: [[h\"6d8a0b425bd2ec9692af39b1c0cf0e51caa07a603550e22f54091e872c7df290\", h\"1ebaca2876fd17122404912a2558a98109cdf0f990a938d2917fa2c3b8c4e55e18a2cbabfa82fff03fa0d7ab8b88ca01ed18e42af3bfc4cda7f423a3aa30c00b\"], [h\"e554163344aafc2bbefe778a6953ddce0583c2f8e0a0686929c020ca33e06932\", h\"777f04fa8f083fe562aecf78898aaaaac36e2cc6ca962f6ffb01e84a421cae1860496db79b2c5fb2879524c3d5121060b9ea1e693336230c6e5338e14c4c3303\"]]}, null]");
+                                          
+        EXPECT_EQ(decode.getArrayElements().size(), 3ul);
+    }
+}
+
+} // namespace TW::Cardano::tests
diff --git a/tests/Cardano/TWCardanoAddressTests.cpp b/tests/chains/Cardano/TWCardanoAddressTests.cpp
similarity index 93%
rename from tests/Cardano/TWCardanoAddressTests.cpp
rename to tests/chains/Cardano/TWCardanoAddressTests.cpp
index 33af5be338b..d18caf17f49 100644
--- a/tests/Cardano/TWCardanoAddressTests.cpp
+++ b/tests/chains/Cardano/TWCardanoAddressTests.cpp
@@ -1,16 +1,16 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWAnyAddress.h>
 #include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCardano.h>
 #include <TrustWalletCore/TWPrivateKey.h>
 #include <TrustWalletCore/TWPublicKey.h>
 #include <TrustWalletCore/TWData.h>
 #include <TrustWalletCore/TWHDWallet.h>
-#include "../interface/TWTestUtilities.h"
+#include <TrustWalletCore/TWCardano.h>
+#include "TestUtilities.h"
 #include "PrivateKey.h"
 
 #include <gtest/gtest.h>
diff --git a/tests/chains/Cardano/TWCoinTypeTests.cpp b/tests/chains/Cardano/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..72ba864892d
--- /dev/null
+++ b/tests/chains/Cardano/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWCardanoCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCardano));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("b7a6c5cadab0f64bdc89c77ee4a351463aba5c33f2cef6bbd6542a74a90a3af3"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCardano, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("DdzFFzCqrhstpwKc8WMvPwwBb5oabcTW9zc5ykA37wJR4tYQucvsR9dXb2kEGNXkFJz2PtrpzfRiZkx8R1iNo8NYqdsukVmv7EAybFwC"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCardano, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCardano));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCardano));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCardano), 6);
+    ASSERT_EQ(TWBlockchainCardano, TWCoinTypeBlockchain(TWCoinTypeCardano));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCardano));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCardano));
+    assertStringsEqual(symbol, "ADA");
+    assertStringsEqual(txUrl, "https://cardanoscan.io/transaction/b7a6c5cadab0f64bdc89c77ee4a351463aba5c33f2cef6bbd6542a74a90a3af3");
+    assertStringsEqual(accUrl, "https://cardanoscan.io/address/DdzFFzCqrhstpwKc8WMvPwwBb5oabcTW9zc5ykA37wJR4tYQucvsR9dXb2kEGNXkFJz2PtrpzfRiZkx8R1iNo8NYqdsukVmv7EAybFwC");
+    assertStringsEqual(id, "cardano");
+    assertStringsEqual(name, "Cardano");
+}
diff --git a/tests/chains/Cardano/TransactionCompilerTests.cpp b/tests/chains/Cardano/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..5106f34af35
--- /dev/null
+++ b/tests/chains/Cardano/TransactionCompilerTests.cpp
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "uint256.h"
+
+#include "proto/Cardano.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(CardanoCompiler, CompileWithSignaturesAndPubKeyType) {
+    /// Prepare transaction input (protobuf)
+    const auto coin = TWCoinTypeCardano;
+    auto input = Cardano::Proto::SigningInput();
+    input.mutable_transfer_message()->set_to_address("addr1qxxe304qg9py8hyyqu8evfj4wln7dnms943wsugpdzzsxnkvvjljtzuwxvx0pnwelkcruy95ujkq3aw6rl0vvg32x35qc92xkq");
+    input.mutable_transfer_message()->set_change_address("addr1v8mv75d2evhr4kt048cx7m3f97x363ajadha8xv8dp96nuggpv8rn");
+    input.mutable_transfer_message()->set_amount(1850000);
+
+    auto* utxo1 = input.add_utxos();
+    utxo1->set_address("addr1v8mv75d2evhr4kt048cx7m3f97x363ajadha8xv8dp96nuggpv8rn");
+    utxo1->set_amount(1000000);
+    auto txHash = parse_hex("d87f6e99c8d3a0fb22b1ea4de477f5a6d1f0e419450c2a194304371cada0ebb9");
+    utxo1->mutable_out_point()->set_tx_hash(txHash.data(), txHash.size());
+    utxo1->mutable_out_point()->set_output_index(0);
+
+    auto* utxo2 = input.add_utxos();
+    utxo2->set_address("addr1v8mv75d2evhr4kt048cx7m3f97x363ajadha8xv8dp96nuggpv8rn");
+    utxo2->set_amount(4040957);
+    utxo2->mutable_out_point()->set_tx_hash(txHash.data(), txHash.size());
+    utxo2->mutable_out_point()->set_output_index(1);
+
+    auto* tokenBundle1 = utxo2->add_token_amount();
+    tokenBundle1->set_policy_id("122d15a15dc753d2b3ca9ee46c1c6ca41dda38d735942d9d259c785b");
+    tokenBundle1->set_asset_name_hex("5454546f6b656e2d31");
+    const auto tokenAmount1 = store(uint256_t(3000000));
+    tokenBundle1->set_amount(tokenAmount1.data(), tokenAmount1.size());
+
+    auto* tokenBundle2 = utxo2->add_token_amount();
+    tokenBundle2->set_policy_id("122d15a15dc753d2b3ca9ee46c1c6ca41dda38d735942d9d259c785b");
+    tokenBundle2->set_asset_name("TTToken-2");
+    const auto tokenAmount2 = store(uint256_t(3000000));
+    tokenBundle2->set_amount(tokenAmount2.data(), tokenAmount2.size());
+
+    auto* tokenBundle3 = utxo2->add_token_amount();
+    tokenBundle3->set_policy_id("122d15a15dc753d2b3ca9ee46c1c6ca41dda38d735942d9d259c785b");
+    tokenBundle3->set_asset_name_hex("5454546f6b656e2d33");
+    const auto tokenAmount3 = store(uint256_t(5000000));
+    tokenBundle3->set_amount(tokenAmount3.data(), tokenAmount3.size());
+
+    auto inputData = data(input.SerializeAsString());
+    const auto preImageHash = TransactionCompiler::preImageHashes(coin, inputData);
+
+    auto preOut = TxCompiler::Proto::PreSigningOutput();
+    preOut.ParseFromArray(preImageHash.data(), (int)preImageHash.size());
+    EXPECT_EQ(hex(preOut.data_hash()), "3e5a7c1d1afbc7e3ca783daba1beb12010fc4ecc748722558697509212c9f186");
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData = parse_hex("17c55d712152ccabf28215fe2d008d615f94796e098a97f1aa43d986ac3cb946");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeED25519);
+    const auto sig = parse_hex("1096ddcfb2ad21a4c0d861ef3fabe18841e8de88105b0d8e36430d7992c588634ead4100c32b2800b31b65e014d54a8238bdda63118d829bf0bcf1b631e86f0e");
+
+    /// Compile transaction info
+    const auto expectedTx =
+        "83a40082825820d87f6e99c8d3a0fb22b1ea4de477f5a6d1f0e419450c2a194304371cada0ebb901"
+        "825820d87f6e99c8d3a0fb22b1ea4de477f5a6d1f0e419450c2a194304371cada0ebb90001828258"
+        "39018d98bea0414243dc84070f96265577e7e6cf702d62e871016885034ecc64bf258b8e330cf0cd"
+        "d9fdb03e10b4e4ac08f5da1fdec6222a34681a001c3a9082581d61f6cf51aacb2e3ad96fa9f06f6e"
+        "292f8d1d47b2eb6fd39987684ba9f1821a002e0feea1581c122d15a15dc753d2b3ca9ee46c1c6ca4"
+        "1dda38d735942d9d259c785ba3495454546f6b656e2d311a002dc6c0495454546f6b656e2d321a00"
+        "2dc6c0495454546f6b656e2d331a004c4b40021a0002a0bf0300a1008182582017c55d712152ccab"
+        "f28215fe2d008d615f94796e098a97f1aa43d986ac3cb94658401096ddcfb2ad21a4c0d861ef3fab"
+        "e18841e8de88105b0d8e36430d7992c588634ead4100c32b2800b31b65e014d54a8238bdda63118d"
+        "829bf0bcf1b631e86f0ef6";
+    const Data outData = TransactionCompiler::compileWithSignaturesAndPubKeyType(coin, inputData, {sig}, {publicKeyData}, TWPublicKeyTypeED25519);
+
+    {
+        auto output = Cardano::Proto::SigningOutput();
+        output.ParseFromArray(outData.data(), (int)outData.size());
+
+        EXPECT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        const Data outputData = TransactionCompiler::compileWithSignaturesAndPubKeyType(
+            coin, inputData, {sig, sig}, {publicKeyData}, TWPublicKeyTypeED25519);
+        Cardano::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        const Data outputData = TransactionCompiler::compileWithSignaturesAndPubKeyType(
+            coin, inputData, {}, {}, TWPublicKeyTypeED25519);
+        Cardano::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
diff --git a/tests/chains/Cardano/TransactionTests.cpp b/tests/chains/Cardano/TransactionTests.cpp
new file mode 100644
index 00000000000..58f8f987883
--- /dev/null
+++ b/tests/chains/Cardano/TransactionTests.cpp
@@ -0,0 +1,192 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cardano/Transaction.h"
+#include "Cardano/AddressV3.h"
+#include <TrustWalletCore/TWCardano.h>
+
+#include "HexCoding.h"
+#include "Cbor.h"
+#include "TestUtilities.h"
+#include "Numeric.h"
+
+#include <gtest/gtest.h>
+
+
+namespace TW::Cardano {
+
+Transaction createTx() {
+    Transaction tx;
+    tx.inputs.emplace_back(parse_hex("f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767"), 1);
+    tx.inputs.emplace_back(parse_hex("554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0"), 0);
+    tx.outputs.emplace_back(
+        AddressV3("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23").data(),
+        2000000);
+    tx.outputs.emplace_back(
+        AddressV3("addr1q92cmkgzv9h4e5q7mnrzsuxtgayvg4qr7y3gyx97ukmz3dfx7r9fu73vqn25377ke6r0xk97zw07dqr9y5myxlgadl2s0dgke5").data(),
+        16749189);
+    tx.fee = 165555;
+    tx.ttl = 53333345;
+    return tx;
+}
+
+TEST(CardanoTransaction, Encode) {
+    const Transaction tx = createTx();
+
+    const auto encoded = tx.encode();
+    EXPECT_EQ(hex(encoded), "a40082825820f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e76701825820554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af000018282583901df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b1a001e848082583901558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd51a00ff9285021a000286b3031a032dcd61");
+
+    {
+        const auto decode = Cbor::Decode(encoded);
+        ASSERT_TRUE(decode.isValid());
+        EXPECT_EQ(decode.getMapElements().size(), 4ul);
+        EXPECT_EQ(decode.dumpToString(), "{0: [[h\"f074134aabbfb13b8aec7cf5465b1e5a862bde5cb88532cc7e64619179b3e767\", 1], [h\"554f2fd942a23d06835d26bbd78f0106fa94c8a551114a0bef81927f66467af0\", 0]], 1: [[h\"01df58ee97ce7a46cd8bdeec4e5f3a03297eb197825ed5681191110804df22424b6880b39e4bac8c58de9fe6d23d79aaf44756389d827aa09b\", 2000000], [h\"01558dd902616f5cd01edcc62870cb4748c45403f1228218bee5b628b526f0ca9e7a2c04d548fbd6ce86f358be139fe680652536437d1d6fd5\", 16749189]], 2: 165555, 3: 53333345}");
+    }
+}
+
+TEST(CardanoTransaction, GetId) {
+    const Transaction tx = createTx();
+
+    const auto txid = tx.getId();
+    EXPECT_EQ(hex(txid), "cc262713a3e15a0fa245b062f33ffc6c2aa5a64c3ae7bfa793414069914e1bbf");
+}
+
+TEST(CardanoTransaction, minAdaAmount) {
+    const auto policyId = "9a9693a9a37912a5097918f97918d15240c92ab729a0b7c4aa144d77";
+
+    { // ADA only
+        const auto tb = TokenBundle();
+        EXPECT_EQ(tb.minAdaAmount(), 1000000ul);
+    }
+
+    {   // 1 policyId, 1 6-char asset name
+        const auto tb = TokenBundle({TokenAmount(policyId, data("TOKEN1"), 0)});
+        EXPECT_EQ(tb.minAdaAmount(), 1444443ul);
+    }
+    { // 2 policyId, 2 4-char asset names
+        auto tb = TokenBundle();
+        tb.add(TokenAmount("012345678901234567890POLICY1", data("TOK1"), 20));
+        tb.add(TokenAmount("012345678901234567890POLICY2", data("TOK2"), 20));
+        EXPECT_EQ(tb.minAdaAmount(), 1629628ul);
+    }
+    { // 10 policyId, 10 6-char asset names
+        auto tb = TokenBundle();
+        for (auto i = 0; i < 10; ++i) {
+            std::string policyId1 =  + "012345678901234567890123456" + std::to_string(i);
+            Data name = data("ASSET" + std::to_string(i));
+            tb.add(TokenAmount(policyId1, name, 0));
+        }
+        EXPECT_EQ(tb.minAdaAmount(), 3370367ul);
+    }
+
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(0, 0, 0), 1000000ul);           // ADA only
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 0, 0), 1370369ul);           // 1 policyId, no asset name
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 1, 1), 1444443ul);           // 1 policyId, 1 1-char asset name
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 1, 6), 1444443ul);           // 1 policyId, 1 6-char asset name
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 1, 32), 1555554ul);          // 1 policyId, 1 32-char asset name
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(1, 110, 110 * 32), 23777754ul); // 1 policyId, 110 32-char asset name
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(2, 2, 8), 1629628ul);           // 2 policyId, 2 4-char asset names
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(3, 5, 20), 1999998ul);          // 3 policyId, 5 4-char asset names
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(10, 10, 10 * 6), 3370367ul);    // 10 policyId, 10 6-char asset names
+    EXPECT_EQ(TokenBundle::minAdaAmountHelper(60, 60, 60 * 32), 21222201ul);  // 60 policyId, 60 32-char asset names
+}
+
+TEST(CardanoTransaction, getPolicyIDs) {
+    const auto policyId1 = "012345678901234567890POLICY1";
+    const auto policyId2 = "012345678901234567890POLICY2";
+    const auto tb = TokenBundle({
+        TokenAmount(policyId1, data("TOK1"), 10),
+        TokenAmount(policyId2, data("TOK2"), 20),
+        TokenAmount(policyId2, data("TOK3"), 30), // duplicate policyId
+    });
+    ASSERT_EQ(tb.getPolicyIds().size(), 2ul);
+    EXPECT_TRUE(tb.getPolicyIds().contains(policyId1));
+    EXPECT_TRUE(tb.getPolicyIds().contains(policyId2));
+
+    EXPECT_EQ(tb.getByPolicyId(policyId1).size(), 1ul);
+    EXPECT_EQ(tb.getByPolicyId(policyId2).size(), 2ul);
+}
+
+TEST(TWCardanoTransaction, minAdaAmount) {
+    { // ADA-only
+        const auto bundleProto = TokenBundle().toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        EXPECT_EQ(TWCardanoMinAdaAmount(&bundleProtoData), 1000000ul);
+    }
+    { // 2 policyId, 2 4-char asset names
+        auto bundle = TokenBundle();
+        bundle.add(TokenAmount("012345678901234567890POLICY1", data("TOK1"), 20));
+        bundle.add(TokenAmount("012345678901234567890POLICY2", data("TOK2"), 20));
+        const auto bundleProto = bundle.toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        EXPECT_EQ(TWCardanoMinAdaAmount(&bundleProtoData), 1629628ul);
+    }
+}
+
+TEST(TWCardanoTransaction, outputMinAdaAmount) {
+    // For an actual value see `ProtocolParams::coinsPerUtxoByte`:
+    // https://input-output-hk.github.io/cardano-graphql/
+    const auto coinsPerUtxoByte = STRING("4310");
+    const auto toAddress = STRING("addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23");
+    const auto toLegacy = STRING("Ae2tdPwUPEZ4YjgvykNpoFeYUxoyhNj2kg8KfKWN2FizsSpLUPv68MpTVDo");
+
+    { // ADA-only
+        const auto bundleProto = TokenBundle().toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        const auto actual = WRAPS(TWCardanoOutputMinAdaAmount(toAddress.get(), &bundleProtoData, coinsPerUtxoByte.get()));
+        assertStringsEqual(actual, "969750");
+    }
+    { // ADA-only (to legacy address)
+        const auto bundleProto = TokenBundle().toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        const auto actual = WRAPS(TWCardanoOutputMinAdaAmount(toLegacy.get(), &bundleProtoData, coinsPerUtxoByte.get()));
+        assertStringsEqual(actual, "909410");
+    }
+    { // 1 NFT
+        auto bundle = TokenBundle();
+        bundle.add(TokenAmount("219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5e", data("coolcatssociety4567"), 1));
+        const auto bundleProto = bundle.toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        const auto actual = WRAPS(TWCardanoOutputMinAdaAmount(toAddress.get(), &bundleProtoData, coinsPerUtxoByte.get()));
+        assertStringsEqual(actual, "1202490");
+    }
+    { // 2 policyId, 2 4-char asset names
+        auto bundle = TokenBundle();
+        bundle.add(TokenAmount("8fef2d34078659493ce161a6c7fba4b56afefa8535296a5743f69587", data("AADA"), 20));
+        bundle.add(TokenAmount("6ac8ef33b510ec004fe11585f7c5a9f0c07f0c23428ab4f29c1d7d10", data("MELD"), 20));
+        const auto bundleProto = bundle.toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        const auto actual = WRAPS(TWCardanoOutputMinAdaAmount(toAddress.get(), &bundleProtoData, coinsPerUtxoByte.get()));
+        assertStringsEqual(actual, "1297310");
+    }
+    { // Invalid token bundle
+        Data invalidTokenBundleData {1, 2, 3, 4, 5};
+        const auto actual = TWCardanoOutputMinAdaAmount(toAddress.get(), &invalidTokenBundleData, coinsPerUtxoByte.get());
+        EXPECT_EQ(actual, nullptr);
+    }
+    { // Invalid address
+        const auto invalidAddress = STRING("foobar");
+        const auto bundleProto = TokenBundle().toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        const auto actual = TWCardanoOutputMinAdaAmount(invalidAddress.get(), &bundleProtoData, coinsPerUtxoByte.get());
+        EXPECT_EQ(actual, nullptr);
+    }
+    { // Invalid coinsPerUtxoByte
+        const auto invalidCoinsPerUtxoByte = STRING("foobar");
+        const auto bundleProto = TokenBundle().toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        const auto actual = TWCardanoOutputMinAdaAmount(toAddress.get(), &bundleProtoData, invalidCoinsPerUtxoByte.get());
+        EXPECT_EQ(actual, nullptr);
+    }
+    { // Invalid coinsPerUtxoByte (multiply overflow)
+        auto invalidCoinsPerUtxoByteStr = std::to_string(std::numeric_limits<uint64_t>::max());
+        const auto invalidCoinsPerUtxoByte = STRING(invalidCoinsPerUtxoByteStr.c_str());
+        const auto bundleProto = TokenBundle().toProto();
+        const auto bundleProtoData = data(bundleProto.SerializeAsString());
+        const auto actual = TWCardanoOutputMinAdaAmount(toAddress.get(), &bundleProtoData, invalidCoinsPerUtxoByte.get());
+        EXPECT_EQ(actual, nullptr);
+    }
+}
+
+} // namespace TW::Cardano
diff --git a/tests/chains/Celo/TWCoinTypeTests.cpp b/tests/chains/Celo/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6ac1b830db8
--- /dev/null
+++ b/tests/chains/Celo/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWCeloCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCelo));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xaf41ee58afe633dc7b179c15693cca40fe0372c1d7c70351620105d59d326693"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCelo, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xFBFf95e2Fa7e4Ff3aeA34eFB05fB60F9968a6aaD"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCelo, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCelo));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCelo));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCelo), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeCelo));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCelo));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCelo));
+    assertStringsEqual(symbol, "CELO");
+    assertStringsEqual(txUrl, "https://explorer.celo.org/tx/0xaf41ee58afe633dc7b179c15693cca40fe0372c1d7c70351620105d59d326693");
+    assertStringsEqual(accUrl, "https://explorer.celo.org/address/0xFBFf95e2Fa7e4Ff3aeA34eFB05fB60F9968a6aaD");
+    assertStringsEqual(id, "celo");
+    assertStringsEqual(name, "Celo");
+}
diff --git a/tests/chains/ConfluxeSpace/TWCoinTypeTests.cpp b/tests/chains/ConfluxeSpace/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..438632f7ad0
--- /dev/null
+++ b/tests/chains/ConfluxeSpace/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWConfluxeSpaceCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeConfluxeSpace;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x920efefb3213b2d6a3b84149cb50b61a813d085443a20e1b0eab74120e41ff72"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x337a087daef75c72871de592fbbba570829a936a"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "cfxevm");
+    assertStringsEqual(name, "Conflux eSpace");
+    assertStringsEqual(symbol, "CFX");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "1030");
+    assertStringsEqual(txUrl, "https://evm.confluxscan.net/tx/0x920efefb3213b2d6a3b84149cb50b61a813d085443a20e1b0eab74120e41ff72");
+    assertStringsEqual(accUrl, "https://evm.confluxscan.net/address/0x337a087daef75c72871de592fbbba570829a936a");
+}
diff --git a/tests/chains/Cosmos/AddressTests.cpp b/tests/chains/Cosmos/AddressTests.cpp
new file mode 100644
index 00000000000..97034a9b590
--- /dev/null
+++ b/tests/chains/Cosmos/AddressTests.cpp
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "Cosmos/Address.h"
+
+#include <gtest/gtest.h>
+#include <TrustWalletCore/TWHDWallet.h>
+
+namespace TW::Cosmos {
+
+TEST(CosmosAddressAddressToData, Invalid) {
+    ASSERT_TRUE(addressToData(TWCoinTypeCosmos, "fake").empty());
+}
+
+TEST(CosmosAddress, Valid) {
+    ASSERT_TRUE(Address::isValid(TWCoinTypeBinance, "bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2"));
+}
+
+TEST(CosmosAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid(TWCoinTypeBinance, "bnb1grpf0955h0ykzq3ar6nmum7y6gdfl6lxfn46h2"));
+}
+
+TEST(CosmosAddress, Cosmos_FromPublicKey) {
+    auto privateKey = PrivateKey(parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005"));
+    auto publicKeyData = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    ASSERT_EQ(hex(publicKeyData.bytes), "0257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc5");
+
+    auto publicKey = PublicKey(publicKeyData);
+    auto address = Address("cosmos", publicKey);
+    ASSERT_EQ(address.string(), "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+    ASSERT_EQ(hex(address.getKeyHash()), "bc2da90c84049370d1b7c528bc164bc588833f21");
+}
+
+TEST(CosmosAddress, Cosmos_FromString) {
+    Address addr;
+    ASSERT_TRUE(Address::decode("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02", addr));
+    ASSERT_EQ(addr.string(), "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+}
+
+TEST(CosmosAddress, Cosmos_Valid) {
+    ASSERT_TRUE(Address::isValid(TWCoinTypeCosmos, "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02"));
+    ASSERT_TRUE(Address::isValid(TWCoinTypeCosmos, "cosmospub1addwnpepqftjsmkr7d7nx4tmhw4qqze8w39vjq364xt8etn45xqarlu3l2wu2n7pgrq"));
+    ASSERT_TRUE(Address::isValid(TWCoinTypeCosmos, "cosmosvaloper1sxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08"));
+    ASSERT_TRUE(Address::isValid(TWCoinTypeCosmos, "cosmosvalconspub1zcjduepqjnnwe2jsywv0kfc97pz04zkm7tc9k2437cde2my3y5js9t7cw9mstfg3sa"));
+}
+
+TEST(CosmosAddress, Cosmos_Invalid) {
+    ASSERT_FALSE(Address::isValid(TWCoinTypeCosmos, "cosmos1xsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02"));
+    ASSERT_FALSE(Address::isValid(TWCoinTypeCosmos, "cosmospub1xddwnpepqftjsmkr7d7nx4tmhw4qqze8w39vjq364xt8etn45xqarlu3l2wu2n7pgrq"));
+    ASSERT_FALSE(Address::isValid(TWCoinTypeCosmos, "cosmosvaloper1xxx9mszve0gaedz5ld7qdkjkfv8z992ax69k08"));
+    ASSERT_FALSE(Address::isValid(TWCoinTypeCosmos, "cosmosvalconspub1xcjduepqjnnwe2jsywv0kfc97pz04zkm7tc9k2437cde2my3y5js9t7cw9mstfg3sa"));
+}
+
+TEST(CosmosAddress, ThorFromPublicKey) {
+    auto privateKey = PrivateKey(parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e"));
+    auto publicKeyData = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    ASSERT_EQ(hex(publicKeyData.bytes), "03ed997e396cf4292f5fce5a42bba41599ccd5d96e313154a7c9ea7049de317c77");
+
+    auto publicKey = PublicKey(publicKeyData);
+    auto address = Address("thor", publicKey);
+    ASSERT_EQ(address.string(), "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r");
+    ASSERT_EQ(hex(address.getKeyHash()), "1522e767db6eb19708b0038029bfbd607bc9bd0e");
+}
+
+TEST(CosmosAddress, ThorValid) {
+    ASSERT_TRUE(Address::isValid(TWCoinTypeTHORChain, "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r"));
+    ASSERT_FALSE(Address::isValid(TWCoinTypeTHORChain, "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2s"));
+}
+
+} // namespace TW::Cosmos
diff --git a/tests/chains/Cosmos/Agoric/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Agoric/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..1cb7062bcb7
--- /dev/null
+++ b/tests/chains/Cosmos/Agoric/TWAnyAddressTests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gAgoricAddr = "agoric1wu32wujsvz290sasq308fswznx77nk9k0cxqwg";
+static const std::string gAgoricHrp = "agoric";
+
+TEST(TWAgoricAnyAddress, AllAgoricAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gAgoricHrp,
+                                       .coinType = TWCoinTypeAgoric,
+                                       .address = gAgoricAddr,
+                                       .privKey = "9457d0a4b7bdfe23528af07603af0f7d0ac0c510526da7721abefdc3948461f6",
+                                       .publicKey = "03602731bc2f787eec358c1ba8ddb8e7c7720f56a0406b8d16e20c93b822953960"};
+    TestCosmosAddressParameters(parameters);
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Agoric/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Agoric/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..05d975709ae
--- /dev/null
+++ b/tests/chains/Cosmos/Agoric/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAgoricCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeAgoric;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("576224B1A0F3D56BA23C5350C2A0E3CEA86F40005B828793E5ACBC2F4813152E"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("agoric1cqvwa8jr6pmt45jndanc8lqmdsxjkhw0yertc0"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "agoric");
+    assertStringsEqual(name, "Agoric");
+    assertStringsEqual(symbol, "BLD");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "agoric-3");
+    assertStringsEqual(txUrl, "https://atomscan.com/agoric/transactions/576224B1A0F3D56BA23C5350C2A0E3CEA86F40005B828793E5ACBC2F4813152E");
+    assertStringsEqual(accUrl, "https://atomscan.com/agoric/accounts/agoric1cqvwa8jr6pmt45jndanc8lqmdsxjkhw0yertc0");
+}
diff --git a/tests/chains/Cosmos/Akash/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Akash/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..621a43dd782
--- /dev/null
+++ b/tests/chains/Cosmos/Akash/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gAkashAddr = "akash1mry47pkga5tdswtluy0m8teslpalkdq0n6af90";
+static const std::string gAkashHrp = "akash";
+
+TEST(TWAkashAnyAddress, AllAkashAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gAkashHrp, .coinType = TWCoinTypeAkash, .address = gAkashAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Akash/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Akash/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..e13668774da
--- /dev/null
+++ b/tests/chains/Cosmos/Akash/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWAkashCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeAkash;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("C0083856344425908D5333D4325E3E0DE9D697BA568C6D99C34303819F615D25"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("akash1f4nskxfw8ufhwnajh7xwt0wmdtxm02vwta6krg"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "akash");
+        assertStringsEqual(name, "Akash");
+        assertStringsEqual(symbol, "AKT");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "akashnet-2");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/akash/txs/C0083856344425908D5333D4325E3E0DE9D697BA568C6D99C34303819F615D25");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/akash/account/akash1f4nskxfw8ufhwnajh7xwt0wmdtxm02vwta6krg");
+    }
+}
diff --git a/tests/chains/Cosmos/Axelar/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Axelar/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..b1e92806669
--- /dev/null
+++ b/tests/chains/Cosmos/Axelar/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gAxelarAddr = "axelar1mry47pkga5tdswtluy0m8teslpalkdq060xxh5";
+static const std::string gAxelarHrp = "axelar";
+
+TEST(TWAxelarAnyAddress, AllAxelarAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gAxelarHrp, .coinType = TWCoinTypeAxelar, .address = gAxelarAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Axelar/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Axelar/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..69c7f823c5f
--- /dev/null
+++ b/tests/chains/Cosmos/Axelar/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWAxelarCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeAxelar;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("838F31D023B273E6A8282085202A4CCEDE1693D2503ACCD557B37C9DAB33A79C"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("axelar1mry47pkga5tdswtluy0m8teslpalkdq060xxh5"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "axelar");
+    assertStringsEqual(name, "Axelar");
+    assertStringsEqual(symbol, "AXL");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "axelar-dojo-1");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/axelar/txs/838F31D023B273E6A8282085202A4CCEDE1693D2503ACCD557B37C9DAB33A79C");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/axelar/account/axelar1mry47pkga5tdswtluy0m8teslpalkdq060xxh5");
+}
diff --git a/tests/chains/Cosmos/BandChain/TWCoinTypeTests.cpp b/tests/chains/Cosmos/BandChain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..d2a7096dd94
--- /dev/null
+++ b/tests/chains/Cosmos/BandChain/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWBandChainCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBandChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("74AF38C2183B06EB6274DA4AAC0D2334E6E283643D436852F5E088AEA2CD0B17"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBandChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("band16gpgu994g2gdrzvwp9047le3pcq9wz6mcgtd4w"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBandChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBandChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBandChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBandChain), 6);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeBandChain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBandChain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBandChain));
+    assertStringsEqual(symbol, "BAND");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/band/tx/74AF38C2183B06EB6274DA4AAC0D2334E6E283643D436852F5E088AEA2CD0B17");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/band/account/band16gpgu994g2gdrzvwp9047le3pcq9wz6mcgtd4w");
+    assertStringsEqual(id, "band");
+    assertStringsEqual(name, "BandChain");
+}
diff --git a/tests/chains/Cosmos/Bluzelle/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Bluzelle/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6a569a48677
--- /dev/null
+++ b/tests/chains/Cosmos/Bluzelle/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWCoinTypeBluzelle, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeBluzelle));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("AC026E0EC6E33A77D5EA6B9CEF9810699BC2AD8C5582E007E7857457C6D3B819"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeBluzelle, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("bluzelle1q9cryfal7u3jvnq6er5ufety20xtzw6ycx2te9"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeBluzelle, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeBluzelle));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeBluzelle));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeBluzelle), 6);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeBluzelle));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeBluzelle));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeBluzelle));
+    assertStringsEqual(symbol, "BLZ");
+    assertStringsEqual(txUrl, "https://bigdipper.net.bluzelle.com/transactions/AC026E0EC6E33A77D5EA6B9CEF9810699BC2AD8C5582E007E7857457C6D3B819");
+    assertStringsEqual(accUrl, "https://bigdipper.net.bluzelle.com/account/bluzelle1q9cryfal7u3jvnq6er5ufety20xtzw6ycx2te9");
+    assertStringsEqual(id, "bluzelle");
+    assertStringsEqual(name, "Bluzelle");
+}
diff --git a/tests/chains/Cosmos/Comdex/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Comdex/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..6ef956ac13e
--- /dev/null
+++ b/tests/chains/Cosmos/Comdex/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gComdexAddr = "comdex1mry47pkga5tdswtluy0m8teslpalkdq0ewjv9z";
+static const std::string gComdexHrp = "comdex";
+
+TEST(TWComdexAnyAddress, AllComdexAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gComdexHrp, .coinType = TWCoinTypeComdex, .address = gComdexAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Comdex/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Comdex/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..1f598515c34
--- /dev/null
+++ b/tests/chains/Cosmos/Comdex/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWComdexCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeComdex;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("04C790D09A40EE958DBDD385B679B5EB60C10F9BC1389CC8F896DC9193A5ED6C"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("comdex1jz7av7cq45gh5hhrugtak7lkps2ga5v0u64nz6"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "comdex");
+        assertStringsEqual(name, "Comdex");
+        assertStringsEqual(symbol, "CMDX");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "comdex-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/comdex/txs/04C790D09A40EE958DBDD385B679B5EB60C10F9BC1389CC8F896DC9193A5ED6C");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/comdex/account/comdex1jz7av7cq45gh5hhrugtak7lkps2ga5v0u64nz6");
+    }
+}
diff --git a/tests/chains/Cosmos/Coreum/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Coreum/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..50a619ba0db
--- /dev/null
+++ b/tests/chains/Cosmos/Coreum/TWAnyAddressTests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gCoreumAddr = "core1a5nvz6smgsph9gephguyhn30fmzrpaxrvvdjun";
+static const std::string gCoreumHrp = "core";
+
+TEST(TWCoreumAnyAddress, AllCoreumAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gCoreumHrp,
+                                       .coinType = TWCoinTypeCoreum,
+                                       .address = gCoreumAddr,
+                                       .privKey = "56e5e45bf33a779527ec670b5336f6bc78efbe0e3bf1f004e7250673a82a3431",
+                                       .publicKey = "0345d8d927b955c3cd468d12b5bc634c7919ee4777e578439af6314cf04b2ff114"};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Coreum/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Coreum/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..a588861349e
--- /dev/null
+++ b/tests/chains/Cosmos/Coreum/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWCoreumCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeCoreum;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("32A4AE2AE6AAE31E75EDDADE0AB9F1499ABD5AD8D3F261ADEF2805CD46FF74E7"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("core1zmwdnfpwuymwn0fkwnj2aaje34npd5sqgjxq9v"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "coreum");
+        assertStringsEqual(name, "Coreum");
+        assertStringsEqual(symbol, "CORE");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "coreum-mainnet-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/coreum/txs/32A4AE2AE6AAE31E75EDDADE0AB9F1499ABD5AD8D3F261ADEF2805CD46FF74E7");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/coreum/account/core1zmwdnfpwuymwn0fkwnj2aaje34npd5sqgjxq9v");
+    }
+}
diff --git a/tests/chains/Cosmos/CosmosTestHelpers.h b/tests/chains/Cosmos/CosmosTestHelpers.h
new file mode 100644
index 00000000000..50e81c4459f
--- /dev/null
+++ b/tests/chains/Cosmos/CosmosTestHelpers.h
@@ -0,0 +1,107 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWPublicKey.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+#include "HexCoding.h"
+#include "Hash.h"
+#include "PublicKey.h"
+#include "Bech32Address.h"
+#include "Cosmos/Address.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+struct CosmosAddressParameters {
+    const std::string hrp{};
+    TWCoinType coinType;
+    const std::string address;
+    bool standaloneChain{true};
+    TWPublicKeyType publicKeyType{TWPublicKeyTypeSECP256k1};
+    const std::string privKey{"a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433"};
+    const std::string publicKey{"02cbfdb5e472893322294e60cf0883d43df431e1089d29ecb447a9e6d55045aae5"};
+};
+
+}
+
+namespace TW::Cosmos::tests::internal {
+    static inline void isValidAddress(const CosmosAddressParameters& addressParameters) {
+        auto address_utf8 = STRING(addressParameters.address.c_str());
+        auto hrp_utf8 = STRING(addressParameters.hrp.c_str());
+        EXPECT_TRUE(TWAnyAddressIsValidBech32(address_utf8.get(), TWCoinTypeCosmos, hrp_utf8.get()));
+        EXPECT_TRUE(TWAnyAddressIsValid(address_utf8.get(), addressParameters.coinType));
+        EXPECT_FALSE(TWAnyAddressIsValidBech32(address_utf8.get(), TWCoinTypeBitcoin, hrp_utf8.get()));
+        if (addressParameters.coinType != TWCoinTypeCosmos) {
+            EXPECT_FALSE(TWAnyAddressIsValid(address_utf8.get(), TWCoinTypeCosmos));
+        }
+        EXPECT_FALSE(TWAnyAddressIsValid(address_utf8.get(), TWCoinTypeBitcoin));
+    }
+
+    static inline void testCreateFromPubKeyWrapper(const CosmosAddressParameters& addressParameters) {
+        if (addressParameters.standaloneChain) {
+            const auto hrp_utf8 = STRING(addressParameters.hrp.c_str());
+            const auto data = DATA(addressParameters.publicKey.c_str());
+            const auto pubkey = TWPublicKeyCreateWithData(data.get(), TWPublicKeyTypeSECP256k1);
+            const auto twAddress = TWAnyAddressCreateBech32WithPublicKey(pubkey, TWCoinTypeCosmos, hrp_utf8.get());
+            auto twData = TWAnyAddressData(twAddress);
+            auto hexData = hex(*reinterpret_cast<const Data*>(twData));
+            ASSERT_EQ(hex(Bech32Address(addressParameters.hrp, TW::Hash::HasherSha256ripemd, pubkey->impl).getKeyHash()), hexData);
+            auto address = TWAnyAddressDescription(twAddress);
+            EXPECT_EQ(addressParameters.address, *reinterpret_cast<const std::string*>(address));
+            TWStringDelete(address);
+            TWAnyAddressDelete(twAddress);
+            TWDataDelete(twData);
+            TWPublicKeyDelete(pubkey);
+        }
+
+        // With coin type
+        {
+            auto publicKey = PublicKey(parse_hex(addressParameters.publicKey), addressParameters.publicKeyType);
+            auto address = Address(addressParameters.coinType, publicKey);
+        }
+    }
+
+    static inline void testCreateFromPrivKey(const CosmosAddressParameters& addressParameters) {
+        auto privateKey = PrivateKey(parse_hex(addressParameters.privKey));
+        auto address = Address(addressParameters.coinType, privateKey.getPublicKey(addressParameters.publicKeyType));
+        ASSERT_EQ(address.string(), addressParameters.address);
+    }
+
+    static inline void testCreateFromString(const CosmosAddressParameters& addressParameters) {
+        // BECH32
+        if (addressParameters.standaloneChain) {
+            const auto address = STRING(addressParameters.address.c_str());
+            const auto hrp = STRING(addressParameters.hrp.c_str());
+            const auto anyAddr = TWAnyAddressCreateBech32(address.get(), TWCoinTypeCosmos, hrp.get());
+            const auto addrDescription = TWAnyAddressDescription(anyAddr);
+            ASSERT_TRUE(TWAnyAddressIsValidBech32(addrDescription, TWCoinTypeCosmos, hrp.get()));
+            TWStringDelete(addrDescription);
+            TWAnyAddressDelete(anyAddr);
+        }
+
+        // With Coin Type
+        {
+            const auto address = STRING(addressParameters.address.c_str());
+            const auto anyAddr = TWAnyAddressCreateWithString(address.get(), addressParameters.coinType);
+            const auto addrDescription = TWAnyAddressDescription(anyAddr);
+            ASSERT_TRUE(TWAnyAddressIsValid(addrDescription, addressParameters.coinType));
+            TWStringDelete(addrDescription);
+            TWAnyAddressDelete(anyAddr);
+        }
+    }
+}
+
+namespace TW::Cosmos::tests {
+    static inline void TestCosmosAddressParameters(const CosmosAddressParameters& addressParameters) {
+        internal::isValidAddress(addressParameters);
+        internal::testCreateFromPubKeyWrapper(addressParameters);
+        internal::testCreateFromPrivKey(addressParameters);
+        internal::testCreateFromString(addressParameters);
+    }
+}
diff --git a/tests/chains/Cosmos/Crescent/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Crescent/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..f53619dd664
--- /dev/null
+++ b/tests/chains/Cosmos/Crescent/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gCrescentAddr = "cre1mry47pkga5tdswtluy0m8teslpalkdq06frtfc";
+static const std::string gCrescentHrp = "cre";
+
+TEST(TWCrescentAnyAddress, AllCrescentAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gCrescentHrp, .coinType = TWCoinTypeCrescent, .address = gCrescentAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Crescent/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Crescent/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..7b8586d04ec
--- /dev/null
+++ b/tests/chains/Cosmos/Crescent/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWCrescentCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeCrescent;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0C46F4B65706FB5A1FB3A7C32543CF7836DA33EB88295573F66F1886A264E852"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("cre1ekj60f38vatr9fxy4p2t04mwedpc3mc6v38d6n"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "crescent");
+    assertStringsEqual(name, "Crescent");
+    assertStringsEqual(symbol, "CRE");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "crescent-1");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/crescent/txs/0C46F4B65706FB5A1FB3A7C32543CF7836DA33EB88295573F66F1886A264E852");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/crescent/account/cre1ekj60f38vatr9fxy4p2t04mwedpc3mc6v38d6n");
+}
diff --git a/tests/chains/Cosmos/CryptoOrg/SignerTests.cpp b/tests/chains/Cosmos/CryptoOrg/SignerTests.cpp
new file mode 100644
index 00000000000..c81ffb931af
--- /dev/null
+++ b/tests/chains/Cosmos/CryptoOrg/SignerTests.cpp
@@ -0,0 +1,172 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "proto/Cosmos.pb.h"
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include "TestUtilities.h"
+#include "TrustWalletCore/TWAnySigner.h"
+
+#include <gtest/gtest.h>
+#include <google/protobuf/util/json_util.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(CryptoorgSigner, SignTx_DDCCE4) {
+    auto input = Cosmos::Proto::SigningInput();
+    input.set_account_number(125798);
+    input.set_sequence(0);
+    input.set_chain_id("crypto-org-chain-mainnet-1");
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address("cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0");
+    message.set_to_address("cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus");
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("basecro");
+    amountOfTx->set_amount("100000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("basecro");
+    amountOfFee->set_amount("5000");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+
+    assertJSONEqual(json, R"(
+        {
+            "accountNumber": "125798",
+            "chainId": "crypto-org-chain-mainnet-1",
+            "fee": {
+                "amounts": [
+                    {
+                        "denom": "basecro",
+                        "amount": "5000"
+                    }
+                ],
+                "gas": "200000"
+            },
+            "messages": [
+                {
+                    "sendCoinsMessage": {
+                        "fromAddress": "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0",
+                        "toAddress": "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus",
+                        "amounts": [
+                            {
+                                "denom": "basecro",
+                                "amount": "100000000"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    )");
+
+    auto privateKey = parse_hex("200e439e39cf1aad465ee3de6166247f914cbc0f823fc2dd48bf16dcd556f39d");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCryptoOrg);
+
+    assertJSONEqual(output.json(), R"(
+        {
+            "mode": "block",
+            "tx": {
+                "fee": {
+                    "amount": [
+                        {
+                            "amount": "5000",
+                            "denom": "basecro"
+                        }
+                    ],
+                    "gas": "200000"
+                },
+                "memo": "",
+                "msg": [
+                    {
+                        "type": "cosmos-sdk/MsgSend",
+                        "value": {
+                            "amount": [
+                                {
+                                    "amount": "100000000",
+                                    "denom": "basecro"
+                                }
+                            ],
+                            "from_address": "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0",
+                            "to_address": "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus"
+                        }
+                    }
+                ],
+                "signatures": [
+                    {
+                        "pub_key": {
+                            "type": "tendermint/PubKeySecp256k1",
+                            "value": "A4gxsGFiPn6L5Z2IjHEISkXI0IkwfL9exV3GLB171Wvj"
+                        },
+                        "signature": "5+5rSFFg0FE9cTklQWQHNktBDJsz7UCnMSgF0t0+gYcrIhEWUyTtibXaHZQbKAAaciJ1BkHXYREjU55VswByVg=="
+                    }
+                ]
+            }
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "e7ee6b485160d0513d713925416407364b410c9b33ed40a7312805d2dd3e81872b2211165324ed89b5da1d941b28001a7222750641d7611123539e55b3007256");
+
+    /// https://crypto.org/explorer/tx/DDCCE4052040B05914CADEFE78C0A75BE363AE39504E7EF6B2EDB8A9072AD44B
+    /// curl -H 'Content-Type: application/json' --data-binary '{"mode":"block","tx":{"fee": ... }}' https://mainnet.crypto.org:1317/txs
+}
+
+TEST(CryptoorgSigner, SignJson) {
+    auto inputJson = R"({"accountNumber":"125798","chainId":"crypto-org-chain-mainnet-1","fee":{"amounts":[{"denom":"basecro","amount":"5000"}],"gas":"200000"},"messages":[{"sendCoinsMessage":{"fromAddress":"cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0","toAddress":"cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus","amounts":[{"denom":"basecro","amount":"100000000"}]}}]})";
+    auto privateKey = parse_hex("200e439e39cf1aad465ee3de6166247f914cbc0f823fc2dd48bf16dcd556f39d");
+
+    auto outputJson = TW::anySignJSON(TWCoinTypeCryptoOrg, inputJson, privateKey);
+
+    assertJSONEqual(outputJson, R"(
+        {
+            "mode": "block",
+            "tx": {
+                "fee": {
+                    "amount": [
+                        {
+                            "amount": "5000",
+                            "denom": "basecro"
+                        }
+                    ],
+                    "gas": "200000"
+                },
+                "memo": "",
+                "msg": [
+                    {
+                        "type": "cosmos-sdk/MsgSend",
+                        "value": {
+                            "amount": [
+                                {
+                                    "amount": "100000000",
+                                    "denom": "basecro"
+                                }
+                            ],
+                            "from_address": "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0",
+                            "to_address": "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus"
+                        }
+                    }
+                ],
+                "signatures": [
+                    {
+                        "pub_key": {
+                            "type": "tendermint/PubKeySecp256k1",
+                            "value": "A4gxsGFiPn6L5Z2IjHEISkXI0IkwfL9exV3GLB171Wvj"
+                        },
+                        "signature": "5+5rSFFg0FE9cTklQWQHNktBDJsz7UCnMSgF0t0+gYcrIhEWUyTtibXaHZQbKAAaciJ1BkHXYREjU55VswByVg=="
+                    }
+                ]
+            }
+        }
+    )");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/CryptoOrg/TWAnyAddressTests.cpp b/tests/chains/Cosmos/CryptoOrg/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..cea33e461fd
--- /dev/null
+++ b/tests/chains/Cosmos/CryptoOrg/TWAnyAddressTests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gCryptoorgAddr = "cro1tcfsr7m7d6jk6fpyety373m8c39ea2f8dmp830";
+static const std::string gCryptoorgHrp = "cro";
+
+TEST(TWCryptoorgAnyAddress, AllCryptoorgAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gCryptoorgHrp,
+                                       .coinType = TWCoinTypeCryptoOrg,
+                                       .address = gCryptoorgAddr,
+                                       .privKey = "5469c1a88e67d6d490e647ac8d82d54c4a17b8f00d272b3b30fac2253339aa28",
+                                       .publicKey = "025824f188c340235910b15e5e35aea11cfc28eabfa7756da5585c08f74db437ef"};
+    TestCosmosAddressParameters(parameters);
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/CryptoOrg/TWAnySignerTests.cpp b/tests/chains/Cosmos/CryptoOrg/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..c39786cac39
--- /dev/null
+++ b/tests/chains/Cosmos/CryptoOrg/TWAnySignerTests.cpp
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include "proto/Cosmos.pb.h"
+#include "HexCoding.h"
+#include "Base64.h"
+#include "Data.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+
+const auto Address1 = "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0";
+const auto Address2 = "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus";
+const auto PrivateKey1 = "200e439e39cf1aad465ee3de6166247f914cbc0f823fc2dd48bf16dcd556f39d";
+
+TEST(TWAnySignerCryptoorg, SignTx_Proto_BCB213) {
+    auto input = Cosmos::Proto::SigningInput();
+    input.set_signing_mode(Cosmos::Proto::Protobuf);
+    input.set_account_number(125798);
+    input.set_sequence(2);
+    input.set_chain_id("crypto-org-chain-mainnet-1");
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(Address1);
+    message.set_to_address(Address2);
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("basecro");
+    amountOfTx->set_amount("50000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("basecro");
+    amountOfFee->set_amount("5000");
+
+    auto privateKey = parse_hex(PrivateKey1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Cosmos::Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeCryptoOrg);
+
+    // https://crypto.org/explorer/tx/BCB213B0A121F0CF11BECCF52475F1C8328D6070F3CFDA9E14C42E6DB30E847E
+    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "CpABC...F0SI=", "mode": "BROADCAST_MODE_BLOCK"}' https://mainnet.crypto.org:1317/cosmos/tx/v1beta1/txs
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CpABCo0BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm0KKmNybzFjdHd0Y3dwZ2tza3k5ODhkaHRoNmpzbHh2ZXVtZ3UwZDQ1emdmMBIqY3JvMXhwYWh5NmM3d2xkeGFjdjZsZDk5aDQzNW1odmZuc3VwMjR2Y3VzGhMKB2Jhc2Vjcm8SCDUwMDAwMDAwEmkKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQOIMbBhYj5+i+WdiIxxCEpFyNCJMHy/XsVdxiwde9Vr4xIECgIIARgCEhUKDwoHYmFzZWNybxIENTAwMBDAmgwaQAcxK9xk6r69gmz+1UWaCnYxNuXPXZdp59YcqKPJE5d6fp+IICTBOwd2rs8MiApcf8kNSrbZ6oECxcGQAdxF0SI=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "07312bdc64eabebd826cfed5459a0a763136e5cf5d9769e7d61ca8a3c913977a7e9f882024c13b0776aecf0c880a5c7fc90d4ab6d9ea8102c5c19001dc45d122");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(TWAnySignerCryptoorg, SignTx_Json_DDCCE4) {
+    auto input = Cosmos::Proto::SigningInput();
+    input.set_signing_mode(Cosmos::Proto::JSON); // obsolete
+    input.set_account_number(125798);
+    input.set_sequence(0);
+    input.set_chain_id("crypto-org-chain-mainnet-1");
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(Address1);
+    message.set_to_address(Address2);
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("basecro");
+    amountOfTx->set_amount("100000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("basecro");
+    amountOfFee->set_amount("5000");
+
+    auto privateKey = parse_hex(PrivateKey1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Cosmos::Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeCryptoOrg);
+
+    assertJSONEqual(output.json(), R"(
+        {
+            "mode": "block",
+            "tx": {
+                "fee": {
+                    "amount": [
+                        {
+                            "amount": "5000",
+                            "denom": "basecro"
+                        }
+                    ],
+                    "gas": "200000"
+                },
+                "memo": "",
+                "msg": [
+                    {
+                        "type": "cosmos-sdk/MsgSend",
+                        "value": {
+                            "amount": [
+                                {
+                                    "amount": "100000000",
+                                    "denom": "basecro"
+                                }
+                            ],
+                            "from_address": "cro1ctwtcwpgksky988dhth6jslxveumgu0d45zgf0",
+                            "to_address": "cro1xpahy6c7wldxacv6ld99h435mhvfnsup24vcus"
+                        }
+                    }
+                ],
+                "signatures": [
+                    {
+                        "pub_key": {
+                            "type": "tendermint/PubKeySecp256k1",
+                            "value": "A4gxsGFiPn6L5Z2IjHEISkXI0IkwfL9exV3GLB171Wvj"
+                        },
+                        "signature": "5+5rSFFg0FE9cTklQWQHNktBDJsz7UCnMSgF0t0+gYcrIhEWUyTtibXaHZQbKAAaciJ1BkHXYREjU55VswByVg=="
+                    }
+                ]
+            }
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "e7ee6b485160d0513d713925416407364b410c9b33ed40a7312805d2dd3e81872b2211165324ed89b5da1d941b28001a7222750641d7611123539e55b3007256");
+    EXPECT_EQ(output.serialized(), "");
+    EXPECT_EQ(output.error_message(), "");
+
+    /// https://crypto.org/explorer/tx/DDCCE4052040B05914CADEFE78C0A75BE363AE39504E7EF6B2EDB8A9072AD44B
+    /// curl -H 'Content-Type: application/json' --data-binary '{"mode":"block","tx":{"fee": ... }}' https://mainnet.crypto.org:1317/txs
+}
diff --git a/tests/chains/Cosmos/CryptoOrg/TWCoinTypeTests.cpp b/tests/chains/Cosmos/CryptoOrg/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6d301f20534
--- /dev/null
+++ b/tests/chains/Cosmos/CryptoOrg/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWCryptoorgCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCryptoOrg));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("D87D2EB46B21466886EE149C1DEA3AE6C2E019C7D8C24FA1533A95439DDCE1E2"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCryptoOrg, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("cro10wrflcdc4pys9vvgqm98yg7yv5ltj7d3xehent"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCryptoOrg, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCryptoOrg));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCryptoOrg));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCryptoOrg), 8);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeCryptoOrg));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCryptoOrg));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCryptoOrg));
+    assertStringsEqual(symbol, "CRO");
+    assertStringsEqual(txUrl, "https://crypto.org/explorer/tx/D87D2EB46B21466886EE149C1DEA3AE6C2E019C7D8C24FA1533A95439DDCE1E2");
+    assertStringsEqual(accUrl, "https://crypto.org/explorer/account/cro10wrflcdc4pys9vvgqm98yg7yv5ltj7d3xehent");
+    assertStringsEqual(id, "cryptoorg");
+    assertStringsEqual(name, "Crypto.org");
+}
diff --git a/tests/chains/Cosmos/FetchAI/TWAnyAddressTests.cpp b/tests/chains/Cosmos/FetchAI/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..1a0f8862c88
--- /dev/null
+++ b/tests/chains/Cosmos/FetchAI/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gFetchAIAddr = "fetch1mry47pkga5tdswtluy0m8teslpalkdq0due27z";
+static const std::string gFetchAIHrp = "fetch";
+
+TEST(TWFetchAIAnyAddress, AllFetchAIAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gFetchAIHrp, .coinType = TWCoinTypeFetchAI, .address = gFetchAIAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/FetchAI/TWCoinTypeTests.cpp b/tests/chains/Cosmos/FetchAI/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..2653dc3ab4d
--- /dev/null
+++ b/tests/chains/Cosmos/FetchAI/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWFetchAICoinType, TWCoinType) {
+        const auto coin = TWCoinTypeFetchAI;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("7EB4F6C26809BA047F81CEFD0889775AC8522B7B8AF559B436083BE7039C5EA6"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("fetch1t3qet68dr0qkmrjtq89lrx837qa2t05265qy6s"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "fetchai");
+        assertStringsEqual(name, "Fetch AI");
+        assertStringsEqual(symbol, "FET");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "fetchhub-4");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/fetchai/txs/7EB4F6C26809BA047F81CEFD0889775AC8522B7B8AF559B436083BE7039C5EA6");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/fetchai/account/fetch1t3qet68dr0qkmrjtq89lrx837qa2t05265qy6s");
+    }
+}
diff --git a/tests/chains/Cosmos/Juno/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Juno/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..0256957b57f
--- /dev/null
+++ b/tests/chains/Cosmos/Juno/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gJunoAddr = "juno1mry47pkga5tdswtluy0m8teslpalkdq0gnn4mf";
+static const std::string gJunoHrp = "juno";
+
+TEST(TWJunoAnyAddress, AllJunoAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gJunoHrp, .coinType = TWCoinTypeJuno, .address = gJunoAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Juno/TWAnySignerTests.cpp b/tests/chains/Cosmos/Juno/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..3fcb6facd0d
--- /dev/null
+++ b/tests/chains/Cosmos/Juno/TWAnySignerTests.cpp
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWAnySignerJuno, Sign) {
+    auto privateKey = parse_hex("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(376606);
+    input.set_chain_id("juno-1");
+    input.set_memo("");
+    input.set_sequence(0);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address("juno1mry47pkga5tdswtluy0m8teslpalkdq0gnn4mf");
+    message.set_to_address("juno1mry47pkga5tdswtluy0m8teslpalkdq0gnn4mf");
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("ujuno");
+    amountOfTx->set_amount("10000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(80000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("ujuno");
+    amountOfFee->set_amount("1000");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeJuno);
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+
+    // https://www.mintscan.io/juno/txs/3DCE6AAF19657BCF11D44FD6BE124D57B44E04CA34851DE0ECCE619F70ECC46F
+    auto expectedJson = R"(
+                {
+                    "mode": "BROADCAST_MODE_BLOCK",
+                    "tx_bytes": "Co0BCooBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmoKK2p1bm8xbXJ5NDdwa2dhNXRkc3d0bHV5MG04dGVzbHBhbGtkcTBnbm40bWYSK2p1bm8xbXJ5NDdwa2dhNXRkc3d0bHV5MG04dGVzbHBhbGtkcTBnbm40bWYaDgoFdWp1bm8SBTEwMDAwEmUKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLL/bXkcokzIilOYM8Ig9Q99DHhCJ0p7LRHqebVUEWq5RIECgIIARITCg0KBXVqdW5vEgQxMDAwEIDxBBpABrA2SUNtur1XqAIzNjM4UYtFylKARkfMd2YJUi11qqMkX0rZfmHrELL+QqjERn0o3vsR231fmPGJe4P0Isjwjw=="
+                })";
+    assertJSONEqual(output.serialized(), expectedJson);
+    EXPECT_EQ(hex(output.signature()), "06b03649436dbabd57a80233363338518b45ca52804647cc776609522d75aaa3245f4ad97e61eb10b2fe42a8c4467d28defb11db7d5f98f1897b83f422c8f08f");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Juno/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Juno/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..e6683195b92
--- /dev/null
+++ b/tests/chains/Cosmos/Juno/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWJunoCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeJuno;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("3DCE6AAF19657BCF11D44FD6BE124D57B44E04CA34851DE0ECCE619F70ECC46F"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("juno1mry47pkga5tdswtluy0m8teslpalkdq0gnn4mf"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "juno");
+        assertStringsEqual(name, "Juno");
+        assertStringsEqual(symbol, "JUNO");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "juno-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/juno/txs/3DCE6AAF19657BCF11D44FD6BE124D57B44E04CA34851DE0ECCE619F70ECC46F");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/juno/account/juno1mry47pkga5tdswtluy0m8teslpalkdq0gnn4mf");
+    }
+}
diff --git a/tests/chains/Cosmos/Kava/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Kava/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..25b8079bad6
--- /dev/null
+++ b/tests/chains/Cosmos/Kava/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWKavaCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeKava));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("2988DF83FCBFAA38179D583A96734CBD071541D6768221BB23111BC8136D5E6A"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeKava, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("kava1xd39avn2f008jmvua0eupg39zsp2xn3wf802vn"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeKava, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeKava));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeKava));
+    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeKava));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeKava), 6);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeKava));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeKava));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeKava));
+    assertStringsEqual(chainId, "kava_2222-10");
+    assertStringsEqual(symbol, "KAVA");
+    assertStringsEqual(txUrl, "https://mintscan.io/kava/txs/2988DF83FCBFAA38179D583A96734CBD071541D6768221BB23111BC8136D5E6A");
+    assertStringsEqual(accUrl, "https://mintscan.io/kava/account/kava1xd39avn2f008jmvua0eupg39zsp2xn3wf802vn");
+    assertStringsEqual(id, "kava");
+    assertStringsEqual(name, "Kava");
+}
diff --git a/tests/chains/Cosmos/Kujira/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Kujira/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..803e8c6e2cf
--- /dev/null
+++ b/tests/chains/Cosmos/Kujira/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gKujiraAddr = "kujira1mry47pkga5tdswtluy0m8teslpalkdq00fjk3l";
+static const std::string gKujiraHrp = "kujira";
+
+TEST(TWKujiraAnyAddress, AllKujiraAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gKujiraHrp, .coinType = TWCoinTypeKujira, .address = gKujiraAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Kujira/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Kujira/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..61583919905
--- /dev/null
+++ b/tests/chains/Cosmos/Kujira/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWKujiraCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeKujira;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("2F5D1B1E0041A86B0590AAD2ED028693E93137A3EA1E614D59FE9B02261BC235"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("kujira13c90ger64wc26s8399rvazceqy273u3n84kgyp"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "kujira");
+    assertStringsEqual(name, "Kujira");
+    assertStringsEqual(symbol, "KUJI");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "kaiyo-1");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/kujira/txs/2F5D1B1E0041A86B0590AAD2ED028693E93137A3EA1E614D59FE9B02261BC235");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/kujira/account/kujira13c90ger64wc26s8399rvazceqy273u3n84kgyp");
+}
diff --git a/tests/chains/Cosmos/Mars/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Mars/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..16fd4812c92
--- /dev/null
+++ b/tests/chains/Cosmos/Mars/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gMarsAddr = "mars1mry47pkga5tdswtluy0m8teslpalkdq0rufhfw";
+static const std::string gMarsHrp = "mars";
+
+TEST(TWMarsAnyAddress, AllMarsAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gMarsHrp, .coinType = TWCoinTypeMars, .address = gMarsAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Mars/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Mars/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..4a21d8a6b4d
--- /dev/null
+++ b/tests/chains/Cosmos/Mars/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWMarsCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeMars;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("C12120760C71189A678739E0F1FD4EFAF2C29EA660B57A359AC728F89FAA7528"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("mars1nnjy6nct405pzfaqjm3dsyw0pf0kyw72vhw4pr"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "mars");
+        assertStringsEqual(name, "Mars Hub");
+        assertStringsEqual(symbol, "MARS");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "mars-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/mars-protocol/txs/C12120760C71189A678739E0F1FD4EFAF2C29EA660B57A359AC728F89FAA7528");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/mars-protocol/account/mars1nnjy6nct405pzfaqjm3dsyw0pf0kyw72vhw4pr");
+    }
+}
diff --git a/tests/chains/Cosmos/NativeCanto/TWAnyAddressTests.cpp b/tests/chains/Cosmos/NativeCanto/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..cfc4a2f6421
--- /dev/null
+++ b/tests/chains/Cosmos/NativeCanto/TWAnyAddressTests.cpp
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gNativeCantoAddr = "canto14py36sx57ud82t9yrks9z6hdsrpn5x6kl5l2ap";
+static const std::string gNativeCantoHrp = "canto";
+
+TEST(TWNativeCantoAnyAddress, AllNativeCantoAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gNativeCantoHrp,
+                                       .coinType = TWCoinTypeNativeCanto,
+                                       .address = gNativeCantoAddr,
+                                       .standaloneChain = false,
+                                       .publicKeyType = TWPublicKeyTypeSECP256k1Extended,
+                                       .privKey = "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed",
+                                       .publicKey = "04868e7e1634417db2adfd9fe38205bfa0fea01898a7fd30565d13f7056a37c065211845f6e553524c2c1611af9712ac02b7a3b439c9f0cfcadfd81a2c86cc0ab8",
+                                        };
+    TestCosmosAddressParameters(parameters);
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/NativeCanto/TWCoinTypeTests.cpp b/tests/chains/Cosmos/NativeCanto/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..cc282cd0e1f
--- /dev/null
+++ b/tests/chains/Cosmos/NativeCanto/TWCoinTypeTests.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::NativeCanto::tests {
+
+TEST(TWCantoCoinType, TWCoinTypeNativeCanto) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNativeCanto));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("A16C211C83AD1E684DE46F694FAAC17D8465C864BD7385A81EC062CDE0638811"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNativeCanto, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("canto17xpfvakm2amg962yls6f84z3kell8c5ljcjw34"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNativeCanto, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNativeCanto));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNativeCanto));
+    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeNativeCanto));
+
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNativeCanto), 18);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeNativeCanto));
+
+    assertStringsEqual(symbol, "CANTO");
+    assertStringsEqual(txUrl, "https://mintscan.io/canto/txs/A16C211C83AD1E684DE46F694FAAC17D8465C864BD7385A81EC062CDE0638811");
+    assertStringsEqual(accUrl, "https://mintscan.io/canto/account/canto17xpfvakm2amg962yls6f84z3kell8c5ljcjw34");
+    assertStringsEqual(id, "nativecanto");
+    assertStringsEqual(name, "NativeCanto");
+    assertStringsEqual(chainId, "canto_7700-1");
+}
+
+} // namespace TW::NativeCanto::tests
diff --git a/tests/chains/Cosmos/NativeEvmos/TWAnyAddressTests.cpp b/tests/chains/Cosmos/NativeEvmos/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..3dbb62b8cfd
--- /dev/null
+++ b/tests/chains/Cosmos/NativeEvmos/TWAnyAddressTests.cpp
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gNativeEvmosAddr = "evmos14py36sx57ud82t9yrks9z6hdsrpn5x6k0r05np";
+static const std::string gNativeEvmosHrp = "evmos";
+
+TEST(TWNativeEvmosAnyAddress, AllNativeEvmosAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gNativeEvmosHrp,
+                                       .coinType = TWCoinTypeNativeEvmos,
+                                       .address = gNativeEvmosAddr,
+                                       .standaloneChain = false,
+                                       .publicKeyType = TWPublicKeyTypeSECP256k1Extended,
+                                       .privKey = "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed",
+                                       .publicKey = "04868e7e1634417db2adfd9fe38205bfa0fea01898a7fd30565d13f7056a37c065211845f6e553524c2c1611af9712ac02b7a3b439c9f0cfcadfd81a2c86cc0ab8",
+                                        };
+    TestCosmosAddressParameters(parameters);
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/NativeEvmos/TWCoinTypeTests.cpp b/tests/chains/Cosmos/NativeEvmos/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..052ffcf1038
--- /dev/null
+++ b/tests/chains/Cosmos/NativeEvmos/TWCoinTypeTests.cpp
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::NativeEvmos::tests {
+
+TEST(TWEvmosCoinType, TWCoinTypeNativeEvmos) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNativeEvmos));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("A16C211C83AD1E684DE46F694FAAC17D8465C864BD7385A81EC062CDE0638811"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNativeEvmos, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNativeEvmos, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNativeEvmos));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNativeEvmos));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNativeEvmos), 18);
+    ASSERT_EQ(TWBlockchainNativeEvmos, TWCoinTypeBlockchain(TWCoinTypeNativeEvmos));
+
+    assertStringsEqual(symbol, "EVMOS");
+    assertStringsEqual(txUrl, "https://mintscan.io/evmos/txs/A16C211C83AD1E684DE46F694FAAC17D8465C864BD7385A81EC062CDE0638811");
+    assertStringsEqual(accUrl, "https://mintscan.io/evmos/account/evmos17xpfvakm2amg962yls6f84z3kell8c5ljcjw34");
+    assertStringsEqual(id, "nativeevmos");
+    assertStringsEqual(name, "Native Evmos");
+}
+
+} // namespace TW::NativeEvmos::tests
diff --git a/tests/chains/Cosmos/NativeInjective/SignerTests.cpp b/tests/chains/Cosmos/NativeInjective/SignerTests.cpp
new file mode 100644
index 00000000000..4b1ce6b5ec2
--- /dev/null
+++ b/tests/chains/Cosmos/NativeInjective/SignerTests.cpp
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Base64.h"
+#include "proto/Cosmos.pb.h"
+#include "Cosmos/Address.h"
+#include "TestUtilities.h"
+#include "TrustWalletCore/TWAnySigner.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::nativeInjective::tests {
+
+TEST(NativeInjectiveSigner, Sign) {
+   auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(17396);
+    input.set_chain_id("injective-1");
+    input.set_sequence(1);
+
+    Address fromAddress;
+    Address toAddress;
+    EXPECT_TRUE(Address::decode("inj13u6g7vqgw074mgmf2ze2cadzvkz9snlwcrtq8a", fromAddress));
+    EXPECT_TRUE(Address::decode("inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("inj");
+    amountOfTx->set_amount("10000000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(110000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("inj");
+    amountOfFee->set_amount("100000000000000");
+
+    auto privateKey = parse_hex("9ee18daf8e463877aaf497282abc216852420101430482a28e246c179e2c5ef1");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeNativeInjective);
+
+    // https://www.mintscan.io/injective/txs/135DD2C4A1910E4334A9C0F15125DA992E724EBF23FEB9638FCB71218BB064A5
+    assertJSONEqual(output.serialized(), "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"Co8BCowBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmwKKmluajEzdTZnN3ZxZ3cwNzRtZ21mMnplMmNhZHp2a3o5c25sd2NydHE4YRIqaW5qMXhtcGtteHI0YXMwMGVtMjN0YzJ6Z211eXkyZ3I0aDN3Z2NsNnZkGhIKA2luahILMTAwMDAwMDAwMDASngEKfgp0Ci0vaW5qZWN0aXZlLmNyeXB0by52MWJldGExLmV0aHNlY3AyNTZrMS5QdWJLZXkSQwpBBFoMa4O4vZgn5QcnDK20mbfjqQlSRvaiITKB94PYd8mLJWdCdBsGOfMXdo/k9MJ2JmDCESKDp2hdgVUH3uMikXMSBAoCCAEYARIcChYKA2luahIPMTAwMDAwMDAwMDAwMDAwELDbBhpAx2vkplmzeK7n3puCFGPWhLd0l/ZC/CYkGl+stH+3S3hiCvIe7uwwMpUlNaSwvT8HwF1kNUp+Sx2m0Uo1x5xcFw==\"}");
+}
+
+}
diff --git a/tests/chains/Cosmos/NativeInjective/TWAnyAddressTests.cpp b/tests/chains/Cosmos/NativeInjective/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..9dd4818c87c
--- /dev/null
+++ b/tests/chains/Cosmos/NativeInjective/TWAnyAddressTests.cpp
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gNativeInjectiveAddr = "inj14py36sx57ud82t9yrks9z6hdsrpn5x6k8tf7m3";
+static const std::string gNativeInjectiveHrp = "inj";
+
+TEST(TWNativeInjectiveAnyAddress, AllNativeInjectiveAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gNativeInjectiveHrp,
+        .coinType = TWCoinTypeNativeInjective,
+        .address = gNativeInjectiveAddr,
+        .standaloneChain = false,
+        .publicKeyType = TWPublicKeyTypeSECP256k1Extended,
+        .privKey = "8d2a3bd62d300a148c89dc8635f87b7a24a951bd1c4e78675fe40e1a640d46ed",
+        .publicKey = "04868e7e1634417db2adfd9fe38205bfa0fea01898a7fd30565d13f7056a37c065211845f6e553524c2c1611af9712ac02b7a3b439c9f0cfcadfd81a2c86cc0ab8",
+    };
+    TestCosmosAddressParameters(parameters);
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/NativeInjective/TWCoinTypeTests.cpp b/tests/chains/Cosmos/NativeInjective/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6a120226d4f
--- /dev/null
+++ b/tests/chains/Cosmos/NativeInjective/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNativeInjectiveCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeNativeInjective;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("C5F6A4FF9DF1AE9FF543D2CEBD8E3E9B04290B2445F9D91D7707EDBF4B7EE16B"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "nativeinjective");
+    assertStringsEqual(name, "Native Injective");
+    assertStringsEqual(symbol, "INJ");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainNativeInjective);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "injective-1");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/injective/txs/C5F6A4FF9DF1AE9FF543D2CEBD8E3E9B04290B2445F9D91D7707EDBF4B7EE16B");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/injective/account/inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd");
+}
diff --git a/tests/chains/Cosmos/NativeInjective/TransactionCompilerTests.cpp b/tests/chains/Cosmos/NativeInjective/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..2bf1a12785a
--- /dev/null
+++ b/tests/chains/Cosmos/NativeInjective/TransactionCompilerTests.cpp
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+#include "TrustWalletCore/TWAnySigner.h"
+#include "TestUtilities.h"
+#include "TransactionCompiler.h"
+
+namespace TW::Cosmos::nativeInjective::tests {
+
+TEST(NativeInjectiveCompiler, CompileWithSignatures) {
+    // Successfully broadcasted: https://www.mintscan.io/injective/transactions/B77D61590353C4AEDEAE2BBFF9E406DCF90E8D3A1A723BF22860F1E0A2617058
+
+    const auto coin = TWCoinTypeNativeInjective;
+    TW::Cosmos::Proto::SigningInput input;
+
+    PrivateKey privateKey =
+        PrivateKey(parse_hex("727513ec3c54eb6fae24f2ff756bbc4c89b82945c6538bbd173613ae3de719d3"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    /// Step 1: Prepare transaction input (protobuf)
+    input.set_account_number(88701);
+    input.set_chain_id("injective-1");
+    input.set_memo("");
+    input.set_sequence(0);
+
+    PublicKey publicKey = privateKey.getPublicKey(TWCoinTypePublicKeyType(coin));
+    const auto pubKeyBz = publicKey.bytes;
+    ASSERT_EQ(hex(pubKeyBz), "04088ac2919987d927368cb2be2ade44cd0ed3616745a9699cae264b3fc5a7c3607d99f441b8340990ee990cb3eaf560f1f0bafe600c7e94a4be8392166984f728");
+    input.set_public_key(pubKeyBz.data(), pubKeyBz.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address("inj1d0jkrsd09c7pule43y3ylrul43lwwcqaky8w8c");
+    message.set_to_address("inj1xmpkmxr4as00em23tc2zgmuyy2gr4h3wgcl6vd");
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("inj");
+    amountOfTx->set_amount("10000000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(110000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("inj");
+    amountOfFee->set_amount("100000000000000");
+
+    /// Step 2: Obtain protobuf preimage hash
+    input.set_signing_mode(TW::Cosmos::Proto::Protobuf);
+    auto protoInputString = input.SerializeAsString();
+    auto protoInputData = TW::Data(protoInputString.begin(), protoInputString.end());
+
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, protoInputData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    auto preImage = preSigningOutput.data();
+    auto preImageHash = preSigningOutput.data_hash();
+
+    EXPECT_EQ(
+        hex(preImage),
+        "0a8f010a8c010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126c0a2a696e6a3164306a6b7273643039633770756c6534337933796c72756c34336c77776371616b7938773863122a696e6a31786d706b6d78723461733030656d32337463327a676d7579793267723468337767636c3676641a120a03696e6a120b3130303030303030303030129c010a7c0a740a2d2f696e6a6563746976652e63727970746f2e763162657461312e657468736563703235366b312e5075624b657912430a4104088ac2919987d927368cb2be2ade44cd0ed3616745a9699cae264b3fc5a7c3607d99f441b8340990ee990cb3eaf560f1f0bafe600c7e94a4be8392166984f72812040a020801121c0a160a03696e6a120f31303030303030303030303030303010b0db061a0b696e6a6563746976652d3120fdb405");
+    EXPECT_EQ(hex(preImageHash),
+        "57dc10c3d1893ff16e1f5a47fa4b2e96f37b9c57d98a42d88c971debb4947ec9");
+
+
+    auto expectedTx = R"({"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"Co8BCowBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmwKKmluajFkMGprcnNkMDljN3B1bGU0M3kzeWxydWw0M2x3d2NxYWt5OHc4YxIqaW5qMXhtcGtteHI0YXMwMGVtMjN0YzJ6Z211eXkyZ3I0aDN3Z2NsNnZkGhIKA2luahILMTAwMDAwMDAwMDASnAEKfAp0Ci0vaW5qZWN0aXZlLmNyeXB0by52MWJldGExLmV0aHNlY3AyNTZrMS5QdWJLZXkSQwpBBAiKwpGZh9knNoyyvireRM0O02FnRalpnK4mSz/Fp8NgfZn0Qbg0CZDumQyz6vVg8fC6/mAMfpSkvoOSFmmE9ygSBAoCCAESHAoWCgNpbmoSDzEwMDAwMDAwMDAwMDAwMBCw2wYaQPep7ApSEXC7VWbKlz08c6G2mxYtmc4CIFkYmZHsRAY3MzOU/xyedfrYTrEUOTlp8gmJsDbx3+0olJ6QbcAHdCE="})";
+    Data signature;
+
+    {
+        TW::Cosmos::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+        assertJSONEqual(
+            output.serialized(),
+            expectedTx);
+
+        signature = data(output.signature());
+        EXPECT_EQ(hex(signature),
+                  "f7a9ec0a521170bb5566ca973d3c73a1b69b162d99ce022059189991ec440637333394ff1c9e75fad84eb114393969f20989b036f1dfed28949e906dc0077421");
+
+        ASSERT_TRUE(publicKey.verify(signature, data(preImageHash.data())));
+    }
+
+    {
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, protoInputData, {signature}, {publicKey.bytes});
+        Cosmos::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        EXPECT_EQ(output.serialized(), expectedTx);
+        EXPECT_EQ(hex(output.signature()), "f7a9ec0a521170bb5566ca973d3c73a1b69b162d99ce022059189991ec440637333394ff1c9e75fad84eb114393969f20989b036f1dfed28949e906dc0077421");
+    }
+}
+
+}
diff --git a/tests/chains/Cosmos/Neutron/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Neutron/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..662f74bd756
--- /dev/null
+++ b/tests/chains/Cosmos/Neutron/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gNeutronAddr = "neutron1mry47pkga5tdswtluy0m8teslpalkdq067evxj";
+static const std::string gNeutronHrp = "neutron";
+
+TEST(TWNeutronAnyAddress, AllNeutronAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gNeutronHrp, .coinType = TWCoinTypeNeutron, .address = gNeutronAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Neutron/TWAnySignerTests.cpp b/tests/chains/Cosmos/Neutron/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..bafa42a9c7d
--- /dev/null
+++ b/tests/chains/Cosmos/Neutron/TWAnySignerTests.cpp
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWAnySignerNeutron, SignAirdropNeutron) {
+    auto privateKey = parse_hex("37f0af5bc20adb6832d39368a15492cd1e9e0cc1556d4317a5f75f9ccdf525ee");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(336);
+    input.set_chain_id("pion-1");
+    input.set_memo("");
+    input.set_sequence(0);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_execute_contract_generic();
+
+    const auto tokenContractAddress = "neutron1465d8udjudl6cd8kgdlh2s37p7q0cf9x7yveumqwqk6ng94qwnmq7n79qn";
+    const auto txMessage = R"({"claim":{"address":"neutron19h42zjnls2tpmg6yylcg6nr56cjxcx35q6xt57", "proof":["404ae2093edcca979ccb6ae4a36689cebc9c2c6a2b00b106c5396b079bf6dcf5","282fee30a25a60904f54d4f74aee8fcf8dd2822799c43be733e18e15743d4ece","e10de4202fe6532329d0d463d9669f1b659920868b9ea87d6715bfd223a86a40","564b4122c6f98653153d8e09d5a5f659fa7ebea740aa6b689c94211f8a11cc4b"], "amount":"2000000"}})";
+
+    message.set_sender_address("neutron19h42zjnls2tpmg6yylcg6nr56cjxcx35q6xt57");
+    message.set_contract_address(tokenContractAddress);
+    message.set_execute_msg(txMessage);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(666666);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("untrn");
+    amountOfFee->set_amount("1000");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNeutron);
+
+    // Successfully broadcasted: https://explorer.rs-testnet.polypore.xyz/pion-1/tx/28F25164B1E2556844C227819B1D5437960B7E91181B37460EC6792588FF7E4E
+    auto expectedJson = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CpQECpEECiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QS6AMKLm5ldXRyb24xOWg0MnpqbmxzMnRwbWc2eXlsY2c2bnI1NmNqeGN4MzVxNnh0NTcSQm5ldXRyb24xNDY1ZDh1ZGp1ZGw2Y2Q4a2dkbGgyczM3cDdxMGNmOXg3eXZldW1xd3FrNm5nOTRxd25tcTduNzlxbhrxAnsiY2xhaW0iOnsiYWRkcmVzcyI6Im5ldXRyb24xOWg0MnpqbmxzMnRwbWc2eXlsY2c2bnI1NmNqeGN4MzVxNnh0NTciLCAicHJvb2YiOlsiNDA0YWUyMDkzZWRjY2E5NzljY2I2YWU0YTM2Njg5Y2ViYzljMmM2YTJiMDBiMTA2YzUzOTZiMDc5YmY2ZGNmNSIsIjI4MmZlZTMwYTI1YTYwOTA0ZjU0ZDRmNzRhZWU4ZmNmOGRkMjgyMjc5OWM0M2JlNzMzZTE4ZTE1NzQzZDRlY2UiLCJlMTBkZTQyMDJmZTY1MzIzMjlkMGQ0NjNkOTY2OWYxYjY1OTkyMDg2OGI5ZWE4N2Q2NzE1YmZkMjIzYTg2YTQwIiwiNTY0YjQxMjJjNmY5ODY1MzE1M2Q4ZTA5ZDVhNWY2NTlmYTdlYmVhNzQwYWE2YjY4OWM5NDIxMWY4YTExY2M0YiJdLCAiYW1vdW50IjoiMjAwMDAwMCJ9fRJlCk4KRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECqPwhojhpWpB3vDr8R+qyUnDkcK3BPxS35F8OrHPq5WwSBAoCCAESEwoNCgV1bnRybhIEMTAwMBCq2CgaQMIEXC8zyuuXWuIeX7dZBBzxMjmheOP1ONitBrVZdwmuQUgClmwhOdW0JwRe8CJ5NUKqtDYZjKFAPKGEWQ2veDs="
+                })";
+    assertJSONEqual(output.serialized(), expectedJson);
+    EXPECT_EQ(hex(output.signature()), "c2045c2f33caeb975ae21e5fb759041cf13239a178e3f538d8ad06b5597709ae414802966c2139d5b427045ef022793542aab436198ca1403ca184590daf783b");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(TWAnySignerNeutron, SignWithdrawAirdropNeutron) {
+    auto privateKey = parse_hex("37f0af5bc20adb6832d39368a15492cd1e9e0cc1556d4317a5f75f9ccdf525ee");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(336);
+    input.set_chain_id("pion-1");
+    input.set_memo("");
+    input.set_sequence(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_execute_contract_generic();
+
+    const auto tokenContractAddress = "neutron1dv49y7afpq573yyk6zj2z4rn7gqh689plhtrf6223kqs8ee3tq9spqpuf2";
+    const auto txMessage = R"({"withdraw":{"amount":"313468"}})";
+
+    message.set_sender_address("neutron19h42zjnls2tpmg6yylcg6nr56cjxcx35q6xt57");
+    message.set_contract_address(tokenContractAddress);
+    message.set_execute_msg(txMessage);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(666666);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("untrn");
+    amountOfFee->set_amount("1000");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNeutron);
+
+    // Successfully broadcasted: https://explorer.rs-testnet.polypore.xyz/pion-1/tx/28F25164B1E2556844C227819B1D5437960B7E91181B37460EC6792588FF7E4E
+    auto expectedJson = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CsIBCr8BCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QSlgEKLm5ldXRyb24xOWg0MnpqbmxzMnRwbWc2eXlsY2c2bnI1NmNqeGN4MzVxNnh0NTcSQm5ldXRyb24xZHY0OXk3YWZwcTU3M3l5azZ6ajJ6NHJuN2dxaDY4OXBsaHRyZjYyMjNrcXM4ZWUzdHE5c3BxcHVmMhogeyJ3aXRoZHJhdyI6eyJhbW91bnQiOiIzMTM0NjgifX0SZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAqj8IaI4aVqQd7w6/EfqslJw5HCtwT8Ut+RfDqxz6uVsEgQKAggBGAESEwoNCgV1bnRybhIEMTAwMBCq2CgaQN/zzFyDC2i/lvQUNJ9Y24sWlDsAx2pa+p7KPAIiya+TNrsVrgW9jq83gi8OPhS/+/47hPH8LYOR41TijWnLgDA="
+                })";
+    assertJSONEqual(output.serialized(), expectedJson);
+    EXPECT_EQ(hex(output.signature()), "dff3cc5c830b68bf96f414349f58db8b16943b00c76a5afa9eca3c0222c9af9336bb15ae05bd8eaf37822f0e3e14bffbfe3b84f1fc2d8391e354e28d69cb8030");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Neutron/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Neutron/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..0c5a3aa3978
--- /dev/null
+++ b/tests/chains/Cosmos/Neutron/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNeutronCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeNeutron;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("E18BA087009A05EB6A15A22FE30BA99379B909F74A74120E6F92B9882C45F0D7"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("neutron1pm4af8pcurxssdxztqw9rexx5f8zfq7uzqfmy8"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "neutron");
+    assertStringsEqual(name, "Neutron");
+    assertStringsEqual(symbol, "NTRN");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "neutron-1");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/neutron/txs/E18BA087009A05EB6A15A22FE30BA99379B909F74A74120E6F92B9882C45F0D7");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/neutron/account/neutron1pm4af8pcurxssdxztqw9rexx5f8zfq7uzqfmy8");
+}
diff --git a/tests/chains/Cosmos/Noble/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Noble/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..4be942ba178
--- /dev/null
+++ b/tests/chains/Cosmos/Noble/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gNobleAddr = "noble1mry47pkga5tdswtluy0m8teslpalkdq0kz9xym";
+static const std::string gNobleHrp = "noble";
+
+TEST(TWNobleAnyAddress, AllNobleAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gNobleHrp, .coinType = TWCoinTypeNoble, .address = gNobleAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Noble/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Noble/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f63dbdff7ee
--- /dev/null
+++ b/tests/chains/Cosmos/Noble/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWNobleCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeNoble;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("EA231079975A058FEC28EF372B445763918C098DE033E868E2E035F3F98C59C7"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("noble1y2egevq0nyzm7w6a9kpxkw86eqytcvxpwsp6d9"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "noble");
+        assertStringsEqual(name, "Noble");
+        assertStringsEqual(symbol, "USDC");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "noble-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/noble/txs/EA231079975A058FEC28EF372B445763918C098DE033E868E2E035F3F98C59C7");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/noble/account/noble1y2egevq0nyzm7w6a9kpxkw86eqytcvxpwsp6d9");
+    }
+}
diff --git a/tests/chains/Cosmos/Osmosis/SignerTests.cpp b/tests/chains/Cosmos/Osmosis/SignerTests.cpp
new file mode 100644
index 00000000000..91935d871e5
--- /dev/null
+++ b/tests/chains/Cosmos/Osmosis/SignerTests.cpp
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include "proto/Cosmos.pb.h"
+#include "TrustWalletCore/TWAnySigner.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(OsmosisSigner, SignTransfer_81B4) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(124703);
+    input.set_chain_id("osmosis-1");
+    input.set_memo("");
+    input.set_sequence(0);
+
+    Address fromAddress;
+    Address toAddress;
+    EXPECT_TRUE(Address::decode("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5", fromAddress));
+    EXPECT_TRUE(Address::decode("osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("uosmo");
+    amountOfTx->set_amount("99800");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uosmo");
+    amountOfFee->set_amount("200");
+
+    auto privateKey = parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeOsmosis);
+
+    // https://www.mintscan.io/osmosis/txs/81B4F01BDE72AF7FF4536E5D7E66EB218E9FC9ACAA7C5EB5DB237DD0595D5F5F
+    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "Co0B...rYVj", "mode": "BROADCAST_MODE_BLOCK"}' https://lcd-osmosis.keplr.app/cosmos/tx/v1beta1/txs
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"Co0BCooBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmoKK29zbW8xbWt5Njljbjhla3R3eTA4NDV2ZWM5dXBzZHBoa3R4dDBlbjk3ZjUSK29zbW8xOHMwaGRuc2xsZ2NjbHdldTlheW13NG5na3RyMmswcmt2bjdqbW4aDgoFdW9zbW8SBTk5ODAwEmQKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLs71zkN6MCxn+VRo3ksx826RH0Z9fmpStBweE+HVY2SRIECgIIARISCgwKBXVvc21vEgMyMDAQwJoMGkAMY//Md5GRUR4lVZhk558hFS3kii9QZYoYKfg4+ac/xgNeyoiEweVDhcmEvlH1orVwjLUOnYs4ly2a/yIurYVj\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "0c63ffcc779191511e25559864e79f21152de48a2f50658a1829f838f9a73fc6035eca8884c1e54385c984be51f5a2b5708cb50e9d8b38972d9aff222ead8563");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Osmosis/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Osmosis/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..7979390c7a3
--- /dev/null
+++ b/tests/chains/Cosmos/Osmosis/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gOsmosisAddr = "osmo1mry47pkga5tdswtluy0m8teslpalkdq0k6r728";
+static const std::string gOsmosisHrp = "osmo";
+
+TEST(TWOsmosisAnyAddress, AllOsmosisAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gOsmosisHrp, .coinType = TWCoinTypeOsmosis, .address = gOsmosisAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Osmosis/TWAnySignerTests.cpp b/tests/chains/Cosmos/Osmosis/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..41dbaaf789c
--- /dev/null
+++ b/tests/chains/Cosmos/Osmosis/TWAnySignerTests.cpp
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWAnySignerOsmosis, Sign) {
+    auto privateKey = parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(124703);
+    input.set_chain_id("osmosis-1");
+    input.set_memo("");
+    input.set_sequence(0);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Address fromAddress;
+    Address toAddress;
+    EXPECT_TRUE(Address::decode("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5", fromAddress));
+    EXPECT_TRUE(Address::decode("osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("uosmo");
+    amountOfTx->set_amount("99800");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uosmo");
+    amountOfFee->set_amount("200");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeOsmosis);
+
+    // https://www.mintscan.io/osmosis/txs/81B4F01BDE72AF7FF4536E5D7E66EB218E9FC9ACAA7C5EB5DB237DD0595D5F5F
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"Co0BCooBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmoKK29zbW8xbWt5Njljbjhla3R3eTA4NDV2ZWM5dXBzZHBoa3R4dDBlbjk3ZjUSK29zbW8xOHMwaGRuc2xsZ2NjbHdldTlheW13NG5na3RyMmswcmt2bjdqbW4aDgoFdW9zbW8SBTk5ODAwEmQKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLs71zkN6MCxn+VRo3ksx826RH0Z9fmpStBweE+HVY2SRIECgIIARISCgwKBXVvc21vEgMyMDAQwJoMGkAMY//Md5GRUR4lVZhk558hFS3kii9QZYoYKfg4+ac/xgNeyoiEweVDhcmEvlH1orVwjLUOnYs4ly2a/yIurYVj\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "0c63ffcc779191511e25559864e79f21152de48a2f50658a1829f838f9a73fc6035eca8884c1e54385c984be51f5a2b5708cb50e9d8b38972d9aff222ead8563");
+    EXPECT_EQ(output.json(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Osmosis/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Osmosis/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..ca043ca6fec
--- /dev/null
+++ b/tests/chains/Cosmos/Osmosis/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWOsmosisCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOsmosis));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("5A6E50A6F2927E4B8C87BB094D5FBF15F1287429A09111806FC44B3CD86CACA8"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOsmosis, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOsmosis, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOsmosis));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOsmosis));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOsmosis), 6);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeOsmosis));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeOsmosis));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeOsmosis));
+    assertStringsEqual(symbol, "OSMO");
+    assertStringsEqual(txUrl, "https://mintscan.io/osmosis/txs/5A6E50A6F2927E4B8C87BB094D5FBF15F1287429A09111806FC44B3CD86CACA8");
+    assertStringsEqual(accUrl, "https://mintscan.io/osmosis/account/osmo1mky69cn8ektwy0845vec9upsdphktxt0en97f5");
+    assertStringsEqual(id, "osmosis");
+    assertStringsEqual(name, "Osmosis");
+}
diff --git a/tests/chains/Cosmos/Persistence/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Persistence/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..3219bf90f55
--- /dev/null
+++ b/tests/chains/Cosmos/Persistence/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gPersistenceAddr = "persistence1mry47pkga5tdswtluy0m8teslpalkdq0sdkaj3";
+static const std::string gPersistenceHrp = "persistence";
+
+TEST(TWPersistenceAnyAddress, AllPersistenceAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gPersistenceHrp, .coinType = TWCoinTypePersistence, .address = gPersistenceAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Persistence/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Persistence/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..0669a3af94d
--- /dev/null
+++ b/tests/chains/Cosmos/Persistence/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWPersistenceCoinType, TWCoinType) {
+        const auto coin = TWCoinTypePersistence;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("BBD9DEE03A8D7538D8E7398217467F4A2B5690D15773E8A6442E6AEEEFA21E64"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("persistence10ys69560pqr6zmqam80g8s0smtjw6p3ugzmy3u"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "persistence");
+        assertStringsEqual(name, "Persistence");
+        assertStringsEqual(symbol, "XPRT");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "core-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/persistence/txs/BBD9DEE03A8D7538D8E7398217467F4A2B5690D15773E8A6442E6AEEEFA21E64");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/persistence/account/persistence10ys69560pqr6zmqam80g8s0smtjw6p3ugzmy3u");
+    }
+}
diff --git a/tests/Cosmos/Protobuf/.gitignore b/tests/chains/Cosmos/Protobuf/.gitignore
similarity index 100%
rename from tests/Cosmos/Protobuf/.gitignore
rename to tests/chains/Cosmos/Protobuf/.gitignore
diff --git a/tests/Cosmos/Protobuf/Article.proto b/tests/chains/Cosmos/Protobuf/Article.proto
similarity index 100%
rename from tests/Cosmos/Protobuf/Article.proto
rename to tests/chains/Cosmos/Protobuf/Article.proto
diff --git a/tests/chains/Cosmos/Quasar/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Quasar/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..99b9eddc9eb
--- /dev/null
+++ b/tests/chains/Cosmos/Quasar/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gQuasarAddr = "quasar1mry47pkga5tdswtluy0m8teslpalkdq0sz2n3s";
+static const std::string gQuasarHrp = "quasar";
+
+TEST(TWQuasarAnyAddress, AllQuasarAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gQuasarHrp, .coinType = TWCoinTypeQuasar, .address = gQuasarAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Quasar/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Quasar/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..724a95988da
--- /dev/null
+++ b/tests/chains/Cosmos/Quasar/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWQuasarCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeQuasar;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("2898B89C98FE1E8CF1E05A37E4EE5EE5ED83FD957B0CAEE53DE39FC82BF1A033"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("quasar1cqu6w425slheul3jsmyt6q0ec0rs0w0ugkst3k"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "quasar");
+        assertStringsEqual(name, "Quasar");
+        assertStringsEqual(symbol, "QSR");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "quasar-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/quasar/txs/2898B89C98FE1E8CF1E05A37E4EE5EE5ED83FD957B0CAEE53DE39FC82BF1A033");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/quasar/account/quasar1cqu6w425slheul3jsmyt6q0ec0rs0w0ugkst3k");
+    }
+}
diff --git a/tests/chains/Cosmos/Secret/SignerTests.cpp b/tests/chains/Cosmos/Secret/SignerTests.cpp
new file mode 100644
index 00000000000..515419fd331
--- /dev/null
+++ b/tests/chains/Cosmos/Secret/SignerTests.cpp
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "TrustWalletCore/TWAnySigner.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "proto/Cosmos.pb.h"
+#include "PublicKey.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(SecretSigner, Sign) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(265538);
+    input.set_chain_id("secret-4");
+    input.set_memo("");
+    input.set_sequence(1);
+
+    Address fromAddress;
+    Address toAddress;
+    EXPECT_TRUE(Address::decode("secret18mdrja40gfuftt5yx6tgj0fn5lurplezyp894y", fromAddress));
+    EXPECT_TRUE(Address::decode("secret1rnq6hjfnalxeef87rmdeya3nu9dhpc7k9pujs3", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("uscrt");
+    amountOfTx->set_amount("100000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(25000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uscrt");
+    amountOfFee->set_amount("2500");
+
+    auto privateKey = parse_hex("87201512d132ef7a1e57f9e24905fbc24300bd73f676b5716182be5f3e39dada");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeSecret);
+
+    // https://www.mintscan.io/secret/txs/01F4BD2458BF966F287533775C8D67BBC7CA7214CAEB1752D270A90223E9E82F
+    // curl -H 'Content-Type: application/json' --data-binary "{\"tx_bytes\":\"CpIB...c4o=\",\"mode\":\"BROADCAST_MODE_BLOCK\"}" https://scrt-lcd.blockpane.com/cosmos/tx/v1beta1/txs
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLXNlY3JldDE4bWRyamE0MGdmdWZ0dDV5eDZ0Z2owZm41bHVycGxlenlwODk0eRItc2VjcmV0MXJucTZoamZuYWx4ZWVmODdybWRleWEzbnU5ZGhwYzdrOXB1anMzGg8KBXVzY3J0EgYxMDAwMDASZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAkZqxdKMtPq2w0kGDGwWGejTAed0H7azPMHtrCX0XYZGEgQKAggBGAESEwoNCgV1c2NydBIEMjUwMBCowwEaQOcHd2gHpa5WKZ/5RRerEtrHlyDlojIEzUGhC9xMFgs7UQMWy+kTTN+NRf7zQ8rx3cPkIKeZhv0u1KRc8uRCc4o=\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "e707776807a5ae56299ff94517ab12dac79720e5a23204cd41a10bdc4c160b3b510316cbe9134cdf8d45fef343caf1ddc3e420a79986fd2ed4a45cf2e442738a");
+    EXPECT_EQ(output.error_message(), "");
+    EXPECT_EQ(output.json(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Secret/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Secret/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..945f5192010
--- /dev/null
+++ b/tests/chains/Cosmos/Secret/TWAnyAddressTests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gSecretAddr = "secret1l0cjpuwu09hwu4wdds7pljn83346x2c90d8h0l";
+static const std::string gSecretHrp = "secret";
+
+TEST(TWSecretAnyAddress, AllSecretAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gSecretHrp,
+                                       .coinType = TWCoinTypeSecret,
+                                       .address = gSecretAddr,
+                                       .privKey = "a054c9a67d81ada560ab6fda3310ebf5971e163ff2291ee736ca64b6a5af1ada",
+                                       .publicKey = "03967d2c6263c2d74d9c2fac3a024e2892a94497b64edb294ffab4042851f00b90"};
+    TestCosmosAddressParameters(parameters);
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Secret/TWAnySignerTests.cpp b/tests/chains/Cosmos/Secret/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..95a0f4712b0
--- /dev/null
+++ b/tests/chains/Cosmos/Secret/TWAnySignerTests.cpp
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWAnySignerSecret, Sign) {
+    auto privateKey = parse_hex("87201512d132ef7a1e57f9e24905fbc24300bd73f676b5716182be5f3e39dada");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(265538);
+    input.set_chain_id("secret-4");
+    input.set_memo("");
+    input.set_sequence(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Address fromAddress;
+    Address toAddress;
+    EXPECT_TRUE(Address::decode("secret18mdrja40gfuftt5yx6tgj0fn5lurplezyp894y", fromAddress));
+    EXPECT_TRUE(Address::decode("secret1rnq6hjfnalxeef87rmdeya3nu9dhpc7k9pujs3", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("uscrt");
+    amountOfTx->set_amount("100000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(25000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uscrt");
+    amountOfFee->set_amount("2500");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeSecret);
+
+    // https://www.mintscan.io/secret/txs/01F4BD2458BF966F287533775C8D67BBC7CA7214CAEB1752D270A90223E9E82F
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLXNlY3JldDE4bWRyamE0MGdmdWZ0dDV5eDZ0Z2owZm41bHVycGxlenlwODk0eRItc2VjcmV0MXJucTZoamZuYWx4ZWVmODdybWRleWEzbnU5ZGhwYzdrOXB1anMzGg8KBXVzY3J0EgYxMDAwMDASZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAkZqxdKMtPq2w0kGDGwWGejTAed0H7azPMHtrCX0XYZGEgQKAggBGAESEwoNCgV1c2NydBIEMjUwMBCowwEaQOcHd2gHpa5WKZ/5RRerEtrHlyDlojIEzUGhC9xMFgs7UQMWy+kTTN+NRf7zQ8rx3cPkIKeZhv0u1KRc8uRCc4o=\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "e707776807a5ae56299ff94517ab12dac79720e5a23204cd41a10bdc4c160b3b510316cbe9134cdf8d45fef343caf1ddc3e420a79986fd2ed4a45cf2e442738a");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Secret/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Secret/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..aa77bd0ac21
--- /dev/null
+++ b/tests/chains/Cosmos/Secret/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWSecretCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeSecret;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("026B4886B1D9CE836A99755DDE99D4F8A7748D27B1CE9D298A763B1CFFF62C00"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("secret167m3s89ddurjpyr82vsluvvj0t8ylzn95trrqy"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "secret");
+    assertStringsEqual(name, "Secret");
+    assertStringsEqual(symbol, "SCRT");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "secret-4");
+    assertStringsEqual(txUrl, "https://mintscan.io/secret/txs/026B4886B1D9CE836A99755DDE99D4F8A7748D27B1CE9D298A763B1CFFF62C00");
+    assertStringsEqual(accUrl, "https://mintscan.io/secret/account/secret167m3s89ddurjpyr82vsluvvj0t8ylzn95trrqy");
+}
diff --git a/tests/chains/Cosmos/Sei/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Sei/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..45746b25326
--- /dev/null
+++ b/tests/chains/Cosmos/Sei/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gSeiAddr = "sei1mry47pkga5tdswtluy0m8teslpalkdq0ndpc65";
+static const std::string gSeiHrp = "sei";
+
+TEST(TWSeiAnyAddress, AllSeiAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gSeiHrp, .coinType = TWCoinTypeSei, .address = gSeiAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Sei/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Sei/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..88a856d389a
--- /dev/null
+++ b/tests/chains/Cosmos/Sei/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWSeiCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeSei;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("4A2114EE45317439690F3BEA9C8B6CFA11D42CF978F9487754902D372EEB488C"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("sei155hqv2rsypqzq0zpjn72frsxx4l6tcmplw63m2"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "sei");
+        assertStringsEqual(name, "Sei");
+        assertStringsEqual(symbol, "SEI");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "pacific-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/sei/txs/4A2114EE45317439690F3BEA9C8B6CFA11D42CF978F9487754902D372EEB488C");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/sei/account/sei155hqv2rsypqzq0zpjn72frsxx4l6tcmplw63m2");
+    }
+}
diff --git a/tests/chains/Cosmos/SignerTests.cpp b/tests/chains/Cosmos/SignerTests.cpp
new file mode 100644
index 00000000000..6e5570004d4
--- /dev/null
+++ b/tests/chains/Cosmos/SignerTests.cpp
@@ -0,0 +1,357 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "Base64.h"
+#include "proto/Cosmos.pb.h"
+#include "Cosmos/Address.h"
+#include "TrustWalletCore/TWAnySigner.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+#include <google/protobuf/util/json_util.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(CosmosSigner, SignTxProtobuf) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(8);
+
+    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
+    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("muon");
+    amountOfTx->set_amount("1");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("200");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+
+    EXPECT_EQ(R"({"signingMode":"Protobuf","accountNumber":"1037","chainId":"gaia-13003","fee":{"amounts":[{"denom":"muon","amount":"200"}],"gas":"200000"},"sequence":"8","messages":[{"sendCoinsMessage":{"fromAddress":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","toAddress":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573","amounts":[{"denom":"muon","amount":"1"}]}}]})", json);
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "f9e1f4001657a42009c4eb6859625d2e41e961fc72efd2842909c898e439fc1f549916e4ecac676ee353c7d54c5ae30a29b4210b8bff0ebfdcb375e105002f47");
+}
+
+TEST(CosmosSigner, SignProtobuf_ErrorMissingMessage) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(8);
+
+    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
+    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("200");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    // TODO
+//    EXPECT_EQ(output.error_message(), "Error: No message found");
+    EXPECT_EQ(output.serialized(), "");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(hex(output.signature()), "");
+}
+
+TEST(CosmosSigner, SignTxJson) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::JSON); // obsolete
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(8);
+
+    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
+    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("muon");
+    amountOfTx->set_amount("1");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("200");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+
+    EXPECT_EQ(R"({"accountNumber":"1037","chainId":"gaia-13003","fee":{"amounts":[{"denom":"muon","amount":"200"}],"gas":"200000"},"sequence":"8","messages":[{"sendCoinsMessage":{"fromAddress":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","toAddress":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573","amounts":[{"denom":"muon","amount":"1"}]}}]})", json);
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    // the sample tx on testnet
+    // https://hubble.figment.network/chains/gaia-13003/blocks/142933/transactions/3A9206598C3D2E75A5EC074FD33EA53EB18EC729357F0965971C1C51F812AEA3?format=json
+    EXPECT_EQ(R"({"mode":"block","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}]}})", output.json());
+
+    EXPECT_EQ(hex(output.signature()), "fc3ef899d206c88077fec42f21ba0b4df4bd3fd115fdf606ae01d9136fef363f57e9e33a7b9ec6ddab658cd07e3c0067470de94e4e75b979a1085a29f0efd926");
+}
+
+TEST(CosmosSigner, SignTxJsonWithRawJSONMsg) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::JSON); // obsolete
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(8);
+
+    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
+    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_raw_json_message();
+    message.set_type("test");
+    message.set_value("{\"test\":\"hello\"}");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("200");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+
+    EXPECT_EQ(json, "{\"accountNumber\":\"1037\",\"chainId\":\"gaia-13003\",\"fee\":{\"amounts\":[{\"denom\":\"muon\",\"amount\":\"200\"}],\"gas\":\"200000\"},\"sequence\":\"8\",\"messages\":[{\"rawJsonMessage\":{\"type\":\"test\",\"value\":\"{\\\"test\\\":\\\"hello\\\"}\"}}]}");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    EXPECT_EQ(output.json(), "{\"mode\":\"block\",\"tx\":{\"fee\":{\"amount\":[{\"amount\":\"200\",\"denom\":\"muon\"}],\"gas\":\"200000\"},\"memo\":\"\",\"msg\":[{\"type\":\"test\",\"value\":{\"test\":\"hello\"}}],\"signatures\":[{\"pub_key\":{\"type\":\"tendermint/PubKeySecp256k1\",\"value\":\"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F\"},\"signature\":\"qhxxCOMiVhP7e7Mx+98HUZI0t5DNOFXwzIqNQz+fT6hDKR/ebW0uocsYnE5CiBNEalmBcs5gSIJegNkHhgyEmA==\"}]}}");
+
+    EXPECT_EQ(hex(output.signature()), "aa1c7108e3225613fb7bb331fbdf07519234b790cd3855f0cc8a8d433f9f4fa843291fde6d6d2ea1cb189c4e428813446a598172ce6048825e80d907860c8498");
+}
+
+TEST(CosmosSigner, SignTxJson_WithMode) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::JSON); // obsolete
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(8);
+    input.set_mode(Proto::BroadcastMode::ASYNC);
+
+    auto fromAddress = Address("cosmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
+    auto toAddress = Address("cosmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("muon");
+    amountOfTx->set_amount("1");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("200");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    {
+        auto output = Proto::SigningOutput();
+        ANY_SIGN(input, TWCoinTypeCosmos);
+        EXPECT_EQ(R"({"mode":"async","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}]}})", output.json());
+        EXPECT_EQ(output.error_message(), "");
+    }
+    input.set_mode(Proto::BroadcastMode::SYNC);
+    {
+        auto output = Proto::SigningOutput();
+        ANY_SIGN(input, TWCoinTypeCosmos);
+        EXPECT_EQ(R"({"mode":"sync","tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},"memo":"","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"1","denom":"muon"}],"from_address":"cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02","to_address":"cosmos1zt50azupanqlfam5afhv3hexwyutnukeh4c573"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"},"signature":"/D74mdIGyIB3/sQvIboLTfS9P9EV/fYGrgHZE2/vNj9X6eM6e57G3atljNB+PABnRw3pTk51uXmhCFop8O/ZJg=="}]}})", output.json());
+        EXPECT_EQ(output.error_message(), "");
+    }
+}
+
+TEST(CosmosSigner, SignIbcTransferProtobuf_817101) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(546179);
+    input.set_chain_id("cosmoshub-4");
+    input.set_sequence(2);
+
+    Address fromAddress;
+    EXPECT_TRUE(Address::decode("cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx", fromAddress));
+    Address toAddress;
+    EXPECT_TRUE(Address::decode("osmo18s0hdnsllgcclweu9aymw4ngktr2k0rkvn7jmn", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_transfer_tokens_message();
+    message.set_source_port("transfer");
+    message.set_source_channel("channel-141");
+    message.set_sender(fromAddress.string());
+    message.set_receiver(toAddress.string());
+    message.mutable_token()->set_denom("uatom");
+    message.mutable_token()->set_amount("100000"); // 0.1 ATOM
+    message.mutable_timeout_height()->set_revision_number(1);
+    message.mutable_timeout_height()->set_revision_height(8800000);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(500000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uatom");
+    amountOfFee->set_amount("12500");
+
+    auto privateKey = parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af");
+    EXPECT_EQ(Cosmos::Address(TWCoinTypeCosmos, PrivateKey(privateKey).getPublicKey(TWPublicKeyTypeSECP256k1)).string(), "cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    // real-world tx: https://www.mintscan.io/cosmos/txs/817101F3D96314AD028733248B28BAFAD535024D7D2C8875D3FE31DC159F096B
+    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "Cr4BCr...1yKOU=", "mode": "BROADCAST_MODE_BLOCK"}' https://api.cosmos.network/cosmos/tx/v1beta1/txs
+    // also similar TX: BCDAC36B605576C8182C2829C808B30A69CAD4959D5ED1E6FF9984ABF280D603
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"Cr4BCrsBCikvaWJjLmFwcGxpY2F0aW9ucy50cmFuc2Zlci52MS5Nc2dUcmFuc2ZlchKNAQoIdHJhbnNmZXISC2NoYW5uZWwtMTQxGg8KBXVhdG9tEgYxMDAwMDAiLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseCorb3NtbzE4czBoZG5zbGxnY2Nsd2V1OWF5bXc0bmdrdHIyazBya3ZuN2ptbjIHCAEQgI6ZBBJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEC7O9c5DejAsZ/lUaN5LMfNukR9GfX5qUrQcHhPh1WNkkSBAoCCAEYAhIUCg4KBXVhdG9tEgUxMjUwMBCgwh4aQK0HIWdFMk+C6Gi1KG/vELe1ffcc1aEWUIqz2t/ZhwqNNHxUUSp27wteiugHEMVTEIOBhs84t2gIcT/nD/1yKOU=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "ad07216745324f82e868b5286fef10b7b57df71cd5a116508ab3dadfd9870a8d347c54512a76ef0b5e8ae80710c55310838186cf38b76808713fe70ffd7228e5");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(CosmosSigner, SignDirect1) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_sign_direct_message();
+    const auto bodyBytes = parse_hex("0a89010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412690a2d636f736d6f733168736b366a727979716a6668703564686335357463396a74636b796778306570683664643032122d636f736d6f73317a743530617a7570616e716c66616d356166687633686578777975746e756b656834633537331a090a046d756f6e120131");
+    message.set_body_bytes(bodyBytes.data(), bodyBytes.size());
+    const auto authInfoBytes = parse_hex("0a500a460a1f2f636f736d6f732e63727970746f2e736563703235366b312e5075624b657912230a210257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc512040a020801180812110a0b0a046d756f6e120332303010c09a0c");
+    message.set_auth_info_bytes(authInfoBytes.data(), authInfoBytes.size());
+
+    {
+        std::string json;
+        google::protobuf::util::MessageToJsonString(input, &json);
+        EXPECT_EQ(R"({"signingMode":"Protobuf","accountNumber":"1037","chainId":"gaia-13003","messages":[{"signDirectMessage":{"bodyBytes":"CokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATE=","authInfoBytes":"ClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYCBIRCgsKBG11b24SAzIwMBDAmgw="}}]})", json);
+    }
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CowBCokBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEmkKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhItY29zbW9zMXp0NTBhenVwYW5xbGZhbTVhZmh2M2hleHd5dXRudWtlaDRjNTczGgkKBG11b24SATESZQpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAgSEQoLCgRtdW9uEgMyMDAQwJoMGkD54fQAFlekIAnE62hZYl0uQelh/HLv0oQpCciY5Dn8H1SZFuTsrGdu41PH1Uxa4woptCELi/8Ov9yzdeEFAC9H\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "f9e1f4001657a42009c4eb6859625d2e41e961fc72efd2842909c898e439fc1f549916e4ecac676ee353c7d54c5ae30a29b4210b8bff0ebfdcb375e105002f47");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(CosmosSigner, SignDirect_0a90010a) {
+    // MsgSend:
+    //   from: cosmos1pkptre7fdkl6gfrzlesjjvhxhlc3r4gmmk8rs6
+    //   to: cosmos1qypqxpq9qcrsszg2pvxq6rs0zqg3yyc5lzv7xu
+    //   amount: 1234567 ucosm
+    const auto bodyBytes = parse_hex("0a90010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412700a2d636f736d6f7331706b707472653766646b6c366766727a6c65736a6a766878686c63337234676d6d6b38727336122d636f736d6f7331717970717870713971637273737a673270767871367273307a716733797963356c7a763778751a100a0575636f736d120731323334353637");
+
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1);
+    input.set_chain_id("cosmoshub-4");
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_sign_direct_message();
+    message.set_body_bytes(bodyBytes.data(), bodyBytes.size());
+    const auto authInfoBytes = parse_hex("0a0a0a0012040a020801180112130a0d0a0575636f736d12043230303010c09a0c");
+    message.set_auth_info_bytes(authInfoBytes.data(), authInfoBytes.size());
+
+    {
+        std::string json;
+        google::protobuf::util::MessageToJsonString(input, &json);
+        EXPECT_EQ(R"({"signingMode":"Protobuf","accountNumber":"1","chainId":"cosmoshub-4","messages":[{"signDirectMessage":{"bodyBytes":"CpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLWNvc21vczFwa3B0cmU3ZmRrbDZnZnJ6bGVzamp2aHhobGMzcjRnbW1rOHJzNhItY29zbW9zMXF5cHF4cHE5cWNyc3N6ZzJwdnhxNnJzMHpxZzN5eWM1bHp2N3h1GhAKBXVjb3NtEgcxMjM0NTY3","authInfoBytes":"CgoKABIECgIIARgBEhMKDQoFdWNvc20SBDIwMDAQwJoM"}}]})", json);
+    }
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CpMBCpABChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnAKLWNvc21vczFwa3B0cmU3ZmRrbDZnZnJ6bGVzamp2aHhobGMzcjRnbW1rOHJzNhItY29zbW9zMXF5cHF4cHE5cWNyc3N6ZzJwdnhxNnJzMHpxZzN5eWM1bHp2N3h1GhAKBXVjb3NtEgcxMjM0NTY3EiEKCgoAEgQKAggBGAESEwoNCgV1Y29zbRIEMjAwMBDAmgwaQEgXmSAlm4M5bz+OX1GtvvZ3fBV2wrZrp4A/Imd55KM7ASivB/siYJegmYiOKzQ82uwoEmFalNnG2BrHHDwDR2Y=\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "48179920259b83396f3f8e5f51adbef6777c1576c2b66ba7803f226779e4a33b0128af07fb226097a099888e2b343cdaec2812615a94d9c6d81ac71c3c034766");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(CosmosSigner, MsgVote) {
+    // Successfully broadcasted https://www.mintscan.io/cosmos/txs/2EFA054B842B1641B131137B13360F95164C6C1D51BB4A4AC6DE8F75F504AA4C
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1366160);
+    input.set_chain_id("cosmoshub-4");
+    input.set_memo("");
+    input.set_sequence(0);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_msg_vote();
+    message.set_voter("cosmos1mry47pkga5tdswtluy0m8teslpalkdq07pswu4");
+    message.set_proposal_id(77);
+    message.set_option(TW::Cosmos::Proto::Message_VoteOption_YES);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(97681);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uatom");
+    amountOfFee->set_amount("2418");
+
+    auto privateKey = parse_hex("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    auto expected = R"(
+                {"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"ClQKUgobL2Nvc21vcy5nb3YudjFiZXRhMS5Nc2dWb3RlEjMITRItY29zbW9zMW1yeTQ3cGtnYTV0ZHN3dGx1eTBtOHRlc2xwYWxrZHEwN3Bzd3U0GAESZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAsv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarlEgQKAggBEhMKDQoFdWF0b20SBDI0MTgQkfsFGkA+Nb3NULc38quGC1x+8ZXry4w9mMX3IA7wUjFboTv7kVOwPlleIc8UqIsjVvKTUFnUuW8dlGQzNR1KkvbvZ1NA"})";
+    assertJSONEqual(output.serialized(), expected);
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Sommelier/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Sommelier/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..2775fcb56ab
--- /dev/null
+++ b/tests/chains/Cosmos/Sommelier/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gSommelierAddr = "somm1mry47pkga5tdswtluy0m8teslpalkdq0jalzdl";
+static const std::string gSommelierHrp = "somm";
+
+TEST(TWSommelierAnyAddress, AllSommelierAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gSommelierHrp, .coinType = TWCoinTypeSommelier, .address = gSommelierAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Sommelier/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Sommelier/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f60eb5df59d
--- /dev/null
+++ b/tests/chains/Cosmos/Sommelier/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWSommelierCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeSommelier;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("E73A9E5E534777DDADF7F69A5CB41972894B862D1763FA4081FE913D8D3A5E80"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("somm10d5wmqvezwtj20u5hg3wuvwucce2nhsy0tzqgn"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "sommelier");
+    assertStringsEqual(name, "Sommelier");
+    assertStringsEqual(symbol, "SOMM");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "sommelier-3");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/sommelier/txs/E73A9E5E534777DDADF7F69A5CB41972894B862D1763FA4081FE913D8D3A5E80");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/sommelier/account/somm10d5wmqvezwtj20u5hg3wuvwucce2nhsy0tzqgn");
+}
diff --git a/tests/chains/Cosmos/StakingTests.cpp b/tests/chains/Cosmos/StakingTests.cpp
new file mode 100644
index 00000000000..ae5be9dd728
--- /dev/null
+++ b/tests/chains/Cosmos/StakingTests.cpp
@@ -0,0 +1,291 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "Coin.h"
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(CosmosStaking, CompoundingAuthz) {
+    // Successfully broadcasted https://www.mintscan.io/cosmos/txs/C4629BC7C88690518D8F448E7A8D239C9D63975B11F8E1CE2F95CC2ADA3CCF67
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1290826);
+    input.set_chain_id("cosmoshub-4");
+    input.set_memo("");
+    input.set_sequence(5);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_auth_grant();
+    message.set_granter("cosmos13k0q0l7lg2kr32kvt7ly236ppldy8v9dzwh3gd");
+    message.set_grantee("cosmos1fs7lu28hx5m9akm7rp0c2422cn8r2f7gurujhf");
+    auto& grant_stake = *message.mutable_grant_stake();
+    grant_stake.mutable_allow_list()->add_address("cosmosvaloper1gjtvly9lel6zskvwtvlg5vhwpu9c9waw7sxzwx");
+    grant_stake.set_authorization_type(TW::Cosmos::Proto::Message_AuthorizationType_DELEGATE);
+    message.set_expiration(1692309600);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(96681);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uatom");
+    amountOfFee->set_amount("2418");
+
+    auto privateKey = parse_hex("c7764249cdf77f8f1d840fa8af431579e5e41cf1af937e1e23afa22f3f4f0ccc");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+    // Please note the signature has been updated according to the serialization of the `StakeAuthorization` message.
+    // Previous: CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjoSNgo0Y29zbW9zdmFsb3BlcjFnanR2bHk5bGVsNnpza3Z3dHZsZzV2aHdwdTljOXdhdzdzeHp3eCABEgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQIFyfuijGKf87Hz61ZqxasfLI1PZnNge4RDq/tRyB/tZI6p80iGRqHecoV6+84EQkc9GTlNRQOSlApRCsivT9XI=
+    auto expected = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CvgBCvUBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQS0gEKLWNvc21vczEzazBxMGw3bGcya3IzMmt2dDdseTIzNnBwbGR5OHY5ZHp3aDNnZBItY29zbW9zMWZzN2x1MjhoeDVtOWFrbTdycDBjMjQyMmNuOHIyZjdndXJ1amhmGnIKaAoqL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuU3Rha2VBdXRob3JpemF0aW9uEjogARI2CjRjb3Ntb3N2YWxvcGVyMWdqdHZseTlsZWw2enNrdnd0dmxnNXZod3B1OWM5d2F3N3N4end4EgYI4LD6pgYSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAUSEwoNCgV1YXRvbRIEMjQxOBCp8wUaQEAN1nIfDawlHnep2bNEm14w+g7tYybJJT3htcGVS6s9D7va3ed1OUEIk9LZoc3G//VenJ+KLw26SRVBaRukgVI="
+                })";
+    assertJSONEqual(output.serialized(), expected);
+}
+
+TEST(CosmosStaking, RevokeCompoundingAuthz) {
+    // Successfully broadcasted:  https://www.mintscan.io/cosmos/txs/E3218F634BB6A1BE256545EBE38275D5B02D41E88F504A43F97CD9CD2B624D44
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1290826);
+    input.set_chain_id("cosmoshub-4");
+    input.set_memo("");
+    input.set_sequence(4);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_auth_revoke();
+    message.set_grantee("cosmos1fs7lu28hx5m9akm7rp0c2422cn8r2f7gurujhf");
+    message.set_granter("cosmos13k0q0l7lg2kr32kvt7ly236ppldy8v9dzwh3gd");
+    message.set_msg_type_url("/cosmos.staking.v1beta1.MsgDelegate");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(87735);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uatom");
+    amountOfFee->set_amount("2194");
+
+    auto privateKey = parse_hex("c7764249cdf77f8f1d840fa8af431579e5e41cf1af937e1e23afa22f3f4f0ccc");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+    auto expected = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CqoBCqcBCh8vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnUmV2b2tlEoMBCi1jb3Ntb3MxM2swcTBsN2xnMmtyMzJrdnQ3bHkyMzZwcGxkeTh2OWR6d2gzZ2QSLWNvc21vczFmczdsdTI4aHg1bTlha203cnAwYzI0MjJjbjhyMmY3Z3VydWpoZhojL2Nvc21vcy5zdGFraW5nLnYxYmV0YTEuTXNnRGVsZWdhdGUSZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA/fcQw1hCVUx904t+kCXTiiziaLIY8lyssu1ENfzaN1KEgQKAggBGAQSEwoNCgV1YXRvbRIEMjE5NBC3rQUaQI7K+W7MMBoD6FbFZxRBqs9VTjErztjWTy57+fvrLaTCIZ+eBs7CuaKqfUZdSN8otjubSHVTQID3k9DpPAX0yDo="
+                })";
+    assertJSONEqual(output.serialized(), expected);
+}
+
+TEST(CosmosStaking, Staking) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(7);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_stake_message();
+    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+    message.set_validator_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
+    auto& amountOfTx = *message.mutable_amount();
+    amountOfTx.set_denom("muon");
+    amountOfTx.set_amount("10");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(101721);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("1018");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"CpsBCpgBCiMvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dEZWxlZ2F0ZRJxCi1jb3Ntb3MxaHNrNmpyeXlxamZocDVkaGM1NXRjOWp0Y2t5Z3gwZXBoNmRkMDISNGNvc21vc3ZhbG9wZXIxemt1cHI4M2hyemtuM3VwNWVsa3R6Y3EzdHVmdDhueHNtd2RxZ3AaCgoEbXVvbhICMTASZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAcSEgoMCgRtdW9uEgQxMDE4ENmaBhpA8O9Jm/kL6Za2I3poDs5vpMowYJgNvYCJBRU/vxAjs0lNZYsq40qpTbwOTbORjJA5UjQ6auc40v6uCFT4q4z+uA==\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "f0ef499bf90be996b6237a680ece6fa4ca3060980dbd808905153fbf1023b3494d658b2ae34aa94dbc0e4db3918c903952343a6ae738d2feae0854f8ab8cfeb8");
+    EXPECT_EQ(output.error_message(), "");
+
+    { // Json-serialization, for coverage (to be removed later)
+        input.set_signing_mode(Proto::JSON);
+        ANY_SIGN(input, TWCoinTypeCosmos);
+
+        ASSERT_EQ(hex(output.signature()), "c08bdf6c2b0b4428f37975e85d329f1cb19745b000994a743b5df81d57d573aa5f755349befcc848c1d1507818723b1288594bc91df685e89aff22e0303b4861");
+        EXPECT_EQ(output.error_message(), "");
+        EXPECT_EQ(hex(output.serialized()), "");
+    }
+}
+
+TEST(CosmosStaking, Unstaking) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(7);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_unstake_message();
+    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+    message.set_validator_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
+    auto& amountOfTx = *message.mutable_amount();
+    amountOfTx.set_denom("muon");
+    amountOfTx.set_amount("10");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(101721);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("1018");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"Cp0BCpoBCiUvY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dVbmRlbGVnYXRlEnEKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBoKCgRtdW9uEgIxMBJmClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYBxISCgwKBG11b24SBDEwMTgQ2ZoGGkBhlxHFnjBERxLtjLbMCKXcrDctaSZ9djtWCa3ely1bpV6m+6aAFjpr8aEZH+q2AtjJSEdgpQRJxP+9/gQsRTnZ\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "619711c59e30444712ed8cb6cc08a5dcac372d69267d763b5609adde972d5ba55ea6fba680163a6bf1a1191feab602d8c9484760a50449c4ffbdfe042c4539d9");
+    EXPECT_EQ(output.error_message(), "");
+
+    { // Json-serialization, for coverage (to be removed later)
+        input.set_signing_mode(Proto::JSON);
+        ANY_SIGN(input, TWCoinTypeCosmos);
+        ASSERT_EQ(hex(output.signature()), "8f85a9515a211881daebfb346c2beeca3ab5c2d406a9b3ad402cfddaa3d08e2b13378e13cfef8ecf1d6500fe85d0ce3e793034dd77aba90f216427807cbff79f");
+        EXPECT_EQ(output.error_message(), "");
+        EXPECT_EQ(hex(output.serialized()), "");
+    }
+}
+
+TEST(CosmosStaking, Restaking) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(7);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_restake_message();
+    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+    message.set_validator_dst_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+    message.set_validator_src_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
+
+    auto& amountOfTx = *message.mutable_amount();
+    amountOfTx.set_denom("muon");
+    amountOfTx.set_amount("10");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(101721);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("1018");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"CtIBCs8BCiovY29zbW9zLnN0YWtpbmcudjFiZXRhMS5Nc2dCZWdpblJlZGVsZWdhdGUSoAEKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBotY29zbW9zMWhzazZqcnl5cWpmaHA1ZGhjNTV0YzlqdGNreWd4MGVwaDZkZDAyIgoKBG11b24SAjEwEmYKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQJXKG7D830zVXu7qgALJ3RKyQI6qZZ8rnWhgdH/kfqdxRIECgIIARgHEhIKDAoEbXVvbhIEMTAxOBDZmgYaQJ52qO5xdtBkNUeFeWrnqUXkngyHFKCXnOPPClyVI0HrULdp5jbwGra2RujEOn4BrbFCb3JFnpc2o1iuLXbKQxg=\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "9e76a8ee7176d064354785796ae7a945e49e0c8714a0979ce3cf0a5c952341eb50b769e636f01ab6b646e8c43a7e01adb1426f72459e9736a358ae2d76ca4318");
+    EXPECT_EQ(output.error_message(), "");
+
+    { // Json-serialization, for coverage (to be removed later)
+        input.set_signing_mode(Proto::JSON);
+        ANY_SIGN(input, TWCoinTypeCosmos);
+        ASSERT_EQ(hex(output.signature()), "e64d3761bd25a28befcda80c0a0e208d024fdb0a2b89955170e65a5c5d454aba2ce81d57e01f0c126de5a59c2b58124c109560c9803d65a17a14b548dd6c50db");
+        EXPECT_EQ(output.error_message(), "");
+        EXPECT_EQ(hex(output.serialized()), "");
+    }
+}
+
+TEST(CosmosStaking, Withdraw) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(7);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_withdraw_stake_reward_message();
+    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+    message.set_validator_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(101721);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("1018");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\":\"CqMBCqABCjcvY29zbW9zLmRpc3RyaWJ1dGlvbi52MWJldGExLk1zZ1dpdGhkcmF3RGVsZWdhdG9yUmV3YXJkEmUKLWNvc21vczFoc2s2anJ5eXFqZmhwNWRoYzU1dGM5anRja3lneDBlcGg2ZGQwMhI0Y29zbW9zdmFsb3BlcjF6a3VwcjgzaHJ6a24zdXA1ZWxrdHpjcTN0dWZ0OG54c213ZHFncBJmClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYBxISCgwKBG11b24SBDEwMTgQ2ZoGGkBW1Cd+0pNfMPEVXQtqG1VIijDjZP2UOiDlvUF478axnxlF8PaOAsY0S5OdUE3Wz7+nu8YVmrLZQS/8mlqLaK05\",\"mode\":\"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "56d4277ed2935f30f1155d0b6a1b55488a30e364fd943a20e5bd4178efc6b19f1945f0f68e02c6344b939d504dd6cfbfa7bbc6159ab2d9412ffc9a5a8b68ad39");
+    EXPECT_EQ(output.error_message(), "");
+
+    { // Json-serialization, for coverage (to be removed later)
+        input.set_signing_mode(Proto::JSON);
+        ANY_SIGN(input, TWCoinTypeCosmos);
+        ASSERT_EQ(hex(output.signature()), "546f0d67356f6af94cfb5ab22b974e499c33123f2c2c292f4f0e64878e0e728f4643105fd771550beb3f2371f08880aaa38fa8f2334c103a779f1d82d2db98d6");
+        EXPECT_EQ(output.error_message(), "");
+        EXPECT_EQ(hex(output.serialized()), "");
+    }
+}
+
+TEST(CosmosStaking, SetWithdrawAddress) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("gaia-13003");
+    input.set_memo("");
+    input.set_sequence(7);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_set_withdraw_address_message();
+    message.set_delegator_address("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
+    message.set_withdraw_address("cosmosvaloper1zkupr83hrzkn3up5elktzcq3tuft8nxsmwdqgp");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(101721);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("1018");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    assertJSONEqual(output.serialized(), R"({"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"Cp4BCpsBCjIvY29zbW9zLmRpc3RyaWJ1dGlvbi52MWJldGExLk1zZ1NldFdpdGhkcmF3QWRkcmVzcxJlCi1jb3Ntb3MxaHNrNmpyeXlxamZocDVkaGM1NXRjOWp0Y2t5Z3gwZXBoNmRkMDISNGNvc21vc3ZhbG9wZXIxemt1cHI4M2hyemtuM3VwNWVsa3R6Y3EzdHVmdDhueHNtd2RxZ3ASZgpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3FEgQKAggBGAcSEgoMCgRtdW9uEgQxMDE4ENmaBhpAkm2TJLw4FcIwN5bkqVaGbmAgkTSHeYD8sUkIyJHLa89cPvThkFO/lKlxBMl2UAMs06hL6cYcl4Px+B6rpFdBpA=="})");
+    EXPECT_EQ(hex(output.signature()), "926d9324bc3815c2303796e4a956866e60209134877980fcb14908c891cb6bcf5c3ef4e19053bf94a97104c97650032cd3a84be9c61c9783f1f81eaba45741a4");
+    EXPECT_EQ(output.error_message(), "");
+
+    { // Json-serialization, for coverage (to be removed later)
+        input.set_signing_mode(Proto::JSON);
+        ANY_SIGN(input, TWCoinTypeCosmos);
+        ASSERT_EQ(hex(output.signature()), "22cfbcec33d06ed42623264049d11d6fb86566103d5621a23b1444022eb1aace3a0790a1c46b48c0218689616daf97f99ae72c3589966205de45b57194fbada2");
+        EXPECT_EQ(output.error_message(), "");
+        EXPECT_EQ(hex(output.serialized()), "");
+    }
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Stargaze/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Stargaze/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..0fb293d3483
--- /dev/null
+++ b/tests/chains/Cosmos/Stargaze/TWAnyAddressTests.cpp
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWCoinType.h>
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gStarsAddr = "stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy";
+static const std::string gStarsHrp = "stars";
+
+TEST(TWStargazeAnyAddress, AllStargazeAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gStarsHrp, .coinType = TWCoinTypeStargaze, .address = gStarsAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Stargaze/TWAnySignerTests.cpp b/tests/chains/Cosmos/Stargaze/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..c6e1faec3e1
--- /dev/null
+++ b/tests/chains/Cosmos/Stargaze/TWAnySignerTests.cpp
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWAnySignerStargaze, SignNftTransferCW721) {
+    auto privateKey = parse_hex("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(188393);
+    input.set_chain_id("stargaze-1");
+    input.set_memo("");
+    input.set_sequence(5);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_execute_contract_generic();
+
+    const auto tokenContractAddress = "stars14gmjlyfz5mpv5d8zrksn0tjhz2wwvdc4yk06754alfasq9qen7fsknry42";
+    const auto txMessage = R"({"transfer_nft": {"recipient": "stars1kd5q7qejlqz94kpmd9pvr4v2gzgnca3lvt6xnp","token_id": "1209"}})";
+
+    message.set_sender_address("stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy");
+    message.set_contract_address(tokenContractAddress);
+    message.set_execute_msg(txMessage);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(666666);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("ustars");
+    amountOfFee->set_amount("1000");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStargaze);
+
+    // https://www.mintscan.io/stargaze/txs/300836A5BF9002CF38EE34A8C56E8E7E6854FA64F1DEB3AE108F381A48150F7C
+    auto expectedJson = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CoACCv0BCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QS1AEKLHN0YXJzMW1yeTQ3cGtnYTV0ZHN3dGx1eTBtOHRlc2xwYWxrZHEwMmE4bmh5EkBzdGFyczE0Z21qbHlmejVtcHY1ZDh6cmtzbjB0amh6Mnd3dmRjNHlrMDY3NTRhbGZhc3E5cWVuN2Zza25yeTQyGmJ7InRyYW5zZmVyX25mdCI6IHsicmVjaXBpZW50IjogInN0YXJzMWtkNXE3cWVqbHF6OTRrcG1kOXB2cjR2Mmd6Z25jYTNsdnQ2eG5wIiwidG9rZW5faWQiOiAiMTIwOSJ9fRJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECy/215HKJMyIpTmDPCIPUPfQx4QidKey0R6nm1VBFquUSBAoCCAEYBRIUCg4KBnVzdGFycxIEMTAwMBCq2CgaQMx+l2sdM5DAPbDyY1p173MLnjGyNWIcRmaFiVNphLuTV3tjhwPbsXEA0hyRxyWS3vN0/xUF/JEsO9wRspj2aJ4="
+                })";
+    assertJSONEqual(output.serialized(), expectedJson);
+    EXPECT_EQ(hex(output.signature()), "cc7e976b1d3390c03db0f2635a75ef730b9e31b235621c46668589536984bb93577b638703dbb17100d21c91c72592def374ff1505fc912c3bdc11b298f6689e");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(TWAnySignerStargaze, Sign) {
+    auto privateKey = parse_hex("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(188393);
+    input.set_chain_id("stargaze-1");
+    input.set_memo("");
+    input.set_sequence(0);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address("stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy");
+    message.set_to_address("stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy");
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("ustars");
+    amountOfTx->set_amount("10000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(80000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("ustars");
+    amountOfFee->set_amount("1000");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStargaze);
+
+    // https://www.mintscan.io/stargaze/txs/98D5E36CA7080DDB286FE924A5A9976ABD4EBE49C92A09D322F29AD30DE4BE4D
+    auto expectedJson = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CpABCo0BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm0KLHN0YXJzMW1yeTQ3cGtnYTV0ZHN3dGx1eTBtOHRlc2xwYWxrZHEwMmE4bmh5EixzdGFyczFtcnk0N3BrZ2E1dGRzd3RsdXkwbTh0ZXNscGFsa2RxMDJhOG5oeRoPCgZ1c3RhcnMSBTEwMDAwEmYKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQLL/bXkcokzIilOYM8Ig9Q99DHhCJ0p7LRHqebVUEWq5RIECgIIARIUCg4KBnVzdGFycxIEMTAwMBCA8QQaQHAkntxzC1oH7Yde4+KEmnB+K3XbJIYw0q6MqMPEY65YAwBDNDOdaTu/rpehus/20MvBfbAEZiw9+whzXLpkQ5A="
+                })";
+    assertJSONEqual(output.serialized(), expectedJson);
+    EXPECT_EQ(hex(output.signature()), "70249edc730b5a07ed875ee3e2849a707e2b75db248630d2ae8ca8c3c463ae5803004334339d693bbfae97a1bacff6d0cbc17db004662c3dfb08735cba644390");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Stride/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Stride/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..9a2035d95c7
--- /dev/null
+++ b/tests/chains/Cosmos/Stride/TWAnyAddressTests.cpp
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+static const std::string gStrideAddr = "stride1mry47pkga5tdswtluy0m8teslpalkdq0a2sjge";
+static const std::string gStrideHrp = "stride";
+
+TEST(TWStrideAnyAddress, AllStrideAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gStrideHrp, .coinType = TWCoinTypeStride, .address = gStrideAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Stride/TWAnySignerTests.cpp b/tests/chains/Cosmos/Stride/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..b076cb54de4
--- /dev/null
+++ b/tests/chains/Cosmos/Stride/TWAnySignerTests.cpp
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include "Base64.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWAnySignerStride, SignLiquidStaking) {
+    auto privateKey = parse_hex("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(136412);
+    input.set_chain_id("stride-1");
+    input.set_memo("");
+    input.set_sequence(0);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_msg_stride_liquid_staking_stake();
+    message.set_creator("stride1mry47pkga5tdswtluy0m8teslpalkdq0a2sjge");
+    message.set_amount("100000");
+    message.set_host_denom("uatom");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(500000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("ustrd");
+    amountOfFee->set_amount("0");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStride);
+
+    // Successfully broadcasted: https://www.mintscan.io/stride/txs/48E51A2571D99453C4581B30CECA2A1156C0D1EBACCD3619729B5A35AD67CC94?height=3485243
+    auto expectedJson = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CmMKYQofL3N0cmlkZS5zdGFrZWliYy5Nc2dMaXF1aWRTdGFrZRI+Ci1zdHJpZGUxbXJ5NDdwa2dhNXRkc3d0bHV5MG04dGVzbHBhbGtkcTBhMnNqZ2USBjEwMDAwMBoFdWF0b20SYgpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAsv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarlEgQKAggBEhAKCgoFdXN0cmQSATAQoMIeGkCDaZHV5/Z3CAQC5DXkaHmF6OKUiS5XKDsl3ZnBaaVuJjlSWV2vA7MPwGbC17P6jbVJt58ZLcxIWFt76UO3y1ix"
+                })";
+    assertJSONEqual(output.serialized(), expectedJson);
+    EXPECT_EQ(hex(output.signature()), "836991d5e7f677080402e435e4687985e8e294892e57283b25dd99c169a56e263952595daf03b30fc066c2d7b3fa8db549b79f192dcc48585b7be943b7cb58b1");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(TWAnySignerStride, SignLiquidStakingRedeem) {
+    auto privateKey = parse_hex("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(136412);
+    input.set_chain_id("stride-1");
+    input.set_memo("");
+    input.set_sequence(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_msg_stride_liquid_staking_redeem();
+    message.set_creator("stride1mry47pkga5tdswtluy0m8teslpalkdq0a2sjge");
+    message.set_amount("40000");
+    message.set_receiver("cosmos1mry47pkga5tdswtluy0m8teslpalkdq07pswu4");
+    message.set_host_zone("cosmoshub-4");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(1000000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("ustrd");
+    amountOfFee->set_amount("0");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStride);
+
+    // Successfully broadcasted: https://www.mintscan.io/stride/txs/B3D3A92A2FFB92A480A4B547A4303E6932204972A965D687DB4FB6B4E16B2C42?height=3485343
+    auto expectedJson = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CpgBCpUBCh8vc3RyaWRlLnN0YWtlaWJjLk1zZ1JlZGVlbVN0YWtlEnIKLXN0cmlkZTFtcnk0N3BrZ2E1dGRzd3RsdXkwbTh0ZXNscGFsa2RxMGEyc2pnZRIFNDAwMDAaC2Nvc21vc2h1Yi00Ii1jb3Ntb3MxbXJ5NDdwa2dhNXRkc3d0bHV5MG04dGVzbHBhbGtkcTA3cHN3dTQSZApQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAsv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarlEgQKAggBGAESEAoKCgV1c3RyZBIBMBDAhD0aQKf84TYoPqwnXw22r0dok2fYplUFu003TlIfpoT+wqTZF1lHPC+RTAoJob6x50CnfvGlgJFBEQYPD+Ccv659VVA="
+                })";
+    assertJSONEqual(output.serialized(), expectedJson);
+    EXPECT_EQ(TW::Base64::encode(data(output.signature())), "p/zhNig+rCdfDbavR2iTZ9imVQW7TTdOUh+mhP7CpNkXWUc8L5FMCgmhvrHnQKd+8aWAkUERBg8P4Jy/rn1VUA==");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Stride/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Stride/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6003f28894a
--- /dev/null
+++ b/tests/chains/Cosmos/Stride/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWStrideCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeStride;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("FB67755B3A00D4BCC11F607867B9C767CF24BCB749C718579D1EC794226087C8"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("stride1c44mngg9pjjeqrr07sle7ntuggrajnt4lsf9jl"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "stride");
+    assertStringsEqual(name, "Stride");
+    assertStringsEqual(symbol, "STRD");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "stride-1");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/stride/txs/FB67755B3A00D4BCC11F607867B9C767CF24BCB749C718579D1EC794226087C8");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/stride/account/stride1c44mngg9pjjeqrr07sle7ntuggrajnt4lsf9jl");
+}
diff --git a/tests/chains/Cosmos/THORChain/SignerTests.cpp b/tests/chains/Cosmos/THORChain/SignerTests.cpp
new file mode 100644
index 00000000000..be2e0a334b3
--- /dev/null
+++ b/tests/chains/Cosmos/THORChain/SignerTests.cpp
@@ -0,0 +1,284 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "proto/Cosmos.pb.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "Bech32Address.h"
+#include "TestUtilities.h"
+#include "TrustWalletCore/TWAnySigner.h"
+#include "TrustWalletCore/TWCoinType.h"
+
+#include <gtest/gtest.h>
+#include <google/protobuf/util/json_util.h>
+
+using namespace TW;
+
+
+TEST(THORChainSigner, SignTx_Protobuf_7E480F) {
+    auto input = Cosmos::Proto::SigningInput();
+    input.set_signing_mode(Cosmos::Proto::Protobuf);
+    input.set_chain_id("thorchain-mainnet-v1");
+    input.set_account_number(593);
+    input.set_sequence(21);
+    input.set_memo("");
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_thorchain_send_message();
+    Bech32Address fromAddress("thor");
+    EXPECT_TRUE(Bech32Address::decode("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r", fromAddress, "thor"));
+    Bech32Address toAddress("thor");
+    EXPECT_TRUE(Bech32Address::decode("thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn", toAddress, "thor"));
+    message.set_from_address(std::string(fromAddress.getKeyHash().begin(), fromAddress.getKeyHash().end()));
+    message.set_to_address(std::string(toAddress.getKeyHash().begin(), toAddress.getKeyHash().end()));
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("rune");
+    amountOfTx->set_amount("38000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(2500000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("rune");
+    amountOfFee->set_amount("200");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+
+    assertJSONEqual(json, R"(
+        {
+            "accountNumber": "593",
+            "chainId": "thorchain-mainnet-v1",
+            "fee": {
+                "amounts": [
+                    {
+                        "amount": "200",
+                        "denom": "rune"
+                    }
+                ],
+                "gas": "2500000"
+            },
+            "messages": [
+                {
+                    "thorchainSendMessage": {
+                        "amounts": [
+                            {
+                                "amount": "38000000",
+                                "denom": "rune"
+                            }
+                        ],
+                        "fromAddress": "FSLnZ9tusZcIsAOAKb+9YHvJvQ4=",
+                        "toAddress": "yoZFn7AFUcffQlQMXnhpGSyDOts="
+                    }
+                }
+            ],
+            "sequence": "21",
+            "signingMode": "Protobuf"
+        }
+    )");
+
+    auto privateKey = parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTHORChain);
+
+    // https://viewblock.io/thorchain/tx/7E480FA163F6C6AFA17593F214C7BBC218F69AE3BC72366E39042AF381BFE105
+    // curl -H 'Content-Type: application/json' --data-binary '{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"ClIKUAoO..89g="}' https://<thornode>/cosmos/tx/v1beta1/txs
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "mode": "BROADCAST_MODE_BLOCK",
+            "tx_bytes": "ClIKUAoOL3R5cGVzLk1zZ1NlbmQSPgoUFSLnZ9tusZcIsAOAKb+9YHvJvQ4SFMqGRZ+wBVHH30JUDF54aRksgzrbGhAKBHJ1bmUSCDM4MDAwMDAwEmYKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQPtmX45bPQpL1/OWkK7pBWZzNXZbjExVKfJ6nBJ3jF8dxIECgIIARgVEhIKCwoEcnVuZRIDMjAwEKDLmAEaQKZtS3ATa26OOGvqdKm14ZbHeNfkPtIajXi5MkZ5XaX2SWOeX+YnCPZ9TxF9Jj5cVIo71m55xq4hVL3yDbRe89g="
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "a66d4b70136b6e8e386bea74a9b5e196c778d7e43ed21a8d78b93246795da5f649639e5fe62708f67d4f117d263e5c548a3bd66e79c6ae2154bdf20db45ef3d8");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(THORChainSigner, SignTx_MsgDeposit) {
+    auto input = Cosmos::Proto::SigningInput();
+    input.set_signing_mode(Cosmos::Proto::Protobuf);
+    input.set_chain_id("thorchain-mainnet-v1");
+    input.set_account_number(75247);
+    input.set_sequence(7);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_thorchain_deposit_message();
+
+    message.set_memo("=:DOGE.DOGE:DNhRF1h8J4ZnB1bxp9kaqhVLYetkx1nSJ5::tr:0");
+    Bech32Address signerAddress("thor");
+    EXPECT_TRUE(Bech32Address::decode("thor14j5lwl8ulexrqp5x39kmkctv2937694z3jn2dz", signerAddress, "thor"));
+    message.set_signer(std::string(signerAddress.getKeyHash().begin(), signerAddress.getKeyHash().end()));
+
+    auto& coins = *message.add_coins();
+    coins.set_amount("150000000");
+    coins.set_decimals(0);
+
+    auto& asset = *coins.mutable_asset();
+    asset.set_chain("THOR");
+    asset.set_symbol("RUNE");
+    asset.set_ticker("RUNE");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(50000000);
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+
+    assertJSONEqual(json, R"(
+        {
+            "accountNumber": "75247",
+            "chainId": "thorchain-mainnet-v1",
+            "fee": {
+                "gas": "50000000"
+            },
+            "messages": [
+                {
+                    "thorchainDepositMessage": {
+                        "coins": [
+                            {
+                                "amount": "150000000",
+                                "asset": {
+                                    "chain": "THOR",
+                                    "symbol": "RUNE",
+                                    "ticker": "RUNE"
+                                }
+                            }
+                        ],
+                        "memo": "=:DOGE.DOGE:DNhRF1h8J4ZnB1bxp9kaqhVLYetkx1nSJ5::tr:0",
+                        "signer": "rKn3fPz+TDAGholtu2FsUWPtFqI="
+                    }
+                }
+            ],
+            "sequence": "7",
+            "signingMode": "Protobuf"
+        }
+    )");
+
+    auto privateKey = parse_hex("2659e41d54ebd449d68b9d58510d8eeeb837ee00d6ecc760b7a731238d8c3113");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTHORChain);
+
+    // https://viewblock.io/thorchain/tx/0162213E7F9D85965B1C57FA3BF9603C655B542F358318303A7B00661AE42510
+    // curl -H 'Content-Type: application/json' --data-binary '{"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CoUBCoIB..hiw="}' https://<thornode>/cosmos/tx/v1beta1/txs
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "mode": "BROADCAST_MODE_BLOCK",
+            "tx_bytes": "CoUBCoIBChEvdHlwZXMuTXNnRGVwb3NpdBJtCh8KEgoEVEhPUhIEUlVORRoEUlVORRIJMTUwMDAwMDAwEjQ9OkRPR0UuRE9HRTpETmhSRjFoOEo0Wm5CMWJ4cDlrYXFoVkxZZXRreDFuU0o1Ojp0cjowGhSsqfd8/P5MMAaGiW27YWxRY+0WohJZClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDuZVDlIFW3DtSEBa6aUBJ0DrQHlQ+2g7lIt5ekAM25SkSBAoCCAEYBxIFEIDh6xcaQAxKMZMKbM8gdLwn23GDXfbwyCkgqWzFMFlnrqFm0u54F8T32wmsoJQAdoLIyOskYmi7nb1rhryfabeeULwRhiw="
+        }
+    )");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(THORChainSigner, SignTx_Json_Deprecated) {
+    auto input = Cosmos::Proto::SigningInput();
+    input.set_memo("memo1234");
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r");
+    message.set_to_address("thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn");
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("rune");
+    amountOfTx->set_amount("50000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(2000000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("rune");
+    amountOfFee->set_amount("200");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+
+    assertJSONEqual(json, R"(
+        {
+            "fee": {
+                "amounts": [
+                    {
+                        "denom": "rune",
+                        "amount": "200"
+                    }
+                ],
+                "gas": "2000000"
+            },
+            "memo": "memo1234",
+            "messages": [
+                {
+                    "sendCoinsMessage": {
+                        "fromAddress": "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r",
+                        "toAddress": "thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn",
+                        "amounts": [
+                            {
+                                "denom": "rune",
+                                "amount": "50000000"
+                            }
+                        ]
+                    }
+                }
+            ]
+        }
+    )");
+
+    auto privateKey = parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTHORChain);
+
+    assertJSONEqual(output.json(), R"(
+        {
+            "mode": "block",
+            "tx": {
+                "fee": {
+                    "amount": [
+                        {
+                            "amount": "200",
+                            "denom": "rune"
+                        }
+                    ],
+                    "gas": "2000000"
+                },
+                "memo": "memo1234",
+                "msg": [
+                    {
+                        "type": "thorchain/MsgSend",
+                        "value": {
+                            "amount": [
+                                {
+                                    "amount": "50000000",
+                                    "denom": "rune"
+                                }
+                            ],
+                            "from_address": "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r",
+                            "to_address": "thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"
+                        }
+                    }
+                ],
+                "signatures": [
+                    {
+                        "pub_key": {
+                            "type": "tendermint/PubKeySecp256k1",
+                            "value": "A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"
+                        },
+                        "signature": "12AaNC0v51Rhz8rBf7V7rpI6oksREWrjzba3RK1v1NNlqZq62sG0aXWvStp9zZXe07Pp2FviFBAx+uqWsO30NQ=="
+                    }
+                ]
+            }
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "d7601a342d2fe75461cfcac17fb57bae923aa24b11116ae3cdb6b744ad6fd4d365a99abadac1b46975af4ada7dcd95ded3b3e9d85be2141031faea96b0edf435");
+}
+
+TEST(THORChainSigner, SignJson) {
+    auto inputJson = R"({"fee":{"amounts":[{"denom":"rune","amount":"200"}],"gas":"2000000"},"memo":"memo1234","messages":[{"sendCoinsMessage":{"fromAddress":"thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r","toAddress":"thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn","amounts":[{"denom":"rune","amount":"50000000"}]}}]})";
+    auto privateKey = parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e");
+
+    auto outputJson = TW::anySignJSON(TWCoinTypeTHORChain, inputJson, privateKey);
+
+    EXPECT_EQ(R"({"mode":"block","tx":{"fee":{"amount":[{"amount":"200","denom":"rune"}],"gas":"2000000"},"memo":"memo1234","msg":[{"type":"thorchain/MsgSend","value":{"amount":[{"amount":"50000000","denom":"rune"}],"from_address":"thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r","to_address":"thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"},"signature":"12AaNC0v51Rhz8rBf7V7rpI6oksREWrjzba3RK1v1NNlqZq62sG0aXWvStp9zZXe07Pp2FviFBAx+uqWsO30NQ=="}]}})", outputJson);
+}
diff --git a/tests/chains/Cosmos/THORChain/SwapTests.cpp b/tests/chains/Cosmos/THORChain/SwapTests.cpp
new file mode 100644
index 00000000000..44b11f6d686
--- /dev/null
+++ b/tests/chains/Cosmos/THORChain/SwapTests.cpp
@@ -0,0 +1,1293 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Binance/Address.h"
+#include "Bitcoin/Script.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "Ethereum/ABI/Function.h"
+#include "Ethereum/Address.h"
+#include "THORChain/Swap.h"
+#include "proto/Binance.pb.h"
+#include "proto/Bitcoin.pb.h"
+#include "proto/Cosmos.pb.h"
+#include "proto/Ethereum.pb.h"
+#include "proto/THORChainSwap.pb.h"
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "TestUtilities.h"
+#include "uint256.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::THORChainSwap {
+
+// Addresses for wallet 'isolate dismiss fury ... note'
+const auto Address1Btc = "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8";
+const auto Address1Eth = "0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7";
+const auto Address1Bnb = "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx";
+const auto Address1Thor = "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r";
+const Data TestKey1Btc = parse_hex("13fcaabaf9e71ffaf915e242ec58a743d55f102cf836968e5bd4881135e0c52c");
+const Data TestKey1Eth = parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904");
+const Data TestKey1Bnb = parse_hex("bcf8b072560dda05122c99390def2c385ec400e1a93df0657a85cf6b57a715da");
+const auto VaultBtc = "bc1q6m9u2qsu8mh8y7v8rr2ywavtj8g5arzlyhcej7";
+const auto VaultEth = "0x1091c4De6a3cF09CdA00AbDAeD42c7c3B69C83EC";
+const auto VaultBnb = "bnb1n9esxuw8ca7ts8l6w66kdh800s09msvul6vlse";
+const auto RouterEth = "0x42A5Ed456650a09Dc10EBc6361A7480fDd61f27B";
+
+TEST(THORChainSwap, OverflowFixEth) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    fromAsset.set_symbol("ETH");
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BTC));
+    toAsset.set_symbol("BTC");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Eth)
+                                         .toAddress(Address1Btc)
+                                         .vault(VaultEth)
+                                         .fromAmount("1234000000000000000000")
+                                         .toAmountLimit("5285656144")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+}
+
+TEST(THORChainSwap, SwapBtcEth) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BTC));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    toAsset.set_symbol("ETH");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Btc)
+                                         .toAddress(Address1Eth)
+                                         .vault(VaultBtc)
+                                         .fromAmount("1000000")
+                                         .toAmountLimit("140000000000000000")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "080110c0843d1801222a62633171366d397532717375386d68387937763872723279776176746a38673561727a6c796863656a372a2a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070386a473d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a313430303030303030303030303030303030");
+
+    auto tx = Bitcoin::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.amount(), 1000000);
+    EXPECT_EQ(tx.to_address(), VaultBtc);
+    EXPECT_EQ(tx.change_address(), Address1Btc);
+    EXPECT_EQ(tx.output_op_return(), "=:ETH.ETH:0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7:140000000000000000");
+    EXPECT_EQ(tx.coin_type(), 0ul);
+    EXPECT_EQ(tx.private_key_size(), 0);
+    EXPECT_FALSE(tx.has_plan());
+
+    // set few fields before signing
+    tx.set_byte_fee(20);
+    EXPECT_EQ(Bitcoin::SegwitAddress(PrivateKey(TestKey1Btc).getPublicKey(TWPublicKeyTypeSECP256k1), "bc").string(), Address1Btc);
+    tx.add_private_key(TestKey1Btc.data(), TestKey1Btc.size());
+    auto& utxo = *tx.add_utxo();
+    Data utxoHash = parse_hex("1234000000000000000000000000000000000000000000000000000000005678");
+    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo.mutable_out_point()->set_index(0);
+    utxo.mutable_out_point()->set_sequence(UINT32_MAX);
+    auto utxoScript = Bitcoin::Script::lockScriptForAddress(Address1Btc, TWCoinTypeBitcoin);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+    utxo.set_amount(50000000);
+    tx.set_use_max_amount(false);
+
+    // sign and encode resulting input
+    Bitcoin::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBitcoin);
+    EXPECT_EQ(output.error(), 0);
+    EXPECT_EQ(hex(output.encoded()), // printed using prettyPrintTransaction
+              "01000000" // version
+              "0001" // marker & flag
+              "01" // inputs
+              "1234000000000000000000000000000000000000000000000000000000005678"  "00000000"  "00"  ""  "ffffffff"
+              "03" // outputs
+              "40420f0000000000"  "16"  "0014d6cbc5021c3eee72798718d447758b91d14e8c5f"
+              "d49ceb0200000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
+              "0000000000000000"  "49"  "6a473d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a313430303030303030303030303030303030"
+              // witness
+              "02"
+              "48"  "3045022100a67f84cbde5affbb46ffff2b33c1453ff2de70ef990fc974175d9a609e5a87ed0220589c57d958208f866c9477c7d6c9075dea4c58622debb02eab85032b8b6d373001"
+              "21"  "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
+              "00000000" // nLockTime
+    );
+}
+
+TEST(THORChainSwap, SwapDogeBusd) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::DOGE));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    toAsset.set_token_id("BUSD-BD1");
+
+    auto vaultDoge = "DExct9oTfqr7pfnbP2hkCHP1Z2eUDgqXya";
+    auto fromAddressDoge = "DKftkYCtCyYxQy2TRAuAzQXoyKDdYsEBnw";
+    auto toAddressBnb = "bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2";
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(fromAddressDoge)
+                                         .toAddress(toAddressBnb)
+                                         .vault(vaultDoge)
+                                         .fromAmount("10000000000")
+                                         .toAmountLimit("789627468")
+                                         .affFeeAddress("t")
+                                         .affFeeRate("0")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "08011080c8afa025180122224445786374396f546671723770666e625032686b434850315a3265554467715879612a22444b66746b5943744379597851793254524175417a51586f794b4464597345426e7750036a473d3a424e422e425553442d4244313a626e623173346b616c6c786e67707973707a6d366e72657a6b6d6c3972677977366b78707734666872323a3738393632373436383a743a30");
+
+    auto tx = Bitcoin::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.amount(), 10000000000);
+    EXPECT_EQ(tx.to_address(), vaultDoge);
+    EXPECT_EQ(tx.change_address(), fromAddressDoge);
+    EXPECT_EQ(tx.output_op_return(), "=:BNB.BUSD-BD1:bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2:789627468:t:0");
+    EXPECT_EQ(tx.coin_type(), TWCoinTypeDogecoin);
+    EXPECT_EQ(tx.private_key_size(), 0);
+    EXPECT_FALSE(tx.has_plan());
+
+    //
+    auto dogeKey = parse_hex("3785864c91ed408ebaeae473962a471eb4d68ce998c2957e8e5f6be7a525f2d7");
+    tx.add_private_key(dogeKey.data(), dogeKey.size());
+    tx.set_byte_fee(1000);
+    auto& utxo = *tx.add_utxo();
+    Data previousUTXOHash = parse_hex("9989c36afdd1755a679226875425b368816031186c0f1b4a363ab2ef6d0a2fe8");
+    std::reverse(previousUTXOHash.begin(), previousUTXOHash.end());
+    utxo.mutable_out_point()->set_hash(previousUTXOHash.data(), previousUTXOHash.size());
+    utxo.mutable_out_point()->set_index(1);
+    utxo.mutable_out_point()->set_sequence(UINT32_MAX - 3);
+    auto utxoScript = Bitcoin::Script::lockScriptForAddress(fromAddressDoge, TWCoinTypeDogecoin);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+    utxo.set_amount(16845776096);
+    tx.set_use_max_amount(false);
+
+    // sign and encode resulting input
+    Bitcoin::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeDogecoin);
+    EXPECT_EQ(output.error(), 0);
+    EXPECT_EQ(hex(output.encoded()), "0100000001e82f0a6defb23a364a1b0f6c1831608168b32554872692675a75d1fd6ac38999010000006b4830450221008660de3d3123a9e6831517265fb84c4fb2bfc4b98366dbfb4b63bc78a5812cce02201a0673af15edab604d9cd89f0e2842ccdd973e107ff9cd08dcf45d8c0b27c5dd0121039535d01e184b4a6d624e7ab007612e2558697fbed29274e6474f17e70d31ce5afcffffff0300e40b54020000001976a9146bb602e5e8eca75c7f6f25f766254658581db71688ac40490698010000001976a9149f64d0c07876a1dbce40cdce328bc7ecd8182b2288ac0000000000000000496a473d3a424e422e425553442d4244313a626e623173346b616c6c786e67707973707a6d366e72657a6b6d6c3972677977366b78707734666872323a3738393632373436383a743a3000000000");
+
+    // similar real transaction:
+    // https://viewblock.io/thorchain/tx/E7588A6A4C6B9DBA8B9AD8B0834655F9D9E5861744B5493E711623E320B981A5
+    // https://dogechain.info/tx/e7588a6a4c6b9dba8b9ad8b0834655f9d9e5861744b5493e711623e320b981a5
+    // https://binance.mintscan.io/txs/A5943D315BFD501DD5FC212F5A505772A20DDB154A8B5760A9897ABB8114CBDB
+}
+
+TEST(THORChainSwap, SwapLtcBusd) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::LTC));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    toAsset.set_token_id("BUSD-BD1");
+
+    auto vaultLTC = "ltc1qmca5runvg3hygarulu34evdulcdfda7z7zquhn";
+    auto fromAddressLTC = "ltc1qyu9qvkukx99r6yadxlk3t2x78a7dxe73s3r4x3";
+    auto toAddressBnb = "bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2";
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(fromAddressLTC)
+                                         .toAddress(toAddressBnb)
+                                         .vault(vaultLTC)
+                                         .fromAmount("15000000")
+                                         .toAmountLimit("977240514")
+                                         .affFeeAddress("t")
+                                         .affFeeRate("0")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "080110c0c393071801222b6c746331716d63613572756e7667336879676172756c753334657664756c6364666461377a377a7175686e2a2b6c7463317179753971766b756b7839397236796164786c6b3374327837386137647865373373337234783350026a473d3a424e422e425553442d4244313a626e623173346b616c6c786e67707973707a6d366e72657a6b6d6c3972677977366b78707734666872323a3937373234303531343a743a30");
+
+    auto tx = Bitcoin::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.amount(), 15000000);
+    EXPECT_EQ(tx.to_address(), vaultLTC);
+    EXPECT_EQ(tx.change_address(), fromAddressLTC);
+    EXPECT_EQ(tx.output_op_return(), "=:BNB.BUSD-BD1:bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2:977240514:t:0");
+    EXPECT_EQ(tx.coin_type(), TWCoinTypeLitecoin);
+    EXPECT_EQ(tx.private_key_size(), 0);
+    EXPECT_FALSE(tx.has_plan());
+
+    //
+    auto ltcKey = parse_hex("6affb3d4e2c4f5a23b711e67ca94d0bd93550e203f5c8258df74cc62282d1494");
+    tx.add_private_key(ltcKey.data(), ltcKey.size());
+    tx.set_byte_fee(140);
+    auto& utxo = *tx.add_utxo();
+    Data previousUTXOHash = parse_hex("6e71e6da1898584ccf92c362db3d7c16326f9daae6687132c69abfdb043cc749");
+    std::reverse(previousUTXOHash.begin(), previousUTXOHash.end());
+    utxo.mutable_out_point()->set_hash(previousUTXOHash.data(), previousUTXOHash.size());
+    utxo.mutable_out_point()->set_index(0);
+    utxo.mutable_out_point()->set_sequence(UINT32_MAX - 3);
+    auto utxoScript = Bitcoin::Script::lockScriptForAddress(fromAddressLTC, TWCoinTypeLitecoin);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+    utxo.set_amount(34183600);
+    tx.set_use_max_amount(false);
+
+    // sign and encode resulting input
+    Bitcoin::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeLitecoin);
+    EXPECT_EQ(output.error(), 0);
+    EXPECT_EQ(hex(output.encoded()), "0100000000010149c73c04dbbf9ac6327168e6aa9d6f32167c3ddb62c392cf4c589818dae6716e0000000000fcffffff03c0e1e40000000000160014de3b41f26c446e44747cff235cb1bcfe1a96f7c2fc3d240100000000160014270a065b96314a3d13ad37ed15a8de3f7cd367d10000000000000000496a473d3a424e422e425553442d4244313a626e623173346b616c6c786e67707973707a6d366e72657a6b6d6c3972677977366b78707734666872323a3937373234303531343a743a3002483045022100fb9df5ef12c26648a50af298c5319ec52ea0287aa1405e07d817c606bb17a23502206520b087a9155a7d8c04b54b8ee3405fad9c3d22cf2c7cac06197ce555d56077012103acefb7d95b8c1da28f17400740d7e1124dbee3cfbe55646deb28198d570ea26b00000000");
+
+    // https://viewblock.io/thorchain/tx/FBB450335ED839C5FE3DCB9CBC0999DA6E6E52B787D1B165D3FA47E6273CCF5F
+    // https://blockchair.com/litecoin/transaction/fbb450335ed839c5fe3dcb9cbc0999da6e6e52b787d1b165d3fa47e6273ccf5f
+    // https://binance.mintscan.io/txs/7071DF040641D9C62EAA5D7AE5CDAC0C408FE64406261EC32417BD919684707C
+}
+
+TEST(THORChainSwap, SwapBchBusd) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BCH));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    toAsset.set_token_id("BUSD-BD1");
+
+    auto vaultBCH = "qpsfh5xvk7mgf9e6kl4e045nm6awl5hmks9x7h5ad6";
+    auto fromAddressBCH = "qr50u7hy3xcr3j0w9j5nfx2gevjqgfm42ykc2hqgy4";
+    auto toAddressBnb = "bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2";
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(fromAddressBCH)
+                                         .toAddress(toAddressBnb)
+                                         .vault(vaultBCH)
+                                         .fromAmount("10000000")
+                                         .toAmountLimit("977240514")
+                                         .affFeeAddress("t")
+                                         .affFeeRate("0")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "08411080ade2041801222a71707366683578766b376d67663965366b6c34653034356e6d3661776c35686d6b7339783768356164362a2a717235307537687933786372336a3077396a356e6678326765766a7167666d3432796b633268716779345091016a473d3a424e422e425553442d4244313a626e623173346b616c6c786e67707973707a6d366e72657a6b6d6c3972677977366b78707734666872323a3937373234303531343a743a30");
+
+    auto tx = Bitcoin::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.amount(), 10000000);
+    EXPECT_EQ(tx.to_address(), vaultBCH);
+    EXPECT_EQ(tx.change_address(), fromAddressBCH);
+    EXPECT_EQ(tx.output_op_return(), "=:BNB.BUSD-BD1:bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2:977240514:t:0");
+    EXPECT_EQ(tx.coin_type(), TWCoinTypeBitcoinCash);
+    EXPECT_EQ(tx.private_key_size(), 0);
+    EXPECT_FALSE(tx.has_plan());
+
+    //
+    auto bchKey = parse_hex("1a3b0105a08908734ed0525f4c6fadca068514cdeb732d7ebca5b0fcbe6952a7");
+    tx.add_private_key(bchKey.data(), bchKey.size());
+    tx.set_byte_fee(3);
+    auto& utxo = *tx.add_utxo();
+    Data previousUTXOHash = parse_hex("651e5d3a60f8110a6cfb745005168bdfcaf21e7f2f4371873a24b5cd894564da");
+    std::reverse(previousUTXOHash.begin(), previousUTXOHash.end());
+    utxo.mutable_out_point()->set_hash(previousUTXOHash.data(), previousUTXOHash.size());
+    utxo.mutable_out_point()->set_index(1);
+    utxo.mutable_out_point()->set_sequence(UINT32_MAX - 3);
+    auto utxoScript = Bitcoin::Script::lockScriptForAddress(fromAddressBCH, TWCoinTypeBitcoinCash);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+    utxo.set_amount(14118938);
+    tx.set_use_max_amount(false);
+
+    // sign and encode resulting input
+    Bitcoin::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBitcoinCash);
+    EXPECT_EQ(output.error(), 0);
+    EXPECT_EQ(hex(output.encoded()), "0100000001da644589cdb5243a8771432f7f1ef2cadf8b16055074fb6c0a11f8603a5d1e65010000006a4730440220392fab53b86e02bef19638077fd378dd713dd6b1968d07f4507e28feb022d52a02200240bb2f2e8b8eb7673c4bc69b485e28a0d56c735d84e3f794c303c1b71759e941210393dc5157b5879cd602f25529437e01b3d4892a4b9b8d9efcaa640d842b27438efcffffff0380969800000000001976a914609bd0ccb7b684973ab7eb97d693debaefd2fbb488ac8ed63e00000000001976a914e8fe7ae489b038c9ee2ca9349948cb240427755188ac0000000000000000496a473d3a424e422e425553442d4244313a626e623173346b616c6c786e67707973707a6d366e72657a6b6d6c3972677977366b78707734666872323a3937373234303531343a743a3000000000");
+
+    // https://viewblock.io/thorchain/tx/B8AA6F2BFD09D7AC510BFCDA417903B2DDBEE0E9811821640D9C304B9B382B9B
+    // https://blockchair.com/bitcoin-cash/transaction/b8aa6f2bfd09d7ac510bfcda417903b2ddbee0e9811821640d9c304b9b382b9b
+    // https://binance.mintscan.io/txs/F4CD6554934E85D72269399607A7ADF8A92378C2287C164CC97CB57E8348B090
+}
+
+TEST(THORChainSwap, SwapBtcBnb) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BTC));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Btc)
+                                         .toAddress(Address1Bnb)
+                                         .vault(VaultBtc)
+                                         .fromAmount("200000")
+                                         .toAmountLimit("140000000")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "080110c09a0c1801222a62633171366d397532717375386d68387937763872723279776176746a38673561727a6c796863656a372a2a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070386a3e3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a313430303030303030");
+
+    auto tx = Bitcoin::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.amount(), 200000);
+    EXPECT_EQ(tx.to_address(), VaultBtc);
+    EXPECT_EQ(tx.change_address(), Address1Btc);
+    EXPECT_EQ(tx.output_op_return(), "=:BNB.BNB:bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx:140000000");
+    EXPECT_EQ(tx.coin_type(), 0ul);
+    EXPECT_EQ(tx.private_key_size(), 0);
+    EXPECT_FALSE(tx.has_plan());
+
+    // set few fields before signing
+    tx.set_byte_fee(80);
+    EXPECT_EQ(Bitcoin::SegwitAddress(PrivateKey(TestKey1Btc).getPublicKey(TWPublicKeyTypeSECP256k1), "bc").string(), Address1Btc);
+    tx.add_private_key(TestKey1Btc.data(), TestKey1Btc.size());
+    auto& utxo = *tx.add_utxo();
+    Data utxoHash = parse_hex("8eae5c3a4c75058d4e3facd5d72f18a40672bcd3d1f35ebf3094bd6c78da48eb");
+    std::reverse(utxoHash.begin(), utxoHash.end());
+    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo.mutable_out_point()->set_index(0);
+    utxo.mutable_out_point()->set_sequence(UINT32_MAX - 3);
+    auto utxoScript = Bitcoin::Script::lockScriptForAddress(Address1Btc, TWCoinTypeBitcoin);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+    utxo.set_amount(450000);
+    tx.set_use_max_amount(false);
+
+    // sign and encode resulting input
+    Bitcoin::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBitcoin);
+    EXPECT_EQ(output.error(), 0);
+    EXPECT_EQ(hex(output.encoded()), // printed using prettyPrintTransaction
+              "01000000" // version
+              "0001" // marker & flag
+              "01" // inputs
+              "eb48da786cbd9430bf5ef3d1d3bc7206a4182fd7d5ac3f4e8d05754c3a5cae8e"  "00000000"  "00"  ""  "fcffffff"
+              "03" // outputs
+              "400d030000000000"  "16"  "0014d6cbc5021c3eee72798718d447758b91d14e8c5f"
+              "b08d030000000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
+              "0000000000000000"  "40"  "6a3e3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a313430303030303030"
+              // witness
+              "02"
+              "48"  "3045022100e17d8cf207c79edfb7afa16102842b434e1f908bd9858553fd54970f1a8b4334022059583f89c3a126df0da46d92947bcbe7c265a1bb838b696c0e7ea7fc8761c2bf01210"
+              "21"  "e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
+              "00000000" // nLockTime
+    );
+
+    // similar real transaction:
+    // https://blockchair.com/bitcoin/transaction/1cd9056b212b85d9d7d34d0795a746dd8691b8cd34ef56df0aa9622fbdec5f88
+    // https://viewblock.io/thorchain/tx/1CD9056B212B85D9D7D34D0795A746DD8691B8CD34EF56DF0AA9622FBDEC5F88
+    // https://explorer.binance.org/tx/8D78469069118E9B9546696214CCD46E63D3FA0D7E854C094D63C8F6061278B7
+}
+
+TEST(THORChainSwap, SwapUsdtBsc) {
+    auto myAddress = "0x0d6aA74992eDDaaf430eadca63B87f4C99Aef8dE";
+    auto vaultAddress = "0x1f3b3c6ac151bf32409fe139a5d55f3d9444729c";
+    auto routerAddress = "0xD37BbE5744D730a1d98d8DC97c42F0Ca46aD7146";
+    auto usdtTokenId = "0xdAC17F958D2ee523a2206206994597C13D831ec7";
+    auto amount = 70000000;
+    auto expirationTime = 1775669796;
+
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    fromAsset.set_symbol("USDT");
+    fromAsset.set_token_id(usdtTokenId);
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BSC));
+    toAsset.set_symbol("BSC");
+    toAsset.set_token_id("BNB");
+
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+        .from(fromAsset)
+        .to(toAsset)
+        .fromAddress(myAddress)
+        .toAddress(myAddress)
+        .vault(vaultAddress)
+        .router(routerAddress)
+        .fromAmount(std::to_string(amount))
+        .expirationPolicy(expirationTime)
+        .affFeeAddress("tr")
+        .affFeeRate("0")
+        .streamInterval("1")
+        .streamQuantity("0")
+        .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+
+    auto tx = Ethereum::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.to_address(), routerAddress);
+    ASSERT_TRUE(tx.transaction().has_contract_generic());
+
+    auto funcData = Ethereum::ABI::Function::encodeFunctionCall("depositWithExpiry", Ethereum::ABI::BaseParams{
+        std::make_shared<Ethereum::ABI::ProtoAddress>(vaultAddress),
+        std::make_shared<Ethereum::ABI::ProtoAddress>(usdtTokenId),
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(uint256_t(amount)),
+        std::make_shared<Ethereum::ABI::ProtoString>("=:BSC.BNB:0x0d6aA74992eDDaaf430eadca63B87f4C99Aef8dE:0/1/0:tr:0"),
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(uint256_t(expirationTime))
+    }).value();
+    EXPECT_EQ(hex(funcData), "44bc937b0000000000000000000000001f3b3c6ac151bf32409fe139a5d55f3d9444729c000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000000000042c1d8000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000069d69224000000000000000000000000000000000000000000000000000000000000003f3d3a4253432e424e423a3078306436614137343939326544446161663433306561646361363342383766344339394165663864453a302f312f303a74723a3000");
+    EXPECT_EQ(hex(TW::data(tx.transaction().contract_generic().amount())), "00");
+    EXPECT_EQ(hex(TW::data(tx.transaction().contract_generic().data())), hex(funcData));
+}
+
+TEST(THORChainSwap, SwapAtomBnb) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::ATOM));
+    fromAsset.set_symbol("ATOM");
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress("cosmos1v4e6vpehwrfez2dqepnw9g6t4fl83xzegd5ac9")
+                                         .toAddress("bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2")
+                                         .vault("cosmos154t5ycejlr7ax3ynmed9z05yg5a27y9u6pj5hq")
+                                         .fromAmount("300000")
+                                         .toAmountLimit("819391")
+                                         .affFeeAddress("t")
+                                         .affFeeRate("0")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "08011a0b636f736d6f736875622d342a3f3d3a424e422e424e423a626e623173346b616c6c786e67707973707a6d366e72657a6b6d6c3972677977366b78707734666872323a3831393339313a743a3042710a6f0a2d636f736d6f73317634653676706568777266657a32647165706e773967367434666c3833787a65676435616339122d636f736d6f7331353474357963656a6c7237617833796e6d6564397a303579673561323779397536706a3568711a0f0a057561746f6d1206333030303030");
+
+    auto tx = Cosmos::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+    ASSERT_EQ(tx.memo(), "=:BNB.BNB:bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2:819391:t:0");
+
+    auto& fee = *tx.mutable_fee();
+    fee.set_gas(200000);
+    auto& fee_amount = *fee.add_amounts();
+    fee_amount.set_denom("uatom");
+    fee_amount.set_amount("500");
+
+    tx.set_account_number(1483163);
+    tx.set_sequence(1);
+
+    auto privKey = parse_hex("3eed3f32b8ba90e579ba46f37e7445fb4b34558306aa5bc32c525a93dff486e7");
+    tx.set_private_key(privKey.data(), privKey.size());
+
+    Cosmos::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeCosmos);
+    EXPECT_EQ(output.error_message(), "");
+    ASSERT_EQ(output.serialized(), "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CtMBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczF2NGU2dnBlaHdyZmV6MmRxZXBudzlnNnQ0Zmw4M3h6ZWdkNWFjORItY29zbW9zMTU0dDV5Y2VqbHI3YXgzeW5tZWQ5ejA1eWc1YTI3eTl1NnBqNWhxGg8KBXVhdG9tEgYzMDAwMDASPz06Qk5CLkJOQjpibmIxczRrYWxseG5ncHlzcHptNm5yZXprbWw5cmd5dzZreHB3NGZocjI6ODE5MzkxOnQ6MBJmClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDmmNIYBvR9bnOloFEMOWdk9DHYIGe7naW0T19y+/k1SUSBAoCCAEYARISCgwKBXVhdG9tEgM1MDAQwJoMGkCFqUWtDu0pn1P/cnVQnIJIWF8HFJn/xkJh55Mc7ZLVPF60uXYUOg8nNkt0IQPuTFREw32/yff6lmA5w6KwPen/\"}");
+
+    // https://viewblock.io/thorchain/tx/07F47D71A74245538E205F24ADB4BBB799B49C3A8A8875665D249EA51662AA50
+    // https://www.mintscan.io/cosmos/txs/07F47D71A74245538E205F24ADB4BBB799B49C3A8A8875665D249EA51662AA50
+    // https://binance.mintscan.io/txs/2C97061737B16B234990B9B18A2BF65F7C7418FF9E39A68E634C832E4E4C59CE
+}
+
+Data SwapTest_ethAddressStringToData(const std::string& asString) {
+    if (asString.empty()) {
+        return Data();
+    }
+    auto address = Ethereum::Address(asString);
+    Data asData;
+    asData.resize(20);
+    std::copy(address.bytes.begin(), address.bytes.end(), asData.data());
+    return asData;
+}
+
+TEST(THORChainSwap, SwapErc20Rune) {
+    Proto::Asset fromAsset;
+    fromAsset.set_token_id("0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E");
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::AVAX));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::THOR));
+    toAsset.set_symbol("RUNE");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress("0xbe6523017422A983B900b614Baeac51Ef7C1d0A3")
+                                         .toAddress("thor1ad6hapypumu7su5ad9qry2d74yt9d56fssa774")
+                                         .vault("0xa56f6Cb1D66cd80150b1ea79643b4C5900D6E36E")
+                                         .router("0x8f66c4ae756bebc49ec8b81966dd8bba9f127549")
+                                         .fromAmount("1000000")
+                                         .toAmountLimit("51638857")
+                                         .expirationPolicy(1775669796)
+                                         .affFeeAddress("t")
+                                         .affFeeRate("0")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "0a010012010018012201002a0100422a30783866363663346165373536626562633439656338623831393636646438626261396631323735343952ad0232aa020a010012a40244bc937b000000000000000000000000a56f6cb1d66cd80150b1ea79643b4c5900d6e36e000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e00000000000000000000000000000000000000000000000000000000000f424000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000069d6922400000000000000000000000000000000000000000000000000000000000000443d3a54484f522e52554e453a74686f72316164366861707970756d753773753561643971727932643734797439643536667373613737343a35313633383835373a743a3000000000000000000000000000000000000000000000000000000000");
+
+    auto tx = Ethereum::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.to_address(), "0x8f66c4ae756bebc49ec8b81966dd8bba9f127549");
+    ASSERT_TRUE(tx.transaction().has_contract_generic());
+
+    auto vaultAddress = "0xa56f6Cb1D66cd80150b1ea79643b4C5900D6E36E";
+    auto funcData = Ethereum::ABI::Function::encodeFunctionCall("depositWithExpiry", Ethereum::ABI::BaseParams{
+        std::make_shared<Ethereum::ABI::ProtoAddress>(vaultAddress),
+        std::make_shared<Ethereum::ABI::ProtoAddress>("0xB97EF9Ef8734C71904D8002F8b6Bc66Dd9c48a6E"),
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(uint256_t(1000000)),
+        std::make_shared<Ethereum::ABI::ProtoString>("=:THOR.RUNE:thor1ad6hapypumu7su5ad9qry2d74yt9d56fssa774:51638857:t:0"),
+        std::make_shared<Ethereum::ABI::ProtoUInt256>(uint256_t(1775669796))
+    }).value();
+    EXPECT_EQ(hex(funcData), "44bc937b000000000000000000000000a56f6cb1d66cd80150b1ea79643b4c5900d6e36e000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e00000000000000000000000000000000000000000000000000000000000f424000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000069d6922400000000000000000000000000000000000000000000000000000000000000443d3a54484f522e52554e453a74686f72316164366861707970756d753773753561643971727932643734797439643536667373613737343a35313633383835373a743a3000000000000000000000000000000000000000000000000000000000");
+    EXPECT_EQ(hex(TW::data(tx.transaction().contract_generic().amount())), "00");
+    EXPECT_EQ(hex(TW::data(tx.transaction().contract_generic().data())), hex(funcData));
+
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set few fields before signing
+    auto chainId = store(uint256_t(43114));
+    tx.set_chain_id(chainId.data(), chainId.size());
+    auto nonce = store(uint256_t(6));
+    tx.set_nonce(nonce.data(), nonce.size());
+    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
+    auto maxFeePerGas = store(uint256_t(25000000000));
+    tx.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    tx.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    auto gasLimit = store(uint256_t(108810));
+    tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+    auto privKey = parse_hex("6649ba1d931059e7b419f97ee41c3f98b8f8054dfeb4cb57b9898bc5b9bbe318");
+    tx.set_private_key(privKey.data(), privKey.size());
+
+    // sign and encode resulting input
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeAvalancheCChain);
+    EXPECT_EQ(hex(output.encoded()), "02f9019482a86a0684773594008505d21dba008301a90a948f66c4ae756bebc49ec8b81966dd8bba9f12754980b9012444bc937b000000000000000000000000a56f6cb1d66cd80150b1ea79643b4c5900d6e36e000000000000000000000000b97ef9ef8734c71904d8002f8b6bc66dd9c48a6e00000000000000000000000000000000000000000000000000000000000f424000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000069d6922400000000000000000000000000000000000000000000000000000000000000443d3a54484f522e52554e453a74686f72316164366861707970756d753773753561643971727932643734797439643536667373613737343a35313633383835373a743a3000000000000000000000000000000000000000000000000000000000c080a04a3a01941906579f1c6888771fe0621d66ee78998bfbb87219c0b5970235fc5ca03aefe4bb0c074f90798e078270c380930f4ae75366217f85535dd9be196a4244");
+    // https://viewblock.io/thorchain/tx/B5E88D61157E7073995CA8729B75DAB2C1684A7B145DB711327CA4B8FF7DBDE7
+    // https://snowtrace.io/tx/0xb5e88d61157e7073995ca8729b75dab2c1684a7b145db711327ca4b8ff7dbde7
+    // https://thorchain.net/tx/B5E88D61157E7073995CA8729B75DAB2C1684A7B145DB711327CA4B8FF7DBDE7
+}
+
+TEST(THORChainSwap, SwapBscBnb) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BSC));
+    fromAsset.set_token_id("0x0000000000000000000000000000000000000000");
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress("0xf8192E9c51c070d199a8F262c12DDD1034274083")
+                                         .toAddress("bnb1tjcup6q8nere6r0pdt2ucc4g0xcrhm0jy5xql8")
+                                         .vault("0xcBE4334E4a0fC7C5Fa8083223B28a4b9F695A06C")
+                                         .router("0xb30eC53F98ff5947EDe720D32aC2da7e52A5f56b")
+                                         .fromAmount("10000000000000000")
+                                         .toAmountLimit("100000")
+                                         .expirationPolicy(1775669796)
+                                         .affFeeAddress("t")
+                                         .affFeeRate("0")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "0a01001201002201002a0100422a3078623330654335334639386666353934374544653732304433326143326461376535324135663536625293023290020a072386f26fc1000012840244bc937b000000000000000000000000cbe4334e4a0fc7c5fa8083223b28a4b9f695a06c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000069d69224000000000000000000000000000000000000000000000000000000000000003f3d3a424e422e424e423a626e6231746a6375703671386e65726536723070647432756363346730786372686d306a793578716c383a3130303030303a743a3000");
+
+    auto tx = Ethereum::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+
+    // check fields
+    EXPECT_EQ(tx.to_address(), "0xb30eC53F98ff5947EDe720D32aC2da7e52A5f56b");
+    ASSERT_TRUE(tx.transaction().has_contract_generic());
+
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set few fields before signing
+    auto chainId = store(uint256_t(56));
+    tx.set_chain_id(chainId.data(), chainId.size());
+    auto nonce = store(uint256_t(0));
+    tx.set_nonce(nonce.data(), nonce.size());
+    // 0,000000001
+    auto gasPrice = store(uint256_t(3000000000));
+    tx.set_gas_price(gasPrice.data(), gasPrice.size());
+    auto gasLimit = store(uint256_t(50000));
+    tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+    auto privKey = parse_hex("74c452b55e0da4139172bc3b32bec469cfefbcdce373edda8e33afcfbf9c0a87");
+    tx.set_private_key(privKey.data(), privKey.size());
+
+    // sign and encode resulting input
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeSmartChain);
+    EXPECT_EQ(hex(output.encoded()), "f901718084b2d05e0082c35094b30ec53f98ff5947ede720d32ac2da7e52a5f56b872386f26fc10000b9010444bc937b000000000000000000000000cbe4334e4a0fc7c5fa8083223b28a4b9f695a06c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000069d69224000000000000000000000000000000000000000000000000000000000000003f3d3a424e422e424e423a626e6231746a6375703671386e65726536723070647432756363346730786372686d306a793578716c383a3130303030303a743a30008194a05b0032d4150a3fa3b39a047648c02cb44b3256b9c34b7780265643c33d2aa2c6a017fece0465a271b7bddf655f7ac77419fb0433f9acf64b455b9aa17183b6eb98");
+    // https://viewblock.io/thorchain/tx/4292A5068BAA5619CF7A35861058915423688DF3CAE8F241453D8FCC6E0BF0A9
+    // https://bscscan.com/tx/0x4292a5068baa5619cf7a35861058915423688df3cae8f241453d8fcc6e0bf0a9
+    // https://explorer.bnbchain.org/tx/88A1B6F9D64F3B48CE1107979CD325E817446C5D6729EE6FC917589A6FADA79D
+}
+
+TEST(THORChainSwap, SwapAvaxBnb) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::AVAX));
+    fromAsset.set_token_id("0x0000000000000000000000000000000000000000");
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress("0xbB7cF2f05a01DB5394234FE1257D907059edFa66")
+                                         .toAddress("bnb16gk7gczst59wy8rnxrqnt3yn6f60uw6ec0w6uv")
+                                         .vault("0x3bd92906c60e5843ce01b2dc54e6dc3575b5215a")
+                                         .router("0x8f66c4ae756bebc49ec8b81966dd8bba9f127549")
+                                         .fromAmount("150000000000000000")
+                                         .toAmountLimit("297039")
+                                         .expirationPolicy(1775669796)
+                                         .affFeeAddress("t")
+                                         .affFeeRate("0")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "0a010012010018012201002a0100422a3078386636366334616537353662656263343965633862383139363664643862626139663132373534395294023291020a080214e8348c4f000012840244bc937b0000000000000000000000003bd92906c60e5843ce01b2dc54e6dc3575b5215a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000214e8348c4f000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000069d69224000000000000000000000000000000000000000000000000000000000000003f3d3a424e422e424e423a626e623136676b3767637a73743539777938726e7872716e7433796e36663630757736656330773675763a3239373033393a743a3000");
+
+    auto tx = Ethereum::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.to_address(), "0x8f66c4ae756bebc49ec8b81966dd8bba9f127549");
+    ASSERT_TRUE(tx.transaction().has_contract_generic());
+
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set few fields before signing
+    auto chainId = store(uint256_t(43114));
+    tx.set_chain_id(chainId.data(), chainId.size());
+    auto nonce = store(uint256_t(5));
+    tx.set_nonce(nonce.data(), nonce.size());
+    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
+    auto maxFeePerGas = store(uint256_t(25000000000));
+    tx.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    tx.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    auto gasLimit = store(uint256_t(108810));
+    tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+    auto privKey = parse_hex("09da019c250b7e2b140645df36fd839806c5ae8eecf4d8f35e8ff57cf3bd1e57");
+    tx.set_private_key(privKey.data(), privKey.size());
+
+    // sign and encode resulting input
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeAvalancheCChain);
+    EXPECT_EQ(hex(output.encoded()), "02f9017c82a86a0584773594008505d21dba008301a90a948f66c4ae756bebc49ec8b81966dd8bba9f127549880214e8348c4f0000b9010444bc937b0000000000000000000000003bd92906c60e5843ce01b2dc54e6dc3575b5215a00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000214e8348c4f000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000069d69224000000000000000000000000000000000000000000000000000000000000003f3d3a424e422e424e423a626e623136676b3767637a73743539777938726e7872716e7433796e36663630757736656330773675763a3239373033393a743a3000c080a0a794b7cd86242df0f69bfc2555adec7841ad1f3a02e478be0d63571da8d41f20a06cd214b052d2a2aee598c2d3d57a972979e4c49a447c52828657101e9ad39737");
+    // https://viewblock.io/thorchain/tx/8A29B132443BF1B0A0BD3E00F8155D10FEEEC7737BDC912C4A1AFB0A52E4FD4F
+    // https://snowtrace.io/tx/0x8A29B132443BF1B0A0BD3E00F8155D10FEEEC7737BDC912C4A1AFB0A52E4FD4F
+    // https://binance.mintscan.io/txs/9D250C8BAC8205B942A597AFB345045439A55CAB8DD588B75870D4E47D751C16
+}
+
+TEST(THORChainSwap, SwapEthBnb) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Eth)
+                                         .toAddress(Address1Bnb)
+                                         .vault(VaultEth)
+                                         .fromAmount("50000000000000000")
+                                         .toAmountLimit("600003")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "0a010012010018012201002a0100422a30783130393163344465366133634630394364413030416244416544343263376333423639433833454352480a460a07b1a2bc2ec50000123b3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a363030303033");
+
+    auto tx = Ethereum::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.to_address(), VaultEth);
+    ASSERT_FALSE(tx.transaction().has_contract_generic());
+
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set few fields before signing
+    auto chainId = store(uint256_t(1));
+    tx.set_chain_id(chainId.data(), chainId.size());
+    auto nonce = store(uint256_t(3));
+    tx.set_nonce(nonce.data(), nonce.size());
+    auto gasPrice = store(uint256_t(30000000000));
+    tx.set_gas_price(gasPrice.data(), gasPrice.size());
+    auto gasLimit = store(uint256_t(80000));
+    tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+    tx.set_private_key("");
+    tx.set_private_key(TestKey1Eth.data(), TestKey1Eth.size());
+
+    // sign and encode resulting input
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeEthereum);
+    EXPECT_EQ(hex(output.encoded()), "02f8a60103808083013880941091c4de6a3cf09cda00abdaed42c7c3b69c83ec87b1a2bc2ec50000b83b3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a363030303033c080a00d605807f983650fafbfdcf0c33bdf0c524c7185eae8c1501ae24892faf16b1ba03b51b0a35e4754ab21d1e48fed635d8486048df50c253ba9af4cebdb6a92a450");
+}
+
+TEST(THORChainSwap, SwapBnbBtc) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BTC));
+    toAsset.set_symbol("BTC");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Bnb)
+                                         .toAddress(Address1Btc)
+                                         .vault(VaultBnb)
+                                         .fromAmount("10000000")
+                                         .toAmountLimit("10000000")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "2a3d3d3a4254432e4254433a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070383a313030303030303052480a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e421080ade204");
+
+    auto tx = Binance::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.memo(), "=:BTC.BTC:bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8:10000000");
+    ASSERT_TRUE(tx.has_send_order());
+    ASSERT_EQ(tx.send_order().inputs_size(), 1);
+    ASSERT_EQ(tx.send_order().outputs_size(), 1);
+    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "e42be736e933cf8b97c26f33789a3ca6f8348cd1");
+    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "99730371c7c77cb81ffa76b566dcef7c1e5dc19c");
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set few fields before signing
+    tx.set_chain_id("Binance-Chain-Tigris");
+    tx.set_private_key(TestKey1Bnb.data(), TestKey1Bnb.size());
+
+    // sign and encode resulting input
+    Binance::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBinance);
+    EXPECT_EQ(hex(output.encoded()), "fd01f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e421080ade204126a0a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e19124086d43e9bdf12508a9a1415f5f970dfa5ff5930dee01d922f99779b63190735ba1d69694bda203b6678939a5c1eab0a52ed32bb67864ec7864de37b333533ae0c1a3d3d3a4254432e4254433a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070383a3130303030303030");
+}
+
+TEST(THORChainSwap, SwapBnbEth) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    toAsset.set_symbol("ETH");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Bnb)
+                                         .toAddress(Address1Eth)
+                                         .vault(VaultBnb)
+                                         .fromAmount("27000000")
+                                         .toAmountLimit("123456")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "2a3b3d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a31323334353652480a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e4210c0f9ef0c12220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e4210c0f9ef0c");
+
+    auto tx = Binance::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.memo(), "=:ETH.ETH:0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7:123456");
+    ASSERT_TRUE(tx.has_send_order());
+    ASSERT_EQ(tx.send_order().inputs_size(), 1);
+    ASSERT_EQ(tx.send_order().outputs_size(), 1);
+    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "e42be736e933cf8b97c26f33789a3ca6f8348cd1");
+    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "99730371c7c77cb81ffa76b566dcef7c1e5dc19c");
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set private key and few other fields
+    EXPECT_EQ(TW::deriveAddress(TWCoinTypeBinance, PrivateKey(TestKey1Bnb)), Address1Bnb);
+    tx.set_private_key(TestKey1Bnb.data(), TestKey1Bnb.size());
+    tx.set_chain_id("Binance-Chain-Tigris");
+    tx.set_account_number(1902570);
+    tx.set_sequence(12);
+    // sign and encode resulting input
+    Binance::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBinance);
+    EXPECT_EQ(hex(output.encoded()), "8102f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e4210c0f9ef0c12220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e4210c0f9ef0c12700a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e1912409ad3d44f3cc8d5dd2701b0bf3758ef674683533fb63e3e94d39728688c0279f8410395d631075dac62dee74b972c320f5a58e88ab81be6f1bb6a9564468ae1b618ea8f74200c1a3b3d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a313233343536");
+
+    // real transaction:
+    // https://explorer.binance.org/tx/F0CFDB0D9467E83B5BBF6DF92E4E2D04FE9EFF9B0A1C71D88DCEF566233DCAA2
+    // https://viewblock.io/thorchain/tx/F0CFDB0D9467E83B5BBF6DF92E4E2D04FE9EFF9B0A1C71D88DCEF566233DCAA2
+    // https://etherscan.io/tx/0x8e5bb7d87e17af86e649e402bc5c182ea8c32ddaca153804679de1184e0d9747
+}
+
+TEST(THORChainSwap, SwapBnbRune) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::THOR));
+    toAsset.set_symbol("RUNE");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Bnb)
+                                         .toAddress(Address1Thor)
+                                         .vault(VaultBnb)
+                                         .fromAmount("4000000")
+                                         .toAmountLimit("121065076")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "2a413d3a54484f522e52554e453a74686f72317a3533777765376d64366365777a39737177717a6e306161767061756e3067773065786e32723a31323130363530373652480a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e42108092f40112220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e42108092f401");
+
+    auto tx = Binance::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.memo(), "=:THOR.RUNE:thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r:121065076");
+    ASSERT_TRUE(tx.has_send_order());
+    ASSERT_EQ(tx.send_order().inputs_size(), 1);
+    ASSERT_EQ(tx.send_order().outputs_size(), 1);
+    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "e42be736e933cf8b97c26f33789a3ca6f8348cd1");
+    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "99730371c7c77cb81ffa76b566dcef7c1e5dc19c");
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set private key and few other fields
+    EXPECT_EQ(TW::deriveAddress(TWCoinTypeBinance, PrivateKey(TestKey1Bnb)), Address1Bnb);
+    tx.set_private_key(TestKey1Bnb.data(), TestKey1Bnb.size());
+    tx.set_chain_id("Binance-Chain-Tigris");
+    tx.set_account_number(1902570);
+    tx.set_sequence(4);
+    // sign and encode resulting input
+    Binance::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBinance);
+    EXPECT_EQ(hex(output.encoded()), "8702f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e42108092f40112220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e42108092f40112700a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e191240f0bd5a0b4936ce73b1564f737a22cb7cfa3c171a3598b1fe42f6c926c516777042673f3b30148d54b591dcfcb88c2aa04bb87b4b492e8d17c72e4d263f57159018ea8f7420041a413d3a54484f522e52554e453a74686f72317a3533777765376d64366365777a39737177717a6e306161767061756e3067773065786e32723a313231303635303736");
+
+    // real transaction:
+    // https://explorer.binance.org/tx/84EE429B35945F0568097527A084532A9DE7BBAB0E6A5562E511CEEFB188DE69
+    // https://viewblock.io/thorchain/tx/D582E1473FE229F02F162055833C64F49FB4FF515989A4785ED7898560A448FC
+}
+
+TEST(THORChainSwap, SwapBusdTokenBnb) {
+    Proto::Asset fromAsset;
+    fromAsset.set_symbol("BNB");
+    fromAsset.set_token_id("BUSD-BD1");
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress("bnb1gddl87crh47wzynjx3c6pmcclzk7txlkm74x28")
+                                         .toAddress("bnb1gddl87crh47wzynjx3c6pmcclzk7txlkm74x28")
+                                         .vault("bnb17e9qd0ffrkxsy9pehx7q6hjer730pzq5z4tv82")
+                                         .fromAmount("500000000")
+                                         .toAmountLimit("719019")
+                                         .affFeeAddress("t")
+                                         .affFeeRate("0")
+                                         .build(false);
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "2a42535741503a424e422e424e423a626e62316764646c38376372683437777a796e6a78336336706d63636c7a6b3774786c6b6d37347832383a3731393031393a743a3052540a280a14435bf3fb03bd7ce112723471a0ef18f8ade59bf612100a08425553442d4244311080cab5ee0112280a14f64a06bd291d8d021439b9bc0d5e591fa2f0881412100a08425553442d4244311080cab5ee01");
+
+    auto tx = Binance::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.memo(), "SWAP:BNB.BNB:bnb1gddl87crh47wzynjx3c6pmcclzk7txlkm74x28:719019:t:0");
+    ASSERT_TRUE(tx.has_send_order());
+    ASSERT_EQ(tx.send_order().inputs_size(), 1);
+    ASSERT_EQ(tx.send_order().outputs_size(), 1);
+    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "435bf3fb03bd7ce112723471a0ef18f8ade59bf6");
+    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "f64a06bd291d8d021439b9bc0d5e591fa2f08814");
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set private key and few other fields
+    const Data privateKey = parse_hex("412c379cccf9d792238f0a8bd923604e00c2be11ea1de715945f6a849796362a");
+    EXPECT_EQ(Binance::Address(PrivateKey(privateKey).getPublicKey(TWPublicKeyTypeSECP256k1)).string(), "bnb1gddl87crh47wzynjx3c6pmcclzk7txlkm74x28");
+    tx.set_private_key(privateKey.data(), privateKey.size());
+    tx.set_chain_id("Binance-Chain-Tigris");
+    tx.set_account_number(7320332);
+    tx.set_sequence(2);
+
+    // sign and encode resulting input
+    Binance::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBinance);
+    EXPECT_EQ(hex(output.encoded()), "9502f0625dee0a582a2c87fa0a280a14435bf3fb03bd7ce112723471a0ef18f8ade59bf612100a08425553442d4244311080cab5ee0112280a14f64a06bd291d8d021439b9bc0d5e591fa2f0881412100a08425553442d4244311080cab5ee0112710a26eb5ae98721039aa92707d6789692628099f288de219c9c9a0dd179df4e8b1b717191c75fbbfb1240fb41cf3eaaf1286de4be633682c120886b39dcc41690b583f4f08561d660a1677ebda2323e0f22c440c6fe8855d21f1153557b94066ce956363f0a82d1ab3c92188ce6be0320021a42535741503a424e422e424e423a626e62316764646c38376372683437777a796e6a78336336706d63636c7a6b3774786c6b6d37347832383a3731393031393a743a30");
+
+    // https://viewblock.io/thorchain/tx/1B7E472C7C8D60176FCFD83CAD7DA970EB12B45145C553CD37BD34CABE276C59
+    // https://explorer.bnbchain.org/tx/1B7E472C7C8D60176FCFD83CAD7DA970EB12B45145C553CD37BD34CABE276C59
+    // https://explorer.bnbchain.org/tx/79D2194584F498CA2D4C391FBD7B158FC94B670703B629CA6F46852BB24234A6
+}
+
+TEST(THORChainSwap, SwapBnbBnbToken) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    toAsset.set_token_id("TWT-8C2");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress("bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx")
+                                         .toAddress("bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx")
+                                         .vault("bnb1qefsjm654cdw94ejj8g4s49w7z8te75veslusz")
+                                         .fromAmount("10000000")
+                                         .toAmountLimit("5400000000")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "2a433d3a424e422e5457542d3843323a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a3534303030303030303052480a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a140653096f54ae1ae2d73291d15854aef08ebcfa8c120a0a03424e421080ade204");
+
+    auto tx = Binance::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.memo(), "=:BNB.TWT-8C2:bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx:5400000000");
+    ASSERT_TRUE(tx.has_send_order());
+    ASSERT_EQ(tx.send_order().inputs_size(), 1);
+    ASSERT_EQ(tx.send_order().outputs_size(), 1);
+    EXPECT_EQ(hex(tx.send_order().inputs(0).address()), "e42be736e933cf8b97c26f33789a3ca6f8348cd1");
+    EXPECT_EQ(hex(tx.send_order().outputs(0).address()), "0653096f54ae1ae2d73291d15854aef08ebcfa8c");
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set private key and few other fields
+    const Data privateKey = parse_hex("bcf8b072560dda05122c99390def2c385ec400e1a93df0657a85cf6b57a715da");
+    EXPECT_EQ(Binance::Address(PrivateKey(privateKey).getPublicKey(TWPublicKeyTypeSECP256k1)).string(), "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx");
+    tx.set_private_key(privateKey.data(), privateKey.size());
+    tx.set_chain_id("Binance-Chain-Tigris");
+    tx.set_account_number(1902570);
+    tx.set_sequence(18);
+
+    // sign and encode resulting input
+    Binance::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBinance);
+    EXPECT_EQ(hex(output.encoded()), "8902f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a140653096f54ae1ae2d73291d15854aef08ebcfa8c120a0a03424e421080ade20412700a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e191240918963970aedc528e3a9ba34f37fb544ec18e7d2caade2ebf7b8371928c93e6e0eca072313ddfda393c1340766d5fef00e6b0cb7147ef3382b6303f3a6ca01a318ea8f7420121a433d3a424e422e5457542d3843323a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a35343030303030303030");
+
+    // real transaction:
+    // curl -X GET "http://dataseed1.binance.org/broadcast_tx_sync?tx=0x8c02...3030"
+    // https://viewblock.io/thorchain/tx/6D1EDC9BD9BFAFEF0F88F95A164191262EA02A0413BF3D9773110AD5676E1523
+    // https://explorer.binance.org/tx/6D1EDC9BD9BFAFEF0F88F95A164191262EA02A0413BF3D9773110AD5676E1523
+    // https://explorer.binance.org/tx/60C54C9F253B89C36A2788AB66951045E8AC5F5729597CB6C64A13013A7A54CC
+}
+
+TEST(THORChainSwap, SwapBtcEthWithAffFee) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BTC));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    toAsset.set_symbol("ETH");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Btc)
+                                         .toAddress(Address1Eth)
+                                         .vault(VaultBtc)
+                                         .fromAmount("1000000")
+                                         .toAmountLimit("140000000000000000")
+                                         .affFeeAddress("thrnm")
+                                         .affFeeRate("10")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "080110c0843d1801222a62633171366d397532717375386d68387937763872723279776176746a38673561727a6c796863656a372a2a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070386a503d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a3134303030303030303030303030303030303a7468726e6d3a3130");
+
+    auto tx = Bitcoin::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.amount(), 1000000);
+    EXPECT_EQ(tx.to_address(), VaultBtc);
+    EXPECT_EQ(tx.change_address(), Address1Btc);
+    EXPECT_EQ(tx.output_op_return(), "=:ETH.ETH:0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7:140000000000000000:thrnm:10");
+    EXPECT_EQ(tx.coin_type(), 0ul);
+    EXPECT_EQ(tx.private_key_size(), 0);
+    EXPECT_FALSE(tx.has_plan());
+
+    // set few fields before signing
+    tx.set_byte_fee(20);
+    EXPECT_EQ(Bitcoin::SegwitAddress(PrivateKey(TestKey1Btc).getPublicKey(TWPublicKeyTypeSECP256k1), "bc").string(), Address1Btc);
+    tx.add_private_key(TestKey1Btc.data(), TestKey1Btc.size());
+    auto& utxo = *tx.add_utxo();
+    Data utxoHash = parse_hex("1234000000000000000000000000000000000000000000000000000000005678");
+    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo.mutable_out_point()->set_index(0);
+    utxo.mutable_out_point()->set_sequence(UINT32_MAX);
+    auto utxoScript = Bitcoin::Script::lockScriptForAddress(Address1Btc, TWCoinTypeBitcoin);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+    utxo.set_amount(50000000);
+    tx.set_use_max_amount(false);
+
+    // sign and encode resulting input
+    Bitcoin::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBitcoin);
+    EXPECT_EQ(output.error(), 0);
+    EXPECT_EQ(hex(output.encoded()), // printed using prettyPrintTransaction
+              "01000000" // version
+              "0001" // marker & flag
+              "01" // inputs
+              "1234000000000000000000000000000000000000000000000000000000005678"  "00000000"  "00"  ""  "ffffffff"
+              "03" // outputs
+              "40420f0000000000"  "16"  "0014d6cbc5021c3eee72798718d447758b91d14e8c5f"
+              "0c9ceb0200000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
+              "0000000000000000"  "53"  "6a4c503d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a3134303030303030303030303030303030303a7468726e6d3a3130"
+              // witness
+              "02"
+              "47"  "3044022056e918d8dea9431057b7b8b7f7c990ff72d653aef296eda9a85e546537e1eaa4022050b64766ea4ce56ecd3325f184d67b20924fd4539cb40bbad916ede1cc26017f01"
+              "21"  "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
+              "00000000" // nLockTime
+    );
+}
+
+TEST(THORChainSwap, SwapEthBnbWithAffFee) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Eth)
+                                         .toAddress(Address1Bnb)
+                                         .vault(VaultEth)
+                                         .fromAmount("50000000000000000")
+                                         .toAmountLimit("600003")
+                                         .affFeeAddress("tthor1ql2tcqyrqsgnql2tcqyj2n8kfdmt9lh0yzql2tcqy")
+                                         .affFeeRate("10")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "0a010012010018012201002a0100422a307831303931633444653661336346303943644130304162444165443432633763334236394338334543527b0a790a07b1a2bc2ec50000126e3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a3630303030333a7474686f7231716c3274637179727173676e716c32746371796a326e386b66646d74396c6830797a716c32746371793a3130");
+
+    auto tx = Ethereum::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.to_address(), VaultEth);
+    ASSERT_FALSE(tx.transaction().has_contract_generic());
+
+    EXPECT_EQ(hex(TW::data(tx.private_key())), "");
+
+    // set few fields before signing
+    auto chainId = store(uint256_t(1));
+    tx.set_chain_id(chainId.data(), chainId.size());
+    auto nonce = store(uint256_t(3));
+    tx.set_nonce(nonce.data(), nonce.size());
+    auto gasPrice = store(uint256_t(30000000000));
+    tx.set_gas_price(gasPrice.data(), gasPrice.size());
+    auto gasLimit = store(uint256_t(80000));
+    tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+    tx.set_private_key("");
+    tx.set_private_key(TestKey1Eth.data(), TestKey1Eth.size());
+
+    // sign and encode resulting input
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeEthereum);
+    EXPECT_EQ(hex(output.encoded()), "02f8d90103808083013880941091c4de6a3cf09cda00abdaed42c7c3b69c83ec87b1a2bc2ec50000b86e3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a3630303030333a7474686f7231716c3274637179727173676e716c32746371796a326e386b66646d74396c6830797a716c32746371793a3130c001a05c16871b66fd0fa8f658d6f171310bab332d09e0533d6c97329a59ddc93a9a11a05ed2be94e6dbb640e58920c8be4fa597cd5f0a918123245acb899042dd43777f");
+}
+
+TEST(THORChainSwap, SwapBtcNegativeMemoTooLong) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BTC));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    toAsset.set_symbol("ETH");
+    auto&& [out, errorCode, error] = SwapBuilder::builder()
+                                         .from(fromAsset)
+                                         .to(toAsset)
+                                         .fromAddress(Address1Btc)
+                                         .toAddress(Address1Eth)
+                                         .vault(VaultBtc)
+                                         .fromAmount("1000000")
+                                         .toAmountLimit("140000000000000000")
+                                         .affFeeAddress("affiliate_address")
+                                         .affFeeRate("10")
+                                         .extraMemo("extra_memo_very_loooooooooooooong")
+                                         .build();
+    ASSERT_EQ(errorCode, 0);
+    ASSERT_EQ(error, "");
+    EXPECT_EQ(hex(out), "080110c0843d1801222a62633171366d397532717375386d68387937763872723279776176746a38673561727a6c796863656a372a2a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070386a7e3d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a3134303030303030303030303030303030303a616666696c696174655f616464726573733a31303a65787472615f6d656d6f5f766572795f6c6f6f6f6f6f6f6f6f6f6f6f6f6f6f6e67");
+
+    auto tx = Bitcoin::Proto::SigningInput();
+    ASSERT_TRUE(tx.ParseFromArray(out.data(), (int)out.size()));
+
+    // check fields
+    EXPECT_EQ(tx.amount(), 1000000);
+    EXPECT_EQ(tx.to_address(), VaultBtc);
+    EXPECT_EQ(tx.change_address(), Address1Btc);
+    EXPECT_EQ(tx.output_op_return(), "=:ETH.ETH:0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7:140000000000000000:affiliate_address:10:extra_memo_very_loooooooooooooong");
+    EXPECT_EQ(tx.output_op_return().length(), 126ul);
+    EXPECT_EQ(tx.coin_type(), 0ul);
+    EXPECT_EQ(tx.private_key_size(), 0);
+    EXPECT_FALSE(tx.has_plan());
+
+    // set few fields before signing
+    tx.set_byte_fee(20);
+    EXPECT_EQ(Bitcoin::SegwitAddress(PrivateKey(TestKey1Btc).getPublicKey(TWPublicKeyTypeSECP256k1), "bc").string(), Address1Btc);
+    tx.add_private_key(TestKey1Btc.data(), TestKey1Btc.size());
+    auto& utxo = *tx.add_utxo();
+    Data utxoHash = parse_hex("1234000000000000000000000000000000000000000000000000000000005678");
+    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo.mutable_out_point()->set_index(0);
+    utxo.mutable_out_point()->set_sequence(UINT32_MAX);
+    auto utxoScript = Bitcoin::Script::lockScriptForAddress(Address1Btc, TWCoinTypeBitcoin);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+    utxo.set_amount(50000000);
+    tx.set_use_max_amount(false);
+
+    // sign and encode resulting input
+    Bitcoin::Proto::SigningOutput output;
+    ANY_SIGN(tx, TWCoinTypeBitcoin);
+    EXPECT_EQ(output.error(), Common::Proto::Error_invalid_memo);
+    EXPECT_EQ(hex(output.encoded()), "");
+}
+
+TEST(THORChainSwap, Memo) {
+    Proto::Asset toAssetBTC;
+    toAssetBTC.set_chain(static_cast<Proto::Chain>(Chain::BTC));
+    toAssetBTC.set_symbol("BTC");
+    auto builder = SwapBuilder::builder().to(toAssetBTC).toAddress("btc123").toAmountLimit("1234");
+    EXPECT_EQ(builder.buildMemo(), "=:BTC.BTC:btc123:1234");
+    EXPECT_EQ(builder.affFeeAddress("feeaddr").buildMemo(), "=:BTC.BTC:btc123:1234:feeaddr");
+    EXPECT_EQ(builder.affFeeRate("10").buildMemo(), "=:BTC.BTC:btc123:1234:feeaddr:10");
+    EXPECT_EQ(builder.extraMemo("extramemo").buildMemo(), "=:BTC.BTC:btc123:1234:feeaddr:10:extramemo");
+    EXPECT_EQ(builder.extraMemo("").affFeeRate("0").buildMemo(), "=:BTC.BTC:btc123:1234:feeaddr:0");
+    EXPECT_EQ(builder.affFeeAddress("").affFeeRate("10").buildMemo(), "=:BTC.BTC:btc123:1234::10");
+    EXPECT_EQ(builder.extraMemo("extramemo").affFeeRate("").buildMemo(), "=:BTC.BTC:btc123:1234:::extramemo");
+
+    Proto::Asset toAssetETH;
+    toAssetETH.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    toAssetETH.set_symbol("ETH");
+    builder = SwapBuilder::builder().to(toAssetETH).toAddress("0xaabbccdd").toAmountLimit("1234");
+    EXPECT_EQ(builder.buildMemo(), "=:ETH.ETH:0xaabbccdd:1234");
+    toAssetETH.set_token_id("0x0000000000000000000000000000000000000000");
+    EXPECT_EQ(builder.to(toAssetETH).buildMemo(), "=:ETH.ETH:0xaabbccdd:1234");
+    toAssetETH.set_token_id("0x4B0F1812e5Df2A09796481Ff14017e6005508003");
+    EXPECT_EQ(builder.to(toAssetETH).buildMemo(), "=:ETH.0x4B0F1812e5Df2A09796481Ff14017e6005508003:0xaabbccdd:1234");
+
+    builder = SwapBuilder::builder().to(toAssetETH).toAddress("bnb123").toAmountLimit("1234");
+    Proto::Asset toAssetBNB;
+    toAssetBNB.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAssetBNB.set_symbol("BNB");
+    EXPECT_EQ(builder.to(toAssetBNB).buildMemo(), "=:BNB.BNB:bnb123:1234");
+    toAssetBNB.set_token_id("TWT-8C2");
+    EXPECT_EQ(builder.to(toAssetBNB).buildMemo(), "=:BNB.TWT-8C2:bnb123:1234");
+
+    // Check streaming parameters.
+    EXPECT_EQ(builder.streamInterval("").buildMemo(), "=:BNB.TWT-8C2:bnb123:1234/1/0");
+    EXPECT_EQ(builder.streamQuantity("").buildMemo(), "=:BNB.TWT-8C2:bnb123:1234/1/0");
+    EXPECT_EQ(builder.streamQuantity("30").buildMemo(), "=:BNB.TWT-8C2:bnb123:1234/1/30");
+    EXPECT_EQ(builder.streamInterval("7").streamQuantity("15").buildMemo(), "=:BNB.TWT-8C2:bnb123:1234/7/15");
+
+    // Check the default `toAmountLimit` and streaming parameters.
+    builder = SwapBuilder::builder().to(toAssetETH).toAddress("bnb123");
+    builder.to(toAssetBNB);
+    EXPECT_EQ(builder.buildMemo(), "=:BNB.TWT-8C2:bnb123:0");
+    EXPECT_EQ(builder.streamQuantity("").buildMemo(), "=:BNB.TWT-8C2:bnb123:0/1/0");
+}
+
+TEST(THORChainSwap, WrongFromAddress) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    toAsset.set_symbol("ETH");
+    {
+        auto&& [_, errorCode, error] = SwapBuilder::builder()
+                                           .from(fromAsset)
+                                           .to(toAsset)
+                                           .fromAddress("DummyAddress")
+                                           .toAddress(Address1Eth)
+                                           .vault(VaultEth)
+                                           .fromAmount("1000000")
+                                           .toAmountLimit("100000")
+                                           .build();
+        EXPECT_EQ(errorCode, Proto::ErrorCode::Error_Invalid_from_address);
+        EXPECT_EQ(error, "Invalid from address");
+    }
+    {
+        auto&& [_, errorCode, error] = SwapBuilder::builder()
+                                           .from(fromAsset)
+                                           .to(toAsset)
+                                           .fromAddress(Address1Btc)
+                                           .toAddress(Address1Eth)
+                                           .vault(VaultEth)
+                                           .fromAmount("1000000")
+                                           .toAmountLimit("100000")
+                                           .build();
+        EXPECT_EQ(errorCode, Proto::ErrorCode::Error_Invalid_from_address);
+        EXPECT_EQ(error, "Invalid from address");
+    }
+}
+
+TEST(THORChainSwap, WrongToAddress) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    toAsset.set_symbol("ETH");
+    {
+        auto&& [_, errorCode, error] = SwapBuilder::builder()
+                                           .from(fromAsset)
+                                           .to(toAsset)
+                                           .fromAddress(Address1Bnb)
+                                           .toAddress("DummyAddress")
+                                           .vault(VaultEth)
+                                           .fromAmount("100000")
+                                           .toAmountLimit("100000")
+                                           .build();
+        EXPECT_EQ(errorCode, Proto::ErrorCode::Error_Invalid_to_address);
+        EXPECT_EQ(error, "Invalid to address");
+    }
+    {
+        auto&& [_, errorCode, error] = SwapBuilder::builder()
+                                           .from(fromAsset)
+                                           .to(toAsset)
+                                           .fromAddress(Address1Bnb)
+                                           .toAddress(Address1Btc)
+                                           .vault(VaultEth)
+                                           .fromAmount("100000")
+                                           .toAmountLimit("100000")
+                                           .build();
+        EXPECT_EQ(errorCode, Proto::ErrorCode::Error_Invalid_to_address);
+        EXPECT_EQ(error, "Invalid to address");
+    }
+}
+
+TEST(THORChainSwap, EthInvalidVault) {
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(static_cast<Proto::Chain>(Chain::ETH));
+    Proto::Asset toAsset;
+    toAsset.set_chain(static_cast<Proto::Chain>(Chain::BNB));
+    toAsset.set_symbol("BNB");
+    {
+        fromAsset.set_token_id("0x53595320f158d4546677b4795cc66dff59d154db");
+        auto&& [_, errorCode, error] = SwapBuilder::builder()
+                                           .from(fromAsset)
+                                           .to(toAsset)
+                                           .fromAddress(Address1Eth)
+                                           .toAddress(Address1Bnb)
+                                           .vault("_INVALID_ADDRESS_")
+                                           .router(RouterEth)
+                                           .fromAmount("50000000000000000")
+                                           .toAmountLimit("600003")
+                                           .build();
+        EXPECT_EQ(errorCode, Proto::ErrorCode::Error_Invalid_vault_address);
+        EXPECT_EQ(error, "Invalid vault address: _INVALID_ADDRESS_");
+    }
+    {
+        auto&& [_, errorCode, error] = SwapBuilder::builder()
+                                           .from(fromAsset)
+                                           .to(toAsset)
+                                           .fromAddress(Address1Eth)
+                                           .toAddress(Address1Bnb)
+                                           .vault(VaultEth)
+                                           .router("_INVALID_ADDRESS_")
+                                           .fromAmount("50000000000000000")
+                                           .toAmountLimit("600003")
+                                           .build();
+        EXPECT_EQ(errorCode, Proto::ErrorCode::Error_Invalid_router_address);
+        EXPECT_EQ(error, "Invalid router address: _INVALID_ADDRESS_");
+    }
+}
+
+} // namespace TW::THORChainSwap
diff --git a/tests/chains/Cosmos/THORChain/TWAnyAddressTests.cpp b/tests/chains/Cosmos/THORChain/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..f28a401908e
--- /dev/null
+++ b/tests/chains/Cosmos/THORChain/TWAnyAddressTests.cpp
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(THORChainAnyAddress, IsValid) {
+    EXPECT_TRUE(TWAnyAddressIsValid(STRING("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r").get(), TWCoinTypeTHORChain));
+    EXPECT_TRUE(TWAnyAddressIsValid(STRING("thor1c8jd7ad9pcw4k3wkuqlkz4auv95mldr2kyhc65").get(), TWCoinTypeTHORChain));
+    EXPECT_FALSE(TWAnyAddressIsValid(STRING("cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02").get(), TWCoinTypeTHORChain));
+}
+
+TEST(THORChainAnyAddress, Create) {
+    auto string = STRING("thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeTHORChain));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "1522e767db6eb19708b0038029bfbd607bc9bd0e");
+}
diff --git a/tests/chains/Cosmos/THORChain/TWAnySignerTests.cpp b/tests/chains/Cosmos/THORChain/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..a33c5df584e
--- /dev/null
+++ b/tests/chains/Cosmos/THORChain/TWAnySignerTests.cpp
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "Cosmos/Address.h"
+#include "proto/Cosmos.pb.h"
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(THORChainTWAnySigner, SignTx) {
+    auto privateKey = parse_hex("7105512f0c020a1dd759e14b865ec0125f59ac31e34d7a2807a228ed50cb343e");
+    Cosmos::Proto::SigningInput input;
+    input.set_account_number(593);
+    input.set_chain_id("thorchain");
+    input.set_sequence(3);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_memo("");
+
+    auto fromAddress = "thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r";
+    auto toAddress = "thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn";
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress);
+    message.set_to_address(toAddress);
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("rune");
+    amountOfTx->set_amount("10000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("rune");
+    amountOfFee->set_amount("2000000");
+
+    Cosmos::Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTHORChain);
+
+    // https://viewblock.io/thorchain/tx/FD0445AFFC4ED9ACCB7B5D3ADE361DAE4596EA096340F1360F1020381EA454AF
+    ASSERT_EQ(output.json(), R"({"mode":"block","tx":{"fee":{"amount":[{"amount":"2000000","denom":"rune"}],"gas":"200000"},"memo":"","msg":[{"type":"thorchain/MsgSend","value":{"amount":[{"amount":"10000000","denom":"rune"}],"from_address":"thor1z53wwe7md6cewz9sqwqzn0aavpaun0gw0exn2r","to_address":"thor1e2ryt8asq4gu0h6z2sx9u7rfrykgxwkmr9upxn"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A+2Zfjls9CkvX85aQrukFZnM1dluMTFUp8nqcEneMXx3"},"signature":"qgpMX3WNq4DsNBnYtdmBD4ejiailK4uI/m3/YVqCSNF8AtkUOTmP48ztqCbpkWTFvw1/9S8/ivsFxOcK6AI0jA=="}]}})");
+}
diff --git a/tests/chains/Cosmos/THORChain/TWCoinTypeTests.cpp b/tests/chains/Cosmos/THORChain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..65b8c1ee908
--- /dev/null
+++ b/tests/chains/Cosmos/THORChain/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWTHORChainCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTHORChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("ADF0899E58C177E2391F22D04E9C5E1C35BB0F75B42B363A0761687907FD9476"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTHORChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("thor196yf4pq80hjrmz7nnh0ar0ypqg02r0w4dq4mzu"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTHORChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTHORChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTHORChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTHORChain), 8);
+    ASSERT_EQ(TWBlockchainThorchain, TWCoinTypeBlockchain(TWCoinTypeTHORChain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTHORChain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTHORChain));
+    assertStringsEqual(symbol, "RUNE");
+    assertStringsEqual(txUrl, "https://viewblock.io/thorchain/tx/ADF0899E58C177E2391F22D04E9C5E1C35BB0F75B42B363A0761687907FD9476");
+    assertStringsEqual(accUrl, "https://viewblock.io/thorchain/address/thor196yf4pq80hjrmz7nnh0ar0ypqg02r0w4dq4mzu");
+    assertStringsEqual(id, "thorchain");
+    assertStringsEqual(name, "THORChain");
+}
diff --git a/tests/chains/Cosmos/THORChain/TWSwapTests.cpp b/tests/chains/Cosmos/THORChain/TWSwapTests.cpp
new file mode 100644
index 00000000000..df999de49ad
--- /dev/null
+++ b/tests/chains/Cosmos/THORChain/TWSwapTests.cpp
@@ -0,0 +1,413 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/Script.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "PrivateKey.h"
+#include "proto/Binance.pb.h"
+#include "proto/Ethereum.pb.h"
+#include "proto/THORChainSwap.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWTHORChainSwap.h>
+
+#include "HexCoding.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::THORChainSwap::tests {
+
+// clang-format off
+const auto Address1Bnb = "bnb1us47wdhfx08ch97zdueh3x3u5murfrx30jecrx";
+const auto Address1Btc = "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8";
+const auto Address1Eth = "0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7";
+const auto VaultBnb = "bnb1n9esxuw8ca7ts8l6w66kdh800s09msvul6vlse";
+const auto VaultBtc = "bc1q6m9u2qsu8mh8y7v8rr2ywavtj8g5arzlyhcej7";
+const auto VaultEth = "0x1091c4De6a3cF09CdA00AbDAeD42c7c3B69C83EC";
+const auto RouterEth = "0x42A5Ed456650a09Dc10EBc6361A7480fDd61f27B";
+const Data TestKey1Bnb = parse_hex("bcf8b072560dda05122c99390def2c385ec400e1a93df0657a85cf6b57a715da");
+const Data TestKey1Btc = parse_hex("13fcaabaf9e71ffaf915e242ec58a743d55f102cf836968e5bd4881135e0c52c");
+const Data TestKey1Eth = parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904");
+
+TEST(TWTHORChainSwap, SwapBtcToEth) {
+    // prepare swap input
+    Proto::SwapInput input;
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(Proto::BTC);
+    *input.mutable_from_asset() = fromAsset;
+    input.set_from_address(Address1Btc);
+    Proto::Asset toAsset;
+    toAsset.set_chain(Proto::ETH);
+    toAsset.set_symbol("ETH");
+    toAsset.set_token_id("");
+    *input.mutable_to_asset() = toAsset;
+    input.set_to_address(Address1Eth);
+    input.set_vault_address(VaultBtc);
+    input.set_router_address("");
+    input.set_from_amount("1000000");
+    input.set_to_amount_limit("140000000000000000");
+
+    // serialize input
+    const auto inputData_ = input.SerializeAsString();
+    EXPECT_EQ(hex(inputData_), "0a020801122a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070381a0708021203455448222a3078623966353737316332373636346266323238326439386530396437663530636563376362303161372a2a62633171366d397532717375386d68387937763872723279776176746a38673561727a6c796863656a373a07313030303030304212313430303030303030303030303030303030");
+    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+
+    // invoke swap
+    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
+    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+    EXPECT_EQ(outputData.size(), 178ul);
+    // parse result in proto
+    Proto::SwapOutput outputProto;
+    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+    EXPECT_EQ(outputProto.from_chain(), Proto::BTC);
+    EXPECT_EQ(outputProto.to_chain(), Proto::ETH);
+    EXPECT_EQ(outputProto.error().code(), 0);
+    EXPECT_EQ(outputProto.error().message(), "");
+    EXPECT_TRUE(outputProto.has_bitcoin());
+    Bitcoin::Proto::SigningInput txInput = outputProto.bitcoin();
+
+    // tx input: check some fields
+    EXPECT_EQ(txInput.amount(), 1000000);
+    EXPECT_EQ(txInput.to_address(), "bc1q6m9u2qsu8mh8y7v8rr2ywavtj8g5arzlyhcej7");
+    EXPECT_EQ(txInput.change_address(), "bc1qpjult34k9spjfym8hss2jrwjgf0xjf40ze0pp8");
+    EXPECT_EQ(txInput.output_op_return(), "=:ETH.ETH:0xb9f5771c27664bf2282d98e09d7f50cec7cb01a7:140000000000000000");
+    EXPECT_EQ(txInput.coin_type(), 0ul);
+
+    // sign tx input for signed full tx
+    // set few fields before signing
+    txInput.set_byte_fee(20);
+    EXPECT_EQ(Bitcoin::SegwitAddress(PrivateKey(TestKey1Btc).getPublicKey(TWPublicKeyTypeSECP256k1), "bc").string(), Address1Btc);
+    txInput.add_private_key(TestKey1Btc.data(), TestKey1Btc.size());
+    auto& utxo = *txInput.add_utxo();
+    Data utxoHash = parse_hex("1234000000000000000000000000000000000000000000000000000000005678");
+    utxo.mutable_out_point()->set_hash(utxoHash.data(), utxoHash.size());
+    utxo.mutable_out_point()->set_index(0);
+    utxo.mutable_out_point()->set_sequence(UINT32_MAX);
+    auto utxoScript = Bitcoin::Script::lockScriptForAddress(Address1Btc, TWCoinTypeBitcoin);
+    utxo.set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
+    utxo.set_amount(50000000);
+    txInput.set_use_max_amount(false);
+
+    // sign and encode resulting input
+    {
+        Bitcoin::Proto::SigningOutput output;
+        ANY_SIGN(txInput, TWCoinTypeBitcoin);
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        EXPECT_EQ(hex(output.encoded()), // printed using prettyPrintTransaction
+            "01000000" // version
+            "0001" // marker & flag
+            "01" // inputs
+                "1234000000000000000000000000000000000000000000000000000000005678"  "00000000"  "00"  ""  "ffffffff"
+            "03" // outputs
+                "40420f0000000000"  "16"  "0014d6cbc5021c3eee72798718d447758b91d14e8c5f"
+                "d49ceb0200000000"  "16"  "00140cb9f5c6b62c03249367bc20a90dd2425e6926af"
+                "0000000000000000"  "49"  "6a473d3a4554482e4554483a3078623966353737316332373636346266323238326439386530396437663530636563376362303161373a313430303030303030303030303030303030"
+            // witness
+                "02"
+                    "48"  "3045022100a67f84cbde5affbb46ffff2b33c1453ff2de70ef990fc974175d9a609e5a87ed0220589c57d958208f866c9477c7d6c9075dea4c58622debb02eab85032b8b6d373001"
+                    "21"  "021e582a887bd94d648a9267143eb600449a8d59a0db0653740b1378067a6d0cee"
+            "00000000" // nLockTime
+        );
+    }
+}
+
+TEST(TWTHORChainSwap, SwapEthBnb) {
+    // prepare swap input
+    Proto::SwapInput input;
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(Proto::ETH);
+    *input.mutable_from_asset() = fromAsset;
+    input.set_from_address(Address1Eth);
+    Proto::Asset toAsset;
+    toAsset.set_chain(Proto::BNB);
+    toAsset.set_symbol("BNB");
+    toAsset.set_token_id("");
+    *input.mutable_to_asset() = toAsset;
+    input.set_to_address(Address1Bnb);
+    input.set_vault_address(VaultEth);
+    input.set_router_address(RouterEth);
+    input.set_from_amount("50000000000000000");
+    input.set_to_amount_limit("600003");
+
+    // serialize input
+    const auto inputData_ = input.SerializeAsString();
+    EXPECT_EQ(hex(inputData_), "0a020802122a3078623966353737316332373636346266323238326439386530396437663530636563376362303161371a0708031203424e42222a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372782a2a307831303931633444653661336346303943644130304162444165443432633763334236394338334543322a3078343241354564343536363530613039446331304542633633363141373438306644643631663237423a1135303030303030303030303030303030304206363030303033");
+    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+
+    // invoke swap
+    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
+    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+    EXPECT_EQ(outputData.size(), 141ul);
+    // parse result in proto
+    Proto::SwapOutput outputProto;
+    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+    EXPECT_EQ(outputProto.from_chain(), Proto::ETH);
+    EXPECT_EQ(outputProto.to_chain(), Proto::BNB);
+    EXPECT_EQ(outputProto.error().code(), 0);
+    EXPECT_EQ(outputProto.error().message(), "");
+    EXPECT_TRUE(outputProto.has_ethereum());
+    Ethereum::Proto::SigningInput txInput = outputProto.ethereum();
+
+    // sign tx input for signed full tx
+    // set few fields before signing
+    auto chainId = store(uint256_t(1));
+    txInput.set_chain_id(chainId.data(), chainId.size());
+    auto nonce = store(uint256_t(3));
+    txInput.set_nonce(nonce.data(), nonce.size());
+    auto gasPrice = store(uint256_t(30000000000));
+    txInput.set_gas_price(gasPrice.data(), gasPrice.size());
+    auto gasLimit = store(uint256_t(80000));
+    txInput.set_gas_limit(gasLimit.data(), gasLimit.size());
+    txInput.set_private_key("");
+    txInput.set_private_key(TestKey1Eth.data(), TestKey1Eth.size());
+
+    // sign and encode resulting input
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(txInput, TWCoinTypeEthereum);
+    EXPECT_EQ(hex(output.encoded()), "02f8a60103808083013880941091c4de6a3cf09cda00abdaed42c7c3b69c83ec87b1a2bc2ec50000b83b3d3a424e422e424e423a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372783a363030303033c080a00d605807f983650fafbfdcf0c33bdf0c524c7185eae8c1501ae24892faf16b1ba03b51b0a35e4754ab21d1e48fed635d8486048df50c253ba9af4cebdb6a92a450");
+}
+
+TEST(TWTHORChainSwap, SwapBnbBtc) {
+    // prepare swap input
+    Proto::SwapInput input;
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(Proto::BNB);
+    *input.mutable_from_asset() = fromAsset;
+    input.set_from_address(Address1Bnb);
+    Proto::Asset toAsset;
+    toAsset.set_chain(Proto::BTC);
+    toAsset.set_symbol("BTC");
+    toAsset.set_token_id("");
+    *input.mutable_to_asset() = toAsset;
+    input.set_to_address(Address1Btc);
+    input.set_vault_address(VaultBnb);
+    input.set_router_address("");
+    input.set_from_amount("10000000");
+    input.set_to_amount_limit("10000000");
+
+    // serialize input
+    const auto inputData_ = input.SerializeAsString();
+    EXPECT_EQ(hex(inputData_), "0a020803122a626e62317573343777646866783038636839377a6475656833783375356d757266727833306a656372781a0708011203425443222a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070382a2a626e62316e396573787577386361377473386c367736366b64683830307330396d7376756c36766c73653a08313030303030303042083130303030303030");
+    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+
+    // invoke swap
+    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
+    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+    EXPECT_EQ(outputData.size(), 146ul);
+    // parse result in proto
+    Proto::SwapOutput outputProto;
+    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+    EXPECT_EQ(outputProto.from_chain(), Proto::BNB);
+    EXPECT_EQ(outputProto.to_chain(), Proto::BTC);
+    EXPECT_EQ(outputProto.error().code(), 0);
+    EXPECT_EQ(outputProto.error().message(), "");
+    EXPECT_TRUE(outputProto.has_binance());
+    Binance::Proto::SigningInput txInput = outputProto.binance();
+
+    // set few fields before signing
+    txInput.set_chain_id("Binance-Chain-Tigris");
+    txInput.set_private_key(TestKey1Bnb.data(), TestKey1Bnb.size());
+
+    // sign and encode resulting input
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(txInput, TWCoinTypeBinance);
+    EXPECT_EQ(hex(output.encoded()), "fd01f0625dee0a4c2a2c87fa0a220a14e42be736e933cf8b97c26f33789a3ca6f8348cd1120a0a03424e421080ade20412220a1499730371c7c77cb81ffa76b566dcef7c1e5dc19c120a0a03424e421080ade204126a0a26eb5ae9872103ea4b4bc12dc6f36a28d2c9775e01eef44def32cc70fb54f0e4177b659dbc0e19124086d43e9bdf12508a9a1415f5f970dfa5ff5930dee01d922f99779b63190735ba1d69694bda203b6678939a5c1eab0a52ed32bb67864ec7864de37b333533ae0c1a3d3d3a4254432e4254433a62633171706a756c7433346b3973706a66796d38687373326a72776a676630786a6634307a65307070383a3130303030303030");
+}
+
+TEST(TWTHORChainSwap, SwapAtomBnb) {
+    // prepare swap input
+    Proto::SwapInput input;
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(Proto::ATOM);
+    fromAsset.set_symbol("ATOM");
+    *input.mutable_from_asset() = fromAsset;
+    input.set_from_address("cosmos1v4e6vpehwrfez2dqepnw9g6t4fl83xzegd5ac9");
+    Proto::Asset toAsset;
+    toAsset.set_chain(Proto::BNB);
+    toAsset.set_symbol("BNB");
+    *input.mutable_to_asset() = toAsset;
+    input.set_to_address("bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2");
+    input.set_vault_address("cosmos154t5ycejlr7ax3ynmed9z05yg5a27y9u6pj5hq");
+    input.set_from_amount("300000");
+    input.set_to_amount_limit("819391");
+    input.set_affiliate_fee_address("t");
+    input.set_affiliate_fee_rate_bp("0");
+
+    // serialize input
+    const auto inputData_ = input.SerializeAsString();
+    EXPECT_EQ(hex(inputData_), "0a080807120441544f4d122d636f736d6f73317634653676706568777266657a32647165706e773967367434666c3833787a656764356163391a0708031203424e42222a626e623173346b616c6c786e67707973707a6d366e72657a6b6d6c3972677977366b78707734666872322a2d636f736d6f7331353474357963656a6c7237617833796e6d6564397a303579673561323779397536706a3568713a0633303030303042063831393339314a0174520130");
+    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+
+    // invoke swap
+    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
+    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+    EXPECT_EQ(outputData.size(), 204ul);
+    // parse result in proto
+    Proto::SwapOutput outputProto;
+    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+    EXPECT_EQ(outputProto.from_chain(), Proto::ATOM);
+    EXPECT_EQ(outputProto.to_chain(), Proto::BNB);
+    EXPECT_EQ(outputProto.error().code(), 0);
+    EXPECT_EQ(outputProto.error().message(), "");
+    EXPECT_TRUE(outputProto.has_cosmos());
+    Cosmos::Proto::SigningInput txInput = outputProto.cosmos();
+
+    ASSERT_EQ(txInput.memo(), "=:BNB.BNB:bnb1s4kallxngpyspzm6nrezkml9rgyw6kxpw4fhr2:819391:t:0");
+    auto& fee = *txInput.mutable_fee();
+    fee.set_gas(200000);
+    auto& fee_amount = *fee.add_amounts();
+    fee_amount.set_denom("uatom");
+    fee_amount.set_amount("500");
+
+    txInput.set_account_number(1483163);
+    txInput.set_sequence(1);
+
+    auto privKey = parse_hex("3eed3f32b8ba90e579ba46f37e7445fb4b34558306aa5bc32c525a93dff486e7");
+    txInput.set_private_key(privKey.data(), privKey.size());
+
+    // sign and encode resulting input
+    Cosmos::Proto::SigningOutput output;
+    ANY_SIGN(txInput, TWCoinTypeCosmos);
+    EXPECT_EQ(output.error_message(), "");
+    ASSERT_EQ(output.serialized(), "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CtMBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczF2NGU2dnBlaHdyZmV6MmRxZXBudzlnNnQ0Zmw4M3h6ZWdkNWFjORItY29zbW9zMTU0dDV5Y2VqbHI3YXgzeW5tZWQ5ejA1eWc1YTI3eTl1NnBqNWhxGg8KBXVhdG9tEgYzMDAwMDASPz06Qk5CLkJOQjpibmIxczRrYWxseG5ncHlzcHptNm5yZXprbWw5cmd5dzZreHB3NGZocjI6ODE5MzkxOnQ6MBJmClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDmmNIYBvR9bnOloFEMOWdk9DHYIGe7naW0T19y+/k1SUSBAoCCAEYARISCgwKBXVhdG9tEgM1MDAQwJoMGkCFqUWtDu0pn1P/cnVQnIJIWF8HFJn/xkJh55Mc7ZLVPF60uXYUOg8nNkt0IQPuTFREw32/yff6lmA5w6KwPen/\"}");
+
+    // https://viewblock.io/thorchain/tx/07F47D71A74245538E205F24ADB4BBB799B49C3A8A8875665D249EA51662AA50
+    // https://www.mintscan.io/cosmos/txs/07F47D71A74245538E205F24ADB4BBB799B49C3A8A8875665D249EA51662AA50
+    // https://binance.mintscan.io/txs/2C97061737B16B234990B9B18A2BF65F7C7418FF9E39A68E634C832E4E4C59CE
+}
+
+TEST(TWTHORChainSwap, SwapRuneDoge) {
+    // prepare swap input
+    Proto::SwapInput input;
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(Proto::THOR);
+    fromAsset.set_symbol("RUNE");
+    *input.mutable_from_asset() = fromAsset;
+    input.set_from_address("thor14j5lwl8ulexrqp5x39kmkctv2937694z3jn2dz");
+    Proto::Asset toAsset;
+    toAsset.set_chain(Proto::DOGE);
+    toAsset.set_symbol("DOGE");
+    *input.mutable_to_asset() = toAsset;
+    input.set_to_address("DNhRF1h8J4ZnB1bxp9kaqhVLYetkx1nSJ5");
+    input.set_from_amount("150000000");
+    input.set_to_amount_limit("10000000");
+    input.set_affiliate_fee_address("tr");
+    input.set_affiliate_fee_rate_bp("0");
+
+    // serialize input
+    const auto inputData_ = input.SerializeAsString();
+    EXPECT_EQ(hex(inputData_), "0a06120452554e45122b74686f7231346a356c776c38756c6578727170357833396b6d6b637476323933373639347a336a6e32647a1a0808041204444f47452222444e6852463168384a345a6e4231627870396b617168564c5965746b78316e534a353a09313530303030303030420831303030303030304a027472520130");
+    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+
+    // invoke swap
+    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
+    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+    EXPECT_EQ(outputData.size(), 153ul);
+    // parse result in proto
+    Proto::SwapOutput outputProto;
+    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+    EXPECT_EQ(outputProto.from_chain(), Proto::THOR);
+    EXPECT_EQ(outputProto.to_chain(), Proto::DOGE);
+    EXPECT_EQ(outputProto.error().code(), 0);
+    EXPECT_EQ(outputProto.error().message(), "");
+    EXPECT_TRUE(outputProto.has_cosmos());
+    Cosmos::Proto::SigningInput txInput = outputProto.cosmos();
+
+    ASSERT_EQ(txInput.messages(0).thorchain_deposit_message().memo(), "=:DOGE.DOGE:DNhRF1h8J4ZnB1bxp9kaqhVLYetkx1nSJ5:10000000:tr:0");
+    auto& fee = *txInput.mutable_fee();
+    fee.set_gas(50000000);
+
+    txInput.set_account_number(75247);
+    txInput.set_sequence(8);
+
+    auto privKey = parse_hex("2659e41d54ebd449d68b9d58510d8eeeb837ee00d6ecc760b7a731238d8c3113");
+    txInput.set_private_key(privKey.data(), privKey.size());
+
+    // sign and encode resulting input
+    Cosmos::Proto::SigningOutput output;
+    ANY_SIGN(txInput, TWCoinTypeCosmos);
+    EXPECT_EQ(output.error_message(), "");
+    ASSERT_EQ(output.serialized(), "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"Co0BCooBChEvdHlwZXMuTXNnRGVwb3NpdBJ1Ch8KEgoEVEhPUhIEUlVORRoEUlVORRIJMTUwMDAwMDAwEjw9OkRPR0UuRE9HRTpETmhSRjFoOEo0Wm5CMWJ4cDlrYXFoVkxZZXRreDFuU0o1OjEwMDAwMDAwOnRyOjAaFKyp93z8/kwwBoaJbbthbFFj7RaiElkKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQO5lUOUgVbcO1IQFrppQEnQOtAeVD7aDuUi3l6QAzblKRIECgIIARgIEgUQgOHrFxpABOMrkMdq0FFNUEvjE7DDFpDW3EudV2qPhNCD4FrYtHsiBjMefdBaN8Ddp2Fucqs6OMkoXBEoW/u1msDqnvaXdA==\"}");
+
+    // https://viewblock.io/thorchain/tx/29C8B558051A0E0B1F44E4FFED034EDD204A7249A824DCE06C72C28D6114B5E3
+    // https://dogechain.info/tx/905ce02ec3397d6d4f2cbe63ebbff2ccf8b9f16d7ea136319be5ed543cdb66f3
+}
+
+TEST(TWTHORChainSwap, SwapRuneBnbStreamParams) {
+    // prepare swap input
+    Proto::SwapInput input;
+    Proto::Asset fromAsset;
+    fromAsset.set_chain(Proto::THOR);
+    fromAsset.set_symbol("RUNE");
+    *input.mutable_from_asset() = fromAsset;
+    input.set_from_address("thor157vzvw2chydgf8g4qu2cqhlsyhq0mydutmd0p7");
+    Proto::Asset toAsset;
+    toAsset.set_chain(Proto::BNB);
+    toAsset.set_symbol("BNB");
+    *input.mutable_to_asset() = toAsset;
+    input.set_to_address("bnb1swlv73yc6rc7z4n244gcpjknqh22m7kpjpr0mw");
+    input.set_from_amount("170000000");
+    // Don't set `toAmountLimit`, should be 0 by default.
+    auto* streamParams = input.mutable_stream_params();
+    streamParams->set_interval("1");
+    streamParams->set_quantity("0");
+    input.set_affiliate_fee_address("tr");
+    input.set_affiliate_fee_rate_bp("0");
+
+    // serialize input
+    const auto inputData_ = input.SerializeAsString();
+    EXPECT_EQ(hex(inputData_), "0a06120452554e45122b74686f72313537767a7677326368796467663867347175326371686c73796871306d796475746d643070371a0708031203424e42222a626e623173776c7637337963367263377a346e3234346763706a6b6e716832326d376b706a7072306d773a093137303030303030304a0274725201306a060a0131120130");
+    const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+
+    // invoke swap
+    const auto outputTWData_ = WRAPD(TWTHORChainSwapBuildSwap(inputTWData_.get()));
+    const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+    EXPECT_EQ(outputData.size(), 156ul);
+    // parse result in proto
+    Proto::SwapOutput outputProto;
+    EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+    EXPECT_EQ(outputProto.from_chain(), Proto::THOR);
+    EXPECT_EQ(outputProto.to_chain(), Proto::BNB);
+    EXPECT_EQ(outputProto.error().code(), 0);
+    EXPECT_EQ(outputProto.error().message(), "");
+    EXPECT_TRUE(outputProto.has_cosmos());
+    Cosmos::Proto::SigningInput txInput = outputProto.cosmos();
+
+    ASSERT_EQ(txInput.messages(0).thorchain_deposit_message().memo(), "=:BNB.BNB:bnb1swlv73yc6rc7z4n244gcpjknqh22m7kpjpr0mw:0/1/0:tr:0");
+    auto& fee = *txInput.mutable_fee();
+    fee.set_gas(50000000);
+
+    txInput.set_account_number(76456);
+    txInput.set_sequence(0);
+
+    auto privKey = parse_hex("15f9be0e6c80949f3dbe24fd9614027869af1e41953a86fdced947b0b1f3efa7");
+    txInput.set_private_key(privKey.data(), privKey.size());
+
+    // sign and encode resulting input
+    Cosmos::Proto::SigningOutput output;
+    ANY_SIGN(txInput, TWCoinTypeCosmos);
+    EXPECT_EQ(output.error_message(), "");
+    ASSERT_EQ(output.serialized(), "{\"mode\":\"BROADCAST_MODE_BLOCK\",\"tx_bytes\":\"CpABCo0BChEvdHlwZXMuTXNnRGVwb3NpdBJ4Ch8KEgoEVEhPUhIEUlVORRoEUlVORRIJMTcwMDAwMDAwEj89OkJOQi5CTkI6Ym5iMXN3bHY3M3ljNnJjN3o0bjI0NGdjcGprbnFoMjJtN2twanByMG13OjAvMS8wOnRyOjAaFKeYJjlYuRqEnRUHFYBf8CXA/ZG8ElcKTgpGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQNWwhqmW30kANTyAfdGJPa9BfZlI3xkAjqLWmhynukWThIECgIIARIFEIDh6xcaQNzvOBmgAgRriO5lsEgU4o58Gxu4mA71XZNyf5XXWBo5L9HkaJiDXE/YOlWPFj7iy86vDXVR1798pmc3n5EbkQ0=\"}");
+
+    // https://viewblock.io/thorchain/tx/317443DD48DDEE8811D0DCCC2FCA397F8E93DA0AC9C1D5173CB42E69CD0E01B0
+    // https://explorer.bnbchain.org/tx/6DE7B60C71F9FC3EEE914AAD8FE80D1A53A2EC59BE759A1C111C1B6C194740D2
+}
+
+TEST(TWTHORChainSwap, NegativeInvalidInput) {
+    const auto inputData = parse_hex("00112233");
+    const auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));
+
+    const auto outputTWData = WRAPD(TWTHORChainSwapBuildSwap(inputTWData.get()));
+    const auto outputData = data(TWDataBytes(outputTWData.get()), TWDataSize(outputTWData.get()));
+    EXPECT_EQ(outputData.size(), 39ul);
+    EXPECT_EQ(hex(outputData), "1a2508021221436f756c64206e6f7420646573657269616c697a6520696e7075742070726f746f");
+    EXPECT_EQ(hex(data(std::string("Could not deserialize input proto"))), "436f756c64206e6f7420646573657269616c697a6520696e7075742070726f746f");
+}
+// clang-format on
+
+} // namespace TW::ThorChainSwap::tests
diff --git a/tests/chains/Cosmos/TWAnyAddressTests.cpp b/tests/chains/Cosmos/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..6f520edca1b
--- /dev/null
+++ b/tests/chains/Cosmos/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gAtomAddr = "cosmos1mry47pkga5tdswtluy0m8teslpalkdq07pswu4";
+static const std::string gAtomHrp = "cosmos";
+
+TEST(TWAtomAnyAddress, AllAtomAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gAtomHrp, .coinType = TWCoinTypeCosmos, .address = gAtomAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/TWAnySignerTests.cpp b/tests/chains/Cosmos/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..2ecc82de1aa
--- /dev/null
+++ b/tests/chains/Cosmos/TWAnySignerTests.cpp
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Cosmos/Address.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWAnySignerCosmos, SignTx) {
+    auto privateKey = parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af");
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(546179);
+    input.set_chain_id("cosmoshub-4");
+    input.set_memo("");
+    input.set_sequence(0);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Address fromAddress;
+    EXPECT_TRUE(Address::decode("cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx", fromAddress));
+    Address toAddress;
+    EXPECT_TRUE(Address::decode("cosmos18s0hdnsllgcclweu9aymw4ngktr2k0rkygdzdp", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("uatom");
+    amountOfTx->set_amount("400000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uatom");
+    amountOfFee->set_amount("1000");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeCosmos);
+
+    // https://www.mintscan.io/cosmos/txs/85392373F54577562067030BF0D61596C91188AA5E6CA8FFE731BD0349296411
+    // curl -H 'Content-Type: application/json' --data-binary '{"tx_bytes": "CpIBC...JXoCX", "mode": "BROADCAST_MODE_BLOCK"}' https://api.cosmos.network/cosmos/tx/v1beta1/txs
+    assertJSONEqual(output.serialized(), "{\"tx_bytes\": \"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseBItY29zbW9zMThzMGhkbnNsbGdjY2x3ZXU5YXltdzRuZ2t0cjJrMHJreWdkemRwGg8KBXVhdG9tEgY0MDAwMDASZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJEgQKAggBEhMKDQoFdWF0b20SBDEwMDAQwJoMGkCvvVE6d29P30cO9/lnXyGunWMPxNY12NuqDcCnFkNM0H4CUQdl1Gc9+ogIJbro5nyzZzlv9rl2/GsZox/JXoCX\", \"mode\": \"BROADCAST_MODE_BLOCK\"}");
+    EXPECT_EQ(hex(output.signature()), "afbd513a776f4fdf470ef7f9675f21ae9d630fc4d635d8dbaa0dc0a716434cd07e02510765d4673dfa880825bae8e67cb367396ff6b976fc6b19a31fc95e8097");
+    EXPECT_EQ(output.json(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(TWAnySignerCosmos, SignJSON) {
+    auto json = STRING(R"({"accountNumber":"8733","chainId":"cosmoshub-2","fee":{"amounts":[{"denom":"uatom","amount":"5000"}],"gas":"200000"}, "memo":"Testing", "messages":[{"sendCoinsMessage":{"fromAddress":"cosmos1ufwv9ymhqaal6xz47n0jhzm2wf4empfqvjy575","toAddress":"cosmos135qla4294zxarqhhgxsx0sw56yssa3z0f78pm0","amounts":[{"denom":"uatom","amount":"995000"}]}}]})");
+    auto key = DATA("c9b0a273831931aa4a5f8d1a570d5021dda91d3319bd3819becdaabfb7b44e3b");
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeCosmos));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeCosmos));
+    assertStringsEqual(result, R"({"mode":"block","tx":{"fee":{"amount":[{"amount":"5000","denom":"uatom"}],"gas":"200000"},"memo":"Testing","msg":[{"type":"cosmos-sdk/MsgSend","value":{"amount":[{"amount":"995000","denom":"uatom"}],"from_address":"cosmos1ufwv9ymhqaal6xz47n0jhzm2wf4empfqvjy575","to_address":"cosmos135qla4294zxarqhhgxsx0sw56yssa3z0f78pm0"}}],"signatures":[{"pub_key":{"type":"tendermint/PubKeySecp256k1","value":"A6EsukEXB53GhohQVeDpxtkeH8KQIayd/Co/ApYRYkTm"},"signature":"ULEpUqNzoAnYEx2x22F3ANAiPXquAU9+mqLWoAA/ZOUGTMsdb6vryzsW6AKX2Kqj1pGNdrTcQ58Z09JPyjpgEA=="}]}})");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/TWCoinTypeTests.cpp b/tests/chains/Cosmos/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..01cbdd3c12b
--- /dev/null
+++ b/tests/chains/Cosmos/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWCosmosCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCosmos));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("541FA06FB37AC1BF61922143783DD76FECA361830F9876D0342536EE8A87A790"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCosmos, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("cosmos1gu6y2a0ffteesyeyeesk23082c6998xyzmt9mz"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCosmos, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCosmos));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCosmos));
+    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeCosmos));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCosmos), 6);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeCosmos));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeCosmos));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeCosmos));
+    assertStringsEqual(chainId, "cosmoshub-4");
+    assertStringsEqual(symbol, "ATOM");
+    assertStringsEqual(txUrl, "https://mintscan.io/cosmos/txs/541FA06FB37AC1BF61922143783DD76FECA361830F9876D0342536EE8A87A790");
+    assertStringsEqual(accUrl, "https://mintscan.io/cosmos/account/cosmos1gu6y2a0ffteesyeyeesk23082c6998xyzmt9mz");
+    assertStringsEqual(id, "cosmos");
+    assertStringsEqual(name, "Cosmos Hub");
+}
diff --git a/tests/chains/Cosmos/Terra/SignerTests.cpp b/tests/chains/Cosmos/Terra/SignerTests.cpp
new file mode 100644
index 00000000000..0b8bb3f92a3
--- /dev/null
+++ b/tests/chains/Cosmos/Terra/SignerTests.cpp
@@ -0,0 +1,433 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Base64.h"
+#include "proto/Cosmos.pb.h"
+#include "Cosmos/Address.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include "TrustWalletCore/TWAnySigner.h"
+
+#include <gtest/gtest.h>
+#include <google/protobuf/util/json_util.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TerraClassicSigner, SignSendTx) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::JSON);
+    input.set_account_number(1037);
+    input.set_chain_id("columbus-5");
+    input.set_memo("");
+    input.set_sequence(2);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("luna");
+    amountOfTx->set_amount("1000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("luna");
+    amountOfFee->set_amount("200");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+    EXPECT_EQ(json, R"({"accountNumber":"1037","chainId":"columbus-5","fee":{"amounts":[{"denom":"luna","amount":"200"}],"gas":"200000"},"sequence":"2","messages":[{"sendCoinsMessage":{"fromAddress":"terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2","toAddress":"terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf","amounts":[{"denom":"luna","amount":"1000000"}]}}]})");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerra);
+
+    assertJSONEqual(output.json(), R"(
+        {
+            "mode": "block",
+            "tx": {
+                "fee": {
+                    "amount": [
+                        {
+                            "amount": "200",
+                            "denom": "luna"
+                        }
+                    ],
+                    "gas": "200000"
+                },
+                "memo": "",
+                "msg": [
+                    {
+                        "type": "cosmos-sdk/MsgSend",
+                        "value": {
+                            "amount": [
+                                {
+                                    "amount": "1000000",
+                                    "denom": "luna"
+                                }
+                            ],
+                            "from_address": "terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2",
+                            "to_address": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf"
+                        }
+                    }
+                ],
+                "signatures": [
+                    {
+                        "pub_key": {
+                            "type": "tendermint/PubKeySecp256k1",
+                            "value": "AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"
+                        },
+                        "signature": "ofdIsLJzkODcQwLG89eE2g4HOaUmfKPh/08t07ehKPUqRMl4rVonzo73mkOvqtrHWjdtB+6t6R8DGudPpb6bRg=="
+                    }
+                ]
+            }
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "a1f748b0b27390e0dc4302c6f3d784da0e0739a5267ca3e1ff4f2dd3b7a128f52a44c978ad5a27ce8ef79a43afaadac75a376d07eeade91f031ae74fa5be9b46");
+    EXPECT_EQ(output.serialized(), "");
+    EXPECT_EQ(output.error_message(), "");
+}
+
+TEST(TerraClassicSigner, SignWasmTransferTxProtobuf_9FF3F0) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(3407705);
+    input.set_chain_id("columbus-5");
+    input.set_memo("");
+    input.set_sequence(3);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
+    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76"; // ANC
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_terra_execute_contract_transfer_message();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    const auto amount = store(uint256_t(250000), 0);
+    message.set_amount(amount.data(), amount.size());
+    message.set_recipient_address(toAddress.string());
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("3000");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+    assertJSONEqual(json, R"(
+        {
+            "signingMode": "Protobuf",
+            "accountNumber": "3407705",
+            "chainId": "columbus-5",
+            "fee": {
+                "amounts": [
+                    {
+                        "denom": "uluna",
+                        "amount": "3000"
+                    }
+                ],
+                "gas": "200000"
+            },
+            "sequence": "3",
+            "messages": [
+                {
+                    "wasmTerraExecuteContractTransferMessage": {
+                        "senderAddress": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
+                        "contractAddress": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
+                        "amount": "A9CQ",
+                        "recipientAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp"
+                    }
+                }
+            ]
+        }
+    )");
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerra);
+
+    // https://finder.terra.money/mainnet/tx/9FF3F0A16879254C22EB90D8B4D6195467FE5014381FD36BD3C23CA6698FE94B
+    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "BROADCAST_MODE_BLOCK","tx_bytes": "CogCCo..wld8"})' https://<lcd-node-url>/cosmos/tx/v1beta1/txs
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "CucBCuQBCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBK5AQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2Glt7InRyYW5zZmVyIjp7ImFtb3VudCI6IjI1MDAwMCIsInJlY2lwaWVudCI6InRlcnJhMWpsZ2FxeTludm4yaGY1dDJzcmE5eWN6OHM3N3duZjlsMGttZ2NwIn19EmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQNwZjrHsPmJKW/rXOWfukpQ1+lOHOJW3/IlFFnKLNmsABIECgIIARgDEhMKDQoFdWx1bmESBDMwMDAQwJoMGkAaprIEMLPH2HmFdwFGoaipb2GIyhXt6ombz+WMnG2mORBI6gFt0M+IymYgzZz6w1SW52R922yafDnn7yXfutRw",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "1aa6b20430b3c7d87985770146a1a8a96f6188ca15edea899bcfe58c9c6da6391048ea016dd0cf88ca6620cd9cfac35496e7647ddb6c9a7c39e7ef25dfbad470");
+    EXPECT_EQ(output.json(), "");
+}
+
+TEST(TerraClassicSigner, SignWasmTransferTxJson_078E90) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::JSON);
+    input.set_account_number(3407705);
+    input.set_chain_id("columbus-5");
+    input.set_memo("");
+    input.set_sequence(2);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
+    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76"; // ANC
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_terra_execute_contract_transfer_message();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    const auto amount = store(250000);
+    message.set_amount(amount.data(), amount.size());
+    message.set_recipient_address(toAddress.string());
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("3000");
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerra);
+
+    // https://finder.terra.money/mainnet/tx/078E90458061611F6FD8B708882B55FF5C1FFB3FCE61322107A0A0DE39FC0F3E
+    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "block","tx":{...}}' https://<lcd-node-url>/txs
+    assertJSONEqual(output.json(), R"(
+        {
+            "mode": "block",
+            "tx":
+                {
+                    "fee": {"amount":[{"amount": "3000","denom": "uluna"}],"gas": "200000"},
+                    "memo": "",
+                    "msg":
+                        [
+                            {
+                                "type": "wasm/MsgExecuteContract",
+                                "value":
+                                    {
+                                        "sender": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
+                                        "contract": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
+                                        "execute_msg":
+                                            {
+                                                "transfer":
+                                                    {
+                                                        "amount": "250000",
+                                                        "recipient": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp"
+                                                    }
+                                            },
+                                        "coins": []
+                                    }
+                            }
+                        ],
+                    "signatures":
+                        [
+                            {
+                                "pub_key":
+                                    {
+                                        "type": "tendermint/PubKeySecp256k1",
+                                        "value": "A3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awA"
+                                    },
+                                "signature": "BjETdtbA97Wv1zvcsCV1tM+bdYKC8O3uGTk4mMRv6pBJB2y/Ds7qoS7s/zrkhYak1YChklQetHsI30XRXzGIkg=="
+                            }
+                        ]
+                }
+        })");
+    EXPECT_EQ(hex(output.signature()), "06311376d6c0f7b5afd73bdcb02575b4cf9b758282f0edee19393898c46fea9049076cbf0eceeaa12eecff3ae48586a4d580a192541eb47b08df45d15f318892");
+    EXPECT_EQ(output.serialized(), "");
+}
+
+TEST(TerraClassicSigner, SignWasmGeneric_EC4F85) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(3407705);
+    input.set_chain_id("columbus-5");
+    input.set_memo("");
+    input.set_sequence(7);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
+    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76"; // ANC
+    const auto txMessage = R"({"transfer": { "amount": "250000", "recipient": "terra1d7048csap4wzcv5zm7z6tdqem2agyp9647vdyj" } })";
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_terra_execute_contract_generic();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    message.set_execute_msg(txMessage);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("3000");
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerra);
+
+    // https://finder.terra.money/mainnet/tx/EC4F8532847E4D6AF016E6F6D3F027AE7FB6FF0B533C5132B01382D83B214A6F
+    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "BROADCAST_MODE_BLOCK","tx_bytes": "Cu4BC...iVt"})' https://<lcd-node-url>/cosmos/tx/v1beta1/txs
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "Cu4BCusBCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBLAAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2GmJ7InRyYW5zZmVyIjogeyAiYW1vdW50IjogIjI1MDAwMCIsICJyZWNpcGllbnQiOiAidGVycmExZDcwNDhjc2FwNHd6Y3Y1em03ejZ0ZHFlbTJhZ3lwOTY0N3ZkeWoiIH0gfRJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYBxITCg0KBXVsdW5hEgQzMDAwEMCaDBpAkPsS7xlSng2LMc9KiD1soN5NLaDcUh8I9okPmsdJN3le1B7yxRGNB4aQfhaRl/8Z0r5vitRT0AWuxDasd8wcFw==",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+
+    EXPECT_EQ(hex(output.signature()), "90fb12ef19529e0d8b31cf4a883d6ca0de4d2da0dc521f08f6890f9ac74937795ed41ef2c5118d0786907e169197ff19d2be6f8ad453d005aec436ac77cc1c17");
+    EXPECT_EQ(output.json(), "");
+}
+
+TEST(TerraClassicSigner, SignWasmGenericWithCoins_6651FC) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(3407705);
+    input.set_chain_id("columbus-5");
+    input.set_memo("");
+    input.set_sequence(9);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
+    const auto tokenContractAddress = "terra1sepfj7s0aeg5967uxnfk4thzlerrsktkpelm5s"; // ANC Market
+    const auto txMessage = R"({ "deposit_stable": {} })";
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_terra_execute_contract_generic();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    message.set_execute_msg(txMessage);
+
+    auto amount = message.add_coins();
+    amount->set_denom("uusd");
+    amount->set_amount("1000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(600000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("7000");
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerra);
+
+    // https://finder.terra.money/mainnet/tx/6651FCE0EE5C6D6ACB655CC49A6FD5E939FB082862854616EA0642475BCDD0C9
+    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "BROADCAST_MODE_BLOCK","tx_bytes": "CrIBCq8B.....0NWg=="})' https://<lcd-node-url>/cosmos/tx/v1beta1/txs
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "CrIBCq8BCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBKEAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMXNlcGZqN3MwYWVnNTk2N3V4bmZrNHRoemxlcnJza3RrcGVsbTVzGhh7ICJkZXBvc2l0X3N0YWJsZSI6IHt9IH0qDAoEdXVzZBIEMTAwMBJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYCRITCg0KBXVsdW5hEgQ3MDAwEMDPJBpAGyi7f1ioY8XV6pjFq1s86Om4++CIUnd3rLHif2iopCcYvX0mLkTlQ6NUERg8nWTYgXcj6fOTO/ptgPuAtv0NWg==",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+
+    EXPECT_EQ(hex(output.signature()), "1b28bb7f58a863c5d5ea98c5ab5b3ce8e9b8fbe088527777acb1e27f68a8a42718bd7d262e44e543a35411183c9d64d8817723e9f3933bfa6d80fb80b6fd0d5a");
+    EXPECT_EQ(output.json(), "");
+}
+
+TEST(TerraClassicSigner, SignWasmSendTxProtobuf) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(3407705);
+    input.set_chain_id("columbus-5");
+    input.set_memo("");
+    input.set_sequence(4);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
+    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76"; // ANC
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_terra_execute_contract_send_message();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    const auto amount = store(uint256_t(250000), 0);
+    message.set_amount(amount.data(), amount.size());
+    message.set_recipient_contract_address(toAddress.string());
+    const auto msgMsg = Base64::encode(data(std::string(R"({"some_message":{}})")));
+    EXPECT_EQ(msgMsg, "eyJzb21lX21lc3NhZ2UiOnt9fQ==");
+    message.set_msg(msgMsg);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("3000");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+    assertJSONEqual(json, R"(
+        {
+            "signingMode": "Protobuf",
+            "accountNumber": "3407705",
+            "chainId": "columbus-5",
+            "fee": {
+                "amounts": [
+                    {
+                        "denom": "uluna",
+                        "amount": "3000"
+                    }
+                ],
+                "gas": "200000"
+            },
+            "sequence": "4",
+            "messages": [
+                {
+                    "wasmTerraExecuteContractSendMessage": {
+                        "senderAddress": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
+                        "contractAddress": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
+                        "amount": "A9CQ",
+                        "recipientContractAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp",
+                        "msg": "eyJzb21lX21lc3NhZ2UiOnt9fQ=="
+                    }
+                }
+            ]
+        }
+    )");
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerra);
+
+    // https://finder.terra.money/mainnet/tx/9FF3F0A16879254C22EB90D8B4D6195467FE5014381FD36BD3C23CA6698FE94B
+    // curl -H 'Content-Type: application/json' --data-binary '{"mode": "BROADCAST_MODE_BLOCK","tx_bytes": "CogCCo..wld8"})' https://<lcd-node-url>/cosmos/tx/v1beta1/txs
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "CocCCoQCCiYvdGVycmEud2FzbS52MWJldGExLk1zZ0V4ZWN1dGVDb250cmFjdBLZAQosdGVycmExOHd1a3A4NGRxMjI3d3U0bWdoMGptNm45bmxuajZyczgycHA5d2YSLHRlcnJhMTR6NTZsMGZwMmxzZjg2enkzaHR5Mno0N2V6a2hudGh0cjl5cTc2Gnt7InNlbmQiOnsiYW1vdW50IjoiMjUwMDAwIiwiY29udHJhY3QiOiJ0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcCIsIm1zZyI6ImV5SnpiMjFsWDIxbGMzTmhaMlVpT250OWZRPT0ifX0SZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awAEgQKAggBGAQSEwoNCgV1bHVuYRIEMzAwMBDAmgwaQL6NByKeRZsyq5g6CTMdmPqiM77nOe9uLO8FjpetFgkBFiG3Le7ieZZ+4vCMhD1bcFgMwSHibFI/uPil847U/+g=",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "be8d07229e459b32ab983a09331d98faa233bee739ef6e2cef058e97ad1609011621b72deee279967ee2f08c843d5b70580cc121e26c523fb8f8a5f38ed4ffe8");
+    EXPECT_EQ(output.json(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/Terra/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Terra/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..b564ac066b9
--- /dev/null
+++ b/tests/chains/Cosmos/Terra/TWCoinTypeTests.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWTerraCoinType, TWCoinTypeClassic) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTerra));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("D28D8AFC7CE89F2A22FA2DBF78D2C0A36E549BB830C4D9FA7459E3F723CA7182"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTerra, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("terra16t3gx5rqvz6ru37yzn3shuu20erv4ngmfr59zf"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTerra, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTerra));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTerra));
+    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeTerra));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTerra), 6);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeTerra));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTerra));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTerra));
+    assertStringsEqual(chainId, "columbus-5");
+    assertStringsEqual(symbol, "LUNC");
+    assertStringsEqual(txUrl, "https://finder.terra.money/classic/tx/D28D8AFC7CE89F2A22FA2DBF78D2C0A36E549BB830C4D9FA7459E3F723CA7182");
+    assertStringsEqual(accUrl, "https://finder.terra.money/classic/address/terra16t3gx5rqvz6ru37yzn3shuu20erv4ngmfr59zf");
+    assertStringsEqual(id, "terra");
+    assertStringsEqual(name, "Terra Classic");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/TerraV2/SignerTests.cpp b/tests/chains/Cosmos/TerraV2/SignerTests.cpp
new file mode 100644
index 00000000000..7e382641480
--- /dev/null
+++ b/tests/chains/Cosmos/TerraV2/SignerTests.cpp
@@ -0,0 +1,345 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Base64.h"
+#include "proto/Cosmos.pb.h"
+#include "Cosmos/Address.h"
+#include "uint256.h"
+#include "TrustWalletCore/TWAnySigner.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+#include <google/protobuf/util/json_util.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TerraSigner, SignSendTx) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(1037);
+    input.set_chain_id("phoenix-1");
+    input.set_memo("");
+    input.set_sequence(1);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("uluna");
+    amountOfTx->set_amount("1000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("30000");
+
+    {
+        std::string json;
+        google::protobuf::util::MessageToJsonString(input, &json);
+        assertJSONEqual(json, R"(
+            {
+                "signingMode": "Protobuf",
+                "accountNumber": "1037",
+                "chainId": "phoenix-1",
+                "fee": {
+                    "amounts": [
+                        {
+                            "denom": "uluna",
+                            "amount": "30000"
+                        }
+                    ],
+                    "gas": "200000"
+                },
+                "sequence": "1",
+                "messages": [
+                    {
+                        "sendCoinsMessage": {
+                            "fromAddress": "terra1hsk6jryyqjfhp5dhc55tc9jtckygx0ep37hdd2",
+                            "toAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp",
+                            "amounts": [
+                                {
+                                    "denom": "uluna",
+                                    "amount": "1000000"
+                                }
+                            ]
+                        }
+                    }
+                ]
+            }
+        )");
+    }
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerraV2);
+
+    // similar tx: https://finder.terra.money/mainnet/tx/fbbe73ad2f0db3a13911dc424f8a34370dc4b7e8b66687f536797e68ee200ece
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "CpEBCo4BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm4KLHRlcnJhMWhzazZqcnl5cWpmaHA1ZGhjNTV0YzlqdGNreWd4MGVwMzdoZGQyEix0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcBoQCgV1bHVuYRIHMTAwMDAwMBJoClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiECVyhuw/N9M1V7u6oACyd0SskCOqmWfK51oYHR/5H6ncUSBAoCCAEYARIUCg4KBXVsdW5hEgUzMDAwMBDAmgwaQPh0C3rjzdixIUiyPx3FlWAxzbKILNAcSRVeQnaTl1vsI5DEfYa2oYlUBLqyilcMCcU/iaJLhex30No2ak0Zn1Q=",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "f8740b7ae3cdd8b12148b23f1dc5956031cdb2882cd01c49155e427693975bec2390c47d86b6a1895404bab28a570c09c53f89a24b85ec77d0da366a4d199f54");
+    EXPECT_EQ(output.error_message(), "");
+    EXPECT_EQ(output.json(), "");
+}
+
+TEST(TerraSigner, SignWasmTransferTx) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(3407705);
+    input.set_chain_id("phoenix-1");
+    input.set_memo("");
+    input.set_sequence(3);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
+    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76";
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_execute_contract_transfer_message();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    const auto amount = store(uint256_t(250000), 0);
+    message.set_amount(amount.data(), amount.size());
+    message.set_recipient_address(toAddress.string());
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("3000");
+
+    {
+        std::string json;
+        google::protobuf::util::MessageToJsonString(input, &json);
+        assertJSONEqual(json, R"(
+            {
+                "signingMode": "Protobuf",
+                "accountNumber": "3407705",
+                "chainId": "phoenix-1",
+                "fee": {
+                    "amounts": [
+                        {
+                            "denom": "uluna",
+                            "amount": "3000"
+                        }
+                    ],
+                    "gas": "200000"
+                },
+                "sequence": "3",
+                "messages": [
+                    {
+                        "wasmExecuteContractTransferMessage": {
+                            "senderAddress": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
+                            "contractAddress": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
+                            "amount": "A9CQ",
+                            "recipientAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp"
+                        }
+                    }
+                ]
+            }
+        )");
+    }
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerraV2);
+
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "CuUBCuIBCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QSuQEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3NhpbeyJ0cmFuc2ZlciI6eyJhbW91bnQiOiIyNTAwMDAiLCJyZWNpcGllbnQiOiJ0ZXJyYTFqbGdhcXk5bnZuMmhmNXQyc3JhOXljejhzNzd3bmY5bDBrbWdjcCJ9fRJnClAKRgofL2Nvc21vcy5jcnlwdG8uc2VjcDI1NmsxLlB1YktleRIjCiEDcGY6x7D5iSlv61zln7pKUNfpThziVt/yJRRZyizZrAASBAoCCAEYAxITCg0KBXVsdW5hEgQzMDAwEMCaDBpAiBGbQaj+jsXE6/FssD3fC77QOxpli9GqsPea+KoNyMIEgVj89Hii+oU1bAEQS4qV0SaE2V6RNy24uCcFTIRbcQ==",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "88119b41a8fe8ec5c4ebf16cb03ddf0bbed03b1a658bd1aab0f79af8aa0dc8c2048158fcf478a2fa85356c01104b8a95d12684d95e91372db8b827054c845b71");
+    EXPECT_EQ(output.error_message(), "");
+    EXPECT_EQ(output.json(), "");
+}
+
+TEST(TerraSigner, SignWasmGeneric) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(3407705);
+    input.set_chain_id("phoenix-1");
+    input.set_memo("");
+    input.set_sequence(7);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76";
+    const auto txMessage = R"({"transfer": { "amount": "250000", "recipient": "terra1d7048csap4wzcv5zm7z6tdqem2agyp9647vdyj" } })";
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_execute_contract_generic();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    message.set_execute_msg(txMessage);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("3000");
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerraV2);
+
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "CuwBCukBCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QSwAEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3NhpieyJ0cmFuc2ZlciI6IHsgImFtb3VudCI6ICIyNTAwMDAiLCAicmVjaXBpZW50IjogInRlcnJhMWQ3MDQ4Y3NhcDR3emN2NXptN3o2dGRxZW0yYWd5cDk2NDd2ZHlqIiB9IH0SZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awAEgQKAggBGAcSEwoNCgV1bHVuYRIEMzAwMBDAmgwaQGlYzOoAu/PfyCTSTisGJVW9KWwifxMbCmzy2xwqNg+ZHQkDjVRyUBl7gmbXXLzdOMqtwF1CMauJhlGwmEdzhK4=",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+
+    EXPECT_EQ(hex(output.signature()), "6958ccea00bbf3dfc824d24e2b062555bd296c227f131b0a6cf2db1c2a360f991d09038d547250197b8266d75cbcdd38caadc05d4231ab898651b098477384ae");
+    EXPECT_EQ(output.error_message(), "");
+    EXPECT_EQ(output.json(), "");
+}
+
+TEST(TerraSigner, SignWasmGenericWithCoins) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(3407705);
+    input.set_chain_id("phoenix-1");
+    input.set_memo("");
+    input.set_sequence(9);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    const auto tokenContractAddress = "terra1sepfj7s0aeg5967uxnfk4thzlerrsktkpelm5s";
+    const auto txMessage = R"({ "deposit_stable": {} })";
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_execute_contract_generic();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    message.set_execute_msg(txMessage);
+
+    auto amount = message.add_coins();
+    amount->set_denom("uusd");
+    amount->set_amount("1000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(600000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("7000");
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerraV2);
+
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "CrABCq0BCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QShAEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTFzZXBmajdzMGFlZzU5Njd1eG5mazR0aHpsZXJyc2t0a3BlbG01cxoYeyAiZGVwb3NpdF9zdGFibGUiOiB7fSB9KgwKBHV1c2QSBDEwMDASZwpQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohA3BmOsew+Ykpb+tc5Z+6SlDX6U4c4lbf8iUUWcos2awAEgQKAggBGAkSEwoNCgV1bHVuYRIENzAwMBDAzyQaQEDA2foXegF+rslj6o8bX2HPJfn+q/6Ezbq2iAd0SFOTQqS8aAyywQkdZJRToXcaby1HOYL1WvmsMPgrFzChiY4=",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+
+    EXPECT_EQ(hex(output.signature()), "40c0d9fa177a017eaec963ea8f1b5f61cf25f9feabfe84cdbab688077448539342a4bc680cb2c1091d649453a1771a6f2d473982f55af9ac30f82b1730a1898e");
+    EXPECT_EQ(output.error_message(), "");
+    EXPECT_EQ(output.json(), "");
+}
+
+TEST(TerraSigner, SignWasmSendTx) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(3407705);
+    input.set_chain_id("phoenix-1");
+    input.set_memo("");
+    input.set_sequence(4);
+
+    Address fromAddress;
+    ASSERT_TRUE(Address::decode("terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf", fromAddress));
+    Address toAddress;
+    ASSERT_TRUE(Address::decode("terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp", toAddress));
+    const auto tokenContractAddress = "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76";
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_wasm_execute_contract_send_message();
+    message.set_sender_address(fromAddress.string());
+    message.set_contract_address(tokenContractAddress);
+    const auto amount = store(uint256_t(250000), 0);
+    message.set_amount(amount.data(), amount.size());
+    message.set_recipient_contract_address(toAddress.string());
+    const auto msgMsg = Base64::encode(data(std::string(R"({"some_message":{}})")));
+    EXPECT_EQ(msgMsg, "eyJzb21lX21lc3NhZ2UiOnt9fQ==");
+    message.set_msg(msgMsg);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uluna");
+    amountOfFee->set_amount("3000");
+
+    std::string json;
+    google::protobuf::util::MessageToJsonString(input, &json);
+    assertJSONEqual(json, R"(
+        {
+            "signingMode": "Protobuf",
+            "accountNumber": "3407705",
+            "chainId": "phoenix-1",
+            "fee": {
+                "amounts": [
+                    {
+                        "denom": "uluna",
+                        "amount": "3000"
+                    }
+                ],
+                "gas": "200000"
+            },
+            "sequence": "4",
+            "messages": [
+                {
+                    "wasmExecuteContractSendMessage": {
+                        "senderAddress": "terra18wukp84dq227wu4mgh0jm6n9nlnj6rs82pp9wf",
+                        "contractAddress": "terra14z56l0fp2lsf86zy3hty2z47ezkhnthtr9yq76",
+                        "amount": "A9CQ",
+                        "recipientContractAddress": "terra1jlgaqy9nvn2hf5t2sra9ycz8s77wnf9l0kmgcp",
+                        "msg": "eyJzb21lX21lc3NhZ2UiOnt9fQ=="
+                    }
+                }
+            ]
+        }
+    )");
+
+    auto privateKey = parse_hex("cf08ee8493e6f6a53f9721b9045576e80f371c0e36d08fdaf78b27a7afd8e616");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Cosmos::Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeTerraV2);
+
+    assertJSONEqual(output.serialized(), R"(
+        {
+            "tx_bytes": "CoUCCoICCiQvY29zbXdhc20ud2FzbS52MS5Nc2dFeGVjdXRlQ29udHJhY3QS2QEKLHRlcnJhMTh3dWtwODRkcTIyN3d1NG1naDBqbTZuOW5sbmo2cnM4MnBwOXdmEix0ZXJyYTE0ejU2bDBmcDJsc2Y4Nnp5M2h0eTJ6NDdlemtobnRodHI5eXE3Nhp7eyJzZW5kIjp7ImFtb3VudCI6IjI1MDAwMCIsImNvbnRyYWN0IjoidGVycmExamxnYXF5OW52bjJoZjV0MnNyYTl5Y3o4czc3d25mOWwwa21nY3AiLCJtc2ciOiJleUp6YjIxbFgyMWxjM05oWjJVaU9udDlmUT09In19EmcKUApGCh8vY29zbW9zLmNyeXB0by5zZWNwMjU2azEuUHViS2V5EiMKIQNwZjrHsPmJKW/rXOWfukpQ1+lOHOJW3/IlFFnKLNmsABIECgIIARgEEhMKDQoFdWx1bmESBDMwMDAQwJoMGkBKJbW1GDrv9j2FIckm7MtpDZzP2RjgDjU84oYmOHNHsxEBPLjtt3YAjsKWBCAsjbnbVoJ3s2XFG08nxQXS9xBK",
+            "mode": "BROADCAST_MODE_BLOCK"
+        }
+    )");
+    EXPECT_EQ(hex(output.signature()), "4a25b5b5183aeff63d8521c926eccb690d9ccfd918e00e353ce28626387347b311013cb8edb776008ec29604202c8db9db568277b365c51b4f27c505d2f7104a");
+    EXPECT_EQ(output.error_message(), "");
+    EXPECT_EQ(output.json(), "");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/TerraV2/TWCoinTypeTests.cpp b/tests/chains/Cosmos/TerraV2/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..a38f54b77e8
--- /dev/null
+++ b/tests/chains/Cosmos/TerraV2/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWTerraCoinType, TWCoinType20) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTerraV2));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("CFF732C6EBEE06FFA08ABE54EE1657FD53E90FAA81604619E2062C46572A6986"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTerraV2, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("terra16t3gx5rqvz6ru37yzn3shuu20erv4ngmfr59zf"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTerraV2, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTerraV2));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTerraV2));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTerraV2), 6);
+    ASSERT_EQ(TWBlockchainCosmos, TWCoinTypeBlockchain(TWCoinTypeTerraV2));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTerraV2));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTerraV2));
+    assertStringsEqual(symbol, "LUNA");
+    assertStringsEqual(txUrl, "https://finder.terra.money/mainnet/tx/CFF732C6EBEE06FFA08ABE54EE1657FD53E90FAA81604619E2062C46572A6986");
+    assertStringsEqual(accUrl, "https://finder.terra.money/mainnet/address/terra16t3gx5rqvz6ru37yzn3shuu20erv4ngmfr59zf");
+    assertStringsEqual(id, "terrav2");
+    assertStringsEqual(name, "Terra");
+}
+
+} // namespace TW::Cosmos::tests
+
diff --git a/tests/chains/Cosmos/Tia/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Tia/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..29c181f36b2
--- /dev/null
+++ b/tests/chains/Cosmos/Tia/TWAnyAddressTests.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gTiaAddr = "celestia1mry47pkga5tdswtluy0m8teslpalkdq00tp7xc";
+static const std::string gTiaHrp = "celestia";
+
+TEST(TWTiaAnyAddress, AllTiaAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gTiaHrp, .coinType = TWCoinTypeTia, .address = gTiaAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
+ 
\ No newline at end of file
diff --git a/tests/chains/Cosmos/Tia/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Tia/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..17f8d8d59a0
--- /dev/null
+++ b/tests/chains/Cosmos/Tia/TWCoinTypeTests.cpp
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+
+TEST(TWTiaCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeTia;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("FF370C65D8D67B8236F9D3A8D2B1256337C60C1965092CADD1FA970288FCE99B"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("celestia1tt4tv4jrs4twdtzwywxd8u65duxgk8y73wvfu2"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+    assertStringsEqual(id, "tia");
+    assertStringsEqual(name, "Celestia");
+    assertStringsEqual(symbol, "TIA");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "celestia");
+    assertStringsEqual(txUrl, "https://www.mintscan.io/celestia/txs/FF370C65D8D67B8236F9D3A8D2B1256337C60C1965092CADD1FA970288FCE99B");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/celestia/account/celestia1tt4tv4jrs4twdtzwywxd8u65duxgk8y73wvfu2");
+}
+
+} // namespace TW::Cosmos::tests
diff --git a/tests/chains/Cosmos/TransactionCompilerTests.cpp b/tests/chains/Cosmos/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..e55e966a13f
--- /dev/null
+++ b/tests/chains/Cosmos/TransactionCompilerTests.cpp
@@ -0,0 +1,179 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Cosmos.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(CosmosCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeCosmos;
+    TW::Cosmos::Proto::SigningInput input;
+
+    PrivateKey privateKey =
+        PrivateKey(parse_hex("8bbec3772ddb4df68f3186440380c301af116d1422001c1877d6f5e4dba8c8af"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    /// Step 1: Prepare transaction input (protobuf)
+    input.set_account_number(546179);
+    input.set_chain_id("cosmoshub-4");
+    input.set_memo("");
+    input.set_sequence(0);
+
+    PublicKey publicKey = privateKey.getPublicKey(TWCoinTypePublicKeyType(coin));
+    const auto pubKeyBz = publicKey.bytes;
+    input.set_public_key(pubKeyBz.data(), pubKeyBz.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address("cosmos1mky69cn8ektwy0845vec9upsdphktxt03gkwlx");
+    message.set_to_address("cosmos18s0hdnsllgcclweu9aymw4ngktr2k0rkygdzdp");
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("uatom");
+    amountOfTx->set_amount("400000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("uatom");
+    amountOfFee->set_amount("1000");
+
+    /// Step 2: Obtain protobuf preimage hash
+    input.set_signing_mode(TW::Cosmos::Proto::Protobuf);
+    auto protoInputString = input.SerializeAsString();
+    auto protoInputData = TW::Data(protoInputString.begin(), protoInputString.end());
+
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, protoInputData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    auto preImage = preSigningOutput.data();
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(
+        hex(preImage),
+        "0a92010a8f010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e64126f0a2d636f736d6f"
+        "73316d6b793639636e38656b74777930383435766563397570736470686b7478743033676b776c78122d636f73"
+        "6d6f733138733068646e736c6c6763636c7765753961796d77346e676b7472326b30726b7967647a64701a0f0a"
+        "057561746f6d120634303030303012650a4e0a460a1f2f636f736d6f732e63727970746f2e736563703235366b"
+        "312e5075624b657912230a2102ecef5ce437a302c67f95468de4b31f36e911f467d7e6a52b41c1e13e1d563649"
+        "12040a02080112130a0d0a057561746f6d12043130303010c09a0c1a0b636f736d6f736875622d342083ab21");
+    EXPECT_EQ(hex(preImageHash),
+              "fa7990e1814c900efaedf1bdbedba22c22336675befe0ae39974130fc204f3de");
+
+    auto expectedTx =
+        "7b226d6f6465223a2242524f4144434153545f4d4f44455f424c4f434b222c2274785f6279746573223a224370"
+        "4942436f3842436877765932397a6257397a4c6d4a68626d7375646a46695a5852684d53354e633264545a5735"
+        "6b456d384b4c574e7663323176637a467461336b324f574e754f475672644864354d4467304e585a6c597a6c31"
+        "63484e6b63476872644868304d444e6e61336473654249745932397a6257397a4d54687a4d47686b626e4e7362"
+        "47646a593278335a58553559586c74647a52755a327430636a4a724d484a726557646b656d52774767384b4258"
+        "566864473974456759304d4441774d4441535a51704f436b594b4879396a62334e7462334d7559334a35634852"
+        "764c6e4e6c593341794e545a724d53355164574a4c5a586b5349776f6841757a76584f51336f774c4766355647"
+        "6a65537a487a62704566526e312b616c4b30484234543464566a5a4a4567514b4167674245684d4b44516f4664"
+        "57463062323053424445774d444151774a6f4d476b437676564536643239503330634f392f6c6e587947756e57"
+        "4d50784e5931324e75714463436e466b4e4d304834435551646c314763392b6f67494a62726f356e797a5a7a6c"
+        "7639726c322f47735a6f782f4a586f4358227d";
+    Data signature;
+
+    {
+        TW::Cosmos::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+
+        assertJSONEqual(
+            output.serialized(),
+            "{\"tx_bytes\": "
+            "\"CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZl"
+            "Yzl1cHNkcGhrdHh0MDNna3dseBItY29zbW9zMThzMGhkbnNsbGdjY2x3ZXU5YXltdzRuZ2t0cjJrMHJreWdkemRwGg"
+            "8KBXVhdG9tEgY0MDAwMDASZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAuzvXOQ3owLG"
+            "f5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJEgQKAggBEhMKDQoFdWF0b20SBDEwMDAQwJoMGkCvvVE6d29P30cO9/"
+            "lnXyGunWMPxNY12NuqDcCnFkNM0H4CUQdl1Gc9+ogIJbro5nyzZzlv9rl2/GsZox/JXoCX\", \"mode\": "
+            "\"BROADCAST_MODE_BLOCK\"}");
+
+        signature = data(output.signature());
+        EXPECT_EQ(hex(signature),
+                  "afbd513a776f4fdf470ef7f9675f21ae9d630fc4d635d8dbaa0dc0a716434cd07e02510765d4673dfa88"
+                  "0825bae8e67cb367396ff6b976fc6b19a31fc95e8097");
+
+        ASSERT_TRUE(publicKey.verify(signature, data(preImageHash.data())));
+        EXPECT_EQ(hex(output.serialized()), expectedTx);
+    }
+
+    {
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, protoInputData, {signature}, {publicKey.bytes});
+        Cosmos::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        EXPECT_EQ(hex(output.serialized()), expectedTx);
+    }
+
+    { // Negative: not enough signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, protoInputData, {signature, signature}, {publicKey.bytes});
+        Cosmos::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.serialized().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, protoInputData, {}, {});
+        Cosmos::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.serialized().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+
+    /// Step 3: Obtain json preimage hash
+    input.set_signing_mode(TW::Cosmos::Proto::JSON);
+    auto jsonInputString = input.SerializeAsString();
+    auto jsonInputData = TW::Data(jsonInputString.begin(), jsonInputString.end());
+
+    const auto jsonPreImageHashData = TransactionCompiler::preImageHashes(coin, jsonInputData);
+    auto jsonPreSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(jsonPreSigningOutput.ParseFromArray(jsonPreImageHashData.data(),
+                                                    (int)jsonPreImageHashData.size()));
+    ASSERT_EQ(jsonPreSigningOutput.error(), 0);
+    auto jsonPreImage = jsonPreSigningOutput.data();
+    auto jsonPreImageHash = jsonPreSigningOutput.data_hash();
+    EXPECT_EQ(hex(jsonPreImage),
+              "7b226163636f756e745f6e756d626572223a22353436313739222c22636861696e5f6964223a22636f73"
+              "6d6f736875622d34222c22666565223a7b22616d6f756e74223a5b7b22616d6f756e74223a2231303030"
+              "222c2264656e6f6d223a227561746f6d227d5d2c22676173223a22323030303030227d2c226d656d6f22"
+              "3a22222c226d736773223a5b7b2274797065223a22636f736d6f732d73646b2f4d736753656e64222c22"
+              "76616c7565223a7b22616d6f756e74223a5b7b22616d6f756e74223a22343030303030222c2264656e6f"
+              "6d223a227561746f6d227d5d2c2266726f6d5f61646472657373223a22636f736d6f73316d6b79363963"
+              "6e38656b74777930383435766563397570736470686b7478743033676b776c78222c22746f5f61646472"
+              "657373223a22636f736d6f733138733068646e736c6c6763636c7765753961796d77346e676b7472326b"
+              "30726b7967647a6470227d7d5d2c2273657175656e6365223a2230227d");
+    EXPECT_EQ(hex(jsonPreImageHash),
+              "0a31f6cd50f1a5c514929ba68a977e222a7df2dc11e8470e93118cc3545e6b37");
+
+    signature = Base64::decode("tTyOrburrHEHa14qiw78e9StoZyyGmoku98IxYrWCmtN8Qo5mTeKa0BKKDfgG4LmmNdwYcrXtqQQ7F4dL3c26g==");
+
+    { // JSON
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, jsonInputData, {signature}, {publicKey.bytes});
+        Cosmos::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        EXPECT_EQ(hex(output.json()), "7b226d6f6465223a22626c6f636b222c227478223a7b22666565223a7b22616d6f756e74223a5b7b22616d6f756e74223a2231303030222c2264656e6f6d223a227561746f6d227d5d2c22676173223a22323030303030227d2c226d656d6f223a22222c226d7367223a5b7b2274797065223a22636f736d6f732d73646b2f4d736753656e64222c2276616c7565223a7b22616d6f756e74223a5b7b22616d6f756e74223a22343030303030222c2264656e6f6d223a227561746f6d227d5d2c2266726f6d5f61646472657373223a22636f736d6f73316d6b793639636e38656b74777930383435766563397570736470686b7478743033676b776c78222c22746f5f61646472657373223a22636f736d6f733138733068646e736c6c6763636c7765753961796d77346e676b7472326b30726b7967647a6470227d7d5d2c227369676e617475726573223a5b7b227075625f6b6579223a7b2274797065223a2274656e6465726d696e742f5075624b6579536563703235366b31222c2276616c7565223a2241757a76584f51336f774c47663556476a65537a487a62704566526e312b616c4b30484234543464566a5a4a227d2c227369676e6174757265223a227454794f72627572724845486131347169773738653953746f5a7979476d6f6b7539384978597257436d744e38516f356d54654b6130424b4b44666747344c6d6d4e64775963725874715151374634644c33633236673d3d227d5d7d7d");
+    }
+}
diff --git a/tests/chains/Cosmos/Umee/TWAnyAddressTests.cpp b/tests/chains/Cosmos/Umee/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..2e1ed50c9f3
--- /dev/null
+++ b/tests/chains/Cosmos/Umee/TWAnyAddressTests.cpp
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "../CosmosTestHelpers.h"
+
+namespace TW::Cosmos::tests {
+
+static const std::string gUmeeAddr = "umee1mry47pkga5tdswtluy0m8teslpalkdq0vhd3c8";
+static const std::string gUmeeHrp = "umee";
+
+TEST(TWUmeeAnyAddress, AllUmeeAddressTests) {
+    CosmosAddressParameters parameters{.hrp = gUmeeHrp, .coinType = TWCoinTypeUmee, .address = gUmeeAddr};
+    TestCosmosAddressParameters(parameters);
+}
+
+}
diff --git a/tests/chains/Cosmos/Umee/TWCoinTypeTests.cpp b/tests/chains/Cosmos/Umee/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..be9788b42c0
--- /dev/null
+++ b/tests/chains/Cosmos/Umee/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Cosmos::tests {
+    TEST(TWUmeeCoinType, TWCoinType) {
+        const auto coin = TWCoinTypeUmee;
+        const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+        const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+        const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+        const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+        const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("65B4B52C5F324F2287540847A114F645D89D544D99F793879FB3DBFF2CFEFC84"));
+        const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+        const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("umee16934q0qf4akw8qruy5y8v748rvtxxjckgsecq4"));
+        const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+        assertStringsEqual(id, "umee");
+        assertStringsEqual(name, "Umee");
+        assertStringsEqual(symbol, "UMEE");
+        ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 6);
+        ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+        ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+        ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+        assertStringsEqual(chainId, "umee-1");
+        assertStringsEqual(txUrl, "https://www.mintscan.io/umee/txs/65B4B52C5F324F2287540847A114F645D89D544D99F793879FB3DBFF2CFEFC84");
+        assertStringsEqual(accUrl, "https://www.mintscan.io/umee/account/umee16934q0qf4akw8qruy5y8v748rvtxxjckgsecq4");
+    }
+}
diff --git a/tests/chains/Cronos/TWAnyAddressTests.cpp b/tests/chains/Cronos/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..2e1c6a0dbdd
--- /dev/null
+++ b/tests/chains/Cronos/TWAnyAddressTests.cpp
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <gtest/gtest.h>
+
+TEST(CronosAnyAddress, Validate) {
+    auto string = STRING("0xEC49280228b0D05Aa8e8b756503254e1eE7835ab");
+
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeCronosChain));
+    
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "ec49280228b0d05aa8e8b756503254e1ee7835ab");    
+}
diff --git a/tests/chains/Cronos/TWCoinTypeTests.cpp b/tests/chains/Cronos/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..0b05cd3f785
--- /dev/null
+++ b/tests/chains/Cronos/TWCoinTypeTests.cpp
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWCronosCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeCronosChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x850131282053328ad569fa91200aa970cbed7d97b52951fe8b449cca3708789e"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeCronosChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x44eed2bb80b688a8778173c19fe11cd6876af15a"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeCronosChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeCronosChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeCronosChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeCronosChain), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeCronosChain));
+
+    assertStringsEqual(symbol, "CRO");
+    assertStringsEqual(txUrl, "https://cronoscan.com/tx/0x850131282053328ad569fa91200aa970cbed7d97b52951fe8b449cca3708789e");
+    assertStringsEqual(accUrl, "https://cronoscan.com/address/0x44eed2bb80b688a8778173c19fe11cd6876af15a");
+    assertStringsEqual(id, "cronos");
+    assertStringsEqual(name, "Cronos Chain");
+}
diff --git a/tests/chains/Dash/TWCoinTypeTests.cpp b/tests/chains/Dash/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6b6cab670eb
--- /dev/null
+++ b/tests/chains/Dash/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWDashCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeDash));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeDash, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeDash, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeDash));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeDash));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeDash), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeDash));
+    ASSERT_EQ(0x10, TWCoinTypeP2shPrefix(TWCoinTypeDash));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeDash));
+    assertStringsEqual(symbol, "DASH");
+    assertStringsEqual(txUrl, "https://blockchair.com/dash/transaction/t123");
+    assertStringsEqual(accUrl, "https://blockchair.com/dash/address/a12");
+    assertStringsEqual(id, "dash");
+    assertStringsEqual(name, "Dash");
+}
diff --git a/tests/chains/Dash/TWDashTests.cpp b/tests/chains/Dash/TWDashTests.cpp
new file mode 100644
index 00000000000..2130faba855
--- /dev/null
+++ b/tests/chains/Dash/TWDashTests.cpp
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWBitcoinScript.h>
+
+#include <gtest/gtest.h>
+
+TEST(Dash, LockScripts) {
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("XgkpWEFe59pX3aMhx6PrDawjNnoZKHeZbp").get(), TWCoinTypeDash));
+    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
+    assertHexEqual(scriptData, "76a91442914f5b70c61619eca5359df57d0b9bdcf8ccff88ac");
+
+    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("7eprxeVjKfVgS8p2RNsZ89K72YV61xg4gq").get(), TWCoinTypeDash));
+    auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
+    assertHexEqual(scriptData2, "a9148835ae54f297ad069552a1401e535dfe5f396f6187");
+}
diff --git a/tests/chains/Decred/AddressTests.cpp b/tests/chains/Decred/AddressTests.cpp
new file mode 100644
index 00000000000..51c855ce811
--- /dev/null
+++ b/tests/chains/Decred/AddressTests.cpp
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Decred/Address.h"
+
+#include "Coin.h"
+#include "HDWallet.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Decred::tests {
+
+TEST(DecredAddress, FromPublicKey) {
+    {
+        const auto publicKey = PublicKey(parse_hex("0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798"), TWPublicKeyTypeSECP256k1);
+        const auto address = Address(publicKey);
+        ASSERT_EQ(address.string(), "DsmcYVbP1Nmag2H4AS17UTvmWXmGeA7nLDx");
+    }
+    {
+        const auto privateKey = PrivateKey(parse_hex("a1269039e4ffdf43687852d7247a295f0b5bc55e6dda031cffaa3295ca0a9d7a"));
+        const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeED25519));
+        EXPECT_ANY_THROW(new Address(publicKey));
+    }
+}
+
+TEST(DecredAddress, Valid) {
+    ASSERT_TRUE(Address::isValid("DsmcYVbP1Nmag2H4AS17UTvmWXmGeA7nLDx"));
+    ASSERT_TRUE(Address::isValid("Dcur2mcGjmENx4DhNqDctW5wJCVyT3Qeqkx"));
+}
+
+TEST(DecredAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("rnBFvgZphmN39GWzUJeUitaP22Fr9be75H"));
+    ASSERT_FALSE(Address::isValid("t3gQDEavk5VzAAHK8TrQu2BWDLxEiF1unBm"));
+}
+
+TEST(DecredAddress, FromString) {
+    const auto string = "DsmcYVbP1Nmag2H4AS17UTvmWXmGeA7nLDx";
+    const auto address = Address(string);
+
+    ASSERT_EQ(address.string(), string);
+}
+
+TEST(DecredAddress, Derive) {
+    const auto mnemonic = "ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal";
+    const auto wallet = HDWallet(mnemonic, "");
+    const auto path = TW::derivationPath(TWCoinTypeDecred);
+    const auto address = TW::deriveAddress(TWCoinTypeDecred, wallet.getKey(TWCoinTypeDecred, path));
+    ASSERT_EQ(address, "DsVMHD5D86dpRnt2GPZvv4bYUJZg6B9Pzqa");
+}
+
+} // namespace TW::Decred::tests
diff --git a/tests/chains/Decred/SignerTests.cpp b/tests/chains/Decred/SignerTests.cpp
new file mode 100644
index 00000000000..e698910b17c
--- /dev/null
+++ b/tests/chains/Decred/SignerTests.cpp
@@ -0,0 +1,517 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Decred/Address.h"
+#include "Decred/Signer.h"
+#include "proto/Decred.pb.h"
+
+#include "Hash.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <Bitcoin/OpCodes.h>
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Decred::tests {
+
+// clang-format off
+TEST(DecredSigner, SignP2PKH) {
+    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
+
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+
+    // For this example, create a fake transaction that represents what would
+    // ordinarily be the real transaction that is being spent. It contains a
+    // single output that pays to address in the amount of 1 DCR.
+    auto originTx = Transaction();
+
+    auto txInOrigin = TransactionInput();
+    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
+    txInOrigin.valueIn = 100'000'000;
+    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
+    originTx.inputs.push_back(txInOrigin);
+
+    auto txOutOrigin = TransactionOutput();
+    txOutOrigin.value = 100'000'000;
+    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
+    originTx.outputs.push_back(txOutOrigin);
+
+    ASSERT_EQ(hex(originTx.hash()), "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a");
+
+
+    // Setup input
+    Bitcoin::Proto::SigningInput input;
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(100'000'000);
+    input.set_byte_fee(1);
+    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
+    input.add_private_key(utxoKey0.data(), utxoKey0.size());
+
+    auto utxo0 = input.add_utxo();
+    auto utxo0Script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
+    utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
+    utxo0->set_amount(100'000'000);
+    utxo0->mutable_out_point()->set_hash(originTx.hash().data(), originTx.hash().size());
+    utxo0->mutable_out_point()->set_index(0);
+
+
+	// Create the transaction to redeem the fake transaction.
+    auto redeemTx = Transaction();
+
+    auto txIn = TransactionInput();
+    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
+    txIn.valueIn = 100'000'000;
+    redeemTx.inputs.push_back(txIn);
+
+    auto txOut = TransactionOutput();
+    redeemTx.outputs.push_back(txOut);
+
+    auto plan = input.mutable_plan();
+    plan->set_amount(100'000'000);
+    plan->set_available_amount(100'000'000);
+    plan->set_fee(0);
+    plan->set_change(0);
+    auto utxop0 = plan->add_utxos();
+    *utxop0 = *utxo0;
+
+    // Sign
+    auto signer = Signer(std::move(input));
+    signer._transaction = redeemTx;
+    signer.txPlan.amount = 100'000'000;
+    const auto result = signer.sign();
+
+    ASSERT_TRUE(result);
+
+    const auto expectedSignature = "47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f0121"
+        "02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5";
+    EXPECT_EQ(hex(result.payload().inputs[0].script.bytes), expectedSignature);
+
+    const auto expectedEncoded =
+        "0100" // Serialize type
+        "0000" // Version
+        "01"   // Inputs
+            "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a" // Hash
+            "00000000" // Index
+            "00" // Tree
+            "ffffffff" // Sequence
+        "01"   // Outputs
+            "0000000000000000" // Value
+            "0000" // Version
+            "00" // Script
+        "00000000" // Lock time
+        "00000000" // Expiry
+        "01"
+            "00e1f50500000000" // Value
+            "00000000" // Block height
+            "ffffffff" // Block index
+            "6a47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f012102a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5";
+    auto encoded = Data();
+    result.payload().encode(encoded);
+    EXPECT_EQ(hex(encoded), expectedEncoded);
+}
+
+TEST(DecredSigner, SignP2PK) {
+    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
+
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+
+    // For this example, create a fake transaction that represents what would
+    // ordinarily be the real transaction that is being spent. It contains a
+    // single output that pays to address in the amount of 1 DCR.
+    auto originTx = Transaction();
+
+    auto txInOrigin = TransactionInput();
+    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
+    txInOrigin.valueIn = 100'000'000;
+    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
+    originTx.inputs.push_back(txInOrigin);
+
+    auto txOutOrigin = TransactionOutput();
+    txOutOrigin.value = 100'000'000;
+    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKey(publicKey.bytes);
+    originTx.outputs.push_back(txOutOrigin);
+
+    ASSERT_EQ(hex(originTx.hash()), "ac59d53c1eaf3fa41a47a9fca9d6b5b79857e7ef8cbe2556460e690e71eeb08b");
+
+    // Setup input
+    Bitcoin::Proto::SigningInput input;
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(100'000'000);
+    input.set_byte_fee(1);
+    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
+    input.add_private_key(utxoKey0.data(), utxoKey0.size());
+
+    auto utxo0 = input.add_utxo();
+    auto utxo0Script = Bitcoin::Script::buildPayToPublicKey(publicKey.bytes);
+    utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
+    utxo0->set_amount(100'000'000);
+    utxo0->mutable_out_point()->set_hash(originTx.hash().data(), originTx.hash().size());
+    utxo0->mutable_out_point()->set_index(0);
+
+	// Create the transaction to redeem the fake transaction.
+    auto redeemTx = Transaction();
+
+    auto txIn = TransactionInput();
+    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
+    txIn.valueIn = 100'000'000;
+    redeemTx.inputs.push_back(txIn);
+
+    auto txOut = TransactionOutput();
+    redeemTx.outputs.push_back(txOut);
+
+    auto plan = input.mutable_plan();
+    plan->set_amount(100'000'000);
+    plan->set_available_amount(100'000'000);
+    plan->set_fee(0);
+    plan->set_change(0);
+    auto utxop0 = plan->add_utxos();
+    *utxop0 = *utxo0;
+
+    // Sign
+    auto signer = Signer(std::move(input));
+    signer._transaction = redeemTx;
+    signer.txPlan.amount = 100'000'000;
+    const auto result = signer.sign();
+
+    ASSERT_TRUE(result);
+
+    const auto expectedSignature = "47304402202f9e6b7c849fc4ebcea8f544680f2652d24cede340b9370084d740e6483f44a60220582c9e70faa35fdf5af38a4268ef5564bbb527fb4e39303afba6ce71848a7b9301";
+    EXPECT_EQ(hex(result.payload().inputs[0].script.bytes), expectedSignature);
+
+    const auto expectedEncoded =
+        "0100000001ac59d53c1eaf3fa41a47a9fca9d6b5b79857e7ef8cbe2556460e690e71eeb08b0000000000ffffffff01000000000000000000000000000000000000000100e1f5050000000000000000ffffffff4847304402202f9e6b7c849fc4ebcea8f544680f2652d24cede340b9370084d740e6483f44a60220582c9e70faa35fdf5af38a4268ef5564bbb527fb4e39303afba6ce71848a7b9301";
+    auto encoded = Data();
+    result.payload().encode(encoded);
+    EXPECT_EQ(hex(encoded), expectedEncoded);
+}
+
+TEST(DecredSigner, SignP2SH) {
+    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
+
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+
+    // For this example, create a fake transaction that represents what would
+    // ordinarily be the real transaction that is being spent. It contains a
+    // single output that pays to address in the amount of 1 DCR.
+    auto originTx = Transaction();
+
+    auto txInOrigin = TransactionInput();
+    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
+    txInOrigin.valueIn = 100'000'000;
+    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
+    originTx.inputs.push_back(txInOrigin);
+
+    auto txOutOrigin = TransactionOutput();
+    txOutOrigin.value = 100'000'000;
+    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
+    originTx.outputs.push_back(txOutOrigin);
+
+    ASSERT_EQ(hex(originTx.hash()), "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a");
+
+
+    // Setup input
+    Bitcoin::Proto::SigningInput input;
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(100'000'000);
+    input.set_byte_fee(1);
+    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
+    input.add_private_key(utxoKey0.data(), utxoKey0.size());
+
+    auto redeemScript = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
+    auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
+    auto scriptString = std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
+    (*input.mutable_scripts())[hex(scriptHash)] = scriptString;
+
+    auto utxo0 = input.add_utxo();
+    auto utxo0Script = Bitcoin::Script::buildPayToScriptHash(scriptHash);
+    utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
+    utxo0->set_amount(100'000'000);
+    utxo0->mutable_out_point()->set_hash(originTx.hash().data(), originTx.hash().size());
+    utxo0->mutable_out_point()->set_index(0);
+
+    auto plan = input.mutable_plan();
+    plan->set_amount(100'000'000);
+    plan->set_available_amount(100'000'000);
+    plan->set_fee(0);
+    plan->set_change(0);
+    auto utxop0 = plan->add_utxos();
+    *utxop0 = *utxo0;
+
+	// Create the transaction to redeem the fake transaction.
+    auto redeemTx = Transaction();
+
+    auto txIn = TransactionInput();
+    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
+    txIn.valueIn = 100'000'000;
+    redeemTx.inputs.push_back(txIn);
+
+    auto txOut = TransactionOutput();
+    redeemTx.outputs.push_back(txOut);
+
+
+    // Sign
+    auto signer = Signer(std::move(input));
+    signer._transaction = redeemTx;
+    signer.txPlan.amount = 100'000'000;
+    const auto result = signer.sign();
+
+    ASSERT_TRUE(result);
+
+    const auto expectedSignature = "47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f012102a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf51976a914f5eba6730a4052ddeef0a93d93d24004f49db51e88ac1976a914f5eba6730a4052ddeef0a93d93d24004f49db51e88ac";
+    EXPECT_EQ(hex(result.payload().inputs[0].script.bytes), expectedSignature);
+
+    const auto expectedEncoded =
+        "0100" // Serialize type
+        "0000" // Version
+        "01"   // Inputs
+            "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a" // Hash
+            "00000000" // Index
+            "00" // Tree
+            "ffffffff" // Sequence
+        "01"   // Outputs
+            "0000000000000000" // Value
+            "0000" // Version
+            "00" // Script
+        "00000000" // Lock time
+        "00000000" // Expiry
+        "01"
+            "00e1f50500000000" // Value
+            "00000000" // Block height
+            "ffffffff" // Block index
+            "9e47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f012102a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf51976a914f5eba6730a4052ddeef0a93d93d24004f49db51e88ac1976a914f5eba6730a4052ddeef0a93d93d24004f49db51e88ac";
+    auto encoded = Data();
+    result.payload().encode(encoded);
+    EXPECT_EQ(hex(encoded), expectedEncoded);
+}
+
+TEST(DecredSigner, SignNegativeNoUtxo) {
+    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
+
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+    auto originTx = Transaction();
+
+    auto txInOrigin = TransactionInput();
+    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
+    txInOrigin.valueIn = 100'000'000;
+    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
+    originTx.inputs.push_back(txInOrigin);
+
+    auto txOutOrigin = TransactionOutput();
+    txOutOrigin.value = 100'000'000;
+    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
+    originTx.outputs.push_back(txOutOrigin);
+
+    ASSERT_EQ(hex(originTx.hash()), "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a");
+
+    // Setup input
+    Bitcoin::Proto::SigningInput input;
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(100'000'000);
+    input.set_byte_fee(1);
+    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
+    input.add_private_key(utxoKey0.data(), utxoKey0.size());
+
+	// Create the transaction to redeem the fake transaction.
+    auto redeemTx = Transaction();
+
+    auto txIn = TransactionInput();
+    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
+    txIn.valueIn = 100'000'000;
+    redeemTx.inputs.push_back(txIn);
+
+    auto txOut = TransactionOutput();
+    redeemTx.outputs.push_back(txOut);
+
+    // Sign
+    auto signer = Signer(std::move(input));
+    signer._transaction = redeemTx;
+    signer.txPlan.amount = 100'000'000;
+    const auto result = signer.sign();
+
+    // Fails as there are 0 utxos
+    ASSERT_FALSE(result);
+}
+
+TEST(DecredSigner, SignP2PKH_NoPlan) {
+    const auto privateKey = PrivateKey(parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    const auto keyhash = Hash::ripemd(Hash::blake256(publicKey.bytes));
+
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+
+    // For this example, create a fake transaction that represents what would
+    // ordinarily be the real transaction that is being spent. It contains a
+    // single output that pays to address in the amount of 1 DCR.
+    auto originTx = Transaction();
+
+    auto txInOrigin = TransactionInput();
+    txInOrigin.previousOutput = OutPoint(std::array<byte, 32>{}, UINT32_MAX, 0);
+    txInOrigin.valueIn = 150'000'000;
+    txInOrigin.script = Bitcoin::Script(Data{OP_0, OP_0});
+    originTx.inputs.push_back(txInOrigin);
+
+    auto txOutOrigin = TransactionOutput();
+    txOutOrigin.value = 100'000'000;
+    txOutOrigin.script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
+    originTx.outputs.push_back(txOutOrigin);
+
+    ASSERT_EQ(hex(originTx.hash()), "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a");
+
+
+    // Setup input
+    Bitcoin::Proto::SigningInput input;
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(100'000'000);
+    input.set_byte_fee(1);
+    input.set_to_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+    input.set_change_address("DsoPDLh462ULTy1QMSvBGLqGKQENerrdZDH");
+
+    auto utxoKey0 = parse_hex("22a47fa09a223f2aa079edf85a7c2d4f8720ee63e502ee2869afab7de234b80c");
+    input.add_private_key(utxoKey0.data(), utxoKey0.size());
+
+    auto utxo0 = input.add_utxo();
+    auto utxo0Script = Bitcoin::Script::buildPayToPublicKeyHash(keyhash);
+    utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
+    utxo0->set_amount(150'000'000);
+    utxo0->mutable_out_point()->set_hash(originTx.hash().data(), originTx.hash().size());
+    utxo0->mutable_out_point()->set_index(0);
+
+
+	// Create the transaction to redeem the fake transaction.
+    auto redeemTx = Transaction();
+
+    auto txIn = TransactionInput();
+    txIn.previousOutput = OutPoint(originTx.hash(), 0, 0);
+    txIn.valueIn = 100'000'000;
+    redeemTx.inputs.push_back(txIn);
+
+    auto txOut = TransactionOutput();
+    redeemTx.outputs.push_back(txOut);
+
+
+    // Sign
+    auto signer = Signer(std::move(input));
+    signer._transaction = redeemTx;
+    //signer.txPlan.utxos.push_back(*utxo0);
+    //signer.txPlan.amount = 100'000'000;
+    const auto result = signer.sign();
+
+    ASSERT_TRUE(result);
+    ASSERT_TRUE(result.payload().inputs.size() >= 1);
+
+    const auto expectedSignature = "47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f0121"
+        "02a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5";
+    EXPECT_EQ(hex(result.payload().inputs[0].script.bytes), expectedSignature);
+
+    const auto expectedEncoded =
+        "0100" // Serialize type
+        "0000" // Version
+        "01"   // Inputs
+            "0ff6ff7c6774a56ccc51598b11724c9c441cadc52978ddb5f08f3511a0cc777a" // Hash
+            "00000000" // Index
+            "00" // Tree
+            "ffffffff" // Sequence
+        "01"   // Outputs
+            "0000000000000000" // Value
+            "0000" // Version
+            "00" // Script
+        "00000000" // Lock time
+        "00000000" // Expiry
+        "01"
+            "00e1f50500000000" // Value
+            "00000000" // Block height
+            "ffffffff" // Block index
+            "6a47304402201ac7bdf56a9d12f3bc09cf7b47cdfafc1348628f659e37b455d497cb6e7a748802202b3630eedee1bbc9248424e4a1b8671e14631a069f36ac8860dee0bb9ea1541f012102a673638cb9587cb68ea08dbef685c6f2d2a751a8b3c6f2a7e9a4999e6e4bfaf5";
+    auto encoded = Data();
+    result.payload().encode(encoded);
+    EXPECT_EQ(hex(encoded), expectedEncoded);
+}
+
+TEST(DecredSigning, SignP2WPKH_NegativeAddressWrongType) {
+    auto hash0 = parse_hex("fff7f7881a8099afa6940d42d1e7f6362bec38171ea3edf433541db4e4ad969f");
+    auto hash1 = parse_hex("ef51e1b804cc89d182d279655c3aa89e815b1b309fe287d9b2b55d57b90ec68a");
+
+    // Setup input
+    Bitcoin::Proto::SigningInput input;
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(335'790'000);
+    input.set_byte_fee(1);
+    input.set_to_address("1Bp9U1ogV3A14FMvKbRJms7ctyso4Z4Tcx");
+    input.set_change_address("1FQc5LdgGHMHEN9nwkjmz6tWkxhPpxBvBU");
+
+    auto utxoKey0 = parse_hex("bbc27228ddcb9209d7fd6f36b02f7dfa6252af40bb2f1cbc7a557da8027ff866");
+    input.add_private_key(utxoKey0.data(), utxoKey0.size());
+
+    auto utxoKey1 = parse_hex("619c335025c7f4012e556c2a58b2506e30b8511b53ade95ea316fd8c3286feb9");
+    input.add_private_key(utxoKey1.data(), utxoKey1.size());
+
+    auto scriptPub1 = Bitcoin::Script(parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1"));
+    auto scriptHash = std::vector<uint8_t>();
+    scriptPub1.matchPayToWitnessPublicKeyHash(scriptHash);
+    auto scriptHashHex = hex(scriptHash);
+    ASSERT_EQ(scriptHashHex, "1d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
+
+    auto redeemScript = Bitcoin::Script::buildPayToPublicKeyHash(scriptHash);
+    auto scriptString = std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
+    (*input.mutable_scripts())[scriptHashHex] = scriptString;
+
+    auto utxo0 = input.add_utxo();
+    auto utxo0Script = parse_hex("2103c9f4836b9a4f77fc0d81f7bcb01b7f1b35916864b9476c241ce9fc198bd25432ac");
+    utxo0->set_script(utxo0Script.data(), utxo0Script.size());
+    utxo0->set_amount(625'000'000);
+    utxo0->mutable_out_point()->set_hash(hash0.data(), hash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    auto utxo1 = input.add_utxo();
+    auto utxo1Script = parse_hex("00141d0f172a0ecb48aee1be1f2687d2963ae33f71a1");
+    utxo1->set_script(utxo1Script.data(), utxo1Script.size());
+    utxo1->set_amount(600'000'000);
+    utxo1->mutable_out_point()->set_hash(hash1.data(), hash1.size());
+    utxo1->mutable_out_point()->set_index(1);
+    utxo1->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    // Sign
+    auto result = Signer::sign(std::move(input));
+    ASSERT_NE(result.error(), Common::Proto::OK);
+
+    // PreImageHashes
+    auto preResult = Signer::preImageHashes(std::move(input));
+    ASSERT_NE(preResult.error(), Common::Proto::OK);
+}
+// clang-format on
+
+} // namespace TW::Decred::tests
diff --git a/tests/chains/Decred/TWAnySignerTests.cpp b/tests/chains/Decred/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..faafc923616
--- /dev/null
+++ b/tests/chains/Decred/TWAnySignerTests.cpp
@@ -0,0 +1,112 @@
+
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include "HexCoding.h"
+#include "proto/Bitcoin.pb.h"
+#include "proto/Decred.pb.h"
+#include <TrustWalletCore/TWBitcoinScript.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+
+namespace TW::Decred {
+
+Bitcoin::Proto::SigningInput createInput() {
+    const int64_t utxoValue = 39900000;
+    const int64_t amount = 10000000;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address("Dsesp1V6DZDEtcq2behmBVKdYqKMdkh96hL");
+    input.set_change_address("DsUoWCAxprdGNtKQqambFbTcSBgH1SHn9Gp");
+    input.set_coin_type(TWCoinTypeDecred);
+
+    auto& utxo = *input.add_utxo();
+
+    auto hash = parse_hex("fdbfe9dd703f306794a467f175be5bd9748a7925033ea1cf9889d7cf4dd11550");
+    auto script = parse_hex("76a914b75fdec70b2e731795dd123ab40f918bf099fee088ac");
+    auto utxoKey = parse_hex("ba005cd605d8a02e3d5dfd04234cef3a3ee4f76bfbad2722d1fb5af8e12e6764");
+
+    utxo.set_amount(utxoValue);
+    utxo.set_script(script.data(), script.size());
+    
+    auto& outpoint = *utxo.mutable_out_point();
+    outpoint.set_hash(hash.data(), hash.size());
+    outpoint.set_index(0);
+
+    input.add_private_key(utxoKey.data(), utxoKey.size());
+    return input;
+}
+
+TEST(TWAnySignerDecred, Signing) {
+    auto input = createInput();
+
+    const int64_t utxoValue = 39900000;
+    const int64_t amount = 10000000;
+    const int64_t fee = 100000;
+
+    auto& plan = *input.mutable_plan();
+    plan.set_amount(amount);
+    plan.set_available_amount(utxoValue);
+    plan.set_fee(fee);
+    plan.set_change(utxoValue - amount - fee);
+    auto& planUtxo = *plan.add_utxos();
+    planUtxo = input.utxo(0);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeDecred);
+
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    ASSERT_EQ(hex(output.encoded()), "0100000001fdbfe9dd703f306794a467f175be5bd9748a7925033ea1cf9889d7cf4dd1155000000000000000000002809698000000000000001976a914989b1aecabf1c24e213cc0f2d8a22ffee25dd4e188ac40b6c6010000000000001976a9142a194fc92e27fef9cc2b057bc9060c580cbb484888ac000000000000000001000000000000000000000000ffffffff6a47304402206ee887c9239e5fff0048674bdfff2a8cfbeec6cd4a3ccebcc12fac44b24cc5ac0220718f7c760818fde18bc5ba8457d43d5a145cc4cf13d2a5557cba9107e9f4558d0121026cc34b92cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b6");
+}
+
+TEST(TWAnySignerDecred, Plan) {
+    auto input = createInput();
+
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, TWCoinTypeDecred);
+
+    EXPECT_EQ(plan.amount(), 10000000);
+    EXPECT_EQ(plan.available_amount(), 39900000);
+    EXPECT_EQ(plan.fee(), 254);
+    EXPECT_EQ(plan.change(), 29899746);
+    EXPECT_EQ(plan.utxos_size(), 1);
+    EXPECT_EQ(plan.branch_id(), "");
+}
+
+TEST(TWAnySignerDecred, PlanAndSign) {
+    auto input = createInput();
+
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, TWCoinTypeDecred);
+
+    EXPECT_EQ(plan.amount(), 10000000);
+    EXPECT_EQ(plan.available_amount(), 39900000);
+    EXPECT_EQ(plan.fee(), 254);
+    EXPECT_EQ(plan.change(), 29899746);
+    EXPECT_EQ(plan.utxos_size(), 1);
+    EXPECT_EQ(plan.branch_id(), "");
+    
+    // copy over plan fields
+    *input.mutable_plan() = plan;
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeDecred);
+
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    ASSERT_EQ(output.encoded().size(), 251ul);
+    ASSERT_EQ(hex(output.encoded()), "0100000001fdbfe9dd703f306794a467f175be5bd9748a7925033ea1cf9889d7cf4dd1155000000000000000000002809698000000000000001976a914989b1aecabf1c24e213cc0f2d8a22ffee25dd4e188ace23bc8010000000000001976a9142a194fc92e27fef9cc2b057bc9060c580cbb484888ac000000000000000001000000000000000000000000ffffffff6a47304402203e6ee9e16d6bc36bb4242f7a4cac333a1c2a150ea16143412b88b721f6ae16bf02201019affdf815a5c22e4b0fb7e4685c4707094922d6a41354f9055d3bb0f26e630121026cc34b92cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b6");
+}
+
+TEST(TWAnySignerDecred, SupportsJSON) {
+    ASSERT_FALSE(TWAnySignerSupportsJSON(TWCoinTypeDecred));
+}
+
+} // namespace
diff --git a/tests/chains/Decred/TWCoinTypeTests.cpp b/tests/chains/Decred/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..2a385b663bc
--- /dev/null
+++ b/tests/chains/Decred/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWDecredCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeDecred));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeDecred, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeDecred, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeDecred));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeDecred));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeDecred), 8);
+    ASSERT_EQ(TWBlockchainDecred, TWCoinTypeBlockchain(TWCoinTypeDecred));
+    ASSERT_EQ(0x1a, TWCoinTypeP2shPrefix(TWCoinTypeDecred));
+    ASSERT_EQ(0x7, TWCoinTypeStaticPrefix(TWCoinTypeDecred));
+    assertStringsEqual(symbol, "DCR");
+    assertStringsEqual(txUrl, "https://dcrdata.decred.org/tx/t123");
+    assertStringsEqual(accUrl, "https://dcrdata.decred.org/address/a12");
+    assertStringsEqual(id, "decred");
+    assertStringsEqual(name, "Decred");
+}
diff --git a/tests/Decred/TWDecredTests.cpp b/tests/chains/Decred/TWDecredTests.cpp
similarity index 87%
rename from tests/Decred/TWDecredTests.cpp
rename to tests/chains/Decred/TWDecredTests.cpp
index 1b05944929b..647df8ed1e6 100644
--- a/tests/Decred/TWDecredTests.cpp
+++ b/tests/chains/Decred/TWDecredTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWHash.h>
 #include <TrustWalletCore/TWHDWallet.h>
diff --git a/tests/chains/Decred/TransactionCompilerTests.cpp b/tests/chains/Decred/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..23d49b69bf1
--- /dev/null
+++ b/tests/chains/Decred/TransactionCompilerTests.cpp
@@ -0,0 +1,161 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/Script.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+#include "proto/Decred.pb.h"
+
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Decred::tests {
+
+TEST(DecredCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeDecred;
+
+    const int64_t utxoValue = 39900000;
+    const int64_t amount = 10000000;
+    const int64_t fee = 100000;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address("Dsesp1V6DZDEtcq2behmBVKdYqKMdkh96hL");
+    input.set_change_address("DsUoWCAxprdGNtKQqambFbTcSBgH1SHn9Gp");
+    input.set_coin_type(coin);
+
+    auto& utxo = *input.add_utxo();
+
+    auto hash = parse_hex("fdbfe9dd703f306794a467f175be5bd9748a7925033ea1cf9889d7cf4dd11550");
+    auto script = parse_hex("76a914b75fdec70b2e731795dd123ab40f918bf099fee088ac");
+    auto utxoKey = parse_hex("ba005cd605d8a02e3d5dfd04234cef3a3ee4f76bfbad2722d1fb5af8e12e6764");
+
+    utxo.set_amount(utxoValue);
+    utxo.set_script(script.data(), script.size());
+
+    auto& outpoint = *utxo.mutable_out_point();
+    outpoint.set_hash(hash.data(), hash.size());
+    outpoint.set_index(0);
+
+    auto& plan = *input.mutable_plan();
+    plan.set_amount(amount);
+    plan.set_available_amount(utxoValue);
+    plan.set_fee(fee);
+    plan.set_change(utxoValue - amount - fee);
+    auto& planUtxo = *plan.add_utxos();
+    planUtxo = input.utxo(0);
+
+    // build preimage
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    ASSERT_EQ(preSigningOutput.hash_public_keys().size(), 1);
+
+    auto preImageHash = data(preSigningOutput.hash_public_keys()[0].data_hash());
+    EXPECT_EQ(hex(preImageHash),
+              "9e4305478d1a69ee5c89a2e234d1cf270798d447d5db983b8fc3c817afddec34");
+
+    // compile
+    auto publicKey = PrivateKey(utxoKey).getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto signature = parse_hex("304402206ee887c9239e5fff0048674bdfff2a8cfbeec6cd4a3ccebcc12fac44b24cc5ac0220718f7c760818fde18bc5ba8457d43d5a145cc4cf13d2a5557cba9107e9f4558d");
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKey.bytes});
+    Decred::Proto::SigningOutput signingOutput;
+    ASSERT_TRUE(signingOutput.ParseFromArray(outputData.data(), (int)outputData.size()));
+    ASSERT_EQ(hex(signingOutput.encoded()),
+              "0100000001fdbfe9dd703f306794a467f175be5bd9748a7925033ea1cf9889d7cf4dd1155000000000000000000002809698000000000000001976a914989b1aecabf1c24e213cc0f2d8a22ffee25dd4e188ac40b6c6010000000000001976a9142a194fc92e27fef9cc2b057bc9060c580cbb484888ac000000000000000001000000000000000000000000ffffffff6a47304402206ee887c9239e5fff0048674bdfff2a8cfbeec6cd4a3ccebcc12fac44b24cc5ac0220718f7c760818fde18bc5ba8457d43d5a145cc4cf13d2a5557cba9107e9f4558d0121026cc34b92cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b6");
+
+    {
+        input.add_private_key(utxoKey.data(), utxoKey.size());
+        Decred::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+        ASSERT_EQ(output.encoded(), signingOutput.encoded());
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, {publicKey.bytes});
+        Decred::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Decred::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+TEST(DecredCompiler, UtxoWithTree) {
+    const auto coin = TWCoinTypeDecred;
+
+    const int64_t utxoValue = 10000000;
+    const int64_t amount = 1000000;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address("Dcur2mcGjmENx4DhNqDctW5wJCVyT3Qeqkx");
+    input.set_change_address("DskhnpQqQVgoSuKeyM6Unn2CEbfaenbcJBT");
+    input.set_coin_type(coin);
+
+    auto& utxo = *input.add_utxo();
+ 
+    auto script = Bitcoin::Script::lockScriptForAddress("DskhnpQqQVgoSuKeyM6Unn2CEbfaenbcJBT", coin);
+    auto hash = parse_hex("3f7b77a111634faa107c539b0c7db54e2cdbddc0c979568034aaa1ef56d2db90");
+    std::reverse(hash.begin(), hash.end());
+    utxo.set_amount(utxoValue);
+    utxo.set_script(script.bytes.data(), script.bytes.size());
+
+    auto& outpoint = *utxo.mutable_out_point();
+    outpoint.set_hash(hash.data(), hash.size());
+    outpoint.set_index(0);
+    outpoint.set_sequence(UINT32_MAX);
+    outpoint.set_tree(1);
+
+    // build preimage
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    ASSERT_EQ(preSigningOutput.hash_public_keys().size(), 1);
+
+    auto preImageHash = data(preSigningOutput.hash_public_keys()[0].data_hash());
+    EXPECT_EQ(hex(preImageHash),
+              "cca7dcac2ac86f40037a51aeac7b6aaacf57e3304354449e140b698023b3fce7");
+}
+
+} // namespace TW::Decred::tests
\ No newline at end of file
diff --git a/tests/chains/Decred/TransactionTests.cpp b/tests/chains/Decred/TransactionTests.cpp
new file mode 100644
index 00000000000..30414251e4f
--- /dev/null
+++ b/tests/chains/Decred/TransactionTests.cpp
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/Script.h"
+#include "Decred/OutPoint.h"
+#include "Decred/Transaction.h"
+#include "Decred/TransactionInput.h"
+#include "Decred/TransactionOutput.h"
+#include "HexCoding.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+
+using namespace TW;
+using namespace TW::Decred;
+
+TEST(DecredTransaction, SignatureHash) {
+    Decred::Transaction transaction;
+
+    auto po0 = OutPoint(
+        parse_hex("5897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f"), 0, 0);
+    transaction.inputs.emplace_back(po0, Bitcoin::Script(), 4294967295);
+
+    auto po1 = OutPoint(
+        parse_hex("bf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c"), 18, 0);
+    transaction.inputs.emplace_back(po1, Bitcoin::Script(), 4294967295);
+
+    auto po2 = OutPoint(
+        parse_hex("22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc"), 1, 0);
+    transaction.inputs.emplace_back(po2, Bitcoin::Script(), 4294967295);
+
+    auto oscript0 =
+        Bitcoin::Script(parse_hex("76a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac"));
+    transaction.outputs.emplace_back(18000000, 0, oscript0);
+
+    auto oscript1 =
+        Bitcoin::Script(parse_hex("0x76a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac"));
+    transaction.outputs.emplace_back(400000000, 0, oscript1);
+
+    auto preOutScript =
+        Bitcoin::Script(parse_hex("a914f5916158e3e2c4551c1796708db8367207ed13bb87"));
+
+    // throw exception
+    EXPECT_EXCEPTION(transaction.computeSignatureHash(preOutScript, transaction.outputs.size(),
+                                                      TWBitcoinSigHashTypeSingle),
+                     "attempt to sign single input at index larger than the number of outputs");
+
+    // All
+    auto hash = transaction.computeSignatureHash(preOutScript, 1, TWBitcoinSigHashTypeAll);
+    EXPECT_EQ(hex(hash), "05b01b517f41112e279b1a9da89d7847a64e5143dba799d7355b1c6c97b4b397");
+
+    // AnyoneCanPay|Single
+    hash = transaction.computeSignatureHash(
+        preOutScript, 1,
+        TWBitcoinSigHashType(TWBitcoinSigHashTypeAnyoneCanPay | TWBitcoinSigHashTypeSingle));
+    EXPECT_EQ(hex(hash), "fa2a276cd2c4d9f56e05ccae6022ca8c201dccffda36b45c39a031711135bc58");
+
+    // AnyoneCanPay|None
+    hash = transaction.computeSignatureHash(
+        preOutScript, 1,
+        TWBitcoinSigHashType(TWBitcoinSigHashTypeAnyoneCanPay | TWBitcoinSigHashTypeNone));
+    EXPECT_EQ(hex(hash), "82338ab38b4d154c72de55c4700909ad97c0f9bb10d8858759d0c90acb220edb");
+
+    // All & noWitness
+    Data result;
+    transaction.serializeType = SerializeType::noWitness;
+    transaction.encode(result);
+    EXPECT_EQ(hex(result),
+              "01000100035897de6bd6027a475eadd57019d4e6872c396d0716c4875a5f1a6fcfdf385c1f0000000000"
+              "ffffffffbf829c6bcf84579331337659d31f89dfd138f7f7785802d5501c92333145ca7c1200000000ff"
+              "ffffff22a6f904655d53ae2ff70e701a0bbd90aa3975c0f40bfc6cc996a9049e31cdfc0100000000ffff"
+              "ffff0280a812010000000000001976a9141fc11f39be1729bf973a7ab6a615ca4729d6457488ac0084d7"
+              "170000000000001976a914f2d4db28cad6502226ee484ae24505c2885cb12d88ac0000000000000000");
+
+    // All & onlyWitness
+    result.clear();
+    transaction.serializeType = SerializeType::onlyWitness;
+    transaction.encode(result);
+    EXPECT_EQ(hex(result), "0100020003000000000000000000000000ffffffff00000000000000000000000000fff"
+                           "fffff00000000000000000000000000ffffffff00");
+}
\ No newline at end of file
diff --git a/tests/chains/DigiByte/TWCoinTypeTests.cpp b/tests/chains/DigiByte/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..af6949e5c34
--- /dev/null
+++ b/tests/chains/DigiByte/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWDigiByteCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeDigiByte));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeDigiByte, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeDigiByte, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeDigiByte));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeDigiByte));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeDigiByte), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeDigiByte));
+    ASSERT_EQ(0x3f, TWCoinTypeP2shPrefix(TWCoinTypeDigiByte));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeDigiByte));
+    assertStringsEqual(symbol, "DGB");
+    assertStringsEqual(txUrl, "https://digiexplorer.info/tx/t123");
+    assertStringsEqual(accUrl, "https://digiexplorer.info/address/a12");
+    assertStringsEqual(id, "digibyte");
+    assertStringsEqual(name, "DigiByte");
+}
diff --git a/tests/DigiByte/TWDigiByteTests.cpp b/tests/chains/DigiByte/TWDigiByteTests.cpp
similarity index 90%
rename from tests/DigiByte/TWDigiByteTests.cpp
rename to tests/chains/DigiByte/TWDigiByteTests.cpp
index 32ff866d846..fe907773a33 100644
--- a/tests/DigiByte/TWDigiByteTests.cpp
+++ b/tests/chains/DigiByte/TWDigiByteTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "Bitcoin/OutPoint.h"
 #include "Bitcoin/TransactionBuilder.h"
@@ -32,6 +30,7 @@ TEST(DigiByteTransaction, SignTransaction) {
     const int64_t fee = 1000;
 
     auto input = Bitcoin::Proto::SigningInput();
+    input.set_coin_type(TWCoinTypeDigiByte);
     input.set_hash_type(TWBitcoinSigHashTypeAll);
     input.set_amount(amount);
     input.set_byte_fee(1);
@@ -60,12 +59,12 @@ TEST(DigiByteTransaction, SignTransaction) {
     protoPlan = plan.proto();
 
     // Sign
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(Bitcoin::SigningInput(input));
+    auto result = Bitcoin::TransactionSigner<Bitcoin::Transaction, Bitcoin::TransactionBuilder>::sign(Bitcoin::SigningInput(input));
     auto signedTx = result.payload();
     ASSERT_TRUE(result);
 
     Data serialized;
-    signedTx.encode(serialized, Transaction::SegwitFormatMode::NonSegwit);
+    signedTx.encode(serialized, Bitcoin::Transaction::SegwitFormatMode::NonSegwit);
     ASSERT_EQ(
         hex(serialized),
         "01000000"
@@ -98,6 +97,7 @@ TEST(DigiByteTransaction, SignP2WPKH) {
     const int64_t amount = 2000000;
 
     Proto::SigningInput input;
+    input.set_coin_type(TWCoinTypeDigiByte);
     input.set_hash_type(TWBitcoinSigHashTypeAll);
     input.set_amount(amount);
     input.set_byte_fee(1);
@@ -108,7 +108,7 @@ TEST(DigiByteTransaction, SignP2WPKH) {
     input.add_private_key(utxoKey0.data(), utxoKey0.size());
 
     auto utxo0 = input.add_utxo();
-    auto utxo0Script = Script(parse_hex("00144b62694cfdd7bdac59cbed211288ccd5c0dabd02"));
+    auto utxo0Script = Bitcoin::Script(parse_hex("00144b62694cfdd7bdac59cbed211288ccd5c0dabd02"));
     utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
     utxo0->set_amount(utxo_amount);
     auto hash0 = parse_hex("80a16412a880d13b0c88929397a50341018da2e78b70b313062b4a496fea5940");
@@ -116,7 +116,7 @@ TEST(DigiByteTransaction, SignP2WPKH) {
     utxo0->mutable_out_point()->set_index(1);
     utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
 
-    auto result = TransactionSigner<Transaction, TransactionBuilder>::sign(input);
+    auto result = Bitcoin::TransactionSigner<Bitcoin::Transaction, Bitcoin::TransactionBuilder>::sign(input);
     ASSERT_TRUE(result) << std::to_string(result.error());
     auto signedTx = result.payload();
 
diff --git a/tests/chains/Dogecoin/TWCoinTypeTests.cpp b/tests/chains/Dogecoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..c08b7a08bdc
--- /dev/null
+++ b/tests/chains/Dogecoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWDogecoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeDogecoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeDogecoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeDogecoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeDogecoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeDogecoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeDogecoin), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeDogecoin));
+    ASSERT_EQ(0x16, TWCoinTypeP2shPrefix(TWCoinTypeDogecoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeDogecoin));
+    assertStringsEqual(symbol, "DOGE");
+    assertStringsEqual(txUrl, "https://blockchair.com/dogecoin/transaction/t123");
+    assertStringsEqual(accUrl, "https://blockchair.com/dogecoin/address/a12");
+    assertStringsEqual(id, "doge");
+    assertStringsEqual(name, "Dogecoin");
+}
diff --git a/tests/chains/Dogecoin/TWDogeTests.cpp b/tests/chains/Dogecoin/TWDogeTests.cpp
new file mode 100644
index 00000000000..9ee431a3414
--- /dev/null
+++ b/tests/chains/Dogecoin/TWDogeTests.cpp
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWBitcoinScript.h>
+
+#include <gtest/gtest.h>
+
+TEST(Doge, LockScripts) {
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("DLSSSUS3ex7YNDACJDxMER1ZMW579Vy8Zy").get(), TWCoinTypeDogecoin));
+    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
+    assertHexEqual(scriptData, "76a914a7d191ec42aa113e28cd858cceaa7c733ba2f77788ac");
+
+    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("AETZJzedcmLM2rxCM6VqCGF3YEMUjA3jMw").get(), TWCoinTypeDogecoin));
+    auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
+    assertHexEqual(scriptData2, "a914f191149f72f235548746654f5b473c58258f7fb687");
+}
diff --git a/tests/chains/Dydx/TWCoinTypeTests.cpp b/tests/chains/Dydx/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..1dd49ee8eb4
--- /dev/null
+++ b/tests/chains/Dydx/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWDydxCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeDydx;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("F236222E4F7C92FA84711FD6451ED22DD56CBDFA319BFDAFB99A21E4E9B9EC2F"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("dydx1adl7usw7z2dnysyn7wvrghu0u0q6gr7jqs4gtt"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "dydx");
+    assertStringsEqual(name, "dYdX");
+    assertStringsEqual(symbol, "DYDX");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://www.mintscan.io/dydx/tx/F236222E4F7C92FA84711FD6451ED22DD56CBDFA319BFDAFB99A21E4E9B9EC2F");
+    assertStringsEqual(accUrl, "https://www.mintscan.io/dydx/address/dydx1adl7usw7z2dnysyn7wvrghu0u0q6gr7jqs4gtt");
+}
diff --git a/tests/chains/ECO/TWCoinTypeTests.cpp b/tests/chains/ECO/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..c982259660f
--- /dev/null
+++ b/tests/chains/ECO/TWCoinTypeTests.cpp
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWHECOCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeECOChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x2e62832615f5b68b3bbcd72046a24260ce47052841c1679841b9c574d3959f13"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeECOChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xc5a5b3e49e5d06afe163553c942dc59b4e358cf1"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeECOChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeECOChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeECOChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeECOChain), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeECOChain));
+
+    assertStringsEqual(symbol, "HT");
+    assertStringsEqual(txUrl, "https://hecoinfo.com/tx/0x2e62832615f5b68b3bbcd72046a24260ce47052841c1679841b9c574d3959f13");
+    assertStringsEqual(accUrl, "https://hecoinfo.com/address/0xc5a5b3e49e5d06afe163553c942dc59b4e358cf1");
+    assertStringsEqual(id, "heco");
+    assertStringsEqual(name, "Huobi ECO Chain");
+}
diff --git a/tests/chains/ECash/TWCoinTypeTests.cpp b/tests/chains/ECash/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..96928e1828e
--- /dev/null
+++ b/tests/chains/ECash/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWECashCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeECash));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("6bc767e69cfacffd954c9e5acd178d3140bf00d094b92c6f6052b517500c553b"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeECash, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("ecash:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdg2jj94l5j"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeECash, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeECash));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeECash));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeECash), 2);
+    ASSERT_EQ(TWBlockchainBitcoinCash, TWCoinTypeBlockchain(TWCoinTypeECash));
+    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeECash));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeECash));
+    assertStringsEqual(symbol, "XEC");
+    assertStringsEqual(txUrl, "https://explorer.bitcoinabc.org/tx/6bc767e69cfacffd954c9e5acd178d3140bf00d094b92c6f6052b517500c553b");
+    assertStringsEqual(accUrl, "https://explorer.bitcoinabc.org/address/ecash:pqnqv9lt7e5vjyp0w88zf2af0l92l8rxdg2jj94l5j");
+    assertStringsEqual(id, "ecash");
+    assertStringsEqual(name, "eCash");
+}
diff --git a/tests/ECash/TWECashTests.cpp b/tests/chains/ECash/TWECashTests.cpp
similarity index 99%
rename from tests/ECash/TWECashTests.cpp
rename to tests/chains/ECash/TWECashTests.cpp
index 974f9bcff81..bd9f5738b3b 100644
--- a/tests/ECash/TWECashTests.cpp
+++ b/tests/chains/ECash/TWECashTests.cpp
@@ -8,7 +8,7 @@
 #include "Bitcoin/SigHashType.h"
 #include "HexCoding.h"
 #include "proto/Bitcoin.pb.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWBitcoinSigHashType.h>
 
@@ -124,6 +124,7 @@ TEST(ECash, SignTransaction) {
     // https://blockchair.com/ecash/transaction/96ee20002b34e468f9d3c5ee54f6a8ddaa61c118889c4f35395c2cd93ba5bbb4
 
     auto input = Proto::SigningInput();
+    input.set_coin_type(TWCoinTypeECash);
     input.set_hash_type(hashTypeForCoin(TWCoinTypeECash));
     input.set_amount(amount);
     input.set_byte_fee(1);
diff --git a/tests/chains/EOS/AddressTests.cpp b/tests/chains/EOS/AddressTests.cpp
new file mode 100644
index 00000000000..28aed7426a4
--- /dev/null
+++ b/tests/chains/EOS/AddressTests.cpp
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "EOS/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include <TrustWalletCore/TWPublicKeyType.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::EOS::tests {
+
+TEST(EOSAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_FALSE(Address::isValid("65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF"));
+    ASSERT_FALSE(Address::isValid("EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjT"));
+    ASSERT_FALSE(Address::isValid("PUB_5hieQEFWh68h6bjaYAY25Ptd2bmqLCaFsunaneh9gZsmSgUBUe"));
+    ASSERT_FALSE(Address::isValid("PUB_K1_5hieQEFWh68h6bjaYAY25Ptd2bmqLCaFsunaneh9gZsmSgUBUe"));
+
+    ASSERT_THROW(Address("PUB_K1_65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF"), std::invalid_argument);
+    ASSERT_THROW(EOS::Address(Data(0)), std::invalid_argument);
+}
+
+TEST(EOSAddress, Base58) {
+    ASSERT_EQ(
+        Address("EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF").string(),
+        "EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF");
+    ASSERT_EQ(
+        Address("EOS55hdeEZHoArE8LLTv6drj2yR1K1AH8wAPT4kjTVSnkmQc3nzwQ").string(),
+        "EOS55hdeEZHoArE8LLTv6drj2yR1K1AH8wAPT4kjTVSnkmQc3nzwQ");
+    ASSERT_EQ(
+        Address("PUB_R1_5hieQEFWh68h6bjaYAY25Ptd2bmqLCaFsunaneh9gZsmSgUBUe").string(),
+        "PUB_R1_5hieQEFWh68h6bjaYAY25Ptd2bmqLCaFsunaneh9gZsmSgUBUe");
+    ASSERT_EQ(
+        Address("PUB_R1_7M9ckjr6p5CmS3N3yLPg9vcTB5NHmLcMHwZ3iGccEVfbjJRHv3").string(),
+        "PUB_R1_7M9ckjr6p5CmS3N3yLPg9vcTB5NHmLcMHwZ3iGccEVfbjJRHv3");
+}
+
+TEST(EOSAddress, FromPrivateKey) {
+    std::string privArray[]{"8e14ef506fee5e0aaa32f03a45242d32d0eb993ffe25ce77542ef07219db667c",
+                            "e2bfd815c5923f404388a3257aa5527f0f52e92ce364e1e26a04d270c901edda",
+                            "e6b783120a21cb234d8e15077ce186c47261d1043781ab8b16b84f2acd377668",
+                            "bb96c0a4a6ec9c93ccc0b2cbad6b0e8110b9ca4731aef9c6937b99552a319b03"};
+
+    Type privTypes[]{Type::Legacy, Type::Legacy, Type::ModernR1, Type::ModernK1};
+
+    std::string pubArray[]{"EOS6TFKUKVvtvjRq9T4fV9pdxNUuJke92nyb4rzSFtZfdR5ssmVuY",
+                           "EOS5YtaCcbPJ3BknNBTDezE9eJoGNnAVuUwT8bnxhSRS5dqRvyfxr",
+                           "PUB_R1_67itCyDj42CRgtpyP4fLbAccBYnVHGeZQujQAeK3fyNbvfvZM6",
+                           "PUB_K1_6enPVMggisfqVVRZ1tj47d9UeHK46CBssoCmAz6sLDMBdtZk78"};
+
+    for (int i = 0; i < 4; i++) {
+        const auto privateKey = PrivateKey(parse_hex(privArray[i]));
+        const auto publicKey = PublicKey(privateKey.getPublicKey(privTypes[i] == Type::ModernR1 ? TWPublicKeyTypeNIST256p1 : TWPublicKeyTypeSECP256k1));
+        const auto address = Address(publicKey, privTypes[i]);
+
+        ASSERT_EQ(address.string(), pubArray[i]);
+    }
+}
+
+TEST(EOSAddress, IsValid) {
+    ASSERT_TRUE(Address::isValid("EOS6Vm7RWMS1KKAM9kDXgggpu4sJkFMEpARhmsWA84tk4P22m29AV"));
+    ASSERT_TRUE(Address::isValid("PUB_R1_6pQRUVU5vdneRnmjSiZPsvu3zBqcptvg6iK2Vz4vKo4ugnzow3"));
+    ASSERT_TRUE(Address::isValid("EOS5mGcPvsqFDe8YRrA3yMMjQgjrCa6yiCho79KViDhvxh4ajQjgS"));
+    ASSERT_TRUE(Address::isValid("PUB_R1_82dMu3zSSfyHYc4cvWJ6SPsHZWB5mBNAyhL53xiM5xpqmfqetN"));
+    ASSERT_TRUE(Address::isValid("PUB_K1_6enPVMggisfqVVRZ1tj47d9UeHK46CBssoCmAz6sLDMBdtZk78"));
+
+    ASSERT_NO_THROW(Address(parse_hex("039d91164ea04f4e751762643ef4ae520690af361b8e677cf341fd213419956b356cb721b7"), Type::ModernR1));
+    ASSERT_NO_THROW(Address(parse_hex("02d3c8e736a9a50889766caf3c37bd16e2fecc7340b3130e25d4c01b153f996a10a78afc0e"), Type::Legacy));
+}
+
+} // namespace TW::EOS::tests
diff --git a/tests/chains/EOS/AssetTests.cpp b/tests/chains/EOS/AssetTests.cpp
new file mode 100644
index 00000000000..23ae9852a69
--- /dev/null
+++ b/tests/chains/EOS/AssetTests.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "EOS/Asset.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::EOS::tests {
+
+TEST(EOSAsset, Serialization) {
+    Data buf;
+    Asset(5000, 3, "BRAVO").serialize(buf);
+    ASSERT_EQ(hex(buf), "881300000000000003425241564f0000");
+
+    buf.clear();
+    Asset(90000, 3, "BRAVO").serialize(buf);
+    ASSERT_EQ(hex(buf), "905f01000000000003425241564f0000");
+
+    buf.clear();
+    Asset(1000, 3, "BRAVO").serialize(buf);
+    ASSERT_EQ(hex(buf), "e80300000000000003425241564f0000");
+
+    std::string assetStr = "3.141 PI";
+    ASSERT_EQ(Asset::fromString(assetStr).string(), assetStr);
+
+    // add tests for negative amounts, fractional amounts
+}
+
+} // namespace TW::EOS
diff --git a/tests/chains/EOS/NameTests.cpp b/tests/chains/EOS/NameTests.cpp
new file mode 100644
index 00000000000..03f80ce53af
--- /dev/null
+++ b/tests/chains/EOS/NameTests.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "EOS/Name.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::EOS::tests {
+
+TEST(EOSName, Invalid) {
+    ASSERT_THROW(Name(std::string(14, 'a')), std::invalid_argument);
+
+    std::string invalidNames[] = {"Alice", "alice16", "12345satoshis"};
+    for (auto name : invalidNames) {
+        ASSERT_FALSE(Name(name).string() == name);
+    }
+}
+
+TEST(EOSName, Valid) {
+    ASSERT_NO_THROW(Name(std::string(13, 'a')));
+
+    std::string validName = "satoshis12345";
+    ASSERT_EQ(Name(validName).string(), validName);
+    Data buf;
+    Name(validName).serialize(buf);
+    ASSERT_EQ(hex(buf), "458608d8354cb3c1");
+}
+
+} // namespace TW::EOS::tests
\ No newline at end of file
diff --git a/tests/chains/EOS/SignatureTests.cpp b/tests/chains/EOS/SignatureTests.cpp
new file mode 100644
index 00000000000..0650c6432fb
--- /dev/null
+++ b/tests/chains/EOS/SignatureTests.cpp
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "EOS/Transaction.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::EOS::tests {
+
+TEST(EOSSignature, Serialization) {
+    Data buf;
+    Signature* sig = new Signature(parse_hex("1f14262320d5b145220fb94d8fe204117edd25e52bbe9557b6e0909dd00307af266f5be1deef001446979523ac9de32c7eae5e5be4180b5a60c0e6bf14b2dd3e05"), Type::ModernK1);
+    sig->serialize(buf);
+
+    ASSERT_EQ(
+        hex(buf),
+        "001f14262320d5b145220fb94d8fe204117edd25e52bbe9557b6e0909dd00307af266f5be1deef001446979523ac9de32c7eae5e5be4180b5a60c0e6bf14b2dd3e05");
+
+    ASSERT_EQ(
+        sig->string(),
+        "SIG_K1_JwtfgsdSx5RuF5aejedQ7FJTexaKMrQyYosPUWUrU1mzdLx6JUgLTZJd7zWA8q8VdnXht3YmVt7jafmD2eEK7hTRpT9rY5");
+
+    delete sig;
+    sig = new Signature(parse_hex("1f5c419d16f573ddbf07d2eb959621f690f9cb856ea2d113e3af02b3b40005488410e82ffa37a079e119844d213f4eb066a640507db68851752bea6e61eb864d84"), Type::ModernR1);
+    buf.clear();
+    sig->serialize(buf);
+
+    ASSERT_EQ(
+        hex(buf),
+        "011f5c419d16f573ddbf07d2eb959621f690f9cb856ea2d113e3af02b3b40005488410e82ffa37a079e119844d213f4eb066a640507db68851752bea6e61eb864d84");
+
+    ASSERT_EQ(
+        sig->string(),
+        "SIG_R1_K7KpdLYqa6ebCP22TuiYAY9YoJh1dTWTZEVkdPzdoadFL6f8PkMYk5N8wtsF11cneEJ91XnEZP6wDJHhRyqr1fr68ouYcz");
+
+    delete sig;
+    ASSERT_THROW(sig = new Signature(parse_hex("1f5c419d16f573ddbf07d2eb959621f690f9cb856ea2d113e3af02b3b40005488410e82ffa37a079e119844d213f4eb066a640507db68851752bea6e61eb864d84"), Type::Legacy), std::invalid_argument);
+    ASSERT_THROW(sig = new Signature(parse_hex("011f5c419d16f573ddbf07d2eb959621f690f9cb856ea2d113e3af02b3b40005488410e82ffa37a079e119844d213f4eb066a640507db68851752bea6e61eb864d84"), Type::ModernR1), std::invalid_argument);
+}
+
+} // namespace TW::EOS::tests
\ No newline at end of file
diff --git a/tests/chains/EOS/TWAnySignerTests.cpp b/tests/chains/EOS/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..575e71566c8
--- /dev/null
+++ b/tests/chains/EOS/TWAnySignerTests.cpp
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+#include "proto/EOS.pb.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::EOS::tests {
+
+TEST(TWAnySignerEOS, Sign) {
+    Proto::SigningInput input;
+    auto chainId = parse_hex("cf057bbfb72640471fd910bcb67639c22df9f92470936cddc1ade0e2f2e7dc4f");
+    auto refBlock = parse_hex("000067d6f6a7e7799a1f3d487439a679f8cf95f1c986f35c0d2fa320f51a7144");
+    auto key = parse_hex("559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd");
+
+    auto& asset = *input.mutable_asset();
+    asset.set_amount(300000);
+    asset.set_decimals(4);
+    asset.set_symbol("TKN");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_reference_block_id(refBlock.data(), refBlock.size());
+    input.set_reference_block_time(1554209118);
+    input.set_currency("token");
+    input.set_sender("token");
+    input.set_recipient("eosio");
+    input.set_memo("my second transfer");
+    input.set_private_key(key.data(), key.size());
+    input.set_private_key_type(Proto::KeyType::MODERNK1);
+
+    {
+        Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeEOS);
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        EXPECT_EQ(output.json_encoded(), R"({"compression":"none","packed_context_free_data":"","packed_trx":"6e67a35cd6679a1f3d4800000000010000000080a920cd000000572d3ccdcd010000000080a920cd00000000a8ed3232330000000080a920cd0000000000ea3055e09304000000000004544b4e00000000126d79207365636f6e64207472616e7366657200","signatures":["SIG_K1_K9RdLC7DEDWjTfR64GU8BtDHcAjzR1ntcT651JMcfHNTpdsvDrUwfyzF1FkvL9fxEi2UCtGJZ9zYoNbJoMF1fbU64cRiJ7"]})");
+    }
+
+    input.set_private_key_type(Proto::KeyType::LEGACY);
+    {
+        Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeEOS);
+        EXPECT_EQ(output.error(), Common::Proto::Error_internal);
+        EXPECT_TRUE(output.json_encoded().empty());
+    }
+}
+
+} // namespace TW::EOS::tests
diff --git a/tests/chains/EOS/TWCoinTypeTests.cpp b/tests/chains/EOS/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..9996fd7467f
--- /dev/null
+++ b/tests/chains/EOS/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWEOSCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeEOS));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeEOS, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeEOS, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeEOS));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeEOS));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeEOS), 4);
+    ASSERT_EQ(TWBlockchainEOS, TWCoinTypeBlockchain(TWCoinTypeEOS));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeEOS));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeEOS));
+    assertStringsEqual(symbol, "EOS");
+    assertStringsEqual(txUrl, "https://bloks.io/transaction/t123");
+    assertStringsEqual(accUrl, "https://bloks.io/account/a12");
+    assertStringsEqual(id, "eos");
+    assertStringsEqual(name, "EOS");
+}
diff --git a/tests/chains/EOS/TransactionCompilerTests.cpp b/tests/chains/EOS/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..bb4bb23f72b
--- /dev/null
+++ b/tests/chains/EOS/TransactionCompilerTests.cpp
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "EOS/Signer.h"
+
+#include "proto/EOS.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWStellarPassphrase.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(EOSCompiler, CompileWithSignatures) {
+    /// Step 1: Prepare transaction input (protobuf)
+    const auto coin = TWCoinTypeEOS;
+    EOS::Proto::SigningInput input;
+    auto chainId = parse_hex("cf057bbfb72640471fd910bcb67639c22df9f92470936cddc1ade0e2f2e7dc4f");
+    auto refBlock = parse_hex("000067d6f6a7e7799a1f3d487439a679f8cf95f1c986f35c0d2fa320f51a7144");
+    auto key = parse_hex("559aead08264d5795d3909718cdd05abd49572e84fe55590eef31a88a08fdffd");
+
+    auto& asset = *input.mutable_asset();
+    asset.set_amount(300000);
+    asset.set_decimals(4);
+    asset.set_symbol("TKN");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_reference_block_id(refBlock.data(), refBlock.size());
+    input.set_reference_block_time(1554209118);
+    input.set_currency("token");
+    input.set_sender("token");
+    input.set_recipient("eosio");
+    input.set_memo("my second transfer");
+    input.set_private_key(key.data(), key.size());
+    input.set_private_key_type(EOS::Proto::KeyType::MODERNK1);
+
+    auto txInputData = data(input.SerializeAsString());
+    {
+        EOS::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        EXPECT_EQ(output.json_encoded(), R"({"compression":"none","packed_context_free_data":"","packed_trx":"6e67a35cd6679a1f3d4800000000010000000080a920cd000000572d3ccdcd010000000080a920cd00000000a8ed3232330000000080a920cd0000000000ea3055e09304000000000004544b4e00000000126d79207365636f6e64207472616e7366657200","signatures":["SIG_K1_K9RdLC7DEDWjTfR64GU8BtDHcAjzR1ntcT651JMcfHNTpdsvDrUwfyzF1FkvL9fxEi2UCtGJZ9zYoNbJoMF1fbU64cRiJ7"]})");
+    }
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = data(preSigningOutput.data_hash());
+    EXPECT_EQ(hex(preImageHash), "14fc3299ee3e1113096bf1869dfa14c04a7ffdedd8ebdabf530683e4cfcd726c");
+
+    // Simulate signature, normally obtained from signature server
+    const PublicKey publicKey = PrivateKey(key).getPublicKey(TWPublicKeyTypeNIST256p1);
+    const auto signature = parse_hex("1f6c4efceb5a6dadab271fd7e2153d97d22690938475b23f017cf9ec29e20d25725e90e541e130daa83c38fc4c933725f05837422c3f4a51f8c1d07208c8fd5e0b"); // data("SIG_K1_K9RdLC7DEDWjTfR64GU8BtDHcAjzR1ntcT651JMcfHNTpdsvDrUwfyzF1FkvL9fxEi2UCtGJZ9zYoNbJoMF1fbU64cRiJ7");
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKey.bytes});
+
+    const auto ExpectedTx = R"({"compression":"none","packed_context_free_data":"","packed_trx":"6e67a35cd6679a1f3d4800000000010000000080a920cd000000572d3ccdcd010000000080a920cd00000000a8ed3232330000000080a920cd0000000000ea3055e09304000000000004544b4e00000000126d79207365636f6e64207472616e7366657200","signatures":["SIG_K1_K9RdLC7DEDWjTfR64GU8BtDHcAjzR1ntcT651JMcfHNTpdsvDrUwfyzF1FkvL9fxEi2UCtGJZ9zYoNbJoMF1fbU64cRiJ7"]})";
+    {
+        EOS::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.json_encoded(), ExpectedTx);
+    }
+
+    input.set_private_key_type(EOS::Proto::KeyType::LEGACY);
+    {
+        EOS::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+        EXPECT_EQ(output.error(), Common::Proto::Error_internal);
+        EXPECT_TRUE(output.json_encoded().empty());
+    }
+}
diff --git a/tests/chains/EOS/TransactionTests.cpp b/tests/chains/EOS/TransactionTests.cpp
new file mode 100644
index 00000000000..013db25ed5a
--- /dev/null
+++ b/tests/chains/EOS/TransactionTests.cpp
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "EOS/Action.h"
+#include "EOS/Address.h"
+#include "EOS/Signer.h"
+#include "EOS/Transaction.h"
+#include "Hash.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+namespace TW::EOS::tests {
+
+static std::string k1Sigs[5]{
+    "SIG_K1_K9RdLC7DEDWjTfR64GU8BtDHcAjzR1ntcT651JMcfHNTpdsvDrUwfyzF1FkvL9fxEi2UCtGJZ9zYoNbJoMF1fbU64cRiJ7",
+    "SIG_K1_K4oXhfa8xJnAB26EeTz8FLfZtY4kw4kjqUqQLz5snryP7USRJ7yGyuBBfYzTBtZ8djBo87pAW53xHsUxjvQvaKHGQRhKd5",
+    "SIG_K1_K2BumXj5Qtk2CtaYe6EvMSZ2JXLCFeNsTQirx4cnZFURBFpkchuS4sNFxGLH5Qrdv4R7cN4rax6ZF9HBMz4f4d6GFoTNN2",
+    "SIG_K1_K8LNseWYiePTM646LZduWevssozJ9t3gaNe2ipZfXbbSFsx36dJFXnk5UBasT2G3cX1Niu7LSUVFspkDYSSPxMFGbWcAvk",
+    "SIG_K1_Jx2JFftzdx28PZXkmoeWk2afm3KHYsn5knYxynA3GrGevMEJVd1GhcuS5h3f2wdUS2ZUojqycyyVizyJFVSajeR2LZGnJr"};
+
+static std::string r1Sigs[5]{
+    "SIG_R1_KC4qBxibZpXLESzN37F46Jv8w7dQtyPDeRmeFs8Z4DmEFhr3FACLkjcbSLkVN7acBt4eb6zUa9N76UfJncr4htxCSe7huZ",
+    "SIG_R1_KaWNQefJReykjKUsS51caChJRgeywUoeuucFReyKY1SPNveSoFFVgxT3jEzW56ZLtpN7qGgekoSNsKs1BzzyZ9snhCALcG",
+    "SIG_R1_KarN7JJxHeKgRJLmscWzCsdDpfdktWrBGJLvVFN7RYZpSeNHBsqNV7dKqxkvKtbhsqHukLKw1EQNTjcUcxUD6hUTVvNWcP",
+    "SIG_R1_KvHdcwEDW8RQWEPTA3BoK9RVZqtAwKqVvYQN9Wz44XUrzjrNyRkpc7vguqc8q6FLMJBUUen59hyXM3BuLvvrp2x4S6m1o8",
+    "SIG_R1_KZB6ivprUS1zwGxMxZQJ7UvWk4Tpvoo6WiFKUPJuUHj4Es39ejiFVoD7ZB6MfSJxAaRPvnAF39hnApwzFAM8Erxmj3Suvm"};
+
+TEST(EOSTransaction, Serialization) {
+    ASSERT_THROW(TransferAction("token", "eosio", "token", Asset::fromString("-20.1234 TKN"), "my first transfer"), std::invalid_argument);
+
+    Data referenceBlockId = parse_hex("000046dc08ad384ca452d92c59348aba888fcbb6ef1ebffc3181617706664d4c");
+    int32_t referenceBlockTime = 1554121728;
+    auto chainId = parse_hex("cf057bbfb72640471fd910bcb67639c22df9f92470936cddc1ade0e2f2e7dc4f");
+
+    Transaction tx{referenceBlockId, referenceBlockTime};
+    tx.actions.push_back(TransferAction("token", "eosio", "token", Asset::fromString("20.1234 TKN"), "my first transfer"));
+    ASSERT_EQ(tx.actions.back().serialize().dump(), "{\"account\":\"token\",\"authorizations\":[{\"actor\":\"eosio\",\"permission\":\"active\"}],\"data\":\"0000000000ea30550000000080a920cd121203000000000004544b4e00000000116d79206669727374207472616e73666572\",\"name\":\"transfer\"}");
+
+    Data buf;
+    tx.serialize(buf);
+
+    Signer signer{chainId};
+
+    ASSERT_EQ(
+        hex(buf),
+        "1012a25cdc46a452d92c00000000010000000080a920cd000000572d3ccdcd010000000000ea305500000000a8ed3232320000000000ea30550000000080a920cd121203000000000004544b4e00000000116d79206669727374207472616e7366657200");
+
+    ASSERT_EQ(
+        hex(signer.hash(tx)),
+        "acbf7e6beb6fd4e224462e87c1d70bca6a15b76f8d9e0b31782c5cdfd493b050");
+
+    // make transaction invalid and see if signing succeeds
+    tx.maxNetUsageWords = UINT32_MAX;
+    ASSERT_THROW(signer.sign(PrivateKey(Hash::sha256(std::string("A"))), Type::ModernK1, tx), std::invalid_argument);
+
+    referenceBlockId = parse_hex("000067d6f6a7e7799a1f3d487439a679f8cf95f1c986f35c0d2fa320f51a7144");
+    referenceBlockTime = 1554209118;
+
+    Transaction tx2{referenceBlockId, referenceBlockTime};
+    tx2.actions.push_back(TransferAction("token", "token", "eosio", Asset::fromString("30.0000 TKN"), "my second transfer"));
+
+    buf.clear();
+    tx2.serialize(buf);
+    ASSERT_EQ(
+        hex(buf),
+        "6e67a35cd6679a1f3d4800000000010000000080a920cd000000572d3ccdcd010000000080a920cd00000000a8ed3232330000000080a920cd0000000000ea3055e09304000000000004544b4e00000000126d79207365636f6e64207472616e7366657200");
+
+    ASSERT_EQ(
+        hex(signer.hash(tx2)),
+        "14fc3299ee3e1113096bf1869dfa14c04a7ffdedd8ebdabf530683e4cfcd726c");
+
+    ASSERT_NO_THROW(tx2.serialize());
+
+    // verify k1 sigs
+    for (int i = 0; i < 5; i++) {
+        PrivateKey pk(Hash::sha256(std::string(i + 1, 'A')));
+        ASSERT_NO_THROW(signer.sign(pk, Type::ModernK1, tx2));
+
+        ASSERT_EQ(
+            tx2.signatures.back().string(),
+            k1Sigs[i]);
+    }
+
+    // verify r1 sigs
+    for (int i = 0; i < 5; i++) {
+        PrivateKey pk(Hash::sha256(std::string(i + 1, 'A')));
+        ASSERT_NO_THROW(signer.sign(pk, Type::ModernR1, tx2));
+
+        ASSERT_EQ(
+            tx2.signatures.back().string(),
+            r1Sigs[i]);
+    }
+
+    referenceBlockId = parse_hex("");
+    referenceBlockTime = 0;
+    EXPECT_ANY_THROW(new Transaction(referenceBlockId, referenceBlockTime));
+
+    referenceBlockId = parse_hex("000067d6f6a7e7799a1f3d487439a679f8cf95f1c986f35c0d2fa320f51a7144");
+    referenceBlockTime = 1554209118;
+    Transaction tx3{referenceBlockId, referenceBlockTime};
+    Data extBuf;
+    auto ext = Extension(uint16_t(0), extBuf);
+    tx3.transactionExtensions.push_back(ext);
+    buf.clear();
+    tx3.serialize(buf);
+    ASSERT_EQ(hex(buf), "6e67a35cd6679a1f3d48000000000001000000");
+}
+
+TEST(EOSTransaction, formatDate) {
+    EXPECT_EQ(Transaction::formatDate(1554209148), "2019-04-02T12:45:48");
+    EXPECT_EQ(Transaction::formatDate(1654160000), "2022-06-02T08:53:20");
+    EXPECT_EQ(Transaction::formatDate(0), "1970-01-01T00:00:00");
+    EXPECT_EQ(Transaction::formatDate(std::numeric_limits<int32_t>::max()), "2038-01-19T03:14:07");
+}
+
+TEST(EOSTransaction, Create) {
+    auto emptyData = Data{};
+    EXPECT_ANY_THROW(new Transaction(emptyData, 0));
+}
+
+} // namespace TW::EOS::tests
diff --git a/tests/chains/Ethereum/AddressTests.cpp b/tests/chains/Ethereum/AddressTests.cpp
new file mode 100644
index 00000000000..b2b320cf82e
--- /dev/null
+++ b/tests/chains/Ethereum/AddressTests.cpp
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Ethereum/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Ethereum::tests {
+
+TEST(EthereumAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_FALSE(Address::isValid("aaeb60f3e94c9b9a09f33669435e7ef1beaed"));
+    ASSERT_FALSE(Address::isValid("fB6916095ca1df60bB79Ce92cE3Ea74c37c5d359"));
+}
+
+TEST(EthereumAddress, EIP55) {
+    ASSERT_EQ(
+        Address(parse_hex("5aaeb6053f3e94c9b9a09f33669435e7ef1beaed")).string(),
+        "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
+    ASSERT_EQ(
+        Address(parse_hex("0x5AAEB6053F3E94C9b9A09f33669435E7Ef1BEAED")).string(),
+        "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
+    ASSERT_EQ(
+        Address(parse_hex("0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359")).string(),
+        "0xfB6916095ca1df60bB79Ce92cE3Ea74c37c5d359");
+    ASSERT_EQ(
+        Address(parse_hex("0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB")).string(),
+        "0xdbF03B407c01E7cD3CBea99509d93f8DDDC8C6FB");
+    ASSERT_EQ(
+        Address(parse_hex("0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb")).string(),
+        "0xD1220A0cf47c7B9Be7A2E6BA89F429762e7b9aDb");
+}
+
+TEST(EthereumAddress, String) {
+    const auto address = Address("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
+    ASSERT_EQ(address.string(), "0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
+}
+
+TEST(EthereumAddress, FromPrivateKey) {
+    const auto privateKey = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
+    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
+    const auto address = Address(publicKey);
+
+    ASSERT_EQ(address.string(), "0xAc1ec44E4f0ca7D172B7803f6836De87Fb72b309");
+
+    const auto publicKey2 = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeED25519));
+    EXPECT_ANY_THROW(new Address(publicKey2));
+}
+
+TEST(EthereumAddress, IsValid) {
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_TRUE(Address::isValid("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"));
+}
+
+TEST(EthereumAddress, FromData) {
+    EXPECT_ANY_THROW(new Address(Data{}));
+}
+
+} // namespace TW::Ethereum::tests
diff --git a/tests/chains/Ethereum/BarzTests.cpp b/tests/chains/Ethereum/BarzTests.cpp
new file mode 100644
index 00000000000..479726d7393
--- /dev/null
+++ b/tests/chains/Ethereum/BarzTests.cpp
@@ -0,0 +1,418 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWEthereum.h>
+#include <TrustWalletCore/TWBarz.h>
+#include <TrustWalletCore/TWHash.h>
+#include <Ethereum/Barz.h>
+#include <PrivateKey.h>
+#include "proto/Ethereum.pb.h"
+#include "HexCoding.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWEthereumAbi.h>
+#include <TrustWalletCore/TWEthereumAbiFunction.h>
+
+namespace TW::Barz::tests {
+
+// https://testnet.bscscan.com/tx/0x6c6e1fe81c722c0abce1856b9b4e078ab2cad06d51f2d1b04945e5ba2286d1b4
+TEST(Barz, GetInitCode) {
+    const PublicKey& publicKey = PublicKey(parse_hex("0x04e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b02"), TWPublicKeyTypeNIST256p1Extended);
+
+    // C++
+    {
+        const std::string& factoryAddress = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800";
+        const std::string& verificationFacetAddress = "0x6BF22ff186CC97D88ECfbA47d1473a234CEBEFDf";
+        const auto salt = 0;
+
+        const auto& initCode = Barz::getInitCode(factoryAddress, publicKey, verificationFacetAddress, salt);
+        ASSERT_EQ(hexEncoded(initCode), "0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000006bf22ff186cc97d88ecfba47d1473a234cebefdf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b0200000000000000000000000000000000000000000000000000000000000000");
+    }
+
+    {
+        const std::string& factoryAddress = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800";
+        const std::string& verificationFacetAddress = "0x6BF22ff186CC97D88ECfbA47d1473a234CEBEFDf";
+        const auto salt = 1;
+
+        const auto& initCode = Barz::getInitCode(factoryAddress, publicKey, verificationFacetAddress, salt);
+        ASSERT_EQ(hexEncoded(initCode), "0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000006bf22ff186cc97d88ecfba47d1473a234cebefdf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004104e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b0200000000000000000000000000000000000000000000000000000000000000");
+    }
+
+    // C
+    {
+        const auto factoryAddress = STRING("0x3fC708630d85A3B5ec217E53100eC2b735d4f800");
+        const auto verificationFacetAddress = STRING("0x6BF22ff186CC97D88ECfbA47d1473a234CEBEFDf");
+        const auto salt = 0;
+
+        const auto& initCodeData = TWBarzGetInitCode(factoryAddress.get(), WRAP(TWPublicKey, new TWPublicKey{ TW::PublicKey(publicKey) }).get(), verificationFacetAddress.get(), salt);
+        const auto& initCode = hexEncoded(*reinterpret_cast<const Data*>(WRAPD(initCodeData).get()));
+        EXPECT_EQ(initCode, "0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000006bf22ff186cc97d88ecfba47d1473a234cebefdf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b0200000000000000000000000000000000000000000000000000000000000000");
+    }
+
+    {
+        const auto factoryAddress = STRING("0x3fC708630d85A3B5ec217E53100eC2b735d4f800");
+        const auto verificationFacetAddress = STRING("0x6BF22ff186CC97D88ECfbA47d1473a234CEBEFDf");
+        const auto salt = 1;
+
+        const auto& initCodeData = TWBarzGetInitCode(factoryAddress.get(), WRAP(TWPublicKey, new TWPublicKey{ TW::PublicKey(publicKey) }).get(), verificationFacetAddress.get(), salt);
+        const auto& initCode = hexEncoded(*reinterpret_cast<const Data*>(WRAPD(initCodeData).get()));
+        EXPECT_EQ(initCode, "0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000006bf22ff186cc97d88ecfba47d1473a234cebefdf00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000004104e6f4e0351e2f556fd7284a9a033832bae046ac31fd529ad02ab6220870624b79eb760e718fdaed7a037dd1d77a561759cee9f2706eb55a729dc953e0d5719b0200000000000000000000000000000000000000000000000000000000000000");
+    }
+}
+
+TEST(Barz, GetCounterfactualAddress) {
+    TW::Barz::Proto::ContractAddressInput input;
+    input.set_factory("0x2c97f4a366Dd5D91178ec9E36c5C1fcA393A538C");
+    input.set_account_facet("0x3322C04EAe11B9b14c6c289f2668b6f07071b591");
+    input.set_verification_facet("0x90A6fE0A938B0d4188e9013C99A0d7D9ca6bFB63");
+    input.set_entry_point("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789");
+    input.set_facet_registry("0xFd1A8170c12747060324D9079a386BD4290e6f93");
+    input.set_default_fallback("0x22eB0720d9Fc4bC90BB812B309e939880B71c20d");
+    input.set_bytecode("0x608060405260405162003cc638038062003cc68339818101604052810190620000299190620019ad565b60008673ffffffffffffffffffffffffffffffffffffffff16633253960f6040518163ffffffff1660e01b81526004016020604051808303816000875af115801562000079573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906200009f919062001aec565b9050600060e01b817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191603620000fe576040517f5a5b4d3900000000000000000000000000000000000000000000000000000000815260040160405180910390fd5b6000600267ffffffffffffffff8111156200011e576200011d6200196b565b5b6040519080825280602002602001820160405280156200015b57816020015b62000147620018ff565b8152602001906001900390816200013d5790505b5090506000600167ffffffffffffffff8111156200017e576200017d6200196b565b5b604051908082528060200260200182016040528015620001ad5781602001602082028036833780820191505090505b5090506000600167ffffffffffffffff811115620001d057620001cf6200196b565b5b604051908082528060200260200182016040528015620001ff5781602001602082028036833780820191505090505b509050631f931c1c60e01b8260008151811062000221576200022062001b21565b5b60200260200101907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152505060405180606001604052808d73ffffffffffffffffffffffffffffffffffffffff16815260200160006002811115620002ab57620002aa62001b37565b5b81526020018381525083600081518110620002cb57620002ca62001b21565b5b60200260200101819052508381600081518110620002ee57620002ed62001b21565b5b60200260200101907bffffffffffffffffffffffffffffffffffffffffffffffffffffffff191690817bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152505060405180606001604052808b73ffffffffffffffffffffffffffffffffffffffff1681526020016000600281111562000378576200037762001b37565b5b8152602001828152508360018151811062000398576200039762001b21565b5b6020026020010181905250620003b9846200047e60201b620001671760201c565b6200046c838c8b8e8e8d8d8d8d604051602401620003de979695949392919062001b8c565b6040516020818303038152906040527f95a21aec000000000000000000000000000000000000000000000000000000007bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19166020820180517bffffffffffffffffffffffffffffffffffffffffffffffffffffffff8381831617835250505050620004b060201b620001911760201c565b5050505050505050505050506200211f565b806200048f6200073460201b60201c565b60010160016101000a81548163ffffffff021916908360e01c021790555050565b60005b8351811015620006df576000848281518110620004d557620004d462001b21565b5b602002602001015160200151905060006002811115620004fa57620004f962001b37565b5b81600281111562000510576200050f62001b37565b5b0362000570576200056a85838151811062000530576200052f62001b21565b5b60200260200101516000015186848151811062000552576200055162001b21565b5b6020026020010151604001516200073960201b60201c565b620006c8565b6001600281111562000587576200058662001b37565b5b8160028111156200059d576200059c62001b37565b5b03620005fd57620005f7858381518110620005bd57620005bc62001b21565b5b602002602001015160000151868481518110620005df57620005de62001b21565b5b602002602001015160400151620009db60201b60201c565b620006c7565b60028081111562000613576200061262001b37565b5b81600281111562000629576200062862001b37565b5b0362000689576200068385838151811062000649576200064862001b21565b5b6020026020010151600001518684815181106200066b576200066a62001b21565b5b60200260200101516040015162000c8f60201b60201c565b620006c6565b6040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620006bd9062001be7565b60405180910390fd5b5b5b508080620006d69062001c61565b915050620004b3565b507f8faa70878671ccd212d20771b795c50af8fd3ff6cf27f4bde57e5d4de0aeb673838383604051620007159392919062001c82565b60405180910390a16200072f828262000e3760201b60201c565b505050565b600090565b600081511162000780576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007779062001d97565b60405180910390fd5b60006200079262000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160362000806576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620007fd9062001dfb565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff16036200087c576200087b828562000f9860201b60201c565b5b60005b8351811015620009d4576000848281518110620008a157620008a062001b21565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff161462000998576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200098f9062001e5f565b60405180910390fd5b620009ac8583868a6200107c60201b60201c565b8380620009b99062001ec3565b94505050508080620009cb9062001c61565b9150506200087f565b5050505050565b600081511162000a22576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000a199062001d97565b60405180910390fd5b600062000a3462000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff160362000aa8576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000a9f9062001dfb565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff160362000b1e5762000b1d828562000f9860201b60201c565b5b60005b835181101562000c8857600084828151811062000b435762000b4262001b21565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff160362000c39576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000c309062001eef565b60405180910390fd5b62000c4c8582846200122960201b60201c565b62000c608583868a6200107c60201b60201c565b838062000c6d9062001ec3565b9450505050808062000c7f9062001c61565b91505062000b21565b5050505050565b600081511162000cd6576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000ccd9062001d97565b60405180910390fd5b600062000ce862000f6b60201b60201c565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161462000d5c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000d539062001f53565b60405180910390fd5b60005b825181101562000e3157600083828151811062000d815762000d8062001b21565b5b602002602001015190506000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905062000e198482846200122960201b60201c565b5050808062000e289062001c61565b91505062000d5f565b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16031562000f675762000e988260405180606001604052806028815260200162003c7a60289139620018aa60201b60201c565b6000808373ffffffffffffffffffffffffffffffffffffffff168360405162000ec2919062001fb7565b600060405180830381855af49150503d806000811462000eff576040519150601f19603f3d011682016040523d82523d6000602084013e62000f04565b606091505b50915091508162000f645760008151111562000f235780518082602001fd5b83836040517f192105d700000000000000000000000000000000000000000000000000000000815260040162000f5b92919062001fd7565b60405180910390fd5b50505b5050565b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f90508091505090565b62000fc38160405180606001604052806024815260200162003ca260249139620018aa60201b60201c565b81600201805490508260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018190555081600201819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b81846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508360010160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018390806001815401808255809150506001900390600052602060002090600891828204019190066004029091909190916101000a81548163ffffffff021916908360e01c021790555080846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036200129b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620012929062002003565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16036200130c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620013039062002067565b60405180910390fd5b6000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160149054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff169050600060018560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000180549050620013e59190620020cb565b9050808214620015805760008560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000182815481106200144a576200144962001b21565b5b90600052602060002090600891828204019190066004029054906101000a900460e01b9050808660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018481548110620014c957620014c862001b21565b5b90600052602060002090600891828204019190066004026101000a81548163ffffffff021916908360e01c021790555082866000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550505b8460010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001805480620015d757620015d6620020ec565b5b60019003818190600052602060002090600891828204019190066004026101000a81549063ffffffff02191690559055846000016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000820160146101000a8154906bffffffffffffffffffffffff0219169055505060008103620018a357600060018660020180549050620016c49190620020cb565b905060008660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015490508181146200180c57600087600201838154811062001732576200173162001b21565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508088600201838154811062001779576200177862001b21565b5b9060005260206000200160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550818860010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060010181905550505b86600201805480620018235762001822620020ec565b5b6001900381819060005260206000200160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905590558660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001016000905550505b5050505050565b6000823b9050600081118290620018f9576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620018f0919062002102565b60405180910390fd5b50505050565b6040518060600160405280600073ffffffffffffffffffffffffffffffffffffffff168152602001600060028111156200193e576200193d62001b37565b5b8152602001606081525090565b60008151905060018060a01b03811681146200196657600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b83811015620019a157808201518184015260208101905062001984565b50600083830152505050565b600080600080600080600080610100898b031215620019cb57600080fd5b620019d6896200194b565b9750620019e660208a016200194b565b9650620019f660408a016200194b565b955062001a0660608a016200194b565b945062001a1660808a016200194b565b935062001a2660a08a016200194b565b925062001a3660c08a016200194b565b915060e089015160018060401b038082111562001a5257600080fd5b818b0191508b601f83011262001a6757600080fd5b81518181111562001a7d5762001a7c6200196b565b5b601f1960405181603f83601f860116011681019150808210848311171562001aaa5762001aa96200196b565b5b816040528281528e602084870101111562001ac457600080fd5b62001ad783602083016020880162001981565b80955050505050509295985092959890939650565b60006020828403121562001aff57600080fd5b815163ffffffff60e01b8116811462001b1757600080fd5b8091505092915050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052602160045260246000fd5b60018060a01b03811682525050565b6000815180845262001b7681602086016020860162001981565b6020601f19601f83011685010191505092915050565b600060018060a01b03808a168352808916602084015280881660408401528087166060840152808616608084015280851660a08401525060e060c083015262001bd960e083018462001b5c565b905098975050505050505050565b60208152602760208201527f4c69624469616d6f6e644375743a20496e636f7272656374204661636574437560408201527f74416374696f6e0000000000000000000000000000000000000000000000000060608201526000608082019050919050565b634e487b7160e01b600052601160045260246000fd5b60008019820362001c775762001c7662001c4b565b5b600182019050919050565b60006060808301818452808751808352608092508286019150828160051b8701016020808b0160005b8481101562001d6357607f198a8503018652815188850160018060a01b038251168652848201516003811062001cf157634e487b7160e01b600052602160045260246000fd5b80868801525060408083015192508a81880152508082518083528a880191508684019350600092505b8083101562001d465763ffffffff60e01b84511682528682019150868401935060018301925062001d1a565b508096505050508282019150828601955060018101905062001cab565b505062001d738189018b62001b4d565b50868103604088015262001d88818962001b5c565b95505050505050949350505050565b60208152602b60208201527f4c69624469616d6f6e644375743a204e6f2073656c6563746f727320696e206660408201527f6163657420746f2063757400000000000000000000000000000000000000000060608201526000608082019050919050565b60208152602c60208201527f4c69624469616d6f6e644375743a204164642066616365742063616e2774206260408201527f652061646472657373283029000000000000000000000000000000000000000060608201526000608082019050919050565b60208152603560208201527f4c69624469616d6f6e644375743a2043616e2774206164642066756e6374696f60408201527f6e207468617420616c726561647920657869737473000000000000000000000060608201526000608082019050919050565b600060018060601b0380831681810362001ee25762001ee162001c4b565b5b6001810192505050919050565b60208152603860208201527f4c69624469616d6f6e644375743a2043616e2774207265706c6163652066756e60408201527f6374696f6e20776974682073616d652066756e6374696f6e000000000000000060608201526000608082019050919050565b60208152603660208201527f4c69624469616d6f6e644375743a2052656d6f7665206661636574206164647260408201527f657373206d75737420626520616464726573732830290000000000000000000060608201526000608082019050919050565b6000825162001fcb81846020870162001981565b80830191505092915050565b60018060a01b038316815260406020820152600062001ffa604083018462001b5c565b90509392505050565b60208152603760208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f76652066756e6360408201527f74696f6e207468617420646f65736e277420657869737400000000000000000060608201526000608082019050919050565b60208152602e60208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f766520696d6d7560408201527f7461626c652066756e6374696f6e00000000000000000000000000000000000060608201526000608082019050919050565b6000828203905081811115620020e657620020e562001c4b565b5b92915050565b634e487b7160e01b600052603160045260246000fd5b60208152600062002117602083018462001b5c565b905092915050565b611b4b806200212f6000396000f3fe60806040523661000b57005b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f9050809150600082600001600080357fffffffff00000000000000000000000000000000000000000000000000000000167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1603610141576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610138906114d3565b60405180910390fd5b3660008037600080366000845af43d6000803e8060008114610162573d6000f35b3d6000fd5b806101706103c0565b60010160016101000a81548163ffffffff021916908360e01c021790555050565b60005b83518110156103755760008482815181106101b2576101b1611510565b5b6020026020010151602001519050600060028111156101d4576101d3611526565b5b8160028111156101e7576101e6611526565b5b036102375761023285838151811061020257610201611510565b5b60200260200101516000015186848151811061022157610220611510565b5b6020026020010151604001516103c5565b610361565b6001600281111561024b5761024a611526565b5b81600281111561025e5761025d611526565b5b036102ae576102a985838151811061027957610278611510565b5b60200260200101516000015186848151811061029857610297611510565b5b60200260200101516040015161063c565b610360565b6002808111156102c1576102c0611526565b5b8160028111156102d4576102d3611526565b5b036103245761031f8583815181106102ef576102ee611510565b5b60200260200101516000015186848151811061030e5761030d611510565b5b6020026020010151604001516108bd565b61035f565b6040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016103569061153c565b60405180910390fd5b5b5b50808061036d906115b6565b915050610194565b507f8faa70878671ccd212d20771b795c50af8fd3ff6cf27f4bde57e5d4de0aeb6738383836040516103a99392919061163b565b60405180910390a16103bb8282610a48565b505050565b600090565b6000815111610409576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161040090611747565b60405180910390fd5b6000610413610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff1603610484576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161047b906117ab565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff16036104f1576104f08285610b97565b5b60005b835181101561063557600084828151811061051257610511611510565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050600073ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff1614610606576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016105fd9061180f565b60405180910390fd5b6106128583868a610c72565b838061061d90611873565b9450505050808061062d906115b6565b9150506104f4565b5050505050565b6000815111610680576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161067790611747565b60405180910390fd5b600061068a610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16036106fb576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016106f2906117ab565b60405180910390fd5b60008160010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054905090506000816bffffffffffffffffffffffff1603610768576107678285610b97565b5b60005b83518110156108b657600084828151811061078957610788611510565b5b602002602001015190506000846000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508673ffffffffffffffffffffffffffffffffffffffff168173ffffffffffffffffffffffffffffffffffffffff160361087c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610873906118a2565b60405180910390fd5b610887858284610e1f565b6108938583868a610c72565b838061089e90611873565b945050505080806108ae906115b6565b91505061076b565b5050505050565b6000815111610901576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016108f890611747565b60405180910390fd5b600061090b610b6a565b9050600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161461097c576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161097390611906565b60405180910390fd5b60005b8251811015610a4257600083828151811061099d5761099c611510565b5b602002602001015190506000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050610a2d848284610e1f565b50508080610a3a906115b6565b91505061097f565b50505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff160315610b6657610a9f82604051806060016040528060288152602001611aca60289139611481565b6000808373ffffffffffffffffffffffffffffffffffffffff1683604051610ac7919061196a565b600060405180830381855af49150503d8060008114610b02576040519150601f19603f3d011682016040523d82523d6000602084013e610b07565b606091505b509150915081610b6357600081511115610b245780518082602001fd5b83836040517f192105d7000000000000000000000000000000000000000000000000000000008152600401610b5a929190611988565b60405180910390fd5b50505b5050565b6000807f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f90508091505090565b610bb981604051806060016040528060248152602001611af260249139611481565b81600201805490508260010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001018190555081600201819080600181540180825580915050600190039060005260206000200160009091909190916101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff1602179055505050565b81846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff1602179055508360010160008273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018390806001815401808255809150506001900390600052602060002090600891828204019190066004029091909190916101000a81548163ffffffff021916908360e01c021790555080846000016000857bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050505050565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610e8e576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610e85906119b2565b60405180910390fd5b3073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1603610efc576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401610ef390611a16565b60405180910390fd5b6000836000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160149054906101000a90046bffffffffffffffffffffffff166bffffffffffffffffffffffff169050600060018560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000180549050610fd39190611a7a565b90508082146111675760008560010160008673ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020600001828154811061103457611033611510565b5b90600052602060002090600891828204019190066004029054906101000a900460e01b9050808660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060000184815481106110b0576110af611510565b5b90600052602060002090600891828204019190066004026101000a81548163ffffffff021916908360e01c021790555082866000016000837bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff1916815260200190815260200160002060000160146101000a8154816bffffffffffffffffffffffff02191690836bffffffffffffffffffffffff160217905550505b8460010160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000018054806111bb576111ba611a98565b5b60019003818190600052602060002090600891828204019190066004026101000a81549063ffffffff02191690559055846000016000847bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19167bffffffffffffffffffffffffffffffffffffffffffffffffffffffff19168152602001908152602001600020600080820160006101000a81549073ffffffffffffffffffffffffffffffffffffffff02191690556000820160146101000a8154906bffffffffffffffffffffffff021916905550506000810361147a576000600186600201805490506112a59190611a7a565b905060008660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001015490508181146113e657600087600201838154811061130f5761130e611510565b5b9060005260206000200160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1690508088600201838154811061135357611352611510565b5b9060005260206000200160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff160217905550818860010160008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060010181905550505b866002018054806113fa576113f9611a98565b5b6001900381819060005260206000200160006101000a81549073ffffffffffffffffffffffffffffffffffffffff021916905590558660010160008773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206001016000905550505b5050505050565b6000823b90506000811182906114cd576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016114c49190611aae565b60405180910390fd5b50505050565b602081526020808201527f4469616d6f6e643a2046756e6374696f6e20646f6573206e6f7420657869737460408201526000606082019050919050565b634e487b7160e01b600052603260045260246000fd5b634e487b7160e01b600052602160045260246000fd5b60208152602760208201527f4c69624469616d6f6e644375743a20496e636f7272656374204661636574437560408201527f74416374696f6e0000000000000000000000000000000000000000000000000060608201526000608082019050919050565b634e487b7160e01b600052601160045260246000fd5b6000801982036115c9576115c86115a0565b5b600182019050919050565b60018060a01b03811682525050565b60005b838110156116015780820151818401526020810190506115e6565b50600083830152505050565b600081518084526116258160208601602086016115e3565b6020601f19601f83011685010191505092915050565b60006060808301818452808751808352608092508286019150828160051b8701016020808b0160005b8481101561171757607f198a8503018652815188850160018060a01b03825116865284820151600381106116a857634e487b7160e01b600052602160045260246000fd5b80868801525060408083015192508a81880152508082518083528a880191508684019350600092505b808310156116fb5763ffffffff60e01b8451168252868201915086840193506001830192506116d1565b5080965050505082820191508286019550600181019050611664565b50506117258189018b6115d4565b508681036040880152611738818961160d565b95505050505050949350505050565b60208152602b60208201527f4c69624469616d6f6e644375743a204e6f2073656c6563746f727320696e206660408201527f6163657420746f2063757400000000000000000000000000000000000000000060608201526000608082019050919050565b60208152602c60208201527f4c69624469616d6f6e644375743a204164642066616365742063616e2774206260408201527f652061646472657373283029000000000000000000000000000000000000000060608201526000608082019050919050565b60208152603560208201527f4c69624469616d6f6e644375743a2043616e2774206164642066756e6374696f60408201527f6e207468617420616c726561647920657869737473000000000000000000000060608201526000608082019050919050565b60006bffffffffffffffffffffffff808316818103611895576118946115a0565b5b6001810192505050919050565b60208152603860208201527f4c69624469616d6f6e644375743a2043616e2774207265706c6163652066756e60408201527f6374696f6e20776974682073616d652066756e6374696f6e000000000000000060608201526000608082019050919050565b60208152603660208201527f4c69624469616d6f6e644375743a2052656d6f7665206661636574206164647260408201527f657373206d75737420626520616464726573732830290000000000000000000060608201526000608082019050919050565b6000825161197c8184602087016115e3565b80830191505092915050565b60018060a01b03831681526040602082015260006119a9604083018461160d565b90509392505050565b60208152603760208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f76652066756e6360408201527f74696f6e207468617420646f65736e277420657869737400000000000000000060608201526000608082019050919050565b60208152602e60208201527f4c69624469616d6f6e644375743a2043616e27742072656d6f766520696d6d7560408201527f7461626c652066756e6374696f6e00000000000000000000000000000000000060608201526000608082019050919050565b6000828203905081811115611a9257611a916115a0565b5b92915050565b634e487b7160e01b600052603160045260246000fd5b602081526000611ac1602083018461160d565b90509291505056fe4c69624469616d6f6e644375743a205f696e6974206164647265737320686173206e6f20636f64654c69624469616d6f6e644375743a204e657720666163657420686173206e6f20636f6465a264697066735822122045b771fb2128a1a34c5b052e9a86464933844b34929cf0d65bbea6a4e76e3b2764736f6c634300081200334c69624469616d6f6e644375743a205f696e6974206164647265737320686173206e6f20636f64654c69624469616d6f6e644375743a204e657720666163657420686173206e6f20636f6465");
+    input.set_public_key("0xB5547FBdC56DCE45e1B8ef75569916D438e09c46");
+    input.set_salt(0);
+
+    // C++
+    {
+        const std::string& address = getCounterfactualAddress(input);
+        ASSERT_EQ(address, "0x77F62bb3E43190253D4E198199356CD2b25063cA");
+    }
+
+    // C
+    {
+        const auto inputData = input.SerializeAsString();
+        const auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));
+        const auto& result = WRAPS(TWBarzGetCounterfactualAddress(inputTWData.get()));
+        assertStringsEqual(result, "0x77F62bb3E43190253D4E198199356CD2b25063cA");
+    }
+}
+
+TEST(Barz, GetCounterfactualAddressNonZeroSalt) {
+    TW::Barz::Proto::ContractAddressInput input;
+    input.set_factory("0x96C489979E39F877BDb8637b75A25C1a5B2DE14C");
+    input.set_account_facet("0xF6F5e5fC74905e65e3FF53c6BacEba8535dd14d1");
+    input.set_verification_facet("0xaB84813cbf26Fd951CB3d7E33Dccb8995027e490");
+    input.set_entry_point("0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789");
+    input.set_facet_registry("0x9a95d201BB8F559771784D12c01F8084278c65E5");
+    input.set_default_fallback("0x522cDc7558b5f798dF5D61AB09B6D95Ebd342EF9");
+    input.set_bytecode("0x60806040526040516104c83803806104c883398101604081905261002291610163565b6000858585858560405160240161003d959493929190610264565b60408051601f198184030181529181526020820180516001600160e01b0316634a93641760e01b1790525190915060009081906001600160a01b038a16906100869085906102c3565b600060405180830381855af49150503d80600081146100c1576040519150601f19603f3d011682016040523d82523d6000602084013e6100c6565b606091505b50915091508115806100e157506100dc816102df565b600114155b156100ff57604051636ff35f8960e01b815260040160405180910390fd5b505050505050505050610306565b80516001600160a01b038116811461012457600080fd5b919050565b634e487b7160e01b600052604160045260246000fd5b60005b8381101561015a578181015183820152602001610142565b50506000910152565b60008060008060008060c0878903121561017c57600080fd5b6101858761010d565b95506101936020880161010d565b94506101a16040880161010d565b93506101af6060880161010d565b92506101bd6080880161010d565b60a08801519092506001600160401b03808211156101da57600080fd5b818901915089601f8301126101ee57600080fd5b81518181111561020057610200610129565b604051601f8201601f19908116603f0116810190838211818310171561022857610228610129565b816040528281528c602084870101111561024157600080fd5b61025283602083016020880161013f565b80955050505050509295509295509295565b600060018060a01b0380881683528087166020840152808616604084015280851660608401525060a0608083015282518060a08401526102ab8160c085016020870161013f565b601f01601f19169190910160c0019695505050505050565b600082516102d581846020870161013f565b9190910192915050565b80516020808301519190811015610300576000198160200360031b1b821691505b50919050565b6101b3806103156000396000f3fe60806040523661000b57005b600080356001600160e01b03191681527f183cde5d4f6bb7b445b8fc2f7f15d0fd1d162275aded24183babbffee7cd491f6020819052604090912054819060601c806100cf576004838101546040516366ffd66360e11b81526000356001600160e01b031916928101929092526001600160a01b03169063cdffacc690602401602060405180830381865afa1580156100a8573d6000803e3d6000fd5b505050506040513d601f19601f820116820180604052508101906100cc919061014d565b90505b6001600160a01b0381166101295760405162461bcd60e51b815260206004820152601d60248201527f4261727a3a2046756e6374696f6e20646f6573206e6f74206578697374000000604482015260640160405180910390fd5b3660008037600080366000845af43d6000803e808015610148573d6000f35b3d6000fd5b60006020828403121561015f57600080fd5b81516001600160a01b038116811461017657600080fd5b939250505056fea2646970667358221220d35db061bb6ecdb7688c3674af669ce44d527cae4ded59214d06722d73da62be64736f6c63430008120033");
+    input.set_public_key("0xB5547FBdC56DCE45e1B8ef75569916D438e09c46");
+    input.set_salt(123456);
+
+    // C++
+    {
+        const std::string& address = getCounterfactualAddress(input);
+        ASSERT_EQ(address, "0xB91aaa96B138A1B1D94c9df4628187132c5F2bf1");
+    }
+
+    // C
+    {
+        const auto inputData = input.SerializeAsString();
+        const auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));
+        const auto& result = WRAPS(TWBarzGetCounterfactualAddress(inputTWData.get()));
+        assertStringsEqual(result, "0xB91aaa96B138A1B1D94c9df4628187132c5F2bf1");
+    }
+}
+
+TEST(Barz, GetFormattedSignature) {
+    // C++
+    {
+        const Data& signature = parse_hex("0x3044022012d89e3b41e253dc9e90bd34dc1750d059b76d0b1d16af2059aa26e90b8960bf0220256d8a05572c654906ce422464693e280e243e6d9dbc5f96a681dba846bca276");
+        const Data& challenge = parse_hex("0xcf267a78c5adaf96f341a696eb576824284c572f3e61be619694d539db1925f9");
+        const Data& authenticatorData = parse_hex("0x1a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d00000000");
+        const std::string& clientDataJSON = "{\"type\":\"webauthn.get\",\"challenge\":\"zyZ6eMWtr5bzQaaW61doJChMVy8-Yb5hlpTVOdsZJfk\",\"origin\":\"https://trustwallet.com\"}";
+
+        const auto& formattedSignature = Barz::getFormattedSignature(signature, challenge, authenticatorData, clientDataJSON);
+        ASSERT_EQ(hexEncoded(formattedSignature), "0x12d89e3b41e253dc9e90bd34dc1750d059b76d0b1d16af2059aa26e90b8960bf256d8a05572c654906ce422464693e280e243e6d9dbc5f96a681dba846bca27600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000251a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000247b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a22000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025222c226f726967696e223a2268747470733a2f2f747275737477616c6c65742e636f6d227d000000000000000000000000000000000000000000000000000000");
+    }
+
+    // C
+    {
+        const auto signature = DATA("0x3044022012d89e3b41e253dc9e90bd34dc1750d059b76d0b1d16af2059aa26e90b8960bf0220256d8a05572c654906ce422464693e280e243e6d9dbc5f96a681dba846bca276");
+        const auto challenge = DATA("0xcf267a78c5adaf96f341a696eb576824284c572f3e61be619694d539db1925f9");
+        const auto authenticatorData = DATA("0x1a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d00000000");
+        const auto clientDataJSON = STRING("{\"type\":\"webauthn.get\",\"challenge\":\"zyZ6eMWtr5bzQaaW61doJChMVy8-Yb5hlpTVOdsZJfk\",\"origin\":\"https://trustwallet.com\"}");
+
+        const auto& formattedSignatureData = TWBarzGetFormattedSignature(signature.get(), challenge.get(), authenticatorData.get(), clientDataJSON.get());
+        const auto& formattedSignature = hexEncoded(*reinterpret_cast<const Data*>(WRAPD(formattedSignatureData).get()));
+        EXPECT_EQ(formattedSignature, "0x12d89e3b41e253dc9e90bd34dc1750d059b76d0b1d16af2059aa26e90b8960bf256d8a05572c654906ce422464693e280e243e6d9dbc5f96a681dba846bca27600000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000016000000000000000000000000000000000000000000000000000000000000000251a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000247b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a22000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000025222c226f726967696e223a2268747470733a2f2f747275737477616c6c65742e636f6d227d000000000000000000000000000000000000000000000000000000");
+    }
+}
+
+// https://testnet.bscscan.com/tx/0x43fc13dfdf06bbb09da8ce070953753764f1e43782d0c8b621946d8b45749419
+TEST(Barz, SignK1TransferAccountDeployed) {
+    TW::Ethereum::Proto::SigningInput input;
+    auto chainId = store(uint256_t(97));
+    auto nonce = store(uint256_t(2));
+    auto amount = store(uint256_t(0x2386f26fc10000));
+    auto gasLimit = store(uint256_t(0x186A0));
+    auto verificationGasLimit = store(uint256_t(0x186a0));
+    auto maxFeePerGas = store(uint256_t(0x1a339c9e9));
+    auto maxInclusionFeePerGas = store(uint256_t(0x1a339c9e9));
+    auto preVerificationGas = store(uint256_t(0xb708));
+    auto entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
+    auto sender = "0xb16Db98B365B1f89191996942612B14F1Da4Bd5f";
+    auto to = "0x61061fCAE11fD5461535e134EfF67A98CFFF44E9";
+
+    auto key = parse_hex("0x3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_tx_mode(TW::Ethereum::Proto::TransactionMode::UserOp);
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    input.set_to_address(to);
+
+    auto& user_operation = *input.mutable_user_operation();
+    user_operation.set_verification_gas_limit(verificationGasLimit.data(), verificationGasLimit.size());
+    user_operation.set_pre_verification_gas(preVerificationGas.data(), preVerificationGas.size());
+    user_operation.set_entry_point(entryPoint);
+    user_operation.set_sender(sender);
+
+    input.set_private_key(key.data(), key.size());
+    auto& transfer = *input.mutable_transaction()->mutable_transfer();
+    transfer.set_amount(amount.data(), amount.size());
+
+    std::string expected = "{\"callData\":\"0xb61d27f600000000000000000000000061061fcae11fd5461535e134eff67a98cfff44e9000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"100000\",\"initCode\":\"0x\",\"maxFeePerGas\":\"7033440745\",\"maxPriorityFeePerGas\":\"7033440745\",\"nonce\":\"2\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"46856\",\"sender\":\"0xb16Db98B365B1f89191996942612B14F1Da4Bd5f\",\"signature\":\"0x80e84992ebf8d5f71180231163ed150a7557ed0aa4b4bcee23d463a09847e4642d0fbf112df2e5fa067adf4b2fa17fc4a8ac172134ba5b78e3ec9c044e7f28d71c\",\"verificationGasLimit\":\"100000\"}";
+
+    {
+        // sign test
+        TW::Ethereum::Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeEthereum);
+
+        ASSERT_EQ(hexEncoded(output.pre_hash()), "0x2d37191a8688f69090451ed90a0a9ba69d652c2062ee9d023b3ebe964a3ed2ae");
+        ASSERT_EQ(std::string(output.encoded()), expected);
+    }
+}
+
+// https://testnet.bscscan.com/tx/0xea1f5cddc0653e116327cbcb3bc770360a642891176eff2ec69c227e46791c31
+TEST(Barz, SignR1TransferAccountNotDeployed) {
+    TW::Ethereum::Proto::SigningInput input;
+    auto chainId = store(uint256_t(97));
+    auto nonce = store(uint256_t(0));
+    auto amount = store(uint256_t(0x2386f26fc10000));
+    auto gasLimit = store(uint256_t(0x2625A0));
+    auto verificationGasLimit = store(uint256_t(0x2DC6C0));
+    auto maxFeePerGas = store(uint256_t(0x1a339c9e9));
+    auto maxInclusionFeePerGas = store(uint256_t(0x1a339c9e9));
+    auto preVerificationGas = store(uint256_t(0xb708));
+    auto entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
+    auto sender = "0x1392Ae041BfBdBAA0cFF9234a0C8F64df97B7218";
+    auto to = "0x61061fCAE11fD5461535e134EfF67A98CFFF44E9";
+    auto factory = "0x3fC708630d85A3B5ec217E53100eC2b735d4f800";
+    auto verificationFacet = "0x5034534Efe9902779eD6eA6983F435c00f3bc510";
+    auto publicKey = PublicKey(parse_hex("0x04b173a6a812025c40c38bac46343646bd0a8137c807aae6e04aac238cc24d2ad2116ca14d23d357588ff2aabd7db29d5976f4ecc8037775db86f67e873a306b1f"), TWPublicKeyTypeNIST256p1Extended);
+    auto salt = 0;
+    auto initCode = Barz::getInitCode(factory, publicKey, verificationFacet, salt);
+
+    auto key = parse_hex("0x3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_tx_mode(TW::Ethereum::Proto::TransactionMode::UserOp);
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    input.set_to_address(to);
+
+    auto& user_operation = *input.mutable_user_operation();
+    user_operation.set_verification_gas_limit(verificationGasLimit.data(), verificationGasLimit.size());
+    user_operation.set_pre_verification_gas(preVerificationGas.data(), preVerificationGas.size());
+    user_operation.set_entry_point(entryPoint);
+    user_operation.set_sender(sender);
+    user_operation.set_init_code(initCode.data(), initCode.size());
+
+    input.set_private_key(key.data(), key.size());
+    auto& transfer = *input.mutable_transaction()->mutable_transfer();
+    transfer.set_amount(amount.data(), amount.size());
+
+    std::string expected = "{\"callData\":\"0xb61d27f600000000000000000000000061061fcae11fd5461535e134eff67a98cfff44e9000000000000000000000000000000000000000000000000002386f26fc1000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"2500000\",\"initCode\":\"0x3fc708630d85a3b5ec217e53100ec2b735d4f800296601cd0000000000000000000000005034534efe9902779ed6ea6983f435c00f3bc51000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004104b173a6a812025c40c38bac46343646bd0a8137c807aae6e04aac238cc24d2ad2116ca14d23d357588ff2aabd7db29d5976f4ecc8037775db86f67e873a306b1f00000000000000000000000000000000000000000000000000000000000000\",\"maxFeePerGas\":\"7033440745\",\"maxPriorityFeePerGas\":\"7033440745\",\"nonce\":\"0\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"46856\",\"sender\":\"0x1392Ae041BfBdBAA0cFF9234a0C8F64df97B7218\",\"signature\":\"0xbf1b68323974e71ad9bd6dfdac07dc062599d150615419bb7876740d2bcf3c8909aa7e627bb0e08a2eab930e2e7313247c9b683c884236dd6ea0b6834fb2cb0a1b\",\"verificationGasLimit\":\"3000000\"}";
+    {
+        // sign test
+        TW::Ethereum::Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeEthereum);
+
+        ASSERT_EQ(hexEncoded(output.pre_hash()), "0x548c13a0bb87981d04a3a24a78ad5e4ba8d0afbf3cfe9311250e07b54cd38937");
+        ASSERT_EQ(std::string(output.encoded()), expected);
+    }
+}
+
+// https://testnet.bscscan.com/tx/0x872f709815a9f79623a349f2f16d93b52c4d5136967bab53a586f045edbe9203
+TEST(Barz, SignR1BatchedTransferAccountDeployed) {
+    TW::Ethereum::Proto::SigningInput input;
+    auto chainId = store(uint256_t(97));
+    auto nonce = store(uint256_t(3));
+    auto amount = store(uint256_t(0x00));
+    auto gasLimit = store(uint256_t(0x015A61));
+    auto verificationGasLimit = store(uint256_t(0x07F7C4));
+    auto maxFeePerGas = store(uint256_t(0x02540BE400));
+    auto maxInclusionFeePerGas = store(uint256_t(0x02540BE400));
+    auto preVerificationGas = store(uint256_t(0xDAFC));
+    auto entryPoint = "0x5FF137D4b0FDCD49DcA30c7CF57E578a026d2789";
+    auto sender = "0x1e6c542ebc7c960c6a155a9094db838cef842cf5";
+    auto to = "0x03bBb5660B8687C2aa453A0e42dCb6e0732b1266";
+
+    auto key = parse_hex("0x3c90badc15c4d35733769093d3733501e92e7f16e101df284cee9a310d36c483");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_tx_mode(TW::Ethereum::Proto::TransactionMode::UserOp);
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    input.set_to_address(to);
+
+    auto& user_operation = *input.mutable_user_operation();
+    user_operation.set_verification_gas_limit(verificationGasLimit.data(), verificationGasLimit.size());
+    user_operation.set_pre_verification_gas(preVerificationGas.data(), preVerificationGas.size());
+    user_operation.set_entry_point(entryPoint);
+    user_operation.set_sender(sender);
+
+
+    // approve
+    TWEthereumAbiFunction* approveFunc = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("approve")).get());
+    TWEthereumAbiFunctionAddParamAddress(approveFunc, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("5FF137D4b0FDCD49DcA30c7CF57E578a026d2789")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamUInt256(approveFunc, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("8AC7230489E80000")).get())).get(), false);
+    auto approveCallEncoded = WRAPD(TWEthereumAbiEncode(approveFunc));
+    auto approveCall = data(TWDataBytes(approveCallEncoded.get()), TWDataSize(approveCallEncoded.get()));
+    EXPECT_EQ(hex(approveCall), "095ea7b30000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e80000");
+
+    // transfer
+    TWEthereumAbiFunction* transferFunc = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("transfer")).get());
+    TWEthereumAbiFunctionAddParamAddress(transferFunc, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("5FF137D4b0FDCD49DcA30c7CF57E578a026d2789")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamUInt256(transferFunc, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("8AC7230489E80000")).get())).get(), false);
+    auto transferCallEncoded = WRAPD(TWEthereumAbiEncode(transferFunc));
+    auto transferCall = data(TWDataBytes(transferCallEncoded.get()), TWDataSize(transferCallEncoded.get()));
+    EXPECT_EQ(hex(transferCall), "a9059cbb0000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e80000");
+
+    auto *batch = input.mutable_transaction()->mutable_batch();
+    auto *c1 = batch->add_calls();
+    c1->set_address(to);
+    c1->set_amount(amount.data(), amount.size());
+    c1->set_payload(approveCall.data(), approveCall.size());
+    auto *c2 = batch->add_calls();
+    c2->set_address(to);
+    c2->set_amount(amount.data(), amount.size());
+    c2->set_payload(transferCall.data(), transferCall.size());
+
+    input.set_private_key(key.data(), key.size());
+
+    std::string expected = "{\"callData\":\"0x47e1da2a000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000000200000000000000000000000003bbb5660b8687c2aa453a0e42dcb6e0732b126600000000000000000000000003bbb5660b8687c2aa453a0e42dcb6e0732b12660000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000000c00000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e80000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000044a9059cbb0000000000000000000000005ff137d4b0fdcd49dca30c7cf57e578a026d27890000000000000000000000000000000000000000000000008ac7230489e8000000000000000000000000000000000000000000000000000000000000\",\"callGasLimit\":\"88673\",\"initCode\":\"0x\",\"maxFeePerGas\":\"10000000000\",\"maxPriorityFeePerGas\":\"10000000000\",\"nonce\":\"3\",\"paymasterAndData\":\"0x\",\"preVerificationGas\":\"56060\",\"sender\":\"0x1E6c542ebC7c960c6A155A9094DB838cEf842cf5\",\"signature\":\"0x0747b665fe9f3a52407f95a35ac3e76de37c9b89483ae440431244e89a77985f47df712c7364c1a299a5ef62d0b79a2cf4ed63d01772275dd61f72bd1ad5afce1c\",\"verificationGasLimit\":\"522180\"}";
+    {
+        // sign test
+        TW::Ethereum::Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeEthereum);
+
+        ASSERT_EQ(hexEncoded(output.pre_hash()), "0x84d0464f5a2b191e06295443970ecdcd2d18f565d0d52b5a79443192153770ab");
+        ASSERT_EQ(std::string(output.encoded()), expected);
+    }
+
+    TWEthereumAbiFunctionDelete(approveFunc);
+    TWEthereumAbiFunctionDelete(transferFunc);
+}
+
+TEST(Barz, GetPrefixedMsgHash) {
+    {
+        const Data& msgHash = parse_hex("0xa6ebe22d8c1ec7edbd7f5776e49a161f67ab97161d7b8c648d80abf365765cf2");
+        const std::string& barzAddress = "0x913233BfC283ffe89a5E70ADC39c0926d240bbD9";
+        const auto chainId = 3604;
+
+        const auto& prefixedMsgHash = Barz::getPrefixedMsgHash(msgHash, barzAddress, chainId);
+        ASSERT_EQ(hexEncoded(prefixedMsgHash), "0x0488fb3e4fdaa890bf55532fc9840fb9edef9c38244f431c9430a78a86d89157");
+    }
+}
+
+TEST(Barz, GetPrefixedMsgHashWithZeroChainId) {
+    {
+        const Data& msgHash = parse_hex("0xcf267a78c5adaf96f341a696eb576824284c572f3e61be619694d539db1925f9");
+        const std::string& barzAddress = "0xB91aaa96B138A1B1D94c9df4628187132c5F2bf1";
+        const auto chainId = 0;
+
+        const auto& prefixedMsgHash = Barz::getPrefixedMsgHash(msgHash, barzAddress, chainId);
+        ASSERT_EQ(hexEncoded(prefixedMsgHash), "0xc74e78634261222af51530703048f98a1b7b995a606a624f0a008e7aaba7a21b");
+    }
+}
+
+TEST(Barz, GetDiamondCutCode) {
+    {
+        TW::Barz::Proto::DiamondCutInput input;
+
+        input.set_init_address("0x0000000000000000000000000000000000000000");
+        input.set_init_data("0x00");
+
+        auto* facetCutAdd = input.add_facet_cuts();
+        facetCutAdd->set_facet_address("0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6");
+        facetCutAdd->set_action(TW::Barz::Proto::FacetCutAction::ADD);
+
+        auto functionSelectorAdd = parse_hex("0xfdd8a83c");
+        facetCutAdd->add_function_selectors(functionSelectorAdd.data(), functionSelectorAdd.size());
+
+        const auto& diamondCutCode = Barz::getDiamondCutCode(input);
+        ASSERT_EQ(hexEncoded(diamondCutCode), "0x1f931c1c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000140000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002279b7a0a67db372996a5fab50d91eaa73d2ebe6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001fdd8a83c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000");
+    }
+}
+
+TEST(Barz, GetDiamondCutCodeWithMultipleCut) {
+    {
+        TW::Barz::Proto::DiamondCutInput input;
+
+        input.set_init_address("0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6");
+        input.set_init_data("0x12341234");
+
+        auto* facetCutMigrationFacet = input.add_facet_cuts();
+        facetCutMigrationFacet->set_facet_address("0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6");
+        facetCutMigrationFacet->set_action(TW::Barz::Proto::FacetCutAction::ADD);
+
+        auto migrationSignature = parse_hex("0xfdd8a83c");
+
+        facetCutMigrationFacet->add_function_selectors(migrationSignature.data(), migrationSignature.size());
+        facetCutMigrationFacet->add_function_selectors(migrationSignature.data(), migrationSignature.size());
+        facetCutMigrationFacet->add_function_selectors(migrationSignature.data(), migrationSignature.size());
+
+        auto* facetCutTestFacet = input.add_facet_cuts();
+        facetCutTestFacet->set_facet_address("0x6e3c94d74af6227aEeF75b54a679e969189a6aEC");
+        facetCutTestFacet->set_action(TW::Barz::Proto::FacetCutAction::ADD);
+
+        auto testSignature = parse_hex("0x12345678");
+        facetCutTestFacet->add_function_selectors(testSignature.data(), testSignature.size());
+
+
+        const auto& diamondCutCode = Barz::getDiamondCutCode(input);
+        ASSERT_EQ(hexEncoded(diamondCutCode), "0x1f931c1c00000000000000000000000000000000000000000000000000000000000000600000000000000000000000002279b7a0a67db372996a5fab50d91eaa73d2ebe600000000000000000000000000000000000000000000000000000000000002400000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001200000000000000000000000002279b7a0a67db372996a5fab50d91eaa73d2ebe6000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000003fdd8a83c00000000000000000000000000000000000000000000000000000000fdd8a83c00000000000000000000000000000000000000000000000000000000fdd8a83c000000000000000000000000000000000000000000000000000000000000000000000000000000006e3c94d74af6227aeef75b54a679e969189a6aec000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000001123456780000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000041234123400000000000000000000000000000000000000000000000000000000");
+    }
+}
+
+TEST(Barz, GetDiamondCutCodeWithZeroSelector) {
+    {
+        TW::Barz::Proto::DiamondCutInput input;
+
+        input.set_init_address("0x0000000000000000000000000000000000000000");
+        input.set_init_data("0x00");
+        auto* facetCutAdd = input.add_facet_cuts();
+        facetCutAdd->set_facet_address("0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6");
+        facetCutAdd->set_action(TW::Barz::Proto::FacetCutAction::ADD);
+
+        const auto& diamondCutCode = Barz::getDiamondCutCode(input);
+        ASSERT_EQ(hexEncoded(diamondCutCode), "0x1f931c1c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002279b7a0a67db372996a5fab50d91eaa73d2ebe600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000");
+    }
+}
+
+TEST(Barz, GetDiamondCutCodeWithLongInitData) {
+    {
+        TW::Barz::Proto::DiamondCutInput input;
+
+        input.set_init_address("0x0000000000000000000000000000000000000000");
+        input.set_init_data("0xb61d27f6000000000000000000000000c2ce171d25837cd43e496719f5355a847edc679b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024a526d83b00000000000000000000000090f79bf6eb2c4f870365e785982e1f101e93b90600000000000000000000000000000000000000000000000000000000");
+        auto* facetCutAdd = input.add_facet_cuts();
+        facetCutAdd->set_facet_address("0x2279B7A0a67DB372996a5FaB50D91eAA73d2eBe6");
+        facetCutAdd->set_action(TW::Barz::Proto::FacetCutAction::ADD);
+
+        const auto& diamondCutCode = Barz::getDiamondCutCode(input);
+        ASSERT_EQ(hexEncoded(diamondCutCode), "0x1f931c1c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000120000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000002279b7a0a67db372996a5fab50d91eaa73d2ebe600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c4b61d27f6000000000000000000000000c2ce171d25837cd43e496719f5355a847edc679b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000024a526d83b00000000000000000000000090f79bf6eb2c4f870365e785982e1f101e93b9060000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+    }
+}
+
+}
+
diff --git a/tests/chains/Ethereum/ContractCallTests.cpp b/tests/chains/Ethereum/ContractCallTests.cpp
new file mode 100644
index 00000000000..8ddf3cddad3
--- /dev/null
+++ b/tests/chains/Ethereum/ContractCallTests.cpp
@@ -0,0 +1,243 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Ethereum/ContractCall.h"
+#include "HexCoding.h"
+
+#include <fstream>
+#include <gtest/gtest.h>
+
+extern std::string TESTS_ROOT;
+
+namespace TW::Ethereum::ABI::tests {
+
+static nlohmann::json load_json(const std::string& path) {
+    std::ifstream stream(path);
+    nlohmann::json json;
+    stream >> json;
+    return json;
+}
+
+static std::string load_json_str(const std::string& path) {
+    std::ifstream stream(path);
+    std::string json((std::istreambuf_iterator<char>(stream)),
+                    std::istreambuf_iterator<char>());
+    return json;
+}
+
+TEST(ContractCall, Approval) {
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/erc20.json";
+    auto abi = load_json_str(path);
+    auto call = parse_hex("095ea7b30000000000000000000000005aaeb6053f3e94c9b9a09f33669435e7ef1beaed"
+                          "0000000000000000000000000000000000000000000000000000000000000001");
+    auto decoded = decodeCall(call, abi);
+
+    auto expected =
+        R"|({"function":"approve(address,uint256)","inputs":[{"name":"_spender","type":"address","value":"0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"},{"name":"_value","type":"uint256","value":"1"}]})|";
+
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, UniswapSwapTokens) {
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/uniswap_router_v2.json";
+    auto abi = load_json_str(path);
+    // https://etherscan.io/tx/0x57a2414f3cd9ca373b7e663ae67ecf933e40cb77a6e4ed28e4e28b5aa0d8ec63
+    auto call = parse_hex(
+        "0x38ed17390000000000000000000000000000000000000000000000000de0b6b3a76400000000000000000000"
+        "00000000000000000000000000000000229f7e501ad62bdb000000000000000000000000000000000000000000"
+        "00000000000000000000a00000000000000000000000007d8bf18c7ce84b3e175b339c4ca93aed1dd166f10000"
+        "00000000000000000000000000000000000000000000000000005f0ed070000000000000000000000000000000"
+        "00000000000000000000000000000000040000000000000000000000006b175474e89094c44da98b954eedeac4"
+        "95271d0f0000000000000000000000009f8f72aa9304c8b593d555f12ef6589cc3a579a2000000000000000000"
+        "000000c02aaa39b223fe8d0a0e5c4f27ead9083c756cc2000000000000000000000000e41d2489571d32218924"
+        "6dafa5ebde1f4699f498");
+    auto decoded = decodeCall(call, abi);
+    auto expected =
+        R"|({"function":"swapExactTokensForTokens(uint256,uint256,address[],address,uint256)","inputs":[{"name":"amountIn","type":"uint256","value":"1000000000000000000"},{"name":"amountOutMin","type":"uint256","value":"2494851601099271131"},{"name":"path","type":"address[]","value":["0x6B175474E89094C44Da98b954EedeAC495271d0F","0x9f8F72aA9304c8B593d555F12eF6589cC3A579A2","0xC02aaA39b223FE8D0A0e5C4F27eAD9083C756Cc2","0xE41d2489571d322189246DaFA5ebDe1F4699F498"]},{"name":"to","type":"address","value":"0x7d8bf18C7cE84b3E175b339c4Ca93aEd1dD166F1"},{"name":"deadline","type":"uint256","value":"1594806384"}]})|";
+
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, KyberTrade) {
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/kyber_proxy.json";
+    auto abi = load_json_str(path);
+
+    // https://etherscan.io/tx/0x51ffab782b9a27d754389505d5a50db525c04c68142ce20512d579f10f9e13e4
+    auto call = parse_hex(
+        "ae591d54000000000000000000000000eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee000000000000000000"
+        "000000000000000000000000000004a97d605a3b980000000000000000000000000000dac17f958d2ee523a220"
+        "6206994597c13d831ec70000000000000000000000007755297c6a26d495739206181fe81646dbd0bf39ffffff"
+        "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffff00000000000000000000000000000000"
+        "000000000000000ce32ff7d63c35d189000000000000000000000000440bbd6a888a36de6e2f6a25f65bc4e168"
+        "74faa9000000000000000000000000000000000000000000000000000000000000000800000000000000000000"
+        "000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000"
+        "000000000000000000");
+    auto decoded = decodeCall(call, abi);
+
+    auto expected =
+        R"|({"function":"tradeWithHintAndFee(address,uint256,address,address,uint256,uint256,address,uint256,bytes)","inputs":[{"name":"src","type":"address","value":"0xEeeeeEeeeEeEeeEeEeEeeEEEeeeeEeeeeeeeEEeE"},{"name":"srcAmount","type":"uint256","value":"86000000000000000000"},{"name":"dest","type":"address","value":"0xdAC17F958D2ee523a2206206994597C13D831ec7"},{"name":"destAddress","type":"address","value":"0x7755297C6A26D495739206181Fe81646dbD0Bf39"},{"name":"maxDestAmount","type":"uint256","value":"115792089237316195423570985008687907853269984665640564039457584007913129639935"},{"name":"minConversionRate","type":"uint256","value":"237731504554534883721"},{"name":"platformWallet","type":"address","value":"0x440bBd6a888a36DE6e2F6A25f65bc4e16874faa9"},{"name":"platformFeeBps","type":"uint256","value":"8"},{"name":"hint","type":"bytes","value":"0x"}]})|";
+
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, ApprovalForAll) {
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/erc721.json";
+    auto abi = load_json_str(path);
+
+    // https://etherscan.io/tx/0xc2744000a107aee4761cf8a638657f91c3003a54e2f1818c37d781be7e48187a
+    auto call = parse_hex("0xa22cb46500000000000000000000000088341d1a8f672d2780c8dc725902aae72f143b"
+                          "0c0000000000000000000000000000000000000000000000000000000000000001");
+    auto decoded = decodeCall(call, abi);
+
+    auto expected =
+        R"|({"function":"setApprovalForAll(address,bool)","inputs":[{"name":"to","type":"address","value":"0x88341d1a8F672D2780C8dC725902AAe72F143B0c"},{"name":"approved","type":"bool","value":true}]})|";
+
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, CustomCall) {
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/custom.json";
+    auto abi = load_json_str(path);
+
+    auto call = parse_hex("ec37a4a000000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000006400000000000000000000000000000000000000000000000000000000000000067472757374790000000000000000000000000000000000000000000000000000");
+    auto decoded = decodeCall(call, abi);
+    auto expected =
+        R"|({"function":"setName(string,uint256,int32)","inputs":[{"name":"name","type":"string","value":"trusty"},{"name":"age","type":"uint256","value":"3"},{"name":"height","type":"int32","value":"100"}]})|";
+
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, SetResolver) {
+    auto call = parse_hex("0x1896f70ae71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c"
+                          "6f0000000000000000000000004976fb03c32e5b8cfe2b6ccb31c09ba78ebaba41");
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/ens.json";
+    auto abi = load_json_str(path);
+    auto decoded = decodeCall(call, abi);
+    auto expected =
+        R"|({"function":"setResolver(bytes32,address)","inputs":[{"name":"node","type":"bytes32","value":"0xe71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f"},{"name":"resolver","type":"address","value":"0x4976fb03C32e5B8cfe2b6cCB31c09Ba78EBaBa41"}]})|";
+
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, RenewENS) {
+    auto call = parse_hex(
+        "0xacf1a84100000000000000000000000000000000000000000000000000000000000000400000000000000000"
+        "000000000000000000000000000000000000000001e18558000000000000000000000000000000000000000000"
+        "000000000000000000000a68657769676f76656e7300000000000000000000000000000000000000000000");
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/ens.json";
+    auto abi = load_json_str(path);
+    auto decoded = decodeCall(call, abi);
+    auto expected =
+        R"|({"function":"renew(string,uint256)","inputs":[{"name":"name","type":"string","value":"hewigovens"},{"name":"duration","type":"uint256","value":"31556952"}]})|";
+
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, Multicall) {
+    auto call = parse_hex(
+        "0xac9650d800000000000000000000000000000000000000000000000000000000000000200000000000000000"
+        "000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000"
+        "000000000000000000008000000000000000000000000000000000000000000000000000000000000001000000"
+        "0000000000000000000000000000000000000000000000000000000001a0000000000000000000000000000000"
+        "000000000000000000000000000000028000000000000000000000000000000000000000000000000000000000"
+        "00000044d5fa2b00e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f0000000000"
+        "0000000000000047331175b23c2f067204b506ca1501c26731c990000000000000000000000000000000000000"
+        "000000000000000000000000000000000000000000000000000000000000000000000000000000000064304e6a"
+        "dee71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f000000000000000000000000"
+        "000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000"
+        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+        "000000000000000000000000000000000000000000a48b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e"
+        "574c32a17a67156fa9ed3c4c6f000000000000000000000000000000000000000000000000000000000000003c"
+        "000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000"
+        "0000000000000000000000000000000000001447331175b23c2f067204b506ca1501c26731c990000000000000"
+        "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+        "0000000000000000000000000000000000000000a48b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e57"
+        "4c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000002ca00"
+        "000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000"
+        "000000000000000000000000000000000014d30f834b53d8f7e851e87b90ffa65757a35b850500000000000000"
+        "000000000000000000000000000000000000000000000000000000000000000000");
+    ASSERT_EQ(4 + 928ul, call.size());
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/ens.json";
+    auto abi = load_json_str(path);
+    auto decoded = decodeCall(call, abi);
+    auto expected =
+        R"|({"function":"multicall(bytes[])","inputs":[{"name":"data","type":"bytes[]","value":["0xd5fa2b00e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000047331175b23c2f067204b506ca1501c26731c990","0x304e6adee71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000000","0x8b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f000000000000000000000000000000000000000000000000000000000000003c0000000000000000000000000000000000000000000000000000000000000060000000000000000000000000000000000000000000000000000000000000001447331175b23c2f067204b506ca1501c26731c990000000000000000000000000","0x8b95dd71e71cd96d4ba1c4b512b0c5bee30d2b6becf61e574c32a17a67156fa9ed3c4c6f00000000000000000000000000000000000000000000000000000000000002ca00000000000000000000000000000000000000000000000000000000000000600000000000000000000000000000000000000000000000000000000000000014d30f834b53d8f7e851e87b90ffa65757a35b8505000000000000000000000000"]}]})|";
+
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, Invalid) {
+    EXPECT_FALSE(decodeCall(Data(), "{}").has_value());
+    EXPECT_FALSE(decodeCall(parse_hex("0xa22cb46500"), "{}").has_value());
+}
+
+TEST(ContractCall, GetAmountsOut) {
+    auto call = parse_hex(
+        "d06ca61f"
+        "0000000000000000000000000000000000000000000000000000000000000064"
+        "0000000000000000000000000000000000000000000000000000000000000040"
+        "0000000000000000000000000000000000000000000000000000000000000001"
+        "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077");
+    auto path = TESTS_ROOT + "/chains/Ethereum/Data/getAmountsOut.json";
+    auto abi = load_json_str(path);
+
+    auto decoded = decodeCall(call, abi);
+    ASSERT_TRUE(decoded.has_value());
+    auto expected =
+        R"|({"function":"getAmountsOut(uint256,address[])","inputs":[{"name":"amountIn","type":"uint256","value":"100"},{"name":"path","type":"address[]","value":["0xF784682C82526e245F50975190EF0fff4E4fC077"]}]})|";
+    EXPECT_EQ(decoded.value(), expected);
+}
+
+TEST(ContractCall, 1inch) {
+    auto abiPath = TESTS_ROOT + "/chains/Ethereum/Data/1inch.json";
+    auto decodedPath = TESTS_ROOT + "/chains/Ethereum/Data/1inch_decoded.json";
+
+    auto abi = load_json_str(abiPath);
+    auto expected = load_json(decodedPath);
+
+    // https://etherscan.io/tx/0xc2d113151124579c21332d4cc6ab2b7f61e81d62392ed8596174513cb47e35ba
+    auto call = parse_hex(
+        "7c02520000000000000000000000000027239549dd40e1d60f5b80b0c4196923745b1fd2000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000001800000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb39000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000027239549dd40e1d60f5b80b0c4196923745b1fd20000000000000000000000001611c227725c5e420ef058275ae772b41775e261000000000000000000000000000000000000000000000000000005d0fadb1c0000000000000000000000000000000000000000000000000000000005c31df1da000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002080000000000000000000000069d91b94f0aaf8e8a2586909fa77a5c2c89818d50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000104128acb080000000000000000000000001611c227725c5e420ef058275ae772b41775e2610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000005d0fadb1c0000000000000000000000000000000000000000000000000000000001000276a400000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000400000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb39000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000");
+    auto decoded = decodeCall(call, abi);
+
+    ASSERT_TRUE(decoded.has_value());
+    nlohmann::json decodedJson = nlohmann::json::parse(decoded.value());
+    EXPECT_EQ(decodedJson, expected);
+}
+
+TEST(ContractCall, TupleNested) {
+    auto abiPath = TESTS_ROOT + "/chains/Ethereum/Data/tuple_nested.json";
+    auto decodedPath = TESTS_ROOT + "/chains/Ethereum/Data/tuple_nested_decoded.json";
+    auto abi = load_json_str(abiPath);
+    auto expected = load_json(decodedPath);
+
+    auto call = parse_hex(
+        "74b6ef0b"
+        "0000000000000000000000000000000000000000000000000000000000000001"
+        "0000000000000000000000000000000000000000000000000000000000000002"
+        "0000000000000000000000000000000000000000000000000000000000000003"
+        "0000000000000000000000000000000000000000000000000000000000000004"
+        "0000000000000000000000000000000000000000000000000000000000000005"
+        "0000000000000000000000000000000000000000000000000000000000000001");
+    auto decoded = decodeCall(call, abi);
+    ASSERT_TRUE(decoded.has_value());
+    nlohmann::json decodedJson = nlohmann::json::parse(decoded.value());
+    EXPECT_EQ(decodedJson, expected);
+}
+
+TEST(ContractCall, TupleArray) {
+    auto abiPath = TESTS_ROOT + "/chains/Ethereum/Data/swap_v2.json";
+    auto decodedPath = TESTS_ROOT + "/chains/Ethereum/Data/swap_v2_decoded.json";
+    auto abi = load_json_str(abiPath);
+    auto expectedJson = load_json(decodedPath);
+
+    auto call = parse_hex("846a1bc6000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec700000000000000000000000000000000000000000000000000470de4df82000000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000740000000000000000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000000000820000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b00000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000001800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b300000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f00000000000000000000000000000000000000000000000000470de4df820000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000046000000000000000000000000000000000000000000000000000000000000003840651cb35000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000bebc44782c7db0a1a60cb6fe97d0b483032ff1c7000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df8200000000000000000000000000000000000000000000000000000000298ce42936ed0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ce16f69375520ab01377ce7b88f5ba8c48f8d66600000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000045553444300000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000762696e616e636500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002a307863653136463639333735353230616230313337376365374238386635424138433438463844363636000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000005a0000000000000000000000000000000000000000000000000000000000000072000000000000000000000000000000000000000000000000000000000000009600000000000000000000000000000000000000000000000000000000000000ac000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000000000000000000000000000000000000000000010000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb1400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf3890000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000640000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7044000000000000000000000000000000000000000000000000000029a23529cf68000000000000000000000000000000000000000000005af4f3f913bd553d03b900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf30000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000100000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf38900000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000001f40000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7045000000000000000000000000000000000000000000005b527785e694f805bdd300000000000000000000000000000000000000000000005f935a1fa5c4a6ec61000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000242e1a7d4d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000");
+    auto decoded = decodeCall(call, abi);
+    ASSERT_TRUE(decoded.has_value());
+
+    nlohmann::json parsedJson = nlohmann::json::parse(decoded.value());
+    EXPECT_EQ(parsedJson, expectedJson);
+}
+
+} // namespace TW::Ethereum::ABI::tests
diff --git a/tests/Ethereum/Data/1inch.json b/tests/chains/Ethereum/Data/1inch.json
similarity index 100%
rename from tests/Ethereum/Data/1inch.json
rename to tests/chains/Ethereum/Data/1inch.json
diff --git a/tests/chains/Ethereum/Data/1inch_decoded.json b/tests/chains/Ethereum/Data/1inch_decoded.json
new file mode 100644
index 00000000000..a9f8a63895e
--- /dev/null
+++ b/tests/chains/Ethereum/Data/1inch_decoded.json
@@ -0,0 +1,61 @@
+{
+    "function": "swap(address,(address,address,address,address,uint256,uint256,uint256,bytes),bytes)",
+    "inputs": [
+        {
+            "name": "caller",
+            "type": "address",
+            "value": "0x27239549DD40E1D60F5B80B0C4196923745B1FD2"
+        },
+        {
+            "components": [
+                {
+                    "name": "srcToken",
+                    "type": "address",
+                    "value": "0x2b591e99afE9f32eAA6214f7B7629768c40Eeb39"
+                },
+                {
+                    "name": "dstToken",
+                    "type": "address",
+                    "value": "0xA0b86991c6218b36c1d19D4a2e9Eb0cE3606eB48"
+                },
+                {
+                    "name": "srcReceiver",
+                    "type": "address",
+                    "value": "0x27239549DD40E1D60F5B80B0C4196923745B1FD2"
+                },
+                {
+                    "name": "dstReceiver",
+                    "type": "address",
+                    "value": "0x1611C227725c5E420Ef058275AE772b41775e261"
+                },
+                {
+                    "name": "amount",
+                    "type": "uint256",
+                    "value": "6395120000000"
+                },
+                {
+                    "name": "minReturnAmount",
+                    "type": "uint256",
+                    "value": "24748356058"
+                },
+                {
+                    "name": "flags",
+                    "type": "uint256",
+                    "value": "4"
+                },
+                {
+                    "name": "permit",
+                    "type": "bytes",
+                    "value": "0x"
+                }
+            ],
+            "name": "desc",
+            "type": "tuple"
+        },
+        {
+            "name": "data",
+            "type": "bytes",
+            "value": "0x00000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000002080000000000000000000000069d91b94f0aaf8e8a2586909fa77a5c2c89818d50000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000104128acb080000000000000000000000001611c227725c5e420ef058275ae772b41775e2610000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000005d0fadb1c0000000000000000000000000000000000000000000000000000000001000276a400000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000400000000000000000000000002b591e99afe9f32eaa6214f7b7629768c40eeb39000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tests/chains/Ethereum/Data/custom.json b/tests/chains/Ethereum/Data/custom.json
new file mode 100644
index 00000000000..711a8c86217
--- /dev/null
+++ b/tests/chains/Ethereum/Data/custom.json
@@ -0,0 +1,20 @@
+{
+    "ec37a4a0": {
+        "constant": false,
+        "inputs": [{
+            "name": "name",
+            "type": "string"
+        }, {
+            "name": "age",
+            "type": "uint"
+        }, {
+            "name": "height",
+            "type": "int32"
+        }],
+        "name": "setName",
+        "outputs": [],
+        "payable": false,
+        "stateMutability": "nonpayable",
+        "type": "function"
+    }
+}
\ No newline at end of file
diff --git a/tests/chains/Ethereum/Data/eip712_cryptofights.json b/tests/chains/Ethereum/Data/eip712_cryptofights.json
new file mode 100644
index 00000000000..563c8eaaa37
--- /dev/null
+++ b/tests/chains/Ethereum/Data/eip712_cryptofights.json
@@ -0,0 +1,83 @@
+{
+    "types": {
+        "EIP712Domain": [
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            },
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "address"
+            },
+            {
+                "name": "salt",
+                "type": "bytes32"
+            }
+        ],
+        "Trade": [
+            {
+                "name": "nonce",
+                "type": "bytes32"
+            },
+            {
+                "name": "firstParty",
+                "type": "address"
+            },
+            {
+                "name": "askingId",
+                "type": "uint256"
+            },
+            {
+                "name": "askingQty",
+                "type": "uint256"
+            },
+            {
+                "name": "offeringId",
+                "type": "uint256"
+            },
+            {
+                "name": "offeringQty",
+                "type": "uint256"
+            },
+            {
+                "name": "maxFee",
+                "type": "uint256"
+            },
+            {
+                "name": "secondParty",
+                "type": "address"
+            },
+            {
+                "name": "count",
+                "type": "uint8"
+            }
+        ]
+    },
+    "domain": {
+        "name": "CryptoFights Trading",
+        "version": "1",
+        "chainId": 1,
+        "verifyingContract": "0xdc45529aC0FA3185f79A005e57deF64F600c4e97",
+        "salt": "0x0"
+    },
+    "primaryType": "Trade",
+    "message": {
+        "count": 1,
+        "offeringQty": 1,
+        "askingQty": 2,
+        "nonce": "0xcfe49aa546453df3f2e768a97204a3268cef7c27df53cc2f2d47385cfeaf",
+        "firstParty": "0xC36edF48e21cf395B206352A1819DE658fD7f988",
+        "askingId": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "offeringId": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "maxFee": "1000000000000000000",
+        "secondParty": "0x0000000000000000000000000000000000000000"
+    }
+}
\ No newline at end of file
diff --git a/tests/Ethereum/Data/eip712_emptyArray.json b/tests/chains/Ethereum/Data/eip712_emptyArray.json
similarity index 100%
rename from tests/Ethereum/Data/eip712_emptyArray.json
rename to tests/chains/Ethereum/Data/eip712_emptyArray.json
diff --git a/tests/Ethereum/Data/eip712_emptyString.json b/tests/chains/Ethereum/Data/eip712_emptyString.json
similarity index 100%
rename from tests/Ethereum/Data/eip712_emptyString.json
rename to tests/chains/Ethereum/Data/eip712_emptyString.json
diff --git a/tests/chains/Ethereum/Data/eip712_greenfield.json b/tests/chains/Ethereum/Data/eip712_greenfield.json
new file mode 100644
index 00000000000..31382ae06ab
--- /dev/null
+++ b/tests/chains/Ethereum/Data/eip712_greenfield.json
@@ -0,0 +1,149 @@
+{
+    "types": {
+        "Coin": [
+            {
+                "name": "amount",
+                "type": "uint256"
+            },
+            {
+                "name": "denom",
+                "type": "string"
+            }
+        ],
+        "EIP712Domain": [
+            {
+                "name": "chainId",
+                "type": "uint256"
+            },
+            {
+                "name": "name",
+                "type": "string"
+            },
+            {
+                "name": "salt",
+                "type": "string"
+            },
+            {
+                "name": "verifyingContract",
+                "type": "string"
+            },
+            {
+                "name": "version",
+                "type": "string"
+            }
+        ],
+        "Fee": [
+            {
+                "name": "amount",
+                "type": "Coin[]"
+            },
+            {
+                "name": "gas_limit",
+                "type": "uint256"
+            },
+            {
+                "name": "granter",
+                "type": "string"
+            },
+            {
+                "name": "payer",
+                "type": "string"
+            }
+        ],
+        "Msg1": [
+            {
+                "name": "amount",
+                "type": "TypeMsg1Amount[]"
+            },
+            {
+                "name": "from_address",
+                "type": "string"
+            },
+            {
+                "name": "to_address",
+                "type": "string"
+            },
+            {
+                "name": "type",
+                "type": "string"
+            }
+        ],
+        "Tx": [
+            {
+                "name": "account_number",
+                "type": "uint256"
+            },
+            {
+                "name": "chain_id",
+                "type": "uint256"
+            },
+            {
+                "name": "fee",
+                "type": "Fee"
+            },
+            {
+                "name": "memo",
+                "type": "string"
+            },
+            {
+                "name": "msg1",
+                "type": "Msg1"
+            },
+            {
+                "name": "sequence",
+                "type": "uint256"
+            },
+            {
+                "name": "timeout_height",
+                "type": "uint256"
+            }
+        ],
+        "TypeMsg1Amount": [
+            {
+                "name": "amount",
+                "type": "string"
+            },
+            {
+                "name": "denom",
+                "type": "string"
+            }
+        ]
+    },
+    "primaryType": "Tx",
+    "domain": {
+        "name": "Greenfield Tx",
+        "version": "1.0.0",
+        "chainId": "0x15e0",
+        "verifyingContract": "greenfield",
+        "salt": "0"
+    },
+    "message": {
+        "sequence": "2",
+        "account_number": "15560",
+        "chain_id": "5600",
+        "memo": "",
+        "fee": {
+            "amount": [
+                {
+                    "amount": "2000000000000000",
+                    "denom": "BNB"
+                }
+            ],
+            "gas_limit": "200000",
+            "payer": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1",
+            "granter": ""
+        },
+        "timeout_height": "0",
+        "msg1": {
+            "from_address": "0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1",
+            "to_address": "0x280b27f3676db1C4475EE10F75D510Eb527fd155",
+            "amount": [
+                {
+                    "amount": "1000000000000000",
+                    "denom": "BNB"
+                }
+            ],
+            "type": "/cosmos.bank.v1beta1.MsgSend"
+        }
+    }
+}
\ No newline at end of file
diff --git a/tests/Ethereum/Data/eip712_rarible.json b/tests/chains/Ethereum/Data/eip712_rarible.json
similarity index 100%
rename from tests/Ethereum/Data/eip712_rarible.json
rename to tests/chains/Ethereum/Data/eip712_rarible.json
diff --git a/tests/Ethereum/Data/eip712_snapshot_v4.json b/tests/chains/Ethereum/Data/eip712_snapshot_v4.json
similarity index 100%
rename from tests/Ethereum/Data/eip712_snapshot_v4.json
rename to tests/chains/Ethereum/Data/eip712_snapshot_v4.json
diff --git a/tests/Ethereum/Data/eip712_walletconnect.json b/tests/chains/Ethereum/Data/eip712_walletconnect.json
similarity index 100%
rename from tests/Ethereum/Data/eip712_walletconnect.json
rename to tests/chains/Ethereum/Data/eip712_walletconnect.json
diff --git a/tests/Ethereum/Data/ens.json b/tests/chains/Ethereum/Data/ens.json
similarity index 100%
rename from tests/Ethereum/Data/ens.json
rename to tests/chains/Ethereum/Data/ens.json
diff --git a/tests/Ethereum/Data/erc20.json b/tests/chains/Ethereum/Data/erc20.json
similarity index 100%
rename from tests/Ethereum/Data/erc20.json
rename to tests/chains/Ethereum/Data/erc20.json
diff --git a/tests/Ethereum/Data/erc721.json b/tests/chains/Ethereum/Data/erc721.json
similarity index 100%
rename from tests/Ethereum/Data/erc721.json
rename to tests/chains/Ethereum/Data/erc721.json
diff --git a/tests/Ethereum/Data/eth_feeHistory.json b/tests/chains/Ethereum/Data/eth_feeHistory.json
similarity index 100%
rename from tests/Ethereum/Data/eth_feeHistory.json
rename to tests/chains/Ethereum/Data/eth_feeHistory.json
diff --git a/tests/Ethereum/Data/eth_feeHistory2.json b/tests/chains/Ethereum/Data/eth_feeHistory2.json
similarity index 100%
rename from tests/Ethereum/Data/eth_feeHistory2.json
rename to tests/chains/Ethereum/Data/eth_feeHistory2.json
diff --git a/tests/Ethereum/Data/eth_feeHistory3.json b/tests/chains/Ethereum/Data/eth_feeHistory3.json
similarity index 100%
rename from tests/Ethereum/Data/eth_feeHistory3.json
rename to tests/chains/Ethereum/Data/eth_feeHistory3.json
diff --git a/tests/Ethereum/Data/eth_feeHistory4.json b/tests/chains/Ethereum/Data/eth_feeHistory4.json
similarity index 100%
rename from tests/Ethereum/Data/eth_feeHistory4.json
rename to tests/chains/Ethereum/Data/eth_feeHistory4.json
diff --git a/tests/Ethereum/Data/getAmountsOut.json b/tests/chains/Ethereum/Data/getAmountsOut.json
similarity index 100%
rename from tests/Ethereum/Data/getAmountsOut.json
rename to tests/chains/Ethereum/Data/getAmountsOut.json
diff --git a/tests/Ethereum/Data/kyber_proxy.json b/tests/chains/Ethereum/Data/kyber_proxy.json
similarity index 100%
rename from tests/Ethereum/Data/kyber_proxy.json
rename to tests/chains/Ethereum/Data/kyber_proxy.json
diff --git a/tests/Ethereum/Data/seaport_712.json b/tests/chains/Ethereum/Data/seaport_712.json
similarity index 100%
rename from tests/Ethereum/Data/seaport_712.json
rename to tests/chains/Ethereum/Data/seaport_712.json
diff --git a/tests/chains/Ethereum/Data/swap_v2.json b/tests/chains/Ethereum/Data/swap_v2.json
new file mode 100644
index 00000000000..3651cd7b1ac
--- /dev/null
+++ b/tests/chains/Ethereum/Data/swap_v2.json
@@ -0,0 +1,70 @@
+{
+  "846a1bc6":{
+    "inputs":[
+      {
+        "name":"token",
+        "type":"address"
+      },
+      {
+        "name":"amount",
+        "type":"uint256"
+      },
+      {
+        "components":[
+          {
+            "name":"callType",
+            "type":"uint8"
+          },
+          {
+            "name":"target",
+            "type":"address"
+          },
+          {
+            "name":"value",
+            "type":"uint256"
+          },
+          {
+            "name":"callData",
+            "type":"bytes"
+          },
+          {
+            "name":"payload",
+            "type":"bytes"
+          }
+        ],
+        "name":"calls",
+        "type":"tuple[]"
+      },
+      {
+        "name":"bridgedTokenSymbol",
+        "type":"string"
+      },
+      {
+        "name":"destinationChain",
+        "type":"string"
+      },
+      {
+        "name":"destinationAddress",
+        "type":"string"
+      },
+      {
+        "name":"payload",
+        "type":"bytes"
+      },
+      {
+        "name":"gasRefundRecipient",
+        "type":"address"
+      },
+      {
+        "name":"enableExpress",
+        "type":"bool"
+      }
+    ],
+    "name":"callBridgeCall",
+    "outputs":[
+
+    ],
+    "stateMutability":"nonpayable",
+    "type":"function"
+  }
+}
\ No newline at end of file
diff --git a/tests/chains/Ethereum/Data/swap_v2_decoded.json b/tests/chains/Ethereum/Data/swap_v2_decoded.json
new file mode 100644
index 00000000000..be3dab098ec
--- /dev/null
+++ b/tests/chains/Ethereum/Data/swap_v2_decoded.json
@@ -0,0 +1,105 @@
+{
+  "function": "callBridgeCall(address,uint256,(uint8,address,uint256,bytes,bytes)[],string,string,string,bytes,address,bool)",
+  "inputs": [
+    {
+      "name": "token",
+      "type": "address",
+      "value": "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+    },
+    {
+      "name": "amount",
+      "type": "uint256",
+      "value": "20000000000000000"
+    },
+    {
+      "components": [
+        [
+          {
+            "name": "callType",
+            "type": "uint8",
+            "value": "0"
+          },
+          {
+            "name": "target",
+            "type": "address",
+            "value": "0xdAC17F958D2ee523a2206206994597C13D831ec7"
+          },
+          {
+            "name": "value",
+            "type": "uint256",
+            "value": "0"
+          },
+          {
+            "name": "callData",
+            "type": "bytes",
+            "value": "0x095ea7b300000000000000000000000099a58482bd75cbab83b27ec03ca68ff489b5788f00000000000000000000000000000000000000000000000000470de4df820000"
+          },
+          {
+            "name": "payload",
+            "type": "bytes",
+            "value": "0x"
+          }
+        ],
+        [
+          {
+            "name": "callType",
+            "type": "uint8",
+            "value": "0"
+          },
+          {
+            "name": "target",
+            "type": "address",
+            "value": "0x99a58482BD75cbab83b27EC03CA68fF489b5788f"
+          },
+          {
+            "name": "value",
+            "type": "uint256",
+            "value": "0"
+          },
+          {
+            "name": "callData",
+            "type": "bytes",
+            "value": "0x0651cb35000000000000000000000000dac17f958d2ee523a2206206994597c13d831ec7000000000000000000000000bebc44782c7db0a1a60cb6fe97d0b483032ff1c7000000000000000000000000a0b86991c6218b36c1d19d4a2e9eb0ce3606eb4800000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000470de4df8200000000000000000000000000000000000000000000000000000000298ce42936ed0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000ce16f69375520ab01377ce7b88f5ba8c48f8d666"
+          },
+          {
+            "name": "payload",
+            "type": "bytes",
+            "value": "0x"
+          }
+        ]
+      ],
+      "name": "calls",
+      "type": "tuple[]"
+    },
+    {
+      "name": "bridgedTokenSymbol",
+      "type": "string",
+      "value": "USDC"
+    },
+    {
+      "name": "destinationChain",
+      "type": "string",
+      "value": "binance"
+    },
+    {
+      "name": "destinationAddress",
+      "type": "string",
+      "value": "0xce16F69375520ab01377ce7B88f5BA8C48F8D666"
+    },
+    {
+      "name": "payload",
+      "type": "bytes",
+      "value": "0x0000000000000000000000000000000000000000000000000000000000000040000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000700000000000000000000000000000000000000000000000000000000000000e000000000000000000000000000000000000000000000000000000000000001e0000000000000000000000000000000000000000000000000000000000000036000000000000000000000000000000000000000000000000000000000000005a0000000000000000000000000000000000000000000000000000000000000072000000000000000000000000000000000000000000000000000000000000009600000000000000000000000000000000000000000000000000000000000000ac000000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000200000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000000000000000000000000000000000000000000010000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb1400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf3000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf3890000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf300000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000640000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7044000000000000000000000000000000000000000000000000000029a23529cf68000000000000000000000000000000000000000000005af4f3f913bd553d03b900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000400000000000000000000000004268b8f0b87b6eae5d897996e6b845ddbd99adf30000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000100000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001200000000000000000000000000000000000000000000000000000000000000044095ea7b30000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000001b81d678ffb9c0263b24a97847620c99d213eb14000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000001e00000000000000000000000000000000000000000000000000000000000000104414bf38900000000000000000000000055d398326f99059ff775485246999027b3197955000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000001f40000000000000000000000004fd39c9e151e50580779bd04b1f7ecc310079fd300000000000000000000000000000000000000000000000000000189c04a7045000000000000000000000000000000000000000000005b527785e694f805bdd300000000000000000000000000000000000000000000005f935a1fa5c4a6ec61000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004000000000000000000000000055d398326f99059ff775485246999027b319795500000000000000000000000000000000000000000000000000000000000000050000000000000000000000000000000000000000000000000000000000000001000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a0000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000000242e1a7d4d0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000040000000000000000000000000bb4cdb9cbd36b01bd1cbaebf2de08d9173bc095c00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002000000000000000000000000a140f413c63fbda84e9008607e678258fffbc76b000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000c000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"
+    },
+    {
+      "name": "gasRefundRecipient",
+      "type": "address",
+      "value": "0xa140F413C63FBDA84E9008607E678258ffFbC76b"
+    },
+    {
+      "name": "enableExpress",
+      "type": "bool",
+      "value": true
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/Ethereum/Data/tuple_nested.json b/tests/chains/Ethereum/Data/tuple_nested.json
similarity index 100%
rename from tests/Ethereum/Data/tuple_nested.json
rename to tests/chains/Ethereum/Data/tuple_nested.json
diff --git a/tests/chains/Ethereum/Data/tuple_nested_decoded.json b/tests/chains/Ethereum/Data/tuple_nested_decoded.json
new file mode 100644
index 00000000000..806049882ad
--- /dev/null
+++ b/tests/chains/Ethereum/Data/tuple_nested_decoded.json
@@ -0,0 +1,47 @@
+{
+    "function": "nested_tuple(uint16,(uint16,(uint16,uint64),uint32),bool)",
+    "inputs": [
+        {
+            "name": "param1",
+            "type": "uint16",
+            "value": "1"
+        },
+        {
+            "components": [
+                {
+                    "name": "param21",
+                    "type": "uint16",
+                    "value": "2"
+                },
+                {
+                    "components": [
+                        {
+                            "name": "param221",
+                            "type": "uint16",
+                            "value": "3"
+                        },
+                        {
+                            "name": "param222",
+                            "type": "uint64",
+                            "value": "4"
+                        }
+                    ],
+                    "name": "param22",
+                    "type": "tuple"
+                },
+                {
+                    "name": "param23",
+                    "type": "uint32",
+                    "value": "5"
+                }
+            ],
+            "name": "param2",
+            "type": "tuple"
+        },
+        {
+            "name": "param3",
+            "type": "bool",
+            "value": true
+        }
+    ]
+}
\ No newline at end of file
diff --git a/tests/Ethereum/Data/uniswap_router_v2.json b/tests/chains/Ethereum/Data/uniswap_router_v2.json
similarity index 100%
rename from tests/Ethereum/Data/uniswap_router_v2.json
rename to tests/chains/Ethereum/Data/uniswap_router_v2.json
diff --git a/tests/Ethereum/Data/zilliqa_data_tx.json b/tests/chains/Ethereum/Data/zilliqa_data_tx.json
similarity index 100%
rename from tests/Ethereum/Data/zilliqa_data_tx.json
rename to tests/chains/Ethereum/Data/zilliqa_data_tx.json
diff --git a/tests/chains/Ethereum/EIP1014Tests.cpp b/tests/chains/Ethereum/EIP1014Tests.cpp
new file mode 100644
index 00000000000..6b53150ee4a
--- /dev/null
+++ b/tests/chains/Ethereum/EIP1014Tests.cpp
@@ -0,0 +1,87 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWEthereum.h>
+#include <TrustWalletCore/TWHash.h>
+#include <Ethereum/AddressChecksum.h>
+#include <Ethereum/EIP1014.h>
+#include <HexCoding.h>
+#include <PrivateKey.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Ethereum::tests {
+    TEST(EthereumEip1014, Example0) {
+        // C++
+        {
+            const std::string& from = "0x0000000000000000000000000000000000000000";
+            const Data salt = parse_hex("0x0000000000000000000000000000000000000000000000000000000000000000");
+            Data initCodeHash = Hash::keccak256(parse_hex("0x00"));
+            const auto& addressData = Ethereum::create2Address(from, salt, initCodeHash);
+            ASSERT_EQ(Ethereum::checksumed(Ethereum::Address(hexEncoded(addressData))), "0x4D1A2e2bB4F88F0250f26Ffff098B0b30B26BF38");
+        }
+    }
+
+    TEST(EthereumEip1014, Example1) {
+        // C++
+        {
+            const std::string& from = "0xdeadbeef00000000000000000000000000000000";
+            const Data salt = parse_hex("0x0000000000000000000000000000000000000000000000000000000000000000");
+            Data initCodeHash = Hash::keccak256(parse_hex("0x00"));
+            const auto& addressData = Ethereum::create2Address(from, salt, initCodeHash);
+            ASSERT_EQ(Ethereum::checksumed(Ethereum::Address(hexEncoded(addressData))), "0xB928f69Bb1D91Cd65274e3c79d8986362984fDA3");
+        }
+    }
+
+    TEST(EthereumEip1014, Example2) {
+        const std::string& from = "0xdeadbeef00000000000000000000000000000000";
+        const Data salt = parse_hex("0x000000000000000000000000feed000000000000000000000000000000000000");
+        Data initCode = parse_hex("0x00");
+        initCode.resize(32);
+        const auto& addressData = Ethereum::create2Address(from, salt, initCode);
+        ASSERT_EQ(Ethereum::checksumed(Ethereum::Address(hexEncoded(addressData))), "0x2DB27D1d6BE32C9abfA484BA3d591101881D4B9f");
+    }
+
+    TEST(EthereumEip1014, Example3) {
+        const std::string& from = "0x0000000000000000000000000000000000000000";
+        const Data salt = parse_hex("0x0000000000000000000000000000000000000000000000000000000000000000");
+        Data initCode = parse_hex("0xdeadbeef");
+        initCode.resize(32);
+        const auto& addressData = Ethereum::create2Address(from, salt, initCode);
+        ASSERT_EQ(Ethereum::checksumed(Ethereum::Address(hexEncoded(addressData))), "0x219438aC82230Cb9A9C13Cd99D324fA1d66CF018");
+    }
+
+    TEST(EthereumEip1014, Example4) {
+        const std::string& from = "0x00000000000000000000000000000000deadbeef";
+        const Data salt = parse_hex("0x00000000000000000000000000000000000000000000000000000000cafebabe");
+        Data initCodeHash = Hash::keccak256(parse_hex("0xdeadbeef"));
+        const auto& addressData = Ethereum::create2Address(from, salt, initCodeHash);
+        ASSERT_EQ(Ethereum::checksumed(Ethereum::Address(hexEncoded(addressData))), "0x60f3f640a8508fC6a86d45DF051962668E1e8AC7");
+    }
+
+    TEST(EthereumEip1014, Example5) {
+        const std::string& from = "0x00000000000000000000000000000000deadbeef";
+        const Data salt = parse_hex("0x00000000000000000000000000000000000000000000000000000000cafebabe");
+        Data initCodeHash = Hash::keccak256(parse_hex("0xdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeefdeadbeef"));
+        const auto& addressData = Ethereum::create2Address(from, salt, initCodeHash);
+        ASSERT_EQ(Ethereum::checksumed(Ethereum::Address(hexEncoded(addressData))), "0x1d8bfDC5D46DC4f61D6b6115972536eBE6A8854C");
+    }
+
+    TEST(EthereumEip1014, Example6) {
+        const std::string& from = "0x0000000000000000000000000000000000000000";
+        const Data salt = parse_hex("0x0000000000000000000000000000000000000000000000000000000000000000");
+        Data initCodeHash = Hash::keccak256(parse_hex("0x"));
+        const auto& addressData = Ethereum::create2Address(from, salt, initCodeHash);
+        ASSERT_EQ(Ethereum::checksumed(Ethereum::Address(hexEncoded(addressData))), "0xE33C0C7F7df4809055C3ebA6c09CFe4BaF1BD9e0");
+    }
+
+    TEST(EthereumEip1014, Example7) {
+        const std::string& from = "0x7EF2e0048f5bAeDe046f6BF797943daF4ED8CB47";
+        const Data salt = parse_hex("0x0000000000000000000000000000000000000000000000000000000000000000");
+        Data initCodeHash = Hash::keccak256(parse_hex("0x608060405260405162000c5138038062000c51833981810160405281019062000029919062000580565b6200003d828260006200004560201b60201c565b5050620007d7565b62000056836200008860201b60201c565b600082511180620000645750805b156200008357620000818383620000df60201b620000371760201c565b505b505050565b62000099816200011560201b60201c565b8073ffffffffffffffffffffffffffffffffffffffff167fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b60405160405180910390a250565b60606200010d838360405180606001604052806027815260200162000c2a60279139620001eb60201b60201c565b905092915050565b6200012b816200027d60201b620000641760201c565b6200016d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000164906200066d565b60405180910390fd5b80620001a77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b620002a060201b620000871760201c565b60000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60606000808573ffffffffffffffffffffffffffffffffffffffff1685604051620002179190620006dc565b600060405180830381855af49150503d806000811462000254576040519150601f19603f3d011682016040523d82523d6000602084013e62000259565b606091505b50915091506200027286838387620002aa60201b60201c565b925050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b606083156200031a5760008351036200031157620002ce856200027d60201b60201c565b62000310576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620003079062000745565b60405180910390fd5b5b8290506200032d565b6200032c83836200033560201b60201c565b5b949350505050565b600082511115620003495781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200037f9190620007b3565b60405180910390fd5b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003c9826200039c565b9050919050565b620003db81620003bc565b8114620003e757600080fd5b50565b600081519050620003fb81620003d0565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b62000456826200040b565b810181811067ffffffffffffffff821117156200047857620004776200041c565b5b80604052505050565b60006200048d62000388565b90506200049b82826200044b565b919050565b600067ffffffffffffffff821115620004be57620004bd6200041c565b5b620004c9826200040b565b9050602081019050919050565b60005b83811015620004f6578082015181840152602081019050620004d9565b60008484015250505050565b6000620005196200051384620004a0565b62000481565b90508281526020810184848401111562000538576200053762000406565b5b62000545848285620004d6565b509392505050565b600082601f83011262000565576200056462000401565b5b81516200057784826020860162000502565b91505092915050565b600080604083850312156200059a576200059962000392565b5b6000620005aa85828601620003ea565b925050602083015167ffffffffffffffff811115620005ce57620005cd62000397565b5b620005dc858286016200054d565b9150509250929050565b600082825260208201905092915050565b7f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60008201527f6f74206120636f6e747261637400000000000000000000000000000000000000602082015250565b600062000655602d83620005e6565b91506200066282620005f7565b604082019050919050565b60006020820190508181036000830152620006888162000646565b9050919050565b600081519050919050565b600081905092915050565b6000620006b2826200068f565b620006be81856200069a565b9350620006d0818560208601620004d6565b80840191505092915050565b6000620006ea8284620006a5565b915081905092915050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b60006200072d601d83620005e6565b91506200073a82620006f5565b602082019050919050565b6000602082019050818103600083015262000760816200071e565b9050919050565b600081519050919050565b60006200077f8262000767565b6200078b8185620005e6565b93506200079d818560208601620004d6565b620007a8816200040b565b840191505092915050565b60006020820190508181036000830152620007cf818462000772565b905092915050565b61044380620007e76000396000f3fe6080604052366100135761001161001d565b005b61001b61001d565b005b610025610091565b610035610030610093565b6100a2565b565b606061005c83836040518060600160405280602781526020016103e7602791396100c8565b905092915050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b565b600061009d61014e565b905090565b3660008037600080366000845af43d6000803e80600081146100c3573d6000f35b3d6000fd5b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516100f291906102db565b600060405180830381855af49150503d806000811461012d576040519150601f19603f3d011682016040523d82523d6000602084013e610132565b606091505b5091509150610143868383876101a5565b925050509392505050565b600061017c7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b610087565b60000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b606083156102075760008351036101ff576101bf85610064565b6101fe576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f59061034f565b60405180910390fd5b5b829050610212565b610211838361021a565b5b949350505050565b60008251111561022d5781518083602001fd5b806040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161026191906103c4565b60405180910390fd5b600081519050919050565b600081905092915050565b60005b8381101561029e578082015181840152602081019050610283565b60008484015250505050565b60006102b58261026a565b6102bf8185610275565b93506102cf818560208601610280565b80840191505092915050565b60006102e782846102aa565b915081905092915050565b600082825260208201905092915050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b6000610339601d836102f2565b915061034482610303565b602082019050919050565b600060208201905081810360008301526103688161032c565b9050919050565b600081519050919050565b6000601f19601f8301169050919050565b60006103968261036f565b6103a081856102f2565b93506103b0818560208601610280565b6103b98161037a565b840191505092915050565b600060208201905081810360008301526103de818461038b565b90509291505056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e57dd3eafc9985be746025b6d82d4f011b9a7bb3db56f9a1eb7eadfddd376b6064736f6c63430008110033416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564000000000000000000000000d9ec9e840bb5df076dbbb488d01485058f421e5800000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000024c4d66de8000000000000000000000000be8fa0112dcb7d21dc63645b633073651e19934800000000000000000000000000000000000000000000000000000000"));
+        const auto& addressData = Ethereum::create2Address(from, salt, initCodeHash);
+        ASSERT_EQ(Ethereum::checksumed(Ethereum::Address(hexEncoded(addressData))), "0x4455e5f0038795939c001aa4d296A45956C460AA");
+    }
+}
diff --git a/tests/chains/Ethereum/EIP1967Tests.cpp b/tests/chains/Ethereum/EIP1967Tests.cpp
new file mode 100644
index 00000000000..e0cd759e8f6
--- /dev/null
+++ b/tests/chains/Ethereum/EIP1967Tests.cpp
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWEthereum.h>
+#include <TrustWalletCore/TWHash.h>
+#include <Ethereum/EIP1967.h>
+#include <HexCoding.h>
+#include <PrivateKey.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Ethereum::tests {
+
+TEST(EthereumEip1967, Example0) {
+    // C++
+    {
+        const std::string& login_address = "0x5C9eb5D6a6C2c1B3EFc52255C0b356f116f6f66D";
+        const Data data = parse_hex("0xc4d66de8000000000000000000000000a5a1dddef094095afb7b6e322de72961df2e1988");
+        const Data initCode = Ethereum::getEIP1967ProxyInitCode(login_address, data);
+        ASSERT_EQ(hexEncoded(initCode), "0x608060405260405162000c5138038062000c51833981810160405281019062000029919062000580565b6200003d828260006200004560201b60201c565b5050620007d7565b62000056836200008860201b60201c565b600082511180620000645750805b156200008357620000818383620000df60201b620000371760201c565b505b505050565b62000099816200011560201b60201c565b8073ffffffffffffffffffffffffffffffffffffffff167fbc7cd75a20ee27fd9adebab32041f755214dbc6bffa90cc0225b39da2e5c2d3b60405160405180910390a250565b60606200010d838360405180606001604052806027815260200162000c2a60279139620001eb60201b60201c565b905092915050565b6200012b816200027d60201b620000641760201c565b6200016d576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040162000164906200066d565b60405180910390fd5b80620001a77f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b620002a060201b620000871760201c565b60000160006101000a81548173ffffffffffffffffffffffffffffffffffffffff021916908373ffffffffffffffffffffffffffffffffffffffff16021790555050565b60606000808573ffffffffffffffffffffffffffffffffffffffff1685604051620002179190620006dc565b600060405180830381855af49150503d806000811462000254576040519150601f19603f3d011682016040523d82523d6000602084013e62000259565b606091505b50915091506200027286838387620002aa60201b60201c565b925050509392505050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b606083156200031a5760008351036200031157620002ce856200027d60201b60201c565b62000310576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401620003079062000745565b60405180910390fd5b5b8290506200032d565b6200032c83836200033560201b60201c565b5b949350505050565b600082511115620003495781518083602001fd5b806040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016200037f9190620007b3565b60405180910390fd5b6000604051905090565b600080fd5b600080fd5b600073ffffffffffffffffffffffffffffffffffffffff82169050919050565b6000620003c9826200039c565b9050919050565b620003db81620003bc565b8114620003e757600080fd5b50565b600081519050620003fb81620003d0565b92915050565b600080fd5b600080fd5b6000601f19601f8301169050919050565b7f4e487b7100000000000000000000000000000000000000000000000000000000600052604160045260246000fd5b62000456826200040b565b810181811067ffffffffffffffff821117156200047857620004776200041c565b5b80604052505050565b60006200048d62000388565b90506200049b82826200044b565b919050565b600067ffffffffffffffff821115620004be57620004bd6200041c565b5b620004c9826200040b565b9050602081019050919050565b60005b83811015620004f6578082015181840152602081019050620004d9565b60008484015250505050565b6000620005196200051384620004a0565b62000481565b90508281526020810184848401111562000538576200053762000406565b5b62000545848285620004d6565b509392505050565b600082601f83011262000565576200056462000401565b5b81516200057784826020860162000502565b91505092915050565b600080604083850312156200059a576200059962000392565b5b6000620005aa85828601620003ea565b925050602083015167ffffffffffffffff811115620005ce57620005cd62000397565b5b620005dc858286016200054d565b9150509250929050565b600082825260208201905092915050565b7f455243313936373a206e657720696d706c656d656e746174696f6e206973206e60008201527f6f74206120636f6e747261637400000000000000000000000000000000000000602082015250565b600062000655602d83620005e6565b91506200066282620005f7565b604082019050919050565b60006020820190508181036000830152620006888162000646565b9050919050565b600081519050919050565b600081905092915050565b6000620006b2826200068f565b620006be81856200069a565b9350620006d0818560208601620004d6565b80840191505092915050565b6000620006ea8284620006a5565b915081905092915050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b60006200072d601d83620005e6565b91506200073a82620006f5565b602082019050919050565b6000602082019050818103600083015262000760816200071e565b9050919050565b600081519050919050565b60006200077f8262000767565b6200078b8185620005e6565b93506200079d818560208601620004d6565b620007a8816200040b565b840191505092915050565b60006020820190508181036000830152620007cf818462000772565b905092915050565b61044380620007e76000396000f3fe6080604052366100135761001161001d565b005b61001b61001d565b005b610025610091565b610035610030610093565b6100a2565b565b606061005c83836040518060600160405280602781526020016103e7602791396100c8565b905092915050565b6000808273ffffffffffffffffffffffffffffffffffffffff163b119050919050565b6000819050919050565b565b600061009d61014e565b905090565b3660008037600080366000845af43d6000803e80600081146100c3573d6000f35b3d6000fd5b60606000808573ffffffffffffffffffffffffffffffffffffffff16856040516100f291906102db565b600060405180830381855af49150503d806000811461012d576040519150601f19603f3d011682016040523d82523d6000602084013e610132565b606091505b5091509150610143868383876101a5565b925050509392505050565b600061017c7f360894a13ba1a3210667c828492db98dca3e2076cc3735a920a3ca505d382bbc60001b610087565b60000160009054906101000a900473ffffffffffffffffffffffffffffffffffffffff16905090565b606083156102075760008351036101ff576101bf85610064565b6101fe576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004016101f59061034f565b60405180910390fd5b5b829050610212565b610211838361021a565b5b949350505050565b60008251111561022d5781518083602001fd5b806040517f08c379a000000000000000000000000000000000000000000000000000000000815260040161026191906103c4565b60405180910390fd5b600081519050919050565b600081905092915050565b60005b8381101561029e578082015181840152602081019050610283565b60008484015250505050565b60006102b58261026a565b6102bf8185610275565b93506102cf818560208601610280565b80840191505092915050565b60006102e782846102aa565b915081905092915050565b600082825260208201905092915050565b7f416464726573733a2063616c6c20746f206e6f6e2d636f6e7472616374000000600082015250565b6000610339601d836102f2565b915061034482610303565b602082019050919050565b600060208201905081810360008301526103688161032c565b9050919050565b600081519050919050565b6000601f19601f8301169050919050565b60006103968261036f565b6103a081856102f2565b93506103b0818560208601610280565b6103b98161037a565b840191505092915050565b600060208201905081810360008301526103de818461038b565b90509291505056fe416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c6564a2646970667358221220e57dd3eafc9985be746025b6d82d4f011b9a7bb3db56f9a1eb7eadfddd376b6064736f6c63430008110033416464726573733a206c6f772d6c6576656c2064656c65676174652063616c6c206661696c65640000000000000000000000005c9eb5d6a6c2c1b3efc52255c0b356f116f6f66d00000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000024c4d66de8000000000000000000000000a5a1dddef094095afb7b6e322de72961df2e198800000000000000000000000000000000000000000000000000000000");
+    }
+}
+
+}
diff --git a/tests/chains/Ethereum/EthereumMessageSignerTests.cpp b/tests/chains/Ethereum/EthereumMessageSignerTests.cpp
new file mode 100644
index 00000000000..6165fe32e47
--- /dev/null
+++ b/tests/chains/Ethereum/EthereumMessageSignerTests.cpp
@@ -0,0 +1,362 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWEthereumMessageSigner.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+#include <Ethereum/MessageSigner.h>
+#include <HexCoding.h>
+#include <PrivateKey.h>
+
+#include <fstream>
+#include <gtest/gtest.h>
+
+extern std::string TESTS_ROOT;
+
+std::string load_file(const std::string& path) {
+    std::ifstream stream(path);
+    std::string content((std::istreambuf_iterator<char>(stream)), (std::istreambuf_iterator<char>()));
+    return content;
+}
+
+namespace TW::Ethereum {
+    TEST(EthereumEip712, SignMessageAndVerifyLegacy) {
+        PrivateKey ethKey(parse_hex("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d"));
+        auto msg = R"(
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ]
+                },
+                "primaryType": "Person",
+                "domain": {
+                    "name": "Ether Person",
+                    "version": "1",
+                    "chainId": 0,
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "name": "Cow",
+                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                }
+            })";
+        auto signature = Ethereum::MessageSigner::signTypedData(ethKey, msg, MessageType::Legacy);
+        ASSERT_EQ(signature, "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf3761c");
+        auto pubKey = ethKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        ASSERT_TRUE(Ethereum::MessageSigner::verifyMessage(pubKey, msg, signature));
+    }
+
+    TEST(EthereumEip712, SignMessageAndVerifyEip155) {
+        PrivateKey ethKey(parse_hex("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d"));
+        auto msg = R"(
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ]
+                },
+                "primaryType": "Person",
+                "domain": {
+                    "name": "Ether Person",
+                    "version": "1",
+                    "chainId": 0,
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "name": "Cow",
+                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                }
+            })";
+        auto signature = Ethereum::MessageSigner::signTypedData(ethKey, msg, MessageType::Eip155, 0);
+        ASSERT_EQ(signature, "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf37624");
+        auto pubKey = ethKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        ASSERT_TRUE(Ethereum::MessageSigner::verifyMessage(pubKey, msg, signature));
+    }
+
+    TEST(EthereumEip712, SignMessageAndVerifyInvalidEip155) {
+        PrivateKey ethKey(parse_hex("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d"));
+        auto msg = R"(
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ]
+                },
+                "primaryType": "Person",
+                "domain": {
+                    "name": "Ether Person",
+                    "version": "1",
+                    "chainId": 1,
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "name": "Cow",
+                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                }
+            })";
+        auto signature = Ethereum::MessageSigner::signTypedData(ethKey, msg, MessageType::Eip155, 0);
+        ASSERT_EQ(signature, "");
+    }
+
+    TEST(EthereumEip191, SignMessageAndVerifyLegacy) {
+        PrivateKey ethKey(parse_hex("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d"));
+        auto msg = "Foo";
+        auto signature = Ethereum::MessageSigner::signMessage(ethKey, msg, MessageType::Legacy);
+        ASSERT_EQ(signature, "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be71101b");
+        auto pubKey = ethKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        ASSERT_TRUE(Ethereum::MessageSigner::verifyMessage(pubKey, msg, signature));
+    }
+
+    TEST(EthereumEip191, SignMessageAndVerifyEip155) {
+        PrivateKey ethKey(parse_hex("03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d"));
+        auto msg = "Foo";
+        auto signature = Ethereum::MessageSigner::signMessage(ethKey, msg, MessageType::Eip155, 0);
+        ASSERT_EQ(signature, "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be711023");
+        auto pubKey = ethKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        ASSERT_TRUE(Ethereum::MessageSigner::verifyMessage(pubKey, msg, signature));
+    }
+
+    TEST(EthereumEip191, SignMessageAndVerifyImmutableX) {
+        PrivateKey ethKey(parse_hex("3b0a61f46fdae924007146eacb6db6642de7a5603ad843ec58e10331d89d4b84"));
+        auto msg = "Only sign this request if you’ve initiated an action with Immutable X.\n\nFor internal use:\nbd717ba31dca6e0f3f136f7c4197babce5f09a9f25176044c0b3112b1b6017a3";
+        auto signature = Ethereum::MessageSigner::signMessage(ethKey, msg, MessageType::ImmutableX);
+        ASSERT_EQ(signature, "32cd5a58f3419fc5db672e3d57f76199b853eda0856d491b38f557b629b0a0814ace689412bf354a1af81126d2749207dffae8ae8845160f33948a6b787e17ee01");
+        auto pubKey = ethKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        ASSERT_TRUE(Ethereum::MessageSigner::verifyMessage(pubKey, msg, signature));
+    }
+
+    TEST(TWEthereumMessageSigner, SignAndVerifyImmutableX) {
+        const auto privKeyData = "3b0a61f46fdae924007146eacb6db6642de7a5603ad843ec58e10331d89d4b84";
+        const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+        const auto message = STRING("Only sign this request if you’ve initiated an action with Immutable X.\n\nFor internal use:\nbd717ba31dca6e0f3f136f7c4197babce5f09a9f25176044c0b3112b1b6017a3");
+
+        const auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeEthereum));
+        const auto signature = WRAPS(TWEthereumMessageSignerSignMessageImmutableX(privateKey.get(), message.get()));
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "32cd5a58f3419fc5db672e3d57f76199b853eda0856d491b38f557b629b0a0814ace689412bf354a1af81126d2749207dffae8ae8845160f33948a6b787e17ee01");
+        EXPECT_TRUE(TWEthereumMessageSignerVerifyMessage(pubKey.get(), message.get(), signature.get()));
+    }
+
+    TEST(TWEthereumMessageSigner, SignAndVerifyLegacy) {
+        const auto privKeyData = "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d";
+        const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+        const auto message = STRING("Foo");
+
+        const auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeEthereum));
+        const auto signature = WRAPS(TWEthereumMessageSignerSignMessage(privateKey.get(), message.get()));
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be71101b");
+        EXPECT_TRUE(TWEthereumMessageSignerVerifyMessage(pubKey.get(), message.get(), signature.get()));
+    }
+
+    TEST(TWEthereumMessageSigner, SignAndVerifyEip155) {
+        const auto privKeyData = "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d";
+        const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+        const auto message = STRING("Foo");
+
+        const auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeEthereum));
+        const auto signature = WRAPS(TWEthereumMessageSignerSignMessageEip155(privateKey.get(), message.get(), 0));
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "21a779d499957e7fd39392d49a079679009e60e492d9654a148829be43d2490736ec72bc4a5644047d979c3cf4ebe2c1c514044cf436b063cb89fc6676be711023");
+        EXPECT_TRUE(TWEthereumMessageSignerVerifyMessage(pubKey.get(), message.get(), signature.get()));
+    }
+
+    TEST(TWEthereumEip712, SignMessageAndVerifyLegacy) {
+        const auto privKeyData = "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d";
+        const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+        auto msg = STRING(R"(
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ]
+                },
+                "primaryType": "Person",
+                "domain": {
+                    "name": "Ether Person",
+                    "version": "1",
+                    "chainId": 0,
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "name": "Cow",
+                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                }
+            })");
+        const auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeEthereum));
+        const auto signature = WRAPS(TWEthereumMessageSignerSignTypedMessage(privateKey.get(), msg.get()));
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf3761c");
+        EXPECT_TRUE(TWEthereumMessageSignerVerifyMessage(pubKey.get(), msg.get(), signature.get()));
+    }
+
+    TEST(TWEthereumEip712, SignMessageAndVerifyEip155) {
+        const auto privKeyData = "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d";
+        const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+        auto msg = STRING(R"(
+            {
+                "types": {
+                    "EIP712Domain": [
+                        {"name": "name", "type": "string"},
+                        {"name": "version", "type": "string"},
+                        {"name": "chainId", "type": "uint256"},
+                        {"name": "verifyingContract", "type": "address"}
+                    ],
+                    "Person": [
+                        {"name": "name", "type": "string"},
+                        {"name": "wallet", "type": "address"}
+                    ]
+                },
+                "primaryType": "Person",
+                "domain": {
+                    "name": "Ether Person",
+                    "version": "1",
+                    "chainId": 0,
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+                },
+                "message": {
+                    "name": "Cow",
+                    "wallet": "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826"
+                }
+            })");
+        const auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeEthereum));
+        const auto signature = WRAPS(TWEthereumMessageSignerSignTypedMessageEip155(privateKey.get(), msg.get(), 0));
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "446434e4c34d6b7456e5f07a1b994b88bf85c057234c68d1e10c936b1c85706c4e19147c0ac3a983bc2d56ebfd7146f8b62bcea6114900fe8e7d7351f44bf37624");
+        EXPECT_TRUE(TWEthereumMessageSignerVerifyMessage(pubKey.get(), msg.get(), signature.get()));
+    }
+
+    // The test checks if extra types are ordered correctly.
+    // The typed message was used to sign a Greenfield transaction:
+    // https://greenfieldscan.com/tx/9F895CF2DD64FB1F428CEFCF2A6585A813C3540FC9FE1EF42DB1DA2CB1DF55AB
+    TEST(TWEthereumEip712, SignTypedMessageExtraTypesOrder) {
+        auto path = TESTS_ROOT + "/chains/Ethereum/Data/eip712_greenfield.json";
+        auto typeData = load_file(path);
+
+        const auto privKeyData = "9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0";
+        const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+        auto msg = STRING(typeData.c_str());
+        auto expected = "cb3a4684a991014a387a04a85b59227ebb79567c2025addcb296b4ca856e9f810d3b526f2a0d0fad6ad1b126b3b9516f8b3be020a7cca9c03ce3cf47f4199b6d1b";
+        const auto signature = WRAPS(TWEthereumMessageSignerSignTypedMessage(privateKey.get(), msg.get()));
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), expected);
+    }
+
+    // Test `TWEthereumMessageSignerSignTypedMessageEip155` where `domain.chainId` is a base10 decimal string.
+    // Generated by using https://metamask.github.io/test-dapp/
+    TEST(EthereumEip712, SignMessageAndVerifyEip155ChainIdString) {
+        PrivateKey ethKey(parse_hex("9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0"));
+        // 5600
+        auto chainId = 0x15e0;
+        auto msg = R"(
+                {
+                  "domain": {
+                    "chainId": "5600",
+                    "name": "Ether Mail",
+                    "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC",
+                    "version": "1"
+                  },
+                  "message": {
+                    "contents": "Hello, Bob!",
+                    "from": {
+                      "name": "Cow",
+                      "wallets": [
+                        "0xCD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
+                        "0xDeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"
+                      ]
+                    },
+                    "to": [
+                      {
+                        "name": "Bob",
+                        "wallets": [
+                          "0xbBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
+                          "0xB0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57",
+                          "0xB0B0b0b0b0b0B000000000000000000000000000"
+                        ]
+                      }
+                    ]
+                  },
+                  "primaryType": "Mail",
+                  "types": {
+                    "EIP712Domain": [
+                      {
+                        "name": "name",
+                        "type": "string"
+                      },
+                      {
+                        "name": "version",
+                        "type": "string"
+                      },
+                      {
+                        "name": "chainId",
+                        "type": "uint256"
+                      },
+                      {
+                        "name": "verifyingContract",
+                        "type": "address"
+                      }
+                    ],
+                    "Group": [
+                      {
+                        "name": "name",
+                        "type": "string"
+                      },
+                      {
+                        "name": "members",
+                        "type": "Person[]"
+                      }
+                    ],
+                    "Mail": [
+                      {
+                        "name": "from",
+                        "type": "Person"
+                      },
+                      {
+                        "name": "to",
+                        "type": "Person[]"
+                      },
+                      {
+                        "name": "contents",
+                        "type": "string"
+                      }
+                    ],
+                    "Person": [
+                      {
+                        "name": "name",
+                        "type": "string"
+                      },
+                      {
+                        "name": "wallets",
+                        "type": "address[]"
+                      }
+                    ]
+                  }
+                })";
+        auto signature = Ethereum::MessageSigner::signTypedData(ethKey, msg, MessageType::Eip155, chainId);
+        ASSERT_EQ(signature, "248b45acf2920a9cef00d3b469a875482b5f0e8ce16f6290212d395aaec7f3be0645d6a5cb6fcdfdca9ecefbadd4e77dae656124094ecc984c5fcb9cb4384b05e3");
+    }
+}
diff --git a/tests/chains/Ethereum/TWAnySignerTests.cpp b/tests/chains/Ethereum/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..f1ffacc0a1e
--- /dev/null
+++ b/tests/chains/Ethereum/TWAnySignerTests.cpp
@@ -0,0 +1,584 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+#include "uint256.h"
+#include "proto/Ethereum.pb.h"
+#include "Ethereum/ABI/Function.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Ethereum {
+
+TEST(TWEthereumSigner, EmptyValue) {
+    auto str = std::string("");
+    uint256_t zero = load(str);
+
+    ASSERT_EQ(zero, uint256_t(0));
+}
+
+TEST(TWEthereumSigner, BigInt) {
+    // Check uint256_t loading
+    Data expectedData = {0x52, 0x08};
+    auto value = uint256_t(21000);
+    auto loaded = load(expectedData);
+    ASSERT_EQ(loaded, value);
+
+    // Check proto storing
+    Proto::SigningInput input;
+    auto storedData = store(value);
+    input.set_gas_limit(storedData.data(), storedData.size());
+    ASSERT_EQ(hex(input.gas_limit()), hex(expectedData));
+
+    // Check proto loading
+    auto protoLoaded = load(input.gas_limit());
+    ASSERT_EQ(protoLoaded, value);
+}
+
+TEST(TWAnySignerEthereum, Sign) {
+    // from http://thetokenfactory.com/#/factory
+    // https://etherscan.io/tx/0x63879f20909a315bcffe629bc03b20e5bc65ba2a377bd7152e3b69c4bd4cd6cc
+    Proto::SigningInput input;
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(11));
+    auto gasPrice = store(uint256_t(20000000000));
+    auto gasLimit = store(uint256_t(1000000));
+    auto data = parse_hex("0x60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161094b38038061094b83398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b5050505050506106da806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f357806318160ddd1461016857806323b872dd14610171578063313ce5671461025c57806354fd4d501461026857806370a08231146102c657806395d89b41146102f4578063a9059cbb14610352578063cae9ca51146103f7578063dd62ed3e146105be575b6105f2610002565b6040805160038054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6102e260025481565b610662600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101c4575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101d05750600082115b156106bf57600160a060020a0383811660008181526020818152604080832080548801905588851680845281842080548990039055600183528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060016106c3565b61067660045460ff1681565b6040805160068054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b6105f46005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03166000908152602081905260408120548290108015906103845750600082115b156106ca5733600160a060020a0390811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610162565b604080516020604435600481810135601f810184900484028501840190955284845261066294813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a03908116600081815260016020908152604080832094881680845294825280832087905580518781529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a383600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105965780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f19250505015156106d257610002565b6102e2600435602435600160a060020a03828116600090815260016020908152604080832093851683529290522054610162565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b6040805160ff9092168252519081900360200190f35b820191906000526020600020905b81548152906001019060200180831161069a57829003601f168201915b505050505081565b5060005b9392505050565b506000610162565b5060016106c35600000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000754204275636b73000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003544f540000000000000000000000000000000000000000000000000000000000");
+    auto key = parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    // tx_mode not set, Legacy is the default
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_private_key(key.data(), key.size());
+    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
+    transfer.set_data(data.data(), data.size());
+
+    std::string expected = "f90a9e0b8504a817c800830f42408080b90a4b60a060405260046060527f48302e31000000000000000000000000000000000000000000000000000000006080526006805460008290527f48302e310000000000000000000000000000000000000000000000000000000882556100b5907ff652222313e28459528d920b65115c16c04f3efc82aaedc97be59f3f377c0d3f602060026001841615610100026000190190931692909204601f01919091048101905b8082111561017957600081556001016100a1565b505060405161094b38038061094b83398101604052808051906020019091908051820191906020018051906020019091908051820191906020015050836000600050600033600160a060020a0316815260200190815260200160002060005081905550836002600050819055508260036000509080519060200190828054600181600116156101000203166002900490600052602060002090601f016020900481019282601f1061017d57805160ff19168380011785555b506101ad9291506100a1565b5090565b8280016001018555821561016d579182015b8281111561016d57825182600050559160200191906001019061018f565b50506004805460ff19168317905560058054825160008390527f036b6384b5eca791c62761152d0c79bb0604c104a5fb6f4eb0703f3154bb3db0602060026001851615610100026000190190941693909304601f90810184900482019386019083901061022d57805160ff19168380011785555b5061025d9291506100a1565b82800160010185558215610221579182015b8281111561022157825182600050559160200191906001019061023f565b5050505050506106da806102716000396000f36060604052361561008d5760e060020a600035046306fdde038114610095578063095ea7b3146100f357806318160ddd1461016857806323b872dd14610171578063313ce5671461025c57806354fd4d501461026857806370a08231146102c657806395d89b41146102f4578063a9059cbb14610352578063cae9ca51146103f7578063dd62ed3e146105be575b6105f2610002565b6040805160038054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03908116600081815260016020908152604080832094871680845294825280832086905580518681529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a35060015b92915050565b6102e260025481565b610662600435602435604435600160a060020a0383166000908152602081905260408120548290108015906101c4575060016020908152604080832033600160a060020a03168452909152812054829010155b80156101d05750600082115b156106bf57600160a060020a0383811660008181526020818152604080832080548801905588851680845281842080548990039055600183528184203390961684529482529182902080548790039055815186815291519293927fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef9281900390910190a35060016106c3565b61067660045460ff1681565b6040805160068054602060026001831615610100026000190190921691909104601f81018290048202840182019094528383526105f493908301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b600160a060020a03600435166000908152602081905260409020545b60408051918252519081900360200190f35b6105f46005805460408051602060026001851615610100026000190190941693909304601f810184900484028201840190925281815292918301828280156106b75780601f1061068c576101008083540402835291602001916106b7565b61066260043560243533600160a060020a03166000908152602081905260408120548290108015906103845750600082115b156106ca5733600160a060020a0390811660008181526020818152604080832080548890039055938716808352918490208054870190558351868152935191937fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef929081900390910190a3506001610162565b604080516020604435600481810135601f810184900484028501840190955284845261066294813594602480359593946064949293910191819084018382808284375094965050505050505033600160a060020a03908116600081815260016020908152604080832094881680845294825280832087905580518781529051929493927f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925929181900390910190a383600160a060020a031660405180807f72656365697665417070726f76616c28616464726573732c75696e743235362c81526020017f616464726573732c627974657329000000000000000000000000000000000000815260200150602e019050604051809103902060e060020a9004338530866040518560e060020a0281526004018085600160a060020a0316815260200184815260200183600160a060020a031681526020018280519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156105965780820380516001836020036101000a031916815260200191505b509450505050506000604051808303816000876161da5a03f19250505015156106d257610002565b6102e2600435602435600160a060020a03828116600090815260016020908152604080832093851683529290522054610162565b005b60405180806020018281038252838181518152602001915080519060200190808383829060006004602084601f0104600f02600301f150905090810190601f1680156106545780820380516001836020036101000a031916815260200191505b509250505060405180910390f35b604080519115158252519081900360200190f35b6040805160ff9092168252519081900360200190f35b820191906000526020600020905b81548152906001019060200180831161069a57829003601f168201915b505050505081565b5060005b9392505050565b506000610162565b5060016106c35600000000000000000000000000000000000000000000000000000000000003e80000000000000000000000000000000000000000000000000000000000000080000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000c0000000000000000000000000000000000000000000000000000000000000000754204275636b73000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000003544f54000000000000000000000000000000000000000000000000000000000026a042556c4f2a3f4e4e639cca524d1da70e60881417d4643e5382ed110a52719eafa0172f591a2a763d0bd6b13d042d8c5eb66e87f129c9dc77ada66b6041012db2b3";
+
+    {
+        // sign test
+        Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeEthereum);
+
+        ASSERT_EQ(hex(output.encoded()), expected);
+        ASSERT_EQ(hex(output.data()), hex(data));
+    }
+}
+
+TEST(TWAnySignerEthereum, SignERC20TransferAsERC20) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasPrice = store(uint256_t(42000000000)); // 0x09c7652400
+    auto gasLimit = store(uint256_t(78009));       // 130B9
+    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
+    auto token = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
+    auto amount = uint256_t(2000000000000000000);
+    auto amountData = store(amount);
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    // tx_mode not set, Legacy is the default
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_to_address(token);
+    input.set_private_key(key.data(), key.size());
+    auto& erc20 = *input.mutable_transaction()->mutable_erc20_transfer();
+    erc20.set_to(toAddress);
+    erc20.set_amount(amountData.data(), amountData.size());
+
+    // https://etherscan.io/tx/0x199a7829fc5149e49b452c2cab76d8fa5a9682fee6e4891b8acb697ac142513e
+    std::string expected = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0724c62ad4fbf47346b02de06e603e013f26f26b56fdc0be7ba3d6273401d98cea0032131cae15da7ddcda66963e8bef51ca0d9962bfef0547d3f02597a4a58c931";
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), expected);
+
+    // expected payload
+    Data payload;
+    {
+        payload = ABI::Function::encodeFunctionCall("transfer", Ethereum::ABI::BaseParams{
+                                             std::make_shared<ABI::ProtoAddress>(toAddress),
+                                             std::make_shared<ABI::ProtoUInt256>(amount)
+        }).value();
+    }
+    ASSERT_EQ(hex(output.data()), hex(payload));
+    ASSERT_EQ(hex(output.data()), "a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000");
+}
+
+TEST(TWAnySignerEthereum, SignERC20TransferAsGenericContract) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasPrice = store(uint256_t(42000000000));                 // 0x09c7652400
+    auto gasLimit = store(uint256_t(78009));                       // 130B9
+    auto toAddress = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
+    // payload: transfer(0x5322b34c88ed0691971bf52a7047448f0f4efc84, 2000000000000000000)
+    auto data = parse_hex("0xa9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000");
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    // tx_mode not set, Legacy is the default
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_to_address(toAddress);
+    input.set_private_key(key.data(), key.size());
+    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
+    transfer.set_data(data.data(), data.size());
+
+    // https://etherscan.io/tx/0x199a7829fc5149e49b452c2cab76d8fa5a9682fee6e4891b8acb697ac142513e
+    std::string expected = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0724c62ad4fbf47346b02de06e603e013f26f26b56fdc0be7ba3d6273401d98cea0032131cae15da7ddcda66963e8bef51ca0d9962bfef0547d3f02597a4a58c931";
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), expected);
+    ASSERT_EQ(hex(output.data()), hex(data));
+}
+
+TEST(TWAnySignerEthereum, SignERC20TransferInvalidAddress) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasPrice = store(uint256_t(42000000000)); // 0x09c7652400
+    auto gasLimit = store(uint256_t(78009));       // 130B9
+    auto invalidAddress = "0xdeadbeef";
+    auto amount = store(uint256_t(2000000000000000000));
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    // tx_mode not set, Legacy is the default
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_to_address(invalidAddress);
+    input.set_private_key(key.data(), key.size());
+    auto& erc20 = *input.mutable_transaction()->mutable_erc20_transfer();
+    erc20.set_to(invalidAddress);
+    erc20.set_amount(amount.data(), amount.size());
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), "");
+}
+
+TEST(TWAnySignerEthereum, SignERC20Approve) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasPrice = store(uint256_t(42000000000)); // 0x09c7652400
+    auto gasLimit = store(uint256_t(78009));       // 130B9
+    auto spenderAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
+    auto token = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
+    auto amount = store(uint256_t(2000000000000000000));
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    // tx_mode not set, Legacy is the default
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_to_address(token);
+    input.set_private_key(key.data(), key.size());
+    auto& erc20 = *input.mutable_transaction()->mutable_erc20_approve();
+    erc20.set_spender(spenderAddress);
+    erc20.set_amount(amount.data(), amount.size());
+
+    std::string expected = "f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844095ea7b30000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0d8136d66da1e0ba8c7208d5c4f143167f54b89a0fe2e23440653bcca28b34dc1a049222a79339f1a9e4641cb4ad805c49c225ae704299ffc10627bf41c035c464a";
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), expected);
+}
+
+TEST(TWAnySignerEthereum, SignERC721Transfer) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasPrice = store(uint256_t(42000000000));
+    auto gasLimit = store(uint256_t(78009));
+    auto tokenContract = "0x4e45e92ed38f885d39a733c14f1817217a89d425";
+    auto fromAddress = "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc";
+    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
+    auto tokenId = parse_hex("23c47ee5");
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    // tx_mode not set, Legacy is the default
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_to_address(tokenContract);
+    input.set_private_key(key.data(), key.size());
+    auto& erc721 = *input.mutable_transaction()->mutable_erc721_transfer();
+    erc721.set_from(fromAddress);
+    erc721.set_to(toAddress);
+    erc721.set_token_id(tokenId.data(), tokenId.size());
+
+    std::string expected = "f8ca808509c7652400830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b86423b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee526a0d38440a4dc140a4100d301eb49fcc35b64439e27d1d8dd9b55823dca04e6e659a03b5f56a57feabc3406f123d6f8198cd7d7e2ced7e2d58d375f076952ecd9ce88";
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), expected);
+    ASSERT_EQ(hex(output.data()), "23b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee5");
+}
+
+TEST(TWAnySignerEthereum, SignERC1155Transfer) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasPrice = store(uint256_t(42000000000));
+    auto gasLimit = store(uint256_t(78009));
+    auto tokenContract = "0x4e45e92ed38f885d39a733c14f1817217a89d425";
+    auto fromAddress = "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc";
+    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
+    auto tokenId = parse_hex("23c47ee5");
+    auto value = uint256_t(2000000000000000000);
+    auto valueData = store(value);
+    auto data = parse_hex("01020304");
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    // tx_mode not set, Legacy is the default
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_to_address(tokenContract);
+    input.set_private_key(key.data(), key.size());
+    auto& erc1155 = *input.mutable_transaction()->mutable_erc1155_transfer();
+    erc1155.set_from(fromAddress);
+    erc1155.set_to(toAddress);
+    erc1155.set_token_id(tokenId.data(), tokenId.size());
+    erc1155.set_value(valueData.data(), valueData.size());
+    erc1155.set_data(data.data(), data.size());
+
+    std::string expected = "f9014a808509c7652400830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b8e4f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a00000000000000000000000000000000000000000000000000000000000000004010203040000000000000000000000000000000000000000000000000000000026a010315488201ac801ce346bffd1570de147615462d7e7db3cf08cf558465c6b79a06643943b24593bc3904a9fda63bb169881730994c973ab80f07d66a698064573";
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), expected);
+
+    // expected payload
+    Data payload;
+    {
+        auto funcData = ABI::Function::encodeFunctionCall("safeTransferFrom", Ethereum::ABI::BaseParams{
+                                                     std::make_shared<ABI::ProtoAddress>(fromAddress),
+                                                     std::make_shared<ABI::ProtoAddress>(toAddress),
+                                                     std::make_shared<ABI::ProtoUInt256>(uint256_t(0x23c47ee5)),
+                                                     std::make_shared<ABI::ProtoUInt256>(value),
+                                                     std::make_shared<ABI::ProtoByteArray>(data)});
+        payload = funcData.value();
+    }
+    ASSERT_EQ(hex(output.data()), hex(payload));
+    ASSERT_EQ(hex(output.data()), "f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000");
+}
+
+TEST(TWAnySignerEthereum, SignJSON) {
+    auto json = STRING(R"({"chainId":"AQ==","gasPrice":"1pOkAA==","gasLimit":"Ugg=","toAddress":"0x7d8bf18C7cE84b3E175b339c4Ca93aEd1dD166F1","transaction":{"transfer":{"amount":"A0i8paFgAA=="}}})");
+    auto key = DATA("17209af590a86462395d5881e60d11c7fa7d482cfb02b5a01b93c2eeef243543");
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeEthereum));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeEthereum));
+    assertStringsEqual(result, "f86a8084d693a400825208947d8bf18c7ce84b3e175b339c4ca93aed1dd166f1870348bca5a160008025a0fe5802b49e04c6b1705088310e133605ed8b549811a18968ad409ea02ad79f21a05bf845646fb1e1b9365f63a7fd5eb5e984094e3ed35c3bed7361aebbcbf41f10");
+}
+
+TEST(TWAnySignerEthereum, PlanNotSupported) {
+    // Ethereum does not use plan(), call it nonetheless
+    Proto::SigningInput input;
+    auto inputData = input.SerializeAsString();
+    auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t*)inputData.data(), inputData.size()));
+    auto outputTWData = WRAPD(TWAnySignerPlan(inputTWData.get(), TWCoinTypeEthereum));
+    EXPECT_EQ(TWDataSize(outputTWData.get()), 0ul);
+}
+
+TEST(TWAnySignerEthereum, SignERC1559Transfer_1442) {
+    auto chainId = store(uint256_t(3));
+    auto nonce = store(uint256_t(6));
+    auto gasLimit = store(uint256_t(21100));
+    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
+    auto maxFeePerGas = store(uint256_t(3000000000));
+    auto toAddress = "0xB9F5771C27664bF2282D98E09D7F50cEc7cB01a7";
+    auto value = uint256_t(543210987654321);
+    auto valueData = store(value);
+    auto key = parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_tx_mode(Proto::TransactionMode::Enveloped); // EIP1559
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_to_address(toAddress);
+    input.set_private_key(key.data(), key.size());
+    auto& transfer = *input.mutable_transaction()->mutable_transfer();
+    transfer.set_amount(valueData.data(), valueData.size());
+    transfer.set_data(Data().data(), 0);
+
+    // https://ropsten.etherscan.io/tx/0x14429509307efebfdaa05227d84c147450d168c68539351fbc01ed87c916ab2e
+    std::string expected = "02f8710306847735940084b2d05e0082526c94b9f5771c27664bf2282d98e09d7f50cec7cb01a78701ee0c29f50cb180c080a092c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c64a06487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58";
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    EXPECT_EQ(hex(output.encoded()), expected);
+    EXPECT_EQ(hex(output.v()), "00");
+    EXPECT_EQ(hex(output.r()), "92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c64");
+    EXPECT_EQ(hex(output.s()), "6487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58");
+    EXPECT_EQ(hex(output.data()), "");
+}
+
+TEST(TWAnySignerEthereum, SignERC20Transfer_1559) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasLimit = store(uint256_t(78009));                   // 130B9
+    auto maxInclusionFeePerGas = store(uint256_t(2000000000)); // 77359400
+    auto maxFeePerGas = store(uint256_t(3000000000));          // B2D05E00
+    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
+    auto token = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
+    auto amount = uint256_t(2000000000000000000);
+    auto amountData = store(amount);
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_tx_mode(Proto::TransactionMode::Enveloped);
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_to_address(token);
+    input.set_private_key(key.data(), key.size());
+    auto& erc20 = *input.mutable_transaction()->mutable_erc20_transfer();
+    erc20.set_to(toAddress);
+    erc20.set_amount(amountData.data(), amountData.size());
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), "02f8b00180847735940084b2d05e00830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000c080a0adfcfdf98d4ed35a8967a0c1d78b42adb7c5d831cf5a3272654ec8f8bcd7be2ea011641e065684f6aa476f4fd250aa46cd0b44eccdb0a6e1650d658d1998684cdf");
+}
+
+TEST(TWAnySignerEthereum, SignERC20Approve_1559) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasLimit = store(uint256_t(78009)); // 130B9
+    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
+    auto maxFeePerGas = store(uint256_t(3000000000));
+    auto spenderAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
+    auto token = "0x6b175474e89094c44da98b954eedeac495271d0f"; // DAI
+    auto amount = store(uint256_t(2000000000000000000));
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_tx_mode(Proto::TransactionMode::Enveloped);
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_to_address(token);
+    input.set_private_key(key.data(), key.size());
+    auto& erc20 = *input.mutable_transaction()->mutable_erc20_approve();
+    erc20.set_spender(spenderAddress);
+    erc20.set_amount(amount.data(), amount.size());
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), "02f8b00180847735940084b2d05e00830130b9946b175474e89094c44da98b954eedeac495271d0f80b844095ea7b30000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec80000c080a05a43dda3dc193480ee532a5ed67ba8fbd2e3afb9eee218f4fb955b415d592925a01300e5b5f51c8cd5bf80f018cea3fb347fae589e65355068ac44ffc996313c60");
+}
+
+TEST(TWAnySignerEthereum, SignERC721Transfer_1559) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasLimit = store(uint256_t(78009));
+    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
+    auto maxFeePerGas = store(uint256_t(3000000000));
+    auto tokenContract = "0x4e45e92ed38f885d39a733c14f1817217a89d425";
+    auto fromAddress = "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc";
+    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
+    auto tokenId = parse_hex("23c47ee5");
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_tx_mode(Proto::TransactionMode::Enveloped);
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_to_address(tokenContract);
+    input.set_private_key(key.data(), key.size());
+    auto& erc721 = *input.mutable_transaction()->mutable_erc721_transfer();
+    erc721.set_from(fromAddress);
+    erc721.set_to(toAddress);
+    erc721.set_token_id(tokenId.data(), tokenId.size());
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), "02f8d00180847735940084b2d05e00830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b86423b872dd000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee5c080a0dbd591d1eac39bad62d7c158d5e1d55e7014d2218998f8980462e2f283f42d4aa05acadb904484a0fb5526a4c64b8addb8aac4f6548f90199e40eb787b79faed4a");
+}
+
+TEST(TWAnySignerEthereum, SignERC1155Transfer_1559) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(0));
+    auto gasLimit = store(uint256_t(78009));
+    auto maxInclusionFeePerGas = store(uint256_t(2000000000));
+    auto maxFeePerGas = store(uint256_t(3000000000));
+    auto tokenContract = "0x4e45e92ed38f885d39a733c14f1817217a89d425";
+    auto fromAddress = "0x718046867b5b1782379a14eA4fc0c9b724DA94Fc";
+    auto toAddress = "0x5322b34c88ed0691971bf52a7047448f0f4efc84";
+    auto tokenId = parse_hex("23c47ee5");
+    auto value = uint256_t(2000000000000000000);
+    auto valueData = store(value);
+    auto data = parse_hex("01020304");
+    auto key = parse_hex("0x608dcb1742bb3fb7aec002074e3420e4fab7d00cced79ccdac53ed5b27138151");
+
+    Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_tx_mode(Proto::TransactionMode::Enveloped);
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_to_address(tokenContract);
+    input.set_private_key(key.data(), key.size());
+    auto& erc1155 = *input.mutable_transaction()->mutable_erc1155_transfer();
+    erc1155.set_from(fromAddress);
+    erc1155.set_to(toAddress);
+    erc1155.set_token_id(tokenId.data(), tokenId.size());
+    erc1155.set_value(valueData.data(), valueData.size());
+    erc1155.set_data(data.data(), data.size());
+
+    // sign test
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    ASSERT_EQ(hex(output.encoded()), "02f901500180847735940084b2d05e00830130b9944e45e92ed38f885d39a733c14f1817217a89d42580b8e4f242432a000000000000000000000000718046867b5b1782379a14ea4fc0c9b724da94fc0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000000000023c47ee50000000000000000000000000000000000000000000000001bc16d674ec8000000000000000000000000000000000000000000000000000000000000000000a000000000000000000000000000000000000000000000000000000000000000040102030400000000000000000000000000000000000000000000000000000000c080a0533df41dda5540c57257b7fe89c29cefff0155c333e063220df2bf9680fcc15aa036a844fd20de5a51de96ceaaf078558e87d86426a4a5d4b215ee1fd0fa397f8a");
+}
+
+TEST(TWAnySignerEthereum, StakeRocketPool) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(1));
+    auto gasPrice = store(uint256_t(2002000000));
+    auto gasLimit = store(uint256_t(205000));
+    auto maxFeePerGas = store(uint256_t(27900000000));
+    auto maxInclusionFeePerGas = store(uint256_t(1000000000));
+    auto toAddress = "0x2cac916b2a963bf162f076c0a8a4a8200bcfbfb4";
+    auto key = parse_hex("9f56448d33de406db1561aae15fce64bdf0e9706ff15c45d4409e8fcbfd1a498");
+    const auto pk = PrivateKey(key);
+
+    // 0.01 ETH
+    auto valueData = store(uint256_t(10000000000000000));
+
+    Data payload;
+    {
+        auto funcData = ABI::Function::encodeFunctionCall("deposit", Ethereum::ABI::BaseParams{ });
+        payload = funcData.value();
+    }
+
+
+    Proto::SigningInput input;
+    input.set_tx_mode(Proto::TransactionMode::Enveloped);
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+
+    input.set_to_address(toAddress);
+    input.set_private_key(key.data(), key.size());
+
+    auto& transfer = *input.mutable_transaction()->mutable_transfer();
+    transfer.set_amount(valueData.data(), valueData.size());
+    transfer.set_data(payload.data(), payload.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    // https://etherscan.io/tx/0xfeba0c579f3e964fbc4eafa500e86891b9f4113735b1364edd4433d765506f1e
+    EXPECT_EQ(hex(output.r()), "fb39e5079d7a0598ec45785d73a06b91fe1db707b9c6a150c87ffce2492c66d6");
+    EXPECT_EQ(hex(output.v()), "00");
+    EXPECT_EQ(hex(output.s()), "7fbd43a6f4733b2b4f98ad1bc4678ea2615f5edf56ad91408337adec2f07c0ac");
+    EXPECT_EQ(hex(output.encoded()), "02f8770101843b9aca0085067ef83700830320c8942cac916b2a963bf162f076c0a8a4a8200bcfbfb4872386f26fc1000084d0e30db0c080a0fb39e5079d7a0598ec45785d73a06b91fe1db707b9c6a150c87ffce2492c66d6a07fbd43a6f4733b2b4f98ad1bc4678ea2615f5edf56ad91408337adec2f07c0ac");
+}
+
+TEST(TWAnySignerEthereum, UnstakeRocketPool) {
+    auto chainId = store(uint256_t(1));
+    auto nonce = store(uint256_t(3));
+    auto gasPrice = store(uint256_t(2002000000));
+    auto gasLimit = store(uint256_t(350000));
+    auto maxFeePerGas = store(uint256_t(27900000000));
+    auto maxInclusionFeePerGas = store(uint256_t(1000000000));
+    auto toAddress = "0xae78736Cd615f374D3085123A210448E74Fc6393";
+    auto key = parse_hex("9f56448d33de406db1561aae15fce64bdf0e9706ff15c45d4409e8fcbfd1a498");
+    const auto pk = PrivateKey(key);
+
+    auto valueData = store(uint256_t(0));
+
+    Data payload;
+    {
+        auto funcData = ABI::Function::encodeFunctionCall("burn", ABI::BaseParams{
+            std::make_shared<ABI::ProtoUInt256>(uint256_t(0x21faa32ab2502b))
+        });
+        payload = funcData.value();
+    }
+
+    Proto::SigningInput input;
+    input.set_tx_mode(Proto::TransactionMode::Enveloped);
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+    input.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+
+    input.set_to_address(toAddress);
+    input.set_private_key(key.data(), key.size());
+
+    auto& transfer = *input.mutable_transaction()->mutable_contract_generic();
+    transfer.set_amount(valueData.data(), valueData.size());
+    transfer.set_data(payload.data(), payload.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEthereum);
+
+    // https://etherscan.io/tx/0x7fd3c0e9b8b309b4258baa7677c60f5e00e8db7b647fbe3a52adda25058a4b37
+    EXPECT_EQ(hex(output.r()), "1fc6e94908107584357799e952b4e3fb87f088aeb66d7930a7015643f19c9e7f");
+    EXPECT_EQ(hex(output.v()), "00");
+    EXPECT_EQ(hex(output.s()), "2c56a0b70ff2e52bf374a3dcd404bc42317d5ca15d319f5e33665352eb48f06f");
+    EXPECT_EQ(hex(output.encoded()), "02f8900103843b9aca0085067ef837008305573094ae78736cd615f374d3085123a210448e74fc639380a442966c680000000000000000000000000000000000000000000000000021faa32ab2502bc080a01fc6e94908107584357799e952b4e3fb87f088aeb66d7930a7015643f19c9e7fa02c56a0b70ff2e52bf374a3dcd404bc42317d5ca15d319f5e33665352eb48f06f");
+}
+
+
+} // namespace TW::Ethereum
diff --git a/tests/chains/Ethereum/TWCoinTypeTests.cpp b/tests/chains/Ethereum/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..4f205ff7a76
--- /dev/null
+++ b/tests/chains/Ethereum/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWEthereumCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeEthereum));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x9edaf0f7d9c6629c31bbf0471fc07d696c73b566b93783f7e25d8d5d2b62fa4f"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeEthereum, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x5bb497e8d9fe26e92dd1be01e32076c8e024d167"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeEthereum, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeEthereum));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeEthereum));
+    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeEthereum));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeEthereum), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeEthereum));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeEthereum));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeEthereum));
+    assertStringsEqual(symbol, "ETH");
+    assertStringsEqual(txUrl, "https://etherscan.io/tx/0x9edaf0f7d9c6629c31bbf0471fc07d696c73b566b93783f7e25d8d5d2b62fa4f");
+    assertStringsEqual(accUrl, "https://etherscan.io/address/0x5bb497e8d9fe26e92dd1be01e32076c8e024d167");
+    assertStringsEqual(id, "ethereum");
+    assertStringsEqual(name, "Ethereum");
+    assertStringsEqual(chainId, "1");
+}
diff --git a/tests/chains/Ethereum/TWEthereumAbiTests.cpp b/tests/chains/Ethereum/TWEthereumAbiTests.cpp
new file mode 100644
index 00000000000..607c2c58193
--- /dev/null
+++ b/tests/chains/Ethereum/TWEthereumAbiTests.cpp
@@ -0,0 +1,348 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWEthereumAbi.h>
+#include <TrustWalletCore/TWEthereumAbiFunction.h>
+#include <TrustWalletCore/TWString.h>
+
+#include "Data.h"
+#include "HexCoding.h"
+#include "proto/EthereumAbi.pb.h"
+#include "uint256.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+#include <string>
+
+namespace TW::Ethereum {
+
+TEST(TWEthereumAbi, FuncCreateEmpty) {
+    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("baz")).get());
+    EXPECT_TRUE(func != nullptr);
+
+    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
+    std::string type2 = TWStringUTF8Bytes(type.get());
+    EXPECT_EQ("baz()", type2);
+
+    // delete
+    TWEthereumAbiFunctionDelete(func);
+}
+
+TEST(TWEthereumAbi, FuncCreate1) {
+    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("baz")).get());
+    EXPECT_TRUE(func != nullptr);
+
+    auto p1index = TWEthereumAbiFunctionAddParamUInt64(func, 69, false);
+    EXPECT_EQ(0, p1index);
+    auto p2index = TWEthereumAbiFunctionAddParamUInt64(func, 9, true);
+    EXPECT_EQ(0, p2index);
+    // check back get value
+    auto p2val2 = TWEthereumAbiFunctionGetParamUInt64(func, p2index, true);
+    EXPECT_EQ(9ul, p2val2);
+
+    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
+    std::string type2 = TWStringUTF8Bytes(type.get());
+    EXPECT_EQ("baz(uint64)", type2);
+
+    // delete
+    TWEthereumAbiFunctionDelete(func);
+}
+
+TEST(TWEthereumAbi, FuncCreate2) {
+    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("baz")).get());
+    EXPECT_TRUE(func != nullptr);
+
+    auto p1valStr = WRAPS(TWStringCreateWithUTF8Bytes("0045"));
+    auto p1val = WRAPD(TWDataCreateWithHexString(p1valStr.get()));
+    auto p1index = TWEthereumAbiFunctionAddParamUInt256(func, p1val.get(), false);
+    EXPECT_EQ(0, p1index);
+
+    Data dummy = store(0);
+    auto p2index = TWEthereumAbiFunctionAddParamUInt256(func, &dummy, true);
+    EXPECT_EQ(0, p2index);
+
+    // check back get value
+    auto p2val2 = WRAPD(TWEthereumAbiFunctionGetParamUInt256(func, p2index, true));
+    Data p2val3 = data(TWDataBytes(p2val2.get()), TWDataSize(p2val2.get()));
+    EXPECT_EQ("00", hex(p2val3));
+
+    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
+    EXPECT_EQ("baz(uint256)", std::string(TWStringUTF8Bytes(type.get())));
+
+    // delete
+    TWEthereumAbiFunctionDelete(func);
+}
+
+TEST(TWEthereumAbi, EncodeFuncCase1) {
+    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("sam")).get());
+    EXPECT_TRUE(func != nullptr);
+    
+    EXPECT_EQ(0, TWEthereumAbiFunctionAddParamBytes(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("64617665")).get())).get(), false));
+    EXPECT_EQ(1, TWEthereumAbiFunctionAddParamBool(func, true, false));
+    auto paramArrIdx = TWEthereumAbiFunctionAddParamArray(func, false);
+    EXPECT_EQ(2, paramArrIdx);
+    EXPECT_EQ(0, TWEthereumAbiFunctionAddInArrayParamUInt256(func, paramArrIdx, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("01")).get())).get()));
+    EXPECT_EQ(1, TWEthereumAbiFunctionAddInArrayParamUInt256(func, paramArrIdx, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("02")).get())).get()));
+    EXPECT_EQ(2, TWEthereumAbiFunctionAddInArrayParamUInt256(func, paramArrIdx, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("03")).get())).get()));
+
+    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
+    EXPECT_EQ("sam(bytes,bool,uint256[])", std::string(TWStringUTF8Bytes(type.get())));
+
+    auto encoded = WRAPD(TWEthereumAbiEncode(func));
+    Data enc2 = data(TWDataBytes(encoded.get()), TWDataSize(encoded.get()));
+    EXPECT_EQ("a5643bf2"
+        "0000000000000000000000000000000000000000000000000000000000000060"
+        "0000000000000000000000000000000000000000000000000000000000000001"
+        "00000000000000000000000000000000000000000000000000000000000000a0"
+        "0000000000000000000000000000000000000000000000000000000000000004"
+        "6461766500000000000000000000000000000000000000000000000000000000"
+        "0000000000000000000000000000000000000000000000000000000000000003"
+        "0000000000000000000000000000000000000000000000000000000000000001"
+        "0000000000000000000000000000000000000000000000000000000000000002"
+        "0000000000000000000000000000000000000000000000000000000000000003",
+        hex(enc2));
+
+    // delete
+    TWEthereumAbiFunctionDelete(func);
+}
+
+TEST(TWEthereumAbi, EncodeFuncCase2) {
+    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("f")).get());
+    EXPECT_TRUE(func != nullptr);
+    
+    EXPECT_EQ(0, TWEthereumAbiFunctionAddParamUInt256(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false));
+    auto paramArrIdx = TWEthereumAbiFunctionAddParamArray(func, false);
+    EXPECT_EQ(1, paramArrIdx);
+    EXPECT_EQ(0, TWEthereumAbiFunctionAddInArrayParamUInt32(func, paramArrIdx, 0x456));
+    EXPECT_EQ(1, TWEthereumAbiFunctionAddInArrayParamUInt32(func, paramArrIdx, 0x789));
+    EXPECT_EQ(2, TWEthereumAbiFunctionAddParamBytesFix(func, 10, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("31323334353637383930")).get())).get(), false));
+    EXPECT_EQ(3, TWEthereumAbiFunctionAddParamString(func, WRAPS(TWStringCreateWithUTF8Bytes("Hello, world!")).get(), false));
+
+    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
+    EXPECT_EQ("f(uint256,uint32[],bytes10,string)", std::string(TWStringUTF8Bytes(type.get())));
+
+    auto encoded = WRAPD(TWEthereumAbiEncode(func));
+    Data enc2 = data(TWDataBytes(encoded.get()), TWDataSize(encoded.get()));
+    EXPECT_EQ("47b941bf"
+        "0000000000000000000000000000000000000000000000000000000000000123"
+        "0000000000000000000000000000000000000000000000000000000000000080"
+        "3132333435363738393000000000000000000000000000000000000000000000"
+        "00000000000000000000000000000000000000000000000000000000000000e0"
+        "0000000000000000000000000000000000000000000000000000000000000002"
+        "0000000000000000000000000000000000000000000000000000000000000456"
+        "0000000000000000000000000000000000000000000000000000000000000789"
+        "000000000000000000000000000000000000000000000000000000000000000d"
+        "48656c6c6f2c20776f726c642100000000000000000000000000000000000000",
+        hex(enc2));
+
+    // delete
+    TWEthereumAbiFunctionDelete(func);
+}
+
+TEST(TWEthereumAbi, EncodeFuncMonster) {
+    // Monster function with all parameters types
+    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("monster")).get());
+    EXPECT_TRUE(func != nullptr);
+    
+    TWEthereumAbiFunctionAddParamUInt8(func, 1, false);
+    TWEthereumAbiFunctionAddParamUInt16(func, 2, false);
+    TWEthereumAbiFunctionAddParamUInt32(func, 3, false);
+    TWEthereumAbiFunctionAddParamUInt64(func, 4, false);
+    TWEthereumAbiFunctionAddParamUIntN(func, 168, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamUInt256(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamInt8(func, 1, false);
+    TWEthereumAbiFunctionAddParamInt16(func, -3, false);
+    TWEthereumAbiFunctionAddParamInt32(func, 3, false);
+    TWEthereumAbiFunctionAddParamInt64(func, 4, false);
+    TWEthereumAbiFunctionAddParamIntN(func, 168, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamInt256(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamBool(func, true, false);
+    TWEthereumAbiFunctionAddParamString(func, WRAPS(TWStringCreateWithUTF8Bytes("Hello, world!")).get(), false);
+    TWEthereumAbiFunctionAddParamAddress(func,
+        WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("f784682c82526e245f50975190ef0fff4e4fc077")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamBytes(func, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("3132333435")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamBytesFix(func, 5, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("3132333435")).get())).get(), false);
+    
+    TWEthereumAbiFunctionAddInArrayParamUInt8(func, TWEthereumAbiFunctionAddParamArray(func, false), 1);
+    TWEthereumAbiFunctionAddInArrayParamUInt16(func, TWEthereumAbiFunctionAddParamArray(func, false), 2);
+    TWEthereumAbiFunctionAddInArrayParamUInt32(func, TWEthereumAbiFunctionAddParamArray(func, false), 3);
+    TWEthereumAbiFunctionAddInArrayParamUInt64(func, TWEthereumAbiFunctionAddParamArray(func, false), 4);
+    TWEthereumAbiFunctionAddInArrayParamUIntN(func, TWEthereumAbiFunctionAddParamArray(func, false), 168, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get());
+    TWEthereumAbiFunctionAddInArrayParamUInt256(func, TWEthereumAbiFunctionAddParamArray(func, false), WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get());
+    TWEthereumAbiFunctionAddInArrayParamInt8(func, TWEthereumAbiFunctionAddParamArray(func, false), 1);
+    TWEthereumAbiFunctionAddInArrayParamInt16(func, TWEthereumAbiFunctionAddParamArray(func, false), -3);
+    TWEthereumAbiFunctionAddInArrayParamInt32(func, TWEthereumAbiFunctionAddParamArray(func, false), 3);
+    TWEthereumAbiFunctionAddInArrayParamInt64(func, TWEthereumAbiFunctionAddParamArray(func, false), 4);
+    TWEthereumAbiFunctionAddInArrayParamIntN(func, TWEthereumAbiFunctionAddParamArray(func, false), 168, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get());
+    TWEthereumAbiFunctionAddInArrayParamInt256(func, TWEthereumAbiFunctionAddParamArray(func, false), WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0123")).get())).get());
+    TWEthereumAbiFunctionAddInArrayParamBool(func, TWEthereumAbiFunctionAddParamArray(func, false), true);
+    TWEthereumAbiFunctionAddInArrayParamString(func, TWEthereumAbiFunctionAddParamArray(func, false), WRAPS(TWStringCreateWithUTF8Bytes("Hello, world!")).get());
+    TWEthereumAbiFunctionAddInArrayParamAddress(func, TWEthereumAbiFunctionAddParamArray(func, false), 
+        WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("f784682c82526e245f50975190ef0fff4e4fc077")).get())).get());
+    TWEthereumAbiFunctionAddInArrayParamBytes(func, TWEthereumAbiFunctionAddParamArray(func, false), WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("3132333435")).get())).get());
+    TWEthereumAbiFunctionAddInArrayParamBytesFix(func, TWEthereumAbiFunctionAddParamArray(func, false), 5, WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("3132333435")).get())).get());
+
+    // check back out params
+    EXPECT_EQ(1, TWEthereumAbiFunctionGetParamUInt8(func, 0, false));
+    EXPECT_EQ(4ul, TWEthereumAbiFunctionGetParamUInt64(func, 3, false));
+    EXPECT_EQ(true, TWEthereumAbiFunctionGetParamBool(func, 12, false));
+    EXPECT_EQ(std::string("Hello, world!"), std::string(TWStringUTF8Bytes(WRAPS(TWEthereumAbiFunctionGetParamString(func, 13, false)).get())));
+    WRAPD(TWEthereumAbiFunctionGetParamAddress(func, 14, false));
+
+    auto type = WRAPS(TWEthereumAbiFunctionGetType(func));
+    EXPECT_EQ(
+        "monster(uint8,uint16,uint32,uint64,uint168,uint256,int8,int16,int32,int64,int168,int256,bool,string,address,bytes,bytes5,"
+        "uint8[],uint16[],uint32[],uint64[],uint168[],uint256[],int8[],int16[],int32[],int64[],int168[],int256[],bool[],string[],address[],bytes[],bytes5[])",
+        std::string(TWStringUTF8Bytes(type.get())));
+
+    auto encoded = WRAPD(TWEthereumAbiEncode(func));
+    Data enc2 = data(TWDataBytes(encoded.get()), TWDataSize(encoded.get()));
+    EXPECT_EQ(4ul + 76 * 32, enc2.size());
+    EXPECT_EQ(hex(enc2), "70efb5a50000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000004000000000000000000000000000000000000000000000000000000000000012300000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000001fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd000000000000000000000000000000000000000000000000000000000000000300000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000012300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000440000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc0770000000000000000000000000000000000000000000000000000000000000480313233343500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004c000000000000000000000000000000000000000000000000000000000000005000000000000000000000000000000000000000000000000000000000000000540000000000000000000000000000000000000000000000000000000000000058000000000000000000000000000000000000000000000000000000000000005c000000000000000000000000000000000000000000000000000000000000006000000000000000000000000000000000000000000000000000000000000000640000000000000000000000000000000000000000000000000000000000000068000000000000000000000000000000000000000000000000000000000000006c000000000000000000000000000000000000000000000000000000000000007000000000000000000000000000000000000000000000000000000000000000740000000000000000000000000000000000000000000000000000000000000078000000000000000000000000000000000000000000000000000000000000007c00000000000000000000000000000000000000000000000000000000000000800000000000000000000000000000000000000000000000000000000000000088000000000000000000000000000000000000000000000000000000000000008c00000000000000000000000000000000000000000000000000000000000000940000000000000000000000000000000000000000000000000000000000000000d48656c6c6f2c20776f726c64210000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000053132333435000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000003000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000040000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000012300000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000001fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffd000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000030000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000400000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000123000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000001230000000000000000000000000000000000000000000000000000000000000001000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000010000000000000000000000000000000000000000000000000000000000000020000000000000000000000000000000000000000000000000000000000000000d48656c6c6f2c20776f726c6421000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077000000000000000000000000000000000000000000000000000000000000000100000000000000000000000000000000000000000000000000000000000000200000000000000000000000000000000000000000000000000000000000000005313233343500000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000013132333435000000000000000000000000000000000000000000000000000000");
+
+    // delete
+    TWEthereumAbiFunctionDelete(func);
+}
+
+TEST(TWEthereumAbi, DecodeOutputFuncCase1) {
+    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("readout")).get());
+    EXPECT_TRUE(func != nullptr);
+
+    TWEthereumAbiFunctionAddParamAddress(func, 
+        WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("f784682c82526e245f50975190ef0fff4e4fc077")).get())).get(), false);
+    TWEthereumAbiFunctionAddParamUInt64(func, 1000, false);
+    EXPECT_EQ(0, TWEthereumAbiFunctionAddParamUInt64(func, 0, true));
+
+    // original output value
+    EXPECT_EQ(0ul, TWEthereumAbiFunctionGetParamUInt64(func, 0, true));
+
+    // decode
+    auto encoded = WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes("0000000000000000000000000000000000000000000000000000000000000045")).get()));
+    EXPECT_EQ(true, TWEthereumAbiDecodeOutput(func, encoded.get()));
+
+    // new output value
+    EXPECT_EQ(0x45ul, TWEthereumAbiFunctionGetParamUInt64(func, 0, true));
+
+    // delete
+    TWEthereumAbiFunctionDelete(func);
+}
+
+TEST(TWEthereumAbi, GetParamWrongType) {
+    TWEthereumAbiFunction* func = TWEthereumAbiFunctionCreateWithString(WRAPS(TWStringCreateWithUTF8Bytes("func")).get());
+    ASSERT_TRUE(func != nullptr);
+    // add parameters
+    EXPECT_EQ(0, TWEthereumAbiFunctionAddParamUInt8(func, 1, true));
+    EXPECT_EQ(1, TWEthereumAbiFunctionAddParamUInt64(func, 2, true));
+
+    // GetParameter with correct types
+    EXPECT_EQ(1, TWEthereumAbiFunctionGetParamUInt8(func, 0, true));
+    EXPECT_EQ(2ul, TWEthereumAbiFunctionGetParamUInt64(func, 1, true));
+
+    // GetParameter with wrong type, default value (0) is returned
+    EXPECT_EQ(0, TWEthereumAbiFunctionGetParamUInt8(func, 1, true));
+    EXPECT_EQ(0ul, TWEthereumAbiFunctionGetParamUInt64(func, 0, true));
+    EXPECT_EQ("00", hex(*(static_cast<const Data*>(WRAPD(TWEthereumAbiFunctionGetParamUInt256(func, 0, true)).get()))));
+    EXPECT_EQ(false, TWEthereumAbiFunctionGetParamBool(func, 0, true));
+    EXPECT_EQ("", std::string(TWStringUTF8Bytes(WRAPS(TWEthereumAbiFunctionGetParamString(func, 0, true)).get())));
+    EXPECT_EQ("", hex(*(static_cast<const Data*>(WRAPD(TWEthereumAbiFunctionGetParamAddress(func, 0, true)).get()))));
+
+    // GetParameter with wrong index, default value (0) is returned
+    EXPECT_EQ(0, TWEthereumAbiFunctionGetParamUInt8(func, 99, true));
+    EXPECT_EQ(0ul, TWEthereumAbiFunctionGetParamUInt64(func, 99, true));
+    EXPECT_EQ("00", hex(*(static_cast<const Data*>(WRAPD(TWEthereumAbiFunctionGetParamUInt256(func, 99, true)).get()))));
+    EXPECT_EQ(false, TWEthereumAbiFunctionGetParamBool(func, 99, true));
+    EXPECT_EQ("", std::string(TWStringUTF8Bytes(WRAPS(TWEthereumAbiFunctionGetParamString(func, 99, true)).get())));
+    EXPECT_EQ("", hex(*(static_cast<const Data*>(WRAPD(TWEthereumAbiFunctionGetParamAddress(func, 99, true)).get()))));
+
+    // delete
+    TWEthereumAbiFunctionDelete(func);
+}
+
+TEST(TWEthereumAbi, DecodeCall) {
+    auto encodedCall = parse_hex("c47f0027000000000000000000000000000000000000000000000000000000000000002000000000000000000000000000000000000000000000000000000000000000086465616462656566000000000000000000000000000000000000000000000000");
+    auto abiJson = R"|({"c47f0027":{"constant":false,"inputs":[{"name":"name","type":"string"}],"name":"setName","outputs":[],"payable":false,"stateMutability":"nonpayable","type":"function"}})|";
+
+    EthereumAbi::Proto::ContractCallDecodingInput input;
+    input.set_encoded(encodedCall.data(), encodedCall.size());
+    input.set_smart_contract_abi_json(abiJson);
+
+    const auto inputData = data(input.SerializeAsString());
+    auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t*)inputData.data(), inputData.size()));
+    auto outputTWData = WRAPD(TWEthereumAbiDecodeContractCall(TWCoinTypeEthereum, inputTWData.get()));
+
+    EthereumAbi::Proto::ContractCallDecodingOutput output;
+    output.ParseFromArray(TWDataBytes(outputTWData.get()), static_cast<int>(TWDataSize(outputTWData.get())));
+
+    auto expected = R"|({"function":"setName(string)","inputs":[{"name":"name","type":"string","value":"deadbeef"}]})|";
+    EXPECT_EQ(output.decoded_json(), expected);
+}
+
+TEST(TWEthereumAbi, DecodeInvalidCall) {
+    auto callHex = STRING("c47f002700");
+    auto call = WRAPD(TWDataCreateWithHexString(callHex.get()));
+
+    auto decoded1 = TWEthereumAbiDecodeCall(call.get(), STRING(",,").get());
+    auto decoded2 = TWEthereumAbiDecodeCall(call.get(), STRING("{}").get());
+
+    EXPECT_TRUE(decoded1 == nullptr);
+    EXPECT_TRUE(decoded2 == nullptr);
+}
+
+TEST(TWEthereumAbi, encodeTyped) {
+    auto message = WRAPS(TWStringCreateWithUTF8Bytes(
+        R"({
+            "types": {
+                "EIP712Domain": [
+                    {"name": "name", "type": "string"},
+                    {"name": "version", "type": "string"},
+                    {"name": "chainId", "type": "uint256"},
+                    {"name": "verifyingContract", "type": "address"}
+                ],
+                "Person": [
+                    {"name": "name", "type": "string"},
+                    {"name": "wallets", "type": "address[]"}
+                ],
+                "Mail": [
+                    {"name": "from", "type": "Person"},
+                    {"name": "to", "type": "Person[]"},
+                    {"name": "contents", "type": "string"}
+                ]
+            },
+            "primaryType": "Mail",
+            "domain": {
+                "name": "Ether Mail",
+                "version": "1",
+                "chainId": 1,
+                "verifyingContract": "0xCcCCccccCCCCcCCCCCCcCcCccCcCCCcCcccccccC"
+            },
+            "message": {
+                "from": {
+                    "name": "Cow",
+                    "wallets": [
+                        "CD2a3d9F938E13CD947Ec05AbC7FE734Df8DD826",
+                        "DeaDbeefdEAdbeefdEadbEEFdeadbeEFdEaDbeeF"
+                    ]
+                },
+                "to": [
+                    {
+                        "name": "Bob",
+                        "wallets": [
+                            "bBbBBBBbbBBBbbbBbbBbbbbBBbBbbbbBbBbbBBbB",
+                            "B0BdaBea57B0BDABeA57b0bdABEA57b0BDabEa57",
+                            "B0B0b0b0b0b0B000000000000000000000000000"
+                        ]
+                    }
+                ],
+                "contents": "Hello, Bob!"
+            }
+        })"));
+    auto hash = WRAPD(TWEthereumAbiEncodeTyped(message.get()));
+
+    EXPECT_EQ(
+        hex(TW::data(TWDataBytes(hash.get()), TWDataSize(hash.get()))),
+        "a85c2e2b118698e88db68a8105b794a8cc7cec074e89ef991cb4f5f533819cc2"
+    );
+}
+
+} // namespace TW::Ethereum
diff --git a/tests/Ethereum/TWEthereumAbiValueDecoderTests.cpp b/tests/chains/Ethereum/TWEthereumAbiValueDecoderTests.cpp
similarity index 92%
rename from tests/Ethereum/TWEthereumAbiValueDecoderTests.cpp
rename to tests/chains/Ethereum/TWEthereumAbiValueDecoderTests.cpp
index 2f84327195b..ba4607d10ca 100644
--- a/tests/Ethereum/TWEthereumAbiValueDecoderTests.cpp
+++ b/tests/chains/Ethereum/TWEthereumAbiValueDecoderTests.cpp
@@ -1,14 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWEthereumAbiValue.h>
 
 #include "Data.h"
 #include "HexCoding.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <gtest/gtest.h>
 
 using namespace TW;
@@ -49,7 +47,7 @@ TEST(TWEthereumAbiValue, decodeValue) {
     {
         const auto input = "000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077";
         const auto type = "address";
-        const auto expected = "0xf784682c82526e245f50975190ef0fff4e4fc077";
+        const auto expected = "0xF784682C82526e245F50975190EF0fff4E4fC077";
         auto data = WRAPD(TWDataCreateWithHexString(STRING(input).get()));
         auto result = WRAPS(TWEthereumAbiValueDecodeValue(data.get(), WRAPS(TWStringCreateWithUTF8Bytes(type)).get()));
         EXPECT_EQ(std::string(expected), std::string(TWStringUTF8Bytes(result.get())));
@@ -97,8 +95,8 @@ TEST(TWEthereumAbiValue, decodeArray) {
             "0000000000000000000000002e00cd222cb42b616d86d037cc494e8ab7f5c9a3";
         const auto type = "address[]";
         const auto expected = 
-            "[\"0xf784682c82526e245f50975190ef0fff4e4fc077\","
-            "\"0x2e00cd222cb42b616d86d037cc494e8ab7f5c9a3\"]";
+            "[\"0xF784682C82526e245F50975190EF0fff4E4fC077\","
+            "\"0x2e00CD222Cb42B616D86D037Cc494e8ab7F5c9a3\"]";
         auto data = WRAPD(TWDataCreateWithHexString(STRING(input).get()));
         auto result = WRAPS(TWEthereumAbiValueDecodeArray(data.get(), WRAPS(TWStringCreateWithUTF8Bytes(type)).get()));
         EXPECT_EQ(std::string(expected), std::string(TWStringUTF8Bytes(result.get())));
diff --git a/tests/Ethereum/TWEthereumAbiValueEncodeTests.cpp b/tests/chains/Ethereum/TWEthereumAbiValueEncodeTests.cpp
similarity index 92%
rename from tests/Ethereum/TWEthereumAbiValueEncodeTests.cpp
rename to tests/chains/Ethereum/TWEthereumAbiValueEncodeTests.cpp
index b4b120adbd3..1d73afc40e6 100644
--- a/tests/Ethereum/TWEthereumAbiValueEncodeTests.cpp
+++ b/tests/chains/Ethereum/TWEthereumAbiValueEncodeTests.cpp
@@ -1,15 +1,13 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWEthereumAbiValue.h>
 
 #include "Data.h"
 #include "HexCoding.h"
 #include "uint256.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <gtest/gtest.h>
 
 using namespace TW;
diff --git a/tests/chains/Ethereum/TWRlpTests.cpp b/tests/chains/Ethereum/TWRlpTests.cpp
new file mode 100644
index 00000000000..661529562dc
--- /dev/null
+++ b/tests/chains/Ethereum/TWRlpTests.cpp
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWEthereumRlp.h"
+#include "proto/EthereumRlp.pb.h"
+#include "HexCoding.h"
+#include "TestUtilities.h"
+#include "uint256.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWEthereumRlp, Eip1559) {
+    auto chainId = store(10);
+    auto nonce = store(6);
+    auto maxInclusionFeePerGas = 2'000'000'000;
+    auto maxFeePerGas = store(3'000'000'000);
+    auto gasLimit = store(21'100);
+    const auto* to = "0x6b175474e89094c44da98b954eedeac495271d0f";
+    auto amount = 0;
+    auto payload = parse_hex("a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1");
+
+    EthereumRlp::Proto::EncodingInput input;
+    auto* list = input.mutable_item()->mutable_list();
+
+    list->add_items()->set_number_u256(chainId.data(), chainId.size());
+    list->add_items()->set_number_u256(nonce.data(), nonce.size());
+    list->add_items()->set_number_u64(maxInclusionFeePerGas);
+    list->add_items()->set_number_u256(maxFeePerGas.data(), maxFeePerGas.size());
+    list->add_items()->set_number_u256(gasLimit.data(), gasLimit.size());
+    list->add_items()->set_address(to);
+    list->add_items()->set_number_u64(amount);
+    list->add_items()->set_data(payload.data(), payload.size());
+    // Append an empty `access_list`.
+    list->add_items()->mutable_list();
+
+    auto inputData = input.SerializeAsString();
+    auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));
+    auto outputTWData = WRAPD(TWEthereumRlpEncode(TWCoinTypeEthereum, inputTWData.get()));
+
+    EthereumRlp::Proto::EncodingOutput output;
+    output.ParseFromArray(TWDataBytes(outputTWData.get()), static_cast<int>(TWDataSize(outputTWData.get())));
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_TRUE(output.error_message().empty());
+    EXPECT_EQ(hex(output.encoded()), "f86c0a06847735940084b2d05e0082526c946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000000001ee0c29f50cb1c0");
+}
diff --git a/tests/chains/Ethereum/TransactionCompilerTests.cpp b/tests/chains/Ethereum/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..3660ed2e610
--- /dev/null
+++ b/tests/chains/Ethereum/TransactionCompilerTests.cpp
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "uint256.h"
+
+#include "proto/Ethereum.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(EthereumCompiler, CompileWithSignatures) {
+    /// Step 1: Prepare transaction input (protobuf)
+    const auto coin = TWCoinTypeEthereum;
+    Ethereum::Proto::SigningInput input;
+
+    const auto nonce = store(uint256_t(11));
+    const auto chainId = store(uint256_t(1));
+    const auto gasPrice = store(uint256_t(20000000000));
+    const auto gasLimit = store(uint256_t(21000));
+    const auto amount = store(uint256_t(1'000'000'000'000'000'000));
+
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_tx_mode(Ethereum::Proto::Legacy);
+    input.set_to_address("0x3535353535353535353535353535353535353535");
+
+    input.mutable_transaction()->mutable_transfer()->set_amount(amount.data(), amount.size());
+
+    // Serialize back, this shows how to serialize SigningInput protobuf to byte array
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_EQ(txInputData.size(), 75ul);
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::SigningError::OK);
+
+    auto preImageHash = data(preSigningOutput.data_hash());
+    EXPECT_EQ(hex(preImageHash), "15e180a6274b2f6a572b9b51823fce25ef39576d10188ecdcd7de44526c47217");
+
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData =
+        parse_hex("044bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ce28cab79ad711"
+                  "9ee1ad3ebcdb98a16805211530ecc6cfefa1b88e6dff99232a");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1Extended);
+    const auto signature =
+        parse_hex("360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a19"
+                  "1d844db458893b928f3efbfee90c9febf51ab84c9796677900");
+
+    // Verify signature (pubkey & hash & signature)
+    { EXPECT_TRUE(publicKey.verify(signature, preImageHash)); }
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKeyData});
+
+    // We dont care about public key in ethereum. It is not part of the transaction.
+    auto outputDataWithoutPubKey =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {});
+
+    EXPECT_EQ(outputData, outputDataWithoutPubKey);
+
+    const auto ExpectedTx =
+        "f86c0b8504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a0"
+        "360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07ba053bd9d1376e15a191d844db4"
+        "58893b928f3efbfee90c9febf51ab84c97966779";
+    {
+        EXPECT_EQ(outputData.size(), 217ul);
+        Ethereum::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.encoded().size(), 110ul);
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        Ethereum::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(txInputData.data(), (int)txInputData.size()));
+        auto key = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+        signingInput.set_private_key(key.data(), key.size());
+
+        Ethereum::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Ethereum::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+}
diff --git a/tests/chains/Ethereum/ValueDecoderTests.cpp b/tests/chains/Ethereum/ValueDecoderTests.cpp
new file mode 100644
index 00000000000..8a47e82e822
--- /dev/null
+++ b/tests/chains/Ethereum/ValueDecoderTests.cpp
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Ethereum/ABI/ValueDecoder.h"
+#include <HexCoding.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Ethereum::tests {
+
+uint256_t decodeFromHex(std::string s) {
+    auto data = parse_hex(s);
+    return ABI::ValueDecoder::decodeUInt256(data);
+}
+
+TEST(EthereumAbiValueDecoder, decodeUInt256) {
+    EXPECT_EQ(uint256_t(0), decodeFromHex(""));
+    EXPECT_EQ(uint256_t(0), decodeFromHex("0000000000000000000000000000000000000000000000000000000000000000"));
+    EXPECT_EQ(uint256_t(1), decodeFromHex("0000000000000000000000000000000000000000000000000000000000000001"));
+    EXPECT_EQ(uint256_t(123456), decodeFromHex("01e240"));
+    EXPECT_EQ(uint256_t(10020405371567), decodeFromHex("0000000000000000000000000000000000000000000000000000091d0eb3e2af"));
+    EXPECT_EQ(uint256_t(10020405371567), decodeFromHex("0000000000000000000000000000000000000000000000000000091d0eb3e2af00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"));
+}
+
+TEST(EthereumAbiValueDecoder, decodeValue) {
+    EXPECT_EQ("42", ABI::ValueDecoder::decodeValue(parse_hex("000000000000000000000000000000000000000000000000000000000000002a"), "uint"));
+    EXPECT_EQ("24", ABI::ValueDecoder::decodeValue(parse_hex("0000000000000000000000000000000000000000000000000000000000000018"), "uint8"));
+    EXPECT_EQ("123456", ABI::ValueDecoder::decodeValue(parse_hex("000000000000000000000000000000000000000000000000000000000001e240"), "uint256"));
+    EXPECT_EQ("0xF784682C82526e245F50975190EF0fff4E4fC077", ABI::ValueDecoder::decodeValue(parse_hex("000000000000000000000000f784682c82526e245f50975190ef0fff4e4fc077"), "address"));
+    EXPECT_EQ("Hello World!    Hello World!    Hello World!",
+              ABI::ValueDecoder::decodeValue(parse_hex(
+                                                 "000000000000000000000000000000000000000000000000000000000000002c"
+                                                 "48656c6c6f20576f726c64212020202048656c6c6f20576f726c642120202020"
+                                                 "48656c6c6f20576f726c64210000000000000000000000000000000000000000"),
+                                             "string"));
+    EXPECT_EQ("0x31323334353637383930", ABI::ValueDecoder::decodeValue(parse_hex("3132333435363738393000000000000000000000000000000000000000000000"), "bytes10"));
+}
+
+} // namespace TW::Ethereum::tests
diff --git a/tests/Ethereum/ValueEncoderTests.cpp b/tests/chains/Ethereum/ValueEncoderTests.cpp
similarity index 96%
rename from tests/Ethereum/ValueEncoderTests.cpp
rename to tests/chains/Ethereum/ValueEncoderTests.cpp
index 29a621d2a05..58cca246524 100644
--- a/tests/Ethereum/ValueEncoderTests.cpp
+++ b/tests/chains/Ethereum/ValueEncoderTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Ethereum/ABI/ValueEncoder.h"
 #include <HexCoding.h>
diff --git a/tests/chains/EthereumClassic/TWCoinTypeTests.cpp b/tests/chains/EthereumClassic/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..e547ced83a0
--- /dev/null
+++ b/tests/chains/EthereumClassic/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWEthereumClassicCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeEthereumClassic));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x66004165d3901819dc22e568931591d2e4287bda54995f4ce2701a12016f5997"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeEthereumClassic, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x9eab4b0fc468a7f5d46228bf5a76cb52370d068d"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeEthereumClassic, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeEthereumClassic));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeEthereumClassic));
+    const auto chainId = WRAPS(TWCoinTypeChainId(TWCoinTypeEthereumClassic));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeEthereumClassic), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeEthereumClassic));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeEthereumClassic));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeEthereumClassic));
+    assertStringsEqual(symbol, "ETC");
+    assertStringsEqual(txUrl, "https://blockscout.com/etc/mainnet/tx/0x66004165d3901819dc22e568931591d2e4287bda54995f4ce2701a12016f5997");
+    assertStringsEqual(accUrl, "https://blockscout.com/etc/mainnet/address/0x9eab4b0fc468a7f5d46228bf5a76cb52370d068d");
+    assertStringsEqual(id, "classic");
+    assertStringsEqual(name, "Ethereum Classic");
+    assertStringsEqual(chainId, "61");
+}
diff --git a/tests/chains/Everscale/AddressTests.cpp b/tests/chains/Everscale/AddressTests.cpp
new file mode 100644
index 00000000000..f984140bd74
--- /dev/null
+++ b/tests/chains/Everscale/AddressTests.cpp
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Everscale/Address.h"
+#include "Everscale/WorkchainType.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+
+namespace TW::Everscale {
+
+TEST(EverscaleAddress, Valid) {
+    ASSERT_TRUE(Address::isValid("0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
+}
+
+TEST(EverscaleAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("hello world"));
+    ASSERT_FALSE(Address::isValid("83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
+    ASSERT_FALSE(Address::isValid("1:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
+    ASSERT_FALSE(Address::isValid("-2:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
+    ASSERT_FALSE(Address::isValid("2147483648:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a"));
+    ASSERT_FALSE(Address::isValid("0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469ab"));
+}
+
+TEST(EverscaleAddress, FromString) {
+    auto address = Address("0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a");
+    ASSERT_EQ(address.string(), "0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a");
+
+    auto address_uppercase = Address("0:83A0352908060FA87839195D8A763A8D9AB28F8FA41468832B398A719CC6469A");
+    ASSERT_EQ(address_uppercase.string(), "0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a");
+}
+
+TEST(EverscaleAddress, FromPrivateKey) {
+    auto privateKey = PrivateKey(parse_hex("5b59e0372d19b6355c73fa8cc708fa3301ae2ec21bb6277e8b79d386ccb7846f"));
+    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519), WorkchainType::Basechain);
+    ASSERT_EQ(address.string(), "0:269fee242eb410786abe1777a14785c8bbeb1e34100c7570e17698b36ad66fb0");
+}
+
+TEST(EverscaleAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("e4925f9932df8d7fd0042efff3e2178a972028b644ded3a3b66f6d0577f82e78"), TWPublicKeyTypeED25519);
+    auto address = Address(publicKey, WorkchainType::Basechain);
+    ASSERT_EQ(address.string(), "0:269fee242eb410786abe1777a14785c8bbeb1e34100c7570e17698b36ad66fb0");
+}
+
+} // namespace TW::Everscale
diff --git a/tests/Everscale/CellBuilderTest.cpp b/tests/chains/Everscale/CellBuilderTest.cpp
similarity index 91%
rename from tests/Everscale/CellBuilderTest.cpp
rename to tests/chains/Everscale/CellBuilderTest.cpp
index 860f3bac6e5..73ad08f382b 100644
--- a/tests/Everscale/CellBuilderTest.cpp
+++ b/tests/chains/Everscale/CellBuilderTest.cpp
@@ -1,20 +1,17 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "BinaryCoding.h"
 #include "HexCoding.h"
 #include "PublicKey.h"
 
-#include "Everscale/Cell.h"
-#include "Everscale/CellBuilder.h"
+#include "Everscale/CommonTON/Cell.h"
+#include "Everscale/CommonTON/CellBuilder.h"
 #include "Everscale/Wallet.h"
 
 #include <gtest/gtest.h>
 
-using namespace TW;
 using boost::multiprecision::uint128_t;
 
 namespace TW::Everscale {
diff --git a/tests/Everscale/CellTests.cpp b/tests/chains/Everscale/CellTests.cpp
similarity index 96%
rename from tests/Everscale/CellTests.cpp
rename to tests/chains/Everscale/CellTests.cpp
index c9b1b821cb9..139878ec6c1 100644
--- a/tests/Everscale/CellTests.cpp
+++ b/tests/chains/Everscale/CellTests.cpp
@@ -1,20 +1,16 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Base64.h"
-#include "Everscale/Cell.h"
-#include "Everscale/Wallet.h"
 #include "HexCoding.h"
-#include <boost/archive/iterators/binary_from_base64.hpp>
-#include <boost/archive/iterators/transform_width.hpp>
+
+#include "Everscale/CommonTON/Cell.h"
+#include "Everscale/Wallet.h"
+
 #include <gtest/gtest.h>
 #include <vector>
 
-using namespace TW;
-
 namespace TW::Everscale {
 
 // All hashes could be verified using https://ever.bytie.moe/visualizer
@@ -68,7 +64,7 @@ TEST(EverscaleCell, EmptyCell) {
     ASSERT_EQ(hex(cell3->hash), EMPTY_CELL);
 
     // With `storeHashes` (provided hash should be skipped)
-    const auto cell4 = Cell::fromBase64("te6ccgEBAQEAJAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA");
+    const auto cell4 = Cell::fromBase64("te6ccgEBAQEAJAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=");
     ASSERT_EQ(hex(cell4->hash), EMPTY_CELL);
 }
 
diff --git a/tests/chains/Everscale/SignerTests.cpp b/tests/chains/Everscale/SignerTests.cpp
new file mode 100644
index 00000000000..832eb068f80
--- /dev/null
+++ b/tests/chains/Everscale/SignerTests.cpp
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Everscale/Messages.h"
+#include "Everscale/Signer.h"
+
+#include "Base64.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Everscale {
+
+TEST(EverscaleSigner, TransferWithDeploy) {
+    auto input = Proto::SigningInput();
+
+    auto& transfer = *input.mutable_transfer();
+    transfer.set_bounce(false);
+    transfer.set_behavior(Proto::MessageBehavior::SimpleTransfer);
+    transfer.set_amount(500000000);
+    transfer.set_expired_at(1680770631);
+    transfer.set_to("0:db18a67f4626f15ac0537a18445937f685f9b30184f0d7b28be4bdeb92d2fd90");
+
+    // NOTE: There is `set_encoded_contract_data` because contract was not deployed yet
+
+    auto privateKey = parse_hex("542bd4288352f1c6b270046f153d406aec054a0a06000ab9b36b5c6dd3050ad4");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(Cell::fromBase64(output.encoded())->hash), "bfb18e56e9d00d783c7eb1726f08bf613dd0f01a110a130c0f8f91bb13390a39");
+
+    // Link to the message: https://everscan.io/messages/bfb18e56e9d00d783c7eb1726f08bf613dd0f01a110a130c0f8f91bb13390a39
+    ASSERT_EQ(output.encoded(), "te6ccgICAAQAAQAAAUoAAAPhiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrBGMBTen55/RbfcIBoeCrPB1cxPMcHRx7xyBzJmdtewBPaTu/WuHgnqg09jQaxTEcii+Nuqm7p3b6iMq+/6598ggCXUlsUyF0MjgAAAAAHAAAwACAAEAaEIAbYxTP6MTeK1gKb0MIiyb+0L82YDCeGvZRfJe9clpfsgg7msoAAAAAAAAAAAAAAAAAAAAUAAAAABLqS2KOWKN+7Y5OSiKhKisiw6t/h2ovvR3WbapyAtrdctwupwA3v8AIN0gggFMl7ohggEznLqxn3Gw7UTQ0x/THzHXC//jBOCk8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA==");
+}
+
+TEST(EverscaleSigner, Transfer1) {
+    auto input = Proto::SigningInput();
+
+    auto& transfer = *input.mutable_transfer();
+    transfer.set_bounce(false);
+    transfer.set_behavior(Proto::MessageBehavior::SimpleTransfer);
+    transfer.set_amount(100000000);
+    transfer.set_expired_at(1680770631);
+    transfer.set_to("0:db18a67f4626f15ac0537a18445937f685f9b30184f0d7b28be4bdeb92d2fd90");
+
+    transfer.set_encoded_contract_data("te6ccgEBAQEAKgAAUAAAAAFLqS2KOWKN+7Y5OSiKhKisiw6t/h2ovvR3WbapyAtrdctwupw=");
+
+    auto privateKey = parse_hex("542bd4288352f1c6b270046f153d406aec054a0a06000ab9b36b5c6dd3050ad4");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(Cell::fromBase64(output.encoded())->hash), "73807b0a3ca2d8564c023dccd5b9da222a270f68338c6fc2c064dda376a2c59d");
+
+    // Link to the message: https://everscan.io/messages/73807b0a3ca2d8564c023dccd5b9da222a270f68338c6fc2c064dda376a2c59d
+    ASSERT_EQ(output.encoded(), "te6ccgICAAIAAQAAAKoAAAHfiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrAImASIQKH2jIwoA65IGC6aua4gAA4fFo/Nuxgb3sIRELhZnSXIS7IsE2E4D+8hk3EWGVZX+ICqlN/ka9DvXduhaXUlsUyF0MjgAAAAIHAABAGhCAG2MUz+jE3itYCm9DCIsm/tC/NmAwnhr2UXyXvXJaX7IIC+vCAAAAAAAAAAAAAAAAAAA");
+}
+
+TEST(EverscaleSigner, Transfer2) {
+    auto input = Proto::SigningInput();
+
+    auto& transfer = *input.mutable_transfer();
+    transfer.set_bounce(true);
+    transfer.set_behavior(Proto::MessageBehavior::SendAllBalance);
+    transfer.set_amount(200000000);
+    transfer.set_expired_at(1680770631);
+    transfer.set_to("0:df112b59eb82792623575194c60d2f547c68d54366644a3a5e02b8132f3c4c56");
+
+    transfer.set_encoded_contract_data("te6ccgEBAQEAKgAAUAAAAAJLqS2KOWKN+7Y5OSiKhKisiw6t/h2ovvR3WbapyAtrdctwupw=");
+
+    auto privateKey = parse_hex("542bd4288352f1c6b270046f153d406aec054a0a06000ab9b36b5c6dd3050ad4");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(Cell::fromBase64(output.encoded())->hash), "e35616cfa88e115580f07c6b41ae3ded1902d2bab1efefb74f677b4aececef24");
+
+    // Link to the message: https://everscan.io/messages/e35616cfa88e115580f07c6b41ae3ded1902d2bab1efefb74f677b4aececef24
+    ASSERT_EQ(output.encoded(), "te6ccgICAAIAAQAAAKoAAAHfiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrANrT0ivIEpuMGjKoyS9J03Wbl24jowXvdzQdLD6L3USLETUyRGbbmbUfBcNtF1FwKtmIQd0lNR1qIX9K/eloMgaXUlsUyF0MjgAAAAUFAABAGhiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrIF9eEAAAAAAAAAAAAAAAAAAA");
+}
+
+} // namespace TW::Everscale
diff --git a/tests/chains/Everscale/TWAnyAddressTests.cpp b/tests/chains/Everscale/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..743f8c56d79
--- /dev/null
+++ b/tests/chains/Everscale/TWAnyAddressTests.cpp
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWHDWallet.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Everscale {
+
+TEST(TWEverscale, HDWallet) {
+    auto mnemonic =
+        STRING("shoot island position soft burden budget tooth cruel issue economy destroy above");
+    auto passphrase = STRING("");
+
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(mnemonic.get(), passphrase.get()));
+
+    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypeEverscale, WRAPS(TWCoinTypeDerivationPath(TWCoinTypeEverscale)).get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyEd25519(privateKey.get()));
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeEverscale));
+    auto addressStr = WRAPS(TWAnyAddressDescription(address.get()));
+
+    assertStringsEqual(addressStr, "0:0c39661089f86ec5926ea7d4ee4223d634ba4ed6dcc2e80c7b6a8e6d59f79b04");
+}
+
+} // namespace TW::Everscale
diff --git a/tests/chains/Everscale/TWAnySignerTests.cpp b/tests/chains/Everscale/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..eb101efdee8
--- /dev/null
+++ b/tests/chains/Everscale/TWAnySignerTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "HexCoding.h"
+#include "proto/Everscale.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Everscale {
+
+TEST(TWAnySignerEverscale, SignMessageToDeployWallet) {
+    Proto::SigningInput input;
+
+    auto& transfer = *input.mutable_transfer();
+    transfer.set_bounce(false);
+    transfer.set_behavior(Proto::MessageBehavior::SimpleTransfer);
+    transfer.set_amount(500000000);
+    transfer.set_expired_at(1680770631);
+    transfer.set_to("0:db18a67f4626f15ac0537a18445937f685f9b30184f0d7b28be4bdeb92d2fd90");
+
+    // NOTE: There is `set_encoded_contract_data` because contract was not deployed yet
+
+    auto privateKey = parse_hex("542bd4288352f1c6b270046f153d406aec054a0a06000ab9b36b5c6dd3050ad4");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeEverscale);
+
+    ASSERT_EQ(output.encoded(), "te6ccgICAAQAAQAAAUoAAAPhiAG+Ilaz1wTyTEauoymMGl6o+NGqhszIlHS8BXAmXniYrBGMBTen55/RbfcIBoeCrPB1cxPMcHRx7xyBzJmdtewBPaTu/WuHgnqg09jQaxTEcii+Nuqm7p3b6iMq+/6598ggCXUlsUyF0MjgAAAAAHAAAwACAAEAaEIAbYxTP6MTeK1gKb0MIiyb+0L82YDCeGvZRfJe9clpfsgg7msoAAAAAAAAAAAAAAAAAAAAUAAAAABLqS2KOWKN+7Y5OSiKhKisiw6t/h2ovvR3WbapyAtrdctwupwA3v8AIN0gggFMl7ohggEznLqxn3Gw7UTQ0x/THzHXC//jBOCk8mCDCNcYINMf0x/TH/gjE7vyY+1E0NMf0x/T/9FRMrryoVFEuvKiBPkBVBBV+RDyo/gAkyDXSpbTB9QC+wDo0QGkyMsfyx/L/8ntVA==");
+}
+
+} // namespace TW::Everscale
diff --git a/tests/chains/Everscale/TWCoinTypeTests.cpp b/tests/chains/Everscale/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f4e59de8cd9
--- /dev/null
+++ b/tests/chains/Everscale/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Everscale {
+
+TEST(TWEverscaleCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeEverscale;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("781238b2b0d15cd4cd2e2a0a142753750cd5e1b2c8b506fcede75a90e02f1268"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0:d2bf59964a05dee84a0dd1ddc0ad83ba44d49719cf843d689dc8b726d0fb59d8"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "everscale");
+    assertStringsEqual(name, "Everscale");
+    assertStringsEqual(symbol, "EVER");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 9);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEverscale);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(txUrl, "https://everscan.io/transactions/781238b2b0d15cd4cd2e2a0a142753750cd5e1b2c8b506fcede75a90e02f1268");
+    assertStringsEqual(accUrl, "https://everscan.io/accounts/0:d2bf59964a05dee84a0dd1ddc0ad83ba44d49719cf843d689dc8b726d0fb59d8");
+}
+
+} // namespace TW::Everscale
diff --git a/tests/chains/Evmos/SignerTests.cpp b/tests/chains/Evmos/SignerTests.cpp
new file mode 100644
index 00000000000..aba0816b53a
--- /dev/null
+++ b/tests/chains/Evmos/SignerTests.cpp
@@ -0,0 +1,127 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Base64.h"
+#include "proto/Cosmos.pb.h"
+#include "Cosmos/Address.h"
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <nlohmann/json.hpp>
+
+#include <gtest/gtest.h>
+#include <google/protobuf/util/json_util.h>
+
+namespace TW::Cosmos::evmos::tests {
+
+TEST(EvmosSigner, SignTxJsonEthermintKeyType) {
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::JSON); // obsolete
+    input.set_account_number(1037);
+    input.set_chain_id("evmos_9001-2");
+    input.set_memo("");
+    input.set_sequence(8);
+
+    auto fromAddress = Address("evmos", parse_hex("BC2DA90C84049370D1B7C528BC164BC588833F21"));
+    auto toAddress = Address("evmos", parse_hex("12E8FE8B81ECC1F4F774EA6EC8DF267138B9F2D9"));
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address(fromAddress.string());
+    message.set_to_address(toAddress.string());
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("muon");
+    amountOfTx->set_amount("1");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("muon");
+    amountOfFee->set_amount("200");
+
+    auto privateKey = parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeNativeEvmos);
+    auto anotherExpectedJson =R"(
+                            {
+                                "mode":"block",
+                                "tx":{"fee":{"amount":[{"amount":"200","denom":"muon"}],"gas":"200000"},
+                                "memo":"",
+                                "msg":[{"type":"cosmos-sdk/MsgSend",
+                                "value":{"amount":[{"amount":"1","denom":"muon"}],
+                                "from_address":"evmos1hsk6jryyqjfhp5dhc55tc9jtckygx0ep4mur4z",
+                                "to_address":"evmos1zt50azupanqlfam5afhv3hexwyutnuke45f6ye"}}],
+                                "signatures":
+                                        [
+                                            {
+                                                "pub_key":
+                                                        {
+                                                            "type":"ethermint/PubKeyEthSecp256k1",
+                                                            "value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"
+                                                        },
+                                                "signature":"1hMFtRqKjB8tiuyHYVYZundPdomebIIvHLC1gj9uXtFc+iO3UAHBysBjFB4brd9AD5yriS3uUDTAqqfg6fNGNg=="
+                                            }
+                                        ]}
+                            })"_json;
+
+    /// This tx is not broadcasted, we just want to test the signature format (ethermint/PubKeyEthSecp256k1)
+    EXPECT_EQ(anotherExpectedJson, nlohmann::json::parse(output.json()));
+
+    auto signatures = nlohmann::json::parse(output.signature_json());
+
+    auto expectedSignatures = R"(
+        [
+            {
+                "pub_key":
+                    {
+                        "type":"ethermint/PubKeyEthSecp256k1",
+                        "value":"AlcobsPzfTNVe7uqAAsndErJAjqplnyudaGB0f+R+p3F"
+                    },
+                "signature":"1hMFtRqKjB8tiuyHYVYZundPdomebIIvHLC1gj9uXtFc+iO3UAHBysBjFB4brd9AD5yriS3uUDTAqqfg6fNGNg=="
+            }
+        ])"_json;
+    EXPECT_EQ(signatures, expectedSignatures);
+}
+
+TEST(EvmosSigner, CompoundingAuthz) {
+    // Successfully broadcasted https://www.mintscan.io/evmos/txs/8D811CEC078420C41220F0B584EA0AC037763380FAC31E0E352E4BB4D1D18B79
+    auto input = Proto::SigningInput();
+    input.set_signing_mode(Proto::Protobuf);
+    input.set_account_number(2139877);
+    input.set_chain_id("evmos_9001-2");
+    input.set_memo("");
+    input.set_sequence(3);
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_auth_grant();
+    message.set_granter("evmos12m9grgas60yk0kult076vxnsrqz8xpjy9rpf3e");
+    message.set_grantee("evmos18fzq4nac28gfma6gqfvkpwrgpm5ctar2z9mxf3");
+    auto& grant_stake = *message.mutable_grant_stake();
+    grant_stake.mutable_allow_list()->add_address("evmosvaloper1umk407eed7af6anvut6llg2zevnf0dn0feqqny");
+    grant_stake.set_authorization_type(TW::Cosmos::Proto::Message_AuthorizationType_DELEGATE);
+    message.set_expiration(1692309600);
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(180859);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("aevmos");
+    amountOfFee->set_amount("4521475000000000");
+
+    auto privateKey = parse_hex("79bcbded1a5678ab34e6d9db9ad78e4e480e7b22723cc5fbf59e843732e1a8e5");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto output = Proto::SigningOutput();
+    ANY_SIGN(input, TWCoinTypeNativeEvmos);
+    // Please note the signature has been updated according to the serialization of the `StakeAuthorization` message.
+    // Previous: CvUBCvIBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQSzwEKLGV2bW9zMTJtOWdyZ2FzNjB5azBrdWx0MDc2dnhuc3Jxejh4cGp5OXJwZjNlEixldm1vczE4ZnpxNG5hYzI4Z2ZtYTZncWZ2a3B3cmdwbTVjdGFyMno5bXhmMxpxCmcKKi9jb3Ntb3Muc3Rha2luZy52MWJldGExLlN0YWtlQXV0aG9yaXphdGlvbhI5EjUKM2V2bW9zdmFsb3BlcjF1bWs0MDdlZWQ3YWY2YW52dXQ2bGxnMnpldm5mMGRuMGZlcXFueSABEgYI4LD6pgYSfQpZCk8KKC9ldGhlcm1pbnQuY3J5cHRvLnYxLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohA4B2WHbj6sH/GWE7z/YW5PRnXYFGaGRAov7gZZI2Fv2nEgQKAggBGAMSIAoaCgZhZXZtb3MSEDQ1MjE0NzUwMDAwMDAwMDAQ+4QLGkAm17CZgB7m+CPVlITnrHosklMTL9zrUeGRs8FL8N0GcRami9zdJ+e3xuXOtJmwP7G6QNh85CRYjFj8a8lpmmJM
+    auto expected = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CvUBCvIBCh4vY29zbW9zLmF1dGh6LnYxYmV0YTEuTXNnR3JhbnQSzwEKLGV2bW9zMTJtOWdyZ2FzNjB5azBrdWx0MDc2dnhuc3Jxejh4cGp5OXJwZjNlEixldm1vczE4ZnpxNG5hYzI4Z2ZtYTZncWZ2a3B3cmdwbTVjdGFyMno5bXhmMxpxCmcKKi9jb3Ntb3Muc3Rha2luZy52MWJldGExLlN0YWtlQXV0aG9yaXphdGlvbhI5IAESNQozZXZtb3N2YWxvcGVyMXVtazQwN2VlZDdhZjZhbnZ1dDZsbGcyemV2bmYwZG4wZmVxcW55EgYI4LD6pgYSfQpZCk8KKC9ldGhlcm1pbnQuY3J5cHRvLnYxLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohA4B2WHbj6sH/GWE7z/YW5PRnXYFGaGRAov7gZZI2Fv2nEgQKAggBGAMSIAoaCgZhZXZtb3MSEDQ1MjE0NzUwMDAwMDAwMDAQ+4QLGkBXaTo3nk5EMFW9Euheez5ADx2bWo7XisNJ5vuGj1fKXh6CGNJGfJj/q1XUkBzaCvPNg+EcFHgtJdVSyF4cJZTg"
+                })";
+    assertJSONEqual(output.serialized(), expected);
+}
+}
diff --git a/tests/chains/Evmos/TWAnyAddressTests.cpp b/tests/chains/Evmos/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..d36bfa9c64f
--- /dev/null
+++ b/tests/chains/Evmos/TWAnyAddressTests.cpp
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWPublicKey.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Evmos::tests {
+
+TEST(EvmosAnyAddress, EvmosValidate) {
+    auto string = STRING("0x30627903124Aa1e71384bc52e1cb96E4AB3252b6");
+
+    EXPECT_TRUE(TWAnyAddressIsValid(string.get(), TWCoinTypeEvmos));
+
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeEvmos));
+    
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "30627903124aa1e71384bc52e1cb96e4ab3252b6");    
+}
+
+TEST(EvmosAnyAddress, EvmosCreate) {
+    auto publicKeyHex = "045a0c6b83b8bd9827e507270cadb499b7e3a9095246f6a2213281f783d877c98b256742741b0639f317768fe4f4c2762660c2112283a7685d815507dee3229173"; // shoot island position ...
+    const auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA(publicKeyHex).get(), TWPublicKeyTypeSECP256k1Extended));
+
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeEvmos));
+
+    EXPECT_EQ(std::string(TWStringUTF8Bytes(WRAPS(TWAnyAddressDescription(addr.get())).get())), std::string("0x8f348F300873Fd5DA36950B2aC75a26584584feE"));
+
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "8f348f300873fd5da36950b2ac75a26584584fee");
+}
+
+} // namespace TW::Evmos::tests
diff --git a/tests/chains/Evmos/TWCoinTypeTests.cpp b/tests/chains/Evmos/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..781e1e4e22b
--- /dev/null
+++ b/tests/chains/Evmos/TWCoinTypeTests.cpp
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Evmos::tests {
+
+TEST(TWEvmosCoinType, TWCoinTypeEvmos) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeEvmos));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x24af42cf4977a96d62e3a82c3cd9b519c3e7c53dd83398b88f0cb435d867b422"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeEvmos, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x30627903124Aa1e71384bc52e1cb96E4AB3252b6"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeEvmos, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeEvmos));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeEvmos));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeEvmos), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeEvmos));
+
+    assertStringsEqual(symbol, "EVMOS");
+    assertStringsEqual(txUrl, "https://evm.evmos.org/tx/0x24af42cf4977a96d62e3a82c3cd9b519c3e7c53dd83398b88f0cb435d867b422");
+    assertStringsEqual(accUrl, "https://evm.evmos.org/address/0x30627903124Aa1e71384bc52e1cb96E4AB3252b6");
+    assertStringsEqual(id, "evmos");
+    assertStringsEqual(name, "Evmos");
+}
+
+} // namespace TW::Evmos::tests
diff --git a/tests/chains/Evmos/TransactionCompilerTests.cpp b/tests/chains/Evmos/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..47a700bdf94
--- /dev/null
+++ b/tests/chains/Evmos/TransactionCompilerTests.cpp
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "HexCoding.h"
+#include "proto/Cosmos.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+#include "TrustWalletCore/TWAnySigner.h"
+#include "TestUtilities.h"
+#include "TransactionCompiler.h"
+
+namespace TW::Cosmos::evmos::tests {
+
+TEST(EvmosCompiler, CompileWithSignatures) {
+    // Successfully broadcasted: https://www.mintscan.io/evmos/transactions/02105B186FCA473C9F467B2D3BF487F6CE5DB26EE54BCD1667DDB7A2DA0E2489
+
+    const auto coin = TWCoinTypeNativeEvmos;
+    TW::Cosmos::Proto::SigningInput input;
+
+    PrivateKey privateKey =
+        PrivateKey(parse_hex("727513ec3c54eb6fae24f2ff756bbc4c89b82945c6538bbd173613ae3de719d3"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    /// Step 1: Prepare transaction input (protobuf)
+    input.set_account_number(106619981);
+    input.set_chain_id("evmos_9001-2");
+    input.set_memo("");
+    input.set_sequence(0);
+
+    PublicKey publicKey = privateKey.getPublicKey(TWCoinTypePublicKeyType(coin));
+    const auto pubKeyBz = publicKey.bytes;
+    ASSERT_EQ(hex(pubKeyBz), "04088ac2919987d927368cb2be2ade44cd0ed3616745a9699cae264b3fc5a7c3607d99f441b8340990ee990cb3eaf560f1f0bafe600c7e94a4be8392166984f728");
+    input.set_public_key(pubKeyBz.data(), pubKeyBz.size());
+
+    auto msg = input.add_messages();
+    auto& message = *msg->mutable_send_coins_message();
+    message.set_from_address("evmos1d0jkrsd09c7pule43y3ylrul43lwwcqa7vpy0g");
+    message.set_to_address("evmos17dh3frt0m6kdd3m9lr6e6sr5zz0rz8cvxd7u5t");
+    auto amountOfTx = message.add_amounts();
+    amountOfTx->set_denom("aevmos");
+    amountOfTx->set_amount("10000000000000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(137840);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("aevmos");
+    amountOfFee->set_amount("5513600000000000");
+
+    /// Step 2: Obtain protobuf preimage hash
+    input.set_signing_mode(TW::Cosmos::Proto::Protobuf);
+    auto protoInputString = input.SerializeAsString();
+    auto protoInputData = TW::Data(protoInputString.begin(), protoInputString.end());
+
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, protoInputData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    auto preImage = preSigningOutput.data();
+    auto preImageHash = preSigningOutput.data_hash();
+
+    EXPECT_EQ(
+        hex(preImage),
+        "0a9c010a99010a1c2f636f736d6f732e62616e6b2e763162657461312e4d736753656e6412790a2c65766d6f733164306a6b7273643039633770756c6534337933796c72756c34336c7777637161377670793067122c65766d6f733137646833667274306d366b6464336d396c723665367372357a7a30727a3863767864377535741a1b0a066165766d6f7312113130303030303030303030303030303030127b0a570a4f0a282f65746865726d696e742e63727970746f2e76312e657468736563703235366b312e5075624b657912230a2102088ac2919987d927368cb2be2ade44cd0ed3616745a9699cae264b3fc5a7c36012040a02080112200a1a0a066165766d6f7312103535313336303030303030303030303010f0b4081a0c65766d6f735f393030312d3220cdc8eb32");
+    EXPECT_EQ(hex(preImageHash),
+        "9912eb629e215027b8d587939b1af72a9f70ae326bcaf48dfe77a729fc4ac632");
+
+
+    auto expectedTx = R"({"mode":"BROADCAST_MODE_BLOCK","tx_bytes":"CpwBCpkBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnkKLGV2bW9zMWQwamtyc2QwOWM3cHVsZTQzeTN5bHJ1bDQzbHd3Y3FhN3ZweTBnEixldm1vczE3ZGgzZnJ0MG02a2RkM205bHI2ZTZzcjV6ejByejhjdnhkN3U1dBobCgZhZXZtb3MSETEwMDAwMDAwMDAwMDAwMDAwEnsKVwpPCigvZXRoZXJtaW50LmNyeXB0by52MS5ldGhzZWNwMjU2azEuUHViS2V5EiMKIQIIisKRmYfZJzaMsr4q3kTNDtNhZ0WpaZyuJks/xafDYBIECgIIARIgChoKBmFldm1vcxIQNTUxMzYwMDAwMDAwMDAwMBDwtAgaQKrmMaaSKnohf3ahyCOYdRJKBKJjr4WkkA/cbn6FRdF0Gd6FHSzBP8S4v4VNiy3KC47TD0C+sUBO413gCzjo8/U="})";
+    Data signature;
+
+    {
+        TW::Cosmos::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+        assertJSONEqual(
+            output.serialized(),
+            expectedTx);
+
+        signature = data(output.signature());
+        EXPECT_EQ(hex(signature),
+                  "aae631a6922a7a217f76a1c8239875124a04a263af85a4900fdc6e7e8545d17419de851d2cc13fc4b8bf854d8b2dca0b8ed30f40beb1404ee35de00b38e8f3f5");
+
+        ASSERT_TRUE(publicKey.verify(signature, data(preImageHash.data())));
+    }
+
+    {
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, protoInputData, {signature}, {publicKey.bytes});
+        Cosmos::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        EXPECT_EQ(output.serialized(), expectedTx);
+        EXPECT_EQ(hex(output.signature()), hex(signature));
+    }
+}
+
+}
diff --git a/tests/chains/FIO/AddressTests.cpp b/tests/chains/FIO/AddressTests.cpp
new file mode 100644
index 00000000000..ffc99746168
--- /dev/null
+++ b/tests/chains/FIO/AddressTests.cpp
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "FIO/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include <TrustWalletCore/TWPublicKeyType.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::FIO::tests {
+
+TEST(FIOAddress, ValidateString) {
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_FALSE(Address::isValid("65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF"));
+    ASSERT_FALSE(Address::isValid("EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjT"));
+
+    ASSERT_TRUE(Address::isValid("FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o"));
+}
+
+TEST(FIOAddress, ValidateData) {
+    Address address("FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
+    EXPECT_EQ(address.bytes.size(), 37ul);
+    Data addrData = TW::data(address.bytes.data(), address.bytes.size());
+
+    EXPECT_EQ(Address::isValid(addrData), true);
+
+    // create invalid data, too short
+    Data addressDataShort = subData(addrData, 0, addrData.size() - 1);
+    EXPECT_EQ(Address::isValid(addressDataShort), false);
+}
+
+TEST(FIOAddress, FromString) {
+    Address addr("FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
+    ASSERT_EQ(addr.string(), "FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
+    ASSERT_EQ(hex(addr.bytes), "0271195c66ec2799e436757a70cd8431d4b17733a097b18a5f7f1b6b085978ff0f343fc54e");
+}
+
+TEST(FIOAddress, FromStringInvalid) {
+    try {
+        Address address("WRP5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
+    } catch (std::invalid_argument&) {
+        return; // ok
+    }
+    ADD_FAILURE() << "Missed expected exeption";
+}
+
+TEST(FIOAddress, FromPublicKey) {
+    auto key = PrivateKey(parse_hex("ea8eb60b7e5868e218f248e032769020b4fea5dcfd02f2992861eaf4fb534854"));
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(hex(publicKey.bytes), "0271195c66ec2799e436757a70cd8431d4b17733a097b18a5f7f1b6b085978ff0f");
+    auto address = Address(publicKey);
+
+    ASSERT_EQ(address.string(), "FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
+}
+
+TEST(FIOAddress, GetPublicKey) {
+    const auto publicKeyHex = "0271195c66ec2799e436757a70cd8431d4b17733a097b18a5f7f1b6b085978ff0f";
+    const PublicKey publicKey(parse_hex(publicKeyHex), TWPublicKeyTypeSECP256k1);
+    auto address = Address(publicKey);
+    EXPECT_EQ(hex(address.publicKey().bytes), publicKeyHex);
+}
+
+} // namespace TW::FIO::tests
diff --git a/tests/FIO/EncryptionTests.cpp b/tests/chains/FIO/EncryptionTests.cpp
similarity index 97%
rename from tests/FIO/EncryptionTests.cpp
rename to tests/chains/FIO/EncryptionTests.cpp
index ac0c2ff9321..db8341d9eb4 100644
--- a/tests/FIO/EncryptionTests.cpp
+++ b/tests/chains/FIO/EncryptionTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "FIO/Encryption.h"
 #include "FIO/Address.h"
diff --git a/tests/chains/FIO/SignerTests.cpp b/tests/chains/FIO/SignerTests.cpp
new file mode 100644
index 00000000000..a3104e15afc
--- /dev/null
+++ b/tests/chains/FIO/SignerTests.cpp
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "FIO/Actor.h"
+#include "FIO/Signer.h"
+#include "FIO/TransactionBuilder.h"
+
+#include "Base58.h"
+#include "Hash.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::FIO::tests {
+
+using namespace std;
+
+TEST(FIOSigner, SignEncode) {
+    string sig1 = Signer::signatureToBase58(parse_hex("1f4fccc30bcba876963aef6de584daf7258306c02f4528fe25b116b517de8b349968bdc080cd6bef36f5a46d31a7c01ed0806ad215bb66a94f61e27a895d610983"));
+
+    EXPECT_EQ("SIG_K1_K5hJTPeiV4bDkNR13mf66N2DY5AtVL4NU1iWE4G4dsczY2q68oCcUVxhzFdxjgV2eAeb2jNV1biqtCJ3SaNL8kkNgoZ43H", sig1);
+}
+
+TEST(FIOSigner, SignInternals) {
+    // 5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf
+    PrivateKey pk = PrivateKey(parse_hex("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035"));
+    {
+        Data pk2 = parse_hex("80");
+        append(pk2, pk.bytes);
+        EXPECT_EQ("5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri", Base58::encodeCheck(pk2));
+    }
+    Data rawData = parse_hex("4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd77b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c6574000000000000000000000000000000000000000000000000000000000000000000");
+    Data hash = Hash::sha256(rawData);
+    EXPECT_EQ("6a82a57fb9bfc43918aa757d6094ba71fa2c7ece1691c4b8551a0607273771d7", hex(hash));
+    Data sign2 = Signer::signData(pk, rawData);
+    EXPECT_EQ("1f6ccee1f4cd188cc8aefa63f8fda8c90c0493ca1504806d3a26a7300a9687bb701f188337bc9a32f01ee0c2ecf030aee197b050460d72f7272cc6ce36ef14c95b", hex(sign2));
+
+    string sigStr = Signer::signatureToBase58(sign2);
+    EXPECT_EQ("SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9", sigStr);
+    EXPECT_TRUE(Signer::verify(pk.getPublicKey(TWPublicKeyTypeSECP256k1), hash, sign2));
+}
+
+TEST(FIOSigner, Actor) {
+    {
+        const auto addr1 = "FIO6cDpi7vPnvRwMEdXtLnAmFwygaQ8CzD7vqKLBJ2GfgtHBQ4PPy";
+        Address addr = Address(addr1);
+        EXPECT_EQ(addr1, addr.string());
+
+        uint64_t shortenedKey = Actor::shortenKey(addr.bytes);
+        EXPECT_EQ(1518832697283783336U, shortenedKey);
+        string name = Actor::name(shortenedKey);
+        EXPECT_EQ("2odzomo2v4pec", name);
+    }
+    const int n = 4;
+    const string addrArr[n] = {
+        "FIO6cDpi7vPnvRwMEdXtLnAmFwygaQ8CzD7vqKLBJ2GfgtHBQ4PPy",
+        "FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE",
+        "FIO7bxrQUTbQ4mqcoefhWPz1aFieN4fA9RQAiozRz7FrUChHZ7Rb8",
+        "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf",
+    };
+    const string actorArr[n] = {
+        "2odzomo2v4pe",
+        "hhq2g4qgycfb",
+        "5kmx4qbqlpld",
+        "qdfejz2a5wpl",
+    };
+    for (int i = 0; i < n; ++i) {
+        Address addr = Address(addrArr[i]);
+        EXPECT_EQ(addrArr[i], addr.string());
+
+        string actor = Actor::actor(addr);
+        EXPECT_EQ(actorArr[i], actor);
+    }
+}
+
+TEST(FIOSigner, compile) {
+        const Data chainId = parse_hex("4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd77");
+        // 5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf
+        const PrivateKey privKeyBA = PrivateKey(parse_hex("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035"));
+        const PublicKey pubKey6M = privKeyBA.getPublicKey(TWPublicKeyTypeSECP256k1);
+        const Address addr6M(pubKey6M);
+        Proto::SigningInput input;
+        input.set_expiry(1579790000);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(addr6M.string());
+
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(50000);
+        input.mutable_chain_params()->set_ref_block_prefix(4000123456);
+
+        input.mutable_action()->mutable_transfer_message()->set_amount(1000000000);
+        input.mutable_action()->mutable_transfer_message()->set_fee(250000000);
+        input.mutable_action()->mutable_transfer_message()->set_payee_public_key("FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE");
+
+        auto txBytes = TransactionBuilder::buildUnsignedTxBytes(input);
+        // create signature
+        Data sigBuf(chainId);
+        append(sigBuf, txBytes);
+        append(sigBuf, TW::Data(32)); // context_free
+        Data signature = Signer::signData(privKeyBA, sigBuf);
+    
+        Proto::SigningOutput result = Signer::compile(input, signature);
+        EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9"]})"
+        , result.json());
+        EXPECT_EQ(result.action_name(), "trnsfiopubky");
+}
+
+} // namespace TW::FIO::tests
diff --git a/tests/chains/FIO/TWCoinTypeTests.cpp b/tests/chains/FIO/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..e961f70263e
--- /dev/null
+++ b/tests/chains/FIO/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWFIOCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeFIO));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("930d1d3cf8988b39b5f64b64e9d61314a3e05a155d9e3505bdf863aab1adddf3"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeFIO, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("f5axfpgffiqz"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeFIO, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeFIO));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeFIO));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeFIO), 9);
+    ASSERT_EQ(TWBlockchainFIO, TWCoinTypeBlockchain(TWCoinTypeFIO));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeFIO));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeFIO));
+    assertStringsEqual(symbol, "FIO");
+    assertStringsEqual(txUrl, "https://explorer.fioprotocol.io/transaction/930d1d3cf8988b39b5f64b64e9d61314a3e05a155d9e3505bdf863aab1adddf3");
+    assertStringsEqual(accUrl, "https://explorer.fioprotocol.io/account/f5axfpgffiqz");
+    assertStringsEqual(id, "fio");
+    assertStringsEqual(name, "FIO");
+}
diff --git a/tests/FIO/TWFIOAccountTests.cpp b/tests/chains/FIO/TWFIOAccountTests.cpp
similarity index 83%
rename from tests/FIO/TWFIOAccountTests.cpp
rename to tests/chains/FIO/TWFIOAccountTests.cpp
index 3c4764d4801..2afa675188e 100644
--- a/tests/FIO/TWFIOAccountTests.cpp
+++ b/tests/chains/FIO/TWFIOAccountTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <TrustWalletCore/TWFIOAccount.h>
 
 #include <gtest/gtest.h>
diff --git a/tests/chains/FIO/TWFIOTests.cpp b/tests/chains/FIO/TWFIOTests.cpp
new file mode 100644
index 00000000000..1c4f35285b3
--- /dev/null
+++ b/tests/chains/FIO/TWFIOTests.cpp
@@ -0,0 +1,231 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+#include "proto/FIO.pb.h"
+#include "FIO/Address.h"
+#include "Data.h"
+#include "TestUtilities.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::FIO::TWFIOTests {
+
+using namespace std;
+
+TEST(TWFIO, Address) {
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035").get()));
+    ASSERT_NE(nullptr, privateKey.get());
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), false));
+    ASSERT_NE(nullptr, publicKey.get());
+    ASSERT_EQ(65ul, publicKey.get()->impl.bytes.size());
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeFIO));
+    auto addressString = WRAPS(TWAnyAddressDescription(address.get()));
+    assertStringsEqual(addressString, "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf");
+
+    auto address2 = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING("FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf").get(), TWCoinTypeFIO));
+    ASSERT_NE(nullptr, address2.get());
+    auto address2String = WRAPS(TWAnyAddressDescription(address2.get()));
+    assertStringsEqual(address2String, "FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf");
+
+    ASSERT_TRUE(TWAnyAddressEqual(address.get(), address2.get()));
+}
+
+const Data gChainId = parse_hex("4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd77");
+const Data gChainIdMainnet = parse_hex("21dcae42c0182200e93f954a074011f9048a7624c6fe81d3c9541a614a88bd1c");
+// 5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf
+const PrivateKey privKeyBA = PrivateKey(parse_hex("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035"));
+const PublicKey pubKey6M = privKeyBA.getPublicKey(TWPublicKeyTypeSECP256k1);
+const Address addr6M(pubKey6M);
+
+TEST(TWFIO, RegisterFioAddress) {
+    Proto::SigningInput input;
+    input.set_expiry(1579784511);
+    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
+    input.mutable_chain_params()->set_head_block_number(39881);
+    input.mutable_chain_params()->set_ref_block_prefix(4279583376);
+    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
+    input.set_tpid("rewards@wallet");
+    input.mutable_action()->mutable_register_fio_address_message()->set_fio_address("adam@fiotestnet");
+    input.mutable_action()->mutable_register_fio_address_message()->set_owner_fio_public_key(addr6M.string());
+    input.mutable_action()->mutable_register_fio_address_message()->set_fee(5000000000);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeFIO);
+    EXPECT_EQ(Common::Proto::OK, output.error());
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K19ugLriG3ApYgjJCRDsy21p9xgsjbDtqBuZrmAEix9XYzndR1kNbJ6fXCngMJMAhxUHfwHAsPnh58otXiJZkazaM1EkS5"]})", output.json());
+    EXPECT_EQ(output.action_name(), "regaddress");
+}
+
+TEST(TWFIO, AddPubAddress) {
+    Proto::SigningInput input;
+    input.set_expiry(1579729429);
+    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
+    input.mutable_chain_params()->set_head_block_number(11565);
+    input.mutable_chain_params()->set_ref_block_prefix(4281229859);
+    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
+    input.set_tpid("rewards@wallet");
+    auto action = input.mutable_action()->mutable_add_pub_address_message();
+    action->set_fio_address("adam@fiotestnet");
+    action->add_public_addresses();
+    action->add_public_addresses();
+    action->add_public_addresses();
+    action->mutable_public_addresses(0)->set_coin_symbol("BTC");
+    action->mutable_public_addresses(0)->set_address("bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v");
+    action->mutable_public_addresses(1)->set_coin_symbol("ETH");
+    action->mutable_public_addresses(1)->set_address("0xce5cB6c92Da37bbBa91Bd40D4C9D4D724A3a8F51");
+    action->mutable_public_addresses(2)->set_coin_symbol("BNB");
+    action->mutable_public_addresses(2)->set_address("bnb1ts3dg54apwlvr9hupv2n0j6e46q54znnusjk9s");
+    action->set_fee(0);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeFIO);
+    EXPECT_EQ(Common::Proto::OK, output.error());
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"15c2285e2d2d23622eff0000000001003056372503a85b0000c6eaa664523201102b2f46fca756b200000000a8ed3232c9010f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K3zimaMKU8cBhVRPw46KM2u7uQWaAKXrnoeYZ7MEbp6sVJcDQmQR2RtdavpUPwkAnYUkd8NqLun8H48tcxZBcTUgkiPGVJ"]})", output.json());
+    EXPECT_EQ(output.action_name(), "addaddress");
+}
+
+TEST(TWFIO, RemovePubAddress) {
+    auto privateKey = parse_hex("93083dc4d9e8f613a57e3a862a1fa5d665c5e90141a8428990c945d1c2b56491");
+
+    Proto::SigningInput input;
+    input.set_expiry(1713269931);
+    input.mutable_chain_params()->set_chain_id(string(gChainIdMainnet.begin(), gChainIdMainnet.end()));
+    input.mutable_chain_params()->set_head_block_number(256054093);
+    input.mutable_chain_params()->set_ref_block_prefix(2438027034);
+    input.set_private_key(string(privateKey.begin(), privateKey.end()));
+    input.set_tpid("trust@fiomembers");
+    auto action = input.mutable_action()->mutable_remove_pub_address_message();
+    action->set_fio_address("sergeitrust@wallet");
+    action->add_public_addresses();
+    action->mutable_public_addresses(0)->set_coin_symbol("BTC");
+    action->mutable_public_addresses(0)->set_address("bc1q68caps3gqt2c9qxtnkhmzf3whxenrs9cav4wlm");
+    action->set_fee(4878336459);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeFIO);
+    EXPECT_EQ(Common::Proto::OK, output.error());
+    std::cout << output.json() << std::endl;
+    // Successfully broadcasted: https://fio.bloks.io/transaction/0bb6da24a3ea9e3ee57906de1cfa8bad18709acd64bf30908713dd61c54cfaea
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"ab6c1e664d131a5751910000000001003056372503a85b0000c6eaa664a4ba01b038b9d6c13372f700000000a8ed3232681273657267656974727573744077616c6c65740103425443034254432a62633171363863617073336771743263397178746e6b686d7a6633776878656e72733963617634776c6dcb81c52201000000b038b9d6c13372f71074727573744066696f6d656d6265727300","signatures":["SIG_K1_K3cKHXCFYYB9aLFc9qk2idmWgEA4Q9192fECc3cF7MYHXkw9kZamdeHv3qbVoifG9oS8h6nVAJwJvj5YcnhHmnd3u89ND7"]})", output.json());
+    EXPECT_EQ(output.action_name(), "remaddress");
+}
+
+TEST(TWFIO, RemoveAllPubAddresses) {
+    auto privateKey = parse_hex("93083dc4d9e8f613a57e3a862a1fa5d665c5e90141a8428990c945d1c2b56491");
+
+    Proto::SigningInput input;
+    input.set_expiry(1713458993);
+    input.mutable_chain_params()->set_chain_id(string(gChainIdMainnet.begin(), gChainIdMainnet.end()));
+    input.mutable_chain_params()->set_head_block_number(256432311);
+    input.mutable_chain_params()->set_ref_block_prefix(2287536876);
+    input.set_private_key(string(privateKey.begin(), privateKey.end()));
+    input.set_tpid("trust@fiomembers");
+    auto action = input.mutable_action()->mutable_remove_all_pub_addresses_message();
+    action->set_fio_address("sergeitrust@wallet");
+    action->set_fee(0);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeFIO);
+    EXPECT_EQ(Common::Proto::OK, output.error());
+    // Successfully broadcasted: https://fio.bloks.io/transaction/f2facdebfcba1981377537424a6d7b7e7ebd8222c87ba4d25a480d1b968704b2
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"314f2166b7d8ec0a59880000000001003056372503a85b00c04dc9c468a4ba01b038b9d6c13372f700000000a8ed3232341273657267656974727573744077616c6c65740000000000000000b038b9d6c13372f71074727573744066696f6d656d6265727300","signatures":["SIG_K1_KXXtpz7NWhzCms7Dj54nSwwtCw6w4zLCyTLxs3tqqgLscrz91cMjcbN4yxcySvZ7t4MER8HPteeJZUnR16uLyDa1gFGzrx"]})", output.json());
+    EXPECT_EQ(output.action_name(), "remalladdr");
+}
+
+TEST(TWFIO, Transfer) {
+    Proto::SigningInput input;
+    input.set_expiry(1579790000);
+    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
+    input.mutable_chain_params()->set_head_block_number(50000);
+    input.mutable_chain_params()->set_ref_block_prefix(4000123456);
+    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
+    input.set_tpid("rewards@wallet");
+    input.mutable_action()->mutable_transfer_message()->set_payee_public_key("FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE");
+    input.mutable_action()->mutable_transfer_message()->set_amount(1000000000);
+    input.mutable_action()->mutable_transfer_message()->set_fee(250000000);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeFIO);
+    EXPECT_EQ(Common::Proto::OK, output.error());
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9"]})", output.json());
+    EXPECT_EQ(output.action_name(), "trnsfiopubky");
+}
+
+TEST(TWFIO, RenewFioAddress) {
+    Proto::SigningInput input;
+    input.set_expiry(1579785000);
+    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
+    input.mutable_chain_params()->set_head_block_number(39881);
+    input.mutable_chain_params()->set_ref_block_prefix(4279583376);
+    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
+    input.set_tpid("rewards@wallet");
+    input.mutable_action()->mutable_renew_fio_address_message()->set_fio_address("nick@fiotestnet");
+    input.mutable_action()->mutable_renew_fio_address_message()->set_owner_fio_public_key(addr6M.string());
+    input.mutable_action()->mutable_renew_fio_address_message()->set_fee(3000000000);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeFIO);
+    EXPECT_EQ(Common::Proto::OK, output.error());
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff0000000001003056372503a85b80b1ba2919aea6ba01102b2f46fca756b200000000a8ed32322f0f6e69636b4066696f746573746e6574005ed0b200000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_Jxz7oCJ7Z4ECsxqb2utqBcyP3zPQCeQCBws9wWQjyptUKoWVk2AyCVEqtdMHJwqtLniio5Z7npMnaZB8E4pa2G75P9uGkb"]})", output.json());
+    EXPECT_EQ(output.action_name(), "renewaddress");
+}
+
+TEST(TWFIO, NewFundsRequest) {
+    Proto::SigningInput input;
+    input.set_expiry(1579785000);
+    input.mutable_chain_params()->set_chain_id(string(gChainId.begin(), gChainId.end()));
+    input.mutable_chain_params()->set_head_block_number(39881);
+    input.mutable_chain_params()->set_ref_block_prefix(4279583376);
+    input.set_private_key(string(privKeyBA.bytes.begin(), privKeyBA.bytes.end()));
+    input.set_tpid("rewards@wallet");
+    input.mutable_action()->mutable_new_funds_request_message()->set_payer_fio_name("mario@fiotestnet");
+    input.mutable_action()->mutable_new_funds_request_message()->set_payer_fio_address("FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o");
+    input.mutable_action()->mutable_new_funds_request_message()->set_payee_fio_name("alice@fiotestnet");
+    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_payee_public_address("bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v");
+    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_amount("5");
+    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_coin_symbol("BTC");
+    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_memo("Memo");
+    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_hash("Hash");
+    input.mutable_action()->mutable_new_funds_request_message()->mutable_content()->set_offline_url("https://trustwallet.com");
+    input.mutable_action()->mutable_new_funds_request_message()->set_fee(3000000000);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeFIO);
+    // Packed transaction varies, as there is no way to control encryption IV parameter from this level.
+    // Therefore full equality cannot be checked, tail is cut off.  The first N chars are checked, works in this case.
+    EXPECT_EQ(
+        R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff000000000100403ed4aa0ba85b00acba384dbdb89a01102b2f46fca756b200000000a8ed32328802106d6172696f4066696f746573746)",
+        output.json().substr(0, 195));
+    EXPECT_EQ(output.action_name(), "newfundsreq");
+}
+
+TEST(TWFIO, AddBundledTransactions) {
+    auto privateKey = parse_hex("93083dc4d9e8f613a57e3a862a1fa5d665c5e90141a8428990c945d1c2b56491");
+
+    Proto::SigningInput input;
+    input.set_expiry(1713458594);
+    input.mutable_chain_params()->set_chain_id(string(gChainIdMainnet.begin(), gChainIdMainnet.end()));
+    input.mutable_chain_params()->set_head_block_number(256431437);
+    input.mutable_chain_params()->set_ref_block_prefix(791306279);
+    input.set_private_key(string(privateKey.begin(), privateKey.end()));
+    input.set_tpid("trust@fiomembers");
+    auto action = input.mutable_action()->mutable_add_bundled_transactions_message();
+    action->set_fio_address("sergeitrust@wallet");
+    action->set_bundle_sets(1);
+    action->set_fee(100000000000);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeFIO);
+    EXPECT_EQ(Common::Proto::OK, output.error());
+    // Successfully broadcasted: https://fio.bloks.io/transaction/2c00f2051ca3738c4fe03ceddb82c48fefd9c534d8bb793dc7dce5d12f4f4f9c
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"a24d21664dd527602a2f0000000001003056372503a85b000056314d7d523201b038b9d6c13372f700000000a8ed32323c1273657267656974727573744077616c6c6574010000000000000000e87648170000001074727573744066696f6d656d62657273b038b9d6c13372f700","signatures":["SIG_K1_KjWGZ4Yd48VJcTAgox3HYVQhXeLhpRCgz2WqiF5WHRFSnbHouKxPgLQmymoABHC8EX51G1jU4ocWg2RKU17UYm4L5kTXP6"]})", output.json());
+    EXPECT_EQ(output.action_name(), "addbundles");
+}
+
+} // namespace TW::FIO::TWFIOTests
diff --git a/tests/chains/FIO/TransactionBuilderTests.cpp b/tests/chains/FIO/TransactionBuilderTests.cpp
new file mode 100644
index 00000000000..16f16f92b06
--- /dev/null
+++ b/tests/chains/FIO/TransactionBuilderTests.cpp
@@ -0,0 +1,563 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "FIO/Action.h"
+#include "FIO/NewFundsRequest.h"
+#include "FIO/Signer.h"
+#include "FIO/Transaction.h"
+#include "FIO/TransactionBuilder.h"
+
+#include "BinaryCoding.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+#include <nlohmann/json.hpp>
+
+namespace TW::FIO::TransactionBuilderTests {
+using namespace std;
+
+const Data chainId = parse_hex("4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd77");
+// 5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf
+const PrivateKey gPrivKeyBA = PrivateKey(parse_hex("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035"));
+const PublicKey gPubKey6MA = gPrivKeyBA.getPublicKey(TWPublicKeyTypeSECP256k1);
+const Address gAddr6M(gPubKey6MA);
+
+TEST(FIOTransactionBuilder, RegisterFioAddressGeneric) {
+    Proto::SigningInput input;
+    input.set_expiry(1579784511);
+    input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+    input.mutable_chain_params()->set_head_block_number(39881);
+    input.mutable_chain_params()->set_ref_block_prefix(4279583376);
+    input.set_private_key(string(gPrivKeyBA.bytes.begin(), gPrivKeyBA.bytes.end()));
+    input.set_tpid("rewards@wallet");
+    input.mutable_action()->mutable_register_fio_address_message()->set_fio_address("adam@fiotestnet");
+    input.mutable_action()->mutable_register_fio_address_message()->set_owner_fio_public_key(gAddr6M.string());
+    input.mutable_action()->mutable_register_fio_address_message()->set_fee(5000000000);
+
+    auto json = TransactionBuilder::sign(input);
+
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K19ugLriG3ApYgjJCRDsy21p9xgsjbDtqBuZrmAEix9XYzndR1kNbJ6fXCngMJMAhxUHfwHAsPnh58otXiJZkazaM1EkS5"]})", json);
+}
+
+TEST(FIOTransactionBuilder, RegisterFioAddress) {
+    ChainParams chainParams{chainId, 39881, 4279583376};
+    uint64_t fee = 5000000000;
+
+    string t = TransactionBuilder::createRegisterFioAddress(gAddr6M, gPrivKeyBA, "adam@fiotestnet",
+                                                            chainParams, fee, "rewards@wallet", 1579784511);
+
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K19ugLriG3ApYgjJCRDsy21p9xgsjbDtqBuZrmAEix9XYzndR1kNbJ6fXCngMJMAhxUHfwHAsPnh58otXiJZkazaM1EkS5"]})", t);
+}
+
+TEST(FIOTransactionBuilder, AddPubAddress) {
+    ChainParams chainParams{chainId, 11565, 4281229859};
+
+    string t = TransactionBuilder::createAddPubAddress(gAddr6M, gPrivKeyBA, "adam@fiotestnet", {{"BTC", "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v"}, {"ETH", "0xce5cB6c92Da37bbBa91Bd40D4C9D4D724A3a8F51"}, {"BNB", "bnb1ts3dg54apwlvr9hupv2n0j6e46q54znnusjk9s"}},
+                                                       chainParams, 0, "rewards@wallet", 1579729429);
+
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"15c2285e2d2d23622eff0000000001003056372503a85b0000c6eaa664523201102b2f46fca756b200000000a8ed3232c9010f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K3zimaMKU8cBhVRPw46KM2u7uQWaAKXrnoeYZ7MEbp6sVJcDQmQR2RtdavpUPwkAnYUkd8NqLun8H48tcxZBcTUgkiPGVJ"]})", t);
+}
+
+TEST(FIOTransactionBuilder, Transfer) {
+    ChainParams chainParams{chainId, 50000, 4000123456};
+    string payee = "FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE";
+    uint64_t amount = 1000000000;
+    uint64_t fee = 250000000;
+
+    string t = TransactionBuilder::createTransfer(gAddr6M, gPrivKeyBA, payee, amount,
+                                                  chainParams, fee, "rewards@wallet", 1579790000);
+
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9"]})", t);
+}
+
+TEST(FIOTransactionBuilder, RenewFioAddress) {
+    ChainParams chainParams{chainId, 39881, 4279583376};
+    uint64_t fee = 3000000000;
+
+    string t = TransactionBuilder::createRenewFioAddress(gAddr6M, gPrivKeyBA, "nick@fiotestnet",
+                                                         chainParams, fee, "rewards@wallet", 1579785000);
+
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff0000000001003056372503a85b80b1ba2919aea6ba01102b2f46fca756b200000000a8ed32322f0f6e69636b4066696f746573746e6574005ed0b200000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_Jxz7oCJ7Z4ECsxqb2utqBcyP3zPQCeQCBws9wWQjyptUKoWVk2AyCVEqtdMHJwqtLniio5Z7npMnaZB8E4pa2G75P9uGkb"]})", t);
+}
+
+TEST(FIOTransactionBuilder, NewFundsRequest) {
+    {
+        ChainParams chainParams{chainId, 18484, 3712870657};
+        const Data iv = parse_hex("000102030405060708090a0b0c0d0e0f"); // use fixed iv for testability
+        string t = TransactionBuilder::createNewFundsRequest(
+            Address("FIO5NMm9Vf3NjYFnhoc7yxTCrLW963KPUCzeMGv3SJ6zR3GMez4ub"), gPrivKeyBA,
+            "tag@fiotestnet", "FIO7iYHtDhs45smFgSqLyJ6Zi4D3YG8K5bZGyxmshLCDXXBPbbmJN", "dapixbp@fiotestnet", "14R4wEsGT58chmqo7nB65Dy4je6TiijDWc",
+            "1", "BTC", "payment", "", "",
+            chainParams, 800000000, "", 1583528215, iv);
+        EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"17b9625e344801e94ddd000000000100403ed4aa0ba85b00acba384dbdb89a01702096fedf5bf9f900000000a8ed3232d2010e7461674066696f746573746e657412646170697862704066696f746573746e6574980141414543417751464267634943516f4c4441304f447a684533513779504a4738592f52486a69545576436163734a444a516243612f41643763354e36354f56366d3441566974596379654e7a4749306d4c366b5a71567348737837537845623471724d346435567258364939746a6842447067566b3078596575325861676759516b323168684972306c76412b7535546977545661673d3d0008af2f000000000c7a62777072727a796d736b620000","signatures":["SIG_K1_K95jnXSBCf1BnQXQPZzxKYPGxugwpbeVp2NSjN1kmYd9SQibvnSfh2ggmSVXii4Jvq3dtRHFA8s7n3kcQdLhY4KMrkgDgp"]})", t);
+    }
+
+    ChainParams chainParams{chainId, 39881, 4279583376};
+    uint64_t fee = 3000000000;
+
+    const Data iv = parse_hex("000102030405060708090a0b0c0d0e0f"); // use fixed iv for testability
+    string t = TransactionBuilder::createNewFundsRequest(gAddr6M, gPrivKeyBA,
+                                                         "mario@fiotestnet", "FIO5kJKNHwctcfUM5XZyiWSqSTM5HTzznJP9F3ZdbhaQAHEVq575o", "alice@fiotestnet", "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v",
+                                                         "5", "BTC", "Memo", "Hash", "https://trustwallet.com",
+                                                         chainParams, fee, "rewards@wallet", 1579785000, iv);
+
+    EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff000000000100403ed4aa0ba85b00acba384dbdb89a01102b2f46fca756b200000000a8ed32328802106d6172696f4066696f746573746e657410616c6963654066696f746573746e6574c00141414543417751464267634943516f4c4441304f442f3575342f6b436b7042554c4a44682f546951334d31534f4e4938426668496c4e54766d39354249586d54396f616f7a55632f6c6c3942726e57426563464e767a76766f6d3751577a517250717241645035683433305732716b52355266416555446a704f514732364c347a6936767241553052764855474e382b685779736a6971506b2b7a455a444952534678426268796c69686d59334f4752342f5a46466358484967343241327834005ed0b2000000000c716466656a7a32613577706c0e726577617264734077616c6c657400","signatures":["SIG_K1_Kk79iVcQMpqpVgZwGTmC1rxgCTLy5BDFtHd8FvjRNm2FqNHR9dpeUmPTNqBKGMNG3BsPy4c5u26TuEDpS87SnyMpF43cZk"]})", t);
+}
+
+TEST(FIOTransaction, ActionRegisterFioAddressInternal) {
+    RegisterFioAddressData radata("adam@fiotestnet", gAddr6M.string(),
+                                  5000000000, "rewards@wallet", "qdfejz2a5wpl");
+    Data ser1;
+    radata.serialize(ser1);
+    EXPECT_EQ(
+        hex(parse_hex("0F6164616D4066696F746573746E65743546494F366D31664D645470526B52426E6564765973685843784C4669433573755255384B44667838787874587032686E7478706E6600F2052A01000000102B2F46FCA756B20E726577617264734077616C6C6574")),
+        hex(ser1));
+
+    Action raAction;
+    raAction.account = "fio.address";
+    raAction.name = "regaddress";
+    raAction.actionDataSer = ser1;
+    raAction.auth.authArray.push_back(Authorization{"qdfejz2a5wpl", "active"});
+    Data ser2;
+    raAction.serialize(ser2);
+    EXPECT_EQ(
+        "003056372503a85b0000c6eaa66498ba0"
+        "1102b2f46fca756b200000000a8ed3232"
+        "65"
+        "0f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400",
+        hex(ser2));
+
+    Transaction tx;
+    tx.expiration = 1579784511;
+    tx.refBlockNumber = 39881;
+    tx.refBlockPrefix = 4279583376;
+    tx.actions.push_back(raAction);
+    Data ser3;
+    tx.serialize(ser3);
+    EXPECT_EQ(
+        "3f99295ec99b904215ff0000000001"
+        "003056372503a85b0000c6eaa66498ba0"
+        "1102b2f46fca756b200000000a8ed3232"
+        "65"
+        "0f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400",
+        hex(ser3));
+}
+
+TEST(FIOTransaction, ActionAddPubAddressInternal) {
+    PubAddressActionData aadata("adam@fiotestnet", {{"BTC", "BTC", "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v"}, {"ETH", "ETH", "0xce5cB6c92Da37bbBa91Bd40D4C9D4D724A3a8F51"}, {"BNB", "BNB", "bnb1ts3dg54apwlvr9hupv2n0j6e46q54znnusjk9s"}},
+                             0, "rewards@wallet", "qdfejz2a5wpl");
+    Data ser1;
+    aadata.serialize(ser1);
+    EXPECT_EQ(
+        "0f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c6574",
+        hex(ser1));
+
+    Action aaAction;
+    aaAction.account = "fio.address";
+    aaAction.name = "addaddress";
+    aaAction.actionDataSer = ser1;
+    aaAction.auth.authArray.push_back(Authorization{"qdfejz2a5wpl", "active"});
+    Data ser2;
+    aaAction.serialize(ser2);
+    EXPECT_EQ(
+        "003056372503a85b0000c6eaa66452320"
+        "1102b2f46fca756b200000000a8ed3232"
+        "c901"
+        "0f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400",
+        hex(ser2));
+
+    Transaction tx;
+    tx.expiration = 1579729429;
+    tx.refBlockNumber = 11565;
+    tx.refBlockPrefix = 4281229859;
+    tx.actions.push_back(aaAction);
+    Data ser3;
+    tx.serialize(ser3);
+    EXPECT_EQ(
+        "15c2285e2d2d23622eff0000000001"
+        "003056372503a85b0000c6eaa66452320"
+        "1102b2f46fca756b200000000a8ed3232"
+        "c901"
+        "0f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400",
+        hex(ser3));
+}
+
+TEST(FIONewFundsContent, serialize) {
+    {
+        NewFundsContent newFunds{"bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v", "10", "BTC", "BTC", "Memo", "Hash", "https://trustwallet.com"};
+        Data ser;
+        newFunds.serialize(ser);
+        EXPECT_EQ(hex(ser), "2a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c78777037306437760231300342544303425443044d656d6f04486173681768747470733a2f2f747275737477616c6c65742e636f6d0000000000");
+    }
+    {
+        // empty struct
+        NewFundsContent newFunds{"", "", "", "", "", "", ""};
+        Data ser;
+        newFunds.serialize(ser);
+        EXPECT_EQ(hex(ser), "000000000000000000000000");
+    }
+    {
+        // test from https://github.com/fioprotocol/fiojs/blob/master/src/tests/encryption-fio.test.ts
+        NewFundsContent newFunds{"purse.alice", "1", "", "fio.reqobt", "", "", ""};
+        Data ser;
+        newFunds.serialize(ser);
+        EXPECT_EQ(hex(ser), "0b70757273652e616c6963650131000a66696f2e7265716f62740000000000000000");
+    }
+}
+
+TEST(FIONewFundsContent, deserialize) {
+    {
+        const Data ser = parse_hex("2a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c78777037306437760231300342544303425443044d656d6f04486173681768747470733a2f2f747275737477616c6c65742e636f6d0000000000");
+        size_t index = 0;
+        const auto newFunds = NewFundsContent::deserialize(ser, index);
+        EXPECT_EQ(newFunds.payeePublicAddress, "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v");
+        EXPECT_EQ(newFunds.amount, "10");
+        EXPECT_EQ(newFunds.coinSymbol, "BTC");
+        EXPECT_EQ(newFunds.offlineUrl, "https://trustwallet.com");
+    }
+    {
+        // incomplete input
+        const Data ser = parse_hex("0b6d");
+        size_t index = 0;
+        const auto newFunds = NewFundsContent::deserialize(ser, index);
+        EXPECT_EQ(newFunds.payeePublicAddress, "");
+        EXPECT_EQ(newFunds.amount, "");
+        EXPECT_EQ(newFunds.offlineUrl, "");
+    }
+}
+
+TEST(FIOTransactionBuilder, expirySetDefault) {
+    uint32_t expiry = 1579790000;
+    EXPECT_EQ(TransactionBuilder::expirySetDefaultIfNeeded(expiry), false);
+    EXPECT_EQ(expiry, 1579790000ul);
+    expiry = 0;
+    EXPECT_EQ(expiry, 0ul);
+    EXPECT_EQ(TransactionBuilder::expirySetDefaultIfNeeded(expiry), true);
+    EXPECT_TRUE(expiry > 1579790000);
+}
+
+// May throw nlohmann::json::type_error
+void createTxWithChainParam(const ChainParams& paramIn, ChainParams& paramOut) {
+    string tx = TransactionBuilder::createAddPubAddress(gAddr6M, gPrivKeyBA, "adam@fiotestnet", {{"BTC", "bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v"}},
+                                                        paramIn, 0, "rewards@wallet", 1579729429);
+    // retrieve chain params from encoded tx; parse out packed tx
+    try {
+        nlohmann::json txJson = nlohmann::json::parse(tx);
+        Data txData = parse_hex(txJson.at("packed_trx").get<std::string>());
+        // decode values
+        ASSERT_TRUE(txData.size() >= 10);
+        paramOut.headBlockNumber = decode16LE(txData.data() + 4);
+        paramOut.refBlockPrefix = decode32LE(txData.data() + 4 + 2);
+    } catch (nlohmann::json::type_error& e) {
+        FAIL() << "Json parse error " << e.what();
+    }
+}
+
+void checkBlockNum(uint64_t blockNumIn, uint64_t blockNumExpected) {
+    ChainParams paramOut;
+    createTxWithChainParam(ChainParams{chainId, blockNumIn, 4281229859}, paramOut);
+    EXPECT_EQ(paramOut.headBlockNumber, blockNumExpected);
+}
+
+void checkRefBlockPrefix(uint64_t blockPrefixIn, uint64_t blockPrefixExpected) {
+    ChainParams paramOut;
+    createTxWithChainParam(ChainParams{chainId, 11565, blockPrefixIn}, paramOut);
+    EXPECT_EQ(paramOut.refBlockPrefix, blockPrefixExpected);
+}
+
+TEST(FIOTransactionBuilder, chainParansRange) {
+    // headBlockNumber, 2 bytes
+    checkBlockNum(101, 101);
+    checkBlockNum(0xFFFF, 0xFFFF);
+    checkBlockNum(0x00011234, 0x1234);
+    // large values truncated
+    checkBlockNum(0xFFAB1234, 0x1234);
+    checkBlockNum(0x0000000112345678, 0x5678);
+    checkBlockNum(0xFFABCDEF12345678, 0x5678);
+
+    // refBlockPrefix, 4 bytes; Large refBlockPrefix values used to cause problem
+    checkRefBlockPrefix(101, 101);
+    checkRefBlockPrefix(4281229859, 4281229859);
+    checkRefBlockPrefix(0xFFFFFFFF, 0xFFFFFFFF);
+    // large values truncated
+    checkRefBlockPrefix(0x0000000112345678, 0x12345678);
+    checkRefBlockPrefix(0xFFABCDEF12345678, 0x12345678);
+}
+
+TEST(FIOTransactionBuilder, encodeVarInt) {
+    {
+        Data data;
+        EXPECT_EQ(TW::FIO::encodeVarInt(0x11, data), 1);
+        EXPECT_EQ(hex(data), "11");
+    }
+    {
+        Data data;
+        EXPECT_EQ(TW::FIO::encodeVarInt(0x7F, data), 1);
+        EXPECT_EQ(hex(data), "7f");
+    }
+    {
+        Data data;
+        EXPECT_EQ(TW::FIO::encodeVarInt(0x80, data), 2);
+        EXPECT_EQ(hex(data), "8001");
+    }
+    {
+        Data data;
+        EXPECT_EQ(TW::FIO::encodeVarInt(0xFF, data), 2);
+        EXPECT_EQ(hex(data), "ff01");
+    }
+    {
+        Data data;
+        EXPECT_EQ(TW::FIO::encodeVarInt(0x100, data), 2);
+        EXPECT_EQ(hex(data), "8002");
+    }
+    {
+        Data data;
+        EXPECT_EQ(TW::FIO::encodeVarInt(0x3FFF, data), 2);
+        EXPECT_EQ(hex(data), "ff7f");
+    }
+    {
+        Data data;
+        EXPECT_EQ(TW::FIO::encodeVarInt(0x4000, data), 3);
+        EXPECT_EQ(hex(data), "808001");
+    }
+    {
+        Data data;
+        EXPECT_EQ(TW::FIO::encodeVarInt(0xFFFFFFFF, data), 5);
+        EXPECT_EQ(hex(data), "ffffffff0f");
+    }
+}
+
+TEST(FIOTransactionBuilder, encodeString) {
+    {
+        Data data;
+        const string text = "ABC";
+        TW::FIO::encodeString(text, data);
+        EXPECT_EQ(hex(data), "03" + hex(text));
+    }
+    {
+        Data data;
+        const string text = "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789";
+        EXPECT_EQ(text.length(), 130ul);
+        TW::FIO::encodeString(text, data);
+        // length on 2 bytes
+        EXPECT_EQ(hex(data), "8201" + hex(text));
+    }
+}
+
+TEST(FIOTransactionBuilder, buildUnsignedTxBytes) {
+    {
+        // Test register_fio_address_message
+        Proto::SigningInput input;
+        
+        input.set_expiry(1579784511);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(gAddr6M.string());
+
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(39881);
+        input.mutable_chain_params()->set_ref_block_prefix(4279583376);
+        
+        input.mutable_action()->mutable_register_fio_address_message()->set_fio_address("adam@fiotestnet");
+        input.mutable_action()->mutable_register_fio_address_message()->set_owner_fio_public_key(gAddr6M.string());
+        input.mutable_action()->mutable_register_fio_address_message()->set_fee(5000000000);
+
+        auto result = TransactionBuilder::buildUnsignedTxBytes(input);
+        //packed_trx: 3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400
+        EXPECT_EQ("3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400"
+        , hex(result));
+    }
+    {
+        // Test add_pub_address_message
+        Proto::SigningInput input;
+        
+        input.set_expiry(1579729429);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(gAddr6M.string());
+        
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(11565);
+        input.mutable_chain_params()->set_ref_block_prefix(4281229859);
+        
+        input.mutable_action()->mutable_add_pub_address_message()->set_fee(0);
+        input.mutable_action()->mutable_add_pub_address_message()->set_fio_address("adam@fiotestnet");
+
+        TW::FIO::Proto::PublicAddress *value;
+        value = input.mutable_action()->mutable_add_pub_address_message()->add_public_addresses();
+        value->set_address("bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v");
+        value->set_coin_symbol("BTC");
+        TW::FIO::Proto::PublicAddress *value1;
+        value1 = input.mutable_action()->mutable_add_pub_address_message()->add_public_addresses();
+        value1->set_address("0xce5cB6c92Da37bbBa91Bd40D4C9D4D724A3a8F51");
+        value1->set_coin_symbol("ETH");
+        TW::FIO::Proto::PublicAddress *value2;
+        value2 = input.mutable_action()->mutable_add_pub_address_message()->add_public_addresses();
+        value2->set_address("bnb1ts3dg54apwlvr9hupv2n0j6e46q54znnusjk9s");
+        value2->set_coin_symbol("BNB");
+
+        auto result = TransactionBuilder::buildUnsignedTxBytes(input);
+        
+        EXPECT_EQ("15c2285e2d2d23622eff0000000001003056372503a85b0000c6eaa664523201102b2f46fca756b200000000a8ed3232c9010f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400"
+        , hex(result));
+    }
+
+    {
+        // Test transfer_message
+        Proto::SigningInput input;
+        input.set_expiry(1579790000);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(gAddr6M.string());
+
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(50000);
+        input.mutable_chain_params()->set_ref_block_prefix(4000123456);
+
+        input.mutable_action()->mutable_transfer_message()->set_amount(1000000000);
+        input.mutable_action()->mutable_transfer_message()->set_fee(250000000);
+        input.mutable_action()->mutable_transfer_message()->set_payee_public_key("FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE");
+        
+        auto result = TransactionBuilder::buildUnsignedTxBytes(input);
+        EXPECT_EQ("b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c657400"
+        , hex(result));
+    }
+
+    {
+        // Test renew_fio_address_message
+        Proto::SigningInput input;
+        input.set_expiry(1579785000);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(gAddr6M.string());
+
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(39881);
+        input.mutable_chain_params()->set_ref_block_prefix(4279583376);
+
+        input.mutable_action()->mutable_renew_fio_address_message()->set_fee(3000000000);
+        input.mutable_action()->mutable_renew_fio_address_message()->set_fio_address("nick@fiotestnet");
+        
+        auto result = TransactionBuilder::buildUnsignedTxBytes(input);
+        EXPECT_EQ("289b295ec99b904215ff0000000001003056372503a85b80b1ba2919aea6ba01102b2f46fca756b200000000a8ed32322f0f6e69636b4066696f746573746e6574005ed0b200000000102b2f46fca756b20e726577617264734077616c6c657400"
+        , hex(result));
+    }
+
+}
+
+TEST(FIOTransactionBuilder, buildSigningOutput) {
+    {
+        // Test register_fio_address_message
+        Proto::SigningInput input;
+        
+        input.set_expiry(1579784511);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(gAddr6M.string());
+
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(39881);
+        input.mutable_chain_params()->set_ref_block_prefix(4279583376);
+        
+        input.mutable_action()->mutable_register_fio_address_message()->set_fio_address("adam@fiotestnet");
+        input.mutable_action()->mutable_register_fio_address_message()->set_owner_fio_public_key(gAddr6M.string());
+        input.mutable_action()->mutable_register_fio_address_message()->set_fee(5000000000);
+
+        Data txBytes = TransactionBuilder::buildUnsignedTxBytes(input);
+        Data sigBuf = TransactionBuilder::buildPreSignTxData(chainId, txBytes);
+        // create signature
+        Data signature = Signer::signData(gPrivKeyBA, sigBuf);
+        
+        Proto::SigningOutput result = TransactionBuilder::buildSigningOutput(input, signature);
+
+        EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"3f99295ec99b904215ff0000000001003056372503a85b0000c6eaa66498ba01102b2f46fca756b200000000a8ed3232650f6164616d4066696f746573746e65743546494f366d31664d645470526b52426e6564765973685843784c4669433573755255384b44667838787874587032686e7478706e6600f2052a01000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K19ugLriG3ApYgjJCRDsy21p9xgsjbDtqBuZrmAEix9XYzndR1kNbJ6fXCngMJMAhxUHfwHAsPnh58otXiJZkazaM1EkS5"]})"
+        , result.json());
+        EXPECT_EQ(result.action_name(), "regaddress");
+
+    }   
+    {
+        // Test add_pub_address_message
+        Proto::SigningInput input;
+        
+        input.set_expiry(1579729429);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(gAddr6M.string());
+        
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(11565);
+        input.mutable_chain_params()->set_ref_block_prefix(4281229859);
+        
+        input.mutable_action()->mutable_add_pub_address_message()->set_fee(0);
+        input.mutable_action()->mutable_add_pub_address_message()->set_fio_address("adam@fiotestnet");
+
+        TW::FIO::Proto::PublicAddress *value;
+        value = input.mutable_action()->mutable_add_pub_address_message()->add_public_addresses();
+        value->set_address("bc1qvy4074rggkdr2pzw5vpnn62eg0smzlxwp70d7v");
+        value->set_coin_symbol("BTC");
+        TW::FIO::Proto::PublicAddress *value1;
+        value1 = input.mutable_action()->mutable_add_pub_address_message()->add_public_addresses();
+        value1->set_address("0xce5cB6c92Da37bbBa91Bd40D4C9D4D724A3a8F51");
+        value1->set_coin_symbol("ETH");
+        TW::FIO::Proto::PublicAddress *value2;
+        value2 = input.mutable_action()->mutable_add_pub_address_message()->add_public_addresses();
+        value2->set_address("bnb1ts3dg54apwlvr9hupv2n0j6e46q54znnusjk9s");
+        value2->set_coin_symbol("BNB");
+
+        Data txBytes = TransactionBuilder::buildUnsignedTxBytes(input);
+        Data sigBuf = TransactionBuilder::buildPreSignTxData(chainId, txBytes);
+        // create signature
+        Data signature = Signer::signData(gPrivKeyBA, sigBuf);
+    
+        Proto::SigningOutput result = TransactionBuilder::buildSigningOutput(input, signature);
+        EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"15c2285e2d2d23622eff0000000001003056372503a85b0000c6eaa664523201102b2f46fca756b200000000a8ed3232c9010f6164616d4066696f746573746e65740303425443034254432a626331717679343037347267676b647232707a773576706e6e3632656730736d7a6c787770373064377603455448034554482a30786365356342366339324461333762624261393142643430443443394434443732344133613846353103424e4203424e422a626e6231747333646735346170776c76723968757076326e306a366534367135347a6e6e75736a6b39730000000000000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K3zimaMKU8cBhVRPw46KM2u7uQWaAKXrnoeYZ7MEbp6sVJcDQmQR2RtdavpUPwkAnYUkd8NqLun8H48tcxZBcTUgkiPGVJ"]})"
+        , result.json());
+        EXPECT_EQ(result.action_name(), "addaddress");
+    }
+    {
+        // Test transfer_message
+        Proto::SigningInput input;
+        input.set_expiry(1579790000);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(gAddr6M.string());
+
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(50000);
+        input.mutable_chain_params()->set_ref_block_prefix(4000123456);
+
+        input.mutable_action()->mutable_transfer_message()->set_amount(1000000000);
+        input.mutable_action()->mutable_transfer_message()->set_fee(250000000);
+        input.mutable_action()->mutable_transfer_message()->set_payee_public_key("FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE");
+
+        Data txBytes = TransactionBuilder::buildUnsignedTxBytes(input);
+        Data sigBuf = TransactionBuilder::buildPreSignTxData(chainId, txBytes);
+        // create signature
+        Data signature = Signer::signData(gPrivKeyBA, sigBuf);
+    
+        Proto::SigningOutput result = TransactionBuilder::buildSigningOutput(input, signature);
+        EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9"]})"
+        , result.json());
+        EXPECT_EQ(result.action_name(), "trnsfiopubky");
+    }
+    {   
+        // Test renew_fio_address_message
+        Proto::SigningInput input;
+        input.set_expiry(1579785000);
+        input.set_tpid("rewards@wallet");
+        input.set_owner_public_key(gAddr6M.string());
+
+        input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+        input.mutable_chain_params()->set_head_block_number(39881);
+        input.mutable_chain_params()->set_ref_block_prefix(4279583376);
+
+        input.mutable_action()->mutable_renew_fio_address_message()->set_fee(3000000000);
+        input.mutable_action()->mutable_renew_fio_address_message()->set_fio_address("nick@fiotestnet");
+    
+        Data txBytes = TransactionBuilder::buildUnsignedTxBytes(input);
+        Data sigBuf = TransactionBuilder::buildPreSignTxData(chainId, txBytes);
+        // create signature
+        Data signature = Signer::signData(gPrivKeyBA, sigBuf);
+    
+        Proto::SigningOutput result = TransactionBuilder::buildSigningOutput(input, signature);
+        EXPECT_EQ(R"({"compression":"none","packed_context_free_data":"","packed_trx":"289b295ec99b904215ff0000000001003056372503a85b80b1ba2919aea6ba01102b2f46fca756b200000000a8ed32322f0f6e69636b4066696f746573746e6574005ed0b200000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_Jxz7oCJ7Z4ECsxqb2utqBcyP3zPQCeQCBws9wWQjyptUKoWVk2AyCVEqtdMHJwqtLniio5Z7npMnaZB8E4pa2G75P9uGkb"]})"
+        , result.json());
+        EXPECT_EQ(result.action_name(), "renewaddress");
+    }
+}
+
+} // namespace TW::FIO::TransactionBuilderTests
diff --git a/tests/chains/FIO/TransactionCompilerTests.cpp b/tests/chains/FIO/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..f3eaecbc159
--- /dev/null
+++ b/tests/chains/FIO/TransactionCompilerTests.cpp
@@ -0,0 +1,133 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "uint256.h"
+
+#include "FIO/Address.h"
+#include "FIO/Action.h"
+#include "FIO/NewFundsRequest.h"
+#include "FIO/Transaction.h"
+#include "FIO/TransactionBuilder.h"
+#include "FIO/Signer.h"
+
+#include "proto/FIO.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+using namespace TW::FIO;
+using namespace std;
+
+TEST(FIOCompiler, CompileWithSignatures) {
+    Data chainId = parse_hex("4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd77");
+    // 5KEDWtAUJcFX6Vz38WXsAQAv2geNqT7UaZC8gYu9kTuryr3qkri FIO6m1fMdTpRkRBnedvYshXCxLFiC5suRU8KDfx8xxtXp2hntxpnf
+    PrivateKey privateKey = PrivateKey(parse_hex("ba0828d5734b65e3bcc2c51c93dfc26dd71bd666cc0273adee77d73d9a322035"));
+    PublicKey pubKeyA = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    Address addrA(pubKeyA);
+    const auto coin = TWCoinTypeFIO;
+
+    /// Step 1: Prepare transaction input (protobuf)    
+    Proto::SigningInput input;
+    input.set_expiry(1579790000);
+    input.set_tpid("rewards@wallet");
+    input.set_owner_public_key(addrA.string());
+
+    input.mutable_chain_params()->set_chain_id(string(chainId.begin(), chainId.end()));
+    input.mutable_chain_params()->set_head_block_number(50000);
+    input.mutable_chain_params()->set_ref_block_prefix(4000123456);
+
+    input.mutable_action()->mutable_transfer_message()->set_amount(1000000000);
+    input.mutable_action()->mutable_transfer_message()->set_fee(250000000);
+    input.mutable_action()->mutable_transfer_message()->set_payee_public_key("FIO7uMZoeei5HtXAD24C4yCkpWWbf24bjYtrRNjWdmGCXHZccwuiE");
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = data(preSigningOutput.data());
+    auto preImageHash = data(preSigningOutput.data_hash());
+
+    std::string expectedPreImage = "4e46572250454b796d7296eec9e8896327ea82dd40f2cd74cf1b1d8ba90bcd77b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c6574000000000000000000000000000000000000000000000000000000000000000000";
+    std::string expectedPreImageHash = "6a82a57fb9bfc43918aa757d6094ba71fa2c7ece1691c4b8551a0607273771d7";
+    ASSERT_EQ(hex(preImage), expectedPreImage);
+    ASSERT_EQ(hex(preImageHash), expectedPreImageHash);
+
+    // create signature
+    Data signature = Signer::signData(privateKey, preImage);
+    EXPECT_EQ("1f6ccee1f4cd188cc8aefa63f8fda8c90c0493ca1504806d3a26a7300a9687bb701f188337bc9a32f01ee0c2ecf030aee197b050460d72f7272cc6ce36ef14c95b", hex(signature));
+    std::string sigStr = Signer::signatureToBase58(signature);
+    EXPECT_EQ("SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9", sigStr);
+    
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(Signer::verify(pubKeyA, preImageHash, signature));
+
+    const auto ExpectedTx = R"({"compression":"none","packed_context_free_data":"","packed_trx":"b0ae295e50c3400a6dee00000000010000980ad20ca85be0e1d195ba85e7cd01102b2f46fca756b200000000a8ed32325d3546494f37754d5a6f6565693548745841443234433479436b70575762663234626a597472524e6a57646d474358485a63637775694500ca9a3b0000000080b2e60e00000000102b2f46fca756b20e726577617264734077616c6c657400","signatures":["SIG_K1_K9VRCnvaTYN7vgcoVKVXgyJTdKUGV8hLXgFLoEbvqAcFxy7DXQ1rSnAfEuabi4ATkgmvnpaSBdVFN7TBtM1wrbZYqeJQw9"]})";
+    /// Step 3: Compile transaction info
+    {
+        const Data outputData = TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {pubKeyA.bytes});
+
+        TW::FIO::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(ExpectedTx, output.json());
+        EXPECT_EQ(output.action_name(), "trnsfiopubky");
+    }
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::FIO::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+        TW::FIO::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.json(), ExpectedTx);
+    }
+    { // Negative: not enough signatures
+        const Data outputData =
+            TransactionCompiler::compileWithSignatures(coin, inputStrData, {}, {pubKeyA.bytes});
+
+        TW::FIO::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.json().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+        EXPECT_EQ(output.error_message(), "empty signatures or publickeys");
+    }
+
+    { // Negative: not enough publicKey
+        const Data outputData =
+            TransactionCompiler::compileWithSignatures(coin, inputStrData, {TW::data(sigStr)}, {});
+
+        TW::FIO::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.json().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+        EXPECT_EQ(output.error_message(), "empty signatures or publickeys");
+    }
+
+    { // Negative: not one to one
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {TW::data(sigStr)}, {pubKeyA.bytes, pubKeyA.bytes});
+
+        TW::FIO::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.json().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+        EXPECT_EQ(output.error_message(), "signatures and publickeys size can only be one");
+    }
+}
\ No newline at end of file
diff --git a/tests/chains/Fantom/TWCoinTypeTests.cpp b/tests/chains/Fantom/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..e574fc3b825
--- /dev/null
+++ b/tests/chains/Fantom/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWFantomCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeFantom));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb0a741d882291951de1fac72e90b9baf886ddb0c9c87658a0c206490dfaa5202"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeFantom, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x9474feb9917b87da6f0d830ba66ee0035835c0d3"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeFantom, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeFantom));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeFantom));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeFantom), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeFantom));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeFantom));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeFantom));
+    assertStringsEqual(symbol, "FTM");
+    assertStringsEqual(txUrl, "https://ftmscan.com/tx/0xb0a741d882291951de1fac72e90b9baf886ddb0c9c87658a0c206490dfaa5202");
+    assertStringsEqual(accUrl, "https://ftmscan.com/address/0x9474feb9917b87da6f0d830ba66ee0035835c0d3");
+    assertStringsEqual(id, "fantom");
+    assertStringsEqual(name, "Fantom");
+}
diff --git a/tests/chains/Filecoin/AddressTests.cpp b/tests/chains/Filecoin/AddressTests.cpp
new file mode 100644
index 00000000000..ebe9dc553c1
--- /dev/null
+++ b/tests/chains/Filecoin/AddressTests.cpp
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Filecoin/Address.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+
+namespace TW::Filecoin::tests {
+// clang-format off
+
+struct address_test {
+    std::string string;
+    std::string encoded;
+    uint64_t actorID;
+    std::string payloadHex;
+};
+
+static const address_test validAddresses[] = {
+    // ID addresses
+    {"f00",                    "0000",                   0,                     ""},
+    {"f01",                    "0001",                   1,                     ""},
+    {"f010",                   "000a",                   10,                    ""},
+    {"f0150",                  "009601",                 150,                   ""},
+    {"f0499",                  "00f303",                 499,                   ""},
+    {"f01024",                 "008008",                 1024,                  ""},
+    {"f01729",                 "00c10d",                 1729,                  ""},
+    {"f0999999",               "00bf843d",               999999,                ""},
+    {"f018446744073709551615", "00ffffffffffffffffff01", 18446744073709551615U, ""},
+    // secp256k1 addresses
+    {"f15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq", "01ea0f0ea039b291a0f08fd179e0556a8c3277c0d3",  0, "ea0f0ea039b291a0f08fd179e0556a8c3277c0d3"},
+    {"f12fiakbhe2gwd5cnmrenekasyn6v5tnaxaqizq6a", "01d1500504e4d1ac3e89ac891a4502586fabd9b417", 0, "d1500504e4d1ac3e89ac891a4502586fabd9b417"},
+    {"f1wbxhu3ypkuo6eyp6hjx6davuelxaxrvwb2kuwva", "01b06e7a6f0f551de261fe3a6fe182b422ee0bc6b6", 0, "b06e7a6f0f551de261fe3a6fe182b422ee0bc6b6"},
+    {"f1xtwapqc6nh4si2hcwpr3656iotzmlwumogqbuaa", "01bcec07c05e69f92468e2b3e3bf77c874f2c5da8c", 0, "bcec07c05e69f92468e2b3e3bf77c874f2c5da8c"},
+    {"f1xcbgdhkgkwht3hrrnui3jdopeejsoatkzmoltqy", "01b882619d46558f3d9e316d11b48dcf211327026a", 0, "b882619d46558f3d9e316d11b48dcf211327026a"},
+    {"f17uoq6tp427uzv7fztkbsnn64iwotfrristwpryy", "01fd1d0f4dfcd7e99afcb99a8326b7dc459d32c628", 0, "fd1d0f4dfcd7e99afcb99a8326b7dc459d32c628"},
+    // Actor addresses
+    {"f24vg6ut43yw2h2jqydgbg2xq7x6f4kub3bg6as6i", "02e54dea4f9bc5b47d261819826d5e1fbf8bc5503b", 0, "e54dea4f9bc5b47d261819826d5e1fbf8bc5503b"},
+    {"f25nml2cfbljvn4goqtclhifepvfnicv6g7mfmmvq", "02eb58bd08a15a6ade19d0989674148fa95a8157c6", 0, "eb58bd08a15a6ade19d0989674148fa95a8157c6"},
+    {"f2nuqrg7vuysaue2pistjjnt3fadsdzvyuatqtfei", "026d21137eb4c4814269e894d296cf6500e43cd714", 0, "6d21137eb4c4814269e894d296cf6500e43cd714"},
+    {"f24dd4ox4c2vpf5vk5wkadgyyn6qtuvgcpxxon64a", "02e0c7c75f82d55e5ed55db28033630df4274a984f", 0, "e0c7c75f82d55e5ed55db28033630df4274a984f"},
+    {"f2gfvuyh7v2sx3patm5k23wdzmhyhtmqctasbr23y", "02316b4c1ff5d4afb7826ceab5bb0f2c3e0f364053", 0, "316b4c1ff5d4afb7826ceab5bb0f2c3e0f364053"},
+    // BLS addresses
+    {"f3vvmn62lofvhjd2ugzca6sof2j2ubwok6cj4xxbfzz4yuxfkgobpihhd2thlanmsh3w2ptld2gqkn2jvlss4a","03ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd", 0, "ad58df696e2d4e91ea86c881e938ba4ea81b395e12797b84b9cf314b9546705e839c7a99d606b247ddb4f9ac7a3414dd"},
+    {"f3wmuu6crofhqmm3v4enos73okk2l366ck6yc4owxwbdtkmpk42ohkqxfitcpa57pjdcftql4tojda2poeruwa","03b3294f0a2e29e0c66ebc235d2fedca5697bf784af605c75af608e6a63d5cd38ea85ca8989e0efde9188b382f9372460d", 0, "b3294f0a2e29e0c66ebc235d2fedca5697bf784af605c75af608e6a63d5cd38ea85ca8989e0efde9188b382f9372460d"},
+    {"f3s2q2hzhkpiknjgmf4zq3ejab2rh62qbndueslmsdzervrhapxr7dftie4kpnpdiv2n6tvkr743ndhrsw6d3a","0396a1a3e4ea7a14d49985e661b22401d44fed402d1d0925b243c923589c0fbc7e32cd04e29ed78d15d37d3aaa3fe6da33", 0, "96a1a3e4ea7a14d49985e661b22401d44fed402d1d0925b243c923589c0fbc7e32cd04e29ed78d15d37d3aaa3fe6da33"},
+    {"f3q22fijmmlckhl56rn5nkyamkph3mcfu5ed6dheq53c244hfmnq2i7efdma3cj5voxenwiummf2ajlsbxc65a","0386b454258c589475f7d16f5aac018a79f6c1169d20fc33921dd8b5ce1cac6c348f90a3603624f6aeb91b64518c2e8095", 0, "86b454258c589475f7d16f5aac018a79f6c1169d20fc33921dd8b5ce1cac6c348f90a3603624f6aeb91b64518c2e8095"},
+    {"f3u5zgwa4ael3vuocgc5mfgygo4yuqocrntuuhcklf4xzg5tcaqwbyfabxetwtj4tsam3pbhnwghyhijr5mixa","03a7726b038022f75a384617585360cee629070a2d9d28712965e5f26ecc40858382803724ed34f2720336f09db631f074", 0, "a7726b038022f75a384617585360cee629070a2d9d28712965e5f26ecc40858382803724ed34f2720336f09db631f074"},
+    // Delegated addresses
+    {"f432f77777777x32lpna",                         "0420ffffffffff",                               32,                    "ffffffffff"},
+    {"f418446744073709551615ftnkyfaq",               "04ffffffffffffffffff01",                       18446744073709551615U, ""},
+    {"f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky", "040a8dbd6c7ede90646a61bbc649831b7c298bfd37a0", 10,                    "8dbd6c7ede90646a61bbc649831b7c298bfd37a0"},
+    {"f410f2oekwcmo2pueydmaq53eic2i62crtbeyuzx2gmy", "040ad388ab098ed3e84c0d808776440b48f685198498", 10,                    "d388ab098ed3e84c0d808776440b48f685198498"},
+    {"f418446744073709551615faaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafbbuagu","04ffffffffffffffffff01000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000", 18446744073709551615U, "000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000"},
+};
+
+static const std::string invalidAddresses[] = {
+    "",
+    "f0-1",                   // Negative :)
+    "f018446744073709551616", // Greater than max uint64_t
+    "f418446744073709551615", // No "f" separator
+    "f4f77777777vnmsana",     // Empty Actor ID
+    "f15ihq5ibzwki2b4ep2f46avlkr\0zhpqgtga7pdrq", // Embedded NUL
+    "t15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq",  // Test net
+    "a15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq",  // Unknown net
+    "f95ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq",  // Unknown address type
+    // Invalid checksum cases
+    "f15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7rdrr",
+    "f24vg6ut43yw2h2jqydgbg2xq7x6f4kub3bg6as66",
+    "f3vvmn62lofvhjd2ugzca6sof2j2ubwok6cj4xxbfzz4yuxfkgobpihhd2thlanmsh3w2ptld2gqkn2jvlss44",
+    "f0vvmn62lofvhjd2ugzca6sof2j2ubwok6cj4xxbfzz4yuxfkgobpihhd2thlanmsh3w2ptld2gqkn2jvlss44",
+    "f410f2oekwcmo2pueydmaq53eic2i62crtbeyuzx2gma",
+};
+
+TEST(FilecoinAddress, IsValid) {
+    for (auto&& test : validAddresses) {
+        ASSERT_TRUE(Address::isValid(test.string))
+            << "isValid(string) != true: " << test.string;
+
+        const Data encodedBytes = parse_hex(test.encoded);
+        ASSERT_TRUE(Address::isValid(encodedBytes))
+            << "isValid(Data) != true: " << test.encoded;
+    }
+}
+
+TEST(FilecoinAddress, IsInvalid) {
+    for (auto&& address : invalidAddresses) {
+        ASSERT_FALSE(Address::isValid(address))
+            << "isValid(string) != false: " << address;
+    }
+
+    ASSERT_FALSE(Address::isValid(parse_hex("00"))) << "Empty varuint";
+    ASSERT_FALSE(Address::isValid(parse_hex("00ff"))) << "Short varuint";
+    ASSERT_FALSE(Address::isValid(parse_hex("00ff00ff"))) << "Varuint with hole";
+    ASSERT_FALSE(Address::isValid(parse_hex("000101"))) << "Long varuint";
+    ASSERT_FALSE(Address::isValid(parse_hex("000000"))) << "Long varuint";
+    ASSERT_FALSE(Address::isValid(parse_hex("00ffffffffffffffffff80"))) << "Overflow";
+}
+
+TEST(FilecoinAddress, Equal) {
+    for (auto&& test : validAddresses) {
+        const Data encodedBytes = parse_hex(test.encoded);
+        const Address lhs(test.string), rhs(encodedBytes);
+        ASSERT_EQ(lhs, rhs) << "Address(string) != Address(Data)";
+    }
+
+    EXPECT_ANY_THROW(new Address(Data{}));
+}
+
+TEST(FilecoinAddress, ExpectedProperties) {
+    for (auto&& test : validAddresses) {
+        const Data encodedBytes = parse_hex(test.encoded);
+        const uint8_t expectedType = encodedBytes[0];
+
+        const Address address(encodedBytes);
+
+        const auto actualType = static_cast<uint8_t>(address.type);
+        ASSERT_TRUE(actualType == expectedType)
+            << "Unexpected type: " << actualType << " != " << expectedType << ": " << test.string;
+        ASSERT_TRUE(address.actorID == test.actorID)
+            << "Unexpected actorID: " << address.actorID << " != " << test.actorID << ": " << test.string;
+        ASSERT_TRUE(address.payload == parse_hex(test.payloadHex))
+            << "Unexpected payload: " << hex(address.payload) << " != " << test.payloadHex;
+    }
+}
+
+TEST(FilecoinAddress, ToString) {
+    for (auto&& test : validAddresses) {
+        Address a(parse_hex(test.encoded));
+        ASSERT_EQ(a.string(), test.string) << "Address(" << test.encoded << ")";
+    }
+}
+
+TEST(FilecoinAddress, ToBytes) {
+    for (auto&& test : validAddresses) {
+        Address a(test.string);
+        ASSERT_EQ(hex(a.toBytes()), test.encoded) << "Address(" << test.string << ")";
+    }
+
+    for (const auto& test : invalidAddresses)
+        EXPECT_ANY_THROW(new Address(test));
+}
+
+} // TW::Filecoin::tests
diff --git a/tests/chains/Filecoin/SignerTests.cpp b/tests/chains/Filecoin/SignerTests.cpp
new file mode 100644
index 00000000000..8eccd8f6f76
--- /dev/null
+++ b/tests/chains/Filecoin/SignerTests.cpp
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Filecoin/Address.h"
+#include "Filecoin/Signer.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Filecoin {
+
+TEST(FilecoinSigner, DerivePublicKey) {
+    const PrivateKey privateKey(
+        parse_hex("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe"));
+    const PublicKey publicKey((privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended)));
+    const Address address = Address::secp256k1Address(publicKey);
+    ASSERT_EQ(address.string(), "f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq");
+}
+
+TEST(FilecoinSigner, Sign) {
+    const PrivateKey privateKey(
+        parse_hex("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe"));
+    const PublicKey publicKey((privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended)));
+    const Address fromAddress = Address::secp256k1Address(publicKey);
+    const Address toAddress("f1rletqqhinhagw6nxjcr4kbfws25thgt7owzuruy");
+
+    Transaction tx(toAddress, fromAddress,
+                   /*nonce*/ 1,
+                   /*value*/ 6000,
+                   /*gasLimit*/ 23423423423423,
+                   /*gasFeeCap*/ 456456456456445645,
+                   /*gasPremium*/ 5675674564734345,
+                   /*method*/ Transaction::MethodType::SEND,
+                   /*params*/ Data());
+
+    Data signature = Signer::sign(privateKey, tx);
+
+    ASSERT_EQ(
+        tx.serialize(Transaction::SignatureType::SECP256K1, signature),
+        R"({"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"456456456456445645","GasLimit":23423423423423,"GasPremium":"5675674564734345","Method":0,"Nonce":1,"To":"f1rletqqhinhagw6nxjcr4kbfws25thgt7owzuruy","Value":"6000"},"Signature":{"Data":"3GOUpn2Wiwe20QXLC8ixx23WiKDwrVkfxYi3CgzZ5jBVKZT4WUOZNuZhpUFky0PqGaM7vErEOi//yqBGSIQQUAA=","Type":1}})"
+    );
+}
+
+/// Successfully broadcasted:
+/// https://filfox.info/en/message/bafy2bzaceczvto7d2af7cq3kuwlvmanlh5xica4apl3vwxu37yaeozq72mvgm
+TEST(FilecoinSigner, SignToDelegated) {
+    Proto::SigningInput input;
+
+    auto privateKey = parse_hex("d3d6ed8b97dcd4661f62a1162bee6949401fd3935f394e6eacf15b6d5005483c");
+    auto toAddress = "f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky";
+    uint64_t nonce = 0;
+    // 0.001 FIL
+    auto value = store(uint256_t(1'000'000) * uint256_t(1'000'000'000));
+    uint64_t gasLimit = 6152567;
+    auto gasFeeCap = store(uint256_t(4435940585));
+    auto gasPremium = store(uint256_t(11597139));
+
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_to(toAddress);
+    input.set_nonce(nonce);
+    input.set_value(value.data(), value.size());
+    input.set_gas_limit(gasLimit);
+    input.set_gas_fee_cap(gasFeeCap.data(), gasFeeCap.size());
+    input.set_gas_premium(gasPremium.data(), gasPremium.size());
+
+    Proto::SigningOutput output = Signer::sign(input);
+
+    ASSERT_EQ(output.json(), R"({"Message":{"From":"f1mzyorxlcvdoqn5cto7urefbucugrcxxghpjc5hi","GasFeeCap":"4435940585","GasLimit":6152567,"GasPremium":"11597139","Method":3844450837,"Nonce":0,"To":"f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky","Value":"1000000000000000"},"Signature":{"Data":"bxZhnsOYjdArPa3W0SpggwqtXPgvfRSoM2dU5lXYar9lWhTGc6FvPWk2RTUGyA8UtzMIdOPSUKfzU1iA2eA3YwA=","Type":1}})");
+}
+
+/// Successfully broadcasted:
+/// https://filfox.info/en/message/bafy2bzacea3ioez23o7t2hae6t2qwwkow46nhc42ffm5lqyxzzvrzblofnleu
+TEST(FilecoinSigner, SignFromDelegated) {
+    Proto::SigningInput input;
+
+    auto privateKey = parse_hex("825d2bb32965764a98338139412c7591ed54c951dd65504cd8ddaeaa0fea7b2a");
+    auto invalidToAddress = "f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq";
+    auto toAddress = "f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky";
+    uint64_t nonce = 0;
+    // 0.001 FIL
+    auto value = store(uint256_t(1'000'000) * uint256_t(1'000'000'000));
+    uint64_t gasLimit = 2154192;
+    auto gasFeeCap = store(uint256_t(516751679));
+    auto gasPremium = store(uint256_t(12729639));
+
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_nonce(nonce);
+    input.set_value(value.data(), value.size());
+    input.set_gas_limit(gasLimit);
+    input.set_gas_fee_cap(gasFeeCap.data(), gasFeeCap.size());
+    input.set_gas_premium(gasPremium.data(), gasPremium.size());
+    input.set_derivation(Proto::DerivationType::DELEGATED);
+
+    // Check if the output.error is set if `to` address is invalid.
+    input.set_to(invalidToAddress);
+    Proto::SigningOutput errorOutput = Signer::sign(input);
+    ASSERT_FALSE(errorOutput.error_message().empty());
+    ASSERT_TRUE(errorOutput.json().empty());
+
+    // Set the valid `to` address. Expect to get a valid response.
+    input.set_to(toAddress);
+    Proto::SigningOutput output = Signer::sign(input);
+
+    ASSERT_TRUE(output.error_message().empty());
+    ASSERT_EQ(output.json(), R"({"Message":{"From":"f410fvak24cyg3saddajborn6idt7rrtfj2ptauk5pbq","GasFeeCap":"516751679","GasLimit":2154192,"GasPremium":"12729639","Method":3844450837,"Nonce":0,"To":"f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky","Value":"1000000000000000"},"Signature":{"Data":"fMOvlBAnc5OYDVEMaSSQURiqmrJbfktSPcUI2ptAoKtK0xl++cnTSKtqZyNV4yH0X5Ly2N2bqeNlFwAFANHoFAE=","Type":3}})");
+}
+
+} // namespace TW::Filecoin
diff --git a/tests/chains/Filecoin/TWAddressConverterTests.cpp b/tests/chains/Filecoin/TWAddressConverterTests.cpp
new file mode 100644
index 00000000000..b50eb9e58aa
--- /dev/null
+++ b/tests/chains/Filecoin/TWAddressConverterTests.cpp
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWFilecoinAddressConverter.h>
+
+#include <gtest/gtest.h>
+#include <vector>
+
+#include "TestUtilities.h"
+
+namespace TW::Filecoin::tests {
+// clang-format off
+
+struct AddressTest {
+    const char* filecoin;
+    const char* eth;
+};
+
+TEST(TWFilecoinAddressConverter, ConvertToEth) {
+    const AddressTest tests[] = {
+        {"f09876", "0xff00000000000000000000000000000000002694"},
+        {"f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky", "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0"},
+        // The following addresses can't be converted to ETH. Expect an empty result.
+        {"f15ihq5ibzwki2b4ep2f46avlkrqzhpqgtga7pdrq", ""},
+        {"f24vg6ut43yw2h2jqydgbg2xq7x6f4kub3bg6as6i", ""},
+        {"f3vvmn62lofvhjd2ugzca6sof2j2ubwok6cj4xxbfzz4yuxfkgobpihhd2thlanmsh3w2ptld2gqkn2jvlss4a", ""},
+        // Should fail since `actorID != 10`. Expect an empty result.
+        {"f432f77777777x32lpna", ""},
+        {"f418446744073709551615ftnkyfaq", ""},
+        // The following addresses are invalid. Expect an empty result.
+        {"f432f77777777x32lpn", ""},
+        {"f018446744073709551616", ""},
+    };
+
+    for (const auto& test : tests) {
+        auto filecoinAddress = STRING(test.filecoin);
+        auto result = WRAPS(TWFilecoinAddressConverterConvertToEthereum(filecoinAddress.get()));
+        assertStringsEqual(result, test.eth);
+    }
+}
+
+TEST(TWFilecoinAddressConverter, ConvertFromEth) {
+    const AddressTest tests[] = {
+        {"f410f74aaaaaaaaaaaaaaaaaaaaaaaaaaajuu3nnltyi", "0xff00000000000000000000000000000000002694"},
+        {"f410frw6wy7w6sbsguyn3yzeygg34fgf72n5ao5sxyky", "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0"},
+        {"f410f2oekwcmo2pueydmaq53eic2i62crtbeyuzx2gmy", "0xd388ab098ed3e84c0d808776440b48f685198498"},
+        // The following addresses are invalid. Expect an empty result.
+        {"", "0xd388ab098ed3e84c0d808776440b48f68519849"},
+        {"", "0x"},
+    };
+
+    for (const auto& test : tests) {
+        auto ethAddress = STRING(test.eth);
+        auto result = WRAPS(TWFilecoinAddressConverterConvertFromEthereum(ethAddress.get()));
+        assertStringsEqual(result, test.filecoin);
+    }
+}
+
+}
diff --git a/tests/chains/Filecoin/TWAnySignerTests.cpp b/tests/chains/Filecoin/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..27b8eaacf9c
--- /dev/null
+++ b/tests/chains/Filecoin/TWAnySignerTests.cpp
@@ -0,0 +1,70 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "Data.h"
+#include "HexCoding.h"
+#include "proto/Filecoin.pb.h"
+#include "uint256.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Filecoin::tests {
+
+TEST(TWAnySignerFilecoin, Sign) {
+    Proto::SigningInput input;
+    auto privateKey = parse_hex("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe");
+    auto toAddress =
+        "f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq";
+    uint64_t nonce = 2;
+    // 600 FIL
+    // auto value = parse_hex("2086ac351052600000");
+    auto value = store(uint256_t(600) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
+    uint64_t gasLimit = 1000;
+    // auto gasFeeCap = parse_hex("25f273933db5700000");
+    auto gasFeeCap = store(uint256_t(700) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
+    // auto gasPremium = parse_hex("2b5e3af16b18800000");
+    auto gasPremium = store(uint256_t(800) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
+
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_to(toAddress);
+    input.set_nonce(nonce);
+    input.set_value(value.data(), value.size());
+    input.set_gas_limit(gasLimit);
+    input.set_gas_fee_cap(gasFeeCap.data(), gasFeeCap.size());
+    input.set_gas_premium(gasPremium.data(), gasPremium.size());
+
+    auto inputString = input.SerializeAsString();
+    auto inputData = WRAPD(TWDataCreateWithBytes((const byte*)inputString.data(), inputString.size()));
+
+    auto outputData = WRAPD(TWAnySignerSign(inputData.get(), TWCoinTypeFilecoin));
+
+    Proto::SigningOutput output;
+    output.ParseFromArray(TWDataBytes(outputData.get()), static_cast<int>(TWDataSize(outputData.get())));
+
+    ASSERT_EQ(output.json(), R"({"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"700000000000000000000","GasLimit":1000,"GasPremium":"800000000000000000000","Method":0,"Nonce":2,"To":"f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq","Value":"600000000000000000000"},"Signature":{"Data":"jMRu+OZ/lfppgmqSfGsntFrRLWZnUg3ZYmJTTRLsVt4V1310vR3VKGJpaE6S4sNvDOE6sEgmN9YmfTkPVK2qMgE=","Type":1}})");
+}
+
+TEST(TWAnySignerFilecoin, SignJSON) {
+    auto json = STRING(
+        R"({
+            "to": "f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq",
+            "nonce": "2",
+            "value": "IIasNRBSYAAA",
+            "gasLimit": 1000,
+            "gasFeeCap": "JfJzkz21cAAA",
+            "gasPremium": "K1468WsYgAAA"
+        })");
+    auto key = DATA("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe");
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeFilecoin));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeFilecoin));
+    assertStringsEqual(result, R"({"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"700000000000000000000","GasLimit":1000,"GasPremium":"800000000000000000000","Method":0,"Nonce":2,"To":"f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq","Value":"600000000000000000000"},"Signature":{"Data":"jMRu+OZ/lfppgmqSfGsntFrRLWZnUg3ZYmJTTRLsVt4V1310vR3VKGJpaE6S4sNvDOE6sEgmN9YmfTkPVK2qMgE=","Type":1}})");
+}
+
+} // namespace TW::Filecoin::tests
diff --git a/tests/chains/Filecoin/TWCoinTypeTests.cpp b/tests/chains/Filecoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..8fd34f04380
--- /dev/null
+++ b/tests/chains/Filecoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWFilecoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeFilecoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("bafy2bzacedsgjcd6xfhrrymmfrqubb44otlyhvgqkgsh533d5j5hwniiqespm"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeFilecoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("f1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeFilecoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeFilecoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeFilecoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeFilecoin), 18);
+    ASSERT_EQ(TWBlockchainFilecoin, TWCoinTypeBlockchain(TWCoinTypeFilecoin));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeFilecoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeFilecoin));
+    assertStringsEqual(symbol, "FIL");
+    assertStringsEqual(txUrl, "https://filfox.info/en/message/bafy2bzacedsgjcd6xfhrrymmfrqubb44otlyhvgqkgsh533d5j5hwniiqespm");
+    assertStringsEqual(accUrl, "https://filfox.info/en/address/f1abjxfbp274xpdqcpuaykwkfb43omjotacm2p3za");
+    assertStringsEqual(id, "filecoin");
+    assertStringsEqual(name, "Filecoin");
+}
diff --git a/tests/chains/Filecoin/TransactionCompilerTests.cpp b/tests/chains/Filecoin/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..f04883c127d
--- /dev/null
+++ b/tests/chains/Filecoin/TransactionCompilerTests.cpp
@@ -0,0 +1,102 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "uint256.h"
+
+#include "proto/Filecoin.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(FilecoinCompiler, CompileWithSignatures) {
+    auto coin = TWCoinTypeFilecoin;
+
+    /// Step 1: Prepare transaction input (protobuf)
+    Filecoin::Proto::SigningInput input;
+    auto privateKey = parse_hex("1d969865e189957b9824bd34f26d5cbf357fda1a6d844cbf0c9ab1ed93fa7dbe");
+    auto key = PrivateKey(privateKey);
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    auto toAddress =
+        "f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq";
+    uint64_t nonce = 2;
+    // 600 FIL
+    // auto value = parse_hex("2086ac351052600000");
+    auto value = store(uint256_t(600) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
+    uint64_t gasLimit = 1000;
+    // auto gasFeeCap = parse_hex("25f273933db5700000");
+    auto gasFeeCap = store(uint256_t(700) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
+    // auto gasPremium = parse_hex("2b5e3af16b18800000");
+    auto gasPremium = store(uint256_t(800) * uint256_t(1'000'000'000) * uint256_t(1'000'000'000));
+
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_to(toAddress);
+    input.set_nonce(nonce);
+    input.set_value(value.data(), value.size());
+    input.set_gas_limit(gasLimit);
+    input.set_gas_fee_cap(gasFeeCap.data(), gasFeeCap.size());
+    input.set_gas_premium(gasPremium.data(), gasPremium.size());
+    input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+
+    auto txInputData = data(input.SerializeAsString());
+    auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = data(preSigningOutput.data_hash());
+    EXPECT_EQ(hex(preImageHash), "8368c0f622b2c529c7fa147d75aa02aaa7fc13fc4847d4dc57e7a5c59048aafe");
+
+    // Simulate signature, normally obtained from signature server
+    const auto signature = key.sign(preImageHash, TWCurveSECP256k1);
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKey.bytes});
+
+    const auto ExpectedTx = R"({"Message":{"From":"f1z4a36sc7mfbv4z3qwutblp2flycdui3baffytbq","GasFeeCap":"700000000000000000000","GasLimit":1000,"GasPremium":"800000000000000000000","Method":0,"Nonce":2,"To":"f3um6uo3qt5of54xjbx3hsxbw5mbsc6auxzrvfxekn5bv3duewqyn2tg5rhrlx73qahzzpkhuj7a34iq7oifsq","Value":"600000000000000000000"},"Signature":{"Data":"jMRu+OZ/lfppgmqSfGsntFrRLWZnUg3ZYmJTTRLsVt4V1310vR3VKGJpaE6S4sNvDOE6sEgmN9YmfTkPVK2qMgE=","Type":1}})";
+    {
+        Filecoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        ASSERT_EQ(output.json(), ExpectedTx);
+    }
+
+    // double check
+    {
+        Filecoin::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+
+        ASSERT_EQ(output.json(), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, {publicKey.bytes});
+        Filecoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.json().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Filecoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.json().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
diff --git a/tests/chains/Filecoin/TransactionTests.cpp b/tests/chains/Filecoin/TransactionTests.cpp
new file mode 100644
index 00000000000..82650f13499
--- /dev/null
+++ b/tests/chains/Filecoin/TransactionTests.cpp
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Filecoin/Address.h"
+#include "Filecoin/Transaction.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Filecoin {
+
+TEST(FilecoinTransaction, EncodeBigInt) {
+    ASSERT_EQ(hex(encodeBigInt(0)), "");
+    ASSERT_EQ(hex(encodeBigInt(1)), "0001");
+    ASSERT_EQ(hex(encodeBigInt(16)), "0010");
+    ASSERT_EQ(hex(encodeBigInt(1111111111111)), "000102b36211c7");
+    uint256_t reallyBig = 1;
+    reallyBig <<= 128;
+    ASSERT_EQ(hex(encodeBigInt(reallyBig)), "000100000000000000000000000000000000");
+}
+
+TEST(FilecoinTransaction, Serialize) {
+    const PrivateKey privateKey(
+        parse_hex("2f0f1d2c8de955c7c3fb4d9cae02539fadcb13fa998ccd9a1e871bed95f1941e"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    const Address fromAddress = Address::secp256k1Address(publicKey);
+    const Address toAddress("f1hvadvq4rd2pyayrigjx2nbqz2nvemqouslw4wxi");
+
+    Transaction tx(toAddress, fromAddress,
+                   /*nonce*/ 0x1234567890,
+                   /*value*/ 1000,
+                   /*gasLimit*/ 3333333333,
+                   /*gasFeeCap*/ 11111111,
+                   /*gasPremium*/ 333333,
+                   /*method*/ Transaction::MethodType::SEND,
+                   /*params*/ Data());
+
+    ASSERT_EQ(hex(tx.message().encoded()),
+              "8a0055013d403ac3911e9f806228326fa68619d36a4641d455013d413d4c3fe3d89f99495a48c6046224"
+              "a71f0cd71b0000001234567890430003e81ac6aea1554400a98ac744000516150040");
+    ASSERT_EQ(hex(tx.cid()),
+              "0171a0e40220a3b06c2837a94e3a431a78b00536d0298455ceec3d304adf26a3868147c4e6e1");
+}
+
+} // namespace TW::Filecoin
diff --git a/tests/chains/Firo/TWCoinTypeTests.cpp b/tests/chains/Firo/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..8a29b13ddd0
--- /dev/null
+++ b/tests/chains/Firo/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWFiroCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeFiro));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("09a60d58b3d17519a42a8eca60750c33b710ca8f3ca71994192e05c248a2a111"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeFiro, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a8ULhhDgfdSiXJhSZVdhb8EuDc6R3ogsaM"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeFiro, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeFiro));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeFiro));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeFiro), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeFiro));
+    ASSERT_EQ(0x7, TWCoinTypeP2shPrefix(TWCoinTypeFiro));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeFiro));
+    assertStringsEqual(symbol, "FIRO");
+    assertStringsEqual(txUrl, "https://explorer.firo.org/tx/09a60d58b3d17519a42a8eca60750c33b710ca8f3ca71994192e05c248a2a111");
+    assertStringsEqual(accUrl, "https://explorer.firo.org/address/a8ULhhDgfdSiXJhSZVdhb8EuDc6R3ogsaM");
+    assertStringsEqual(id, "firo");
+    assertStringsEqual(name, "Firo");
+}
diff --git a/tests/chains/Firo/TWFiroAddressTests.cpp b/tests/chains/Firo/TWFiroAddressTests.cpp
new file mode 100644
index 00000000000..9054b6100c5
--- /dev/null
+++ b/tests/chains/Firo/TWFiroAddressTests.cpp
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWDerivation.h>
+#include <TrustWalletCore/TWFiroAddressType.h>
+#include <TrustWalletCore/TWSegwitAddress.h>
+#include <TrustWalletCore/TWBitcoinAddress.h>
+#include <TrustWalletCore/TWBitcoinScript.h>
+#include <TrustWalletCore/TWHash.h>
+#include <TrustWalletCore/TWHDWallet.h>
+#include <TrustWalletCore/TWHRP.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+
+#include <gtest/gtest.h>
+
+TEST(TWZCoin, Address) {
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("a22ddec5c567b4488bb00f69b6146c50da2ee883e2c096db098726394d585730").get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+    auto address = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeFiro)));
+    auto addressString = WRAPS(TWBitcoinAddressDescription(address.get()));
+    assertStringsEqual(addressString, "aAbqxogrjdy2YHVcnQxFHMzqpt2fhjCTVT");
+}
+
+TEST(TWZCoin, ExchangeAddress_CreateWithString) {
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING("aJtPAs49k2RYonsUoY9SGgmpzv4awdPfVP").get(), TWCoinTypeFiro));
+    auto addressData = WRAPD(TWAnyAddressData(address.get()));
+    assertHexEqual(addressData, "c7529bf17541410428c7b23b402761acb83fdfba");
+
+    auto exchangeAddress = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING("EXXYdhSMM9Em5Z3kzdUWeUm2vFMNyXFSAEE9").get(), TWCoinTypeFiro));
+    auto exchangeAddressData = WRAPD(TWAnyAddressData(exchangeAddress.get()));
+    assertHexEqual(exchangeAddressData, "c7529bf17541410428c7b23b402761acb83fdfba");
+}
+
+TEST(TWZCoin, ExchangeAddress_DeriveFromPublicKey) {
+    auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA("034cc1963365aa67d35643f419d6601eca6ef7f62e46bf7f8b6ffa64e2f44fd0bf").get(), TWPublicKeyTypeSECP256k1));
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKeyFiroAddressType(publicKey.get(), TWFiroAddressTypeExchange));
+    auto addressDesc = WRAPS(TWAnyAddressDescription(address.get()));
+    assertStringsEqual(addressDesc, "EXXWKhUtcaFKVW1NeRFuqPq33zAJMtQJwR4y");
+
+    auto defaultAddress = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKeyFiroAddressType(publicKey.get(), TWFiroAddressTypeDefault));
+    auto defaultAddressDesc = WRAPS(TWAnyAddressDescription(defaultAddress.get()));
+    assertStringsEqual(defaultAddressDesc, "aGaPDQKakaqVmQXGawLMLguZoqSx6CnSfK");
+}
+
+TEST(TWZCoin, ExtendedKeys) {
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
+        STRING("ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal").get(),
+        STRING("TREZOR").get()
+    ));
+
+    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeFiro, TWHDVersionXPUB));
+    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeFiro, TWHDVersionXPRV));
+
+    assertStringsEqual(xpub, "xpub6Cb8Q6pDeS8PdKNbDv9Hvq4WpJXL3JvKvmHHwR1wD2H543hiCUE1f1tB5AXE6yg13k7xZ6PzEXMNUFHXk6kkx4RYte8VB1i4tCX9rwQVR4a");
+    assertStringsEqual(xprv, "xprv9ybmzbHKp4a6QqJ87tcHZh7nGGgqdrCUZYMh92cKegk6BFNZevum7DZhDuVDqqMdcBT9B4wJSEmwJW9JNdkMcUUjEWKqppxNrJjKFSyKsCr");
+}
+
+TEST(TWZcoin, DeriveFromXpub) {
+    auto xpub = STRING("xpub6Cb8Q6pDeS8PdKNbDv9Hvq4WpJXL3JvKvmHHwR1wD2H543hiCUE1f1tB5AXE6yg13k7xZ6PzEXMNUFHXk6kkx4RYte8VB1i4tCX9rwQVR4a");
+    auto pubKey3 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeFiro, STRING("m/44'/136'/0'/0/3").get()));
+    auto pubKey5 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeFiro, STRING("m/44'/136'/0'/0/5").get()));
+
+    auto address3 = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(pubKey3.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeFiro)));
+    auto address3String = WRAPS(TWBitcoinAddressDescription(address3.get()));
+
+    auto address5 = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(pubKey5.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeFiro)));
+    auto address5String = WRAPS(TWBitcoinAddressDescription(address5.get()));
+
+    assertStringsEqual(address3String, "aLnztJEbyACnxF9H7SFC8YjUxedwyQsgVm");
+    assertStringsEqual(address5String, "aJj2jdMzHyKFJLEFTxhpn379avEqRKFUyw");
+}
+
+TEST(TWZcoin, LockScripts) {
+    auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("a4YtT82mWWxHZhLmdx7e5aroW92dqJoRs3").get(), TWCoinTypeFiro));
+    auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
+    assertHexEqual(scriptData2, "76a9142a10f88e30768d2712665c279922b9621ce58bc788ac");
+
+    auto script3 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("4CFa4fnAQvFz4VpikGNzQ9XfCDXMmdk6sh").get(), TWCoinTypeFiro));
+    auto scriptData3 = WRAPD(TWBitcoinScriptData(script3.get()));
+    assertHexEqual(scriptData3, "a914f010b17a9189e0f2737d71ae9790359eb5bbc13787");
+}
diff --git a/tests/chains/Firo/TransactionCompilerTests.cpp b/tests/chains/Firo/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..c5265971f52
--- /dev/null
+++ b/tests/chains/Firo/TransactionCompilerTests.cpp
@@ -0,0 +1,148 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Bitcoin/Script.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(FiroCompiler, FiroCompileWithSignatures) {
+    // tx on mainnet
+    // https://explorer.firo.org/tx/f1e9a418eb8d2bc96856ac221e9112ee061805af35d52be261caf7a7c9c48756
+
+    const auto coin = TWCoinTypeFiro;
+    const int64_t amount = 9999741;
+    const int64_t fee = 259;
+    const std::string toAddress = "EXXQe1Xhay75BzoFFhXgpqNTtLomdBKSfyMZ";
+
+    auto toScript = Bitcoin::Script::lockScriptForAddress(toAddress, coin);
+    ASSERT_EQ(hex(toScript.bytes), "e076a9146fa0b49c4fe011eeeeba6abb9ea6832d15acda1488ac");
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("EXXWKhUtcaFKVW1NeRFuqPq33zAJMtQJwR4y");
+    input.set_coin_type(coin);
+    input.set_lock_time(824147);
+
+    auto txHash0 = parse_hex("7d46af1b51ac6d55554e4748f08d87727214da7c6148da037cb71dc893b6297f");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(1);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX - 1);
+    utxo0->set_amount(10000000);
+
+    auto utxoAddr0 = "EXXWKhUtcaFKVW1NeRFuqPq33zAJMtQJwR4y";
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, coin);
+    ASSERT_EQ(hex(script0.bytes), "e076a914adfae82521fb6bba65fecc265fe67e5ee476b5df88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    EXPECT_EQ(input.utxo_size(), 1);
+
+    // Plan
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, coin);
+
+    plan.set_amount(amount);
+    plan.set_fee(fee);
+    plan.set_change(0);
+
+    // Extend input with accepted plan
+    *input.mutable_plan() = plan;
+
+    // Serialize input
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT((int)txInputData.size(), 0);
+
+    /// Step 2: Obtain preimage hashes
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    TW::Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), (int)preImageHashes.size()));
+
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].data_hash()),
+              "c4841429065d36ec089c0d27b6f803b8fb1b2fb22d25629f38dcb40e2afff80d");
+
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].public_key_hash()), "adfae82521fb6bba65fecc265fe67e5ee476b5df");
+
+    auto publicKeyHex = "034cc1963365aa67d35643f419d6601eca6ef7f62e46bf7f8b6ffa64e2f44fd0bf";
+    auto publicKey = PublicKey(parse_hex(publicKeyHex), TWPublicKeyTypeSECP256k1);
+    auto preImageHash = preSigningOutput.hash_public_keys()[0].data_hash();
+    auto signature = parse_hex("304402206c5135f0ebfe329b1f1ba3b53730b2e1d02a6afca9c7c9ce007b8b956f9a235a0220482e76d74375b097bcd6275ab30d0c7a716263e744ecbbc33c651f83c15c4d99");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(
+        publicKey.verifyAsDER(signature, TW::Data(preImageHash.begin(), preImageHash.end())));
+
+    // Simulate signatures, normally obtained from signature server.
+    std::vector<Data> signatureVec;
+    std::vector<Data> pubkeyVec;
+    signatureVec.push_back(signature);
+    pubkeyVec.push_back(publicKey.bytes);
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, signatureVec, pubkeyVec);
+
+    const auto ExpectedTx =
+        "01000000017f29b693c81db77c03da48617cda147272878df048474e55556dac511baf467d010000006a47304402206c5135f0ebfe329b1f1ba3b53730b2e1d02a6afca9c7c9ce007b8b956f9a235a0220482e76d74375b097bcd6275ab30d0c7a716263e744ecbbc33c651f83c15c4d990121034cc1963365aa67d35643f419d6601eca6ef7f62e46bf7f8b6ffa64e2f44fd0bffeffffff017d959800000000001ae076a9146fa0b49c4fe011eeeeba6abb9ea6832d15acda1488ac53930c00";
+    {
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: not enough signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, pubkeyVec);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+    { // Negative: invalid public key
+        const auto publicKeyBlake =
+            parse_hex("b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9");
+        EXPECT_EXCEPTION(
+            TransactionCompiler::compileWithSignatures(
+                coin, txInputData, signatureVec, {publicKeyBlake}),
+            "Invalid public key");
+    }
+    { // Negative: wrong signature (formally valid)
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData,
+            {parse_hex("415502201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b349022"
+                       "00a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f3b51")},
+            pubkeyVec);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signing);
+    }
+}
diff --git a/tests/chains/GoChain/TWCoinTypeTests.cpp b/tests/chains/GoChain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..052a2700c5a
--- /dev/null
+++ b/tests/chains/GoChain/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWGoChainCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeGoChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeGoChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeGoChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeGoChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeGoChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeGoChain), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeGoChain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeGoChain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeGoChain));
+    assertStringsEqual(symbol, "GO");
+    assertStringsEqual(txUrl, "https://explorer.gochain.io/tx/t123");
+    assertStringsEqual(accUrl, "https://explorer.gochain.io/addr/a12");
+    assertStringsEqual(id, "gochain");
+    assertStringsEqual(name, "GoChain");
+}
diff --git a/tests/chains/Greenfield/TWAnyAddressTests.cpp b/tests/chains/Greenfield/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..5e4736f9de0
--- /dev/null
+++ b/tests/chains/Greenfield/TWAnyAddressTests.cpp
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWGreenfield, Address) {
+    auto string = STRING("0x5aaeb6053f3e94c9b9a09f33669435e7ef1beaed");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeGreenfield));
+    auto actual = WRAPS(TWAnyAddressDescription(addr.get()));
+    auto expected = STRING("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed");
+    EXPECT_TRUE(TWStringEqual(actual.get(), expected.get()));
+}
diff --git a/tests/chains/Greenfield/TWAnySignerTests.cpp b/tests/chains/Greenfield/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..12afa89b367
--- /dev/null
+++ b/tests/chains/Greenfield/TWAnySignerTests.cpp
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Greenfield.pb.h"
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+namespace TW::Greenfield::tests {
+
+TEST(TWAnySignerGreenfield, Sign) {
+    // Successfully broadcasted: https://greenfieldscan.com/tx/ED8508F3C174C4430B8EE718A6D6F0B02A8C516357BE72B1336CF74356529D19
+
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Eip712);
+    input.set_account_number(15952);
+    input.set_cosmos_chain_id("greenfield_5600-1");
+    input.set_eth_chain_id("5600");
+    input.set_sequence(0);
+    input.set_mode(Proto::BroadcastMode::SYNC);
+    input.set_memo("Trust Wallet test memo");
+
+    auto &msg = *input.add_messages();
+    auto &msgSend = *msg.mutable_send_coins_message();
+    msgSend.set_from_address("0xA815ae0b06dC80318121745BE40e7F8c6654e9f3");
+    msgSend.set_to_address("0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0");
+    auto amountOfTx = msgSend.add_amounts();
+    amountOfTx->set_denom("BNB");
+    amountOfTx->set_amount("1234500000000000");
+
+    auto &fee = *input.mutable_fee();
+    fee.set_gas(1200);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("BNB");
+    amountOfFee->set_amount("6000000000000");
+
+    auto privateKey = parse_hex("825d2bb32965764a98338139412c7591ed54c951dd65504cd8ddaeaa0fea7b2a");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeGreenfield);
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_EQ(hex(output.signature()), "c1b45bd6a1005b06aa55f9a9d4c9fb88c8bbc3057fa0f8b6276796f4d04874da24cbe64bfae7a04bf918f9fba708eaea559f8a6e897dfdd8c057e6d068d501d31c");
+    EXPECT_EQ(output.serialized(), R"({"mode":"BROADCAST_MODE_SYNC","tx_bytes":"CqwBCpEBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnEKKjB4QTgxNWFlMGIwNmRDODAzMTgxMjE3NDVCRTQwZTdGOGM2NjU0ZTlmMxIqMHg4ZGJENmM3RWRlOTA2NDZhNjFCYmM2NDk4MzFiN2MyOThCRmQzN0EwGhcKA0JOQhIQMTIzNDUwMDAwMDAwMDAwMBIWVHJ1c3QgV2FsbGV0IHRlc3QgbWVtbxJzClYKTQomL2Nvc21vcy5jcnlwdG8uZXRoLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohAhm/mQgs8vzaqBLW66HrqQNv86PYTBgXyElU1OiuKD/sEgUKAwjIBRIZChQKA0JOQhINNjAwMDAwMDAwMDAwMBCwCRpBwbRb1qEAWwaqVfmp1Mn7iMi7wwV/oPi2J2eW9NBIdNoky+ZL+uegS/kY+funCOrqVZ+Kbol9/djAV+bQaNUB0xw="})");
+}
+
+} // namespace TW::Greenfield::tests
diff --git a/tests/chains/Greenfield/TWCoinTypeTests.cpp b/tests/chains/Greenfield/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..37292589ba1
--- /dev/null
+++ b/tests/chains/Greenfield/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWGreenfieldCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeGreenfield;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x150eac42070957115fd538b1f348fadd78d710fb641c248120efcf35d1e7e4f3"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xcf0f6b88ed72653b00fdebbffc90b98072cb3285"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "greenfield");
+    assertStringsEqual(name, "BNB Greenfield");
+    assertStringsEqual(symbol, "BNB");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainGreenfield);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "1017");
+    assertStringsEqual(txUrl, "https://greenfieldscan.com/tx/0x150eac42070957115fd538b1f348fadd78d710fb641c248120efcf35d1e7e4f3");
+    assertStringsEqual(accUrl, "https://greenfieldscan.com/account/0xcf0f6b88ed72653b00fdebbffc90b98072cb3285");
+}
diff --git a/tests/chains/Greenfield/TransactionCompilerTests.cpp b/tests/chains/Greenfield/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..9766bbcaa0c
--- /dev/null
+++ b/tests/chains/Greenfield/TransactionCompilerTests.cpp
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestUtilities.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Greenfield.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Greenfield {
+
+TEST(GreenfieldCompiler, PreHashCompile) {
+    // Successfully broadcasted https://greenfieldscan.com/tx/0x9f895cf2dd64fb1f428cefcf2a6585a813c3540fc9fe1ef42db1da2cb1df55ab
+
+    auto privateKeyData = parse_hex("9066aa168c379a403becb235c15e7129c133c244e56a757ab07bc369288bcab0");
+    PrivateKey privateKey(privateKeyData);
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+
+    Proto::SigningInput input;
+    input.set_signing_mode(Proto::Eip712);
+    input.set_account_number(15560);
+    input.set_cosmos_chain_id("greenfield_5600-1");
+    input.set_eth_chain_id("5600");
+    input.set_sequence(2);
+    input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+
+    auto& msg = *input.add_messages();
+    auto& msgSend = *msg.mutable_send_coins_message();
+    msgSend.set_from_address("0x9d1d97aDFcd324Bbd603D3872BD78e04098510b1");
+    msgSend.set_to_address("0x280b27f3676db1C4475EE10F75D510Eb527fd155");
+    auto amountOfTx = msgSend.add_amounts();
+    amountOfTx->set_denom("BNB");
+    amountOfTx->set_amount("1000000000000000");
+
+    auto& fee = *input.mutable_fee();
+    fee.set_gas(200000);
+    auto amountOfFee = fee.add_amounts();
+    amountOfFee->set_denom("BNB");
+    amountOfFee->set_amount("2000000000000000");
+
+    // Step 1: PreHash
+
+    auto inputData = data(input.SerializeAsString());
+    auto preOutputData = TransactionCompiler::preImageHashes(TWCoinTypeGreenfield, inputData);
+    TW::TxCompiler::Proto::PreSigningOutput preOutput;
+    preOutput.ParseFromArray(preOutputData.data(), static_cast<int>(preOutputData.size()));
+
+    EXPECT_EQ(preOutput.error(), Common::Proto::SigningError::OK);
+    EXPECT_EQ(hex(preOutput.data_hash()), "b8c62654582ca96b37ca94966199682bf70ed934e740d2f874ff54675a0ac344");
+
+    // Step 2: Sign "remotely"
+
+    auto signature = privateKey.sign(data(preOutput.data_hash()), TWCurveSECP256k1);
+
+    EXPECT_EQ(hex(signature), "cb3a4684a991014a387a04a85b59227ebb79567c2025addcb296b4ca856e9f810d3b526f2a0d0fad6ad1b126b3b9516f8b3be020a7cca9c03ce3cf47f4199b6d00");
+
+    // Step 3: Compile
+
+    auto outputData = TransactionCompiler::compileWithSignatures(TWCoinTypeGreenfield, inputData, {signature}, {publicKey.bytes});
+    Proto::SigningOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_EQ(hex(output.signature()), "cb3a4684a991014a387a04a85b59227ebb79567c2025addcb296b4ca856e9f810d3b526f2a0d0fad6ad1b126b3b9516f8b3be020a7cca9c03ce3cf47f4199b6d1b");
+    EXPECT_EQ(output.serialized(), R"({"mode":"BROADCAST_MODE_SYNC","tx_bytes":"CpQBCpEBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnEKKjB4OWQxZDk3YURGY2QzMjRCYmQ2MDNEMzg3MkJENzhlMDQwOTg1MTBiMRIqMHgyODBiMjdmMzY3NmRiMUM0NDc1RUUxMEY3NUQ1MTBFYjUyN2ZkMTU1GhcKA0JOQhIQMTAwMDAwMDAwMDAwMDAwMBJ5ClgKTQomL2Nvc21vcy5jcnlwdG8uZXRoLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohAnnvNAZNoQ2wRjxwSAYWugIHA+w6RQJt73vr0ggvXW/IEgUKAwjIBRgCEh0KFwoDQk5CEhAyMDAwMDAwMDAwMDAwMDAwEMCaDBpByzpGhKmRAUo4egSoW1kifrt5VnwgJa3cspa0yoVun4ENO1JvKg0PrWrRsSazuVFvizvgIKfMqcA8489H9BmbbRs="})");
+}
+
+} // namespace TW::Greenfield
diff --git a/tests/chains/Groestlcoin/AddressTests.cpp b/tests/chains/Groestlcoin/AddressTests.cpp
new file mode 100644
index 00000000000..8fcce675012
--- /dev/null
+++ b/tests/chains/Groestlcoin/AddressTests.cpp
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Groestlcoin/Address.h"
+
+#include "Coin.h"
+#include "HDWallet.h"
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Groestlcoin::tests {
+
+TEST(GroestlcoinAddress, FromPublicKey) {
+    const auto publicKey = PublicKey(parse_hex("03b85cc59b67c35851eb5060cfc3a759a482254553c5857075c9e247d74d412c91"), TWPublicKeyTypeSECP256k1);
+    const auto address = Address(publicKey, 36);
+    ASSERT_EQ(address.string(), "Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM");
+
+    const auto privateKey = PrivateKey(parse_hex("a1269039e4ffdf43687852d7247a295f0b5bc55e6dda031cffaa3295ca0a9d7a"));
+    const auto publicKey2 = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeED25519));
+    EXPECT_ANY_THROW(new Address(publicKey2, 36));
+}
+
+TEST(GroestlcoinAddress, Valid) {
+    ASSERT_TRUE(Address::isValid(std::string("Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM")));
+    TW::Data addressData;
+    addressData.push_back(TW::p2pkhPrefix(TWCoinTypeGroestlcoin));
+
+    auto addressHash = parse_hex("98af0aaca388a7e1024f505c033626d908e3b54a");
+    std::copy(addressHash.begin(), addressHash.end(), std::back_inserter(addressData));
+
+    ASSERT_EQ(Address(addressData).string(), "Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM");
+}
+
+TEST(GroestlcoinAddress, Invalid) {
+    EXPECT_EXCEPTION(Address("Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLo"), "Invalid address string");                    // Invalid address
+    EXPECT_EXCEPTION(Address(parse_hex("98af0aaca388a7e1024f505c033626d908e3b5")), "Invalid address key data"); // Invalid address data
+    ASSERT_FALSE(Address::isValid(std::string("1JAd7XCBzGudGpJQSDSfpmJhiygtLQWaGL")));                          // Valid bitcoin address
+}
+
+TEST(GroestlcoinAddress, FromString) {
+    const auto string = "Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM";
+    const auto address = Address(string);
+
+    ASSERT_EQ(address.string(), string);
+}
+
+TEST(GroestlcoinAddress, Derive) {
+    const auto mnemonic = "all all all all all all all all all all all all";
+    const auto wallet = HDWallet(mnemonic, "");
+    const auto path = TW::derivationPath(TWCoinTypeGroestlcoin);
+    auto address = TW::deriveAddress(TWCoinTypeGroestlcoin, wallet.getKey(TWCoinTypeGroestlcoin, path));
+    ASSERT_EQ(address, "grs1qw4teyraux2s77nhjdwh9ar8rl9dt7zww8r6lne");
+
+    address = TW::deriveAddress(TWCoinTypeGroestlcoin, wallet.getKey(TWCoinTypeGroestlcoin, path), TWDerivationBitcoinLegacy);
+    ASSERT_EQ(address, "FfsAQrzfdECwEsApubn2rvxgamU8CcqsLT");
+}
+
+TEST(GroestlcoinAddress, AddressData) {
+    const auto publicKey = PublicKey(parse_hex("03b85cc59b67c35851eb5060cfc3a759a482254553c5857075c9e247d74d412c91"), TWPublicKeyTypeSECP256k1);
+    auto address = TW::deriveAddress(TWCoinTypeGroestlcoin, publicKey, TWDerivationBitcoinLegacy);
+    ASSERT_EQ(address, "Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM");
+
+    auto addressData = TW::addressToData(TWCoinTypeGroestlcoin, address);
+    ASSERT_EQ(hex(addressData), "98af0aaca388a7e1024f505c033626d908e3b54a");
+
+    address = TW::deriveAddress(TWCoinTypeGroestlcoin, publicKey, TWDerivationBitcoinSegwit);
+    EXPECT_EQ(address, "grs1qnzhs4t9r3zn7zqj02pwqxd3xmyyw8d22q55nf8");
+
+    addressData = TW::addressToData(TWCoinTypeGroestlcoin, address);
+    EXPECT_EQ(hex(addressData), "98af0aaca388a7e1024f505c033626d908e3b54a");
+}
+
+} // namespace TW::Groestlcoin::tests
diff --git a/tests/chains/Groestlcoin/TWCoinTypeTests.cpp b/tests/chains/Groestlcoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..974fdbe9881
--- /dev/null
+++ b/tests/chains/Groestlcoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWGroestlcoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeGroestlcoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeGroestlcoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeGroestlcoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeGroestlcoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeGroestlcoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeGroestlcoin), 8);
+    ASSERT_EQ(TWBlockchainGroestlcoin, TWCoinTypeBlockchain(TWCoinTypeGroestlcoin));
+    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeGroestlcoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeGroestlcoin));
+    assertStringsEqual(symbol, "GRS");
+    assertStringsEqual(txUrl, "https://blockchair.com/groestlcoin/transaction/t123");
+    assertStringsEqual(accUrl, "https://blockchair.com/groestlcoin/address/a12");
+    assertStringsEqual(id, "groestlcoin");
+    assertStringsEqual(name, "Groestlcoin");
+}
diff --git a/tests/Groestlcoin/TWGroestlcoinSigningTests.cpp b/tests/chains/Groestlcoin/TWGroestlcoinSigningTests.cpp
similarity index 88%
rename from tests/Groestlcoin/TWGroestlcoinSigningTests.cpp
rename to tests/chains/Groestlcoin/TWGroestlcoinSigningTests.cpp
index b2c7127d6e5..db0c4dc4702 100644
--- a/tests/Groestlcoin/TWGroestlcoinSigningTests.cpp
+++ b/tests/chains/Groestlcoin/TWGroestlcoinSigningTests.cpp
@@ -1,15 +1,14 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bitcoin/Script.h"
+#include "Groestlcoin/Signer.h"
 #include "Hash.h"
 #include "HexCoding.h"
 #include "PrivateKey.h"
 #include "proto/Bitcoin.pb.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include "../Bitcoin/TxComparisonHelper.h"
 #include <TrustWalletCore/TWBitcoinSigHashType.h>
 #include <TrustWalletCore/TWAnySigner.h>
@@ -22,6 +21,7 @@ namespace TW::Bitcoin {
 
 TEST(GroestlcoinSigning, SignP2WPKH) {
     Proto::SigningInput input;
+    input.set_coin_type(TWCoinTypeGroestlcoin);
     input.set_hash_type(TWBitcoinSigHashTypeAll);
     input.set_amount(2500);
     input.set_byte_fee(1);
@@ -64,6 +64,7 @@ TEST(GroestlcoinSigning, SignP2WPKH) {
 
 TEST(GroestlcoinSigning, SignP2PKH) {
     Proto::SigningInput input;
+    input.set_coin_type(TWCoinTypeGroestlcoin);
     input.set_hash_type(TWBitcoinSigHashTypeAll);
     input.set_amount(2500);
     input.set_byte_fee(1);
@@ -104,9 +105,27 @@ TEST(GroestlcoinSigning, SignP2PKH) {
     ASSERT_EQ(hex(output.encoded()), "01000000019568b09e6c6d940302ec555a877c9e5f799de8ee473e18d3a19ae14478cc4e8f000000006a47304402202163ab98b028aa13563f0de00b785d6df81df5eac0b7c91d23f5be7ea674aa3702202bf6cd7055c6f8f697ce045b1a4f9b997cf6e5761a661d27696ac34064479d19012103b85cc59b67c35851eb5060cfc3a759a482254553c5857075c9e247d74d412c91ffffffff02c4090000000000001600147557920fbc32a1ef4ef26bae5e8ce3f95abf09cee20800000000000017a9140055b0c94df477ee6b9f75185dfc9aa8ce2e52e48700000000");
 }
 
+TEST(GroestlcoinSigning, SignWithError) {
+    Proto::SigningInput input;
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(2500);
+    input.set_byte_fee(1);
+    input.set_to_address("grs1qw4teyraux2s77nhjdwh9ar8rl9dt7zww8r6lne");
+    input.set_change_address("31inaRqambLsd9D7Ke4USZmGEVd3PHkh7P");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeGroestlcoin);
+
+    ASSERT_NE(output.error(), Common::Proto::OK);
+
+    auto result = Groestlcoin::Signer::preImageHashes(input);
+    ASSERT_NE(result.error(), Common::Proto::OK);
+}
+
 TEST(GroestlcoinSigning, SignP2SH_P2WPKH) {
     // TX outputs
     Proto::SigningInput input;
+    input.set_coin_type(TWCoinTypeGroestlcoin);
     input.set_hash_type(TWBitcoinSigHashTypeAll);
     input.set_amount(5'000);
     input.set_byte_fee(1);
@@ -117,14 +136,14 @@ TEST(GroestlcoinSigning, SignP2SH_P2WPKH) {
     auto utxoKey0 = PrivateKey(parse_hex("302fc195a8fc96c5a581471e67e4c1ac2efda252f76ad5c77a53764c70d58f91"));
     auto pubKey0 = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
     auto utxoPubkeyHash = Hash::ripemd(Hash::sha256(pubKey0.bytes));
-    EXPECT_EQ(hex(utxoPubkeyHash.begin(), utxoPubkeyHash.end()), "2fc7d70acef142d1f7b5ef2f20b1a9b759797674");
+    EXPECT_EQ(hex(utxoPubkeyHash), "2fc7d70acef142d1f7b5ef2f20b1a9b759797674");
     input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
 
     auto redeemScript = Script::buildPayToWitnessPublicKeyHash(utxoPubkeyHash);
     auto scriptHash = Hash::ripemd(Hash::sha256(redeemScript.bytes));
-    ASSERT_EQ(hex(scriptHash.begin(), scriptHash.end()), "0055b0c94df477ee6b9f75185dfc9aa8ce2e52e4");
+    ASSERT_EQ(hex(scriptHash), "0055b0c94df477ee6b9f75185dfc9aa8ce2e52e4");
     auto scriptString = std::string(redeemScript.bytes.begin(), redeemScript.bytes.end());
-    (*input.mutable_scripts())[hex(scriptHash.begin(), scriptHash.end())] = scriptString;
+    (*input.mutable_scripts())[hex(scriptHash)] = scriptString;
 
     auto utxo0 = input.add_utxo();
     auto utxo0Script = Script(parse_hex("a9140055b0c94df477ee6b9f75185dfc9aa8ce2e52e487"));
@@ -159,6 +178,7 @@ TEST(GroestlcoinSigning, SignP2SH_P2WPKH) {
 
 TEST(GroestlcoinSigning, PlanP2WPKH) {
     Proto::SigningInput input;
+    input.set_coin_type(TWCoinTypeGroestlcoin);
     input.set_hash_type(TWBitcoinSigHashTypeAll);
     input.set_amount(2500);
     input.set_byte_fee(1);
diff --git a/tests/Groestlcoin/TWGroestlcoinTests.cpp b/tests/chains/Groestlcoin/TWGroestlcoinTests.cpp
similarity index 93%
rename from tests/Groestlcoin/TWGroestlcoinTests.cpp
rename to tests/chains/Groestlcoin/TWGroestlcoinTests.cpp
index a00b684b019..bb186cfd48f 100644
--- a/tests/Groestlcoin/TWGroestlcoinTests.cpp
+++ b/tests/chains/Groestlcoin/TWGroestlcoinTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWAnyAddress.h>
 #include <TrustWalletCore/TWGroestlcoinAddress.h>
@@ -23,11 +21,17 @@ TEST(Groestlcoin, Address) {
     auto addressString = WRAPS(TWGroestlcoinAddressDescription(address.get()));
     assertStringsEqual(addressString, "Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM");
 
+    ASSERT_TRUE(TWGroestlcoinAddressIsValidString(addressString.get()));
+
     auto address2 = WRAP(TWGroestlcoinAddress, TWGroestlcoinAddressCreateWithString(STRING("Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM").get()));
     auto address2String = WRAPS(TWGroestlcoinAddressDescription(address2.get()));
     assertStringsEqual(address2String, "Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLoZM");
 
     ASSERT_TRUE(TWGroestlcoinAddressEqual(address.get(), address2.get()));
+
+    // invalid address
+    auto address3 = WRAP(TWGroestlcoinAddress, TWGroestlcoinAddressCreateWithString(STRING("Fj62rBJi8LvbmWu2jzkaUX1NFXLEqDLo").get()));
+    ASSERT_EQ(address3, nullptr);
 }
 
 TEST(Groestlcoin, BuildForLegacyAddress) {
diff --git a/tests/chains/Groestlcoin/TransactionCompilerTests.cpp b/tests/chains/Groestlcoin/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..dfe513977cf
--- /dev/null
+++ b/tests/chains/Groestlcoin/TransactionCompilerTests.cpp
@@ -0,0 +1,117 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Groestlcoin/Signer.h"
+#include "Groestlcoin/Transaction.h"
+
+#include "../Bitcoin/TxComparisonHelper.h"
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Bitcoin {
+
+TEST(GroestlcoinCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeGroestlcoin;
+
+    Bitcoin::Proto::SigningInput input;
+    input.set_coin_type(coin);
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(2500);
+    input.set_byte_fee(1);
+    input.set_to_address("grs1qw4teyraux2s77nhjdwh9ar8rl9dt7zww8r6lne");
+    input.set_change_address("31inaRqambLsd9D7Ke4USZmGEVd3PHkh7P");
+
+    auto utxoKey0 = parse_hex("3c3385ddc6fd95ba7282051aeb440bc75820b8c10db5c83c052d7586e3e98e84");
+    input.add_private_key(utxoKey0.data(), utxoKey0.size());
+
+    auto utxo0 = input.add_utxo();
+    auto utxo0Script = Bitcoin::Script(parse_hex("76a91498af0aaca388a7e1024f505c033626d908e3b54a88ac"));
+    utxo0->set_script(utxo0Script.bytes.data(), utxo0Script.bytes.size());
+    utxo0->set_amount(5000);
+    auto hash0 = parse_hex("9568b09e6c6d940302ec555a877c9e5f799de8ee473e18d3a19ae14478cc4e8f");
+    utxo0->mutable_out_point()->set_hash(hash0.data(), hash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+
+    Bitcoin::Proto::TransactionPlan plan;
+    {
+        // try plan first
+        ANY_PLAN(input, plan, coin);
+        EXPECT_TRUE(verifyPlan(plan, {5000}, 2500, 221));
+    }
+
+    // Supply plan for signing, to match fee of previously-created real TX
+    *input.mutable_plan() = plan;
+    input.mutable_plan()->set_fee(226);
+    input.mutable_plan()->set_change(2274);
+
+    // build preimage
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    ASSERT_EQ(preSigningOutput.hash_public_keys().size(), 1);
+
+    auto preImageHash = data(preSigningOutput.hash_public_keys()[0].data_hash());
+    EXPECT_EQ(hex(preImageHash),
+              "0fb3da786ad1028574f0b40ff1446515eb85cacccff3f3d0459e191b660597b3");
+
+    // compile
+    auto publicKey = PrivateKey(utxoKey0).getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto signature = parse_hex("304402202163ab98b028aa13563f0de00b785d6df81df5eac0b7c91d23f5be7ea674aa3702202bf6cd7055c6f8f697ce045b1a4f9b997cf6e5761a661d27696ac34064479d19");
+    {
+        const Data outputData =
+            TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKey.bytes});
+        Bitcoin::Proto::SigningOutput signingOutput;
+        ASSERT_TRUE(signingOutput.ParseFromArray(outputData.data(), (int)outputData.size()));
+        ASSERT_EQ(hex(signingOutput.encoded()),
+                  "01000000019568b09e6c6d940302ec555a877c9e5f799de8ee473e18d3a19ae14478cc4e8f000000"
+                  "006a47304402202163ab98b028aa13563f0de00b785d6df81df5eac0b7c91d23f5be7ea674aa3702"
+                  "202bf6cd7055c6f8f697ce045b1a4f9b997cf6e5761a661d27696ac34064479d19012103b85cc59b"
+                  "67c35851eb5060cfc3a759a482254553c5857075c9e247d74d412c91ffffffff02c4090000000000"
+                  "001600147557920fbc32a1ef4ef26bae5e8ce3f95abf09cee20800000000000017a9140055b0c94d"
+                  "f477ee6b9f75185dfc9aa8ce2e52e48700000000");
+        Bitcoin::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+        ASSERT_EQ(output.encoded(), signingOutput.encoded());
+    }
+
+    { // Negative: not enough signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature}, {publicKey.bytes, publicKey.bytes});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+    { // Negative: empty signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+} // TW::Bitcoin
\ No newline at end of file
diff --git a/tests/chains/Harmony/AddressTests.cpp b/tests/chains/Harmony/AddressTests.cpp
new file mode 100644
index 00000000000..3d7786b76be
--- /dev/null
+++ b/tests/chains/Harmony/AddressTests.cpp
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Harmony/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Harmony::tests {
+
+TEST(HarmonyAddress, FromString) {
+    Address sender;
+    ASSERT_TRUE(Address::decode("one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe", sender));
+    Address receiver;
+    ASSERT_TRUE(Address::decode("one1tp7xdd9ewwnmyvws96au0e7e7mz6f8hjqr3g3p", receiver));
+
+    ASSERT_EQ("ed1ebe4fd1f73f86388f231997859ca42c07da5d", hex(sender.getKeyHash()));
+    ASSERT_EQ("587c66b4b973a7b231d02ebbc7e7d9f6c5a49ef2", hex(receiver.getKeyHash()));
+}
+
+TEST(HarmonyAddress, FromData) {
+    const auto address = Address(parse_hex("0x587c66b4b973a7b231d02ebbc7e7d9f6c5a49ef2"));
+    const auto address_2 = Address(parse_hex("0xed1ebe4fd1f73f86388f231997859ca42c07da5d"));
+    ASSERT_EQ(address.string(), "one1tp7xdd9ewwnmyvws96au0e7e7mz6f8hjqr3g3p");
+    ASSERT_EQ(address_2.string(), "one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe");
+
+    EXPECT_ANY_THROW(new Address(parse_hex("")));
+}
+
+TEST(HarmonyAddress, InvalidHarmonyAddress) {
+    ASSERT_FALSE(Address::isValid("one1a50tun737ulcvwy0yvve0pe"));
+    ASSERT_FALSE(Address::isValid("oe1tp7xdd9ewwnmyvws96au0ee7e7mz6f8hjqr3g3p"));
+}
+
+TEST(HarmonyAddress, FromPublicKey) {
+    const auto privateKey =
+        PrivateKey(parse_hex("e2f88b4974ae763ca1c2db49218802c2e441293a09eaa9ab681779e05d1b7b94"));
+    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "one1a50tun737ulcvwy0yvve0pvu5skq0kjargvhwe");
+
+    const auto publicKey2 = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeED25519));
+    EXPECT_ANY_THROW(new Address(publicKey2));
+}
+
+} // namespace TW::Harmony::tests
diff --git a/tests/chains/Harmony/SignerTests.cpp b/tests/chains/Harmony/SignerTests.cpp
new file mode 100644
index 00000000000..dc917bf26b5
--- /dev/null
+++ b/tests/chains/Harmony/SignerTests.cpp
@@ -0,0 +1,287 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <gtest/gtest.h>
+
+#include "Ethereum/RLP.h"
+#include "Harmony/Address.h"
+#include "Harmony/Signer.h"
+#include "HexCoding.h"
+#include "proto/Harmony.pb.h"
+
+namespace TW::Harmony {
+
+using namespace boost::multiprecision;
+
+class SignerExposed : public Signer {
+  public:
+    SignerExposed(uint256_t chainID) : Signer(chainID) {}
+    using Signer::hash;
+};
+
+static uint256_t MAIN_NET = 0x1;
+
+static uint256_t LOCAL_NET = 0x2;
+
+static uint256_t TEST_AMOUNT = uint256_t("0x4c53ecdc18a60000");
+
+static Address TEST_RECEIVER;
+static bool testReceiverDecodeResult =
+    Address::decode("one1d2rngmem4x2c6zxsjjz29dlah0jzkr0k2n88wc", TEST_RECEIVER);
+
+static auto TEST_TRANSACTION = Transaction(/* nonce: */ 0x9,
+                                           /* gasPrice: */ 0x0,
+                                           /* gasLimit: */ 0x5208,
+                                           /* fromShardID */ 0x1,
+                                           /* toShardID */ 0x0,
+                                           /* to: */ TEST_RECEIVER,
+                                           /* amount: */ TEST_AMOUNT,
+                                           /* payload: */ {});
+
+TEST(HarmonySigner, RLPEncodingAndHashAssumeLocalNet) {
+    auto rlpUnhashedShouldBe = "e909808252080180946a87346f3ba9958d08d09484a"
+                               "2b7fdbbe42b0df6884c53ecdc18a6000080028080";
+    auto rlpHashedShouldBe = "610238ad72e4492af494f49bf5d92"
+                             "13626a0ee5adb8256bb2558e990ee4da8f0";
+    auto signer = SignerExposed(LOCAL_NET);
+    auto rlpHex = signer.txnAsRLPHex(TEST_TRANSACTION);
+    auto hash = signer.hash(TEST_TRANSACTION);
+
+    ASSERT_EQ(rlpHex, rlpUnhashedShouldBe);
+    ASSERT_EQ(hex(hash), rlpHashedShouldBe);
+}
+
+TEST(HarmonySigner, SignAssumeLocalNet) {
+    auto key =
+        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
+    auto signer = SignerExposed(LOCAL_NET);
+
+    uint256_t v("0x28");
+    uint256_t r("0x325aed6caa01a5235b7a508c8ab67f0c43946b05a1ea6a3e0628de4033fe372d");
+    uint256_t s("0x6c19085d3376c30f6dc47cec795991cd37d6d0ebddfa633b0a8f494bc19cd01b");
+
+    auto transaction = Transaction(TEST_TRANSACTION);
+    auto hash = signer.hash(transaction);
+
+    signer.sign(key, hash, transaction);
+
+    ASSERT_EQ(transaction.v, v);
+    ASSERT_EQ(transaction.r, r);
+    ASSERT_EQ(transaction.s, s);
+}
+
+TEST(HarmonySigner, SignProtoBufAssumeLocalNet) {
+    auto input = Proto::SigningInput();
+    auto trasactionMsg = input.mutable_transaction_message();
+
+    trasactionMsg->set_to_address(TEST_RECEIVER.string());
+    const auto privateKey =
+        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
+    auto payload = parse_hex("");
+    trasactionMsg->set_payload(payload.data(), payload.size());
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto value = store(LOCAL_NET);
+    input.set_chain_id(value.data(), value.size());
+
+    value = store(uint256_t("0x9"));
+    trasactionMsg->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t(""));
+    trasactionMsg->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x5208"));
+    trasactionMsg->set_gas_limit(value.data(), value.size());
+
+    value = store(uint256_t("0x1"));
+    trasactionMsg->set_from_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    trasactionMsg->set_to_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x4c53ecdc18a60000"));
+    trasactionMsg->set_amount(value.data(), value.size());
+
+    auto proto_output = Signer::sign(input);
+
+    auto shouldBeV = "28";
+    auto shouldBeR = "325aed6caa01a5235b7a508c8ab67f0c43946b05a1ea6a3e0628de4033fe372d";
+    auto shouldBeS = "6c19085d3376c30f6dc47cec795991cd37d6d0ebddfa633b0a8f494bc19cd01b";
+
+    ASSERT_EQ(hex(proto_output.v()), shouldBeV);
+    ASSERT_EQ(hex(proto_output.r()), shouldBeR);
+    ASSERT_EQ(hex(proto_output.s()), shouldBeS);
+}
+
+TEST(HarmonySigner, SignOverProtoBufAssumeMainNet) {
+    auto input = Proto::SigningInput();
+    auto trasactionMsg = input.mutable_transaction_message();
+    trasactionMsg->set_to_address(TEST_RECEIVER.string());
+    const auto privateKey =
+        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
+    auto payload = parse_hex("");
+    trasactionMsg->set_payload(payload.data(), payload.size());
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto value = store(MAIN_NET);
+    input.set_chain_id(value.data(), value.size());
+    
+    value = store(uint256_t("0xa"));
+    trasactionMsg->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t(""));
+    trasactionMsg->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x5208"));
+    trasactionMsg->set_gas_limit(value.data(), value.size());
+
+    value = store(uint256_t("0x1"));
+    trasactionMsg->set_from_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    trasactionMsg->set_to_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x4c53ecdc18a60000"));
+    trasactionMsg->set_amount(value.data(), value.size());
+
+    auto proto_output = Signer::sign(input);
+
+    auto expectEncoded = "f8690a808252080180946a87346f3ba9958d08d09484a2b7fdbbe42b0df6884c53ecdc18a"
+                         "600008026a074acbc63a58e7861e54ca24babf1cb800c5b694da25c3ae2b1543045053667"
+                         "08a0616ab8262ee6f6fb30ffcab3e9e8261479c7469ce97010a70b3d3f962842c61a";
+
+    auto v = "26";
+    auto r = "74acbc63a58e7861e54ca24babf1cb800c5b694da25c3ae2b154304505366708";
+    auto s = "616ab8262ee6f6fb30ffcab3e9e8261479c7469ce97010a70b3d3f962842c61a";
+
+    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
+    ASSERT_EQ(hex(proto_output.v()), v);
+    ASSERT_EQ(hex(proto_output.r()), r);
+    ASSERT_EQ(hex(proto_output.s()), s);
+}
+
+TEST(HarmonySigner, BuildSigningOutput) {
+    auto input = Proto::SigningInput();
+    auto trasactionMsg = input.mutable_transaction_message();
+    trasactionMsg->set_to_address(TEST_RECEIVER.string());
+    const auto privateKey =
+        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
+    auto payload = parse_hex("");
+    trasactionMsg->set_payload(payload.data(), payload.size());
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto value = store(MAIN_NET);
+    input.set_chain_id(value.data(), value.size());
+
+    value = store(uint256_t("0xa"));
+    trasactionMsg->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t(""));
+    trasactionMsg->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x5208"));
+    trasactionMsg->set_gas_limit(value.data(), value.size());
+
+    value = store(uint256_t("0x1"));
+    trasactionMsg->set_from_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    trasactionMsg->set_to_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x4c53ecdc18a60000"));
+    trasactionMsg->set_amount(value.data(), value.size());
+
+    Data signature = parse_hex("74acbc63a58e7861e54ca24babf1cb800c5b694da25c3ae2b154304505366708616ab8262ee6f6fb30ffcab3e9e8261479c7469ce97010a70b3d3f962842c61a01");
+
+    Signer signer(uint256_t(load(input.chain_id())));
+    auto proto_output = signer.buildSigningOutput(input, signature);
+
+    auto expectEncoded = "f8690a808252080180946a87346f3ba9958d08d09484a2b7fdbbe42b0df6884c53ecdc18a"
+                         "600008026a074acbc63a58e7861e54ca24babf1cb800c5b694da25c3ae2b1543045053667"
+                         "08a0616ab8262ee6f6fb30ffcab3e9e8261479c7469ce97010a70b3d3f962842c61a";
+
+    auto v = "26";
+    auto r = "74acbc63a58e7861e54ca24babf1cb800c5b694da25c3ae2b154304505366708";
+    auto s = "616ab8262ee6f6fb30ffcab3e9e8261479c7469ce97010a70b3d3f962842c61a";
+
+    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
+    ASSERT_EQ(hex(proto_output.v()), v);
+    ASSERT_EQ(hex(proto_output.r()), r);
+    ASSERT_EQ(hex(proto_output.s()), s);
+}
+
+TEST(HarmonySigner, BuildUnsignedTxBytes) {
+    auto input = Proto::SigningInput();
+    auto trasactionMsg = input.mutable_transaction_message();
+    trasactionMsg->set_to_address(TEST_RECEIVER.string());
+    const auto privateKey =
+        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
+    auto payload = parse_hex("");
+    trasactionMsg->set_payload(payload.data(), payload.size());
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto value = store(MAIN_NET);
+    input.set_chain_id(value.data(), value.size());
+
+    value = store(uint256_t("0xa"));
+    trasactionMsg->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t(""));
+    trasactionMsg->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x5208"));
+    trasactionMsg->set_gas_limit(value.data(), value.size());
+
+    value = store(uint256_t("0x1"));
+    trasactionMsg->set_from_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    trasactionMsg->set_to_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x4c53ecdc18a60000"));
+    trasactionMsg->set_amount(value.data(), value.size());
+
+    Signer signer(uint256_t(load(input.chain_id())));
+    auto unsignedTxBytes = signer.buildUnsignedTxBytes(input);
+
+    auto expectEncoded = "e90a808252080180946a87346f3ba9958d08d09484a2b7fdbbe42b0df6884c53ecdc18a6000080018080";
+
+    ASSERT_EQ(hex(unsignedTxBytes), expectEncoded);
+}
+
+TEST(HarmonySigner, BuildUnsignedStakingTxBytes) {
+    auto input = Proto::SigningInput();
+    auto stakingMsg = input.mutable_staking_message();
+    const auto privateKey =
+        PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto value = store(MAIN_NET);
+    input.set_chain_id(value.data(), value.size());
+
+    value = store(uint256_t("0xa"));
+    stakingMsg->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t(""));
+    stakingMsg->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x5208"));
+    stakingMsg->set_gas_limit(value.data(), value.size());
+
+    // delegate message
+    auto delegateMsg = stakingMsg->mutable_delegate_message();
+        delegateMsg->set_delegator_address(TEST_RECEIVER.string());
+    delegateMsg->set_validator_address(TEST_RECEIVER.string());
+
+    value = store(uint256_t("0x4c53ecdc18a60000"));
+    delegateMsg->set_amount(value.data(), value.size());
+
+    Signer signer(uint256_t(load(input.chain_id())));
+    auto unsignedTxBytes = signer.buildUnsignedTxBytes(input);
+
+    auto expectEncoded = "f83d02f3946a87346f3ba9958d08d09484a2b7fdbbe42b0df6946a87346f3ba9958d08d09484a2b7fdbbe42b0df6884c53ecdc18a600000a80825208018080";
+
+    ASSERT_EQ(hex(unsignedTxBytes), expectEncoded);
+}
+} // namespace TW::Harmony
diff --git a/tests/chains/Harmony/StakingTests.cpp b/tests/chains/Harmony/StakingTests.cpp
new file mode 100644
index 00000000000..bbcce90bb7d
--- /dev/null
+++ b/tests/chains/Harmony/StakingTests.cpp
@@ -0,0 +1,302 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "Coin.h"
+#include "HDWallet.h"
+#include "Harmony/Address.h"
+#include "Harmony/Signer.h"
+#include "HexCoding.h"
+#include "proto/Harmony.pb.h"
+
+#include <TrustWalletCore/TWHRP.h>
+#include <gtest/gtest.h>
+
+namespace TW::Harmony {
+
+static Address TEST_ACCOUNT;
+static bool testAccountDecodeResult =
+    Address::decode("one1a0x3d6xpmr6f8wsyaxd9v36pytvp48zckswvv9", TEST_ACCOUNT);
+
+static auto PRIVATE_KEY =
+    PrivateKey(parse_hex("4edef2c24995d15b0e25cbd152fb0e2c05d3b79b9c2afd134e6f59f91bf99e48"));
+
+TEST(HarmonyStaking, SignCreateValidator) {
+    auto input = Proto::SigningInput();
+    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
+
+    auto value = store(uint256_t("0x2"));
+    input.set_chain_id(value.data(), value.size());
+
+    auto stakingMessage = input.mutable_staking_message();
+    auto createValidatorMsg = stakingMessage->mutable_create_validator_message();
+
+    createValidatorMsg->set_validator_address(TEST_ACCOUNT.string());
+
+    auto description = createValidatorMsg->mutable_description();
+    description->set_name("Alice");
+    description->set_identity("alice");
+    description->set_website("alice.harmony.one");
+    description->set_security_contact("Bob");
+    description->set_details("Don't mess with me!!!");
+    auto commission = createValidatorMsg->mutable_commission_rates();
+
+    // (value, precision): (1, 1) represents 0.1
+    value = store(uint256_t("1"));
+    commission->mutable_rate()->set_value(value.data(), value.size());
+    value = store(uint256_t("1"));
+    commission->mutable_rate()->set_precision(value.data(), value.size());
+
+    // (value, precision): (9, 1) represents 0.9
+    value = store(uint256_t("9"));
+    commission->mutable_max_rate()->set_value(value.data(), value.size());
+    value = store(uint256_t("1"));
+    commission->mutable_max_rate()->set_precision(value.data(), value.size());
+
+    // (value, precision): (5, 2) represents 0.05
+    value = store(uint256_t("5"));
+    commission->mutable_max_change_rate()->set_value(value.data(), value.size());
+    value = store(uint256_t("2"));
+    commission->mutable_max_change_rate()->set_precision(value.data(), value.size());
+
+    value = store(uint256_t("10"));
+    createValidatorMsg->set_min_self_delegation(value.data(), value.size());
+
+    value = store(uint256_t("3000"));
+    createValidatorMsg->set_max_total_delegation(value.data(), value.size());
+
+    value = parse_hex("b9486167ab9087ab818dc4ce026edb5bf216863364c32e42df"
+                      "2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611");
+    createValidatorMsg->add_slot_pub_keys(value.data(), value.size());
+
+    value = parse_hex("4252b0f1210efb0d5061e8a706a7ea9d62292a7947a975472f"
+                      "b77e1af7278a1c3c2e6eeba73c0581ece398613829940df129"
+                      "f3071c9a24b4b448bb1e880dc5872a58cb07eed94294c4e01a"
+                      "5c864771cafef7b96be541cb3c521a98f01838dd94");
+    createValidatorMsg->add_slot_key_sigs(value.data(), value.size());
+
+    value = store(uint256_t("100"));
+    createValidatorMsg->set_amount(value.data(), value.size());
+
+    value = store(uint256_t("0x02"));
+    stakingMessage->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    stakingMessage->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x64"));
+    stakingMessage->set_gas_limit(value.data(), value.size());
+
+    auto proto_output = Signer::sign(input);
+
+    auto expectEncoded =
+            "f9015280f9010894ebcd16e8c1d8f493ba04e99a56474122d81a9c58f83885416c69636585616c696365916"
+            "16c6963652e6861726d6f6e792e6f6e6583426f6295446f6e2774206d6573732077697468206d65212121dd"
+            "c988016345785d8a0000c9880c7d713b49da0000c887b1a2bc2ec500000a820bb8f1b0b9486167ab9087ab8"
+            "18dc4ce026edb5bf216863364c32e42df2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611f862b860"
+            "4252b0f1210efb0d5061e8a706a7ea9d62292a7947a975472fb77e1af7278a1c3c2e6eeba73c0581ece3986"
+            "13829940df129f3071c9a24b4b448bb1e880dc5872a58cb07eed94294c4e01a5c864771cafef7b96be541cb"
+            "3c521a98f01838dd946402806428a00d8437f81be3481b01542e9baef0445f3758cf084c5e1fba93d087ccc"
+            "e084cb1a0404c1a42442c2d39f84582353a1c67012451ff83ef6d3622f684041df9bf0072";
+
+    auto v = "28";
+    auto r = "0d8437f81be3481b01542e9baef0445f3758cf084c5e1fba93d087ccce084cb1";
+    auto s = "404c1a42442c2d39f84582353a1c67012451ff83ef6d3622f684041df9bf0072";
+
+    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
+    ASSERT_EQ(hex(proto_output.v()), v);
+    ASSERT_EQ(hex(proto_output.r()), r);
+    ASSERT_EQ(hex(proto_output.s()), s);
+}
+
+TEST(HarmonyStaking, SignEditValidator) {
+    auto input = Proto::SigningInput();
+    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
+
+    auto value = store(uint256_t("0x2"));
+    input.set_chain_id(value.data(), value.size());
+
+    auto stakingMessage = input.mutable_staking_message();
+    auto editValidatorMsg = stakingMessage->mutable_edit_validator_message();
+
+    editValidatorMsg->set_validator_address(TEST_ACCOUNT.string());
+
+    auto description = editValidatorMsg->mutable_description();
+    description->set_name("Alice");
+    description->set_identity("alice");
+    description->set_website("alice.harmony.one");
+    description->set_security_contact("Bob");
+    description->set_details("Don't mess with me!!!");
+
+    auto commissionRate = editValidatorMsg->mutable_commission_rate();
+
+    // (value, precision): (1, 1) represents 0.1
+    value = store(uint256_t("1"));
+    commissionRate->set_value(value.data(), value.size());
+    value = store(uint256_t("1"));
+    commissionRate->set_precision(value.data(), value.size());
+
+    value = store(uint256_t("10"));
+    editValidatorMsg->set_min_self_delegation(value.data(), value.size());
+
+    value = store(uint256_t("3000"));
+    editValidatorMsg->set_max_total_delegation(value.data(), value.size());
+
+    value = parse_hex("b9486167ab9087ab818dc4ce026edb5bf216863364c32e42df"
+                      "2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611");
+    editValidatorMsg->set_slot_key_to_remove(value.data(), value.size());
+    editValidatorMsg->set_slot_key_to_add(value.data(), value.size());
+
+    value = parse_hex("4252b0f1210efb0d5061e8a706a7ea9d62292a7947a975472f"
+                      "b77e1af7278a1c3c2e6eeba73c0581ece398613829940df129"
+                      "f3071c9a24b4b448bb1e880dc5872a58cb07eed94294c4e01a"
+                      "5c864771cafef7b96be541cb3c521a98f01838dd94");
+    editValidatorMsg->set_slot_key_to_add_sig(value.data(), value.size());
+
+    value = store(uint256_t("1"));
+    editValidatorMsg->set_active(value.data(), value.size());
+
+    value = store(uint256_t("0x02"));
+    stakingMessage->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    stakingMessage->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x64")); // 0x5208
+    stakingMessage->set_gas_limit(value.data(), value.size());
+
+    auto proto_output = Signer::sign(input);
+
+    auto expectEncoded =
+        "f9016c01f9012294ebcd16e8c1d8f493ba04e99a56474122d81a9c58f83885416c69636585616c69636591616c6963652e6861726d6f6e792e6f6e6583426f6295446f6e2774206d6573732077697468206d65212121c988016345785d8a00000a820bb8b0b9486167ab9087ab818dc4ce026edb5bf216863364c32e42df2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611b0b9486167ab9087ab818dc4ce026edb5bf216863364c32e42df2af03c5ced1ad181e7d12f0e6dd5307a73b62247608611b8604252b0f1210efb0d5061e8a706a7ea9d62292a7947a975472fb77e1af7278a1c3c2e6eeba73c0581ece398613829940df129f3071c9a24b4b448bb1e880dc5872a58cb07eed94294c4e01a5c864771cafef7b96be541cb3c521a98f01838dd940102806427a089d6f87855619c31e933d5f00638ca58737dfffdfdf8b66a048a2e45f103e05da04aafc5c51a95412760c089371b411a5ab8f235b456291a9754d544b162df4eef";
+
+    auto v = "27";
+    auto r = "89d6f87855619c31e933d5f00638ca58737dfffdfdf8b66a048a2e45f103e05d";
+    auto s = "4aafc5c51a95412760c089371b411a5ab8f235b456291a9754d544b162df4eef";
+
+    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
+    ASSERT_EQ(hex(proto_output.v()), v);
+    ASSERT_EQ(hex(proto_output.r()), r);
+    ASSERT_EQ(hex(proto_output.s()), s);
+}
+
+TEST(HarmonyStaking, SignDelegate) {
+    auto input = Proto::SigningInput();
+    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
+
+    auto value = store(uint256_t("0x2"));
+    input.set_chain_id(value.data(), value.size());
+
+    auto stakingMessage = input.mutable_staking_message();
+    auto delegateMsg = stakingMessage->mutable_delegate_message();
+    delegateMsg->set_delegator_address(TEST_ACCOUNT.string());
+    delegateMsg->set_validator_address(TEST_ACCOUNT.string());
+
+    value = store(uint256_t("0xa"));
+    delegateMsg->set_amount(value.data(), value.size());
+
+    value = store(uint256_t("0x02"));
+    stakingMessage->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    stakingMessage->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x64"));
+    stakingMessage->set_gas_limit(value.data(), value.size());
+
+    auto proto_output = Signer::sign(input);
+
+    auto expectEncoded =
+        "f87302eb94ebcd16e8c1d8f493ba04e99a56474122d81a9c5894ebcd16e8c1d8f493ba04e99a56474122d81a"
+        "9c580a02806428a0ada9a8fb49eb3cd74f0f861e16bc1f1d56a0c6e3c25b0391f9e07a7963317e80a05c28dbc4"
+        "1763dc2391263e1aae30f842f90734d7ec68cee2352af0d4b0662b54";
+
+    auto v = "28";
+    auto r = "ada9a8fb49eb3cd74f0f861e16bc1f1d56a0c6e3c25b0391f9e07a7963317e80";
+    auto s = "5c28dbc41763dc2391263e1aae30f842f90734d7ec68cee2352af0d4b0662b54";
+
+    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
+    ASSERT_EQ(hex(proto_output.v()), v);
+    ASSERT_EQ(hex(proto_output.r()), r);
+    ASSERT_EQ(hex(proto_output.s()), s);
+}
+
+TEST(HarmonyStaking, SignUndelegate) {
+    auto input = Proto::SigningInput();
+    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
+
+    auto value = store(uint256_t("0x2"));
+    input.set_chain_id(value.data(), value.size());
+
+    auto stakingMessage = input.mutable_staking_message();
+    auto undelegateMsg = stakingMessage->mutable_undelegate_message();
+    undelegateMsg->set_delegator_address(TEST_ACCOUNT.string());
+    undelegateMsg->set_validator_address(TEST_ACCOUNT.string());
+
+    value = store(uint256_t("0xa"));
+    undelegateMsg->set_amount(value.data(), value.size());
+
+    value = store(uint256_t("0x02"));
+    stakingMessage->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    stakingMessage->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x64"));
+    stakingMessage->set_gas_limit(value.data(), value.size());
+
+    auto proto_output = Signer::sign(input);
+
+    auto expectEncoded =
+        "f87303eb94ebcd16e8c1d8f493ba04e99a56474122d81a9c5894ebcd16e8c1d8f493ba04e99a56474122d81a9c"
+        "580a02806428a05bf8c653567defe2c3728732bc9d67dd099a977df91c740a883fd89e03abb6e2a05202c4b516"
+        "52d5144c6a30d14d1a7a316b5a4a6b49be985b4bc6980e49f7acb7";
+
+    auto v = "28";
+    auto r = "5bf8c653567defe2c3728732bc9d67dd099a977df91c740a883fd89e03abb6e2";
+    auto s = "5202c4b51652d5144c6a30d14d1a7a316b5a4a6b49be985b4bc6980e49f7acb7";
+
+    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
+    ASSERT_EQ(hex(proto_output.v()), v);
+    ASSERT_EQ(hex(proto_output.r()), r);
+    ASSERT_EQ(hex(proto_output.s()), s);
+}
+
+TEST(HarmonyStaking, SignCollectRewards) {
+    auto input = Proto::SigningInput();
+    input.set_private_key(PRIVATE_KEY.bytes.data(), PRIVATE_KEY.bytes.size());
+
+    auto value = store(uint256_t("0x2"));
+    input.set_chain_id(value.data(), value.size());
+
+    auto stakingMessage = input.mutable_staking_message();
+    auto collectRewardsMsg = stakingMessage->mutable_collect_rewards();
+    collectRewardsMsg->set_delegator_address(TEST_ACCOUNT.string());
+
+    value = store(uint256_t("0x02"));
+    stakingMessage->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    stakingMessage->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x64"));
+    stakingMessage->set_gas_limit(value.data(), value.size());
+
+    auto proto_output = Signer::sign(input);
+
+    auto expectEncoded = "f85d04d594ebcd16e8c1d8f493ba04e99a56474122d81a9c5802806428a04c15c72f425"
+                         "77001083a9c7ff9d9724077aec704a524e53dc7c9afe97ca4e625a055c13ea17c3efd1cd9"
+                         "1f2988c7e7673950bac5a08c174f2d0af27a82039f1e3d";
+
+    auto v = "28";
+    auto r = "4c15c72f42577001083a9c7ff9d9724077aec704a524e53dc7c9afe97ca4e625";
+    auto s = "55c13ea17c3efd1cd91f2988c7e7673950bac5a08c174f2d0af27a82039f1e3d";
+
+    ASSERT_EQ(hex(proto_output.encoded()), expectEncoded);
+    ASSERT_EQ(hex(proto_output.v()), v);
+    ASSERT_EQ(hex(proto_output.r()), r);
+    ASSERT_EQ(hex(proto_output.s()), s);
+}
+
+} // namespace TW::Harmony
diff --git a/tests/chains/Harmony/TWAnyAddressTests.cpp b/tests/chains/Harmony/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..70cd48bfa18
--- /dev/null
+++ b/tests/chains/Harmony/TWAnyAddressTests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <gtest/gtest.h>
+
+TEST(HarmonyAnyAddress, Harmony) {
+    auto string = STRING("one1c8dpswxg2p50znzecnq0peuxlxtcm9je7q7yje");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeHarmony));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "c1da1838c85068f14c59c4c0f0e786f9978d9659");
+}
diff --git a/tests/chains/Harmony/TWAnySignerTests.cpp b/tests/chains/Harmony/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..24c722b2646
--- /dev/null
+++ b/tests/chains/Harmony/TWAnySignerTests.cpp
@@ -0,0 +1,75 @@
+
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Harmony.pb.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Harmony::tests {
+
+static auto TEST_RECEIVER = "one129r9pj3sk0re76f7zs3qz92rggmdgjhtwge62k";
+
+static uint256_t LOCAL_NET = 0x2;
+
+TEST(TWAnySignerHarmony, Sign) {
+    Proto::SigningInput input;
+
+    auto transactionMessage = input.mutable_transaction_message();
+    transactionMessage->set_to_address(TEST_RECEIVER);
+    const auto privateKey = parse_hex("4edef2c24995d15b0e25cbd152fb0e2c05d3b79b9c2afd134e6f59f91bf99e48");
+
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    auto value = store(LOCAL_NET);
+    input.set_chain_id(value.data(), value.size());
+
+    value = store(uint256_t("0x1"));
+    transactionMessage->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t(""));
+    transactionMessage->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t("0x5208"));
+    transactionMessage->set_gas_limit(value.data(), value.size());
+
+    value = store(uint256_t("0x1"));
+    transactionMessage->set_from_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    transactionMessage->set_to_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x6bfc8da5ee8220000"));
+    transactionMessage->set_amount(value.data(), value.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeHarmony);
+
+    auto shouldBeV = "28";
+    auto shouldBeR = "84cc200aab11f5e1b2f7ece0d56ec67385ac50cefb6e3dc2a2f3e036ed575a5c";
+    auto shouldBeS = "643f18005b790cac8d8e7dc90e6147df0b83874b52db198864694ea28a79e6fc";
+
+    ASSERT_EQ(hex(output.v()), shouldBeV);
+    ASSERT_EQ(hex(output.r()), shouldBeR);
+    ASSERT_EQ(hex(output.s()), shouldBeS);
+
+    ASSERT_EQ(hex(output.encoded()), "f86a0180825208018094514650ca30b3c79f693e14220115434236d44aeb8906bfc8da5ee82200008028a084cc200aab11f5e1b2f7ece0d56ec67385ac50cefb6e3dc2a2f3e036ed575a5ca0643f18005b790cac8d8e7dc90e6147df0b83874b52db198864694ea28a79e6fc");
+}
+
+TEST(TWAnySignerHarmony, SignJSON) {
+    auto json = STRING(R"({"chainId":"Ag==","transactionMessage":{"nonce":"AQ==","gasPrice":"AA==","gasLimit":"Ugg=","toAddress":"one129r9pj3sk0re76f7zs3qz92rggmdgjhtwge62k","amount":"Br/I2l7oIgAA","fromShardId":"AQ==","toShardId":"AA=="}})");
+    auto key = DATA("4edef2c24995d15b0e25cbd152fb0e2c05d3b79b9c2afd134e6f59f91bf99e48");
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeHarmony));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeHarmony));
+    assertStringsEqual(result, "f86a0180825208018094514650ca30b3c79f693e14220115434236d44aeb8906bfc8da5ee82200008028a084cc200aab11f5e1b2f7ece0d56ec67385ac50cefb6e3dc2a2f3e036ed575a5ca0643f18005b790cac8d8e7dc90e6147df0b83874b52db198864694ea28a79e6fc");
+}
+
+} // namespace TW::Harmony::tests
diff --git a/tests/chains/Harmony/TWCoinTypeTests.cpp b/tests/chains/Harmony/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..66cb9c51292
--- /dev/null
+++ b/tests/chains/Harmony/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWHarmonyCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeHarmony));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeHarmony, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeHarmony, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeHarmony));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeHarmony));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeHarmony), 18);
+    ASSERT_EQ(TWBlockchainHarmony, TWCoinTypeBlockchain(TWCoinTypeHarmony));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeHarmony));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeHarmony));
+    assertStringsEqual(symbol, "ONE");
+    assertStringsEqual(txUrl, "https://explorer.harmony.one/#/tx/t123");
+    assertStringsEqual(accUrl, "https://explorer.harmony.one/#/address/a12");
+    assertStringsEqual(id, "harmony");
+    assertStringsEqual(name, "Harmony");
+}
diff --git a/tests/Harmony/TWHarmonyStakingTests.cpp b/tests/chains/Harmony/TWHarmonyStakingTests.cpp
similarity index 98%
rename from tests/Harmony/TWHarmonyStakingTests.cpp
rename to tests/chains/Harmony/TWHarmonyStakingTests.cpp
index 9492225f7a7..5c0283c81f0 100644
--- a/tests/Harmony/TWHarmonyStakingTests.cpp
+++ b/tests/chains/Harmony/TWHarmonyStakingTests.cpp
@@ -1,15 +1,13 @@
 
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Data.h"
 #include "Harmony/Staking.h"
 #include "HexCoding.h"
 #include "PrivateKey.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include "proto/Harmony.pb.h"
 #include "uint256.h"
 #include <TrustWalletCore/TWAnySigner.h>
diff --git a/tests/chains/Harmony/TransactionCompilerTests.cpp b/tests/chains/Harmony/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..5cc34ad9765
--- /dev/null
+++ b/tests/chains/Harmony/TransactionCompilerTests.cpp
@@ -0,0 +1,120 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "uint256.h"
+
+#include "proto/Harmony.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(HarmonyCompiler, CompileWithSignatures) {
+    // txHash 0x238c0db5f139422d64d12b3d5208243b4b355bfb87024cec7795660291a628d0 on https://explorer.ps.hmny.io/
+    /// Step 1: Prepare transaction input (protobuf)
+    auto coin = TWCoinTypeHarmony;
+    auto input = TW::Harmony::Proto::SigningInput();
+    auto trasactionMsg = input.mutable_transaction_message();
+    auto receiver = "one1y563nrrtcpu7874cry68ehxwrpteyhp0sztlym";
+    trasactionMsg->set_to_address(receiver);
+    auto payload = parse_hex("");
+    trasactionMsg->set_payload(payload.data(), payload.size());
+
+    uint256_t MAIN_NET = 0x4;
+    auto value = store(MAIN_NET);
+    input.set_chain_id(value.data(), value.size());
+
+    value = store(uint256_t(0));
+    trasactionMsg->set_nonce(value.data(), value.size());
+
+    value = store(uint256_t(1000000000000000));
+    trasactionMsg->set_gas_price(value.data(), value.size());
+
+    value = store(uint256_t(1000000));
+    trasactionMsg->set_gas_limit(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    trasactionMsg->set_from_shard_id(value.data(), value.size());
+
+    value = store(uint256_t("0x0"));
+    trasactionMsg->set_to_shard_id(value.data(), value.size());
+
+    value = store(uint256_t(10));
+    trasactionMsg->set_amount(value.data(), value.size());
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = data(preSigningOutput.data());
+    auto preImageHash = data(preSigningOutput.data_hash());
+
+    std::string expectedPreImage = "e98087038d7ea4c68000830f42408080942535198c6bc079e3fab819347cdcce1857925c2f0a80048080";
+    std::string expectedPreImageHash = "fd1be8579542dc60f15a6218887cc1b42945bf04b50205d15ad7df8b5fac5714";
+    ASSERT_EQ(hex(preImage), expectedPreImage);
+    ASSERT_EQ(hex(preImageHash), expectedPreImageHash);
+
+    const auto privateKey = PrivateKey(parse_hex("b578822c5c718e510f67a9e291e9c6efdaf753f406020f55223b940e1ddb282e"));
+    Data signature = parse_hex("43824f50bf4b16ebe1020114de16e3579bdb5f3dcaa26117de87a73b5414b72550506609fd60e3cb565b1f9bae0952d37f3a6c6be262380f7f18cbda5216f34300");
+    const PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, preImageHash));
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKey.bytes});
+    const auto ExpectedTx =
+        "f8698087038d7ea4c68000830f42408080942535198c6bc079e3fab819347cdcce1857925c2f0a802ba043824f50bf4b16ebe1020114de16e3579bdb5f3dcaa26117de87a73b5414b725a050506609fd60e3cb565b1f9bae0952d37f3a6c6be262380f7f18cbda5216f343";
+    {
+        TW::Harmony::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::Harmony::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::Harmony::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKey.bytes});
+        Harmony::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {}, {});
+        Harmony::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
diff --git a/tests/chains/Hedera/AddressTests.cpp b/tests/chains/Hedera/AddressTests.cpp
new file mode 100644
index 00000000000..4065b5164b2
--- /dev/null
+++ b/tests/chains/Hedera/AddressTests.cpp
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Hedera/Address.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+#include <vector>
+
+namespace TW::Hedera::tests {
+
+TEST(HederaAddress, FromStandardArgument) {
+    {
+        // 0.0.1377988
+        Address addr(0uL, 0uL, 1'377'988uL);
+        ASSERT_EQ(addr.shard(), 0uL);
+        ASSERT_EQ(addr.realm(), 0uL);
+        ASSERT_EQ(addr.num(), 1'377'988uL);
+        ASSERT_EQ(addr.string(), "0.0.1377988");
+        ASSERT_TRUE(addr.isValid(addr.string()));
+    }
+
+    {
+        // 0.0.302a300506032b65700321007df3e1ab790b28de4706d36a7aa99a0e043cb3e2c3d6ec6686e4af7f638b0860
+        // https://github.com/hashgraph/hedera-sdk-rust/blob/c1c10d5750552e6bb857132cc824c430bd890a6b/sdk/rust/src/key/public_key/mod.rs#L306
+        auto pubkey = PublicKey(parse_hex("7df3e1ab790b28de4706d36a7aa99a0e043cb3e2c3d6ec6686e4af7f638b0860"), TWPublicKeyTypeED25519);
+        Address addr(0uL, 0uL, 0uL, pubkey);
+        ASSERT_EQ(addr.shard(), 0uL);
+        ASSERT_EQ(addr.realm(), 0uL);
+        ASSERT_EQ(addr.num(), 0uL);
+        ASSERT_EQ(addr.alias().string(), "302a300506032b65700321007df3e1ab790b28de4706d36a7aa99a0e043cb3e2c3d6ec6686e4af7f638b0860");
+        ASSERT_EQ(addr.string(), "0.0.302a300506032b65700321007df3e1ab790b28de4706d36a7aa99a0e043cb3e2c3d6ec6686e4af7f638b0860");
+        ASSERT_TRUE(addr.isValid(addr.string()));
+    }
+}
+
+TEST(HederaAddress, Valid) {
+    ASSERT_FALSE(Address::isValid("invalid"));
+    ASSERT_FALSE(Address::isValid("302a300506032b65700321007df3e1ab790b28de4706d36a7aa99a0e043cb3e2c3d6ec6686e4af7f638b0860"));
+    ASSERT_FALSE(Address::isValid("0.0.abc"));
+    ASSERT_TRUE(Address::isValid("0.0.1"));
+    ASSERT_TRUE(Address::isValid("0.0.1377988"));
+    ASSERT_TRUE(Address::isValid("0.0.302a300506032b65700321007df3e1ab790b28de4706d36a7aa99a0e043cb3e2c3d6ec6686e4af7f638b0860"));
+}
+
+TEST(HederaAddress, FromString) {
+    auto address = Address("0.0.1377988");
+    ASSERT_EQ(address.string(), "0.0.1377988");
+}
+
+} // namespace TW::Hedera::tests
diff --git a/tests/chains/Hedera/SignerTests.cpp b/tests/chains/Hedera/SignerTests.cpp
new file mode 100644
index 00000000000..b1b4220226a
--- /dev/null
+++ b/tests/chains/Hedera/SignerTests.cpp
@@ -0,0 +1,236 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Hedera/Address.h"
+#include "Hedera/Protobuf/basic_types.pb.h"
+#include "Hedera/Protobuf/crypto_transfer.pb.h"
+#include "Hedera/Protobuf/transaction_body.pb.h"
+#include "Hedera/Signer.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Hedera::tests {
+
+TEST(HederaSigner, Sign) {
+    // Successfully broadcasted: https://hashscan.io/testnet/transaction/0.0.48694347-1667222879-749068449?t=1667222891.440398729&p=1
+    Proto::SigningInput input;
+    auto privateKey = PrivateKey(parse_hex("e87a5584c0173263e138db689fdb2a7389025aaae7cb1a18a1017d76012130e8"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    auto* body = input.mutable_body();
+
+    *body->mutable_memo() = "";
+    *body->mutable_nodeaccountid() = "0.0.9";
+    body->set_transactionfee(100000000);
+    body->set_transactionvalidduration(120);
+    auto* transferMsg = body->mutable_transfer();
+    transferMsg->set_from("0.0.48694347");
+    transferMsg->set_to("0.0.48462050");
+    transferMsg->set_amount(100000000);
+
+    auto* transactionID = body->mutable_transactionid();
+    transactionID->mutable_transactionvalidstart()->set_seconds(1667222879);
+    transactionID->mutable_transactionvalidstart()->set_nanos(749068449);
+    transactionID->set_accountid("0.0.48694347");
+
+    auto result = Signer::sign(input);
+    ASSERT_EQ(hex(result.encoded()), "0a440a150a0c08df9aff9a0610a1c197e502120518cb889c17120218091880c2d72f22020878721e0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f12660a640a205d3a70d08b2beafb72c7a68986b3ff819a306078b8c359d739e4966e82e6d40e1a40612589c3b15f1e3ed6084b5a3a5b1b81751578cac8d6c922f31731b3982a5bac80a22558b2197276f5bae49b62503a4d39448ceddbc5ef3ba9bee4c0f302f70c");
+}
+
+TEST(HederaSigner, SignWithMemo) {
+    // Successfully broadcasted: https://hashscan.io/testnet/transaction/0.0.48694347-1667227300-854561449?t=1667227312.554926003
+    Proto::SigningInput input;
+    auto privateKey = PrivateKey(parse_hex("e87a5584c0173263e138db689fdb2a7389025aaae7cb1a18a1017d76012130e8"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    auto* body = input.mutable_body();
+
+    *body->mutable_memo() = "wallet core";
+    *body->mutable_nodeaccountid() = "0.0.7";
+    body->set_transactionfee(100000000);
+    body->set_transactionvalidduration(120);
+    auto* transferMsg = body->mutable_transfer();
+    transferMsg->set_from("0.0.48694347");
+    transferMsg->set_to("0.0.48462050");
+    transferMsg->set_amount(100000000);
+
+    auto* transactionID = body->mutable_transactionid();
+    transactionID->mutable_transactionvalidstart()->set_seconds(1667227300);
+    transactionID->mutable_transactionvalidstart()->set_nanos(854561449);
+    transactionID->set_accountid("0.0.48694347");
+
+    auto result = Signer::sign(input);
+    ASSERT_EQ(hex(result.encoded()), "0a510a150a0c08a4bdff9a0610a9a5be9703120518cb889c17120218071880c2d72f22020878320b77616c6c657420636f7265721e0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f12660a640a205d3a70d08b2beafb72c7a68986b3ff819a306078b8c359d739e4966e82e6d40e1a40ee1764c9acf79b68a675c1a78c8c43cb7d136f5f230b48b44992ad3e7ba87a8256758b823120a76142e58b94f082a0551000cf68cd3336fc4393c6b2191d8603");
+}
+
+TEST(HederaSigner, SignWithMemoMainnet) {
+    // Successfully broadcasted: https://hashscan.io/mainnet/transaction/0.0.1377988-1667566445-926176449?t=1667566457.533804616
+    Proto::SigningInput input;
+    auto privateKey = PrivateKey(parse_hex("650c5120cbdc6244e3d10001eb27eea4dd3f80c331b3b6969fa434797d4edd50"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    auto* body = input.mutable_body();
+
+    *body->mutable_memo() = "wallet core";
+    *body->mutable_nodeaccountid() = "0.0.12";
+    body->set_transactionfee(100000000);
+    body->set_transactionvalidduration(120);
+    auto* transferMsg = body->mutable_transfer();
+    transferMsg->set_from("0.0.1377988");
+    transferMsg->set_to("0.0.19783");
+    transferMsg->set_amount(100000000);
+
+    auto* transactionID = body->mutable_transactionid();
+    transactionID->mutable_transactionvalidstart()->set_seconds(1667566445);
+    transactionID->mutable_transactionvalidstart()->set_nanos(926176449);
+    transactionID->set_accountid("0.0.1377988");
+
+    auto result = Signer::sign(input);
+    ASSERT_EQ(hex(result.encoded()), "0a4e0a140a0c08ed96949b0610c1a9d1b903120418c48d541202180c1880c2d72f22020878320b77616c6c657420636f7265721c0a1a0a0b0a0418c79a01108084af5f0a0b0a0418c48d5410ff83af5f12660a640a207df3e1ab790b28de4706d36a7aa99a0e043cb3e2c3d6ec6686e4af7f638b08601a4020a527f81c10a256b089fb2fbe2a1fc5917e0d221c0d06b8bb9095a6b26390634610f2034b99025ad70db4d84e08751841c2a70651220e32d1213a4b05ec9906");
+}
+
+TEST(HederaSigner, ProtoTestsTransferList) {
+    auto transferList = proto::TransferList();
+    auto* to = transferList.add_accountamounts();
+    to->set_amount(100000000);
+    auto accountIdTo = to->mutable_accountid();
+    accountIdTo->set_shardnum(0);
+    accountIdTo->set_realmnum(0);
+    accountIdTo->set_accountnum(48462050);
+
+    auto encoded = hex(transferList.SerializeAsString());
+    ASSERT_EQ(encoded, "0a0c0a0518e2f18d17108084af5f");
+}
+
+TEST(HederaSigner, ProtoTestsDoubleTransferList) {
+    auto transferList = proto::TransferList();
+
+    {
+        auto* to = transferList.add_accountamounts();
+        to->set_amount(100000000);
+        auto* accountIdTo = to->mutable_accountid();
+        accountIdTo->set_shardnum(0);
+        accountIdTo->set_realmnum(0);
+        accountIdTo->set_accountnum(48462050);
+    }
+
+    {
+        auto* from = transferList.add_accountamounts();
+        from->set_amount(-100000000);
+        auto* accountIdFrom = from->mutable_accountid();
+        accountIdFrom->set_shardnum(0);
+        accountIdFrom->set_realmnum(0);
+        accountIdFrom->set_accountnum(48694347);
+    }
+
+    auto encoded = hex(transferList.SerializeAsString());
+    ASSERT_EQ(encoded, "0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f");
+}
+
+TEST(HederaSigner, ProtoTestsCryptoTransfer) {
+    auto transferList = proto::TransferList();
+
+    {
+        auto* to = transferList.add_accountamounts();
+        to->set_amount(100000000);
+        auto* accountIdTo = to->mutable_accountid();
+        accountIdTo->set_shardnum(0);
+        accountIdTo->set_realmnum(0);
+        accountIdTo->set_accountnum(48462050);
+    }
+
+    {
+        auto* from = transferList.add_accountamounts();
+        from->set_amount(-100000000);
+        auto* accountIdFrom = from->mutable_accountid();
+        accountIdFrom->set_shardnum(0);
+        accountIdFrom->set_realmnum(0);
+        accountIdFrom->set_accountnum(48694347);
+    }
+
+    auto cryptoTransfer = proto::CryptoTransferTransactionBody();
+    *cryptoTransfer.mutable_transfers() = transferList;
+
+    auto encoded = hex(cryptoTransfer.SerializeAsString());
+    ASSERT_EQ(encoded, "0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f");
+}
+
+TEST(HederaSigner, ProtoTestsTransactionBody) {
+    auto transferList = proto::TransferList();
+
+    {
+        auto* to = transferList.add_accountamounts();
+        to->set_amount(100000000);
+        auto* accountIdTo = to->mutable_accountid();
+        accountIdTo->set_shardnum(0);
+        accountIdTo->set_realmnum(0);
+        accountIdTo->set_accountnum(48462050);
+    }
+
+    {
+        auto* from = transferList.add_accountamounts();
+        from->set_amount(-100000000);
+        auto* accountIdFrom = from->mutable_accountid();
+        accountIdFrom->set_shardnum(0);
+        accountIdFrom->set_realmnum(0);
+        accountIdFrom->set_accountnum(48694347);
+    }
+
+    auto cryptoTransfer = proto::CryptoTransferTransactionBody();
+    *cryptoTransfer.mutable_transfers() = transferList;
+
+    auto transactionBody = proto::TransactionBody();
+    *transactionBody.mutable_cryptotransfer() = cryptoTransfer;
+    transactionBody.set_transactionfee(100000000);
+    transactionBody.mutable_nodeaccountid()->set_accountnum(9);
+    transactionBody.mutable_transactionvalidduration()->set_seconds(120);
+    auto& transactionID = *transactionBody.mutable_transactionid();
+    transactionID.mutable_accountid()->set_accountnum(48694347);
+    transactionID.mutable_transactionvalidstart()->set_nanos(749068449);
+    transactionID.mutable_transactionvalidstart()->set_seconds(1667222879);
+
+    auto encoded = hex(transactionBody.SerializeAsString());
+
+    ASSERT_EQ(encoded, "0a150a0c08df9aff9a0610a1c197e502120518cb889c17120218091880c2d72f22020878721e0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f");
+}
+
+TEST(HederaSigner, ProtoTestsTransactionBodyWithMemo) {
+    auto transferList = proto::TransferList();
+    {
+        auto* to = transferList.add_accountamounts();
+        to->set_amount(100000000);
+        auto* accountIdTo = to->mutable_accountid();
+        accountIdTo->set_shardnum(0);
+        accountIdTo->set_realmnum(0);
+        accountIdTo->set_accountnum(48462050);
+    }
+
+    {
+        auto* from = transferList.add_accountamounts();
+        from->set_amount(-100000000);
+        auto* accountIdFrom = from->mutable_accountid();
+        accountIdFrom->set_shardnum(0);
+        accountIdFrom->set_realmnum(0);
+        accountIdFrom->set_accountnum(48694347);
+    }
+
+    auto cryptoTransfer = proto::CryptoTransferTransactionBody();
+    *cryptoTransfer.mutable_transfers() = transferList;
+
+    auto transactionBody = proto::TransactionBody();
+    transactionBody.set_memo("wallet core");
+    *transactionBody.mutable_cryptotransfer() = cryptoTransfer;
+    transactionBody.set_transactionfee(100000000);
+    transactionBody.mutable_nodeaccountid()->set_accountnum(3);
+    transactionBody.mutable_transactionvalidduration()->set_seconds(120);
+    auto& transactionID = *transactionBody.mutable_transactionid();
+    transactionID.mutable_accountid()->set_accountnum(48694347);
+    transactionID.mutable_transactionvalidstart()->set_nanos(942876449);
+    transactionID.mutable_transactionvalidstart()->set_seconds(1667215034);
+
+    auto encoded = hex(transactionBody.SerializeAsString());
+    ASSERT_EQ(encoded, "0a150a0c08baddfe9a0610a1ceccc103120518cb889c17120218031880c2d72f22020878320b77616c6c657420636f7265721e0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f");
+}
+
+} // namespace TW::Hedera::tests
diff --git a/tests/chains/Hedera/TWAnySignerTests.cpp b/tests/chains/Hedera/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..0e2d900604f
--- /dev/null
+++ b/tests/chains/Hedera/TWAnySignerTests.cpp
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include "Hedera/Signer.h"
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Hedera::tests {
+
+TEST(TWAnySignerHedera, Sign) {
+    // Successfully broadcasted: https://hashscan.io/testnet/transaction/0.0.48694347-1667222879-749068449?t=1667222891.440398729&p=1
+    Proto::SigningInput input;
+    auto privateKey = PrivateKey(parse_hex("e87a5584c0173263e138db689fdb2a7389025aaae7cb1a18a1017d76012130e8"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    auto* body = input.mutable_body();
+
+    *body->mutable_memo() = "";
+    *body->mutable_nodeaccountid() = "0.0.9";
+    body->set_transactionfee(100000000);
+    body->set_transactionvalidduration(120);
+    auto* transferMsg = body->mutable_transfer();
+    transferMsg->set_from("0.0.48694347");
+    transferMsg->set_to("0.0.48462050");
+    transferMsg->set_amount(100000000);
+
+    auto* transactionID = body->mutable_transactionid();
+    transactionID->mutable_transactionvalidstart()->set_seconds(1667222879);
+    transactionID->mutable_transactionvalidstart()->set_nanos(749068449);
+    transactionID->set_accountid("0.0.48694347");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeHedera);
+    ASSERT_EQ(hex(output.encoded()), "0a440a150a0c08df9aff9a0610a1c197e502120518cb889c17120218091880c2d72f22020878721e0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f12660a640a205d3a70d08b2beafb72c7a68986b3ff819a306078b8c359d739e4966e82e6d40e1a40612589c3b15f1e3ed6084b5a3a5b1b81751578cac8d6c922f31731b3982a5bac80a22558b2197276f5bae49b62503a4d39448ceddbc5ef3ba9bee4c0f302f70c");
+}
+
+}
diff --git a/tests/chains/Hedera/TWCoinTypeTests.cpp b/tests/chains/Hedera/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f3ee374a49d
--- /dev/null
+++ b/tests/chains/Hedera/TWCoinTypeTests.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWHederaCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeHedera;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0.0.19790-1666769504-858851231"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0.0.19790"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "hedera");
+    assertStringsEqual(name, "Hedera");
+    assertStringsEqual(symbol, "HBAR");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 8);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainHedera);
+    assertStringsEqual(txUrl, "https://hashscan.io/mainnet/transaction/0.0.19790-1666769504-858851231");
+    assertStringsEqual(accUrl, "https://hashscan.io/mainnet/account/0.0.19790");
+}
diff --git a/tests/chains/ICON/AddressTests.cpp b/tests/chains/ICON/AddressTests.cpp
new file mode 100644
index 00000000000..2d8229fac8f
--- /dev/null
+++ b/tests/chains/ICON/AddressTests.cpp
@@ -0,0 +1,42 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Icon/Address.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Icon::tests {
+
+TEST(IconAddress, Validation) {
+    ASSERT_TRUE(Address::isValid("cx116f042497e5f34268b1b91e742680f84cf4e9f3"));
+    ASSERT_TRUE(Address::isValid("hx116f042497e5f34268b1b91e742680f84cf4e9f3"));
+
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_FALSE(Address::isValid("dshadghasdghsadadsadjsad"));
+    ASSERT_FALSE(Address::isValid("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed"));
+}
+
+TEST(IconAddress, String) {
+    const auto address = Address("hx116f042497e5f34268b1b91e742680f84cf4e9f3");
+    ASSERT_EQ(address.string(), "hx116f042497e5f34268b1b91e742680f84cf4e9f3");
+
+    const auto address2 = Address("cx116f042497e5f34268b1b91e742680f84cf4e9f3");
+    ASSERT_EQ(address2.string(), "cx116f042497e5f34268b1b91e742680f84cf4e9f3");
+
+    EXPECT_ANY_THROW(new Address(""));
+}
+
+TEST(IconAddress, FromPrivateKey) {
+    const auto privateKey = PrivateKey(parse_hex("94d1a980d5e528067d44bf8a60d646f556e40ca71e17cd4ead2d56f89e4bd20f"));
+    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
+    const auto address = Address(publicKey, TypeAddress);
+
+    ASSERT_EQ(address.string(), "hx98c0832ca5bd8e8bf355ca9491888aa9725c2c48");
+}
+
+} // namespace TW::Icon::tests
diff --git a/tests/chains/ICON/TWAnySignerTests.cpp b/tests/chains/ICON/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..c010fe5e159
--- /dev/null
+++ b/tests/chains/ICON/TWAnySignerTests.cpp
@@ -0,0 +1,49 @@
+
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Data.h"
+#include "HexCoding.h"
+#include "proto/Icon.pb.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Icon::tests {
+
+TEST(TWAnySignerIcon, Sign) {
+    auto key = parse_hex("2d42994b2f7735bbc93a3e64381864d06747e574aa94655c516f9ad0a74eed79");
+    auto input = Proto::SigningInput();
+
+    input.set_from_address("hxbe258ceb872e08851f1f59694dac2558708ece11");
+    input.set_to_address("hx5bfdb090f43a808005ffc27c25b213145e80b7cd");
+
+    auto value = uint256_t(1000000000000000000);
+    auto valueData = store(value);
+    input.set_value(valueData.data(), valueData.size());
+
+    auto stepLimit = uint256_t("74565");
+    auto stepLimitData = store(stepLimit);
+    input.set_step_limit(stepLimitData.data(), stepLimitData.size());
+
+    auto one = uint256_t("01");
+    auto oneData = store(one);
+    input.set_network_id(oneData.data(), oneData.size());
+    input.set_nonce(oneData.data(), oneData.size());
+
+    input.set_timestamp(1516942975500598);
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeICON);
+
+    auto expected = std::string("{\"from\":\"hxbe258ceb872e08851f1f59694dac2558708ece11\",\"nid\":\"0x1\",\"nonce\":\"0x1\",\"signature\":\"xR6wKs+IA+7E91bT8966jFKlK5mayutXCvayuSMCrx9KB7670CsWa0B7LQzgsxU0GLXaovlAT2MLs1XuDiSaZQE=\",\"stepLimit\":\"0x12345\",\"timestamp\":\"0x563a6cf330136\",\"to\":\"hx5bfdb090f43a808005ffc27c25b213145e80b7cd\",\"value\":\"0xde0b6b3a7640000\",\"version\":\"0x3\"}");
+    ASSERT_EQ(output.encoded(), expected);
+}
+
+} // namespace TW::Icon::tests
diff --git a/tests/chains/ICON/TWCoinTypeTests.cpp b/tests/chains/ICON/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..cd0f6fff5a0
--- /dev/null
+++ b/tests/chains/ICON/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWICONCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeICON));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeICON, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeICON, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeICON));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeICON));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeICON), 18);
+    ASSERT_EQ(TWBlockchainIcon, TWCoinTypeBlockchain(TWCoinTypeICON));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeICON));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeICON));
+    assertStringsEqual(symbol, "ICX");
+    assertStringsEqual(txUrl, "https://tracker.icon.foundation/transaction/t123");
+    assertStringsEqual(accUrl, "https://tracker.icon.foundation/address/a12");
+    assertStringsEqual(id, "icon");
+    assertStringsEqual(name, "ICON");
+}
diff --git a/tests/chains/ICON/TransactionCompilerTests.cpp b/tests/chains/ICON/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..a47dc54d2be
--- /dev/null
+++ b/tests/chains/ICON/TransactionCompilerTests.cpp
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Icon.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include <TrustWalletCore/TWCoinType.h>
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(IconCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeICON;
+    TW::Icon::Proto::SigningInput input;
+
+    input.set_from_address("hxbe258ceb872e08851f1f59694dac2558708ece11");
+    input.set_to_address("hx5bfdb090f43a808005ffc27c25b213145e80b7cd");
+
+    auto value = uint256_t(1000000000000000000);
+    auto valueData = store(value);
+    input.set_value(valueData.data(), valueData.size());
+
+    auto stepLimit = uint256_t("74565");
+    auto stepLimitData = store(stepLimit);
+    input.set_step_limit(stepLimitData.data(), stepLimitData.size());
+
+    auto one = uint256_t("01");
+    auto oneData = store(one);
+    input.set_network_id(oneData.data(), oneData.size());
+    input.set_nonce(oneData.data(), oneData.size());
+
+    input.set_timestamp(1516942975500598);
+
+    auto protoInputString = input.SerializeAsString();
+    auto protoInputData = TW::Data(protoInputString.begin(), protoInputString.end());
+
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, protoInputData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    auto preImage = preSigningOutput.data();
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImage),"6963785f73656e645472616e73616374696f6e2e66726f6d2e6878626532353863656238373265303838353166316635393639346461633235353837303865636531312e6e69642e3078312e6e6f6e63652e3078312e737465704c696d69742e307831323334352e74696d657374616d702e3078353633613663663333303133362e746f2e6878356266646230393066343361383038303035666663323763323562323133313435653830623763642e76616c75652e30786465306236623361373634303030302e76657273696f6e2e307833");
+    EXPECT_EQ(hex(preImageHash),"f0c68a4f588233d722fff7b5a738ffa6b56ad4cb62ad6bc9fb3e5facb0c25059");
+
+    auto key = parse_hex("2d42994b2f7735bbc93a3e64381864d06747e574aa94655c516f9ad0a74eed79");
+    const auto privateKey = PrivateKey(key);
+    const auto publicKey = privateKey.getPublicKey(TWCoinTypePublicKeyType(coin));
+    const auto signature = privateKey.sign(parse_hex(hex(preImageHash)), TWCurveSECP256k1);
+
+    const Data outputData = TransactionCompiler::compileWithSignatures(coin, protoInputData, {signature}, {publicKey.bytes});
+    Icon::Proto::SigningOutput output;
+    ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(output.encoded()), "7b2266726f6d223a22687862653235386365623837326530383835316631663539363934646163323535383730386563653131222c226e6964223a22307831222c226e6f6e6365223a22307831222c227369676e6174757265223a22785236774b732b49412b374539316254383936366a464b6c4b356d61797574584376617975534d437278394b4237363730437357613042374c517a6773785530474c58616f766c4154324d4c73315875446953615a51453d222c22737465704c696d6974223a2230783132333435222c2274696d657374616d70223a22307835363361366366333330313336222c22746f223a22687835626664623039306634336138303830303566666332376332356232313331343565383062376364222c2276616c7565223a223078646530623662336137363430303030222c2276657273696f6e223a22307833227d");
+}
\ No newline at end of file
diff --git a/tests/chains/IOST/AddressTests.cpp b/tests/chains/IOST/AddressTests.cpp
new file mode 100644
index 00000000000..42c4e41de0d
--- /dev/null
+++ b/tests/chains/IOST/AddressTests.cpp
@@ -0,0 +1,66 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HDWallet.h"
+#include "HexCoding.h"
+#include "IOST/Account.h"
+#include "proto/IOST.pb.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+using namespace TW::IOST;
+
+TEST(IOSTAddress, ValidateAccount) {
+    // https://www.iostabc.com/tx/DnR4QuRDJAjUZ2qfJK9MT92p95BBub2FnyigeXn2Z1es
+    ASSERT_TRUE(Account::isValid("12345xusong"));
+    ASSERT_TRUE(Account::isValid("12345"));
+    ASSERT_TRUE(Account::isValid("1234_xuson"));
+    ASSERT_TRUE(Account::isValid("EKRQPgX7nKt8hJABwm9m3BKWGj7kcSECkJnCBauHQWin"));
+
+    ASSERT_FALSE(TW::validateAddress(TWCoinTypeIOST, "1234"));
+    ASSERT_FALSE(TW::validateAddress(TWCoinTypeIOST, "1234_xusonG"));
+    ASSERT_FALSE(TW::validateAddress(TWCoinTypeIOST, "12345xusong6"));
+    ASSERT_FALSE(TW::validateAddress(TWCoinTypeIOST, "bc1quvuarfksewfeuevuc6tn0kfyptgjvwsvrprk9d"));
+    ASSERT_FALSE(TW::validateAddress(TWCoinTypeIOST, "DJRFZNg8jkUtjcpo2zJd92FUAzwRjitw6f"));
+
+    ASSERT_EQ(TW::normalizeAddress(TWCoinTypeIOST, "EKRQPgX7nKt8hJABwm9m3BKWGj7kcSECkJnCBauHQWin"), "EKRQPgX7nKt8hJABwm9m3BKWGj7kcSECkJnCBauHQWin");
+    ASSERT_EQ(TW::normalizeAddress(TWCoinTypeIOST, "Gcv8c2tH8qZrUYnKdEEdTtASsxivic2834MQW6mgxqto"), "Gcv8c2tH8qZrUYnKdEEdTtASsxivic2834MQW6mgxqto");
+}
+
+TEST(IOSTAddress, Account) {
+    std::string key = ("63095105a37b4e896e5ebbd740e751c6f9df7cca2410beba3261dc5680299cebe"
+                       "812b52ea9ad5cba9a9af03afcc6f2942a4524b0df3c0344dc195072831670c4");
+    Data secKeyBytes = parse_hex(key);
+    std::string secKey(secKeyBytes.begin(), secKeyBytes.end());
+
+    Proto::AccountInfo ai;
+    ai.set_active_key(secKey);
+    ai.set_owner_key(secKey);
+
+    Account account(ai);
+    ASSERT_EQ(hex(account.activeKey), "63095105a37b4e896e5ebbd740e751c6f9df7cca2410beba3261dc5680299ceb");
+    EXPECT_EQ(hex(account.ownerKey), "63095105a37b4e896e5ebbd740e751c6f9df7cca2410beba3261dc5680299ceb");
+
+    auto pubKey = account.publicOwnerKey();
+    auto address = Account::address(std::string(pubKey.begin(), pubKey.end()));
+    EXPECT_EQ(address, "Gcv8c2tH8qZrUYnKdEEdTtASsxivic2834MQW6mgxqto");
+
+    EXPECT_EQ(hex(TW::addressToData(TWCoinTypeIOST, address)), "e812b52ea9ad5cba9a9af03afcc6f2942a4524b0df3c0344dc195072831670c4");
+}
+
+TEST(IOSTAddress, FromPrivateKey) {
+    auto wallet = HDWallet(
+        "shoot island position soft burden budget tooth cruel issue economy destroy above", "");
+    auto address = wallet.deriveAddress(TWCoinTypeIOST);
+    ASSERT_EQ(address, "4av8w81EyzUgHonsVWqfs15WM4Vrpgox4BYYQWhNQDVu");
+}
+
+TEST(IOSTAddress, EqualOperator) {
+    auto acnt1 = Account("account1");
+    auto acnt2 = Account("account2");
+    ASSERT_TRUE(acnt1 == acnt1);
+    ASSERT_FALSE(acnt1 == acnt2);
+}
\ No newline at end of file
diff --git a/tests/chains/IOST/SignerTests.cpp b/tests/chains/IOST/SignerTests.cpp
new file mode 100644
index 00000000000..cde607ed48a
--- /dev/null
+++ b/tests/chains/IOST/SignerTests.cpp
@@ -0,0 +1,84 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "IOST/Signer.h"
+#include "proto/IOST.pb.h"
+#include <gtest/gtest.h>
+
+#include <iostream>
+
+using namespace TW;
+using namespace TW::IOST;
+
+TEST(IOSTSigner, Sign) {
+    auto tx = Proto::Transaction();
+    tx.set_time(1550137587000000000);
+    tx.set_expiration(tx.time() + int64_t(1000000000) * 300);
+    tx.set_gas_ratio(1);
+    tx.set_gas_limit(1000000);
+    tx.set_chain_id(1024);
+
+    tx.add_amount_limit();
+    auto amountLimit = tx.mutable_amount_limit(0);
+    amountLimit->set_token("*");
+    amountLimit->set_value("unlimited");
+
+    Data secKeyBytes = parse_hex("63095105a37b4e896e5ebbd740e751c6f9df7cca2410beba3261dc5680299cebe"
+                                 "812b52ea9ad5cba9a9af03afcc6f2942a4524b0df3c0344dc195072831670c4");
+    std::string secKey(secKeyBytes.begin(), secKeyBytes.end());
+    Proto::AccountInfo account;
+    account.set_active_key(secKey);
+    account.set_name("myname");
+
+    Proto::SigningInput input;
+    input.mutable_account()->CopyFrom(account);
+    input.mutable_transaction_template()->CopyFrom(tx);
+    input.set_transfer_destination("admin");
+    input.set_transfer_amount("10");
+    input.set_transfer_memo("");
+
+    Signer signer(input);
+    std::string signature = signer.sign(input).transaction().publisher_sigs(0).signature();
+
+    ASSERT_EQ(hex(signature), "e8ce15214bad39683021c15dd318e963da8541fd8f3d8484df5042b4ea7fdafb7f46"
+                              "505b85841367d6e1736c7d3b433ca72089b88a23f43661dfb0429a10cb03");
+}
+
+TEST(IOSTSigner, EncodeTransaction) {
+    auto tx = Proto::Transaction();
+    tx.set_time(1550137587000000000);
+    tx.set_expiration(tx.time() + int64_t(1000000000) * 300);
+    tx.set_gas_ratio(1);
+    tx.set_gas_limit(1000000);
+    tx.set_chain_id(1024);
+
+    tx.add_amount_limit();
+    auto amountLimit = tx.mutable_amount_limit(0);
+    amountLimit->set_token("*");
+    amountLimit->set_value("unlimited");
+
+    Data secKeyBytes = parse_hex("63095105a37b4e896e5ebbd740e751c6f9df7cca2410beba3261dc5680299cebe"
+                                 "812b52ea9ad5cba9a9af03afcc6f2942a4524b0df3c0344dc195072831670c4");
+    std::string secKey(secKeyBytes.begin(), secKeyBytes.end());
+    Proto::AccountInfo account;
+    account.set_active_key(secKey);
+    account.set_name("myname");
+
+    tx.add_signers();
+    *tx.mutable_signers(0) = secKey;
+
+    const auto signature =
+        parse_hex("1e5e2de66512658e9317fa56766678166abcf492d020863935723db2030f736710e13437cef0981f"
+                  "cc376eae45349759508767d407b6c9963712910ada2c3606");
+
+    tx.add_signatures();
+    auto* sig = tx.mutable_signatures(0);
+    sig->set_algorithm(Proto::Algorithm::ED25519);
+    sig->set_public_key(secKey);
+    sig->set_signature(std::string(signature.begin(), signature.end()));
+
+    auto encoded = Signer::encodeTransaction(tx);
+    ASSERT_EQ(hex(encoded), "158331ec221dbe0015833231fb82760000000000000000640000000005f5e10000000000000000000000040000000000000000010000004063095105a37b4e896e5ebbd740e751c6f9df7cca2410beba3261dc5680299cebe812b52ea9ad5cba9a9af03afcc6f2942a4524b0df3c0344dc195072831670c4000000000000000100000012000000012a00000009756e6c696d69746564000000010000008902000000401e5e2de66512658e9317fa56766678166abcf492d020863935723db2030f736710e13437cef0981fcc376eae45349759508767d407b6c9963712910ada2c36060000004063095105a37b4e896e5ebbd740e751c6f9df7cca2410beba3261dc5680299cebe812b52ea9ad5cba9a9af03afcc6f2942a4524b0df3c0344dc195072831670c4");
+}
diff --git a/tests/chains/IOST/TWCoinTypeTests.cpp b/tests/chains/IOST/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..3b4f8817d7d
--- /dev/null
+++ b/tests/chains/IOST/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWIOSTCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeIOST));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("7dKQzgTkPBNrZqrQ2Bqhqq132CHGPKANFDtzRsjHRCqx"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeIOST, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("4av8w81EyzUgHonsVWqfs15WM4Vrpgox4BYYQWhNQDVu"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeIOST, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeIOST));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeIOST));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeIOST), 2);
+    ASSERT_EQ(TWBlockchainIOST, TWCoinTypeBlockchain(TWCoinTypeIOST));
+    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeIOST));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeIOST));
+    assertStringsEqual(symbol, "IOST");
+    assertStringsEqual(txUrl, "https://explorer.iost.io/tx/7dKQzgTkPBNrZqrQ2Bqhqq132CHGPKANFDtzRsjHRCqx");
+    assertStringsEqual(accUrl, "https://explorer.iost.io/account/4av8w81EyzUgHonsVWqfs15WM4Vrpgox4BYYQWhNQDVu");
+    assertStringsEqual(id, "iost");
+    assertStringsEqual(name, "IOST");
+}
diff --git a/tests/chains/IOST/TransactionCompilerTests.cpp b/tests/chains/IOST/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..9db3d3e0d84
--- /dev/null
+++ b/tests/chains/IOST/TransactionCompilerTests.cpp
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/IOST.pb.h"
+#include "proto/Theta.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(IostCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeIOST;
+    /// Step 1: Prepare transaction input (protobuf)
+    const auto privKeyBytes = Base58::decode(
+        "4TQwN7wWXg26ByuU5WkUPErd5v6PD6HsDuULyGNJgpS979wXF7jRU8NKviJs5boHrRKbLMomKycbek4NyDy6cLb8");
+    const auto pkFrom = PrivateKey(Data(privKeyBytes.begin(), privKeyBytes.begin() + 32));
+    const auto publicKey = pkFrom.getPublicKey(TWPublicKeyTypeED25519);
+    TW::IOST::Proto::SigningInput input;
+    input.set_transfer_memo("");
+    auto t = input.mutable_transaction_template();
+    t->set_publisher("astastooo");
+    t->set_time(1647421579901555000);
+    t->set_expiration(1647421879901555000);
+    t->set_gas_ratio(1);
+    t->set_gas_limit(100000);
+    t->set_chain_id(1023);
+    t->set_delay(0);
+    t->set_publisher("astastooo");
+    t->add_actions();
+    auto action = t->mutable_actions(0);
+    action->set_contract("token.iost");
+    action->set_action_name("transfer");
+    action->set_data("[\"IOST\",\"astastooo\",\"test_iosted\",\"0.001\",\"test\"]");
+    t->add_amount_limit();
+    auto amountLimit = t->mutable_amount_limit(0);
+    amountLimit->set_token("*");
+    amountLimit->set_value("unlimited");
+    input.mutable_account()->set_active_key(privKeyBytes.data(), 32);
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "451ed1e542da2422ed152bff6f30c95e2a8ee2153f4d36f15c45914fa2d2e9f1");
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData = publicKey.bytes;
+    const auto signature =
+        parse_hex("1e5e2de66512658e9317fa56766678166abcf492d020863935723db2030f736710e13437cef0981f"
+                  "cc376eae45349759508767d407b6c9963712910ada2c3606");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preSigningOutput.data_hash())));
+
+    /// Step 3: Compile transaction info
+    const auto expectedTx =
+        "7b2274696d65223a2231363437343231353739393031353535303030222c2265787069726174696f6e223a2231"
+        "363437343231383739393031353535303030222c226761735f726174696f223a312c226761735f6c696d697422"
+        "3a3130303030302c22636861696e5f6964223a313032332c22616374696f6e73223a5b7b22636f6e7472616374"
+        "223a22746f6b656e2e696f7374222c22616374696f6e5f6e616d65223a227472616e73666572222c2264617461"
+        "223a225b5c22494f53545c222c5c226173746173746f6f6f5c222c5c22746573745f696f737465645c222c5c22"
+        "302e3030315c222c5c22746573745c225d227d5d2c22616d6f756e745f6c696d6974223a5b7b22746f6b656e22"
+        "3a222a222c2276616c7565223a22756e6c696d69746564227d5d2c227075626c6973686572223a226173746173"
+        "746f6f6f222c227075626c69736865725f73696773223a5b7b22616c676f726974686d223a322c227369676e61"
+        "74757265223a22486c3474356d55535a593654462f7057646d5a34466d7138394a4c51494959354e5849397367"
+        "4d5063326351345451337a76435948387733627135464e4a645a5549646e31416532795a59334570454b326977"
+        "3242673d3d222c227075626c69635f6b6579223a2234687a496d2b6d383234536f663866645641474545332b64"
+        "667931554c7a69786e6f4c5047694a565879383d227d5d7d";
+    {
+        const Data outputData =
+            TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+
+        IOST::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::IOST::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+
+        TW::IOST::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKey.bytes});
+        IOST::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: invalid signatures
+        const auto invalidSignature =
+            parse_hex("fb43727477caaa12542b9060856816d42eedef6ebf2e98e4f8dff4355fe384751925833c4a26b2fed1707aebe655cb3317504a61ee59697c086f7baa6ca06a09");
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {invalidSignature}, {publicKey.bytes});
+        IOST::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_internal);
+        EXPECT_EQ(output.error_message(), "Invalid signature/hash/publickey combination");
+    }
+
+    { // Negative: empty signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {}, {});
+        IOST::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
diff --git a/tests/chains/ImmutableX/StarkKeyTests.cpp b/tests/chains/ImmutableX/StarkKeyTests.cpp
new file mode 100644
index 00000000000..6f9efca154e
--- /dev/null
+++ b/tests/chains/ImmutableX/StarkKeyTests.cpp
@@ -0,0 +1,94 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Ethereum/EIP2645.h"
+#include "HexCoding.h"
+#include "ImmutableX/Constants.h"
+#include "ImmutableX/StarkKey.h"
+#include <gtest/gtest.h>
+
+namespace TW::ImmutableX::tests {
+
+TEST(ImmutableX, PathFromAddress) {
+    // https://github.com/immutable/imx-core-sdk-swift/blob/main/Tests/ImmutableXCoreTests/Crypto/Stark/StarkKeyTests.swift#L30
+    auto res = Ethereum::accountPathFromAddress("0xa76e3eeb2f7143165618ab8feaabcd395b6fac7f", internal::gLayer, internal::gApplication, internal::gIndex);
+    ASSERT_EQ(res, "m/2645'/579218131'/211006541'/1534045311'/1431804530'/1");
+}
+
+TEST(ImmutableX, ExtraGrinding) {
+    using namespace internal;
+    std::string signature = "0x6d1550458c7a9a1257d73adbcf0fabc12f4497e970d9fa62dd88bf7d9e12719148c96225c1402d8707fd061b1aae2222bdf13571dfc82b3aa9974039f247f2b81b";
+    std::string address = "0xa4864d977b944315389d1765ffa7e66F74ee8cd7";
+    auto data = parse_hex(signature);
+    auto path = DerivationPath(Ethereum::accountPathFromAddress(address, gLayer, gApplication, gIndex));
+    auto privKey = ImmutableX::getPrivateKeyFromRawSignature(parse_hex(signature), path);
+    auto pubKey = privKey.getPublicKey(TWPublicKeyTypeStarkex);
+    ASSERT_EQ(hexEncoded(pubKey.bytes), "0x035919acd61e97b3ecdc75ff8beed8d1803f7ea3cad2937926ae59cc3f8070d4");
+}
+
+TEST(ImmutableX, GrindKey) {
+    auto seed = parse_hex("86F3E7293141F20A8BAFF320E8EE4ACCB9D4A4BF2B4D295E8CEE784DB46E0519");
+    auto res = grindKey(seed);
+    ASSERT_EQ(res, "5c8c8683596c732541a59e03007b2d30dbbbb873556fe65b5fb63c16688f941");
+}
+
+TEST(ImmutableX, GetPrivateKeySignature) {
+    std::string signature = "0x21fbf0696d5e0aa2ef41a2b4ffb623bcaf070461d61cf7251c74161f82fec3a4370854bc0a34b3ab487c1bc021cd318c734c51ae29374f2beb0e6f2dd49b4bf41c";
+    auto data = parse_hex(signature);
+    // The signature is `rsv`, where `r` starts at 0 and is 32 long.
+    auto seed = subData(data, 0, 32);
+    auto result = grindKey(seed);
+    ASSERT_EQ(result, "766f11e90cd7c7b43085b56da35c781f8c067ac0d578eabdceebc4886435bda");
+}
+
+TEST(ImmutableX, GetPrivateKeyFromSignature) {
+    using namespace internal;
+    std::string address = "0xa76e3eeb2f7143165618ab8feaabcd395b6fac7f";
+    std::string signature = "0x5a263fad6f17f23e7c7ea833d058f3656d3fe464baf13f6f5ccba9a2466ba2ce4c4a250231bcac7beb165aec4c9b049b4ba40ad8dd287dc79b92b1ffcf20cdcf1b";
+    auto path = DerivationPath(Ethereum::accountPathFromAddress(address, gLayer, gApplication, gIndex));
+    auto privKey = ImmutableX::getPrivateKeyFromRawSignature(parse_hex(signature), path);
+    ASSERT_EQ(hex(privKey.bytes), "058ab7989d625b1a690400dcbe6e070627adedceff7bd196e58d4791026a8afe");
+    ASSERT_TRUE(PrivateKey::isValid(privKey.bytes));
+}
+
+TEST(ImmutableX, GetPublicKeyFromPrivateKey) {
+    auto privKeyData = parse_hex("058ab7989d625b1a690400dcbe6e070627adedceff7bd196e58d4791026a8afe", true);
+    PrivateKey privKey(privKeyData);
+    auto pubKey = privKey.getPublicKey(TWPublicKeyTypeStarkex);
+    auto pubKeyHex = hexEncoded(pubKey.bytes);
+    ASSERT_EQ(pubKeyHex, "0x02a4c7332c55d6c1c510d24272d1db82878f2302f05b53bcc38695ed5f78fffd");
+}
+
+TEST(ImmutableX, SimpleSign) {
+    auto privKeyBytes = parse_hex("0139fe4d6f02e666e86a6f58e65060f115cd3c185bd9e98bd829636931458f79");
+    PrivateKey privKey(privKeyBytes);
+    auto digest = parse_hex("06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76");
+    auto signature = hex(privKey.sign(digest, TWCurve::TWCurveStarkex));
+    auto expectedSignature = "061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a";
+    ASSERT_EQ(signature.size(), 128ULL);
+    ASSERT_EQ(signature.substr(0, 64), "061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f");
+    ASSERT_EQ(signature.substr(64, 64), "04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a");
+    ASSERT_EQ(signature, expectedSignature);
+}
+
+TEST(ImmutableX, VerifySign) {
+    // valid
+    {
+        auto pubKeyData = parse_hex("02c5dbad71c92a45cc4b40573ae661f8147869a91d57b8d9b8f48c8af7f83159");
+        auto hash = parse_hex("06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76");
+        auto signature = parse_hex("061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9a");
+        auto pubKey = PublicKey(pubKeyData, TWPublicKeyTypeStarkex);
+        ASSERT_TRUE(pubKey.verify(signature, hash));
+    }
+    // invalid
+    {
+        auto pubKeyData = parse_hex("02c5dbad71c92a45cc4b40573ae661f8147869a91d57b8d9b8f48c8af7f83159");
+        auto hash = parse_hex("06fea80189363a786037ed3e7ba546dad0ef7de49fccae0e31eb658b7dd4ea76");
+        auto signature = parse_hex("061ec782f76a66f6984efc3a1b6d152a124c701c00abdd2bf76641b4135c770f04e44e759cea02c23568bb4d8a09929bbca8768ab68270d50c18d214166ccd9b");
+        auto pubKey = PublicKey(pubKeyData, TWPublicKeyTypeStarkex);
+        ASSERT_FALSE(pubKey.verify(signature, hash));
+    }
+}
+
+} // namespace TW::ImmutableX::tests
diff --git a/tests/chains/InternetComputer/TWAnyAddressTests.cpp b/tests/chains/InternetComputer/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..5833e05b68d
--- /dev/null
+++ b/tests/chains/InternetComputer/TWAnyAddressTests.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include <TrustWalletCore/TWAnyAddress.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWInternetComputer, Address) {
+    auto string = STRING("58b26ace22a36a0011608a130e84c7cf34ba469c38d24ccf606152ce7de91f4e");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeInternetComputer));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+}
diff --git a/tests/chains/InternetComputer/TWAnySignerTests.cpp b/tests/chains/InternetComputer/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..803c5f1e487
--- /dev/null
+++ b/tests/chains/InternetComputer/TWAnySignerTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Common.pb.h"
+#include "proto/InternetComputer.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::InternetComputer {
+
+TEST(TWAnySignerInternetComputer, Sign) {
+    auto key = parse_hex("227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be");
+    auto input = Proto::SigningInput();
+    input.set_private_key(key.data(), key.size());
+    input.mutable_transaction()->mutable_transfer()->set_to_account_identifier("943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a");
+    input.mutable_transaction()->mutable_transfer()->set_amount(100'000'000);
+    input.mutable_transaction()->mutable_transfer()->set_memo(0);
+    input.mutable_transaction()->mutable_transfer()->set_current_timestamp_nanos(1'691'709'940'000'000'000);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeInternetComputer);
+
+    const auto signed_transaction = output.signed_transaction();
+    const auto hex_encoded = hex(signed_transaction);
+    ASSERT_EQ(hex_encoded, "81826b5452414e53414354494f4e81a266757064617465a367636f6e74656e74a66c726571756573745f747970656463616c6c6e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d026b63616e69737465725f69644a000000000000000201016b6d6574686f645f6e616d656773656e645f706263617267583b0a0012070a050880c2d72f2a220a20943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a3a0a088090caa5a3a78abd176d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f736967984013186f18b9181c189818b318a8186518b2186118d418971618b1187d18eb185818e01826182f1873183b185018cb185d18ef18d81839186418b3183218da1824182f184e18a01880182718c0189018c918a018fd18c418d9189e189818b318ef1874183b185118e118a51864185918e718ed18c71889186c1822182318ca6a726561645f7374617465a367636f6e74656e74a46c726571756573745f747970656a726561645f73746174656e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d0265706174687381824e726571756573745f7374617475735820e8fbc2d5b0bf837b3a369249143e50d4476faafb2dd620e4e982586a51ebcf1e6d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f7369679840182d182718201888188618ce187f0c182a187a18d718e818df18fb18d318d41118a5186a184b18341842185318d718e618e8187a1828186c186a183618461418f3183318bd18a618a718bc18d918c818b7189d186e1865188418ff18fd18e418e9187f181b18d705184818b21872187818d6181c161833184318a2");
+}
+
+} // namespace TW::InternetComputer
diff --git a/tests/chains/InternetComputer/TWCoinTypeTests.cpp b/tests/chains/InternetComputer/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..ca29c0f517a
--- /dev/null
+++ b/tests/chains/InternetComputer/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWInternetComputerCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeInternetComputer;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("9e32c54975adf84a1d98f19df41bbc34a752a899c32cc9c0000200b2c4308f85"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("529ea51c22e8d66e8302eabd9297b100fdb369109822248bb86939a671fbc55b"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "internet_computer");
+    assertStringsEqual(name, "Internet Computer");
+    assertStringsEqual(symbol, "ICP");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 8);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainInternetComputer);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(txUrl, "https://dashboard.internetcomputer.org/transaction/9e32c54975adf84a1d98f19df41bbc34a752a899c32cc9c0000200b2c4308f85");
+    assertStringsEqual(accUrl, "https://dashboard.internetcomputer.org/account/529ea51c22e8d66e8302eabd9297b100fdb369109822248bb86939a671fbc55b");
+}
diff --git a/tests/chains/IoTeX/AddressTests.cpp b/tests/chains/IoTeX/AddressTests.cpp
new file mode 100644
index 00000000000..fd94363fdff
--- /dev/null
+++ b/tests/chains/IoTeX/AddressTests.cpp
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <gtest/gtest.h>
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include "IoTeX/Address.h"
+
+namespace TW::IoTeX {
+
+TEST(IoTeXAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8"));
+    ASSERT_FALSE(Address::isValid("io187wzp08vnhjpkydnr97qlh8kh0dpkkytfam8j"));
+    ASSERT_FALSE(Address::isValid("it187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j"));
+    ASSERT_FALSE(Address::isValid("ko187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j"));
+    ASSERT_FALSE(Address::isValid("io187wzp18vnhjjpkydnr97qlh8kh0dpkkytfam8j"));
+    ASSERT_FALSE(Address::isValid("io187wzp08vnhjbpkydnr97qlh8kh0dpkkytfam8j"));
+    ASSERT_FALSE(Address::isValid("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8k"));
+}
+
+TEST(IoTeXAddress, Valid) {
+    ASSERT_TRUE(Address::isValid("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j"));
+}
+
+TEST(IoTeXAddress, FromString) {
+    Address address;
+    ASSERT_TRUE(Address::decode("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j", address));
+    ASSERT_EQ("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j", address.string());
+
+    ASSERT_FALSE(Address::decode("io187wzp08vnhjbpkydnr97qlh8kh0dpkkytfam8j", address));
+}
+
+TEST(IoTeXAddress, FromPrivateKey) {
+    const auto privateKey = PrivateKey(parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f"));
+    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
+
+    EXPECT_THROW({
+        try
+        {
+            const auto _publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
+            const auto _address = Address(_publicKey);
+        }
+        catch( const std::invalid_argument& e )
+        {
+            EXPECT_STREQ("address may only be an extended SECP256k1 public key", e.what());
+            throw;
+        }
+    }, std::invalid_argument);
+}
+
+TEST(IoTeXAddress, FromKeyHash) {
+    const auto keyHash = parse_hex("3f9c20bcec9de520d88d98cbe07ee7b5ded0dac4");
+    const auto address = Address(keyHash);
+    ASSERT_EQ(address.string(), "io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
+
+    EXPECT_THROW({
+        try
+        {
+            const auto _keyHash = parse_hex("3f9c20bcec9de520d88d98cbe07ee7b5ded0da");
+            const auto _address = Address(_keyHash);
+        }
+        catch( const std::invalid_argument& e )
+        {
+            EXPECT_STREQ("invalid address data", e.what());
+            throw;
+        }
+    }, std::invalid_argument);
+}
+
+} // namespace TW::IoTeX
diff --git a/tests/chains/IoTeX/SignerTests.cpp b/tests/chains/IoTeX/SignerTests.cpp
new file mode 100644
index 00000000000..bb743500c66
--- /dev/null
+++ b/tests/chains/IoTeX/SignerTests.cpp
@@ -0,0 +1,123 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <gtest/gtest.h>
+
+#include "HexCoding.h"
+#include "Hash.h"
+#include "IoTeX/Address.h"
+#include "IoTeX/Signer.h"
+#include "proto/IoTeX.pb.h"
+
+namespace TW::IoTeX {
+
+TEST(IoTeXSigner, Sign) {
+    auto input = Proto::SigningInput();
+    input.set_version(1);
+    input.set_nonce(123);
+    input.set_gaslimit(888);
+    input.set_gasprice("999");
+    auto key = parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f");
+    input.set_privatekey(key.data(), key.size());
+    auto tsf = input.mutable_transfer();
+    tsf->set_amount("456");
+    tsf->set_recipient("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
+    auto text = parse_hex("68656c6c6f20776f726c6421"); // "hello world!"
+    tsf->set_payload(text.data(), text.size());
+
+    auto signer = IoTeX::Signer(std::move(input));
+    auto h = signer.hash();
+    ASSERT_EQ(hex(h), "0f17cd7f43bdbeff73dfe8f5cb0c0045f2990884e5050841de887cf22ca35b50");
+    auto sig = signer.sign();
+    ASSERT_EQ(hex(sig), "555cc8af4181bf85c044c3201462eeeb95374f78aa48c67b87510ee63d5e502372e53082f03e9a11c1e351de539cedf85d8dff87de9d003cb9f92243541541a000");
+}
+
+TEST(IoTeXSigner, Build) {
+    auto input = Proto::SigningInput();
+    input.set_version(1);
+    input.set_nonce(123);
+    input.set_gaslimit(888);
+    input.set_gasprice("999");
+    auto keyhex = parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f");
+    input.set_privatekey(keyhex.data(), keyhex.size());
+    auto tsf = input.mutable_transfer();
+    tsf->set_amount("456");
+    tsf->set_recipient("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
+    auto text = parse_hex("68656c6c6f20776f726c6421"); // "hello world!"
+    tsf->set_payload(text.data(), text.size());
+
+    auto signer = IoTeX::Signer(std::move(input));
+    auto output = signer.build();
+    auto encoded = output.encoded(); // signed action's serialized bytes
+    ASSERT_EQ(hex(encoded), "0a4c0801107b18f8062203393939523e0a033435361229696f313837777a703038766e686a6a706b79646e723937716c68386b683064706b6b797466616d386a1a0c68656c6c6f20776f726c64211241044e18306ae9ef4ec9d07bf6e705442d4d1a75e6cdf750330ca2d880f2cc54607c9c33deb9eae9c06e06e04fe9ce3d43962cc67d5aa34fbeb71270d4bad3d648d91a41555cc8af4181bf85c044c3201462eeeb95374f78aa48c67b87510ee63d5e502372e53082f03e9a11c1e351de539cedf85d8dff87de9d003cb9f92243541541a000");
+    auto h = output.hash(); // signed action's hash
+    ASSERT_EQ(hex(h), "6c84ac119058e859a015221f87a4e187c393d0c6ee283959342eac95fad08c33");
+}
+
+TEST(IoTeXSigner, Compile) {
+    auto input = Proto::SigningInput();
+    input.set_version(1);
+    input.set_nonce(123);
+    input.set_gaslimit(888);
+    input.set_gasprice("999");
+    auto tsf = input.mutable_transfer();
+    tsf->set_amount("456");
+    tsf->set_recipient("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
+    auto text = parse_hex("68656c6c6f20776f726c6421"); // "hello world!"
+    tsf->set_payload(text.data(), text.size());
+
+    //build preImage
+    auto preInputData = IoTeX::Signer(std::move(input));
+    auto h = preInputData.hash();
+    auto checkHash = "0f17cd7f43bdbeff73dfe8f5cb0c0045f2990884e5050841de887cf22ca35b50";
+    //check un sign hash
+    ASSERT_EQ(hex(h), checkHash);
+
+    //build sign
+    auto key = parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f");
+    input.set_privatekey(key.data(), key.size());
+    auto signer = IoTeX::Signer(std::move(input));
+    Data sig = signer.sign();
+    auto checkSig = "555cc8af4181bf85c044c3201462eeeb95374f78aa48c67b87510ee63d5e502372e53082f03e9a11c1e351de539cedf85d8dff87de9d003cb9f92243541541a000";
+    //check signature
+    ASSERT_EQ(hex(sig), checkSig);
+
+    //build compile
+    auto k = PrivateKey(key);
+    PublicKey pk = k.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    //merge hash data and signature
+    auto output = signer.compile(input, sig, pk);
+
+    auto encoded = output.encoded();
+    auto hash = output.hash(); // signed action's hash
+
+    auto checkEncoded = "0a4c0801107b18f8062203393939523e0a033435361229696f313837777a703038766e686a6a706b79646e723937716c68386b683064706b6b797466616d386a1a0c68656c6c6f20776f726c64211241044e18306ae9ef4ec9d07bf6e705442d4d1a75e6cdf750330ca2d880f2cc54607c9c33deb9eae9c06e06e04fe9ce3d43962cc67d5aa34fbeb71270d4bad3d648d91a41555cc8af4181bf85c044c3201462eeeb95374f78aa48c67b87510ee63d5e502372e53082f03e9a11c1e351de539cedf85d8dff87de9d003cb9f92243541541a000";
+    auto compileHash = "6c84ac119058e859a015221f87a4e187c393d0c6ee283959342eac95fad08c33";
+    //check encoded
+    ASSERT_EQ(hex(encoded), checkEncoded);
+    //check hash
+    ASSERT_EQ(hex(hash), compileHash);
+}
+
+TEST(IoTeXSigner, SignaturePreimage) {
+    auto input = Proto::SigningInput();
+    input.set_version(1);
+    input.set_nonce(123);
+    input.set_gaslimit(888);
+    input.set_gasprice("999");
+    auto key = parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f");
+    input.set_privatekey(key.data(), key.size());
+    auto tsf = input.mutable_transfer();
+    tsf->set_amount("456");
+    tsf->set_recipient("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
+    auto text = parse_hex("68656c6c6f20776f726c6421"); // "hello world!"
+    tsf->set_payload(text.data(), text.size());
+
+    auto signer = IoTeX::Signer(std::move(input));
+
+    auto preImage = signer.signaturePreimage();
+    ASSERT_EQ(hex(preImage), "0801107b18f8062203393939523e0a033435361229696f313837777a703038766e686a6a706b79646e723937716c68386b683064706b6b797466616d386a1a0c68656c6c6f20776f726c6421");
+}
+
+} // namespace TW::IoTeX
diff --git a/tests/chains/IoTeX/StakingTests.cpp b/tests/chains/IoTeX/StakingTests.cpp
new file mode 100644
index 00000000000..16515808566
--- /dev/null
+++ b/tests/chains/IoTeX/StakingTests.cpp
@@ -0,0 +1,330 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Data.h"
+#include "HexCoding.h"
+#include "IoTeX/Staking.h"
+#include "proto/IoTeX.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+namespace TW::IoTeX::tests {
+
+TEST(TWIoTeXStaking, Create) {
+    std::string IOTEX_STAKING_CANDIDATE = "io19d0p3ah4g8ww9d7kcxfq87yxe7fnr8rpth5shj";
+    std::string IOTEX_STAKING_PAYLOAD = "payload";
+    std::string IOTEX_STAKING_AMOUNT = "100";
+    Data candidate(IOTEX_STAKING_CANDIDATE.begin(), IOTEX_STAKING_CANDIDATE.end());
+    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
+    Data amount(IOTEX_STAKING_AMOUNT.begin(), IOTEX_STAKING_AMOUNT.end());
+
+    auto stake = stakingCreate(candidate, amount, 10000, true, payload);
+    ASSERT_EQ(hex(stake), "0a29696f313964307033616834673877773964376b63786671383779786537666e723872"
+                          "7074683573686a120331303018904e20012a077061796c6f6164");
+}
+
+TEST(TWIoTeXStaking, AddDeposit) {
+    std::string IOTEX_STAKING_PAYLOAD = "payload";
+    std::string IOTEX_STAKING_AMOUNT = "10";
+    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
+    Data amount(IOTEX_STAKING_AMOUNT.begin(), IOTEX_STAKING_AMOUNT.end());
+
+    auto stake = stakingAddDeposit(10, amount, payload);
+
+    ASSERT_EQ(hex(stake), "080a120231301a077061796c6f6164");
+}
+
+TEST(TWIoTeXStaking, Unstake) {
+    std::string IOTEX_STAKING_PAYLOAD = "payload";
+    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
+
+    auto stake = stakingUnstake(10, payload);
+
+    ASSERT_EQ(hex(stake), "080a12077061796c6f6164");
+}
+
+TEST(TWIoTeXStaking, Withdraw) {
+    std::string IOTEX_STAKING_PAYLOAD = "payload";
+    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
+
+    auto stake = stakingWithdraw(10, payload);
+
+    ASSERT_EQ(hex(stake), "080a12077061796c6f6164");
+}
+
+TEST(TWIoTeXStaking, Restake) {
+    std::string IOTEX_STAKING_PAYLOAD = "payload";
+    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
+
+    auto stake = stakingRestake(10, 1000, true, payload);
+
+    ASSERT_EQ(hex(stake), "080a10e807180122077061796c6f6164");
+}
+
+TEST(TWIoTeXStaking, ChangeCandidate) {
+    std::string IOTEX_STAKING_CANDIDATE = "io1xpq62aw85uqzrccg9y5hnryv8ld2nkpycc3gza";
+    std::string IOTEX_STAKING_PAYLOAD = "payload";
+    Data candidate(IOTEX_STAKING_CANDIDATE.begin(), IOTEX_STAKING_CANDIDATE.end());
+    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
+
+    auto stake = stakingChangeCandidate(10, candidate, payload);
+
+    ASSERT_EQ(hex(stake), "080a1229696f3178707136326177383575717a72636367397935686e727976386c"
+                          "64326e6b7079636333677a611a077061796c6f6164");
+}
+
+TEST(TWIoTeXStaking, Transfer) {
+    std::string IOTEX_STAKING_CANDIDATE = "io1xpq62aw85uqzrccg9y5hnryv8ld2nkpycc3gza";
+    std::string IOTEX_STAKING_PAYLOAD = "payload";
+    Data candidate(IOTEX_STAKING_CANDIDATE.begin(), IOTEX_STAKING_CANDIDATE.end());
+    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
+
+    auto stake = stakingTransfer(10, candidate, payload);
+
+    ASSERT_EQ(hex(stake), "080a1229696f3178707136326177383575717a72636367397935686e727976386c6432"
+                          "6e6b7079636333677a611a077061796c6f6164");
+}
+
+TEST(TWIoTeXStaking, CandidateRegister) {
+    std::string IOTEX_STAKING_NAME = "test";
+    std::string IOTEX_STAKING_OPERATOR = "io10a298zmzvrt4guq79a9f4x7qedj59y7ery84he";
+    std::string IOTEX_STAKING_REWARD = "io13sj9mzpewn25ymheukte4v39hvjdtrfp00mlyv";
+    std::string IOTEX_STAKING_OWNER = "io19d0p3ah4g8ww9d7kcxfq87yxe7fnr8rpth5shj";
+    std::string IOTEX_STAKING_AMOUNT = "100";
+    std::string IOTEX_STAKING_PAYLOAD = "payload";
+    Data name(IOTEX_STAKING_NAME.begin(), IOTEX_STAKING_NAME.end());
+    Data operatorAddress(IOTEX_STAKING_OPERATOR.begin(), IOTEX_STAKING_OPERATOR.end());
+    Data reward(IOTEX_STAKING_REWARD.begin(), IOTEX_STAKING_REWARD.end());
+    Data amount(IOTEX_STAKING_AMOUNT.begin(), IOTEX_STAKING_AMOUNT.end());
+    Data owner(IOTEX_STAKING_OWNER.begin(), IOTEX_STAKING_OWNER.end());
+    Data payload(IOTEX_STAKING_PAYLOAD.begin(), IOTEX_STAKING_PAYLOAD.end());
+
+    auto stake =
+        candidateRegister(name, operatorAddress, reward, amount, 10000, false, owner, payload);
+
+    ASSERT_EQ(hex(stake),
+              "0a5c0a04746573741229696f3130613239387a6d7a7672743467757137396139663478377165646a3539"
+              "7937657279383468651a29696f3133736a396d7a7065776e3235796d6865756b74653476333968766a64"
+              "7472667030306d6c7976120331303018904e2a29696f313964307033616834673877773964376b637866"
+              "71383779786537666e7238727074683573686a32077061796c6f6164");
+}
+
+TEST(TWIoTeXStaking, CandidateUpdate) {
+    std::string IOTEX_STAKING_NAME = "test";
+    std::string IOTEX_STAKING_OPERATOR = "io1cl6rl2ev5dfa988qmgzg2x4hfazmp9vn2g66ng";
+    std::string IOTEX_STAKING_REWARD = "io1juvx5g063eu4ts832nukp4vgcwk2gnc5cu9ayd";
+    Data name(IOTEX_STAKING_NAME.begin(), IOTEX_STAKING_NAME.end());
+    Data operatorAddress(IOTEX_STAKING_OPERATOR.begin(), IOTEX_STAKING_OPERATOR.end());
+    Data reward(IOTEX_STAKING_REWARD.begin(), IOTEX_STAKING_REWARD.end());
+
+    auto stake = candidateUpdate(name, operatorAddress, reward);
+
+    ASSERT_EQ(hex(stake), "0a04746573741229696f31636c36726c32657635646661393838716d677a6732783468"
+                          "66617a6d7039766e326736366e671a29696f316a757678356730363365753474733833"
+                          "326e756b7034766763776b32676e6335637539617964");
+}
+
+Proto::SigningInput createSigningInput() {
+    auto keyhex = parse_hex("cfa6ef757dee2e50351620dca002d32b9c090cfda55fb81f37f1d26b273743f1");
+    auto input = Proto::SigningInput();
+    input.set_version(1);
+    input.set_nonce(0);
+    input.set_gaslimit(1000000);
+    input.set_gasprice("10");
+    input.set_privatekey(keyhex.data(), keyhex.size());
+    return input;
+}
+
+TEST(TWIoTeXStaking, SignAll) {
+    { // sign stakecreate
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        auto& action = *input.mutable_stakecreate();
+        action.set_candidatename("io19d0p3ah4g8ww9d7kcxfq87yxe7fnr8rpth5shj");
+        action.set_stakedamount("100");
+        action.set_stakedduration(10000);
+        action.set_autostake(true);
+        action.set_payload("payload");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(hex(output.encoded()),
+                  "0a4b080118c0843d22023130c2023e0a29696f313964307033616834673877773964376b63786671"
+                  "3837797865"
+                  "37666e7238727074683573686a120331303018904e20012a077061796c6f6164124104755ce6d890"
+                  "3f6b3793bd"
+                  "db4ea5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c"
+                  "0bc76ef30d"
+                  "d6a1038ed9da8daf331a412e8bac421bab88dcd99c26ac8ffbf27f11ee57a41e7d2537891bfed5ae"
+                  "d8e2e026d4"
+                  "6e55d1b856787bc1cd7c1216a6e2534c5b5d1097c3afe8e657aa27cbbb0801");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "f1785e47b4200c752bb6518bd18097a41e075438b8c18c9cb00e1ae2f38ce767");
+    }
+    { // sign stakeadddeposit
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        auto& action = *input.mutable_stakeadddeposit();
+        action.set_bucketindex(10);
+        action.set_amount("10");
+        action.set_payload("payload");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(
+            hex(output.encoded()),
+            "0a1c080118c0843d22023130da020f080a120231301a077061796c6f6164124104755ce6d8903f6b3793"
+            "bddb4ea5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0b"
+            "c76ef30dd6a1038ed9da8daf331a41a48ab1feba8181d760de946aefed7d815a89fd9b1ab503d2392bb5"
+            "5e1bb75eec42dddc8bd642f89accc3a37b3cf15a103a95d66695fdf0647b202869fdd66bcb01");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "ca8937d6f224a4e4bf93cb5605581de2d26fb0481e1dfc1eef384ee7ccf94b73");
+    }
+    { // sign stakeunstake
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        auto& action = *input.mutable_stakeunstake();
+        action.set_bucketindex(10);
+        action.set_payload("payload");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(
+            hex(output.encoded()),
+            "0a18080118c0843d22023130ca020b080a12077061796c6f6164124104755ce6d8903f6b3793bddb4ea5"
+            "d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef30d"
+            "d6a1038ed9da8daf331a4100adee39b48e1d3dbbd65298a57c7889709fc4df39987130da306f6997374a"
+            "184b7e7c232a42f21e89b06e6e7ceab81303c6b7483152d08d19ac829b22eb81e601");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "bed58b64a6c4e959eca60a86f0b2149ce0e1dd527ac5fd26aef725ebf7c22a7d");
+    }
+    { // sign stakewithdraw
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        auto& action = *input.mutable_stakewithdraw();
+        action.set_bucketindex(10);
+        action.set_payload("payload");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(
+            hex(output.encoded()),
+            "0a18080118c0843d22023130d2020b080a12077061796c6f6164124104755ce6d8903f6b3793bddb4ea5"
+            "d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef30d"
+            "d6a1038ed9da8daf331a4152644d102186be6640d46b517331f3402e24424b0d85129595421d28503d75"
+            "340b2922f5a0d4f667bbd6f576d9816770286b2ce032ba22eaec3952e24da4756b00");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "28049348cf34f1aa927caa250e7a1b08778c44efaf73b565b6fa9abe843871b4");
+    }
+    { // sign stakerestake
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        auto& action = *input.mutable_stakerestake();
+        action.set_bucketindex(10);
+        action.set_stakedduration(1000);
+        action.set_autostake(true);
+        action.set_payload("payload");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(
+            hex(output.encoded()),
+            "0a1d080118c0843d22023130e20210080a10e807180122077061796c6f6164124104755ce6d8903f6b37"
+            "93bddb4ea5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c"
+            "0bc76ef30dd6a1038ed9da8daf331a41e2e763aed5b1fd1a8601de0f0ae34eb05162e34b0389ae3418ee"
+            "dbf762f64959634a968313a6516dba3a97b34efba4753bbed3a33d409ecbd45ac75007cd8e9101");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "8816e8f784a1fce40b54d1cd172bb6976fd9552f1570c73d1d9fcdc5635424a9");
+    }
+    { // sign stakechangecandidate
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        auto& action = *input.mutable_stakechangecandidate();
+        action.set_bucketindex(10);
+        action.set_candidatename("io1xpq62aw85uqzrccg9y5hnryv8ld2nkpycc3gza");
+        action.set_payload("payload");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(
+            hex(output.encoded()),
+            "0a43080118c0843d22023130ea0236080a1229696f3178707136326177383575717a7263636739793568"
+            "6e727976386c64326e6b7079636333677a611a077061796c6f6164124104755ce6d8903f6b3793bddb4e"
+            "a5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef3"
+            "0dd6a1038ed9da8daf331a41d519eb3747163b945b862989b7e82a7f8468001e9683757cb88d5ddd95f8"
+            "1895047429e858bd48f7d59a88bfec92de231d216293aeba1e4fbe11461d9c9fc99801");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "186526b5b9fe74e25beb52c83c41780a69108160bef2ddaf3bffb9f1f1e5e73a");
+    }
+    { // sign staketransfer
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        auto& action = *input.mutable_staketransferownership();
+        action.set_bucketindex(10);
+        action.set_voteraddress("io1xpq62aw85uqzrccg9y5hnryv8ld2nkpycc3gza");
+        action.set_payload("payload");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(
+            hex(output.encoded()),
+            "0a43080118c0843d22023130f20236080a1229696f3178707136326177383575717a7263636739793568"
+            "6e727976386c64326e6b7079636333677a611a077061796c6f6164124104755ce6d8903f6b3793bddb4e"
+            "a5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef3"
+            "0dd6a1038ed9da8daf331a41fa26db427ab87a56a129196c1604f2e22c4dd2a1f99b2217bc916260757d"
+            "00093d9e6dccdf53e3b0b64e41a69d71c238fbf9281625164694a74dfbeba075d0ce01");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "74b2e1d6a09ba5d1298fa422d5850991ae516865077282196295a38f93c78b85");
+    }
+    { // sign candidateupdate
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        auto& action = *input.mutable_candidateupdate();
+        action.set_name("test");
+        action.set_operatoraddress("io1cl6rl2ev5dfa988qmgzg2x4hfazmp9vn2g66ng");
+        action.set_rewardaddress("io1juvx5g063eu4ts832nukp4vgcwk2gnc5cu9ayd");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(
+            hex(output.encoded()),
+            "0a69080118c0843d2202313082035c0a04746573741229696f31636c36726c3265763564666139383871"
+            "6d677a673278346866617a6d7039766e326736366e671a29696f316a7576783567303633657534747338"
+            "33326e756b7034766763776b32676e6335637539617964124104755ce6d8903f6b3793bddb4ea5d3589d"
+            "637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99a5c1335b583c0bc76ef30dd6a103"
+            "8ed9da8daf331a4101885c9c6684a4a8f2f5bf11f8326f27be48658f292e8f55ec8a11a604bb0c563a11"
+            "ebf12d995ca1c152e00f8e0f0edf288db711aa10dbdfd5b7d73b4a28e1f701");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "ca1a28f0e9a58ffc67037cc75066dbdd8e024aa2b2e416e4d6ce16c3d86282e5");
+    }
+    { // sign candidateregister
+        auto input = createSigningInput();
+        Proto::SigningOutput output;
+        input.set_gasprice("1000");
+        auto& cbi = *input.mutable_candidateregister()->mutable_candidate();
+        cbi.set_name("test");
+        cbi.set_operatoraddress("io10a298zmzvrt4guq79a9f4x7qedj59y7ery84he");
+        cbi.set_rewardaddress("io13sj9mzpewn25ymheukte4v39hvjdtrfp00mlyv");
+
+        auto& action = *input.mutable_candidateregister();
+        action.set_stakedamount("100");
+        action.set_stakedduration(10000);
+        action.set_autostake(false);
+        action.set_owneraddress("io19d0p3ah4g8ww9d7kcxfq87yxe7fnr8rpth5shj");
+        action.set_payload("payload");
+        ANY_SIGN(input, TWCoinTypeIoTeX);
+        ASSERT_EQ(hex(output.encoded()),
+                  "0aaa01080118c0843d220431303030fa029a010a5c0a04746573741229696f3130613239387a6d7a"
+                  "7672743467"
+                  "757137396139663478377165646a35397937657279383468651a29696f3133736a396d7a7065776e"
+                  "3235796d68"
+                  "65756b74653476333968766a647472667030306d6c7976120331303018904e2a29696f3139643070"
+                  "3361683467"
+                  "3877773964376b63786671383779786537666e7238727074683573686a32077061796c6f61641241"
+                  "04755ce6d8"
+                  "903f6b3793bddb4ea5d3589d637de2d209ae0ea930815c82db564ee8cc448886f639e8a0c7e94e99"
+                  "a5c1335b58"
+                  "3c0bc76ef30dd6a1038ed9da8daf331a417819b5bcb635e3577acc8ca757f2c3d6afa451c2b6ff8a"
+                  "9179b141ac"
+                  "68e2c50305679e5d09d288da6f0fb52876a86c74deab6a5247edc6d371de5c2f121e159400");
+        // signed action's hash
+        ASSERT_EQ(hex(output.hash()),
+                  "35f53a536e014b32b85df50483ef04849b80ad60635b3b1979c5ba1096b65237");
+    }
+}
+
+} // namespace TW::IoTeX::tests
diff --git a/tests/chains/IoTeX/TWAnySignerTests.cpp b/tests/chains/IoTeX/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..84336d5fe2e
--- /dev/null
+++ b/tests/chains/IoTeX/TWAnySignerTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+#include "proto/IoTeX.pb.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::IoTeX::tests {
+
+TEST(TWAnySignerIoTeX, Sign) {
+    auto key = parse_hex("68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748");
+    Proto::SigningInput input;
+    input.set_version(1);
+    input.set_nonce(1);
+    input.set_gaslimit(1);
+    input.set_gasprice("1");
+    input.set_privatekey(key.data(), key.size());
+    auto& transfer = *input.mutable_transfer();
+    transfer.set_amount("1");
+    transfer.set_recipient("io1e2nqsyt7fkpzs5x7zf2uk0jj72teu5n6aku3tr");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeIoTeX);
+
+    ASSERT_EQ(hex(output.encoded()), "0a39080110011801220131522e0a01311229696f3165326e7173797437666b707a733578377a6632756b306a6a3732746575356e36616b75337472124104fb30b196ce3e976593ecc2da220dca9cdea8c84d2373770042a930b892ac0f5cf762f20459c9100eb9d4d7597f5817bf21e10b53a0120b9ec1ba5cddfdcb669b1a41ec9757ae6c9009315830faaab250b6db0e9535b00843277f596ae0b2b9efc0bd4e14138c056fc4cdfa285d13dd618052b3d1cb7a3f554722005a2941bfede96601");
+}
+
+} // namespace TW::IoTeX::tests
diff --git a/tests/chains/IoTeX/TWCoinTypeTests.cpp b/tests/chains/IoTeX/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..25107bc3895
--- /dev/null
+++ b/tests/chains/IoTeX/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWIoTeXCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeIoTeX));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeIoTeX, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeIoTeX, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeIoTeX));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeIoTeX));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeIoTeX), 18);
+    ASSERT_EQ(TWBlockchainIoTeX, TWCoinTypeBlockchain(TWCoinTypeIoTeX));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeIoTeX));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeIoTeX));
+    assertStringsEqual(symbol, "IOTX");
+    assertStringsEqual(txUrl, "https://iotexscan.io/action/t123");
+    assertStringsEqual(accUrl, "https://iotexscan.io/address/a12");
+    assertStringsEqual(id, "iotex");
+    assertStringsEqual(name, "IoTeX");
+}
diff --git a/tests/chains/IoTeX/TransactionCompilerTests.cpp b/tests/chains/IoTeX/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..4c25d7e5431
--- /dev/null
+++ b/tests/chains/IoTeX/TransactionCompilerTests.cpp
@@ -0,0 +1,166 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/IoTeX.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TransactionCompiler, IoTeXCompileWithSignatures) {
+    const auto coin = TWCoinTypeIoTeX;
+
+    const auto privateKey0 =
+        parse_hex("0806c458b262edd333a191e92f561aff338211ee3e18ab315a074a2d82aa343f");
+    const auto privateKey1 =
+        parse_hex("6021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d");
+    const auto pubKey0 =
+        parse_hex("034e18306ae9ef4ec9d07bf6e705442d4d1a75e6cdf750330ca2d880f2cc54607c");
+    const auto pubKey1 =
+        parse_hex("0253ad2f3b734a197f64911242aabc9b5b10bf5744949f5396e56427f35448eafa");
+    const auto ExpectedTx0 =
+        "0a4c0801107b18f8062203393939523e0a033435361229696f313837777a703038766e686a6a706b79646e7239"
+        "37716c68386b683064706b6b797466616d386a1a0c68656c6c6f20776f726c64211241044e18306ae9ef4ec9d0"
+        "7bf6e705442d4d1a75e6cdf750330ca2d880f2cc54607c9c33deb9eae9c06e06e04fe9ce3d43962cc67d5aa34f"
+        "beb71270d4bad3d648d91a41555cc8af4181bf85c044c3201462eeeb95374f78aa48c67b87510ee63d5e502372"
+        "e53082f03e9a11c1e351de539cedf85d8dff87de9d003cb9f92243541541a000";
+    const auto ExpectedTx1 =
+        "0a4c0801107b18f8062203393939523e0a033435361229696f313837777a703038766e686a6a706b79646e7239"
+        "37716c68386b683064706b6b797466616d386a1a0c68656c6c6f20776f726c642112410453ad2f3b734a197f64"
+        "911242aabc9b5b10bf5744949f5396e56427f35448eafa84a5d74b49ecb56e011b18c3d5a300e8cff7c6b39d33"
+        "0d1d3799c4700a0b1be21a41de4be56ce74dce8e526590f5b5f947385b00947c4c2ead014429aa706a2470055c"
+        "56c7e57d1b119b487765d59b21bcdeafac25108f6929a14f9edf4b2309534501";
+
+    const auto prkey0 = PrivateKey(privateKey0);
+    const PublicKey pbkey0 = prkey0.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+
+    const auto prkey1 = PrivateKey(privateKey1);
+    const PublicKey pbkey1 = prkey1.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::IoTeX::Proto::SigningInput();
+    input.set_version(1);
+    input.set_nonce(123);
+    input.set_gaslimit(888);
+    input.set_gasprice("999");
+    auto tsf = input.mutable_transfer();
+    tsf->set_amount("456");
+    tsf->set_recipient("io187wzp08vnhjjpkydnr97qlh8kh0dpkkytfam8j");
+    auto text = parse_hex("68656c6c6f20776f726c6421"); // "hello world!"
+    tsf->set_payload(text.data(), text.size());
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = data(preSigningOutput.data());
+    auto preImageHash = data(preSigningOutput.data_hash());
+
+    std::string expectedPreImage =
+        "0801107b18f8062203393939523e0a033435361229696f313837777a703038766e686a6a706b79646e72393771"
+        "6c68386b683064706b6b797466616d386a1a0c68656c6c6f20776f726c6421";
+    std::string expectedPreImageHash =
+        "0f17cd7f43bdbeff73dfe8f5cb0c0045f2990884e5050841de887cf22ca35b50";
+    ASSERT_EQ(hex(preImage), expectedPreImage);
+    ASSERT_EQ(hex(preImageHash), expectedPreImageHash);
+
+    Data signature = parse_hex("555cc8af4181bf85c044c3201462eeeb95374f78aa48c67b87510ee63d5e502372e"
+                               "53082f03e9a11c1e351de539cedf85d8dff87de9d003cb9f92243541541a000");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(pbkey0.verify(signature, preImageHash));
+    /// Step 3: Compile transaction info
+    {
+        const Data outputData =
+            TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {pbkey0.bytes});
+
+        TW::IoTeX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx0);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::IoTeX::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        EXPECT_EQ(hex(PrivateKey(privateKey0).getPublicKey(TWPublicKeyTypeSECP256k1).bytes),
+                  hex(pubKey0));
+        signingInput.set_privatekey(prkey0.bytes.data(), prkey0.bytes.size());
+        TW::IoTeX::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx0);
+    }
+
+    { // more signatures
+        TW::IoTeX::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        EXPECT_EQ(hex(PrivateKey(privateKey1).getPublicKey(TWPublicKeyTypeSECP256k1).bytes),
+                  hex(pubKey1));
+        signingInput.set_privatekey(prkey1.bytes.data(), prkey1.bytes.size());
+        TW::IoTeX::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx1);
+    }
+
+    { // Negative: invalid public key
+        const auto publicKeyBlake =
+            parse_hex("6641abedacf9483b793afe1718689cc9420bbb1c");
+        EXPECT_EXCEPTION(
+            TransactionCompiler::compileWithSignatures(
+                coin, inputStrData, {signature}, {publicKeyBlake}),
+            "Invalid public key");
+    }
+
+    { // Negative: not enough signatures
+        const Data outputData =
+            TransactionCompiler::compileWithSignatures(coin, inputStrData, {}, {pbkey0.bytes});
+
+        TW::IoTeX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+        EXPECT_EQ(output.error_message(), "empty signatures or publickeys");
+    }
+
+    { // Negative: not enough publicKey
+        const Data outputData =
+            TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {});
+
+        TW::IoTeX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+        EXPECT_EQ(output.error_message(), "empty signatures or publickeys");
+    }
+
+    { // Negative: not one to on
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature}, {pbkey0.bytes, pbkey1.bytes});
+
+        TW::IoTeX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+        EXPECT_EQ(output.error_message(), "signatures and publickeys size can only be one");
+    }
+}
\ No newline at end of file
diff --git a/tests/chains/KavaEvm/TWCoinTypeTests.cpp b/tests/chains/KavaEvm/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..75ea26d7afc
--- /dev/null
+++ b/tests/chains/KavaEvm/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWKavaEvmCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeKavaEvm;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xa999bd5183568ba178795e6a9d1561566fbf4a9ccc813cc475168832bc4909b3"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xF92d3DB0d9f912f285b1ec69578A6201A78487d7"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "kavaevm");
+    assertStringsEqual(name, "KavaEvm");
+    assertStringsEqual(symbol, "KAVA");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "2222");
+    assertStringsEqual(txUrl, "https://explorer.kava.io/tx/0xa999bd5183568ba178795e6a9d1561566fbf4a9ccc813cc475168832bc4909b3");
+    assertStringsEqual(accUrl, "https://explorer.kava.io/address/0xF92d3DB0d9f912f285b1ec69578A6201A78487d7");
+}
diff --git a/tests/chains/Kin/TWCoinTypeTests.cpp b/tests/chains/Kin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..0f8c6f5c509
--- /dev/null
+++ b/tests/chains/Kin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWKinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeKin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeKin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeKin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeKin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeKin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeKin), 5);
+    ASSERT_EQ(TWBlockchainStellar, TWCoinTypeBlockchain(TWCoinTypeKin));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeKin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeKin));
+    assertStringsEqual(symbol, "KIN");
+    assertStringsEqual(txUrl, "https://www.kin.org/blockchainInfoPage/?&dataType=public&header=Transaction&id=t123");
+    assertStringsEqual(accUrl, "https://www.kin.org/blockchainAccount/?&dataType=public&header=accountID&id=a12");
+    assertStringsEqual(id, "kin");
+    assertStringsEqual(name, "Kin");
+}
diff --git a/tests/chains/Klaytn/TWCoinTypeTests.cpp b/tests/chains/Klaytn/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..3a07d5df016
--- /dev/null
+++ b/tests/chains/Klaytn/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWKaiaCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeKaia;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x2ad9656bf5b82caf10847b431012e28e301e83ba"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "kaia");
+    assertStringsEqual(name, "Kaia");
+    assertStringsEqual(symbol, "KLAY");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "8217");
+    assertStringsEqual(txUrl, "https://kaiascan.io/tx/0x93ea92687845fe7bb6cacd69c76a16a2a3c2bbb85a8a93ff0e032d0098d583d7");
+    assertStringsEqual(accUrl, "https://kaiascan.io/account/0x2ad9656bf5b82caf10847b431012e28e301e83ba");
+}
diff --git a/tests/chains/Komodo/AddressTests.cpp b/tests/chains/Komodo/AddressTests.cpp
new file mode 100644
index 00000000000..ab2e54482db
--- /dev/null
+++ b/tests/chains/Komodo/AddressTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HDWallet.h"
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+
+namespace TW::Komodo::tests {
+
+TEST(KomodoAddress, Valid) {
+    ASSERT_TRUE(TW::validateAddress(TWCoinTypeKomodo, "RXL3YXG2ceaB6C5hfJcN4fvmLH2C34knhA"));
+}
+
+TEST(KomodoAddress, Invalid) {
+    ASSERT_FALSE(TW::validateAddress(TWCoinTypeKomodo, "t1Wg9uPPAfwhBWeRjtDPa5ZHNzyBx9rJVKY"));
+}
+
+TEST(KomodoAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("020e46e79a2a8d12b9b5d12c7a91adb4e454edfae43c0a0cb805427d2ac7613fd9"), TWPublicKeyTypeSECP256k1);
+    auto address = TW::deriveAddress(TWCoinTypeKomodo, publicKey);
+    ASSERT_EQ(address, "RXL3YXG2ceaB6C5hfJcN4fvmLH2C34knhA");
+
+    auto wallet = HDWallet("shoot island position soft burden budget tooth cruel issue economy destroy above", "");
+    auto addr = wallet.deriveAddress(TWCoinTypeKomodo);
+    EXPECT_EQ(addr, "RCWJLXE5CSXydxdSnwcghzPgkFswERegyb");
+}
+
+} // namespace TW::Komodo::tests
diff --git a/tests/chains/Komodo/TWAnyAddressTests.cpp b/tests/chains/Komodo/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..fb1374f99fe
--- /dev/null
+++ b/tests/chains/Komodo/TWAnyAddressTests.cpp
@@ -0,0 +1,24 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include <TrustWalletCore/TWAnyAddress.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Komodo::tests {
+
+TEST(TWKomodo, Address) {
+    auto string = STRING("RALiENnMMjyubc38hM31h6oicPsuWdAMYg");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeKomodo));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "0ba28b3eebfe1d39dab038324be2c66090ee21a3");
+}
+
+} // namespace TW::Komodo::tests
diff --git a/tests/chains/Komodo/TWCoinTypeTests.cpp b/tests/chains/Komodo/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..ca1c88a4c15
--- /dev/null
+++ b/tests/chains/Komodo/TWCoinTypeTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::Komodo::tests {
+
+TEST(TWKomodoCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeKomodo;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("f53bd1a5c0f5dc4b60ba9a1882742ea96faa996e1b870795812a29604dd7829e"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("RWvfkt8UjbPWXgeZEcgYmKw2vA1bbAx5t2"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "komodo");
+    assertStringsEqual(name, "Komodo");
+    assertStringsEqual(symbol, "KMD");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 8);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainZcash);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x55);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(txUrl, "https://kmdexplorer.io//tx/f53bd1a5c0f5dc4b60ba9a1882742ea96faa996e1b870795812a29604dd7829e");
+    assertStringsEqual(accUrl, "https://kmdexplorer.io//address/RWvfkt8UjbPWXgeZEcgYmKw2vA1bbAx5t2");
+}
+
+} // namespace TW::Komodo::tests
\ No newline at end of file
diff --git a/tests/chains/Komodo/TransactionCompilerTests.cpp b/tests/chains/Komodo/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..70b12713334
--- /dev/null
+++ b/tests/chains/Komodo/TransactionCompilerTests.cpp
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "Zcash/TransactionBuilder.h"
+
+#include "proto/Bitcoin.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+namespace TW::Komodo::tests {
+
+TEST(KomodoCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeKomodo;
+
+    // tx on mainnet
+    // https://kmdexplorer.io/tx/dab3e7a705b0f80f0cd557a1e727dc50d8ccd24ff0ae159ca8cdefda656d7c9b
+    
+    const int64_t amount = 892984972;
+    const int64_t fee = 407;
+    const std::string toAddress = "RVUiqSDZEqTw9Ny4XRBsp6fgJKtmUj5nXD";
+    auto publicKey = PublicKey(parse_hex("021f5a3a5f78b1f0adbbd8685c2c32de45e00e5b83faa814db57ce410295405207"), TWPublicKeyTypeSECP256k1);
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_coin_type(coin);
+
+    auto txHash0 = parse_hex("f6118b221c4e5f436d536eded8486f6b0cc6ab99ca424da120fec593304acd8c");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(1);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(892989042);
+
+    auto utxoAddr0 = "R9TKEwwiDLA2oD7a1jt8YmCoX2cjg1pfEU";
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, coin);
+    ASSERT_EQ(hex(script0.bytes), "76a91401ea238017d65b2c5152a81146b95582b5284c2f88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+
+    auto plan = Zcash::TransactionBuilder::plan(input);
+    ASSERT_EQ(plan.error, Common::Proto::OK);
+
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 0;
+    std::copy(Zcash::SaplingBranchID.begin(), Zcash::SaplingBranchID.end(), std::back_inserter(plan.branchId));
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // build preimage
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    ASSERT_EQ(preSigningOutput.hash_public_keys().size(), 1);
+
+    auto preImageHash = data(preSigningOutput.hash_public_keys()[0].data_hash());
+    EXPECT_EQ(hex(preImageHash),
+              "09323f2c24af2cf44453aa228c213f26f40e1f87548031bad35cc4c65edc087a");
+
+    // compile
+    TW::Data signature0 = parse_hex("3045022100fb6e7a940815bc0de683dd70ed85696ffe21199958161331e76954af2ba11b1b02204860632bcad9c5a3cbaa2d60c401f7616f529e4c65915f1996286d3bd54c01cb");
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature0}, {publicKey.bytes});
+    Bitcoin::Proto::SigningOutput signingOutput;
+    ASSERT_TRUE(signingOutput.ParseFromArray(outputData.data(), (int)outputData.size()));
+    ASSERT_EQ(signingOutput.error(), Common::Proto::OK);
+    ASSERT_EQ(hex(signingOutput.encoded()), "0400008085202f89018ccd4a3093c5fe20a14d42ca99abc60c6b6f48d8de6e536d435f4e1c228b11f6010000006b483045022100fb6e7a940815bc0de683dd70ed85696ffe21199958161331e76954af2ba11b1b02204860632bcad9c5a3cbaa2d60c401f7616f529e4c65915f1996286d3bd54c01cb0121021f5a3a5f78b1f0adbbd8685c2c32de45e00e5b83faa814db57ce410295405207ffffffff018cde3935000000001976a914dd90c41f2916bcfea10ed11cd10ed4db01c5be6488ac00000000000000000000000000000000000000");
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature0, signature0}, {publicKey.bytes});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+} // namespace TW::Komodo::tests
\ No newline at end of file
diff --git a/tests/chains/KuCoinCommunityChain/TWCoinTypeTests.cpp b/tests/chains/KuCoinCommunityChain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..c1f3e42147f
--- /dev/null
+++ b/tests/chains/KuCoinCommunityChain/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWKuCoinCommunityChainCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeKuCoinCommunityChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x2f0d79cd289a02f3181b68b9583a64c3809fe7387810b274275985c29d02c80d"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeKuCoinCommunityChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x4446fc4eb47f2f6586f9faab68b3498f86c07521"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeKuCoinCommunityChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeKuCoinCommunityChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeKuCoinCommunityChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeKuCoinCommunityChain), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeKuCoinCommunityChain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeKuCoinCommunityChain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeKuCoinCommunityChain));
+    assertStringsEqual(symbol, "KCS");
+    assertStringsEqual(txUrl, "https://explorer.kcc.io/en/tx/0x2f0d79cd289a02f3181b68b9583a64c3809fe7387810b274275985c29d02c80d");
+    assertStringsEqual(accUrl, "https://explorer.kcc.io/en/address/0x4446fc4eb47f2f6586f9faab68b3498f86c07521");
+    assertStringsEqual(id, "kcc");
+    assertStringsEqual(name, "KuCoin Community Chain");
+}
diff --git a/tests/chains/Kusama/AddressTests.cpp b/tests/chains/Kusama/AddressTests.cpp
new file mode 100644
index 00000000000..a29aa2abf54
--- /dev/null
+++ b/tests/chains/Kusama/AddressTests.cpp
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Kusama/Address.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+namespace TW::Kusama::tests {
+
+TEST(KusamaAddress, Validation) {
+    // Substrate ed25519
+    ASSERT_FALSE(Address::isValid("5FqqU2rytGPhcwQosKRtW1E3ha6BJKAjHgtcodh71dSyXhoZ"));
+    // Polkadot ed25519
+    ASSERT_FALSE(Address::isValid("15AeCjMpcSt3Fwa47jJBd7JzQ395Kr2cuyF5Zp4UBf1g9ony"));
+    // Polkadot sr25519
+    ASSERT_FALSE(Address::isValid("15AeCjMpcSt3Fwa47jJBd7JzQ395Kr2cuyF5Zp4UBf1g9ony"));
+    // Bitcoin
+    ASSERT_FALSE(Address::isValid("1ES14c7qLb5CYhLMUekctxLgc1FV2Ti9DA"));
+
+    // Kusama ed25519
+    ASSERT_TRUE(Address::isValid("FHKAe66mnbk8ke8zVWE9hFVFrJN1mprFPVmD5rrevotkcDZ"));
+    // Kusama secp256k1
+    ASSERT_TRUE(Address::isValid("FxQFyTorsjVsjjMyjdgq8w5vGx8LiA1qhWbRYcFijxKKchx"));
+    // Kusama sr25519
+    ASSERT_TRUE(Address::isValid("EJ5UJ12GShfh7EWrcNZFLiYU79oogdtXFUuDDZzk7Wb2vCe"));
+}
+
+TEST(KusamaAddress, FromPrivateKey) {
+    // from subkey: tiny escape drive pupil flavor endless love walk gadget match filter luxury
+    auto privateKey = PrivateKey(parse_hex("0xa21981f3bb990c40837df44df639541ff57c5e600f9eb4ac00ed8d1f718364e5"));
+    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
+    ASSERT_EQ(address.string(), "CeVXtoU4py9e7F6upfM2ZarVave299TjcdaTSxhDDZrYgnM");
+}
+
+TEST(KusamaAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("0x032eb287017c5cde2940b5dd062d413f9d09f8aa44723fc80bf46b96c81ac23d"), TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "CeVXtoU4py9e7F6upfM2ZarVave299TjcdaTSxhDDZrYgnM");
+}
+
+TEST(KusamaAddress, FromString) {
+    auto address = Address("CeVXtoU4py9e7F6upfM2ZarVave299TjcdaTSxhDDZrYgnM");
+    ASSERT_EQ(address.string(), "CeVXtoU4py9e7F6upfM2ZarVave299TjcdaTSxhDDZrYgnM");
+}
+
+} // namespace TW::Kusama::tests
\ No newline at end of file
diff --git a/tests/chains/Kusama/SignerTests.cpp b/tests/chains/Kusama/SignerTests.cpp
new file mode 100644
index 00000000000..f271547e1e8
--- /dev/null
+++ b/tests/chains/Kusama/SignerTests.cpp
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Polkadot/Extrinsic.h"
+#include "Polkadot/SS58Address.h"
+#include "Polkadot/Signer.h"
+#include "Coin.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "proto/Polkadot.pb.h"
+#include "uint256.h"
+
+#include <TrustWalletCore/TWSS58AddressType.h>
+#include <gtest/gtest.h>
+
+
+namespace TW::Polkadot::tests {
+    extern PrivateKey privateKey;
+    extern PublicKey toPublicKey;
+    auto genesisHashKSM = parse_hex("b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe");
+
+TEST(KusamaSigner, SignTransferKSM) {
+    auto blockHash = parse_hex("4955dd4813f3e91ef3fd5a825b928af2fc50a71380085f753ccef00bb1582891");
+    auto toAddress = SS58Address(toPublicKey, TWSS58AddressTypeKusama);
+
+    auto input = TW::Polkadot::Proto::SigningInput();
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_genesis_hash(genesisHashKSM.data(), genesisHashKSM.size());
+    input.set_nonce(0);
+    input.set_spec_version(2019);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_network(ss58Prefix(TWCoinType::TWCoinTypeKusama));
+    input.set_transaction_version(2);
+
+    auto balanceCall = input.mutable_balance_call();
+    auto& transfer = *balanceCall->mutable_transfer();
+    auto value = store(uint256_t(12345));
+    transfer.set_to_address(toAddress.string());
+    transfer.set_value(value.data(), value.size());
+
+    auto extrinsic = TW::Polkadot::Extrinsic(input);
+    auto preimage = extrinsic.encodePayload();
+    auto output = TW::Polkadot::Signer::sign(input);
+
+    ASSERT_EQ(hex(preimage), "04008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48e5c0000000e307000002000000b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe4955dd4813f3e91ef3fd5a825b928af2fc50a71380085f753ccef00bb1582891");
+    ASSERT_EQ(hex(output.encoded()), "25028488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee000765cfa76cfe19499f4f19ef7dc4527652ec5b2e6b5ecfaf68725dafd48ae2694ad52e61f44152a544784e847de10ddb2c56bee4406574dcbcfdb5e5d35b6d0300000004008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48e5c0");
+}
+
+} // namespace TW::Polkadot::tests
diff --git a/tests/chains/Kusama/TWAnySignerTests.cpp b/tests/chains/Kusama/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..cb61bf2ee82
--- /dev/null
+++ b/tests/chains/Kusama/TWAnySignerTests.cpp
@@ -0,0 +1,40 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Polkadot.pb.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Polkadot::tests {
+
+TEST(TWAnySignerKusama, Sign) {
+    auto key = parse_hex("0x8cdc538e96f460da9d639afc5c226f477ce98684d77fb31e88db74c1f1dd86b2");
+    auto genesisHash = parse_hex("0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe");
+
+    Proto::SigningInput input;
+    input.set_block_hash(genesisHash.data(), genesisHash.size());
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_nonce(1);
+    input.set_spec_version(2019);
+    input.set_private_key(key.data(), key.size());
+    input.set_network(TWCoinTypeSS58Prefix(TWCoinTypeKusama));
+    input.set_transaction_version(2);
+
+    auto balanceCall = input.mutable_balance_call();
+    auto& transfer = *balanceCall->mutable_transfer();
+    auto value = store(uint256_t(10000000000));
+    transfer.set_to_address("CtwdfrhECFs3FpvCGoiE4hwRC4UsSiM8WL899HjRdQbfYZY");
+    transfer.set_value(value.data(), value.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeKusama);
+
+    ASSERT_EQ(hex(output.encoded()), "350284f41296779fd61a5bed6c2f506cc6c9ea93d6aeb357b9c69717193f434ba24ae700cd78b46eff36c433e642d7e9830805aab4f43eef70067ef32c8b2a294c510673a841c5f8a6e8900c03be40cfa475ae53e6f8aa61961563cb7cc0fa169ef9630d00040004000e33fdfb980e4499e5c3576e742a563b6a4fc0f6f598b1917fd7a6fe393ffc720700e40b5402");
+}
+
+} // namespace TW::Polkadot::tests
diff --git a/tests/chains/Kusama/TWCoinTypeTests.cpp b/tests/chains/Kusama/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6dcf092e68d
--- /dev/null
+++ b/tests/chains/Kusama/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWKusamaCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeKusama));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xcbe0c2e2851c1245bedaae4d52f06eaa6b4784b786bea2f0bff11af7715973dd"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeKusama, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("DbCNECPna3k6MXFWWNZa5jGsuWycqEE6zcUxZYkxhVofrFk"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeKusama, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeKusama));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeKusama));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeKusama), 12);
+    ASSERT_EQ(TWBlockchainKusama, TWCoinTypeBlockchain(TWCoinTypeKusama));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeKusama));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeKusama));
+    assertStringsEqual(symbol, "KSM");
+    assertStringsEqual(txUrl, "https://kusama.subscan.io/extrinsic/0xcbe0c2e2851c1245bedaae4d52f06eaa6b4784b786bea2f0bff11af7715973dd");
+    assertStringsEqual(accUrl, "https://kusama.subscan.io/account/DbCNECPna3k6MXFWWNZa5jGsuWycqEE6zcUxZYkxhVofrFk");
+    assertStringsEqual(id, "kusama");
+    assertStringsEqual(name, "Kusama");
+}
diff --git a/tests/chains/Lightlink/TWCoinTypeTests.cpp b/tests/chains/Lightlink/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..1b41b162d87
--- /dev/null
+++ b/tests/chains/Lightlink/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWLightlinkCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeLightlink;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xc65f82445aefc883fd4ffe09149c8ce48f61b670c0734528a49d4a8bd8309bb0"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x4566ED6c7a7fFc90E2C7cfF7eB9156262afD2fDe"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "lightlink");
+    assertStringsEqual(name, "Lightlink Phoenix");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://phoenix.lightlink.io/tx/0xc65f82445aefc883fd4ffe09149c8ce48f61b670c0734528a49d4a8bd8309bb0");
+    assertStringsEqual(accUrl, "https://phoenix.lightlink.io/address/0x4566ED6c7a7fFc90E2C7cfF7eB9156262afD2fDe");
+}
diff --git a/tests/chains/Linea/TWCoinTypeTests.cpp b/tests/chains/Linea/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..8570bd33cdd
--- /dev/null
+++ b/tests/chains/Linea/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWLineaCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeLinea;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x0c7086f96865f4fcad58d7f3449db7baab9fce2625bcb79e7ea26676aa0d3420"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xbf71018f716ca6c64b0b12622f87a26b3b86100f"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "linea");
+    assertStringsEqual(name, "Linea");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "59144");
+    assertStringsEqual(txUrl, "https://lineascan.build/tx/0x0c7086f96865f4fcad58d7f3449db7baab9fce2625bcb79e7ea26676aa0d3420");
+    assertStringsEqual(accUrl, "https://lineascan.build/address/0xbf71018f716ca6c64b0b12622f87a26b3b86100f");
+}
diff --git a/tests/Litecoin/LitecoinAddressTests.cpp b/tests/chains/Litecoin/LitecoinAddressTests.cpp
similarity index 83%
rename from tests/Litecoin/LitecoinAddressTests.cpp
rename to tests/chains/Litecoin/LitecoinAddressTests.cpp
index 6858723ce13..19bee636bb4 100644
--- a/tests/Litecoin/LitecoinAddressTests.cpp
+++ b/tests/chains/Litecoin/LitecoinAddressTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bitcoin/Address.h"
 #include "Bitcoin/SegwitAddress.h"
diff --git a/tests/chains/Litecoin/TWCoinTypeTests.cpp b/tests/chains/Litecoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..0bb7e1376f6
--- /dev/null
+++ b/tests/chains/Litecoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWLitecoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeLitecoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeLitecoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeLitecoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeLitecoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeLitecoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeLitecoin), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeLitecoin));
+    ASSERT_EQ(0x32, TWCoinTypeP2shPrefix(TWCoinTypeLitecoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeLitecoin));
+    assertStringsEqual(symbol, "LTC");
+    assertStringsEqual(txUrl, "https://blockchair.com/litecoin/transaction/t123");
+    assertStringsEqual(accUrl, "https://blockchair.com/litecoin/address/a12");
+    assertStringsEqual(id, "litecoin");
+    assertStringsEqual(name, "Litecoin");
+}
diff --git a/tests/Litecoin/TWLitecoinTests.cpp b/tests/chains/Litecoin/TWLitecoinTests.cpp
similarity index 95%
rename from tests/Litecoin/TWLitecoinTests.cpp
rename to tests/chains/Litecoin/TWLitecoinTests.cpp
index 35daa1d0a8c..f85584a571a 100644
--- a/tests/Litecoin/TWLitecoinTests.cpp
+++ b/tests/chains/Litecoin/TWLitecoinTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWAnyAddress.h>
 #include <TrustWalletCore/TWBitcoinAddress.h>
diff --git a/tests/chains/MantaPacific/TWCoinTypeTests.cpp b/tests/chains/MantaPacific/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..53dbbf4ffde
--- /dev/null
+++ b/tests/chains/MantaPacific/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWMantaPacificCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeMantaPacific;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x2bbd5d85b0ed05d1416e30ce1197a6f0c27d10ce02593a2719e2baf486d2e8c2"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xF122a1aC569a36a5Cf6d0F828A22254c8A9afF84"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "manta");
+    assertStringsEqual(name, "Manta Pacific");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://pacific-explorer.manta.network/tx/0x2bbd5d85b0ed05d1416e30ce1197a6f0c27d10ce02593a2719e2baf486d2e8c2");
+    assertStringsEqual(accUrl, "https://pacific-explorer.manta.network/address/0xF122a1aC569a36a5Cf6d0F828A22254c8A9afF84");
+}
diff --git a/tests/chains/Mantle/TWCoinTypeTests.cpp b/tests/chains/Mantle/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..43518159914
--- /dev/null
+++ b/tests/chains/Mantle/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWMantleCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeMantle;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xfae996ea23f1ff9909ac04d26ae6e52ab600a84163fab9e0e893483c685629dd"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xA295EEFd401C8BE1457F266d3e73cdD015e5CFbb"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "mantle");
+    assertStringsEqual(name, "Mantle");
+    assertStringsEqual(symbol, "MNT");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "5000");
+    assertStringsEqual(txUrl, "https://explorer.mantle.xyz/tx/0xfae996ea23f1ff9909ac04d26ae6e52ab600a84163fab9e0e893483c685629dd");
+    assertStringsEqual(accUrl, "https://explorer.mantle.xyz/address/0xA295EEFd401C8BE1457F266d3e73cdD015e5CFbb");
+}
diff --git a/tests/chains/Merlin/TWCoinTypeTests.cpp b/tests/chains/Merlin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..c50d7b185bb
--- /dev/null
+++ b/tests/chains/Merlin/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWMerlinCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeMerlin;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xca6f2891959b669237738dd0bc2c1051d966778c9de90b94165032ce58364212"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xf7e017b3f61bD3410A3b03D7DAD7699FD6780584"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "merlin");
+    assertStringsEqual(name, "Merlin");
+    assertStringsEqual(symbol, "BTC");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://scan.merlinchain.io/tx/0xca6f2891959b669237738dd0bc2c1051d966778c9de90b94165032ce58364212");
+    assertStringsEqual(accUrl, "https://scan.merlinchain.io/address/0xf7e017b3f61bD3410A3b03D7DAD7699FD6780584");
+}
diff --git a/tests/chains/Meter/TWCoinTypeTests.cpp b/tests/chains/Meter/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..711c4fb8577
--- /dev/null
+++ b/tests/chains/Meter/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWMeterCoinType, TWCoinType) {
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeMeter));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x8ea268d5dbb40217c763b800a75fc063cf28b56f40f2bc69dc043f5c4bbdc144"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeMeter, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xe5a273954d24eddf9ae9ea4cef2347d584cfa3dd"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeMeter, accId.get()));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeMeter));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeMeter));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeMeter), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeMeter));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeMeter));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeMeter));
+    assertStringsEqual(symbol, "MTR");
+    assertStringsEqual(txUrl, "https://scan.meter.io/tx/0x8ea268d5dbb40217c763b800a75fc063cf28b56f40f2bc69dc043f5c4bbdc144");
+    assertStringsEqual(accUrl, "https://scan.meter.io/address/0xe5a273954d24eddf9ae9ea4cef2347d584cfa3dd");
+    assertStringsEqual(id, "meter");
+    assertStringsEqual(name, "Meter");
+}
diff --git a/tests/chains/Metis/TWCoinTypeTests.cpp b/tests/chains/Metis/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..b5696255acd
--- /dev/null
+++ b/tests/chains/Metis/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWMetisCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeMetis));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x422f2ebbede32d4434ad0cf0ae55d44a84e14d3d5725a760133255b42676d8ce"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeMetis, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xBe9E8Ec25866B21bA34e97b9393BCabBcB4A5C86"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeMetis, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeMetis));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeMetis));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeMetis), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeMetis));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeMetis));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeMetis));
+    assertStringsEqual(symbol, "METIS");
+    assertStringsEqual(txUrl, "https://andromeda-explorer.metis.io/tx/0x422f2ebbede32d4434ad0cf0ae55d44a84e14d3d5725a760133255b42676d8ce");
+    assertStringsEqual(accUrl, "https://andromeda-explorer.metis.io/address/0xBe9E8Ec25866B21bA34e97b9393BCabBcB4A5C86");
+    assertStringsEqual(id, "metis");
+    assertStringsEqual(name, "Metis");
+}
diff --git a/tests/chains/Monacoin/TWCoinTypeTests.cpp b/tests/chains/Monacoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..30ae52f4ef0
--- /dev/null
+++ b/tests/chains/Monacoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWMonacoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeMonacoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeMonacoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeMonacoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeMonacoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeMonacoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeMonacoin), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeMonacoin));
+    ASSERT_EQ(0x37, TWCoinTypeP2shPrefix(TWCoinTypeMonacoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeMonacoin));
+    assertStringsEqual(symbol, "MONA");
+    assertStringsEqual(txUrl, "https://blockbook.electrum-mona.org/tx/t123");
+    assertStringsEqual(accUrl, "https://blockbook.electrum-mona.org/address/a12");
+    assertStringsEqual(id, "monacoin");
+    assertStringsEqual(name, "Monacoin");
+}
diff --git a/tests/Monacoin/TWMonacoinAddressTests.cpp b/tests/chains/Monacoin/TWMonacoinAddressTests.cpp
similarity index 95%
rename from tests/Monacoin/TWMonacoinAddressTests.cpp
rename to tests/chains/Monacoin/TWMonacoinAddressTests.cpp
index e8f6c7c985d..a4ef2fa7fca 100644
--- a/tests/Monacoin/TWMonacoinAddressTests.cpp
+++ b/tests/chains/Monacoin/TWMonacoinAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWSegwitAddress.h>
 #include <TrustWalletCore/TWBitcoinAddress.h>
diff --git a/tests/Monacoin/TWMonacoinTransactionTests.cpp b/tests/chains/Monacoin/TWMonacoinTransactionTests.cpp
similarity index 93%
rename from tests/Monacoin/TWMonacoinTransactionTests.cpp
rename to tests/chains/Monacoin/TWMonacoinTransactionTests.cpp
index 29a70f4045f..c2113f0c915 100644
--- a/tests/Monacoin/TWMonacoinTransactionTests.cpp
+++ b/tests/chains/Monacoin/TWMonacoinTransactionTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include "HexCoding.h"
 #include "PublicKey.h"
 #include "proto/Bitcoin.pb.h"
diff --git a/tests/chains/Moonbeam/TWCoinTypeTests.cpp b/tests/chains/Moonbeam/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..4d30a26c0f5
--- /dev/null
+++ b/tests/chains/Moonbeam/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWMoonbeamCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeMoonbeam;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb22a146c933e6e51affbfa5f712a266b5f5e92ae453cd2f252bcc3c36ff035a6"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x201bb4f276C765dF7225e5A4153E17edD23a67eC"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "moonbeam");
+    assertStringsEqual(name, "Moonbeam");
+    assertStringsEqual(symbol, "GLMR");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "1284");
+    assertStringsEqual(txUrl, "https://moonscan.io/tx/0xb22a146c933e6e51affbfa5f712a266b5f5e92ae453cd2f252bcc3c36ff035a6");
+    assertStringsEqual(accUrl, "https://moonscan.io/address/0x201bb4f276C765dF7225e5A4153E17edD23a67eC");
+}
diff --git a/tests/chains/Moonriver/TWCoinTypeTests.cpp b/tests/chains/Moonriver/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..b278f21814c
--- /dev/null
+++ b/tests/chains/Moonriver/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWMoonriverCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeMoonriver;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x2e2daa3943ba65d9bbb910a4f6765aa6a466a0ef8935090547ca9d30e201e032"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x899831D937937d011305E73EE782cce0455DF15a"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "moonriver");
+    assertStringsEqual(name, "Moonriver");
+    assertStringsEqual(symbol, "MOVR");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "1285");
+    assertStringsEqual(txUrl, "https://moonriver.moonscan.io/tx/0x2e2daa3943ba65d9bbb910a4f6765aa6a466a0ef8935090547ca9d30e201e032");
+    assertStringsEqual(accUrl, "https://moonriver.moonscan.io/address/0x899831D937937d011305E73EE782cce0455DF15a");
+}
diff --git a/tests/chains/MultiversX/AddressTests.cpp b/tests/chains/MultiversX/AddressTests.cpp
new file mode 100644
index 00000000000..2135f4678bd
--- /dev/null
+++ b/tests/chains/MultiversX/AddressTests.cpp
@@ -0,0 +1,67 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <gtest/gtest.h>
+#include <vector>
+
+#include "MultiversX/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestAccounts.h"
+
+using namespace TW;
+
+namespace TW::MultiversX::tests {
+
+TEST(MultiversXAddress, Valid) {
+    ASSERT_TRUE(Address::isValid(ALICE_BECH32));
+    ASSERT_TRUE(Address::isValid(BOB_BECH32));
+}
+
+TEST(MultiversXAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid(""));
+    ASSERT_FALSE(Address::isValid("foo"));
+    ASSERT_FALSE(Address::isValid("10z9xdugayn528ksaesdwlhf006fw5sg2qmmm0h52fvxczwgesyvq5pwemr"));
+    ASSERT_FALSE(Address::isValid("xerd10z9xdugayn528ksaesdwlhf006fw5sg2qmmm0h52fvxczwgesyvq5pwemr"));
+    ASSERT_FALSE(Address::isValid("foo10z9xdugayn528ksaesdwlhf006fw5sg2qmmm0h52fvxczwgesyvq5pwemr"));
+    ASSERT_FALSE(Address::isValid(ALICE_PUBKEY_HEX));
+}
+
+TEST(MultiversXAddress, FromString) {
+    Address alice, bob, carol;
+    ASSERT_TRUE(Address::decode(ALICE_BECH32, alice));
+    ASSERT_TRUE(Address::decode(BOB_BECH32, bob));
+
+    ASSERT_EQ(ALICE_PUBKEY_HEX, hex(alice.getKeyHash()));
+    ASSERT_EQ(BOB_PUBKEY_HEX, hex(bob.getKeyHash()));
+}
+
+TEST(MultiversXAddress, FromData) {
+    const auto alice = Address(parse_hex(ALICE_PUBKEY_HEX));
+    const auto bob = Address(parse_hex(BOB_PUBKEY_HEX));
+
+    ASSERT_EQ(ALICE_BECH32, alice.string());
+    ASSERT_EQ(BOB_BECH32, bob.string());
+}
+
+TEST(MultiversXAddress, FromPrivateKey) {
+    auto aliceKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    auto alice = Address(aliceKey.getPublicKey(TWPublicKeyTypeED25519));
+    ASSERT_EQ(ALICE_BECH32, alice.string());
+
+    auto bobKey = PrivateKey(parse_hex(BOB_SEED_HEX));
+    auto bob = Address(bobKey.getPublicKey(TWPublicKeyTypeED25519));
+    ASSERT_EQ(BOB_BECH32, bob.string());
+}
+
+TEST(MultiversXAddress, FromPublicKey) {
+    auto alice = PublicKey(parse_hex(ALICE_PUBKEY_HEX), TWPublicKeyTypeED25519);
+    ASSERT_EQ(ALICE_BECH32, Address(alice).string());
+
+    auto bob = PublicKey(parse_hex(BOB_PUBKEY_HEX), TWPublicKeyTypeED25519);
+    ASSERT_EQ(BOB_BECH32, Address(bob).string());
+}
+
+} // namespace TW::MultiversX::tests
diff --git a/tests/chains/MultiversX/SerializationTests.cpp b/tests/chains/MultiversX/SerializationTests.cpp
new file mode 100644
index 00000000000..37651803c7d
--- /dev/null
+++ b/tests/chains/MultiversX/SerializationTests.cpp
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <gtest/gtest.h>
+#include <vector>
+
+#include "HexCoding.h"
+#include "MultiversX/Serialization.h"
+#include "TestAccounts.h"
+
+using namespace TW;
+
+namespace TW::MultiversX::tests {
+
+TEST(MultiversXSerialization, SerializeTransactionWithData) {
+    Transaction transaction;
+    transaction.nonce = 42;
+    transaction.value = "1000000000000000000";
+    transaction.sender = ALICE_BECH32;
+    transaction.receiver = BOB_BECH32;
+    transaction.gasPrice = 1000000000;
+    transaction.gasLimit = 54500;
+    transaction.data = "foo";
+    transaction.chainID = "1";
+    transaction.version = 2;
+
+    string expected =
+        "{"
+        R"("nonce":42,"value":"1000000000000000000",)"
+        R"("receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",)"
+        R"("sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",)"
+        R"("gasPrice":1000000000,"gasLimit":54500,"data":"Zm9v","chainID":"1","version":2)"
+        "}";
+
+    string actual = serializeTransaction(transaction);
+    ASSERT_EQ(expected, actual);
+}
+
+TEST(MultiversXSerialization, SerializeTransactionWithoutData) {
+    Transaction transaction;
+    transaction.nonce = 42;
+    transaction.value = "1000000000000000000";
+    transaction.sender = ALICE_BECH32;
+    transaction.receiver = BOB_BECH32;
+    transaction.gasPrice = 1000000000;
+    transaction.gasLimit = 50000;
+    transaction.chainID = "1";
+    transaction.version = 2;
+
+    string expected =
+        "{"
+        R"("nonce":42,"value":"1000000000000000000",)"
+        R"("receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",)"
+        R"("sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",)"
+        R"("gasPrice":1000000000,"gasLimit":50000,"chainID":"1","version":2)"
+        "}";
+
+    string actual = serializeTransaction(transaction);
+    ASSERT_EQ(expected, actual);
+}
+
+TEST(MultiversXSerialization, SerializeTransactionWithUsernames) {
+    Transaction transaction;
+    transaction.nonce = 42;
+    transaction.value = "1000000000000000000";
+    transaction.sender = ALICE_BECH32;
+    transaction.senderUsername = "alice";
+    transaction.receiver = BOB_BECH32;
+    transaction.receiverUsername = "bob";
+    transaction.gasPrice = 1000000000;
+    transaction.gasLimit = 100000;
+    transaction.chainID = "1";
+    transaction.version = 2;
+
+    string expected =
+        "{"
+        R"("nonce":42,"value":"1000000000000000000",)"
+        R"("receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",)"
+        R"("sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",)"
+        R"("senderUsername":"YWxpY2U=","receiverUsername":"Ym9i",)"
+        R"("gasPrice":1000000000,"gasLimit":100000,"chainID":"1","version":2)"
+        "}";
+
+    string actual = serializeTransaction(transaction);
+    ASSERT_EQ(expected, actual);
+}
+
+TEST(MultiversXSerialization, SerializeTransactionWithGuardianAddress) {
+    Transaction transaction;
+    transaction.nonce = 42;
+    transaction.value = "1000000000000000000";
+    transaction.sender = ALICE_BECH32;
+    transaction.receiver = BOB_BECH32;
+    transaction.guardian = CAROL_BECH32;
+    transaction.gasPrice = 1000000000;
+    transaction.gasLimit = 100000;
+    transaction.chainID = "1";
+    transaction.version = 2;
+    transaction.options = TransactionOptions::Guarded;
+
+    string expected =
+        "{"
+        R"("nonce":42,"value":"1000000000000000000",)"
+        R"("receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",)"
+        R"("sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",)"
+        R"("gasPrice":1000000000,"gasLimit":100000,"chainID":"1","version":2,"options":2,)"
+        R"("guardian":"erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8")"
+        "}";
+
+    string actual = serializeTransaction(transaction);
+    ASSERT_EQ(expected, actual);
+}
+
+} // namespace TW::MultiversX::tests
diff --git a/tests/chains/MultiversX/SignerTests.cpp b/tests/chains/MultiversX/SignerTests.cpp
new file mode 100644
index 00000000000..73b1ed7cf29
--- /dev/null
+++ b/tests/chains/MultiversX/SignerTests.cpp
@@ -0,0 +1,651 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <gtest/gtest.h>
+#include <nlohmann/json.hpp>
+
+#include "boost/format.hpp"
+#include "HexCoding.h"
+#include "MultiversX/Address.h"
+#include "MultiversX/Codec.h"
+#include "MultiversX/Signer.h"
+#include "MultiversX/Transaction.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestAccounts.h"
+#include "TestUtilities.h"
+
+using namespace TW;
+
+namespace TW::MultiversX::tests {
+
+TEST(MultiversXSigner, SignGenericAction) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("foo");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(54500);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "61362540ad012ebff8436aa7fed7567639e7ef3150434b880975d844fde8cbb4e637e5537cb895ba2d0b12014ada866080b379dd96e2a7c150818a9956fb7b00";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"Zm9v",
+                                     "gasLimit":54500,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"61362540ad012ebff8436aa7fed7567639e7ef3150434b880975d844fde8cbb4e637e5537cb895ba2d0b12014ada866080b379dd96e2a7c150818a9956fb7b00",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+    ASSERT_EQ(expectedSignature, signature);
+}
+
+TEST(MultiversXSigner, SignGenericActionUnDelegate) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(6);
+    input.mutable_generic_action()->mutable_accounts()->set_sender("erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa");
+    input.mutable_generic_action()->mutable_accounts()->set_receiver("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r");
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("unDelegate@" + TW::MultiversX::Codec::encodeBigInt("1000000000000000000"));
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(12000000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "89f9683af92f7b835bff4e1d0dbfcff5245b3367df4d23538eb799e0ad0a90be29ac3bd3598ce55b35b35ebef68bfa5738eed39fd01adc33476f65bd1b966e0b";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"dW5EZWxlZ2F0ZUAwZGUwYjZiM2E3NjQwMDAw",
+                                     "gasLimit":12000000,
+                                     "gasPrice":1000000000,
+                                     "nonce":6,
+                                     "receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r",
+                                     "sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa",
+                                     "signature":"89f9683af92f7b835bff4e1d0dbfcff5245b3367df4d23538eb799e0ad0a90be29ac3bd3598ce55b35b35ebef68bfa5738eed39fd01adc33476f65bd1b966e0b",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+    ASSERT_EQ(expectedSignature, signature);
+    // Successfully broadcasted https://explorer.multiversx.com/transactions/3301ae5a6a77f0ab9ceb5125258f12539a113b0c6787de76a5c5867f2c515d65
+}
+
+TEST(MultiversXSigner, SignGenericActionRedelegateRewards) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_generic_action()->mutable_accounts()->set_sender("erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa");
+    input.mutable_generic_action()->mutable_accounts()->set_receiver("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r");
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("reDelegateRewards");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(12000000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "fc0238d41e4d02a24ac8a502cc3d59e406258b5c186c883e2e9aeffa859a818f5317bf22c9bc6d3838c64529953a46c1d4aabc485f96675a4c4dd642f5f50402";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"cmVEZWxlZ2F0ZVJld2FyZHM=",
+                                     "gasLimit":12000000,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r",
+                                     "sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa",
+                                     "signature":"fc0238d41e4d02a24ac8a502cc3d59e406258b5c186c883e2e9aeffa859a818f5317bf22c9bc6d3838c64529953a46c1d4aabc485f96675a4c4dd642f5f50402",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+    ASSERT_EQ(expectedSignature, signature);
+}
+
+TEST(MultiversXSigner, SignGenericActionClaimRewards) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_generic_action()->mutable_accounts()->set_sender("erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa");
+    input.mutable_generic_action()->mutable_accounts()->set_receiver("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r");
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("claimRewards");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(6000000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "c453652214d428045721ad5560194a699ce4194ba7edcbdc1c4f5d1e9a605b82bb0a0fd7dba708322b62518d5d5af3e7380efab0804ac00cdafe7598e7498900";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"Y2xhaW1SZXdhcmRz",
+                                     "gasLimit":6000000,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r",
+                                     "sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa",
+                                     "signature":"c453652214d428045721ad5560194a699ce4194ba7edcbdc1c4f5d1e9a605b82bb0a0fd7dba708322b62518d5d5af3e7380efab0804ac00cdafe7598e7498900",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+    ASSERT_EQ(expectedSignature, signature);
+}
+
+TEST(MultiversXSigner, SignGenericActionWithdrawStake) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_generic_action()->mutable_accounts()->set_sender("erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa");
+    input.mutable_generic_action()->mutable_accounts()->set_receiver("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r");
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("withdraw");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(12000000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "a2a17498e78e29082c433c009895bd949fc68b2222620d8f5350f821350cde390c15ffe00df4f0e84a074abd892331b79503bf458a35cb90333d1350553d9302";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"d2l0aGRyYXc=",
+                                     "gasLimit":12000000,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r",
+                                     "sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa",
+                                     "signature":"a2a17498e78e29082c433c009895bd949fc68b2222620d8f5350f821350cde390c15ffe00df4f0e84a074abd892331b79503bf458a35cb90333d1350553d9302",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+    ASSERT_EQ(expectedSignature, signature);
+    // Need to wait 9 days for broadcasting
+}
+
+TEST(MultiversXSigner, SignGenericActionDelegate) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(1);
+    input.mutable_generic_action()->mutable_accounts()->set_sender("erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa");
+    input.mutable_generic_action()->mutable_accounts()->set_receiver("erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r");
+    input.mutable_generic_action()->set_value("1");
+    input.mutable_generic_action()->set_data("delegate");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(12000000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "3b9164d47a4e3c0330ae387cd29ba6391f9295acf5e43a16a4a2611645e66e5fa46bf22294ca68fe1948adf45cec8cb47b8792afcdb248bd9adec7c6e6c27108";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"ZGVsZWdhdGU=",
+                                     "gasLimit":12000000,
+                                     "gasPrice":1000000000,
+                                     "nonce":1,
+                                     "receiver":"erd1qqqqqqqqqqqqqqqpqqqqqqqqqqqqqqqqqqqqqqqqqqqqqfhllllscrt56r",
+                                     "sender":"erd1aajqh5xjka5fk0c235dwy7qd6lkz2e29tlhy8gncuq0mcr68q34qgswnqa",
+                                     "signature":"3b9164d47a4e3c0330ae387cd29ba6391f9295acf5e43a16a4a2611645e66e5fa46bf22294ca68fe1948adf45cec8cb47b8792afcdb248bd9adec7c6e6c27108",
+                                     "value":"1",
+                                     "version":1
+                                    })"_json;
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+    ASSERT_EQ(expectedSignature, signature);
+    // Successfully broadcasted https://explorer.multiversx.com/transactions/e5007662780f8ed677b37b156007c24bf60b7366000f66ec3525cfa16a4564e7
+}
+
+TEST(MultiversXSigner, SignGenericActionJSON) {
+    // Shuffle some fields, assume arbitrary order in the input
+    auto input = R"(
+        {
+            "genericAction" : {
+                "accounts": {
+                    "senderNonce": 7,
+                    "receiver": "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                    "sender": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
+                },
+                "data": "foo",
+                "value": "0",
+                "version": 1
+            }, 
+            "gasPrice": 1000000000,
+            "gasLimit": 54500,
+            "chainId": "1"
+        })";
+
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    auto encoded = Signer::signJSON(input, privateKey.bytes);
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"Zm9v",
+                                     "gasLimit":54500,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"61362540ad012ebff8436aa7fed7567639e7ef3150434b880975d844fde8cbb4e637e5537cb895ba2d0b12014ada866080b379dd96e2a7c150818a9956fb7b00",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignWithoutData) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(0);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(50000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "c7253b821c68011584ebd3a5bb050ade19235c2d10260e411e523105826c40a79849b3eeb96fcc2a7a6b1fa140b6756f50b249e005be056ce0cf53125e0b1b00";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "gasLimit":50000,
+                                     "gasPrice":1000000000,
+                                     "nonce":0,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"c7253b821c68011584ebd3a5bb050ade19235c2d10260e411e523105826c40a79849b3eeb96fcc2a7a6b1fa140b6756f50b249e005be056ce0cf53125e0b1b00",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignJSONWithoutData) {
+    // Shuffle some fields, assume arbitrary order in the input
+    auto input = R"(
+        {
+            "genericAction" : {
+                "accounts": {
+                    "senderNonce": 0,
+                    "receiver": "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                    "sender": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
+                }, 
+                "value": "0",
+                "version": 1
+            },
+            "gasPrice": 1000000000,
+            "gasLimit": 50000,
+            "chainId": "1"
+        })";
+
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    auto encoded = Signer::signJSON(input, privateKey.bytes);
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "gasLimit":50000,
+                                     "gasPrice":1000000000,
+                                     "nonce":0,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"c7253b821c68011584ebd3a5bb050ade19235c2d10260e411e523105826c40a79849b3eeb96fcc2a7a6b1fa140b6756f50b249e005be056ce0cf53125e0b1b00",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignWithUsernames) {
+    // https://github.com/multiversx/mx-chain-go/blob/master/examples/construction_test.go, scenario "TestConstructTransaction_Usernames".
+
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(89);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_sender_username("alice");
+    input.mutable_generic_action()->mutable_accounts()->set_receiver_username("bob");
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(50000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "dfffb303eee7a6df0a027171feffde001637e59164a8b8c61d387da7fcefccd08d90f7b0e6fd0b4bc7357517edc5b6ea4a5088e0fb0be314e7e597e5248a8a03";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "gasLimit":50000,
+                                     "gasPrice":1000000000,
+                                     "nonce":89,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "receiverUsername": "Ym9i",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "senderUsername": "YWxpY2U=",
+                                     "signature":"dfffb303eee7a6df0a027171feffde001637e59164a8b8c61d387da7fcefccd08d90f7b0e6fd0b4bc7357517edc5b6ea4a5088e0fb0be314e7e597e5248a8a03",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignWithOptions) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(89);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("");
+    input.mutable_generic_action()->set_version(2);
+    // We'll set a dummy value on the "options" field (merely an example).
+    // Currently, the "options" field should be ignored (not set) by applications using TW Core.
+    input.mutable_generic_action()->set_options(42);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(50000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "ea478652417dc319c3e898d7f99f3a7b04fd32b62a7d43d5d6822a6a46b9346853426ac2ad5cdc710f0f3c5a6f509b21195e712ed9b3c95f454c7ed85079cb0b";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "gasLimit":50000,
+                                     "gasPrice":1000000000,
+                                     "nonce":89,
+                                     "options": 42,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"ea478652417dc319c3e898d7f99f3a7b04fd32b62a7d43d5d6822a6a46b9346853426ac2ad5cdc710f0f3c5a6f509b21195e712ed9b3c95f454c7ed85079cb0b",
+                                     "value":"0",
+                                     "version":2
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignEGLDTransfer) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_egld_transfer()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_egld_transfer()->set_amount("1000000000000000000");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "0f40dec9d37bde3c67803fc535088e536344e271807bb7c1aa24af3c69bffa9b705e149ff7bcaf21678f4900c4ee72741fa6ef08bf4c67fc6da1c6b0f337730e";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "gasLimit":50000,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"0f40dec9d37bde3c67803fc535088e536344e271807bb7c1aa24af3c69bffa9b705e149ff7bcaf21678f4900c4ee72741fa6ef08bf4c67fc6da1c6b0f337730e",
+                                     "value":"1000000000000000000",
+                                     "version":2
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignESDTTransfer) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_esdt_transfer()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
+    input.mutable_esdt_transfer()->set_amount("10000000000000");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "dd7cdc90aa09da6034b00a99e3ba0f1a2a38fa788fad018d53bf2e706f99e1a42c80063c28e6b48a5f2574c4054986f34c8eb36b1da63a22d19cf3ea5990b306";
+
+    // "ESDTTransfer@4d59544f4b454e2d31323334@09184e72a000"
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"RVNEVFRyYW5zZmVyQDRkNTk1NDRmNGI0NTRlMmQzMTMyMzMzNEAwOTE4NGU3MmEwMDA=",
+                                     "gasLimit":425000,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"dd7cdc90aa09da6034b00a99e3ba0f1a2a38fa788fad018d53bf2e706f99e1a42c80063c28e6b48a5f2574c4054986f34c8eb36b1da63a22d19cf3ea5990b306",
+                                     "value":"0",
+                                     "version":2
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignESDTNFTTransfer) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_esdtnft_transfer()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
+    input.mutable_esdtnft_transfer()->set_token_nonce(4);
+    input.mutable_esdtnft_transfer()->set_amount("184300000000000000");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "59af89d9a9ece1f35bc34323c42061cae27bb5f9830f5eb26772e680732cbd901a86caa7c3eadacd392fe1024bef4c1f08ce1dfcafec257d6f41444ccea30a0c";
+
+    // "ESDTNFTTransfer@4c4b4d45582d616162393130@04@028ec3dfa01ac000@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8"
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"RVNEVE5GVFRyYW5zZmVyQDRjNGI0ZDQ1NTgyZDYxNjE2MjM5MzEzMEAwNEAwMjhlYzNkZmEwMWFjMDAwQDgwNDlkNjM5ZTVhNjk4MGQxY2QyMzkyYWJjY2U0MTAyOWNkYTc0YTE1NjM1MjNhMjAyZjA5NjQxY2MyNjE4Zjg=",
+                                     "gasLimit":937500,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"59af89d9a9ece1f35bc34323c42061cae27bb5f9830f5eb26772e680732cbd901a86caa7c3eadacd392fe1024bef4c1f08ce1dfcafec257d6f41444ccea30a0c",
+                                     "value":"0",
+                                     "version":2
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignGenericActionWithGuardian) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(42);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_guardian(CAROL_BECH32);
+    input.mutable_generic_action()->set_value("1000000000000000000");
+    input.mutable_generic_action()->set_data("");
+    input.mutable_generic_action()->set_version(2);
+    input.mutable_generic_action()->set_options(TransactionOptions::Guarded);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(100000);
+    input.set_chain_id("1");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "dae30e5cddb4a1f050009f939ce2c90843770870f9e6c77366be07e5cd7b3ebfdda38cd45d04e9070037d57761b6a68cee697e6043057f9dc565a4d0e632480d";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "gasLimit":100000,
+                                     "gasPrice":1000000000,
+                                     "guardian":"erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
+                                     "nonce":42,
+                                     "options":2,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"dae30e5cddb4a1f050009f939ce2c90843770870f9e6c77366be07e5cd7b3ebfdda38cd45d04e9070037d57761b6a68cee697e6043057f9dc565a4d0e632480d",
+                                     "value":"1000000000000000000",
+                                     "version":2
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(MultiversXSigner, SignEGLDTransferWithGuardian) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_egld_transfer()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_egld_transfer()->mutable_accounts()->set_guardian(CAROL_BECH32);
+    input.mutable_egld_transfer()->set_amount("1000000000000000000");
+
+    auto output = Signer::sign(input);
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "741dd0d24db4df37a050f693f8481b6e51b8dd6dfc2f01a4f90aa1af3e59c89a8b0ef9d710af33103970e353d9f0cb9fd128a2e174731cbc88265d9737ed5604";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "gasLimit":100000,
+                                     "gasPrice":1000000000,
+                                     "guardian":"erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8",
+                                     "nonce":7,
+                                     "options":2,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"741dd0d24db4df37a050f693f8481b6e51b8dd6dfc2f01a4f90aa1af3e59c89a8b0ef9d710af33103970e353d9f0cb9fd128a2e174731cbc88265d9737ed5604",
+                                     "value":"1000000000000000000",
+                                     "version":2
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(ElrondSigner, buildUnsignedTxBytes) {
+    auto input = Proto::SigningInput();
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("foo");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(50000);
+    input.set_chain_id("1");
+    auto unsignedTxBytes = Signer::buildUnsignedTxBytes(input);
+    auto expectedData = TW::data((boost::format(R"({"nonce":7,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1})") % BOB_BECH32 % ALICE_BECH32).str());
+    ASSERT_EQ(expectedData, unsignedTxBytes);
+}
+
+TEST(ElrondSigner, buildSigningOutput) {
+    auto input = Proto::SigningInput();
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("foo");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(50000);
+    input.set_chain_id("1");
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    auto unsignedTxBytes = Signer::buildUnsignedTxBytes(input);
+    auto signature = privateKey.sign(unsignedTxBytes, TWCurveED25519);
+
+    auto output = Signer::buildSigningOutput(input, signature);
+    std::string expectedSignatureHex = "e8647dae8b16e034d518a1a860c6a6c38d16192d0f1362833e62424f424e5da660770dff45f4b951d9cc58bfb9d14559c977d443449bfc4b8783ff9c84065700";
+    ASSERT_EQ(expectedSignatureHex, hex(signature));
+    auto expectedEncoded = (boost::format(R"({"nonce":7,"value":"0","receiver":"%1%","sender":"%2%","gasPrice":1000000000,"gasLimit":50000,"data":"Zm9v","chainID":"1","version":1,"signature":"%3%"})") % BOB_BECH32 % ALICE_BECH32 % expectedSignatureHex).str();
+    ASSERT_EQ(output.signature(), expectedSignatureHex);
+    ASSERT_EQ(output.encoded(), expectedEncoded);
+}
+
+} // namespace TW::MultiversX::tests
diff --git a/tests/chains/MultiversX/TWAnySignerTests.cpp b/tests/chains/MultiversX/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..1b1311b1382
--- /dev/null
+++ b/tests/chains/MultiversX/TWAnySignerTests.cpp
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <gtest/gtest.h>
+
+#include "HexCoding.h"
+#include "MultiversX/Signer.h"
+#include "TestAccounts.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+using namespace TW;
+
+namespace TW::MultiversX::tests {
+
+TEST(TWAnySignerMultiversX, Sign) {
+    auto input = Proto::SigningInput();
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->set_value("0");
+    input.mutable_generic_action()->set_data("foo");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(54500);
+    input.set_chain_id("1");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeMultiversX);
+
+    auto signature = output.signature();
+    auto encoded = output.encoded();
+    auto expectedSignature = "61362540ad012ebff8436aa7fed7567639e7ef3150434b880975d844fde8cbb4e637e5537cb895ba2d0b12014ada866080b379dd96e2a7c150818a9956fb7b00";
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"Zm9v",
+                                     "gasLimit":54500,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"61362540ad012ebff8436aa7fed7567639e7ef3150434b880975d844fde8cbb4e637e5537cb895ba2d0b12014ada866080b379dd96e2a7c150818a9956fb7b00",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+
+    ASSERT_EQ(expectedSignature, signature);
+    assertJSONEqual(expected, nlohmann::json::parse(encoded));
+}
+
+TEST(TWAnySignerMultiversX, SignJSON) {
+    // Shuffle some fields, assume arbitrary order in the input
+    auto input = STRING(R"(
+        {
+            "genericAction" : {
+                "accounts": {
+                    "senderNonce": 7,
+                    "receiver": "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                    "sender": "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"
+                },
+                "data": "foo",
+                "value": "0",
+                "version": 1
+            },
+            "gasPrice": 1000000000,
+            "gasLimit": 54500,
+            "chainId": "1"
+        })");
+
+    auto privateKey = DATA(ALICE_SEED_HEX);
+    auto encoded = WRAPS(TWAnySignerSignJSON(input.get(), privateKey.get(), TWCoinTypeMultiversX));
+    nlohmann::json expected = R"(
+                                    {
+                                     "chainID":"1",
+                                     "data":"Zm9v",
+                                     "gasLimit":54500,
+                                     "gasPrice":1000000000,
+                                     "nonce":7,
+                                     "receiver":"erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx",
+                                     "sender":"erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th",
+                                     "signature":"61362540ad012ebff8436aa7fed7567639e7ef3150434b880975d844fde8cbb4e637e5537cb895ba2d0b12014ada866080b379dd96e2a7c150818a9956fb7b00",
+                                     "value":"0",
+                                     "version":1
+                                    })"_json;
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeMultiversX));
+    assertJSONEqual(expected, nlohmann::json::parse(TWStringUTF8Bytes(encoded.get())));
+}
+
+} // namespace TW::MultiversX::tests
diff --git a/tests/chains/MultiversX/TWCoinTypeTests.cpp b/tests/chains/MultiversX/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..fd5a2248400
--- /dev/null
+++ b/tests/chains/MultiversX/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWMultiversXCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeMultiversX));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("163b46551a74626415074b626d2f37d3c78aef0f6ccb628db434ee65a35ea127"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeMultiversX, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeMultiversX, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeMultiversX));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeMultiversX));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeMultiversX), 18);
+    ASSERT_EQ(TWBlockchainMultiversX, TWCoinTypeBlockchain(TWCoinTypeMultiversX));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeMultiversX));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeMultiversX));
+    assertStringsEqual(symbol, "eGLD");
+    assertStringsEqual(txUrl, "https://explorer.multiversx.com/transactions/163b46551a74626415074b626d2f37d3c78aef0f6ccb628db434ee65a35ea127");
+    assertStringsEqual(accUrl, "https://explorer.multiversx.com/accounts/erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th");
+    assertStringsEqual(id, "elrond");
+    assertStringsEqual(name, "MultiversX");
+}
diff --git a/tests/chains/MultiversX/TestAccounts.h b/tests/chains/MultiversX/TestAccounts.h
new file mode 100644
index 00000000000..3026c9895ef
--- /dev/null
+++ b/tests/chains/MultiversX/TestAccounts.h
@@ -0,0 +1,19 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+namespace TW::MultiversX::tests {
+
+// Well-known accounts on Testnet & Devnet,
+// https://github.com/multiversx/mx-sdk-testwallets:
+const auto ALICE_BECH32 = "erd1qyu5wthldzr8wx5c9ucg8kjagg0jfs53s8nr3zpz3hypefsdd8ssycr6th";
+const auto ALICE_PUBKEY_HEX = "0139472eff6886771a982f3083da5d421f24c29181e63888228dc81ca60d69e1";
+const auto ALICE_SEED_HEX = "413f42575f7f26fad3317a778771212fdb80245850981e48b58a4f25e344e8f9";
+const auto BOB_BECH32 = "erd1spyavw0956vq68xj8y4tenjpq2wd5a9p2c6j8gsz7ztyrnpxrruqzu66jx";
+const auto BOB_PUBKEY_HEX = "8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8";
+const auto BOB_SEED_HEX = "b8ca6f8203fb4b545a8e83c5384da033c415db155b53fb5b8eba7ff5a039d639";
+const auto CAROL_BECH32 = "erd1k2s324ww2g0yj38qn2ch2jwctdy8mnfxep94q9arncc6xecg3xaq6mjse8";
+
+} // namespace TW::MultiversX::tests
diff --git a/tests/chains/MultiversX/TransactionCompilerTests.cpp b/tests/chains/MultiversX/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..438add4c4c6
--- /dev/null
+++ b/tests/chains/MultiversX/TransactionCompilerTests.cpp
@@ -0,0 +1,245 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "TransactionCompiler.h"
+#include "proto/MultiversX.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWStellarPassphrase.h>
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestAccounts.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::MultiversX::tests {
+
+TEST(MultiversXCompiler, CompileGenericActionWithSignatures) {
+    // txHash 2d3d69707de60e93868a417353c8ecbc6b717e09e384f1a27100287067a5f970 on testnet
+    /// Step 1: Prepare transaction input (protobuf)
+    auto coin = TWCoinTypeMultiversX;
+    auto input = TW::MultiversX::Proto::SigningInput();
+    input.mutable_generic_action()->mutable_accounts()->set_sender_nonce(2383);
+    input.mutable_generic_action()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_generic_action()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_generic_action()->set_value("1");
+    input.mutable_generic_action()->set_data("foo");
+    input.mutable_generic_action()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(11100000);
+    input.set_chain_id("T");
+    auto inputString = input.SerializeAsString();
+    auto localInputData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, localInputData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = data(preSigningOutput.data());
+    auto preImageHash = data(preSigningOutput.data_hash());
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    const PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    Data signature = parse_hex("4f0eb7dca9177f1849bc98b856ab4b3238a666abb3369b4fc0faba429b5c91c46b06893e841a8f411aa199c78cc456514abe39948108baf83a7be0b3fae9d70a");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, preImageHash));
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, localInputData, {signature}, {publicKey.bytes});
+    const auto ExpectedTx = "7b226e6f6e6365223a323338332c2276616c7565223a2231222c227265636569766572223a22657264317370796176773039353676713638786a38793474656e6a7071327764356139703263366a3867737a377a7479726e7078727275717a7536366a78222c2273656e646572223a2265726431717975357774686c647a72387778356339756367386b6a616767306a6673353373386e72337a707a336879706566736464387373796372367468222c226761735072696365223a313030303030303030302c226761734c696d6974223a31313130303030302c2264617461223a225a6d3976222c22636861696e4944223a2254222c2276657273696f6e223a312c227369676e6174757265223a223466306562376463613931373766313834396263393862383536616234623332333861363636616262333336396234666330666162613432396235633931633436623036383933653834316138663431316161313939633738636334353635313461626533393934383130386261663833613762653062336661653964373061227d";
+
+    {
+        TW::MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::MultiversX::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(localInputData.data(), (int)localInputData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::MultiversX::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, localInputData, {signature, signature}, {publicKey.bytes});
+        MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, localInputData, {}, {});
+        MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+TEST(MultiversXCompiler, CompileEGLDTransferWithSignatures) {
+    // txHash a4dd60099bb2cd14b57f3feb54d868d64dfe1b74d8ad90d8bd0668b96ead13af on testnet
+    /// Step 1: Prepare transaction input (protobuf)
+    auto coin = TWCoinTypeMultiversX;
+    auto input = TW::MultiversX::Proto::SigningInput();
+    input.mutable_egld_transfer()->mutable_accounts()->set_sender_nonce(2418);
+    input.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_egld_transfer()->set_amount("1");
+    input.mutable_egld_transfer()->set_data("foo");
+    input.mutable_egld_transfer()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(11100000);
+    input.set_chain_id("T");
+    auto inputString = input.SerializeAsString();
+    auto localInputData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, localInputData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = data(preSigningOutput.data());
+    auto preImageHash = data(preSigningOutput.data_hash());
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    const PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    Data signature = parse_hex("e55ad0642c7d47806410c12b1c93eb6250ccb76f711bbf82c5963bf59b5cdfe291d8b083b75de526f20457eede0c8a1dacf65c2c0034d47560c3bab5319c4006");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, preImageHash));
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, localInputData, {signature}, {publicKey.bytes});
+    const auto ExpectedTx = "7b226e6f6e6365223a323431382c2276616c7565223a2231222c227265636569766572223a22657264317370796176773039353676713638786a38793474656e6a7071327764356139703263366a3867737a377a7479726e7078727275717a7536366a78222c2273656e646572223a2265726431717975357774686c647a72387778356339756367386b6a616767306a6673353373386e72337a707a336879706566736464387373796372367468222c226761735072696365223a313030303030303030302c226761734c696d6974223a31313130303030302c2264617461223a225a6d3976222c22636861696e4944223a2254222c2276657273696f6e223a312c227369676e6174757265223a226535356164303634326337643437383036343130633132623163393365623632353063636237366637313162626638326335393633626635396235636466653239316438623038336237356465353236663230343537656564653063386131646163663635633263303033346434373536306333626162353331396334303036227d";
+    {
+        TW::MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::MultiversX::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(localInputData.data(), (int)localInputData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::MultiversX::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, localInputData, {signature, signature}, {publicKey.bytes});
+        MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, localInputData, {}, {});
+        MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+TEST(MultiversXCompiler, CompileESDTTransferWithSignatures) {
+    // txHash d399477c5d2784d55521fadb2692d447e3459c6a006b1720a3bd513c68dc6848 on testnet
+    /// Step 1: Prepare transaction input (protobuf)
+    auto coin = TWCoinTypeMultiversX;
+    auto input = TW::MultiversX::Proto::SigningInput();
+    input.mutable_esdt_transfer()->mutable_accounts()->set_sender_nonce(2529);
+    input.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_esdt_transfer()->set_amount("100");
+    input.mutable_esdt_transfer()->set_token_identifier("MBONDTEST-4ce053");
+    input.mutable_esdt_transfer()->set_version(1);
+    input.set_gas_price(1000000000);
+    input.set_gas_limit(11100000);
+    input.set_chain_id("T");
+    auto inputString = input.SerializeAsString();
+    auto localInputData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, localInputData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = data(preSigningOutput.data());
+    auto preImageHash = data(preSigningOutput.data_hash());
+    auto privateKey = PrivateKey(parse_hex(ALICE_SEED_HEX));
+    const PublicKey publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    Data signature = parse_hex("99314010bca2251e52f3a8c2efae2f02b81cb27c83edbaf553e7fb771ffbe69e99ac6304bdc8477ff6727e6e6a47b3d5e17c5537859e21d06a81ec8d632ad100");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, preImageHash));
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, localInputData, {signature}, {publicKey.bytes});
+    const auto ExpectedTx = "7b226e6f6e6365223a323532392c2276616c7565223a2230222c227265636569766572223a22657264317370796176773039353676713638786a38793474656e6a7071327764356139703263366a3867737a377a7479726e7078727275717a7536366a78222c2273656e646572223a2265726431717975357774686c647a72387778356339756367386b6a616767306a6673353373386e72337a707a336879706566736464387373796372367468222c226761735072696365223a313030303030303030302c226761734c696d6974223a31313130303030302c2264617461223a2252564e45564652795957357a5a6d56795144526b4e4449305a6a526c4e4451314e4451314e544d314e444a6b4d7a51324d7a59314d7a417a4e544d7a51445930222c22636861696e4944223a2254222c2276657273696f6e223a312c227369676e6174757265223a223939333134303130626361323235316535326633613863326566616532663032623831636232376338336564626166353533653766623737316666626536396539396163363330346264633834373766663637323765366536613437623364356531376335353337383539653231643036613831656338643633326164313030227d";
+
+    {
+        TW::MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::MultiversX::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(localInputData.data(), (int)localInputData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::MultiversX::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, localInputData, {signature, signature}, {publicKey.bytes});
+        MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, localInputData, {}, {});
+        MultiversX::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+} // namespace TW::MultiversX::tests
diff --git a/tests/chains/MultiversX/TransactionFactoryTests.cpp b/tests/chains/MultiversX/TransactionFactoryTests.cpp
new file mode 100644
index 00000000000..6b082245973
--- /dev/null
+++ b/tests/chains/MultiversX/TransactionFactoryTests.cpp
@@ -0,0 +1,243 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "boost/format.hpp"
+#include <gtest/gtest.h>
+#include <vector>
+
+#include "MultiversX/TransactionFactory.h"
+#include "TestAccounts.h"
+
+namespace TW::MultiversX::tests {
+
+TEST(MultiversXTransactionFactory, fromEGLDTransfer) {
+    auto input = Proto::SigningInput();
+    input.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_egld_transfer()->set_amount("1000000000000000000");
+
+    TransactionFactory factory;
+    Transaction transaction = factory.fromEGLDTransfer(input);
+
+    ASSERT_EQ(ALICE_BECH32, transaction.sender);
+    ASSERT_EQ(BOB_BECH32, transaction.receiver);
+    ASSERT_EQ("", transaction.data);
+    ASSERT_EQ("1000000000000000000", transaction.value);
+    ASSERT_EQ(50000ul, transaction.gasLimit);
+    ASSERT_EQ(1000000000ul, transaction.gasPrice);
+    ASSERT_EQ("1", transaction.chainID);
+    ASSERT_EQ(2ul, transaction.version);
+}
+
+TEST(MultiversXTransactionFactory, fromESDTTransfer) {
+    auto input = Proto::SigningInput();
+    input.mutable_esdt_transfer()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
+    input.mutable_esdt_transfer()->set_amount("10000000000000");
+
+    TransactionFactory factory;
+    Transaction transaction = factory.fromESDTTransfer(input);
+
+    ASSERT_EQ(ALICE_BECH32, transaction.sender);
+    ASSERT_EQ(BOB_BECH32, transaction.receiver);
+    ASSERT_EQ("ESDTTransfer@4d59544f4b454e2d31323334@09184e72a000", transaction.data);
+    ASSERT_EQ("0", transaction.value);
+    ASSERT_EQ(425000ul, transaction.gasLimit);
+    ASSERT_EQ(1000000000ul, transaction.gasPrice);
+    ASSERT_EQ("1", transaction.chainID);
+    ASSERT_EQ(2ul, transaction.version);
+}
+
+TEST(MultiversXTransactionFactory, fromESDTNFTTransfer) {
+    auto input = Proto::SigningInput();
+    input.mutable_esdtnft_transfer()->mutable_accounts()->set_sender_nonce(7);
+    input.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    input.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    input.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
+    input.mutable_esdtnft_transfer()->set_token_nonce(4);
+    input.mutable_esdtnft_transfer()->set_amount("184300000000000000");
+
+    TransactionFactory factory;
+    Transaction transaction = factory.fromESDTNFTTransfer(input);
+
+    ASSERT_EQ(ALICE_BECH32, transaction.sender);
+    ASSERT_EQ(ALICE_BECH32, transaction.receiver);
+    ASSERT_EQ("ESDTNFTTransfer@4c4b4d45582d616162393130@04@028ec3dfa01ac000@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8", transaction.data);
+    ASSERT_EQ("0", transaction.value);
+    ASSERT_EQ(937500ul, transaction.gasLimit);
+    ASSERT_EQ(1000000000ul, transaction.gasPrice);
+    ASSERT_EQ("1", transaction.chainID);
+    ASSERT_EQ(2ul, transaction.version);
+}
+
+TEST(MultiversXTransactionFactory, createTransfersWithProvidedConfig) {
+    TransactionFactoryConfig config;
+
+    // Set dummy values:
+    config.setChainId("T");
+    config.setMinGasPrice(1500000000);
+    config.setMinGasLimit(60000);
+    config.setGasPerDataByte(2000);
+    config.setGasCostESDTTransfer(300000);
+    config.setGasCostESDTNFTTransfer(300000);
+    config.setAdditionalGasForESDTTransfer(100000);
+    config.setAdditionalGasForESDTNFTTransfer(500000);
+
+    Proto::SigningInput signingInputWithEGLDTransfer;
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->set_amount("0");
+
+    Proto::SigningInput signingInputWithESDTTransfer;
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_amount("10000000000000");
+
+    Proto::SigningInput signingInputWithESDTNFTTransfer;
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_nonce(4);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_amount("184300000000000000");
+
+    TransactionFactory factory(config);
+    Transaction tx1 = factory.fromEGLDTransfer(signingInputWithEGLDTransfer);
+    Transaction tx2 = factory.fromESDTTransfer(signingInputWithESDTTransfer);
+    Transaction tx3 = factory.fromESDTNFTTransfer(signingInputWithESDTNFTTransfer);
+
+    ASSERT_EQ(60000ul, tx1.gasLimit);
+    ASSERT_EQ(1500000000ul, tx1.gasPrice);
+    ASSERT_EQ("T", tx1.chainID);
+
+    ASSERT_EQ(560000ul, tx2.gasLimit);
+    ASSERT_EQ(1500000000ul, tx2.gasPrice);
+    ASSERT_EQ("T", tx2.chainID);
+
+    ASSERT_EQ(1110000ul, tx3.gasLimit);
+    ASSERT_EQ(1500000000ul, tx3.gasPrice);
+    ASSERT_EQ("T", tx3.chainID);
+}
+
+TEST(MultiversXTransactionFactory, createTransfersWithOverriddenNetworkParameters) {
+    Proto::SigningInput signingInputWithEGLDTransfer;
+    signingInputWithEGLDTransfer.set_gas_limit(50500);
+    signingInputWithEGLDTransfer.set_gas_price(1000000001);
+    signingInputWithEGLDTransfer.set_chain_id("A");
+
+    Proto::SigningInput signingInputWithESDTTransfer;
+    signingInputWithESDTTransfer.set_gas_limit(5000000);
+    signingInputWithESDTTransfer.set_gas_price(1000000002);
+    signingInputWithESDTTransfer.set_chain_id("B");
+
+    Proto::SigningInput signingInputWithESDTNFTTransfer;
+    signingInputWithESDTNFTTransfer.set_gas_limit(10000000);
+    signingInputWithESDTNFTTransfer.set_gas_price(1000000003);
+    signingInputWithESDTNFTTransfer.set_chain_id("C");
+
+    TransactionFactory factory;
+    Transaction tx1 = factory.fromEGLDTransfer(signingInputWithEGLDTransfer);
+    Transaction tx2 = factory.fromESDTTransfer(signingInputWithESDTTransfer);
+    Transaction tx3 = factory.fromESDTNFTTransfer(signingInputWithESDTNFTTransfer);
+
+    ASSERT_EQ(50500ul, tx1.gasLimit);
+    ASSERT_EQ(1000000001ul, tx1.gasPrice);
+    ASSERT_EQ("A", tx1.chainID);
+
+    ASSERT_EQ(5000000ul, tx2.gasLimit);
+    ASSERT_EQ(1000000002ul, tx2.gasPrice);
+    ASSERT_EQ("B", tx2.chainID);
+
+    ASSERT_EQ(10000000ul, tx3.gasLimit);
+    ASSERT_EQ(1000000003ul, tx3.gasPrice);
+    ASSERT_EQ("C", tx3.chainID);
+}
+
+TEST(MultiversXTransactionFactory, create) {
+    Proto::SigningInput signingInputWithGenericAction;
+    signingInputWithGenericAction.mutable_generic_action()->set_data("hello");
+
+    Proto::SigningInput signingInputWithEGLDTransfer;
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->set_amount("1");
+
+    Proto::SigningInput signingInputWithESDTTransfer;
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_amount("10000000000000");
+
+    Proto::SigningInput signingInputWithESDTNFTTransfer;
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_nonce(4);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_amount("184300000000000000");
+
+    TransactionFactory factory;
+    Transaction tx1 = factory.create(signingInputWithGenericAction);
+    Transaction tx2 = factory.create(signingInputWithEGLDTransfer);
+    Transaction tx3 = factory.create(signingInputWithESDTTransfer);
+    Transaction tx4 = factory.create(signingInputWithESDTNFTTransfer);
+
+    ASSERT_EQ("hello", tx1.data);
+    ASSERT_EQ("1", tx2.value);
+    ASSERT_EQ("ESDTTransfer@4d59544f4b454e2d31323334@09184e72a000", tx3.data);
+    ASSERT_EQ("ESDTNFTTransfer@4c4b4d45582d616162393130@04@028ec3dfa01ac000@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8", tx4.data);
+
+    ASSERT_EQ(TransactionOptions::Default, tx1.options);
+    ASSERT_EQ(TransactionOptions::Default, tx2.options);
+    ASSERT_EQ(TransactionOptions::Default, tx3.options);
+    ASSERT_EQ(TransactionOptions::Default, tx4.options);
+}
+
+TEST(MultiversXTransactionFactory, createWithGuardian) {
+    Proto::SigningInput signingInputWithGenericAction;
+    signingInputWithGenericAction.mutable_generic_action()->set_data("hello");
+    // For generic actions, the caller is responsible with providing the appropriate options.
+    signingInputWithGenericAction.mutable_generic_action()->set_options(TransactionOptions::Guarded);
+    signingInputWithGenericAction.mutable_generic_action()->mutable_accounts()->set_guardian(CAROL_BECH32);
+
+    Proto::SigningInput signingInputWithEGLDTransfer;
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->mutable_accounts()->set_guardian(CAROL_BECH32);
+    signingInputWithEGLDTransfer.mutable_egld_transfer()->set_amount("1");
+
+    Proto::SigningInput signingInputWithESDTTransfer;
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->mutable_accounts()->set_guardian(CAROL_BECH32);
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_token_identifier("MYTOKEN-1234");
+    signingInputWithESDTTransfer.mutable_esdt_transfer()->set_amount("10000000000000");
+
+    Proto::SigningInput signingInputWithESDTNFTTransfer;
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_sender(ALICE_BECH32);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_receiver(BOB_BECH32);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->mutable_accounts()->set_guardian(CAROL_BECH32);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_collection("LKMEX-aab910");
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_token_nonce(4);
+    signingInputWithESDTNFTTransfer.mutable_esdtnft_transfer()->set_amount("184300000000000000");
+
+    TransactionFactory factory;
+    Transaction tx1 = factory.create(signingInputWithGenericAction);
+    Transaction tx2 = factory.create(signingInputWithEGLDTransfer);
+    Transaction tx3 = factory.create(signingInputWithESDTTransfer);
+    Transaction tx4 = factory.create(signingInputWithESDTNFTTransfer);
+
+    ASSERT_EQ("hello", tx1.data);
+    ASSERT_EQ("1", tx2.value);
+    ASSERT_EQ("ESDTTransfer@4d59544f4b454e2d31323334@09184e72a000", tx3.data);
+    ASSERT_EQ("ESDTNFTTransfer@4c4b4d45582d616162393130@04@028ec3dfa01ac000@8049d639e5a6980d1cd2392abcce41029cda74a1563523a202f09641cc2618f8", tx4.data);
+
+    ASSERT_EQ(TransactionOptions::Guarded, tx1.options);
+    ASSERT_EQ(TransactionOptions::Guarded, tx2.options);
+    ASSERT_EQ(TransactionOptions::Guarded, tx3.options);
+    ASSERT_EQ(TransactionOptions::Guarded, tx4.options);
+}
+
+} // namespace TW::MultiversX::tests
diff --git a/tests/chains/NEAR/AccountTests.cpp b/tests/chains/NEAR/AccountTests.cpp
new file mode 100644
index 00000000000..880794bd506
--- /dev/null
+++ b/tests/chains/NEAR/AccountTests.cpp
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "NEAR/Account.h"
+#include "HexCoding.h"
+#include <gtest/gtest.h>
+
+namespace TW::NEAR::tests {
+
+TEST(NEARAccount, Validation) {
+    ASSERT_FALSE(Account::isValid("a"));
+    ASSERT_FALSE(Account::isValid("!?:"));
+    ASSERT_FALSE(Account::isValid("11111111111111111111111111111111222222222222222222222222222222223"));
+
+    ASSERT_TRUE(Account::isValid("9902c136629fc630416e50d4f2fef6aff867ea7e.lockup.near"));
+    ASSERT_TRUE(Account::isValid("app_1.alice.near"));
+    ASSERT_TRUE(Account::isValid("test-trust.vlad.near"));
+    ASSERT_TRUE(Account::isValid("deadbeef"));
+}
+
+} // namespace TW::NEAR::tests
diff --git a/tests/chains/NEAR/AddressTests.cpp b/tests/chains/NEAR/AddressTests.cpp
new file mode 100644
index 00000000000..7ae6b77a671
--- /dev/null
+++ b/tests/chains/NEAR/AddressTests.cpp
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "NEAR/Address.h"
+#include "Base58.h"
+#include "PrivateKey.h"
+#include <TrustWalletCore/TWPublicKeyType.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::NEAR::tests {
+
+TEST(NEARAddress, Validation) {
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_FALSE(Address::isValid("65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjTF"));
+    ASSERT_FALSE(Address::isValid("EOS65QzSGJ579GPNKtZoZkChTzsxR4B48RCfiS82m2ymJR6VZCjT"));
+    ASSERT_FALSE(Address::isValid("NEAR2V8xUQn8gLZUd9ofzNbDz5ahVJwaQNHKoDSbysPA6GYfsJS4hbDPTSFzfrRKs8UsSkakdoC623ZYbfAJKYRbx4UJHjPoi9SdF7nh6ZM3ditbDYaXC9aan8VEtrEicpXsgnYdD91qEPfUL9jd1j7Uipz1jHR1SG3mTMHsZbE1JQyYJBB6sGRQ6GsLe5Yks5tuYuEU88cpu6rk8iHEL6hzXNhWSbg6MJLoaA6FdEddnBZjLpqM5fZahaLpL9HTPo8PpsCgoRKDEifakbHPRg3NSQnGR4vV3oonz1bisVL5gF1yfZTsH9VYTMJ6CiNqZ7Dk2fPu1WFn3Sp91e34ysyuddqTHeypsAgVtWBNP7bTTvomxVR9xwEH1bBZ83oqwnnyXwMNqi1aHGouyneYPNU363cjEiKHz2mXYBs3NFX5kB9NPqPBETGptFh71EHrbB1XQT2WTqCEeKmQ8RR28E82Ei2GsxSbVPLP8TDTk7XpHy5UtbHf1CS5bY8SkiSUfFPJnNabx2FeLtHTTdxWmxPRa2dYgFANQnjt6g4wKnGAorbaqeu3jHuUvbNeUuhCNuwWe176fhisoW4gxz2VrK2w4qNeMrgWkWt4N1PPGyfuF3bWigi8Kdek9c3HGCk1vuTs1okartuuibCyzahPDnGLYBLdSEVU4endvxBsMmfXSrhcXpxXtxMPih88HjGR69MMWrjYPrVJvhvbU2AYejpLE1QqCpbJ4pNesUet9zddS1QHE23TMmY1Gk2UhQV6SocFqeAgf1Wu17RjnZKF4p9MQNjXM2oaZvWL7ZEf46ZT9uizKPSrGfP5rqJ1JyYA7Mj7KsfYspf5HuFhLynfybQSwerqLKJk8s4EGA8KkeekGJTspBGnxtgqQThPmqfy9hKqP5JrhEcBC68nhC7kokhC8qgdERUL2LzAtguQG1ZrfhcQDdhePExiFa9QKNuzXzPfzuTwBAByrNSW54nH5wkWXUKuZ1fmV7XrAEzNJK2ozRgbxsnxBdqmkZfpyzzC5zGaH4Eisw4e8o7jYmtK8udp4vrxxQMzsHkKa9Xpgn2tKmyfMQPk9afSrV9GJK7HoMwWPBMaPEm4DgBRWYksSNgQQuLQm4SeLzmeyZpGycida5MfnTyB8jH8jMPEYTonxE7bgFwNDBkZxwDa4FNAkBhbKELp3inYsvHWJ18QG7XbLNa9F74Xug3wFzoXC7Z34xv8rnW2Quj9CPfvkMwz3qF3E1XJnm3Adamg799yEjahcbR1bKHSVLTkThoNMkF2z8D1XswB7ZiMqV7TCPVYu94GrWxbo6Mr8Jhs76eH9EvXapqCdMEiC62zycDWvhruF44f4F9E1WVxpdXQAbhCXtwqHzSJV18SFGjUmF91AU9oevKP5EW82jY7JP2"));
+    ASSERT_FALSE(Address::isValid("NEAR5y2"));
+    ASSERT_FALSE(Address::isValid("NEAR2fk7ax"));
+    ASSERT_FALSE(Address::isValid("NEAR2758Nk7CMUcxTwXdjVdSxNEidiZQWMZN3USJzj76q5ia3v2v"));
+    ASSERT_FALSE(Address::isValid("NEAR2758Nk7CMUcxTwXdjVdSxNEidiZQWMZN3USJzj76q5ia3v2v2v3"));
+    ASSERT_FALSE(Address::isValid("917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb7786"));
+    ASSERT_FALSE(Address::isValid("917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d1f"));
+
+    ASSERT_TRUE(Address::isValid("NEAR2758Nk7CMUcxTwXdjVdSxNEidiZQWMZN3USJzj76q5ia3v2v2v"));
+    ASSERT_TRUE(Address::isValid("917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d"));
+}
+
+TEST(NEARAddress, FromString) {
+    ASSERT_EQ(
+        Address("NEAR2758Nk7CMUcxTwXdjVdSxNEidiZQWMZN3USJzj76q5ia3v2v2v").string(),
+        "917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d");
+    ASSERT_EQ(
+        Address("9685af3fe2dc231e5069ccff8ec6950eb961d42ebb9116a8ab9c0d38f9e45249").string(),
+        "9685af3fe2dc231e5069ccff8ec6950eb961d42ebb9116a8ab9c0d38f9e45249");
+}
+
+TEST(NEARAddress, FromPrivateKey) {
+    auto fullKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    auto key = PrivateKey(Data(fullKey.begin(), fullKey.begin() + 32));
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+
+    ASSERT_EQ(address.string(), "917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d");
+}
+
+} // namespace TW::NEAR::tests
diff --git a/tests/chains/NEAR/SerializationTests.cpp b/tests/chains/NEAR/SerializationTests.cpp
new file mode 100644
index 00000000000..f534edd48f2
--- /dev/null
+++ b/tests/chains/NEAR/SerializationTests.cpp
@@ -0,0 +1,276 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Base58.h"
+#include "proto/NEAR.pb.h"
+#include "NEAR/Serialization.h"
+
+#include <TrustWalletCore/TWHRP.h>
+#include <gtest/gtest.h>
+
+namespace TW::NEAR {
+
+TEST(NEARSerialization, SerializeTransferTransaction) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    auto& transfer = *input.mutable_actions(0)->mutable_transfer();
+    Data deposit(16, 0);
+    deposit[0] = 1;
+    transfer.set_deposit(deposit.data(), deposit.size());
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000301000000000000000000000000000000");
+}
+
+TEST(NEARSerialization, SerializeFunctionCallTransaction) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    auto& functionCall = *input.mutable_actions(0)->mutable_function_call();
+
+    functionCall.set_method_name("qqq");
+    functionCall.set_gas(1000);
+
+    Data deposit(16, 0);
+    deposit[0] = 1;
+    functionCall.set_deposit(deposit.data(), deposit.size());
+
+    Data args(3, 0);
+    args[0] = 1;
+    args[1] = 2;
+    args[2] = 3;
+    functionCall.set_args(args.data(), args.size());
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef601000000020300000071717103000000010203e80300000000000001000000000000000000000000000000");
+}
+
+TEST(NEARSerialization, SerializeStakeTransaction) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    auto& stake = *input.mutable_actions(0)->mutable_stake();
+    Data amount(16, 0);
+    amount[0] = 1;
+    stake.set_stake(amount.data(), amount.size());
+
+    auto& pKey = *stake.mutable_public_key();
+    pKey.set_data(publicKey.data(), publicKey.size());
+    pKey.set_key_type(0);
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef601000000040100000000000000000000000000000000917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d");
+}
+
+TEST(NEARSerialization, SerializeStakeTransaction2) {
+    auto publicKey = Base58::decode("C2P7YcEmBv31vtCHLBcESteN4Yi4vSCkXEXMTANyB649");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("vdx.testnet");
+    input.set_nonce(93128451000005);
+    input.set_receiver_id("vdx.testnet");
+
+    input.add_actions();
+    auto& stake = *input.mutable_actions(0)->mutable_stake();
+    // 2490000000000000000000000000
+    auto amount = parse_hex("000000fa4f3f757902ae0b0800000000"); // little endian
+    stake.set_stake(amount.data(), amount.size());
+
+    auto& pKey = *stake.mutable_public_key();
+    pKey.set_data(publicKey.data(), publicKey.size());
+    pKey.set_key_type(0);
+
+    auto blockHash = Base58::decode("ByDnm7c25npQXwNUX5yivbYbpjFcNuNumF6BJjaK3vhJ");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("5Cfk7QBnmDxxFxQk75FFq4ADrQS9gxHKe6vtuGH6JCCm8WV8aRPEGVqp579JHNmmHMUt49gkCVcH2t7NRnh2v7Qu");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "0b0000007664782e746573746e657400a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426dac5863d28b35400000b0000007664782e746573746e6574a2fbdae8a769c636d109952e4fe760b03688e629933cbf693aedfd97a470c7a50100000004000000fa4f3f757902ae0b080000000000a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426da");
+}
+
+TEST(NEARSerialization, SerializeAddKeyFunctionCallTransaction) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    auto& addKey = *input.mutable_actions(0)->mutable_add_key();
+
+    auto& pKey = *addKey.mutable_public_key();
+    pKey.set_data(publicKey.data(), publicKey.size());
+    pKey.set_key_type(0);
+
+    auto& accessKey = *addKey.mutable_access_key();
+    accessKey.set_nonce(0);
+    auto& functionCallPermission = *accessKey.mutable_function_call();
+    functionCallPermission.set_receiver_id("zzz");
+    functionCallPermission.add_method_names("www");
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000500917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d00000000000000000000030000007a7a7a0100000003000000777777");
+}
+
+TEST(NEARSerialization, SerializeAddKeyFullAccessTransaction) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    auto& addKey = *input.mutable_actions(0)->mutable_add_key();
+
+    auto& pKey = *addKey.mutable_public_key();
+    pKey.set_data(publicKey.data(), publicKey.size());
+    pKey.set_key_type(0);
+
+    auto& accessKey = *addKey.mutable_access_key();
+    accessKey.set_nonce(0);
+
+    accessKey.mutable_full_access();
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000500917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d000000000000000001");
+}
+
+TEST(NEARSerialization, SerializeDeleteKeyTransaction) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    auto& deleteKey = *input.mutable_actions(0)->mutable_delete_key();
+
+    auto& pKey = *deleteKey.mutable_public_key();
+    pKey.set_data(publicKey.data(), publicKey.size());
+    pKey.set_key_type(0);
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000600917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d");
+}
+
+TEST(NEARSerialization, SerializeCreateAccountTransaction) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    input.mutable_actions(0)->mutable_create_account();
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef60100000000");
+}
+
+TEST(NEARSerialization, SerializeDeleteAccountTransaction) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    auto& deleteAccount = *input.mutable_actions(0)->mutable_delete_account();
+    deleteAccount.set_beneficiary_id("123");
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto serialized = transactionData(input);
+    auto serializedHex = hex(serialized);
+
+    ASSERT_EQ(serializedHex, "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6010000000703000000313233");
+}
+
+}
diff --git a/tests/chains/NEAR/SignerTests.cpp b/tests/chains/NEAR/SignerTests.cpp
new file mode 100644
index 00000000000..16659e4393c
--- /dev/null
+++ b/tests/chains/NEAR/SignerTests.cpp
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "Base58.h"
+#include "HexCoding.h"
+#include "proto/NEAR.pb.h"
+#include "NEAR/Signer.h"
+
+#include <TrustWalletCore/TWHRP.h>
+#include <gtest/gtest.h>
+
+namespace TW::NEAR {
+
+TEST(NEARSigner, SignTx) {
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+
+    auto input = Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+
+    input.add_actions();
+    auto& transfer = *input.mutable_actions(0)->mutable_transfer();
+    Data deposit(16, 0);
+    deposit[0] = 1;
+    // uint128_t / little endian byte order
+    transfer.set_deposit(deposit.data(), deposit.size());
+
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto privateKey = Base58::decode("3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    input.set_private_key(privateKey.data(), 32);
+
+    auto output = Signer::sign(std::move(input));
+
+    auto signed_transaction = output.signed_transaction();
+    auto outputInBase64 = Base64::encode(Data(signed_transaction.begin(), signed_transaction.end()));
+
+    ASSERT_EQ(outputInBase64, "CQAAAHRlc3QubmVhcgCRez0mjUtY9/7BsVC9aNab4+5dTMOYVeNBU4Rlu3eGDQEAAAAAAAAADQAAAHdoYXRldmVyLm5lYXIPpHP9JpAd8pa+atxMxN800EDvokNSJLaYaRDmMML+9gEAAAADAQAAAAAAAAAAAAAAAAAAAACWmoMzIYbul1Xkg5MlUlgG4Ymj0tK7S0dg6URD6X4cTyLe7vAFmo6XExAO2m4ZFE2n6KDvflObIHCLodjQIb0B");
+    ASSERT_EQ(hex(output.hash()), "eea6e680f3ea51a7f667e9a801d0bfadf66e03d41ed54975b3c6006351461b32");
+}
+
+}
diff --git a/tests/chains/NEAR/TWAnySignerTests.cpp b/tests/chains/NEAR/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..7bd363fc63e
--- /dev/null
+++ b/tests/chains/NEAR/TWAnySignerTests.cpp
@@ -0,0 +1,162 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/NEAR.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "Base58.h"
+#include "Base64.h"
+#include <gtest/gtest.h>
+
+namespace TW::NEAR {
+
+TEST(TWAnySignerNEAR, SignTransfer) {
+
+    auto privateKey = parse_hex("8737b99bf16fba78e1e753e23ba00c4b5423ac9c45d9b9caae9a519434786568");
+    auto blockHash = parse_hex("0fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef6");
+    // uint128_t / little endian byte order
+    auto deposit = parse_hex("01000000000000000000000000000000");
+
+    Proto::SigningInput input;
+    input.set_signer_id("test.near");
+    input.set_nonce(1);
+    input.set_receiver_id("whatever.near");
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    
+    auto& action = *input.add_actions();
+    auto& transfer = *action.mutable_transfer();
+    transfer.set_deposit(deposit.data(), deposit.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNEAR);
+
+    ASSERT_EQ(hex(output.signed_transaction()), "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901df296be6adc4cc4df34d040efa2435224b6986910e630c2fef601000000030100000000000000000000000000000000969a83332186ee9755e4839325525806e189a3d2d2bb4b4760e94443e97e1c4f22deeef0059a8e9713100eda6e19144da7e8a0ef7e539b20708ba1d8d021bd01");
+    ASSERT_EQ(hex(output.hash()), "eea6e680f3ea51a7f667e9a801d0bfadf66e03d41ed54975b3c6006351461b32");
+}
+
+TEST(TWAnySignerNEAR, SignStake) {
+
+    auto privateKey = parse_hex("d22149327ceb8e86f70962be0c7293f8308d85d0cbea2cc24e47c3033da7440f");
+    auto publicKey = parse_hex("a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426da");
+    auto blockHash = parse_hex("a2fbdae8a769c636d109952e4fe760b03688e629933cbf693aedfd97a470c7a5");
+
+    // 2490000000000000000000000000
+    auto amount = parse_hex("000000fa4f3f757902ae0b0800000000"); // little endian
+
+    Proto::SigningInput input;
+    input.set_signer_id("vdx.testnet");
+    input.set_nonce(93128451000005);
+    input.set_receiver_id("vdx.testnet");
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    
+    auto& action = *input.add_actions();
+    auto& stake = *action.mutable_stake();
+    stake.set_stake(amount.data(), amount.size());
+
+    auto& pubkey = *stake.mutable_public_key();
+    pubkey.set_data(publicKey.data(), publicKey.size());
+    pubkey.set_key_type(0);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNEAR);
+
+    ASSERT_EQ(hex(output.signed_transaction()), "0b0000007664782e746573746e657400a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426dac5863d28b35400000b0000007664782e746573746e6574a2fbdae8a769c636d109952e4fe760b03688e629933cbf693aedfd97a470c7a50100000004000000fa4f3f757902ae0b080000000000a3cb23dbb9810abd4a6804328eec47a17236383b5c234cae903b064e9dc426da0011fdbc234d4ce470ec7f2ac5e4d3d8f8fe1525f83e9a2425e7000aea52f7260ff4f5191beaa1a5ac29256e68c6acd368ada0d06ed033e9a204ee119f5ef1b104");
+    ASSERT_EQ(hex(output.hash()), "c8aedbf75fcaa9b663a3959d27f1deae809e1923460791471e5219eafecc4ba8");
+}
+
+TEST(TWAnySignerNEAR, SignStakeMainnetReplication) {
+    auto privateKey = Base58::decode("3BPZ9Qu7CviWD4CeKy3DYbNc4suyuBJYnjhVT2oTRCrfb4CQPiTK5tFVdg8Z3ijozxWoxxt9Y1kwkwPntrcc3dom");
+    auto blockHash = parse_hex("e78680996127b7a0f3f2343502e442f24366cba5f79cb72f8bc6d0debb26ce24");
+    
+    // 0.1 with 24 decimal precision in big endian
+    auto amount = parse_hex("000080f64ae1c7022d15000000000000");
+
+    Proto::SigningInput input;
+    input.set_signer_id("b8d5df25047841365008f30fb6b30dd820e9a84d869f05623d114e96831f2fbf");
+    input.set_nonce(77701544000004);
+    input.set_receiver_id("avado.poolv1.near");
+    input.set_private_key(privateKey.data(), 32);
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto& action = *input.add_actions();
+    auto& call = *action.mutable_function_call();
+    call.set_method_name("deposit_and_stake");
+    call.set_args("{}");
+    call.set_gas(125000000000000);
+    call.set_deposit(amount.data(), amount.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNEAR);
+
+    // https://nearblocks.io/txns/kd7ajFw1CfXB8LiJXvhz5NDS7QpQXkuQraAbhb5MMMq
+    ASSERT_EQ(Base58::encode(data(output.hash())), "kd7ajFw1CfXB8LiJXvhz5NDS7QpQXkuQraAbhb5MMMq");
+    ASSERT_EQ(Base64::encode(data(output.signed_transaction())), "QAAAAGI4ZDVkZjI1MDQ3ODQxMzY1MDA4ZjMwZmI2YjMwZGQ4MjBlOWE4NGQ4NjlmMDU2MjNkMTE0ZTk2ODMxZjJmYmYAzgCT6NK76nb1mB7pToefgkGUHfUe5BKvvr3gW/nq+MgEuu1Mq0YAABEAAABhdmFkby5wb29sdjEubmVhcueGgJlhJ7eg8/I0NQLkQvJDZsul95y3L4vG0N67Js4kAQAAAAIRAAAAZGVwb3NpdF9hbmRfc3Rha2UCAAAAe30A0JjUr3EAAAAAgPZK4ccCLRUAAAAAAAAALNrorr8qTL6u1nlxLpuPa45nFdYmjU96i7CmJP08mVHVzHUaw/bGN30Z3u3o1F2o2yefCBNqO9Ogn9fM25NGCg==");
+}
+
+TEST(TWAnySignerNEAR, SignUnstakeMainnetReplication) {
+    auto privateKey = Base58::decode("3BPZ9Qu7CviWD4CeKy3DYbNc4suyuBJYnjhVT2oTRCrfb4CQPiTK5tFVdg8Z3ijozxWoxxt9Y1kwkwPntrcc3dom");
+    auto blockHash = Base58::decode("CehJc9uZhqE2m17ZrkqcAog4mxSz6JSvYv1JEK1iBsX9");
+
+    auto amount = parse_hex("00000000000000000000000000000000");
+
+    Proto::SigningInput input;
+    input.set_signer_id("b8d5df25047841365008f30fb6b30dd820e9a84d869f05623d114e96831f2fbf");
+    input.set_nonce(77701544000006);
+    input.set_receiver_id("avado.poolv1.near");
+    input.set_private_key(privateKey.data(), 32);
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto& action = *input.add_actions();
+    auto& call = *action.mutable_function_call();
+    call.set_method_name("unstake_all");
+    call.set_args("{}");
+    call.set_gas(125000000000000);
+    call.set_deposit(amount.data(), amount.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNEAR);
+
+    // https://nearblocks.io/txns/DH6QAX3TkY6XtkteorvKBoGT5hA5ADkURZdzrbbKRs8P
+    ASSERT_EQ(Base58::encode(data(output.hash())), "DH6QAX3TkY6XtkteorvKBoGT5hA5ADkURZdzrbbKRs8P");
+    ASSERT_EQ(Base64::encode(data(output.signed_transaction())), "QAAAAGI4ZDVkZjI1MDQ3ODQxMzY1MDA4ZjMwZmI2YjMwZGQ4MjBlOWE4NGQ4NjlmMDU2MjNkMTE0ZTk2ODMxZjJmYmYAzgCT6NK76nb1mB7pToefgkGUHfUe5BKvvr3gW/nq+MgGuu1Mq0YAABEAAABhdmFkby5wb29sdjEubmVhcq0YnhRlt+TTtagkoy0qKn56zAfGhE+jkTJW6PR5k5r8AQAAAAILAAAAdW5zdGFrZV9hbGwCAAAAe30A0JjUr3EAAAAAAAAAAAAAAAAAAAAAAAAABaFP0EkfJU3VQZ4QAiTwq9ebWDJ7jx7TxbA+VGH4hwKX3gWnmDHVve+LK7/UbbffjF/y8vn0KrPxdh3ONAG0Ag==");
+}
+
+/// Implements NEP-141:
+/// https://nomicon.io/Standards/Tokens/FungibleToken/Core
+///
+/// Successfully broadcasted tx:
+/// https://nearblocks.io/txns/ABQY6nfLdNrRVynHYNjYkfUM6Up5pDHHpuhRJe6FCMRu
+TEST(TWAnySignerNEAR, SignTokenTransfer) {
+    auto privateKey = parse_hex("77006e227658c18da47546413926a26b839204b1b19e807c4a13d994d661c72e");
+
+    auto blockHash = Base58::decode("2dQBYs8XjprLLgtH7eVsJ3e58A5QuRcbuqFisSk9fFWQ");
+
+    // Deposit should be 1 yocto NEAR for security purposes.
+    auto deposit = parse_hex("01000000000000000000000000000000");
+
+    Proto::SigningInput input;
+    input.set_signer_id("105396228ac2e0ef144b93bcc5322fca1167d524422bb73d17440d35c714a58f");
+    input.set_nonce(93062928000003);
+    input.set_receiver_id("token.paras.near");
+    input.set_private_key(privateKey.data(), 32);
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    auto& action = *input.add_actions();
+    auto& tokenTransfer = *action.mutable_token_transfer();
+    tokenTransfer.set_token_amount("100000000000000000");
+    tokenTransfer.set_receiver_id("c6d5e3e8f328436f595856a598239b691d3d136b24c05a4614f9e9716edc14fe");
+    tokenTransfer.set_gas(15000000000000);
+    tokenTransfer.set_deposit(deposit.data(), deposit.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNEAR);
+
+    ASSERT_EQ(Base58::encode(data(output.hash())), "ABQY6nfLdNrRVynHYNjYkfUM6Up5pDHHpuhRJe6FCMRu");
+    ASSERT_EQ(Base64::encode(data(output.signed_transaction())), "QAAAADEwNTM5NjIyOGFjMmUwZWYxNDRiOTNiY2M1MzIyZmNhMTE2N2Q1MjQ0MjJiYjczZDE3NDQwZDM1YzcxNGE1OGYAEFOWIorC4O8US5O8xTIvyhFn1SRCK7c9F0QNNccUpY8D5MPmo1QAABAAAAB0b2tlbi5wYXJhcy5uZWFyGC7O0jXN2b4SH1XfMtNISEnU8XATKOhZwxx0pLLZqTEBAAAAAgsAAABmdF90cmFuc2ZlcnAAAAB7ImFtb3VudCI6IjEwMDAwMDAwMDAwMDAwMDAwMCIsInJlY2VpdmVyX2lkIjoiYzZkNWUzZThmMzI4NDM2ZjU5NTg1NmE1OTgyMzliNjkxZDNkMTM2YjI0YzA1YTQ2MTRmOWU5NzE2ZWRjMTRmZSJ9APCrdaQNAAABAAAAAAAAAAAAAAAAAAAAANUjO7fmnTebSNW9EcHHwYwPNlQJcReGWJfJUuxWzPDAGEeo4JTcLB8pLCkqxKKsI0NE1Szv2+GAt5mCBum5mQY=");
+}
+
+} // namespace TW::NEAR
diff --git a/tests/chains/NEAR/TWCoinTypeTests.cpp b/tests/chains/NEAR/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..b62f545841a
--- /dev/null
+++ b/tests/chains/NEAR/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNEARCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNEAR));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("FPQAMaVnvFHNwNBJWnTttXfdJhp5FvMGGDJEesB8gvbL"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNEAR, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("test-trust.vlad.near"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNEAR, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNEAR));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNEAR));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNEAR), 24);
+    ASSERT_EQ(TWBlockchainNEAR, TWCoinTypeBlockchain(TWCoinTypeNEAR));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNEAR));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNEAR));
+    assertStringsEqual(symbol, "NEAR");
+    assertStringsEqual(txUrl, "https://nearblocks.io/txns/FPQAMaVnvFHNwNBJWnTttXfdJhp5FvMGGDJEesB8gvbL");
+    assertStringsEqual(accUrl, "https://nearblocks.io/address/test-trust.vlad.near");
+    assertStringsEqual(id, "near");
+    assertStringsEqual(name, "NEAR");
+}
diff --git a/tests/NEAR/TWNEARAccountTests.cpp b/tests/chains/NEAR/TWNEARAccountTests.cpp
similarity index 75%
rename from tests/NEAR/TWNEARAccountTests.cpp
rename to tests/chains/NEAR/TWNEARAccountTests.cpp
index c97ba7d5c0d..9f09189dfd7 100644
--- a/tests/NEAR/TWNEARAccountTests.cpp
+++ b/tests/chains/NEAR/TWNEARAccountTests.cpp
@@ -1,12 +1,10 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 //
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <TrustWalletCore/TWNEARAccount.h>
 #include <gtest/gtest.h>
 
diff --git a/tests/chains/NEAR/TransactionCompilerTests.cpp b/tests/chains/NEAR/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..705ba950804
--- /dev/null
+++ b/tests/chains/NEAR/TransactionCompilerTests.cpp
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/NEAR.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(NEARCompiler, CompileWithSignatures) {
+    auto privateKeyBytes = Base58::decode(
+        "3hoMW1HvnRLSFCLZnvPzWeoGwtdHzke34B2cTHM8rhcbG3TbuLKtShTv3DvyejnXKXKBiV7YPkLeqUHN1ghnqpFv");
+    auto publicKey = Base58::decode("Anu7LYDfpLtkP7E16LT9imXF694BdQaa9ufVkQiwTQxC");
+    const auto coin = TWCoinTypeNEAR;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::NEAR::Proto::SigningInput();
+    input.set_signer_id("test.near");
+    input.set_receiver_id("whatever.near");
+    input.set_nonce(1);
+    auto blockHash = Base58::decode("244ZQ9cgj3CQ6bWBdytfrJMuMQ1jdXLFGnr4HhvtCTnM");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_public_key(publicKey.data(), publicKey.size());
+
+    input.add_actions();
+    auto& transfer = *input.mutable_actions(0)->mutable_transfer();
+    Data deposit(16, 0);
+    deposit[0] = 1;
+    transfer.set_deposit(deposit.data(), deposit.size());
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "eea6e680f3ea51a7f667e9a801d0bfadf66e03d41ed54975b3c6006351461b32");
+    auto signature = parse_hex("969a83332186ee9755e4839325525806e189a3d2d2bb4b4760e94443e97e1c4f22d"
+                               "eeef0059a8e9713100eda6e19144da7e8a0ef7e539b20708ba1d8d021bd01");
+
+    /// Step 3: Compile transaction info
+    const auto tx = "09000000746573742e6e65617200917b3d268d4b58f7fec1b150bd68d69be3ee5d4cc39855e341"
+                    "538465bb77860d01000000000000000d00000077686174657665722e6e6561720fa473fd26901d"
+                    "f296be6adc4cc4df34d040efa2435224b6986910e630c2fef60100000003010000000000000000"
+                    "0000000000000000969a83332186ee9755e4839325525806e189a3d2d2bb4b4760e94443e97e1c"
+                    "4f22deeef0059a8e9713100eda6e19144da7e8a0ef7e539b20708ba1d8d021bd01";
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKey});
+
+    {
+        TW::NEAR::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.signed_transaction()), tx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+        // keys were not used anywhere up to this point.
+        TW::NEAR::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(privateKeyBytes.data(), 32);
+
+        TW::NEAR::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.signed_transaction()), tx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKey});
+        NEAR::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.signed_transaction().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+}
diff --git a/tests/chains/NEO/AddressTests.cpp b/tests/chains/NEO/AddressTests.cpp
new file mode 100644
index 00000000000..af24375ebfe
--- /dev/null
+++ b/tests/chains/NEO/AddressTests.cpp
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "NEO/Address.h"
+#include "NEO/Signer.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace TW;
+
+namespace TW::NEO::tests {
+
+TEST(NEOAddress, FromPublicKey) {
+    const auto publicKey = PublicKey(parse_hex("0222b2277d039d67f4197a638dd5a1d99c290b17aa8c4a16ccee5165fe612de66a"), TWPublicKeyTypeSECP256k1);
+    const auto address = Address(publicKey);
+    EXPECT_EQ(string("AKmrAHRD9ZDUnu4m3vWWonpsojo4vgSuqp"), address.string());
+}
+
+TEST(NEOAddress, FromString) {
+    string neoAddress = "AXkgwcMJTy9wTAXHsbyhauxh7t2Tt31MmC";
+    const auto address = Address(neoAddress);
+    EXPECT_EQ(address.string(), neoAddress);
+}
+
+TEST(NEOAddress, isValid) {
+    string neoAddress = "AQAsqiyHS4SSVWZ4CmMmnCxWg7vJ84GEj4";
+    string bitcoinAddress = "1Ma2DrB78K7jmAwaomqZNRMCvgQrNjE2QC";
+
+    EXPECT_TRUE(Address::isValid(neoAddress));
+    EXPECT_FALSE(Address::isValid(bitcoinAddress));
+}
+
+TEST(NEOAddress, validation) {
+    EXPECT_FALSE(Address::isValid("abc"));
+    EXPECT_FALSE(Address::isValid("abeb60f3e94c1b9a09f33669435e7ef12eacd"));
+    EXPECT_FALSE(Address::isValid("abcb60f3e94c9b9a09f33669435e7ef1beaedads"));
+    EXPECT_TRUE(Address::isValid("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD"));
+}
+
+TEST(NEOAddress, fromPubKey) {
+    auto address = Address(PublicKey(parse_hex("031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486"), TWPublicKeyTypeNIST256p1));
+    EXPECT_EQ("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5", address.string());
+}
+
+TEST(NEOAddress, fromString) {
+    auto b58Str = "AYTxeseHT5khTWhtWX1pFFP1mbQrd4q1zz";
+    auto address = Address(b58Str);
+    EXPECT_EQ(b58Str, address.string());
+    auto errB58Str = "AATxeseHT5khTWhtWX1pFFP1mbQrd4q1zz";
+    EXPECT_THROW(new Address(errB58Str), std::invalid_argument);
+}
+
+TEST(NEOAddress, Valid) {
+    ASSERT_TRUE(Address::isValid("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD"));
+}
+
+TEST(NEOAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("ANDfjwrUr54515515155WKRMyxFwvVwnZD"));
+}
+
+TEST(NEOAddress, FromPrivateKey) {
+    auto key = PrivateKey(parse_hex("0x2A9EAB0FEC93CD94FA0A209AC5604602C1F0105FB02EAB398E17B4517C2FFBAB"));
+    auto publicKey = key.getPublicKey(TWPublicKeyTypeNIST256p1);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "AQCSMB3oSDA1dHPn6GXN6KB4NHmdo1fX41");
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/BinaryCodingTests.cpp b/tests/chains/NEO/BinaryCodingTests.cpp
new file mode 100644
index 00000000000..ec01ba5fd98
--- /dev/null
+++ b/tests/chains/NEO/BinaryCodingTests.cpp
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "NEO/BinaryCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::NEO::tests {
+
+using namespace std;
+
+TEST(NEOBinaryCoding, encode256LE) {
+    Data d;
+    encode256LE(d, uint256_t(110000000));
+    EXPECT_EQ(hex(d), "80778e06");
+}
+
+TEST(NEOBinaryCoding, encode256LEWithPadding) {
+    Data d;
+    encode256LE(d, uint256_t(10000000));
+    EXPECT_EQ(hex(d), "80969800");
+}
+
+TEST(NEOBinaryCoding, encodeBytes) {
+    Data d;
+    Data value;
+    std::fill_n(std::back_inserter(value), 10, 'a');
+    encodeBytes(d, value);
+    EXPECT_EQ(d.size(), value.size() + 1);
+
+    d.clear();
+    value.clear();
+    std::fill_n(std::back_inserter(value), 255, 'a');
+    encodeBytes(d, value);
+    EXPECT_EQ(d.size(), value.size() + 1 + 1);
+
+    d.clear();
+    value.clear();
+    std::fill_n(std::back_inserter(value), 300, 'a');
+    encodeBytes(d, value);
+    EXPECT_EQ(d.size(), value.size() + 1 + 2);
+
+    d.clear();
+    value.clear();
+    std::fill_n(std::back_inserter(value), 0x10000, 'a');
+    encodeBytes(d, value);
+    EXPECT_EQ(d.size(), value.size() + 1 + 4);
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/CoinReferenceTests.cpp b/tests/chains/NEO/CoinReferenceTests.cpp
new file mode 100644
index 00000000000..03f195fc6f4
--- /dev/null
+++ b/tests/chains/NEO/CoinReferenceTests.cpp
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "uint256.h"
+#include "HexCoding.h"
+#include "NEO/CoinReference.h"
+#include <gtest/gtest.h>
+
+namespace TW::NEO::tests {
+
+using namespace std;
+
+TEST(NEOCoinReference, Serialize) {
+    auto coinReference = CoinReference();
+    string prevHash = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a";
+    coinReference.prevHash = load(parse_hex(prevHash));
+    coinReference.prevIndex = 1;
+    EXPECT_EQ(prevHash + "0100", hex(coinReference.serialize()));
+}
+
+TEST(NEOCoinReference, SerializeWithZeroLeading) {
+    auto coinReference = CoinReference();
+    string prevHash = "0037ebf259ca5c6c43a5e7117c910858ea1146290e07d39e48554bc00d890b94";
+    coinReference.prevHash = load(parse_hex(prevHash));
+    coinReference.prevIndex = 1;
+    EXPECT_EQ(prevHash + "0100", hex(coinReference.serialize()));
+}
+
+TEST(NEOCoinReference, Deserialize) {
+    auto coinReference = CoinReference();
+    coinReference.deserialize(parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a0100"));
+    EXPECT_EQ("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a", hex(store(coinReference.prevHash)));
+    EXPECT_EQ(1, coinReference.prevIndex);
+}
+
+TEST(NEOCoinReference, DeserializeError) {
+    auto coinReference = CoinReference();
+    // rawRef is 33 bytes length, expected 34.
+    auto rawRef = parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a01");
+    EXPECT_THROW(coinReference.deserialize(rawRef), std::invalid_argument);
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/ReadDataTests.cpp b/tests/chains/NEO/ReadDataTests.cpp
new file mode 100644
index 00000000000..02f16e02617
--- /dev/null
+++ b/tests/chains/NEO/ReadDataTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "NEO/ReadData.h"
+
+#include <gtest/gtest.h>
+
+#include "TestUtilities.h"
+
+namespace TW::NEO::tests {
+
+using namespace std;
+
+TEST(NEOReadData, readBytes) {
+    EXPECT_EXCEPTION(TW::readBytes(Data{}, 10), "Data::Cannot read enough bytes!");
+}
+
+TEST(NEOReadData, readVar) {
+    Data from{0xfe, 0x00, 0x00, 0x00, 0x01};
+    int64_t max = 0;
+    EXPECT_EXCEPTION(TW::readVar(from, 0, max), "ReadData::ReadVarInt error: Too huge value! FormatException");
+    
+    max = INT64_MAX;
+    ASSERT_EQ(TW::readVar(from, 0, max), 0x1000000);
+
+    from = {0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
+    ASSERT_EQ(TW::readVar(from, 0, max), 0x100000000000000);
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/ScriptTests.cpp b/tests/chains/NEO/ScriptTests.cpp
new file mode 100644
index 00000000000..2b36c1e1d10
--- /dev/null
+++ b/tests/chains/NEO/ScriptTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "NEO/Script.h"
+#include "NEO/Address.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::NEO::tests {
+
+using namespace std;
+
+TEST(NEOScript, Nep5TransferWithRet) {
+    auto assetId = parse_hex("0d821bd7b6d53f5c2b40e217c6defc8bbe896cf5");
+    std::reverse(assetId.begin(),assetId.end());
+    auto from = Address("AJzoeKrj7RHMwSrPQDPdv61ciVEYpmhkjk").toScriptHash();
+    auto to = Address("AeRsDBqPiGKZhzNtL2vWhXbXGccJLCGrbJ").toScriptHash();
+    auto script = Script::CreateNep5TransferScript(assetId, from, to, uint256_t(110000000), true);
+
+    EXPECT_EQ(hex(script), "0480778e0614f88235a26e55cce0747ee827f39fd8167849672b14235a717ed7ed18a43de47499c3d05b8d4a4bcf3a53c1087472616e7366657267f56c89be8bfcdec617e2402b5c3fd5b6d71b820df166");
+}
+
+TEST(NEOScript, Nep5Transfer) {
+    auto assetId = parse_hex("f46719e2d16bf50cddcef9d4bbfece901f73cbb6");
+    std::reverse(assetId.begin(),assetId.end());
+    auto from = Address("APqYfjvV2cCwcvFjceVcSrcouyq74qNFKS").toScriptHash();
+    auto to = Address("ANeo2toNeo3MigrationAddressxwPB2Hz").toScriptHash();
+    auto script = Script::CreateNep5TransferScript(assetId, from, to, uint256_t(15000000000));
+
+    EXPECT_EQ(hex(script), "0500d6117e03144b721e06b50cc74e68b417716e3b099fb99757a8145872d3dd8741af4c8d5a94f8a1bfff5c617be01b53c1087472616e7366657267b6cb731f90cefebbd4f9cedd0cf56bd1e21967f4");
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/SignerTests.cpp b/tests/chains/NEO/SignerTests.cpp
new file mode 100644
index 00000000000..55a214e09ae
--- /dev/null
+++ b/tests/chains/NEO/SignerTests.cpp
@@ -0,0 +1,89 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include "PublicKeyLegacy.h"
+#include "NEO/Address.h"
+#include "NEO/Signer.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::NEO::tests {
+
+using namespace std;
+
+TEST(NEOSigner, FromPublicPrivateKey) {
+    auto hexPrvKey = "4646464646464646464646464646464646464646464646464646464646464646";
+    auto hexPubKey = "031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486";
+    auto signer = Signer(PrivateKey(parse_hex(hexPrvKey)));
+    auto prvKey = signer.getPrivateKey();
+    auto pubKey = signer.getPublicKey();
+
+    EXPECT_EQ(hexPrvKey, hex(prvKey.bytes));
+    EXPECT_EQ(hexPubKey, hex(pubKey.bytes));
+
+    auto address = signer.getAddress();
+    EXPECT_TRUE(Address::isValid(address.string()));
+
+    EXPECT_EQ(Address(pubKey), address);
+}
+
+TEST(NEOSigner, SigningData) {
+    auto signer = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
+    auto verScript = "ba7908ddfe5a1177f2c9d3fa1d3dc71c9c289a3325b3bdd977e20c50136959ed02d1411efa5e8b897d970ef7e2325e6c0a3fdee4eb421223f0d86e455879a9ad";
+    auto invocationScript = string("401642b3d538e138f34b32330e381a7fe3f5151fcf958f2030991e72e2e25043143e4a1ebd239634efba279c96fa0ab04a15aa15179d73a7ef5a886ac8a06af484401642b3d538e138f34b32330e381a7fe3f5151fcf958f2030991e72e2e25043143e4a1ebd239634efba279c96fa0ab04a15aa15179d73a7ef5a886ac8a06af484401642b3d538e138f34b32330e381a7fe3f5151fcf958f2030991e72e2e25043143e4a1ebd239634efba279c96fa0ab04a15aa15179d73a7ef5a886ac8a06af484");
+    invocationScript = string(invocationScript.rbegin(), invocationScript.rend());
+
+    EXPECT_EQ(verScript, hex(signer.sign(parse_hex(invocationScript))));
+}
+
+TEST(NEOAccount, validity) {
+    auto hexPrvKey = "4646464646464646464646464646464646464646464646464646464646464646";
+    auto hexPubKey = "031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486";
+    auto signer = Signer(PrivateKey(parse_hex(hexPrvKey)));
+    auto prvKey = signer.getPrivateKey();
+    auto pubKey = signer.getPublicKey();
+    EXPECT_EQ(hexPrvKey, hex(prvKey.bytes));
+    EXPECT_EQ(hexPubKey, hex(pubKey.bytes));
+}
+
+TEST(NEOSigner, SigningTransaction) {
+    auto privateKey = PrivateKey(parse_hex("F18B2F726000E86B4950EBEA7BFF151F69635951BC4A31C44F28EE6AF7AEC128"));
+    auto signer = Signer(privateKey);
+    auto transaction = Transaction();
+    transaction.type = TransactionType::TT_ContractTransaction;
+    transaction.version = 0x00;
+
+    CoinReference coin;
+    coin.prevHash = load(parse_hex("9c85b39cd5677e2bfd6bf8a711e8da93a2f1d172b2a52c6ca87757a4bccc24de")); // reverse hash
+    coin.prevIndex = (uint16_t)1;
+    transaction.inInputs.push_back(coin);
+
+    {
+        TransactionOutput out;
+        out.assetId = load(parse_hex("9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5"));
+        out.value = (int64_t)1 * 100000000;
+        auto scriptHash = TW::NEO::Address("Ad9A1xPbuA5YBFr1XPznDwBwQzdckAjCev").toScriptHash();
+        out.scriptHash = load(scriptHash);
+        transaction.outputs.push_back(out);
+    }
+
+    {
+        TransactionOutput out;
+        out.assetId = load(parse_hex("9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5"));
+        out.value = (int64_t)892 * 100000000;
+        auto scriptHash = TW::NEO::Address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV").toScriptHash();
+        out.scriptHash = load(scriptHash);
+        transaction.outputs.push_back(out);
+    }
+
+    signer.sign(transaction);
+    auto signedTx = transaction.serialize();
+    EXPECT_EQ(hex(signedTx), "800000019c85b39cd5677e2bfd6bf8a711e8da93a2f1d172b2a52c6ca87757a4bccc24de0100029b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500e1f50500000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500fcbbc414000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac0141405046619c8e20e1fdeec92ce95f3019f6e7cc057294eb16b2d5e55c105bf32eb27e1fc01c1858576228f1fef8c0945a8ad69688e52a4ed19f5b85f5eff7e961d7232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac");
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // EXPECT_EQ(hex(signedTx), "800000019c85b39cd5677e2bfd6bf8a711e8da93a2f1d172b2a52c6ca87757a4bccc24de0100029b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500e1f50500000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500fcbbc414000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac0141405046619c8e20e1fdeec92ce95f3019f6e7cc057294eb16b2d5e55c105bf32eb281e03fe2e7a7a89ed70e01073f6ba574e65071c87cc8cce59833d4d30479c37a232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac");
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/TWAnySignerTests.cpp b/tests/chains/NEO/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..e600d17ad3f
--- /dev/null
+++ b/tests/chains/NEO/TWAnySignerTests.cpp
@@ -0,0 +1,206 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "PrivateKey.h"
+#include "PublicKeyLegacy.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+#include "proto/NEO.pb.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::NEO::tests {
+
+const std::string SECRET = "F18B2F726000E86B4950EBEA7BFF151F69635951BC4A31C44F28EE6AF7AEC128";
+
+Proto::SigningInput createInput() {
+    const std::string NEO_ASSET_ID = "9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5";
+    const std::string GAS_ASSET_ID = "e72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c60";
+
+    Proto::SigningInput input;
+    auto privateKey = parse_hex(SECRET);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_fee(12345); // too low
+    input.set_gas_asset_id(GAS_ASSET_ID);
+    input.set_gas_change_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
+
+#define ADD_UTXO_INPUT(hash, index, value, assetId) \
+        { \
+            auto utxo = input.add_inputs(); \
+            utxo->set_prev_hash(parse_hex(hash).data(), parse_hex(hash).size()); \
+            utxo->set_prev_index(index); \
+            utxo->set_asset_id(assetId); \
+            utxo->set_value(value); \
+        }
+
+    ADD_UTXO_INPUT("c61508268c5d0343af1875c60e569493100824dbdba108b31789e0e33bcb50fb", 1, 98899890000, GAS_ASSET_ID);
+    ADD_UTXO_INPUT("4eb2f96937a0d4dc96b77ba69a29e1de9574cbd62b16d881f1ee2061a291d70b", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("3fee0109d155dcfab272176117306b45b176914c88e8c379933c246a9e29ea0b", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("6ea9ce8c578bfeeecdf281f498e2a764689df3b93d6855a3cc45bd6b5213c426", 0, 400000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("f75ad3cbd277d83ee240e08f99a97ffd7e42a82a868e0f7043414f6d6147262b", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("054734e98f442b3e73a940ca8f594859ece1c7ddac14130b0e2f5e2799b85931", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("8b0c42d448912fc28c674fdcf8e21e4667d7d2133666168eaa0570488a9c5036", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 1, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 2, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 3, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 4, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 5, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 6, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 7, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 8, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 9, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("cf83bce600626b6077e136581c1aecc78a0bbb7d7649b1f580b6be881087ec40", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("9bd7572ba8df685e262369897d24f7217b42be496b9eed16e16a889dd83b394e", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("b4ee250397dde2f1001d782d3c803c38992447d3b351cdc9bf20cfaa2cbf995b", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("e1019ca259a1615f77263324156a70007b76cb4f26b01b2956b8f85e6842ac62", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("bd379df2aca526ac600919aaba0e59d4a1ad4e2f22d18966063cf45e431d016f", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("164c3f843b9b7bfa6a7376a1548f343acb5cdfa0193b8f31e8c9a647ea63ea7d", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("4acec74a76161eafe70e0791b1f504b5ba1d175fd4f340d5bf56804e25505e92", 0, 300000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("895c6629a71c84cbdc8956abea9ca2d9d215e909e6173b1a1a96289186a67796", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("54828143c4c3a0e1b09102e4ed29220b141089c2bc4200b1042eeb12e5e49296", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("5345e4abc86f7ace47112f5a91c129175833bafcaf9f1e1bcbbaf4d019c1c69d", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("c83e19d0d4210df97b3bc7768dc7184ae3acfc1b5b3ac9b05d2be0fe5a636b9f", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("3456b03f5cb688ce26ab1d09b7a15799136c8c886ca7c3c6bcb2363e61bb1bb1", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 10, 34000000000, NEO_ASSET_ID);
+    // all inputs below must be unused in this tx
+    ADD_UTXO_INPUT("e5a7887521b8b3aaf2d5426617ddabe8ef8ea3eab31c80a977c3b8f339df5be0", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("1455e9dd3cd6a04d81cd47acc07a7335212029ebbdcd0abc3e52c33f8b77f6eb", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("da711260085211b5573801d0dfe064235c69e61a55f9c15449ac55cc02b9adee", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("04486cfed371103dd51a89205b2c8bcc45ad887c49a768a62465f35810437bef", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("a5f27055a442db0e65103561900456d37af4233267960daded870c1ab2219ef4", 0, 500000000, NEO_ASSET_ID);
+
+    {
+        auto output = input.add_outputs();
+        output->set_asset_id(NEO_ASSET_ID);
+        output->set_to_address("Ad9A1xPbuA5YBFr1XPznDwBwQzdckAjCev");
+        output->set_change_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
+        output->set_amount(25000000000);
+    }
+
+    return input;
+}
+
+Proto::SigningInput createInputWithMultiOutput() {
+    const std::string NEO_ASSET_ID = "9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5";
+    const std::string GAS_ASSET_ID = NEO_ASSET_ID; // use NEO as gas token to cover the gas token check
+
+    Proto::SigningInput input;
+    auto privateKey = parse_hex("F18B2F726000E86B4950EBEA7BFF151F69635951BC4A31C44F28EE6AF7AEC128");
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_fee(12345); // too low
+    input.set_gas_asset_id(GAS_ASSET_ID);
+    input.set_gas_change_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
+
+#define ADD_UTXO_INPUT(hash, index, value, assetId) \
+        { \
+            auto utxo = input.add_inputs(); \
+            utxo->set_prev_hash(parse_hex(hash).data(), parse_hex(hash).size()); \
+            utxo->set_prev_index(index); \
+            utxo->set_asset_id(assetId); \
+            utxo->set_value(value); \
+        }
+
+    ADD_UTXO_INPUT("c61508268c5d0343af1875c60e569493100824dbdba108b31789e0e33bcb50fb", 1, 98899890000, GAS_ASSET_ID);
+    ADD_UTXO_INPUT("4eb2f96937a0d4dc96b77ba69a29e1de9574cbd62b16d881f1ee2061a291d70b", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("3fee0109d155dcfab272176117306b45b176914c88e8c379933c246a9e29ea0b", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("6ea9ce8c578bfeeecdf281f498e2a764689df3b93d6855a3cc45bd6b5213c426", 0, 400000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("f75ad3cbd277d83ee240e08f99a97ffd7e42a82a868e0f7043414f6d6147262b", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("054734e98f442b3e73a940ca8f594859ece1c7ddac14130b0e2f5e2799b85931", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("8b0c42d448912fc28c674fdcf8e21e4667d7d2133666168eaa0570488a9c5036", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 1, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 2, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 3, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 4, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 5, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 6, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 7, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 8, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 9, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("cf83bce600626b6077e136581c1aecc78a0bbb7d7649b1f580b6be881087ec40", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("9bd7572ba8df685e262369897d24f7217b42be496b9eed16e16a889dd83b394e", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("b4ee250397dde2f1001d782d3c803c38992447d3b351cdc9bf20cfaa2cbf995b", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("e1019ca259a1615f77263324156a70007b76cb4f26b01b2956b8f85e6842ac62", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("bd379df2aca526ac600919aaba0e59d4a1ad4e2f22d18966063cf45e431d016f", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("164c3f843b9b7bfa6a7376a1548f343acb5cdfa0193b8f31e8c9a647ea63ea7d", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("4acec74a76161eafe70e0791b1f504b5ba1d175fd4f340d5bf56804e25505e92", 0, 300000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("895c6629a71c84cbdc8956abea9ca2d9d215e909e6173b1a1a96289186a67796", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("54828143c4c3a0e1b09102e4ed29220b141089c2bc4200b1042eeb12e5e49296", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("5345e4abc86f7ace47112f5a91c129175833bafcaf9f1e1bcbbaf4d019c1c69d", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("c83e19d0d4210df97b3bc7768dc7184ae3acfc1b5b3ac9b05d2be0fe5a636b9f", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("3456b03f5cb688ce26ab1d09b7a15799136c8c886ca7c3c6bcb2363e61bb1bb1", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("048f73d6cc82d9d92b08044eccef66c78a0c22e836988ed25d6f7ffe24fb5b38", 10, 34000000000, NEO_ASSET_ID);
+    // all inputs below must be unused in this tx
+    ADD_UTXO_INPUT("e5a7887521b8b3aaf2d5426617ddabe8ef8ea3eab31c80a977c3b8f339df5be0", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("1455e9dd3cd6a04d81cd47acc07a7335212029ebbdcd0abc3e52c33f8b77f6eb", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("da711260085211b5573801d0dfe064235c69e61a55f9c15449ac55cc02b9adee", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("04486cfed371103dd51a89205b2c8bcc45ad887c49a768a62465f35810437bef", 0, 500000000, NEO_ASSET_ID);
+    ADD_UTXO_INPUT("a5f27055a442db0e65103561900456d37af4233267960daded870c1ab2219ef4", 0, 500000000, NEO_ASSET_ID);
+
+    {
+        auto output = input.add_outputs();
+        output->set_asset_id(NEO_ASSET_ID);
+        output->set_to_address("Ad9A1xPbuA5YBFr1XPznDwBwQzdckAjCev");
+        output->set_change_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
+        output->set_amount(25000000000);
+
+        auto extra_output1 = output->add_extra_outputs();
+        extra_output1->set_amount(100000000);
+        extra_output1->set_to_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
+
+        auto extra_output2 = output->add_extra_outputs();
+        extra_output2->set_amount(200000000);
+        extra_output2->set_to_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
+    }
+
+    return input;
+}
+
+
+TEST(TWAnySignerNEO, Sign) {
+    Proto::SigningInput input = createInput();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNEO);
+
+    //  https://testnet-explorer.o3.network/transactions/0x7b138c753c24f474d0f70af30a9d79756e0ee9c1f38c12ed07fbdf6fc5132eaf
+    ASSERT_EQ(hex(output.encoded()), "8000001efb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00039b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc50083064905000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ace72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c605013cf0617000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac014140dc261ac093a87640441bf0c3ad4a55ec727932b9175f600618bb5275f31aacf122956bc88746dc666759a2d67f120fe3ce1659f916d22a91e0b02421d3bddbd1232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac");
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // ASSERT_EQ(hex(output.encoded()), "8000001efb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00039b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc50083064905000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ace72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c605013cf0617000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac014140dc261ac093a87640441bf0c3ad4a55ec727932b9175f600618bb5275f31aacf1dd6a943678b9239a98a65d2980edf01beed0a0b4904573f31309a6a128a54980232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac");
+}
+
+TEST(TWAnySignerNEO, Plan) {
+    Proto::SigningInput input = createInput();
+    Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, TWCoinTypeNEO);
+
+    EXPECT_EQ(plan.inputs_size(), 30);
+    EXPECT_EQ(plan.outputs_size(), 2);
+    EXPECT_EQ(plan.fee(), 1408000);
+    EXPECT_EQ(plan.error(), Common::Proto::OK);
+}
+
+TEST(TWAnySignerNEO, SignMultiOutput) {
+    Proto::SigningInput input = createInputWithMultiOutput();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNEO);
+
+    ASSERT_EQ(hex(output.encoded()), "80000023fb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00e05bdf39f3b8c377a9801cb3eaa38eefe8abdd176642d5f2aab3b8217588a7e50000ebf6778b3fc3523ebc0acdbdeb29202135737ac0ac47cd814da0d63cdde955140000eeadb902cc55ac4954c1f9551ae6695c2364e0dfd0013857b5115208601271da0000ef7b431058f36524a668a7497c88ad45cc8b2c5b20891ad53d1071d3fe6c48040000f49e21b21a0c87edad0d96673223f47ad3560490613510650edb42a45570f2a50000049b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500e1f50500000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500c2eb0b00000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5e069f3d21c000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac01414057b786872d667a637ff44412e3ccf50933a9c30609016ecbcaec8b9d80f2b0e26eb0cf111674ff0802a42357671867b11c334807c40146419825eed8c45a6eed232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac");
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // ASSERT_EQ(hex(output.encoded()), "80000023fb50cb3be3e08917b308a1dbdb2408109394560ec67518af43035d8c260815c601000bd791a26120eef181d8162bd6cb7495dee1299aa67bb796dcd4a03769f9b24e00000bea299e6a243c9379c3e8884c9176b1456b3017611772b2fadc55d10901ee3f000026c413526bbd45cca355683db9f39d6864a7e298f481f2cdeefe8b578ccea96e00002b2647616d4f4143700f8e862aa8427efd7fa9998fe040e23ed877d2cbd35af700003159b899275e2f0e0b1314acddc7e1ec5948598fca40a9733e2b448fe9344705000036509c8a487005aa8e16663613d2d767461ee2f8dc4f678cc22f9148d4420c8b0000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040100385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040200385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040300385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040400385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040500385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040600385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040700385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040800385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f04090040ec871088beb680f5b149767dbb0b8ac7ec1a1c5836e177606b6200e6bc83cf00004e393bd89d886ae116ed9e6b49be427b21f7247d896923265e68dfa82b57d79b00005b99bf2caacf20bfc9cd51b3d3472499383c803c2d781d00f1e2dd970325eeb4000062ac42685ef8b856291bb0264fcb767b00706a15243326775f61a159a29c01e100006f011d435ef43c066689d1222f4eada1d4590ebaaa190960ac26a5acf29d37bd00007dea63ea47a6c9e8318f3b19a0df5ccb3a348f54a176736afa7b9b3b843f4c160000925e50254e8056bfd540f3d45f171dbab504f5b191070ee7af1e16764ac7ce4a00009677a6869128961a1a3b17e609e915d2d9a29ceaab5689dccb841ca729665c8900009692e4e512eb2e04b10042bcc28910140b2229ede40291b0e1a0c3c44381825400009dc6c119d0f4bacb1b1e9faffcba33581729c1915a2f1147ce7a6fc8abe4455300009f6b635afee02b5db0c93a5b1bfcace34a18c78d76c73b7bf90d21d4d0193ec80000b11bbb613e36b2bcc6c3a76c888c6c139957a1b7091dab26ce88b65c3fb056340000385bfb24fe7f6f5dd28e9836e8220c8ac766efcc4e04082bd9d982ccd6738f040a00e05bdf39f3b8c377a9801cb3eaa38eefe8abdd176642d5f2aab3b8217588a7e50000ebf6778b3fc3523ebc0acdbdeb29202135737ac0ac47cd814da0d63cdde955140000eeadb902cc55ac4954c1f9551ae6695c2364e0dfd0013857b5115208601271da0000ef7b431058f36524a668a7497c88ad45cc8b2c5b20891ad53d1071d3fe6c48040000f49e21b21a0c87edad0d96673223f47ad3560490613510650edb42a45570f2a50000049b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500ba1dd205000000ea610aa6db39bd8c8556c9569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500e1f50500000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500c2eb0b00000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5e069f3d21c000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac01414057b786872d667a637ff44412e3ccf50933a9c30609016ecbcaec8b9d80f2b0e2914f30ede98b00f8fd5bdca898e7984ea0b3b2a5e31658435b93dbea3808b664232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac");
+}
+
+TEST(TWAnySignerNEO, PlanMultiOutput) {
+    Proto::SigningInput input = createInputWithMultiOutput();
+    Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, TWCoinTypeNEO);
+
+    EXPECT_EQ(plan.inputs_size(), 35);
+    EXPECT_EQ(plan.outputs_size(), 1);
+    EXPECT_EQ(plan.fee(), 1638000);
+    EXPECT_EQ(plan.error(), Common::Proto::OK);
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/TWCoinTypeTests.cpp b/tests/chains/NEO/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..167405c45ae
--- /dev/null
+++ b/tests/chains/NEO/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNEOCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNEO));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("e0ddf7c81c732df26180aca0c36d5868ad009fdbbe6e7a56ebafc14bba41cd53"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNEO, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("AcxuqWhTureEQGeJgbmtSWNAtssjMLU7pb"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNEO, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNEO));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNEO));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNEO), 8);
+    ASSERT_EQ(TWBlockchainNEO, TWCoinTypeBlockchain(TWCoinTypeNEO));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNEO));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNEO));
+    assertStringsEqual(symbol, "NEO");
+    assertStringsEqual(txUrl, "https://neoscan.io/transaction/e0ddf7c81c732df26180aca0c36d5868ad009fdbbe6e7a56ebafc14bba41cd53");
+    assertStringsEqual(accUrl, "https://neoscan.io/address/AcxuqWhTureEQGeJgbmtSWNAtssjMLU7pb");
+    assertStringsEqual(id, "neo");
+    assertStringsEqual(name, "NEO");
+}
diff --git a/tests/NEO/TransactionAttributeTests.cpp b/tests/chains/NEO/TransactionAttributeTests.cpp
similarity index 84%
rename from tests/NEO/TransactionAttributeTests.cpp
rename to tests/chains/NEO/TransactionAttributeTests.cpp
index d911270c92f..10e667370e8 100644
--- a/tests/NEO/TransactionAttributeTests.cpp
+++ b/tests/chains/NEO/TransactionAttributeTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "uint256.h"
 #include "HexCoding.h"
@@ -28,7 +26,9 @@ TEST(NEOTransactionAttribute, Serialize) {
     EXPECT_EQ("30" + data, hex(transactionAttribute.serialize()));
 
     transactionAttribute.usage = TransactionAttributeUsage::TAU_ECDH02;
-    transactionAttribute._data = parse_hex(data);
+    transactionAttribute._data = {(TW::byte)transactionAttribute.usage};
+    auto d = parse_hex(data);
+    transactionAttribute._data.insert(transactionAttribute._data.end(), d.begin(), d.end());
     EXPECT_EQ("02" + data, hex(transactionAttribute.serialize()));
 
     data = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af";
@@ -39,12 +39,12 @@ TEST(NEOTransactionAttribute, Serialize) {
     data = "bd";
     transactionAttribute.usage = TransactionAttributeUsage::TAU_DescriptionUrl;
     transactionAttribute._data = parse_hex(data);
-    EXPECT_EQ("81" + data, hex(transactionAttribute.serialize()));
+    EXPECT_EQ("8101" + data, hex(transactionAttribute.serialize()));
 
     data = "bdecbb623eee6f9ade28d5a8ff5fb3ea";
     transactionAttribute.usage = TransactionAttributeUsage::TAU_Remark;
     transactionAttribute._data = parse_hex(data);
-    EXPECT_EQ("f0" + data, hex(transactionAttribute.serialize()));
+    EXPECT_EQ("f010" + data, hex(transactionAttribute.serialize()));
 }
 
 TEST(NEOTransactionAttribute, Deserialize) {
@@ -61,7 +61,7 @@ TEST(NEOTransactionAttribute, Deserialize) {
 
     transactionAttribute.deserialize(parse_hex("02" + data));
     EXPECT_EQ(TransactionAttributeUsage::TAU_ECDH02, transactionAttribute.usage);
-    EXPECT_EQ(data, hex(transactionAttribute._data));
+    EXPECT_EQ("02" + data, hex(transactionAttribute._data));
 
     data = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af";
     transactionAttribute.deserialize(parse_hex("20" + data));
@@ -69,12 +69,12 @@ TEST(NEOTransactionAttribute, Deserialize) {
     EXPECT_EQ(data, hex(transactionAttribute._data));
 
     data = "bd";
-    transactionAttribute.deserialize(parse_hex("81" + data));
+    transactionAttribute.deserialize(parse_hex("8101" + data));
     EXPECT_EQ(TransactionAttributeUsage::TAU_DescriptionUrl, transactionAttribute.usage);
     EXPECT_EQ(data, hex(transactionAttribute._data));
 
     data = "bdecbb623eee6f9ade28d5a8ff5fb3ea";
-    transactionAttribute.deserialize(parse_hex("f0" + data));
+    transactionAttribute.deserialize(parse_hex("f010" + data));
     EXPECT_EQ(TransactionAttributeUsage::TAU_Remark, transactionAttribute.usage);
     EXPECT_EQ(data, hex(transactionAttribute._data));
 
@@ -84,8 +84,8 @@ TEST(NEOTransactionAttribute, Deserialize) {
 TEST(NEOTransactionAttribute, DeserializeInitialPositionAfterData) {
     auto transactionAttribute = TransactionAttribute();
     EXPECT_THROW(transactionAttribute.deserialize(Data(), 1), std::invalid_argument);
-
     EXPECT_THROW(transactionAttribute.deserialize(Data({1}), 2), std::invalid_argument);
 }
 
+
 } // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/TransactionCompilerTests.cpp b/tests/chains/NEO/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..121919c7eda
--- /dev/null
+++ b/tests/chains/NEO/TransactionCompilerTests.cpp
@@ -0,0 +1,302 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/NEO.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "NEO/Address.h"
+#include "NEO/Script.h"
+#include "NEO/TransactionAttribute.h"
+#include "NEO/TransactionAttributeUsage.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::NEO::tests {
+
+TEST(NEOCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeNEO;
+    /// Step 1: Prepare transaction input (protobuf)
+    const std::string NEO_ASSET_ID =
+        "9b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc5";
+    const std::string GAS_ASSET_ID =
+        "e72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c60";
+
+    TW::NEO::Proto::SigningInput input;
+    auto privateKey =
+        PrivateKey(parse_hex("F18B2F726000E86B4950EBEA7BFF151F69635951BC4A31C44F28EE6AF7AEC128"));
+    auto publicKey = privateKey.getPublicKey(publicKeyType(coin));
+    input.set_gas_asset_id(GAS_ASSET_ID);
+    input.set_gas_change_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
+
+    auto* utxo = input.add_inputs();
+    auto hash = parse_hex("9c85b39cd5677e2bfd6bf8a711e8da93a2f1d172b2a52c6ca87757a4bccc24de");
+    std::reverse(hash.begin(), hash.end());
+    utxo->set_prev_hash(hash.data(), hash.size());
+    utxo->set_prev_index(1);
+    utxo->set_asset_id(NEO_ASSET_ID);
+    utxo->set_value(89300000000);
+
+    auto txOutput = input.add_outputs();
+    txOutput->set_asset_id(NEO_ASSET_ID);
+    txOutput->set_to_address("Ad9A1xPbuA5YBFr1XPznDwBwQzdckAjCev");
+    txOutput->set_change_address("AdtSLMBqACP4jv8tRWwyweXGpyGG46eMXV");
+    txOutput->set_amount(100000000);
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "7fd5629cfc7cb0f8f01f15fc6d8b37ed1240c4f818d0b397bac65266aa6466da");
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData = publicKey.bytes;
+    const auto signature =
+        parse_hex("5046619c8e20e1fdeec92ce95f3019f6e7cc057294eb16b2d5e55c105bf32eb27e1fc01c18585762"
+                  "28f1fef8c0945a8ad69688e52a4ed19f5b85f5eff7e961d7");
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // const auto signature =
+    //     parse_hex("5046619c8e20e1fdeec92ce95f3019f6e7cc057294eb16b2d5e55c105bf32eb281e03fe2e7a7a89e"
+    //               "d70e01073f6ba574e65071c87cc8cce59833d4d30479c37a");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+
+    /// Step 3: Compile transaction info
+    auto expectedTx =
+        "800000019c85b39cd5677e2bfd6bf8a711e8da93a2f1d172b2a52c6ca87757a4bccc24de0100029b7cffdaa674"
+        "beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500e1f50500000000ea610aa6db39bd8c8556c9"
+        "569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500fcbbc4"
+        "14000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac0141405046619c8e20e1fdeec92ce95f3019f6e7cc"
+        "057294eb16b2d5e55c105bf32eb27e1fc01c1858576228f1fef8c0945a8ad69688e52a4ed19f5b85f5eff7e961"
+        "d7232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac";
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // auto expectedTx =
+    //     "800000019c85b39cd5677e2bfd6bf8a711e8da93a2f1d172b2a52c6ca87757a4bccc24de0100029b7cffdaa674"
+    //     "beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500e1f50500000000ea610aa6db39bd8c8556c9"
+    //     "569d94b5e5a5d0ad199b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500fcbbc4"
+    //     "14000000f2908c7efc0c9e43ffa7e79170ba37e501e1b4ac0141405046619c8e20e1fdeec92ce95f3019f6e7cc"
+    //     "057294eb16b2d5e55c105bf32eb281e03fe2e7a7a89ed70e01073f6ba574e65071c87cc8cce59833d4d30479c3"
+    //     "7a232102a41c2aea8568864b106553729d32b1317ec463aa23e7a3521455d95992e17a7aac";
+
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+    {
+        NEO::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), expectedTx);
+    }
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        NEO::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        NEO::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {}, {});
+        NEO::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+TEST(NEOCompiler, Nep5TokenCompileWithSignatures) {
+    // tx on mainnet
+    // https://neoscan.io/transaction/6368FC6127DD7FAA3B7548CA97162D5BE18D4B2FA0046A79853E5864318E19B8
+
+    const auto coin = TWCoinTypeNEO;
+    /// Step 1: Prepare transaction input (protobuf)
+    const std::string ASSET_ID =
+        "f56c89be8bfcdec617e2402b5c3fd5b6d71b820d";
+    const std::string GAS_ASSET_ID =
+        "e72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c60";
+
+    TW::NEO::Proto::SigningInput input;
+    auto publicKey = PublicKey(parse_hex("030ab39b99d8675cd9bd90aaec37cba964297cc817078d33e508ab11f1d245c068"), publicKeyType(coin));
+    input.set_gas_asset_id(GAS_ASSET_ID);
+    input.set_gas_change_address("AJzoeKrj7RHMwSrPQDPdv61ciVEYpmhkjk");
+
+    auto* utxo = input.add_inputs();
+    auto hash = parse_hex("f231ee7b5097d912a22fe7cb6b7417490d2ddde200e3c57042be5abcdf6f974c");
+    utxo->set_prev_hash(hash.data(), hash.size());
+    utxo->set_prev_index(0);
+    utxo->set_asset_id(GAS_ASSET_ID);
+    utxo->set_value(7011673);
+
+    auto txOutput = input.add_outputs();
+    txOutput->set_asset_id(GAS_ASSET_ID);
+    txOutput->set_to_address("AJzoeKrj7RHMwSrPQDPdv61ciVEYpmhkjk");
+    txOutput->set_change_address("AJzoeKrj7RHMwSrPQDPdv61ciVEYpmhkjk");
+    txOutput->set_amount(6911673);
+
+    // set nep5 transfer
+    auto nep5Tx = input.mutable_transaction()->mutable_nep5_transfer();
+    nep5Tx->set_asset_id(ASSET_ID);
+    nep5Tx->set_from("AJzoeKrj7RHMwSrPQDPdv61ciVEYpmhkjk");
+    nep5Tx->set_to("AeRsDBqPiGKZhzNtL2vWhXbXGccJLCGrbJ");
+    auto amount = store(110000000);
+    nep5Tx->set_amount(amount.data(), (int)amount.size());
+    nep5Tx->set_script_with_ret(true);
+
+    input.set_fee(100000);
+
+    // Plan
+    NEO::Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, coin);
+
+    ASSERT_EQ(plan.error(), Common::Proto::OK);
+
+    auto attr = plan.add_attributes();
+    auto remark = parse_hex("f15508a6ea4e15e8");
+    attr->set_usage((int32_t)NEO::TransactionAttributeUsage::TAU_Remark);
+    attr->set_data(remark.data(), (int)remark.size());
+
+    attr = plan.add_attributes();
+    auto script = parse_hex("235a717ed7ed18a43de47499c3d05b8d4a4bcf3a");
+    attr->set_usage((int32_t)NEO::TransactionAttributeUsage::TAU_Script);
+    attr->set_data(script.data(), (int)script.size());
+
+    *input.mutable_plan() = plan;
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "d301bc00e59a1c92741a31955714c76689f627dcb9d7ec176435f269a981159c");
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData = publicKey.bytes;
+    const auto signature =
+        parse_hex("8b707d23f84d39ddaad7da100e2d8b657ef6c0858c6c09edc029f441f28e49ff6af994ba7ad180f90e12dd9d7828f8f28785ae5079ed9a52bb5ddd3bcce1b189");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+
+    /// Step 3: Compile transaction info
+    auto expectedTx =
+        "d101510480778e0614f88235a26e55cce0747ee827f39fd8167849672b14235a717ed7ed18a43de47499c3d05b8d4a4bcf3a53c1087472616e7366657267f56c89be8bfcdec617e2402b5c3fd5b6d71b820df166000000000000000002f008f15508a6ea4e15e820235a717ed7ed18a43de47499c3d05b8d4a4bcf3a014c976fdfbc5abe4270c5e300e2dd2d0d4917746bcbe72fa212d997507bee31f2000001e72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c60b976690000000000235a717ed7ed18a43de47499c3d05b8d4a4bcf3a0141408b707d23f84d39ddaad7da100e2d8b657ef6c0858c6c09edc029f441f28e49ff6af994ba7ad180f90e12dd9d7828f8f28785ae5079ed9a52bb5ddd3bcce1b1892321030ab39b99d8675cd9bd90aaec37cba964297cc817078d33e508ab11f1d245c068ac";
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+    {
+        NEO::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), expectedTx);
+    }
+}
+
+TEST(NEOCompiler, InvocationTransactionCompileWithSignatures) {
+    // tx on mainnet
+    // https://neoscan.io/transaction/73f540f5ce6fd4f363262e4b168d411f5443c694f3c53beee36fc03861c00356
+
+    const auto coin = TWCoinTypeNEO;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto ASSET_ID = parse_hex("f46719e2d16bf50cddcef9d4bbfece901f73cbb6");
+    std::reverse(ASSET_ID.begin(), ASSET_ID.end());
+
+    const std::string GAS_ASSET_ID =
+        "e72d286979ee6cb1b7e65dfddfb2e384100b8d148e7758de42e4168b71792c60";
+
+    TW::NEO::Proto::SigningInput input;
+    auto publicKey = PublicKey(parse_hex("02337b2d3982d71aa234a112cd8507260f480994d20129921f5a95c77f8bbe1bb3"), publicKeyType(coin));
+
+    auto amount = store(15000000000);
+
+    auto script = NEO::Script::CreateNep5TransferScript(
+        ASSET_ID,
+        NEO::Address("APqYfjvV2cCwcvFjceVcSrcouyq74qNFKS").toScriptHash(),
+        NEO::Address("ANeo2toNeo3MigrationAddressxwPB2Hz").toScriptHash(),
+        load(amount));
+
+    // set invocation transaction script
+    input.mutable_transaction()->mutable_invocation_generic()->set_script(script.data(), (int)script.size());
+
+    auto plan = input.mutable_plan();
+    auto attr = plan->add_attributes();
+    auto attrScript = parse_hex("5872d3dd8741af4c8d5a94f8a1bfff5c617be01b");
+    attr->set_usage((int32_t)NEO::TransactionAttributeUsage::TAU_Script);
+    attr->set_data(attrScript.data(), (int)attrScript.size());
+
+    attr = plan->add_attributes();
+    auto remark1 = parse_hex("46726f6d204e656f4c696e652061742031363539303030373533343031");
+    attr->set_usage((int32_t)NEO::TransactionAttributeUsage::TAU_Remark1);
+    attr->set_data(remark1.data(), (int)remark1.size());
+
+    attr = plan->add_attributes();
+    auto remark14 = parse_hex("4e55577138626836486363746e5357346167384a4a4b453734333841637374554d54");
+    attr->set_usage((int32_t)NEO::TransactionAttributeUsage::TAU_Remark14);
+    attr->set_data(remark14.data(), (int)remark14.size());
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "a59a59f840dfc9426f070355bbbbe024b673095d86ba1b2810f61d5291f127f3");
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData = publicKey.bytes;
+    const auto signature =
+        parse_hex("0c22129691f4438adf0ff178acc4811dee1c625df0f65909791e2c0f563cd88f7967f0ccbb6b60609e5225fb7b2873d510fe42c43c2741d90ca002afb4861d5c");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+
+    /// Step 3: Compile transaction info
+    const auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+
+    NEO::Proto::SigningOutput output;
+    ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+    auto expectedTx =
+        "d101500500d6117e03144b721e06b50cc74e68b417716e3b099fb99757a8145872d3dd8741af4c8d5a94f8a1bfff5c617be01b53c1087472616e7366657267b6cb731f90cefebbd4f9cedd0cf56bd1e21967f4000000000000000003205872d3dd8741af4c8d5a94f8a1bfff5c617be01bf11d46726f6d204e656f4c696e652061742031363539303030373533343031fe224e55577138626836486363746e5357346167384a4a4b453734333841637374554d5400000141400c22129691f4438adf0ff178acc4811dee1c625df0f65909791e2c0f563cd88f7967f0ccbb6b60609e5225fb7b2873d510fe42c43c2741d90ca002afb4861d5c232102337b2d3982d71aa234a112cd8507260f480994d20129921f5a95c77f8bbe1bb3ac";
+    EXPECT_EQ(hex(output.encoded()), expectedTx);
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/TransactionOutputTests.cpp b/tests/chains/NEO/TransactionOutputTests.cpp
new file mode 100644
index 00000000000..cf1e76ed3d5
--- /dev/null
+++ b/tests/chains/NEO/TransactionOutputTests.cpp
@@ -0,0 +1,50 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "uint256.h"
+#include "HexCoding.h"
+#include "NEO/TransactionOutput.h"
+#include <gtest/gtest.h>
+
+namespace TW::NEO::tests {
+
+using namespace std;
+
+TEST(NEOTransactionOutput, Serialize) {
+    auto transactionOutput = TransactionOutput();
+    string assetId = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a";
+    string scriptHash = "cbb23e6f9ade28d5a8ff3eac9d73af039e821b1b";
+    transactionOutput.value = 1L;
+    transactionOutput.assetId = load(parse_hex(assetId));
+    transactionOutput.scriptHash = load(parse_hex(scriptHash));
+    EXPECT_EQ(assetId + "0100000000000000" + scriptHash, hex(transactionOutput.serialize()));
+
+    transactionOutput.value = 0xff01;
+    EXPECT_EQ(assetId + "01ff000000000000" + scriptHash, hex(transactionOutput.serialize()));
+}
+
+TEST(NEOTransactionOutput, Deserialize) {
+    string assetId = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a";
+    string scriptHash = "cbb23e6f9ade28d5a8ff3eac9d73af039e821b1b";
+    auto transactionOutput = TransactionOutput();
+    transactionOutput.deserialize(parse_hex(assetId + "0100000000000000" + scriptHash));
+    EXPECT_EQ(1UL, transactionOutput.value);
+    EXPECT_EQ(assetId, hex(store(transactionOutput.assetId)));
+    EXPECT_EQ(scriptHash, hex(store(transactionOutput.scriptHash)));
+
+    transactionOutput.deserialize(parse_hex(assetId + "01ff000000000000" + scriptHash));
+    EXPECT_EQ(0xff01UL, transactionOutput.value);
+    EXPECT_EQ(assetId, hex(store(transactionOutput.assetId)));
+    EXPECT_EQ(scriptHash, hex(store(transactionOutput.scriptHash)));
+}
+
+TEST(NEOTransactionOutput, DeserializeError) {
+    string assetId = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a";
+    // The scriptHash is 19 bytes length. Expected 20.
+    string scriptHash = "cbb23e6f9ade28d5a8ff3eac9d73af039e821b";
+    auto transactionOutput = TransactionOutput();
+    EXPECT_THROW(transactionOutput.deserialize(parse_hex(assetId + "0100000000000000" + scriptHash)), std::invalid_argument);
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/chains/NEO/TransactionTests.cpp b/tests/chains/NEO/TransactionTests.cpp
new file mode 100644
index 00000000000..615716a9f58
--- /dev/null
+++ b/tests/chains/NEO/TransactionTests.cpp
@@ -0,0 +1,265 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "uint256.h"
+#include "HexCoding.h"
+#include "NEO/Transaction.h"
+#include "NEO/TransactionType.h"
+#include "NEO/TransactionAttributeUsage.h"
+#include "NEO/TransactionAttribute.h"
+#include <gtest/gtest.h>
+
+namespace TW::NEO::tests {
+
+using namespace std;
+
+TEST(NEOTransaction, SerializeDeserializeEmpty) {
+    auto transaction = Transaction();
+    EXPECT_EQ(transaction, transaction);
+
+    EXPECT_EQ(0ul, transaction.attributes.size());
+    EXPECT_EQ(0ul, transaction.inInputs.size());
+    EXPECT_EQ(0ul, transaction.outputs.size());
+    auto serialized = transaction.serialize();
+
+    auto deserializedTransaction = Transaction();
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+}
+
+TEST(NEOTransaction, SerializeDeserializeEmptyCollections) {
+    auto transaction = Transaction();
+    transaction.type = TransactionType::TT_EnrollmentTransaction;
+    transaction.version = 0x07;
+    const string zeroVarLong = "00";
+    auto serialized = transaction.serialize();
+    EXPECT_EQ("2007" + zeroVarLong + zeroVarLong + zeroVarLong, hex(serialized));
+
+    auto deserializedTransaction = Transaction();
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+    EXPECT_EQ(transaction, transaction);
+}
+
+TEST(NEOTransaction, SerializeDeserializeAttribute) {
+    auto transaction = Transaction();
+    transaction.type = TransactionType::TT_ContractTransaction;
+    transaction.version = 0x07;
+    const string zeroVarLong = "00";
+    const string oneVarLong = "01";
+    transaction.attributes.push_back(TransactionAttribute());
+    transaction.attributes[0].usage = TransactionAttributeUsage::TAU_ContractHash;
+    transaction.attributes[0]._data = parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a");
+    auto serialized = transaction.serialize();
+    EXPECT_EQ("8007" + oneVarLong + hex(transaction.attributes[0].serialize()) + zeroVarLong + zeroVarLong, hex(serialized));
+
+    auto deserializedTransaction = Transaction();
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+
+    transaction.attributes.push_back(TransactionAttribute());
+    transaction.attributes[1].usage = TransactionAttributeUsage::TAU_ECDH02;
+    transaction.attributes[1]._data = parse_hex("02b7ecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a");
+    serialized = transaction.serialize();
+    const string twoVarLong = "02";
+    string expectedSerialized = "8007" + twoVarLong;
+    expectedSerialized += hex(transaction.attributes[0].serialize());
+    expectedSerialized += hex(transaction.attributes[1].serialize());
+    expectedSerialized += zeroVarLong + zeroVarLong;
+    EXPECT_EQ(expectedSerialized, hex(serialized));
+
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+    EXPECT_EQ(transaction, transaction);
+}
+
+TEST(NEOTransaction, SerializeDeserializeInputs) {
+    auto transaction = Transaction();
+    transaction.type = TransactionType::TT_ContractTransaction;
+    transaction.version = 0x07;
+    const string zeroVarLong = "00";
+    const string oneVarLong = "01";
+    transaction.inInputs.push_back(CoinReference());
+    transaction.inInputs[0].prevHash = load(parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.inInputs[0].prevIndex = 0xa;
+    auto serialized = transaction.serialize();
+    EXPECT_EQ("8007" + zeroVarLong + oneVarLong + hex(transaction.inInputs[0].serialize()) + zeroVarLong, hex(serialized));
+
+    auto deserializedTransaction = Transaction();
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+
+    transaction.inInputs.push_back(CoinReference());
+    transaction.inInputs[1].prevHash = load(parse_hex("bdecbb623eee4f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.inInputs[1].prevIndex = 0xbc;
+    serialized = transaction.serialize();
+    const string twoVarLong = "02";
+    string expectedSerialized = "8007" + zeroVarLong + twoVarLong;
+    expectedSerialized += hex(transaction.inInputs[0].serialize());
+    expectedSerialized += hex(transaction.inInputs[1].serialize());
+    expectedSerialized += zeroVarLong;
+    EXPECT_EQ(expectedSerialized, hex(serialized));
+
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+    EXPECT_EQ(transaction, transaction);
+}
+
+TEST(NEOTransaction, SerializeDeserializeOutputs) {
+    auto transaction = Transaction();
+    transaction.type = TransactionType::TT_ContractTransaction;
+    transaction.version = 0x07;
+    const string zeroVarLong = "00";
+    const string oneVarLong = "01";
+    transaction.outputs.push_back(TransactionOutput());
+    transaction.outputs[0].assetId = load(parse_hex("bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.outputs[0].scriptHash = load(parse_hex("cbb23e6f9ade28d5a8ff3eac9d73af039e821b1b"));
+    transaction.outputs[0].value = 0x2;
+    auto serialized = transaction.serialize();
+    EXPECT_EQ("8007" + zeroVarLong + zeroVarLong + oneVarLong + hex(transaction.outputs[0].serialize()), hex(serialized));
+
+    auto deserializedTransaction = Transaction();
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+
+    transaction.outputs.push_back(TransactionOutput());
+    transaction.outputs[1].assetId = load(parse_hex("bdecbb623eee6a9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.outputs[1].scriptHash = load(parse_hex("cbb23e6f9a3e28d5a8ff3eac9d73af039e821b1b"));
+    transaction.outputs[1].value = 0x2;
+    serialized = transaction.serialize();
+    const string twoVarLong = "02";
+    string expectedSerialized = "8007" + zeroVarLong + zeroVarLong + twoVarLong;
+    expectedSerialized += hex(transaction.outputs[0].serialize());
+    expectedSerialized += hex(transaction.outputs[1].serialize());
+    EXPECT_EQ(expectedSerialized, hex(serialized));
+
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+}
+
+TEST(NEOTransaction, SerializeDeserialize) {
+    auto transaction = Transaction();
+    transaction.type = TransactionType::TT_ContractTransaction;
+    transaction.version = 0x07;
+    const string oneVarLong = "01";
+
+    transaction.attributes.push_back(TransactionAttribute());
+    transaction.attributes[0].usage = TransactionAttributeUsage::TAU_ContractHash;
+    transaction.attributes[0]._data = parse_hex("bdecbb623eee6f9ade28d5a8ff5fbdea9c9d73af039e0286201b3b0291fb4d4a");
+
+    transaction.inInputs.push_back(CoinReference());
+    transaction.inInputs[0].prevHash = load(parse_hex("bdecbb623eee679ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.inInputs[0].prevIndex = 0xa;
+
+    transaction.outputs.push_back(TransactionOutput());
+    transaction.outputs[0].assetId = load(parse_hex("bdecbb623eee6f9ad328d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.outputs[0].scriptHash = load(parse_hex("cbb23e6f9ade28a5a8ff3eac9d73af039e821b1b"));
+    transaction.outputs[0].value = 0x2;
+
+    auto serialized = transaction.serialize();
+    string expectedSerialized = "8007";
+    expectedSerialized += oneVarLong + hex(transaction.attributes[0].serialize());
+    expectedSerialized += oneVarLong + hex(transaction.inInputs[0].serialize());
+    expectedSerialized += oneVarLong + hex(transaction.outputs[0].serialize());
+    ASSERT_EQ(expectedSerialized, hex(serialized));
+
+    auto deserializedTransaction = Transaction();
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+
+    transaction.outputs.push_back(TransactionOutput());
+    transaction.outputs[1].assetId = load(parse_hex("bdecbb623eee6a9a3e28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.outputs[1].scriptHash = load(parse_hex("cbb23e6f9a3e28d5a8ff3eac9da3af039e821b1b"));
+    transaction.outputs[1].value = 0x2;
+    serialized = transaction.serialize();
+    const string twoVarLong = "02";
+    expectedSerialized = "8007";
+    expectedSerialized += oneVarLong + hex(transaction.attributes[0].serialize());
+    expectedSerialized += oneVarLong + hex(transaction.inInputs[0].serialize());
+    expectedSerialized += twoVarLong + hex(transaction.outputs[0].serialize());
+    expectedSerialized += hex(transaction.outputs[1].serialize());
+    EXPECT_EQ(expectedSerialized, hex(serialized));
+
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+
+    transaction.inInputs.push_back(CoinReference());
+    transaction.inInputs[1].prevHash = load(parse_hex("bdecbb623e3e6f9ade28d5a8ff4fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.inInputs[1].prevIndex = 0xbc;
+    transaction.inInputs.push_back(CoinReference());
+    transaction.inInputs[2].prevHash = load(parse_hex("bdecbb624eee6f9ade28d5a8ff3fb3ea9c9d73af039e0286201b3b0291fb4d4a"));
+    transaction.inInputs[2].prevIndex = 0x1f;
+
+    serialized = transaction.serialize();
+    const string threeVarLong = "03";
+    expectedSerialized = "8007";
+    expectedSerialized += oneVarLong + hex(transaction.attributes[0].serialize());
+    expectedSerialized += threeVarLong + hex(transaction.inInputs[0].serialize());
+    expectedSerialized += hex(transaction.inInputs[1].serialize());
+    expectedSerialized += hex(transaction.inInputs[2].serialize());
+    expectedSerialized += twoVarLong + hex(transaction.outputs[0].serialize());
+    expectedSerialized += hex(transaction.outputs[1].serialize());
+    EXPECT_EQ(expectedSerialized, hex(serialized));
+
+    deserializedTransaction.deserialize(serialized);
+    EXPECT_EQ(transaction, deserializedTransaction);
+}
+
+TEST(NEOTransaction, SerializeDeserializeMiner) {
+    string block2tn = "0000d11f7a2800000000";
+    std::unique_ptr<Transaction> deserializedTransaction(Transaction::deserializeFrom(parse_hex(block2tn)));
+    auto serialized = deserializedTransaction->serialize();
+    std::unique_ptr<Transaction> serializedTransaction(Transaction::deserializeFrom(serialized));
+
+    EXPECT_EQ(*deserializedTransaction, *serializedTransaction);
+
+    string notMiner = "1000d11f7a2800000000";
+    EXPECT_THROW(
+        std::unique_ptr<Transaction> _deserializedTransaction(Transaction::deserializeFrom(parse_hex(notMiner))),
+        std::invalid_argument);
+}
+
+TEST(NEOTransaction, SerializeDeserializeInvocation) {
+    string data = "d1014f04e0aebb00148b720fabfe9cf041f9a27df4f7f1daaabf73c66414f88235a26e55cce0747ee827f39fd8167849672b53c1087472616e7366657267e345419e7377286ee5b0a39b56e30f6213ab9e4d00000000000000000220f88235a26e55cce0747ee827f39fd8167849672bf0084d65822107fcfd5200000141407d9089f957dbaf526a425f7dc494c62511989124f357364c750a3c3bff94e9f677c9cd497d9dcea3c7a1abbfa59411608736c86ef23297d0813699cd279fe27923210339fbbe7bdce6be3101fd8a1fb45df6782cd8ab76c80c884bfee14d5daafac392ac";
+    std::unique_ptr<Transaction> deserializedTransaction(Transaction::deserializeFrom(parse_hex(data)));
+    auto serialized = deserializedTransaction->serialize();
+    std::unique_ptr<Transaction> serializedTransaction(Transaction::deserializeFrom(serialized));
+
+    EXPECT_EQ(*deserializedTransaction, *serializedTransaction);
+}
+
+TEST(NEOTransaction, SerializeDeserializeContract) {
+    string data = "80000001820e56309f4c26b32cc00025d0e35e7faa25641fa03138877478a155794f54490000019b7cffdaa674beae0f930ebe6085af9093e5fe56b34a5c220ccdcf6efc336fc500e1f50500000000f88235a26e55cce0747ee827f39fd8167849672b0141401ca0aa69bccbcb97ca9423573a2c3c696422055c02e8d4ce37e2460ae88753c66144f4fbf392de6619c73ff27346f1d0a9f3d23967327d4d4f4b3b151dbb05942321025c01e1650f6bf488c318a0105ed7214c1b6a9a14cfebd9ec5da53a29723f8101ac";
+    std::unique_ptr<Transaction> deserializedTransaction(Transaction::deserializeFrom(parse_hex(data)));
+    auto serialized = deserializedTransaction->serialize();
+    std::unique_ptr<Transaction> serializedTransaction(Transaction::deserializeFrom(serialized));
+
+    EXPECT_EQ(*deserializedTransaction, *serializedTransaction);
+}
+
+TEST(NEOTransaction, GetHash) {
+    string block2tn = "0000d11f7a2800000000";
+    std::unique_ptr<Transaction> deserializedTransaction(Transaction::deserializeFrom(parse_hex(block2tn)));
+
+    Data hash = parse_hex("8e3a32ba3a7e8bdb0ad9a2ad064713e45bd20eb0dab0d2e77df5b5ce985276d0");
+    // It is flipped on the https://github.com/NeoResearch/neopt/blob/master/tests/ledger_Tests/Transaction.Test.cpp
+    hash = Data(hash.rbegin(), hash.rend());
+
+    EXPECT_EQ(hex(hash), hex(deserializedTransaction->getHash()));
+}
+
+TEST(NEOTransaction, SerializeSize) {
+    auto transaction = Transaction();
+    transaction.type = TransactionType::TT_EnrollmentTransaction;
+    transaction.version = 0x07;
+    const string zeroVarLong = "00";
+    auto serialized = transaction.serialize();
+    auto verSerialized = parse_hex("2007" + zeroVarLong + zeroVarLong + zeroVarLong);
+    EXPECT_EQ(hex(verSerialized), hex(serialized));
+    EXPECT_EQ(verSerialized, serialized);
+
+    EXPECT_EQ(serialized.size(), static_cast<uint64_t>(transaction.size()));
+}
+
+} // namespace TW::NEO::tests
diff --git a/tests/NEO/WitnessTests.cpp b/tests/chains/NEO/WitnessTests.cpp
similarity index 90%
rename from tests/NEO/WitnessTests.cpp
rename to tests/chains/NEO/WitnessTests.cpp
index 7bd68fda171..d31c122cc4a 100644
--- a/tests/NEO/WitnessTests.cpp
+++ b/tests/chains/NEO/WitnessTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "uint256.h"
 #include "HexCoding.h"
@@ -22,12 +20,14 @@ TEST(NEOWitness, Serialize) {
     witness.invocationScript = parse_hex(invocationScript);
     witness.verificationScript = parse_hex(verificationScript);
     EXPECT_EQ("20" + invocationScript + "14" + verificationScript, hex(witness.serialize()));
+    EXPECT_EQ((size_t)witness.size(), witness.invocationScript.size() + witness.verificationScript.size());
 
     invocationScript = "bdecbb623eee6f9ade28d5a8ff5fb3ea9c9d73af039e0286201b3b0291fb4d4aba";
     verificationScript = "cbb23e6f9ade28d5a8ff3eac9d73af039e821b";
     witness.invocationScript = parse_hex(invocationScript);
     witness.verificationScript = parse_hex(verificationScript);
     EXPECT_EQ("21" + invocationScript + "13" + verificationScript, hex(witness.serialize()));
+    EXPECT_EQ((size_t)witness.size(), witness.invocationScript.size() + witness.verificationScript.size());
 }
 
 TEST(NEOWitness, Deserialize) {
diff --git a/tests/chains/NULS/AddressTests.cpp b/tests/chains/NULS/AddressTests.cpp
new file mode 100644
index 00000000000..542d939d183
--- /dev/null
+++ b/tests/chains/NULS/AddressTests.cpp
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "NULS/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+
+namespace TW::NULS::tests {
+
+TEST(NULSAddress, StaticInvalid) {
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_FALSE(Address::isValid("tNULSe"));
+    ASSERT_FALSE(Address::isValid("aaeb60f3e94c9b9a09f33669435e7ef1beaed"));
+    ASSERT_FALSE(Address::isValid("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z"));
+    ASSERT_TRUE(Address::isValid("NULSd6HgUxmcJWc88iELEJ7RH9XHsazBQqnJc"));
+    ASSERT_TRUE(Address::isValid("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2"));
+    ASSERT_TRUE(Address::isValid("tNULSeBaMtdtUNbnNBZ5RoFoh3fHrrrm6dVZLH"));
+}
+
+TEST(NULSAddress, ChainID) {
+    const auto address = Address("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2");
+    ASSERT_TRUE(address.chainID() == 1);
+}
+
+TEST(NULSAddress, Type) {
+    const auto address = Address("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2");
+    ASSERT_TRUE(address.type() == 1);
+}
+
+TEST(NULSAddress, FromString) {
+    const auto address = Address("NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2");
+    ASSERT_EQ(address.string(), "NULSd6HgbwcM8wz48f6UkFYHLVriT1L81X9z2");
+    const auto address2 = Address("tNULSeBaMtdtUNbnNBZ5RoFoh3fHrrrm6dVZLH");
+    ASSERT_EQ(address2.string(), "tNULSeBaMtdtUNbnNBZ5RoFoh3fHrrrm6dVZLH");
+
+    EXPECT_ANY_THROW(new Address("WrongPrefix"));
+    EXPECT_ANY_THROW(new Address("NULSdPrefixButInvalid"));
+}
+
+TEST(NULSAddress, FromPrivateKey) {
+    const auto privateKey =
+        PrivateKey(parse_hex("a1269039e4ffdf43687852d7247a295f0b5bc55e6dda031cffaa3295ca0a9d7a"));
+    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
+    const auto address = Address(publicKey, true);
+    ASSERT_EQ(address.string(), "NULSd6HghWa4CN5qdxqMwYVikQxRZyj57Jn4L");
+    const auto address2 = Address(publicKey, false);
+    ASSERT_EQ(address2.string(), "tNULSeBaMtdtUNbnNBZ5RoFoh3fHrrrm6dVZLH");
+}
+
+TEST(NULSAddress, FromCompressedPublicKey) {
+    const auto publicKey =
+        PublicKey(parse_hex("0244d50ff36c3136b4bf81f0c74b066695bc2af43e28d7f0ca1d48fcfd084bea66"), TWPublicKeyTypeSECP256k1);
+    const auto address = Address(publicKey, true);
+
+    ASSERT_EQ(address.string(), "NULSd6HgUiMKPNi221bPfqvvho8QpuYBvn1x3");
+}
+
+TEST(NULSAddress, FromPrivateKey33) {
+    const auto privateKey = PrivateKey(parse_hex("d77580833f0b3c35b7114c23d6b66790d726c308baf237ec8c369152f2c08d27"));
+    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
+    const auto address = Address(publicKey, true);
+
+    ASSERT_EQ(address.string(), "NULSd6HgXx8YkwEjePLWUmdRSZzPQzK6BXnsB");
+}
+
+} // namespace TW::NULS::tests
diff --git a/tests/chains/NULS/SignerTests.cpp b/tests/chains/NULS/SignerTests.cpp
new file mode 100644
index 00000000000..3db30b5c2f4
--- /dev/null
+++ b/tests/chains/NULS/SignerTests.cpp
@@ -0,0 +1,270 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "NULS/Signer.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "proto/NULS.pb.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::NULS::tests {
+
+TEST(NULSSigner, Sign) {
+    auto privateKey =
+        parse_hex("0x9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b");
+    auto amount = store(uint256_t(10000000));
+    auto balance = store(uint256_t(100000000));
+    std::string nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
+    input.set_to("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(1);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1569228280);
+    input.set_nonce(nonce.data(), nonce.size());
+
+    Proto::SigningOutput output;
+    output = Signer::sign(input);
+
+    EXPECT_EQ(
+        hex(output.encoded()),
+        "0200f885885d00008c0117010001f7ec6473df12e751d64cf20a8baa7edd50810f8101000100201d9a00000000"
+        "00000000000000000000000000000000000000000000000000080000000000000000000117010001f05e787897"
+        "1f3374515eabb6f16d75219d887312010001008096980000000000000000000000000000000000000000000000"
+        "0000000000000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae1"
+        "43c1d7e3463044022028019c0099e2233c7adb84bb03a9a5666ece4a5b65a026a090fa460f3679654702204df0"
+        "fcb8762b5944b3aba033fa1a287ccb098150035dd8b66f52dc58d3d0843a");
+}
+
+TEST(NULSSigner, SignToken) {
+    auto privateKey =
+        parse_hex("0x9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b");
+    auto amount = store(uint256_t(10000000));
+    auto balance = store(uint256_t(100000000));
+    auto feePayerBalance = store(uint256_t(1000000));
+    std::string nonce = "0000000000000000";
+    std::string asset_nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
+    input.set_to("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(9);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1569228280);
+    input.set_nonce(asset_nonce.data(), asset_nonce.size());
+    input.set_fee_payer("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
+    input.set_fee_payer_nonce(nonce.data(), nonce.size());
+    input.set_fee_payer_balance(feePayerBalance.data(), feePayerBalance.size());
+
+    Proto::SigningOutput output;
+    output = Signer::sign(input);
+
+    EXPECT_EQ(hex(output.encoded()),
+              "0200f885885d0000d20217010001f7ec6473df12e751d64cf20a8baa7edd50810f810900010080969800"
+              "000000000000000000000000000000000000000000000000000000000800000000000000000017010001"
+              "f7ec6473df12e751d64cf20a8baa7edd50810f8101000100a08601000000000000000000000000000000"
+              "0000000000000000000000000000080000000000000000000117010001f05e7878971f3374515eabb6f1"
+              "6d75219d8873120900010080969800000000000000000000000000000000000000000000000000000000"
+              "000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1"
+              "d7e346304402204629e7e39708468a405f8d8dd208d0133a686beb5d3ae829b7a2f5867c74480902203d"
+              "0dffac8189b1caa9087e480fd57581e8c382cc4e17034b492dd2178dac851d");
+}
+
+TEST(NULSSigner, SignWithFeePayer) {
+    auto privateKey =
+        parse_hex("0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002");
+    auto feePayerPrivateKey =
+        parse_hex("0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6");
+    auto amount = store(uint256_t(100000));
+    auto balance = store(uint256_t(1000000));
+    auto feePayerBalance = store(uint256_t(1000000));
+    std::string nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac");
+    input.set_to("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(1);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1660632991);
+    input.set_nonce(nonce.data(), nonce.size());
+
+    // fee payer
+    input.set_fee_payer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA");
+    input.set_fee_payer_nonce("0000000000000000");
+    input.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+    input.set_fee_payer_balance(feePayerBalance.data(), feePayerBalance.size());
+
+    Proto::SigningOutput output;
+    output = Signer::sign(input);
+
+    EXPECT_EQ(
+        hex(output.encoded()),
+        "02009f3ffb620000d202170100014f019a4227bff89d51590fbf53fbd98d994485f801000100a0860100000000"
+        "00000000000000000000000000000000000000000000000000080000000000000000001701000152a6388c8bf5"
+        "4e8fcd73cc824813bfef0912299b01000100a08601000000000000000000000000000000000000000000000000"
+        "0000000000080000000000000000000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b701000100a0"
+        "860100000000000000000000000000000000000000000000000000000000000000000000000000d22102764370"
+        "693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022040b5820b93fd5e272f2a00"
+        "518af45a722571834934ba20d9a866de8e6d6409ab022003c610c647648444c1e2193634b2c51817a5a6ac3fe7"
+        "81da1a9ea773506afd8221025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff46"
+        "30440220140e46b260942a8475f38df39bf54a2eea56c77199fc7ba775aa4b7f147d0d2102206c82705cba509f"
+        "37ba0e35520a97bccb71a9e35cadcb8d95dd7fde5c8aa9e428");
+}
+
+TEST(NULSSigner, SignTokenWithFeePayer) {
+    auto privateKey =
+        parse_hex("0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002");
+
+    auto feePayerPrivateKey =
+        parse_hex("0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6");
+    auto amount = store(uint256_t(100000));
+    auto balance = store(uint256_t(900000));
+    auto feePayerBalance = store(uint256_t(1000000));
+    std::string asset_nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac");
+    input.set_to("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(9);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1660636748);
+    input.set_nonce(asset_nonce.data(), asset_nonce.size());
+
+    // fee payer
+    input.set_fee_payer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA");
+    input.set_fee_payer_nonce("e05d03df6ede0e22");
+    input.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+    input.set_fee_payer_balance(feePayerBalance.data(), feePayerBalance.size());
+
+    Proto::SigningOutput output;
+    output = Signer::sign(input);
+
+    EXPECT_EQ(
+        hex(output.encoded()),
+        "02004c4efb620000d2021701000152a6388c8bf54e8fcd73cc824813bfef0912299b09000100a0860100000000"
+        "0000000000000000000000000000000000000000000000000008000000000000000000170100014f019a4227bf"
+        "f89d51590fbf53fbd98d994485f801000100a08601000000000000000000000000000000000000000000000000"
+        "000000000008e05d03df6ede0e22000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b709000100a0"
+        "860100000000000000000000000000000000000000000000000000000000000000000000000000d32102764370"
+        "693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022025cb5b40bda4e6fc0ba719"
+        "bb0c1a907b2a0faa91316ef2c836310d49f906b6a802207d530a56a6c56d974036c86125da06d6e47f9d8ba154"
+        "4ac3e620cebd883a707821025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff47"
+        "3045022100ff6f45a1c3856f9ea954baca6b2988295bbb22c958f87f0d3baf9989930549530220426ecb152051"
+        "3710b99ab50e1f6c7e21b0175adef08aa05070bb9bfca8a001d8");
+}
+
+TEST(NULSSigner, InsufficientBalance) {
+    auto privateKey =
+        parse_hex("0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002");
+    auto feePayerPrivateKey =
+        parse_hex("0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6");
+    auto amount = store(uint256_t(10000000));
+    auto balance = store(uint256_t(100));
+    auto feePayerBalance = store(uint256_t(1000000));
+    std::string nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac");
+    input.set_to("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(1);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1660632991);
+    input.set_nonce(nonce.data(), nonce.size());
+
+    // fee payer
+    input.set_fee_payer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA");
+    input.set_fee_payer_nonce("0000000000000000");
+    input.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+    input.set_fee_payer_balance(feePayerBalance.data(), feePayerBalance.size());
+
+    Proto::SigningOutput output;
+    output = Signer::sign(input);
+
+    EXPECT_EQ(output.error(), Common::Proto::Error_general);
+    EXPECT_EQ(output.error_message(), "User account balance not sufficient");
+}
+
+TEST(NULSSigner, InsufficientBalanceWithFeePayer) {
+    auto privateKey =
+        parse_hex("0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002");
+    auto feePayerPrivateKey =
+        parse_hex("0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6");
+    auto amount = store(uint256_t(10000000));
+    auto balance = store(uint256_t(100000000));
+    auto feePayerBalance = store(uint256_t(100));
+    std::string nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac");
+    input.set_to("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(1);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1660632991);
+    input.set_nonce(nonce.data(), nonce.size());
+
+    // fee payer
+    input.set_fee_payer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA");
+    input.set_fee_payer_nonce("0000000000000000");
+    input.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+    input.set_fee_payer_balance(feePayerBalance.data(), feePayerBalance.size());
+
+    Proto::SigningOutput output;
+    output = Signer::sign(input);
+
+    EXPECT_EQ(output.error(), Common::Proto::Error_general);
+    EXPECT_EQ(output.error_message(), "fee payer balance not sufficient");
+}
+
+TEST(NULSSigner, TokenInsufficientBalance) {
+    auto privateKey =
+        parse_hex("0x9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b");
+    auto amount = store(uint256_t(10000000));
+    auto balance = store(uint256_t(100000000));
+    auto feePayerBalance = store(uint256_t(100));
+    std::string nonce = "0000000000000000";
+    std::string asset_nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
+    input.set_to("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(9);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1569228280);
+    input.set_nonce(asset_nonce.data(), asset_nonce.size());
+    input.set_fee_payer("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
+    input.set_fee_payer_nonce(nonce.data(), nonce.size());
+    input.set_fee_payer_balance(feePayerBalance.data(), feePayerBalance.size());
+
+    Proto::SigningOutput output;
+    output = Signer::sign(input);
+
+    EXPECT_EQ(output.error(), Common::Proto::Error_general);
+    EXPECT_EQ(output.error_message(), "fee payer balance not sufficient");
+}
+
+} // namespace TW::NULS::tests
diff --git a/tests/chains/NULS/TWAnySignerTests.cpp b/tests/chains/NULS/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..d82048ada7a
--- /dev/null
+++ b/tests/chains/NULS/TWAnySignerTests.cpp
@@ -0,0 +1,179 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "NULS/Address.h"
+#include "PrivateKey.h"
+#include "proto/NULS.pb.h"
+#include "uint256.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <ctime>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::NULS::tests {
+
+TEST(TWAnySignerNULS, Sign) {
+    auto privateKey =
+        parse_hex("0x9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b");
+    auto amount = store(uint256_t(10000000));
+    auto balance = store(uint256_t(100000000));
+    std::string nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
+    input.set_to("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(1);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1569228280);
+    input.set_nonce(nonce.data(), nonce.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNULS);
+
+    EXPECT_EQ(
+        hex(output.encoded()),
+        "0200f885885d00008c0117010001f7ec6473df12e751d64cf20a8baa7edd50810f8101000100201d9a00000000"
+        "00000000000000000000000000000000000000000000000000080000000000000000000117010001f05e787897"
+        "1f3374515eabb6f16d75219d887312010001008096980000000000000000000000000000000000000000000000"
+        "0000000000000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae1"
+        "43c1d7e3463044022028019c0099e2233c7adb84bb03a9a5666ece4a5b65a026a090fa460f3679654702204df0"
+        "fcb8762b5944b3aba033fa1a287ccb098150035dd8b66f52dc58d3d0843a");
+}
+
+TEST(TWAnySignerNULS, SignToken) {
+    auto privateKey =
+        parse_hex("0x9ce21dad67e0f0af2599b41b515a7f7018059418bab892a7b68f283d489abc4b");
+    auto amount = store(uint256_t(10000000));
+    auto balance = store(uint256_t(100000000));
+    auto assetBalance = store(uint256_t(100000000));
+    std::string nonce = "0000000000000000";
+    std::string asset_nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
+    input.set_to("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(9);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(assetBalance.data(), assetBalance.size());
+    input.set_timestamp(1569228280);
+    input.set_nonce(asset_nonce.data(), asset_nonce.size());
+    input.set_fee_payer("NULSd6Hgj7ZoVgsPN9ybB4C1N2TbvkgLc8Z9H");
+    input.set_fee_payer_balance(balance.data(), balance.size());
+    input.set_fee_payer_nonce(nonce.data(), nonce.size());
+    
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNULS);
+
+    EXPECT_EQ(hex(output.encoded()),
+              "0200f885885d0000d20217010001f7ec6473df12e751d64cf20a8baa7edd50810f810900010080969800"
+              "000000000000000000000000000000000000000000000000000000000800000000000000000017010001"
+              "f7ec6473df12e751d64cf20a8baa7edd50810f8101000100a08601000000000000000000000000000000"
+              "0000000000000000000000000000080000000000000000000117010001f05e7878971f3374515eabb6f1"
+              "6d75219d8873120900010080969800000000000000000000000000000000000000000000000000000000"
+              "000000000000000000692103958b790c331954ed367d37bac901de5c2f06ac8368b37d7bd6cd5ae143c1"
+              "d7e346304402204629e7e39708468a405f8d8dd208d0133a686beb5d3ae829b7a2f5867c74480902203d"
+              "0dffac8189b1caa9087e480fd57581e8c382cc4e17034b492dd2178dac851d");
+}
+
+// Tx:
+// https://nulscan.io/transaction/info?hash=58694394d2e28e18f66cf61697c791774c44d5275dce60d5e05d03df6ede0e22
+TEST(TWAnySigner, SignWithFeePayer) {
+    auto privateKey =
+        parse_hex("0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002");
+    auto feePayerPrivateKey =
+        parse_hex("0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6");
+    auto pk = PrivateKey(privateKey);
+    auto amount = store(uint256_t(100000));
+    auto balance = store(uint256_t(1000000));
+    auto feePayerBalance = store(uint256_t(1000000));
+    std::string nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac");
+    input.set_to("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(1);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1660632991);
+    input.set_nonce(nonce.data(), nonce.size());
+
+    // fee payer
+    input.set_fee_payer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA");
+    input.set_fee_payer_nonce("0000000000000000");
+    input.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+    input.set_fee_payer_balance(feePayerBalance.data(), feePayerBalance.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNULS);
+
+    EXPECT_EQ(
+        hex(output.encoded()),
+        "02009f3ffb620000d202170100014f019a4227bff89d51590fbf53fbd98d994485f801000100a0860100000000"
+        "00000000000000000000000000000000000000000000000000080000000000000000001701000152a6388c8bf5"
+        "4e8fcd73cc824813bfef0912299b01000100a08601000000000000000000000000000000000000000000000000"
+        "0000000000080000000000000000000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b701000100a0"
+        "860100000000000000000000000000000000000000000000000000000000000000000000000000d22102764370"
+        "693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022040b5820b93fd5e272f2a00"
+        "518af45a722571834934ba20d9a866de8e6d6409ab022003c610c647648444c1e2193634b2c51817a5a6ac3fe7"
+        "81da1a9ea773506afd8221025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff46"
+        "30440220140e46b260942a8475f38df39bf54a2eea56c77199fc7ba775aa4b7f147d0d2102206c82705cba509f"
+        "37ba0e35520a97bccb71a9e35cadcb8d95dd7fde5c8aa9e428");
+}
+
+// Tx:
+// https://nulscan.io/transaction/info?hash=210731f7b4a96884a2e04925e758586fb2edb07627621ba1be4de2c54b0868fc
+TEST(TWAnySigner, SignTokenWithFeePayer) {
+    auto privateKey =
+        parse_hex("0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002");
+    auto feePayerPrivateKey =
+        parse_hex("0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6");
+    auto amount = store(uint256_t(100000));
+    auto balance = store(uint256_t(900000));
+    auto feePayerBalance = store(uint256_t(1000000));
+    std::string asset_nonce = "0000000000000000";
+    Proto::SigningInput input;
+
+    input.set_from("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac");
+    input.set_to("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV");
+    input.set_amount(amount.data(), amount.size());
+    input.set_chain_id(9);
+    input.set_idassets_id(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_balance(balance.data(), balance.size());
+    input.set_timestamp(1660636748);
+    input.set_nonce(asset_nonce.data(), asset_nonce.size());
+
+    // fee payer
+    input.set_fee_payer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA");
+    input.set_fee_payer_nonce("e05d03df6ede0e22");
+    input.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+    input.set_fee_payer_balance(feePayerBalance.data(), feePayerBalance.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNULS);
+
+    EXPECT_EQ(
+        hex(output.encoded()),
+        "02004c4efb620000d2021701000152a6388c8bf54e8fcd73cc824813bfef0912299b09000100a0860100000000"
+        "0000000000000000000000000000000000000000000000000008000000000000000000170100014f019a4227bf"
+        "f89d51590fbf53fbd98d994485f801000100a08601000000000000000000000000000000000000000000000000"
+        "000000000008e05d03df6ede0e22000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b709000100a0"
+        "860100000000000000000000000000000000000000000000000000000000000000000000000000d32102764370"
+        "693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022025cb5b40bda4e6fc0ba719"
+        "bb0c1a907b2a0faa91316ef2c836310d49f906b6a802207d530a56a6c56d974036c86125da06d6e47f9d8ba154"
+        "4ac3e620cebd883a707821025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff47"
+        "3045022100ff6f45a1c3856f9ea954baca6b2988295bbb22c958f87f0d3baf9989930549530220426ecb152051"
+        "3710b99ab50e1f6c7e21b0175adef08aa05070bb9bfca8a001d8");
+}
+} // namespace TW::NULS::tests
diff --git a/tests/chains/NULS/TWCoinTypeTests.cpp b/tests/chains/NULS/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f2592aa1d2d
--- /dev/null
+++ b/tests/chains/NULS/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNULSCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNULS));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("303e0e42c28acc37ba952a1effd43daa1caec79928054f7abefb21c32e6fdc02"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNULS, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("NULSd6HgdSjUZy7jKMZfvQ5QU6Z97oufGTGcF"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNULS, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNULS));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNULS));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNULS), 8);
+    ASSERT_EQ(TWBlockchainNULS, TWCoinTypeBlockchain(TWCoinTypeNULS));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNULS));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNULS));
+    assertStringsEqual(symbol, "NULS");
+    assertStringsEqual(txUrl, "https://nulscan.io/transaction/info?hash=303e0e42c28acc37ba952a1effd43daa1caec79928054f7abefb21c32e6fdc02");
+    assertStringsEqual(accUrl, "https://nulscan.io/address/info?address=NULSd6HgdSjUZy7jKMZfvQ5QU6Z97oufGTGcF");
+    assertStringsEqual(id, "nuls");
+    assertStringsEqual(name, "NULS");
+}
diff --git a/tests/chains/NULS/TransactionCompilerTests.cpp b/tests/chains/NULS/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..cbc2def155d
--- /dev/null
+++ b/tests/chains/NULS/TransactionCompilerTests.cpp
@@ -0,0 +1,419 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "uint256.h"
+
+#include "proto/NULS.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::NULS::tests {
+
+TEST(NULSCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeNULS;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::NULS::Proto::SigningInput();
+    auto from = std::string("NULSd6HgWabfcG6H7NDK2TJvtoU3wxY1YLKwJ");
+    auto to = std::string("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    uint32_t chainId = 1;
+    uint32_t idassetsId = 1;
+    auto amount = TW::store((TW::uint256_t)10000000);
+    auto amountStr = std::string(amount.begin(), amount.end());
+    auto balance = TW::store((TW::uint256_t)100000000);
+    auto balanceStr = std::string(balance.begin(), balance.end());
+    auto nonce = std::string("0000000000000000");
+    input.set_from(from);
+    input.set_to(to);
+    input.set_amount(amountStr);
+    input.set_chain_id(chainId);
+    input.set_idassets_id(idassetsId);
+    input.set_nonce(nonce);
+    input.set_balance(balanceStr);
+    input.set_timestamp((uint32_t)1569228280);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    auto preImage = preSigningOutput.data();
+    EXPECT_EQ(hex(preImage),
+              "0200f885885d00008c01170100012c177a01a7afbe98e094007b99476534fb7926b701000100201d9a00"
+              "000000000000000000000000000000000000000000000000000000000800000000000000000001170100"
+              "01f05e7878971f3374515eabb6f16d75219d887312010001008096980000000000000000000000000000"
+              "0000000000000000000000000000000000000000000000");
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "8746b37cb4b443424d3093e8107c5dfd6c5318010bbffcc8e8ba7c1da60877fd");
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData =
+        parse_hex("033c87a3d9b812556b3034b6471cad5131a01e210c1d7ca06dd53b7d0aff0ee045");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
+    const auto signature =
+        parse_hex("a5234269eab6fe8a1510dd0cb36070a03464b48856e1ef2681dbb79a5ec656f92961ac01d401a6f8"
+                  "49acc958c6c9653f49282f5a0916df036ea8766918bac19500");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+    const auto ExpectedEncoded = parse_hex(
+        "0200f885885d00008c01170100012c177a01a7afbe98e094007b99476534fb7926b701000100201d9a00000000"
+        "00000000000000000000000000000000000000000000000000080000000000000000000117010001f05e787897"
+        "1f3374515eabb6f16d75219d887312010001008096980000000000000000000000000000000000000000000000"
+        "00000000000000000000000000006a21033c87a3d9b812556b3034b6471cad5131a01e210c1d7ca06dd53b7d0a"
+        "ff0ee045473045022100a5234269eab6fe8a1510dd0cb36070a03464b48856e1ef2681dbb79a5ec656f9022029"
+        "61ac01d401a6f849acc958c6c9653f49282f5a0916df036ea8766918bac195");
+    const auto ExpectedTx = std::string(ExpectedEncoded.begin(), ExpectedEncoded.end());
+    EXPECT_EQ(outputData.size(), 259ul);
+    {
+        TW::NULS::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.encoded(), ExpectedTx);
+        EXPECT_EQ(output.encoded().size(), 256ul);
+    }
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::NULS::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        auto key = parse_hex("044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1");
+        signingInput.set_private_key(key.data(), key.size());
+
+        TW::NULS::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.encoded(), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKeyData});
+        NULS::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+}
+
+TEST(NULSCompiler, TokenCompileWithSignatures) {
+    const auto coin = TWCoinTypeNULS;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::NULS::Proto::SigningInput();
+    auto from = std::string("NULSd6HgWabfcG6H7NDK2TJvtoU3wxY1YLKwJ");
+    auto to = std::string("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    uint32_t chainId = 9;
+    uint32_t idassetsId = 1;
+    auto amount = TW::store((TW::uint256_t)10000000);
+    auto amountStr = std::string(amount.begin(), amount.end());
+    auto balance = TW::store((TW::uint256_t)100000000);
+    auto balanceStr = std::string(balance.begin(), balance.end());
+    auto feePayerBalance = TW::store((TW::uint256_t)100000000);
+    auto feePayerBalanceStr = std::string(feePayerBalance.begin(), feePayerBalance.end());
+    auto nonce = std::string("0000000000000000");
+    auto asset_nonce = std::string("0000000000000000");
+    input.set_from(from);
+    input.set_to(to);
+    input.set_amount(amountStr);
+    input.set_chain_id(chainId);
+    input.set_idassets_id(idassetsId);
+    input.set_nonce(asset_nonce.data(), asset_nonce.size());
+    input.set_balance(balanceStr);
+    input.set_timestamp((uint32_t)1569228280);
+    input.set_fee_payer(from);
+    input.set_fee_payer_balance(feePayerBalanceStr);
+    input.set_fee_payer_nonce(nonce.data(), nonce.size());
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    auto preImage = preSigningOutput.data();
+    EXPECT_EQ(
+        hex(preImage),
+        "0200f885885d0000d202170100012c177a01a7afbe98e094007b99476534fb7926b70900010080969800000000"
+        "0000000000000000000000000000000000000000000000000008000000000000000000170100012c177a01a7af"
+        "be98e094007b99476534fb7926b701000100a08601000000000000000000000000000000000000000000000000"
+        "0000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120900010080"
+        "969800000000000000000000000000000000000000000000000000000000000000000000000000");
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "9040642ce845b320453b2ccd6f80efc38fdf61ec8f0c12e0c16f6244ec2e0496");
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData =
+        parse_hex("033c87a3d9b812556b3034b6471cad5131a01e210c1d7ca06dd53b7d0aff0ee045");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
+    const auto signature =
+        parse_hex("5ddea604c6cdfcf6cbe32f5873937641676ee5f9aee3c40aa9857c59aefedff25b77429cf62307d4"
+                  "3a6a79b4c106123e6232e3981032573770fe2726bf9fc07c00");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+    /// Step 3: Compile transaction info
+    const Data outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+    const auto ExpectedEncoded = parse_hex(
+        "0200f885885d0000d202170100012c177a01a7afbe98e094007b99476534fb7926b70900010080969800000000"
+        "0000000000000000000000000000000000000000000000000008000000000000000000170100012c177a01a7af"
+        "be98e094007b99476534fb7926b701000100a08601000000000000000000000000000000000000000000000000"
+        "0000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120900010080"
+        "9698000000000000000000000000000000000000000000000000000000000000000000000000006921033c87a3"
+        "d9b812556b3034b6471cad5131a01e210c1d7ca06dd53b7d0aff0ee04546304402205ddea604c6cdfcf6cbe32f"
+        "5873937641676ee5f9aee3c40aa9857c59aefedff202205b77429cf62307d43a6a79b4c106123e6232e3981032"
+        "573770fe2726bf9fc07c");
+    const auto ExpectedTx = std::string(ExpectedEncoded.begin(), ExpectedEncoded.end());
+    EXPECT_EQ(outputData.size(), 328ul);
+
+    {
+        TW::NULS::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.encoded(), ExpectedTx);
+        EXPECT_EQ(output.encoded().size(), 325ul);
+    }
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::NULS::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        auto key = parse_hex("044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1");
+        signingInput.set_private_key(key.data(), key.size());
+
+        TW::NULS::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.encoded(), ExpectedTx);
+    }
+}
+
+// Tx:
+// https://nulscan.io/transaction/info?hash=58694394d2e28e18f66cf61697c791774c44d5275dce60d5e05d03df6ede0e22
+TEST(NULSCompiler, CompileWithSignaturesFeePayer) {
+    const auto coin = TWCoinTypeNULS;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::NULS::Proto::SigningInput();
+    auto from = std::string("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac");
+    auto to = std::string("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV");
+    uint32_t chainId = 1;
+    uint32_t idassetsId = 1;
+    auto amount = TW::store((TW::uint256_t)100000);
+    auto amountStr = std::string(amount.begin(), amount.end());
+    auto balance = TW::store((TW::uint256_t)1000000);
+    auto balanceStr = std::string(balance.begin(), balance.end());
+    auto feePayerBalance = TW::store((TW::uint256_t)1000000);
+    auto feePayerBalanceStr = std::string(feePayerBalance.begin(), feePayerBalance.end());
+    auto nonce = std::string("0000000000000000");
+    input.set_from(from);
+    input.set_to(to);
+    input.set_amount(amountStr);
+    input.set_chain_id(chainId);
+    input.set_idassets_id(idassetsId);
+    input.set_nonce(nonce);
+    input.set_balance(balanceStr);
+    input.set_timestamp((uint32_t)1660632991);
+    // fee payer
+    input.set_fee_payer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA");
+    input.set_fee_payer_nonce("0000000000000000");
+    input.set_fee_payer_balance(feePayerBalanceStr);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    auto preImage = preSigningOutput.data();
+    EXPECT_EQ(
+        hex(preImage),
+        "02009f3ffb620000d202170100014f019a4227bff89d51590fbf53fbd98d994485f801000100a0860100000000"
+        "00000000000000000000000000000000000000000000000000080000000000000000001701000152a6388c8bf5"
+        "4e8fcd73cc824813bfef0912299b01000100a08601000000000000000000000000000000000000000000000000"
+        "0000000000080000000000000000000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b701000100a0"
+        "860100000000000000000000000000000000000000000000000000000000000000000000000000");
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "58694394d2e28e18f66cf61697c791774c44d5275dce60d5e05d03df6ede0e22");
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData =
+        parse_hex("02764370693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
+    const Data feePayerPublicKeyData =
+        parse_hex("025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff");
+    const PublicKey feePayerPublicKey = PublicKey(feePayerPublicKeyData, TWPublicKeyTypeSECP256k1);
+
+    const auto signature =
+        parse_hex("40b5820b93fd5e272f2a00518af45a722571834934ba20d9a866de8e6d6409ab03c610c647648444"
+                  "c1e2193634b2c51817a5a6ac3fe781da1a9ea773506afd8201");
+    const auto feePayerSignature =
+        parse_hex("140e46b260942a8475f38df39bf54a2eea56c77199fc7ba775aa4b7f147d0d216c82705cba509f37"
+                  "ba0e35520a97bccb71a9e35cadcb8d95dd7fde5c8aa9e42800");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+    EXPECT_TRUE(feePayerPublicKey.verify(feePayerSignature, TW::data(preImageHash)));
+    /// Step 3: Compile transaction info
+    Data outputData = TransactionCompiler::compileWithSignatures(
+        coin, inputStrData, {signature, feePayerSignature}, {publicKeyData, feePayerPublicKeyData});
+    const auto ExpectedEncoded = parse_hex(
+        "02009f3ffb620000d202170100014f019a4227bff89d51590fbf53fbd98d994485f801000100a0860100000000"
+        "00000000000000000000000000000000000000000000000000080000000000000000001701000152a6388c8bf5"
+        "4e8fcd73cc824813bfef0912299b01000100a08601000000000000000000000000000000000000000000000000"
+        "0000000000080000000000000000000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b701000100a0"
+        "860100000000000000000000000000000000000000000000000000000000000000000000000000d22102764370"
+        "693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022040b5820b93fd5e272f2a00"
+        "518af45a722571834934ba20d9a866de8e6d6409ab022003c610c647648444c1e2193634b2c51817a5a6ac3fe7"
+        "81da1a9ea773506afd8221025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff46"
+        "30440220140e46b260942a8475f38df39bf54a2eea56c77199fc7ba775aa4b7f147d0d2102206c82705cba509f"
+        "37ba0e35520a97bccb71a9e35cadcb8d95dd7fde5c8aa9e428");
+    const auto ExpectedTx = std::string(ExpectedEncoded.begin(), ExpectedEncoded.end());
+    EXPECT_EQ(outputData.size(), 433ul);
+    TW::NULS::Proto::SigningOutput signingOutput;
+    ASSERT_TRUE(signingOutput.ParseFromArray(outputData.data(), (int)outputData.size()));
+    EXPECT_EQ(signingOutput.encoded(), ExpectedTx);
+    EXPECT_EQ(signingOutput.encoded().size(), 430ul);
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::NULS::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        auto key = parse_hex("0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002");
+        signingInput.set_private_key(key.data(), key.size());
+        auto feePayerPrivateKey =
+            parse_hex("0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6");
+        signingInput.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+
+        TW::NULS::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.encoded(), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKeyData});
+        NULS::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+}
+
+// Tx:
+// https://nulscan.io/transaction/info?hash=210731f7b4a96884a2e04925e758586fb2edb07627621ba1be4de2c54b0868fc
+TEST(NULSCompiler, TokenCompileWithSignaturesFeePayer) {
+    const auto coin = TWCoinTypeNULS;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::NULS::Proto::SigningInput();
+    auto from = std::string("NULSd6HgYx7bdWWv7PxYhYeTRBhD6kZs1o5Ac");
+    auto to = std::string("NULSd6HgaHjzhMEUjd4T5DFnLz9EvV4TntrdV");
+    uint32_t chainId = 9;
+    uint32_t idassetsId = 1;
+    auto amount = TW::store((TW::uint256_t)100000);
+    auto amountStr = std::string(amount.begin(), amount.end());
+    auto balance = TW::store((TW::uint256_t)900000);
+    auto balanceStr = std::string(balance.begin(), balance.end());
+    auto feePayerBalance = TW::store((TW::uint256_t)1000000);
+    auto feePayerBalanceStr = std::string(feePayerBalance.begin(), feePayerBalance.end());
+    auto nonce = std::string("0000000000000000");
+    input.set_from(from);
+    input.set_to(to);
+    input.set_amount(amountStr);
+    input.set_chain_id(chainId);
+    input.set_idassets_id(idassetsId);
+    input.set_nonce(nonce);
+    input.set_balance(balanceStr);
+    input.set_timestamp((uint32_t)1660636748);
+    // fee payer
+    input.set_fee_payer("NULSd6HgYj81NrQBFZYXvyQhHCJCkGYWDTNeA");
+    input.set_fee_payer_nonce("e05d03df6ede0e22");
+    input.set_fee_payer_balance(feePayerBalanceStr);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    auto preImage = preSigningOutput.data();
+    EXPECT_EQ(
+        hex(preImage),
+        "02004c4efb620000d2021701000152a6388c8bf54e8fcd73cc824813bfef0912299b09000100a0860100000000"
+        "0000000000000000000000000000000000000000000000000008000000000000000000170100014f019a4227bf"
+        "f89d51590fbf53fbd98d994485f801000100a08601000000000000000000000000000000000000000000000000"
+        "000000000008e05d03df6ede0e22000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b709000100a0"
+        "860100000000000000000000000000000000000000000000000000000000000000000000000000");
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "210731f7b4a96884a2e04925e758586fb2edb07627621ba1be4de2c54b0868fc");
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData =
+        parse_hex("02764370693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
+    const Data feePayerPublicKeyData =
+        parse_hex("025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff");
+    const PublicKey feePayerPublicKey = PublicKey(feePayerPublicKeyData, TWPublicKeyTypeSECP256k1);
+
+    const auto signature =
+        parse_hex("25cb5b40bda4e6fc0ba719bb0c1a907b2a0faa91316ef2c836310d49f906b6a87d530a56a6c56d97"
+                  "4036c86125da06d6e47f9d8ba1544ac3e620cebd883a707800");
+    const auto feePayerSignature =
+        parse_hex("ff6f45a1c3856f9ea954baca6b2988295bbb22c958f87f0d3baf998993054953426ecb1520513710"
+                  "b99ab50e1f6c7e21b0175adef08aa05070bb9bfca8a001d801");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+    EXPECT_TRUE(feePayerPublicKey.verify(feePayerSignature, TW::data(preImageHash)));
+    /// Step 3: Compile transaction info
+    Data outputData = TransactionCompiler::compileWithSignatures(
+        coin, inputStrData, {signature, feePayerSignature}, {publicKeyData, feePayerPublicKeyData});
+    const auto ExpectedEncoded = parse_hex(
+        "02004c4efb620000d2021701000152a6388c8bf54e8fcd73cc824813bfef0912299b09000100a0860100000000"
+        "0000000000000000000000000000000000000000000000000008000000000000000000170100014f019a4227bf"
+        "f89d51590fbf53fbd98d994485f801000100a08601000000000000000000000000000000000000000000000000"
+        "000000000008e05d03df6ede0e22000117010001686a3c9cd2ac45aee0ef825b0443d1eb209368b709000100a0"
+        "860100000000000000000000000000000000000000000000000000000000000000000000000000d32102764370"
+        "693450d654d6fc061d1d4dbfbe0c95715fd3cde7e15df073ab0983b8c8463044022025cb5b40bda4e6fc0ba719"
+        "bb0c1a907b2a0faa91316ef2c836310d49f906b6a802207d530a56a6c56d974036c86125da06d6e47f9d8ba154"
+        "4ac3e620cebd883a707821025910df09ca768909cce9224d182401044c7b5bd44b0adee2ec5f2e64446573ff47"
+        "3045022100ff6f45a1c3856f9ea954baca6b2988295bbb22c958f87f0d3baf9989930549530220426ecb152051"
+        "3710b99ab50e1f6c7e21b0175adef08aa05070bb9bfca8a001d8");
+    const auto ExpectedTx = std::string(ExpectedEncoded.begin(), ExpectedEncoded.end());
+    EXPECT_EQ(outputData.size(), 434ul);
+    TW::NULS::Proto::SigningOutput signingOutput;
+    ASSERT_TRUE(signingOutput.ParseFromArray(outputData.data(), (int)outputData.size()));
+    EXPECT_EQ(signingOutput.encoded(), ExpectedTx);
+    EXPECT_EQ(signingOutput.encoded().size(), 431ul);
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::NULS::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        auto key = parse_hex("0x48c91cd24a27a1cdc791022ff39316444229db1c466b3b1841b40c919dee3002");
+        signingInput.set_private_key(key.data(), key.size());
+        auto feePayerPrivateKey =
+            parse_hex("0x9401fd554cb700777e57b05338f9ff47597add8b23ce9f1c8e041e9b4e2116b6");
+        signingInput.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+
+        TW::NULS::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.encoded(), ExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKeyData});
+        NULS::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+}
+
+} // namespace TW::NULS::tests
diff --git a/tests/chains/Nano/AddressTests.cpp b/tests/chains/Nano/AddressTests.cpp
new file mode 100644
index 00000000000..fdf30780912
--- /dev/null
+++ b/tests/chains/Nano/AddressTests.cpp
@@ -0,0 +1,56 @@
+// Copyright © 2019 Mart Roosmaa.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Nano/Address.h"
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace TW;
+
+namespace TW::Nano::tests {
+
+TEST(NanoAddress, FromPublicKey) {
+    {
+        const auto publicKey = PublicKey(parse_hex("5114aad86a390897d2a91b33b931b3a59a7df9e63eb3694f9430122f5622ae50"), TWPublicKeyTypeED25519Blake2b);
+        const auto address = Address(publicKey);
+        ASSERT_EQ(string("nano_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg"), address.string());
+    }
+
+    {
+        const auto publicKey = PublicKey(parse_hex("03e20ec6b4a39a629815ae02c0a1393b9225e3b890cae45b59f42fa29be9668d"), TWPublicKeyTypeED25519);
+        ASSERT_THROW(Address address(publicKey), std::invalid_argument);
+    }
+}
+
+TEST(NanoAddress, FromString) {
+    {
+        string nanoAddress = "nano_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg";
+        const auto address = Address(nanoAddress);
+        ASSERT_EQ(address.string(), nanoAddress);
+        ASSERT_EQ(hex(address.bytes), "5114aad86a390897d2a91b33b931b3a59a7df9e63eb3694f9430122f5622ae50");
+    }
+
+    {
+        string xrbAddress = "xrb_1111111111111111111111111111111111111111111111111111hifc8npp";
+        string nanoAddress = "nano_1111111111111111111111111111111111111111111111111111hifc8npp";
+        const auto address = Address(xrbAddress);
+        ASSERT_EQ(address.string(), nanoAddress);
+        ASSERT_EQ(hex(address.bytes), "0000000000000000000000000000000000000000000000000000000000000000");
+    }
+}
+
+TEST(NanoAddress, isValid) {
+    string nanodeAddress = "nano_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg";
+    string faultyChecksumAddress = "xrb_1111111111111111111111111111111111111111111111111111hi111111";
+    string bitcoinAddress = "1Ma2DrB78K7jmAwaomqZNRMCvgQrNjE2QC";
+
+    ASSERT_TRUE(Address::isValid(nanodeAddress));
+    ASSERT_FALSE(Address::isValid(faultyChecksumAddress));
+    ASSERT_FALSE(Address::isValid(bitcoinAddress));
+}
+
+} // namespace TW::Nano::tests
diff --git a/tests/chains/Nano/SignerTests.cpp b/tests/chains/Nano/SignerTests.cpp
new file mode 100644
index 00000000000..c28645d0794
--- /dev/null
+++ b/tests/chains/Nano/SignerTests.cpp
@@ -0,0 +1,248 @@
+// Copyright © 2019 Mart Roosmaa.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Nano/Signer.h"
+
+#include "TestAccounts.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Nano::tests {
+
+TEST(NanoSigner, sign1) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative(kRepOfficial1);
+    input.set_balance("96242336390000000000000000000");
+
+    // https://www.nanode.co/block/f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696
+    const auto signer = Signer(input);
+    ASSERT_EQ(hex(signer.blockHash), "f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
+    const auto signature = signer.sign();
+    ASSERT_EQ(hex(signature), "d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09");
+    const Proto::SigningOutput out = signer.build();
+    EXPECT_EQ(hex(out.signature()), "d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09");
+    EXPECT_EQ(hex(out.block_hash()), "f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
+    EXPECT_EQ(
+        "{\"account\":\"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c\","
+        "\"balance\":\"96242336390000000000000000000\","
+        "\"link\":\"491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507\","
+        "\"link_as_account\":\"nano_1kazsap8mc481zbqbcqjytpf9mmigj87qr5k5fhf97579t4k8fa94octjx6d\","
+        "\"previous\":\"0000000000000000000000000000000000000000000000000000000000000000\","
+        "\"representative\":\"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4\","
+        "\"signature\":\"d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09\","
+        "\"type\":\"state\"}",
+        out.json());
+}
+
+TEST(NanoSigner, sign2) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto parentBlock = parse_hex("f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
+
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_parent_block(parentBlock.data(), parentBlock.size());
+    input.set_representative(kRepNanode);
+    input.set_balance("96242336390000000000000000000");
+
+    // https://www.nanode.co/block/2568bf76336f7a415ca236dab97c1df9de951ca057a2e79df1322e647a259e7b
+    const auto signer = Signer(input);
+    ASSERT_EQ(hex(signer.blockHash), "2568bf76336f7a415ca236dab97c1df9de951ca057a2e79df1322e647a259e7b");
+    const auto signature = signer.sign();
+    ASSERT_EQ(hex(signature), "3a0687542405163d5623808052042b3482360a82cc003d178a0c0d8bfbca86450975d0faec60ae5ac37feba9a8e2205c8540317b26f2c589c2a6578b03870403");
+}
+
+TEST(NanoSigner, sign3) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto parentBlock = parse_hex("2568bf76336f7a415ca236dab97c1df9de951ca057a2e79df1322e647a259e7b");
+    const auto linkBlock = parse_hex("d7384845d2ae530b45a5dd50ee50757f988329f652781767af3f1bc2322f52b9");
+
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_parent_block(parentBlock.data(), parentBlock.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative(kRepNanode);
+    input.set_balance("196242336390000000000000000000");
+    input.set_work("123456789");
+
+    // https://www.nanode.co/block/1ca240212838d053ecaa9dceee598c52a6080067edecaeede3319eb0b7db6525
+    const auto signer = Signer(input);
+    ASSERT_EQ(hex(signer.blockHash), "1ca240212838d053ecaa9dceee598c52a6080067edecaeede3319eb0b7db6525");
+    const auto signature = signer.sign();
+    ASSERT_EQ(hex(signature), "e980d45365ae2fb291950019f7c19a3d5fa5df2736ca7e7ca1984338b4686976cb7efdda2894ddcea480f82645b50f2340c9d0fc69a05621bdc355783a21820d");
+    const Proto::SigningOutput out = signer.build();
+    EXPECT_EQ(
+        "{\"account\":\"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c\","
+        "\"balance\":\"196242336390000000000000000000\","
+        "\"link\":\"d7384845d2ae530b45a5dd50ee50757f988329f652781767af3f1bc2322f52b9\","
+        "\"link_as_account\":\"nano_3osrb34x7dkm3f4tdqcixsa9czwrienzenmr4xmtyhruras4ynosarg1sdiq\","
+        "\"previous\":\"2568bf76336f7a415ca236dab97c1df9de951ca057a2e79df1322e647a259e7b\","
+        "\"representative\":\"nano_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg\","
+        "\"signature\":\"e980d45365ae2fb291950019f7c19a3d5fa5df2736ca7e7ca1984338b4686976cb7efdda2894ddcea480f82645b50f2340c9d0fc69a05621bdc355783a21820d\","
+        "\"type\":\"state\",\"work\":\"123456789\"}",
+        out.json());
+}
+
+TEST(NanoSigner, sign4) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto parentBlock = parse_hex("1ca240212838d053ecaa9dceee598c52a6080067edecaeede3319eb0b7db6525");
+
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_parent_block(parentBlock.data(), parentBlock.size());
+    input.set_link_recipient("xrb_3wm37qz19zhei7nzscjcopbrbnnachs4p1gnwo5oroi3qonw6inwgoeuufdp");
+    input.set_representative(kRepNanode);
+    input.set_balance("126242336390000000000000000000");
+
+    // https://www.nanode.co/block/32ac7d8f5a16a498abf203b8dfee623c9e111ff25e7339f8cd69ec7492b23edd
+    const auto signer = Signer(input);
+    ASSERT_EQ(hex(signer.blockHash), "32ac7d8f5a16a498abf203b8dfee623c9e111ff25e7339f8cd69ec7492b23edd");
+    const auto signature = signer.sign();
+    ASSERT_EQ(hex(signature), "bcb806e140c9e2bc71c51ebbd941b4d99cee3d97fd50e3006eabc5e325c712662e2dc163ee32660875d67815ce4721e122389d2e64f1c9ad4555a9d3d8c33802");
+}
+
+TEST(NanoSigner, signInvalid1) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+
+    // Missing link_block
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_representative(kRepOfficial1);
+    input.set_balance("96242336390000000000000000000");
+
+    ASSERT_THROW(Signer signer(input), std::invalid_argument);
+}
+
+TEST(NanoSigner, signInvalid2) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    // Missing representative
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_balance("96242336390000000000000000000");
+
+    ASSERT_THROW(Signer signer(input), std::invalid_argument);
+}
+
+TEST(NanoSigner, signInvalid3) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    // Missing balance
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative(kRepOfficial1);
+
+    ASSERT_THROW(Signer signer(input), std::invalid_argument);
+}
+
+TEST(NanoSigner, signInvalid4) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    // Account first block cannot be 0 balance
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative(kRepOfficial1);
+    input.set_balance("0");
+
+    ASSERT_THROW(Signer signer(input), std::invalid_argument);
+}
+
+TEST(NanoSigner, signInvalid5) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+
+    // First block must use link_block not link_recipient
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_link_recipient("xrb_3wm37qz19zhei7nzscjcopbrbnnachs4p1gnwo5oroi3qonw6inwgoeuufdp");
+    input.set_representative(kRepOfficial1);
+    input.set_balance("96242336390000000000000000000");
+
+    ASSERT_THROW(Signer signer(input), std::invalid_argument);
+}
+
+TEST(NanoSigner, signInvalid6) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    // Invalid representative value
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative("xrb_4wm37qz19zhei7nzscjcopbrbnnachs4p1gnwo5oroi3qonw6inwgoeuufdp");
+    input.set_balance("96242336390000000000000000000");
+
+    ASSERT_THROW(Signer signer(input), std::invalid_argument);
+}
+
+TEST(NanoSigner, signInvalid7) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto parentBlock = parse_hex("f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
+
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_parent_block(parentBlock.data(), parentBlock.size());
+    input.set_link_recipient("xrb_4wm37qz19zhei7nzscjcopbrbnnachs4p1gnwo5oroi3qonw6inwgoeuufdp");
+    input.set_representative(kRepOfficial1);
+    input.set_balance("1.2.3");
+
+    ASSERT_THROW(Signer signer(input), std::invalid_argument);
+}
+
+TEST(NanoSigner, buildUnsignedTxBytes) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Blake2b);
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    auto input = Proto::SigningInput();
+    input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative(kRepOfficial1);
+    input.set_balance("96242336390000000000000000000");
+
+    const auto unsignedTxBytes = Signer::buildUnsignedTxBytes(input);
+    ASSERT_EQ(hex(unsignedTxBytes), "f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
+}
+
+TEST(NanoSigner, buildSigningOutput) {
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Blake2b);
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    auto input = Proto::SigningInput();
+    input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative(kRepOfficial1);
+    input.set_balance("96242336390000000000000000000");
+
+    const auto signature = parse_hex("d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09");
+
+    const auto out = Signer::buildSigningOutput(input, signature);
+    EXPECT_EQ(hex(out.signature()), "d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09");
+    EXPECT_EQ(hex(out.block_hash()), "f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696");
+    EXPECT_EQ(
+        "{\"account\":\"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c\","
+        "\"balance\":\"96242336390000000000000000000\","
+        "\"link\":\"491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507\","
+        "\"link_as_account\":\"nano_1kazsap8mc481zbqbcqjytpf9mmigj87qr5k5fhf97579t4k8fa94octjx6d\","
+        "\"previous\":\"0000000000000000000000000000000000000000000000000000000000000000\","
+        "\"representative\":\"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4\","
+        "\"signature\":\"d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09\","
+        "\"type\":\"state\"}",
+        out.json());
+}
+
+} // namespace TW::Nano::tests
diff --git a/tests/chains/Nano/TWAnySignerTests.cpp b/tests/chains/Nano/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..767b9ce0f6c
--- /dev/null
+++ b/tests/chains/Nano/TWAnySignerTests.cpp
@@ -0,0 +1,52 @@
+// Copyright © 2019 Mart Roosmaa.
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Nano.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Nano::tests {
+
+TEST(TWAnySignerNano, sign) {
+    const auto privateKey = parse_hex("173c40e97fe2afcd24187e74f6b603cb949a5365e72fbdd065a6b165e2189e34");
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    auto input = Proto::SigningInput();
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative("xrb_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4");
+    input.set_balance("96242336390000000000000000000");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNano);
+
+    EXPECT_EQ(
+        "{\"account\":\"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c\","
+        "\"balance\":\"96242336390000000000000000000\","
+        "\"link\":\"491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507\","
+        "\"link_as_account\":\"nano_1kazsap8mc481zbqbcqjytpf9mmigj87qr5k5fhf97579t4k8fa94octjx6d\","
+        "\"previous\":\"0000000000000000000000000000000000000000000000000000000000000000\","
+        "\"representative\":\"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4\","
+        "\"signature\":"
+        "\"d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5"
+        "ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09\","
+        "\"type\":\"state\"}",
+        output.json());
+}
+
+TEST(TWAnySignerNano, SignJSON) {
+    auto json = STRING(R"({"link_block":"SR/KLGmoRgfTdKrx9qzTznB0TFvgchte05RlPoUjNQc=","representative":"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4","balance":"96242336390000000000000000000"})");
+    auto key = DATA("173c40e97fe2afcd24187e74f6b603cb949a5365e72fbdd065a6b165e2189e34");
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeNano));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeNano));
+    assertStringsEqual(result, R"({"account":"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c","balance":"96242336390000000000000000000","link":"491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507","link_as_account":"nano_1kazsap8mc481zbqbcqjytpf9mmigj87qr5k5fhf97579t4k8fa94octjx6d","previous":"0000000000000000000000000000000000000000000000000000000000000000","representative":"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4","signature":"d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09","type":"state"})");
+}
+
+} // namespace TW::Nano::tests
diff --git a/tests/chains/Nano/TWCoinTypeTests.cpp b/tests/chains/Nano/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..a0b033eeade
--- /dev/null
+++ b/tests/chains/Nano/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNanoCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNano));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNano, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("nano_1wpj616kwhe1y38y1mspd8aub8i334cwybqco511iyuxm55zx8d67ptf1tsf"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNano, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNano));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNano));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNano), 30);
+    ASSERT_EQ(TWBlockchainNano, TWCoinTypeBlockchain(TWCoinTypeNano));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNano));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNano));
+    assertStringsEqual(symbol, "XNO");
+    assertStringsEqual(txUrl, "https://www.nanolooker.com/block/C264DB7BF40738F0CEFF19B606746CB925B713E4B8699A055699E0DC8ABBC70F");
+    assertStringsEqual(accUrl, "https://www.nanolooker.com/account/nano_1wpj616kwhe1y38y1mspd8aub8i334cwybqco511iyuxm55zx8d67ptf1tsf");
+    assertStringsEqual(id, "nano");
+    assertStringsEqual(name, "Nano");
+}
diff --git a/tests/Nano/TWNanoAddressTests.cpp b/tests/chains/Nano/TWNanoAddressTests.cpp
similarity index 82%
rename from tests/Nano/TWNanoAddressTests.cpp
rename to tests/chains/Nano/TWNanoAddressTests.cpp
index afcd1587cf4..b01dfc2447a 100644
--- a/tests/Nano/TWNanoAddressTests.cpp
+++ b/tests/chains/Nano/TWNanoAddressTests.cpp
@@ -1,11 +1,9 @@
 // Copyright © 2019 Mart Roosmaa.
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include "HexCoding.h"
 #include "PrivateKey.h"
 #include "PublicKey.h"
diff --git a/tests/chains/Nano/TestAccounts.h b/tests/chains/Nano/TestAccounts.h
new file mode 100644
index 00000000000..636c643e9d0
--- /dev/null
+++ b/tests/chains/Nano/TestAccounts.h
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+namespace TW::Nano::tests {
+
+const auto kPrivateKey = "173c40e97fe2afcd24187e74f6b603cb949a5365e72fbdd065a6b165e2189e34";
+const auto kRepOfficial1 = "xrb_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4";
+const auto kRepNanode = "xrb_1nanode8ngaakzbck8smq6ru9bethqwyehomf79sae1k7xd47dkidjqzffeg";
+
+} // namespace TW::Nano::tests
diff --git a/tests/chains/Nano/TransactionCompilerTests.cpp b/tests/chains/Nano/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..88ec1cda1ca
--- /dev/null
+++ b/tests/chains/Nano/TransactionCompilerTests.cpp
@@ -0,0 +1,106 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "TransactionCompiler.h"
+#include "proto/Nano.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWStellarPassphrase.h>
+
+#include "HexCoding.h"
+#include "Nano/Signer.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include "TestAccounts.h"
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Nano::tests {
+
+TEST(NanoCompiler, CompileWithSignatures) {
+    /// Step 1 : Prepare transaction input(protobuf)
+    auto coin = TWCoinTypeNano;
+    const auto privateKey = PrivateKey(parse_hex(kPrivateKey));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Blake2b);
+    const auto linkBlock = parse_hex("491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507");
+
+    auto input = Proto::SigningInput();
+    input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+    input.set_link_block(linkBlock.data(), linkBlock.size());
+    input.set_representative(kRepOfficial1);
+    input.set_balance("96242336390000000000000000000");
+    auto inputString = input.SerializeAsString();
+    auto localInputData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, localInputData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(Common::Proto::OK, preSigningOutput.error());
+
+    auto preImage = data(preSigningOutput.data());
+    auto preImageHash = data(preSigningOutput.data_hash());
+    const auto ExpectedPreImageHash = "f9a323153daefe041efb94d69b9669c882c935530ed953bbe8a665dfedda9696";
+    ASSERT_EQ(ExpectedPreImageHash, hex(preImageHash));
+    // Verify signature (pubkey & hash & signature)
+    Data signature = parse_hex("d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09");
+    EXPECT_TRUE(publicKey.verify(signature, preImageHash));
+    /// Step 3 : Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, localInputData, {signature}, {publicKey.bytes});
+    const auto ExpectedOutJson = "{\"account\":\"nano_1bhbsc9yuh15anq3owu1izw1nk7bhhqefrkhfo954fyt8dk1q911buk1kk4c\","
+                                 "\"balance\":\"96242336390000000000000000000\","
+                                 "\"link\":\"491fca2c69a84607d374aaf1f6acd3ce70744c5be0721b5ed394653e85233507\","
+                                 "\"link_as_account\":\"nano_1kazsap8mc481zbqbcqjytpf9mmigj87qr5k5fhf97579t4k8fa94octjx6d\","
+                                 "\"previous\":\"0000000000000000000000000000000000000000000000000000000000000000\","
+                                 "\"representative\":\"nano_3arg3asgtigae3xckabaaewkx3bzsh7nwz7jkmjos79ihyaxwphhm6qgjps4\","
+                                 "\"signature\":\"d247f6b90383b24e612569c75a12f11242f6e03b4914eadc7d941577dcf54a3a7cb7f0a4aba4246a40d9ebb5ee1e00b4a0a834ad5a1e7bef24e11f62b95a9e09\","
+                                 "\"type\":\"state\"}";
+    {
+        TW::Nano::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(signature), hex(output.signature()));
+        EXPECT_EQ(ExpectedPreImageHash, hex(output.block_hash()));
+        EXPECT_EQ(ExpectedOutJson, output.json());
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+        // keys were not used anywhere up to this point.
+        TW::Nano::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(localInputData.data(), (int)localInputData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::Nano::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        EXPECT_EQ(ExpectedOutJson, output.json());
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, localInputData, {signature, signature}, {publicKey.bytes});
+        TW::Nano::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(0ul, output.json().size());
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, localInputData, {}, {});
+        TW::Nano::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(0ul, output.json().size());
+        EXPECT_EQ(Common::Proto::Error_invalid_params, output.error());
+    }
+}
+
+} // namespace TW::Nano::tests
diff --git a/tests/chains/NativeZetaChain/TWCoinTypeTests.cpp b/tests/chains/NativeZetaChain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..89e2cdafc2d
--- /dev/null
+++ b/tests/chains/NativeZetaChain/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWNativeZetaChainCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeNativeZetaChain;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("2DBB071DDD47985F4470A21E5943CE95D371AE4BDE2267E201D3553FB2BDCFDE"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "zetachain");
+    assertStringsEqual(name, "NativeZetaChain");
+    assertStringsEqual(symbol, "ZETA");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainCosmos);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://explorer.zetachain.com/cosmos/tx/2DBB071DDD47985F4470A21E5943CE95D371AE4BDE2267E201D3553FB2BDCFDE");
+    assertStringsEqual(accUrl, "https://explorer.zetachain.com/address/zeta14py36sx57ud82t9yrks9z6hdsrpn5x6kmxs0ne");
+}
diff --git a/tests/chains/Nebl/AddressTests.cpp b/tests/chains/Nebl/AddressTests.cpp
new file mode 100644
index 00000000000..932f9dfd9b4
--- /dev/null
+++ b/tests/chains/Nebl/AddressTests.cpp
@@ -0,0 +1,53 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "Bitcoin/Address.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+#include <TrustWalletCore/TWCoinType.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(NeblAddress, Valid) {
+    ASSERT_TRUE(Address::isValid(std::string("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc")));
+    ASSERT_TRUE(TW::validateAddress(TWCoinTypeNebl, "NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc"));
+}
+
+TEST(NeblAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid(std::string("TZzJsL7VSUVeTcLb12LHr5tUW9bcx1T4G3")));
+}
+
+TEST(NeblAddress, FromPrivateKey) {
+    auto privateKey = PrivateKey(parse_hex("4222aae79af41eade7b07ce6fd44d926ea8e3f95e51a06e85f8bdec89680cbd9"));
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto address = Address(publicKey, TWCoinTypeP2pkhPrefix(TWCoinTypeNebl));
+    ASSERT_EQ(address.string(), "NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+}
+
+TEST(NeblAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("03787a4c5ff72dce6d97f9b6360dc302b2d8a833e8c570dcc124a96e5f564bb524"), TWPublicKeyTypeSECP256k1);
+    auto address = Address(publicKey, TWCoinTypeP2pkhPrefix(TWCoinTypeNebl));
+    ASSERT_EQ(address.string(), "NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+
+    auto addr = TW::deriveAddress(TWCoinTypeNebl, publicKey, TWDerivationBitcoinLegacy);
+    ASSERT_EQ(addr, "NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+}
+
+TEST(NeblAddress, FromString) {
+    auto address = Address("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    ASSERT_EQ(address.string(), "NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+
+    auto data = TW::addressToData(TWCoinTypeNebl, "NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    EXPECT_EQ(hex(data), "ae40b2142aba5ddd10f74d9440bfda8a36cbad5b");
+
+    // invalid address
+    data = TW::addressToData(TWCoinTypeNebl, "xZW297yHHzSdiiwqE1eN4bfm5tJULjVZ");
+    EXPECT_EQ(data.size(), 0ul);
+}
diff --git a/tests/chains/Nebl/SignerTests.cpp b/tests/chains/Nebl/SignerTests.cpp
new file mode 100644
index 00000000000..eb8cad61749
--- /dev/null
+++ b/tests/chains/Nebl/SignerTests.cpp
@@ -0,0 +1,154 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Verge/Signer.h"
+#include "Verge/Transaction.h"
+#include "Verge/TransactionBuilder.h"
+#include "Bitcoin/Address.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+
+TEST(NeblSigner, Sign) {
+    const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "NRrKgiZfT7jUdS3geoEBproA7hzZnDQAdr";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    input.set_coin_type(TWCoinTypeNebl);
+    input.set_time(1656474580);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto utxoKey0 = PrivateKey(parse_hex("4222aae79af41eade7b07ce6fd44d926ea8e3f95e51a06e85f8bdec89680cbd9"));
+    auto script0 = Bitcoin::Script::lockScriptForAddress("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc", TWCoinTypeNebl);
+    ASSERT_EQ(hex(script0.bytes), "76a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 980000000;
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = Verge::Signer::sign(input);
+    
+    ASSERT_EQ(hex(result.encoded()),
+        "01000000d4cbbb62017d40b2c80adbb0f44cbec466ae30f0316e0c1bf98110fd6d3f1b0fda47e1a6a5000000006a47304402207f77f7ed50ec56447fd108b2a9a693b2ac9f62e99b59dfa914f242510943187602204618fd9195050c763eb93644e51344f6c00e4dd93aa41bb42bce42c9e4cc53b6012103787a4c5ff72dce6d97f9b6360dc302b2d8a833e8c570dcc124a96e5f564bb524feffffff02002f6859000000001976a914412033ed457c72ca70bab5fbfdc03256bd2ce07d88ac009d693a000000001976a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac00000000"
+    );
+}
+
+TEST(NeblSigner, SignAnyoneCanPay) {
+    const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "NRrKgiZfT7jUdS3geoEBproA7hzZnDQAdr";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAnyoneCanPay|TWBitcoinSigHashTypeSingle);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    input.set_coin_type(TWCoinTypeNebl);
+    input.set_time(1656474580);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto script0 = Bitcoin::Script::lockScriptForAddress("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc", TWCoinTypeNebl);
+    EXPECT_EQ(hex(script0.bytes), "76a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+
+    auto txHash1 = parse_hex("29bd442521ea303afb09ad2583f589a6527c9218c050882b6b8527bbe4d11766");
+    std::reverse(txHash1.begin(), txHash1.end());
+
+    auto utxo1 = input.add_utxo();
+    utxo1->mutable_out_point()->set_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_index(0);
+    utxo1->mutable_out_point()->set_sequence(4294967294);
+    utxo1->set_amount(200000000);
+
+    auto script1 = Bitcoin::Script::lockScriptForAddress("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc", TWCoinTypeNebl);
+    ASSERT_EQ(hex(script1.bytes), "76a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac");
+    utxo1->set_script(script1.bytes.data(), script1.bytes.size());
+
+    auto utxoKey0 = PrivateKey(parse_hex("4222aae79af41eade7b07ce6fd44d926ea8e3f95e51a06e85f8bdec89680cbd9"));
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 1000000000;
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = Bitcoin::TransactionSigner<Verge::Transaction, Verge::TransactionBuilder>::sign(input);
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    ASSERT_EQ(hex(serialized),
+        "01000000d4cbbb62017d40b2c80adbb0f44cbec466ae30f0316e0c1bf98110fd6d3f1b0fda47e1a6a5000000006b483045022100827715814a853164cf04b7106ef508eeadc5d868616756d5f598eab977c3ea2d022024ab244bfda0d31a4454ec70bedc07391fd956c94bb80f6164dc45188e0507d6832103787a4c5ff72dce6d97f9b6360dc302b2d8a833e8c570dcc124a96e5f564bb524feffffff02002f6859000000001976a914412033ed457c72ca70bab5fbfdc03256bd2ce07d88ac00ca9a3b000000001976a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac00000000"
+    );
+}
+
+TEST(NeblSigner, SignWithError) {
+    const int64_t amount = 1500000000;
+    const std::string toAddress = "NRrKgiZfT7jUdS3geoEBproA7hzZnDQAdr";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    input.set_coin_type(TWCoinTypeNebl);
+    input.set_time(1656474580);
+
+    // Sign
+    auto result = Verge::Signer::sign(input);
+
+    ASSERT_NE(result.error(), Common::Proto::OK);
+
+    // PreImage
+    auto preResult = Verge::Signer::preImageHashes(input);
+    ASSERT_NE(preResult.error(), Common::Proto::OK);
+}
+
diff --git a/tests/chains/Nebl/TWAnySignerTests.cpp b/tests/chains/Nebl/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..745d6ed792c
--- /dev/null
+++ b/tests/chains/Nebl/TWAnySignerTests.cpp
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Bitcoin/Signer.h"
+#include "Bitcoin/Address.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(TWAnySignerNebl, Sign) {
+    const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "NRrKgiZfT7jUdS3geoEBproA7hzZnDQAdr";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    input.set_coin_type(TWCoinTypeNebl);
+    input.set_time(1656474580);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto utxoKey0 = PrivateKey(parse_hex("4222aae79af41eade7b07ce6fd44d926ea8e3f95e51a06e85f8bdec89680cbd9"));
+    auto script0 = Bitcoin::Script::lockScriptForAddress("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc", TWCoinTypeNebl);
+    ASSERT_EQ(hex(script0.bytes), "76a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    Bitcoin::Proto::TransactionPlan plan;
+    {
+        ANY_PLAN(input, plan, TWCoinTypeNebl);
+
+        plan.set_amount(amount);
+        plan.set_fee(fee);
+        plan.set_change(980000000);
+
+        *input.mutable_plan() = plan;
+    }
+
+    Bitcoin::Proto::SigningOutput output;
+    {
+        ANY_SIGN(input, TWCoinTypeNebl);
+        ASSERT_EQ(output.error(), Common::Proto::OK);
+    }
+
+    // Sign
+    ASSERT_EQ(hex(output.encoded()),
+        "01000000d4cbbb62017d40b2c80adbb0f44cbec466ae30f0316e0c1bf98110fd6d3f1b0fda47e1a6a5000000006a47304402207f77f7ed50ec56447fd108b2a9a693b2ac9f62e99b59dfa914f242510943187602204618fd9195050c763eb93644e51344f6c00e4dd93aa41bb42bce42c9e4cc53b6012103787a4c5ff72dce6d97f9b6360dc302b2d8a833e8c570dcc124a96e5f564bb524feffffff02002f6859000000001976a914412033ed457c72ca70bab5fbfdc03256bd2ce07d88ac009d693a000000001976a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac00000000"
+    );
+}
diff --git a/tests/chains/Nebl/TWCoinTypeTests.cpp b/tests/chains/Nebl/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..817ad95c8cc
--- /dev/null
+++ b/tests/chains/Nebl/TWCoinTypeTests.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNeblCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNebl));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("53713d5208e2a1bc68ef8bd5c851f113cf5e1675d22ecf3406f38819ab9187b3"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNebl, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNebl, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNebl));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNebl));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNebl), 8);
+    ASSERT_EQ(TWBlockchainVerge, TWCoinTypeBlockchain(TWCoinTypeNebl));
+    ASSERT_EQ(0x70, TWCoinTypeP2shPrefix(TWCoinTypeNebl));
+    ASSERT_EQ(0x35, TWCoinTypeP2pkhPrefix(TWCoinTypeNebl));
+    assertStringsEqual(symbol, "NEBL");
+    assertStringsEqual(txUrl, "https://explorer.nebl.io/tx/53713d5208e2a1bc68ef8bd5c851f113cf5e1675d22ecf3406f38819ab9187b3");
+    assertStringsEqual(accUrl, "https://explorer.nebl.io/address/NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    assertStringsEqual(id, "Nebl");
+    assertStringsEqual(name, "Nebl");
+}
\ No newline at end of file
diff --git a/tests/chains/Nebl/TWNeblAddressTests.cpp b/tests/chains/Nebl/TWNeblAddressTests.cpp
new file mode 100644
index 00000000000..085680ffaaa
--- /dev/null
+++ b/tests/chains/Nebl/TWNeblAddressTests.cpp
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWNebl, Address) {
+    auto string = STRING("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeNebl));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "ae40b2142aba5ddd10f74d9440bfda8a36cbad5b");
+}
diff --git a/tests/chains/Nebl/TransactionBuilderTests.cpp b/tests/chains/Nebl/TransactionBuilderTests.cpp
new file mode 100644
index 00000000000..09bdcb8218d
--- /dev/null
+++ b/tests/chains/Nebl/TransactionBuilderTests.cpp
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Verge/Transaction.h"
+#include "Verge/TransactionBuilder.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(NeblTransactionBuilder, BuildWithTime) {
+ const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "NRrKgiZfT7jUdS3geoEBproA7hzZnDQAdr";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    input.set_coin_type(TWCoinTypeNebl);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto utxoKey0 = PrivateKey(parse_hex("4222aae79af41eade7b07ce6fd44d926ea8e3f95e51a06e85f8bdec89680cbd9"));
+    auto script0 = Bitcoin::Script::lockScriptForAddress("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc", TWCoinTypeNebl);
+    ASSERT_EQ(hex(script0.bytes), "76a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 980000000;
+
+    auto tx = Verge::TransactionBuilder::build<Verge::Transaction>(plan, input).payload();
+    ASSERT_NE(tx.time, 0ul);
+}
\ No newline at end of file
diff --git a/tests/chains/Nebl/TransactionCompilerTests.cpp b/tests/chains/Nebl/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..30669f9ad36
--- /dev/null
+++ b/tests/chains/Nebl/TransactionCompilerTests.cpp
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+#include "Bitcoin/Script.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+
+
+TEST(NeblCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeNebl;
+
+    // tx on mainnet
+    // https://Nebl-blockchain.info/tx/21314157b60ddacb842d2a749429c4112724b7a078adb9e77ba502ea2dd7c230
+
+    const int64_t amount = 100000000;
+    const int64_t fee = 226;
+    const std::string toAddress = "NRrKgiZfT7jUdS3geoEBproA7hzZnDQAdr";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc");
+    input.set_coin_type(coin);
+    input.set_time(1584059579);
+
+    auto txHash0 = parse_hex("ee839754c8e93d620cbec9a1c51e7b69016d00839741b03af2c039852d941212");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(1);
+    utxo0->mutable_out_point()->set_sequence(4294967295);
+    utxo0->set_amount(20000000000000);
+    
+    auto script0 = TW::Bitcoin::Script::lockScriptForAddress("NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc", TWCoinTypeNebl);
+    ASSERT_EQ(hex(script0.bytes), "76a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+
+    auto utxoKey0 = PrivateKey(parse_hex("4222aae79af41eade7b07ce6fd44d926ea8e3f95e51a06e85f8bdec89680cbd9"));
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    EXPECT_EQ(input.utxo_size(), 1);
+    // Plan
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, coin);
+
+    plan.set_amount(amount);
+    plan.set_fee(fee);
+    plan.set_change(19999899999774);
+
+    // Extend input with accepted plan
+    *input.mutable_plan() = plan;
+
+    // Serialize input
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    /// Step 2: Obtain preimage hashes
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    TW::Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), (int)preImageHashes.size()));
+
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].data_hash()),
+              "e7d7c67a125a506d46fa75f86a575360239d301a19621f9f231c46d889fe1a3b");
+
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].public_key_hash()), "ae40b2142aba5ddd10f74d9440bfda8a36cbad5b");
+
+    
+
+    auto publicKeyHex = "03787a4c5ff72dce6d97f9b6360dc302b2d8a833e8c570dcc124a96e5f564bb524";
+    auto publicKey = PublicKey(parse_hex(publicKeyHex), TWPublicKeyTypeSECP256k1);
+
+    auto preImageHash = preSigningOutput.hash_public_keys()[0].data_hash();
+    auto signature = parse_hex("3045022100a2dd4cbc8516a7b19516bce90fde7a3c4836c1277ddc61ca80d27d5711bcefc302200e049a3c2bdfd7ebacb7be48914a7cad8ea0db0695fb28ab645acdb12c413cb3");
+    
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(
+        publicKey.verifyAsDER(signature, TW::Data(preImageHash.begin(), preImageHash.end())));
+
+    // Simulate signatures, normally obtained from signature server.
+    std::vector<Data> signatureVec;
+    std::vector<Data> pubkeyVec;
+    signatureVec.push_back(signature);
+    pubkeyVec.push_back(publicKey.bytes);
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, signatureVec, pubkeyVec);
+
+    const auto ExpectedTx =
+        "01000000bbd46a5e011212942d8539c0f23ab0419783006d01697b1ec5a1c9be0c623de9c8549783ee010000006b483045022100a2dd4cbc8516a7b19516bce90fde7a3c4836c1277ddc61ca80d27d5711bcefc302200e049a3c2bdfd7ebacb7be48914a7cad8ea0db0695fb28ab645acdb12c413cb3012103787a4c5ff72dce6d97f9b6360dc302b2d8a833e8c570dcc124a96e5f564bb524ffffffff0200e1f505000000001976a914412033ed457c72ca70bab5fbfdc03256bd2ce07d88ac1e5eef96301200001976a914ae40b2142aba5ddd10f74d9440bfda8a36cbad5b88ac00000000";
+    {
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: not enough signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, pubkeyVec);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
diff --git a/tests/chains/Nebulas/AddressTests.cpp b/tests/chains/Nebulas/AddressTests.cpp
new file mode 100644
index 00000000000..8efe6395086
--- /dev/null
+++ b/tests/chains/Nebulas/AddressTests.cpp
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Nebulas/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+
+namespace TW::Nebulas::tests {
+
+using namespace std;
+
+TEST(NebulasAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_FALSE(Address::isValid("a1TgpFZWCMmFd2sphb6RKsCvsEyMCNa2Yyv"));
+    ASSERT_FALSE(Address::isValid("n2TgpFZWCMmFd2sphb6RKsCvsEyMCNa2Yyv"));
+    // normal address test
+    ASSERT_TRUE(Address::isValid("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY"));
+    // contract address test
+    ASSERT_TRUE(Address::isValid("n1zUNqeBPvsyrw5zxp9mKcDdLTjuaEL7s39"));
+}
+
+TEST(NebulasAddress, String) {
+    ASSERT_THROW(Address("abc"), std::invalid_argument);
+    ASSERT_EQ(Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY").string(),
+              "n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+    ASSERT_EQ(Address(Base58::decode("n1TgpFZWCMmFd2sphb6RKsCvsEyMCNa2Yyv")).string(),
+              "n1TgpFZWCMmFd2sphb6RKsCvsEyMCNa2Yyv");
+
+    const auto address = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+    ASSERT_EQ(address.string(), "n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+}
+
+TEST(NebulasAddress, Data) {
+    Data data;
+    EXPECT_THROW(Address(data).string(), std::invalid_argument);
+    ASSERT_EQ(Address(Base58::decode("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY")).string(),
+              "n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+}
+
+TEST(NebulasAddress, FromPrivateKey) {
+    const auto privateKey = PrivateKey(parse_hex("d2fd0ec9f6268fc8d1f563e3e976436936708bdf0dc60c66f35890f5967a8d2b"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+
+    EXPECT_THROW(Address(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1)), std::invalid_argument);
+}
+
+} // namespace TW::Nebulas::tests
diff --git a/tests/chains/Nebulas/SignerTests.cpp b/tests/chains/Nebulas/SignerTests.cpp
new file mode 100644
index 00000000000..c904a4a2fe4
--- /dev/null
+++ b/tests/chains/Nebulas/SignerTests.cpp
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Nebulas/Address.h"
+#include "Nebulas/Signer.h"
+#include <time.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Nebulas {
+
+class SignerExposed : public Signer {
+  public:
+    SignerExposed(boost::multiprecision::uint256_t chainID) : Signer(chainID) {}
+    using Signer::hash;
+};
+
+TEST(NebulasSigner, Hash) {
+    auto from = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+    auto to = Address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
+    auto transaction = Transaction(
+        /* to: */ from,
+        /* nonce: */ 7,
+        /* gasPrice: */ 1000000,
+        /* gasLimit: */ 200000,
+        /* to: */ to,
+        /* amount: */ 11000000000000000000ULL,
+        /* timestamp: */ 1560052938,
+        /* payload: */ std::string());
+    auto signer = SignerExposed(1);
+    auto hash = signer.hash(transaction);
+
+    ASSERT_EQ(hex(hash), "505dd4769de32a9c4bb6d6afd4f8e1ea6474815fd43484d8917cbd9e0993b885");
+}
+
+} // namespace TW::Nebulas
diff --git a/tests/chains/Nebulas/TWAnySignerTests.cpp b/tests/chains/Nebulas/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..21ed9d0c0de
--- /dev/null
+++ b/tests/chains/Nebulas/TWAnySignerTests.cpp
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+#include "uint256.h"
+#include "proto/Nebulas.pb.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Nebulas::tests {
+
+TEST(TWAnySignerNebulas, Sign) {
+    Proto::SigningInput input;
+    input.set_from_address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+    input.set_to_address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
+    auto value = store(uint256_t(7));
+    input.set_nonce(value.data(), value.size());
+    value = store(uint256_t(1000000));
+    input.set_gas_price(value.data(), value.size());
+    value = store(uint256_t(200000));
+    input.set_gas_limit(value.data(), value.size());
+    value = store(uint256_t(11000000000000000000ULL));
+    input.set_amount(value.data(), value.size());
+    input.set_payload("");
+    value = store(uint256_t(1560052938));
+    input.set_timestamp(value.data(), value.size());
+
+    const auto privateKey = parse_hex("d2fd0ec9f6268fc8d1f563e3e976436936708bdf0dc60c66f35890f5967a8d2b");
+    input.set_private_key(privateKey.data(), privateKey.size());
+    auto chainid = store(uint256_t(1));
+    input.set_chain_id(chainid.data(), chainid.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNebulas);
+
+    EXPECT_EQ(hex(output.signature()), "f53f4a9141ff8e462b094138eccd8c3a5d7865f9e9ab509626c78460a9e0b0fc35f7ed5ba1795ceb81a5e46b7580a6f7fb431d44fdba92515399cf6a8e47e71500");
+    EXPECT_EQ(output.raw(), "CiBQXdR2neMqnEu21q/U+OHqZHSBX9Q0hNiRfL2eCZO4hRIaGVefwtw23wEobqA40/7aIwQHghETxH4r+50aGhlXf89CeLWgHFjKu9/6tn4KNbelsMDAIIi2IhAAAAAAAAAAAJin2bgxTAAAKAcwyony5wU6CAoGYmluYXJ5QAFKEAAAAAAAAAAAAAAAAAAPQkBSEAAAAAAAAAAAAAAAAAADDUBYAWJB9T9KkUH/jkYrCUE47M2MOl14Zfnpq1CWJseEYKngsPw19+1boXlc64Gl5Gt1gKb3+0MdRP26klFTmc9qjkfnFQA=");
+}
+
+} // namespace TW::Nebulas::tests
diff --git a/tests/chains/Nebulas/TWCoinTypeTests.cpp b/tests/chains/Nebulas/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..2d302a0aa52
--- /dev/null
+++ b/tests/chains/Nebulas/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNebulasCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNebulas));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNebulas, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNebulas, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNebulas));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNebulas));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNebulas), 18);
+    ASSERT_EQ(TWBlockchainNebulas, TWCoinTypeBlockchain(TWCoinTypeNebulas));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNebulas));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNebulas));
+    assertStringsEqual(symbol, "NAS");
+    assertStringsEqual(txUrl, "https://explorer.nebulas.io/#/tx/t123");
+    assertStringsEqual(accUrl, "https://explorer.nebulas.io/#/address/a12");
+    assertStringsEqual(id, "nebulas");
+    assertStringsEqual(name, "Nebulas");
+}
diff --git a/tests/Nebulas/TWNebulasAddressTests.cpp b/tests/chains/Nebulas/TWNebulasAddressTests.cpp
similarity index 89%
rename from tests/Nebulas/TWNebulasAddressTests.cpp
rename to tests/chains/Nebulas/TWNebulasAddressTests.cpp
index 32e7ae08fa4..e41a4e54e09 100644
--- a/tests/Nebulas/TWNebulasAddressTests.cpp
+++ b/tests/chains/Nebulas/TWNebulasAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWAnyAddress.h>
 #include <TrustWalletCore/TWHDWallet.h>
diff --git a/tests/chains/Nebulas/TransactionTests.cpp b/tests/chains/Nebulas/TransactionTests.cpp
new file mode 100644
index 00000000000..d937cb73734
--- /dev/null
+++ b/tests/chains/Nebulas/TransactionTests.cpp
@@ -0,0 +1,81 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Nebulas/Signer.h"
+#include "HexCoding.h"
+#include "Base64.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+extern std::string htmlescape(const std::string& str);
+
+namespace TW::Nebulas::tests {
+
+using namespace std;
+
+TEST(NebulasTransaction, serialize) {
+    auto from = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+    auto to = Address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
+    auto transaction = Transaction(
+        /* to: */ from,
+        /* nonce: */ 7,
+        /* gasPrice: */ 1000000,
+        /* gasLimit: */ 200000,
+        /* to: */ to,
+        /* amount: */ 11000000000000000000ULL,
+        /* timestamp: */ 1560052938,
+        /* payload: */ std::string());
+
+    const auto privateKey = PrivateKey(parse_hex("d2fd0ec9f6268fc8d1f563e3e976436936708bdf0dc60c66f35890f5967a8d2b"));
+    auto signer = Signer(1);
+    signer.sign(privateKey, transaction);
+    transaction.serializeToRaw();
+
+    ASSERT_EQ(TW::Base64::encode(transaction.raw), "CiBQXdR2neMqnEu21q/U+OHqZHSBX9Q0hNiRfL2eCZO4hRIaGVefwtw23wEobqA40/7aIwQHghETxH4r+50aGhlXf89CeLWgHFjKu9/6tn4KNbelsMDAIIi2IhAAAAAAAAAAAJin2bgxTAAAKAcwyony5wU6CAoGYmluYXJ5QAFKEAAAAAAAAAAAAAAAAAAPQkBSEAAAAAAAAAAAAAAAAAADDUBYAWJB9T9KkUH/jkYrCUE47M2MOl14Zfnpq1CWJseEYKngsPw19+1boXlc64Gl5Gt1gKb3+0MdRP26klFTmc9qjkfnFQA=");
+}
+
+TEST(NebulasTransaction, binaryPayload) {
+    auto from = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+    auto to = Address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
+    auto transaction = Transaction(
+        /* to: */ from,
+        /* nonce: */ 7,
+        /* gasPrice: */ 1000000,
+        /* gasLimit: */ 200000,
+        /* to: */ to,
+        /* amount: */ 11000000000000000000ULL,
+        /* timestamp: */ 1560052938,
+        /* payload: */ std::string("{\"binary\":\"test\"}"));
+
+    const auto privateKey = PrivateKey(parse_hex("d2fd0ec9f6268fc8d1f563e3e976436936708bdf0dc60c66f35890f5967a8d2b"));
+    auto signer = Signer(1);
+    signer.sign(privateKey, transaction);
+    ASSERT_EQ(TW::Base64::encode(transaction.raw), "CiB1Oqj7bxLQMHEoNyg/vFHmsTrGdkpTf/5qFDkYPB3bkxIaGVefwtw23wEobqA40/7aIwQHghETxH4r+50aGhlXf89CeLWgHFjKu9/6tn4KNbelsMDAIIi2IhAAAAAAAAAAAJin2bgxTAAAKAcwyony5wU6PQoGYmluYXJ5EjN7IkRhdGEiOnsiZGF0YSI6WzExNiwxMDEsMTE1LDExNl0sInR5cGUiOiJCdWZmZXIifX1AAUoQAAAAAAAAAAAAAAAAAA9CQFIQAAAAAAAAAAAAAAAAAAMNQFgBYkGHXq+JWPaEyeB19bqL3QB5jyM961WLq7PMTpnGM4iLtBjCkngjS81kgPM2TE4qKDcpzqjum/NccrZtUPQLGk0MAQ==");
+}
+
+TEST(NebulasTransaction, htmlescape) {
+    // test for escaped label
+    auto test = ("test&<>\x20\x28\x20\x29");
+    auto result = htmlescape(test);
+    ASSERT_EQ(result, "test\\u0026\\u003c\\u003e\\u2028\\u2029");
+}
+
+TEST(NebulasTransaction, serializeUnsigned) {
+    auto from = Address("n1V5bB2tbaM3FUiL4eRwpBLgEredS5C2wLY");
+    auto to = Address("n1SAeQRVn33bamxN4ehWUT7JGdxipwn8b17");
+    auto transaction = Transaction(
+        /* to: */ from,
+        /* nonce: */ 7,
+        /* gasPrice: */ 1000000,
+        /* gasLimit: */ 200000,
+        /* to: */ to,
+        /* amount: */ 11000000000000000000ULL,
+        /* timestamp: */ 1560052938,
+        /* payload: */ std::string());
+
+    ASSERT_THROW(transaction.serializeToRaw(), std::logic_error);
+}
+
+} // namespace TW::Nebulas::tests
diff --git a/tests/chains/Neon/TWCoinTypeTests.cpp b/tests/chains/Neon/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..d0a506e4119
--- /dev/null
+++ b/tests/chains/Neon/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNeonCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeNeon;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x77d86af2c6f02f14ef13ca52bf54864d92fcc4b32d8e884e225061c006738ed6"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xfa4a8650e7bebb918859c280a86f9661bed29877"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "neon");
+    assertStringsEqual(name, "Neon");
+    assertStringsEqual(symbol, "NEON");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "245022934");
+    assertStringsEqual(txUrl, "https://neonscan.org/tx/0x77d86af2c6f02f14ef13ca52bf54864d92fcc4b32d8e884e225061c006738ed6");
+    assertStringsEqual(accUrl, "https://neonscan.org/address/0xfa4a8650e7bebb918859c280a86f9661bed29877");
+}
diff --git a/tests/chains/Nervos/AddressTests.cpp b/tests/chains/Nervos/AddressTests.cpp
new file mode 100644
index 00000000000..4ff4d1246d5
--- /dev/null
+++ b/tests/chains/Nervos/AddressTests.cpp
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HDWallet.h"
+#include "HexCoding.h"
+#include "Nervos/Address.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+namespace TW::Nervos::tests {
+
+TEST(NervosAddress, Valid) {
+    ASSERT_TRUE(Address::isValid("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
+                                 "rg8furras980hksatlslfaktks7epf25"));
+    ASSERT_TRUE(Address::isValid("ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt6"));
+    ASSERT_TRUE(Address::isValid("ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3394p3wg6"
+                                 "p60qclvpfmaa582lu860dja5h0fk0v"));
+}
+
+TEST(NervosAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9"
+                                  "erg8furras980hksatlslfaktks7epf26"));
+    ASSERT_FALSE(Address::isValid("ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt7"));
+    ASSERT_FALSE(Address::isValid("ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3394p3wg"
+                                  "6p60qclvpfmaa582lu860dja5h0fk0w"));
+}
+
+TEST(NervosAddress, FromPrivateKey) {
+    auto privateKey =
+        PrivateKey(parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb"));
+    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
+    ASSERT_EQ(address.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
+                                "g8furras980hksatlslfaktks7epf25");
+}
+
+TEST(NervosAddress, FromPublicKey) {
+    auto publicKey =
+        PublicKey(parse_hex("026c9e4cbb95d4b3a123c1fc80795feacc38029683a1b3e16bccf49bba25fb2858"),
+                  TWPublicKeyTypeSECP256k1);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
+                                "g8furras980hksatlslfaktks7epf25");
+}
+
+TEST(NervosAddress, FromString) {
+    auto address1 = Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8fu"
+                            "rras980hksatlslfaktks7epf25");
+    ASSERT_EQ(address1.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
+                                 "rg8furras980hksatlslfaktks7epf25");
+    auto address2 = Address("ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt6");
+    ASSERT_EQ(address2.string(), "ckb1qyqvfdgvtjxswncx8mq2wl0dp6hlp7nmvhdqcecnt6");
+    auto address3 = Address("ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3394p3wg6p60qc"
+                            "lvpfmaa582lu860dja5h0fk0v");
+    ASSERT_EQ(address3.string(), "ckb1qjda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xw3394p3wg6"
+                                 "p60qclvpfmaa582lu860dja5h0fk0v");
+}
+
+TEST(TWNervosAddress, AddressFromPublicKey) {
+    auto privateKey =
+        PrivateKey(parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb"));
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    ASSERT_EQ(publicKey.bytes.size(), 33ul);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
+                                "g8furras980hksatlslfaktks7epf25");
+}
+
+TEST(NervosAddress, AddressFromString) {
+    auto address = Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8fur"
+                           "ras980hksatlslfaktks7epf25");
+    ASSERT_EQ(address.string(), "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
+                                "g8furras980hksatlslfaktks7epf25");
+}
+
+TEST(NervosAddress, AddressFromWallet) {
+    auto hdWallet = HDWallet(
+        "alpha draw toss question picnic endless recycle wrong enable roast success palm", "");
+    auto addressString = hdWallet.deriveAddress(TWCoinTypeNervos);
+    ASSERT_EQ(addressString, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8f"
+                             "urras980hksatlslfaktks7epf25");
+}
+
+} // namespace TW::Nervos::tests
diff --git a/tests/chains/Nervos/SignerTests.cpp b/tests/chains/Nervos/SignerTests.cpp
new file mode 100644
index 00000000000..af862b5f84a
--- /dev/null
+++ b/tests/chains/Nervos/SignerTests.cpp
@@ -0,0 +1,927 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Nervos/Address.h"
+#include "Nervos/Cell.h"
+#include "Nervos/Serialization.h"
+#include "Nervos/Signer.h"
+#include "Nervos/Transaction.h"
+#include "Nervos/TransactionPlan.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Nervos::tests {
+
+std::vector<PrivateKey> getPrivateKeys(Proto::SigningInput& input) {
+    std::vector<PrivateKey> privateKeys;
+    privateKeys.reserve(input.private_key_size());
+    for (auto&& privateKey : input.private_key()) {
+        privateKeys.emplace_back(privateKey);
+    }
+    return privateKeys;
+}
+
+Proto::SigningInput getInput1() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_native_transfer();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
+                             "wectaumxn0664yw2jd53lqk4mxg3");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
+                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
+    operation.set_amount(10000000000);
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(100000000000);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"), 1)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(20000000000);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"), 0)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
+
+    return input;
+}
+
+void checkOutput1(Transaction& tx) {
+    // https://explorer.nervos.org/transaction/0xf2c32afde7e72011985583873bc16c0a3c01fc01fc161eb4b914fcf84c53cdf8
+    ASSERT_EQ(tx.hash(),
+              parse_hex("f2c32afde7e72011985583873bc16c0a3c01fc01fc161eb4b914fcf84c53cdf8"));
+
+    ASSERT_EQ(tx.cellDeps.size(), 1ul);
+
+    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
+              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
+    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
+
+    ASSERT_EQ(tx.headerDeps.size(), 0ul);
+
+    ASSERT_EQ(tx.inputs.size(), 1ul);
+
+    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
+              parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"));
+    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[0].since, 0ul);
+
+    ASSERT_EQ(tx.outputs.size(), 2ul);
+    ASSERT_EQ(tx.outputsData.size(), 2ul);
+
+    ASSERT_EQ(tx.outputs[0].capacity, 10000000000ul);
+    ASSERT_EQ(tx.outputs[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
+    ASSERT_EQ(tx.outputs[0].type.codeHash.size(), 0ul);
+    ASSERT_EQ(tx.outputs[0].type.args.size(), 0ul);
+    ASSERT_EQ(tx.outputsData[0].size(), 0ul);
+
+    ASSERT_EQ(tx.outputs[1].capacity, 9999999536ul);
+    ASSERT_EQ(tx.outputs[1].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
+    ASSERT_EQ(tx.outputs[1].type.codeHash.size(), 0ul);
+    ASSERT_EQ(tx.outputs[1].type.args.size(), 0ul);
+    ASSERT_EQ(tx.outputsData[1].size(), 0ul);
+
+    ASSERT_EQ(tx.serializedWitnesses.size(), 1ul);
+    ASSERT_EQ(
+        hex(tx.serializedWitnesses[0]),
+        "55000000100000005500000055000000410000002a9ef2ad7829e5ea0c7a32735d29a0cb2ec20434f6fd5bf6e2"
+        "9cda56b28e08140156191cbbf80313d3c9cae4b74607acce7b28eb21d52ef058ed8491cdde70b700");
+}
+
+void checkPlan1(TransactionPlan& txPlan) {
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+
+    ASSERT_EQ(txPlan.cellDeps.size(), 1ul);
+
+    ASSERT_EQ(txPlan.cellDeps[0].outPoint.txHash,
+              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
+    ASSERT_EQ(txPlan.cellDeps[0].outPoint.index, 0ul);
+    ASSERT_EQ(txPlan.cellDeps[0].depType, DepType::DepGroup);
+
+    ASSERT_EQ(txPlan.headerDeps.size(), 0ul);
+
+    ASSERT_EQ(txPlan.selectedCells.size(), 1ul);
+
+    ASSERT_EQ(txPlan.selectedCells[0].outPoint.txHash,
+              parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"));
+    ASSERT_EQ(txPlan.selectedCells[0].outPoint.index, 0ul);
+    ASSERT_EQ(txPlan.selectedCells[0].capacity, 20000000000ul);
+    ASSERT_EQ(txPlan.selectedCells[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(txPlan.selectedCells[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(txPlan.selectedCells[0].lock.args,
+              parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
+    ASSERT_EQ(txPlan.selectedCells[0].type.codeHash.size(), 0ul);
+    ASSERT_EQ(txPlan.selectedCells[0].type.args.size(), 0ul);
+    ASSERT_EQ(txPlan.selectedCells[0].data.size(), 0ul);
+
+    ASSERT_EQ(txPlan.outputs.size(), 2ul);
+    ASSERT_EQ(txPlan.outputsData.size(), 2ul);
+
+    ASSERT_EQ(txPlan.outputs[0].capacity, 10000000000ul);
+    ASSERT_EQ(txPlan.outputs[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(txPlan.outputs[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(txPlan.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
+    ASSERT_EQ(txPlan.outputs[0].type.codeHash.size(), 0ul);
+    ASSERT_EQ(txPlan.outputs[0].type.args.size(), 0ul);
+    ASSERT_EQ(txPlan.outputsData[0].size(), 0ul);
+
+    ASSERT_EQ(txPlan.outputs[1].capacity, 9999999536ul);
+    ASSERT_EQ(txPlan.outputs[1].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(txPlan.outputs[1].lock.hashType, HashType::Type1);
+    ASSERT_EQ(txPlan.outputs[1].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
+    ASSERT_EQ(txPlan.outputs[1].type.codeHash.size(), 0ul);
+    ASSERT_EQ(txPlan.outputs[1].type.args.size(), 0ul);
+    ASSERT_EQ(txPlan.outputsData[1].size(), 0ul);
+}
+
+TEST(NervosSigner, PlanAndSign_Native_Simple) {
+    auto input = getInput1();
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+    checkPlan1(txPlan);
+    Transaction tx;
+    tx.build(txPlan);
+    auto error = tx.sign(getPrivateKeys(input));
+    ASSERT_EQ(error, Common::Proto::SigningError::OK);
+    checkOutput1(tx);
+}
+
+TEST(NervosSigner, Sign_NegativeMissingKey) {
+    auto input = getInput1();
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+    Transaction tx;
+    tx.build(txPlan);
+    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61fec");
+    *input.mutable_private_key(0) = std::string(privateKey.begin(), privateKey.end());
+    auto error = tx.sign(getPrivateKeys(input));
+    ASSERT_EQ(error, Common::Proto::Error_missing_private_key);
+}
+
+TEST(NervosSigner, Sign_NegativeNotEnoughUtxos) {
+    auto input = getInput1();
+    auto& operation = *input.mutable_native_transfer();
+    operation.set_amount(1000000000000);
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::Error_not_enough_utxos);
+}
+
+Proto::SigningInput getInput2() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_native_transfer();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
+                             "wectaumxn0664yw2jd53lqk4mxg3");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
+                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
+    operation.set_use_max_amount(true);
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(11410040620);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("c75567c80dc9b97aaf4e5c23f4c7f37b077f2b33a50dd7abd952abfbd5beb247"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
+
+    return input;
+}
+
+TEST(NervosSigner, Sign_Native_SendMaximum) {
+    auto input = getInput2();
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+    Transaction tx;
+    tx.build(txPlan);
+    auto error = tx.sign(getPrivateKeys(input));
+
+    ASSERT_EQ(error, Common::Proto::SigningError::OK);
+
+    // https://explorer.nervos.org/transaction/0x298f5e04b6900796614b89062eb96cec63c3b2c460d01058736a793b567bc5c8
+    ASSERT_EQ(tx.hash(),
+              parse_hex("298f5e04b6900796614b89062eb96cec63c3b2c460d01058736a793b567bc5c8"));
+
+    ASSERT_EQ(tx.cellDeps.size(), 1ul);
+
+    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
+              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
+    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
+
+    ASSERT_EQ(tx.headerDeps.size(), 0ul);
+
+    ASSERT_EQ(tx.inputs.size(), 1ul);
+
+    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
+              parse_hex("c75567c80dc9b97aaf4e5c23f4c7f37b077f2b33a50dd7abd952abfbd5beb247"));
+    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[0].since, 0ul);
+
+    ASSERT_EQ(tx.outputs.size(), 1ul);
+    ASSERT_EQ(tx.outputsData.size(), 1ul);
+
+    ASSERT_EQ(tx.outputs[0].capacity, 11410040265ul);
+    ASSERT_EQ(tx.outputs[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
+    ASSERT_EQ(tx.outputs[0].type.codeHash.size(), 0ul);
+    ASSERT_EQ(tx.outputs[0].type.args.size(), 0ul);
+    ASSERT_EQ(tx.outputsData[0].size(), 0ul);
+
+    ASSERT_EQ(tx.serializedWitnesses.size(), 1ul);
+    ASSERT_EQ(
+        hex(tx.serializedWitnesses[0]),
+        "5500000010000000550000005500000041000000daf6e65e5a1fe447a4feb7199886b6635c44738e04ea594576"
+        "08fb1c447e068026529d57b02014ddc144622f886153df426853f22083f8891461eeb50b5ce97d01");
+}
+
+Proto::SigningInput getInput3() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_sudt_transfer();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
+                             "wectaumxn0664yw2jd53lqk4mxg3");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
+                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
+    uint256_t amount = 1000000000000000;
+    operation.set_amount(toString(amount));
+    input.set_byte_fee(1);
+    auto sudtAddress =
+        parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8");
+    *operation.mutable_sudt_address() = std::string(sudtAddress.begin(), sudtAddress.end());
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(14399998906);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("5b12911e7413e011f251c1fb5fae4e76fd5fcae4f0d4c6412dcc5b0bfcece823"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(14400000000);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("e118bd11a73d381daf288381ce182d92b6cf2f52d25886bbda9e1a61525c7c4a"), 0)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+    *cell2.mutable_type() =
+        Script(parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"),
+               HashType::Type1,
+               parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"))
+            .proto();
+    auto cell2Data = parse_hex("00e0e4c9b9f84f000000000000000000");
+    *cell2.mutable_data() = std::string(cell2Data.begin(), cell2Data.end());
+
+    auto& cell3 = *input.add_cell();
+    cell3.set_capacity(8210025567);
+    *cell3.mutable_out_point() =
+        OutPoint(parse_hex("09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a"), 1)
+            .proto();
+    *cell3.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqds6ed78yze6eyfyvd537z66ur22c9mmrgz82ama"))
+                                .proto();
+
+    auto privateKey1 =
+        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
+    auto privateKey2 =
+        parse_hex("0c8859a9d9084a8c2b55963268b352e258756f9240f2a1f4645c610ed191dae9");
+    input.add_private_key(std::string(privateKey2.begin(), privateKey2.end()));
+
+    return input;
+}
+
+TEST(NervosSigner, Sign_SUDT_Simple) {
+    auto input = getInput3();
+
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+    Transaction tx;
+    tx.build(txPlan);
+    auto error = tx.sign(getPrivateKeys(input));
+
+    ASSERT_EQ(error, Common::Proto::SigningError::OK);
+
+    // https://explorer.nervos.org/transaction/0x9b15f2bea26b98201540d8e20e8b1c21d96dd77ad246520b405c6aabb7173371
+    ASSERT_EQ(tx.hash(),
+              parse_hex("9b15f2bea26b98201540d8e20e8b1c21d96dd77ad246520b405c6aabb7173371"));
+
+    ASSERT_EQ(tx.cellDeps.size(), 2ul);
+
+    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
+              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
+    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
+
+    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
+              parse_hex("c7813f6a415144643970c2e88e0bb6ca6a8edc5dd7c1022746f628284a9936d5"));
+    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
+
+    ASSERT_EQ(tx.headerDeps.size(), 0ul);
+
+    ASSERT_EQ(tx.inputs.size(), 3ul);
+
+    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
+              parse_hex("e118bd11a73d381daf288381ce182d92b6cf2f52d25886bbda9e1a61525c7c4a"));
+    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[0].since, 0ul);
+
+    ASSERT_EQ(tx.inputs[1].previousOutput.txHash,
+              parse_hex("09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a"));
+    ASSERT_EQ(tx.inputs[1].previousOutput.index, 1ul);
+    ASSERT_EQ(tx.inputs[1].since, 0ul);
+
+    ASSERT_EQ(tx.inputs[2].previousOutput.txHash,
+              parse_hex("5b12911e7413e011f251c1fb5fae4e76fd5fcae4f0d4c6412dcc5b0bfcece823"));
+    ASSERT_EQ(tx.inputs[2].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[2].since, 0ul);
+
+    ASSERT_EQ(tx.outputs.size(), 3ul);
+    ASSERT_EQ(tx.outputsData.size(), 3ul);
+
+    ASSERT_EQ(tx.outputs[0].capacity, 14400000000ul);
+    ASSERT_EQ(tx.outputs[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
+    ASSERT_EQ(tx.outputs[0].type.codeHash,
+              parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"));
+    ASSERT_EQ(tx.outputs[0].type.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].type.args,
+              parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"));
+    ASSERT_EQ(hex(tx.outputsData[0]), "0080c6a47e8d03000000000000000000");
+
+    ASSERT_EQ(tx.outputs[1].capacity, 14400000000ul);
+    ASSERT_EQ(tx.outputs[1].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
+    ASSERT_EQ(tx.outputs[1].type.codeHash,
+              parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"));
+    ASSERT_EQ(tx.outputs[1].type.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[1].type.args,
+              parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"));
+    ASSERT_EQ(hex(tx.outputsData[1]), "00601e253b6b4c000000000000000000");
+
+    ASSERT_EQ(tx.outputs[2].capacity, 8210023387ul);
+    ASSERT_EQ(tx.outputs[2].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[2].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[2].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
+    ASSERT_EQ(tx.outputs[2].type.codeHash.size(), 0ul);
+    ASSERT_EQ(tx.outputs[2].type.args.size(), 0ul);
+    ASSERT_EQ(tx.outputsData[2].size(), 0ul);
+
+    ASSERT_EQ(tx.serializedWitnesses.size(), 3ul);
+    ASSERT_EQ(
+        hex(tx.serializedWitnesses[0]),
+        "550000001000000055000000550000004100000035d55fd46316f248552eb6af7ac9589c9ec533c4e5b71896b0"
+        "5cdf697e2d18551ceff54d7b860ebb2f4dd5f6c5bb4af1da15460a7621f5aa4bc7d5585a0504de00");
+    ASSERT_EQ(
+        hex(tx.serializedWitnesses[1]),
+        "5500000010000000550000005500000041000000eaa4bf69126d3016ab786610f2f0668b2ef353915d623d0b01"
+        "84fc25cec3dcad6dc08a1504a2d7dd9faced17b041d79d4c21f1977e57859713360f5e3609583501");
+    ASSERT_EQ(hex(tx.serializedWitnesses[2]), "");
+}
+
+Proto::SigningInput getInput4() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_sudt_transfer();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
+                             "wectaumxn0664yw2jd53lqk4mxg3");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
+                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
+    operation.set_use_max_amount(true);
+    input.set_byte_fee(1);
+    auto sudtAddress =
+        parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8");
+    *operation.mutable_sudt_address() = std::string(sudtAddress.begin(), sudtAddress.end());
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(8210026306);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("430cb60ee816e2631d6d9605659c18fec8eb3de94526f5fd4ad51feaad6f1664"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(14400000000);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("378b6bd2f7fc2b1599ee55be7e8fa17fdd6e0d25e2e146d5f46006e0292d6564"), 0)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+    *cell2.mutable_type() =
+        Script(parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"),
+               HashType::Type1,
+               parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"))
+            .proto();
+    auto cell2Data = parse_hex("00601e253b6b4c000000000000000000");
+    *cell2.mutable_data() = std::string(cell2Data.begin(), cell2Data.end());
+
+    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
+
+    return input;
+}
+
+TEST(NervosSigner, Sign_SUDT_SendMaximum) {
+    auto input = getInput4();
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+    Transaction tx;
+    tx.build(txPlan);
+    auto error = tx.sign(getPrivateKeys(input));
+
+    ASSERT_EQ(error, Common::Proto::SigningError::OK);
+
+    // https://explorer.nervos.org/transaction/0x09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a
+    ASSERT_EQ(tx.hash(),
+              parse_hex("09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a"));
+
+    ASSERT_EQ(tx.cellDeps.size(), 2ul);
+
+    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
+              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
+    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
+
+    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
+              parse_hex("c7813f6a415144643970c2e88e0bb6ca6a8edc5dd7c1022746f628284a9936d5"));
+    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
+
+    ASSERT_EQ(tx.headerDeps.size(), 0ul);
+
+    ASSERT_EQ(tx.inputs.size(), 2ul);
+
+    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
+              parse_hex("378b6bd2f7fc2b1599ee55be7e8fa17fdd6e0d25e2e146d5f46006e0292d6564"));
+    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[0].since, 0ul);
+
+    ASSERT_EQ(tx.inputs[1].previousOutput.txHash,
+              parse_hex("430cb60ee816e2631d6d9605659c18fec8eb3de94526f5fd4ad51feaad6f1664"));
+    ASSERT_EQ(tx.inputs[1].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[1].since, 0ul);
+
+    ASSERT_EQ(tx.outputs.size(), 2ul);
+    ASSERT_EQ(tx.outputsData.size(), 2ul);
+
+    ASSERT_EQ(tx.outputs[0].capacity, 14400000000ul);
+    ASSERT_EQ(tx.outputs[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
+    ASSERT_EQ(tx.outputs[0].type.codeHash,
+              parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"));
+    ASSERT_EQ(tx.outputs[0].type.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].type.args,
+              parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"));
+    ASSERT_EQ(hex(tx.outputsData[0]), "00601e253b6b4c000000000000000000");
+
+    ASSERT_EQ(tx.outputs[1].capacity, 8210025567ul);
+    ASSERT_EQ(tx.outputs[1].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
+    ASSERT_EQ(tx.outputs[1].type.codeHash.size(), 0ul);
+    ASSERT_EQ(tx.outputs[1].type.args.size(), 0ul);
+    ASSERT_EQ(tx.outputsData[1].size(), 0ul);
+
+    ASSERT_EQ(tx.serializedWitnesses.size(), 2ul);
+    ASSERT_EQ(
+        hex(tx.serializedWitnesses[0]),
+        "5500000010000000550000005500000041000000da7c908bdf2cb091b7ff9bb682b762d1323c5e1ecf9b2ce0eb"
+        "edb9d55f6625c52ab14910ae401833112f2ea516ab11bc9ef691c3dff7886e3238c9348c3d73a701");
+    ASSERT_EQ(hex(tx.serializedWitnesses[1]), "");
+}
+
+Proto::SigningInput getInput5() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_dao_deposit();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8f"
+                             "urras980hksatlslfaktks7epf25");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
+                                 "rg8furras980hksatlslfaktks7epf25");
+
+    operation.set_amount(10200000000);
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(8210021909);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("c7dacd4aab49f5f9643e87752428cebde38eeb49c7726781c4d8b526822004a1"), 1)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqds6ed78yze6eyfyvd537z66ur22c9mmrgz82ama"))
+                                .proto();
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(14399998167);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("d3c3263170815b326779e2fd8d548f846ae13eff9d9a82833c7071069a1d32bf"), 0)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto privateKey1 =
+        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
+    auto privateKey2 =
+        parse_hex("0c8859a9d9084a8c2b55963268b352e258756f9240f2a1f4645c610ed191dae9");
+    input.add_private_key(std::string(privateKey2.begin(), privateKey2.end()));
+
+    return input;
+}
+
+TEST(NervosSigner, Sign_DAO_Deposit) {
+    auto input = getInput5();
+
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+    Transaction tx;
+    tx.build(txPlan);
+    auto error = tx.sign(getPrivateKeys(input));
+
+    ASSERT_EQ(error, Common::Proto::SigningError::OK);
+
+    // https://explorer.nervos.org/transaction/0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683
+    ASSERT_EQ(tx.hash(),
+              parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"));
+
+    ASSERT_EQ(tx.cellDeps.size(), 2ul);
+
+    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
+              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
+    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
+
+    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
+              parse_hex("e2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c"));
+    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 2ul);
+    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
+
+    ASSERT_EQ(tx.headerDeps.size(), 0ul);
+
+    ASSERT_EQ(tx.inputs.size(), 2ul);
+
+    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
+              parse_hex("c7dacd4aab49f5f9643e87752428cebde38eeb49c7726781c4d8b526822004a1"));
+    ASSERT_EQ(tx.inputs[0].previousOutput.index, 1ul);
+    ASSERT_EQ(tx.inputs[0].since, 0ul);
+
+    ASSERT_EQ(tx.inputs[1].previousOutput.txHash,
+              parse_hex("d3c3263170815b326779e2fd8d548f846ae13eff9d9a82833c7071069a1d32bf"));
+    ASSERT_EQ(tx.inputs[1].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[1].since, 0ul);
+
+    ASSERT_EQ(tx.outputs.size(), 2ul);
+    ASSERT_EQ(tx.outputsData.size(), 2ul);
+
+    ASSERT_EQ(tx.outputs[0].capacity, 10200000000ul);
+    ASSERT_EQ(tx.outputs[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
+    ASSERT_EQ(tx.outputs[0].type.codeHash,
+              parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"));
+    ASSERT_EQ(tx.outputs[0].type.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].type.args, parse_hex(""));
+    ASSERT_EQ(hex(tx.outputsData[0]), "0000000000000000");
+
+    ASSERT_EQ(tx.outputs[1].capacity, 12410019377ul);
+    ASSERT_EQ(tx.outputs[1].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
+    ASSERT_EQ(tx.outputs[1].type.codeHash.size(), 0ul);
+    ASSERT_EQ(tx.outputs[1].type.args.size(), 0ul);
+    ASSERT_EQ(tx.outputsData[1].size(), 0ul);
+
+    ASSERT_EQ(tx.serializedWitnesses.size(), 2ul);
+    ASSERT_EQ(
+        hex(tx.serializedWitnesses[0]),
+        "5500000010000000550000005500000041000000305d09c7de3f34a4d53bc4e0031ee59c95b9abc4fc3ff5548e"
+        "1a17ca726c069a232012c9c4be6ec4d4ffbe88613ca5e686e3e4b7d0b9bbd7038003e23ffdcdd601");
+    ASSERT_EQ(
+        hex(tx.serializedWitnesses[1]),
+        "55000000100000005500000055000000410000007c514c77482dd1e1086f41a6d17364c9b5ed16364d61df6f7f"
+        "d8540f8bf7c131275c877943786b1b72fbf4f9d817ee5dd554a689808b7919543c691b5068e5be01");
+}
+
+Proto::SigningInput getInput6() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_dao_withdraw_phase1();
+
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
+                                 "rg8furras980hksatlslfaktks7epf25");
+    auto& depositCell = *operation.mutable_deposit_cell();
+    depositCell.set_capacity(10200000000);
+    *depositCell.mutable_out_point() =
+        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
+            .proto();
+    *depositCell.mutable_lock() =
+        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
+                       "80hksatlslfaktks7epf25"))
+            .proto();
+    *depositCell.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto depositCellData = parse_hex("0000000000000000");
+    *depositCell.mutable_data() = std::string(depositCellData.begin(), depositCellData.end());
+    depositCell.set_block_number(7575466);
+    auto blockHashData =
+        parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a");
+    *depositCell.mutable_block_hash() = std::string(blockHashData.begin(), blockHashData.end());
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(10200000000);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+    *cell1.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto cell1Data = parse_hex("0000000000000000");
+    *cell1.mutable_data() = std::string(cell1Data.begin(), cell1Data.end());
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(12410019377);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 1)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto privateKey1 =
+        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
+
+    return input;
+}
+
+TEST(NervosSigner, Sign_DAO_Withdraw_Phase1) {
+    auto input = getInput6();
+
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+    Transaction tx;
+    tx.build(txPlan);
+    auto error = tx.sign(getPrivateKeys(input));
+
+    ASSERT_EQ(error, Common::Proto::SigningError::OK);
+
+    // https://explorer.nervos.org/transaction/0xb4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca
+    ASSERT_EQ(tx.hash(),
+              parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"));
+
+    ASSERT_EQ(tx.cellDeps.size(), 2ul);
+
+    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
+              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
+    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
+
+    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
+              parse_hex("e2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c"));
+    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 2ul);
+    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
+
+    ASSERT_EQ(tx.headerDeps.size(), 1ul);
+    ASSERT_EQ(tx.headerDeps[0],
+              parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a"));
+
+    ASSERT_EQ(tx.inputs.size(), 2ul);
+
+    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
+              parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"));
+    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[0].since, 0ul);
+
+    ASSERT_EQ(tx.inputs[1].previousOutput.txHash,
+              parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"));
+    ASSERT_EQ(tx.inputs[1].previousOutput.index, 1ul);
+    ASSERT_EQ(tx.inputs[1].since, 0ul);
+
+    ASSERT_EQ(tx.outputs.size(), 2ul);
+    ASSERT_EQ(tx.outputsData.size(), 2ul);
+
+    ASSERT_EQ(tx.outputs[0].capacity, 10200000000ul);
+    ASSERT_EQ(tx.outputs[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
+    ASSERT_EQ(tx.outputs[0].type.codeHash,
+              parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"));
+    ASSERT_EQ(tx.outputs[0].type.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].type.args, parse_hex(""));
+    ASSERT_EQ(hex(tx.outputsData[0]), "aa97730000000000");
+
+    ASSERT_EQ(tx.outputs[1].capacity, 12410018646ul);
+    ASSERT_EQ(tx.outputs[1].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[1].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[1].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
+    ASSERT_EQ(tx.outputs[1].type.codeHash.size(), 0ul);
+    ASSERT_EQ(tx.outputs[1].type.args.size(), 0ul);
+    ASSERT_EQ(tx.outputsData[1].size(), 0ul);
+
+    ASSERT_EQ(tx.serializedWitnesses.size(), 2ul);
+    ASSERT_EQ(
+        hex(tx.serializedWitnesses[0]),
+        "5500000010000000550000005500000041000000d5131c1a6b8eca11e2c280b72c5db09ea00bb788fd3262eace"
+        "d861c39db2aad04a36f9d174b6f167a9c98b85d2bccf537a163c44459d23467dfa86408f48dd5f01");
+    ASSERT_EQ(tx.serializedWitnesses[1].size(), 0ul);
+}
+
+Proto::SigningInput getInput7() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_dao_withdraw_phase2();
+
+    auto& depositCell = *operation.mutable_deposit_cell();
+    depositCell.set_capacity(10200000000);
+    *depositCell.mutable_out_point() =
+        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
+            .proto();
+    *depositCell.mutable_lock() =
+        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
+                       "80hksatlslfaktks7epf25"))
+            .proto();
+    *depositCell.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto depositCellData = parse_hex("0000000000000000");
+    *depositCell.mutable_data() = std::string(depositCellData.begin(), depositCellData.end());
+    depositCell.set_block_number(7575466);
+    auto blockHashData1 =
+        parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a");
+    *depositCell.mutable_block_hash() = std::string(blockHashData1.begin(), blockHashData1.end());
+
+    auto& withdrawingCell = *operation.mutable_withdrawing_cell();
+    withdrawingCell.set_capacity(10200000000);
+    *withdrawingCell.mutable_out_point() =
+        OutPoint(parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"), 0)
+            .proto();
+    *withdrawingCell.mutable_lock() =
+        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
+                       "80hksatlslfaktks7epf25"))
+            .proto();
+    *withdrawingCell.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto withdrawingCellData = parse_hex("aa97730000000000");
+    *withdrawingCell.mutable_data() =
+        std::string(withdrawingCellData.begin(), withdrawingCellData.end());
+    withdrawingCell.set_block_number(7575534);
+    auto blockHashData2 =
+        parse_hex("b070d5364afd47c23fe267077d454009d6f665f200a915e68af1616e46f4aa52");
+    *withdrawingCell.mutable_block_hash() =
+        std::string(blockHashData2.begin(), blockHashData2.end());
+    withdrawingCell.set_since(0x20037c0000001731);
+
+    operation.set_amount(10200000000);
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(10200000000);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+    *cell1.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto cell1Data = parse_hex("aa97730000000000");
+    *cell1.mutable_data() = std::string(cell1Data.begin(), cell1Data.end());
+
+    auto privateKey1 =
+        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
+
+    return input;
+}
+
+TEST(NervosSigner, Sign_DAO_Withdraw_Phase2) {
+    auto input = getInput7();
+
+    TransactionPlan txPlan;
+    txPlan.plan(input);
+    ASSERT_EQ(txPlan.error, Common::Proto::SigningError::OK);
+    Transaction tx;
+    tx.build(txPlan);
+    auto error = tx.sign(getPrivateKeys(input));
+
+    ASSERT_EQ(error, Common::Proto::SigningError::OK);
+
+    ASSERT_EQ(tx.hash(),
+              parse_hex("4fde13c93fc5d24ab7f660070aaa0b1725809d585f6258605e595cdbd856ea1c"));
+
+    ASSERT_EQ(tx.cellDeps.size(), 2ul);
+
+    ASSERT_EQ(tx.cellDeps[0].outPoint.txHash,
+              parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c"));
+    ASSERT_EQ(tx.cellDeps[0].outPoint.index, 0ul);
+    ASSERT_EQ(tx.cellDeps[0].depType, DepType::DepGroup);
+
+    ASSERT_EQ(tx.cellDeps[1].outPoint.txHash,
+              parse_hex("e2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c"));
+    ASSERT_EQ(tx.cellDeps[1].outPoint.index, 2ul);
+    ASSERT_EQ(tx.cellDeps[1].depType, DepType::Code);
+
+    ASSERT_EQ(tx.headerDeps.size(), 2ul);
+    ASSERT_EQ(tx.headerDeps[0],
+              parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a"));
+    ASSERT_EQ(tx.headerDeps[1],
+              parse_hex("b070d5364afd47c23fe267077d454009d6f665f200a915e68af1616e46f4aa52"));
+
+    ASSERT_EQ(tx.inputs.size(), 1ul);
+
+    ASSERT_EQ(tx.inputs[0].previousOutput.txHash,
+              parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"));
+    ASSERT_EQ(tx.inputs[0].previousOutput.index, 0ul);
+    ASSERT_EQ(tx.inputs[0].since, 0x20037c0000001731ul);
+
+    ASSERT_EQ(tx.outputs.size(), 1ul);
+    ASSERT_EQ(tx.outputsData.size(), 1ul);
+
+    ASSERT_EQ(tx.outputs[0].capacity, 10199999532ul);
+    ASSERT_EQ(tx.outputs[0].lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(tx.outputs[0].lock.hashType, HashType::Type1);
+    ASSERT_EQ(tx.outputs[0].lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
+    ASSERT_EQ(tx.outputs[0].type.codeHash.size(), 0ul);
+    ASSERT_EQ(tx.outputs[0].type.args.size(), 0ul);
+    ASSERT_EQ(tx.outputsData[0].size(), 0ul);
+
+    ASSERT_EQ(tx.serializedWitnesses.size(), 1ul);
+    ASSERT_EQ(hex(tx.serializedWitnesses[0]),
+              "6100000010000000550000006100000041000000743f86c5557f4e2d3327f4d17e7bad27209b29c1e9cd"
+              "bab42ab03f7094af917b4b203ddd7f2e87102e09ae579f2fe7f6adb7900b7386b58c1183ba0011b7c421"
+              "00080000000000000000000000");
+}
+
+} // namespace TW::Nervos::tests
diff --git a/tests/chains/Nervos/TWAnyAddressTests.cpp b/tests/chains/Nervos/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..be1c5f92e01
--- /dev/null
+++ b/tests/chains/Nervos/TWAnyAddressTests.cpp
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "PrivateKey.h"
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWData.h>
+#include <TrustWalletCore/TWHDWallet.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+#include <TrustWalletCore/TWPublicKey.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWAnyAddressNervos, AddressFromPublicKey) {
+    auto privateKey =
+        WRAP(TWPrivateKey,
+             TWPrivateKeyCreateWithData(
+                 DATA("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb").get()));
+    ASSERT_NE(nullptr, privateKey.get());
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+    ASSERT_NE(nullptr, publicKey.get());
+    ASSERT_EQ(33ul, publicKey.get()->impl.bytes.size());
+    auto address =
+        WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeNervos));
+    auto addressString = WRAPS(TWAnyAddressDescription(address.get()));
+    assertStringsEqual(addressString, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwy"
+                                      "k5x9erg8furras980hksatlslfaktks7epf25");
+}
+
+TEST(TWAnyAddressNervos, AddressFromString) {
+    auto address =
+        WRAP(TWAnyAddress,
+             TWAnyAddressCreateWithString(STRING("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthy"
+                                                 "waa50xwsqwyk5x9erg8furras980hksatlslfaktks7epf25")
+                                              .get(),
+                                          TWCoinTypeNervos));
+    ASSERT_NE(nullptr, address.get());
+    auto addressString = WRAPS(TWAnyAddressDescription(address.get()));
+    assertStringsEqual(addressString, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwy"
+                                      "k5x9erg8furras980hksatlslfaktks7epf25");
+}
+
+TEST(TWAnyAddressNervos, AddressFromWallet) {
+    auto wallet = WRAP(
+        TWHDWallet,
+        TWHDWalletCreateWithMnemonic(
+            STRING(
+                "alpha draw toss question picnic endless recycle wrong enable roast success palm")
+                .get(),
+            STRING("").get()));
+    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKeyForCoin(wallet.get(), TWCoinTypeNervos));
+    auto privateKeyData = WRAPD(TWPrivateKeyData(privateKey.get()));
+    EXPECT_EQ(TWDataSize(privateKeyData.get()), 32ul);
+
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+    auto publicKeyData = WRAPD(TWPublicKeyData(publicKey.get()));
+    EXPECT_EQ(TWDataSize(publicKeyData.get()), 33ul);
+    assertHexEqual(publicKeyData,
+                   "026c9e4cbb95d4b3a123c1fc80795feacc38029683a1b3e16bccf49bba25fb2858");
+
+    auto address = WRAPS(TWCoinTypeDeriveAddress(TWCoinTypeNervos, privateKey.get()));
+    assertStringsEqual(address, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9er"
+                                "g8furras980hksatlslfaktks7epf25");
+}
diff --git a/tests/chains/Nervos/TWAnySignerTests.cpp b/tests/chains/Nervos/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..75b42c032f1
--- /dev/null
+++ b/tests/chains/Nervos/TWAnySignerTests.cpp
@@ -0,0 +1,663 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Nervos/Address.h"
+#include "Nervos/Serialization.h"
+#include "Nervos/TransactionPlan.h"
+#include "PublicKey.h"
+#include "proto/Nervos.pb.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Nervos::tests {
+
+Proto::SigningInput getAnySignerInput1() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_native_transfer();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
+                             "wectaumxn0664yw2jd53lqk4mxg3");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
+                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
+    operation.set_amount(10000000000);
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(100000000000);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"), 1)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(20000000000);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"), 0)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
+
+    return input;
+}
+
+void checkAnySignerOutput1(Proto::SigningOutput& output) {
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    // https://explorer.nervos.org/transaction/0xf2c32afde7e72011985583873bc16c0a3c01fc01fc161eb4b914fcf84c53cdf8
+    ASSERT_EQ(output.transaction_id(),
+              "0xf2c32afde7e72011985583873bc16c0a3c01fc01fc161eb4b914fcf84c53cdf8");
+    ASSERT_EQ(
+        output.transaction_json(),
+        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}}],\"header_deps\":"
+        "[],\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0x71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3\"},\"since\":\"0x0\"}"
+        "],\"outputs\":[{\"capacity\":\"0x2540be400\",\"lock\":{\"args\":"
+        "\"0xab201f55b02f53b385f79b34dfad548e549b48fc\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":null},{\"capacity\":\"0x2540be230\",\"lock\":{\"args\":"
+        "\"0xb0d65be39059d6489231b48f85ad706a560bbd8d\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x\",\"0x\"],\"version\":\"0x0\","
+        "\"witnesses\":["
+        "\"0x55000000100000005500000055000000410000002a9ef2ad7829e5ea0c7a32735d29a0cb2ec20434f6fd5b"
+        "f6e29cda56b28e08140156191cbbf80313d3c9cae4b74607acce7b28eb21d52ef058ed8491cdde70b700\"]}");
+}
+
+void checkPlan1(Proto::TransactionPlan& txPlanProto) {
+    ASSERT_EQ(txPlanProto.error(), Common::Proto::OK);
+
+    ASSERT_EQ(txPlanProto.cell_deps_size(), 1);
+
+    const auto cellDep1 = txPlanProto.cell_deps(0);
+    const auto cellDep1TxHash =
+        parse_hex("71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c");
+    ASSERT_EQ(cellDep1.out_point().tx_hash(),
+              std::string(cellDep1TxHash.begin(), cellDep1TxHash.end()));
+    ASSERT_EQ(cellDep1.out_point().index(), 0ul);
+    ASSERT_EQ(cellDep1.dep_type(), "dep_group");
+
+    ASSERT_EQ(txPlanProto.header_deps_size(), 0);
+
+    ASSERT_EQ(txPlanProto.selected_cells_size(), 1);
+
+    auto cell1 = Cell(txPlanProto.selected_cells(0));
+    ASSERT_EQ(cell1.outPoint.txHash,
+              parse_hex("71caea2d3ac9e3ea899643e3e67dd11eb587e7fe0d8c6e67255d0959fa0a1fa3"));
+    ASSERT_EQ(cell1.outPoint.index, 0ul);
+    ASSERT_EQ(cell1.capacity, 20000000000ul);
+    ASSERT_EQ(cell1.lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(cell1.lock.hashType, HashType::Type1);
+    ASSERT_EQ(cell1.lock.args, parse_hex("c4b50c5c8d074f063ec0a77ded0eaff0fa7b65da"));
+    ASSERT_EQ(cell1.type.codeHash.size(), 0ul);
+    ASSERT_EQ(cell1.type.args.size(), 0ul);
+    ASSERT_EQ(cell1.data.size(), 0ul);
+
+    ASSERT_EQ(txPlanProto.outputs_size(), 2);
+    ASSERT_EQ(txPlanProto.outputs_data_size(), 2);
+
+    auto cellOutput1 = CellOutput(txPlanProto.outputs(0));
+    ASSERT_EQ(cellOutput1.capacity, 10000000000ul);
+    ASSERT_EQ(cellOutput1.lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(cellOutput1.lock.hashType, HashType::Type1);
+    ASSERT_EQ(cellOutput1.lock.args, parse_hex("ab201f55b02f53b385f79b34dfad548e549b48fc"));
+    ASSERT_EQ(cellOutput1.type.codeHash.size(), 0ul);
+    ASSERT_EQ(cellOutput1.type.args.size(), 0ul);
+    ASSERT_EQ(txPlanProto.outputs_data(0).length(), 0ul);
+
+    auto cellOutput2 = CellOutput(txPlanProto.outputs(1));
+    ASSERT_EQ(cellOutput2.capacity, 9999999536ul);
+    ASSERT_EQ(cellOutput2.lock.codeHash,
+              parse_hex("9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8"));
+    ASSERT_EQ(cellOutput2.lock.hashType, HashType::Type1);
+    ASSERT_EQ(cellOutput2.lock.args, parse_hex("b0d65be39059d6489231b48f85ad706a560bbd8d"));
+    ASSERT_EQ(cellOutput2.type.codeHash.size(), 0ul);
+    ASSERT_EQ(cellOutput2.type.args.size(), 0ul);
+    ASSERT_EQ(txPlanProto.outputs_data(1).length(), 0ul);
+}
+
+TEST(TWAnySignerNervos, Sign_Native_Simple) {
+    auto input = getAnySignerInput1();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNervos);
+    checkAnySignerOutput1(output);
+}
+
+TEST(TWAnySignerNervos, PlanAndSign_Native_Simple) {
+    auto input = getAnySignerInput1();
+    Proto::TransactionPlan txPlanProto;
+    ANY_PLAN(input, txPlanProto, TWCoinTypeNervos);
+    checkPlan1(txPlanProto);
+    *input.mutable_plan() = txPlanProto;
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNervos);
+    checkAnySignerOutput1(output);
+}
+
+TEST(TWAnySignerNervos, Sign_NegativeMissingKey) {
+    auto input = getAnySignerInput1();
+    input.clear_private_key();
+    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61fec");
+    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
+    Proto::SigningOutput output;
+
+    ANY_SIGN(input, TWCoinTypeNervos);
+
+    ASSERT_EQ(output.error(), Common::Proto::Error_missing_private_key);
+}
+
+TEST(TWAnySignerNervos, Sign_NegativeNotEnoughUtxos) {
+    auto input = getAnySignerInput1();
+    auto& operation = *input.mutable_native_transfer();
+    operation.set_amount(1000000000000);
+    Proto::SigningOutput output;
+
+    ANY_SIGN(input, TWCoinTypeNervos);
+
+    ASSERT_EQ(output.error(), Common::Proto::Error_not_enough_utxos);
+}
+
+Proto::SigningInput getAnySignerInput2() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_native_transfer();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
+                             "wectaumxn0664yw2jd53lqk4mxg3");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
+                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
+    operation.set_use_max_amount(true);
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(11410040620);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("c75567c80dc9b97aaf4e5c23f4c7f37b077f2b33a50dd7abd952abfbd5beb247"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
+
+    return input;
+}
+
+TEST(TWAnySignerNervos, Sign_Native_SendMaximum) {
+    auto input = getAnySignerInput2();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNervos);
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    // https://explorer.nervos.org/transaction/0x298f5e04b6900796614b89062eb96cec63c3b2c460d01058736a793b567bc5c8
+    ASSERT_EQ(output.transaction_id(),
+              "0x298f5e04b6900796614b89062eb96cec63c3b2c460d01058736a793b567bc5c8");
+    ASSERT_EQ(
+        output.transaction_json(),
+        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}}],\"header_deps\":"
+        "[],\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0xc75567c80dc9b97aaf4e5c23f4c7f37b077f2b33a50dd7abd952abfbd5beb247\"},\"since\":\"0x0\"}"
+        "],\"outputs\":[{\"capacity\":\"0x2a81765c9\",\"lock\":{\"args\":"
+        "\"0xab201f55b02f53b385f79b34dfad548e549b48fc\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x\"],\"version\":\"0x0\",\"witnesses\":["
+        "\"0x5500000010000000550000005500000041000000daf6e65e5a1fe447a4feb7199886b6635c44738e04ea59"
+        "457608fb1c447e068026529d57b02014ddc144622f886153df426853f22083f8891461eeb50b5ce97d01\"]}");
+}
+
+Proto::SigningInput getAnySignerInput3() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_sudt_transfer();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
+                             "wectaumxn0664yw2jd53lqk4mxg3");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
+                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
+    uint256_t amount = 1000000000000000;
+    operation.set_amount(toString(amount));
+    input.set_byte_fee(1);
+    auto sudtAddress =
+        parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8");
+    *operation.mutable_sudt_address() = std::string(sudtAddress.begin(), sudtAddress.end());
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(14399998906);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("5b12911e7413e011f251c1fb5fae4e76fd5fcae4f0d4c6412dcc5b0bfcece823"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(14400000000);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("e118bd11a73d381daf288381ce182d92b6cf2f52d25886bbda9e1a61525c7c4a"), 0)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+    *cell2.mutable_type() =
+        Script(parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"),
+               HashType::Type1,
+               parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"))
+            .proto();
+    auto cell2Data = parse_hex("00e0e4c9b9f84f000000000000000000");
+    *cell2.mutable_data() = std::string(cell2Data.begin(), cell2Data.end());
+
+    auto& cell3 = *input.add_cell();
+    cell3.set_capacity(8210025567);
+    *cell3.mutable_out_point() =
+        OutPoint(parse_hex("09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a"), 1)
+            .proto();
+    *cell3.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqds6ed78yze6eyfyvd537z66ur22c9mmrgz82ama"))
+                                .proto();
+
+    auto privateKey1 =
+        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
+    auto privateKey2 =
+        parse_hex("0c8859a9d9084a8c2b55963268b352e258756f9240f2a1f4645c610ed191dae9");
+    input.add_private_key(std::string(privateKey2.begin(), privateKey2.end()));
+
+    return input;
+}
+
+TEST(TWAnySignerNervos, Sign_SUDT_Simple) {
+    auto input = getAnySignerInput3();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNervos);
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    // https://explorer.nervos.org/transaction/0x9b15f2bea26b98201540d8e20e8b1c21d96dd77ad246520b405c6aabb7173371
+    ASSERT_EQ(output.transaction_id(),
+              "0x9b15f2bea26b98201540d8e20e8b1c21d96dd77ad246520b405c6aabb7173371");
+    ASSERT_EQ(
+        output.transaction_json(),
+        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{\"dep_type\":"
+        "\"code\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0xc7813f6a415144643970c2e88e0bb6ca6a8edc5dd7c1022746f628284a9936d5\"}}],\"header_deps\":"
+        "[],\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0xe118bd11a73d381daf288381ce182d92b6cf2f52d25886bbda9e1a61525c7c4a\"},\"since\":\"0x0\"}"
+        ",{\"previous_output\":{\"index\":\"0x1\",\"tx_hash\":"
+        "\"0x09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a\"},\"since\":\"0x0\"}"
+        ",{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0x5b12911e7413e011f251c1fb5fae4e76fd5fcae4f0d4c6412dcc5b0bfcece823\"},\"since\":\"0x0\"}"
+        "],\"outputs\":[{\"capacity\":\"0x35a4e9000\",\"lock\":{\"args\":"
+        "\"0xab201f55b02f53b385f79b34dfad548e549b48fc\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":{\"args\":"
+        "\"0x9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8\",\"code_hash\":"
+        "\"0x5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5\",\"hash_type\":"
+        "\"type\"}},{\"capacity\":\"0x35a4e9000\",\"lock\":{\"args\":"
+        "\"0xb0d65be39059d6489231b48f85ad706a560bbd8d\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":{\"args\":"
+        "\"0x9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8\",\"code_hash\":"
+        "\"0x5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5\",\"hash_type\":"
+        "\"type\"}},{\"capacity\":\"0x1e95b03db\",\"lock\":{\"args\":"
+        "\"0xb0d65be39059d6489231b48f85ad706a560bbd8d\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x0080c6a47e8d03000000000000000000\","
+        "\"0x00601e253b6b4c000000000000000000\",\"0x\"],\"version\":\"0x0\",\"witnesses\":["
+        "\"0x550000001000000055000000550000004100000035d55fd46316f248552eb6af7ac9589c9ec533c4e5b718"
+        "96b05cdf697e2d18551ceff54d7b860ebb2f4dd5f6c5bb4af1da15460a7621f5aa4bc7d5585a0504de00\","
+        "\"0x5500000010000000550000005500000041000000eaa4bf69126d3016ab786610f2f0668b2ef353915d623d"
+        "0b0184fc25cec3dcad6dc08a1504a2d7dd9faced17b041d79d4c21f1977e57859713360f5e3609583501\","
+        "\"0x\"]}");
+}
+
+Proto::SigningInput getAnySignerInput4() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_sudt_transfer();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqdtyq04tvp02"
+                             "wectaumxn0664yw2jd53lqk4mxg3");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqds6ed78"
+                                 "yze6eyfyvd537z66ur22c9mmrgz82ama");
+    operation.set_use_max_amount(true);
+    input.set_byte_fee(1);
+    auto sudtAddress =
+        parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8");
+    *operation.mutable_sudt_address() = std::string(sudtAddress.begin(), sudtAddress.end());
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(8210026306);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("430cb60ee816e2631d6d9605659c18fec8eb3de94526f5fd4ad51feaad6f1664"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(14400000000);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("378b6bd2f7fc2b1599ee55be7e8fa17fdd6e0d25e2e146d5f46006e0292d6564"), 0)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+    *cell2.mutable_type() =
+        Script(parse_hex("5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5"),
+               HashType::Type1,
+               parse_hex("9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8"))
+            .proto();
+    auto cell2Data = parse_hex("00601e253b6b4c000000000000000000");
+    *cell2.mutable_data() = std::string(cell2Data.begin(), cell2Data.end());
+
+    auto privateKey = parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey.begin(), privateKey.end()));
+
+    return input;
+}
+
+TEST(TWAnySignerNervos, Sign_SUDT_SendMaximum) {
+    auto input = getAnySignerInput4();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNervos);
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    // https://explorer.nervos.org/transaction/0x09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a
+    ASSERT_EQ(output.transaction_id(),
+              "0x09a45a15e48f985b554a0b6e5f0857913cc492ec061cc9b0b2befa4b24609a4a");
+    ASSERT_EQ(output.transaction_json(),
+              "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_"
+              "hash\":\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{"
+              "\"dep_type\":\"code\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
+              "\"0xc7813f6a415144643970c2e88e0bb6ca6a8edc5dd7c1022746f628284a9936d5\"}}],\"header_"
+              "deps\":[],\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+              "\"0x378b6bd2f7fc2b1599ee55be7e8fa17fdd6e0d25e2e146d5f46006e0292d6564\"},\"since\":"
+              "\"0x0\"},{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+              "\"0x430cb60ee816e2631d6d9605659c18fec8eb3de94526f5fd4ad51feaad6f1664\"},\"since\":"
+              "\"0x0\"}],\"outputs\":[{\"capacity\":\"0x35a4e9000\",\"lock\":{\"args\":"
+              "\"0xab201f55b02f53b385f79b34dfad548e549b48fc\",\"code_hash\":"
+              "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_"
+              "type\":\"type\"},\"type\":{\"args\":"
+              "\"0x9657b32fcdc463e13ec9205914fd91c443822a949937ae94add9869e7f2e1de8\",\"code_"
+              "hash\":\"0x5e7a36a77e68eecc013dfa2fe6a23f3b6c344b04005808694ae6dd45eea4cfd5\","
+              "\"hash_type\":\"type\"}},{\"capacity\":\"0x1e95b0c5f\",\"lock\":{\"args\":"
+              "\"0xb0d65be39059d6489231b48f85ad706a560bbd8d\",\"code_hash\":"
+              "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_"
+              "type\":\"type\"},\"type\":null}],\"outputs_data\":["
+              "\"0x00601e253b6b4c000000000000000000\",\"0x\"],\"version\":\"0x0\",\"witnesses\":["
+              "\"0x5500000010000000550000005500000041000000da7c908bdf2cb091b7ff9bb682b762d1323c5e1e"
+              "cf9b2ce0ebedb9d55f6625c52ab14910ae401833112f2ea516ab11bc9ef691c3dff7886e3238c9348c3d"
+              "73a701\",\"0x\"]}");
+}
+
+Proto::SigningInput getAnySignerInput5() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_dao_deposit();
+
+    operation.set_to_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8f"
+                             "urras980hksatlslfaktks7epf25");
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
+                                 "rg8furras980hksatlslfaktks7epf25");
+    operation.set_amount(10200000000);
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(8210021909);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("c7dacd4aab49f5f9643e87752428cebde38eeb49c7726781c4d8b526822004a1"), 1)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqds6ed78yze6eyfyvd537z66ur22c9mmrgz82ama"))
+                                .proto();
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(14399998167);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("d3c3263170815b326779e2fd8d548f846ae13eff9d9a82833c7071069a1d32bf"), 0)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto privateKey1 =
+        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
+    auto privateKey2 =
+        parse_hex("0c8859a9d9084a8c2b55963268b352e258756f9240f2a1f4645c610ed191dae9");
+    input.add_private_key(std::string(privateKey2.begin(), privateKey2.end()));
+
+    return input;
+}
+
+TEST(TWAnySignerNervos, Sign_DAO_Deposit) {
+    auto input = getAnySignerInput5();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNervos);
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    // https://explorer.nervos.org/transaction/0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683
+    ASSERT_EQ(output.transaction_id(),
+              "0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683");
+    ASSERT_EQ(
+        output.transaction_json(),
+        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{\"dep_type\":"
+        "\"code\",\"out_point\":{\"index\":\"0x2\",\"tx_hash\":"
+        "\"0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c\"}}],\"header_deps\":"
+        "[],\"inputs\":[{\"previous_output\":{\"index\":\"0x1\",\"tx_hash\":"
+        "\"0xc7dacd4aab49f5f9643e87752428cebde38eeb49c7726781c4d8b526822004a1\"},\"since\":\"0x0\"}"
+        ",{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0xd3c3263170815b326779e2fd8d548f846ae13eff9d9a82833c7071069a1d32bf\"},\"since\":\"0x0\"}"
+        "],\"outputs\":[{\"capacity\":\"0x25ff7a600\",\"lock\":{\"args\":"
+        "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":{\"args\":\"0x\",\"code_hash\":"
+        "\"0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e\",\"hash_type\":"
+        "\"type\"}},{\"capacity\":\"0x2e3b1de31\",\"lock\":{\"args\":"
+        "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x0000000000000000\",\"0x\"],\"version\":"
+        "\"0x0\",\"witnesses\":["
+        "\"0x5500000010000000550000005500000041000000305d09c7de3f34a4d53bc4e0031ee59c95b9abc4fc3ff5"
+        "548e1a17ca726c069a232012c9c4be6ec4d4ffbe88613ca5e686e3e4b7d0b9bbd7038003e23ffdcdd601\","
+        "\"0x55000000100000005500000055000000410000007c514c77482dd1e1086f41a6d17364c9b5ed16364d61df"
+        "6f7fd8540f8bf7c131275c877943786b1b72fbf4f9d817ee5dd554a689808b7919543c691b5068e5be01\"]}");
+}
+
+Proto::SigningInput getAnySignerInput6() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_dao_withdraw_phase1();
+
+    operation.set_change_address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9e"
+                                 "rg8furras980hksatlslfaktks7epf25");
+    auto& depositCell = *operation.mutable_deposit_cell();
+    depositCell.set_capacity(10200000000);
+    *depositCell.mutable_out_point() =
+        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
+            .proto();
+    *depositCell.mutable_lock() =
+        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
+                       "80hksatlslfaktks7epf25"))
+            .proto();
+    *depositCell.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto depositCellData = parse_hex("0000000000000000");
+    *depositCell.mutable_data() = std::string(depositCellData.begin(), depositCellData.end());
+    depositCell.set_block_number(7575466);
+    auto blockHashData =
+        parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a");
+    *depositCell.mutable_block_hash() = std::string(blockHashData.begin(), blockHashData.end());
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(10200000000);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+    *cell1.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto cell1Data = parse_hex("0000000000000000");
+    *cell1.mutable_data() = std::string(cell1Data.begin(), cell1Data.end());
+
+    auto& cell2 = *input.add_cell();
+    cell2.set_capacity(12410019377);
+    *cell2.mutable_out_point() =
+        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 1)
+            .proto();
+    *cell2.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+
+    auto privateKey1 =
+        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
+
+    return input;
+}
+
+TEST(TWAnySignerNervos, Sign_DAO_Withdraw_Phase1) {
+    auto input = getAnySignerInput6();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNervos);
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    // https://explorer.nervos.org/transaction/0xb4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca
+    ASSERT_EQ(output.transaction_id(),
+              "0xb4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca");
+    ASSERT_EQ(output.transaction_json(),
+              "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_"
+              "hash\":\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{"
+              "\"dep_type\":\"code\",\"out_point\":{\"index\":\"0x2\",\"tx_hash\":"
+              "\"0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c\"}}],\"header_"
+              "deps\":[\"0x3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a\"],"
+              "\"inputs\":[{\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+              "\"0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683\"},\"since\":"
+              "\"0x0\"},{\"previous_output\":{\"index\":\"0x1\",\"tx_hash\":"
+              "\"0x583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683\"},\"since\":"
+              "\"0x0\"}],\"outputs\":[{\"capacity\":\"0x25ff7a600\",\"lock\":{\"args\":"
+              "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
+              "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_"
+              "type\":\"type\"},\"type\":{\"args\":\"0x\",\"code_hash\":"
+              "\"0x82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e\",\"hash_"
+              "type\":\"type\"}},{\"capacity\":\"0x2e3b1db56\",\"lock\":{\"args\":"
+              "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
+              "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_"
+              "type\":\"type\"},\"type\":null}],\"outputs_data\":[\"0xaa97730000000000\",\"0x\"],"
+              "\"version\":\"0x0\",\"witnesses\":["
+              "\"0x5500000010000000550000005500000041000000d5131c1a6b8eca11e2c280b72c5db09ea00bb788"
+              "fd3262eaced861c39db2aad04a36f9d174b6f167a9c98b85d2bccf537a163c44459d23467dfa86408f48"
+              "dd5f01\",\"0x\"]}");
+}
+
+Proto::SigningInput getAnySignerInput7() {
+    auto input = Proto::SigningInput();
+    auto& operation = *input.mutable_dao_withdraw_phase2();
+
+    auto& depositCell = *operation.mutable_deposit_cell();
+    depositCell.set_capacity(10200000000);
+    *depositCell.mutable_out_point() =
+        OutPoint(parse_hex("583d77a037e86155b7ab79ac59fc9bb01640e2427e859467ea10c4a6f222b683"), 0)
+            .proto();
+    *depositCell.mutable_lock() =
+        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
+                       "80hksatlslfaktks7epf25"))
+            .proto();
+    *depositCell.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto depositCellData = parse_hex("0000000000000000");
+    *depositCell.mutable_data() = std::string(depositCellData.begin(), depositCellData.end());
+    depositCell.set_block_number(7575466);
+    auto blockHashData1 =
+        parse_hex("3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a");
+    *depositCell.mutable_block_hash() = std::string(blockHashData1.begin(), blockHashData1.end());
+
+    auto& withdrawingCell = *operation.mutable_withdrawing_cell();
+    withdrawingCell.set_capacity(10200000000);
+    *withdrawingCell.mutable_out_point() =
+        OutPoint(parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"), 0)
+            .proto();
+    *withdrawingCell.mutable_lock() =
+        Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqwyk5x9erg8furras9"
+                       "80hksatlslfaktks7epf25"))
+            .proto();
+    *withdrawingCell.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto withdrawingCellData = parse_hex("aa97730000000000");
+    *withdrawingCell.mutable_data() =
+        std::string(withdrawingCellData.begin(), withdrawingCellData.end());
+    withdrawingCell.set_block_number(7575534);
+    auto blockHashData2 =
+        parse_hex("b070d5364afd47c23fe267077d454009d6f665f200a915e68af1616e46f4aa52");
+    *withdrawingCell.mutable_block_hash() =
+        std::string(blockHashData2.begin(), blockHashData2.end());
+    withdrawingCell.set_since(0x20037c0000001731);
+
+    operation.set_amount(10200000000);
+    input.set_byte_fee(1);
+
+    auto& cell1 = *input.add_cell();
+    cell1.set_capacity(10200000000);
+    *cell1.mutable_out_point() =
+        OutPoint(parse_hex("b4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca"), 0)
+            .proto();
+    *cell1.mutable_lock() = Script(Address("ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50x"
+                                           "wsqwyk5x9erg8furras980hksatlslfaktks7epf25"))
+                                .proto();
+    *cell1.mutable_type() =
+        Script(parse_hex("82d76d1b75fe2fd9a27dfbaa65a039221a380d76c926f378d3f81cf3e7e13f2e"),
+               HashType::Type1, Data())
+            .proto();
+    auto cell1Data = parse_hex("aa97730000000000");
+    *cell1.mutable_data() = std::string(cell1Data.begin(), cell1Data.end());
+
+    auto privateKey1 =
+        parse_hex("8a2a726c44e46d1efaa0f9c2a8efed932f0e96d6050b914fde762ee285e61feb");
+    input.add_private_key(std::string(privateKey1.begin(), privateKey1.end()));
+
+    return input;
+}
+
+TEST(TWAnySignerNervos, Sign_DAO_Withdraw_Phase2) {
+    auto input = getAnySignerInput7();
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNervos);
+    ASSERT_EQ(output.error(), Common::Proto::OK);
+    ASSERT_EQ(output.transaction_id(),
+              "0x4fde13c93fc5d24ab7f660070aaa0b1725809d585f6258605e595cdbd856ea1c");
+    ASSERT_EQ(
+        output.transaction_json(),
+        "{\"cell_deps\":[{\"dep_type\":\"dep_group\",\"out_point\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0x71a7ba8fc96349fea0ed3a5c47992e3b4084b031a42264a018e0072e8172e46c\"}},{\"dep_type\":"
+        "\"code\",\"out_point\":{\"index\":\"0x2\",\"tx_hash\":"
+        "\"0xe2fb199810d49a4d8beec56718ba2593b665db9d52299a0f9e6e75416d73ff5c\"}}],\"header_deps\":"
+        "[\"0x3dfdb4b702a355a5593315016f8af0537d5a2f3292811b79420ded78a092be6a\","
+        "\"0xb070d5364afd47c23fe267077d454009d6f665f200a915e68af1616e46f4aa52\"],\"inputs\":[{"
+        "\"previous_output\":{\"index\":\"0x0\",\"tx_hash\":"
+        "\"0xb4e62bc5f5108275b0ef3da8f8cc3fb0172843c4a2a9cdfef3b04d6c65e9acca\"},\"since\":"
+        "\"0x20037c0000001731\"}],\"outputs\":[{\"capacity\":\"0x25ff7a42c\",\"lock\":{\"args\":"
+        "\"0xc4b50c5c8d074f063ec0a77ded0eaff0fa7b65da\",\"code_hash\":"
+        "\"0x9bd7e06f3ecf4be0f2fcd2188b23f1b9fcc88e5d4b65a8637b17723bbda3cce8\",\"hash_type\":"
+        "\"type\"},\"type\":null}],\"outputs_data\":[\"0x\"],\"version\":\"0x0\",\"witnesses\":["
+        "\"0x6100000010000000550000006100000041000000743f86c5557f4e2d3327f4d17e7bad27209b29c1e9cdba"
+        "b42ab03f7094af917b4b203ddd7f2e87102e09ae579f2fe7f6adb7900b7386b58c1183ba0011b7c42100080000"
+        "000000000000000000\"]}");
+}
+
+} // namespace TW::Nervos::tests
\ No newline at end of file
diff --git a/tests/chains/Nervos/TWCoinTypeTests.cpp b/tests/chains/Nervos/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..d2abfee8137
--- /dev/null
+++ b/tests/chains/Nervos/TWCoinTypeTests.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNervosCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeNervos;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "nervos");
+    assertStringsEqual(name, "Nervos");
+    assertStringsEqual(symbol, "CKB");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 8);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainNervos);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(txUrl, "https://explorer.nervos.org/transaction/t123");
+    assertStringsEqual(accUrl, "https://explorer.nervos.org/address/a12");
+}
diff --git a/tests/Nervos/TWNervosAddressTests.cpp b/tests/chains/Nervos/TWNervosAddressTests.cpp
similarity index 75%
rename from tests/Nervos/TWNervosAddressTests.cpp
rename to tests/chains/Nervos/TWNervosAddressTests.cpp
index 1fa5924000c..f98cff90bae 100644
--- a/tests/Nervos/TWNervosAddressTests.cpp
+++ b/tests/chains/Nervos/TWNervosAddressTests.cpp
@@ -1,14 +1,12 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "HexCoding.h"
 #include "PrivateKey.h"
 #include <TrustWalletCore/TWNervosAddress.h>
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <gtest/gtest.h>
 
 namespace TW::Nervos::tests {
diff --git a/tests/chains/Nimiq/AddressTests.cpp b/tests/chains/Nimiq/AddressTests.cpp
new file mode 100644
index 00000000000..169c18359a9
--- /dev/null
+++ b/tests/chains/Nimiq/AddressTests.cpp
@@ -0,0 +1,64 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Nimiq/Address.h"
+#include "Nimiq/Signer.h"
+
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+
+namespace TW::Nimiq::tests {
+
+TEST(NimiqAddress, Create) {
+    EXPECT_ANY_THROW(new Address(""));
+    EXPECT_ANY_THROW(new Address(Data{}));
+}
+
+TEST(NimiqAddress, IsValid) {
+    // No address
+    ASSERT_FALSE(Address::isValid(""));
+    // Invalid country code
+    ASSERT_FALSE(Address::isValid("DE86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"));
+    // Invalid checksum
+    ASSERT_FALSE(Address::isValid("NQ42 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"));
+    // Too short
+    ASSERT_FALSE(Address::isValid("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0ML"));
+    // Too long
+    ASSERT_FALSE(Address::isValid("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA 0MLA"));
+    // Is not Base32
+    ASSERT_FALSE(Address::isValid("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR ####"));
+    // Invalid checksum
+    ASSERT_FALSE(Address::isValid("NQXX 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"));
+    // Valid, without spaces
+    ASSERT_TRUE(Address::isValid("NQ862H8FYGU5RM77QSN9LYLHC56ACYYR0MLA"));
+    // Valid, normal format
+    ASSERT_TRUE(Address::isValid("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"));
+}
+
+TEST(NimiqAddress, String) {
+    // Address to string
+    ASSERT_EQ(
+        Address(parse_hex("5b3e9e5f32b89abafc3708765dc8f00216cefbb1")).string(),
+        "NQ61 BCY9 UPRJ P2DB MY1P 11T5 TJ7G 08BC VXVH");
+    // Without spaces
+    ASSERT_EQ(
+        Address("NQ862H8FYGU5RM77QSN9LYLHC56ACYYR0MLA").string(),
+        "NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA");
+    // With spaces
+    ASSERT_EQ(
+        Address("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA").string(),
+        "NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA");
+}
+
+TEST(NimiqAddress, FromPublicKey) {
+    const auto publicKey = Signer::publicKeyFromBytes(
+        parse_hex("70c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b702"));
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "NQ27 GBAY EVHP HK5X 6JHV JGFJ 5M3H BF4Y G7GD");
+}
+
+} // namespace TW::Nimiq::tests
diff --git a/tests/chains/Nimiq/SignerTests.cpp b/tests/chains/Nimiq/SignerTests.cpp
new file mode 100644
index 00000000000..d8a56bdb9cd
--- /dev/null
+++ b/tests/chains/Nimiq/SignerTests.cpp
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Nimiq/Address.h"
+#include "Nimiq/Signer.h"
+#include "Nimiq/Transaction.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Nimiq {
+
+TEST(NimiqSigner, DerivePublicKey) {
+    const PrivateKey privateKey(parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756"));
+    const PublicKey publicKey((privateKey.getPublicKey(TWPublicKeyTypeED25519)));
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "NQ27 GBAY EVHP HK5X 6JHV JGFJ 5M3H BF4Y G7GD");
+}
+
+TEST(NimiqSigner, Sign) {
+    const PrivateKey privateKey(parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756"));
+    const auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    std::array<uint8_t, 32> pubkeyBytes;
+    std::copy(pubkey.bytes.begin(), pubkey.bytes.end(), pubkeyBytes.data());
+
+    Transaction tx(
+        pubkeyBytes,
+        Address("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"),
+        42042042,
+        1000,
+        314159,
+        Proto::NetworkId::Mainnet
+    );
+
+    Signer signer;
+    signer.sign(privateKey, tx);
+
+    ASSERT_EQ(hex(tx.signature),
+        "74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b");
+}
+
+} // namespace TW::Nimiq
diff --git a/tests/chains/Nimiq/TWAnySignerTests.cpp b/tests/chains/Nimiq/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..f8879960cd1
--- /dev/null
+++ b/tests/chains/Nimiq/TWAnySignerTests.cpp
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Nimiq.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Nimiq::tests {
+
+TEST(TWAnySignerNimiq, Sign) {
+    auto privateKey = parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756");
+    
+    Proto::SigningInput input;
+
+    input.set_destination("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA");
+    input.set_fee(1000);
+    input.set_value(42042042);
+    input.set_validity_start_height(314159);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNimiq);
+
+    EXPECT_EQ(hex(output.encoded()), "0070c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b7021450ffc385cd4e7c6ac9a7e91614ca67ff90568a00000000028182ba00000000000003e80004cb2f2a74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b");
+}
+
+TEST(TWAnySignerNimiq, SignPoS) {
+    auto privateKey = parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756");
+
+    Proto::SigningInput input;
+
+    input.set_destination("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA");
+    input.set_fee(1000);
+    input.set_value(42042042);
+    input.set_validity_start_height(314159);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_network_id(Proto::NetworkId::MainnetAlbatross);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeNimiq);
+
+    EXPECT_EQ(hex(output.encoded()), "000070c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b7021450ffc385cd4e7c6ac9a7e91614ca67ff90568a00000000028182ba00000000000003e80004cb2f180ba678744be3bf9cd44fbcdabfb5be209f21739934836e26055610ab02720fa99489219d9f3581664473a1b40b30ad1f6e13150d59f8234a42c3f0de3d505405");
+}
+
+} // namespace TW::Nimiq::tests
diff --git a/tests/chains/Nimiq/TWCoinTypeTests.cpp b/tests/chains/Nimiq/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..65439d5fb46
--- /dev/null
+++ b/tests/chains/Nimiq/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWNimiqCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeNimiq));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeNimiq, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeNimiq, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeNimiq));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeNimiq));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeNimiq), 5);
+    ASSERT_EQ(TWBlockchainNimiq, TWCoinTypeBlockchain(TWCoinTypeNimiq));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeNimiq));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeNimiq));
+    assertStringsEqual(symbol, "NIM");
+    assertStringsEqual(txUrl, "https://nimiq.watch/#t123");
+    assertStringsEqual(accUrl, "https://nimiq.watch/#a12");
+    assertStringsEqual(id, "nimiq");
+    assertStringsEqual(name, "Nimiq");
+}
diff --git a/tests/chains/Nimiq/TransactionTests.cpp b/tests/chains/Nimiq/TransactionTests.cpp
new file mode 100644
index 00000000000..cd6eaeb2b22
--- /dev/null
+++ b/tests/chains/Nimiq/TransactionTests.cpp
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Nimiq/Address.h"
+#include "Nimiq/Transaction.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Nimiq {
+
+TEST(NimiqTransaction, PreImage) {
+    const PrivateKey privateKey(parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756"));
+    const auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    std::array<uint8_t, 32> pubkeyBytes;
+    std::copy(pubkey.bytes.begin(), pubkey.bytes.end(), pubkeyBytes.data());
+
+    Transaction tx(
+        pubkeyBytes,
+        Address("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"),
+        42042042,
+        1000,
+        314159,
+        Proto::NetworkId::UseDefault
+    );
+    ASSERT_EQ(hex(tx.getPreImage()),
+        "000082d5f776378ccbe34a3d941f22d4715bc9f81e0d001450ffc385cd4e7c6ac9a7e91614ca67ff90568a0000000000028182ba00000000000003e80004cb2f2a00");
+}
+
+TEST(NimiqTransaction, Serialize) {
+    const PrivateKey privateKey(parse_hex("e3cc33575834add098f8487123cd4bca543ee859b3e8cfe624e7e6a97202b756"));
+    const auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    std::array<uint8_t, 32> pubkeyBytes;
+    std::copy(pubkey.bytes.begin(), pubkey.bytes.end(), pubkeyBytes.data());
+
+    Transaction tx(
+        pubkeyBytes,
+        Address("NQ86 2H8F YGU5 RM77 QSN9 LYLH C56A CYYR 0MLA"),
+        42042042,
+        1000,
+        314159,
+        Proto::NetworkId::Mainnet
+    );
+
+    const auto signature = parse_hex("74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b");
+    std::copy(signature.begin(), signature.end(), tx.signature.begin());
+
+    ASSERT_EQ(hex(tx.serialize()),
+        "0070c7492aaa9c9ac7a05bc0d9c5db2dae9372029654f71f0c7f95deed5099b7021450ffc385cd4e7c6ac9a7e91614ca67ff90568a00000000028182ba00000000000003e80004cb2f2a74dc7f6e0ab58a0bf52cc6e8801b0cca132dd4229d9a3e3a3d2f90e4d8f045d981b771bf5fc3851a98f3c617b1a943228f963e910e061808a721cfa0e3cad50b");
+}
+
+} // namespace TW::Nimiq
diff --git a/tests/chains/OKXChain/TWCoinTypeTests.cpp b/tests/chains/OKXChain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..28db8f84c53
--- /dev/null
+++ b/tests/chains/OKXChain/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWCoinTypeOKXChain, TWCoinType) {
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOKXChain));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x46C3A947E8248570FBD28E4FE456CC8F80DFD90716533878FB67857B95FA3D37"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOKXChain, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x074faafd0b20fad2efa115b8ed7e75993e580b85"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOKXChain, accId.get()));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOKXChain));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOKXChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOKXChain), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeOKXChain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeOKXChain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeOKXChain));
+    assertStringsEqual(symbol, "OKT");
+    assertStringsEqual(txUrl, "https://www.oklink.com/oktc/tx/0x46C3A947E8248570FBD28E4FE456CC8F80DFD90716533878FB67857B95FA3D37");
+    assertStringsEqual(accUrl, "https://www.oklink.com/oktc/address/0x074faafd0b20fad2efa115b8ed7e75993e580b85");
+    assertStringsEqual(id, "okc");
+    assertStringsEqual(name, "OKX Chain");
+}
diff --git a/tests/chains/Oasis/AddressTests.cpp b/tests/chains/Oasis/AddressTests.cpp
new file mode 100644
index 00000000000..a85dd59c24f
--- /dev/null
+++ b/tests/chains/Oasis/AddressTests.cpp
@@ -0,0 +1,75 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Oasis/Address.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+
+namespace TW::Oasis::tests {
+
+TEST(OasisAddress, Valid) {
+    ASSERT_TRUE(Address::isValid("oasis1qp0cnmkjl22gky6p6qeghjytt4v7dkxsrsmueweh"));
+}
+
+TEST(OasisAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("oasis1qp0cnmkjl22gky6p6qeghjytt4v7dkxsrsmuewehj"));
+    ASSERT_FALSE(Address::isValid("oasi1qp0cnmkjl22gky6p6qeghjytt4v7dkxsrsmueweh"));
+}
+
+TEST(OasisAddress, ForceInvalid) {
+    try {
+        auto addressString = "oasis1qp0cnmkjl22gky6p6qeghjytt4v7dkxsrsmuewehj";
+        auto address = Address(addressString);
+    } catch (std::invalid_argument& e1) {
+        return;
+    }
+    FAIL() << "This test should generate an exception as it an invalid address";
+}
+
+TEST(OasisAddress, FromWrongData) {
+    try {
+        auto dataString = "asdadfasdfsdfwrwrsadasdasdsad";
+        auto address = Address(data(dataString));
+    } catch (std::invalid_argument& e1) {
+        return;
+    }
+    FAIL() << "This test should generate an exception as it an invalid data";
+}
+
+TEST(OasisAddress, FromPrivateKey) {
+    auto privateKey = PrivateKey(parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0"));
+    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
+    ASSERT_EQ(address.string(), "oasis1qzawzy5kaa2xgphenf3r0f5enpr3mx5dps559yxm");
+}
+
+TEST(OasisAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("aba52c0dcb80c2fe96ed4c3741af40c573a0500c0d73acda22795c37cb0f1739"), TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "oasis1qphdkldpttpsj2j3l9sde9h26cwpfwqwwuhvruyu");
+}
+
+TEST(OasisAddress, WrongPublicKeyType) {
+    try {
+        auto publicKey = PublicKey(parse_hex("aba52c0dcb80c2fe96ed4c3741af40c573a0500c0d73acda22795c37cb0f1739"), TWPublicKeyTypeED25519Cardano);
+        auto address = Address(publicKey);
+    } catch (std::invalid_argument& e1) {
+        return;
+    }
+    FAIL() << "TWPublicKeyTypeED25519Cardano should generate an exception as it an invalid publicKey type";
+}
+
+TEST(OasisAddress, FromString) {
+    Address address;
+    ASSERT_TRUE(Address::decode("oasis1hts399h023jqd7v6vgm6dxvcguwe4rgvqqgvq38n", address));
+    ASSERT_EQ(address.string(), "oasis1hts399h023jqd7v6vgm6dxvcguwe4rgvqqgvq38n");
+
+    ASSERT_FALSE(Address::decode("oasis1hts399h023jqd7v6vgm6dxvcguwe4rgvqqgvq38ng", address));
+}
+
+} // namespace TW::Oasis::tests
diff --git a/tests/chains/Oasis/SignerTests.cpp b/tests/chains/Oasis/SignerTests.cpp
new file mode 100644
index 00000000000..23a26f587bf
--- /dev/null
+++ b/tests/chains/Oasis/SignerTests.cpp
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Oasis/Address.h"
+#include "Oasis/Signer.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Oasis::tests {
+
+TEST(OasisSigner, Sign) {
+    auto input = Proto::SigningInput();
+    auto& transfer = *input.mutable_transfer();
+
+    transfer.set_gas_price(0);
+    transfer.set_gas_amount("0");
+    transfer.set_nonce(0);
+    transfer.set_to("oasis1qrrnesqpgc6rfy2m50eew5d7klqfqk69avhv4ak5");
+    transfer.set_amount("10000000");
+
+    // The use of this context thing is explained here --> https://docs.oasis.dev/oasis-core/common-functionality/crypto#domain-separation
+    transfer.set_context("oasis-core/consensus: tx for chain a245619497e580dd3bc1aa3256c07f68b8dcc13f92da115eadc3b231b083d3c4");
+
+    auto key = parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.encoded()), "a2697369676e6174757265a2697369676e617475726558406e51c18c9b2015c9b49414b3307336597f51ff331873d214ce2db81c9651a34d99529ccaa294a39ccd01c6b0bc2c2239d87c624e5ba4840cf99ac8f9283e240c6a7075626c69635f6b6579582093d8f8a455f50527976a8aa87ebde38d5606efa86cb985d3fb466aff37000e3b73756e747275737465645f7261775f76616c7565585ea463666565a2636761730066616d6f756e74410064626f6479a262746f5500c73cc001463434915ba3f39751beb7c0905b45eb66616d6f756e744400989680656e6f6e636500666d6574686f64707374616b696e672e5472616e73666572");
+}
+
+} // namespace TW::Oasis::tests
diff --git a/tests/chains/Oasis/TWAnySignerTests.cpp b/tests/chains/Oasis/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..63f24e03fe7
--- /dev/null
+++ b/tests/chains/Oasis/TWAnySignerTests.cpp
@@ -0,0 +1,78 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+#include "proto/Oasis.pb.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+namespace TW::Oasis::tests {
+
+TEST(TWAnySignerOasis, Sign) {
+    auto input = Proto::SigningInput();
+    auto output = Proto::SigningOutput();
+    auto& transfer = *input.mutable_transfer();
+
+    transfer.set_gas_price(0);
+    transfer.set_gas_amount("0");
+    transfer.set_nonce(0);
+    transfer.set_to("oasis1qrrnesqpgc6rfy2m50eew5d7klqfqk69avhv4ak5");
+    transfer.set_amount("10000000");
+    transfer.set_context("oasis-core/consensus: tx for chain a245619497e580dd3bc1aa3256c07f68b8dcc13f92da115eadc3b231b083d3c4");
+
+    auto key = parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0");
+    input.set_private_key(key.data(), key.size());
+
+    ANY_SIGN(input, TWCoinTypeOasis);
+
+    EXPECT_EQ("a2697369676e6174757265a2697369676e617475726558406e51c18c9b2015c9b49414b3307336597f51ff331873d214ce2db81c9651a34d99529ccaa294a39ccd01c6b0bc2c2239d87c624e5ba4840cf99ac8f9283e240c6a7075626c69635f6b6579582093d8f8a455f50527976a8aa87ebde38d5606efa86cb985d3fb466aff37000e3b73756e747275737465645f7261775f76616c7565585ea463666565a2636761730066616d6f756e74410064626f6479a262746f5500c73cc001463434915ba3f39751beb7c0905b45eb66616d6f756e744400989680656e6f6e636500666d6574686f64707374616b696e672e5472616e73666572",
+              hex(output.encoded()));
+}
+
+TEST(TWAnySignerOasisEscrow, Sign) {
+    auto input = Proto::SigningInput();
+    auto output = Proto::SigningOutput();
+    auto& transfer = *input.mutable_escrow();
+
+    transfer.set_gas_price(0);
+    transfer.set_gas_amount("0");
+    transfer.set_nonce(0);
+    transfer.set_account("oasis1qrrnesqpgc6rfy2m50eew5d7klqfqk69avhv4ak5");
+    transfer.set_amount("10000000");
+    transfer.set_context("oasis-core/consensus: tx for chain a245619497e580dd3bc1aa3256c07f68b8dcc13f92da115eadc3b231b083d3c4");
+
+    auto key = parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0");
+    input.set_private_key(key.data(), key.size());
+
+    ANY_SIGN(input, TWCoinTypeOasis);
+
+    EXPECT_EQ("a2697369676e6174757265a2697369676e61747572655840f22235e307a45dbeb0c4201bee58b920c791d80356dc17ebe7fb878dbfe35a5e8e05ac8842c7f6cfaaf7a2b8898528f4cea7f9d501be1ce1275191c3333b00076a7075626c69635f6b6579582093d8f8a455f50527976a8aa87ebde38d5606efa86cb985d3fb466aff37000e3b73756e747275737465645f7261775f76616c75655864a463666565a2636761730066616d6f756e74410064626f6479a266616d6f756e744400989680676163636f756e745500c73cc001463434915ba3f39751beb7c0905b45eb656e6f6e636500666d6574686f64717374616b696e672e416464457363726f77",
+              hex(output.encoded()));
+}
+
+TEST(TWAnySignerOasisReclaimEscrow, Sign) {
+    auto input = Proto::SigningInput();
+    auto output = Proto::SigningOutput();
+    auto& transfer = *input.mutable_reclaimescrow();
+
+    transfer.set_gas_price(0);
+    transfer.set_gas_amount("0");
+    transfer.set_nonce(0);
+    transfer.set_account("oasis1qrrnesqpgc6rfy2m50eew5d7klqfqk69avhv4ak5");
+    transfer.set_shares("10000000");
+    transfer.set_context("oasis-core/consensus: tx for chain a245619497e580dd3bc1aa3256c07f68b8dcc13f92da115eadc3b231b083d3c4");
+
+    auto key = parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0");
+    input.set_private_key(key.data(), key.size());
+
+    ANY_SIGN(input, TWCoinTypeOasis);
+
+    EXPECT_EQ("a2697369676e6174757265a2697369676e6174757265584048a3218b453a130dec2a1392556b5e03d54c6dab29600c50944e9bd0e5325b76f98ffe4e9f8b07590cd964480ce76b50d134035e73b03cba1adb7631ab67eb006a7075626c69635f6b6579582093d8f8a455f50527976a8aa87ebde38d5606efa86cb985d3fb466aff37000e3b73756e747275737465645f7261775f76616c75655868a463666565a2636761730066616d6f756e74410064626f6479a2667368617265734400989680676163636f756e745500c73cc001463434915ba3f39751beb7c0905b45eb656e6f6e636500666d6574686f64757374616b696e672e5265636c61696d457363726f77",
+              hex(output.encoded()));
+}
+
+} // namespace TW::Oasis::tests
diff --git a/tests/chains/Oasis/TWCoinTypeTests.cpp b/tests/chains/Oasis/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..15085e876c0
--- /dev/null
+++ b/tests/chains/Oasis/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWOasisCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOasis));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("73dc977fdd8596d4a57e6feb891b21f5da3652d26815dc94f15f7420c298e29e"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOasis, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("oasis1qrx376dmwuckmruzn9vq64n49clw72lywctvxdf4"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOasis, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOasis));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOasis));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOasis), 9);
+    ASSERT_EQ(TWBlockchainOasisNetwork, TWCoinTypeBlockchain(TWCoinTypeOasis));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeOasis));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeOasis));
+    assertStringsEqual(symbol, "ROSE");
+    assertStringsEqual(txUrl, "https://oasisscan.com/transactions/73dc977fdd8596d4a57e6feb891b21f5da3652d26815dc94f15f7420c298e29e");
+    assertStringsEqual(accUrl, "https://oasisscan.com/accounts/detail/oasis1qrx376dmwuckmruzn9vq64n49clw72lywctvxdf4");
+    assertStringsEqual(id, "oasis");
+    assertStringsEqual(name, "Oasis");
+}
diff --git a/tests/chains/Oasis/TransactionCompilerTests.cpp b/tests/chains/Oasis/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..18edd6b58e9
--- /dev/null
+++ b/tests/chains/Oasis/TransactionCompilerTests.cpp
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Oasis.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Oasis::tests {
+
+TEST(OasisCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeOasis;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto privateKey = PrivateKey(parse_hex("4f8b5676990b00e23d9904a92deb8d8f428ff289c8939926358f1d20537c21a0"));
+    auto publicKey = privateKey.getPublicKey(publicKeyType(coin));
+
+    auto input = TW::Oasis::Proto::SigningInput();
+    auto& transfer = *input.mutable_transfer();
+    transfer.set_gas_price(0);
+    transfer.set_gas_amount("0");
+    transfer.set_nonce(0);
+    transfer.set_to("oasis1qrrnesqpgc6rfy2m50eew5d7klqfqk69avhv4ak5");
+    transfer.set_amount("10000000");
+    transfer.set_context("oasis-core/consensus: tx for chain a245619497e580dd3bc1aa3256c07f68b8dcc13f92da115eadc3b231b083d3c4");
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash), "373976e01fa0634a40ce8898a869f1056d862e3a0f26d8ae22ebeb5fdbcde9b3");
+
+    auto signature = parse_hex("6e51c18c9b2015c9b49414b3307336597f51ff331873d214ce2db81c9651a34d99529ccaa294a39ccd01c6b0bc2c2239d87c624e5ba4840cf99ac8f9283e240c");
+
+    /// Step 3: Compile transaction info
+    const auto expectedTx = "a2697369676e6174757265a2697369676e617475726558406e51c18c9b2015c9b49414b3307336597f51ff331873d214ce2db81c9651a34d99529ccaa294a39ccd01c6b0bc2c2239d87c624e5ba4840cf99ac8f9283e240c6a7075626c69635f6b6579582093d8f8a455f50527976a8aa87ebde38d5606efa86cb985d3fb466aff37000e3b73756e747275737465645f7261775f76616c7565585ea463666565a2636761730066616d6f756e74410064626f6479a262746f5500c73cc001463434915ba3f39751beb7c0905b45eb66616d6f756e744400989680656e6f6e636500666d6574686f64707374616b696e672e5472616e73666572";
+    auto outputData = TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKey.bytes});
+
+    {
+        TW::Oasis::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+        // keys were not used anywhere up to this point.
+        TW::Oasis::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::Oasis::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKey.bytes});
+        Oasis::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {}, {});
+        Oasis::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+} // namespace TW::Oasis::tests
diff --git a/tests/chains/Ontology/AccountTests.cpp b/tests/chains/Ontology/AccountTests.cpp
new file mode 100644
index 00000000000..1917eea454f
--- /dev/null
+++ b/tests/chains/Ontology/AccountTests.cpp
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Hash.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include "Ontology/Signer.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+namespace TW::Ontology::tests {
+
+TEST(OntologyAccount, validity) {
+    auto hexPrvKey = "4646464646464646464646464646464646464646464646464646464646464646";
+    auto hexPubKey = "031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486";
+    auto signer = Signer(PrivateKey(parse_hex(hexPrvKey)));
+    auto prvKey = signer.getPrivateKey();
+    auto pubKey = signer.getPublicKey();
+    EXPECT_EQ(hexPrvKey, hex(prvKey.bytes));
+    EXPECT_EQ(hexPubKey, hex(pubKey.bytes));
+}
+
+} // namespace TW::Ontology::tests
diff --git a/tests/chains/Ontology/AddressTests.cpp b/tests/chains/Ontology/AddressTests.cpp
new file mode 100644
index 00000000000..559c5ebe5b0
--- /dev/null
+++ b/tests/chains/Ontology/AddressTests.cpp
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PublicKey.h"
+
+#include "Ontology/Address.h"
+#include "Ontology/Signer.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Ontology::tests {
+
+TEST(OntologyAddress, validation) {
+    ASSERT_FALSE(Address::isValid("abc"));
+    ASSERT_FALSE(Address::isValid("abeb60f3e94c1b9a09f33669435e7ef12eacd"));
+    ASSERT_FALSE(Address::isValid("abcb60f3e94c9b9a09f33669435e7ef1beaedads"));
+    ASSERT_TRUE(Address::isValid("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD"));
+}
+
+TEST(OntologyAddress, fromPubKey) {
+    auto address = Address(
+        PublicKey(parse_hex("031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486"), TWPublicKeyTypeSECP256k1));
+    EXPECT_EQ("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5", address.string());
+}
+
+TEST(OntologyAddress, fromString) {
+    auto b58Str = "AYTxeseHT5khTWhtWX1pFFP1mbQrd4q1zz";
+    auto address = Address(b58Str);
+    EXPECT_EQ(b58Str, address.string());
+    auto errB58Str = "AATxeseHT5khTWhtWX1pFFP1mbQrd4q1zz";
+    ASSERT_THROW(new Address(errB58Str), std::runtime_error);
+}
+
+TEST(OntologyAddress, fromMultiPubKeys) {
+    auto signer1 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
+    auto signer2 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464652")));
+    auto signer3 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464658")));
+    std::vector<Data> pubKeys{signer1.getPublicKey().bytes, signer2.getPublicKey().bytes, signer3.getPublicKey().bytes};
+    uint8_t m = 2;
+    auto multiAddress = Address(m, pubKeys);
+    EXPECT_EQ("AYGWgijVZnrUa2tRoCcydsHUXR1111DgdW", multiAddress.string());
+}
+
+TEST(OntologyAddress, fromBytes) {
+    auto address = Address(
+        PublicKey(parse_hex("031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486"), TWPublicKeyTypeSECP256k1));
+    EXPECT_EQ("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5", address.string());
+
+    std::vector<uint8_t> v(20);
+
+    for (auto i = 0ul; i < address._data.size(); ++i) {
+        v[i] = address._data[i];
+    }
+    auto address2 = Address(v);
+    EXPECT_EQ("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5", address2.string());
+
+    v.pop_back();
+    EXPECT_ANY_THROW(new Address(v));
+}
+
+} // namespace TW::Ontology::tests
diff --git a/tests/Ontology/Oep4Tests.cpp b/tests/chains/Ontology/Oep4Tests.cpp
similarity index 79%
rename from tests/Ontology/Oep4Tests.cpp
rename to tests/chains/Ontology/Oep4Tests.cpp
index be49303bd69..6c43b61be89 100644
--- a/tests/Ontology/Oep4Tests.cpp
+++ b/tests/chains/Ontology/Oep4Tests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "HexCoding.h"
 
@@ -15,7 +13,7 @@ namespace TW::Ontology::tests {
 
 TEST(OntologyOep4, name) {
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     Oep4 wing(wing_addr);
 
     uint32_t nonce = 0x1234;
@@ -26,7 +24,7 @@ TEST(OntologyOep4, name) {
 
 TEST(OntologyOep4, symbol) {
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     Oep4 wing(wing_addr);
 
     uint32_t nonce = 0x1234;
@@ -37,7 +35,7 @@ TEST(OntologyOep4, symbol) {
 
 TEST(OntologyOep4, decimals) {
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     Oep4 wing(wing_addr);
 
     uint32_t nonce = 0x1234;
@@ -48,7 +46,7 @@ TEST(OntologyOep4, decimals) {
 
 TEST(OntologyOep4, totalSupply) {
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     Oep4 wing(wing_addr);
 
     uint32_t nonce = 0x1234;
@@ -59,7 +57,7 @@ TEST(OntologyOep4, totalSupply) {
 
 TEST(OntologyOep4, balanceOf) {
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     Oep4 wing(wing_addr);
     auto user = Address("AeaThtPwh5kAYnjHavzwmvxPd725nVTvbM");
 
@@ -87,11 +85,11 @@ TEST(OntologyOep4, addressHack) {
 }
 
 TEST(OntologyOep4, transfer) {
-    auto from = Signer(
-        PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464652")));
+    PrivateKey fromPrivate(parse_hex("4646464646464646464646464646464646464646464646464646464646464652"));
+    Signer from(fromPrivate);
 
-    auto payer = Signer(
-        PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
+    PrivateKey payerPrivate(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
+    Signer payer(payerPrivate);
 
     auto toAddress = Address("AVY6LfvxauVQAVHDV9hC3ZCv7cQqzfDotH");
 
@@ -101,14 +99,17 @@ TEST(OntologyOep4, transfer) {
     uint64_t gasLimit = 50000;
 
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     Oep4 wing(wing_addr);
 
     auto tx = wing.transfer(from, toAddress, amount, payer, gasPrice, gasLimit, nonce);
-    auto rawTx = hex(tx.serialize());
+    auto rawTxBytes = tx.serialize();
+    auto rawTx = hex(rawTxBytes);
     // Transaction Hex tab
     // https://explorer.ont.io/testnet/tx/710266b8d497e794ecd47e01e269e4aeb6f4ff2b01eaeafc4cd371e062b13757
     EXPECT_EQ("00d134120000c40900000000000050c3000000000000fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a4d02e9001496f688657b95be51c11a87b51adfda4ab69e9cbb1457e9d1a61f9aafa798b6c7fbeae35639681d7df653c1087472616e736665726733def739225d0f93dd2aed457d7b1fd074ec31ff00024140bd2923854d7b84b97a107bb3cddf18c8e3dddd2f36b41a1f5f5b23366484daa22871cfb819923fe01e9cb1e9ed16baa2b05c2feb76bcbe2ec125f72701c5e965232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac41406d638653597774ce45812ea2653250806b657b32b7c6ad3e027ddeba91e9a9da4bb5dacd23dafba868cb31bacb38b4a6ff2607682a426c1dc09b05a1e158d6cd2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac", rawTx);
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // EXPECT_EQ(rawTx, "00d134120000c40900000000000050c3000000000000fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a4d02e9001496f688657b95be51c11a87b51adfda4ab69e9cbb1457e9d1a61f9aafa798b6c7fbeae35639681d7df653c1087472616e736665726733def739225d0f93dd2aed457d7b1fd074ec31ff00024140bd2923854d7b84b97a107bb3cddf18c8e3dddd2f36b41a1f5f5b23366484daa2d78e3046e66dc020e1634e1612e9455d0c8acac2305ae0563293d39bfa9d3bec232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac41406d638653597774ce45812ea2653250806b657b32b7c6ad3e027ddeba91e9a9dab44a2531dc2504589734ce4534c74b58bdc0f3457cd53267331ec5211b0a4e842321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac");
 }
 
 TEST(OntologyOep4, transferMainnet) {
@@ -127,7 +128,7 @@ TEST(OntologyOep4, transferMainnet) {
 
     // wing oep4 mainnet address
     std::string wing_hex{"00c59fcd27a562d6397883eab1f2fff56e58ef80"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     Oep4 wing(wing_addr);
 
     auto tx = wing.transfer(from, toAddress, amount, payer, gasPrice, gasLimit, nonce);
diff --git a/tests/chains/Ontology/OngTests.cpp b/tests/chains/Ontology/OngTests.cpp
new file mode 100644
index 00000000000..1aa603bebf9
--- /dev/null
+++ b/tests/chains/Ontology/OngTests.cpp
@@ -0,0 +1,114 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+
+#include "Ontology/Ong.h"
+
+#include <gtest/gtest.h>
+#include <string>
+
+namespace TW::Ontology::tests {
+
+TEST(OntologyOng, decimals) {
+    uint32_t nonce = 0;
+    auto tx = Ong().decimals(nonce);
+    auto rawTx = hex(tx.serialize());
+    EXPECT_EQ("00d100000000000000000000000000000000000000000000000000000000000000000000000000000000"
+              "380008646563696d616c731400000000000000000000000000000000000000020068164f6e746f6c6f67"
+              "792e4e61746976652e496e766f6b650000",
+              rawTx);
+}
+
+TEST(OntologyOng, balanceOf) {
+    uint32_t nonce = 0;
+    auto address = Address("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD");
+    auto tx = Ong().balanceOf(address, nonce);
+    auto rawTx = hex(tx.serialize());
+    EXPECT_EQ("00d100000000000000000000000000000000000000000000000000000000000000000000000000000000"
+              "4d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f6614000000000000000000"
+              "00000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b650000",
+              rawTx);
+}
+
+TEST(OntologyOng, transfer) {
+    PrivateKey privateKey1(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
+    Signer signer1(privateKey1);
+
+    PrivateKey privateKey2(parse_hex("4646464646464646464646464646464646464646464646464646464646464652"));
+    Signer signer2(privateKey2);
+
+    Address toAddress("Af1n2cZHhMZumNqKgw9sfCNoTWu9de4NDn");
+    uint32_t nonce = 0;
+    uint64_t amount = 1, gasPrice = 500, gasLimit = 20000;
+
+    auto tx = Ong().transfer(signer1, toAddress, amount, signer2, gasPrice, gasLimit, nonce);
+    auto rawTx = tx.serialize();
+    auto rawTxHex = hex(rawTx);
+
+    EXPECT_EQ("00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+              "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
+              "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+              "00000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140ac3edf2d00540f9c"
+              "2f3b24878936b409c995c425ab5edf247c5b0d812a50df293ff63e173bac71a6cd0772ff78415c46ac64"
+              "f625cbc06fe90ccdecf9a94319c42321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
+              "47125f927b7486ac41406fea9f12b125d7f65a94774e765a796428b3c6c4c46b0470624b9a1cef4ff420"
+              "488828f308c263b35287363e51add8cd49136eb57a397c6ade95df80d9a16282232103d9fd62df332403"
+              "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+              rawTxHex);
+
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // EXPECT_EQ("00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+    //           "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
+    //           "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+    //           "00000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140ac3edf2d00540f9c"
+    //           "2f3b24878936b409c995c425ab5edf247c5b0d812a50df29c009c1e7c4538e5a32f88d0087bea3b91082"
+    //           "0487db572e9be6ebddc953200b8d2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
+    //           "47125f927b7486ac41406fea9f12b125d7f65a94774e765a796428b3c6c4c46b0470624b9a1cef4ff420"
+    //           "b777d70bf73d9c4dad78c9c1ae52273273d38bf82cde221a1523eb4222c1c2cf232103d9fd62df332403"
+    //           "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+    //           rawTxHex);
+}
+
+TEST(OntologyOng, withdraw) {
+    PrivateKey privateKey1(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
+    Signer signer1(privateKey1);
+
+    PrivateKey privateKey2(parse_hex("4646464646464646464646464646464646464646464646464646464646464652"));
+    Signer signer2(privateKey2);
+
+    uint32_t nonce = 0;
+    uint64_t amount = 1, gasPrice = 500, gasLimit = 20000;
+    auto tx =
+        Ong().withdraw(signer1, signer1.getAddress(), amount, signer2, gasPrice, gasLimit, nonce);
+    auto rawTx = tx.serialize();
+    auto rawTxHex = hex(rawTx);
+
+    EXPECT_EQ(
+        "00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df68b00c6"
+        "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81400000000000000000000000000000000000000"
+        "016a7cc814fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc8516a7cc86c0c7472616e7366657246726f"
+        "6d1400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f"
+        "6b6500024140b8b859055c744a89ef4d4f6ae7a58e0a99fef2eb0f6cf09d740b56cf4c7c14ab64e00c28de9b1f"
+        "28921cbd62e6bcd6d452ab9871f8f5d2288812ff322ee2f4af2321031bec1250aa8f78275f99a6663688f31085"
+        "848d0ed92f1203e447125f927b7486ac41406413b060329e133cd13709c361ccd90b3944477cf3937f1459313f"
+        "0ea6435f6f2b1335192a5d1b346fd431e8af912bfa4e1a23ad7d0ab7fc5b808655af5c9043232103d9fd62df33"
+        "2403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+        rawTxHex);
+
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // EXPECT_EQ(
+    //     "00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df68b00c6"
+    //     "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81400000000000000000000000000000000000000"
+    //     "016a7cc814fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc8516a7cc86c0c7472616e7366657246726f"
+    //     "6d1400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f"
+    //     "6b6500024140b8b859055c744a89ef4d4f6ae7a58e0a99fef2eb0f6cf09d740b56cf4c7c14ab9b1ff3d62164e0"
+    //     "d86de3429d1943292b6a3b623bae21cc5c6ba6cb90cd8030a22321031bec1250aa8f78275f99a6663688f31085"
+    //     "848d0ed92f1203e447125f927b7486ac41406413b060329e133cd13709c361ccd90b3944477cf3937f1459313f"
+    //     "0ea6435f6f2b1335192a5d1b346fd431e8af912bfa4e1a23ad7d0ab7fc5b808655af5c9043232103d9fd62df33"
+    //     "2403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+    //     rawTxHex);
+}
+
+} // namespace TW::Ontology::tests
diff --git a/tests/chains/Ontology/OntTests.cpp b/tests/chains/Ontology/OntTests.cpp
new file mode 100644
index 00000000000..4d499ddbdcc
--- /dev/null
+++ b/tests/chains/Ontology/OntTests.cpp
@@ -0,0 +1,113 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Ontology/Ont.h"
+
+#include <string>
+#include <gtest/gtest.h>
+
+namespace TW::Ontology::tests {
+
+TEST(OntologyOnt, decimals) {
+    uint32_t nonce = 0;
+    auto tx = Ont().decimals(nonce);
+    auto rawTx = hex(tx.serialize());
+    EXPECT_EQ("00d100000000000000000000000000000000000000000000000000000000000000000000000000000000"
+              "380008646563696d616c731400000000000000000000000000000000000000010068164f6e746f6c6f67"
+              "792e4e61746976652e496e766f6b650000",
+              rawTx);
+}
+
+TEST(OntologyOnt, queryBalance) {
+    uint32_t nonce = 0;
+    auto address = Address("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD");
+    auto tx = Ont().balanceOf(address, nonce);
+    auto rawTx = hex(tx.serialize());
+    EXPECT_EQ("00d100000000000000000000000000000000000000000000000000000000000000000000000000000000"
+              "4d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f6614000000000000000000"
+              "00000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b650000",
+              rawTx);
+}
+
+TEST(OntologyOnt, transfer) {
+    PrivateKey privateKey1(parse_hex("4646464646464646464646464646464646464646464646464646464646464646"));
+    Signer signer1(privateKey1);
+
+    PrivateKey privateKey2(parse_hex("4646464646464646464646464646464646464646464646464646464646464652"));
+    Signer signer2(privateKey2);
+
+    auto toAddress = Address("Af1n2cZHhMZumNqKgw9sfCNoTWu9de4NDn");
+    uint32_t nonce = 0;
+    uint64_t amount = 1, gasPrice = 500, gasLimit = 20000;
+    auto tx = Ont().transfer(signer1, toAddress, amount, signer2, gasPrice, gasLimit, nonce);
+    auto rawTx = tx.serialize();
+    auto rawTxHex = hex(rawTx);
+
+    EXPECT_EQ("00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+              "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
+              "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+              "00000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b65000241407531e7d5bb9ae138"
+              "862585a65c26d624f1a7a61011298809d9ed9cf60d10a4504067dee9d549a836b480c4e48904e28f9b42"
+              "dd5fa14376cbb1ef27d931eaea552321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
+              "47125f927b7486ac4140bcc6df81d7f2f3143f152c446643ac5bf7910ef90046be8c89818264a11d360d"
+              "0576d7b092fabafd0913a67ccf8b2f8e3d2bd708f768c2bb67e2d2f759805608232103d9fd62df332403"
+              "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+              rawTxHex);
+
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // EXPECT_EQ("00d100000000f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+    //           "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
+    //           "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+    //           "00000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b65000241407531e7d5bb9ae138"
+    //           "862585a65c26d624f1a7a61011298809d9ed9cf60d10a450bf9821152ab657ca4b7f3b1b76fb1d7021a4"
+    //           "1d4e05d427b941caa2e9ca783afc2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
+    //           "47125f927b7486ac4140bcc6df81d7f2f3143f152c446643ac5bf7910ef90046be8c89818264a11d360d"
+    //           "fa89284e6d054503f6ec59833074d0717fbb23a4afaedbc98bd6f7cba2e2cf49232103d9fd62df332403"
+    //           "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+    //           rawTxHex);
+}
+
+// Successfully broadcasted: https://explorer.ont.io/tx/785af64758886099b995e2aed914c56b15ab63c6e0c5acf42b66f3bbc3e95f98
+// TEST(OntologyOnt, transferUpdatedSign) {
+//     PrivateKey privateKey1(parse_hex("3b2bca95860af1baf5ef55f60167ef59db098b5871617c889f42dee4ffcb0c6f"));
+//     Signer signer1(privateKey1);
+//
+//     PrivateKey privateKey2(parse_hex("3b2bca95860af1baf5ef55f60167ef59db098b5871617c889f42dee4ffcb0c6f"));
+//     Signer signer2(privateKey2);
+//
+//     auto toAddress = Address("AUyL4TZ1zFEcSKDJrjFnD7vsq5iFZMZqT7");
+//     uint32_t nonce = 2760697417;
+//
+//     uint64_t amount = 1, gasPrice = 2500, gasLimit = 20000;
+//     auto tx = Ont().transfer(signer1, toAddress, amount, signer2, gasPrice, gasLimit, nonce);
+//     auto rawTx = tx.serialize();
+//     auto rawTxHex = hex(rawTx);
+//
+//     // The transaction hex signed by using Rust implementation:
+//     EXPECT_EQ("00d149e68ca4c409000000000000204e0000000000007ae1b6c6e44a518f8bcffc44e75236c7a2a8f3c2"
+//               "7100c66b147ae1b6c6e44a518f8bcffc44e75236c7a2a8f3c26a7cc81490c44262e0c9740f7b3c0e3d04"
+//               "6c106901c72cc46a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+//               "00000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140362bc7dd7d005b47"
+//               "464a2a2f84edd146e993267ceefb4174ef30d0cba0a1aa42bcd043b2349ba7030c2a3d7700d6653cc921"
+//               "d17a9f8942d46a93e84ae7968ed223210332aa8304797de2817ca65ce25aede0b176c3c5a61a20caffaf"
+//               "2df7fb6bb0b1b4ac4140362bc7dd7d005b47464a2a2f84edd146e993267ceefb4174ef30d0cba0a1aa42"
+//               "bcd043b2349ba7030c2a3d7700d6653cc921d17a9f8942d46a93e84ae7968ed223210332aa8304797de2"
+//               "817ca65ce25aede0b176c3c5a61a20caffaf2df7fb6bb0b1b4ac",
+//               rawTxHex);
+//
+//     // The transaction hex signed by using `trezor-crypto`:
+//     EXPECT_NE("00d149e68ca4c409000000000000204e0000000000007ae1b6c6e44a518f8bcffc44e75236c7a2a8f3c2"
+//               "7100c66b147ae1b6c6e44a518f8bcffc44e75236c7a2a8f3c26a7cc81490c44262e0c9740f7b3c0e3d04"
+//               "6c106901c72cc46a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+//               "00000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140362bc7dd7d005b47"
+//               "464a2a2f84edd146e993267ceefb4174ef30d0cba0a1aa42432fbc4ccb6458fdf3d5c288ff299ac2f3c5"
+//               "2933078e5bb08925e27814cc967f23210332aa8304797de2817ca65ce25aede0b176c3c5a61a20caffaf"
+//               "2df7fb6bb0b1b4ac4140362bc7dd7d005b47464a2a2f84edd146e993267ceefb4174ef30d0cba0a1aa42"
+//               "432fbc4ccb6458fdf3d5c288ff299ac2f3c52933078e5bb08925e27814cc967f23210332aa8304797de2"
+//               "817ca65ce25aede0b176c3c5a61a20caffaf2df7fb6bb0b1b4ac",
+//               rawTxHex);
+// }
+
+} // namespace TW::Ontology::tests
diff --git a/tests/Ontology/ParamsBuilderTests.cpp b/tests/chains/Ontology/ParamsBuilderTests.cpp
similarity index 91%
rename from tests/Ontology/ParamsBuilderTests.cpp
rename to tests/chains/Ontology/ParamsBuilderTests.cpp
index 0534472852d..e9262dc59a7 100644
--- a/tests/Ontology/ParamsBuilderTests.cpp
+++ b/tests/chains/Ontology/ParamsBuilderTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "HexCoding.h"
 #include "PublicKey.h"
@@ -11,7 +9,9 @@
 #include "Ontology/Ont.h"
 #include "Ontology/ParamsBuilder.h"
 
+#include <algorithm>
 #include <gtest/gtest.h>
+#include <iostream>
 
 namespace TW::Ontology::tests {
 
@@ -31,6 +31,7 @@ TEST(ParamsBuilder, pushInt) {
                                     4294967296,
                                     68719476735,
                                     68719476736,
+                                    281474976710655,
                                     72057594037927935,
                                     1152921504606846975};
     std::vector<std::string> codeVector{"00",
@@ -48,6 +49,7 @@ TEST(ParamsBuilder, pushInt) {
                                         "050000000001",
                                         "05ffffffff0f",
                                         "050000000010",
+                                        "07ffffffffffff00",
                                         "08ffffffffffffff00",
                                         "08ffffffffffffff0f"};
     for (auto index = 0ul; index < numVector.size(); index++) {
@@ -84,7 +86,7 @@ TEST(ParamsBuilder, transferInvokeCode) {
 
 TEST(ParamsBuilder, invokeOep4Code) {
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
 
     NeoVmParamValue::ParamArray args{};
     std::string method{"name"};
@@ -96,7 +98,7 @@ TEST(ParamsBuilder, invokeOep4Code) {
 
 TEST(ParamsBuilder, invokeOep4CodeBalanceOf) {
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     auto user_addr = Address("AeaThtPwh5kAYnjHavzwmvxPd725nVTvbM");
     Data d(std::begin(user_addr._data), std::end(user_addr._data));
 
@@ -110,7 +112,7 @@ TEST(ParamsBuilder, invokeOep4CodeBalanceOf) {
 
 TEST(OntologyOep4, invokeOep4CodeTransfer) {
     std::string wing_hex{"ff31ec74d01f7b7d45ed2add930f5d2239f7de33"};
-    auto wing_addr = Address(parse_hex(wing_hex.begin(), wing_hex.end()));
+    auto wing_addr = Address(parse_hex(wing_hex));
     auto from = Address("APniYDGozkhUh8Tk7pe35aah2HGJ4fJfVd");
     auto to = Address("AVY6LfvxauVQAVHDV9hC3ZCv7cQqzfDotH");
     uint64_t amount = 253;
diff --git a/tests/chains/Ontology/TWAnySignerTests.cpp b/tests/chains/Ontology/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..3d9754490aa
--- /dev/null
+++ b/tests/chains/Ontology/TWAnySignerTests.cpp
@@ -0,0 +1,331 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "TestUtilities.h"
+
+#include "Ontology/Oep4TxBuilder.h"
+#include "Ontology/OngTxBuilder.h"
+#include "Ontology/OntTxBuilder.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Ontology::tests {
+
+TEST(TWAnySingerOntology, OntBalanceOf) {
+    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
+    // "Version":"1.0.0","00d1885602ec0000000000000000000000000000000000000000000000000000000000000000000000004d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f661400000000000000000000000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b650000"}'
+    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
+    //
+    // {"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"00","Notify":[]},"Version":"1.0.0"}
+    auto input = Proto::SigningInput();
+    input.set_contract("ONT");
+    input.set_method("balanceOf");
+    input.set_query_address("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD");
+    input.set_nonce(3959576200);
+    auto data = OntTxBuilder::build(input);
+    auto rawTx = hex(data);
+    EXPECT_EQ("00d1885602ec000000000000000000000000000000000000000000000000000000000000000000000000"
+              "4d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f6614000000000000000000"
+              "00000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b650000",
+              rawTx);
+}
+
+TEST(TWAnySingerOntology, OntDecimals) {
+    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
+    // "Version":"1.0.0","Data":"00d1bdc12a48000000000000000000000000000000000000000000000000000000000000000000000000380008646563696d616c731400000000000000000000000000000000000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b650000"}'
+    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
+    //
+    //{"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"","Notify":[]},"Version":"1.0.0"}
+    auto input = Proto::SigningInput();
+    input.set_contract("ONT");
+    input.set_method("decimals");
+    input.set_nonce(1210761661);
+    auto data = OntTxBuilder::build(input);
+    auto rawTx = hex(data);
+    EXPECT_EQ("00d1bdc12a48000000000000000000000000000000000000000000000000000000000000000000000000"
+              "380008646563696d616c731400000000000000000000000000000000000000010068164f6e746f6c6f67"
+              "792e4e61746976652e496e766f6b650000",
+              rawTx);
+}
+
+TEST(TWAnySingerOntology, OntTransfer) {
+    // tx on polaris test net.
+    // https://explorer.ont.io/transaction/4a672ce813d3fac9042e9472cf9b470f8a5e59a2deb41fd7b23a1f7479a155d5/testnet
+    auto ownerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+    auto payerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
+    auto input = Proto::SigningInput();
+    input.set_contract("ONT");
+    input.set_method("transfer");
+    input.set_nonce(2338116610);
+    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
+    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
+    input.set_to_address("Af1n2cZHhMZumNqKgw9sfCNoTWu9de4NDn");
+    input.set_amount(1);
+    input.set_gas_price(500);
+    input.set_gas_limit(20000);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeOntology);
+
+    EXPECT_EQ("00d102d45c8bf401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+              "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
+              "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+              "00000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140301766d925382a6e"
+              "bb2ebeb18d3741954c9370dcf6d9c45b34ce7b18bc42dcdb7cff28ddaf7f1048822c0ca21a0c4926323a"
+              "2497875b963f3b8cbd3717aa6e7c2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
+              "47125f927b7486ac414038466b25ac49a22ba8c301328ef049a61711b257987e85e25d63e0444a14e860"
+              "305a4cd3bb6ea2fe80fd293abb3c592e679c42c546cbf3baa051a07b28b374a6232103d9fd62df332403"
+              "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+              hex(output.encoded()));
+
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // EXPECT_EQ("00d102d45c8bf401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+    //           "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
+    //           "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+    //           "00000000010068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140301766d925382a6e"
+    //           "bb2ebeb18d3741954c9370dcf6d9c45b34ce7b18bc42dcdb8300d7215080efb87dd3f35de5f3b6d98aac"
+    //           "d6161fbc0845b82d0d8be4b8b6d52321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
+    //           "47125f927b7486ac414038466b25ac49a22ba8c301328ef049a61711b257987e85e25d63e0444a14e860"
+    //           "305a4cd3bb6ea2fe80fd293abb3c592e679c42c546cbf3baa051a07b28b374a6232103d9fd62df332403"
+    //           "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+    //           hex(output.encoded()));
+}
+
+TEST(TWAnySingerOntology, OngDecimals) {
+    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
+    // "Version":"1.0.0","Data":"00d1e3f2e679000000000000000000000000000000000000000000000000000000000000000000000000380008646563696d616c731400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b650000"}'
+    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
+    //
+    // {"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"09","Notify":[]},"Version":"1.0.0"}
+    auto input = Proto::SigningInput();
+    input.set_contract("ONG");
+    input.set_method("decimals");
+    input.set_nonce(2045178595);
+    auto data = OngTxBuilder::build(input);
+    auto rawTx = hex(data);
+    EXPECT_EQ("00d1e3f2e679000000000000000000000000000000000000000000000000000000000000000000000000"
+              "380008646563696d616c731400000000000000000000000000000000000000020068164f6e746f6c6f67"
+              "792e4e61746976652e496e766f6b650000",
+              rawTx);
+}
+
+TEST(TWAnySingerOntology, OngBalanceOf) {
+    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
+    // "Version":"1.0.0","Data":"00d1ab1ad0cf0000000000000000000000000000000000000000000000000000000000000000000000004d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f661400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b650000"}'
+    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
+    //
+    //{"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"27e74d240609","Notify":[]},"Version":"1.0.0"}
+    auto input = Proto::SigningInput();
+    input.set_contract("ONG");
+    input.set_method("balanceOf");
+    input.set_query_address("ANDfjwrUroaVtvBguDtrWKRMyxFwvVwnZD");
+    input.set_nonce(3486522027);
+    auto data = OngTxBuilder::build(input);
+    auto rawTx = hex(data);
+    EXPECT_EQ("00d1ab1ad0cf000000000000000000000000000000000000000000000000000000000000000000000000"
+              "4d1446b1a18af6b7c9f8a4602f9f73eeb3030f0c29b70962616c616e63654f6614000000000000000000"
+              "00000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b650000",
+              rawTx);
+}
+
+TEST(TWAnySingerOntology, OngTransfer) {
+    // tx on polaris test net.
+    // https://explorer.ont.io/transaction/8a1e59396dcb72d9095088f50d1023294bf9c7b79ba693bd641578f748cbd4e6/testnet
+    auto ownerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+    auto payerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
+    auto input = Proto::SigningInput();
+    input.set_contract("ONG");
+    input.set_method("transfer");
+    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
+    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
+    input.set_to_address("Af1n2cZHhMZumNqKgw9sfCNoTWu9de4NDn");
+    input.set_amount(1);
+    input.set_gas_price(500);
+    input.set_gas_limit(20000);
+    input.set_nonce(2827104669);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeOntology);
+
+    EXPECT_EQ("00d19d3182a8f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+              "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
+              "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+              "00000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140e27e935b87855efa"
+              "d62bb76b21c7b591f445f867eff86f888ca6ee1870ecd80f73b8ab199a4d757b4c7b9ed46c4ff8cfa8ae"
+              "faa90b7fb6485e358034448cba752321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
+              "47125f927b7486ac4140450047b2efb384129a16ec4c707790e9379b978cc7085170071d8d7c5c037d74"
+              "3b078bd4e21bb4404c0182a32ee05260e22454dffb34dacccf458dfbee6d32db232103d9fd62df332403"
+              "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+              hex(output.encoded()));
+
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // EXPECT_EQ("00d19d3182a8f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+    //           "7100c66b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc814feec06b79ed299ea06fcb94aba"
+    //           "c41aaf3ead76586a7cc8516a7cc86c51c1087472616e7366657214000000000000000000000000000000"
+    //           "00000000020068164f6e746f6c6f67792e4e61746976652e496e766f6b6500024140e27e935b87855efa"
+    //           "d62bb76b21c7b591f445f867eff86f888ca6ee1870ecd80f8c4754e565b28a85b384612b93b007301438"
+    //           "00049b97e83c95844a8eb7d66adc2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e4"
+    //           "47125f927b7486ac4140450047b2efb384129a16ec4c707790e9379b978cc7085170071d8d7c5c037d74"
+    //           "c4f8742a1de44bc0b3fe7d5cd11fad9edac2a5cdabe2c3b824743cc70df5f276232103d9fd62df332403"
+    //           "d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+    //           hex(output.encoded()));
+}
+
+TEST(TWAnySingerOntology, OngWithdraw) {
+    // tx on polaris test net.
+    // https://explorer.ont.io/transaction/433cb7ed4dec32d55be0db104aaa7ade4c7dbe0f62ef94f7b17829f7ac7cd75b/testnet
+    auto ownerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+    auto payerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
+    auto input = Proto::SigningInput();
+    input.set_contract("ONG");
+    input.set_method("withdraw");
+    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
+    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
+    input.set_to_address("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5");
+    input.set_amount(1);
+    input.set_gas_price(500);
+    input.set_gas_limit(20000);
+    input.set_nonce(3784713724);
+    auto data = OngTxBuilder::build(input);
+    auto rawTx = hex(data);
+    EXPECT_EQ(
+        "00d1fc2596e1f401000000000000204e00000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df68b00c6"
+        "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81400000000000000000000000000000000000000"
+        "016a7cc814fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc8516a7cc86c0c7472616e7366657246726f"
+        "6d1400000000000000000000000000000000000000020068164f6e746f6c6f67792e4e61746976652e496e766f"
+        "6b65000241400ef868766eeafce71b6ff2a4332aa4363980e66c55ef70aea80e3baee1daf02b43ae6d4c7c8a17"
+        "8b92f523602426eaa4205ab0ae5944b0fdae0abcbabaefbc4c2321031bec1250aa8f78275f99a6663688f31085"
+        "848d0ed92f1203e447125f927b7486ac4140c49c23092cd9003247a55792211d816010c7d6204c6e07a6e017da"
+        "70007b25ee2ab3665103f846300cd03512040275b78ae46812d40cd611058decdff5551e1f232103d9fd62df33"
+        "2403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+        rawTx);
+}
+
+TEST(TWAnySingerOntology, Oep4Decimal) {
+    auto input = Proto::SigningInput();
+    input.set_contract("ff31ec74d01f7b7d45ed2add930f5d2239f7de33");
+    input.set_method("decimals");
+    input.set_nonce(0x1234);
+    auto data = Oep4TxBuilder::build(input);
+    auto rawTx = hex(data);
+    EXPECT_EQ("00d1341200000000000000000000000000000000000000000000000000000000000000000000000000002000c108646563696d616c736733def739225d0f93dd2aed457d7b1fd074ec31ff0000", rawTx);
+}
+
+TEST(TWAnySingerOntology, Oep4BalanceOf) {
+    // read only method don't need signer
+    auto input = Proto::SigningInput();
+    input.set_contract("ff31ec74d01f7b7d45ed2add930f5d2239f7de33");
+    input.set_method("balanceOf");
+    input.set_query_address("AeaThtPwh5kAYnjHavzwmvxPd725nVTvbM");
+    input.set_nonce(0x1234);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeOntology);
+    EXPECT_EQ("00d1341200000000000000000000000000000000000000000000000000000000000000000000000000003614fa2254ffaee3c3e1172e8e98f800e4105c74988e51c10962616c616e63654f666733def739225d0f93dd2aed457d7b1fd074ec31ff0000", hex(output.encoded()));
+}
+
+TEST(TWAnySingerOntology, Oep4Transfer) {
+    // https://explorer.ont.io/testnet/tx/710266b8d497e794ecd47e01e269e4aeb6f4ff2b01eaeafc4cd371e062b13757
+    auto ownerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
+    auto payerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+    auto input = Proto::SigningInput();
+    input.set_contract("ff31ec74d01f7b7d45ed2add930f5d2239f7de33");
+    input.set_method("transfer");
+    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
+    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
+    input.set_to_address("AVY6LfvxauVQAVHDV9hC3ZCv7cQqzfDotH");
+    input.set_amount(233);
+    input.set_gas_price(2500);
+    input.set_gas_limit(50000);
+    input.set_nonce(0x1234);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeOntology);
+
+    auto rawTx = data(output.encoded());
+    auto rawTxHex = hex(rawTx);
+
+    EXPECT_EQ("00d134120000c40900000000000050c3000000000000fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a4d02e9001496f688657b95be51c11a87b51adfda4ab69e9cbb1457e9d1a61f9aafa798b6c7fbeae35639681d7df653c1087472616e736665726733def739225d0f93dd2aed457d7b1fd074ec31ff00024140bd2923854d7b84b97a107bb3cddf18c8e3dddd2f36b41a1f5f5b23366484daa22871cfb819923fe01e9cb1e9ed16baa2b05c2feb76bcbe2ec125f72701c5e965232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac41406d638653597774ce45812ea2653250806b657b32b7c6ad3e027ddeba91e9a9da4bb5dacd23dafba868cb31bacb38b4a6ff2607682a426c1dc09b05a1e158d6cd2321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac", hex(output.encoded()));
+
+    // TODO uncomment when nist256p1 Rust implementation is enabled.
+    // EXPECT_EQ("00d134120000c40900000000000050c3000000000000fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a4d02e9001496f688657b95be51c11a87b51adfda4ab69e9cbb1457e9d1a61f9aafa798b6c7fbeae35639681d7df653c1087472616e736665726733def739225d0f93dd2aed457d7b1fd074ec31ff00024140bd2923854d7b84b97a107bb3cddf18c8e3dddd2f36b41a1f5f5b23366484daa2d78e3046e66dc020e1634e1612e9455d0c8acac2305ae0563293d39bfa9d3bec232103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac41406d638653597774ce45812ea2653250806b657b32b7c6ad3e027ddeba91e9a9dab44a2531dc2504589734ce4534c74b58bdc0f3457cd53267331ec5211b0a4e842321031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac", rawTxHex);
+}
+
+TEST(TWAnySingerOntology, Oep4TokenBalanceOf) {
+    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
+    // "Version":"1.0.0","00d1a119d4f700000000000000000000000000000000000000000000000000000000000000000000000036144a03aaf03d12fd4d46bfcc260bda73ecef33b83b51c10962616c616e63654f6667e77fb36f54874c29f503d301d91d8ab98eb2342f0000"}'
+    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
+    //
+    // {"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"40922df506","Notify":[]},"Version":"1.0.0"}
+    auto input = Proto::SigningInput();
+    input.set_contract("2f34b28eb98a1dd901d303f5294c87546fb37fe7");
+    input.set_method("balanceOf");
+    input.set_query_address("ANXE3XovCwBH1ckQnPc6vKYiTwRXyrVToD");
+    input.set_nonce(4157872545);
+    auto data = Oep4TxBuilder::build(input);
+    auto rawTx = hex(data);
+    EXPECT_EQ("00d1a119d4f700000000000000000000000000000000000000000000000000000000000000000000000036144a03aaf03d12fd4d46bfcc260bda73ecef33b83b51c10962616c616e63654f6667e77fb36f54874c29f503d301d91d8ab98eb2342f0000",
+              rawTx);
+}
+
+TEST(TWAnySingerOntology, Oep4TokenDecimals) {
+    // curl  -H "Content-Type: application/json"  -X POST -d '{"Action":"sendrawtransaction",
+    // "Version":"1.0.0","Data":"00d1b1050fb40000000000000000000000000000000000000000000000000000000000000000000000002000c108646563696d616c7367e77fb36f54874c29f503d301d91d8ab98eb2342f0000"}'
+    // http://polaris2.ont.io:20334/api/v1/transaction?preExec=1
+    //
+    //{"Action":"sendrawtransaction","Desc":"SUCCESS","Error":0,"Result":{"State":1,"Gas":20000,"Result":"08","Notify":[]},"Version":"1.0.0"}
+    auto input = Proto::SigningInput();
+    input.set_contract("2f34b28eb98a1dd901d303f5294c87546fb37fe7");
+    input.set_method("decimals");
+    input.set_nonce(3020883377);
+    auto data = Oep4TxBuilder::build(input);
+    auto rawTx = hex(data);
+    EXPECT_EQ("00d1b1050fb40000000000000000000000000000000000000000000000000000000000000000000000002000c108646563696d616c7367e77fb36f54874c29f503d301d91d8ab98eb2342f0000",
+              rawTx);
+}
+
+TEST(TWAnySingerOntology, Oep4TokenTransfer) {
+    auto ownerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
+    auto payerPrivateKey =
+        parse_hex("4646464646464646464646464646464646464646464646464646464646464652");
+    auto input = Proto::SigningInput();
+    input.set_contract("2f34b28eb98a1dd901d303f5294c87546fb37fe7");
+    input.set_method("transfer");
+    input.set_nonce(2232822985);
+    input.set_owner_private_key(ownerPrivateKey.data(), ownerPrivateKey.size());
+    input.set_payer_private_key(payerPrivateKey.data(), payerPrivateKey.size());
+    input.set_to_address("ARR6PsaBwRttzCmyxCMhL7NmFk1LqExD7L");
+    input.set_amount(1000);
+    input.set_gas_price(2500);
+    input.set_gas_limit(200);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeOntology);
+
+    EXPECT_EQ("00d1c92c1685c409000000000000c80000000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df6"
+              "4d02e8031469c329fbb30a490979ea1a6f0b6a3a91235f6bd714fbacc8214765d457c8e3f2b5a1d3c498"
+              "1a2e9d2a53c1087472616e7366657267e77fb36f54874c29f503d301d91d8ab98eb2342f000241402b62"
+              "b4c6bc07667019e5c9a1fa1b83ca71ee23ddb763446406b1b03706bf50a6180b13e255a08ade7da376df"
+              "d34faee7f51c4f0056325fa79aaf7de0ef25d64e2321031bec1250aa8f78275f99a6663688f31085848d"
+              "0ed92f1203e447125f927b7486ac41408aa88ae92ea30a9e5059de8594f462af7dfa7545fffa6654e94e"
+              "edfb910bcd5452a26d1554d5d980db84d00dd330aab2fc68316660c8ae5af2c806085157e8ce232103d9"
+              "fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac",
+              hex(output.encoded()));
+}
+
+} // namespace TW::Ontology::tests
diff --git a/tests/chains/Ontology/TWCoinTypeTests.cpp b/tests/chains/Ontology/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..026dd2a2fc3
--- /dev/null
+++ b/tests/chains/Ontology/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWOntologyCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOntology));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOntology, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOntology, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOntology));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOntology));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOntology), 0);
+    ASSERT_EQ(TWBlockchainOntology, TWCoinTypeBlockchain(TWCoinTypeOntology));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeOntology));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeOntology));
+    assertStringsEqual(symbol, "ONT");
+    assertStringsEqual(txUrl, "https://explorer.ont.io/transaction/t123");
+    assertStringsEqual(accUrl, "https://explorer.ont.io/address/a12");
+    assertStringsEqual(id, "ontology");
+    assertStringsEqual(name, "Ontology");
+}
diff --git a/tests/chains/Ontology/TransactionCompilerTests.cpp b/tests/chains/Ontology/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..8315ae6180d
--- /dev/null
+++ b/tests/chains/Ontology/TransactionCompilerTests.cpp
@@ -0,0 +1,160 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Ontology.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Ontology::tests {
+
+TEST(OntologyCompiler, CompileWithSignatures) {
+    /// Prepare transaction input (protobuf)
+    const auto coin = TWCoinTypeOntology;
+    auto input = Ontology::Proto::SigningInput();
+    input.set_method("transfer");
+    input.set_owner_address("AaCTzuhEr6essEEKnSTuxD2GJkmGc4nuJp");
+    input.set_to_address("AWBzyqpXcSpgrWyzR6qzUGWc9ZoYT3Bsvk");
+    input.set_payer_address("AaCTzuhEr6essEEKnSTuxD2GJkmGc4nuJp");
+    input.set_amount(1);
+    input.set_gas_price(3500);
+    input.set_gas_limit(20000);
+    input.set_nonce(1);
+
+    /// Obtain preimage hash and check it
+    input.set_contract("ONT");
+    auto ontTxInputData = data(input.SerializeAsString());
+    const auto ontPreImageHashes = TransactionCompiler::preImageHashes(coin, ontTxInputData);
+    auto ontPreOutput = TxCompiler::Proto::PreSigningOutput();
+    ontPreOutput.ParseFromArray(ontPreImageHashes.data(), (int)ontPreImageHashes.size());
+    auto ontPreImageHash = ontPreOutput.data_hash();
+
+    input.set_contract("ONG");
+    auto ongTxInputData = data(input.SerializeAsString());
+    const auto ongPreImageHashes = TransactionCompiler::preImageHashes(coin, ongTxInputData);
+    auto ongPreOutput = TxCompiler::Proto::PreSigningOutput();
+    ongPreOutput.ParseFromArray(ongPreImageHashes.data(), (int)ongPreImageHashes.size());
+    auto ongPreImageHash = ongPreOutput.data_hash();
+
+    {
+        EXPECT_EQ(hex(ontPreImageHash),
+                  "d3770eb50f1fcddc17ac9d59f1b7e69c4916dbbe4c484cc6ba27dd0792aeb943");
+        EXPECT_EQ(hex(ongPreImageHash),
+                  "788066583071cfd05a4a10e5b897b9b81d2363c16fd98128ddc81891535567af");
+    }
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData =
+        parse_hex("038ea73c590f48c7d5a8ba544a928a0c8fb206aab60688793a054db9823602765a");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeNIST256p1);
+    const auto ontSignature =
+        parse_hex("b1678dfcda9b9b468d9a97a5b3021a680814180ca08cd17d9e3a9cf512b05a3b286fed9b8f635718"
+                  "c0aabddc9fc1acfbc48561577e35ef92ee97d7fa86e14f47");
+    const auto ongSignature =
+        parse_hex("d90c4d76e9d07d3e5c00e4a8768ce09ca66be05cfb7f48ad02632b4f08fcaa6f4e3f6f52eb4278c1"
+                  "579065e54ea5e696b7711f071298576fa7050b21ae614bbe");
+
+    // Verify signature (pubkey & hash & signature)
+    {
+        EXPECT_TRUE(publicKey.verify(ontSignature, TW::data(ontPreImageHash)));
+        EXPECT_TRUE(publicKey.verify(ongSignature, TW::data(ongPreImageHash)));
+    }
+
+    /// Compile transaction info
+    const Data ontOutputData = TransactionCompiler::compileWithSignatures(
+        coin, ontTxInputData, {ontSignature}, {publicKeyData});
+    const Data ongOutputData = TransactionCompiler::compileWithSignatures(
+        coin, ongTxInputData, {ongSignature}, {publicKeyData});
+    auto ontOutput = Ontology::Proto::SigningOutput();
+    auto ongOutput = Ontology::Proto::SigningOutput();
+    ontOutput.ParseFromArray(ontOutputData.data(), (int)ontOutputData.size());
+    ongOutput.ParseFromArray(ongOutputData.data(), (int)ongOutputData.size());
+    const auto ontExpectedTx =
+        "00d101000000ac0d000000000000204e000000000000ca18ec37ac94f19588926a5302ded54cd909a76e7100c6"
+        "6b14ca18ec37ac94f19588926a5302ded54cd909a76e6a7cc8149e21dda3257e18eb033d9451dda1d9ac8bcfa4"
+        "776a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f"
+        "6e746f6c6f67792e4e61746976652e496e766f6b6500014140b1678dfcda9b9b468d9a97a5b3021a680814180c"
+        "a08cd17d9e3a9cf512b05a3b286fed9b8f635718c0aabddc9fc1acfbc48561577e35ef92ee97d7fa86e14f4723"
+        "21038ea73c590f48c7d5a8ba544a928a0c8fb206aab60688793a054db9823602765aac";
+    const auto ongExpectedTx =
+        "00d101000000ac0d000000000000204e000000000000ca18ec37ac94f19588926a5302ded54cd909a76e7100c6"
+        "6b14ca18ec37ac94f19588926a5302ded54cd909a76e6a7cc8149e21dda3257e18eb033d9451dda1d9ac8bcfa4"
+        "776a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000020068164f"
+        "6e746f6c6f67792e4e61746976652e496e766f6b6500014140d90c4d76e9d07d3e5c00e4a8768ce09ca66be05c"
+        "fb7f48ad02632b4f08fcaa6f4e3f6f52eb4278c1579065e54ea5e696b7711f071298576fa7050b21ae614bbe23"
+        "21038ea73c590f48c7d5a8ba544a928a0c8fb206aab60688793a054db9823602765aac";
+
+    {
+        EXPECT_EQ(hex(ontOutput.encoded()), ontExpectedTx);
+        EXPECT_EQ(hex(ongOutput.encoded()), ongExpectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, ontTxInputData, {ongSignature, ongSignature}, {publicKey.bytes});
+        Ontology::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+
+    { // Negative: empty signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, ontTxInputData, {}, {});
+        Ontology::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    // OEP4Token transfer test case
+    input.set_method("transfer");
+    input.set_contract("2f34b28eb98a1dd901d303f5294c87546fb37fe7");
+    input.set_owner_address("Aa8QcHJ8tbRXyjpG6FHo7TysjKXxkd1Yf2");
+    input.set_to_address("ARR6PsaBwRttzCmyxCMhL7NmFk1LqExD7L");
+    input.set_payer_address("Aa8QcHJ8tbRXyjpG6FHo7TysjKXxkd1Yf2");
+    input.set_amount(1000);
+    input.set_gas_price(2500);
+    input.set_gas_limit(20000);
+    input.set_nonce(1);
+
+    auto oepTxInputData = data(input.SerializeAsString());
+    const auto oepPreImageHashes = TransactionCompiler::preImageHashes(coin, oepTxInputData);
+    auto oepPreOutput = TxCompiler::Proto::PreSigningOutput();
+    oepPreOutput.ParseFromArray(oepPreImageHashes.data(), (int)oepPreImageHashes.size());
+    auto oepPreImageHash = oepPreOutput.data_hash();
+    EXPECT_EQ(hex(oepPreImageHash),
+              "5be4a3be92a49ce2af800c94c7c44eeb8cd345c25541f63e545edc06bd72c0ed");
+
+    const auto oepPublicKeyData =
+        parse_hex("03932a08085b4bd7adcf8915f805ab35ad51f58ebbd09783b01bb4c44e503444f9");
+    const PublicKey opePublicKey = PublicKey(oepPublicKeyData, TWPublicKeyTypeNIST256p1);
+    const auto oepSignature =
+        parse_hex("55aff2726c5e17dd6a6bbdaf5200442f4c9890a0cc044fb13d4a09918893dce261bb14eec2f578b590ed5c925f66bcfeddf794bee6a014c65e049f544953cb09");
+    EXPECT_TRUE(opePublicKey.verify(oepSignature, TW::data(oepPreImageHash)));
+
+    const Data oepOutputData = TransactionCompiler::compileWithSignatures(
+        coin, oepTxInputData, {oepSignature}, {oepPublicKeyData});
+    auto oepOutput = Ontology::Proto::SigningOutput();
+    oepOutput.ParseFromArray(oepOutputData.data(), (int)oepOutputData.size());
+    const auto oepExpectedTx =
+        "00d101000000c409000000000000204e000000000000c9546dcef4038ce3b64e79d079b3c97a8931c7174d02e8"
+        "031469c329fbb30a490979ea1a6f0b6a3a91235f6bd714c9546dcef4038ce3b64e79d079b3c97a8931c71753c1"
+        "087472616e7366657267e77fb36f54874c29f503d301d91d8ab98eb2342f0001414055aff2726c5e17dd6a6bbd"
+        "af5200442f4c9890a0cc044fb13d4a09918893dce261bb14eec2f578b590ed5c925f66bcfeddf794bee6a014c6"
+        "5e049f544953cb09232103932a08085b4bd7adcf8915f805ab35ad51f58ebbd09783b01bb4c44e503444f9ac";
+    EXPECT_EQ(hex(oepOutput.encoded()), oepExpectedTx);
+}
+
+} // namespace TW::Ontology::tests
diff --git a/tests/chains/Ontology/TransactionTests.cpp b/tests/chains/Ontology/TransactionTests.cpp
new file mode 100644
index 00000000000..43def521309
--- /dev/null
+++ b/tests/chains/Ontology/TransactionTests.cpp
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include "Ontology/ParamsBuilder.h"
+#include "Ontology/Signer.h"
+#include "Ontology/Transaction.h"
+
+#include <list>
+
+#include <gtest/gtest.h>
+
+namespace TW::Ontology::tests {
+
+TEST(OntologyTransaction, validity) {
+    std::vector<uint8_t> ontContract{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+                                     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01};
+    auto fromAddress = Address("AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5");
+    auto toAddress = Address("APniYDGozkhUh8Tk7pe35aah2HGJ4fJfVd");
+    uint64_t amount = 1;
+    NeoVmParamValue::ParamList transferParam{fromAddress._data, toAddress._data, amount};
+    NeoVmParamValue::ParamArray args{transferParam};
+    auto invokeCode = ParamsBuilder::buildNativeInvokeCode(ontContract, 0x00, "transfer", {args});
+    uint8_t version = 0;
+    uint8_t txType = 0xd1;
+    uint32_t nonce = 1552759011;
+    uint64_t gasPrice = 600;
+    uint64_t gasLimit = 300000;
+    auto tx =
+        Transaction(version, txType, nonce, gasPrice, gasLimit, toAddress.string(), invokeCode);
+    std::string hexTx =
+        "00d1e3388d5c5802000000000000e09304000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c6"
+        "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81457e9d1a61f9aafa798b6c7fbeae35639681d7d"
+        "f66a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f"
+        "6e746f6c6f67792e4e61746976652e496e766f6b650000";
+    EXPECT_EQ(hexTx, hex(tx.serialize()));
+    auto signer1 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464646")));
+    signer1.sign(tx);
+    hexTx =
+        "00d1e3388d5c5802000000000000e09304000000000057e9d1a61f9aafa798b6c7fbeae35639681d7df67100c6"
+        "6b14fbacc8214765d457c8e3f2b5a1d3c4981a2e9d2a6a7cc81457e9d1a61f9aafa798b6c7fbeae35639681d7d"
+        "f66a7cc8516a7cc86c51c1087472616e736665721400000000000000000000000000000000000000010068164f"
+        "6e746f6c6f67792e4e61746976652e496e766f6b6500014140e03a09d85f56d2ceb5817a1f3a430bab9bf0f469"
+        "da38afe4a5b33de258a06236d8e0a59d25918a49825455c99f91de9caf8071e38a589a530519705af9081eca23"
+        "21031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac";
+    EXPECT_EQ(520ul, hex(tx.serialize()).length());
+    EXPECT_EQ(hexTx.substr(0, 20), hex(tx.serialize()).substr(0, 20));
+    auto signer2 = Signer(PrivateKey(parse_hex("4646464646464646464646464646464646464646464646464646464646464652")));
+    signer2.addSign(tx);
+    auto result = tx.serialize();
+    auto verifyPosition1 =
+        hex(result).find("21031bec1250aa8f78275f99a6663688f31085848d0ed92f1203e447125f927b7486ac");
+    auto verifyPosition2 =
+        hex(result).find("2103d9fd62df332403d9114f3fa3da0d5aec9dfa42948c2f50738d52470469a1a1eeac");
+    EXPECT_EQ(450ul, verifyPosition1);
+    EXPECT_EQ(654ul, verifyPosition2);
+    EXPECT_EQ(724ul, hex(result).length());
+}
+
+} // namespace TW::Ontology::tests
diff --git a/tests/chains/OpBNBtestnet/TWCoinTypeTests.cpp b/tests/chains/OpBNBtestnet/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..aca675e68fb
--- /dev/null
+++ b/tests/chains/OpBNBtestnet/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWOpBNBtestnetCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeOpBNB;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x788ea8fb4a82dae957f1d3b18af3cd0bbde55a276e66bd17af8c869f24c03a0f"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x4eaf936c172b5e5511959167e8ab4f7031113ca3"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "opbnb");
+    assertStringsEqual(name, "OpBNB");
+    assertStringsEqual(symbol, "BNB");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "204");
+    assertStringsEqual(txUrl, "https://opbnbscan.com/tx/0x788ea8fb4a82dae957f1d3b18af3cd0bbde55a276e66bd17af8c869f24c03a0f");
+    assertStringsEqual(accUrl, "https://opbnbscan.com/address/0x4eaf936c172b5e5511959167e8ab4f7031113ca3");
+}
diff --git a/tests/chains/Optimism/TWCoinTypeTests.cpp b/tests/chains/Optimism/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..97be122198d
--- /dev/null
+++ b/tests/chains/Optimism/TWCoinTypeTests.cpp
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWOptimismCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeOptimism));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x6fd99288be9bf71eb002bb31da10a4fb0fbbb3c45ae73693b212f49c9db7df8f"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeOptimism, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x1f932361e31d206b4f6b2478123a9d0f8c761031"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeOptimism, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeOptimism));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeOptimism));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeOptimism), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeOptimism));
+
+    assertStringsEqual(symbol, "ETH");
+    assertStringsEqual(txUrl, "https://optimistic.etherscan.io/tx/0x6fd99288be9bf71eb002bb31da10a4fb0fbbb3c45ae73693b212f49c9db7df8f");
+    assertStringsEqual(accUrl, "https://optimistic.etherscan.io/address/0x1f932361e31d206b4f6b2478123a9d0f8c761031");
+    assertStringsEqual(id, "optimism");
+    assertStringsEqual(name, "OP Mainnet");
+}
diff --git a/tests/chains/POANetwork/TWCoinTypeTests.cpp b/tests/chains/POANetwork/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..b43bedb7d0f
--- /dev/null
+++ b/tests/chains/POANetwork/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWPOANetworkCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypePOANetwork));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypePOANetwork, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypePOANetwork, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypePOANetwork));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypePOANetwork));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypePOANetwork), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypePOANetwork));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypePOANetwork));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypePOANetwork));
+    assertStringsEqual(symbol, "POA");
+    assertStringsEqual(txUrl, "https://blockscout.com/poa/core/tx/t123");
+    assertStringsEqual(accUrl, "https://blockscout.com/poa/core/address/a12");
+    assertStringsEqual(id, "poa");
+    assertStringsEqual(name, "POA Network");
+}
diff --git a/tests/chains/Pactus/AddressTests.cpp b/tests/chains/Pactus/AddressTests.cpp
new file mode 100644
index 00000000000..c3bcb0a260d
--- /dev/null
+++ b/tests/chains/Pactus/AddressTests.cpp
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Pactus/Entry.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <gtest/gtest.h>
+
+namespace TW::Pactus::tests {
+
+TEST(PactusAddress, AddressData) {
+    auto string = STRING("pc1rspm7ps49gar9ft5g0tkl6lhxs8ygeakq87quh3");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypePactus));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "038077e0c2a5474654ae887aedfd7ee681c88cf6c0");
+}
+
+TEST(PactusAddress, FromPrivateKey) {
+    auto privateKey = PrivateKey(parse_hex("2134ae97465505dfd5a1fd05a8a0f146209c601eb3f1b0363b4cfe4b47ba1ab4"));
+    auto pubkey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    Entry entry;
+    auto address = entry.deriveAddress(TWCoinTypePactus, pubkey, TWDerivationDefault, std::monostate{});
+    ASSERT_EQ(address, "pc1r7jkvfnegf0rf5ua05fzu9krjhjxcrrygl3v4nl");
+}
+
+TEST(PactusAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("600d30a4373ae788e2d4a08f4728f45d259593fbdd9632bbe283c4c37ac6a3df"), TWPublicKeyTypeED25519);
+    Entry entry;
+    auto address = entry.deriveAddress(TWCoinTypePactus, publicKey, TWDerivationDefault, std::monostate{});
+    ASSERT_EQ(address, "pc1r7jkvfnegf0rf5ua05fzu9krjhjxcrrygl3v4nl");
+}
+
+} // namespace TW::Pactus::tests
\ No newline at end of file
diff --git a/tests/chains/Pactus/CoinTypeTests.cpp b/tests/chains/Pactus/CoinTypeTests.cpp
new file mode 100644
index 00000000000..cd28ee9de14
--- /dev/null
+++ b/tests/chains/Pactus/CoinTypeTests.cpp
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include "Pactus/Entry.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWHDWallet.h>
+#include <gtest/gtest.h>
+
+namespace TW::Pactus::tests {
+
+TEST(PactusCoinType, TWCoinType) {
+    const auto coin = TWCoinTypePactus;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes(""));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes(""));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "pactus");
+    assertStringsEqual(name, "Pactus");
+    assertStringsEqual(symbol, "PAC");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 9);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainPactus);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://pacviewer.com/transaction/");
+    assertStringsEqual(accUrl, "https://pacviewer.com/address/");
+}
+
+}
\ No newline at end of file
diff --git a/tests/chains/Pactus/CompilerTests.cpp b/tests/chains/Pactus/CompilerTests.cpp
new file mode 100644
index 00000000000..0d4a902e2d9
--- /dev/null
+++ b/tests/chains/Pactus/CompilerTests.cpp
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestCases.h"
+#include "TestUtilities.h"
+#include "TransactionCompiler.h"
+#include "proto/Pactus.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(PactusCompiler, CompileAndSign) {
+    for (const auto& testCase : TEST_CASES) {
+        auto input = testCase.createSigningInput();
+        auto inputString = input.SerializeAsString();
+        auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+        // Pre-hash the transaction.
+        auto preImageHashesData = TransactionCompiler::preImageHashes(TWCoinTypePactus, inputStrData);
+        TxCompiler::Proto::PreSigningOutput preSigningOutput;
+        preSigningOutput.ParseFromArray(preImageHashesData.data(), static_cast<int>(preImageHashesData.size()));
+        auto actualDataToSign = data(preSigningOutput.data());
+
+        EXPECT_EQ(preSigningOutput.error(), Common::Proto::OK);
+        EXPECT_EQ(hex(actualDataToSign), testCase.dataToSign);
+
+        // Sign the pre-hash data.
+        auto privateKey = PrivateKey(parse_hex(PRIVATE_KEY_HEX));
+        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519).bytes;
+        auto signature = privateKey.sign(actualDataToSign, TWCurveED25519);
+        EXPECT_EQ(hex(signature), testCase.signature);
+
+        // Compile the transaction.
+        auto outputData = TransactionCompiler::compileWithSignatures(TWCoinTypePactus, inputStrData, {signature}, {publicKey});
+        TW::Pactus::Proto::SigningOutput output;
+        output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        ASSERT_EQ(hex(output.signed_transaction_data()), testCase.signedData);
+        ASSERT_EQ(hex(output.signature()), testCase.signature);
+        ASSERT_EQ(hex(output.transaction_id()), testCase.transactionID);
+    }
+}
diff --git a/tests/chains/Pactus/SignerTests.cpp b/tests/chains/Pactus/SignerTests.cpp
new file mode 100644
index 00000000000..cbb469310c0
--- /dev/null
+++ b/tests/chains/Pactus/SignerTests.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TestCases.h"
+#include "TestUtilities.h"
+#include "TransactionCompiler.h"
+#include "proto/Pactus.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(PactusSigner, Sign) {
+    for (const auto& testCase : TEST_CASES) {
+        auto input = testCase.createSigningInput();
+
+        auto privateKey = PrivateKey(parse_hex(PRIVATE_KEY_HEX));
+        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::Pactus::Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypePactus);
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        ASSERT_EQ(hex(output.signed_transaction_data()), testCase.signedData);
+        ASSERT_EQ(hex(output.signature()), testCase.signature);
+        ASSERT_EQ(hex(output.transaction_id()), testCase.transactionID);
+    }
+}
diff --git a/tests/chains/Pactus/TestCases.h b/tests/chains/Pactus/TestCases.h
new file mode 100644
index 00000000000..1fc953b54e4
--- /dev/null
+++ b/tests/chains/Pactus/TestCases.h
@@ -0,0 +1,150 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include "proto/Pactus.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <string>
+
+const std::string PRIVATE_KEY_HEX = "4e51f1f3721f644ac7a193be7f5e7b8c2abaa3467871daf4eacb5d3af080e5d6";
+
+namespace TransferTransaction {
+// Successfully broadcasted transaction:
+// https://pacviewer.com/transaction/1b6b7226f7935a15f05371d1a1fefead585a89704ce464b7cc1d453d299d235f
+static TW::Pactus::Proto::SigningInput createSigningInput() {
+    TW::Pactus::Proto::SigningInput input;
+    TW::Pactus::Proto::TransactionMessage* trx = input.mutable_transaction();
+    trx->set_lock_time(2335524);
+    trx->set_fee(10000000);
+    trx->set_memo("wallet-core");
+
+    TW::Pactus::Proto::TransferPayload* pld = trx->mutable_transfer();
+    pld->set_sender("pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr");
+    pld->set_receiver("pc1r0g22ufzn8qtw0742dmfglnw73e260hep0k3yra");
+    pld->set_amount(200000000);
+
+    return input;
+}
+
+const std::string transactionID = "1b6b7226f7935a15f05371d1a1fefead585a89704ce464b7cc1d453d299d235f";
+const std::string signature = "4ed8fee3d8992e82660dd05bbe8608fc56ceabffdeeee61e3213b9b49d33a0fc"
+                              "8dea6d79ee7ec60f66433f189ed9b3c50b2ad6fa004e26790ee736693eda8506";
+const std::string dataToSign = "0124a3230080ade2040b77616c6c65742d636f726501037098338e0b6808119d"
+                               "fd4457ab806b9c2059b89b037a14ae24533816e7faaa6ed28fcdde8e55a7df21"
+                               "8084af5f";
+const std::string signedData = "000124a3230080ade2040b77616c6c65742d636f726501037098338e0b680811"
+                               "9dfd4457ab806b9c2059b89b037a14ae24533816e7faaa6ed28fcdde8e55a7df"
+                               "218084af5f4ed8fee3d8992e82660dd05bbe8608fc56ceabffdeeee61e3213b9"
+                               "b49d33a0fc8dea6d79ee7ec60f66433f189ed9b3c50b2ad6fa004e26790ee736"
+                               "693eda850695794161374b22c696dabb98e93f6ca9300b22f3b904921fbf560b"
+                               "b72145f4fa";
+} // namespace TransferTransaction
+
+namespace BondWithPublicKeyTransaction {
+// Successfully broadcasted transaction:
+// https://pacviewer.com/transaction/d194b445642a04ec78ced4448696e50b733f2f0b517a23871882c0eefaf1c28f
+
+static TW::Pactus::Proto::SigningInput createSigningInput() {
+    TW::Pactus::Proto::SigningInput input;
+    TW::Pactus::Proto::TransactionMessage* trx = input.mutable_transaction();
+    trx->set_lock_time(2339009);
+    trx->set_fee(10000000);
+    trx->set_memo("wallet-core");
+
+    TW::Pactus::Proto::BondPayload* pld = trx->mutable_bond();
+    pld->set_sender("pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr");
+    pld->set_receiver("pc1p9y5gmu9l002tt60wak9extgvwm69rq3a9ackrl");
+    pld->set_stake(1000000000);
+    pld->set_public_key("public1pnz75msstqdrq5eguvcwanug0zauhqjw2cc4flmez3qethnp68y64ehc4k69amapj7x4na2uda0snqz4yxujgx3jsse4f64fgy7jkh0xauvhrc5ts09vfk48g85t0js66hvajm6xruemsvlxqv3xvkyur8v9v0mtn");
+
+    return input;
+}
+
+const std::string transactionID = "d194b445642a04ec78ced4448696e50b733f2f0b517a23871882c0eefaf1c28f";
+const std::string signature = "0d7bc6d94927534b89e2f53bcfc9fc849e0e2982438955eda55b4338328adac7"
+                              "9d4ee3216d143f0e1629764ab650734f8ba188e716d71f9eff65e39ce7006300";
+const std::string dataToSign = "01c1b0230080ade2040b77616c6c65742d636f726502037098338e0b6808119d"
+                               "fd4457ab806b9c2059b89b0129288df0bf7bd4b5e9eeed8b932d0c76f451823d"
+                               "6098bd4dc20b03460a651c661dd9f10f17797049cac62a9fef228832bbcc3a39"
+                               "355cdf15b68bddf432f1ab3eab8debe1300aa43724834650866a9d552827a56b"
+                               "bcdde32e3c517079589b54e83d16f9435abb3b2de8c3e677067cc0644ccb1383"
+                               "3b8094ebdc03";
+const std::string signedData = "0001c1b0230080ade2040b77616c6c65742d636f726502037098338e0b680811"
+                               "9dfd4457ab806b9c2059b89b0129288df0bf7bd4b5e9eeed8b932d0c76f45182"
+                               "3d6098bd4dc20b03460a651c661dd9f10f17797049cac62a9fef228832bbcc3a"
+                               "39355cdf15b68bddf432f1ab3eab8debe1300aa43724834650866a9d552827a5"
+                               "6bbcdde32e3c517079589b54e83d16f9435abb3b2de8c3e677067cc0644ccb13"
+                               "833b8094ebdc030d7bc6d94927534b89e2f53bcfc9fc849e0e2982438955eda5"
+                               "5b4338328adac79d4ee3216d143f0e1629764ab650734f8ba188e716d71f9eff"
+                               "65e39ce700630095794161374b22c696dabb98e93f6ca9300b22f3b904921fbf"
+                               "560bb72145f4fa";
+} // namespace BondWithPublicKeyTransaction
+
+namespace BondWithoutPublicKeyTransaction {
+// Successfully broadcasted transaction:
+// https://pacviewer.com/transaction/f83f583a5c40adf93a90ea536a7e4b467d30ca4f308d5da52624d80c42adec80
+
+static TW::Pactus::Proto::SigningInput createSigningInput() {
+    TW::Pactus::Proto::SigningInput input;
+    TW::Pactus::Proto::TransactionMessage* trx = input.mutable_transaction();
+    trx->set_lock_time(2335580);
+    trx->set_fee(10000000);
+    trx->set_memo("wallet-core");
+
+    TW::Pactus::Proto::BondPayload* pld = trx->mutable_bond();
+    pld->set_sender("pc1rwzvr8rstdqypr80ag3t6hqrtnss9nwymcxy3lr");
+    pld->set_receiver("pc1p6taz5l2kq5ppnxv4agnqj48svnvsy797xpe6wd");
+    pld->set_stake(1000000000);
+
+    return input;
+}
+
+const std::string transactionID = "f83f583a5c40adf93a90ea536a7e4b467d30ca4f308d5da52624d80c42adec80";
+const std::string signature = "9e6279fb64067c7d7316ac74630bbb8589df268aa4548f1c7d85c087a8748ff0"
+                              "715b9149afbd94c5d8ee6b37c787ec63e963cbb38be513ebc436aa58f9a8f00d";
+const std::string dataToSign = "015ca3230080ade2040b77616c6c65742d636f726502037098338e0b6808119d"
+                               "fd4457ab806b9c2059b89b01d2fa2a7d560502199995ea260954f064d90278be"
+                               "008094ebdc03";
+const std::string signedData = "00015ca3230080ade2040b77616c6c65742d636f726502037098338e0b680811"
+                               "9dfd4457ab806b9c2059b89b01d2fa2a7d560502199995ea260954f064d90278"
+                               "be008094ebdc039e6279fb64067c7d7316ac74630bbb8589df268aa4548f1c7d"
+                               "85c087a8748ff0715b9149afbd94c5d8ee6b37c787ec63e963cbb38be513ebc4"
+                               "36aa58f9a8f00d95794161374b22c696dabb98e93f6ca9300b22f3b904921fbf"
+                               "560bb72145f4fa";
+
+} // namespace BondWithoutPublicKeyTransaction
+
+struct TestCase {
+    std::function<TW::Pactus::Proto::SigningInput()> createSigningInput;
+    std::string transactionID;
+    std::string signature;
+    std::string dataToSign;
+    std::string signedData;
+};
+
+const TestCase TEST_CASES[] = {
+    {
+        TransferTransaction::createSigningInput,
+        TransferTransaction::transactionID,
+        TransferTransaction::signature,
+        TransferTransaction::dataToSign,
+        TransferTransaction::signedData,
+    },
+    {
+        BondWithPublicKeyTransaction::createSigningInput,
+        BondWithPublicKeyTransaction::transactionID,
+        BondWithPublicKeyTransaction::signature,
+        BondWithPublicKeyTransaction::dataToSign,
+        BondWithPublicKeyTransaction::signedData,
+    },
+    {
+        BondWithoutPublicKeyTransaction::createSigningInput,
+        BondWithoutPublicKeyTransaction::transactionID,
+        BondWithoutPublicKeyTransaction::signature,
+        BondWithoutPublicKeyTransaction::dataToSign,
+        BondWithoutPublicKeyTransaction::signedData,
+    },
+};
\ No newline at end of file
diff --git a/tests/chains/Pactus/WalletTests.cpp b/tests/chains/Pactus/WalletTests.cpp
new file mode 100644
index 00000000000..bcd3076f398
--- /dev/null
+++ b/tests/chains/Pactus/WalletTests.cpp
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include "Pactus/Entry.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWHDWallet.h>
+#include <gtest/gtest.h>
+
+namespace TW::Pactus::tests {
+
+TEST(PactusWallet, DerivationPath) {
+    auto derivationPath = TWCoinTypeDerivationPath(TWCoinTypePactus);
+    assertStringsEqual(WRAPS(derivationPath), "m/44'/21888'/3'/0'");
+}
+
+TEST(PactusWallet, HDWallet) {
+    auto mnemonic = "abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon cactus";
+    auto passphrase = "";
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(STRING(mnemonic).get(), STRING(passphrase).get()));
+
+    auto derivationPath1 = TWStringCreateWithUTF8Bytes("m/44'/21888'/3'/0'");
+    auto privateKey1 = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypePactus, derivationPath1));
+    auto publicKey1 = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyEd25519(privateKey1.get()));
+    auto address1 = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey1.get(), TWCoinTypePactus));
+    auto addressStr1 = WRAPS(TWAnyAddressDescription(address1.get()));
+
+    auto derivationPath2 = TWStringCreateWithUTF8Bytes("m/44'/21888'/3'/1'");
+    auto privateKey2 = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypePactus, derivationPath2));
+    auto publicKey2 = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyEd25519(privateKey2.get()));
+    auto address2 = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey2.get(), TWCoinTypePactus));
+    auto addressStr2 = WRAPS(TWAnyAddressDescription(address2.get()));
+
+    assertStringsEqual(addressStr1, "pc1rcx9x55nfme5juwdgxd2ksjdcmhvmvkrygmxpa3");
+    assertStringsEqual(addressStr2, "pc1r7aynw9urvh66ktr3fte2gskjjnxzruflkgde94");
+    TWStringDelete(derivationPath1);
+    TWStringDelete(derivationPath2);
+}
+
+}
\ No newline at end of file
diff --git a/tests/chains/Pivx/AddressTests.cpp b/tests/chains/Pivx/AddressTests.cpp
new file mode 100644
index 00000000000..4032e352241
--- /dev/null
+++ b/tests/chains/Pivx/AddressTests.cpp
@@ -0,0 +1,51 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "HDWallet.h"
+#include "Bitcoin/Address.h"
+#include "PublicKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(PivxAddress, Valid) {
+    ASSERT_TRUE(Address::isValid(std::string("DLCk9wuF3r8CRbawUhrDpDHXAGfkHAC7if")));
+    ASSERT_TRUE(Address::isValid(std::string("DSHhD6WxT5RfG2deUzVfuC1jDuRfdDpsSo")));
+}
+
+TEST(PivxAddress, FromPublicKey) {
+    const auto publicKey = PublicKey(parse_hex("0273132ffeafdc0eec3aaef5684a320a677cc77ba43df81de944af4a7fc6de66c9"), TWPublicKeyTypeSECP256k1);
+    const auto address = Address(publicKey, TWCoinTypeP2pkhPrefix(TWCoinTypePivx));
+    EXPECT_EQ(address.string(), "D6E4vLacYhKc6RVxLNQg5j8rtWbAH8fybH");
+
+    auto wallet = HDWallet("shoot island position soft burden budget tooth cruel issue economy destroy above", "");
+    auto addr = wallet.deriveAddress(TWCoinTypePivx);
+    EXPECT_EQ(addr, "D81AqC8zKma3Cht4TbVuh4jyVVyLkZULCm");
+}
+
+TEST(PivxAddress, FromString) {
+    auto address = Address("D6E4vLacYhKc6RVxLNQg5j8rtWbAH8fybH");
+    ASSERT_EQ(address.string(), "D6E4vLacYhKc6RVxLNQg5j8rtWbAH8fybH");
+
+    address = Address("DSHhD6WxT5RfG2deUzVfuC1jDuRfdDpsSo");
+    ASSERT_EQ(address.string(), "DSHhD6WxT5RfG2deUzVfuC1jDuRfdDpsSo");
+}
+
+TEST(PivxAddress, AddressData) {
+    const auto publicKey = PublicKey(parse_hex("0273132ffeafdc0eec3aaef5684a320a677cc77ba43df81de944af4a7fc6de66c9"), TWPublicKeyTypeSECP256k1);
+    auto address = TW::deriveAddress(TWCoinTypePivx, publicKey);
+
+    auto data = TW::addressToData(TWCoinTypePivx, "D6E4vLacYhKc6RVxLNQg5j8rtWbAH8fybH");
+    ASSERT_EQ(hex(data), "0be8da968f9bc6c1c16b8c635544e757aade7013");
+    ASSERT_EQ(data, TW::addressToData(TWCoinTypePivx, address));
+
+    data = TW::addressToData(TWCoinTypePivx, "1G15VvshDxwFTnahZZECJfFwEkq9fP79"); // invalid address
+    ASSERT_EQ(data.size(), 0ul);
+}
\ No newline at end of file
diff --git a/tests/chains/Pivx/TWAnyAddressTests.cpp b/tests/chains/Pivx/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..9185d79531a
--- /dev/null
+++ b/tests/chains/Pivx/TWAnyAddressTests.cpp
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWPivx, Address) {
+    auto string = STRING("DSHhD6WxT5RfG2deUzVfuC1jDuRfdDpsSo");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypePivx));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "e7fae8ee6ecabaab1252f3b27679cb34f2406169");
+
+    string = STRING("D6E4vLacYhKc6RVxLNQg5j8rtWbAH8fybH");
+    addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypePivx));
+    string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "0be8da968f9bc6c1c16b8c635544e757aade7013");
+}
diff --git a/tests/chains/Pivx/TWCoinTypeTests.cpp b/tests/chains/Pivx/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..dc73c23eba3
--- /dev/null
+++ b/tests/chains/Pivx/TWCoinTypeTests.cpp
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWPivxCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypePivx));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypePivx));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypePivx));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypePivx), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypePivx));
+    ASSERT_EQ(13, TWCoinTypeP2shPrefix(TWCoinTypePivx));
+    ASSERT_EQ(30, TWCoinTypeP2pkhPrefix(TWCoinTypePivx));
+    assertStringsEqual(symbol, "PIVX");
+    assertStringsEqual(id, "pivx");
+    assertStringsEqual(name, "Pivx");
+}
diff --git a/tests/chains/Pivx/TransactionCompilerTests.cpp b/tests/chains/Pivx/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..b654b874273
--- /dev/null
+++ b/tests/chains/Pivx/TransactionCompilerTests.cpp
@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Bitcoin/Script.h"
+#include "Bitcoin/TransactionInput.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(PivxCompiler, CompileWithSignatures) {
+    // tx on mainnet
+    // https://pivx.ccore.online/transaction/e5376c954c748926c373eb08df50ad72b3869be230c659689f9d83c150efd6be
+
+    const auto coin = TWCoinTypePivx;
+    const int64_t amount = 87090;
+    const int64_t fee = 2910;
+    const std::string toAddress = "D6MrY5B9oZaCYNaXCbt2uvmjKC1nPgrgrq";
+
+    auto toScript = Bitcoin::Script::lockScriptForAddress(toAddress, coin);
+    ASSERT_EQ(hex(toScript.bytes), "76a9140d61d810a1ae2a9c4638808dd73b64e3ea54caf488ac");
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("DFsBL73ZaDAJkzv9DeBLEzX8Jh6kkmkfzV");
+    input.set_coin_type(coin);
+
+    auto txHash0 = parse_hex("1eda07bd98ea04d322d65facaed830024e264e356810e55111cf6d7c26dff3de");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(1);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(26910000);
+
+    auto utxoAddr0 = "D6E4vLacYhKc6RVxLNQg5j8rtWbAH8fybH";
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, coin);
+    ASSERT_EQ(hex(script0.bytes), "76a9140be8da968f9bc6c1c16b8c635544e757aade701388ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    EXPECT_EQ(input.utxo_size(), 1);
+
+    // Plan
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, coin);
+
+    plan.set_amount(amount);
+    plan.set_fee(fee);
+    plan.set_change(26820000);
+
+    // Extend input with accepted plan
+    *input.mutable_plan() = plan;
+
+    // Serialize input
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT((int)txInputData.size(), 0);
+
+    /// Step 2: Obtain preimage hashes
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    TW::Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), (int)preImageHashes.size()));
+
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].data_hash()),
+              "7d1af92dd981db6512142aa84c38385664d6751cc858a57e4adee34e6cae1449");
+
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].public_key_hash()), "0be8da968f9bc6c1c16b8c635544e757aade7013");
+
+    auto publicKeyHex = "0273132ffeafdc0eec3aaef5684a320a677cc77ba43df81de944af4a7fc6de66c9";
+    auto publicKey = PublicKey(parse_hex(publicKeyHex), TWPublicKeyTypeSECP256k1);
+    auto preImageHash = preSigningOutput.hash_public_keys()[0].data_hash();
+    auto signature = parse_hex("304402202bd34158770290fb304ec85d8a92671e003681e20fb64a346ac5bd8d3686571402207c64b662d85367a949cc275a15aa10713f91815c37cf2979408dc1aa9ddbf4ab");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(
+        publicKey.verifyAsDER(signature, TW::Data(preImageHash.begin(), preImageHash.end())));
+
+    // Simulate signatures, normally obtained from signature server.
+    std::vector<Data> signatureVec;
+    std::vector<Data> pubkeyVec;
+    signatureVec.push_back(signature);
+    pubkeyVec.push_back(publicKey.bytes);
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, signatureVec, pubkeyVec);
+
+    const auto ExpectedTx =
+        "0100000001def3df267c6dcf1151e51068354e264e0230d8aeac5fd622d304ea98bd07da1e010000006a47304402202bd34158770290fb304ec85d8a92671e003681e20fb64a346ac5bd8d3686571402207c64b662d85367a949cc275a15aa10713f91815c37cf2979408dc1aa9ddbf4ab01210273132ffeafdc0eec3aaef5684a320a677cc77ba43df81de944af4a7fc6de66c9ffffffff0232540100000000001976a9140d61d810a1ae2a9c4638808dd73b64e3ea54caf488aca03d9901000000001976a91475a6ba23a1faaceed874538fe42362b72a1a156588ac00000000";
+    {
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: not enough signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, pubkeyVec);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+    { // Negative: invalid public key
+        const auto publicKeyBlake =
+            parse_hex("b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9");
+        EXPECT_EXCEPTION(
+            TransactionCompiler::compileWithSignatures(
+                coin, txInputData, signatureVec, {publicKeyBlake}),
+            "Invalid public key");
+    }
+    { // Negative: wrong signature (formally valid)
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData,
+            {parse_hex("415502201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b349022"
+                       "00a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f3b51")},
+            pubkeyVec);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signing);
+    }
+}
diff --git a/tests/chains/Polkadot/AddressTests.cpp b/tests/chains/Polkadot/AddressTests.cpp
new file mode 100644
index 00000000000..47fb3a5d8ca
--- /dev/null
+++ b/tests/chains/Polkadot/AddressTests.cpp
@@ -0,0 +1,86 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Polkadot/Address.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+namespace TW::Polkadot::tests {
+
+TEST(PolkadotAddress, Validation) {
+    // Substrate ed25519
+    ASSERT_FALSE(Address::isValid("5FqqU2rytGPhcwQosKRtW1E3ha6BJKAjHgtcodh71dSyXhoZ"));
+    // Bitcoin
+    ASSERT_FALSE(Address::isValid("1ES14c7qLb5CYhLMUekctxLgc1FV2Ti9DA"));
+    // Kusama ed25519
+    ASSERT_FALSE(Address::isValid("FHKAe66mnbk8ke8zVWE9hFVFrJN1mprFPVmD5rrevotkcDZ"));
+    // Kusama secp256k1
+    ASSERT_FALSE(Address::isValid("FxQFyTorsjVsjjMyjdgq8w5vGx8LiA1qhWbRYcFijxKKchx"));
+    // Kusama sr25519
+    ASSERT_FALSE(Address::isValid("EJ5UJ12GShfh7EWrcNZFLiYU79oogdtXFUuDDZzk7Wb2vCe"));
+
+    // Polkadot ed25519
+    ASSERT_TRUE(Address::isValid("15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu"));
+    // Polkadot sr25519
+    ASSERT_TRUE(Address::isValid("15AeCjMpcSt3Fwa47jJBd7JzQ395Kr2cuyF5Zp4UBf1g9ony"));
+
+    ASSERT_TRUE(Address::isValid("cEYtw6AVMB27hFUs4gVukajLM7GqxwxUfJkbPY3rNToHMcCgb", 64));
+    ASSERT_FALSE(Address::isValid("JCViCkwMdGWKpf7Wogb8EFtDmaYTEZGEg6ah4svUPGnnpc7A", 64));
+
+    // Polymesh
+    ASSERT_TRUE(Address::isValid("2DxwekgWwK7sqVeuXGmaXLZUvwnewLTs2rvU2CFKLgvvYwCG", 12));
+    ASSERT_FALSE(Address::isValid("JCViCkwMdGWKpf7Wogb8EFtDmaYTEZGEg6ah4svUPGnnpc7A", 12));
+}
+
+TEST(PolkadotAddress, FromPrivateKey) {
+    // subkey phrase `chief menu kingdom stereo hope hazard into island bag trick egg route`
+    auto privateKey = PrivateKey(parse_hex("0x612d82bc053d1b4729057688ecb1ebf62745d817ddd9b595bc822f5f2ba0e41a"));
+    auto address = Address(privateKey.getPublicKey(TWPublicKeyTypeED25519));
+    ASSERT_EQ(address.string(), "15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu");
+}
+
+TEST(PolkadotAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("0xbeff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu");
+}
+
+TEST(PolkadotAddress, FromPublicKeyWithPrefix) {
+    auto publicKey = PublicKey(parse_hex("0x92fd9c237030356e26cfcc4568dc71055d5ec92dfe0ff903767e00611971bad3"), TWPublicKeyTypeED25519);
+    auto addressPolkadot = Address(publicKey, 0);
+    ASSERT_EQ(addressPolkadot.string(), "14KjL5vGAYJCbKgZJmFKDSjewtBpvaxx9YvRZvi7qmb5s8CC");
+
+    auto addressAstar = Address(publicKey, 5);
+    ASSERT_EQ(addressAstar.string(), "ZG2d3dH5zfqNchsqReS6x4nBJuJCW7Z6Fh5eLvdA3ZXGkPd");
+
+    auto addressParallel = Address(publicKey, 172);
+    ASSERT_EQ(addressParallel.string(), "p8EGHjWt7e1MYoD7V6WXvbPZWK9GSJiiK85kv2R7Ur7FisPUL");
+
+    // polymesh
+    publicKey = PublicKey(parse_hex("849e2f6b165d4b28b39ef3d98f86c0520d82bc349536324365c10af08f323f83"), TWPublicKeyTypeED25519);
+    auto addressPolymesh = Address(publicKey, 12);
+    ASSERT_EQ(addressPolymesh.string(), "2FSoQykVV3uWe5ChZuazMDHBoaZmCPPuoYx5KHL5VqXooDQW");
+}
+
+TEST(PolkadotAddress, FromString) {
+    auto address = Address("15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu");
+    ASSERT_EQ(address.string(), "15KRsCq9LLNmCxNFhGk55s5bEyazKefunDxUH24GFZwsTxyu");
+}
+
+TEST(PolkadotAddress, FromStringWithPrefix) {
+    auto addressKusama = Address("Fu3r514w83euSVV7q1MyFGWErUR2xDzXS2goHzimUn4S12D", 2);
+    ASSERT_EQ(addressKusama.string(), "Fu3r514w83euSVV7q1MyFGWErUR2xDzXS2goHzimUn4S12D");
+
+    auto addressParallel = Address("p8EGHjWt7e1MYoD7V6WXvbPZWK9GSJiiK85kv2R7Ur7FisPUL", 172);
+    ASSERT_EQ(addressParallel.string(), "p8EGHjWt7e1MYoD7V6WXvbPZWK9GSJiiK85kv2R7Ur7FisPUL");
+
+    // polymesh
+    auto addressPolymesh = Address("2FSoQykVV3uWe5ChZuazMDHBoaZmCPPuoYx5KHL5VqXooDQW", 12);
+    ASSERT_EQ(addressPolymesh.string(), "2FSoQykVV3uWe5ChZuazMDHBoaZmCPPuoYx5KHL5VqXooDQW");
+}
+
+} // namespace TW::Polkadot::tests
diff --git a/tests/chains/Polkadot/ExtrinsicTests.cpp b/tests/chains/Polkadot/ExtrinsicTests.cpp
new file mode 100644
index 00000000000..4f5c969722a
--- /dev/null
+++ b/tests/chains/Polkadot/ExtrinsicTests.cpp
@@ -0,0 +1,191 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Data.h"
+#include "HexCoding.h"
+#include "Polkadot/Extrinsic.h"
+#include "proto/Polkadot.pb.h"
+#include "uint256.h"
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace TW;
+
+namespace TW::Polkadot::tests {
+
+TEST(PolkadotExtrinsic, Polymesh_encodeTransferWithMemo) {
+    Polkadot::Proto::SigningInput input;
+    input.set_network(12);
+    input.set_multi_address(true);
+
+    auto* transfer = input.mutable_balance_call()->mutable_transfer();
+    transfer->set_to_address("2EB7wW2fYfFskkSx2d65ivn34ewpuEjcowfJYBL79ty5FsZF");
+    auto* callIndices = transfer->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x05);
+    callIndices->set_method_index(0x01);
+
+    auto value = store(1);
+    transfer->set_value(std::string(value.begin(), value.end()));
+    transfer->set_memo("MEMO PADDED WITH SPACES");
+
+    auto result = Polkadot::Extrinsic(input).encodeCall(input);
+    EXPECT_EQ(hex(result), "0501004c6c63e3dc083959f876788716b78885460b5f3c7ed9379f8d5f408e08639e0204014d454d4f20504144444544205749544820535041434553000000000000000000");
+}
+
+TEST(PolkadotExtrinsic, Polymesh_encodeAuthorizationJoinIdentity) {
+    Polkadot::Proto::SigningInput input;
+    input.set_network(12);
+    input.set_multi_address(true);
+
+    auto* identity = input.mutable_polymesh_call()->mutable_identity_call()->mutable_add_authorization();
+    identity->set_target("2FM6FpjQ6r5HTt7FGYSzskDNkwUyFsonMtwBpsnr9vwmCjhc");
+    auto* authCallIndices = identity->mutable_call_indices()->mutable_custom();
+    authCallIndices->set_module_index(0x07);
+    authCallIndices->set_method_index(0x0d);
+
+    auto result = Polkadot::Extrinsic(input).encodeCall(input);
+    EXPECT_EQ(hex(result), "070d0180436894d47a18e0bcfea6940bd90226f7104fbd037a259aeff6b47b8257c1320501000100010000");
+
+    auto* authData = identity->mutable_data();
+    authData->mutable_asset()->set_data({0x00});
+    authData->mutable_extrinsic()->set_data({0x00});
+    authData->mutable_portfolio()->set_data({0x00});
+
+    EXPECT_EQ(hex(result), hex(Polkadot::Extrinsic(input).encodeCall(input)));
+
+    // clear data
+    authData->clear_asset();
+    authData->clear_extrinsic();
+    authData->clear_portfolio();
+
+    EXPECT_EQ(hex(Polkadot::Extrinsic(input).encodeCall(input)), "070d0180436894d47a18e0bcfea6940bd90226f7104fbd037a259aeff6b47b8257c1320500000000");
+}
+
+TEST(PolkadotExtrinsic, Polymesh_encodeIdentity) {
+    Polkadot::Proto::SigningInput input;
+    input.set_network(12);
+    input.set_multi_address(true);
+
+    auto* key = input.mutable_polymesh_call()->mutable_identity_call()->mutable_join_identity_as_key();
+    key->set_auth_id(4875);
+    auto* callIndices = key->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x07);
+    callIndices->set_method_index(0x05);
+
+    auto result = Polkadot::Extrinsic(input).encodeCall(input);
+    EXPECT_EQ(hex(result), "07050b13000000000000");
+}
+
+TEST(PolkadotExtrinsic, Statemint_encodeAssetTransfer) {
+    // tx on mainnet
+    // https://statemint.subscan.io/extrinsic/2619512-2
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+
+    auto* transfer = input.mutable_balance_call()->mutable_asset_transfer();
+    transfer->set_to_address("14ixj163bkk2UEKLEXsEWosuFNuijpqEWZbX5JzN4yMHbUVD");
+    auto* callIndices = transfer->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x32);
+    callIndices->set_method_index(0x05);
+
+    auto value = store(999500000);
+    transfer->set_value(std::string(value.begin(), value.end()));
+    transfer->set_asset_id(1984);
+
+    auto result = Polkadot::Extrinsic(input).encodeCall(input);
+    // clang-format off
+    EXPECT_EQ(hex(result), "3205"
+                           "011f"
+                           "00"
+                           "a4b558a0342ae6e379a7ed00d23ff505f1101646cb279844496ad608943eda0d"
+                           "82a34cee");
+    // clang-format on
+}
+
+TEST(PolkadotExtrinsic, Statemint_encodeBatchAssetTransfer) {
+    // tx on mainnet
+    // https://statemint.subscan.io/extrinsic/2571849-2
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+
+    auto* transfer = input.mutable_balance_call()->mutable_batch_asset_transfer();
+    auto* batchCallIndices = transfer->mutable_call_indices()->mutable_custom();
+    batchCallIndices->set_module_index(0x28);
+    batchCallIndices->set_method_index(0x00);
+    transfer->set_fee_asset_id(0x00);
+
+    auto* t = transfer->add_transfers();
+    t->set_to_address("13wQDQTMM6E9g5WD27e6UsWWTwHLaW763FQxnkbVaoKmsBQy");
+    auto value = store(808081);
+    t->set_value(std::string(value.begin(), value.end()));
+    t->set_asset_id(1984);
+
+    auto* transferCallIndices = t->mutable_call_indices()->mutable_custom();
+    transferCallIndices->set_module_index(0x32);
+    transferCallIndices->set_method_index(0x06);
+
+    auto result = Polkadot::Extrinsic(input).encodeCall(input);
+    // clang-format off
+    EXPECT_EQ(hex(result), "2800"
+                           "04"
+                           "3206"
+                           "011f"
+                           "00"
+                           "81f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c91"
+                           "46523100");
+    // clang-format on
+}
+
+TEST(PolkadotExtrinsic, Kusama_encodeAssetTransferNoCallIndices) {
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+
+    auto* transfer = input.mutable_balance_call()->mutable_batch_asset_transfer();
+    transfer->set_fee_asset_id(0x00);
+
+    auto* t = transfer->add_transfers();
+    t->set_to_address("13wQDQTMM6E9g5WD27e6UsWWTwHLaW763FQxnkbVaoKmsBQy");
+    auto value = store(808081);
+    t->set_value(std::string(value.begin(), value.end()));
+    t->set_asset_id(1984);
+
+    EXPECT_THROW(Polkadot::Extrinsic(input).encodeCall(input), std::invalid_argument);
+}
+
+TEST(PolkadotExtrinsic, Polkadot_EncodePayloadWithNewSpec) {
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+
+    auto* transfer = input.mutable_balance_call()->mutable_asset_transfer();
+    transfer->set_to_address("14ixj163bkk2UEKLEXsEWosuFNuijpqEWZbX5JzN4yMHbUVD");
+    auto* callIndices = transfer->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x32);
+    callIndices->set_method_index(0x05);
+
+    auto value = store(999500000);
+    transfer->set_value(std::string(value.begin(), value.end()));
+    transfer->set_asset_id(1984);
+
+    input.set_spec_version(1002000);  // breaking change happens at version 1002005
+    auto result = Polkadot::Extrinsic(input).encodePayload();
+    EXPECT_EQ(hex(result), "3205011f00a4b558a0342ae6e379a7ed00d23ff505f1101646cb279844496ad608943eda0d82a34cee00000000104a0f0000000000");
+
+    input.set_spec_version(1002005);  // >= 1002005
+    result = Polkadot::Extrinsic(input).encodePayload();
+    EXPECT_EQ(hex(result), "3205011f00a4b558a0342ae6e379a7ed00d23ff505f1101646cb279844496ad608943eda0d82a34cee0000000000154a0f000000000000");
+
+    input.set_spec_version(1002006);  // >= 1002005
+    result = Polkadot::Extrinsic(input).encodePayload();
+    EXPECT_EQ(hex(result), "3205011f00a4b558a0342ae6e379a7ed00d23ff505f1101646cb279844496ad608943eda0d82a34cee0000000000164a0f000000000000");
+}
+
+
+} // namespace TW::Polkadot::tests
diff --git a/tests/Polkadot/SS58AddressTests.cpp b/tests/chains/Polkadot/SS58AddressTests.cpp
similarity index 94%
rename from tests/Polkadot/SS58AddressTests.cpp
rename to tests/chains/Polkadot/SS58AddressTests.cpp
index b8db84c66af..6482c70f1f0 100644
--- a/tests/Polkadot/SS58AddressTests.cpp
+++ b/tests/chains/Polkadot/SS58AddressTests.cpp
@@ -1,13 +1,11 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Polkadot/SS58Address.h"
 #include "HexCoding.h"
 #include "PublicKey.h"
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <gtest/gtest.h>
 #include <map>
diff --git a/tests/Polkadot/ScaleCodecTests.cpp b/tests/chains/Polkadot/ScaleCodecTests.cpp
similarity index 77%
rename from tests/Polkadot/ScaleCodecTests.cpp
rename to tests/chains/Polkadot/ScaleCodecTests.cpp
index c31892fddea..7202e84037d 100644
--- a/tests/Polkadot/ScaleCodecTests.cpp
+++ b/tests/chains/Polkadot/ScaleCodecTests.cpp
@@ -1,13 +1,12 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 
 #include "HexCoding.h"
 #include "Polkadot/ScaleCodec.h"
 #include "Kusama/Address.h"
+#include "uint256.h"
 
 #include <gtest/gtest.h>
 
@@ -35,7 +34,7 @@ TEST(PolkadotCodec, EncodeCompact) {
 
     ASSERT_EQ(hex(encodeCompact(72057594037927935)), "0fffffffffffffff");
     ASSERT_EQ(hex(encodeCompact(72057594037927936)), "130000000000000001");
-    
+
     ASSERT_EQ(hex(encodeCompact(18446744073709551615u)), "13ffffffffffffffff");
 }
 
@@ -69,11 +68,27 @@ TEST(PolkadotCodec, EncodeVectorAccountIds) {
     ASSERT_EQ(hex(encoded), "08008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48000e33fdfb980e4499e5c3576e742a563b6a4fc0f6f598b1917fd7a6fe393ffc72");
 }
 
+TEST(PolkadotCodec, EncodeVectorAccountIdsKusama) {
+    auto addresses = std::vector<SS58Address>{
+        SS58Address("FoQJpPyadYccjavVdTWxpxU7rUEaYhfLCPwXgkfD6Zat9QP", TWSS58AddressTypeKusama),
+        SS58Address("CtwdfrhECFs3FpvCGoiE4hwRC4UsSiM8WL899HjRdQbfYZY", TWSS58AddressTypeKusama)};
+    auto encoded = encodeAccountIds(addresses, false);
+    ASSERT_EQ(hex(encoded), "08008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48000e33fdfb980e4499e5c3576e742a563b6a4fc0f6f598b1917fd7a6fe393ffc72");
+}
+
 TEST(PolkadotCodec, EncodeEra) {
     auto era1 = encodeEra(429119, 8);
     auto era2 = encodeEra(428861, 4);
+    auto era3 = encodeEra(4246319, 64);
     ASSERT_EQ(hex(era1), "7200");
     ASSERT_EQ(hex(era2), "1100");
+    EXPECT_EQ(hex(era3), "f502");
+}
+
+TEST(PolkadotCodec, CountBytes) {
+    EXPECT_EQ(size_t(1), countBytes(uint256_t(0)));
+    EXPECT_EQ(size_t(1), countBytes(uint256_t(1)));
+    EXPECT_EQ(size_t(2), countBytes(uint256_t("0x1ff")));
 }
 
 } // namespace TW::Polkadot::tests
diff --git a/tests/chains/Polkadot/SignerTests.cpp b/tests/chains/Polkadot/SignerTests.cpp
new file mode 100644
index 00000000000..7e712160f51
--- /dev/null
+++ b/tests/chains/Polkadot/SignerTests.cpp
@@ -0,0 +1,696 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Polkadot/Address.h"
+#include "Polkadot/Extrinsic.h"
+#include "Polkadot/SS58Address.h"
+#include "Polkadot/Signer.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "proto/Polkadot.pb.h"
+#include "Coin.h"
+#include "uint256.h"
+
+#include <TrustWalletCore/TWSS58AddressType.h>
+#include <gtest/gtest.h>
+
+
+namespace TW::Polkadot::tests {
+    auto privateKey = PrivateKey(parse_hex("0xabf8e5bdbe30c65656c0a3cbd181ff8a56294a69dfedd27982aace4a76909115"));
+    auto privateKeyIOS = PrivateKey(parse_hex("37932b086586a6675e66e562fe68bd3eeea4177d066619c602fe3efc290ada62"));
+    auto privateKeyThrow2 = PrivateKey(parse_hex("70a794d4f1019c3ce002f33062f45029c4f930a56b3d20ec477f7668c6bbc37f"));
+    auto privateKeyPolkadot = PrivateKey(parse_hex("298fcced2b497ed48367261d8340f647b3fca2d9415d57c2e3c5ef90482a2266"));
+    auto addressThrow2 = "14Ztd3KJDaB9xyJtRkREtSZDdhLSbm7UUKt8Z7AwSv7q85G2";
+    auto toPublicKey = PublicKey(parse_hex("0x8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"), TWPublicKeyTypeED25519);
+    auto genesisHash = parse_hex("91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3");
+    auto controller1 = "14xKzzU1ZYDnzFj7FgdtDAYSMJNARjDc2gNw4XAFDgr4uXgp";
+
+TEST(PolkadotSigner, SignTransfer_9fd062) {
+    auto toAddress = Address("13ZLCqJNPsRZYEbwjtZZFpWt9GyFzg5WahXCVWKpWdUJqrQ5");
+
+    auto input = Proto::SigningInput();
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    auto blockHash = parse_hex("0x5d2143bb808626d63ad7e1cda70fa8697059d670a992e82cd440fbb95ea40351");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_nonce(3);
+    input.set_spec_version(26);
+    {
+        PublicKey publicKey = privateKeyThrow2.getPublicKey(TWPublicKeyTypeED25519);
+        Address address = Address(publicKey);
+        EXPECT_EQ(address.string(), addressThrow2);
+    }
+    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(5);
+
+    // era: for blockhash and block number, use curl -H "Content-Type: application/json" -H "Accept: text/plain" https://<polkadot-rpc-url>/transaction/material?noMeta=true
+    auto era = input.mutable_era();
+    era->set_block_number(3541050);
+    era->set_period(64);
+
+    auto balanceCall = input.mutable_balance_call();
+    auto transfer = balanceCall->mutable_transfer();
+    auto value = store(uint256_t(2000000000)); // 0.2
+    transfer->set_to_address(toAddress.string());
+    transfer->set_value(value.data(), value.size());
+
+    auto extrinsic = Extrinsic(input);
+    auto preimage = extrinsic.encodePayload();
+    EXPECT_EQ(hex(preimage), "05007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0300943577a5030c001a0000000500000091b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c35d2143bb808626d63ad7e1cda70fa8697059d670a992e82cd440fbb95ea40351");
+
+    auto output = Signer::sign(input);
+    // https://polkadot.subscan.io/extrinsic/0x9fd06208a6023e489147d8d93f0182b0cb7e45a40165247319b87278e08362d8
+    EXPECT_EQ(hex(output.encoded()), "3502849dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f7830073e59cef381aedf56d7af076bafff9857ffc1e3bd7d1d7484176ff5b58b73f1211a518e1ed1fd2ea201bd31869c0798bba4ffe753998c409d098b65d25dff801a5030c0005007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0300943577");
+}
+
+TEST(PolkadotSigner, SignTransferDOT) {
+
+    auto blockHash = parse_hex("0x343a3f4258fd92f5ca6ca5abdf473d86a78b0bcd0dc09c568ca594245cc8c642");
+    auto toAddress = SS58Address(toPublicKey, TWSS58AddressTypePolkadot);
+
+    auto input = Proto::SigningInput();
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    input.set_nonce(0);
+    input.set_spec_version(17);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(3);
+
+    auto& era = *input.mutable_era();
+    era.set_block_number(927699);
+    era.set_period(8);
+
+    auto balanceCall = input.mutable_balance_call();
+    auto& transfer = *balanceCall->mutable_transfer();
+    auto value = store(uint256_t(12345));
+    transfer.set_to_address(toAddress.string());
+    transfer.set_value(value.data(), value.size());
+
+    auto extrinsic = Extrinsic(input);
+    auto preimage = extrinsic.encodePayload();
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(preimage), "05008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48e5c032000000110000000300000091b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3343a3f4258fd92f5ca6ca5abdf473d86a78b0bcd0dc09c568ca594245cc8c642");
+    ASSERT_EQ(hex(output.encoded()), "29028488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee003d91a06263956d8ce3ce5c55455baefff299d9cb2bb3f76866b6828ee4083770b6c03b05d7b6eb510ac78d047002c1fe5c6ee4b37c9c5a8b09ea07677f12e50d3200000005008eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48e5c0");
+}
+
+TEST(PolkadotSigner, SignTransfer_72dd5b) {
+
+    auto blockHash = parse_hex("7d5fa17b70251d0806f26156b1b698dfd09e040642fa092595ce0a78e9e84fcd");
+
+    auto input = Proto::SigningInput();
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+
+    input.set_nonce(1);
+    input.set_spec_version(28);
+    input.set_private_key(privateKeyIOS.bytes.data(), privateKeyIOS.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(6);
+
+    auto& era = *input.mutable_era();
+    era.set_block_number(3910736);
+    era.set_period(64);
+
+    auto balanceCall = input.mutable_balance_call();
+    auto& transfer = *balanceCall->mutable_transfer();
+    auto value = store(uint256_t(10000000000));
+    transfer.set_to_address("13ZLCqJNPsRZYEbwjtZZFpWt9GyFzg5WahXCVWKpWdUJqrQ5");
+    transfer.set_value(value.data(), value.size());
+
+    auto extrinsic = Extrinsic(input);
+    auto preimage = extrinsic.encodePayload();
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(preimage), "0500007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0700e40b5402050104001c0000000600000091b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c37d5fa17b70251d0806f26156b1b698dfd09e040642fa092595ce0a78e9e84fcd");
+    ASSERT_EQ(hex(output.encoded()), "410284008d96660f14babe708b5e61853c9f5929bc90dd9874485bf4d6dc32d3e6f22eaa0038ec4973ab9773dfcbf170b8d27d36d89b85c3145e038d68914de83cf1f7aca24af64c55ec51ba9f45c5a4d74a9917dee380e9171108921c3e5546e05be15206050104000500007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0700e40b5402");
+}
+
+TEST(PolkadotSigner, SignBond_8da66d) {
+    auto input = Proto::SigningInput();
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    auto blockHash = parse_hex("0xf1eee612825f29abd3299b486e401299df2faa55b7ce1e34bf2243bd591905fc");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_nonce(0);
+    input.set_spec_version(26);
+    {
+        PublicKey publicKey = privateKeyThrow2.getPublicKey(TWPublicKeyTypeED25519);
+        Address address = Address(publicKey);
+        EXPECT_EQ(address.string(), addressThrow2);
+    }
+    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(5);
+
+    // era: for blockhash and block number, use curl -H "Content-Type: application/json" -H "Accept: text/plain" https://<polkadot-rpc-url>/transaction/material?noMeta=true
+    auto era = input.mutable_era();
+    era->set_block_number(3540912);
+    era->set_period(64);
+
+    auto stakingCall = input.mutable_staking_call();
+    auto bond = stakingCall->mutable_bond();
+    auto value = store(uint256_t(11000000000)); // 1.1
+    bond->set_controller(addressThrow2);        // myself
+    bond->set_value(value.data(), value.size());
+    bond->set_reward_destination(Proto::RewardDestination::STASH);
+
+    auto output = Signer::sign(input);
+    // https://polkadot.subscan.io/extrinsic/0x8da66d3fe0f592cff714ec107289370365117a1abdb72a19ac91181fdcf62bba
+    ASSERT_EQ(hex(output.encoded()), "3d02849dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f783009025843bc49c1c4fbc99dbbd290c92f9879665d55b02f110abfb4800f0e7630877d2cffd853deae7466c22fbc8616a609e1b92615bb365ea8adccba5ef7624050503000007009dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f7830700aea68f0201");
+}
+
+TEST(PolkadotSigner, SignBondAndNominate_4955314_2) {
+
+    auto key = parse_hex("7f44b19b391a8015ca4c7d94097b3695867a448d1391e7f3243f06987bdb6858");
+    auto input = Proto::SigningInput();
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_block_hash(genesisHash.data(), genesisHash.size());
+    input.set_nonce(4);
+    input.set_spec_version(30);
+    input.set_private_key(key.data(), key.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(7);
+
+    auto stakingCall = input.mutable_staking_call();
+    auto bondnom = stakingCall->mutable_bond_and_nominate();
+    auto value = store(uint256_t(10000000000)); // 1 DOT
+    bondnom->set_controller("13ZLCqJNPsRZYEbwjtZZFpWt9GyFzg5WahXCVWKpWdUJqrQ5");
+    bondnom->set_value(value.data(), value.size());
+    bondnom->set_reward_destination(Proto::RewardDestination::STASH);
+    bondnom->add_nominators("1zugcavYA9yCuYwiEYeMHNJm9gXznYjNfXQjZsZukF1Mpow");
+    bondnom->add_nominators("15oKi7HoBQbwwdQc47k71q4sJJWnu5opn1pqoGx4NAEYZSHs");
+
+    auto output = Signer::sign(input);
+    // https://polkadot.subscan.io/extrinsic/4955314-2
+    ASSERT_EQ(hex(output.encoded()), "6103840036092fac541e0e5feda19e537c679b487566d7101141c203ac8322c27e5f076a00a8b1f859d788f11a958e98b731358f89cf3fdd41a667ea992522e8d4f46915f4c03a1896f2ac54bdc5f16e2ce8a2a3bf233d02aad8192332afd2113ed6688e0d0010001a02080700007120f76076bcb0efdf94c7219e116899d0163ea61cb428183d71324eb33b2bce0700e40b540201070508002c2a55b5ffdca266bd0207df97565b03255f70783ca1a349be5ed9f44589c36000d44533a4d21fd9d6f5d57c8cd05c61a6f23f9131cec8ae386b6b437db399ec3d");
+}
+
+TEST(PolkadotSigner, SignNominate_452522) {
+    auto input = Proto::SigningInput();
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    auto blockHash = parse_hex("0x211787d016e39007ac054547737a10542620013e73648b3134541d536cb44e2c");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_nonce(1);
+    input.set_spec_version(26);
+    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(5);
+
+    // era: for blockhash and block number, use curl -H "Content-Type: application/json" -H "Accept: text/plain" https://<polkadot-rpc-url>/transaction/material?noMeta=true
+    auto era = input.mutable_era();
+    era->set_block_number(3540945);
+    era->set_period(64);
+
+    auto stakingCall = input.mutable_staking_call();
+    auto nominate = stakingCall->mutable_nominate();
+
+    nominate->add_nominators(controller1);
+    nominate->add_nominators("1REAJ1k691g5Eqqg9gL7vvZCBG7FCCZ8zgQkZWd4va5ESih");
+
+    auto output = Signer::sign(input);
+    // https://polkadot.subscan.io/extrinsic/0x4525224b7d8f3e58de3a54a9fbfd071401c2b737f314c972a2bb087a0ff508a6
+    ASSERT_EQ(hex(output.encoded()), "a502849dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f78300d73ff0dc456704743f70173a56e6c13e88a6e1dddb38a23552a066e44fb64e2c9d8a5e9a76afb9489b8540365f668bddd34b7d9c8dbdc4600e6316080e55a30315010400070508aee72821ca00e62304e4f0d858122a65b87c8df4f0eae224ae064b951d39f610127a30e486492921e58f2564b36ab1ca21ff630672f0e76920edd601f8f2b89a");
+}
+
+TEST(PolkadotSigner, SignNominate2) {
+    auto blockHash = parse_hex("d22a6b2e3e61325050718bd04a14da9efca1f41c9f0a525c375d36106e25af68");
+    auto input = Proto::SigningInput();
+
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_nonce(0);
+    input.set_spec_version(17);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(3);
+
+    auto stakingCall = input.mutable_staking_call();
+    auto& nominate = *stakingCall->mutable_nominate();
+    // payload size larger than 256, will be hashed
+    nominate.add_nominators("1zugcabYjgfQdMLC3cAzQ8tJZMo45tMnGpivpAzpxB4CZyK");
+    nominate.add_nominators("1REAJ1k691g5Eqqg9gL7vvZCBG7FCCZ8zgQkZWd4va5ESih");
+    nominate.add_nominators("1WG3jyNqniQMRZGQUc7QD2kVLT8hkRPGMSqAb5XYQM1UDxN");
+    nominate.add_nominators("16QFrtU6kDdBjxY8qEKz5EEfuDkHxqG8pix3wSGKQzRcuWHo");
+    nominate.add_nominators("14ShUZUYUR35RBZW6uVVt1zXDxmSQddkeDdXf1JkMA6P721N");
+    nominate.add_nominators("15MUBwP6dyVw5CXF9PjSSv7SdXQuDSwjX86v1kBodCSWVR7c");
+
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.encoded()), "a1048488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee00135bbc68b67fffadaf7e98b6402c4fc60382765f543225083a024b0e0ff8071d4ec4ddd67a65828113cc76f3208765608be010d2fcfdcd47e8fe342872704c000000000705182c2a55b5a116a4c88aff57e8f2b70ba72dda72dda4b78630e16ad0ca69006f18127a30e486492921e58f2564b36ab1ca21ff630672f0e76920edd601f8f2b89a1650c532ed1a8641e8922aa24ade0ff411d03edd9ed1c6b7fe42f1a801cee37ceee9d5d071a418b51c02b456d5f5cefd6231041ad59b0e8379c59c11ba4a2439984e16482c99cfad1436111e321a86d87d0fac203bf64538f888e45d793b5413c08d5de7a5d97bea2c7ddf516d0635bddc43f326ae2f80e2595b49d4a08c4619");
+}
+
+TEST(PolkadotSigner, SignChill) {
+    auto blockHash = parse_hex("1d4a1ecc8b1c37bf0ba5d3e0bf14ec5402fbb035eeaf6d8042c07ca5f8c57429");
+    auto input = Proto::SigningInput();
+
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_nonce(0);
+    input.set_spec_version(17);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(3);
+
+    auto stakingCall = input.mutable_staking_call();
+    auto __attribute__((unused))& chill = *stakingCall->mutable_chill();
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.encoded()), "9d018488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee0088b5e1cd93ba74b82e329f95e1b22660385970182172b2ae280801fdd1ee5652cf7bf319e5e176ccc299dd8eb1e7fccb0ea7717efaf4aacd7640789dd09c1e070000000706");
+}
+
+TEST(PolkadotSigner, SignWithdraw) {
+    auto blockHash = parse_hex("7b4d1d1e2573eabcc90a3e96058eb0d8d21d7a0b636e8030d152d9179a345dda");
+    auto input = Proto::SigningInput();
+
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_nonce(0);
+    input.set_spec_version(17);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(3);
+
+    auto stakingCall = input.mutable_staking_call();
+    auto& withdraw = *stakingCall->mutable_withdraw_unbonded();
+    withdraw.set_slashing_spans(10);
+
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.encoded()), "ad018488dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee002e49bf0dec9bef01dd3bd25419e2147dc983613d0860108f889f9ff2d062c5e3267e309e2dbc35dd2fc2b877b57d86a5f12cbeb8217485be32be3c34d2507d0e00000007030a000000");
+}
+
+TEST(PolkadotSigner, SignUnbond_070957) {
+    auto input = Proto::SigningInput();
+
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    auto blockHash = parse_hex("0x53040c71c6061bd256346b81fcb3545c13b5c34c7cd0c2c25f00aa6e564b16d5");
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_nonce(2);
+    input.set_spec_version(26);
+    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(5);
+
+    auto era = input.mutable_era();
+    era->set_block_number(3540983);
+    era->set_period(64);
+
+    auto stakingCall = input.mutable_staking_call();
+    auto unbond = stakingCall->mutable_unbond();
+    auto value = store(uint256_t(4000000000));
+    unbond->set_value(value.data(), value.size());
+
+    auto output = Signer::sign(input);
+    // https://polkadot.subscan.io/extrinsic/0x070957ab697adbe11f7d72a1314d0a81d272a747d2e6880818073317125f980a
+    ASSERT_EQ(hex(output.encoded()), "b501849dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f783003a762d9dc3f2aba8922c4babf7e6622ca1d74da17ab3f152d8f29b0ffee53c7e5e150915912a9dfd98ef115d272e096543eef9f513207dd606eea97d023a64087503080007020300286bee");
+}
+
+TEST(PolkadotSigner, SignChillAndUnbond) {
+    auto blockHash = parse_hex("0x35ba668bb19453e8da6334cadcef2a27c8d4141bfc8b49e78e853c3d73e1ecd0");
+    auto input = Proto::SigningInput();
+
+    input.set_genesis_hash(genesisHash.data(), genesisHash.size());
+    input.set_block_hash(blockHash.data(), blockHash.size());
+    input.set_nonce(6);
+    input.set_spec_version(9200);
+    input.set_private_key(privateKeyPolkadot.bytes.data(), privateKeyPolkadot.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+    input.set_transaction_version(12);
+
+    auto era = input.mutable_era();
+    era->set_block_number(10541373);
+    era->set_period(64);
+
+    auto stakingCall = input.mutable_staking_call();
+    auto chillBond = stakingCall->mutable_chill_and_unbond();
+    auto value = store(uint256_t(100500000000)); // 10.05 DOT
+    chillBond->set_value(value.data(), value.size());
+
+    auto output = Signer::sign(input);
+    // https://polkadot.subscan.io/extrinsic/10541383-2
+    ASSERT_EQ(hex(output.encoded()), "d10184008361bd08ddca5fda28b5e2aa84dc2621de566e23e089e555a42194c3eaf2da7900c891ba102db672e378945d74cf7f399226a76b43cab502436971599255451597fc2599902e4b62c7ce85ecc3f653c693fef3232be620984b5bb5bcecbbd7b209d50318001a02080706070207004d446617");
+}
+
+TEST(PolkadotSigner, PolymeshEncodeAndSign) {
+    // tx on mainnet
+    // https://polymesh.subscan.io/extrinsic/0x9a4283cc38f7e769c53ad2d1c5cf292fc85a740ec1c1aa80c180847e51928650
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(12);
+    input.set_multi_address(true);
+    auto blockHash = parse_hex("898bba6413c38f79a284aec8749f297f6c8734c501f67517b5a6aadc338d1102");
+    auto vGenesisHash = parse_hex("6fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(1UL);
+    input.set_spec_version(3010u);
+    input.set_transaction_version(2u);
+
+    auto* era = input.mutable_era();
+    era->set_block_number(4298130UL);
+    era->set_period(64UL);
+
+    auto* transfer = input.mutable_balance_call()->mutable_transfer();
+    transfer->set_to_address("2FSoQykVV3uWe5ChZuazMDHBoaZmCPPuoYx5KHL5VqXooDQW");
+    auto value = store(1000000);
+    transfer->set_value(std::string(value.begin(), value.end()));
+    transfer->set_memo("MEMO PADDED WITH SPACES");
+
+    auto* callIndices = transfer->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x05);
+    callIndices->set_method_index(0x01);
+
+    auto preImage = Signer::signaturePreImage(input);
+    ASSERT_EQ(hex(preImage), "050100849e2f6b165d4b28b39ef3d98f86c0520d82bc349536324365c10af08f323f8302093d00014d454d4f2050414444454420574954482053504143455300000000000000000025010400c20b0000020000006fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063898bba6413c38f79a284aec8749f297f6c8734c501f67517b5a6aadc338d1102");
+
+    auto publicKey = parse_hex("4322cf71da08f9d56181a707af7c0c437dfcb93e6caac9825a5aba57548142ee");
+    auto signature = parse_hex("0791ee378775eaff34ef7e529ab742f0d81d281fdf20ace0aa765ca484f5909c4eea0a59c8dbbc534c832704924b424ba3230c38acd0ad5360cef023ca2a420f");
+    auto encoded = Signer::encodeTransaction(input, publicKey, signature);
+    ASSERT_EQ(hex(encoded), "bd0284004322cf71da08f9d56181a707af7c0c437dfcb93e6caac9825a5aba57548142ee000791ee378775eaff34ef7e529ab742f0d81d281fdf20ace0aa765ca484f5909c4eea0a59c8dbbc534c832704924b424ba3230c38acd0ad5360cef023ca2a420f25010400050100849e2f6b165d4b28b39ef3d98f86c0520d82bc349536324365c10af08f323f8302093d00014d454d4f20504144444544205749544820535041434553000000000000000000");
+}
+
+TEST(PolkadotSigner, Statemint_encodeTransaction_transfer) {
+    // tx on mainnet
+    // https://statemint.subscan.io/extrinsic/2686030-2
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+    auto blockHash = parse_hex("68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f");
+    auto vGenesisHash = parse_hex("68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(0UL);
+    input.set_spec_version(9320U);
+    input.set_transaction_version(9U);
+
+    auto* transfer = input.mutable_balance_call()->mutable_asset_transfer();
+    transfer->set_to_address("12q4hq1dgqHZVGzHbwZmqq1cFwatN15Visfd7YmUiMB5ZWkH");
+
+    auto value = store(100000);
+    transfer->set_value(std::string(value.begin(), value.end()));
+    transfer->set_asset_id(1984);
+    transfer->set_fee_asset_id(0x00); // native token
+
+    auto* callIndices = transfer->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x32);
+    callIndices->set_method_index(0x05);
+
+    auto publicKey = parse_hex("81f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c91");
+    auto signature = parse_hex("e0ae36a5ceaaa7ff53fadfecc8a285a436b15e39c43ea09e8897f34fa3fe55133028eb7d8a9ea2cd42ff1c786e945cd47a02243454ecb39c81acc3409d96f903");
+    auto encoded = Signer::encodeTransaction(input, publicKey, signature);
+    ASSERT_EQ(hex(encoded), "4102840081f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c9100e0ae36a5ceaaa7ff53fadfecc8a285a436b15e39c43ea09e8897f34fa3fe55133028eb7d8a9ea2cd42ff1c786e945cd47a02243454ecb39c81acc3409d96f903000000003205011f0050e47b3c8aef60bc4fc744d8d979cb0eb2d45fa25c2e9da74e1e5ebd9e117518821a0600");
+
+    // 3d  02840081f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c9100e0ae36a5ceaaa7ff53fadfecc8a285a436b15e39c43ea09e8897f34fa3fe55133028eb7d8a9ea2cd42ff1c786e945cd47a02243454ecb39c81acc3409d96f903000000      3205011f0050e47b3c8aef60bc4fc744d8d979cb0eb2d45fa25c2e9da74e1e5ebd9e117518821a0600
+    // 41  02840081f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c9100e0ae36a5ceaaa7ff53fadfecc8a285a436b15e39c43ea09e8897f34fa3fe55133028eb7d8a9ea2cd42ff1c786e945cd47a02243454ecb39c81acc3409d96f903000000  00  3205011f0050e47b3c8aef60bc4fc744d8d979cb0eb2d45fa25c2e9da74e1e5ebd9e117518821a0600
+}
+
+TEST(PolkadotSigner, Statemint_encodeTransaction_transfer_keep_alive) {
+    // tx on mainnet
+    // https://statemint.subscan.io/extrinsic/2686081-2
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+    auto blockHash = parse_hex("e8f10f9a841dc73578148c763afa17638670c8655542172a80af2e03bf3cbe62");
+    auto vGenesisHash = parse_hex("68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(2UL);
+    input.set_spec_version(9320U);
+    input.set_transaction_version(9U);
+
+    auto* era = input.mutable_era();
+    era->set_block_number(2686056UL);
+    era->set_period(64UL);
+
+    auto* transfer = input.mutable_balance_call()->mutable_asset_transfer();
+    transfer->set_to_address("12q4hq1dgqHZVGzHbwZmqq1cFwatN15Visfd7YmUiMB5ZWkH");
+
+    auto value = store(100000);
+    transfer->set_value(std::string(value.begin(), value.end()));
+    transfer->set_asset_id(1984);
+    transfer->set_fee_asset_id(0x00); // native token
+
+    auto* callIndices = transfer->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x32);
+    callIndices->set_method_index(0x06);
+
+    auto publicKey = parse_hex("81f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c91");
+    auto signature = parse_hex("68c40526bd9e56e340bfc9385ea463afce34e5c49be75b5946974d9ef6a357f90842036cd1b811b60882ae7183aa23545ef5825aafc8aaa6274d71a03414dc0a");
+    auto encoded = Signer::encodeTransaction(input, publicKey, signature);
+    ASSERT_EQ(hex(encoded), "4502840081f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c910068c40526bd9e56e340bfc9385ea463afce34e5c49be75b5946974d9ef6a357f90842036cd1b811b60882ae7183aa23545ef5825aafc8aaa6274d71a03414dc0a85020800003206011f0050e47b3c8aef60bc4fc744d8d979cb0eb2d45fa25c2e9da74e1e5ebd9e117518821a0600");
+}
+
+TEST(PolkadotSigner, Statemint_encodeTransaction_batch_transfer_keep_alive) {
+    // tx on mainnet
+    // https://statemint.subscan.io/extrinsic/2711054-2
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+    auto blockHash = parse_hex("c8a2e9492f822f8c07f3717a00e36f68a3090a878b07998724ec1f178f4cf514");
+    auto vGenesisHash = parse_hex("68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(3UL);
+    input.set_spec_version(9320U);
+    input.set_transaction_version(9U);
+
+    auto* era = input.mutable_era();
+    era->set_block_number(2711016UL);
+    era->set_period(64UL);
+
+    auto* transfer = input.mutable_balance_call()->mutable_batch_asset_transfer();
+    transfer->set_fee_asset_id(0x00);
+    auto* batchCallIndices = transfer->mutable_call_indices()->mutable_custom();
+    batchCallIndices->set_module_index(0x28);
+    batchCallIndices->set_method_index(0x00);
+
+    auto* t1 = transfer->add_transfers();
+    t1->set_to_address("12q4hq1dgqHZVGzHbwZmqq1cFwatN15Visfd7YmUiMB5ZWkH");
+    auto value = store(100000);
+    t1->set_value(std::string(value.begin(), value.end()));
+    t1->set_asset_id(1984);
+    t1->set_fee_asset_id(0x00); // native token
+    auto* t1CallIndices = t1->mutable_call_indices()->mutable_custom();
+    t1CallIndices->set_module_index(0x32);
+    t1CallIndices->set_method_index(0x06);
+
+    auto* t2 = transfer->add_transfers();
+    t2->set_to_address("12q4hq1dgqHZVGzHbwZmqq1cFwatN15Visfd7YmUiMB5ZWkH");
+    t2->set_value(std::string(value.begin(), value.end()));
+    t2->set_asset_id(1984);
+    t2->set_fee_asset_id(0x00); // native token
+    auto* t2CallIndices = t2->mutable_call_indices()->mutable_custom();
+    t2CallIndices->set_module_index(0x32);
+    t2CallIndices->set_method_index(0x06);
+
+    auto publicKey = parse_hex("81f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c91");
+    auto signature = parse_hex("e1d541271965858ff2ba1a1296f0b4d28c8cbcaddf0ea06a9866869caeca3d16eff1265591d11b46d66882493079fde9e425cd941f166260135e9d81f7daf60c");
+    auto encoded = Signer::encodeTransaction(input, publicKey, signature);
+    ASSERT_EQ(hex(encoded), "f502840081f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c9100e1d541271965858ff2ba1a1296f0b4d28c8cbcaddf0ea06a9866869caeca3d16eff1265591d11b46d66882493079fde9e425cd941f166260135e9d81f7daf60c85020c00002800083206011f0050e47b3c8aef60bc4fc744d8d979cb0eb2d45fa25c2e9da74e1e5ebd9e117518821a06003206011f0050e47b3c8aef60bc4fc744d8d979cb0eb2d45fa25c2e9da74e1e5ebd9e117518821a0600");
+}
+
+TEST(PolkadotSigner, Statemint_encodeTransaction_dot_transfer_keep_alive) {
+    // tx on mainnet
+    // https://statemint.subscan.io/extrinsic/2789245-2
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+    auto blockHash = parse_hex("68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f");
+    auto vGenesisHash = parse_hex("68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(7UL);
+    input.set_spec_version(9320U);
+    input.set_transaction_version(9U);
+
+    auto* transfer = input.mutable_balance_call()->mutable_asset_transfer();
+    transfer->set_to_address("12q4hq1dgqHZVGzHbwZmqq1cFwatN15Visfd7YmUiMB5ZWkH");
+
+    auto value = store(100000);
+    transfer->set_value(std::string(value.begin(), value.end()));
+    transfer->set_asset_id(0x00);
+    transfer->set_fee_asset_id(0x00); // native token
+
+    auto* callIndices = transfer->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x0a);
+    callIndices->set_method_index(0x03);
+
+    auto publicKey = parse_hex("81f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c91");
+    auto signature = parse_hex("c4f7cb46605986ff6dd1a192736feddd8ae468a10b1b458eadfa855ed6b59ad442a96c18e7109ad594d11ba2fd52920545f8a450234e9b03ee3e8f59a8f06f00");
+    auto encoded = Signer::encodeTransaction(input, publicKey, signature);
+    ASSERT_EQ(hex(encoded), "3902840081f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c9100c4f7cb46605986ff6dd1a192736feddd8ae468a10b1b458eadfa855ed6b59ad442a96c18e7109ad594d11ba2fd52920545f8a450234e9b03ee3e8f59a8f06f00001c00000a030050e47b3c8aef60bc4fc744d8d979cb0eb2d45fa25c2e9da74e1e5ebd9e117518821a0600");
+}
+
+TEST(PolkadotSigner, Statemint_encodeTransaction_usdt_transfer_keep_alive) {
+    // tx on mainnet
+    // https://statemint.subscan.io/extrinsic/2789377-2
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(0);
+    input.set_multi_address(true);
+    auto blockHash = parse_hex("68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f");
+    auto vGenesisHash = parse_hex("68d56f15f85d3136970ec16946040bc1752654e906147f7e43e9d539d7c3de2f");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(8UL);
+    input.set_spec_version(9320U);
+    input.set_transaction_version(9U);
+
+    auto* transfer = input.mutable_balance_call()->mutable_asset_transfer();
+    transfer->set_to_address("12q4hq1dgqHZVGzHbwZmqq1cFwatN15Visfd7YmUiMB5ZWkH");
+
+    auto value = store(100000);
+    transfer->set_value(std::string(value.begin(), value.end()));
+    transfer->set_asset_id(1984);
+    transfer->set_fee_asset_id(1984);
+
+    auto* callIndices = transfer->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x32);
+    callIndices->set_method_index(0x06);
+
+    auto publicKey = parse_hex("81f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c91");
+    auto signature = parse_hex("d22583408806c005a24caf16f2084691f4c6dcb6015e6645adc86fc1474369b0e0b7dbcc0ef25b17eae43844aff6fb42a0b279a19e822c76043cac015be5e40a");
+    auto encoded = Signer::encodeTransaction(input, publicKey, signature);
+    ASSERT_EQ(hex(encoded), "5102840081f5dd1432e5dd60aa71819e1141ad5e54d6f4277d7d128030154114444b8c9100d22583408806c005a24caf16f2084691f4c6dcb6015e6645adc86fc1474369b0e0b7dbcc0ef25b17eae43844aff6fb42a0b279a19e822c76043cac015be5e40a00200001c00700003206011f0050e47b3c8aef60bc4fc744d8d979cb0eb2d45fa25c2e9da74e1e5ebd9e117518821a0600");
+}
+
+TEST(PolkadotSigner, encodeTransaction_Add_authorization) {
+    // tx on mainnet
+    // https://polymesh.subscan.io/extrinsic/0x7d9b9109027b36b72d37ba0648cb70e5254524d3d6752cc6b41601f4bdfb1af0
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(12);
+    input.set_multi_address(true);
+    auto blockHash = parse_hex("ce0c2109db498e45abf8fd447580dcfa7b7a07ffc2bfb1a0fbdd1af3e8816d2b");
+    auto vGenesisHash = parse_hex("6fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(5UL);
+    input.set_spec_version(3010U);
+    input.set_transaction_version(2U);
+
+    auto* era = input.mutable_era();
+    era->set_block_number(4395451UL);
+    era->set_period(64UL);
+
+    auto* addAuthorization = input.mutable_polymesh_call()->mutable_identity_call()->mutable_add_authorization();
+    addAuthorization->set_target("2HEVN4PHYKj7B1krQ9bctAQXZxHQQkANVNCcfbdYk2gZ4cBR");
+    auto* callIndices = addAuthorization->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x07);
+    callIndices->set_method_index(0x0d);
+
+    auto publicKey = parse_hex("4322cf71da08f9d56181a707af7c0c437dfcb93e6caac9825a5aba57548142ee");
+    auto signature = parse_hex("81e6561e4391862b5da961d7033baced1c4b25f0e27f938b02321af1118e0b859e1c2bd5607576a258f2c2befbc5f397ea4adb62938f30eb73c8060ab0eabf01");
+    auto encoded = Signer::encodeTransaction(input, publicKey, signature);
+    ASSERT_EQ(hex(encoded), "490284004322cf71da08f9d56181a707af7c0c437dfcb93e6caac9825a5aba57548142ee0081e6561e4391862b5da961d7033baced1c4b25f0e27f938b02321af1118e0b859e1c2bd5607576a258f2c2befbc5f397ea4adb62938f30eb73c8060ab0eabf01b5031400070d01d3b2f1c41b9b4522eb3e23329b81aca6cc0231167ecfa3580c5a71ff6d0610540501000100010000");
+}
+
+TEST(PolkadotSigner, encodeTransaction_JoinIdentityAsKey) {
+    // tx on mainnet
+    // https://polymesh.subscan.io/extrinsic/0x9d7297d8b38af5668861996cb115f321ed681989e87024fda64eae748c2dc542
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(12);
+    input.set_multi_address(true);
+    auto blockHash = parse_hex("45c80153c47f5d16acc7a66d473870e8d4574437a7d8c813f47da74cae3812c2");
+    auto vGenesisHash = parse_hex("6fbd74e5e1d0a61d52ccfe9d4adaed16dd3a7caa37c6bc4d0c2fa12e8b2f4063");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(0UL);
+    input.set_spec_version(3010U);
+    input.set_transaction_version(2U);
+
+    auto* era = input.mutable_era();
+    era->set_block_number(4395527UL);
+    era->set_period(64UL);
+
+    auto* key = input.mutable_polymesh_call()->mutable_identity_call()->mutable_join_identity_as_key();
+    key->set_auth_id(21435);
+    auto* callIndices = key->mutable_call_indices()->mutable_custom();
+    callIndices->set_module_index(0x07);
+    callIndices->set_method_index(0x05);
+
+    auto publicKey = parse_hex("d3b2f1c41b9b4522eb3e23329b81aca6cc0231167ecfa3580c5a71ff6d061054");
+    auto signature = parse_hex("7f5adbb2749e2f0ace29b409c41dd717681495b1f22dc5358311646a9fb8af8a173fc47f1b19748fb56831c2128773e2976986685adee83c741ab49934d80006");
+    auto encoded = Signer::encodeTransaction(input, publicKey, signature);
+    ASSERT_EQ(hex(encoded), "c5018400d3b2f1c41b9b4522eb3e23329b81aca6cc0231167ecfa3580c5a71ff6d061054007f5adbb2749e2f0ace29b409c41dd717681495b1f22dc5358311646a9fb8af8a173fc47f1b19748fb56831c2128773e2976986685adee83c741ab49934d80006750000000705bb53000000000000");
+}
+
+TEST(PolkadotSigner, Kusama_SignBond_NoController) {
+    // tx on mainnet
+    // https://kusama.subscan.io/extrinsic/0x4e52e59b63910cbdb8c5430c2d100908934f473363c8994cddfd6d1501b017f5
+
+    Polkadot::Proto::SigningInput input;
+    input.set_network(ss58Prefix(TWCoinTypeKusama));
+    auto blockHash = parse_hex("beb02a3ee782f4bd60ffcfc3de473e3c5a00b2cf124dd302c559b0e77b4331eb");
+    auto vGenesisHash = parse_hex("b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe");
+    input.set_block_hash(std::string(blockHash.begin(), blockHash.end()));
+    input.set_genesis_hash(std::string(vGenesisHash.begin(), vGenesisHash.end()));
+    input.set_nonce(3UL);
+    input.set_spec_version(9430U);
+    input.set_transaction_version(23U);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto* era = input.mutable_era();
+    era->set_block_number(18672490UL);
+    era->set_period(64UL);
+
+    // Ignore `controller` as it was removed from the `Staking::bond` function at `spec_version = 9430`
+    // https://kusama.subscan.io/runtime/Staking?version=9430
+    auto* bond = input.mutable_staking_call()->mutable_bond();
+    auto value = store(uint256_t(120'000'000'000)); // 0.12
+    bond->set_value(value.data(), value.size());
+    bond->set_reward_destination(Proto::RewardDestination::CONTROLLER);
+
+    auto output = Signer::sign(input);
+    ASSERT_EQ(hex(output.encoded()), "c101840088dc3417d5058ec4b4503e0c12ea1a0a89be200fe98922423d4334014fa6b0ee00bc4d7a166bd1e7e2bfe9b53e81239c9e340d5a326f17c0a3d2768fcc127f20f4f85d888ecb90aa3ed9a0943f8ae8116b9a19747e563c8d8151dfe3b1b5deb40ca5020c0006000700b08ef01b02");
+}
+
+TEST(PolkadotSigner, SignTransfer_KusamaNewSpec) {
+    auto toAddress = Address("DAbYHrSQTULYZsuA1kvH2cQ33oBsCxxSRPM1XkhzGLeJuHG", ss58Prefix(TWCoinTypeKusama));
+
+    auto input = Proto::SigningInput();
+    auto genesisHashData = parse_hex("0xb0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe");
+    input.set_genesis_hash(genesisHashData.data(), genesisHashData.size());
+    auto blockHashData = parse_hex("0x0c731c2b7f5332749432eae61cd5a919592965b28181cf9b73b0a1258ea73303");
+    input.set_block_hash(blockHashData.data(), blockHashData.size());
+    input.set_nonce(150);
+    input.set_spec_version(1002005);
+    {
+        PublicKey publicKey = privateKeyThrow2.getPublicKey(TWPublicKeyTypeED25519);
+        Address address = Address(publicKey);
+        EXPECT_EQ(address.string(), addressThrow2);
+    }
+    input.set_private_key(privateKeyThrow2.bytes.data(), privateKeyThrow2.bytes.size());
+    input.set_network(ss58Prefix(TWCoinTypeKusama));
+    input.set_transaction_version(26);
+
+    // era: for blockhash and block number, use curl -H "Content-Type: application/json" -H "Accept: text/plain" https://<polkadot-rpc-url>/transaction/material?noMeta=true
+    auto era = input.mutable_era();
+    era->set_block_number(23610713);
+    era->set_period(64);
+
+    auto balanceCall = input.mutable_balance_call();
+    auto transfer = balanceCall->mutable_transfer();
+    auto value = store(uint256_t(2000000000)); // 0.2
+    transfer->set_to_address(toAddress.string());
+    transfer->set_value(value.data(), value.size());
+
+    auto extrinsic = Extrinsic(input);
+    auto preimage = extrinsic.encodePayload();
+    EXPECT_EQ(hex(preimage), "0400001a2447c661c9b168bba4a2a178baef7d79eee006c1d145ffc832be76ff6ee9ce0300943577950159020000154a0f001a000000b0a8d493285c2df73290dfb7e61f870f17b41801197a149ca93654499ea3dafe0c731c2b7f5332749432eae61cd5a919592965b28181cf9b73b0a1258ea7330300");
+
+    auto output = Signer::sign(input);
+    EXPECT_EQ(hex(output.encoded()), "450284009dca538b7a925b8ea979cc546464a3c5f81d2398a3a272f6f93bdf4803f2f78300fc5a463d3b6972ac7e0b701110f9d95d377be5b6a2f356765553104c04765fc0066c235c11dabde650d487760dc310003d607abceaf85a0a0f47f1a90e3680029501590200000400001a2447c661c9b168bba4a2a178baef7d79eee006c1d145ffc832be76ff6ee9ce0300943577");
+}
+
+
+} // namespace TW::Polkadot::tests
diff --git a/tests/chains/Polkadot/TWCoinTypeTests.cpp b/tests/chains/Polkadot/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f59d9208226
--- /dev/null
+++ b/tests/chains/Polkadot/TWCoinTypeTests.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWPolkadotCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypePolkadot));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb96f97d8ee508f420e606e1a6dcc74b88844713ddec2bd7cf4e3aa6b1d6beef4"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypePolkadot, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("13hJFqnkqQbmgnGQteGntjMjTdmTBRE8Z93JqxsrpgT7Yjd2"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypePolkadot, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypePolkadot));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypePolkadot));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypePolkadot), 10);
+    ASSERT_EQ(TWBlockchainPolkadot, TWCoinTypeBlockchain(TWCoinTypePolkadot));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypePolkadot));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypePolkadot));
+    assertStringsEqual(symbol, "DOT");
+    assertStringsEqual(txUrl, "https://polkadot.subscan.io/extrinsic/0xb96f97d8ee508f420e606e1a6dcc74b88844713ddec2bd7cf4e3aa6b1d6beef4");
+    assertStringsEqual(accUrl, "https://polkadot.subscan.io/account/13hJFqnkqQbmgnGQteGntjMjTdmTBRE8Z93JqxsrpgT7Yjd2");
+    assertStringsEqual(id, "polkadot");
+    assertStringsEqual(name, "Polkadot");
+}
diff --git a/tests/chains/Polkadot/TransactionCompilerTests.cpp b/tests/chains/Polkadot/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..2476fe54ab8
--- /dev/null
+++ b/tests/chains/Polkadot/TransactionCompilerTests.cpp
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Polkadot.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Polkadot::tests {
+
+TEST(PolkadotCompiler, CompileWithSignatures) {
+    /// Prepare transaction input (protobuf)
+    const auto coin = TWCoinTypePolkadot;
+    auto input = Polkadot::Proto::SigningInput();
+    auto block_hash = parse_hex("40cee3c3b7f8422f4c512e9ebebdeeff1c28e81cc678ee4864d945d641e05f9b");
+    auto genesis_hash = parse_hex("91b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c3");
+    input.set_block_hash(block_hash.data(), block_hash.size());
+    input.set_genesis_hash(genesis_hash.data(), genesis_hash.size());
+    input.set_nonce(0);
+    input.set_spec_version(25);
+    input.set_transaction_version(5);
+    input.set_network(ss58Prefix(TWCoinTypePolkadot));
+
+    auto era = input.mutable_era();
+    era->set_block_number(5898150);
+    era->set_period(10000);
+
+    auto call = input.mutable_balance_call();
+    auto tx = call->mutable_transfer();
+    auto value = parse_hex("210fdc0c00");
+    tx->set_to_address("15JWiQUmczAFU3hrZrD2gDyuJdL2BbFaX9yngivb1UWiBJWA");
+    tx->set_value(value.data(), value.size());
+
+    auto txInputData = data(input.SerializeAsString());
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    auto preOutput = TxCompiler::Proto::PreSigningOutput();
+    preOutput.ParseFromArray(preImageHashes.data(), (int)preImageHashes.size());
+    auto preImageHash = preOutput.data_hash();
+
+    {
+        EXPECT_EQ(hex(preImageHash), "0500be4c21aa92dcba057e9b719ce1de970f774f064c09b13a3ea3009affb8cb5ec707000cdc0f219dfe0000190000000500000091b171bb158e2d3848fa23a9f1c25182fb8e20313b2c1eb49219da7a70ce90c340cee3c3b7f8422f4c512e9ebebdeeff1c28e81cc678ee4864d945d641e05f9b");
+    }
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData = parse_hex("d84accbb64934815506288fafbfc7d275e64aa4e3cd9c5392db6e83b13256bf3");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeED25519);
+    const auto signature = parse_hex("fb43727477caaa12542b9060856816d42eedef6ebf2e98e4f8dff4355fe384751925833c4a26b2fed1707aebe655cb3317504a61ee59697c086f7baa6ca06a09");
+
+    // Verify signature (pubkey & hash & signature)
+    {
+        EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+    }
+
+    const auto expectedTx = "390284d84accbb64934815506288fafbfc7d275e64aa4e3cd9c5392db6e83b13256bf300fb43727477caaa12542b9060856816d42eedef6ebf2e98e4f8dff4355fe384751925833c4a26b2fed1707aebe655cb3317504a61ee59697c086f7baa6ca06a099dfe00000500be4c21aa92dcba057e9b719ce1de970f774f064c09b13a3ea3009affb8cb5ec707000cdc0f21";
+    {
+        /// Compile transaction info
+        const Data outputData = TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKeyData});
+        auto output = Polkadot::Proto::SigningOutput();
+        output.ParseFromArray(outputData.data(), (int)outputData.size());
+        EXPECT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, {publicKey.bytes});
+        Polkadot::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Polkadot::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+} // namespace TW::Polkadot::tests
diff --git a/tests/chains/Polygon/TWCoinTypeTests.cpp b/tests/chains/Polygon/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..e9360551de0
--- /dev/null
+++ b/tests/chains/Polygon/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWPolygonCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypePolygon));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xe26ed1470d5bf99a53d687843e7acdf7e4ba6620af93b4d672e714de90476e8e"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypePolygon, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x720E1fa107A1Df39Db4E78A3633121ac36Bec132"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypePolygon, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypePolygon));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypePolygon));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypePolygon), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypePolygon));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypePolygon));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypePolygon));
+    assertStringsEqual(symbol, "POL");
+    assertStringsEqual(txUrl, "https://polygonscan.com/tx/0xe26ed1470d5bf99a53d687843e7acdf7e4ba6620af93b4d672e714de90476e8e");
+    assertStringsEqual(accUrl, "https://polygonscan.com/address/0x720E1fa107A1Df39Db4E78A3633121ac36Bec132");
+    assertStringsEqual(id, "polygon");
+    assertStringsEqual(name, "Polygon");
+}
diff --git a/tests/chains/PolygonZkEvm/TWCoinTypeTests.cpp b/tests/chains/PolygonZkEvm/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..3329a57d97d
--- /dev/null
+++ b/tests/chains/PolygonZkEvm/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::TWPolygonZkEvm::tests {
+
+TEST(TWPolygonZkEVMCoinType, TWCoinType) {
+    const auto coin = TWCoinTypePolygonzkEVM;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xc70fd1a45b3130f5515a27d96f01a7f508099fb0b8af52ef432d5e4b2373dccd"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x81d98c8fda0410ee3e9d7586cb949cd19fa4cf38"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "polygonzkevm");
+    assertStringsEqual(name, "Polygon zkEVM");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    ASSERT_EQ(coin, 10001101ull);
+    assertStringsEqual(chainId, "1101");
+    assertStringsEqual(txUrl, "https://zkevm.polygonscan.com/tx/0xc70fd1a45b3130f5515a27d96f01a7f508099fb0b8af52ef432d5e4b2373dccd");
+    assertStringsEqual(accUrl, "https://zkevm.polygonscan.com/address/0x81d98c8fda0410ee3e9d7586cb949cd19fa4cf38");
+}
+
+} // namespace TW::TWZksync::tests
diff --git a/tests/chains/Qtum/TWCoinTypeTests.cpp b/tests/chains/Qtum/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f32c75e50b4
--- /dev/null
+++ b/tests/chains/Qtum/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWQtumCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeQtum));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeQtum, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeQtum, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeQtum));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeQtum));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeQtum), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeQtum));
+    ASSERT_EQ(0x32, TWCoinTypeP2shPrefix(TWCoinTypeQtum));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeQtum));
+    assertStringsEqual(symbol, "QTUM");
+    assertStringsEqual(txUrl, "https://qtum.info/tx/t123");
+    assertStringsEqual(accUrl, "https://qtum.info/address/a12");
+    assertStringsEqual(id, "qtum");
+    assertStringsEqual(name, "Qtum");
+}
diff --git a/tests/Qtum/TWQtumAddressTests.cpp b/tests/chains/Qtum/TWQtumAddressTests.cpp
similarity index 95%
rename from tests/Qtum/TWQtumAddressTests.cpp
rename to tests/chains/Qtum/TWQtumAddressTests.cpp
index 8d658cf096c..cf95e3bc12a 100644
--- a/tests/Qtum/TWQtumAddressTests.cpp
+++ b/tests/chains/Qtum/TWQtumAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWSegwitAddress.h>
 #include <TrustWalletCore/TWBitcoinAddress.h>
diff --git a/tests/chains/Ravencoin/TWCoinTypeTests.cpp b/tests/chains/Ravencoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..38304931caa
--- /dev/null
+++ b/tests/chains/Ravencoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWRavencoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeRavencoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeRavencoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeRavencoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeRavencoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeRavencoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeRavencoin), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeRavencoin));
+    ASSERT_EQ(0x7a, TWCoinTypeP2shPrefix(TWCoinTypeRavencoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeRavencoin));
+    assertStringsEqual(symbol, "RVN");
+    assertStringsEqual(txUrl, "https://blockbook.ravencoin.org/tx/t123");
+    assertStringsEqual(accUrl, "https://blockbook.ravencoin.org/address/a12");
+    assertStringsEqual(id, "ravencoin");
+    assertStringsEqual(name, "Ravencoin");
+}
diff --git a/tests/Ravencoin/TWRavencoinTransactionTests.cpp b/tests/chains/Ravencoin/TWRavencoinTransactionTests.cpp
similarity index 90%
rename from tests/Ravencoin/TWRavencoinTransactionTests.cpp
rename to tests/chains/Ravencoin/TWRavencoinTransactionTests.cpp
index b90d76b91c8..7c3c7da223e 100644
--- a/tests/Ravencoin/TWRavencoinTransactionTests.cpp
+++ b/tests/chains/Ravencoin/TWRavencoinTransactionTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "Bitcoin/OutPoint.h"
 #include "Bitcoin/TransactionBuilder.h"
@@ -83,7 +81,7 @@ TEST(RavencoinTransaction, LockScripts) {
     assertHexEqual(scriptData, "76a9149451f4546e09fc2e49ef9b5303924712ec2b038e88ac");
 
     // P2SH
-    // https://ravencoin.network/api/tx/f600d07814677d1f60545c8f7f71260238595c4928d6fb87caa0f9dd732e9bb5
+    // https://blockbook.ravencoin.org/tx/f600d07814677d1f60545c8f7f71260238595c4928d6fb87caa0f9dd732e9bb5
 
     auto script2 = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("rPWwn5h4QFZNaz1XmY39rc73sdYGGDdmq1").get(), TWCoinTypeRavencoin));
     auto scriptData2 = WRAPD(TWBitcoinScriptData(script2.get()));
diff --git a/tests/chains/Ronin/TWAnyAddressTests.cpp b/tests/chains/Ronin/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..b1d162c2974
--- /dev/null
+++ b/tests/chains/Ronin/TWAnyAddressTests.cpp
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Ronin/Entry.h"
+
+#include <gtest/gtest.h>
+
+const auto roninPrefixChecksummed = "ronin:EC49280228b0D05Aa8e8b756503254e1eE7835ab";
+
+const auto gTests = {
+    roninPrefixChecksummed,
+    "ronin:ec49280228b0d05aa8e8b756503254e1ee7835ab",
+    "0xEC49280228b0D05Aa8e8b756503254e1eE7835ab",
+    "ronin:0xEC49280228b0D05Aa8e8b756503254e1eE7835ab",
+};
+
+TEST(RoninAnyAddress, Validate) {
+    for (const auto& t: gTests) {
+        EXPECT_TRUE(TWAnyAddressIsValid(STRING(t).get(), TWCoinTypeRonin));
+    }
+}
+
+TEST(RoninAnyAddress, Normalize) {
+    for (const auto& t: gTests) {
+        auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(STRING(t).get(), TWCoinTypeRonin));
+        auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+        EXPECT_TRUE(TWStringEqual(string2.get(), STRING(roninPrefixChecksummed).get()));
+
+        auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+        assertHexEqual(keyHash, "ec49280228b0d05aa8e8b756503254e1ee7835ab");
+    }
+}
+
+TEST(RoninAnyAddress, Invalid) {
+    const auto tests = {
+        "EC49280228b0D05Aa8e8b756503254e1eE7835ab", // no prefix
+        "ec49280228b0d05aa8e8b756503254e1ee7835ab", // no prefix
+        "roni:EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
+        "ronin=EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
+        "0xronin:EC49280228b0D05Aa8e8b756503254e1eE7835ab", // wrong prefix
+        "EC49280228b0D05Aa8e8b756503254e1eE7835", // too short
+        "ronin:EC49280228b0D05Aa8e8b756503254e1eE7835", // too short
+        "ronin:ec49280228b0d05aa8e8b756503254e1ee7835", // too short
+    };
+
+    for (const auto& t: tests) {
+        EXPECT_FALSE(TWAnyAddressIsValid(STRING(t).get(), TWCoinTypeRonin));
+    }
+}
diff --git a/tests/chains/Ronin/TWAnySignerTests.cpp b/tests/chains/Ronin/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..7e73d988335
--- /dev/null
+++ b/tests/chains/Ronin/TWAnySignerTests.cpp
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Ethereum.pb.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Ronin::tests {
+
+TEST(TWAnySignerRonin, Sign) {
+    // https://explorer.roninchain.com/tx/0xf13a2c4421700f8782ca73eaf16bb8baf82bcf093e23570a1ff062cdd8dbf6c3
+    Ethereum::Proto::SigningInput input;
+    auto chainId = store(uint256_t(2020));
+    auto nonce = store(uint256_t(0));
+    auto gasPrice = store(uint256_t(1000000000));
+    auto gasLimit = store(uint256_t(21000));
+    auto key = parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_private_key(key.data(), key.size());
+    input.set_to_address("ronin:c36edf48e21cf395b206352a1819de658fd7f988");
+
+    auto& transfer = *input.mutable_transaction()->mutable_transfer();
+    auto amount = store(uint256_t(276447));
+    transfer.set_amount(amount.data(), amount.size());
+
+    std::string expected = "f86880843b9aca0082520894c36edf48e21cf395b206352a1819de658fd7f988830437df80820feca0442aa06b0d0465bfecf84b28e2ce614a32a1ccc12735dc03a5799517d6659d7aa004e1bf2efa30743f1b6d49dbec2671e9fb5ead1e7da15e352ca1df6fb86a8ba7";
+
+    // sign test
+    Ethereum::Proto::SigningOutput output;
+
+    ANY_SIGN(input, TWCoinTypeRonin);
+
+    ASSERT_EQ(hex(output.encoded()), expected);
+    EXPECT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeRonin));
+}
+
+} // namespace TW::Ronin::tests
diff --git a/tests/chains/Ronin/TWCoinTypeTests.cpp b/tests/chains/Ronin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..3efdb99911f
--- /dev/null
+++ b/tests/chains/Ronin/TWCoinTypeTests.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWRoninCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeRonin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xc09835aaf9c1cacea8ce322865583c791d3a4dfbd9a3b72f79539db88d3697ab"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeRonin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xdc05ecd5fbdb64058d94f3182d66f44342b9adcb"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeRonin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeRonin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeRonin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeRonin), 18);
+    ASSERT_EQ(TWBlockchainRonin, TWCoinTypeBlockchain(TWCoinTypeRonin));
+
+    assertStringsEqual(symbol, "RON");
+    assertStringsEqual(txUrl, "https://explorer.roninchain.com/tx/0xc09835aaf9c1cacea8ce322865583c791d3a4dfbd9a3b72f79539db88d3697ab");
+    assertStringsEqual(accUrl, "https://explorer.roninchain.com/address/0xdc05ecd5fbdb64058d94f3182d66f44342b9adcb");
+    assertStringsEqual(id, "ronin");
+    assertStringsEqual(name, "Ronin");
+}
diff --git a/tests/chains/Rootstock/TWCoinTypeTests.cpp b/tests/chains/Rootstock/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..04795f50dae
--- /dev/null
+++ b/tests/chains/Rootstock/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWRootstockCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeRootstock;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xeb8fa0488a655f8dc975153bffd066800bcaae5f21cf372356365b2a1d6d2288"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x4e5dabc28e4a0f5e5b19fcb56b28c5a1989352c1"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "rootstock");
+    assertStringsEqual(name, "Rootstock");
+    assertStringsEqual(symbol, "RBTC");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "30");
+    assertStringsEqual(txUrl, "https://explorer.rsk.co/tx/0xeb8fa0488a655f8dc975153bffd066800bcaae5f21cf372356365b2a1d6d2288");
+    assertStringsEqual(accUrl, "https://explorer.rsk.co/address/0x4e5dabc28e4a0f5e5b19fcb56b28c5a1989352c1");
+}
diff --git a/tests/chains/Scroll/TWAnySignerTests.cpp b/tests/chains/Scroll/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..b719ff58bf9
--- /dev/null
+++ b/tests/chains/Scroll/TWAnySignerTests.cpp
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Ethereum.pb.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Scroll::tests {
+
+/// Successfully broadcasted:
+/// https://blockscout.scroll.io/tx/0x5a7ba291e0490079bddda54ca5592e5990d6b0eb49f8d239202941e3f63d32bc
+TEST(TWAnySignerScroll, Sign) {
+    Ethereum::Proto::SigningInput input;
+    auto chainId = store(uint256_t(534352));
+    auto nonce = store(uint256_t(1));
+    auto gasPrice = store(uint256_t(1000000));
+    auto gasLimit = store(uint256_t(200000));
+    auto key = parse_hex("ba4c9bceece0677d2c92be11c2338652e34b10675dc4cec5546a20a314fe7a73");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_private_key(key.data(), key.size());
+    input.set_to_address("0xa6BC5EE0B1e904DD0773c5555D2F6833fE937A68");
+
+    auto& transfer = *input.mutable_transaction()->mutable_transfer();
+    auto amount = store(uint256_t(200000000000000));
+    transfer.set_amount(amount.data(), amount.size());
+
+    std::string expected = "f86c01830f424083030d4094a6bc5ee0b1e904dd0773c5555d2f6833fe937a6886b5e620f480008083104ec3a0c43ee3d34f7758e05e2f54df227eb7780ad97d06e91e03ef6a3c91d4bea6e42fa07d075f20776f7f485faca6f057110fd2745a5cdd6cf121682ef7791619a03ade";
+
+    // sign test
+    Ethereum::Proto::SigningOutput output;
+
+    ANY_SIGN(input, TWCoinTypeScroll);
+
+    ASSERT_EQ(hex(output.encoded()), expected);
+    EXPECT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeScroll));
+}
+
+} // namespace TW::Scroll::tests
diff --git a/tests/chains/Scroll/TWCoinTypeTests.cpp b/tests/chains/Scroll/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..afe6e3c63b0
--- /dev/null
+++ b/tests/chains/Scroll/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWScrollCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeScroll;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xa2062a4530b194a438bb9f9e87cdce59f70775a52e8336892364445847c43ca2"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xf9062b8a30e0d7722960e305049fa50b86ba6253"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "scroll");
+    assertStringsEqual(name, "Scroll");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "534352");
+    assertStringsEqual(txUrl, "https://scrollscan.com/tx/0xa2062a4530b194a438bb9f9e87cdce59f70775a52e8336892364445847c43ca2");
+    assertStringsEqual(accUrl, "https://scrollscan.com/address/0xf9062b8a30e0d7722960e305049fa50b86ba6253");
+}
diff --git a/tests/chains/SmartBitcoinCash/TWCoinTypeTests.cpp b/tests/chains/SmartBitcoinCash/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..30c048093bc
--- /dev/null
+++ b/tests/chains/SmartBitcoinCash/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWSmartBitcoinCashCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeSmartBitcoinCash));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeSmartBitcoinCash, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xFeEc227410E1DF9f3b4e6e2E284DC83051ae468F"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeSmartBitcoinCash, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSmartBitcoinCash));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSmartBitcoinCash));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeSmartBitcoinCash), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeSmartBitcoinCash));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeSmartBitcoinCash));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeSmartBitcoinCash));
+    assertStringsEqual(symbol, "BCH");
+    assertStringsEqual(txUrl, "https://www.smartscan.cash/tx/0x6413466b455b17d03c7a8ce2d7f99fec34bcd338628bdd2d0580a21e3197a4d9");
+    assertStringsEqual(accUrl, "https://www.smartscan.cash/address/0xFeEc227410E1DF9f3b4e6e2E284DC83051ae468F");
+    assertStringsEqual(id, "smartbch");
+    assertStringsEqual(name, "Smart Bitcoin Cash");
+}
diff --git a/tests/chains/Solana/AddressTests.cpp b/tests/chains/Solana/AddressTests.cpp
new file mode 100644
index 00000000000..6e040826979
--- /dev/null
+++ b/tests/chains/Solana/AddressTests.cpp
@@ -0,0 +1,68 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Solana/Address.h"
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace TW;
+
+namespace TW::Solana::tests {
+
+TEST(SolanaAddress, FromPublicKey) {
+    {
+        const auto addressString = "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST";
+        const auto publicKey = PublicKey(Base58::decode(addressString), TWPublicKeyTypeED25519);
+        const auto address = Address(publicKey);
+        ASSERT_EQ(addressString, address.string());
+    }
+    {
+        const auto privateKey = PrivateKey(parse_hex("a1269039e4ffdf43687852d7247a295f0b5bc55e6dda031cffaa3295ca0a9d7a"));
+        const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
+        EXPECT_ANY_THROW(new Address(publicKey));
+    }
+}
+
+TEST(SolanaAddress, FromData) {
+    {
+        const auto address = Address(parse_hex("18f9d8d877393bbbe8d697a8a2e52879cc7e84f467656d1cce6bab5a8d2637ec"));
+        ASSERT_EQ("2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST", address.string());
+    }
+    {
+        EXPECT_ANY_THROW(new Address(Data{}));
+    }
+}
+
+TEST(SolanaAddress, FromString) {
+    string addressString = "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST";
+    const auto address = Address(addressString);
+    ASSERT_EQ(address.string(), addressString);
+
+    EXPECT_ANY_THROW(new Address("4h4bzCLCV8"));
+}
+
+TEST(SolanaAddress, isValid) {
+    ASSERT_TRUE(Address::isValid("2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdST"));
+    ASSERT_FALSE(Address::isValid(
+        "2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpdSl")); // Contains invalid base-58 character
+    ASSERT_FALSE(
+        Address::isValid("2gVkYWexTHR5Hb2aLeQN3tnngvWzisFKXDUPrgMHpd")); // Is invalid length
+}
+
+TEST(SolanaAddress, isValidOnCurve) {
+    EXPECT_TRUE(PublicKey(Base58::decode("HzqnaMjWFbK2io6WgV2Z5uBguCBU21RMUS16wsDUHkon"), TWPublicKeyTypeED25519).isValidED25519());
+    EXPECT_TRUE(PublicKey(Base58::decode("68io7dTfyeWua1wD1YcCMka4y5iiChceaFRCBjqCM5PK"), TWPublicKeyTypeED25519).isValidED25519());
+    EXPECT_TRUE(PublicKey(Base58::decode("Dra34QLFCjxnk8tUNcBwxs6pgb5spF4oseQYF2xn7ABZ"), TWPublicKeyTypeED25519).isValidED25519());
+    // negative case
+    EXPECT_FALSE(PublicKey(Base58::decode("6X4X1Ae24mkoWeCEpktevySVG9jzeCufut5vtUW3wFrD"), TWPublicKeyTypeED25519).isValidED25519());
+    EXPECT_FALSE(PublicKey(Base58::decode("EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP"), TWPublicKeyTypeED25519).isValidED25519());
+    EXPECT_FALSE(PublicKey(Base58::decode("ANVCrmRw7Ww7rTFfMbrjApSPXEEcZpBa6YEiBdf98pAf"), TWPublicKeyTypeED25519).isValidED25519());
+    EXPECT_FALSE(PublicKey(Base58::decode("AbygL37RheNZv327cMvZPqKYLLkZ6wqWYexRxgNiZyeP"), TWPublicKeyTypeED25519).isValidED25519());
+}
+
+} // namespace TW::Solana::tests
diff --git a/tests/chains/Solana/TWAnySignerTests.cpp b/tests/chains/Solana/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..8537199f0e6
--- /dev/null
+++ b/tests/chains/Solana/TWAnySignerTests.cpp
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "PrivateKey.h"
+#include "proto/Solana.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+namespace TW::Solana::tests {
+
+const auto expectedString1 =
+    "3p2kzZ1DvquqC6LApPuxpTg5CCDVPqJFokGSnGhnBHrta4uq7S2EyehV1XNUVXp51D69GxGzQZU"
+    "jikfDzbWBG2aFtG3gHT1QfLzyFKHM4HQtMQMNXqay1NAeiiYZjNhx9UvMX4uAQZ4Q6rx6m2AYfQ"
+    "7aoMUrejq298q1wBFdtS9XVB5QTiStnzC7zs97FUEK2T4XapjF1519EyFBViTfHpGpnf5bfizDz"
+    "sW9kYUtRDW1UC2LgHr7npgq5W9TBmHf9hSmRgM9XXucjXLqubNWE7HUMhbKjuBqkirRM";
+
+TEST(TWAnySignerSolana, SignTransfer) {
+    auto privateKey = Base58::decode("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr");
+    auto input = Proto::SigningInput();
+
+    auto& message = *input.mutable_transfer_transaction();
+    message.set_recipient("EN2sCsJ1WDV8UFqsiTXHcUPUxQ4juE71eCknHYYMifkd");
+    message.set_value((uint64_t)42L);
+    input.set_private_key(privateKey.data(), privateKey.size());
+    input.set_recent_blockhash("11111111111111111111111111111111");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeSolana);
+
+    ASSERT_EQ(output.encoded(), expectedString1);
+    ASSERT_EQ(output.unsigned_tx(), "87PYsiS4MUU1UqXrsDoCBmD5FcKsXhwEBD8hc4zbq78yePu7bLENmbnmjmVbsj4VvaxnZhy4bERndPFzjSRH5WpwKwMLSCKvn9eSDmPESNcdkqne2UdMfWiFoq8ZeQBnF9h98dP8GM9kfzWPjvLmhjwuwA1E2k5WCtfii7LKQ34v6AtmFQGZqgdKiNqygP7ZKusHWGT8ZkTZ");
+}
+
+} // namespace TW::Solana::tests
diff --git a/tests/chains/Solana/TWCoinTypeTests.cpp b/tests/chains/Solana/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..4fe7feb42af
--- /dev/null
+++ b/tests/chains/Solana/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWSolanaCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeSolana));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("5LmxrEKGchhMuYfw6Qut6CbsvE9pVfb8YvwZKvWssSesDVjHioBCmWKSJQh1WhvcM6CpemhpHNmEMA2a36rzwTa8"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeSolana, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("Bxp8yhH9zNwxyE4UqxP7a7hgJ5xTZfxNNft7YJJ2VRjT"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeSolana, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSolana));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSolana));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeSolana), 9);
+    ASSERT_EQ(TWBlockchainSolana, TWCoinTypeBlockchain(TWCoinTypeSolana));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeSolana));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeSolana));
+    assertStringsEqual(symbol, "SOL");
+    assertStringsEqual(txUrl, "https://solscan.io/tx/5LmxrEKGchhMuYfw6Qut6CbsvE9pVfb8YvwZKvWssSesDVjHioBCmWKSJQh1WhvcM6CpemhpHNmEMA2a36rzwTa8");
+    assertStringsEqual(accUrl, "https://solscan.io/account/Bxp8yhH9zNwxyE4UqxP7a7hgJ5xTZfxNNft7YJJ2VRjT");
+    assertStringsEqual(id, "solana");
+    assertStringsEqual(name, "Solana");
+}
diff --git a/tests/chains/Solana/TWSolanaAddressTests.cpp b/tests/chains/Solana/TWSolanaAddressTests.cpp
new file mode 100644
index 00000000000..5607877186b
--- /dev/null
+++ b/tests/chains/Solana/TWSolanaAddressTests.cpp
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWHDWallet.h>
+#include <TrustWalletCore/TWSolanaAddress.h>
+
+#include <gtest/gtest.h>
+
+TEST(TWSolanaAddress, HDWallet) {
+    auto mnemonic =
+        "shoot island position soft burden budget tooth cruel issue economy destroy above";
+    auto passphrase = "";
+
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(STRING(mnemonic).get(), STRING(passphrase).get()));
+
+    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypeSolana, WRAPS(TWCoinTypeDerivationPath(TWCoinTypeSolana)).get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyEd25519(privateKey.get()));
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeSolana));
+    auto addressStr = WRAPS(TWAnyAddressDescription(address.get()));
+
+    assertStringsEqual(addressStr, "2bUBiBNZyD29gP1oV6de7nxowMLoDBtopMMTGgMvjG5m");
+}
+
+TEST(TWSolanaProgram, defaultTokenAddress) {
+    const auto solAddress = STRING("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
+    const auto serumToken = STRING("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKWRt");
+
+    auto solanaAddress = WRAP(TWSolanaAddress, TWSolanaAddressCreateWithString(solAddress.get()));
+    auto description = WRAPS(TWSolanaAddressDescription(solanaAddress.get()));
+    auto tokenAddress = WRAPS(TWSolanaAddressDefaultTokenAddress(solanaAddress.get(), serumToken.get()));
+
+    assertStringsEqual(tokenAddress, "EDNd1ycsydWYwVmrYZvqYazFqwk1QjBgAUKFjBoz1jKP");
+    assertStringsEqual(description, "B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
+}
+
+TEST(TWSolanaProgram, defaultTokenAddressError) {
+    const auto solAddress = STRING("B1iGmDJdvmxyUiYM8UEo2Uw2D58EmUrw4KyLYMmrhf8V");
+    // Invalid token mint address.
+    const auto serumToken = STRING("SRMuApVNdxXokk5GT7XD5cUUgXMBCoAz2LHeuAoKW");
+
+    auto solanaAddress = WRAP(TWSolanaAddress, TWSolanaAddressCreateWithString(solAddress.get()));
+    auto description = WRAPS(TWSolanaAddressDescription(solanaAddress.get()));
+
+    EXPECT_EQ(TWSolanaAddressDefaultTokenAddress(solanaAddress.get(), serumToken.get()), nullptr);
+}
+
+TEST(TWSolanaProgram, token2022Address) {
+    const auto solAddress = STRING("68dzdXkni9BrAwU1asAwurMEdQhXUJq6MNY8niDAny8t");
+    const auto catwifhatToken = STRING("7atgF8KQo4wJrD5ATGX7t1V2zVvykPJbFfNeVf1icFv1");
+
+    auto solanaAddress = WRAP(TWSolanaAddress, TWSolanaAddressCreateWithString(solAddress.get()));
+    auto description = WRAPS(TWSolanaAddressDescription(solanaAddress.get()));
+    auto tokenAddress = WRAPS(TWSolanaAddressToken2022Address(solanaAddress.get(), catwifhatToken.get()));
+
+    assertStringsEqual(tokenAddress, "3PaFQnebQMHBgthRScup2B932cMxA1GBP7m9roCkomHq");
+    assertStringsEqual(description, "68dzdXkni9BrAwU1asAwurMEdQhXUJq6MNY8niDAny8t");
+}
+
+TEST(TWSolanaProgram, token2022AddressError) {
+    const auto solAddress = STRING("68dzdXkni9BrAwU1asAwurMEdQhXUJq6MNY8niDAny8t");
+    // Invalid token mint address.
+    const auto catwifhatToken = STRING("7atgF8KQo4wJrD5ATGX7t1V2zVvykPJbFfNeVf1icF");
+
+    auto solanaAddress = WRAP(TWSolanaAddress, TWSolanaAddressCreateWithString(solAddress.get()));
+    auto description = WRAPS(TWSolanaAddressDescription(solanaAddress.get()));
+
+    EXPECT_EQ(TWSolanaAddressToken2022Address(solanaAddress.get(), catwifhatToken.get()), nullptr);
+}
diff --git a/tests/chains/Solana/TWSolanaTransaction.cpp b/tests/chains/Solana/TWSolanaTransaction.cpp
new file mode 100644
index 00000000000..14613f3c344
--- /dev/null
+++ b/tests/chains/Solana/TWSolanaTransaction.cpp
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TrustWalletCore/TWSolanaTransaction.h"
+#include "TrustWalletCore/TWTransactionDecoder.h"
+#include "TrustWalletCore/TWAnySigner.h"
+#include "proto/Solana.pb.h"
+#include "TestUtilities.h"
+#include "Base64.h"
+#include "Base58.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+namespace TW::Solana::tests {
+
+TEST(TWSolanaTransaction, UpdateBlockhashAndSign) {
+    // base64 encoded
+    // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+    auto encodedTx = STRING("AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG");
+    // base58 encoded
+    auto newBlockhash = STRING("CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg");
+
+    auto myPrivateKey = DATA("7f0932159226ddec9e1a4b0b8fe7cdc135049f9e549a867d722aa720dd64f32e");
+    auto feePayerPrivateKey = DATA("4b9d6f57d28b06cbfa1d4cc710953e62d653caf853415c56ffd9d150acdeb7f7");
+    auto privateKeysVec = WRAP(TWDataVector, TWDataVectorCreateWithData(myPrivateKey.get()));
+    TWDataVectorAdd(privateKeysVec.get(), feePayerPrivateKey.get());
+
+    auto outputData = WRAPD(TWSolanaTransactionUpdateBlockhashAndSign(encodedTx.get(), newBlockhash.get(), privateKeysVec.get()));
+
+    Proto::SigningOutput output;
+    output.ParseFromArray(TWDataBytes(outputData.get()), static_cast<int>(TWDataSize(outputData.get())));
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_EQ(output.encoded(), "Ajzc/Tke0CG8Cew5qFa6xZI/7Ya3DN0M8Ige6tKPsGzhg8Bw9DqL18KUrEZZ1F4YqZBo4Rv+FsDT8A7Nss7p4A6BNVZzzGprCJqYQeNg0EVIbmPc6mDitNniHXGeKgPZ6QZbM4FElw9O7IOFTpOBPvQFeqy0vZf/aayncL8EK/UEAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG");
+}
+
+TEST(TWSolanaTransaction, DecodeUpdateBlockhashAndSign) {
+    // base64 encoded
+    // https://explorer.solana.com/tx/3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej?cluster=devnet
+    auto encodedTx = Base64::decode("AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG");
+    auto newBlockhash = "CyPYVsYWrsJNfVpi8aazu7WsrswNFuDd385z6GNoBGUg";
+    auto senderPrivateKey = Base58::decode("9YtuoD4sH4h88CVM8DSnkfoAaLY7YeGC2TarDJ8eyMS5");
+    auto feePayerPrivateKey = Base58::decode("66ApBuKpo2uSzpjGBraHq7HP8UZMUJzp3um8FdEjkC9c");
+
+    // Step 1: Decode the transaction.
+
+    auto encodedTxPtr = WRAPD(TWDataCreateWithBytes(encodedTx.data(), encodedTx.size()));
+    auto decodeOutputPtr = WRAPD(TWTransactionDecoderDecode(TWCoinTypeSolana, encodedTxPtr.get()));
+
+    Proto::DecodingTransactionOutput decodeOutput;
+    decodeOutput.ParseFromArray(
+        TWDataBytes(decodeOutputPtr.get()),
+        static_cast<int>(TWDataSize(decodeOutputPtr.get()))
+    );
+
+    EXPECT_EQ(decodeOutput.error(), Common::Proto::SigningError::OK);
+    ASSERT_TRUE(decodeOutput.transaction().has_legacy());
+    // Previous fee payer signature.
+    EXPECT_EQ(
+        decodeOutput.transaction().signatures(0).signature(),
+        "3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej"
+    );
+    // Previous sender signature.
+    EXPECT_EQ(
+        decodeOutput.transaction().signatures(1).signature(),
+        "37UT8U6DdqaWqV6yQuHcRN3JpMefDgVna8LJJPmmDNKYMwmefEgvcreSg9AqSsT7cU2rMBNyDktEtDU19ZqqZvML"
+    );
+
+    // Step 2. Prepare a signing input and update the recent-blockhash.
+
+    Proto::SigningInput signingInput;
+    *signingInput.mutable_raw_message() = decodeOutput.transaction();
+    signingInput.mutable_raw_message()->mutable_legacy()->set_recent_blockhash(newBlockhash);
+    signingInput.set_private_key(senderPrivateKey.data(), senderPrivateKey.size());
+    signingInput.set_fee_payer_private_key(feePayerPrivateKey.data(), feePayerPrivateKey.size());
+    signingInput.set_tx_encoding(Proto::Encoding::Base64);
+
+    // Step 3. Re-sign the updated transaction.
+
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeSolana);
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_EQ(output.encoded(), "Ajzc/Tke0CG8Cew5qFa6xZI/7Ya3DN0M8Ige6tKPsGzhg8Bw9DqL18KUrEZZ1F4YqZBo4Rv+FsDT8A7Nss7p4A6BNVZzzGprCJqYQeNg0EVIbmPc6mDitNniHXGeKgPZ6QZbM4FElw9O7IOFTpOBPvQFeqy0vZf/aayncL8EK/UEAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8AqbHiki6ThNH3auuyZPQpJntnN0mA//56nMpK/6HIuu8xAQUEAgQDAQoMoA8AAAAAAAAG");
+}
+
+TEST(TWSolanaTransaction, SetPriorityFee) {
+    // base64 encoded
+    const auto privateKey = parse_hex("baf2b2dbbbad7ca96c1fa199c686f3d8fbd2c7b352f307e37e04f33df6741f18");
+    const auto originalTx = STRING("AX43+Ir2EDqf2zLEvgzFrCZKRjdr3wCdp8CnvYh6N0G/s86IueX9BbiNUl16iLRGvwREDfi2Srb0hmLNBFw1BwABAAEDODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAG6GdPcA92ORzVJe2jfG8KQqqMHr9YTLu30oM4i7MFEoBAgIAAQwCAAAA6AMAAAAAAAA=");
+
+    // Step 1 - Check if there are no price and limit instructions in the original transaction.
+
+    EXPECT_EQ(TWSolanaTransactionGetComputeUnitPrice(originalTx.get()), nullptr);
+    EXPECT_EQ(TWSolanaTransactionGetComputeUnitLimit(originalTx.get()), nullptr);
+
+    // Step 2 - Set price and limit instructions.
+
+    const auto txWithPrice = WRAPS(TWSolanaTransactionSetComputeUnitPrice(originalTx.get(), STRING("1000").get()));
+    const auto updatedTx = WRAPS(TWSolanaTransactionSetComputeUnitLimit(txWithPrice.get(), STRING("10000").get()));
+
+    assertStringsEqual(updatedTx, "AX43+Ir2EDqf2zLEvgzFrCZKRjdr3wCdp8CnvYh6N0G/s86IueX9BbiNUl16iLRGvwREDfi2Srb0hmLNBFw1BwABAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAboZ09wD3Y5HNUl7aN8bwpCqowev1hMu7fSgziLswUSgMDAAUCECcAAAICAAEMAgAAAOgDAAAAAAAAAwAJA+gDAAAAAAAA");
+
+    // Step 3 - Check if price and limit instructions are set successfully.
+
+    assertStringsEqual(WRAPS(TWSolanaTransactionGetComputeUnitPrice(updatedTx.get())), "1000");
+    assertStringsEqual(WRAPS(TWSolanaTransactionGetComputeUnitLimit(updatedTx.get())), "10000");
+
+    // Step 4 - Decode transaction into a `RawMessage` Protobuf.
+
+    const std::string updateTxDataB64 {TWStringUTF8Bytes(updatedTx.get()) };
+    const auto updatedTxData = Base64::decode(updateTxDataB64);
+    const auto updatedTxRef = WRAPD(TWDataCreateWithBytes(updatedTxData.data(), updatedTxData.size()));
+
+    const auto decodeOutputData = WRAPD(TWTransactionDecoderDecode(TWCoinTypeSolana, updatedTxRef.get()));
+    Proto::DecodingTransactionOutput decodeOutput;
+    decodeOutput.ParseFromArray(TWDataBytes(decodeOutputData.get()), static_cast<int>(TWDataSize(decodeOutputData.get())));
+    EXPECT_EQ(decodeOutput.error(), Common::Proto::SigningError::OK);
+
+    // Step 5 - Sign the decoded `RawMessage` transaction.
+
+    Proto::SigningInput input;
+    input.set_private_key(privateKey.data(), privateKey.size());
+    *input.mutable_raw_message() = decodeOutput.transaction();
+    input.set_tx_encoding(Proto::Encoding::Base64);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeSolana);
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+
+    // Successfully broadcasted tx:
+    // https://explorer.solana.com/tx/2ho7wZUXbDNz12xGfsXg2kcNMqkBAQjv7YNXNcVcuCmbC4p9FZe9ELeM2gMjq9MKQPpmE3nBW5pbdgwVCfNLr1h8
+    EXPECT_EQ(output.encoded(), "AVUye82Mv+/aWeU2G+B6Nes365mUU2m8iqcGZn/8kFJvw4wY6AgKGG+vJHaknHlCDwE1yi1SIMVUUtNCOm3kHg8BAAIEODI+iWe7g68B9iwCy8bFkJKvsIEj350oSOpcv4gNnv/st+6qmqipl9lwMK6toB9TiL7LrJVfij+pKwr+pUKxfwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwZGb+UhFzL/7K26csOb57yM5bvF9xJrLEObOkAAAAAboZ09wD3Y5HNUl7aN8bwpCqowev1hMu7fSgziLswUSgMDAAUCECcAAAICAAEMAgAAAOgDAAAAAAAAAwAJA+gDAAAAAAAA");
+}
+
+} // TW::Solana::tests
diff --git a/tests/chains/Solana/TWWalletConnectSolana.cpp b/tests/chains/Solana/TWWalletConnectSolana.cpp
new file mode 100644
index 00000000000..f8c23d0c80e
--- /dev/null
+++ b/tests/chains/Solana/TWWalletConnectSolana.cpp
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "proto/Solana.pb.h"
+#include "proto/WalletConnect.pb.h"
+#include "Coin.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWWalletConnectRequest.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Solana {
+
+TEST(TWWalletConnectSolana, Transfer) {
+    auto private_key = Base58::decode("A7psj2GW7ZMdY4E5hJq14KMeYg7HFjULSsWSrTXZLvYr");
+    const auto payload = R"({"transaction":"AQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA="})";
+
+    WalletConnect::Proto::ParseRequestInput parsingInput;
+    parsingInput.set_method(WalletConnect::Proto::Method::SolanaSignTransaction);
+    parsingInput.set_payload(payload);
+
+    const auto parsinginputData = parsingInput.SerializeAsString();
+    const auto parsingInputDataPtr = WRAPD(TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(parsinginputData.c_str()), parsinginputData.size()));
+
+    const auto outputDataPtr = WRAPD(TWWalletConnectRequestParse(TWCoinTypeSolana, parsingInputDataPtr.get()));
+
+    WalletConnect::Proto::ParseRequestOutput parsingOutput;
+    parsingOutput.ParseFromArray(
+        TWDataBytes(outputDataPtr.get()),
+        static_cast<int>(TWDataSize(outputDataPtr.get()))
+    );
+
+    EXPECT_EQ(parsingOutput.error(), Common::Proto::SigningError::OK);
+
+    // Step 2: Set missing fields.
+    ASSERT_TRUE(parsingOutput.has_solana());
+    Proto::SigningInput signingInput = parsingOutput.solana();
+
+    signingInput.set_private_key(private_key.data(), private_key.size());
+    signingInput.set_tx_encoding(Proto::Encoding::Base64);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(signingInput, TWCoinTypeSolana);
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::OK);
+    EXPECT_EQ(output.encoded(), "AQPWaOi7dMdmQpXi8HyQQKwiqIftrg1igGQxGtZeT50ksn4wAnyH4DtDrkkuE0fqgx80LTp4LwNN9a440SrmoA8BAAEDZsL1CMnFVcrMn7JtiOiN1U4hC7WovOVof2DX51xM0H/GizyJTHgrBanCf8bGbrFNTn0x3pCGq30hKbywSTr6AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAgIAAQwCAAAAKgAAAAAAAAA=");
+}
+
+} // namespace TW::Binance
diff --git a/tests/chains/Solana/TransactionCompilerTests.cpp b/tests/chains/Solana/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..7130966e3b8
--- /dev/null
+++ b/tests/chains/Solana/TransactionCompilerTests.cpp
@@ -0,0 +1,134 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Solana.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Solana::tests {
+
+TEST(SolanaCompiler, CompileTransferWithSignatures) {
+    const auto coin = TWCoinTypeSolana;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::Solana::Proto::SigningInput();
+    auto& message = *input.mutable_transfer_transaction();
+    auto recipient = std::string("3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe");
+    auto sender = std::string("sp6VUqq1nDEuU83bU2hstmEYrJNipJYpwS7gZ7Jv7ZH");
+    input.set_sender(sender);
+    input.set_recent_blockhash(std::string("TPJFTN4CjBn12HiBfAbGUhpD9zGvRSm2RcheFRA4Fyv"));
+    message.set_recipient(recipient);
+    message.set_value((uint64_t)1000);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::Solana::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    ASSERT_EQ(preSigningOutput.signers_size(), 1);
+    auto signer = preSigningOutput.signers(0);
+    EXPECT_EQ(signer, sender);
+    auto preImageHash = preSigningOutput.data();
+    EXPECT_EQ(hex(preImageHash),
+              "010001030d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c024c255a8bc3e"
+              "8496217a2cd2a1894b9b9dcace04fcd9c0d599acdaaea40a1b6100000000000000000000000000000000"
+              "0000000000000000000000000000000006c25012cc11a599a45b3b2f7f8a7c65b0547fa0bb67170d7a0c"
+              "d1eda4e2c9e501020200010c02000000e803000000000000");
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData =
+        parse_hex("0d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c0");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeED25519);
+    const auto signature =
+        parse_hex("a8c610697087eaf8a34b3facbe06f8e9bb9603bb03270dad021ffcd2fc37b6e9efcdcb78b227401f"
+                  "000eb9231c67685240890962e44a17fd27fc2ff7b971df03");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+    const auto ExpectedTx =
+        "5bWxVCP5fuzkKSGby9hnsLranszQJR2evJGTfBrpDQ4rJceW1WxKNrWqVPBsN2QCAGmE6W7VaYkyWjv39HhGrr1Ne2"
+        "QSUuHZdyyn7hK4pxzLPMgPG8fY1XvXdppWMaKMLmhriLkckzGKJMaE3pWBRFBKzigXY28714uUNndb7S9hVakxa59h"
+        "rLph39CMgAkcj6b8KYvJEkb1YdYytHSZNGi4kVVTNqiicNgPdf1gmG6qz9zVtnqj9JtaD2efdS8qxsKnvNWSgb8Xxb"
+        "T6dwyp7msUUi7d27cYaPTpK";
+    {
+        Solana::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.encoded(), ExpectedTx);
+        EXPECT_EQ(output.encoded().size(), 293ul);
+    }
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        Solana::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        auto key = parse_hex("044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1");
+        signingInput.set_private_key(key.data(), key.size());
+
+        Solana::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.encoded(), ExpectedTx);
+    }
+}
+
+TEST(SolanaCompiler, CompileTransferWithPriorityFee) {
+    // tx on mainnet
+    // https://explorer.solana.com/tx/5asW13PSGvbZAeiGe8YFo7jt3UTqb8KUfFhXh5DXpDVfpVup1ZP41tp7PmBJH43gK5xT9U4VDVChDynmC7PJp9fa
+
+    const auto coin = TWCoinTypeSolana;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::Solana::Proto::SigningInput();
+    auto& message = *input.mutable_transfer_transaction();
+    auto recipient = std::string("6NdFCrugyZVRhFbHvJT3dFBrGE9ZYFbfc8dBS2q4d2a9");
+    auto sender = std::string("EQ37VYUVcqUSzYgvaguDB4yVRg5m3Xg7qQoKF8zFiJxe");
+    input.set_sender(sender);
+    input.set_recent_blockhash(std::string("8oFmGuWUpsy8h8WP8AXTp3yhcLt4gQJRG5GxNcK7jfhX"));
+    input.set_nonce_account("ubKTCz9avQt3twiC9TbRjfoCiJnggH1abjgj9FjZJJm");
+    input.mutable_priority_fee_price()->set_price(40000);
+    input.mutable_priority_fee_limit()->set_limit(480000);
+    message.set_recipient(recipient);
+    message.set_value((uint64_t)10000);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::Solana::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    ASSERT_EQ(preSigningOutput.signers_size(), 1);
+    auto signer = preSigningOutput.signers(0);
+    EXPECT_EQ(signer, sender);
+    auto preImageHash = preSigningOutput.data();
+    EXPECT_EQ(hex(preImageHash), "01000306c70ead37125b5e142838eb59a6883ef915474f9b0a52494f698a4d23f4827ca70d79017647148829ddee52e687a840b42ce55a808367ff3cb0dc67444f5361ca4fd49d2664e7ac3016160e0b943a9222a21bee6510248dc2ae341f58195a2a3606a7d517192c568ee08a845f73d29788cf035c3145b21ab344d8062ea940000000000000000000000000000000000000000000000000000000000000000000000306466fe5211732ffecadba72c39be7bc8ce5bbc5f7126b2c439b3a4000000073db37fafe5d370e4605395dfc4661d886170c751ecfd7d76a744ea43c9f16f6040403010300040400000005000903409c0000000000000500050200530700040200020c020000001027000000000000");
+
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData = parse_hex("c70ead37125b5e142838eb59a6883ef915474f9b0a52494f698a4d23f4827ca7");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeED25519);
+    const auto signature = parse_hex("e546dbc2b896ff53abe5d3f090abdea84fb3862c6dcab4a6878e4d0dc803a53a2b077ef14014737e049815ff4df5daa92dc3e11b55770466d5feab6bdfccf005");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+
+    /// Step 3: Compile transaction info
+    auto outputData = TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+    const auto ExpectedTx = "84RnGAbza5DstiCPgBwtyuGnB2TPYsRGFr4L9tvzc71tBjyPS5aK9xGfMPdKA16gm8dJSxdAwMQX22zF3bQAHtgNHSApaL9Hs2B4Rz1HjazPmbNYLJKkSZ4gq2MWbY6DSKkg3NUf4L9HpZVFbrUw7TNgFYbEYiA1wTJ4aVwVAh9NQLDaQBgANnMvjFTYy2rDjgHL8nZU6omjK2uvDaLdqp2L4hXjGTKQ1mMFVRLXnrMUX8dijBPty3NDcgJ3G442ccGguez7DwYooirYuZ5ajiJwkKtqu8tW4namRdvAC7YmL1tCqZpWXyDBhqMapoyf1bVCvUbnuz64RZwhd7nj6DyULtiMXCUXFayeShe2nvJGTkzWZxEEeHPyvLtTmSNrmRWqE2ZEDCFGH3bopBKG2QJVeEomh7rKFSZ6WTDmG2V7L6zPFexAhuen9ynEBu8JJWRM3nx5dj4BSDeQf";
+    {
+        Solana::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.encoded(), ExpectedTx);
+    }
+}
+
+} // namespace TW::Solana::tests
diff --git a/tests/chains/StarkEx/MessageSignerTests.cpp b/tests/chains/StarkEx/MessageSignerTests.cpp
new file mode 100644
index 00000000000..d8140ecead3
--- /dev/null
+++ b/tests/chains/StarkEx/MessageSignerTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <StarkEx/MessageSigner.h>
+#include <HexCoding.h>
+#include <TrustWalletCore/TWStarkExMessageSigner.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::StarkEx::tests {
+
+TEST(StarkExMessageSigner, SignAndVerify) {
+    PrivateKey starkPrivKey(parse_hex("04be51a04e718c202e4dca60c2b72958252024cfc1070c090dd0f170298249de", true));
+    auto starkPubKey  = starkPrivKey.getPublicKey(TWPublicKeyTypeStarkex);
+    auto starkMsg = "463a2240432264a3aa71a5713f2a4e4c1b9e12bbb56083cd56af6d878217cf";
+    auto starkSignature = StarkEx::MessageSigner::signMessage(starkPrivKey, starkMsg);
+    ASSERT_EQ(starkSignature, "04cf5f21333dd189ada3c0f2a51430d733501a9b1d5e07905273c1938cfb261e05b6013d74adde403e8953743a338c8d414bb96bf69d2ca1a91a85ed2700a528");
+    ASSERT_TRUE(StarkEx::MessageSigner::verifyMessage(starkPubKey, starkMsg, starkSignature));
+}
+
+TEST(TWStarkExMessageSigner, SignAndVerify) {
+    const auto privKeyData = "04be51a04e718c202e4dca60c2b72958252024cfc1070c090dd0f170298249de";
+    const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+    const auto message = STRING("463a2240432264a3aa71a5713f2a4e4c1b9e12bbb56083cd56af6d878217cf");
+    
+    const auto pubKey = TWPrivateKeyGetPublicKeyByType(privateKey.get(), TWPublicKeyTypeStarkex);
+    const auto signature = WRAPS(TWStarkExMessageSignerSignMessage(privateKey.get(), message.get()));
+    EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "04cf5f21333dd189ada3c0f2a51430d733501a9b1d5e07905273c1938cfb261e05b6013d74adde403e8953743a338c8d414bb96bf69d2ca1a91a85ed2700a528");
+    EXPECT_TRUE(TWStarkExMessageSignerVerifyMessage(pubKey, message.get(), signature.get()));
+    delete pubKey;
+}
+
+}
diff --git a/tests/chains/Stellar/AddressTests.cpp b/tests/chains/Stellar/AddressTests.cpp
new file mode 100644
index 00000000000..b4c84772273
--- /dev/null
+++ b/tests/chains/Stellar/AddressTests.cpp
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Stellar/Address.h"
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace TW;
+
+namespace TW::Stellar::tests {
+
+TEST(StellarAddress, FromPublicKey) {
+    const auto publicKey = PublicKey(parse_hex("0103E20EC6B4A39A629815AE02C0A1393B9225E3B890CAE45B59F42FA29BE9668D"), TWPublicKeyTypeED25519);
+    const auto address = Address(publicKey);
+    auto str = hex(address.bytes);
+    ASSERT_EQ(string("GAB6EDWGWSRZUYUYCWXAFQFBHE5ZEJPDXCIMVZC3LH2C7IU35FTI2NOQ"), address.string());
+
+    const auto privateKey = PrivateKey(parse_hex("94d1a980d5e528067d44bf8a60d646f556e40ca71e17cd4ead2d56f89e4bd20f"));
+    const auto publicKey2 = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended));
+    EXPECT_ANY_THROW(new Address(publicKey2));
+}
+
+TEST(StellarAddress, FromString) {
+    string stellarAddress = "GAB6EDWGWSRZUYUYCWXAFQFBHE5ZEJPDXCIMVZC3LH2C7IU35FTI2NOQ";
+    const auto address = Address(stellarAddress);
+    ASSERT_EQ(address.string(), stellarAddress);
+
+    EXPECT_ANY_THROW(new Address(""));
+}
+
+TEST(StellarAddress, isValid) {
+    string stellarAddress = "GABQHYQOY22KHGTCTAK24AWAUE4TXERF4O4JBSXELNM7IL5CTPUWM3SC";
+    string bitcoinAddress = "1Ma2DrB78K7jmAwaomqZNRMCvgQrNjE2QC";
+
+    ASSERT_TRUE(Address::isValid(stellarAddress));
+    ASSERT_FALSE(Address::isValid(bitcoinAddress));
+    ASSERT_FALSE(Address::isValid("qc64537q3cvjmc2cgkz10y58waj4294967296r10ccchmrmrdzq03783"));
+}
+
+} // namespace TW::Stellar::tests
diff --git a/tests/chains/Stellar/TWAnySignerTests.cpp b/tests/chains/Stellar/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..fe8728b1de4
--- /dev/null
+++ b/tests/chains/Stellar/TWAnySignerTests.cpp
@@ -0,0 +1,190 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Stellar/Address.h"
+#include "proto/Stellar.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWStellarPassphrase.h>
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Stellar::tests {
+
+TEST(TWAnySingerStellar, Sign_Payment) {
+    auto key = parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722");
+    Proto::SigningInput input;
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
+    input.set_fee(1000);
+    input.set_sequence(2);
+    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
+    input.mutable_op_payment()->set_amount(10000000);
+    input.set_private_key(key.data(), key.size());
+    auto& memoText = *input.mutable_memo_text();
+    memoText.set_text("Hello, world!");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStellar);
+
+    EXPECT_EQ(output.signature(), "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAEAAAANSGVsbG8sIHdvcmxkIQAAAAAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEBQQldEkYJ6rMvOHilkwFCYyroGGUvrNeWVqr/sn3iFFqgz91XxgUT0ou7bMSPRgPROfBYDfQCFfFxbcDPrrCwB");
+}
+
+TEST(TWAnySingerStellar, Sign_Payment_66b5) {
+    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
+    PrivateKey privKey = PrivateKey(key);
+    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
+    Address addr = Address(pubKey);
+    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+
+    Proto::SigningInput input;
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+    input.set_fee(1000);
+    input.set_sequence(144098454883270657);
+    input.mutable_op_payment()->set_destination("GA3ISGYIE2ZTH3UAKEKBVHBPKUSL3LT4UQ6C5CUGP2IM5F467O267KI7");
+    input.mutable_op_payment()->set_amount(1000000);
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStellar);
+
+    // curl "https://horizon.stellar.org/transactions/66b5bca4b4293bdd85a6a559b08918482774b76bcc170b4533411f1d6422ce24"
+    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAD6AH/8MgAAAABAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAANokbCCazM+6AURQanC9VJL2ufKQ8LoqGfpDOl577te8AAAAAAAAAAAAPQkAAAAAAAAAAAXfTkXUAAABAM9Nhzr8iWKzqnHknrxSVoa4b2qzbTzgyE2+WWxg6XHH50xiFfmvtRKVhzp0Jg8PfhatOb6KNheKRWEw4OvqEDw==");
+}
+
+TEST(TWAnySingerStellar, Sign_Payment_Asset_ea50) {
+    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
+    PrivateKey privKey = PrivateKey(key);
+    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
+    Address addr = Address(pubKey);
+    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+
+    Proto::SigningInput input;
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+    input.set_fee(1000);
+    input.set_sequence(144098454883270661);
+    input.mutable_op_payment()->set_destination("GA3ISGYIE2ZTH3UAKEKBVHBPKUSL3LT4UQ6C5CUGP2IM5F467O267KI7");
+    input.mutable_op_payment()->mutable_asset()->set_issuer("GA6HCMBLTZS5VYYBCATRBRZ3BZJMAFUDKYYF6AH6MVCMGWMRDNSWJPIH");
+    input.mutable_op_payment()->mutable_asset()->set_alphanum4("MOBI");
+    input.mutable_op_payment()->set_amount(12000000);
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStellar);
+
+    // curl "https://horizon.stellar.org/transactions/ea50884cd1288d2d5420065995d13d750d812258e0e79280c4033a434e625c99
+    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAD6AH/8MgAAAAFAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAANokbCCazM+6AURQanC9VJL2ufKQ8LoqGfpDOl577te8AAAABTU9CSQAAAAA8cTArnmXa4wEQJxDHOw5SwBaDVjBfAP5lRMNZkRtlZAAAAAAAtxsAAAAAAAAAAAF305F1AAAAQEuWZZvKZuF6SMuSGIyfLqx5sn5O55+Kd489uP4g9jZH4UE7zZ4ME0+74I0BU8YDsYOmmxcfp/vdwTd+n3oGCQw=");
+}
+
+TEST(TWAnySingerStellar, Sign_Change_Trust_ad9c) {
+    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
+    PrivateKey privKey = PrivateKey(key);
+    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
+    Address addr = Address(pubKey);
+    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+
+    Proto::SigningInput input;
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+    input.set_fee(10000);
+    input.set_sequence(144098454883270659);
+    input.mutable_op_change_trust()->mutable_asset()->set_issuer("GA6HCMBLTZS5VYYBCATRBRZ3BZJMAFUDKYYF6AH6MVCMGWMRDNSWJPIH");
+    input.mutable_op_change_trust()->mutable_asset()->set_alphanum4("MOBI");
+    input.mutable_op_change_trust()->set_valid_before(1613336576);
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStellar);
+
+    // curl "https://horizon.stellar.org/transactions/ad9cd0f3d636096b6502ccae07adbcf2cd3c0da5393fc2b07813dbe90ecc0d7b"
+    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAnEAH/8MgAAAADAAAAAQAAAAAAAAAAAAAAAGApkAAAAAAAAAAAAQAAAAAAAAAGAAAAAU1PQkkAAAAAPHEwK55l2uMBECcQxzsOUsAWg1YwXwD+ZUTDWZEbZWR//////////wAAAAAAAAABd9ORdQAAAEAnfyXyaNQX5Bq3AEQVBIaYd+cLib+y2sNY7DF/NYVSE51dZ6swGGElz094ObsPefmVmeRrkGsSc/fF5pmth+wJ");
+}
+
+TEST(TWAnySingerStellar, Sign_Change_Trust_2) {
+    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
+    PrivateKey privKey = PrivateKey(key);
+    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
+    Address addr = Address(pubKey);
+    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+
+    Proto::SigningInput input;
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+    input.set_fee(10000);
+    input.set_sequence(144098454883270659);
+    input.mutable_op_change_trust()->mutable_asset()->set_issuer("GDUKMGUGDZQK6YHYA5Z6AY2G4XDSZPSZ3SW5UN3ARVMO6QSRDWP5YLEX");
+    input.mutable_op_change_trust()->mutable_asset()->set_alphanum4("USD");
+    input.mutable_op_change_trust()->set_valid_before(1613336576);
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStellar);
+
+    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAnEAH/8MgAAAADAAAAAQAAAAAAAAAAAAAAAGApkAAAAAAAAAAAAQAAAAAAAAAGAAAAAVVTRAAAAAAA6KYahh5gr2D4B3PgY0blxyy+Wdyt2jdgjVjvQlEdn9x//////////wAAAAAAAAABd9ORdQAAAEDMZtN05ZsZB4OKOZSFkQvuRqDIvMME3PYMTAGJPQlO6Ee0nOtaRn2q0uf0IhETSSfqcsK5asAZzNj07tG0SPwM");
+}
+
+TEST(TWAnySingerStellar, Sign_Create_Claimable_Balance_1f1f84) {
+    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
+    PrivateKey privKey = PrivateKey(key);
+    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
+    Address addr = Address(pubKey);
+    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+
+    Proto::SigningInput input;
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+    input.set_fee(10000);
+    input.set_sequence(144098454883270687);
+    input.mutable_op_create_claimable_balance()->set_amount(90000000);
+    input.mutable_op_create_claimable_balance()->add_claimants();
+    input.mutable_op_create_claimable_balance()->mutable_claimants(0)->set_account("GC6CJDAY54D3O4RHEH33LUTBKDZGVOTR6NHBOTL4PIWI2CDKVRSZZJGJ");
+    input.mutable_op_create_claimable_balance()->mutable_claimants(0)->set_predicate(Proto::Predicate_unconditional);
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStellar);
+
+    // https://stellar.expert/explorer/public/tx/1f1f849ff2560901c91226f2fc866ef4ed1c67d672262c1f5829abe2348ac638
+    // curl -X POST -F "tx=AAAAAMpF..Bg==" "https://horizon.stellar.org/transactions"
+    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAnEAH/8MgAAAAfAAAAAAAAAAAAAAABAAAAAAAAAA4AAAAAAAAAAAVdSoAAAAABAAAAAAAAAAC8JIwY7we3cich97XSYVDyarpx804XTXx6LI0IaqxlnAAAAAAAAAAAAAAAAXfTkXUAAABAgms/HPhEP/EYtVr5aWwhKJsn3pIVEZGFnTD2Xd/VPVsn8qogI7RYyjyBxSFPiLAljgGsPaUMfU3WFvyJCWNwBg==");
+}
+
+TEST(TWAnySingerStellar, Sign_Claim_Claimable_Balance_c1fb3c) {
+    auto key = parse_hex("3c0635f8638605aed6e461cf3fa2d508dd895df1a1655ff92c79bfbeaf88d4b9");
+    PrivateKey privKey = PrivateKey(key);
+    PublicKey pubKey = privKey.getPublicKey(TWPublicKeyTypeED25519);
+    Address addr = Address(pubKey);
+    EXPECT_EQ(addr.string(), "GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+
+    Proto::SigningInput input;
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GDFEKJIFKUZP26SESUHZONAUJZMBSODVN2XBYN4KAGNHB7LX2OIXLPUL");
+    input.set_fee(10000);
+    input.set_sequence(144098454883270689);
+    const Data balanceIdHash = parse_hex("9c7b794b7b150f3e4c6dcfa260672bbe0c248b360129112e927e0f7ee2f9faf8");
+    input.mutable_op_claim_claimable_balance()->set_balance_id(balanceIdHash.data(), balanceIdHash.size());
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeStellar);
+
+    // https://stellar.expert/explorer/public/tx/c1fb3cf348aeb72bb2e1030c1d7f7f9c6c6d1bbab071b3e7c7c1cadafa795e8e
+    // curl -X POST -F "tx=AAAAAMpF..DQ==" "https://horizon.stellar.org/transactions"
+    EXPECT_EQ(output.signature(), "AAAAAMpFJQVVMv16RJUPlzQUTlgZOHVurhw3igGacP1305F1AAAnEAH/8MgAAAAhAAAAAAAAAAAAAAABAAAAAAAAAA8AAAAAnHt5S3sVDz5Mbc+iYGcrvgwkizYBKREukn4PfuL5+vgAAAAAAAAAAXfTkXUAAABAWL7dKkR1JuPZGFbDTRDgGBHW/vLPMWNRkAew+wPfGiCnZhpJJDcyX197EDDZMsJ7ungPUyhczRaeQOwZKx4DDQ==");
+
+    { // negative test: hash wrong size
+        const Data invalidBalanceIdHash = parse_hex("010203");
+        input.mutable_op_claim_claimable_balance()->set_balance_id(invalidBalanceIdHash.data(), invalidBalanceIdHash.size());
+        ANY_SIGN(input, TWCoinTypeStellar);
+        EXPECT_EQ(output.signature(), "AAAAAXfTkXUAAABAFCywEfLs3q5Tv9eZCIcjhkJR0s8J4Us9G5YjVKUSaMoUz/AadC8dM2oQSLhpC5wjrNBi7hevg7jlkPx5/4AJCQ==");
+    }
+}
+
+} // namespace TW::Stellar::tests
diff --git a/tests/chains/Stellar/TWCoinTypeTests.cpp b/tests/chains/Stellar/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..95e6cbd55f1
--- /dev/null
+++ b/tests/chains/Stellar/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWStellarCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeStellar));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("8a7ff7261e8b3f31af7f6ed257c2e9fe7c47afcd9b1ce1be1bfc1bc5f6a3ad9e"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeStellar, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("GCILJZQ3CKBKBUJWW4TAM6Q37LJA5MQX6GMSFSQN75BPLWIZ33OPRG52"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeStellar, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeStellar));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeStellar));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeStellar), 7);
+    ASSERT_EQ(TWBlockchainStellar, TWCoinTypeBlockchain(TWCoinTypeStellar));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeStellar));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeStellar));
+    assertStringsEqual(symbol, "XLM");
+    assertStringsEqual(txUrl, "https://blockchair.com/stellar/transaction/8a7ff7261e8b3f31af7f6ed257c2e9fe7c47afcd9b1ce1be1bfc1bc5f6a3ad9e");
+    assertStringsEqual(accUrl, "https://blockchair.com/stellar/account/GCILJZQ3CKBKBUJWW4TAM6Q37LJA5MQX6GMSFSQN75BPLWIZ33OPRG52");
+    assertStringsEqual(id, "stellar");
+    assertStringsEqual(name, "Stellar");
+}
diff --git a/tests/Stellar/TWStellarAddressTests.cpp b/tests/chains/Stellar/TWStellarAddressTests.cpp
similarity index 75%
rename from tests/Stellar/TWStellarAddressTests.cpp
rename to tests/chains/Stellar/TWStellarAddressTests.cpp
index 47d1f759c76..aeb02ed3a06 100644
--- a/tests/Stellar/TWStellarAddressTests.cpp
+++ b/tests/chains/Stellar/TWStellarAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWHDWallet.h>
diff --git a/tests/chains/Stellar/TransactionCompilerTests.cpp b/tests/chains/Stellar/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..578877ba49c
--- /dev/null
+++ b/tests/chains/Stellar/TransactionCompilerTests.cpp
@@ -0,0 +1,93 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Stellar.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWStellarPassphrase.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(StellarCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeStellar;
+    /// Step 1: Prepare transaction input (protobuf)
+    TW::Stellar::Proto::SigningInput input;
+    auto privateKey =
+        PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
+    auto publicKey = privateKey.getPublicKey(::publicKeyType(coin));
+
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
+    input.set_fee(1000);
+    input.set_sequence(2);
+    input.mutable_op_payment()->set_destination(
+        "GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
+    input.mutable_op_payment()->set_amount(10000000);
+    auto &memoText = *input.mutable_memo_text();
+    memoText.set_text("Hello, world!");
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "1e8786a0162630b2393e0f6c51f16a2d7860715023cb19bf25cad14490b1f8f3");
+
+    auto signature = parse_hex("5042574491827aaccbce1e2964c05098caba06194beb35e595aabfec9f788516a83"
+                               "3f755f18144f4a2eedb3123d180f44e7c16037d00857c5c5b7033ebac2c01");
+
+    /// Step 3: Compile transaction info
+    const auto tx = "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/"
+                    "DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAEAAAANSGVsbG8sIHdvcmxkIQAAAAAAAAEAAAAAAAAA"
+                    "AQAAAADFgLYxeg6zm/"
+                    "f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEBQQldEkYJ6"
+                    "rMvOHilkwFCYyroGGUvrNeWVqr/sn3iFFqgz91XxgUT0ou7bMSPRgPROfBYDfQCFfFxbcDPrrCwB";
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {});
+    {
+        TW::Stellar::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.signature(), tx);
+    }
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::Stellar::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::Stellar::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.signature(), tx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {});
+        Stellar::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.signature().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+}
diff --git a/tests/chains/Stellar/TransactionTests.cpp b/tests/chains/Stellar/TransactionTests.cpp
new file mode 100644
index 00000000000..1803cb1605f
--- /dev/null
+++ b/tests/chains/Stellar/TransactionTests.cpp
@@ -0,0 +1,141 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include "HexCoding.h"
+#include "Stellar/Signer.h"
+#include <TrustWalletCore/TWHDWallet.h>
+#include <TrustWalletCore/TWStellarPassphrase.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Stellar::tests {
+
+using namespace std;
+
+TEST(StellarTransaction, sign) {
+    auto words = STRING("indicate rival expand cave giant same grocery burden ugly rose tuna blood");
+    auto passphrase = STRING("");
+
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(words.get(), passphrase.get()));
+    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKeyForCoin(wallet.get(), TWCoinTypeStellar));
+    auto input = TW::Stellar::Proto::SigningInput();
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
+    input.set_fee(1000);
+    input.set_sequence(2);
+    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
+    input.mutable_op_payment()->set_amount(10000000);
+    input.set_private_key(privateKey.get()->impl.bytes.data(), privateKey.get()->impl.bytes.size());
+
+    const auto signer = TW::Stellar::Signer(input);
+
+    const auto signature = signer.sign();
+    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAAAAAABAAAAAAAAAAEAAAAAxYC2MXoOs5v3/NT6PBn9q0uJu6u/YQle5FBa9uzteq4AAAAAAAAAAACYloAAAAAAAAAAARnfXKIAAABAocQZwTnVvGMQlpdGacWvgenxN5ku8YB8yhEGrDfEV48yDqcj6QaePAitDj/N2gxfYD9Q2pJ+ZpkQMsZZG4ACAg==");
+}
+
+TEST(StellarTransaction, signWithMemoText) {
+    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
+    auto input = TW::Stellar::Proto::SigningInput();
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
+    input.set_fee(1000);
+    input.set_sequence(2);
+    auto memoText = TW::Stellar::Proto::MemoText();
+    memoText.set_text("Hello, world!");
+    *input.mutable_memo_text() = memoText;
+    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
+    input.mutable_op_payment()->set_amount(10000000);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto signer = Signer(input);
+
+    const auto signature = signer.sign();
+    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAEAAAANSGVsbG8sIHdvcmxkIQAAAAAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEBQQldEkYJ6rMvOHilkwFCYyroGGUvrNeWVqr/sn3iFFqgz91XxgUT0ou7bMSPRgPROfBYDfQCFfFxbcDPrrCwB");
+}
+
+TEST(StellarTransaction, signWithMemoHash) {
+    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
+    auto input = TW::Stellar::Proto::SigningInput();
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
+    input.set_fee(1000);
+    input.set_sequence(2);
+    auto memoHash = TW::Stellar::Proto::MemoHash();
+    auto fromHex = parse_hex("315f5bdb76d078c43b8ac0064e4a0164612b1fce77c869345bfc94c75894edd3");
+    memoHash.set_hash(fromHex.data(), fromHex.size());
+    *input.mutable_memo_hash() = memoHash;
+    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
+    input.mutable_op_payment()->set_amount(10000000);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto signer = Signer(input);
+
+    const auto signature = signer.sign();
+    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAMxX1vbdtB4xDuKwAZOSgFkYSsfznfIaTRb/JTHWJTt0wAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAECIyh1BG+hER5W+dgHDKe49X6VEYRWIjajM4Ufq3DUG/yw7Xv1MMF4eax3U0TRi7Qwj2fio/DRD3+/Ljtvip2MD");
+}
+
+TEST(StellarTransaction, signWithMemoReturn) {
+    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
+    auto input = TW::Stellar::Proto::SigningInput();
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
+    input.set_fee(1000);
+    input.set_sequence(2);
+    auto memoHash = TW::Stellar::Proto::MemoHash();
+    auto fromHex = parse_hex("315f5bdb76d078c43b8ac0064e4a0164612b1fce77c869345bfc94c75894edd3");
+    memoHash.set_hash(fromHex.data(), fromHex.size());
+    *input.mutable_memo_return_hash() = memoHash;
+    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
+    input.mutable_op_payment()->set_amount(10000000);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto signer = Signer(input);
+
+    const auto signature = signer.sign();
+    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAQxX1vbdtB4xDuKwAZOSgFkYSsfznfIaTRb/JTHWJTt0wAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEBd77iui04quoaoWMfeJO06nRfn3Z9bptbAj7Ol44j3ApU8c9dJwVhJbQ7La4mKgIkYviEhGx3AIulFYCkokb8M");
+}
+
+TEST(StellarTransaction, signWithMemoID) {
+    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
+    auto input = TW::Stellar::Proto::SigningInput();
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
+    input.set_fee(1000);
+    input.set_sequence(2);
+    auto memoId = TW::Stellar::Proto::MemoId();
+    memoId.set_id(1234567890);
+    *input.mutable_memo_id() = memoId;
+    input.mutable_op_payment()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
+    input.mutable_op_payment()->set_amount(10000000);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto signer = Signer(input);
+
+    const auto signature = signer.sign();
+    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAIAAAAASZYC0gAAAAEAAAAAAAAAAQAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAAAAAAJiWgAAAAAAAAAABGd9cogAAAEAOJ8wwCizQPf6JmkCsCNZolQeqet2qN7fgLUUQlwx3TNzM0+/GJ6Qc2faTybjKy111rE60IlnfaPeMl/nyxKIB");
+}
+
+TEST(StellarTransaction, signAcreateAccount) {
+    auto privateKey = PrivateKey(parse_hex("59a313f46ef1c23a9e4f71cea10fc0c56a2a6bb8a4b9ea3d5348823e5a478722"));
+    auto input = TW::Stellar::Proto::SigningInput();
+    input.set_passphrase(TWStellarPassphrase_Stellar);
+    input.set_account("GAE2SZV4VLGBAPRYRFV2VY7YYLYGYIP5I7OU7BSP6DJT7GAZ35OKFDYI");
+    input.set_fee(1000);
+    input.set_sequence(2);
+    auto memoId = TW::Stellar::Proto::MemoId();
+    memoId.set_id(1234567890);
+    *input.mutable_memo_id() = memoId;
+    input.mutable_op_create_account()->set_destination("GDCYBNRRPIHLHG7X7TKPUPAZ7WVUXCN3VO7WCCK64RIFV5XM5V5K4A52");
+    input.mutable_op_create_account()->set_amount(10000000);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto signer = Signer(input);
+
+    const auto signature = signer.sign();
+    ASSERT_EQ(signature, "AAAAAAmpZryqzBA+OIlrquP4wvBsIf1H3U+GT/DTP5gZ31yiAAAD6AAAAAAAAAACAAAAAAAAAAIAAAAASZYC0gAAAAEAAAAAAAAAAAAAAADFgLYxeg6zm/f81Po8Gf2rS4m7q79hCV7kUFr27O16rgAAAAAAmJaAAAAAAAAAAAEZ31yiAAAAQNgqNDqbe0X60gyH+1xf2Tv2RndFiJmyfbrvVjsTfjZAVRrS2zE9hHlqPQKpZkGKEFka7+1ElOS+/m/1JDnauQg=");
+}
+
+} // namespace TW::Stellar::tests
diff --git a/tests/chains/Stratis/TWCoinTypeTests.cpp b/tests/chains/Stratis/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..978e12df6b1
--- /dev/null
+++ b/tests/chains/Stratis/TWCoinTypeTests.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWStratisCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeStratis;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("3923df87e83859dec8b87a414cbb1529113788c512a4d0c283e1394c274f0bfb"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("XWqnSWzQA5kDAS727UTYtXkdcbKc8mEvyN"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "stratis");
+    assertStringsEqual(name, "Stratis");
+    assertStringsEqual(symbol, "STRAX");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 8);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainBitcoin);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x8c);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(txUrl, "https://explorer.rutanio.com/strax/explorer/transaction/3923df87e83859dec8b87a414cbb1529113788c512a4d0c283e1394c274f0bfb");
+    assertStringsEqual(accUrl, "https://explorer.rutanio.com/strax/explorer/address/XWqnSWzQA5kDAS727UTYtXkdcbKc8mEvyN");
+}
diff --git a/tests/chains/Stratis/TWStratisTests.cpp b/tests/chains/Stratis/TWStratisTests.cpp
new file mode 100644
index 00000000000..6d8dbf1f95b
--- /dev/null
+++ b/tests/chains/Stratis/TWStratisTests.cpp
@@ -0,0 +1,72 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWBitcoinAddress.h>
+#include <TrustWalletCore/TWBitcoinScript.h>
+#include <TrustWalletCore/TWHDWallet.h>
+#include <TrustWalletCore/TWHRP.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+
+#include <gtest/gtest.h>
+
+TEST(Stratis, LegacyAddress) {
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("a22ddec5c567b4488bb00f69b6146c50da2ee883e2c096db098726394d585730").get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+    auto address = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeStratis)));
+    auto addressString = WRAPS(TWBitcoinAddressDescription(address.get()));
+    assertStringsEqual(addressString, "XMEd53bqmNitpFX1cUd1tV6LRME4pcuaPe");
+}
+
+TEST(Stratis, Address) {
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("55f9cbb0376c422946fa28397c1219933ac60b312ede41bfacaf701ecd546625").get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeStratis));
+    auto string = WRAPS(TWAnyAddressDescription(address.get()));
+
+    assertStringsEqual(string, "strax1qytnqzjknvv03jwfgrsmzt0ycmwqgl0as6zdq3n");
+}
+
+TEST(Stratis, LockScriptForLegacyAddress) {
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("XWqnSWzQA5kDAS727UTYtXkdcbKc8mEvyN").get(), TWCoinTypeStratis));
+    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
+    assertHexEqual(scriptData, "76a914d5d068b60f3b63a5a59cc7b8609ac85b76b1896388ac");
+}
+
+TEST(Stratis, LockScriptForAddress) {
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("strax1qqktrryxg23qjxmnhmz9xsp8w4kkfqv7c2xl6t7").get(), TWCoinTypeStratis));
+    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
+    assertHexEqual(scriptData, "001405963190c85441236e77d88a6804eeadac9033d8");
+}
+
+TEST(Stratis, ExtendedKeys) {
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
+        STRING("ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal").get(),
+        STRING("TREZOR").get()
+    ));
+
+    // .bip44
+    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeStratis, TWHDVersionXPRV));
+    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeStratis, TWHDVersionXPUB));
+
+    assertStringsEqual(xprv, "xprv9xyQ71PNhXBFdiY9xAs76X1Y4YzejPv9qe6tKBQ4pEemnmk6b4iFnV1BpJThm2en26emssc558vqHPujDyBKDdSkrNtQiHwbzpQNobWyvh9");
+    assertStringsEqual(xpub, "xpub6BxkWWvGXtjYrCcd4CQ7TexGcaq98re1Cs2V7ZogNaBkfa5F8c2WLHKffYrwmJdNQztsd3oJvdmHuhN79c8qKpASRtavBsbcUq1R5SxeQtq");
+}
+
+TEST(Stratis, DeriveFromXpub) {
+    auto xpub = STRING("xpub6BxkWWvGXtjYrCcd4CQ7TexGcaq98re1Cs2V7ZogNaBkfa5F8c2WLHKffYrwmJdNQztsd3oJvdmHuhN79c8qKpASRtavBsbcUq1R5SxeQtq");
+    auto pubKey2 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeStratis, STRING("m/44'/105105'/0'/0/2").get()));
+    auto pubKey9 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(xpub.get(), TWCoinTypeStratis, STRING("m/44'/105105'/0'/0/9").get()));
+
+    auto address2 = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(pubKey2.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeStratis)));
+    auto address2String = WRAPS(TWBitcoinAddressDescription(address2.get()));
+
+    auto address9 = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(pubKey9.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeStratis)));
+    auto address9String = WRAPS(TWBitcoinAddressDescription(address9.get()));
+
+    assertStringsEqual(address2String, "XC4QM1nSbHrLb8sWMf4qXcphocqSAMNLng");
+    assertStringsEqual(address9String, "XM4ixdCpyqF86RhKwWRyUXFxXHNypRXiyL");
+}
\ No newline at end of file
diff --git a/tests/chains/Sui/CompilerTests.cpp b/tests/chains/Sui/CompilerTests.cpp
new file mode 100644
index 00000000000..b496546ff43
--- /dev/null
+++ b/tests/chains/Sui/CompilerTests.cpp
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "proto/Sui.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Sui::tests {
+
+TEST(SuiCompiler, PreHashAndCompile) {
+    // Successfully broadcasted https://explorer.sui.io/txblock/HkPo6rYPyDY53x1MBszvSZVZyixVN7CHvCJGX381czAh?network=devnet
+    auto expectedData = parse_hex("000000000002000810270000000000000020259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b50150202000101000001010300000000010100d575ad7f18e948462a5cf698f564ef394a752a71fec62493af8a055c012c0d500106f2c2c8c1d8964df1019d6616e9705719bebabd931da2755cb948ceb7e68964ec020000000000002060456ec667f5cd10467680ebf950ed329205175dacd946bb236aeed57c8617cfd575ad7f18e948462a5cf698f564ef394a752a71fec62493af8a055c012c0d500100000000000000d00700000000000000");
+    auto expectedHash = TW::Hash::blake2b(expectedData, 32);
+
+    Proto::SigningInput input;
+    auto txMsg = "AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA";
+    input.mutable_sign_direct_message()->set_unsigned_tx_msg(txMsg);
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    auto preImageHashesData = TransactionCompiler::preImageHashes(TWCoinTypeSui, inputStrData);
+    TxCompiler::Proto::PreSigningOutput preSigningOutput;
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), static_cast<int>(preImageHashesData.size()));
+
+    EXPECT_EQ(data(preSigningOutput.data()), expectedData);
+    EXPECT_EQ(data(preSigningOutput.data_hash()), expectedHash);
+
+    auto privateKey = PrivateKey(parse_hex("3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266"));
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519).bytes;
+    auto signature = privateKey.sign(expectedHash, TWCurveED25519);
+
+    auto outputData = TransactionCompiler::compileWithSignatures(TWCoinTypeSui, inputStrData, {signature}, {publicKey});
+    Proto::SigningOutput output;
+    output.ParseFromArray(outputData.data(), static_cast<int>(outputData.size()));
+
+    EXPECT_EQ(output.error(), Common::Proto::OK);
+    EXPECT_EQ(output.signature(), "APxPduNVvHj2CcRcHOtiP2aBR9qP3vO2Cb0g12PI64QofDB6ks33oqe/i/iCTLcop2rBrkczwrayZuJOdi7gvwNqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg==");
+}
+
+}
diff --git a/tests/chains/Sui/SignerTests.cpp b/tests/chains/Sui/SignerTests.cpp
new file mode 100644
index 00000000000..ce801ca9113
--- /dev/null
+++ b/tests/chains/Sui/SignerTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "proto/Sui.pb.h"
+#include "PublicKey.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Sui::tests {
+
+TEST(SuiSigner, Transfer) {
+    // Successfully broadcasted https://explorer.sui.io/txblock/HkPo6rYPyDY53x1MBszvSZVZyixVN7CHvCJGX381czAh?network=devnet
+    Proto::SigningInput input;
+    auto txMsg = "AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA";
+    input.mutable_sign_direct_message()->set_unsigned_tx_msg(txMsg);
+    auto privateKey = PrivateKey(parse_hex("3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeSui);
+    ASSERT_EQ(output.unsigned_tx(), "AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA");
+    ASSERT_EQ(output.signature(), "APxPduNVvHj2CcRcHOtiP2aBR9qP3vO2Cb0g12PI64QofDB6ks33oqe/i/iCTLcop2rBrkczwrayZuJOdi7gvwNqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg==");
+}
+
+} // namespace TW::Sui::tests
diff --git a/tests/chains/Sui/TWCoinTypeTests.cpp b/tests/chains/Sui/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..459a08e9ff5
--- /dev/null
+++ b/tests/chains/Sui/TWCoinTypeTests.cpp
@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWSuiCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeSui;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("5i8fbSL6r8yw2xcKmXxwkzHu3wpiyMLsyf2htCvDH8Ao"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "sui");
+    assertStringsEqual(name, "Sui");
+    assertStringsEqual(symbol, "SUI");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 9);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainSui);
+    assertStringsEqual(txUrl, "https://explorer.sui.io//txblock/5i8fbSL6r8yw2xcKmXxwkzHu3wpiyMLsyf2htCvDH8Ao");
+    assertStringsEqual(accUrl, "https://explorer.sui.io//address/0x259ff8074ab425cbb489f236e18e08f03f1a7856bdf7c7a2877bd64f738b5015");
+}
diff --git a/tests/chains/Syscoin/TWCoinTypeTests.cpp b/tests/chains/Syscoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f33efe2beb6
--- /dev/null
+++ b/tests/chains/Syscoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWSyscoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeSyscoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("19e043f76f6ffc960f5fe93ecec37bc37a58ae7525d7e9cd6ed40f71f0da60eb"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeSyscoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("sys1qh3gvhnzq2ch7w8g04x8zksr2mz7r90x7ksmu40"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeSyscoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeSyscoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeSyscoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeSyscoin), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeSyscoin));
+    ASSERT_EQ(0x5, TWCoinTypeP2shPrefix(TWCoinTypeSyscoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeSyscoin));
+    assertStringsEqual(symbol, "SYS");
+    assertStringsEqual(txUrl, "https://sys1.bcfn.ca/tx/19e043f76f6ffc960f5fe93ecec37bc37a58ae7525d7e9cd6ed40f71f0da60eb");
+    assertStringsEqual(accUrl, "https://sys1.bcfn.ca/address/sys1qh3gvhnzq2ch7w8g04x8zksr2mz7r90x7ksmu40");
+    assertStringsEqual(id, "syscoin");
+    assertStringsEqual(name, "Syscoin");
+}
diff --git a/tests/chains/Syscoin/TWSyscoinTests.cpp b/tests/chains/Syscoin/TWSyscoinTests.cpp
new file mode 100644
index 00000000000..77cc8390314
--- /dev/null
+++ b/tests/chains/Syscoin/TWSyscoinTests.cpp
@@ -0,0 +1,85 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWBitcoinAddress.h>
+#include <TrustWalletCore/TWBitcoinScript.h>
+#include <TrustWalletCore/TWHDWallet.h>
+#include <TrustWalletCore/TWHRP.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+
+#include <gtest/gtest.h>
+
+TEST(Syscoin, LegacyAddress) {
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("a22ddec5c567b4488bb00f69b6146c50da2ee883e2c096db098726394d585730").get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+    auto address = WRAP(TWBitcoinAddress, TWBitcoinAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeP2pkhPrefix(TWCoinTypeSyscoin)));
+    auto addressString = WRAPS(TWBitcoinAddressDescription(address.get()));
+    assertStringsEqual(addressString, "SXBPFk2PFDAP13qyKSdC4yptsJ8kJRAT3T");
+}
+
+TEST(Syscoin, Address) {
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA("55f9cbb0376c422946fa28397c1219933ac60b312ede41bfacaf701ecd546625").get()));
+    auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+    auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeSyscoin));
+    auto string = WRAPS(TWAnyAddressDescription(address.get()));
+
+    assertStringsEqual(string, "sys1qytnqzjknvv03jwfgrsmzt0ycmwqgl0as7lkcf7");
+}
+
+TEST(Syscoin, LockScriptForLegacyAddress) {
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("SXBPFk2PFDAP13qyKSdC4yptsJ8kJRAT3T").get(), TWCoinTypeSyscoin));
+    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
+    assertHexEqual(scriptData, "76a9146c70e57df7b18eeb0198be9e254737ecd336ed8888ac");
+}
+
+TEST(Syscoin, LockScriptForAddress) {
+    auto script = WRAP(TWBitcoinScript, TWBitcoinScriptLockScriptForAddress(STRING("sys1qytnqzjknvv03jwfgrsmzt0ycmwqgl0as7lkcf7").get(), TWCoinTypeSyscoin));
+    auto scriptData = WRAPD(TWBitcoinScriptData(script.get()));
+    assertHexEqual(scriptData, "001422e6014ad3631f1939281c3625bc98db808fbfb0");
+}
+
+TEST(Syscoin, ExtendedKeys) {
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
+        STRING("ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal").get(),
+        STRING("TREZOR").get()
+    ));
+
+    // .bip44
+    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeSyscoin, TWHDVersionXPRV));
+    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeSyscoin, TWHDVersionXPUB));
+
+    assertStringsEqual(xprv, "xprv9yFNgN7z81uG6QtwFt7gvbmLeDGeGfS2ar3DunwEkZcC7uLBXyy4eaaV3ir769zMLe3eHuTaGUtWVXwp6dkunLsfmA7bf3XqEFpTjHxSijx");
+    assertStringsEqual(xpub, "xpub6CEj5sesxPTZJtyQMuehHji5CF78g89sx4xpiBLrJu9AzhfL5XHKCNtxtzPzyGxqb6jMbZfmbHeSGZZArL4hLttmdC6KEMuiWy7VocTYjzR");
+
+    // .bip49
+    auto yprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP49, TWCoinTypeSyscoin, TWHDVersionYPRV));
+    auto ypub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP49, TWCoinTypeSyscoin, TWHDVersionYPUB));
+
+    assertStringsEqual(yprv, "yprvAJAofBFEEQ1DLJJVMkPr4pufHLUKZ2VSbtHqPpphEgwgfvG8exgadM8vtW8AW52N7tqU4qM8JHk5xZkq3icnzoph5QA5kRVHBnhXuRMGw2b");
+    assertStringsEqual(ypub, "ypub6XAA4gn84mZWYnNxTmvrRxrPqNJoxVDHy7DSCDEJo2UfYibHCVzqB9TQjmL2TKSEZVFmTNcmdJXunEu6oV2AFQNeiszjzcnX4nbG27s4SgS");
+
+    // .bip84
+    auto zprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP84, TWCoinTypeSyscoin, TWHDVersionZPRV));
+    auto zpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP84, TWCoinTypeSyscoin, TWHDVersionZPUB));
+    assertStringsEqual(zprv, "zprvAcdCiLx9ooAFnC1hXh7stnobLnnu7u25rqfLeJ9v632xdCXJrc8KvgNk2eZeQQbPQHvcUpsfJzgyDkRdfnkT6vjpYqkxFv1LsPxQ7uFwLGy");
+    assertStringsEqual(zpub, "zpub6qcZ7rV3eAiYzg6AdietFvkKtpdPXMjwE4awSgZXeNZwVzrTQ9SaUUhDswmdA4A5riyimx322es7niQvJ1Fbi3mJNSVz3d3f9GBsYBb8Wky");
+}
+
+TEST(Syscoin, DeriveFromZpub) {
+    auto zpub = STRING("zpub6sCFp8chadVDXVt7GRmQFpq8B7W8wMLdFDto1hXu2jLZtvkFhRnwScXARNfrGSeyhR8DBLJnaUUkBbkmB2GwUYkecEAMUcbUpFQV4v7PXcs");
+    auto pubKey4 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(zpub.get(), TWCoinTypeSyscoin, STRING("m/44'/2'/0'/0/4").get()));
+    auto pubKey11 = WRAP(TWPublicKey, TWHDWalletGetPublicKeyFromExtended(zpub.get(), TWCoinTypeSyscoin, STRING("m/44'/2'/0'/0/11").get()));
+
+    auto address4 = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(pubKey4.get(), TWCoinTypeSyscoin));
+    auto address4String = WRAPS(TWAnyAddressDescription(address4.get()));
+
+    auto address11 = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(pubKey11.get(), TWCoinTypeSyscoin));
+    auto address11String = WRAPS(TWAnyAddressDescription(address11.get()));
+
+    assertStringsEqual(address4String, "sys1qcgnevr9rp7aazy62m4gen0tfzlssa52a2z04vc");
+    assertStringsEqual(address11String, "sys1qy072y8968nzp6mz3j292h8lp72d678fchhmyta");
+}
diff --git a/tests/chains/TBinance/TWAnyAddressTests.cpp b/tests/chains/TBinance/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..196cc13bc86
--- /dev/null
+++ b/tests/chains/TBinance/TWAnyAddressTests.cpp
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWTBinance, Address) {
+    auto string = STRING("tbnb18mtcq20875cr0p7l4upm0u5zx4r9jpj2kfu9f8");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeTBinance));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "3ed78029e7f5303787dfaf03b7f282354659064a");
+}
diff --git a/tests/chains/TBinance/TWCoinTypeTests.cpp b/tests/chains/TBinance/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..6c55888e754
--- /dev/null
+++ b/tests/chains/TBinance/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWTBinanceCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTBinance));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("92E9DA1B6D603667E2DE83C0AC0C1D9E6D65405AD642DA794421C64A82A078D0"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTBinance, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("tbnb1c2cxgv3cklswxlvqr9anm6mlp6536qnd36txgr"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTBinance, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTBinance));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTBinance));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTBinance), 8);
+    ASSERT_EQ(TWBlockchainBinance, TWCoinTypeBlockchain(TWCoinTypeTBinance));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTBinance));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTBinance));
+    assertStringsEqual(symbol, "BNB");
+    assertStringsEqual(txUrl, "https://testnet-explorer.binance.org/tx/92E9DA1B6D603667E2DE83C0AC0C1D9E6D65405AD642DA794421C64A82A078D0");
+    assertStringsEqual(accUrl, "https://testnet-explorer.binance.org/address/tbnb1c2cxgv3cklswxlvqr9anm6mlp6536qnd36txgr");
+    assertStringsEqual(id, "tbinance");
+    assertStringsEqual(name, "TBNB");
+}
diff --git a/tests/chains/Tezos/AddressTests.cpp b/tests/chains/Tezos/AddressTests.cpp
new file mode 100644
index 00000000000..0fca1e431cd
--- /dev/null
+++ b/tests/chains/Tezos/AddressTests.cpp
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HDWallet.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Tezos/Address.h"
+#include "Tezos/Forging.h"
+
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <array>
+#include <gtest/gtest.h>
+#include <string>
+
+using namespace TW;
+
+namespace TW::Tezos::tests {
+
+TEST(TezosAddress, forge_tz1) {
+    auto input = Address("tz1eZwq8b5cvE2bPKokatLkVMzkxz24z3Don");
+    auto expected = "0000cfa4aae60f5d9389752d41e320da224d43287fe2";
+
+    ASSERT_EQ(input.forge(), parse_hex(expected));
+}
+
+TEST(TezosAddress, forge_tz2) {
+    auto input = Address("tz2Rh3NYeLxrqTuvaZJmaMiVMqCajeXMWtYo");
+    auto expected = "0001be99dd914e38388ec80432818b517759e3524f16";
+
+    ASSERT_EQ(input.forge(), parse_hex(expected));
+}
+
+TEST(TezosAddress, forge_tz3) {
+    auto input = Address("tz3RDC3Jdn4j15J7bBHZd29EUee9gVB1CxD9");
+    auto expected = "0002358cbffa97149631cfb999fa47f0035fb1ea8636";
+
+    ASSERT_EQ(input.forge(), parse_hex(expected));
+}
+
+TEST(TezosAddress, forge_kt1) {
+    auto input = Address("KT1XnTn74bUtxHfDtBmm2bGZAQfhPbvKWR8o");
+    auto expected = "01fe810959c3d6127a41cbd471e7cb4e91a61b780b00";
+
+    ASSERT_EQ(input.forge(), parse_hex(expected));
+}
+
+TEST(TezosAddress, isInvalid) {
+    std::array<std::string, 3> invalidAddresses{
+        "NmH7tmeJUmHcncBDvpr7aJNEBk7rp5zYsB1qt", // Invalid prefix, valid checksum
+        "tz1eZwq8b5cvE2bPKokatLkVMzkxz24z3AAAA", // Valid prefix, invalid checksum
+        "1tzeZwq8b5cvE2bPKokatLkVMzkxz24zAAAAA"  // Invalid prefix, invalid checksum
+    };
+
+    for (auto& address : invalidAddresses) {
+        ASSERT_FALSE(Address::isValid(address));
+    }
+}
+
+TEST(TezosAddress, isValid) {
+    std::array<std::string, 4> validAddresses {
+        "tz1Yju7jmmsaUiG9qQLoYv35v5pHgnWoLWbt",
+        "tz2PdGc7U5tiyqPgTSgqCDct94qd6ovQwP6u",
+        "tz3VEZ4k6a4Wx42iyev6i2aVAptTRLEAivNN",
+        "KT1XnTn74bUtxHfDtBmm2bGZAQfhPbvKWR8o",
+    };
+
+    for (auto& address : validAddresses) {
+        ASSERT_TRUE(Address::isValid(address));
+    }
+}
+
+TEST(TezosAddress, string) {
+    auto addressString = "tz1d1qQL3mYVuiH4JPFvuikEpFwaDm85oabM";
+    auto address = Address(addressString);
+    ASSERT_EQ(address.string(), addressString);
+}
+
+TEST(TezosAddress, deriveOriginatedAddress) {
+    auto operationHash = "oo7VeTEPjEusPKnsHtKcGYbYa7i4RWpcEhUVo3Suugbbs6K62Ro";
+    auto operationIndex = 0;
+    auto expected = "KT1WrtjtAYQSrUVvSNJPTZTebiUWoopQL5hw";
+
+    ASSERT_EQ(Address::deriveOriginatedAddress(operationHash, operationIndex), expected);
+}
+
+TEST(TezosAddress, PublicKeyInit) {
+    Data bytes = parse_hex("01fe157cc8011727936c592f856c9071d39cf4acdadfa6d76435e4619c9dc56f63");
+    const auto publicKey = PublicKey(bytes, TWPublicKeyTypeED25519);
+    auto address = Address(publicKey);
+
+    auto expected = "tz1cG2jx3W4bZFeVGBjsTxUAG8tdpTXtE8PT";
+    ASSERT_EQ(address.string(), expected);
+}
+
+} // namespace TW::Tezos::tests
diff --git a/tests/Tezos/ForgingTests.cpp b/tests/chains/Tezos/ForgingTests.cpp
similarity index 93%
rename from tests/Tezos/ForgingTests.cpp
rename to tests/chains/Tezos/ForgingTests.cpp
index 66187be27d2..95ffe14dd78 100644
--- a/tests/Tezos/ForgingTests.cpp
+++ b/tests/chains/Tezos/ForgingTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "HDWallet.h"
 #include "HexCoding.h"
@@ -99,7 +97,7 @@ TEST(Forging, forge_tz3) {
     ASSERT_EQ(output, parse_hex(expected));
 }
 
-TEST(Forging, ForgePublicKey) {
+TEST(Forging, ForgeED25519PublicKey) {
     auto expected = "00311f002e899cdd9a52d96cb8be18ea2bbab867c505da2b44ce10906f511cff95";
 
     auto privateKey = PrivateKey(parse_hex("c6377a4cc490dc913fc3f0d9cf67d293a32df4547c46cb7e9e33c3b7b97c64d8"));
@@ -133,6 +131,15 @@ TEST(Forging, ForgeMichelsonFA12) {
     auto v = FA12ParameterToMichelson(data);
     ASSERT_EQ(hex(forgeMichelson(v)), "07070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b555007070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b555000bb01");
 }
+TEST(Forging, ForgeSECP256k1PublicKey) {
+    auto expected = "0102b4ac9056d20c52ac11b0d7e83715dd3eac851cfc9cb64b8546d9ea0d4bb3bdfe";
+
+    auto privateKey = PrivateKey(parse_hex("3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a"));
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto output = forgePublicKey(publicKey);
+
+    ASSERT_EQ(hex(output), expected);
+}
 
 TEST(TezosTransaction, forgeTransaction) {
     auto transactionOperationData = new TW::Tezos::Proto::TransactionOperationData();
@@ -151,7 +158,7 @@ TEST(TezosTransaction, forgeTransaction) {
     auto expected = "6c0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e81020100008fb5cea62d147c696afd9a93dbce962f4c8a9c9100";
     auto serialized = forgeOperation(transactionOperation);
 
-    ASSERT_EQ(hex(serialized.begin(), serialized.end()), expected);
+    ASSERT_EQ(hex(serialized), expected);
 }
 
 TEST(TezosTransaction, forgeTransactionFA12) {
@@ -222,7 +229,7 @@ TEST(TezosTransaction, forgeReveal) {
     auto expected = "6b0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e810200429a986c8072a40a1f3a3e2ab5a5819bb1b2fb69993c5004837815b9dc55923e";
     auto serialized = forgeOperation(revealOperation);
 
-    ASSERT_EQ(hex(serialized.begin(), serialized.end()), expected);
+    ASSERT_EQ(hex(serialized), expected);
 }
 
 TEST(TezosTransaction, forgeDelegate) {
@@ -241,7 +248,7 @@ TEST(TezosTransaction, forgeDelegate) {
     auto expected = "6e0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e8102ff003e47f837f0467b4acde406ed5842f35e2414b1a8";
     auto serialized = forgeOperation(delegateOperation);
 
-    ASSERT_EQ(hex(serialized.begin(), serialized.end()), expected);
+    ASSERT_EQ(hex(serialized), expected);
 }
 
 TEST(TezosTransaction, forgeUndelegate) {
@@ -260,7 +267,7 @@ TEST(TezosTransaction, forgeUndelegate) {
     auto expected = "6e0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e810200";
     auto serialized = forgeOperation(delegateOperation);
 
-    ASSERT_EQ(hex(serialized.begin(), serialized.end()), expected);
+    ASSERT_EQ(hex(serialized), expected);
 }
 
 } // namespace TW::Tezos::tests
diff --git a/tests/chains/Tezos/MessageSignerTests.cpp b/tests/chains/Tezos/MessageSignerTests.cpp
new file mode 100644
index 00000000000..3f38133d55a
--- /dev/null
+++ b/tests/chains/Tezos/MessageSignerTests.cpp
@@ -0,0 +1,59 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <gtest/gtest.h>
+#include <regex>
+
+#include "HexCoding.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWTezosMessageSigner.h>
+#include <Tezos/MessageSigner.h>
+
+namespace TW::Tezos::tests {
+TEST(TezosMessageSigner, inputToPayload) {
+    auto payload = Tezos::MessageSigner::inputToPayload("Tezos Signed Message: testUrl 2023-02-08T10:36:18.454Z Hello World");
+    ASSERT_EQ(payload, "05010000004254657a6f73205369676e6564204d6573736167653a207465737455726c20323032332d30322d30385431303a33363a31382e3435345a2048656c6c6f20576f726c64");
+}
+
+TEST(TezosMessageSigner, formatMessage) {
+    auto formatMessage = Tezos::MessageSigner::formatMessage("Hello World", "testUrl");
+    std::regex regex("Tezos Signed Message: \\S+ \\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z .+");
+    ASSERT_TRUE(std::regex_match(formatMessage, regex));
+}
+
+TEST(TezosMessageSigner, SignMessage) {
+    auto payload = Tezos::MessageSigner::inputToPayload("Tezos Signed Message: testUrl 2023-02-08T10:36:18.454Z Hello World");
+    PrivateKey privKey(parse_hex("91b4fb8d7348db2e7de2693f58ce1cceb966fa960739adac1d9dba2cbaa0940a"));
+    auto result = Tezos::MessageSigner::signMessage(privKey, payload);
+    auto expected = "edsigu3se2fcEJUCm1aqxjzbHdf7Wsugr4mLaA9YM2UVZ9Yy5meGv87VqHN3mmDeRwApTj1JKDaYjqmLZifSFdWCqBoghqaowwJ";
+    ASSERT_EQ(result, expected);
+    ASSERT_TRUE(Tezos::MessageSigner::verifyMessage(privKey.getPublicKey(TWPublicKeyTypeED25519), payload, result));
+}
+
+TEST(TWTezosMessageSigner, formatMessage) {
+    const auto message = STRING("Hello World");
+    const auto dappUrl = STRING("testUrl");
+    auto formattedMsg = WRAPS(TWTezosMessageSignerFormatMessage(message.get(), dappUrl.get()));
+    std::regex regex("Tezos Signed Message: \\S+ \\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{3}Z .+");
+    ASSERT_TRUE(std::regex_match(std::string(TWStringUTF8Bytes(formattedMsg.get())), regex));
+}
+
+TEST(TWTezosMessageSigner, inputToPayload) {
+    const auto message = STRING("Tezos Signed Message: testUrl 2023-02-08T10:36:18.454Z Hello World");
+    const auto expected = "05010000004254657a6f73205369676e6564204d6573736167653a207465737455726c20323032332d30322d30385431303a33363a31382e3435345a2048656c6c6f20576f726c64";
+    auto payload = WRAPS(TWTezosMessageSignerInputToPayload(message.get()));
+    ASSERT_EQ(std::string(TWStringUTF8Bytes(payload.get())), expected);
+}
+
+TEST(TWTezosMessageSigner, SignAndVerify) {
+    const auto privKeyData = "91b4fb8d7348db2e7de2693f58ce1cceb966fa960739adac1d9dba2cbaa0940a";
+    const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+    const auto message = STRING("05010000004254657a6f73205369676e6564204d6573736167653a207465737455726c20323032332d30322d30385431303a33363a31382e3435345a2048656c6c6f20576f726c64");
+
+    const auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeTezos));
+    const auto signature = WRAPS(TWTezosMessageSignerSignMessage(privateKey.get(), message.get()));
+    EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "edsigu3se2fcEJUCm1aqxjzbHdf7Wsugr4mLaA9YM2UVZ9Yy5meGv87VqHN3mmDeRwApTj1JKDaYjqmLZifSFdWCqBoghqaowwJ");
+    EXPECT_TRUE(TWTezosMessageSignerVerifyMessage(pubKey.get(), message.get(), signature.get()));
+}
+} // namespace TW::Tezos::tests
diff --git a/tests/Tezos/OperationListTests.cpp b/tests/chains/Tezos/OperationListTests.cpp
similarity index 93%
rename from tests/Tezos/OperationListTests.cpp
rename to tests/chains/Tezos/OperationListTests.cpp
index 9fb89d9e8a6..4218e01c6e1 100644
--- a/tests/Tezos/OperationListTests.cpp
+++ b/tests/chains/Tezos/OperationListTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Tezos/Address.h"
 #include "Tezos/BinaryCoding.h"
@@ -43,7 +41,7 @@ TEST(TezosOperationList, ForgeOperationList_TransactionOnly) {
 
     auto expected = "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016c0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e81020100008fb5cea62d147c696afd9a93dbce962f4c8a9c9100";
     auto forged = op_list.forge(key);
-    ASSERT_EQ(hex(forged.begin(), forged.end()), expected);
+    ASSERT_EQ(hex(forged), expected);
 }
 
 TEST(TezosOperationList, ForgeOperationList_RevealOnly) {
@@ -68,7 +66,7 @@ TEST(TezosOperationList, ForgeOperationList_RevealOnly) {
     auto expected = "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016b0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e810200429a986c8072a40a1f3a3e2ab5a5819bb1b2fb69993c5004837815b9dc55923e";
     auto forged = op_list.forge(key);
 
-    ASSERT_EQ(hex(forged.begin(), forged.end()), expected);
+    ASSERT_EQ(hex(forged), expected);
 }
 
 TEST(TezosOperationList, ForgeOperationList_Delegation_ClearDelegate) {
@@ -112,7 +110,7 @@ TEST(TezosOperationList, ForgeOperationList_Delegation_AddDelegate) {
     op_list.addOperation(delegationOperation);
     auto expected = "7105102c032807994dd9b5edf219261896a559876ca16cbf9d31dbe3612b89f26e00315b1206ec00b1b1e64cc3b8b93059f58fa2fc39e90944904e00ff00c4650fd609f88c67356e5fe01e37cd3ff654b18c";
     auto forged = op_list.forge(key);
-    ASSERT_EQ(hex(forged.begin(), forged.end()), expected);
+    ASSERT_EQ(hex(forged), expected);
 }
 
 TEST(TezosOperationList, ForgeOperationList_TransactionAndReveal) {
@@ -152,7 +150,7 @@ TEST(TezosOperationList, ForgeOperationList_TransactionAndReveal) {
     auto expected = "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016b003e47f837f0467b4acde406ed5842f35e2414b1a8f80992f001f44e810200603247bbf52501498293686da89ad8b2aca85f83b90903d4521dd2aba66054eb6c003e47f837f0467b4acde406ed5842f35e2414b1a8f80993f001f44e8102010000e42504da69a7c8d5baeaaeebe157a02db6b22ed800";
     auto forged = op_list.forge(key);
 
-    ASSERT_EQ(hex(forged.begin(), forged.end()), expected);
+    ASSERT_EQ(hex(forged), expected);
 }
 
 TEST(TezosOperationList, ForgeOperationList_RevealWithoutPublicKey) {
@@ -176,7 +174,7 @@ TEST(TezosOperationList, ForgeOperationList_RevealWithoutPublicKey) {
     auto expected = "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016b003e47f837f0467b4acde406ed5842f35e2414b1a8f80992f001f44e810200603247bbf52501498293686da89ad8b2aca85f83b90903d4521dd2aba66054eb";
     auto forged = op_list.forge(key);
 
-    ASSERT_EQ(hex(forged.begin(), forged.end()), expected);
+    ASSERT_EQ(hex(forged), expected);
 }
 
 } // namespace TW::Tezos::tests
diff --git a/tests/chains/Tezos/PublicKeyTests.cpp b/tests/chains/Tezos/PublicKeyTests.cpp
new file mode 100644
index 00000000000..c91383fcb86
--- /dev/null
+++ b/tests/chains/Tezos/PublicKeyTests.cpp
@@ -0,0 +1,30 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Tezos/BinaryCoding.h"
+#include "Tezos/Forging.h"
+#include "PublicKey.h"
+#include "Data.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Tezos::tests {
+
+TEST(TezosPublicKey, forge) {
+    auto input = parsePublicKey("edpkuAfEJCEatRgFpRGg3gn3FdWniLXBoubARreRwuVZPWufkgDBvR");
+    auto expected = "00451bde832454ba73e6e0de313fcf5d1565ec51080edc73bb19287b8e0ab2122b";
+    auto serialized = forgePublicKey(input);
+    ASSERT_EQ(hex(serialized), expected);
+}
+
+TEST(TezosPublicKey, parse) {
+    auto input = "edpkuAfEJCEatRgFpRGg3gn3FdWniLXBoubARreRwuVZPWufkgDBvR";
+    auto bytes = Data({1, 69, 27, 222, 131, 36, 84, 186, 115, 230, 224, 222, 49, 63, 207, 93, 21, 101, 236, 81, 8, 14, 220, 115, 187, 25, 40, 123, 142, 10, 178, 18, 43});
+    auto output = parsePublicKey(input);
+    auto expected = PublicKey(bytes, TWPublicKeyTypeED25519);
+    ASSERT_EQ(output, expected);
+}
+
+} // namespace TW::Tezos::tests
diff --git a/tests/chains/Tezos/SignerTests.cpp b/tests/chains/Tezos/SignerTests.cpp
new file mode 100644
index 00000000000..2f63e20c9e8
--- /dev/null
+++ b/tests/chains/Tezos/SignerTests.cpp
@@ -0,0 +1,92 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Tezos/BinaryCoding.h"
+#include "Tezos/OperationList.h"
+#include "Tezos/Signer.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Tezos::tests {
+
+TEST(TezosSigner, SignString) {
+    Data bytesToSign = parse_hex("ffaa");
+    Data expectedSignature = parse_hex("eaab7f4066217b072b79609a9f76cdfadd93f8dde41763887e131c02324f18c8e41b1009e334baf87f9d2e917bf4c0e73165622e5522409a0c5817234a48cc02");
+    Data expected = Data();
+    append(expected, bytesToSign);
+    append(expected, expectedSignature);
+
+    auto key = PrivateKey(parse_hex("0x2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f"));
+    auto signedBytes = Signer().signData(key, bytesToSign);
+
+    ASSERT_EQ(signedBytes, expected);
+}
+
+TEST(TezosSigner, SignOperationList) {
+    auto branch = "BLDnkhhVgwdBAtmDNQc5HtEMsrxq8L3t7NQbjUbbdTdw5Ug1Mpe";
+    auto op_list = Tezos::OperationList(branch);
+
+    auto transactionOperationData = new Proto::TransactionOperationData();
+    transactionOperationData->set_amount(11100000);
+    transactionOperationData->set_destination("tz1gSM6yiwr85jEASZ1q3UekgHEoxYt7wg2M");
+
+    auto transactionOperation = TW::Tezos::Proto::Operation();
+    transactionOperation.set_source("tz1RKLoYm4vtLzo7TAgGifMDAkiWhjfyXwP4");
+    transactionOperation.set_fee(1283);
+    transactionOperation.set_counter(1878);
+    transactionOperation.set_gas_limit(10307);
+    transactionOperation.set_storage_limit(0);
+    transactionOperation.set_kind(Proto::Operation::TRANSACTION);
+    transactionOperation.set_allocated_transaction_operation_data(transactionOperationData);
+
+    op_list.addOperation(transactionOperation);
+
+    PublicKey publicKey = parsePublicKey("edpkuNb9N2UHtGeSc2BZCBHN8ETx7E4DwkSfz5Hw3m3tF3dLZTU8qp");
+    auto revealOperationData = new TW::Tezos::Proto::RevealOperationData();
+    revealOperationData->set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+
+    auto revealOperation = Proto::Operation();
+    revealOperation.set_source("tz1RKLoYm4vtLzo7TAgGifMDAkiWhjfyXwP4");
+    revealOperation.set_fee(1268);
+    revealOperation.set_counter(1876);
+    revealOperation.set_gas_limit(10100);
+    revealOperation.set_storage_limit(0);
+    revealOperation.set_kind(Proto::Operation::REVEAL);
+    revealOperation.set_allocated_reveal_operation_data(revealOperationData);
+
+    op_list.addOperation(revealOperation);
+
+    auto delegateOperationData = new Tezos::Proto::DelegationOperationData();
+    delegateOperationData->set_delegate("tz1gSM6yiwr85jEASZ1q3UekgHEoxYt7wg2M");
+
+    auto delegateOperation = Proto::Operation();
+    delegateOperation.set_source("tz1RKLoYm4vtLzo7TAgGifMDAkiWhjfyXwP4");
+    delegateOperation.set_fee(1257);
+    delegateOperation.set_counter(1879);
+    delegateOperation.set_gas_limit(10100);
+    delegateOperation.set_storage_limit(0);
+    delegateOperation.set_kind(Proto::Operation::DELEGATION);
+    delegateOperation.set_allocated_delegation_operation_data(delegateOperationData);
+
+    op_list.addOperation(delegateOperation);
+
+    auto decodedPrivateKey = Base58::decodeCheck("edsk4bMQMM6HYtMazF3m7mYhQ6KQ1WCEcBuRwh6DTtdnoqAvC3nPCc");
+    auto key = PrivateKey(Data(decodedPrivateKey.begin() + 4, decodedPrivateKey.end()));
+
+    std::string expectedForgedBytesToSign = hex(op_list.forge(key));
+    std::string expectedSignature = "871693145f2dc72861ff6816e7ac3ce93c57611ac09a4c657a5a35270fa57153334c14cd8cae94ee228b6ef52f0e3f10948721e666318bc54b6c455404b11e03";
+    std::string expectedSignedBytes = expectedForgedBytesToSign + expectedSignature;
+
+    auto signedBytes = Signer().signOperationList(key, op_list);
+    auto signedBytesHex = hex(signedBytes);
+
+    ASSERT_EQ(hex(signedBytes), expectedSignedBytes);
+}
+
+} // namespace TW::Tezos::tests
diff --git a/tests/chains/Tezos/TWAnySignerTests.cpp b/tests/chains/Tezos/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..30943e749c8
--- /dev/null
+++ b/tests/chains/Tezos/TWAnySignerTests.cpp
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Tezos/BinaryCoding.h"
+#include "proto/Tezos.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+namespace TW::Tezos::tests {
+
+TEST(TWAnySignerTezos, SignFA12) {
+    // https://ghostnet.tzkt.io/ooTBu7DLbeC7DmVfXEsp896A6WTwimedbsM9QRqUVtqA8Vxt6D3/2993172
+    auto key = parse_hex("363265a0b3f06661001cab8b4f3ca8fd97ae70608184979cf7300836f57ec2d6");
+
+    Proto::SigningInput input;
+    input.set_private_key(key.data(), key.size());
+    auto& operations = *input.mutable_operation_list();
+    operations.set_branch("BL8euoCWqNCny9AR3AKjnpi38haYMxjei1ZqNHuXMn19JSQnoWp");
+
+    auto& transaction = *operations.add_operations();
+    auto& txData = *transaction.mutable_transaction_operation_data();
+    txData.set_amount(0);
+    txData.set_destination("KT1EwXFWoG9bYebmF4pYw72aGjwEnBWefgW5");
+    txData.mutable_parameters()->mutable_fa12_parameters()->set_entrypoint("transfer");
+    txData.mutable_parameters()->mutable_fa12_parameters()->set_from("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
+    txData.mutable_parameters()->mutable_fa12_parameters()->set_to("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
+    txData.mutable_parameters()->mutable_fa12_parameters()->set_value("123");
+    transaction.set_source("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
+    transaction.set_fee(100000);
+    transaction.set_counter(2993172);
+    transaction.set_gas_limit(100000);
+    transaction.set_storage_limit(0);
+    transaction.set_kind(Proto::Operation::TRANSACTION);
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTezos);
+    ASSERT_EQ(hex(output.encoded()), "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016c00fe2ce0cccc0214af521ad60c140c5589b4039247a08d0694d8b601a08d0600000145bd8a65cc48159d8ea60a55df735b7c5ad45f0e00ffff087472616e736665720000005907070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b555007070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b555000bb012914d768155fba2df319a81136e8e3e573b9cadb1676834490c90212615d271da029b6b0531e290e9063bcdb40bea43627af048b18e036f02be2b6b22fc8b307");
+}
+
+TEST(TWAnySignerTezos, SignFA2) {
+    // https://ghostnet.tzkt.io/onxLBoPaf23M3A8kHTwncSFG2GVXPfnGXUhkC8BhKj8QDdCEbng
+    auto key = parse_hex("363265a0b3f06661001cab8b4f3ca8fd97ae70608184979cf7300836f57ec2d6");
+
+    Proto::SigningInput input;
+    input.set_private_key(key.data(), key.size());
+    auto& operations = *input.mutable_operation_list();
+    operations.set_branch("BKvEAX9HXfJZWYfTQbR1C7B3ADoKY6a1aKVRF7qQqvc9hS8Rr3m");
+
+    auto& transaction = *operations.add_operations();
+
+    auto* transactionOperationData = transaction.mutable_transaction_operation_data();
+    transactionOperationData->set_amount(0);
+    transactionOperationData->set_destination("KT1DYk1XDzHredJq1EyNkDindiWDqZyekXGj");
+
+    auto& fa2 = *transactionOperationData->mutable_parameters()->mutable_fa2_parameters();
+    fa2.set_entrypoint("transfer");
+    auto& txObject = *fa2.add_txs_object();
+    txObject.set_from("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
+    auto& tx = *txObject.add_txs();
+    tx.set_amount("10");
+    tx.set_token_id("0");
+    tx.set_to("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
+
+    transaction.set_source("tz1ioz62kDw6Gm5HApeQtc1PGmN2wPBtJKUP");
+    transaction.set_fee(100000);
+    transaction.set_counter(2993173);
+    transaction.set_gas_limit(100000);
+    transaction.set_storage_limit(0);
+    transaction.set_kind(Proto::Operation::TRANSACTION);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTezos);
+    ASSERT_EQ(hex(output.encoded()), "1b1f9345dc9f77bd24b09034d1d2f9a28f02ac837f49db54b8d68341f53dc4b76c00fe2ce0cccc0214af521ad60c140c5589b4039247a08d0695d8b601a08d0600000136767f88850bae28bfb9f46b73c5e87ede4de12700ffff087472616e7366657200000066020000006107070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b5550020000003107070100000024747a31696f7a36326b447736476d35484170655174633150476d4e32775042744a4b555007070000000a552d24710d6c59383286700c6c2917b25a6c1fa8b587e593c289dd47704278796792f1e522c1623845ec991e292b0935445e6994850bd03f035a006c5ed93806");
+}
+
+TEST(TWAnySignerTezos, BlindSign) {
+    // Successfully broadcasted: https://ghostnet.tzkt.io/oobGgTkDNz9eqGVXiU4wShPZydkroCrmbKjoDcfSqhnM7GmcdEu/15229334
+    auto key = parse_hex("3caf5afaed067890cd850efd1555df351aa482badb4a541c29261f1acf261bf5");
+    auto bytes = parse_hex("64aa7792af40de41371a72b3342daa7bf3d2b5a84511e9074341fdd52148dd9d6c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542850f96c3a1079d780080ade2040155959998da7e79231e2be8ed8ff373ac1b1574b000ffff04737761700000009e070703060707020000000807070508030b000007070100000018323032332d30322d32345431333a34303a32322e3332385a07070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484807070100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a4438457907070080dac409070700bdf892a1a291e196aa0503066c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd0497c3a107f10f180001543aa1803f0bbe2099809ab067dfa8a4cbc1c26a00ffff07617070726f76650000002d070701000000244b5431516f64676b5974754e79664a726a72673854515a586d64544643616d373268533900006c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd0498c3a107f70f090001543aa1803f0bbe2099809ab067dfa8a4cbc1c26a00ffff07617070726f766500000036070701000000244b5431516f64676b5974754e79664a726a72673854515a586d64544643616d373268533900bdf892a1a291e196aa056c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542e71599c3a107fabb01400001b1f0d7affc39861f7f5c75f917f683d2e9f55e3100ffff04737761700000009a070700000707000007070001070700bdf892a1a291e196aa05070700a3f683c2a6d80a07070100000018323032332d30322d32345431333a34303a32322e3332385a070705090100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484805090100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a443845796c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd049ac3a107f50f1b000193d22b59c496c94504729be1c671ec1d1d7a9cf000ffff107570646174655f6f70657261746f72730000005f020000005a050507070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a73766178684848070701000000244b543147504a44546638475a73704363616e6147324b684d764775334e4a52717572617400006c00ad756cb46ba6f59efa8bd10ff544ba9d20d0954285109bc3a107a0820100000155959998da7e79231e2be8ed8ff373ac1b1574b000ffff0473776170000000a1070703060707020000000807070508030b000807070100000018323032332d30322d32345431333a34303a32322e3332385a07070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484807070100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a44384579070700a3f683c2a6d80a070700a4f096bfbe9df6f0e00603066c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd049cc3a107ed0f00000193d22b59c496c94504729be1c671ec1d1d7a9cf000ffff107570646174655f6f70657261746f72730000005f020000005a050807070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a73766178684848070701000000244b543147504a44546638475a73704363616e6147324b684d764775334e4a5271757261740000");
+
+    Proto::SigningInput input;
+    input.set_private_key(key.data(), key.size());
+    input.set_encoded_operations(bytes.data(), bytes.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTezos);
+
+    EXPECT_EQ(hex(output.encoded()), "64aa7792af40de41371a72b3342daa7bf3d2b5a84511e9074341fdd52148dd9d6c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542850f96c3a1079d780080ade2040155959998da7e79231e2be8ed8ff373ac1b1574b000ffff04737761700000009e070703060707020000000807070508030b000007070100000018323032332d30322d32345431333a34303a32322e3332385a07070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484807070100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a4438457907070080dac409070700bdf892a1a291e196aa0503066c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd0497c3a107f10f180001543aa1803f0bbe2099809ab067dfa8a4cbc1c26a00ffff07617070726f76650000002d070701000000244b5431516f64676b5974754e79664a726a72673854515a586d64544643616d373268533900006c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd0498c3a107f70f090001543aa1803f0bbe2099809ab067dfa8a4cbc1c26a00ffff07617070726f766500000036070701000000244b5431516f64676b5974754e79664a726a72673854515a586d64544643616d373268533900bdf892a1a291e196aa056c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542e71599c3a107fabb01400001b1f0d7affc39861f7f5c75f917f683d2e9f55e3100ffff04737761700000009a070700000707000007070001070700bdf892a1a291e196aa05070700a3f683c2a6d80a07070100000018323032332d30322d32345431333a34303a32322e3332385a070705090100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484805090100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a443845796c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd049ac3a107f50f1b000193d22b59c496c94504729be1c671ec1d1d7a9cf000ffff107570646174655f6f70657261746f72730000005f020000005a050507070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a73766178684848070701000000244b543147504a44546638475a73704363616e6147324b684d764775334e4a52717572617400006c00ad756cb46ba6f59efa8bd10ff544ba9d20d0954285109bc3a107a0820100000155959998da7e79231e2be8ed8ff373ac1b1574b000ffff0473776170000000a1070703060707020000000807070508030b000807070100000018323032332d30322d32345431333a34303a32322e3332385a07070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a7376617868484807070100000024747a315377326d4641557a626b6d37646b47434472626542734a54547456374a44384579070700a3f683c2a6d80a070700a4f096bfbe9df6f0e00603066c00ad756cb46ba6f59efa8bd10ff544ba9d20d09542cd049cc3a107ed0f00000193d22b59c496c94504729be1c671ec1d1d7a9cf000ffff107570646174655f6f70657261746f72730000005f020000005a050807070100000024747a31625443473754415535523736356f4458694c4d63385a4537546a73766178684848070701000000244b543147504a44546638475a73704363616e6147324b684d764775334e4a5271757261740000e10077fc3068aaaf1c7779e1dc2c396b3b40d73ddda04648bf4b16ac2e747c89b461771488e80da3aa30fc18c90de99fd358bfb76683f3c3ec250b1ee09b6d07");
+}
+
+TEST(TWAnySignerTezos, Sign) {
+    auto key = parse_hex("2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f");
+    auto revealKey = parse_hex("311f002e899cdd9a52d96cb8be18ea2bbab867c505da2b44ce10906f511cff95");
+
+    Proto::SigningInput input;
+    input.set_private_key(key.data(), key.size());
+    auto& operations = *input.mutable_operation_list();
+    operations.set_branch("BL8euoCWqNCny9AR3AKjnpi38haYMxjei1ZqNHuXMn19JSQnoWp");
+
+    auto& reveal = *operations.add_operations();
+    auto& revealData = *reveal.mutable_reveal_operation_data();
+    revealData.set_public_key(revealKey.data(), revealKey.size());
+    reveal.set_source("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
+    reveal.set_fee(1272);
+    reveal.set_counter(30738);
+    reveal.set_gas_limit(10100);
+    reveal.set_storage_limit(257);
+    reveal.set_kind(Proto::Operation::REVEAL);
+
+    auto& transaction = *operations.add_operations();
+    auto& txData = *transaction.mutable_transaction_operation_data();
+    txData.set_amount(1);
+    txData.set_destination("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
+    transaction.set_source("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
+    transaction.set_fee(1272);
+    transaction.set_counter(30739);
+    transaction.set_gas_limit(10100);
+    transaction.set_storage_limit(257);
+    transaction.set_kind(Proto::Operation::TRANSACTION);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTezos);
+
+    EXPECT_EQ(hex(output.encoded()), "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016b0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e810200311f002e899cdd9a52d96cb8be18ea2bbab867c505da2b44ce10906f511cff956c0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80993f001f44e810201000081faa75f741ef614b0e35fcc8c90dfa3b0b95721000217034271b815e5f0c0a881342838ce49d7b48cdf507c72b1568c69a10db70c98774cdad1a74df760763e25f760ff13afcbbf3a1f2c833a0beeb9576a579c05");
+}
+
+TEST(TWAnySignerTezos, SignJSON) {
+    auto json = STRING(R"({"operationList": {"branch": "BL8euoCWqNCny9AR3AKjnpi38haYMxjei1ZqNHuXMn19JSQnoWp","operations": [{"source": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW","fee": 1272,"counter": 30738,"gasLimit": 10100,"storageLimit": 257,"kind": 107,"revealOperationData": {"publicKey": "QpqYbIBypAofOj4qtaWBm7Gy+2mZPFAEg3gVudxVkj4="}},{"source": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW","fee": 1272,"counter": 30739,"gasLimit": 10100,"storageLimit": 257,"kind": 108,"transactionOperationData": {"destination": "tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW","amount": 1}}]}})");
+    auto key = DATA("2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f");
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeTezos));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeTezos));
+    assertStringsEqual(result, "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016b0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80992f001f44e810200429a986c8072a40a1f3a3e2ab5a5819bb1b2fb69993c5004837815b9dc55923e6c0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80993f001f44e810201000081faa75f741ef614b0e35fcc8c90dfa3b0b957210001b86398d5b9be737dca8e4106ea18d70e69b75e92f892fb283546a99152b8d7794b919c0fbf1c31de386069a60014491c0e7505adef5781cead1cfe6608030b");
+}
+
+} // namespace TW::Tezos::tests
diff --git a/tests/chains/Tezos/TWCoinTypeTests.cpp b/tests/chains/Tezos/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..50e2e1baea1
--- /dev/null
+++ b/tests/chains/Tezos/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWTezosCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTezos));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("onk3Z6V4StyfiXTPSHwZFvTKVAaws37cHmZacmULPr3VbVHpKrg"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTezos, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("tz1SiPXX4MYGNJNDsRc7n8hkvUqFzg8xqF9m"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTezos, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTezos));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTezos));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTezos), 6);
+    ASSERT_EQ(TWBlockchainTezos, TWCoinTypeBlockchain(TWCoinTypeTezos));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTezos));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTezos));
+    assertStringsEqual(symbol, "XTZ");
+    assertStringsEqual(txUrl, "https://tzstats.com/onk3Z6V4StyfiXTPSHwZFvTKVAaws37cHmZacmULPr3VbVHpKrg");
+    assertStringsEqual(accUrl, "https://tzstats.com/tz1SiPXX4MYGNJNDsRc7n8hkvUqFzg8xqF9m");
+    assertStringsEqual(id, "tezos");
+    assertStringsEqual(name, "Tezos");
+}
diff --git a/tests/chains/Tezos/TransactionCompilerTests.cpp b/tests/chains/Tezos/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..56f3ec7a008
--- /dev/null
+++ b/tests/chains/Tezos/TransactionCompilerTests.cpp
@@ -0,0 +1,111 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Tezos.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TezosCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeTezos;
+
+    /// Step 1: Prepare transaction input (protobuf)
+    auto privateKey =
+        PrivateKey(parse_hex("2e8905819b8723fe2c1d161860e5ee1830318dbf49a83bd451cfb8440c28bd6f"));
+    auto publicKey = privateKey.getPublicKey(::publicKeyType(coin));
+    auto revealKey = parse_hex("311f002e899cdd9a52d96cb8be18ea2bbab867c505da2b44ce10906f511cff95");
+
+    TW::Tezos::Proto::SigningInput input;
+    auto& operations = *input.mutable_operation_list();
+    operations.set_branch("BL8euoCWqNCny9AR3AKjnpi38haYMxjei1ZqNHuXMn19JSQnoWp");
+
+    auto& reveal = *operations.add_operations();
+    auto& revealData = *reveal.mutable_reveal_operation_data();
+    revealData.set_public_key(revealKey.data(), revealKey.size());
+    reveal.set_source("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
+    reveal.set_fee(1272);
+    reveal.set_counter(30738);
+    reveal.set_gas_limit(10100);
+    reveal.set_storage_limit(257);
+    reveal.set_kind(Tezos::Proto::Operation::REVEAL);
+
+    auto& transaction = *operations.add_operations();
+    auto& txData = *transaction.mutable_transaction_operation_data();
+    txData.set_amount(1);
+    txData.set_destination("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
+    transaction.set_source("tz1XVJ8bZUXs7r5NV8dHvuiBhzECvLRLR3jW");
+    transaction.set_fee(1272);
+    transaction.set_counter(30739);
+    transaction.set_gas_limit(10100);
+    transaction.set_storage_limit(257);
+    transaction.set_kind(Tezos::Proto::Operation::TRANSACTION);
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "12e4f8b17ad3b316a5a56960db76c7d6505dbf2fff66106be75c8d6753daac0e");
+
+    auto signature = parse_hex("0217034271b815e5f0c0a881342838ce49d7b48cdf507c72b1568c69a10db70c987"
+                               "74cdad1a74df760763e25f760ff13afcbbf3a1f2c833a0beeb9576a579c05");
+
+    /// Step 3: Compile transaction info
+    const auto tx =
+        "3756ef37b1be849e3114643f0aa5847cabf9a896d3bfe4dd51448de68e91da016b0081faa75f741ef614b0e35f"
+        "cc8c90dfa3b0b95721f80992f001f44e810200311f002e899cdd9a52d96cb8be18ea2bbab867c505da2b44ce10"
+        "906f511cff956c0081faa75f741ef614b0e35fcc8c90dfa3b0b95721f80993f001f44e810201000081faa75f74"
+        "1ef614b0e35fcc8c90dfa3b0b95721000217034271b815e5f0c0a881342838ce49d7b48cdf507c72b1568c69a1"
+        "0db70c98774cdad1a74df760763e25f760ff13afcbbf3a1f2c833a0beeb9576a579c05";
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {});
+
+    {
+        TW::Tezos::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), tx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::Tezos::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        TW::Tezos::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), tx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {});
+        Tezos::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_signatures_count);
+    }
+}
\ No newline at end of file
diff --git a/tests/chains/TheOpenNetwork/TWAnyAddressTests.cpp b/tests/chains/TheOpenNetwork/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..6a7fc5a7a5d
--- /dev/null
+++ b/tests/chains/TheOpenNetwork/TWAnyAddressTests.cpp
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Data.h"
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include <TrustWalletCore/TWHDWallet.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::TheOpenNetwork::tests {
+
+TEST(TWTheOpenNetwork, Address) {
+    const auto mnemonic = STRING("stuff diamond cycle federal scan spread pigeon people engage teach snack grain");
+    const auto passphrase = STRING("");
+
+    const auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(mnemonic.get(), passphrase.get()));
+
+    const auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypeTON, WRAPS(TWCoinTypeDerivationPath(TWCoinTypeTON)).get()));
+    const auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyEd25519(privateKey.get()));
+    const auto address = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(publicKey.get(), TWCoinTypeTON));
+    const auto addressStr = WRAPS(TWAnyAddressDescription(address.get()));
+
+    assertStringsEqual(addressStr, "UQDYW_1eScJVxtitoBRksvoV9cCYo4uKGWLVNIHB1JqRRyQx");
+}
+
+TEST(TWTheOpenNetwork, AddressValidate) {
+    auto string = STRING("EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorkdl");
+
+    ASSERT_TRUE(TWAnyAddressIsValid(string.get(), TWCoinTypeTON));
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeTON));
+
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae");
+
+    auto normalized = WRAPS(TWAnyAddressDescription(addr.get()));
+    assertStringsEqual(normalized, "UQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorhqg");
+}
+
+} // namespace TW::TheOpenNetwork::tests
diff --git a/tests/chains/TheOpenNetwork/TWAnySignerTests.cpp b/tests/chains/TheOpenNetwork/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..ffd5d276a78
--- /dev/null
+++ b/tests/chains/TheOpenNetwork/TWAnySignerTests.cpp
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+
+#include "proto/TheOpenNetwork.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::TheOpenNetwork::tests {
+
+TEST(TWAnySignerTheOpenNetwork, SignMessageToTransferAndDeployWalletV4R2) {
+    Proto::SigningInput input;
+
+    auto& transfer = *input.add_messages();
+    transfer.set_dest("EQDYW_1eScJVxtitoBRksvoV9cCYo4uKGWLVNIHB1JqRR3n0");
+    transfer.set_amount(10);
+    transfer.set_mode(Proto::SendMode::PAY_FEES_SEPARATELY | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS);
+    transfer.set_bounceable(true);
+
+    const auto privateKey = parse_hex("63474e5fe9511f1526a50567ce142befc343e71a49b865ac3908f58667319cb8");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    input.set_expire_at(1671135440);
+
+    input.set_wallet_version(Proto::WALLET_V4_R2);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTON);
+
+    // The same Cell can be BoC encoded differently.
+    // This encoded BoC equals to:
+    // te6ccgICABoAAQAAA8sAAAJFiADN98eLgHfrkE8l8gmT8X5REpTVR6QnqDhArTbKlVvbZh4ABAABAZznxvGBhoRXhPogxNY8QmHlihJWxg5t6KptqcAIZlVks1r+Z+r1avCWNCeqeLC/oaiVN4mDx/E1+Zhi33G25rcIKamjF/////8AAAAAAAMAAgFiYgBsLf6vJOEq42xW0AoyWX0K+uBMUcXFDLFqmkDg6k1Io4hQAAAAAAAAAAAAAAAAAQADAAACATQABgAFAFEAAAAAKamjF/Qsd/kxvqIOxdAVBzEna7suKGCUdmEkWyMZ74Ez7o1BQAEU/wD0pBP0vPLICwAHAgEgAA0ACAT48oMI1xgg0x/TH9MfAvgju/Jk7UTQ0x/TH9P/9ATRUUO68qFRUbryogX5AVQQZPkQ8qP4ACSkyMsfUkDLH1Iwy/9SEPQAye1U+A8B0wchwACfbFGTINdKltMH1AL7AOgw4CHAAeMAIcAC4wABwAORMOMNA6TIyx8Syx/L/wAMAAsACgAJAAr0AMntVABsgQEI1xj6ANM/MFIkgQEI9Fnyp4IQZHN0cnB0gBjIywXLAlAFzxZQA/oCE8tqyx8Syz/Jc/sAAHCBAQjXGPoA0z/IVCBHgQEI9FHyp4IQbm90ZXB0gBjIywXLAlAGzxZQBPoCFMtqEssfyz/Jc/sAAgBu0gf6ANTUIvkABcjKBxXL/8nQd3SAGMjLBcsCIs8WUAX6AhTLaxLMzMlz+wDIQBSBAQj0UfKnAgIBSAAXAA4CASAAEAAPAFm9JCtvaiaECAoGuQ+gIYRw1AgIR6STfSmRDOaQPp/5g3gSgBt4EBSJhxWfMYQCASAAEgARABG4yX7UTQ1wsfgCAVgAFgATAgEgABUAFAAZrx32omhAEGuQ64WPwAAZrc52omhAIGuQ64X/wAA9sp37UTQgQFA1yH0BDACyMoHy//J0AGBAQj0Cm+hMYALm0AHQ0wMhcbCSXwTgItdJwSCSXwTgAtMfIYIQcGx1Z70ighBkc3RyvbCSXwXgA/pAMCD6RAHIygfL/8nQ7UTQgQFA1yH0BDBcgQEI9ApvoTGzkl8H4AXTP8glghBwbHVnupI4MOMNA4IQZHN0crqSXwbjDQAZABgAilAEgQEI9Fkw7UTQgQFA1yDIAc8W9ADJ7VQBcrCOI4IQZHN0coMesXCAGFAFywVQA88WI/oCE8tqyx/LP8mAQPsAkl8D4gB4AfoA9AQw+CdvIjBQCqEhvvLgUIIQcGx1Z4MesXCAGFAEywUmzxZY+gIZ9ADLaRfLH1Jgyz8gyYBA+wAG
+    ASSERT_EQ(output.encoded(), "te6cckECGgEAA7IAAkWIAM33x4uAd+uQTyXyCZPxflESlNVHpCeoOECtNsqVW9tmHgECAgE0AwQBnOfG8YGGhFeE+iDE1jxCYeWKElbGDm3oqm2pwAhmVWSzWv5n6vVq8JY0J6p4sL+hqJU3iYPH8TX5mGLfcbbmtwgpqaMX/////wAAAAAAAwUBFP8A9KQT9LzyyAsGAFEAAAAAKamjF/Qsd/kxvqIOxdAVBzEna7suKGCUdmEkWyMZ74Ez7o1BQAFiYgBsLf6vJOEq42xW0AoyWX0K+uBMUcXFDLFqmkDg6k1Io4hQAAAAAAAAAAAAAAAAAQcCASAICQAAAgFICgsE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8MDQ4PAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNEBECASASEwBu0gf6ANTUIvkABcjKBxXL/8nQd3SAGMjLBcsCIs8WUAX6AhTLaxLMzMlz+wDIQBSBAQj0UfKnAgBwgQEI1xj6ANM/yFQgR4EBCPRR8qeCEG5vdGVwdIAYyMsFywJQBs8WUAT6AhTLahLLH8s/yXP7AAIAbIEBCNcY+gDTPzBSJIEBCPRZ8qeCEGRzdHJwdIAYyMsFywJQBc8WUAP6AhPLassfEss/yXP7AAAK9ADJ7VQAeAH6APQEMPgnbyIwUAqhIb7y4FCCEHBsdWeDHrFwgBhQBMsFJs8WWPoCGfQAy2kXyx9SYMs/IMmAQPsABgCKUASBAQj0WTDtRNCBAUDXIMgBzxb0AMntVAFysI4jghBkc3Rygx6xcIAYUAXLBVADzxYj+gITy2rLH8s/yYBA+wCSXwPiAgEgFBUAWb0kK29qJoQICga5D6AhhHDUCAhHpJN9KZEM5pA+n/mDeBKAG3gQFImHFZ8xhAIBWBYXABG4yX7UTQ1wsfgAPbKd+1E0IEBQNch9AQwAsjKB8v/ydABgQEI9ApvoTGACASAYGQAZrc52omhAIGuQ64X/wAAZrx32omhAEGuQ64WPwJiaP4Q=");
+}
+
+TEST(TWAnySignerTheOpenNetwork, SignMessageToTransferAndDeployWalletV5R1) {
+    Proto::SigningInput input;
+
+    auto& transfer = *input.add_messages();
+    transfer.set_dest("EQBe6DtCpJZe8M4t-crMXe93JlEYgSl30S5OUuMSLOfeQfBu");
+    transfer.set_amount(10);
+    transfer.set_mode(Proto::SendMode::PAY_FEES_SEPARATELY | Proto::SendMode::IGNORE_ACTION_PHASE_ERRORS);
+    transfer.set_bounceable(true);
+
+    const auto privateKey = parse_hex("3570e35f54cfb843f2cfaf2b8cae7ceeb7b32225d7dbbd86f611056d74d9073e");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    input.set_expire_at(0xffffffff);
+
+    input.set_wallet_version(Proto::WALLET_V5_R1);
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTON);
+
+    // Successfully broadcasted: https://tonviewer.com/transaction/Q32uRBqVprzNzc6iVgwxPeJPE92Fx21dfsqrHnCh5Ss=
+    ASSERT_EQ(hex(output.hash()), "437dae441a95a6bccdcdcea2560c313de24f13dd85c76d5d7ecaab1e70a1e52b");
+    ASSERT_EQ(output.encoded(), "te6cckECGwEAA2sAAkWIACm9HPyVOpjCNOG6nbf+EwCONRHHpeMQsIlCoWNKhUaaHgECAgE0AwQBoXNpZ25///8R/////wAAAACACOfqY7L3l3aKc58eNxuJTaeH/fgBw2aG0coM+hjDpjWhJKbYKmsAD8v054HYSuO6vN3bQnV5U19BhsGfe1MDoAUBFP8A9KQT9LzyyAsGAFGAAAAAP///iKrcG+d35KaMMtuxik4jqNofFL51Mu1f8Qf19onqsDlyIAIKDsPIbQMWBwIBIAgJAWJiAC90HaFSSy94Zxb85WYu97uTKIxAlLvolycpcYkWc+8giFAAAAAAAAAAAAAAAAABFgIBSAoLAQLyDALc0CDXScEgkVuPYyDXCx8gghBleHRuvSGCEHNpbnS9sJJfA+CCEGV4dG66jrSAINchAdB01yH6QDD6RPgo+kQwWL2RW+DtRNCBAUHXIfQFgwf0Dm+hMZEw4YBA1yFwf9s84DEg10mBAoC5kTDgcOIXDQIBIA4PAR4g1wsfghBzaWduuvLgin8NAeaO8O2i7fshgwjXIgKDCNcjIIAg1yHTH9Mf0x/tRNDSANMfINMf0//XCgAK+QFAzPkQmiiUXwrbMeHywIffArNQB7Dy0IRRJbry4IVQNrry4Ib4I7vy0IgikvgA3gGkf8jKAMsfAc8Wye1UIJL4D95w2zzYFwIBIBARABm+Xw9qJoQICg65D6AsAgFuEhMCAUgUFQAZrc52omhAIOuQ64X/wAAZrx32omhAEOuQ64WPwAAXsyX7UTQcdch1wsfgABGyYvtRNDXCgCAAAAP27aLt+wL0BCFukmwhjkwCIdc5MHCUIccAs44tAdcoIHYeQ2wg10nACPLgkyDXSsAC8uCTINcdBscSwgBSMLDy0InXTNc5MAGk6GwShAe78uCT10rAAPLgk+1V4tIAAcAAkVvg69csCBQgkXCWAdcsCBwS4lIQseMPINdKGBkaAJYB+kAB+kT4KPpEMFi68uCR7UTQgQFB1xj0BQSdf8jKAEAEgwf0U/Lgi44UA4MH9Fvy4Iwi1woAIW4Bs7Dy0JDiyFADzxYS9ADJ7VQAcjDXLAgkji0h8uCS0gDtRNDSAFETuvLQj1RQMJExnAGBAUDXIdcKAPLgjuLIygBYzxbJ7VST8sCN4gAQk1vbMeHXTNB8Ui06");
+}
+
+} // namespace TW::TheOpenNetwork::tests
+
diff --git a/tests/chains/TheOpenNetwork/TWCoinTypeTests.cpp b/tests/chains/TheOpenNetwork/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..c35df437493
--- /dev/null
+++ b/tests/chains/TheOpenNetwork/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+
+TEST(TWTONCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeTON;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("fJXfn0EVhV09HFuEgUHu4Cchb24nUQtIMwSzmzk2tLs="));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("EQCD39VS5jcptHL8vMjEXrzGaRcCVYto7HUn4bpAOg8xqB2N"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "ton");
+    assertStringsEqual(name, "TON");
+    assertStringsEqual(symbol, "TON");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 9);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainTheOpenNetwork);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(txUrl, "https://tonviewer.com/transaction/fJXfn0EVhV09HFuEgUHu4Cchb24nUQtIMwSzmzk2tLs=");
+    assertStringsEqual(accUrl, "https://tonviewer.com/EQCD39VS5jcptHL8vMjEXrzGaRcCVYto7HUn4bpAOg8xqB2N");
+}
diff --git a/tests/chains/TheOpenNetwork/TWTONAddressConverterTests.cpp b/tests/chains/TheOpenNetwork/TWTONAddressConverterTests.cpp
new file mode 100644
index 00000000000..01113313ce8
--- /dev/null
+++ b/tests/chains/TheOpenNetwork/TWTONAddressConverterTests.cpp
@@ -0,0 +1,131 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include "TrustWalletCore/TWTONAddressConverter.h"
+
+namespace TW::TheOpenNetwork::tests {
+
+TEST(TWTONAddressConverter, GetJettonNotcoinAddress) {
+    auto mainAddress = STRING("UQBjKqthWBE6GEcqb_epTRFrQ1niS6Z1Z1MHMwR-mnAYRoYr");
+    auto addressBocEncoded = WRAPS(TWTONAddressConverterToBoc(mainAddress.get()));
+    assertStringsEqual(addressBocEncoded, "te6cckEBAQEAJAAAQ4AMZVVsKwInQwjlTf71KaItaGs8SXTOrOpg5mCP004DCNAptHQU");
+
+    // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+    // '{"address":"EQAvlWFDxGF2lXm67y4yzC17wYKD9A0guwPkMs1gOsM__NOT","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","te6ccgICAAEAAQAAACQAAABDgAxlVWwrAidDCOVN/vUpoi1oazxJdM6s6mDmYI/TTgMI0A=="]]}'
+
+    // `get_wallet_address` response:
+    auto jettonAddressBocEncoded = STRING("te6cckEBAQEAJAAAQ4AFvT5rqwxcbKfITqnkwL+go4Zi9bulRHAtLt4cjjFdK7B8L+Cq");
+    auto jettonAddress = WRAPS(TWTONAddressConverterFromBoc(jettonAddressBocEncoded.get()));
+    assertStringsEqual(jettonAddress, "UQAt6fNdWGLjZT5CdU8mBf0FHDMXrd0qI4FpdvDkcYrpXV5H");
+}
+
+TEST(TWTONAddressConverter, GetJettonUSDTAddress) {
+    auto mainAddress = STRING("UQBjKqthWBE6GEcqb_epTRFrQ1niS6Z1Z1MHMwR-mnAYRoYr");
+    auto addressBocEncoded = WRAPS(TWTONAddressConverterToBoc(mainAddress.get()));
+    assertStringsEqual(addressBocEncoded, "te6cckEBAQEAJAAAQ4AMZVVsKwInQwjlTf71KaItaGs8SXTOrOpg5mCP004DCNAptHQU");
+
+    // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+    // '{"address":"EQCxE6mUtQJKFnGfaROTKOt1lZbDiiX1kCixRv7Nw2Id_sDs","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","te6ccgICAAEAAQAAACQAAABDgAxlVWwrAidDCOVN/vUpoi1oazxJdM6s6mDmYI/TTgMI0A=="]]}'
+
+    // `get_wallet_address` response:
+    auto jettonAddressBocEncoded = STRING("te6cckEBAQEAJAAAQ4Aed71FEI46jdFXghsGUIG2GIR8wpbQaLzrKNj7BtHOEHBSO5Mf");
+    auto jettonAddress = WRAPS(TWTONAddressConverterFromBoc(jettonAddressBocEncoded.get()));
+    assertStringsEqual(jettonAddress, "UQDzveoohHHUboq8ENgyhA2wxCPmFLaDRedZRsfYNo5wg4TL");
+}
+
+TEST(TWTONAddressConverter, GetJettonStonAddress) {
+    auto mainAddress = STRING("EQATQPeCwtMzQ9u54nTjUNcK4n_0VRSxPOOROLf_IE0OU3XK");
+    auto addressBocEncoded = WRAPS(TWTONAddressConverterToBoc(mainAddress.get()));
+    assertStringsEqual(addressBocEncoded, "te6cckEBAQEAJAAAQ4ACaB7wWFpmaHt3PE6cahrhXE/+iqKWJ5xyJxb/5AmhynDu6Ygj");
+
+    // curl --location 'https://toncenter.com/api/v2/runGetMethod' --header 'Content-Type: application/json' --data \
+    // '{"address":"EQA2kCVNwVsil2EM2mB0SkXytxCqQjS4mttjDpnXmwG9T6bO","method":"get_wallet_address","method":"get_wallet_address","stack":[["tvm.Slice","te6ccgICAAEAAQAAACQAAABDgAxlVWwrAidDCOVN/vUpoi1oazxJdM6s6mDmYI/TTgMI0A=="]]}'
+
+    // `get_wallet_address` response:
+    auto jettonAddressBocEncoded = STRING("te6cckEBAQEAJAAAQ4ALPu0dyA1gHd3r7J1rxlvhXSvT5y3rokMDMiCQ86TsUJDnt69H");
+    auto jettonAddress = WRAPS(TWTONAddressConverterFromBoc(jettonAddressBocEncoded.get()));
+    assertStringsEqual(jettonAddress, "UQBZ92juQGsA7u9fZOteMt8K6V6fOW9dEhgZkQSHnSdihHPH");
+}
+
+TEST(TWTONAddressConverter, FromBocNullAddress) {
+    auto jettonAddressBocEncoded = STRING("te6cckEBAQEAAwAAASCUQYZV");
+    auto jettonAddress = WRAPS(TWTONAddressConverterFromBoc(jettonAddressBocEncoded.get()));
+    assertStringsEqual(jettonAddress, "UQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKZ");
+}
+
+TEST(TWTONAddressConverter, FromBocError) {
+    // No type bit.
+    auto boc1 = STRING("te6cckEBAQEAAwAAAcCO6ba2");
+    ASSERT_EQ(TWTONAddressConverterFromBoc(boc1.get()), nullptr);
+
+    // No res1 and workchain bits.
+    auto boc2 = STRING("te6cckEBAQEAAwAAAaDsenDX");
+    ASSERT_EQ(TWTONAddressConverterFromBoc(boc2.get()), nullptr);
+
+    // Incomplete hash (31 bytes instead of 32).
+    auto boc3 = STRING("te6cckEBAQEAIwAAQYAgQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAUGJnJWk=");
+    ASSERT_EQ(TWTONAddressConverterFromBoc(boc3.get()), nullptr);
+
+    // Expected 267 bits, found 268.
+    auto boc4 = STRING("te6cckEBAQEAJAAAQ4AgQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEBAQEgGG0Gq");
+    ASSERT_EQ(TWTONAddressConverterFromBoc(boc4.get()), nullptr);
+}
+
+TEST(TWTONAddressConverter, ToUserFriendly) {
+    auto rawAddress = "0:8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae";
+    auto bounceable = "EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorkdl";
+    auto nonBounceable = "UQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorhqg";
+    auto bounceableTestnet = "kQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorvzv";
+    auto nonBounceableTestnet = "0QCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorqEq";
+
+    // Raw to user friendly.
+    assertStringsEqual(
+        WRAPS(TWTONAddressConverterToUserFriendly(STRING(rawAddress).get(), true, false)),
+        bounceable
+    );
+    assertStringsEqual(
+        WRAPS(TWTONAddressConverterToUserFriendly(STRING(rawAddress).get(), false, false)),
+        nonBounceable
+    );
+    assertStringsEqual(
+        WRAPS(TWTONAddressConverterToUserFriendly(STRING(rawAddress).get(), true, true)),
+        bounceableTestnet
+    );
+    assertStringsEqual(
+        WRAPS(TWTONAddressConverterToUserFriendly(STRING(rawAddress).get(), false, true)),
+        nonBounceableTestnet
+    );
+
+    // Bounceable to non-bounceable.
+    assertStringsEqual(
+        WRAPS(TWTONAddressConverterToUserFriendly(STRING(bounceable).get(), false, false)),
+        nonBounceable
+    );
+
+    // Non-bounceable to bounceable.
+    assertStringsEqual(
+        WRAPS(TWTONAddressConverterToUserFriendly(STRING(nonBounceable).get(), true, false)),
+        bounceable
+    );
+
+    // Non-bounceable to non-bounceable.
+    assertStringsEqual(
+        WRAPS(TWTONAddressConverterToUserFriendly(STRING(nonBounceable).get(), false, false)),
+        nonBounceable
+    );
+}
+
+TEST(TWTONAddressConverter, ToUserFriendlyError) {
+    // No "0:" prefix.
+    auto invalid1 = STRING("8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae");
+    ASSERT_EQ(TWTONAddressConverterToUserFriendly(invalid1.get(), true, false), nullptr);
+
+    // Too short.
+    auto invalid2 = STRING("EQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsor");
+    ASSERT_EQ(TWTONAddressConverterToUserFriendly(invalid1.get(), false, false), nullptr);
+}
+
+} // namespace TW::TheOpenNetwork::tests
diff --git a/tests/chains/TheOpenNetwork/TWTONMessageSignerTests.cpp b/tests/chains/TheOpenNetwork/TWTONMessageSignerTests.cpp
new file mode 100644
index 00000000000..fd9367dffd7
--- /dev/null
+++ b/tests/chains/TheOpenNetwork/TWTONMessageSignerTests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include "HexCoding.h"
+#include "TrustWalletCore/TWTONMessageSigner.h"
+
+namespace TW::TheOpenNetwork::tests {
+
+TEST(TWTONMessageSigner, SignMessage) {
+    const auto privateKeyBytes = DATA("112d4e2e700a468f1eae699329202f1ee671d6b665caa2d92dea038cf3868c18");
+    const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(privateKeyBytes.get()));
+    const auto message = STRING("Hello world");
+
+    const auto signature = WRAPS(TWTONMessageSignerSignMessage(privateKey.get(), message.get()));
+    assertStringsEqual(signature, "2490fbaa72aec0b77b19162bbbe0b0e3f7afd42cc9ef469f0494cd4a366a4bf76643300cd5991f66bce6006336742b8d1d435d541d244dcc013d428472e89504");
+}
+
+} // namespace TW::TheOpenNetwork::tests
diff --git a/tests/chains/TheOpenNetwork/TWTONWalletTests.cpp b/tests/chains/TheOpenNetwork/TWTONWalletTests.cpp
new file mode 100644
index 00000000000..b346ee5568b
--- /dev/null
+++ b/tests/chains/TheOpenNetwork/TWTONWalletTests.cpp
@@ -0,0 +1,22 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include "HexCoding.h"
+#include "TrustWalletCore/TWTONWallet.h"
+
+namespace TW::TheOpenNetwork::tests {
+
+TEST(TWTONWallet, BuildV4R2StateInit) {
+    auto publicKeyBytes = DATA("f229a9371fa7c2108b3d90ea22c9be705ff5d0cfeaee9cbb9366ff0171579357");
+    auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(publicKeyBytes.get(), TWPublicKeyTypeED25519));
+
+    const int32_t baseWorkchain = 0;
+    const int32_t defaultWalletId = 0x29a9a317;
+    const auto stateInit = WRAPS(TWTONWalletBuildV4R2StateInit(publicKey.get(), baseWorkchain, defaultWalletId));
+    assertStringsEqual(stateInit, "te6cckECFgEAAwQAAgE0AQIBFP8A9KQT9LzyyAsDAFEAAAAAKamjF/IpqTcfp8IQiz2Q6iLJvnBf9dDP6u6cu5Nm/wFxV5NXQAIBIAQFAgFIBgcE+PKDCNcYINMf0x/THwL4I7vyZO1E0NMf0x/T//QE0VFDuvKhUVG68qIF+QFUEGT5EPKj+AAkpMjLH1JAyx9SMMv/UhD0AMntVPgPAdMHIcAAn2xRkyDXSpbTB9QC+wDoMOAhwAHjACHAAuMAAcADkTDjDQOkyMsfEssfy/8ICQoLAubQAdDTAyFxsJJfBOAi10nBIJJfBOAC0x8hghBwbHVnvSKCEGRzdHK9sJJfBeAD+kAwIPpEAcjKB8v/ydDtRNCBAUDXIfQEMFyBAQj0Cm+hMbOSXwfgBdM/yCWCEHBsdWe6kjgw4w0DghBkc3RyupJfBuMNDA0CASAODwBu0gf6ANTUIvkABcjKBxXL/8nQd3SAGMjLBcsCIs8WUAX6AhTLaxLMzMlz+wDIQBSBAQj0UfKnAgBwgQEI1xj6ANM/yFQgR4EBCPRR8qeCEG5vdGVwdIAYyMsFywJQBs8WUAT6AhTLahLLH8s/yXP7AAIAbIEBCNcY+gDTPzBSJIEBCPRZ8qeCEGRzdHJwdIAYyMsFywJQBc8WUAP6AhPLassfEss/yXP7AAAK9ADJ7VQAeAH6APQEMPgnbyIwUAqhIb7y4FCCEHBsdWeDHrFwgBhQBMsFJs8WWPoCGfQAy2kXyx9SYMs/IMmAQPsABgCKUASBAQj0WTDtRNCBAUDXIMgBzxb0AMntVAFysI4jghBkc3Rygx6xcIAYUAXLBVADzxYj+gITy2rLH8s/yYBA+wCSXwPiAgEgEBEAWb0kK29qJoQICga5D6AhhHDUCAhHpJN9KZEM5pA+n/mDeBKAG3gQFImHFZ8xhAIBWBITABG4yX7UTQ1wsfgAPbKd+1E0IEBQNch9AQwAsjKB8v/ydABgQEI9ApvoTGACASAUFQAZrc52omhAIGuQ64X/wAAZrx32omhAEGuQ64WPwEXtMkg=");
+}
+
+} // namespace TW::TheOpenNetwork::tests
diff --git a/tests/chains/Theta/SignerTests.cpp b/tests/chains/Theta/SignerTests.cpp
new file mode 100644
index 00000000000..295ee5fc98d
--- /dev/null
+++ b/tests/chains/Theta/SignerTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Theta/Signer.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Theta {
+
+using boost::multiprecision::uint256_t;
+
+TEST(Signer, Sign) {
+    const auto pkFrom =
+        PrivateKey(parse_hex("0x93a90ea508331dfdf27fb79757d4250b4e84954927ba0073cd67454ac432c737"));
+    const auto from = Ethereum::Address("0x2E833968E5bB786Ae419c4d13189fB081Cc43bab");
+    const auto to = Ethereum::Address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
+    auto transaction = Transaction(from, to, 10, 20, 1);
+
+    auto signer = Signer("privatenet");
+    auto signature = signer.sign(pkFrom, transaction);
+    transaction.setSignature(from, signature);
+
+    ASSERT_EQ(hex(signature), "5190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8"
+                              "fe9134ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501");
+    ASSERT_EQ(hex(transaction.encodePayload()),
+              "02f887c78085e8d4a51000f863f861942e833968e5bb786ae419c4d13189fb081cc43babc70a85e8d4a5"
+              "101401b8415190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134"
+              "ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501d9d8949f1233798e905e17356007"
+              "1255140b4a8abd3ec6c20a14");
+}
+
+} // namespace TW::Theta
diff --git a/tests/chains/Theta/TWAnySignerTests.cpp b/tests/chains/Theta/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..07d544c0a50
--- /dev/null
+++ b/tests/chains/Theta/TWAnySignerTests.cpp
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Theta.pb.h"
+#include "uint256.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Theta::tests {
+
+TEST(TWAnySignerTheta, Sign) {
+    auto privateKey = parse_hex("93a90ea508331dfdf27fb79757d4250b4e84954927ba0073cd67454ac432c737");
+
+    Proto::SigningInput input;
+    input.set_chain_id("privatenet");
+    input.set_to_address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
+    auto amount = store(uint256_t(10));
+    input.set_theta_amount(amount.data(), amount.size());
+    auto tfuelAmount = store(uint256_t(20));
+    input.set_tfuel_amount(tfuelAmount.data(), tfuelAmount.size());
+    auto fee = store(uint256_t(1000000000000));
+    input.set_fee(fee.data(), fee.size());
+    input.set_sequence(1);
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTheta);
+
+    ASSERT_EQ(hex(output.encoded()), "02f887c78085e8d4a51000f863f861942e833968e5bb786ae419c4d13189fb081cc43babc70a85e8d4a5101401b8415190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501d9d8949f1233798e905e173560071255140b4a8abd3ec6c20a14");
+}
+
+} // namespace TW::Thetha::tests
diff --git a/tests/chains/Theta/TWCoinTypeTests.cpp b/tests/chains/Theta/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..595dfe4172e
--- /dev/null
+++ b/tests/chains/Theta/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWThetaCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTheta));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTheta, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTheta, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTheta));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTheta));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTheta), 18);
+    ASSERT_EQ(TWBlockchainTheta, TWCoinTypeBlockchain(TWCoinTypeTheta));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTheta));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTheta));
+    assertStringsEqual(symbol, "THETA");
+    assertStringsEqual(txUrl, "https://explorer.thetatoken.org/txs/t123");
+    assertStringsEqual(accUrl, "https://explorer.thetatoken.org/account/a12");
+    assertStringsEqual(id, "theta");
+    assertStringsEqual(name, "Theta");
+}
diff --git a/tests/chains/Theta/TransactionCompilerTests.cpp b/tests/chains/Theta/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..fd35e22f406
--- /dev/null
+++ b/tests/chains/Theta/TransactionCompilerTests.cpp
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+#include "uint256.h"
+
+#include "proto/Theta.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(ThetaCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeTheta;
+    /// Step 1: Prepare transaction input (protobuf)
+    const auto pkFrom =
+        PrivateKey(parse_hex("0x93a90ea508331dfdf27fb79757d4250b4e84954927ba0073cd67454ac432c737"));
+    const auto publicKey = pkFrom.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    TW::Theta::Proto::SigningInput input;
+    input.set_chain_id("privatenet");
+    input.set_to_address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
+    auto amount = store(uint256_t(10));
+    input.set_theta_amount(amount.data(), amount.size());
+    auto tfuelAmount = store(uint256_t(20));
+    input.set_tfuel_amount(tfuelAmount.data(), tfuelAmount.size());
+    auto fee = store(uint256_t(1000000000000));
+    input.set_fee(fee.data(), fee.size());
+    input.set_sequence(1);
+    std::string pubkeyStr(publicKey.bytes.begin(), publicKey.bytes.end());
+    input.set_public_key(pubkeyStr);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, inputStrData);
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(preSigningOutput.data_hash()),
+              "2dc419e9919e65f129453419dc72a6bee99b2281dfddf754807a5c212ae35678");
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData = publicKey.bytes;
+    const auto signature =
+        parse_hex("5190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134ccdef0"
+                  "53ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preSigningOutput.data_hash())));
+
+    /// Step 3: Compile transaction info
+    auto expectedTx = "02f887c78085e8d4a51000f863f861942e833968e5bb786ae419c4d13189fb081cc43babc70a"
+                      "85e8d4a5101401b8415190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb"
+                      "7fff267cb8fe9134ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501d9d8"
+                      "949f1233798e905e173560071255140b4a8abd3ec6c20a14";
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKeyData});
+
+    {
+        Theta::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+        // keys were not used anywhere up to this point.
+        Theta::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(pkFrom.bytes.data(), pkFrom.bytes.size());
+
+        Theta::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), expectedTx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKeyData});
+        Theta::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+}
diff --git a/tests/chains/Theta/TransactionTests.cpp b/tests/chains/Theta/TransactionTests.cpp
new file mode 100644
index 00000000000..7cebeb254b2
--- /dev/null
+++ b/tests/chains/Theta/TransactionTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Theta/Transaction.h"
+
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Theta::tests {
+
+TEST(ThetaTransaction, EncodePayload) {
+    const auto from = Ethereum::Address("0x2E833968E5bB786Ae419c4d13189fB081Cc43bab");
+    const auto to = Ethereum::Address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
+    auto transaction = Transaction(from, to, 10, 20, 1);
+    ASSERT_EQ(hex(transaction.encodePayload()),
+              "02f843c78085e8d4a51000e0df942e833968e5bb786ae419c4d13189fb081cc43babc70a85e8d4a51014"
+              "0180d9d8949f1233798e905e173560071255140b4a8abd3ec6c20a14");
+}
+
+TEST(ThetaTransaction, EncodePayloadWithSignature) {
+    const auto from = Ethereum::Address("0x2E833968E5bB786Ae419c4d13189fB081Cc43bab");
+    const auto to = Ethereum::Address("0x9F1233798E905E173560071255140b4A8aBd3Ec6");
+    auto transaction = Transaction(from, to, 10, 20, 1);
+    transaction.setSignature(
+        from, parse_hex("5190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134"
+                        "ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501"));
+    ASSERT_EQ(hex(transaction.encodePayload()),
+              "02f887c78085e8d4a51000f863f861942e833968e5bb786ae419c4d13189fb081cc43babc70a85e8d4a5"
+              "101401b8415190868498d587d074d57298f41853d0109d997f15ddf617f471eb8cbb7fff267cb8fe9134"
+              "ccdef053ec7cabd18070325c9c436efe1abbacd14eb7561d3fc10501d9d8949f1233798e905e17356007"
+              "1255140b4a8abd3ec6c20a14");
+}
+
+} // namespace TW::Theta::tests
diff --git a/tests/chains/ThetaFuel/TWAnySignerTests.cpp b/tests/chains/ThetaFuel/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..6650ab26722
--- /dev/null
+++ b/tests/chains/ThetaFuel/TWAnySignerTests.cpp
@@ -0,0 +1,77 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+#include "uint256.h"
+#include "proto/Ethereum.pb.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::ThetaFuel::tests {
+
+/// Successfully broadcasted:
+/// https://explorer.thetatoken.org/txs/0x0e7b0642f89855bf591d094cb7648c325fcef669add66dd273c4e16170fbca01
+TEST(TWAnySignerThetaFuel, TfuelTransfer) {
+    auto chainId = store(uint256_t(361));
+    auto nonce = store(uint256_t(5));
+    auto gasLimit = store(uint256_t(79883));
+    auto gasPrice = store(uint256_t(4000000000000)); // 0.000004
+    auto toAddress = "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0";
+    auto amount = uint256_t(100000000000000000); // 0.1
+    auto amountData = store(amount);
+    auto key = parse_hex("0xc99dd0045dff0c1594c383658c07b4b75f39b90af7f8b592d1a7b461e03cc34b");
+
+    Ethereum::Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_to_address(toAddress);
+    input.set_private_key(key.data(), key.size());
+    auto &transfer = *input.mutable_transaction()->mutable_transfer();
+    transfer.set_amount(amountData.data(), amountData.size());
+
+    // sign test
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeThetaFuel);
+
+    ASSERT_EQ(hex(output.encoded()),
+              "f870058603a3529440008301380b948dbd6c7ede90646a61bbc649831b7c298bfd37a088016345785d8a0000808202f5a0b1857121d66a484798ad0cd0fed0e205ee2e1f7f7f60b45cf84a2dbeb25c8c9fa06ffedd5df33a38f7de958c2800482432b6a8546913fc145f2615cc93f7a7647d");
+}
+
+/// Successfully broadcasted:
+/// https://explorer.thetatoken.org/txs/0x2c38163d84f031d4276dedc4e4424a6443208f7b22e1bfe6fd2ba0f607af5100
+TEST(TWAnySignerThetaFuel, TdropTokenTransfer) {
+    auto chainId = store(uint256_t(361));
+    auto nonce = store(uint256_t(4));
+    auto gasLimit = store(uint256_t(79883));
+    auto gasPrice = store(uint256_t(4000000000000)); // 0.000004
+    auto toAddress = "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0";
+    auto token = "0x1336739b05c7ab8a526d40dcc0d04a826b5f8b03"; // TDROP
+    auto amount = uint256_t(4000000000000000000); // 4 TDROP
+    auto amountData = store(amount);
+    auto key = parse_hex("0xc99dd0045dff0c1594c383658c07b4b75f39b90af7f8b592d1a7b461e03cc34b");
+
+    Ethereum::Proto::SigningInput input;
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_nonce(nonce.data(), nonce.size());
+    input.set_gas_limit(gasLimit.data(), gasLimit.size());
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_to_address(token);
+    input.set_private_key(key.data(), key.size());
+    auto &erc20 = *input.mutable_transaction()->mutable_erc20_transfer();
+    erc20.set_to(toAddress);
+    erc20.set_amount(amountData.data(), amountData.size());
+
+    // sign test
+    Ethereum::Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeThetaFuel);
+
+    ASSERT_EQ(hex(output.encoded()),
+              "f8ad048603a3529440008301380b941336739b05c7ab8a526d40dcc0d04a826b5f8b0380b844a9059cbb0000000000000000000000008dbd6c7ede90646a61bbc649831b7c298bfd37a00000000000000000000000000000000000000000000000003782dace9d9000008202f6a03c1d37f5fc6adaa018c4ba41e13b9983e91500e7cfa8bc3731bb6365dd28d61ba07500748e46febcb781d6f37dad2479e1bd172479d108614c986122e1c6a4441e");
+}
+
+} // namespace TW::ThetaFuel
diff --git a/tests/chains/ThetaFuel/TWCoinTypeTests.cpp b/tests/chains/ThetaFuel/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..c00d89bc9e6
--- /dev/null
+++ b/tests/chains/ThetaFuel/TWCoinTypeTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWThetaFuelCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeThetaFuel;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xdb1c1c4e06289a4fc71b98ced218242d4f4a54a09987791a6a53a5260c053555"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xa144e6a98b967e585b214bfa7f6692af81987e5b"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "tfuelevm");
+    assertStringsEqual(name, "Theta Fuel");
+    assertStringsEqual(symbol, "TFUEL");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "361");
+    assertStringsEqual(txUrl, "https://explorer.thetatoken.org/tx/0xdb1c1c4e06289a4fc71b98ced218242d4f4a54a09987791a6a53a5260c053555");
+    assertStringsEqual(accUrl, "https://explorer.thetatoken.org/account/0xa144e6a98b967e585b214bfa7f6692af81987e5b");
+}
diff --git a/tests/chains/ThunderToken/TWCoinTypeTests.cpp b/tests/chains/ThunderToken/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..7534dd9a20f
--- /dev/null
+++ b/tests/chains/ThunderToken/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWThunderTokenCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeThunderCore));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeThunderCore, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeThunderCore, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeThunderCore));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeThunderCore));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeThunderCore), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeThunderCore));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeThunderCore));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeThunderCore));
+    assertStringsEqual(symbol, "TT");
+    assertStringsEqual(txUrl, "https://scan.thundercore.com/transactions/t123");
+    assertStringsEqual(accUrl, "https://scan.thundercore.com/address/a12");
+    assertStringsEqual(id, "thundertoken");
+    assertStringsEqual(name, "ThunderCore");
+}
diff --git a/tests/chains/Tron/AddressTests.cpp b/tests/chains/Tron/AddressTests.cpp
new file mode 100644
index 00000000000..7489812ddca
--- /dev/null
+++ b/tests/chains/Tron/AddressTests.cpp
@@ -0,0 +1,43 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Tron/Address.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Tron {
+
+TEST(TronAddress, FromPublicKey) {
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    const auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+
+    const auto privateKey2 = PrivateKey(parse_hex("BE88DF1D0BF30A923CB39C3BB953178BAAF3726E8D3CE81E7C8462E046E0D835"));
+    const auto publicKey2 = privateKey2.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    const auto address2 = Address(publicKey2);
+    ASSERT_EQ(address2.string(), "THRF3GuPnvvPzKoaT8pJex5XHmo8NNbCb3");
+
+    const auto privateKey3 = PrivateKey(parse_hex("BE88DF1D0BF30A923CB39C3BB953178BAAF3726E8D3CE81E7C8462E046E0D835"));
+    const auto publicKey3 = privateKey3.getPublicKey(TWPublicKeyTypeED25519);
+    EXPECT_ANY_THROW(new Address(publicKey3));
+}
+
+TEST(TronAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid(std::string("abc")));
+    ASSERT_FALSE(Address::isValid(std::string("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed")));
+    ASSERT_FALSE(Address::isValid(std::string("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")));
+    ASSERT_FALSE(Address::isValid(std::string("2MegQ6oqSda2tTagdEzBA")));
+    ASSERT_TRUE(Address::isValid(std::string("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC")));
+}
+
+TEST(TronAddress, InitWithString) {
+    const auto address = Address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+
+    ASSERT_EQ(address.string(), "TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+}
+
+} // namespace TW::Tron
diff --git a/tests/chains/Tron/SerializationTests.cpp b/tests/chains/Tron/SerializationTests.cpp
new file mode 100644
index 00000000000..ef321093f73
--- /dev/null
+++ b/tests/chains/Tron/SerializationTests.cpp
@@ -0,0 +1,207 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "proto/Tron.pb.h"
+#include "Tron/Signer.h"
+#include "PrivateKey.h"
+#include "HexCoding.h"
+#include "uint256.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Tron {
+    TEST(TronSerialization, TransferAsset) {
+        auto input = Proto::SigningInput();
+        auto& transaction = *input.mutable_transaction();
+
+        auto& transfer = *transaction.mutable_transfer_asset();
+        transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+        transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+        transfer.set_amount(4);
+        transfer.set_asset_name("1000959");
+
+        transaction.set_timestamp(1539295479000);
+        transaction.set_expiration(1541890116000 + 10 * 60 * 60 * 1000);
+
+        auto& blockHeader = *transaction.mutable_block_header();
+        blockHeader.set_timestamp(1541890116000);
+        const auto txTrieRoot = parse_hex("845ab51bf63c2c21ee71a4dc0ac3781619f07a7cd05e1e0bd8ba828979332ffa");
+        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+        const auto parentHash = parse_hex("00000000003cb800a7e69e9144e3d16f0cf33f33a95c7ce274097822c67243c1");
+        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+        blockHeader.set_number(3979265);
+        const auto witnessAddress = parse_hex("41b487cdc02de90f15ac89a68c82f44cbfe3d915ea");
+        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+        blockHeader.set_version(3);
+
+        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        const auto output = Signer::sign(input);
+
+        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.TransferAssetContract","value":{"amount":4,"asset_name":"31303030393539","owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db","to_address":"41521ea197907927725ef36d70f25f850d1659c7c7"}},"type":"TransferAssetContract"}],"expiration":1541926116000,"ref_block_bytes":"b801","ref_block_hash":"0e2bc08d550f5f58","timestamp":1539295479000},"signature":["77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00"],"txID":"546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb"})");
+    }
+
+    TEST(TronSerialization, SignVoteAsset) {
+        auto input = Proto::SigningInput();
+        auto& transaction = *input.mutable_transaction();
+
+        auto& vote = *transaction.mutable_vote_asset();
+        vote.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+        vote.add_vote_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+        vote.set_support(true);
+        vote.set_count(1);
+
+        transaction.set_timestamp(1539295479000);
+        transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+        auto& blockHeader = *transaction.mutable_block_header();
+        blockHeader.set_timestamp(1539295479000);
+        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+        blockHeader.set_number(3111739);
+        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+        blockHeader.set_version(3);
+
+        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        const auto output = Signer::sign(input);
+
+        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.VoteAssetContract","value":{"count":1,"owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db","support":true,"vote_address":["41521ea197907927725ef36d70f25f850d1659c7c7"]}},"type":"VoteAssetContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["501e04b08f359116a26d9ec784abc50830f92a9dc05d2c1aceefe0eba79466d2730b63b6739edf0f1f1972181618b201ce0b4167d14a66abf40eba4097c39ec400"],"txID":"59b5736fb9756124f9470e4fadbcdafdc8c970da7157fa0ad34a41559418bf0a"})");
+    }
+
+    TEST(TronSerialization, SignVoteWitness) {
+        auto input = Proto::SigningInput();
+        auto& transaction = *input.mutable_transaction();
+
+        auto& vote_witness = *transaction.mutable_vote_witness();
+        vote_witness.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+        vote_witness.set_support(true);
+
+        auto& vote = *vote_witness.add_votes();
+        vote.set_vote_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+        vote.set_vote_count(3);
+
+        transaction.set_timestamp(1539295479000);
+        transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+        auto& blockHeader = *transaction.mutable_block_header();
+        blockHeader.set_timestamp(1539295479000);
+        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+        blockHeader.set_number(3111739);
+        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+        blockHeader.set_version(3);
+
+        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        const auto output = Signer::sign(input);
+
+        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.VoteWitnessContract","value":{"owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db","support":true,"votes":[{"vote_address":"41521ea197907927725ef36d70f25f850d1659c7c7","vote_count":3}]}},"type":"VoteWitnessContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["79ec1073ae1319ef9303a2f5a515876cfd67f8f0e155bdbde1115d391c05358a3c32f148bfafacf07e1619aaed728d9ffbc2c7e4a5046003c7b74feb86fc68e400"],"txID":"3f923e9dd9571a66624fafeda27baa3e00aba1709d3fdc5c97c77b81fda18c1f"})");
+    }
+
+    TEST(TronSerialization, SignTriggerSmartContract) {
+        auto input = Proto::SigningInput();
+        auto data = parse_hex("736f6d652064617461");
+        auto& transaction = *input.mutable_transaction();
+        auto& trigger_contract = *transaction.mutable_trigger_smart_contract();
+        trigger_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+        trigger_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+        trigger_contract.set_call_value(0);
+        trigger_contract.set_call_token_value(10000);
+        trigger_contract.set_token_id(1);
+        trigger_contract.set_data(data.data(), data.size());
+
+        transaction.set_timestamp(1539295479000);
+        transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+        auto& blockHeader = *transaction.mutable_block_header();
+        blockHeader.set_timestamp(1539295479000);
+        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+        blockHeader.set_number(3111739);
+        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+        blockHeader.set_version(3);
+
+        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        const auto output = Signer::sign(input);
+
+        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.TriggerSmartContract","value":{"call_token_value":10000,"contract_address":"41521ea197907927725ef36d70f25f850d1659c7c7","data":"736f6d652064617461","owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db","token_id":1}},"type":"TriggerSmartContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["21a99aafeabdddfdfae86538df048d120a83eb36bbcf5656595919ba6afddacd0a07d0ba051ae80337613174b109f36cb583b6e46ee5aecf6ffe3392fdbb8a2a01"],"txID":"9927d3daae10ad001b25ef3c1bb03073c928cc0e0823f6f3ce404c2b03ce3570"})");
+    }
+
+    TEST(TronSerialization, SignTransferTrc20Contract) {
+        auto input = Proto::SigningInput();
+        auto& transaction = *input.mutable_transaction();
+        auto& transfer_contract = *transaction.mutable_transfer_trc20_contract();
+        transfer_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+        transfer_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+        transfer_contract.set_to_address("TW1dU4L3eNm7Lw8WvieLKEHpXWAussRG9Z");
+        Data amount = store(uint256_t(1000));
+        transfer_contract.set_amount(std::string(amount.begin(), amount.end()));
+
+        transaction.set_timestamp(1539295479000);
+
+        auto& blockHeader = *transaction.mutable_block_header();
+        blockHeader.set_timestamp(1539295479000);
+        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+        blockHeader.set_number(3111739);
+        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+        blockHeader.set_version(3);
+
+        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        const auto output = Signer::sign(input);
+
+        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.TriggerSmartContract","value":{"contract_address":"41521ea197907927725ef36d70f25f850d1659c7c7","data":"a9059cbb000000000000000000000041dbd7c53729b3310e1843083000fa84abad99696100000000000000000000000000000000000000000000000000000000000003e8","owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db"}},"type":"TriggerSmartContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["bec790877b3a008640781e3948b070740b1f6023c29ecb3f7b5835433c13fc5835e5cad3bd44360ff2ddad5ed7dc9d7dee6878f90e86a40355b7697f5954b88c01"],"txID":"0d644290e3cf554f6219c7747f5287589b6e7e30e1b02793b48ba362da6a5058"})");
+    }
+
+    TEST(TronSerialization, SignTransferTrc20Contract_LargeAmount) {
+        auto input = Proto::SigningInput();
+        auto& transaction = *input.mutable_transaction();
+        auto& transfer_contract = *transaction.mutable_transfer_trc20_contract();
+        transfer_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+        transfer_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+        transfer_contract.set_to_address("TW1dU4L3eNm7Lw8WvieLKEHpXWAussRG9Z");
+        Data amount = store(uint256_t("10000000000000000000000")); // over 64 bits, corresponds to 10000 in case of 18 decimals
+        transfer_contract.set_amount(std::string(amount.begin(), amount.end()));
+
+        transaction.set_timestamp(1539295479000);
+
+        auto& blockHeader = *transaction.mutable_block_header();
+        blockHeader.set_timestamp(1539295479000);
+        const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+        blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+        const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+        blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+        blockHeader.set_number(3111739);
+        const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+        blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+        blockHeader.set_version(3);
+
+        const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+        input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+        const auto output = Signer::sign(input);
+
+        ASSERT_EQ(output.json(), R"({"raw_data":{"contract":[{"parameter":{"type_url":"type.googleapis.com/protocol.TriggerSmartContract","value":{"contract_address":"41521ea197907927725ef36d70f25f850d1659c7c7","data":"a9059cbb000000000000000000000041dbd7c53729b3310e1843083000fa84abad99696100000000000000000000000000000000000000000000021e19e0c9bab2400000","owner_address":"415cd0fb0ab3ce40f3051414c604b27756e69e43db"}},"type":"TriggerSmartContract"}],"expiration":1539331479000,"ref_block_bytes":"7b3b","ref_block_hash":"b21ace8d6ac20e7e","timestamp":1539295479000},"signature":["8207cbae6aff799cfefa1ab4d8a0c52b6a59be43491bd25b4f03754f0e8115b006b5f1393a3934ec3489f5d3c272a7af42658bdc165dc632b36114bd3180da2e00"],"txID":"774422d8d205760876496f22b7d4395cfceda03f139b8362a3693f1f405f0c36"})");
+    }
+}
diff --git a/tests/chains/Tron/SignerTests.cpp b/tests/chains/Tron/SignerTests.cpp
new file mode 100644
index 00000000000..b62ac222b73
--- /dev/null
+++ b/tests/chains/Tron/SignerTests.cpp
@@ -0,0 +1,552 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/Address.h"
+#include "Tron/Address.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "uint256.h"
+#include "proto/Tron.pb.h"
+#include "Tron/Signer.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Tron {
+
+TEST(TronSigner, SignDirectTransferAsset) {
+    auto input = Proto::SigningInput();
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    input.set_txid("546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb");
+    const auto output = Signer::sign(input);
+    ASSERT_EQ(hex(output.id()), "546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb");
+    ASSERT_EQ(hex(output.signature()), "77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00");
+}
+
+TEST(TronSigner, SignTransferAsset) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& transfer = *transaction.mutable_transfer_asset();
+    transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    transfer.set_amount(4);
+    transfer.set_asset_name("1000959");
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1541890116000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1541890116000);
+    const auto txTrieRoot = parse_hex("845ab51bf63c2c21ee71a4dc0ac3781619f07a7cd05e1e0bd8ba828979332ffa");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000003cb800a7e69e9144e3d16f0cf33f33a95c7ce274097822c67243c1");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3979265);
+    const auto witnessAddress = parse_hex("41b487cdc02de90f15ac89a68c82f44cbfe3d915ea");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb");
+    ASSERT_EQ(hex(output.signature()), "77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00");
+}
+
+TEST(TronSigner, SignTransfer) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& transfer = *transaction.mutable_transfer();
+    transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    transfer.set_amount(2000000);
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "dc6f6d9325ee44ab3c00528472be16e1572ab076aa161ccd12515029869d0451");
+    ASSERT_EQ(hex(output.signature()), "ede769f6df28aefe6a846be169958c155e23e7e5c9621d2e8dce1719b4d952b63e8a8bf9f00e41204ac1bf69b1a663dacdf764367e48e4a5afcd6b055a747fb200");
+}
+
+TEST(TronSigner, SignTransferWithMemo) {
+    // Successfully broadcasted https://tronscan.org/#/transaction/20321755964d6ec5bcfc9ebfb15faeb043787ae599fff44442962e12e1c357f1
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& transfer = *transaction.mutable_transfer();
+    transfer.set_owner_address("TFnYQCt892UNjn67pjAULTSTkB7YvqsnPp");
+    transfer.set_to_address("TBUCzgc29vykkvFaEG2mgRtxKvaKe6skwX");
+    transfer.set_amount(100000);
+
+    transaction.set_timestamp(1730827017000);
+    transaction.set_expiration(1730827017000 + 10 * 60 * 60 * 1000);
+    transaction.set_memo("Test memo");
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1730827017000);
+    const auto txTrieRoot = parse_hex("a94f115089893f37336baf32dbf6cb7d06adc13cf6bf046d9bc22748bd72e7a6");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("0000000003fa27db7d67f93920f64733532412ab6a71eb4089dc48c8ff5e182c");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(66725852);
+    const auto witnessAddress = parse_hex("4167e39013be3cdd3814bed152d7439fb5b6791409");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(30);
+
+    const auto privateKey = PrivateKey(parse_hex("7c2108a30f6f69f8dce72a7df897eabadfe9810eee6976b43bdf8c0b0d35337d"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    EXPECT_EQ(hex(output.id()), "20321755964d6ec5bcfc9ebfb15faeb043787ae599fff44442962e12e1c357f1");
+    EXPECT_EQ(hex(output.signature()), "6fcee79c61f660ec689299f77924f32b5020b4c41593056052ef07d640cc799325103fab130c8691e8a224c96cd0704a698ac356ff789a543c284605668bf38000");
+}
+
+TEST(TronSigner, SignFreezeBalanceV2) {
+    // Successfully broadcasted https://nile.tronscan.org/#/transaction/3a46321487ce1fd115da38b3431006ea529f65ef2507f19233f5a23c05abd01d
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& freeze = *transaction.mutable_freeze_balance_v2();
+    freeze.set_owner_address("TWWb9EjUWai17YEVB7FR8hreupYJKG9sMR");
+    freeze.set_frozen_balance(10000000);
+    freeze.set_resource("ENERGY");
+
+    transaction.set_timestamp(1676983541337);
+    transaction.set_expiration(1676983599000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1676983485000);
+    const auto txTrieRoot = parse_hex("9b54db7f84bd19bbad9ff1fccef894c1aade6879450e9e9e2accec751eaa1f52");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000020cd4c13a67497a3a433a3105bc5a73a041ee3da98407d5a2a2bf1b");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(34395330);
+    const auto witnessAddress = parse_hex("4150d3765e4e670727ebac9d5b598f74b75a3d54a7");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(26);
+
+    const auto privateKey = PrivateKey(parse_hex("75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "3a46321487ce1fd115da38b3431006ea529f65ef2507f19233f5a23c05abd01d");
+    ASSERT_EQ(hex(output.signature()), "d4b539a389f6721b4e9d0eb9f39b62a539069060e1af2a118f06b81737ad9cdb49d5b4fda85f10603012f8de3996da2a1234c21d74ac6ea5e60217d3c10b630900");
+}
+
+TEST(TronSigner, WithdrawExpireUnfreezeContract) {
+    // Successfully broadcasted https://nile.tronscan.org/#/transaction/65ff34192eebda9ba7013771ff2da1010615e348b70c046647f41afe865f00eb
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& freeze = *transaction.mutable_withdraw_expire_unfreeze();
+    freeze.set_owner_address("TWWb9EjUWai17YEVB7FR8hreupYJKG9sMR");
+
+    transaction.set_timestamp(1677574466457);
+    transaction.set_expiration(1677574524000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1677574410000);
+    const auto txTrieRoot = parse_hex("0000000000000000000000000000000000000000000000000000000000000000");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000020fce45738ef00be07c350c03d027851308bc19d61c32312c673d3d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(34590278);
+    const auto witnessAddress = parse_hex("41e7860196ad5b5718c1d6326babab039b70b8c1cd");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(27);
+
+    const auto privateKey = PrivateKey(parse_hex("75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "65ff34192eebda9ba7013771ff2da1010615e348b70c046647f41afe865f00eb");
+    ASSERT_EQ(hex(output.signature()), "ef0361248c118b8afae9c4c8e6dfad1e63eec4fb6c182ae369fa3bbecc2ac29a292838949ad74300b2b7322a110ffd4458224e283181cf6d64df0324b068bb0001");
+}
+
+TEST(TronSigner, SignUnFreezeBalanceV2) {
+    // Successfully broadcasted https://nile.tronscan.org/#/transaction/3070adc1743e6fdd20e04a749cc2af691ca26d2ce70e40cc0886be03595f9eeb
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& freeze = *transaction.mutable_unfreeze_balance_v2();
+    freeze.set_owner_address("TWWb9EjUWai17YEVB7FR8hreupYJKG9sMR");
+    freeze.set_unfreeze_balance(510000000);
+    freeze.set_resource("ENERGY");
+
+    transaction.set_timestamp(1676992267490);
+    transaction.set_expiration(1676992326000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1676992212000);
+    const auto txTrieRoot = parse_hex("4b1edc58d14a5c60c083365d8b77771ba626394b445c7a7b8b5d67330bb6c92d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000020ce000354fbb346d676de268b3f83124381f8496835afe88da4a01");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(34398209);
+    const auto witnessAddress = parse_hex("4194a21bec5d0e1dde2151475f72ed158a87eb4817");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(26);
+
+    const auto privateKey = PrivateKey(parse_hex("75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "3070adc1743e6fdd20e04a749cc2af691ca26d2ce70e40cc0886be03595f9eeb");
+    ASSERT_EQ(hex(output.signature()), "10bc05c47102f1db1a3a4c0b4a6aba028d5a35dda4e505563c3f0ccf95a562cf18b53f7f7053c485299cfc599a432d1f0ee5554a56cd5981ccfff31d79b9868b00");
+}
+
+TEST(TronSigner, DelegateResourceContract) {
+    // Successfully broadcasted https://nile.tronscan.org/#/transaction/ceabcd0f105854c13aae12ba35c0766945713c29cee540be1239bb0f1f0cde2c
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& freeze = *transaction.mutable_delegate_resource();
+    freeze.set_owner_address("TWWb9EjUWai17YEVB7FR8hreupYJKG9sMR");
+    freeze.set_receiver_address("TPFfHr1CWfTcS9eugQXQmvqHNGufnjxjXP");
+    freeze.set_balance(68000000);
+    freeze.set_resource("ENERGY");
+
+    transaction.set_timestamp(1676991607274);
+    transaction.set_expiration(1676991660000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1676991546000);
+    const auto txTrieRoot = parse_hex("0000000000000000000000000000000000000000000000000000000000000000");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000020cdf260ff2357d814141106c375c101913c933c2b5c31a390db7fc");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(34397991);
+    const auto witnessAddress = parse_hex("417d3601dbd9d033b034c154868acc2904d9c45565");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(26);
+
+    const auto privateKey = PrivateKey(parse_hex("75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "ceabcd0f105854c13aae12ba35c0766945713c29cee540be1239bb0f1f0cde2c");
+    ASSERT_EQ(hex(output.signature()), "664500a76466497a442cecc0e9282a9234483f047c12a997b6206d7f6a9030c70b700c879d7948c4cbdfe339c2c81a29dea18e00e9916504196c1b20cf045ca300");
+}
+
+TEST(TronSigner, UnDelegateResourceContract) {
+    // Successfully broadcasted https://nile.tronscan.org/#/transaction/3609519cc700cf2446b5e048864abc4b45e2ba6b7f9f8890d471ba2876599d3b
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& freeze = *transaction.mutable_undelegate_resource();
+    freeze.set_owner_address("TWWb9EjUWai17YEVB7FR8hreupYJKG9sMR");
+    freeze.set_receiver_address("TPFfHr1CWfTcS9eugQXQmvqHNGufnjxjXP");
+    freeze.set_balance(68000000);
+    freeze.set_resource("ENERGY");
+
+    transaction.set_timestamp(1676992063012);
+    transaction.set_expiration(1676992122000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1676992008000);
+    const auto txTrieRoot = parse_hex("85a47017a4380e92d09bac0f8991031e8de13b8b65767a6f5372d3f0992eabcd");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000020cdfbe4d7f36fcbb3d96dd634987b897eaf885001dd62fd92eb263");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(34398143);
+    const auto witnessAddress = parse_hex("4196409f85790883057edf03286d08e4aa608c0d0a");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(26);
+
+    const auto privateKey = PrivateKey(parse_hex("75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "3609519cc700cf2446b5e048864abc4b45e2ba6b7f9f8890d471ba2876599d3b");
+    ASSERT_EQ(hex(output.signature()), "b08e32a704d5a366df499d283d407c428dd50e60665f54ecf967226b75bec37157e6bc23312af07fad9dd3551cd668ce027cc280932fd4772af89d6f0fecf11900");
+}
+
+TEST(TronSigner, SignFreezeBalance) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& freeze = *transaction.mutable_freeze_balance();
+    freeze.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    freeze.set_receiver_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    freeze.set_frozen_duration(1000000);
+    freeze.set_frozen_duration(100);
+    freeze.set_resource("ENERGY");
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "d314967bc1d153d649d9f54a1cc78033f0d696a58ff6922f490ddaec82558c83");
+    ASSERT_EQ(hex(output.signature()), "aa7cf79fb1692ff432a1a3e520be3355c3e8168c5fa22f6e3b96c2a9f2e2827b49d67d5e6eea5c7e7cf872047d422ce5d4d149c4df752b176d13f8f48920271201");
+}
+
+TEST(TronSigner, SignUnFreezeBalance) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& unfreeze = *transaction.mutable_unfreeze_balance();
+    unfreeze.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    unfreeze.set_receiver_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    unfreeze.set_resource("ENERGY");
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "c5bd624bb53fed8ce4a7361475263b3a91ae71ef389630e0b3b8693c8c56d7a1");
+    ASSERT_EQ(hex(output.signature()), "4b4b12b5fd091d5343335f14ac90bf23ea9a8167d648dd9d10d00c9c9b24731c484937bf133e5010f0338fb70a679a9a2eca8b945574005bc4015b419a68897300");
+}
+
+TEST(TronSigner, SignUnFreezeAsset) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& unfreeze = *transaction.mutable_unfreeze_asset();
+    unfreeze.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "432bd5cf77ff134787712724709a672fc6e51763de00292438db02d23931e13d");
+    ASSERT_EQ(hex(output.signature()), "f493d8f275538a50bb8a832d759df9cad535bb2c5cc73296b04983f551d8398b6d7a30fc0fdfd73e8a9cac77a1a6a9435dc6309bb98fbb219035e88809a0b65901");
+}
+
+TEST(TronSigner, SignWithdrawBalance) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& unfreeze = *transaction.mutable_withdraw_balance();
+    unfreeze.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "69aaa954dcd61f28a6a73e979addece6e36541522e5b3374b18b4ef9bc3de4cb");
+    ASSERT_EQ(hex(output.signature()), "cb7d23a5eb23284a25ba6deaa231de0f18d8d103592e3312bff101a4219a3e02167eca24b3f4ce78b34f0c1842b6f7fb8d813f530c4c54342cdedef9f8e1f85100");
+}
+
+TEST(TronSigner, SignVoteAsset) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& vote = *transaction.mutable_vote_asset();
+    vote.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    vote.add_vote_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    vote.set_support(true);
+    vote.set_count(1);
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "59b5736fb9756124f9470e4fadbcdafdc8c970da7157fa0ad34a41559418bf0a");
+    ASSERT_EQ(hex(output.signature()), "501e04b08f359116a26d9ec784abc50830f92a9dc05d2c1aceefe0eba79466d2730b63b6739edf0f1f1972181618b201ce0b4167d14a66abf40eba4097c39ec400");
+}
+
+TEST(TronSigner, SignVoteWitness) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& vote_witness = *transaction.mutable_vote_witness();
+    vote_witness.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    vote_witness.set_support(true);
+
+    auto& vote = *vote_witness.add_votes();
+    vote.set_vote_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    vote.set_vote_count(3);
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "3f923e9dd9571a66624fafeda27baa3e00aba1709d3fdc5c97c77b81fda18c1f");
+    ASSERT_EQ(hex(output.signature()), "79ec1073ae1319ef9303a2f5a515876cfd67f8f0e155bdbde1115d391c05358a3c32f148bfafacf07e1619aaed728d9ffbc2c7e4a5046003c7b74feb86fc68e400");
+}
+
+TEST(TronSigner, SignTriggerSmartContract) {
+    auto input = Proto::SigningInput();
+    auto data = parse_hex("736f6d652064617461");
+    auto& transaction = *input.mutable_transaction();
+    auto& trigger_contract = *transaction.mutable_trigger_smart_contract();
+    trigger_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    trigger_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    trigger_contract.set_call_value(0);
+    trigger_contract.set_call_token_value(10000);
+    trigger_contract.set_token_id(1);
+    trigger_contract.set_data(data.data(), data.size());
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1539295479000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "9927d3daae10ad001b25ef3c1bb03073c928cc0e0823f6f3ce404c2b03ce3570");
+    ASSERT_EQ(hex(output.signature()), "21a99aafeabdddfdfae86538df048d120a83eb36bbcf5656595919ba6afddacd0a07d0ba051ae80337613174b109f36cb583b6e46ee5aecf6ffe3392fdbb8a2a01");
+}
+
+TEST(TronSigner, SignTransferTrc20Contract) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+    auto& transfer_contract = *transaction.mutable_transfer_trc20_contract();
+    transfer_contract.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    transfer_contract.set_contract_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    transfer_contract.set_to_address("TW1dU4L3eNm7Lw8WvieLKEHpXWAussRG9Z");
+    Data amount = store(uint256_t(1000));
+    transfer_contract.set_amount(std::string(amount.begin(), amount.end()));
+
+    transaction.set_timestamp(1539295479000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1539295479000);
+    const auto txTrieRoot = parse_hex("64288c2db0641316762a99dbb02ef7c90f968b60f9f2e410835980614332f86d");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000002f7b3af4f5f8b9e23a30c530f719f165b742e7358536b280eead2d");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3111739);
+    const auto witnessAddress = parse_hex("415863f6091b8e71766da808b1dd3159790f61de7d");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    const auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.id()), "0d644290e3cf554f6219c7747f5287589b6e7e30e1b02793b48ba362da6a5058");
+    ASSERT_EQ(hex(output.signature()), "bec790877b3a008640781e3948b070740b1f6023c29ecb3f7b5835433c13fc5835e5cad3bd44360ff2ddad5ed7dc9d7dee6878f90e86a40355b7697f5954b88c01");
+}
+
+} // namespace TW::Tron
diff --git a/tests/chains/Tron/TWAnySignerTests.cpp b/tests/chains/Tron/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..bff0316d20a
--- /dev/null
+++ b/tests/chains/Tron/TWAnySignerTests.cpp
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Tron.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Tron {
+
+TEST(TWAnySignerTron, SignTransferAsset) {
+    auto input = Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& transfer = *transaction.mutable_transfer_asset();
+    transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    transfer.set_amount(4);
+    transfer.set_asset_name("1000959");
+
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1541890116000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1541890116000);
+    const auto txTrieRoot = parse_hex("845ab51bf63c2c21ee71a4dc0ac3781619f07a7cd05e1e0bd8ba828979332ffa");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash = parse_hex("00000000003cb800a7e69e9144e3d16f0cf33f33a95c7ce274097822c67243c1");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3979265);
+    const auto witnessAddress = parse_hex("41b487cdc02de90f15ac89a68c82f44cbfe3d915ea");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+
+    const auto privateKey = parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54");
+    input.set_private_key(privateKey.data(), privateKey.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeTron);
+
+    ASSERT_EQ(hex(output.signature()), "77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00");
+}
+
+}
diff --git a/tests/chains/Tron/TWCoinTypeTests.cpp b/tests/chains/Tron/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..9aae259d088
--- /dev/null
+++ b/tests/chains/Tron/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWTronCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeTron));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeTron, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeTron, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeTron));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeTron));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeTron), 6);
+    ASSERT_EQ(TWBlockchainTron, TWCoinTypeBlockchain(TWCoinTypeTron));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeTron));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeTron));
+    assertStringsEqual(symbol, "TRX");
+    assertStringsEqual(txUrl, "https://tronscan.org/#/transaction/t123");
+    assertStringsEqual(accUrl, "https://tronscan.org/#/address/a12");
+    assertStringsEqual(id, "tron");
+    assertStringsEqual(name, "Tron");
+}
diff --git a/tests/chains/Tron/TransactionCompilerTests.cpp b/tests/chains/Tron/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..0962f4bda07
--- /dev/null
+++ b/tests/chains/Tron/TransactionCompilerTests.cpp
@@ -0,0 +1,110 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/TransactionCompiler.pb.h"
+#include "proto/Tron.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TronCompiler, CompileWithSignatures) {
+    const auto privateKey =
+        PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    const auto coin = TWCoinTypeTron;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::Tron::Proto::SigningInput();
+    auto& transaction = *input.mutable_transaction();
+
+    auto& transfer = *transaction.mutable_transfer_asset();
+    transfer.set_owner_address("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC");
+    transfer.set_to_address("THTR75o8xXAgCTQqpiot2AFRAjvW1tSbVV");
+    transfer.set_amount(4);
+    transfer.set_asset_name("1000959");
+    transaction.set_timestamp(1539295479000);
+    transaction.set_expiration(1541890116000 + 10 * 60 * 60 * 1000);
+
+    auto& blockHeader = *transaction.mutable_block_header();
+    blockHeader.set_timestamp(1541890116000);
+    const auto txTrieRoot =
+        parse_hex("845ab51bf63c2c21ee71a4dc0ac3781619f07a7cd05e1e0bd8ba828979332ffa");
+    blockHeader.set_tx_trie_root(txTrieRoot.data(), txTrieRoot.size());
+    const auto parentHash =
+        parse_hex("00000000003cb800a7e69e9144e3d16f0cf33f33a95c7ce274097822c67243c1");
+    blockHeader.set_parent_hash(parentHash.data(), parentHash.size());
+    blockHeader.set_number(3979265);
+    const auto witnessAddress = parse_hex("41b487cdc02de90f15ac89a68c82f44cbfe3d915ea");
+    blockHeader.set_witness_address(witnessAddress.data(), witnessAddress.size());
+    blockHeader.set_version(3);
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash),
+              "546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb");
+    auto signature = parse_hex("77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603"
+                               "a183aa12124adeee7991bf55acc8e488a6ca04fb393b1a8ac16610eeafdfc00");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preSigningOutput.data_hash())));
+    /// Step 3: Compile transaction info
+    const auto tx =
+        "{\"raw_data\":{\"contract\":[{\"parameter\":{\"type_url\":\"type.googleapis.com/"
+        "protocol.TransferAssetContract\",\"value\":{\"amount\":4,\"asset_name\":"
+        "\"31303030393539\",\"owner_address\":\"415cd0fb0ab3ce40f3051414c604b27756e69e43db\",\"to_"
+        "address\":\"41521ea197907927725ef36d70f25f850d1659c7c7\"}},\"type\":"
+        "\"TransferAssetContract\"}],\"expiration\":1541926116000,\"ref_block_bytes\":\"b801\","
+        "\"ref_block_hash\":\"0e2bc08d550f5f58\",\"timestamp\":1539295479000},\"signature\":["
+        "\"77f5eabde31e739d34a66914540f1756981dc7d782c9656f5e14e53b59a15371603a183aa12124adeee7991b"
+        "f55acc8e488a6ca04fb393b1a8ac16610eeafdfc00\"],\"txID\":"
+        "\"546a3d07164c624809cf4e564a083a7a7974bb3c4eff6bb3e278b0ca21083fcb\"}";
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKey.bytes});
+
+    {
+        TW::Tron::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(output.json(), tx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+        // keys were not used anywhere up to this point.
+        TW::Tron::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(privateKey.bytes.data(), 32);
+
+        TW::Tron::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.json(), tx);
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKey.bytes});
+        Tron::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.json().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+}
diff --git a/tests/chains/Tron/TronMessageSignerTests.cpp b/tests/chains/Tron/TronMessageSignerTests.cpp
new file mode 100644
index 00000000000..4b0940a5db6
--- /dev/null
+++ b/tests/chains/Tron/TronMessageSignerTests.cpp
@@ -0,0 +1,33 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <Tron/MessageSigner.h>
+#include <TrustWalletCore/TWTronMessageSigner.h>
+#include <HexCoding.h>
+#include <PrivateKey.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Tron {
+    TEST(TronMessageSigner, SignMessageAndVerify) {
+        PrivateKey tronKey(parse_hex("75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a"));
+        auto msg = "Hello World";
+        auto signature = Tron::MessageSigner::signMessage(tronKey, msg);
+        ASSERT_EQ(signature, "9bb6d11ec8a6a3fb686a8f55b123e7ec4e9746a26157f6f9e854dd72f5683b450397a7b0a9653865658de8f9243f877539882891bad30c7286c3bf5622b900471b");
+        auto pubKey = tronKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        ASSERT_TRUE(Tron::MessageSigner::verifyMessage(pubKey, msg, signature));
+    }
+    
+    TEST(TWTronMessageSigner, SignAndVerifyLegacy) {
+        const auto privKeyData = "75065f100e38d3f3b4c5c4235834ba8216de62272a4f03532c44b31a5734360a";
+        const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privKeyData).get()));
+        const auto message = STRING("Hello World");
+        
+        const auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeTron));
+        const auto signature = WRAPS(TWTronMessageSignerSignMessage(privateKey.get(), message.get()));
+        EXPECT_EQ(std::string(TWStringUTF8Bytes(signature.get())), "9bb6d11ec8a6a3fb686a8f55b123e7ec4e9746a26157f6f9e854dd72f5683b450397a7b0a9653865658de8f9243f877539882891bad30c7286c3bf5622b900471b");
+        EXPECT_TRUE(TWTronMessageSignerVerifyMessage(pubKey.get(), message.get(), signature.get()));
+    }
+}
diff --git a/tests/chains/VeChain/SignerTests.cpp b/tests/chains/VeChain/SignerTests.cpp
new file mode 100644
index 00000000000..1317cc17ee4
--- /dev/null
+++ b/tests/chains/VeChain/SignerTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "VeChain/Signer.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::VeChain {
+
+using boost::multiprecision::uint256_t;
+
+TEST(Signer, Sign) {
+    auto transaction = Transaction();
+    transaction.chainTag = 1;
+    transaction.blockRef = 1;
+    transaction.expiration = 1;
+    transaction.clauses.push_back(
+        Clause(Ethereum::Address("0x3535353535353535353535353535353535353535"), 1000, {})
+    );
+    transaction.gasPriceCoef = 0;
+    transaction.gas = 21000;
+    transaction.nonce = 1;
+
+    auto key = PrivateKey(parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646"));
+    auto signature = Signer::sign(key, transaction);
+
+    ASSERT_EQ(hex(signature), "3181b1094150f8e4f51f370b805cc9c5b107504145b9e316e846d5e5dbeedb5c1c2b5d217f197a105983dfaad6a198414d5731c7447493cb6b5169907d73dbe101");
+}
+
+} // namespace TW::VeChain
diff --git a/tests/chains/VeChain/TWAnySignerTests.cpp b/tests/chains/VeChain/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..c2aab9d4d8c
--- /dev/null
+++ b/tests/chains/VeChain/TWAnySignerTests.cpp
@@ -0,0 +1,37 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/VeChain.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+namespace TW::VeChain::tests {
+
+TEST(TWAnySignerVeChain, Sign) {
+    auto input = Proto::SigningInput();
+
+    input.set_chain_tag(1);
+    input.set_block_ref(1);
+    input.set_expiration(1);
+    input.set_gas_price_coef(0);
+    input.set_gas(21000);
+    input.set_nonce(1);
+
+    auto key = parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
+    input.set_private_key(key.data(), key.size());
+
+    auto& clause = *input.add_clauses();
+    auto amount = parse_hex("31303030"); // 1000
+    clause.set_to("0x3535353535353535353535353535353535353535");
+    clause.set_value(amount.data(), amount.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeVeChain);
+
+    ASSERT_EQ(hex(output.encoded()), "f86a010101dcdb943535353535353535353535353535353535353535843130303080808252088001c0b841bf8edf9600e645b5abd677cb52f585e7f655d1361075d511b37f707a9f31da6702d28739933b264527a1d05b046f5b74044b88c30c3f5a09d616bd7a4af4901601");
+}
+
+} // namespace TW::VeChain::tests
diff --git a/tests/chains/VeChain/TWCoinTypeTests.cpp b/tests/chains/VeChain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..325499d53a8
--- /dev/null
+++ b/tests/chains/VeChain/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWVeChainCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeVeChain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xa424053be0063555aee73a595ca69968c2e4d90d36f280753e503b92b11a655d"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeVeChain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x8a0a035a33173601bfbec8b6ae7c4a6557a55103"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeVeChain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeVeChain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeVeChain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeVeChain), 18);
+    ASSERT_EQ(TWBlockchainVechain, TWCoinTypeBlockchain(TWCoinTypeVeChain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeVeChain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeVeChain));
+    assertStringsEqual(symbol, "VET");
+    assertStringsEqual(txUrl, "https://explore.vechain.org/transactions/0xa424053be0063555aee73a595ca69968c2e4d90d36f280753e503b92b11a655d");
+    assertStringsEqual(accUrl, "https://explore.vechain.org/accounts/0x8a0a035a33173601bfbec8b6ae7c4a6557a55103");
+    assertStringsEqual(id, "vechain");
+    assertStringsEqual(name, "VeChain");
+}
diff --git a/tests/chains/VeChain/TransactionCompilerTests.cpp b/tests/chains/VeChain/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..6a9f9ab9c90
--- /dev/null
+++ b/tests/chains/VeChain/TransactionCompilerTests.cpp
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/TransactionCompiler.pb.h"
+#include "proto/VeChain.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(VechainCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeVeChain;
+
+    /// Step 1: Prepare transaction input (protobuf)
+    TW::VeChain::Proto::SigningInput input;
+    PrivateKey privateKey =
+        PrivateKey(parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646"));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    auto publicKey = privateKey.getPublicKey(publicKeyType(coin));
+
+    input.set_chain_tag(1);
+    input.set_block_ref(1);
+    input.set_expiration(1);
+    input.set_gas_price_coef(0);
+    input.set_gas(21000);
+    input.set_nonce(1);
+
+    auto& clause = *input.add_clauses();
+    auto amount = parse_hex("31303030"); // 1000
+    clause.set_to("0x3535353535353535353535353535353535353535");
+    clause.set_value(amount.data(), amount.size());
+
+    auto stringInput = input.SerializeAsString();
+    auto dataInput = TW::Data(stringInput.begin(), stringInput.end());
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashData = TransactionCompiler::preImageHashes(coin, dataInput);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = preSigningOutput.data();
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImage),
+              "e7010101dcdb943535353535353535353535353535353535353535843130303080808252088001c0");
+    EXPECT_EQ(hex(preImageHash),
+              "a1b8ef3af3d8c74e97ac6cd732916a8f4c38c0905c8b70d2fa598edf1f62ea04");
+
+    /// Step 3: Sign
+    TW::Data signature;
+    {
+        TW::VeChain::Proto::SigningOutput output;
+        ANY_SIGN(input, coin);
+        ASSERT_EQ(hex(output.encoded()),
+                  "f86a010101dcdb943535353535353535353535353535353535353535843130303080808252088001c0b8"
+                  "41bf8edf9600e645b5abd677cb52f585e7f655d1361075d511b37f707a9f31da6702d28739933b264527"
+                  "a1d05b046f5b74044b88c30c3f5a09d616bd7a4af4901601");
+
+        signature = data(output.signature());
+        /// Step 4: Verify signature
+        ASSERT_TRUE(publicKey.verify(signature, data(preImageHash.data())));
+    }
+    {
+        const Data outputData =
+            TransactionCompiler::compileWithSignatures(coin, dataInput, {signature}, {publicKey.bytes});
+
+        TW::VeChain::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        ASSERT_EQ(hex(output.encoded()),
+                  "f86a010101dcdb943535353535353535353535353535353535353535843130303080808252088001c0b8"
+                  "41bf8edf9600e645b5abd677cb52f585e7f655d1361075d511b37f707a9f31da6702d28739933b264527"
+                  "a1d05b046f5b74044b88c30c3f5a09d616bd7a4af4901601");
+    }
+
+    { // Negative: more than one signatures
+        const Data outputData = TransactionCompiler::compileWithSignatures(
+            coin, dataInput, {signature, signature}, {publicKey.bytes});
+        VeChain::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+}
diff --git a/tests/chains/Verge/AddressTests.cpp b/tests/chains/Verge/AddressTests.cpp
new file mode 100644
index 00000000000..5185d3bd005
--- /dev/null
+++ b/tests/chains/Verge/AddressTests.cpp
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "Bitcoin/Address.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+#include <TrustWalletCore/TWCoinType.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(VergeAddress, Valid) {
+    ASSERT_TRUE(Address::isValid(std::string("DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E")));
+    ASSERT_TRUE(TW::validateAddress(TWCoinTypeVerge, "DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E"));
+    ASSERT_TRUE(TW::validateAddress(TWCoinTypeVerge, "vg1qujpe553lzgyg95g7k0w6zwscuy0ae022h4q4zg"));
+}
+
+TEST(VergeAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid(std::string("DRyNFvJaybnF22UfMS6NR1Qav3mqxPj234")));
+}
+
+TEST(VergeAddress, FromPrivateKey) {
+    auto privateKey = PrivateKey(parse_hex("693dfe6f3ed717573eb10c24ebe5eb592fa3c239245cd499c487eb7b8ea7ed3a"));
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto address = Address(publicKey, TWCoinTypeP2pkhPrefix(TWCoinTypeVerge));
+    ASSERT_EQ(address.string(), "DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E");
+
+    auto addr = TW::deriveAddress(TWCoinTypeVerge, publicKey, TWDerivationBitcoinSegwit);
+    ASSERT_EQ(addr, "vg1qujpe553lzgyg95g7k0w6zwscuy0ae022h4q4zg");
+}
+
+TEST(VergeAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("034f3eb727ca1eba84a0d22839a483a1120ee6a1da0d5087dde527b5ff912c1694"), TWPublicKeyTypeSECP256k1);
+    auto address = Address(publicKey, TWCoinTypeP2pkhPrefix(TWCoinTypeVerge));
+    ASSERT_EQ(address.string(), "D8rBdwBfz5wvLhmHvRkXnNzeeihQgxkLmL");
+
+    auto addr = TW::deriveAddress(TWCoinTypeVerge, publicKey, TWDerivationBitcoinLegacy);
+    ASSERT_EQ(addr, "D8rBdwBfz5wvLhmHvRkXnNzeeihQgxkLmL");
+}
+
+TEST(VergeAddress, FromString) {
+    auto address = Address("DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E");
+    ASSERT_EQ(address.string(), "DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E");
+
+    auto data = TW::addressToData(TWCoinTypeVerge, "DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E");
+    EXPECT_EQ(hex(data), "e4839a523f120882d11eb3dda13a18e11fdcbd4a");
+
+    data = TW::addressToData(TWCoinTypeVerge, "vg1qujpe553lzgyg95g7k0w6zwscuy0ae022h4q4zg");
+    EXPECT_EQ(hex(data), "e4839a523f120882d11eb3dda13a18e11fdcbd4a");
+
+    // invalid address
+    data = TW::addressToData(TWCoinTypeVerge, "vg1qujpe553lzgyg95g7k0w6zwscuy0ae022h4q4");
+    EXPECT_EQ(data.size(), 0ul);
+}
diff --git a/tests/chains/Verge/SignerTests.cpp b/tests/chains/Verge/SignerTests.cpp
new file mode 100644
index 00000000000..14ff7bb0720
--- /dev/null
+++ b/tests/chains/Verge/SignerTests.cpp
@@ -0,0 +1,199 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Verge/Signer.h"
+#include "Verge/Transaction.h"
+#include "Verge/TransactionBuilder.h"
+#include "Bitcoin/Address.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+
+TEST(VergeSigner, Sign) {
+    const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "DQYMMpqPrnWYZaikKGTQqk5ydUaQw8nkdD";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("DAkEo5pNELZav7MRwBfEwHRG1aChgSUw6c");
+    input.set_coin_type(TWCoinTypeVerge);
+    input.set_time(1656474580);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto utxoKey0 = PrivateKey(parse_hex("693dfe6f3ed717573eb10c24ebe5eb592fa3c239245cd499c487eb7b8ea7ed3a"));
+    auto script0 = Bitcoin::Script::lockScriptForAddress("DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E", TWCoinTypeVerge);
+    ASSERT_EQ(hex(script0.bytes), "76a914e4839a523f120882d11eb3dda13a18e11fdcbd4a88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 980000000;
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = Verge::Signer::sign(input);
+
+    ASSERT_EQ(hex(result.encoded()),
+        "01000000d4cbbb62017d40b2c80adbb0f44cbec466ae30f0316e0c1bf98110fd6d3f1b0fda47e1a6a5000000006b483045022100bf1d0e5f84e70e699f45dd4822ecdbbfb1687e61ac749354a76f2afa2e13f76602202d4f5cda7177282b58f80163fead42300468670d03c5f4bb1db3b9596f2dcea301210220ee0423797a856fdd2e85876a60bf10f8696e6ae83e744f498f2173237fe23dfeffffff02002f6859000000001976a914d4d05406c3ca73cf887911f80c852a1c0773615088ac009d693a000000001976a9143d7e143a8b3c8a4aa2f51104da380edeb6c3fc2088ac00000000"
+    );
+}
+
+TEST(VergeSigner, SignAnyoneCanPay) {
+    const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "DQYMMpqPrnWYZaikKGTQqk5ydUaQw8nkdD";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAnyoneCanPay|TWBitcoinSigHashTypeSingle);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("DAkEo5pNELZav7MRwBfEwHRG1aChgSUw6c");
+    input.set_coin_type(TWCoinTypeVerge);
+    input.set_time(1656474580);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto script0 = Bitcoin::Script::lockScriptForAddress("vg1qujpe553lzgyg95g7k0w6zwscuy0ae022h4q4zg", TWCoinTypeVerge);
+    EXPECT_EQ(hex(script0.bytes), "0014e4839a523f120882d11eb3dda13a18e11fdcbd4a");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+
+    auto txHash1 = parse_hex("29bd442521ea303afb09ad2583f589a6527c9218c050882b6b8527bbe4d11766");
+    std::reverse(txHash1.begin(), txHash1.end());
+
+    auto utxo1 = input.add_utxo();
+    utxo1->mutable_out_point()->set_hash(txHash1.data(), txHash1.size());
+    utxo1->mutable_out_point()->set_index(0);
+    utxo1->mutable_out_point()->set_sequence(4294967294);
+    utxo1->set_amount(200000000);
+
+    auto script1 = Bitcoin::Script::lockScriptForAddress("DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E", TWCoinTypeVerge);
+    ASSERT_EQ(hex(script1.bytes), "76a914e4839a523f120882d11eb3dda13a18e11fdcbd4a88ac");
+    utxo1->set_script(script1.bytes.data(), script1.bytes.size());
+
+    auto utxoKey0 = PrivateKey(parse_hex("693dfe6f3ed717573eb10c24ebe5eb592fa3c239245cd499c487eb7b8ea7ed3a"));
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 1000000000;
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = Bitcoin::TransactionSigner<Verge::Transaction, Verge::TransactionBuilder>::sign(input);
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    ASSERT_EQ(hex(serialized),
+        "01000000d4cbbb620001017d40b2c80adbb0f44cbec466ae30f0316e0c1bf98110fd6d3f1b0fda47e1a6a50000000000feffffff02002f6859000000001976a914d4d05406c3ca73cf887911f80c852a1c0773615088ac00ca9a3b000000001976a9143d7e143a8b3c8a4aa2f51104da380edeb6c3fc2088ac02473044022016413b2d31c16d185cdf7c0ae343b14eee586124a8fa65bfaaec6a35eeb54e13022073e3d73d251d97fd951201ab184cdb101627317866e199ac0963b83b17e5f3bf83210220ee0423797a856fdd2e85876a60bf10f8696e6ae83e744f498f2173237fe23d00000000"
+    );
+}
+
+TEST(VergeSigner, SignSegwit) {
+    const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "DQYMMpqPrnWYZaikKGTQqk5ydUaQw8nkdD";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("DAkEo5pNELZav7MRwBfEwHRG1aChgSUw6c");
+    input.set_coin_type(TWCoinTypeVerge);
+    input.set_time(1656474580);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto script0 = Bitcoin::Script::lockScriptForAddress("vg1qujpe553lzgyg95g7k0w6zwscuy0ae022h4q4zg", TWCoinTypeVerge);
+    EXPECT_EQ(hex(script0.bytes), "0014e4839a523f120882d11eb3dda13a18e11fdcbd4a");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+
+    auto utxoKey0 = PrivateKey(parse_hex("693dfe6f3ed717573eb10c24ebe5eb592fa3c239245cd499c487eb7b8ea7ed3a"));
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 980000000;
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = Verge::Signer::sign(input);
+
+    ASSERT_EQ(hex(result.encoded()),
+        "01000000d4cbbb620001017d40b2c80adbb0f44cbec466ae30f0316e0c1bf98110fd6d3f1b0fda47e1a6a50000000000feffffff02002f6859000000001976a914d4d05406c3ca73cf887911f80c852a1c0773615088ac009d693a000000001976a9143d7e143a8b3c8a4aa2f51104da380edeb6c3fc2088ac024730440220657132a334ffbb15f6bbcd11da743756534c2c345195e19c007d67224f09703f022036cebc6442e212be80b74d5992cfd70355e603c1e538e84e02fecf49f82f2f8a01210220ee0423797a856fdd2e85876a60bf10f8696e6ae83e744f498f2173237fe23d00000000"
+    );
+}
+
+TEST(VergeSigner, SignWithError) {
+    const int64_t amount = 1500000000;
+    const std::string toAddress = "DQYMMpqPrnWYZaikKGTQqk5ydUaQw8nkdD";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("DAkEo5pNELZav7MRwBfEwHRG1aChgSUw6c");
+    input.set_coin_type(TWCoinTypeVerge);
+    input.set_time(1656474580);
+
+    // Sign
+    auto result = Verge::Signer::sign(input);
+
+    ASSERT_NE(result.error(), Common::Proto::OK);
+
+    // PreImage
+    auto preResult = Verge::Signer::preImageHashes(input);
+    ASSERT_NE(preResult.error(), Common::Proto::OK);
+}
\ No newline at end of file
diff --git a/tests/chains/Verge/TWAnyAddressTests.cpp b/tests/chains/Verge/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..0476122548a
--- /dev/null
+++ b/tests/chains/Verge/TWAnyAddressTests.cpp
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWVerge, Address) {
+    auto string = STRING("DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeVerge));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "e4839a523f120882d11eb3dda13a18e11fdcbd4a");
+}
diff --git a/tests/chains/Verge/TWAnySignerTests.cpp b/tests/chains/Verge/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..7d65a5a792d
--- /dev/null
+++ b/tests/chains/Verge/TWAnySignerTests.cpp
@@ -0,0 +1,74 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Bitcoin/Signer.h"
+#include "Bitcoin/Address.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(TWAnySignerVerge, Sign) {
+    const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "DQYMMpqPrnWYZaikKGTQqk5ydUaQw8nkdD";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("DAkEo5pNELZav7MRwBfEwHRG1aChgSUw6c");
+    input.set_coin_type(TWCoinTypeVerge);
+    input.set_time(1656474580);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto utxoKey0 = PrivateKey(parse_hex("693dfe6f3ed717573eb10c24ebe5eb592fa3c239245cd499c487eb7b8ea7ed3a"));
+    auto script0 = Bitcoin::Script::lockScriptForAddress("DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E", TWCoinTypeVerge);
+    ASSERT_EQ(hex(script0.bytes), "76a914e4839a523f120882d11eb3dda13a18e11fdcbd4a88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    Bitcoin::Proto::TransactionPlan plan;
+    {
+        ANY_PLAN(input, plan, TWCoinTypeVerge);
+
+        plan.set_amount(amount);
+        plan.set_fee(fee);
+        plan.set_change(980000000);
+
+        *input.mutable_plan() = plan;
+    }
+
+    Bitcoin::Proto::SigningOutput output;
+    {
+        ANY_SIGN(input, TWCoinTypeVerge);
+        ASSERT_EQ(output.error(), Common::Proto::OK);
+    }
+
+    // Sign
+    ASSERT_EQ(hex(output.encoded()),
+        "01000000d4cbbb62017d40b2c80adbb0f44cbec466ae30f0316e0c1bf98110fd6d3f1b0fda47e1a6a5000000006b483045022100bf1d0e5f84e70e699f45dd4822ecdbbfb1687e61ac749354a76f2afa2e13f76602202d4f5cda7177282b58f80163fead42300468670d03c5f4bb1db3b9596f2dcea301210220ee0423797a856fdd2e85876a60bf10f8696e6ae83e744f498f2173237fe23dfeffffff02002f6859000000001976a914d4d05406c3ca73cf887911f80c852a1c0773615088ac009d693a000000001976a9143d7e143a8b3c8a4aa2f51104da380edeb6c3fc2088ac00000000"
+    );
+}
diff --git a/tests/chains/Verge/TWCoinTypeTests.cpp b/tests/chains/Verge/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..47d2546607f
--- /dev/null
+++ b/tests/chains/Verge/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWVergeCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeVerge));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("8c99979a2b25a46659bff35b238aab1c3158f736f215d99526429c7c96203581"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeVerge, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("DFre88gd87bAZQdnS7dbBLwT6GWiGFMQB6"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeVerge, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeVerge));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeVerge));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeVerge), 6);
+    ASSERT_EQ(TWBlockchainVerge, TWCoinTypeBlockchain(TWCoinTypeVerge));
+    ASSERT_EQ(0x21, TWCoinTypeP2shPrefix(TWCoinTypeVerge));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeVerge));
+    assertStringsEqual(symbol, "XVG");
+    assertStringsEqual(txUrl, "https://verge-blockchain.info/tx/8c99979a2b25a46659bff35b238aab1c3158f736f215d99526429c7c96203581");
+    assertStringsEqual(accUrl, "https://verge-blockchain.info/address/DFre88gd87bAZQdnS7dbBLwT6GWiGFMQB6");
+    assertStringsEqual(id, "verge");
+    assertStringsEqual(name, "Verge");
+}
diff --git a/tests/chains/Verge/TransactionBuilderTests.cpp b/tests/chains/Verge/TransactionBuilderTests.cpp
new file mode 100644
index 00000000000..dd0b84e1c94
--- /dev/null
+++ b/tests/chains/Verge/TransactionBuilderTests.cpp
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Verge/Transaction.h"
+#include "Verge/TransactionBuilder.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(VergeTransactionBuilder, BuildWithTime) {
+    const int64_t amount = 1500000000;
+    const int64_t fee = 2000000;
+    const std::string toAddress = "DQYMMpqPrnWYZaikKGTQqk5ydUaQw8nkdD";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("DAkEo5pNELZav7MRwBfEwHRG1aChgSUw6c");
+    input.set_coin_type(TWCoinTypeVerge);
+
+    auto txHash0 = parse_hex("a5a6e147da0f1b3f6dfd1081f91b0c6e31f030ae66c4be4cf4b0db0ac8b2407d");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(2500000000);
+
+    auto utxoKey0 = PrivateKey(parse_hex("693dfe6f3ed717573eb10c24ebe5eb592fa3c239245cd499c487eb7b8ea7ed3a"));
+    auto script0 = Bitcoin::Script::lockScriptForAddress("DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E", TWCoinTypeVerge);
+    ASSERT_EQ(hex(script0.bytes), "76a914e4839a523f120882d11eb3dda13a18e11fdcbd4a88ac");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 980000000;
+
+    auto tx = Verge::TransactionBuilder::build<Verge::Transaction>(plan, input).payload();
+    ASSERT_NE(tx.time, 0ul);
+}
\ No newline at end of file
diff --git a/tests/chains/Verge/TransactionCompilerTests.cpp b/tests/chains/Verge/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..796676fa20f
--- /dev/null
+++ b/tests/chains/Verge/TransactionCompilerTests.cpp
@@ -0,0 +1,125 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(VergeCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeVerge;
+
+    // tx on mainnet
+    // https://verge-blockchain.info/tx/21314157b60ddacb842d2a749429c4112724b7a078adb9e77ba502ea2dd7c230
+
+    const int64_t amount = 9999995000000;
+    const int64_t fee = 120850;
+    const std::string toAddress = "DQZboqURLgrBzBz4Kfbs3yV6fZ3DrNFRjQ";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("DCUWt5ctZcPdPMYPV2o1xK1kqv7jNwxu4h");
+    input.set_coin_type(coin);
+    input.set_time(1584059579);
+
+    auto txHash0 = parse_hex("ee839754c8e93d620cbec9a1c51e7b69016d00839741b03af2c039852d941212");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(1);
+    utxo0->mutable_out_point()->set_sequence(4294967295);
+    utxo0->set_amount(20000000000000);
+
+    auto script0 = parse_hex("76a91479471b92b3c94b37544fff430556043d9acd53b188ac");
+    utxo0->set_script(script0.data(), script0.size());
+
+    EXPECT_EQ(input.utxo_size(), 1);
+
+    // Plan
+    Bitcoin::Proto::TransactionPlan plan;
+    ANY_PLAN(input, plan, coin);
+
+    plan.set_amount(amount);
+    plan.set_fee(fee);
+    plan.set_change(10000004879150);
+
+    // Extend input with accepted plan
+    *input.mutable_plan() = plan;
+
+    // Serialize input
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    /// Step 2: Obtain preimage hashes
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    TW::Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), (int)preImageHashes.size()));
+
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].data_hash()),
+              "f7498449e2b8d33d4ff00c72b05c820e5262f43360d9f38455dcfd8f6425c9b2");
+
+    EXPECT_EQ(hex(preSigningOutput.hash_public_keys()[0].public_key_hash()), "79471b92b3c94b37544fff430556043d9acd53b1");
+
+    auto publicKeyHex = "02b2655122379a375a47e7a204a9dc4572cec5dbe4db4c51fea0c9fa03061fdb0b";
+    auto publicKey = PublicKey(parse_hex(publicKeyHex), TWPublicKeyTypeSECP256k1);
+    auto preImageHash = preSigningOutput.hash_public_keys()[0].data_hash();
+    auto signature = parse_hex("3044022039e18d10ab4793d0564cfa675286d2ffd016b8f936c696fd3b72267b621dcd400220653d4761be6b12261629c4240033a08d9767a5f16851dc91a190c8a8d25ecbe0");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(
+        publicKey.verifyAsDER(signature, TW::Data(preImageHash.begin(), preImageHash.end())));
+
+    // Simulate signatures, normally obtained from signature server.
+    std::vector<Data> signatureVec;
+    std::vector<Data> pubkeyVec;
+    signatureVec.push_back(signature);
+    pubkeyVec.push_back(publicKey.bytes);
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, signatureVec, pubkeyVec);
+
+    const auto ExpectedTx =
+        "01000000bbd46a5e011212942d8539c0f23ab0419783006d01697b1ec5a1c9be0c623de9c8549783ee010000006a473044022039e18d10ab4793d0564cfa675286d2ffd016b8f936c696fd3b72267b621dcd400220653d4761be6b12261629c4240033a08d9767a5f16851dc91a190c8a8d25ecbe0012102b2655122379a375a47e7a204a9dc4572cec5dbe4db4c51fea0c9fa03061fdb0bffffffff02c054264e180900001976a914d50cce1f1449ac5630a0a731cbfcf7d7208a6e7d88ac2e13bd4e180900001976a91450751a6dc46f7068ac3c6350f6a85f7c20fd5e2988ac00000000";
+    {
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: not enough signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, pubkeyVec);
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
diff --git a/tests/chains/Viacoin/TWCoinTypeTests.cpp b/tests/chains/Viacoin/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..1c416808887
--- /dev/null
+++ b/tests/chains/Viacoin/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWViacoinCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeViacoin));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeViacoin, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeViacoin, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeViacoin));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeViacoin));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeViacoin), 8);
+    ASSERT_EQ(TWBlockchainBitcoin, TWCoinTypeBlockchain(TWCoinTypeViacoin));
+    ASSERT_EQ(0x21, TWCoinTypeP2shPrefix(TWCoinTypeViacoin));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeViacoin));
+    assertStringsEqual(symbol, "VIA");
+    assertStringsEqual(txUrl, "https://explorer.viacoin.org/tx/t123");
+    assertStringsEqual(accUrl, "https://explorer.viacoin.org/address/a12");
+    assertStringsEqual(id, "viacoin");
+    assertStringsEqual(name, "Viacoin");
+}
diff --git a/tests/Viacoin/TWViacoinAddressTests.cpp b/tests/chains/Viacoin/TWViacoinAddressTests.cpp
similarity index 95%
rename from tests/Viacoin/TWViacoinAddressTests.cpp
rename to tests/chains/Viacoin/TWViacoinAddressTests.cpp
index 55ef8fe74a5..996afe1fe8b 100644
--- a/tests/Viacoin/TWViacoinAddressTests.cpp
+++ b/tests/chains/Viacoin/TWViacoinAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWSegwitAddress.h>
 #include <TrustWalletCore/TWBitcoinAddress.h>
diff --git a/tests/chains/Viction/TWCoinTypeTests.cpp b/tests/chains/Viction/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..8bb5b07ecb5
--- /dev/null
+++ b/tests/chains/Viction/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWVictionType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeViction));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x35a8d3ab06c94d5b7d27221b7c9a24ba3f1710dd0fcfd75c5d59b3a885fd709b"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeViction, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x86cCbD9bfb371c355202086882bC644A7D0b024B"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeViction, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeViction));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeViction));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeViction), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeViction));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeViction));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeViction));
+    assertStringsEqual(symbol, "VIC");
+    assertStringsEqual(txUrl, "https://www.vicscan.xyz/tx/0x35a8d3ab06c94d5b7d27221b7c9a24ba3f1710dd0fcfd75c5d59b3a885fd709b");
+    assertStringsEqual(accUrl, "https://www.vicscan.xyz/address/0x86cCbD9bfb371c355202086882bC644A7D0b024B");
+    assertStringsEqual(id, "viction");
+    assertStringsEqual(name, "Viction");
+}
diff --git a/tests/chains/WAX/TWAnySignerTests.cpp b/tests/chains/WAX/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..f81d7663dec
--- /dev/null
+++ b/tests/chains/WAX/TWAnySignerTests.cpp
@@ -0,0 +1,55 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+#include "EOS/Address.h"
+#include "Base58.h"
+#include "proto/EOS.pb.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::EOS::tests {
+
+TEST(TWAnySignerWAX, Sign) {
+    Proto::SigningInput input;
+    const auto chainId = parse_hex("1064487b3cd1a897ce03ae5b6a865651747e2e152090f99c1d19d44e01aea5a4");
+    const auto refBlock = parse_hex("0cffaeda15039f3468398c5b4295d220fcc217f7cf96030c3729773097c6bd76");
+    const auto key = parse_hex("d30d185a296b9591d648cb92fe0aa8f8a42de30ed9d2a21da9e7f69c67e8e355");
+
+    const auto pubKey = PublicKey(PrivateKey(key).getPublicKey(TWPublicKeyTypeSECP256k1));
+    const auto address = Address(pubKey);
+    EXPECT_EQ(address.string(), "EOS7rC6zYUjuxWkiokZTrwwHqwFvZ15Qdrn5WNxMKVXtHiDDmBWog");
+
+    auto& asset = *input.mutable_asset();
+    asset.set_amount(100000000);
+    asset.set_decimals(4);
+    asset.set_symbol("WAX");
+
+    input.set_chain_id(chainId.data(), chainId.size());
+    input.set_reference_block_id(refBlock.data(), refBlock.size());
+    input.set_reference_block_time(1670507804);
+    input.set_currency("eosio.token");
+    input.set_sender("k52o1qdeh.gm");
+    input.set_recipient("c2lrpvzxb.gm");
+    input.set_memo("sent from wallet-core");
+    input.set_private_key(key.data(), key.size());
+    input.set_private_key_type(Proto::KeyType::MODERNK1);
+    input.set_expiration(1670507804 + 30);
+
+    // https://wax.bloks.io/transaction/4548f7b28ee608663caea61234049ac0018415e02dd0abcea1c215c8da00d10a
+    {
+        Proto::SigningOutput output;
+        ANY_SIGN(input, TWCoinTypeEOS);
+
+        EXPECT_EQ(output.error(), Common::Proto::OK);
+        auto expected = R"({"compression":"none","packed_context_free_data":"","packed_trx":"3aed9163daae68398c5b000000000100a6823403ea3055000000572d3ccdcd012019682ad940458100000000a8ed3232362019682ad9404581201938fdef7aa34000e1f5050000000004574158000000001573656e742066726f6d2077616c6c65742d636f726500","signatures":["SIG_K1_KAroa9t89dpujjfBgBMgDcZrVhML5yP7iFk5sGNnNqbT4SxTCLqjQwwLZDi1ryx4W7Hy9DE9p1MqUSFVKeY8NtKyiySFjE"]})";
+        EXPECT_EQ(output.json_encoded(), expected);
+    }
+}
+
+} // namespace TW::EOS::tests
diff --git a/tests/chains/WAX/TWCoinTypeTests.cpp b/tests/chains/WAX/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..bb223717567
--- /dev/null
+++ b/tests/chains/WAX/TWCoinTypeTests.cpp
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWWAXCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeWAX));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("4548f7b28ee608663caea61234049ac0018415e02dd0abcea1c215c8da00d10a"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeWAX, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("k52o1qdeh.gm"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeWAX, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeWAX));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeWAX));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeWAX), 4);
+    ASSERT_EQ(TWBlockchainEOS, TWCoinTypeBlockchain(TWCoinTypeWAX));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeWAX));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeWAX));
+    assertStringsEqual(symbol, "WAXP");
+    assertStringsEqual(txUrl, "https://wax.bloks.io/transaction/4548f7b28ee608663caea61234049ac0018415e02dd0abcea1c215c8da00d10a");
+    assertStringsEqual(accUrl, "https://wax.bloks.io/account/k52o1qdeh.gm");
+    assertStringsEqual(id, "wax");
+    assertStringsEqual(name, "WAX");
+}
diff --git a/tests/chains/Wanchain/TWCoinTypeTests.cpp b/tests/chains/Wanchain/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..9d2f2704238
--- /dev/null
+++ b/tests/chains/Wanchain/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWWanchainCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeWanchain));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x180ea96a3218b82b9b35d796823266d8a425c182507adfe5eeffc96e6a14d856"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeWanchain, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x69B492D57bb777e97aa7044D0575228434e2E8B1"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeWanchain, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeWanchain));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeWanchain));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeWanchain), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeWanchain));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeWanchain));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeWanchain));
+    assertStringsEqual(symbol, "WAN");
+    assertStringsEqual(txUrl, "https://www.wanscan.org/tx/0x180ea96a3218b82b9b35d796823266d8a425c182507adfe5eeffc96e6a14d856");
+    assertStringsEqual(accUrl, "https://www.wanscan.org/address/0x69B492D57bb777e97aa7044D0575228434e2E8B1");
+    assertStringsEqual(id, "wanchain");
+    assertStringsEqual(name, "Wanchain");
+}
diff --git a/tests/chains/Waves/AddressTests.cpp b/tests/chains/Waves/AddressTests.cpp
new file mode 100644
index 00000000000..22de9778b55
--- /dev/null
+++ b/tests/chains/Waves/AddressTests.cpp
@@ -0,0 +1,95 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Waves/Address.h"
+
+#include <Coin.h>
+#include <HDWallet.h>
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace TW;
+
+namespace TW::Waves::tests {
+
+TEST(WavesAddress, SecureHash) {
+    const auto secureHash =
+        hex(Address::secureHash(parse_hex("0157c7fefc0c6acc54e9e4354a81ac1f038e01745731")));
+
+    ASSERT_EQ(secureHash, "a7978a753c6496866dc75ba3abcaaec796f2380037a1fa7c46cbf9762ee380df");
+}
+
+TEST(WavesAddress, FromPrivateKey) {
+    const auto privateKey =
+        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
+    const auto publicKeyEd25519 = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    ASSERT_EQ(hex(Data(publicKeyEd25519.bytes.begin(), publicKeyEd25519.bytes.end())),
+              "ff84c4bfc095df25b01e48807715856d95af93d88c5b57f30cb0ce567ca4ced6");
+    const auto publicKeyCurve25519 = privateKey.getPublicKey(TWPublicKeyTypeCURVE25519);
+    ASSERT_EQ(hex(Data(publicKeyCurve25519.bytes.begin(), publicKeyCurve25519.bytes.end())),
+              "559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
+    const auto address = Address(publicKeyCurve25519);
+
+    ASSERT_EQ(address.string(), "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds");
+
+    const auto publicKeySECP256k1 = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_ANY_THROW(new Address(publicKeySECP256k1));
+}
+
+TEST(WavesAddress, FromPublicKey) {
+    const auto publicKey =
+        PublicKey(parse_hex("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d"),
+                  TWPublicKeyTypeCURVE25519);
+    const auto address = Address(publicKey);
+
+    ASSERT_EQ(address.string(), "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds");
+
+    const auto address2 = Address(Data(address.bytes.begin(), address.bytes.end()));
+    ASSERT_EQ(address2.string(), "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds");
+}
+
+TEST(WavesAddress, FromData) {
+    EXPECT_ANY_THROW(new Address(Data{}));
+}
+
+TEST(WavesAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid(std::string("abc")));
+    ASSERT_FALSE(Address::isValid(std::string("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed")));
+    ASSERT_FALSE(Address::isValid(std::string("3PLANf4MgtNN5v5k4NNnyx2m4zKJiw1tF9v")));
+    ASSERT_FALSE(Address::isValid(std::string("3PLANf4MgtNN5v6k4NNnyx2m4zKJiw1tF8v")));
+}
+
+TEST(WavesAddress, Valid) {
+    ASSERT_TRUE(Address::isValid(std::string("3PLANf4MgtNN5v6k4NNnyx2m4zKJiw1tF9v")));
+    ASSERT_TRUE(Address::isValid(std::string("3PDjjLFDR5aWkKgufika7KSLnGmAe8ueDpC")));
+    ASSERT_TRUE(Address::isValid(std::string("3PLjucTjqEfmgBF7fs2CER3fHQapCtknPeW")));
+    ASSERT_TRUE(Address::isValid(std::string("3PB9ffP1YKQer3e7t283gPCLyjEfK8xrGp7")));
+}
+
+TEST(WavesAddress, InitWithString) {
+    const auto address = Address("3PQupTC1yRiHneotFt79LF2pkN6GrGMwEy3");
+    ASSERT_EQ(address.string(), "3PQupTC1yRiHneotFt79LF2pkN6GrGMwEy3");
+}
+
+TEST(WavesAddress, InitWithInvalidString) {
+    EXPECT_THROW(Address("3PQupTC1yRiHneotFt79LF2pkN6GrGMwEy2"), invalid_argument);
+}
+
+TEST(WavesAddress, Derive) {
+    const auto mnemonic =
+        "water process satisfy repeat flag avoid town badge sketch surge split between cabin sugar "
+        "ill special axis adjust pull useful craft peace flee physical";
+    const auto wallet = HDWallet(mnemonic, "");
+    const auto address1 = TW::deriveAddress(
+        TWCoinTypeWaves, wallet.getKey(TWCoinTypeWaves, DerivationPath("m/44'/5741564'/0'/0'/0'")));
+    const auto address2 = TW::deriveAddress(
+        TWCoinTypeWaves, wallet.getKey(TWCoinTypeWaves, DerivationPath("m/44'/5741564'/0'/0'/1'")));
+
+    ASSERT_EQ(address1, "3PQupTC1yRiHneotFt79LF2pkN6GrGMwEy3");
+    ASSERT_EQ(address2, "3PEXw52bkS9XuLhttWoKyykZjXqEY8zeLxf");
+}
+
+} // namespace TW::Waves::tests
diff --git a/tests/Waves/LeaseTests.cpp b/tests/chains/Waves/LeaseTests.cpp
similarity index 95%
rename from tests/Waves/LeaseTests.cpp
rename to tests/chains/Waves/LeaseTests.cpp
index 53f6e192cbd..588f7f99db7 100644
--- a/tests/Waves/LeaseTests.cpp
+++ b/tests/chains/Waves/LeaseTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "HexCoding.h"
 #include "PrivateKey.h"
diff --git a/tests/chains/Waves/SignerTests.cpp b/tests/chains/Waves/SignerTests.cpp
new file mode 100644
index 00000000000..bbc63fad0c5
--- /dev/null
+++ b/tests/chains/Waves/SignerTests.cpp
@@ -0,0 +1,62 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include "Waves/Signer.h"
+#include "Waves/Transaction.h"
+
+#include <TrezorCrypto/sodium/keypair.h>
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Waves::tests {
+
+TEST(WavesSigner, SignTransaction) {
+    const auto privateKey =
+        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
+    const auto publicKeyCurve25519 = privateKey.getPublicKey(TWPublicKeyTypeCURVE25519);
+    ASSERT_EQ(hex(Data(publicKeyCurve25519.bytes.begin(), publicKeyCurve25519.bytes.end())),
+              "559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
+    // 3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds
+    const auto address = Address(publicKeyCurve25519);
+    auto input = Proto::SigningInput();
+    input.set_timestamp(int64_t(1526641218066));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+    
+    auto& message = *input.mutable_transfer_message();
+    message.set_amount(int64_t(100000000));
+    message.set_asset(Transaction::WAVES);
+    message.set_fee(int64_t(100000000));
+    message.set_fee_asset(Transaction::WAVES);
+    message.set_to(address.string());
+    message.set_attachment("falafel");
+    auto tx1 = Transaction(
+                           input,
+                           /* pub_key */
+                           parse_hex("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d"));
+
+    auto signature = Signer::sign(privateKey, tx1);
+
+    EXPECT_EQ(hex(tx1.serializeToSign()),
+              "0402559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d00000000016372e8"
+              "52120000000005f5e1000000000005f5e10001570acc4110b78a6d38b34d879b5bba38806202ecf1732f"
+              "8542000766616c6166656c");
+    EXPECT_EQ(hex(signature), "af7989256f496e103ce95096b3f52196dd9132e044905fe486da3b829b5e403bcba9"
+                              "5ab7e650a4a33948c2d05cfca2dce4d4df747e26402974490fb4c49fbe8f");
+
+    ASSERT_TRUE(publicKeyCurve25519.verify(signature, tx1.serializeToSign()));
+}
+
+TEST(WavesSigner, curve25519_pk_to_ed25519) {
+    const auto publicKeyCurve25519 =
+        parse_hex("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
+    auto r = Data();
+    r.resize(32);
+    curve25519_pk_to_ed25519(r.data(), publicKeyCurve25519.data());
+    EXPECT_EQ(hex(r), "ff84c4bfc095df25b01e48807715856d95af93d88c5b57f30cb0ce567ca4ce56");
+}
+
+} // namespace TW::Waves::tests
diff --git a/tests/chains/Waves/TWAnySignerTests.cpp b/tests/chains/Waves/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..23e858b682c
--- /dev/null
+++ b/tests/chains/Waves/TWAnySignerTests.cpp
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "HexCoding.h"
+#include "proto/Waves.pb.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+namespace TW::Waves::tests {
+
+TEST(TWAnySignerWaves, Sign) {
+    auto input = Proto::SigningInput();
+    const auto privateKey = Base58::decode("83mqJpmgB5Mko1567sVAdqZxVKsT6jccXt3eFSi4G1zE");
+
+    input.set_timestamp(int64_t(1559146613));
+    input.set_private_key(privateKey.data(), privateKey.size());
+    auto& message = *input.mutable_transfer_message();
+    message.set_amount(int64_t(100000000));
+    message.set_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
+    message.set_fee(int64_t(100000));
+    message.set_fee_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
+    message.set_to("3PPCZQkvdMJpmx7Zrz1cnYsPe9Bt1XT2Ckx");
+    message.set_attachment("hello");
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeWaves);
+
+    ASSERT_EQ(hex(output.signature()), "5d6a77b1fd9b53d9735cd2543ba94215664f2b07d6c7befb081221fcd49f5b6ad6b9ac108582e8d3e74943bdf35fd80d985edf4b4de1fb1c5c427e84d0879f8f");
+}
+
+} // namespace TW::Waves::tests
diff --git a/tests/chains/Waves/TWCoinTypeTests.cpp b/tests/chains/Waves/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..4e3fdc744e1
--- /dev/null
+++ b/tests/chains/Waves/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWWavesCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeWaves));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeWaves, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeWaves, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeWaves));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeWaves));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeWaves), 8);
+    ASSERT_EQ(TWBlockchainWaves, TWCoinTypeBlockchain(TWCoinTypeWaves));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeWaves));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeWaves));
+    assertStringsEqual(symbol, "WAVES");
+    assertStringsEqual(txUrl, "https://wavesexplorer.com/tx/t123");
+    assertStringsEqual(accUrl, "https://wavesexplorer.com/address/a12");
+    assertStringsEqual(id, "waves");
+    assertStringsEqual(name, "Waves");
+}
diff --git a/tests/chains/Waves/TransactionTests.cpp b/tests/chains/Waves/TransactionTests.cpp
new file mode 100644
index 00000000000..a71ca9c9069
--- /dev/null
+++ b/tests/chains/Waves/TransactionTests.cpp
@@ -0,0 +1,135 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "Waves/Address.h"
+#include "proto/Waves.pb.h"
+#include "Waves/Transaction.h"
+
+#include <Waves/Signer.h>
+#include <gtest/gtest.h>
+
+namespace TW::Waves::tests {
+
+using json = nlohmann::json;
+using namespace std;
+
+TEST(WavesTransaction, serialize) {
+    const auto privateKey =
+        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
+    auto input = Proto::SigningInput();
+    input.set_timestamp(int64_t(1526641218066));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto& message = *input.mutable_transfer_message();
+    message.set_amount(int64_t(100000000));
+    message.set_asset("");
+    message.set_fee(int64_t(100000000));
+    message.set_fee_asset(Transaction::WAVES);
+    message.set_to("3PLgzJXQiN77G7KgnR1WVa8jBYhF2dmWndx");
+    message.set_attachment("falafel");
+    auto tx1 = Transaction(
+        input,
+        /* pub_key */
+        parse_hex("d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef22"));
+    auto serialized1 = tx1.serializeToSign();
+    ASSERT_EQ(hex(serialized1), "0402d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef"
+                                "2200000000016372e852120000000005f5e1000000000005f5e1000157cdc9381c"
+                                "071beb5abd27738d5cd36cf75f3cbfdd69e8e6bb000766616c6166656c");
+
+    auto input2 = Proto::SigningInput();
+    input2.set_timestamp(int64_t(1));
+    input2.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto& message2 = *input2.mutable_transfer_message();
+    message2.set_amount(int64_t(1));
+    message2.set_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
+    message2.set_fee(int64_t(1));
+    message2.set_fee_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
+    message2.set_to("3PLgzJXQiN77G7KgnR1WVa8jBYhF2dmWndx");
+    message2.set_attachment("");
+
+    auto tx2 = Transaction(
+        input2,
+        /* pub_key */
+        parse_hex("d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef22"));
+    auto serialized2 = tx2.serializeToSign();
+    ASSERT_EQ(hex(serialized2),
+              "0402d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef2201bae8ddc9955fa6"
+              "f69f8e7b155efcdb97bc3bb3a95db4c4604408cec245cd187201bae8ddc9955fa6f69f8e7b155efcdb97"
+              "bc3bb3a95db4c4604408cec245cd18720000000000000001000000000000000100000000000000010157"
+              "cdc9381c071beb5abd27738d5cd36cf75f3cbfdd69e8e6bb0000");
+}
+
+TEST(WavesTransaction, failedSerialize) {
+    // 141 bytes attachment
+    const auto privateKey =
+        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
+    auto input = Proto::SigningInput();
+    input.set_timestamp(int64_t(1526641218066));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto& message = *input.mutable_transfer_message();
+    message.set_amount(int64_t(100000000));
+    message.set_asset("");
+    message.set_fee(int64_t(100000000));
+    message.set_fee_asset("");
+    message.set_to("3PLgzJXQiN77G7KgnR1WVa8jBYhF2dmWndx");
+    message.set_attachment("falafelfalafelfalafelfalafelfalafelfalafelfalafel"
+                           "falafelfalafelfalafelfalafelfalafelfalafelfalafel"
+                           "falafelfalafelfalafelfalafelfalafelfalafel
");
+    auto tx1 = Transaction(
+        input,
+        /* pub_key */
+        parse_hex("d528aabec35ca100d87c7b7a128632faf19cd44531819457445113a32a21ef22"));
+    EXPECT_THROW(tx1.serializeToSign(), invalid_argument);
+}
+
+TEST(WavesTransaction, jsonSerialize) {
+
+    const auto privateKey =
+        PrivateKey(parse_hex("9864a747e1b97f131fabb6b447296c9b6f0201e79fb3c5356e6c77e89b6a806a"));
+    const auto publicKeyCurve25519 = privateKey.getPublicKey(TWPublicKeyTypeCURVE25519);
+    ASSERT_EQ(hex(Data(publicKeyCurve25519.bytes.begin(), publicKeyCurve25519.bytes.end())),
+              "559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d");
+    const auto address = Address(publicKeyCurve25519);
+
+    auto input = Proto::SigningInput();
+    input.set_timestamp(int64_t(1526641218066));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto& message = *input.mutable_transfer_message();
+    message.set_amount(int64_t(10000000));
+    message.set_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
+    message.set_fee(int64_t(100000000));
+    message.set_fee_asset("DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD82zq");
+    message.set_to(address.string());
+    message.set_attachment("falafel");
+    auto tx1 = Transaction(
+        input,
+        /* pub_key */
+        parse_hex("559a50cb45a9a8e8d4f83295c354725990164d10bb505275d1a3086c08fb935d"));
+
+    auto signature = Signer::sign(privateKey, tx1);
+
+    auto json = tx1.buildJson(signature);
+
+    ASSERT_EQ(json["type"], TransactionType::transfer);
+    ASSERT_EQ(json["version"], TransactionVersion::V2);
+    ASSERT_EQ(json["fee"], int64_t(100000000));
+    ASSERT_EQ(json["senderPublicKey"], "6mA8eQjie53kd4jbZrwL3ZhMBqCX6nzit1k55tR2X7zU");
+    ASSERT_EQ(json["timestamp"], int64_t(1526641218066));
+    ASSERT_EQ(json["proofs"].dump(), "[\"5ynN2NUiFHkQzw9bK8R7dZcNfTWMAtcWRJsrMvFFM6dUT3fSnPCCX7CTajNU8bJCB"
+                                     "H69vU1mnwfx4zpDtF1SkzKg\"]");
+    ASSERT_EQ(json["recipient"], "3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds");
+    ASSERT_EQ(json["assetId"], "DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq");
+    ASSERT_EQ(json["feeAssetId"], "DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD82zq");
+    ASSERT_EQ(json["amount"], int64_t(10000000));
+    ASSERT_EQ(json["attachment"], "4t2Xazb2SX");
+    ASSERT_EQ(json.dump(), "{\"amount\":10000000,\"assetId\":\"DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD81zq\",\"attachment\":\"4t2Xazb2SX\",\"fee\":100000000,\"feeAssetId\":\"DacnEpaUVFRCYk8Fcd1F3cqUZuT4XG7qW9mRyoZD82zq\",\"proofs\":[\"5ynN2NUiFHkQzw9bK8R7dZcNfTWMAtcWRJsrMvFFM6dUT3fSnPCCX7CTajNU8bJCBH69vU1mnwfx4zpDtF1SkzKg\"],\"recipient\":\"3P2uzAzX9XTu1t32GkWw68YFFLwtapWvDds\",\"senderPublicKey\":\"6mA8eQjie53kd4jbZrwL3ZhMBqCX6nzit1k55tR2X7zU\",\"timestamp\":1526641218066,\"type\":4,\"version\":2}");
+}
+
+} // namespace TW::Waves::tests
diff --git a/tests/chains/XRP/AddressTests.cpp b/tests/chains/XRP/AddressTests.cpp
new file mode 100644
index 00000000000..cac0f014219
--- /dev/null
+++ b/tests/chains/XRP/AddressTests.cpp
@@ -0,0 +1,56 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "XRP/Address.h"
+#include "XRP/XAddress.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Ripple {
+
+TEST(RippleAddress, FromPublicKey) {
+    const auto publicKey = PublicKey(parse_hex("0303E20EC6B4A39A629815AE02C0A1393B9225E3B890CAE45B59F42FA29BE9668D"), TWPublicKeyTypeSECP256k1);
+    const auto address = Address(publicKey);
+    ASSERT_EQ(std::string("rnBFvgZphmN39GWzUJeUitaP22Fr9be75H"), address.string());
+}
+
+TEST(RippleAddress, FromString) {
+    std::string classic = "rnBFvgZphmN39GWzUJeUitaP22Fr9be75H";
+    const auto address = Address(classic);
+
+    ASSERT_EQ(address.string(), classic);
+}
+
+TEST(RippleXAddress, FromPublicKey) {
+    const auto publicKey = PublicKey(parse_hex("0303E20EC6B4A39A629815AE02C0A1393B9225E3B890CAE45B59F42FA29BE9668D"), TWPublicKeyTypeSECP256k1);
+    const auto address = XAddress(publicKey, 12345);
+    ASSERT_EQ(std::string("X76UnYEMbQfEs3mUqgtjp4zFy9exgThRj7XVZ6UxsdrBptF"), address.string());
+}
+
+TEST(RippleXAddress, FromString) {
+    std::string xAddress = "X76UnYEMbQfEs3mUqgtjp4zFy9exgThRj7XVZ6UxsdrBptF";
+    std::string xAddress2 = "X76UnYEMbQfEs3mUqgtjp4zFy9exgTsM93nriVZAPufrpE3";
+    const auto address = XAddress(xAddress);
+    const auto address2 = XAddress(xAddress2);
+
+    ASSERT_EQ(address.tag, 12345ul);
+    ASSERT_EQ(address.string(), xAddress);
+
+    ASSERT_EQ(address2.tag, 0ul);
+    ASSERT_EQ(address2.string(), xAddress2);
+}
+
+TEST(RippleAddress, isValid) {
+    std::string classicAddress = "r36yxStAh7qgTQNHTzjZvXybCTzUFhrfav";
+    std::string bitcoinAddress = "1Ma2DrB78K7jmAwaomqZNRMCvgQrNjE2QC";
+    std::string xAddress = "XVfvixWZQKkcenFRYApCjpTUyJ4BePTe3jJv7beatUZvQYh";
+
+    ASSERT_TRUE(Address::isValid(classicAddress));
+    ASSERT_TRUE(XAddress::isValid(xAddress));
+    ASSERT_FALSE(Address::isValid(bitcoinAddress));
+    ASSERT_FALSE(XAddress::isValid(bitcoinAddress));
+}
+
+} // namespace TW::Ripple
diff --git a/tests/chains/XRP/BinaryCodingTests.cpp b/tests/chains/XRP/BinaryCodingTests.cpp
new file mode 100644
index 00000000000..a8081beb0fc
--- /dev/null
+++ b/tests/chains/XRP/BinaryCodingTests.cpp
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "XRP/BinaryCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Ripple::tests {
+using namespace std;
+
+TEST(RippleBinaryCoding, encodeVariableLength) {
+    Data data;
+    encodeVariableLength(180, data);
+    EXPECT_EQ(hex(data), "b4");
+
+    data.clear();
+    encodeVariableLength(12080, data);
+    EXPECT_EQ(hex(data), "2e6f");
+
+    data.clear();
+    encodeVariableLength(12580, data);
+    EXPECT_EQ(hex(data), "000063");
+}
+
+} // namespace TW::Ripple::tests
diff --git a/tests/chains/XRP/TWAnySignerTests.cpp b/tests/chains/XRP/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..3dd17ea7d1b
--- /dev/null
+++ b/tests/chains/XRP/TWAnySignerTests.cpp
@@ -0,0 +1,469 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Common.pb.h"
+#include "proto/Ripple.pb.h"
+#include <TrustWalletCore/TWAnySigner.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+namespace TW::Ripple::tests {
+
+TEST(TWAnySignerRipple, SignXrpPayment) {
+    // https://testnet.xrpl.org/transactions/A202034796F37F38D1D20F2025DECECB1623FC801F041FC694199C0D0E49A739
+    auto key = parse_hex("a5576c0f63da10e584568c8d134569ff44017b0a249eb70657127ae04f38cc77");
+    Proto::SigningInput input;
+
+    input.mutable_op_payment()->set_amount(10);
+    input.set_fee(10);
+    input.set_sequence(32268248);
+    input.set_last_ledger_sequence(32268269);
+    input.set_account("rfxdLwsZnoespnTDDb1Xhvbc8EFNdztaoq");
+    input.mutable_op_payment()->set_destination("rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "12000022000000002401ec5fd8201b01ec5fed61400000000000000a68400000000000000a732103d13e1152965a51a4a9fd9a8b4ea3dd82a4eba6b25fcad5f460a2342bb650333f74463044022037d32835c9394f39b2cfd4eaf5b0a80e0db397ace06630fa2b099ff73e425dbc02205288f780330b7a88a1980fa83c647b5908502ad7de9a44500c08f0750b0d9e8481144c55f5a78067206507580be7bb2686c8460adff983148132e4e20aecf29090ac428a9c43f230a829220d");
+
+    // invalid tag
+    input.mutable_op_payment()->set_destination_tag(641505641505);
+
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(output.error(), Common::Proto::SigningError::Error_invalid_memo);
+    EXPECT_EQ(output.encoded(), "");
+}
+
+TEST(TWAnySignerRipple, SignXrpPaymentMain) {
+    // https://xrpscan.com/tx/4B9D022E8C77D798B7D11C41FDFDCF468F03A5564151C520EECA1E96FF1A1610
+    auto key = parse_hex("acf1bbf6264e699da0cc65d17ac03fcca6ded1522d19529df7762db46097ff9f");
+    Proto::SigningInput input;
+
+    input.mutable_op_payment()->set_amount(1000000);
+    input.set_fee(10);
+    input.set_sequence(75674534);
+    input.set_last_ledger_sequence(75674797);
+    input.set_account("rGV1v1xw23PHcRn4Km4tF8R2mfh6yTZkcP");
+    input.mutable_op_payment()->set_destination("rNLpgsBTCwiaZAnHe2ZViAN1GcXZtYW6rg");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "1200002200000000240482b3a6201b0482b4ad6140000000000f424068400000000000000a7321027efc5f15071d2ae5e73ee09a0c17456c5d9170a41d67e3297c554829199be80b74473045022100e1c746c3aeebc8278c627ee4c2ce5cae97e3856292c7fe5388f803920230a37b02207d2eccb76cd35dd379d6b24c2cabd786e62d34a564cf083e863176109c5b6bb48114aa000c09c692ef1f82787e51e22833149941ea2083149232ef60695add51f0f84534cc4084e4fdfc698e");
+}
+
+TEST(TWAnySignerRipple, SignTrustSetPayment) {
+    // https://testnet.xrpl.org/transactions/31042345374CFF785B3F7E2A3716E3BAB7E2CAA30D40F5E488E67ABA116655B9
+    auto key = parse_hex("8753e78ee2963f301f82e5eeab2754f593fc242ce94273dd2fb0684e3b0f2b91");
+    Proto::SigningInput input;
+
+    input.mutable_op_trust_set()->mutable_limit_amount()->set_currency("USD");
+    input.mutable_op_trust_set()->mutable_limit_amount()->set_value("10");
+    input.mutable_op_trust_set()->mutable_limit_amount()->set_issuer("rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn");
+    input.set_fee(10);
+    input.set_sequence(32268473);
+    input.set_last_ledger_sequence(32268494);
+    input.set_account("rnRkLPni2Q5yMxSqyJSJEkKUfQNFkaAspS");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "12001422000000002401ec60b9201b01ec60ce63d4c38d7ea4c6800000000000000000000000000055534400000000004b4e9c06f24296074f7bc48f92a97916c6dc5ea968400000000000000a732103dc4a0dae2d550de7cace9c26c1a331a114e3e7efee5577204b476d27e2dc683a7446304402206ebcc7a689845df373dd2566cd3789862d426d9ad4e6a09c2d2772b57e82696a022066b1f217a0f0d834d167613a313f74097423a9ccd11f1ae7f90ffab0d2fc26b58114308ea8e515b64f2e6616a33b42e1bbb9fa00bbd2");
+}
+
+TEST(TWAnySignerRipple, SignTokenPayment0) {
+    // https://testnet.xrpl.org/transactions/8F7820892294598B58CFA2E1101D15ED98C179B25A2BA6DAEB4F5B727CB00D4E
+    auto key = parse_hex("4ba5fd2ebf0f5d7e579b3c354c263ebb39cda4093845125786a280301af14e21");
+    Proto::SigningInput input;
+    input.mutable_op_payment()->mutable_currency_amount()->set_currency("USD");
+    input.mutable_op_payment()->mutable_currency_amount()->set_value("10");
+    input.mutable_op_payment()->mutable_currency_amount()->set_issuer("rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn");
+    input.set_fee(10);
+    input.set_sequence(32268645);
+    input.set_last_ledger_sequence(32268666);
+    input.set_account("raPAA61ca99bdwNiZs5JJukR5rvkHWvkBX");
+    input.mutable_op_payment()->set_destination("rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF");
+    input.set_private_key(key.data(), key.size());
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+    EXPECT_EQ(hex(output.encoded()), "12000022000000002401ec6165201b01ec617a61d4c38d7ea4c6800000000000000000000000000055534400000000004b4e9c06f24296074f7bc48f92a97916c6dc5ea968400000000000000a7321020652a477b0cca8b74d6e68a6a386a836b226101617481b95180eaffbe841b3227446304402203e925caeb05006afb135254e9ae4e46de2019db6c6f68614ef969885063a777602206af110fc29775256fcad8b14974c6a838141d82193192d3b57324fe1079afa1781143b2fa4f36553e5b7a4f54ff9e6883e44b4b0dbb383148132e4e20aecf29090ac428a9c43f230a829220d");
+}
+
+TEST(TWAnySignerRipple, SignTokenPayment1) {
+    // https://testnet.xrpl.org/transactions/14606DAAFA54DB29B738000DFC133312B341FFC1D22D57AE0C8D54C9C56E19D8
+    auto key = parse_hex("4041882ce8c2ceea6f4cfe1a067b927c1e1eb2f5eb025eaf2f429479a7ec3738");
+    Proto::SigningInput input;
+
+    input.mutable_op_payment()->mutable_currency_amount()->set_currency("USD");
+    input.mutable_op_payment()->mutable_currency_amount()->set_value("29.3e-1");
+    input.mutable_op_payment()->mutable_currency_amount()->set_issuer("rf1BiGeXwwQoi8Z2ueFYTEXSwuJYfV2Jpn");
+    input.set_fee(10);
+    input.set_sequence(32268768);
+    input.set_last_ledger_sequence(32268789);
+    input.set_account("raJe5XVt99649qn5Pg7cKdmgEYdN3d4Mky");
+    input.mutable_op_payment()->set_destination("rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "12000022000000002401ec61e0201b01ec61f561d48a68d1c931200000000000000000000000000055534400000000004b4e9c06f24296074f7bc48f92a97916c6dc5ea968400000000000000a73210348c331ab218ba964150490c83875b06ccad2100b1f5707f296764712738cf1ca74473045022100a938783258d33e2e3e6099d1ab68fd85c3fd21adfa00e136a67bed8fddec6c9a02206cc6784c1f212f19dc939207643d361ceaa8334eb366722cf33b24dc7669dd7a81143a2f2f189d05abb8519cc9dee0e2dbc6fa53924183148132e4e20aecf29090ac428a9c43f230a829220d");
+}
+
+TEST(TWAnySignerRipple, SignEscrowCreateMain) {
+    // https://xrpscan.com/tx/3576E5D413CBDC228D13F281BB66304C1EE9DDEAA5563F1783EDB1848266D739
+    auto key = parse_hex("a3cf20a85b25be4c955f0814718cc7a02eae9195159bd72ede5dd5c4e60d22c4");
+    Proto::SigningInput input;
+
+    // with finish after and dest tag
+    input.mutable_op_escrow_create()->set_amount(21300);
+    input.mutable_op_escrow_create()->set_destination("rEeSXUWEYyEADhDHvi3mtahkFVn7dYNH2G");
+    input.mutable_op_escrow_create()->set_destination_tag(67);
+    input.mutable_op_escrow_create()->set_cancel_after(755015907);
+    input.mutable_op_escrow_create()->set_finish_after(755015897);
+    input.mutable_op_escrow_create()->set_condition("");
+
+    input.set_fee(12);
+    input.set_sequence(84363229);
+    input.set_last_ledger_sequence(84363920);
+    input.set_account("rnXwGtLDXXcV63CnRoNaesSsJCZZkJwo9w");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120001220000000024050747dd2e00000043201b05074a9020242d00a0e320252d00a0d961400000000000533468400000000000000c7321029b557f4db390d68d39d3457204c225d4a68ed86854567a1da99d3e2cd640717374473045022100e62d5005401f1d2b1d9eaa42e0fdbb8b8a433d0cfe71455e782882aa6ab0656f02207b589489b4f344e87a956382e5ede6a55fbfc7e38701364c1fe7d056e9a3253a81143194b932f389b95922fba31662f3c8a606fedfd68314a0a67483ad4d51b2524eb304c0fcef6b2025b865");
+}
+
+TEST(TWAnySignerRipple, SignEscrowCreate) {
+    // https://testnet.xrpl.org/transactions/3F581927C742D5FAE65FB0759D0F04EF3B64B4A087911B07975816ECCB59915B
+    auto key = parse_hex("f157cf7951908b9a2b28d6c5817a3212c3971d8c05a1e964bbafaa5ad7529cb0");
+    Proto::SigningInput input;
+
+    // with finish after and dest tag
+    input.mutable_op_escrow_create()->set_amount(345941506);
+    input.mutable_op_escrow_create()->set_destination("rNS1tYfynXoKC3eX52gvVnSyU9mqWXvCgh");
+    input.mutable_op_escrow_create()->set_destination_tag(2467);
+    input.mutable_op_escrow_create()->set_cancel_after(0);
+    input.mutable_op_escrow_create()->set_finish_after(750095491);
+    input.mutable_op_escrow_create()->set_condition("");
+
+    input.set_fee(12);
+    input.set_sequence(41874843);
+    input.set_last_ledger_sequence(41874865);
+    input.set_account("rL6iE1bbAHekMavpGot6gRxqkQKm6yfoQ6");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120001220000000024027ef59b2e000009a3201b027ef5b120252cb58c836140000000149ea60268400000000000000c7321021846a49ea81238d03dff5a89a9da82eb06b23a276af9a06b45d4aba39713311f744630440220176318f29d2b815f599072230690397f91262c1f801bafada9820d89c719359c0220756eb74d815e20e86f6748c6821d3204f93221a95b4481a572a10530f5776c698114d8242542e6108fccf75a7f5bb0059cfae6d155378314937e838cb1033342c72acfae58fe2e3875ce7693");
+}
+
+TEST(TWAnySignerRipple, SignEscrowCreate2) {
+    // https://testnet.xrpl.org/transactions/3F581927C742D5FAE65FB0759D0F04EF3B64B4A087911B07975816ECCB59915B
+    auto key = parse_hex("8b488ed9b9875174140a97cad53cd8c652789889612f94a9006b7ced18a1c6ef");
+    Proto::SigningInput input;
+
+    // with cancel after > 0x7fffffff
+    input.mutable_op_escrow_create()->set_amount(88941506);
+    input.mutable_op_escrow_create()->set_destination("rfC73DuBhDqF3Zw1K3uxaQNCkwT8pPKyf5");
+    input.mutable_op_escrow_create()->set_destination_tag(0);
+    input.mutable_op_escrow_create()->set_cancel_after(2147483648);
+    input.mutable_op_escrow_create()->set_finish_after(750097108);
+    input.mutable_op_escrow_create()->set_condition("");
+
+    input.set_fee(12);
+    input.set_sequence(41875372);
+    input.set_last_ledger_sequence(41875394);
+    input.set_account("rEE4PdEYhEikJ1bvQjdE9HdjBV8yp8FsGC");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120001220000000024027ef7ac201b027ef7c220248000000020252cb592d46140000000054d23c268400000000000000c73210211cfeb81bc410e694e98c6a0f17c9c89d85e2b89bc17d2699063c0920217ab0574463044022038d27cd842422d8ee72d5cab11734ce128aef21d7cec17654d21c27d0556d23e0220059f913178a4c65a5d3289896876989e0fcaf3add9769459fb232ab94398368a81149c4970a2b763b9484e3b65d67f3d9b7b1698cb7f83144917342345fbe5cef1e22d3f1353fc468bf696ac");
+}
+
+TEST(TWAnySignerRipple, SignEscrowCreateWithConditionMain) {
+    // https://xrpscan.com/tx/77E01FD30A788BFC96F28960F099D4076255252F33FCD31EEBBCBB61E3318544
+    auto key = parse_hex("a3cf20a85b25be4c955f0814718cc7a02eae9195159bd72ede5dd5c4e60d22c4");
+    Proto::SigningInput input;
+
+    // with cancel after and crypto condition
+    input.mutable_op_escrow_create()->set_amount(37000);
+    input.mutable_op_escrow_create()->set_destination("rEeSXUWEYyEADhDHvi3mtahkFVn7dYNH2G");
+    input.mutable_op_escrow_create()->set_destination_tag(0);
+    input.mutable_op_escrow_create()->set_cancel_after(755014300);
+    input.mutable_op_escrow_create()->set_finish_after(0);
+    input.mutable_op_escrow_create()->set_condition("a0258020c26add2db64dd6d5700a5e2721c1e908d599901627b8dc82f25b3e035ec4004b810120"); // PREIMAGE-SHA-256 crypto-condition of secret 5d729ac237c4c7976403817b6409be7190efbfad49af2cf974b9582a854e8794
+
+    input.set_fee(12);
+    input.set_sequence(84363226);
+    input.set_last_ledger_sequence(84363509);
+    input.set_account("rnXwGtLDXXcV63CnRoNaesSsJCZZkJwo9w");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120001220000000024050747da201b050748f520242d009a9c61400000000000908868400000000000000c7321029b557f4db390d68d39d3457204c225d4a68ed86854567a1da99d3e2cd6407173744630440220307f4c91e91166db1428eb1ab8f65a84bd9b89542ed844045ffd040f5e13d12b022061120350b9685381e9941c7ec54ce154ca0ef0d01f630aeb3e78dd9fd087ff80701127a0258020c26add2db64dd6d5700a5e2721c1e908d599901627b8dc82f25b3e035ec4004b81012081143194b932f389b95922fba31662f3c8a606fedfd68314a0a67483ad4d51b2524eb304c0fcef6b2025b865");
+}
+
+TEST(TWAnySignerRipple, SignEscrowCreateWithCondition) {
+    // https://testnet.xrpl.org/transactions/A8EE35E26CD09E3D6A415DDEFEA6723CA5AFEB1838C5FE06835937FA49DEF3A0
+    auto key = parse_hex("a3cf20a85b25be4c955f0814718cc7a02eae9195159bd72ede5dd5c4e60d22c4");
+    Proto::SigningInput input;
+
+    // with cancel after and crypto condition
+    input.mutable_op_escrow_create()->set_amount(30941506);
+    input.mutable_op_escrow_create()->set_destination("rEeSXUWEYyEADhDHvi3mtahkFVn7dYNH2G");
+    input.mutable_op_escrow_create()->set_destination_tag(0);
+    input.mutable_op_escrow_create()->set_cancel_after(750090371);
+    input.mutable_op_escrow_create()->set_finish_after(0);
+    input.mutable_op_escrow_create()->set_condition("a0258020b3dda5c580919ce0fd6acdf013c337461951946e54b41446467961568cdd9e7b810120"); // PREIMAGE-SHA-256 crypto-condition of secret b3dda5c580919ce0fd6acdf013c337461951946e54b41446467961568cdd9e7b
+
+    input.set_fee(12);
+    input.set_sequence(41872968);
+    input.set_last_ledger_sequence(41873012);
+    input.set_account("rnXwGtLDXXcV63CnRoNaesSsJCZZkJwo9w");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120001220000000024027eee48201b027eee7420242cb57883614000000001d8214268400000000000000c7321029b557f4db390d68d39d3457204c225d4a68ed86854567a1da99d3e2cd640717374473045022100931b3a6634471fa22f709417d7280b76564a8f3a700cf51a50a2c1b1e0162d570220217c0f2e3922e9bc5b2175712c0e244f2f05bf42ccd1e632b06476f66704203f701127a0258020b3dda5c580919ce0fd6acdf013c337461951946e54b41446467961568cdd9e7b81012081143194b932f389b95922fba31662f3c8a606fedfd68314a0a67483ad4d51b2524eb304c0fcef6b2025b865");
+}
+
+TEST(TWAnySignerRipple, SignEscrowCreateWithCondition2) {
+    // https://testnet.xrpl.org/transactions/25AE9F7CBC9944B140A4BE338A47DD8C2C29313B44694533D9D47CD758A60A8F
+    auto key = parse_hex("be60f33cbeb2b5ee688dcb1e93986f2522d8ad76b3c48398bf2be02a6699e781");
+    Proto::SigningInput input;
+
+    // with cancel after, crypto condition and dest tag
+    input.mutable_op_escrow_create()->set_amount(28941506);
+    input.mutable_op_escrow_create()->set_destination("r9YD31TAtbS8EPwEt2gzGDjsaMDyV1s5QE");
+    input.mutable_op_escrow_create()->set_destination_tag(2467);
+    input.mutable_op_escrow_create()->set_cancel_after(750094604);
+    input.mutable_op_escrow_create()->set_finish_after(0);
+    input.mutable_op_escrow_create()->set_condition("a0258020ffecf1ae6182f10efebe0c0896cd6b044df7b27d33b05030033ef63d47e2b250810120"); // PREIMAGE-SHA-256 crypto-condition of secret ffecf1ae6182f10efebe0c0896cd6b044df7b27d33b05030033ef63d47e2b250
+
+    input.set_fee(12);
+    input.set_sequence(41874370);
+    input.set_last_ledger_sequence(41874392);
+    input.set_account("rpLGh11T9B6b4UjAU1WRCJowLw8uk7vS44");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120001220000000024027ef3c22e000009a3201b027ef3d820242cb5890c614000000001b99cc268400000000000000c7321035e6cd73289f9b1a796fba572f7a2732aae23b2a9ea6b0ec239d5b9feb388774074473045022100c4bb3b65acd5d30aa8f85ea2a0d2c0e18d2025a005a827722059a9a636eb1bca02207d73b4a64d679e605a6cb31881d7ea3642c1e54e3bf38d13d0dd4219c27d1420701127a0258020ffecf1ae6182f10efebe0c0896cd6b044df7b27d33b05030033ef63d47e2b25081012081140e9c9b31b826671aaa387555cdeccab82a78402083145da8080d21fecf98f24ea2223482e5d24f107799");
+}
+
+TEST(TWAnySignerRipple, SignEscrowCancelMain) {
+    // https://xrpscan.com/tx/949B3C3D8B4528C95D07654BBA10B08ABA65FFD339E31706BC93CB0824427F97
+    auto key = parse_hex("a3cf20a85b25be4c955f0814718cc7a02eae9195159bd72ede5dd5c4e60d22c4");
+    Proto::SigningInput input;
+
+    input.mutable_op_escrow_cancel()->set_owner("rnXwGtLDXXcV63CnRoNaesSsJCZZkJwo9w");
+    input.mutable_op_escrow_cancel()->set_offer_sequence(84363227);
+
+    input.set_fee(12);
+    input.set_sequence(84363228);
+    input.set_last_ledger_sequence(84363740);
+    input.set_account("rnXwGtLDXXcV63CnRoNaesSsJCZZkJwo9w");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120004220000000024050747dc2019050747db201b050749dc68400000000000000c7321029b557f4db390d68d39d3457204c225d4a68ed86854567a1da99d3e2cd64071737446304402202c0416934dbf3a0c42d0b0da9e893cec69e42c81f41424f4a388c3ba8862e65a02201781e22ef85b251902e918f6d923769993757a79b865a62ecdebc1a015368f1f81143194b932f389b95922fba31662f3c8a606fedfd682143194b932f389b95922fba31662f3c8a606fedfd6");
+}
+
+TEST(TWAnySignerRipple, SignEscrowCancel) {
+    // https://testnet.xrpl.org/transactions/5B0F8766FFBDE7D3A9ACAA63361BF00FE0739DC8718507776EB2C1AD980BC965
+    auto key = parse_hex("bf9810cc4f7cc5e6dea8a0c29f3389d9d511e795d467b402a870e71d93243705");
+    Proto::SigningInput input;
+
+    input.mutable_op_escrow_cancel()->set_owner("rE16pf2ZQUZBDLKAyTFF9Q1b3YY1nc7v2J");
+    input.mutable_op_escrow_cancel()->set_offer_sequence(41875229);
+
+    input.set_fee(12);
+    input.set_sequence(41875230);
+    input.set_last_ledger_sequence(41875263);
+    input.set_account("rE16pf2ZQUZBDLKAyTFF9Q1b3YY1nc7v2J");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120004220000000024027ef71e2019027ef71d201b027ef73f68400000000000000c73210277314966f72e9520199faa3941bd45b89e444f7eabf203e805527f880de80b8674473045022100ec04d05db5725ce154a511f93056fde0b825b7e0bb4a59b4d4264a008eafdcfe0220676f30f916c6ea0644c11c0bcafcfa8209a083041742d672a726a5c8d99230ea8114a327f724d30f2732f78a4ec6744db298e827ba2b8214a327f724d30f2732f78a4ec6744db298e827ba2b");
+}
+
+TEST(TWAnySignerRipple, SignEscrowFinishMain) {
+    // https://xrpscan.com/tx/F015FB9E893877289E3058F14DD2FAA93D7F1E44AC2C7F71E684BD65B94EEB59
+    auto key = parse_hex("f60edca8e4bb25f9916017c9c7fe93e633b800550f86cf305a2e99271d7cede5");
+    Proto::SigningInput input;
+
+    input.mutable_op_escrow_finish()->set_owner("rnXwGtLDXXcV63CnRoNaesSsJCZZkJwo9w");
+    input.mutable_op_escrow_finish()->set_offer_sequence(84363235);
+
+    input.set_fee(12);
+    input.set_sequence(84363475);
+    input.set_last_ledger_sequence(84364395);
+    input.set_account("rEeSXUWEYyEADhDHvi3mtahkFVn7dYNH2G");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120002220000000024050748d32019050747e3201b05074c6b68400000000000000c7321025a4c754a3f836ebe18520e7d3861c6e38a4adfe466465d5db6cbb2d745d27ee574473045022100df5a22c475fa039d8fd7f1dd9a3b248e2f11232bf23ae0206b79b6ac3014a80e02202df2da6d98ed9ced91b9790a3d84f28c2aeb368e3cde84806926086d74d406c18114a0a67483ad4d51b2524eb304c0fcef6b2025b86582143194b932f389b95922fba31662f3c8a606fedfd6");
+}
+
+TEST(TWAnySignerRipple, SignEscrowFinish) {
+    // https://testnet.xrpl.org/transactions/690E04E97761E3E5F33A9FF3DA42C16E8E234043850DA294BB3FE38CAE551E71
+    auto key = parse_hex("a6e306206d400dcc4a2d00e70b4a3925d511b2dabc1a85f4ffbf174a334e28e6");
+    Proto::SigningInput input;
+
+    input.mutable_op_escrow_finish()->set_owner("rL6iE1bbAHekMavpGot6gRxqkQKm6yfoQ6");
+    input.mutable_op_escrow_finish()->set_offer_sequence(41874843);
+
+    input.set_fee(12);
+    input.set_sequence(41874845);
+    input.set_last_ledger_sequence(41874877);
+    input.set_account("rNS1tYfynXoKC3eX52gvVnSyU9mqWXvCgh");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120002220000000024027ef59d2019027ef59b201b027ef5bd68400000000000000c7321026f8adad2b4071daa02916f8759ff148fad37c1562e48e71bb608d896d1c833cb74473045022100a7f06325574a9c4300725cb069029645b94d67217e5ae15a2e20bc0387e32aaf02206f9f1a7ae4aaccf2f4c2ab8d90f868e786a285aae677e0b01507eca5dd6823818114937e838cb1033342c72acfae58fe2e3875ce76938214d8242542e6108fccf75a7f5bb0059cfae6d15537");
+}
+
+TEST(TWAnySignerRipple, SignEscrowFinishWithConditionMain) {
+    // https://xrpscan.com/tx/7E9AC2C8286E3EC0410784920A0F8048C79257EDF19B392F98A31F62E3CF4FAD
+    auto key = parse_hex("f60edca8e4bb25f9916017c9c7fe93e633b800550f86cf305a2e99271d7cede5");
+    Proto::SigningInput input;
+
+    input.mutable_op_escrow_finish()->set_owner("rnXwGtLDXXcV63CnRoNaesSsJCZZkJwo9w");
+    input.mutable_op_escrow_finish()->set_offer_sequence(84363226);
+    input.mutable_op_escrow_finish()->set_condition("a0258020c26add2db64dd6d5700a5e2721c1e908d599901627b8dc82f25b3e035ec4004b810120");
+    input.mutable_op_escrow_finish()->set_fulfillment("a02280205d729ac237c4c7976403817b6409be7190efbfad49af2cf974b9582a854e8794");
+
+    input.set_fee(423);
+    input.set_sequence(84363473);
+    input.set_last_ledger_sequence(84363511);
+    input.set_account("rEeSXUWEYyEADhDHvi3mtahkFVn7dYNH2G");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120002220000000024050748d12019050747da201b050748f76840000000000001a77321025a4c754a3f836ebe18520e7d3861c6e38a4adfe466465d5db6cbb2d745d27ee574473045022100f06a6ac18efc1280f9d26cbb47c31f7ecd72ed200f9d05c6c762ffcf18b53534022049c6bb4ac8e79c478939a55dd1cb571d56ec929e5200332e410fd69c0fe1ef48701024a02280205d729ac237c4c7976403817b6409be7190efbfad49af2cf974b9582a854e8794701127a0258020c26add2db64dd6d5700a5e2721c1e908d599901627b8dc82f25b3e035ec4004b8101208114a0a67483ad4d51b2524eb304c0fcef6b2025b86582143194b932f389b95922fba31662f3c8a606fedfd6");
+}
+
+TEST(TWAnySignerRipple, SignEscrowFinishWithCondition) {
+    // https://testnet.xrpl.org/transactions/4A49D4AD05FBDC4A354E31C7453829509F59DD2B51CDE560C4350155F5DBFD86
+    auto key = parse_hex("4bae9219cf9c58e5db0c395900085f07fc06709e1b2223ccac40191fbcbdab2a");
+    Proto::SigningInput input;
+
+    input.mutable_op_escrow_finish()->set_owner("rpLGh11T9B6b4UjAU1WRCJowLw8uk7vS44");
+    input.mutable_op_escrow_finish()->set_offer_sequence(41874370);
+    input.mutable_op_escrow_finish()->set_condition("a0258020ffecf1ae6182f10efebe0c0896cd6b044df7b27d33b05030033ef63d47e2b250810120");
+    input.mutable_op_escrow_finish()->set_fulfillment("a022802049b9ab20ca85b55d0c12b948ec7c524f843c77be1ef1561a42b7167dce174b7a");
+
+    input.set_fee(423);
+    input.set_sequence(41874372);
+    input.set_last_ledger_sequence(41874394);
+    input.set_account("r9YD31TAtbS8EPwEt2gzGDjsaMDyV1s5QE");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "120002220000000024027ef3c42019027ef3c2201b027ef3da6840000000000001a773210277c5d02c3c774c96017234a532dae12023ac8fb499c5d90a56488900ecc746d07446304402206698c1d296bf1493c97beb64945558724c6c88474cd3e0b90e9dc9e7313ac1970220175fef60c48646be934be28a964af0cc55843fb6e6ef17c886716a03af849f74701024a022802049b9ab20ca85b55d0c12b948ec7c524f843c77be1ef1561a42b7167dce174b7a701127a0258020ffecf1ae6182f10efebe0c0896cd6b044df7b27d33b05030033ef63d47e2b25081012081145da8080d21fecf98f24ea2223482e5d24f10779982140e9c9b31b826671aaa387555cdeccab82a784020");
+}
+
+TEST(TWAnySignerRipple, SignNfTokenBurn) {
+    // https://devnet.xrpl.org/transactions/37DA90BE3C30016B3A2C3D47D9677278A3F6D4141B318793CE6AA467A6530E2D
+    auto key = parse_hex("7c2ea5c7b1fd7dfc62d879918b7fc779cdff6bf6391d02ec99854297e916318e");
+    Proto::SigningInput input;
+
+    input.mutable_op_nftoken_burn()->set_nftoken_id("000b013a95f14b0044f78a264e41713c64b5f89242540ee208c3098e00000d65");
+    input.set_fee(10);
+    input.set_sequence(22858395);
+    input.set_last_ledger_sequence(22858416);
+    input.set_account("rhR1mTXkg4iSGhz7zsEKBLbV3MkopivPVF");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "12001a220000000024015cca9b201b015ccab05a000b013a95f14b0044f78a264e41713c64b5f89242540ee208c3098e00000d6568400000000000000a73210254fc876043109af1ff11b832320be4436ef51dcc344da5970c9b6c6d1fbcddcf744730450221008b4d437bc92aa4643b275b17c0f88a1bef2c1c160ece5faf93b03e2d31b8278602207640e7e35426352deaafecf61e2b401a4ea1fc645839280370a72fa3c41aea7d8114259cbcf9635360bc302f27d0ce72c18d4dbe9c8d");
+}
+
+TEST(TWAnySignerRipple, SignNfTokenCreateOffer) {
+    // https://devnet.xrpl.org/transactions/E61D66E261DB89CEAAB4F54ECF792B329296CB524E8B40EA99D27CF5E16DD27D
+    auto key = parse_hex("1963884da4a4da79ad7681d106b2c55fb652c68ca7b288dd12bb86cd40b9d940");
+    Proto::SigningInput input;
+
+    input.mutable_op_nftoken_create_offer()->set_nftoken_id("000b013a95f14b0044f78a264e41713c64b5f89242540ee208c3098e00000d65");
+    input.mutable_op_nftoken_create_offer()->set_destination("rDxTa8vhigDUCq9nmZY8jAkFne5XrcYbxG");
+    input.set_fee(10);
+    input.set_sequence(22857522);
+    input.set_last_ledger_sequence(22857543);
+    input.set_account("rJdxtrVoL3Tak74EzN8SdMxFF6RP9smjJJ");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "12001b220000000124015cc732201b015cc7475a000b013a95f14b0044f78a264e41713c64b5f89242540ee208c3098e00000d6561400000000000000068400000000000000a7321022707066e4f8b87b749ef802338be064065dc978f0ea52ea9c8c8ea0a6145571974473045022100a148140469b8e9e2f9aa43631f3101e532d161d49a05e739cd3494ea208bd657022029a9752df3fc0d23b8fdb46d2274e69ab198ce6f373aeb7cdd0d81ab05aff6f48114c177c23ed1f5d175f42fd7970ece74ac18d61c4d83148e1e2ca343165bf30e96abead961f7a34510ad93");
+}
+
+TEST(TWAnySignerRipple, SignNfTokenAcceptOffer) {
+    // https://devnet.xrpl.org/transactions/6BB00A7BABB8797D60E3AB0E52DB64562524D014833977D87B04CA9FA3F56AD7
+    auto key = parse_hex("3c01b3458d2b2a4b86a5699d11682d791b5c3136692c5594f7a8ca7f3967e7ae");
+    Proto::SigningInput input;
+
+    input.mutable_op_nftoken_accept_offer()->set_sell_offer("000b013a95f14b0044f78a264e41713c64b5f89242540ee208c3098e00000d65");
+    input.set_fee(10);
+    input.set_sequence(22857743);
+    input.set_last_ledger_sequence(22857764);
+    input.set_account("rPa2KsEuSuZnmjosds99nhgsoiKtw85j6Z");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "12001d220000000024015cc80f201b015cc824501d000b013a95f14b0044f78a264e41713c64b5f89242540ee208c3098e00000d6568400000000000000a73210331c298cb86428b9126bd4af6a952870cfe3fe5065dc093cf97f3edbb27e9dd15744630440220797922caaa593c4e91fa6b63a38c92ef9f5e2183128918dda166f4292882e137022057702b668d7463ef1d01dad5ee6633bd36f0aa358dacc90d6b68d248672a400f8114f260a758132d3ed27e52d7f55ef0481606f090d4");
+}
+
+TEST(TWAnySignerRipple, SignNfTokenCancelOffer) {
+    // https://devnet.xrpl.org/transactions/CBA148308A0D1561E5E8CDF1F2E8D5562C320C221AC4053AA5F495CEF4B5D5D4
+    auto key = parse_hex("3e50cc102d8c96abd55f047a536b6425154514ba8abdf5f09335a7c644176c5d");
+    Proto::SigningInput input;
+
+    input.mutable_op_nftoken_cancel_offer()->add_token_offers("000b013a95f14b0044f78a264e41713c64b5f89242540ee208c3098e00000d65");
+    input.set_fee(10);
+    input.set_sequence(22857838);
+    input.set_last_ledger_sequence(22857859);
+    input.set_account("rPqczdU9bzow966hQKQejsXrMJspM7G4CC");
+    input.set_private_key(key.data(), key.size());
+
+    Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeXRP);
+
+    EXPECT_EQ(hex(output.encoded()), "12001c220000000024015cc86e201b015cc88368400000000000000a7321022250f103fd045edf2e552df2d20aca01a52dc6aedd522d68767f1c744fedb39d74463044022015fff495fc5d61cd71e5815e4d23845ec26f4dc94adb85207feba2c97e19856502207297ec84afc0bb74aa8a20d7254025a82d9b9f177f648845d8c72ee62884ff618114fa84c77f2a5245ef774845d40428d2a6f9603415041320000b013a95f14b0044f78a264e41713c64b5f89242540ee208c3098e00000d65");
+}
+
+} // namespace TW::Ripple::tests
diff --git a/tests/chains/XRP/TWCoinTypeTests.cpp b/tests/chains/XRP/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..d9fcc697b53
--- /dev/null
+++ b/tests/chains/XRP/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWXRPCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeXRP));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("E26AB8F3372D2FC02DEC1FD5674ADAB762D684BFFDBBDF5D674E9D7CF4A47054"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeXRP, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("rfkH7EuS1XcSkB9pocy1R6T8F4CsNYixYU"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeXRP, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeXRP));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeXRP));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeXRP), 6);
+    ASSERT_EQ(TWBlockchainRipple, TWCoinTypeBlockchain(TWCoinTypeXRP));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeXRP));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeXRP));
+    assertStringsEqual(symbol, "XRP");
+    assertStringsEqual(txUrl, "https://bithomp.com/explorer/E26AB8F3372D2FC02DEC1FD5674ADAB762D684BFFDBBDF5D674E9D7CF4A47054");
+    assertStringsEqual(accUrl, "https://bithomp.com/explorer/rfkH7EuS1XcSkB9pocy1R6T8F4CsNYixYU");
+    assertStringsEqual(id, "ripple");
+    assertStringsEqual(name, "XRP");
+}
diff --git a/tests/chains/XRP/TWRippleAddressTests.cpp b/tests/chains/XRP/TWRippleAddressTests.cpp
new file mode 100644
index 00000000000..db9d8ec9382
--- /dev/null
+++ b/tests/chains/XRP/TWRippleAddressTests.cpp
@@ -0,0 +1,76 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWHDWallet.h>
+#include <TrustWalletCore/TWRippleXAddress.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Ripple::tests {
+
+const char* validAddrStr1 = "X76UnYEMbQfEs3mUqgtjp4zFy9exgThRj7XVZ6UxsdrBptF";
+const char* publicKeyDataStr1 = "0303E20EC6B4A39A629815AE02C0A1393B9225E3B890CAE45B59F42FA29BE9668D";
+const char* invalidAddrStr1 = "12345678";
+
+TEST(TWRippleXAddress, ExtendedKeys) {
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(
+                                       STRING("ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal").get(),
+                                       STRING("TREZOR").get()));
+
+    auto xpub = WRAPS(TWHDWalletGetExtendedPublicKey(wallet.get(), TWPurposeBIP44, TWCoinTypeXRP, TWHDVersionXPUB));
+    auto xprv = WRAPS(TWHDWalletGetExtendedPrivateKey(wallet.get(), TWPurposeBIP44, TWCoinTypeXRP, TWHDVersionXPRV));
+
+    assertStringsEqual(xpub, "xpub6D9oDY4gqFBtsFEonh5GTDiUm6nmij373YWzmYdshcnM4AFzdhUf55iZD33vNU2ZqfQJU5wiCJUgisMt2RHKDzhi1PbZfh5Y2NiiYJAQqUn");
+    assertStringsEqual(xprv, "xprv9zASp2XnzsdbemALgfYG65mkD4xHKGKFgKbPyAEG9HFNBMvr6AAQXHQ5MmqM66EnbJfe9TvYMy1bucz7hSQjG43NVizRZwJJYfLmeKo4nVB");
+}
+
+TEST(TWRipple, XAddress) {
+    const auto string = STRING("XVfvixWZQKkcenFRYApCjpTUyJ4BePTe3jJv7beatUZvQYh");
+    const auto xAddress = WRAP(TWRippleXAddress, TWRippleXAddressCreateWithString(string.get()));
+
+    EXPECT_TRUE(TWRippleXAddressIsValidString(string.get()));
+    EXPECT_EQ(TWRippleXAddressTag(xAddress.get()), 12345ul);
+    assertStringsEqual(WRAPS(TWRippleXAddressDescription(xAddress.get())), "XVfvixWZQKkcenFRYApCjpTUyJ4BePTe3jJv7beatUZvQYh");
+}
+
+TEST(TWRippleXAddress, CreateAndDelete) {
+    {
+        TWRippleXAddress* addr = TWRippleXAddressCreateWithString(STRING(validAddrStr1).get());
+        EXPECT_TRUE(addr != nullptr);
+        TWRippleXAddressDelete(addr);
+    }
+    {
+        auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA(publicKeyDataStr1).get(), TWPublicKeyTypeSECP256k1));
+        TWRippleXAddress* addr = TWRippleXAddressCreateWithPublicKey(publicKey.get(), 12345);
+        EXPECT_TRUE(addr != nullptr);
+        TWRippleXAddressDelete(addr);
+    }
+}
+
+TEST(TWRippleXAddress, AddressEqual) {
+    auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA(publicKeyDataStr1).get(), TWPublicKeyTypeSECP256k1));
+    auto addr1 = WRAP(TWRippleXAddress, TWRippleXAddressCreateWithPublicKey(publicKey.get(), 12345));
+    EXPECT_TRUE(addr1.get() != nullptr);
+
+    auto addr2 = WRAP(TWRippleXAddress, TWRippleXAddressCreateWithString(STRING(validAddrStr1).get()));
+    EXPECT_TRUE(addr2.get() != nullptr);
+    ASSERT_TRUE(TWRippleXAddressEqual(addr1.get(), addr2.get()));
+}
+
+TEST(TWRippleXAddress, IsValidString) {
+    ASSERT_TRUE(TWRippleXAddressIsValidString(STRING(validAddrStr1).get()));
+    ASSERT_FALSE(TWRippleXAddressIsValidString(STRING(invalidAddrStr1).get()));
+}
+
+TEST(TWRippleXAddress, AddressDescription) {
+
+    auto addr1 = WRAP(TWRippleXAddress, TWRippleXAddressCreateWithString(STRING(validAddrStr1).get()));
+    EXPECT_TRUE(addr1.get() != nullptr);
+    auto addrStr1 = std::string(TWStringUTF8Bytes(WRAPS(TWRippleXAddressDescription(addr1.get())).get()));
+    EXPECT_TRUE(addrStr1 == validAddrStr1);
+}
+
+} // namespace TW::Ripple::tests
diff --git a/tests/chains/XRP/TransactionCompilerTests.cpp b/tests/chains/XRP/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..f5040e2cf41
--- /dev/null
+++ b/tests/chains/XRP/TransactionCompilerTests.cpp
@@ -0,0 +1,97 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Ripple.pb.h"
+#include "proto/TransactionCompiler.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+namespace TW::Ripple::tests {
+
+TEST(RippleCompiler, CompileRippleWithSignatures) {
+    const auto coin = TWCoinTypeXRP;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto key = parse_hex("acf1bbf6264e699da0cc65d17ac03fcca6ded1522d19529df7762db46097ff9f");
+    auto input = TW::Ripple::Proto::SigningInput();
+    auto privateKey = TW::PrivateKey(key);
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+
+    input.mutable_op_payment()->set_amount(1000000);
+    input.set_fee(10);
+    input.set_sequence(75674534);
+    input.set_last_ledger_sequence(75674797);
+    input.set_account("rGV1v1xw23PHcRn4Km4tF8R2mfh6yTZkcP");
+    input.mutable_op_payment()->set_destination("rNLpgsBTCwiaZAnHe2ZViAN1GcXZtYW6rg");
+    input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashesData = TransactionCompiler::preImageHashes(coin, inputStrData);
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    preSigningOutput.ParseFromArray(preImageHashesData.data(), (int)preImageHashesData.size());
+    auto preImage = preSigningOutput.data();
+    EXPECT_EQ(hex(preImage), "535458001200002200000000240482b3a6201b0482b4ad6140000000000f424068400000000000000a7321027efc5f15071d2ae5e73ee09a0c17456c5d9170a41d67e3297c554829199be80b8114aa000c09c692ef1f82787e51e22833149941ea2083149232ef60695add51f0f84534cc4084e4fdfc698e");
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImageHash), "86ef78df7a4aad29e6b3730f7965c1bd5ccd2439426cb738d7c494a64cfaf4af");
+    // Simulate signature, normally obtained from signature server
+    const auto signature = privateKey.signAsDER(TW::data(preImageHash));
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verifyAsDER(signature, TW::data(preImageHash)));
+
+    /// Step 3: Compile transaction info
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, inputStrData, {signature}, {publicKey.bytes});
+    const auto ExpectedTx = std::string("1200002200000000240482b3a6201b0482b4ad6140000000000f424068400000000000000a7321027efc5f15071d2ae5e73ee09a0c17456c5d9170a41d67e3297c554829199be80b74473045022100e1c746c3aeebc8278c627ee4c2ce5cae97e3856292c7fe5388f803920230a37b02207d2eccb76cd35dd379d6b24c2cabd786e62d34a564cf083e863176109c5b6bb48114aa000c09c692ef1f82787e51e22833149941ea2083149232ef60695add51f0f84534cc4084e4fdfc698e");
+
+    {
+        TW::Ripple::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+
+        EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+        ASSERT_EQ(output.error(), TW::Common::Proto::SigningError::OK);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        TW::Ripple::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(inputStrData.data(), (int)inputStrData.size()));
+        signingInput.set_private_key(key.data(), key.size());
+
+        TW::Ripple::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+    }
+
+    { // Negative: not enough signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {signature, signature}, {publicKey.bytes});
+        Ripple::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_no_support_n2n);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, inputStrData, {}, {});
+        Ripple::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
+
+} // namespace TW::Ripple::tests
diff --git a/tests/chains/XRP/TransactionTests.cpp b/tests/chains/XRP/TransactionTests.cpp
new file mode 100644
index 00000000000..eccde7ccaf4
--- /dev/null
+++ b/tests/chains/XRP/TransactionTests.cpp
@@ -0,0 +1,136 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "XRP/Address.h"
+#include "XRP/Transaction.h"
+#include "XRP/BinaryCoding.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+using namespace std;
+
+namespace TW::Ripple::tests {
+
+TEST(RippleTransaction, serializeAmount) {
+    /// From https://github.com/trezor/trezor-core/blob/master/tests/test_apps.ripple.serializer.py
+    auto data0 = Transaction::serializeAmount(0);
+    auto data1 = Transaction::serializeAmount(1);
+    auto data2 = Transaction::serializeAmount(93493429243);
+    auto data3 = Transaction::serializeAmount(25000000);
+    auto data4 = Transaction::serializeAmount(100000000000);
+    /// more than max supply
+    auto data5 = Transaction::serializeAmount(200000000000000000);
+    /// negative value
+    auto data6 = Transaction::serializeAmount(-1);
+
+    ASSERT_EQ(hex(data0), "4000000000000000");
+    ASSERT_EQ(hex(data1), "4000000000000001");
+    ASSERT_EQ(hex(data2), "40000015c4a483fb");
+    ASSERT_EQ(hex(data3), "40000000017d7840");
+    ASSERT_EQ(hex(data4), "400000174876e800");
+    ASSERT_EQ(hex(data5), "42c68af0bb140000");
+    ASSERT_EQ(hex(data6), "");
+}
+
+TEST(RippleTransaction, serialize) {
+    /// From https://github.com/trezor/trezor-core/blob/master/tests/test_apps.ripple.serializer.py
+    auto account = Address("r9TeThyi5xiuUUrFjtPKZiHcDxs7K9H6Rb");
+    auto destination = "r4BPgS7DHebQiU31xWELvZawwSG2fSPJ7C";
+    auto tx1 = Transaction(
+       /* fee */10,
+       /* flags */0,
+       /* sequence */2,
+       /* last_ledger_sequence */0,
+       /* account */account
+    );
+    tx1.createXrpPayment(
+       /* amount */25000000,
+       /* destination */destination,
+       /* destination_tag*/0
+    );
+    auto serialized1 = tx1.serialize();
+    ASSERT_EQ(hex(serialized1), "120000220000000024000000026140000000017d784068400000000000000a81145ccb151f6e9d603f394ae778acf10d3bece874f68314e851bbbe79e328e43d68f43445368133df5fba5a");
+
+    auto tx2 = Transaction(
+       /* fee */15,
+       /* flags */0,
+       /* sequence */144,
+       /* last_ledger_sequence */0,
+       /* account */Address("rGWTUVmm1fB5QUjMYn8KfnyrFNgDiD9H9e")
+    );
+    tx2.createXrpPayment(
+       /* amount */200000,
+       /* destination */"rw71Qs1UYQrSQ9hSgRohqNNQcyjCCfffkQ",
+       /* destination_tag*/0
+    );
+    auto serialized2 = tx2.serialize();
+    ASSERT_EQ(hex(serialized2), "12000022000000002400000090614000000000030d4068400000000000000f8114aa1bd19d9e87be8069fdbf6843653c43837c03c6831467fe6ec28e0464dd24fb2d62a492aac697cfad02");
+
+    auto tx3 = Transaction(
+       /* fee */12,
+       /* flags */0,
+       /* sequence */1,
+       /* last_ledger_sequence */0,
+       /* account */Address("r4BPgS7DHebQiU31xWELvZawwSG2fSPJ7C")
+    );
+    tx3.createXrpPayment(
+       /* amount */25000000,
+       /* destination */"rBqSFEFg2B6GBMobtxnU1eLA1zbNC9NDGM",
+       /* destination_tag*/4146942154
+    );
+    auto serialized3 = tx3.serialize();
+    ASSERT_EQ(hex(serialized3), "120000220000000024000000012ef72d50ca6140000000017d784068400000000000000c8114e851bbbe79e328e43d68f43445368133df5fba5a831476dac5e814cd4aa74142c3ab45e69a900e637aa2");
+
+    auto tx4 = Transaction(
+       /* fee */12,
+       /* flags */0,
+       /* sequence */1,
+       /* last_ledger_sequence */0,
+       /* account */Address("r4BPgS7DHebQiU31xWELvZawwSG2fSPJ7C")
+    );
+    tx4.createXrpPayment(
+       /* amount */25000000,
+       /* destination */"XVhidoXkozM5DTZFdDnJ5nYC8FPrTuJiyGh1VxSGS6RNJJ5",
+       /* ignore destination_tag*/12345
+    );
+    auto serialized4 = tx4.serialize();
+    ASSERT_EQ(hex(serialized4), hex(serialized3));
+}
+
+TEST(RippleTransaction, preImage) {
+    auto account = Address("r9LqNeG6qHxjeUocjvVki2XR35weJ9mZgQ");
+    auto destination = "rHb9CJAWyB4rj91VRWn96DkukG4bwdtyTh";
+    auto tx1 = Transaction(
+        /* fee */10,
+        /* flags */2147483648,
+        /* sequence */1,
+        /* last_ledger_sequence */0,
+        /* account */account
+    );
+    tx1.createXrpPayment(
+        /* amount */1000,
+        /* destination */destination,
+        /* destination_tag*/0
+    );
+    tx1.pub_key = parse_hex("ed5f5ac8b98974a3ca843326d9b88cebd0560177b973ee0b149f782cfaa06dc66a");
+    auto unsignedTx = tx1.getPreImage();
+
+    ASSERT_EQ(hex(unsignedTx),
+          /* prefix */      "53545800"
+          /* tx type */     "120000"
+          /* flags */       "2280000000"
+          /* sequence */    "2400000001"
+          /* amount */      "6140000000000003e8"
+          /* fee */         "68400000000000000a"
+          /* pub key */     "7321ed5f5ac8b98974a3ca843326d9b88cebd0560177b973ee0b149f782cfaa06dc66a"
+          /* account */     "81145b812c9d57731e27a2da8b1830195f88ef32a3b6"
+          /* destination */ "8314b5f762798a53d543a014caf8b297cff8f2f937e8"
+    );
+    ASSERT_EQ(unsignedTx.size(), 114ul);
+}
+
+} // namespace TW::Ripple::tests
diff --git a/tests/chains/Zcash/AddressTests.cpp b/tests/chains/Zcash/AddressTests.cpp
new file mode 100644
index 00000000000..32ea339ed5f
--- /dev/null
+++ b/tests/chains/Zcash/AddressTests.cpp
@@ -0,0 +1,65 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Zcash/TAddress.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Zcash {
+
+TEST(ZcashAddress, FromPrivateKey) {
+    const auto privateKey =  PrivateKey(parse_hex("2d8f68944bdbfbc0769542fba8fc2d2a3de67393334471624364c7006da2aa54"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    const auto address = TAddress(publicKey);
+
+    EXPECT_EQ(address.string(), "t1Wg9uPPAfwhBWeRjtDPa5ZHNzyBx9rJVKY");
+    EXPECT_EQ(address.bytes[0], 0x1c);
+    EXPECT_EQ(address.bytes[1], 0xb8);
+}
+
+TEST(ZcashAddress, FromPublicKey) {
+    const auto privateKey = PrivateKey(parse_hex("BE88DF1D0BF30A923CB39C3BB953178BAAF3726E8D3CE81E7C8462E046E0D835"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    const auto address = TAddress(publicKey);
+
+    EXPECT_EQ(address.string(), "t1gaySCXCYtXE3ygP38YuWtVZczsEbdjG49");
+    EXPECT_EQ(address.bytes[0], 0x1c);
+    EXPECT_EQ(address.bytes[1], 0xb8);
+}
+
+TEST(ZcashAddress, Valid) {
+    EXPECT_TRUE(TAddress::isValid(std::string("t1RygJmrLdNGgi98gUgEJDTVaELTAYWoMBy")));
+    EXPECT_TRUE(TAddress::isValid(std::string("t1TWk2mmvESDnE4dmCfT7MQ97ij6ZqLpNVU")));
+    EXPECT_TRUE(TAddress::isValid(std::string("t3RD6RFKhWSotNbPEY4Vw7Ku9QCfKkzrbBL")));
+}
+
+TEST(ZcashAddress, Invalid) {
+    EXPECT_FALSE(TAddress::isValid(std::string("abc")));
+    EXPECT_FALSE(TAddress::isValid(std::string("0x5aAeb6053F3E94C9b9A09f33669435E7Ef1BeAed")));
+    EXPECT_FALSE(TAddress::isValid(std::string("175tWpb8K1S7NmH4Zx6rewF9WQrcZv245W")));
+    EXPECT_FALSE(TAddress::isValid(std::string("t1RygJmrLdNGgi98+UgEJDTVaELTAYWoMBy"))); // Invalid Base58
+    EXPECT_FALSE(TAddress::isValid(std::string("t1RygJmrLdNGgi98gUgEJDTVaELTAYW"))); // too short
+    EXPECT_FALSE(TAddress::isValid(std::string("t1RygJmrLdNGgi98gUgEJDTVaELTAYWoMBz"))); // bad checksum
+    EXPECT_FALSE(TAddress::isValid(std::string("TJRyWwFs9wTFGZg3JbrVriFbNfCug5tDeC"))); // too short
+    EXPECT_FALSE(TAddress::isValid(std::string("2NRbuP5YfzRNEa1RibT5kXay1VgvQHnydZY1"))); // invalid prefix
+}
+
+TEST(ZcashAddress, InitWithString) {
+    {
+        const auto address = TAddress("t1Wg9uPPAfwhBWeRjtDPa5ZHNzyBx9rJVKY");
+        EXPECT_EQ(address.string(), "t1Wg9uPPAfwhBWeRjtDPa5ZHNzyBx9rJVKY");
+        EXPECT_EQ(address.bytes[0], 0x1c);
+        EXPECT_EQ(address.bytes[1], 0xb8);
+    }
+    {
+        const auto address = TAddress("t3RD6RFKhWSotNbPEY4Vw7Ku9QCfKkzrbBL");
+        EXPECT_EQ(address.string(), "t3RD6RFKhWSotNbPEY4Vw7Ku9QCfKkzrbBL");
+        EXPECT_EQ(address.bytes[0], 0x1c);
+        EXPECT_EQ(address.bytes[1], 0xbd);
+    }
+}
+
+} // namespace TW::Zcash
diff --git a/tests/chains/Zcash/TWCoinTypeTests.cpp b/tests/chains/Zcash/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..b85b7e8afd9
--- /dev/null
+++ b/tests/chains/Zcash/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWZcashCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeZcash));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("f2438a93039faf08d39bd3df1f7b5f19a2c29ffe8753127e2956ab4461adab35"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeZcash, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("t1Yfrf1dssDLmaMBsq2LFKWPbS5vH3nGpa2"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeZcash, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeZcash));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeZcash));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeZcash), 8);
+    ASSERT_EQ(TWBlockchainZcash, TWCoinTypeBlockchain(TWCoinTypeZcash));
+    ASSERT_EQ(0xbd, TWCoinTypeP2shPrefix(TWCoinTypeZcash));
+    ASSERT_EQ(0x1c, TWCoinTypeStaticPrefix(TWCoinTypeZcash));
+    assertStringsEqual(symbol, "ZEC");
+    assertStringsEqual(txUrl, "https://blockchair.com/zcash/transaction/f2438a93039faf08d39bd3df1f7b5f19a2c29ffe8753127e2956ab4461adab35");
+    assertStringsEqual(accUrl, "https://blockchair.com/zcash/address/t1Yfrf1dssDLmaMBsq2LFKWPbS5vH3nGpa2");
+    assertStringsEqual(id, "zcash");
+    assertStringsEqual(name, "Zcash");
+}
diff --git a/tests/Zcash/TWZcashAddressTests.cpp b/tests/chains/Zcash/TWZcashAddressTests.cpp
similarity index 93%
rename from tests/Zcash/TWZcashAddressTests.cpp
rename to tests/chains/Zcash/TWZcashAddressTests.cpp
index bbaa4ad932e..4b1cfd3dee6 100644
--- a/tests/Zcash/TWZcashAddressTests.cpp
+++ b/tests/chains/Zcash/TWZcashAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "Zcash/TAddress.h"
 
diff --git a/tests/chains/Zcash/TWZcashTransactionTests.cpp b/tests/chains/Zcash/TWZcashTransactionTests.cpp
new file mode 100644
index 00000000000..cc20c735e5b
--- /dev/null
+++ b/tests/chains/Zcash/TWZcashTransactionTests.cpp
@@ -0,0 +1,226 @@
+
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include "Bitcoin/OutPoint.h"
+#include "Bitcoin/Script.h"
+#include "Zcash/Signer.h"
+#include "Zcash/TransactionBuilder.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "HexCoding.h"
+#include "PublicKey.h"
+#include "Data.h"
+#include "Coin.h"
+#include "Zcash/Transaction.h"
+
+#include <TrustWalletCore/TWBitcoinScript.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWZcashTransaction, Encode) {
+    // Test vector 3 https://github.com/zcash/zips/blob/master/zip-0243.rst
+    auto transaction = Zcash::Transaction();
+    transaction.lockTime = 0x0004b029;
+    transaction.expiryHeight = 0x0004b048;
+    transaction.branchId = Zcash::SaplingBranchID;
+
+    auto outpoint0 = Bitcoin::OutPoint(parse_hex("a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9"), 1);
+    transaction.inputs.emplace_back(outpoint0, Bitcoin::Script(parse_hex("483045022100a61e5d557568c2ddc1d9b03a7173c6ce7c996c4daecab007ac8f34bee01e6b9702204d38fdc0bcf2728a69fde78462a10fb45a9baa27873e6a5fc45fb5c76764202a01210365ffea3efa3908918a8b8627724af852fc9b86d7375b103ab0543cf418bcaa7f")), 0xfffffffe);
+
+    auto script0 = Bitcoin::Script(parse_hex("76a9148132712c3ff19f3a151234616777420a6d7ef22688ac"));
+    transaction.outputs.emplace_back(0x02625a00, script0);
+
+    auto script1 = Bitcoin::Script(parse_hex("76a9145453e4698f02a38abdaa521cd1ff2dee6fac187188ac"));
+    transaction.outputs.emplace_back(0x0098958b, script1);
+
+    auto unsignedData = Data{};
+    transaction.encode(unsignedData);
+
+    ASSERT_EQ(hex(unsignedData),
+        /* header */          "04000080"
+        /* versionGroupId */  "85202f89"
+        /* vin */             "01""a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9""01000000""6b483045022100a61e5d557568c2ddc1d9b03a7173c6ce7c996c4daecab007ac8f34bee01e6b9702204d38fdc0bcf2728a69fde78462a10fb45a9baa27873e6a5fc45fb5c76764202a01210365ffea3efa3908918a8b8627724af852fc9b86d7375b103ab0543cf418bcaa7f""feffffff"
+        /* vout */            "02""005a620200000000""1976a9148132712c3ff19f3a151234616777420a6d7ef22688ac"
+                                  "8b95980000000000""1976a9145453e4698f02a38abdaa521cd1ff2dee6fac187188ac"
+        /* lockTime */        "29b00400"
+        /* expiryHeight */    "48b00400"
+        /* valueBalance */    "0000000000000000"
+        /* vShieldedSpend */  "00"
+        /* vShieldedOutput */ "00"
+        /* vJoinSplit */      "00"
+    );
+
+    auto scriptCode = Bitcoin::Script(parse_hex("76a914507173527b4c3318a2aecd793bf1cfed705950cf88ac"));
+    auto preImage = transaction.getPreImage(scriptCode, 0, TWBitcoinSigHashTypeAll, 0x02faf080);
+    ASSERT_EQ(hex(preImage),
+        /* header */              "04000080"
+        /* versionGroupId */      "85202f89"
+        /* hashPrevouts */        "fae31b8dec7b0b77e2c8d6b6eb0e7e4e55abc6574c26dd44464d9408a8e33f11"
+        /* hashSequence */        "6c80d37f12d89b6f17ff198723e7db1247c4811d1a695d74d930f99e98418790"
+        /* hashOutputs */         "d2b04118469b7810a0d1cc59568320aad25a84f407ecac40b4f605a4e6868454"
+        /* hashJoinSplits */      "0000000000000000000000000000000000000000000000000000000000000000"
+        /* hashShieldedSpends */  "0000000000000000000000000000000000000000000000000000000000000000"
+        /* hashShieldedOutputs */ "0000000000000000000000000000000000000000000000000000000000000000"
+        /* lockTime */            "29b00400"
+        /* expiryHeight */        "48b00400"
+        /* valueBalance */        "0000000000000000"
+        /* hashType */            "01000000"
+        /* prevout */             "a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9""01000000"
+        /* scriptCode */          "1976a914507173527b4c3318a2aecd793bf1cfed705950cf88ac"
+        /* amount */              "80f0fa0200000000"
+        /* sequence */            "feffffff"
+    );
+
+    auto sighash = transaction.getSignatureHash(scriptCode, 0, TWBitcoinSigHashTypeAll, 0x02faf080, Bitcoin::BASE);
+    ASSERT_EQ(hex(sighash), "f3148f80dfab5e573d5edfe7a850f5fd39234f80b5429d3a57edcc11e34c585b");
+
+    // AnyoneCanPay|none
+    preImage = transaction.getPreImage(scriptCode, 0, TWBitcoinSigHashType(TWBitcoinSigHashTypeAnyoneCanPay | TWBitcoinSigHashTypeNone), 0x02faf080);
+    EXPECT_EQ(hex(preImage),
+        "0400008085202f8900000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000029b0040048b00400000000000000000082000000a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9010000001976a914507173527b4c3318a2aecd793bf1cfed705950cf88ac80f0fa0200000000feffffff"
+    );
+
+    sighash = transaction.getSignatureHash(scriptCode, 0, TWBitcoinSigHashTypeAnyoneCanPay, 0x02faf080, Bitcoin::BASE);
+    EXPECT_EQ(hex(sighash), "f0bde4facddbc11f5e9ed2f5d5038083bec4a61627a2715a5ee9be7fb3152e9b");
+
+    // AnyoneCanPay|Single
+    preImage = transaction.getPreImage(scriptCode, 0, TWBitcoinSigHashType(TWBitcoinSigHashTypeAnyoneCanPay | TWBitcoinSigHashTypeSingle), 0x02faf080);
+    EXPECT_EQ(hex(preImage),
+        "0400008085202f890000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000055986938e432f825904fe288aa4feca1fe7eafa24aecd1bd6a9a739536b50a5469be00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000029b0040048b00400000000000000000083000000a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9010000001976a914507173527b4c3318a2aecd793bf1cfed705950cf88ac80f0fa0200000000feffffff"
+    );
+
+    sighash = transaction.getSignatureHash(scriptCode, 0, TWBitcoinSigHashType(TWBitcoinSigHashTypeAnyoneCanPay | TWBitcoinSigHashTypeSingle), 0x02faf080, Bitcoin::BASE);
+    EXPECT_EQ(hex(sighash), "1e747b6a4a96aa9e7c1d7968221ec916bd30b514f8bca14b6f74d7c11c0742c2");
+}
+
+TEST(TWZcashTransaction, SaplingSigning) {
+    // tx on mainnet
+    // https://explorer.zcha.in/transactions/ec9033381c1cc53ada837ef9981c03ead1c7c41700ff3a954389cfaddc949256
+    const int64_t amount = 488000;
+    const int64_t fee = 6000;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_coin_type(TWCoinTypeZcash);
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address("t1QahNjDdibyE4EdYkawUSKBBcVTSqv64CS");
+
+    auto hash0 = DATA("53685b8809efc50dd7d5cb0906b307a1b8aa5157baa5fc1bd6fe2d0344dd193a");
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(TWDataBytes(hash0.get()), TWDataSize(hash0.get()));
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(494000);
+    auto script0 = parse_hex("76a914f84c7f4dd3c3dc311676444fdead6e6d290d50e388ac");
+    utxo0->set_script(script0.data(), script0.size());
+
+    auto utxoKey0 = DATA("a9684f5bebd0e1208aae2e02bc9e9163bd1965ad23d8538644e1df8b99b99559");
+    input.add_private_key(TWDataBytes(utxoKey0.get()), TWDataSize(utxoKey0.get()));
+
+    auto plan = Zcash::TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 0;
+    plan.branchId = Data(Zcash::SaplingBranchID.begin(), Zcash::SaplingBranchID.end());
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = Bitcoin::TransactionSigner<Zcash::Transaction, Zcash::TransactionBuilder>::sign(input);
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    // txid = "ec9033381c1cc53ada837ef9981c03ead1c7c41700ff3a954389cfaddc949256"
+
+    Data serialized;
+    signedTx.encode(serialized);
+    ASSERT_EQ(hex(serialized),
+        "04000080"
+        "85202f89"
+        "01"
+            "53685b8809efc50dd7d5cb0906b307a1b8aa5157baa5fc1bd6fe2d0344dd193a""00000000""6b483045022100ca0be9f37a4975432a52bb65b25e483f6f93d577955290bb7fb0060a93bfc92002203e0627dff004d3c72a957dc9f8e4e0e696e69d125e4d8e275d119001924d3b48012103b243171fae5516d1dc15f9178cfcc5fdc67b0a883055c117b01ba8af29b953f6""ffffffff"
+        "01"
+            "4072070000000000""1976a91449964a736f3713d64283fd0018626ba50091c7e988ac"
+        "00000000"
+        "00000000"
+        "0000000000000000"
+        "00"
+        "00"
+        "00"
+    );
+}
+
+TEST(TWZcashTransaction, BlossomSigning) {
+    // tx on mainnet
+    // https://explorer.zcha.in/transactions/387939ff8eb07dd264376eeef2e126394ab139802b1d80e92b21c1a2ae54fe92
+    const int64_t amount = 17615;
+    const int64_t fee = 10000;
+    const std::string toAddress = "t1biXYN8wJahR76SqZTe1LBzTLf3JAsmT93";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_coin_type(TWCoinTypeZcash);
+
+    auto txHash0 = parse_hex("2381825cd9069a200944996257e25b9403ba3e296bbc1dd98b01019cc7028cde");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(27615);
+
+    // real key 1p "m/44'/133'/0'/0/14"
+    auto utxoKey0 = PrivateKey(parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646"));
+    auto utxoAddr0 = TW::deriveAddress(TWCoinTypeZcash, utxoKey0);
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeZcash);
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = Zcash::TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 0;
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // Sign
+    auto result = Bitcoin::TransactionSigner<Zcash::Transaction, Zcash::TransactionBuilder>::sign(input);
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    ASSERT_EQ(hex(serialized), "0400008085202f8901de8c02c79c01018bd91dbc6b293eba03945be25762994409209a06d95c828123000000006b483045022100e6e5071811c08d0c2e81cb8682ee36a8c6b645f5c08747acd3e828de2a4d8a9602200b13b36a838c7e8af81f2d6e7e694ede28833a480cfbaaa68a47187655298a7f0121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ffffffff01cf440000000000001976a914c3bacb129d85288a3deb5890ca9b711f7f71392688ac00000000000000000000000000000000000000");
+}
+
+TEST(TWZcashTransaction, SigningWithError) {
+    const int64_t amount = 17615;
+    const std::string toAddress = "t1biXYN8wJahR76SqZTe1LBzTLf3JAsmT93";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_coin_type(TWCoinTypeZcash);
+
+    // Sign
+    auto result = Zcash::Signer::sign(input);
+    ASSERT_NE(result.error(), Common::Proto::OK);
+
+    // PreImageHashes
+    auto preResult = Zcash::Signer::preImageHashes(input);
+    ASSERT_NE(preResult.error(), Common::Proto::OK);
+}
\ No newline at end of file
diff --git a/tests/chains/Zcash/TransactionCompilerTests.cpp b/tests/chains/Zcash/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..6e92a26d50d
--- /dev/null
+++ b/tests/chains/Zcash/TransactionCompilerTests.cpp
@@ -0,0 +1,112 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Zcash/Signer.h"
+#include "Zcash/Transaction.h"
+#include "Zcash/TransactionBuilder.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(ZcashCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeZcash;
+
+    // tx on mainnet
+    // https://explorer.zcha.in/transactions/387939ff8eb07dd264376eeef2e126394ab139802b1d80e92b21c1a2ae54fe92
+    const int64_t amount = 17615;
+    const int64_t fee = 10000;
+    const std::string toAddress = "t1biXYN8wJahR76SqZTe1LBzTLf3JAsmT93";
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_coin_type(TWCoinTypeZcash);
+
+    auto txHash0 = parse_hex("2381825cd9069a200944996257e25b9403ba3e296bbc1dd98b01019cc7028cde");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(27615);
+
+    // real key 1p "m/44'/133'/0'/0/14"
+    auto utxoKey0 = PrivateKey(parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646"));
+    auto utxoAddr0 = TW::deriveAddress(TWCoinTypeZcash, utxoKey0);
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeZcash);
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = Zcash::TransactionBuilder::plan(input);
+    plan.amount = amount;
+    plan.fee = fee;
+    plan.change = 0;
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // build preimage
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    ASSERT_EQ(preSigningOutput.hash_public_keys().size(), 1);
+
+    auto preImageHash = data(preSigningOutput.hash_public_keys()[0].data_hash());
+    EXPECT_EQ(hex(preImageHash),
+              "1472faba6529ac6d88f87f6ab881e438c3c8a17482b4a82ef13212333868258a");
+
+    // compile
+    auto publicKey = utxoKey0.getPublicKey(TWPublicKeyTypeSECP256k1);
+    TW::Data signature = parse_hex("3045022100e6e5071811c08d0c2e81cb8682ee36a8c6b645f5c08747acd3e828de2a4d8a9602200b13b36a838c7e8af81f2d6e7e694ede28833a480cfbaaa68a47187655298a7f");
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKey.bytes});
+    Bitcoin::Proto::SigningOutput signingOutput;
+    ASSERT_TRUE(signingOutput.ParseFromArray(outputData.data(), (int)outputData.size()));
+    ASSERT_EQ(hex(signingOutput.encoded()), "0400008085202f8901de8c02c79c01018bd91dbc6b293eba03945be25762994409209a06d95c828123000000006b483045022100e6e5071811c08d0c2e81cb8682ee36a8c6b645f5c08747acd3e828de2a4d8a9602200b13b36a838c7e8af81f2d6e7e694ede28833a480cfbaaa68a47187655298a7f0121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ffffffff01cf440000000000001976a914c3bacb129d85288a3deb5890ca9b711f7f71392688ac00000000000000000000000000000000000000");
+
+    {
+        auto result = Zcash::Signer::sign(input);
+        ASSERT_EQ(hex(result.encoded()), hex(signingOutput.encoded()));
+    }
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, {publicKey.bytes});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
diff --git a/tests/chains/Zelcash/TWCoinTypeTests.cpp b/tests/chains/Zelcash/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..ce646194bfb
--- /dev/null
+++ b/tests/chains/Zelcash/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWZelcashCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeZelcash));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeZelcash, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeZelcash, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeZelcash));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeZelcash));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeZelcash), 8);
+    ASSERT_EQ(TWBlockchainZcash, TWCoinTypeBlockchain(TWCoinTypeZelcash));
+    ASSERT_EQ(0xbd, TWCoinTypeP2shPrefix(TWCoinTypeZelcash));
+    ASSERT_EQ(0x1c, TWCoinTypeStaticPrefix(TWCoinTypeZelcash));
+    assertStringsEqual(symbol, "FLUX");
+    assertStringsEqual(txUrl, "https://explorer.runonflux.io/tx/t123");
+    assertStringsEqual(accUrl, "https://explorer.runonflux.io/address/a12");
+    assertStringsEqual(id, "zelcash");
+    assertStringsEqual(name, "Flux");
+}
diff --git a/tests/Zelcash/TWZelcashAddressTests.cpp b/tests/chains/Zelcash/TWZelcashAddressTests.cpp
similarity index 92%
rename from tests/Zelcash/TWZelcashAddressTests.cpp
rename to tests/chains/Zelcash/TWZelcashAddressTests.cpp
index 6d2b5807778..f247625c93d 100644
--- a/tests/Zelcash/TWZelcashAddressTests.cpp
+++ b/tests/chains/Zelcash/TWZelcashAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWHDWallet.h>
diff --git a/tests/Zelcash/TWZelcashTransactionTests.cpp b/tests/chains/Zelcash/TWZelcashTransactionTests.cpp
similarity index 91%
rename from tests/Zelcash/TWZelcashTransactionTests.cpp
rename to tests/chains/Zelcash/TWZelcashTransactionTests.cpp
index 90d2b09cb41..9a61ddcdd10 100644
--- a/tests/Zelcash/TWZelcashTransactionTests.cpp
+++ b/tests/chains/Zelcash/TWZelcashTransactionTests.cpp
@@ -1,11 +1,9 @@
 
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "Bitcoin/OutPoint.h"
 #include "HexCoding.h"
@@ -40,7 +38,7 @@ TEST(TWZelcashTransaction, Encode) {
     auto unsignedData = Data{};
     transaction.encode(unsignedData);
 
-    ASSERT_EQ(hex(unsignedData.begin(), unsignedData.end()),
+    ASSERT_EQ(hex(unsignedData),
         /* header */          "04000080"
         /* versionGroupId */  "85202f89"
         /* vin */             "01""a8c685478265f4c14dada651969c45a65e1aeb8cd6791f2f5bb6a1d9952104d9""01000000""6b483045022100a61e5d557568c2ddc1d9b03a7173c6ce7c996c4daecab007ac8f34bee01e6b9702204d38fdc0bcf2728a69fde78462a10fb45a9baa27873e6a5fc45fb5c76764202a01210365ffea3efa3908918a8b8627724af852fc9b86d7375b103ab0543cf418bcaa7f""feffffff"
@@ -56,7 +54,7 @@ TEST(TWZelcashTransaction, Encode) {
 
     auto scriptCode = Bitcoin::Script(parse_hex("76a914507173527b4c3318a2aecd793bf1cfed705950cf88ac"));
     auto preImage = transaction.getPreImage(scriptCode, 0, TWBitcoinSigHashTypeAll, 0x02faf080);
-    ASSERT_EQ(hex(preImage.begin(), preImage.end()),
+    ASSERT_EQ(hex(preImage),
         /* header */              "04000080"
         /* versionGroupId */      "85202f89"
         /* hashPrevouts */        "fae31b8dec7b0b77e2c8d6b6eb0e7e4e55abc6574c26dd44464d9408a8e33f11"
@@ -76,7 +74,7 @@ TEST(TWZelcashTransaction, Encode) {
     );
 
     auto sighash = transaction.getSignatureHash(scriptCode, 0, TWBitcoinSigHashTypeAll, 0x02faf080, Bitcoin::BASE);
-    ASSERT_EQ(hex(sighash.begin(), sighash.end()), "f3148f80dfab5e573d5edfe7a850f5fd39234f80b5429d3a57edcc11e34c585b");
+    ASSERT_EQ(hex(sighash), "f3148f80dfab5e573d5edfe7a850f5fd39234f80b5429d3a57edcc11e34c585b");
 }
 
 TEST(TWZelcashTransaction, Signing) {
@@ -86,6 +84,7 @@ TEST(TWZelcashTransaction, Signing) {
     const int64_t fee = 2260;
 
     auto input = Bitcoin::Proto::SigningInput();
+    input.set_coin_type(TWCoinTypeZelcash);
     input.set_hash_type(TWBitcoinSigHashTypeAll);
     input.set_amount(amount);
     input.set_byte_fee(1);
diff --git a/tests/chains/Zen/AddressTests.cpp b/tests/chains/Zen/AddressTests.cpp
new file mode 100644
index 00000000000..bef8a87317a
--- /dev/null
+++ b/tests/chains/Zen/AddressTests.cpp
@@ -0,0 +1,44 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "HDWallet.h"
+#include "Zen/Address.h"
+#include "PublicKey.h"
+#include "PrivateKey.h"
+#include <gtest/gtest.h>
+#include <vector>
+
+using namespace TW;
+using namespace TW::Zen;
+
+TEST(ZenAddress, Valid) {
+    ASSERT_TRUE(Address::isValid("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg"));
+    ASSERT_TRUE(Address::isValid("zshX5BAgUvNgM1VoBVKZyFVVozTDjjJvRxJ"));
+}
+
+TEST(ZenAddress, Invalid) {
+    ASSERT_FALSE(Address::isValid("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5abs"));
+}
+
+TEST(ZenAddress, FromPrivateKey) {
+    auto privateKey = PrivateKey(parse_hex("3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a"));
+    auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto address = Address(pubKey);
+    ASSERT_EQ(address.string(), "znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+}
+
+TEST(ZenAddress, FromPublicKey) {
+    auto publicKey = PublicKey(parse_hex("02b4ac9056d20c52ac11b0d7e83715dd3eac851cfc9cb64b8546d9ea0d4bb3bdfe"), TWPublicKeyTypeSECP256k1);
+    auto address = Address(publicKey);
+    ASSERT_EQ(address.string(), "znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+}
+
+TEST(ZenAddress, FromString) {
+    auto address = Address("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    ASSERT_EQ(address.string(), "znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+
+    address = Address("zshX5BAgUvNgM1VoBVKZyFVVozTDjjJvRxJ");
+    ASSERT_EQ(address.string(), "zshX5BAgUvNgM1VoBVKZyFVVozTDjjJvRxJ");
+}
diff --git a/tests/chains/Zen/SignerTests.cpp b/tests/chains/Zen/SignerTests.cpp
new file mode 100644
index 00000000000..8b054461429
--- /dev/null
+++ b/tests/chains/Zen/SignerTests.cpp
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Zen/Signer.h"
+#include "Zen/Address.h"
+#include "Zen/TransactionBuilder.h"
+
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "proto/Bitcoin.pb.h"
+
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+using namespace TW::Zen;
+
+TEST(ZenSigner, Sign) {
+    const int64_t amount = 10000;
+    const std::string toAddress = "zngBGZGKaaBamofSuFw5WMnvU2HQAtwGeb5";
+
+    auto blockHash = parse_hex("0000000004561422697a29d424d925334db5ef2e80232306a1ad3fd35f72dc81");
+    std::reverse(blockHash.begin(), blockHash.end());
+    auto blockHeight = 1147624;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    input.set_coin_type(TWCoinTypeZen);
+
+    auto txHash0 = parse_hex("62dea4b87fd66ca8e75a199c93131827ed40fb96cd8412e3476540abb5139ea3");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(17600);
+
+    auto utxoKey0 = PrivateKey(parse_hex("3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a"));
+    auto utxoAddr0 = TW::deriveAddress(TWCoinTypeZen, utxoKey0);
+    ASSERT_EQ(utxoAddr0, "znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeZen, blockHash, blockHeight);
+    ASSERT_EQ(hex(script0.bytes), "76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = Signer::plan(input);
+    ASSERT_EQ(plan.fee(), 226);
+    plan.set_preblockhash(blockHash.data(), (int)blockHash.size());
+    plan.set_preblockheight(blockHeight);
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan;
+
+    // Sign
+    auto result = Bitcoin::TransactionSigner<Bitcoin::Transaction, TransactionBuilder>::sign(input);
+    ASSERT_TRUE(result) << std::to_string(result.error());
+    auto signedTx = result.payload();
+
+    Data serialized;
+    signedTx.encode(serialized);
+    ASSERT_EQ(hex(serialized),
+        "0100000001a39e13b5ab406547e31284cd96fb40ed271813939c195ae7a86cd67fb8a4de62000000006a473044022014d687c0bee0b7b584db2eecbbf73b545ee255c42b8edf0944665df3fa882cfe02203bce2412d93c5a56cb4806ddd8297ff05f8fc121306e870bae33377a58a02f05012102b4ac9056d20c52ac11b0d7e83715dd3eac851cfc9cb64b8546d9ea0d4bb3bdfeffffffff0210270000000000003f76a914a58d22659b1082d1fa8698fc51996b43281bfce788ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4ce1c0000000000003f76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b400000000"
+    );
+}
+
+TEST(ZenSigner, SignWithError) {
+    const int64_t amount = 10000;
+    const std::string toAddress = "zngBGZGKaaBamofSuFw5WMnvU2HQAtwGeb5";
+
+    auto blockHash = parse_hex("0000000004561422697a29d424d925334db5ef2e80232306a1ad3fd35f72dc81");
+    std::reverse(blockHash.begin(), blockHash.end());
+    auto blockHeight = 1147624;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    input.set_coin_type(TWCoinTypeZen);
+
+    auto plan = Signer::plan(input);
+    plan.set_preblockhash(blockHash.data(), (int)blockHash.size());
+    plan.set_preblockheight(blockHeight);
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan;
+
+    // Sign
+    auto result = Zen::Signer::sign(input);
+
+    ASSERT_NE(result.error(), Common::Proto::OK);
+
+    // PreImageHash
+    auto preResult = Zen::Signer::preImageHashes(input);
+
+    ASSERT_NE(preResult.error(), Common::Proto::OK);
+}
\ No newline at end of file
diff --git a/tests/chains/Zen/TWAnyAddressTests.cpp b/tests/chains/Zen/TWAnyAddressTests.cpp
new file mode 100644
index 00000000000..d6e2a86b245
--- /dev/null
+++ b/tests/chains/Zen/TWAnyAddressTests.cpp
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnyAddress.h>
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWZen, Address) {
+    auto string = STRING("znfexeyosWvMG93AjJx6CkRzKtS2aBdDgAx");
+    auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeZen));
+    auto string2 = WRAPS(TWAnyAddressDescription(addr.get()));
+    EXPECT_TRUE(TWStringEqual(string.get(), string2.get()));
+    auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
+    assertHexEqual(keyHash, "9fd1b64dad29d82b151206f66057bab1dae2f517");
+}
diff --git a/tests/chains/Zen/TWAnySignerTests.cpp b/tests/chains/Zen/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..55a83993273
--- /dev/null
+++ b/tests/chains/Zen/TWAnySignerTests.cpp
@@ -0,0 +1,79 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Bitcoin/Signer.h"
+#include "Bitcoin/Address.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "HexCoding.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(TWAnySignerZen, Sign) {
+    const int64_t amount = 10000;
+    const std::string toAddress = "zngBGZGKaaBamofSuFw5WMnvU2HQAtwGeb5";
+
+    auto blockHash = parse_hex("0000000004561422697a29d424d925334db5ef2e80232306a1ad3fd35f72dc81");
+    std::reverse(blockHash.begin(), blockHash.end());
+    auto blockHeight = 1147624;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    input.set_coin_type(TWCoinTypeZen);
+
+    auto txHash0 = parse_hex("62dea4b87fd66ca8e75a199c93131827ed40fb96cd8412e3476540abb5139ea3");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(17600);
+
+    auto utxoKey0 = PrivateKey(parse_hex("3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a"));
+    auto utxoAddr0 = TW::deriveAddress(TWCoinTypeZen, utxoKey0);
+    ASSERT_EQ(utxoAddr0, "znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeZen, blockHash, blockHeight);
+    ASSERT_EQ(hex(script0.bytes), "76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    Bitcoin::Proto::TransactionPlan plan;
+    {
+        ANY_PLAN(input, plan, TWCoinTypeZen);
+
+        ASSERT_EQ(plan.fee(), 226);
+
+        plan.set_preblockhash(blockHash.data(), (int)blockHash.size());
+        plan.set_preblockheight(blockHeight);
+
+        *input.mutable_plan() = plan;
+    }
+
+    Bitcoin::Proto::SigningOutput output;
+    {
+        ANY_SIGN(input, TWCoinTypeZen);
+        ASSERT_EQ(output.error(), Common::Proto::OK);
+    }
+
+    // Sign
+    ASSERT_EQ(hex(output.encoded()),
+        "0100000001a39e13b5ab406547e31284cd96fb40ed271813939c195ae7a86cd67fb8a4de62000000006a473044022014d687c0bee0b7b584db2eecbbf73b545ee255c42b8edf0944665df3fa882cfe02203bce2412d93c5a56cb4806ddd8297ff05f8fc121306e870bae33377a58a02f05012102b4ac9056d20c52ac11b0d7e83715dd3eac851cfc9cb64b8546d9ea0d4bb3bdfeffffffff0210270000000000003f76a914a58d22659b1082d1fa8698fc51996b43281bfce788ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4ce1c0000000000003f76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b400000000"
+    );
+}
diff --git a/tests/chains/Zen/TWCoinTypeTests.cpp b/tests/chains/Zen/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..3cd9d0e75a8
--- /dev/null
+++ b/tests/chains/Zen/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWZenCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeZen));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("b7f548640766fb024247accf4e01bec37d88d49c4900357edc84d49a09ff4430"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeZen, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("znRchPtvEyJJUwGbCALqyjwHJb1Gx6z4H4j"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeZen, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeZen));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeZen));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeZen), 8);
+    ASSERT_EQ(TWBlockchainZen, TWCoinTypeBlockchain(TWCoinTypeZen));
+    ASSERT_EQ(0x96, TWCoinTypeP2shPrefix(TWCoinTypeZen));
+    ASSERT_EQ(0x20, TWCoinTypeStaticPrefix(TWCoinTypeZen));
+    assertStringsEqual(symbol, "ZEN");
+    assertStringsEqual(txUrl, "https://explorer.horizen.io/tx/b7f548640766fb024247accf4e01bec37d88d49c4900357edc84d49a09ff4430");
+    assertStringsEqual(accUrl, "https://explorer.horizen.io/address/znRchPtvEyJJUwGbCALqyjwHJb1Gx6z4H4j");
+    assertStringsEqual(id, "zen");
+    assertStringsEqual(name, "Zen");
+}
diff --git a/tests/chains/Zen/TransactionBuilderTests.cpp b/tests/chains/Zen/TransactionBuilderTests.cpp
new file mode 100644
index 00000000000..8ba691be1b6
--- /dev/null
+++ b/tests/chains/Zen/TransactionBuilderTests.cpp
@@ -0,0 +1,91 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Bitcoin/Transaction.h"
+#include "Bitcoin/TransactionPlan.h"
+#include "Bitcoin/TransactionSigner.h"
+#include "Zen/Address.h"
+#include "Zen/Signer.h"
+#include "Zen/TransactionBuilder.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+
+#include <gtest/gtest.h>
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+using namespace TW;
+using namespace TW::Bitcoin;
+
+TEST(ZenTransactionBuilder, Build) {
+    const int64_t amount = 10000;
+    const std::string toAddress = "zngBGZGKaaBamofSuFw5WMnvU2HQAtwGeb5";
+
+    auto blockHash = parse_hex("0000000004561422697a29d424d925334db5ef2e80232306a1ad3fd35f72dc81");
+    std::reverse(blockHash.begin(), blockHash.end());
+    auto blockHeight = 1147624;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    input.set_coin_type(TWCoinTypeZen);
+
+    Data opScript = parse_hex("00010203");
+    input.set_output_op_return(std::string(opScript.begin(), opScript.end()));
+
+    auto eo = input.add_extra_outputs();
+    eo->set_to_address("znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    eo->set_amount(7000);
+
+    auto txHash0 = parse_hex("62dea4b87fd66ca8e75a199c93131827ed40fb96cd8412e3476540abb5139ea3");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(0);
+    utxo0->mutable_out_point()->set_sequence(UINT32_MAX);
+    utxo0->set_amount(17600);
+
+    auto utxoKey0 = PrivateKey(parse_hex("3a8e0a528f62f4ca2c77744c8a571def2845079b50105a9f7ef6b1b823def67a"));
+    auto utxoAddr0 = TW::deriveAddress(TWCoinTypeZen, utxoKey0);
+    ASSERT_EQ(utxoAddr0, "znk19H1wcARcCa7TM6zgmJUbWoWWtZ8k5cg");
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, TWCoinTypeZen, blockHash, blockHeight);
+    ASSERT_EQ(hex(script0.bytes), "76a914cf83669620de8bbdf2cefcdc5b5113195603c56588ac2081dc725fd33fada1062323802eefb54d3325d924d4297a69221456040000000003e88211b4");
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+    input.add_private_key(utxoKey0.bytes.data(), utxoKey0.bytes.size());
+
+    auto plan = Bitcoin::TransactionSigner<Bitcoin::Transaction, Zen::TransactionBuilder>::plan(input);
+    ASSERT_EQ(plan.fee, 294);
+    plan.preBlockHash = blockHash;
+    plan.preBlockHeight = blockHeight;
+
+    // plan1
+    auto result = Zen::TransactionBuilder::build<Bitcoin::Transaction>(plan, input).payload();
+  
+    ASSERT_GT(result.outputs.size(), 0ul);
+    ASSERT_EQ(result.outputs[0].value, plan.amount);
+
+    // plan2
+    result = Zen::TransactionBuilder::build<Bitcoin::Transaction>(plan, input).payload();
+  
+    ASSERT_EQ(result.outputs.size(), 4ul);
+    ASSERT_EQ(result.outputs[3].value, 7000);
+}
+
+TEST(ZenTransactionBuilder, BuildScript) {
+    auto blockHash = parse_hex("0000000004561422697a29d424d925334db5ef2e80232306a1ad3fd35f72dc81");
+    std::reverse(blockHash.begin(), blockHash.end());
+    auto blockHeight = 1147624;
+
+    // invalid address
+    auto result = Zen::TransactionBuilder::prepareOutputWithScript(
+        "DRyNFvJaybnF22UfMS6NR1Qav3mqxPj86E",
+        10000, TWCoinTypeZen, blockHash, blockHeight);
+    ASSERT_FALSE(result.has_value());
+}
\ No newline at end of file
diff --git a/tests/chains/Zen/TransactionCompilerTests.cpp b/tests/chains/Zen/TransactionCompilerTests.cpp
new file mode 100644
index 00000000000..006b9539811
--- /dev/null
+++ b/tests/chains/Zen/TransactionCompilerTests.cpp
@@ -0,0 +1,115 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "PublicKey.h"
+#include "TransactionCompiler.h"
+
+#include "proto/Bitcoin.pb.h"
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include "Zen/Signer.h"
+#include "Zen/TransactionBuilder.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(ZenCompiler, CompileWithSignatures) {
+    const auto coin = TWCoinTypeZen;
+
+    const int64_t amount = 200000;
+    const std::string toAddress = "znma8BydGx1p7SZ17g5JMMWXqSoRSE7BNdQ";
+
+    auto blockHash = parse_hex("000000000396ef95695b498168964e1733aca9fe47bb4f9b2851dcd0ec0edad0");
+    std::reverse(blockHash.begin(), blockHash.end());
+    auto blockHeight = 1163482;
+
+    auto sblockHash = parse_hex("0000000002906dc9ef21c60d08cd03d192cba94de66095c63082d8e7e9436d40");
+    std::reverse(sblockHash.begin(), sblockHash.end());
+    auto sblockHeight = 1163438;
+
+    auto input = Bitcoin::Proto::SigningInput();
+    input.set_hash_type(TWBitcoinSigHashTypeAll);
+    input.set_amount(amount);
+    input.set_byte_fee(1);
+    input.set_to_address(toAddress);
+    input.set_change_address("zncug4MEDrunR5WgdWfGB1t9Bjp8RCpKxA6");
+    input.set_coin_type(coin);
+    input.set_lock_time(1163772);
+
+    auto txHash0 = parse_hex("89f799d7aaf17dbc619f5c68aa5a5ae55ceec779f9009203a87359217405f8d8");
+    std::reverse(txHash0.begin(), txHash0.end());
+
+    auto utxo0 = input.add_utxo();
+    utxo0->mutable_out_point()->set_hash(txHash0.data(), txHash0.size());
+    utxo0->mutable_out_point()->set_index(1);
+    utxo0->mutable_out_point()->set_sequence(4294967294);
+    utxo0->set_amount(1249057);
+
+    auto utxoAddr0 = "znj6M9EbCmU7UKN2zgAQ8j1GwUnr4QbZBYt";
+    // build utxo scriptPubKey
+    // check 89f799d7aaf17dbc619f5c68aa5a5ae55ceec779f9009203a87359217405f8d8,1
+    auto script0 = Bitcoin::Script::lockScriptForAddress(utxoAddr0, coin, sblockHash, sblockHeight);
+    utxo0->set_script(script0.bytes.data(), script0.bytes.size());
+
+    auto plan = Zen::TransactionBuilder::plan(input);
+    ASSERT_EQ(plan.fee, 226);
+    plan.preBlockHash = blockHash;
+    plan.preBlockHeight = blockHeight;
+    plan.fee = 302;
+    plan.change = 1249057 - plan.amount - plan.fee;
+
+    auto& protoPlan = *input.mutable_plan();
+    protoPlan = plan.proto();
+
+    // build preimage
+    const auto txInputData = data(input.SerializeAsString());
+    EXPECT_GT(txInputData.size(), 0ul);
+
+    const auto preImageHashes = TransactionCompiler::preImageHashes(coin, txInputData);
+    ASSERT_GT(preImageHashes.size(), 0ul);
+
+    Bitcoin::Proto::PreSigningOutput preSigningOutput;
+    ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHashes.data(), int(preImageHashes.size())));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+    ASSERT_EQ(preSigningOutput.hash_public_keys().size(), 1);
+
+    auto preImageHash = data(preSigningOutput.hash_public_keys()[0].data_hash());
+    EXPECT_EQ(hex(preImageHash),
+              "882e2e61e740ff3d5889995679bf3dcda1b872e0d93be23c89a4fd4e3837f200");
+
+    // compile
+    auto publicKey = PublicKey(parse_hex("02806408d2f6d5095bb73e89f9edbe02fe81853f25c541d33da4422c6916c1d0e1"), TWPublicKeyTypeSECP256k1);
+    TW::Data signature = parse_hex("3045022100b27a4d10a4c5e758c4a379ccf7050eae6d8d4dacf5c65894d024de5ab947d4640220194ffccb29c95fe0ae3fb91a40276536494102891c6c5a9aee6063106fa55d30");
+    auto outputData =
+        TransactionCompiler::compileWithSignatures(coin, txInputData, {signature}, {publicKey.bytes});
+    Bitcoin::Proto::SigningOutput signingOutput;
+    ASSERT_TRUE(signingOutput.ParseFromArray(outputData.data(), (int)outputData.size()));
+    // txid: 0fc555f8e205e66576f760d99270eaa6d60480c0e816209b2058387b65c2a000
+    ASSERT_EQ(hex(signingOutput.encoded()), "0100000001d8f80574215973a8039200f979c7ee5ce55a5aaa685c9f61bc7df1aad799f789010000006b483045022100b27a4d10a4c5e758c4a379ccf7050eae6d8d4dacf5c65894d024de5ab947d4640220194ffccb29c95fe0ae3fb91a40276536494102891c6c5a9aee6063106fa55d30012102806408d2f6d5095bb73e89f9edbe02fe81853f25c541d33da4422c6916c1d0e1feffffff02400d0300000000003f76a914e0b858909b6b2c14996658085ed907abd880d32d88ac20d0da0eecd0dc51289b4fbb47fea9ac33174e966881495b6995ef96030000000003dac011b4b3001000000000003f76a91481b1b83b2ae8a4cddd72750dc5252c4bddd4e57e88ac20d0da0eecd0dc51289b4fbb47fea9ac33174e966881495b6995ef96030000000003dac011b4fcc11100");
+
+    { // Negative: inconsistent signatures & publicKeys
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {signature, signature}, {publicKey.bytes});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+
+    { // Negative: empty signatures
+        outputData = TransactionCompiler::compileWithSignatures(
+            coin, txInputData, {}, {});
+        Bitcoin::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(outputData.data(), (int)outputData.size()));
+        EXPECT_EQ(output.encoded().size(), 0ul);
+        EXPECT_EQ(output.error(), Common::Proto::Error_invalid_params);
+    }
+}
diff --git a/tests/chains/ZenEON/TWCoinTypeTests.cpp b/tests/chains/ZenEON/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..a0571a15621
--- /dev/null
+++ b/tests/chains/ZenEON/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWZenEONCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeZenEON;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xb462e3dac8eef21957d3b6cff3c184d083434367a726dd871e98a774f4d037a5"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x09bCfC348101B1179BCF3837aC996cF09357215f"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "zeneon");
+    assertStringsEqual(name, "Zen EON");
+    assertStringsEqual(symbol, "ZEN");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "7332");
+    assertStringsEqual(txUrl, "https://eon-explorer.horizenlabs.io/tx/0xb462e3dac8eef21957d3b6cff3c184d083434367a726dd871e98a774f4d037a5");
+    assertStringsEqual(accUrl, "https://eon-explorer.horizenlabs.io/address/0x09bCfC348101B1179BCF3837aC996cF09357215f");
+}
diff --git a/tests/chains/ZetaEVM/TWCoinTypeTests.cpp b/tests/chains/ZetaEVM/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..b8e9eaf9ef9
--- /dev/null
+++ b/tests/chains/ZetaEVM/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWZetaEVMCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeZetaEVM;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x04cb1201857de29af97b755e51c888454fb96c1f3bb3c1329bb94d5353d5c19e"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x85539A58F9c88DdDccBaBBfc660968323Fd1e167"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "zetaevm");
+    assertStringsEqual(name, "Zeta EVM");
+    assertStringsEqual(symbol, "ZETA");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    assertStringsEqual(chainId, "7000");
+    assertStringsEqual(txUrl, "https://explorer.zetachain.com/evm/tx/0x04cb1201857de29af97b755e51c888454fb96c1f3bb3c1329bb94d5353d5c19e");
+    assertStringsEqual(accUrl, "https://explorer.zetachain.com/address/0x85539A58F9c88DdDccBaBBfc660968323Fd1e167");
+}
diff --git a/tests/chains/Zilliqa/AddressTests.cpp b/tests/chains/Zilliqa/AddressTests.cpp
new file mode 100644
index 00000000000..db26af859b7
--- /dev/null
+++ b/tests/chains/Zilliqa/AddressTests.cpp
@@ -0,0 +1,54 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Zilliqa/Address.h"
+#include "Zilliqa/AddressChecksum.h"
+
+#include <TrustWalletCore/TWHRP.h>
+
+#include <gtest/gtest.h>
+
+namespace TW::Zilliqa::tests {
+
+TEST(ZilliqaAddress, FromPrivateKey) {
+    const auto privateKey =
+        PrivateKey(parse_hex("3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6"));
+    const auto publicKey = PublicKey(privateKey.getPublicKey(TWPublicKeyTypeSECP256k1));
+    const auto address = Address(publicKey);
+    auto expectedAddress = "zil1j8xae6lggm8y63m3y2r7aefu797ze7mhzulnqg";
+
+    ASSERT_EQ(address.getHrp(), stringForHRP(TWHRPZilliqa));
+    ASSERT_EQ(address.string(), expectedAddress);
+}
+
+TEST(ZilliqaAddress, Validation) {
+    ASSERT_FALSE(Zilliqa::Address::isValid("0x91cddcebe846ce4d47712287eee53cf17c2cfb7"));
+    ASSERT_FALSE(Zilliqa::Address::isValid(""));
+    ASSERT_FALSE(Zilliqa::Address::isValid("0x"));
+    ASSERT_FALSE(Zilliqa::Address::isValid("91cddcebe846ce4d47712287eee53cf17c2cfb7"));
+
+    ASSERT_TRUE(Zilliqa::Address::isValid("zil1fwh4ltdguhde9s7nysnp33d5wye6uqpugufkz7"));
+}
+
+TEST(ZilliqaAddress, Checksum) {
+    ASSERT_EQ(
+        checksum(parse_hex("4BAF5FADA8E5DB92C3D3242618C5B47133AE003C")),
+        "4BAF5faDA8e5Db92C3d3242618c5B47133AE003C");
+    ASSERT_EQ(
+        checksum(parse_hex("448261915A80CDE9BDE7C7A791685200D3A0BF4E")),
+        "448261915a80cdE9BDE7C7a791685200D3A0bf4E");
+    ASSERT_EQ(
+        checksum(parse_hex("0xDED02FD979FC2E55C0243BD2F52DF022C40ADA1E")),
+        "Ded02fD979fC2e55c0243bd2F52df022c40ADa1E");
+    ASSERT_EQ(
+        checksum(parse_hex("0x13F06E60297BEA6A3C402F6F64C416A6B31E586E")),
+        "13F06E60297bea6A3c402F6f64c416A6b31e586e");
+    ASSERT_EQ(
+        checksum(parse_hex("0x1A90C25307C3CC71958A83FA213A2362D859CF33")),
+        "1a90C25307C3Cc71958A83fa213A2362D859CF33");
+}
+
+} // namespace TW::Zilliqa::tests
diff --git a/tests/chains/Zilliqa/SignatureTests.cpp b/tests/chains/Zilliqa/SignatureTests.cpp
new file mode 100644
index 00000000000..bea022cd485
--- /dev/null
+++ b/tests/chains/Zilliqa/SignatureTests.cpp
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include "HexCoding.h"
+#include "Data.h"
+#include <TrustWalletCore/TWPrivateKey.h>
+#include <TrustWalletCore/TWCoinType.h>
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(ZilliqaSignature, Signing) {
+    auto keyData = WRAPD(TWDataCreateWithHexString(STRING("0xafeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5").get()));
+    auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(keyData.get()));
+    auto pubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey.get(), true));
+
+    auto message = "hello schnorr";
+    auto messageData = WRAPD(TWDataCreateWithBytes((uint8_t *)message, strnlen(message, 13)));
+    auto signatureData = WRAPD(TWPrivateKeySignZilliqaSchnorr(privateKey.get(), messageData.get()));
+    auto signature = data(TWDataBytes(signatureData.get()), TWDataSize(signatureData.get()));
+
+    ASSERT_TRUE(TWPublicKeyVerifyZilliqaSchnorr(pubKey.get(), signatureData.get(), messageData.get()));
+    EXPECT_EQ(hex(signature), "d166b1ae7892c5ef541461dc12a50214d0681b63d8037cda29a3fe6af8bb973e4ea94624d85bc0010bdc1b38d05198328fae21254adc2bf5feaf2804d54dba55");
+}
diff --git a/tests/chains/Zilliqa/SignerTests.cpp b/tests/chains/Zilliqa/SignerTests.cpp
new file mode 100644
index 00000000000..f8e0440307d
--- /dev/null
+++ b/tests/chains/Zilliqa/SignerTests.cpp
@@ -0,0 +1,109 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "Zilliqa/Address.h"
+#include "Zilliqa/Signer.h"
+#include "proto/Zilliqa.pb.h"
+#include "uint256.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Zilliqa::tests {
+
+TEST(ZilliqaSigner, PreImage) {
+    auto privateKey = PrivateKey(parse_hex("0E891B9DFF485000C7D1DC22ECF3A583CC50328684321D61947A86E57CF6C638"));
+    auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    ASSERT_EQ(hex(pubKey.bytes), "034ae47910d58b9bde819c3cffa8de4441955508db00aa2540db8e6bf6e99abc1b");
+
+    auto amount = uint256_t(15000000000000);
+    auto gasPrice = uint256_t(1000000000);
+    auto amountData = store(amount);
+    auto gasData = store(gasPrice);
+    auto toAddress = Address(parse_hex("0x9Ca91EB535Fb92Fda5094110FDaEB752eDb9B039"));
+
+    auto input = Proto::SigningInput();
+    auto& tx = *input.mutable_transaction();
+    auto& transfer = *tx.mutable_transfer();
+    transfer.set_amount(amountData.data(), amountData.size());
+
+    input.set_version(65537);
+    input.set_nonce(4);
+    input.set_to(toAddress.string());
+    input.set_gas_price(gasData.data(), gasData.size());
+    input.set_gas_limit(uint64_t(1));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    Address address;
+    auto preImage = Signer::getPreImage(input, address);
+    auto signature = Signer::sign(input).signature();
+
+    ASSERT_EQ(hex(preImage), "0881800410041a149ca91eb535fb92fda5094110fdaeb752edb9b03922230a21034ae47910d58b9bde819c3cffa8de4441955508db00aa2540db8e6bf6e99abc1b2a120a10000000000000000000000da475abf00032120a100000000000000000000000003b9aca003801");
+
+    ASSERT_TRUE(pubKey.verifyZilliqa(Data(signature.begin(), signature.end()), preImage));
+}
+
+TEST(ZilliqaSigner, Signing) {
+    auto privateKey = PrivateKey(parse_hex("0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748"));
+    auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+
+    // 1 ZIL
+    auto amount = uint256_t(1000000000000);
+    auto gasPrice = uint256_t(1000000000);
+    auto amountData = store(amount);
+    auto gasData = store(gasPrice);
+    auto toAddress = Address(parse_hex("0x7FCcaCf066a5F26Ee3AFfc2ED1FA9810Deaa632C"));
+
+    auto input = Proto::SigningInput();
+    auto& tx = *input.mutable_transaction();
+    auto& transfer = *tx.mutable_transfer();
+    transfer.set_amount(amountData.data(), amountData.size());
+
+    input.set_version(65537);
+    input.set_nonce(2);
+    input.set_to(toAddress.string());
+    input.set_gas_price(gasData.data(), gasData.size());
+    input.set_gas_limit(uint64_t(1));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto output = Signer::sign(input);
+
+    ASSERT_EQ(hex(output.signature()), "001fa4df08c11a4a79e96e69399ee48eeecc78231a78b0355a8ca783c77c139436e37934fecc2252ed8dac00e235e22d18410461fb896685c4270642738ed268");
+    ASSERT_EQ(output.json(), R"({"amount":"1000000000000","code":"","data":"","gasLimit":"1","gasPrice":"1000000000","nonce":2,"pubKey":"03fb30b196ce3e976593ecc2da220dca9cdea8c84d2373770042a930b892ac0f5c","signature":"001fa4df08c11a4a79e96e69399ee48eeecc78231a78b0355a8ca783c77c139436e37934fecc2252ed8dac00e235e22d18410461fb896685c4270642738ed268","toAddr":"7FCcaCf066a5F26Ee3AFfc2ED1FA9810Deaa632C","version":65537})");
+}
+
+TEST(ZilliqaSigner, SigningData) {
+    // https://viewblock.io/zilliqa/tx/0x6228b3d7e69fc3481b84fd00e892cec359a41654f58948ff7b1b932396b00ad9
+    auto privateKey = PrivateKey(parse_hex("0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748"));
+    auto pubKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+
+    // 10 ZIL
+    auto amount = uint256_t(10000000000000);
+    auto gasPrice = uint256_t(2000000000);
+    auto amountData = store(amount);
+    auto gasData = store(gasPrice);
+
+    std::string json = "{\"_tag\":\"DelegateStake\",\"params\":[{\"type\":\"ByStr20\",\"value\":\"0x122219cCeAb410901e96c3A0e55E46231480341b\",\"vname\":\"ssnaddr\"}]}";
+    auto jsonData = Data(json.begin(), json.end());
+
+    auto input = Proto::SigningInput();
+    auto& tx = *input.mutable_transaction();
+    auto& raw = *tx.mutable_raw_transaction();
+    raw.set_amount(amountData.data(), amountData.size());
+    raw.set_data(jsonData.data(), jsonData.size());
+
+    input.set_version(65537);
+    input.set_nonce(56);
+    input.set_to("zil1g029nmzsf36r99vupp4s43lhs40fsscx3jjpuy");
+    input.set_gas_price(gasData.data(), gasData.size());
+    input.set_gas_limit(uint64_t(5000));
+    input.set_private_key(privateKey.bytes.data(), privateKey.bytes.size());
+
+    auto output = Signer::sign(input);
+    ASSERT_EQ(output.json(), R"({"amount":"10000000000000","code":"","data":"{\"_tag\":\"DelegateStake\",\"params\":[{\"type\":\"ByStr20\",\"value\":\"0x122219cCeAb410901e96c3A0e55E46231480341b\",\"vname\":\"ssnaddr\"}]}","gasLimit":"5000","gasPrice":"2000000000","nonce":56,"pubKey":"03fb30b196ce3e976593ecc2da220dca9cdea8c84d2373770042a930b892ac0f5c","signature":"437fb5c3ce2c6b01f9d490f670539fae4533c82a21fa7edfe6b23df70d732937e8c578c8d6ed24be9150f5126f7b7c977a467af8947ef92a720908a761a6eb0d","toAddr":"43D459eC504C7432959c086B0ac7F7855E984306","version":65537})");
+    ASSERT_EQ(hex(output.signature()), "437fb5c3ce2c6b01f9d490f670539fae4533c82a21fa7edfe6b23df70d732937e8c578c8d6ed24be9150f5126f7b7c977a467af8947ef92a720908a761a6eb0d");
+}
+
+} // namespace TW::Zilliqa::tests
diff --git a/tests/chains/Zilliqa/TWAnySignerTests.cpp b/tests/chains/Zilliqa/TWAnySignerTests.cpp
new file mode 100644
index 00000000000..1b420161496
--- /dev/null
+++ b/tests/chains/Zilliqa/TWAnySignerTests.cpp
@@ -0,0 +1,46 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "proto/Zilliqa.pb.h"
+#include "uint256.h"
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWAnySigner.h>
+#include <gtest/gtest.h>
+
+namespace TW::Zilliqa::tests {
+
+TEST(TWAnySignerZilliqa, Sign) {
+    auto input = TW::Zilliqa::Proto::SigningInput();
+    auto& tx = *input.mutable_transaction();
+    auto& transfer = *tx.mutable_transfer();
+    auto key = parse_hex("0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748");
+    auto amount = store(uint256_t(1000000000000));
+    auto gasPrice = store(uint256_t(1000000000));
+
+    input.set_version(65537);
+    input.set_nonce(2);
+    input.set_to("zil10lx2eurx5hexaca0lshdr75czr025cevqu83uz");
+    input.set_gas_price(gasPrice.data(), gasPrice.size());
+    input.set_gas_limit(1);
+    input.set_private_key(key.data(), key.size());
+    transfer.set_amount(amount.data(), amount.size());
+
+    TW::Zilliqa::Proto::SigningOutput output;
+    ANY_SIGN(input, TWCoinTypeZilliqa);
+
+    EXPECT_EQ(hex(output.signature()), "001fa4df08c11a4a79e96e69399ee48eeecc78231a78b0355a8ca783c77c139436e37934fecc2252ed8dac00e235e22d18410461fb896685c4270642738ed268");
+    EXPECT_EQ(hex(output.json()), "7b22616d6f756e74223a2231303030303030303030303030222c22636f6465223a22222c2264617461223a22222c226761734c696d6974223a2231222c226761735072696365223a2231303030303030303030222c226e6f6e6365223a322c227075624b6579223a22303366623330623139366365336539373635393365636332646132323064636139636465613863383464323337333737303034326139333062383932616330663563222c227369676e6174757265223a223030316661346466303863313161346137396539366536393339396565343865656563633738323331613738623033353561386361373833633737633133393433366533373933346665636332323532656438646163303065323335653232643138343130343631666238393636383563343237303634323733386564323638222c22746f41646472223a2237464363614366303636613546323645653341466663324544314641393831304465616136333243222c2276657273696f6e223a36353533377d");
+}
+
+TEST(TWAnySignerZilliqa, SignJSON) {
+    auto json = STRING(R"({"version":65537,"nonce":"2","to":"zil10lx2eurx5hexaca0lshdr75czr025cevqu83uz","gasPrice":"O5rKAA==","gasLimit":"1","transaction":{"transfer":{"amount":"6NSlEAA="}}})");
+    auto key = DATA("0x68ffa8ec149ce50da647166036555f73d57f662eb420e154621e5f24f6cf9748");
+    auto result = WRAPS(TWAnySignerSignJSON(json.get(), key.get(), TWCoinTypeZilliqa));
+
+    ASSERT_TRUE(TWAnySignerSupportsJSON(TWCoinTypeZilliqa));
+    assertStringsEqual(result, "7b22616d6f756e74223a2231303030303030303030303030222c22636f6465223a22222c2264617461223a22222c226761734c696d6974223a2231222c226761735072696365223a2231303030303030303030222c226e6f6e6365223a322c227075624b6579223a22303366623330623139366365336539373635393365636332646132323064636139636465613863383464323337333737303034326139333062383932616330663563222c227369676e6174757265223a223030316661346466303863313161346137396539366536393339396565343865656563633738323331613738623033353561386361373833633737633133393433366533373933346665636332323532656438646163303065323335653232643138343130343631666238393636383563343237303634323733386564323638222c22746f41646472223a2237464363614366303636613546323645653341466663324544314641393831304465616136333243222c2276657273696f6e223a36353533377d");
+}
+
+} // namespace TW::Zilliqa::tests
\ No newline at end of file
diff --git a/tests/chains/Zilliqa/TWCoinTypeTests.cpp b/tests/chains/Zilliqa/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..f1c5545b0d2
--- /dev/null
+++ b/tests/chains/Zilliqa/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWZilliqaCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeZilliqa));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("t123"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeZilliqa, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("a12"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeZilliqa, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeZilliqa));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeZilliqa));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeZilliqa), 12);
+    ASSERT_EQ(TWBlockchainZilliqa, TWCoinTypeBlockchain(TWCoinTypeZilliqa));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeZilliqa));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeZilliqa));
+    assertStringsEqual(symbol, "ZIL");
+    assertStringsEqual(txUrl, "https://viewblock.io/zilliqa/tx/t123");
+    assertStringsEqual(accUrl, "https://viewblock.io/zilliqa/address/a12");
+    assertStringsEqual(id, "zilliqa");
+    assertStringsEqual(name, "Zilliqa");
+}
diff --git a/tests/Zilliqa/TWZilliqaAddressTests.cpp b/tests/chains/Zilliqa/TWZilliqaAddressTests.cpp
similarity index 80%
rename from tests/Zilliqa/TWZilliqaAddressTests.cpp
rename to tests/chains/Zilliqa/TWZilliqaAddressTests.cpp
index e2e19630cbe..63b7b515816 100644
--- a/tests/Zilliqa/TWZilliqaAddressTests.cpp
+++ b/tests/chains/Zilliqa/TWZilliqaAddressTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWHash.h>
 #include <TrustWalletCore/TWCoinType.h>
diff --git a/tests/chains/ZkLinkNova/TWCoinTypeTests.cpp b/tests/chains/ZkLinkNova/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..933ab752af8
--- /dev/null
+++ b/tests/chains/ZkLinkNova/TWCoinTypeTests.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+TEST(TWZkLinkNovaCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeZkLinkNova;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xeb5eb8710369c89115a83f3e744c15c9d388030cfce2fd3a653dbd18f2947400"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xF95115BaD9a4585B3C5e2bfB50579f17163A45aA"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "zklinknova");
+    assertStringsEqual(name, "zkLink Nova Mainnet");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2pkhPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0);
+    assertStringsEqual(txUrl, "https://explorer.zklink.io/tx/0xeb5eb8710369c89115a83f3e744c15c9d388030cfce2fd3a653dbd18f2947400");
+    assertStringsEqual(accUrl, "https://explorer.zklink.io/address/0xF95115BaD9a4585B3C5e2bfB50579f17163A45aA");
+}
diff --git a/tests/chains/ZkSyncV2/TWCoinTypeTests.cpp b/tests/chains/ZkSyncV2/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..b72bb030ab0
--- /dev/null
+++ b/tests/chains/ZkSyncV2/TWCoinTypeTests.cpp
@@ -0,0 +1,35 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+namespace TW::TWZksync::tests {
+
+TEST(TWZksyncCoinType, TWCoinType) {
+    const auto coin = TWCoinTypeZksync;
+    const auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(coin));
+    const auto id = WRAPS(TWCoinTypeConfigurationGetID(coin));
+    const auto name = WRAPS(TWCoinTypeConfigurationGetName(coin));
+    const auto chainId = WRAPS(TWCoinTypeChainId(coin));
+    const auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0xae38d3ede1104d088b474da261d0eb4847952c3db24c21e820502f4c1b0c01f5"));
+    const auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(coin, txId.get()));
+    const auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0xeF86b2c8740518548ae449c4C3892B4be0475d8c"));
+    const auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(coin, accId.get()));
+
+    assertStringsEqual(id, "zksync");
+    assertStringsEqual(name, "zkSync Era");
+    assertStringsEqual(symbol, "ETH");
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(coin), 18);
+    ASSERT_EQ(TWCoinTypeBlockchain(coin), TWBlockchainEthereum);
+    ASSERT_EQ(TWCoinTypeP2shPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeStaticPrefix(coin), 0x0);
+    ASSERT_EQ(TWCoinTypeZksync, 10000324ull);
+    assertStringsEqual(chainId, "324");
+    assertStringsEqual(txUrl, "https://explorer.zksync.io/tx/0xae38d3ede1104d088b474da261d0eb4847952c3db24c21e820502f4c1b0c01f5");
+    assertStringsEqual(accUrl, "https://explorer.zksync.io/address/0xeF86b2c8740518548ae449c4C3892B4be0475d8c");
+}
+
+} // namespace TW::TWZksync::tests
diff --git a/tests/chains/xDai/TWCoinTypeTests.cpp b/tests/chains/xDai/TWCoinTypeTests.cpp
new file mode 100644
index 00000000000..68ebf0e6ee6
--- /dev/null
+++ b/tests/chains/xDai/TWCoinTypeTests.cpp
@@ -0,0 +1,32 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+//
+// This is a GENERATED FILE, changes made here MAY BE LOST.
+// Generated one-time (codegen/bin/cointests)
+//
+
+#include "TestUtilities.h"
+#include <TrustWalletCore/TWCoinTypeConfiguration.h>
+#include <gtest/gtest.h>
+
+
+TEST(TWxDaiCoinType, TWCoinType) {
+    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeXDai));
+    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x936798a1ef607c9e856d7861b15999c770c06f0887c4fc1f6acbf3bef09899c1"));
+    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeXDai, txId.get()));
+    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x12d61a95CF55e18D267C2F1AA67d8e42ae1368f8"));
+    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeXDai, accId.get()));
+    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeXDai));
+    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeXDai));
+
+    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeXDai), 18);
+    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeXDai));
+    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeXDai));
+    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeXDai));
+    assertStringsEqual(symbol, "xDAI");
+    assertStringsEqual(txUrl, "https://blockscout.com/xdai/mainnet/tx/0x936798a1ef607c9e856d7861b15999c770c06f0887c4fc1f6acbf3bef09899c1");
+    assertStringsEqual(accUrl, "https://blockscout.com/xdai/mainnet/address/0x12d61a95CF55e18D267C2F1AA67d8e42ae1368f8");
+    assertStringsEqual(id, "xdai");
+    assertStringsEqual(name, "Gnosis Chain");
+}
diff --git a/tests/common/AnyAddressTests.cpp b/tests/common/AnyAddressTests.cpp
new file mode 100644
index 00000000000..fc765c6f548
--- /dev/null
+++ b/tests/common/AnyAddressTests.cpp
@@ -0,0 +1,45 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "AnyAddress.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::tests {
+
+constexpr auto ANY_ADDRESS_TEST_ADDRESS = "bc1qcj2vfjec3c3luf9fx9vddnglhh9gawmncmgxhz";
+constexpr auto ANY_ADDRESS_TEST_PUBKEY = "02753f5c275e1847ba4d2fd3df36ad00af2e165650b35fe3991e9c9c46f68b12bc";
+
+TEST(AnyAddress, createFromString) {
+    std::unique_ptr<AnyAddress> addr(AnyAddress::createAddress(ANY_ADDRESS_TEST_ADDRESS, TWCoinTypeBitcoin));
+    EXPECT_EQ(ANY_ADDRESS_TEST_ADDRESS, addr->address);
+}
+
+TEST(AnyAddress, createFromPubKey) {
+    const Data key = parse_hex(ANY_ADDRESS_TEST_PUBKEY);
+    PublicKey publicKey(key, TWPublicKeyTypeSECP256k1);
+    std::unique_ptr<AnyAddress> addr(AnyAddress::createAddress(publicKey, TWCoinTypeBitcoin));
+    EXPECT_EQ(ANY_ADDRESS_TEST_ADDRESS, addr->address);
+}
+
+TEST(AnyAddress, createFromPubKeyDerivation) {
+    const Data key = parse_hex(ANY_ADDRESS_TEST_PUBKEY);
+    PublicKey publicKey(key, TWPublicKeyTypeSECP256k1);
+    {
+        std::unique_ptr<AnyAddress> addr(AnyAddress::createAddress(publicKey, TWCoinTypeBitcoin, TWDerivationDefault, std::monostate()));
+        EXPECT_EQ(addr->address, ANY_ADDRESS_TEST_ADDRESS);
+    }
+    {
+        std::unique_ptr<AnyAddress> addr(AnyAddress::createAddress(publicKey, TWCoinTypeBitcoin, TWDerivationBitcoinLegacy, std::monostate()));
+        EXPECT_EQ(addr->address, "1JvRfEQFv5q5qy9uTSAezH7kVQf4hqnHXx");
+    }
+}
+
+TEST(AnyAddress, createFromWrongString) {
+    std::unique_ptr<AnyAddress> addr(AnyAddress::createAddress("1aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaax", TWCoinTypeBitcoin));
+    EXPECT_EQ(nullptr, addr);
+}
+
+} // namespace TW::tests
diff --git a/tests/common/Base64Tests.cpp b/tests/common/Base64Tests.cpp
new file mode 100644
index 00000000000..b5d01b4ccba
--- /dev/null
+++ b/tests/common/Base64Tests.cpp
@@ -0,0 +1,82 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base64.h"
+#include "Data.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+namespace TW::Base64::tests {
+
+TEST(Base64, encode) {
+    auto encoded = encode(data("Hello, world!"));
+    EXPECT_EQ("SGVsbG8sIHdvcmxkIQ==", encoded);
+    encoded = encode(data("1"));
+    EXPECT_EQ("MQ==", encoded);
+    encoded = encode(data("12"));
+    EXPECT_EQ("MTI=", encoded);
+    encoded = encode(data("123"));
+    EXPECT_EQ("MTIz", encoded);
+    encoded = encode(data("1234"));
+    EXPECT_EQ("MTIzNA==", encoded);
+    encoded = encode(data(""));
+    EXPECT_EQ("", encoded);
+    encoded = encode(data("Lorem ipsum dolor sit amet, consectetur adipiscing elit"));
+    EXPECT_EQ("TG9yZW0gaXBzdW0gZG9sb3Igc2l0IGFtZXQsIGNvbnNlY3RldHVyIGFkaXBpc2NpbmcgZWxpdA==", encoded);
+    encoded = encode(parse_hex("11ff8156775b79325e5d62e742d9b96c30b6515a5cd2f1f64c5da4b193c03f070e0d291b"));
+    EXPECT_EQ("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODSkb", encoded);
+}
+
+TEST(Base64, decode) {
+    auto decoded = decode("SGVsbG8sIHdvcmxkIQ==");
+    EXPECT_EQ(hex(data("Hello, world!")), hex(decoded));
+    decoded = decode("MQ==");
+    EXPECT_EQ(hex(data("1")), hex(decoded));
+    decoded = decode("MTI=");
+    EXPECT_EQ(hex(data("12")), hex(decoded));
+    decoded = decode("MTIz");
+    EXPECT_EQ(hex(data("123")), hex(decoded));
+    decoded = decode("");
+    EXPECT_EQ("", hex(decoded));
+    decoded = decode("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODSkb");
+    EXPECT_EQ("11ff8156775b79325e5d62e742d9b96c30b6515a5cd2f1f64c5da4b193c03f070e0d291b", hex(decoded));
+}
+
+
+
+TEST(Base64, EncodeDecodeSui) {
+    auto v = "AAIAAAAAAAAAAAAAAAAAAAAAAAAAAgEAAAAAAAAAINaXMihjlCd4CQVFRPjcNb7QfYP4wGgQyl1xbplvEKUCA3N1aQh0cmFuc2ZlcgACAQCDlY9/fBVEt0yclyDF8RrjSRBfRRsAAAAAAAAAIJttZrU/26Bim7ku4dwY8d3fdabngn0B6dY/hLKgb6+xABQv0f6HrJCZ/1cuDVuxh1BL12XMeC21AKyRnN3jUaw243EdgyxtuXZpG62iKzFvYdk6RMGXxnoWd8RcfwkUAQAAAAAAACDi9GYNIZ0FXpPPi+zdDUuzHfs6MDoxzPuXGPZJq8ZfOAEAAAAAAAAA0AcAAAAAAAA=";
+    auto decoded = decode(v);
+    auto encoded = encode(decoded);
+    ASSERT_EQ(encoded, v);
+}
+
+TEST(Base64, UrlFormat) {
+    const std::string const1 = "11003faa8556289975ec991ac9994dfb613abec4ea000d5094e6379080f594e559b330b8";
+
+    // Encoded string has both special characters
+    auto encoded = encode(parse_hex(const1));
+    EXPECT_EQ("EQA/qoVWKJl17JkayZlN+2E6vsTqAA1QlOY3kID1lOVZszC4", encoded);
+    encoded = encodeBase64Url(parse_hex(const1));
+    EXPECT_EQ("EQA_qoVWKJl17JkayZlN-2E6vsTqAA1QlOY3kID1lOVZszC4", encoded);
+
+    auto decoded = decode("EQA/qoVWKJl17JkayZlN+2E6vsTqAA1QlOY3kID1lOVZszC4");
+    EXPECT_EQ(const1, hex(decoded));
+    decoded = decodeBase64Url("EQA_qoVWKJl17JkayZlN-2E6vsTqAA1QlOY3kID1lOVZszC4");
+    EXPECT_EQ(const1, hex(decoded));
+}
+
+TEST(Base64, isBase64) {
+    EXPECT_TRUE(isBase64orBase64Url("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODSkb"));
+    EXPECT_TRUE(isBase64orBase64Url("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODSk="));
+    EXPECT_TRUE(isBase64orBase64Url("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODS=="));
+    EXPECT_TRUE(isBase64orBase64Url("EQA_qoVWKJl17JkayZlN-2E6vsTqAA1QlOY3kID1lOVZszC4"));
+    EXPECT_FALSE(isBase64orBase64Url("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcOD==="));
+    EXPECT_FALSE(isBase64orBase64Url("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODSkb="));
+    EXPECT_FALSE(isBase64orBase64Url("Ef+BVndbeTJeXWLnQtm5bDC2UVpc0vH2TF2ksZPAPwcODSk"));
+    EXPECT_FALSE(isBase64orBase64Url("MwCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsors=#"));
+}
+
+} // namespace TW::Base64::tests
diff --git a/tests/BaseEncoding.cpp b/tests/common/BaseEncoding.cpp
similarity index 90%
rename from tests/BaseEncoding.cpp
rename to tests/common/BaseEncoding.cpp
index 48003ec5fad..69d655c94f9 100644
--- a/tests/BaseEncoding.cpp
+++ b/tests/common/BaseEncoding.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Base32.h"
 #include "HexCoding.h"
diff --git a/tests/Bech32AddressTests.cpp b/tests/common/Bech32AddressTests.cpp
similarity index 90%
rename from tests/Bech32AddressTests.cpp
rename to tests/common/Bech32AddressTests.cpp
index 7152fd9ce78..11d8ec18b81 100644
--- a/tests/Bech32AddressTests.cpp
+++ b/tests/common/Bech32AddressTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bech32Address.h"
 #include "HexCoding.h"
@@ -103,14 +101,14 @@ TEST(Bech32Address, FromPublicKey) {
     {
         auto privateKey = PrivateKey(parse_hex("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832"));
         auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-        ASSERT_EQ(hex(publicKey.bytes.begin(), publicKey.bytes.end()), "026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502");
+        ASSERT_EQ(hex(publicKey.bytes), "026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502");
         auto address = Bech32Address("bnb", Hash::HasherSha256ripemd, publicKey);
         ASSERT_EQ("bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2", address.string());
     }
     {
         auto privateKey = PrivateKey(parse_hex("80e81ea269e66a0a05b11236df7919fb7fbeedba87452d667489d7403a02f005"));
         auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-        ASSERT_EQ(hex(publicKey.bytes.begin(), publicKey.bytes.end()), "0257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc5");
+        ASSERT_EQ(hex(publicKey.bytes), "0257286ec3f37d33557bbbaa000b27744ac9023aa9967cae75a181d1ff91fa9dc5");
         auto address = Bech32Address("cosmos", Hash::HasherSha256ripemd, publicKey);
         ASSERT_EQ(address.string(), "cosmos1hsk6jryyqjfhp5dhc55tc9jtckygx0eph6dd02");
     }
@@ -129,7 +127,7 @@ TEST(Bech32Address, FromPublicKey) {
     {
         const auto privateKey = PrivateKey(parse_hex("3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6"));
         auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-        ASSERT_EQ(hex(publicKey.bytes.begin(), publicKey.bytes.end()), "02b65744e8bd0ba7666468abaff2aeb862c88a25ed605e0153100aa8f2661c1c3d");
+        ASSERT_EQ(hex(publicKey.bytes), "02b65744e8bd0ba7666468abaff2aeb862c88a25ed605e0153100aa8f2661c1c3d");
         const auto address = Bech32Address("zil", Hash::HasherSha256, publicKey);
         ASSERT_EQ("zil", address.getHrp());
         ASSERT_EQ("zil1j8xae6lggm8y63m3y2r7aefu797ze7mhzulnqg", address.string());
@@ -141,7 +139,7 @@ TEST(Bech32Address, Hashes) {
     const auto privateKey = PrivateKey(parse_hex("3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6"));
 
     auto publicKey1 = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    ASSERT_EQ("02b65744e8bd0ba7666468abaff2aeb862c88a25ed605e0153100aa8f2661c1c3d", hex(publicKey1.bytes.begin(), publicKey1.bytes.end()));
+    ASSERT_EQ("02b65744e8bd0ba7666468abaff2aeb862c88a25ed605e0153100aa8f2661c1c3d", hex(publicKey1.bytes));
 
     const auto address1 = Bech32Address("hrp", Hash::HasherSha256ripemd, publicKey1);
     ASSERT_EQ("hrp186zwn9h0z9fyvwfqs4jl92cw3kexusm4xw6ptp", address1.string());
@@ -152,7 +150,7 @@ TEST(Bech32Address, Hashes) {
     auto publicKey2 = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
     ASSERT_EQ(
         "04b65744e8bd0ba7666468abaff2aeb862c88a25ed605e0153100aa8f2661c1c3d83c307736082c09f1f22328e0fbeab40ddd198cf0f70fcdaa1e5969ca400c098",
-        hex(publicKey2.bytes.begin(), publicKey2.bytes.end()));
+        hex(publicKey2.bytes));
 
     const auto address3 = Bech32Address("hrp", Hash::HasherKeccak256, publicKey2);
     ASSERT_EQ("hrp17hff3s97m5uxpjcdq3nzqxxatt8cmumnsf03su", address3.string());
@@ -163,7 +161,7 @@ TEST(Bech32Address, Prefixes) {
     const auto privateKey = PrivateKey(parse_hex("3382266517e2ebe6df51faf4bfe612236ad46fb8bd59ac982a223b045e080ac6"));
 
     auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
-    ASSERT_EQ("02b65744e8bd0ba7666468abaff2aeb862c88a25ed605e0153100aa8f2661c1c3d", hex(publicKey.bytes.begin(), publicKey.bytes.end()));
+    ASSERT_EQ("02b65744e8bd0ba7666468abaff2aeb862c88a25ed605e0153100aa8f2661c1c3d", hex(publicKey.bytes));
 
     const auto address1 = Bech32Address("hrpone", Hash::HasherSha256ripemd, publicKey);
     ASSERT_EQ("hrpone186zwn9h0z9fyvwfqs4jl92cw3kexusm47das6p", address1.string());
diff --git a/tests/Bech32Tests.cpp b/tests/common/Bech32Tests.cpp
similarity index 96%
rename from tests/Bech32Tests.cpp
rename to tests/common/Bech32Tests.cpp
index 9c8b0b32baa..c081fd9cf6c 100644
--- a/tests/Bech32Tests.cpp
+++ b/tests/common/Bech32Tests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Bech32.h"
 #include "HexCoding.h"
diff --git a/tests/common/BinaryCodingTests.cpp b/tests/common/BinaryCodingTests.cpp
new file mode 100644
index 00000000000..5ce20884b9a
--- /dev/null
+++ b/tests/common/BinaryCodingTests.cpp
@@ -0,0 +1,152 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "BinaryCoding.h"
+#include "HexCoding.h"
+
+#include <vector>
+
+#include <gtest/gtest.h>
+
+using namespace std;
+using namespace TW;
+
+TEST(BinaryCodingTests, varIntSize) {
+    vector<tuple<uint64_t, uint8_t>> tests = {
+        {0, 1},
+        {1, 1},
+        {10, 1},
+        {100, 1},
+        {0xfb, 1},
+        {0xfc, 1},
+        {0xfd, 3},
+        {0xfe, 3},
+        {0xff, 3},
+        {0x100, 3},
+        {0x200, 3},
+        {0x1000, 3},
+        {0xffff, 3},
+        {0x10000, 5},
+        {0x20000, 5},
+        {0xffffffff, 5},
+        {0x100000000, 9},
+        {0x200000000, 9},
+        {0x1000000000, 9},
+        {0x10000000000, 9},
+        {0x100000000000, 9},
+        {0x1000000000000, 9},
+        {0x10000000000000, 9},
+        {0x100000000000000, 9},
+        {0xffffffffffffffff, 9},
+    };
+    for (auto& test : tests) {
+        EXPECT_EQ(varIntSize(get<0>(test)), get<1>(test));
+    }
+}
+
+TEST(BinaryCodingTests, encodeAndDecodeVarInt) {
+    vector<tuple<uint64_t, string>> tests = {
+        {0, "00"},
+        {1, "01"},
+        {10, "0a"},
+        {100, "64"},
+        {0xfb, "fb"},
+        {0xfc, "fc"},
+        {0xfd, "fdfd00"},
+        {0xfe, "fdfe00"},
+        {0xff, "fdff00"},
+        {0x100, "fd0001"},
+        {0x200, "fd0002"},
+        {0x1000, "fd0010"},
+        {0xffff, "fdffff"},
+        {0x10000, "fe00000100"},
+        {0x20000, "fe00000200"},
+        {0xffffffff, "feffffffff"},
+        {0x100000000, "ff0000000001000000"},
+        {0x200000000, "ff0000000002000000"},
+        {0x1000000000, "ff0000000010000000"},
+        {0x10000000000, "ff0000000000010000"},
+        {0x100000000000, "ff0000000000100000"},
+        {0x1000000000000, "ff0000000000000100"},
+        {0x10000000000000, "ff0000000000001000"},
+        {0x100000000000000, "ff0000000000000001"},
+        {0xffffffffffffffff, "ffffffffffffffffff"},
+    };
+    for (auto& test : tests) {
+        const auto input = get<0>(test);
+        Data encoded;
+        uint8_t resultEnc = encodeVarInt(input, encoded);
+        EXPECT_EQ(hex(encoded), get<1>(test));
+        EXPECT_EQ(resultEnc, varIntSize(input));
+        // decode back
+        size_t index = 0;
+        const auto resultDec = decodeVarInt(encoded, index);
+        EXPECT_EQ(get<0>(resultDec), true);
+        EXPECT_EQ(get<1>(resultDec), input);
+    }
+}
+
+TEST(BinaryCodingTests, decodeVarIntTooShort) {
+    {
+        Data encoded = parse_hex("fe000000"); // one byte missing
+        size_t index = 0;
+        const auto result = decodeVarInt(encoded, index);
+        EXPECT_EQ(get<0>(result), false);
+    }
+    {
+        Data encoded = parse_hex("fe00000000");
+        size_t index = 0;
+        const auto result = decodeVarInt(encoded, index);
+        EXPECT_EQ(get<0>(result), true);
+    }
+}
+
+TEST(BinaryCodingTests, encodeAndDecodeString) {
+    vector<tuple<string, string>> tests = {
+        {"", "00"},
+        {"A", "0141"},
+        {"AB", "024142"},
+        {"abcdefghij", "0a6162636465666768696a"},
+        {"abcdefghIj", "0a6162636465666768496a"},
+        {"12345678901234567890123456789012345678901234567890", "323132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"},
+        {
+            "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+            "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+            "1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890"
+            , "fd2c01"
+            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
+            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
+            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
+            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
+            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
+            "3132333435363738393031323334353637383930313233343536373839303132333435363738393031323334353637383930"
+        },
+    };
+    for (auto& test : tests) {
+        const auto input = get<0>(test);
+        Data encoded;
+        encodeString(input, encoded);
+        EXPECT_EQ(hex(encoded), get<1>(test));
+        // decode back
+        size_t index = 0;
+        const auto resultDec = decodeString(encoded, index);
+        EXPECT_EQ(get<0>(resultDec), true);
+        EXPECT_EQ(get<1>(resultDec), get<0>(test));
+    }
+}
+
+TEST(BinaryCodingTests, decodeStringTooShort) {
+    {
+        Data encoded = parse_hex("0a616263646566676849"); // one byte missing
+        size_t index = 0;
+        const auto result = decodeString(encoded, index);
+        EXPECT_EQ(get<0>(result), false);
+    }
+    {
+        Data encoded = parse_hex("0a6162636465666768496a");
+        size_t index = 0;
+        const auto result = decodeString(encoded, index);
+        EXPECT_EQ(get<0>(result), true);
+    }
+}
diff --git a/tests/CborTests.cpp b/tests/common/CborTests.cpp
similarity index 98%
rename from tests/CborTests.cpp
rename to tests/common/CborTests.cpp
index 592b0ec9322..a941565dd39 100644
--- a/tests/CborTests.cpp
+++ b/tests/common/CborTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Cbor.h"
 
diff --git a/tests/common/CoinAddressDerivationTests.cpp b/tests/common/CoinAddressDerivationTests.cpp
new file mode 100644
index 00000000000..6df5336c5c0
--- /dev/null
+++ b/tests/common/CoinAddressDerivationTests.cpp
@@ -0,0 +1,440 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Coin.h"
+#include "HexCoding.h"
+
+#include <gtest/gtest.h>
+
+#include <mutex>
+#include <thread>
+
+namespace TW {
+
+TEST(Coin, DeriveAddress) {
+    auto dummyKeyData = parse_hex("0x4646464646464646464646464646464646464646464646464646464646464646");
+    const auto privateKey = PrivateKey(dummyKeyData);
+    const auto privateKeyExt = PrivateKey(dummyKeyData, dummyKeyData, dummyKeyData, dummyKeyData, dummyKeyData, dummyKeyData);
+
+    const auto coins = TW::getCoinTypes();
+    for (auto& c : coins) {
+        std::string address;
+        switch (c) {
+        default:
+            address = TW::deriveAddress(c, privateKey);
+            break;
+
+        case TWCoinTypeCardano:
+        case TWCoinTypeNEO:
+            address = TW::deriveAddress(c, privateKeyExt);
+            break;
+        }
+
+        switch (c) {
+        // Ethereum and ...
+        case TWCoinTypeEthereum:
+        // ... clones:
+        case TWCoinTypeAcalaEVM:
+        case TWCoinTypeArbitrum:
+        case TWCoinTypeArbitrumNova:
+        case TWCoinTypeAurora:
+        case TWCoinTypeAvalancheCChain:
+        case TWCoinTypeBoba:
+        case TWCoinTypeCallisto:
+        case TWCoinTypeCelo:
+        case TWCoinTypeConfluxeSpace:
+        case TWCoinTypeCronosChain:
+        case TWCoinTypeECOChain:
+        case TWCoinTypeEthereumClassic:
+        case TWCoinTypeEvmos:
+        case TWCoinTypeFantom:
+        case TWCoinTypeGoChain:
+        case TWCoinTypeKavaEvm:
+        case TWCoinTypeKaia:
+        case TWCoinTypeKuCoinCommunityChain:
+        case TWCoinTypeMeter:
+        case TWCoinTypeMetis:
+        case TWCoinTypeMoonbeam:
+        case TWCoinTypeMoonriver:
+        case TWCoinTypeOptimism:
+        case TWCoinTypeZksync:
+        case TWCoinTypePolygonzkEVM:
+        case TWCoinTypeOKXChain:
+        case TWCoinTypePOANetwork:
+        case TWCoinTypePolygon:
+        case TWCoinTypeSmartBitcoinCash:
+        case TWCoinTypeSmartChain:
+        case TWCoinTypeSmartChainLegacy:
+        case TWCoinTypeTheta:
+        case TWCoinTypeThetaFuel:
+        case TWCoinTypeThunderCore:
+        case TWCoinTypeViction:
+        case TWCoinTypeVeChain:
+        case TWCoinTypeWanchain:
+        case TWCoinTypeXDai:
+        case TWCoinTypeIoTeXEVM:
+        case TWCoinTypeScroll:
+        case TWCoinTypeOpBNB:
+        case TWCoinTypeNeon:
+        case TWCoinTypeBase:
+        case TWCoinTypeLinea:
+        case TWCoinTypeGreenfield:
+        case TWCoinTypeMantle:
+        case TWCoinTypeZenEON:
+        case TWCoinTypeMantaPacific:
+        case TWCoinTypeZetaEVM:
+        case TWCoinTypeMerlin:
+        case TWCoinTypeLightlink:
+        case TWCoinTypeBlast:
+        case TWCoinTypeBounceBit:
+        case TWCoinTypeZkLinkNova:
+            // end_of_evm_address_derivation_tests_marker_do_not_modify
+            EXPECT_EQ(address, "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F");
+            break;
+
+        case TWCoinTypeKin:
+        case TWCoinTypeStellar:
+            EXPECT_EQ(address, "GDXJHJHWN6GRNOAZXON6XH74ZX6NYFAS5B7642RSJQVJTIPA4ZYUQLEB");
+            break;
+
+        case TWCoinTypeNEO:
+        case TWCoinTypeOntology:
+            EXPECT_EQ(address, "AeicEjZyiXKgUeSBbYQHxsU1X3V5Buori5");
+            break;
+
+        case TWCoinTypeTerra:
+        case TWCoinTypeTerraV2:
+            EXPECT_EQ(address, "terra1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0ll9rwp");
+            break;
+
+        case TWCoinTypeZcash:
+        case TWCoinTypeZelcash:
+            EXPECT_EQ(address, "t1b9xfAk3kZp5Qk3rinDPq7zzLkJGHTChDS");
+            break;
+
+        case TWCoinTypeKomodo:
+            EXPECT_EQ(address, "RSZYjMDCP4q3t7NAFXPPnqEGrMZn971pdB");
+            break;
+        case TWCoinTypeAcala:
+            EXPECT_EQ(address, "26GQqmwt3154cQbG2fyBsh3cGuCBoRFtrwuCD6WcVJdFReA4");
+            break;
+        case TWCoinTypeAeternity:
+            EXPECT_EQ(address, "ak_2p5878zbFhxnrm7meL7TmqwtvBaqcBddyp5eGzZbovZ5FeVfcw");
+            break;
+        case TWCoinTypeAion:
+            EXPECT_EQ(address, "0xa0010b0ea04ba4d76ca6e5e9900bacf19bc4402eaec7e36ea7ddd8eed48f60f3");
+            break;
+        case TWCoinTypeAlgorand:
+            EXPECT_EQ(address, "52J2J5TPRULLQGN3TPVZ77GN7TOBIEXIP7XGUMSMFKM2DYHGOFEOGBP2T4");
+            break;
+        case TWCoinTypeBandChain:
+            EXPECT_EQ(address, "band1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0q5lp5f");
+            break;
+        case TWCoinTypeBinance:
+            EXPECT_EQ(address, "bnb1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0mlq0d0");
+            break;
+        case TWCoinTypeTBinance:
+            EXPECT_EQ(address, "tbnb1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z042ftd7");
+            break;
+        case TWCoinTypeBitcoin:
+            EXPECT_EQ(address, "bc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z00ppggv");
+            break;
+        case TWCoinTypeBitcoinCash:
+            EXPECT_EQ(address, "bitcoincash:qz7eyzytkl5z6cg6nw20hd62pyyp22mcfuardfd2vn");
+            break;
+        case TWCoinTypeBitcoinDiamond:
+            EXPECT_EQ(address, "1JHMeqKunF2Up6zxnMQGhJu5667BXz98YQ");
+            break;
+        case TWCoinTypeBitcoinGold:
+            EXPECT_EQ(address, "btg1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0eg8day");
+            break;
+        case TWCoinTypeBluzelle:
+            EXPECT_EQ(address, "bluzelle1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0vrup2s");
+            break;
+        case TWCoinTypeCardano:
+            EXPECT_EQ(address, "addr1qxzk4wqhh5qmzas4e26aghcvkz8feju6sa43nghfj5xxsly9d2up00gpk9mptj44630sevywnn9e4pmtrx3wn9gvdp7qjhvjl4");
+            break;
+        case TWCoinTypeCosmos:
+            EXPECT_EQ(address, "cosmos1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0emlrvp");
+            break;
+        case TWCoinTypeCryptoOrg:
+            EXPECT_EQ(address, "cro1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0pqh6ss");
+            break;
+        case TWCoinTypeDash:
+            EXPECT_EQ(address, "XsyCV5yojxF4y3bYeEiVYqarvRgsWFELZL");
+            break;
+        case TWCoinTypeDecred:
+            EXPECT_EQ(address, "Dsp4u8xxTHSZU2ELWTQLQP77xJhgeWrTsGK");
+            break;
+        case TWCoinTypeDigiByte:
+            EXPECT_EQ(address, "dgb1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0c69ssz");
+            break;
+        case TWCoinTypeDogecoin:
+            EXPECT_EQ(address, "DNRTC6GZ5evmM7BZWwPqF54fyDqUqULMyu");
+            break;
+        case TWCoinTypeECash:
+            EXPECT_EQ(address, "ecash:qz7eyzytkl5z6cg6nw20hd62pyyp22mcfuywezks2y");
+            break;
+        case TWCoinTypeEOS:
+        case TWCoinTypeWAX:
+            EXPECT_EQ(address, "EOS5TrYnZP1RkDSUMzBY4GanCy6AP68kCMdkAb5EACkAwkdgRLShz");
+            break;
+        case TWCoinTypeMultiversX:
+            EXPECT_EQ(address, "erd1a6f6fan035ttsxdmn04ellxdlnwpgyhg0lhx5vjv92v6rc8xw9yq83344f");
+            break;
+        case TWCoinTypeEverscale:
+            EXPECT_EQ(address, "0:ef64d51f95ef17973b737277cfecbd2a8d551141be2f58f5fb362575fc3eb5b0");
+            break;
+        case TWCoinTypeTON:
+            EXPECT_EQ(address, "UQAoYT8nMLfeNh6h0uIoK_wLm9JkvxiGxJDr6GRXJGu2Zked");
+            break;
+        case TWCoinTypeFIO:
+            EXPECT_EQ(address, "FIO5TrYnZP1RkDSUMzBY4GanCy6AP68kCMdkAb5EACkAwkdgRLShz");
+            break;
+        case TWCoinTypeFilecoin:
+            EXPECT_EQ(address, "f1qsx7qwiojh5duxbxhbqgnlyx5hmpcf7mcz5oxsy");
+            break;
+        case TWCoinTypeFiro:
+            EXPECT_EQ(address, "aHzpPjmY132KseS4nkiQTbDahTEXqesY89");
+            break;
+        case TWCoinTypeGroestlcoin:
+            EXPECT_EQ(address, "grs1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0jsaf3d");
+            break;
+        case TWCoinTypeHarmony:
+            EXPECT_EQ(address, "one1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj0nmx3dt");
+            break;
+        case TWCoinTypeICON:
+            EXPECT_EQ(address, "hx4728fc65c31728f0d3538b8783b5394b31a136b9");
+            break;
+        case TWCoinTypeIOST:
+            EXPECT_EQ(address, "H4JcMPicKkHcxxDjkyyrLoQj7Kcibd9t815ak4UvTr9M");
+            break;
+        case TWCoinTypeIoTeX:
+            EXPECT_EQ(address, "io1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj0zgdt6h");
+            break;
+        case TWCoinTypeKava:
+            EXPECT_EQ(address, "kava1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z09wt76x");
+            break;
+        case TWCoinTypeKusama:
+            EXPECT_EQ(address, "Hy8mqcexg5FMwMYnQvzrUvD723qMxDjMRU9HdNCnTsMAypY");
+            break;
+        case TWCoinTypeLitecoin:
+            EXPECT_EQ(address, "ltc1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0tamvsu");
+            break;
+        case TWCoinTypeMonacoin:
+            EXPECT_EQ(address, "MRBWtGEKHGCHhmyJ1L4CwaWQZJzM5DnVcs");
+            break;
+        case TWCoinTypeNEAR:
+            EXPECT_EQ(address, "ee93a4f66f8d16b819bb9beb9ffccdfcdc1412e87fee6a324c2a99a1e0e67148");
+            break;
+        case TWCoinTypeNULS:
+            EXPECT_EQ(address, "NULSd6HgfXT3m5JBGxeCZXHRQbb82FKgZGT8o");
+            break;
+        case TWCoinTypeNano:
+            EXPECT_EQ(address, "nano_1qepdf4k95dhb5gsmhmq3iddqsxiafwkihunm7irn48jdiwdtnn6pe93k3f6");
+            break;
+        case TWCoinTypeNativeEvmos:
+            EXPECT_EQ(address, "evmos1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj07me7uu");
+            break;
+        case TWCoinTypeNebulas:
+            EXPECT_EQ(address, "n1XTciu9ZRYt3ni7SxNBmivk9Y6XpP6VrhT");
+            break;
+        case TWCoinTypeNimiq:
+            EXPECT_EQ(address, "NQ74 D40G N3M0 9EJD ET56 UPLR 02VC X6DU 8G1E");
+            break;
+        case TWCoinTypeOasis:
+            EXPECT_EQ(address, "oasis1qzw4h3wmyjtrttduqqrs8udggyy2emwdzqmuzwg4");
+            break;
+        case TWCoinTypeOsmosis:
+            EXPECT_EQ(address, "osmo1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z03qvn6n");
+            break;
+        case TWCoinTypePivx:
+            EXPECT_EQ(address, "DNRTC6GZ5evmM7BZWwPqF54fyDqUqULMyu");
+            break;
+        case TWCoinTypePolkadot:
+            EXPECT_EQ(address, "16PpFrXrC6Ko3pYcyMAx6gPMp3mFFaxgyYMt4G5brkgNcSz8");
+            break;
+        case TWCoinTypeQtum:
+            EXPECT_EQ(address, "QdtLm8ccxhuJFF5zCgikpaghbM3thdaGsW");
+            break;
+        case TWCoinTypeRavencoin:
+            EXPECT_EQ(address, "RSZYjMDCP4q3t7NAFXPPnqEGrMZn971pdB");
+            break;
+        case TWCoinTypeRonin:
+            EXPECT_EQ(address, "ronin:9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F");
+            break;
+        case TWCoinTypeSolana:
+            EXPECT_EQ(address, "H4JcMPicKkHcxxDjkyyrLoQj7Kcibd9t815ak4UvTr9M");
+            break;
+        case TWCoinTypeSyscoin:
+            EXPECT_EQ(address, "sys1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z083sjh7");
+            break;
+        case TWCoinTypeTHORChain:
+            EXPECT_EQ(address, "thor1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0luxce7");
+            break;
+        case TWCoinTypeTezos:
+            EXPECT_EQ(address, "tz1gcEWswVU6dxfNQWbhTgaZrUrNUFwrsT4z");
+            break;
+        case TWCoinTypeTron:
+            EXPECT_EQ(address, "TQLCsShbQNXMTVCjprY64qZmEA4rBarpQp");
+            break;
+        case TWCoinTypeVerge:
+            EXPECT_EQ(address, "DNRTC6GZ5evmM7BZWwPqF54fyDqUqULMyu");
+            break;
+        case TWCoinTypeViacoin:
+            EXPECT_EQ(address, "via1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z09y9mn2");
+            break;
+        case TWCoinTypeWaves:
+            EXPECT_EQ(address, "3P2C786D6mBuvyf4WYr6K6Vch5uhi97nBHG");
+            break;
+        case TWCoinTypeXRP:
+            EXPECT_EQ(address, "rJHMeqKu8Ep7Fazx8MQG6JunaafBXz93YQ");
+            break;
+        case TWCoinTypeZen:
+            EXPECT_EQ(address, "zniNGeFxXRpY6RDGVdfdmbcvcFb1rrLdnFz");
+            break;
+        case TWCoinTypeZilliqa:
+            EXPECT_EQ(address, "zil1j2cvtd7j9n7fnxfv2r3neucjw8tp4xz9sp07v4");
+            break;
+        case TWCoinTypeStratis:
+            EXPECT_EQ(address, "strax1qhkfq3zahaqkkzx5mjnamwjsfpq2jk7z0rvt20n");
+            break;
+        case TWCoinTypeNervos:
+            EXPECT_EQ(address, "ckb1qzda0cr08m85hc8jlnfp3zer7xulejywt49kt2rr0vthywaa50xwsqtsqfsf77ae0wn5a7795hs2ydv83g6hl4qleywxw");
+            break;
+        case TWCoinTypeAptos:
+            EXPECT_EQ(address, "0xce2fd04ac9efa74f17595e5785e847a2399d7e637f5e8179244f76191f653276");
+            break;
+        case TWCoinTypeNebl:
+            EXPECT_EQ(address, "NdCKqb8BQoavA5PZ5b4APxKmSpmBA6yMSi");
+            break;
+        case TWCoinTypeSui:
+            EXPECT_EQ(address, "0x870deb25d5c0a4d7250d52d5cd58dacca2d51eb2a120a979b13384cd52e21e1b");
+            break;
+        case TWCoinTypeHedera:
+            EXPECT_EQ(address, "0.0.302a300506032b6570032100ee93a4f66f8d16b819bb9beb9ffccdfcdc1412e87fee6a324c2a99a1e0e67148");
+            break;
+        case TWCoinTypeSecret:
+            EXPECT_EQ(address, "secret1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0m7t23a");
+            break;
+        case TWCoinTypeNativeInjective:
+            EXPECT_EQ(address, "inj1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj0knl55v");
+            break;
+        case TWCoinTypeAgoric:
+            EXPECT_EQ(address, "agoric1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0txauuh");
+            break;
+        case TWCoinTypeStargaze:
+            EXPECT_EQ(address, "stars1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0d8g78s");
+            break;
+        case TWCoinTypeJuno:
+            EXPECT_EQ(address, "juno1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z00fucta");
+            break;
+        case TWCoinTypeStride:
+            EXPECT_EQ(address, "stride1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z06sllcd");
+            break;
+        case TWCoinTypeAxelar:
+            EXPECT_EQ(address, "axelar1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0a4ft8q");
+            break;
+        case TWCoinTypeCrescent:
+            EXPECT_EQ(address, "cre1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0anvxev");
+            break;
+        case TWCoinTypeKujira:
+            EXPECT_EQ(address, "kujira1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0gnampt");
+            break;
+        case TWCoinTypeNativeCanto:
+            EXPECT_EQ(address, "canto1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj0wvfqju");
+            break;
+        case TWCoinTypeComdex:
+            EXPECT_EQ(address, "comdex1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z075ap4k");
+            break;
+        case TWCoinTypeNeutron:
+            EXPECT_EQ(address, "neutron1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0aykpkx");
+            break;
+        case TWCoinTypeSommelier:
+            EXPECT_EQ(address, "somm1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z048s0at");
+            break;
+        case TWCoinTypeFetchAI:
+            EXPECT_EQ(address, "fetch1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z02xk8wk");
+            break;
+        case TWCoinTypeMars:
+            EXPECT_EQ(address, "mars1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0yxx6e6");
+            break;
+        case TWCoinTypeUmee:
+            EXPECT_EQ(address, "umee1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0tdzugn");
+            break;
+        case TWCoinTypeCoreum:
+            EXPECT_EQ(address, "core1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0248ct6");
+            break;
+        case TWCoinTypeQuasar:
+            EXPECT_EQ(address, "quasar1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0hc97py");
+            break;
+        case TWCoinTypePersistence:
+            EXPECT_EQ(address, "persistence1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0hhesz9");
+            break;
+        case TWCoinTypeAkash:
+            EXPECT_EQ(address, "akash1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z05qjy4m");
+            break;
+        case TWCoinTypeNoble:
+            EXPECT_EQ(address, "noble1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z03c2t50");
+            break;
+        case TWCoinTypeRootstock:
+            EXPECT_EQ(address, "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F");
+            break;
+        case TWCoinTypeSei:
+            EXPECT_EQ(address, "sei1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z05hw42q");
+            break;
+        case TWCoinTypeInternetComputer:
+            EXPECT_EQ(address, "cb3aa6a0471a417fc33d8e71f1d241750dfa29b4dc8f084265ce1301fb03b65b");
+            break;
+        case TWCoinTypeTia:
+            EXPECT_EQ(address, "celestia1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0g3wnkv");
+            break;
+        case TWCoinTypeNativeZetaChain:
+            EXPECT_EQ(address, "zeta1nk9x9ajk4rgkzhqjjn7hr6w0k0jg2kj027x9uy");
+            break;
+        case TWCoinTypeDydx:
+            EXPECT_EQ(address, "dydx1hkfq3zahaqkkzx5mjnamwjsfpq2jk7z0sz38vk");
+            break;
+        case TWCoinTypePactus:
+            EXPECT_EQ(address, "pc1rehvlc6tfn79z0zjqqaj8zas5j5h9c2fe59a4ff");
+            break;
+            // end_of_coin_address_derivation_tests_marker_do_not_modify
+            // no default branch here, intentionally, to better notice any missing coins
+        }
+    }
+}
+
+int countThreadReady = 0;
+std::mutex countThreadReadyMutex;
+
+void useCoinFromThread() {
+    const int tryCount = 20;
+    for (int i = 0; i < tryCount; ++i) {
+        // perform some operations
+        TW::validateAddress(TWCoinTypeZilliqa, "zil1j8xae6lggm8y63m3y2r7aefu797ze7mhzulnqg");
+        TW::validateAddress(TWCoinTypeEthereum, "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F");
+        const auto coinTypes = TW::getCoinTypes();
+    }
+    countThreadReadyMutex.lock();
+    ++countThreadReady;
+    countThreadReadyMutex.unlock();
+}
+
+TEST(Coin, InitMultithread) {
+    const int numThread = 20;
+    countThreadReady = 0;
+    std::thread thread[numThread];
+    // execute in threads
+    for (int i = 0; i < numThread; ++i) {
+        thread[i] = std::thread(useCoinFromThread);
+    }
+    // wait for completion
+    for (int i = 0; i < numThread; ++i) {
+        thread[i].join();
+    }
+    // check that all completed OK
+    ASSERT_EQ(countThreadReady, numThread);
+}
+
+} // namespace TW
diff --git a/tests/CoinAddressValidationTests.cpp b/tests/common/CoinAddressValidationTests.cpp
similarity index 94%
rename from tests/CoinAddressValidationTests.cpp
rename to tests/common/CoinAddressValidationTests.cpp
index a1816d6e911..b02fe64d635 100644
--- a/tests/CoinAddressValidationTests.cpp
+++ b/tests/common/CoinAddressValidationTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Coin.h"
 #include "HexCoding.h"
@@ -45,7 +43,10 @@ TEST(Coin, validateAddressBitcoin) {
 
 TEST(Coin, ValidateAddressBinance) {
     EXPECT_TRUE(validateAddress(TWCoinTypeBinance, "bnb12vtaxl9952zm6rwf7v8jerq74pvaf77fcmvzhw"));
-    EXPECT_FALSE(validateAddress(TWCoinTypeBinance, "tbnb12vtaxl9952zm6rwf7v8jerq74pvaf77fkw9xhl"));
+    EXPECT_TRUE(validateAddress(TWCoinTypeBinance, "tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2", "tbnb"));
+
+    EXPECT_FALSE(validateAddress(TWCoinTypeBinance, "tbnb1devga6q804tx9fqrnx0vtu5r36kxgp9t4ruzk2"));
+    EXPECT_FALSE(validateAddress(TWCoinTypeBinance, "bad1devga6q804tx9fqrnx0vtu5r36kxgp9tqx8h9k"));
 }
 
 TEST(Coin, ValidateAddressLitecoin) {
@@ -374,9 +375,9 @@ TEST(Coin, ValidateAddressVeChain) {
     EXPECT_EQ(normalizeAddress(TWCoinTypeVeChain, "0x9d8a62f656a8d1615c1294fd71e9cfb3e4855a4f"), "0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F");
 }
 
-TEST(Coin, ValidateAddressElrond) {
-    EXPECT_TRUE(validateAddress(TWCoinTypeElrond, "erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz"));
-    EXPECT_FALSE(validateAddress(TWCoinTypeElrond, "xerd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz"));
+TEST(Coin, ValidateAddressMultiversX) {
+    EXPECT_TRUE(validateAddress(TWCoinTypeMultiversX, "erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz"));
+    EXPECT_FALSE(validateAddress(TWCoinTypeMultiversX, "xerd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz"));
 }
 
 TEST(Coin, ValidateAddressOasis) {
@@ -409,4 +410,16 @@ TEST(Coin, ValidateAddressEverscale) {
     ASSERT_EQ(normalizeAddress(TWCoinTypeEverscale, "0:83A0352908060FA87839195D8A763A8D9AB28F8FA41468832B398A719CC6469A"), "0:83a0352908060fa87839195d8a763a8d9ab28f8fa41468832b398a719cc6469a");
 }
 
+TEST(Coin, ValidateAddressNebl) {
+    EXPECT_TRUE(validateAddress(TWCoinTypeNebl, "NboLGGKWtK5eXzaah5GVpXju9jCcoMi4cc"));
+    EXPECT_TRUE(validateAddress(TWCoinTypeNebl, "NidLccuLD8J4oK25PwPg5ipLj5L9VVrwi5"));
+}
+
+TEST(Coin, ValidateAddressTheOpenNetwork) {
+    EXPECT_TRUE(validateAddress(TWCoinTypeTON, "0:8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae"));
+    EXPECT_FALSE(validateAddress(TWCoinTypeTON, "8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae"));
+
+    ASSERT_EQ(normalizeAddress(TWCoinTypeTON, "0:8a8627861a5dd96c9db3ce0807b122da5ed473934ce7568a5b4b1c361cbb28ae"), "UQCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsorhqg");
+}
+
 } // namespace TW
diff --git a/tests/DataTests.cpp b/tests/common/DataTests.cpp
similarity index 91%
rename from tests/DataTests.cpp
rename to tests/common/DataTests.cpp
index dec40018c9c..9d0a573ecc7 100644
--- a/tests/DataTests.cpp
+++ b/tests/common/DataTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Data.h"
 #include "HexCoding.h"
diff --git a/tests/EncryptTests.cpp b/tests/common/EncryptTests.cpp
similarity index 96%
rename from tests/EncryptTests.cpp
rename to tests/common/EncryptTests.cpp
index 74fe4a1f13a..52c030913a2 100644
--- a/tests/EncryptTests.cpp
+++ b/tests/common/EncryptTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Encrypt.h"
 #include "Data.h"
diff --git a/tests/HDWallet/HDWalletInternalTests.cpp b/tests/common/HDWallet/HDWalletInternalTests.cpp
similarity index 94%
rename from tests/HDWallet/HDWalletInternalTests.cpp
rename to tests/common/HDWallet/HDWalletInternalTests.cpp
index 10c7282a665..19e8c45868f 100644
--- a/tests/HDWallet/HDWalletInternalTests.cpp
+++ b/tests/common/HDWallet/HDWalletInternalTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "HDWallet.h"
 #include "Data.h"
@@ -11,7 +9,7 @@
 #include "PublicKey.h"
 #include <TrezorCrypto/bip32.h>
 #include <TrezorCrypto/curves.h>
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <gtest/gtest.h>
 #include <stdlib.h>
@@ -61,7 +59,7 @@ TEST(HDWalletInternal, SquareDerivationRoutes) {
 
     // getMasterNode
     auto masterNode = HDNode();
-    hdnode_from_seed(wallet.getSeed().data(), HDWallet::seedSize, SECP256K1_NAME, &masterNode);
+    hdnode_from_seed(wallet.getSeed().data(), HDWallet<>::mSeedSize, SECP256K1_NAME, &masterNode);
 
     auto node0 = masterNode;
     // getNode
diff --git a/tests/common/HDWallet/HDWalletTests.cpp b/tests/common/HDWallet/HDWalletTests.cpp
new file mode 100644
index 00000000000..355036071c6
--- /dev/null
+++ b/tests/common/HDWallet/HDWalletTests.cpp
@@ -0,0 +1,653 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "Base58.h"
+#include "Bitcoin/Address.h"
+#include "Bitcoin/CashAddress.h"
+#include "Bitcoin/SegwitAddress.h"
+#include "IoTeX/Address.h"
+#include "Cosmos/Address.h"
+#include "Coin.h"
+#include "Ethereum/Address.h"
+#include "Ethereum/EIP2645.h"
+#include "Ethereum/MessageSigner.h"
+#include "HDWallet.h"
+#include "Hash.h"
+#include "Hedera/DER.h"
+#include "HexCoding.h"
+#include "ImmutableX/StarkKey.h"
+#include "Mnemonic.h"
+#include "NEAR/Address.h"
+#include "PublicKey.h"
+#include "StarkEx/MessageSigner.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+extern std::string TESTS_ROOT;
+
+namespace TW::HDWalletTests {
+
+const auto mnemonic1 = "ripple scissors kick mammal hire column oak again sun offer wealth tomorrow wagon turn fatal";
+const auto gPassphrase = "passphrase";
+
+TEST(HDWallet, generate) {
+    {
+        HDWallet wallet = HDWallet(128, gPassphrase);
+        EXPECT_TRUE(Mnemonic::isValid(wallet.getMnemonic()));
+        EXPECT_EQ(wallet.getPassphrase(), gPassphrase);
+        EXPECT_EQ(wallet.getEntropy().size(), 16ul);
+    }
+    {
+        HDWallet wallet = HDWallet(256, gPassphrase);
+        EXPECT_TRUE(Mnemonic::isValid(wallet.getMnemonic()));
+        EXPECT_EQ(wallet.getPassphrase(), gPassphrase);
+        EXPECT_EQ(wallet.getEntropy().size(), 32ul);
+    }
+}
+
+TEST(HDWallet, generateInvalid) {
+    EXPECT_EXCEPTION(HDWallet(64, gPassphrase), "Invalid strength");
+    EXPECT_EXCEPTION(HDWallet(129, gPassphrase), "Invalid strength");
+    EXPECT_EXCEPTION(HDWallet(512, gPassphrase), "Invalid strength");
+}
+
+TEST(HDWallet, createFromMnemonic) {
+    {
+        HDWallet wallet = HDWallet(mnemonic1, gPassphrase);
+        EXPECT_EQ(wallet.getMnemonic(), mnemonic1);
+        EXPECT_EQ(wallet.getPassphrase(), gPassphrase);
+        EXPECT_EQ(hex(wallet.getEntropy()), "ba5821e8c356c05ba5f025d9532fe0f21f65d594");
+        EXPECT_EQ(hex(wallet.getSeed()), "143cd5fc27ae46eb423efebc41610473f5e24a80f2ca2e2fa7bf167e537f58f4c68310ae487fce82e25bad29bab2530cf77fd724a5ebfc05a45872773d7ee2d6");
+    }
+    { // empty passphrase
+        HDWallet wallet = HDWallet(mnemonic1, "");
+        EXPECT_EQ(wallet.getMnemonic(), mnemonic1);
+        EXPECT_EQ(wallet.getPassphrase(), "");
+        EXPECT_EQ(hex(wallet.getEntropy()), "ba5821e8c356c05ba5f025d9532fe0f21f65d594");
+        EXPECT_EQ(hex(wallet.getSeed()), "354c22aedb9a37407adc61f657a6f00d10ed125efa360215f36c6919abd94d6dbc193a5f9c495e21ee74118661e327e84a5f5f11fa373ec33b80897d4697557d");
+    }
+}
+
+TEST(HDWallet, entropyLength_createFromMnemonic) {
+    { // 12 words
+        HDWallet wallet = HDWallet("oil oil oil oil oil oil oil oil oil oil oil oil", "");
+        EXPECT_EQ(wallet.getEntropy().size(), 16ul);
+        EXPECT_EQ(hex(wallet.getEntropy()), "99d33a674ce99d33a674ce99d33a674c");
+    }
+    { // 12 words, from https://github.com/trezor/python-mnemonic/blob/master/vectors.json
+        HDWallet wallet = HDWallet("abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon abandon about", "");
+        EXPECT_EQ(wallet.getEntropy().size(), 16ul);
+        EXPECT_EQ(hex(wallet.getEntropy()), "00000000000000000000000000000000");
+    }
+    { // 15 words
+        HDWallet wallet = HDWallet("history step cheap card humble screen raise seek robot slot coral roof spoil wreck caution", "");
+        EXPECT_EQ(wallet.getEntropy().size(), 20ul);
+        EXPECT_EQ(hex(wallet.getEntropy()), "6c3aac9b9146ef832c4e18bb3980c0dddd25fc49");
+    }
+    { // 18 words
+        HDWallet wallet = HDWallet("caught hockey split gun symbol code payment copy broccoli silly shed secret stove tell citizen staff photo high", "");
+        EXPECT_EQ(wallet.getEntropy().size(), 24ul);
+        EXPECT_EQ(hex(wallet.getEntropy()), "246d8f48b3fdc65a2869801c791715614d6bbd8a56a0a3ad");
+    }
+    { // 21 words
+        HDWallet wallet = HDWallet("diary shine country alpha bridge coast loan hungry hip media sell crucial swarm share gospel lake visa coin dizzy physical basket", "");
+        EXPECT_EQ(wallet.getEntropy().size(), 28ul);
+        EXPECT_EQ(hex(wallet.getEntropy()), "3d58bcc40381bc59a0c37a6bf14f0d9a3db78a5933e5f4a5ad00d1f1");
+    }
+    { // 24 words
+        HDWallet wallet = HDWallet("poet spider smile swift roof pilot subject save hand diet ice universe over brown inspire ugly wide economy symbol shove episode patient plug swamp", "");
+        EXPECT_EQ(wallet.getEntropy().size(), 32ul);
+        EXPECT_EQ(hex(wallet.getEntropy()), "a73a3732edebbb49f5fdfe68c7b5c0f6e9de3a1d5760faa8c771e384bf4229b6");
+    }
+    { // 24 words, from https://github.com/trezor/python-mnemonic/blob/master/vectors.json
+        HDWallet wallet = HDWallet("letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic avoid letter advice cage absurd amount doctor acoustic bless", "");
+        EXPECT_EQ(wallet.getEntropy().size(), 32ul);
+        EXPECT_EQ(hex(wallet.getEntropy()), "8080808080808080808080808080808080808080808080808080808080808080");
+    }
+}
+
+TEST(HDWallet, createFromSpanishMnemonic) {
+    {
+        EXPECT_EXCEPTION(HDWallet("llanto radical atraer riesgo actuar masa fondo cielo dieta archivo sonrisa mamut", ""), "Invalid mnemonic");
+    }
+    {
+        HDWallet wallet = HDWallet("llanto radical atraer riesgo actuar masa fondo cielo dieta archivo sonrisa mamut", "", false);
+        EXPECT_EQ(wallet.getMnemonic(), "llanto radical atraer riesgo actuar masa fondo cielo dieta archivo sonrisa mamut");
+        EXPECT_EQ(wallet.getPassphrase(), "");
+        EXPECT_EQ(hex(wallet.getEntropy()), "");
+        EXPECT_EQ(hex(wallet.getSeed()), "ec8f8703432fc7d32e699ee056e9d84b1435e6a64a6a40ad63dbde11eab189a276ddcec20f3326d3c6ee39cbd018585b104fc3633b801c011063ae4c318fb9b6");
+    }
+}
+
+TEST(HDWallet, createFromMnemonicInvalid) {
+    EXPECT_EXCEPTION(HDWallet("THIS IS AN INVALID MNEMONIC", gPassphrase), "Invalid mnemonic");
+    EXPECT_EXCEPTION(HDWallet("", gPassphrase), "Invalid mnemonic");
+
+    EXPECT_EXCEPTION(HDWallet("", gPassphrase, false), "Invalid mnemonic");
+    HDWallet walletUnchecked = HDWallet("THIS IS AN INVALID MNEMONIC", gPassphrase, false);
+}
+
+TEST(HDWallet, createFromEntropy) {
+    {
+        HDWallet wallet = HDWallet(parse_hex("ba5821e8c356c05ba5f025d9532fe0f21f65d594"), gPassphrase);
+        EXPECT_EQ(wallet.getMnemonic(), mnemonic1);
+    }
+}
+
+TEST(HDWallet, createFromEntropyInvalid) {
+    EXPECT_EXCEPTION(HDWallet(parse_hex(""), gPassphrase), "Invalid mnemonic data");
+    EXPECT_EXCEPTION(HDWallet(parse_hex("123456"), gPassphrase), "Invalid mnemonic data");
+}
+
+TEST(HDWallet, recreateFromEntropy) {
+    {
+        HDWallet wallet1 = HDWallet(mnemonic1, gPassphrase);
+        EXPECT_EQ(wallet1.getMnemonic(), mnemonic1);
+        EXPECT_EQ(hex(wallet1.getEntropy()), "ba5821e8c356c05ba5f025d9532fe0f21f65d594");
+        HDWallet wallet2 = HDWallet(wallet1.getEntropy(), gPassphrase);
+        EXPECT_EQ(wallet2.getMnemonic(), wallet1.getMnemonic());
+        EXPECT_EQ(wallet2.getEntropy(), wallet1.getEntropy());
+        EXPECT_EQ(wallet2.getSeed(), wallet1.getSeed());
+    }
+}
+
+TEST(HDWallet, privateKeyFromXPRV) {
+    const std::string xprv = "xprv9yqEgpMG2KCjvotCxaiMkzmKJpDXz2xZi3yUe4XsURvo9DUbPySW1qRbdeDLiSxZt88hESHUhm2AAe2EqfWM9ucdQzH3xv1HoKoLDqHMK9n";
+    auto privateKey = HDWallet<>::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
+    ASSERT_TRUE(privateKey);
+    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto address = Bitcoin::BitcoinCashAddress(publicKey);
+
+    EXPECT_EQ(hex(publicKey.bytes), "025108168f7e5aad52f7381c18d8f880744dbee21dc02c15abe512da0b1cca7e2f");
+    EXPECT_EQ(address.string(), "bitcoincash:qp3y0dyg6ya8nt4n3algazn073egswkytqs00z7rz4");
+}
+
+TEST(HDWallet, privateKeyFromXPRV_Invalid) {
+    const std::string xprv = "xprv9y0000";
+    auto privateKey = HDWallet<>::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
+    ASSERT_FALSE(privateKey);
+}
+
+TEST(HDWallet, privateKeyFromXPRV_InvalidVersion) {
+    {
+        // Version bytes (first 4) are invalid, 0x00000000
+        const std::string xprv = "11117pE7xwz2GARukXY8Vj2ge4ozfX4HLgy5ztnJXjr5btzJE8EbtPhZwrcPWAodW2aFeYiXkXjSxJYm5QrnhSKFXDgACcFdMqGns9VLqESCq3";
+        auto privateKey = HDWallet<>::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
+        ASSERT_FALSE(privateKey);
+    }
+    {
+        // Version bytes (first 4) are invalid, 0xdeadbeef
+        const std::string xprv = "pGoh3VZXR4mTkT4bfqj4paog12KmHkAWkdLY8HNsZagD1ihVccygLr1ioLBhVQsny47uEh5swP3KScFc4JJrazx1Y7xvzmH2y5AseLgVMwomBTg2";
+        auto privateKey = HDWallet<>::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
+        ASSERT_FALSE(privateKey);
+    }
+}
+
+TEST(HDWallet, privateKeyFromExtended_InvalidCurve) {
+    // invalid coin & curve, should fail
+    const std::string xprv = "xprv9yqEgpMG2KCjvotCxaiMkzmKJpDXz2xZi3yUe4XsURvo9DUbPySW1qRbdeDLiSxZt88hESHUhm2AAe2EqfWM9ucdQzH3xv1HoKoLDqHMK9n";
+    auto privateKey = HDWallet<>::getPrivateKeyFromExtended(xprv, TWCoinType(123456), DerivationPath(TWPurposeBIP44, 123456, 0, 0, 0));
+    ASSERT_FALSE(privateKey);
+}
+
+TEST(HDWallet, privateKeyFromXPRV_Invalid45) {
+    // 45th byte is not 0
+    const std::string xprv = "xprv9yqEgpMG2KCjvotCxaiMkzmKJpDXz2xZi3yUe4XsURvo9DUbPySW1qRbhw2dJ8QexahgVSfkjxU4FgmN4GLGN3Ui8oLqC6433CeyPUNVHHh";
+    auto privateKey = HDWallet<>::getPrivateKeyFromExtended(xprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 3));
+    ASSERT_FALSE(privateKey);
+}
+
+TEST(HDWallet, privateKeyFromMptv) {
+    const std::string mptv = "Mtpv7SkyM349Svcf1WiRtB5hC91ZZkVsGuv3kz1V7tThGxBFBzBLFnw6LpaSvwpHHuy8dAfMBqpBvaSAHzbffvhj2TwfojQxM7Ppm3CzW67AFL5";
+    auto privateKey = HDWallet<>::getPrivateKeyFromExtended(mptv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoinCash), 0, 0, 4));
+    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
+
+    auto witness = Data{0x00, 0x14};
+    auto keyHash = Hash::sha256ripemd(publicKey.bytes.data(), 33);
+    witness.insert(witness.end(), keyHash.begin(), keyHash.end());
+
+    auto prefix = Data{TW::p2shPrefix(TWCoinTypeLitecoin)};
+    auto redeemScript = Hash::sha256ripemd(witness.data(), witness.size());
+    prefix.insert(prefix.end(), redeemScript.begin(), redeemScript.end());
+
+    auto address = Bitcoin::Address(prefix);
+
+    EXPECT_EQ(hex(publicKey.bytes), "02c36f9c3051e9cfbb196ecc35311f3ad705ea6798ffbe6b039e70f6bd047e6f2c");
+    EXPECT_EQ(address.string(), "MBzcCaoLk9626cLj2UVvcxs6nsVUi39zEy");
+}
+
+TEST(HDWallet, privateKeyFromZprv) {
+    const std::string zprv = "zprvAdzGEQ44z4WPLNCRpDaup2RumWxLGgR8PQ9UVsSmJigXsHVDaHK1b6qGM2u9PmxB2Gx264ctAz4yRoN3Xwf1HZmKcn6vmjqwsawF4WqQjfd";
+    auto privateKey = HDWallet<>::getPrivateKeyFromExtended(zprv, TWCoinTypeBitcoinCash, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeBitcoin), 0, 0, 5));
+    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto address = Bitcoin::SegwitAddress(publicKey, "bc");
+
+    EXPECT_EQ(hex(publicKey.bytes), "022dc3f5a3fcfd2d1cc76d0cb386eaad0e30247ba729da0d8847a2713e444fdafa");
+    EXPECT_EQ(address.string(), "bc1q5yyq60jepll68hds7exa7kpj20gsvdu0aztw5x");
+}
+
+TEST(HDWallet, privateKeyFromDGRV) {
+    const std::string dgpv = "dgpv595jAJYGBLanByCJXRzrWBZFVXdNisfuPmKRDquCQcwBbwKbeR21AtkETf4EpjBsfsK3kDZgMqhcuky1B9PrT5nxiEcjghxpUVYviHXuCmc";
+    auto privateKey = HDWallet<>::getPrivateKeyFromExtended(dgpv, TWCoinTypeDogecoin, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeDogecoin), 0, 0, 1));
+    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto address = Bitcoin::Address(publicKey, TW::p2pkhPrefix(TWCoinTypeDogecoin));
+
+    EXPECT_EQ(hex(publicKey.bytes), "03eb6bf281990ee074a39c71ed8ce78c486066ac433bcf066dd5eb08f87d3a6c34");
+    EXPECT_EQ(address.string(), "D5taDndQJ1fDF3AM1yWavmJY2BgSi17CUv");
+}
+
+TEST(HDWallet, privateKeyFromXPRVForDGB) {
+    const std::string xprvForDgb = "xprv9ynLofyuR3uCqCMJADwzBaPnXB53EVe5oLujvPfdvCxae3NzgEpYjZMgcUeS8EUeYfYVLG61ZgPXm9TZWiwBnLVCgd551vCwpXC19hX3mFJ";
+    auto privateKey = HDWallet<>::getPrivateKeyFromExtended(xprvForDgb, TWCoinTypeDigiByte, DerivationPath(TWPurposeBIP44, TWCoinTypeSlip44Id(TWCoinTypeDigiByte), 0, 0, 1));
+    auto publicKey = privateKey->getPublicKey(TWPublicKeyTypeSECP256k1);
+    auto address = Bitcoin::Address(publicKey, TW::p2pkhPrefix(TWCoinTypeDigiByte));
+
+    EXPECT_EQ(hex(publicKey.bytes), "03238a5c541c2cbbf769dbe0fb2a373c22db4da029370767fbe746d59da4de07f1");
+    EXPECT_EQ(address.string(), "D9Gv7jWSVsS9Y5q98C79WyfEj6P2iM5Nzs");
+}
+
+TEST(HDWallet, DeriveWithLeadingZerosEth) {
+    // Derivation test case with leading zeroes, see  https://blog.polychainlabs.com/bitcoin,/bip32,/bip39,/kdf/2021/05/17/inconsistent-bip32-derivations.html
+    const auto mnemonic = "name dash bleak force moral disease shine response menu rescue more will";
+    const auto derivationPath = "m/44'/60'";
+    const auto coin = TWCoinTypeEthereum;
+    auto wallet = HDWallet(mnemonic, "");
+    const auto addr = Ethereum::Address(wallet.getKey(coin, DerivationPath(derivationPath)).getPublicKey(TW::publicKeyType(coin)));
+    EXPECT_EQ(addr.string(), "0x0ba17e928471c64AaEaf3ABfB3900EF4c27b380D");
+}
+
+static nlohmann::json getVectors() {
+    const std::string vectorsJsonPath = std::string(TESTS_ROOT) + "/common/HDWallet/bip39_vectors.json";
+    auto vectorsJson = loadJson(vectorsJsonPath)["english"];
+    return vectorsJson;
+}
+
+TEST(HDWallet, Bip39Vectors) {
+    // BIP39 test vectors, from https://github.com/trezor/python-mnemonic/blob/master/vectors.json
+    const auto passphrase = "TREZOR";
+    const auto vectors = getVectors();
+    for (const auto& v : vectors) {
+        const std::string entropy = v[0];
+        const std::string mnemonic = v[1];
+        const std::string seed = v[2];
+        const std::string xprv = v[3];
+        { // from mnemonic
+            HDWallet wallet = HDWallet(mnemonic, passphrase);
+            EXPECT_EQ(wallet.getMnemonic(), mnemonic);
+            EXPECT_EQ(wallet.getPassphrase(), passphrase);
+            EXPECT_EQ(hex(wallet.getEntropy()), entropy);
+            EXPECT_EQ(hex(wallet.getSeed()), seed);
+            EXPECT_EQ(wallet.getRootKey(TWCoinTypeBitcoin, TWHDVersionXPRV), xprv);
+        }
+        { // from entropy
+            HDWallet wallet = HDWallet(parse_hex(entropy), passphrase);
+            EXPECT_EQ(wallet.getMnemonic(), mnemonic);
+            EXPECT_EQ(wallet.getPassphrase(), passphrase);
+            EXPECT_EQ(hex(wallet.getEntropy()), entropy);
+            EXPECT_EQ(hex(wallet.getSeed()), seed);
+            EXPECT_EQ(wallet.getRootKey(TWCoinTypeBitcoin, TWHDVersionXPRV), xprv);
+        }
+    }
+}
+
+TEST(HDWallet, getExtendedPrivateKey) {
+    const HDWallet wallet = HDWallet(mnemonic1, "");
+    const auto purpose = TWPurposeBIP44;
+    const auto coin = TWCoinTypeBitcoin;
+    const auto hdVersion = TWHDVersionZPRV;
+
+    // default
+    const auto extPubKey1 = wallet.getExtendedPrivateKey(purpose, coin, hdVersion);
+    EXPECT_EQ(extPubKey1, "zprvAcwsTZNaY1f7rfwsy5GseSDStYBrxwtsBZDkb3iyuQUs4NF6n58BuH7Xj54RuaSCWtU5CiQzuYQgFgqr1HokgKcVAeGeXokhJUAJeP3VmvY");
+
+    // explicitly specify default account=0
+    const auto extPubKey2 = wallet.getExtendedPrivateKeyAccount(purpose, coin, TWDerivationDefault, hdVersion, 0);
+    EXPECT_EQ(extPubKey2, "zprvAcwsTZNaY1f7rfwsy5GseSDStYBrxwtsBZDkb3iyuQUs4NF6n58BuH7Xj54RuaSCWtU5CiQzuYQgFgqr1HokgKcVAeGeXokhJUAJeP3VmvY");
+
+    // custom account=1
+    const auto extPubKey3 = wallet.getExtendedPrivateKeyAccount(purpose, coin, TWDerivationDefault, hdVersion, 1);
+    EXPECT_EQ(extPubKey3, "zprvAcwsTZNaY1f7sifgNNgdNa4P9mPtyg3zRVgwkx2qF9Sn7F255MzP6Zyumn6bgV5xuoS8ZrDvjzE7APcFSacXdzFYpGvyybb1bnAoh5nHxpn");
+}
+
+TEST(HDWallet, getExtendedPublicKey) {
+    const HDWallet wallet = HDWallet(mnemonic1, "");
+    const auto purpose = TWPurposeBIP44;
+    const auto coin = TWCoinTypeBitcoin;
+    const auto hdVersion = TWHDVersionZPUB;
+    const auto derivation = TWDerivationDefault;
+
+    // default
+    const auto extPubKey1 = wallet.getExtendedPublicKey(purpose, coin, hdVersion);
+    EXPECT_EQ(extPubKey1, "zpub6qwDs4uUNPDR5A2M56ot1aABSa2MNQciYn9MPS8bTk1qwAaFKcSST5S1aLidvPp9twqpaumG7vikR2vHhBXjp5oGgHyMvWK3AtUkfeEgyns");
+
+    // explicitly specify default account=0
+    const auto extPubKey2 = wallet.getExtendedPublicKeyAccount(purpose, coin, derivation, hdVersion, 0);
+    EXPECT_EQ(extPubKey2, "zpub6qwDs4uUNPDR5A2M56ot1aABSa2MNQciYn9MPS8bTk1qwAaFKcSST5S1aLidvPp9twqpaumG7vikR2vHhBXjp5oGgHyMvWK3AtUkfeEgyns");
+
+    // custom account=1
+    const auto extPubKey3 = wallet.getExtendedPublicKeyAccount(purpose, coin, derivation, hdVersion, 1);
+    EXPECT_EQ(extPubKey3, "zpub6qwDs4uUNPDR6Ck9UQDdji17hoEPP8mqnicYZLSSoUykz3MDcuJdeNJPd3BozqEafeLZkegWqzAvkgA4JZZ5tTN2rDpGKfk54essyfx1eZP");
+}
+
+TEST(HDWallet, Derive_XpubPub_vs_PrivPub) {
+    // Test different routes for deriving address from mnemonic, result should be the same:
+    // - Direct: mnemonic -> seed -> privateKey -> publicKey -> address
+    // - Extended Public: mnemonic -> seed -> zpub -> publicKey -> address
+    // - Extended Private: mnemonic -> seed -> zpriv -> privateKey -> publicKey -> address
+
+    const HDWallet wallet = HDWallet(mnemonic1, "");
+    const auto coin = TWCoinTypeBitcoin;
+    const auto derivPath1 = DerivationPath("m/84'/0'/0'/0/0");
+    const auto derivPath2 = DerivationPath("m/84'/0'/0'/0/2");
+    const auto expectedPublicKey1 = "02df9ef2a7a5552765178b181e1e1afdefc7849985c7dfe9647706dd4fa40df6ac";
+    const auto expectedPublicKey2 = "031e1f64d2f6768dccb6814545b2e2d58e26ad5f91b7cbaffe881ed572c65060db";
+    const auto expectedAddress1 = "bc1qpsp72plnsqe6e2dvtsetxtww2cz36ztmfxghpd";
+    const auto expectedAddress2 = "bc1q7zddsunzaftf4zlsg9exhzlkvc5374a6v32jf6";
+
+    // -> privateKey -> publicKey
+    {
+        const auto privateKey1 = wallet.getKey(coin, derivPath1);
+        const auto publicKey1 = privateKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_EQ(hex(publicKey1.bytes), expectedPublicKey1);
+        const auto address1 = Bitcoin::SegwitAddress(publicKey1, "bc");
+        EXPECT_EQ(address1.string(), expectedAddress1);
+    }
+    {
+        const auto privateKey2 = wallet.getKey(coin, derivPath2);
+        const auto publicKey2 = privateKey2.getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_EQ(hex(publicKey2.bytes), expectedPublicKey2);
+        const auto address2 = Bitcoin::SegwitAddress(publicKey2, "bc");
+        EXPECT_EQ(address2.string(), expectedAddress2);
+    }
+
+    // zpub -> publicKey
+    const auto zpub = wallet.getExtendedPublicKey(TWPurposeBIP84, coin, TWHDVersionZPUB);
+    EXPECT_EQ(zpub, "zpub6rNUNtxSa9Gxvm4Bdxf1MPMwrvkzwDx6vP96Hkzw3jiQKdg3fhXBStxjn12YixQB8h88B3RMSRscRstf9AEVaYr3MAqVBEWBDuEJU4PGaT9");
+
+    {
+        const auto publicKey1 = wallet.getPublicKeyFromExtended(zpub, coin, derivPath1);
+        EXPECT_TRUE(publicKey1.has_value());
+        EXPECT_EQ(hex(publicKey1->bytes), expectedPublicKey1);
+        const auto address1 = Bitcoin::SegwitAddress(publicKey1.value(), "bc");
+        EXPECT_EQ(address1.string(), expectedAddress1);
+    }
+    {
+        const auto publicKey2 = wallet.getPublicKeyFromExtended(zpub, coin, derivPath2);
+        EXPECT_TRUE(publicKey2.has_value());
+        EXPECT_EQ(hex(publicKey2->bytes), expectedPublicKey2);
+        const auto address2 = Bitcoin::SegwitAddress(publicKey2.value(), "bc");
+        EXPECT_EQ(address2.string(), expectedAddress2);
+    }
+
+    // zpriv -> privateKey -> publicKey
+    const auto zpriv = wallet.getExtendedPrivateKey(TWPurposeBIP84, coin, TWHDVersionZPRV);
+    EXPECT_EQ(zpriv, "zprvAdP7yPRYjmifiGyiXw7zzFRDJtvWXmEFZADVVNbKVQBRSqLu8ACvu6eFvhrnnw4QwdTD8PUVa48MguwiPTiyfn85zWx9iA5MYy4Eufu5bas");
+
+    {
+        const auto privateKey1 = wallet.getPrivateKeyFromExtended(zpriv, coin, derivPath1);
+        EXPECT_TRUE(privateKey1.has_value());
+        const auto publicKey1 = privateKey1->getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_EQ(hex(publicKey1.bytes), expectedPublicKey1);
+        const auto address1 = Bitcoin::SegwitAddress(publicKey1, "bc");
+        EXPECT_EQ(address1.string(), expectedAddress1);
+    }
+    {
+        const auto privateKey2 = wallet.getPrivateKeyFromExtended(zpriv, coin, derivPath2);
+        EXPECT_TRUE(privateKey2.has_value());
+        const auto publicKey2 = privateKey2->getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_EQ(hex(publicKey2.bytes), expectedPublicKey2);
+        const auto address2 = Bitcoin::SegwitAddress(publicKey2, "bc");
+        EXPECT_EQ(address2.string(), expectedAddress2);
+    }
+}
+
+TEST(HDWallet, getKeyByCurve) {
+    const auto derivPath = "m/44'/539'/0'/0/0";
+    HDWallet wallet = HDWallet(mnemonic1, "");
+    {
+        const auto privateKey = wallet.getKeyByCurve(TWCurveSECP256k1, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "4fb8657d6464adcaa086d6758d7f0b6b6fc026c98dc1671fcc6460b5a74abc62");
+    }
+    {
+        const auto privateKey = wallet.getKeyByCurve(TWCurveNIST256p1, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "a13df52d5a5b438bbf921bbf86276e4347fe8e2f2ed74feaaee12b77d6d26f86");
+    }
+}
+
+TEST(HDWallet, getKey) {
+    const auto derivPath = "m/44'/539'/0'/0/0";
+    HDWallet wallet = HDWallet(mnemonic1, "");
+    {
+        const auto privateKey = wallet.getKey(TWCoinTypeBitcoin, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "4fb8657d6464adcaa086d6758d7f0b6b6fc026c98dc1671fcc6460b5a74abc62");
+    }
+    {
+        const auto privateKey = wallet.getKey(TWCoinTypeNEO, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "a13df52d5a5b438bbf921bbf86276e4347fe8e2f2ed74feaaee12b77d6d26f86");
+    }
+}
+
+TEST(HDWallet, AptosKey) {
+    const auto derivPath = "m/44'/637'/0'/0'/0'";
+    HDWallet wallet = HDWallet(mnemonic1, "");
+    {
+        const auto privateKey = wallet.getKey(TWCoinTypeAptos, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "7f2634c0e2414a621e96e39c41d09021700cee12ee43328ed094c5580cd0bd6f");
+        EXPECT_EQ(hex(privateKey.getPublicKey(TWPublicKeyTypeED25519).bytes), "633e5c7e355bdd484706436ce1f06fdf280bd7c2229a7f9b6489684412c6967c");
+    }
+}
+
+TEST(HDWallet, HederaKey) {
+    // https://github.com/hashgraph/hedera-sdk-js/blob/e0cd39c84ab189d59a6bcedcf16e4102d7bb8beb/packages/cryptography/test/unit/Mnemonic.js#L47
+    {
+        const auto derivPath = "m/44'/3030'/0'/0'/0";
+        HDWallet wallet = HDWallet("inmate flip alley wear offer often piece magnet surge toddler submit right radio absent pear floor belt raven price stove replace reduce plate home", "");
+        {
+            const auto privateKey = wallet.getKey(TWCoinTypeHedera, DerivationPath(derivPath));
+            EXPECT_EQ(Hedera::gHederaDerPrefixPrivate + hex(privateKey.bytes), "302e020100300506032b657004220420853f15aecd22706b105da1d709b4ac05b4906170c2b9c7495dff9af49e1391da");
+            EXPECT_EQ(Hedera::gHederaDerPrefixPublic + hex(privateKey.getPublicKey(TWPublicKeyTypeED25519).bytes), "302a300506032b6570032100b63b3815f453cf697b53b290b1d78e88c725d39bde52c34c79fb5b4c93894673");
+        }
+    }
+    {
+        const auto derivPath = "m/44'/3030'/0'/0'/0";
+        HDWallet wallet = HDWallet("walk gun glide frequent exhaust sugar siege prosper staff skill swarm label", "");
+        {
+            const auto privateKey = wallet.getKey(TWCoinTypeHedera, DerivationPath(derivPath));
+            EXPECT_EQ(Hedera::gHederaDerPrefixPrivate + hex(privateKey.bytes), "302e020100300506032b657004220420650c5120cbdc6244e3d10001eb27eea4dd3f80c331b3b6969fa434797d4edd50");
+            EXPECT_EQ(Hedera::gHederaDerPrefixPublic + hex(privateKey.getPublicKey(TWPublicKeyTypeED25519).bytes), "302a300506032b65700321007df3e1ab790b28de4706d36a7aa99a0e043cb3e2c3d6ec6686e4af7f638b0860");
+        }
+    }
+}
+
+TEST(HDWallet, FromSeedStark) {
+    auto seed = parse_hex("4c4a250231bcac7beb165aec4c9b049b4ba40ad8dd287dc79b92b1ffcf20cdcf");
+    ASSERT_EQ(load(seed), uint256_t("34506778598894488719068064129252410649539581100963007245393949841529394744783"));
+    auto derivationPath = DerivationPath("m/2645'/579218131'/211006541'/1534045311'/1431804530'/1");
+    auto key = HDWallet<32>::bip32DeriveRawSeed(TWCoinTypeEthereum, seed, derivationPath);
+    ASSERT_EQ(hex(key.bytes), "57384e99059bb1c0e51d70f0fca22d18d7191398dd39d6b9b4e0521174b2377a");
+    auto addr = Ethereum::Address(key.getPublicKey(TWPublicKeyTypeSECP256k1Extended)).string();
+    ASSERT_EQ(addr, "0x47bbe762944B089315ac50c9ca762F4B4884B965");
+}
+
+TEST(HDWallet, FromMnemonicStark) {
+    // https://github.com/starkware-libs/starkware-crypto-utils/blob/d3a1e655105afd66ebc07f88a179a3042407cc7b/test/js/key_derivation.spec.js#L20
+    const auto mnemonic = "range mountain blast problem vibrant void vivid doctor cluster enough melody salt layer language laptop boat major space monkey unit glimpse pause change vibrant";
+    const auto ethAddress = "0xA4864D977b944315389d1765Ffa7E66F74eE8cD7";
+    HDWallet wallet = HDWallet(mnemonic, "");
+    auto derivationPath = DerivationPath(Ethereum::accountPathFromAddress(ethAddress, "starkex", "starkdeployement", "0"));
+    ASSERT_EQ(derivationPath.string(), "m/2645'/579218131'/891216374'/1961790679'/2135936222'/0");
+
+    // ETH
+    {
+        auto ethPrivKey = wallet.getKey(TWCoinTypeEthereum, DerivationPath("m/44'/60'/0'/0/0"));
+        auto ethAddressFromPub = Ethereum::Address(ethPrivKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended)).string();
+        ASSERT_EQ(ethAddressFromPub, ethAddress);
+    }
+
+    // Stark
+    {
+        auto starkPrivKey = wallet.getKeyByCurve(TWCurveStarkex, DerivationPath(derivationPath));
+        auto starkPubKey  = hex(starkPrivKey.getPublicKey(TWPublicKeyTypeStarkex).bytes);
+        ASSERT_EQ(hex(starkPrivKey.bytes), "06cf0a8bf113352eb863157a45c5e5567abb34f8d32cddafd2c22aa803f4892c");
+        ASSERT_EQ(starkPubKey, "02d2bbdc1adaf887b0027cdde2113cfd81c60493aa6dc15d7887ddf1a82bc831");
+    }
+}
+
+TEST(HDWallet, FromMnemonicImmutableX) {
+    // Successfully register the user: https://api.sandbox.x.immutable.com/v1/users/0x1A817D0cC495C8157E4C734c48a1e840473CBCa1
+    const auto mnemonic = "owner erupt swamp room swift final allow unaware hint identify figure cotton";
+    const auto ethAddress = "0x1A817D0cC495C8157E4C734c48a1e840473CBCa1";
+    HDWallet wallet = HDWallet(mnemonic, "");
+    auto derivationPath = DerivationPath(Ethereum::accountPathFromAddress(ethAddress, "starkex", "immutablex", "1"));
+    ASSERT_EQ(derivationPath.string(), "m/2645'/579218131'/211006541'/1195162785'/289656960'/1");
+
+    // ETH
+    {
+        auto ethPrivKey = wallet.getKey(TWCoinTypeEthereum, DerivationPath("m/44'/60'/0'/0/0"));
+        ASSERT_EQ(hex(ethPrivKey.bytes), "a84f129929f6effe3fd541bcaa8a13d80714cd93c205682bea8b9e0cfc28a2ad");
+        auto ethAddressFromPub = Ethereum::Address(ethPrivKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended)).string();
+        ASSERT_EQ(ethAddressFromPub, ethAddress);
+    }
+
+    // Stark
+    {
+        auto starkPrivKey = wallet.getKeyByCurve(TWCurveStarkex, DerivationPath(derivationPath));
+        auto starkPubKey  = starkPrivKey.getPublicKey(TWPublicKeyTypeStarkex);
+        ASSERT_EQ(hex(starkPrivKey.bytes), "02d037bb9c1302295c2f9fa66bcc4ab8e353a3140600a390598777d69c1bc71a");
+        ASSERT_EQ(hex(starkPubKey.bytes), "006c061ea4195769058e0e2e14cd747619a866954a412e15fa2241fdf49438cf");
+
+        auto starkMsg = "28419a504c5b1c83df4fdcbf7f5f36a7d5cfa8148aff2d33aed2f40a64e7ea0";
+        auto starkSignature = StarkEx::MessageSigner::signMessage(starkPrivKey, starkMsg);
+        ASSERT_EQ(starkSignature, "077cae8f00327a2072d3ca8b31725263f61303dc0142a631561d33cb2b4cb221008d659541d59f1589b0e714ddc0a5bee77faddf093f96d529b6c55c0bffd45d");
+        ASSERT_TRUE(StarkEx::MessageSigner::verifyMessage(starkPubKey, starkMsg, starkSignature));
+    }
+}
+
+TEST(HDWallet, FromMnemonicImmutableXMainnet) {
+    const auto mnemonic = "ocean seven canyon push fiscal banana music guess arrange edit glance school";
+    const auto ethAddress = "0x39E652fE9458D391737058b0dd5eCC6ec910A7dd";
+    HDWallet wallet = HDWallet(mnemonic, "");
+    auto derivationPath = DerivationPath(Ethereum::accountPathFromAddress(ethAddress, "starkex", "immutablex", "1"));
+    ASSERT_EQ(derivationPath.string(), "m/2645'/579218131'/211006541'/1225828317'/985503965'/1");
+
+    // ETH
+    {
+        auto ethPrivKey = wallet.getKey(TWCoinTypeEthereum, DerivationPath("m/44'/60'/0'/0/0"));
+        ASSERT_EQ(hex(ethPrivKey.bytes), "3b0a61f46fdae924007146eacb6db6642de7a5603ad843ec58e10331d89d4b84");
+        auto ethAddressFromPub = Ethereum::Address(ethPrivKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended)).string();
+        ASSERT_EQ(ethAddressFromPub, ethAddress);
+
+        std::string tosign = "Only sign this request if you’ve initiated an action with Immutable X.\n\nFor internal use:\nbd717ba31dca6e0f3f136f7c4197babce5f09a9f25176044c0b3112b1b6017a3";
+        auto hexEthSignature = Ethereum::MessageSigner::signMessage(ethPrivKey, tosign, Ethereum::MessageType::ImmutableX);
+
+        ASSERT_EQ(hexEthSignature, "32cd5a58f3419fc5db672e3d57f76199b853eda0856d491b38f557b629b0a0814ace689412bf354a1af81126d2749207dffae8ae8845160f33948a6b787e17ee01");
+    }
+
+    // Stark
+    {
+        auto starkPrivKey = wallet.getKeyByCurve(TWCurveStarkex, DerivationPath(derivationPath));
+        auto starkPubKey  = starkPrivKey.getPublicKey(TWPublicKeyTypeStarkex);
+        ASSERT_EQ(hex(starkPrivKey.bytes), "070128376c2cfd21e7475708049d00c83d7ab65f15368e28730bf1684dee8370");
+        ASSERT_EQ(hex(starkPubKey.bytes), "00453ca02b347f80e5ddfc4caf254852fc05b172b37bca8f7e28600631d12dfe");
+
+        auto starkMsg = "76b66c453cd1b812032ff206a28df59f6abe41e805b9f1c48a1c4afe780756c";
+        auto starkSignature = StarkEx::MessageSigner::signMessage(starkPrivKey, starkMsg);
+        ASSERT_EQ(starkSignature, "070ad88f79650fbdc152affd738d4ec29888bed554ea74f9ad8ca7031ef300b50597f4a62752336db06e6d37dfc18047fdd40804f5fd19cebfda8cac91e4f178");
+        ASSERT_TRUE(StarkEx::MessageSigner::verifyMessage(starkPubKey, starkMsg, starkSignature));
+    }
+}
+
+TEST(HDWallet, FromMnemonicImmutableXMainnetFromSignature) {
+    // Successfully register: https://api.x.immutable.com/v1/users/0xd0972E2312518Ca15A2304D56ff9cc0b7ea0Ea37
+    const auto mnemonic = "obscure opera favorite shuffle mail tip age debate dirt pact cement loyal";
+    const auto ethAddress = "0xd0972E2312518Ca15A2304D56ff9cc0b7ea0Ea37";
+    HDWallet wallet = HDWallet(mnemonic, "");
+    auto derivationPath = DerivationPath(Ethereum::accountPathFromAddress(ethAddress, "starkex", "immutablex", "1"));
+    ASSERT_EQ(derivationPath.string(), "m/2645'/579218131'/211006541'/2124474935'/1609799702'/1");
+
+    // ETH + stark
+    {
+        auto ethPrivKey = wallet.getKey(TWCoinTypeEthereum, DerivationPath("m/44'/60'/0'/0/0"));
+        ASSERT_EQ(hex(ethPrivKey.bytes), "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d");
+        auto ethAddressFromPub = Ethereum::Address(ethPrivKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended)).string();
+        ASSERT_EQ(ethAddressFromPub, ethAddress);
+        auto signature = Ethereum::MessageSigner::signMessage(ethPrivKey, "Only sign this request if you’ve initiated an action with Immutable X.", Ethereum::MessageType::ImmutableX);
+        ASSERT_EQ(signature, "18b1be8b78807d3326e28bc286d7ee3d068dcd90b1949ce1d25c1f99825f26e70992c5eb7f44f76b202aceded00d74f771ed751f2fe538eec01e338164914fe001");
+        auto starkPrivKey = ImmutableX::getPrivateKeyFromRawSignature(parse_hex(signature), DerivationPath(derivationPath));
+        auto starkPubKey  = starkPrivKey.getPublicKey(TWPublicKeyTypeStarkex);
+        ASSERT_EQ(hex(starkPrivKey.bytes), "04be51a04e718c202e4dca60c2b72958252024cfc1070c090dd0f170298249de");
+        ASSERT_EQ(hex(starkPubKey.bytes), "00e5b9b11f8372610ef35d647a1dcaba1a4010716588d591189b27bf3c2d5095");
+        auto signatureToSend = Ethereum::MessageSigner::signMessage(ethPrivKey, "Only sign this key linking request from Immutable X", Ethereum::MessageType::ImmutableX);
+        ASSERT_EQ(signatureToSend, "646da4160f7fc9205e6f502fb7691a0bf63ecbb74bbb653465cd62388dd9f56325ab1e4a9aba99b1661e3e6251b42822855a71e60017b310b9f90e990a12e1dc01");
+
+        auto starkMsg = "463a2240432264a3aa71a5713f2a4e4c1b9e12bbb56083cd56af6d878217cf";
+        auto starkSignature = StarkEx::MessageSigner::signMessage(starkPrivKey, starkMsg);
+        ASSERT_EQ(starkSignature, "04cf5f21333dd189ada3c0f2a51430d733501a9b1d5e07905273c1938cfb261e05b6013d74adde403e8953743a338c8d414bb96bf69d2ca1a91a85ed2700a528");
+        ASSERT_TRUE(StarkEx::MessageSigner::verifyMessage(starkPubKey, starkMsg, starkSignature));
+    }
+}
+
+TEST(HDWallet, StargazeKey) {
+    const auto derivPath = "m/44'/118'/0'/0/0";
+    HDWallet wallet = HDWallet("rude segment two fury you output manual volcano sugar draft elite fame", "");
+    {
+        const auto privateKey = wallet.getKey(TWCoinTypeStargaze, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+        const auto p = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_EQ(hex(p.bytes), "02cbfdb5e472893322294e60cf0883d43df431e1089d29ecb447a9e6d55045aae5");
+        EXPECT_EQ(Cosmos::Address(TWCoinTypeStargaze ,p).string(), "stars1mry47pkga5tdswtluy0m8teslpalkdq02a8nhy");
+    }
+}
+
+TEST(HDWallet, CoreumKey) {
+    const auto derivPath = "m/44'/990'/0'/0/0";
+    HDWallet wallet = HDWallet("rude segment two fury you output manual volcano sugar draft elite fame", "");
+    {
+        const auto privateKey = wallet.getKey(TWCoinTypeCoreum, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "56e5e45bf33a779527ec670b5336f6bc78efbe0e3bf1f004e7250673a82a3431");
+        const auto p = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_EQ(hex(p.bytes), "0345d8d927b955c3cd468d12b5bc634c7919ee4777e578439af6314cf04b2ff114");
+        EXPECT_EQ(Cosmos::Address(TWCoinTypeCoreum ,p).string(), "core1a5nvz6smgsph9gephguyhn30fmzrpaxrvvdjun");
+    }
+}
+
+TEST(HDWallet, NearKey) {
+    const auto derivPath = "m/44'/397'/0'";
+    HDWallet wallet = HDWallet("owner erupt swamp room swift final allow unaware hint identify figure cotton", "");
+    {
+        const auto privateKey = wallet.getKey(TWCoinTypeNEAR, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "35e0d9631bd538d5569266abf6be7a9a403ebfda92ddd49b3268e35360a6c2dd");
+        const auto p = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+        EXPECT_EQ(hex(p.bytes), "b8d5df25047841365008f30fb6b30dd820e9a84d869f05623d114e96831f2fbf");
+        EXPECT_EQ(NEAR::Address(p).string(), "b8d5df25047841365008f30fb6b30dd820e9a84d869f05623d114e96831f2fbf");
+    }
+}
+
+TEST(HDWallet, IoTexEvmKeys) {
+    const auto derivPath = "m/44'/304'/0'/0/0";
+    HDWallet wallet = HDWallet("token major laundry actor dish lunch physical machine kingdom adapt gym true", "");
+    {
+        const auto privateKey = wallet.getKey(TWCoinTypeEthereum, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "3aa86eafa99cb9ae0f7c1c4f06391ffbef91578169715dfbdcdf76b532b73f24");
+        const auto p = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        EXPECT_EQ(hex(p.bytes), "042be00e86db75bbe3e8defe9bb09fbd5444eea10e2d53d55468f3d25bf3b0cb3ea8d992baba30c9353584b8ff061f8585cae1c792b8bb6f0607750dbf4fe8c760");
+        EXPECT_EQ(Ethereum::Address(p).string(), "0x6b3FBEDcB9E106e84c3a47f63cf96Df8500bBc22");
+    }
+}
+
+TEST(HDWallet, IoTexKeys) {
+    const auto derivPath = "m/44'/304'/0'/0/0";
+    HDWallet wallet = HDWallet("token major laundry actor dish lunch physical machine kingdom adapt gym true", "");
+    {
+        const auto privateKey = wallet.getKey(TWCoinTypeIoTeX, DerivationPath(derivPath));
+        EXPECT_EQ(hex(privateKey.bytes), "3aa86eafa99cb9ae0f7c1c4f06391ffbef91578169715dfbdcdf76b532b73f24");
+        const auto p = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+        EXPECT_EQ(hex(p.bytes), "042be00e86db75bbe3e8defe9bb09fbd5444eea10e2d53d55468f3d25bf3b0cb3ea8d992baba30c9353584b8ff061f8585cae1c792b8bb6f0607750dbf4fe8c760");
+        EXPECT_EQ(IoTeX::Address(p).string(), "io1dvlmah9euyrwsnp6glmre7tdlpgqh0pzz542zd");
+    }
+    // io1qmkv62pvg56qkashkwauhhjv3gtjhcm889r8dc
+}
+
+} // namespace TW::HDWalletTests
diff --git a/tests/HDWallet/bip39_vectors.json b/tests/common/HDWallet/bip39_vectors.json
similarity index 100%
rename from tests/HDWallet/bip39_vectors.json
rename to tests/common/HDWallet/bip39_vectors.json
diff --git a/tests/HashTests.cpp b/tests/common/HashTests.cpp
similarity index 94%
rename from tests/HashTests.cpp
rename to tests/common/HashTests.cpp
index c60acec946c..f1c1229e377 100644
--- a/tests/HashTests.cpp
+++ b/tests/common/HashTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Hash.h"
 #include "HexCoding.h"
diff --git a/tests/common/HexCodingTests.cpp b/tests/common/HexCodingTests.cpp
new file mode 100644
index 00000000000..db49b1b7376
--- /dev/null
+++ b/tests/common/HexCodingTests.cpp
@@ -0,0 +1,36 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "HexCoding.h"
+#include "Data.h"
+#include "uint256.h"
+#include <gtest/gtest.h>
+
+namespace TW {
+
+TEST(HexCoding, validation) {
+    const std::string valid = "0x7d8bf18c7ce84b3e175b339c4ca93aed1dd166f1";
+    const std::string invalid = "0xMQqpqMQgCBuiPkoXfgZZsJvuzCeI1zc00z6vHJj4";
+    const auto bytes = parse_hex(invalid);
+    const auto bytes2 = parse_hex(valid);
+
+    ASSERT_TRUE(bytes.empty());
+    ASSERT_EQ("0x" + hex(bytes2), valid);
+}
+
+TEST(HexCoding, OddLength) {
+    const std::string oddHex = "0x28fa6ae00";
+    const auto bytes = parse_hex(oddHex, true);
+    const auto number = load(bytes);
+    ASSERT_EQ(number, 11000000000);
+}
+
+TEST(HexCoding, isHexEncoded) {
+    ASSERT_TRUE(is_hex_encoded("66fbe3c5c03bf5c82792f904c9f8bf28894a6aa3d213d41c20569b654aadedb3"));
+    ASSERT_TRUE(is_hex_encoded("0x66fbe3c5c03bf5c82792f904c9f8bf28894a6aa3d213d41c20569b654aadedb3"));
+    ASSERT_FALSE(is_hex_encoded("1x66fbe3c5c03bf5c82792f904c9f8bf28894a6aa3d213d41c20569b654aadedb3"));
+    ASSERT_FALSE(is_hex_encoded("0xyahoo"));
+}
+
+}
diff --git a/tests/Keystore/Data/empty-accounts.json b/tests/common/Keystore/Data/empty-accounts.json
similarity index 100%
rename from tests/Keystore/Data/empty-accounts.json
rename to tests/common/Keystore/Data/empty-accounts.json
diff --git a/tests/Keystore/Data/ethereum-wallet-address-no-0x.json b/tests/common/Keystore/Data/ethereum-wallet-address-no-0x.json
similarity index 100%
rename from tests/Keystore/Data/ethereum-wallet-address-no-0x.json
rename to tests/common/Keystore/Data/ethereum-wallet-address-no-0x.json
diff --git a/tests/Keystore/Data/key.json b/tests/common/Keystore/Data/key.json
similarity index 100%
rename from tests/Keystore/Data/key.json
rename to tests/common/Keystore/Data/key.json
diff --git a/tests/Keystore/Data/key_bitcoin.json b/tests/common/Keystore/Data/key_bitcoin.json
similarity index 100%
rename from tests/Keystore/Data/key_bitcoin.json
rename to tests/common/Keystore/Data/key_bitcoin.json
diff --git a/tests/Keystore/Data/legacy-mnemonic.json b/tests/common/Keystore/Data/legacy-mnemonic.json
similarity index 100%
rename from tests/Keystore/Data/legacy-mnemonic.json
rename to tests/common/Keystore/Data/legacy-mnemonic.json
diff --git a/tests/Keystore/Data/legacy-private-key.json b/tests/common/Keystore/Data/legacy-private-key.json
similarity index 100%
rename from tests/Keystore/Data/legacy-private-key.json
rename to tests/common/Keystore/Data/legacy-private-key.json
diff --git a/tests/Keystore/Data/livepeer.json b/tests/common/Keystore/Data/livepeer.json
similarity index 100%
rename from tests/Keystore/Data/livepeer.json
rename to tests/common/Keystore/Data/livepeer.json
diff --git a/tests/Keystore/Data/missing-address.json b/tests/common/Keystore/Data/missing-address.json
similarity index 100%
rename from tests/Keystore/Data/missing-address.json
rename to tests/common/Keystore/Data/missing-address.json
diff --git a/tests/Keystore/Data/myetherwallet.uu b/tests/common/Keystore/Data/myetherwallet.uu
similarity index 100%
rename from tests/Keystore/Data/myetherwallet.uu
rename to tests/common/Keystore/Data/myetherwallet.uu
diff --git a/tests/Keystore/Data/pbkdf2.json b/tests/common/Keystore/Data/pbkdf2.json
similarity index 100%
rename from tests/Keystore/Data/pbkdf2.json
rename to tests/common/Keystore/Data/pbkdf2.json
diff --git a/tests/Keystore/Data/wallet.json b/tests/common/Keystore/Data/wallet.json
similarity index 100%
rename from tests/Keystore/Data/wallet.json
rename to tests/common/Keystore/Data/wallet.json
diff --git a/tests/Keystore/Data/watch.json b/tests/common/Keystore/Data/watch.json
similarity index 100%
rename from tests/Keystore/Data/watch.json
rename to tests/common/Keystore/Data/watch.json
diff --git a/tests/Keystore/Data/web3j.json b/tests/common/Keystore/Data/web3j.json
similarity index 100%
rename from tests/Keystore/Data/web3j.json
rename to tests/common/Keystore/Data/web3j.json
diff --git a/tests/Keystore/DerivationPathTests.cpp b/tests/common/Keystore/DerivationPathTests.cpp
similarity index 93%
rename from tests/Keystore/DerivationPathTests.cpp
rename to tests/common/Keystore/DerivationPathTests.cpp
index 62d21aab939..a38fc23903a 100644
--- a/tests/Keystore/DerivationPathTests.cpp
+++ b/tests/common/Keystore/DerivationPathTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Coin.h"
 #include "DerivationPath.h"
@@ -84,6 +82,8 @@ TEST(Derivation, alternativeDerivation) {
     EXPECT_EQ(std::string(TW::derivationName(TWCoinTypeBitcoin, TWDerivationBitcoinSegwit)), "segwit");
     EXPECT_EQ(TW::derivationPath(TWCoinTypeBitcoin, TWDerivationBitcoinLegacy).string(), "m/44'/0'/0'/0/0");
     EXPECT_EQ(std::string(TW::derivationName(TWCoinTypeBitcoin, TWDerivationBitcoinLegacy)), "legacy");
+    EXPECT_EQ(TW::derivationPath(TWCoinTypeBitcoin, TWDerivationBitcoinTaproot).string(), "m/86'/0'/0'/0/0");
+    EXPECT_EQ(std::string(TW::derivationName(TWCoinTypeBitcoin, TWDerivationBitcoinTaproot)), "taproot");
 
     EXPECT_EQ(TW::derivationPath(TWCoinTypeLitecoin, TWDerivationDefault).string(), "m/84'/2'/0'/0/0");
     EXPECT_EQ(TW::derivationPath(TWCoinTypeLitecoin, TWDerivationLitecoinLegacy).string(), "m/44'/2'/0'/0/0");
diff --git a/tests/Keystore/StoredKeyTests.cpp b/tests/common/Keystore/StoredKeyTests.cpp
similarity index 83%
rename from tests/Keystore/StoredKeyTests.cpp
rename to tests/common/Keystore/StoredKeyTests.cpp
index e792c0f7ab5..02c9bed047b 100644
--- a/tests/Keystore/StoredKeyTests.cpp
+++ b/tests/common/Keystore/StoredKeyTests.cpp
@@ -1,24 +1,22 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Keystore/StoredKey.h"
 
+#include "Bitcoin/Address.h"
 #include "Coin.h"
-#include "HexCoding.h"
 #include "Data.h"
-#include "PrivateKey.h"
+#include "HexCoding.h"
 #include "Mnemonic.h"
-#include "Bitcoin/Address.h"
+#include "PrivateKey.h"
 
-#include <stdexcept>
 #include <gtest/gtest.h>
+#include <stdexcept>
 
 extern std::string TESTS_ROOT;
 
-namespace TW::Keystore {
+namespace TW::Keystore::tests {
 
 using namespace std;
 
@@ -31,6 +29,10 @@ const TWCoinType coinTypeBsc = TWCoinTypeSmartChain;
 const TWCoinType coinTypeEth = TWCoinTypeEthereum;
 const TWCoinType coinTypeBscLegacy = TWCoinTypeSmartChainLegacy;
 
+const std::string testDataPath(const char* subpath) {
+    return TESTS_ROOT + "/common/Keystore/Data/" + subpath;
+}
+
 TEST(StoredKey, CreateWithMnemonic) {
     auto key = StoredKey::createWithMnemonic("name", gPassword, gMnemonic, TWStoredKeyEncryptionLevelDefault);
     EXPECT_EQ(key.type, StoredKeyType::mnemonicPhrase);
@@ -43,13 +45,15 @@ TEST(StoredKey, CreateWithMnemonic) {
     EXPECT_EQ(json["name"], "name");
     EXPECT_EQ(json["type"], "mnemonic");
     EXPECT_EQ(json["version"], 3);
+    // Salt is 32 bytes, encoded as hex.
+    EXPECT_EQ(json["crypto"]["kdfparams"]["salt"].get<std::string>().size(), 64ul);
 }
 
 TEST(StoredKey, CreateWithMnemonicInvalid) {
     try {
         auto key = StoredKey::createWithMnemonic("name", gPassword, "_THIS_IS_NOT_A_VALID_MNEMONIC_", TWStoredKeyEncryptionLevelDefault);
     } catch (std::invalid_argument&) {
-        // expedcted exception OK
+        // expected exception OK
         return;
     }
     FAIL() << "Missing excpected excpetion";
@@ -80,6 +84,22 @@ TEST(StoredKey, CreateWithMnemonicAddDefaultAddress) {
     EXPECT_EQ(hex(key.privateKey(coinTypeBc, gPassword).bytes), "d2568511baea8dc347f14c4e0479eb8ebe29eb5f664ed796e755896250ffd11f");
 }
 
+TEST(StoredKey, CreateWithMnemonicAddDefaultAddressAes256) {
+    auto key = StoredKey::createWithMnemonicAddDefaultAddress("name", gPassword, gMnemonic, coinTypeBc, TWStoredKeyEncryptionAes256Ctr);
+    EXPECT_EQ(key.type, StoredKeyType::mnemonicPhrase);
+    auto header = key.payload;
+    EXPECT_EQ(header.params.cipher(), "aes-256-ctr");
+    const Data& mnemo2Data = key.payload.decrypt(gPassword);
+
+    EXPECT_EQ(string(mnemo2Data.begin(), mnemo2Data.end()), string(gMnemonic));
+    EXPECT_EQ(key.accounts.size(), 1ul);
+    EXPECT_EQ(key.accounts[0].coin, coinTypeBc);
+    EXPECT_EQ(key.accounts[0].address, "bc1qturc268v0f2srjh4r2zu4t6zk4gdutqd5a6zny");
+    EXPECT_EQ(key.accounts[0].publicKey, "02df6fc590ab3101bbe0bb5765cbaeab9b5dcfe09ac9315d707047cbd13bc7e006");
+    EXPECT_EQ(key.accounts[0].extendedPublicKey, "zpub6qbsWdbcKW9sC6shTKK4VEhfWvDCoWpfLnnVfYKHLHt31wKYUwH3aFDz4WLjZvjHZ5W4qVEyk37cRwzTbfrrT1Gnu8SgXawASnkdQ994atn");
+    EXPECT_EQ(hex(key.privateKey(coinTypeBc, gPassword).bytes), "d2568511baea8dc347f14c4e0479eb8ebe29eb5f664ed796e755896250ffd11f");
+}
+
 TEST(StoredKey, CreateWithPrivateKeyAddDefaultAddress) {
     const auto privateKey = parse_hex("3a1076bf45ab87712ad64ccb3b10217737f7faacbf2872e88fdd9a537d8fe266");
     auto key = StoredKey::createWithPrivateKeyAddDefaultAddress("name", gPassword, coinTypeBc, privateKey);
@@ -95,6 +115,23 @@ TEST(StoredKey, CreateWithPrivateKeyAddDefaultAddress) {
     EXPECT_EQ(json["version"], 3);
 }
 
+TEST(StoredKey, CreateWithPrivateKeyAddDefaultAddressAes256) {
+    const auto privateKey = parse_hex("3a1076bf45ab87712ad64ccb3b10217737f7faacbf2872e88fdd9a537d8fe266");
+    auto key = StoredKey::createWithPrivateKeyAddDefaultAddress("name", gPassword, coinTypeBc, privateKey, TWStoredKeyEncryptionAes256Ctr);
+    auto header = key.payload;
+    EXPECT_EQ(header.params.cipher(), "aes-256-ctr");
+    EXPECT_EQ(key.type, StoredKeyType::privateKey);
+    EXPECT_EQ(key.accounts.size(), 1ul);
+    EXPECT_EQ(key.accounts[0].coin, coinTypeBc);
+    EXPECT_EQ(key.accounts[0].address, "bc1q375sq4kl2nv0mlmup3vm8znn4eqwu7mt6hkwhr");
+    EXPECT_EQ(hex(key.privateKey(coinTypeBc, gPassword).bytes), hex(privateKey));
+
+    const auto json = key.json();
+    EXPECT_EQ(json["name"], "name");
+    EXPECT_EQ(json["type"], "private-key");
+    EXPECT_EQ(json["version"], 3);
+}
+
 TEST(StoredKey, CreateWithPrivateKeyAddDefaultAddressInvalid) {
     try {
         const auto privateKeyInvalid = parse_hex("0001020304");
@@ -152,7 +189,7 @@ TEST(StoredKey, AccountGetDoesntChange) {
     vector<TWCoinType> coins = {coinTypeBc, coinTypeEth, coinTypeBnb};
     // retrieve multiple accounts, which will be created
     vector<Account> accounts;
-    for (auto coin: coins) {
+    for (auto coin : coins) {
         std::optional<Account> account = key.account(coin, &wallet);
         accounts.push_back(*account);
 
@@ -272,11 +309,11 @@ TEST(StoredKey, WalletInvalid) {
 }
 
 TEST(StoredKey, LoadNonexistent) {
-    ASSERT_THROW(StoredKey::load(TESTS_ROOT + "/Keystore/Data/nonexistent.json"), invalid_argument);
+    ASSERT_THROW(StoredKey::load(testDataPath("nonexistent.json")), invalid_argument);
 }
 
 TEST(StoredKey, LoadLegacyPrivateKey) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/legacy-private-key.json");
+    const auto key = StoredKey::load(testDataPath("legacy-private-key.json"));
     EXPECT_EQ(key.type, StoredKeyType::privateKey);
     EXPECT_EQ(key.id, "3051ca7d-3d36-4a4a-acc2-09e9083732b0");
     EXPECT_EQ(key.accounts[0].coin, TWCoinTypeEthereum);
@@ -284,7 +321,7 @@ TEST(StoredKey, LoadLegacyPrivateKey) {
 }
 
 TEST(StoredKey, LoadLivepeerKey) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/livepeer.json");
+    const auto key = StoredKey::load(testDataPath("livepeer.json"));
     EXPECT_EQ(key.type, StoredKeyType::privateKey);
     EXPECT_EQ(key.id, "70ea3601-ee21-4e94-a7e4-66255a987d22");
     EXPECT_EQ(key.accounts[0].coin, TWCoinTypeEthereum);
@@ -292,7 +329,7 @@ TEST(StoredKey, LoadLivepeerKey) {
 }
 
 TEST(StoredKey, LoadPBKDF2Key) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/pbkdf2.json");
+    const auto key = StoredKey::load(testDataPath("pbkdf2.json"));
     EXPECT_EQ(key.type, StoredKeyType::privateKey);
     EXPECT_EQ(key.id, "3198bc9c-6672-5ab3-d995-4942343ae5b6");
 
@@ -303,10 +340,19 @@ TEST(StoredKey, LoadPBKDF2Key) {
     EXPECT_EQ(hex(std::get<PBKDF2Parameters>(payload.params.kdfParams).salt), "ae3cd4e7013836a3df6bd7241b12db061dbe2c6785853cce422d148a624ce0bd");
 
     EXPECT_EQ(hex(payload.decrypt(TW::data("testpassword"))), "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d");
+
+    auto j = std::get<PBKDF2Parameters>(payload.params.kdfParams).json();
+    auto expected = R"|({"c":262144,"dklen":32,"salt":"ae3cd4e7013836a3df6bd7241b12db061dbe2c6785853cce422d148a624ce0bd"})|";
+    EXPECT_EQ(j.dump(), expected);
+}
+
+TEST(StoredKey, RandomPBKDF2Param) {
+    auto p = PBKDF2Parameters();
+    ASSERT_TRUE(p.salt.size() == 32ul);
 }
 
 TEST(StoredKey, LoadLegacyMnemonic) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/legacy-mnemonic.json");
+    const auto key = StoredKey::load(testDataPath("legacy-mnemonic.json"));
     EXPECT_EQ(key.type, StoredKeyType::mnemonicPhrase);
     EXPECT_EQ(key.id, "629aad29-0b22-488e-a0e7-b4219d4f311c");
 
@@ -324,7 +370,7 @@ TEST(StoredKey, LoadLegacyMnemonic) {
 }
 
 TEST(StoredKey, LoadFromWeb3j) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/web3j.json");
+    const auto key = StoredKey::load(testDataPath("web3j.json"));
     EXPECT_EQ(key.type, StoredKeyType::privateKey);
     EXPECT_EQ(key.id, "86066d8c-8dba-4d81-afd4-934e2a2b72a2");
     const auto password = parse_hex("2d6eefbfbd4622efbfbdefbfbd516718efbfbdefbfbdefbfbdefbfbd59efbfbd30efbfbdefbfbd3a4348efbfbd2aefbfbdefbfbd49efbfbd27efbfbd0638efbfbdefbfbdefbfbd4cefbfbd6befbfbdefbfbd6defbfbdefbfbd63efbfbd5aefbfbd61262b70efbfbdefbfbdefbfbdefbfbdefbfbdc7aa373163417cefbfbdefbfbdefbfbd44efbfbdefbfbd1d10efbfbdefbfbdefbfbd61dc9e5b124befbfbd11efbfbdefbfbd2fefbfbdefbfbd3d7c574868efbfbdefbfbdefbfbd37043b7b5c1a436471592f02efbfbd18efbfbdefbfbd2befbfbdefbfbd7218efbfbd6a68efbfbdcb8e5f3328773ec48174efbfbd67efbfbdefbfbdefbfbdefbfbdefbfbd2a31efbfbd7f60efbfbdd884efbfbd57efbfbd25efbfbd590459efbfbd37efbfbd2bdca20fefbfbdefbfbdefbfbdefbfbd39450113efbfbdefbfbdefbfbd454671efbfbdefbfbdd49fefbfbd47efbfbdefbfbdefbfbdefbfbd00efbfbdefbfbdefbfbdefbfbd05203f4c17712defbfbd7bd1bbdc967902efbfbdc98a77efbfbd707a36efbfbd12efbfbdefbfbd57c78cefbfbdefbfbdefbfbd10efbfbdefbfbdefbfbde1a1bb08efbfbdefbfbd26efbfbdefbfbd58efbfbdefbfbdc4b1efbfbd295fefbfbd0eefbfbdefbfbdefbfbd0e6eefbfbd");
@@ -333,7 +379,7 @@ TEST(StoredKey, LoadFromWeb3j) {
 }
 
 TEST(StoredKey, ReadWallet) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/key.json");
+    const auto key = StoredKey::load(testDataPath("key.json"));
 
     EXPECT_EQ(key.type, StoredKeyType::privateKey);
     EXPECT_EQ(key.id, "e13b209c-3b2f-4327-bab0-3bef2e51630d");
@@ -341,7 +387,7 @@ TEST(StoredKey, ReadWallet) {
 
     const auto header = key.payload;
 
-    EXPECT_EQ(header.params.cipher, "aes-128-ctr");
+    EXPECT_EQ(header.params.cipher(), "aes-128-ctr");
     EXPECT_EQ(hex(header.encrypted), "d172bf743a674da9cdad04534d56926ef8358534d458fffccd4e6ad2fbde479c");
     EXPECT_EQ(hex(header._mac), "2103ac29920d71da29f15d75b4a16dbe95cfd7ff8faea1056c33131d846e3097");
     EXPECT_EQ(hex(header.params.cipherParams.iv), "83dbcc02d8ccb40e466191a123791e0e");
@@ -355,23 +401,23 @@ TEST(StoredKey, ReadWallet) {
 }
 
 TEST(StoredKey, ReadMyEtherWallet) {
-    ASSERT_NO_THROW(StoredKey::load(TESTS_ROOT + "/Keystore/Data/myetherwallet.uu"));
+    ASSERT_NO_THROW(StoredKey::load(testDataPath("myetherwallet.uu")));
 }
 
 TEST(StoredKey, InvalidPassword) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/key.json");
+    const auto key = StoredKey::load(testDataPath("key.json"));
 
     ASSERT_THROW(key.payload.decrypt(gPassword), DecryptionError);
 }
 
 TEST(StoredKey, EmptyAccounts) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/empty-accounts.json");
+    const auto key = StoredKey::load(testDataPath("empty-accounts.json"));
 
     ASSERT_NO_THROW(key.payload.decrypt(TW::data("testpassword")));
 }
 
 TEST(StoredKey, Decrypt) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/key.json");
+    const auto key = StoredKey::load(testDataPath("key.json"));
     const auto privateKey = key.payload.decrypt(TW::data("testpassword"));
 
     EXPECT_EQ(hex(privateKey), "7a28b5ba57c53603b0b07b56bba752f7784bf506fa95edc395f5cf6c7514fe9d");
@@ -399,20 +445,36 @@ TEST(StoredKey, CreateAccounts) {
     EXPECT_EQ(key.account(coinTypeBc, &wallet)->extendedPublicKey, "zpub6qbsWdbcKW9sC6shTKK4VEhfWvDCoWpfLnnVfYKHLHt31wKYUwH3aFDz4WLjZvjHZ5W4qVEyk37cRwzTbfrrT1Gnu8SgXawASnkdQ994atn");
 }
 
+TEST(StoredKey, CreateAccountsAes256) {
+    string mnemonicPhrase = "team engine square letter hero song dizzy scrub tornado fabric divert saddle";
+    auto key = StoredKey::createWithMnemonic("name", gPassword, mnemonicPhrase, TWStoredKeyEncryptionLevelDefault, TWStoredKeyEncryptionAes256Ctr);
+    auto header = key.payload;
+    const auto wallet = key.wallet(gPassword);
+
+    EXPECT_EQ(header.params.cipher(), "aes-256-ctr");
+    EXPECT_EQ(key.account(TWCoinTypeEthereum, &wallet)->address, "0x494f60cb6Ac2c8F5E1393aD9FdBdF4Ad589507F7");
+    EXPECT_EQ(key.account(TWCoinTypeEthereum, &wallet)->publicKey, "04cc32a479080d83fdcf69966713f0aad1bc1dc3ecf873b034894e84259841bc1c9b122717803e68905220ff54952d3f5ea2ab2698ca31f843addf94ae73fae9fd");
+    EXPECT_EQ(key.account(TWCoinTypeEthereum, &wallet)->extendedPublicKey, "");
+
+    EXPECT_EQ(key.account(coinTypeBc, &wallet)->address, "bc1qturc268v0f2srjh4r2zu4t6zk4gdutqd5a6zny");
+    EXPECT_EQ(key.account(coinTypeBc, &wallet)->publicKey, "02df6fc590ab3101bbe0bb5765cbaeab9b5dcfe09ac9315d707047cbd13bc7e006");
+    EXPECT_EQ(key.account(coinTypeBc, &wallet)->extendedPublicKey, "zpub6qbsWdbcKW9sC6shTKK4VEhfWvDCoWpfLnnVfYKHLHt31wKYUwH3aFDz4WLjZvjHZ5W4qVEyk37cRwzTbfrrT1Gnu8SgXawASnkdQ994atn");
+}
+
 TEST(StoredKey, DecodingEthereumAddress) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/key.json");
+    const auto key = StoredKey::load(testDataPath("key.json"));
 
     EXPECT_EQ(key.accounts[0].address, "0x008AeEda4D805471dF9b2A5B0f38A0C3bCBA786b");
 }
 
 TEST(StoredKey, DecodingBitcoinAddress) {
-    const auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/key_bitcoin.json");
+    const auto key = StoredKey::load(testDataPath("key_bitcoin.json"));
 
     EXPECT_EQ(key.accounts[0].address, "3PWazDi9n1Hfyq9gXFxDxzADNL8RNYyK2y");
 }
-    
+
 TEST(StoredKey, RemoveAccount) {
-    auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/legacy-mnemonic.json");
+    auto key = StoredKey::load(testDataPath("legacy-mnemonic.json"));
     EXPECT_EQ(key.accounts.size(), 2ul);
     key.removeAccount(TWCoinTypeEthereum);
     EXPECT_EQ(key.accounts.size(), 1ul);
@@ -420,7 +482,7 @@ TEST(StoredKey, RemoveAccount) {
 }
 
 TEST(StoredKey, MissingAddressFix) {
-    auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/missing-address.json");
+    auto key = StoredKey::load(testDataPath("missing-address.json"));
     EXPECT_EQ(key.type, StoredKeyType::mnemonicPhrase);
 
     const auto wallet = key.wallet(gPassword);
@@ -439,7 +501,7 @@ TEST(StoredKey, MissingAddressFix) {
 }
 
 TEST(StoredKey, MissingAddressReadd) {
-    auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/missing-address.json");
+    auto key = StoredKey::load(testDataPath("missing-address.json"));
     EXPECT_EQ(key.type, StoredKeyType::mnemonicPhrase);
 
     const auto wallet = key.wallet(gPassword);
@@ -460,7 +522,7 @@ TEST(StoredKey, MissingAddressReadd) {
 }
 
 TEST(StoredKey, EtherWalletAddressNo0x) {
-    auto key = StoredKey::load(TESTS_ROOT + "/Keystore/Data/ethereum-wallet-address-no-0x.json");
+    auto key = StoredKey::load(testDataPath("ethereum-wallet-address-no-0x.json"));
     key.fixAddresses(TW::data("15748c4e3dca6ae2110535576ab0c398cb79d985707c68ee6c9f9df9d421dd53"));
     const auto account = key.account(TWCoinTypeEthereum, nullptr);
     EXPECT_EQ(account->address, "0xAc1ec44E4f0ca7D172B7803f6836De87Fb72b309");
@@ -479,6 +541,7 @@ TEST(StoredKey, CreateMinimalEncryptionParameters) {
 
     EXPECT_EQ(json["crypto"]["kdf"], "scrypt");
     EXPECT_EQ(json["crypto"]["kdfparams"]["n"], 4096);
+    EXPECT_EQ(json["crypto"]["kdfparams"]["salt"].get<std::string>().size(), 64ul);
 
     // load it back
     const auto key2 = StoredKey::createWithJson(json);
@@ -497,6 +560,7 @@ TEST(StoredKey, CreateWeakEncryptionParameters) {
 
     EXPECT_EQ(json["crypto"]["kdf"], "scrypt");
     EXPECT_EQ(json["crypto"]["kdfparams"]["n"], 16384);
+    EXPECT_EQ(json["crypto"]["kdfparams"]["salt"].get<std::string>().size(), 64ul);
 
     // load it back
     const auto key2 = StoredKey::createWithJson(json);
@@ -515,12 +579,23 @@ TEST(StoredKey, CreateStandardEncryptionParameters) {
 
     EXPECT_EQ(json["crypto"]["kdf"], "scrypt");
     EXPECT_EQ(json["crypto"]["kdfparams"]["n"], 262144);
+    EXPECT_EQ(json["crypto"]["kdfparams"]["salt"].get<std::string>().size(), 64ul);
 
     // load it back
     const auto key2 = StoredKey::createWithJson(json);
     EXPECT_EQ(key2.wallet(gPassword).getMnemonic(), string(gMnemonic));
 }
 
+TEST(StoredKey, CreateEncryptionParametersRandomSalt) {
+    const auto key1 = StoredKey::createWithMnemonic("name", gPassword, gMnemonic, TWStoredKeyEncryptionLevelStandard);
+    const auto salt1 = parse_hex(key1.json()["crypto"]["kdfparams"]["salt"]);
+
+    const auto key2 = StoredKey::createWithMnemonic("name", gPassword, gMnemonic, TWStoredKeyEncryptionLevelStandard);
+    const auto salt2 = parse_hex(key2.json()["crypto"]["kdfparams"]["salt"]);
+
+    EXPECT_NE(salt1, salt2) << "salt must be random on every StoredKey creation";
+}
+
 TEST(StoredKey, CreateMultiAccounts) { // Multiple accounts for the same coin
     auto key = StoredKey::createWithMnemonic("name", gPassword, gMnemonic, TWStoredKeyEncryptionLevelDefault);
     EXPECT_EQ(key.type, StoredKeyType::mnemonicPhrase);
@@ -539,7 +614,7 @@ TEST(StoredKey, CreateMultiAccounts) { // Multiple accounts for the same coin
         const auto coin = TWCoinTypeBitcoin;
 
         const auto btc1 = key.account(coin, &wallet);
-        
+
         EXPECT_TRUE(btc1.has_value());
         EXPECT_EQ(btc1->address, expectedBtc1);
         EXPECT_EQ(btc1->derivationPath.string(), "m/84'/0'/0'/0/0");
@@ -568,7 +643,7 @@ TEST(StoredKey, CreateMultiAccounts) { // Multiple accounts for the same coin
         const auto coin = TWCoinTypeBitcoin;
 
         const auto btc2 = key.account(coin, TWDerivationBitcoinLegacy, wallet);
-        
+
         EXPECT_EQ(btc2.address, expectedBtc2);
         EXPECT_EQ(btc2.derivationPath.string(), "m/44'/0'/0'/0/0");
         EXPECT_EQ(btc2.extendedPublicKey, "xpub6CR52eaUuVb4kXAVyHC2i5ZuqJ37oWNPZFtjXaazFPXZD45DwWBYEBLdrF7fmCR9pgBuCA9Q57zZfyJjDUBDNtWkhWuGHNYKLgDHpqrHsxV");
diff --git a/tests/common/LiquidStaking/LiquidStakingTests.cpp b/tests/common/LiquidStaking/LiquidStakingTests.cpp
new file mode 100644
index 00000000000..ac5bad4c7b2
--- /dev/null
+++ b/tests/common/LiquidStaking/LiquidStakingTests.cpp
@@ -0,0 +1,771 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "LiquidStaking/LiquidStaking.h"
+#include "HexCoding.h"
+#include "Base64.h"
+#include "uint256.h"
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWLiquidStaking.h>
+#include <gtest/gtest.h>
+#include "TestUtilities.h"
+
+namespace TW::LiquidStaking::tests {
+    TEST(LiquidStaking, Coverage) {
+        auto output = LiquidStaking::generateError(Proto::OK);
+        ASSERT_EQ(output.code(), Proto::OK);
+    }
+
+    TEST(LiquidStaking, ErrorActionNotSet) {
+        Proto::Input input;
+        auto output = build(input);
+        ASSERT_EQ(output.status().code(), Proto::ERROR_ACTION_NOT_SET);
+    }
+
+    TEST(LiquidStaking, ErrorCanDeserializeInput) {
+        const auto inputData_ = data("Invalid");
+        const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+        const auto outputTWData_ = WRAPD(TWLiquidStakingBuildRequest(inputTWData_.get()));
+        Proto::Output outputProto;
+        const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+        EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+        ASSERT_EQ(outputProto.status().code(), Proto::ERROR_INPUT_PROTO_DESERIALIZATION);
+    }
+
+    TEST(LiquidStaking, PolygonStride) {
+        // TODO: code logic
+        Proto::Input input;
+        input.set_blockchain(Proto::STRIDE);
+        input.set_protocol(Proto::Stride);
+        Proto::Stake stake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::ATOM);
+        *stake.mutable_asset() = asset;
+        stake.set_amount("1000000");
+        *input.mutable_stake() = stake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+    }
+
+    TEST(LiquidStaking, PolygonStraderSmartContractAddressNotSet) {
+        Proto::Input input;
+        input.set_blockchain(Proto::POLYGON);
+        input.set_protocol(Proto::Strader);
+        Proto::Stake stake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::POL);
+        *stake.mutable_asset() = asset;
+        stake.set_amount("1000000000000000000");
+        *input.mutable_stake() = stake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::ERROR_SMART_CONTRACT_ADDRESS_NOT_SET);
+    }
+
+    TEST(LiquidStaking, PolygonStraderStakeInvalidBlockchain) {
+        Proto::Input input;
+        input.set_blockchain(Proto::Blockchain::STRIDE);
+        input.set_protocol(Proto::Strader);
+        input.set_smart_contract_address("0xfd225c9e6601c9d38d8f98d8731bf59efcf8c0e3");
+        Proto::Stake stake;
+        Proto::Asset asset;
+        *stake.mutable_asset() = asset;
+        stake.set_amount("1000000");
+        *input.mutable_stake() = stake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::ERROR_TARGETED_BLOCKCHAIN_NOT_SUPPORTED_BY_PROTOCOL);
+    }
+
+    TEST(LiquidStaking, PolygonStraderStakePol) {
+        Proto::Input input;
+        input.set_blockchain(Proto::POLYGON);
+        input.set_protocol(Proto::Strader);
+        input.set_smart_contract_address("0xfd225c9e6601c9d38d8f98d8731bf59efcf8c0e3");
+        Proto::Stake stake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::POL);
+        *stake.mutable_asset() = asset;
+        stake.set_amount("1000000000000000000");
+        *input.mutable_stake() = stake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto tx = *ls_output.mutable_ethereum();
+        ASSERT_TRUE(tx.transaction().has_contract_generic());
+        ASSERT_EQ(hex(tx.transaction().contract_generic().data(), true), "0xc78cf1a0");
+
+        auto fill_tx_functor = [](auto& tx){
+            // Following fields must be set afterwards, before signing ...
+            const auto chainId = store(uint256_t(137));
+            tx.set_chain_id(chainId.data(), chainId.size());
+            auto nonce = store(uint256_t(1));
+            tx.set_nonce(nonce.data(), nonce.size());
+            auto maxInclusionFeePerGas = store(uint256_t(35941173184));
+            auto maxFeePerGas = store(uint256_t(617347611864));
+            tx.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+            tx.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+            auto gasLimit = store(uint256_t(116000));
+            tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+            auto privKey = parse_hex("4a160b803c4392ea54865d0c5286846e7ad5e68fbd78880547697472b22ea7ab");
+            tx.set_private_key(privKey.data(), privKey.size());
+            // ... end
+        };
+
+        {
+            fill_tx_functor(tx);
+            Ethereum::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypePolygon);
+            EXPECT_EQ(hex(output.encoded()), "02f87a81890185085e42c7c0858fbcc8fcd88301c52094fd225c9e6601c9d38d8f98d8731bf59efcf8c0e3880de0b6b3a764000084c78cf1a0c001a04bcf92394d53d4908130cc6d4f7b2491967f9d6c59292b84c1f56adc49f6c458a073e09f45d64078c41a7946ffdb1dee8e604eb76f318088490f8f661bb7ddfc54");
+            // Successfully broadcasted https://polygonscan.com/tx/0x0f6c4f7a893c3f08be30d2ea24479d7ed4bdba40875d07cfd607cf97980b7cf0
+        }
+
+        // TW interface
+        {
+            const auto inputData_ = input.SerializeAsString();
+            EXPECT_EQ(hex(inputData_), "0a170a00121331303030303030303030303030303030303030222a3078666432323563396536363031633964333864386639386438373331626635396566636638633065333001");
+            const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+            const auto outputTWData_ = WRAPD(TWLiquidStakingBuildRequest(inputTWData_.get()));
+            const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+            EXPECT_EQ(outputData.size(), 68ul);
+            Proto::Output outputProto;
+            EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+            ASSERT_TRUE(outputProto.has_ethereum());
+            ASSERT_EQ(outputProto.status().code(), Proto::OK);
+            auto eth_tx = *ls_output.mutable_ethereum();
+            ASSERT_TRUE(eth_tx.transaction().has_contract_generic());
+            ASSERT_EQ(hex(eth_tx.transaction().contract_generic().data(), true), "0xc78cf1a0");
+            fill_tx_functor(eth_tx);
+            Ethereum::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypePolygon);
+            EXPECT_EQ(hex(output.encoded()), "02f87a81890185085e42c7c0858fbcc8fcd88301c52094fd225c9e6601c9d38d8f98d8731bf59efcf8c0e3880de0b6b3a764000084c78cf1a0c001a04bcf92394d53d4908130cc6d4f7b2491967f9d6c59292b84c1f56adc49f6c458a073e09f45d64078c41a7946ffdb1dee8e604eb76f318088490f8f661bb7ddfc54");
+            // Successfully broadcasted https://polygonscan.com/tx/0x0f6c4f7a893c3f08be30d2ea24479d7ed4bdba40875d07cfd607cf97980b7cf0
+        }
+    }
+
+    TEST(LiquidStaking, PolygonStraderUnStakePol) {
+        Proto::Input input;
+        input.set_blockchain(Proto::POLYGON);
+        input.set_protocol(Proto::Strader);
+        input.set_smart_contract_address("0xfd225c9e6601c9d38d8f98d8731bf59efcf8c0e3");
+        Proto::Unstake unstake;
+        Proto::Asset asset;
+        *unstake.mutable_asset() = asset;
+        unstake.set_amount("1000000000000000000");
+        *input.mutable_unstake() = unstake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto tx = *ls_output.mutable_ethereum();
+        ASSERT_TRUE(tx.transaction().has_contract_generic());
+        ASSERT_EQ(hex(tx.transaction().contract_generic().data(), true), "0x48eaf6d60000000000000000000000000000000000000000000000000de0b6b3a7640000");
+
+        // Following fields must be set afterwards, before signing ...
+        const auto chainId = store(uint256_t(137));
+        tx.set_chain_id(chainId.data(), chainId.size());
+        auto nonce = store(uint256_t(4));
+        tx.set_nonce(nonce.data(), nonce.size());
+        auto maxInclusionFeePerGas = store(uint256_t(35941173184));
+        auto maxFeePerGas = store(uint256_t(617347611864));
+        tx.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+        tx.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+        auto gasLimit = store(uint256_t(200000));
+        tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+        auto privKey = parse_hex("4a160b803c4392ea54865d0c5286846e7ad5e68fbd78880547697472b22ea7ab");
+        tx.set_private_key(privKey.data(), privKey.size());
+        // ... end
+
+        Ethereum::Proto::SigningOutput output;
+        ANY_SIGN(tx, TWCoinTypePolygon);
+        EXPECT_EQ(hex(output.encoded()), "02f89281890485085e42c7c0858fbcc8fcd883030d4094fd225c9e6601c9d38d8f98d8731bf59efcf8c0e380a448eaf6d60000000000000000000000000000000000000000000000000de0b6b3a7640000c001a0a0dd3f23758fbcc6f25c8e4396881ab6a1fb444e5a9531b1028b121407d4b79ca0618908f0f1aa79ce3f9e25cfe24a86fd8870c85e78b3730115c033f4f6678531");
+        // Successfully broadcasted https://polygonscan.com/tx/0xa66855e4af8e654e458915f59acd77e88706c01b59a3e4aed1363a665458368a
+    }
+
+    TEST(LiquidStaking, PolygonStraderWithdrawPol) {
+        Proto::Input input;
+        input.set_blockchain(Proto::POLYGON);
+        input.set_protocol(Proto::Strader);
+        input.set_smart_contract_address("0xfd225c9e6601c9d38d8f98d8731bf59efcf8c0e3");
+        Proto::Withdraw withdraw;
+        Proto::Asset asset;
+        *withdraw.mutable_asset() = asset;
+        withdraw.set_idx("0");
+        *input.mutable_withdraw() = withdraw;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto tx = *ls_output.mutable_ethereum();
+        ASSERT_TRUE(tx.transaction().has_contract_generic());
+        ASSERT_EQ(hex(tx.transaction().contract_generic().data(), true), "0x77baf2090000000000000000000000000000000000000000000000000000000000000000");
+
+        // Following fields must be set afterwards, before signing ...
+        const auto chainId = store(uint256_t(137));
+        tx.set_chain_id(chainId.data(), chainId.size());
+        auto nonce = store(uint256_t(6));
+        tx.set_nonce(nonce.data(), nonce.size());
+        auto maxInclusionFeePerGas = store(uint256_t(35941173184));
+        auto maxFeePerGas = store(uint256_t(678347611864));
+        tx.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+        tx.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+        auto gasLimit = store(uint256_t(200000));
+        tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+        auto privKey = parse_hex("4a160b803c4392ea54865d0c5286846e7ad5e68fbd78880547697472b22ea7ab");
+        tx.set_private_key(privKey.data(), privKey.size());
+        // ... end
+
+        Ethereum::Proto::SigningOutput output;
+        ANY_SIGN(tx, TWCoinTypePolygon);
+        EXPECT_EQ(hex(output.encoded()), "02f89281890685085e42c7c0859df0ab1ed883030d4094fd225c9e6601c9d38d8f98d8731bf59efcf8c0e380a477baf2090000000000000000000000000000000000000000000000000000000000000000c080a02c2440ded34fc9930e4d07a7c16d5a6d865b17e37dba61f3a94a3b78cd269a35a055cb8ba79645063f99e999b6ca44cd0ac26d6fd2b3acc8453a1c1c61de767559");
+        // Successfully broadcasted https://polygonscan.com/tx/0x61fa7b9051ddb9e2906130b0c5d94b8e3ecfc89b1fdfeff86042fbea851d8ba4
+    }
+
+    TEST(LiquidStaking, PolygonStraderStakeBnb) {
+        Proto::Input input;
+        input.set_blockchain(Proto::BNB_BSC);
+        input.set_protocol(Proto::Strader);
+        input.set_smart_contract_address("0x7276241a669489e4bbb76f63d2a43bfe63080f2f");
+        Proto::Stake stake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::BNB);
+        *stake.mutable_asset() = asset;
+        stake.set_amount("20000000000000000");
+        *input.mutable_stake() = stake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto tx = *ls_output.mutable_ethereum();
+        ASSERT_TRUE(tx.transaction().has_contract_generic());
+        ASSERT_EQ(hex(tx.transaction().contract_generic().data(), true), "0xd0e30db0");
+
+        // Following fields must be set afterwards, before signing ...
+        const auto chainId = store(uint256_t(56));
+        tx.set_chain_id(chainId.data(), chainId.size());
+        auto nonce = store(uint256_t(1));
+        tx.set_nonce(nonce.data(), nonce.size());
+        auto gasPrice = store(uint256_t(20000000000));
+        tx.set_gas_price(gasPrice.data(), gasPrice.size());
+        auto gasLimit = store(uint256_t(250000));
+        tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+        auto privKey = parse_hex("4a160b803c4392ea54865d0c5286846e7ad5e68fbd78880547697472b22ea7ab");
+        tx.set_private_key(privKey.data(), privKey.size());
+        // ... end
+
+        Ethereum::Proto::SigningOutput output;
+        ANY_SIGN(tx, TWCoinTypeSmartChain);
+        EXPECT_EQ(hex(output.encoded()), "f871018504a817c8008303d090947276241a669489e4bbb76f63d2a43bfe63080f2f87470de4df82000084d0e30db08193a0ec9bcc1b203477b9e5af8d0f9338de2af2553bb34ba693e79183708d6025e5c9a01e1c1f5d724fa2aa55464451bc0eee45b8522091048e6ac377db0b181e412a15");
+        // Successfully broadcasted https://bscscan.com/tx/0x17014f06b267f683d03d4d9cc2e5c1b182be05c14c3b9ffa0eaa3060bc859ba6
+    }
+
+    TEST(LiquidStaking, PolygonStraderUnStakeBnb) {
+        Proto::Input input;
+        input.set_blockchain(Proto::BNB_BSC);
+        input.set_protocol(Proto::Strader);
+        input.set_smart_contract_address("0x7276241a669489e4bbb76f63d2a43bfe63080f2f");
+        Proto::Unstake unstake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::BNB);
+        *unstake.mutable_asset() = asset;
+        unstake.set_amount("10000000000000000");
+        *input.mutable_unstake() = unstake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto tx = *ls_output.mutable_ethereum();
+        ASSERT_TRUE(tx.transaction().has_contract_generic());
+        ASSERT_EQ(hex(tx.transaction().contract_generic().data(), true), "0x745400c9000000000000000000000000000000000000000000000000002386f26fc10000");
+
+        // Following fields must be set afterwards, before signing ...
+        const auto chainId = store(uint256_t(56));
+        tx.set_chain_id(chainId.data(), chainId.size());
+        auto nonce = store(uint256_t(7));
+        tx.set_nonce(nonce.data(), nonce.size());
+        auto gasPrice = store(uint256_t(20000000000));
+        tx.set_gas_price(gasPrice.data(), gasPrice.size());
+        auto gasLimit = store(uint256_t(250000));
+        tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+        auto privKey = parse_hex("4a160b803c4392ea54865d0c5286846e7ad5e68fbd78880547697472b22ea7ab");
+        tx.set_private_key(privKey.data(), privKey.size());
+        // ... end
+
+        Ethereum::Proto::SigningOutput output;
+        ANY_SIGN(tx, TWCoinTypeSmartChain);
+        EXPECT_EQ(hex(output.encoded()), "f889078504a817c8008303d090947276241a669489e4bbb76f63d2a43bfe63080f2f80a4745400c9000000000000000000000000000000000000000000000000002386f26fc100008193a0a1b72a5c368e0591c488094e5f9a431b1be915310fb47c1c9312c247044310279f5fffeaf2e1659c841f31927b0e60870b455fa35e041ae29006472c87550c9d");
+        // Successfully broadcasted https://bscscan.com/tx/0x420b203b998d4de40e78ab7c6e80399d45a20620368c11c7d7d45820eeef3096
+    }
+
+    TEST(LiquidStaking, AptosTortugaStakeApt) {
+        // Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x25dca849cb4ebacbff223139f7ad5d24c37c225d9506b8b12a925de70429e685/userTxnOverview?network=mainnet
+        Proto::Input input;
+        input.set_blockchain(Proto::APTOS);
+        input.set_protocol(Proto::Tortuga);
+        input.set_smart_contract_address("0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f");
+        Proto::Stake stake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::APT);
+        *stake.mutable_asset() = asset;
+        stake.set_amount("100000000");
+        *input.mutable_stake() = stake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto& tx = *ls_output.mutable_aptos();
+
+        auto fill_tx_functor = [](auto& tx){
+            // Following fields must be set afterwards, before signing ...
+            tx.set_sender("0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc");
+            tx.set_sequence_number(19);
+            tx.set_max_gas_amount(5554);
+            tx.set_gas_unit_price(100);
+            tx.set_expiration_timestamp_secs(1670240203);
+            tx.set_chain_id(1);
+            auto privateKey = parse_hex("786fc7ceca43b4c1da018fea5d96f35dfdf5605f220b1205ff29c5c6d9eccf05");
+            tx.set_private_key(privateKey.data(), privateKey.size());
+        };
+
+        auto verify_tx_functor = [](auto& tx) {
+            EXPECT_EQ(hex(tx.raw_txn()), "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1300000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f75746572057374616b6500010800e1f50500000000b2150000000000006400000000000000cbd78d630000000001");
+            EXPECT_EQ(hex(tx.authenticator().signature()), "22d3166c3003f9c24a35fd39c71eb27e0d2bb82541be610822165c9283f56fefe5a9d46421b9caf174995bd8f83141e60ea8cff521ecf4741fe19e6ae9a5680d");
+            EXPECT_EQ(hex(tx.encoded()), "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1300000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f75746572057374616b6500010800e1f50500000000b2150000000000006400000000000000cbd78d630000000001002089e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc44022d3166c3003f9c24a35fd39c71eb27e0d2bb82541be610822165c9283f56fefe5a9d46421b9caf174995bd8f83141e60ea8cff521ecf4741fe19e6ae9a5680d");
+            nlohmann::json expectedJson = R"(
+                {
+                    "sender": "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+                    "sequence_number": "19",
+                    "max_gas_amount": "5554",
+                    "gas_unit_price": "100",
+                    "expiration_timestamp_secs": "1670240203",
+                    "payload": {
+                        "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::stake",
+                        "type_arguments": [],
+                        "arguments": [
+                            "100000000"
+                        ],
+                    "type": "entry_function_payload"
+                    },
+                    "signature": {
+                        "public_key": "0x89e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc4",
+                        "signature": "0x22d3166c3003f9c24a35fd39c71eb27e0d2bb82541be610822165c9283f56fefe5a9d46421b9caf174995bd8f83141e60ea8cff521ecf4741fe19e6ae9a5680d",
+                        "type": "ed25519_signature"
+                    }
+                }
+        )"_json;
+            nlohmann::json parsedJson = nlohmann::json::parse(tx.json());
+            assertJSONEqual(expectedJson, parsedJson);
+        };
+
+        {
+            fill_tx_functor(tx);
+            Aptos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeAptos);
+            verify_tx_functor(output);
+        }
+
+        // TW interface
+        {
+            const auto inputData_ = input.SerializeAsString();
+            EXPECT_EQ(hex(inputData_), "0a0f0a0208031209313030303030303030224230783866333936653432343662326261383762353163303733396566356561346632363531356139383337353330386333316163326563316534323134326135376628023004");
+            const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+            const auto outputTWData_ = WRAPD(TWLiquidStakingBuildRequest(inputTWData_.get()));
+            const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+            EXPECT_EQ(outputData.size(), 79ul);
+            Proto::Output outputProto;
+            EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+            ASSERT_TRUE(outputProto.has_aptos());
+            ASSERT_EQ(outputProto.status().code(), Proto::OK);
+            auto aptos_tx = *ls_output.mutable_aptos();
+            fill_tx_functor(aptos_tx);
+            Aptos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeAptos);
+            verify_tx_functor(output);
+        }
+    }
+
+    TEST(LiquidStaking, AptosTortugaUnstakeApt) {
+        // Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x92edb4f756fe86118e34a0e64746c70260ee02c2ae2cf402b3e39f6a282ce968?network=mainnet
+        Proto::Input input;
+        input.set_blockchain(Proto::APTOS);
+        input.set_protocol(Proto::Tortuga);
+        input.set_smart_contract_address("0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f");
+        Proto::Unstake unstake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::APT);
+        *unstake.mutable_asset() = asset;
+        unstake.set_amount("99178100");
+        *input.mutable_unstake() = unstake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto& tx = *ls_output.mutable_aptos();
+
+        auto fill_tx_functor = [](auto& tx){
+            // Following fields must be set afterwards, before signing ...
+            tx.set_sender("0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc");
+            tx.set_sequence_number(20);
+            tx.set_max_gas_amount(2371);
+            tx.set_gas_unit_price(120);
+            tx.set_expiration_timestamp_secs(1670304949);
+            tx.set_chain_id(1);
+            auto privateKey = parse_hex("786fc7ceca43b4c1da018fea5d96f35dfdf5605f220b1205ff29c5c6d9eccf05");
+            tx.set_private_key(privateKey.data(), privateKey.size());
+        };
+
+        auto verify_tx_functor = [](auto& tx) {
+            EXPECT_EQ(hex(tx.raw_txn()), "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1400000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657207756e7374616b650001087456e9050000000043090000000000007800000000000000b5d48e630000000001");
+            EXPECT_EQ(hex(tx.authenticator().signature()), "6994b917432ad70ae84d2ce1484e6aece589a68aad1b7c6e38c9697f2a012a083a3a755c5e010fd3d0f149a75dd8d257acbd09f10800e890074e5ad384314d0c");
+            EXPECT_EQ(hex(tx.encoded()), "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1400000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657207756e7374616b650001087456e9050000000043090000000000007800000000000000b5d48e630000000001002089e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc4406994b917432ad70ae84d2ce1484e6aece589a68aad1b7c6e38c9697f2a012a083a3a755c5e010fd3d0f149a75dd8d257acbd09f10800e890074e5ad384314d0c");
+            nlohmann::json expectedJson = R"(
+                {
+                    "sender": "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+                    "sequence_number": "20",
+                    "max_gas_amount": "2371",
+                    "gas_unit_price": "120",
+                    "expiration_timestamp_secs": "1670304949",
+                    "payload": {
+                        "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::unstake",
+                        "type_arguments": [],
+                        "arguments": [
+                            "99178100"
+                        ],
+                    "type": "entry_function_payload"
+                    },
+                    "signature": {
+                        "public_key": "0x89e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc4",
+                        "signature": "0x6994b917432ad70ae84d2ce1484e6aece589a68aad1b7c6e38c9697f2a012a083a3a755c5e010fd3d0f149a75dd8d257acbd09f10800e890074e5ad384314d0c",
+                        "type": "ed25519_signature"
+                    }
+                }
+        )"_json;
+            nlohmann::json parsedJson = nlohmann::json::parse(tx.json());
+            assertJSONEqual(expectedJson, parsedJson);
+        };
+
+        {
+            fill_tx_functor(tx);
+            Aptos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeAptos);
+            verify_tx_functor(output);
+        }
+
+        // TW interface
+        {
+            const auto inputData_ = input.SerializeAsString();
+            EXPECT_EQ(hex(inputData_), "120e0a02080312083939313738313030224230783866333936653432343662326261383762353163303733396566356561346632363531356139383337353330386333316163326563316534323134326135376628023004");
+            const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+            const auto outputTWData_ = WRAPD(TWLiquidStakingBuildRequest(inputTWData_.get()));
+            const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+            EXPECT_EQ(outputData.size(), 79ul);
+            Proto::Output outputProto;
+            EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+            ASSERT_TRUE(outputProto.has_aptos());
+            ASSERT_EQ(outputProto.status().code(), Proto::OK);
+            auto aptos_tx = *ls_output.mutable_aptos();
+            fill_tx_functor(aptos_tx);
+            Aptos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeAptos);
+            verify_tx_functor(output);
+        }
+    }
+
+    TEST(LiquidStaking, AptosTortugaWithdrawApt) {
+        // Successfully broadcasted: https://explorer.aptoslabs.com/txn/0x9fc874de7a7d3e813d9a1658d896023de270a0096a5e258c196005656ace7d54?network=mainnet
+        Proto::Input input;
+        input.set_blockchain(Proto::APTOS);
+        input.set_protocol(Proto::Tortuga);
+        input.set_smart_contract_address("0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f");
+        Proto::Withdraw withdraw;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::APT);
+        *withdraw.mutable_asset() = asset;
+        withdraw.set_idx("0");
+        *input.mutable_withdraw() = withdraw;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto& tx = *ls_output.mutable_aptos();
+
+        auto fill_tx_functor = [](auto& tx){
+            // Following fields must be set afterwards, before signing ...
+            tx.set_sender("0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc");
+            tx.set_sequence_number(28);
+            tx.set_max_gas_amount(10);
+            tx.set_gas_unit_price(148);
+            tx.set_expiration_timestamp_secs(1682066783);
+            tx.set_chain_id(1);
+            auto privateKey = parse_hex("786fc7ceca43b4c1da018fea5d96f35dfdf5605f220b1205ff29c5c6d9eccf05");
+            tx.set_private_key(privateKey.data(), privateKey.size());
+        };
+
+        auto verify_tx_functor = [](auto& tx) {
+            EXPECT_EQ(hex(tx.raw_txn()), "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1c00000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657205636c61696d00010800000000000000000a0000000000000094000000000000005f4d42640000000001");
+            EXPECT_EQ(hex(tx.authenticator().signature()), "c936584f89777e1fe2d5dd75cd8d9c514efc445810ba22f462b6fe7229c6ec7fc1c8b25d3e233eafaa8306433b3220235e563498ba647be38cac87ff618e3d03");
+            EXPECT_EQ(hex(tx.encoded()), "f3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc1c00000000000000028f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f0c7374616b655f726f7574657205636c61696d00010800000000000000000a0000000000000094000000000000005f4d42640000000001002089e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc440c936584f89777e1fe2d5dd75cd8d9c514efc445810ba22f462b6fe7229c6ec7fc1c8b25d3e233eafaa8306433b3220235e563498ba647be38cac87ff618e3d03");
+            nlohmann::json expectedJson = R"(
+                {
+                    "sender": "0xf3d7f364dd7705824a5ebda9c7aab6cb3fc7bb5b58718249f12defec240b36cc",
+                    "sequence_number": "28",
+                    "max_gas_amount": "10",
+                    "gas_unit_price": "148",
+                    "expiration_timestamp_secs": "1682066783",
+                    "payload": {
+                        "function": "0x8f396e4246b2ba87b51c0739ef5ea4f26515a98375308c31ac2ec1e42142a57f::stake_router::claim",
+                        "type_arguments": [],
+                        "arguments": [
+                            "0"
+                        ],
+                        "type": "entry_function_payload"
+                    },
+                    "signature": {
+                        "public_key": "0x89e0211d7e19c7d3a8e2030fe16c936a690ca9b95569098c5d2bf1031ff44bc4",
+                        "signature": "0xc936584f89777e1fe2d5dd75cd8d9c514efc445810ba22f462b6fe7229c6ec7fc1c8b25d3e233eafaa8306433b3220235e563498ba647be38cac87ff618e3d03",
+                        "type": "ed25519_signature"
+                    }
+                }
+        )"_json;
+            nlohmann::json parsedJson = nlohmann::json::parse(tx.json());
+            assertJSONEqual(expectedJson, parsedJson);
+        };
+
+        {
+            fill_tx_functor(tx);
+            Aptos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeAptos);
+            verify_tx_functor(output);
+        }
+
+        // TW interface
+        {
+            const auto inputData_ = input.SerializeAsString();
+            EXPECT_EQ(hex(inputData_), "1a070a0208031a0130224230783866333936653432343662326261383762353163303733396566356561346632363531356139383337353330386333316163326563316534323134326135376628023004");
+            const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+            const auto outputTWData_ = WRAPD(TWLiquidStakingBuildRequest(inputTWData_.get()));
+            const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+            EXPECT_EQ(outputData.size(), 74ul);
+            Proto::Output outputProto;
+            EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+            ASSERT_TRUE(outputProto.has_aptos());
+            ASSERT_EQ(outputProto.status().code(), Proto::OK);
+            auto aptos_tx = *ls_output.mutable_aptos();
+            fill_tx_functor(aptos_tx);
+            Aptos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeAptos);
+            verify_tx_functor(output);
+        }
+    }
+
+    TEST(LiquidStaking, StrideStakeAtom) {
+        Proto::Input input;
+        input.set_blockchain(Proto::STRIDE);
+        input.set_protocol(Proto::Stride);
+        Proto::Stake stake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::ATOM);
+        asset.set_denom("uatom");
+        asset.set_from_address("stride1mry47pkga5tdswtluy0m8teslpalkdq0a2sjge");
+        *stake.mutable_asset() = asset;
+        stake.set_amount("100000");
+        *input.mutable_stake() = stake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        ASSERT_TRUE(ls_output.has_cosmos());
+        auto tx = *ls_output.mutable_cosmos();
+
+        auto fill_tx_functor = [](auto& tx){
+            // Following fields must be set afterwards, before signing ...tx
+            auto privateKey = parse_hex("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+            tx.set_signing_mode(Cosmos::Proto::Protobuf);
+            tx.set_account_number(136412);
+            tx.set_chain_id("stride-1");
+            tx.set_memo("");
+            tx.set_sequence(0);
+            tx.set_private_key(privateKey.data(), privateKey.size());
+
+            auto& fee = *tx.mutable_fee();
+            fee.set_gas(500000);
+            auto amountOfFee = fee.add_amounts();
+            amountOfFee->set_denom("ustrd");
+            amountOfFee->set_amount("0");
+        };
+
+        auto verify_tx_functor = [](auto& tx) {
+            // Successfully broadcasted: https://www.mintscan.io/stride/txs/48E51A2571D99453C4581B30CECA2A1156C0D1EBACCD3619729B5A35AD67CC94?height=3485243
+            auto expectedJson = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CmMKYQofL3N0cmlkZS5zdGFrZWliYy5Nc2dMaXF1aWRTdGFrZRI+Ci1zdHJpZGUxbXJ5NDdwa2dhNXRkc3d0bHV5MG04dGVzbHBhbGtkcTBhMnNqZ2USBjEwMDAwMBoFdWF0b20SYgpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAsv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarlEgQKAggBEhAKCgoFdXN0cmQSATAQoMIeGkCDaZHV5/Z3CAQC5DXkaHmF6OKUiS5XKDsl3ZnBaaVuJjlSWV2vA7MPwGbC17P6jbVJt58ZLcxIWFt76UO3y1ix"
+                })";
+            assertJSONEqual(tx.serialized(), expectedJson);
+            EXPECT_EQ(hex(tx.signature()), "836991d5e7f677080402e435e4687985e8e294892e57283b25dd99c169a56e263952595daf03b30fc066c2d7b3fa8db549b79f192dcc48585b7be943b7cb58b1");
+            EXPECT_EQ(tx.json(), "");
+            EXPECT_EQ(tx.error_message(), "");
+        };
+
+        {
+            fill_tx_functor(tx);
+            Cosmos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeStride);
+            verify_tx_functor(output);
+        }
+
+        {
+            const auto inputData_ = input.SerializeAsString();
+            EXPECT_EQ(hex(inputData_), "0a420a3808011a057561746f6d222d737472696465316d72793437706b67613574647377746c7579306d387465736c70616c6b6471306132736a6765120631303030303028013002");
+            const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+            const auto outputTWData_ = WRAPD(TWLiquidStakingBuildRequest(inputTWData_.get()));
+            const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+            EXPECT_EQ(outputData.size(), 69ul);
+            Proto::Output outputProto;
+            EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+            ASSERT_TRUE(outputProto.has_cosmos());
+            ASSERT_EQ(outputProto.status().code(), Proto::OK);
+            auto aptos_tx = *ls_output.mutable_cosmos();
+            fill_tx_functor(aptos_tx);
+            Cosmos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeStride);
+            verify_tx_functor(output);
+        }
+    }
+
+    TEST(LiquidStaking, StrideUnstakeAtom) {
+        Proto::Input input;
+        input.set_blockchain(Proto::STRIDE);
+        input.set_protocol(Proto::Stride);
+        Proto::Unstake unstake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::ATOM);
+        asset.set_from_address("stride1mry47pkga5tdswtluy0m8teslpalkdq0a2sjge");
+        *unstake.mutable_asset() = asset;
+        unstake.set_amount("40000");
+        unstake.set_receiver_chain_id("cosmoshub-4");
+        unstake.set_receiver_address("cosmos1mry47pkga5tdswtluy0m8teslpalkdq07pswu4");
+        *input.mutable_unstake() = unstake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        ASSERT_TRUE(ls_output.has_cosmos());
+        auto tx = *ls_output.mutable_cosmos();
+
+        auto fill_tx_functor = [](auto& tx){
+            // Following fields must be set afterwards, before signing ...tx
+            auto privateKey = parse_hex("a498a9ee41af9bab5ef2a8be63d5c970135c3c109e70efc8c56c534e6636b433");
+            tx.set_signing_mode(Cosmos::Proto::Protobuf);
+            tx.set_account_number(136412);
+            tx.set_chain_id("stride-1");
+            tx.set_memo("");
+            tx.set_sequence(1);
+            tx.set_private_key(privateKey.data(), privateKey.size());
+
+            auto& fee = *tx.mutable_fee();
+            fee.set_gas(1000000);
+            auto amountOfFee = fee.add_amounts();
+            amountOfFee->set_denom("ustrd");
+            amountOfFee->set_amount("0");
+        };
+
+        auto verify_tx_functor = [](auto& tx) {
+            // Successfully broadcasted: https://www.mintscan.io/stride/txs/B3D3A92A2FFB92A480A4B547A4303E6932204972A965D687DB4FB6B4E16B2C42?height=3485343
+            auto expectedJson = R"(
+                {
+                    "mode":"BROADCAST_MODE_BLOCK",
+                    "tx_bytes":"CpgBCpUBCh8vc3RyaWRlLnN0YWtlaWJjLk1zZ1JlZGVlbVN0YWtlEnIKLXN0cmlkZTFtcnk0N3BrZ2E1dGRzd3RsdXkwbTh0ZXNscGFsa2RxMGEyc2pnZRIFNDAwMDAaC2Nvc21vc2h1Yi00Ii1jb3Ntb3MxbXJ5NDdwa2dhNXRkc3d0bHV5MG04dGVzbHBhbGtkcTA3cHN3dTQSZApQCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAsv9teRyiTMiKU5gzwiD1D30MeEInSnstEep5tVQRarlEgQKAggBGAESEAoKCgV1c3RyZBIBMBDAhD0aQKf84TYoPqwnXw22r0dok2fYplUFu003TlIfpoT+wqTZF1lHPC+RTAoJob6x50CnfvGlgJFBEQYPD+Ccv659VVA="
+                })";
+            assertJSONEqual(tx.serialized(), expectedJson);
+            EXPECT_EQ(TW::Base64::encode(data(tx.signature())), "p/zhNig+rCdfDbavR2iTZ9imVQW7TTdOUh+mhP7CpNkXWUc8L5FMCgmhvrHnQKd+8aWAkUERBg8P4Jy/rn1VUA==");
+            EXPECT_EQ(tx.json(), "");
+            EXPECT_EQ(tx.error_message(), "");
+        };
+
+        {
+            fill_tx_functor(tx);
+            Cosmos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeStride);
+            verify_tx_functor(output);
+        }
+
+        {
+            const auto inputData_ = input.SerializeAsString();
+            EXPECT_EQ(hex(inputData_), "12760a310801222d737472696465316d72793437706b67613574647377746c7579306d387465736c70616c6b6471306132736a6765120534303030301a2d636f736d6f73316d72793437706b67613574647377746c7579306d387465736c70616c6b647130377073777534220b636f736d6f736875622d3428013002");
+            const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+            const auto outputTWData_ = WRAPD(TWLiquidStakingBuildRequest(inputTWData_.get()));
+            const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+            EXPECT_EQ(outputData.size(), 121ul);
+            Proto::Output outputProto;
+            EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+            ASSERT_TRUE(outputProto.has_cosmos());
+            ASSERT_EQ(outputProto.status().code(), Proto::OK);
+            auto aptos_tx = *ls_output.mutable_cosmos();
+            fill_tx_functor(aptos_tx);
+            Cosmos::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeStride);
+            verify_tx_functor(output);
+        }
+    }
+
+    TEST(LiquidStaking, EthereumLidoStakeEth) {
+        Proto::Input input;
+        input.set_blockchain(Proto::ETHEREUM);
+        input.set_protocol(Proto::Lido);
+        input.set_smart_contract_address("0xae7ab96520DE3A18E5e111B5EaAb095312D7fE84");
+        Proto::Stake stake;
+        Proto::Asset asset;
+        asset.set_staking_token(Proto::ETH);
+        *stake.mutable_asset() = asset;
+        stake.set_amount("1000000000000000");
+        *input.mutable_stake() = stake;
+
+        auto ls_output = build(input);
+        ASSERT_EQ(ls_output.status().code(), Proto::OK);
+        auto tx = *ls_output.mutable_ethereum();
+        ASSERT_TRUE(tx.transaction().has_contract_generic());
+        ASSERT_EQ(hex(tx.transaction().contract_generic().data(), true), "0xa1903eab0000000000000000000000000000000000000000000000000000000000000000");
+
+        auto fill_tx_functor = [](auto& tx){
+            // Following fields must be set afterwards, before signing ...
+            const auto chainId = store(uint256_t(1));
+            tx.set_chain_id(chainId.data(), chainId.size());
+            auto nonce = store(uint256_t(0));
+            tx.set_nonce(nonce.data(), nonce.size());
+            auto maxInclusionFeePerGas = store(uint256_t(1500000000));
+            auto maxFeePerGas = store(uint256_t(109039719380));
+            tx.set_max_inclusion_fee_per_gas(maxInclusionFeePerGas.data(), maxInclusionFeePerGas.size());
+            tx.set_max_fee_per_gas(maxFeePerGas.data(), maxFeePerGas.size());
+            auto gasLimit = store(uint256_t(117093));
+            tx.set_gas_limit(gasLimit.data(), gasLimit.size());
+            auto privKey = parse_hex("d68f3ae9c5b3974d27e606eb9fd8e03cf172380307dd0fe1273394b40c8b33aa");
+            tx.set_private_key(privKey.data(), privKey.size());
+            // ... end
+        };
+
+        {
+            fill_tx_functor(tx);
+            Ethereum::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeEthereum);
+            EXPECT_EQ(hex(output.encoded()), "02f89701808459682f008519634613d48301c96594ae7ab96520de3a18e5e111b5eaab095312d7fe8487038d7ea4c68000a4a1903eab0000000000000000000000000000000000000000000000000000000000000000c001a0daace8c05277cf7eaff3f03a4e1ba7edadab20407674d1b659f5c13f89a04087a0528b5d4499b67a50989b6397e530be23515532732b54d60c4a4d726e499e046a");
+            // Successfully broadcasted https://etherscan.io/tx/0x4d509fd50f474a568419ade4df13b43943b5c8233e980d2217784c512941b3bd
+        }
+
+        // TW interface
+        {
+            const auto inputData_ = input.SerializeAsString();
+            EXPECT_EQ(hex(inputData_), "0a160a020804121031303030303030303030303030303030222a3078616537616239363532304445334131384535653131314235456141623039353331324437664538342803");
+            const auto inputTWData_ = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData_.data(), inputData_.size()));
+            const auto outputTWData_ = WRAPD(TWLiquidStakingBuildRequest(inputTWData_.get()));
+            const auto outputData = data(TWDataBytes(outputTWData_.get()), TWDataSize(outputTWData_.get()));
+            EXPECT_EQ(outputData.size(), 99ul);
+            Proto::Output outputProto;
+            EXPECT_TRUE(outputProto.ParseFromArray(outputData.data(), static_cast<int>(outputData.size())));
+            ASSERT_TRUE(outputProto.has_ethereum());
+            ASSERT_EQ(outputProto.status().code(), Proto::OK);
+            auto eth_tx = *ls_output.mutable_ethereum();
+            ASSERT_TRUE(eth_tx.transaction().has_contract_generic());
+            ASSERT_EQ(hex(eth_tx.transaction().contract_generic().data(), true), "0xa1903eab0000000000000000000000000000000000000000000000000000000000000000");
+            fill_tx_functor(eth_tx);
+            Ethereum::Proto::SigningOutput output;
+            ANY_SIGN(tx, TWCoinTypeEthereum);
+            EXPECT_EQ(hex(output.encoded()), "02f89701808459682f008519634613d48301c96594ae7ab96520de3a18e5e111b5eaab095312d7fe8487038d7ea4c68000a4a1903eab0000000000000000000000000000000000000000000000000000000000000000c001a0daace8c05277cf7eaff3f03a4e1ba7edadab20407674d1b659f5c13f89a04087a0528b5d4499b67a50989b6397e530be23515532732b54d60c4a4d726e499e046a");
+            // Successfully broadcasted https://etherscan.io/tx/0x4d509fd50f474a568419ade4df13b43943b5c8233e980d2217784c512941b3bd
+        }
+    }
+}
diff --git a/tests/MnemonicTests.cpp b/tests/common/MnemonicTests.cpp
similarity index 94%
rename from tests/MnemonicTests.cpp
rename to tests/common/MnemonicTests.cpp
index c82b08a82f5..bb0b86a55ac 100644
--- a/tests/MnemonicTests.cpp
+++ b/tests/common/MnemonicTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Mnemonic.h"
 
diff --git a/tests/common/NumericLiteralTests.cpp b/tests/common/NumericLiteralTests.cpp
new file mode 100644
index 00000000000..ef1dcee68dd
--- /dev/null
+++ b/tests/common/NumericLiteralTests.cpp
@@ -0,0 +1,12 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "NumericLiteral.h"
+
+#include <gtest/gtest.h>
+
+TEST(UzLitteralOperator, SizetEquality) {
+    [[maybe_unused]] auto size = 42_uz;
+    static_assert(std::is_same_v<decltype(size), std::size_t>);
+}
\ No newline at end of file
diff --git a/tests/PrivateKeyTests.cpp b/tests/common/PrivateKeyTests.cpp
similarity index 78%
rename from tests/PrivateKeyTests.cpp
rename to tests/common/PrivateKeyTests.cpp
index f969ce40c8e..fa9ec36aea3 100644
--- a/tests/PrivateKeyTests.cpp
+++ b/tests/common/PrivateKeyTests.cpp
@@ -1,13 +1,13 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Hash.h"
 #include "HexCoding.h"
 #include "PrivateKey.h"
+#include <TrezorCrypto/rand.h>
 #include "PublicKey.h"
+#include "PublicKeyLegacy.h"
 
 #include <gtest/gtest.h>
 
@@ -221,77 +221,6 @@ TEST(PrivateKey, PrivateKeyExtendedError) {
     FAIL() << "Should throw Invalid empty key extension";
 }
 
-TEST(PrivateKey, getSharedKey) {
-    Data privKeyData = parse_hex("9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0");
-    EXPECT_TRUE(PrivateKey::isValid(privKeyData, TWCurveSECP256k1));
-    auto privateKey = PrivateKey(privKeyData);
-
-    const Data pubKeyData = parse_hex("02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992");
-    EXPECT_TRUE(PublicKey::isValid(pubKeyData, TWPublicKeyTypeSECP256k1));
-    PublicKey publicKey(pubKeyData, TWPublicKeyTypeSECP256k1);
-    EXPECT_TRUE(publicKey.isCompressed());
-
-    const Data derivedKeyData = privateKey.getSharedKey(publicKey, TWCurveSECP256k1);
-
-    EXPECT_EQ(
-        "ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a",
-        hex(derivedKeyData));
-}
-
-/**
- * Valid test vector from Wycherproof project
- * Source: https://github.com/google/wycheproof/blob/master/testvectors/ecdh_secp256k1_test.json#L31
- */
-TEST(PrivateKey, getSharedKeyWycherproof) {
-    // Stripped left-padded zeroes from: `00f4b7ff7cccc98813a69fae3df222bfe3f4e28f764bf91b4a10d8096ce446b254`
-    Data privKeyData = parse_hex("f4b7ff7cccc98813a69fae3df222bfe3f4e28f764bf91b4a10d8096ce446b254");
-    EXPECT_TRUE(PrivateKey::isValid(privKeyData, TWCurveSECP256k1));
-    auto privateKey = PrivateKey(privKeyData);
-
-    // Decoded from ASN.1 & uncompressed `3056301006072a8648ce3d020106052b8104000a03420004d8096af8a11e0b80037e1ee68246b5dcbb0aeb1cf1244fd767db80f3fa27da2b396812ea1686e7472e9692eaf3e958e50e9500d3b4c77243db1f2acd67ba9cc4`
-    const Data pubKeyData = parse_hex("02d8096af8a11e0b80037e1ee68246b5dcbb0aeb1cf1244fd767db80f3fa27da2b");
-    EXPECT_TRUE(PublicKey::isValid(pubKeyData, TWPublicKeyTypeSECP256k1));
-    PublicKey publicKey(pubKeyData, TWPublicKeyTypeSECP256k1);
-    EXPECT_TRUE(publicKey.isCompressed());
-
-    const Data derivedKeyData = privateKey.getSharedKey(publicKey, TWCurveSECP256k1);
-
-    // SHA-256 of encoded x-coordinate `02544dfae22af6af939042b1d85b71a1e49e9a5614123c4d6ad0c8af65baf87d65`
-    EXPECT_EQ(
-        "81165066322732362ca5d3f0991d7f1f7d0aad7ea533276496785d369e35159a",
-        hex(derivedKeyData));
-}
-
-TEST(PrivateKey, getSharedKeyBidirectional) {
-    Data privKeyData1 = parse_hex("9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0");
-    EXPECT_TRUE(PrivateKey::isValid(privKeyData1, TWCurveSECP256k1));
-    auto privateKey1 = PrivateKey(privKeyData1);
-    auto publicKey1 = privateKey1.getPublicKey(TWPublicKeyTypeSECP256k1);
-
-    Data privKeyData2 = parse_hex("ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a");
-    EXPECT_TRUE(PrivateKey::isValid(privKeyData2, TWCurveSECP256k1));
-    auto privateKey2 = PrivateKey(privKeyData2);
-    auto publicKey2 = privateKey2.getPublicKey(TWPublicKeyTypeSECP256k1);
-
-    const Data derivedKeyData1 = privateKey1.getSharedKey(publicKey2, TWCurveSECP256k1);
-    const Data derivedKeyData2 = privateKey2.getSharedKey(publicKey1, TWCurveSECP256k1);
-
-    EXPECT_EQ(hex(derivedKeyData1), hex(derivedKeyData2));
-}
-
-TEST(PrivateKey, getSharedKeyError) {
-    Data privKeyData = parse_hex("9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0");
-    auto privateKey = PrivateKey(privKeyData);
-
-    const Data pubKeyData = parse_hex("02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992");
-    PublicKey publicKey(pubKeyData, TWPublicKeyTypeSECP256k1);
-
-    const Data derivedKeyData = privateKey.getSharedKey(publicKey, TWCurveCurve25519);
-    const Data expected = {};
-
-    EXPECT_EQ(expected, derivedKeyData);
-}
-
 TEST(PrivateKey, SignSECP256k1) {
     Data privKeyData = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
     auto privateKey = PrivateKey(privKeyData);
@@ -338,6 +267,25 @@ TEST(PrivateKey, SignNIST256p1) {
         hex(actual));
 }
 
+TEST(PrivateKey, SignNIST256p1VerifyLegacy) {
+    for (auto i = 0; i < 1000; ++i) {
+        Data secret(32);
+        random_buffer(secret.data(), 32);
+
+        Data msg(32);
+        random_buffer(msg.data(), 32);
+
+        PrivateKey privateKey(secret);
+        auto signature = privateKey.sign(msg, TWCurveNIST256p1);
+
+        auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1);
+        EXPECT_TRUE(TrezorCrypto::verifyNist256p1Signature(publicKey.bytes, signature, msg))
+            << "Error verifying nist256p1 signature" << std::endl
+            << "Private key: " << hex(secret) << std::endl
+            << "Message: " << hex(msg);
+    }
+}
+
 int isCanonical([[maybe_unused]] uint8_t by, [[maybe_unused]] uint8_t sig[64]) {
     return 1;
 }
diff --git a/tests/common/PublicKeyLegacy.h b/tests/common/PublicKeyLegacy.h
new file mode 100644
index 00000000000..33007667c76
--- /dev/null
+++ b/tests/common/PublicKeyLegacy.h
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <TrezorCrypto/ecdsa.h>
+#include <TrezorCrypto/nist256p1.h>
+#include "Data.h"
+
+namespace TW::TrezorCrypto {
+
+/// Verifies a signature for the provided message by using `trezor-crypto` library (legacy implementation).
+inline bool verifyNist256p1Signature(const Data& publicKey, const Data& signature, const Data& message) {
+    return ecdsa_verify_digest(&nist256p1, publicKey.data(), signature.data(), message.data()) == 0;
+}
+
+} // namespace TW::TrezorCrypto
diff --git a/tests/common/PublicKeyTests.cpp b/tests/common/PublicKeyTests.cpp
new file mode 100644
index 00000000000..d73c1c1ac8a
--- /dev/null
+++ b/tests/common/PublicKeyTests.cpp
@@ -0,0 +1,366 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "PublicKey.h"
+
+#include "Hash.h"
+#include "HexCoding.h"
+#include "PrivateKey.h"
+#include "TestUtilities.h"
+
+#include <gtest/gtest.h>
+
+using namespace TW;
+
+TEST(PublicKeyTests, CreateFromPrivateSecp256k1) {
+    const Data key = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
+    auto privateKey = PrivateKey(key);
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(publicKey.bytes.size(), 33ul);
+    EXPECT_EQ(hex(publicKey.bytes), "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1");
+    EXPECT_EQ(publicKey.isCompressed(), true);
+    EXPECT_TRUE(PublicKey::isValid(publicKey.bytes, TWPublicKeyTypeSECP256k1));
+}
+
+TEST(PublicKeyTests, CreateFromDataSecp256k1) {
+    const Data key = parse_hex("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1");
+    PublicKey publicKey(key, TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(hex(publicKey.bytes), hex(key));
+}
+
+TEST(PublicKeyTests, CreateInvalid) {
+    const Data keyInvalid = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32af"); // too short
+    try {
+        PublicKey publicKey(keyInvalid, TWPublicKeyTypeSECP256k1);
+    } catch (const std::invalid_argument&) {
+        return; // OK
+    }
+    FAIL() << "Missing expected exception";
+}
+
+TEST(PublicKeyTests, CreateBlake) {
+    const auto privateKeyHex = "afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5";
+    const auto publicKeyKeyHex = "b689ab808542e13f3d2ec56fe1efe43a1660dcadc73ce489fde7df98dd8ce5d9";
+    {
+        auto publicKey = PrivateKey(parse_hex(privateKeyHex)).getPublicKey(TWPublicKeyTypeED25519Blake2b);
+        EXPECT_EQ(hex(publicKey.bytes), publicKeyKeyHex);
+        EXPECT_EQ(publicKey.bytes.size(), 32ul);
+    }
+    {
+        const auto publicKey = PublicKey(parse_hex(publicKeyKeyHex), TWPublicKeyTypeED25519Blake2b);
+        EXPECT_EQ(hex(publicKey.bytes), publicKeyKeyHex);
+    }
+}
+
+TEST(PublicKeyTests, CompressedExtended) {
+    const Data key = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
+    auto privateKey = PrivateKey(key);
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(publicKey.type, TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(publicKey.bytes.size(), 33ul);
+    EXPECT_EQ(publicKey.isCompressed(), true);
+    EXPECT_TRUE(PublicKey::isValid(publicKey.bytes, TWPublicKeyTypeSECP256k1));
+    EXPECT_EQ(hex(publicKey.bytes), std::string("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1"));
+
+    auto extended = publicKey.extended();
+    EXPECT_EQ(extended.type, TWPublicKeyTypeSECP256k1Extended);
+    EXPECT_EQ(extended.bytes.size(), 65ul);
+    EXPECT_EQ(extended.isCompressed(), false);
+    EXPECT_TRUE(PublicKey::isValid(extended.bytes, TWPublicKeyTypeSECP256k1Extended));
+    EXPECT_EQ(hex(extended.bytes), std::string("0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91"));
+
+    auto compressed = extended.compressed();
+    EXPECT_EQ(compressed.type, TWPublicKeyTypeSECP256k1);
+    EXPECT_TRUE(compressed == publicKey);
+    EXPECT_EQ(compressed.bytes.size(), 33ul);
+    EXPECT_EQ(compressed.isCompressed(), true);
+    EXPECT_TRUE(PublicKey::isValid(compressed.bytes, TWPublicKeyTypeSECP256k1));
+    EXPECT_EQ(hex(compressed.bytes), std::string("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1"));
+
+    auto extended2 = extended.extended();
+    EXPECT_EQ(extended2.type, TWPublicKeyTypeSECP256k1Extended);
+    EXPECT_EQ(extended2.bytes.size(), 65ul);
+    EXPECT_EQ(extended2.isCompressed(), false);
+
+    auto compressed2 = compressed.compressed();
+    EXPECT_EQ(compressed2.type, TWPublicKeyTypeSECP256k1);
+    EXPECT_TRUE(compressed2 == publicKey);
+    EXPECT_EQ(compressed2.bytes.size(), 33ul);
+    EXPECT_EQ(compressed2.isCompressed(), true);
+}
+
+TEST(PublicKeyTests, CompressedExtendedNist) {
+    const Data key = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
+    auto privateKey = PrivateKey(key);
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1);
+    EXPECT_EQ(publicKey.type, TWPublicKeyTypeNIST256p1);
+    EXPECT_EQ(publicKey.bytes.size(), 33ul);
+    EXPECT_EQ(publicKey.isCompressed(), true);
+    EXPECT_TRUE(PublicKey::isValid(publicKey.bytes, TWPublicKeyTypeNIST256p1));
+    EXPECT_EQ(hex(publicKey.bytes), std::string("026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab"));
+
+    auto extended = publicKey.extended();
+    EXPECT_EQ(extended.type, TWPublicKeyTypeNIST256p1Extended);
+    EXPECT_EQ(extended.bytes.size(), 65ul);
+    EXPECT_EQ(extended.isCompressed(), false);
+    EXPECT_TRUE(PublicKey::isValid(extended.bytes, TWPublicKeyTypeNIST256p1Extended));
+    EXPECT_EQ(hex(extended.bytes), std::string("046d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab918b4fe46ccbf56701fb210d67d91c5779468f6b3fdc7a63692b9b62543f47ae"));
+
+    auto compressed = extended.compressed();
+    EXPECT_EQ(compressed.type, TWPublicKeyTypeNIST256p1);
+    EXPECT_TRUE(compressed == publicKey);
+    EXPECT_EQ(compressed.bytes.size(), 33ul);
+    EXPECT_EQ(compressed.isCompressed(), true);
+    EXPECT_TRUE(PublicKey::isValid(compressed.bytes, TWPublicKeyTypeNIST256p1));
+    EXPECT_EQ(hex(compressed.bytes), std::string("026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab"));
+
+    auto extended2 = extended.extended();
+    EXPECT_EQ(extended2.type, TWPublicKeyTypeNIST256p1Extended);
+    EXPECT_EQ(extended2.bytes.size(), 65ul);
+    EXPECT_EQ(extended2.isCompressed(), false);
+
+    auto compressed2 = compressed.compressed();
+    EXPECT_EQ(compressed2.type, TWPublicKeyTypeNIST256p1);
+    EXPECT_TRUE(compressed2 == publicKey);
+    EXPECT_EQ(compressed2.bytes.size(), 33ul);
+    EXPECT_EQ(compressed2.isCompressed(), true);
+}
+
+TEST(PublicKeyTests, CompressedExtendedED25519) {
+    const Data key = parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5");
+    auto privateKey = PrivateKey(key);
+    auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+    EXPECT_EQ(publicKey.type, TWPublicKeyTypeED25519);
+    EXPECT_EQ(publicKey.bytes.size(), 32ul);
+    EXPECT_EQ(publicKey.isCompressed(), true);
+    EXPECT_TRUE(PublicKey::isValid(publicKey.bytes, TWPublicKeyTypeED25519));
+    EXPECT_EQ(hex(publicKey.bytes), std::string("4870d56d074c50e891506d78faa4fb69ca039cc5f131eb491e166b975880e867"));
+
+    auto extended = publicKey.extended();
+    EXPECT_EQ(extended.type, TWPublicKeyTypeED25519);
+    EXPECT_TRUE(extended == publicKey);
+    EXPECT_EQ(extended.bytes.size(), 32ul);
+    EXPECT_EQ(extended.isCompressed(), true);
+
+    auto compressed = publicKey.compressed();
+    EXPECT_EQ(compressed.type, TWPublicKeyTypeED25519);
+    EXPECT_TRUE(compressed == publicKey);
+    EXPECT_EQ(compressed.bytes.size(), 32ul);
+    EXPECT_EQ(compressed.isCompressed(), true);
+}
+
+TEST(PublicKeyTests, IsValidWrongType) {
+    EXPECT_FALSE(PublicKey::isValid(parse_hex("deadbeef"), (enum TWPublicKeyType)99));
+}
+
+TEST(PublicKeyTests, Verify) {
+    const auto privateKey = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
+
+    const char* message = "Hello";
+    const Data messageData = TW::data(message);
+    const Data digest = Hash::sha256(messageData);
+
+    {
+        const auto signature = privateKey.sign(digest, TWCurveSECP256k1);
+        const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+        EXPECT_TRUE(publicKey.verify(signature, digest));
+        EXPECT_EQ(hex(signature), "0f5d5a9e5fc4b82a625312f3be5d3e8ad017d882de86c72c92fcefa924e894c12071772a14201a3a0debf381b5e8dea39fadb9bcabdc02ee71ab018f55bf717f01");
+    }
+    {
+        const auto signature = privateKey.sign(digest, TWCurveED25519);
+        const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519);
+        EXPECT_TRUE(publicKey.verify(signature, digest));
+        EXPECT_EQ(hex(signature), "42848abf2641a731e18b8a1fb80eff341a5acebdc56faeccdcbadb960aef775192842fccec344679446daa4d02d264259c8f9aa364164ebe0ebea218581e2e03");
+    }
+    {
+        const auto signature = privateKey.sign(digest, TWCurveED25519Blake2bNano);
+        const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Blake2b);
+        EXPECT_TRUE(publicKey.verify(signature, digest));
+        EXPECT_EQ(hex(signature), "5c1473944cd0234ebc5a91b2966b9e707a33b936dadd149417a2e53b6b3fc97bef17b767b1690708c74d7b4c8fe48703fd44a6ef59d4cc5b9f88ba992db0a003");
+    }
+    {
+        const auto signature = privateKey.sign(digest, TWCurveNIST256p1);
+        const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1Extended);
+        EXPECT_TRUE(publicKey.verify(signature, digest));
+        EXPECT_EQ(hex(signature), "2e4655831f0c60729583595c103bf0d862af6313e4326f03f512682106c792822f5a9cd21e7d4a3316c2d337e5eee649b09c34f7b4407344f0d32e8d33167d8901");
+    }
+}
+
+TEST(PublicKeyTests, ED25519_malleability) {
+    const auto publicKey = PublicKey(parse_hex("a96e02312b03116ff88a9f3e7cea40f424af43a5c6ca6c8ed4f98969faf46ade"), TWPublicKeyTypeED25519);
+
+    const Data messageData = TW::data("Hello, world!");
+
+    const Data origSign = parse_hex("ea85a47dcc18b512dfea7c209162abaea4808d77c1ec903dc7ba6e2afa3f9f07e7ed7a20a4e2fa1009db3d1443e937e6abb16ff3c3eaecb798faed7fbb40b008");
+    const Data modifiedSign = parse_hex("ea85a47dcc18b512dfea7c209162abaea4808d77c1ec903dc7ba6e2afa3f9f07d4c1707dbe450d69df7735b721e316fbabb16ff3c3eaecb798faed7fbb40b018");
+
+    EXPECT_TRUE(publicKey.verify(origSign, messageData));
+    EXPECT_FALSE(publicKey.verify(modifiedSign, messageData));
+}
+
+TEST(PublicKeyTests, VerifyAsDER) {
+    const auto privateKey = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
+
+    const char* message = "Hello";
+    const Data messageData = TW::data(message);
+    const Data digest = Hash::sha256(messageData);
+
+    const auto signature = privateKey.signAsDER(digest);
+    EXPECT_EQ(signature.size(), 70ul);
+    EXPECT_EQ(hex(signature), "304402200f5d5a9e5fc4b82a625312f3be5d3e8ad017d882de86c72c92fcefa924e894c102202071772a14201a3a0debf381b5e8dea39fadb9bcabdc02ee71ab018f55bf717f");
+
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_EQ(hex(publicKey.bytes), "0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1");
+
+    EXPECT_TRUE(publicKey.verifyAsDER(signature, digest));
+
+    EXPECT_FALSE(publicKey.verify(signature, digest));
+
+    { // Negative: wrong key type
+        const auto publicKeyWrong = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1Extended);
+        EXPECT_FALSE(publicKeyWrong.verifyAsDER(signature, digest));
+    }
+}
+
+TEST(PublicKeyTests, VerifyEd25519Extended) {
+    const auto privateKey = PrivateKey(parse_hex("e8c8c5b2df13f3abed4e6b1609c808e08ff959d7e6fc3d849e3f2880550b574437aa559095324d78459b9bb2da069da32337e1cc5da78f48e1bd084670107f3110f3245ddf9132ecef98c670272ef39c03a232107733d4a1d28cb53318df26fae0d152bb611cb9ff34e945e4ff627e6fba81da687a601a879759cd76530b5744424db69a75edd4780a5fbc05d1a3c84ac4166ff8e424808481dd8e77627ce5f5bf2eea84515a4e16c4ff06c92381822d910b5cbf9e9c144e1fb76a6291af7276"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeED25519Cardano);
+
+    const auto message = TW::data("Hello");
+    const auto digest = Hash::sha256(message);
+    const auto signature = privateKey.sign(digest, TWCurveED25519ExtendedCardano);
+    const auto valid = publicKey.verify(signature, digest);
+
+    EXPECT_TRUE(valid);
+}
+
+TEST(PublicKeyTests, VerifySchnorr) {
+    const auto key = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
+    const auto privateKey = PrivateKey(key);
+
+    const Data messageData = TW::data("hello schnorr");
+    const Data digest = Hash::sha256(messageData);
+
+    const auto signature = privateKey.signZilliqa(digest);
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+    EXPECT_TRUE(publicKey.verifyZilliqa(signature, digest));
+    EXPECT_EQ(hex(signature), "b8118ccb99563fe014279c957b0a9d563c1666e00367e9896fe541765246964f64a53052513da4e6dc20fdaf69ef0d95b4ca51c87ad3478986cf053c2dd0b853");
+}
+
+TEST(PublicKeyTests, VerifySchnorrWrongType) {
+    const auto key = PrivateKey(parse_hex("afeefca74d9a325cf1d6b6911d61a65c32afa8e02bd5e78e2e4ac2910bab45f5"));
+    const auto privateKey = PrivateKey(key);
+
+    const Data messageData = TW::data("hello schnorr");
+    const Data digest = Hash::sha256(messageData);
+
+    const auto signature = privateKey.signZilliqa(digest);
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeNIST256p1);
+    EXPECT_FALSE(publicKey.verifyZilliqa(signature, digest));
+}
+
+TEST(PublicKeyTests, RecoverRaw) {
+    {
+        const auto message = parse_hex("de4e9524586d6fce45667f9ff12f661e79870c4105fa0fb58af976619bb11432");
+        const auto signature = parse_hex("00000000000000000000000000000000000000000000000000000000000000020123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef");
+        {
+            const auto publicKey = PublicKey::recoverRaw(signature, 1ul, message);
+            EXPECT_EQ(publicKey.type, TWPublicKeyTypeSECP256k1Extended);
+            EXPECT_EQ(hex(publicKey.bytes), "0456d8089137b1fd0d890f8c7d4a04d0fd4520a30b19518ee87bd168ea12ed8090329274c4c6c0d9df04515776f2741eeffc30235d596065d718c3973e19711ad0");
+        }
+        {   // same data but different recId -> different result
+            const auto publicKey = PublicKey::recoverRaw(signature, 0ul, message);
+            EXPECT_EQ(publicKey.type, TWPublicKeyTypeSECP256k1Extended);
+            EXPECT_EQ(hex(publicKey.bytes), "043fc5bf5fec35b6ffe6fd246226d312742a8c296bfa57dd22da509a2e348529b7ddb9faf8afe1ecda3c05e7b2bda47ee1f5a87e952742b22afca560b29d972fcf");
+        }
+    }
+    {
+        const auto message = parse_hex("6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155");
+        const auto signature = parse_hex("92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c646487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e58");
+        const auto recovered = PublicKey::recoverRaw(signature, 0ul, message);
+        EXPECT_EQ(hex(recovered.bytes), "0463ade8ebc212b85e7e4278dc3dcb4f9cc18aab912ef5d302b5d1940e772e9e1a9213522efddad487bbd5dd7907e8e776f918e9a5e4cb51893724e9fe76792a4f");
+    }
+}
+
+TEST(PublicKeyTests, SignAndRecoverRaw) {
+    const auto privateKey = PrivateKey(parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    EXPECT_EQ(hex(publicKey.bytes), "0463ade8ebc212b85e7e4278dc3dcb4f9cc18aab912ef5d302b5d1940e772e9e1a9213522efddad487bbd5dd7907e8e776f918e9a5e4cb51893724e9fe76792a4f");
+    const auto message = parse_hex("6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155");
+
+    // sign
+    const auto signature = privateKey.sign(message, TWCurveSECP256k1);
+    EXPECT_EQ(hex(signature), "92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c646487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e5800");
+
+    // revocer
+    const auto pubkeyRecovered = PublicKey::recoverRaw(signature, signature[64], message);
+    EXPECT_EQ(hex(pubkeyRecovered.bytes), hex(publicKey.bytes));
+    EXPECT_EQ(hex(pubkeyRecovered.bytes), "0463ade8ebc212b85e7e4278dc3dcb4f9cc18aab912ef5d302b5d1940e772e9e1a9213522efddad487bbd5dd7907e8e776f918e9a5e4cb51893724e9fe76792a4f");
+}
+
+TEST(PublicKeyTests, RecoverRawNegative) {
+    const auto message = parse_hex("de4e9524586d6fce45667f9ff12f661e79870c4105fa0fb58af976619bb11432");
+    const auto signature = parse_hex("00000000000000000000000000000000000000000000000000000000000000020123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef");
+    // recid >= 4
+    EXPECT_EXCEPTION(PublicKey::recoverRaw(signature, 4ul, message), "Invalid recId");
+    // signature too short
+    EXPECT_EXCEPTION(PublicKey::recoverRaw(parse_hex("00000000000000000000000000000000000000000000000000000000000000020123456789abcdef0123456789abcdef0123456789abcdef0123456789abcd"), 1ul, message),
+        "signature too short");
+    // Digest too  short
+    EXPECT_EXCEPTION(PublicKey::recoverRaw(signature, 1ul, parse_hex("de4e9524586d6fce45667f9ff12f661e79870c4105fa0fb58af976619bb114")),
+        "digest too short");
+}
+
+TEST(PublicKeyTests, Recover) {
+    {
+        const auto message = parse_hex("de4e9524586d6fce45667f9ff12f661e79870c4105fa0fb58af976619bb11432");
+        const auto signature = parse_hex("00000000000000000000000000000000000000000000000000000000000000020123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef80");
+        const auto publicKey = PublicKey::recover(signature, message);
+        EXPECT_EQ(publicKey.type, TWPublicKeyTypeSECP256k1Extended);
+        EXPECT_EQ(hex(publicKey.bytes),
+                  "0456d8089137b1fd0d890f8c7d4a04d0fd4520a30b19518ee87bd168ea12ed8090329274c4c6c0d9df04515776f2741eeffc30235d596065d718c3973e19711ad0");
+    }
+
+    const auto privateKey = PrivateKey(parse_hex("4f96ed80e9a7555a6f74b3d658afdd9c756b0a40d4ca30c42c2039eb449bb904"));
+    const auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1Extended);
+    EXPECT_EQ(hex(publicKey.bytes), "0463ade8ebc212b85e7e4278dc3dcb4f9cc18aab912ef5d302b5d1940e772e9e1a9213522efddad487bbd5dd7907e8e776f918e9a5e4cb51893724e9fe76792a4f");
+    {
+        const auto message = parse_hex("6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155");
+        const auto signature = parse_hex("92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c646487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e5800");
+        const auto recovered = PublicKey::recover(signature, message);
+        EXPECT_EQ(hex(recovered.bytes), hex(publicKey.bytes));
+    }
+    { // same with v=27
+        const auto message = parse_hex("6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155");
+        const auto signature = parse_hex("92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c646487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e581b");
+        const auto recovered = PublicKey::recover(signature, message);
+        EXPECT_EQ(hex(recovered.bytes), hex(publicKey.bytes));
+    }
+    { // same with v=35+2
+        const auto message = parse_hex("6468eb103d51c9a683b51818fdb73390151c9973831d2cfb4e9587ad54273155");
+        const auto signature = parse_hex("92c336138f7d0231fe9422bb30ee9ef10bf222761fe9e04442e3a11e88880c646487026011dae03dc281bc21c7d7ede5c2226d197befb813a4ecad686b559e5825");
+        const auto recovered = PublicKey::recover(signature, message);
+        EXPECT_EQ(hex(recovered.bytes), hex(publicKey.bytes));
+    }
+}
+
+TEST(PublicKeyTests, isValidED25519) {
+    EXPECT_TRUE(PublicKey::isValid(parse_hex("beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519));
+    EXPECT_TRUE(PublicKey(parse_hex("beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519).isValidED25519());
+    EXPECT_TRUE(PublicKey::isValid(parse_hex("fc8c425a8a94a55ce42f2c24b2fb2ef5ab4a69142d2d97f6c11e0106c84136d5"), TWPublicKeyTypeED25519));
+    EXPECT_TRUE(PublicKey(parse_hex("fc8c425a8a94a55ce42f2c24b2fb2ef5ab4a69142d2d97f6c11e0106c84136d5"), TWPublicKeyTypeED25519).isValidED25519());
+    EXPECT_TRUE(PublicKey::isValid(parse_hex("01beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519));
+    EXPECT_TRUE(PublicKey(parse_hex("01beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519).isValidED25519());
+    // Following 32 bytes are not valid public keys (not on the curve)
+    EXPECT_TRUE(PublicKey::isValid(parse_hex("8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"), TWPublicKeyTypeED25519));
+    EXPECT_FALSE(PublicKey(parse_hex("8eaf04151687736326c9fea17e25fc5287613693c912909cb226aa4794f26a48"), TWPublicKeyTypeED25519).isValidED25519());
+    EXPECT_TRUE(PublicKey::isValid(parse_hex("51fdd5feae59d7dcbf5ebea99c05593ebee302577a5486ceac706ed568aa1e0e"), TWPublicKeyTypeED25519));
+    EXPECT_FALSE(PublicKey(parse_hex("51fdd5feae59d7dcbf5ebea99c05593ebee302577a5486ceac706ed568aa1e0e"), TWPublicKeyTypeED25519).isValidED25519());
+    // invalid input size/format
+    EXPECT_FALSE(PublicKey::isValid(parse_hex("1234"), TWPublicKeyTypeED25519));
+    EXPECT_FALSE(PublicKey::isValid(parse_hex("beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa5279"), TWPublicKeyTypeED25519));
+    EXPECT_FALSE(PublicKey::isValid(parse_hex("02beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519));
+    EXPECT_FALSE(PublicKey::isValid(parse_hex("0101beff0e5d6f6e6e6d573d3044f3e2bfb353400375dc281da3337468d4aa527908"), TWPublicKeyTypeED25519));
+    EXPECT_FALSE(PublicKey(parse_hex("0399c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c1"), TWPublicKeyTypeSECP256k1).isValidED25519());
+}
diff --git a/tests/common/TestUtilities.cpp b/tests/common/TestUtilities.cpp
new file mode 100644
index 00000000000..924b8df3cd8
--- /dev/null
+++ b/tests/common/TestUtilities.cpp
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <string>
+#include <fstream>
+
+using namespace std;
+
+/// Return a writable temp dir which can be used to create files during testing
+string getTestTempDir(void) {
+    // In general, tests should not use hardcoded "/tmp", but TEST_TMPDIR env var.
+    const char* fromEnvironment = getenv("TEST_TMPDIR");
+    if (fromEnvironment == NULL || fromEnvironment[0] == '\0') { return "/tmp"; }
+    return string(fromEnvironment);
+}
+
+nlohmann::json loadJson(std::string path) {
+    std::ifstream stream(path);
+    nlohmann::json json;
+    stream >> json;
+    return json;
+}
diff --git a/tests/common/TestUtilities.h b/tests/common/TestUtilities.h
new file mode 100644
index 00000000000..28ccc30584d
--- /dev/null
+++ b/tests/common/TestUtilities.h
@@ -0,0 +1,88 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <TrustWalletCore/TWAnySigner.h>
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWData.h>
+#include <TrustWalletCore/TWString.h>
+
+#include <gtest/gtest.h>
+#include <google/protobuf/util/json_util.h>
+#include <nlohmann/json.hpp>
+
+#include <vector>
+
+#define WRAP(type, x) std::shared_ptr<type>(x, type##Delete)
+#define WRAPD(x) std::shared_ptr<TWData>(x, TWDataDelete)
+#define WRAPS(x) std::shared_ptr<TWString>(x, TWStringDelete)
+#define STRING(x) std::shared_ptr<TWString>(TWStringCreateWithUTF8Bytes(x), TWStringDelete)
+#define DATA(x) std::shared_ptr<TWData>(TWDataCreateWithHexString(STRING(x).get()), TWDataDelete)
+
+inline void assertStringsEqual(const std::shared_ptr<TWString>& string, const char* expected) {
+    ASSERT_STREQ(TWStringUTF8Bytes(string.get()), expected);
+}
+
+inline void assertHexEqual(const std::shared_ptr<TWData>& data, const char* expected) {
+    auto hex = WRAPS(TWStringCreateWithHexData(data.get()));
+    assertStringsEqual(hex, expected);
+}
+
+
+inline void assertJSONEqual(const nlohmann::json& lhs, const nlohmann::json& rhs) {
+    ASSERT_EQ(lhs, rhs);
+}
+
+inline void assertJSONEqual(const std::string& lhs, const char* expected) {
+    auto lhsJson = nlohmann::json::parse(lhs);
+    auto rhsJson = nlohmann::json::parse(std::string(expected));
+    return assertJSONEqual(lhsJson, rhsJson);
+}
+
+inline std::vector<uint8_t>* dataFromTWData(TWData* data) {
+    return const_cast<std::vector<uint8_t>*>(reinterpret_cast<const std::vector<uint8_t>*>(data));
+}
+
+/// Return a writable temp dir which can be used to create files during testing
+std::string getTestTempDir(void);
+
+#define ANY_SIGN(input, coin) \
+        {\
+            auto inputData = input.SerializeAsString();\
+            auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));\
+            auto outputTWData = WRAPD(TWAnySignerSign(inputTWData.get(), coin));\
+            output.ParseFromArray(TWDataBytes(outputTWData.get()), static_cast<int>(TWDataSize(outputTWData.get())));\
+        }
+#define ANY_PLAN(input, output, coin) \
+        {\
+            auto inputData = input.SerializeAsString();\
+            auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));\
+            auto outputTWData = WRAPD(TWAnySignerPlan(inputTWData.get(), coin));\
+            output.ParseFromArray(TWDataBytes(outputTWData.get()), static_cast<int>(TWDataSize(outputTWData.get())));\
+        }
+#define DUMP_PROTO(input) \
+        { \
+            std::string json; \
+            google::protobuf::util::MessageToJsonString(input, &json); \
+            std::cout<<"dump proto: "<<json<<std::endl; \
+        }
+
+/// For tests which should throw.  Wrap code under test in this macro.  
+/// ExceptionMsg is the expected exception message (startsWith match)
+#define EXPECT_EXCEPTION(statement, expExceptionMsg) \
+    try { \
+        statement; \
+        FAIL() << "An exception was expected, but none was thrown"; \
+    } catch (const std::exception& ex) { \
+        const std::string expEx = expExceptionMsg; \
+        const std::string actEx = ex.what(); \
+        const auto actExPrefix = actEx.substr(0, expEx.length()); \
+        EXPECT_EQ(actExPrefix, expEx); \
+    } catch (...) { \
+        FAIL() << "Not the expected exception"; \
+    }
+
+/// Open a json file
+nlohmann::json loadJson(std::string path);
diff --git a/tests/Uint256Tests.cpp b/tests/common/Uint256Tests.cpp
similarity index 82%
rename from tests/Uint256Tests.cpp
rename to tests/common/Uint256Tests.cpp
index a396e1e0318..5b01de5a3c5 100644
--- a/tests/Uint256Tests.cpp
+++ b/tests/common/Uint256Tests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "uint256.h"
 #include "HexCoding.h"
@@ -99,12 +97,6 @@ TEST(Uint256, LoadEmpty) {
     EXPECT_EQ(load(parse_hex("0000")), uint256_t(0));
 }
 
-TEST(Uint256, LoadWithOffset) {
-    EXPECT_EQ(loadWithOffset(parse_hex("0000000000000000000000000000000000000000000000000000000000000003"), 0), uint256_t(3));
-    EXPECT_EQ(loadWithOffset(parse_hex("abcdef0000000000000000000000000000000000000000000000000000000000000003"), 3), uint256_t(3));
-    EXPECT_EQ(loadWithOffset(parse_hex("0000000000000000000000000000000000000000000000000000000000000003"), 1), uint256_t(0)); // not enough bytes
-}
-
 TEST(Uint256, loadStringProtobuf) {
     const Data data = parse_hex("03");
     const std::string str = std::string(reinterpret_cast<const char*>(data.data()), data.size());
diff --git a/tests/WalletConsoleTests.cpp b/tests/common/WalletConsoleTests.cpp
similarity index 95%
rename from tests/WalletConsoleTests.cpp
rename to tests/common/WalletConsoleTests.cpp
index e6bdfc9be62..3ad84cb5f2c 100644
--- a/tests/WalletConsoleTests.cpp
+++ b/tests/common/WalletConsoleTests.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "../walletconsole/lib/CommandExecutor.h"
 #include "../walletconsole/lib/WalletConsole.h"
@@ -86,27 +84,27 @@ TEST(WalletConsole, coins) {
 TEST(WalletConsole, coin) {
     {
         auto pos = outputss.str().length();
-        cmd.executeLine("coin btc");
+        cmd.executeLine("coin atom");
         string res = outputss.str().substr(pos);
-        EXPECT_TRUE(res.find("Set active coin to: bitcoin") != string::npos);
+        EXPECT_TRUE(res.find("Set active coin to: cosmos") != string::npos);
     }
     {
         auto pos = outputss.str().length();
         cmd.executeLine("coin ethereum");
         string res = outputss.str().substr(pos);
-        EXPECT_TRUE(res.find("Set active coin to: ethereum") != string::npos);
+        EXPECT_TRUE(res.find("Set active coin to: ethereum") != string::npos) << res;
     }
     {
         auto pos = outputss.str().length();
         cmd.executeLine("coin bitcoin");
         string res = outputss.str().substr(pos);
-        EXPECT_TRUE(res.find("Set active coin to: bitcoin") != string::npos);
+        EXPECT_TRUE(res.find("Set active coin to: bitcoin") != string::npos) << res;
     }
     {
         auto pos = outputss.str().length();
         cmd.executeLine("coin no_such_coin_exists");
         string res = outputss.str().substr(pos);
-        EXPECT_TRUE(res.find("Error: No such coin") != string::npos);
+        EXPECT_TRUE(res.find("Error: No such coin") != string::npos) << res;
     }
 }
 
@@ -129,7 +127,7 @@ TEST(WalletConsole, newkey1) {
 }
 
 TEST(WalletConsole, pubPri1) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos1 = outputss.str().length();
     cmd.executeLine("pubPri 7d40d6a74e98543f545852989d54712834f9c86eddee89303a2083219749e38c");
     string res1 = outputss.str().substr(pos1);
@@ -137,7 +135,7 @@ TEST(WalletConsole, pubPri1) {
 }
 
 TEST(WalletConsole, pubPriInvalid) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos1 = outputss.str().length();
     cmd.executeLine("pubPri Hello!_This_is_an_invalid_private_key");
     string res1 = outputss.str().substr(pos1);
@@ -145,7 +143,7 @@ TEST(WalletConsole, pubPriInvalid) {
 }
 
 TEST(WalletConsole, priPub) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos1 = outputss.str().length();
     cmd.executeLine("priPub 0200266ab7dc3efec040cc8b9714ff49cc8339d2f30d9bab8a4b11043e1bdfee37");
     string res1 = outputss.str().substr(pos1);
@@ -153,7 +151,7 @@ TEST(WalletConsole, priPub) {
 }
 
 TEST(WalletConsole, addrPubBtc1) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos0 = outputss.str().length();
     cmd.executeLine("addrPub 0200266ab7dc3efec040cc8b9714ff49cc8339d2f30d9bab8a4b11043e1bdfee37");
     string res = outputss.str().substr(pos0);
@@ -162,7 +160,7 @@ TEST(WalletConsole, addrPubBtc1) {
 }
 
 TEST(WalletConsole, addrPubInvalid) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos0 = outputss.str().length();
     cmd.executeLine("addrPub Hello!");
     string res = outputss.str().substr(pos0);
@@ -170,7 +168,7 @@ TEST(WalletConsole, addrPubInvalid) {
 }
 
 TEST(WalletConsole, addrPri1) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos1 = outputss.str().length();
     cmd.executeLine("addrPri 7d40d6a74e98543f545852989d54712834f9c86eddee89303a2083219749e38c");
     string res1 = outputss.str().substr(pos1);
@@ -179,7 +177,7 @@ TEST(WalletConsole, addrPri1) {
 }
 
 TEST(WalletConsole, addrPriInvalid) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos1 = outputss.str().length();
     cmd.executeLine("addrPri Hello!");
     string res1 = outputss.str().substr(pos1);
@@ -187,7 +185,7 @@ TEST(WalletConsole, addrPriInvalid) {
 }
 
 TEST(WalletConsole, addrInvalid) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos1 = outputss.str().length();
     cmd.executeLine("addr Hello_This_is_an_Invalid_BTC_Address!_");
     string res1 = outputss.str().substr(pos1);
@@ -196,7 +194,7 @@ TEST(WalletConsole, addrInvalid) {
 
 TEST(WalletConsole, addrDP1) {
     cmd.executeLine("setMnemonic " + mnemonic1);
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
 
     // default DP
     auto pos1 = outputss.str().length();
@@ -265,7 +263,7 @@ TEST(WalletConsole, newMnemonic) {
 
 TEST(WalletConsole, dumpdp) {
     {
-        cmd.executeLine("coin btc");
+        cmd.executeLine("coin bitcoin");
         auto pos1 = outputss.str().length();
         cmd.executeLine("dumpDP");
         string res1 = outputss.str().substr(pos1);
@@ -288,7 +286,7 @@ TEST(WalletConsole, dumpdp) {
 }
 
 TEST(WalletConsole, dumpXpub) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     auto pos1 = outputss.str().length();
     cmd.executeLine("setMnemonic " + mnemonic1);
     string res1 = outputss.str().substr(pos1);
@@ -303,7 +301,7 @@ TEST(WalletConsole, dumpXpub) {
 TEST(WalletConsole, derive) {
     // Step-by-step derivation, mnemo -> pri -> pub -> addr
     cmd.executeLine("setMnemonic " + mnemonic1);
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     {
         auto pos1 = outputss.str().length();
         cmd.executeLine("priDP m/84'/0'/0'/0/1");
@@ -336,7 +334,7 @@ TEST(WalletConsole, derive) {
 TEST(WalletConsole, addrDefault) {
     {
         cmd.executeLine("setMnemonic " + mnemonic1);
-        cmd.executeLine("coin btc");
+        cmd.executeLine("coin bitcoin");
         auto pos1 = outputss.str().length();
         cmd.executeLine("addrDefault");
         string res1 = outputss.str().substr(pos1);
@@ -359,7 +357,7 @@ TEST(WalletConsole, addrDefault) {
 }
 
 TEST(WalletConsole, addrXpub) {
-    cmd.executeLine("coin btc");
+    cmd.executeLine("coin bitcoin");
     // no need to set mnemonic here
     auto pos1 = outputss.str().length();
     cmd.executeLine("addrXpub zpub6qvN3x2m4Q96SJJ8Q3ZRbCTm4mGdTny6u2hY8tTiyWznnjwc3rRYpHDb1gN9AAypB5m2x1WR954CLNqpLcAxkxt9x7LX9hKDGp9sGtZca7o 0");
diff --git a/tests/common/WebAuthnTests.cpp b/tests/common/WebAuthnTests.cpp
new file mode 100644
index 00000000000..9faaaf39d02
--- /dev/null
+++ b/tests/common/WebAuthnTests.cpp
@@ -0,0 +1,52 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include "HexCoding.h"
+#include <WebAuthn.h>
+#include <TrustWalletCore/TWWebAuthn.h>
+
+namespace TW::WebAuthn::tests {
+
+TEST(WebAuthn, GetPublicKey) {
+    // C++
+    {
+        const Data& attestationObject = parse_hex("0xa363666d74646e6f6e656761747453746d74a068617574684461746158a4f95bc73828ee210f9fd3bbe72d97908013b0a3759e9aea3d0ae318766cd2e1ad4500000000adce000235bcc60a648b0b25f1f055030020c720eb493e167ce93183dd91f5661e1004ed8cc1be23d3340d92381da5c0c80ca5010203262001215820a620a8cfc88fd062b11eab31663e56cad95278bef612959be214d98779f645b82258204e7b905b42917570148b0432f99ba21f2e7eebe018cbf837247e38150a89f771");
+        const auto publicKey = getPublicKey(attestationObject);
+        ASSERT_EQ(hex(publicKey.value().bytes), "04a620a8cfc88fd062b11eab31663e56cad95278bef612959be214d98779f645b84e7b905b42917570148b0432f99ba21f2e7eebe018cbf837247e38150a89f771");
+    }
+
+    // C
+    {
+        const auto attestationObject = DATA("0xa363666d74646e6f6e656761747453746d74a068617574684461746158a4f95bc73828ee210f9fd3bbe72d97908013b0a3759e9aea3d0ae318766cd2e1ad4500000000adce000235bcc60a648b0b25f1f055030020c720eb493e167ce93183dd91f5661e1004ed8cc1be23d3340d92381da5c0c80ca5010203262001215820a620a8cfc88fd062b11eab31663e56cad95278bef612959be214d98779f645b82258204e7b905b42917570148b0432f99ba21f2e7eebe018cbf837247e38150a89f771");
+        const auto& publicKey = WRAP(TWPublicKey, TWWebAuthnGetPublicKey(attestationObject.get()));
+        EXPECT_EQ(hex(publicKey->impl.bytes), "04a620a8cfc88fd062b11eab31663e56cad95278bef612959be214d98779f645b84e7b905b42917570148b0432f99ba21f2e7eebe018cbf837247e38150a89f771");
+    }
+}
+
+TEST(WebAuthn, GetRSValues) {
+
+    // C
+    {
+        const auto signature = DATA("0x30440220766589b461a838748708cdf88444b21b1fa52b57d70671b4f9bf60ad14b372ec022020cc439c9c20661bfa39bbea24a900ec1484b2395eb065ead8ef4e273144a57d");
+        const auto& rsValuesData = TWWebAuthnGetRSValues(signature.get());
+        const auto& rsValues = hexEncoded(*reinterpret_cast<const Data*>(WRAPD(rsValuesData).get()));
+        EXPECT_EQ(rsValues, "0x766589b461a838748708cdf88444b21b1fa52b57d70671b4f9bf60ad14b372ec20cc439c9c20661bfa39bbea24a900ec1484b2395eb065ead8ef4e273144a57d");
+    }
+}
+
+TEST(WebAuthn, ReconstructOriginalMessage) {
+
+    // C
+    {
+        const auto authenticatorData = DATA("0x1a70842af8c1feb7133b81e6a160a6a2be45ee057f0eb6d3f7f5126daa202e071d00000000");
+        const auto clientDataJSON = DATA("0x7b2274797065223a22776562617574686e2e676574222c226368616c6c656e6765223a224e5549794f5545774d6b45744e554535517930304d6b5a424c546847516a4174517a52474f4441794d3045304f546b30222c226f726967696e223a2268747470733a2f2f747275737477616c6c65742e636f6d227d");
+
+        const auto& messageData = TWWebAuthnReconstructOriginalMessage(authenticatorData.get(), clientDataJSON.get());
+        const auto& message = hexEncoded(*reinterpret_cast<const Data*>(WRAPD(messageData).get()));
+        EXPECT_EQ(message, "0x3254cdbd677e6e31e75d2135bad0cf56440d7c6b108c141a3509d76ce45c6731");
+    }
+}
+
+}
\ No newline at end of file
diff --git a/tests/common/algorithm/erase_tests.cpp b/tests/common/algorithm/erase_tests.cpp
new file mode 100644
index 00000000000..97b6f06897d
--- /dev/null
+++ b/tests/common/algorithm/erase_tests.cpp
@@ -0,0 +1,25 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "algorithm/erase.h"
+
+#include "gtest/gtest.h"
+#include <numeric> // std::iota
+
+TEST(Algorithm, Erase) {
+    std::vector<char> cnt(10);
+    std::iota(cnt.begin(), cnt.end(), '0');
+    cnt.back() = '3';
+    std::size_t nbElementsErased = TW::erase(cnt, '3');
+    ASSERT_EQ(cnt.size(), 8ul);
+    ASSERT_EQ(nbElementsErased, 2ul);
+}
+
+TEST(Algorithm, EraseIf) {
+    std::vector<char> cnt(10);
+    std::iota(cnt.begin(), cnt.end(), '0');
+    auto erased = TW::erase_if(cnt, [](char x) { return (x - '0') % 2 == 0; });
+    ASSERT_EQ(cnt.size(), 5ul);
+    ASSERT_EQ(erased, 5ul);
+}
diff --git a/tests/common/algorithm/sort_copy_tests.cpp b/tests/common/algorithm/sort_copy_tests.cpp
new file mode 100644
index 00000000000..3bbe1a1c567
--- /dev/null
+++ b/tests/common/algorithm/sort_copy_tests.cpp
@@ -0,0 +1,23 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "algorithm/sort_copy.h"
+
+#include "gtest/gtest.h"
+
+using namespace TW;
+
+struct Amount {
+    int value;
+};
+
+TEST(SortCopy, IsSorted) {
+    std::vector<int> data{9, 1, 2, 4, 5};
+    const auto sorted = sortCopy(data);
+    std::vector<Amount> anotherData{Amount{.value = 9}, Amount{.value = 1}, Amount{.value = 0}};
+    auto sortFunctor = [](auto&& lhs, auto&& rhs) { return lhs.value < rhs.value; };
+    const auto anotherSorted = sortCopy(anotherData, sortFunctor);
+    ASSERT_TRUE(std::is_sorted(cbegin(sorted), cend(sorted)));
+    ASSERT_TRUE(std::is_sorted(cbegin(anotherSorted), cend(anotherSorted), sortFunctor));
+}
\ No newline at end of file
diff --git a/tests/common/algorithm/string.cpp b/tests/common/algorithm/string.cpp
new file mode 100644
index 00000000000..1371ddcf8b2
--- /dev/null
+++ b/tests/common/algorithm/string.cpp
@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "algorithm/string.hpp"
+
+#include "gtest/gtest.h"
+
+namespace TW::tests {
+    TEST(Algorithm, StringSplit) {
+        auto splitted = TW::ssplit("0.0.1", '.');
+        ASSERT_EQ(splitted.size(), 3uL);
+        ASSERT_EQ(splitted[0], "0");
+        ASSERT_EQ(splitted[1], "0");
+        ASSERT_EQ(splitted[2], "1");
+    }
+
+    TEST(Algorithm, StringTrim) {
+        std::string str = " \t \n  Hello, \n World \t   \n";
+        trim(str);
+        ASSERT_EQ(str, "Hello, \n World");
+    }
+
+    TEST(Algorithm, StringTrimSpecificSymbols) {
+        std::string str = ".\n  Hello. World ...";
+        trim(str, ".");
+        ASSERT_EQ(str, "\n  Hello. World ");
+    }
+}
diff --git a/tests/common/algorithm/to_array_tests.cpp b/tests/common/algorithm/to_array_tests.cpp
new file mode 100644
index 00000000000..033e5faa8e0
--- /dev/null
+++ b/tests/common/algorithm/to_array_tests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "algorithm/to_array.h"
+
+#include "gtest/gtest.h"
+
+using namespace TW;
+
+TEST(Algorithms, ToArray) {
+    std::string str{"foo"};
+    auto value = TW::to_array<std::uint8_t, 4>(str);
+    auto expected = std::array<std::uint8_t, 4>{"foo"};
+    ASSERT_EQ(value, expected);
+
+    std::vector<std::uint8_t> ints{0, 1, 2};
+    auto another_value = TW::to_array<std::uint8_t, 3>(ints);
+    auto expected_ints = std::array<std::uint8_t, 3>{0, 1, 2};
+    ASSERT_EQ(another_value, expected_ints);
+}
diff --git a/tests/common/memory/memzero_tests.cpp b/tests/common/memory/memzero_tests.cpp
new file mode 100644
index 00000000000..5edee36dbf7
--- /dev/null
+++ b/tests/common/memory/memzero_tests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "memory/memzero_wrapper.h"
+
+#include "gtest/gtest.h"
+
+struct int_wrapper {
+    int value;
+};
+
+TEST(Memory, Memzero) {
+    int_wrapper obj{.value = 42};
+    TW::memzero(&obj);
+    ASSERT_EQ(obj.value, 0);
+    obj.value = 42;
+    ASSERT_EQ(obj.value, 42);
+    TW::memzero(&obj, sizeof(int_wrapper));
+    ASSERT_EQ(obj.value, 0);
+}
diff --git a/tests/common/operators/equality_comparable_tests.cpp b/tests/common/operators/equality_comparable_tests.cpp
new file mode 100644
index 00000000000..ce54cd16e57
--- /dev/null
+++ b/tests/common/operators/equality_comparable_tests.cpp
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "operators/equality_comparable.h"
+
+#include "gtest/gtest.h"
+
+namespace TW::operators::tests {
+
+struct Amount : equality_comparable<Amount> {
+    int value;
+    friend bool operator==(const Amount& lhs, const Amount& rhs) { return lhs.value == rhs.value; }
+};
+
+TEST(Operators, EqualityComparable) {
+    ASSERT_TRUE(Amount{.value = 1} != Amount{.value = 2});
+    ASSERT_TRUE(Amount{.value = 1} == Amount{.value = 1});
+}
+
+} // namespace TW::operators::tests
diff --git a/tests/interface/TWAESTests.cpp b/tests/interface/TWAESTests.cpp
index 8f1229ae5ca..52675f2aaab 100644
--- a/tests/interface/TWAESTests.cpp
+++ b/tests/interface/TWAESTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWAES.h>
 
diff --git a/tests/interface/TWAccountTests.cpp b/tests/interface/TWAccountTests.cpp
index cfcf75d3ce9..afc84a58498 100644
--- a/tests/interface/TWAccountTests.cpp
+++ b/tests/interface/TWAccountTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <TrustWalletCore/TWAccount.h>
 
 #include <gtest/gtest.h>
diff --git a/tests/interface/TWAnyAddressTests.cpp b/tests/interface/TWAnyAddressTests.cpp
index bf6e4e98c42..1068efe40fb 100644
--- a/tests/interface/TWAnyAddressTests.cpp
+++ b/tests/interface/TWAnyAddressTests.cpp
@@ -1,20 +1,19 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "HexCoding.h"
 #include <TrustWalletCore/TWAnyAddress.h>
 #include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWPublicKey.h>
 
 #include <gtest/gtest.h>
 
 using namespace TW;
 
-TEST(AnyAddress, InvalidString) {
+TEST(TWAnyAddress, InvalidString) {
     auto string = STRING("0x4E5B2e1dc63F6b91cb6Cd759936495434C7e972F");
     auto btcAddress = TWAnyAddressCreateWithString(string.get(), TWCoinTypeBitcoin);
     auto ethAaddress = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeEthereum));
@@ -24,7 +23,7 @@ TEST(AnyAddress, InvalidString) {
     ASSERT_EQ(TWAnyAddressCoin(ethAaddress.get()), TWCoinTypeEthereum);
 }
 
-TEST(AnyAddress, Data) {
+TEST(TWAnyAddress, Data) {
     // ethereum
     {
         auto string = STRING("0x4E5B2e1dc63F6b91cb6Cd759936495434C7e972F");
@@ -140,10 +139,10 @@ TEST(AnyAddress, Data) {
         auto keyHash = WRAPD(TWAnyAddressData(addr.get()));
         assertHexEqual(keyHash, "172bdf43265c0adfe105a1a8c45b3f406a38362f24");
     }
-    // elrond
+    // multiversx
     {
         auto string = STRING("erd1l453hd0gt5gzdp7czpuall8ggt2dcv5zwmfdf3sd3lguxseux2fsmsgldz");
-        auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeElrond));
+        auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithString(string.get(), TWCoinTypeMultiversX));
         auto pubkey = WRAPD(TWAnyAddressData(addr.get()));
         assertHexEqual(pubkey, "fd691bb5e85d102687d81079dffce842d4dc328276d2d4c60d8fd1c3433c3293");
     }
@@ -169,3 +168,54 @@ TEST(AnyAddress, Data) {
         assertHexEqual(keyHash, "18f9d8d877393bbbe8d697a8a2e52879cc7e84f467656d1cce6bab5a8d2637ec");
     }
 }
+
+TEST(TWAnyAddress, createFromPubKey) {
+    constexpr auto pubkey = "02753f5c275e1847ba4d2fd3df36ad00af2e165650b35fe3991e9c9c46f68b12bc";
+    const auto pubkey_twstring = STRING(pubkey);
+    const auto pubkey_data = WRAPD(TWDataCreateWithHexString(pubkey_twstring.get()));
+    const auto pubkey_obj = WRAP(TWPublicKey, TWPublicKeyCreateWithData(pubkey_data.get(), TWPublicKeyTypeSECP256k1));
+
+    const auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKey(pubkey_obj.get(), TWCoinTypeBitcoin));
+
+    assertStringsEqual(WRAPS(TWAnyAddressDescription(addr.get())), "bc1qcj2vfjec3c3luf9fx9vddnglhh9gawmncmgxhz");
+}
+
+TEST(TWAnyAddress, createFromPubKeyDerivation) {
+    constexpr auto pubkey = "02753f5c275e1847ba4d2fd3df36ad00af2e165650b35fe3991e9c9c46f68b12bc";
+    const auto pubkey_twstring = STRING(pubkey);
+    const auto pubkey_data = WRAPD(TWDataCreateWithHexString(pubkey_twstring.get()));
+    const auto pubkey_obj = WRAP(TWPublicKey, TWPublicKeyCreateWithData(pubkey_data.get(), TWPublicKeyTypeSECP256k1));
+
+    {
+        const auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKeyDerivation(pubkey_obj.get(), TWCoinTypeBitcoin, TWDerivationDefault));
+        assertStringsEqual(WRAPS(TWAnyAddressDescription(addr.get())), "bc1qcj2vfjec3c3luf9fx9vddnglhh9gawmncmgxhz");
+    }
+    {
+        const auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKeyDerivation(pubkey_obj.get(), TWCoinTypeBitcoin, TWDerivationBitcoinLegacy));
+        assertStringsEqual(WRAPS(TWAnyAddressDescription(addr.get())), "1JvRfEQFv5q5qy9uTSAezH7kVQf4hqnHXx");
+    }
+    {
+        const auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKeyDerivation(pubkey_obj.get(), TWCoinTypeBitcoin, TWDerivationBitcoinTestnet));
+        assertStringsEqual(WRAPS(TWAnyAddressDescription(addr.get())), "tb1qcj2vfjec3c3luf9fx9vddnglhh9gawmnjan4v3");
+    }
+}
+
+TEST(TWAnyAddress, createFromPubKeyFilecoinAddressType) {
+    constexpr auto pubkey = "0419bf99082cf2fcdaa812d6eba1eba9036ff3a3d84c1817c84954d4e8ae283fec5313e427a0f5f68dec3169b2eda876b1d9f97b1ede7f958baee6a2ce78f6e94a";
+    const auto pubkey_twstring = STRING(pubkey);
+    const auto pubkey_data = WRAPD(TWDataCreateWithHexString(pubkey_twstring.get()));
+    const auto pubkey_obj = WRAP(TWPublicKey, TWPublicKeyCreateWithData(pubkey_data.get(), TWPublicKeyTypeSECP256k1Extended));
+
+    {
+        const auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKeyFilecoinAddressType(pubkey_obj.get(), TWFilecoinAddressTypeDefault));
+        const auto actual = WRAPS(TWAnyAddressDescription(addr.get()));
+        assertStringsEqual(actual, "f1syn25x7infncgfvodhriq2dudvmudabtavm3wyy");
+        ASSERT_TRUE(TWAnyAddressIsValid(actual.get(), TWCoinTypeFilecoin));
+    }
+    {
+        const auto addr = WRAP(TWAnyAddress, TWAnyAddressCreateWithPublicKeyFilecoinAddressType(pubkey_obj.get(), TWFilecoinAddressTypeDelegated));
+        const auto actual = WRAPS(TWAnyAddressDescription(addr.get()));
+        assertStringsEqual(actual, "f410fvak24cyg3saddajborn6idt7rrtfj2ptauk5pbq");
+        ASSERT_TRUE(TWAnyAddressIsValid(actual.get(), TWCoinTypeFilecoin));
+    }
+}
diff --git a/tests/interface/TWAsnParserTests.cpp b/tests/interface/TWAsnParserTests.cpp
new file mode 100644
index 00000000000..ce0ccf0266e
--- /dev/null
+++ b/tests/interface/TWAsnParserTests.cpp
@@ -0,0 +1,18 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWAsnParser.h>
+
+#include <gtest/gtest.h>
+
+TEST(TWAsnParser, EcdsaSignatureFromDer) {
+    auto encoded = DATA("3046022100db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495da022100ff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1");
+    auto decodedResult = WRAPD(TWAsnParserEcdsaSignatureFromDer(encoded.get()));
+    assertHexEqual(decodedResult, "db421231f23d0320dbb8f1284b600cd34b8e9218628139539ff4f1f6c05495daff715aab70d5317dbf8ee224eb18bec3120cfb9db1000dbb31eadaf96c71c1b1");
+
+    auto invalid = DATA("");
+    ASSERT_EQ(TWAsnParserEcdsaSignatureFromDer(invalid.get()), nullptr);
+}
diff --git a/tests/interface/TWBase32Tests.cpp b/tests/interface/TWBase32Tests.cpp
index c8d826dad86..da8fd615984 100644
--- a/tests/interface/TWBase32Tests.cpp
+++ b/tests/interface/TWBase32Tests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "Data.h"
 #include <TrustWalletCore/TWBase32.h>
diff --git a/tests/interface/TWBase58Tests.cpp b/tests/interface/TWBase58Tests.cpp
index 79542447036..b0c4e17b3e6 100644
--- a/tests/interface/TWBase58Tests.cpp
+++ b/tests/interface/TWBase58Tests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWBase58.h>
 
diff --git a/tests/interface/TWBase64Tests.cpp b/tests/interface/TWBase64Tests.cpp
index d3da4e2f747..bf313b3be60 100644
--- a/tests/interface/TWBase64Tests.cpp
+++ b/tests/interface/TWBase64Tests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "Data.h"
 #include <TrustWalletCore/TWBase64.h>
diff --git a/tests/interface/TWBech32Tests.cpp b/tests/interface/TWBech32Tests.cpp
new file mode 100644
index 00000000000..00c1b3b6d98
--- /dev/null
+++ b/tests/interface/TWBech32Tests.cpp
@@ -0,0 +1,49 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+
+#include <TrustWalletCore/TWBech32.h>
+
+#include <gtest/gtest.h>
+
+TEST(TWBech32, Encode) {
+    const auto hrp = STRING("abcdef");
+    const auto data = DATA("00443214c74254b635cf84653a56d7c675be77df");
+    const auto result = WRAPS(TWBech32Encode(hrp.get(), data.get()));
+    assertStringsEqual(result, "abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw");
+}
+
+TEST(TWBech32, Decode) {
+    const auto input = STRING("abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw");
+    const auto result = WRAPD(TWBech32Decode(input.get()));
+    assertHexEqual(result, "00443214c74254b635cf84653a56d7c675be77df");
+}
+
+TEST(TWBech32, Decode_WrongChecksumVariant) {
+    // This is a Bech32m variant, not Bech32 variant. So it should fail using Bech32 decoder.
+    const auto input = STRING("abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx");
+    const auto result = WRAPD(TWBech32Decode(input.get()));
+    ASSERT_EQ(result.get(), nullptr);
+}
+
+TEST(TWBech32, EncodeM) {
+    const auto hrp = STRING("abcdef");
+    const auto data = DATA("ffbbcdeb38bdab49ca307b9ac5a928398a418820");
+    const auto result = WRAPS(TWBech32EncodeM(hrp.get(), data.get()));
+    assertStringsEqual(result, "abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx");
+}
+
+TEST(TWBech32, DecodeM) {
+    const auto input = STRING("abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx");
+    auto result = WRAPD(TWBech32DecodeM(input.get()));
+    assertHexEqual(result, "ffbbcdeb38bdab49ca307b9ac5a928398a418820");
+}
+
+TEST(TWBech32, DecodeM_WrongChecksumVariant) {
+    // This is a Bech32 variant, not Bech32m variant. So it should fail using Bech32M decoder.
+    const auto input = STRING("abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw");
+    const auto result = WRAPD(TWBech32DecodeM(input.get()));
+    ASSERT_EQ(result.get(), nullptr);
+}
diff --git a/tests/interface/TWCoinTypeTests.cpp b/tests/interface/TWCoinTypeTests.cpp
index 0390b8ad1e0..b7547ae34a9 100644
--- a/tests/interface/TWCoinTypeTests.cpp
+++ b/tests/interface/TWCoinTypeTests.cpp
@@ -1,12 +1,11 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWPublicKey.h>
 
 #include <gtest/gtest.h>
 
@@ -28,7 +27,7 @@ TEST(TWCoinType, TWPurpose) {
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeBandChain));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeBluzelle));
     ASSERT_EQ(TWPurposeBIP1852, TWCoinTypePurpose(TWCoinTypeCardano));
-    ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeElrond));
+    ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeMultiversX));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeOasis));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeTHORChain));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeCryptoOrg));
@@ -55,8 +54,8 @@ TEST(TWCoinType, TWPurpose) {
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeStellar));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeTezos));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeTheta));
-    ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeThunderToken));
-    ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeTomoChain));
+    ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeThunderCore));
+    ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeViction));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeTron));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeVeChain));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeWanchain));
@@ -66,6 +65,7 @@ TEST(TWCoinType, TWPurpose) {
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeRavencoin));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeWaves));
     ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeNEO));
+    ASSERT_EQ(TWPurposeBIP44, TWCoinTypePurpose(TWCoinTypeNebl));
 }
 
 TEST(TWCoinType, TWHDVersion) {
@@ -100,7 +100,7 @@ TEST(TWCoinType, TWPublicKeyType) {
     ASSERT_EQ(TWPublicKeyTypeSECP256k1, TWCoinTypePublicKeyType(TWCoinTypeBandChain));
     ASSERT_EQ(TWPublicKeyTypeSECP256k1, TWCoinTypePublicKeyType(TWCoinTypeBluzelle));
     ASSERT_EQ(TWPublicKeyTypeED25519Cardano, TWCoinTypePublicKeyType(TWCoinTypeCardano));
-    ASSERT_EQ(TWPublicKeyTypeED25519, TWCoinTypePublicKeyType(TWCoinTypeElrond));
+    ASSERT_EQ(TWPublicKeyTypeED25519, TWCoinTypePublicKeyType(TWCoinTypeMultiversX));
     ASSERT_EQ(TWPublicKeyTypeED25519, TWCoinTypePublicKeyType(TWCoinTypeOasis));
     ASSERT_EQ(TWPublicKeyTypeSECP256k1, TWCoinTypePublicKeyType(TWCoinTypeTHORChain));
     ASSERT_EQ(TWPublicKeyTypeSECP256k1, TWCoinTypePublicKeyType(TWCoinTypeCryptoOrg));
@@ -127,8 +127,8 @@ TEST(TWCoinType, TWPublicKeyType) {
     ASSERT_EQ(TWPublicKeyTypeED25519, TWCoinTypePublicKeyType(TWCoinTypeStellar));
     ASSERT_EQ(TWPublicKeyTypeED25519, TWCoinTypePublicKeyType(TWCoinTypeTezos));
     ASSERT_EQ(TWPublicKeyTypeSECP256k1Extended, TWCoinTypePublicKeyType(TWCoinTypeTheta));
-    ASSERT_EQ(TWPublicKeyTypeSECP256k1Extended, TWCoinTypePublicKeyType(TWCoinTypeThunderToken));
-    ASSERT_EQ(TWPublicKeyTypeSECP256k1Extended, TWCoinTypePublicKeyType(TWCoinTypeTomoChain));
+    ASSERT_EQ(TWPublicKeyTypeSECP256k1Extended, TWCoinTypePublicKeyType(TWCoinTypeThunderCore));
+    ASSERT_EQ(TWPublicKeyTypeSECP256k1Extended, TWCoinTypePublicKeyType(TWCoinTypeViction));
     ASSERT_EQ(TWPublicKeyTypeSECP256k1Extended, TWCoinTypePublicKeyType(TWCoinTypeTron));
     ASSERT_EQ(TWPublicKeyTypeSECP256k1Extended, TWCoinTypePublicKeyType(TWCoinTypeVeChain));
     ASSERT_EQ(TWPublicKeyTypeSECP256k1Extended, TWCoinTypePublicKeyType(TWCoinTypeWanchain));
@@ -138,6 +138,20 @@ TEST(TWCoinType, TWPublicKeyType) {
     ASSERT_EQ(TWPublicKeyTypeSECP256k1, TWCoinTypePublicKeyType(TWCoinTypeRavencoin));
     ASSERT_EQ(TWPublicKeyTypeCURVE25519, TWCoinTypePublicKeyType(TWCoinTypeWaves));
     ASSERT_EQ(TWPublicKeyTypeNIST256p1, TWCoinTypePublicKeyType(TWCoinTypeNEO));
+    ASSERT_EQ(TWPublicKeyTypeSECP256k1, TWCoinTypePublicKeyType(TWCoinTypeNebl));
+}
+
+TEST(TWCoinType, ValidateAddress) {
+    ASSERT_TRUE(TWCoinTypeValidate(TWCoinTypeBitcoin, STRING("12dNaXQtN5Asn2YFwT1cvciCrJa525fAe4").get()));
+    ASSERT_TRUE(TWCoinTypeValidate(TWCoinTypeBitcoin, STRING("bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4").get()));
+}
+
+TEST(TWCoinType, DeriveAddress) {
+    auto pkData = DATA("0279BE667EF9DCBBAC55A06295CE870B07029BFCDB2DCE28D959F2815B16F81798");
+    auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(pkData.get(), TWPublicKeyTypeSECP256k1));
+
+    auto address = WRAPS(TWCoinTypeDeriveAddressFromPublicKeyAndDerivation(TWCoinTypeBitcoin, publicKey.get(), TWDerivationBitcoinSegwit));
+    assertStringsEqual(address, "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4");
 }
 
 TEST(TWCoinType, TWCoinTypeDerivationPath) {
diff --git a/tests/interface/TWCryptoBoxTests.cpp b/tests/interface/TWCryptoBoxTests.cpp
new file mode 100644
index 00000000000..cb9a3335c54
--- /dev/null
+++ b/tests/interface/TWCryptoBoxTests.cpp
@@ -0,0 +1,63 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include "TestUtilities.h"
+#include "TrustWalletCore/TWCryptoBox.h"
+#include "TrustWalletCore/TWCryptoBoxPublicKey.h"
+#include "TrustWalletCore/TWCryptoBoxSecretKey.h"
+
+#include <gtest/gtest.h>
+
+TEST(TWCryptoBox, EncryptDecryptEasy) {
+    const auto mySecret = WRAP(TWCryptoBoxSecretKey, TWCryptoBoxSecretKeyCreate());
+    const auto myPubkey = WRAP(TWCryptoBoxPublicKey, TWCryptoBoxSecretKeyGetPublicKey(mySecret.get()));
+
+    const auto otherSecret = WRAP(TWCryptoBoxSecretKey, TWCryptoBoxSecretKeyCreate());
+    const auto otherPubkey = WRAP(TWCryptoBoxPublicKey, TWCryptoBoxSecretKeyGetPublicKey(otherSecret.get()));
+
+    const auto message = "Well done is better than well said. -Benjamin Franklin";
+    const auto messageData = WRAPD(TWDataCreateWithBytes(reinterpret_cast<const uint8_t*>(message), strlen(message)));
+
+    const auto encrypted = WRAPD(TWCryptoBoxEncryptEasy(mySecret.get(), otherPubkey.get(), messageData.get()));
+
+    // Step 2. Make sure the Box can be decrypted by the other side.
+    const auto decrypted = WRAPD(TWCryptoBoxDecryptEasy(otherSecret.get(), myPubkey.get(), encrypted.get()));
+    const auto decryptedData = dataFromTWData(decrypted.get());
+    std::string decryptedMessage(decryptedData->begin(), decryptedData->end());
+
+    EXPECT_EQ(decryptedMessage, message);
+}
+
+TEST(TWCryptoBox, PublicKeyWithData) {
+    auto pubkeyBytesHex = "afccabc5b28a8a1fd1cd880516f9c854ae2498d0d1b978b53a59f38e4ae55747";
+    auto pubkeyBytes = DATA(pubkeyBytesHex);
+
+    ASSERT_TRUE(TWCryptoBoxPublicKeyIsValid(pubkeyBytes.get()));
+    const auto publicKey = WRAP(TWCryptoBoxPublicKey, TWCryptoBoxPublicKeyCreateWithData(pubkeyBytes.get()));
+    const auto actualBytes = WRAPD(TWCryptoBoxPublicKeyData(publicKey.get()));
+    assertHexEqual(actualBytes, pubkeyBytesHex);
+}
+
+TEST(TWCryptoBox, SecretKeyWithData) {
+    auto secretBytesHex = "dd87000d4805d6fbd89ae1352f5e4445648b79d5e901c92aebcb610e9be468e4";
+    auto secretBytes = DATA(secretBytesHex);
+
+    ASSERT_TRUE(TWCryptoBoxSecretKeyIsValid(secretBytes.get()));
+    const auto publicKey = WRAP(TWCryptoBoxSecretKey, TWCryptoBoxSecretKeyCreateWithData(secretBytes.get()));
+    const auto actualBytes = WRAPD(TWCryptoBoxSecretKeyData(publicKey.get()));
+    assertHexEqual(actualBytes, secretBytesHex);
+}
+
+TEST(TWCryptoBox, DecryptEasyError) {
+    auto otherPubkeyBytes = DATA("afccabc5b28a8a1fd1cd880516f9c854ae2498d0d1b978b53a59f38e4ae55747");
+
+    const auto mySecret = WRAP(TWCryptoBoxSecretKey, TWCryptoBoxSecretKeyCreate());
+    const auto otherPubkey = WRAP(TWCryptoBoxPublicKey, TWCryptoBoxPublicKeyCreateWithData(otherPubkeyBytes.get()));
+
+    // The given encrypted box cannot be decrypted by using `mySecret` and `otherPubkey`.
+    const auto invalidEncrypted = DATA("7a7b9c8fee6e3c597512848c7d513e7131193cdfd410ff6611522fdeea99d7160873182019d7a18502f22c5e3644d26a2b669365");
+
+    const auto* decrypted = TWCryptoBoxDecryptEasy(mySecret.get(), otherPubkey.get(), invalidEncrypted.get());
+    ASSERT_EQ(decrypted, nullptr);
+}
diff --git a/tests/interface/TWDataTests.cpp b/tests/interface/TWDataTests.cpp
index 73c287d5a2e..9c1a69c3b07 100644
--- a/tests/interface/TWDataTests.cpp
+++ b/tests/interface/TWDataTests.cpp
@@ -1,11 +1,9 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWData.h>
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/interface/TWDataVectorTests.cpp b/tests/interface/TWDataVectorTests.cpp
index 38779f4bb92..670d50edeba 100644
--- a/tests/interface/TWDataVectorTests.cpp
+++ b/tests/interface/TWDataVectorTests.cpp
@@ -1,12 +1,10 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrustWalletCore/TWDataVector.h>
 #include "HexCoding.h"
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <gtest/gtest.h>
 
diff --git a/tests/interface/TWDerivationPathTests.cpp b/tests/interface/TWDerivationPathTests.cpp
index 22cef1e8b32..24284ec8ef4 100644
--- a/tests/interface/TWDerivationPathTests.cpp
+++ b/tests/interface/TWDerivationPathTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 #include "TrustWalletCore/TWDerivation.h"
 #include "TrustWalletCore/TWPurpose.h"
 #include <TrustWalletCore/TWDerivationPath.h>
diff --git a/tests/interface/TWHDWalletTests.cpp b/tests/interface/TWHDWalletTests.cpp
index c826186dbfd..cff8a206c30 100644
--- a/tests/interface/TWHDWalletTests.cpp
+++ b/tests/interface/TWHDWalletTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "Coin.h"
 
@@ -17,6 +15,10 @@
 #include <TrustWalletCore/TWBase58.h>
 #include <TrustWalletCore/TWCoinType.h>
 #include <TrustWalletCore/TWSegwitAddress.h>
+#include <TrustWalletCore/TWEthereum.h>
+#include <TrustWalletCore/TWEthereumMessageSigner.h>
+#include <TrustWalletCore/TWStarkExMessageSigner.h>
+#include <TrustWalletCore/TWStarkWare.h>
 #include <proto/Stellar.pb.h>
 
 #include "HexCoding.h"
@@ -77,6 +79,11 @@ TEST(HDWallet, CreateFromMnemonicNoPassword) {
     assertSeedEq(wallet, "354c22aedb9a37407adc61f657a6f00d10ed125efa360215f36c6919abd94d6dbc193a5f9c495e21ee74118661e327e84a5f5f11fa373ec33b80897d4697557d");
 }
 
+TEST(HDWallet, CreateFromMnemonicCheck) {
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonicCheck(gWords.get(), STRING("").get(), false));
+    assertSeedEq(wallet, "354c22aedb9a37407adc61f657a6f00d10ed125efa360215f36c6919abd94d6dbc193a5f9c495e21ee74118661e327e84a5f5f11fa373ec33b80897d4697557d");
+}
+
 TEST(HDWallet, CreateFromStrengthInvalid) {
     auto wallet = WRAP(TWHDWallet, TWHDWalletCreate(64, STRING("").get()));
     ASSERT_EQ(wallet.get(), nullptr);
@@ -133,12 +140,49 @@ TEST(HDWallet, DeriveBitcoinExtended) {
     assertStringsEqual(address, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85");
 }
 
+TEST(HDWallet, GetKeyDerivation) {
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(gWords.get(), gPassphrase.get()));
+    {
+        auto key = WRAP(TWPrivateKey, TWHDWalletGetKeyDerivation(wallet.get(), TWCoinTypeBitcoin, TWDerivationBitcoinSegwit));
+        assertHexEqual(WRAPD(TWPrivateKeyData(key.get())), "1901b5994f075af71397f65bd68a9fff8d3025d65f5a2c731cf90f5e259d6aac");
+        auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(key.get(), true));
+        auto publicKeyData = WRAPD(TWPublicKeyData(publicKey.get()));
+        assertHexEqual(publicKeyData, "037ea5dff03f677502c4a1d73c5ac897200e56b155e876774c8fba0cc22f80b941");
+    }
+    {
+        auto key = WRAP(TWPrivateKey, TWHDWalletGetKeyDerivation(wallet.get(), TWCoinTypeBitcoin, TWDerivationBitcoinLegacy));
+        assertHexEqual(WRAPD(TWPrivateKeyData(key.get())), "28071bf4e2b0340db41b807ed8a5514139e5d6427ff9d58dbd22b7ed187103a4");
+        auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(key.get(), true));
+        auto publicKeyData = WRAPD(TWPublicKeyData(publicKey.get()));
+        assertHexEqual(publicKeyData, "0240ebf906b948281289405317a5eb9a98045af8a8ab5311b2e3060cfb66c507a1");
+    }
+    {
+        auto key = WRAP(TWPrivateKey, TWHDWalletGetKeyDerivation(wallet.get(), TWCoinTypeBitcoin, TWDerivationBitcoinTaproot));
+        assertHexEqual(WRAPD(TWPrivateKeyData(key.get())), "a2c4d6df786f118f20330affd65d248ffdc0750ae9cbc729d27c640302afd030");
+        auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(key.get(), true));
+        auto publicKeyData = WRAPD(TWPublicKeyData(publicKey.get()));
+        assertHexEqual(publicKeyData, "026acc6c37789625ecd5ad4ebb7631249dfb9ebc3f82386f187325f54881557b9f");
+    }
+}
+
 TEST(HDWallet, DeriveAddressBitcoin) {
     auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(gWords.get(), gPassphrase.get()));
     auto address = WRAP(TWString, TWHDWalletGetAddressForCoin(wallet.get(), TWCoinTypeBitcoin));
     assertStringsEqual(address, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85");
 }
 
+TEST(HDWallet, DeriveAddressBitcoinDerivation) {
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(gWords.get(), gPassphrase.get()));
+    {
+        auto address = WRAP(TWString, TWHDWalletGetAddressDerivation(wallet.get(), TWCoinTypeBitcoin, TWDerivationBitcoinSegwit));
+        assertStringsEqual(address, "bc1qumwjg8danv2vm29lp5swdux4r60ezptzz7ce85");
+    }
+    {
+        auto address = WRAP(TWString, TWHDWalletGetAddressDerivation(wallet.get(), TWCoinTypeBitcoin, TWDerivationBitcoinLegacy));
+        assertStringsEqual(address, "1PeUvjuxyf31aJKX6kCXuaqxhmG78ZUdL1");
+    }
+}
+
 TEST(HDWallet, DeriveEthereum) {
     auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(gWords.get(), gPassphrase.get()));
     auto key = WRAP(TWPrivateKey, TWHDWalletGetKeyForCoin(wallet.get(), TWCoinTypeEthereum));
@@ -252,11 +296,11 @@ TEST(HDWallet, DeriveAlgorand) {
     assertHexEqual(privateKeyData, "ce0b7ac644e2b7d9d14d3928b11643f43e48c33d3e328d059fef8add7f070e82");
 }
 
-TEST(HDWallet, DeriveElrond) {
+TEST(HDWallet, DeriveMultiversX) {
     auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(gWords.get(), gPassphrase.get()));
-    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKeyForCoin(wallet.get(), TWCoinTypeElrond));
+    auto privateKey = WRAP(TWPrivateKey, TWHDWalletGetKeyForCoin(wallet.get(), TWCoinTypeMultiversX));
     auto privateKeyData = WRAPD(TWPrivateKeyData(privateKey.get()));
-    auto address = WRAPS(TWCoinTypeDeriveAddress(TWCoinTypeElrond, privateKey.get()));
+    auto address = WRAPS(TWCoinTypeDeriveAddress(TWCoinTypeMultiversX, privateKey.get()));
 
     assertHexEqual(privateKeyData, "0eb593141de897d60a0883320793eb49e63d556ccdf783a87ec014f150d50453");
     assertStringsEqual(address, "erd1a6l7q9cfvrgr80xuzm37tapdr4zm3mwrtl6vt8f45df45x7eadfs8ds5vv");
@@ -329,11 +373,15 @@ TEST(HDWallet, ExtendedKeysCustomAccount) {
 
     auto zprv0 = WRAPS(TWHDWalletGetExtendedPrivateKeyAccount(wallet.get(), TWPurposeBIP84, TWCoinTypeBitcoin, TWDerivationBitcoinSegwit, TWHDVersionZPRV, 0));
     assertStringsEqual(zprv0, "zprvAdG4iTXWBoARxkkzNpNh8r6Qag3irQB8PzEMkAFeTRXxHpbF9z4QgEvBRmfvqWvGp42t42nvgGpNgYSJA9iefm1yYNZKEm7z6qUWCroSQnE");
+    auto zprvTaproot = WRAPS(TWHDWalletGetExtendedPrivateKeyAccount(wallet.get(), TWPurposeBIP86, TWCoinTypeBitcoin, TWDerivationBitcoinTaproot, TWHDVersionZPRV, 0));
+    assertStringsEqual(zprvTaproot, "zprvAcMMthTpHWStuMM6r6wLFq5uiZhLN8sZCYyTCQLEF5XWgMtAgobYEqc95nLcWB43pCvLjbEu5HCEa8D5MjxcUdLdaeyQfojS5zpovJT6Swy");
     auto zprv1 = WRAPS(TWHDWalletGetExtendedPrivateKeyAccount(wallet.get(), TWPurposeBIP84, TWCoinTypeBitcoin, TWDerivationBitcoinSegwit, TWHDVersionZPRV, 1));
     assertStringsEqual(zprv1, "zprvAdG4iTXWBoAS2cCGuaGevCvH54GCunrvLJb2hoWCSuE3D9LS42XVg3c6sPm64w6VMq3w18vJf8nF3cBA2kUMkyWHsq6enWVXivzw42UrVHG");
 
     auto zpub0 = WRAPS(TWHDWalletGetExtendedPublicKeyAccount(wallet.get(), TWPurposeBIP84, TWCoinTypeBitcoin, TWDerivationBitcoinSegwit, TWHDVersionZPUB, 0));
     assertStringsEqual(zpub0, "zpub6rFR7y4Q2AijBEqTUquhVz398htDFrtymD9xYYfG1m4wAcvPhXNfE3EfH1r1ADqtfSdVCToUG868RvUUkgDKf31mGDtKsAYz2oz2AGutZYs");
+    auto zpubTaproot = WRAPS(TWHDWalletGetExtendedPublicKeyAccount(wallet.get(), TWPurposeBIP86, TWCoinTypeBitcoin, TWDerivationBitcoinTaproot, TWHDVersionZPUB, 0));
+    assertStringsEqual(zpubTaproot, "zpub6qLiJCzi7t1C7qRZx8ULcy2eGbXpmbbQZmu3znjqoR4VZADKELunndvcw4iSVaGx2KhviLLXuB3vcyGcdd2q8XXBQJc5T5qrtorRowa1zfs");
     auto zpub1 = WRAPS(TWHDWalletGetExtendedPublicKeyAccount(wallet.get(), TWPurposeBIP84, TWCoinTypeBitcoin, TWDerivationBitcoinSegwit, TWHDVersionZPUB, 1));
     assertStringsEqual(zpub1, "zpub6rFR7y4Q2AijF6Gk1bofHLs1d66hKFamhXWdWBup1Em25wfabZqkDqvaieV63fDQFaYmaatCG7jVNUpUiM2hAMo6SAVHcrUpSnHDpNzucB7");
 }
@@ -468,6 +516,47 @@ TEST(HDWallet, GetKeyByCurve) {
     assertHexEqual(privateKeyData2, "a13df52d5a5b438bbf921bbf86276e4347fe8e2f2ed74feaaee12b77d6d26f86");
 }
 
+TEST(TWHDWallet, FromMnemonicImmutableXMainnetFromSignature) {
+    // Successfully register: https://api.x.immutable.com/v1/users/0xd0972E2312518Ca15A2304D56ff9cc0b7ea0Ea37
+    const auto mnemonic = STRING("obscure opera favorite shuffle mail tip age debate dirt pact cement loyal");
+    const auto ethAddress = STRING("0xd0972E2312518Ca15A2304D56ff9cc0b7ea0Ea37");
+    const auto layer = STRING("starkex");
+    const auto application = STRING("immutablex");
+    const auto index = STRING("1");
+    const auto ethDerivationPath = STRING("m/44'/60'/0'/0/0");
+    auto wallet = WRAP(TWHDWallet, TWHDWalletCreateWithMnemonic(mnemonic.get(), STRING("").get()));
+    auto derivationPath = WRAPS(TWEthereumEip2645GetPath(ethAddress.get(), layer.get(), application.get(), index.get()));
+    assertStringsEqual(derivationPath, "m/2645'/579218131'/211006541'/2124474935'/1609799702'/1");
+
+    // Retrieve eth private key
+    auto ethPrivateKey = WRAP(TWPrivateKey, TWHDWalletGetKey(wallet.get(), TWCoinTypeEthereum, ethDerivationPath.get()));
+    const auto ethPrivateKeyData = WRAPD(TWPrivateKeyData(ethPrivateKey.get()));
+    assertHexEqual(ethPrivateKeyData, "03a9ca895dca1623c7dfd69693f7b4111f5d819d2e145536e0b03c136025a25d");
+
+    // StarkKey Derivation Path
+    const auto starkDerivationPath = WRAP(TWDerivationPath, TWDerivationPathCreateWithString(derivationPath.get()));
+
+    // Retrieve Stark Private key part
+    const auto ethMsg = STRING("Only sign this request if you’ve initiated an action with Immutable X.");
+    const auto ethSignature = WRAPS(TWEthereumMessageSignerSignMessageImmutableX(ethPrivateKey.get(), ethMsg.get()));
+    assertStringsEqual(ethSignature, "18b1be8b78807d3326e28bc286d7ee3d068dcd90b1949ce1d25c1f99825f26e70992c5eb7f44f76b202aceded00d74f771ed751f2fe538eec01e338164914fe001");
+    const auto starkPrivateKey = WRAP(TWPrivateKey, TWStarkWareGetStarkKeyFromSignature(starkDerivationPath.get(), ethSignature.get()));
+    const auto starkPrivateKeyData = WRAPD(TWPrivateKeyData(starkPrivateKey.get()));
+    const auto starkPubKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyByType(starkPrivateKey.get(), TWPublicKeyTypeStarkex));
+    const auto starkPublicKeyData = WRAPD(TWPublicKeyData(starkPubKey.get()));
+    assertHexEqual(starkPrivateKeyData, "04be51a04e718c202e4dca60c2b72958252024cfc1070c090dd0f170298249de");
+    assertHexEqual(starkPublicKeyData, "00e5b9b11f8372610ef35d647a1dcaba1a4010716588d591189b27bf3c2d5095");
+
+    // Account register
+    const auto ethMsgToRegister = STRING("Only sign this key linking request from Immutable X");
+    const auto ethSignatureToRegister = WRAPS(TWEthereumMessageSignerSignMessageImmutableX(ethPrivateKey.get(), ethMsgToRegister.get()));
+    assertStringsEqual(ethSignatureToRegister, "646da4160f7fc9205e6f502fb7691a0bf63ecbb74bbb653465cd62388dd9f56325ab1e4a9aba99b1661e3e6251b42822855a71e60017b310b9f90e990a12e1dc01");
+    const auto starkMsg = STRING("463a2240432264a3aa71a5713f2a4e4c1b9e12bbb56083cd56af6d878217cf");
+    const auto starkSignature = WRAPS(TWStarkExMessageSignerSignMessage(starkPrivateKey.get(), starkMsg.get()));
+    assertStringsEqual(starkSignature, "04cf5f21333dd189ada3c0f2a51430d733501a9b1d5e07905273c1938cfb261e05b6013d74adde403e8953743a338c8d414bb96bf69d2ca1a91a85ed2700a528");
+    ASSERT_TRUE(TWStarkExMessageSignerVerifyMessage(starkPubKey.get(), starkMsg.get(), starkSignature.get()));
+}
+
 TEST(TWHDWallet, Derive_XpubPub_vs_PrivPub) {
     // Test different routes for deriving address from mnemonic, result should be the same:
     // - Direct: mnemonic -> seed -> privateKey -> publicKey -> address
diff --git a/tests/interface/TWHRPTests.cpp b/tests/interface/TWHRPTests.cpp
index a4a205cb75a..d99e81a6bb8 100644
--- a/tests/interface/TWHRPTests.cpp
+++ b/tests/interface/TWHRPTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWHRP.h>
 #include <TrustWalletCore/TWCoinType.h>
@@ -30,11 +28,13 @@ TEST(TWHRP, StringForHRP) {
     ASSERT_STREQ(stringForHRP(TWHRPBandChain), "band");
     ASSERT_STREQ(stringForHRP(TWHRPBluzelle), "bluzelle");
     ASSERT_STREQ(stringForHRP(TWHRPCardano), "addr");
-    ASSERT_STREQ(stringForHRP(TWHRPElrond), "erd");
+    ASSERT_STREQ(stringForHRP(TWHRPMultiversX), "erd");
     ASSERT_STREQ(stringForHRP(TWHRPOasis), "oasis");
     ASSERT_STREQ(stringForHRP(TWHRPTHORChain), "thor");
     ASSERT_STREQ(stringForHRP(TWHRPCryptoOrg), "cro");
     ASSERT_STREQ(stringForHRP(TWHRPOsmosis), "osmo");
+    ASSERT_STREQ(stringForHRP(TWHRPSecret), "secret");
+    ASSERT_STREQ(stringForHRP(TWHRPPactus), "pc");
 }
 
 TEST(TWHRP, HRPForString) {
@@ -55,13 +55,15 @@ TEST(TWHRP, HRPForString) {
     ASSERT_EQ(hrpForString("kava"), TWHRPKava);
     ASSERT_EQ(hrpForString("band"), TWHRPBandChain);
     ASSERT_EQ(hrpForString("addr"), TWHRPCardano);
-    ASSERT_EQ(hrpForString("erd"), TWHRPElrond);
+    ASSERT_EQ(hrpForString("erd"), TWHRPMultiversX);
     ASSERT_EQ(hrpForString("oasis"), TWHRPOasis);
     ASSERT_EQ(hrpForString("thor"), TWHRPTHORChain);
     ASSERT_EQ(hrpForString("bluzelle"), TWHRPBluzelle);
     ASSERT_EQ(hrpForString("cro"), TWHRPCryptoOrg);
     ASSERT_EQ(hrpForString("osmo"), TWHRPOsmosis);
     ASSERT_EQ(hrpForString("ecash"), TWHRPECash);
+    ASSERT_EQ(hrpForString("secret"), TWHRPSecret);
+    ASSERT_EQ(hrpForString("pc"), TWHRPPactus);
 }
 
 TEST(TWHPR, HPRByCoinType) {
@@ -82,12 +84,14 @@ TEST(TWHPR, HPRByCoinType) {
     ASSERT_EQ(TWHRPBandChain, TWCoinTypeHRP(TWCoinTypeBandChain));
     ASSERT_EQ(TWHRPBluzelle, TWCoinTypeHRP(TWCoinTypeBluzelle));
     ASSERT_EQ(TWHRPCardano, TWCoinTypeHRP(TWCoinTypeCardano));
-    ASSERT_EQ(TWHRPElrond, TWCoinTypeHRP(TWCoinTypeElrond));
+    ASSERT_EQ(TWHRPMultiversX, TWCoinTypeHRP(TWCoinTypeMultiversX));
     ASSERT_EQ(TWHRPOasis, TWCoinTypeHRP(TWCoinTypeOasis));
     ASSERT_EQ(TWHRPTHORChain, TWCoinTypeHRP(TWCoinTypeTHORChain));
     ASSERT_EQ(TWHRPCryptoOrg, TWCoinTypeHRP(TWCoinTypeCryptoOrg));
     ASSERT_EQ(TWHRPOsmosis, TWCoinTypeHRP(TWCoinTypeOsmosis));
     ASSERT_EQ(TWHRPECash, TWCoinTypeHRP(TWCoinTypeECash));
+    ASSERT_EQ(TWHRPSecret, TWCoinTypeHRP(TWCoinTypeSecret));
+    ASSERT_EQ(TWHRPPactus, TWCoinTypeHRP(TWCoinTypePactus));
 
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeAion));
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeCallisto));
@@ -109,8 +113,8 @@ TEST(TWHPR, HPRByCoinType) {
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeStellar));
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeTezos));
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeTheta));
-    ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeThunderToken));
-    ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeTomoChain));
+    ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeThunderCore));
+    ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeViction));
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeTron));
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeVeChain));
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeWanchain));
@@ -120,4 +124,5 @@ TEST(TWHPR, HPRByCoinType) {
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeRavencoin));
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeWaves));
     ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeNEO));
+    ASSERT_EQ(TWHRPUnknown, TWCoinTypeHRP(TWCoinTypeNebl));
 }
diff --git a/tests/interface/TWHashTests.cpp b/tests/interface/TWHashTests.cpp
index 09b4498c690..800be2f28e9 100644
--- a/tests/interface/TWHashTests.cpp
+++ b/tests/interface/TWHashTests.cpp
@@ -1,15 +1,13 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Hash.h"
 #include "HexCoding.h"
 
 #include <TrustWalletCore/TWHash.h>
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <gtest/gtest.h>
 
 using namespace std;
diff --git a/tests/interface/TWMnemonicTests.cpp b/tests/interface/TWMnemonicTests.cpp
index 6ed7d3b1a9c..2fd55e74b85 100644
--- a/tests/interface/TWMnemonicTests.cpp
+++ b/tests/interface/TWMnemonicTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWMnemonic.h>
 
diff --git a/tests/interface/TWPBKDF2Tests.cpp b/tests/interface/TWPBKDF2Tests.cpp
index 646126fb3de..dbd22ca6fa4 100644
--- a/tests/interface/TWPBKDF2Tests.cpp
+++ b/tests/interface/TWPBKDF2Tests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWPBKDF2.h>
 
diff --git a/tests/interface/TWPrivateKeyTests.cpp b/tests/interface/TWPrivateKeyTests.cpp
index 96df973cf57..3c4882247ec 100644
--- a/tests/interface/TWPrivateKeyTests.cpp
+++ b/tests/interface/TWPrivateKeyTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "PrivateKey.h"
 #include "PublicKey.h"
@@ -83,68 +81,23 @@ TEST(TWPrivateKeyTests, PublicKey) {
         const auto publicKey = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyCurve25519(privateKey.get()));
         ASSERT_EQ(TW::hex(publicKey.get()->impl.bytes), "686cfce9108566dd43fc6aa75e31f9a9f319c9e9c04d6ad0a52505b86bc17c3a");
     }
-}
-
-TEST(TWPrivateKeyTests, GetSharedKey) {
-    const auto privateKeyHex = "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0";
-    const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privateKeyHex).get()));
-    ASSERT_TRUE(privateKey.get() != nullptr);
-
-    const auto publicKeyHex = "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992";
-    const auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA(publicKeyHex).get(), TWPublicKeyTypeSECP256k1));
-    EXPECT_TRUE(publicKey != nullptr);
-
-    const auto derivedData = WRAPD(TWPrivateKeyGetSharedKey(privateKey.get(), publicKey.get(), TWCurveSECP256k1));
-    ASSERT_EQ(TW::hex(*((TW::Data*)derivedData.get())), "ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a");
-}
-
-/**
- * Valid test vector from Wycherproof project
- * Source: https://github.com/google/wycheproof/blob/master/testvectors/ecdh_secp256k1_test.json#L31
- */
-TEST(TWPrivateKeyTests, GetSharedKeyWycherproof) {
-    // Stripped left-padded zeroes from: `00f4b7ff7cccc98813a69fae3df222bfe3f4e28f764bf91b4a10d8096ce446b254`
-    const auto privateKeyHex = "f4b7ff7cccc98813a69fae3df222bfe3f4e28f764bf91b4a10d8096ce446b254";
-    const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privateKeyHex).get()));
-    ASSERT_TRUE(privateKey.get() != nullptr);
-
-    // Decoded from ASN.1 & uncompressed `3056301006072a8648ce3d020106052b8104000a03420004d8096af8a11e0b80037e1ee68246b5dcbb0aeb1cf1244fd767db80f3fa27da2b396812ea1686e7472e9692eaf3e958e50e9500d3b4c77243db1f2acd67ba9cc4`
-    const auto publicKeyHex = "02d8096af8a11e0b80037e1ee68246b5dcbb0aeb1cf1244fd767db80f3fa27da2b";
-    const auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA(publicKeyHex).get(), TWPublicKeyTypeSECP256k1));
-    EXPECT_TRUE(publicKey != nullptr);
-
-    // SHA-256 of encoded x-coordinate `02544dfae22af6af939042b1d85b71a1e49e9a5614123c4d6ad0c8af65baf87d65`
-    const auto derivedData = WRAPD(TWPrivateKeyGetSharedKey(privateKey.get(), publicKey.get(), TWCurveSECP256k1));
-    ASSERT_EQ(TW::hex(*((TW::Data*)derivedData.get())), "81165066322732362ca5d3f0991d7f1f7d0aad7ea533276496785d369e35159a");
-}
-
-TEST(TWPrivateKeyTests, GetSharedKeyBidirectional) {
-    const auto privateKeyHex1 = "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0";
-    const auto privateKey1 = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privateKeyHex1).get()));
-    ASSERT_TRUE(privateKey1.get() != nullptr);
-    auto publicKey1 = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey1.get(), true));
-
-    const auto privateKeyHex2 = "ef2cf705af8714b35c0855030f358f2bee356ff3579cea2607b2025d80133c3a";
-    const auto privateKey2 = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privateKeyHex2).get()));
-    ASSERT_TRUE(privateKey2.get() != nullptr);
-    auto publicKey2 = WRAP(TWPublicKey, TWPrivateKeyGetPublicKeySecp256k1(privateKey2.get(), true));
-
-    const auto derivedData1 = WRAPD(TWPrivateKeyGetSharedKey(privateKey1.get(), publicKey2.get(), TWCurveSECP256k1));
-    const auto derivedData2 = WRAPD(TWPrivateKeyGetSharedKey(privateKey2.get(), publicKey1.get(), TWCurveSECP256k1));
-    ASSERT_EQ(TW::hex(*((TW::Data*)derivedData1.get())), TW::hex(*((TW::Data*)derivedData2.get())));
-}
-
-TEST(TWPrivateKeyTests, GetSharedKeyError) {
-    const auto privateKeyHex = "9cd3b16e10bd574fed3743d8e0de0b7b4e6c69f3245ab5a168ef010d22bfefa0";
-    const auto privateKey = WRAP(TWPrivateKey, TWPrivateKeyCreateWithData(DATA(privateKeyHex).get()));
-    ASSERT_TRUE(privateKey.get() != nullptr);
+    {
+        const auto publicKey =  WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeEthereum));
+        ASSERT_EQ(TW::hex(publicKey.get()->impl.bytes), "0499c6f51ad6f98c9c583f8e92bb7758ab2ca9a04110c0a1126ec43e5453d196c166b489a4b7c491e7688e6ebea3a71fc3a1a48d60f98d5ce84c93b65e423fde91");
 
-    const auto publicKeyHex = "02a18a98316b5f52596e75bfa5ca9fa9912edd0c989b86b73d41bb64c9c6adb992";
-    const auto publicKey = WRAP(TWPublicKey, TWPublicKeyCreateWithData(DATA(publicKeyHex).get(), TWPublicKeyTypeSECP256k1));
-    EXPECT_TRUE(publicKey != nullptr);
+        auto pubkeyType = TWCoinTypePublicKeyType(TWCoinTypeEthereum);
+        const auto publicKeyByType =  WRAP(TWPublicKey, TWPrivateKeyGetPublicKeyByType(privateKey.get(), pubkeyType));
 
-    const auto derivedData = WRAPD(TWPrivateKeyGetSharedKey(privateKey.get(), publicKey.get(), TWCurveED25519));
-    EXPECT_TRUE(derivedData == nullptr);
+        ASSERT_EQ(TW::hex(publicKey.get()->impl.bytes), TW::hex(publicKeyByType.get()->impl.bytes));
+    }
+    {
+        const auto publicKey =  WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeNEO));
+        ASSERT_EQ(TW::hex(publicKey.get()->impl.bytes), "026d786ab8fda678cf50f71d13641049a393b325063b8c0d4e5070de48a2caf9ab");
+    }
+    {
+        const auto publicKey =  WRAP(TWPublicKey, TWPrivateKeyGetPublicKey(privateKey.get(), TWCoinTypeWaves));
+        ASSERT_EQ(TW::hex(publicKey.get()->impl.bytes), "686cfce9108566dd43fc6aa75e31f9a9f319c9e9c04d6ad0a52505b86bc17c3a");
+    }
 }
 
 TEST(TWPrivateKeyTests, Sign) {
diff --git a/tests/interface/TWPublicKeyTests.cpp b/tests/interface/TWPublicKeyTests.cpp
index 5fd8fbd7af8..16b707e0a95 100644
--- a/tests/interface/TWPublicKeyTests.cpp
+++ b/tests/interface/TWPublicKeyTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include "PublicKey.h"
 #include "PrivateKey.h"
diff --git a/tests/interface/TWStoredKeyTests.cpp b/tests/interface/TWStoredKeyTests.cpp
index 9c34ea41a89..ee758923b47 100644
--- a/tests/interface/TWStoredKeyTests.cpp
+++ b/tests/interface/TWStoredKeyTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <TrustWalletCore/TWAccount.h>
 #include <TrustWalletCore/TWCoinType.h>
@@ -25,23 +23,23 @@ using namespace std;
 
 
 /// Return a StoredKey instance that can be used for further tests.  Needs to be deleted at the end.
-struct std::shared_ptr<TWStoredKey> createAStoredKey(TWCoinType coin, TWData* password) {
+struct std::shared_ptr<TWStoredKey> createAStoredKey(TWCoinType coin, TWData* password, TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr) {
     const auto mnemonic = WRAPS(TWStringCreateWithUTF8Bytes("team engine square letter hero song dizzy scrub tornado fabric divert saddle"));
     const auto name = WRAPS(TWStringCreateWithUTF8Bytes("name"));
-    const auto key = WRAP(TWStoredKey, TWStoredKeyImportHDWallet(mnemonic.get(), name.get(), password, coin));
+    const auto key = WRAP(TWStoredKey, TWStoredKeyImportHDWalletWithEncryption(mnemonic.get(), name.get(), password, coin, encryption));
     return key;
 }
 
 /// Return a StoredKey instance that can be used for further tests.  Needs to be deleted at the end.
-struct std::shared_ptr<TWStoredKey> createDefaultStoredKey() {
+struct std::shared_ptr<TWStoredKey> createDefaultStoredKey(TWStoredKeyEncryption encryption = TWStoredKeyEncryptionAes128Ctr) {
     const auto passwordString = WRAPS(TWStringCreateWithUTF8Bytes("password"));
     const auto password = WRAPD(TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(TWStringUTF8Bytes(passwordString.get())), TWStringSize(passwordString.get())));
     
-    return createAStoredKey(TWCoinTypeBitcoin, password.get());
+    return createAStoredKey(TWCoinTypeBitcoin, password.get(), encryption);
 }
 
 TEST(TWStoredKey, loadPBKDF2Key) {
-    const auto filename = WRAPS(TWStringCreateWithUTF8Bytes((TESTS_ROOT + "/Keystore/Data/pbkdf2.json").c_str()));
+    const auto filename = WRAPS(TWStringCreateWithUTF8Bytes((TESTS_ROOT + "/common/Keystore/Data/pbkdf2.json").c_str()));
     const auto key = WRAP(TWStoredKey, TWStoredKeyLoad(filename.get()));
     const auto keyId = WRAPS(TWStoredKeyIdentifier(key.get()));
     EXPECT_EQ(string(TWStringUTF8Bytes(keyId.get())), "3198bc9c-6672-5ab3-d995-4942343ae5b6");
@@ -57,7 +55,7 @@ TEST(TWStoredKey, createWallet) {
     const auto name = WRAPS(TWStringCreateWithUTF8Bytes("name"));
     const auto passwordString = WRAPS(TWStringCreateWithUTF8Bytes("password"));
     const auto password = WRAPD(TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(TWStringUTF8Bytes(passwordString.get())), TWStringSize(passwordString.get())));
-    const auto key = WRAP(TWStoredKey, TWStoredKeyCreateLevel(name.get(), password.get(), TWStoredKeyEncryptionLevelDefault));
+    const auto key = WRAP(TWStoredKey, TWStoredKeyCreateLevelAndEncryption(name.get(), password.get(), TWStoredKeyEncryptionLevelDefault, TWStoredKeyEncryptionAes128Ctr));
     const auto name2 = WRAPS(TWStoredKeyName(key.get()));
     EXPECT_EQ(string(TWStringUTF8Bytes(name2.get())), "name");
     const auto mnemonic = WRAPS(TWStoredKeyDecryptMnemonic(key.get(), password.get()));
@@ -82,6 +80,23 @@ TEST(TWStoredKey, importPrivateKey) {
     TWPrivateKeyDelete(privateKey3);
 }
 
+TEST(TWStoredKey, importPrivateKeyAes256) {
+    const auto privateKeyHex = "3a1076bf45ab87712ad64ccb3b10217737f7faacbf2872e88fdd9a537d8fe266";
+    const auto privateKey = WRAPD(TWDataCreateWithHexString(WRAPS(TWStringCreateWithUTF8Bytes(privateKeyHex)).get()));
+    const auto name = WRAPS(TWStringCreateWithUTF8Bytes("name"));
+    const auto passwordString = WRAPS(TWStringCreateWithUTF8Bytes("password"));
+    const auto password = WRAPD(TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(TWStringUTF8Bytes(passwordString.get())), TWStringSize(passwordString.get())));
+    const auto coin = TWCoinTypeBitcoin;
+    const auto key = WRAP(TWStoredKey, TWStoredKeyImportPrivateKeyWithEncryption(privateKey.get(), name.get(), password.get(), coin, TWStoredKeyEncryptionAes256Ctr));
+    const auto privateKey2 = WRAPD(TWStoredKeyDecryptPrivateKey(key.get(), password.get()));
+    EXPECT_EQ(hex(data(TWDataBytes(privateKey2.get()), TWDataSize(privateKey2.get()))), privateKeyHex);
+
+    const auto privateKey3 = TWStoredKeyPrivateKey(key.get(), coin, password.get());
+    const auto pkData3 = WRAPD(TWPrivateKeyData(privateKey3));
+    EXPECT_EQ(hex(data(TWDataBytes(pkData3.get()), TWDataSize(pkData3.get()))), privateKeyHex);
+    TWPrivateKeyDelete(privateKey3);
+}
+
 TEST(TWStoredKey, importHDWallet) {
     const auto mnemonic = WRAPS(TWStringCreateWithUTF8Bytes("team engine square letter hero song dizzy scrub tornado fabric divert saddle"));
     const auto name = WRAPS(TWStringCreateWithUTF8Bytes("name"));
@@ -97,6 +112,21 @@ TEST(TWStoredKey, importHDWallet) {
     EXPECT_EQ(nokey.get(), nullptr);
 }
 
+TEST(TWStoredKey, importHDWalletAES256) {
+    const auto mnemonic = WRAPS(TWStringCreateWithUTF8Bytes("team engine square letter hero song dizzy scrub tornado fabric divert saddle"));
+    const auto name = WRAPS(TWStringCreateWithUTF8Bytes("name"));
+    const auto passwordString = WRAPS(TWStringCreateWithUTF8Bytes("password"));
+    const auto password = WRAPD(TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(TWStringUTF8Bytes(passwordString.get())), TWStringSize(passwordString.get())));
+    const auto coin = TWCoinTypeBitcoin;
+    const auto key = WRAP(TWStoredKey, TWStoredKeyImportHDWalletWithEncryption(mnemonic.get(), name.get(), password.get(), coin, TWStoredKeyEncryptionAes256Ctr));
+    EXPECT_TRUE(TWStoredKeyIsMnemonic(key.get()));
+
+    // invalid mnemonic
+    const auto mnemonicInvalid = WRAPS(TWStringCreateWithUTF8Bytes("_THIS_IS_AN_INVALID_MNEMONIC_"));
+    const auto nokey = WRAP(TWStoredKey, TWStoredKeyImportHDWalletWithEncryption(mnemonicInvalid.get(), name.get(), password.get(), coin, TWStoredKeyEncryptionAes256Ctr));
+    EXPECT_EQ(nokey.get(), nullptr);
+}
+
 TEST(TWStoredKey, addressAddRemove) {
     const auto passwordString = WRAPS(TWStringCreateWithUTF8Bytes("password"));
     const auto password = WRAPD(TWDataCreateWithBytes(reinterpret_cast<const uint8_t *>(TWStringUTF8Bytes(passwordString.get())), TWStringSize(passwordString.get())));
@@ -174,6 +204,10 @@ TEST(TWStoredKey, addressAddDerivation) {
     EXPECT_EQ(string(TWStringUTF8Bytes(accountAddress2.get())), "1NyRyFewhZcWMa9XCj3bBxSXPXyoSg8dKz");
 
     EXPECT_EQ(TWStoredKeyAccountCount(key.get()), 2ul);
+
+    const auto accountCoin3 = WRAP(TWAccount, TWStoredKeyAccountForCoinDerivation(key.get(), coin, TWDerivationBitcoinTaproot, wallet.get()));
+    const auto accountAddress3 = WRAPS(TWAccountAddress(accountCoin3.get()));
+    EXPECT_EQ(string(TWStringUTF8Bytes(accountAddress3.get())), "bc1pyqkqf20fmmwmcxf98tv6k63e2sgnjy4zne6d0r32vxwm3au0hnksq6ec57");
 }
 
 TEST(TWStoredKey, exportJSON) {
@@ -184,6 +218,30 @@ TEST(TWStoredKey, exportJSON) {
     EXPECT_EQ(TWDataGet(json.get(), 0), '{');
 }
 
+TEST(TWStoredKey, storeAndImportJSONAES256) {
+    const auto key = createDefaultStoredKey(TWStoredKeyEncryptionAes256Ctr);
+    const auto outFileName = string(getTestTempDir() + "/TWStoredKey_store.json");
+    const auto outFileNameStr = WRAPS(TWStringCreateWithUTF8Bytes(outFileName.c_str()));
+    EXPECT_TRUE(TWStoredKeyStore(key.get(), outFileNameStr.get()));
+
+    // read contents of file
+    ifstream ifs(outFileName);
+    // get length of file:
+    ifs.seekg (0, ifs.end);
+    auto length = ifs.tellg();
+    ifs.seekg (0, ifs.beg);
+    EXPECT_TRUE(length > 20);
+
+    Data json(length);
+    size_t idx = 0;
+    // read the slow way, ifs.read gave some false warnings with codacy
+    while (!ifs.eof() && idx < static_cast<std::size_t>(length)) { char c = ifs.get(); json[idx++] = (uint8_t)c; }
+
+    const auto key2 = WRAP(TWStoredKey, TWStoredKeyImportJSON(WRAPD(TWDataCreateWithData(&json)).get()));
+    const auto name2 = WRAPS(TWStoredKeyName(key2.get()));
+    EXPECT_EQ(string(TWStringUTF8Bytes(name2.get())), "name");
+}
+
 TEST(TWStoredKey, storeAndImportJSON) {
     const auto key = createDefaultStoredKey();
     const auto outFileName = string(getTestTempDir() + "/TWStoredKey_store.json");
@@ -224,6 +282,80 @@ TEST(TWStoredKey, fixAddresses) {
     EXPECT_TRUE(TWStoredKeyFixAddresses(key.get(), password.get()));
 }
 
+// In this test, we add a TON account with an outdated bounceable (`EQ`) address to the key storage,
+// and then check if `TWStoredKeyUpdateAddress` re-derives non-bounceable `UQ` instead.
+TEST(TWStoredKey, UpdateAddressWithMnemonic) {
+    const auto keyName = STRING("key");
+    const string passwordString = "password";
+    const auto password = WRAPD(TWDataCreateWithBytes((const uint8_t*)passwordString.c_str(), passwordString.size()));
+
+    // Create stored key with a dummy Bitcoin account.
+    auto key = createAStoredKey(TWCoinTypeBitcoin, password.get());
+
+    const auto oldAddress = "EQDSRYDMMez8BdcOuPEiaR6aJZpO6EjlIwmOBFn14mMbnUtk";
+    const auto newAddress = "UQDSRYDMMez8BdcOuPEiaR6aJZpO6EjlIwmOBFn14mMbnRah";
+    const auto derivationPath = "m/44'/607'/0'";
+    const auto extPubKey = "";
+    const auto pubKey = "b191d35f81aa8b144aa91c90a6b887e0b165ad9c2933b1c5266eb5c4e8bea241";
+
+    // Add a TON account with an outdated address (bounceable).
+    TWStoredKeyAddAccount(key.get(),
+                          STRING(oldAddress).get(),
+                          TWCoinTypeTON,
+                          STRING(derivationPath).get(),
+                          STRING(pubKey).get(),
+                          STRING(extPubKey).get());
+    EXPECT_EQ(TWStoredKeyAccountCount(key.get()), 2ul);
+
+    // Last step - update TON account address.
+    // Expect to have a non-bounceable address in the end.
+    ASSERT_TRUE(TWStoredKeyUpdateAddress(key.get(), TWCoinTypeTON));
+    const auto tonAccount = WRAP(TWAccount, TWStoredKeyAccountForCoin(key.get(), TWCoinTypeTON, nullptr));
+    assertStringsEqual(WRAPS(TWAccountAddress(tonAccount.get())), newAddress);
+}
+
+// In this test, we add an Ethereum account with an outdated lowercase address to the key storage,
+// and then check if `TWStoredKeyUpdateAddress` re-derives checksummed address instead.
+TEST(TWStoredKey, UpdateAddressWithPrivateKey) {
+    const auto keyName = STRING("key");
+    const auto privateKey = DATA("3a1076bf45ab87712ad64ccb3b10217737f7faacbf2872e88fdd9a537d8fe266");
+    const string passwordString = "password";
+    const auto password = WRAPD(TWDataCreateWithBytes((const uint8_t*)passwordString.c_str(), passwordString.size()));
+
+    // Create stored key with a dummy Bitcoin account.
+    auto key = WRAP(TWStoredKey, TWStoredKeyImportPrivateKey(privateKey.get(), keyName.get(), password.get(), TWCoinTypeBitcoin));
+
+    const auto oldAddress = "0xc2d7cf95645d33006175b78989035c7c9061d3f9";
+    const auto newAddress = "0xC2D7CF95645D33006175B78989035C7c9061d3F9";
+    const auto derivationPath = "m/44'/60'/0'";
+    const auto extPubKey = "";
+    const auto pubKey = "04efb99d9860f4dec4cb548a5722c27e9ef58e37fbab9719c5b33d55c216db49311221a01f638ce5f255875b194e0acaa58b19a89d2e56a864427298f826a7f887";
+
+    // Add an Ethereum account with an outdated address (lowercase).
+    TWStoredKeyAddAccount(key.get(),
+                          STRING(oldAddress).get(),
+                          TWCoinTypeEthereum,
+                          STRING(derivationPath).get(),
+                          STRING(pubKey).get(),
+                          STRING(extPubKey).get());
+    EXPECT_EQ(TWStoredKeyAccountCount(key.get()), 2ul);
+
+    // Last step - update Ethereum account address.
+    // Expect to have a checksummed address in the end.
+    ASSERT_TRUE(TWStoredKeyUpdateAddress(key.get(), TWCoinTypeEthereum));
+    const auto ethAccount = WRAP(TWAccount, TWStoredKeyAccountForCoin(key.get(), TWCoinTypeEthereum, nullptr));
+    assertStringsEqual(WRAPS(TWAccountAddress(ethAccount.get())), newAddress);
+}
+
+TEST(TWStoredKey, updateAddressNoAssociatedAccounts) {
+    const auto keyName = STRING("key");
+    const string passwordString = "password";
+    const auto password = WRAPD(TWDataCreateWithBytes((const uint8_t*)passwordString.c_str(), passwordString.size()));
+
+    auto key = createAStoredKey(TWCoinTypeBitcoin, password.get());
+    ASSERT_FALSE(TWStoredKeyUpdateAddress(key.get(), TWCoinTypeEthereum));
+}
+
 TEST(TWStoredKey, importInvalidKey) {
     auto bytes = TW::parse_hex("fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141");
     auto data = WRAPD(TWDataCreateWithBytes(bytes.data(), bytes.size()));
diff --git a/tests/interface/TWStringTests.cpp b/tests/interface/TWStringTests.cpp
index 17d800b6782..15177373914 100644
--- a/tests/interface/TWStringTests.cpp
+++ b/tests/interface/TWStringTests.cpp
@@ -1,10 +1,8 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include "TWTestUtilities.h"
+#include "TestUtilities.h"
 
 #include <gtest/gtest.h>
 
@@ -21,3 +19,19 @@ TEST(StringTests, HexNumber) {
     auto string = WRAPS(TWStringCreateWithHexData(data.get()));
     ASSERT_STREQ(TWStringUTF8Bytes(string.get()), "deadbeef");
 }
+
+TEST(StringTests, GetChar) {
+    uint8_t bytes[] = { 0xde, 0xad, 0xbe, 0xef };
+    auto data = WRAPD(TWDataCreateWithBytes(bytes, 4));
+    auto string = WRAPS(TWStringCreateWithHexData(data.get()));
+    ASSERT_STREQ(TWStringUTF8Bytes(string.get()), "deadbeef");
+
+    ASSERT_EQ(TWStringGet(string.get(), 0), 'd');
+    ASSERT_EQ(TWStringGet(string.get(), 1), 'e');
+    ASSERT_EQ(TWStringGet(string.get(), 2), 'a');
+    ASSERT_EQ(TWStringGet(string.get(), 3), 'd');
+    ASSERT_EQ(TWStringGet(string.get(), 4), 'b');
+    ASSERT_EQ(TWStringGet(string.get(), 5), 'e');
+    ASSERT_EQ(TWStringGet(string.get(), 6), 'e');
+    ASSERT_EQ(TWStringGet(string.get(), 7), 'f');
+}
\ No newline at end of file
diff --git a/tests/interface/TWTestUtilities.cpp b/tests/interface/TWTestUtilities.cpp
deleted file mode 100644
index 7a7fae7b15a..00000000000
--- a/tests/interface/TWTestUtilities.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "TWTestUtilities.h"
-
-#include <string>
-#include <fstream>
-
-using namespace std;
-
-/// Return a writable temp dir which can be used to create files during testing
-string getTestTempDir(void) {
-    // In general, tests should not use hardcoded "/tmp", but TEST_TMPDIR env var.
-    const char* fromEnvironment = getenv("TEST_TMPDIR");
-    if (fromEnvironment == NULL || fromEnvironment[0] == '\0') { return "/tmp"; }
-    return string(fromEnvironment);
-}
-
-nlohmann::json loadJson(std::string path) {
-    std::ifstream stream(path);
-    nlohmann::json json;
-    stream >> json;
-    return json;
-}
diff --git a/tests/interface/TWTestUtilities.h b/tests/interface/TWTestUtilities.h
deleted file mode 100644
index a03691dc7e4..00000000000
--- a/tests/interface/TWTestUtilities.h
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright © 2017-2020 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#pragma once
-
-#include <TrustWalletCore/TWData.h>
-#include <TrustWalletCore/TWString.h>
-
-#include <gtest/gtest.h>
-#include <google/protobuf/util/json_util.h>
-#include <nlohmann/json.hpp>
-
-#include <vector>
-
-#define WRAP(type, x) std::shared_ptr<type>(x, type##Delete)
-#define WRAPD(x) std::shared_ptr<TWData>(x, TWDataDelete)
-#define WRAPS(x) std::shared_ptr<TWString>(x, TWStringDelete)
-#define STRING(x) std::shared_ptr<TWString>(TWStringCreateWithUTF8Bytes(x), TWStringDelete)
-#define DATA(x) std::shared_ptr<TWData>(TWDataCreateWithHexString(STRING(x).get()), TWDataDelete)
-
-inline void assertStringsEqual(const std::shared_ptr<TWString>& string, const char* expected) {
-    ASSERT_STREQ(TWStringUTF8Bytes(string.get()), expected);
-}
-
-inline void assertHexEqual(const std::shared_ptr<TWData>& data, const char* expected) {
-    auto hex = WRAPS(TWStringCreateWithHexData(data.get()));
-    assertStringsEqual(hex, expected);
-}
-
-inline void assertJSONEqual(const std::string& lhs, const char* expected) {
-    auto lhsJson = nlohmann::json::parse(lhs);
-    auto rhsJson = nlohmann::json::parse(std::string(expected));
-    ASSERT_EQ(lhsJson, rhsJson);
-}
-
-inline std::vector<uint8_t>* dataFromTWData(TWData* data) {
-    return const_cast<std::vector<uint8_t>*>(reinterpret_cast<const std::vector<uint8_t>*>(data));
-}
-
-/// Return a writable temp dir which can be used to create files during testing
-std::string getTestTempDir(void);
-
-#define ANY_SIGN(input, coin) \
-        {\
-            auto inputData = input.SerializeAsString();\
-            auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));\
-            auto outputTWData = WRAPD(TWAnySignerSign(inputTWData.get(), coin));\
-            output.ParseFromArray(TWDataBytes(outputTWData.get()), static_cast<int>(TWDataSize(outputTWData.get())));\
-        }
-#define ANY_PLAN(input, output, coin) \
-        {\
-            auto inputData = input.SerializeAsString();\
-            auto inputTWData = WRAPD(TWDataCreateWithBytes((const uint8_t *)inputData.data(), inputData.size()));\
-            auto outputTWData = WRAPD(TWAnySignerPlan(inputTWData.get(), coin));\
-            output.ParseFromArray(TWDataBytes(outputTWData.get()), static_cast<int>(TWDataSize(outputTWData.get())));\
-        }
-#define DUMP_PROTO(input) \
-        { \
-            std::string json; \
-            google::protobuf::util::MessageToJsonString(input, &json); \
-            std::cout<<"dump proto: "<<json<<std::endl; \
-        }
-
-/// For tests which should throw.  Wrap code under test in this macro.  
-/// ExceptionMsg is the expected exception message (startsWith match)
-#define EXPECT_EXCEPTION(statement, expExceptionMsg) \
-    try { \
-        statement; \
-        FAIL() << "An exception was expected, but none was thrown"; \
-    } catch (const std::exception& ex) { \
-        const std::string expEx = expExceptionMsg; \
-        const std::string actEx = ex.what(); \
-        const auto actExPrefix = actEx.substr(0, expEx.length()); \
-        EXPECT_EQ(actExPrefix, expEx); \
-    } catch (...) { \
-        FAIL() << "Not the expected exception"; \
-    }
-
-/// Open a json file
-nlohmann::json loadJson(std::string path);
diff --git a/tests/interface/TWTransactionCompilerTests.cpp b/tests/interface/TWTransactionCompilerTests.cpp
index 5793a97340a..806de4959da 100644
--- a/tests/interface/TWTransactionCompilerTests.cpp
+++ b/tests/interface/TWTransactionCompilerTests.cpp
@@ -1,20 +1,22 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-#include <TrustWalletCore/TWCoinType.h>
-#include <TrustWalletCore/TWTransactionCompiler.h>
-#include <TrustWalletCore/TWData.h>
 #include "proto/Binance.pb.h"
 #include "proto/Bitcoin.pb.h"
 #include "proto/Ethereum.pb.h"
+#include "proto/NULS.pb.h"
+#include "proto/Ripple.pb.h"
+#include "proto/Solana.pb.h"
 #include "proto/TransactionCompiler.pb.h"
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWData.h>
+#include <TrustWalletCore/TWTransactionCompiler.h>
 
-#include <TrustWalletCore/TWBitcoinSigHashType.h>
 #include "Bitcoin/Script.h"
 #include "Bitcoin/SegwitAddress.h"
+#include "NULS/Address.h"
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
 
 #include "HexCoding.h"
 #include "PrivateKey.h"
@@ -22,80 +24,103 @@
 #include "uint256.h"
 #include <TrustWalletCore/TWAnySigner.h>
 
-#include "../interface/TWTestUtilities.h"
+#include "TestUtilities.h"
 #include <gtest/gtest.h>
 
-#include <thread>
 #include <algorithm>
 #include <map>
+#include <thread>
 
 using namespace TW;
 
 TEST(TWTransactionCompiler, ExternalSignatureSignBinance) {
     /// Step 1: Prepare transaction input (protobuf)
     const auto coin = TWCoinTypeBinance;
-    const auto txInputData = WRAPD(TWTransactionCompilerBuildInput(
-        coin,
-        STRING("bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2").get(),  // from
-        STRING("bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5").get(),  // to
-        STRING("1").get(),  // amount
-        STRING("BNB").get(),  // asset
-        STRING("").get(),  // memo
-        STRING("Binance-Chain-Nile").get()  // testnet chainId
-    ));
+    // bnb1grpf0955h0ykzq3ar5nmum7y6gdfl6lxfn46h2
+    const auto fromAddressData = parse_hex("40c2979694bbc961023d1d27be6fc4d21a9febe6");
+    // bnb1hlly02l6ahjsgxw9wlcswnlwdhg4xhx38yxpd5
+    const auto toAddressData = parse_hex("bffe47abfaede50419c577f1074fee6dd1535cd1");
+
+    Binance::Proto::SigningInput txInput;
+
+    txInput.set_chain_id("Binance-Chain-Nile");
+    auto& sendOrder = *txInput.mutable_send_order();
+
+    auto& input1 = *sendOrder.add_inputs();
+    input1.set_address(fromAddressData.data(), fromAddressData.size());
+    auto& input1Coin = *input1.add_coins();
+    input1Coin.set_amount(1);
+    input1Coin.set_denom("BNB");
+
+    auto& output1 = *sendOrder.add_outputs();
+    output1.set_address(toAddressData.data(), toAddressData.size());
+    auto& output1Coin = *output1.add_coins();
+    output1Coin.set_amount(1);
+    output1Coin.set_denom("BNB");
+
+    auto txInputData = data(txInput.SerializeAsString());
 
     {
         // Check, by parsing
-        EXPECT_EQ((int)TWDataSize(txInputData.get()), 88);
+        EXPECT_EQ((int)txInputData.size(), 88);
         Binance::Proto::SigningInput input;
-        ASSERT_TRUE(input.ParseFromArray(TWDataBytes(txInputData.get()), (int)TWDataSize(txInputData.get())));
+        ASSERT_TRUE(input.ParseFromArray(txInputData.data(), (int)txInputData.size()));
         EXPECT_EQ(input.chain_id(), "Binance-Chain-Nile");
         EXPECT_TRUE(input.has_send_order());
         ASSERT_EQ(input.send_order().inputs_size(), 1);
-        EXPECT_EQ(hex(data(input.send_order().inputs(0).address())), "40c2979694bbc961023d1d27be6fc4d21a9febe6");
+        EXPECT_EQ(hex(data(input.send_order().inputs(0).address())),
+                  "40c2979694bbc961023d1d27be6fc4d21a9febe6");
     }
 
     /// Step 2: Obtain preimage hash
-    const auto preImageHashes = WRAPD(TWTransactionCompilerPreImageHashes(coin, txInputData.get()));
+    auto txInputDataPtr = WRAPD(TWDataCreateWithBytes(txInputData.data(), txInputData.size()));
+    const auto preImageHashes = WRAPD(TWTransactionCompilerPreImageHashes(coin, txInputDataPtr.get()));
     auto preImageHash = data(TWDataBytes(preImageHashes.get()), TWDataSize(preImageHashes.get()));
 
     TxCompiler::Proto::PreSigningOutput preSigningOutput;
     ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHash.data(), int(preImageHash.size())));
-    ASSERT_EQ(preSigningOutput.error(), 0);
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
     const auto preImageHashData = data(preSigningOutput.data_hash());
     
     EXPECT_EQ(hex(preImageHashData), "3f3fece9059e714d303a9a1496ddade8f2c38fa78fc4cc2e505c5dbb0ea678d1");
 
     // Simulate signature, normally obtained from signature server
-    const auto publicKeyData = parse_hex("026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502");
+    const auto publicKeyData =
+        parse_hex("026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e502");
     const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
-    const auto signature = parse_hex("1b1181faec30b60a2ddaa2804c253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5366bb8b041781a6771248550d04094c3d7a504f9e8310679");
+    const auto signature =
+        parse_hex("1b1181faec30b60a2ddaa2804c253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5"
+                  "366bb8b041781a6771248550d04094c3d7a504f9e8310679");
 
     // Verify signature (pubkey & hash & signature)
-    {
-        EXPECT_TRUE(publicKey.verify(signature, preImageHashData));
-    }
+    { EXPECT_TRUE(publicKey.verify(signature, preImageHashData)); }
 
     /// Step 3: Compile transaction info
     const auto outputData = WRAPD(TWTransactionCompilerCompileWithSignatures(
-        coin,
-        txInputData.get(),
+        coin, txInputDataPtr.get(),
         WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&signature)).get(),
-        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&publicKeyData)).get())
-    );
-
-    const auto ExpectedTx = "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212401b1181faec30b60a2ddaa2804c253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5366bb8b041781a6771248550d04094c3d7a504f9e8310679";
+        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&publicKeyData)).get()));
+
+    const auto ExpectedTx =
+        "b801f0625dee0a462a2c87fa0a1f0a1440c2979694bbc961023d1d27be6fc4d21a9febe612070a03424e421001"
+        "121f0a14bffe47abfaede50419c577f1074fee6dd1535cd112070a03424e421001126a0a26eb5ae98721026a35"
+        "920088d98c3888ca68c53dfc93f4564602606cbb87f0fe5ee533db38e50212401b1181faec30b60a2ddaa2804c"
+        "253cf264c69180ec31814929b5de62088c0c5a45e8a816d1208fc5366bb8b041781a6771248550d04094c3d7a5"
+        "04f9e8310679";
     {
-        EXPECT_EQ(TWDataSize(outputData.get()), 189ul);
         Binance::Proto::SigningOutput output;
-        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()), (int)TWDataSize(outputData.get())));
+        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()),
+                                          (int)TWDataSize(outputData.get())));
 
         EXPECT_EQ(hex(output.encoded()), ExpectedTx);
     }
 
-    { // Double check: check if simple signature process gives the same result. Note that private keys were not used anywhere up to this point.
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
         Binance::Proto::SigningInput input;
-        ASSERT_TRUE(input.ParseFromArray(TWDataBytes(txInputData.get()), (int)TWDataSize(txInputData.get())));
+        ASSERT_TRUE(input.ParseFromArray(TWDataBytes(txInputDataPtr.get()),
+                                         (int)TWDataSize(txInputDataPtr.get())));
         auto key = parse_hex("95949f757db1f57ca94a5dff23314accbe7abee89597bf6a3c7382c84d7eb832");
         input.set_private_key(key.data(), key.size());
 
@@ -109,33 +134,22 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBinance) {
 TEST(TWTransactionCompiler, ExternalSignatureSignEthereum) {
     /// Step 1: Prepare transaction input (protobuf)
     const auto coin = TWCoinTypeEthereum;
-    const auto txInputData0 = WRAPD(TWTransactionCompilerBuildInput(
-        coin,
-        STRING("0x9d8A62f656a8d1615C1294fd71e9CFb3E4855A4F").get(),  // from
-        STRING("0x3535353535353535353535353535353535353535").get(),  // to
-        STRING("1000000000000000000").get(),  // amount
-        STRING("ETH").get(),  // asset
-        STRING("").get(),  // memo
-        STRING("").get()  // chainId
-    ));
-
-    // Check, by parsing
-    EXPECT_EQ((int)TWDataSize(txInputData0.get()), 61);
     Ethereum::Proto::SigningInput signingInput;
-    ASSERT_TRUE(signingInput.ParseFromArray(TWDataBytes(txInputData0.get()), (int)TWDataSize(txInputData0.get())));
-    EXPECT_EQ(hex(signingInput.chain_id()), "01");
-    EXPECT_EQ(signingInput.to_address(), "0x3535353535353535353535353535353535353535");
-    ASSERT_TRUE(signingInput.transaction().has_transfer());
-    EXPECT_EQ(hex(signingInput.transaction().transfer().amount()), "0de0b6b3a7640000");
 
-    // Set a few other values
     const auto nonce = store(uint256_t(11));
+    const auto chainId = store(uint256_t(1));
     const auto gasPrice = store(uint256_t(20000000000));
     const auto gasLimit = store(uint256_t(21000));
+    const auto amount = store(uint256_t(1'000'000'000'000'000'000));
+
     signingInput.set_nonce(nonce.data(), nonce.size());
+    signingInput.set_chain_id(chainId.data(), chainId.size());
     signingInput.set_gas_price(gasPrice.data(), gasPrice.size());
     signingInput.set_gas_limit(gasLimit.data(), gasLimit.size());
     signingInput.set_tx_mode(Ethereum::Proto::Legacy);
+    signingInput.set_to_address("0x3535353535353535353535353535353535353535");
+
+    signingInput.mutable_transaction()->mutable_transfer()->set_amount(amount.data(), amount.size());
 
     // Serialize back, this shows how to serialize SigningInput protobuf to byte array
     const auto txInputDataData = data(signingInput.SerializeAsString());
@@ -148,41 +162,48 @@ TEST(TWTransactionCompiler, ExternalSignatureSignEthereum) {
 
     TxCompiler::Proto::PreSigningOutput preSigningOutput;
     ASSERT_TRUE(preSigningOutput.ParseFromArray(preImageHash.data(), int(preImageHash.size())));
-    ASSERT_EQ(preSigningOutput.error(), 0);
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
     const auto preImageHashData = data(preSigningOutput.data_hash());
     EXPECT_EQ(hex(preImageHashData), "15e180a6274b2f6a572b9b51823fce25ef39576d10188ecdcd7de44526c47217");
 
     // Simulate signature, normally obtained from signature server
-    const auto publicKeyData = parse_hex("044bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ce28cab79ad7119ee1ad3ebcdb98a16805211530ecc6cfefa1b88e6dff99232a");
+    const auto publicKeyData =
+        parse_hex("044bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382ce28cab79ad711"
+                  "9ee1ad3ebcdb98a16805211530ecc6cfefa1b88e6dff99232a");
     const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1Extended);
-    const auto signature = parse_hex("360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c9796677900");
+    const auto signature =
+        parse_hex("360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07b53bd9d1376e15a19"
+                  "1d844db458893b928f3efbfee90c9febf51ab84c9796677900");
 
     // Verify signature (pubkey & hash & signature)
-    {
-        EXPECT_TRUE(publicKey.verify(signature, preImageHashData));
-    }
+    { EXPECT_TRUE(publicKey.verify(signature, preImageHashData)); }
 
     /// Step 3: Compile transaction info
     const auto outputData = WRAPD(TWTransactionCompilerCompileWithSignatures(
-        coin,
-        txInputData.get(),
+        coin, txInputData.get(),
         WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&signature)).get(),
-        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&publicKeyData)).get())
-    );
+        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&publicKeyData)).get()));
 
-    const auto ExpectedTx = "f86c0b8504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a0360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07ba053bd9d1376e15a191d844db458893b928f3efbfee90c9febf51ab84c97966779";
+    const auto ExpectedTx =
+        "f86c0b8504a817c800825208943535353535353535353535353535353535353535880de0b6b3a76400008025a0"
+        "360a84fb41ad07f07c845fedc34cde728421803ebbaae392fc39c116b29fc07ba053bd9d1376e15a191d844db4"
+        "58893b928f3efbfee90c9febf51ab84c97966779";
     {
-        EXPECT_EQ(TWDataSize(outputData.get()), 183ul);
+        EXPECT_EQ(TWDataSize(outputData.get()), 217ul);
         Ethereum::Proto::SigningOutput output;
-        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()), (int)TWDataSize(outputData.get())));
+        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()),
+                                          (int)TWDataSize(outputData.get())));
 
         EXPECT_EQ(output.encoded().size(), 110ul);
         EXPECT_EQ(hex(output.encoded()), ExpectedTx);
     }
 
-    { // Double check: check if simple signature process gives the same result. Note that private keys were not used anywhere up to this point.
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
         Ethereum::Proto::SigningInput input;
-        ASSERT_TRUE(input.ParseFromArray(TWDataBytes(txInputData.get()), (int)TWDataSize(txInputData.get())));
+        ASSERT_TRUE(input.ParseFromArray(TWDataBytes(txInputData.get()),
+                                         (int)TWDataSize(txInputData.get())));
         auto key = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
         input.set_private_key(key.data(), key.size());
 
@@ -199,14 +220,19 @@ Data dataFromTWData(std::shared_ptr<TWData> data) {
 }
 
 TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
-    // Test external signining with a Bircoin transaction with 3 input UTXOs, all used, but only using 2 public keys.
+    // Test external signining with a Bitcoin transaction with 3 input UTXOs, all used, but only using 2 public keys.
     // Three signatures are neeeded.  This illustrates that order of UTXOs/hashes is not always the same.
 
-    const auto revUtxoHash0 = parse_hex("07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8");
-    const auto revUtxoHash1 = parse_hex("d6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e");
-    const auto revUtxoHash2 = parse_hex("6021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d");
-    const auto inPubKey0 = parse_hex("024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382");
-    const auto inPubKey1 = parse_hex("0217142f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc");
+    const auto revUtxoHash0 =
+        parse_hex("07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa8");
+    const auto revUtxoHash1 =
+        parse_hex("d6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e");
+    const auto revUtxoHash2 =
+        parse_hex("6021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d");
+    const auto inPubKey0 =
+        parse_hex("024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382");
+    const auto inPubKey1 =
+        parse_hex("0217142f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc");
     const auto inPubKeyHash0 = parse_hex("bd92088bb7e82d611a9b94fbb74a0908152b784f");
     const auto inPubKeyHash1 = parse_hex("6641abedacf9483b793afe1718689cc9420bbb1c");
 
@@ -219,11 +245,11 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
     };
     std::vector<UtxoInfo> utxoInfos = {
         // first
-        UtxoInfo {revUtxoHash0, inPubKey0, 600'000, 0},
+        UtxoInfo{revUtxoHash0, inPubKey0, 600'000, 0},
         // second UTXO, with same pubkey
-        UtxoInfo {revUtxoHash1, inPubKey0, 500'000, 1},
+        UtxoInfo{revUtxoHash1, inPubKey0, 500'000, 1},
         // third UTXO, with different pubkey
-        UtxoInfo {revUtxoHash2, inPubKey1, 400'000, 0},
+        UtxoInfo{revUtxoHash2, inPubKey1, 400'000, 0},
     };
 
     // Signature infos, indexed by pubkeyhash+hash
@@ -232,27 +258,27 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
         Data publicKey;
     };
     std::map<std::string, SignatureInfo> signatureInfos = {
-        {
-            hex(inPubKeyHash0) + "+" + "a296bead4172007be69b21971a790e076388666c162a9505698415f1b003ebd7",
-            {
-                parse_hex("304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a40"),
-                inPubKey0,
-            }
-        },
-        {
-            hex(inPubKeyHash1) + "+" + "505f527f00e15fcc5a2d2416c9970beb57dfdfaca99e572a01f143b24dd8fab6",
-            {
-                parse_hex("3044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e37966414fe115820220646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e4"),
-                inPubKey1,
-            }
-        },
-        {
-            hex(inPubKeyHash0) + "+" + "60ed6e9371e5ddc72fd88e46a12cb2f68516ebd307c0fd31b1b55cf767272101",
-            {
-                parse_hex("30440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b102207e777f7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc"),
-                inPubKey0,
-            }
-        },
+        {hex(inPubKeyHash0) + "+" +
+             "a296bead4172007be69b21971a790e076388666c162a9505698415f1b003ebd7",
+         {
+             parse_hex("304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b349022"
+                       "00a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a40"),
+             inPubKey0,
+         }},
+        {hex(inPubKeyHash1) + "+" +
+             "505f527f00e15fcc5a2d2416c9970beb57dfdfaca99e572a01f143b24dd8fab6",
+         {
+             parse_hex("3044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e37966414fe11582022"
+                       "0646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e4"),
+             inPubKey1,
+         }},
+        {hex(inPubKeyHash0) + "+" +
+             "60ed6e9371e5ddc72fd88e46a12cb2f68516ebd307c0fd31b1b55cf767272101",
+         {
+             parse_hex("30440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b1022"
+                       "07e777f7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc"),
+             inPubKey0,
+         }},
     };
 
     const auto coin = TWCoinTypeBitcoin;
@@ -270,23 +296,32 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
 
     // process UTXOs
     int count = 0;
-    for (auto& u: utxoInfos) {
+    for (auto& u : utxoInfos) {
         const auto publicKey = PublicKey(u.publicKey, TWPublicKeyTypeSECP256k1);
         const auto address = Bitcoin::SegwitAddress(publicKey, "bc");
-        if (count == 0) EXPECT_EQ(address.string(), ownAddress);
-        if (count == 1) EXPECT_EQ(address.string(), ownAddress);
-        if (count == 2) EXPECT_EQ(address.string(), "bc1qveq6hmdvl9yrk7f6lct3s6yue9pqhwcuxedggg");
+        if (count == 0)
+            EXPECT_EQ(address.string(), ownAddress);
+        if (count == 1)
+            EXPECT_EQ(address.string(), ownAddress);
+        if (count == 2)
+            EXPECT_EQ(address.string(), "bc1qveq6hmdvl9yrk7f6lct3s6yue9pqhwcuxedggg");
 
         const auto utxoScript = Bitcoin::Script::lockScriptForAddress(address.string(), coin);
-        if (count == 0) EXPECT_EQ(hex(utxoScript.bytes), "0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
-        if (count == 1) EXPECT_EQ(hex(utxoScript.bytes), "0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
-        if (count == 2) EXPECT_EQ(hex(utxoScript.bytes), "00146641abedacf9483b793afe1718689cc9420bbb1c");
+        if (count == 0)
+            EXPECT_EQ(hex(utxoScript.bytes), "0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
+        if (count == 1)
+            EXPECT_EQ(hex(utxoScript.bytes), "0014bd92088bb7e82d611a9b94fbb74a0908152b784f");
+        if (count == 2)
+            EXPECT_EQ(hex(utxoScript.bytes), "00146641abedacf9483b793afe1718689cc9420bbb1c");
 
         Data keyHash;
         EXPECT_TRUE(utxoScript.matchPayToWitnessPublicKeyHash(keyHash));
-        if (count == 0) EXPECT_EQ(hex(keyHash), hex(inPubKeyHash0));
-        if (count == 1) EXPECT_EQ(hex(keyHash), hex(inPubKeyHash0));
-        if (count == 2) EXPECT_EQ(hex(keyHash), hex(inPubKeyHash1));
+        if (count == 0)
+            EXPECT_EQ(hex(keyHash), hex(inPubKeyHash0));
+        if (count == 1)
+            EXPECT_EQ(hex(keyHash), hex(inPubKeyHash0));
+        if (count == 2)
+            EXPECT_EQ(hex(keyHash), hex(inPubKeyHash1));
 
         const auto redeemScript = Bitcoin::Script::buildPayToPublicKeyHash(keyHash);
         if (count == 0) EXPECT_EQ(hex(redeemScript.bytes), "76a914bd92088bb7e82d611a9b94fbb74a0908152b784f88ac");
@@ -297,7 +332,8 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
         auto utxo = signingInput.add_utxo();
         utxo->set_script(utxoScript.bytes.data(), utxoScript.bytes.size());
         utxo->set_amount(u.amount);
-        utxo->mutable_out_point()->set_hash(std::string(u.revUtxoHash.begin(), u.revUtxoHash.end()));
+        utxo->mutable_out_point()->set_hash(
+            std::string(u.revUtxoHash.begin(), u.revUtxoHash.end()));
         utxo->mutable_out_point()->set_index(u.index);
         utxo->mutable_out_point()->set_sequence(UINT32_MAX);
 
@@ -326,7 +362,6 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
     // Serialize signingInput
     const auto txInputDataData = data(signingInput.SerializeAsString());
     const auto txInputData = WRAPD(TWDataCreateWithBytes(txInputDataData.data(), txInputDataData.size()));
-    EXPECT_EQ((int)TWDataSize(txInputData.get()), 692);
 
     /// Step 2: Obtain preimage hashes
     const auto preImageHashes = WRAPD(TWTransactionCompilerPreImageHashes(coin, txInputData.get()));
@@ -364,14 +399,26 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
     }
     /// Step 3: Compile transaction info
     const auto outputData = WRAPD(TWTransactionCompilerCompileWithSignatures(
-        coin, txInputData.get(), signatureVec.get(), pubkeyVec.get()
-    ));
-
-    const auto ExpectedTx = "010000000001036021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d0000000000ffffffffd6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e0100000000ffffffff07c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa80000000000ffffffff02804f1200000000001600145360df8231ac5965147c9d90ca930a2aafb05232cb92040000000000160014bd92088bb7e82d611a9b94fbb74a0908152b784f02473044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e37966414fe115820220646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e401210217142f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc0247304402201857bc6e6e48b46046a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efdbc9c6784aa2571ff4f6f2a400121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb493382024730440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b102207e777f7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc0121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb49338200000000";
+        coin, txInputData.get(), signatureVec.get(), pubkeyVec.get()));
+
+    const auto ExpectedTx =
+        "010000000001036021efcf7555f90627364339fc921139dd40a06ccb2cb2a2a4f8f4ea7a2dc74d0000000000ff"
+        "ffffffd6892a5aa54e3b8fe430efd23f49a8950733aaa9d7c915d9989179f48dd1905e0100000000ffffffff07"
+        "c42b969286be06fae38528c85f0a1ce508d4df837eb5ac4cf5f2a7a9d65fa80000000000ffffffff02804f1200"
+        "000000001600145360df8231ac5965147c9d90ca930a2aafb05232cb92040000000000160014bd92088bb7e82d"
+        "611a9b94fbb74a0908152b784f02473044022041294880caa09bb1b653775310fcdd1458da6b8e7d7fae34e379"
+        "66414fe115820220646397c9d2513edc5974ecc336e9b287de0cdf071c366f3b3dc3ff309213e4e40121021714"
+        "2f69535e4dad0dc7060df645c55a174cc1bfa5b9eb2e59aad2ae96072dfc0247304402201857bc6e6e48b46046"
+        "a4bd204136fc77e24c240943fb5a1f0e86387aae59b34902200a7f31478784e51c49f46ef072745a4f263d7efd"
+        "bc9c6784aa2571ff4f6f2a400121024bc2a31265153f07e70e0bab08724e6b85e217f8cd628ceb62974247bb49"
+        "3382024730440220764e3d5b3971c4b3e70b23fb700a7462a6fe519d9830e863a1f8388c402ad0b102207e777f"
+        "7972c636961f92375a2774af3b7a2a04190251bbcb31d19c70927952dc0121024bc2a31265153f07e70e0bab08"
+        "724e6b85e217f8cd628ceb62974247bb49338200000000";
     {
         EXPECT_EQ(TWDataSize(outputData.get()), 786ul);
         Bitcoin::Proto::SigningOutput output;
-        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()), (int)TWDataSize(outputData.get())));
+        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()),
+                                          (int)TWDataSize(outputData.get())));
 
         EXPECT_EQ(output.encoded().size(), 518ul);
         EXPECT_EQ(hex(output.encoded()), ExpectedTx);
@@ -384,8 +431,10 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
         // 2 private keys are needed (despite >2 UTXOs)
         auto key0 = parse_hex("4646464646464646464646464646464646464646464646464646464646464646");
         auto key1 = parse_hex("7878787878787878787878787878787878787878787878787878787878787878");
-        EXPECT_EQ(hex(PrivateKey(key0).getPublicKey(TWPublicKeyTypeSECP256k1).bytes), hex(inPubKey0));
-        EXPECT_EQ(hex(PrivateKey(key1).getPublicKey(TWPublicKeyTypeSECP256k1).bytes), hex(inPubKey1));
+        EXPECT_EQ(hex(PrivateKey(key0).getPublicKey(TWPublicKeyTypeSECP256k1).bytes),
+                  hex(inPubKey0));
+        EXPECT_EQ(hex(PrivateKey(key1).getPublicKey(TWPublicKeyTypeSECP256k1).bytes),
+                  hex(inPubKey1));
         *input.add_private_key() = std::string(key0.begin(), key0.end());
         *input.add_private_key() = std::string(key1.begin(), key1.end());
 
@@ -395,3 +444,350 @@ TEST(TWTransactionCompiler, ExternalSignatureSignBitcoin) {
         ASSERT_EQ(hex(output.encoded()), ExpectedTx);
     }
 }
+
+TEST(TWTransactionCompiler, ExternalSignatureSignSolana) {
+    const auto coin = TWCoinTypeSolana;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::Solana::Proto::SigningInput();
+    auto& message = *input.mutable_transfer_transaction();
+    auto recipient = std::string("3UVYmECPPMZSCqWKfENfuoTv51fTDTWicX9xmBD2euKe");
+    auto sender = std::string("sp6VUqq1nDEuU83bU2hstmEYrJNipJYpwS7gZ7Jv7ZH");
+    input.set_sender(sender);
+    input.set_recent_blockhash(std::string("TPJFTN4CjBn12HiBfAbGUhpD9zGvRSm2RcheFRA4Fyv"));
+    message.set_recipient(recipient);
+    message.set_value((uint64_t)1000);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    const auto txInputData = WRAPD(TWDataCreateWithBytes(inputStrData.data(), inputStrData.size()));
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashes = WRAPD(TWTransactionCompilerPreImageHashes(coin, txInputData.get()));
+    auto preImageHashData = data(TWDataBytes(preImageHashes.get()), TWDataSize(preImageHashes.get()));
+
+    auto preSigningOutput = TW::Solana::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    ASSERT_EQ(preSigningOutput.signers_size(), 1);
+    auto signer = preSigningOutput.signers(0);
+    EXPECT_EQ(signer, sender);
+    auto preImageHash = preSigningOutput.data();
+    EXPECT_EQ(hex(preImageHash),
+              "010001030d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c024c255a8bc3e"
+              "8496217a2cd2a1894b9b9dcace04fcd9c0d599acdaaea40a1b6100000000000000000000000000000000"
+              "0000000000000000000000000000000006c25012cc11a599a45b3b2f7f8a7c65b0547fa0bb67170d7a0c"
+              "d1eda4e2c9e501020200010c02000000e803000000000000");
+
+    // Simulate signature, normally obtained from signature server
+    const auto publicKeyData =
+        parse_hex("0d044a62d0a4dfe5a037a15b59fa4d4d0d3ab81103a2c10a6da08a4d058611c0");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeED25519);
+    const auto signature =
+        parse_hex("a8c610697087eaf8a34b3facbe06f8e9bb9603bb03270dad021ffcd2fc37b6e9efcdcb78b227401f"
+                  "000eb9231c67685240890962e44a17fd27fc2ff7b971df03");
+
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+
+    /// Step 3: Compile transaction info
+    const auto outputData = WRAPD(TWTransactionCompilerCompileWithSignatures(
+        coin, txInputData.get(),
+        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&signature)).get(),
+        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&publicKeyData)).get()));
+
+    const auto ExpectedTx =
+        "5bWxVCP5fuzkKSGby9hnsLranszQJR2evJGTfBrpDQ4rJceW1WxKNrWqVPBsN2QCAGmE6W7VaYkyWjv39HhGrr1Ne2"
+        "QSUuHZdyyn7hK4pxzLPMgPG8fY1XvXdppWMaKMLmhriLkckzGKJMaE3pWBRFBKzigXY28714uUNndb7S9hVakxa59h"
+        "rLph39CMgAkcj6b8KYvJEkb1YdYytHSZNGi4kVVTNqiicNgPdf1gmG6qz9zVtnqj9JtaD2efdS8qxsKnvNWSgb8Xxb"
+        "T6dwyp7msUUi7d27cYaPTpK";
+    {
+        Solana::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()),
+                                          (int)TWDataSize(outputData.get())));
+        EXPECT_EQ(output.encoded(), ExpectedTx);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        Solana::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(TWDataBytes(txInputData.get()),
+                                         (int)TWDataSize(txInputData.get())));
+        auto key = parse_hex("044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1");
+        signingInput.set_private_key(key.data(), key.size());
+
+        Solana::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.encoded(), ExpectedTx);
+    }
+}
+
+TEST(TWTransactionCompiler, ExternalSignatureSignNULS) {
+    const auto coin = TWCoinTypeNULS;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::NULS::Proto::SigningInput();
+    auto from = std::string("NULSd6HgWabfcG6H7NDK2TJvtoU3wxY1YLKwJ");
+    auto to = std::string("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    uint32_t chainId = 1;
+    uint32_t idassetsId = 1;
+    auto amount = TW::store((TW::uint256_t)10000000);
+    auto amountStr = std::string(amount.begin(), amount.end());
+    auto balance = TW::store((TW::uint256_t)100000000);
+    auto balanceStr = std::string(balance.begin(), balance.end());
+    auto nonce = std::string("0000000000000000");
+    input.set_from(from);
+    input.set_to(to);
+    input.set_amount(amountStr);
+    input.set_chain_id(chainId);
+    input.set_idassets_id(idassetsId);
+    input.set_nonce(nonce);
+    input.set_balance(balanceStr);
+    input.set_timestamp((uint32_t)1569228280);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    const auto txInputData = WRAPD(TWDataCreateWithBytes(inputStrData.data(), inputStrData.size()));
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashes = WRAPD(TWTransactionCompilerPreImageHashes(coin, txInputData.get()));
+    auto preImageHashData = data(TWDataBytes(preImageHashes.get()), TWDataSize(preImageHashes.get()));
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = preSigningOutput.data();
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(hex(preImage),
+              "0200f885885d00008c01170100012c177a01a7afbe98e094007b99476534fb7926b701000100201d9a00"
+              "000000000000000000000000000000000000000000000000000000000800000000000000000001170100"
+              "01f05e7878971f3374515eabb6f16d75219d887312010001008096980000000000000000000000000000"
+              "0000000000000000000000000000000000000000000000");
+    EXPECT_EQ(hex(preImageHash),
+              "8746b37cb4b443424d3093e8107c5dfd6c5318010bbffcc8e8ba7c1da60877fd");
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData =
+        parse_hex("033c87a3d9b812556b3034b6471cad5131a01e210c1d7ca06dd53b7d0aff0ee045");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
+    const auto signature =
+        parse_hex("a5234269eab6fe8a1510dd0cb36070a03464b48856e1ef2681dbb79a5ec656f92961ac01d401a6f8"
+                  "49acc958c6c9653f49282f5a0916df036ea8766918bac19500");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+
+    /// Step 3: Compile transaction info
+    const auto outputData = WRAPD(TWTransactionCompilerCompileWithSignatures(
+        coin, txInputData.get(),
+        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&signature)).get(),
+        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&publicKeyData)).get()));
+
+    const auto ExpectedEncoded = parse_hex(
+        "0200f885885d00008c01170100012c177a01a7afbe98e094007b99476534fb7926b701000100201d9a00000000"
+        "00000000000000000000000000000000000000000000000000080000000000000000000117010001f05e787897"
+        "1f3374515eabb6f16d75219d887312010001008096980000000000000000000000000000000000000000000000"
+        "00000000000000000000000000006a21033c87a3d9b812556b3034b6471cad5131a01e210c1d7ca06dd53b7d0a"
+        "ff0ee045473045022100a5234269eab6fe8a1510dd0cb36070a03464b48856e1ef2681dbb79a5ec656f9022029"
+        "61ac01d401a6f849acc958c6c9653f49282f5a0916df036ea8766918bac195");
+    const auto ExpectedTx = std::string(ExpectedEncoded.begin(), ExpectedEncoded.end());
+    {
+        EXPECT_EQ(TWDataSize(outputData.get()), 259ul);
+        NULS::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()),
+                                          (int)TWDataSize(outputData.get())));
+        EXPECT_EQ(output.encoded(), ExpectedTx);
+        EXPECT_EQ(output.encoded().size(), 256ul);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        NULS::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(TWDataBytes(txInputData.get()),
+                                         (int)TWDataSize(txInputData.get())));
+        auto key = parse_hex("044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1");
+        signingInput.set_private_key(key.data(), key.size());
+
+        NULS::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.encoded(), ExpectedTx);
+    }
+}
+
+// TEST(TWTransactionCompiler, ExternalSignatureSignRipple) {
+//     const auto coin = TWCoinTypeXRP;
+//     /// Step 1: Prepare transaction input (protobuf)
+//     auto key = parse_hex("ba005cd605d8a02e3d5dfd04234cef3a3ee4f76bfbad2722d1fb5af8e12e6764");
+//     auto input = TW::Ripple::Proto::SigningInput();
+//     auto privateKey = TW::PrivateKey(key);
+//     auto publicKey = privateKey.getPublicKey(TWPublicKeyTypeSECP256k1);
+//     input.set_amount(29000000);
+//     input.set_fee(200000);
+//     input.set_sequence(1);
+//     input.set_account("rDpysuumkweqeC7XdNgYNtzL5GxbdsmrtF");
+//     input.set_destination("rU893viamSnsfP3zjzM2KPxjqZjXSXK6VF");
+//     input.set_public_key(publicKey.bytes.data(), publicKey.bytes.size());
+//     auto inputString = input.SerializeAsString();
+//     auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+//     const auto txInputData = WRAPD(TWDataCreateWithBytes(inputStrData.data(), inputStrData.size()));
+    
+//     /// Step 2: Obtain preimage hash
+//     const auto preImageHashes = WRAPD(TWTransactionCompilerPreImageHashes(coin, txInputData.get()));
+//     auto preImageHashData = data(TWDataBytes(preImageHashes.get()), TWDataSize(preImageHashes.get()));
+
+//     auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+//     ASSERT_TRUE(
+//         preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+//     ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+//     // preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size());
+//     auto preImage = preSigningOutput.data();
+//     EXPECT_EQ(hex(preImage),
+//               "5354580012000022800000002400000001614000000001ba8140684000000000030d407321026cc34b92"
+//               "cefb3a4537b3edb0b6044c04af27c01583c577823ecc69a9a21119b681148400b6b6d08d5d495653d73e"
+//               "da6804c249a5148883148132e4e20aecf29090ac428a9c43f230a829220d");
+//     auto preImageHash = preSigningOutput.data_hash();
+//     EXPECT_EQ(hex(preImageHash),
+//               "8624dbbd5da9ccc8f7a50faf8af8709837db72f51a50cac15a6cd28ce6107b3d");
+//     // Simulate signature, normally obtained from signature server
+//     const auto signature = privateKey.sign(parse_hex("8624dbbd5da9ccc8f7a50faf8af8709837db72f51a50cac15a6cd28ce6107b3d"), TWCurveSECP256k1);
+//     // Verify signature (pubkey & hash & signature)
+//     EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+//     /// Step 3: Compile transaction info
+//     const auto outputData = WRAPD(TWTransactionCompilerCompileWithSignatures(
+//         coin, txInputData.get(),
+//         WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&signature)).get(),
+//         WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&publicKey.bytes)).get()));
+
+//     const auto ExpectedTx = std::string(
+//         "12000022800000002400000001614000000001ba8140684000000000030d407321026cc34b92cefb3a45"
+//         "37b3edb0b6044c04af27c01583c577823ecc69a9a21119b6744630440220067f20b3eebfc7107dd0bcc7"
+//         "2337a236ac3be042c0469f2341d76694a17d4bb9022048393d7ee7dcb729783b33f5038939ddce1bb833"
+//         "7e66d752974626854556bbb681148400b6b6d08d5d495653d73eda6804c249a5148883148132e4e20aec"
+//         "f29090ac428a9c43f230a829220d");
+//     EXPECT_EQ(TWDataSize(outputData.get()), 185ul);
+
+//     {
+//         TW::Ripple::Proto::SigningOutput output;
+//         ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()),
+//                                             (int)TWDataSize(outputData.get())));
+
+//         EXPECT_EQ(hex(output.encoded()), ExpectedTx);
+//         EXPECT_EQ(output.encoded().size(), 182ul);
+//         ASSERT_EQ(output.error(), TW::Common::Proto::SigningError::OK);
+//     }
+
+//     { // Double check: check if simple signature process gives the same result. Note that private
+//       // keys were not used anywhere up to this point.
+//         Ripple::Proto::SigningInput signingInput;
+//         ASSERT_TRUE(signingInput.ParseFromArray(TWDataBytes(txInputData.get()),
+//                                          (int)TWDataSize(txInputData.get())));
+//         signingInput.set_private_key(key.data(), key.size());
+
+//         Ripple::Proto::SigningOutput output;
+//         ANY_SIGN(signingInput, coin);
+
+//         ASSERT_EQ(hex(output.encoded()), ExpectedTx);
+//     }
+// }
+
+TEST(TWTransactionCompiler, ExternalSignatureSignNULSToken) {
+    const auto coin = TWCoinTypeNULS;
+    /// Step 1: Prepare transaction input (protobuf)
+    auto input = TW::NULS::Proto::SigningInput();
+    auto from = std::string("NULSd6HgWabfcG6H7NDK2TJvtoU3wxY1YLKwJ");
+    auto to = std::string("NULSd6Hgied7ym6qMEfVzZanMaa9qeqA6TZSe");
+    uint32_t chainId = 9;
+    uint32_t idassetsId = 1;
+    auto amount = TW::store((TW::uint256_t)10000000);
+    auto amountStr = std::string(amount.begin(), amount.end());
+    auto balance = TW::store((TW::uint256_t)100000000);
+    auto balanceStr = std::string(balance.begin(), balance.end());
+    auto feePayerBalance = TW::store((TW::uint256_t)100000000);
+    auto feePayerBalanceStr = std::string(feePayerBalance.begin(), feePayerBalance.end());
+    auto nonce = std::string("0000000000000000");
+    auto asset_nonce = std::string("0000000000000000");
+    input.set_from(from);
+    input.set_to(to);
+    input.set_amount(amountStr);
+    input.set_chain_id(chainId);
+    input.set_idassets_id(idassetsId);
+    input.set_nonce(asset_nonce.data(), asset_nonce.size());
+    input.set_balance(balanceStr);
+    input.set_fee_payer(from);
+    input.set_fee_payer_nonce(nonce.data(), nonce.size());
+    input.set_fee_payer_balance(feePayerBalanceStr);
+    input.set_timestamp((uint32_t)1569228280);
+    auto inputString = input.SerializeAsString();
+    auto inputStrData = TW::Data(inputString.begin(), inputString.end());
+    const auto txInputData = WRAPD(TWDataCreateWithBytes(inputStrData.data(), inputStrData.size()));
+
+    /// Step 2: Obtain preimage hash
+    const auto preImageHashes = WRAPD(TWTransactionCompilerPreImageHashes(coin, txInputData.get()));
+    auto preImageHashData =
+        data(TWDataBytes(preImageHashes.get()), TWDataSize(preImageHashes.get()));
+
+    auto preSigningOutput = TW::TxCompiler::Proto::PreSigningOutput();
+    ASSERT_TRUE(
+        preSigningOutput.ParseFromArray(preImageHashData.data(), (int)preImageHashData.size()));
+    ASSERT_EQ(preSigningOutput.error(), Common::Proto::OK);
+
+    auto preImage = preSigningOutput.data();
+    auto preImageHash = preSigningOutput.data_hash();
+    EXPECT_EQ(
+        hex(preImage),
+        "0200f885885d0000d202170100012c177a01a7afbe98e094007b99476534fb7926b70900010080969800000000"
+        "0000000000000000000000000000000000000000000000000008000000000000000000170100012c177a01a7af"
+        "be98e094007b99476534fb7926b701000100a08601000000000000000000000000000000000000000000000000"
+        "0000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120900010080"
+        "969800000000000000000000000000000000000000000000000000000000000000000000000000");
+    EXPECT_EQ(hex(preImageHash),
+              "9040642ce845b320453b2ccd6f80efc38fdf61ec8f0c12e0c16f6244ec2e0496");
+    // Simulate signature, normally obtained from signature server
+    const Data publicKeyData =
+        parse_hex("033c87a3d9b812556b3034b6471cad5131a01e210c1d7ca06dd53b7d0aff0ee045");
+    const PublicKey publicKey = PublicKey(publicKeyData, TWPublicKeyTypeSECP256k1);
+    const auto signature =
+        parse_hex("5ddea604c6cdfcf6cbe32f5873937641676ee5f9aee3c40aa9857c59aefedff25b77429cf62307d4"
+                  "3a6a79b4c106123e6232e3981032573770fe2726bf9fc07c00");
+    // Verify signature (pubkey & hash & signature)
+    EXPECT_TRUE(publicKey.verify(signature, TW::data(preImageHash)));
+
+    /// Step 3: Compile transaction info
+    const auto outputData = WRAPD(TWTransactionCompilerCompileWithSignatures(
+        coin, txInputData.get(),
+        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&signature)).get(),
+        WRAP(TWDataVector, TWDataVectorCreateWithData((TWData*)&publicKeyData)).get()));
+
+    const auto ExpectedEncoded = parse_hex(
+        "0200f885885d0000d202170100012c177a01a7afbe98e094007b99476534fb7926b70900010080969800000000"
+        "0000000000000000000000000000000000000000000000000008000000000000000000170100012c177a01a7af"
+        "be98e094007b99476534fb7926b701000100a08601000000000000000000000000000000000000000000000000"
+        "0000000000080000000000000000000117010001f05e7878971f3374515eabb6f16d75219d8873120900010080"
+        "9698000000000000000000000000000000000000000000000000000000000000000000000000006921033c87a3"
+        "d9b812556b3034b6471cad5131a01e210c1d7ca06dd53b7d0aff0ee04546304402205ddea604c6cdfcf6cbe32f"
+        "5873937641676ee5f9aee3c40aa9857c59aefedff202205b77429cf62307d43a6a79b4c106123e6232e3981032"
+        "573770fe2726bf9fc07c");
+    const auto ExpectedTx = std::string(ExpectedEncoded.begin(), ExpectedEncoded.end());
+    {
+        EXPECT_EQ(TWDataSize(outputData.get()), 328ul);
+        NULS::Proto::SigningOutput output;
+        ASSERT_TRUE(output.ParseFromArray(TWDataBytes(outputData.get()),
+                                          (int)TWDataSize(outputData.get())));
+        EXPECT_EQ(output.encoded(), ExpectedTx);
+        EXPECT_EQ(output.encoded().size(), 325ul);
+    }
+
+    { // Double check: check if simple signature process gives the same result. Note that private
+      // keys were not used anywhere up to this point.
+        NULS::Proto::SigningInput signingInput;
+        ASSERT_TRUE(signingInput.ParseFromArray(TWDataBytes(txInputData.get()),
+                                         (int)TWDataSize(txInputData.get())));
+        auto key = parse_hex("044014463e2ee3cc9c67a6f191dbac82288eb1d5c1111d21245bdc6a855082a1");
+        signingInput.set_private_key(key.data(), key.size());
+
+        NULS::Proto::SigningOutput output;
+        ANY_SIGN(signingInput, coin);
+
+        ASSERT_EQ(output.encoded(), ExpectedTx);
+    }
+}
diff --git a/tests/interface/TWTransactionUtilTests.cpp b/tests/interface/TWTransactionUtilTests.cpp
new file mode 100644
index 00000000000..c6b59420e6b
--- /dev/null
+++ b/tests/interface/TWTransactionUtilTests.cpp
@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWData.h>
+#include <TrustWalletCore/TWTransactionUtil.h>
+
+#include "Bitcoin/Script.h"
+#include "uint256.h"
+
+#include "TestUtilities.h"
+#include <gtest/gtest.h>
+
+#include <thread>
+
+using namespace TW;
+
+TEST(TWTransactionUtil, CalcTxHashBitcoin) {
+    constexpr auto coin = TWCoinTypeBitcoin;
+    const auto encodedTxPtr = WRAPS(TWStringCreateWithUTF8Bytes("02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000"));
+    const auto txHashResult = WRAPS(TWTransactionUtilCalcTxHash(coin, encodedTxPtr.get()));
+
+    assertStringsEqual(txHashResult, "797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1");
+}
+
+TEST(TWTransactionUtil, CalcTxHashEthereum) {
+    constexpr auto coin = TWCoinTypeEthereum;
+    const auto encodedTxPtr = WRAPS(TWStringCreateWithUTF8Bytes("f8aa808509c7652400830130b9946b175474e89094c44da98b954eedeac495271d0f80b844a9059cbb0000000000000000000000005322b34c88ed0691971bf52a7047448f0f4efc840000000000000000000000000000000000000000000000001bc16d674ec8000025a0724c62ad4fbf47346b02de06e603e013f26f26b56fdc0be7ba3d6273401d98cea0032131cae15da7ddcda66963e8bef51ca0d9962bfef0547d3f02597a4a58c931"));
+    const auto txHashResult = WRAPS(TWTransactionUtilCalcTxHash(coin, encodedTxPtr.get()));
+
+    assertStringsEqual(txHashResult, "0x199a7829fc5149e49b452c2cab76d8fa5a9682fee6e4891b8acb697ac142513e");
+}
+
+TEST(TWTransactionUtil, CalcTxHashSolana) {
+    constexpr auto coin = TWCoinTypeSolana;
+    const auto encodedTxPtr = WRAPS(TWStringCreateWithUTF8Bytes("AnQTYwZpkm3fs4SdLxnV6gQj3hSLsyacpxDdLMALYWObm722f79IfYFTbZeFK9xHtMumiDOWAM2hHQP4r/GtbARpncaXgOVFv7OgbRLMbuCEJHO1qwcdCbtH72VzyzU8yw9sqqHIAaCUE8xaQTgT6Z5IyZfeyMe2QGJIfOjz65UPAgACBssq8Im1alV3N7wXGODL8jLPWwLhTuCqfGZ1Iz9fb5tXlMOJD6jUvASrKmdtLK/qXNyJns2Vqcvlk+nfJYdZaFpIWiT/tAcEYbttfxyLdYxrLckAKdVRtf1OrNgtZeMCII4SAn6SYaaidrX/AN3s/aVn/zrlEKW0cEUIatHVDKtXO0Qss5EhV/E6kz0BNCgtAytf/s0Botvxt3kGCN8ALqcG3fbh12Whk9nL4UbO63msHLSF7V9bN5E6jPWFfv8Aqe6sdLXiXSDILEtzckCjkjchiSf6zVGpMYiAE5BE2IqHAQUEAgQDAQoMoA8AAAAAAAAG"));
+    const auto txHashResult = WRAPS(TWTransactionUtilCalcTxHash(coin, encodedTxPtr.get()));
+
+    assertStringsEqual(txHashResult, "3KbvREZUat76wgWMtnJfWbJL74Vzh4U2eabVJa3Z3bb2fPtW8AREP5pbmRwUrxZCESbTomWpL41PeKDcPGbojsej");
+}
+
+TEST(TWTransactionUtil, CalcTxHashCosmos) {
+    constexpr auto coin = TWCoinTypeCosmos;
+    const auto encodedTxPtr = WRAPS(TWStringCreateWithUTF8Bytes("CpIBCo8BChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEm8KLWNvc21vczFta3k2OWNuOGVrdHd5MDg0NXZlYzl1cHNkcGhrdHh0MDNna3dseBItY29zbW9zMThzMGhkbnNsbGdjY2x3ZXU5YXltdzRuZ2t0cjJrMHJreWdkemRwGg8KBXVhdG9tEgY0MDAwMDASZQpOCkYKHy9jb3Ntb3MuY3J5cHRvLnNlY3AyNTZrMS5QdWJLZXkSIwohAuzvXOQ3owLGf5VGjeSzHzbpEfRn1+alK0HB4T4dVjZJEgQKAggBEhMKDQoFdWF0b20SBDEwMDAQwJoMGkCvvVE6d29P30cO9/lnXyGunWMPxNY12NuqDcCnFkNM0H4CUQdl1Gc9+ogIJbro5nyzZzlv9rl2/GsZox/JXoCX"));
+    const auto txHashResult = WRAPS(TWTransactionUtilCalcTxHash(coin, encodedTxPtr.get()));
+
+    assertStringsEqual(txHashResult, "85392373F54577562067030BF0D61596C91188AA5E6CA8FFE731BD0349296411");
+}
+
+TEST(TWTransactionUtil, CalcTxHashTon) {
+    constexpr auto coin = TWCoinTypeTON;
+    const auto encodedTxPtr = WRAPS(TWStringCreateWithUTF8Bytes("te6cckECGwEAA2sAAkWIACm9HPyVOpjCNOG6nbf+EwCONRHHpeMQsIlCoWNKhUaaHgECAgE0AwQBoXNpZ25///8R/////wAAAACACOfqY7L3l3aKc58eNxuJTaeH/fgBw2aG0coM+hjDpjWhJKbYKmsAD8v054HYSuO6vN3bQnV5U19BhsGfe1MDoAUBFP8A9KQT9LzyyAsGAFGAAAAAP///iKrcG+d35KaMMtuxik4jqNofFL51Mu1f8Qf19onqsDlyIAIKDsPIbQMWBwIBIAgJAWJiAC90HaFSSy94Zxb85WYu97uTKIxAlLvolycpcYkWc+8giFAAAAAAAAAAAAAAAAABFgIBSAoLAQLyDALc0CDXScEgkVuPYyDXCx8gghBleHRuvSGCEHNpbnS9sJJfA+CCEGV4dG66jrSAINchAdB01yH6QDD6RPgo+kQwWL2RW+DtRNCBAUHXIfQFgwf0Dm+hMZEw4YBA1yFwf9s84DEg10mBAoC5kTDgcOIXDQIBIA4PAR4g1wsfghBzaWduuvLgin8NAeaO8O2i7fshgwjXIgKDCNcjIIAg1yHTH9Mf0x/tRNDSANMfINMf0//XCgAK+QFAzPkQmiiUXwrbMeHywIffArNQB7Dy0IRRJbry4IVQNrry4Ib4I7vy0IgikvgA3gGkf8jKAMsfAc8Wye1UIJL4D95w2zzYFwIBIBARABm+Xw9qJoQICg65D6AsAgFuEhMCAUgUFQAZrc52omhAIOuQ64X/wAAZrx32omhAEOuQ64WPwAAXsyX7UTQcdch1wsfgABGyYvtRNDXCgCAAAAP27aLt+wL0BCFukmwhjkwCIdc5MHCUIccAs44tAdcoIHYeQ2wg10nACPLgkyDXSsAC8uCTINcdBscSwgBSMLDy0InXTNc5MAGk6GwShAe78uCT10rAAPLgk+1V4tIAAcAAkVvg69csCBQgkXCWAdcsCBwS4lIQseMPINdKGBkaAJYB+kAB+kT4KPpEMFi68uCR7UTQgQFB1xj0BQSdf8jKAEAEgwf0U/Lgi44UA4MH9Fvy4Iwi1woAIW4Bs7Dy0JDiyFADzxYS9ADJ7VQAcjDXLAgkji0h8uCS0gDtRNDSAFETuvLQj1RQMJExnAGBAUDXIdcKAPLgjuLIygBYzxbJ7VST8sCN4gAQk1vbMeHXTNB8Ui06"));
+    const auto txHashResult = WRAPS(TWTransactionUtilCalcTxHash(coin, encodedTxPtr.get()));
+
+    assertStringsEqual(txHashResult, "437dae441a95a6bccdcdcea2560c313de24f13dd85c76d5d7ecaab1e70a1e52b");
+}
+
+TEST(TWTransactionUtil, CalcTxHashAptos) {
+    constexpr auto coin = TWCoinTypeAptos;
+    const auto encodedTxPtr = WRAPS(TWStringCreateWithUTF8Bytes("07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01"));
+    const auto txHashResult = WRAPS(TWTransactionUtilCalcTxHash(coin, encodedTxPtr.get()));
+
+    assertStringsEqual(txHashResult, "0xb4d62afd3862116e060dd6ad9848ccb50c2bc177799819f1d29c059ae2042467");
+}
+
+TEST(TWTransactionUtil, CalcTxHashSui) {
+    constexpr auto coin = TWCoinTypeSui;
+    const auto encodedTxPtr = WRAPS(TWStringCreateWithUTF8Bytes("AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA"));
+    const auto txHashResult = WRAPS(TWTransactionUtilCalcTxHash(coin, encodedTxPtr.get()));
+
+    assertStringsEqual(txHashResult, "HkPo6rYPyDY53x1MBszvSZVZyixVN7CHvCJGX381czAh");
+}
diff --git a/tests/main.cpp b/tests/main.cpp
index cd1077f409b..93248dc0b6c 100644
--- a/tests/main.cpp
+++ b/tests/main.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <filesystem>
 #include <gtest/gtest.h>
diff --git a/tests/memory/memzero_tests.cpp b/tests/memory/memzero_tests.cpp
deleted file mode 100644
index 47fba2f4697..00000000000
--- a/tests/memory/memzero_tests.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "memory/memzero_wrapper.h"
-
-#include "gtest/gtest.h"
-
-struct int_wrapper {
-    int value;
-};
-
-TEST(Memory, Memzero) {
-    int_wrapper obj{.value = 42};
-    TW::memzero(&obj);
-    ASSERT_EQ(obj.value, 0);
-    obj.value = 42;
-    ASSERT_EQ(obj.value, 42);
-    TW::memzero(&obj, sizeof(int_wrapper));
-    ASSERT_EQ(obj.value, 0);
-}
diff --git a/tests/operators/equality_comparable_tests.cpp b/tests/operators/equality_comparable_tests.cpp
deleted file mode 100644
index 134d172968e..00000000000
--- a/tests/operators/equality_comparable_tests.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright © 2017-2022 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-
-#include "operators/equality_comparable.h"
-
-#include "gtest/gtest.h"
-
-namespace TW::operators::tests {
-
-struct Amount : equality_comparable<Amount> {
-    int value;
-    friend bool operator==(const Amount& lhs, const Amount& rhs) { return lhs.value == rhs.value; }
-};
-
-TEST(Operators, EqualityComparable) {
-    ASSERT_TRUE(Amount{.value = 1} != Amount{.value = 2});
-    ASSERT_TRUE(Amount{.value = 1} == Amount{.value = 1});
-}
-
-} // namespace TW::operators::tests
diff --git a/tests/xDai/TWCoinTypeTests.cpp b/tests/xDai/TWCoinTypeTests.cpp
deleted file mode 100644
index 05d70075d8d..00000000000
--- a/tests/xDai/TWCoinTypeTests.cpp
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright © 2017-2021 Trust Wallet.
-//
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
-//
-// This is a GENERATED FILE, changes made here MAY BE LOST.
-// Generated one-time (codegen/bin/cointests)
-//
-
-#include "../interface/TWTestUtilities.h"
-#include <TrustWalletCore/TWCoinTypeConfiguration.h>
-#include <gtest/gtest.h>
-
-
-TEST(TWxDaiCoinType, TWCoinType) {
-    auto symbol = WRAPS(TWCoinTypeConfigurationGetSymbol(TWCoinTypeXDai));
-    auto txId = WRAPS(TWStringCreateWithUTF8Bytes("0x936798a1ef607c9e856d7861b15999c770c06f0887c4fc1f6acbf3bef09899c1"));
-    auto txUrl = WRAPS(TWCoinTypeConfigurationGetTransactionURL(TWCoinTypeXDai, txId.get()));
-    auto accId = WRAPS(TWStringCreateWithUTF8Bytes("0x12d61a95CF55e18D267C2F1AA67d8e42ae1368f8"));
-    auto accUrl = WRAPS(TWCoinTypeConfigurationGetAccountURL(TWCoinTypeXDai, accId.get()));
-    auto id = WRAPS(TWCoinTypeConfigurationGetID(TWCoinTypeXDai));
-    auto name = WRAPS(TWCoinTypeConfigurationGetName(TWCoinTypeXDai));
-
-    ASSERT_EQ(TWCoinTypeConfigurationGetDecimals(TWCoinTypeXDai), 18);
-    ASSERT_EQ(TWBlockchainEthereum, TWCoinTypeBlockchain(TWCoinTypeXDai));
-    ASSERT_EQ(0x0, TWCoinTypeP2shPrefix(TWCoinTypeXDai));
-    ASSERT_EQ(0x0, TWCoinTypeStaticPrefix(TWCoinTypeXDai));
-    assertStringsEqual(symbol, "xDAI");
-    assertStringsEqual(txUrl, "https://blockscout.com/xdai/mainnet/tx/0x936798a1ef607c9e856d7861b15999c770c06f0887c4fc1f6acbf3bef09899c1");
-    assertStringsEqual(accUrl, "https://blockscout.com/xdai/mainnet/address/0x12d61a95CF55e18D267C2F1AA67d8e42ae1368f8");
-    assertStringsEqual(id, "xdai");
-    assertStringsEqual(name, "Gnosis Chain");
-}
diff --git a/tools/android-build b/tools/android-build
index f63af0c09af..8c4b1344af8 100755
--- a/tools/android-build
+++ b/tools/android-build
@@ -5,11 +5,20 @@
 set -e
 
 source $(dirname $0)/library
-version=$(wc_read_version)
+version=$(wc_read_version $1)
+
+if [[ `uname` == "Darwin" ]]; then
+    export BOOST_ROOT=$(brew --prefix boost)
+fi
 
 pushd android
 ./gradlew assembleRelease
-cp trustwalletcore/build/outputs/aar/trustwalletcore-release.aar ../build/trustwalletcore.aar
+cp wallet-core/build/outputs/aar/wallet-core-release.aar ../build/wallet-core.aar
 popd
 
-echo "Now upload build/trustwalletcore.aar to https://github.com/TrustWallet/trust-wallet-core/releases/tag/$version"
+echo "Now upload build/wallet-core.aar to https://github.com/TrustWallet/trust-wallet-core/releases/tag/$version"
+
+echo "Building docs..."
+tools/kotlin-doc
+
+echo "Now upload Kotlin docs from build/kdoc.zip to whatever place it needs to be"
diff --git a/tools/android-release b/tools/android-release
index 60199fb10e5..2b4bca2da1d 100755
--- a/tools/android-release
+++ b/tools/android-release
@@ -1,11 +1,16 @@
 #!/bin/bash
 #
 # This script uploads android build to repositories defined in maven-push.gradle
+# It also builds and uploads Kotlin docs
 
 set -e
 
 source $(dirname $0)/library
-version=$(wc_read_version)
+version=$(wc_read_version  $1)
+
+if [[ `uname` == "Darwin" ]]; then
+    export BOOST_ROOT=$(brew --prefix boost)
+fi
 
 echo "Building $version"
 
@@ -14,3 +19,18 @@ pushd android
 ./gradlew clean build assembleRelease publish -Pversion="$version"
 
 echo "Android build uploaded"
+popd # android
+
+echo "Building docs..."
+tools/kotlin-doc
+
+pushd build/dokka
+release_url=$(wc_release_url ${version})
+echo "release_url url for docs is $release_url"
+
+filename=kdoc.zip
+download_url=$(wc_upload_asset ${release_url} ${filename})
+echo "download_url is $download_url"
+
+popd # build/dokka
+
diff --git a/tools/android-sdk b/tools/android-sdk
new file mode 100644
index 00000000000..2ee8025fdb4
--- /dev/null
+++ b/tools/android-sdk
@@ -0,0 +1,50 @@
+#!/bin/bash
+
+export NDK_API_LEVEL=21
+
+find_android_ndk() {
+    if [[ "$ANDROID_NDK_HOME" != "" ]]; then
+        >&2 echo "Use ANDROID_NDK_HOME"
+    elif [[ "$ANDROID_HOME" != "" ]]; then
+        >&2 echo "ANDROID_NDK_HOME is not set. Use ANDROID_HOME value instead"
+        ANDROID_NDK_HOME="$ANDROID_HOME/ndk"
+    else
+        >&2 echo "WARNING: ANDROID_HOME is not set. Use a default path"
+        ANDROID_NDK_HOME="$HOME/Library/Android/sdk/ndk"
+    fi
+
+    TEST_CLANG="aarch64-linux-android$NDK_API_LEVEL-clang"
+    PATH_TO_CLANG=$(find "$ANDROID_NDK_HOME" -iname $TEST_CLANG -print -quit)
+
+    if [[ "$PATH_TO_CLANG" == "" ]]; then
+        >&2 echo "ERROR: cannot find NDK tools within '$ANDROID_NDK_HOME'"
+        exit 22
+    fi
+
+    echo $(dirname "$PATH_TO_CLANG")
+}
+
+find_android_cmdline_tools() {
+    # Default version of cmdline tools is 11.
+    # https://github.com/android-actions/setup-android/blob/9584f05408b63719e3464df8ac85bdbe58f88a64/src/main.ts#L9
+    CMDLINE_TOOLS_VERSION="11.0"
+
+    if [[ "$ANDROID_HOME" == "" ]]; then
+        >&2 echo "ANDROID_HOME is not set. Use a default path"
+        ANDROID_HOME="$HOME/Library/Android/sdk"
+    fi
+
+    # cmdline-tools could have a 'latest' version, but if it was installed 2 years ago it may not be 'latest' as of today
+    if [ -x "$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager" ]; then
+        echo "$ANDROID_HOME/cmdline-tools/latest/bin"
+        return 0
+    fi
+
+    if [ -x "$ANDROID_HOME/cmdline-tools/$CMDLINE_TOOLS_VERSION/bin/sdkmanager" ]; then
+        echo "$ANDROID_HOME/cmdline-tools/$CMDLINE_TOOLS_VERSION/bin"
+        return 0
+    fi
+
+    >&2 echo "ERROR: cannot find SDK cmdline tools within '$ANDROID_HOME'"
+    exit 22
+}
diff --git a/tools/android-test b/tools/android-test
index 576cb4dd659..7185d860711 100755
--- a/tools/android-test
+++ b/tools/android-test
@@ -4,9 +4,17 @@
 
 set -e
 
+source "$(dirname $0)/android-sdk"
+
+ANDROID_CMDTOOLS=$(find_android_cmdline_tools)
+
 AVD_NAME="integration-tests"
 PORT=5556
 
+if [[ `uname` == "Darwin" ]]; then
+    export BOOST_ROOT=$(brew --prefix boost)
+fi
+
 # Make sure it builds before starting an emulator
 pushd android
 ./gradlew assembleAndroidTest
@@ -17,9 +25,9 @@ SERIAL=emulator-${PORT}
 
 # We have to echo "no" because it will ask us if we want to use a custom hardware profile, and we don't.
 echo -e "\nCreating Android emulator...\n"
-echo "no" | "$ANDROID_HOME/cmdline-tools/latest/bin/avdmanager" create avd \
+echo "no" | "$ANDROID_CMDTOOLS/avdmanager" create avd \
     -n "${AVD_NAME}" \
-    -k "system-images;android-26;google_apis;x86" \
+    -k "system-images;android-33;google_apis;arm64-v8a" \
 	-f
 echo -e "\nAVD ${AVD_NAME} created."
 
diff --git a/tools/build-and-test b/tools/build-and-test
index 0bc769ce9b8..bd4ba92c6cf 100755
--- a/tools/build-and-test
+++ b/tools/build-and-test
@@ -7,7 +7,7 @@
 set -e
 
 echo "#### Generating files... ####"
-tools/generate-files
+tools/generate-files native
 
 echo "#### Building... ####"
 cmake -H. -Bbuild -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
@@ -24,4 +24,7 @@ build/trezor-crypto/crypto/tests/TrezorCryptoTests
 
 echo "#### Running unit tests... ####"
 FILTER="*"
+if [ -n "$1" ]; then
+    FILTER="*$1*"
+fi
 build/tests/tests --gtest_filter="$FILTER"
diff --git a/tools/check-coverage b/tools/check-coverage
new file mode 100755
index 00000000000..f37723408d6
--- /dev/null
+++ b/tools/check-coverage
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+# This script processes captured test code coverage information
+# and compares current value to previously saved value (stored in coverage.stats).
+#
+# - Usage (CPP part):
+#   ./tools/check-coverage coverage.stats coverage.info
+#
+# - Usage (Rust part):
+#   ./tools/check-coverage rust/coverage.stats rust/coverage.info
+
+# Fail if any commands fails
+set -e
+
+coverage_stats=$1
+coverage_info=$2
+
+lcov --summary $coverage_info
+
+current=$(<$coverage_stats)
+new=$(lcov --summary $coverage_info | awk '/lines.*:/{sub("%", "", $2);print $2}')
+
+if (( $(echo "$current > $new" | bc -l) )); then
+    echo "Code coverage drops to ${new}% (current is ${current}%)"
+    exit -1
+else
+    echo "Update code coverage: ${current}% -> ${new}%"
+    echo -n $new > $coverage_stats
+    # commit to master
+fi
diff --git a/tools/coverage b/tools/coverage
index 648a1a81f8f..88b246fecd7 100755
--- a/tools/coverage
+++ b/tools/coverage
@@ -38,6 +38,7 @@ else
 fi
 
 lcov --remove coverage.info '/usr/*' --output-file coverage.info
+lcov --remove coverage.info '/opt/*' --output-file coverage.info
 lcov --remove coverage.info '/Applications/*' --output-file coverage.info
 lcov --remove coverage.info '*/build/*' --output-file coverage.info
 lcov --remove coverage.info '*.pb.cc' --output-file coverage.info
@@ -54,17 +55,4 @@ if [[ "$1" == "html" ]]; then
         coverage.info
 fi
 
-lcov --summary coverage.info
-
-echo
-current=$(<coverage.stats)
-new=$(lcov --summary coverage.info | awk '/lines.*:/{sub("%", "", $2);print $2}')
-
-if (( $(echo "$current > $new" | bc -l) )); then
-    echo "Code coverage drops to ${new}% (current is ${current}%)"
-    exit -1
-else
-    echo "Update code coverage: ${current}% -> ${new}%"
-    echo -n $new > coverage.stats
-    # commit to master
-fi
+tools/check-coverage coverage.stats coverage.info
diff --git a/tools/doxygen_convert_comments b/tools/doxygen_convert_comments
index 3c76e250487..3a81e3baeae 100755
--- a/tools/doxygen_convert_comments
+++ b/tools/doxygen_convert_comments
@@ -7,6 +7,13 @@ SWIFT_SEE_PATTERN='s/\\see/\- SeeAlso:/g'
 SWIFT_FOLDER_PATH="swift/Sources/Generated/*.swift"
 SWIFT_FOLDER_PATH_BAK="swift/Sources/Generated/*.bak"
 
+KOTLIN_PARAMETER_PATTERN='s/\\param/\@param/g'
+KOTLIN_RETURN_PATTERN='s/\\return/\@return/g'
+KOTLIN_NOTE_PATTERN='s/\\note/\@note/g'
+KOTLIN_SEE_PATTERN='s/\\see/\@see/g'
+KOTLIN_FOLDER_PATH="jni/java/wallet/core/jni/*.java"
+KOTLIN_FOLDER_PATH_BAK="jni/java/wallet/core/jni/*.bak"
+
 function process_swift_comments() {
     perl -pi.bak -e "$SWIFT_PARAMETER_PATTERN" "$1"
     perl -pi.bak -e "$SWIFT_RETURN_PATTERN" "$1"
@@ -14,9 +21,19 @@ function process_swift_comments() {
     perl -pi.bak -e "$SWIFT_SEE_PATTERN" "$1"
 }
 
+function process_kotlin_comments() {
+    # Process multiline /// comments into javadoc /** ... */ format
+    perl -0777 -pi.bak -e 's/\/\/\/([^\n]*\n)((?:\ *\/\/\/[^\n]*\n)*)/\/**\n *$1$2*\/\n/g' $1
+    perl -pi.bak -e 's/\/\/\//\ \*/g' $1
+
+    perl -pi.bak -e "$KOTLIN_PARAMETER_PATTERN" "$1"
+    perl -pi.bak -e "$KOTLIN_RETURN_PATTERN" "$1"
+    perl -pi.bak -e "$KOTLIN_NOTE_PATTERN" "$1"
+    perl -pi.bak -e "$KOTLIN_SEE_PATTERN" "$1"
+}
 
 function swift_convert() {
-  echo "Processing swift convertion"
+  echo "Processing swift conversion"
 
   for d in $SWIFT_FOLDER_PATH ; do
       process_swift_comments $d
@@ -25,4 +42,15 @@ function swift_convert() {
   rm -rf $SWIFT_FOLDER_PATH_BAK
 }
 
+function kotlin_convert() {
+  echo "Processing kotlin conversion"
+
+  for d in $KOTLIN_FOLDER_PATH ; do
+      process_kotlin_comments $d
+  done
+
+  rm -rf $KOTLIN_FOLDER_PATH_BAK
+}
+
 swift_convert
+kotlin_convert
diff --git a/tools/generate-files b/tools/generate-files
index 54c041b5fbe..de3abc7f906 100755
--- a/tools/generate-files
+++ b/tools/generate-files
@@ -10,6 +10,16 @@
 
 set -e
 
+source tools/parse_args "$@"
+
+if isHelp; then
+    echo "usage: generate-files [-h | --help] [all | native | wasm | android | ios]"
+    echo ""
+    echo "Generate files and bindings for target platforms specified in arguments"
+    echo "You can specify multiple targets at once"
+    exit 0
+fi
+
 # This script works in both Docker and normal build environments.
 # Protobuf and co. tools are taken from: $PREFIX if provided, or from $PWD/build/local if exists, or from /usr/bin
 if [ -z $PREFIX ]
@@ -39,42 +49,48 @@ $PROTOC --version
 # Clean
 rm -rf swift/Sources/Generated
 rm -rf jni/java/wallet/core/jni
-rm -rf jni/cpp/generated
+rm -rf jni/android/generated
 
 mkdir -p swift/Sources/Generated/Protobuf swift/Sources/Generated/Enums
 
 # Generate coins info from registry.json
 codegen/bin/coins
 
-# Generate interface code
+# Generate interface code, Swift bindings excluded.
 codegen/bin/codegen
 
 # Convert doxygen comments to appropriate format
 tools/doxygen_convert_comments
 
+# Generate rust bindgen
+tools/rust-bindgen "$@"
+
 # Generate Java, C++ and Swift Protobuf files
-if [ -x "$(command -v protoc-gen-swift)" ]; then
-    "$PROTOC" -I=$PREFIX/include -I=src/proto --cpp_out=src/proto --java_out=lite:jni/java --swift_out=swift/Sources/Generated/Protobuf --swift_opt=Visibility=Public src/proto/*.proto
+
+if [ -x "$(command -v protoc-gen-swift)" ] && isTargetSpecified "ios"; then
+    "$PROTOC" -I=$PREFIX/include -I=src/proto --cpp_out=src/proto --java_out=lite:jni/proto --swift_out=swift/Sources/Generated/Protobuf --swift_opt=Visibility=Public src/proto/*.proto
 else
-    "$PROTOC" -I=$PREFIX/include -I=src/proto --cpp_out=src/proto --java_out=lite:jni/java src/proto/*.proto
+    "$PROTOC" -I=$PREFIX/include -I=src/proto --cpp_out=src/proto --java_out=lite:jni/proto src/proto/*.proto
 fi
 
 # Generate internal message protocol Protobuf files
 "$PROTOC" -I=$PREFIX/include -I=src/Tron/Protobuf --cpp_out=src/Tron/Protobuf src/Tron/Protobuf/*.proto
 "$PROTOC" -I=$PREFIX/include -I=src/Zilliqa/Protobuf --cpp_out=src/Zilliqa/Protobuf src/Zilliqa/Protobuf/*.proto
-"$PROTOC" -I=$PREFIX/include -I=src/Cosmos/Protobuf --cpp_out=src/Cosmos/Protobuf src/Cosmos/Protobuf/*.proto
-"$PROTOC" -I=$PREFIX/include -I=tests/Cosmos/Protobuf --cpp_out=tests/Cosmos/Protobuf tests/Cosmos/Protobuf/*.proto
+"$PROTOC" -I=$PREFIX/include -I=src/Hedera/Protobuf --cpp_out=src/Hedera/Protobuf src/Hedera/Protobuf/*.proto
+"$PROTOC" -I=$PREFIX/include -I=tests/chains/Cosmos/Protobuf --cpp_out=tests/chains/Cosmos/Protobuf tests/chains/Cosmos/Protobuf/*.proto
 
 # Generate Proto interface file
 "$PROTOC" -I=$PREFIX/include -I=src/proto --plugin=$PREFIX/bin/protoc-gen-c-typedef --c-typedef_out include/TrustWalletCore src/proto/*.proto
 "$PROTOC" -I=$PREFIX/include -I=src/proto --plugin=$PREFIX/bin/protoc-gen-swift-typealias --swift-typealias_out swift/Sources/Generated/Protobuf src/proto/*.proto
 
 # Generate Xcode project
-if [ -x "$(command -v xcodegen)" ]; then
+if [ -x "$(command -v xcodegen)" ] && isTargetSpecified "ios"; then
     pushd swift
     xcodegen
     pod install
     popd
-else
+elif isTargetSpecified "ios"; then
     echo -e "\nWARNING: Skipped generating Xcode project because the xcodegen tool is not installed."
+else
+    echo -e "\nWARNING: skipping xcodegen generation"
 fi
diff --git a/tools/install-android-dependencies b/tools/install-android-dependencies
index 7f3d5c64b88..667e8c4342d 100755
--- a/tools/install-android-dependencies
+++ b/tools/install-android-dependencies
@@ -2,7 +2,40 @@
 
 set -e
 
-$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --verbose "cmake;3.18.1" "ndk;23.1.7779620"
-$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "system-images;android-26;google_apis;x86"
+source "$(dirname $0)/android-sdk"
 
-echo -e "y\ny\ny\ny\ny\n" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses
+ANDROID_CMDTOOLS=$(find_android_cmdline_tools)
+
+# Dokka stuff
+ROOT="$PWD"
+DOKKA_CLI_JAR=https://repo1.maven.org/maven2/org/jetbrains/dokka/dokka-cli/1.7.20/dokka-cli-1.7.20.jar
+
+declare -a DOKKA_DEPS=(
+https://repo1.maven.org/maven2/org/jetbrains/dokka/dokka-base/1.7.20/dokka-base-1.7.20.jar
+https://repo1.maven.org/maven2/org/jetbrains/dokka/dokka-analysis/1.7.20/dokka-analysis-1.7.20.jar
+https://repo1.maven.org/maven2/org/jetbrains/dokka/kotlin-analysis-intellij/1.7.20/kotlin-analysis-intellij-1.7.20.jar
+https://repo1.maven.org/maven2/org/jetbrains/dokka/kotlin-analysis-compiler/1.7.20/kotlin-analysis-compiler-1.7.20.jar
+https://repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-coroutines-core/1.6.4/kotlinx-coroutines-core-1.6.4.jar
+https://repo1.maven.org/maven2/org/jetbrains/kotlinx/kotlinx-html-jvm/0.8.0/kotlinx-html-jvm-0.8.0.jar
+https://repo1.maven.org/maven2/org/freemarker/freemarker/2.3.31/freemarker-2.3.31.jar
+)
+
+$ANDROID_CMDTOOLS/sdkmanager --verbose "cmake;3.18.1" "ndk;23.1.7779620"
+$ANDROID_CMDTOOLS/sdkmanager "system-images;android-30;google_apis;x86"
+
+echo -e "y\ny\ny\ny\ny\n" | $ANDROID_CMDTOOLS/sdkmanager --licenses
+
+echo "Downloading Dokka..."
+DOKKA_DIR="$ROOT/build/dokka"
+mkdir -p "$DOKKA_DIR"
+cd "$DOKKA_DIR"
+
+if [ ! -f dokka-cli-1.7.20.jar ]; then
+    curl -fSsOL $DOKKA_CLI_JAR
+fi
+
+for dep in "${DOKKA_DEPS[@]}" ; do
+    if [ ! -f ${dep##*/} ]; then
+        curl -fSsOL $dep
+    fi
+done
diff --git a/tools/install-dependencies b/tools/install-dependencies
index 3a04f8434bd..3ad3d77a54d 100755
--- a/tools/install-dependencies
+++ b/tools/install-dependencies
@@ -10,7 +10,10 @@ CMAKE=cmake
 MAKE=make
 
 # Load dependencies version
-BASE_DIR=$(cd `dirname $0`; pwd)
+BASE_DIR=$(
+    cd $(dirname $0)
+    pwd
+)
 source ${BASE_DIR}/dependencies-version
 
 # Setup up folders
@@ -50,28 +53,28 @@ function build_protobuf() {
     PROTOBUF_DIR="$ROOT/build/local/src/protobuf"
     cd ${PROTOBUF_DIR}/protobuf-$PROTOBUF_VERSION
 
-    ./configure --prefix="$PREFIX"
-    $MAKE -j4
-    $MAKE install
+    $CMAKE -Scmake -B . -Dprotobuf_BUILD_TESTS=OFF -Dprotobuf_MODULE_COMPATIBLE=ON
+    $CMAKE --build . -j
+    $CMAKE --install . --prefix $PREFIX
 
     # after install, cleanup to save space (docker)
-    make clean
+    $CMAKE --build . --target clean
     "$PREFIX/bin/protoc" --version
 
     # Protobuf plugins
     cd "$ROOT/protobuf-plugin"
-    $CMAKE -H. -Bbuild -DCMAKE_INSTALL_PREFIX=$PREFIX
-    $MAKE -Cbuild -j12
-    $MAKE -Cbuild install
-    rm -rf build
+    $CMAKE . -Bbuild -DProtobuf_DIR=$PREFIX/lib/cmake/protobuf
+    $CMAKE --build build -j
+    $CMAKE --install build --prefix $PREFIX
+    $CMAKE --build build --target clean
 
-    if [[ -x "$(command -v swift)" && `uname` == "Darwin" ]]; then
+    if [[ -x "$(command -v swift)" && $(uname) == "Darwin" ]]; then
         build_swift_plugin
     fi
 }
 
 function build_swift_plugin() {
-     # Download Swift Protobuf sources
+    # Download Swift Protobuf sources
     SWIFT_PROTOBUF_DIR="$ROOT/build/local/src/swift-protobuf"
     mkdir -p "$SWIFT_PROTOBUF_DIR"
     cd "$SWIFT_PROTOBUF_DIR"
diff --git a/tools/install-kotlin-dependencies b/tools/install-kotlin-dependencies
new file mode 100755
index 00000000000..42c24dca325
--- /dev/null
+++ b/tools/install-kotlin-dependencies
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+source "$(dirname $0)/android-sdk"
+
+ANDROID_CMDTOOLS=$(find_android_cmdline_tools)
+
+$ANDROID_CMDTOOLS/sdkmanager --verbose "cmake;3.22.1" "ndk;25.2.9519653"
+yes | $ANDROID_CMDTOOLS/sdkmanager --licenses
diff --git a/tools/install-rust-dependencies b/tools/install-rust-dependencies
new file mode 100755
index 00000000000..1b12239c010
--- /dev/null
+++ b/tools/install-rust-dependencies
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+set -e
+
+NIGHTLY="nightly-2024-06-13"
+
+rustup toolchain install $NIGHTLY
+rustup default $NIGHTLY
+rustup toolchain install $NIGHTLY-x86_64-apple-darwin --force-non-host
+rustup toolchain install $NIGHTLY-aarch64-apple-darwin --force-non-host
+rustup component add rust-src --toolchain $NIGHTLY-aarch64-apple-darwin
+rustup component add rust-src --toolchain $NIGHTLY-x86_64-apple-darwin
+if [[ `uname` == "Linux" ]]; then
+  rustup component add rust-src --toolchain $NIGHTLY-x86_64-unknown-linux-gnu
+fi
+
+# Android
+rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
+# iOS
+rustup target add aarch64-apple-darwin x86_64-apple-darwin
+# macOS
+rustup target add x86_64-apple-ios aarch64-apple-ios-sim aarch64-apple-ios
+# Wasm
+rustup target add wasm32-unknown-emscripten
+
+cargo install cbindgen --locked
+
+if [[ "$1" == "dev" ]]; then
+  rustup component add llvm-tools-preview clippy rustfmt
+  cargo install cargo-llvm-cov --locked
+fi
diff --git a/tools/install-sys-dependencies-linux b/tools/install-sys-dependencies-linux
new file mode 100755
index 00000000000..3a2c786eff9
--- /dev/null
+++ b/tools/install-sys-dependencies-linux
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+set -e
+
+# build-essential clang-14 libc++-dev libc++abi-dev ruby-full cmake
+sudo apt-get update && sudo apt-get install ninja-build llvm-14 clang-tidy-14 libboost-all-dev rustc --fix-missing gcc-multilib g++-multilib
+
+# As of now, Ubuntu 24.04 has lcov 2.0-4ubuntu2 only, but we don't support it yet.
+# Install lcov 1.15-1 manually.
+LCOV_TEMP="$(mktemp -d)"
+LCOV_DEB="$LCOV_TEMP/lcov.deb"
+wget -O "$LCOV_DEB" http://mirrors.kernel.org/ubuntu/pool/universe/l/lcov/lcov_1.15-1_all.deb
+sudo apt-get install "$LCOV_DEB"
+rm -rf $LCOV_TEMP
diff --git a/tools/install-sys-dependencies-mac b/tools/install-sys-dependencies-mac
new file mode 100755
index 00000000000..28dc34cb356
--- /dev/null
+++ b/tools/install-sys-dependencies-mac
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+brew install cmake boost ninja xcodegen xcbeautify
+
+if [[ "$BOOST_ROOT" == "" ]]; then
+    echo "export BOOST_ROOT=$(brew --prefix boost)" >>  ~/.zprofile
+fi
+
+if command -v rustup &> /dev/null
+then
+    echo "Rustup is already installed."
+else
+    echo "Rustup is not installed. Installing it now."
+    brew install rustup
+    rustup-init -y --default-toolchain none --no-update-default-toolchain
+fi
diff --git a/tools/install-wasm-dependencies b/tools/install-wasm-dependencies
index dcf17caa686..d19611616ce 100755
--- a/tools/install-wasm-dependencies
+++ b/tools/install-wasm-dependencies
@@ -2,7 +2,7 @@
 
 set -e
 
-emsdk_version=3.1.22
+emsdk_version=3.1.33
 
 git clone https://github.com/emscripten-core/emsdk.git
 
diff --git a/tools/ios-build b/tools/ios-build
index e1b3945ecfc..6a7b73eb96e 100755
--- a/tools/ios-build
+++ b/tools/ios-build
@@ -43,17 +43,19 @@ build_mac_x64_arm64() {
 }
 
 create_xc_framework() {
-    echo "Createing xcframework..."
+    echo "Creating xcframework..."
     xcodebuild -create-xcframework -output $BUILD_FOLDER/$FRAMEWORK.xcframework \
                -framework $BUILD_FOLDER/ios-arm64.xcarchive/Products/Library/Frameworks/$FRAMEWORK.framework \
                -framework $BUILD_FOLDER/ios-arm64_x86_64-simulator.xcarchive/Products/Library/Frameworks/$FRAMEWORK.framework \
+               -framework $BUILD_FOLDER/ios-x86_64_arm64-maccatalyst.xcarchive/Products/Library/Frameworks/$FRAMEWORK.framework \
                -framework $BUILD_FOLDER/macos-arm64_x86_64.xcarchive/Products/Library/Frameworks/$FRAMEWORK.framework
 }
 
 main() {
     init
-    build_ios_arm64 && build_ios_simulator
     build_mac_x64_arm64
+    build_ios_mac_catalyst
+    build_ios_arm64 && build_ios_simulator
     create_xc_framework
 }
 
diff --git a/tools/ios-doc b/tools/ios-doc
index 9c004897a18..60c5a41b1cd 100755
--- a/tools/ios-doc
+++ b/tools/ios-doc
@@ -9,7 +9,7 @@ pushd swift
 mkdir -p build && rm -rf build/*.doccarchive
 
 export DOCC_JSON_PRETTYPRINT="YES"
-xcodebuild -workspace TrustWalletCore.xcworkspace -derivedDataPath build/docsData -scheme WalletCore -destination 'platform=iOS Simulator,name=iPhone 13 Pro Max' -parallelizeTargets docbuild | xcbeautify
+xcodebuild -workspace TrustWalletCore.xcworkspace -derivedDataPath build/docsData -scheme WalletCore -destination 'platform=iOS Simulator,name=iPhone 14' -parallelizeTargets docbuild | xcbeautify
 
 pushd build
 
diff --git a/tools/ios-test b/tools/ios-test
index 62d09d61417..639c605a8d6 100755
--- a/tools/ios-test
+++ b/tools/ios-test
@@ -11,7 +11,7 @@ xcodegen && pod install
 xcodebuild -workspace TrustWalletCore.xcworkspace \
 	-scheme WalletCore \
 	-sdk iphonesimulator \
-	-destination "platform=iOS Simulator,name=iPhone 13" \
+	-destination "platform=iOS Simulator,name=iPhone 15,OS=17.2" \
 	test | xcbeautify
 
 popd
diff --git a/tools/kotlin-build b/tools/kotlin-build
new file mode 100755
index 00000000000..4681910d30a
--- /dev/null
+++ b/tools/kotlin-build
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -e
+
+if [[ `uname` == "Darwin" ]]; then
+    export BOOST_ROOT=$(brew --prefix boost)
+fi
+
+pushd kotlin
+./gradlew :wallet-core-kotlin:generateProtos
+./gradlew :wallet-core-kotlin:assemble
+popd
diff --git a/tools/kotlin-doc b/tools/kotlin-doc
new file mode 100755
index 00000000000..d1ea9e5de3b
--- /dev/null
+++ b/tools/kotlin-doc
@@ -0,0 +1,28 @@
+#!/bin/bash
+
+pushd jni
+
+DOKKA_CLI_JAR=../build/dokka/dokka-cli-1.7.20.jar
+
+declare -a DOKKA_DEPS=(
+dokka-base-1.7.20.jar
+dokka-analysis-1.7.20.jar
+kotlin-analysis-intellij-1.7.20.jar
+kotlin-analysis-compiler-1.7.20.jar
+kotlinx-coroutines-core-1.6.4.jar
+kotlinx-html-jvm-0.8.0.jar
+freemarker-2.3.31.jar
+)
+
+pluginClassPath=""
+for dep in "${DOKKA_DEPS[@]}" ; do
+	pluginClassPath="$pluginClassPath;../build/dokka/$dep"
+done
+
+mkdir -p dokka-out
+
+java -jar ${DOKKA_CLI_JAR} -moduleName WalletCore -outputDir dokka-out -pluginsClasspath $pluginClassPath -sourceSet "-sourceSetName TrustWallet -src java/wallet/core/jni"
+
+zip -rq kdoc.zip dokka-out && mv kdoc.zip ../build/dokka
+
+popd #jni
diff --git a/tools/kotlin-release b/tools/kotlin-release
new file mode 100755
index 00000000000..c6e5f40afa8
--- /dev/null
+++ b/tools/kotlin-release
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+set -e
+
+source $(dirname $0)/library
+version=$(wc_read_version $1)
+
+echo "Building $version"
+
+export ANDROID_HOME="$HOME/Library/Android/sdk"
+export BOOST_ROOT=$(brew --prefix boost)
+
+pushd kotlin
+./gradlew :wallet-core-kotlin:generateProtos
+./gradlew :wallet-core-kotlin:assemble :wallet-core-kotlin:publish -Pversion="$version"
+popd
+
+echo "Kotlin build uploaded"
diff --git a/tools/kotlin-test b/tools/kotlin-test
new file mode 100755
index 00000000000..2c97cef3d00
--- /dev/null
+++ b/tools/kotlin-test
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -e
+
+if [[ `uname` == "Darwin" ]]; then
+    export BOOST_ROOT=$(brew --prefix boost)
+fi
+
+pushd kotlin
+./gradlew :wallet-core-kotlin:jvmTest
+popd
diff --git a/tools/new-blockchain b/tools/new-blockchain
new file mode 100755
index 00000000000..8ccdd0e740b
--- /dev/null
+++ b/tools/new-blockchain
@@ -0,0 +1,11 @@
+#!/bin/bash
+#
+# This script generates new Blockchain skeleton files.
+
+pushd codegen-v2
+cargo run -- new-blockchain $1
+popd # codegen-v2
+
+pushd codegen
+codegen/bin/newcoin-mobile-tests $1
+popd # codegen
diff --git a/tools/new-evmchain b/tools/new-evmchain
new file mode 100755
index 00000000000..3eb2c89410d
--- /dev/null
+++ b/tools/new-evmchain
@@ -0,0 +1,7 @@
+#!/bin/bash
+#
+# This script generates new EVM chain skeleton files.
+
+pushd codegen-v2
+cargo run -- new-evmchain $1
+popd # codegen-v2
diff --git a/tools/parse_args b/tools/parse_args
new file mode 100755
index 00000000000..3868fe56077
--- /dev/null
+++ b/tools/parse_args
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+# Save the arguments on the first `source ./tools/parse_args "$@"` call.
+ARGS=("$@")
+
+function containsArg() {
+  for arg in "${ARGS[@]}"; do
+    if [[ "$arg" == "$1" ]]; then
+      return 0
+    fi
+  done
+  return 1
+}
+
+function isHelp() {
+  if containsArg "--help" || containsArg "-h"; then
+    return 0
+  fi
+  return 1
+}
+
+function noArgs() {
+  if [[ "${#ARGS}" -eq 0 ]]; then
+    return 0
+  fi
+  return 1
+}
+
+# Whether the command line arguments contain a target.
+# Returns `true` if either no arguments are specified, or `all`, or the exact target specified.
+function isTargetSpecified() {
+  if noArgs || containsArg "all" || containsArg "$1"; then
+    return 0
+  fi
+  return 1
+}
diff --git a/tools/registry b/tools/registry
new file mode 100755
index 00000000000..2f322890910
--- /dev/null
+++ b/tools/registry
@@ -0,0 +1,66 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+import requests
+import subprocess
+import sys
+
+PATH_TO_REGISTRY_JSON = "registry.json"
+
+
+def ping_url(url):
+    response = requests.get(url)
+    if response.status_code != 200:
+        raise Exception(str(response.status_code))
+
+
+def ping_explorers(_args):
+    """Pings blockchain explorers inside 'registry.json'"""
+    registry_file = open(PATH_TO_REGISTRY_JSON, 'r')
+    registry_json = json.load(registry_file)
+
+    for chain_json in registry_json:
+        explorer_json = chain_json["explorer"]
+        sample_url = explorer_json["url"]
+
+        # Not all chains have `sampleTx` parameter.
+        if "sampleTx" in explorer_json:
+            sample_url += explorer_json["txPath"] + explorer_json["sampleTx"]
+
+        try:
+            ping_url(sample_url)
+        except Exception as exception:
+            print(chain_json["name"], ":", sample_url, " NOT WORKING")
+            print("\tError: ", exception)
+
+
+def registry_stats(_args):
+    """Print registry stats"""
+    subprocess.run([
+        "cargo",
+        "run",
+        "--manifest-path",
+        "rust/Cargo.toml",
+        "-p",
+        "wallet_core_bin",
+        "--",
+        "registry-stats"
+    ],
+        shell=False)
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="Operations over registry.json")
+    subparsers = parser.add_subparsers()
+
+    ping_explorers_parser = subparsers.add_parser('ping-explorers',
+                                                  help="Ping blockchain explorers inside 'registry.json'")
+    ping_explorers_parser.set_defaults(func=ping_explorers)
+
+    registry_stats_parser = subparsers.add_parser('registry-stats',
+                                                  help="Print registry statistic (e.g Rust transition progress)")
+    registry_stats_parser.set_defaults(func=registry_stats)
+
+    args = parser.parse_args()
+    args.func(args)
diff --git a/tools/release-size b/tools/release-size
new file mode 100755
index 00000000000..c80c71ee873
--- /dev/null
+++ b/tools/release-size
@@ -0,0 +1,84 @@
+#!/usr/bin/env python3
+
+import argparse
+import json
+import os
+
+RUST_TARGETS = [
+    "aarch64-apple-ios",
+    "aarch64-apple-ios-sim",
+    "aarch64-linux-android",
+    "armv7-linux-androideabi",
+    "wasm32-unknown-emscripten",
+]
+LIB_NAME = "libwallet_core_rs.a"
+
+
+def display_size(size_kb: int) -> str:
+    if size_kb >= 10000:
+        size_mb = float(size_kb) / 1024
+        return f'{size_mb:.2f} MB'
+    else:
+        return f'{size_kb} KB'
+
+
+def display_diff(diff_kb: int) -> str:
+    if abs(diff_kb) >= 10000:
+        diff_mb = float(diff_kb) / 1024
+        return f'{diff_mb:+.2f} MB'
+    else:
+        return f'{diff_kb:+} KB'
+
+
+def measure_rust(_args):
+    result = {}
+
+    for target in RUST_TARGETS:
+        path = f'rust/target/{target}/release/{LIB_NAME}'
+        file_stats = os.stat(path)
+        file_size_kb = file_stats.st_size / 1024
+        result[target] = int(file_size_kb)
+
+    print(json.dumps(result))
+
+
+def compare_sizes(args):
+    def display_target(target: str, before_kb: int, current_kb: int):
+        diff_kb = current_kb - before_kb
+        if before_kb == current_kb:
+            print(f'➡️ **{target}**: {display_size(before_kb)}')
+        else:
+            print(f'➡️ **{target}**:')
+            print("```diff")
+            print(f'- {display_size(before_kb)}')
+            print(f'+ {display_size(current_kb)} \t {display_diff(diff_kb)}')
+            print("```")
+
+    current_json = json.load(open(args.current, 'r'))
+    before_json = {}
+    if os.path.isfile(args.before):
+        before_json = json.load(open(args.before, 'r'))
+
+    print("## Binary size comparison")
+    print()
+    for target, current_kb in current_json.items():
+        before_kb = before_json.get(target, current_kb)
+        display_target(target, before_kb, current_kb)
+        print()
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="GitHub CI helper functions")
+    subparsers = parser.add_subparsers()
+
+    measure_parser = subparsers.add_parser('measure-rust', help="Measures Rust release binaries'")
+    measure_parser.set_defaults(func=measure_rust)
+
+    compare_parser = subparsers.add_parser('compare',
+                                           help="Compares binary sizes. Takes 'before' and 'current' file names")
+    compare_parser.add_argument('--before', type=str)
+    compare_parser.add_argument('--current', type=str)
+    compare_parser.set_defaults(func=compare_sizes)
+
+    args = parser.parse_args()
+    args.func(args)
diff --git a/tools/rust-bindgen b/tools/rust-bindgen
new file mode 100755
index 00000000000..0edaf9c23a5
--- /dev/null
+++ b/tools/rust-bindgen
@@ -0,0 +1,148 @@
+#!/bin/bash
+
+set -e
+
+source "$(dirname $0)/parse_args" "$@"
+source "$(dirname $0)/android-sdk"
+
+if isHelp; then
+  echo "usage: rust-bindgen [-h | --help] [all | native | wasm | android | ios]"
+  echo ""
+  echo "Generate Rust bindings for target platforms specified in arguments"
+  echo "You can specify multiple targets at once"
+  exit 0
+fi
+
+TARGET_NAME="libwallet_core_rs.a"
+TARGET_XCFRAMEWORK_NAME=../swift/WalletCoreRs.xcframework
+BUILD_FOLDER=../rust/target
+CRATE="wallet-core-rs"
+HEADER_NAME="WalletCoreRSBindgen.h"
+
+create_xc_framework() {
+  rm -rf $TARGET_XCFRAMEWORK_NAME
+  xcodebuild -create-xcframework -library $BUILD_FOLDER/$TARGET_NAME -library $BUILD_FOLDER/darwin_universal/$TARGET_NAME -library $BUILD_FOLDER/aarch64-apple-ios/release/$TARGET_NAME -output $TARGET_XCFRAMEWORK_NAME
+  mkdir -p $TARGET_XCFRAMEWORK_NAME/ios-arm64_x86_64-maccatalyst
+  cp $BUILD_FOLDER/catalyst/$TARGET_NAME $TARGET_XCFRAMEWORK_NAME/ios-arm64_x86_64-maccatalyst
+}
+
+cd rust
+
+if isTargetSpecified "native"; then
+  echo "Generating Native target"
+  cargo build --release --lib
+fi
+
+export RUSTFLAGS="-Zlocation-detail=none"
+
+if isTargetSpecified "wasm"; then
+  echo "Generating WASM target"
+
+  source ../emsdk/emsdk_env.sh
+  cargo build -Z build-std=std,panic_abort --target wasm32-unknown-emscripten --release --lib
+fi
+
+if isTargetSpecified "android"; then
+  NDK_BIN_PATH=$(find_android_ndk)
+
+  export AR="$NDK_BIN_PATH/llvm-ar"
+  export CC_aarch64_linux_android="$NDK_BIN_PATH/aarch64-linux-android$NDK_API_LEVEL-clang"
+  export CC_x86_64_linux_android="$NDK_BIN_PATH/x86_64-linux-android$NDK_API_LEVEL-clang"
+  export CC_i686_linux_android="$NDK_BIN_PATH/i686-linux-android$NDK_API_LEVEL-clang"
+  export CC_armv7_linux_androideabi="$NDK_BIN_PATH/armv7a-linux-androideabi$NDK_API_LEVEL-clang"
+
+  echo "Generating Android targets"
+  cargo build -Z build-std=std,panic_abort --target aarch64-linux-android --target armv7-linux-androideabi --target x86_64-linux-android --target i686-linux-android --release --lib
+fi
+
+if isTargetSpecified "ios" && [[ $(uname) == "Darwin" ]]; then
+  echo "Generating iOS targets"
+  cargo build -Z build-std=std,panic_abort --target aarch64-apple-ios --target aarch64-apple-ios-sim --target x86_64-apple-ios --target aarch64-apple-darwin --target x86_64-apple-darwin --target aarch64-apple-ios-macabi --target x86_64-apple-ios-macabi --release --lib &
+  wait
+  lipo $BUILD_FOLDER/x86_64-apple-ios/release/$TARGET_NAME $BUILD_FOLDER/aarch64-apple-ios-sim/release/$TARGET_NAME -create -output $BUILD_FOLDER/$TARGET_NAME
+  mkdir -p $BUILD_FOLDER/darwin_universal
+  lipo $BUILD_FOLDER/x86_64-apple-darwin/release/$TARGET_NAME $BUILD_FOLDER/aarch64-apple-darwin/release/$TARGET_NAME -create -output $BUILD_FOLDER/darwin_universal/$TARGET_NAME
+  mkdir -p $BUILD_FOLDER/catalyst
+  lipo $BUILD_FOLDER/aarch64-apple-ios-macabi/release/$TARGET_NAME $BUILD_FOLDER/x86_64-apple-ios-macabi/release/$TARGET_NAME -create -output $BUILD_FOLDER/catalyst/$TARGET_NAME
+
+  create_xc_framework
+fi
+
+cbindgen --crate $CRATE --output ../src/rust/bindgen/$HEADER_NAME
+cd -
+[[ -e rust/target/release/${TARGET_NAME} ]] && cp rust/target/release/${TARGET_NAME} build/local/lib/
+
+if isTargetSpecified "ios" && [[ $(uname) == "Darwin" ]]; then
+cd rust
+cat > $TARGET_XCFRAMEWORK_NAME/Info.plist << EOF
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>AvailableLibraries</key>
+	<array>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>macos-arm64_x86_64</string>
+			<key>LibraryPath</key>
+			<string>libwallet_core_rs.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>macos</string>
+		</dict>
+		<dict>
+        			<key>LibraryIdentifier</key>
+        			<string>ios-arm64_x86_64-maccatalyst</string>
+        			<key>LibraryPath</key>
+        			<string>libwallet_core_rs.a</string>
+        			<key>SupportedArchitectures</key>
+        			<array>
+        				<string>arm64</string>
+        				<string>x86_64</string>
+        			</array>
+        			<key>SupportedPlatform</key>
+        			<string>ios</string>
+        			<key>SupportedPlatformVariant</key>
+        			<string>maccatalyst</string>
+        </dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64</string>
+			<key>LibraryPath</key>
+			<string>libwallet_core_rs.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+		</dict>
+		<dict>
+			<key>LibraryIdentifier</key>
+			<string>ios-arm64_x86_64-simulator</string>
+			<key>LibraryPath</key>
+			<string>libwallet_core_rs.a</string>
+			<key>SupportedArchitectures</key>
+			<array>
+				<string>arm64</string>
+				<string>x86_64</string>
+			</array>
+			<key>SupportedPlatform</key>
+			<string>ios</string>
+			<key>SupportedPlatformVariant</key>
+			<string>simulator</string>
+		</dict>
+	</array>
+	<key>CFBundlePackageType</key>
+	<string>XFWK</string>
+	<key>XCFrameworkFormatVersion</key>
+	<string>1.0</string>
+</dict>
+</plist>
+EOF
+cd -
+fi
diff --git a/tools/rust-coverage b/tools/rust-coverage
new file mode 100755
index 00000000000..835b13997b3
--- /dev/null
+++ b/tools/rust-coverage
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+#
+# This script processes captured test code coverage information of the Rust part,
+# generates HTML report (if html argument is given),
+# and compares current value to previously saved value (stored in coverage.stats).
+#
+# To generate coverage info:
+# - install cargo-llvm-cov binary
+#   cargo install cargo-llvm-cov
+# - run unit tests ang generate coverage info (slow). Optionally generate report in HTML format:
+#   ./tools/rust-coverage html
+
+# Fail if any commands fails
+set -e
+
+pushd rust
+
+# Generate HTML report if requested
+if [[ "$1" == "html" ]]; then
+    cargo llvm-cov test --workspace --exclude wallet_core_bin --html
+    cargo llvm-cov report --lcov --output-path coverage.info
+else
+    cargo llvm-cov test --workspace --exclude wallet_core_bin --lcov --output-path coverage.info
+fi
+
+popd
+
+tools/check-coverage rust/coverage.stats rust/coverage.info
diff --git a/tools/rust-fuzz b/tools/rust-fuzz
new file mode 100755
index 00000000000..5aabfcf96cd
--- /dev/null
+++ b/tools/rust-fuzz
@@ -0,0 +1,39 @@
+#!/bin/bash
+#
+# This script ensures that all `cargo-fuzz` targets are compilable if the `dry` argument is given. Otherwise it does nothing.
+# Prerequisite: install `cargo-fuzz` by running `cargo install cargo-fuzz`.
+
+set -e
+
+run_fuzz_target_dry() {
+    crate=$1
+    target=$2
+
+    pushd rust/$crate
+
+    echo
+    echo "Running '$crate::$target' fuzz test (dry)"
+    echo
+    cargo fuzz run $target -- -runs=0
+    echo
+
+    popd # rust/$crate
+}
+
+run_fuzz_crate_dry() {
+    crate=$1
+
+    pushd rust/$crate
+    targets=$(cargo fuzz list)
+    popd # rust/$crate
+
+    while read -r target; do
+      run_fuzz_target_dry $crate $target
+    done < <(printf '%s\n' "$targets")
+}
+
+if [[ $1 == "dry" ]]; then
+  run_fuzz_crate_dry "tw_encoding"
+  run_fuzz_crate_dry "tw_hash"
+  run_fuzz_crate_dry "tw_keypair"
+fi
diff --git a/tools/rust-lint b/tools/rust-lint
new file mode 100755
index 00000000000..6b47a463c51
--- /dev/null
+++ b/tools/rust-lint
@@ -0,0 +1,15 @@
+#!/bin/bash
+#
+# Run Rust lints: fmt, clippy and udeps.
+
+set -e
+
+pushd rust
+
+echo "Check code formatting"
+cargo fmt --check
+
+echo "Check Clippy warnings"
+cargo clippy -- -D warnings
+
+popd
diff --git a/tools/rust-test b/tools/rust-test
new file mode 100755
index 00000000000..ad72918e65b
--- /dev/null
+++ b/tools/rust-test
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+# To run Rust tests (home architecture):
+# - run unit tests without additional flags:
+#   ./tools/rust-test
+#
+# To run Rust tests in WASM:
+# - install wasm dependencies
+#   ./tools/install-wasm-dependencies
+# - run unit tests with `wasm` flag:
+#   ./tools/rust-test wasm
+
+set -e
+
+pushd rust
+
+if [[ "$1" == "wasm" ]]; then
+  source ../emsdk/emsdk_env.sh
+  export CARGO_TARGET_WASM32_UNKNOWN_EMSCRIPTEN_RUNNER=node
+
+  cargo test --target wasm32-unknown-emscripten --profile wasm-test --workspace --exclude wallet_core_bin
+else
+  cargo test --all
+fi
+
+popd # rust
diff --git a/tools/sonar-scanner.properties b/tools/sonar-scanner.properties
new file mode 100644
index 00000000000..08eb8f97091
--- /dev/null
+++ b/tools/sonar-scanner.properties
@@ -0,0 +1,9 @@
+#Configure here general information about the environment, such as SonarQube server connection details for example
+#No information about specific project should appear here
+
+#----- Default SonarQube server
+sonar.host.url=https://sonarcloud.io/
+
+#----- Default source code encoding
+#sonar.sourceEncoding=UTF-8
+
diff --git a/tools/sonarcloud-analysis b/tools/sonarcloud-analysis
new file mode 100755
index 00000000000..a8daa2f79ad
--- /dev/null
+++ b/tools/sonarcloud-analysis
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+TARGET=sonar-scanner-cli-5.0.1.3006-linux.zip
+TARGET_DIR=sonar-scanner-5.0.1.3006-linux
+curl https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/${TARGET} --output ${TARGET}
+unzip ${TARGET}
+cp tools/sonar-scanner.properties ${TARGET_DIR}/conf
+chmod +x ${TARGET_DIR}/bin/sonar-scanner
+./${TARGET_DIR}/bin/sonar-scanner
diff --git a/tools/test b/tools/test
new file mode 100755
index 00000000000..97f79e9d566
--- /dev/null
+++ b/tools/test
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+#
+# Perform full build and runs the tests.
+# Prerequisite: workspace with dependencies installed, see bootstrap.sh
+
+# Fail if any commands fails
+set -e
+
+make -Cbuild -j12 tests
+
+echo "#### Running unit tests... ####"
+FILTER="*"
+if [ -n "$1" ]; then
+    FILTER="*$1*"
+fi
+build/tests/tests --gtest_filter="$FILTER"
diff --git a/trezor-crypto/CMakeLists.txt b/trezor-crypto/CMakeLists.txt
index 76f526bd984..a3ef46a38f2 100644
--- a/trezor-crypto/CMakeLists.txt
+++ b/trezor-crypto/CMakeLists.txt
@@ -1,8 +1,6 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
 set(TW_WARNING_FLAGS 
     -W
@@ -25,6 +23,8 @@ set(TW_WARNING_FLAGS
     -Wno-missing-braces
 )
 
+set(CMAKE_C_STANDARD 11)
+
 add_library(TrezorCrypto
     crypto/bignum.c crypto/ecdsa.c crypto/curves.c crypto/secp256k1.c crypto/rand.c crypto/hmac.c crypto/bip32.c crypto/bip39.c crypto/slip39.c crypto/pbkdf2.c crypto/base58.c crypto/base32.c
     crypto/address.c
@@ -65,7 +65,7 @@ if (EMSCRIPTEN)
     message(STATUS "Skip building trezor-crypto/tests")
     set(TW_WARNING_FLAGS ${TW_WARNING_FLAGS} -Wno-bitwise-instead-of-logical)
 else ()
-    if(NOT ANDROID AND NOT IOS_PLATFORM)
+    if(NOT ANDROID AND NOT IOS_PLATFORM AND NOT TW_COMPILE_JAVA)
         add_subdirectory(crypto/tests)
     endif()
 endif()
diff --git a/trezor-crypto/crypto/README.md b/trezor-crypto/crypto/README.md
index a71139335a2..856dbb44ac5 100644
--- a/trezor-crypto/crypto/README.md
+++ b/trezor-crypto/crypto/README.md
@@ -27,9 +27,9 @@ These include:
 - unit tests (using Check - check.sf.net; in test_check.c)
 - tests against OpenSSL (in test_openssl.c)
 - integrated Wycheproof tests
-- public key convertion between Curve25519 to Ed25519 and vice versa
+- public key conversion between Curve25519 to Ed25519 and vice versa
 
-Distibuted under MIT License.
+Distributed under MIT License.
 
 ## Some parts of the library come from external sources:
 
diff --git a/trezor-crypto/crypto/aes/aescrypt.c b/trezor-crypto/crypto/aes/aescrypt.c
index aac3b571b6c..8a168d04efe 100644
--- a/trezor-crypto/crypto/aes/aescrypt.c
+++ b/trezor-crypto/crypto/aes/aescrypt.c
@@ -215,7 +215,7 @@ AES_RETURN aes_xi(encrypt)(const unsigned char *in, unsigned char *out, const ae
 #endif
 
 /* This code can work with the decryption key schedule in the   */
-/* order that is used for encrytpion (where the 1st decryption  */
+/* order that is used for encryption (where the 1st decryption  */
 /* round key is at the high end ot the schedule) or with a key  */
 /* schedule that has been reversed to put the 1st decryption    */
 /* round key at the low end of the schedule in memory (when     */
diff --git a/trezor-crypto/crypto/bignum.c b/trezor-crypto/crypto/bignum.c
index 85b8b0172e7..5791448d100 100644
--- a/trezor-crypto/crypto/bignum.c
+++ b/trezor-crypto/crypto/bignum.c
@@ -46,7 +46,7 @@
  A limb of a bignum256 is *normalized* iff it's less than 2**29.
  A bignum256 is *normalized* iff every its limb is normalized.
  A number is *fully reduced modulo p* iff it is less than p.
- A number is *partly reduced modulo p* iff is is less than 2*p.
+ A number is *partly reduced modulo p* iff it is less than 2*p.
  The number p is usually a prime number such that 2^256 - 2^224 <= p <= 2^256.
 
  All functions except bn_fast_mod expect that all their bignum256 inputs are
diff --git a/trezor-crypto/crypto/blake2b.c b/trezor-crypto/crypto/blake2b.c
index 5ec488bfe00..5b71c58de65 100644
--- a/trezor-crypto/crypto/blake2b.c
+++ b/trezor-crypto/crypto/blake2b.c
@@ -93,7 +93,7 @@ static void blake2b_init0( blake2b_state *S )
 }
 
 /* init xors IV with input parameter block */
-int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
+static int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
 {
   const uint8_t *p = ( const uint8_t * )( P );
   size_t i = 0;
@@ -110,7 +110,7 @@ int blake2b_init_param( blake2b_state *S, const blake2b_param *P )
 
 
 /* Sequential blake2b initialization */
-int blake2b_Init( blake2b_state *S, size_t outlen )
+int tc_blake2b_Init( blake2b_state *S, size_t outlen )
 {
   blake2b_param P[1] = {0};
 
@@ -131,7 +131,7 @@ int blake2b_Init( blake2b_state *S, size_t outlen )
   return blake2b_init_param( S, P );
 }
 
-int blake2b_InitPersonal( blake2b_state *S, size_t outlen, const void *personal, size_t personal_len)
+int tc_blake2b_InitPersonal( blake2b_state *S, size_t outlen, const void *personal, size_t personal_len)
 {
   blake2b_param P[1] = {0};
 
@@ -153,7 +153,7 @@ int blake2b_InitPersonal( blake2b_state *S, size_t outlen, const void *personal,
   return blake2b_init_param( S, P );
 }
 
-int blake2b_InitKey( blake2b_state *S, size_t outlen, const void *key, size_t keylen )
+int tc_blake2b_InitKey( blake2b_state *S, size_t outlen, const void *key, size_t keylen )
 {
   blake2b_param P[1] = {0};
 
@@ -180,7 +180,7 @@ int blake2b_InitKey( blake2b_state *S, size_t outlen, const void *key, size_t ke
     uint8_t block[BLAKE2B_BLOCKBYTES] = {0};
     memzero( block, BLAKE2B_BLOCKBYTES );
     memcpy( block, key, keylen );
-    blake2b_Update( S, block, BLAKE2B_BLOCKBYTES );
+    tc_blake2b_Update( S, block, BLAKE2B_BLOCKBYTES );
     memzero( block, BLAKE2B_BLOCKBYTES ); /* Burn the key from stack */
   }
   return 0;
@@ -254,7 +254,7 @@ static void blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2B_BLOC
 #undef G
 #undef ROUND
 
-int blake2b_Update( blake2b_state *S, const void *pin, size_t inlen )
+int tc_blake2b_Update( blake2b_state *S, const void *pin, size_t inlen )
 {
   const unsigned char * in = (const unsigned char *)pin;
   if( inlen > 0 )
@@ -281,7 +281,7 @@ int blake2b_Update( blake2b_state *S, const void *pin, size_t inlen )
   return 0;
 }
 
-int blake2b_Final( blake2b_state *S, void *out, size_t outlen )
+int tc_blake2b_Final( blake2b_state *S, void *out, size_t outlen )
 {
   uint8_t buffer[BLAKE2B_OUTBYTES] = {0};
   size_t i = 0;
@@ -305,30 +305,30 @@ int blake2b_Final( blake2b_state *S, void *out, size_t outlen )
   return 0;
 }
 
-int blake2b(const uint8_t *msg, uint32_t msg_len, void *out, size_t outlen)
+int tc_blake2b(const uint8_t *msg, uint32_t msg_len, void *out, size_t outlen)
 {
     BLAKE2B_CTX ctx;
-    if (0 != blake2b_Init(&ctx, outlen)) return -1;
-    if (0 != blake2b_Update(&ctx, msg, msg_len)) return -1;
-    if (0 != blake2b_Final(&ctx, out, outlen)) return -1;
+    if (0 != tc_blake2b_Init(&ctx, outlen)) return -1;
+    if (0 != tc_blake2b_Update(&ctx, msg, msg_len)) return -1;
+    if (0 != tc_blake2b_Final(&ctx, out, outlen)) return -1;
     return 0;
 }
 
 // [wallet-core]
-int blake2b_Personal(const uint8_t *msg, uint32_t msg_len, const void *personal, size_t personal_len, void *out, size_t outlen)
+int tc_blake2b_Personal(const uint8_t *msg, uint32_t msg_len, const void *personal, size_t personal_len, void *out, size_t outlen)
 {
     BLAKE2B_CTX ctx;
-    if (0 != blake2b_InitPersonal(&ctx, outlen, personal, personal_len)) return -1;
-    if (0 != blake2b_Update(&ctx, msg, msg_len)) return -1;
-    if (0 != blake2b_Final(&ctx, out, outlen)) return -1;
+    if (0 != tc_blake2b_InitPersonal(&ctx, outlen, personal, personal_len)) return -1;
+    if (0 != tc_blake2b_Update(&ctx, msg, msg_len)) return -1;
+    if (0 != tc_blake2b_Final(&ctx, out, outlen)) return -1;
     return 0;
 }
 
-int blake2b_Key(const uint8_t *msg, uint32_t msg_len, const void *key, size_t keylen, void *out, size_t outlen)
+int tc_blake2b_Key(const uint8_t *msg, uint32_t msg_len, const void *key, size_t keylen, void *out, size_t outlen)
 {
     BLAKE2B_CTX ctx;
-    if (0 != blake2b_InitKey(&ctx, outlen, key, keylen)) return -1;
-    if (0 != blake2b_Update(&ctx, msg, msg_len)) return -1;
-    if (0 != blake2b_Final(&ctx, out, outlen)) return -1;
+    if (0 != tc_blake2b_InitKey(&ctx, outlen, key, keylen)) return -1;
+    if (0 != tc_blake2b_Update(&ctx, msg, msg_len)) return -1;
+    if (0 != tc_blake2b_Final(&ctx, out, outlen)) return -1;
     return 0;
 }
diff --git a/trezor-crypto/crypto/ed25519-donna/README.md b/trezor-crypto/crypto/ed25519-donna/README.md
index 73eadf8db7c..71b643485de 100644
--- a/trezor-crypto/crypto/ed25519-donna/README.md
+++ b/trezor-crypto/crypto/ed25519-donna/README.md
@@ -1,5 +1,5 @@
 [ed25519](https://ed25519.cr.yp.to) is an
-[Elliptic Curve Digital Signature Algortithm](https://en.wikipedia.org/wiki/Elliptic_Curve_Digital_Signature_Algorithm),
+[Elliptic Curve Digital Signature Algorithm](https://en.wikipedia.org/wiki/Elliptic_Curve_Digital_Signature_Algorithm),
 developed by [Dan Bernstein](https://cr.yp.to/djb.html),
 [Niels Duif](https://www.nielsduif.nl),
 [Tanja Lange](https://hyperelliptic.org/tanja),
@@ -56,7 +56,7 @@ No configuration is needed **if you are compiling against OpenSSL**.
 
 ##### Hash Options
 
-If you are not compiling aginst OpenSSL, you will need a hash function.
+If you are not compiling against OpenSSL, you will need a hash function.
 
 To use a simple/**slow** implementation of SHA-512, use `-DED25519_REFHASH` when compiling `ed25519.c`.
 This should never be used except to verify the code works when OpenSSL is not available.
@@ -73,7 +73,7 @@ custom hash implementation in ed25519-hash-custom.h. The hash must have a 512bit
 
 ##### Random Options
 
-If you are not compiling aginst OpenSSL, you will need a random function for batch verification.
+If you are not compiling against OpenSSL, you will need a random function for batch verification.
 
 To use a custom random function, use `-DED25519_CUSTOMRANDOM` when compiling `ed25519.c` and put your
 custom hash implementation in ed25519-randombytes-custom.h. The random function must implement:
@@ -170,7 +170,7 @@ signing due to both using the same code for the scalar multiply.
 
 #### Testing
 
-Fuzzing against reference implemenations is now available. See [fuzz/README](fuzz/README.md).
+Fuzzing against reference implementations is now available. See [fuzz/README](fuzz/README.md).
 
 Building `ed25519.c` with `-DED25519_TEST` and linking with `test.c` will run basic sanity tests
 and benchmark each function. `test-batch.c` has been incorporated in to `test.c`.
diff --git a/trezor-crypto/crypto/hasher.c b/trezor-crypto/crypto/hasher.c
index d6dd613e905..59c10181497 100644
--- a/trezor-crypto/crypto/hasher.c
+++ b/trezor-crypto/crypto/hasher.c
@@ -50,10 +50,10 @@ void hasher_InitParam(Hasher *hasher, HasherType type, const void *param,
       groestl512_Init(&hasher->ctx.groestl);
       break;
     case HASHER_BLAKE2B:
-      blake2b_Init(&hasher->ctx.blake2b, 32);
+      tc_blake2b_Init(&hasher->ctx.blake2b, 32);
       break;
     case HASHER_BLAKE2B_PERSONAL:
-      blake2b_InitPersonal(&hasher->ctx.blake2b, 32, hasher->param,
+      tc_blake2b_InitPersonal(&hasher->ctx.blake2b, 32, hasher->param,
                            hasher->param_size);
       break;
   }
@@ -90,7 +90,7 @@ void hasher_Update(Hasher *hasher, const uint8_t *data, size_t length) {
       break;
     case HASHER_BLAKE2B:
     case HASHER_BLAKE2B_PERSONAL:
-      blake2b_Update(&hasher->ctx.blake2b, data, length);
+      tc_blake2b_Update(&hasher->ctx.blake2b, data, length);
       break;
   }
 }
@@ -132,7 +132,7 @@ void hasher_Final(Hasher *hasher, uint8_t hash[HASHER_DIGEST_LENGTH]) {
       break;
     case HASHER_BLAKE2B:
     case HASHER_BLAKE2B_PERSONAL:
-      blake2b_Final(&hasher->ctx.blake2b, hash, 32);
+      tc_blake2b_Final(&hasher->ctx.blake2b, hash, 32);
       break;
   }
 }
diff --git a/trezor-crypto/crypto/nano.c b/trezor-crypto/crypto/nano.c
index 15dc643fa13..54f4968d1ef 100644
--- a/trezor-crypto/crypto/nano.c
+++ b/trezor-crypto/crypto/nano.c
@@ -66,9 +66,9 @@ size_t nano_get_address(
 
     uint8_t checksum[NANO_CHECKSUM_LEN];
     blake2b_state hash;
-    blake2b_Init(&hash, NANO_CHECKSUM_LEN);
-    blake2b_Update(&hash, public_key, sizeof(ed25519_public_key));
-    blake2b_Final(&hash, checksum, NANO_CHECKSUM_LEN);
+    tc_blake2b_Init(&hash, NANO_CHECKSUM_LEN);
+    tc_blake2b_Update(&hash, public_key, sizeof(ed25519_public_key));
+    tc_blake2b_Final(&hash, checksum, NANO_CHECKSUM_LEN);
 
     for (int i = 0; i < NANO_CHECKSUM_LEN; i++) {
         raw.data.checksum[NANO_CHECKSUM_LEN - (i + 1)] = checksum[i];
@@ -132,9 +132,9 @@ bool nano_validate_address(
     // Validate the checksum
     uint8_t checksum[NANO_CHECKSUM_LEN];
     blake2b_state hash;
-    blake2b_Init(&hash, NANO_CHECKSUM_LEN);
-    blake2b_Update(&hash, raw.data.public_key, sizeof(ed25519_public_key));
-    blake2b_Final(&hash, checksum, NANO_CHECKSUM_LEN);
+    tc_blake2b_Init(&hash, NANO_CHECKSUM_LEN);
+    tc_blake2b_Update(&hash, raw.data.public_key, sizeof(ed25519_public_key));
+    tc_blake2b_Final(&hash, checksum, NANO_CHECKSUM_LEN);
 
     for (int i = 0; i < NANO_CHECKSUM_LEN; i++) {
         if (raw.data.checksum[NANO_CHECKSUM_LEN - (i + 1)] != checksum[i]) {
diff --git a/trezor-crypto/crypto/scrypt.c b/trezor-crypto/crypto/scrypt.c
index c1856dcbda5..4e94beab0e8 100644
--- a/trezor-crypto/crypto/scrypt.c
+++ b/trezor-crypto/crypto/scrypt.c
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-static void blkcpy(void *, void *, size_t);
+static void blkcpy(uint32_t *, const uint32_t *, size_t);
 static void blkxor(void *, void *, size_t);
 static void salsa20_8(uint32_t[16]);
 static void blockmix_salsa8(uint32_t *, uint32_t *, uint32_t *, size_t);
@@ -50,15 +50,12 @@ static uint64_t integerify(void *, size_t);
 static void smix(uint8_t *, size_t, uint64_t, uint32_t *, uint32_t *);
 
 static void
-blkcpy(void * dest, void * src, size_t len)
+blkcpy(uint32_t * dest, const uint32_t * src, size_t len)
 {
-	size_t * D = dest;
-	size_t * S = src;
-	size_t L = len / sizeof(size_t);
-	size_t i;
+    size_t L = len / sizeof(uint32_t);
 
-	for (i = 0; i < L; i++)
-		D[i] = S[i];
+    for (size_t i = 0; i < L; i++)
+        dest[i] = src[i];
 }
 
 static void
diff --git a/trezor-crypto/crypto/sha2.c b/trezor-crypto/crypto/sha2.c
index bea30dae7cf..47d7eebbcdb 100644
--- a/trezor-crypto/crypto/sha2.c
+++ b/trezor-crypto/crypto/sha2.c
@@ -589,7 +589,7 @@ void sha1_Update(SHA1_CTX* context, const sha2_byte *data, size_t len) {
 	usedspace = freespace = 0;
 }
 
-void sha1_Final(SHA1_CTX* context, sha2_byte digest[]) {
+void sha1_Final(SHA1_CTX* context, sha2_byte digest[SHA1_DIGEST_LENGTH]) {
 	unsigned int	usedspace = 0;
 
 	/* If no digest buffer is passed, we don't bother doing this: */
@@ -896,7 +896,7 @@ void sha256_Update(SHA256_CTX* context, const sha2_byte *data, size_t len) {
 	usedspace = freespace = 0;
 }
 
-void sha256_Final(SHA256_CTX* context, sha2_byte digest[]) {
+void sha256_Final(SHA256_CTX* context, sha2_byte digest[SHA256_DIGEST_LENGTH]) {
 	unsigned int	usedspace = 0;
 
 	/* If no digest buffer is passed, we don't bother doing this: */
@@ -1250,7 +1250,7 @@ static void sha512_Last(SHA512_CTX* context) {
 	sha512_Transform(context->state, context->buffer, context->state);
 }
 
-void sha512_Final(SHA512_CTX* context, sha2_byte digest[]) {
+void sha512_Final(SHA512_CTX* context, sha2_byte digest[SHA512_DIGEST_LENGTH]) {
 	/* If no digest buffer is passed, we don't bother doing this: */
 	if (digest != (sha2_byte*)0) {
 		sha512_Last(context);
diff --git a/trezor-crypto/crypto/tests/CMakeLists.txt b/trezor-crypto/crypto/tests/CMakeLists.txt
index f2bf56bee5a..0765cae1f44 100644
--- a/trezor-crypto/crypto/tests/CMakeLists.txt
+++ b/trezor-crypto/crypto/tests/CMakeLists.txt
@@ -1,8 +1,6 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
 enable_testing()
 
diff --git a/trezor-crypto/crypto/tests/test_check.c b/trezor-crypto/crypto/tests/test_check.c
index 0227f0146a8..138dd253fa0 100644
--- a/trezor-crypto/crypto/tests/test_check.c
+++ b/trezor-crypto/crypto/tests/test_check.c
@@ -4837,21 +4837,21 @@ START_TEST(test_blake2b) {
   uint8_t digest[BLAKE2B_DIGEST_LENGTH];
   for (size_t i = 0; i < (sizeof(tests) / sizeof(*tests)); i++) {
     size_t msg_len = strlen(tests[i].msg) / 2;
-    blake2b_Key(fromhex(tests[i].msg), msg_len, key, sizeof(key), digest,
+    tc_blake2b_Key(fromhex(tests[i].msg), msg_len, key, sizeof(key), digest,
                 sizeof(digest));
     ck_assert_mem_eq(digest, fromhex(tests[i].hash), sizeof(digest));
 
     // Test progressive hashing.
     size_t part_len = msg_len / 2;
     BLAKE2B_CTX ctx;
-    ck_assert_int_eq(blake2b_InitKey(&ctx, sizeof(digest), key, sizeof(key)),
+    ck_assert_int_eq(tc_blake2b_InitKey(&ctx, sizeof(digest), key, sizeof(key)),
                      0);
-    ck_assert_int_eq(blake2b_Update(&ctx, fromhex(tests[i].msg), part_len), 0);
-    ck_assert_int_eq(blake2b_Update(&ctx, NULL, 0), 0);
-    ck_assert_int_eq(blake2b_Update(&ctx, fromhex(tests[i].msg) + part_len,
+    ck_assert_int_eq(tc_blake2b_Update(&ctx, fromhex(tests[i].msg), part_len), 0);
+    ck_assert_int_eq(tc_blake2b_Update(&ctx, NULL, 0), 0);
+    ck_assert_int_eq(tc_blake2b_Update(&ctx, fromhex(tests[i].msg) + part_len,
                                     msg_len - part_len),
                      0);
-    ck_assert_int_eq(blake2b_Final(&ctx, digest, sizeof(digest)), 0);
+    ck_assert_int_eq(tc_blake2b_Final(&ctx, digest, sizeof(digest)), 0);
     ck_assert_mem_eq(digest, fromhex(tests[i].hash), BLAKE2B_DIGEST_LENGTH);
   }
 }
@@ -4897,15 +4897,15 @@ START_TEST(test_blake2bp) {
     size_t part_len = msg_len / 2;
     BLAKE2B_CTX ctx;
     ck_assert_int_eq(
-        blake2b_InitPersonal(&ctx, sizeof(digest), tests[i].personal,
+        tc_blake2b_InitPersonal(&ctx, sizeof(digest), tests[i].personal,
                              strlen(tests[i].personal)),
         0);
-    ck_assert_int_eq(blake2b_Update(&ctx, fromhex(tests[i].msg), part_len), 0);
-    ck_assert_int_eq(blake2b_Update(&ctx, NULL, 0), 0);
-    ck_assert_int_eq(blake2b_Update(&ctx, fromhex(tests[i].msg) + part_len,
+    ck_assert_int_eq(tc_blake2b_Update(&ctx, fromhex(tests[i].msg), part_len), 0);
+    ck_assert_int_eq(tc_blake2b_Update(&ctx, NULL, 0), 0);
+    ck_assert_int_eq(tc_blake2b_Update(&ctx, fromhex(tests[i].msg) + part_len,
                                     msg_len - part_len),
                      0);
-    ck_assert_int_eq(blake2b_Final(&ctx, digest, sizeof(digest)), 0);
+    ck_assert_int_eq(tc_blake2b_Final(&ctx, digest, sizeof(digest)), 0);
     ck_assert_mem_eq(digest, fromhex(tests[i].hash), sizeof(digest));
   }
 }
diff --git a/trezor-crypto/include/TrezorCrypto/TrezorCrypto.h b/trezor-crypto/include/TrezorCrypto/TrezorCrypto.h
index 8aa414c9a50..10910c17b2c 100644
--- a/trezor-crypto/include/TrezorCrypto/TrezorCrypto.h
+++ b/trezor-crypto/include/TrezorCrypto/TrezorCrypto.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include <TrezorCrypto/options.h>
 
diff --git a/trezor-crypto/include/TrezorCrypto/aes/aesopt.h b/trezor-crypto/include/TrezorCrypto/aes/aesopt.h
index e8d9db4b4c0..5e8763fa545 100644
--- a/trezor-crypto/include/TrezorCrypto/aes/aesopt.h
+++ b/trezor-crypto/include/TrezorCrypto/aes/aesopt.h
@@ -363,10 +363,10 @@ Issue Date: 20/12/2007
 
 /*  10. TABLE ALIGNMENT
 
-    On some sytsems speed will be improved by aligning the AES large lookup
+    On some systems speed will be improved by aligning the AES large lookup
     tables on particular boundaries. This define should be set to a power of
     two giving the desired alignment. It can be left undefined if alignment
-    is not needed.  This option is specific to the Microsft VC++ compiler -
+    is not needed.  This option is specific to the Microsoft VC++ compiler -
     it seems to sometimes cause trouble for the VC++ version 6 compiler.
 */
 
diff --git a/trezor-crypto/include/TrezorCrypto/blake2b.h b/trezor-crypto/include/TrezorCrypto/blake2b.h
index c002dd7afc5..c4e20bb7c34 100644
--- a/trezor-crypto/include/TrezorCrypto/blake2b.h
+++ b/trezor-crypto/include/TrezorCrypto/blake2b.h
@@ -33,16 +33,16 @@ typedef struct __blake2b_state
 #define BLAKE2B_DIGEST_LENGTH  BLAKE2B_OUTBYTES
 #define BLAKE2B_KEY_LENGTH     BLAKE2B_KEYBYTES
 
-int blake2b_Init(blake2b_state *S, size_t outlen);
-int blake2b_InitKey(blake2b_state *S, size_t outlen, const void *key, size_t keylen);
-int blake2b_InitPersonal(blake2b_state *S, size_t outlen, const void *personal, size_t personal_len);
-int blake2b_Update(blake2b_state *S, const void *pin, size_t inlen);
-int blake2b_Final(blake2b_state *S, void *out, size_t outlen);
+int tc_blake2b_Init(blake2b_state *S, size_t outlen);
+int tc_blake2b_InitKey(blake2b_state *S, size_t outlen, const void *key, size_t keylen);
+int tc_blake2b_InitPersonal(blake2b_state *S, size_t outlen, const void *personal, size_t personal_len);
+int tc_blake2b_Update(blake2b_state *S, const void *pin, size_t inlen);
+int tc_blake2b_Final(blake2b_state *S, void *out, size_t outlen);
 
-int blake2b(const uint8_t *msg, uint32_t msg_len, void *out, size_t outlen);
+int tc_blake2b(const uint8_t *msg, uint32_t msg_len, void *out, size_t outlen);
 // [wallet-core]
-int blake2b_Personal(const uint8_t *msg, uint32_t msg_len, const void *personal, size_t personal_len, void *out, size_t outlen);
-int blake2b_Key(const uint8_t *msg, uint32_t msg_len, const void *key, size_t keylen, void *out, size_t outlen);
+int tc_blake2b_Personal(const uint8_t *msg, uint32_t msg_len, const void *personal, size_t personal_len, void *out, size_t outlen);
+int tc_blake2b_Key(const uint8_t *msg, uint32_t msg_len, const void *key, size_t keylen, void *out, size_t outlen);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-hash-custom-blake2b.h b/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-hash-custom-blake2b.h
index 9c46630a9bd..68706f37795 100644
--- a/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-hash-custom-blake2b.h
+++ b/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-hash-custom-blake2b.h
@@ -15,9 +15,9 @@
 #include <TrezorCrypto/blake2b.h>
 
 #define ed25519_hash_context BLAKE2B_CTX
-#define ed25519_hash_init(ctx) blake2b_Init(ctx, 64)
-#define ed25519_hash_update(ctx, in, inlen) blake2b_Update((ctx), (in), (inlen))
-#define ed25519_hash_final(ctx, hash) blake2b_Final((ctx), (hash), 64)
-#define ed25519_hash(hash, in, inlen) blake2b((in), (inlen), (hash), 64)
+#define ed25519_hash_init(ctx) tc_blake2b_Init(ctx, 64)
+#define ed25519_hash_update(ctx, in, inlen) tc_blake2b_Update((ctx), (in), (inlen))
+#define ed25519_hash_final(ctx, hash) tc_blake2b_Final((ctx), (hash), 64)
+#define ed25519_hash(hash, in, inlen) tc_blake2b((in), (inlen), (hash), 64)
 
 #endif // ED25519_HASH_CUSTOM
diff --git a/trezor-crypto/include/TrezorCrypto/groestl.h b/trezor-crypto/include/TrezorCrypto/groestl.h
index e18f96910bb..8335abf46a1 100644
--- a/trezor-crypto/include/TrezorCrypto/groestl.h
+++ b/trezor-crypto/include/TrezorCrypto/groestl.h
@@ -86,7 +86,7 @@ void groestl512_Update(void *cc, const void *data, size_t len);
 /**
  * Terminate the current Groestl-512 computation and output the result into
  * the provided buffer. The destination buffer must be wide enough to
- * accomodate the result (64 bytes). The context is automatically
+ * accommodate the result (64 bytes). The context is automatically
  * reinitialized.
  *
  * @param cc    the Groestl-512 context
diff --git a/walletconsole/CMakeLists.txt b/walletconsole/CMakeLists.txt
index f72134a29b9..f5c8c08ff31 100644
--- a/walletconsole/CMakeLists.txt
+++ b/walletconsole/CMakeLists.txt
@@ -1,8 +1,6 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
 # walletconsole executable
 file(GLOB walletconsole_sources *.cpp)
diff --git a/walletconsole/lib/Address.cpp b/walletconsole/lib/Address.cpp
index 7a082f7413c..166efc215cc 100644
--- a/walletconsole/lib/Address.cpp
+++ b/walletconsole/lib/Address.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Address.h"
 
@@ -29,7 +27,7 @@ bool Address::addrPub(const string& coinid, const string& pubkey_in, string& res
         pubDat = parse_hex(pubkey_in);
     } catch (exception& ex) {
         _out << "Error: could not parse public key data" << endl;
-        return false; 
+        return false;
     }
     auto ctype = (TWCoinType)coin.c;
     PublicKey pubKey = PublicKey(pubDat, (TWPublicKeyType)coin.pubKeyType);
@@ -45,7 +43,7 @@ bool Address::addrPri(const string& coinid, const string& prikey_in, string& res
         priDat = parse_hex(prikey_in);
     } catch (exception& ex) {
         _out << "Error: could not parse private key data" << endl;
-        return false; 
+        return false;
     }
     auto ctype = (TWCoinType)coin.c;
     PrivateKey priKey = PrivateKey(priDat);
@@ -108,7 +106,7 @@ bool Address::deriveFromXpubIndex(const string& coinid, const string& xpub, cons
     dp.setChange(0);
     dp.setAddress(index);
 
-    const auto publicKey = HDWallet::getPublicKeyFromExtended(xpub, ctype, dp);
+    const auto publicKey = HDWallet<>::getPublicKeyFromExtended(xpub, ctype, dp);
     if (!publicKey) { return false; }
     res = TW::deriveAddress(ctype, publicKey.value());
     return true;
diff --git a/walletconsole/lib/Address.h b/walletconsole/lib/Address.h
index 1d3306c190c..d9db3474502 100644
--- a/walletconsole/lib/Address.h
+++ b/walletconsole/lib/Address.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/walletconsole/lib/Buffer.cpp b/walletconsole/lib/Buffer.cpp
index 27f40a7e596..5f75eba20fd 100644
--- a/walletconsole/lib/Buffer.cpp
+++ b/walletconsole/lib/Buffer.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Buffer.h"
 #include "WalletConsole.h"
diff --git a/walletconsole/lib/Buffer.h b/walletconsole/lib/Buffer.h
index 05428f2c012..c0043f6d7a9 100644
--- a/walletconsole/lib/Buffer.h
+++ b/walletconsole/lib/Buffer.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/walletconsole/lib/CMakeLists.txt b/walletconsole/lib/CMakeLists.txt
index c3ee4a7f6d2..dc3453b0112 100644
--- a/walletconsole/lib/CMakeLists.txt
+++ b/walletconsole/lib/CMakeLists.txt
@@ -1,8 +1,6 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
 # walletconsolelib library
 file(GLOB_RECURSE walletconsolelib_sources *.cpp)
diff --git a/walletconsole/lib/Coins.cpp b/walletconsole/lib/Coins.cpp
index 368c1b9853e..b73eb6a1eb9 100644
--- a/walletconsole/lib/Coins.cpp
+++ b/walletconsole/lib/Coins.cpp
@@ -1,9 +1,7 @@
 
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Coins.h"
 
diff --git a/walletconsole/lib/Coins.h b/walletconsole/lib/Coins.h
index 4aacc299eca..6b9a5321fd8 100644
--- a/walletconsole/lib/Coins.h
+++ b/walletconsole/lib/Coins.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/walletconsole/lib/CommandExecutor.cpp b/walletconsole/lib/CommandExecutor.cpp
index 973c2cf4dd7..4692abf9b98 100644
--- a/walletconsole/lib/CommandExecutor.cpp
+++ b/walletconsole/lib/CommandExecutor.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "CommandExecutor.h"
 #include "WalletConsole.h"
diff --git a/walletconsole/lib/CommandExecutor.h b/walletconsole/lib/CommandExecutor.h
index a722e47c1fc..2098cb502be 100644
--- a/walletconsole/lib/CommandExecutor.h
+++ b/walletconsole/lib/CommandExecutor.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/walletconsole/lib/Keys.cpp b/walletconsole/lib/Keys.cpp
index 974e3f46e38..b30e90b98f8 100644
--- a/walletconsole/lib/Keys.cpp
+++ b/walletconsole/lib/Keys.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2021 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Keys.h"
 
diff --git a/walletconsole/lib/Keys.h b/walletconsole/lib/Keys.h
index 674a50e86c9..d33ace97f44 100644
--- a/walletconsole/lib/Keys.h
+++ b/walletconsole/lib/Keys.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/walletconsole/lib/Util.cpp b/walletconsole/lib/Util.cpp
index 86dd938dc84..6cc444822ec 100644
--- a/walletconsole/lib/Util.cpp
+++ b/walletconsole/lib/Util.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "Util.h"
 
@@ -38,14 +36,13 @@ bool Util::base64Encode(const string& p, string& res) {
 }
 
 bool Util::base64Decode(const string& p, string& res) {
-    try {
-        auto dec = Base64::decode(p);
-        res = TW::hex(dec);
-        return true;
-    } catch (exception& ex) {
+    auto dec = Base64::decode(p);
+    if (dec.empty()) {
         _out << "Error while Base64 decode" << endl;
         return false;
     }
+    res = TW::hex(dec);
+    return true;
 }
 
 bool Util::fileW(const string& fileName, const string& data, [[maybe_unused]] string& res) {
diff --git a/walletconsole/lib/Util.h b/walletconsole/lib/Util.h
index ab9f0f13c9b..d025feb064e 100644
--- a/walletconsole/lib/Util.h
+++ b/walletconsole/lib/Util.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/walletconsole/lib/WalletConsole.cpp b/walletconsole/lib/WalletConsole.cpp
index 6602428a982..47c4f73a6f9 100644
--- a/walletconsole/lib/WalletConsole.cpp
+++ b/walletconsole/lib/WalletConsole.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "WalletConsole.h"
 #include "CommandExecutor.h"
diff --git a/walletconsole/lib/WalletConsole.h b/walletconsole/lib/WalletConsole.h
index fc740ae363a..e1482ffffd4 100644
--- a/walletconsole/lib/WalletConsole.h
+++ b/walletconsole/lib/WalletConsole.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #pragma once
 
diff --git a/walletconsole/main.cpp b/walletconsole/main.cpp
index 27819c1e57f..e04d5c09b6a 100644
--- a/walletconsole/main.cpp
+++ b/walletconsole/main.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2020 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 #include "WalletConsole.h"
 #include <iostream>
diff --git a/wasm/.gitignore b/wasm/.gitignore
index c1327fb6af0..13d2d8098a4 100644
--- a/wasm/.gitignore
+++ b/wasm/.gitignore
@@ -2,4 +2,5 @@ dist/
 generated/
 wallet-core.d.ts
 lib/wallet-core.js
+lib/wallet-core.d.ts
 lib/wallet-core.wasm
diff --git a/wasm/CMakeLists.txt b/wasm/CMakeLists.txt
index 379042f09e6..1b4017a7ea4 100644
--- a/wasm/CMakeLists.txt
+++ b/wasm/CMakeLists.txt
@@ -1,8 +1,6 @@
-# Copyright © 2017-2022 Trust Wallet.
+# SPDX-License-Identifier: Apache-2.0
 #
-# This file is part of Trust. The full Trust copyright notice, including
-# terms governing use, modification, and redistribution, is contained in the
-# file LICENSE at the root of the source code distribution tree.
+# Copyright © 2017 Trust Wallet.
 
 file(GLOB wasm_sources src/*.cpp src/generated/*.cpp)
 file(GLOB wasm_headers src/*.h src/generated/*.h)
@@ -16,7 +14,7 @@ target_compile_options(${TARGET_NAME} PRIVATE "-Wall")
 
 set_target_properties(${TARGET_NAME}
         PROPERTIES
-        CXX_STANDARD 17
+        CXX_STANDARD 20
         CXX_STANDARD_REQUIRED ON
 )
 
@@ -39,6 +37,6 @@ set_target_properties(${TARGET_NAME}
 
 set_target_properties(${TARGET_NAME} 
         PROPERTIES 
-        COMPILE_FLAGS "-O2 -sSTRICT -sUSE_BOOST_HEADERS=1" 
-        LINK_FLAGS "--bind --no-entry --closure 1 -O2 -sSTRICT -sASSERTIONS -sMODULARIZE=1 -sALLOW_MEMORY_GROWTH=1 -sDYNAMIC_EXECUTION=0"
+        COMPILE_FLAGS "-O2 -sSTRICT -sUSE_BOOST_HEADERS=1"
+        LINK_FLAGS "--bind --no-entry --closure 1 -O2 -sSTRICT -sASSERTIONS -sMODULARIZE=1 -sALLOW_MEMORY_GROWTH=1 -sDYNAMIC_EXECUTION=0 -s EXPORTED_FUNCTIONS=['_setThrew']"
 )
diff --git a/wasm/index.ts b/wasm/index.ts
index 2e298c52d53..a7f54ee4b95 100644
--- a/wasm/index.ts
+++ b/wasm/index.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import * as Loader from "./lib/wallet-core";
 import { TW } from "./generated/core_proto";
diff --git a/wasm/package-lock.json b/wasm/package-lock.json
index 8697fe149e1..bd207c0436d 100644
--- a/wasm/package-lock.json
+++ b/wasm/package-lock.json
@@ -13,12 +13,12 @@
       },
       "devDependencies": {
         "@types/chai": "^4.3.0",
-        "@types/mocha": "^9.1.0",
+        "@types/mocha": "^10.0.0",
         "@types/node": "^18.7.18",
         "@types/webextension-polyfill": "^0.9.0",
         "buffer": "^6.0.3",
         "chai": "^4.3.6",
-        "mocha": "^9.2.2",
+        "mocha": "^10.1.0",
         "ts-node": "^10.7.0",
         "typescript": "^4.6.3"
       }
@@ -134,9 +134,9 @@
       "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
     },
     "node_modules/@types/mocha": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz",
-      "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.0.tgz",
+      "integrity": "sha512-rADY+HtTOA52l9VZWtgQfn4p+UDVM2eDVkMZT1I6syp0YKxW2F9v+0pbRZLsvskhQv/vMb6ZfCay81GHbz5SHg==",
       "dev": true
     },
     "node_modules/@types/node": {
@@ -150,12 +150,6 @@
       "integrity": "sha512-HG1y1o2hK8ag6Y7dfkrAbfKmMIP+B0E6SwAzUfmQ1dDxEIdLTtMyrStY26suHBPrAL7Xw/chlDW02ugc3uXWtQ==",
       "dev": true
     },
-    "node_modules/@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
-    },
     "node_modules/acorn": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
@@ -290,12 +284,12 @@
       }
     },
     "node_modules/braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "dependencies": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       },
       "engines": {
         "node": ">=8"
@@ -467,9 +461,9 @@
       "dev": true
     },
     "node_modules/debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "dependencies": {
         "ms": "2.1.2"
@@ -550,9 +544,9 @@
       }
     },
     "node_modules/fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "dependencies": {
         "to-regex-range": "^5.0.1"
@@ -668,15 +662,6 @@
         "node": "*"
       }
     },
-    "node_modules/growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true,
-      "engines": {
-        "node": ">=4.x"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -803,12 +788,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -873,54 +852,60 @@
       "dev": true
     },
     "node_modules/minimatch": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
-      "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
       "dev": true,
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
         "node": ">=10"
       }
     },
+    "node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/mocha": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
-      "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
+      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
       "dev": true,
       "dependencies": {
-        "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
         "chokidar": "3.5.3",
-        "debug": "4.3.3",
+        "debug": "4.3.4",
         "diff": "5.0.0",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
         "glob": "7.2.0",
-        "growl": "1.10.5",
         "he": "1.2.0",
         "js-yaml": "4.1.0",
         "log-symbols": "4.1.0",
-        "minimatch": "4.2.1",
+        "minimatch": "5.0.1",
         "ms": "2.1.3",
-        "nanoid": "3.3.1",
+        "nanoid": "3.3.3",
         "serialize-javascript": "6.0.0",
         "strip-json-comments": "3.1.1",
         "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.2.0",
+        "workerpool": "6.2.1",
         "yargs": "16.2.0",
         "yargs-parser": "20.2.4",
         "yargs-unparser": "2.0.0"
       },
       "bin": {
         "_mocha": "bin/_mocha",
-        "mocha": "bin/mocha"
+        "mocha": "bin/mocha.js"
       },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">= 14.0.0"
       },
       "funding": {
         "type": "opencollective",
@@ -943,9 +928,9 @@
       "dev": true
     },
     "node_modules/nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
       "dev": true,
       "bin": {
         "nanoid": "bin/nanoid.cjs"
@@ -1042,9 +1027,9 @@
       }
     },
     "node_modules/protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
+      "version": "6.11.4",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz",
+      "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==",
       "hasInstallScript": true,
       "dependencies": {
         "@protobufjs/aspromise": "^1.1.2",
@@ -1261,25 +1246,10 @@
       "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==",
       "dev": true
     },
-    "node_modules/which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "node-which": "bin/node-which"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/workerpool": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
-      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
       "dev": true
     },
     "node_modules/wrap-ansi": {
@@ -1484,9 +1454,9 @@
       "integrity": "sha512-MqTGEo5bj5t157U6fA/BiDynNkn0YknVdh48CMPkTSpFTVmvao5UQmm7uEF6xBEo7qIMAlY/JSleYaE6VOdpaA=="
     },
     "@types/mocha": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-9.1.0.tgz",
-      "integrity": "sha512-QCWHkbMv4Y5U9oW10Uxbr45qMMSzl4OzijsozynUAgx3kEHUdXB00udx2dWDQ7f2TU2a2uuiFaRZjCe3unPpeg==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/@types/mocha/-/mocha-10.0.0.tgz",
+      "integrity": "sha512-rADY+HtTOA52l9VZWtgQfn4p+UDVM2eDVkMZT1I6syp0YKxW2F9v+0pbRZLsvskhQv/vMb6ZfCay81GHbz5SHg==",
       "dev": true
     },
     "@types/node": {
@@ -1500,12 +1470,6 @@
       "integrity": "sha512-HG1y1o2hK8ag6Y7dfkrAbfKmMIP+B0E6SwAzUfmQ1dDxEIdLTtMyrStY26suHBPrAL7Xw/chlDW02ugc3uXWtQ==",
       "dev": true
     },
-    "@ungap/promise-all-settled": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz",
-      "integrity": "sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==",
-      "dev": true
-    },
     "acorn": {
       "version": "8.7.0",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.7.0.tgz",
@@ -1596,12 +1560,12 @@
       }
     },
     "braces": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
-      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
+      "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
       "dev": true,
       "requires": {
-        "fill-range": "^7.0.1"
+        "fill-range": "^7.1.1"
       }
     },
     "browser-stdout": {
@@ -1723,9 +1687,9 @@
       "dev": true
     },
     "debug": {
-      "version": "4.3.3",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz",
-      "integrity": "sha512-/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q==",
+      "version": "4.3.4",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
+      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
       "dev": true,
       "requires": {
         "ms": "2.1.2"
@@ -1779,9 +1743,9 @@
       "dev": true
     },
     "fill-range": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
-      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dev": true,
       "requires": {
         "to-regex-range": "^5.0.1"
@@ -1862,12 +1826,6 @@
         "is-glob": "^4.0.1"
       }
     },
-    "growl": {
-      "version": "1.10.5",
-      "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz",
-      "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==",
-      "dev": true
-    },
     "has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
@@ -1950,12 +1908,6 @@
       "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
       "dev": true
     },
-    "isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
-      "dev": true
-    },
     "js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@@ -2005,41 +1957,49 @@
       "dev": true
     },
     "minimatch": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-4.2.1.tgz",
-      "integrity": "sha512-9Uq1ChtSZO+Mxa/CL1eGizn2vRn3MlLgzhT0Iz8zaY8NdvxvB0d5QdPFmCKf7JKA9Lerx5vRrnwO03jsSfGG9g==",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.0.1.tgz",
+      "integrity": "sha512-nLDxIFRyhDblz3qMuq+SoRZED4+miJ/G+tdDrjkkkRnjAsBexeGpgjLEQ0blJy7rHhR2b93rhQY4SvyWu9v03g==",
       "dev": true,
       "requires": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
+      },
+      "dependencies": {
+        "brace-expansion": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+          "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+          "dev": true,
+          "requires": {
+            "balanced-match": "^1.0.0"
+          }
+        }
       }
     },
     "mocha": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/mocha/-/mocha-9.2.2.tgz",
-      "integrity": "sha512-L6XC3EdwT6YrIk0yXpavvLkn8h+EU+Y5UcCHKECyMbdUIxyMuZj4bX4U9e1nvnvUUvQVsV2VHQr5zLdcUkhW/g==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/mocha/-/mocha-10.1.0.tgz",
+      "integrity": "sha512-vUF7IYxEoN7XhQpFLxQAEMtE4W91acW4B6En9l97MwE9stL1A9gusXfoHZCLVHDUJ/7V5+lbCM6yMqzo5vNymg==",
       "dev": true,
       "requires": {
-        "@ungap/promise-all-settled": "1.1.2",
         "ansi-colors": "4.1.1",
         "browser-stdout": "1.3.1",
         "chokidar": "3.5.3",
-        "debug": "4.3.3",
+        "debug": "4.3.4",
         "diff": "5.0.0",
         "escape-string-regexp": "4.0.0",
         "find-up": "5.0.0",
         "glob": "7.2.0",
-        "growl": "1.10.5",
         "he": "1.2.0",
         "js-yaml": "4.1.0",
         "log-symbols": "4.1.0",
-        "minimatch": "4.2.1",
+        "minimatch": "5.0.1",
         "ms": "2.1.3",
-        "nanoid": "3.3.1",
+        "nanoid": "3.3.3",
         "serialize-javascript": "6.0.0",
         "strip-json-comments": "3.1.1",
         "supports-color": "8.1.1",
-        "which": "2.0.2",
-        "workerpool": "6.2.0",
+        "workerpool": "6.2.1",
         "yargs": "16.2.0",
         "yargs-parser": "20.2.4",
         "yargs-unparser": "2.0.0"
@@ -2060,9 +2020,9 @@
       "dev": true
     },
     "nanoid": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.1.tgz",
-      "integrity": "sha512-n6Vs/3KGyxPQd6uO0eH4Bv0ojGSUvuLlIHtC3Y0kEO23YRge8H9x1GCzLn28YX0H66pMkxuaeESFq4tKISKwdw==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.3.tgz",
+      "integrity": "sha512-p1sjXuopFs0xg+fPASzQ28agW1oHD7xDsd9Xkf3T15H3c/cifrFHVwrh74PdoklAPi+i7MdRsE47vm2r6JoB+w==",
       "dev": true
     },
     "normalize-path": {
@@ -2123,9 +2083,9 @@
       "dev": true
     },
     "protobufjs": {
-      "version": "6.11.3",
-      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.3.tgz",
-      "integrity": "sha512-xL96WDdCZYdU7Slin569tFX712BxsxslWwAfAhCYjQKGTq7dAU91Lomy6nLLhh/dyGhk/YH4TwTSRxTzhuHyZg==",
+      "version": "6.11.4",
+      "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-6.11.4.tgz",
+      "integrity": "sha512-5kQWPaJHi1WoCpjTGszzQ32PG2F4+wRY6BmAT4Vfw56Q2FZ4YZzK20xUYQH4YkfehY1e6QSICrJquM6xXZNcrw==",
       "requires": {
         "@protobufjs/aspromise": "^1.1.2",
         "@protobufjs/base64": "^1.1.2",
@@ -2264,19 +2224,10 @@
       "integrity": "sha512-mpSYqfsFvASnSn5qMiwrr4VKfumbPyONLCOPmsR3A6pTY/r0+tSaVbgPWSAIuzbk3lCTa+FForeTiO+wBQGkjA==",
       "dev": true
     },
-    "which": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
-      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
-      "dev": true,
-      "requires": {
-        "isexe": "^2.0.0"
-      }
-    },
     "workerpool": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.0.tgz",
-      "integrity": "sha512-Rsk5qQHJ9eowMH28Jwhe8HEbmdYDX4lwoMWshiCXugjtHqMD9ZbiqSDLxcsfdqsETPzVUtX5s1Z5kStiIM6l4A==",
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-6.2.1.tgz",
+      "integrity": "sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw==",
       "dev": true
     },
     "wrap-ansi": {
diff --git a/wasm/package.json b/wasm/package.json
index 8ae7e3f0b3b..996f10ac35e 100644
--- a/wasm/package.json
+++ b/wasm/package.json
@@ -11,8 +11,8 @@
     "codegen:js-browser": "pbjs -t static-module '../src/proto/*.proto' -w closure --no-delimited --force-long -o ../samples/wasm/core_proto.js",
     "codegen:ts": "pbts -o generated/core_proto.d.ts generated/core_proto.js",
     "clean": "rm -rf dist generated && mkdir -p dist/generated generated",
-    "build": "npm run clean && npm run generate && cp -R generated lib dist && tsc && cp src/wallet-core.d.ts dist/src",
-    "build-and-test": "npm run copy:wasm && npm run build && npm test",
+    "build": "npm run copy:wasm && npm run clean && npm run generate && cp -R generated lib dist && tsc && cp src/wallet-core.d.ts dist/src",
+    "build-and-test": "npm run build && npm test",
     "copy:wasm": "mkdir -p lib && cp ../wasm-build/wasm/wallet-core.* lib",
     "copy:wasm-sample": "cp ../wasm-build/wasm/wallet-core.* ../samples/wasm/"
   },
@@ -34,12 +34,12 @@
   },
   "devDependencies": {
     "@types/chai": "^4.3.0",
-    "@types/mocha": "^9.1.0",
+    "@types/mocha": "^10.0.0",
     "@types/node": "^18.7.18",
     "@types/webextension-polyfill": "^0.9.0",
     "buffer": "^6.0.3",
     "chai": "^4.3.6",
-    "mocha": "^9.2.2",
+    "mocha": "^10.1.0",
     "ts-node": "^10.7.0",
     "typescript": "^4.6.3"
   }
diff --git a/wasm/src/AnySigner.cpp b/wasm/src/AnySigner.cpp
index cbddc1a8bf1..9ebd732149c 100644
--- a/wasm/src/AnySigner.cpp
+++ b/wasm/src/AnySigner.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 
 #include <TrustWalletCore/TWAnySigner.h>
diff --git a/wasm/src/BitcoinSigHashTypeExt.cpp b/wasm/src/BitcoinSigHashTypeExt.cpp
new file mode 100644
index 00000000000..5ec44c8385f
--- /dev/null
+++ b/wasm/src/BitcoinSigHashTypeExt.cpp
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+
+#include <emscripten/bind.h>
+
+using namespace emscripten;
+
+#include "BitcoinSigHashTypeExt.h"
+
+namespace TW::Wasm {
+
+    auto BitcoinSigHashTypeExt::isSingle(TWBitcoinSigHashType type) {
+        return TWBitcoinSigHashTypeIsSingle(type);
+    }
+    auto BitcoinSigHashTypeExt::isNone(TWBitcoinSigHashType type) {
+        return TWBitcoinSigHashTypeIsNone(type);
+    }
+
+    EMSCRIPTEN_BINDINGS(Wasm_BitcoinSigHashTypeExt) {
+        class_<BitcoinSigHashTypeExt>("BitcoinSigHashTypeExt")
+            .class_function("isSingle", &BitcoinSigHashTypeExt::isSingle)
+            .class_function("isNone", &BitcoinSigHashTypeExt::isNone);
+    };
+}
diff --git a/wasm/src/BitcoinSigHashTypeExt.h b/wasm/src/BitcoinSigHashTypeExt.h
new file mode 100644
index 00000000000..315c62b6c91
--- /dev/null
+++ b/wasm/src/BitcoinSigHashTypeExt.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <TrustWalletCore/TWBitcoinSigHashType.h>
+
+#include <emscripten/bind.h>
+
+using namespace emscripten;
+
+namespace TW::Wasm {
+
+    class BitcoinSigHashTypeExt {
+    public:
+        static auto isSingle(TWBitcoinSigHashType type);
+        static auto isNone(TWBitcoinSigHashType type);
+    };
+}
diff --git a/wasm/src/CoinTypeExt.cpp b/wasm/src/CoinTypeExt.cpp
new file mode 100644
index 00000000000..40bd47b5292
--- /dev/null
+++ b/wasm/src/CoinTypeExt.cpp
@@ -0,0 +1,99 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWCoinType.h>
+#include "WasmString.h"
+
+#include "generated/PrivateKey.h"
+#include "generated/PublicKey.h"
+
+#include <emscripten/bind.h>
+
+using namespace emscripten;
+
+#include "CoinTypeExt.h"
+
+namespace TW::Wasm {
+
+    auto CoinTypeExt::blockchain(TWCoinType coin) {
+        return TWCoinTypeBlockchain(coin);
+    }
+    auto CoinTypeExt::purpose(TWCoinType coin) {
+        return TWCoinTypePurpose(coin);
+    }
+    auto CoinTypeExt::curve(TWCoinType coin) {
+        return TWCoinTypeCurve(coin);
+    }
+    auto CoinTypeExt::xpubVersion(TWCoinType coin) {
+        return TWCoinTypeXpubVersion(coin);
+    }
+    auto CoinTypeExt::xprvVersion(TWCoinType coin) {
+        return TWCoinTypeXprvVersion(coin);
+    }
+    auto CoinTypeExt::hrp(TWCoinType coin) {
+        return TWCoinTypeHRP(coin);
+    }
+    auto CoinTypeExt::p2pkhPrefix(TWCoinType coin) {
+        return TWCoinTypeP2pkhPrefix(coin);
+    }
+    auto CoinTypeExt::p2shPrefix(TWCoinType coin) {
+        return TWCoinTypeP2shPrefix(coin);
+    }
+    auto CoinTypeExt::staticPrefix(TWCoinType coin) {
+        return TWCoinTypeStaticPrefix(coin);
+    }
+    auto CoinTypeExt::chainId(TWCoinType coin) {
+        return TWStringToStd(TWCoinTypeChainId(coin));
+    }
+    auto CoinTypeExt::slip44Id(TWCoinType coin) {
+        return TWCoinTypeSlip44Id(coin);
+    }
+    auto CoinTypeExt::ss58Prefix(TWCoinType coin) {
+        return TWCoinTypeSS58Prefix(coin);
+    }
+    auto CoinTypeExt::publicKeyType(TWCoinType coin) {
+        return TWCoinTypePublicKeyType(coin);
+    }
+    auto CoinTypeExt::validate(TWCoinType coin, const std::string& address) {
+        return TWCoinTypeValidate(coin, &address);
+    }
+    auto CoinTypeExt::derivationPath(TWCoinType coin) {
+        return TWStringToStd(TWCoinTypeDerivationPath(coin));
+    }
+    auto CoinTypeExt::derivationPathWithDerivation(TWCoinType coin, TWDerivation derivation) {
+        return TWStringToStd(TWCoinTypeDerivationPathWithDerivation(coin, derivation));
+    }
+    auto CoinTypeExt::deriveAddress(TWCoinType coin, WasmPrivateKey* privateKey) {
+        return TWStringToStd(TWCoinTypeDeriveAddress(coin, privateKey->instance));
+    }
+    auto CoinTypeExt::deriveAddressFromPublicKey(TWCoinType coin, WasmPublicKey* publicKey) {
+        return TWStringToStd(TWCoinTypeDeriveAddressFromPublicKey(coin, publicKey->instance));
+    }
+    auto CoinTypeExt::deriveAddressFromPublicKeyAndDerivation(TWCoinType coin, WasmPublicKey* publicKey, TWDerivation derivation) {
+        return TWStringToStd(TWCoinTypeDeriveAddressFromPublicKeyAndDerivation(coin, publicKey->instance, derivation));
+    }
+
+    EMSCRIPTEN_BINDINGS(Wasm_CoinTypeExt) {
+        class_<CoinTypeExt>("CoinTypeExt")
+            .class_function("blockchain", &CoinTypeExt::blockchain)
+            .class_function("purpose", &CoinTypeExt::purpose)
+            .class_function("curve", &CoinTypeExt::curve)
+            .class_function("xpubVersion", &CoinTypeExt::xpubVersion)
+            .class_function("xprvVersion", &CoinTypeExt::xprvVersion)
+            .class_function("hrp", &CoinTypeExt::hrp)
+            .class_function("p2pkhPrefix", &CoinTypeExt::p2pkhPrefix)
+            .class_function("p2shPrefix", &CoinTypeExt::p2shPrefix)
+            .class_function("staticPrefix", &CoinTypeExt::staticPrefix)
+            .class_function("chainId", &CoinTypeExt::chainId)
+            .class_function("slip44Id", &CoinTypeExt::slip44Id)
+            .class_function("ss58Prefix", &CoinTypeExt::ss58Prefix)
+            .class_function("publicKeyType", &CoinTypeExt::publicKeyType)
+            .class_function("validate", &CoinTypeExt::validate)
+            .class_function("derivationPath", &CoinTypeExt::derivationPath)
+            .class_function("derivationPathWithDerivation", &CoinTypeExt::derivationPathWithDerivation)
+            .class_function("deriveAddress", &CoinTypeExt::deriveAddress, allow_raw_pointers())
+            .class_function("deriveAddressFromPublicKey", &CoinTypeExt::deriveAddressFromPublicKey, allow_raw_pointers())
+            .class_function("deriveAddressFromPublicKeyAndDerivation", &CoinTypeExt::deriveAddressFromPublicKeyAndDerivation, allow_raw_pointers());
+    };
+}
diff --git a/wasm/src/CoinTypeExt.h b/wasm/src/CoinTypeExt.h
new file mode 100644
index 00000000000..3f7d4d35842
--- /dev/null
+++ b/wasm/src/CoinTypeExt.h
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <TrustWalletCore/TWCoinType.h>
+#include <TrustWalletCore/TWPrivateKey.h>
+#include <TrustWalletCore/TWPublicKey.h>
+
+#include "generated/PrivateKey.h"
+#include "generated/PublicKey.h"
+
+#include <emscripten/bind.h>
+
+using namespace emscripten;
+
+#include <string>
+
+#include "WasmString.h"
+#include "WasmData.h"
+
+namespace TW::Wasm {
+
+    class CoinTypeExt {
+    public:
+        static auto blockchain(TWCoinType coin);
+        static auto purpose(TWCoinType coin);
+        static auto curve(TWCoinType coin);
+        static auto xpubVersion(TWCoinType coin);
+        static auto xprvVersion(TWCoinType coin);
+        static auto hrp(TWCoinType coin);
+        static auto p2pkhPrefix(TWCoinType coin);
+        static auto p2shPrefix(TWCoinType coin);
+        static auto staticPrefix(TWCoinType coin);
+        static auto chainId(TWCoinType coin);
+        static auto slip44Id(TWCoinType coin);
+        static auto ss58Prefix(TWCoinType coin);
+        static auto publicKeyType(TWCoinType coin);
+        static auto validate(TWCoinType coin, const std::string& address);
+        static auto derivationPath(TWCoinType coin);
+        static auto derivationPathWithDerivation(TWCoinType coin, TWDerivation derivation);
+        static auto deriveAddress(TWCoinType coin, WasmPrivateKey* privateKey);
+        static auto deriveAddressFromPublicKey(TWCoinType coin, WasmPublicKey* publicKey);
+        static auto deriveAddressFromPublicKeyAndDerivation(TWCoinType coin, WasmPublicKey* publicKey, TWDerivation derivation);
+    };
+}
diff --git a/wasm/src/HDVersionExt.cpp b/wasm/src/HDVersionExt.cpp
new file mode 100644
index 00000000000..da7b736a6db
--- /dev/null
+++ b/wasm/src/HDVersionExt.cpp
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#include <TrustWalletCore/TWHDVersion.h>
+
+#include <emscripten/bind.h>
+
+using namespace emscripten;
+
+#include "HDVersionExt.h"
+
+namespace TW::Wasm {
+
+    auto HDVersionExt::isPublic(TWHDVersion version) {
+        return TWHDVersionIsPublic(version);
+    }
+    auto HDVersionExt::isPrivate(TWHDVersion version) {
+        return TWHDVersionIsPrivate(version);
+    }
+
+    EMSCRIPTEN_BINDINGS(Wasm_HDVersionExt) {
+        class_<HDVersionExt>("HDVersionExt")
+            .class_function("isPublic", &HDVersionExt::isPublic)
+            .class_function("isPrivate", &HDVersionExt::isPrivate);
+    };
+}
diff --git a/wasm/src/HDVersionExt.h b/wasm/src/HDVersionExt.h
new file mode 100644
index 00000000000..2bc5ca14035
--- /dev/null
+++ b/wasm/src/HDVersionExt.h
@@ -0,0 +1,20 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+#pragma once
+
+#include <TrustWalletCore/TWHDVersion.h>
+
+#include <emscripten/bind.h>
+
+using namespace emscripten;
+
+namespace TW::Wasm {
+
+    class HDVersionExt {
+    public:
+        static auto isPublic(TWHDVersion version);
+        static auto isPrivate(TWHDVersion version);
+    };
+}
diff --git a/wasm/src/HexCoding.cpp b/wasm/src/HexCoding.cpp
index 1a1c58f57c9..b91dd05fc7c 100644
--- a/wasm/src/HexCoding.cpp
+++ b/wasm/src/HexCoding.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 
 #include <emscripten/bind.h>
diff --git a/wasm/src/Random.cpp b/wasm/src/Random.cpp
index d0ea0b2557f..84e49a515f4 100644
--- a/wasm/src/Random.cpp
+++ b/wasm/src/Random.cpp
@@ -1,24 +1,86 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 
-#include <algorithm>
 #include <cstddef>
 #include <cstdint>
-#include <random>
+#include <emscripten.h>
+
+// clang-format off
+static uint32_t
+javascript_random(void)
+{
+    return EM_ASM_INT_V({
+        return Module.getRandomValue();
+    });
+}
+
+// https://github.com/jedisct1/libsodium/blob/master/src/libsodium/randombytes/randombytes.c#L53
+static void
+javascript_stir(void)
+{
+    EM_ASM({
+        if (Module.getRandomValue === undefined) {
+            try {
+                var window_ = 'object' === typeof window ? window : self;
+                var crypto_ = typeof window_.crypto !== 'undefined' ? window_.crypto : window_.msCrypto;
+                var randomValuesStandard = function() {
+                    var buf = new Uint32Array(1);
+                    crypto_.getRandomValues(buf);
+                    return buf[0] >>> 0;
+                };
+                randomValuesStandard();
+                Module.getRandomValue = randomValuesStandard;
+            } catch (e) {
+                try {
+                    var crypto = require('crypto');
+                    var randomValueNodeJS = function() {
+                        var buf = crypto['randomBytes'](4);
+                        return (buf[0] << 24 | buf[1] << 16 | buf[2] << 8 | buf[3]) >>> 0;
+                    };
+                    randomValueNodeJS();
+                    Module.getRandomValue = randomValueNodeJS;
+                } catch (e) {
+                    throw 'No secure random number generator found';
+                }
+            }
+        }
+    });
+}
+
+
+static void
+randombytes_init_if_needed(void)
+{
+    static bool initialized = false;
+    if (!initialized) {
+        javascript_stir();
+        initialized = true;
+    }
+}
+
+static void
+javascript_buf(void * const buf, const size_t size)
+{
+    unsigned char *p = (unsigned char *) buf;
+    size_t         i;
+
+    for (i = (size_t) 0U; i < size; i++) {
+        p[i] = (unsigned char) javascript_random();
+    }
+}
+// clang-format on
 
 extern "C" {
 uint32_t random32(void) {
-    std::mt19937 rng(std::random_device{}());
-    return rng();
+    randombytes_init_if_needed();
+    return javascript_random();
 }
 
 void random_buffer(uint8_t* buf, size_t len) {
-    std::mt19937 rng(std::random_device{}());
-    std::generate_n(buf, len, [&rng]() -> uint8_t { return rng() & 0x000000ff; });
+    randombytes_init_if_needed();
+    javascript_buf(buf, len);
     return;
 }
 
diff --git a/wasm/src/WasmData.cpp b/wasm/src/WasmData.cpp
index 7426d443675..7916c9e39a0 100644
--- a/wasm/src/WasmData.cpp
+++ b/wasm/src/WasmData.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 
 #include "WasmData.h"
diff --git a/wasm/src/WasmData.h b/wasm/src/WasmData.h
index 133f9b69f73..8cd2a4853ad 100644
--- a/wasm/src/WasmData.h
+++ b/wasm/src/WasmData.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 
 #pragma once
diff --git a/wasm/src/WasmString.cpp b/wasm/src/WasmString.cpp
index 2ea9f9cec79..f03f58d7b6e 100644
--- a/wasm/src/WasmString.cpp
+++ b/wasm/src/WasmString.cpp
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 
 #include "WasmString.h"
diff --git a/wasm/src/WasmString.h b/wasm/src/WasmString.h
index ae58e22daa8..9d7c8999e18 100644
--- a/wasm/src/WasmString.h
+++ b/wasm/src/WasmString.h
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 //
 
 #pragma once
diff --git a/wasm/src/enum-ext.d.ts b/wasm/src/enum-ext.d.ts
new file mode 100644
index 00000000000..06164ae114c
--- /dev/null
+++ b/wasm/src/enum-ext.d.ts
@@ -0,0 +1,34 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+export class BitcoinSigHashTypeExt {
+    static isSingle(type: BitcoinSigHashType): boolean;
+    static isNone(type: BitcoinSigHashType): boolean;
+}
+
+export class CoinTypeExt {
+    static blockchain(coin: CoinType): Blockchain;
+    static purpose(coin: CoinType): Purpose;
+    static curve(coin: CoinType): Curve;
+    static xpubVersion(coin: CoinType): HDVersion;
+    static xprvVersion(coin: CoinType): HDVersion;
+    static hrp(coin: CoinType): HRP;
+    static p2pkhPrefix(coin: CoinType): number;
+    static p2shPrefix(coin: CoinType): number;
+    static staticPrefix(coin: CoinType): number;
+    static chainId(coin: CoinType): string;
+    static slip44Id(coin: CoinType): number;
+    static ss58Prefix(coin: CoinType): number;
+    static publicKeyType(coin: CoinType): PublicKeyType;
+    static validate(coin: CoinType, address: string): boolean;
+    static derivationPath(coin: CoinType): string;
+    static derivationPathWithDerivation(coin: CoinType, derivation: Derivation): string;
+    static deriveAddress(coin: CoinType, privateKey: PrivateKey): string;
+    static deriveAddressFromPublicKey(coin: CoinType, publicKey: PublicKey): string;
+}
+
+export class HDVersionExt {
+    static isPublic(version: HDVersion): boolean;
+    static isPrivate(version: HDVersion): boolean;
+}
diff --git a/wasm/src/keystore/default-impl.ts b/wasm/src/keystore/default-impl.ts
index 91da9b40f16..6da4ae6c57a 100644
--- a/wasm/src/keystore/default-impl.ts
+++ b/wasm/src/keystore/default-impl.ts
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-import { WalletCore, CoinType, PrivateKey, StoredKey } from "../wallet-core";
+import {WalletCore, CoinType, PrivateKey, StoredKey, StoredKeyEncryption} from "../wallet-core";
 import * as Types from "./types";
 
 export class Default implements Types.IKeyStore {
@@ -53,16 +51,17 @@ export class Default implements Types.IKeyStore {
     mnemonic: string,
     name: string,
     password: string,
-    coins: CoinType[]
+    coins: CoinType[],
+    encryption: StoredKeyEncryption
   ): Promise<Types.Wallet> {
     return new Promise((resolve, reject) => {
-      const { Mnemonic, StoredKey, HDWallet } = this.core;
+      const { Mnemonic, StoredKey, HDWallet, StoredKeyEncryption } = this.core;
 
       if (!Mnemonic.isValid(mnemonic)) {
         throw Types.Error.InvalidMnemonic;
       }
       let pass = Buffer.from(password);
-      let storedKey = StoredKey.importHDWallet(mnemonic, name, pass, coins[0]);
+      let storedKey = StoredKey.importHDWalletWithEncryption(mnemonic, name, pass, coins[0], encryption);
       let hdWallet = HDWallet.createWithMnemonic(mnemonic, "");
       coins.forEach((coin) => {
         storedKey.accountForCoin(coin, hdWallet);
@@ -82,10 +81,11 @@ export class Default implements Types.IKeyStore {
     key: Uint8Array,
     name: string,
     password: string,
-    coin: CoinType
+    coin: CoinType,
+    encryption: StoredKeyEncryption
   ): Promise<Types.Wallet> {
     return new Promise((resolve, reject) => {
-      const { StoredKey, PrivateKey, Curve } = this.core;
+      const { StoredKey, PrivateKey, Curve, StoredKeyEncryption } = this.core;
 
       // FIXME: get curve from coin
       if (
@@ -95,7 +95,7 @@ export class Default implements Types.IKeyStore {
         throw Types.Error.InvalidKey;
       }
       let pass = Buffer.from(password);
-      let storedKey = StoredKey.importPrivateKey(key, name, pass, coin);
+      let storedKey = StoredKey.importPrivateKeyWithEncryption(key, name, pass, coin, encryption);
       let wallet = this.mapWallet(storedKey);
       storedKey.delete();
       this.importWallet(wallet)
diff --git a/wasm/src/keystore/extension-storage.ts b/wasm/src/keystore/extension-storage.ts
index 3056a4b8681..b17e3398649 100644
--- a/wasm/src/keystore/extension-storage.ts
+++ b/wasm/src/keystore/extension-storage.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import { Storage } from "webextension-polyfill";
 import * as Types from "./types";
diff --git a/wasm/src/keystore/fs-storage.ts b/wasm/src/keystore/fs-storage.ts
index 3689be747e3..fd5eaf64631 100644
--- a/wasm/src/keystore/fs-storage.ts
+++ b/wasm/src/keystore/fs-storage.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import * as Types from "./types";
 import * as fs from "fs/promises";
diff --git a/wasm/src/keystore/index.ts b/wasm/src/keystore/index.ts
index 68931378db0..663f3affeb0 100644
--- a/wasm/src/keystore/index.ts
+++ b/wasm/src/keystore/index.ts
@@ -1,10 +1,9 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 export { Default } from "./default-impl";
 export * from "./types";
 export { FileSystemStorage } from "./fs-storage";
 export { ExtensionStorage } from "./extension-storage";
+
diff --git a/wasm/src/keystore/types.ts b/wasm/src/keystore/types.ts
index cc0ce8a21fd..bccb05ef58a 100644
--- a/wasm/src/keystore/types.ts
+++ b/wasm/src/keystore/types.ts
@@ -1,10 +1,8 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
-import { CoinType, PrivateKey } from "../wallet-core";
+import { CoinType, PrivateKey, StoredKeyEncryption } from "../wallet-core";
 
 export enum WalletType {
   Mnemonic = "mnemonic",
@@ -54,7 +52,8 @@ export interface IKeyStore {
     mnemonic: string,
     name: string,
     password: string,
-    coins: CoinType[]
+    coins: CoinType[],
+    encryption: StoredKeyEncryption
   ): Promise<Wallet>;
 
   // Import a wallet by private key, name and password
@@ -62,7 +61,8 @@ export interface IKeyStore {
     key: Uint8Array,
     name: string,
     password: string,
-    coin: CoinType
+    coin: CoinType,
+    encryption: StoredKeyEncryption
   ): Promise<Wallet>;
 
   // Import a Wallet object directly
diff --git a/wasm/tests/AES.test.ts b/wasm/tests/AES.test.ts
index 9a44fb1b337..a6a6b65a56a 100644
--- a/wasm/tests/AES.test.ts
+++ b/wasm/tests/AES.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/AnyAddress.test.ts b/wasm/tests/AnyAddress.test.ts
index 8d0de564223..5701ea89c98 100644
--- a/wasm/tests/AnyAddress.test.ts
+++ b/wasm/tests/AnyAddress.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/Base32.test.ts b/wasm/tests/Base32.test.ts
index 36915d1d41b..281a535c48d 100644
--- a/wasm/tests/Base32.test.ts
+++ b/wasm/tests/Base32.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import { assert } from "chai";
 import { Buffer } from "buffer";
diff --git a/wasm/tests/Base64.test.ts b/wasm/tests/Base64.test.ts
index b2f6297627b..b89c99820ec 100644
--- a/wasm/tests/Base64.test.ts
+++ b/wasm/tests/Base64.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import { assert } from "chai";
 import { Buffer } from "buffer";
diff --git a/wasm/tests/Bech32.test.ts b/wasm/tests/Bech32.test.ts
new file mode 100644
index 00000000000..f9ac76a0c9f
--- /dev/null
+++ b/wasm/tests/Bech32.test.ts
@@ -0,0 +1,47 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import { assert } from "chai";
+import { Buffer } from "buffer";
+
+describe("Bech32", () => {
+
+  it("test encode", () => {
+    const { Bech32 } = globalThis.core;
+
+    const encoded = Bech32.encode("abcdef", Buffer.from("00443214c74254b635cf84653a56d7c675be77df", "hex"));
+
+    assert.equal(encoded, "abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw");
+  });
+
+  it("test decode", () => {
+    const { Bech32, HexCoding } = globalThis.core;
+
+    const decoded = Bech32.decode("abcdef1qpzry9x8gf2tvdw0s3jn54khce6mua7lmqqqxw");
+
+    assert.equal(
+        HexCoding.encode(decoded),
+        "0x00443214c74254b635cf84653a56d7c675be77df"
+    );
+  });
+
+  it("test encodeM", () => {
+    const { Bech32 } = globalThis.core;
+
+    const encoded = Bech32.encodeM("abcdef", Buffer.from("ffbbcdeb38bdab49ca307b9ac5a928398a418820", "hex"));
+
+    assert.equal(encoded, "abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx");
+  });
+
+  it("test decodeM", () => {
+    const { Bech32, HexCoding } = globalThis.core;
+
+    const decoded = Bech32.decodeM("abcdef1l7aum6echk45nj3s0wdvt2fg8x9yrzpqzd3ryx");
+
+    assert.equal(
+        HexCoding.encode(decoded),
+        "0xffbbcdeb38bdab49ca307b9ac5a928398a418820"
+    );
+  });
+});
diff --git a/wasm/tests/BitcoinSigHashType.test.ts b/wasm/tests/BitcoinSigHashType.test.ts
new file mode 100644
index 00000000000..4ff0fdc1a26
--- /dev/null
+++ b/wasm/tests/BitcoinSigHashType.test.ts
@@ -0,0 +1,28 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import "mocha";
+import { assert } from "chai";
+
+describe("BitcoinSigHashType", () => {
+  it("test isSingle", () => {
+    const { BitcoinSigHashType, BitcoinSigHashTypeExt } = globalThis.core;
+
+    assert.isFalse(BitcoinSigHashTypeExt.isSingle(BitcoinSigHashType.all));
+    assert.isFalse(BitcoinSigHashTypeExt.isSingle(BitcoinSigHashType.none));
+    assert.isTrue(BitcoinSigHashTypeExt.isSingle(BitcoinSigHashType.single));
+    assert.isFalse(BitcoinSigHashTypeExt.isSingle(BitcoinSigHashType.fork));
+    assert.isFalse(BitcoinSigHashTypeExt.isSingle(BitcoinSigHashType.forkBTG));
+  });
+
+  it("test isNone", () => {
+    const { BitcoinSigHashType, BitcoinSigHashTypeExt } = globalThis.core;
+
+    assert.isFalse(BitcoinSigHashTypeExt.isNone(BitcoinSigHashType.all));
+    assert.isTrue(BitcoinSigHashTypeExt.isNone(BitcoinSigHashType.none));
+    assert.isFalse(BitcoinSigHashTypeExt.isNone(BitcoinSigHashType.single));
+    assert.isFalse(BitcoinSigHashTypeExt.isNone(BitcoinSigHashType.fork));
+    assert.isFalse(BitcoinSigHashTypeExt.isNone(BitcoinSigHashType.forkBTG));
+  });
+});
diff --git a/wasm/tests/Blockchain/Aptos.test.ts b/wasm/tests/Blockchain/Aptos.test.ts
new file mode 100644
index 00000000000..98ccaf9ce27
--- /dev/null
+++ b/wasm/tests/Blockchain/Aptos.test.ts
@@ -0,0 +1,38 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import "mocha";
+import { assert } from "chai";
+import { Buffer } from "buffer";
+import { TW } from "../../dist";
+import Long = require("long");
+
+describe("Aptos", () => {
+  it("test sign aptos", () => {
+    const { PrivateKey, HexCoding, AnySigner, AnyAddress, CoinType } = globalThis.core;
+    const txDataInput = TW.Aptos.Proto.SigningInput.create({
+      chainId: 33,
+      sender: "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+      transfer: TW.Aptos.Proto.TransferMessage.create({
+        amount: new Long(1000),
+        to: "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f30",
+      }),
+      sequenceNumber: new Long(99),
+      expirationTimestampSecs: new Long(3664390082),
+      gasUnitPrice: new Long(100),
+      maxGasAmount: new Long(3296766),
+      privateKey: PrivateKey.createWithData(
+          HexCoding.decode(
+              "0x5d996aa76b3212142792d9130796cd2e11e3c445a93118c08414df4f66bc60ec",
+          ),
+      ).data(),
+    });
+    const input = TW.Aptos.Proto.SigningInput.encode(txDataInput).finish();
+    const outputData = AnySigner.sign(input, CoinType.aptos);
+    const output = TW.Aptos.Proto.SigningOutput.decode(outputData);
+    assert.equal(HexCoding.encode(output.encoded), "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada00000000210020ea526ba1710343d953461ff68641f1b7df5f23b9042ffa2d2a798d3adb3f3d6c405707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01")
+    assert.equal(HexCoding.encode(output.authenticator!.signature), "0x5707246db31e2335edc4316a7a656a11691d1d1647f6e864d1ab12f43428aaaf806cf02120d0b608cdd89c5c904af7b137432aacdd60cc53f9fad7bd33578e01")
+    assert.equal(HexCoding.encode(output.rawTxn), "0x07968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3063000000000000000200000000000000000000000000000000000000000000000000000000000000010d6170746f735f6163636f756e74087472616e7366657200022007968dab936c1bad187c60ce4082f307d030d780e91e694ae03aef16aba73f3008e803000000000000fe4d3200000000006400000000000000c2276ada0000000021")
+  });
+});
diff --git a/wasm/tests/Blockchain/Bitcoin.test.ts b/wasm/tests/Blockchain/Bitcoin.test.ts
index 4cad6e61e5d..f839f31b8f3 100644
--- a/wasm/tests/Blockchain/Bitcoin.test.ts
+++ b/wasm/tests/Blockchain/Bitcoin.test.ts
@@ -1,16 +1,345 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
 import { TW } from "../../dist";
+import Long = require("long");
 
 describe("Bitcoin", () => {
   it("test Bitcoin SigningInput / SigningOutput", () => {
     assert.isNotNull(TW.Bitcoin.Proto.SigningInput);
     assert.isNotNull(TW.Binance.Proto.SigningOutput);
   });
+
+  // Transfer from P2TR to P2WPKH address.
+  // Successfully broadcasted: https://mempool.space/tx/a9c63dfe54f6ff462155d966a54226c456b3e43b52a9abe55d7fa87d6564c6e4
+  it("test Bitcoin sign P2TR", () => {
+    const { AnySigner, BitcoinSigHashType, PrivateKey, HexCoding, CoinType } = globalThis.core;
+    const Proto = TW.BitcoinV2.Proto;
+
+    const privateKeyData = HexCoding.decode("7fa638b0df495b2968ae6dc7011c4db08c86df16c91aa71a77ee6a222954e5bb");
+    const dustAmount = new Long(546);
+    const utxoTxId = HexCoding.decode("75ed78f0ae2bad924065d2357ef01184ceee2181c44e03337746512be9371a82").reverse();
+
+    const privateKey = PrivateKey.createWithData(privateKeyData);
+    const publicKey = privateKey.getPublicKeySecp256k1(true);
+
+    const utxo0 = Proto.Input.create({
+      outPoint: {
+        hash: utxoTxId,
+        vout: 1,
+      },
+      value: new Long(8_802),
+      sighashType: BitcoinSigHashType.all.value,
+      scriptBuilder: {
+        // Spend a UTXO sent to a P2TR address associated with this account
+        // (bc1pgy48w0sthfw0k4rz6qjv6jljensms6y2nea850u9ql4m4rcqmevqp3w344).
+        p2trKeyPath: publicKey.data(),
+      },
+    });
+
+    const out0 = Proto.Output.create({
+      value: new Long(3_000),
+      toAddress: "bc1qtaquch7d90x37qre6f75z5a6l0luzh0c03epyz",
+    });
+
+    // Send the change amount back to the same P2TR address.
+    // The correct amount will be calculated for us.
+    const changeOut = Proto.Output.create({
+      builder: {
+        p2trKeyPath: publicKey.data(),
+      },
+    });
+
+    const signingInput = Proto.SigningInput.create({
+      builder: {
+        version: Proto.TransactionVersion.V2,
+        inputs: [utxo0],
+        outputs: [out0],
+        inputSelector: Proto.InputSelector.SelectDescending,
+        feePerVb: new Long(8),
+        changeOutput: changeOut,
+        fixedDustThreshold: dustAmount,
+      },
+      privateKeys: [privateKeyData],
+      chainInfo: {
+        p2pkhPrefix: 0,
+        p2shPrefix: 5,
+      },
+      // WARNING Do not use in production!
+      dangerousUseFixedSchnorrRng: true,
+    });
+
+    const legacySigningInput = TW.Bitcoin.Proto.SigningInput.create({
+      signingV2: signingInput,
+    });
+
+    const encoded = TW.Bitcoin.Proto.SigningInput.encode(legacySigningInput).finish();
+    const outputData = AnySigner.sign(encoded, CoinType.bitcoin);
+    const output = TW.Bitcoin.Proto.SigningOutput.decode(outputData);
+
+    assert.equal(output.error, TW.Common.Proto.SigningError.OK);
+    assert.equal(output.signingResultV2!.error, TW.Common.Proto.SigningError.OK);
+    assert.equal(
+        HexCoding.encode(output.signingResultV2!.encoded),
+        "0x02000000000101821a37e92b51467733034ec48121eece8411f07e35d2654092ad2baef078ed750100000000ffffffff02b80b0000000000001600145f41cc5fcd2bcd1f0079d27d4153bafbffc15df83212000000000000225120412a773e0bba5cfb5462d024cd4bf2cce1b8688a9e7a7a3f8507ebba8f00de580140cbe4d13bc9e067b042179e2c217e4e4b1d552119d12839aa4df11c21282f9159e2c4b58a4f22b291c200c0d0c5f277902282bdd78589dff0edbea89d3f00d77400000000"
+    );
+    assert.equal(
+        HexCoding.encode(output.signingResultV2!.txid),
+        "0xa9c63dfe54f6ff462155d966a54226c456b3e43b52a9abe55d7fa87d6564c6e4"
+    );
+  });
+
+  // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/3e3576eb02667fac284a5ecfcb25768969680cc4c597784602d0a33ba7c654b7
+  it("test Bitcoin sign BRC20 Transfer", () => {
+    const { AnySigner, BitcoinSigHashType, PrivateKey, HexCoding, CoinType } = globalThis.core;
+    const Proto = TW.BitcoinV2.Proto;
+
+    const privateKeyData = HexCoding.decode("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129");
+    const dustSatoshis = new Long(546);
+    const txIdInscription = HexCoding.decode("7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca").reverse();
+    const txIdForFees = HexCoding.decode("797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1").reverse();
+
+    const privateKey = PrivateKey.createWithData(privateKeyData);
+    const publicKey = privateKey.getPublicKeySecp256k1(true);
+    const bobAddress = "bc1qazgc2zhu2kmy42py0vs8d7yff67l3zgpwfzlpk";
+
+    // Now spend just created `7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca` reveal output.
+    const utxo0 = Proto.Input.create({
+      outPoint: {
+        hash: txIdInscription,
+        vout: 0,
+      },
+      value: dustSatoshis,
+      sighashType: BitcoinSigHashType.all.value,
+      scriptBuilder: {
+        p2wpkh: {
+          pubkey: publicKey.data(),
+        },
+      },
+    });
+
+    // UTXO to cover fee.
+    const utxo1 = Proto.Input.create({
+      outPoint: {
+        hash: txIdForFees,
+        vout: 1,
+      },
+      value: new Long(16_400),
+      sighashType: BitcoinSigHashType.all.value,
+      scriptBuilder: {
+        p2wpkh: {
+          pubkey: publicKey.data(),
+        },
+      },
+    });
+
+    const out0 = Proto.Output.create({
+      value: dustSatoshis,
+      toAddress: bobAddress,
+    });
+
+    // Change/return transaction. Set it explicitly.
+    const changeOut = Proto.Output.create({
+      value: new Long(13_400),
+      builder: {
+        p2wpkh: {
+          pubkey: publicKey.data()
+        },
+      },
+    });
+
+    const signingInput = Proto.SigningInput.create({
+      builder: {
+        version: Proto.TransactionVersion.V2,
+        inputs: [utxo0, utxo1],
+        outputs: [out0, changeOut],
+        inputSelector: Proto.InputSelector.UseAll,
+        fixedDustThreshold: dustSatoshis,
+      },
+      privateKeys: [privateKeyData],
+      chainInfo: {
+        p2pkhPrefix: 0,
+        p2shPrefix: 5,
+      },
+    });
+
+    const legacySigningInput = TW.Bitcoin.Proto.SigningInput.create({
+      signingV2: signingInput,
+    });
+
+    const encoded = TW.Bitcoin.Proto.SigningInput.encode(legacySigningInput).finish();
+    const outputData = AnySigner.sign(encoded, CoinType.bitcoin);
+    const output = TW.Bitcoin.Proto.SigningOutput.decode(outputData);
+
+    assert.equal(output.error, TW.Common.Proto.SigningError.OK);
+    assert.equal(output.signingResultV2!.error, TW.Common.Proto.SigningError.OK);
+    assert.equal(
+        HexCoding.encode(output.signingResultV2!.encoded),
+        "0x02000000000102ca3edda74a46877efa5364ab85947e148508713910ada23e147ea28926dc46700000000000ffffffffb11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790100000000ffffffff022202000000000000160014e891850afc55b64aa8247b2076f8894ebdf889015834000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d024830450221008798393eb0b7390217591a8c33abe18dd2f7ea7009766e0d833edeaec63f2ec302200cf876ff52e68dbaf108a3f6da250713a9b04949a8f1dcd1fb867b24052236950121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb0248304502210096bbb9d1f0596d69875646689e46f29485e8ceccacde9d0025db87fd96d3066902206d6de2dd69d965d28df3441b94c76e812384ab9297e69afe3480ee4031e1b2060121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000"
+    );
+    assert.equal(
+        HexCoding.encode(output.signingResultV2!.txid),
+        "0x3e3576eb02667fac284a5ecfcb25768969680cc4c597784602d0a33ba7c654b7"
+    );
+  });
+
+  // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1
+  it("test Bitcoin sign BRC20 Commit", () => {
+    const { AnySigner, BitcoinSigHashType, PrivateKey, HexCoding, CoinType } = globalThis.core;
+    const Proto = TW.BitcoinV2.Proto;
+
+    const privateKeyData = HexCoding.decode("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129");
+    const dustAmount = new Long(546);
+    const txId = HexCoding.decode("8ec895b4d30adb01e38471ca1019bfc8c3e5fbd1f28d9e7b5653260d89989008").reverse();
+
+    const privateKey = PrivateKey.createWithData(privateKeyData);
+    const publicKey = privateKey.getPublicKeySecp256k1(true);
+
+    const utxo0 = Proto.Input.create({
+      outPoint: {
+        hash: txId,
+        vout: 1,
+      },
+      value: new Long(26_400),
+      sighashType: BitcoinSigHashType.all.value,
+      scriptBuilder: {
+        p2wpkh: {
+          pubkey: publicKey.data(),
+        },
+      },
+    });
+
+    const out0 = Proto.Output.create({
+      value: new Long(7_000),
+      builder: {
+        brc20Inscribe: {
+          inscribeTo: publicKey.data(),
+          ticker: "oadf",
+          transferAmount: "20",
+        },
+      },
+    });
+
+    // Change/return transaction. Set it explicitly.
+    const changeOut = Proto.Output.create({
+      value: new Long(16_400),
+      builder: {
+        p2wpkh: {
+          pubkey: publicKey.data(),
+        },
+      },
+    });
+
+    const signingInput = Proto.SigningInput.create({
+      builder: {
+        version: Proto.TransactionVersion.V2,
+        inputs: [utxo0],
+        outputs: [out0, changeOut],
+        inputSelector: Proto.InputSelector.UseAll,
+        fixedDustThreshold: dustAmount,
+      },
+      privateKeys: [privateKeyData],
+      chainInfo: {
+        p2pkhPrefix: 0,
+        p2shPrefix: 5,
+      },
+    });
+
+    const legacySigningInput = TW.Bitcoin.Proto.SigningInput.create({
+      signingV2: signingInput,
+    });
+
+    const encoded = TW.Bitcoin.Proto.SigningInput.encode(legacySigningInput).finish();
+    const outputData = AnySigner.sign(encoded, CoinType.bitcoin);
+    const output = TW.Bitcoin.Proto.SigningOutput.decode(outputData);
+
+    assert.equal(output.error, TW.Common.Proto.SigningError.OK);
+    assert.equal(output.signingResultV2!.error, TW.Common.Proto.SigningError.OK);
+    assert.equal(
+      HexCoding.encode(output.signingResultV2!.encoded),
+      "0x02000000000101089098890d2653567b9e8df2d1fbe5c3c8bf1910ca7184e301db0ad3b495c88e0100000000ffffffff02581b000000000000225120e8b706a97732e705e22ae7710703e7f589ed13c636324461afa443016134cc051040000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d02483045022100a44aa28446a9a886b378a4a65e32ad9a3108870bd725dc6105160bed4f317097022069e9de36422e4ce2e42b39884aa5f626f8f94194d1013007d5a1ea9220a06dce0121030f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000"
+    );
+    assert.equal(
+      HexCoding.encode(output.signingResultV2!.txid),
+      "0x797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1"
+    );
+  });
+
+  // Successfully broadcasted: https://www.blockchain.com/explorer/transactions/btc/7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca
+  it("test Bitcoin sign BRC20 Reveal", () => {
+    const { AnySigner, BitcoinSigHashType, PrivateKey, HexCoding, CoinType } = globalThis.core;
+    const Proto = TW.BitcoinV2.Proto;
+
+    const privateKeyData = HexCoding.decode("e253373989199da27c48680e3a3fc0f648d50f9a727ef17a7fe6a4dc3b159129");
+    const dustAmount = new Long(546);
+    const txIdCommit = HexCoding.decode("797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1").reverse();
+
+    const privateKey = PrivateKey.createWithData(privateKeyData);
+    const publicKey = privateKey.getPublicKeySecp256k1(true);
+
+    // Now spend just created `797d17d47ae66e598341f9dfdea020b04d4017dcf9cc33f0e51f7a6082171fb1` commit output.
+    const utxo0 = Proto.Input.create({
+      outPoint: {
+        hash: txIdCommit,
+        vout: 0,
+      },
+      value: new Long(7_000),
+      sighashType: BitcoinSigHashType.all.value,
+      scriptBuilder: {
+        brc20Inscribe: {
+          inscribeTo: publicKey.data(),
+          ticker: "oadf",
+          transferAmount: "20",
+        },
+      },
+    });
+
+    const out0 = Proto.Output.create({
+      value: dustAmount,
+      builder: {
+        p2wpkh: {
+          pubkey: publicKey.data(),
+        },
+      },
+    });
+
+    const signingInput = Proto.SigningInput.create({
+      builder: {
+        version: Proto.TransactionVersion.V2,
+        inputs: [utxo0],
+        outputs: [out0],
+        inputSelector: Proto.InputSelector.UseAll,
+        fixedDustThreshold: dustAmount,
+      },
+      privateKeys: [privateKeyData],
+      chainInfo: {
+        p2pkhPrefix: 0,
+        p2shPrefix: 5,
+      },
+      // WARNING Do not use in production!
+      dangerousUseFixedSchnorrRng: true,
+    });
+
+    const legacySigningInput = TW.Bitcoin.Proto.SigningInput.create({
+      signingV2: signingInput,
+    });
+
+    const encoded = TW.Bitcoin.Proto.SigningInput.encode(legacySigningInput).finish();
+    const outputData = AnySigner.sign(encoded, CoinType.bitcoin);
+    const output = TW.Bitcoin.Proto.SigningOutput.decode(outputData);
+
+    assert.equal(output.error, TW.Common.Proto.SigningError.OK);
+    assert.equal(output.signingResultV2!.error, TW.Common.Proto.SigningError.OK);
+    assert.equal(
+        HexCoding.encode(output.signingResultV2!.encoded),
+        "0x02000000000101b11f1782607a1fe5f033ccf9dc17404db020a0dedff94183596ee67ad4177d790000000000ffffffff012202000000000000160014e311b8d6ddff856ce8e9a4e03bc6d4fe5050a83d03406a35548b8fa4620028e021a944c1d3dc6e947243a7bfc901bf63fefae0d2460efa149a6440cab51966aa4f09faef2d1e5efcba23ab4ca6e669da598022dbcfe35b0063036f7264010118746578742f706c61696e3b636861727365743d7574662d3800377b2270223a226272632d3230222c226f70223a227472616e73666572222c227469636b223a226f616466222c22616d74223a223230227d6821c00f209b6ada5edb42c77fd2bc64ad650ae38314c8f451f3e36d80bc8e26f132cb00000000"
+    );
+    assert.equal(
+        HexCoding.encode(output.signingResultV2!.txid),
+        "0x7046dc2689a27e143ea2ad1039710885147e9485ab6453fa7e87464aa7dd3eca"
+    );
+  });
 });
diff --git a/wasm/tests/Blockchain/Cardano.test.ts b/wasm/tests/Blockchain/Cardano.test.ts
new file mode 100644
index 00000000000..8624da2e81c
--- /dev/null
+++ b/wasm/tests/Blockchain/Cardano.test.ts
@@ -0,0 +1,84 @@
+import {TW} from "../../dist";
+import {assert} from "chai";
+import Long = require("long");
+
+describe("Cardano", () => {
+    it("test outputMinAdaAmount", () => {
+        const { Cardano } = globalThis.core;
+
+        const output = TW.Cardano.Proto.TxOutput.create()
+        const outputData = TW.Cardano.Proto.TxOutput.encode(output).finish()
+        const coinsPerUtxoByte = "4310"
+        const toAddress = "addr1q8043m5heeaydnvtmmkyuhe6qv5havvhsf0d26q3jygsspxlyfpyk6yqkw0yhtyvtr0flekj84u64az82cufmqn65zdsylzk23"
+
+        const actual = Cardano.outputMinAdaAmount(toAddress, outputData, coinsPerUtxoByte)
+        assert.equal(actual, "969750")
+    });
+
+    it("test signTransferNft", () => {
+        const { AnySigner, CoinType, HexCoding } = globalThis.core;
+
+        const privateKeyData = HexCoding.decode("d09831a668db6b36ffb747600cb1cd3e3d34f36e1e6feefc11b5f988719b7557a7029ab80d3e6fe4180ad07a59ddf742ea9730f3c4145df6365fa4ae2ee49c3392e19444caf461567727b7fefec40a3763bdb6ce5e0e8c05f5e340355a8fef4528dfe7502cfbda49e38f5a0021962d52dc3dee82834a23abb6750981799b75577d1ed9af9853707f0ef74264274e71b2f12e86e3c91314b6efa75ef750d9711b84cedd742ab873ef2f9566ad20b3fc702232c6d2f5d83ff425019234037d1e58");
+        const fromAddress = "addr1qy5eme9r6frr0m6q2qpncg282jtrhq5lg09uxy2j0545hj8rv7v2ntdxuv6p4s3eq4lqzg39lewgvt6fk5kmpa0zppesufzjud"
+        const toAddress = "addr1qy9wjfn6nd8kak6dd8z53u7t5wt9f4lx0umll40px5hnq05avwcsq5r3ytdp36wttzv4558jaq8lvhgqhe3y8nuf5xrquju7z4"
+        // 1.20249 ADA. Amount locked by the NFT.
+        const nftInputAmount = new Long(1202490);
+
+        const tokenAmount = TW.Cardano.Proto.TokenAmount.create({
+            policyId: "219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5e",
+            assetName: "coolcatssociety4567",
+            amount: HexCoding.decode("1"),
+        });
+        const utxo1 = TW.Cardano.Proto.TxInput.create({
+            outPoint: TW.Cardano.Proto.OutPoint.create({
+                txHash: HexCoding.decode("aba499ec2f23529e70bb256ceaffcc6274a882cf02f29e5670c75ee980d7c2b8"),
+                outputIndex: new Long(0),
+            }),
+            address: fromAddress,
+            amount: nftInputAmount,
+            tokenAmount: [tokenAmount],
+        });
+
+        const utxo2 = TW.Cardano.Proto.TxInput.create({
+            outPoint: TW.Cardano.Proto.OutPoint.create({
+                txHash: HexCoding.decode("ee414d635b3bc67831907354d274a31174664777c57c21ae923b9459e5644840"),
+                outputIndex: new Long(0),
+            }),
+            address: fromAddress,
+            amount: new Long(1000000),
+        });
+
+        const utxo3 = TW.Cardano.Proto.TxInput.create({
+            outPoint: TW.Cardano.Proto.OutPoint.create({
+                txHash: HexCoding.decode("6a7221dcc28353ed69b733391ffeb984a34c1e72293af111d59f9ddfa8639167"),
+                outputIndex: new Long(0),
+            }),
+            address: fromAddress,
+            amount: new Long(2000000),
+        });
+
+        const transferMessage = TW.Cardano.Proto.Transfer.create({
+            toAddress: toAddress,
+            changeAddress: fromAddress,
+            amount: nftInputAmount,
+            tokenAmount: TW.Cardano.Proto.TokenBundle.create({
+                token: [tokenAmount],
+            }),
+        });
+
+        const input = TW.Cardano.Proto.SigningInput.create({
+            utxos: [utxo1, utxo2, utxo3],
+            privateKey: [privateKeyData],
+            ttl: new Long(89130965),
+            transferMessage: transferMessage,
+        })
+
+        const encoded = TW.Cardano.Proto.SigningInput.encode(input).finish();
+        const outputData = AnySigner.sign(encoded, CoinType.cardano);
+        const output = TW.Cardano.Proto.SigningOutput.decode(outputData);
+        assert.equal(
+            HexCoding.encode(output.encoded),
+            "0x83a400838258206a7221dcc28353ed69b733391ffeb984a34c1e72293af111d59f9ddfa863916700825820aba499ec2f23529e70bb256ceaffcc6274a882cf02f29e5670c75ee980d7c2b800825820ee414d635b3bc67831907354d274a31174664777c57c21ae923b9459e5644840000182825839010ae9267a9b4f6edb4d69c548f3cba39654d7e67f37ffd5e1352f303e9d63b100507122da18e9cb58995a50f2e80ff65d00be6243cf89a186821a0012593aa1581c219820e6cb04316f41a337fea356480f412e7acc147d28f175f21b5ea153636f6f6c63617473736f6369657479343536370182583901299de4a3d24637ef4050033c214754963b829f43cbc311527d2b4bc8e36798a9ada6e3341ac239057e012225fe5c862f49b52db0f5e208731a002b1525021a0002b19b031a055007d5a1008182582088bd26e8656fa7dead846c3373588f0192da5bfb90bf5d3fb877decfb3b3fd085840da8656aca0dacc57d4c2d957fc7dff03908f6dcf60c48f1e40b3006e2fd0cfacfa4c24fa02e35a310572526586d4ce0d30bf660ba274c8efd507848cbe177d09f6"
+        );
+    });
+});
diff --git a/wasm/tests/Blockchain/Ethereum.test.ts b/wasm/tests/Blockchain/Ethereum.test.ts
index 660b6e43afc..357e8d306f3 100644
--- a/wasm/tests/Blockchain/Ethereum.test.ts
+++ b/wasm/tests/Blockchain/Ethereum.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
@@ -99,7 +97,7 @@ describe("Ethereum", () => {
   });
 
   it("test signing personal message", () => {
-    const { HexCoding, Hash, PrivateKey, Curve } = globalThis.core;;
+    const { HexCoding, Hash, PrivateKey, Curve } = globalThis.core;
     const message = Buffer.from("Some data");
     const prefix = Buffer.from("\x19Ethereum Signed Message:\n" + message.length);
     const hash = Hash.keccak256(Buffer.concat([prefix, message]));
diff --git a/wasm/tests/Blockchain/Greenfield.test.ts b/wasm/tests/Blockchain/Greenfield.test.ts
new file mode 100644
index 00000000000..222d3482d96
--- /dev/null
+++ b/wasm/tests/Blockchain/Greenfield.test.ts
@@ -0,0 +1,57 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import "mocha";
+import { assert } from "chai";
+import { TW } from "../../dist";
+import Long = require("long");
+
+describe("Greenfield", () => {
+
+    // Successfully broadcasted: https://greenfieldscan.com/tx/ED8508F3C174C4430B8EE718A6D6F0B02A8C516357BE72B1336CF74356529D19
+    it("test signing transfer tx", () => {
+        const { HexCoding, AnySigner, CoinType } = globalThis.core;
+
+        const msgSend = TW.Greenfield.Proto.Message.create({
+            sendCoinsMessage: TW.Greenfield.Proto.Message.Send.create({
+                fromAddress: "0xA815ae0b06dC80318121745BE40e7F8c6654e9f3",
+                toAddress: "0x8dbD6c7Ede90646a61Bbc649831b7c298BFd37A0",
+                amounts: [TW.Greenfield.Proto.Amount.create({
+                    amount: "1234500000000000",
+                    denom: "BNB",
+                })]
+            }),
+        });
+        const input = TW.Greenfield.Proto.SigningInput.create({
+            signingMode: TW.Greenfield.Proto.SigningMode.Eip712,
+            encodingMode: TW.Greenfield.Proto.EncodingMode.Protobuf,
+            accountNumber: new Long(15952),
+            cosmosChainId: "greenfield_5600-1",
+            ethChainId: "5600",
+            sequence: new Long(0),
+            mode: TW.Greenfield.Proto.BroadcastMode.SYNC,
+            memo: "Trust Wallet test memo",
+            messages: [msgSend],
+            fee: TW.Greenfield.Proto.Fee.create({
+                amounts: [TW.Greenfield.Proto.Amount.create({
+                    amount: "6000000000000",
+                    denom: "BNB",
+                })],
+                gas: new Long(1200),
+            }),
+            privateKey: HexCoding.decode(
+                "825d2bb32965764a98338139412c7591ed54c951dd65504cd8ddaeaa0fea7b2a"
+            ),
+        });
+
+        const encoded = TW.Greenfield.Proto.SigningInput.encode(input).finish();
+
+        const outputData = AnySigner.sign(encoded, CoinType.greenfield);
+        const output = TW.Greenfield.Proto.SigningOutput.decode(outputData);
+        assert.equal(
+            output.serialized,
+            "{\"mode\":\"BROADCAST_MODE_SYNC\",\"tx_bytes\":\"CqwBCpEBChwvY29zbW9zLmJhbmsudjFiZXRhMS5Nc2dTZW5kEnEKKjB4QTgxNWFlMGIwNmRDODAzMTgxMjE3NDVCRTQwZTdGOGM2NjU0ZTlmMxIqMHg4ZGJENmM3RWRlOTA2NDZhNjFCYmM2NDk4MzFiN2MyOThCRmQzN0EwGhcKA0JOQhIQMTIzNDUwMDAwMDAwMDAwMBIWVHJ1c3QgV2FsbGV0IHRlc3QgbWVtbxJzClYKTQomL2Nvc21vcy5jcnlwdG8uZXRoLmV0aHNlY3AyNTZrMS5QdWJLZXkSIwohAhm/mQgs8vzaqBLW66HrqQNv86PYTBgXyElU1OiuKD/sEgUKAwjIBRIZChQKA0JOQhINNjAwMDAwMDAwMDAwMBCwCRpBwbRb1qEAWwaqVfmp1Mn7iMi7wwV/oPi2J2eW9NBIdNoky+ZL+uegS/kY+funCOrqVZ+Kbol9/djAV+bQaNUB0xw=\"}"
+        );
+    });
+});
diff --git a/wasm/tests/Blockchain/Hedera.test.ts b/wasm/tests/Blockchain/Hedera.test.ts
new file mode 100644
index 00000000000..e9dbbe0c881
--- /dev/null
+++ b/wasm/tests/Blockchain/Hedera.test.ts
@@ -0,0 +1,60 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import "mocha";
+import { assert } from "chai";
+import { Buffer } from "buffer";
+import { TW } from "../../dist";
+import Long = require("long");
+
+describe("Hedera", () => {
+
+  it("test address", () => {
+    const { PrivateKey, HexCoding, AnyAddress, CoinType, Curve } = globalThis.core;
+    const address = AnyAddress.createWithString("0.0.48694347", CoinType.hedera);
+    assert.equal(address.description(), "0.0.48694347");
+    assert.equal(AnyAddress.isValid("0.0.48694347", CoinType.hedera), true);
+    assert.equal(AnyAddress.isValid("0.0.a", CoinType.hedera), false);
+    address.delete();
+  });
+
+  it("test sign simple transfer Hedera", () => {
+    const { PrivateKey, HexCoding, AnySigner, AnyAddress, CoinType } = globalThis.core;
+    const transferMsg = TW.Hedera.Proto.TransferMessage.create({
+      from: "0.0.48694347",
+      to: "0.0.48462050",
+      amount: new Long(100000000)
+    })
+
+    const transactionID = TW.Hedera.Proto.TransactionID.create({
+        accountID: "0.0.48694347",
+        transactionValidStart: TW.Hedera.Proto.Timestamp.create({
+          seconds: new Long(1667222879),
+          nanos: 749068449
+        })
+    })
+
+    const transactionBody = TW.Hedera.Proto.TransactionBody.create({
+      memo: "",
+      nodeAccountID: "0.0.9",
+      transactionFee: new Long(100000000),
+      transactionValidDuration: new Long(120),
+      transfer: transferMsg,
+      transactionID: transactionID
+    })
+
+    const txDataInput = TW.Hedera.Proto.SigningInput.create({
+      privateKey: PrivateKey.createWithData(
+          HexCoding.decode(
+              "0xe87a5584c0173263e138db689fdb2a7389025aaae7cb1a18a1017d76012130e8",
+          ),
+      ).data(),
+      body: transactionBody
+    });
+    const input = TW.Hedera.Proto.SigningInput.encode(txDataInput).finish();
+    const outputData = AnySigner.sign(input, CoinType.hedera);
+    const output = TW.Hedera.Proto.SigningOutput.decode(outputData);
+    assert.equal(HexCoding.encode(output.encoded), "0x0a440a150a0c08df9aff9a0610a1c197e502120518cb889c17120218091880c2d72f22020878721e0a1c0a0c0a0518e2f18d17108084af5f0a0c0a0518cb889c1710ff83af5f12660a640a205d3a70d08b2beafb72c7a68986b3ff819a306078b8c359d739e4966e82e6d40e1a40612589c3b15f1e3ed6084b5a3a5b1b81751578cac8d6c922f31731b3982a5bac80a22558b2197276f5bae49b62503a4d39448ceddbc5ef3ba9bee4c0f302f70c")
+  });
+});
diff --git a/wasm/tests/Blockchain/InternetComputer.test.ts b/wasm/tests/Blockchain/InternetComputer.test.ts
new file mode 100644
index 00000000000..210a06961e0
--- /dev/null
+++ b/wasm/tests/Blockchain/InternetComputer.test.ts
@@ -0,0 +1,137 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import "mocha";
+import { assert } from "chai";
+import { Buffer } from "buffer";
+import { TW } from "../../dist";
+import Long = require("long");
+
+describe("InternetComputer", () => {
+
+    it("test address", () => {
+        const { PrivateKey, HexCoding, AnyAddress, CoinType, Curve } = globalThis.core;
+        const privateKeyBytes = HexCoding.decode("ee42eaada903e20ef6e5069f0428d552475c1ea7ed940842da6448f6ef9d48e7");
+
+        assert.isTrue(PrivateKey.isValid(privateKeyBytes, Curve.secp256k1));
+
+        const privateKey = PrivateKey.createWithData(privateKeyBytes);
+        const publicKey = privateKey.getPublicKeySecp256k1(false);
+
+        assert.equal(
+            HexCoding.encode(publicKey.data()),
+            "0x048542e6fb4b17d6dfcac3948fe412c00d626728815ee7cc70509603f1bc92128a6e7548f3432d6248bc49ff44a1e50f6389238468d17f7d7024de5be9b181dbc8"
+        );
+
+        const address = AnyAddress.createWithPublicKey(publicKey, CoinType.internetComputer);
+
+        assert.equal(address.description(), "2f25874478d06cf68b9833524a6390d0ba69c566b02f46626979a3d6a4153211");
+
+        privateKey.delete();
+        publicKey.delete();
+        address.delete();
+    });
+
+    it("test sign", () => {
+        const { HexCoding, AnySigner, CoinType } = globalThis.core;
+        const privateKeyBytes = HexCoding.decode("227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be");
+
+        const input = TW.InternetComputer.Proto.SigningInput.create({
+            transaction: TW.InternetComputer.Proto.Transaction.create({
+                transfer: TW.InternetComputer.Proto.Transaction.Transfer.create({
+                    toAccountIdentifier: "943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a",
+                    amount: new Long(100000000),
+                    memo: new Long(0),
+                    currentTimestampNanos: Long.fromString("1691709940000000000")
+                })
+            }),
+            privateKey: privateKeyBytes
+        });
+
+        const encoded = TW.InternetComputer.Proto.SigningInput.encode(input).finish();
+
+        const outputData = AnySigner.sign(encoded, CoinType.internetComputer);
+        const output = TW.InternetComputer.Proto.SigningOutput.decode(outputData);
+        const signedTransaction = HexCoding.encode(output.signedTransaction);
+
+        assert.equal(signedTransaction, "0x81826b5452414e53414354494f4e81a266757064617465a367636f6e74656e74a66c726571756573745f747970656463616c6c6e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d026b63616e69737465725f69644a000000000000000201016b6d6574686f645f6e616d656773656e645f706263617267583b0a0012070a050880c2d72f2a220a20943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a3a0a088090caa5a3a78abd176d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f736967984013186f18b9181c189818b318a8186518b2186118d418971618b1187d18eb185818e01826182f1873183b185018cb185d18ef18d81839186418b3183218da1824182f184e18a01880182718c0189018c918a018fd18c418d9189e189818b318ef1874183b185118e118a51864185918e718ed18c71889186c1822182318ca6a726561645f7374617465a367636f6e74656e74a46c726571756573745f747970656a726561645f73746174656e696e67726573735f6578706972791b177a297215cfe8006673656e646572581d971cd2ddeecd1cf1b28be914d7a5c43441f6296f1f9966a7c8aff68d0265706174687381824e726571756573745f7374617475735820e8fbc2d5b0bf837b3a369249143e50d4476faafb2dd620e4e982586a51ebcf1e6d73656e6465725f7075626b65799858183018561830100607182a1886184818ce183d02010605182b188104000a0318420004183d18ab183a182118a81838184d184c187e1852188a187e18dc18d8184418ea18cd18c5189518ac188518b518bc181d188515186318bc18e618ab18d2184318d3187c184f18cd18f018de189b18b5181918dd18ef1889187218e71518c40418d4189718881843187218c611182e18cc18e6186b182118630218356a73656e6465725f7369679840182d182718201888188618ce187f0c182a187a18d718e818df18fb18d318d41118a5186a184b18341842185318d718e618e8187a1828186c186a183618461418f3183318bd18a618a718bc18d918c818b7189d186e1865188418ff18fd18e418e9187f181b18d705184818b21872187818d6181c161833184318a2");
+    });
+
+    it("test sign with invalid private key", () => {
+        const { HexCoding, AnySigner, CoinType } = globalThis.core;
+        const privateKeyBytes = HexCoding.decode("227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7000000");
+
+        const input = TW.InternetComputer.Proto.SigningInput.create({
+            transaction: TW.InternetComputer.Proto.Transaction.create({
+                transfer: TW.InternetComputer.Proto.Transaction.Transfer.create({
+                    toAccountIdentifier: "943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a",
+                    amount: new Long(100000000),
+                    memo: new Long(0),
+                    currentTimestampNanos: Long.fromString("1691709940000000000")
+                })
+            }),
+            privateKey: privateKeyBytes
+        });
+
+        const encoded = TW.InternetComputer.Proto.SigningInput.encode(input).finish();
+
+        const outputData = AnySigner.sign(encoded, CoinType.internetComputer);
+        const output = TW.InternetComputer.Proto.SigningOutput.decode(outputData);
+        const signedTransaction = HexCoding.encode(output.signedTransaction);
+
+        // Invalid private key
+        assert.equal(output.error, 15);
+    });
+
+    it("test sign with invalid to account identifier", () => {
+        const { HexCoding, AnySigner, CoinType } = globalThis.core;
+        const privateKeyBytes = HexCoding.decode("227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be");
+
+        const input = TW.InternetComputer.Proto.SigningInput.create({
+            transaction: TW.InternetComputer.Proto.Transaction.create({
+                transfer: TW.InternetComputer.Proto.Transaction.Transfer.create({
+                    toAccountIdentifier: "643d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826b",
+                    amount: new Long(100000000),
+                    memo: new Long(0),
+                    currentTimestampNanos: Long.fromString("1691709940000000000")
+                })
+            }),
+            privateKey: privateKeyBytes
+        });
+
+        const encoded = TW.InternetComputer.Proto.SigningInput.encode(input).finish();
+
+        const outputData = AnySigner.sign(encoded, CoinType.internetComputer);
+        const output = TW.InternetComputer.Proto.SigningOutput.decode(outputData);
+        const signedTransaction = HexCoding.encode(output.signedTransaction);
+
+        // Invalid account identifier
+        assert.equal(output.error, 16);
+    });
+
+    it("test sign with invalid amount", () => {
+        const { HexCoding, AnySigner, CoinType } = globalThis.core;
+        const privateKeyBytes = HexCoding.decode("227102911bb99ce7285a55f952800912b7d22ebeeeee59d77fc33a5d7c7080be");
+
+        const input = TW.InternetComputer.Proto.SigningInput.create({
+            transaction: TW.InternetComputer.Proto.Transaction.create({
+                transfer: TW.InternetComputer.Proto.Transaction.Transfer.create({
+                    toAccountIdentifier: "943d12e762f43806782f524b8f90297298a6d79e4749b41b585ec427409c826a",
+                    amount: new Long(0),
+                    memo: new Long(0),
+                    currentTimestampNanos: Long.fromString("1691709940000000000")
+                })
+            }),
+            privateKey: privateKeyBytes
+        });
+
+        const encoded = TW.InternetComputer.Proto.SigningInput.encode(input).finish();
+
+        const outputData = AnySigner.sign(encoded, CoinType.internetComputer);
+        const output = TW.InternetComputer.Proto.SigningOutput.decode(outputData);
+
+        assert.equal(output.error, 23);
+        assert.equal(output.errorMessage, 'Invalid input token amount');
+    });
+});
\ No newline at end of file
diff --git a/wasm/tests/Blockchain/Sui.test.ts b/wasm/tests/Blockchain/Sui.test.ts
new file mode 100644
index 00000000000..fe4a3e15bcf
--- /dev/null
+++ b/wasm/tests/Blockchain/Sui.test.ts
@@ -0,0 +1,26 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import "mocha";
+import { assert } from "chai";
+import { Buffer } from "buffer";
+import { TW } from "../../dist";
+
+describe("Sui", () => {
+  it("test sign Sui", () => {
+    const { PrivateKey, HexCoding, AnySigner, AnyAddress, CoinType } = globalThis.core;
+    const txDataInput = TW.Sui.Proto.SigningInput.create({
+      signDirectMessage: TW.Sui.Proto.SignDirect.create({
+        unsignedTxMsg: "AAACAAgQJwAAAAAAAAAgJZ/4B0q0Jcu0ifI24Y4I8D8aeFa998eih3vWT3OLUBUCAgABAQAAAQEDAAAAAAEBANV1rX8Y6UhGKlz2mPVk7zlKdSpx/sYkk6+KBVwBLA1QAQbywsjB2JZN8QGdZhbpcFcZvrq9kx2idVy5SM635olk7AIAAAAAAAAgYEVuxmf1zRBGdoDr+VDtMpIFF12s2Ua7I2ru1XyGF8/Vda1/GOlIRipc9pj1ZO85SnUqcf7GJJOvigVcASwNUAEAAAAAAAAA0AcAAAAAAAAA"
+      }),
+      privateKey: HexCoding.decode(
+              "0x3823dce5288ab55dd1c00d97e91933c613417fdb282a0b8b01a7f5f5a533b266",
+          )
+    });
+    const input = TW.Sui.Proto.SigningInput.encode(txDataInput).finish();
+    const outputData = AnySigner.sign(input, CoinType.sui);
+    const output = TW.Sui.Proto.SigningOutput.decode(outputData);
+    assert.equal(output.signature, "APxPduNVvHj2CcRcHOtiP2aBR9qP3vO2Cb0g12PI64QofDB6ks33oqe/i/iCTLcop2rBrkczwrayZuJOdi7gvwNqfN7sFqdcD/Z4e8I1YQlGkDMCK7EOgmydRDqfH8C9jg==")
+  });
+});
diff --git a/wasm/tests/Blockchain/TheOpenNetwork.test.ts b/wasm/tests/Blockchain/TheOpenNetwork.test.ts
new file mode 100644
index 00000000000..b96cb551675
--- /dev/null
+++ b/wasm/tests/Blockchain/TheOpenNetwork.test.ts
@@ -0,0 +1,140 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import "mocha";
+import { assert } from "chai";
+import { Buffer } from "buffer";
+import { TW } from "../../dist";
+import Long = require("long");
+
+describe("TheOpenNetwork", () => {
+  it("test address from private key TheOpenNetwork", () => {
+    const { PrivateKey, HexCoding, AnyAddress, CoinType, Curve } = globalThis.core;
+    let data = HexCoding.decode("63474e5fe9511f1526a50567ce142befc343e71a49b865ac3908f58667319cb8");
+    let privateKey = PrivateKey.createWithData(data);
+
+    assert.isTrue(PrivateKey.isValid(data, Curve.ed25519));
+
+    let publicKey = privateKey.getPublicKeyEd25519();
+    let address = AnyAddress.createWithPublicKey(publicKey, CoinType.ton)
+    
+    assert.equal(publicKey.description(), "f42c77f931bea20ec5d0150731276bbb2e2860947661245b2319ef8133ee8d41");
+    assert.equal(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV");
+  });
+
+  it("test address from public key TheOpenNetwork", () => {
+    const { PublicKey, PublicKeyType, HexCoding, AnyAddress, CoinType } = globalThis.core;
+    let publicKey = PublicKey.createWithData(HexCoding.decode("f42c77f931bea20ec5d0150731276bbb2e2860947661245b2319ef8133ee8d41"), PublicKeyType.ed25519);
+    let address = AnyAddress.createWithPublicKey(publicKey, CoinType.ton);
+    assert.equal(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV");
+  });
+
+  it("test address from raw string TheOpenNetwork", () => {
+    const { AnyAddress, CoinType } = globalThis.core;
+    let addressString = "0:66fbe3c5c03bf5c82792f904c9f8bf28894a6aa3d213d41c20569b654aadedb3";
+    let address = AnyAddress.createWithString(addressString, CoinType.ton);
+    assert.equal(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV");
+  });
+
+  it("test address invalid hex TheOpenNetwork", () => {
+    const { AnyAddress, CoinType } = globalThis.core;
+    let addressString = "0:yahoo3c5c03bf5c82792f904c9f8bf28894a6aa3d213d41c20569b654aadedb3";
+    let valid = AnyAddress.isValid(addressString, CoinType.ton);
+    assert.isFalse(valid);
+  });
+
+  it("test address invalid workchain id TheOpenNetwork", () => {
+    const { AnyAddress, CoinType } = globalThis.core;
+    let addressString = "a:66fbe3c5c03bf5c82792f904c9f8bf28894a6aa3d213d41c20569b654aadedb3";
+    let valid = AnyAddress.isValid(addressString, CoinType.ton);
+    assert.isFalse(valid);
+  });
+  
+  it("test address from user friendly string TheOpenNetwork", () => {
+    const { AnyAddress, CoinType } = globalThis.core;
+    let addressString = "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q";
+    let address = AnyAddress.createWithString(addressString, CoinType.ton);
+    assert.equal(address.description(), "UQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts4DV");
+  });
+
+  it("test address from user friendly invalid base64 decoding TheOpenNetwork", () => {
+    const { AnyAddress, CoinType } = globalThis.core;
+    let addressString = "MwCKhieGGl3ZbJ2zzggHsSLaXtRzk0znVopbSxw2HLsors=#";
+    let valid = AnyAddress.isValid(addressString, CoinType.ton);
+    assert.isFalse(valid);
+  });
+
+  it("test sign TheOpenNetwork", () => {
+    const { PrivateKey, HexCoding, CoinType, AnySigner } = globalThis.core;
+
+    let privateKeyData = HexCoding.decode("c38f49de2fb13223a9e7d37d5d0ffbdd89a5eb7c8b0ee4d1c299f2cefe7dc4a0");
+
+    let transfer = TW.TheOpenNetwork.Proto.Transfer.create({
+        dest: "EQBm--PFwDv1yCeS-QTJ-L8oiUpqo9IT1BwgVptlSq3ts90Q",
+        amount: new Long(10),
+        mode: (TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEPARATELY | TW.TheOpenNetwork.Proto.SendMode.IGNORE_ACTION_PHASE_ERRORS),
+        bounceable: true,
+    });
+
+    let input = TW.TheOpenNetwork.Proto.SigningInput.create({
+        messages: [transfer],
+        privateKey: PrivateKey.createWithData(privateKeyData).data(),
+        sequenceNumber: 6,
+        expireAt: 1671132440,
+        walletVersion: TW.TheOpenNetwork.Proto.WalletVersion.WALLET_V4_R2,
+    });
+
+    const encoded = TW.TheOpenNetwork.Proto.SigningInput.encode(input).finish();
+    let outputData = AnySigner.sign(encoded, CoinType.ton);
+    let output = TW.TheOpenNetwork.Proto.SigningOutput.decode(outputData);
+
+    // tx: https://tonscan.org/tx/3Z4tHpXNLyprecgu5aTQHWtY7dpHXEoo11MAX61Xyg0=
+    let expectedString = "te6cckEBBAEArQABRYgBsLf6vJOEq42xW0AoyWX0K+uBMUcXFDLFqmkDg6k1Io4MAQGcEUPkil2aZ4s8KKparSep/OKHMC8vuXafFbW2HGp/9AcTRv0J5T4dwyW1G0JpHw+g5Ov6QI3Xo0O9RFr3KidICimpoxdjm3UYAAAABgADAgFiYgAzffHi4B365BPJfIJk/F+URKU1UekJ6g4QK02ypVb22YhQAAAAAAAAAAAAAAAAAQMAAA08Nzs=";
+
+    assert.equal(output.encoded, expectedString)
+  });
+
+  it("test jetton transfer TheOpenNetwork", () => {
+    const { PrivateKey, HexCoding, CoinType, AnySigner } = globalThis.core;
+
+    let privateKeyData = HexCoding.decode("c054900a527538c1b4325688a421c0469b171c29f23a62da216e90b0df2412ee");
+
+    let jettonTransfer = TW.TheOpenNetwork.Proto.JettonTransfer.create({
+        jettonAmount: new Long(500 * 1000 * 1000),
+        toOwner: "EQAFwMs5ha8OgZ9M4hQr80z9NkE7rGxUpE1hCFndiY6JnDx8",
+        responseAddress: "EQBaKIMq5Am2p_rfR1IFTwsNWHxBkOpLTmwUain5Fj4llTXk",
+        forwardAmount: new Long(1)
+    });
+
+    let transfer = TW.TheOpenNetwork.Proto.Transfer.create({
+        dest: "EQBiaD8PO1NwfbxSkwbcNT9rXDjqhiIvXWymNO-edV0H5lja",
+        amount: new Long(100 * 1000 * 1000),
+        mode: (TW.TheOpenNetwork.Proto.SendMode.PAY_FEES_SEPARATELY | TW.TheOpenNetwork.Proto.SendMode.IGNORE_ACTION_PHASE_ERRORS),
+        comment: "test comment",
+        bounceable: true,
+        jettonTransfer: jettonTransfer,
+    });
+
+    let input = TW.TheOpenNetwork.Proto.SigningInput.create({
+        messages: [transfer],
+        privateKey: PrivateKey.createWithData(privateKeyData).data(),
+        sequenceNumber: 1,
+        expireAt: 1787693046,
+        walletVersion: TW.TheOpenNetwork.Proto.WalletVersion.WALLET_V4_R2,
+    });
+
+    const encoded = TW.TheOpenNetwork.Proto.SigningInput.encode(input).finish();
+    let outputData = AnySigner.sign(encoded, CoinType.ton);
+    let output = TW.TheOpenNetwork.Proto.SigningOutput.decode(outputData);
+
+    // tx: https://testnet.tonscan.org/tx/Er_oT5R3QK7D-qVPBKUGkJAOOq6ayVls-mgEphpI9Ck=
+    let expectedString = "te6cckECBAEAARUAAUWIALRRBlXIE21P9b6OpAqeFhqw+IMh1Jac2CjUU/IsfEsqDAEBnGiFlaLItV573gJqBvctP5j3jVKlLuxmO+pnW0QGlXjXgzjw5YeTNwRG9upJHOl6GA3pFetKNojqGzfkxku+owUpqaMXao4H9gAAAAEAAwIBaGIAMTQfh52puD7eKUmDbhqfta4cdUMRF662Uxp3zzqug/MgL68IAAAAAAAAAAAAAAAAAAEDAMoPin6lAAAAAAAAAABB3NZQCAALgZZzC14dAz6ZxChX5pn6bIJ3WNipSJrCELO7Ex0TOQAWiiDKuQJtqf630dSBU8LDVh8QZDqS05sFGop+RY+JZUICAAAAAHRlc3QgY29tbWVudG/bd5c=";
+
+    assert.equal(output.encoded, expectedString)
+  });
+
+  
+});
+
+
diff --git a/wasm/tests/CoinType.test.ts b/wasm/tests/CoinType.test.ts
index d18fdf4c60e..75a0bed0408 100644
--- a/wasm/tests/CoinType.test.ts
+++ b/wasm/tests/CoinType.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
@@ -19,4 +17,42 @@ describe("CoinType", () => {
     assert.equal(CoinType.cosmos.value, 118);
     assert.equal(CoinType.solana.value, 501);
   });
+
+  it("test CoinTypeExt methods", () => {
+    const { CoinType, CoinTypeExt, Blockchain, Purpose, Curve, Derivation } = globalThis.core;
+
+    assert.equal(CoinTypeExt.blockchain(CoinType.solana), Blockchain.solana);
+    assert.equal(CoinTypeExt.purpose(CoinType.solana), Purpose.bip44);
+    assert.equal(CoinTypeExt.curve(CoinType.solana), Curve.ed25519);
+    assert.isTrue(CoinTypeExt.validate(CoinType.solana, "Bxp8yhH9zNwxyE4UqxP7a7hgJ5xTZfxNNft7YJJ2VRjT"))
+    assert.equal(CoinTypeExt.derivationPath(CoinType.solana), "m/44'/501'/0'");
+    assert.equal(CoinTypeExt.derivationPathWithDerivation(CoinType.solana, Derivation.solanaSolana), "m/44'/501'/0'/0'");
+  });
+
+  it("test deriveAddress", () => {
+    const { CoinType, CoinTypeExt, PrivateKey, HexCoding } = globalThis.core;
+
+    const data = HexCoding.decode("8778cc93c6596387e751d2dc693bbd93e434bd233bc5b68a826c56131821cb63");
+    const key = PrivateKey.createWithData(data);
+    const addr = CoinTypeExt.deriveAddress(CoinType.solana, key);
+    assert.equal(addr, "7v91N7iZ9mNicL8WfG6cgSCKyRXydQjLh6UYBWwm6y1Q")
+  });
+
+  it("test deriveAddressFromPublicKey", () => {
+    const { CoinType, CoinTypeExt, PublicKey, PublicKeyType, HexCoding } = globalThis.core;
+
+    const data = HexCoding.decode("044516c4aa5352035e1bb5be132694e1389a4ac37d32e5e717d35ee4c4dfab513226a9d14ea37a55962ad3644a08e2ce551b4495beabb9b09e688c7b92eba18acc");
+    const key = PublicKey.createWithData(data, PublicKeyType.secp256k1Extended);
+    const addr = CoinTypeExt.deriveAddressFromPublicKey(CoinType.ethereum, key);
+    assert.equal(addr, "0x996891c410FB76C19DBA72C6f6cEFF2d9DD069b1");
+  });
+
+  it("test deriveAddressFromPublicKeyAndDerivation", () => {
+    const { CoinType, CoinTypeExt, Derivation, PublicKey, PublicKeyType, HexCoding } = globalThis.core;
+
+    const data = HexCoding.decode("0279be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798");
+    const key = PublicKey.createWithData(data, PublicKeyType.secp256k1);
+    const addr = CoinTypeExt.deriveAddressFromPublicKeyAndDerivation(CoinType.bitcoin, key, Derivation.bitcoinSegwit);
+    assert.equal(addr, "bc1qw508d6qejxtdg4y5r3zarvary0c5xw7kv8f3t4");
+  });
 });
diff --git a/wasm/tests/HDVersion.test.ts b/wasm/tests/HDVersion.test.ts
new file mode 100644
index 00000000000..864f5e2cca5
--- /dev/null
+++ b/wasm/tests/HDVersion.test.ts
@@ -0,0 +1,48 @@
+// SPDX-License-Identifier: Apache-2.0
+//
+// Copyright © 2017 Trust Wallet.
+
+import "mocha";
+import { assert } from "chai";
+
+describe("HDVersion", () => {
+  it("test isPublic", () => {
+    const { HDVersion, HDVersionExt } = globalThis.core;
+
+    assert.isFalse(HDVersionExt.isPublic(HDVersion.none));
+    assert.isTrue(HDVersionExt.isPublic(HDVersion.xpub));
+    assert.isFalse(HDVersionExt.isPublic(HDVersion.xprv));
+    assert.isTrue(HDVersionExt.isPublic(HDVersion.ypub));
+    assert.isFalse(HDVersionExt.isPublic(HDVersion.yprv));
+    assert.isTrue(HDVersionExt.isPublic(HDVersion.zpub));
+    assert.isFalse(HDVersionExt.isPublic(HDVersion.zprv));
+    assert.isTrue(HDVersionExt.isPublic(HDVersion.ltub));
+    assert.isFalse(HDVersionExt.isPublic(HDVersion.ltpv));
+    assert.isTrue(HDVersionExt.isPublic(HDVersion.mtub));
+    assert.isFalse(HDVersionExt.isPublic(HDVersion.mtpv));
+    assert.isTrue(HDVersionExt.isPublic(HDVersion.dpub));
+    assert.isFalse(HDVersionExt.isPublic(HDVersion.dprv));
+    assert.isTrue(HDVersionExt.isPublic(HDVersion.dgub));
+    assert.isFalse(HDVersionExt.isPublic(HDVersion.dgpv));
+  });
+
+  it("test isPrivate", () => {
+    const { HDVersion, HDVersionExt } = globalThis.core;
+
+    assert.isFalse(HDVersionExt.isPrivate(HDVersion.none));
+    assert.isFalse(HDVersionExt.isPrivate(HDVersion.xpub));
+    assert.isTrue(HDVersionExt.isPrivate(HDVersion.xprv));
+    assert.isFalse(HDVersionExt.isPrivate(HDVersion.ypub));
+    assert.isTrue(HDVersionExt.isPrivate(HDVersion.yprv));
+    assert.isFalse(HDVersionExt.isPrivate(HDVersion.zpub));
+    assert.isTrue(HDVersionExt.isPrivate(HDVersion.zprv));
+    assert.isFalse(HDVersionExt.isPrivate(HDVersion.ltub));
+    assert.isTrue(HDVersionExt.isPrivate(HDVersion.ltpv));
+    assert.isFalse(HDVersionExt.isPrivate(HDVersion.mtub));
+    assert.isTrue(HDVersionExt.isPrivate(HDVersion.mtpv));
+    assert.isFalse(HDVersionExt.isPrivate(HDVersion.dpub));
+    assert.isTrue(HDVersionExt.isPrivate(HDVersion.dprv));
+    assert.isFalse(HDVersionExt.isPrivate(HDVersion.dgub));
+    assert.isTrue(HDVersionExt.isPrivate(HDVersion.dgpv));
+  });
+});
diff --git a/wasm/tests/HDWallet.test.ts b/wasm/tests/HDWallet.test.ts
index 567517cc74d..a45fc92c3dd 100644
--- a/wasm/tests/HDWallet.test.ts
+++ b/wasm/tests/HDWallet.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/HRP.test.ts b/wasm/tests/HRP.test.ts
index 99d596e5f98..e6e81505003 100644
--- a/wasm/tests/HRP.test.ts
+++ b/wasm/tests/HRP.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/Hash.test.ts b/wasm/tests/Hash.test.ts
index 47c26e87e81..1747995eb48 100644
--- a/wasm/tests/Hash.test.ts
+++ b/wasm/tests/Hash.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/HexCoding.test.ts b/wasm/tests/HexCoding.test.ts
index 0bacf5d67ce..9879072a047 100644
--- a/wasm/tests/HexCoding.test.ts
+++ b/wasm/tests/HexCoding.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/KeyStore+extension.test.ts b/wasm/tests/KeyStore+extension.test.ts
index fe22c5b7091..9cc1dcf5c22 100644
--- a/wasm/tests/KeyStore+extension.test.ts
+++ b/wasm/tests/KeyStore+extension.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
@@ -11,7 +9,7 @@ import { ChromeStorageMock } from "./mock";
 
 describe("KeyStore", async () => {
   it("test ExtensionStorage", async () => {
-    const { CoinType, HexCoding } = globalThis.core;
+    const { CoinType, HexCoding, StoredKeyEncryption } = globalThis.core;
     const mnemonic = globalThis.mnemonic as string;
     const password = globalThis.password as string;
 
@@ -24,7 +22,7 @@ describe("KeyStore", async () => {
 
     var wallet = await keystore.import(mnemonic, "Coolw", password, [
       CoinType.bitcoin,
-    ]);
+    ], StoredKeyEncryption.aes128Ctr);
 
     assert.equal(wallet.name, "Coolw");
     assert.equal(wallet.type, "mnemonic");
@@ -65,4 +63,60 @@ describe("KeyStore", async () => {
       keystore.delete(w.id, password);
     });
   }).timeout(10000);
+
+  it("test ExtensionStorage AES256", async () => {
+    const { CoinType, HexCoding, StoredKeyEncryption } = globalThis.core;
+    const mnemonic = globalThis.mnemonic as string;
+    const password = globalThis.password as string;
+
+    const walletIdsKey = "all-wallet-ids";
+    const storage = new KeyStore.ExtensionStorage(
+        walletIdsKey,
+        new ChromeStorageMock()
+    );
+    const keystore = new KeyStore.Default(globalThis.core, storage);
+
+    var wallet = await keystore.import(mnemonic, "Coolw", password, [
+      CoinType.bitcoin,
+    ], StoredKeyEncryption.aes256Ctr);
+
+    assert.equal(wallet.name, "Coolw");
+    assert.equal(wallet.type, "mnemonic");
+    assert.equal(wallet.version, 3);
+
+    const account = wallet.activeAccounts[0];
+    const key = await keystore.getKey(wallet.id, password, account);
+
+    assert.equal(
+        HexCoding.encode(key.data()),
+        "0xd2568511baea8dc347f14c4e0479eb8ebe29eb5f664ed796e755896250ffd11f"
+    );
+    assert.equal(account.address, "bc1qturc268v0f2srjh4r2zu4t6zk4gdutqd5a6zny");
+    assert.equal(
+        account.extendedPublicKey,
+        "zpub6qbsWdbcKW9sC6shTKK4VEhfWvDCoWpfLnnVfYKHLHt31wKYUwH3aFDz4WLjZvjHZ5W4qVEyk37cRwzTbfrrT1Gnu8SgXawASnkdQ994atn"
+    );
+    assert.equal(
+        account.publicKey,
+        "02df6fc590ab3101bbe0bb5765cbaeab9b5dcfe09ac9315d707047cbd13bc7e006"
+    );
+
+    wallet = await keystore.addAccounts(wallet.id, password, [
+      CoinType.ethereum,
+      CoinType.binance,
+    ]);
+
+    assert.equal(wallet.activeAccounts.length, 3);
+    assert.isTrue(await keystore.hasWallet(wallet.id));
+    assert.isFalse(await keystore.hasWallet("invalid-id"));
+
+    const exported = await keystore.export(wallet.id, password);
+    assert.equal(exported, mnemonic);
+
+    const wallets = await keystore.loadAll();
+
+    await wallets.forEach((w) => {
+      keystore.delete(w.id, password);
+    });
+  }).timeout(10000);
 });
diff --git a/wasm/tests/KeyStore+fs.test.ts b/wasm/tests/KeyStore+fs.test.ts
index 743a9a8e4b4..78359293dd6 100644
--- a/wasm/tests/KeyStore+fs.test.ts
+++ b/wasm/tests/KeyStore+fs.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
@@ -11,7 +9,7 @@ import { KeyStore } from "../dist";
 
 describe("KeyStore", async () => {
   it("test FileSystemStorage", async () => {
-    const { CoinType, HexCoding } = globalThis.core;
+    const { CoinType, HexCoding, StoredKeyEncryption } = globalThis.core;
     const mnemonic = globalThis.mnemonic as string;
     const password = globalThis.password as string;
     const testDir = "/tmp/wasm-test";
@@ -23,7 +21,7 @@ describe("KeyStore", async () => {
 
     var wallet = await keystore.import(mnemonic, "Coolw", password, [
       CoinType.bitcoin,
-    ]);
+    ], StoredKeyEncryption.aes128Ctr);
     const stats = fs.statSync(storage.getFilename(wallet.id));
 
     assert.isTrue(stats.isFile());
@@ -67,4 +65,62 @@ describe("KeyStore", async () => {
       keystore.delete(w.id, password);
     });
   }).timeout(10000);
+
+  it("test FileSystemStorage AES256", async () => {
+    const { CoinType, HexCoding, StoredKeyEncryption } = globalThis.core;
+    const mnemonic = globalThis.mnemonic as string;
+    const password = globalThis.password as string;
+    const testDir = "/tmp/wasm-test";
+
+    fs.mkdirSync(testDir, { recursive: true });
+
+    const storage = new KeyStore.FileSystemStorage(testDir);
+    const keystore = new KeyStore.Default(globalThis.core, storage);
+
+    var wallet = await keystore.import(mnemonic, "Coolw", password, [
+      CoinType.bitcoin,
+    ], StoredKeyEncryption.aes256Ctr);
+    const stats = fs.statSync(storage.getFilename(wallet.id));
+
+    assert.isTrue(stats.isFile());
+    assert.isTrue(stats.size > 0);
+    assert.equal(wallet.name, "Coolw");
+    assert.equal(wallet.type, "mnemonic");
+    assert.equal(wallet.version, 3);
+
+    const account = wallet.activeAccounts[0];
+    const key = await keystore.getKey(wallet.id, password, account);
+
+    assert.equal(
+        HexCoding.encode(key.data()),
+        "0xd2568511baea8dc347f14c4e0479eb8ebe29eb5f664ed796e755896250ffd11f"
+    );
+    assert.equal(account.address, "bc1qturc268v0f2srjh4r2zu4t6zk4gdutqd5a6zny");
+    assert.equal(
+        account.extendedPublicKey,
+        "zpub6qbsWdbcKW9sC6shTKK4VEhfWvDCoWpfLnnVfYKHLHt31wKYUwH3aFDz4WLjZvjHZ5W4qVEyk37cRwzTbfrrT1Gnu8SgXawASnkdQ994atn"
+    );
+    assert.equal(
+        account.publicKey,
+        "02df6fc590ab3101bbe0bb5765cbaeab9b5dcfe09ac9315d707047cbd13bc7e006"
+    );
+
+    wallet = await keystore.addAccounts(wallet.id, password, [
+      CoinType.ethereum,
+      CoinType.binance,
+    ]);
+
+    assert.equal(wallet.activeAccounts.length, 3);
+    assert.isTrue(await keystore.hasWallet(wallet.id));
+    assert.isFalse(await keystore.hasWallet("invalid-id"));
+
+    const exported = await keystore.export(wallet.id, password);
+    assert.equal(exported, mnemonic);
+
+    const wallets = await keystore.loadAll();
+
+    await wallets.forEach((w) => {
+      keystore.delete(w.id, password);
+    });
+  }).timeout(10000);
 });
diff --git a/wasm/tests/Mnemonic.test.ts b/wasm/tests/Mnemonic.test.ts
index 690c614aa95..f392a659e27 100644
--- a/wasm/tests/Mnemonic.test.ts
+++ b/wasm/tests/Mnemonic.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/PBKDF2.test.ts b/wasm/tests/PBKDF2.test.ts
index 138ff504963..8658a79d69e 100644
--- a/wasm/tests/PBKDF2.test.ts
+++ b/wasm/tests/PBKDF2.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/StoredKey.test.ts b/wasm/tests/StoredKey.test.ts
index a24f8d8479f..7f3b04638c2 100644
--- a/wasm/tests/StoredKey.test.ts
+++ b/wasm/tests/StoredKey.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/initWasm.test.ts b/wasm/tests/initWasm.test.ts
index 0fb9dd84fef..e20b9cb00b6 100644
--- a/wasm/tests/initWasm.test.ts
+++ b/wasm/tests/initWasm.test.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import "mocha";
 import { assert } from "chai";
diff --git a/wasm/tests/mock.ts b/wasm/tests/mock.ts
index 99451f70d76..7064f115489 100644
--- a/wasm/tests/mock.ts
+++ b/wasm/tests/mock.ts
@@ -1,8 +1,6 @@
-// Copyright © 2017-2022 Trust Wallet.
+// SPDX-License-Identifier: Apache-2.0
 //
-// This file is part of Trust. The full Trust copyright notice, including
-// terms governing use, modification, and redistribution, is contained in the
-// file LICENSE at the root of the source code distribution tree.
+// Copyright © 2017 Trust Wallet.
 
 import { Events, Storage } from "webextension-polyfill";